X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fodp-util.h;h=cdafbe46c056d379ede3419eb72da06eb452eb21;hb=36fc5f183328c538eba3744bec3302972891f3e7;hp=dd320aca523b5f8b63aee6e3edfe5c35584d5106;hpb=3bffc610fa3ae08fa837f6bd0bf7a2deebdd0970;p=sliver-openvswitch.git diff --git a/lib/odp-util.h b/lib/odp-util.h index dd320aca5..cdafbe46c 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. @@ -21,25 +21,27 @@ #include #include #include +#include #include "hash.h" #include "openflow/openflow.h" -#include "openvswitch/datapath-protocol.h" #include "util.h" struct ds; struct flow; +struct nlattr; struct ofpbuf; +struct shash; -#define ODPP_NONE ((uint16_t) -1) +#define OVSP_NONE ((uint16_t) -1) static inline uint16_t ofp_port_to_odp_port(uint16_t ofp_port) { switch (ofp_port) { case OFPP_LOCAL: - return ODPP_LOCAL; + return OVSP_LOCAL; case OFPP_NONE: - return ODPP_NONE; + return OVSP_NONE; default: return ofp_port; } @@ -49,42 +51,38 @@ static inline uint16_t odp_port_to_ofp_port(uint16_t odp_port) { switch (odp_port) { - case ODPP_LOCAL: + case OVSP_LOCAL: return OFPP_LOCAL; - case ODPP_NONE: + case OVSP_NONE: return OFPP_NONE; default: return odp_port; } } -int odp_action_len(uint16_t type); -void format_odp_action(struct ds *, const struct nlattr *); 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: * * struct pad nl hdr total * ------ --- ------ ----- - * ODP_KEY_ATTR_TUN_ID 8 -- 4 12 - * ODP_KEY_ATTR_IN_PORT 4 -- 4 8 - * ODP_KEY_ATTR_ETHERNET 12 -- 4 16 - * ODP_KEY_ATTR_8021Q 4 -- 4 8 - * ODP_KEY_ATTR_ETHERTYPE 2 2 4 8 - * ODP_KEY_ATTR_IPV6 34 2 4 40 - * ODP_KEY_ATTR_ICMPV6 2 2 4 8 - * ODP_KEY_ATTR_ND 28 -- 4 32 + * OVS_KEY_ATTR_PRIORITY 4 -- 4 8 + * OVS_KEY_ATTR_TUN_ID 8 -- 4 12 + * OVS_KEY_ATTR_IN_PORT 4 -- 4 8 + * 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 40 -- 4 44 + * OVS_KEY_ATTR_ICMPV6 2 2 4 8 + * OVS_KEY_ATTR_ND 28 -- 4 32 * ------------------------------------------------- - * total 132 + * total 144 */ -#define ODPUTIL_FLOW_KEY_BYTES 132 - -/* 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 ODP - * key types are added. */ -BUILD_ASSERT_DECL(__ODP_KEY_ATTR_MAX == 14); +#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 @@ -94,9 +92,51 @@ 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); + +enum user_action_cookie_type { + USER_ACTION_COOKIE_UNSPEC, + USER_ACTION_COOKIE_SFLOW, /* Packet for sFlow sampling. */ +}; + +/* user_action_cookie is passed as argument to OVS_ACTION_ATTR_USERSPACE. + * Since it is passed to kernel as u64, its size has to be 8 bytes. */ +struct user_action_cookie { + uint16_t type; /* enum user_action_cookie_type. */ + + /* The following members are used only by USER_ACTION_COOKIE_SFLOW. */ + ovs_be16 vlan_tci; /* Destination VLAN TCI. */ + uint32_t output; /* SFL_FLOW_SAMPLE_TYPE 'output' value. */ +}; + +BUILD_ASSERT_DECL(sizeof(struct user_action_cookie) == 8); + +size_t odp_put_userspace_action(uint32_t pid, + const struct user_action_cookie *, + struct ofpbuf *odp_actions); + +void commit_odp_actions(const struct flow *, struct flow *base, + struct ofpbuf *odp_actions); #endif /* odp-util.h */