X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fmultipath.c;h=46976fb2ac4bc7c1dd7846c8698ab714b32bc244;hb=a2af1e9dd995420730a334a610d53e381d259e54;hp=4ee6fd025e4062ad664d00212537349a8086916d;hpb=520e9a2acdcf6136bf0a20586df6351ecf72dd3e;p=sliver-openvswitch.git diff --git a/lib/multipath.c b/lib/multipath.c index 4ee6fd025..46976fb2a 100644 --- a/lib/multipath.c +++ b/lib/multipath.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2011 Nicira Networks. + * Copyright (c) 2010, 2011, 2012 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,9 @@ #include #include #include "dynamic-string.h" +#include "meta-flow.h" #include "nx-match.h" +#include "ofp-errors.h" #include "ofp-util.h" #include "openflow/nicira-ext.h" #include "packets.h" @@ -33,12 +35,19 @@ VLOG_DEFINE_THIS_MODULE(multipath); static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); /* multipath_check(). */ -int -multipath_check(const struct nx_action_multipath *mp) +enum ofperr +multipath_check(const struct nx_action_multipath *mp, const struct flow *flow) { - uint32_t dst = ntohl(mp->dst); - int ofs = nxm_decode_ofs(mp->ofs_nbits); - int n_bits = nxm_decode_n_bits(mp->ofs_nbits); + uint32_t n_links = ntohs(mp->max_link) + 1; + size_t min_n_bits = log_2_ceil(n_links); + struct mf_subfield dst; + enum ofperr error; + + nxm_decode(&dst, mp->dst, mp->ofs_nbits); + error = mf_check_dst(&dst, flow); + if (error) { + return error; + } if (!flow_hash_fields_valid(ntohs(mp->fields))) { VLOG_WARN_RL(&rl, "unsupported fields %"PRIu16, ntohs(mp->fields)); @@ -48,17 +57,14 @@ multipath_check(const struct nx_action_multipath *mp) && mp->algorithm != htons(NX_MP_ALG_ITER_HASH)) { VLOG_WARN_RL(&rl, "unsupported algorithm %"PRIu16, ntohs(mp->algorithm)); - } else if (!NXM_IS_NX_REG(dst) || NXM_NX_REG_IDX(dst) >= FLOW_N_REGS) { - VLOG_WARN_RL(&rl, "unsupported destination field %#"PRIx32, dst); - } else if (ofs + n_bits > nxm_field_bits(dst)) { - VLOG_WARN_RL(&rl, "destination overflows output field"); - } else if (n_bits < 16 && ntohs(mp->max_link) > (1u << n_bits)) { - VLOG_WARN_RL(&rl, "max_link overflows output field"); + } else if (dst.n_bits < min_n_bits) { + VLOG_WARN_RL(&rl, "multipath action requires at least %zu bits for " + "%"PRIu32" links", min_n_bits, n_links); } else { return 0; } - return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_ARGUMENT); + return OFPERR_OFPBAC_BAD_ARGUMENT; } /* multipath_execute(). */ @@ -75,13 +81,10 @@ multipath_execute(const struct nx_action_multipath *mp, struct flow *flow) uint16_t link = multipath_algorithm(hash, ntohs(mp->algorithm), ntohs(mp->max_link) + 1, ntohl(mp->arg)); + struct mf_subfield dst; - /* Store it. */ - uint32_t *reg = &flow->regs[NXM_NX_REG_IDX(ntohl(mp->dst))]; - int ofs = nxm_decode_ofs(mp->ofs_nbits); - int n_bits = nxm_decode_n_bits(mp->ofs_nbits); - uint32_t mask = n_bits == 32 ? UINT32_MAX : (UINT32_C(1) << n_bits) - 1; - *reg = (*reg & ~(mask << ofs)) | (link << ofs); + nxm_decode(&dst, mp->dst, mp->ofs_nbits); + mf_set_subfield_value(&dst, link, flow); } static uint16_t @@ -166,9 +169,8 @@ multipath_parse(struct nx_action_multipath *mp, const char *s_) { char *s = xstrdup(s_); char *save_ptr = NULL; - char *fields, *basis, *algorithm, *n_links_str, *arg, *dst; - uint32_t header; - int ofs, n_bits; + char *fields, *basis, *algorithm, *n_links_str, *arg, *dst_s; + struct mf_subfield dst; int n_links; fields = strtok_r(s, ", ", &save_ptr); @@ -176,16 +178,12 @@ multipath_parse(struct nx_action_multipath *mp, const char *s_) algorithm = strtok_r(NULL, ", ", &save_ptr); n_links_str = strtok_r(NULL, ", ", &save_ptr); arg = strtok_r(NULL, ", ", &save_ptr); - dst = strtok_r(NULL, ", ", &save_ptr); - if (!dst) { + dst_s = strtok_r(NULL, ", ", &save_ptr); + if (!dst_s) { ovs_fatal(0, "%s: not enough arguments to multipath action", s_); } - memset(mp, 0, sizeof *mp); - mp->type = htons(OFPAT_VENDOR); - mp->len = htons(sizeof *mp); - mp->vendor = htonl(NX_VENDOR_ID); - mp->subtype = htons(NXAST_MULTIPATH); + ofputil_init_NXAST_MULTIPATH(mp); if (!strcasecmp(fields, "eth_src")) { mp->fields = htons(NX_HASH_FIELDS_ETH_SRC); } else if (!strcasecmp(fields, "symmetric_l4")) { @@ -213,17 +211,14 @@ multipath_parse(struct nx_action_multipath *mp, const char *s_) mp->max_link = htons(n_links - 1); mp->arg = htonl(atoi(arg)); - nxm_parse_field_bits(dst, &header, &ofs, &n_bits); - if (!NXM_IS_NX_REG(header) || NXM_NX_REG_IDX(header) >= FLOW_N_REGS) { - ovs_fatal(0, "%s: destination field must be register", s_); - } - if (n_bits < 16 && n_links > (1u << n_bits)) { + mf_parse_subfield(&dst, dst_s); + if (dst.n_bits < 16 && n_links > (1u << dst.n_bits)) { ovs_fatal(0, "%s: %d-bit destination field has %u possible values, " "less than specified n_links %d", - s_, n_bits, 1u << n_bits, n_links); + s_, dst.n_bits, 1u << dst.n_bits, n_links); } - mp->ofs_nbits = nxm_encode_ofs_nbits(ofs, n_bits); - mp->dst = htonl(header); + mp->ofs_nbits = nxm_encode_ofs_nbits(dst.ofs, dst.n_bits); + mp->dst = htonl(dst.field->nxm_header); free(s); } @@ -236,6 +231,8 @@ multipath_format(const struct nx_action_multipath *mp, struct ds *s) uint16_t mp_fields = ntohs(mp->fields); uint16_t mp_algorithm = ntohs(mp->algorithm); + struct mf_subfield dst; + fields = flow_hash_fields_to_str(mp_fields); switch ((enum nx_mp_algorithm) mp_algorithm) { @@ -258,7 +255,7 @@ multipath_format(const struct nx_action_multipath *mp, struct ds *s) ds_put_format(s, "multipath(%s,%"PRIu16",%s,%d,%"PRIu16",", fields, ntohs(mp->basis), algorithm, ntohs(mp->max_link) + 1, ntohl(mp->arg)); - nxm_format_field_bits(s, ntohl(mp->dst), nxm_decode_ofs(mp->ofs_nbits), - nxm_decode_n_bits(mp->ofs_nbits)); + nxm_decode(&dst, mp->dst, mp->ofs_nbits); + mf_format_subfield(&dst, s); ds_put_char(s, ')'); }