X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fopenvswitch%2Fdatapath-protocol.h;h=b8f93de6f54d0299d127252051a67b6927dc8745;hb=57b7c6a143a7b86f753ec1928aae3a74b95befd4;hp=8e07b8bd1804559655498a9d2909430bd94f2fa4;hpb=c3827f619a38d3d202020838e1f92860046a3dbe;p=openvswitch diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h index 8e07b8bd..b8f93de6 100644 --- a/include/openvswitch/datapath-protocol.h +++ b/include/openvswitch/datapath-protocol.h @@ -63,9 +63,12 @@ #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. */ @@ -84,7 +87,7 @@ #define ODP_VPORT_QUERY _IOWR('O', 9, struct odp_port) #define ODP_VPORT_LIST _IOWR('O', 10, struct odp_portvec) -#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_FLUSH _IO('O', 16) @@ -141,10 +144,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 @@ -152,35 +154,35 @@ 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 VPORT_TYPE_SIZE 16 @@ -218,7 +220,7 @@ struct odp_flow_stats { #define ODP_TCI_PRESENT 0x1000 /* CFI bit */ struct odp_flow_key { - ovs_be32 tun_id; /* Encapsulating tunnel ID. */ + ovs_be64 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. */ @@ -240,8 +242,8 @@ struct odp_flow_key { struct odp_flow { struct odp_flow_stats stats; struct odp_flow_key key; - union odp_action *actions; - uint32_t n_actions; + struct nlattr *actions; + uint32_t actions_len; uint32_t flags; }; @@ -262,101 +264,31 @@ struct odp_flowvec { }; /* Action types. */ -#define ODPAT_OUTPUT 0 /* Output to switch port. */ -#define ODPAT_CONTROLLER 2 /* Send copy to controller. */ -#define ODPAT_SET_DL_TCI 3 /* Set the 802.1q TCI value. */ -#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_DROP_SPOOFED_ARP 16 /* Drop ARPs with spoofed source MAC. */ -#define ODPAT_N_ACTIONS 17 - -struct odp_action_output { - uint16_t type; /* ODPAT_OUTPUT. */ - uint16_t port; /* Output port. */ - 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_DL_TCI. */ -struct odp_action_dl_tci { - uint16_t type; /* ODPAT_SET_DL_TCI. */ - ovs_be16 tci; /* New TCI. CFI bit must be zero. */ - uint32_t reserved; -}; - -/* 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. */ +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, /* IP source address. */ + ODPAT_SET_NW_DST, /* IP 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 }; -/* 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; -}; - -/* 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. */ -}; - -union odp_action { - uint16_t type; - struct odp_action_output output; - struct odp_action_controller controller; - struct odp_action_tunnel tunnel; - struct odp_action_dl_tci dl_tci; - 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 { - union odp_action *actions; - uint32_t n_actions; + struct nlattr *actions; + uint32_t actions_len; const void *data; uint32_t length;