X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Factions.c;h=4fc0a4a4405929c2a7c6acb30e4499a75dfa7a5d;hb=629cd2f17fedf8d922f61ffd13365d1f4f9b34fe;hp=7c618ccd222f841fe294089de1578f28be422fb9;hpb=72b0630028e94a24d92a7c14cd7bce96a252a3f5;p=openvswitch

diff --git a/datapath/actions.c b/datapath/actions.c
index 7c618ccd..4fc0a4a4 100644
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -1,6 +1,6 @@
 /*
  * 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.
@@ -213,10 +213,43 @@ static void update_csum(__sum16 *sum, struct sk_buff *skb,
 			__be32 from, __be32 to, int pseudohdr)
 {
 	__be32 diff[] = { ~from, to };
-	if (skb->ip_summed != CHECKSUM_PARTIAL) {
+
+/* On older kernels, CHECKSUM_PARTIAL and CHECKSUM_COMPLETE are both defined
+ * as CHECKSUM_HW.  However, we can make some inferences so that we can update
+ * the checksums appropriately. */
+	enum {
+		CSUM_PARTIAL,	/* Partial checksum, skb->csum undefined. */
+		CSUM_PACKET,	/* In-packet checksum, skb->csum undefined. */
+		CSUM_COMPLETE,	/* In-packet checksum, skb->csum valid. */
+	} csum_type;
+
+	csum_type = CSUM_PACKET;
+#ifndef CHECKSUM_HW
+	/* Newer kernel, just map between kernel types and ours. */
+	if (skb->ip_summed == CHECKSUM_PARTIAL)
+		csum_type = CSUM_PARTIAL;
+	else if (skb->ip_summed == CHECKSUM_COMPLETE)
+		csum_type = CSUM_COMPLETE;
+#else
+	/* In theory this could be either CHECKSUM_PARTIAL or CHECKSUM_COMPLETE.
+	 * However, we should only get CHECKSUM_PARTIAL packets from Xen, which
+	 * uses some special fields to represent this (see below).  Since we
+	 * can only make one type work, pick the one that actually happens in
+	 * practice. */
+	if (skb->ip_summed == CHECKSUM_HW)
+		csum_type = CSUM_COMPLETE;
+#endif
+#if defined(CONFIG_XEN) && defined(HAVE_PROTO_DATA_VALID)
+	/* Xen has a special way of representing CHECKSUM_PARTIAL on older
+	 * kernels. */
+	if (skb->proto_csum_blank)
+		csum_type = CSUM_PARTIAL;
+#endif
+
+	if (csum_type != CSUM_PARTIAL) {
 		*sum = csum_fold(csum_partial((char *)diff, sizeof(diff),
 				~csum_unfold(*sum)));
-		if (skb->ip_summed == CHECKSUM_COMPLETE && pseudohdr)
+		if (csum_type == CSUM_COMPLETE && pseudohdr)
 			skb->csum = ~csum_partial((char *)diff, sizeof(diff),
 						~skb->csum);
 	} else if (pseudohdr)
@@ -276,7 +309,7 @@ set_tp_port(struct sk_buff *skb, struct odp_flow_key *key,
 		u16 old = *f;
 		u16 new = a->tp_port;
 		update_csum((u16*)(skb_transport_header(skb) + check_ofs), 
-				skb, old, new, 1);
+				skb, old, new, 0);
 		*f = new;
 	}
 	return skb;
@@ -302,6 +335,7 @@ int dp_xmit_skb(struct sk_buff *skb)
 		return -E2BIG;
 	}
 
+	forward_ip_summed(skb);
 	dev_queue_xmit(skb);
 
 	return len;
@@ -369,13 +403,13 @@ output_control(struct datapath *dp, struct sk_buff *skb, u32 arg, gfp_t gfp)
 /* Send a copy of this packet up to the sFlow agent, along with extra
  * information about what happened to it. */
 static void sflow_sample(struct datapath *dp, struct sk_buff *skb,
-			 const union odp_action *a, int n_actions, gfp_t gfp)
+			 const union odp_action *a, int n_actions,
+			 gfp_t gfp, struct net_bridge_port *nbp)
 {
 	struct odp_sflow_sample_header *hdr;
 	unsigned int actlen = n_actions * sizeof(union odp_action);
 	unsigned int hdrlen = sizeof(struct odp_sflow_sample_header);
 	struct sk_buff *nskb;
-	int i;
 
 	nskb = skb_copy_expand(skb, actlen + hdrlen, 0, gfp);
 	if (!nskb)
@@ -384,12 +418,7 @@ static void sflow_sample(struct datapath *dp, struct sk_buff *skb,
 	memcpy(__skb_push(nskb, actlen), a, actlen);
 	hdr = (struct odp_sflow_sample_header*)__skb_push(nskb, hdrlen);
 	hdr->n_actions = n_actions;
-	hdr->sample_pool = 0;
-	for_each_possible_cpu (i) {
-		const struct dp_stats_percpu *stats;
-		stats = per_cpu_ptr(dp->stats_percpu, i);
-		hdr->sample_pool += stats->sflow_pool;
-	}
+	hdr->sample_pool = atomic_read(&nbp->sflow_pool);
 	dp_output_control(dp, nskb, _ODPL_SFLOW_NR, 0);
 }
 
@@ -407,15 +436,13 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb,
 	int err;
 
 	if (dp->sflow_probability) {
-		/* Increment sample pool. */
-		int cpu = get_cpu();
-		per_cpu_ptr(dp->stats_percpu, cpu)->sflow_pool++;
-		put_cpu();
-
-		/* Sample packet. */
-		if (dp->sflow_probability == UINT_MAX ||
-		    net_random() < dp->sflow_probability)
-			sflow_sample(dp, skb, a, n_actions, gfp);
+		struct net_bridge_port *p = skb->dev->br_port;
+		if (p) {
+			atomic_inc(&p->sflow_pool);
+			if (dp->sflow_probability == UINT_MAX ||
+			    net_random() < dp->sflow_probability)
+				sflow_sample(dp, skb, a, n_actions, gfp, p);
+		}
 	}
 
 	for (; n_actions > 0; a++, n_actions--) {