X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fflow.c;h=7be10e29b0a708b3ca2f9a0c5be67a2256bffb2d;hb=6767a2cce9a6412b3a41a927c4d56b9f0e1ec36f;hp=c85219e59394dcb9bc652aaac74a8fefa72e0740;hpb=b63f2ea79417e93390eaa86f68e546242e15a9ec;p=openvswitch diff --git a/lib/flow.c b/lib/flow.c index c85219e5..7be10e29 100644 --- a/lib/flow.c +++ b/lib/flow.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 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. @@ -22,6 +22,7 @@ #include #include "byte-order.h" #include "coverage.h" +#include "dpif.h" #include "dynamic-string.h" #include "hash.h" #include "ofpbuf.h" @@ -33,6 +34,8 @@ VLOG_DEFINE_THIS_MODULE(flow); +COVERAGE_DEFINE(flow_extract); + static struct arp_eth_header * pull_arp(struct ofpbuf *packet) { @@ -87,8 +90,7 @@ parse_vlan(struct ofpbuf *b, struct flow *flow) if (b->size >= sizeof(struct qtag_prefix) + sizeof(ovs_be16)) { struct qtag_prefix *qp = ofpbuf_pull(b, sizeof *qp); - flow->dl_vlan = qp->tci & htons(VLAN_VID_MASK); - flow->dl_vlan_pcp = vlan_tci_to_pcp(qp->tci); + flow->vlan_tci = qp->tci | htons(VLAN_CFI); } } @@ -99,12 +101,12 @@ parse_ethertype(struct ofpbuf *b) ovs_be16 proto; proto = *(ovs_be16 *) ofpbuf_pull(b, sizeof proto); - if (ntohs(proto) >= ODP_DL_TYPE_ETH2_CUTOFF) { + if (ntohs(proto) >= ETH_TYPE_MIN) { return proto; } if (b->size < sizeof *llc) { - return htons(ODP_DL_TYPE_NOT_ETH_TYPE); + return htons(FLOW_DL_TYPE_NONE); } llc = b->data; @@ -113,7 +115,7 @@ parse_ethertype(struct ofpbuf *b) || llc->llc.llc_cntl != LLC_CNTL_SNAP || memcmp(llc->snap.snap_org, SNAP_ORG_ETHERNET, sizeof llc->snap.snap_org)) { - return htons(ODP_DL_TYPE_NOT_ETH_TYPE); + return htons(FLOW_DL_TYPE_NONE); } ofpbuf_pull(b, sizeof *llc); @@ -136,7 +138,7 @@ parse_ethertype(struct ofpbuf *b) * present and has a correct length, and otherwise NULL. */ int -flow_extract(struct ofpbuf *packet, ovs_be32 tun_id, uint16_t in_port, +flow_extract(struct ofpbuf *packet, ovs_be64 tun_id, uint16_t in_port, struct flow *flow) { struct ofpbuf b = *packet; @@ -148,7 +150,6 @@ flow_extract(struct ofpbuf *packet, ovs_be32 tun_id, uint16_t in_port, memset(flow, 0, sizeof *flow); flow->tun_id = tun_id; flow->in_port = in_port; - flow->dl_vlan = htons(OFP_VLAN_NONE); packet->l2 = b.data; packet->l3 = NULL; @@ -164,7 +165,7 @@ flow_extract(struct ofpbuf *packet, ovs_be32 tun_id, uint16_t in_port, memcpy(flow->dl_src, eth->eth_src, ETH_ADDR_LEN); memcpy(flow->dl_dst, eth->eth_dst, ETH_ADDR_LEN); - /* dl_type, dl_vlan, dl_vlan_pcp. */ + /* dl_type, vlan_tci. */ ofpbuf_pull(&b, ETH_ADDR_LEN * 2); if (eth->eth_type == htons(ETH_TYPE_VLAN)) { parse_vlan(&b, flow); @@ -176,27 +177,27 @@ flow_extract(struct ofpbuf *packet, ovs_be32 tun_id, uint16_t in_port, if (flow->dl_type == htons(ETH_TYPE_IP)) { const struct ip_header *nh = pull_ip(&b); if (nh) { - flow->nw_src = get_unaligned_u32(&nh->ip_src); - flow->nw_dst = get_unaligned_u32(&nh->ip_dst); + flow->nw_src = get_unaligned_be32(&nh->ip_src); + flow->nw_dst = get_unaligned_be32(&nh->ip_dst); flow->nw_tos = nh->ip_tos & IP_DSCP_MASK; flow->nw_proto = nh->ip_proto; packet->l4 = b.data; if (!IP_IS_FRAGMENT(nh->ip_frag_off)) { - if (flow->nw_proto == IP_TYPE_TCP) { + if (flow->nw_proto == IPPROTO_TCP) { const struct tcp_header *tcp = pull_tcp(&b); if (tcp) { flow->tp_src = tcp->tcp_src; flow->tp_dst = tcp->tcp_dst; packet->l7 = b.data; } - } else if (flow->nw_proto == IP_TYPE_UDP) { + } else if (flow->nw_proto == IPPROTO_UDP) { const struct udp_header *udp = pull_udp(&b); if (udp) { flow->tp_src = udp->udp_src; flow->tp_dst = udp->udp_dst; packet->l7 = b.data; } - } else if (flow->nw_proto == IP_TYPE_ICMP) { + } else if (flow->nw_proto == IPPROTO_ICMP) { const struct icmp_header *icmp = pull_icmp(&b); if (icmp) { flow->icmp_type = htons(icmp->icmp_type); @@ -234,12 +235,12 @@ flow_extract(struct ofpbuf *packet, ovs_be32 tun_id, uint16_t in_port, */ void flow_extract_stats(const struct flow *flow, struct ofpbuf *packet, - struct odp_flow_stats *stats) + struct dpif_flow_stats *stats) { - memset(stats, '\0', sizeof(*stats)); + memset(stats, 0, sizeof(*stats)); if ((flow->dl_type == htons(ETH_TYPE_IP)) && packet->l4) { - if ((flow->nw_proto == IP_TYPE_TCP) && packet->l7) { + if ((flow->nw_proto == IPPROTO_TCP) && packet->l7) { struct tcp_header *tcp = packet->l4; stats->tcp_flags = TCP_FLAGS(tcp->tcp_ctl); } @@ -249,63 +250,6 @@ flow_extract_stats(const struct flow *flow, struct ofpbuf *packet, stats->n_packets = 1; } -/* Extract 'flow' with 'wildcards' into the OpenFlow match structure - * 'match'. 'flow_format' should be one of NXFF_*. */ -void -flow_to_match(const struct flow *flow, uint32_t wildcards, - int flow_format, struct ofp_match *match) -{ - if (flow_format != NXFF_TUN_ID_FROM_COOKIE) { - wildcards &= OFPFW_ALL; - } - match->wildcards = htonl(wildcards); - - match->in_port = htons(flow->in_port == ODPP_LOCAL ? OFPP_LOCAL - : flow->in_port); - match->dl_vlan = flow->dl_vlan; - match->dl_vlan_pcp = flow->dl_vlan_pcp; - memcpy(match->dl_src, flow->dl_src, ETH_ADDR_LEN); - memcpy(match->dl_dst, flow->dl_dst, ETH_ADDR_LEN); - match->dl_type = flow->dl_type; - match->nw_src = flow->nw_src; - match->nw_dst = flow->nw_dst; - match->nw_tos = flow->nw_tos; - match->nw_proto = flow->nw_proto; - match->tp_src = flow->tp_src; - match->tp_dst = flow->tp_dst; - memset(match->pad1, '\0', sizeof match->pad1); - memset(match->pad2, '\0', sizeof match->pad2); -} - -void -flow_from_match(const struct ofp_match *match, int flow_format, - ovs_be64 cookie, struct flow *flow, - struct flow_wildcards *wc) -{ - flow_wildcards_init(wc, ntohl(match->wildcards)); - if (flow_format == NXFF_TUN_ID_FROM_COOKIE - && !(wc->wildcards & NXFW_TUN_ID)) { - flow->tun_id = htonl(ntohll(cookie) >> 32); - } else { - wc->wildcards |= NXFW_TUN_ID; - flow->tun_id = 0; - } - - flow->nw_src = match->nw_src; - flow->nw_dst = match->nw_dst; - flow->in_port = (match->in_port == htons(OFPP_LOCAL) ? ODPP_LOCAL - : ntohs(match->in_port)); - flow->dl_vlan = match->dl_vlan; - flow->dl_vlan_pcp = match->dl_vlan_pcp; - flow->dl_type = match->dl_type; - flow->tp_src = match->tp_src; - flow->tp_dst = match->tp_dst; - memcpy(flow->dl_src, match->dl_src, ETH_ADDR_LEN); - memcpy(flow->dl_dst, match->dl_dst, ETH_ADDR_LEN); - flow->nw_tos = match->nw_tos; - flow->nw_proto = match->nw_proto; -} - char * flow_to_string(const struct flow *flow) { @@ -317,18 +261,21 @@ flow_to_string(const struct flow *flow) void flow_format(struct ds *ds, const struct flow *flow) { - ds_put_format(ds, "tunnel%08"PRIx32":in_port%04"PRIx16 - ":vlan%"PRIu16":pcp%"PRIu8 - " mac"ETH_ADDR_FMT"->"ETH_ADDR_FMT + ds_put_format(ds, "tunnel%#"PRIx64":in_port%04"PRIx16":tci(", + flow->tun_id, flow->in_port); + if (flow->vlan_tci) { + ds_put_format(ds, "vlan%"PRIu16",pcp%d", + vlan_tci_to_vid(flow->vlan_tci), + vlan_tci_to_pcp(flow->vlan_tci)); + } else { + ds_put_char(ds, '0'); + } + ds_put_format(ds, ") mac"ETH_ADDR_FMT"->"ETH_ADDR_FMT " type%04"PRIx16 " proto%"PRIu8 " tos%"PRIu8 " ip"IP_FMT"->"IP_FMT " port%"PRIu16"->%"PRIu16, - ntohl(flow->tun_id), - flow->in_port, - ntohs(flow->dl_vlan), - flow->dl_vlan_pcp, ETH_ADDR_ARGS(flow->dl_src), ETH_ADDR_ARGS(flow->dl_dst), ntohs(flow->dl_type), @@ -350,49 +297,17 @@ flow_print(FILE *stream, const struct flow *flow) /* flow_wildcards functions. */ -/* Given the wildcard bit count in bits 'shift' through 'shift + 5' (inclusive) - * of 'wildcards', returns a 32-bit bit mask with a 1 in each bit that must - * match and a 0 in each bit that is wildcarded. - * - * The bits in 'wildcards' are in the format used in enum ofp_flow_wildcards: 0 - * is exact match, 1 ignores the LSB, 2 ignores the 2 least-significant bits, - * ..., 32 and higher wildcard the entire field. This is the *opposite* of the - * usual convention where e.g. /24 indicates that 8 bits (not 24 bits) are - * wildcarded. */ -ovs_be32 -flow_nw_bits_to_mask(uint32_t wildcards, int shift) -{ - wildcards = (wildcards >> shift) & 0x3f; - return wildcards < 32 ? htonl(~((1u << wildcards) - 1)) : 0; -} - -/* Return 'wildcards' in "normal form": - * - * - Forces unknown bits to 0. - * - * - Forces nw_src and nw_dst masks greater than 32 to exactly 32. - */ -static inline uint32_t -flow_wildcards_normalize(uint32_t wildcards) -{ - wildcards &= wildcards & OVSFW_ALL; - if (wildcards & (0x20 << OFPFW_NW_SRC_SHIFT)) { - wildcards &= ~(0x1f << OFPFW_NW_SRC_SHIFT); - } - if (wildcards & (0x20 << OFPFW_NW_DST_SHIFT)) { - wildcards &= ~(0x1f << OFPFW_NW_DST_SHIFT); - } - return wildcards; -} - -/* Initializes 'wc' from 'wildcards', which may be any combination of the - * OFPFW_* and OVSFW_* wildcard bits. */ +/* Initializes 'wc' as a set of wildcards that matches every packet. */ void -flow_wildcards_init(struct flow_wildcards *wc, uint32_t wildcards) +flow_wildcards_init_catchall(struct flow_wildcards *wc) { - wc->wildcards = flow_wildcards_normalize(wildcards); - wc->nw_src_mask = flow_nw_bits_to_mask(wc->wildcards, OFPFW_NW_SRC_SHIFT); - wc->nw_dst_mask = flow_nw_bits_to_mask(wc->wildcards, OFPFW_NW_DST_SHIFT); + wc->wildcards = FWW_ALL; + wc->tun_id_mask = htonll(0); + wc->nw_src_mask = htonl(0); + wc->nw_dst_mask = htonl(0); + memset(wc->reg_masks, 0, sizeof wc->reg_masks); + wc->vlan_tci_mask = htons(0); + wc->zero = 0; } /* Initializes 'wc' as an exact-match set of wildcards; that is, 'wc' does not @@ -400,15 +315,37 @@ flow_wildcards_init(struct flow_wildcards *wc, uint32_t wildcards) void flow_wildcards_init_exact(struct flow_wildcards *wc) { - flow_wildcards_init(wc, 0); + wc->wildcards = 0; + wc->tun_id_mask = htonll(UINT64_MAX); + wc->nw_src_mask = htonl(UINT32_MAX); + wc->nw_dst_mask = htonl(UINT32_MAX); + memset(wc->reg_masks, 0xff, sizeof wc->reg_masks); + wc->vlan_tci_mask = htons(UINT16_MAX); + wc->zero = 0; } -static inline uint32_t -combine_nw_bits(uint32_t wb1, uint32_t wb2, int shift) +/* Returns true if 'wc' is exact-match, false if 'wc' wildcards any bits or + * fields. */ +bool +flow_wildcards_is_exact(const struct flow_wildcards *wc) { - uint32_t sb1 = (wb1 >> shift) & 0x3f; - uint32_t sb2 = (wb2 >> shift) & 0x3f; - return MAX(sb1, sb2) << shift; + int i; + + if (wc->wildcards + || wc->tun_id_mask != htonll(UINT64_MAX) + || wc->nw_src_mask != htonl(UINT32_MAX) + || wc->nw_dst_mask != htonl(UINT32_MAX) + || wc->vlan_tci_mask != htons(UINT16_MAX)) { + return false; + } + + for (i = 0; i < FLOW_N_REGS; i++) { + if (wc->reg_masks[i] != htonl(UINT32_MAX)) { + return false; + } + } + + return true; } /* Initializes 'dst' as the combination of wildcards in 'src1' and 'src2'. @@ -419,23 +356,27 @@ flow_wildcards_combine(struct flow_wildcards *dst, const struct flow_wildcards *src1, const struct flow_wildcards *src2) { - uint32_t wb1 = src1->wildcards; - uint32_t wb2 = src2->wildcards; + int i; - dst->wildcards = (wb1 | wb2) & ~(OFPFW_NW_SRC_MASK | OFPFW_NW_DST_MASK); - dst->wildcards |= combine_nw_bits(wb1, wb2, OFPFW_NW_SRC_SHIFT); - dst->wildcards |= combine_nw_bits(wb1, wb2, OFPFW_NW_DST_SHIFT); + dst->wildcards = src1->wildcards | src2->wildcards; + dst->tun_id_mask = src1->tun_id_mask & src2->tun_id_mask; dst->nw_src_mask = src1->nw_src_mask & src2->nw_src_mask; dst->nw_dst_mask = src1->nw_dst_mask & src2->nw_dst_mask; + for (i = 0; i < FLOW_N_REGS; i++) { + dst->reg_masks[i] = src1->reg_masks[i] & src2->reg_masks[i]; + } + dst->vlan_tci_mask = src1->vlan_tci_mask & src2->vlan_tci_mask; } /* Returns a hash of the wildcards in 'wc'. */ uint32_t flow_wildcards_hash(const struct flow_wildcards *wc) { - /* There is no need to include nw_src_mask or nw_dst_mask because they do - * not add any information (they can be computed from wc->wildcards). */ - return hash_int(wc->wildcards, 0); + /* If you change struct flow_wildcards and thereby trigger this + * assertion, please check that the new struct flow_wildcards has no holes + * in it before you update the assertion. */ + BUILD_ASSERT_DECL(sizeof *wc == 24 + FLOW_N_REGS * 4); + return hash_bytes(wc, sizeof *wc, 0); } /* Returns true if 'a' and 'b' represent the same wildcards, false if they are @@ -444,7 +385,23 @@ bool flow_wildcards_equal(const struct flow_wildcards *a, const struct flow_wildcards *b) { - return a->wildcards == b->wildcards; + int i; + + if (a->wildcards != b->wildcards + || a->tun_id_mask != b->tun_id_mask + || a->nw_src_mask != b->nw_src_mask + || a->nw_dst_mask != b->nw_dst_mask + || a->vlan_tci_mask != b->vlan_tci_mask) { + return false; + } + + for (i = 0; i < FLOW_N_REGS; i++) { + if (a->reg_masks[i] != b->reg_masks[i]) { + return false; + } + } + + return true; } /* Returns true if at least one bit or field is wildcarded in 'a' but not in @@ -453,36 +410,25 @@ bool flow_wildcards_has_extra(const struct flow_wildcards *a, const struct flow_wildcards *b) { -#define OFPFW_NW_MASK (OFPFW_NW_SRC_MASK | OFPFW_NW_DST_MASK) - return ((a->wildcards & ~(b->wildcards | OFPFW_NW_MASK)) - || (a->nw_src_mask & b->nw_src_mask) != b->nw_src_mask - || (a->nw_dst_mask & b->nw_dst_mask) != b->nw_dst_mask); -} - -static int -count_ones(ovs_be32 mask) -{ -#if __GNUC__ >= 4 - return __builtin_popcount(mask); -#else - int bits; + int i; - for (bits = 0; mask; bits++) { - mask &= mask - 1; + for (i = 0; i < FLOW_N_REGS; i++) { + if ((a->reg_masks[i] & b->reg_masks[i]) != b->reg_masks[i]) { + return true; + } } - return bits; -#endif + return (a->wildcards & ~b->wildcards + || (a->tun_id_mask & b->tun_id_mask) != b->tun_id_mask + || (a->nw_src_mask & b->nw_src_mask) != b->nw_src_mask + || (a->nw_dst_mask & b->nw_dst_mask) != b->nw_dst_mask + || (a->vlan_tci_mask & b->vlan_tci_mask) != b->vlan_tci_mask); } static bool -set_nw_mask(struct flow_wildcards *wc, ovs_be32 mask, - ovs_be32 *maskp, int shift) +set_nw_mask(ovs_be32 *maskp, ovs_be32 mask) { - int wcbits = 32 - count_ones(mask); - if (flow_nw_bits_to_mask(wcbits, 0) == mask) { - wc->wildcards &= ~(0x3f << shift); - wc->wildcards |= wcbits << shift; + if (ip_is_cidr(mask)) { *maskp = mask; return true; } else { @@ -496,7 +442,7 @@ set_nw_mask(struct flow_wildcards *wc, ovs_be32 mask, bool flow_wildcards_set_nw_src_mask(struct flow_wildcards *wc, ovs_be32 mask) { - return set_nw_mask(wc, mask, &wc->nw_src_mask, OFPFW_NW_SRC_SHIFT); + return set_nw_mask(&wc->nw_src_mask, mask); } /* Sets the IP (or ARP) destination wildcard mask to CIDR 'mask' (consisting of @@ -505,5 +451,50 @@ flow_wildcards_set_nw_src_mask(struct flow_wildcards *wc, ovs_be32 mask) bool flow_wildcards_set_nw_dst_mask(struct flow_wildcards *wc, ovs_be32 mask) { - return set_nw_mask(wc, mask, &wc->nw_dst_mask, OFPFW_NW_DST_SHIFT); + return set_nw_mask(&wc->nw_dst_mask, mask); +} + +/* Sets the wildcard mask for register 'idx' in 'wc' to 'mask'. + * (A 0-bit indicates a wildcard bit.) */ +void +flow_wildcards_set_reg_mask(struct flow_wildcards *wc, int idx, uint32_t mask) +{ + wc->reg_masks[idx] = mask; +} + +/* Hashes 'flow' based on its L2 through L4 protocol information. */ +uint32_t +flow_hash_symmetric_l4(const struct flow *flow, uint32_t basis) +{ + struct { + ovs_be32 ip_addr; + ovs_be16 eth_type; + ovs_be16 vlan_tci; + ovs_be16 tp_addr; + uint8_t eth_addr[ETH_ADDR_LEN]; + uint8_t ip_proto; + } fields; + + int i; + + memset(&fields, 0, sizeof fields); + for (i = 0; i < ETH_ADDR_LEN; i++) { + fields.eth_addr[i] = flow->dl_src[i] ^ flow->dl_dst[i]; + } + fields.vlan_tci = flow->vlan_tci & htons(VLAN_VID_MASK); + fields.eth_type = flow->dl_type; + if (fields.eth_type == htons(ETH_TYPE_IP)) { + fields.ip_addr = flow->nw_src ^ flow->nw_dst; + fields.ip_proto = flow->nw_proto; + if (fields.ip_proto == IPPROTO_TCP || fields.ip_proto == IPPROTO_UDP) { + fields.tp_addr = flow->tp_src ^ flow->tp_dst; + } else { + fields.tp_addr = htons(0); + } + } else { + fields.ip_addr = htonl(0); + fields.ip_proto = 0; + fields.tp_addr = htons(0); + } + return hash_bytes(&fields, sizeof fields, basis); }