X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=datapath%2Factions.c;h=b20873bf293592c3a0fa89d143f10043433bdd9d;hb=b09d5ec96a32c906bb35770937120401f64e90b7;hp=cadab05f177234b9fa61ec31b5e5262207203561;hpb=6a33828dbcc9a4f67bd730061b931c77caad2990;p=openvswitch

diff --git a/datapath/actions.c b/datapath/actions.c
index cadab05f..b20873bf 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.
@@ -15,6 +15,7 @@
 #include <linux/udp.h>
 #include <linux/in6.h>
 #include <linux/if_vlan.h>
+#include <net/inet_ecn.h>
 #include <net/ip.h>
 #include <net/checksum.h>
 #include "datapath.h"
@@ -92,7 +93,7 @@ modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
 		mask = VLAN_VID_MASK;
 		key->dl_vlan = htons(tci & mask);
 	} else {
-		tci = a->vlan_pcp.vlan_pcp << 13;
+		tci = a->vlan_pcp.vlan_pcp << VLAN_PCP_SHIFT;
 		mask = VLAN_PCP_MASK;
 	}
 
@@ -213,10 +214,11 @@ 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) {
+
+	if (OVS_CB(skb)->ip_summed != CSUM_PARTIAL) {
 		*sum = csum_fold(csum_partial((char *)diff, sizeof(diff),
 				~csum_unfold(*sum)));
-		if (skb->ip_summed == CHECKSUM_COMPLETE && pseudohdr)
+		if (OVS_CB(skb)->ip_summed == CSUM_COMPLETE && pseudohdr)
 			skb->csum = ~csum_partial((char *)diff, sizeof(diff),
 						~skb->csum);
 	} else if (pseudohdr)
@@ -252,6 +254,30 @@ static struct sk_buff *set_nw_addr(struct sk_buff *skb,
 	return skb;
 }
 
+static struct sk_buff *set_nw_tos(struct sk_buff *skb,
+				   struct odp_flow_key *key,
+				   const struct odp_action_nw_tos *a,
+				   gfp_t gfp)
+{
+	if (key->dl_type != htons(ETH_P_IP))
+		return skb;
+
+	skb = make_writable(skb, 0, gfp);
+	if (skb) {
+		struct iphdr *nh = ip_hdr(skb);
+		u8 *f = &nh->tos;
+		u8 old = *f;
+		u8 new;
+
+		/* Set the DSCP bits and preserve the ECN bits. */
+		new = (a->nw_tos & ~INET_ECN_MASK) | (nh->tos & INET_ECN_MASK);
+		update_csum(&nh->check, skb, htons((uint16_t)old),
+				htons((uint16_t)new), 0);
+		*f = new;
+	}
+	return skb;
+}
+
 static struct sk_buff *
 set_tp_port(struct sk_buff *skb, struct odp_flow_key *key,
 	    const struct odp_action_tp_port *a,
@@ -276,7 +302,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 +328,7 @@ int dp_xmit_skb(struct sk_buff *skb)
 		return -E2BIG;
 	}
 
+	forward_ip_summed(skb);
 	dev_queue_xmit(skb);
 
 	return len;
@@ -366,6 +393,28 @@ output_control(struct datapath *dp, struct sk_buff *skb, u32 arg, gfp_t gfp)
 	return dp_output_control(dp, skb, _ODPL_ACTION_NR, arg);
 }
 
+/* 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, 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;
+
+	nskb = skb_copy_expand(skb, actlen + hdrlen, 0, gfp);
+	if (!nskb)
+		return;
+
+	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 = atomic_read(&nbp->sflow_pool);
+	dp_output_control(dp, nskb, _ODPL_SFLOW_NR, 0);
+}
+
 /* Execute a list of actions against 'skb'. */
 int execute_actions(struct datapath *dp, struct sk_buff *skb,
 		    struct odp_flow_key *key,
@@ -378,6 +427,17 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb,
 	 * is slightly obscure just to avoid that. */
 	int prev_port = -1;
 	int err;
+
+	if (dp->sflow_probability) {
+		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--) {
 		WARN_ON_ONCE(skb_shared(skb));
 		if (prev_port != -1) {
@@ -424,6 +484,10 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb,
 			skb = set_nw_addr(skb, key, &a->nw_addr, gfp);
 			break;
 
+		case ODPAT_SET_NW_TOS:
+			skb = set_nw_tos(skb, key, &a->nw_tos, gfp);
+			break;
+
 		case ODPAT_SET_TP_SRC:
 		case ODPAT_SET_TP_DST:
 			skb = set_tp_port(skb, key, &a->tp_port, gfp);