X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=lib%2Fodp-util.h;h=08b0a2a413b371112e5a7fc547ea1c50491210de;hb=79d4ffe2c977c9750b77f869be185b5bedd08c2d;hp=eceeae6b404cd54d3f83913071c61456042591c1;hpb=abff858b5ad310a529d5a5ac2a230ee4ac9736db;p=openvswitch diff --git a/lib/odp-util.h b/lib/odp-util.h index eceeae6b..08b0a2a4 100644 --- a/lib/odp-util.h +++ b/lib/odp-util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,6 +30,7 @@ struct ds; struct flow; struct nlattr; struct ofpbuf; +struct shash; #define OVSP_NONE ((uint16_t) -1) @@ -58,8 +59,11 @@ odp_port_to_ofp_port(uint16_t odp_port) return odp_port; } } + void format_odp_actions(struct ds *, const struct nlattr *odp_actions, size_t actions_len); +int odp_actions_from_string(const char *, const struct shash *port_names, + struct ofpbuf *odp_actions); /* Upper bound on the length of a nlattr-formatted flow key. The longest * nlattr-formatted flow key would be: @@ -72,18 +76,13 @@ void format_odp_actions(struct ds *, const struct nlattr *odp_actions, * OVS_KEY_ATTR_ETHERNET 12 -- 4 16 * OVS_KEY_ATTR_8021Q 4 -- 4 8 * OVS_KEY_ATTR_ETHERTYPE 2 2 4 8 - * OVS_KEY_ATTR_IPV6 34 2 4 40 + * OVS_KEY_ATTR_IPV6 40 -- 4 44 * OVS_KEY_ATTR_ICMPV6 2 2 4 8 * OVS_KEY_ATTR_ND 28 -- 4 32 * ------------------------------------------------- - * total 140 + * total 144 */ -#define ODPUTIL_FLOW_KEY_BYTES 140 - -/* This is an imperfect sanity-check that ODPUTIL_FLOW_KEY_BYTES doesn't - * need to be updated, but will at least raise awareness when new OVS - * datapath key types are added. */ -BUILD_ASSERT_DECL(__OVS_KEY_ATTR_MAX == 15); +#define ODPUTIL_FLOW_KEY_BYTES 144 /* 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 @@ -93,27 +92,84 @@ struct odputil_keybuf { }; void odp_flow_key_format(const struct nlattr *, size_t, struct ds *); -int odp_flow_key_from_string(const char *s, struct ofpbuf *); +int odp_flow_key_from_string(const char *s, const struct shash *port_names, + struct ofpbuf *); void odp_flow_key_from_flow(struct ofpbuf *, const struct flow *); -int odp_flow_key_to_flow(const struct nlattr *, size_t, struct flow *); + +uint32_t odp_flow_key_hash(const struct nlattr *, size_t); + +/* How well a kernel-provided flow key (a sequence of OVS_KEY_ATTR_* + * attributes) matches OVS userspace expectations. + * + * These values are arranged so that greater values are "more important" than + * lesser ones. In particular, a single flow key can fit the descriptions for + * both ODP_FIT_TOO_LITTLE and ODP_FIT_TOO_MUCH. Such a key is treated as + * ODP_FIT_TOO_LITTLE. */ +enum odp_key_fitness { + ODP_FIT_PERFECT, /* The key had exactly the fields we expect. */ + ODP_FIT_TOO_MUCH, /* The key had fields we don't understand. */ + ODP_FIT_TOO_LITTLE, /* The key lacked fields we expected to see. */ + ODP_FIT_ERROR, /* The key was invalid. */ +}; +enum odp_key_fitness odp_flow_key_to_flow(const struct nlattr *, size_t, + struct flow *); +const char *odp_key_fitness_to_string(enum odp_key_fitness); + +void commit_odp_actions(const struct flow *, struct flow *base, + struct ofpbuf *odp_actions); + +/* ofproto-dpif interface. + * + * The following types and functions are logically part of ofproto-dpif. + * ofproto-dpif puts values of these types into the flows that it installs in + * the kernel datapath, though, so ovs-dpctl needs to interpret them so that + * it can print flows in a more human-readable manner. */ enum user_action_cookie_type { USER_ACTION_COOKIE_UNSPEC, - USER_ACTION_COOKIE_CONTROLLER, /* Packet for controller. */ USER_ACTION_COOKIE_SFLOW, /* Packet for sFlow sampling. */ + USER_ACTION_COOKIE_SLOW_PATH /* Userspace must process this flow. */ }; /* user_action_cookie is passed as argument to OVS_ACTION_ATTR_USERSPACE. - * Since is it passed to kernel as u64, its size has to be 8 bytes. */ -struct user_action_cookie { - uint8_t type; /* enum user_action_cookie_type. */ - uint8_t n_output; /* No of output ports. used by sflow. */ - ovs_be16 vlan_tci; /* Used by sFlow */ - uint32_t data; /* Data is len for OFPP_CONTROLLER action. - For sFlow it is port_ifindex. */ + * Since it is passed to kernel as u64, its size has to be 8 bytes. */ +union user_action_cookie { + uint16_t type; /* enum user_action_cookie_type. */ + + struct { + uint16_t type; /* USER_ACTION_COOKIE_SFLOW. */ + ovs_be16 vlan_tci; /* Destination VLAN TCI. */ + uint32_t output; /* SFL_FLOW_SAMPLE_TYPE 'output' value. */ + } sflow; + + struct { + uint16_t type; /* USER_ACTION_COOKIE_SLOW_PATH. */ + uint16_t unused; + uint32_t reason; /* enum slow_path_reason. */ + } slow_path; }; +BUILD_ASSERT_DECL(sizeof(union user_action_cookie) == 8); + +size_t odp_put_userspace_action(uint32_t pid, + const union user_action_cookie *, + struct ofpbuf *odp_actions); -BUILD_ASSERT_DECL(sizeof(struct user_action_cookie) == 8); +/* Reasons why a subfacet might not be fast-pathable. */ +enum slow_path_reason { + /* These reasons are mutually exclusive. */ + SLOW_CFM = 1 << 0, /* CFM packets need per-packet processing. */ + SLOW_LACP = 1 << 1, /* LACP packets need per-packet processing. */ + SLOW_STP = 1 << 2, /* STP packets need per-packet processing. */ + SLOW_IN_BAND = 1 << 3, /* In-band control needs every packet. */ + + /* Mutually exclusive with SLOW_CFM, SLOW_LACP, SLOW_STP. + * Could possibly appear with SLOW_IN_BAND. */ + SLOW_CONTROLLER = 1 << 4, /* Packets must go to OpenFlow controller. */ + + /* This can appear on its own, or, theoretically at least, along with any + * other combination of reasons. */ + SLOW_MATCH = 1 << 5, /* Datapath can't match specifically enough. */ +}; #endif /* odp-util.h */