X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=lib%2Fclassifier.c;h=088367a969233ca7c7d22f7d2d97108e5d2e628c;hb=a7d78e8d22e068a0fda8a258aac4dde1aaf1bbe0;hp=658be8086395105c7c26fffaa484c7a7e65a2e01;hpb=d31f1109f10e5ffb9bf266306b913ebf23781666;p=openvswitch diff --git a/lib/classifier.c b/lib/classifier.c index 658be808..088367a9 100644 --- a/lib/classifier.c +++ b/lib/classifier.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2009, 2010, 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. @@ -32,9 +32,6 @@ static struct cls_table *find_table(const struct classifier *, static struct cls_table *insert_table(struct classifier *, const struct flow_wildcards *); -static struct cls_table *classifier_first_table(const struct classifier *); -static struct cls_table *classifier_next_table(const struct classifier *, - const struct cls_table *); static void destroy_table(struct classifier *, struct cls_table *); static struct cls_rule *find_match(const struct cls_table *, @@ -45,7 +42,6 @@ static struct cls_rule *insert_rule(struct cls_table *, struct cls_rule *); static bool flow_equal_except(const struct flow *, const struct flow *, const struct flow_wildcards *); -static void zero_wildcards(struct flow *, const struct flow_wildcards *); /* Iterates RULE over HEAD and all of the cls_rules on HEAD->list. */ #define FOR_EACH_RULE_IN_LIST(RULE, HEAD) \ @@ -58,12 +54,6 @@ static void zero_wildcards(struct flow *, const struct flow_wildcards *); static struct cls_rule *next_rule_in_list__(struct cls_rule *); static struct cls_rule *next_rule_in_list(struct cls_rule *); -static struct cls_table * -cls_table_from_hmap_node(const struct hmap_node *node) -{ - return node ? CONTAINER_OF(node, struct cls_table, hmap_node) : NULL; -} - /* Converts the flow in 'flow' into a cls_rule in 'rule', with the given * 'wildcards' and 'priority'. */ void @@ -84,6 +74,7 @@ cls_rule_init_exact(const struct flow *flow, unsigned int priority, struct cls_rule *rule) { rule->flow = *flow; + rule->flow.skb_priority = 0; flow_wildcards_init_exact(&rule->wc); rule->priority = priority; } @@ -109,7 +100,7 @@ cls_rule_init_catchall(struct cls_rule *rule, unsigned int priority) void cls_rule_zero_wildcarded_fields(struct cls_rule *rule) { - zero_wildcards(&rule->flow, &rule->wc); + flow_zero_wildcards(&rule->flow, &rule->wc); } void @@ -127,6 +118,20 @@ cls_rule_set_reg_masked(struct cls_rule *rule, unsigned int reg_idx, rule->flow.regs[reg_idx] = value & mask; } +void +cls_rule_set_metadata(struct cls_rule *rule, ovs_be64 metadata) +{ + cls_rule_set_metadata_masked(rule, metadata, htonll(UINT64_MAX)); +} + +void +cls_rule_set_metadata_masked(struct cls_rule *rule, ovs_be64 metadata, + ovs_be64 mask) +{ + rule->wc.metadata_mask = mask; + rule->flow.metadata = metadata & mask; +} + void cls_rule_set_tun_id(struct cls_rule *rule, ovs_be64 tun_id) { @@ -142,10 +147,10 @@ cls_rule_set_tun_id_masked(struct cls_rule *rule, } void -cls_rule_set_in_port(struct cls_rule *rule, uint16_t odp_port) +cls_rule_set_in_port(struct cls_rule *rule, uint16_t ofp_port) { rule->wc.wildcards &= ~FWW_IN_PORT; - rule->flow.in_port = odp_port; + rule->flow.in_port = ofp_port; } void @@ -155,18 +160,72 @@ cls_rule_set_dl_type(struct cls_rule *rule, ovs_be16 dl_type) rule->flow.dl_type = dl_type; } +/* Modifies 'value_src' so that the Ethernet address must match + * 'value_dst' exactly. 'mask_dst' is set to all 1s */ +static void +cls_rule_set_eth(const uint8_t value_src[ETH_ADDR_LEN], + uint8_t value_dst[ETH_ADDR_LEN], + uint8_t mask_dst[ETH_ADDR_LEN]) +{ + memcpy(value_dst, value_src, ETH_ADDR_LEN); + memset(mask_dst, 0xff, ETH_ADDR_LEN); +} + +/* Modifies 'value_src' so that the Ethernet address must match + * 'value_src' after each byte is ANDed with the appropriate byte in + * 'mask_src'. 'mask_dst' is set to 'mask_src' */ +static void +cls_rule_set_eth_masked(const uint8_t value_src[ETH_ADDR_LEN], + const uint8_t mask_src[ETH_ADDR_LEN], + uint8_t value_dst[ETH_ADDR_LEN], + uint8_t mask_dst[ETH_ADDR_LEN]) +{ + size_t i; + + for (i = 0; i < ETH_ADDR_LEN; i++) { + value_dst[i] = value_src[i] & mask_src[i]; + mask_dst[i] = mask_src[i]; + } +} + +/* Modifies 'rule' so that the source Ethernet address + * must match 'dl_src' exactly. */ void cls_rule_set_dl_src(struct cls_rule *rule, const uint8_t dl_src[ETH_ADDR_LEN]) { - rule->wc.wildcards &= ~FWW_DL_SRC; - memcpy(rule->flow.dl_src, dl_src, ETH_ADDR_LEN); + cls_rule_set_eth(dl_src, rule->flow.dl_src, rule->wc.dl_src_mask); } +/* Modifies 'rule' so that the source Ethernet address + * must match 'dl_src' after each byte is ANDed with + * the appropriate byte in 'mask'. */ +void +cls_rule_set_dl_src_masked(struct cls_rule *rule, + const uint8_t dl_src[ETH_ADDR_LEN], + const uint8_t mask[ETH_ADDR_LEN]) +{ + cls_rule_set_eth_masked(dl_src, mask, + rule->flow.dl_src, rule->wc.dl_src_mask); +} + +/* Modifies 'rule' so that the destination Ethernet address + * must match 'dl_dst' exactly. */ void cls_rule_set_dl_dst(struct cls_rule *rule, const uint8_t dl_dst[ETH_ADDR_LEN]) { - rule->wc.wildcards &= ~(FWW_DL_DST | FWW_ETH_MCAST); - memcpy(rule->flow.dl_dst, dl_dst, ETH_ADDR_LEN); + cls_rule_set_eth(dl_dst, rule->flow.dl_dst, rule->wc.dl_dst_mask); +} + +/* Modifies 'rule' so that the destination Ethernet address + * must match 'dl_src' after each byte is ANDed with + * the appropriate byte in 'mask'. */ +void +cls_rule_set_dl_dst_masked(struct cls_rule *rule, + const uint8_t dl_dst[ETH_ADDR_LEN], + const uint8_t mask[ETH_ADDR_LEN]) +{ + cls_rule_set_eth_masked(dl_dst, mask, + rule->flow.dl_dst, rule->wc.dl_dst_mask); } void @@ -207,12 +266,10 @@ cls_rule_set_any_vid(struct cls_rule *rule) void cls_rule_set_dl_vlan(struct cls_rule *rule, ovs_be16 dl_vlan) { - if (dl_vlan == htons(OFP_VLAN_NONE)) { - cls_rule_set_dl_tci(rule, htons(0)); + flow_set_vlan_vid(&rule->flow, dl_vlan); + if (dl_vlan == htons(OFP10_VLAN_NONE)) { + rule->wc.vlan_tci_mask = htons(UINT16_MAX); } else { - dl_vlan &= htons(VLAN_VID_MASK); - rule->flow.vlan_tci &= ~htons(VLAN_VID_MASK); - rule->flow.vlan_tci |= htons(VLAN_CFI) | dl_vlan; rule->wc.vlan_tci_mask |= htons(VLAN_VID_MASK | VLAN_CFI); } } @@ -236,24 +293,34 @@ cls_rule_set_any_pcp(struct cls_rule *rule) void cls_rule_set_dl_vlan_pcp(struct cls_rule *rule, uint8_t dl_vlan_pcp) { - dl_vlan_pcp &= 0x07; - rule->flow.vlan_tci &= ~htons(VLAN_PCP_MASK); - rule->flow.vlan_tci |= htons((dl_vlan_pcp << VLAN_PCP_SHIFT) | VLAN_CFI); + flow_set_vlan_pcp(&rule->flow, dl_vlan_pcp); rule->wc.vlan_tci_mask |= htons(VLAN_CFI | VLAN_PCP_MASK); } void cls_rule_set_tp_src(struct cls_rule *rule, ovs_be16 tp_src) { - rule->wc.wildcards &= ~FWW_TP_SRC; - rule->flow.tp_src = tp_src; + cls_rule_set_tp_src_masked(rule, tp_src, htons(UINT16_MAX)); +} + +void +cls_rule_set_tp_src_masked(struct cls_rule *rule, ovs_be16 port, ovs_be16 mask) +{ + rule->flow.tp_src = port & mask; + rule->wc.tp_src_mask = mask; } void cls_rule_set_tp_dst(struct cls_rule *rule, ovs_be16 tp_dst) { - rule->wc.wildcards &= ~FWW_TP_DST; - rule->flow.tp_dst = tp_dst; + cls_rule_set_tp_dst_masked(rule, tp_dst, htons(UINT16_MAX)); +} + +void +cls_rule_set_tp_dst_masked(struct cls_rule *rule, ovs_be16 port, ovs_be16 mask) +{ + rule->flow.tp_dst = port & mask; + rule->wc.tp_dst_mask = mask; } void @@ -266,57 +333,80 @@ cls_rule_set_nw_proto(struct cls_rule *rule, uint8_t nw_proto) void cls_rule_set_nw_src(struct cls_rule *rule, ovs_be32 nw_src) { - cls_rule_set_nw_src_masked(rule, nw_src, htonl(UINT32_MAX)); + rule->flow.nw_src = nw_src; + rule->wc.nw_src_mask = htonl(UINT32_MAX); } -bool -cls_rule_set_nw_src_masked(struct cls_rule *rule, ovs_be32 ip, ovs_be32 mask) +void +cls_rule_set_nw_src_masked(struct cls_rule *rule, + ovs_be32 nw_src, ovs_be32 mask) { - if (flow_wildcards_set_nw_src_mask(&rule->wc, mask)) { - rule->flow.nw_src = ip & mask; - return true; - } else { - return false; - } + rule->flow.nw_src = nw_src & mask; + rule->wc.nw_src_mask = mask; } void cls_rule_set_nw_dst(struct cls_rule *rule, ovs_be32 nw_dst) { - cls_rule_set_nw_dst_masked(rule, nw_dst, htonl(UINT32_MAX)); + rule->flow.nw_dst = nw_dst; + rule->wc.nw_dst_mask = htonl(UINT32_MAX); } -bool +void cls_rule_set_nw_dst_masked(struct cls_rule *rule, ovs_be32 ip, ovs_be32 mask) { - if (flow_wildcards_set_nw_dst_mask(&rule->wc, mask)) { - rule->flow.nw_dst = ip & mask; - return true; - } else { - return false; - } + rule->flow.nw_dst = ip & mask; + rule->wc.nw_dst_mask = mask; } void -cls_rule_set_nw_tos(struct cls_rule *rule, uint8_t nw_tos) +cls_rule_set_nw_dscp(struct cls_rule *rule, uint8_t nw_dscp) { - rule->wc.wildcards &= ~FWW_NW_TOS; - rule->flow.nw_tos = nw_tos & IP_DSCP_MASK; + rule->wc.wildcards &= ~FWW_NW_DSCP; + rule->flow.nw_tos &= ~IP_DSCP_MASK; + rule->flow.nw_tos |= nw_dscp & IP_DSCP_MASK; } void -cls_rule_set_icmp_type(struct cls_rule *rule, uint8_t icmp_type) +cls_rule_set_nw_ecn(struct cls_rule *rule, uint8_t nw_ecn) +{ + rule->wc.wildcards &= ~FWW_NW_ECN; + rule->flow.nw_tos &= ~IP_ECN_MASK; + rule->flow.nw_tos |= nw_ecn & IP_ECN_MASK; +} + +void +cls_rule_set_nw_ttl(struct cls_rule *rule, uint8_t nw_ttl) { - rule->wc.wildcards &= ~FWW_TP_SRC; - rule->flow.icmp_type = htons(icmp_type); + rule->wc.wildcards &= ~FWW_NW_TTL; + rule->flow.nw_ttl = nw_ttl; +} +void +cls_rule_set_nw_frag(struct cls_rule *rule, uint8_t nw_frag) +{ + rule->wc.nw_frag_mask |= FLOW_NW_FRAG_MASK; + rule->flow.nw_frag = nw_frag; +} + +void +cls_rule_set_nw_frag_masked(struct cls_rule *rule, + uint8_t nw_frag, uint8_t mask) +{ + rule->flow.nw_frag = nw_frag & mask; + rule->wc.nw_frag_mask = mask; +} + +void +cls_rule_set_icmp_type(struct cls_rule *rule, uint8_t icmp_type) +{ + cls_rule_set_tp_src(rule, htons(icmp_type)); } void cls_rule_set_icmp_code(struct cls_rule *rule, uint8_t icmp_code) { - rule->wc.wildcards &= ~FWW_TP_DST; - rule->flow.icmp_code = htons(icmp_code); + cls_rule_set_tp_dst(rule, htons(icmp_code)); } void @@ -336,37 +426,61 @@ cls_rule_set_arp_tha(struct cls_rule *rule, const uint8_t tha[ETH_ADDR_LEN]) void cls_rule_set_ipv6_src(struct cls_rule *rule, const struct in6_addr *src) { - cls_rule_set_ipv6_src_masked(rule, src, &in6addr_exact); + rule->flow.ipv6_src = *src; + rule->wc.ipv6_src_mask = in6addr_exact; } -bool +void cls_rule_set_ipv6_src_masked(struct cls_rule *rule, const struct in6_addr *src, const struct in6_addr *mask) { - if (flow_wildcards_set_ipv6_src_mask(&rule->wc, mask)) { - rule->flow.ipv6_src = ipv6_addr_bitand(src, mask); - return true; - } else { - return false; - } + rule->flow.ipv6_src = ipv6_addr_bitand(src, mask); + rule->wc.ipv6_src_mask = *mask; } void cls_rule_set_ipv6_dst(struct cls_rule *rule, const struct in6_addr *dst) { - cls_rule_set_ipv6_dst_masked(rule, dst, &in6addr_exact); + rule->flow.ipv6_dst = *dst; + rule->wc.ipv6_dst_mask = in6addr_exact; } -bool +void cls_rule_set_ipv6_dst_masked(struct cls_rule *rule, const struct in6_addr *dst, const struct in6_addr *mask) { - if (flow_wildcards_set_ipv6_dst_mask(&rule->wc, mask)) { - rule->flow.ipv6_dst = ipv6_addr_bitand(dst, mask); - return true; - } else { - return false; - } + rule->flow.ipv6_dst = ipv6_addr_bitand(dst, mask); + rule->wc.ipv6_dst_mask = *mask; +} + +void +cls_rule_set_ipv6_label(struct cls_rule *rule, ovs_be32 ipv6_label) +{ + cls_rule_set_ipv6_label_masked(rule, ipv6_label, htonl(UINT32_MAX)); +} + +void +cls_rule_set_ipv6_label_masked(struct cls_rule *rule, ovs_be32 ipv6_label, + ovs_be32 mask) +{ + rule->flow.ipv6_label = ipv6_label & mask; + rule->wc.ipv6_label_mask = mask; +} + +void +cls_rule_set_nd_target(struct cls_rule *rule, const struct in6_addr *target) +{ + rule->flow.nd_target = *target; + rule->wc.nd_target_mask = in6addr_exact; +} + +void +cls_rule_set_nd_target_masked(struct cls_rule *rule, + const struct in6_addr *target, + const struct in6_addr *mask) +{ + rule->flow.nd_target = ipv6_addr_bitand(target, mask); + rule->wc.nd_target_mask = *mask; } /* Returns true if 'a' and 'b' have the same priority, wildcard the same @@ -379,20 +493,34 @@ cls_rule_equal(const struct cls_rule *a, const struct cls_rule *b) && flow_equal(&a->flow, &b->flow)); } +/* Returns a hash value for the flow, wildcards, and priority in 'rule', + * starting from 'basis'. */ +uint32_t +cls_rule_hash(const struct cls_rule *rule, uint32_t basis) +{ + uint32_t h0 = flow_hash(&rule->flow, basis); + uint32_t h1 = flow_wildcards_hash(&rule->wc, h0); + return hash_int(rule->priority, h1); +} + +static void +format_eth_masked(struct ds *s, const char *name, const uint8_t eth[6], + const uint8_t mask[6]) +{ + if (!eth_addr_is_zero(mask)) { + ds_put_format(s, "%s=", name); + eth_format_masked(eth, mask, s); + ds_put_char(s, ','); + } +} + static void format_ip_netmask(struct ds *s, const char *name, ovs_be32 ip, ovs_be32 netmask) { if (netmask) { - ds_put_format(s, "%s="IP_FMT, name, IP_ARGS(&ip)); - if (netmask != htonl(UINT32_MAX)) { - if (ip_is_cidr(netmask)) { - int wcbits = ofputil_netmask_to_wcbits(netmask); - ds_put_format(s, "/%d", 32 - wcbits); - } else { - ds_put_format(s, "/"IP_FMT, IP_ARGS(&netmask)); - } - } + ds_put_format(s, "%s=", name); + ip_format_masked(ip, netmask, s); ds_put_char(s, ','); } } @@ -404,15 +532,23 @@ format_ipv6_netmask(struct ds *s, const char *name, { if (!ipv6_mask_is_any(netmask)) { ds_put_format(s, "%s=", name); - print_ipv6_addr(s, addr); - if (!ipv6_mask_is_exact(netmask)) { - if (ipv6_is_cidr(netmask)) { - int cidr_bits = ipv6_count_cidr_bits(netmask); - ds_put_format(s, "/%d", cidr_bits); - } else { - ds_put_char(s, '/'); - print_ipv6_addr(s, netmask); - } + print_ipv6_masked(s, addr, netmask); + ds_put_char(s, ','); + } +} + + +static void +format_be16_masked(struct ds *s, const char *name, + ovs_be16 value, ovs_be16 mask) +{ + if (mask != htons(0)) { + ds_put_format(s, "%s=", name); + if (mask == htons(UINT16_MAX)) { + ds_put_format(s, "%"PRIu16, ntohs(value)); + } else { + ds_put_format(s, "0x%"PRIx16"/0x%"PRIx16, + ntohs(value), ntohs(mask)); } ds_put_char(s, ','); } @@ -430,6 +566,8 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s) int i; + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 13); + if (rule->priority != OFP_DEFAULT_PRIORITY) { ds_put_format(s, "priority=%d,", rule->priority); } @@ -498,9 +636,19 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s) ntohll(f->tun_id), ntohll(wc->tun_id_mask)); break; } + switch (wc->metadata_mask) { + case 0: + break; + case CONSTANT_HTONLL(UINT64_MAX): + ds_put_format(s, "metadata=%#"PRIx64",", ntohll(f->metadata)); + break; + default: + ds_put_format(s, "metadata=%#"PRIx64"/%#"PRIx64",", + ntohll(f->metadata), ntohll(wc->metadata_mask)); + break; + } if (!(w & FWW_IN_PORT)) { - ds_put_format(s, "in_port=%"PRIu16",", - odp_port_to_ofp_port(f->in_port)); + ds_put_format(s, "in_port=%"PRIu16",", f->in_port); } if (wc->vlan_tci_mask) { ovs_be16 vid_mask = wc->vlan_tci_mask & htons(VLAN_VID_MASK); @@ -519,42 +667,38 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s) ds_put_format(s, "dl_vlan_pcp=%d,", vlan_tci_to_pcp(f->vlan_tci)); } + } else if (wc->vlan_tci_mask == htons(0xffff)) { + ds_put_format(s, "vlan_tci=0x%04"PRIx16",", ntohs(f->vlan_tci)); } else { ds_put_format(s, "vlan_tci=0x%04"PRIx16"/0x%04"PRIx16",", ntohs(f->vlan_tci), ntohs(wc->vlan_tci_mask)); } } - if (!(w & FWW_DL_SRC)) { - ds_put_format(s, "dl_src="ETH_ADDR_FMT",", ETH_ADDR_ARGS(f->dl_src)); - } - switch (w & (FWW_DL_DST | FWW_ETH_MCAST)) { - case 0: - ds_put_format(s, "dl_dst="ETH_ADDR_FMT",", ETH_ADDR_ARGS(f->dl_dst)); - break; - case FWW_DL_DST: - ds_put_format(s, "dl_dst="ETH_ADDR_FMT"/01:00:00:00:00:00,", - ETH_ADDR_ARGS(f->dl_dst)); - break; - case FWW_ETH_MCAST: - ds_put_format(s, "dl_dst="ETH_ADDR_FMT"/fe:ff:ff:ff:ff:ff,", - ETH_ADDR_ARGS(f->dl_dst)); - break; - case FWW_DL_DST | FWW_ETH_MCAST: - break; - } + format_eth_masked(s, "dl_src", f->dl_src, wc->dl_src_mask); + format_eth_masked(s, "dl_dst", f->dl_dst, wc->dl_dst_mask); if (!skip_type && !(w & FWW_DL_TYPE)) { ds_put_format(s, "dl_type=0x%04"PRIx16",", ntohs(f->dl_type)); } if (f->dl_type == htons(ETH_TYPE_IPV6)) { format_ipv6_netmask(s, "ipv6_src", &f->ipv6_src, &wc->ipv6_src_mask); format_ipv6_netmask(s, "ipv6_dst", &f->ipv6_dst, &wc->ipv6_dst_mask); + if (wc->ipv6_label_mask) { + if (wc->ipv6_label_mask == htonl(UINT32_MAX)) { + ds_put_format(s, "ipv6_label=0x%05"PRIx32",", + ntohl(f->ipv6_label)); + } else { + ds_put_format(s, "ipv6_label=0x%05"PRIx32"/0x%05"PRIx32",", + ntohl(f->ipv6_label), + ntohl(wc->ipv6_label_mask)); + } + } } else { format_ip_netmask(s, "nw_src", f->nw_src, wc->nw_src_mask); format_ip_netmask(s, "nw_dst", f->nw_dst, wc->nw_dst_mask); } if (!skip_proto && !(w & FWW_NW_PROTO)) { if (f->dl_type == htons(ETH_TYPE_ARP)) { - ds_put_format(s, "opcode=%"PRIu8",", f->nw_proto); + ds_put_format(s, "arp_op=%"PRIu8",", f->nw_proto); } else { ds_put_format(s, "nw_proto=%"PRIu8",", f->nw_proto); } @@ -569,30 +713,52 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s) ETH_ADDR_ARGS(f->arp_tha)); } } - if (!(w & FWW_NW_TOS)) { - ds_put_format(s, "nw_tos=%"PRIu8",", f->nw_tos); + if (!(w & FWW_NW_DSCP)) { + ds_put_format(s, "nw_tos=%"PRIu8",", f->nw_tos & IP_DSCP_MASK); + } + if (!(w & FWW_NW_ECN)) { + ds_put_format(s, "nw_ecn=%"PRIu8",", f->nw_tos & IP_ECN_MASK); + } + if (!(w & FWW_NW_TTL)) { + ds_put_format(s, "nw_ttl=%"PRIu8",", f->nw_ttl); + } + switch (wc->nw_frag_mask) { + case FLOW_NW_FRAG_ANY | FLOW_NW_FRAG_LATER: + ds_put_format(s, "nw_frag=%s,", + f->nw_frag & FLOW_NW_FRAG_ANY + ? (f->nw_frag & FLOW_NW_FRAG_LATER ? "later" : "first") + : (f->nw_frag & FLOW_NW_FRAG_LATER ? "" : "no")); + break; + + case FLOW_NW_FRAG_ANY: + ds_put_format(s, "nw_frag=%s,", + f->nw_frag & FLOW_NW_FRAG_ANY ? "yes" : "no"); + break; + + case FLOW_NW_FRAG_LATER: + ds_put_format(s, "nw_frag=%s,", + f->nw_frag & FLOW_NW_FRAG_LATER ? "later" : "not_later"); + break; } if (f->nw_proto == IPPROTO_ICMP) { - if (!(w & FWW_TP_SRC)) { - ds_put_format(s, "icmp_type=%"PRIu16",", ntohs(f->tp_src)); - } - if (!(w & FWW_TP_DST)) { - ds_put_format(s, "icmp_code=%"PRIu16",", ntohs(f->tp_dst)); - } + format_be16_masked(s, "icmp_type", f->tp_src, wc->tp_src_mask); + format_be16_masked(s, "icmp_code", f->tp_dst, wc->tp_dst_mask); } else if (f->nw_proto == IPPROTO_ICMPV6) { - if (!(w & FWW_TP_SRC)) { - ds_put_format(s, "icmp_type=%"PRIu16",", ntohs(f->tp_src)); - } - if (!(w & FWW_TP_DST)) { - ds_put_format(s, "icmp_code=%"PRIu16",", ntohs(f->tp_dst)); - } - } else { - if (!(w & FWW_TP_SRC)) { - ds_put_format(s, "tp_src=%"PRIu16",", ntohs(f->tp_src)); + format_be16_masked(s, "icmp_type", f->tp_src, wc->tp_src_mask); + format_be16_masked(s, "icmp_code", f->tp_dst, wc->tp_dst_mask); + format_ipv6_netmask(s, "nd_target", &f->nd_target, + &wc->nd_target_mask); + if (!(w & FWW_ARP_SHA)) { + ds_put_format(s, "nd_sll="ETH_ADDR_FMT",", + ETH_ADDR_ARGS(f->arp_sha)); } - if (!(w & FWW_TP_DST)) { - ds_put_format(s, "tp_dst=%"PRIu16",", ntohs(f->tp_dst)); + if (!(w & FWW_ARP_THA)) { + ds_put_format(s, "nd_tll="ETH_ADDR_FMT",", + ETH_ADDR_ARGS(f->arp_tha)); } + } else { + format_be16_masked(s, "tp_src", f->tp_src, wc->tp_src_mask); + format_be16_masked(s, "tp_dst", f->tp_dst, wc->tp_dst_mask); } if (s->length > start_len && ds_last(s) == ',') { @@ -671,7 +837,7 @@ classifier_count(const struct classifier *cls) * rule, even rules that cannot have any effect because the new rule matches a * superset of their flows and has higher priority. */ struct cls_rule * -classifier_insert(struct classifier *cls, struct cls_rule *rule) +classifier_replace(struct classifier *cls, struct cls_rule *rule) { struct cls_rule *old_rule; struct cls_table *table; @@ -689,6 +855,19 @@ classifier_insert(struct classifier *cls, struct cls_rule *rule) return old_rule; } +/* Inserts 'rule' into 'cls'. Until 'rule' is removed from 'cls', the caller + * must not modify or free it. + * + * 'cls' must not contain an identical rule (including wildcards, values of + * fixed fields, and priority). Use classifier_find_rule_exactly() to find + * such a rule. */ +void +classifier_insert(struct classifier *cls, struct cls_rule *rule) +{ + struct cls_rule *displaced_rule = classifier_replace(cls, rule); + assert(!displaced_rule); +} + /* Removes 'rule' from 'cls'. It is the caller's responsibility to free * 'rule', if this is desirable. */ void @@ -739,10 +918,7 @@ classifier_lookup(const struct classifier *cls, const struct flow *flow) /* Finds and returns a rule in 'cls' with exactly the same priority and * matching criteria as 'target'. Returns a null pointer if 'cls' doesn't - * contain an exact match. - * - * Priority is ignored for exact-match rules (because OpenFlow 1.0 always - * treats exact-match rules as highest priority). */ + * contain an exact match. */ struct cls_rule * classifier_find_rule_exactly(const struct classifier *cls, const struct cls_rule *target) @@ -756,9 +932,6 @@ classifier_find_rule_exactly(const struct classifier *cls, } head = find_equal(table, &target->flow, flow_hash(&target->flow, 0)); - if (flow_wildcards_is_exact(&target->wc)) { - return head; - } FOR_EACH_RULE_IN_LIST (rule, head) { if (target->priority >= rule->priority) { return target->priority == rule->priority ? rule : NULL; @@ -795,6 +968,47 @@ classifier_rule_overlaps(const struct classifier *cls, return false; } + +/* Returns true if 'rule' exactly matches 'criteria' or if 'rule' is more + * specific than 'criteria'. That is, 'rule' matches 'criteria' and this + * function returns true if, for every field: + * + * - 'criteria' and 'rule' specify the same (non-wildcarded) value for the + * field, or + * + * - 'criteria' wildcards the field, + * + * Conversely, 'rule' does not match 'criteria' and this function returns false + * if, for at least one field: + * + * - 'criteria' and 'rule' specify different values for the field, or + * + * - 'criteria' specifies a value for the field but 'rule' wildcards it. + * + * Equivalently, the truth table for whether a field matches is: + * + * rule + * + * c wildcard exact + * r +---------+---------+ + * i wild | yes | yes | + * t card | | | + * e +---------+---------+ + * r exact | no |if values| + * i | |are equal| + * a +---------+---------+ + * + * This is the matching rule used by OpenFlow 1.0 non-strict OFPT_FLOW_MOD + * commands and by OpenFlow 1.0 aggregate and flow stats. + * + * Ignores rule->priority and criteria->priority. */ +bool +cls_rule_is_loose_match(const struct cls_rule *rule, + const struct cls_rule *criteria) +{ + return (!flow_wildcards_has_extra(&rule->wc, &criteria->wc) + && flow_equal_except(&rule->flow, &criteria->flow, &criteria->wc)); +} /* Iteration. */ @@ -820,40 +1034,14 @@ search_table(const struct cls_table *table, const struct cls_rule *target) return NULL; } -/* Initializes 'cursor' for iterating through 'cls' rules that exactly match - * 'target' or are more specific than 'target'. That is, a given 'rule' - * matches 'target' if, for every field: +/* Initializes 'cursor' for iterating through rules in 'cls': * - * - 'target' and 'rule' specify the same (non-wildcarded) value for the - * field, or + * - If 'target' is null, the cursor will visit every rule in 'cls'. * - * - 'target' wildcards the field, - * - * but not if: - * - * - 'target' and 'rule' specify different values for the field, or - * - * - 'target' specifies a value for the field but 'rule' wildcards it. - * - * Equivalently, the truth table for whether a field matches is: - * - * rule + * - If 'target' is nonnull, the cursor will visit each 'rule' in 'cls' + * such that cls_rule_is_loose_match(rule, target) returns true. * - * wildcard exact - * +---------+---------+ - * t wild | yes | yes | - * a card | | | - * r +---------+---------+ - * g exact | no |if values| - * e | |are equal| - * t +---------+---------+ - * - * This is the matching rule used by OpenFlow 1.0 non-strict OFPT_FLOW_MOD - * commands and by OpenFlow 1.0 aggregate and flow stats. - * - * Ignores target->priority. - * - * 'target' may be NULL to iterate over every rule in 'cls'. */ + * Ignores target->priority. */ void cls_cursor_init(struct cls_cursor *cursor, const struct classifier *cls, const struct cls_rule *target) @@ -869,8 +1057,7 @@ cls_cursor_first(struct cls_cursor *cursor) { struct cls_table *table; - for (table = classifier_first_table(cursor->cls); table; - table = classifier_next_table(cursor->cls, table)) { + HMAP_FOR_EACH (table, hmap_node, &cursor->cls->tables) { struct cls_rule *rule = search_table(table, cursor->target); if (rule) { cursor->table = table; @@ -904,8 +1091,8 @@ cls_cursor_next(struct cls_cursor *cursor, struct cls_rule *rule) } } - for (table = classifier_next_table(cursor->cls, cursor->table); table; - table = classifier_next_table(cursor->cls, table)) { + table = cursor->table; + HMAP_FOR_EACH_CONTINUE (table, hmap_node, &cursor->cls->tables) { rule = search_table(table, cursor->target); if (rule) { cursor->table = table; @@ -921,7 +1108,7 @@ find_table(const struct classifier *cls, const struct flow_wildcards *wc) { struct cls_table *table; - HMAP_FOR_EACH_IN_BUCKET (table, hmap_node, flow_wildcards_hash(wc), + HMAP_FOR_EACH_IN_BUCKET (table, hmap_node, flow_wildcards_hash(wc, 0), &cls->tables) { if (flow_wildcards_equal(wc, &table->wc)) { return table; @@ -938,25 +1125,12 @@ insert_table(struct classifier *cls, const struct flow_wildcards *wc) table = xzalloc(sizeof *table); hmap_init(&table->rules); table->wc = *wc; - hmap_insert(&cls->tables, &table->hmap_node, flow_wildcards_hash(wc)); + table->is_catchall = flow_wildcards_is_catchall(&table->wc); + hmap_insert(&cls->tables, &table->hmap_node, flow_wildcards_hash(wc, 0)); return table; } -static struct cls_table * -classifier_first_table(const struct classifier *cls) -{ - return cls_table_from_hmap_node(hmap_first(&cls->tables)); -} - -static struct cls_table * -classifier_next_table(const struct classifier *cls, - const struct cls_table *table) -{ - return cls_table_from_hmap_node(hmap_next(&cls->tables, - &table->hmap_node)); -} - static void destroy_table(struct classifier *cls, struct cls_table *table) { @@ -969,16 +1143,24 @@ static struct cls_rule * find_match(const struct cls_table *table, const struct flow *flow) { struct cls_rule *rule; - struct flow f; - f = *flow; - zero_wildcards(&f, &table->wc); - HMAP_FOR_EACH_WITH_HASH (rule, hmap_node, flow_hash(&f, 0), - &table->rules) { - if (flow_equal(&f, &rule->flow)) { + if (table->is_catchall) { + HMAP_FOR_EACH (rule, hmap_node, &table->rules) { return rule; } + } else { + struct flow f; + + f = *flow; + flow_zero_wildcards(&f, &table->wc); + HMAP_FOR_EACH_WITH_HASH (rule, hmap_node, flow_hash(&f, 0), + &table->rules) { + if (flow_equal(&f, &rule->flow)) { + return rule; + } + } } + return NULL; } @@ -1080,7 +1262,7 @@ flow_equal_except(const struct flow *a, const struct flow *b, const flow_wildcards_t wc = wildcards->wildcards; int i; - BUILD_ASSERT_DECL(FLOW_SIG_SIZE == 84 + FLOW_N_REGS * 4); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 13); for (i = 0; i < FLOW_N_REGS; i++) { if ((a->regs[i] ^ b->regs[i]) & wildcards->reg_masks[i]) { @@ -1089,84 +1271,30 @@ flow_equal_except(const struct flow *a, const struct flow *b, } return (!((a->tun_id ^ b->tun_id) & wildcards->tun_id_mask) + && !((a->metadata ^ b->metadata) & wildcards->metadata_mask) && !((a->nw_src ^ b->nw_src) & wildcards->nw_src_mask) && !((a->nw_dst ^ b->nw_dst) & wildcards->nw_dst_mask) && (wc & FWW_IN_PORT || a->in_port == b->in_port) && !((a->vlan_tci ^ b->vlan_tci) & wildcards->vlan_tci_mask) && (wc & FWW_DL_TYPE || a->dl_type == b->dl_type) - && (wc & FWW_TP_SRC || a->tp_src == b->tp_src) - && (wc & FWW_TP_DST || a->tp_dst == b->tp_dst) - && (wc & FWW_DL_SRC || eth_addr_equals(a->dl_src, b->dl_src)) - && (wc & FWW_DL_DST - || (!((a->dl_dst[0] ^ b->dl_dst[0]) & 0xfe) - && a->dl_dst[1] == b->dl_dst[1] - && a->dl_dst[2] == b->dl_dst[2] - && a->dl_dst[3] == b->dl_dst[3] - && a->dl_dst[4] == b->dl_dst[4] - && a->dl_dst[5] == b->dl_dst[5])) - && (wc & FWW_ETH_MCAST - || !((a->dl_dst[0] ^ b->dl_dst[0]) & 0x01)) + && !((a->tp_src ^ b->tp_src) & wildcards->tp_src_mask) + && !((a->tp_dst ^ b->tp_dst) & wildcards->tp_dst_mask) + && eth_addr_equal_except(a->dl_src, b->dl_src, + wildcards->dl_src_mask) + && eth_addr_equal_except(a->dl_dst, b->dl_dst, + wildcards->dl_dst_mask) && (wc & FWW_NW_PROTO || a->nw_proto == b->nw_proto) - && (wc & FWW_NW_TOS || a->nw_tos == b->nw_tos) + && (wc & FWW_NW_TTL || a->nw_ttl == b->nw_ttl) + && (wc & FWW_NW_DSCP || !((a->nw_tos ^ b->nw_tos) & IP_DSCP_MASK)) + && (wc & FWW_NW_ECN || !((a->nw_tos ^ b->nw_tos) & IP_ECN_MASK)) + && !((a->nw_frag ^ b->nw_frag) & wildcards->nw_frag_mask) && (wc & FWW_ARP_SHA || eth_addr_equals(a->arp_sha, b->arp_sha)) && (wc & FWW_ARP_THA || eth_addr_equals(a->arp_tha, b->arp_tha)) + && !((a->ipv6_label ^ b->ipv6_label) & wildcards->ipv6_label_mask) && ipv6_equal_except(&a->ipv6_src, &b->ipv6_src, &wildcards->ipv6_src_mask) && ipv6_equal_except(&a->ipv6_dst, &b->ipv6_dst, - &wildcards->ipv6_dst_mask)); -} - -static void -zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards) -{ - const flow_wildcards_t wc = wildcards->wildcards; - int i; - - BUILD_ASSERT_DECL(FLOW_SIG_SIZE == 84 + 4 * FLOW_N_REGS); - - for (i = 0; i < FLOW_N_REGS; i++) { - flow->regs[i] &= wildcards->reg_masks[i]; - } - flow->tun_id &= wildcards->tun_id_mask; - flow->nw_src &= wildcards->nw_src_mask; - flow->nw_dst &= wildcards->nw_dst_mask; - if (wc & FWW_IN_PORT) { - flow->in_port = 0; - } - flow->vlan_tci &= wildcards->vlan_tci_mask; - if (wc & FWW_DL_TYPE) { - flow->dl_type = 0; - } - if (wc & FWW_TP_SRC) { - flow->tp_src = 0; - } - if (wc & FWW_TP_DST) { - flow->tp_dst = 0; - } - if (wc & FWW_DL_SRC) { - memset(flow->dl_src, 0, sizeof flow->dl_src); - } - if (wc & FWW_DL_DST) { - flow->dl_dst[0] &= 0x01; - memset(&flow->dl_dst[1], 0, 5); - } - if (wc & FWW_ETH_MCAST) { - flow->dl_dst[0] &= 0xfe; - } - if (wc & FWW_NW_PROTO) { - flow->nw_proto = 0; - } - if (wc & FWW_NW_TOS) { - flow->nw_tos = 0; - } - if (wc & FWW_ARP_SHA) { - memset(flow->arp_sha, 0, sizeof flow->arp_sha); - } - if (wc & FWW_ARP_THA) { - memset(flow->arp_tha, 0, sizeof flow->arp_tha); - } - flow->ipv6_src = ipv6_addr_bitand(&flow->ipv6_src, - &wildcards->ipv6_src_mask); - flow->ipv6_dst = ipv6_addr_bitand(&flow->ipv6_dst, - &wildcards->ipv6_dst_mask); + &wildcards->ipv6_dst_mask) + && ipv6_equal_except(&a->nd_target, &b->nd_target, + &wildcards->nd_target_mask)); }