#include <linux/if_link.h>
#include <linux/netlink.h>
-
-#define ODP_FLOW_NEW _IOWR('O', 13, struct odp_flow)
-#define ODP_FLOW_DEL _IOWR('O', 14, struct odp_flow)
-#define ODP_FLOW_GET _IOWR('O', 15, struct odp_flow)
-#define ODP_FLOW_SET _IOWR('O', 16, struct odp_flow)
-#define ODP_FLOW_DUMP _IOWR('O', 17, struct odp_flow)
-#define ODP_FLOW_FLUSH _IO('O', 19)
\f
-/* Datapaths. */
+/* datapaths. */
#define ODP_DATAPATH_FAMILY "odp_datapath"
#define ODP_DATAPATH_MCGROUP "odp_datapath"
/**
* struct odp_header - header for ODP Generic Netlink messages.
- * @dp_idx: Number of datapath to which the packet belongs.
+ * @dp_ifindex: ifindex of local port for datapath (0 to make a request not
+ * specific to a datapath).
*
* Attributes following the header are specific to a particular ODP Generic
* Netlink family, but all of the ODP families use this header.
*/
struct odp_header {
- uint32_t dp_idx;
+ int dp_ifindex;
};
\f
/**
* enum odp_datapath_attr - attributes for %ODP_DP_* commands.
* @ODP_DP_ATTR_NAME: Name of the network device that serves as the "local
- * port". This is the name of the network device whose dp_idx is given in the
- * &struct odp_header. Always present in notifications. Required in
- * %ODP_DP_NEW requests. May be used as an alternative to specifying dp_idx on
- * other requests (with a dp_idx of %UINT32_MAX).
+ * port". This is the name of the network device whose dp_ifindex is given in
+ * the &struct odp_header. Always present in notifications. Required in
+ * %ODP_DP_NEW requests. May be used as an alternative to specifying
+ * dp_ifindex in other requests (with a dp_ifindex of 0).
* @ODP_DP_ATTR_STATS: Statistics about packets that have passed through the
* datapath. Always present in notifications.
* @ODP_DP_ATTR_IPV4_FRAGS: One of %ODP_DP_FRAG_*. Always present in
*/
enum odp_datapath_attr {
ODP_DP_ATTR_UNSPEC,
- ODP_DP_ATTR_NAME, /* name of dp_ifidx netdev */
+ ODP_DP_ATTR_NAME, /* name of dp_ifindex netdev */
ODP_DP_ATTR_STATS, /* struct odp_stats */
ODP_DP_ATTR_IPV4_FRAGS, /* 32-bit enum odp_frag_handling */
ODP_DP_ATTR_SAMPLING, /* 32-bit fraction of packets to sample. */
/* Kernel-to-user notifications. */
ODP_PACKET_CMD_MISS, /* Flow table miss. */
- ODP_PACKET_CMD_ACTION, /* ODPAT_CONTROLLER action. */
+ ODP_PACKET_CMD_ACTION, /* ODP_ACTION_ATTR_CONTROLLER action. */
ODP_PACKET_CMD_SAMPLE, /* Sampled packet. */
/* User commands. */
* @ODP_PACKET_ATTR_PACKET: Present for all notifications. Contains the entire
* packet as received, from the start of the Ethernet header onward. For
* %ODP_PACKET_CMD_ACTION, %ODP_PACKET_ATTR_PACKET reflects changes made by
- * actions preceding %ODPAT_CONTROLLER, but %ODP_PACKET_ATTR_KEY is the flow
- * key extracted from the packet as originally received.
+ * actions preceding %ODP_ACTION_ATTR_CONTROLLER, but %ODP_PACKET_ATTR_KEY is
+ * the flow key extracted from the packet as originally received.
* @ODP_PACKET_ATTR_KEY: Present for all notifications. Contains the flow key
* extracted from the packet as nested %ODP_KEY_ATTR_* attributes. This allows
* userspace to adapt its flow setup strategy by comparing its notion of the
* flow key against the kernel's.
* @ODP_PACKET_ATTR_USERDATA: Present for an %ODP_PACKET_CMD_ACTION
- * notification if the %ODPAT_CONTROLLER action's argument was nonzero.
+ * notification if the %ODP_ACTION_ATTR_CONTROLLER, action's argument was
+ * nonzero.
* @ODP_PACKET_ATTR_SAMPLE_POOL: Present for %ODP_PACKET_CMD_SAMPLE. Contains
* the number of packets processed so far that were candidates for sampling.
* @ODP_PACKET_ATTR_ACTIONS: Present for %ODP_PACKET_CMD_SAMPLE. Contains a
- * copy of the actions applied to the packet, as nested %ODPAT_* attributes.
+ * copy of the actions applied to the packet, as nested %ODP_ACTION_ATTR_*
+ * attributes.
*
* These attributes follow the &struct odp_header within the Generic Netlink
* payload for %ODP_PACKET_* commands.
ODP_PACKET_ATTR_UNSPEC,
ODP_PACKET_ATTR_PACKET, /* Packet data. */
ODP_PACKET_ATTR_KEY, /* Nested ODP_KEY_ATTR_* attributes. */
- ODP_PACKET_ATTR_USERDATA, /* 64-bit data from ODPAT_CONTROLLER. */
+ ODP_PACKET_ATTR_USERDATA, /* u64 ODP_ACTION_ATTR_CONTROLLER arg. */
ODP_PACKET_ATTR_SAMPLE_POOL, /* # sampling candidate packets so far. */
- ODP_PACKET_ATTR_ACTIONS, /* Nested ODPAT_* attributes. */
+ ODP_PACKET_ATTR_ACTIONS, /* Nested ODP_ACTION_ATTR_* attributes. */
__ODP_PACKET_ATTR_MAX
};
};
#define ODP_PATCH_ATTR_MAX (__ODP_PATCH_ATTR_MAX - 1)
+\f
+/* Flows. */
+
+#define ODP_FLOW_FAMILY "odp_flow"
+#define ODP_FLOW_MCGROUP "odp_flow"
+
+enum odp_flow_cmd {
+ ODP_FLOW_CMD_UNSPEC,
+ ODP_FLOW_CMD_NEW,
+ ODP_FLOW_CMD_DEL,
+ ODP_FLOW_CMD_GET,
+ ODP_FLOW_CMD_SET
+};
struct odp_flow_stats {
uint64_t n_packets; /* Number of matched packets. */
ODP_KEY_ATTR_8021Q, /* struct odp_key_8021q */
ODP_KEY_ATTR_ETHERTYPE, /* 16-bit Ethernet type */
ODP_KEY_ATTR_IPV4, /* struct odp_key_ipv4 */
+ ODP_KEY_ATTR_IPV6, /* struct odp_key_ipv6 */
ODP_KEY_ATTR_TCP, /* struct odp_key_tcp */
ODP_KEY_ATTR_UDP, /* struct odp_key_udp */
ODP_KEY_ATTR_ICMP, /* struct odp_key_icmp */
+ ODP_KEY_ATTR_ICMPV6, /* struct odp_key_icmpv6 */
ODP_KEY_ATTR_ARP, /* struct odp_key_arp */
+ ODP_KEY_ATTR_ND, /* struct odp_key_nd */
__ODP_KEY_ATTR_MAX
};
uint8_t ipv4_tos;
};
+struct odp_key_ipv6 {
+ ovs_be32 ipv6_src[4];
+ ovs_be32 ipv6_dst[4];
+ uint8_t ipv6_proto;
+ uint8_t ipv6_tos;
+};
+
struct odp_key_tcp {
ovs_be16 tcp_src;
ovs_be16 tcp_dst;
uint8_t icmp_code;
};
+struct odp_key_icmpv6 {
+ uint8_t icmpv6_type;
+ uint8_t icmpv6_code;
+};
+
struct odp_key_arp {
ovs_be32 arp_sip;
ovs_be32 arp_tip;
ovs_be16 arp_op;
+ uint8_t arp_sha[6];
+ uint8_t arp_tha[6];
+};
+
+struct odp_key_nd {
+ uint32_t nd_target[4];
+ uint8_t nd_sll[6];
+ uint8_t nd_tll[6];
};
/**
- * struct odp_flow - header with basic information about a flow.
- * @dp_idx: Datapath index.
- * @len: Length of this structure plus the Netlink attributes following it.
- * @total_len: Total space available for kernel reply to request.
+ * enum odp_flow_attr - attributes for %ODP_FLOW_* commands.
+ * @ODP_FLOW_ATTR_KEY: Nested %ODP_KEY_ATTR_* attributes specifying the flow
+ * key. Always present in notifications. Required for all requests (except
+ * dumps).
+ * @ODP_FLOW_ATTR_ACTIONS: Nested %ODPAT_* attributes specifying the actions to
+ * take for packets that match the key. Always present in notifications.
+ * Required for %ODP_FLOW_CMD_NEW requests, optional on %ODP_FLOW_CMD_SET
+ * request to change the existing actions, ignored for other requests.
+ * @ODP_FLOW_ATTR_STATS: &struct odp_flow_stats giving statistics for this
+ * flow. Present in notifications if the stats would be nonzero. Ignored in
+ * requests.
+ * @ODP_FLOW_ATTR_TCP_FLAGS: An 8-bit value giving the OR'd value of all of the
+ * TCP flags seen on packets in this flow. Only present in notifications for
+ * TCP flows, and only if it would be nonzero. Ignored in requests.
+ * @ODP_FLOW_ATTR_USED: A 64-bit integer giving the time, in milliseconds on
+ * the system monotonic clock, at which a packet was last processed for this
+ * flow. Only present in notifications if a packet has been processed for this
+ * flow. Ignored in requests.
+ * @ODP_FLOW_ATTR_CLEAR: If present in a %ODP_FLOW_CMD_SET request, clears the
+ * last-used time, accumulated TCP flags, and statistics for this flow.
+ * Otherwise ignored in requests. Never present in notifications.
*
- * Followed by &struct nlattr attributes, whose types are drawn from
- * %ODP_FLOW_ATTR_*, up to a length of @len bytes including the &struct
- * odp_flow header.
+ * These attributes follow the &struct odp_header within the Generic Netlink
+ * payload for %ODP_FLOW_* commands.
*/
-struct odp_flow {
- uint32_t nlmsg_flags;
- uint32_t dp_idx;
- uint32_t len;
- uint32_t total_len;
-};
-
-enum odp_flow_type {
+enum odp_flow_attr {
ODP_FLOW_ATTR_UNSPEC,
ODP_FLOW_ATTR_KEY, /* Sequence of ODP_KEY_ATTR_* attributes. */
- ODP_FLOW_ATTR_ACTIONS, /* Sequence of nested ODPAT_* attributes. */
+ ODP_FLOW_ATTR_ACTIONS, /* Nested ODP_ACTION_ATTR_* attributes. */
ODP_FLOW_ATTR_STATS, /* struct odp_flow_stats. */
ODP_FLOW_ATTR_TCP_FLAGS, /* 8-bit OR'd TCP flags. */
ODP_FLOW_ATTR_USED, /* u64 msecs last used in monotonic time. */
ODP_FLOW_ATTR_CLEAR, /* Flag to clear stats, tcp_flags, used. */
- ODP_FLOW_ATTR_STATE, /* u64 state for ODP_FLOW_DUMP. */
__ODP_FLOW_ATTR_MAX
};
/* Action types. */
enum odp_action_type {
- ODPAT_UNSPEC,
- ODPAT_OUTPUT, /* Output to switch port. */
- ODPAT_CONTROLLER, /* Send copy to controller. */
- ODPAT_SET_DL_TCI, /* Set the 802.1q TCI value. */
- ODPAT_STRIP_VLAN, /* Strip the 802.1q header. */
- ODPAT_SET_DL_SRC, /* Ethernet source address. */
- ODPAT_SET_DL_DST, /* Ethernet destination address. */
- ODPAT_SET_NW_SRC, /* IPv4 source address. */
- ODPAT_SET_NW_DST, /* IPv4 destination address. */
- ODPAT_SET_NW_TOS, /* IP ToS/DSCP field (6 bits). */
- ODPAT_SET_TP_SRC, /* TCP/UDP source port. */
- ODPAT_SET_TP_DST, /* TCP/UDP destination port. */
- ODPAT_SET_TUNNEL, /* Set the encapsulating tunnel ID. */
- ODPAT_SET_PRIORITY, /* Set skb->priority. */
- ODPAT_POP_PRIORITY, /* Restore original skb->priority. */
- ODPAT_DROP_SPOOFED_ARP, /* Drop ARPs with spoofed source MAC. */
- __ODPAT_MAX
+ ODP_ACTION_ATTR_UNSPEC,
+ ODP_ACTION_ATTR_OUTPUT, /* Output to switch port. */
+ ODP_ACTION_ATTR_CONTROLLER, /* Send copy to controller. */
+ ODP_ACTION_ATTR_SET_DL_TCI, /* Set the 802.1q TCI value. */
+ ODP_ACTION_ATTR_STRIP_VLAN, /* Strip the 802.1q header. */
+ ODP_ACTION_ATTR_SET_DL_SRC, /* Ethernet source address. */
+ ODP_ACTION_ATTR_SET_DL_DST, /* Ethernet destination address. */
+ ODP_ACTION_ATTR_SET_NW_SRC, /* IPv4 source address. */
+ ODP_ACTION_ATTR_SET_NW_DST, /* IPv4 destination address. */
+ ODP_ACTION_ATTR_SET_NW_TOS, /* IP ToS/DSCP field (6 bits). */
+ ODP_ACTION_ATTR_SET_TP_SRC, /* TCP/UDP source port. */
+ ODP_ACTION_ATTR_SET_TP_DST, /* TCP/UDP destination port. */
+ ODP_ACTION_ATTR_SET_TUNNEL, /* Set the encapsulating tunnel ID. */
+ ODP_ACTION_ATTR_SET_PRIORITY, /* Set skb->priority. */
+ ODP_ACTION_ATTR_POP_PRIORITY, /* Restore original skb->priority. */
+ ODP_ACTION_ATTR_DROP_SPOOFED_ARP, /* Drop ARPs with spoofed source MAC. */
+ __ODP_ACTION_ATTR_MAX
};
-#define ODPAT_MAX (__ODPAT_MAX - 1)
+#define ODP_ACTION_ATTR_MAX (__ODP_ACTION_ATTR_MAX - 1)
#endif /* openvswitch/datapath-protocol.h */
git://git.onelab.eu / sliver-openvswitch.git / blobdiff