X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Fofp-util.c;h=de7cf3cea308801d38b8987863c64293865574ce;hb=6c6eedc5d6730835a0d9724e2e8cfe9cdf03b07d;hp=6366919a435aa50e060be560c2380f7399458229;hpb=36be51c5b09c97a62c342e8ff0bb2d1a33ea2b68;p=cascardo%2Fovs.git diff --git a/lib/ofp-util.c b/lib/ofp-util.c index 6366919a4..de7cf3cea 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,11 +36,14 @@ #include "ofp-actions.h" #include "ofp-errors.h" #include "ofp-msgs.h" +#include "ofp-prop.h" #include "ofp-util.h" #include "ofpbuf.h" #include "openflow/netronome-ext.h" #include "packets.h" +#include "pktbuf.h" #include "random.h" +#include "tun-metadata.h" #include "unaligned.h" #include "type-props.h" #include "openvswitch/vlog.h" @@ -52,113 +55,14 @@ VLOG_DEFINE_THIS_MODULE(ofp_util); * in the peer and so there's not much point in showing a lot of them. */ static struct vlog_rate_limit bad_ofmsg_rl = VLOG_RATE_LIMIT_INIT(1, 5); -static enum ofputil_table_miss ofputil_table_miss_from_config( - ovs_be32 config_, enum ofp_version); - -struct ofp_prop_header { - ovs_be16 type; - ovs_be16 len; -}; - -struct ofp_prop_experimenter { - ovs_be16 type; /* OFP*_EXPERIMENTER. */ - ovs_be16 length; /* Length in bytes of this property. */ - ovs_be32 experimenter; /* Experimenter ID which takes the same form as - * in struct ofp_experimenter_header. */ - ovs_be32 exp_type; /* Experimenter defined. */ -}; - -/* Pulls a property, beginning with struct ofp_prop_header, from the beginning - * of 'msg'. Stores the type of the property in '*typep' and, if 'property' is - * nonnull, the entire property, including the header, in '*property'. Returns - * 0 if successful, otherwise an error code. - * - * This function pulls the property's stated size padded out to a multiple of - * 'alignment' bytes. The common case in OpenFlow is an 'alignment' of 8, so - * you can use ofputil_pull_property() for that case. */ -static enum ofperr -ofputil_pull_property__(struct ofpbuf *msg, struct ofpbuf *property, - unsigned int alignment, uint16_t *typep) -{ - struct ofp_prop_header *oph; - unsigned int padded_len; - unsigned int len; - - if (msg->size < sizeof *oph) { - return OFPERR_OFPBPC_BAD_LEN; - } - - oph = msg->data; - len = ntohs(oph->len); - padded_len = ROUND_UP(len, alignment); - if (len < sizeof *oph || padded_len > msg->size) { - return OFPERR_OFPBPC_BAD_LEN; - } - - *typep = ntohs(oph->type); - if (property) { - ofpbuf_use_const(property, msg->data, len); - } - ofpbuf_pull(msg, padded_len); - return 0; -} - -/* Pulls a property, beginning with struct ofp_prop_header, from the beginning - * of 'msg'. Stores the type of the property in '*typep' and, if 'property' is - * nonnull, the entire property, including the header, in '*property'. Returns - * 0 if successful, otherwise an error code. - * - * This function pulls the property's stated size padded out to a multiple of - * 8 bytes, which is the common case for OpenFlow properties. */ -static enum ofperr -ofputil_pull_property(struct ofpbuf *msg, struct ofpbuf *property, - uint16_t *typep) -{ - return ofputil_pull_property__(msg, property, 8, typep); -} - -static void OVS_PRINTF_FORMAT(2, 3) -log_property(bool loose, const char *message, ...) -{ - enum vlog_level level = loose ? VLL_DBG : VLL_WARN; - if (!vlog_should_drop(THIS_MODULE, level, &bad_ofmsg_rl)) { - va_list args; - - va_start(args, message); - vlog_valist(THIS_MODULE, level, message, args); - va_end(args); - } -} - -static size_t -start_property(struct ofpbuf *msg, uint16_t type) -{ - size_t start_ofs = msg->size; - struct ofp_prop_header *oph; - - oph = ofpbuf_put_uninit(msg, sizeof *oph); - oph->type = htons(type); - oph->len = htons(4); /* May be updated later by end_property(). */ - return start_ofs; -} - -static void -end_property(struct ofpbuf *msg, size_t start_ofs) -{ - struct ofp_prop_header *oph; - - oph = ofpbuf_at_assert(msg, start_ofs, sizeof *oph); - oph->len = htons(msg->size - start_ofs); - ofpbuf_padto(msg, ROUND_UP(msg->size, 8)); -} - -static void -put_bitmap_properties(struct ofpbuf *msg, uint64_t bitmap) -{ - for (; bitmap; bitmap = zero_rightmost_1bit(bitmap)) { - start_property(msg, rightmost_1bit_idx(bitmap)); - } -} +static enum ofputil_table_vacancy ofputil_decode_table_vacancy( + ovs_be32 config, enum ofp_version); +static enum ofputil_table_eviction ofputil_decode_table_eviction( + ovs_be32 config, enum ofp_version); +static ovs_be32 ofputil_encode_table_config(enum ofputil_table_miss, + enum ofputil_table_eviction, + enum ofputil_table_vacancy, + enum ofp_version); /* Given the wildcard bit count in the least-significant 6 of 'wcbits', returns * an IP netmask with a 1 in each bit that must match and a 0 in each bit that @@ -195,7 +99,7 @@ ofputil_netmask_to_wcbits(ovs_be32 netmask) void ofputil_wildcard_from_ofpfw10(uint32_t ofpfw, struct flow_wildcards *wc) { - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 31); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 35); /* Initialize most of wc. */ flow_wildcards_init_catchall(wc); @@ -224,10 +128,10 @@ ofputil_wildcard_from_ofpfw10(uint32_t ofpfw, struct flow_wildcards *wc) } if (!(ofpfw & OFPFW10_DL_SRC)) { - memset(wc->masks.dl_src, 0xff, ETH_ADDR_LEN); + WC_MASK_FIELD(wc, dl_src); } if (!(ofpfw & OFPFW10_DL_DST)) { - memset(wc->masks.dl_dst, 0xff, ETH_ADDR_LEN); + WC_MASK_FIELD(wc, dl_dst); } if (!(ofpfw & OFPFW10_DL_TYPE)) { wc->masks.dl_type = OVS_BE16_MAX; @@ -260,8 +164,8 @@ ofputil_match_from_ofp10_match(const struct ofp10_match *ofmatch, match->flow.dl_type = ofputil_dl_type_from_openflow(ofmatch->dl_type); match->flow.tp_src = ofmatch->tp_src; match->flow.tp_dst = ofmatch->tp_dst; - memcpy(match->flow.dl_src, ofmatch->dl_src, ETH_ADDR_LEN); - memcpy(match->flow.dl_dst, ofmatch->dl_dst, ETH_ADDR_LEN); + match->flow.dl_src = ofmatch->dl_src; + match->flow.dl_dst = ofmatch->dl_dst; match->flow.nw_tos = ofmatch->nw_tos & IP_DSCP_MASK; match->flow.nw_proto = ofmatch->nw_proto; @@ -340,7 +244,6 @@ ofputil_match_to_ofp10_match(const struct match *match, } else if (match->wc.masks.vlan_tci & htons(VLAN_CFI) && !(match->flow.vlan_tci & htons(VLAN_CFI))) { ofmatch->dl_vlan = htons(OFP10_VLAN_NONE); - ofpfw |= OFPFW10_DL_VLAN_PCP; } else { if (!(match->wc.masks.vlan_tci & htons(VLAN_VID_MASK))) { ofpfw |= OFPFW10_DL_VLAN; @@ -358,8 +261,8 @@ ofputil_match_to_ofp10_match(const struct match *match, /* Compose most of the match structure. */ ofmatch->wildcards = htonl(ofpfw); ofmatch->in_port = htons(ofp_to_u16(match->flow.in_port.ofp_port)); - memcpy(ofmatch->dl_src, match->flow.dl_src, ETH_ADDR_LEN); - memcpy(ofmatch->dl_dst, match->flow.dl_dst, ETH_ADDR_LEN); + ofmatch->dl_src = match->flow.dl_src; + ofmatch->dl_dst = match->flow.dl_dst; ofmatch->dl_type = ofputil_dl_type_to_openflow(match->flow.dl_type); ofmatch->nw_src = match->flow.nw_src; ofmatch->nw_dst = match->flow.nw_dst; @@ -416,10 +319,7 @@ ofputil_match_from_ofp11_match(const struct ofp11_match *ofmatch, struct match *match) { uint16_t wc = ntohl(ofmatch->wildcards); - uint8_t dl_src_mask[ETH_ADDR_LEN]; - uint8_t dl_dst_mask[ETH_ADDR_LEN]; bool ipv4, arp, rarp; - int i; match_init_catchall(match); @@ -434,15 +334,10 @@ ofputil_match_from_ofp11_match(const struct ofp11_match *ofmatch, match_set_in_port(match, ofp_port); } - for (i = 0; i < ETH_ADDR_LEN; i++) { - dl_src_mask[i] = ~ofmatch->dl_src_mask[i]; - } - match_set_dl_src_masked(match, ofmatch->dl_src, dl_src_mask); - - for (i = 0; i < ETH_ADDR_LEN; i++) { - dl_dst_mask[i] = ~ofmatch->dl_dst_mask[i]; - } - match_set_dl_dst_masked(match, ofmatch->dl_dst, dl_dst_mask); + match_set_dl_src_masked(match, ofmatch->dl_src, + eth_addr_invert(ofmatch->dl_src_mask)); + match_set_dl_dst_masked(match, ofmatch->dl_dst, + eth_addr_invert(ofmatch->dl_dst_mask)); if (!(wc & OFPFW11_DL_VLAN)) { if (ofmatch->dl_vlan == htons(OFPVID11_NONE)) { @@ -569,7 +464,6 @@ ofputil_match_to_ofp11_match(const struct match *match, struct ofp11_match *ofmatch) { uint32_t wc = 0; - int i; memset(ofmatch, 0, sizeof *ofmatch); ofmatch->omh.type = htons(OFPMT_STANDARD); @@ -581,15 +475,10 @@ ofputil_match_to_ofp11_match(const struct match *match, ofmatch->in_port = ofputil_port_to_ofp11(match->flow.in_port.ofp_port); } - memcpy(ofmatch->dl_src, match->flow.dl_src, ETH_ADDR_LEN); - for (i = 0; i < ETH_ADDR_LEN; i++) { - ofmatch->dl_src_mask[i] = ~match->wc.masks.dl_src[i]; - } - - memcpy(ofmatch->dl_dst, match->flow.dl_dst, ETH_ADDR_LEN); - for (i = 0; i < ETH_ADDR_LEN; i++) { - ofmatch->dl_dst_mask[i] = ~match->wc.masks.dl_dst[i]; - } + ofmatch->dl_src = match->flow.dl_src; + ofmatch->dl_src_mask = eth_addr_invert(match->wc.masks.dl_src); + ofmatch->dl_dst = match->flow.dl_dst; + ofmatch->dl_dst_mask = eth_addr_invert(match->wc.masks.dl_dst); if (match->wc.masks.vlan_tci == htons(0)) { wc |= OFPFW11_DL_VLAN | OFPFW11_DL_VLAN_PCP; @@ -1236,8 +1125,9 @@ bool ofputil_packet_in_format_is_valid(enum nx_packet_in_format packet_in_format) { switch (packet_in_format) { - case NXPIF_OPENFLOW10: - case NXPIF_NXM: + case NXPIF_STANDARD: + case NXPIF_NXT_PACKET_IN: + case NXPIF_NXT_PACKET_IN2: return true; } @@ -1248,10 +1138,12 @@ const char * ofputil_packet_in_format_to_string(enum nx_packet_in_format packet_in_format) { switch (packet_in_format) { - case NXPIF_OPENFLOW10: - return "openflow10"; - case NXPIF_NXM: - return "nxm"; + case NXPIF_STANDARD: + return "standard"; + case NXPIF_NXT_PACKET_IN: + return "nxt_packet_in"; + case NXPIF_NXT_PACKET_IN2: + return "nxt_packet_in2"; default: OVS_NOT_REACHED(); } @@ -1260,8 +1152,12 @@ ofputil_packet_in_format_to_string(enum nx_packet_in_format packet_in_format) int ofputil_packet_in_format_from_string(const char *s) { - return (!strcmp(s, "openflow10") ? NXPIF_OPENFLOW10 - : !strcmp(s, "nxm") ? NXPIF_NXM + return (!strcmp(s, "standard") || !strcmp(s, "openflow10") + ? NXPIF_STANDARD + : !strcmp(s, "nxt_packet_in") || !strcmp(s, "nxm") + ? NXPIF_NXT_PACKET_IN + : !strcmp(s, "nxt_packet_in2") + ? NXPIF_NXT_PACKET_IN2 : -1); } @@ -1317,7 +1213,7 @@ ofputil_decode_hello_bitmap(const struct ofp_hello_elem_header *oheh, /* Only use the first 32-bit element of the bitmap as that is all the * current implementation supports. Subsequent elements are ignored which - * should have no effect on session negotiation until Open vSwtich supports + * should have no effect on session negotiation until Open vSwitch supports * wire-protocol versions greater than 31. */ allowed_versions = ntohl(bitmap[0]); @@ -1355,13 +1251,12 @@ version_bitmap_from_version(uint8_t ofp_version) bool ofputil_decode_hello(const struct ofp_header *oh, uint32_t *allowed_versions) { - struct ofpbuf msg; - bool ok = true; - - ofpbuf_use_const(&msg, oh, ntohs(oh->length)); + struct ofpbuf msg = ofpbuf_const_initializer(oh, ntohs(oh->length)); ofpbuf_pull(&msg, sizeof *oh); *allowed_versions = version_bitmap_from_version(oh->version); + + bool ok = true; while (msg.size) { const struct ofp_hello_elem_header *oheh; unsigned int len; @@ -1656,14 +1551,12 @@ ofputil_decode_flow_mod(struct ofputil_flow_mod *fm, { ovs_be16 raw_flags; enum ofperr error; - struct ofpbuf b; - enum ofpraw raw; /* Ignored for non-delete actions */ fm->delete_reason = OFPRR_DELETE; - ofpbuf_use_const(&b, oh, ntohs(oh->length)); - raw = ofpraw_pull_assert(&b); + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); + enum ofpraw raw = ofpraw_pull_assert(&b); if (raw == OFPRAW_OFPT11_FLOW_MOD) { /* Standard OpenFlow 1.1+ flow_mod. */ const struct ofp11_flow_mod *ofm; @@ -1724,7 +1617,7 @@ ofputil_decode_flow_mod(struct ofputil_flow_mod *fm, fm->out_group = (ofm->command == OFPFC_DELETE || ofm->command == OFPFC_DELETE_STRICT ? ntohl(ofm->out_group) - : OFPG11_ANY); + : OFPG_ANY); raw_flags = ofm->flags; } else { uint16_t command; @@ -1756,7 +1649,7 @@ ofputil_decode_flow_mod(struct ofputil_flow_mod *fm, fm->importance = 0; fm->buffer_id = ntohl(ofm->buffer_id); fm->out_port = u16_to_ofp(ntohs(ofm->out_port)); - fm->out_group = OFPG11_ANY; + fm->out_group = OFPG_ANY; raw_flags = ofm->flags; } else if (raw == OFPRAW_NXT_FLOW_MOD) { /* Nicira extended flow_mod. */ @@ -1784,7 +1677,7 @@ ofputil_decode_flow_mod(struct ofputil_flow_mod *fm, fm->importance = 0; fm->buffer_id = ntohl(nfm->buffer_id); fm->out_port = u16_to_ofp(ntohs(nfm->out_port)); - fm->out_group = OFPG11_ANY; + fm->out_group = OFPG_ANY; raw_flags = nfm->flags; } else { OVS_NOT_REACHED(); @@ -1795,11 +1688,19 @@ ofputil_decode_flow_mod(struct ofputil_flow_mod *fm, fm->command = command & 0xff; fm->table_id = command >> 8; } else { + if (command > 0xff) { + VLOG_WARN_RL(&bad_ofmsg_rl, "flow_mod has explicit table_id " + "but flow_mod_table_id extension is not enabled"); + } fm->command = command; fm->table_id = 0xff; } } + if (fm->command > OFPFC_DELETE_STRICT) { + return OFPERR_OFPFMFC_BAD_COMMAND; + } + error = ofpacts_pull_openflow_instructions(&b, b.size, oh->version, ofpacts); if (error) { @@ -1876,12 +1777,9 @@ ofputil_decode_meter_mod(const struct ofp_header *oh, struct ofputil_meter_mod *mm, struct ofpbuf *bands) { - const struct ofp13_meter_mod *omm; - struct ofpbuf b; - - ofpbuf_use_const(&b, oh, ntohs(oh->length)); + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); ofpraw_pull_assert(&b); - omm = ofpbuf_pull(&b, sizeof *omm); + const struct ofp13_meter_mod *omm = ofpbuf_pull(&b, sizeof *omm); /* Translate the message. */ mm->command = ntohs(omm->command); @@ -1983,12 +1881,14 @@ ofputil_append_meter_config(struct ovs_list *replies, { struct ofpbuf *msg = ofpbuf_from_list(list_back(replies)); size_t start_ofs = msg->size; - struct ofp13_meter_config *reply = ofpbuf_put_uninit(msg, sizeof *reply); - reply->flags = htons(mc->flags); - reply->meter_id = htonl(mc->meter_id); + struct ofp13_meter_config *reply; + ofpbuf_put_uninit(msg, sizeof *reply); ofputil_put_bands(mc->n_bands, mc->bands, msg); + reply = ofpbuf_at_assert(msg, start_ofs, sizeof *reply); + reply->flags = htons(mc->flags); + reply->meter_id = htonl(mc->meter_id); reply->length = htons(msg->size - start_ofs); ofpmp_postappend(replies, start_ofs); @@ -2337,7 +2237,7 @@ ofputil_decode_ofpst10_flow_request(struct ofputil_flow_stats_request *fsr, fsr->aggregate = aggregate; ofputil_match_from_ofp10_match(&ofsr->match, &fsr->match); fsr->out_port = u16_to_ofp(ntohs(ofsr->out_port)); - fsr->out_group = OFPG11_ANY; + fsr->out_group = OFPG_ANY; fsr->table_id = ofsr->table_id; fsr->cookie = fsr->cookie_mask = htonll(0); @@ -2388,17 +2288,21 @@ ofputil_decode_nxst_flow_request(struct ofputil_flow_stats_request *fsr, fsr->aggregate = aggregate; fsr->out_port = u16_to_ofp(ntohs(nfsr->out_port)); - fsr->out_group = OFPG11_ANY; + fsr->out_group = OFPG_ANY; fsr->table_id = nfsr->table_id; return 0; } /* Constructs and returns an OFPT_QUEUE_GET_CONFIG request for the specified - * 'port', suitable for OpenFlow version 'version'. */ + * 'port' and 'queue', suitable for OpenFlow version 'version'. + * + * 'queue' is honored only for OpenFlow 1.4 and later; older versions always + * request all queues. */ struct ofpbuf * ofputil_encode_queue_get_config_request(enum ofp_version version, - ofp_port_t port) + ofp_port_t port, + uint32_t queue) { struct ofpbuf *request; @@ -2409,13 +2313,21 @@ ofputil_encode_queue_get_config_request(enum ofp_version version, version, 0); qgcr10 = ofpbuf_put_zeros(request, sizeof *qgcr10); qgcr10->port = htons(ofp_to_u16(port)); - } else { + } else if (version < OFP14_VERSION) { struct ofp11_queue_get_config_request *qgcr11; request = ofpraw_alloc(OFPRAW_OFPT11_QUEUE_GET_CONFIG_REQUEST, version, 0); qgcr11 = ofpbuf_put_zeros(request, sizeof *qgcr11); qgcr11->port = ofputil_port_to_ofp11(port); + } else { + struct ofp14_queue_desc_request *qdr14; + + request = ofpraw_alloc(OFPRAW_OFPST14_QUEUE_DESC_REQUEST, + version, 0); + qdr14 = ofpbuf_put_zeros(request, sizeof *qdr14); + qdr14->port = ofputil_port_to_ofp11(port); + qdr14->queue = htonl(queue); } return request; @@ -2426,78 +2338,96 @@ ofputil_encode_queue_get_config_request(enum ofp_version version, * code. */ enum ofperr ofputil_decode_queue_get_config_request(const struct ofp_header *oh, - ofp_port_t *port) + ofp_port_t *port, uint32_t *queue) { const struct ofp10_queue_get_config_request *qgcr10; const struct ofp11_queue_get_config_request *qgcr11; - enum ofpraw raw; - struct ofpbuf b; - - ofpbuf_use_const(&b, oh, ntohs(oh->length)); - raw = ofpraw_pull_assert(&b); + const struct ofp14_queue_desc_request *qdr14; + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); + enum ofpraw raw = ofpraw_pull_assert(&b); switch ((int) raw) { case OFPRAW_OFPT10_QUEUE_GET_CONFIG_REQUEST: qgcr10 = b.data; *port = u16_to_ofp(ntohs(qgcr10->port)); - return 0; + *queue = OFPQ_ALL; + break; case OFPRAW_OFPT11_QUEUE_GET_CONFIG_REQUEST: qgcr11 = b.data; - return ofputil_port_from_ofp11(qgcr11->port, port); + *queue = OFPQ_ALL; + enum ofperr error = ofputil_port_from_ofp11(qgcr11->port, port); + if (error || *port == OFPP_ANY) { + return error; + } + break; + + case OFPRAW_OFPST14_QUEUE_DESC_REQUEST: + qdr14 = b.data; + *queue = ntohl(qdr14->queue); + return ofputil_port_from_ofp11(qdr14->port, port); + + default: + OVS_NOT_REACHED(); } - OVS_NOT_REACHED(); + return (ofp_to_u16(*port) < ofp_to_u16(OFPP_MAX) + ? 0 + : OFPERR_OFPQOFC_BAD_PORT); } /* Constructs and returns the beginning of a reply to - * OFPT_QUEUE_GET_CONFIG_REQUEST 'oh'. The caller may append information about - * individual queues with ofputil_append_queue_get_config_reply(). */ -struct ofpbuf * -ofputil_encode_queue_get_config_reply(const struct ofp_header *oh) + * OFPT_QUEUE_GET_CONFIG_REQUEST or OFPMP_QUEUE_DESC request 'oh'. The caller + * may append information about individual queues with + * ofputil_append_queue_get_config_reply(). */ +void +ofputil_start_queue_get_config_reply(const struct ofp_header *request, + struct ovs_list *replies) { - struct ofp10_queue_get_config_reply *qgcr10; - struct ofp11_queue_get_config_reply *qgcr11; struct ofpbuf *reply; enum ofperr error; - struct ofpbuf b; - enum ofpraw raw; ofp_port_t port; + uint32_t queue; - error = ofputil_decode_queue_get_config_request(oh, &port); + error = ofputil_decode_queue_get_config_request(request, &port, &queue); ovs_assert(!error); - ofpbuf_use_const(&b, oh, ntohs(oh->length)); - raw = ofpraw_pull_assert(&b); - + enum ofpraw raw = ofpraw_decode_assert(request); switch ((int) raw) { case OFPRAW_OFPT10_QUEUE_GET_CONFIG_REQUEST: reply = ofpraw_alloc_reply(OFPRAW_OFPT10_QUEUE_GET_CONFIG_REPLY, - oh, 0); - qgcr10 = ofpbuf_put_zeros(reply, sizeof *qgcr10); + request, 0); + struct ofp10_queue_get_config_reply *qgcr10 + = ofpbuf_put_zeros(reply, sizeof *qgcr10); qgcr10->port = htons(ofp_to_u16(port)); break; case OFPRAW_OFPT11_QUEUE_GET_CONFIG_REQUEST: reply = ofpraw_alloc_reply(OFPRAW_OFPT11_QUEUE_GET_CONFIG_REPLY, - oh, 0); - qgcr11 = ofpbuf_put_zeros(reply, sizeof *qgcr11); + request, 0); + struct ofp11_queue_get_config_reply *qgcr11 + = ofpbuf_put_zeros(reply, sizeof *qgcr11); qgcr11->port = ofputil_port_to_ofp11(port); break; + case OFPRAW_OFPST14_QUEUE_DESC_REQUEST: + reply = ofpraw_alloc_stats_reply(request, 0); + break; + default: OVS_NOT_REACHED(); } - return reply; + list_init(replies); + list_push_back(replies, &reply->list_node); } static void -put_queue_rate(struct ofpbuf *reply, enum ofp_queue_properties property, - uint16_t rate) +put_ofp10_queue_rate(struct ofpbuf *reply, + enum ofp10_queue_properties property, uint16_t rate) { if (rate != UINT16_MAX) { - struct ofp_queue_prop_rate *oqpr; + struct ofp10_queue_prop_rate *oqpr; oqpr = ofpbuf_put_zeros(reply, sizeof *oqpr); oqpr->prop_header.property = htons(property); @@ -2506,78 +2436,68 @@ put_queue_rate(struct ofpbuf *reply, enum ofp_queue_properties property, } } -/* Appends a queue description for 'queue_id' to the - * OFPT_QUEUE_GET_CONFIG_REPLY already in 'oh'. */ +static void +put_ofp14_queue_rate(struct ofpbuf *reply, + enum ofp14_queue_desc_prop_type type, uint16_t rate) +{ + if (rate != UINT16_MAX) { + ofpprop_put_u16(reply, type, rate); + } +} + void -ofputil_append_queue_get_config_reply(struct ofpbuf *reply, - const struct ofputil_queue_config *oqc) +ofputil_append_queue_get_config_reply(const struct ofputil_queue_config *qc, + struct ovs_list *replies) { - const struct ofp_header *oh = reply->data; - size_t start_ofs, len_ofs; + enum ofp_version ofp_version = ofpmp_version(replies); + struct ofpbuf *reply = ofpbuf_from_list(list_back(replies)); + size_t start_ofs = reply->size; + size_t len_ofs; ovs_be16 *len; - start_ofs = reply->size; - if (oh->version < OFP12_VERSION) { - struct ofp10_packet_queue *opq10; + if (ofp_version < OFP14_VERSION) { + if (ofp_version < OFP12_VERSION) { + struct ofp10_packet_queue *opq10; - opq10 = ofpbuf_put_zeros(reply, sizeof *opq10); - opq10->queue_id = htonl(oqc->queue_id); - len_ofs = (char *) &opq10->len - (char *) reply->data; - } else { - struct ofp11_queue_get_config_reply *qgcr11; - struct ofp12_packet_queue *opq12; - ovs_be32 port; + opq10 = ofpbuf_put_zeros(reply, sizeof *opq10); + opq10->queue_id = htonl(qc->queue); + len_ofs = (char *) &opq10->len - (char *) reply->data; + } else { + struct ofp12_packet_queue *opq12; - qgcr11 = reply->msg; - port = qgcr11->port; + opq12 = ofpbuf_put_zeros(reply, sizeof *opq12); + opq12->port = ofputil_port_to_ofp11(qc->port); + opq12->queue_id = htonl(qc->queue); + len_ofs = (char *) &opq12->len - (char *) reply->data; + } - opq12 = ofpbuf_put_zeros(reply, sizeof *opq12); - opq12->port = port; - opq12->queue_id = htonl(oqc->queue_id); - len_ofs = (char *) &opq12->len - (char *) reply->data; + put_ofp10_queue_rate(reply, OFPQT10_MIN_RATE, qc->min_rate); + put_ofp10_queue_rate(reply, OFPQT11_MAX_RATE, qc->max_rate); + } else { + struct ofp14_queue_desc *oqd = ofpbuf_put_zeros(reply, sizeof *oqd); + oqd->port_no = ofputil_port_to_ofp11(qc->port); + oqd->queue_id = htonl(qc->queue); + len_ofs = (char *) &oqd->len - (char *) reply->data; + put_ofp14_queue_rate(reply, OFPQDPT14_MIN_RATE, qc->min_rate); + put_ofp14_queue_rate(reply, OFPQDPT14_MAX_RATE, qc->max_rate); } - put_queue_rate(reply, OFPQT_MIN_RATE, oqc->min_rate); - put_queue_rate(reply, OFPQT_MAX_RATE, oqc->max_rate); - len = ofpbuf_at(reply, len_ofs, sizeof *len); *len = htons(reply->size - start_ofs); -} - -/* Decodes the initial part of an OFPT_QUEUE_GET_CONFIG_REPLY from 'reply' and - * stores in '*port' the port that the reply is about. The caller may call - * ofputil_pull_queue_get_config_reply() to obtain information about individual - * queues included in the reply. Returns 0 if successful, otherwise an - * ofperr.*/ -enum ofperr -ofputil_decode_queue_get_config_reply(struct ofpbuf *reply, ofp_port_t *port) -{ - const struct ofp10_queue_get_config_reply *qgcr10; - const struct ofp11_queue_get_config_reply *qgcr11; - enum ofpraw raw; - - raw = ofpraw_pull_assert(reply); - switch ((int) raw) { - case OFPRAW_OFPT10_QUEUE_GET_CONFIG_REPLY: - qgcr10 = ofpbuf_pull(reply, sizeof *qgcr10); - *port = u16_to_ofp(ntohs(qgcr10->port)); - return 0; - case OFPRAW_OFPT11_QUEUE_GET_CONFIG_REPLY: - qgcr11 = ofpbuf_pull(reply, sizeof *qgcr11); - return ofputil_port_from_ofp11(qgcr11->port, port); + if (ofp_version >= OFP14_VERSION) { + ofpmp_postappend(replies, start_ofs); } - - OVS_NOT_REACHED(); } static enum ofperr -parse_queue_rate(const struct ofp_queue_prop_header *hdr, uint16_t *rate) +parse_ofp10_queue_rate(const struct ofp10_queue_prop_header *hdr, + uint16_t *rate) { - const struct ofp_queue_prop_rate *oqpr; + const struct ofp10_queue_prop_rate *oqpr; if (hdr->len == htons(sizeof *oqpr)) { - oqpr = (const struct ofp_queue_prop_rate *) hdr; + oqpr = (const struct ofp10_queue_prop_rate *) hdr; *rate = ntohs(oqpr->rate); return 0; } else { @@ -2585,76 +2505,76 @@ parse_queue_rate(const struct ofp_queue_prop_header *hdr, uint16_t *rate) } } -/* Decodes information about a queue from the OFPT_QUEUE_GET_CONFIG_REPLY in - * 'reply' and stores it in '*queue'. ofputil_decode_queue_get_config_reply() - * must already have pulled off the main header. - * - * This function returns EOF if the last queue has already been decoded, 0 if a - * queue was successfully decoded into '*queue', or an ofperr if there was a - * problem decoding 'reply'. */ -int -ofputil_pull_queue_get_config_reply(struct ofpbuf *reply, - struct ofputil_queue_config *queue) +static int +ofputil_pull_queue_get_config_reply10(struct ofpbuf *msg, + struct ofputil_queue_config *queue) { - const struct ofp_header *oh; - unsigned int opq_len; - unsigned int len; + const struct ofp_header *oh = msg->header; + unsigned int opq_len; /* Length of protocol-specific queue header. */ + unsigned int len; /* Total length of queue + properties. */ - if (!reply->size) { - return EOF; + /* Obtain the port number from the message header. */ + if (oh->version == OFP10_VERSION) { + const struct ofp10_queue_get_config_reply *oqgcr10 = msg->msg; + queue->port = u16_to_ofp(ntohs(oqgcr10->port)); + } else { + const struct ofp11_queue_get_config_reply *oqgcr11 = msg->msg; + enum ofperr error = ofputil_port_from_ofp11(oqgcr11->port, + &queue->port); + if (error) { + return error; + } } - queue->min_rate = UINT16_MAX; - queue->max_rate = UINT16_MAX; - - oh = reply->header; + /* Pull off the queue header and get the queue number and length. */ if (oh->version < OFP12_VERSION) { const struct ofp10_packet_queue *opq10; - - opq10 = ofpbuf_try_pull(reply, sizeof *opq10); + opq10 = ofpbuf_try_pull(msg, sizeof *opq10); if (!opq10) { return OFPERR_OFPBRC_BAD_LEN; } - queue->queue_id = ntohl(opq10->queue_id); + queue->queue = ntohl(opq10->queue_id); len = ntohs(opq10->len); opq_len = sizeof *opq10; } else { const struct ofp12_packet_queue *opq12; - - opq12 = ofpbuf_try_pull(reply, sizeof *opq12); + opq12 = ofpbuf_try_pull(msg, sizeof *opq12); if (!opq12) { return OFPERR_OFPBRC_BAD_LEN; } - queue->queue_id = ntohl(opq12->queue_id); + queue->queue = ntohl(opq12->queue_id); len = ntohs(opq12->len); opq_len = sizeof *opq12; } - if (len < opq_len || len > reply->size + opq_len || len % 8) { + /* Length check. */ + if (len < opq_len || len > msg->size + opq_len || len % 8) { return OFPERR_OFPBRC_BAD_LEN; } len -= opq_len; + /* Pull properties. The format of these properties differs from used in + * OF1.4+ so we can't use the common property functions. */ while (len > 0) { - const struct ofp_queue_prop_header *hdr; + const struct ofp10_queue_prop_header *hdr; unsigned int property; unsigned int prop_len; enum ofperr error = 0; - hdr = ofpbuf_at_assert(reply, 0, sizeof *hdr); + hdr = ofpbuf_at_assert(msg, 0, sizeof *hdr); prop_len = ntohs(hdr->len); - if (prop_len < sizeof *hdr || prop_len > reply->size || prop_len % 8) { + if (prop_len < sizeof *hdr || prop_len > msg->size || prop_len % 8) { return OFPERR_OFPBRC_BAD_LEN; } property = ntohs(hdr->property); switch (property) { - case OFPQT_MIN_RATE: - error = parse_queue_rate(hdr, &queue->min_rate); + case OFPQT10_MIN_RATE: + error = parse_ofp10_queue_rate(hdr, &queue->min_rate); break; - case OFPQT_MAX_RATE: - error = parse_queue_rate(hdr, &queue->max_rate); + case OFPQT11_MAX_RATE: + error = parse_ofp10_queue_rate(hdr, &queue->max_rate); break; default: @@ -2665,12 +2585,107 @@ ofputil_pull_queue_get_config_reply(struct ofpbuf *reply, return error; } - ofpbuf_pull(reply, prop_len); + ofpbuf_pull(msg, prop_len); len -= prop_len; } return 0; } +static int +ofputil_pull_queue_get_config_reply14(struct ofpbuf *msg, + struct ofputil_queue_config *queue) +{ + struct ofp14_queue_desc *oqd14 = ofpbuf_try_pull(msg, sizeof *oqd14); + if (!oqd14) { + return OFPERR_OFPBRC_BAD_LEN; + } + enum ofperr error = ofputil_port_from_ofp11(oqd14->port_no, &queue->port); + if (error) { + return error; + } + queue->queue = ntohl(oqd14->queue_id); + + /* Length check. */ + unsigned int len = ntohs(oqd14->len); + if (len < sizeof *oqd14 || len > msg->size + sizeof *oqd14 || len % 8) { + return OFPERR_OFPBRC_BAD_LEN; + } + len -= sizeof *oqd14; + + struct ofpbuf properties = ofpbuf_const_initializer(ofpbuf_pull(msg, len), + len); + while (properties.size > 0) { + struct ofpbuf payload; + uint64_t type; + + error = ofpprop_pull(&properties, &payload, &type); + if (error) { + return error; + } + + switch (type) { + case OFPQDPT14_MIN_RATE: + error = ofpprop_parse_u16(&payload, &queue->min_rate); + break; + + case OFPQDPT14_MAX_RATE: + error = ofpprop_parse_u16(&payload, &queue->max_rate); + break; + + default: + error = OFPPROP_UNKNOWN(true, "queue desc", type); + break; + } + + if (error) { + return error; + } + } + + return 0; +} + +/* Decodes information about a queue from the OFPT_QUEUE_GET_CONFIG_REPLY in + * 'reply' and stores it in '*queue'. ofputil_decode_queue_get_config_reply() + * must already have pulled off the main header. + * + * This function returns EOF if the last queue has already been decoded, 0 if a + * queue was successfully decoded into '*queue', or an ofperr if there was a + * problem decoding 'reply'. */ +int +ofputil_pull_queue_get_config_reply(struct ofpbuf *msg, + struct ofputil_queue_config *queue) +{ + enum ofpraw raw; + if (!msg->header) { + /* Pull OpenFlow header. */ + raw = ofpraw_pull_assert(msg); + + /* Pull protocol-specific ofp_queue_get_config_reply header (OF1.4 + * doesn't have one at all). */ + if (raw == OFPRAW_OFPT10_QUEUE_GET_CONFIG_REPLY) { + ofpbuf_pull(msg, sizeof(struct ofp10_queue_get_config_reply)); + } else if (raw == OFPRAW_OFPT11_QUEUE_GET_CONFIG_REPLY) { + ofpbuf_pull(msg, sizeof(struct ofp11_queue_get_config_reply)); + } else { + ovs_assert(raw == OFPRAW_OFPST14_QUEUE_DESC_REPLY); + } + } else { + raw = ofpraw_decode_assert(msg->header); + } + + queue->min_rate = UINT16_MAX; + queue->max_rate = UINT16_MAX; + + if (!msg->size) { + return EOF; + } else if (raw == OFPRAW_OFPST14_QUEUE_DESC_REPLY) { + return ofputil_pull_queue_get_config_reply14(msg, queue); + } else { + return ofputil_pull_queue_get_config_reply10(msg, queue); + } +} + /* Converts an OFPST_FLOW, OFPST_AGGREGATE, NXST_FLOW, or NXST_AGGREGATE * request 'oh', into an abstract flow_stats_request in 'fsr'. Returns 0 if * successful, otherwise an OpenFlow error code. */ @@ -2678,11 +2693,8 @@ enum ofperr ofputil_decode_flow_stats_request(struct ofputil_flow_stats_request *fsr, const struct ofp_header *oh) { - enum ofpraw raw; - struct ofpbuf b; - - ofpbuf_use_const(&b, oh, ntohs(oh->length)); - raw = ofpraw_pull_assert(&b); + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); + enum ofpraw raw = ofpraw_pull_assert(&b); switch ((int) raw) { case OFPRAW_OFPST10_FLOW_REQUEST: return ofputil_decode_ofpst10_flow_request(fsr, b.data, false); @@ -3110,13 +3122,10 @@ enum ofperr ofputil_decode_aggregate_stats_reply(struct ofputil_aggregate_stats *stats, const struct ofp_header *reply) { - struct ofp_aggregate_stats_reply *asr; - struct ofpbuf msg; - - ofpbuf_use_const(&msg, reply, ntohs(reply->length)); + struct ofpbuf msg = ofpbuf_const_initializer(reply, ntohs(reply->length)); ofpraw_pull_assert(&msg); - asr = msg.msg; + struct ofp_aggregate_stats_reply *asr = msg.msg; stats->packet_count = ntohll(get_32aligned_be64(&asr->packet_count)); stats->byte_count = ntohll(get_32aligned_be64(&asr->byte_count)); stats->flow_count = ntohl(asr->flow_count); @@ -3131,11 +3140,8 @@ enum ofperr ofputil_decode_flow_removed(struct ofputil_flow_removed *fr, const struct ofp_header *oh) { - enum ofpraw raw; - struct ofpbuf b; - - ofpbuf_use_const(&b, oh, ntohs(oh->length)); - raw = ofpraw_pull_assert(&b); + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); + enum ofpraw raw = ofpraw_pull_assert(&b); if (raw == OFPRAW_OFPT11_FLOW_REMOVED) { const struct ofp12_flow_removed *ofr; enum ofperr error; @@ -3295,82 +3301,177 @@ ofputil_encode_flow_removed(const struct ofputil_flow_removed *fr, return msg; } -static void -ofputil_decode_packet_in_finish(struct ofputil_packet_in *pin, - struct match *match, struct ofpbuf *b) -{ - pin->packet = b->data; - pin->packet_len = b->size; - - pin->fmd.in_port = match->flow.in_port.ofp_port; - pin->fmd.tun_id = match->flow.tunnel.tun_id; - pin->fmd.tun_src = match->flow.tunnel.ip_src; - pin->fmd.tun_dst = match->flow.tunnel.ip_dst; - pin->fmd.gbp_id = match->flow.tunnel.gbp_id; - pin->fmd.gbp_flags = match->flow.tunnel.gbp_flags; - pin->fmd.metadata = match->flow.metadata; - memcpy(pin->fmd.regs, match->flow.regs, sizeof pin->fmd.regs); - pin->fmd.pkt_mark = match->flow.pkt_mark; -} - -enum ofperr -ofputil_decode_packet_in(struct ofputil_packet_in *pin, - const struct ofp_header *oh) +/* The caller has done basic initialization of '*pin'; the other output + * arguments needs to be initialized. */ +static enum ofperr +decode_nx_packet_in2(const struct ofp_header *oh, bool loose, + struct ofputil_packet_in *pin, + size_t *total_len, uint32_t *buffer_id, + struct ofpbuf *continuation) { - enum ofpraw raw; - struct ofpbuf b; + *total_len = 0; + *buffer_id = UINT32_MAX; - memset(pin, 0, sizeof *pin); - pin->cookie = OVS_BE64_MAX; - - ofpbuf_use_const(&b, oh, ntohs(oh->length)); - raw = ofpraw_pull_assert(&b); - if (raw == OFPRAW_OFPT13_PACKET_IN || raw == OFPRAW_OFPT12_PACKET_IN) { - const struct ofp13_packet_in *opi; - struct match match; - int error; - size_t packet_in_size; + struct ofpbuf properties; + ofpbuf_use_const(&properties, oh, ntohs(oh->length)); + ofpraw_pull_assert(&properties); - if (raw == OFPRAW_OFPT12_PACKET_IN) { - packet_in_size = sizeof (struct ofp12_packet_in); - } else { - packet_in_size = sizeof (struct ofp13_packet_in); - } + while (properties.size > 0) { + struct ofpbuf payload; + uint64_t type; - opi = ofpbuf_pull(&b, packet_in_size); - error = oxm_pull_match_loose(&b, &match); + enum ofperr error = ofpprop_pull(&properties, &payload, &type); if (error) { return error; } - if (!ofpbuf_try_pull(&b, 2)) { - return OFPERR_OFPBRC_BAD_LEN; - } - - pin->reason = opi->pi.reason; - pin->table_id = opi->pi.table_id; - pin->buffer_id = ntohl(opi->pi.buffer_id); - pin->total_len = ntohs(opi->pi.total_len); + switch (type) { + case NXPINT_PACKET: + pin->packet = payload.msg; + pin->packet_len = ofpbuf_msgsize(&payload); + break; - if (raw == OFPRAW_OFPT13_PACKET_IN) { - pin->cookie = opi->cookie; + case NXPINT_FULL_LEN: { + uint32_t u32; + error = ofpprop_parse_u32(&payload, &u32); + *total_len = u32; + break; } - ofputil_decode_packet_in_finish(pin, &match, &b); - } else if (raw == OFPRAW_OFPT10_PACKET_IN) { - const struct ofp10_packet_in *opi; + case NXPINT_BUFFER_ID: + error = ofpprop_parse_u32(&payload, buffer_id); + break; - opi = ofpbuf_pull(&b, offsetof(struct ofp10_packet_in, data)); + case NXPINT_TABLE_ID: + error = ofpprop_parse_u8(&payload, &pin->table_id); + break; - pin->packet = opi->data; + case NXPINT_COOKIE: + error = ofpprop_parse_be64(&payload, &pin->cookie); + break; + + case NXPINT_REASON: { + uint8_t reason; + error = ofpprop_parse_u8(&payload, &reason); + pin->reason = reason; + break; + } + + case NXPINT_METADATA: + error = oxm_decode_match(payload.msg, ofpbuf_msgsize(&payload), + &pin->flow_metadata); + break; + + case NXPINT_USERDATA: + pin->userdata = payload.msg; + pin->userdata_len = ofpbuf_msgsize(&payload); + break; + + case NXPINT_CONTINUATION: + if (continuation) { + error = ofpprop_parse_nested(&payload, continuation); + } + break; + + default: + error = OFPPROP_UNKNOWN(loose, "NX_PACKET_IN2", type); + break; + } + if (error) { + return error; + } + } + + if (!pin->packet_len) { + VLOG_WARN_RL(&bad_ofmsg_rl, "NXT_PACKET_IN2 lacks packet"); + return OFPERR_OFPBRC_BAD_LEN; + } else if (!*total_len) { + *total_len = pin->packet_len; + } else if (*total_len < pin->packet_len) { + VLOG_WARN_RL(&bad_ofmsg_rl, "NXT_PACKET_IN2 claimed full_len < len"); + return OFPERR_OFPBRC_BAD_LEN; + } + + return 0; +} + +/* Decodes the packet-in message starting at 'oh' into '*pin'. Populates + * 'pin->packet' and 'pin->packet_len' with the part of the packet actually + * included in the message. If 'total_lenp' is nonnull, populates + * '*total_lenp' with the original length of the packet (which is larger than + * 'packet->len' if only part of the packet was included). If 'buffer_idp' is + * nonnull, stores the packet's buffer ID in '*buffer_idp' (UINT32_MAX if it + * was not buffered). + * + * Populates 'continuation', if nonnull, with the continuation data from the + * packet-in (an empty buffer, if 'oh' did not contain continuation data). The + * format of this data is supposed to be opaque to anything other than + * ovs-vswitchd, so that in any other process the only reasonable use of this + * data is to be copied into an NXT_RESUME message via ofputil_encode_resume(). + * + * This function points 'pin->packet' into 'oh', so the caller should not free + * it separately from the original OpenFlow message. This is also true for + * 'pin->userdata' (which could also end up NULL if there is no userdata). + * + * Returns 0 if successful, otherwise an OpenFlow error code. */ +enum ofperr +ofputil_decode_packet_in(const struct ofp_header *oh, bool loose, + struct ofputil_packet_in *pin, + size_t *total_lenp, uint32_t *buffer_idp, + struct ofpbuf *continuation) +{ + uint32_t buffer_id; + size_t total_len; + + memset(pin, 0, sizeof *pin); + pin->cookie = OVS_BE64_MAX; + if (continuation) { + ofpbuf_use_const(continuation, NULL, 0); + } + + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); + enum ofpraw raw = ofpraw_pull_assert(&b); + if (raw == OFPRAW_OFPT13_PACKET_IN || raw == OFPRAW_OFPT12_PACKET_IN) { + const struct ofp12_packet_in *opi = ofpbuf_pull(&b, sizeof *opi); + const ovs_be64 *cookie = (raw == OFPRAW_OFPT13_PACKET_IN + ? ofpbuf_pull(&b, sizeof *cookie) + : NULL); + enum ofperr error = oxm_pull_match_loose(&b, &pin->flow_metadata); + if (error) { + return error; + } + + if (!ofpbuf_try_pull(&b, 2)) { + return OFPERR_OFPBRC_BAD_LEN; + } + + pin->reason = opi->reason; + pin->table_id = opi->table_id; + buffer_id = ntohl(opi->buffer_id); + total_len = ntohs(opi->total_len); + if (cookie) { + pin->cookie = *cookie; + } + + pin->packet = b.data; + pin->packet_len = b.size; + } else if (raw == OFPRAW_OFPT10_PACKET_IN) { + const struct ofp10_packet_in *opi; + + opi = ofpbuf_pull(&b, offsetof(struct ofp10_packet_in, data)); + + pin->packet = CONST_CAST(uint8_t *, opi->data); pin->packet_len = b.size; - pin->fmd.in_port = u16_to_ofp(ntohs(opi->in_port)); + match_init_catchall(&pin->flow_metadata); + match_set_in_port(&pin->flow_metadata, + u16_to_ofp(ntohs(opi->in_port))); pin->reason = opi->reason; - pin->buffer_id = ntohl(opi->buffer_id); - pin->total_len = ntohs(opi->total_len); + buffer_id = ntohl(opi->buffer_id); + total_len = ntohs(opi->total_len); } else if (raw == OFPRAW_OFPT11_PACKET_IN) { const struct ofp11_packet_in *opi; + ofp_port_t in_port; enum ofperr error; opi = ofpbuf_pull(&b, sizeof *opi); @@ -3378,22 +3479,23 @@ ofputil_decode_packet_in(struct ofputil_packet_in *pin, pin->packet = b.data; pin->packet_len = b.size; - pin->buffer_id = ntohl(opi->buffer_id); - error = ofputil_port_from_ofp11(opi->in_port, &pin->fmd.in_port); + buffer_id = ntohl(opi->buffer_id); + error = ofputil_port_from_ofp11(opi->in_port, &in_port); if (error) { return error; } - pin->total_len = ntohs(opi->total_len); + match_init_catchall(&pin->flow_metadata); + match_set_in_port(&pin->flow_metadata, in_port); + total_len = ntohs(opi->total_len); pin->reason = opi->reason; pin->table_id = opi->table_id; } else if (raw == OFPRAW_NXT_PACKET_IN) { const struct nx_packet_in *npi; - struct match match; int error; npi = ofpbuf_pull(&b, sizeof *npi); - error = nx_pull_match_loose(&b, ntohs(npi->match_len), &match, NULL, - NULL); + error = nx_pull_match_loose(&b, ntohs(npi->match_len), + &pin->flow_metadata, NULL, NULL); if (error) { return error; } @@ -3406,206 +3508,411 @@ ofputil_decode_packet_in(struct ofputil_packet_in *pin, pin->table_id = npi->table_id; pin->cookie = npi->cookie; - pin->buffer_id = ntohl(npi->buffer_id); - pin->total_len = ntohs(npi->total_len); + buffer_id = ntohl(npi->buffer_id); + total_len = ntohs(npi->total_len); - ofputil_decode_packet_in_finish(pin, &match, &b); + pin->packet = b.data; + pin->packet_len = b.size; + } else if (raw == OFPRAW_NXT_PACKET_IN2 || raw == OFPRAW_NXT_RESUME) { + enum ofperr error = decode_nx_packet_in2(oh, loose, pin, &total_len, + &buffer_id, continuation); + if (error) { + return error; + } } else { OVS_NOT_REACHED(); } + if (total_lenp) { + *total_lenp = total_len; + } + if (buffer_idp) { + *buffer_idp = buffer_id; + } + return 0; } -static void -ofputil_packet_in_to_match(const struct ofputil_packet_in *pin, - struct match *match) +static int +encode_packet_in_reason(enum ofp_packet_in_reason reason, + enum ofp_version version) { - int i; + switch (reason) { + case OFPR_NO_MATCH: + case OFPR_ACTION: + case OFPR_INVALID_TTL: + return reason; - match_init_catchall(match); - if (pin->fmd.tun_id != htonll(0)) { - match_set_tun_id(match, pin->fmd.tun_id); + case OFPR_ACTION_SET: + case OFPR_GROUP: + case OFPR_PACKET_OUT: + return version < OFP14_VERSION ? OFPR_ACTION : reason; + + case OFPR_EXPLICIT_MISS: + return version < OFP13_VERSION ? OFPR_ACTION : OFPR_NO_MATCH; + + case OFPR_IMPLICIT_MISS: + return OFPR_NO_MATCH; + + case OFPR_N_REASONS: + default: + OVS_NOT_REACHED(); + } +} + +/* Only NXT_PACKET_IN2 (not NXT_RESUME) should include NXCPT_USERDATA, so this + * function omits it. The caller can add it itself if desired. */ +static void +ofputil_put_packet_in(const struct ofputil_packet_in *pin, + enum ofp_version version, uint32_t buffer_id, + size_t include_bytes, struct ofpbuf *msg) +{ + /* Add packet properties. */ + ofpprop_put(msg, NXPINT_PACKET, pin->packet, include_bytes); + if (include_bytes != pin->packet_len) { + ofpprop_put_u32(msg, NXPINT_FULL_LEN, pin->packet_len); + } + if (buffer_id != UINT32_MAX) { + ofpprop_put_u32(msg, NXPINT_BUFFER_ID, buffer_id); } - if (pin->fmd.tun_src != htonl(0)) { - match_set_tun_src(match, pin->fmd.tun_src); + + /* Add flow properties. */ + ofpprop_put_u8(msg, NXPINT_TABLE_ID, pin->table_id); + if (pin->cookie != OVS_BE64_MAX) { + ofpprop_put_be64(msg, NXPINT_COOKIE, pin->cookie); } - if (pin->fmd.tun_dst != htonl(0)) { - match_set_tun_dst(match, pin->fmd.tun_dst); + + /* Add other properties. */ + ofpprop_put_u8(msg, NXPINT_REASON, + encode_packet_in_reason(pin->reason, version)); + + size_t start = ofpprop_start(msg, NXPINT_METADATA); + oxm_put_raw(msg, &pin->flow_metadata, version); + ofpprop_end(msg, start); +} + +static void +put_actions_property(struct ofpbuf *msg, uint64_t prop_type, + enum ofp_version version, + const struct ofpact *actions, size_t actions_len) +{ + if (actions_len) { + size_t start = ofpprop_start_nested(msg, prop_type); + ofpacts_put_openflow_actions(actions, actions_len, msg, version); + ofpprop_end(msg, start); + } +} + +enum nx_continuation_prop_type { + NXCPT_BRIDGE = 0x8000, + NXCPT_STACK, + NXCPT_MIRRORS, + NXCPT_CONNTRACKED, + NXCPT_TABLE_ID, + NXCPT_COOKIE, + NXCPT_ACTIONS, + NXCPT_ACTION_SET, +}; + +/* Only NXT_PACKET_IN2 (not NXT_RESUME) should include NXCPT_USERDATA, so this + * function omits it. The caller can add it itself if desired. */ +static void +ofputil_put_packet_in_private(const struct ofputil_packet_in_private *pin, + enum ofp_version version, uint32_t buffer_id, + size_t include_bytes, struct ofpbuf *msg) +{ + ofputil_put_packet_in(&pin->public, version, buffer_id, + include_bytes, msg); + + size_t continuation_ofs = ofpprop_start_nested(msg, NXPINT_CONTINUATION); + size_t inner_ofs = msg->size; + + if (!uuid_is_zero(&pin->bridge)) { + ofpprop_put_uuid(msg, NXCPT_BRIDGE, &pin->bridge); } - if (pin->fmd.gbp_id != htons(0)) { - match_set_tun_gbp_id(match, pin->fmd.gbp_id); + + for (size_t i = 0; i < pin->n_stack; i++) { + const union mf_subvalue *s = &pin->stack[i]; + size_t ofs; + for (ofs = 0; ofs < sizeof *s; ofs++) { + if (s->u8[ofs]) { + break; + } + } + + ofpprop_put(msg, NXCPT_STACK, &s->u8[ofs], sizeof *s - ofs); } - if (pin->fmd.gbp_flags) { - match_set_tun_gbp_flags(match, pin->fmd.gbp_flags); + + if (pin->mirrors) { + ofpprop_put_u32(msg, NXCPT_MIRRORS, pin->mirrors); } - if (pin->fmd.metadata != htonll(0)) { - match_set_metadata(match, pin->fmd.metadata); + + if (pin->conntracked) { + ofpprop_put_flag(msg, NXCPT_CONNTRACKED); } - for (i = 0; i < FLOW_N_REGS; i++) { - if (pin->fmd.regs[i]) { - match_set_reg(match, i, pin->fmd.regs[i]); + if (pin->actions_len) { + /* Divide 'pin->actions' into groups that begins with an + * unroll_xlate action. For each group, emit a NXCPT_TABLE_ID and + * NXCPT_COOKIE property (if either has changed; each is initially + * assumed 0), then a NXCPT_ACTIONS property with the grouped + * actions. + * + * The alternative is to make OFPACT_UNROLL_XLATE public. We can + * always do that later, since this is a private property. */ + const struct ofpact *const end = ofpact_end(pin->actions, + pin->actions_len); + const struct ofpact_unroll_xlate *unroll = NULL; + uint8_t table_id = 0; + ovs_be64 cookie = 0; + + const struct ofpact *a; + for (a = pin->actions; ; a = ofpact_next(a)) { + if (a == end || a->type == OFPACT_UNROLL_XLATE) { + if (unroll) { + if (table_id != unroll->rule_table_id) { + ofpprop_put_u8(msg, NXCPT_TABLE_ID, + unroll->rule_table_id); + table_id = unroll->rule_table_id; + } + if (cookie != unroll->rule_cookie) { + ofpprop_put_be64(msg, NXCPT_COOKIE, + unroll->rule_cookie); + cookie = unroll->rule_cookie; + } + } + + const struct ofpact *start + = unroll ? ofpact_next(&unroll->ofpact) : pin->actions; + put_actions_property(msg, NXCPT_ACTIONS, version, + start, (a - start) * sizeof *a); + + if (a == end) { + break; + } + unroll = ofpact_get_UNROLL_XLATE(a); + } } } - if (pin->fmd.pkt_mark != 0) { - match_set_pkt_mark(match, pin->fmd.pkt_mark); + if (pin->action_set_len) { + size_t start = ofpprop_start_nested(msg, NXCPT_ACTION_SET); + ofpacts_put_openflow_actions(pin->action_set, + pin->action_set_len, msg, version); + ofpprop_end(msg, start); } - match_set_in_port(match, pin->fmd.in_port); + if (msg->size > inner_ofs) { + ofpprop_end(msg, continuation_ofs); + } else { + msg->size = continuation_ofs; + } } static struct ofpbuf * -ofputil_encode_ofp10_packet_in(const struct ofputil_packet_in *pin) +ofputil_encode_ofp10_packet_in(const struct ofputil_packet_in *pin, + uint32_t buffer_id) { struct ofp10_packet_in *opi; - struct ofpbuf *packet; - - packet = ofpraw_alloc_xid(OFPRAW_OFPT10_PACKET_IN, OFP10_VERSION, - htonl(0), pin->packet_len); - opi = ofpbuf_put_zeros(packet, offsetof(struct ofp10_packet_in, data)); - opi->total_len = htons(pin->total_len); - opi->in_port = htons(ofp_to_u16(pin->fmd.in_port)); - opi->reason = pin->reason; - opi->buffer_id = htonl(pin->buffer_id); + struct ofpbuf *msg; - ofpbuf_put(packet, pin->packet, pin->packet_len); + msg = ofpraw_alloc_xid(OFPRAW_OFPT10_PACKET_IN, OFP10_VERSION, + htonl(0), pin->packet_len); + opi = ofpbuf_put_zeros(msg, offsetof(struct ofp10_packet_in, data)); + opi->total_len = htons(pin->packet_len); + opi->in_port = htons(ofp_to_u16(pin->flow_metadata.flow.in_port.ofp_port)); + opi->reason = encode_packet_in_reason(pin->reason, OFP10_VERSION); + opi->buffer_id = htonl(buffer_id); - return packet; + return msg; } static struct ofpbuf * -ofputil_encode_nx_packet_in(const struct ofputil_packet_in *pin) +ofputil_encode_nx_packet_in(const struct ofputil_packet_in *pin, + enum ofp_version version, uint32_t buffer_id) { struct nx_packet_in *npi; - struct ofpbuf *packet; - struct match match; + struct ofpbuf *msg; size_t match_len; - ofputil_packet_in_to_match(pin, &match); - /* The final argument is just an estimate of the space required. */ - packet = ofpraw_alloc_xid(OFPRAW_NXT_PACKET_IN, OFP10_VERSION, - htonl(0), (sizeof(struct flow_metadata) * 2 - + 2 + pin->packet_len)); - ofpbuf_put_zeros(packet, sizeof *npi); - match_len = nx_put_match(packet, &match, 0, 0); - ofpbuf_put_zeros(packet, 2); - ofpbuf_put(packet, pin->packet, pin->packet_len); - - npi = packet->msg; - npi->buffer_id = htonl(pin->buffer_id); - npi->total_len = htons(pin->total_len); - npi->reason = pin->reason; + msg = ofpraw_alloc_xid(OFPRAW_NXT_PACKET_IN, version, + htonl(0), NXM_TYPICAL_LEN + 2 + pin->packet_len); + ofpbuf_put_zeros(msg, sizeof *npi); + match_len = nx_put_match(msg, &pin->flow_metadata, 0, 0); + ofpbuf_put_zeros(msg, 2); + + npi = msg->msg; + npi->buffer_id = htonl(buffer_id); + npi->total_len = htons(pin->packet_len); + npi->reason = encode_packet_in_reason(pin->reason, version); npi->table_id = pin->table_id; npi->cookie = pin->cookie; npi->match_len = htons(match_len); - return packet; + return msg; +} + +static struct ofpbuf * +ofputil_encode_nx_packet_in2(const struct ofputil_packet_in_private *pin, + enum ofp_version version, uint32_t buffer_id, + size_t include_bytes) +{ + /* 'extra' is just an estimate of the space required. */ + size_t extra = (pin->public.packet_len + + NXM_TYPICAL_LEN /* flow_metadata */ + + pin->n_stack * 16 + + pin->actions_len + + pin->action_set_len + + 256); /* fudge factor */ + struct ofpbuf *msg = ofpraw_alloc_xid(OFPRAW_NXT_PACKET_IN2, version, + htonl(0), extra); + + ofputil_put_packet_in_private(pin, version, buffer_id, include_bytes, msg); + if (pin->public.userdata_len) { + ofpprop_put(msg, NXPINT_USERDATA, pin->public.userdata, + pin->public.userdata_len); + } + + ofpmsg_update_length(msg); + return msg; } static struct ofpbuf * -ofputil_encode_ofp11_packet_in(const struct ofputil_packet_in *pin) +ofputil_encode_ofp11_packet_in(const struct ofputil_packet_in *pin, + uint32_t buffer_id) { struct ofp11_packet_in *opi; - struct ofpbuf *packet; + struct ofpbuf *msg; - packet = ofpraw_alloc_xid(OFPRAW_OFPT11_PACKET_IN, OFP11_VERSION, - htonl(0), pin->packet_len); - opi = ofpbuf_put_zeros(packet, sizeof *opi); - opi->buffer_id = htonl(pin->buffer_id); - opi->in_port = ofputil_port_to_ofp11(pin->fmd.in_port); + msg = ofpraw_alloc_xid(OFPRAW_OFPT11_PACKET_IN, OFP11_VERSION, + htonl(0), pin->packet_len); + opi = ofpbuf_put_zeros(msg, sizeof *opi); + opi->buffer_id = htonl(buffer_id); + opi->in_port = ofputil_port_to_ofp11( + pin->flow_metadata.flow.in_port.ofp_port); opi->in_phy_port = opi->in_port; - opi->total_len = htons(pin->total_len); - opi->reason = pin->reason; + opi->total_len = htons(pin->packet_len); + opi->reason = encode_packet_in_reason(pin->reason, OFP11_VERSION); opi->table_id = pin->table_id; - ofpbuf_put(packet, pin->packet, pin->packet_len); - - return packet; + return msg; } static struct ofpbuf * ofputil_encode_ofp12_packet_in(const struct ofputil_packet_in *pin, - enum ofputil_protocol protocol) -{ - struct ofp13_packet_in *opi; - struct match match; - enum ofpraw packet_in_raw; - enum ofp_version packet_in_version; - size_t packet_in_size; - struct ofpbuf *packet; - - if (protocol == OFPUTIL_P_OF12_OXM) { - packet_in_raw = OFPRAW_OFPT12_PACKET_IN; - packet_in_version = OFP12_VERSION; - packet_in_size = sizeof (struct ofp12_packet_in); - } else { - packet_in_raw = OFPRAW_OFPT13_PACKET_IN; - packet_in_version = ofputil_protocol_to_ofp_version(protocol); - packet_in_size = sizeof (struct ofp13_packet_in); - } - - ofputil_packet_in_to_match(pin, &match); + enum ofp_version version, + uint32_t buffer_id) +{ + enum ofpraw raw = (version >= OFP13_VERSION + ? OFPRAW_OFPT13_PACKET_IN + : OFPRAW_OFPT12_PACKET_IN); + struct ofpbuf *msg; /* The final argument is just an estimate of the space required. */ - packet = ofpraw_alloc_xid(packet_in_raw, packet_in_version, - htonl(0), (sizeof(struct flow_metadata) * 2 - + 2 + pin->packet_len)); - ofpbuf_put_zeros(packet, packet_in_size); - oxm_put_match(packet, &match, ofputil_protocol_to_ofp_version(protocol)); - ofpbuf_put_zeros(packet, 2); - ofpbuf_put(packet, pin->packet, pin->packet_len); + msg = ofpraw_alloc_xid(raw, version, + htonl(0), NXM_TYPICAL_LEN + 2 + pin->packet_len); + + struct ofp12_packet_in *opi = ofpbuf_put_zeros(msg, sizeof *opi); + opi->buffer_id = htonl(buffer_id); + opi->total_len = htons(pin->packet_len); + opi->reason = encode_packet_in_reason(pin->reason, version); + opi->table_id = pin->table_id; - opi = packet->msg; - opi->pi.buffer_id = htonl(pin->buffer_id); - opi->pi.total_len = htons(pin->total_len); - opi->pi.reason = pin->reason; - opi->pi.table_id = pin->table_id; - if (protocol != OFPUTIL_P_OF12_OXM) { - opi->cookie = pin->cookie; + if (version >= OFP13_VERSION) { + ovs_be64 cookie = pin->cookie; + ofpbuf_put(msg, &cookie, sizeof cookie); } - return packet; + oxm_put_match(msg, &pin->flow_metadata, version); + ofpbuf_put_zeros(msg, 2); + + return msg; } -/* Converts abstract ofputil_packet_in 'pin' into a PACKET_IN message - * in the format specified by 'packet_in_format'. */ +/* Converts abstract ofputil_packet_in_private 'pin' into a PACKET_IN message + * for 'protocol', using the packet-in format specified by 'packet_in_format'. + * + * If 'pkt_buf' is nonnull and 'max_len' allows the packet to be buffered, this + * function will attempt to obtain a buffer ID from 'pktbuf' and truncate the + * packet to 'max_len' bytes. Otherwise, or if 'pktbuf' doesn't have a free + * buffer, it will send the whole packet without buffering. + * + * This function is really meant only for use by ovs-vswitchd. To any other + * code, the "continuation" data, i.e. the data that is in struct + * ofputil_packet_in_private but not in struct ofputil_packet_in, is supposed + * to be opaque (and it might change from one OVS version to another). Thus, + * if any other code wants to encode a packet-in, it should use a non-"private" + * version of this function. (Such a version doesn't currently exist because + * only ovs-vswitchd currently wants to encode packet-ins. If you need one, + * write it...) */ struct ofpbuf * -ofputil_encode_packet_in(const struct ofputil_packet_in *pin, - enum ofputil_protocol protocol, - enum nx_packet_in_format packet_in_format) +ofputil_encode_packet_in_private(const struct ofputil_packet_in_private *pin, + enum ofputil_protocol protocol, + enum nx_packet_in_format packet_in_format, + uint16_t max_len, struct pktbuf *pktbuf) { - struct ofpbuf *packet; + enum ofp_version version = ofputil_protocol_to_ofp_version(protocol); - switch (protocol) { - case OFPUTIL_P_OF10_STD: - case OFPUTIL_P_OF10_STD_TID: - case OFPUTIL_P_OF10_NXM: - case OFPUTIL_P_OF10_NXM_TID: - packet = (packet_in_format == NXPIF_NXM - ? ofputil_encode_nx_packet_in(pin) - : ofputil_encode_ofp10_packet_in(pin)); - break; + /* Get buffer ID. */ + ofp_port_t in_port = pin->public.flow_metadata.flow.in_port.ofp_port; + uint32_t buffer_id = (max_len != OFPCML12_NO_BUFFER && pktbuf + ? pktbuf_save(pktbuf, pin->public.packet, + pin->public.packet_len, in_port) + : UINT32_MAX); - case OFPUTIL_P_OF11_STD: - packet = ofputil_encode_ofp11_packet_in(pin); + /* Calculate the number of bytes of the packet to include in the + * packet-in: + * + * - If not buffered, the whole thing. + * + * - Otherwise, no more than 'max_len' bytes. */ + size_t include_bytes = (buffer_id == UINT32_MAX + ? pin->public.packet_len + : MIN(max_len, pin->public.packet_len)); + + struct ofpbuf *msg; + switch (packet_in_format) { + case NXPIF_STANDARD: + switch (protocol) { + case OFPUTIL_P_OF10_STD: + case OFPUTIL_P_OF10_STD_TID: + case OFPUTIL_P_OF10_NXM: + case OFPUTIL_P_OF10_NXM_TID: + msg = ofputil_encode_ofp10_packet_in(&pin->public, buffer_id); + break; + + case OFPUTIL_P_OF11_STD: + msg = ofputil_encode_ofp11_packet_in(&pin->public, buffer_id); + break; + + case OFPUTIL_P_OF12_OXM: + case OFPUTIL_P_OF13_OXM: + case OFPUTIL_P_OF14_OXM: + case OFPUTIL_P_OF15_OXM: + msg = ofputil_encode_ofp12_packet_in(&pin->public, version, buffer_id); + break; + + default: + OVS_NOT_REACHED(); + } break; - case OFPUTIL_P_OF12_OXM: - case OFPUTIL_P_OF13_OXM: - case OFPUTIL_P_OF14_OXM: - case OFPUTIL_P_OF15_OXM: - packet = ofputil_encode_ofp12_packet_in(pin, protocol); + case NXPIF_NXT_PACKET_IN: + msg = ofputil_encode_nx_packet_in(&pin->public, version, buffer_id); break; + case NXPIF_NXT_PACKET_IN2: + return ofputil_encode_nx_packet_in2(pin, version, buffer_id, + include_bytes); + default: OVS_NOT_REACHED(); } - ofpmsg_update_length(packet); - return packet; + ofpbuf_put(msg, pin->public.packet, include_bytes); + ofpmsg_update_length(msg); + return msg; } /* Returns a string form of 'reason'. The return value is either a statically @@ -3628,6 +3935,9 @@ ofputil_packet_in_reason_to_string(enum ofp_packet_in_reason reason, return "group"; case OFPR_PACKET_OUT: return "packet_out"; + case OFPR_EXPLICIT_MISS: + case OFPR_IMPLICIT_MISS: + return ""; case OFPR_N_REASONS: default: @@ -3656,66 +3966,229 @@ ofputil_packet_in_reason_from_string(const char *s, return false; } -/* Converts an OFPT_PACKET_OUT in 'opo' into an abstract ofputil_packet_out in - * 'po'. - * - * Uses 'ofpacts' to store the abstract OFPACT_* version of the packet out - * message's actions. The caller must initialize 'ofpacts' and retains - * ownership of it. 'po->ofpacts' will point into the 'ofpacts' buffer. - * - * Returns 0 if successful, otherwise an OFPERR_* value. */ -enum ofperr -ofputil_decode_packet_out(struct ofputil_packet_out *po, - const struct ofp_header *oh, - struct ofpbuf *ofpacts) +/* Returns a newly allocated NXT_RESUME message for 'pin', with the given + * 'continuation', for 'protocol'. This message is suitable for resuming the + * pipeline traveral of the packet represented by 'pin', if sent to the switch + * from which 'pin' was received. */ +struct ofpbuf * +ofputil_encode_resume(const struct ofputil_packet_in *pin, + const struct ofpbuf *continuation, + enum ofputil_protocol protocol) { - enum ofpraw raw; - struct ofpbuf b; - - ofpbuf_use_const(&b, oh, ntohs(oh->length)); - raw = ofpraw_pull_assert(&b); + enum ofp_version version = ofputil_protocol_to_ofp_version(protocol); + size_t extra = pin->packet_len + NXM_TYPICAL_LEN + continuation->size; + struct ofpbuf *msg = ofpraw_alloc_xid(OFPRAW_NXT_RESUME, version, + 0, extra); + ofputil_put_packet_in(pin, version, UINT32_MAX, pin->packet_len, msg); + ofpprop_put_nested(msg, NXPINT_CONTINUATION, continuation); + ofpmsg_update_length(msg); + return msg; +} - if (raw == OFPRAW_OFPT11_PACKET_OUT) { - enum ofperr error; - const struct ofp11_packet_out *opo = ofpbuf_pull(&b, sizeof *opo); +static enum ofperr +parse_subvalue_prop(const struct ofpbuf *property, union mf_subvalue *sv) +{ + unsigned int len = ofpbuf_msgsize(property); + if (len > sizeof *sv) { + VLOG_WARN_RL(&bad_ofmsg_rl, "NXCPT_STACK property has bad length %u", + len); + return OFPERR_OFPBPC_BAD_LEN; + } + memset(sv, 0, sizeof *sv); + memcpy(&sv->u8[sizeof *sv - len], property->msg, len); + return 0; +} - po->buffer_id = ntohl(opo->buffer_id); - error = ofputil_port_from_ofp11(opo->in_port, &po->in_port); - if (error) { - return error; - } +static enum ofperr +parse_actions_property(struct ofpbuf *property, enum ofp_version version, + struct ofpbuf *ofpacts) +{ + if (!ofpbuf_try_pull(property, ROUND_UP(ofpbuf_headersize(property), 8))) { + VLOG_WARN_RL(&bad_ofmsg_rl, "actions property has bad length %"PRIu32, + property->size); + return OFPERR_OFPBPC_BAD_LEN; + } - error = ofpacts_pull_openflow_actions(&b, ntohs(opo->actions_len), - oh->version, ofpacts); - if (error) { - return error; - } - } else if (raw == OFPRAW_OFPT10_PACKET_OUT) { - enum ofperr error; - const struct ofp10_packet_out *opo = ofpbuf_pull(&b, sizeof *opo); + return ofpacts_pull_openflow_actions(property, property->size, + version, ofpacts); +} - po->buffer_id = ntohl(opo->buffer_id); - po->in_port = u16_to_ofp(ntohs(opo->in_port)); +/* This is like ofputil_decode_packet_in(), except that it decodes the + * continuation data into 'pin'. The format of this data is supposed to be + * opaque to any process other than ovs-vswitchd, so this function should not + * be used outside ovs-vswitchd. + * + * When successful, 'pin' contains some dynamically allocated data. Call + * ofputil_packet_in_private_destroy() to free this data. */ +enum ofperr +ofputil_decode_packet_in_private(const struct ofp_header *oh, bool loose, + struct ofputil_packet_in_private *pin, + size_t *total_len, uint32_t *buffer_id) +{ + memset(pin, 0, sizeof *pin); - error = ofpacts_pull_openflow_actions(&b, ntohs(opo->actions_len), - oh->version, ofpacts); - if (error) { - return error; - } - } else { - OVS_NOT_REACHED(); + struct ofpbuf continuation; + enum ofperr error; + error = ofputil_decode_packet_in(oh, loose, &pin->public, total_len, + buffer_id, &continuation); + if (error) { + return error; } - if (ofp_to_u16(po->in_port) >= ofp_to_u16(OFPP_MAX) - && po->in_port != OFPP_LOCAL - && po->in_port != OFPP_NONE && po->in_port != OFPP_CONTROLLER) { - VLOG_WARN_RL(&bad_ofmsg_rl, "packet-out has bad input port %#"PRIx16, - po->in_port); - return OFPERR_OFPBRC_BAD_PORT; - } + struct ofpbuf actions, action_set; + ofpbuf_init(&actions, 0); + ofpbuf_init(&action_set, 0); - po->ofpacts = ofpacts->data; - po->ofpacts_len = ofpacts->size; + uint8_t table_id = 0; + ovs_be64 cookie = 0; + + size_t allocated_stack = 0; + + while (continuation.size > 0) { + struct ofpbuf payload; + uint64_t type; + + error = ofpprop_pull(&continuation, &payload, &type); + ovs_assert(!error); + + switch (type) { + case NXCPT_BRIDGE: + error = ofpprop_parse_uuid(&payload, &pin->bridge); + break; + + case NXCPT_STACK: + if (pin->n_stack >= allocated_stack) { + pin->stack = x2nrealloc(pin->stack, &allocated_stack, + sizeof *pin->stack); + } + error = parse_subvalue_prop(&payload, + &pin->stack[pin->n_stack++]); + break; + + case NXCPT_MIRRORS: + error = ofpprop_parse_u32(&payload, &pin->mirrors); + break; + + case NXCPT_CONNTRACKED: + pin->conntracked = true; + break; + + case NXCPT_TABLE_ID: + error = ofpprop_parse_u8(&payload, &table_id); + break; + + case NXCPT_COOKIE: + error = ofpprop_parse_be64(&payload, &cookie); + break; + + case NXCPT_ACTIONS: { + struct ofpact_unroll_xlate *unroll + = ofpact_put_UNROLL_XLATE(&actions); + unroll->rule_table_id = table_id; + unroll->rule_cookie = cookie; + error = parse_actions_property(&payload, oh->version, &actions); + break; + } + + case NXCPT_ACTION_SET: + error = parse_actions_property(&payload, oh->version, &action_set); + break; + + default: + error = OFPPROP_UNKNOWN(loose, "continuation", type); + break; + } + if (error) { + break; + } + } + + pin->actions_len = actions.size; + pin->actions = ofpbuf_steal_data(&actions); + pin->action_set_len = action_set.size; + pin->action_set = ofpbuf_steal_data(&action_set); + + if (error) { + ofputil_packet_in_private_destroy(pin); + } + + return 0; +} + +/* Frees data in 'pin' that is dynamically allocated by + * ofputil_decode_packet_in_private(). + * + * 'pin->public' contains some pointer members that + * ofputil_decode_packet_in_private() doesn't initialize to newly allocated + * data, so this function doesn't free those. */ +void +ofputil_packet_in_private_destroy(struct ofputil_packet_in_private *pin) +{ + if (pin) { + free(pin->stack); + free(pin->actions); + free(pin->action_set); + } +} + +/* Converts an OFPT_PACKET_OUT in 'opo' into an abstract ofputil_packet_out in + * 'po'. + * + * Uses 'ofpacts' to store the abstract OFPACT_* version of the packet out + * message's actions. The caller must initialize 'ofpacts' and retains + * ownership of it. 'po->ofpacts' will point into the 'ofpacts' buffer. + * + * Returns 0 if successful, otherwise an OFPERR_* value. */ +enum ofperr +ofputil_decode_packet_out(struct ofputil_packet_out *po, + const struct ofp_header *oh, + struct ofpbuf *ofpacts) +{ + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); + enum ofpraw raw = ofpraw_pull_assert(&b); + + ofpbuf_clear(ofpacts); + if (raw == OFPRAW_OFPT11_PACKET_OUT) { + enum ofperr error; + const struct ofp11_packet_out *opo = ofpbuf_pull(&b, sizeof *opo); + + po->buffer_id = ntohl(opo->buffer_id); + error = ofputil_port_from_ofp11(opo->in_port, &po->in_port); + if (error) { + return error; + } + + error = ofpacts_pull_openflow_actions(&b, ntohs(opo->actions_len), + oh->version, ofpacts); + if (error) { + return error; + } + } else if (raw == OFPRAW_OFPT10_PACKET_OUT) { + enum ofperr error; + const struct ofp10_packet_out *opo = ofpbuf_pull(&b, sizeof *opo); + + po->buffer_id = ntohl(opo->buffer_id); + po->in_port = u16_to_ofp(ntohs(opo->in_port)); + + error = ofpacts_pull_openflow_actions(&b, ntohs(opo->actions_len), + oh->version, ofpacts); + if (error) { + return error; + } + } else { + OVS_NOT_REACHED(); + } + + if (ofp_to_u16(po->in_port) >= ofp_to_u16(OFPP_MAX) + && po->in_port != OFPP_LOCAL + && po->in_port != OFPP_NONE && po->in_port != OFPP_CONTROLLER) { + VLOG_WARN_RL(&bad_ofmsg_rl, "packet-out has bad input port %#"PRIx16, + po->in_port); + return OFPERR_OFPBRC_BAD_PORT; + } + + po->ofpacts = ofpacts->data; + po->ofpacts_len = ofpacts->size; if (po->buffer_id == UINT32_MAX) { po->packet = b.data; @@ -3793,7 +4266,7 @@ ofputil_decode_ofp10_phy_port(struct ofputil_phy_port *pp, const struct ofp10_phy_port *opp) { pp->port_no = u16_to_ofp(ntohs(opp->port_no)); - memcpy(pp->hw_addr, opp->hw_addr, OFP_ETH_ALEN); + pp->hw_addr = opp->hw_addr; ovs_strlcpy(pp->name, opp->name, OFP_MAX_PORT_NAME_LEN); pp->config = ntohl(opp->config) & OFPPC10_ALL; @@ -3820,7 +4293,7 @@ ofputil_decode_ofp11_port(struct ofputil_phy_port *pp, if (error) { return error; } - memcpy(pp->hw_addr, op->hw_addr, OFP_ETH_ALEN); + pp->hw_addr = op->hw_addr; ovs_strlcpy(pp->name, op->name, OFP_MAX_PORT_NAME_LEN); pp->config = ntohl(op->config) & OFPPC11_ALL; @@ -3861,39 +4334,35 @@ parse_ofp14_port_ethernet_property(const struct ofpbuf *payload, static enum ofperr ofputil_pull_ofp14_port(struct ofputil_phy_port *pp, struct ofpbuf *msg) { - struct ofpbuf properties; - struct ofp14_port *op; - enum ofperr error; - size_t len; - - op = ofpbuf_try_pull(msg, sizeof *op); + struct ofp14_port *op = ofpbuf_try_pull(msg, sizeof *op); if (!op) { return OFPERR_OFPBRC_BAD_LEN; } - len = ntohs(op->length); + size_t len = ntohs(op->length); if (len < sizeof *op || len - sizeof *op > msg->size) { return OFPERR_OFPBRC_BAD_LEN; } len -= sizeof *op; - ofpbuf_use_const(&properties, ofpbuf_pull(msg, len), len); - error = ofputil_port_from_ofp11(op->port_no, &pp->port_no); + enum ofperr error = ofputil_port_from_ofp11(op->port_no, &pp->port_no); if (error) { return error; } - memcpy(pp->hw_addr, op->hw_addr, OFP_ETH_ALEN); + pp->hw_addr = op->hw_addr; ovs_strlcpy(pp->name, op->name, OFP_MAX_PORT_NAME_LEN); pp->config = ntohl(op->config) & OFPPC11_ALL; pp->state = ntohl(op->state) & OFPPS11_ALL; + struct ofpbuf properties = ofpbuf_const_initializer(ofpbuf_pull(msg, len), + len); while (properties.size > 0) { struct ofpbuf payload; enum ofperr error; - uint16_t type; + uint64_t type; - error = ofputil_pull_property(&properties, &payload, &type); + error = ofpprop_pull(&properties, &payload, &type); if (error) { return error; } @@ -3904,8 +4373,7 @@ ofputil_pull_ofp14_port(struct ofputil_phy_port *pp, struct ofpbuf *msg) break; default: - log_property(true, "unknown port property %"PRIu16, type); - error = 0; + error = OFPPROP_UNKNOWN(true, "port", type); break; } @@ -3924,7 +4392,7 @@ ofputil_encode_ofp10_phy_port(const struct ofputil_phy_port *pp, memset(opp, 0, sizeof *opp); opp->port_no = htons(ofp_to_u16(pp->port_no)); - memcpy(opp->hw_addr, pp->hw_addr, ETH_ADDR_LEN); + opp->hw_addr = pp->hw_addr; ovs_strlcpy(opp->name, pp->name, OFP_MAX_PORT_NAME_LEN); opp->config = htonl(pp->config & OFPPC10_ALL); @@ -3943,7 +4411,7 @@ ofputil_encode_ofp11_port(const struct ofputil_phy_port *pp, memset(op, 0, sizeof *op); op->port_no = ofputil_port_to_ofp11(pp->port_no); - memcpy(op->hw_addr, pp->hw_addr, ETH_ADDR_LEN); + op->hw_addr = pp->hw_addr; ovs_strlcpy(op->name, pp->name, OFP_MAX_PORT_NAME_LEN); op->config = htonl(pp->config & OFPPC11_ALL); @@ -3970,14 +4438,12 @@ ofputil_put_ofp14_port(const struct ofputil_phy_port *pp, op = ofpbuf_put_zeros(b, sizeof *op); op->port_no = ofputil_port_to_ofp11(pp->port_no); op->length = htons(sizeof *op + sizeof *eth); - memcpy(op->hw_addr, pp->hw_addr, ETH_ADDR_LEN); + op->hw_addr = pp->hw_addr; ovs_strlcpy(op->name, pp->name, sizeof op->name); op->config = htonl(pp->config & OFPPC11_ALL); op->state = htonl(pp->state & OFPPS11_ALL); - eth = ofpbuf_put_zeros(b, sizeof *eth); - eth->type = htons(OFPPDPT14_ETHERNET); - eth->length = htons(sizeof *eth); + eth = ofpprop_put_zeros(b, OFPPDPT14_ETHERNET, sizeof *eth); eth->curr = netdev_port_features_to_ofp11(pp->curr); eth->advertised = netdev_port_features_to_ofp11(pp->advertised); eth->supported = netdev_port_features_to_ofp11(pp->supported); @@ -4019,11 +4485,9 @@ enum ofperr ofputil_decode_port_desc_stats_request(const struct ofp_header *request, ofp_port_t *port) { - struct ofpbuf b; - enum ofpraw raw; - - ofpbuf_use_const(&b, request, ntohs(request->length)); - raw = ofpraw_pull_assert(&b); + struct ofpbuf b = ofpbuf_const_initializer(request, + ntohs(request->length)); + enum ofpraw raw = ofpraw_pull_assert(&b); if (raw == OFPRAW_OFPST10_PORT_DESC_REQUEST) { *port = OFPP_ANY; return 0; @@ -4042,7 +4506,6 @@ ofputil_encode_port_desc_stats_request(enum ofp_version ofp_version, ofp_port_t port) { struct ofpbuf *request; - ovs_be32 ofp11_port; switch (ofp_version) { case OFP10_VERSION: @@ -4053,14 +4516,14 @@ ofputil_encode_port_desc_stats_request(enum ofp_version ofp_version, request = ofpraw_alloc(OFPRAW_OFPST10_PORT_DESC_REQUEST, ofp_version, 0); break; - - case OFP15_VERSION: + case OFP15_VERSION:{ + struct ofp15_port_desc_request *req; request = ofpraw_alloc(OFPRAW_OFPST15_PORT_DESC_REQUEST, ofp_version, 0); - ofp11_port = ofputil_port_to_ofp11(port); - ofpbuf_put(request, &ofp11_port, sizeof ofp11_port); + req = ofpbuf_put_zeros(request, sizeof *req); + req->port_no = ofputil_port_to_ofp11(port); break; - + } default: OVS_NOT_REACHED(); } @@ -4079,6 +4542,81 @@ ofputil_append_port_desc_stats_reply(const struct ofputil_phy_port *pp, ofpmp_postappend(replies, start_ofs); } +/* ofputil_switch_config */ + +/* Decodes 'oh', which must be an OFPT_GET_CONFIG_REPLY or OFPT_SET_CONFIG + * message, into 'config'. Returns false if 'oh' contained any flags that + * aren't specified in its version of OpenFlow, true otherwise. */ +static bool +ofputil_decode_switch_config(const struct ofp_header *oh, + struct ofputil_switch_config *config) +{ + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); + ofpraw_pull_assert(&b); + + const struct ofp_switch_config *osc = ofpbuf_pull(&b, sizeof *osc); + config->frag = ntohs(osc->flags) & OFPC_FRAG_MASK; + config->miss_send_len = ntohs(osc->miss_send_len); + + ovs_be16 valid_mask = htons(OFPC_FRAG_MASK); + if (oh->version < OFP13_VERSION) { + const ovs_be16 ttl_bit = htons(OFPC_INVALID_TTL_TO_CONTROLLER); + valid_mask |= ttl_bit; + config->invalid_ttl_to_controller = (osc->flags & ttl_bit) != 0; + } else { + config->invalid_ttl_to_controller = -1; + } + + return !(osc->flags & ~valid_mask); +} + +void +ofputil_decode_get_config_reply(const struct ofp_header *oh, + struct ofputil_switch_config *config) +{ + ofputil_decode_switch_config(oh, config); +} + +enum ofperr +ofputil_decode_set_config(const struct ofp_header *oh, + struct ofputil_switch_config *config) +{ + return (ofputil_decode_switch_config(oh, config) + ? 0 + : OFPERR_OFPSCFC_BAD_FLAGS); +} + +static struct ofpbuf * +ofputil_put_switch_config(const struct ofputil_switch_config *config, + struct ofpbuf *b) +{ + const struct ofp_header *oh = b->data; + struct ofp_switch_config *osc = ofpbuf_put_zeros(b, sizeof *osc); + osc->flags = htons(config->frag); + if (config->invalid_ttl_to_controller > 0 && oh->version < OFP13_VERSION) { + osc->flags |= htons(OFPC_INVALID_TTL_TO_CONTROLLER); + } + osc->miss_send_len = htons(config->miss_send_len); + return b; +} + +struct ofpbuf * +ofputil_encode_get_config_reply(const struct ofp_header *request, + const struct ofputil_switch_config *config) +{ + struct ofpbuf *b = ofpraw_alloc_reply(OFPRAW_OFPT_GET_CONFIG_REPLY, + request, 0); + return ofputil_put_switch_config(config, b); +} + +struct ofpbuf * +ofputil_encode_set_config(const struct ofputil_switch_config *config, + enum ofp_version version) +{ + struct ofpbuf *b = ofpraw_alloc(OFPRAW_OFPT_SET_CONFIG, version, 0); + return ofputil_put_switch_config(config, b); +} + /* ofputil_switch_features */ #define OFPC_COMMON (OFPC_FLOW_STATS | OFPC_TABLE_STATS | OFPC_PORT_STATS | \ @@ -4109,23 +4647,18 @@ ofputil_capabilities_mask(enum ofp_version ofp_version) } } -/* Decodes an OpenFlow 1.0 or 1.1 "switch_features" structure 'osf' into an - * abstract representation in '*features'. Initializes '*b' to iterate over - * the OpenFlow port structures following 'osf' with later calls to - * ofputil_pull_phy_port(). Returns 0 if successful, otherwise an - * OFPERR_* value. */ +/* Pulls an OpenFlow "switch_features" structure from 'b' and decodes it into + * an abstract representation in '*features', readying 'b' to iterate over the + * OpenFlow port structures following 'osf' with later calls to + * ofputil_pull_phy_port(). Returns 0 if successful, otherwise an OFPERR_* + * value. */ enum ofperr -ofputil_decode_switch_features(const struct ofp_header *oh, - struct ofputil_switch_features *features, - struct ofpbuf *b) +ofputil_pull_switch_features(struct ofpbuf *b, + struct ofputil_switch_features *features) { - const struct ofp_switch_features *osf; - enum ofpraw raw; - - ofpbuf_use_const(b, oh, ntohs(oh->length)); - raw = ofpraw_pull_assert(b); - - osf = ofpbuf_pull(b, sizeof *osf); + const struct ofp_header *oh = b->data; + enum ofpraw raw = ofpraw_pull_assert(b); + const struct ofp_switch_features *osf = ofpbuf_pull(b, sizeof *osf); features->datapath_id = ntohll(osf->datapath_id); features->n_buffers = ntohl(osf->n_buffers); features->n_tables = osf->n_tables; @@ -4290,14 +4823,10 @@ enum ofperr ofputil_decode_port_status(const struct ofp_header *oh, struct ofputil_port_status *ps) { - const struct ofp_port_status *ops; - struct ofpbuf b; - int retval; - - ofpbuf_use_const(&b, oh, ntohs(oh->length)); + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); ofpraw_pull_assert(&b); - ops = ofpbuf_pull(&b, sizeof *ops); + const struct ofp_port_status *ops = ofpbuf_pull(&b, sizeof *ops); if (ops->reason != OFPPR_ADD && ops->reason != OFPPR_DELETE && ops->reason != OFPPR_MODIFY) { @@ -4305,7 +4834,7 @@ ofputil_decode_port_status(const struct ofp_header *oh, } ps->reason = ops->reason; - retval = ofputil_pull_phy_port(oh->version, &b, &ps->desc); + int retval = ofputil_pull_phy_port(oh->version, &b, &ps->desc); ovs_assert(retval != EOF); return retval; } @@ -4357,14 +4886,14 @@ static enum ofperr parse_port_mod_ethernet_property(struct ofpbuf *property, struct ofputil_port_mod *pm) { - struct ofp14_port_mod_prop_ethernet *eth = property->data; + ovs_be32 advertise; + enum ofperr error; - if (property->size != sizeof *eth) { - return OFPERR_OFPBRC_BAD_LEN; + error = ofpprop_parse_be32(property, &advertise); + if (!error) { + pm->advertise = netdev_port_features_from_ofp11(advertise); } - - pm->advertise = netdev_port_features_from_ofp11(eth->advertise); - return 0; + return error; } /* Decodes the OpenFlow "port mod" message in '*oh' into an abstract form in @@ -4373,17 +4902,13 @@ enum ofperr ofputil_decode_port_mod(const struct ofp_header *oh, struct ofputil_port_mod *pm, bool loose) { - enum ofpraw raw; - struct ofpbuf b; - - ofpbuf_use_const(&b, oh, ntohs(oh->length)); - raw = ofpraw_pull_assert(&b); - + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); + enum ofpraw raw = ofpraw_pull_assert(&b); if (raw == OFPRAW_OFPT10_PORT_MOD) { const struct ofp10_port_mod *opm = b.data; pm->port_no = u16_to_ofp(ntohs(opm->port_no)); - memcpy(pm->hw_addr, opm->hw_addr, ETH_ADDR_LEN); + pm->hw_addr = opm->hw_addr; pm->config = ntohl(opm->config) & OFPPC10_ALL; pm->mask = ntohl(opm->mask) & OFPPC10_ALL; pm->advertise = netdev_port_features_from_ofp10(opm->advertise); @@ -4396,7 +4921,7 @@ ofputil_decode_port_mod(const struct ofp_header *oh, return error; } - memcpy(pm->hw_addr, opm->hw_addr, ETH_ADDR_LEN); + pm->hw_addr = opm->hw_addr; pm->config = ntohl(opm->config) & OFPPC11_ALL; pm->mask = ntohl(opm->mask) & OFPPC11_ALL; pm->advertise = netdev_port_features_from_ofp11(opm->advertise); @@ -4411,16 +4936,16 @@ ofputil_decode_port_mod(const struct ofp_header *oh, return error; } - memcpy(pm->hw_addr, opm->hw_addr, ETH_ADDR_LEN); + pm->hw_addr = opm->hw_addr; pm->config = ntohl(opm->config) & OFPPC11_ALL; pm->mask = ntohl(opm->mask) & OFPPC11_ALL; while (b.size > 0) { struct ofpbuf property; enum ofperr error; - uint16_t type; + uint64_t type; - error = ofputil_pull_property(&b, &property, &type); + error = ofpprop_pull(&b, &property, &type); if (error) { return error; } @@ -4431,14 +4956,7 @@ ofputil_decode_port_mod(const struct ofp_header *oh, break; default: - log_property(loose, "unknown port_mod property %"PRIu16, type); - if (loose) { - error = 0; - } else if (type == OFPPMPT14_EXPERIMENTER) { - error = OFPERR_OFPBPC_BAD_EXPERIMENTER; - } else { - error = OFPERR_OFPBRC_BAD_TYPE; - } + error = OFPPROP_UNKNOWN(loose, "port_mod", type); break; } @@ -4471,7 +4989,7 @@ ofputil_encode_port_mod(const struct ofputil_port_mod *pm, b = ofpraw_alloc(OFPRAW_OFPT10_PORT_MOD, ofp_version, 0); opm = ofpbuf_put_zeros(b, sizeof *opm); opm->port_no = htons(ofp_to_u16(pm->port_no)); - memcpy(opm->hw_addr, pm->hw_addr, ETH_ADDR_LEN); + opm->hw_addr = pm->hw_addr; opm->config = htonl(pm->config & OFPPC10_ALL); opm->mask = htonl(pm->mask & OFPPC10_ALL); opm->advertise = netdev_port_features_to_ofp10(pm->advertise); @@ -4486,7 +5004,7 @@ ofputil_encode_port_mod(const struct ofputil_port_mod *pm, b = ofpraw_alloc(OFPRAW_OFPT11_PORT_MOD, ofp_version, 0); opm = ofpbuf_put_zeros(b, sizeof *opm); opm->port_no = ofputil_port_to_ofp11(pm->port_no); - memcpy(opm->hw_addr, pm->hw_addr, ETH_ADDR_LEN); + opm->hw_addr = pm->hw_addr; opm->config = htonl(pm->config & OFPPC11_ALL); opm->mask = htonl(pm->mask & OFPPC11_ALL); opm->advertise = netdev_port_features_to_ofp11(pm->advertise); @@ -4494,21 +5012,18 @@ ofputil_encode_port_mod(const struct ofputil_port_mod *pm, } case OFP14_VERSION: case OFP15_VERSION: { - struct ofp14_port_mod_prop_ethernet *eth; struct ofp14_port_mod *opm; - b = ofpraw_alloc(OFPRAW_OFPT14_PORT_MOD, ofp_version, sizeof *eth); + b = ofpraw_alloc(OFPRAW_OFPT14_PORT_MOD, ofp_version, 0); opm = ofpbuf_put_zeros(b, sizeof *opm); opm->port_no = ofputil_port_to_ofp11(pm->port_no); - memcpy(opm->hw_addr, pm->hw_addr, ETH_ADDR_LEN); + opm->hw_addr = pm->hw_addr; opm->config = htonl(pm->config & OFPPC11_ALL); opm->mask = htonl(pm->mask & OFPPC11_ALL); if (pm->advertise) { - eth = ofpbuf_put_zeros(b, sizeof *eth); - eth->type = htons(OFPPMPT14_ETHERNET); - eth->length = htons(sizeof *eth); - eth->advertise = netdev_port_features_to_ofp11(pm->advertise); + ofpprop_put_be32(b, OFPPMPT14_ETHERNET, + netdev_port_features_to_ofp11(pm->advertise)); } break; } @@ -4523,13 +5038,13 @@ ofputil_encode_port_mod(const struct ofputil_port_mod *pm, static enum ofperr pull_table_feature_property(struct ofpbuf *msg, struct ofpbuf *payload, - uint16_t *typep) + uint64_t *typep) { enum ofperr error; - error = ofputil_pull_property(msg, payload, typep); + error = ofpprop_pull(msg, payload, typep); if (payload && !error) { - ofpbuf_pull(payload, sizeof(struct ofp_prop_header)); + ofpbuf_pull(payload, (char *)payload->msg - (char *)payload->header); } return error; } @@ -4541,10 +5056,10 @@ parse_action_bitmap(struct ofpbuf *payload, enum ofp_version ofp_version, uint32_t types = 0; while (payload->size > 0) { - uint16_t type; enum ofperr error; + uint64_t type; - error = ofputil_pull_property__(payload, NULL, 1, &type); + error = ofpprop_pull__(payload, NULL, 1, 0x10000, &type); if (error) { return error; } @@ -4564,7 +5079,7 @@ parse_instruction_ids(struct ofpbuf *payload, bool loose, uint32_t *insts) while (payload->size > 0) { enum ovs_instruction_type inst; enum ofperr error; - uint16_t ofpit; + uint64_t ofpit; /* OF1.3 and OF1.4 aren't clear about padding in the instruction IDs. * It seems clear that they aren't padded to 8 bytes, though, because @@ -4575,7 +5090,7 @@ parse_instruction_ids(struct ofpbuf *payload, bool loose, uint32_t *insts) * * Anyway, we just assume they're all glommed together on byte * boundaries. */ - error = ofputil_pull_property__(payload, NULL, 1, &ofpit); + error = ofpprop_pull__(payload, NULL, 1, 0x10000, &ofpit); if (error) { return error; } @@ -4659,33 +5174,26 @@ int ofputil_decode_table_features(struct ofpbuf *msg, struct ofputil_table_features *tf, bool loose) { - const struct ofp_header *oh; - struct ofp13_table_features *otf; - struct ofpbuf properties; - unsigned int len; - memset(tf, 0, sizeof *tf); if (!msg->header) { ofpraw_pull_assert(msg); } - oh = msg->header; if (!msg->size) { return EOF; } + const struct ofp_header *oh = msg->header; + struct ofp13_table_features *otf = msg->data; if (msg->size < sizeof *otf) { return OFPERR_OFPBPC_BAD_LEN; } - otf = msg->data; - len = ntohs(otf->length); + unsigned int len = ntohs(otf->length); if (len < sizeof *otf || len % 8 || len > msg->size) { return OFPERR_OFPBPC_BAD_LEN; } - ofpbuf_use_const(&properties, ofpbuf_pull(msg, len), len); - ofpbuf_pull(&properties, sizeof *otf); tf->table_id = otf->table_id; if (tf->table_id == OFPTT_ALL) { @@ -4695,13 +5203,24 @@ ofputil_decode_table_features(struct ofpbuf *msg, ovs_strlcpy(tf->name, otf->name, OFP_MAX_TABLE_NAME_LEN); tf->metadata_match = otf->metadata_match; tf->metadata_write = otf->metadata_write; - tf->miss_config = ofputil_table_miss_from_config(otf->config, oh->version); + tf->miss_config = OFPUTIL_TABLE_MISS_DEFAULT; + if (oh->version >= OFP14_VERSION) { + uint32_t caps = ntohl(otf->capabilities); + tf->supports_eviction = (caps & OFPTC14_EVICTION) != 0; + tf->supports_vacancy_events = (caps & OFPTC14_VACANCY_EVENTS) != 0; + } else { + tf->supports_eviction = -1; + tf->supports_vacancy_events = -1; + } tf->max_entries = ntohl(otf->max_entries); + struct ofpbuf properties = ofpbuf_const_initializer(ofpbuf_pull(msg, len), + len); + ofpbuf_pull(&properties, sizeof *otf); while (properties.size > 0) { struct ofpbuf payload; enum ofperr error; - uint16_t type; + uint64_t type; error = pull_table_feature_property(&properties, &payload, &type); if (error) { @@ -4771,9 +5290,7 @@ ofputil_decode_table_features(struct ofpbuf *msg, case OFPTFPT13_EXPERIMENTER: case OFPTFPT13_EXPERIMENTER_MISS: default: - log_property(loose, "unknown table features property %"PRIu16, - type); - error = loose ? 0 : OFPERR_OFPBPC_BAD_TYPE; + error = OFPPROP_UNKNOWN(loose, "table features", type); break; } if (error) { @@ -4834,12 +5351,12 @@ put_fields_property(struct ofpbuf *reply, size_t start_ofs; int field; - start_ofs = start_property(reply, property); + start_ofs = ofpprop_start(reply, property); BITMAP_FOR_EACH_1 (field, MFF_N_IDS, fields->bm) { nx_put_header(reply, field, version, masks && bitmap_is_set(masks->bm, field)); } - end_property(reply, start_ofs); + ofpprop_end(reply, start_ofs); } static void @@ -4849,14 +5366,9 @@ put_table_action_features(struct ofpbuf *reply, enum ofp13_table_feature_prop_type set_fields_type, int miss_offset, enum ofp_version version) { - size_t start_ofs; - - start_ofs = start_property(reply, actions_type + miss_offset); - put_bitmap_properties(reply, - ntohl(ofpact_bitmap_to_openflow(taf->ofpacts, - version))); - end_property(reply, start_ofs); - + ofpprop_put_bitmap(reply, actions_type + miss_offset, + ntohl(ofpact_bitmap_to_openflow(taf->ofpacts, + version))); put_fields_property(reply, &taf->set_fields, NULL, set_fields_type + miss_offset, version); } @@ -4869,17 +5381,15 @@ put_table_instruction_features( size_t start_ofs; uint8_t table_id; - start_ofs = start_property(reply, OFPTFPT13_INSTRUCTIONS + miss_offset); - put_bitmap_properties(reply, - ntohl(ovsinst_bitmap_to_openflow(tif->instructions, - version))); - end_property(reply, start_ofs); + ofpprop_put_bitmap(reply, OFPTFPT13_INSTRUCTIONS + miss_offset, + ntohl(ovsinst_bitmap_to_openflow(tif->instructions, + version))); - start_ofs = start_property(reply, OFPTFPT13_NEXT_TABLES + miss_offset); + start_ofs = ofpprop_start(reply, OFPTFPT13_NEXT_TABLES + miss_offset); BITMAP_FOR_EACH_1 (table_id, 255, tif->next) { ofpbuf_put(reply, &table_id, 1); } - end_property(reply, start_ofs); + ofpprop_end(reply, start_ofs); put_table_action_features(reply, &tif->write, OFPTFPT13_WRITE_ACTIONS, @@ -4903,7 +5413,14 @@ ofputil_append_table_features_reply(const struct ofputil_table_features *tf, ovs_strlcpy(otf->name, tf->name, sizeof otf->name); otf->metadata_match = tf->metadata_match; otf->metadata_write = tf->metadata_write; - otf->config = ofputil_table_miss_to_config(tf->miss_config, version); + if (version >= OFP14_VERSION) { + if (tf->supports_eviction) { + otf->capabilities |= htonl(OFPTC14_EVICTION); + } + if (tf->supports_vacancy_events) { + otf->capabilities |= htonl(OFPTC14_VACANCY_EVENTS); + } + } otf->max_entries = htonl(tf->max_entries); put_table_instruction_features(reply, &tf->nonmiss, 0, version); @@ -4919,88 +5436,354 @@ ofputil_append_table_features_reply(const struct ofputil_table_features *tf, ofpmp_postappend(replies, start_ofs); } -/* ofputil_table_mod */ +static enum ofperr +parse_table_desc_vacancy_property(struct ofpbuf *property, + struct ofputil_table_desc *td) +{ + struct ofp14_table_mod_prop_vacancy *otv = property->data; -/* Given 'config', taken from an OpenFlow 'version' message that specifies - * table configuration (a table mod, table stats, or table features message), - * returns the table miss configuration that it specifies. */ -static enum ofputil_table_miss -ofputil_table_miss_from_config(ovs_be32 config_, enum ofp_version version) + if (property->size != sizeof *otv) { + return OFPERR_OFPBPC_BAD_LEN; + } + + td->table_vacancy.vacancy_down = otv->vacancy_down; + td->table_vacancy.vacancy_up = otv->vacancy_up; + td->table_vacancy.vacancy = otv->vacancy; + return 0; +} + +/* Decodes the next OpenFlow "table desc" message (of possibly several) from + * 'msg' into an abstract form in '*td'. Returns 0 if successful, EOF if the + * last "table desc" in 'msg' was already decoded, otherwise an OFPERR_* + * value. */ +int +ofputil_decode_table_desc(struct ofpbuf *msg, + struct ofputil_table_desc *td, + enum ofp_version version) { - uint32_t config = ntohl(config_); + memset(td, 0, sizeof *td); - if (version < OFP13_VERSION) { - switch (config & OFPTC11_TABLE_MISS_MASK) { - case OFPTC11_TABLE_MISS_CONTROLLER: - return OFPUTIL_TABLE_MISS_CONTROLLER; + if (!msg->header) { + ofpraw_pull_assert(msg); + } - case OFPTC11_TABLE_MISS_CONTINUE: - return OFPUTIL_TABLE_MISS_CONTINUE; + if (!msg->size) { + return EOF; + } - case OFPTC11_TABLE_MISS_DROP: - return OFPUTIL_TABLE_MISS_DROP; + struct ofp14_table_desc *otd = ofpbuf_try_pull(msg, sizeof *otd); + if (!otd) { + VLOG_WARN_RL(&bad_ofmsg_rl, "OFP14_TABLE_DESC reply has %"PRIu32" " + "leftover bytes at end", msg->size); + return OFPERR_OFPBRC_BAD_LEN; + } - default: - VLOG_WARN_RL(&bad_ofmsg_rl, "bad table miss config %d", config); - return OFPUTIL_TABLE_MISS_CONTROLLER; - } - } else { - return OFPUTIL_TABLE_MISS_DEFAULT; + td->table_id = otd->table_id; + size_t length = ntohs(otd->length); + if (length < sizeof *otd || length - sizeof *otd > msg->size) { + VLOG_WARN_RL(&bad_ofmsg_rl, "OFP14_TABLE_DESC reply claims invalid " + "length %"PRIuSIZE, length); + return OFPERR_OFPBRC_BAD_LEN; } -} + length -= sizeof *otd; -/* Given a table miss configuration, returns the corresponding OpenFlow table - * configuration for use in an OpenFlow message of the given 'version'. */ -ovs_be32 -ofputil_table_miss_to_config(enum ofputil_table_miss miss, - enum ofp_version version) -{ - if (version < OFP13_VERSION) { - switch (miss) { - case OFPUTIL_TABLE_MISS_CONTROLLER: - case OFPUTIL_TABLE_MISS_DEFAULT: - return htonl(OFPTC11_TABLE_MISS_CONTROLLER); + td->eviction = ofputil_decode_table_eviction(otd->config, version); + td->vacancy = ofputil_decode_table_vacancy(otd->config, version); + td->eviction_flags = UINT32_MAX; - case OFPUTIL_TABLE_MISS_CONTINUE: - return htonl(OFPTC11_TABLE_MISS_CONTINUE); + struct ofpbuf properties = ofpbuf_const_initializer( + ofpbuf_pull(msg, length), length); + while (properties.size > 0) { + struct ofpbuf payload; + enum ofperr error; + uint64_t type; - case OFPUTIL_TABLE_MISS_DROP: - return htonl(OFPTC11_TABLE_MISS_DROP); + error = ofpprop_pull(&properties, &payload, &type); + if (error) { + return error; + } + + switch (type) { + case OFPTMPT14_EVICTION: + error = ofpprop_parse_u32(&payload, &td->eviction_flags); + break; + + case OFPTMPT14_VACANCY: + error = parse_table_desc_vacancy_property(&payload, td); + break; default: - OVS_NOT_REACHED(); + error = OFPPROP_UNKNOWN(true, "table_desc", type); + break; } - } else { - return htonl(0); - } -} -/* Decodes the OpenFlow "table mod" message in '*oh' into an abstract form in + if (error) { + return error; + } + } + + return 0; +} + +/* Encodes and returns a request to obtain description of tables of a switch. + * The message is encoded for OpenFlow version 'ofp_version'. */ +struct ofpbuf * +ofputil_encode_table_desc_request(enum ofp_version ofp_version) +{ + struct ofpbuf *request = NULL; + + if (ofp_version >= OFP14_VERSION) { + request = ofpraw_alloc(OFPRAW_OFPST14_TABLE_DESC_REQUEST, + ofp_version, 0); + } else { + ovs_fatal(0, "dump-table-desc needs OpenFlow 1.4 or later " + "(\'-O OpenFlow14\')"); + } + + return request; +} + +/* Function to append Table desc information in a reply list. */ +void +ofputil_append_table_desc_reply(const struct ofputil_table_desc *td, + struct ovs_list *replies, + enum ofp_version version) +{ + struct ofpbuf *reply = ofpbuf_from_list(list_back(replies)); + size_t start_otd; + struct ofp14_table_desc *otd; + + start_otd = reply->size; + ofpbuf_put_zeros(reply, sizeof *otd); + if (td->eviction_flags != UINT32_MAX) { + ofpprop_put_u32(reply, OFPTMPT14_EVICTION, td->eviction_flags); + } + if (td->vacancy == OFPUTIL_TABLE_VACANCY_ON) { + struct ofp14_table_mod_prop_vacancy *otv; + + otv = ofpprop_put_zeros(reply, OFPTMPT14_VACANCY, sizeof *otv); + otv->vacancy_down = td->table_vacancy.vacancy_down; + otv->vacancy_up = td->table_vacancy.vacancy_up; + otv->vacancy = td->table_vacancy.vacancy; + } + + otd = ofpbuf_at_assert(reply, start_otd, sizeof *otd); + otd->length = htons(reply->size - start_otd); + otd->table_id = td->table_id; + otd->config = ofputil_encode_table_config(OFPUTIL_TABLE_MISS_DEFAULT, + td->eviction, td->vacancy, + version); + ofpmp_postappend(replies, start_otd); +} + +/* This function parses Vacancy property, and decodes the + * ofp14_table_mod_prop_vacancy in ofputil_table_mod. + * Returns OFPERR_OFPBPC_BAD_VALUE error code when vacancy_down is + * greater than vacancy_up and also when current vacancy has non-zero + * value. Returns 0 on success. */ +static enum ofperr +parse_table_mod_vacancy_property(struct ofpbuf *property, + struct ofputil_table_mod *tm) +{ + struct ofp14_table_mod_prop_vacancy *otv = property->data; + + if (property->size != sizeof *otv) { + return OFPERR_OFPBPC_BAD_LEN; + } + tm->table_vacancy.vacancy_down = otv->vacancy_down; + tm->table_vacancy.vacancy_up = otv->vacancy_up; + if (tm->table_vacancy.vacancy_down > tm->table_vacancy.vacancy_up) { + OFPPROP_LOG(&bad_ofmsg_rl, false, + "Value of vacancy_down is greater than vacancy_up"); + return OFPERR_OFPBPC_BAD_VALUE; + } + if (tm->table_vacancy.vacancy_down > 100 || + tm->table_vacancy.vacancy_up > 100) { + OFPPROP_LOG(&bad_ofmsg_rl, false, "Vacancy threshold percentage " + "should not be greater than 100"); + return OFPERR_OFPBPC_BAD_VALUE; + } + tm->table_vacancy.vacancy = otv->vacancy; + if (tm->table_vacancy.vacancy) { + OFPPROP_LOG(&bad_ofmsg_rl, false, + "Vacancy value should be zero for table-mod messages"); + return OFPERR_OFPBPC_BAD_VALUE; + } + return 0; +} + +/* Given 'config', taken from an OpenFlow 'version' message that specifies + * table configuration (a table mod, table stats, or table features message), + * returns the table vacancy configuration that it specifies. + * + * Only OpenFlow 1.4 and later specify table vacancy configuration this way, + * so for other 'version' this function always returns + * OFPUTIL_TABLE_VACANCY_DEFAULT. */ +static enum ofputil_table_vacancy +ofputil_decode_table_vacancy(ovs_be32 config, enum ofp_version version) +{ + return (version < OFP14_VERSION ? OFPUTIL_TABLE_VACANCY_DEFAULT + : config & htonl(OFPTC14_VACANCY_EVENTS) ? OFPUTIL_TABLE_VACANCY_ON + : OFPUTIL_TABLE_VACANCY_OFF); +} + +/* Given 'config', taken from an OpenFlow 'version' message that specifies + * table configuration (a table mod, table stats, or table features message), + * returns the table eviction configuration that it specifies. + * + * Only OpenFlow 1.4 and later specify table eviction configuration this way, + * so for other 'version' values this function always returns + * OFPUTIL_TABLE_EVICTION_DEFAULT. */ +static enum ofputil_table_eviction +ofputil_decode_table_eviction(ovs_be32 config, enum ofp_version version) +{ + return (version < OFP14_VERSION ? OFPUTIL_TABLE_EVICTION_DEFAULT + : config & htonl(OFPTC14_EVICTION) ? OFPUTIL_TABLE_EVICTION_ON + : OFPUTIL_TABLE_EVICTION_OFF); +} + +/* Returns a bitmap of OFPTC* values suitable for 'config' fields in various + * OpenFlow messages of the given 'version', based on the provided 'miss' and + * 'eviction' values. */ +static ovs_be32 +ofputil_encode_table_config(enum ofputil_table_miss miss, + enum ofputil_table_eviction eviction, + enum ofputil_table_vacancy vacancy, + enum ofp_version version) +{ + uint32_t config = 0; + /* See the section "OFPTC_* Table Configuration" in DESIGN.md for more + * information on the crazy evolution of this field. */ + switch (version) { + case OFP10_VERSION: + /* OpenFlow 1.0 didn't have such a field, any value ought to do. */ + return htonl(0); + + case OFP11_VERSION: + case OFP12_VERSION: + /* OpenFlow 1.1 and 1.2 define only OFPTC11_TABLE_MISS_*. */ + switch (miss) { + case OFPUTIL_TABLE_MISS_DEFAULT: + /* Really this shouldn't be used for encoding (the caller should + * provide a specific value) but I can't imagine that defaulting to + * the fall-through case here will hurt. */ + case OFPUTIL_TABLE_MISS_CONTROLLER: + default: + return htonl(OFPTC11_TABLE_MISS_CONTROLLER); + case OFPUTIL_TABLE_MISS_CONTINUE: + return htonl(OFPTC11_TABLE_MISS_CONTINUE); + case OFPUTIL_TABLE_MISS_DROP: + return htonl(OFPTC11_TABLE_MISS_DROP); + } + OVS_NOT_REACHED(); + + case OFP13_VERSION: + /* OpenFlow 1.3 removed OFPTC11_TABLE_MISS_* and didn't define any new + * flags, so this is correct. */ + return htonl(0); + + case OFP14_VERSION: + case OFP15_VERSION: + /* OpenFlow 1.4 introduced OFPTC14_EVICTION and + * OFPTC14_VACANCY_EVENTS. */ + if (eviction == OFPUTIL_TABLE_EVICTION_ON) { + config |= OFPTC14_EVICTION; + } + if (vacancy == OFPUTIL_TABLE_VACANCY_ON) { + config |= OFPTC14_VACANCY_EVENTS; + } + return htonl(config); + } + + OVS_NOT_REACHED(); +} + +/* Given 'config', taken from an OpenFlow 'version' message that specifies + * table configuration (a table mod, table stats, or table features message), + * returns the table miss configuration that it specifies. + * + * Only OpenFlow 1.1 and 1.2 specify table miss configurations this way, so for + * other 'version' values this function always returns + * OFPUTIL_TABLE_MISS_DEFAULT. */ +static enum ofputil_table_miss +ofputil_decode_table_miss(ovs_be32 config_, enum ofp_version version) +{ + uint32_t config = ntohl(config_); + + if (version == OFP11_VERSION || version == OFP12_VERSION) { + switch (config & OFPTC11_TABLE_MISS_MASK) { + case OFPTC11_TABLE_MISS_CONTROLLER: + return OFPUTIL_TABLE_MISS_CONTROLLER; + + case OFPTC11_TABLE_MISS_CONTINUE: + return OFPUTIL_TABLE_MISS_CONTINUE; + + case OFPTC11_TABLE_MISS_DROP: + return OFPUTIL_TABLE_MISS_DROP; + + default: + VLOG_WARN_RL(&bad_ofmsg_rl, "bad table miss config %d", config); + return OFPUTIL_TABLE_MISS_CONTROLLER; + } + } else { + return OFPUTIL_TABLE_MISS_DEFAULT; + } +} + +/* Decodes the OpenFlow "table mod" message in '*oh' into an abstract form in * '*pm'. Returns 0 if successful, otherwise an OFPERR_* value. */ enum ofperr ofputil_decode_table_mod(const struct ofp_header *oh, struct ofputil_table_mod *pm) { - enum ofpraw raw; - struct ofpbuf b; - - ofpbuf_use_const(&b, oh, ntohs(oh->length)); - raw = ofpraw_pull_assert(&b); + memset(pm, 0, sizeof *pm); + pm->miss = OFPUTIL_TABLE_MISS_DEFAULT; + pm->eviction = OFPUTIL_TABLE_EVICTION_DEFAULT; + pm->eviction_flags = UINT32_MAX; + pm->vacancy = OFPUTIL_TABLE_VACANCY_DEFAULT; + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); + enum ofpraw raw = ofpraw_pull_assert(&b); if (raw == OFPRAW_OFPT11_TABLE_MOD) { const struct ofp11_table_mod *otm = b.data; pm->table_id = otm->table_id; - pm->miss_config = ofputil_table_miss_from_config(otm->config, - oh->version); + pm->miss = ofputil_decode_table_miss(otm->config, oh->version); } else if (raw == OFPRAW_OFPT14_TABLE_MOD) { const struct ofp14_table_mod *otm = ofpbuf_pull(&b, sizeof *otm); pm->table_id = otm->table_id; - pm->miss_config = ofputil_table_miss_from_config(otm->config, - oh->version); - /* We do not understand any properties yet, so we do not bother - * parsing them. */ + pm->miss = ofputil_decode_table_miss(otm->config, oh->version); + pm->eviction = ofputil_decode_table_eviction(otm->config, oh->version); + pm->vacancy = ofputil_decode_table_vacancy(otm->config, oh->version); + while (b.size > 0) { + struct ofpbuf property; + enum ofperr error; + uint64_t type; + + error = ofpprop_pull(&b, &property, &type); + if (error) { + return error; + } + + switch (type) { + case OFPTMPT14_EVICTION: + error = ofpprop_parse_u32(&property, &pm->eviction); + break; + + case OFPTMPT14_VACANCY: + error = parse_table_mod_vacancy_property(&property, pm); + break; + + default: + error = OFPERR_OFPBRC_BAD_TYPE; + break; + } + + if (error) { + return error; + } + } } else { return OFPERR_OFPBRC_BAD_TYPE; } @@ -5008,11 +5791,11 @@ ofputil_decode_table_mod(const struct ofp_header *oh, return 0; } -/* Converts the abstract form of a "table mod" message in '*pm' into an OpenFlow - * message suitable for 'protocol', and returns that encoded form in a buffer - * owned by the caller. */ +/* Converts the abstract form of a "table mod" message in '*tm' into an + * OpenFlow message suitable for 'protocol', and returns that encoded form in a + * buffer owned by the caller. */ struct ofpbuf * -ofputil_encode_table_mod(const struct ofputil_table_mod *pm, +ofputil_encode_table_mod(const struct ofputil_table_mod *tm, enum ofputil_protocol protocol) { enum ofp_version ofp_version = ofputil_protocol_to_ofp_version(protocol); @@ -5031,9 +5814,9 @@ ofputil_encode_table_mod(const struct ofputil_table_mod *pm, b = ofpraw_alloc(OFPRAW_OFPT11_TABLE_MOD, ofp_version, 0); otm = ofpbuf_put_zeros(b, sizeof *otm); - otm->table_id = pm->table_id; - otm->config = ofputil_table_miss_to_config(pm->miss_config, - ofp_version); + otm->table_id = tm->table_id; + otm->config = ofputil_encode_table_config(tm->miss, tm->eviction, + tm->vacancy, ofp_version); break; } case OFP14_VERSION: @@ -5042,9 +5825,20 @@ ofputil_encode_table_mod(const struct ofputil_table_mod *pm, b = ofpraw_alloc(OFPRAW_OFPT14_TABLE_MOD, ofp_version, 0); otm = ofpbuf_put_zeros(b, sizeof *otm); - otm->table_id = pm->table_id; - otm->config = ofputil_table_miss_to_config(pm->miss_config, - ofp_version); + otm->table_id = tm->table_id; + otm->config = ofputil_encode_table_config(tm->miss, tm->eviction, + tm->vacancy, ofp_version); + + if (tm->eviction_flags != UINT32_MAX) { + ofpprop_put_u32(b, OFPTMPT14_EVICTION, tm->eviction_flags); + } + if (tm->vacancy == OFPUTIL_TABLE_VACANCY_ON) { + struct ofp14_table_mod_prop_vacancy *otv; + + otv = ofpprop_put_zeros(b, OFPTMPT14_VACANCY, sizeof *otv); + otv->vacancy_down = tm->table_vacancy.vacancy_down; + otv->vacancy_up = tm->table_vacancy.vacancy_up; + } break; } default: @@ -5063,12 +5857,8 @@ enum ofperr ofputil_decode_role_message(const struct ofp_header *oh, struct ofputil_role_request *rr) { - struct ofpbuf b; - enum ofpraw raw; - - ofpbuf_use_const(&b, oh, ntohs(oh->length)); - raw = ofpraw_pull_assert(&b); - + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); + enum ofpraw raw = ofpraw_pull_assert(&b); if (raw == OFPRAW_OFPT12_ROLE_REQUEST || raw == OFPRAW_OFPT12_ROLE_REPLY) { const struct ofp12_role_request *orr = b.msg; @@ -5182,15 +5972,11 @@ enum ofperr ofputil_decode_role_status(const struct ofp_header *oh, struct ofputil_role_status *rs) { - struct ofpbuf b; - enum ofpraw raw; - const struct ofp14_role_status *r; - - ofpbuf_use_const(&b, oh, ntohs(oh->length)); - raw = ofpraw_pull_assert(&b); + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); + enum ofpraw raw = ofpraw_pull_assert(&b); ovs_assert(raw == OFPRAW_OFPT14_ROLE_STATUS); - r = b.msg; + const struct ofp14_role_status *r = b.msg; if (r->role != htonl(OFPCR12_ROLE_NOCHANGE) && r->role != htonl(OFPCR12_ROLE_EQUAL) && r->role != htonl(OFPCR12_ROLE_MASTER) && @@ -5205,6 +5991,127 @@ ofputil_decode_role_status(const struct ofp_header *oh, return 0; } +/* Encodes 'rf' according to 'protocol', and returns the encoded message. + * 'protocol' must be for OpenFlow 1.4 or later. */ +struct ofpbuf * +ofputil_encode_requestforward(const struct ofputil_requestforward *rf, + enum ofputil_protocol protocol) +{ + enum ofp_version ofp_version = ofputil_protocol_to_ofp_version(protocol); + struct ofpbuf *inner; + + switch (rf->reason) { + case OFPRFR_GROUP_MOD: + inner = ofputil_encode_group_mod(ofp_version, rf->group_mod); + break; + + case OFPRFR_METER_MOD: + inner = ofputil_encode_meter_mod(ofp_version, rf->meter_mod); + break; + + case OFPRFR_N_REASONS: + default: + OVS_NOT_REACHED(); + } + + struct ofp_header *inner_oh = inner->data; + inner_oh->xid = rf->xid; + inner_oh->length = htons(inner->size); + + struct ofpbuf *outer = ofpraw_alloc_xid(OFPRAW_OFPT14_REQUESTFORWARD, + ofp_version, htonl(0), + inner->size); + ofpbuf_put(outer, inner->data, inner->size); + ofpbuf_delete(inner); + + return outer; +} + +/* Decodes OFPT_REQUESTFORWARD message 'outer'. On success, puts the decoded + * form into '*rf' and returns 0, and the caller is later responsible for + * freeing the content of 'rf', with ofputil_destroy_requestforward(rf). On + * failure, returns an ofperr and '*rf' is indeterminate. */ +enum ofperr +ofputil_decode_requestforward(const struct ofp_header *outer, + struct ofputil_requestforward *rf) +{ + struct ofpbuf b = ofpbuf_const_initializer(outer, ntohs(outer->length)); + + /* Skip past outer message. */ + enum ofpraw outer_raw = ofpraw_pull_assert(&b); + ovs_assert(outer_raw == OFPRAW_OFPT14_REQUESTFORWARD); + + /* Validate inner message. */ + if (b.size < sizeof(struct ofp_header)) { + return OFPERR_OFPBFC_MSG_BAD_LEN; + } + const struct ofp_header *inner = b.data; + unsigned int inner_len = ntohs(inner->length); + if (inner_len < sizeof(struct ofp_header) || inner_len > b.size) { + return OFPERR_OFPBFC_MSG_BAD_LEN; + } + if (inner->version != outer->version) { + return OFPERR_OFPBRC_BAD_VERSION; + } + + /* Parse inner message. */ + enum ofptype type; + enum ofperr error = ofptype_decode(&type, inner); + if (error) { + return error; + } + + rf->xid = inner->xid; + if (type == OFPTYPE_GROUP_MOD) { + rf->reason = OFPRFR_GROUP_MOD; + rf->group_mod = xmalloc(sizeof *rf->group_mod); + error = ofputil_decode_group_mod(inner, rf->group_mod); + if (error) { + free(rf->group_mod); + return error; + } + } else if (type == OFPTYPE_METER_MOD) { + rf->reason = OFPRFR_METER_MOD; + rf->meter_mod = xmalloc(sizeof *rf->meter_mod); + ofpbuf_init(&rf->bands, 64); + error = ofputil_decode_meter_mod(inner, rf->meter_mod, &rf->bands); + if (error) { + free(rf->meter_mod); + ofpbuf_uninit(&rf->bands); + return error; + } + } else { + return OFPERR_OFPBFC_MSG_UNSUP; + } + + return 0; +} + +/* Frees the content of 'rf', which should have been initialized through a + * successful call to ofputil_decode_requestforward(). */ +void +ofputil_destroy_requestforward(struct ofputil_requestforward *rf) +{ + if (!rf) { + return; + } + + switch (rf->reason) { + case OFPRFR_GROUP_MOD: + ofputil_uninit_group_mod(rf->group_mod); + free(rf->group_mod); + break; + + case OFPRFR_METER_MOD: + ofpbuf_uninit(&rf->bands); + free(rf->meter_mod); + break; + + case OFPRFR_N_REASONS: + OVS_NOT_REACHED(); + } +} + /* Table stats. */ /* OpenFlow 1.0 and 1.1 don't distinguish between a field that cannot be @@ -5390,8 +6297,10 @@ ofputil_put_ofp12_table_stats(const struct ofputil_table_stats *stats, out->metadata_write = features->metadata_write; out->instructions = ovsinst_bitmap_to_openflow( features->nonmiss.instructions, OFP12_VERSION); - out->config = ofputil_table_miss_to_config(features->miss_config, - OFP12_VERSION); + out->config = ofputil_encode_table_config(features->miss_config, + OFPUTIL_TABLE_EVICTION_DEFAULT, + OFPUTIL_TABLE_VACANCY_DEFAULT, + OFP12_VERSION); out->max_entries = htonl(features->max_entries); out->active_count = htonl(stats->active_count); out->lookup_count = htonll(stats->lookup_count); @@ -5497,8 +6406,8 @@ ofputil_decode_ofp11_table_stats(struct ofpbuf *msg, features->nonmiss.apply.ofpacts = ofpact_bitmap_from_openflow( ots->write_actions, OFP11_VERSION); features->miss = features->nonmiss; - features->miss_config = ofputil_table_miss_from_config(ots->config, - OFP11_VERSION); + features->miss_config = ofputil_decode_table_miss(ots->config, + OFP11_VERSION); features->match = mf_bitmap_from_of11(ots->match); features->wildcard = mf_bitmap_from_of11(ots->wildcards); bitmap_or(features->match.bm, features->wildcard.bm, MFF_N_IDS); @@ -5527,8 +6436,8 @@ ofputil_decode_ofp12_table_stats(struct ofpbuf *msg, ovs_strlcpy(features->name, ots->name, sizeof features->name); features->metadata_match = ots->metadata_match; features->metadata_write = ots->metadata_write; - features->miss_config = ofputil_table_miss_from_config(ots->config, - OFP12_VERSION); + features->miss_config = ofputil_decode_table_miss(ots->config, + OFP12_VERSION); features->max_entries = ntohl(ots->max_entries); features->nonmiss.instructions = ovsinst_bitmap_from_openflow( @@ -5596,6 +6505,8 @@ ofputil_decode_table_stats_reply(struct ofpbuf *msg, memset(stats, 0, sizeof *stats); memset(features, 0, sizeof *features); + features->supports_eviction = -1; + features->supports_vacancy_events = -1; switch ((enum ofp_version) oh->version) { case OFP10_VERSION: @@ -5724,6 +6635,7 @@ ofputil_decode_flow_update(struct ofputil_flow_update *update, ofpraw_pull_assert(msg); } + ofpbuf_clear(ofpacts); if (!msg->size) { return EOF; } @@ -5954,13 +6866,11 @@ make_echo_request(enum ofp_version ofp_version) struct ofpbuf * make_echo_reply(const struct ofp_header *rq) { - struct ofpbuf rq_buf; - struct ofpbuf *reply; - - ofpbuf_use_const(&rq_buf, rq, ntohs(rq->length)); + struct ofpbuf rq_buf = ofpbuf_const_initializer(rq, ntohs(rq->length)); ofpraw_pull_assert(&rq_buf); - reply = ofpraw_alloc_reply(OFPRAW_OFPT_ECHO_REPLY, rq, rq_buf.size); + struct ofpbuf *reply = ofpraw_alloc_reply(OFPRAW_OFPT_ECHO_REPLY, + rq, rq_buf.size); ofpbuf_put(reply, rq_buf.data, rq_buf.size); return reply; } @@ -5991,29 +6901,30 @@ ofputil_encode_barrier_request(enum ofp_version ofp_version) } const char * -ofputil_frag_handling_to_string(enum ofp_config_flags flags) +ofputil_frag_handling_to_string(enum ofputil_frag_handling frag) { - switch (flags & OFPC_FRAG_MASK) { - case OFPC_FRAG_NORMAL: return "normal"; - case OFPC_FRAG_DROP: return "drop"; - case OFPC_FRAG_REASM: return "reassemble"; - case OFPC_FRAG_NX_MATCH: return "nx-match"; + switch (frag) { + case OFPUTIL_FRAG_NORMAL: return "normal"; + case OFPUTIL_FRAG_DROP: return "drop"; + case OFPUTIL_FRAG_REASM: return "reassemble"; + case OFPUTIL_FRAG_NX_MATCH: return "nx-match"; } OVS_NOT_REACHED(); } bool -ofputil_frag_handling_from_string(const char *s, enum ofp_config_flags *flags) +ofputil_frag_handling_from_string(const char *s, + enum ofputil_frag_handling *frag) { if (!strcasecmp(s, "normal")) { - *flags = OFPC_FRAG_NORMAL; + *frag = OFPUTIL_FRAG_NORMAL; } else if (!strcasecmp(s, "drop")) { - *flags = OFPC_FRAG_DROP; + *frag = OFPUTIL_FRAG_DROP; } else if (!strcasecmp(s, "reassemble")) { - *flags = OFPC_FRAG_REASM; + *frag = OFPUTIL_FRAG_REASM; } else if (!strcasecmp(s, "nx-match")) { - *flags = OFPC_FRAG_NX_MATCH; + *frag = OFPUTIL_FRAG_NX_MATCH; } else { return false; } @@ -6189,9 +7100,9 @@ bool ofputil_group_from_string(const char *s, uint32_t *group_idp) { if (!strcasecmp(s, "any")) { - *group_idp = OFPG11_ANY; + *group_idp = OFPG_ANY; } else if (!strcasecmp(s, "all")) { - *group_idp = OFPG11_ALL; + *group_idp = OFPG_ALL; } else if (!str_to_uint(s, 10, group_idp)) { VLOG_WARN("%s is not a valid group ID. (Valid group IDs are " "32-bit nonnegative integers or the keywords ANY or " @@ -6204,7 +7115,7 @@ ofputil_group_from_string(const char *s, uint32_t *group_idp) /* Appends to 's' a string representation of the OpenFlow group ID 'group_id'. * Most groups' string representation is just the number, but for special - * groups, e.g. OFPG11_ALL, it is the name, e.g. "ALL". */ + * groups, e.g. OFPG_ALL, it is the name, e.g. "ALL". */ void ofputil_format_group(uint32_t group_id, struct ds *s) { @@ -6217,18 +7128,18 @@ ofputil_format_group(uint32_t group_id, struct ds *s) /* Puts in the 'bufsize' byte in 'namebuf' a null-terminated string * representation of OpenFlow group ID 'group_id'. Most group are represented - * as just their number, but special groups, e.g. OFPG11_ALL, are represented + * as just their number, but special groups, e.g. OFPG_ALL, are represented * by name, e.g. "ALL". */ void ofputil_group_to_string(uint32_t group_id, char namebuf[MAX_GROUP_NAME_LEN + 1], size_t bufsize) { switch (group_id) { - case OFPG11_ALL: + case OFPG_ALL: ovs_strlcpy(namebuf, "ALL", bufsize); break; - case OFPG11_ANY: + case OFPG_ANY: ovs_strlcpy(namebuf, "ANY", bufsize); break; @@ -6333,10 +7244,10 @@ ofputil_normalize_match__(struct match *match, bool may_log) wc.masks.nw_ttl = 0; } if (!(may_match & MAY_ARP_SHA)) { - memset(wc.masks.arp_sha, 0, ETH_ADDR_LEN); + WC_UNMASK_FIELD(&wc, arp_sha); } if (!(may_match & MAY_ARP_THA)) { - memset(wc.masks.arp_tha, 0, ETH_ADDR_LEN); + WC_UNMASK_FIELD(&wc, arp_tha); } if (!(may_match & MAY_IPV6)) { wc.masks.ipv6_src = wc.masks.ipv6_dst = in6addr_any; @@ -6579,10 +7490,7 @@ ofputil_append_ofp14_port_stats(const struct ofputil_port_stats *ops, ps14->rx_errors = htonll(ops->stats.rx_errors); ps14->tx_errors = htonll(ops->stats.tx_errors); - eth = ofpbuf_put_uninit(reply, sizeof *eth); - eth->type = htons(OFPPSPT14_ETHERNET); - eth->length = htons(sizeof *eth); - memset(eth->pad, 0, sizeof eth->pad); + eth = ofpprop_put_zeros(reply, OFPPSPT14_ETHERNET, sizeof *eth); eth->rx_frame_err = htonll(ops->stats.rx_frame_errors); eth->rx_over_err = htonll(ops->stats.rx_over_errors); eth->rx_crc_err = htonll(ops->stats.rx_crc_errors); @@ -6711,24 +7619,18 @@ static enum ofperr ofputil_pull_ofp14_port_stats(struct ofputil_port_stats *ops, struct ofpbuf *msg) { - const struct ofp14_port_stats *ps14; - struct ofpbuf properties; - enum ofperr error; - size_t len; - - ps14 = ofpbuf_try_pull(msg, sizeof *ps14); + const struct ofp14_port_stats *ps14 = ofpbuf_try_pull(msg, sizeof *ps14); if (!ps14) { return OFPERR_OFPBRC_BAD_LEN; } - len = ntohs(ps14->length); + size_t len = ntohs(ps14->length); if (len < sizeof *ps14 || len - sizeof *ps14 > msg->size) { return OFPERR_OFPBRC_BAD_LEN; } len -= sizeof *ps14; - ofpbuf_use_const(&properties, ofpbuf_pull(msg, len), len); - error = ofputil_port_from_ofp11(ps14->port_no, &ops->port_no); + enum ofperr error = ofputil_port_from_ofp11(ps14->port_no, &ops->port_no); if (error) { return error; } @@ -6748,12 +7650,14 @@ ofputil_pull_ofp14_port_stats(struct ofputil_port_stats *ops, ops->stats.rx_crc_errors = UINT64_MAX; ops->stats.collisions = UINT64_MAX; + struct ofpbuf properties = ofpbuf_const_initializer(ofpbuf_pull(msg, len), + len); while (properties.size > 0) { struct ofpbuf payload; enum ofperr error; - uint16_t type; + uint64_t type; - error = ofputil_pull_property(&properties, &payload, &type); + error = ofpprop_pull(&properties, &payload, &type); if (error) { return error; } @@ -6764,8 +7668,7 @@ ofputil_pull_ofp14_port_stats(struct ofputil_port_stats *ops, break; default: - log_property(true, "unknown port stats property %"PRIu16, type); - error = 0; + error = OFPPROP_UNKNOWN(true, "port stats", type); break; } @@ -6782,16 +7685,15 @@ ofputil_pull_ofp14_port_stats(struct ofputil_port_stats *ops, size_t ofputil_count_port_stats(const struct ofp_header *oh) { - struct ofputil_port_stats ps; - struct ofpbuf b; - size_t n = 0; - - ofpbuf_use_const(&b, oh, ntohs(oh->length)); + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); ofpraw_pull_assert(&b); - while (!ofputil_decode_port_stats(&ps, &b)) { - n++; + + for (size_t n = 0; ; n++) { + struct ofputil_port_stats ps; + if (ofputil_decode_port_stats(&ps, &b)) { + return n; + } } - return n; } /* Converts an OFPST_PORT_STATS reply in 'msg' into an abstract @@ -7041,11 +7943,8 @@ ofputil_uninit_group_desc(struct ofputil_group_desc *gd) uint32_t ofputil_decode_group_desc_request(const struct ofp_header *oh) { - struct ofpbuf request; - enum ofpraw raw; - - ofpbuf_use_const(&request, oh, ntohs(oh->length)); - raw = ofpraw_pull_assert(&request); + struct ofpbuf request = ofpbuf_const_initializer(oh, ntohs(oh->length)); + enum ofpraw raw = ofpraw_pull_assert(&request); if (raw == OFPRAW_OFPST11_GROUP_DESC_REQUEST) { return OFPG_ALL; } else if (raw == OFPRAW_OFPST15_GROUP_DESC_REQUEST) { @@ -7068,7 +7967,6 @@ ofputil_encode_group_desc_request(enum ofp_version ofp_version, uint32_t group_id) { struct ofpbuf *request; - ovs_be32 gid; switch (ofp_version) { case OFP10_VERSION: @@ -7081,12 +7979,14 @@ ofputil_encode_group_desc_request(enum ofp_version ofp_version, request = ofpraw_alloc(OFPRAW_OFPST11_GROUP_DESC_REQUEST, ofp_version, 0); break; - case OFP15_VERSION: + case OFP15_VERSION:{ + struct ofp15_group_desc_request *req; request = ofpraw_alloc(OFPRAW_OFPST15_GROUP_DESC_REQUEST, ofp_version, 0); - gid = htonl(group_id); - ofpbuf_put(request, &gid, sizeof gid); + req = ofpbuf_put_zeros(request, sizeof *req); + req->group_id = htonl(group_id); break; + } default: OVS_NOT_REACHED(); } @@ -7359,34 +8259,6 @@ ofputil_put_ofp11_bucket(const struct ofputil_bucket *bucket, ob->watch_group = htonl(bucket->watch_group); } -static void -ofputil_put_ofp15_group_bucket_prop_weight(ovs_be16 weight, - struct ofpbuf *openflow) -{ - size_t start_ofs; - struct ofp15_group_bucket_prop_weight *prop; - - start_ofs = start_property(openflow, OFPGBPT15_WEIGHT); - ofpbuf_put_zeros(openflow, sizeof *prop - sizeof(struct ofp_prop_header)); - prop = ofpbuf_at_assert(openflow, start_ofs, sizeof *prop); - prop->weight = weight; - end_property(openflow, start_ofs); -} - -static void -ofputil_put_ofp15_group_bucket_prop_watch(ovs_be32 watch, uint16_t type, - struct ofpbuf *openflow) -{ - size_t start_ofs; - struct ofp15_group_bucket_prop_watch *prop; - - start_ofs = start_property(openflow, type); - ofpbuf_put_zeros(openflow, sizeof *prop - sizeof(struct ofp_prop_header)); - prop = ofpbuf_at_assert(openflow, start_ofs, sizeof *prop); - prop->watch = watch; - end_property(openflow, start_ofs); -} - static void ofputil_put_ofp15_bucket(const struct ofputil_bucket *bucket, uint32_t bucket_id, enum ofp11_group_type group_type, @@ -7404,20 +8276,14 @@ ofputil_put_ofp15_bucket(const struct ofputil_bucket *bucket, actions_len = openflow->size - actions_start; if (group_type == OFPGT11_SELECT) { - ofputil_put_ofp15_group_bucket_prop_weight(htons(bucket->weight), - openflow); + ofpprop_put_u16(openflow, OFPGBPT15_WEIGHT, bucket->weight); } if (bucket->watch_port != OFPP_ANY) { - ovs_be32 port = ofputil_port_to_ofp11(bucket->watch_port); - ofputil_put_ofp15_group_bucket_prop_watch(port, - OFPGBPT15_WATCH_PORT, - openflow); + ofpprop_put_be32(openflow, OFPGBPT15_WATCH_PORT, + ofputil_port_to_ofp11(bucket->watch_port)); } if (bucket->watch_group != OFPG_ANY) { - ovs_be32 group = htonl(bucket->watch_group); - ofputil_put_ofp15_group_bucket_prop_watch(group, - OFPGBPT15_WATCH_GROUP, - openflow); + ofpprop_put_u32(openflow, OFPGBPT15_WATCH_GROUP, bucket->watch_group); } ob = ofpbuf_at_assert(openflow, start, sizeof *ob); @@ -7443,7 +8309,7 @@ ofputil_put_group_prop_ntr_selection_method(enum ofp_version ofp_version, prop->exp_type = htonl(NTRT_SELECTION_METHOD); strcpy(prop->selection_method, gp->selection_method); prop->selection_method_param = htonll(gp->selection_method_param); - end_property(openflow, start); + ofpprop_end(openflow, start); } static void @@ -7489,7 +8355,6 @@ ofputil_append_ofp15_group_desc_reply(const struct ofputil_group_desc *gds, gds->type, reply, version); } ogds = ofpbuf_at_assert(reply, start_ogds, sizeof *ogds); - ogds->length = htons(reply->size - start_ogds); ogds->type = gds->type; ogds->group_id = htonl(gds->group_id); ogds->bucket_list_len = htons(reply->size - start_buckets); @@ -7499,6 +8364,7 @@ ofputil_append_ofp15_group_desc_reply(const struct ofputil_group_desc *gds, ofputil_put_group_prop_ntr_selection_method(version, &gds->props, reply); } + ogds->length = htons(reply->size - start_ogds); ofpmp_postappend(replies, start_ogds); } @@ -7597,55 +8463,21 @@ ofputil_pull_ofp11_buckets(struct ofpbuf *msg, size_t buckets_length, } static enum ofperr -parse_ofp15_group_bucket_prop_weight(const struct ofpbuf *payload, - ovs_be16 *weight) +ofputil_pull_ofp15_buckets(struct ofpbuf *msg, size_t buckets_length, + enum ofp_version version, uint8_t group_type, + struct ovs_list *buckets) { - struct ofp15_group_bucket_prop_weight *prop = payload->data; - - if (payload->size != sizeof *prop) { - log_property(false, "OpenFlow bucket weight property length " - "%u is not valid", payload->size); - return OFPERR_OFPBPC_BAD_LEN; - } - - *weight = prop->weight; - - return 0; -} - -static enum ofperr -parse_ofp15_group_bucket_prop_watch(const struct ofpbuf *payload, - ovs_be32 *watch) -{ - struct ofp15_group_bucket_prop_watch *prop = payload->data; - - if (payload->size != sizeof *prop) { - log_property(false, "OpenFlow bucket watch port or group " - "property length %u is not valid", payload->size); - return OFPERR_OFPBPC_BAD_LEN; - } - - *watch = prop->watch; - - return 0; -} - -static enum ofperr -ofputil_pull_ofp15_buckets(struct ofpbuf *msg, size_t buckets_length, - enum ofp_version version, struct ovs_list *buckets) -{ - struct ofp15_bucket *ob; + struct ofp15_bucket *ob; list_init(buckets); while (buckets_length > 0) { struct ofputil_bucket *bucket = NULL; struct ofpbuf ofpacts; enum ofperr err = OFPERR_OFPGMFC_BAD_BUCKET; - struct ofpbuf properties; size_t ob_len, actions_len, properties_len; ovs_be32 watch_port = ofputil_port_to_ofp11(OFPP_ANY); ovs_be32 watch_group = htonl(OFPG_ANY); - ovs_be16 weight = htons(1); + ovs_be16 weight = htons(group_type == OFPGT11_SELECT ? 1 : 0); ofpbuf_init(&ofpacts, 0); @@ -7684,37 +8516,32 @@ ofputil_pull_ofp15_buckets(struct ofpbuf *msg, size_t buckets_length, } properties_len = ob_len - sizeof *ob - actions_len; - ofpbuf_use_const(&properties, ofpbuf_pull(msg, properties_len), - properties_len); - + struct ofpbuf properties = ofpbuf_const_initializer( + ofpbuf_pull(msg, properties_len), properties_len); while (properties.size > 0) { struct ofpbuf payload; - uint16_t type; + uint64_t type; - err = ofputil_pull_property(&properties, &payload, &type); + err = ofpprop_pull(&properties, &payload, &type); if (err) { goto err; } switch (type) { case OFPGBPT15_WEIGHT: - err = parse_ofp15_group_bucket_prop_weight(&payload, &weight); + err = ofpprop_parse_be16(&payload, &weight); break; case OFPGBPT15_WATCH_PORT: - err = parse_ofp15_group_bucket_prop_watch(&payload, - &watch_port); + err = ofpprop_parse_be32(&payload, &watch_port); break; case OFPGBPT15_WATCH_GROUP: - err = parse_ofp15_group_bucket_prop_watch(&payload, - &watch_group); + err = ofpprop_parse_be32(&payload, &watch_group); break; default: - log_property(false, "unknown group bucket property %"PRIu16, - type); - err = OFPERR_OFPBPC_BAD_TYPE; + err = OFPPROP_UNKNOWN(false, "group bucket", type); break; } @@ -7784,8 +8611,8 @@ parse_group_prop_ntr_selection_method(struct ofpbuf *payload, case OFPGT11_ALL: case OFPGT11_INDIRECT: case OFPGT11_FF: - log_property(false, "ntr selection method property is only allowed " - "for select groups"); + OFPPROP_LOG(&bad_ofmsg_rl, false, "ntr selection method property is " + "only allowed for select groups"); return OFPERR_OFPBPC_BAD_VALUE; default: OVS_NOT_REACHED(); @@ -7798,29 +8625,31 @@ parse_group_prop_ntr_selection_method(struct ofpbuf *payload, case OFPGC15_DELETE: case OFPGC15_INSERT_BUCKET: case OFPGC15_REMOVE_BUCKET: - log_property(false, "ntr selection method property is only allowed " - "for add and delete group modifications"); + OFPPROP_LOG(&bad_ofmsg_rl, false, "ntr selection method property is " + "only allowed for add and delete group modifications"); return OFPERR_OFPBPC_BAD_VALUE; default: OVS_NOT_REACHED(); } if (payload->size < sizeof *prop) { - log_property(false, "ntr selection method property length " - "%u is not valid", payload->size); + OFPPROP_LOG(&bad_ofmsg_rl, false, "ntr selection method property " + "length %u is not valid", payload->size); return OFPERR_OFPBPC_BAD_LEN; } method_len = strnlen(prop->selection_method, NTR_MAX_SELECTION_METHOD_LEN); if (method_len == NTR_MAX_SELECTION_METHOD_LEN) { - log_property(false, "ntr selection method is not null terminated"); + OFPPROP_LOG(&bad_ofmsg_rl, false, + "ntr selection method is not null terminated"); return OFPERR_OFPBPC_BAD_VALUE; } if (strcmp("hash", prop->selection_method)) { - log_property(false, "ntr selection method '%s' is not supported", - prop->selection_method); + OFPPROP_LOG(&bad_ofmsg_rl, false, + "ntr selection method '%s' is not supported", + prop->selection_method); return OFPERR_OFPBPC_BAD_VALUE; } @@ -7828,8 +8657,8 @@ parse_group_prop_ntr_selection_method(struct ofpbuf *payload, gp->selection_method_param = ntohll(prop->selection_method_param); if (!method_len && gp->selection_method_param) { - log_property(false, "ntr selection method parameter is non-zero but " - "selection method is empty"); + OFPPROP_LOG(&bad_ofmsg_rl, false, "ntr selection method parameter is " + "non-zero but selection method is empty"); return OFPERR_OFPBPC_BAD_VALUE; } @@ -7837,79 +8666,22 @@ parse_group_prop_ntr_selection_method(struct ofpbuf *payload, fields_len = ntohs(prop->length) - sizeof *prop; if (!method_len && fields_len) { - log_property(false, "ntr selection method parameter is zero " - "but fields are provided"); + OFPPROP_LOG(&bad_ofmsg_rl, false, "ntr selection method parameter is " + "zero but fields are provided"); return OFPERR_OFPBPC_BAD_VALUE; } error = oxm_pull_field_array(payload->data, fields_len, &gp->fields); if (error) { - log_property(false, "ntr selection method fields are invalid"); + OFPPROP_LOG(&bad_ofmsg_rl, false, + "ntr selection method fields are invalid"); return error; } return 0; } -static enum ofperr -parse_group_prop_ntr(struct ofpbuf *payload, uint32_t exp_type, - enum ofp11_group_type group_type, - enum ofp15_group_mod_command group_cmd, - struct ofputil_group_props *gp) -{ - enum ofperr error; - - switch (exp_type) { - case NTRT_SELECTION_METHOD: - error = parse_group_prop_ntr_selection_method(payload, group_type, - group_cmd, gp); - break; - - default: - log_property(false, "unknown group property ntr experimenter type " - "%"PRIu32, exp_type); - error = OFPERR_OFPBPC_BAD_TYPE; - break; - } - - return error; -} - -static enum ofperr -parse_ofp15_group_prop_exp(struct ofpbuf *payload, - enum ofp11_group_type group_type, - enum ofp15_group_mod_command group_cmd, - struct ofputil_group_props *gp) -{ - struct ofp_prop_experimenter *prop = payload->data; - uint16_t experimenter; - uint32_t exp_type; - enum ofperr error; - - if (payload->size < sizeof *prop) { - return OFPERR_OFPBPC_BAD_LEN; - } - - experimenter = ntohl(prop->experimenter); - exp_type = ntohl(prop->exp_type); - - switch (experimenter) { - case NTR_VENDOR_ID: - error = parse_group_prop_ntr(payload, exp_type, group_type, - group_cmd, gp); - break; - - default: - log_property(false, "unknown group property experimenter %"PRIu16, - experimenter); - error = OFPERR_OFPBPC_BAD_EXPERIMENTER; - break; - } - - return error; -} - static enum ofperr parse_ofp15_group_properties(struct ofpbuf *msg, enum ofp11_group_type group_type, @@ -7917,30 +8689,27 @@ parse_ofp15_group_properties(struct ofpbuf *msg, struct ofputil_group_props *gp, size_t properties_len) { - struct ofpbuf properties; - - ofpbuf_use_const(&properties, ofpbuf_pull(msg, properties_len), - properties_len); - + struct ofpbuf properties = ofpbuf_const_initializer( + ofpbuf_pull(msg, properties_len), properties_len); while (properties.size > 0) { struct ofpbuf payload; enum ofperr error; - uint16_t type; + uint64_t type; - error = ofputil_pull_property(&properties, &payload, &type); + error = ofpprop_pull(&properties, &payload, &type); if (error) { return error; } switch (type) { - case OFPGPT15_EXPERIMENTER: - error = parse_ofp15_group_prop_exp(&payload, group_type, - group_cmd, gp); + case OFPPROP_EXP(NTR_VENDOR_ID, NTRT_SELECTION_METHOD): + case OFPPROP_EXP(NTR_COMPAT_VENDOR_ID, NTRT_SELECTION_METHOD): + error = parse_group_prop_ntr_selection_method(&payload, group_type, + group_cmd, gp); break; default: - log_property(false, "unknown group property %"PRIu16, type); - error = OFPERR_OFPBPC_BAD_TYPE; + error = OFPPROP_UNKNOWN(false, "group", type); break; } @@ -8027,7 +8796,7 @@ ofputil_decode_ofp15_group_desc_reply(struct ofputil_group_desc *gd, "bucket list length %u", bucket_list_len); return OFPERR_OFPBRC_BAD_LEN; } - error = ofputil_pull_ofp15_buckets(msg, bucket_list_len, version, + error = ofputil_pull_ofp15_buckets(msg, bucket_list_len, version, gd->type, &gd->buckets); if (error) { return error; @@ -8042,7 +8811,7 @@ ofputil_decode_ofp15_group_desc_reply(struct ofputil_group_desc *gd, * claim that the group mod command is OFPGC15_ADD to * satisfy the check in parse_group_prop_ntr_selection_method() */ return parse_ofp15_group_properties(msg, gd->type, OFPGC15_ADD, &gd->props, - msg->size); + length - sizeof *ogds - bucket_list_len); } /* Converts a group description reply in 'msg' into an abstract @@ -8325,7 +9094,7 @@ ofputil_pull_ofp15_group_mod(struct ofpbuf *msg, enum ofp_version ofp_version, bucket_list_len = ntohs(ogm->bucket_array_len); error = ofputil_pull_ofp15_buckets(msg, bucket_list_len, ofp_version, - &gm->buckets); + gm->type, &gm->buckets); if (error) { return error; } @@ -8340,16 +9109,13 @@ enum ofperr ofputil_decode_group_mod(const struct ofp_header *oh, struct ofputil_group_mod *gm) { - enum ofp_version ofp_version = oh->version; - struct ofpbuf msg; - struct ofputil_bucket *bucket; - enum ofperr err; + ofputil_init_group_properties(&gm->props); - ofpbuf_use_const(&msg, oh, ntohs(oh->length)); + enum ofp_version ofp_version = oh->version; + struct ofpbuf msg = ofpbuf_const_initializer(oh, ntohs(oh->length)); ofpraw_pull_assert(&msg); - ofputil_init_group_properties(&gm->props); - + enum ofperr err; switch (ofp_version) { case OFP11_VERSION: @@ -8367,7 +9133,6 @@ ofputil_decode_group_mod(const struct ofp_header *oh, default: OVS_NOT_REACHED(); } - if (err) { return err; } @@ -8375,7 +9140,7 @@ ofputil_decode_group_mod(const struct ofp_header *oh, switch (gm->type) { case OFPGT11_INDIRECT: if (!list_is_singleton(&gm->buckets)) { - return OFPERR_OFPGMFC_OUT_OF_BUCKETS; + return OFPERR_OFPGMFC_INVALID_GROUP; } break; case OFPGT11_ALL: @@ -8383,7 +9148,7 @@ ofputil_decode_group_mod(const struct ofp_header *oh, case OFPGT11_FF: break; default: - OVS_NOT_REACHED(); + return OFPERR_OFPGMFC_BAD_TYPE; } switch (gm->command) { @@ -8398,10 +9163,15 @@ ofputil_decode_group_mod(const struct ofp_header *oh, } break; default: - OVS_NOT_REACHED(); + return OFPERR_OFPGMFC_BAD_COMMAND; } + struct ofputil_bucket *bucket; LIST_FOR_EACH (bucket, list_node, &gm->buckets) { + if (bucket->weight && gm->type != OFPGT11_SELECT) { + return OFPERR_OFPGMFC_INVALID_GROUP; + } + switch (gm->type) { case OFPGT11_ALL: case OFPGT11_INDIRECT: @@ -8417,7 +9187,9 @@ ofputil_decode_group_mod(const struct ofp_header *oh, } break; default: - OVS_NOT_REACHED(); + /* Returning BAD TYPE to be consistent + * though gm->type has been checked already. */ + return OFPERR_OFPGMFC_BAD_TYPE; } } @@ -8501,16 +9273,15 @@ ofputil_encode_queue_stats_request(enum ofp_version ofp_version, size_t ofputil_count_queue_stats(const struct ofp_header *oh) { - struct ofputil_queue_stats qs; - struct ofpbuf b; - size_t n = 0; - - ofpbuf_use_const(&b, oh, ntohs(oh->length)); + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); ofpraw_pull_assert(&b); - while (!ofputil_decode_queue_stats(&qs, &b)) { - n++; + + for (size_t n = 0; ; n++) { + struct ofputil_queue_stats qs; + if (ofputil_decode_queue_stats(&qs, &b)) { + return n; + } } - return n; } static enum ofperr @@ -8731,15 +9502,11 @@ enum ofperr ofputil_decode_bundle_ctrl(const struct ofp_header *oh, struct ofputil_bundle_ctrl_msg *msg) { - struct ofpbuf b; - enum ofpraw raw; - const struct ofp14_bundle_ctrl_msg *m; - - ofpbuf_use_const(&b, oh, ntohs(oh->length)); - raw = ofpraw_pull_assert(&b); + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); + enum ofpraw raw = ofpraw_pull_assert(&b); ovs_assert(raw == OFPRAW_OFPT14_BUNDLE_CONTROL); - m = b.msg; + const struct ofp14_bundle_ctrl_msg *m = b.msg; msg->bundle_id = ntohl(m->bundle_id); msg->type = ntohs(m->type); msg->flags = ntohs(m->flags); @@ -8747,6 +9514,36 @@ ofputil_decode_bundle_ctrl(const struct ofp_header *oh, return 0; } +struct ofpbuf * +ofputil_encode_bundle_ctrl_request(enum ofp_version ofp_version, + struct ofputil_bundle_ctrl_msg *bc) +{ + struct ofpbuf *request; + struct ofp14_bundle_ctrl_msg *m; + + switch (ofp_version) { + case OFP10_VERSION: + case OFP11_VERSION: + case OFP12_VERSION: + case OFP13_VERSION: + ovs_fatal(0, "bundles need OpenFlow 1.4 or later " + "(\'-O OpenFlow14\')"); + case OFP14_VERSION: + case OFP15_VERSION: + request = ofpraw_alloc(OFPRAW_OFPT14_BUNDLE_CONTROL, ofp_version, 0); + m = ofpbuf_put_zeros(request, sizeof *m); + + m->bundle_id = htonl(bc->bundle_id); + m->type = htons(bc->type); + m->flags = htons(bc->flags); + break; + default: + OVS_NOT_REACHED(); + } + + return request; +} + struct ofpbuf * ofputil_encode_bundle_ctrl_reply(const struct ofp_header *oh, struct ofputil_bundle_ctrl_msg *msg) @@ -8781,6 +9578,7 @@ ofputil_is_bundlable(enum ofptype type) case OFPTYPE_TABLE_MOD: case OFPTYPE_METER_MOD: case OFPTYPE_PACKET_OUT: + case OFPTYPE_NXT_TLV_TABLE_MOD: /* Not to be bundlable. */ case OFPTYPE_ECHO_REQUEST: @@ -8802,6 +9600,7 @@ ofputil_is_bundlable(enum ofptype type) case OFPTYPE_AGGREGATE_STATS_REQUEST: case OFPTYPE_TABLE_STATS_REQUEST: case OFPTYPE_TABLE_FEATURES_STATS_REQUEST: + case OFPTYPE_TABLE_DESC_REQUEST: case OFPTYPE_PORT_STATS_REQUEST: case OFPTYPE_QUEUE_STATS_REQUEST: case OFPTYPE_PORT_DESC_STATS_REQUEST: @@ -8843,7 +9642,13 @@ ofputil_is_bundlable(enum ofptype type) case OFPTYPE_METER_CONFIG_STATS_REPLY: case OFPTYPE_METER_FEATURES_STATS_REPLY: case OFPTYPE_TABLE_FEATURES_STATS_REPLY: + case OFPTYPE_TABLE_DESC_REPLY: case OFPTYPE_ROLE_STATUS: + case OFPTYPE_REQUESTFORWARD: + case OFPTYPE_TABLE_STATUS: + case OFPTYPE_NXT_TLV_TABLE_REQUEST: + case OFPTYPE_NXT_TLV_TABLE_REPLY: + case OFPTYPE_NXT_RESUME: break; } @@ -8852,25 +9657,22 @@ ofputil_is_bundlable(enum ofptype type) enum ofperr ofputil_decode_bundle_add(const struct ofp_header *oh, - struct ofputil_bundle_add_msg *msg) + struct ofputil_bundle_add_msg *msg, + enum ofptype *typep) { - const struct ofp14_bundle_ctrl_msg *m; - struct ofpbuf b; - enum ofpraw raw; - size_t inner_len; - enum ofperr error; - enum ofptype type; - - ofpbuf_use_const(&b, oh, ntohs(oh->length)); - raw = ofpraw_pull_assert(&b); + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); + enum ofpraw raw = ofpraw_pull_assert(&b); ovs_assert(raw == OFPRAW_OFPT14_BUNDLE_ADD_MESSAGE); - m = ofpbuf_pull(&b, sizeof *m); + const struct ofp14_bundle_ctrl_msg *m = ofpbuf_pull(&b, sizeof *m); msg->bundle_id = ntohl(m->bundle_id); msg->flags = ntohs(m->flags); msg->msg = b.data; - inner_len = ntohs(msg->msg->length); + if (msg->msg->version != oh->version) { + return OFPERR_NXBFC_BAD_VERSION; + } + size_t inner_len = ntohs(msg->msg->length); if (inner_len < sizeof(struct ofp_header) || inner_len > b.size) { return OFPERR_OFPBFC_MSG_BAD_LEN; } @@ -8879,7 +9681,8 @@ ofputil_decode_bundle_add(const struct ofp_header *oh, } /* Reject unbundlable messages. */ - error = ofptype_decode(&type, msg->msg); + enum ofptype type; + enum ofperr error = ofptype_decode(&type, msg->msg); if (error) { VLOG_WARN_RL(&bad_ofmsg_rl, "OFPT14_BUNDLE_ADD_MESSAGE contained " "message is unparsable (%s)", ofperr_get_name(error)); @@ -8887,8 +9690,13 @@ ofputil_decode_bundle_add(const struct ofp_header *oh, } if (!ofputil_is_bundlable(type)) { + VLOG_WARN_RL(&bad_ofmsg_rl, "%s message not allowed inside " + "OFPT14_BUNDLE_ADD_MESSAGE", ofptype_get_name(type)); return OFPERR_OFPBFC_MSG_UNSUP; } + if (typep) { + *typep = type; + } return 0; } @@ -8900,7 +9708,9 @@ ofputil_encode_bundle_add(enum ofp_version ofp_version, struct ofpbuf *request; struct ofp14_bundle_ctrl_msg *m; - request = ofpraw_alloc(OFPRAW_OFPT14_BUNDLE_ADD_MESSAGE, ofp_version, 0); + /* Must use the same xid as the embedded message. */ + request = ofpraw_alloc_xid(OFPRAW_OFPT14_BUNDLE_ADD_MESSAGE, ofp_version, + msg->msg->xid, 0); m = ofpbuf_put_zeros(request, sizeof *m); m->bundle_id = htonl(msg->bundle_id); @@ -8909,3 +9719,578 @@ ofputil_encode_bundle_add(enum ofp_version ofp_version, return request; } + +static void +encode_tlv_table_mappings(struct ofpbuf *b, struct ovs_list *mappings) +{ + struct ofputil_tlv_map *map; + + LIST_FOR_EACH (map, list_node, mappings) { + struct nx_tlv_map *nx_map; + + nx_map = ofpbuf_put_zeros(b, sizeof *nx_map); + nx_map->option_class = htons(map->option_class); + nx_map->option_type = map->option_type; + nx_map->option_len = map->option_len; + nx_map->index = htons(map->index); + } +} + +struct ofpbuf * +ofputil_encode_tlv_table_mod(enum ofp_version ofp_version, + struct ofputil_tlv_table_mod *ttm) +{ + struct ofpbuf *b; + struct nx_tlv_table_mod *nx_ttm; + + b = ofpraw_alloc(OFPRAW_NXT_TLV_TABLE_MOD, ofp_version, 0); + nx_ttm = ofpbuf_put_zeros(b, sizeof *nx_ttm); + nx_ttm->command = htons(ttm->command); + encode_tlv_table_mappings(b, &ttm->mappings); + + return b; +} + +static enum ofperr +decode_tlv_table_mappings(struct ofpbuf *msg, unsigned int max_fields, + struct ovs_list *mappings) +{ + list_init(mappings); + + while (msg->size) { + struct nx_tlv_map *nx_map; + struct ofputil_tlv_map *map; + + nx_map = ofpbuf_pull(msg, sizeof *nx_map); + map = xmalloc(sizeof *map); + list_push_back(mappings, &map->list_node); + + map->option_class = ntohs(nx_map->option_class); + map->option_type = nx_map->option_type; + + map->option_len = nx_map->option_len; + if (map->option_len % 4 || map->option_len > TLV_MAX_OPT_SIZE) { + VLOG_WARN_RL(&bad_ofmsg_rl, + "tlv table option length (%u) is not a valid option size", + map->option_len); + ofputil_uninit_tlv_table(mappings); + return OFPERR_NXTTMFC_BAD_OPT_LEN; + } + + map->index = ntohs(nx_map->index); + if (map->index >= max_fields) { + VLOG_WARN_RL(&bad_ofmsg_rl, + "tlv table field index (%u) is too large (max %u)", + map->index, max_fields - 1); + ofputil_uninit_tlv_table(mappings); + return OFPERR_NXTTMFC_BAD_FIELD_IDX; + } + } + + return 0; +} + +enum ofperr +ofputil_decode_tlv_table_mod(const struct ofp_header *oh, + struct ofputil_tlv_table_mod *ttm) +{ + struct ofpbuf msg = ofpbuf_const_initializer(oh, ntohs(oh->length)); + ofpraw_pull_assert(&msg); + + struct nx_tlv_table_mod *nx_ttm = ofpbuf_pull(&msg, sizeof *nx_ttm); + ttm->command = ntohs(nx_ttm->command); + if (ttm->command > NXTTMC_CLEAR) { + VLOG_WARN_RL(&bad_ofmsg_rl, + "tlv table mod command (%u) is out of range", + ttm->command); + return OFPERR_NXTTMFC_BAD_COMMAND; + } + + return decode_tlv_table_mappings(&msg, TUN_METADATA_NUM_OPTS, + &ttm->mappings); +} + +struct ofpbuf * +ofputil_encode_tlv_table_reply(const struct ofp_header *oh, + struct ofputil_tlv_table_reply *ttr) +{ + struct ofpbuf *b; + struct nx_tlv_table_reply *nx_ttr; + + b = ofpraw_alloc_reply(OFPRAW_NXT_TLV_TABLE_REPLY, oh, 0); + nx_ttr = ofpbuf_put_zeros(b, sizeof *nx_ttr); + nx_ttr->max_option_space = htonl(ttr->max_option_space); + nx_ttr->max_fields = htons(ttr->max_fields); + + encode_tlv_table_mappings(b, &ttr->mappings); + + return b; +} + +/* Decodes the NXT_TLV_TABLE_REPLY message in 'oh' into '*ttr'. Returns 0 + * if successful, otherwise an ofperr. + * + * The decoder verifies that the indexes in 'ttr->mappings' are less than + * 'ttr->max_fields', but the caller must ensure, if necessary, that they are + * less than TUN_METADATA_NUM_OPTS. */ +enum ofperr +ofputil_decode_tlv_table_reply(const struct ofp_header *oh, + struct ofputil_tlv_table_reply *ttr) +{ + struct ofpbuf msg = ofpbuf_const_initializer(oh, ntohs(oh->length)); + ofpraw_pull_assert(&msg); + + struct nx_tlv_table_reply *nx_ttr = ofpbuf_pull(&msg, sizeof *nx_ttr); + ttr->max_option_space = ntohl(nx_ttr->max_option_space); + ttr->max_fields = ntohs(nx_ttr->max_fields); + + return decode_tlv_table_mappings(&msg, ttr->max_fields, &ttr->mappings); +} + +void +ofputil_uninit_tlv_table(struct ovs_list *mappings) +{ + struct ofputil_tlv_map *map; + + LIST_FOR_EACH_POP (map, list_node, mappings) { + free(map); + } +} + +const char * +ofputil_async_msg_type_to_string(enum ofputil_async_msg_type type) +{ + switch (type) { + case OAM_PACKET_IN: return "PACKET_IN"; + case OAM_PORT_STATUS: return "PORT_STATUS"; + case OAM_FLOW_REMOVED: return "FLOW_REMOVED"; + case OAM_ROLE_STATUS: return "ROLE_STATUS"; + case OAM_TABLE_STATUS: return "TABLE_STATUS"; + case OAM_REQUESTFORWARD: return "REQUESTFORWARD"; + + case OAM_N_TYPES: + default: + OVS_NOT_REACHED(); + } +} + +struct ofp14_async_prop { + uint64_t prop_type; + enum ofputil_async_msg_type oam; + bool master; + uint32_t allowed10, allowed14; +}; + +#define AP_PAIR(SLAVE_PROP_TYPE, OAM, A10, A14) \ + { SLAVE_PROP_TYPE, OAM, false, A10, (A14) ? (A14) : (A10) }, \ + { (SLAVE_PROP_TYPE + 1), OAM, true, A10, (A14) ? (A14) : (A10) } + +static const struct ofp14_async_prop async_props[] = { + AP_PAIR( 0, OAM_PACKET_IN, OFPR10_BITS, OFPR14_BITS), + AP_PAIR( 2, OAM_PORT_STATUS, (1 << OFPPR_N_REASONS) - 1, 0), + AP_PAIR( 4, OAM_FLOW_REMOVED, (1 << OVS_OFPRR_NONE) - 1, 0), + AP_PAIR( 6, OAM_ROLE_STATUS, (1 << OFPCRR_N_REASONS) - 1, 0), + AP_PAIR( 8, OAM_TABLE_STATUS, OFPTR_BITS, 0), + AP_PAIR(10, OAM_REQUESTFORWARD, (1 << OFPRFR_N_REASONS) - 1, 0), +}; + +#define FOR_EACH_ASYNC_PROP(VAR) \ + for (const struct ofp14_async_prop *VAR = async_props; \ + VAR < &async_props[ARRAY_SIZE(async_props)]; VAR++) + +static const struct ofp14_async_prop * +get_ofp14_async_config_prop_by_prop_type(uint64_t prop_type) +{ + FOR_EACH_ASYNC_PROP (ap) { + if (prop_type == ap->prop_type) { + return ap; + } + } + return NULL; +} + +static const struct ofp14_async_prop * +get_ofp14_async_config_prop_by_oam(enum ofputil_async_msg_type oam, + bool master) +{ + FOR_EACH_ASYNC_PROP (ap) { + if (ap->oam == oam && ap->master == master) { + return ap; + } + } + return NULL; +} + +static uint32_t +ofp14_async_prop_allowed(const struct ofp14_async_prop *prop, + enum ofp_version version) +{ + return version >= OFP14_VERSION ? prop->allowed14 : prop->allowed10; +} + +static ovs_be32 +encode_async_mask(const struct ofputil_async_cfg *src, + const struct ofp14_async_prop *ap, + enum ofp_version version) +{ + uint32_t mask = ap->master ? src->master[ap->oam] : src->slave[ap->oam]; + return htonl(mask & ofp14_async_prop_allowed(ap, version)); +} + +static enum ofperr +decode_async_mask(ovs_be32 src, + const struct ofp14_async_prop *ap, enum ofp_version version, + bool loose, struct ofputil_async_cfg *dst) +{ + uint32_t mask = ntohl(src); + uint32_t allowed = ofp14_async_prop_allowed(ap, version); + if (mask & ~allowed) { + OFPPROP_LOG(&bad_ofmsg_rl, loose, + "bad value %#x for %s (allowed mask %#x)", + mask, ofputil_async_msg_type_to_string(ap->oam), + allowed); + mask &= allowed; + if (!loose) { + return OFPERR_OFPACFC_INVALID; + } + } + + if (ap->oam == OAM_PACKET_IN) { + if (mask & (1u << OFPR_NO_MATCH)) { + mask |= 1u << OFPR_EXPLICIT_MISS; + if (version < OFP13_VERSION) { + mask |= 1u << OFPR_IMPLICIT_MISS; + } + } + } + + uint32_t *array = ap->master ? dst->master : dst->slave; + array[ap->oam] = mask; + return 0; +} + +static enum ofperr +parse_async_tlv(const struct ofpbuf *property, + const struct ofp14_async_prop *ap, + struct ofputil_async_cfg *ac, + enum ofp_version version, bool loose) +{ + enum ofperr error; + ovs_be32 mask; + + error = ofpprop_parse_be32(property, &mask); + if (error) { + return error; + } + + if (ofpprop_is_experimenter(ap->prop_type)) { + /* For experimenter properties, whether a property is for the master or + * slave role is indicated by both 'type' and 'exp_type' in struct + * ofp_prop_experimenter. Check that these are consistent. */ + const struct ofp_prop_experimenter *ope = property->data; + bool should_be_master = ope->type == htons(0xffff); + if (should_be_master != ap->master) { + VLOG_WARN_RL(&bad_ofmsg_rl, "async property type %#"PRIx16" " + "indicates %s role but exp_type %"PRIu32" indicates " + "%s role", + ntohs(ope->type), + should_be_master ? "master" : "slave", + ntohl(ope->exp_type), + ap->master ? "master" : "slave"); + return OFPERR_OFPBPC_BAD_EXP_TYPE; + } + } + + return decode_async_mask(mask, ap, version, loose, ac); +} + +static void +decode_legacy_async_masks(const ovs_be32 masks[2], + enum ofputil_async_msg_type oam, + enum ofp_version version, + struct ofputil_async_cfg *dst) +{ + for (int i = 0; i < 2; i++) { + bool master = i == 0; + const struct ofp14_async_prop *ap + = get_ofp14_async_config_prop_by_oam(oam, master); + decode_async_mask(masks[i], ap, version, true, dst); + } +} + +/* Decodes the OpenFlow "set async config" request and "get async config + * reply" message in '*oh' into an abstract form in 'ac'. + * + * Some versions of the "set async config" request change only some of the + * settings and leave the others alone. This function uses 'basis' as the + * initial state for decoding these. Other versions of the request change all + * the settings; this function ignores 'basis' when decoding these. + * + * If 'loose' is true, this function ignores properties and values that it does + * not understand, as a controller would want to do when interpreting + * capabilities provided by a switch. If 'loose' is false, this function + * treats unknown properties and values as an error, as a switch would want to + * do when interpreting a configuration request made by a controller. + * + * Returns 0 if successful, otherwise an OFPERR_* value. + * + * Returns error code OFPERR_OFPACFC_INVALID if the value of mask is not in + * the valid range of mask. + * + * Returns error code OFPERR_OFPACFC_UNSUPPORTED if the configuration is not + * supported.*/ +enum ofperr +ofputil_decode_set_async_config(const struct ofp_header *oh, bool loose, + const struct ofputil_async_cfg *basis, + struct ofputil_async_cfg *ac) +{ + struct ofpbuf b = ofpbuf_const_initializer(oh, ntohs(oh->length)); + enum ofpraw raw = ofpraw_pull_assert(&b); + + if (raw == OFPRAW_OFPT13_SET_ASYNC || + raw == OFPRAW_NXT_SET_ASYNC_CONFIG || + raw == OFPRAW_OFPT13_GET_ASYNC_REPLY) { + const struct nx_async_config *msg = ofpmsg_body(oh); + + *ac = OFPUTIL_ASYNC_CFG_INIT; + decode_legacy_async_masks(msg->packet_in_mask, OAM_PACKET_IN, + oh->version, ac); + decode_legacy_async_masks(msg->port_status_mask, OAM_PORT_STATUS, + oh->version, ac); + decode_legacy_async_masks(msg->flow_removed_mask, OAM_FLOW_REMOVED, + oh->version, ac); + } else if (raw == OFPRAW_OFPT14_SET_ASYNC || + raw == OFPRAW_OFPT14_GET_ASYNC_REPLY || + raw == OFPRAW_NXT_SET_ASYNC_CONFIG2) { + *ac = *basis; + while (b.size > 0) { + struct ofpbuf property; + enum ofperr error; + uint64_t type; + + error = ofpprop_pull__(&b, &property, 8, 0xfffe, &type); + if (error) { + return error; + } + + const struct ofp14_async_prop *ap + = get_ofp14_async_config_prop_by_prop_type(type); + error = (ap + ? parse_async_tlv(&property, ap, ac, oh->version, loose) + : OFPPROP_UNKNOWN(loose, "async config", type)); + if (error) { + /* Most messages use OFPBPC_BAD_TYPE but async has its own (who + * knows why, it's OpenFlow. */ + if (error == OFPERR_OFPBPC_BAD_TYPE) { + error = OFPERR_OFPACFC_UNSUPPORTED; + } + return error; + } + } + } else { + return OFPERR_OFPBRC_BAD_VERSION; + } + return 0; +} + +static void +encode_legacy_async_masks(const struct ofputil_async_cfg *ac, + enum ofputil_async_msg_type oam, + enum ofp_version version, + ovs_be32 masks[2]) +{ + for (int i = 0; i < 2; i++) { + bool master = i == 0; + const struct ofp14_async_prop *ap + = get_ofp14_async_config_prop_by_oam(oam, master); + masks[i] = encode_async_mask(ac, ap, version); + } +} + +static void +ofputil_put_async_config__(const struct ofputil_async_cfg *ac, + struct ofpbuf *buf, bool tlv, + enum ofp_version version, uint32_t oams) +{ + if (!tlv) { + struct nx_async_config *msg = ofpbuf_put_zeros(buf, sizeof *msg); + encode_legacy_async_masks(ac, OAM_PACKET_IN, version, + msg->packet_in_mask); + encode_legacy_async_masks(ac, OAM_PORT_STATUS, version, + msg->port_status_mask); + encode_legacy_async_masks(ac, OAM_FLOW_REMOVED, version, + msg->flow_removed_mask); + } else { + FOR_EACH_ASYNC_PROP (ap) { + if (oams & (1u << ap->oam)) { + size_t ofs = buf->size; + ofpprop_put_be32(buf, ap->prop_type, + encode_async_mask(ac, ap, version)); + + /* For experimenter properties, we need to use type 0xfffe for + * master and 0xffff for slaves. */ + if (ofpprop_is_experimenter(ap->prop_type)) { + struct ofp_prop_experimenter *ope + = ofpbuf_at_assert(buf, ofs, sizeof *ope); + ope->type = ap->master ? htons(0xffff) : htons(0xfffe); + } + } + } + } +} + +/* Encodes and returns a reply to the OFPT_GET_ASYNC_REQUEST in 'oh' that + * states that the asynchronous message configuration is 'ac'. */ +struct ofpbuf * +ofputil_encode_get_async_reply(const struct ofp_header *oh, + const struct ofputil_async_cfg *ac) +{ + struct ofpbuf *buf; + + enum ofpraw raw = (oh->version < OFP14_VERSION + ? OFPRAW_OFPT13_GET_ASYNC_REPLY + : OFPRAW_OFPT14_GET_ASYNC_REPLY); + struct ofpbuf *reply = ofpraw_alloc_reply(raw, oh, 0); + ofputil_put_async_config__(ac, reply, + raw == OFPRAW_OFPT14_GET_ASYNC_REPLY, + oh->version, UINT32_MAX); + return reply; + + return buf; +} + +/* Encodes and returns a message, in a format appropriate for OpenFlow version + * 'ofp_version', that sets the asynchronous message configuration to 'ac'. + * + * Specify 'oams' as a bitmap of OAM_* that indicate the asynchronous messages + * to configure. OF1.0 through OF1.3 can't natively configure a subset of + * messages, so more messages than requested may be configured. OF1.0 through + * OF1.3 also can't configure OVS extension OAM_* values, so if 'oam' includes + * any extensions then this function encodes an Open vSwitch extension message + * that does support configuring OVS extension OAM_*. */ +struct ofpbuf * +ofputil_encode_set_async_config(const struct ofputil_async_cfg *ac, + uint32_t oams, enum ofp_version ofp_version) +{ + enum ofpraw raw = (ofp_version >= OFP14_VERSION ? OFPRAW_OFPT14_SET_ASYNC + : oams & OAM_EXTENSIONS ? OFPRAW_NXT_SET_ASYNC_CONFIG2 + : ofp_version >= OFP13_VERSION ? OFPRAW_OFPT13_SET_ASYNC + : OFPRAW_NXT_SET_ASYNC_CONFIG); + struct ofpbuf *request = ofpraw_alloc(raw, ofp_version, 0); + ofputil_put_async_config__(ac, request, + (raw == OFPRAW_OFPT14_SET_ASYNC || + raw == OFPRAW_NXT_SET_ASYNC_CONFIG2), + ofp_version, oams); + return request; +} + +struct ofputil_async_cfg +ofputil_async_cfg_default(enum ofp_version version) +{ + /* We enable all of the OF1.4 reasons regardless of 'version' because the + * reasons added in OF1.4 just are just refinements of the OFPR_ACTION + * introduced in OF1.0, breaking it into more specific categories. When we + * encode these for earlier OpenFlow versions, we translate them into + * OFPR_ACTION. */ + uint32_t pin = OFPR14_BITS & ~(1u << OFPR_INVALID_TTL); + pin |= 1u << OFPR_EXPLICIT_MISS; + if (version <= OFP12_VERSION) { + pin |= 1u << OFPR_IMPLICIT_MISS; + } + + return (struct ofputil_async_cfg) { + .master[OAM_PACKET_IN] = pin, + + .master[OAM_FLOW_REMOVED] + = (version >= OFP14_VERSION ? OFPRR14_BITS : OFPRR10_BITS), + + .master[OAM_PORT_STATUS] = OFPPR_BITS, + .slave[OAM_PORT_STATUS] = OFPPR_BITS, + }; +} + +static void +ofputil_put_ofp14_table_desc(const struct ofputil_table_desc *td, + struct ofpbuf *b, enum ofp_version version) +{ + struct ofp14_table_desc *otd; + struct ofp14_table_mod_prop_vacancy *otv; + size_t start_otd; + + start_otd = b->size; + ofpbuf_put_zeros(b, sizeof *otd); + + ofpprop_put_u32(b, OFPTMPT14_EVICTION, td->eviction_flags); + + otv = ofpbuf_put_zeros(b, sizeof *otv); + otv->type = htons(OFPTMPT14_VACANCY); + otv->length = htons(sizeof *otv); + otv->vacancy_down = td->table_vacancy.vacancy_down; + otv->vacancy_up = td->table_vacancy.vacancy_up; + otv->vacancy = td->table_vacancy.vacancy; + + otd = ofpbuf_at_assert(b, start_otd, sizeof *otd); + otd->length = htons(b->size - start_otd); + otd->table_id = td->table_id; + otd->config = ofputil_encode_table_config(OFPUTIL_TABLE_MISS_DEFAULT, + td->eviction, td->vacancy, + version); +} + +/* Converts the abstract form of a "table status" message in '*ts' into an + * OpenFlow message suitable for 'protocol', and returns that encoded form in + * a buffer owned by the caller. */ +struct ofpbuf * +ofputil_encode_table_status(const struct ofputil_table_status *ts, + enum ofputil_protocol protocol) +{ + enum ofp_version version; + struct ofpbuf *b; + + version = ofputil_protocol_to_ofp_version(protocol); + if (version >= OFP14_VERSION) { + enum ofpraw raw; + struct ofp14_table_status *ots; + + raw = OFPRAW_OFPT14_TABLE_STATUS; + b = ofpraw_alloc_xid(raw, version, htonl(0), 0); + ots = ofpbuf_put_zeros(b, sizeof *ots); + ots->reason = ts->reason; + ofputil_put_ofp14_table_desc(&ts->desc, b, version); + ofpmsg_update_length(b); + return b; + } else { + return NULL; + } +} + +/* Decodes the OpenFlow "table status" message in '*ots' into an abstract form + * in '*ts'. Returns 0 if successful, otherwise an OFPERR_* value. */ +enum ofperr +ofputil_decode_table_status(const struct ofp_header *oh, + struct ofputil_table_status *ts) +{ + const struct ofp14_table_status *ots; + struct ofpbuf b; + enum ofperr error; + enum ofpraw raw; + + ofpbuf_use_const(&b, oh, ntohs(oh->length)); + raw = ofpraw_pull_assert(&b); + ots = ofpbuf_pull(&b, sizeof *ots); + + if (raw == OFPRAW_OFPT14_TABLE_STATUS) { + if (ots->reason != OFPTR_VACANCY_DOWN + && ots->reason != OFPTR_VACANCY_UP) { + return OFPERR_OFPBPC_BAD_VALUE; + } + ts->reason = ots->reason; + + error = ofputil_decode_table_desc(&b, &ts->desc, oh->version); + return error; + } else { + return OFPERR_OFPBRC_BAD_VERSION; + } + + return 0; +}