X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fflow.c;h=f1d2cad292e112d3d34f6064020781539358512a;hb=4b0424809b823101c969a0691fc1db0c880ae64a;hp=0e7c493a0b0315f593f77552c8859f32231c9817;hpb=a24de7eecaefbad2967bb093e4a12c9dbb9d9d62;p=sliver-openvswitch.git diff --git a/lib/flow.c b/lib/flow.c index 0e7c493a0..f1d2cad29 100644 --- a/lib/flow.c +++ b/lib/flow.c @@ -35,14 +35,20 @@ #include "ofpbuf.h" #include "openflow/openflow.h" #include "packets.h" +#include "random.h" #include "unaligned.h" -#include "vlog.h" - -VLOG_DEFINE_THIS_MODULE(flow); COVERAGE_DEFINE(flow_extract); COVERAGE_DEFINE(miniflow_malloc); +/* U32 indices for segmented flow classification. */ +const uint8_t flow_segment_u32s[4] = { + FLOW_SEGMENT_1_ENDS_AT / 4, + FLOW_SEGMENT_2_ENDS_AT / 4, + FLOW_SEGMENT_3_ENDS_AT / 4, + FLOW_U32S +}; + static struct arp_eth_header * pull_arp(struct ofpbuf *packet) { @@ -103,9 +109,11 @@ static void parse_mpls(struct ofpbuf *b, struct flow *flow) { struct mpls_hdr *mh; + bool top = true; while ((mh = ofpbuf_try_pull(b, sizeof *mh))) { - if (flow->mpls_depth++ == 0) { + if (top) { + top = false; flow->mpls_lse = mh->mpls_lse; } if (mh->mpls_lse & htonl(MPLS_BOS_MASK)) { @@ -256,6 +264,7 @@ parse_tcp(struct ofpbuf *packet, struct ofpbuf *b, struct flow *flow) if (tcp) { flow->tp_src = tcp->tcp_src; flow->tp_dst = tcp->tcp_dst; + flow->tcp_flags = tcp->tcp_ctl & htons(0x0fff); packet->l7 = b->data; } } @@ -510,11 +519,23 @@ flow_zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards) } } +void +flow_unwildcard_tp_ports(const struct flow *flow, struct flow_wildcards *wc) +{ + if (flow->nw_proto != IPPROTO_ICMP) { + memset(&wc->masks.tp_src, 0xff, sizeof wc->masks.tp_src); + memset(&wc->masks.tp_dst, 0xff, sizeof wc->masks.tp_dst); + } else { + wc->masks.tp_src = htons(0xff); + wc->masks.tp_dst = htons(0xff); + } +} + /* Initializes 'fmd' with the metadata found in 'flow'. */ void flow_get_metadata(const struct flow *flow, struct flow_metadata *fmd) { - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 20); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 23); fmd->tun_id = flow->tunnel.tun_id; fmd->tun_src = flow->tunnel.ip_src; @@ -577,6 +598,24 @@ format_flags(struct ds *ds, const char *(*bit_to_string)(uint32_t), ds_chomp(ds, del); } +void +format_flags_masked(struct ds *ds, const char *name, + const char *(*bit_to_string)(uint32_t), uint32_t flags, + uint32_t mask) +{ + if (name) { + ds_put_format(ds, "%s=", name); + } + while (mask) { + uint32_t bit = rightmost_1bit(mask); + const char *s = bit_to_string(bit); + + ds_put_format(ds, "%s%s", (flags & bit) ? "+" : "-", + s ? s : "[Unknown]"); + mask &= ~bit; + } +} + void flow_format(struct ds *ds, const struct flow *flow) { @@ -603,13 +642,13 @@ flow_wildcards_init_catchall(struct flow_wildcards *wc) memset(&wc->masks, 0, sizeof wc->masks); } -/* Initializes 'wc' as an exact-match set of wildcards; that is, 'wc' does not - * wildcard any bits or fields. */ +/* Clear the metadata and register wildcard masks. They are not packet + * header fields. */ void -flow_wildcards_init_exact(struct flow_wildcards *wc) +flow_wildcards_clear_non_packet_fields(struct flow_wildcards *wc) { - memset(&wc->masks, 0xff, sizeof wc->masks); - memset(wc->masks.zeros, 0, sizeof wc->masks.zeros); + memset(&wc->masks.metadata, 0, sizeof wc->masks.metadata); + memset(&wc->masks.regs, 0, sizeof wc->masks.regs); } /* Returns true if 'wc' matches every packet, false if 'wc' fixes any bits or @@ -670,16 +709,11 @@ static void flow_union_with_miniflow(struct flow *dst, const struct miniflow *src) { uint32_t *dst_u32 = (uint32_t *) dst; - int ofs; - int i; - - ofs = 0; - for (i = 0; i < MINI_N_MAPS; i++) { - uint32_t map; + const uint32_t *p = src->values; + uint64_t map; - for (map = src->map[i]; map; map = zero_rightmost_1bit(map)) { - dst_u32[raw_ctz(map) + i * 32] |= src->values[ofs++]; - } + for (map = src->map; map; map = zero_rightmost_1bit(map)) { + dst_u32[raw_ctz(map)] |= *p++; } } @@ -691,6 +725,43 @@ flow_wildcards_fold_minimask(struct flow_wildcards *wc, flow_union_with_miniflow(&wc->masks, &mask->masks); } +uint64_t +miniflow_get_map_in_range(const struct miniflow *miniflow, + uint8_t start, uint8_t end, unsigned int *offset) +{ + uint64_t map = miniflow->map; + *offset = 0; + + if (start > 0) { + uint64_t msk = (UINT64_C(1) << start) - 1; /* 'start' LSBs set */ + *offset = count_1bits(map & msk); + map &= ~msk; + } + if (end < FLOW_U32S) { + uint64_t msk = (UINT64_C(1) << end) - 1; /* 'end' LSBs set */ + map &= msk; + } + return map; +} + +/* Fold minimask 'mask''s wildcard mask into 'wc's wildcard mask + * in range [start, end). */ +void +flow_wildcards_fold_minimask_range(struct flow_wildcards *wc, + const struct minimask *mask, + uint8_t start, uint8_t end) +{ + uint32_t *dst_u32 = (uint32_t *)&wc->masks; + unsigned int offset; + uint64_t map = miniflow_get_map_in_range(&mask->masks, start, end, + &offset); + const uint32_t *p = mask->masks.values + offset; + + for (; map; map = zero_rightmost_1bit(map)) { + dst_u32[raw_ctz(map)] |= *p++; + } +} + /* Returns a hash of the wildcards in 'wc'. */ uint32_t flow_wildcards_hash(const struct flow_wildcards *wc, uint32_t basis) @@ -801,6 +872,46 @@ flow_hash_symmetric_l4(const struct flow *flow, uint32_t basis) return jhash_bytes(&fields, sizeof fields, basis); } +/* Initialize a flow with random fields that matter for nx_hash_fields. */ +void +flow_random_hash_fields(struct flow *flow) +{ + uint16_t rnd = random_uint16(); + + /* Initialize to all zeros. */ + memset(flow, 0, sizeof *flow); + + eth_addr_random(flow->dl_src); + eth_addr_random(flow->dl_dst); + + flow->vlan_tci = (OVS_FORCE ovs_be16) (random_uint16() & VLAN_VID_MASK); + + /* Make most of the random flows IPv4, some IPv6, and rest random. */ + flow->dl_type = rnd < 0x8000 ? htons(ETH_TYPE_IP) : + rnd < 0xc000 ? htons(ETH_TYPE_IPV6) : (OVS_FORCE ovs_be16)rnd; + + if (dl_type_is_ip_any(flow->dl_type)) { + if (flow->dl_type == htons(ETH_TYPE_IP)) { + flow->nw_src = (OVS_FORCE ovs_be32)random_uint32(); + flow->nw_dst = (OVS_FORCE ovs_be32)random_uint32(); + } else { + random_bytes(&flow->ipv6_src, sizeof flow->ipv6_src); + random_bytes(&flow->ipv6_dst, sizeof flow->ipv6_dst); + } + /* Make most of IP flows TCP, some UDP or SCTP, and rest random. */ + rnd = random_uint16(); + flow->nw_proto = rnd < 0x8000 ? IPPROTO_TCP : + rnd < 0xc000 ? IPPROTO_UDP : + rnd < 0xd000 ? IPPROTO_SCTP : (uint8_t)rnd; + if (flow->nw_proto == IPPROTO_TCP || + flow->nw_proto == IPPROTO_UDP || + flow->nw_proto == IPPROTO_SCTP) { + flow->tp_src = (OVS_FORCE ovs_be16)random_uint16(); + flow->tp_dst = (OVS_FORCE ovs_be16)random_uint16(); + } + } +} + /* Masks the fields in 'wc' that are used by the flow hash 'fields'. */ void flow_mask_hash_fields(const struct flow *flow, struct flow_wildcards *wc, @@ -823,14 +934,13 @@ flow_mask_hash_fields(const struct flow *flow, struct flow_wildcards *wc, } if (is_ip_any(flow)) { memset(&wc->masks.nw_proto, 0xff, sizeof wc->masks.nw_proto); - memset(&wc->masks.tp_src, 0xff, sizeof wc->masks.tp_src); - memset(&wc->masks.tp_dst, 0xff, sizeof wc->masks.tp_dst); + flow_unwildcard_tp_ports(flow, wc); } wc->masks.vlan_tci |= htons(VLAN_VID_MASK | VLAN_CFI); break; default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -848,7 +958,7 @@ flow_hash_fields(const struct flow *flow, enum nx_hash_fields fields, return flow_hash_symmetric_l4(flow, basis); } - NOT_REACHED(); + OVS_NOT_REACHED(); } /* Returns a string representation of 'fields'. */ @@ -968,6 +1078,78 @@ flow_set_mpls_bos(struct flow *flow, uint8_t bos) set_mpls_lse_bos(&flow->mpls_lse, bos); } + +static void +flow_compose_l4(struct ofpbuf *b, const struct flow *flow) +{ + if (!(flow->nw_frag & FLOW_NW_FRAG_ANY) + || !(flow->nw_frag & FLOW_NW_FRAG_LATER)) { + if (flow->nw_proto == IPPROTO_TCP) { + struct tcp_header *tcp; + + tcp = ofpbuf_put_zeros(b, sizeof *tcp); + tcp->tcp_src = flow->tp_src; + tcp->tcp_dst = flow->tp_dst; + tcp->tcp_ctl = TCP_CTL(ntohs(flow->tcp_flags), 5); + b->l7 = ofpbuf_tail(b); + } else if (flow->nw_proto == IPPROTO_UDP) { + struct udp_header *udp; + + udp = ofpbuf_put_zeros(b, sizeof *udp); + udp->udp_src = flow->tp_src; + udp->udp_dst = flow->tp_dst; + b->l7 = ofpbuf_tail(b); + } else if (flow->nw_proto == IPPROTO_SCTP) { + struct sctp_header *sctp; + + sctp = ofpbuf_put_zeros(b, sizeof *sctp); + sctp->sctp_src = flow->tp_src; + sctp->sctp_dst = flow->tp_dst; + b->l7 = ofpbuf_tail(b); + } else if (flow->nw_proto == IPPROTO_ICMP) { + struct icmp_header *icmp; + + icmp = ofpbuf_put_zeros(b, sizeof *icmp); + icmp->icmp_type = ntohs(flow->tp_src); + icmp->icmp_code = ntohs(flow->tp_dst); + icmp->icmp_csum = csum(icmp, ICMP_HEADER_LEN); + b->l7 = ofpbuf_tail(b); + } else if (flow->nw_proto == IPPROTO_ICMPV6) { + struct icmp6_hdr *icmp; + + icmp = ofpbuf_put_zeros(b, sizeof *icmp); + icmp->icmp6_type = ntohs(flow->tp_src); + icmp->icmp6_code = ntohs(flow->tp_dst); + + if (icmp->icmp6_code == 0 && + (icmp->icmp6_type == ND_NEIGHBOR_SOLICIT || + icmp->icmp6_type == ND_NEIGHBOR_ADVERT)) { + struct in6_addr *nd_target; + struct nd_opt_hdr *nd_opt; + + nd_target = ofpbuf_put_zeros(b, sizeof *nd_target); + *nd_target = flow->nd_target; + + if (!eth_addr_is_zero(flow->arp_sha)) { + nd_opt = ofpbuf_put_zeros(b, 8); + nd_opt->nd_opt_len = 1; + nd_opt->nd_opt_type = ND_OPT_SOURCE_LINKADDR; + memcpy(nd_opt + 1, flow->arp_sha, ETH_ADDR_LEN); + } + if (!eth_addr_is_zero(flow->arp_tha)) { + nd_opt = ofpbuf_put_zeros(b, 8); + nd_opt->nd_opt_len = 1; + nd_opt->nd_opt_type = ND_OPT_TARGET_LINKADDR; + memcpy(nd_opt + 1, flow->arp_tha, ETH_ADDR_LEN); + } + } + icmp->icmp6_cksum = (OVS_FORCE uint16_t) + csum(icmp, (char *)ofpbuf_tail(b) - (char *)icmp); + b->l7 = ofpbuf_tail(b); + } + } +} + /* Puts into 'b' a packet that flow_extract() would parse as having the given * 'flow'. * @@ -977,6 +1159,7 @@ flow_set_mpls_bos(struct flow *flow, uint8_t bos) void flow_compose(struct ofpbuf *b, const struct flow *flow) { + /* eth_compose() sets l3 pointer and makes sure it is 32-bit aligned. */ eth_compose(b, flow->dl_dst, flow->dl_src, ntohs(flow->dl_type), 0); if (flow->dl_type == htons(FLOW_DL_TYPE_NONE)) { struct eth_header *eth = b->l2; @@ -991,7 +1174,7 @@ flow_compose(struct ofpbuf *b, const struct flow *flow) if (flow->dl_type == htons(ETH_TYPE_IP)) { struct ip_header *ip; - b->l3 = ip = ofpbuf_put_zeros(b, sizeof *ip); + ip = ofpbuf_put_zeros(b, sizeof *ip); ip->ip_ihl_ver = IP_IHL_VER(5, 4); ip->ip_tos = flow->nw_tos; ip->ip_ttl = flow->nw_ttl; @@ -1005,43 +1188,32 @@ flow_compose(struct ofpbuf *b, const struct flow *flow) ip->ip_frag_off |= htons(100); } } - if (!(flow->nw_frag & FLOW_NW_FRAG_ANY) - || !(flow->nw_frag & FLOW_NW_FRAG_LATER)) { - if (flow->nw_proto == IPPROTO_TCP) { - struct tcp_header *tcp; - - b->l4 = tcp = ofpbuf_put_zeros(b, sizeof *tcp); - tcp->tcp_src = flow->tp_src; - tcp->tcp_dst = flow->tp_dst; - tcp->tcp_ctl = TCP_CTL(0, 5); - } else if (flow->nw_proto == IPPROTO_UDP) { - struct udp_header *udp; - - b->l4 = udp = ofpbuf_put_zeros(b, sizeof *udp); - udp->udp_src = flow->tp_src; - udp->udp_dst = flow->tp_dst; - } else if (flow->nw_proto == IPPROTO_SCTP) { - struct sctp_header *sctp; - - b->l4 = sctp = ofpbuf_put_zeros(b, sizeof *sctp); - sctp->sctp_src = flow->tp_src; - sctp->sctp_dst = flow->tp_dst; - } else if (flow->nw_proto == IPPROTO_ICMP) { - struct icmp_header *icmp; - - b->l4 = icmp = ofpbuf_put_zeros(b, sizeof *icmp); - icmp->icmp_type = ntohs(flow->tp_src); - icmp->icmp_code = ntohs(flow->tp_dst); - icmp->icmp_csum = csum(icmp, ICMP_HEADER_LEN); - } - } - ip = b->l3; + b->l4 = ofpbuf_tail(b); + + flow_compose_l4(b, flow); + ip->ip_tot_len = htons((uint8_t *) b->data + b->size - (uint8_t *) b->l3); ip->ip_csum = csum(ip, sizeof *ip); } else if (flow->dl_type == htons(ETH_TYPE_IPV6)) { - /* XXX */ + struct ovs_16aligned_ip6_hdr *nh; + + nh = ofpbuf_put_zeros(b, sizeof *nh); + put_16aligned_be32(&nh->ip6_flow, htonl(6 << 28) | + htonl(flow->nw_tos << 20) | flow->ipv6_label); + nh->ip6_hlim = flow->nw_ttl; + nh->ip6_nxt = flow->nw_proto; + + memcpy(&nh->ip6_src, &flow->ipv6_src, sizeof(nh->ip6_src)); + memcpy(&nh->ip6_dst, &flow->ipv6_dst, sizeof(nh->ip6_dst)); + + b->l4 = ofpbuf_tail(b); + + flow_compose_l4(b, flow); + + nh->ip6_plen = + b->l7 ? htons((uint8_t *) b->l7 - (uint8_t *) b->l4) : htons(0); } else if (flow->dl_type == htons(ETH_TYPE_ARP) || flow->dl_type == htons(ETH_TYPE_RARP)) { struct arp_eth_header *arp; @@ -1073,13 +1245,7 @@ flow_compose(struct ofpbuf *b, const struct flow *flow) static int miniflow_n_values(const struct miniflow *flow) { - int n, i; - - n = 0; - for (i = 0; i < MINI_N_MAPS; i++) { - n += popcount(flow->map[i]); - } - return n; + return count_1bits(flow->map); } static uint32_t * @@ -1093,36 +1259,63 @@ miniflow_alloc_values(struct miniflow *flow, int n) } } +/* Completes an initialization of 'dst' as a miniflow copy of 'src' begun by + * the caller. The caller must have already initialized 'dst->map' properly + * to indicate the significant uint32_t elements of 'src'. 'n' must be the + * number of 1-bits in 'dst->map'. + * + * Normally the significant elements are the ones that are non-zero. However, + * when a miniflow is initialized from a (mini)mask, the values can be zeroes, + * so that the flow and mask always have the same maps. + * + * This function initializes 'dst->values' (either inline if possible or with + * malloc() otherwise) and copies the uint32_t elements of 'src' indicated by + * 'dst->map' into it. */ +static void +miniflow_init__(struct miniflow *dst, const struct flow *src, int n) +{ + const uint32_t *src_u32 = (const uint32_t *) src; + unsigned int ofs; + uint64_t map; + + dst->values = miniflow_alloc_values(dst, n); + ofs = 0; + for (map = dst->map; map; map = zero_rightmost_1bit(map)) { + dst->values[ofs++] = src_u32[raw_ctz(map)]; + } +} + /* Initializes 'dst' as a copy of 'src'. The caller must eventually free 'dst' * with miniflow_destroy(). */ void miniflow_init(struct miniflow *dst, const struct flow *src) { const uint32_t *src_u32 = (const uint32_t *) src; - unsigned int ofs; unsigned int i; int n; /* Initialize dst->map, counting the number of nonzero elements. */ n = 0; - memset(dst->map, 0, sizeof dst->map); + dst->map = 0; + for (i = 0; i < FLOW_U32S; i++) { if (src_u32[i]) { - dst->map[i / 32] |= 1u << (i % 32); + dst->map |= UINT64_C(1) << i; n++; } } - /* Initialize dst->values. */ - dst->values = miniflow_alloc_values(dst, n); - ofs = 0; - for (i = 0; i < MINI_N_MAPS; i++) { - uint32_t map; + miniflow_init__(dst, src, n); +} - for (map = dst->map[i]; map; map = zero_rightmost_1bit(map)) { - dst->values[ofs++] = src_u32[raw_ctz(map) + i * 32]; - } - } +/* Initializes 'dst' as a copy of 'src', using 'mask->map' as 'dst''s map. The + * caller must eventually free 'dst' with miniflow_destroy(). */ +void +miniflow_init_with_minimask(struct miniflow *dst, const struct flow *src, + const struct minimask *mask) +{ + dst->map = mask->masks.map; + miniflow_init__(dst, src, miniflow_n_values(dst)); } /* Initializes 'dst' as a copy of 'src'. The caller must eventually free 'dst' @@ -1131,7 +1324,7 @@ void miniflow_clone(struct miniflow *dst, const struct miniflow *src) { int n = miniflow_n_values(src); - memcpy(dst->map, src->map, sizeof dst->map); + dst->map = src->map; dst->values = miniflow_alloc_values(dst, n); memcpy(dst->values, src->values, n * sizeof *dst->values); } @@ -1141,14 +1334,14 @@ miniflow_clone(struct miniflow *dst, const struct miniflow *src) void miniflow_move(struct miniflow *dst, struct miniflow *src) { - int n = miniflow_n_values(src); - if (n <= MINI_N_INLINE) { + if (src->values == src->inline_values) { dst->values = dst->inline_values; - memcpy(dst->values, src->values, n * sizeof *dst->values); + memcpy(dst->values, src->values, + miniflow_n_values(src) * sizeof *dst->values); } else { dst->values = src->values; } - memcpy(dst->map, src->map, sizeof dst->map); + dst->map = src->map; } /* Frees any memory owned by 'flow'. Does not free the storage in which 'flow' @@ -1172,21 +1365,12 @@ miniflow_expand(const struct miniflow *src, struct flow *dst) static const uint32_t * miniflow_get__(const struct miniflow *flow, unsigned int u32_ofs) { - if (!(flow->map[u32_ofs / 32] & (1u << (u32_ofs % 32)))) { + if (!(flow->map & (UINT64_C(1) << u32_ofs))) { static const uint32_t zero = 0; return &zero; - } else { - const uint32_t *p = flow->values; - - BUILD_ASSERT(MINI_N_MAPS == 2); - if (u32_ofs < 32) { - p += popcount(flow->map[0] & ((1u << u32_ofs) - 1)); - } else { - p += popcount(flow->map[0]); - p += popcount(flow->map[1] & ((1u << (u32_ofs - 32)) - 1)); - } - return p; } + return flow->values + + count_1bits(flow->map & ((UINT64_C(1) << u32_ofs) - 1)); } /* Returns the uint32_t that would be at byte offset '4 * u32_ofs' if 'flow' @@ -1220,16 +1404,31 @@ miniflow_get_vid(const struct miniflow *flow) bool miniflow_equal(const struct miniflow *a, const struct miniflow *b) { - int i; + const uint32_t *ap = a->values; + const uint32_t *bp = b->values; + const uint64_t a_map = a->map; + const uint64_t b_map = b->map; + uint64_t map; - for (i = 0; i < MINI_N_MAPS; i++) { - if (a->map[i] != b->map[i]) { - return false; + if (a_map == b_map) { + for (map = a_map; map; map = zero_rightmost_1bit(map)) { + if (*ap++ != *bp++) { + return false; + } + } + } else { + for (map = a_map | b_map; map; map = zero_rightmost_1bit(map)) { + uint64_t bit = rightmost_1bit(map); + uint64_t a_value = a_map & bit ? *ap++ : 0; + uint64_t b_value = b_map & bit ? *bp++ : 0; + + if (a_value != b_value) { + return false; + } } } - return !memcmp(a->values, b->values, - miniflow_n_values(a) * sizeof *a->values); + return true; } /* Returns true if 'a' and 'b' are equal at the places where there are 1-bits @@ -1239,20 +1438,17 @@ miniflow_equal_in_minimask(const struct miniflow *a, const struct miniflow *b, const struct minimask *mask) { const uint32_t *p; - int i; + uint64_t map; p = mask->masks.values; - for (i = 0; i < MINI_N_MAPS; i++) { - uint32_t map; - for (map = mask->masks.map[i]; map; map = zero_rightmost_1bit(map)) { - int ofs = raw_ctz(map) + i * 32; + for (map = mask->masks.map; map; map = zero_rightmost_1bit(map)) { + int ofs = raw_ctz(map); - if ((miniflow_get(a, ofs) ^ miniflow_get(b, ofs)) & *p) { - return false; - } - p++; + if ((miniflow_get(a, ofs) ^ miniflow_get(b, ofs)) & *p) { + return false; } + p++; } return true; @@ -1266,20 +1462,17 @@ miniflow_equal_flow_in_minimask(const struct miniflow *a, const struct flow *b, { const uint32_t *b_u32 = (const uint32_t *) b; const uint32_t *p; - int i; + uint64_t map; p = mask->masks.values; - for (i = 0; i < MINI_N_MAPS; i++) { - uint32_t map; - for (map = mask->masks.map[i]; map; map = zero_rightmost_1bit(map)) { - int ofs = raw_ctz(map) + i * 32; + for (map = mask->masks.map; map; map = zero_rightmost_1bit(map)) { + int ofs = raw_ctz(map); - if ((miniflow_get(a, ofs) ^ b_u32[ofs]) & *p) { - return false; - } - p++; + if ((miniflow_get(a, ofs) ^ b_u32[ofs]) & *p) { + return false; } + p++; } return true; @@ -1289,10 +1482,22 @@ miniflow_equal_flow_in_minimask(const struct miniflow *a, const struct flow *b, uint32_t miniflow_hash(const struct miniflow *flow, uint32_t basis) { - BUILD_ASSERT_DECL(MINI_N_MAPS == 2); - return hash_3words(flow->map[0], flow->map[1], - hash_words(flow->values, miniflow_n_values(flow), - basis)); + const uint32_t *p = flow->values; + uint32_t hash = basis; + uint64_t hash_map = 0; + uint64_t map; + + for (map = flow->map; map; map = zero_rightmost_1bit(map)) { + if (*p) { + hash = mhash_add(hash, *p); + hash_map |= rightmost_1bit(map); + } + p++; + } + hash = mhash_add(hash, hash_map); + hash = mhash_add(hash, hash_map >> 32); + + return mhash_finish(hash, p - flow->values); } /* Returns a hash value for the bits of 'flow' where there are 1-bits in @@ -1306,18 +1511,12 @@ miniflow_hash_in_minimask(const struct miniflow *flow, { const uint32_t *p = mask->masks.values; uint32_t hash; - int i; + uint64_t map; hash = basis; - for (i = 0; i < MINI_N_MAPS; i++) { - uint32_t map; - for (map = mask->masks.map[i]; map; map = zero_rightmost_1bit(map)) { - int ofs = raw_ctz(map) + i * 32; - - hash = mhash_add(hash, miniflow_get(flow, ofs) & *p); - p++; - } + for (map = mask->masks.map; map; map = zero_rightmost_1bit(map)) { + hash = mhash_add(hash, miniflow_get(flow, raw_ctz(map)) & *p++); } return mhash_finish(hash, (p - mask->masks.values) * 4); @@ -1332,25 +1531,44 @@ uint32_t flow_hash_in_minimask(const struct flow *flow, const struct minimask *mask, uint32_t basis) { - const uint32_t *flow_u32 = (const uint32_t *) flow; + const uint32_t *flow_u32 = (const uint32_t *)flow; const uint32_t *p = mask->masks.values; uint32_t hash; - int i; + uint64_t map; hash = basis; - for (i = 0; i < MINI_N_MAPS; i++) { - uint32_t map; + for (map = mask->masks.map; map; map = zero_rightmost_1bit(map)) { + hash = mhash_add(hash, flow_u32[raw_ctz(map)] & *p++); + } - for (map = mask->masks.map[i]; map; map = zero_rightmost_1bit(map)) { - int ofs = raw_ctz(map) + i * 32; + return mhash_finish(hash, (p - mask->masks.values) * 4); +} - hash = mhash_add(hash, flow_u32[ofs] & *p); - p++; - } +/* Returns a hash value for the bits of range [start, end) in 'flow', + * where there are 1-bits in 'mask', given 'hash'. + * + * The hash values returned by this function are the same as those returned by + * minimatch_hash_range(), only the form of the arguments differ. */ +uint32_t +flow_hash_in_minimask_range(const struct flow *flow, + const struct minimask *mask, + uint8_t start, uint8_t end, uint32_t *basis) +{ + const uint32_t *flow_u32 = (const uint32_t *)flow; + unsigned int offset; + uint64_t map = miniflow_get_map_in_range(&mask->masks, start, end, + &offset); + const uint32_t *p = mask->masks.values + offset; + uint32_t hash = *basis; + + for (; map; map = zero_rightmost_1bit(map)) { + hash = mhash_add(hash, flow_u32[raw_ctz(map)] & *p++); } + *basis = hash; /* Allow continuation from the unfinished value. */ return mhash_finish(hash, (p - mask->masks.values) * 4); } + /* Initializes 'dst' as a copy of 'src'. The caller must eventually free 'dst' * with minimask_destroy(). */ @@ -1388,23 +1606,19 @@ minimask_combine(struct minimask *dst_, struct miniflow *dst = &dst_->masks; const struct miniflow *a = &a_->masks; const struct miniflow *b = &b_->masks; - int i, n; + uint64_t map; + int n = 0; - n = 0; dst->values = storage; - for (i = 0; i < MINI_N_MAPS; i++) { - uint32_t map; - - dst->map[i] = 0; - for (map = a->map[i] & b->map[i]; map; - map = zero_rightmost_1bit(map)) { - int ofs = raw_ctz(map) + i * 32; - uint32_t mask = miniflow_get(a, ofs) & miniflow_get(b, ofs); - - if (mask) { - dst->map[i] |= rightmost_1bit(map); - dst->values[n++] = mask; - } + + dst->map = 0; + for (map = a->map & b->map; map; map = zero_rightmost_1bit(map)) { + int ofs = raw_ctz(map); + uint32_t mask = miniflow_get(a, ofs) & miniflow_get(b, ofs); + + if (mask) { + dst->map |= rightmost_1bit(map); + dst->values[n++] = mask; } } } @@ -1461,20 +1675,15 @@ minimask_has_extra(const struct minimask *a_, const struct minimask *b_) { const struct miniflow *a = &a_->masks; const struct miniflow *b = &b_->masks; - int i; - - for (i = 0; i < MINI_N_MAPS; i++) { - uint32_t map; + uint64_t map; - for (map = a->map[i] | b->map[i]; map; - map = zero_rightmost_1bit(map)) { - int ofs = raw_ctz(map) + i * 32; - uint32_t a_u32 = miniflow_get(a, ofs); - uint32_t b_u32 = miniflow_get(b, ofs); + for (map = a->map | b->map; map; map = zero_rightmost_1bit(map)) { + int ofs = raw_ctz(map); + uint32_t a_u32 = miniflow_get(a, ofs); + uint32_t b_u32 = miniflow_get(b, ofs); - if ((a_u32 & b_u32) != b_u32) { - return true; - } + if ((a_u32 & b_u32) != b_u32) { + return true; } } @@ -1487,7 +1696,13 @@ bool minimask_is_catchall(const struct minimask *mask_) { const struct miniflow *mask = &mask_->masks; + const uint32_t *p = mask->values; + uint64_t map; - BUILD_ASSERT(MINI_N_MAPS == 2); - return !(mask->map[0] | mask->map[1]); + for (map = mask->map; map; map = zero_rightmost_1bit(map)) { + if (*p++) { + return false; + } + } + return true; }