X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=lib%2Fflow.c;h=7be10e29b0a708b3ca2f9a0c5be67a2256bffb2d;hb=6767a2cce9a6412b3a41a927c4d56b9f0e1ec36f;hp=8146519dcd257c184a6a8adb2d95a608f1c3b276;hpb=d8ae4d672673cd72285eb405a96b4ac3590a7639;p=openvswitch diff --git a/lib/flow.c b/lib/flow.c index 8146519d..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,9 +22,9 @@ #include #include "byte-order.h" #include "coverage.h" +#include "dpif.h" #include "dynamic-string.h" #include "hash.h" -#include "ofp-util.h" #include "ofpbuf.h" #include "openflow/openflow.h" #include "openvswitch/datapath-protocol.h" @@ -34,6 +34,8 @@ VLOG_DEFINE_THIS_MODULE(flow); +COVERAGE_DEFINE(flow_extract); + static struct arp_eth_header * pull_arp(struct ofpbuf *packet) { @@ -88,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); } } @@ -100,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; @@ -114,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); @@ -137,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; @@ -149,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; @@ -165,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); @@ -177,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); @@ -235,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); } @@ -261,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), @@ -299,9 +302,12 @@ void flow_wildcards_init_catchall(struct flow_wildcards *wc) { 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 @@ -310,9 +316,12 @@ void flow_wildcards_init_exact(struct flow_wildcards *wc) { 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; } /* Returns true if 'wc' is exact-match, false if 'wc' wildcards any bits or @@ -323,8 +332,10 @@ flow_wildcards_is_exact(const struct flow_wildcards *wc) 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->nw_dst_mask != htonl(UINT32_MAX) + || wc->vlan_tci_mask != htons(UINT16_MAX)) { return false; } @@ -348,11 +359,13 @@ flow_wildcards_combine(struct flow_wildcards *dst, int i; 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'. */ @@ -362,7 +375,7 @@ flow_wildcards_hash(const struct flow_wildcards *wc) /* 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 == 12 + FLOW_N_REGS * 4); + BUILD_ASSERT_DECL(sizeof *wc == 24 + FLOW_N_REGS * 4); return hash_bytes(wc, sizeof *wc, 0); } @@ -375,8 +388,10 @@ flow_wildcards_equal(const struct flow_wildcards *a, 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->nw_dst_mask != b->nw_dst_mask + || a->vlan_tci_mask != b->vlan_tci_mask) { return false; } @@ -404,8 +419,10 @@ flow_wildcards_has_extra(const struct flow_wildcards *a, } 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->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 @@ -444,3 +461,40 @@ 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); +}