X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fclassifier.c;h=33245aeab0c4613165b1dea9d12f102ad47e1088;hb=e878338bf1409f0dd6d23cb57822a2c4c1a69e0f;hp=85c3c45afb0957a8a1a4857858b781a01cf75fc5;hpb=b63f2ea79417e93390eaa86f68e546242e15a9ec;p=openvswitch diff --git a/lib/classifier.c b/lib/classifier.c index 85c3c45a..33245aea 100644 --- a/lib/classifier.c +++ b/lib/classifier.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010 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. @@ -19,9 +19,12 @@ #include #include #include +#include "byte-order.h" #include "dynamic-string.h" #include "flow.h" #include "hash.h" +#include "odp-util.h" +#include "ofp-util.h" #include "packets.h" static struct cls_table *find_table(const struct classifier *, @@ -29,13 +32,8 @@ 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 bool should_include(const struct cls_table *, int include); - static struct cls_rule *find_match(const struct cls_table *, const struct flow *); static struct cls_rule *find_equal(struct cls_table *, const struct flow *, @@ -44,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) \ @@ -54,51 +51,9 @@ static void zero_wildcards(struct flow *, const struct flow_wildcards *); (RULE) != NULL && ((NEXT) = next_rule_in_list(RULE), true); \ (RULE) = (NEXT)) +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; -} - -static struct cls_rule * -cls_rule_from_hmap_node(const struct hmap_node *node) -{ - return node ? CONTAINER_OF(node, struct cls_rule, hmap_node) : NULL; -} - -/* Returns the cls_table within 'cls' that has no wildcards, or NULL if there - * is none. */ -struct cls_table * -classifier_exact_table(const struct classifier *cls) -{ - struct flow_wildcards exact_wc; - flow_wildcards_init_exact(&exact_wc); - return find_table(cls, &exact_wc); -} - -/* Returns the first rule in 'table', or a null pointer if 'table' is NULL. */ -struct cls_rule * -cls_table_first_rule(const struct cls_table *table) -{ - return table ? cls_rule_from_hmap_node(hmap_first(&table->rules)) : NULL; -} - -/* Returns the next rule in 'table' following 'rule', or a null pointer if - * 'rule' is the last rule in 'table'. */ -struct cls_rule * -cls_table_next_rule(const struct cls_table *table, const struct cls_rule *rule) -{ - struct cls_rule *next - = CONTAINER_OF(rule->list.next, struct cls_rule, hmap_node); - - return (next->priority < rule->priority - ? next - : cls_rule_from_hmap_node(hmap_next(&table->rules, - &next->hmap_node))); -} - /* Converts the flow in 'flow' into a cls_rule in 'rule', with the given * 'wildcards' and 'priority'. */ void @@ -119,30 +74,18 @@ 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; } -/* Converts the ofp_match in 'match' (with format 'flow_format', one of NXFF_*) - * into a cls_rule in 'rule', with the given 'priority'. 'cookie' is used - * when 'flow_format' is NXFF_TUN_ID_FROM_COOKIE. */ -void -cls_rule_from_match(const struct ofp_match *match, unsigned int priority, - int flow_format, uint64_t cookie, - struct cls_rule *rule) -{ - flow_from_match(match, flow_format, cookie, &rule->flow, &rule->wc); - rule->priority = !rule->wc.wildcards ? UINT16_MAX : priority; - cls_rule_zero_wildcarded_fields(rule); -} - /* Initializes 'rule' as a "catch-all" rule that matches every packet, with * priority 'priority'. */ void cls_rule_init_catchall(struct cls_rule *rule, unsigned int priority) { memset(&rule->flow, 0, sizeof rule->flow); - flow_wildcards_init(&rule->wc, OVSFW_ALL); + flow_wildcards_init_catchall(&rule->wc); rule->priority = priority; } @@ -157,192 +100,674 @@ 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 +cls_rule_set_reg(struct cls_rule *rule, unsigned int reg_idx, uint32_t value) +{ + cls_rule_set_reg_masked(rule, reg_idx, value, UINT32_MAX); } void -cls_rule_set_in_port(struct cls_rule *rule, uint16_t odp_port) +cls_rule_set_reg_masked(struct cls_rule *rule, unsigned int reg_idx, + uint32_t value, uint32_t mask) { - rule->wc.wildcards &= ~OFPFW_IN_PORT; - rule->flow.in_port = odp_port; + assert(reg_idx < FLOW_N_REGS); + flow_wildcards_set_reg_mask(&rule->wc, reg_idx, mask); + 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) +{ + cls_rule_set_tun_id_masked(rule, tun_id, htonll(UINT64_MAX)); +} + +void +cls_rule_set_tun_id_masked(struct cls_rule *rule, + ovs_be64 tun_id, ovs_be64 mask) +{ + rule->wc.tun_id_mask = mask; + rule->flow.tun_id = tun_id & mask; +} + +void +cls_rule_set_in_port(struct cls_rule *rule, uint16_t ofp_port) +{ + rule->wc.wildcards &= ~FWW_IN_PORT; + rule->flow.in_port = ofp_port; } void cls_rule_set_dl_type(struct cls_rule *rule, ovs_be16 dl_type) { - rule->wc.wildcards &= ~OFPFW_DL_TYPE; + rule->wc.wildcards &= ~FWW_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 &= ~OFPFW_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 &= ~OFPFW_DL_DST; - 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); } -bool +/* 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 cls_rule_set_dl_tci(struct cls_rule *rule, ovs_be16 tci) { - return cls_rule_set_dl_tci_masked(rule, tci, htons(0xffff)); + cls_rule_set_dl_tci_masked(rule, tci, htons(0xffff)); } -bool +void cls_rule_set_dl_tci_masked(struct cls_rule *rule, ovs_be16 tci, ovs_be16 mask) { - switch (ntohs(mask)) { - case 0xffff: - if (tci == htons(0)) { - /* Match only packets that have no 802.1Q header. */ - rule->wc.wildcards &= ~(OFPFW_DL_VLAN | OFPFW_DL_VLAN_PCP); - rule->flow.dl_vlan = htons(OFP_VLAN_NONE); - rule->flow.dl_vlan_pcp = 0; - return true; - } else if (tci & htons(VLAN_CFI)) { - /* Match only packets that have a specific 802.1Q VID and PCP. */ - rule->wc.wildcards &= ~(OFPFW_DL_VLAN | OFPFW_DL_VLAN_PCP); - rule->flow.dl_vlan = htons(vlan_tci_to_vid(tci)); - rule->flow.dl_vlan_pcp = vlan_tci_to_pcp(tci); - return true; - } else { - /* Impossible. */ - return false; - } - - case 0x1fff: - if (!(tci & htons(VLAN_CFI))) { - return false; - } else { - /* Match only packets that have a specific 802.1Q VID. */ - cls_rule_set_dl_vlan(rule, tci & htons(VLAN_VID_MASK)); - rule->wc.wildcards |= OFPFW_DL_VLAN_PCP; - rule->flow.dl_vlan_pcp = 0; - return true; - } - - case 0xf000: - if (!(tci & htons(VLAN_CFI))) { - return false; - } else { - /* Match only packets that have a specific 802.1Q PCP. */ - cls_rule_set_dl_vlan_pcp(rule, vlan_tci_to_pcp(tci)); - rule->wc.wildcards |= OFPFW_DL_VLAN; - rule->flow.dl_vlan = 0; - return true; - } - - case 0x0000: - /* Match anything. */ - rule->wc.wildcards |= OFPFW_DL_VLAN | OFPFW_DL_VLAN_PCP; - rule->flow.dl_vlan = htons(0); - rule->flow.dl_vlan_pcp = 0; - return true; + rule->flow.vlan_tci = tci & mask; + rule->wc.vlan_tci_mask = mask; +} - default: - return false; +/* Modifies 'rule' so that the VLAN VID is wildcarded. If the PCP is already + * wildcarded, then 'rule' will match a packet regardless of whether it has an + * 802.1Q header or not. */ +void +cls_rule_set_any_vid(struct cls_rule *rule) +{ + if (rule->wc.vlan_tci_mask & htons(VLAN_PCP_MASK)) { + rule->wc.vlan_tci_mask &= ~htons(VLAN_VID_MASK); + rule->flow.vlan_tci &= ~htons(VLAN_VID_MASK); + } else { + cls_rule_set_dl_tci_masked(rule, htons(0), htons(0)); } } +/* Modifies 'rule' depending on 'dl_vlan': + * + * - If 'dl_vlan' is htons(OFP_VLAN_NONE), makes 'rule' match only packets + * without an 802.1Q header. + * + * - Otherwise, makes 'rule' match only packets with an 802.1Q header whose + * VID equals the low 12 bits of 'dl_vlan'. + */ void cls_rule_set_dl_vlan(struct cls_rule *rule, ovs_be16 dl_vlan) { - if (dl_vlan != htons(OFP_VLAN_NONE)) { - dl_vlan &= htons(VLAN_VID_MASK); + flow_set_vlan_vid(&rule->flow, dl_vlan); + if (dl_vlan == htons(OFP10_VLAN_NONE)) { + rule->wc.vlan_tci_mask = htons(UINT16_MAX); + } else { + rule->wc.vlan_tci_mask |= htons(VLAN_VID_MASK | VLAN_CFI); } +} - rule->wc.wildcards &= ~OFPFW_DL_VLAN; - rule->flow.dl_vlan = dl_vlan; +/* Modifies 'rule' so that the VLAN PCP is wildcarded. If the VID is already + * wildcarded, then 'rule' will match a packet regardless of whether it has an + * 802.1Q header or not. */ +void +cls_rule_set_any_pcp(struct cls_rule *rule) +{ + if (rule->wc.vlan_tci_mask & htons(VLAN_VID_MASK)) { + rule->wc.vlan_tci_mask &= ~htons(VLAN_PCP_MASK); + rule->flow.vlan_tci &= ~htons(VLAN_PCP_MASK); + } else { + cls_rule_set_dl_tci_masked(rule, htons(0), htons(0)); + } } +/* Modifies 'rule' so that it matches only packets with an 802.1Q header whose + * PCP equals the low 3 bits of 'dl_vlan_pcp'. */ void cls_rule_set_dl_vlan_pcp(struct cls_rule *rule, uint8_t dl_vlan_pcp) { - rule->wc.wildcards &= ~OFPFW_DL_VLAN_PCP; - rule->flow.dl_vlan_pcp = dl_vlan_pcp & 0x07; + 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 &= ~OFPFW_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 &= ~OFPFW_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 cls_rule_set_nw_proto(struct cls_rule *rule, uint8_t nw_proto) { - rule->wc.wildcards &= ~OFPFW_NW_PROTO; + rule->wc.wildcards &= ~FWW_NW_PROTO; rule->flow.nw_proto = 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 &= ~OFPFW_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 &= ~OFPFW_ICMP_TYPE; - rule->flow.icmp_type = htons(icmp_type); + 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_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 &= ~OFPFW_ICMP_CODE; - rule->flow.icmp_code = htons(icmp_code); + cls_rule_set_tp_dst(rule, htons(icmp_code)); +} + +void +cls_rule_set_arp_sha(struct cls_rule *rule, const uint8_t sha[ETH_ADDR_LEN]) +{ + cls_rule_set_eth(sha, rule->flow.arp_sha, rule->wc.arp_sha_mask); +} + +void +cls_rule_set_arp_sha_masked(struct cls_rule *rule, + const uint8_t arp_sha[ETH_ADDR_LEN], + const uint8_t mask[ETH_ADDR_LEN]) +{ + cls_rule_set_eth_masked(arp_sha, mask, + rule->flow.arp_sha, rule->wc.arp_sha_mask); +} + +void +cls_rule_set_arp_tha(struct cls_rule *rule, const uint8_t tha[ETH_ADDR_LEN]) +{ + cls_rule_set_eth(tha, rule->flow.arp_tha, rule->wc.arp_tha_mask); +} + +void +cls_rule_set_arp_tha_masked(struct cls_rule *rule, + const uint8_t arp_tha[ETH_ADDR_LEN], + const uint8_t mask[ETH_ADDR_LEN]) +{ + cls_rule_set_eth_masked(arp_tha, mask, + rule->flow.arp_tha, rule->wc.arp_tha_mask); +} + +void +cls_rule_set_ipv6_src(struct cls_rule *rule, const struct in6_addr *src) +{ + rule->flow.ipv6_src = *src; + rule->wc.ipv6_src_mask = in6addr_exact; +} + +void +cls_rule_set_ipv6_src_masked(struct cls_rule *rule, const struct in6_addr *src, + const struct in6_addr *mask) +{ + 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) +{ + rule->flow.ipv6_dst = *dst; + rule->wc.ipv6_dst_mask = in6addr_exact; +} + +void +cls_rule_set_ipv6_dst_masked(struct cls_rule *rule, const struct in6_addr *dst, + const struct in6_addr *mask) +{ + 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 + * fields, and have the same values for fixed fields, otherwise false. */ +bool +cls_rule_equal(const struct cls_rule *a, const struct cls_rule *b) +{ + return (a->priority == b->priority + && flow_wildcards_equal(&a->wc, &b->wc) + && 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=", name); + ip_format_masked(ip, netmask, s); + ds_put_char(s, ','); + } +} + +static void +format_ipv6_netmask(struct ds *s, const char *name, + const struct in6_addr *addr, + const struct in6_addr *netmask) +{ + if (!ipv6_mask_is_any(netmask)) { + ds_put_format(s, "%s=", name); + 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, ','); + } +} + +void +cls_rule_format(const struct cls_rule *rule, struct ds *s) +{ + const struct flow_wildcards *wc = &rule->wc; + size_t start_len = s->length; + flow_wildcards_t w = wc->wildcards; + const struct flow *f = &rule->flow; + bool skip_type = false; + bool skip_proto = false; + + int i; + + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14); + + if (rule->priority != OFP_DEFAULT_PRIORITY) { + ds_put_format(s, "priority=%d,", rule->priority); + } + + if (!(w & FWW_DL_TYPE)) { + skip_type = true; + if (f->dl_type == htons(ETH_TYPE_IP)) { + if (!(w & FWW_NW_PROTO)) { + skip_proto = true; + if (f->nw_proto == IPPROTO_ICMP) { + ds_put_cstr(s, "icmp,"); + } else if (f->nw_proto == IPPROTO_TCP) { + ds_put_cstr(s, "tcp,"); + } else if (f->nw_proto == IPPROTO_UDP) { + ds_put_cstr(s, "udp,"); + } else { + ds_put_cstr(s, "ip,"); + skip_proto = false; + } + } else { + ds_put_cstr(s, "ip,"); + } + } else if (f->dl_type == htons(ETH_TYPE_IPV6)) { + if (!(w & FWW_NW_PROTO)) { + skip_proto = true; + if (f->nw_proto == IPPROTO_ICMPV6) { + ds_put_cstr(s, "icmp6,"); + } else if (f->nw_proto == IPPROTO_TCP) { + ds_put_cstr(s, "tcp6,"); + } else if (f->nw_proto == IPPROTO_UDP) { + ds_put_cstr(s, "udp6,"); + } else { + ds_put_cstr(s, "ipv6,"); + skip_proto = false; + } + } else { + ds_put_cstr(s, "ipv6,"); + } + } else if (f->dl_type == htons(ETH_TYPE_ARP)) { + ds_put_cstr(s, "arp,"); + } else { + skip_type = false; + } + } + for (i = 0; i < FLOW_N_REGS; i++) { + switch (wc->reg_masks[i]) { + case 0: + break; + case UINT32_MAX: + ds_put_format(s, "reg%d=0x%"PRIx32",", i, f->regs[i]); + break; + default: + ds_put_format(s, "reg%d=0x%"PRIx32"/0x%"PRIx32",", + i, f->regs[i], wc->reg_masks[i]); + break; + } + } + switch (wc->tun_id_mask) { + case 0: + break; + case CONSTANT_HTONLL(UINT64_MAX): + ds_put_format(s, "tun_id=%#"PRIx64",", ntohll(f->tun_id)); + break; + default: + ds_put_format(s, "tun_id=%#"PRIx64"/%#"PRIx64",", + 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",", f->in_port); + } + if (wc->vlan_tci_mask) { + ovs_be16 vid_mask = wc->vlan_tci_mask & htons(VLAN_VID_MASK); + ovs_be16 pcp_mask = wc->vlan_tci_mask & htons(VLAN_PCP_MASK); + ovs_be16 cfi = wc->vlan_tci_mask & htons(VLAN_CFI); + + if (cfi && f->vlan_tci & htons(VLAN_CFI) + && (!vid_mask || vid_mask == htons(VLAN_VID_MASK)) + && (!pcp_mask || pcp_mask == htons(VLAN_PCP_MASK)) + && (vid_mask || pcp_mask)) { + if (vid_mask) { + ds_put_format(s, "dl_vlan=%"PRIu16",", + vlan_tci_to_vid(f->vlan_tci)); + } + if (pcp_mask) { + 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)); + } + } + 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, "arp_op=%"PRIu8",", f->nw_proto); + } else { + ds_put_format(s, "nw_proto=%"PRIu8",", f->nw_proto); + } + } + if (f->dl_type == htons(ETH_TYPE_ARP)) { + format_eth_masked(s, "arp_sha", f->arp_sha, wc->arp_sha_mask); + format_eth_masked(s, "arp_tha", f->arp_tha, wc->arp_tha_mask); + } + 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) { + 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) { + 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); + format_eth_masked(s, "nd_sll", f->arp_sha, wc->arp_sha_mask); + format_eth_masked(s, "nd_tll", f->arp_tha, wc->arp_tha_mask); + } 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) == ',') { + s->length--; + } } /* Converts 'rule' to a string and returns the string. The caller must free @@ -351,22 +776,16 @@ char * cls_rule_to_string(const struct cls_rule *rule) { struct ds s = DS_EMPTY_INITIALIZER; - ds_put_format(&s, "wildcards=%x priority=%u ", - rule->wc.wildcards, rule->priority); - flow_format(&s, &rule->flow); - return ds_cstr(&s); + cls_rule_format(rule, &s); + return ds_steal_cstr(&s); } -/* Prints cls_rule 'rule', for debugging. - * - * (The output could be improved and expanded, but this was good enough to - * debug the classifier.) */ void cls_rule_print(const struct cls_rule *rule) { - printf("wildcards=%x priority=%u ", rule->wc.wildcards, rule->priority); - flow_print(stdout, &rule->flow); - putc('\n', stdout); + char *s = cls_rule_to_string(rule); + puts(s); + free(s); } /* Initializes 'cls' as a classifier that initially contains no classification @@ -409,14 +828,6 @@ classifier_count(const struct classifier *cls) return cls->n_rules; } -/* Returns the number of rules in 'classifier' that have no wildcards. */ -int -classifier_count_exact(const struct classifier *cls) -{ - struct cls_table *exact_table = classifier_exact_table(cls); - return exact_table ? exact_table->n_table_rules : 0; -} - /* Inserts 'rule' into 'cls'. Until 'rule' is removed from 'cls', the caller * must not modify or free it. * @@ -430,7 +841,7 @@ classifier_count_exact(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; @@ -448,6 +859,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 @@ -470,7 +894,7 @@ classifier_remove(struct classifier *cls, struct cls_rule *rule) hmap_replace(&table->rules, &rule->hmap_node, &next->hmap_node); } - if (--table->n_table_rules == 0 && !table->n_refs) { + if (--table->n_table_rules == 0) { destroy_table(cls, table); } @@ -479,24 +903,18 @@ classifier_remove(struct classifier *cls, struct cls_rule *rule) /* Finds and returns the highest-priority rule in 'cls' that matches 'flow'. * Returns a null pointer if no rules in 'cls' match 'flow'. If multiple rules - * of equal priority match 'flow', returns one arbitrarily. - * - * 'include' is a combination of CLS_INC_* values that specify tables to - * include in the search. */ + * of equal priority match 'flow', returns one arbitrarily. */ struct cls_rule * -classifier_lookup(const struct classifier *cls, const struct flow *flow, - int include) +classifier_lookup(const struct classifier *cls, const struct flow *flow) { struct cls_table *table; struct cls_rule *best; best = NULL; HMAP_FOR_EACH (table, hmap_node, &cls->tables) { - if (should_include(table, include)) { - struct cls_rule *rule = find_match(table, flow); - if (rule && (!best || rule->priority > best->priority)) { - best = rule; - } + struct cls_rule *rule = find_match(table, flow); + if (rule && (!best || rule->priority > best->priority)) { + best = rule; } } return best; @@ -504,10 +922,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) @@ -521,9 +936,6 @@ classifier_find_rule_exactly(const struct classifier *cls, } head = find_equal(table, &target->flow, flow_hash(&target->flow, 0)); - if (!target->wc.wildcards) { - return head; - } FOR_EACH_RULE_IN_LIST (rule, head) { if (target->priority >= rule->priority) { return target->priority == rule->priority ? rule : NULL; @@ -561,113 +973,138 @@ classifier_rule_overlaps(const struct classifier *cls, return false; } -/* Searches 'cls' for rules that exactly match 'target' or are more specific - * than 'target'. That is, a given 'rule' matches 'target' if, for every - * field: +/* 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: * - * - 'target' and 'rule' specify the same (non-wildcarded) value for the + * - 'criteria' and 'rule' specify the same (non-wildcarded) value for the * field, or * - * - 'target' wildcards the field, + * - 'criteria' wildcards the field, * - * but not if: + * Conversely, 'rule' does not match 'criteria' and this function returns false + * if, for at least one field: * - * - 'target' and 'rule' specify different values for the field, or + * - 'criteria' and 'rule' specify different values for the field, or * - * - 'target' specifies a value for the field but 'rule' wildcards it. + * - 'criteria' specifies a value for the field but 'rule' wildcards it. * * Equivalently, the truth table for whether a field matches is: * * rule * - * wildcard exact - * +---------+---------+ - * t wild | yes | yes | - * a card | | | + * c wildcard exact * r +---------+---------+ - * g exact | no |if values| - * e | |are equal| - * t +---------+---------+ + * 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 target->priority. - * - * 'callback' is allowed to delete the rule that is passed as its argument, but - * it must not delete (or move) any other rules in 'cls' that have the same - * wildcards as the argument rule. */ -void -classifier_for_each_match(const struct classifier *cls_, - const struct cls_rule *target, - int include, cls_cb_func *callback, void *aux) -{ - struct classifier *cls = (struct classifier *) cls_; - struct cls_table *table, *next_table; - - for (table = classifier_first_table(cls); table; table = next_table) { - if (should_include(table, include) - && !flow_wildcards_has_extra(&table->wc, &target->wc)) { - /* We have eliminated the "no" case in the truth table above. Two - * of the three remaining cases are trivial. We only need to check - * the fourth case, where both 'rule' and 'target' require an exact - * match. */ - struct cls_rule *head, *next_head; - - table->n_refs++; - HMAP_FOR_EACH_SAFE (head, next_head, hmap_node, &table->rules) { - if (flow_equal_except(&head->flow, &target->flow, - &target->wc)) { - struct cls_rule *rule, *next_rule; - - FOR_EACH_RULE_IN_LIST_SAFE (rule, next_rule, head) { - callback(rule, aux); - } - } - } - next_table = classifier_next_table(cls, table); - if (!--table->n_refs && !table->n_table_rules) { - destroy_table(cls, table); + * 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. */ + +static bool +rule_matches(const struct cls_rule *rule, const struct cls_rule *target) +{ + return (!target + || flow_equal_except(&rule->flow, &target->flow, &target->wc)); +} + +static struct cls_rule * +search_table(const struct cls_table *table, const struct cls_rule *target) +{ + if (!target || !flow_wildcards_has_extra(&table->wc, &target->wc)) { + struct cls_rule *rule; + + HMAP_FOR_EACH (rule, hmap_node, &table->rules) { + if (rule_matches(rule, target)) { + return rule; } - } else { - next_table = classifier_next_table(cls, table); } } + return NULL; } -/* 'callback' is allowed to delete the rule that is passed as its argument, but - * it must not delete (or move) any other rules in 'cls' that have the same - * wildcards as the argument rule. +/* Initializes 'cursor' for iterating through rules in 'cls': * - * If 'include' is CLS_INC_EXACT then CLASSIFIER_FOR_EACH_EXACT_RULE is - * probably easier to use. */ + * - If 'target' is null, the cursor will visit every rule in 'cls'. + * + * - If 'target' is nonnull, the cursor will visit each 'rule' in 'cls' + * such that cls_rule_is_loose_match(rule, target) returns true. + * + * Ignores target->priority. */ void -classifier_for_each(const struct classifier *cls_, int include, - cls_cb_func *callback, void *aux) +cls_cursor_init(struct cls_cursor *cursor, const struct classifier *cls, + const struct cls_rule *target) { - struct classifier *cls = (struct classifier *) cls_; - struct cls_table *table, *next_table; + cursor->cls = cls; + cursor->target = target; +} - for (table = classifier_first_table(cls); table; table = next_table) { - if (should_include(table, include)) { - struct cls_rule *head, *next_head; +/* Returns the first matching cls_rule in 'cursor''s iteration, or a null + * pointer if there are no matches. */ +struct cls_rule * +cls_cursor_first(struct cls_cursor *cursor) +{ + struct cls_table *table; - table->n_refs++; - HMAP_FOR_EACH_SAFE (head, next_head, hmap_node, &table->rules) { - struct cls_rule *rule, *next_rule; + HMAP_FOR_EACH (table, hmap_node, &cursor->cls->tables) { + struct cls_rule *rule = search_table(table, cursor->target); + if (rule) { + cursor->table = table; + return rule; + } + } - FOR_EACH_RULE_IN_LIST_SAFE (rule, next_rule, head) { - callback(rule, aux); - } - } - next_table = classifier_next_table(cls, table); - if (!--table->n_refs && !table->n_table_rules) { - destroy_table(cls, table); - } - } else { - next_table = classifier_next_table(cls, table); + return NULL; +} + +/* Returns the next matching cls_rule in 'cursor''s iteration, or a null + * pointer if there are no more matches. */ +struct cls_rule * +cls_cursor_next(struct cls_cursor *cursor, struct cls_rule *rule) +{ + const struct cls_table *table; + struct cls_rule *next; + + next = next_rule_in_list__(rule); + if (next->priority < rule->priority) { + return next; + } + + /* 'next' is the head of the list, that is, the rule that is included in + * the table's hmap. (This is important when the classifier contains rules + * that differ only in priority.) */ + rule = next; + HMAP_FOR_EACH_CONTINUE (rule, hmap_node, &cursor->table->rules) { + if (rule_matches(rule, cursor->target)) { + return rule; } } + + table = cursor->table; + HMAP_FOR_EACH_CONTINUE (table, hmap_node, &cursor->cls->tables) { + rule = search_table(table, cursor->target); + if (rule) { + cursor->table = table; + return rule; + } + } + + return NULL; } static struct cls_table * @@ -675,7 +1112,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; @@ -692,25 +1129,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) { @@ -719,28 +1143,28 @@ destroy_table(struct classifier *cls, struct cls_table *table) free(table); } -/* Returns true if 'table' should be included by an operation with the - * specified 'include' (a combination of CLS_INC_*). */ -static bool -should_include(const struct cls_table *table, int include) -{ - return include & (table->wc.wildcards ? CLS_INC_WILD : CLS_INC_EXACT); -} - 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; } @@ -798,75 +1222,85 @@ insert_rule(struct cls_table *table, struct cls_rule *new) } static struct cls_rule * -next_rule_in_list(struct cls_rule *rule) +next_rule_in_list__(struct cls_rule *rule) { struct cls_rule *next = OBJECT_CONTAINING(rule->list.next, next, list); + return next; +} + +static struct cls_rule * +next_rule_in_list(struct cls_rule *rule) +{ + struct cls_rule *next = next_rule_in_list__(rule); return next->priority < rule->priority ? next : NULL; } static bool -flow_equal_except(const struct flow *a, const struct flow *b, - const struct flow_wildcards *wildcards) +ipv6_equal_except(const struct in6_addr *a, const struct in6_addr *b, + const struct in6_addr *mask) { - const uint32_t wc = wildcards->wildcards; + int i; - BUILD_ASSERT_DECL(FLOW_SIG_SIZE == 37); +#ifdef s6_addr32 + for (i=0; i<4; i++) { + if ((a->s6_addr32[i] ^ b->s6_addr32[i]) & mask->s6_addr32[i]) { + return false; + } + } +#else + for (i=0; i<16; i++) { + if ((a->s6_addr[i] ^ b->s6_addr[i]) & mask->s6_addr[i]) { + return false; + } + } +#endif - return ((wc & NXFW_TUN_ID || a->tun_id == b->tun_id) - && !((a->nw_src ^ b->nw_src) & wildcards->nw_src_mask) - && !((a->nw_dst ^ b->nw_dst) & wildcards->nw_dst_mask) - && (wc & OFPFW_IN_PORT || a->in_port == b->in_port) - && (wc & OFPFW_DL_VLAN || a->dl_vlan == b->dl_vlan) - && (wc & OFPFW_DL_TYPE || a->dl_type == b->dl_type) - && (wc & OFPFW_TP_SRC || a->tp_src == b->tp_src) - && (wc & OFPFW_TP_DST || a->tp_dst == b->tp_dst) - && (wc & OFPFW_DL_SRC || eth_addr_equals(a->dl_src, b->dl_src)) - && (wc & OFPFW_DL_DST || eth_addr_equals(a->dl_dst, b->dl_dst)) - && (wc & OFPFW_NW_PROTO || a->nw_proto == b->nw_proto) - && (wc & OFPFW_DL_VLAN_PCP || a->dl_vlan_pcp == b->dl_vlan_pcp) - && (wc & OFPFW_NW_TOS || a->nw_tos == b->nw_tos)); + return true; } -static void -zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards) + +static bool +flow_equal_except(const struct flow *a, const struct flow *b, + const struct flow_wildcards *wildcards) { - const uint32_t wc = wildcards->wildcards; + const flow_wildcards_t wc = wildcards->wildcards; + int i; - BUILD_ASSERT_DECL(FLOW_SIG_SIZE == 37); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 14); - if (wc & NXFW_TUN_ID) { - flow->tun_id = 0; - } - flow->nw_src &= wildcards->nw_src_mask; - flow->nw_dst &= wildcards->nw_dst_mask; - if (wc & OFPFW_IN_PORT) { - flow->in_port = 0; - } - if (wc & OFPFW_DL_VLAN) { - flow->dl_vlan = 0; - } - if (wc & OFPFW_DL_TYPE) { - flow->dl_type = 0; - } - if (wc & OFPFW_TP_SRC) { - flow->tp_src = 0; - } - if (wc & OFPFW_TP_DST) { - flow->tp_dst = 0; - } - if (wc & OFPFW_DL_SRC) { - memset(flow->dl_src, 0, sizeof flow->dl_src); - } - if (wc & OFPFW_DL_DST) { - memset(flow->dl_dst, 0, sizeof flow->dl_dst); - } - if (wc & OFPFW_NW_PROTO) { - flow->nw_proto = 0; - } - if (wc & OFPFW_DL_VLAN_PCP) { - flow->dl_vlan_pcp = 0; - } - if (wc & OFPFW_NW_TOS) { - flow->nw_tos = 0; + for (i = 0; i < FLOW_N_REGS; i++) { + if ((a->regs[i] ^ b->regs[i]) & wildcards->reg_masks[i]) { + return false; + } } + + 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) + && !((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_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) + && eth_addr_equal_except(a->arp_sha, b->arp_sha, + wildcards->arp_sha_mask) + && eth_addr_equal_except(a->arp_tha, b->arp_tha, + wildcards->arp_tha_mask) + && !((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) + && ipv6_equal_except(&a->nd_target, &b->nd_target, + &wildcards->nd_target_mask)); }