X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fmeta-flow.c;h=8b60b35f11ee0368b5b7b129ab618f0cdff508b2;hb=d58c5bc2d854ce601338d0785c8086d619a16135;hp=41cbf4944d6f7c7337488d5d11c499ba79d8307f;hpb=28da1f8f725fc2a797174df18a7b3e31ef49ede0;p=openvswitch diff --git a/lib/meta-flow.c b/lib/meta-flow.c index 41cbf494..8b60b35f 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, \ @@ -50,6 +54,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_NONE, true, NXM_NX_TUN_ID, "NXM_NX_TUN_ID", + 0, NULL, }, { MFF_IN_PORT, "in_port", NULL, MF_FIELD_SIZES(be16), @@ -58,6 +63,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_NONE, false, NXM_OF_IN_PORT, "NXM_OF_IN_PORT", + OXM_OF_IN_PORT, "OXM_OF_IN_PORT", }, #define REGISTER(IDX) \ @@ -69,7 +75,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_NONE, \ true, \ NXM_NX_REG(IDX), \ - "NXM_NX_REG" #IDX \ + "NXM_NX_REG" #IDX, \ + 0, NULL, \ } #if FLOW_N_REGS > 0 REGISTER(0), @@ -87,6 +94,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 @@ -102,6 +118,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_NONE, 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), @@ -110,6 +127,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_NONE, 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), @@ -118,6 +136,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_NONE, false, NXM_OF_ETH_TYPE, "NXM_OF_ETH_TYPE", + OXM_OF_ETH_TYPE, "OXM_OF_ETH_TYPE", }, { @@ -128,6 +147,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_NONE, true, NXM_OF_VLAN_TCI, "NXM_OF_VLAN_TCI", + 0, NULL, }, { MFF_VLAN_VID, "dl_vlan", NULL, sizeof(ovs_be16), 12, @@ -135,7 +155,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFS_DECIMAL, MFP_NONE, true, - 0, NULL + 0, NULL, + OXM_OF_VLAN_VID, "OXM_OF_VLAN_VID", }, { MFF_VLAN_PCP, "dl_vlan_pcp", NULL, 1, 3, @@ -143,7 +164,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFS_DECIMAL, MFP_NONE, true, - 0, NULL + 0, NULL, + OXM_OF_VLAN_PCP, "OXM_OF_VLAN_PCP", }, /* ## -- ## */ @@ -158,6 +180,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_IPV4, 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), @@ -166,6 +189,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_IPV4, true, NXM_OF_IP_DST, "NXM_OF_IP_DST", + OXM_OF_IPV4_DST, "OXM_OF_IPV4_DST", }, { @@ -176,6 +200,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_IPV6, 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), @@ -184,6 +209,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_IPV6, true, NXM_NX_IPV6_DST, "NXM_NX_IPV6_DST", + OXM_OF_IPV6_DST, "OXM_OF_IPV6_DST", }, { MFF_IPV6_LABEL, "ipv6_label", NULL, @@ -193,6 +219,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_IPV6, false, NXM_NX_IPV6_LABEL, "NXM_NX_IPV6_LABEL", + OXM_OF_IPV6_FLABEL, "OXM_OF_IPV6_FLABEL", }, { @@ -203,6 +230,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_IP_ANY, false, NXM_OF_IP_PROTO, "NXM_OF_IP_PROTO", + OXM_OF_IP_PROTO, "OXM_OF_IP_PROTO", }, { MFF_IP_DSCP, "nw_tos", NULL, MF_FIELD_SIZES(u8), @@ -210,7 +238,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFS_DECIMAL, MFP_IP_ANY, true, - NXM_OF_IP_TOS, "NXM_OF_IP_TOS" + NXM_OF_IP_TOS, "NXM_OF_IP_TOS", + OXM_OF_IP_DSCP, "OXM_OF_IP_DSCP", }, { MFF_IP_ECN, "nw_ecn", NULL, 1, 2, @@ -219,6 +248,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { 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), @@ -226,7 +256,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFS_DECIMAL, MFP_IP_ANY, true, - NXM_NX_IP_TTL, "NXM_NX_IP_TTL" + NXM_NX_IP_TTL, "NXM_NX_IP_TTL", + 0, NULL, }, { MFF_IP_FRAG, "ip_frag", NULL, 1, 2, @@ -234,7 +265,8 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFS_FRAG, MFP_IP_ANY, false, - NXM_NX_IP_FRAG, "NXM_NX_IP_FRAG" + NXM_NX_IP_FRAG, "NXM_NX_IP_FRAG", + 0, NULL, }, { @@ -245,6 +277,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_ARP, 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), @@ -253,6 +286,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_ARP, 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), @@ -261,6 +295,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_ARP, 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), @@ -269,6 +304,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_ARP, 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), @@ -277,6 +313,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_ARP, false, NXM_NX_ARP_THA, "NXM_NX_ARP_THA", + OXM_OF_ARP_THA, "OXM_OF_ARP_THA", }, /* ## -- ## */ @@ -286,73 +323,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, 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, 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, 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, true, NXM_OF_UDP_DST, "NXM_OF_UDP_DST", + OXM_OF_UDP_DST, "OXM_OF_UDP_DST", }, { MFF_ICMPV4_TYPE, "icmp_type", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, FWW_TP_SRC, + MFM_NONE, 0, MFS_DECIMAL, MFP_ICMPV4, false, NXM_OF_ICMP_TYPE, "NXM_OF_ICMP_TYPE", + OXM_OF_ICMPV4_TYPE, "OXM_OF_ICMPV4_TYPE", }, { MFF_ICMPV4_CODE, "icmp_code", NULL, MF_FIELD_SIZES(u8), - MFM_NONE, FWW_TP_DST, + MFM_NONE, 0, MFS_DECIMAL, 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, FWW_TP_SRC, + 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, FWW_TP_DST, + MFM_NONE, 0, MFS_DECIMAL, MFP_ICMPV6, false, NXM_NX_ICMPV6_CODE, "NXM_NX_ICMPV6_CODE", + OXM_OF_ICMPV6_CODE, "OXM_OF_ICMPV6_CODE", }, /* ## ---- ## */ @@ -362,11 +407,12 @@ 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_CIDR, 0, MFS_IPV6, MFP_ND, 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), @@ -375,6 +421,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_ND_SOLICIT, 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), @@ -383,6 +430,7 @@ static const struct mf_field mf_fields[MFF_N_IDS] = { MFP_ND_ADVERT, false, NXM_NX_ND_TLL, "NXM_NX_ND_TLL", + OXM_OF_IPV6_ND_TLL, "OXM_OF_IPV6_ND_TLL", } }; @@ -394,6 +442,10 @@ struct nxm_field { static struct hmap all_nxm_fields = HMAP_INITIALIZER(&all_nxm_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); + /* Returns the field with the given 'id'. */ const struct mf_field * mf_from_id(enum mf_field_id id) @@ -501,15 +553,6 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) 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_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: assert(mf->fww_bit != 0); @@ -534,6 +577,15 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) case MFF_REG4: #endif #if FLOW_N_REGS > 5 + case MFF_REG5: +#endif +#if FLOW_N_REGS > 6 + case MFF_REG6: +#endif +#if FLOW_N_REGS > 7 + case MFF_REG7: +#endif +#if FLOW_N_REGS > 8 #error #endif return !wc->reg_masks[mf->id - MFF_REG0]; @@ -559,6 +611,9 @@ 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_ND_TARGET: + return ipv6_mask_is_any(&wc->nd_target_mask); + case MFF_IP_FRAG: return !(wc->nw_frag_mask & FLOW_NW_FRAG_MASK); @@ -567,6 +622,17 @@ mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc) 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(); @@ -595,15 +661,6 @@ mf_get_mask(const struct mf_field *mf, const struct flow_wildcards *wc, 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_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: assert(mf->fww_bit != 0); @@ -630,6 +687,15 @@ mf_get_mask(const struct mf_field *mf, const struct flow_wildcards *wc, case MFF_REG4: #endif #if FLOW_N_REGS > 5 + case MFF_REG5: +#endif +#if FLOW_N_REGS > 6 + case MFF_REG6: +#endif +#if FLOW_N_REGS > 7 + case MFF_REG7: +#endif +#if FLOW_N_REGS > 8 #error #endif mask->be32 = htonl(wc->reg_masks[mf->id - MFF_REG0]); @@ -664,6 +730,10 @@ mf_get_mask(const struct mf_field *mf, const struct flow_wildcards *wc, mask->ipv6 = wc->ipv6_dst_mask; break; + case MFF_ND_TARGET: + mask->ipv6 = wc->nd_target_mask; + break; + case MFF_IP_FRAG: mask->u8 = wc->nw_frag_mask & FLOW_NW_FRAG_MASK; break; @@ -675,6 +745,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(); @@ -803,6 +891,15 @@ mf_is_value_valid(const struct mf_field *mf, const union mf_value *value) case MFF_REG4: #endif #if FLOW_N_REGS > 5 + case MFF_REG5: +#endif +#if FLOW_N_REGS > 6 + case MFF_REG6: +#endif +#if FLOW_N_REGS > 7 + case MFF_REG7: +#endif +#if FLOW_N_REGS > 8 #error #endif case MFF_ETH_SRC: @@ -888,6 +985,15 @@ mf_get_value(const struct mf_field *mf, const struct flow *flow, case MFF_REG4: #endif #if FLOW_N_REGS > 5 + case MFF_REG5: +#endif +#if FLOW_N_REGS > 6 + case MFF_REG6: +#endif +#if FLOW_N_REGS > 7 + case MFF_REG7: +#endif +#if FLOW_N_REGS > 8 #error #endif value->be32 = htonl(flow->regs[mf->id - MFF_REG0]); @@ -1047,6 +1153,15 @@ mf_set_value(const struct mf_field *mf, case MFF_REG4: #endif #if FLOW_N_REGS > 5 + case MFF_REG5: +#endif +#if FLOW_N_REGS > 6 + case MFF_REG6: +#endif +#if FLOW_N_REGS > 7 + case MFF_REG7: +#endif +#if FLOW_N_REGS > 8 #error #endif #if FLOW_N_REGS > 0 @@ -1208,6 +1323,15 @@ mf_set_flow_value(const struct mf_field *mf, case MFF_REG4: #endif #if FLOW_N_REGS > 5 + case MFF_REG5: +#endif +#if FLOW_N_REGS > 6 + case MFF_REG6: +#endif +#if FLOW_N_REGS > 7 + case MFF_REG7: +#endif +#if FLOW_N_REGS > 8 #error #endif #if FLOW_N_REGS > 0 @@ -1220,7 +1344,7 @@ mf_set_flow_value(const struct mf_field *mf, break; case MFF_ETH_DST: - memcpy(flow->dl_src, value->mac, ETH_ADDR_LEN); + memcpy(flow->dl_dst, value->mac, ETH_ADDR_LEN); break; case MFF_ETH_TYPE: @@ -1333,6 +1457,19 @@ mf_set_flow_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 @@ -1376,6 +1513,21 @@ mf_set_wild(const struct mf_field *mf, struct cls_rule *rule) break; #endif #if FLOW_N_REGS > 5 + case MFF_REG5: + cls_rule_set_reg_masked(rule, 5, 0, 0); + break; +#endif +#if FLOW_N_REGS > 6 + case MFF_REG6: + cls_rule_set_reg_masked(rule, 6, 0, 0); + break; +#endif +#if FLOW_N_REGS > 7 + case MFF_REG7: + cls_rule_set_reg_masked(rule, 7, 0, 0); + break; +#endif +#if FLOW_N_REGS > 8 #error #endif @@ -1477,7 +1629,7 @@ mf_set_wild(const struct mf_field *mf, struct cls_rule *rule) case MFF_UDP_SRC: case MFF_ICMPV4_TYPE: case MFF_ICMPV6_TYPE: - rule->wc.wildcards |= FWW_TP_SRC; + rule->wc.tp_src_mask = htons(0); rule->flow.tp_src = htons(0); break; @@ -1485,12 +1637,12 @@ mf_set_wild(const struct mf_field *mf, struct cls_rule *rule) case MFF_UDP_DST: case MFF_ICMPV4_CODE: case MFF_ICMPV6_CODE: - rule->wc.wildcards |= FWW_TP_DST; + 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; @@ -1538,15 +1690,10 @@ mf_set(const struct mf_field *mf, 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_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: NOT_REACHED(); @@ -1571,6 +1718,15 @@ mf_set(const struct mf_field *mf, case MFF_REG4: #endif #if FLOW_N_REGS > 5 + case MFF_REG5: +#endif +#if FLOW_N_REGS > 6 + case MFF_REG6: +#endif +#if FLOW_N_REGS > 7 + case MFF_REG7: +#endif +#if FLOW_N_REGS > 8 #error #endif cls_rule_set_reg_masked(rule, mf->id - MFF_REG0, @@ -1603,6 +1759,10 @@ 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_nw_frag_masked(rule, value->u8, mask->u8); break; @@ -1615,83 +1775,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; + return 0; + } - 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 OFPERR_OFPBAC_BAD_ARGUMENT; +} - *--vp &= ~chunk_mask; - *vp |= chunk_mask & x; - *--mp |= chunk_mask; - } +/* 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 @@ -1729,6 +1875,15 @@ mf_random_value(const struct mf_field *mf, union mf_value *value) case MFF_REG4: #endif #if FLOW_N_REGS > 5 + case MFF_REG5: +#endif +#if FLOW_N_REGS > 6 + case MFF_REG6: +#endif +#if FLOW_N_REGS > 7 + case MFF_REG7: +#endif +#if FLOW_N_REGS > 8 #error #endif case MFF_ETH_SRC: @@ -2141,3 +2296,261 @@ 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'. + * + * See mf_set_subfield() for an example. + * + * The difference between this function and mf_set_subfield() is that the + * latter function can only handle subfields up to 64 bits wide, whereas this + * one handles the general case. On the other hand, mf_set_subfield() is + * arguably easier to use. */ +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); +} + +/* Makes subfield 'sf' within 'rule' exactly match the 'sf->n_bits' + * least-significant bits of 'x'. + * + * Example: suppose that 'sf->field' is originally the following 2-byte field + * in 'rule': + * + * value == 0xe00a == 2#1110000000001010 + * mask == 0xfc3f == 2#1111110000111111 + * + * The call mf_set_subfield(sf, 0x55, 8, 7, rule), where sf->ofs == 8 and + * sf->n_bits == 7 would have the following effect (note that 0x55 is + * 2#1010101): + * + * value == 0xd50a == 2#1101010100001010 + * mask == 0xff3f == 2#1111111100111111 + * ^^^^^^^ affected bits + * + * The caller is responsible for ensuring that the result will be a valid + * wildcard pattern for 'sf->field'. The caller is responsible for ensuring + * that 'rule' meets 'sf->field''s prerequisites. */ +void +mf_set_subfield(const struct mf_subfield *sf, uint64_t x, + struct cls_rule *rule) +{ + const struct mf_field *field = sf->field; + unsigned int n_bits = sf->n_bits; + unsigned int ofs = sf->ofs; + + if (ofs == 0 && field->n_bytes * 8 == n_bits) { + union mf_value value; + int i; + + for (i = field->n_bytes - 1; i >= 0; i--) { + ((uint8_t *) &value)[i] = x; + x >>= 8; + } + mf_set_value(field, &value, rule); + } else { + union mf_value value, mask; + uint8_t *vp = (uint8_t *) &value; + uint8_t *mp = (uint8_t *) &mask; + + mf_get(field, rule, &value, &mask); + bitwise_put(x, vp, field->n_bytes, ofs, n_bits); + bitwise_put(UINT64_MAX, mp, field->n_bytes, ofs, n_bits); + mf_set(field, &value, &mask, rule); + } +} + +/* Similar to mf_set_subfield() but modifies only a flow, not a cls_rule. */ +void +mf_set_subfield_value(const struct mf_subfield *sf, uint64_t x, + struct flow *flow) +{ + const struct mf_field *field = sf->field; + unsigned int n_bits = sf->n_bits; + unsigned int ofs = sf->ofs; + union mf_value value; + + if (ofs == 0 && field->n_bytes * 8 == n_bits) { + int i; + + for (i = field->n_bytes - 1; i >= 0; i--) { + ((uint8_t *) &value)[i] = x; + x >>= 8; + } + mf_set_flow_value(field, &value, flow); + } else { + mf_get_value(field, flow, &value); + bitwise_put(x, &value, field->n_bytes, ofs, n_bits); + mf_set_flow_value(field, &value, flow); + } +} + +/* 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; + } + } + + 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; +}