X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fopenvswitch%2Fdatapath-protocol.h;h=e5bbc6ac2fe15282ff0cddbabaa13f1d1f587565;hb=a3e2d85f8f3a8b3220c0a834cc0fd9519e6b5b85;hp=083800cc88399ac20fe16440fc52d0c34e336eb8;hpb=254f2dc8e3eb18debf4a8f238b9c87cf4d4dbd3f;p=openvswitch diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h index 083800cc..e5bbc6ac 100644 --- a/include/openvswitch/datapath-protocol.h +++ b/include/openvswitch/datapath-protocol.h @@ -37,19 +37,9 @@ * ---------------------------------------------------------------------- */ -/* Protocol between userspace and kernel datapath. - * - * Be sure to update datapath/odp-compat.h if you change any of the structures - * in here. */ - #ifndef OPENVSWITCH_DATAPATH_PROTOCOL_H #define OPENVSWITCH_DATAPATH_PROTOCOL_H 1 -/* The ovs_be types indicate that an object is in big-endian, not - * native-endian, byte order. They are otherwise equivalent to uint_t. - * The Linux kernel already has __be types for this, which take on - * additional semantics when the "sparse" static checker is used, so we use - * those types when compiling the kernel. */ #ifdef __KERNEL__ #include #include @@ -61,12 +51,6 @@ #include #endif -#ifndef __aligned_u64 -#define __aligned_u64 __u64 __attribute__((aligned(8))) -#define __aligned_be64 __be64 __attribute__((aligned(8))) -#define __aligned_le64 __le64 __attribute__((aligned(8))) -#endif - #include #include @@ -161,7 +145,7 @@ enum odp_packet_cmd { /* 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. */ @@ -173,18 +157,20 @@ enum odp_packet_cmd { * @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. @@ -193,9 +179,9 @@ enum odp_packet_attr { 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 }; @@ -235,7 +221,8 @@ enum odp_vport_cmd { * @ODP_VPORT_ATTR_STATS: A &struct rtnl_link_stats64 giving statistics for * packets sent or received through the vport. * @ODP_VPORT_ATTR_ADDRESS: A 6-byte Ethernet address for the vport. - * @ODP_VPORT_ATTR_MTU: MTU for the vport. + * @ODP_VPORT_ATTR_MTU: MTU for the vport. Omitted if the vport does not have + * an MTU as, e.g., some tunnels do not. * @ODP_VPORT_ATTR_IFINDEX: ifindex of the underlying network device, if any. * @ODP_VPORT_ATTR_IFLINK: ifindex of the device on which packets are sent (for * tunnels), if any. @@ -309,10 +296,13 @@ enum odp_key_type { 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 }; @@ -335,6 +325,13 @@ struct odp_key_ipv4 { 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; @@ -350,10 +347,23 @@ struct odp_key_icmp { 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]; }; /** @@ -385,7 +395,7 @@ struct odp_key_arp { 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. */ @@ -397,25 +407,25 @@ enum odp_flow_attr { /* 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 */