X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fofp-util.h;h=02096b0ba16f3636139aabd7b649c9045cdd1966;hb=772ec52b896380f23b587bea4a5bf18edd22449d;hp=079f13f8dcc0708d9d24525fc3232a4c6fa53bf4;hpb=71ce92352cbcb96f179f8ec19dd1e843d91d8828;p=openvswitch diff --git a/lib/ofp-util.h b/lib/ofp-util.h index 079f13f8..02096b0b 100644 --- a/lib/ofp-util.h +++ b/lib/ofp-util.h @@ -22,24 +22,47 @@ #include #include #include "flow.h" +#include "openflow/nicira-ext.h" +#include "openvswitch/types.h" +struct cls_rule; struct ofpbuf; struct ofp_action_header; +/* Alignment of ofp_actions. */ +#define OFP_ACTION_ALIGN 8 + +/* Converting OFPFW_NW_SRC_MASK and OFPFW_NW_DST_MASK wildcard bit counts to + * and from IP bitmasks. */ +ovs_be32 ofputil_wcbits_to_netmask(int wcbits); +int ofputil_netmask_to_wcbits(ovs_be32 netmask); + +/* Work with OpenFlow 1.0 ofp_match. */ +void ofputil_cls_rule_from_match(const struct ofp_match *, + unsigned int priority, enum nx_flow_format, + uint64_t cookie, struct cls_rule *); +void ofputil_cls_rule_to_match(const struct cls_rule *, enum nx_flow_format, + struct ofp_match *); +void normalize_match(struct ofp_match *); +char *ofp_match_to_literal_string(const struct ofp_match *match); + /* OpenFlow protocol utility functions. */ void *make_openflow(size_t openflow_len, uint8_t type, struct ofpbuf **); +void *make_nxmsg(size_t openflow_len, uint32_t subtype, struct ofpbuf **); void *make_openflow_xid(size_t openflow_len, uint8_t type, - uint32_t xid, struct ofpbuf **); + ovs_be32 xid, struct ofpbuf **); +void *make_nxmsg_xid(size_t openflow_len, uint32_t subtype, ovs_be32 xid, + struct ofpbuf **); void *put_openflow(size_t openflow_len, uint8_t type, struct ofpbuf *); -void *put_openflow_xid(size_t openflow_len, uint8_t type, uint32_t xid, +void *put_openflow_xid(size_t openflow_len, uint8_t type, ovs_be32 xid, struct ofpbuf *); void update_openflow_length(struct ofpbuf *); -struct ofpbuf *make_flow_mod(uint16_t command, const struct flow *, +struct ofpbuf *make_flow_mod(uint16_t command, const struct cls_rule *, size_t actions_len); -struct ofpbuf *make_add_flow(const struct flow *, uint32_t buffer_id, +struct ofpbuf *make_add_flow(const struct cls_rule *, uint32_t buffer_id, uint16_t max_idle, size_t actions_len); -struct ofpbuf *make_del_flow(const struct flow *); -struct ofpbuf *make_add_simple_flow(const struct flow *, +struct ofpbuf *make_del_flow(const struct cls_rule *); +struct ofpbuf *make_add_simple_flow(const struct cls_rule *, uint32_t buffer_id, uint16_t out_port, uint16_t max_idle); struct ofpbuf *make_packet_in(uint32_t buffer_id, uint16_t in_port, @@ -59,8 +82,6 @@ int check_ofp_message(const struct ofp_header *, uint8_t type, size_t size); int check_ofp_message_array(const struct ofp_header *, uint8_t type, size_t size, size_t array_elt_size, size_t *n_array_elts); -int check_ofp_packet_out(const struct ofp_header *, struct ofpbuf *data, - int *n_actions, int max_ports); struct flow_stats_iterator { const uint8_t *pos, *end; @@ -77,63 +98,131 @@ const union ofp_action *actions_first(struct actions_iterator *, size_t n_actions); const union ofp_action *actions_next(struct actions_iterator *); int validate_actions(const union ofp_action *, size_t n_actions, - int max_ports); + const struct flow *, int max_ports); bool action_outputs_to_port(const union ofp_action *, uint16_t port); -void normalize_match(struct ofp_match *); -char *ofp_match_to_literal_string(const struct ofp_match *match); +int ofputil_pull_actions(struct ofpbuf *, unsigned int actions_len, + union ofp_action **, size_t *); -/* OpenFlow errors. +/* OpenFlow vendors. * - * OpenFlow errors have two 16-bit parts: a "type" and a "code". A "type" has - * a unique meaning. The "code" values are different for each "type". + * These functions map OpenFlow 32-bit vendor IDs (as used in struct + * ofp_vendor_header) into 4-bit values to embed in an "int". The 4-bit values + * are only used internally in Open vSwitch and never appear on the wire, so + * particular codes used are not important. + */ + +/* Vendor error numbers currently used in Open vSwitch. */ +#define OFPUTIL_VENDORS \ + /* vendor name vendor value */ \ + OFPUTIL_VENDOR(OFPUTIL_VENDOR_OPENFLOW, 0x00000000) \ + OFPUTIL_VENDOR(OFPUTIL_VENDOR_NICIRA, NX_VENDOR_ID) + +/* OFPUTIL_VENDOR_* definitions. */ +enum ofputil_vendor_codes { +#define OFPUTIL_VENDOR(NAME, VENDOR_ID) NAME, + OFPUTIL_VENDORS + OFPUTIL_N_VENDORS +#undef OFPUTIL_VENDOR +}; + +/* Error codes. * - * We embed OpenFlow errors in the same space as errno values by shifting - * 'type' left 16 bits and adding the 'code'. An "int" value is thus broken - * into a few different ranges: + * We embed system errno values and OpenFlow standard and vendor extension + * error codes into a single 31-bit space using the following encoding. + * (Bit 31 is unused and assumed 0 to avoid negative "int" values.) * - * - 0: success. + * 30 0 + * +------------------------------------------------------+ + * | 0 | success + * +------------------------------------------------------+ * - * - 1...65535: system errno values. + * 30 29 0 + * +--+---------------------------------------------------+ + * | 0| errno value | errno value + * +--+---------------------------------------------------+ * - * The assumption that system errno values are less than 65536 is true - * on at least Linux, FreeBSD, OpenBSD, and Windows. RFC 1813 defines - * NFSv3-specific errno codes starting at 10000, another hint that this - * is a reasonable assumption. + * 30 29 26 25 16 15 0 + * +--+-------+----------------+--------------------------+ + * | 1| 0 | type | code | standard OpenFlow + * +--+-------+----------------+--------------------------+ error * - * C and POSIX say that errno values are positive. + * 30 29 26 25 16 15 0 + * +--+-------+----------------+--------------------------+ Nicira + * | 1| vendor| type | code | NXET_VENDOR + * +--+-------+----------------+--------------------------+ error extension * - * - 65536...INT_MAX: OpenFlow errors. + * C and POSIX say that errno values are positive. We assume that they are + * less than 2**29. They are actually less than 65536 on at least Linux, + * FreeBSD, OpenBSD, and Windows. * - * In OpenFlow, a "type" of 0 is valid, but it corresponds to - * OFPET_HELLO_FAILED. That's not a general-purpose error: only the - * vconn library would ever care to send it. So we ignore it. + * The 'vendor' field holds one of the OFPUTIL_VENDOR_* codes defined above. + * It must be nonzero. * - * - negative values: not used. + * Negative values are not defined. */ -/* Returns the OpenFlow error with the specified 'type' and 'code' as an - * integer. */ +/* Currently 4 bits are allocated to the "vendor" field. Make sure that all + * the vendor codes can fit. */ +BUILD_ASSERT_DECL(OFPUTIL_N_VENDORS <= 16); + +/* These are macro versions of the functions defined below. The macro versions + * are intended for use in contexts where function calls are not allowed, + * e.g. static initializers and case labels. */ +#define OFP_MKERR(TYPE, CODE) ((1 << 30) | ((TYPE) << 16) | (CODE)) +#define OFP_MKERR_VENDOR(VENDOR, TYPE, CODE) \ + ((1 << 30) | ((VENDOR) << 26) | ((TYPE) << 16) | (CODE)) +#define OFP_MKERR_NICIRA(TYPE, CODE) \ + OFP_MKERR_VENDOR(OFPUTIL_VENDOR_NICIRA, TYPE, CODE) + +/* Returns the standard OpenFlow error with the specified 'type' and 'code' as + * an integer. */ static inline int ofp_mkerr(uint16_t type, uint16_t code) { - assert(type > 0 && type <= 0x7fff); - return (type << 16) | code; + return OFP_MKERR(type, code); } -/* Returns true if 'error' is in the range of values used as OpenFlow error - * codes as explained above. */ +/* Returns the OpenFlow vendor error with the specified 'vendor', 'type', and + * 'code' as an integer. 'vendor' must be an OFPUTIL_VENDOR_* constant. */ +static inline int +ofp_mkerr_vendor(uint8_t vendor, uint16_t type, uint16_t code) +{ + assert(vendor < OFPUTIL_N_VENDORS); + return OFP_MKERR_VENDOR(vendor, type, code); +} + +/* Returns the OpenFlow vendor error with Nicira as vendor, with the specific + * 'type' and 'code', as an integer. */ +static inline int +ofp_mkerr_nicira(uint16_t type, uint16_t code) +{ + return OFP_MKERR_NICIRA(type, code); +} + +/* Returns true if 'error' encodes an OpenFlow standard or vendor extension + * error codes as documented above. */ static inline bool is_ofp_error(int error) { - return error >= 0x10000; + return (error & (1 << 30)) != 0; } /* Returns true if 'error' appears to be a system errno value. */ static inline bool is_errno(int error) { - return error < 0x10000; + return !is_ofp_error(error); +} + +/* Returns the "vendor" part of the OpenFlow error code 'error' (which must be + * in the format explained above). This is normally one of the + * OFPUTIL_VENDOR_* constants. Returns OFPUTIL_VENDOR_OPENFLOW (0) for a + * standard OpenFlow error. */ +static inline uint8_t +get_ofp_err_vendor(int error) +{ + return (error >> 26) & 0xf; } /* Returns the "type" part of the OpenFlow error code 'error' (which must be in @@ -141,7 +230,7 @@ is_errno(int error) static inline uint16_t get_ofp_err_type(int error) { - return error >> 16; + return (error >> 16) & 0x3ff; } /* Returns the "code" part of the OpenFlow error code 'error' (which must be in @@ -152,4 +241,6 @@ get_ofp_err_code(int error) return error & 0xffff; } +struct ofpbuf *make_ofp_error_msg(int error, const struct ofp_header *); + #endif /* ofp-util.h */