X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fopenvswitch%2Fdatapath-protocol.h;h=083800cc88399ac20fe16440fc52d0c34e336eb8;hb=254f2dc8e3eb18debf4a8f238b9c87cf4d4dbd3f;hp=8183651717f0804b05bac7602498dcfbeaaca64d;hpb=f0fef76062d67bff94a3243a469f182dd6f503a1;p=openvswitch diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h index 81836517..083800cc 100644 --- a/include/openvswitch/datapath-protocol.h +++ b/include/openvswitch/datapath-protocol.h @@ -69,15 +69,8 @@ #include #include - -#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) -/* Datapaths. */ +/* datapaths. */ #define ODP_DATAPATH_FAMILY "odp_datapath" #define ODP_DATAPATH_MCGROUP "odp_datapath" @@ -92,22 +85,23 @@ enum odp_datapath_cmd { /** * 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; }; /** * 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 @@ -127,7 +121,7 @@ struct odp_header { */ 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. */ @@ -288,6 +282,19 @@ enum { }; #define ODP_PATCH_ATTR_MAX (__ODP_PATCH_ATTR_MAX - 1) + +/* 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. */ @@ -350,23 +357,32 @@ struct odp_key_arp { }; /** - * 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. */ @@ -374,7 +390,6 @@ enum odp_flow_type { 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 };