X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-actions.c;h=a02f842929f3d886e436a775873ffaa693e13652;hb=0a407cd6f2129793940bfbd42dc39fe97e93e14b;hp=abc950529b6ec5838942aece635e7032fcda6ee7;hpb=b55f2f799b6340a89fd282ac28f6eff8d8492bf5;p=sliver-openvswitch.git diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index abc950529..a02f84292 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -248,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; @@ -638,7 +638,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); @@ -697,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; @@ -712,7 +711,7 @@ ofpacts_pull_openflow_actions(struct ofpbuf *openflow, actions = ofpbuf_try_pull(openflow, actions_len); if (actions == NULL) { VLOG_WARN_RL(&rl, "OpenFlow message actions length %u exceeds " - "remaining message length (%zu)", + "remaining message length (%"PRIuSIZE")", actions_len, openflow->size); return OFPERR_OFPBRC_BAD_LEN; } @@ -1716,7 +1715,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; } @@ -1738,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; @@ -1756,7 +1754,7 @@ ofpacts_pull_openflow_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)", + "remaining message length (%"PRIuSIZE")", instructions_len, openflow->size); error = OFPERR_OFPBIC_BAD_LEN; goto exit; @@ -1869,13 +1867,26 @@ ofpact_check_output_port(ofp_port_t port, ofp_port_t max_ports) } } -/* May modify flow->dl_type and flow->vlan_tci, caller must restore them. +/* 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__(struct ofpact *a, struct flow *flow, - bool enforce_consistency, ofp_port_t max_ports, +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; @@ -1911,7 +1922,7 @@ ofpact_check__(struct ofpact *a, struct flow *flow, (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) { - goto inconsistent; + inconsistent_match(usable_protocols); } /* Temporary mark that we have a vlan tag. */ flow->vlan_tci |= htons(VLAN_CFI); @@ -1924,7 +1935,7 @@ ofpact_check__(struct ofpact *a, struct flow *flow, (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) { - goto inconsistent; + inconsistent_match(usable_protocols); } /* Temporary mark that we have a vlan tag. */ flow->vlan_tci |= htons(VLAN_CFI); @@ -1932,7 +1943,7 @@ ofpact_check__(struct ofpact *a, struct flow *flow, 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); @@ -1954,7 +1965,7 @@ ofpact_check__(struct ofpact *a, struct flow *flow, 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; @@ -1963,7 +1974,7 @@ ofpact_check__(struct ofpact *a, struct flow *flow, case OFPACT_SET_IP_TTL: case OFPACT_DEC_TTL: if (!is_ip_any(flow)) { - goto inconsistent; + inconsistent_match(usable_protocols); } return 0; @@ -1971,7 +1982,7 @@ ofpact_check__(struct ofpact *a, struct flow *flow, 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 @@ -1983,7 +1994,7 @@ ofpact_check__(struct ofpact *a, struct flow *flow, 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 @@ -2028,7 +2039,7 @@ ofpact_check__(struct ofpact *a, struct flow *flow, 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; @@ -2040,7 +2051,7 @@ ofpact_check__(struct ofpact *a, struct flow *flow, case OFPACT_FIN_TIMEOUT: if (flow->nw_proto != IPPROTO_TCP) { - goto inconsistent; + inconsistent_match(usable_protocols); } return 0; @@ -2056,12 +2067,16 @@ ofpact_check__(struct ofpact *a, struct flow *flow, 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); } return 0; @@ -2072,9 +2087,12 @@ ofpact_check__(struct ofpact *a, struct flow *flow, 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, false, max_ports, table_id, n_tables); + flow, max_ports, table_id, n_tables, &p); } case OFPACT_WRITE_METADATA: @@ -2103,34 +2121,34 @@ ofpact_check__(struct ofpact *a, struct flow *flow, default: 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(struct ofpact ofpacts[], size_t ofpacts_len, - struct flow *flow, bool enforce_consistency, - ofp_port_t max_ports, - uint8_t table_id, uint8_t n_tables) + struct flow *flow, ofp_port_t max_ports, + uint8_t table_id, uint8_t n_tables, + enum ofputil_protocol *usable_protocols) { 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, enforce_consistency, + error = ofpact_check__(usable_protocols, a, flow, max_ports, table_id, n_tables); if (error) { break; @@ -2139,9 +2157,28 @@ 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; } +/* 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