X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-actions.c;h=ce1400462a3321767b60ffca39a8abe4ca88081b;hb=HEAD;hp=cccd6b1745ab7a50be2fc404114b461a62dc9d3e;hpb=2431be1b68d386bd616378d2c528242775c4d54a;p=sliver-openvswitch.git diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index cccd6b174..ce1400462 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,6 +53,8 @@ union ofp_action { struct ofp11_action_push push; struct ofp11_action_pop_mpls ofp11_pop_mpls; struct ofp11_action_set_queue ofp11_set_queue; + struct ofp11_action_mpls_label ofp11_mpls_label; + struct ofp11_action_mpls_tc ofp11_mpls_tc; struct ofp11_action_mpls_ttl ofp11_mpls_ttl; struct ofp11_action_group group; struct ofp12_action_set_field set_field; @@ -77,6 +79,8 @@ union ofp_action { struct nx_action_pop_mpls pop_mpls; struct nx_action_sample sample; struct nx_action_learn learn; + struct nx_action_mpls_label mpls_label; + struct nx_action_mpls_tc mpls_tc; }; static enum ofperr @@ -89,7 +93,7 @@ output_from_openflow10(const struct ofp10_action_output *oao, output->port = u16_to_ofp(ntohs(oao->port)); output->max_len = ntohs(oao->max_len); - return ofputil_check_output_port(output->port, OFPP_MAX); + return ofpact_check_output_port(output->port, OFPP_MAX); } static enum ofperr @@ -221,14 +225,14 @@ dec_ttl_from_openflow(struct ofpbuf *out, enum ofputil_action_code compat) ids->ofpact.compat = compat; ids->n_controllers = 1; ofpbuf_put(out, &id, sizeof id); - ids = out->l2; + ids = out->frame; ofpact_update_len(out, &ids->ofpact); return error; } static enum ofperr dec_ttl_cnt_ids_from_openflow(const struct nx_action_cnt_ids *nac_ids, - struct ofpbuf *out) + struct ofpbuf *out) { struct ofpact_cnt_ids *ids; size_t ids_size; @@ -244,8 +248,8 @@ dec_ttl_cnt_ids_from_openflow(const struct nx_action_cnt_ids *nac_ids, } if (ids_size < ids->n_controllers * sizeof(ovs_be16)) { - VLOG_WARN_RL(&rl, "Nicira action dec_ttl_cnt_ids only has %zu bytes " - "allocated for controller ids. %zu bytes are required for " + VLOG_WARN_RL(&rl, "Nicira action dec_ttl_cnt_ids only has %"PRIuSIZE" bytes " + "allocated for controller ids. %"PRIuSIZE" bytes are required for " "%"PRIu16" controllers.", ids_size, ids->n_controllers * sizeof(ovs_be16), ids->n_controllers); return OFPERR_OFPBAC_BAD_LEN; @@ -254,7 +258,7 @@ dec_ttl_cnt_ids_from_openflow(const struct nx_action_cnt_ids *nac_ids, for (i = 0; i < ids->n_controllers; i++) { uint16_t id = ntohs(((ovs_be16 *)(nac_ids + 1))[i]); ofpbuf_put(out, &id, sizeof id); - ids = out->l2; + ids = out->frame; } ofpact_update_len(out, &ids->ofpact); @@ -282,8 +286,7 @@ sample_from_openflow(const struct nx_action_sample *nas, } static enum ofperr -push_mpls_from_openflow(ovs_be16 ethertype, enum ofpact_mpls_position position, - struct ofpbuf *out) +push_mpls_from_openflow(ovs_be16 ethertype, struct ofpbuf *out) { struct ofpact_push_mpls *oam; @@ -292,7 +295,6 @@ push_mpls_from_openflow(ovs_be16 ethertype, enum ofpact_mpls_position position, } oam = ofpact_put_PUSH_MPLS(out); oam->ethertype = ethertype; - oam->position = position; return 0; } @@ -320,7 +322,7 @@ decode_nxast_action(const union ofp_action *a, enum ofputil_action_code *code) } else { \ return OFPERR_OFPBAC_BAD_LEN; \ } \ - NOT_REACHED(); + OVS_NOT_REACHED(); #include "ofp-util.def" case CONSTANT_HTONS(NXAST_SNAT__OBSOLETE): @@ -375,8 +377,9 @@ ofpact_from_nxast(const union ofp_action *a, enum ofputil_action_code code, case OFPUTIL_ACTION_INVALID: #define OFPAT10_ACTION(ENUM, STRUCT, NAME) case OFPUTIL_##ENUM: #define OFPAT11_ACTION(ENUM, STRUCT, EXTENSIBLE, NAME) case OFPUTIL_##ENUM: +#define OFPAT13_ACTION(ENUM, STRUCT, EXTENSIBLE, NAME) case OFPUTIL_##ENUM: #include "ofp-util.def" - NOT_REACHED(); + OVS_NOT_REACHED(); case OFPUTIL_NXAST_RESUBMIT: resubmit_from_openflow(&a->resubmit, out); @@ -469,8 +472,15 @@ ofpact_from_nxast(const union ofp_action *a, enum ofputil_action_code code, break; case OFPUTIL_NXAST_PUSH_MPLS: - error = push_mpls_from_openflow(a->push_mpls.ethertype, - OFPACT_MPLS_AFTER_VLAN, out); + error = push_mpls_from_openflow(a->push_mpls.ethertype, out); + break; + + case OFPUTIL_NXAST_SET_MPLS_LABEL: + ofpact_put_SET_MPLS_LABEL(out)->label = a->mpls_label.label; + break; + + case OFPUTIL_NXAST_SET_MPLS_TC: + ofpact_put_SET_MPLS_TC(out)->tc = a->mpls_tc.tc; break; case OFPUTIL_NXAST_SET_MPLS_TTL: @@ -497,10 +507,14 @@ ofpact_from_nxast(const union ofp_action *a, enum ofputil_action_code code, } static enum ofperr -ofpact_from_openflow10(const union ofp_action *a, struct ofpbuf *out) +ofpact_from_openflow10(const union ofp_action *a, + enum ofp_version version OVS_UNUSED, + struct ofpbuf *out) { enum ofputil_action_code code; enum ofperr error; + struct ofpact_vlan_vid *vlan_vid; + struct ofpact_vlan_pcp *vlan_pcp; error = decode_openflow10_action(a, &code); if (error) { @@ -510,8 +524,9 @@ ofpact_from_openflow10(const union ofp_action *a, struct ofpbuf *out) switch (code) { case OFPUTIL_ACTION_INVALID: #define OFPAT11_ACTION(ENUM, STRUCT, EXTENSIBLE, NAME) case OFPUTIL_##ENUM: +#define OFPAT13_ACTION(ENUM, STRUCT, EXTENSIBLE, NAME) case OFPUTIL_##ENUM: #include "ofp-util.def" - NOT_REACHED(); + OVS_NOT_REACHED(); case OFPUTIL_OFPAT10_OUTPUT: return output_from_openflow10(&a->output10, out); @@ -520,18 +535,24 @@ ofpact_from_openflow10(const union ofp_action *a, struct ofpbuf *out) if (a->vlan_vid.vlan_vid & ~htons(0xfff)) { return OFPERR_OFPBAC_BAD_ARGUMENT; } - ofpact_put_SET_VLAN_VID(out)->vlan_vid = ntohs(a->vlan_vid.vlan_vid); + vlan_vid = ofpact_put_SET_VLAN_VID(out); + vlan_vid->vlan_vid = ntohs(a->vlan_vid.vlan_vid); + vlan_vid->push_vlan_if_needed = true; + vlan_vid->ofpact.compat = code; break; case OFPUTIL_OFPAT10_SET_VLAN_PCP: if (a->vlan_pcp.vlan_pcp & ~7) { return OFPERR_OFPBAC_BAD_ARGUMENT; } - ofpact_put_SET_VLAN_PCP(out)->vlan_pcp = a->vlan_pcp.vlan_pcp; + vlan_pcp = ofpact_put_SET_VLAN_PCP(out); + vlan_pcp->vlan_pcp = a->vlan_pcp.vlan_pcp; + vlan_pcp->push_vlan_if_needed = true; + vlan_pcp->ofpact.compat = code; break; case OFPUTIL_OFPAT10_STRIP_VLAN: - ofpact_put_STRIP_VLAN(out); + ofpact_put_STRIP_VLAN(out)->ofpact.compat = code; break; case OFPUTIL_OFPAT10_SET_DL_SRC: @@ -580,6 +601,10 @@ ofpact_from_openflow10(const union ofp_action *a, struct ofpbuf *out) return error; } +static enum ofperr ofpact_from_openflow11(const union ofp_action *, + enum ofp_version, + struct ofpbuf *out); + static inline union ofp_action * action_next(const union ofp_action *a) { @@ -612,7 +637,7 @@ log_bad_action(const union ofp_action *actions, size_t max_actions, ds_init(&s); ds_put_hex_dump(&s, actions, max_actions * OFP_ACTION_ALIGN, 0, false); - VLOG_WARN("bad action at offset %#tx (%s):\n%s", + VLOG_WARN("bad action at offset %#"PRIxPTR" (%s):\n%s", (char *)bad_action - (char *)actions, ofperr_get_name(error), ds_cstr(&s)); ds_destroy(&s); @@ -621,15 +646,19 @@ log_bad_action(const union ofp_action *actions, size_t max_actions, static enum ofperr ofpacts_from_openflow(const union ofp_action *in, size_t n_in, - struct ofpbuf *out, - enum ofperr (*ofpact_from_openflow)( - const union ofp_action *a, struct ofpbuf *out)) + enum ofp_version version, struct ofpbuf *out) { const union ofp_action *a; size_t left; + enum ofperr (*ofpact_from_openflow)(const union ofp_action *a, + enum ofp_version, + struct ofpbuf *out) = + (version == OFP10_VERSION) ? + ofpact_from_openflow10 : ofpact_from_openflow11; + ACTION_FOR_EACH (a, left, in, n_in) { - enum ofperr error = ofpact_from_openflow(a, out); + enum ofperr error = ofpact_from_openflow(a, version, out); if (error) { log_bad_action(in, n_in, a, error); return error; @@ -645,21 +674,28 @@ ofpacts_from_openflow(const union ofp_action *in, size_t n_in, return 0; } -static enum ofperr -ofpacts_from_openflow10(const union ofp_action *in, size_t n_in, - struct ofpbuf *out) -{ - return ofpacts_from_openflow(in, n_in, out, ofpact_from_openflow10); -} - -static enum ofperr -ofpacts_pull_actions(struct ofpbuf *openflow, unsigned int actions_len, - struct ofpbuf *ofpacts, - enum ofperr (*translate)(const union ofp_action *actions, - size_t max_actions, - struct ofpbuf *ofpacts)) -{ - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); +/* Attempts to convert 'actions_len' bytes of OpenFlow actions from the + * front of 'openflow' into ofpacts. On success, replaces any existing content + * in 'ofpacts' by the converted ofpacts; on failure, clears 'ofpacts'. + * Returns 0 if successful, otherwise an OpenFlow error. + * + * Actions are processed according to their OpenFlow version which + * is provided in the 'version' parameter. + * + * In most places in OpenFlow 1.1 and 1.2, actions appear encapsulated in + * instructions, so you should call ofpacts_pull_openflow_instructions() + * instead of this function. + * + * The parsed actions are valid generically, but they may not be valid in a + * specific context. For example, port numbers up to OFPP_MAX are valid + * generically, but specific datapaths may only support port numbers in a + * smaller range. Use ofpacts_check() to additional check whether actions are + * valid in a specific context. */ +enum ofperr +ofpacts_pull_openflow_actions(struct ofpbuf *openflow, + unsigned int actions_len, + enum ofp_version version, + struct ofpbuf *ofpacts) { const union ofp_action *actions; enum ofperr error; @@ -674,41 +710,25 @@ ofpacts_pull_actions(struct ofpbuf *openflow, unsigned int actions_len, actions = ofpbuf_try_pull(openflow, actions_len); if (actions == NULL) { VLOG_WARN_RL(&rl, "OpenFlow message actions length %u exceeds " - "remaining message length (%zu)", - actions_len, openflow->size); + "remaining message length (%"PRIu32")", + actions_len, ofpbuf_size(openflow)); return OFPERR_OFPBRC_BAD_LEN; } - error = translate(actions, actions_len / OFP_ACTION_ALIGN, ofpacts); + error = ofpacts_from_openflow(actions, actions_len / OFP_ACTION_ALIGN, + version, ofpacts); if (error) { ofpbuf_clear(ofpacts); return error; } - error = ofpacts_verify(ofpacts->data, ofpacts->size); + error = ofpacts_verify(ofpbuf_data(ofpacts), ofpbuf_size(ofpacts)); if (error) { ofpbuf_clear(ofpacts); } return error; } -/* Attempts to convert 'actions_len' bytes of OpenFlow 1.0 actions from the - * front of 'openflow' into ofpacts. On success, replaces any existing content - * in 'ofpacts' by the converted ofpacts; on failure, clears 'ofpacts'. - * Returns 0 if successful, otherwise an OpenFlow error. - * - * The parsed actions are valid generically, but they may not be valid in a - * specific context. For example, port numbers up to OFPP_MAX are valid - * generically, but specific datapaths may only support port numbers in a - * smaller range. Use ofpacts_check() to additional check whether actions are - * valid in a specific context. */ -enum ofperr -ofpacts_pull_openflow10(struct ofpbuf *openflow, unsigned int actions_len, - struct ofpbuf *ofpacts) -{ - return ofpacts_pull_actions(openflow, actions_len, ofpacts, - ofpacts_from_openflow10); -} /* OpenFlow 1.1 actions. */ @@ -743,7 +763,7 @@ decode_openflow11_action(const union ofp_action *a, } else { \ return OFPERR_OFPBAC_BAD_LEN; \ } \ - NOT_REACHED(); + OVS_NOT_REACHED(); #include "ofp-util.def" default: @@ -751,6 +771,325 @@ decode_openflow11_action(const union ofp_action *a, } } +static enum ofperr +set_field_from_openflow(const struct ofp12_action_set_field *oasf, + struct ofpbuf *ofpacts) +{ + uint16_t oasf_len = ntohs(oasf->len); + uint32_t oxm_header = ntohl(oasf->dst); + uint8_t oxm_length = NXM_LENGTH(oxm_header); + struct ofpact_set_field *sf; + const struct mf_field *mf; + + /* ofp12_action_set_field is padded to 64 bits by zero */ + if (oasf_len != ROUND_UP(sizeof *oasf + oxm_length, 8)) { + return OFPERR_OFPBAC_BAD_SET_LEN; + } + if (!is_all_zeros((const uint8_t *)oasf + sizeof *oasf + oxm_length, + oasf_len - oxm_length - sizeof *oasf)) { + return OFPERR_OFPBAC_BAD_SET_ARGUMENT; + } + + if (NXM_HASMASK(oxm_header)) { + return OFPERR_OFPBAC_BAD_SET_TYPE; + } + mf = mf_from_nxm_header(oxm_header); + if (!mf) { + return OFPERR_OFPBAC_BAD_SET_TYPE; + } + ovs_assert(mf->n_bytes == oxm_length); + /* oxm_length is now validated to be compatible with mf_value. */ + if (!mf->writable) { + VLOG_WARN_RL(&rl, "destination field %s is not writable", mf->name); + return OFPERR_OFPBAC_BAD_SET_ARGUMENT; + } + sf = ofpact_put_SET_FIELD(ofpacts); + sf->field = mf; + memcpy(&sf->value, oasf + 1, mf->n_bytes); + + /* The value must be valid for match and must have the OFPVID_PRESENT bit + * on for OXM_OF_VLAN_VID. */ + if (!mf_is_value_valid(mf, &sf->value) + || (mf->id == MFF_VLAN_VID + && !(sf->value.be16 & htons(OFPVID12_PRESENT)))) { + struct ds ds = DS_EMPTY_INITIALIZER; + mf_format(mf, &sf->value, NULL, &ds); + VLOG_WARN_RL(&rl, "Invalid value for set field %s: %s", + mf->name, ds_cstr(&ds)); + ds_destroy(&ds); + + return OFPERR_OFPBAC_BAD_SET_ARGUMENT; + } + return 0; +} + +static void +set_field_to_openflow12(const struct ofpact_set_field *sf, + struct ofpbuf *openflow) +{ + uint16_t padded_value_len = ROUND_UP(sf->field->n_bytes, 8); + struct ofp12_action_set_field *oasf; + char *value; + + oasf = ofputil_put_OFPAT12_SET_FIELD(openflow); + oasf->dst = htonl(sf->field->oxm_header); + oasf->len = htons(sizeof *oasf + padded_value_len); + + value = ofpbuf_put_zeros(openflow, padded_value_len); + memcpy(value, &sf->value, sf->field->n_bytes); +} + +/* Convert 'sf' to one or two REG_LOADs. */ +static void +set_field_to_nxast(const struct ofpact_set_field *sf, struct ofpbuf *openflow) +{ + const struct mf_field *mf = sf->field; + struct nx_action_reg_load *narl; + + if (mf->n_bits > 64) { + ovs_assert(mf->n_bytes == 16); /* IPv6 addr. */ + /* Split into 64bit chunks */ + /* Lower bits first. */ + narl = ofputil_put_NXAST_REG_LOAD(openflow); + narl->ofs_nbits = nxm_encode_ofs_nbits(0, 64); + narl->dst = htonl(mf->nxm_header); + memcpy(&narl->value, &sf->value.ipv6.s6_addr[8], sizeof narl->value); + /* Higher bits next. */ + narl = ofputil_put_NXAST_REG_LOAD(openflow); + narl->ofs_nbits = nxm_encode_ofs_nbits(64, mf->n_bits - 64); + narl->dst = htonl(mf->nxm_header); + memcpy(&narl->value, &sf->value.ipv6.s6_addr[0], sizeof narl->value); + } else { + narl = ofputil_put_NXAST_REG_LOAD(openflow); + narl->ofs_nbits = nxm_encode_ofs_nbits(0, mf->n_bits); + narl->dst = htonl(mf->nxm_header); + memset(&narl->value, 0, 8 - mf->n_bytes); + memcpy((char*)&narl->value + (8 - mf->n_bytes), + &sf->value, mf->n_bytes); + } +} + +/* Convert 'sf' to standard OpenFlow 1.1 actions, if we can, falling back + * to Nicira extensions if we must. + * + * We check only meta-flow types that can appear within set field actions and + * that have a mapping to compatible action types. These struct mf_field + * definitions have a defined OXM or NXM header value and specify the field as + * writable. */ +static void +set_field_to_openflow11(const struct ofpact_set_field *sf, + struct ofpbuf *openflow) +{ + switch ((int) sf->field->id) { + case MFF_VLAN_TCI: + /* NXM_OF_VLAN_TCI to OpenFlow 1.1 mapping: + * + * If CFI=1, Add or modify VLAN VID & PCP. + * OpenFlow 1.1 set actions only apply if the packet + * already has VLAN tags. To be sure that is the case + * we have to push a VLAN header. As we do not support + * multiple layers of VLANs, this is a no-op, if a VLAN + * header already exists. This may backfire, however, + * when we start supporting multiple layers of VLANs. + * If CFI=0, strip VLAN header, if any. + */ + if (sf->value.be16 & htons(VLAN_CFI)) { + /* Push a VLAN tag, if one was not seen at action validation + * time. */ + if (!sf->flow_has_vlan) { + ofputil_put_OFPAT11_PUSH_VLAN(openflow)->ethertype + = htons(ETH_TYPE_VLAN_8021Q); + } + ofputil_put_OFPAT11_SET_VLAN_VID(openflow)->vlan_vid + = sf->value.be16 & htons(VLAN_VID_MASK); + ofputil_put_OFPAT11_SET_VLAN_PCP(openflow)->vlan_pcp + = vlan_tci_to_pcp(sf->value.be16); + } else { + /* If the flow did not match on vlan, we have no way of + * knowing if the vlan tag exists, so we must POP just to be + * sure. */ + ofputil_put_OFPAT11_POP_VLAN(openflow); + } + break; + + case MFF_VLAN_VID: + /* OXM VLAN_PCP to OpenFlow 1.1. + * Set field on OXM_OF_VLAN_VID onlyapplies to an existing vlan + * tag. Clear the OFPVID_PRESENT bit. + */ + ofputil_put_OFPAT11_SET_VLAN_VID(openflow)->vlan_vid + = sf->value.be16 & htons(VLAN_VID_MASK); + break; + + case MFF_VLAN_PCP: + /* OXM VLAN_PCP to OpenFlow 1.1. + * OXM_OF_VLAN_PCP only applies to existing vlan tag. */ + ofputil_put_OFPAT11_SET_VLAN_PCP(openflow)->vlan_pcp = sf->value.u8; + break; + + case MFF_ETH_SRC: + memcpy(ofputil_put_OFPAT11_SET_DL_SRC(openflow)->dl_addr, + sf->value.mac, ETH_ADDR_LEN); + break; + + case MFF_ETH_DST: + memcpy(ofputil_put_OFPAT11_SET_DL_DST(openflow)->dl_addr, + sf->value.mac, ETH_ADDR_LEN); + break; + + case MFF_MPLS_LABEL: + ofputil_put_OFPAT11_SET_MPLS_LABEL(openflow)->mpls_label = + sf->value.be32; + break; + + case MFF_MPLS_TC: + ofputil_put_OFPAT11_SET_MPLS_TC(openflow)->mpls_tc = sf->value.u8; + break; + + case MFF_IPV4_SRC: + ofputil_put_OFPAT11_SET_NW_SRC(openflow)->nw_addr = sf->value.be32; + break; + + case MFF_IPV4_DST: + ofputil_put_OFPAT11_SET_NW_DST(openflow)->nw_addr = sf->value.be32; + break; + + case MFF_IP_DSCP: + ofputil_put_OFPAT11_SET_NW_TOS(openflow)->nw_tos = sf->value.u8; + break; + + case MFF_IP_DSCP_SHIFTED: + ofputil_put_OFPAT11_SET_NW_TOS(openflow)->nw_tos = sf->value.u8 << 2; + break; + + case MFF_IP_ECN: + ofputil_put_OFPAT11_SET_NW_ECN(openflow)->nw_ecn = sf->value.u8; + break; + + case MFF_IP_TTL: + ofputil_put_OFPAT11_SET_NW_TTL(openflow)->nw_ttl = sf->value.u8; + break; + + case MFF_TCP_SRC: + case MFF_UDP_SRC: + case MFF_SCTP_SRC: + ofputil_put_OFPAT11_SET_TP_SRC(openflow)->tp_port = sf->value.be16; + break; + + case MFF_TCP_DST: + case MFF_UDP_DST: + case MFF_SCTP_DST: + ofputil_put_OFPAT11_SET_TP_DST(openflow)->tp_port = sf->value.be16; + break; + + default: + set_field_to_nxast(sf, openflow); + break; + } +} + +/* Convert 'sf' to standard OpenFlow 1.0 actions, if we can, falling back + * to Nicira extensions if we must. + * + * We check only meta-flow types that can appear within set field actions and + * that have a mapping to compatible action types. These struct mf_field + * definitions have a defined OXM or NXM header value and specify the field as + * writable. */ +static void +set_field_to_openflow10(const struct ofpact_set_field *sf, + struct ofpbuf *openflow) +{ + switch ((int) sf->field->id) { + case MFF_VLAN_TCI: + /* NXM_OF_VLAN_TCI to OpenFlow 1.0 mapping: + * + * If CFI=1, Add or modify VLAN VID & PCP. + * If CFI=0, strip VLAN header, if any. + */ + if (sf->value.be16 & htons(VLAN_CFI)) { + ofputil_put_OFPAT10_SET_VLAN_VID(openflow)->vlan_vid + = sf->value.be16 & htons(VLAN_VID_MASK); + ofputil_put_OFPAT10_SET_VLAN_PCP(openflow)->vlan_pcp + = vlan_tci_to_pcp(sf->value.be16); + } else { + ofputil_put_OFPAT10_STRIP_VLAN(openflow); + } + break; + + case MFF_VLAN_VID: + /* OXM VLAN_VID to OpenFlow 1.0. + * Set field on OXM_OF_VLAN_VID onlyapplies to an existing vlan + * tag. Clear the OFPVID_PRESENT bit. + */ + ofputil_put_OFPAT10_SET_VLAN_VID(openflow)->vlan_vid + = sf->value.be16 & htons(VLAN_VID_MASK); + break; + + case MFF_VLAN_PCP: + /* OXM VLAN_PCP to OpenFlow 1.0. + * OXM_OF_VLAN_PCP only applies to existing vlan tag. */ + ofputil_put_OFPAT10_SET_VLAN_PCP(openflow)->vlan_pcp = sf->value.u8; + break; + + case MFF_ETH_SRC: + memcpy(ofputil_put_OFPAT10_SET_DL_SRC(openflow)->dl_addr, + sf->value.mac, ETH_ADDR_LEN); + break; + + case MFF_ETH_DST: + memcpy(ofputil_put_OFPAT10_SET_DL_DST(openflow)->dl_addr, + sf->value.mac, ETH_ADDR_LEN); + break; + + case MFF_IPV4_SRC: + ofputil_put_OFPAT10_SET_NW_SRC(openflow)->nw_addr = sf->value.be32; + break; + + case MFF_IPV4_DST: + ofputil_put_OFPAT10_SET_NW_DST(openflow)->nw_addr = sf->value.be32; + break; + + case MFF_IP_DSCP: + ofputil_put_OFPAT10_SET_NW_TOS(openflow)->nw_tos = sf->value.u8; + break; + + case MFF_IP_DSCP_SHIFTED: + ofputil_put_OFPAT10_SET_NW_TOS(openflow)->nw_tos = sf->value.u8 << 2; + break; + + case MFF_TCP_SRC: + case MFF_UDP_SRC: + ofputil_put_OFPAT10_SET_TP_SRC(openflow)->tp_port = sf->value.be16; + break; + + case MFF_TCP_DST: + case MFF_UDP_DST: + ofputil_put_OFPAT10_SET_TP_DST(openflow)->tp_port = sf->value.be16; + break; + + default: + set_field_to_nxast(sf, openflow); + break; + } +} + +static void +set_field_to_openflow(const struct ofpact_set_field *sf, + struct ofpbuf *openflow) +{ + struct ofp_header *oh = (struct ofp_header *)openflow->frame; + + if (oh->version >= OFP12_VERSION) { + set_field_to_openflow12(sf, openflow); + } else if (oh->version == OFP11_VERSION) { + set_field_to_openflow11(sf, openflow); + } else if (oh->version == OFP10_VERSION) { + set_field_to_openflow10(sf, openflow); + } else { + OVS_NOT_REACHED(); + } +} + static enum ofperr output_from_openflow11(const struct ofp11_action_output *oao, struct ofpbuf *out) @@ -766,25 +1105,47 @@ output_from_openflow11(const struct ofp11_action_output *oao, return error; } - return ofputil_check_output_port(output->port, OFPP_MAX); + return ofpact_check_output_port(output->port, OFPP_MAX); } static enum ofperr -ofpact_from_openflow11(const union ofp_action *a, struct ofpbuf *out) +ofpact_from_openflow11(const union ofp_action *a, enum ofp_version version, + struct ofpbuf *out) { enum ofputil_action_code code; enum ofperr error; + struct ofpact_vlan_vid *vlan_vid; + struct ofpact_vlan_pcp *vlan_pcp; error = decode_openflow11_action(a, &code); if (error) { return error; } + if (version >= OFP12_VERSION) { + switch ((int)code) { + case OFPUTIL_OFPAT11_SET_VLAN_VID: + case OFPUTIL_OFPAT11_SET_VLAN_PCP: + case OFPUTIL_OFPAT11_SET_DL_SRC: + case OFPUTIL_OFPAT11_SET_DL_DST: + case OFPUTIL_OFPAT11_SET_NW_SRC: + case OFPUTIL_OFPAT11_SET_NW_DST: + case OFPUTIL_OFPAT11_SET_NW_TOS: + case OFPUTIL_OFPAT11_SET_NW_ECN: + case OFPUTIL_OFPAT11_SET_TP_SRC: + case OFPUTIL_OFPAT11_SET_TP_DST: + VLOG_WARN_RL(&rl, "Deprecated action %s received over %s", + ofputil_action_name_from_code(code), + ofputil_version_to_string(version)); + } + } + switch (code) { case OFPUTIL_ACTION_INVALID: #define OFPAT10_ACTION(ENUM, STRUCT, NAME) case OFPUTIL_##ENUM: +#define OFPAT13_ACTION(ENUM, STRUCT, EXTENSIBLE, NAME) case OFPUTIL_##ENUM: #include "ofp-util.def" - NOT_REACHED(); + OVS_NOT_REACHED(); case OFPUTIL_OFPAT11_OUTPUT: return output_from_openflow11(&a->ofp11_output, out); @@ -793,14 +1154,20 @@ ofpact_from_openflow11(const union ofp_action *a, struct ofpbuf *out) if (a->vlan_vid.vlan_vid & ~htons(0xfff)) { return OFPERR_OFPBAC_BAD_ARGUMENT; } - ofpact_put_SET_VLAN_VID(out)->vlan_vid = ntohs(a->vlan_vid.vlan_vid); + vlan_vid = ofpact_put_SET_VLAN_VID(out); + vlan_vid->vlan_vid = ntohs(a->vlan_vid.vlan_vid); + vlan_vid->push_vlan_if_needed = false; + vlan_vid->ofpact.compat = code; break; case OFPUTIL_OFPAT11_SET_VLAN_PCP: if (a->vlan_pcp.vlan_pcp & ~7) { return OFPERR_OFPBAC_BAD_ARGUMENT; } - ofpact_put_SET_VLAN_PCP(out)->vlan_pcp = a->vlan_pcp.vlan_pcp; + vlan_pcp = ofpact_put_SET_VLAN_PCP(out); + vlan_pcp->vlan_pcp = a->vlan_pcp.vlan_pcp; + vlan_pcp->push_vlan_if_needed = false; + vlan_pcp->ofpact.compat = code; break; case OFPUTIL_OFPAT11_PUSH_VLAN: @@ -812,7 +1179,7 @@ ofpact_from_openflow11(const union ofp_action *a, struct ofpbuf *out) break; case OFPUTIL_OFPAT11_POP_VLAN: - ofpact_put_STRIP_VLAN(out); + ofpact_put_STRIP_VLAN(out)->ofpact.compat = code; break; case OFPUTIL_OFPAT11_SET_QUEUE: @@ -869,7 +1236,15 @@ ofpact_from_openflow11(const union ofp_action *a, struct ofpbuf *out) break; case OFPUTIL_OFPAT12_SET_FIELD: - return nxm_reg_load_from_openflow12_set_field(&a->set_field, out); + return set_field_from_openflow(&a->set_field, out); + + case OFPUTIL_OFPAT11_SET_MPLS_LABEL: + ofpact_put_SET_MPLS_LABEL(out)->label = a->ofp11_mpls_label.mpls_label; + break; + + case OFPUTIL_OFPAT11_SET_MPLS_TC: + ofpact_put_SET_MPLS_TC(out)->tc = a->ofp11_mpls_tc.mpls_tc; + break; case OFPUTIL_OFPAT11_SET_MPLS_TTL: ofpact_put_SET_MPLS_TTL(out)->ttl = a->ofp11_mpls_ttl.mpls_ttl; @@ -880,8 +1255,7 @@ ofpact_from_openflow11(const union ofp_action *a, struct ofpbuf *out) break; case OFPUTIL_OFPAT11_PUSH_MPLS: - error = push_mpls_from_openflow(a->push.ethertype, - OFPACT_MPLS_AFTER_VLAN, out); + error = push_mpls_from_openflow(a->push.ethertype, out); break; case OFPUTIL_OFPAT11_POP_MPLS: @@ -903,13 +1277,6 @@ ofpact_from_openflow11(const union ofp_action *a, struct ofpbuf *out) return error; } -static enum ofperr -ofpacts_from_openflow11(const union ofp_action *in, size_t n_in, - struct ofpbuf *out) -{ - return ofpacts_from_openflow(in, n_in, out, ofpact_from_openflow11); -} - /* True if an action sets the value of a field * in a way that is compatibile with the action set. * False otherwise. */ @@ -917,6 +1284,7 @@ static bool ofpact_is_set_action(const struct ofpact *a) { switch (a->type) { + case OFPACT_SET_FIELD: case OFPACT_REG_LOAD: case OFPACT_SET_ETH_DST: case OFPACT_SET_ETH_SRC: @@ -927,6 +1295,8 @@ ofpact_is_set_action(const struct ofpact *a) case OFPACT_SET_IPV4_SRC: case OFPACT_SET_L4_DST_PORT: case OFPACT_SET_L4_SRC_PORT: + case OFPACT_SET_MPLS_LABEL: + case OFPACT_SET_MPLS_TC: case OFPACT_SET_MPLS_TTL: case OFPACT_SET_QUEUE: case OFPACT_SET_TUNNEL: @@ -963,7 +1333,7 @@ ofpact_is_set_action(const struct ofpact *a) case OFPACT_WRITE_METADATA: return false; default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -981,6 +1351,7 @@ ofpact_is_allowed_in_actions_set(const struct ofpact *a) case OFPACT_PUSH_MPLS: case OFPACT_PUSH_VLAN: case OFPACT_REG_LOAD: + case OFPACT_SET_FIELD: case OFPACT_SET_ETH_DST: case OFPACT_SET_ETH_SRC: case OFPACT_SET_IP_DSCP: @@ -990,6 +1361,8 @@ ofpact_is_allowed_in_actions_set(const struct ofpact *a) case OFPACT_SET_IPV4_SRC: case OFPACT_SET_L4_DST_PORT: case OFPACT_SET_L4_SRC_PORT: + case OFPACT_SET_MPLS_LABEL: + case OFPACT_SET_MPLS_TC: case OFPACT_SET_MPLS_TTL: case OFPACT_SET_QUEUE: case OFPACT_SET_TUNNEL: @@ -1027,7 +1400,7 @@ ofpact_is_allowed_in_actions_set(const struct ofpact *a) case OFPACT_WRITE_METADATA: return false; default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -1047,7 +1420,7 @@ ofpacts_copy_last(struct ofpbuf *out, const struct ofpbuf *in, const struct ofpact *a; target = NULL; - OFPACT_FOR_EACH (a, in->data, in->size) { + OFPACT_FOR_EACH (a, ofpbuf_data(in), ofpbuf_size(in)) { if (a->type == filter) { target = a; } @@ -1066,7 +1439,7 @@ ofpacts_copy_all(struct ofpbuf *out, const struct ofpbuf *in, { const struct ofpact *a; - OFPACT_FOR_EACH (a, in->data, in->size) { + OFPACT_FOR_EACH (a, ofpbuf_data(in), ofpbuf_size(in)) { if (filter(a)) { ofpact_copy(out, a); } @@ -1119,18 +1492,20 @@ ofpacts_execute_action_set(struct ofpbuf *action_list, static enum ofperr ofpacts_from_openflow11_for_action_set(const union ofp_action *in, - size_t n_in, struct ofpbuf *out) + size_t n_in, enum ofp_version version, + struct ofpbuf *out) { enum ofperr error; struct ofpact *a; - size_t start = out->size; + size_t start = ofpbuf_size(out); + + error = ofpacts_from_openflow(in, n_in, version, out); - error = ofpacts_from_openflow11(in, n_in, out); if (error) { return error; } - OFPACT_FOR_EACH (a, ofpact_end(out->data, start), out->size - start) { + OFPACT_FOR_EACH (a, ofpact_end(ofpbuf_data(out), start), ofpbuf_size(out) - start) { if (!ofpact_is_allowed_in_actions_set(a)) { VLOG_WARN_RL(&rl, "disallowed action in action set"); return OFPERR_OFPBAC_BAD_TYPE; @@ -1140,35 +1515,6 @@ ofpacts_from_openflow11_for_action_set(const union ofp_action *in, return 0; } - -static enum ofperr -ofpact_from_openflow13(const union ofp_action *a, struct ofpbuf *out) -{ - enum ofputil_action_code code; - enum ofperr error; - - error = decode_openflow11_action(a, &code); - if (error) { - return error; - } - - if (code == OFPUTIL_OFPAT11_PUSH_MPLS) { - struct ofp11_action_push *oap = (struct ofp11_action_push *)a; - error = push_mpls_from_openflow(oap->ethertype, - OFPACT_MPLS_BEFORE_VLAN, out); - } else { - error = ofpact_from_openflow11(a, out); - } - - return error; -} - -static enum ofperr -ofpacts_from_openflow13(const union ofp_action *in, size_t n_in, - struct ofpbuf *out) -{ - return ofpacts_from_openflow(in, n_in, out, ofpact_from_openflow13); -} /* OpenFlow 1.1 instructions. */ @@ -1262,9 +1608,12 @@ ovs_instruction_type_from_ofpact_type(enum ofpact_type type) case OFPACT_SET_L4_DST_PORT: case OFPACT_REG_MOVE: case OFPACT_REG_LOAD: + case OFPACT_SET_FIELD: case OFPACT_STACK_PUSH: case OFPACT_STACK_POP: case OFPACT_DEC_TTL: + case OFPACT_SET_MPLS_LABEL: + case OFPACT_SET_MPLS_TC: case OFPACT_SET_MPLS_TTL: case OFPACT_DEC_MPLS_TTL: case OFPACT_PUSH_MPLS: @@ -1284,6 +1633,24 @@ ovs_instruction_type_from_ofpact_type(enum ofpact_type type) } } +enum ofperr +ovs_instruction_type_from_inst_type(enum ovs_instruction_type *instruction_type, + const uint16_t inst_type) +{ + switch (inst_type) { + +#define DEFINE_INST(ENUM, STRUCT, EXTENSIBLE, NAME) \ + case ENUM: \ + *instruction_type = OVSINST_##ENUM; \ + return 0; +OVS_INSTRUCTIONS +#undef DEFINE_INST + + default: + return OFPERR_OFPBIC_UNKNOWN_INST; + } +} + static inline struct ofp11_instruction * instruction_next(const struct ofp11_instruction *inst) { @@ -1362,7 +1729,7 @@ decode_openflow11_instructions(const struct ofp11_instruction insts[], } if (left) { - VLOG_WARN_RL(&rl, "bad instruction format at offset %zu", + VLOG_WARN_RL(&rl, "bad instruction format at offset %"PRIuSIZE, (n_insts - left) * sizeof *inst); return OFPERR_OFPBIC_BAD_LEN; } @@ -1378,50 +1745,12 @@ get_actions_from_instruction(const struct ofp11_instruction *inst, *max_actions = (ntohs(inst->len) - sizeof *inst) / OFP11_INSTRUCTION_ALIGN; } -/* Attempts to convert 'actions_len' bytes of OpenFlow actions from the - * front of 'openflow' into ofpacts. On success, replaces any existing content - * in 'ofpacts' by the converted ofpacts; on failure, clears 'ofpacts'. - * Returns 0 if successful, otherwise an OpenFlow error. - * - * Actions are processed according to their OpenFlow version which - * is provided in the 'version' parameter. - * - * In most places in OpenFlow 1.1 and 1.2, actions appear encapsulated in - * instructions, so you should call ofpacts_pull_openflow11_instructions() - * instead of this function. - * - * The parsed actions are valid generically, but they may not be valid in a - * specific context. For example, port numbers up to OFPP_MAX are valid - * generically, but specific datapaths may only support port numbers in a - * smaller range. Use ofpacts_check() to additional check whether actions are - * valid in a specific context. */ -enum ofperr -ofpacts_pull_openflow11_actions(struct ofpbuf *openflow, - enum ofp_version version, - unsigned int actions_len, - struct ofpbuf *ofpacts) -{ - switch (version) { - case OFP10_VERSION: - case OFP11_VERSION: - case OFP12_VERSION: - return ofpacts_pull_actions(openflow, actions_len, ofpacts, - ofpacts_from_openflow11); - case OFP13_VERSION: - return ofpacts_pull_actions(openflow, actions_len, ofpacts, - ofpacts_from_openflow13); - default: - NOT_REACHED(); - } -} - enum ofperr -ofpacts_pull_openflow11_instructions(struct ofpbuf *openflow, - enum ofp_version version, - unsigned int instructions_len, - struct ofpbuf *ofpacts) +ofpacts_pull_openflow_instructions(struct ofpbuf *openflow, + unsigned int instructions_len, + enum ofp_version version, + struct ofpbuf *ofpacts) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); const struct ofp11_instruction *instructions; const struct ofp11_instruction *insts[N_OVS_INSTRUCTIONS]; enum ofperr error; @@ -1439,8 +1768,8 @@ ofpacts_pull_openflow11_instructions(struct ofpbuf *openflow, instructions = ofpbuf_try_pull(openflow, instructions_len); if (instructions == NULL) { VLOG_WARN_RL(&rl, "OpenFlow message instructions length %u exceeds " - "remaining message length (%zu)", - instructions_len, openflow->size); + "remaining message length (%"PRIu32")", + instructions_len, ofpbuf_size(openflow)); error = OFPERR_OFPBIC_BAD_LEN; goto exit; } @@ -1468,18 +1797,7 @@ ofpacts_pull_openflow11_instructions(struct ofpbuf *openflow, get_actions_from_instruction(insts[OVSINST_OFPIT11_APPLY_ACTIONS], &actions, &max_actions); - switch (version) { - case OFP10_VERSION: - case OFP11_VERSION: - case OFP12_VERSION: - error = ofpacts_from_openflow11(actions, max_actions, ofpacts); - break; - case OFP13_VERSION: - error = ofpacts_from_openflow13(actions, max_actions, ofpacts); - break; - default: - NOT_REACHED(); - } + error = ofpacts_from_openflow(actions, max_actions, version, ofpacts); if (error) { goto exit; } @@ -1496,18 +1814,18 @@ ofpacts_pull_openflow11_instructions(struct ofpbuf *openflow, size_t start; ofpact_pad(ofpacts); - start = ofpacts->size; + start = ofpbuf_size(ofpacts); on = ofpact_put(ofpacts, OFPACT_WRITE_ACTIONS, offsetof(struct ofpact_nest, actions)); get_actions_from_instruction(insts[OVSINST_OFPIT11_WRITE_ACTIONS], &actions, &max_actions); error = ofpacts_from_openflow11_for_action_set(actions, max_actions, - ofpacts); + version, ofpacts); if (error) { goto exit; } on = ofpbuf_at_assert(ofpacts, start, sizeof *on); - on->ofpact.len = ofpacts->size - start; + on->ofpact.len = ofpbuf_size(ofpacts) - start; } if (insts[OVSINST_OFPIT11_WRITE_METADATA]) { const struct ofp11_instruction_write_metadata *oiwm; @@ -1530,7 +1848,7 @@ ofpacts_pull_openflow11_instructions(struct ofpbuf *openflow, ogt->table_id = oigt->table_id; } - error = ofpacts_verify(ofpacts->data, ofpacts->size); + error = ofpacts_verify(ofpbuf_data(ofpacts), ofpbuf_size(ofpacts)); exit: if (error) { ofpbuf_clear(ofpacts); @@ -1538,17 +1856,60 @@ exit: return error; } -/* May modify flow->dl_type, caller must restore it. */ +/* Checks that 'port' is a valid output port for OFPACT_OUTPUT, given that the + * switch will never have more than 'max_ports' ports. Returns 0 if 'port' is + * valid, otherwise an OpenFlow error code. */ +enum ofperr +ofpact_check_output_port(ofp_port_t port, ofp_port_t max_ports) +{ + switch (port) { + case OFPP_IN_PORT: + case OFPP_TABLE: + case OFPP_NORMAL: + case OFPP_FLOOD: + case OFPP_ALL: + case OFPP_CONTROLLER: + case OFPP_NONE: + case OFPP_LOCAL: + return 0; + + default: + if (ofp_to_u16(port) < ofp_to_u16(max_ports)) { + return 0; + } + return OFPERR_OFPBAC_BAD_OUT_PORT; + } +} + +/* Removes the protocols that require consistency between match and actions + * (that's everything but OpenFlow 1.0) from '*usable_protocols'. + * + * (An example of an inconsistency between match and actions is a flow that + * does not match on an MPLS Ethertype but has an action that pops an MPLS + * label.) */ +static void +inconsistent_match(enum ofputil_protocol *usable_protocols) +{ + *usable_protocols &= OFPUTIL_P_OF10_ANY; +} + +/* May modify flow->dl_type, flow->nw_proto and flow->vlan_tci, + * caller must restore them. + * + * Modifies some actions, filling in fields that could not be properly set + * without context. */ static enum ofperr -ofpact_check__(const struct ofpact *a, struct flow *flow, ofp_port_t max_ports, - uint8_t table_id, bool enforce_consistency) +ofpact_check__(enum ofputil_protocol *usable_protocols, struct ofpact *a, + struct flow *flow, ofp_port_t max_ports, + uint8_t table_id, uint8_t n_tables) { const struct ofpact_enqueue *enqueue; + const struct mf_field *mf; switch (a->type) { case OFPACT_OUTPUT: - return ofputil_check_output_port(ofpact_get_OUTPUT(a)->port, - max_ports); + return ofpact_check_output_port(ofpact_get_OUTPUT(a)->port, + max_ports); case OFPACT_CONTROLLER: return 0; @@ -1569,13 +1930,37 @@ ofpact_check__(const struct ofpact *a, struct flow *flow, ofp_port_t max_ports, return bundle_check(ofpact_get_BUNDLE(a), max_ports, flow); case OFPACT_SET_VLAN_VID: + /* Remember if we saw a vlan tag in the flow to aid translating to + * OpenFlow 1.1+ if need be. */ + ofpact_get_SET_VLAN_VID(a)->flow_has_vlan = + (flow->vlan_tci & htons(VLAN_CFI)) == htons(VLAN_CFI); + if (!(flow->vlan_tci & htons(VLAN_CFI)) && + !ofpact_get_SET_VLAN_VID(a)->push_vlan_if_needed) { + inconsistent_match(usable_protocols); + } + /* Temporary mark that we have a vlan tag. */ + flow->vlan_tci |= htons(VLAN_CFI); + return 0; + case OFPACT_SET_VLAN_PCP: + /* Remember if we saw a vlan tag in the flow to aid translating to + * OpenFlow 1.1+ if need be. */ + ofpact_get_SET_VLAN_PCP(a)->flow_has_vlan = + (flow->vlan_tci & htons(VLAN_CFI)) == htons(VLAN_CFI); + if (!(flow->vlan_tci & htons(VLAN_CFI)) && + !ofpact_get_SET_VLAN_PCP(a)->push_vlan_if_needed) { + inconsistent_match(usable_protocols); + } + /* Temporary mark that we have a vlan tag. */ + flow->vlan_tci |= htons(VLAN_CFI); return 0; case OFPACT_STRIP_VLAN: if (!(flow->vlan_tci & htons(VLAN_CFI))) { - goto inconsistent; + inconsistent_match(usable_protocols); } + /* Temporary mark that we have no vlan tag. */ + flow->vlan_tci = htons(0); return 0; case OFPACT_PUSH_VLAN: @@ -1583,6 +1968,8 @@ ofpact_check__(const struct ofpact *a, struct flow *flow, ofp_port_t max_ports, /* Multiple VLAN headers not supported. */ return OFPERR_OFPBAC_BAD_TAG; } + /* Temporary mark that we have a vlan tag. */ + flow->vlan_tci |= htons(VLAN_CFI); return 0; case OFPACT_SET_ETH_SRC: @@ -1592,7 +1979,7 @@ ofpact_check__(const struct ofpact *a, struct flow *flow, ofp_port_t max_ports, case OFPACT_SET_IPV4_SRC: case OFPACT_SET_IPV4_DST: if (flow->dl_type != htons(ETH_TYPE_IP)) { - goto inconsistent; + inconsistent_match(usable_protocols); } return 0; @@ -1601,17 +1988,32 @@ ofpact_check__(const struct ofpact *a, struct flow *flow, ofp_port_t max_ports, case OFPACT_SET_IP_TTL: case OFPACT_DEC_TTL: if (!is_ip_any(flow)) { - goto inconsistent; + inconsistent_match(usable_protocols); } return 0; case OFPACT_SET_L4_SRC_PORT: + if (!is_ip_any(flow) || + (flow->nw_proto != IPPROTO_TCP && flow->nw_proto != IPPROTO_UDP + && flow->nw_proto != IPPROTO_SCTP)) { + inconsistent_match(usable_protocols); + } + /* Note on which transport protocol the port numbers are set. + * This allows this set action to be converted to an OF1.2 set field + * action. */ + ofpact_get_SET_L4_SRC_PORT(a)->flow_ip_proto = flow->nw_proto; + return 0; + case OFPACT_SET_L4_DST_PORT: if (!is_ip_any(flow) || (flow->nw_proto != IPPROTO_TCP && flow->nw_proto != IPPROTO_UDP && flow->nw_proto != IPPROTO_SCTP)) { - goto inconsistent; + inconsistent_match(usable_protocols); } + /* Note on which transport protocol the port numbers are set. + * This allows this set action to be converted to an OF1.2 set field + * action. */ + ofpact_get_SET_L4_DST_PORT(a)->flow_ip_proto = flow->nw_proto; return 0; case OFPACT_REG_MOVE: @@ -1620,16 +2022,38 @@ ofpact_check__(const struct ofpact *a, struct flow *flow, ofp_port_t max_ports, case OFPACT_REG_LOAD: return nxm_reg_load_check(ofpact_get_REG_LOAD(a), flow); + case OFPACT_SET_FIELD: + mf = ofpact_get_SET_FIELD(a)->field; + /* Require OXM_OF_VLAN_VID to have an existing VLAN header. */ + if (!mf_are_prereqs_ok(mf, flow) || + (mf->id == MFF_VLAN_VID && !(flow->vlan_tci & htons(VLAN_CFI)))) { + VLOG_WARN_RL(&rl, "set_field %s lacks correct prerequisities", + mf->name); + return OFPERR_OFPBAC_MATCH_INCONSISTENT; + } + /* Remember if we saw a vlan tag in the flow to aid translating to + * OpenFlow 1.1 if need be. */ + ofpact_get_SET_FIELD(a)->flow_has_vlan = + (flow->vlan_tci & htons(VLAN_CFI)) == htons(VLAN_CFI); + if (mf->id == MFF_VLAN_TCI) { + /* The set field may add or remove the vlan tag, + * Mark the status temporarily. */ + flow->vlan_tci = ofpact_get_SET_FIELD(a)->value.be16; + } + return 0; + case OFPACT_STACK_PUSH: return nxm_stack_push_check(ofpact_get_STACK_PUSH(a), flow); case OFPACT_STACK_POP: return nxm_stack_pop_check(ofpact_get_STACK_POP(a), flow); + case OFPACT_SET_MPLS_LABEL: + case OFPACT_SET_MPLS_TC: case OFPACT_SET_MPLS_TTL: case OFPACT_DEC_MPLS_TTL: if (!eth_type_mpls(flow->dl_type)) { - goto inconsistent; + inconsistent_match(usable_protocols); } return 0; @@ -1641,7 +2065,7 @@ ofpact_check__(const struct ofpact *a, struct flow *flow, ofp_port_t max_ports, case OFPACT_FIN_TIMEOUT: if (flow->nw_proto != IPPROTO_TCP) { - goto inconsistent; + inconsistent_match(usable_protocols); } return 0; @@ -1657,13 +2081,17 @@ ofpact_check__(const struct ofpact *a, struct flow *flow, ofp_port_t max_ports, case OFPACT_PUSH_MPLS: flow->dl_type = ofpact_get_PUSH_MPLS(a)->ethertype; + /* The packet is now MPLS and the MPLS payload is opaque. + * Thus nothing can be assumed about the network protocol. + * Temporarily mark that we have no nw_proto. */ + flow->nw_proto = 0; return 0; case OFPACT_POP_MPLS: - flow->dl_type = ofpact_get_POP_MPLS(a)->ethertype; if (!eth_type_mpls(flow->dl_type)) { - goto inconsistent; + inconsistent_match(usable_protocols); } + flow->dl_type = ofpact_get_POP_MPLS(a)->ethertype; return 0; case OFPACT_SAMPLE: @@ -1673,9 +2101,12 @@ ofpact_check__(const struct ofpact *a, struct flow *flow, ofp_port_t max_ports, return 0; case OFPACT_WRITE_ACTIONS: { + /* Use a temporary copy of 'usable_protocols' because we can't check + * consistency of an action set. */ struct ofpact_nest *on = ofpact_get_WRITE_ACTIONS(a); + enum ofputil_protocol p = *usable_protocols; return ofpacts_check(on->actions, ofpact_nest_get_action_len(on), - flow, max_ports, table_id, false); + flow, max_ports, table_id, n_tables, &p); } case OFPACT_WRITE_METADATA: @@ -1689,51 +2120,79 @@ ofpact_check__(const struct ofpact *a, struct flow *flow, ofp_port_t max_ports, return 0; } - case OFPACT_GOTO_TABLE: - if (ofpact_get_GOTO_TABLE(a)->table_id <= table_id) { + case OFPACT_GOTO_TABLE: { + uint8_t goto_table = ofpact_get_GOTO_TABLE(a)->table_id; + if ((table_id != 255 && goto_table <= table_id) + || (n_tables != 255 && goto_table >= n_tables)) { return OFPERR_OFPBRC_BAD_TABLE_ID; } return 0; + } case OFPACT_GROUP: return 0; default: - NOT_REACHED(); + OVS_NOT_REACHED(); } - - inconsistent: - if (enforce_consistency) { - return OFPERR_OFPBAC_MATCH_INCONSISTENT; - } - return 0; } /* Checks that the 'ofpacts_len' bytes of actions in 'ofpacts' are * appropriate for a packet with the prerequisites satisfied by 'flow' in a * switch with no more than 'max_ports' ports. * + * If 'ofpacts' and 'flow' are inconsistent with one another, un-sets in + * '*usable_protocols' the protocols that forbid the inconsistency. (An + * example of an inconsistency between match and actions is a flow that does + * not match on an MPLS Ethertype but has an action that pops an MPLS label.) + * + * May annotate ofpacts with information gathered from the 'flow'. + * * May temporarily modify 'flow', but restores the changes before returning. */ enum ofperr -ofpacts_check(const struct ofpact ofpacts[], size_t ofpacts_len, - struct flow *flow, ofp_port_t max_ports, uint8_t table_id, - bool enforce_consistency) +ofpacts_check(struct ofpact ofpacts[], size_t ofpacts_len, + struct flow *flow, ofp_port_t max_ports, + uint8_t table_id, uint8_t n_tables, + enum ofputil_protocol *usable_protocols) { - const struct ofpact *a; + struct ofpact *a; ovs_be16 dl_type = flow->dl_type; + ovs_be16 vlan_tci = flow->vlan_tci; + uint8_t nw_proto = flow->nw_proto; enum ofperr error = 0; OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) { - error = ofpact_check__(a, flow, max_ports, table_id, - enforce_consistency); + error = ofpact_check__(usable_protocols, a, flow, + max_ports, table_id, n_tables); if (error) { break; } } - flow->dl_type = dl_type; /* Restore. */ + /* Restore fields that may have been modified. */ + flow->dl_type = dl_type; + flow->vlan_tci = vlan_tci; + flow->nw_proto = nw_proto; return error; } +/* Like ofpacts_check(), but reports inconsistencies as + * OFPERR_OFPBAC_MATCH_INCONSISTENT rather than clearing bits. */ +enum ofperr +ofpacts_check_consistency(struct ofpact ofpacts[], size_t ofpacts_len, + struct flow *flow, ofp_port_t max_ports, + uint8_t table_id, uint8_t n_tables, + enum ofputil_protocol usable_protocols) +{ + enum ofputil_protocol p = usable_protocols; + enum ofperr error; + + error = ofpacts_check(ofpacts, ofpacts_len, flow, max_ports, + table_id, n_tables, &p); + return (error ? error + : p != usable_protocols ? OFPERR_OFPBAC_MATCH_INCONSISTENT + : 0); +} + /* Verifies that the 'ofpacts_len' bytes of actions in 'ofpacts' are * in the appropriate order as defined by the OpenFlow spec. */ enum ofperr @@ -1742,14 +2201,15 @@ ofpacts_verify(const struct ofpact ofpacts[], size_t ofpacts_len) const struct ofpact *a; enum ovs_instruction_type inst; - inst = OVSINST_OFPIT11_APPLY_ACTIONS; + inst = OVSINST_OFPIT13_METER; OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) { enum ovs_instruction_type next; next = ovs_instruction_type_from_ofpact_type(a->type); - if (inst == OVSINST_OFPIT11_APPLY_ACTIONS - ? next < inst - : next <= inst) { + if (a > ofpacts + && (inst == OVSINST_OFPIT11_APPLY_ACTIONS + ? next < inst + : next <= inst)) { const char *name = ovs_instruction_name_from_type(inst); const char *next_name = ovs_instruction_name_from_type(next); @@ -1828,23 +2288,23 @@ ofpact_write_metadata_to_nxast(const struct ofpact_metadata *om, static void ofpact_note_to_nxast(const struct ofpact_note *note, struct ofpbuf *out) { - size_t start_ofs = out->size; + size_t start_ofs = ofpbuf_size(out); struct nx_action_note *nan; unsigned int remainder; unsigned int len; nan = ofputil_put_NXAST_NOTE(out); - out->size -= sizeof nan->note; + ofpbuf_set_size(out, ofpbuf_size(out) - sizeof nan->note); ofpbuf_put(out, note->data, note->length); - len = out->size - start_ofs; + len = ofpbuf_size(out) - start_ofs; remainder = len % OFP_ACTION_ALIGN; if (remainder) { ofpbuf_put_zeros(out, OFP_ACTION_ALIGN - remainder); } nan = ofpbuf_at(out, start_ofs, sizeof *nan); - nan->len = htons(out->size - start_ofs); + nan->len = htons(ofpbuf_size(out) - start_ofs); } static void @@ -1940,6 +2400,16 @@ ofpact_to_nxast(const struct ofpact *a, struct ofpbuf *out) ofpact_dec_ttl_to_nxast(ofpact_get_DEC_TTL(a), out); break; + case OFPACT_SET_MPLS_LABEL: + ofputil_put_NXAST_SET_MPLS_LABEL(out)->label + = ofpact_get_SET_MPLS_LABEL(a)->label; + break; + + case OFPACT_SET_MPLS_TC: + ofputil_put_NXAST_SET_MPLS_TC(out)->tc + = ofpact_get_SET_MPLS_TC(a)->tc; + break; + case OFPACT_SET_MPLS_TTL: ofputil_put_NXAST_SET_MPLS_TTL(out)->ttl = ofpact_get_SET_MPLS_TTL(a)->ttl; @@ -2024,7 +2494,8 @@ ofpact_to_nxast(const struct ofpact *a, struct ofpbuf *out) case OFPACT_CLEAR_ACTIONS: case OFPACT_GOTO_TABLE: case OFPACT_METER: - NOT_REACHED(); + case OFPACT_SET_FIELD: + OVS_NOT_REACHED(); } } @@ -2114,6 +2585,12 @@ ofpact_to_openflow10(const struct ofpact *a, struct ofpbuf *out) break; case OFPACT_PUSH_VLAN: + /* PUSH is a side effect of a SET_VLAN_VID/PCP, which should + * follow this action. */ + break; + + case OFPACT_SET_IP_ECN: + case OFPACT_SET_IP_TTL: case OFPACT_CLEAR_ACTIONS: case OFPACT_WRITE_ACTIONS: case OFPACT_GOTO_TABLE: @@ -2124,6 +2601,10 @@ ofpact_to_openflow10(const struct ofpact *a, struct ofpbuf *out) case OFPACT_GROUP: break; + case OFPACT_SET_FIELD: + set_field_to_openflow(ofpact_get_SET_FIELD(a), out); + break; + case OFPACT_CONTROLLER: case OFPACT_OUTPUT_REG: case OFPACT_BUNDLE: @@ -2132,8 +2613,8 @@ ofpact_to_openflow10(const struct ofpact *a, struct ofpbuf *out) case OFPACT_STACK_PUSH: case OFPACT_STACK_POP: case OFPACT_DEC_TTL: - case OFPACT_SET_IP_ECN: - case OFPACT_SET_IP_TTL: + case OFPACT_SET_MPLS_LABEL: + case OFPACT_SET_MPLS_TC: case OFPACT_SET_MPLS_TTL: case OFPACT_DEC_MPLS_TTL: case OFPACT_SET_TUNNEL: @@ -2153,20 +2634,6 @@ ofpact_to_openflow10(const struct ofpact *a, struct ofpbuf *out) break; } } - -/* Converts the 'ofpacts_len' bytes of ofpacts in 'ofpacts' into OpenFlow 1.0 - * actions in 'openflow', appending the actions to any existing data in - * 'openflow'. */ -void -ofpacts_put_openflow10(const struct ofpact ofpacts[], size_t ofpacts_len, - struct ofpbuf *openflow) -{ - const struct ofpact *a; - - OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) { - ofpact_to_openflow10(a, openflow); - } -} /* Converting ofpacts to OpenFlow 1.1. */ @@ -2206,11 +2673,23 @@ ofpact_to_openflow11(const struct ofpact *a, struct ofpbuf *out) break; case OFPACT_SET_VLAN_VID: + /* Push a VLAN tag, if one was not seen at action validation time. */ + if (!ofpact_get_SET_VLAN_VID(a)->flow_has_vlan + && ofpact_get_SET_VLAN_VID(a)->push_vlan_if_needed) { + ofputil_put_OFPAT11_PUSH_VLAN(out)->ethertype + = htons(ETH_TYPE_VLAN_8021Q); + } ofputil_put_OFPAT11_SET_VLAN_VID(out)->vlan_vid = htons(ofpact_get_SET_VLAN_VID(a)->vlan_vid); break; case OFPACT_SET_VLAN_PCP: + /* Push a VLAN tag, if one was not seen at action validation time. */ + if (!ofpact_get_SET_VLAN_PCP(a)->flow_has_vlan + && ofpact_get_SET_VLAN_PCP(a)->push_vlan_if_needed) { + ofputil_put_OFPAT11_PUSH_VLAN(out)->ethertype + = htons(ETH_TYPE_VLAN_8021Q); + } ofputil_put_OFPAT11_SET_VLAN_PCP(out)->vlan_pcp = ofpact_get_SET_VLAN_PCP(a)->vlan_pcp; break; @@ -2279,6 +2758,16 @@ ofpact_to_openflow11(const struct ofpact *a, struct ofpbuf *out) ofpact_dec_ttl_to_openflow11(ofpact_get_DEC_TTL(a), out); break; + case OFPACT_SET_MPLS_LABEL: + ofputil_put_OFPAT11_SET_MPLS_LABEL(out)->mpls_label + = ofpact_get_SET_MPLS_LABEL(a)->label; + break; + + case OFPACT_SET_MPLS_TC: + ofputil_put_OFPAT11_SET_MPLS_TC(out)->mpls_tc + = ofpact_get_SET_MPLS_TC(a)->tc; + break; + case OFPACT_SET_MPLS_TTL: ofputil_put_OFPAT11_SET_MPLS_TTL(out)->mpls_ttl = ofpact_get_SET_MPLS_TTL(a)->ttl; @@ -2307,13 +2796,17 @@ ofpact_to_openflow11(const struct ofpact *a, struct ofpbuf *out) case OFPACT_WRITE_ACTIONS: case OFPACT_GOTO_TABLE: case OFPACT_METER: - NOT_REACHED(); + OVS_NOT_REACHED(); case OFPACT_GROUP: ofputil_put_OFPAT11_GROUP(out)->group_id = htonl(ofpact_get_GROUP(a)->group_id); break; + case OFPACT_SET_FIELD: + set_field_to_openflow(ofpact_get_SET_FIELD(a), out); + break; + case OFPACT_CONTROLLER: case OFPACT_OUTPUT_REG: case OFPACT_BUNDLE: @@ -2335,21 +2828,170 @@ ofpact_to_openflow11(const struct ofpact *a, struct ofpbuf *out) } } -/* Converts the ofpacts in 'ofpacts' (terminated by OFPACT_END) into OpenFlow - * 1.1 actions in 'openflow', appending the actions to any existing data in +/* Output deprecated set actions as set_field actions. */ +static void +ofpact_to_openflow12(const struct ofpact *a, struct ofpbuf *out) +{ + enum mf_field_id field; + union mf_value value; + struct ofpact_l4_port *l4port; + uint8_t proto; + + /* + * Convert actions deprecated in OpenFlow 1.2 to Set Field actions, + * if possible. + */ + switch ((int)a->type) { + case OFPACT_SET_VLAN_VID: + case OFPACT_SET_VLAN_PCP: + case OFPACT_SET_ETH_SRC: + case OFPACT_SET_ETH_DST: + case OFPACT_SET_IPV4_SRC: + case OFPACT_SET_IPV4_DST: + case OFPACT_SET_IP_DSCP: + case OFPACT_SET_IP_ECN: + case OFPACT_SET_L4_SRC_PORT: + case OFPACT_SET_L4_DST_PORT: + case OFPACT_SET_MPLS_LABEL: + case OFPACT_SET_MPLS_TC: + case OFPACT_SET_TUNNEL: /* Convert to a set_field, too. */ + + switch ((int)a->type) { + + case OFPACT_SET_VLAN_VID: + if (!ofpact_get_SET_VLAN_VID(a)->flow_has_vlan && + ofpact_get_SET_VLAN_VID(a)->push_vlan_if_needed) { + ofputil_put_OFPAT11_PUSH_VLAN(out)->ethertype + = htons(ETH_TYPE_VLAN_8021Q); + } + field = MFF_VLAN_VID; + /* Set-Field on OXM_OF_VLAN_VID must have OFPVID_PRESENT set. */ + value.be16 = htons(ofpact_get_SET_VLAN_VID(a)->vlan_vid + | OFPVID12_PRESENT); + break; + + case OFPACT_SET_VLAN_PCP: + if (!ofpact_get_SET_VLAN_PCP(a)->flow_has_vlan && + ofpact_get_SET_VLAN_PCP(a)->push_vlan_if_needed) { + ofputil_put_OFPAT11_PUSH_VLAN(out)->ethertype + = htons(ETH_TYPE_VLAN_8021Q); + } + field = MFF_VLAN_PCP; + value.u8 = ofpact_get_SET_VLAN_PCP(a)->vlan_pcp; + break; + + case OFPACT_SET_ETH_SRC: + field = MFF_ETH_SRC; + memcpy(value.mac, ofpact_get_SET_ETH_SRC(a)->mac, ETH_ADDR_LEN); + break; + + case OFPACT_SET_ETH_DST: + field = MFF_ETH_DST; + memcpy(value.mac, ofpact_get_SET_ETH_DST(a)->mac, ETH_ADDR_LEN); + break; + + case OFPACT_SET_IPV4_SRC: + field = MFF_IPV4_SRC; + value.be32 = ofpact_get_SET_IPV4_SRC(a)->ipv4; + break; + + case OFPACT_SET_IPV4_DST: + field = MFF_IPV4_DST; + value.be32 = ofpact_get_SET_IPV4_DST(a)->ipv4; + break; + + case OFPACT_SET_IP_DSCP: + field = MFF_IP_DSCP_SHIFTED; /* OXM_OF_IP_DSCP */ + value.u8 = ofpact_get_SET_IP_DSCP(a)->dscp >> 2; + break; + + case OFPACT_SET_IP_ECN: + field = MFF_IP_ECN; + value.u8 = ofpact_get_SET_IP_ECN(a)->ecn; + break; + + case OFPACT_SET_L4_SRC_PORT: + /* We keep track of IP protocol while translating actions to be + * able to translate to the proper OXM type. + * If the IP protocol type is unknown, the translation cannot + * be performed and we will send the action using the original + * action type. */ + l4port = ofpact_get_SET_L4_SRC_PORT(a); + proto = l4port->flow_ip_proto; + field = proto == IPPROTO_TCP ? MFF_TCP_SRC + : proto == IPPROTO_UDP ? MFF_UDP_SRC + : proto == IPPROTO_SCTP ? MFF_SCTP_SRC + : MFF_N_IDS; /* RFC: Unknown IP proto, do not translate. */ + value.be16 = htons(l4port->port); + break; + + case OFPACT_SET_L4_DST_PORT: + l4port = ofpact_get_SET_L4_DST_PORT(a); + proto = l4port->flow_ip_proto; + field = proto == IPPROTO_TCP ? MFF_TCP_DST + : proto == IPPROTO_UDP ? MFF_UDP_DST + : proto == IPPROTO_SCTP ? MFF_SCTP_DST + : MFF_N_IDS; /* RFC: Unknown IP proto, do not translate. */ + value.be16 = htons(l4port->port); + break; + + case OFPACT_SET_MPLS_LABEL: + field = MFF_MPLS_LABEL; + value.be32 = ofpact_get_SET_MPLS_LABEL(a)->label; + break; + + case OFPACT_SET_MPLS_TC: + field = MFF_MPLS_TC; + value.u8 = ofpact_get_SET_MPLS_TC(a)->tc; + break; + + case OFPACT_SET_TUNNEL: + field = MFF_TUN_ID; + value.be64 = htonll(ofpact_get_SET_TUNNEL(a)->tun_id); + break; + + default: + field = MFF_N_IDS; + } + + /* Put the action out as a set field action, if possible. */ + if (field < MFF_N_IDS) { + uint64_t ofpacts_stub[128 / 8]; + struct ofpbuf sf_act; + struct ofpact_set_field *sf; + + ofpbuf_use_stub(&sf_act, ofpacts_stub, sizeof ofpacts_stub); + sf = ofpact_put_SET_FIELD(&sf_act); + sf->field = mf_from_id(field); + memcpy(&sf->value, &value, sf->field->n_bytes); + set_field_to_openflow(sf, out); + return; + } + } + + ofpact_to_openflow11(a, out); +} + +/* Converts the 'ofpacts_len' bytes of ofpacts in 'ofpacts' into OpenFlow + * actions in 'openflow', appending the actions to any existing data in * 'openflow'. */ size_t -ofpacts_put_openflow11_actions(const struct ofpact ofpacts[], - size_t ofpacts_len, struct ofpbuf *openflow) +ofpacts_put_openflow_actions(const struct ofpact ofpacts[], size_t ofpacts_len, + struct ofpbuf *openflow, + enum ofp_version ofp_version) { const struct ofpact *a; - size_t start_size = openflow->size; + size_t start_size = ofpbuf_size(openflow); + + void (*translate)(const struct ofpact *a, struct ofpbuf *out) = + (ofp_version == OFP10_VERSION) ? ofpact_to_openflow10 : + (ofp_version == OFP11_VERSION) ? ofpact_to_openflow11 : + ofpact_to_openflow12; OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) { - ofpact_to_openflow11(a, openflow); + translate(a, openflow); } - - return openflow->size - start_size; + return ofpbuf_size(openflow) - start_size; } static void @@ -2359,20 +3001,23 @@ ofpacts_update_instruction_actions(struct ofpbuf *openflow, size_t ofs) /* Update the instruction's length (or, if it's empty, delete it). */ oia = ofpbuf_at_assert(openflow, ofs, sizeof *oia); - if (openflow->size > ofs + sizeof *oia) { - oia->len = htons(openflow->size - ofs); + if (ofpbuf_size(openflow) > ofs + sizeof *oia) { + oia->len = htons(ofpbuf_size(openflow) - ofs); } else { - openflow->size = ofs; + ofpbuf_set_size(openflow, ofs); } } void -ofpacts_put_openflow11_instructions(const struct ofpact ofpacts[], - size_t ofpacts_len, - struct ofpbuf *openflow) +ofpacts_put_openflow_instructions(const struct ofpact ofpacts[], + size_t ofpacts_len, + struct ofpbuf *openflow, + enum ofp_version ofp_version) { const struct ofpact *a; + ovs_assert(ofp_version >= OFP11_VERSION); + OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) { switch (ovs_instruction_type_from_ofpact_type(a->type)) { case OVSINST_OFPIT11_CLEAR_ACTIONS: @@ -2398,18 +3043,19 @@ ofpacts_put_openflow11_instructions(const struct ofpact ofpacts[], break; } - case OVSINST_OFPIT13_METER: { - const struct ofpact_meter *om; - struct ofp13_instruction_meter *oim; + case OVSINST_OFPIT13_METER: + if (ofp_version >= OFP13_VERSION) { + const struct ofpact_meter *om; + struct ofp13_instruction_meter *oim; - om = ofpact_get_METER(a); - oim = instruction_put_OFPIT13_METER(openflow); - oim->meter_id = htonl(om->meter_id); + om = ofpact_get_METER(a); + oim = instruction_put_OFPIT13_METER(openflow); + oim->meter_id = htonl(om->meter_id); + } break; - } case OVSINST_OFPIT11_APPLY_ACTIONS: { - const size_t ofs = openflow->size; + const size_t ofs = ofpbuf_size(openflow); const size_t ofpacts_len_left = (uint8_t*)ofpact_end(ofpacts, ofpacts_len) - (uint8_t*)a; const struct ofpact *action; @@ -2421,7 +3067,11 @@ ofpacts_put_openflow11_instructions(const struct ofpact ofpacts[], != OVSINST_OFPIT11_APPLY_ACTIONS) { break; } - ofpact_to_openflow11(action, openflow); + if (ofp_version == OFP11_VERSION) { + ofpact_to_openflow11(action, openflow); + } else { + ofpact_to_openflow12(action, openflow); + } processed = action; } ofpacts_update_instruction_actions(openflow, ofs); @@ -2430,14 +3080,14 @@ ofpacts_put_openflow11_instructions(const struct ofpact ofpacts[], } case OVSINST_OFPIT11_WRITE_ACTIONS: { - const size_t ofs = openflow->size; + const size_t ofs = ofpbuf_size(openflow); const struct ofpact_nest *on; on = ofpact_get_WRITE_ACTIONS(a); instruction_put_OFPIT11_WRITE_ACTIONS(openflow); - ofpacts_put_openflow11_actions(on->actions, - ofpact_nest_get_action_len(on), - openflow); + ofpacts_put_openflow_actions(on->actions, + ofpact_nest_get_action_len(on), + openflow, ofp_version); ofpacts_update_instruction_actions(openflow, ofs); break; @@ -2475,9 +3125,12 @@ ofpact_outputs_to_port(const struct ofpact *ofpact, ofp_port_t port) case OFPACT_SET_L4_DST_PORT: case OFPACT_REG_MOVE: case OFPACT_REG_LOAD: + case OFPACT_SET_FIELD: case OFPACT_STACK_PUSH: case OFPACT_STACK_POP: case OFPACT_DEC_TTL: + case OFPACT_SET_MPLS_LABEL: + case OFPACT_SET_MPLS_TC: case OFPACT_SET_MPLS_TTL: case OFPACT_DEC_MPLS_TTL: case OFPACT_SET_TUNNEL: @@ -2630,6 +3283,8 @@ ofpact_format(const struct ofpact *a, struct ds *s) const struct ofpact_metadata *metadata; const struct ofpact_tunnel *tunnel; const struct ofpact_sample *sample; + const struct ofpact_set_field *set_field; + const struct mf_field *mf; ofp_port_t port; switch (a->type) { @@ -2677,7 +3332,7 @@ ofpact_format(const struct ofpact *a, struct ds *s) enqueue = ofpact_get_ENQUEUE(a); ds_put_format(s, "enqueue:"); ofputil_format_port(enqueue->port, s); - ds_put_format(s, "q%"PRIu32, enqueue->queue); + ds_put_format(s, ":%"PRIu32, enqueue->queue); break; case OFPACT_OUTPUT_REG: @@ -2690,17 +3345,24 @@ ofpact_format(const struct ofpact *a, struct ds *s) break; case OFPACT_SET_VLAN_VID: - ds_put_format(s, "mod_vlan_vid:%"PRIu16, + ds_put_format(s, "%s:%"PRIu16, + (a->compat == OFPUTIL_OFPAT11_SET_VLAN_VID + ? "set_vlan_vid" + : "mod_vlan_vid"), ofpact_get_SET_VLAN_VID(a)->vlan_vid); break; case OFPACT_SET_VLAN_PCP: - ds_put_format(s, "mod_vlan_pcp:%"PRIu8, + ds_put_format(s, "%s:%"PRIu8, + (a->compat == OFPUTIL_OFPAT11_SET_VLAN_PCP + ? "set_vlan_pcp" + : "mod_vlan_pcp"), ofpact_get_SET_VLAN_PCP(a)->vlan_pcp); break; case OFPACT_STRIP_VLAN: - ds_put_cstr(s, "strip_vlan"); + ds_put_cstr(s, a->compat == OFPUTIL_OFPAT11_POP_VLAN + ? "pop_vlan" : "strip_vlan"); break; case OFPACT_PUSH_VLAN: @@ -2756,6 +3418,14 @@ ofpact_format(const struct ofpact *a, struct ds *s) nxm_format_reg_load(ofpact_get_REG_LOAD(a), s); break; + case OFPACT_SET_FIELD: + set_field = ofpact_get_SET_FIELD(a); + mf = set_field->field; + ds_put_format(s, "set_field:"); + mf_format(mf, &set_field->value, NULL, s); + ds_put_format(s, "->%s", mf->name); + break; + case OFPACT_STACK_PUSH: nxm_format_stack_push(ofpact_get_STACK_PUSH(a), s); break; @@ -2768,6 +3438,16 @@ ofpact_format(const struct ofpact *a, struct ds *s) print_dec_ttl(ofpact_get_DEC_TTL(a), s); break; + case OFPACT_SET_MPLS_LABEL: + ds_put_format(s, "set_mpls_label(%"PRIu32")", + ntohl(ofpact_get_SET_MPLS_LABEL(a)->label)); + break; + + case OFPACT_SET_MPLS_TC: + ds_put_format(s, "set_mpls_ttl(%"PRIu8")", + ofpact_get_SET_MPLS_TC(a)->tc); + break; + case OFPACT_SET_MPLS_TTL: ds_put_format(s, "set_mpls_ttl(%"PRIu8")", ofpact_get_SET_MPLS_TTL(a)->ttl); @@ -2928,7 +3608,7 @@ ofpact_put(struct ofpbuf *ofpacts, enum ofpact_type type, size_t len) struct ofpact *ofpact; ofpact_pad(ofpacts); - ofpact = ofpacts->l2 = ofpbuf_put_uninit(ofpacts, len); + ofpact = ofpacts->frame = ofpbuf_put_uninit(ofpacts, len); ofpact_init(ofpact, type, len); return ofpact; } @@ -2951,7 +3631,7 @@ ofpact_init(struct ofpact *ofpact, enum ofpact_type type, size_t len) void ofpact_update_len(struct ofpbuf *ofpacts, struct ofpact *ofpact) { - ovs_assert(ofpact == ofpacts->l2); + ovs_assert(ofpact == ofpacts->frame); ofpact->len = (char *) ofpbuf_tail(ofpacts) - (char *) ofpact; } @@ -2968,20 +3648,8 @@ ofpact_update_len(struct ofpbuf *ofpacts, struct ofpact *ofpact) void ofpact_pad(struct ofpbuf *ofpacts) { - unsigned int rem = ofpacts->size % OFPACT_ALIGNTO; - if (rem) { - ofpbuf_put_zeros(ofpacts, OFPACT_ALIGNTO - rem); + unsigned int pad = PAD_SIZE(ofpbuf_size(ofpacts), OFPACT_ALIGNTO); + if (pad) { + ofpbuf_put_zeros(ofpacts, pad); } } - -void -ofpact_set_field_init(struct ofpact_reg_load *load, const struct mf_field *mf, - const void *src) -{ - load->ofpact.compat = OFPUTIL_OFPAT12_SET_FIELD; - load->dst.field = mf; - load->dst.ofs = 0; - load->dst.n_bits = mf->n_bits; - bitwise_copy(src, mf->n_bytes, load->dst.ofs, - &load->subvalue, sizeof load->subvalue, 0, mf->n_bits); -}