X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Fodp-util.h;h=51cf5c3680e912254eb6ac4191c8d3b9ba405f54;hb=HEAD;hp=192cfa0169fc4d38f4a053059e82a96bcd93b68a;hpb=4a2216156e6e1683848b400542297b01cceac401;p=cascardo%2Fovs.git diff --git a/lib/odp-util.h b/lib/odp-util.h index 192cfa016..51cf5c368 100644 --- a/lib/odp-util.h +++ b/lib/odp-util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc. + * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,18 +21,57 @@ #include #include #include -#include +#include "flow.h" #include "hash.h" +#include "hmap.h" +#include "odp-netlink.h" #include "openflow/openflow.h" #include "util.h" struct ds; -struct flow; -struct flow_tnl; -struct flow_wildcards; struct nlattr; struct ofpbuf; struct simap; +struct pkt_metadata; + +#define SLOW_PATH_REASONS \ + /* These reasons are mutually exclusive. */ \ + SPR(SLOW_CFM, "cfm", "Consists of CFM packets") \ + SPR(SLOW_BFD, "bfd", "Consists of BFD packets") \ + SPR(SLOW_LACP, "lacp", "Consists of LACP packets") \ + SPR(SLOW_STP, "stp", "Consists of STP packets") \ + SPR(SLOW_LLDP, "lldp", "Consists of LLDP packets") \ + SPR(SLOW_CONTROLLER, "controller", \ + "Sends \"packet-in\" messages to the OpenFlow controller") \ + SPR(SLOW_ACTION, "action", \ + "Uses action(s) not supported by datapath") + +/* Indexes for slow-path reasons. Client code uses "enum slow_path_reason" + * values instead of these, these are just a way to construct those. */ +enum { +#define SPR(ENUM, STRING, EXPLANATION) ENUM##_INDEX, + SLOW_PATH_REASONS +#undef SPR +}; + +/* Reasons why a subfacet might not be fast-pathable. + * + * Each reason is a separate bit to allow reasons to be combined. */ +enum slow_path_reason { +#define SPR(ENUM, STRING, EXPLANATION) ENUM = 1 << ENUM##_INDEX, + SLOW_PATH_REASONS +#undef SPR +}; + +/* Mask of all slow_path_reasons. */ +enum { + SLOW_PATH_REASON_MASK = 0 +#define SPR(ENUM, STRING, EXPLANATION) | 1 << ENUM##_INDEX + SLOW_PATH_REASONS +#undef SPR +}; + +const char *slow_path_reason_to_explanation(enum slow_path_reason); #define ODPP_LOCAL ODP_PORT_C(OVSP_LOCAL) #define ODPP_NONE ODP_PORT_C(UINT32_MAX) @@ -42,6 +81,16 @@ void format_odp_actions(struct ds *, const struct nlattr *odp_actions, int odp_actions_from_string(const char *, const struct simap *port_names, struct ofpbuf *odp_actions); +/* A map from odp port number to its name. */ +struct odp_portno_names { + struct hmap_node hmap_node; /* A node in a port number to name hmap. */ + odp_port_t port_no; /* Port number in the datapath. */ + char *name; /* Name associated with the above 'port_no'. */ +}; + +void odp_portno_names_set(struct hmap *portno_names, odp_port_t port_no, + char *port_name); +void odp_portno_names_destroy(struct hmap *portno_names); /* The maximum number of bytes that odp_flow_key_from_flow() appends to a * buffer. This is the upper bound on the length of a nlattr-formatted flow * key that ovs-vswitchd fully understands. @@ -60,27 +109,39 @@ int odp_actions_from_string(const char *, const struct simap *port_names, * - OVS_TUNNEL_KEY_ATTR_ID 8 -- 4 12 * - OVS_TUNNEL_KEY_ATTR_IPV4_SRC 4 -- 4 8 * - OVS_TUNNEL_KEY_ATTR_IPV4_DST 4 -- 4 8 + * - OVS_TUNNEL_KEY_ATTR_IPV6_SRC 16 -- 4 20 + * - OVS_TUNNEL_KEY_ATTR_IPV6_DST 16 -- 4 20 * - OVS_TUNNEL_KEY_ATTR_TOS 1 3 4 8 * - OVS_TUNNEL_KEY_ATTR_TTL 1 3 4 8 * - OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT 0 -- 4 4 * - OVS_TUNNEL_KEY_ATTR_CSUM 0 -- 4 4 + * - OVS_TUNNEL_KEY_ATTR_OAM 0 -- 4 4 + * - OVS_TUNNEL_KEY_ATTR_GENEVE_OPTS 256 -- 4 260 + * - OVS_TUNNEL_KEY_ATTR_VXLAN_OPTS - -- - - (shared with _GENEVE_OPTS) * OVS_KEY_ATTR_IN_PORT 4 -- 4 8 * OVS_KEY_ATTR_SKB_MARK 4 -- 4 8 + * OVS_KEY_ATTR_DP_HASH 4 -- 4 8 + * OVS_KEY_ATTR_RECIRC_ID 4 -- 4 8 + * OVS_KEY_ATTR_CT_STATE 4 -- 4 8 + * OVS_KEY_ATTR_CT_ZONE 2 2 4 8 + * OVS_KEY_ATTR_CT_MARK 4 -- 4 8 + * OVS_KEY_ATTR_CT_LABEL 16 -- 4 20 * OVS_KEY_ATTR_ETHERNET 12 -- 4 16 * OVS_KEY_ATTR_ETHERTYPE 2 2 4 8 (outer VLAN ethertype) - * OVS_KEY_ATTR_8021Q 4 -- 4 8 + * OVS_KEY_ATTR_VLAN 2 2 4 8 * OVS_KEY_ATTR_ENCAP 0 -- 4 4 (VLAN encapsulation) * OVS_KEY_ATTR_ETHERTYPE 2 2 4 8 (inner VLAN ethertype) * OVS_KEY_ATTR_IPV6 40 -- 4 44 * OVS_KEY_ATTR_ICMPV6 2 2 4 8 * OVS_KEY_ATTR_ND 28 -- 4 32 * ---------------------------------------------------------- - * total 208 + * total 572 * * We include some slack space in case the calculation isn't quite right or we * add another field and forget to adjust this value. */ -#define ODPUTIL_FLOW_KEY_BYTES 256 +#define ODPUTIL_FLOW_KEY_BYTES 640 +BUILD_ASSERT_DECL(FLOW_WC_SEQ == 35); /* A buffer with sufficient size and alignment to hold an nlattr-formatted flow * key. An array of "struct nlattr" might not, in theory, be sufficiently @@ -89,24 +150,77 @@ struct odputil_keybuf { uint32_t keybuf[DIV_ROUND_UP(ODPUTIL_FLOW_KEY_BYTES, 4)]; }; -enum odp_key_fitness odp_tun_key_from_attr(const struct nlattr *, +enum odp_key_fitness odp_tun_key_from_attr(const struct nlattr *, bool udpif, struct flow_tnl *); +int odp_ufid_from_string(const char *s_, ovs_u128 *ufid); +void odp_format_ufid(const ovs_u128 *ufid, struct ds *); void odp_flow_format(const struct nlattr *key, size_t key_len, const struct nlattr *mask, size_t mask_len, - struct ds *, bool verbose); + const struct hmap *portno_names, struct ds *, + bool verbose); void odp_flow_key_format(const struct nlattr *, size_t, struct ds *); int odp_flow_from_string(const char *s, const struct simap *port_names, struct ofpbuf *, struct ofpbuf *); -void odp_flow_key_from_flow(struct ofpbuf *, const struct flow *, - odp_port_t odp_in_port); -void odp_flow_key_from_mask(struct ofpbuf *, const struct flow *mask, - const struct flow *flow, uint32_t odp_in_port); +/* Indicates support for various fields. This defines how flows will be + * serialised. */ +struct odp_support { + /* Maximum number of MPLS label stack entries to serialise in a mask. */ + size_t max_mpls_depth; + + /* If this is true, then recirculation fields will always be serialised. */ + bool recirc; + + /* If true, serialise the corresponding OVS_KEY_ATTR_CONN_* field. */ + bool ct_state; + bool ct_zone; + bool ct_mark; + bool ct_label; + + /* If true, it means that the datapath supports the NAT bits in + * 'ct_state'. The above 'ct_state' member must be true for this + * to make sense */ + bool ct_state_nat; +}; + +struct odp_flow_key_parms { + /* The flow and mask to be serialized. In the case of masks, 'flow' + * is used as a template to determine how to interpret 'mask'. For + * example, the 'dl_type' of 'mask' describes the mask, but it doesn't + * indicate whether the other fields should be interpreted as ARP, IPv4, + * IPv6, etc. */ + const struct flow *flow; + const struct flow *mask; + + /* 'flow->in_port' is ignored (since it is likely to be an OpenFlow port + * number rather than a datapath port number). Instead, if 'odp_in_port' + * is anything other than ODPP_NONE, it is included in 'buf' as the input + * port. */ + odp_port_t odp_in_port; + + /* Indicates support for various fields. If the datapath supports a field, + * then it will always be serialised. */ + struct odp_support support; + + /* The netlink formatted version of the flow. It is used in cases where + * the mask cannot be constructed from the OVS internal representation + * and needs to see the original form. */ + const struct ofpbuf *key_buf; +}; + +void odp_flow_key_from_flow(const struct odp_flow_key_parms *, struct ofpbuf *); +void odp_flow_key_from_mask(const struct odp_flow_key_parms *, struct ofpbuf *); uint32_t odp_flow_key_hash(const struct nlattr *, size_t); +/* Estimated space needed for metadata. */ +enum { ODP_KEY_METADATA_SIZE = 9 * 8 }; +void odp_key_from_pkt_metadata(struct ofpbuf *, const struct pkt_metadata *); +void odp_key_to_pkt_metadata(const struct nlattr *key, size_t key_len, + struct pkt_metadata *md); + /* How well a kernel-provided flow key (a sequence of OVS_KEY_ATTR_* * attributes) matches OVS userspace expectations. * @@ -122,16 +236,34 @@ enum odp_key_fitness { }; enum odp_key_fitness odp_flow_key_to_flow(const struct nlattr *, size_t, struct flow *); -enum odp_key_fitness odp_flow_key_to_mask(const struct nlattr *key, size_t len, - struct flow *mask, +enum odp_key_fitness odp_flow_key_to_mask(const struct nlattr *mask_key, + size_t mask_key_len, + const struct nlattr *flow_key, + size_t flow_key_len, + struct flow_wildcards *mask, const struct flow *flow); + +enum odp_key_fitness odp_flow_key_to_flow_udpif(const struct nlattr *, size_t, + struct flow *); +enum odp_key_fitness odp_flow_key_to_mask_udpif(const struct nlattr *mask_key, + size_t mask_key_len, + const struct nlattr *flow_key, + size_t flow_key_len, + struct flow_wildcards *mask, + const struct flow *flow); + const char *odp_key_fitness_to_string(enum odp_key_fitness); void commit_odp_tunnel_action(const struct flow *, struct flow *base, struct ofpbuf *odp_actions); -void commit_odp_actions(const struct flow *, struct flow *base, - struct ofpbuf *odp_actions, - struct flow_wildcards *wc); +void commit_masked_set_action(struct ofpbuf *odp_actions, + enum ovs_key_attr key_type, const void *key, + const void *mask, size_t key_size); +enum slow_path_reason commit_odp_actions(const struct flow *, + struct flow *base, + struct ofpbuf *odp_actions, + struct flow_wildcards *wc, + bool use_masked); /* ofproto-dpif interface. * @@ -174,27 +306,20 @@ union user_action_cookie { } flow_sample; struct { - uint16_t type; /* USER_ACTION_COOKIE_IPFIX. */ + uint16_t type; /* USER_ACTION_COOKIE_IPFIX. */ + odp_port_t output_odp_port; /* The output odp port. */ } ipfix; }; BUILD_ASSERT_DECL(sizeof(union user_action_cookie) == 16); size_t odp_put_userspace_action(uint32_t pid, const void *userdata, size_t userdata_size, + odp_port_t tunnel_out_port, + bool include_actions, struct ofpbuf *odp_actions); void odp_put_tunnel_action(const struct flow_tnl *tunnel, struct ofpbuf *odp_actions); -void odp_put_pkt_mark_action(const uint32_t pkt_mark, - struct ofpbuf *odp_actions); - -/* Reasons why a subfacet might not be fast-pathable. */ -enum slow_path_reason { - SLOW_CFM = 1, /* CFM packets need per-packet processing. */ - SLOW_LACP, /* LACP packets need per-packet processing. */ - SLOW_STP, /* STP packets need per-packet processing. */ - SLOW_BFD, /* BFD packets need per-packet processing. */ - SLOW_CONTROLLER, /* Packets must go to OpenFlow controller. */ - __SLOW_MAX -}; +void odp_put_tnl_push_action(struct ofpbuf *odp_actions, + struct ovs_action_push_tnl *data); #endif /* odp-util.h */