X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fopenvswitch%2Fdatapath-protocol.h;h=25499aa1be90e2ebbd1b112cbe925253d6b599ad;hb=36956a7d33c9ee204fcb184484a5aaacbd9ecef8;hp=c3ec4dcf2f7a88417aa592b65532d94966b41d74;hpb=abfec865566e6cce961cc8660de1ddfdc85dae5f;p=openvswitch diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h index c3ec4dcf..25499aa1 100644 --- a/include/openvswitch/datapath-protocol.h +++ b/include/openvswitch/datapath-protocol.h @@ -52,16 +52,24 @@ * those types when compiling the kernel. */ #ifdef __KERNEL__ #include +#include #define ovs_be16 __be16 #define ovs_be32 __be32 #define ovs_be64 __be64 #else -#include -#define ovs_be16 uint16_t -#define ovs_be32 uint32_t -#define ovs_be64 uint64_t +#include "openvswitch/types.h" +#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 + #define ODP_MAX 256 /* Maximum number of datapaths. */ #define ODP_DP_CREATE _IO('O', 0) @@ -74,17 +82,14 @@ #define ODP_GET_LISTEN_MASK _IOW('O', 5, int) #define ODP_SET_LISTEN_MASK _IOR('O', 6, int) -#define ODP_PORT_ATTACH _IOR('O', 7, struct odp_port) -#define ODP_PORT_DETACH _IOR('O', 8, int) -#define ODP_PORT_QUERY _IOWR('O', 9, struct odp_port) -#define ODP_PORT_LIST _IOWR('O', 10, struct odp_portvec) +#define ODP_VPORT_ATTACH _IOR('O', 7, struct odp_port) +#define ODP_VPORT_DETACH _IOR('O', 8, int) +#define ODP_VPORT_QUERY _IOWR('O', 9, struct odp_port) +#define ODP_VPORT_LIST _IOWR('O', 10, struct odp_portvec) -#define ODP_PORT_GROUP_SET _IOR('O', 11, struct odp_port_group) -#define ODP_PORT_GROUP_GET _IOWR('O', 12, struct odp_port_group) - -#define ODP_FLOW_GET _IOWR('O', 13, struct odp_flow) +#define ODP_FLOW_GET _IOWR('O', 13, struct odp_flowvec) #define ODP_FLOW_PUT _IOWR('O', 14, struct odp_flow) -#define ODP_FLOW_LIST _IOWR('O', 15, struct odp_flowvec) +#define ODP_FLOW_DUMP _IOWR('O', 15, struct odp_flow_dump) #define ODP_FLOW_FLUSH _IO('O', 16) #define ODP_FLOW_DEL _IOWR('O', 17, struct odp_flow) @@ -93,9 +98,7 @@ #define ODP_SET_SFLOW_PROBABILITY _IOR('O', 19, int) #define ODP_GET_SFLOW_PROBABILITY _IOW('O', 20, int) -#define ODP_VPORT_ADD _IOR('O', 21, struct odp_vport_add) -#define ODP_VPORT_MOD _IOR('O', 22, struct odp_vport_mod) -#define ODP_VPORT_DEL _IO('O', 23) +#define ODP_VPORT_MOD _IOR('O', 22, struct odp_port) #define ODP_VPORT_STATS_GET _IOWR('O', 24, struct odp_vport_stats_req) #define ODP_VPORT_ETHER_GET _IOWR('O', 25, struct odp_vport_ether) #define ODP_VPORT_ETHER_SET _IOW('O', 26, struct odp_vport_ether) @@ -112,8 +115,6 @@ struct odp_stats { /* Ports. */ uint32_t n_ports; /* Current number of ports. */ uint32_t max_ports; /* Maximum supported number of ports. */ - uint16_t max_groups; /* Maximum number of port groups. */ - uint16_t reserved; /* Lookups. */ uint64_t n_frags; /* Number of dropped IP fragments. */ @@ -130,7 +131,6 @@ struct odp_stats { /* Logical ports. */ #define ODPP_LOCAL ((uint16_t)0) #define ODPP_NONE ((uint16_t)-1) -#define ODPP_NORMAL ((uint16_t)-2) /* Listening channels. */ #define _ODPL_MISS_NR 0 /* Packet missed in flow table. */ @@ -143,10 +143,9 @@ struct odp_stats { /** * struct odp_msg - format of messages read from datapath fd. - * @type: One of the %_ODPL_* constants. * @length: Total length of message, including this header. + * @type: One of the %_ODPL_* constants. * @port: Port that received the packet embedded in this message. - * @reserved: Not currently used. Should be set to 0. * @arg: Argument value whose meaning depends on @type. * * For @type == %_ODPL_MISS_NR, the header is followed by packet data. The @@ -154,43 +153,46 @@ struct odp_stats { * encapsulated this packet. It is 0 if the packet was not received on a tunnel. * * For @type == %_ODPL_ACTION_NR, the header is followed by packet data. The - * @arg member is copied from the &struct odp_action_controller that caused - * the &struct odp_msg to be composed. + * @arg member is copied from the %ODPAT_CONTROLLER action that caused the + * &struct odp_msg to be composed. * * For @type == %_ODPL_SFLOW_NR, the header is followed by &struct - * odp_sflow_sample_header, then by an array of &union odp_action (the number - * of which is specified in &struct odp_sflow_sample_header), then by packet + * odp_sflow_sample_header, then by a series of Netlink attributes (whose + * length is specified in &struct odp_sflow_sample_header), then by packet * data. */ struct odp_msg { - uint32_t type; uint32_t length; + uint16_t type; uint16_t port; - uint16_t reserved; - uint32_t arg; + __aligned_u64 arg; }; /** * struct odp_sflow_sample_header - header added to sFlow sampled packet. * @sample_pool: Number of packets that were candidates for sFlow sampling, * regardless of whether they were actually chosen and sent down to userspace. - * @n_actions: Number of "union odp_action"s immediately following this header. + * @actions_len: Number of bytes of actions immediately following this header. * * This header follows &struct odp_msg when that structure's @type is - * %_ODPL_SFLOW_NR, and it is itself followed by an array of &union odp_action - * (the number of which is specified in @n_actions) and then by packet data. + * %_ODPL_SFLOW_NR, and it is itself followed by a series of Netlink attributes + * (the number of bytes of which is specified in @actions_len) and then by + * packet data. */ struct odp_sflow_sample_header { uint32_t sample_pool; - uint32_t n_actions; + uint32_t actions_len; }; -#define ODP_PORT_INTERNAL (1 << 0) /* This port is simulated. */ +#define VPORT_TYPE_SIZE 16 +#define VPORT_CONFIG_SIZE 32 struct odp_port { char devname[16]; /* IFNAMSIZ */ + char type[VPORT_TYPE_SIZE]; uint16_t port; - uint16_t flags; + uint16_t reserved1; uint32_t reserved2; + __aligned_u64 config[VPORT_CONFIG_SIZE / 8]; /* type-specific */ }; struct odp_portvec { @@ -198,12 +200,6 @@ struct odp_portvec { uint32_t n_ports; }; -struct odp_port_group { - uint16_t *ports; - uint16_t n_ports; /* Number of ports. */ - uint16_t group; /* Group number. */ -}; - struct odp_flow_stats { uint64_t n_packets; /* Number of matched packets. */ uint64_t n_bytes; /* Number of matched bytes. */ @@ -214,32 +210,71 @@ struct odp_flow_stats { uint16_t error; /* Used by ODP_FLOW_GET. */ }; -struct odp_flow_key { - ovs_be32 tun_id; /* Encapsulating tunnel ID. */ - ovs_be32 nw_src; /* IP source address. */ - ovs_be32 nw_dst; /* IP destination address. */ - uint16_t in_port; /* Input switch port. */ - ovs_be16 dl_vlan; /* Input VLAN. */ - ovs_be16 dl_type; /* Ethernet frame type. */ - ovs_be16 tp_src; /* TCP/UDP source port. */ - ovs_be16 tp_dst; /* TCP/UDP destination port. */ - uint8_t dl_src[6]; /* Ethernet source address. */ - uint8_t dl_dst[6]; /* Ethernet destination address. */ - uint8_t nw_proto; /* IP protocol or lower 8 bits of - ARP opcode. */ - uint8_t dl_vlan_pcp; /* Input VLAN priority. */ - uint8_t nw_tos; /* IP ToS (DSCP field, 6 bits). */ - uint8_t reserved[3]; /* Align to 32-bits...must be zeroed. */ +enum odp_key_type { + ODP_KEY_ATTR_UNSPEC, + ODP_KEY_ATTR_TUN_ID, /* 64-bit tunnel ID */ + ODP_KEY_ATTR_IN_PORT, /* 32-bit ODP port number */ + ODP_KEY_ATTR_ETHERNET, /* struct odp_key_ethernet */ + 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_TCP, /* struct odp_key_tcp */ + ODP_KEY_ATTR_UDP, /* struct odp_key_udp */ + ODP_KEY_ATTR_ICMP, /* struct odp_key_icmp */ + ODP_KEY_ATTR_ARP, /* struct odp_key_arp */ + __ODP_KEY_ATTR_MAX +}; + +#define ODP_KEY_ATTR_MAX (__ODP_KEY_ATTR_MAX - 1) + +struct odp_key_ethernet { + uint8_t eth_src[6]; + uint8_t eth_dst[6]; +}; + +struct odp_key_8021q { + ovs_be16 q_tpid; + ovs_be16 q_tci; +}; + +struct odp_key_ipv4 { + ovs_be32 ipv4_src; + ovs_be32 ipv4_dst; + uint8_t ipv4_proto; + uint8_t ipv4_tos; +}; + +struct odp_key_tcp { + ovs_be16 tcp_src; + ovs_be16 tcp_dst; +}; + +struct odp_key_udp { + ovs_be16 udp_src; + ovs_be16 udp_dst; +}; + +struct odp_key_icmp { + uint8_t icmp_type; + uint8_t icmp_code; +}; + +struct odp_key_arp { + ovs_be32 arp_sip; + ovs_be32 arp_tip; + ovs_be16 arp_op; }; /* Flags for ODP_FLOW. */ #define ODPFF_ZERO_TCP_FLAGS (1 << 0) /* Zero the TCP flags. */ +#define ODPFF_EOF (1 << 1) /* ODP_FLOW_DUMP: end of flow table. */ struct odp_flow { struct odp_flow_stats stats; - struct odp_flow_key key; - union odp_action *actions; - uint32_t n_actions; + struct nlattr *key; + uint32_t key_len; + struct nlattr *actions; + uint32_t actions_len; uint32_t flags; }; @@ -259,131 +294,47 @@ struct odp_flowvec { uint32_t n_flows; }; -/* The VLAN id is 12 bits, so we can use the entire 16 bits to indicate - * special conditions. All ones is used to match that no VLAN id was - * set. */ -#define ODP_VLAN_NONE 0xffff - -/* Action types. */ -#define ODPAT_OUTPUT 0 /* Output to switch port. */ -#define ODPAT_OUTPUT_GROUP 1 /* Output to all ports in group. */ -#define ODPAT_CONTROLLER 2 /* Send copy to controller. */ -#define ODPAT_SET_VLAN_VID 3 /* Set the 802.1q VLAN id. */ -#define ODPAT_SET_VLAN_PCP 4 /* Set the 802.1q priority. */ -#define ODPAT_STRIP_VLAN 5 /* Strip the 802.1q header. */ -#define ODPAT_SET_DL_SRC 6 /* Ethernet source address. */ -#define ODPAT_SET_DL_DST 7 /* Ethernet destination address. */ -#define ODPAT_SET_NW_SRC 8 /* IP source address. */ -#define ODPAT_SET_NW_DST 9 /* IP destination address. */ -#define ODPAT_SET_NW_TOS 10 /* IP ToS/DSCP field (6 bits). */ -#define ODPAT_SET_TP_SRC 11 /* TCP/UDP source port. */ -#define ODPAT_SET_TP_DST 12 /* TCP/UDP destination port. */ -#define ODPAT_SET_TUNNEL 13 /* Set the encapsulating tunnel ID. */ -#define ODPAT_SET_PRIORITY 14 /* Set skb->priority. */ -#define ODPAT_POP_PRIORITY 15 /* Restore original skb->priority. */ -#define ODPAT_N_ACTIONS 16 - -struct odp_action_output { - uint16_t type; /* ODPAT_OUTPUT. */ - uint16_t port; /* Output port. */ - uint16_t reserved1; - uint16_t reserved2; -}; - -struct odp_action_output_group { - uint16_t type; /* ODPAT_OUTPUT_GROUP. */ - uint16_t group; /* Group number. */ - uint16_t reserved1; - uint16_t reserved2; -}; - -struct odp_action_controller { - uint16_t type; /* ODPAT_OUTPUT_CONTROLLER. */ - uint16_t reserved; - uint32_t arg; /* Copied to struct odp_msg 'arg' member. */ -}; - -struct odp_action_tunnel { - uint16_t type; /* ODPAT_SET_TUNNEL. */ - uint16_t reserved; - ovs_be32 tun_id; /* Tunnel ID. */ -}; - -/* Action structure for ODPAT_SET_VLAN_VID. */ -struct odp_action_vlan_vid { - uint16_t type; /* ODPAT_SET_VLAN_VID. */ - ovs_be16 vlan_vid; /* VLAN id. */ - uint16_t reserved1; - uint16_t reserved2; -}; - -/* Action structure for ODPAT_SET_VLAN_PCP. */ -struct odp_action_vlan_pcp { - uint16_t type; /* ODPAT_SET_VLAN_PCP. */ - uint8_t vlan_pcp; /* VLAN priority. */ - uint8_t reserved1; - uint16_t reserved2; - uint16_t reserved3; -}; - -/* Action structure for ODPAT_SET_DL_SRC/DST. */ -struct odp_action_dl_addr { - uint16_t type; /* ODPAT_SET_DL_SRC/DST. */ - uint8_t dl_addr[6]; /* Ethernet address. */ -}; - -/* Action structure for ODPAT_SET_NW_SRC/DST. */ -struct odp_action_nw_addr { - uint16_t type; /* ODPAT_SET_TW_SRC/DST. */ - uint16_t reserved; - ovs_be32 nw_addr; /* IP address. */ -}; - -struct odp_action_nw_tos { - uint16_t type; /* ODPAT_SET_NW_TOS. */ - uint8_t nw_tos; /* IP ToS/DSCP field (6 bits). */ - uint8_t reserved1; - uint16_t reserved2; - uint16_t reserved3; -}; - -/* Action structure for ODPAT_SET_TP_SRC/DST. */ -struct odp_action_tp_port { - uint16_t type; /* ODPAT_SET_TP_SRC/DST. */ - ovs_be16 tp_port; /* TCP/UDP port. */ - uint16_t reserved1; - uint16_t reserved2; +/* ODP_FLOW_DUMP argument. + * + * This is used to iterate through the flow table flow-by-flow. Each + * ODP_FLOW_DUMP call either stores a new odp_flow into 'flow' or stores + * ODPFF_EOF into flow->flags to indicate that the end of the table has been + * reaches, and updates 'state' in-place. + * + * Before the first call, zero 'state'. The format of 'state' is otherwise + * unspecified. + */ +struct odp_flow_dump { + struct odp_flow *flow; + uint32_t state[2]; }; -/* Action structure for ODPAT_SET_PRIORITY. */ -struct odp_action_priority { - uint16_t type; /* ODPAT_SET_PRIORITY. */ - uint16_t reserved; - uint32_t priority; /* skb->priority value. */ +/* 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 }; -union odp_action { - uint16_t type; - struct odp_action_output output; - struct odp_action_output_group output_group; - struct odp_action_controller controller; - struct odp_action_tunnel tunnel; - struct odp_action_vlan_vid vlan_vid; - struct odp_action_vlan_pcp vlan_pcp; - struct odp_action_dl_addr dl_addr; - struct odp_action_nw_addr nw_addr; - struct odp_action_nw_tos nw_tos; - struct odp_action_tp_port tp_port; - struct odp_action_priority priority; -}; +#define ODPAT_MAX (__ODPAT_MAX - 1) struct odp_execute { - uint16_t in_port; - uint16_t reserved1; - uint32_t reserved2; - - union odp_action *actions; - uint32_t n_actions; + struct nlattr *actions; + uint32_t actions_len; const void *data; uint32_t length; @@ -401,24 +352,9 @@ struct odp_vport_mod { void *config; }; -struct odp_vport_stats { - uint64_t rx_packets; - uint64_t tx_packets; - uint64_t rx_bytes; - uint64_t tx_bytes; - uint64_t rx_dropped; - uint64_t tx_dropped; - uint64_t rx_errors; - uint64_t tx_errors; - uint64_t rx_frame_err; - uint64_t rx_over_err; - uint64_t rx_crc_err; - uint64_t collisions; -}; - struct odp_vport_stats_req { char devname[16]; /* IFNAMSIZ */ - struct odp_vport_stats stats; + struct rtnl_link_stats64 stats; }; struct odp_vport_ether { @@ -431,20 +367,4 @@ struct odp_vport_mtu { uint16_t mtu; }; -/* Values below this cutoff are 802.3 packets and the two bytes - * following MAC addresses are used as a frame length. Otherwise, the - * two bytes are used as the Ethernet type. - */ -#define ODP_DL_TYPE_ETH2_CUTOFF 0x0600 - -/* Value of dl_type to indicate that the frame does not include an - * Ethernet type. - */ -#define ODP_DL_TYPE_NOT_ETH_TYPE 0x05ff - -/* The VLAN id is 12-bits, so we can use the entire 16 bits to indicate - * special conditions. All ones indicates that no VLAN id was set. - */ -#define ODP_VLAN_NONE 0xffff - #endif /* openvswitch/datapath-protocol.h */