X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-actions.c;h=45586690b935f6fec3e0419191746d6d50e253bf;hb=8c19b83f862a66f032930b328ab72cd2ee5aebf0;hp=556fd052ec1887233896d7329f01b049fa62a026;hpb=e3f8f887480856064fab42bc01ae364d64506d85;p=sliver-openvswitch.git diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index 556fd052e..45586690b 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -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 @@ -473,6 +477,14 @@ ofpact_from_nxast(const union ofp_action *a, enum ofputil_action_code code, OFPACT_MPLS_AFTER_VLAN, 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: ofpact_put_SET_MPLS_TTL(out)->ttl = a->mpls_ttl.ttl; break; @@ -685,7 +697,6 @@ ofpacts_pull_openflow_actions(struct ofpbuf *openflow, unsigned int actions_len, enum ofp_version version, struct ofpbuf *ofpacts) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); const union ofp_action *actions; enum ofperr error; @@ -927,6 +938,15 @@ set_field_to_openflow11(const struct ofpact_set_field *sf, 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; @@ -963,8 +983,6 @@ set_field_to_openflow11(const struct ofpact_set_field *sf, ofputil_put_OFPAT11_SET_TP_DST(openflow)->tp_port = sf->value.be16; break; - case MFF_MPLS_TC: /* XXX */ - case MFF_MPLS_LABEL: /* XXX */ default: set_field_to_nxast(sf, openflow); break; @@ -1088,7 +1106,7 @@ 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 @@ -1105,6 +1123,24 @@ ofpact_from_openflow11(const union ofp_action *a, enum ofp_version version, 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: @@ -1202,6 +1238,14 @@ ofpact_from_openflow11(const union ofp_action *a, enum ofp_version version, case OFPUTIL_OFPAT12_SET_FIELD: 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; break; @@ -1255,6 +1299,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: @@ -1319,6 +1365,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: @@ -1568,6 +1616,8 @@ ovs_instruction_type_from_ofpact_type(enum ofpact_type type) 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: @@ -1687,7 +1737,6 @@ ofpacts_pull_openflow_instructions(struct ofpbuf *openflow, 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; @@ -1793,21 +1842,48 @@ exit: return error; } -/* May modify flow->dl_type and flow->vlan_tci, caller must restore them. +/* 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; + } +} + +/* 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__(struct ofpact *a, struct flow *flow, ofp_port_t max_ports, - uint8_t table_id, bool enforce_consistency) +ofpact_check__(struct ofpact *a, struct flow *flow, + bool enforce_consistency, 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; @@ -1891,12 +1967,27 @@ ofpact_check__(struct ofpact *a, struct flow *flow, ofp_port_t max_ports, 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)) { + goto inconsistent; + } + /* 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; } + /* 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: @@ -1931,6 +2022,8 @@ ofpact_check__(struct ofpact *a, struct flow *flow, ofp_port_t max_ports, 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)) { @@ -1962,6 +2055,10 @@ ofpact_check__(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: @@ -1980,7 +2077,7 @@ ofpact_check__(struct ofpact *a, struct flow *flow, ofp_port_t max_ports, case OFPACT_WRITE_ACTIONS: { struct ofpact_nest *on = ofpact_get_WRITE_ACTIONS(a); return ofpacts_check(on->actions, ofpact_nest_get_action_len(on), - flow, max_ports, table_id, false); + flow, false, max_ports, table_id, n_tables); } case OFPACT_WRITE_METADATA: @@ -1994,11 +2091,14 @@ ofpact_check__(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; @@ -2023,17 +2123,19 @@ ofpact_check__(struct ofpact *a, struct flow *flow, ofp_port_t max_ports, * May temporarily modify 'flow', but restores the changes before returning. */ enum ofperr ofpacts_check(struct ofpact ofpacts[], size_t ofpacts_len, - struct flow *flow, ofp_port_t max_ports, uint8_t table_id, - bool enforce_consistency) + struct flow *flow, bool enforce_consistency, + ofp_port_t max_ports, + uint8_t table_id, uint8_t n_tables) { 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__(a, flow, enforce_consistency, + max_ports, table_id, n_tables); if (error) { break; } @@ -2041,6 +2143,7 @@ ofpacts_check(struct ofpact ofpacts[], size_t ofpacts_len, /* Restore fields that may have been modified. */ flow->dl_type = dl_type; flow->vlan_tci = vlan_tci; + flow->nw_proto = nw_proto; return error; } @@ -2052,14 +2155,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); @@ -2250,6 +2354,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; @@ -2453,6 +2567,8 @@ ofpact_to_openflow10(const struct ofpact *a, struct ofpbuf *out) 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: @@ -2596,6 +2712,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; @@ -2656,9 +2782,147 @@ ofpact_to_openflow11(const struct ofpact *a, struct ofpbuf *out) } } +/* 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); } @@ -2819,6 +3083,8 @@ ofpact_outputs_to_port(const struct ofpact *ofpact, ofp_port_t port) 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: @@ -3020,7 +3286,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: @@ -3126,6 +3392,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);