X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fmeta-flow.c;h=f85f7a468c12c1afef6d719a6c8b2bf854fd275e;hb=615660a99a2c1b1b4e0af258f1e8f8a9ea6cd3d4;hp=a823c3048aa3fab6a099ab4da4afbefb7c3b3635;hpb=9e44d715638af28689b15ef0c5be920e61c7997b;p=openvswitch diff --git a/lib/meta-flow.c b/lib/meta-flow.c index a823c304..f85f7a46 100644 --- a/lib/meta-flow.c +++ b/lib/meta-flow.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Nicira Networks. + * Copyright (c) 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,12 +26,16 @@ #include "classifier.h" #include "dynamic-string.h" +#include "ofp-errors.h" #include "ofp-util.h" #include "packets.h" #include "random.h" #include "shash.h" #include "socket-util.h" #include "unaligned.h" +#include "vlog.h" + +VLOG_DEFINE_THIS_MODULE(meta_flow); #define MF_FIELD_SIZES(MEMBER) \ sizeof ((union mf_value *)0)->MEMBER, \ @@ -48,14 +52,27 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFM_FULLY, 0, MFS_HEXADECIMAL, MFP_NONE, - NXM_NX_TUN_ID, + true, + NXM_NX_TUN_ID, "NXM_NX_TUN_ID", + NXM_NX_TUN_ID, "NXM_NX_TUN_ID", + }, { + MFF_METADATA, "metadata", NULL, + MF_FIELD_SIZES(be64), + MFM_FULLY, 0, + MFS_HEXADECIMAL, + MFP_NONE, + true, + OXM_OF_METADATA, "OXM_OF_METADATA", + OXM_OF_METADATA, "OXM_OF_METADATA", }, { MFF_IN_PORT, "in_port", NULL, MF_FIELD_SIZES(be16), MFM_NONE, FWW_IN_PORT, MFS_OFP_PORT, MFP_NONE, - NXM_OF_IN_PORT, + false, + NXM_OF_IN_PORT, "NXM_OF_IN_PORT", + OXM_OF_IN_PORT, "OXM_OF_IN_PORT", }, #define REGISTER(IDX) \ @@ -65,7 +82,9 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFM_FULLY, 0, \ MFS_HEXADECIMAL, \ MFP_NONE, \ - NXM_NX_REG(IDX), \ + true, \ + NXM_NX_REG(IDX), "NXM_NX_REG" #IDX, \ + NXM_NX_REG(IDX), "NXM_NX_REG" #IDX, \ } #if FLOW_N_REGS > 0 REGISTER(0), @@ -83,6 +102,15 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { REGISTER(4), #endif #if FLOW_N_REGS > 5 + REGISTER(5), +#endif +#if FLOW_N_REGS > 6 + REGISTER(6), +#endif +#if FLOW_N_REGS > 7 + REGISTER(7), +#endif +#if FLOW_N_REGS > 8 #error #endif @@ -93,24 +121,30 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_ETH_SRC, "eth_src", "dl_src", MF_FIELD_SIZES(mac), - MFM_NONE, FWW_DL_SRC, + MFM_FULLY, 0, MFS_ETHERNET, MFP_NONE, - NXM_OF_ETH_SRC, + true, + NXM_OF_ETH_SRC, "NXM_OF_ETH_SRC", + OXM_OF_ETH_SRC, "OXM_OF_ETH_SRC", }, { MFF_ETH_DST, "eth_dst", "dl_dst", MF_FIELD_SIZES(mac), - MFM_MCAST, 0, + MFM_FULLY, 0, MFS_ETHERNET, MFP_NONE, - NXM_OF_ETH_DST, + true, + NXM_OF_ETH_DST, "NXM_OF_ETH_DST", + OXM_OF_ETH_DST, "OXM_OF_ETH_DST", }, { MFF_ETH_TYPE, "eth_type", "dl_type", MF_FIELD_SIZES(be16), MFM_NONE, FWW_DL_TYPE, MFS_HEXADECIMAL, MFP_NONE, - NXM_OF_ETH_TYPE, + false, + NXM_OF_ETH_TYPE, "NXM_OF_ETH_TYPE", + OXM_OF_ETH_TYPE, "OXM_OF_ETH_TYPE", }, { @@ -119,21 +153,27 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFM_FULLY, 0, MFS_HEXADECIMAL, MFP_NONE, - NXM_OF_VLAN_TCI, + true, + NXM_OF_VLAN_TCI, "NXM_OF_VLAN_TCI", + NXM_OF_VLAN_TCI, "NXM_OF_VLAN_TCI", }, { MFF_VLAN_VID, "dl_vlan", NULL, sizeof(ovs_be16), 12, MFM_NONE, 0, MFS_DECIMAL, MFP_NONE, - 0, + true, + OXM_OF_VLAN_VID, "OXM_OF_VLAN_VID", + OXM_OF_VLAN_VID, "OXM_OF_VLAN_VID", }, { MFF_VLAN_PCP, "dl_vlan_pcp", NULL, 1, 3, MFM_NONE, 0, MFS_DECIMAL, MFP_NONE, - 0, + true, + OXM_OF_VLAN_PCP, "OXM_OF_VLAN_PCP", + OXM_OF_VLAN_PCP, "OXM_OF_VLAN_PCP", }, /* ## -- ## */ @@ -143,33 +183,41 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_IPV4_SRC, "ip_src", "nw_src", MF_FIELD_SIZES(be32), - MFM_CIDR, 0, + MFM_FULLY, 0, MFS_IPV4, MFP_IPV4, - NXM_OF_IP_SRC, + true, + NXM_OF_IP_SRC, "NXM_OF_IP_SRC", + OXM_OF_IPV4_SRC, "OXM_OF_IPV4_SRC", }, { MFF_IPV4_DST, "ip_dst", "nw_dst", MF_FIELD_SIZES(be32), - MFM_CIDR, 0, + MFM_FULLY, 0, MFS_IPV4, MFP_IPV4, - NXM_OF_IP_DST, + true, + NXM_OF_IP_DST, "NXM_OF_IP_DST", + OXM_OF_IPV4_DST, "OXM_OF_IPV4_DST", }, { MFF_IPV6_SRC, "ipv6_src", NULL, MF_FIELD_SIZES(ipv6), - MFM_CIDR, 0, + MFM_FULLY, 0, MFS_IPV6, MFP_IPV6, - NXM_NX_IPV6_SRC, + true, + NXM_NX_IPV6_SRC, "NXM_NX_IPV6_SRC", + OXM_OF_IPV6_SRC, "OXM_OF_IPV6_SRC", }, { MFF_IPV6_DST, "ipv6_dst", NULL, MF_FIELD_SIZES(ipv6), - MFM_CIDR, 0, + MFM_FULLY, 0, MFS_IPV6, MFP_IPV6, - NXM_NX_IPV6_DST, + true, + NXM_NX_IPV6_DST, "NXM_NX_IPV6_DST", + OXM_OF_IPV6_DST, "OXM_OF_IPV6_DST", }, { MFF_IPV6_LABEL, "ipv6_label", NULL, @@ -177,7 +225,9 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFM_NONE, FWW_IPV6_LABEL, MFS_HEXADECIMAL, MFP_IPV6, - NXM_NX_IPV6_LABEL, + false, + NXM_NX_IPV6_LABEL, "NXM_NX_IPV6_LABEL", + OXM_OF_IPV6_FLABEL, "OXM_OF_IPV6_FLABEL", }, { @@ -186,21 +236,45 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFM_NONE, FWW_NW_PROTO, MFS_DECIMAL, MFP_IP_ANY, - NXM_OF_IP_PROTO, + false, + NXM_OF_IP_PROTO, "NXM_OF_IP_PROTO", + OXM_OF_IP_PROTO, "OXM_OF_IP_PROTO", }, { - MFF_IP_TOS, "nw_tos", NULL, + MFF_IP_DSCP, "nw_tos", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, 0, + MFM_NONE, FWW_NW_DSCP, + MFS_DECIMAL, + MFP_IP_ANY, + true, + NXM_OF_IP_TOS, "NXM_OF_IP_TOS", + OXM_OF_IP_DSCP, "OXM_OF_IP_DSCP", + }, { + MFF_IP_ECN, "nw_ecn", NULL, + 1, 2, + MFM_NONE, FWW_NW_ECN, + MFS_DECIMAL, + MFP_IP_ANY, + true, + NXM_NX_IP_ECN, "NXM_NX_IP_ECN", + OXM_OF_IP_ECN, "OXM_OF_IP_ECN", + }, { + MFF_IP_TTL, "nw_ttl", NULL, + MF_FIELD_SIZES(u8), + MFM_NONE, FWW_NW_TTL, MFS_DECIMAL, MFP_IP_ANY, - NXM_OF_IP_TOS, + true, + NXM_NX_IP_TTL, "NXM_NX_IP_TTL", + NXM_NX_IP_TTL, "NXM_NX_IP_TTL", }, { MFF_IP_FRAG, "ip_frag", NULL, 1, 2, MFM_FULLY, 0, MFS_FRAG, MFP_IP_ANY, - NXM_NX_IP_FRAG, + false, + NXM_NX_IP_FRAG, "NXM_NX_IP_FRAG", + NXM_NX_IP_FRAG, "NXM_NX_IP_FRAG", }, { @@ -209,35 +283,45 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFM_NONE, FWW_NW_PROTO, MFS_DECIMAL, MFP_ARP, - NXM_OF_ARP_OP, + false, + NXM_OF_ARP_OP, "NXM_OF_ARP_OP", + OXM_OF_ARP_OP, "OXM_OF_ARP_OP", }, { MFF_ARP_SPA, "arp_spa", NULL, MF_FIELD_SIZES(be32), - MFM_CIDR, 0, + MFM_FULLY, 0, MFS_IPV4, MFP_ARP, - NXM_OF_ARP_SPA, + false, + NXM_OF_ARP_SPA, "NXM_OF_ARP_SPA", + OXM_OF_ARP_SPA, "OXM_OF_ARP_SPA", }, { MFF_ARP_TPA, "arp_tpa", NULL, MF_FIELD_SIZES(be32), - MFM_CIDR, 0, + MFM_FULLY, 0, MFS_IPV4, MFP_ARP, - NXM_OF_ARP_TPA, + false, + NXM_OF_ARP_TPA, "NXM_OF_ARP_TPA", + OXM_OF_ARP_TPA, "OXM_OF_ARP_TPA", }, { MFF_ARP_SHA, "arp_sha", NULL, MF_FIELD_SIZES(mac), MFM_NONE, FWW_ARP_SHA, MFS_ETHERNET, MFP_ARP, - NXM_NX_ARP_SHA, + false, + NXM_NX_ARP_SHA, "NXM_NX_ARP_SHA", + OXM_OF_ARP_SHA, "OXM_OF_ARP_SHA", }, { MFF_ARP_THA, "arp_tha", NULL, MF_FIELD_SIZES(mac), MFM_NONE, FWW_ARP_THA, MFS_ETHERNET, MFP_ARP, - NXM_NX_ARP_THA, + false, + NXM_NX_ARP_THA, "NXM_NX_ARP_THA", + OXM_OF_ARP_THA, "OXM_OF_ARP_THA", }, /* ## -- ## */ @@ -247,49 +331,81 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_TCP_SRC, "tcp_src", "tp_src", MF_FIELD_SIZES(be16), - MFM_NONE, FWW_TP_SRC, + MFM_FULLY, 0, MFS_DECIMAL, MFP_TCP, - NXM_OF_TCP_SRC, + true, + NXM_OF_TCP_SRC, "NXM_OF_TCP_SRC", + OXM_OF_TCP_SRC, "OXM_OF_TCP_SRC", }, { MFF_TCP_DST, "tcp_dst", "tp_dst", MF_FIELD_SIZES(be16), - MFM_NONE, FWW_TP_DST, + MFM_FULLY, 0, MFS_DECIMAL, MFP_TCP, - NXM_OF_TCP_DST, + true, + NXM_OF_TCP_DST, "NXM_OF_TCP_DST", + OXM_OF_TCP_DST, "OXM_OF_TCP_DST", }, { MFF_UDP_SRC, "udp_src", NULL, MF_FIELD_SIZES(be16), - MFM_NONE, FWW_TP_SRC, + MFM_FULLY, 0, MFS_DECIMAL, MFP_UDP, - NXM_OF_UDP_SRC, + true, + NXM_OF_UDP_SRC, "NXM_OF_UDP_SRC", + OXM_OF_UDP_SRC, "OXM_OF_UDP_SRC", }, { MFF_UDP_DST, "udp_dst", NULL, MF_FIELD_SIZES(be16), - MFM_NONE, FWW_TP_DST, + MFM_FULLY, 0, MFS_DECIMAL, MFP_UDP, - NXM_OF_UDP_DST, + true, + NXM_OF_UDP_DST, "NXM_OF_UDP_DST", + OXM_OF_UDP_DST, "OXM_OF_UDP_DST", }, { - MFF_ICMP_TYPE, "icmp_type", NULL, + MFF_ICMPV4_TYPE, "icmp_type", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, FWW_TP_SRC, + MFM_NONE, 0, MFS_DECIMAL, - MFP_ICMP_ANY, - NXM_OF_ICMP_TYPE, + MFP_ICMPV4, + false, + NXM_OF_ICMP_TYPE, "NXM_OF_ICMP_TYPE", + OXM_OF_ICMPV4_TYPE, "OXM_OF_ICMPV4_TYPE", }, { - MFF_ICMP_CODE, "icmp_code", NULL, + MFF_ICMPV4_CODE, "icmp_code", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, FWW_TP_DST, + MFM_NONE, 0, MFS_DECIMAL, - MFP_ICMP_ANY, - NXM_OF_ICMP_CODE, + MFP_ICMPV4, + false, + NXM_OF_ICMP_CODE, "NXM_OF_ICMP_CODE", + OXM_OF_ICMPV4_CODE, "OXM_OF_ICMPV4_CODE", + }, + + { + MFF_ICMPV6_TYPE, "icmpv6_type", NULL, + MF_FIELD_SIZES(u8), + MFM_NONE, 0, + MFS_DECIMAL, + MFP_ICMPV6, + false, + NXM_NX_ICMPV6_TYPE, "NXM_NX_ICMPV6_TYPE", + OXM_OF_ICMPV6_TYPE, "OXM_OF_ICMPV6_TYPE", + }, { + MFF_ICMPV6_CODE, "icmpv6_code", NULL, + MF_FIELD_SIZES(u8), + MFM_NONE, 0, + MFS_DECIMAL, + MFP_ICMPV6, + false, + NXM_NX_ICMPV6_CODE, "NXM_NX_ICMPV6_CODE", + OXM_OF_ICMPV6_CODE, "OXM_OF_ICMPV6_CODE", }, /* ## ---- ## */ @@ -299,27 +415,49 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { { MFF_ND_TARGET, "nd_target", NULL, MF_FIELD_SIZES(ipv6), - MFM_NONE, FWW_ND_TARGET, + MFM_FULLY, 0, MFS_IPV6, MFP_ND, - NXM_NX_ND_TARGET, + false, + NXM_NX_ND_TARGET, "NXM_NX_ND_TARGET", + OXM_OF_IPV6_ND_TARGET, "OXM_OF_IPV6_ND_TARGET", }, { MFF_ND_SLL, "nd_sll", NULL, MF_FIELD_SIZES(mac), MFM_NONE, FWW_ARP_SHA, MFS_ETHERNET, MFP_ND_SOLICIT, - NXM_NX_ND_SLL, + false, + NXM_NX_ND_SLL, "NXM_NX_ND_SLL", + OXM_OF_IPV6_ND_SLL, "OXM_OF_IPV6_ND_SLL", }, { MFF_ND_TLL, "nd_tll", NULL, MF_FIELD_SIZES(mac), MFM_NONE, FWW_ARP_THA, MFS_ETHERNET, MFP_ND_ADVERT, - NXM_NX_ND_TLL, + false, + NXM_NX_ND_TLL, "NXM_NX_ND_TLL", + OXM_OF_IPV6_ND_TLL, "OXM_OF_IPV6_ND_TLL", } }; +/* Maps an NXM or OXM header value to an mf_field. */ +struct nxm_field { + struct hmap_node hmap_node; /* In 'all_fields' hmap. */ + uint32_t header; /* NXM or OXM header value. */ + const struct mf_field *mf; +}; + +/* Contains 'struct nxm_field's. */ +static struct hmap all_fields = HMAP_INITIALIZER(&all_fields); + +/* Rate limit for parse errors. These always indicate a bug in an OpenFlow + * controller and so there's not much point in showing a lot of them. */ +static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); + +const struct mf_field *mf_from_nxm_header__(uint32_t header); + /* Returns the field with the given 'id'. */ const struct mf_field * mf_from_id(enum mf_field_id id) @@ -349,6 +487,65 @@ mf_from_name(const char *name) return shash_find_data(&mf_by_name, name); } +static void +add_nxm_field(uint32_t header, const struct mf_field *mf) +{ + struct nxm_field *f; + + f = xmalloc(sizeof *f); + hmap_insert(&all_fields, &f->hmap_node, hash_int(header, 0)); + f->header = header; + f->mf = mf; +} + +static void +nxm_init_add_field(const struct mf_field *mf, uint32_t header) +{ + if (header) { + assert(!mf_from_nxm_header__(header)); + add_nxm_field(header, mf); + if (mf->maskable != MFM_NONE) { + add_nxm_field(NXM_MAKE_WILD_HEADER(header), mf); + } + } +} + +static void +nxm_init(void) +{ + const struct mf_field *mf; + + for (mf = mf_fields; mf < &mf_fields[MFF_N_IDS]; mf++) { + nxm_init_add_field(mf, mf->nxm_header); + if (mf->oxm_header != mf->nxm_header) { + nxm_init_add_field(mf, mf->oxm_header); + } + } +} + +const struct mf_field * +mf_from_nxm_header(uint32_t header) +{ + if (hmap_is_empty(&all_fields)) { + nxm_init(); + } + return mf_from_nxm_header__(header); +} + +const struct mf_field * +mf_from_nxm_header__(uint32_t header) +{ + const struct nxm_field *f; + + HMAP_FOR_EACH_IN_BUCKET (f, hmap_node, hash_int(header, 0), &all_fields) { + if (f->header == header) { + return f->mf; + } + } + + return NULL; +} + /* Returns true if 'wc' wildcards all the bits in field 'mf', false if 'wc' * specifies at least one bit in the field. * @@ -359,20 +556,15 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) { switch (mf->id) { case MFF_IN_PORT: - case MFF_ETH_SRC: case MFF_ETH_TYPE: case MFF_IP_PROTO: + case MFF_IP_DSCP: + case MFF_IP_ECN: + case MFF_IP_TTL: case MFF_IPV6_LABEL: case MFF_ARP_OP: case MFF_ARP_SHA: case MFF_ARP_THA: - case MFF_TCP_SRC: - case MFF_TCP_DST: - case MFF_UDP_SRC: - case MFF_UDP_DST: - case MFF_ICMP_TYPE: - case MFF_ICMP_CODE: - case MFF_ND_TARGET: case MFF_ND_SLL: case MFF_ND_TLL: assert(mf->fww_bit != 0); @@ -380,30 +572,16 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) case MFF_TUN_ID: return !wc->tun_id_mask; + case MFF_METADATA: + return !wc->metadata_mask; -#if FLOW_N_REGS > 0 - case MFF_REG0: -#endif -#if FLOW_N_REGS > 1 - case MFF_REG1: -#endif -#if FLOW_N_REGS > 2 - case MFF_REG2: -#endif -#if FLOW_N_REGS > 3 - case MFF_REG3: -#endif -#if FLOW_N_REGS > 4 - case MFF_REG4: -#endif -#if FLOW_N_REGS > 5 -#error -#endif + CASE_MFF_REGS: return !wc->reg_masks[mf->id - MFF_REG0]; + case MFF_ETH_SRC: + return eth_addr_is_zero(wc->dl_src_mask); case MFF_ETH_DST: - return ((wc->wildcards & (FWW_ETH_MCAST | FWW_DL_DST)) - == (FWW_ETH_MCAST | FWW_DL_DST)); + return eth_addr_is_zero(wc->dl_dst_mask); case MFF_VLAN_TCI: return !wc->vlan_tci_mask; @@ -422,16 +600,28 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) case MFF_IPV6_DST: return ipv6_mask_is_any(&wc->ipv6_dst_mask); - case MFF_IP_TOS: - return !(wc->tos_mask & IP_DSCP_MASK); + case MFF_ND_TARGET: + return ipv6_mask_is_any(&wc->nd_target_mask); + case MFF_IP_FRAG: - return !(wc->frag_mask & FLOW_FRAG_MASK); + return !(wc->nw_frag_mask & FLOW_NW_FRAG_MASK); case MFF_ARP_SPA: return !wc->nw_src_mask; case MFF_ARP_TPA: return !wc->nw_dst_mask; + case MFF_TCP_SRC: + case MFF_UDP_SRC: + case MFF_ICMPV4_TYPE: + case MFF_ICMPV6_TYPE: + return !wc->tp_src_mask; + case MFF_TCP_DST: + case MFF_UDP_DST: + case MFF_ICMPV4_CODE: + case MFF_ICMPV6_CODE: + return !wc->tp_dst_mask; + case MFF_N_IDS: default: NOT_REACHED(); @@ -450,20 +640,15 @@ mf_get_mask(const struct mf_field *mf, const struct flow_wildcards *wc, { switch (mf->id) { case MFF_IN_PORT: - case MFF_ETH_SRC: case MFF_ETH_TYPE: case MFF_IP_PROTO: + case MFF_IP_DSCP: + case MFF_IP_ECN: + case MFF_IP_TTL: case MFF_IPV6_LABEL: case MFF_ARP_OP: case MFF_ARP_SHA: case MFF_ARP_THA: - case MFF_TCP_SRC: - case MFF_TCP_DST: - case MFF_UDP_SRC: - case MFF_UDP_DST: - case MFF_ICMP_TYPE: - case MFF_ICMP_CODE: - case MFF_ND_TARGET: case MFF_ND_SLL: case MFF_ND_TLL: assert(mf->fww_bit != 0); @@ -473,31 +658,20 @@ mf_get_mask(const struct mf_field *mf, const struct flow_wildcards *wc, case MFF_TUN_ID: mask->be64 = wc->tun_id_mask; break; + case MFF_METADATA: + mask->be64 = wc->metadata_mask; + break; -#if FLOW_N_REGS > 0 - case MFF_REG0: -#endif -#if FLOW_N_REGS > 1 - case MFF_REG1: -#endif -#if FLOW_N_REGS > 2 - case MFF_REG2: -#endif -#if FLOW_N_REGS > 3 - case MFF_REG3: -#endif -#if FLOW_N_REGS > 4 - case MFF_REG4: -#endif -#if FLOW_N_REGS > 5 -#error -#endif + CASE_MFF_REGS: mask->be32 = htonl(wc->reg_masks[mf->id - MFF_REG0]); break; case MFF_ETH_DST: - memcpy(mask->mac, flow_wildcards_to_dl_dst_mask(wc->wildcards), - ETH_ADDR_LEN); + memcpy(mask->mac, wc->dl_dst_mask, ETH_ADDR_LEN); + break; + + case MFF_ETH_SRC: + memcpy(mask->mac, wc->dl_src_mask, ETH_ADDR_LEN); break; case MFF_VLAN_TCI: @@ -524,11 +698,12 @@ mf_get_mask(const struct mf_field *mf, const struct flow_wildcards *wc, mask->ipv6 = wc->ipv6_dst_mask; break; - case MFF_IP_TOS: - mask->u8 = wc->tos_mask & IP_DSCP_MASK; + case MFF_ND_TARGET: + mask->ipv6 = wc->nd_target_mask; break; + case MFF_IP_FRAG: - mask->u8 = wc->frag_mask & FLOW_FRAG_MASK; + mask->u8 = wc->nw_frag_mask & FLOW_NW_FRAG_MASK; break; case MFF_ARP_SPA: @@ -538,6 +713,24 @@ mf_get_mask(const struct mf_field *mf, const struct flow_wildcards *wc, mask->be32 = wc->nw_dst_mask; break; + case MFF_TCP_SRC: + case MFF_UDP_SRC: + mask->be16 = wc->tp_src_mask; + break; + case MFF_TCP_DST: + case MFF_UDP_DST: + mask->be16 = wc->tp_dst_mask; + break; + + case MFF_ICMPV4_TYPE: + case MFF_ICMPV6_TYPE: + mask->u8 = ntohs(wc->tp_src_mask); + break; + case MFF_ICMPV4_CODE: + case MFF_ICMPV6_CODE: + mask->u8 = ntohs(wc->tp_dst_mask); + break; + case MFF_N_IDS: default: NOT_REACHED(); @@ -556,14 +749,6 @@ mf_is_mask_valid(const struct mf_field *mf, const union mf_value *mask) case MFM_FULLY: return true; - - case MFM_CIDR: - return (mf->n_bytes == 4 - ? ip_is_cidr(mask->be32) - : ipv6_is_cidr(&mask->ipv6)); - - case MFM_MCAST: - return flow_wildcards_is_dl_dst_mask_valid(mask->mac); } NOT_REACHED(); @@ -611,10 +796,10 @@ mf_are_prereqs_ok(const struct mf_field *mf, const struct flow *flow) return is_ip_any(flow) && flow->nw_proto == IPPROTO_TCP; case MFP_UDP: return is_ip_any(flow) && flow->nw_proto == IPPROTO_UDP; + case MFP_ICMPV4: + return is_icmpv4(flow); case MFP_ICMPV6: return is_icmpv6(flow); - case MFP_ICMP_ANY: - return is_icmpv4(flow) || is_icmpv6(flow); case MFP_ND: return (is_icmpv6(flow) @@ -643,31 +828,15 @@ mf_are_prereqs_ok(const struct mf_field *mf, const struct flow *flow) * without the VLAN_CFI bit being set, but we can't reject those values because * it is still legitimate to test just for those bits (see the documentation * for NXM_OF_VLAN_TCI in nicira-ext.h). On the other hand, there is never a - * reason to set the low bit of MFF_IP_TOS to 1, so we reject that. */ + * reason to set the low bit of MFF_IP_DSCP to 1, so we reject that. */ bool mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) { switch (mf->id) { case MFF_TUN_ID: + case MFF_METADATA: case MFF_IN_PORT: -#if FLOW_N_REGS > 0 - case MFF_REG0: -#endif -#if FLOW_N_REGS > 1 - case MFF_REG1: -#endif -#if FLOW_N_REGS > 2 - case MFF_REG2: -#endif -#if FLOW_N_REGS > 3 - case MFF_REG3: -#endif -#if FLOW_N_REGS > 4 - case MFF_REG4: -#endif -#if FLOW_N_REGS > 5 -#error -#endif + CASE_MFF_REGS: case MFF_ETH_SRC: case MFF_ETH_DST: case MFF_ETH_TYPE: @@ -677,6 +846,7 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) case MFF_IPV6_SRC: case MFF_IPV6_DST: case MFF_IP_PROTO: + case MFF_IP_TTL: case MFF_ARP_SPA: case MFF_ARP_TPA: case MFF_ARP_SHA: @@ -685,17 +855,21 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) case MFF_TCP_DST: case MFF_UDP_SRC: case MFF_UDP_DST: - case MFF_ICMP_TYPE: - case MFF_ICMP_CODE: + case MFF_ICMPV4_TYPE: + case MFF_ICMPV4_CODE: + case MFF_ICMPV6_TYPE: + case MFF_ICMPV6_CODE: case MFF_ND_TARGET: case MFF_ND_SLL: case MFF_ND_TLL: return true; - case MFF_IP_TOS: + case MFF_IP_DSCP: return !(value->u8 & ~IP_DSCP_MASK); + case MFF_IP_ECN: + return !(value->u8 & ~IP_ECN_MASK); case MFF_IP_FRAG: - return !(value->u8 & ~FLOW_FRAG_MASK); + return !(value->u8 & ~FLOW_NW_FRAG_MASK); case MFF_ARP_OP: return !(value->be16 & htons(0xff00)); @@ -704,7 +878,7 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) return !(value->be16 & htons(VLAN_CFI | VLAN_PCP_MASK)); case MFF_VLAN_PCP: - return !(value->u8 & ~7); + return !(value->u8 & ~(VLAN_PCP_MASK >> VLAN_PCP_SHIFT)); case MFF_IPV6_LABEL: return !(value->be32 & ~htonl(IPV6_LABEL_MASK)); @@ -725,29 +899,15 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, case MFF_TUN_ID: value->be64 = flow->tun_id; break; + case MFF_METADATA: + value->be64 = flow->metadata; + break; case MFF_IN_PORT: value->be16 = htons(flow->in_port); break; -#if FLOW_N_REGS > 0 - case MFF_REG0: -#endif -#if FLOW_N_REGS > 1 - case MFF_REG1: -#endif -#if FLOW_N_REGS > 2 - case MFF_REG2: -#endif -#if FLOW_N_REGS > 3 - case MFF_REG3: -#endif -#if FLOW_N_REGS > 4 - case MFF_REG4: -#endif -#if FLOW_N_REGS > 5 -#error -#endif + CASE_MFF_REGS: value->be32 = htonl(flow->regs[mf->id - MFF_REG0]); break; @@ -799,12 +959,20 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, value->u8 = flow->nw_proto; break; - case MFF_IP_TOS: - value->u8 = flow->tos & IP_DSCP_MASK; + case MFF_IP_DSCP: + value->u8 = flow->nw_tos & IP_DSCP_MASK; + break; + + case MFF_IP_ECN: + value->u8 = flow->nw_tos & IP_ECN_MASK; + break; + + case MFF_IP_TTL: + value->u8 = flow->nw_ttl; break; case MFF_IP_FRAG: - value->u8 = flow->frag; + value->u8 = flow->nw_frag; break; case MFF_ARP_OP: @@ -830,26 +998,22 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, break; case MFF_TCP_SRC: - value->be16 = flow->tp_src; - break; - - case MFF_TCP_DST: - value->be16 = flow->tp_dst; - break; - case MFF_UDP_SRC: value->be16 = flow->tp_src; break; + case MFF_TCP_DST: case MFF_UDP_DST: value->be16 = flow->tp_dst; break; - case MFF_ICMP_TYPE: + case MFF_ICMPV4_TYPE: + case MFF_ICMPV6_TYPE: value->u8 = ntohs(flow->tp_src); break; - case MFF_ICMP_CODE: + case MFF_ICMPV4_CODE: + case MFF_ICMPV6_CODE: value->u8 = ntohs(flow->tp_dst); break; @@ -874,33 +1038,17 @@ mf_set_value(const struct mf_field *mf, case MFF_TUN_ID: cls_rule_set_tun_id(rule, value->be64); break; + case MFF_METADATA: + cls_rule_set_metadata(rule, value->be64); + break; case MFF_IN_PORT: cls_rule_set_in_port(rule, ntohs(value->be16)); break; -#if FLOW_N_REGS > 0 - case MFF_REG0: -#endif -#if FLOW_N_REGS > 1 - case MFF_REG1: -#endif -#if FLOW_N_REGS > 2 - case MFF_REG2: -#endif -#if FLOW_N_REGS > 3 - case MFF_REG3: -#endif -#if FLOW_N_REGS > 4 - case MFF_REG4: -#endif -#if FLOW_N_REGS > 5 -#error -#endif -#if FLOW_N_REGS > 0 + CASE_MFF_REGS: cls_rule_set_reg(rule, mf->id - MFF_REG0, ntohl(value->be32)); break; -#endif case MFF_ETH_SRC: cls_rule_set_dl_src(rule, value->mac); @@ -950,12 +1098,20 @@ mf_set_value(const struct mf_field *mf, cls_rule_set_nw_proto(rule, value->u8); break; - case MFF_IP_TOS: - cls_rule_set_nw_tos(rule, value->u8); + case MFF_IP_DSCP: + cls_rule_set_nw_dscp(rule, value->u8); + break; + + case MFF_IP_ECN: + cls_rule_set_nw_ecn(rule, value->u8); + break; + + case MFF_IP_TTL: + cls_rule_set_nw_ttl(rule, value->u8); break; case MFF_IP_FRAG: - cls_rule_set_frag(rule, value->u8); + cls_rule_set_nw_frag(rule, value->u8); break; case MFF_ARP_OP: @@ -981,31 +1137,168 @@ mf_set_value(const struct mf_field *mf, break; case MFF_TCP_SRC: + case MFF_UDP_SRC: cls_rule_set_tp_src(rule, value->be16); break; case MFF_TCP_DST: + case MFF_UDP_DST: cls_rule_set_tp_dst(rule, value->be16); break; + case MFF_ICMPV4_TYPE: + case MFF_ICMPV6_TYPE: + cls_rule_set_icmp_type(rule, value->u8); + break; + + case MFF_ICMPV4_CODE: + case MFF_ICMPV6_CODE: + cls_rule_set_icmp_code(rule, value->u8); + break; + + case MFF_ND_TARGET: + cls_rule_set_nd_target(rule, &value->ipv6); + break; + + case MFF_N_IDS: + default: + NOT_REACHED(); + } +} + +/* Makes 'rule' match field 'mf' exactly, with the value matched taken from + * 'value'. The caller is responsible for ensuring that 'rule' meets 'mf''s + * prerequisites. */ +void +mf_set_flow_value(const struct mf_field *mf, + const union mf_value *value, struct flow *flow) +{ + switch (mf->id) { + case MFF_TUN_ID: + flow->tun_id = value->be64; + break; + case MFF_METADATA: + flow->metadata = value->be64; + break; + + case MFF_IN_PORT: + flow->in_port = ntohs(value->be16); + break; + + CASE_MFF_REGS: + flow->regs[mf->id - MFF_REG0] = ntohl(value->be32); + break; + + case MFF_ETH_SRC: + memcpy(flow->dl_src, value->mac, ETH_ADDR_LEN); + break; + + case MFF_ETH_DST: + memcpy(flow->dl_dst, value->mac, ETH_ADDR_LEN); + break; + + case MFF_ETH_TYPE: + flow->dl_type = value->be16; + break; + + case MFF_VLAN_TCI: + flow->vlan_tci = value->be16; + break; + + case MFF_VLAN_VID: + flow_set_vlan_vid(flow, value->be16); + break; + + case MFF_VLAN_PCP: + flow_set_vlan_pcp(flow, value->u8); + break; + + case MFF_IPV4_SRC: + flow->nw_src = value->be32; + break; + + case MFF_IPV4_DST: + flow->nw_dst = value->be32; + break; + + case MFF_IPV6_SRC: + flow->ipv6_src = value->ipv6; + break; + + case MFF_IPV6_DST: + flow->ipv6_dst = value->ipv6; + break; + + case MFF_IPV6_LABEL: + flow->ipv6_label = value->be32 & ~htonl(IPV6_LABEL_MASK); + break; + + case MFF_IP_PROTO: + flow->nw_proto = value->u8; + break; + + case MFF_IP_DSCP: + flow->nw_tos &= ~IP_DSCP_MASK; + flow->nw_tos |= value->u8 & IP_DSCP_MASK; + break; + + case MFF_IP_ECN: + flow->nw_tos &= ~IP_ECN_MASK; + flow->nw_tos |= value->u8 & IP_ECN_MASK; + break; + + case MFF_IP_TTL: + flow->nw_ttl = value->u8; + break; + + case MFF_IP_FRAG: + flow->nw_frag &= value->u8; + break; + + case MFF_ARP_OP: + flow->nw_proto = ntohs(value->be16); + break; + + case MFF_ARP_SPA: + flow->nw_src = value->be32; + break; + + case MFF_ARP_TPA: + flow->nw_dst = value->be32; + break; + + case MFF_ARP_SHA: + case MFF_ND_SLL: + memcpy(flow->arp_sha, value->mac, ETH_ADDR_LEN); + break; + + case MFF_ARP_THA: + case MFF_ND_TLL: + memcpy(flow->arp_tha, value->mac, ETH_ADDR_LEN); + break; + + case MFF_TCP_SRC: case MFF_UDP_SRC: - cls_rule_set_tp_src(rule, value->be16); + flow->tp_src = value->be16; break; + case MFF_TCP_DST: case MFF_UDP_DST: - cls_rule_set_tp_dst(rule, value->be16); + flow->tp_dst = value->be16; break; - case MFF_ICMP_TYPE: - cls_rule_set_icmp_type(rule, value->u8); + case MFF_ICMPV4_TYPE: + case MFF_ICMPV6_TYPE: + flow->tp_src = htons(value->u8); break; - case MFF_ICMP_CODE: - cls_rule_set_icmp_code(rule, value->u8); + case MFF_ICMPV4_CODE: + case MFF_ICMPV6_CODE: + flow->tp_dst = htons(value->u8); break; case MFF_ND_TARGET: - cls_rule_set_nd_target(rule, &value->ipv6); + flow->nd_target = value->ipv6; break; case MFF_N_IDS: @@ -1014,6 +1307,19 @@ mf_set_value(const struct mf_field *mf, } } +/* Returns true if 'mf' has a zero value in 'flow', false if it is nonzero. + * + * The caller is responsible for ensuring that 'flow' meets 'mf''s + * prerequisites. */ +bool +mf_is_zero(const struct mf_field *mf, const struct flow *flow) +{ + union mf_value value; + + mf_get_value(mf, flow, &value); + return is_all_zeros((const uint8_t *) &value, mf->n_bytes); +} + /* Makes 'rule' wildcard field 'mf'. * * The caller is responsible for ensuring that 'rule' meets 'mf''s @@ -1025,49 +1331,26 @@ mf_set_wild(const struct mf_field *mf, struct cls_rule *rule) case MFF_TUN_ID: cls_rule_set_tun_id_masked(rule, htonll(0), htonll(0)); break; + case MFF_METADATA: + cls_rule_set_metadata_masked(rule, htonll(0), htonll(0)); case MFF_IN_PORT: rule->wc.wildcards |= FWW_IN_PORT; rule->flow.in_port = 0; break; -#if FLOW_N_REGS > 0 - case MFF_REG0: - cls_rule_set_reg_masked(rule, 0, 0, 0); - break; -#endif -#if FLOW_N_REGS > 1 - case MFF_REG1: - cls_rule_set_reg_masked(rule, 1, 0, 0); - break; -#endif -#if FLOW_N_REGS > 2 - case MFF_REG2: - cls_rule_set_reg_masked(rule, 2, 0, 0); - break; -#endif -#if FLOW_N_REGS > 3 - case MFF_REG3: - cls_rule_set_reg_masked(rule, 3, 0, 0); + CASE_MFF_REGS: + cls_rule_set_reg_masked(rule, mf->id - MFF_REG0, 0, 0); break; -#endif -#if FLOW_N_REGS > 4 - case MFF_REG4: - cls_rule_set_reg_masked(rule, 4, 0, 0); - break; -#endif -#if FLOW_N_REGS > 5 -#error -#endif case MFF_ETH_SRC: - rule->wc.wildcards |= FWW_DL_SRC; - memset(rule->flow.dl_src, 0, sizeof rule->flow.dl_src); + memset(rule->flow.dl_src, 0, ETH_ADDR_LEN); + memset(rule->wc.dl_src_mask, 0, ETH_ADDR_LEN); break; case MFF_ETH_DST: - rule->wc.wildcards |= FWW_DL_DST | FWW_ETH_MCAST; - memset(rule->flow.dl_dst, 0, sizeof rule->flow.dl_dst); + memset(rule->flow.dl_dst, 0, ETH_ADDR_LEN); + memset(rule->wc.dl_dst_mask, 0, ETH_ADDR_LEN); break; case MFF_ETH_TYPE: @@ -1117,14 +1400,24 @@ mf_set_wild(const struct mf_field *mf, struct cls_rule *rule) rule->flow.nw_proto = 0; break; - case MFF_IP_TOS: - rule->wc.tos_mask |= IP_DSCP_MASK; - rule->flow.tos &= ~IP_DSCP_MASK; + case MFF_IP_DSCP: + rule->wc.wildcards |= FWW_NW_DSCP; + rule->flow.nw_tos &= ~IP_DSCP_MASK; + break; + + case MFF_IP_ECN: + rule->wc.wildcards |= FWW_NW_ECN; + rule->flow.nw_tos &= ~IP_ECN_MASK; + break; + + case MFF_IP_TTL: + rule->wc.wildcards |= FWW_NW_TTL; + rule->flow.nw_ttl = 0; break; case MFF_IP_FRAG: - rule->wc.frag_mask |= FLOW_FRAG_MASK; - rule->flow.frag &= ~FLOW_FRAG_MASK; + rule->wc.nw_frag_mask |= FLOW_NW_FRAG_MASK; + rule->flow.nw_frag &= ~FLOW_NW_FRAG_MASK; break; case MFF_ARP_OP: @@ -1146,20 +1439,22 @@ mf_set_wild(const struct mf_field *mf, struct cls_rule *rule) case MFF_TCP_SRC: case MFF_UDP_SRC: - case MFF_ICMP_TYPE: - rule->wc.wildcards |= FWW_TP_SRC; + case MFF_ICMPV4_TYPE: + case MFF_ICMPV6_TYPE: + rule->wc.tp_src_mask = htons(0); rule->flow.tp_src = htons(0); break; case MFF_TCP_DST: case MFF_UDP_DST: - case MFF_ICMP_CODE: - rule->wc.wildcards |= FWW_TP_DST; + case MFF_ICMPV4_CODE: + case MFF_ICMPV6_CODE: + rule->wc.tp_dst_mask = htons(0); rule->flow.tp_dst = htons(0); break; case MFF_ND_TARGET: - rule->wc.wildcards |= FWW_ND_TARGET; + memset(&rule->wc.nd_target_mask, 0, sizeof rule->wc.nd_target_mask); memset(&rule->flow.nd_target, 0, sizeof rule->flow.nd_target); break; @@ -1195,23 +1490,21 @@ mf_set(const struct mf_field *mf, switch (mf->id) { case MFF_IN_PORT: - case MFF_ETH_SRC: case MFF_ETH_TYPE: case MFF_VLAN_VID: case MFF_VLAN_PCP: case MFF_IPV6_LABEL: case MFF_IP_PROTO: - case MFF_IP_TOS: + case MFF_IP_TTL: + case MFF_IP_DSCP: + case MFF_IP_ECN: case MFF_ARP_OP: case MFF_ARP_SHA: case MFF_ARP_THA: - case MFF_TCP_SRC: - case MFF_TCP_DST: - case MFF_UDP_SRC: - case MFF_UDP_DST: - case MFF_ICMP_TYPE: - case MFF_ICMP_CODE: - case MFF_ND_TARGET: + case MFF_ICMPV4_TYPE: + case MFF_ICMPV4_CODE: + case MFF_ICMPV6_TYPE: + case MFF_ICMPV6_CODE: case MFF_ND_SLL: case MFF_ND_TLL: NOT_REACHED(); @@ -1219,33 +1512,21 @@ mf_set(const struct mf_field *mf, case MFF_TUN_ID: cls_rule_set_tun_id_masked(rule, value->be64, mask->be64); break; + case MFF_METADATA: + cls_rule_set_metadata_masked(rule, value->be64, mask->be64); + break; -#if FLOW_N_REGS > 0 - case MFF_REG0: -#endif -#if FLOW_N_REGS > 1 - case MFF_REG1: -#endif -#if FLOW_N_REGS > 2 - case MFF_REG2: -#endif -#if FLOW_N_REGS > 3 - case MFF_REG3: -#endif -#if FLOW_N_REGS > 4 - case MFF_REG4: -#endif -#if FLOW_N_REGS > 5 -#error -#endif + CASE_MFF_REGS: cls_rule_set_reg_masked(rule, mf->id - MFF_REG0, ntohl(value->be32), ntohl(mask->be32)); break; case MFF_ETH_DST: - if (flow_wildcards_is_dl_dst_mask_valid(mask->mac)) { - cls_rule_set_dl_dst_masked(rule, value->mac, mask->mac); - } + cls_rule_set_dl_dst_masked(rule, value->mac, mask->mac); + break; + + case MFF_ETH_SRC: + cls_rule_set_dl_src_masked(rule, value->mac, mask->mac); break; case MFF_VLAN_TCI: @@ -1268,8 +1549,12 @@ mf_set(const struct mf_field *mf, cls_rule_set_ipv6_dst_masked(rule, &value->ipv6, &mask->ipv6); break; + case MFF_ND_TARGET: + cls_rule_set_nd_target_masked(rule, &value->ipv6, &mask->ipv6); + break; + case MFF_IP_FRAG: - cls_rule_set_frag_masked(rule, value->u8, mask->u8); + cls_rule_set_nw_frag_masked(rule, value->u8, mask->u8); break; case MFF_ARP_SPA: @@ -1280,83 +1565,69 @@ mf_set(const struct mf_field *mf, cls_rule_set_nw_dst_masked(rule, value->be32, mask->be32); break; + case MFF_TCP_SRC: + case MFF_UDP_SRC: + cls_rule_set_tp_src_masked(rule, value->be16, mask->be16); + break; + + case MFF_TCP_DST: + case MFF_UDP_DST: + cls_rule_set_tp_dst_masked(rule, value->be16, mask->be16); + break; + case MFF_N_IDS: default: NOT_REACHED(); } } -/* Makes a subfield starting at bit offset 'ofs' and continuing for 'n_bits' in - * 'rule''s field 'mf' exactly match the 'n_bits' least-significant bits of - * 'x'. - * - * Example: suppose that 'mf' is originally the following 2-byte field in - * 'rule': - * - * value == 0xe00a == 2#1110000000001010 - * mask == 0xfc3f == 2#1111110000111111 - * - * The call mf_set_subfield(mf, 0x55, 8, 7, rule) would have the following - * effect (note that 0x55 is 2#1010101): - * - * value == 0xd50a == 2#1101010100001010 - * mask == 0xff3f == 2#1111111100111111 - * - * The caller is responsible for ensuring that the result will be a valid - * wildcard pattern for 'mf'. The caller is responsible for ensuring that - * 'rule' meets 'mf''s prerequisites. */ -void -mf_set_subfield(const struct mf_field *mf, uint64_t x, unsigned int ofs, - unsigned int n_bits, struct cls_rule *rule) +static enum ofperr +mf_check__(const struct mf_subfield *sf, const struct flow *flow, + const char *type) { - if (ofs == 0 && mf->n_bytes * 8 == n_bits) { - union mf_value value; - int i; - - for (i = mf->n_bytes - 1; i >= 0; i--) { - ((uint8_t *) &value)[i] = x; - x >>= 8; - } - mf_set_value(mf, &value, rule); + if (!sf->field) { + VLOG_WARN_RL(&rl, "unknown %s field", type); + } else if (!sf->n_bits) { + VLOG_WARN_RL(&rl, "zero bit %s field %s", type, sf->field->name); + } else if (sf->ofs >= sf->field->n_bits) { + VLOG_WARN_RL(&rl, "bit offset %d exceeds %d-bit width of %s field %s", + sf->ofs, sf->field->n_bits, type, sf->field->name); + } else if (sf->ofs + sf->n_bits > sf->field->n_bits) { + VLOG_WARN_RL(&rl, "bit offset %d and width %d exceeds %d-bit width " + "of %s field %s", sf->ofs, sf->n_bits, + sf->field->n_bits, type, sf->field->name); + } else if (flow && !mf_are_prereqs_ok(sf->field, flow)) { + VLOG_WARN_RL(&rl, "%s field %s lacks correct prerequisites", + type, sf->field->name); } else { - union mf_value value, mask; - uint8_t *vp, *mp; - unsigned int byte_ofs; - - mf_get(mf, rule, &value, &mask); - - byte_ofs = mf->n_bytes - ofs / 8; - vp = &((uint8_t *) &value)[byte_ofs]; - mp = &((uint8_t *) &mask)[byte_ofs]; - if (ofs % 8) { - unsigned int chunk = MIN(8 - ofs % 8, n_bits); - uint8_t chunk_mask = ((1 << chunk) - 1) << (ofs % 8); - - *--vp &= ~chunk_mask; - *vp |= chunk_mask & (x << (ofs % 8)); - *--mp |= chunk_mask; - - x >>= chunk; - n_bits -= chunk; - ofs += chunk; - } - while (n_bits >= 8) { - *--vp = x; - *--mp = 0xff; - x >>= 8; - n_bits -= 8; - ofs += 8; - } - if (n_bits) { - uint8_t chunk_mask = (1 << n_bits) - 1; + return 0; + } - *--vp &= ~chunk_mask; - *vp |= chunk_mask & x; - *--mp |= chunk_mask; - } + return OFPERR_OFPBAC_BAD_ARGUMENT; +} + +/* Checks whether 'sf' is valid for reading a subfield out of 'flow'. Returns + * 0 if so, otherwise an OpenFlow error code (e.g. as returned by + * ofp_mkerr()). */ +enum ofperr +mf_check_src(const struct mf_subfield *sf, const struct flow *flow) +{ + return mf_check__(sf, flow, "source"); +} - mf_set(mf, &value, &mask, rule); +/* Checks whether 'sf' is valid for writing a subfield into 'flow'. Returns 0 + * if so, otherwise an OpenFlow error code (e.g. as returned by + * ofp_mkerr()). */ +enum ofperr +mf_check_dst(const struct mf_subfield *sf, const struct flow *flow) +{ + int error = mf_check__(sf, flow, "destination"); + if (!error && !sf->field->writable) { + VLOG_WARN_RL(&rl, "destination field %s is not writable", + sf->field->name); + return OFPERR_OFPBAC_BAD_ARGUMENT; } + return error; } /* Copies the value and wildcard bit pattern for 'mf' from 'rule' into the @@ -1377,25 +1648,9 @@ mf_random_value(const struct mf_field *mf, union mf_value *value) switch (mf->id) { case MFF_TUN_ID: + case MFF_METADATA: case MFF_IN_PORT: -#if FLOW_N_REGS > 0 - case MFF_REG0: -#endif -#if FLOW_N_REGS > 1 - case MFF_REG1: -#endif -#if FLOW_N_REGS > 2 - case MFF_REG2: -#endif -#if FLOW_N_REGS > 3 - case MFF_REG3: -#endif -#if FLOW_N_REGS > 4 - case MFF_REG4: -#endif -#if FLOW_N_REGS > 5 -#error -#endif + CASE_MFF_REGS: case MFF_ETH_SRC: case MFF_ETH_DST: case MFF_ETH_TYPE: @@ -1405,6 +1660,7 @@ mf_random_value(const struct mf_field *mf, union mf_value *value) case MFF_IPV6_SRC: case MFF_IPV6_DST: case MFF_IP_PROTO: + case MFF_IP_TTL: case MFF_ARP_SPA: case MFF_ARP_TPA: case MFF_ARP_SHA: @@ -1413,8 +1669,10 @@ mf_random_value(const struct mf_field *mf, union mf_value *value) case MFF_TCP_DST: case MFF_UDP_SRC: case MFF_UDP_DST: - case MFF_ICMP_TYPE: - case MFF_ICMP_CODE: + case MFF_ICMPV4_TYPE: + case MFF_ICMPV4_CODE: + case MFF_ICMPV6_TYPE: + case MFF_ICMPV6_CODE: case MFF_ND_TARGET: case MFF_ND_SLL: case MFF_ND_TLL: @@ -1424,12 +1682,16 @@ mf_random_value(const struct mf_field *mf, union mf_value *value) value->be32 &= ~htonl(IPV6_LABEL_MASK); break; - case MFF_IP_TOS: - value->u8 &= ~0x03; + case MFF_IP_DSCP: + value->u8 &= IP_DSCP_MASK; + break; + + case MFF_IP_ECN: + value->u8 &= IP_ECN_MASK; break; case MFF_IP_FRAG: - value->u8 &= FLOW_FRAG_MASK; + value->u8 &= FLOW_NW_FRAG_MASK; break; case MFF_ARP_OP: @@ -1563,12 +1825,14 @@ mf_from_ipv6_string(const struct mf_field *mf, const char *s, netmask = strtok_r(NULL, "/", &save_ptr); if (netmask) { - int prefix = atoi(netmask); - if (prefix <= 0 || prefix > 128) { - free(str); - return xasprintf("%s: prefix bits not between 1 and 128", s); - } else { - *mask = ipv6_create_mask(prefix); + if (inet_pton(AF_INET6, netmask, mask) != 1) { + int prefix = atoi(netmask); + if (prefix <= 0 || prefix > 128) { + free(str); + return xasprintf("%s: prefix bits not between 1 and 128", s); + } else { + *mask = ipv6_create_mask(prefix); + } } } else { *mask = in6addr_exact; @@ -1602,8 +1866,8 @@ struct frag_handling { }; static const struct frag_handling all_frags[] = { -#define A FLOW_FRAG_ANY -#define L FLOW_FRAG_LATER +#define A FLOW_NW_FRAG_ANY +#define L FLOW_NW_FRAG_LATER /* name mask value */ { "no", A|L, 0 }, @@ -1628,7 +1892,7 @@ mf_from_frag_string(const char *s, uint8_t *valuep, uint8_t *maskp) if (!strcasecmp(s, h->name)) { /* We force the upper bits of the mask on to make mf_parse_value() * happy (otherwise it will never think it's an exact match.) */ - *maskp = h->mask | ~FLOW_FRAG_MASK; + *maskp = h->mask | ~FLOW_NW_FRAG_MASK; *valuep = h->value; return NULL; } @@ -1736,7 +2000,7 @@ mf_format_frag_string(const uint8_t *valuep, const uint8_t *maskp, uint8_t mask = *maskp; value &= mask; - mask &= FLOW_FRAG_MASK; + mask &= FLOW_NW_FRAG_MASK; for (h = all_frags; h < &all_frags[ARRAY_SIZE(all_frags)]; h++) { if (value == h->value && mask == h->mask) { @@ -1776,10 +2040,7 @@ mf_format(const struct mf_field *mf, break; case MFS_ETHERNET: - ds_put_format(s, ETH_ADDR_FMT, ETH_ADDR_ARGS(value->mac)); - if (mask) { - ds_put_format(s, "/"ETH_ADDR_FMT, ETH_ADDR_ARGS(mask->mac)); - } + eth_format_masked(value->mac, mask->mac, s); break; case MFS_IPV4: @@ -1799,3 +2060,186 @@ mf_format(const struct mf_field *mf, NOT_REACHED(); } } + +/* Makes subfield 'sf' within 'rule' exactly match the 'sf->n_bits' + * least-significant bits in 'x'. + */ +void +mf_write_subfield(const struct mf_subfield *sf, const union mf_subvalue *x, + struct cls_rule *rule) +{ + const struct mf_field *field = sf->field; + union mf_value value, mask; + + mf_get(field, rule, &value, &mask); + bitwise_copy(x, sizeof *x, 0, &value, field->n_bytes, sf->ofs, sf->n_bits); + bitwise_one ( &mask, field->n_bytes, sf->ofs, sf->n_bits); + mf_set(field, &value, &mask, rule); +} + +/* Initializes 'x' to the value of 'sf' within 'flow'. 'sf' must be valid for + * reading 'flow', e.g. as checked by mf_check_src(). */ +void +mf_read_subfield(const struct mf_subfield *sf, const struct flow *flow, + union mf_subvalue *x) +{ + union mf_value value; + + mf_get_value(sf->field, flow, &value); + + memset(x, 0, sizeof *x); + bitwise_copy(&value, sf->field->n_bytes, sf->ofs, + x, sizeof *x, 0, + sf->n_bits); +} + +/* Returns the value of 'sf' within 'flow'. 'sf' must be valid for reading + * 'flow', e.g. as checked by mf_check_src() and sf->n_bits must be 64 or + * less. */ +uint64_t +mf_get_subfield(const struct mf_subfield *sf, const struct flow *flow) +{ + union mf_value value; + + mf_get_value(sf->field, flow, &value); + return bitwise_get(&value, sf->field->n_bytes, sf->ofs, sf->n_bits); +} + +/* Formats 'sf' into 's' in a format normally acceptable to + * mf_parse_subfield(). (It won't be acceptable if sf->field is NULL or if + * sf->field has no NXM name.) */ +void +mf_format_subfield(const struct mf_subfield *sf, struct ds *s) +{ + if (!sf->field) { + ds_put_cstr(s, ""); + } else if (sf->field->nxm_name) { + ds_put_cstr(s, sf->field->nxm_name); + } else if (sf->field->nxm_header) { + uint32_t header = sf->field->nxm_header; + ds_put_format(s, "%d:%d", NXM_VENDOR(header), NXM_FIELD(header)); + } else { + ds_put_cstr(s, sf->field->name); + } + + if (sf->field && sf->ofs == 0 && sf->n_bits == sf->field->n_bits) { + ds_put_cstr(s, "[]"); + } else if (sf->n_bits == 1) { + ds_put_format(s, "[%d]", sf->ofs); + } else { + ds_put_format(s, "[%d..%d]", sf->ofs, sf->ofs + sf->n_bits - 1); + } +} + +static const struct mf_field * +mf_parse_subfield_name(const char *name, int name_len, bool *wild) +{ + int i; + + *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') { + return mf; + } + if (mf->oxm_name + && !strncmp(mf->oxm_name, name, name_len) + && mf->oxm_name[name_len] == '\0') { + return mf; + } + } + + return NULL; +} + +/* Parses a subfield from the beginning of '*sp' into 'sf'. If successful, + * returns NULL and advances '*sp' to the first byte following the parsed + * string. On failure, returns a malloc()'d error message, does not modify + * '*sp', and does not properly initialize 'sf'. + * + * The syntax parsed from '*sp' takes the form "header[start..end]" where + * 'header' is the name of an NXM field and 'start' and 'end' are (inclusive) + * bit indexes. "..end" may be omitted to indicate a single bit. "start..end" + * may both be omitted (the [] are still required) to indicate an entire + * field. */ +char * +mf_parse_subfield__(struct mf_subfield *sf, const char **sp) +{ + const struct mf_field *field; + const char *name; + int start, end; + const char *s; + int name_len; + bool wild; + + s = *sp; + name = s; + name_len = strcspn(s, "["); + if (s[name_len] != '[') { + return xasprintf("%s: missing [ looking for field name", *sp); + } + + field = mf_parse_subfield_name(name, name_len, &wild); + if (!field) { + return xasprintf("%s: unknown field `%.*s'", *sp, name_len, s); + } + + 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 = field->n_bits - 1; + } else { + return xasprintf("%s: syntax error expecting [] or [] or " + "[..]", *sp); + } + s = strchr(s, ']') + 1; + + if (start > end) { + return xasprintf("%s: starting bit %d is after ending bit %d", + *sp, start, end); + } else if (start >= field->n_bits) { + return xasprintf("%s: starting bit %d is not valid because field is " + "only %d bits wide", *sp, start, field->n_bits); + } else if (end >= field->n_bits){ + return xasprintf("%s: ending bit %d is not valid because field is " + "only %d bits wide", *sp, end, field->n_bits); + } + + sf->field = field; + sf->ofs = start; + sf->n_bits = end - start + 1; + + *sp = s; + return NULL; +} + +/* Parses a subfield from the beginning of 's' into 'sf'. Returns the first + * byte in 's' following the parsed string. + * + * Exits with an error message if 's' has incorrect syntax. + * + * The syntax parsed from 's' takes the form "header[start..end]" where + * 'header' is the name of an NXM field and 'start' and 'end' are (inclusive) + * bit indexes. "..end" may be omitted to indicate a single bit. "start..end" + * may both be omitted (the [] are still required) to indicate an entire + * field. */ +const char * +mf_parse_subfield(struct mf_subfield *sf, const char *s) +{ + char *msg = mf_parse_subfield__(sf, &s); + if (msg) { + ovs_fatal(0, "%s", msg); + } + return s; +}