X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fflow.c;h=8228da2e1c6ef9cf7c652a8fa5c60508daa8c797;hb=f2459fe7d91c4c325dfaa3ed18f56200b63ae27e;hp=ae60617dd27e08a167e6735420a603e580af51c9;hpb=a26ef51703333b9ab337ba13f397c28c062422fd;p=openvswitch

diff --git a/datapath/flow.c b/datapath/flow.c
index ae60617d..8228da2e 100644
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -1,12 +1,13 @@
 /*
  * 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 <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/if_ether.h>
@@ -24,6 +25,7 @@
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/icmp.h>
+#include <net/inet_ecn.h>
 #include <net/ip.h>
 
 #include "compat.h"
@@ -95,7 +97,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 +108,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)
@@ -200,8 +201,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 +233,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 +246,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,22 +297,22 @@ 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);
 	}
@@ -332,16 +336,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));
-}