X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fofp-util.c;h=9210413a1417f15d78b9e07df12b0f3623f3d932;hb=6e11a6a15519561d932a018b2ca19dc3acee87c2;hp=d58f7ea5ce2627f4c4ba1ce36e5f23d7714d07bb;hpb=7045a624ea8a516f536e7857b0bc6c474e7f2426;p=openvswitch diff --git a/lib/ofp-util.c b/lib/ofp-util.c index d58f7ea5..9210413a 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -20,11 +20,13 @@ #include #include "byte-order.h" #include "classifier.h" +#include "multipath.h" #include "nx-match.h" #include "ofp-util.h" #include "ofpbuf.h" #include "packets.h" #include "random.h" +#include "type-props.h" #include "vlog.h" VLOG_DEFINE_THIS_MODULE(ofp_util); @@ -103,8 +105,9 @@ enum { * wildcarded. */ void ofputil_cls_rule_from_match(const struct ofp_match *match, - unsigned int priority, int flow_format, - uint64_t cookie, struct cls_rule *rule) + unsigned int priority, + enum nx_flow_format flow_format, + ovs_be64 cookie, struct cls_rule *rule) { struct flow_wildcards *wc = &rule->wc; unsigned int ofpfw; @@ -116,19 +119,19 @@ ofputil_cls_rule_from_match(const struct ofp_match *match, rule->priority = !ofpfw ? UINT16_MAX : priority; /* Initialize most of rule->wc. */ + flow_wildcards_init_catchall(wc); wc->wildcards = ofpfw & WC_INVARIANTS; if (ofpfw & OFPFW_NW_TOS) { wc->wildcards |= FWW_NW_TOS; } - memset(wc->reg_masks, 0, sizeof wc->reg_masks); wc->nw_src_mask = ofputil_wcbits_to_netmask(ofpfw >> OFPFW_NW_SRC_SHIFT); wc->nw_dst_mask = ofputil_wcbits_to_netmask(ofpfw >> OFPFW_NW_DST_SHIFT); if (flow_format == NXFF_TUN_ID_FROM_COOKIE && !(ofpfw & NXFW_TUN_ID)) { - rule->flow.tun_id = htonl(ntohll(cookie) >> 32); + rule->flow.tun_id = htonll(ntohll(cookie) >> 32); } else { wc->wildcards |= FWW_TUN_ID; - rule->flow.tun_id = 0; + rule->flow.tun_id = htonll(0); } if (ofpfw & OFPFW_DL_DST) { @@ -198,15 +201,21 @@ ofputil_cls_rule_from_match(const struct ofp_match *match, cls_rule_zero_wildcarded_fields(rule); } -/* Extract 'flow' with 'wildcards' into the OpenFlow match structure - * 'match'. +/* Convert 'rule' into the OpenFlow match structure 'match'. 'flow_format' + * must either NXFF_OPENFLOW10 or NXFF_TUN_ID_FROM_COOKIE. * - * 'flow_format' must either NXFF_OPENFLOW10 or NXFF_TUN_ID_FROM_COOKIE. In - * the latter case only, 'match''s NXFW_TUN_ID bit will be filled in; otherwise - * it is always set to 0. */ + * The NXFF_TUN_ID_FROM_COOKIE flow format requires modifying the flow cookie. + * This function can help with that, if 'cookie_out' is nonnull. For + * NXFF_OPENFLOW10, or if the tunnel ID is wildcarded, 'cookie_in' will be + * copied directly to '*cookie_out'. For NXFF_TUN_ID_FROM_COOKIE when tunnel + * ID is matched, 'cookie_in' will be modified appropriately before setting + * '*cookie_out'. + */ void -ofputil_cls_rule_to_match(const struct cls_rule *rule, int flow_format, - struct ofp_match *match) +ofputil_cls_rule_to_match(const struct cls_rule *rule, + enum nx_flow_format flow_format, + struct ofp_match *match, + ovs_be64 cookie_in, ovs_be64 *cookie_out) { const struct flow_wildcards *wc = &rule->wc; unsigned int ofpfw; @@ -218,8 +227,19 @@ ofputil_cls_rule_to_match(const struct cls_rule *rule, int flow_format, if (wc->wildcards & FWW_NW_TOS) { ofpfw |= OFPFW_NW_TOS; } - if (flow_format == NXFF_TUN_ID_FROM_COOKIE && wc->wildcards & FWW_TUN_ID) { - ofpfw |= NXFW_TUN_ID; + + /* Tunnel ID. */ + if (flow_format == NXFF_TUN_ID_FROM_COOKIE) { + if (wc->wildcards & FWW_TUN_ID) { + ofpfw |= NXFW_TUN_ID; + } else { + uint32_t cookie_lo = ntohll(cookie_in); + uint32_t cookie_hi = ntohll(rule->flow.tun_id); + cookie_in = htonll(cookie_lo | ((uint64_t) cookie_hi << 32)); + } + } + if (cookie_out) { + *cookie_out = cookie_in; } /* Translate VLANs. */ @@ -268,7 +288,948 @@ alloc_xid(void) static uint32_t next_xid = 1; return htonl(next_xid++); } + +/* Basic parsing of OpenFlow messages. */ + +struct ofputil_msg_type { + enum ofputil_msg_code code; /* OFPUTIL_*. */ + uint32_t value; /* OFPT_*, OFPST_*, NXT_*, or NXST_*. */ + const char *name; /* e.g. "OFPT_FLOW_REMOVED". */ + unsigned int min_size; /* Minimum total message size in bytes. */ + /* 0 if 'min_size' is the exact size that the message must be. Otherwise, + * the message may exceed 'min_size' by an even multiple of this value. */ + unsigned int extra_multiple; +}; + +struct ofputil_msg_category { + const char *name; /* e.g. "OpenFlow message" */ + const struct ofputil_msg_type *types; + size_t n_types; + int missing_error; /* ofp_mkerr() value for missing type. */ +}; + +static bool +ofputil_length_ok(const struct ofputil_msg_category *cat, + const struct ofputil_msg_type *type, + unsigned int size) +{ + switch (type->extra_multiple) { + case 0: + if (size != type->min_size) { + VLOG_WARN_RL(&bad_ofmsg_rl, "received %s %s with incorrect " + "length %u (expected length %u)", + cat->name, type->name, size, type->min_size); + return false; + } + return true; + + case 1: + if (size < type->min_size) { + VLOG_WARN_RL(&bad_ofmsg_rl, "received %s %s with incorrect " + "length %u (expected length at least %u bytes)", + cat->name, type->name, size, type->min_size); + return false; + } + return true; + + default: + if (size < type->min_size + || (size - type->min_size) % type->extra_multiple) { + VLOG_WARN_RL(&bad_ofmsg_rl, "received %s %s with incorrect " + "length %u (must be exactly %u bytes or longer " + "by an integer multiple of %u bytes)", + cat->name, type->name, size, + type->min_size, type->extra_multiple); + return false; + } + return true; + } +} + +static int +ofputil_lookup_openflow_message(const struct ofputil_msg_category *cat, + uint32_t value, unsigned int size, + const struct ofputil_msg_type **typep) +{ + const struct ofputil_msg_type *type; + + for (type = cat->types; type < &cat->types[cat->n_types]; type++) { + if (type->value == value) { + if (!ofputil_length_ok(cat, type, size)) { + return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); + } + *typep = type; + return 0; + } + } + + VLOG_WARN_RL(&bad_ofmsg_rl, "received %s of unknown type %"PRIu32, + cat->name, value); + return cat->missing_error; +} + +static int +ofputil_decode_vendor(const struct ofp_header *oh, + const struct ofputil_msg_type **typep) +{ + static const struct ofputil_msg_type nxt_messages[] = { + { OFPUTIL_NXT_STATUS_REQUEST, + NXT_STATUS_REQUEST, "NXT_STATUS_REQUEST", + sizeof(struct nicira_header), 1 }, + + { OFPUTIL_NXT_STATUS_REPLY, + NXT_STATUS_REPLY, "NXT_STATUS_REPLY", + sizeof(struct nicira_header), 1 }, + + { OFPUTIL_NXT_TUN_ID_FROM_COOKIE, + NXT_TUN_ID_FROM_COOKIE, "NXT_TUN_ID_FROM_COOKIE", + sizeof(struct nxt_tun_id_cookie), 0 }, + + { OFPUTIL_NXT_ROLE_REQUEST, + NXT_ROLE_REQUEST, "NXT_ROLE_REQUEST", + sizeof(struct nx_role_request), 0 }, + + { OFPUTIL_NXT_ROLE_REPLY, + NXT_ROLE_REPLY, "NXT_ROLE_REPLY", + sizeof(struct nx_role_request), 0 }, + + { OFPUTIL_NXT_SET_FLOW_FORMAT, + NXT_SET_FLOW_FORMAT, "NXT_SET_FLOW_FORMAT", + sizeof(struct nxt_set_flow_format), 0 }, + + { OFPUTIL_NXT_FLOW_MOD, + NXT_FLOW_MOD, "NXT_FLOW_MOD", + sizeof(struct nx_flow_mod), 8 }, + + { OFPUTIL_NXT_FLOW_REMOVED, + NXT_FLOW_REMOVED, "NXT_FLOW_REMOVED", + sizeof(struct nx_flow_removed), 8 }, + }; + + static const struct ofputil_msg_category nxt_category = { + "Nicira extension message", + nxt_messages, ARRAY_SIZE(nxt_messages), + OFP_MKERR(OFPET_BAD_REQUEST, OFPBRC_BAD_SUBTYPE) + }; + + const struct ofp_vendor_header *ovh; + const struct nicira_header *nh; + + ovh = (const struct ofp_vendor_header *) oh; + if (ovh->vendor != htonl(NX_VENDOR_ID)) { + VLOG_WARN_RL(&bad_ofmsg_rl, "received vendor message for unknown " + "vendor %"PRIx32, ntohl(ovh->vendor)); + return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_VENDOR); + } + + if (ntohs(ovh->header.length) < sizeof(struct nicira_header)) { + VLOG_WARN_RL(&bad_ofmsg_rl, "received Nicira vendor message of " + "length %u (expected at least %zu)", + ntohs(ovh->header.length), sizeof(struct nicira_header)); + return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); + } + + nh = (const struct nicira_header *) oh; + return ofputil_lookup_openflow_message(&nxt_category, ntohl(nh->subtype), + ntohs(oh->length), typep); +} + +static int +check_nxstats_msg(const struct ofp_header *oh) +{ + const struct ofp_stats_request *osr; + ovs_be32 vendor; + + osr = (const struct ofp_stats_request *) oh; + + memcpy(&vendor, osr->body, sizeof vendor); + if (vendor != htonl(NX_VENDOR_ID)) { + VLOG_WARN_RL(&bad_ofmsg_rl, "received vendor stats message for " + "unknown vendor %"PRIx32, ntohl(vendor)); + return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_VENDOR); + } + + if (ntohs(osr->header.length) < sizeof(struct nicira_stats_msg)) { + VLOG_WARN_RL(&bad_ofmsg_rl, "truncated Nicira stats message"); + return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); + } + + return 0; +} + +static int +ofputil_decode_nxst_request(const struct ofp_header *oh, + const struct ofputil_msg_type **typep) +{ + static const struct ofputil_msg_type nxst_requests[] = { + { OFPUTIL_NXST_FLOW_REQUEST, + NXST_FLOW, "NXST_FLOW request", + sizeof(struct nx_flow_stats_request), 8 }, + + { OFPUTIL_NXST_AGGREGATE_REQUEST, + NXST_AGGREGATE, "NXST_AGGREGATE request", + sizeof(struct nx_aggregate_stats_request), 8 }, + }; + + static const struct ofputil_msg_category nxst_request_category = { + "Nicira extension statistics request", + nxst_requests, ARRAY_SIZE(nxst_requests), + OFP_MKERR(OFPET_BAD_REQUEST, OFPBRC_BAD_SUBTYPE) + }; + + const struct nicira_stats_msg *nsm; + int error; + + error = check_nxstats_msg(oh); + if (error) { + return error; + } + + nsm = (struct nicira_stats_msg *) oh; + return ofputil_lookup_openflow_message(&nxst_request_category, + ntohl(nsm->subtype), + ntohs(oh->length), typep); +} + +static int +ofputil_decode_nxst_reply(const struct ofp_header *oh, + const struct ofputil_msg_type **typep) +{ + static const struct ofputil_msg_type nxst_replies[] = { + { OFPUTIL_NXST_FLOW_REPLY, + NXST_FLOW, "NXST_FLOW reply", + sizeof(struct nicira_stats_msg), 8 }, + + { OFPUTIL_NXST_AGGREGATE_REPLY, + NXST_AGGREGATE, "NXST_AGGREGATE reply", + sizeof(struct nx_aggregate_stats_reply), 0 }, + }; + + static const struct ofputil_msg_category nxst_reply_category = { + "Nicira extension statistics reply", + nxst_replies, ARRAY_SIZE(nxst_replies), + OFP_MKERR(OFPET_BAD_REQUEST, OFPBRC_BAD_SUBTYPE) + }; + + const struct nicira_stats_msg *nsm; + int error; + + error = check_nxstats_msg(oh); + if (error) { + return error; + } + + nsm = (struct nicira_stats_msg *) oh; + return ofputil_lookup_openflow_message(&nxst_reply_category, + ntohl(nsm->subtype), + ntohs(oh->length), typep); +} + +static int +ofputil_decode_ofpst_request(const struct ofp_header *oh, + const struct ofputil_msg_type **typep) +{ + enum { OSR_SIZE = sizeof(struct ofp_stats_request) }; + static const struct ofputil_msg_type ofpst_requests[] = { + { OFPUTIL_OFPST_DESC_REQUEST, + OFPST_DESC, "OFPST_DESC request", + OSR_SIZE, 0 }, + + { OFPUTIL_OFPST_FLOW_REQUEST, + OFPST_FLOW, "OFPST_FLOW request", + OSR_SIZE + sizeof(struct ofp_flow_stats_request), 0 }, + + { OFPUTIL_OFPST_AGGREGATE_REQUEST, + OFPST_AGGREGATE, "OFPST_AGGREGATE request", + OSR_SIZE + sizeof(struct ofp_aggregate_stats_request), 0 }, + + { OFPUTIL_OFPST_TABLE_REQUEST, + OFPST_TABLE, "OFPST_TABLE request", + OSR_SIZE, 0 }, + + { OFPUTIL_OFPST_PORT_REQUEST, + OFPST_PORT, "OFPST_PORT request", + OSR_SIZE + sizeof(struct ofp_port_stats_request), 0 }, + + { OFPUTIL_OFPST_QUEUE_REQUEST, + OFPST_QUEUE, "OFPST_QUEUE request", + OSR_SIZE + sizeof(struct ofp_queue_stats_request), 0 }, + + { 0, + OFPST_VENDOR, "OFPST_VENDOR request", + OSR_SIZE + sizeof(uint32_t), 1 }, + }; + + static const struct ofputil_msg_category ofpst_request_category = { + "OpenFlow statistics", + ofpst_requests, ARRAY_SIZE(ofpst_requests), + OFP_MKERR(OFPET_BAD_REQUEST, OFPBRC_BAD_STAT) + }; + + const struct ofp_stats_request *osr; + int error; + + osr = (const struct ofp_stats_request *) oh; + error = ofputil_lookup_openflow_message(&ofpst_request_category, + ntohs(osr->type), + ntohs(oh->length), typep); + if (!error && osr->type == htons(OFPST_VENDOR)) { + error = ofputil_decode_nxst_request(oh, typep); + } + return error; +} + +static int +ofputil_decode_ofpst_reply(const struct ofp_header *oh, + const struct ofputil_msg_type **typep) +{ + enum { OSR_SIZE = sizeof(struct ofp_stats_reply) }; + static const struct ofputil_msg_type ofpst_replies[] = { + { OFPUTIL_OFPST_DESC_REPLY, + OFPST_DESC, "OFPST_DESC reply", + OSR_SIZE + sizeof(struct ofp_desc_stats), 0 }, + + { OFPUTIL_OFPST_FLOW_REPLY, + OFPST_FLOW, "OFPST_FLOW reply", + OSR_SIZE, 1 }, + + { OFPUTIL_OFPST_AGGREGATE_REPLY, + OFPST_AGGREGATE, "OFPST_AGGREGATE reply", + OSR_SIZE + sizeof(struct ofp_aggregate_stats_reply), 0 }, + + { OFPUTIL_OFPST_TABLE_REPLY, + OFPST_TABLE, "OFPST_TABLE reply", + OSR_SIZE, sizeof(struct ofp_table_stats) }, + + { OFPUTIL_OFPST_PORT_REPLY, + OFPST_PORT, "OFPST_PORT reply", + OSR_SIZE, sizeof(struct ofp_port_stats) }, + + { OFPUTIL_OFPST_QUEUE_REPLY, + OFPST_QUEUE, "OFPST_QUEUE reply", + OSR_SIZE, sizeof(struct ofp_queue_stats) }, + + { 0, + OFPST_VENDOR, "OFPST_VENDOR reply", + OSR_SIZE + sizeof(uint32_t), 1 }, + }; + + static const struct ofputil_msg_category ofpst_reply_category = { + "OpenFlow statistics", + ofpst_replies, ARRAY_SIZE(ofpst_replies), + OFP_MKERR(OFPET_BAD_REQUEST, OFPBRC_BAD_STAT) + }; + + const struct ofp_stats_reply *osr = (const struct ofp_stats_reply *) oh; + int error; + + error = ofputil_lookup_openflow_message(&ofpst_reply_category, + ntohs(osr->type), + ntohs(oh->length), typep); + if (!error && osr->type == htons(OFPST_VENDOR)) { + error = ofputil_decode_nxst_reply(oh, typep); + } + return error; +} + +/* Decodes the message type represented by 'oh'. Returns 0 if successful or + * an OpenFlow error code constructed with ofp_mkerr() on failure. Either + * way, stores in '*typep' a type structure that can be inspected with the + * ofputil_msg_type_*() functions. + * + * oh->length must indicate the correct length of the message (and must be at + * least sizeof(struct ofp_header)). + * + * Success indicates that 'oh' is at least as long as the minimum-length + * message of its type. */ +int +ofputil_decode_msg_type(const struct ofp_header *oh, + const struct ofputil_msg_type **typep) +{ + static const struct ofputil_msg_type ofpt_messages[] = { + { OFPUTIL_OFPT_HELLO, + OFPT_HELLO, "OFPT_HELLO", + sizeof(struct ofp_hello), 1 }, + + { OFPUTIL_OFPT_ERROR, + OFPT_ERROR, "OFPT_ERROR", + sizeof(struct ofp_error_msg), 1 }, + + { OFPUTIL_OFPT_ECHO_REQUEST, + OFPT_ECHO_REQUEST, "OFPT_ECHO_REQUEST", + sizeof(struct ofp_header), 1 }, + + { OFPUTIL_OFPT_ECHO_REPLY, + OFPT_ECHO_REPLY, "OFPT_ECHO_REPLY", + sizeof(struct ofp_header), 1 }, + + { OFPUTIL_OFPT_FEATURES_REQUEST, + OFPT_FEATURES_REQUEST, "OFPT_FEATURES_REQUEST", + sizeof(struct ofp_header), 0 }, + + { OFPUTIL_OFPT_FEATURES_REPLY, + OFPT_FEATURES_REPLY, "OFPT_FEATURES_REPLY", + sizeof(struct ofp_switch_features), sizeof(struct ofp_phy_port) }, + + { OFPUTIL_OFPT_GET_CONFIG_REQUEST, + OFPT_GET_CONFIG_REQUEST, "OFPT_GET_CONFIG_REQUEST", + sizeof(struct ofp_header), 0 }, + + { OFPUTIL_OFPT_GET_CONFIG_REPLY, + OFPT_GET_CONFIG_REPLY, "OFPT_GET_CONFIG_REPLY", + sizeof(struct ofp_switch_config), 0 }, + + { OFPUTIL_OFPT_SET_CONFIG, + OFPT_SET_CONFIG, "OFPT_SET_CONFIG", + sizeof(struct ofp_switch_config), 0 }, + + { OFPUTIL_OFPT_PACKET_IN, + OFPT_PACKET_IN, "OFPT_PACKET_IN", + offsetof(struct ofp_packet_in, data), 1 }, + + { OFPUTIL_OFPT_FLOW_REMOVED, + OFPT_FLOW_REMOVED, "OFPT_FLOW_REMOVED", + sizeof(struct ofp_flow_removed), 0 }, + + { OFPUTIL_OFPT_PORT_STATUS, + OFPT_PORT_STATUS, "OFPT_PORT_STATUS", + sizeof(struct ofp_port_status), 0 }, + + { OFPUTIL_OFPT_PACKET_OUT, + OFPT_PACKET_OUT, "OFPT_PACKET_OUT", + sizeof(struct ofp_packet_out), 1 }, + + { OFPUTIL_OFPT_FLOW_MOD, + OFPT_FLOW_MOD, "OFPT_FLOW_MOD", + sizeof(struct ofp_flow_mod), 1 }, + + { OFPUTIL_OFPT_PORT_MOD, + OFPT_PORT_MOD, "OFPT_PORT_MOD", + sizeof(struct ofp_port_mod), 0 }, + + { 0, + OFPT_STATS_REQUEST, "OFPT_STATS_REQUEST", + sizeof(struct ofp_stats_request), 1 }, + + { 0, + OFPT_STATS_REPLY, "OFPT_STATS_REPLY", + sizeof(struct ofp_stats_reply), 1 }, + + { OFPUTIL_OFPT_BARRIER_REQUEST, + OFPT_BARRIER_REQUEST, "OFPT_BARRIER_REQUEST", + sizeof(struct ofp_header), 0 }, + + { OFPUTIL_OFPT_BARRIER_REPLY, + OFPT_BARRIER_REPLY, "OFPT_BARRIER_REPLY", + sizeof(struct ofp_header), 0 }, + + { 0, + OFPT_VENDOR, "OFPT_VENDOR", + sizeof(struct ofp_vendor_header), 1 }, + }; + + static const struct ofputil_msg_category ofpt_category = { + "OpenFlow message", + ofpt_messages, ARRAY_SIZE(ofpt_messages), + OFP_MKERR(OFPET_BAD_REQUEST, OFPBRC_BAD_TYPE) + }; + + int error; + + error = ofputil_lookup_openflow_message(&ofpt_category, oh->type, + ntohs(oh->length), typep); + if (!error) { + switch (oh->type) { + case OFPT_VENDOR: + error = ofputil_decode_vendor(oh, typep); + break; + + case OFPT_STATS_REQUEST: + error = ofputil_decode_ofpst_request(oh, typep); + break; + + case OFPT_STATS_REPLY: + error = ofputil_decode_ofpst_reply(oh, typep); + + default: + break; + } + } + if (error) { + static const struct ofputil_msg_type ofputil_invalid_type = { + OFPUTIL_INVALID, + 0, "OFPUTIL_INVALID", + 0, 0 + }; + + *typep = &ofputil_invalid_type; + } + return error; +} + +/* Returns an OFPUTIL_* message type code for 'type'. */ +enum ofputil_msg_code +ofputil_msg_type_code(const struct ofputil_msg_type *type) +{ + return type->code; +} + +/* Flow formats. */ + +bool +ofputil_flow_format_is_valid(enum nx_flow_format flow_format) +{ + switch (flow_format) { + case NXFF_OPENFLOW10: + case NXFF_TUN_ID_FROM_COOKIE: + case NXFF_NXM: + return true; + } + + return false; +} + +const char * +ofputil_flow_format_to_string(enum nx_flow_format flow_format) +{ + switch (flow_format) { + case NXFF_OPENFLOW10: + return "openflow10"; + case NXFF_TUN_ID_FROM_COOKIE: + return "tun_id_from_cookie"; + case NXFF_NXM: + return "nxm"; + default: + NOT_REACHED(); + } +} + +int +ofputil_flow_format_from_string(const char *s) +{ + return (!strcmp(s, "openflow10") ? NXFF_OPENFLOW10 + : !strcmp(s, "tun_id_from_cookie") ? NXFF_TUN_ID_FROM_COOKIE + : !strcmp(s, "nxm") ? NXFF_NXM + : -1); +} + +static bool +regs_fully_wildcarded(const struct flow_wildcards *wc) +{ + int i; + + for (i = 0; i < FLOW_N_REGS; i++) { + if (wc->reg_masks[i] != 0) { + return false; + } + } + return true; +} + +/* Returns the minimum nx_flow_format to use for sending 'rule' to a switch + * (e.g. to add or remove a flow). 'cookie_support' should be true if the + * command to be sent includes a flow cookie (as OFPT_FLOW_MOD does, for + * example) or false if the command does not (OFPST_FLOW and OFPST_AGGREGATE do + * not, for example). If 'cookie_support' is true, then 'cookie' should be the + * cookie to be sent; otherwise its value is ignored. + * + * The "best" flow format is chosen on this basis: + * + * - It must be capable of expressing the rule. NXFF_OPENFLOW10 flows can't + * handle tunnel IDs. NXFF_TUN_ID_FROM_COOKIE flows can't handle registers + * or fixing the Ethernet multicast bit, and can't handle tunnel IDs that + * conflict with the high 32 bits of the cookie or commands that don't + * support cookies. + * + * - Otherwise, the chosen format should be as backward compatible as + * possible. (NXFF_OPENFLOW10 is more backward compatible than + * NXFF_TUN_ID_FROM_COOKIE, which is more backward compatible than + * NXFF_NXM.) + */ +enum nx_flow_format +ofputil_min_flow_format(const struct cls_rule *rule, bool cookie_support, + ovs_be64 cookie) +{ + const struct flow_wildcards *wc = &rule->wc; + ovs_be32 cookie_hi = htonl(ntohll(cookie) >> 32); + + if (!(wc->wildcards & FWW_DL_DST) != !(wc->wildcards & FWW_ETH_MCAST) + || !regs_fully_wildcarded(wc) + || (!(wc->wildcards & FWW_TUN_ID) + && (!cookie_support + || (cookie_hi && cookie_hi != ntohll(rule->flow.tun_id))))) { + return NXFF_NXM; + } else if (!(wc->wildcards & FWW_TUN_ID)) { + return NXFF_TUN_ID_FROM_COOKIE; + } else { + return NXFF_OPENFLOW10; + } +} + +/* Returns an OpenFlow message that can be used to set the flow format to + * 'flow_format'. */ +struct ofpbuf * +ofputil_make_set_flow_format(enum nx_flow_format flow_format) +{ + struct ofpbuf *msg; + + if (flow_format == NXFF_OPENFLOW10 + || flow_format == NXFF_TUN_ID_FROM_COOKIE) { + struct nxt_tun_id_cookie *tic; + + tic = make_nxmsg(sizeof *tic, NXT_TUN_ID_FROM_COOKIE, &msg); + tic->set = flow_format == NXFF_TUN_ID_FROM_COOKIE; + } else { + struct nxt_set_flow_format *sff; + + sff = make_nxmsg(sizeof *sff, NXT_SET_FLOW_FORMAT, &msg); + sff->format = htonl(flow_format); + } + + return msg; +} + +/* Converts an OFPT_FLOW_MOD or NXT_FLOW_MOD message 'oh' into an abstract + * flow_mod in 'fm'. Returns 0 if successful, otherwise an OpenFlow error + * code. + * + * For OFPT_FLOW_MOD messages, 'flow_format' should be the current flow format + * at the time when the message was received. Otherwise 'flow_format' is + * ignored. + * + * Does not validate the flow_mod actions. */ +int +ofputil_decode_flow_mod(struct flow_mod *fm, const struct ofp_header *oh, + enum nx_flow_format flow_format) +{ + const struct ofputil_msg_type *type; + struct ofpbuf b; + + ofpbuf_use_const(&b, oh, ntohs(oh->length)); + + ofputil_decode_msg_type(oh, &type); + if (ofputil_msg_type_code(type) == OFPUTIL_OFPT_FLOW_MOD) { + /* Standard OpenFlow flow_mod. */ + struct ofp_match match, orig_match; + const struct ofp_flow_mod *ofm; + int error; + + /* Dissect the message. */ + ofm = ofpbuf_pull(&b, sizeof *ofm); + error = ofputil_pull_actions(&b, b.size, &fm->actions, &fm->n_actions); + if (error) { + return error; + } + + /* Normalize ofm->match. If normalization actually changes anything, + * then log the differences. */ + match = ofm->match; + match.pad1[0] = match.pad2[0] = 0; + orig_match = match; + normalize_match(&match); + if (memcmp(&match, &orig_match, sizeof orig_match)) { + if (!VLOG_DROP_INFO(&bad_ofmsg_rl)) { + char *old = ofp_match_to_literal_string(&orig_match); + char *new = ofp_match_to_literal_string(&match); + VLOG_INFO("normalization changed ofp_match, details:"); + VLOG_INFO(" pre: %s", old); + VLOG_INFO("post: %s", new); + free(old); + free(new); + } + } + + /* Translate the message. */ + ofputil_cls_rule_from_match(&match, ntohs(ofm->priority), flow_format, + ofm->cookie, &fm->cr); + fm->cookie = ofm->cookie; + fm->command = ntohs(ofm->command); + fm->idle_timeout = ntohs(ofm->idle_timeout); + fm->hard_timeout = ntohs(ofm->hard_timeout); + fm->buffer_id = ntohl(ofm->buffer_id); + fm->out_port = ntohs(ofm->out_port); + fm->flags = ntohs(ofm->flags); + } else if (ofputil_msg_type_code(type) == OFPUTIL_NXT_FLOW_MOD) { + /* Nicira extended flow_mod. */ + const struct nx_flow_mod *nfm; + int error; + + /* Dissect the message. */ + nfm = ofpbuf_pull(&b, sizeof *nfm); + error = nx_pull_match(&b, ntohs(nfm->match_len), ntohs(nfm->priority), + &fm->cr); + if (error) { + return error; + } + error = ofputil_pull_actions(&b, b.size, &fm->actions, &fm->n_actions); + if (error) { + return error; + } + + /* Translate the message. */ + fm->cookie = nfm->cookie; + fm->command = ntohs(nfm->command); + fm->idle_timeout = ntohs(nfm->idle_timeout); + fm->hard_timeout = ntohs(nfm->hard_timeout); + fm->buffer_id = ntohl(nfm->buffer_id); + fm->out_port = ntohs(nfm->out_port); + fm->flags = ntohs(nfm->flags); + } else { + NOT_REACHED(); + } + return 0; +} + +/* Converts 'fm' into an OFPT_FLOW_MOD or NXT_FLOW_MOD message according to + * 'flow_format' and returns the message. */ +struct ofpbuf * +ofputil_encode_flow_mod(const struct flow_mod *fm, + enum nx_flow_format flow_format) +{ + size_t actions_len = fm->n_actions * sizeof *fm->actions; + struct ofpbuf *msg; + + if (flow_format == NXFF_OPENFLOW10 + || flow_format == NXFF_TUN_ID_FROM_COOKIE) { + struct ofp_flow_mod *ofm; + + msg = ofpbuf_new(sizeof *ofm + actions_len); + ofm = put_openflow(sizeof *ofm, OFPT_FLOW_MOD, msg); + ofputil_cls_rule_to_match(&fm->cr, flow_format, &ofm->match, + fm->cookie, &ofm->cookie); + ofm->command = htons(fm->command); + ofm->idle_timeout = htons(fm->idle_timeout); + ofm->hard_timeout = htons(fm->hard_timeout); + ofm->priority = htons(fm->cr.priority); + ofm->buffer_id = htonl(fm->buffer_id); + ofm->out_port = htons(fm->out_port); + ofm->flags = htons(fm->flags); + } else if (flow_format == NXFF_NXM) { + struct nx_flow_mod *nfm; + int match_len; + + msg = ofpbuf_new(sizeof *nfm + NXM_TYPICAL_LEN + actions_len); + put_nxmsg(sizeof *nfm, NXT_FLOW_MOD, msg); + match_len = nx_put_match(msg, &fm->cr); + + nfm = msg->data; + nfm->cookie = fm->cookie; + nfm->command = htons(fm->command); + nfm->idle_timeout = htons(fm->idle_timeout); + nfm->hard_timeout = htons(fm->hard_timeout); + nfm->priority = htons(fm->cr.priority); + nfm->buffer_id = htonl(fm->buffer_id); + nfm->out_port = htons(fm->out_port); + nfm->flags = htons(fm->flags); + nfm->match_len = htons(match_len); + } else { + NOT_REACHED(); + } + + ofpbuf_put(msg, fm->actions, actions_len); + update_openflow_length(msg); + return msg; +} + +static int +ofputil_decode_ofpst_flow_request(struct flow_stats_request *fsr, + const struct ofp_header *oh, + enum nx_flow_format flow_format, + bool aggregate) +{ + const struct ofp_flow_stats_request *ofsr = ofputil_stats_body(oh); + + fsr->aggregate = aggregate; + ofputil_cls_rule_from_match(&ofsr->match, 0, flow_format, 0, &fsr->match); + fsr->out_port = ntohs(ofsr->out_port); + fsr->table_id = ofsr->table_id; + + return 0; +} + +static int +ofputil_decode_nxst_flow_request(struct flow_stats_request *fsr, + const struct ofp_header *oh, + bool aggregate) +{ + const struct nx_flow_stats_request *nfsr; + struct ofpbuf b; + int error; + + ofpbuf_use_const(&b, oh, ntohs(oh->length)); + + nfsr = ofpbuf_pull(&b, sizeof *nfsr); + error = nx_pull_match(&b, ntohs(nfsr->match_len), 0, &fsr->match); + if (error) { + return error; + } + if (b.size) { + return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); + } + + fsr->aggregate = aggregate; + fsr->out_port = ntohs(nfsr->out_port); + fsr->table_id = nfsr->table_id; + + return 0; +} + +/* Converts an OFPST_FLOW, OFPST_AGGREGATE, NXST_FLOW, or NXST_AGGREGATE + * message 'oh', received when the current flow format was 'flow_format', into + * an abstract flow_stats_request in 'fsr'. Returns 0 if successful, otherwise + * an OpenFlow error code. + * + * For OFPST_FLOW and OFPST_AGGREGATE messages, 'flow_format' should be the + * current flow format at the time when the message was received. Otherwise + * 'flow_format' is ignored. */ +int +ofputil_decode_flow_stats_request(struct flow_stats_request *fsr, + const struct ofp_header *oh, + enum nx_flow_format flow_format) +{ + const struct ofputil_msg_type *type; + struct ofpbuf b; + int code; + + ofpbuf_use_const(&b, oh, ntohs(oh->length)); + + ofputil_decode_msg_type(oh, &type); + code = ofputil_msg_type_code(type); + switch (code) { + case OFPUTIL_OFPST_FLOW_REQUEST: + return ofputil_decode_ofpst_flow_request(fsr, oh, flow_format, false); + + case OFPUTIL_OFPST_AGGREGATE_REQUEST: + return ofputil_decode_ofpst_flow_request(fsr, oh, flow_format, true); + + case OFPUTIL_NXST_FLOW_REQUEST: + return ofputil_decode_nxst_flow_request(fsr, oh, false); + + case OFPUTIL_NXST_AGGREGATE_REQUEST: + return ofputil_decode_nxst_flow_request(fsr, oh, true); + + default: + /* Hey, the caller lied. */ + NOT_REACHED(); + } +} + +/* Converts abstract flow_stats_request 'fsr' into an OFPST_FLOW, + * OFPST_AGGREGATE, NXST_FLOW, or NXST_AGGREGATE message 'oh' according to + * 'flow_format', and returns the message. */ +struct ofpbuf * +ofputil_encode_flow_stats_request(const struct flow_stats_request *fsr, + enum nx_flow_format flow_format) +{ + struct ofpbuf *msg; + + if (flow_format == NXFF_OPENFLOW10 + || flow_format == NXFF_TUN_ID_FROM_COOKIE) { + struct ofp_flow_stats_request *ofsr; + int type; + + BUILD_ASSERT_DECL(sizeof(struct ofp_flow_stats_request) + == sizeof(struct ofp_aggregate_stats_request)); + + type = fsr->aggregate ? OFPST_AGGREGATE : OFPST_FLOW; + ofsr = ofputil_make_stats_request(sizeof *ofsr, type, &msg); + ofputil_cls_rule_to_match(&fsr->match, flow_format, &ofsr->match, + 0, NULL); + ofsr->table_id = fsr->table_id; + ofsr->out_port = htons(fsr->out_port); + } else if (flow_format == NXFF_NXM) { + struct nx_flow_stats_request *nfsr; + int match_len; + int subtype; + + subtype = fsr->aggregate ? NXST_AGGREGATE : NXST_FLOW; + ofputil_make_nxstats_request(sizeof *nfsr, subtype, &msg); + match_len = nx_put_match(msg, &fsr->match); + + nfsr = msg->data; + nfsr->out_port = htons(fsr->out_port); + nfsr->match_len = htons(match_len); + nfsr->table_id = fsr->table_id; + } else { + NOT_REACHED(); + } + + return msg; +} + +/* Converts an OFPT_FLOW_REMOVED or NXT_FLOW_REMOVED message 'oh', received + * when the current flow format was 'flow_format', into an abstract + * ofputil_flow_removed in 'fr'. Returns 0 if successful, otherwise an + * OpenFlow error code. + * + * For OFPT_FLOW_REMOVED messages, 'flow_format' should be the current flow + * format at the time when the message was received. Otherwise 'flow_format' + * is ignored. */ +int +ofputil_decode_flow_removed(struct ofputil_flow_removed *fr, + const struct ofp_header *oh, + enum nx_flow_format flow_format) +{ + const struct ofputil_msg_type *type; + enum ofputil_msg_code code; + + ofputil_decode_msg_type(oh, &type); + code = ofputil_msg_type_code(type); + if (code == OFPUTIL_OFPT_FLOW_REMOVED) { + const struct ofp_flow_removed *ofr; + + ofr = (const struct ofp_flow_removed *) oh; + ofputil_cls_rule_from_match(&ofr->match, ntohs(ofr->priority), + flow_format, ofr->cookie, &fr->rule); + fr->cookie = ofr->cookie; + fr->reason = ofr->reason; + fr->duration_sec = ntohl(ofr->duration_sec); + fr->duration_nsec = ntohl(ofr->duration_nsec); + fr->idle_timeout = ntohs(ofr->idle_timeout); + fr->packet_count = ntohll(ofr->packet_count); + fr->byte_count = ntohll(ofr->byte_count); + } else if (code == OFPUTIL_NXT_FLOW_REMOVED) { + struct nx_flow_removed *nfr; + struct ofpbuf b; + int error; + + ofpbuf_use_const(&b, oh, ntohs(oh->length)); + + nfr = ofpbuf_pull(&b, sizeof *nfr); + error = nx_pull_match(&b, ntohs(nfr->match_len), ntohs(nfr->priority), + &fr->rule); + if (error) { + return error; + } + if (b.size) { + return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); + } + + fr->cookie = nfr->cookie; + fr->reason = nfr->reason; + fr->duration_sec = ntohl(nfr->duration_sec); + fr->duration_nsec = ntohl(nfr->duration_nsec); + fr->idle_timeout = ntohs(nfr->idle_timeout); + fr->packet_count = ntohll(nfr->packet_count); + fr->byte_count = ntohll(nfr->byte_count); + } else { + NOT_REACHED(); + } + + return 0; +} + +/* Returns a string representing the message type of 'type'. The string is the + * enumeration constant for the type, e.g. "OFPT_HELLO". For statistics + * messages, the constant is followed by "request" or "reply", + * e.g. "OFPST_AGGREGATE reply". */ +const char * +ofputil_msg_type_name(const struct ofputil_msg_type *type) +{ + return type->name; +} + /* Allocates and stores in '*bufferp' a new ofpbuf with a size of * 'openflow_len', starting with an OpenFlow header with the given 'type' and * an arbitrary transaction id. Allocated bytes beyond the header, if any, are @@ -324,11 +1285,8 @@ void * make_nxmsg_xid(size_t openflow_len, uint32_t subtype, ovs_be32 xid, struct ofpbuf **bufferp) { - struct nicira_header *nxh = make_openflow_xid(openflow_len, OFPT_VENDOR, - xid, bufferp); - nxh->vendor = htonl(NX_VENDOR_ID); - nxh->subtype = htonl(subtype); - return nxh; + *bufferp = ofpbuf_new(openflow_len); + return put_nxmsg_xid(openflow_len, subtype, xid, *bufferp); } /* Appends 'openflow_len' bytes to 'buffer', starting with an OpenFlow header @@ -373,6 +1331,28 @@ put_openflow_xid(size_t openflow_len, uint8_t type, ovs_be32 xid, return oh; } +/* Similar to put_openflow() but append a Nicira vendor extension message with + * the specific 'subtype'. 'subtype' should be in host byte order. */ +void * +put_nxmsg(size_t openflow_len, uint32_t subtype, struct ofpbuf *buffer) +{ + return put_nxmsg_xid(openflow_len, subtype, alloc_xid(), buffer); +} + +/* Similar to put_openflow_xid() but append a Nicira vendor extension message + * with the specific 'subtype'. 'subtype' should be in host byte order. */ +void * +put_nxmsg_xid(size_t openflow_len, uint32_t subtype, ovs_be32 xid, + struct ofpbuf *buffer) +{ + struct nicira_header *nxh; + + nxh = put_openflow_xid(openflow_len, OFPT_VENDOR, xid, buffer); + nxh->vendor = htonl(NX_VENDOR_ID); + nxh->subtype = htonl(subtype); + return nxh; +} + /* Updates the 'length' field of the OpenFlow message in 'buffer' to * 'buffer->size'. */ void @@ -382,6 +1362,71 @@ update_openflow_length(struct ofpbuf *buffer) oh->length = htons(buffer->size); } +/* Creates an ofp_stats_request with the given 'type' and 'body_len' bytes of + * space allocated for the 'body' member. Returns the first byte of the 'body' + * member. */ +void * +ofputil_make_stats_request(size_t body_len, uint16_t type, + struct ofpbuf **bufferp) +{ + struct ofp_stats_request *osr; + osr = make_openflow((offsetof(struct ofp_stats_request, body) + + body_len), OFPT_STATS_REQUEST, bufferp); + osr->type = htons(type); + osr->flags = htons(0); + return osr->body; +} + +/* Creates a stats request message with Nicira as vendor and the given + * 'subtype', of total length 'openflow_len'. Returns the message. */ +void * +ofputil_make_nxstats_request(size_t openflow_len, uint32_t subtype, + struct ofpbuf **bufferp) +{ + struct nicira_stats_msg *nsm; + + nsm = make_openflow(openflow_len, OFPT_STATS_REQUEST, bufferp); + nsm->type = htons(OFPST_VENDOR); + nsm->flags = htons(0); + nsm->vendor = htonl(NX_VENDOR_ID); + nsm->subtype = htonl(subtype); + return nsm; +} + +/* Returns the first byte of the 'body' member of the ofp_stats_request or + * ofp_stats_reply in 'oh'. */ +const void * +ofputil_stats_body(const struct ofp_header *oh) +{ + assert(oh->type == OFPT_STATS_REQUEST || oh->type == OFPT_STATS_REPLY); + return ((const struct ofp_stats_request *) oh)->body; +} + +/* Returns the length of the 'body' member of the ofp_stats_request or + * ofp_stats_reply in 'oh'. */ +size_t +ofputil_stats_body_len(const struct ofp_header *oh) +{ + assert(oh->type == OFPT_STATS_REQUEST || oh->type == OFPT_STATS_REPLY); + return ntohs(oh->length) - sizeof(struct ofp_stats_request); +} + +/* Returns the first byte of the body of the nicira_stats_msg in 'oh'. */ +const void * +ofputil_nxstats_body(const struct ofp_header *oh) +{ + assert(oh->type == OFPT_STATS_REQUEST || oh->type == OFPT_STATS_REPLY); + return ((const struct nicira_stats_msg *) oh) + 1; +} + +/* Returns the length of the body of the nicira_stats_msg in 'oh'. */ +size_t +ofputil_nxstats_body_len(const struct ofp_header *oh) +{ + assert(oh->type == OFPT_STATS_REQUEST || oh->type == OFPT_STATS_REPLY); + return ntohs(oh->length) - sizeof(struct nicira_stats_msg); +} + struct ofpbuf * make_flow_mod(uint16_t command, const struct cls_rule *rule, size_t actions_len) @@ -395,7 +1440,7 @@ make_flow_mod(uint16_t command, const struct cls_rule *rule, ofm->header.length = htons(size); ofm->cookie = 0; ofm->priority = htons(MIN(rule->priority, UINT16_MAX)); - ofputil_cls_rule_to_match(rule, NXFF_OPENFLOW10, &ofm->match); + ofputil_cls_rule_to_match(rule, NXFF_OPENFLOW10, &ofm->match, 0, NULL); ofm->command = htons(command); return out; } @@ -542,98 +1587,6 @@ make_echo_reply(const struct ofp_header *rq) return out; } -static int -check_message_type(uint8_t got_type, uint8_t want_type) -{ - if (got_type != want_type) { - char *want_type_name = ofp_message_type_to_string(want_type); - char *got_type_name = ofp_message_type_to_string(got_type); - VLOG_WARN_RL(&bad_ofmsg_rl, - "received bad message type %s (expected %s)", - got_type_name, want_type_name); - free(want_type_name); - free(got_type_name); - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_TYPE); - } - return 0; -} - -/* Checks that 'msg' has type 'type' and that it is exactly 'size' bytes long. - * Returns 0 if the checks pass, otherwise an OpenFlow error code (produced - * with ofp_mkerr()). */ -int -check_ofp_message(const struct ofp_header *msg, uint8_t type, size_t size) -{ - size_t got_size; - int error; - - error = check_message_type(msg->type, type); - if (error) { - return error; - } - - got_size = ntohs(msg->length); - if (got_size != size) { - char *type_name = ofp_message_type_to_string(type); - VLOG_WARN_RL(&bad_ofmsg_rl, - "received %s message of length %zu (expected %zu)", - type_name, got_size, size); - free(type_name); - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); - } - - return 0; -} - -/* Checks that 'msg' has type 'type' and that 'msg' is 'size' plus a - * nonnegative integer multiple of 'array_elt_size' bytes long. Returns 0 if - * the checks pass, otherwise an OpenFlow error code (produced with - * ofp_mkerr()). - * - * If 'n_array_elts' is nonnull, then '*n_array_elts' is set to the number of - * 'array_elt_size' blocks in 'msg' past the first 'min_size' bytes, when - * successful. */ -int -check_ofp_message_array(const struct ofp_header *msg, uint8_t type, - size_t min_size, size_t array_elt_size, - size_t *n_array_elts) -{ - size_t got_size; - int error; - - assert(array_elt_size); - - error = check_message_type(msg->type, type); - if (error) { - return error; - } - - got_size = ntohs(msg->length); - if (got_size < min_size) { - char *type_name = ofp_message_type_to_string(type); - VLOG_WARN_RL(&bad_ofmsg_rl, "received %s message of length %zu " - "(expected at least %zu)", - type_name, got_size, min_size); - free(type_name); - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); - } - if ((got_size - min_size) % array_elt_size) { - char *type_name = ofp_message_type_to_string(type); - VLOG_WARN_RL(&bad_ofmsg_rl, - "received %s message of bad length %zu: the " - "excess over %zu (%zu) is not evenly divisible by %zu " - "(remainder is %zu)", - type_name, got_size, min_size, got_size - min_size, - array_elt_size, (got_size - min_size) % array_elt_size); - free(type_name); - return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); - } - if (n_array_elts) { - *n_array_elts = (got_size - min_size) / array_elt_size; - } - return 0; -} - const struct ofp_flow_stats * flow_stats_first(struct flow_stats_iterator *iter, const struct ofp_stats_reply *osr) @@ -684,9 +1637,23 @@ check_action_exact_len(const union ofp_action *a, unsigned int len, unsigned int required_len) { if (len != required_len) { - VLOG_DBG_RL(&bad_ofmsg_rl, - "action %u has invalid length %"PRIu16" (must be %u)\n", - a->type, ntohs(a->header.len), required_len); + VLOG_WARN_RL(&bad_ofmsg_rl, "action %"PRIu16" has invalid length " + "%"PRIu16" (must be %u)\n", + ntohs(a->type), ntohs(a->header.len), required_len); + return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_LEN); + } + return 0; +} + +static int +check_nx_action_exact_len(const struct nx_action_header *a, + unsigned int len, unsigned int required_len) +{ + if (len != required_len) { + VLOG_WARN_RL(&bad_ofmsg_rl, + "Nicira action %"PRIu16" has invalid length %"PRIu16" " + "(must be %u)\n", + ntohs(a->subtype), ntohs(a->len), required_len); return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_LEN); } return 0; @@ -747,34 +1714,42 @@ check_nicira_action(const union ofp_action *a, unsigned int len, const struct flow *flow) { const struct nx_action_header *nah; + uint16_t subtype; int error; if (len < 16) { - VLOG_DBG_RL(&bad_ofmsg_rl, - "Nicira vendor action only %u bytes", len); + VLOG_WARN_RL(&bad_ofmsg_rl, + "Nicira vendor action only %u bytes", len); return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_LEN); } nah = (const struct nx_action_header *) a; - switch (ntohs(nah->subtype)) { + subtype = ntohs(nah->subtype); + if (subtype > TYPE_MAXIMUM(enum nx_action_subtype)) { + /* This is necessary because enum nx_action_subtype is probably an + * 8-bit type, so the cast below throws away the top 8 bits. */ + return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_VENDOR_TYPE); + } + + switch ((enum nx_action_subtype) subtype) { case NXAST_RESUBMIT: case NXAST_SET_TUNNEL: case NXAST_DROP_SPOOFED_ARP: case NXAST_SET_QUEUE: case NXAST_POP_QUEUE: - return check_action_exact_len(a, len, 16); + return check_nx_action_exact_len(nah, len, 16); case NXAST_REG_MOVE: - error = check_action_exact_len(a, len, - sizeof(struct nx_action_reg_move)); + error = check_nx_action_exact_len(nah, len, + sizeof(struct nx_action_reg_move)); if (error) { return error; } return nxm_check_reg_move((const struct nx_action_reg_move *) a, flow); case NXAST_REG_LOAD: - error = check_action_exact_len(a, len, - sizeof(struct nx_action_reg_load)); + error = check_nx_action_exact_len(nah, len, + sizeof(struct nx_action_reg_load)); if (error) { return error; } @@ -783,7 +1758,23 @@ check_nicira_action(const union ofp_action *a, unsigned int len, case NXAST_NOTE: return 0; + case NXAST_SET_TUNNEL64: + return check_nx_action_exact_len( + nah, len, sizeof(struct nx_action_set_tunnel64)); + + case NXAST_MULTIPATH: + error = check_nx_action_exact_len( + nah, len, sizeof(struct nx_action_multipath)); + if (error) { + return error; + } + return multipath_check((const struct nx_action_multipath *) a); + + case NXAST_SNAT__OBSOLETE: default: + VLOG_WARN_RL(&bad_ofmsg_rl, + "unknown Nicira vendor action subtype %"PRIu16, + ntohs(nah->subtype)); return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_VENDOR_TYPE); } } @@ -792,9 +1783,10 @@ static int check_action(const union ofp_action *a, unsigned int len, const struct flow *flow, int max_ports) { + enum ofp_action_type type = ntohs(a->type); int error; - switch (ntohs(a->type)) { + switch (type) { case OFPAT_OUTPUT: error = check_action_exact_len(a, len, 8); if (error) { @@ -843,8 +1835,7 @@ check_action(const union ofp_action *a, unsigned int len, return check_enqueue_action(a, len, max_ports); default: - VLOG_WARN_RL(&bad_ofmsg_rl, "unknown action type %"PRIu16, - ntohs(a->type)); + VLOG_WARN_RL(&bad_ofmsg_rl, "unknown action type %d", (int) type); return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_TYPE); } } @@ -863,16 +1854,16 @@ validate_actions(const union ofp_action *actions, size_t n_actions, int error; if (n_slots > slots_left) { - VLOG_DBG_RL(&bad_ofmsg_rl, - "action requires %u slots but only %u remain", - n_slots, slots_left); + VLOG_WARN_RL(&bad_ofmsg_rl, + "action requires %u slots but only %u remain", + n_slots, slots_left); return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_LEN); } else if (!len) { - VLOG_DBG_RL(&bad_ofmsg_rl, "action has invalid length 0"); + VLOG_WARN_RL(&bad_ofmsg_rl, "action has invalid length 0"); return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_LEN); } else if (len % OFP_ACTION_ALIGN) { - VLOG_DBG_RL(&bad_ofmsg_rl, "action length %u is not a multiple " - "of %d", len, OFP_ACTION_ALIGN); + VLOG_WARN_RL(&bad_ofmsg_rl, "action length %u is not a multiple " + "of %d", len, OFP_ACTION_ALIGN); return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_LEN); } @@ -1119,13 +2110,14 @@ make_ofp_error_msg(int error, const struct ofp_header *oh) oem->type = htons(NXET_VENDOR); oem->code = htons(NXVC_VENDOR_ERROR); - nve = ofpbuf_put_uninit(buf, sizeof *nve); + nve = (struct nx_vendor_error *)oem->data; nve->vendor = htonl(vendor_id); nve->type = htons(type); nve->code = htons(code); } if (len) { + buf->size -= len; ofpbuf_put(buf, data, len); } @@ -1148,16 +2140,16 @@ ofputil_pull_actions(struct ofpbuf *b, unsigned int actions_len, union ofp_action **actionsp, size_t *n_actionsp) { if (actions_len % OFP_ACTION_ALIGN != 0) { - VLOG_DBG_RL(&bad_ofmsg_rl, "OpenFlow message actions length %u " - "is not a multiple of %d", actions_len, OFP_ACTION_ALIGN); + VLOG_WARN_RL(&bad_ofmsg_rl, "OpenFlow message actions length %u " + "is not a multiple of %d", actions_len, OFP_ACTION_ALIGN); goto error; } *actionsp = ofpbuf_try_pull(b, actions_len); if (*actionsp == NULL) { - VLOG_DBG_RL(&bad_ofmsg_rl, "OpenFlow message actions length %u " - "exceeds remaining message length (%zu)", - actions_len, b->size); + VLOG_WARN_RL(&bad_ofmsg_rl, "OpenFlow message actions length %u " + "exceeds remaining message length (%zu)", + actions_len, b->size); goto error; }