X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnx-match.c;h=cccf6fe671c6c644f8994b9da4d40376e237d216;hb=8d5634845f9032468982c09a737a9f30c3764c3e;hp=764ec61d29285256400ad503a6094ed4ff8cfa69;hpb=b9298d3f825703063c9538aa37407da43e1e4781;p=sliver-openvswitch.git diff --git a/lib/nx-match.c b/lib/nx-match.c index 764ec61d2..cccf6fe67 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,6 +18,8 @@ #include "nx-match.h" +#include + #include "classifier.h" #include "dynamic-string.h" #include "ofp-util.h" @@ -46,42 +48,36 @@ enum { /* 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, +#define DEFINE_FIELD(HEADER, WILDCARD, DL_TYPES, NW_PROTO, WRITABLE) \ + 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. */ - flow_wildcards_t wildcard; /* FWW_* 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. */ + enum nxm_field_index index; /* NFI_* value. */ + uint32_t header; /* NXM_* value. */ + flow_wildcards_t wildcard; /* FWW_* bit, if exactly one. */ + ovs_be16 dl_type[N_NXM_DL_TYPES]; /* dl_type prerequisites. */ + uint8_t nw_proto; /* nw_proto prerequisite, if nonzero. */ + const char *name; /* "NXM_*" string. */ + bool writable; /* Writable with NXAST_REG_{MOVE,LOAD}? */ }; + /* All the known fields. */ static struct nxm_field nxm_fields[N_NXM_FIELDS] = { -#define DEFINE_FIELD(HEADER, WILDCARD, DL_TYPE, NW_PROTO) \ +#define DEFINE_FIELD(HEADER, WILDCARD, DL_TYPES, NW_PROTO, WRITABLE) \ { HMAP_NODE_NULL_INITIALIZER, NFI_NXM_##HEADER, NXM_##HEADER, WILDCARD, \ - CONSTANT_HTONS(DL_TYPE), NW_PROTO, "NXM_" #HEADER }, + DL_CONVERT DL_TYPES, NW_PROTO, "NXM_" #HEADER, WRITABLE }, +#define DL_CONVERT(T1, T2) { CONSTANT_HTONS(T1), CONSTANT_HTONS(T2) } #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) { @@ -97,7 +93,7 @@ nxm_init(void) /* 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) \ +#define DEFINE_FIELD(HEADER, WILDCARD, DL_TYPE, NW_PROTO, WRITABLE) \ case NXM_##HEADER: break; #include "nx-match.def" } @@ -123,7 +119,7 @@ nxm_field_lookup(uint32_t header) /* 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 +128,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; @@ -166,13 +162,12 @@ parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f, struct flow_wildcards *wc = &rule->wc; struct flow *flow = &rule->flow; + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 1); + switch (f->index) { /* Metadata. */ case NFI_NXM_OF_IN_PORT: flow->in_port = ntohs(get_unaligned_be16(value)); - if (flow->in_port == OFPP_LOCAL) { - flow->in_port = ODPP_LOCAL; - } return 0; /* Ethernet header. */ @@ -189,18 +184,8 @@ parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f, if ((wc->wildcards & (FWW_DL_DST | FWW_ETH_MCAST)) != (FWW_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 &= ~FWW_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 &= ~(FWW_DL_DST | FWW_ETH_MCAST); - memcpy(flow->dl_dst, value, ETH_ADDR_LEN); + } else if (flow_wildcards_is_dl_dst_mask_valid(mask)) { + cls_rule_set_dl_dst_masked(rule, value, mask); return 0; } else { return NXM_BAD_MASK; @@ -209,7 +194,7 @@ parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f, memcpy(flow->dl_src, value, ETH_ADDR_LEN); return 0; case NFI_NXM_OF_ETH_TYPE: - flow->dl_type = get_unaligned_be16(value); + flow->dl_type = ofputil_dl_type_from_openflow(get_unaligned_be16(value)); return 0; /* 802.1Q header. */ @@ -283,6 +268,50 @@ parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f, return 0; } + /* IPv6 addresses. */ + case NFI_NXM_NX_IPV6_SRC: + if (!ipv6_mask_is_any(&wc->ipv6_src_mask)) { + return NXM_DUP_TYPE; + } else { + struct in6_addr ipv6; + memcpy(&ipv6, value, sizeof ipv6); + cls_rule_set_ipv6_src(rule, &ipv6); + return 0; + } + case NFI_NXM_NX_IPV6_SRC_W: + if (!ipv6_mask_is_any(&wc->ipv6_src_mask)) { + return NXM_DUP_TYPE; + } else { + struct in6_addr ipv6, netmask; + memcpy(&ipv6, value, sizeof ipv6); + memcpy(&netmask, mask, sizeof netmask); + if (!cls_rule_set_ipv6_src_masked(rule, &ipv6, &netmask)) { + return NXM_BAD_MASK; + } + return 0; + } + case NFI_NXM_NX_IPV6_DST: + if (!ipv6_mask_is_any(&wc->ipv6_dst_mask)) { + return NXM_DUP_TYPE; + } else { + struct in6_addr ipv6; + memcpy(&ipv6, value, sizeof ipv6); + cls_rule_set_ipv6_dst(rule, &ipv6); + return 0; + } + case NFI_NXM_NX_IPV6_DST_W: + if (!ipv6_mask_is_any(&wc->ipv6_dst_mask)) { + return NXM_DUP_TYPE; + } else { + struct in6_addr ipv6, netmask; + memcpy(&ipv6, value, sizeof ipv6); + memcpy(&netmask, mask, sizeof netmask); + if (!cls_rule_set_ipv6_dst_masked(rule, &ipv6, &netmask)) { + return NXM_BAD_MASK; + } + return 0; + } + /* TCP header. */ case NFI_NXM_OF_TCP_SRC: flow->tp_src = get_unaligned_be16(value); @@ -307,6 +336,38 @@ parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f, flow->tp_dst = htons(*(uint8_t *) value); return 0; + /* ICMPv6 header. */ + case NFI_NXM_NX_ICMPV6_TYPE: + flow->tp_src = htons(*(uint8_t *) value); + return 0; + case NFI_NXM_NX_ICMPV6_CODE: + flow->tp_dst = htons(*(uint8_t *) value); + return 0; + + /* IPv6 Neighbor Discovery. */ + case NFI_NXM_NX_ND_TARGET: + /* We've already verified that it's an ICMPv6 message. */ + if ((flow->tp_src != htons(ND_NEIGHBOR_SOLICIT)) + && (flow->tp_src != htons(ND_NEIGHBOR_ADVERT))) { + return NXM_BAD_PREREQ; + } + memcpy(&flow->nd_target, value, sizeof flow->nd_target); + return 0; + case NFI_NXM_NX_ND_SLL: + /* We've already verified that it's an ICMPv6 message. */ + if (flow->tp_src != htons(ND_NEIGHBOR_SOLICIT)) { + return NXM_BAD_PREREQ; + } + memcpy(flow->arp_sha, value, ETH_ADDR_LEN); + return 0; + case NFI_NXM_NX_ND_TLL: + /* We've already verified that it's an ICMPv6 message. */ + if (flow->tp_src != htons(ND_NEIGHBOR_ADVERT)) { + return NXM_BAD_PREREQ; + } + memcpy(flow->arp_tha, value, ETH_ADDR_LEN); + return 0; + /* ARP header. */ case NFI_NXM_OF_ARP_OP: if (ntohs(get_unaligned_be16(value)) > 255) { @@ -316,10 +377,30 @@ parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f, return 0; } + case NFI_NXM_NX_ARP_SHA: + memcpy(flow->arp_sha, value, ETH_ADDR_LEN); + return 0; + case NFI_NXM_NX_ARP_THA: + memcpy(flow->arp_tha, value, ETH_ADDR_LEN); + return 0; + /* Tunnel ID. */ case NFI_NXM_NX_TUN_ID: - flow->tun_id = get_unaligned_be64(value); - return 0; + if (wc->tun_id_mask) { + return NXM_DUP_TYPE; + } else { + cls_rule_set_tun_id(rule, get_unaligned_be64(value)); + return 0; + } + case NFI_NXM_NX_TUN_ID_W: + if (wc->tun_id_mask) { + return NXM_DUP_TYPE; + } else { + ovs_be64 tun_id = get_unaligned_be64(value); + ovs_be64 tun_mask = get_unaligned_be64(mask); + cls_rule_set_tun_id_masked(rule, tun_id, tun_mask); + return 0; + } /* Registers. */ case NFI_NXM_NX_REG0: @@ -350,9 +431,19 @@ parse_nxm_entry(struct cls_rule *rule, const struct nxm_field *f, 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))); + if (field->nw_proto && field->nw_proto != flow->nw_proto) { + return false; + } + + if (!field->dl_type[0]) { + return true; + } else if (field->dl_type[0] == flow->dl_type) { + return true; + } else if (field->dl_type[1] && field->dl_type[1] == flow->dl_type) { + return true; + } + + return false; } static uint32_t @@ -395,7 +486,7 @@ nx_pull_match(struct ofpbuf *b, unsigned int match_len, uint16_t priority, 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); @@ -531,6 +622,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]) @@ -541,20 +657,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 & (FWW_DL_DST | FWW_ETH_MCAST)) { case FWW_DL_DST | FWW_ETH_MCAST: break; - case FWW_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); @@ -562,6 +673,32 @@ 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); + } +} + +/* 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. + * + * 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) { @@ -571,12 +708,11 @@ nx_put_match(struct ofpbuf *b, const struct cls_rule *cr) int match_len; int i; + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 1); + /* Metadata. */ 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)); } @@ -586,7 +722,8 @@ nx_put_match(struct ofpbuf *b, const struct cls_rule *cr) nxm_put_eth(b, NXM_OF_ETH_SRC, flow->dl_src); } if (!(wc & FWW_DL_TYPE)) { - nxm_put_16(b, NXM_OF_ETH_TYPE, flow->dl_type); + nxm_put_16(b, NXM_OF_ETH_TYPE, + ofputil_dl_type_to_openflow(flow->dl_type)); } /* 802.1Q. */ @@ -605,7 +742,7 @@ nx_put_match(struct ofpbuf *b, const struct cls_rule *cr) nxm_put_8(b, NXM_OF_IP_PROTO, flow->nw_proto); switch (flow->nw_proto) { /* TCP. */ - case IP_TYPE_TCP: + case IPPROTO_TCP: if (!(wc & FWW_TP_SRC)) { nxm_put_16(b, NXM_OF_TCP_SRC, flow->tp_src); } @@ -615,7 +752,7 @@ nx_put_match(struct ofpbuf *b, const struct cls_rule *cr) break; /* UDP. */ - case IP_TYPE_UDP: + case IPPROTO_UDP: if (!(wc & FWW_TP_SRC)) { nxm_put_16(b, NXM_OF_UDP_SRC, flow->tp_src); } @@ -625,7 +762,7 @@ nx_put_match(struct ofpbuf *b, const struct cls_rule *cr) break; /* ICMP. */ - case IP_TYPE_ICMP: + case IPPROTO_ICMP: if (!(wc & FWW_TP_SRC)) { nxm_put_8(b, NXM_OF_ICMP_TYPE, ntohs(flow->tp_src)); } @@ -635,6 +772,67 @@ nx_put_match(struct ofpbuf *b, const struct cls_rule *cr) break; } } + } else if (!(wc & FWW_DL_TYPE) && flow->dl_type == htons(ETH_TYPE_IPV6)) { + /* IPv6. */ + + if (!(wc & FWW_NW_TOS)) { + nxm_put_8(b, NXM_OF_IP_TOS, flow->nw_tos & 0xfc); + } + 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); + + 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 & FWW_NW_PROTO)) { @@ -642,12 +840,16 @@ nx_put_match(struct ofpbuf *b, const struct cls_rule *cr) } 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 & FWW_TUN_ID)) { - nxm_put_64(b, NXM_NX_TUN_ID, 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++) { @@ -814,8 +1016,8 @@ nx_match_from_string(const char *s, struct ofpbuf *b) return match_len; } -static const char * -parse_nxm_field_bits(const char *s, uint32_t *headerp, int *ofsp, int *n_bitsp) +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; @@ -876,12 +1078,12 @@ nxm_parse_reg_move(struct nx_action_reg_move *move, const char *s) int src_ofs, dst_ofs; int src_n_bits, dst_n_bits; - s = parse_nxm_field_bits(s, &src, &src_ofs, &src_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 = parse_nxm_field_bits(s, &dst, &dst_ofs, &dst_n_bits); + 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); } @@ -915,13 +1117,13 @@ nxm_parse_reg_load(struct nx_action_reg_load *load, const char *s) ovs_fatal(0, "%s: missing `->' following value", full_s); } s += 2; - s = parse_nxm_field_bits(s, &dst, &ofs, &n_bits); + 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 %llu does not fit into %d bits", + ovs_fatal(0, "%s: value %"PRIu64" does not fit into %d bits", full_s, value, n_bits); } @@ -929,21 +1131,23 @@ nxm_parse_reg_load(struct nx_action_reg_load *load, const char *s) load->len = htons(sizeof *load); load->vendor = htonl(NX_VENDOR_ID); load->subtype = htons(NXAST_REG_LOAD); - load->ofs_nbits = htons((ofs << 6) | (n_bits - 1)); + 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(). */ -static void -format_nxm_field_bits(struct ds *s, uint32_t header, int ofs, int n_bits) +void +nxm_format_field_bits(struct ds *s, uint32_t header, int ofs, int n_bits) { format_nxm_field_name(s, header); - if (n_bits != 1) { - ds_put_format(s, "[%d..%d]", ofs, ofs + n_bits - 1); - } else { + 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); } } @@ -957,22 +1161,21 @@ nxm_format_reg_move(const struct nx_action_reg_move *move, struct ds *s) uint32_t dst = ntohl(move->dst); ds_put_format(s, "move:"); - format_nxm_field_bits(s, src, src_ofs, n_bits); + nxm_format_field_bits(s, src, src_ofs, n_bits); ds_put_cstr(s, "->"); - format_nxm_field_bits(s, dst, dst_ofs, n_bits); + 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) { - uint16_t ofs_nbits = ntohs(load->ofs_nbits); - int ofs = ofs_nbits >> 6; - int n_bits = (ofs_nbits & 0x3f) + 1; + 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:%"PRIu64"->", value); - format_nxm_field_bits(s, dst, ofs, n_bits); + ds_put_format(s, "load:%#"PRIx64"->", value); + nxm_format_field_bits(s, dst, ofs, n_bits); } /* nxm_check_reg_move(), nxm_check_reg_load(). */ @@ -1005,39 +1208,58 @@ nxm_check_reg_move(const struct nx_action_reg_move *action, return BAD_ARGUMENT; } - if (!NXM_IS_NX_REG(dst->header) - && dst->header != NXM_OF_VLAN_TCI - && dst->header != NXM_NX_TUN_ID) { + if (!dst->writable) { return BAD_ARGUMENT; } return 0; } +/* Given a flow, checks that the destination field represented by 'dst_header' + * and 'ofs_nbits' is valid and large enough for 'min_n_bits' bits of data. */ int -nxm_check_reg_load(const struct nx_action_reg_load *action, - const struct flow *flow) +nxm_dst_check(ovs_be32 dst_header, ovs_be16 ofs_nbits, size_t min_n_bits, + const struct flow *flow) { const struct nxm_field *dst; int ofs, n_bits; - ofs = ntohs(action->ofs_nbits) >> 6; - n_bits = (ntohs(action->ofs_nbits) & 0x3f) + 1; - dst = nxm_field_lookup(ntohl(action->dst)); + ofs = nxm_decode_ofs(ofs_nbits); + n_bits = nxm_decode_n_bits(ofs_nbits); + dst = nxm_field_lookup(ntohl(dst_header)); + if (!field_ok(dst, flow, ofs + n_bits)) { - return BAD_ARGUMENT; + VLOG_WARN_RL(&rl, "invalid destination field"); + } else if (!dst->writable) { + VLOG_WARN_RL(&rl, "destination field is not writable"); + } else if (n_bits < min_n_bits) { + VLOG_WARN_RL(&rl, "insufficient bits in destination"); + } else { + return 0; + } + + return BAD_ARGUMENT; +} + +int +nxm_check_reg_load(const struct nx_action_reg_load *action, + const struct flow *flow) +{ + int n_bits; + int error; + + error = nxm_dst_check(action->dst, action->ofs_nbits, 0, flow); + if (error) { + return error; } /* Reject 'action' if a bit numbered 'n_bits' or higher is set to 1 in * action->value. */ + n_bits = nxm_decode_n_bits(action->ofs_nbits); if (n_bits < 64 && ntohll(action->value) >> n_bits) { return BAD_ARGUMENT; } - if (!NXM_IS_NX_REG(dst->header)) { - return BAD_ARGUMENT; - } - return 0; } @@ -1048,7 +1270,7 @@ nxm_read_field(const struct nxm_field *src, const struct flow *flow) { switch (src->index) { case NFI_NXM_OF_IN_PORT: - return flow->in_port == ODPP_LOCAL ? OFPP_LOCAL : flow->in_port; + return flow->in_port; case NFI_NXM_OF_ETH_DST: return eth_addr_to_uint64(flow->dl_dst); @@ -1057,7 +1279,7 @@ nxm_read_field(const struct nxm_field *src, const struct flow *flow) return eth_addr_to_uint64(flow->dl_src); case NFI_NXM_OF_ETH_TYPE: - return ntohs(flow->dl_type); + return ntohs(ofputil_dl_type_to_openflow(flow->dl_type)); case NFI_NXM_OF_VLAN_TCI: return ntohs(flow->vlan_tci); @@ -1086,9 +1308,11 @@ nxm_read_field(const struct nxm_field *src, const struct flow *flow) return ntohs(flow->tp_dst); case NFI_NXM_OF_ICMP_TYPE: + case NFI_NXM_NX_ICMPV6_TYPE: return ntohs(flow->tp_src) & 0xff; case NFI_NXM_OF_ICMP_CODE: + case NFI_NXM_NX_ICMPV6_CODE: return ntohs(flow->tp_dst) & 0xff; case NFI_NXM_NX_TUN_ID: @@ -1114,12 +1338,26 @@ nxm_read_field(const struct nxm_field *src, const struct flow *flow) #error #endif + case NFI_NXM_NX_ARP_SHA: + case NFI_NXM_NX_ND_SLL: + return eth_addr_to_uint64(flow->arp_sha); + + case NFI_NXM_NX_ARP_THA: + case NFI_NXM_NX_ND_TLL: + return eth_addr_to_uint64(flow->arp_tha); + + case NFI_NXM_NX_TUN_ID_W: 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 NFI_NXM_NX_IPV6_SRC: + case NFI_NXM_NX_IPV6_SRC_W: + case NFI_NXM_NX_IPV6_DST: + case NFI_NXM_NX_IPV6_DST_W: + case NFI_NXM_NX_ND_TARGET: case N_NXM_FIELDS: NOT_REACHED(); } @@ -1127,6 +1365,101 @@ nxm_read_field(const struct nxm_field *src, const struct flow *flow) NOT_REACHED(); } +static void +nxm_write_field(const struct nxm_field *dst, struct flow *flow, + uint64_t new_value) +{ + switch (dst->index) { + case NFI_NXM_OF_ETH_DST: + eth_addr_from_uint64(new_value, flow->dl_dst); + break; + + case NFI_NXM_OF_ETH_SRC: + eth_addr_from_uint64(new_value, flow->dl_src); + break; + + case NFI_NXM_OF_VLAN_TCI: + flow->vlan_tci = htons(new_value); + break; + + case NFI_NXM_NX_TUN_ID: + flow->tun_id = htonll(new_value); + break; + +#define NXM_WRITE_REGISTER(IDX) \ + case NFI_NXM_NX_REG##IDX: \ + flow->regs[IDX] = new_value; \ + break; \ + case NFI_NXM_NX_REG##IDX##_W: \ + NOT_REACHED(); + + NXM_WRITE_REGISTER(0); +#if FLOW_N_REGS >= 2 + NXM_WRITE_REGISTER(1); +#endif +#if FLOW_N_REGS >= 3 + NXM_WRITE_REGISTER(2); +#endif +#if FLOW_N_REGS >= 4 + NXM_WRITE_REGISTER(3); +#endif +#if FLOW_N_REGS > 4 +#error +#endif + + case NFI_NXM_OF_IP_TOS: + flow->nw_tos = new_value & IP_DSCP_MASK; + break; + + case NFI_NXM_OF_IP_SRC: + flow->nw_src = htonl(new_value); + break; + + case NFI_NXM_OF_IP_DST: + flow->nw_dst = htonl(new_value); + break; + + case NFI_NXM_OF_TCP_SRC: + case NFI_NXM_OF_UDP_SRC: + flow->tp_src = htons(new_value); + break; + + case NFI_NXM_OF_TCP_DST: + case NFI_NXM_OF_UDP_DST: + flow->tp_dst = htons(new_value); + break; + + case NFI_NXM_OF_IN_PORT: + case NFI_NXM_OF_ETH_TYPE: + case NFI_NXM_OF_IP_PROTO: + case NFI_NXM_OF_ARP_OP: + case NFI_NXM_OF_ARP_SPA: + case NFI_NXM_OF_ARP_TPA: + case NFI_NXM_OF_ICMP_TYPE: + case NFI_NXM_OF_ICMP_CODE: + case NFI_NXM_NX_TUN_ID_W: + 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 NFI_NXM_NX_ARP_SHA: + case NFI_NXM_NX_ARP_THA: + case NFI_NXM_NX_IPV6_SRC: + case NFI_NXM_NX_IPV6_SRC_W: + case NFI_NXM_NX_IPV6_DST: + case NFI_NXM_NX_IPV6_DST_W: + case NFI_NXM_NX_ICMPV6_TYPE: + case NFI_NXM_NX_ICMPV6_CODE: + case NFI_NXM_NX_ND_TARGET: + case NFI_NXM_NX_ND_SLL: + case NFI_NXM_NX_ND_TLL: + case N_NXM_FIELDS: + NOT_REACHED(); + } +} + void nxm_execute_reg_move(const struct nx_action_reg_move *action, struct flow *flow) @@ -1138,43 +1471,36 @@ nxm_execute_reg_move(const struct nx_action_reg_move *action, /* 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); + uint64_t src_data = (nxm_read_field(src, flow) >> src_ofs) & mask; - /* 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) { - flow->vlan_tci = htons(new_data); - } else if (dst->header == NXM_NX_TUN_ID) { - flow->tun_id = htonll(new_data); - } else { - NOT_REACHED(); - } + nxm_reg_load(action->dst, + nxm_encode_ofs_nbits(ntohs(action->dst_ofs), n_bits), + src_data, 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))]; + nxm_reg_load(action->dst, action->ofs_nbits, ntohll(action->value), flow); +} - /* Get source data. */ - uint32_t src_data = ntohll(action->value); +/* 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) +{ + int n_bits = nxm_decode_n_bits(ofs_nbits); + int dst_ofs = nxm_decode_ofs(ofs_nbits); + uint64_t mask = n_bits == 64 ? UINT64_MAX : (UINT64_C(1) << n_bits) - 1; /* Get remaining bits of the destination field. */ - int dst_ofs = ntohs(action->ofs_nbits) >> 6; - uint32_t dst_data = *reg & ~(mask << dst_ofs); + const struct nxm_field *dst = nxm_field_lookup(ntohl(dst_header)); + uint64_t dst_data = nxm_read_field(dst, flow) & ~(mask << dst_ofs); + + /* Get the final value. */ + uint64_t new_data = dst_data | (src_data << dst_ofs); - *reg = dst_data | (src_data << dst_ofs); + nxm_write_field(dst, flow, new_data); }