X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fflow.c;h=ca745187d20780ac3994085b7fda4eaa6b0b7d70;hb=7da6be985c6fc7f6b425f660501133f1118a73b5;hp=1fab02fd6e5beb924fcd02ab6a7df75c9c9db1d5;hpb=ca78c6b69c01508713b8a8e50065843fcaf53936;p=openvswitch diff --git a/lib/flow.c b/lib/flow.c index 1fab02fd..ca745187 100644 --- a/lib/flow.c +++ b/lib/flow.c @@ -20,6 +20,7 @@ #include #include #include +#include "byte-order.h" #include "coverage.h" #include "dynamic-string.h" #include "hash.h" @@ -29,9 +30,8 @@ #include "packets.h" #include "unaligned.h" #include "vlog.h" -#include "xtoxll.h" -VLOG_DEFINE_THIS_MODULE(flow) +VLOG_DEFINE_THIS_MODULE(flow); static struct arp_eth_header * pull_arp(struct ofpbuf *packet) @@ -53,7 +53,7 @@ pull_ip(struct ofpbuf *packet) } static struct tcp_header * -pull_tcp(struct ofpbuf *packet) +pull_tcp(struct ofpbuf *packet) { if (packet->size >= TCP_HEADER_LEN) { struct tcp_header *tcp = packet->data; @@ -66,39 +66,39 @@ pull_tcp(struct ofpbuf *packet) } static struct udp_header * -pull_udp(struct ofpbuf *packet) +pull_udp(struct ofpbuf *packet) { return ofpbuf_try_pull(packet, UDP_HEADER_LEN); } static struct icmp_header * -pull_icmp(struct ofpbuf *packet) +pull_icmp(struct ofpbuf *packet) { return ofpbuf_try_pull(packet, ICMP_HEADER_LEN); } static void -parse_vlan(struct ofpbuf *b, flow_t *flow) +parse_vlan(struct ofpbuf *b, struct flow *flow) { struct qtag_prefix { - uint16_t eth_type; /* ETH_TYPE_VLAN */ - uint16_t tci; + ovs_be16 eth_type; /* ETH_TYPE_VLAN */ + ovs_be16 tci; }; - if (b->size >= sizeof(struct qtag_prefix) + sizeof(uint16_t)) { + 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 = (ntohs(qp->tci) & VLAN_PCP_MASK) >> VLAN_PCP_SHIFT; + flow->dl_vlan_pcp = vlan_tci_to_pcp(qp->tci); } } -static uint16_t +static ovs_be16 parse_ethertype(struct ofpbuf *b) { struct llc_snap_header *llc; - uint16_t proto; + ovs_be16 proto; - proto = *(uint16_t *) ofpbuf_pull(b, sizeof proto); + proto = *(ovs_be16 *) ofpbuf_pull(b, sizeof proto); if (ntohs(proto) >= ODP_DL_TYPE_ETH2_CUTOFF) { return proto; } @@ -120,10 +120,8 @@ parse_ethertype(struct ofpbuf *b) return llc->snap.snap_type; } -/* 'tun_id' is in network byte order, while 'in_port' is in host byte order. - * These byte orders are the same as they are in struct odp_flow_key. - * - * Initializes packet header pointers as follows: +/* Initializes 'flow' members from 'packet', 'tun_id', and 'in_port. + * Initializes 'packet' header pointers as follows: * * - packet->l2 to the start of the Ethernet header. * @@ -138,8 +136,8 @@ parse_ethertype(struct ofpbuf *b) * present and has a correct length, and otherwise NULL. */ int -flow_extract(struct ofpbuf *packet, uint32_t tun_id, uint16_t in_port, - flow_t *flow) +flow_extract(struct ofpbuf *packet, ovs_be32 tun_id, uint16_t in_port, + struct flow *flow) { struct ofpbuf b = *packet; struct eth_header *eth; @@ -213,7 +211,7 @@ flow_extract(struct ofpbuf *packet, uint32_t tun_id, uint16_t in_port, } else if (flow->dl_type == htons(ETH_TYPE_ARP)) { const struct arp_eth_header *arp = pull_arp(&b); if (arp && arp->ar_hrd == htons(1) - && arp->ar_pro == htons(ETH_TYPE_IP) + && arp->ar_pro == htons(ETH_TYPE_IP) && arp->ar_hln == ETH_ADDR_LEN && arp->ar_pln == 4) { /* We only match on the lower 8 bits of the opcode. */ @@ -221,7 +219,7 @@ flow_extract(struct ofpbuf *packet, uint32_t tun_id, uint16_t in_port, flow->nw_proto = ntohs(arp->ar_op); } - if ((flow->nw_proto == ARP_OP_REQUEST) + if ((flow->nw_proto == ARP_OP_REQUEST) || (flow->nw_proto == ARP_OP_REPLY)) { flow->nw_src = arp->ar_spa; flow->nw_dst = arp->ar_tpa; @@ -235,7 +233,7 @@ flow_extract(struct ofpbuf *packet, uint32_t tun_id, uint16_t in_port, * arguments must have been initialized through a call to flow_extract(). */ void -flow_extract_stats(const flow_t *flow, struct ofpbuf *packet, +flow_extract_stats(const struct flow *flow, struct ofpbuf *packet, struct odp_flow_stats *stats) { memset(stats, '\0', sizeof(*stats)); @@ -254,8 +252,8 @@ flow_extract_stats(const flow_t *flow, struct ofpbuf *packet, /* Extract 'flow' with 'wildcards' into the OpenFlow match structure * 'match'. */ void -flow_to_match(const flow_t *flow, uint32_t wildcards, bool tun_id_from_cookie, - struct ofp_match *match) +flow_to_match(const struct flow *flow, uint32_t wildcards, + bool tun_id_from_cookie, struct ofp_match *match) { if (!tun_id_from_cookie) { wildcards &= OFPFW_ALL; @@ -281,7 +279,7 @@ flow_to_match(const flow_t *flow, uint32_t wildcards, bool tun_id_from_cookie, void flow_from_match(const struct ofp_match *match, bool tun_id_from_cookie, - uint64_t cookie, flow_t *flow, uint32_t *flow_wildcards) + ovs_be64 cookie, struct flow *flow, uint32_t *flow_wildcards) { uint32_t wildcards = ntohl(match->wildcards); @@ -304,15 +302,13 @@ flow_from_match(const struct ofp_match *match, bool tun_id_from_cookie, memcpy(flow->dl_dst, match->dl_dst, ETH_ADDR_LEN); flow->nw_tos = match->nw_tos; flow->nw_proto = match->nw_proto; - memset(flow->reserved, 0, sizeof flow->reserved); - if (flow_wildcards) { *flow_wildcards = wildcards; } } char * -flow_to_string(const flow_t *flow) +flow_to_string(const struct flow *flow) { struct ds ds = DS_EMPTY_INITIALIZER; flow_format(&ds, flow); @@ -320,7 +316,7 @@ flow_to_string(const flow_t *flow) } void -flow_format(struct ds *ds, const flow_t *flow) +flow_format(struct ds *ds, const struct flow *flow) { ds_put_format(ds, "tunnel%08"PRIx32":in_port%04"PRIx16 ":vlan%"PRIu16":pcp%"PRIu8 @@ -346,9 +342,94 @@ flow_format(struct ds *ds, const flow_t *flow) } void -flow_print(FILE *stream, const flow_t *flow) +flow_print(FILE *stream, const struct flow *flow) { char *s = flow_to_string(flow); fputs(s, stream); free(s); } + +/* 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; +} + +/* Initializes 'wc' from 'wildcards', which may be any combination of the + * OFPFW_* and OVSFW_* wildcard bits. */ +void +flow_wildcards_init(struct flow_wildcards *wc, uint32_t wildcards) +{ + wc->wildcards = wildcards & OVSFW_ALL; + 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); +} + +/* Initializes 'wc' as an exact-match set of wildcards; that is, 'wc' does not + * wildcard any bits or fields. */ +void +flow_wildcards_init_exact(struct flow_wildcards *wc) +{ + flow_wildcards_init(wc, 0); +} + +static int +count_ones(ovs_be32 mask) +{ +#if __GNUC__ >= 4 + return __builtin_popcount(mask); +#else + int bits; + + for (bits = 0; mask; bits++) { + mask &= mask - 1; + } + + return bits; +#endif +} + +static bool +set_nw_mask(struct flow_wildcards *wc, ovs_be32 mask, + ovs_be32 *maskp, int shift) +{ + int wcbits = 32 - count_ones(mask); + if (flow_nw_bits_to_mask(wcbits, 0) == mask) { + wc->wildcards &= ~(0x3f << shift); + wc->wildcards |= wcbits << shift; + *maskp = mask; + return true; + } else { + return false; + } +} + +/* Sets the IP (or ARP) source wildcard mask to CIDR 'mask' (consisting of N + * high-order 1-bit and 32-N low-order 0-bits). Returns true if successful, + * false if 'mask' is not a CIDR 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); +} + +/* Sets the IP (or ARP) destination wildcard mask to CIDR 'mask' (consisting of + * N high-order 1-bit and 32-N low-order 0-bits). Returns true if successful, + * false if 'mask' is not a CIDR 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); +}