X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fflow.c;h=548c729afd69f8b52e4fd9e4c6bf6733feced348;hb=54adbf40ff717f05e081967102083889143447a7;hp=ae60617dd27e08a167e6735420a603e580af51c9;hpb=a26ef51703333b9ab337ba13f397c28c062422fd;p=sliver-openvswitch.git diff --git a/datapath/flow.c b/datapath/flow.c index ae60617dd..548c729af 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -1,18 +1,20 @@ /* * Distributed under the terms of the GNU GPL version 2. - * Copyright (c) 2007, 2008, 2009 Nicira Networks. + * Copyright (c) 2007, 2008, 2009, 2010 Nicira Networks. * * Significant portions of this file may be copied from parts of the Linux * kernel, by Linus Torvalds and others. */ #include "flow.h" +#include "datapath.h" #include #include #include #include #include #include +#include #include #include #include @@ -24,11 +26,13 @@ #include #include #include +#include #include #include "compat.h" struct kmem_cache *flow_cache; +static unsigned int hash_seed; struct arp_eth_header { @@ -95,7 +99,6 @@ static inline struct ovs_tcphdr *ovs_tcp_hdr(const struct sk_buff *skb) void flow_used(struct sw_flow *flow, struct sk_buff *skb) { - unsigned long flags; u8 tcp_flags = 0; if (flow->key.dl_type == htons(ETH_P_IP) && iphdr_ok(skb)) { @@ -107,12 +110,12 @@ void flow_used(struct sw_flow *flow, struct sk_buff *skb) } } - spin_lock_irqsave(&flow->lock, flags); + spin_lock_bh(&flow->lock); getnstimeofday(&flow->used); flow->packet_count++; flow->byte_count += skb->len; flow->tcp_flags |= tcp_flags; - spin_unlock_irqrestore(&flow->lock, flags); + spin_unlock_bh(&flow->lock); } struct sw_flow_actions *flow_actions_alloc(size_t n_actions) @@ -133,7 +136,7 @@ struct sw_flow_actions *flow_actions_alloc(size_t n_actions) /* Frees 'flow' immediately. */ -void flow_free(struct sw_flow *flow) +static void flow_free(struct sw_flow *flow) { if (unlikely(!flow)) return; @@ -141,6 +144,12 @@ void flow_free(struct sw_flow *flow) kmem_cache_free(flow_cache, flow); } +void flow_free_tbl(struct tbl_node *node) +{ + struct sw_flow *flow = flow_cast(node); + flow_free(flow); +} + /* RCU callback used by flow_deferred_free. */ static void rcu_free_flow_callback(struct rcu_head *rcu) { @@ -200,8 +209,9 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key) int nh_ofs; memset(key, 0, sizeof *key); - key->dl_vlan = htons(ODP_VLAN_NONE); + key->tun_id = OVS_CB(skb)->tun_id; key->in_port = in_port; + key->dl_vlan = htons(ODP_VLAN_NONE); if (skb->len < sizeof *eth) return 0; @@ -231,6 +241,7 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key) struct vlan_hdr *vh = (struct vlan_hdr*)(skb->data + nh_ofs); key->dl_type = vh->h_vlan_encapsulated_proto; key->dl_vlan = vh->h_vlan_TCI & htons(VLAN_VID_MASK); + key->dl_vlan_pcp = (ntohs(vh->h_vlan_TCI) & VLAN_PCP_MASK) >> VLAN_PCP_SHIFT; nh_ofs += sizeof(struct vlan_hdr); } memcpy(key->dl_src, eth->h_source, ETH_ALEN); @@ -243,6 +254,7 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key) int th_ofs = nh_ofs + nh->ihl * 4; key->nw_src = nh->saddr; key->nw_dst = nh->daddr; + key->nw_tos = nh->tos & ~INET_ECN_MASK; key->nw_proto = nh->protocol; skb_set_transport_header(skb, th_ofs); @@ -293,28 +305,46 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key) arp = (struct arp_eth_header *)skb_network_header(skb); - if (arp->ar_hrd == htons(1) - && arp->ar_pro == htons(ETH_P_IP) - && arp->ar_hln == ETH_ALEN - && arp->ar_pln == 4) { - - /* We only match on the lower 8 bits of the opcode. */ - if (ntohs(arp->ar_op) <= 0xff) { - key->nw_proto = ntohs(arp->ar_op); - } - - if (key->nw_proto == ARPOP_REQUEST - || key->nw_proto == ARPOP_REPLY) { - memcpy(&key->nw_src, arp->ar_sip, sizeof(key->nw_src)); - memcpy(&key->nw_dst, arp->ar_tip, sizeof(key->nw_dst)); - } - } + if (arp->ar_hrd == htons(ARPHRD_ETHER) + && arp->ar_pro == htons(ETH_P_IP) + && arp->ar_hln == ETH_ALEN + && arp->ar_pln == 4) { + + /* We only match on the lower 8 bits of the opcode. */ + if (ntohs(arp->ar_op) <= 0xff) { + key->nw_proto = ntohs(arp->ar_op); + } + + if (key->nw_proto == ARPOP_REQUEST + || key->nw_proto == ARPOP_REPLY) { + memcpy(&key->nw_src, arp->ar_sip, sizeof(key->nw_src)); + memcpy(&key->nw_dst, arp->ar_tip, sizeof(key->nw_dst)); + } + } } else { skb_reset_transport_header(skb); } return retval; } +struct sw_flow *flow_cast(const struct tbl_node *node) +{ + return container_of(node, struct sw_flow, tbl_node); +} + +u32 flow_hash(const struct odp_flow_key *key) +{ + return jhash2((u32*)key, sizeof *key / sizeof(u32), hash_seed); +} + +int flow_cmp(const struct tbl_node *node, void *key2_) +{ + const struct odp_flow_key *key1 = &flow_cast(node)->key; + const struct odp_flow_key *key2 = key2_; + + return !memcmp(key1, key2, sizeof(struct odp_flow_key)); +} + /* Initializes the flow module. * Returns zero if successful or a negative error code. */ int flow_init(void) @@ -324,6 +354,8 @@ int flow_init(void) if (flow_cache == NULL) return -ENOMEM; + get_random_bytes(&hash_seed, sizeof hash_seed); + return 0; } @@ -332,16 +364,3 @@ void flow_exit(void) { kmem_cache_destroy(flow_cache); } - -void print_flow(const struct odp_flow_key *key) -{ -#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" -#define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5] - printk("port%04x:vlan%d mac"MAC_FMT"->"MAC_FMT" " - "type%04x proto%d ip%x->%x port%d->%d\n", - key->in_port, ntohs(key->dl_vlan), - MAC_ARG(key->dl_src), MAC_ARG(key->dl_dst), - ntohs(key->dl_type), key->nw_proto, - key->nw_src, key->nw_dst, - ntohs(key->tp_src), ntohs(key->tp_dst)); -}