X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fclassifier.c;h=02011e0cc01defbc7df9524dc6de1e471014165d;hb=7cba02e442012a7ae6cfdfe67f858a18057e5470;hp=76a33dd253f84671bcda7d577297ed56e6bbcf63;hpb=844dff325b1f6a6f520fce9242c85162275ab7ad;p=openvswitch diff --git a/lib/classifier.c b/lib/classifier.c index 76a33dd2..02011e0c 100644 --- a/lib/classifier.c +++ b/lib/classifier.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010 Nicira Networks. + * Copyright (c) 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,8 @@ #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 *, @@ -43,7 +45,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) \ @@ -92,81 +93,10 @@ 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 | FWW_ALL); + flow_wildcards_init_catchall(&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) -{ - uint32_t wildcards = ntohl(match->wildcards) & OVSFW_ALL; - - rule->priority = !wildcards ? UINT16_MAX : priority; - - rule->flow.tun_id = 0; - if (flow_format != NXFF_TUN_ID_FROM_COOKIE) { - wildcards |= NXFW_TUN_ID; - } else { - if (!(wildcards & NXFW_TUN_ID)) { - rule->flow.tun_id = htonl(ntohll(cookie) >> 32); - } - } - if (wildcards & OFPFW_DL_DST) { - /* OpenFlow 1.0 OFPFW_DL_DST covers the whole Ethernet destination, but - * internally to OVS it excludes the multicast bit, which has to be set - * separately with FWW_ETH_MCAST. */ - wildcards |= FWW_ETH_MCAST; - } - flow_wildcards_init(&rule->wc, wildcards); - - rule->flow.nw_src = match->nw_src; - rule->flow.nw_dst = match->nw_dst; - rule->flow.in_port = (match->in_port == htons(OFPP_LOCAL) ? ODPP_LOCAL - : ntohs(match->in_port)); - rule->flow.dl_vlan = match->dl_vlan; - rule->flow.dl_vlan_pcp = match->dl_vlan_pcp; - rule->flow.dl_type = match->dl_type; - rule->flow.tp_src = match->tp_src; - rule->flow.tp_dst = match->tp_dst; - memcpy(rule->flow.dl_src, match->dl_src, ETH_ADDR_LEN); - memcpy(rule->flow.dl_dst, match->dl_dst, ETH_ADDR_LEN); - rule->flow.nw_tos = match->nw_tos; - rule->flow.nw_proto = match->nw_proto; - - cls_rule_zero_wildcarded_fields(rule); -} - -/* Converts 'rule' into an OpenFlow match structure 'match' with the given flow - * format 'flow_format' (one of NXFF_*). */ -void -cls_rule_to_match(const struct cls_rule *rule, int flow_format, - struct ofp_match *match) -{ - match->wildcards = htonl(rule->wc.wildcards - & (flow_format == NXFF_TUN_ID_FROM_COOKIE - ? OVSFW_ALL : OFPFW_ALL)); - match->in_port = htons(rule->flow.in_port == ODPP_LOCAL ? OFPP_LOCAL - : rule->flow.in_port); - match->dl_vlan = rule->flow.dl_vlan; - match->dl_vlan_pcp = rule->flow.dl_vlan_pcp; - memcpy(match->dl_src, rule->flow.dl_src, ETH_ADDR_LEN); - memcpy(match->dl_dst, rule->flow.dl_dst, ETH_ADDR_LEN); - match->dl_type = rule->flow.dl_type; - match->nw_src = rule->flow.nw_src; - match->nw_dst = rule->flow.nw_dst; - match->nw_tos = rule->flow.nw_tos; - match->nw_proto = rule->flow.nw_proto; - match->tp_src = rule->flow.tp_src; - match->tp_dst = rule->flow.tp_dst; - memset(match->pad1, '\0', sizeof match->pad1); - memset(match->pad2, '\0', sizeof match->pad2); -} - /* For each bit or field wildcarded in 'rule', sets the corresponding bit or * field in 'flow' to all-0-bits. It is important to maintain this invariant * in a clr_rule that might be inserted into a classifier. @@ -178,135 +108,177 @@ cls_rule_to_match(const struct cls_rule *rule, int flow_format, 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_reg_masked(struct cls_rule *rule, unsigned int reg_idx, + uint32_t value, uint32_t mask) +{ + 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_in_port(struct cls_rule *rule, uint16_t odp_port) +cls_rule_set_tun_id(struct cls_rule *rule, ovs_be64 tun_id) { - rule->wc.wildcards &= ~OFPFW_IN_PORT; - rule->flow.in_port = odp_port; + 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; } void cls_rule_set_dl_src(struct cls_rule *rule, const uint8_t dl_src[ETH_ADDR_LEN]) { - rule->wc.wildcards &= ~OFPFW_DL_SRC; + rule->wc.wildcards &= ~FWW_DL_SRC; memcpy(rule->flow.dl_src, dl_src, ETH_ADDR_LEN); } +/* Modifies 'rule' so that the 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 | FWW_ETH_MCAST); + rule->wc.wildcards &= ~(FWW_DL_DST | FWW_ETH_MCAST); memcpy(rule->flow.dl_dst, dl_dst, ETH_ADDR_LEN); } -bool +/* Modifies 'rule' so that the Ethernet address must match 'dl_dst' after each + * byte is ANDed with the appropriate byte in 'mask'. + * + * This function will assert-fail if 'mask' is invalid. Only 'mask' values + * accepted by flow_wildcards_is_dl_dst_mask_valid() are allowed. */ +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]) +{ + flow_wildcards_t *wc = &rule->wc.wildcards; + size_t i; + + *wc = flow_wildcards_set_dl_dst_mask(*wc, mask); + for (i = 0; i < ETH_ADDR_LEN; i++) { + rule->flow.dl_dst[i] = dl_dst[i] & mask[i]; + } +} + +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)) { + if (dl_vlan == htons(OFP_VLAN_NONE)) { + cls_rule_set_dl_tci(rule, htons(0)); + } 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); } +} - 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; + 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); + 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->wc.wildcards &= ~FWW_TP_SRC; rule->flow.tp_src = tp_src; } void cls_rule_set_tp_dst(struct cls_rule *rule, ovs_be16 tp_dst) { - rule->wc.wildcards &= ~OFPFW_TP_DST; + rule->wc.wildcards &= ~FWW_TP_DST; rule->flow.tp_dst = tp_dst; } 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; } @@ -347,14 +319,14 @@ cls_rule_set_nw_dst_masked(struct cls_rule *rule, ovs_be32 ip, ovs_be32 mask) void cls_rule_set_nw_tos(struct cls_rule *rule, uint8_t nw_tos) { - rule->wc.wildcards &= ~OFPFW_NW_TOS; + rule->wc.wildcards &= ~FWW_NW_TOS; rule->flow.nw_tos = nw_tos & IP_DSCP_MASK; } void cls_rule_set_icmp_type(struct cls_rule *rule, uint8_t icmp_type) { - rule->wc.wildcards &= ~OFPFW_ICMP_TYPE; + rule->wc.wildcards &= ~FWW_TP_SRC; rule->flow.icmp_type = htons(icmp_type); } @@ -362,10 +334,67 @@ cls_rule_set_icmp_type(struct cls_rule *rule, uint8_t icmp_type) void cls_rule_set_icmp_code(struct cls_rule *rule, uint8_t icmp_code) { - rule->wc.wildcards &= ~OFPFW_ICMP_CODE; + rule->wc.wildcards &= ~FWW_TP_DST; rule->flow.icmp_code = htons(icmp_code); } +void +cls_rule_set_arp_sha(struct cls_rule *rule, const uint8_t sha[ETH_ADDR_LEN]) +{ + rule->wc.wildcards &= ~FWW_ARP_SHA; + memcpy(rule->flow.arp_sha, sha, ETH_ADDR_LEN); +} + +void +cls_rule_set_arp_tha(struct cls_rule *rule, const uint8_t tha[ETH_ADDR_LEN]) +{ + rule->wc.wildcards &= ~FWW_ARP_THA; + memcpy(rule->flow.arp_tha, 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); +} + +bool +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; + } +} + +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); +} + +bool +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; + } +} + +void +cls_rule_set_nd_target(struct cls_rule *rule, const struct in6_addr *target) +{ + rule->wc.wildcards &= ~FWW_ND_TARGET; + rule->flow.nd_target = *target; +} + /* 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 @@ -376,28 +405,253 @@ 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_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, ','); + } +} + +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 == 1); + + 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; + } + 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)); + } + } + 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; + } + 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); + } 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)) { + if (!(w & FWW_ARP_SHA)) { + ds_put_format(s, "arp_sha="ETH_ADDR_FMT",", + ETH_ADDR_ARGS(f->arp_sha)); + } + if (!(w & FWW_ARP_THA)) { + ds_put_format(s, "arp_tha="ETH_ADDR_FMT",", + ETH_ADDR_ARGS(f->arp_tha)); + } + } + if (!(w & FWW_NW_TOS)) { + ds_put_format(s, "nw_tos=%"PRIu8",", f->nw_tos); + } + 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)); + } + } 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)); + } + if (!(w & FWW_ND_TARGET)) { + ds_put_cstr(s, "nd_target="); + print_ipv6_addr(s, &f->nd_target); + ds_put_char(s, ','); + } + if (!(w & FWW_ARP_SHA)) { + ds_put_format(s, "nd_sll="ETH_ADDR_FMT",", + ETH_ADDR_ARGS(f->arp_sha)); + } + if (!(w & FWW_ARP_THA)) { + ds_put_format(s, "nd_tll="ETH_ADDR_FMT",", + ETH_ADDR_ARGS(f->arp_tha)); + } + } else { + if (!(w & FWW_TP_SRC)) { + ds_put_format(s, "tp_src=%"PRIu16",", ntohs(f->tp_src)); + } + if (!(w & FWW_TP_DST)) { + ds_put_format(s, "tp_dst=%"PRIu16",", ntohs(f->tp_dst)); + } + } + + if (s->length > start_len && ds_last(s) == ',') { + s->length--; + } +} + /* Converts 'rule' to a string and returns the string. The caller must free * the string (with free()). */ 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 @@ -453,7 +707,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; @@ -471,6 +725,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 @@ -521,10 +788,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) @@ -538,9 +802,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; @@ -703,7 +964,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; @@ -720,7 +981,7 @@ 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)); + hmap_insert(&cls->tables, &table->hmap_node, flow_wildcards_hash(wc, 0)); return table; } @@ -754,7 +1015,7 @@ find_match(const struct cls_table *table, const struct flow *flow) struct flow f; f = *flow; - zero_wildcards(&f, &table->wc); + 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)) { @@ -831,14 +1092,38 @@ next_rule_in_list(struct cls_rule *rule) return next->priority < rule->priority ? next : NULL; } +static bool +ipv6_equal_except(const struct in6_addr *a, const struct in6_addr *b, + const struct in6_addr *mask) +{ + int i; + +#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 true; +} + + 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 + FLOW_N_REGS * 4); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 1); for (i = 0; i < FLOW_N_REGS; i++) { if ((a->regs[i] ^ b->regs[i]) & wildcards->reg_masks[i]) { @@ -846,76 +1131,32 @@ flow_equal_except(const struct flow *a, const struct flow *b, } } - return ((wc & NXFW_TUN_ID || a->tun_id == b->tun_id) + return (!((a->tun_id ^ b->tun_id) & wildcards->tun_id_mask) && !((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 + && (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)) - && (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)); -} - -static void -zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards) -{ - const uint32_t wc = wildcards->wildcards; - int i; - - BUILD_ASSERT_DECL(FLOW_SIG_SIZE == 37 + 4 * FLOW_N_REGS); - - for (i = 0; i < FLOW_N_REGS; i++) { - flow->regs[i] &= wildcards->reg_masks[i]; - } - 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) { - flow->dl_dst[0] &= 0x01; - memset(&flow->dl_dst[1], 0, 5); - } - if (wc & FWW_ETH_MCAST) { - flow->dl_dst[0] &= 0xfe; - } - 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; - } + && (wc & FWW_ETH_MCAST + || !((a->dl_dst[0] ^ b->dl_dst[0]) & 0x01)) + && (wc & FWW_NW_PROTO || a->nw_proto == b->nw_proto) + && (wc & FWW_NW_TOS || a->nw_tos == b->nw_tos) + && (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)) + && 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) + && (wc & FWW_ND_TARGET + || ipv6_addr_equals(&a->nd_target, &b->nd_target))); }