X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnx-match.c;h=a93a6939b0a8bded5df53301d31f29744b5da6b3;hb=e729e7935e5c77eae1ca4a8040d05626f61cf9a2;hp=9f869a765acdcd4d17ee496204dc141f5f940f74;hpb=bf9712678fc9ec85bf2ac54407e16d76aa22e7b6;p=sliver-openvswitch.git diff --git a/lib/nx-match.c b/lib/nx-match.c index 9f869a765..a93a6939b 100644 --- a/lib/nx-match.c +++ b/lib/nx-match.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Nicira Networks. + * Copyright (c) 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,8 +18,11 @@ #include "nx-match.h" +#include + #include "classifier.h" #include "dynamic-string.h" +#include "meta-flow.h" #include "ofp-util.h" #include "ofpbuf.h" #include "openflow/nicira-ext.h" @@ -43,87 +46,9 @@ enum { BAD_ARGUMENT = OFP_MKERR(OFPET_BAD_ACTION, OFPBAC_BAD_ARGUMENT) }; -/* For each NXM_* field, define NFI_NXM_* as consecutive integers starting from - * zero. */ -enum nxm_field_index { -#define DEFINE_FIELD(HEADER, WILDCARD, DL_TYPE, NW_PROTO) NFI_NXM_##HEADER, -#include "nx-match.def" - N_NXM_FIELDS -}; - -struct nxm_field { - struct hmap_node hmap_node; - enum nxm_field_index index; /* NFI_* value. */ - uint32_t header; /* NXM_* value. */ - uint32_t wildcard; /* Wildcard bit, if exactly one. */ - ovs_be16 dl_type; /* dl_type prerequisite, if nonzero. */ - uint8_t nw_proto; /* nw_proto prerequisite, if nonzero. */ - const char *name; /* "NXM_*" string. */ -}; - -/* All the known fields. */ -static struct nxm_field nxm_fields[N_NXM_FIELDS] = { -#define DEFINE_FIELD(HEADER, WILDCARD, DL_TYPE, NW_PROTO) \ - { HMAP_NODE_NULL_INITIALIZER, NFI_NXM_##HEADER, NXM_##HEADER, WILDCARD, \ - CONSTANT_HTONS(DL_TYPE), NW_PROTO, "NXM_" #HEADER }, -#include "nx-match.def" -}; - -/* Hash table of 'nxm_fields'. */ -static struct hmap all_nxm_fields = HMAP_INITIALIZER(&all_nxm_fields); - -/* Possible masks for NXM_OF_ETH_DST_W. */ -static const uint8_t eth_all_0s[ETH_ADDR_LEN] - = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static const uint8_t eth_all_1s[ETH_ADDR_LEN] - = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; -static const uint8_t eth_mcast_1[ETH_ADDR_LEN] - = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00}; -static const uint8_t eth_mcast_0[ETH_ADDR_LEN] - = {0xfe, 0xff, 0xff, 0xff, 0xff, 0xff}; - -static void -nxm_init(void) -{ - if (hmap_is_empty(&all_nxm_fields)) { - int i; - - for (i = 0; i < N_NXM_FIELDS; i++) { - struct nxm_field *f = &nxm_fields[i]; - hmap_insert(&all_nxm_fields, &f->hmap_node, - hash_int(f->header, 0)); - } - - /* Verify that the header values are unique (duplicate "case" values - * cause a compile error). */ - switch (0) { -#define DEFINE_FIELD(HEADER, WILDCARD, DL_TYPE, NW_PROTO) \ - case NXM_##HEADER: break; -#include "nx-match.def" - } - } -} - -static const struct nxm_field * -nxm_field_lookup(uint32_t header) -{ - struct nxm_field *f; - - nxm_init(); - - HMAP_FOR_EACH_WITH_HASH (f, hmap_node, hash_int(header, 0), - &all_nxm_fields) { - if (f->header == header) { - return f; - } - } - - return NULL; -} - /* Returns the width of the data for a field with the given 'header', in * bytes. */ -static int +int nxm_field_bytes(uint32_t header) { unsigned int length = NXM_LENGTH(header); @@ -132,7 +57,7 @@ nxm_field_bytes(uint32_t header) /* Returns the width of the data for a field with the given 'header', in * bits. */ -static int +int nxm_field_bits(uint32_t header) { return nxm_field_bytes(header) * 8; @@ -140,223 +65,6 @@ nxm_field_bits(uint32_t header) /* nx_pull_match() and helpers. */ -static int -parse_tci(struct cls_rule *rule, ovs_be16 tci, ovs_be16 mask) -{ - enum { OFPFW_DL_TCI = OFPFW_DL_VLAN | OFPFW_DL_VLAN_PCP }; - if ((rule->wc.wildcards & OFPFW_DL_TCI) != OFPFW_DL_TCI) { - return NXM_DUP_TYPE; - } else { - return cls_rule_set_dl_tci_masked(rule, tci, mask) ? 0 : NXM_INVALID; - } -} - -static int -parse_nx_reg(const struct nxm_field *f, - struct flow *flow, struct flow_wildcards *wc, - const void *value, const void *maskp) -{ - int idx = NXM_NX_REG_IDX(f->header); - if (wc->reg_masks[idx]) { - return NXM_DUP_TYPE; - } else { - flow_wildcards_set_reg_mask(wc, idx, - (NXM_HASMASK(f->header) - ? ntohl(get_unaligned_u32(maskp)) - : UINT32_MAX)); - flow->regs[idx] = ntohl(get_unaligned_u32(value)); - flow->regs[idx] &= wc->reg_masks[idx]; - return 0; - } -} - -static int -parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f, - const void *value, const void *mask) -{ - struct flow_wildcards *wc = &rule->wc; - struct flow *flow = &rule->flow; - - switch (f->index) { - /* Metadata. */ - case NFI_NXM_OF_IN_PORT: - flow->in_port = ntohs(get_unaligned_u16(value)); - if (flow->in_port == OFPP_LOCAL) { - flow->in_port = ODPP_LOCAL; - } - return 0; - - /* Ethernet header. */ - case NFI_NXM_OF_ETH_DST: - if ((wc->wildcards & (OFPFW_DL_DST | FWW_ETH_MCAST)) - != (OFPFW_DL_DST | FWW_ETH_MCAST)) { - return NXM_DUP_TYPE; - } else { - wc->wildcards &= ~(OFPFW_DL_DST | FWW_ETH_MCAST); - memcpy(flow->dl_dst, value, ETH_ADDR_LEN); - return 0; - } - case NFI_NXM_OF_ETH_DST_W: - if ((wc->wildcards & (OFPFW_DL_DST | FWW_ETH_MCAST)) - != (OFPFW_DL_DST | FWW_ETH_MCAST)) { - return NXM_DUP_TYPE; - } else if (eth_addr_equals(mask, eth_mcast_1)) { - wc->wildcards &= ~FWW_ETH_MCAST; - flow->dl_dst[0] = *(uint8_t *) value & 0x01; - } else if (eth_addr_equals(mask, eth_mcast_0)) { - wc->wildcards &= ~OFPFW_DL_DST; - memcpy(flow->dl_dst, value, ETH_ADDR_LEN); - flow->dl_dst[0] &= 0xfe; - } else if (eth_addr_equals(mask, eth_all_0s)) { - return 0; - } else if (eth_addr_equals(mask, eth_all_1s)) { - wc->wildcards &= ~(OFPFW_DL_DST | FWW_ETH_MCAST); - memcpy(flow->dl_dst, value, ETH_ADDR_LEN); - return 0; - } else { - return NXM_BAD_MASK; - } - case NFI_NXM_OF_ETH_SRC: - memcpy(flow->dl_src, value, ETH_ADDR_LEN); - return 0; - case NFI_NXM_OF_ETH_TYPE: - flow->dl_type = get_unaligned_u16(value); - return 0; - - /* 802.1Q header. */ - case NFI_NXM_OF_VLAN_TCI: - return parse_tci(rule, get_unaligned_u16(value), htons(UINT16_MAX)); - - case NFI_NXM_OF_VLAN_TCI_W: - return parse_tci(rule, get_unaligned_u16(value), - get_unaligned_u16(mask)); - - /* IP header. */ - case NFI_NXM_OF_IP_TOS: - if (*(uint8_t *) value & 0x03) { - return NXM_BAD_VALUE; - } else { - flow->nw_tos = *(uint8_t *) value; - return 0; - } - case NFI_NXM_OF_IP_PROTO: - flow->nw_proto = *(uint8_t *) value; - return 0; - - /* IP addresses in IP and ARP headers. */ - case NFI_NXM_OF_IP_SRC: - case NFI_NXM_OF_ARP_SPA: - if (wc->nw_src_mask) { - return NXM_DUP_TYPE; - } else { - cls_rule_set_nw_src(rule, get_unaligned_u32(value)); - return 0; - } - case NFI_NXM_OF_IP_SRC_W: - case NFI_NXM_OF_ARP_SPA_W: - if (wc->nw_src_mask) { - return NXM_DUP_TYPE; - } else { - ovs_be32 ip = get_unaligned_u32(value); - ovs_be32 netmask = get_unaligned_u32(mask); - if (!cls_rule_set_nw_src_masked(rule, ip, netmask)) { - return NXM_BAD_MASK; - } - return 0; - } - case NFI_NXM_OF_IP_DST: - case NFI_NXM_OF_ARP_TPA: - if (wc->nw_dst_mask) { - return NXM_DUP_TYPE; - } else { - cls_rule_set_nw_dst(rule, get_unaligned_u32(value)); - return 0; - } - case NFI_NXM_OF_IP_DST_W: - case NFI_NXM_OF_ARP_TPA_W: - if (wc->nw_dst_mask) { - return NXM_DUP_TYPE; - } else { - ovs_be32 ip = get_unaligned_u32(value); - ovs_be32 netmask = get_unaligned_u32(mask); - if (!cls_rule_set_nw_dst_masked(rule, ip, netmask)) { - return NXM_BAD_MASK; - } - return 0; - } - - /* TCP header. */ - case NFI_NXM_OF_TCP_SRC: - flow->tp_src = get_unaligned_u16(value); - return 0; - case NFI_NXM_OF_TCP_DST: - flow->tp_dst = get_unaligned_u16(value); - return 0; - - /* UDP header. */ - case NFI_NXM_OF_UDP_SRC: - flow->tp_src = get_unaligned_u16(value); - return 0; - case NFI_NXM_OF_UDP_DST: - flow->tp_dst = get_unaligned_u16(value); - return 0; - - /* ICMP header. */ - case NFI_NXM_OF_ICMP_TYPE: - flow->tp_src = htons(*(uint8_t *) value); - return 0; - case NFI_NXM_OF_ICMP_CODE: - flow->tp_dst = htons(*(uint8_t *) value); - return 0; - - /* ARP header. */ - case NFI_NXM_OF_ARP_OP: - if (ntohs(get_unaligned_u16(value)) > 255) { - return NXM_BAD_VALUE; - } else { - flow->nw_proto = ntohs(get_unaligned_u16(value)); - return 0; - } - - /* Tunnel ID. */ - case NFI_NXM_NX_TUN_ID: - flow->tun_id = htonl(ntohll(get_unaligned_u64(value))); - return 0; - - /* Registers. */ - case NFI_NXM_NX_REG0: - case NFI_NXM_NX_REG0_W: -#if FLOW_N_REGS >= 2 - case NFI_NXM_NX_REG1: - case NFI_NXM_NX_REG1_W: -#endif -#if FLOW_N_REGS >= 3 - case NFI_NXM_NX_REG2: - case NFI_NXM_NX_REG2_W: -#endif -#if FLOW_N_REGS >= 4 - case NFI_NXM_NX_REG3: - case NFI_NXM_NX_REG3_W: -#endif -#if FLOW_N_REGS > 4 -#error -#endif - return parse_nx_reg(f, flow, wc, value, mask); - - case N_NXM_FIELDS: - NOT_REACHED(); - } - NOT_REACHED(); -} - -static bool -nxm_prereqs_ok(const struct nxm_field *field, const struct flow *flow) -{ - return (!field->dl_type - || (field->dl_type == flow->dl_type - && (!field->nw_proto || field->nw_proto == flow->nw_proto))); -} - static uint32_t nx_entry_ok(const void *p, unsigned int match_len) { @@ -388,52 +96,101 @@ nx_entry_ok(const void *p, unsigned int match_len) return header; } +/* Parses the nx_match formatted match description in 'b' with length + * 'match_len'. The results are stored in 'rule', which is initialized + * with 'priority'. If 'cookie' and 'cookie_mask' contain valid + * pointers, then the cookie and mask will be stored in them if a + * "NXM_NX_COOKIE*" match is defined. Otherwise, 0 is stored in both. + * + * Returns 0 if successful, otherwise an OpenFlow error code. + */ int nx_pull_match(struct ofpbuf *b, unsigned int match_len, uint16_t priority, - struct cls_rule *rule) + struct cls_rule *rule, + ovs_be64 *cookie, ovs_be64 *cookie_mask) { uint32_t header; uint8_t *p; + assert((cookie != NULL) == (cookie_mask != NULL)); + p = ofpbuf_try_pull(b, ROUND_UP(match_len, 8)); if (!p) { - VLOG_DBG_RL(&rl, "nx_match length %zu, rounded up to a " + VLOG_DBG_RL(&rl, "nx_match length %u, rounded up to a " "multiple of 8, is longer than space in message (max " "length %zu)", match_len, b->size); return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN); } cls_rule_init_catchall(rule, priority); + if (cookie) { + *cookie = *cookie_mask = htonll(0); + } while ((header = nx_entry_ok(p, match_len)) != 0) { unsigned length = NXM_LENGTH(header); - const struct nxm_field *f; + const struct mf_field *mf; int error; - f = nxm_field_lookup(header); - if (!f) { + mf = mf_from_nxm_header(header); + if (!mf) { error = NXM_BAD_TYPE; - } else if (!nxm_prereqs_ok(f, &rule->flow)) { + } else if (!mf_are_prereqs_ok(mf, &rule->flow)) { error = NXM_BAD_PREREQ; - } else if (f->wildcard && !(rule->wc.wildcards & f->wildcard)) { + } else if (!mf_is_all_wild(mf, &rule->wc)) { error = NXM_DUP_TYPE; } else { - /* 'hasmask' and 'length' are known to be correct at this point - * because they are included in 'header' and nxm_field_lookup() - * checked them already. */ - rule->wc.wildcards &= ~f->wildcard; - error = parse_nxm_entry(rule, f, p + 4, p + 4 + length / 2); + unsigned int width = mf->n_bytes; + union mf_value value; + + memcpy(&value, p + 4, width); + if (!mf_is_value_valid(mf, &value)) { + error = NXM_BAD_VALUE; + } else if (!NXM_HASMASK(header)) { + error = 0; + mf_set_value(mf, &value, rule); + } else { + union mf_value mask; + + memcpy(&mask, p + 4 + width, width); + if (!mf_is_mask_valid(mf, &mask)) { + error = NXM_BAD_MASK; + } else { + error = 0; + mf_set(mf, &value, &mask, rule); + } + } + } + + /* Check if the match is for a cookie rather than a classifier rule. */ + if ((header == NXM_NX_COOKIE || header == NXM_NX_COOKIE_W) && cookie) { + if (*cookie_mask) { + error = NXM_DUP_TYPE; + } else { + unsigned int width = sizeof *cookie; + + memcpy(cookie, p + 4, width); + if (NXM_HASMASK(header)) { + memcpy(cookie_mask, p + 4 + width, width); + } else { + *cookie_mask = htonll(UINT64_MAX); + } + error = 0; + } } + if (error) { - VLOG_DBG_RL(&rl, "bad nxm_entry with vendor=%"PRIu32", " - "field=%"PRIu32", hasmask=%"PRIu32", type=%"PRIu32" " - "(error %x)", + char *msg = ofputil_error_to_string(error); + VLOG_DBG_RL(&rl, "bad nxm_entry %#08"PRIx32" (vendor=%"PRIu32", " + "field=%"PRIu32", hasmask=%"PRIu32", len=%"PRIu32"), " + "(%s)", header, NXM_VENDOR(header), NXM_FIELD(header), - NXM_HASMASK(header), NXM_TYPE(header), - error); + NXM_HASMASK(header), NXM_LENGTH(header), + msg); + free(msg); + return error; } - p += 4 + length; match_len -= 4 + length; } @@ -462,6 +219,24 @@ nxm_put_8(struct ofpbuf *b, uint32_t header, uint8_t value) ofpbuf_put(b, &value, sizeof value); } +static void +nxm_put_8m(struct ofpbuf *b, uint32_t header, uint8_t value, uint8_t mask) +{ + switch (mask) { + case 0: + break; + + case UINT8_MAX: + nxm_put_8(b, header, value); + break; + + default: + nxm_put_header(b, NXM_MAKE_WILD_HEADER(header)); + ofpbuf_put(b, &value, sizeof value); + ofpbuf_put(b, &mask, sizeof mask); + } +} + static void nxm_put_16(struct ofpbuf *b, uint32_t header, ovs_be16 value) { @@ -477,6 +252,23 @@ nxm_put_16w(struct ofpbuf *b, uint32_t header, ovs_be16 value, ovs_be16 mask) ofpbuf_put(b, &mask, sizeof mask); } +static void +nxm_put_16m(struct ofpbuf *b, uint32_t header, ovs_be16 value, ovs_be16 mask) +{ + switch (mask) { + case 0: + break; + + case CONSTANT_HTONS(UINT16_MAX): + nxm_put_16(b, header, value); + break; + + default: + nxm_put_16w(b, NXM_MAKE_WILD_HEADER(header), value, mask); + break; + } +} + static void nxm_put_32(struct ofpbuf *b, uint32_t header, ovs_be32 value) { @@ -499,7 +291,7 @@ nxm_put_32m(struct ofpbuf *b, uint32_t header, ovs_be32 value, ovs_be32 mask) case 0: break; - case UINT32_MAX: + case CONSTANT_HTONL(UINT32_MAX): nxm_put_32(b, header, value); break; @@ -516,6 +308,31 @@ nxm_put_64(struct ofpbuf *b, uint32_t header, ovs_be64 value) ofpbuf_put(b, &value, sizeof value); } +static void +nxm_put_64w(struct ofpbuf *b, uint32_t header, ovs_be64 value, ovs_be64 mask) +{ + nxm_put_header(b, header); + ofpbuf_put(b, &value, sizeof value); + ofpbuf_put(b, &mask, sizeof mask); +} + +static void +nxm_put_64m(struct ofpbuf *b, uint32_t header, ovs_be64 value, ovs_be64 mask) +{ + switch (mask) { + case 0: + break; + + case CONSTANT_HTONLL(UINT64_MAX): + nxm_put_64(b, header, value); + break; + + default: + nxm_put_64w(b, NXM_MAKE_WILD_HEADER(header), value, mask); + break; + } +} + static void nxm_put_eth(struct ofpbuf *b, uint32_t header, const uint8_t value[ETH_ADDR_LEN]) @@ -526,20 +343,15 @@ nxm_put_eth(struct ofpbuf *b, uint32_t header, static void nxm_put_eth_dst(struct ofpbuf *b, - uint32_t wc, const uint8_t value[ETH_ADDR_LEN]) + flow_wildcards_t wc, const uint8_t value[ETH_ADDR_LEN]) { - switch (wc & (OFPFW_DL_DST | FWW_ETH_MCAST)) { - case OFPFW_DL_DST | FWW_ETH_MCAST: + switch (wc & (FWW_DL_DST | FWW_ETH_MCAST)) { + case FWW_DL_DST | FWW_ETH_MCAST: break; - case OFPFW_DL_DST: - nxm_put_header(b, NXM_OF_ETH_DST_W); - ofpbuf_put(b, value, ETH_ADDR_LEN); - ofpbuf_put(b, eth_mcast_1, ETH_ADDR_LEN); - break; - case FWW_ETH_MCAST: + default: nxm_put_header(b, NXM_OF_ETH_DST_W); ofpbuf_put(b, value, ETH_ADDR_LEN); - ofpbuf_put(b, eth_mcast_0, ETH_ADDR_LEN); + ofpbuf_put(b, flow_wildcards_to_dl_dst_mask(wc), ETH_ADDR_LEN); break; case 0: nxm_put_eth(b, NXM_OF_ETH_DST, value); @@ -547,116 +359,230 @@ nxm_put_eth_dst(struct ofpbuf *b, } } +static void +nxm_put_ipv6(struct ofpbuf *b, uint32_t header, + const struct in6_addr *value, const struct in6_addr *mask) +{ + if (ipv6_mask_is_any(mask)) { + return; + } else if (ipv6_mask_is_exact(mask)) { + nxm_put_header(b, header); + ofpbuf_put(b, value, sizeof *value); + } else { + nxm_put_header(b, NXM_MAKE_WILD_HEADER(header)); + ofpbuf_put(b, value, sizeof *value); + ofpbuf_put(b, mask, sizeof *mask); + } +} + +static void +nxm_put_frag(struct ofpbuf *b, const struct cls_rule *cr) +{ + uint8_t nw_frag = cr->flow.nw_frag; + uint8_t nw_frag_mask = cr->wc.nw_frag_mask; + + switch (nw_frag_mask) { + case 0: + break; + + case FLOW_NW_FRAG_MASK: + nxm_put_8(b, NXM_NX_IP_FRAG, nw_frag); + break; + + default: + nxm_put_8m(b, NXM_NX_IP_FRAG, nw_frag, + nw_frag_mask & FLOW_NW_FRAG_MASK); + break; + } +} + +/* Appends to 'b' the nx_match format that expresses 'cr' (except for + * 'cr->priority', because priority is not part of nx_match), plus enough + * zero bytes to pad the nx_match out to a multiple of 8. For Flow Mod + * and Flow Stats Requests messages, a 'cookie' and 'cookie_mask' may be + * supplied. Otherwise, 'cookie_mask' should be zero. + * + * This function can cause 'b''s data to be reallocated. + * + * Returns the number of bytes appended to 'b', excluding padding. + * + * If 'cr' is a catch-all rule that matches every packet, then this function + * appends nothing to 'b' and returns 0. */ int -nx_put_match(struct ofpbuf *b, const struct cls_rule *cr) +nx_put_match(struct ofpbuf *b, const struct cls_rule *cr, + ovs_be64 cookie, ovs_be64 cookie_mask) { - const uint32_t wc = cr->wc.wildcards; + const flow_wildcards_t wc = cr->wc.wildcards; const struct flow *flow = &cr->flow; const size_t start_len = b->size; - ovs_be16 vid, pcp; int match_len; int i; + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 7); + /* Metadata. */ - if (!(wc & OFPFW_IN_PORT)) { + if (!(wc & FWW_IN_PORT)) { uint16_t in_port = flow->in_port; - if (in_port == ODPP_LOCAL) { - in_port = OFPP_LOCAL; - } nxm_put_16(b, NXM_OF_IN_PORT, htons(in_port)); } /* Ethernet. */ nxm_put_eth_dst(b, wc, flow->dl_dst); - if (!(wc & OFPFW_DL_SRC)) { + if (!(wc & FWW_DL_SRC)) { nxm_put_eth(b, NXM_OF_ETH_SRC, flow->dl_src); } - if (!(wc & OFPFW_DL_TYPE)) { - nxm_put_16(b, NXM_OF_ETH_TYPE, flow->dl_type); + if (!(wc & FWW_DL_TYPE)) { + nxm_put_16(b, NXM_OF_ETH_TYPE, + ofputil_dl_type_to_openflow(flow->dl_type)); } /* 802.1Q. */ - vid = flow->dl_vlan & htons(VLAN_VID_MASK); - pcp = htons((flow->dl_vlan_pcp << VLAN_PCP_SHIFT) & VLAN_PCP_MASK); - switch (wc & (OFPFW_DL_VLAN | OFPFW_DL_VLAN_PCP)) { - case OFPFW_DL_VLAN | OFPFW_DL_VLAN_PCP: - break; - case OFPFW_DL_VLAN: - nxm_put_16w(b, NXM_OF_VLAN_TCI_W, pcp | htons(VLAN_CFI), - htons(VLAN_PCP_MASK | VLAN_CFI)); - break; - case OFPFW_DL_VLAN_PCP: - if (flow->dl_vlan == htons(OFP_VLAN_NONE)) { - nxm_put_16(b, NXM_OF_VLAN_TCI, 0); - } else { - nxm_put_16w(b, NXM_OF_VLAN_TCI_W, vid | htons(VLAN_CFI), - htons(VLAN_VID_MASK | VLAN_CFI)); - } - break; - case 0: - if (flow->dl_vlan == htons(OFP_VLAN_NONE)) { - nxm_put_16(b, NXM_OF_VLAN_TCI, 0); - } else { - nxm_put_16(b, NXM_OF_VLAN_TCI, vid | pcp | htons(VLAN_CFI)); - } - break; - } + nxm_put_16m(b, NXM_OF_VLAN_TCI, flow->vlan_tci, cr->wc.vlan_tci_mask); - if (!(wc & OFPFW_DL_TYPE) && flow->dl_type == htons(ETH_TYPE_IP)) { + /* L3. */ + if (!(wc & FWW_DL_TYPE) && flow->dl_type == htons(ETH_TYPE_IP)) { /* IP. */ - if (!(wc & OFPFW_NW_TOS)) { - nxm_put_8(b, NXM_OF_IP_TOS, flow->nw_tos & 0xfc); - } nxm_put_32m(b, NXM_OF_IP_SRC, flow->nw_src, cr->wc.nw_src_mask); nxm_put_32m(b, NXM_OF_IP_DST, flow->nw_dst, cr->wc.nw_dst_mask); + nxm_put_frag(b, cr); - if (!(wc & OFPFW_NW_PROTO)) { + if (!(wc & FWW_NW_DSCP)) { + nxm_put_8(b, NXM_OF_IP_TOS, flow->nw_tos & IP_DSCP_MASK); + } + + if (!(wc & FWW_NW_ECN)) { + nxm_put_8(b, NXM_NX_IP_ECN, flow->nw_tos & IP_ECN_MASK); + } + + if (!(wc & FWW_NW_TTL)) { + nxm_put_8(b, NXM_NX_IP_TTL, flow->nw_ttl); + } + + if (!(wc & FWW_NW_PROTO)) { nxm_put_8(b, NXM_OF_IP_PROTO, flow->nw_proto); switch (flow->nw_proto) { /* TCP. */ - case IP_TYPE_TCP: - if (!(wc & OFPFW_TP_SRC)) { + case IPPROTO_TCP: + if (!(wc & FWW_TP_SRC)) { nxm_put_16(b, NXM_OF_TCP_SRC, flow->tp_src); } - if (!(wc & OFPFW_TP_DST)) { + if (!(wc & FWW_TP_DST)) { nxm_put_16(b, NXM_OF_TCP_DST, flow->tp_dst); } break; /* UDP. */ - case IP_TYPE_UDP: - if (!(wc & OFPFW_TP_SRC)) { + case IPPROTO_UDP: + if (!(wc & FWW_TP_SRC)) { nxm_put_16(b, NXM_OF_UDP_SRC, flow->tp_src); } - if (!(wc & OFPFW_TP_DST)) { + if (!(wc & FWW_TP_DST)) { nxm_put_16(b, NXM_OF_UDP_DST, flow->tp_dst); } break; /* ICMP. */ - case IP_TYPE_ICMP: - if (!(wc & OFPFW_TP_SRC)) { + case IPPROTO_ICMP: + if (!(wc & FWW_TP_SRC)) { nxm_put_8(b, NXM_OF_ICMP_TYPE, ntohs(flow->tp_src)); } - if (!(wc & OFPFW_TP_DST)) { + if (!(wc & FWW_TP_DST)) { nxm_put_8(b, NXM_OF_ICMP_CODE, ntohs(flow->tp_dst)); } break; } } - } else if (!(wc & OFPFW_DL_TYPE) && flow->dl_type == htons(ETH_TYPE_ARP)) { + } else if (!(wc & FWW_DL_TYPE) && flow->dl_type == htons(ETH_TYPE_IPV6)) { + /* IPv6. */ + nxm_put_ipv6(b, NXM_NX_IPV6_SRC, &flow->ipv6_src, + &cr->wc.ipv6_src_mask); + nxm_put_ipv6(b, NXM_NX_IPV6_DST, &flow->ipv6_dst, + &cr->wc.ipv6_dst_mask); + nxm_put_frag(b, cr); + + if (!(wc & FWW_IPV6_LABEL)) { + nxm_put_32(b, NXM_NX_IPV6_LABEL, flow->ipv6_label); + } + + if (!(wc & FWW_NW_DSCP)) { + nxm_put_8(b, NXM_OF_IP_TOS, flow->nw_tos & IP_DSCP_MASK); + } + + if (!(wc & FWW_NW_ECN)) { + nxm_put_8(b, NXM_NX_IP_ECN, flow->nw_tos & IP_ECN_MASK); + } + + if (!(wc & FWW_NW_TTL)) { + nxm_put_8(b, NXM_NX_IP_TTL, flow->nw_ttl); + } + + if (!(wc & FWW_NW_PROTO)) { + nxm_put_8(b, NXM_OF_IP_PROTO, flow->nw_proto); + switch (flow->nw_proto) { + /* TCP. */ + case IPPROTO_TCP: + if (!(wc & FWW_TP_SRC)) { + nxm_put_16(b, NXM_OF_TCP_SRC, flow->tp_src); + } + if (!(wc & FWW_TP_DST)) { + nxm_put_16(b, NXM_OF_TCP_DST, flow->tp_dst); + } + break; + + /* UDP. */ + case IPPROTO_UDP: + if (!(wc & FWW_TP_SRC)) { + nxm_put_16(b, NXM_OF_UDP_SRC, flow->tp_src); + } + if (!(wc & FWW_TP_DST)) { + nxm_put_16(b, NXM_OF_UDP_DST, flow->tp_dst); + } + break; + + /* ICMPv6. */ + case IPPROTO_ICMPV6: + if (!(wc & FWW_TP_SRC)) { + nxm_put_8(b, NXM_NX_ICMPV6_TYPE, ntohs(flow->tp_src)); + + if (flow->tp_src == htons(ND_NEIGHBOR_SOLICIT) || + flow->tp_src == htons(ND_NEIGHBOR_ADVERT)) { + if (!(wc & FWW_ND_TARGET)) { + nxm_put_ipv6(b, NXM_NX_ND_TARGET, &flow->nd_target, + &in6addr_exact); + } + if (!(wc & FWW_ARP_SHA) + && flow->tp_src == htons(ND_NEIGHBOR_SOLICIT)) { + nxm_put_eth(b, NXM_NX_ND_SLL, flow->arp_sha); + } + if (!(wc & FWW_ARP_THA) + && flow->tp_src == htons(ND_NEIGHBOR_ADVERT)) { + nxm_put_eth(b, NXM_NX_ND_TLL, flow->arp_tha); + } + } + } + if (!(wc & FWW_TP_DST)) { + nxm_put_8(b, NXM_NX_ICMPV6_CODE, ntohs(flow->tp_dst)); + } + break; + } + } + } else if (!(wc & FWW_DL_TYPE) && flow->dl_type == htons(ETH_TYPE_ARP)) { /* ARP. */ - if (!(wc & OFPFW_NW_PROTO)) { + if (!(wc & FWW_NW_PROTO)) { nxm_put_16(b, NXM_OF_ARP_OP, htons(flow->nw_proto)); } nxm_put_32m(b, NXM_OF_ARP_SPA, flow->nw_src, cr->wc.nw_src_mask); nxm_put_32m(b, NXM_OF_ARP_TPA, flow->nw_dst, cr->wc.nw_dst_mask); + if (!(wc & FWW_ARP_SHA)) { + nxm_put_eth(b, NXM_NX_ARP_SHA, flow->arp_sha); + } + if (!(wc & FWW_ARP_THA)) { + nxm_put_eth(b, NXM_NX_ARP_THA, flow->arp_tha); + } } /* Tunnel ID. */ - if (!(wc & NXFW_TUN_ID)) { - nxm_put_64(b, NXM_NX_TUN_ID, htonll(ntohl(flow->tun_id))); - } + nxm_put_64m(b, NXM_NX_TUN_ID, flow->tun_id, cr->wc.tun_id_mask); /* Registers. */ for (i = 0; i < FLOW_N_REGS; i++) { @@ -664,6 +590,9 @@ nx_put_match(struct ofpbuf *b, const struct cls_rule *cr) htonl(flow->regs[i]), htonl(cr->wc.reg_masks[i])); } + /* Cookie. */ + nxm_put_64m(b, NXM_NX_COOKIE, cookie, cookie_mask); + match_len = b->size - start_len; ofpbuf_put_zeros(b, ROUND_UP(match_len, 8) - match_len); return match_len; @@ -671,6 +600,8 @@ nx_put_match(struct ofpbuf *b, const struct cls_rule *cr) /* nx_match_to_string() and helpers. */ +static void format_nxm_field_name(struct ds *, uint32_t header); + char * nx_match_to_string(const uint8_t *p, unsigned int match_len) { @@ -687,20 +618,13 @@ nx_match_to_string(const uint8_t *p, unsigned int match_len) unsigned int value_len = nxm_field_bytes(header); const uint8_t *value = p + 4; const uint8_t *mask = value + value_len; - const struct nxm_field *f; unsigned int i; if (s.length) { ds_put_cstr(&s, ", "); } - f = nxm_field_lookup(header); - if (f) { - ds_put_cstr(&s, f->name); - } else { - ds_put_format(&s, "%d:%d", NXM_VENDOR(header), NXM_FIELD(header)); - } - + format_nxm_field_name(&s, header); ds_put_char(&s, '('); for (i = 0; i < value_len; i++) { @@ -729,37 +653,69 @@ nx_match_to_string(const uint8_t *p, unsigned int match_len) return ds_steal_cstr(&s); } -static const struct nxm_field * -lookup_nxm_field(const char *name, int name_len) +static void +format_nxm_field_name(struct ds *s, uint32_t header) { - const struct nxm_field *f; - - for (f = nxm_fields; f < &nxm_fields[ARRAY_SIZE(nxm_fields)]; f++) { - if (!strncmp(f->name, name, name_len) && f->name[name_len] == '\0') { - return f; + const struct mf_field *mf = mf_from_nxm_header(header); + if (mf) { + ds_put_cstr(s, mf->nxm_name); + if (NXM_HASMASK(header)) { + ds_put_cstr(s, "_W"); } + } else if (header == NXM_NX_COOKIE) { + ds_put_cstr(s, "NXM_NX_COOKIE"); + } else if (header == NXM_NX_COOKIE_W) { + ds_put_cstr(s, "NXM_NX_COOKIE_W"); + } else { + ds_put_format(s, "%d:%d", NXM_VENDOR(header), NXM_FIELD(header)); } - - return NULL; } -static const char * -parse_hex_bytes(struct ofpbuf *b, const char *s, unsigned int n) +static uint32_t +parse_nxm_field_name(const char *name, int name_len) { - while (n--) { - uint8_t byte; - bool ok; + bool wild; + int i; - s += strspn(s, " "); - byte = hexits_value(s, 2, &ok); - if (!ok) { - ovs_fatal(0, "%.2s: hex digits expected", s); + /* Check whether it's a field name. */ + wild = name_len > 2 && !memcmp(&name[name_len - 2], "_W", 2); + if (wild) { + name_len -= 2; + } + + for (i = 0; i < MFF_N_IDS; i++) { + const struct mf_field *mf = mf_from_id(i); + + if (mf->nxm_name + && !strncmp(mf->nxm_name, name, name_len) + && mf->nxm_name[name_len] == '\0') { + if (!wild) { + return mf->nxm_header; + } else if (mf->maskable != MFM_NONE) { + return NXM_MAKE_WILD_HEADER(mf->nxm_header); + } } + } - ofpbuf_put(b, &byte, 1); - s += 2; + if (!strncmp("NXM_NX_COOKIE", name, name_len) + && (name_len == strlen("NXM_NX_COOKIE"))) { + if (!wild) { + return NXM_NX_COOKIE; + } else { + return NXM_NX_COOKIE_W; + } } - return s; + + /* Check whether it's a 32-bit field header value as hex. + * (This isn't ordinarily useful except for testing error behavior.) */ + if (name_len == 8) { + uint32_t header = hexits_value(name, name_len, NULL); + if (header != UINT_MAX) { + return header; + } + } + + return 0; } /* nx_match_from_string(). */ @@ -778,35 +734,45 @@ nx_match_from_string(const char *s, struct ofpbuf *b) } for (s += strspn(s, ", "); *s; s += strspn(s, ", ")) { - const struct nxm_field *f; + const char *name; + uint32_t header; int name_len; + size_t n; + name = s; name_len = strcspn(s, "("); if (s[name_len] != '(') { ovs_fatal(0, "%s: missing ( at end of nx_match", full_s); } - f = lookup_nxm_field(s, name_len); - if (!f) { + header = parse_nxm_field_name(name, name_len); + if (!header) { ovs_fatal(0, "%s: unknown field `%.*s'", full_s, name_len, s); } s += name_len + 1; - nxm_put_header(b, f->header); - s = parse_hex_bytes(b, s, nxm_field_bytes(f->header)); - if (NXM_HASMASK(f->header)) { + nxm_put_header(b, header); + s = ofpbuf_put_hex(b, s, &n); + if (n != nxm_field_bytes(header)) { + ovs_fatal(0, "%.2s: hex digits expected", s); + } + if (NXM_HASMASK(header)) { s += strspn(s, " "); if (*s != '/') { - ovs_fatal(0, "%s: missing / in masked field %s", - full_s, f->name); + ovs_fatal(0, "%s: missing / in masked field %.*s", + full_s, name_len, name); + } + s = ofpbuf_put_hex(b, s + 1, &n); + if (n != nxm_field_bytes(header)) { + ovs_fatal(0, "%.2s: hex digits expected", s); } - s = parse_hex_bytes(b, s + 1, nxm_field_bytes(f->header)); } s += strspn(s, " "); if (*s != ')') { - ovs_fatal(0, "%s: missing ) following field %s", full_s, f->name); + ovs_fatal(0, "%s: missing ) following field %.*s", + full_s, name_len, name); } s++; } @@ -816,57 +782,244 @@ nx_match_from_string(const char *s, struct ofpbuf *b) return match_len; } +const char * +nxm_parse_field_bits(const char *s, uint32_t *headerp, int *ofsp, int *n_bitsp) +{ + const char *full_s = s; + const char *name; + uint32_t header; + int start, end; + int name_len; + int width; + + name = s; + name_len = strcspn(s, "["); + if (s[name_len] != '[') { + ovs_fatal(0, "%s: missing [ looking for field name", full_s); + } + + header = parse_nxm_field_name(name, name_len); + if (!header) { + ovs_fatal(0, "%s: unknown field `%.*s'", full_s, name_len, s); + } + width = nxm_field_bits(header); + + s += name_len; + if (sscanf(s, "[%d..%d]", &start, &end) == 2) { + /* Nothing to do. */ + } else if (sscanf(s, "[%d]", &start) == 1) { + end = start; + } else if (!strncmp(s, "[]", 2)) { + start = 0; + end = width - 1; + } else { + ovs_fatal(0, "%s: syntax error expecting [] or [] or " + "[..]", full_s); + } + s = strchr(s, ']') + 1; + + if (start > end) { + ovs_fatal(0, "%s: starting bit %d is after ending bit %d", + full_s, start, end); + } else if (start >= width) { + ovs_fatal(0, "%s: starting bit %d is not valid because field is only " + "%d bits wide", full_s, start, width); + } else if (end >= width){ + ovs_fatal(0, "%s: ending bit %d is not valid because field is only " + "%d bits wide", full_s, end, width); + } + + *headerp = header; + *ofsp = start; + *n_bitsp = end - start + 1; + + return s; +} + +void +nxm_parse_reg_move(struct nx_action_reg_move *move, const char *s) +{ + const char *full_s = s; + uint32_t src, dst; + int src_ofs, dst_ofs; + int src_n_bits, dst_n_bits; + + s = nxm_parse_field_bits(s, &src, &src_ofs, &src_n_bits); + if (strncmp(s, "->", 2)) { + ovs_fatal(0, "%s: missing `->' following source", full_s); + } + s += 2; + s = nxm_parse_field_bits(s, &dst, &dst_ofs, &dst_n_bits); + if (*s != '\0') { + ovs_fatal(0, "%s: trailing garbage following destination", full_s); + } + + if (src_n_bits != dst_n_bits) { + ovs_fatal(0, "%s: source field is %d bits wide but destination is " + "%d bits wide", full_s, src_n_bits, dst_n_bits); + } + + ofputil_init_NXAST_REG_MOVE(move); + move->n_bits = htons(src_n_bits); + move->src_ofs = htons(src_ofs); + move->dst_ofs = htons(dst_ofs); + move->src = htonl(src); + move->dst = htonl(dst); +} + +void +nxm_parse_reg_load(struct nx_action_reg_load *load, const char *s) +{ + const char *full_s = s; + uint32_t dst; + int ofs, n_bits; + uint64_t value; + + value = strtoull(s, (char **) &s, 0); + if (strncmp(s, "->", 2)) { + ovs_fatal(0, "%s: missing `->' following value", full_s); + } + s += 2; + s = nxm_parse_field_bits(s, &dst, &ofs, &n_bits); + if (*s != '\0') { + ovs_fatal(0, "%s: trailing garbage following destination", full_s); + } + + if (n_bits < 64 && (value >> n_bits) != 0) { + ovs_fatal(0, "%s: value %"PRIu64" does not fit into %d bits", + full_s, value, n_bits); + } + + ofputil_init_NXAST_REG_LOAD(load); + load->ofs_nbits = nxm_encode_ofs_nbits(ofs, n_bits); + load->dst = htonl(dst); + load->value = htonll(value); +} + +/* nxm_format_reg_move(), nxm_format_reg_load(). */ + +void +nxm_format_field_bits(struct ds *s, uint32_t header, int ofs, int n_bits) +{ + format_nxm_field_name(s, header); + if (ofs == 0 && n_bits == nxm_field_bits(header)) { + ds_put_cstr(s, "[]"); + } else if (n_bits == 1) { + ds_put_format(s, "[%d]", ofs); + } else { + ds_put_format(s, "[%d..%d]", ofs, ofs + n_bits - 1); + } +} + +void +nxm_format_reg_move(const struct nx_action_reg_move *move, struct ds *s) +{ + int n_bits = ntohs(move->n_bits); + int src_ofs = ntohs(move->src_ofs); + int dst_ofs = ntohs(move->dst_ofs); + uint32_t src = ntohl(move->src); + uint32_t dst = ntohl(move->dst); + + ds_put_format(s, "move:"); + nxm_format_field_bits(s, src, src_ofs, n_bits); + ds_put_cstr(s, "->"); + nxm_format_field_bits(s, dst, dst_ofs, n_bits); +} + +void +nxm_format_reg_load(const struct nx_action_reg_load *load, struct ds *s) +{ + int ofs = nxm_decode_ofs(load->ofs_nbits); + int n_bits = nxm_decode_n_bits(load->ofs_nbits); + uint32_t dst = ntohl(load->dst); + uint64_t value = ntohll(load->value); + + ds_put_format(s, "load:%#"PRIx64"->", value); + nxm_format_field_bits(s, dst, ofs, n_bits); +} + /* nxm_check_reg_move(), nxm_check_reg_load(). */ static bool -field_ok(const struct nxm_field *f, const struct flow *flow, int size) +field_ok(const struct mf_field *mf, const struct flow *flow, int size) { - return (f && !NXM_HASMASK(f->header) - && nxm_prereqs_ok(f, flow) && size <= nxm_field_bits(f->header)); + return (mf + && mf_are_prereqs_ok(mf, flow) + && size <= nxm_field_bits(mf->nxm_header)); } int nxm_check_reg_move(const struct nx_action_reg_move *action, const struct flow *flow) { - const struct nxm_field *src; - const struct nxm_field *dst; + int src_ofs, dst_ofs, n_bits; + int error; - if (action->n_bits == htons(0)) { - return BAD_ARGUMENT; - } + n_bits = ntohs(action->n_bits); + src_ofs = ntohs(action->src_ofs); + dst_ofs = ntohs(action->dst_ofs); - src = nxm_field_lookup(ntohl(action->src)); - if (!field_ok(src, flow, ntohs(action->src_ofs) + ntohs(action->n_bits))) { - return BAD_ARGUMENT; + error = nxm_src_check(action->src, src_ofs, n_bits, flow); + if (error) { + return error; } - dst = nxm_field_lookup(ntohl(action->dst)); - if (!field_ok(dst, flow, ntohs(action->dst_ofs) + ntohs(action->n_bits))) { - return BAD_ARGUMENT; + return nxm_dst_check(action->dst, dst_ofs, n_bits, flow); +} + +/* Given a flow, checks that the source field represented by 'src_header' + * in the range ['ofs', 'ofs' + 'n_bits') is valid. */ +int +nxm_src_check(ovs_be32 src_header_, unsigned int ofs, unsigned int n_bits, + const struct flow *flow) +{ + uint32_t src_header = ntohl(src_header_); + const struct mf_field *src = mf_from_nxm_header(src_header); + + if (!n_bits) { + VLOG_WARN_RL(&rl, "zero bit source field"); + } else if (NXM_HASMASK(src_header) || !field_ok(src, flow, ofs + n_bits)) { + VLOG_WARN_RL(&rl, "invalid source field"); + } else { + return 0; } - if (!NXM_IS_NX_REG(dst->header) - && dst->header != NXM_OF_VLAN_TCI - && dst->header != NXM_NX_TUN_ID) { - return BAD_ARGUMENT; + return BAD_ARGUMENT; +} + +/* Given a flow, checks that the destination field represented by 'dst_header' + * in the range ['ofs', 'ofs' + 'n_bits') is valid. */ +int +nxm_dst_check(ovs_be32 dst_header_, unsigned int ofs, unsigned int n_bits, + const struct flow *flow) +{ + uint32_t dst_header = ntohl(dst_header_); + const struct mf_field *dst = mf_from_nxm_header(dst_header); + + if (!n_bits) { + VLOG_WARN_RL(&rl, "zero bit destination field"); + } else if (NXM_HASMASK(dst_header) || !field_ok(dst, flow, ofs + n_bits)) { + VLOG_WARN_RL(&rl, "invalid destination field"); + } else if (!dst->writable) { + VLOG_WARN_RL(&rl, "destination field is not writable"); + } else { + return 0; } - return 0; + return BAD_ARGUMENT; } int nxm_check_reg_load(const struct nx_action_reg_load *action, const struct flow *flow) { - const struct nxm_field *dst; - int ofs, n_bits; + unsigned int ofs = nxm_decode_ofs(action->ofs_nbits); + unsigned int n_bits = nxm_decode_n_bits(action->ofs_nbits); + int error; - ofs = ntohs(action->ofs_nbits) >> 6; - n_bits = (ntohs(action->ofs_nbits) & 0x3f) + 1; - dst = nxm_field_lookup(ntohl(action->dst)); - if (!field_ok(dst, flow, ofs + n_bits)) { - return BAD_ARGUMENT; + error = nxm_dst_check(action->dst, ofs, n_bits, flow); + if (error) { + return error; } /* Reject 'action' if a bit numbered 'n_bits' or higher is set to 1 in @@ -875,155 +1028,122 @@ nxm_check_reg_load(const struct nx_action_reg_load *action, return BAD_ARGUMENT; } - if (!NXM_IS_NX_REG(dst->header)) { - return BAD_ARGUMENT; - } - return 0; } /* nxm_execute_reg_move(), nxm_execute_reg_load(). */ -static uint64_t -nxm_read_field(const struct nxm_field *src, const struct flow *flow) +static void +bitwise_copy(const void *src_, unsigned int src_len, unsigned int src_ofs, + void *dst_, unsigned int dst_len, unsigned int dst_ofs, + unsigned int n_bits) { - switch (src->index) { - case NFI_NXM_OF_IN_PORT: - return flow->in_port == ODPP_LOCAL ? OFPP_LOCAL : flow->in_port; + const uint8_t *src = src_; + uint8_t *dst = dst_; - case NFI_NXM_OF_ETH_DST: - return eth_addr_to_uint64(flow->dl_dst); + src += src_len - (src_ofs / 8 + 1); + src_ofs %= 8; - case NFI_NXM_OF_ETH_SRC: - return eth_addr_to_uint64(flow->dl_src); + dst += dst_len - (dst_ofs / 8 + 1); + dst_ofs %= 8; - case NFI_NXM_OF_ETH_TYPE: - return ntohs(flow->dl_type); + if (src_ofs == 0 && dst_ofs == 0) { + unsigned int n_bytes = n_bits / 8; + if (n_bytes) { + dst -= n_bytes - 1; + src -= n_bytes - 1; + memcpy(dst, src, n_bytes); - case NFI_NXM_OF_VLAN_TCI: - if (flow->dl_vlan == htons(OFP_VLAN_NONE)) { - return 0; - } else { - return (ntohs(flow->dl_vlan & htons(VLAN_VID_MASK)) - | ((flow->dl_vlan_pcp << VLAN_PCP_SHIFT) & VLAN_PCP_MASK) - | VLAN_CFI); + n_bits %= 8; + src--; + dst--; + } + if (n_bits) { + uint8_t mask = (1 << n_bits) - 1; + *dst = (*dst & ~mask) | (*src & mask); + } + } else { + while (n_bits > 0) { + unsigned int max_copy = 8 - MAX(src_ofs, dst_ofs); + unsigned int chunk = MIN(n_bits, max_copy); + uint8_t mask = ((1 << chunk) - 1) << dst_ofs; + + *dst &= ~mask; + *dst |= ((*src >> src_ofs) << dst_ofs) & mask; + + src_ofs += chunk; + if (src_ofs == 8) { + src--; + src_ofs = 0; + } + dst_ofs += chunk; + if (dst_ofs == 8) { + dst--; + dst_ofs = 0; + } + n_bits -= chunk; } - - case NFI_NXM_OF_IP_TOS: - return flow->nw_tos; - - case NFI_NXM_OF_IP_PROTO: - case NFI_NXM_OF_ARP_OP: - return flow->nw_proto; - - case NFI_NXM_OF_IP_SRC: - case NFI_NXM_OF_ARP_SPA: - return ntohl(flow->nw_src); - - case NFI_NXM_OF_IP_DST: - case NFI_NXM_OF_ARP_TPA: - return ntohl(flow->nw_dst); - - case NFI_NXM_OF_TCP_SRC: - case NFI_NXM_OF_UDP_SRC: - return ntohs(flow->tp_src); - - case NFI_NXM_OF_TCP_DST: - case NFI_NXM_OF_UDP_DST: - return ntohs(flow->tp_dst); - - case NFI_NXM_OF_ICMP_TYPE: - return ntohs(flow->tp_src) & 0xff; - - case NFI_NXM_OF_ICMP_CODE: - return ntohs(flow->tp_dst) & 0xff; - - case NFI_NXM_NX_TUN_ID: - return ntohl(flow->tun_id); - -#define NXM_READ_REGISTER(IDX) \ - case NFI_NXM_NX_REG##IDX: \ - return flow->regs[IDX]; \ - case NFI_NXM_NX_REG##IDX##_W: \ - NOT_REACHED(); - - NXM_READ_REGISTER(0); -#if FLOW_N_REGS >= 2 - NXM_READ_REGISTER(1); -#endif -#if FLOW_N_REGS >= 3 - NXM_READ_REGISTER(2); -#endif -#if FLOW_N_REGS >= 4 - NXM_READ_REGISTER(3); -#endif -#if FLOW_N_REGS > 4 -#error -#endif - - case NFI_NXM_OF_ETH_DST_W: - case NFI_NXM_OF_VLAN_TCI_W: - case NFI_NXM_OF_IP_SRC_W: - case NFI_NXM_OF_IP_DST_W: - case NFI_NXM_OF_ARP_SPA_W: - case NFI_NXM_OF_ARP_TPA_W: - case N_NXM_FIELDS: - NOT_REACHED(); } +} - NOT_REACHED(); +/* Returns the value of the NXM field corresponding to 'header' at 'ofs_nbits' + * in 'flow'. */ +uint64_t +nxm_read_field_bits(ovs_be32 header, ovs_be16 ofs_nbits, + const struct flow *flow) +{ + const struct mf_field *field = mf_from_nxm_header(ntohl(header)); + union mf_value value; + union mf_value bits; + + mf_get_value(field, flow, &value); + bits.be64 = htonll(0); + bitwise_copy(&value, field->n_bytes, nxm_decode_ofs(ofs_nbits), + &bits, sizeof bits.be64, 0, + nxm_decode_n_bits(ofs_nbits)); + return ntohll(bits.be64); } void nxm_execute_reg_move(const struct nx_action_reg_move *action, struct flow *flow) { - /* Preparation. */ - int n_bits = ntohs(action->n_bits); - uint64_t mask = n_bits == 64 ? UINT64_MAX : (UINT64_C(1) << n_bits) - 1; - - /* Get the interesting bits of the source field. */ - const struct nxm_field *src = nxm_field_lookup(ntohl(action->src)); - int src_ofs = ntohs(action->src_ofs); - uint64_t src_data = nxm_read_field(src, flow) & (mask << src_ofs); - - /* Get the remaining bits of the destination field. */ - const struct nxm_field *dst = nxm_field_lookup(ntohl(action->dst)); - int dst_ofs = ntohs(action->dst_ofs); - uint64_t dst_data = nxm_read_field(dst, flow) & ~(mask << dst_ofs); - - /* Get the final value. */ - uint64_t new_data = dst_data | ((src_data >> src_ofs) << dst_ofs); - - /* Store the result. */ - if (NXM_IS_NX_REG(dst->header)) { - flow->regs[NXM_NX_REG_IDX(dst->header)] = new_data; - } else if (dst->header == NXM_OF_VLAN_TCI) { - ovs_be16 vlan_tci = htons(new_data & VLAN_CFI ? new_data : 0); - flow->dl_vlan = htons(vlan_tci_to_vid(vlan_tci)); - flow->dl_vlan_pcp = vlan_tci_to_pcp(vlan_tci); - } else if (dst->header == NXM_NX_TUN_ID) { - flow->tun_id = htonl(new_data); - } else { - NOT_REACHED(); - } + const struct mf_field *src = mf_from_nxm_header(ntohl(action->src)); + const struct mf_field *dst = mf_from_nxm_header(ntohl(action->dst)); + union mf_value src_value; + union mf_value dst_value; + + mf_get_value(dst, flow, &dst_value); + mf_get_value(src, flow, &src_value); + bitwise_copy(&src_value, src->n_bytes, ntohs(action->src_ofs), + &dst_value, dst->n_bytes, ntohs(action->dst_ofs), + ntohs(action->n_bits)); + mf_set_flow_value(dst, &dst_value, flow); } void nxm_execute_reg_load(const struct nx_action_reg_load *action, struct flow *flow) { - /* Preparation. */ - int n_bits = (ntohs(action->ofs_nbits) & 0x3f) + 1; - uint32_t mask = n_bits == 32 ? UINT32_MAX : (UINT32_C(1) << n_bits) - 1; - uint32_t *reg = &flow->regs[NXM_NX_REG_IDX(ntohl(action->dst))]; - - /* Get source data. */ - uint32_t src_data = ntohll(action->value); - - /* Get remaining bits of the destination field. */ - int dst_ofs = ntohs(action->ofs_nbits) >> 6; - uint32_t dst_data = *reg & ~(mask << dst_ofs); + nxm_reg_load(action->dst, action->ofs_nbits, ntohll(action->value), flow); +} - *reg = dst_data | (src_data << dst_ofs); +/* Calculates ofs and n_bits from the given 'ofs_nbits' parameter, and copies + * 'src_data'[0:n_bits] to 'dst_header'[ofs:ofs+n_bits] in the given 'flow'. */ +void +nxm_reg_load(ovs_be32 dst_header, ovs_be16 ofs_nbits, uint64_t src_data, + struct flow *flow) +{ + const struct mf_field *dst = mf_from_nxm_header(ntohl(dst_header)); + int n_bits = nxm_decode_n_bits(ofs_nbits); + int dst_ofs = nxm_decode_ofs(ofs_nbits); + union mf_value dst_value; + union mf_value src_value; + + mf_get_value(dst, flow, &dst_value); + src_value.be64 = htonll(src_data); + bitwise_copy(&src_value, sizeof src_value.be64, 0, + &dst_value, dst->n_bytes, dst_ofs, + n_bits); + mf_set_flow_value(dst, &dst_value, flow); }