X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Factions.c;h=bef7d108c3e7b1ef61f53824bbd426bbea925a22;hb=7360012bdf64effd898242a58634267e203a2795;hp=b39d83070c75cf1b196487d8d80f3679ea9b58b7;hpb=02dd3123a0e312f1d33403e744af52dd6096f12d;p=openvswitch

diff --git a/datapath/actions.c b/datapath/actions.c
index b39d8307..bef7d108 100644
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -65,11 +65,14 @@ vlan_pull_tag(struct sk_buff *skb)
 	struct vlan_ethhdr *vh = vlan_eth_hdr(skb);
 	struct ethhdr *eh;
 
-
 	/* Verify we were given a vlan packet */
 	if (vh->h_vlan_proto != htons(ETH_P_8021Q))
 		return skb;
 
+	if (OVS_CB(skb)->ip_summed == OVS_CSUM_COMPLETE)
+		skb->csum = csum_sub(skb->csum, csum_partial(skb->data
+					+ ETH_HLEN, VLAN_HLEN, 0));
+
 	memmove(skb->data + VLAN_HLEN, skb->data, 2 * VLAN_ETH_ALEN);
 
 	eh = (struct ethhdr *)skb_pull(skb, VLAN_HLEN);
@@ -91,10 +94,11 @@ modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
 	if (a->type == ODPAT_SET_VLAN_VID) {
 		tci = ntohs(a->vlan_vid.vlan_vid);
 		mask = VLAN_VID_MASK;
-		key->dl_vlan = htons(tci & mask);
+		key->dl_vlan = a->vlan_vid.vlan_vid;
 	} else {
 		tci = a->vlan_pcp.vlan_pcp << VLAN_PCP_SHIFT;
 		mask = VLAN_PCP_MASK;
+		key->dl_vlan_pcp = a->vlan_pcp.vlan_pcp;
 	}
 
 	skb = make_writable(skb, VLAN_HLEN, gfp);
@@ -104,7 +108,16 @@ modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
 	if (skb->protocol == htons(ETH_P_8021Q)) {
 		/* Modify vlan id, but maintain other TCI values */
 		struct vlan_ethhdr *vh = vlan_eth_hdr(skb);
+		__be16 old_tci = vh->h_vlan_TCI;
+
 		vh->h_vlan_TCI = htons((ntohs(vh->h_vlan_TCI) & ~mask) | tci);
+
+		if (OVS_CB(skb)->ip_summed == OVS_CSUM_COMPLETE) {
+			__be16 diff[] = { ~old_tci, vh->h_vlan_TCI };
+
+			skb->csum = ~csum_partial((char *)diff, sizeof(diff),
+						~skb->csum);
+		}
 	} else {
 		/* Add vlan header */
 
@@ -144,6 +157,9 @@ modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
 
 				segs->next = NULL;
 
+				/* GSO can change the checksum type so update.*/
+				compute_ip_summed(segs, true);
+
 				segs = __vlan_put_tag(segs, tci);
 				err = -ENOMEM;
 				if (segs) {
@@ -167,6 +183,7 @@ modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
 			} while (segs->next);
 
 			skb = segs;
+			compute_ip_summed(skb, true);
 		}
 
 		/* The hardware-accelerated version of vlan_put_tag() works
@@ -177,6 +194,12 @@ modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
 		skb = __vlan_put_tag(skb, tci);
 		if (!skb)
 			return ERR_PTR(-ENOMEM);
+
+		/* GSO doesn't fix up the hardware computed checksum so this
+		 * will only be hit in the non-GSO case. */
+		if (OVS_CB(skb)->ip_summed == OVS_CSUM_COMPLETE)
+			skb->csum = csum_add(skb->csum, csum_partial(skb->data
+						+ ETH_HLEN, VLAN_HLEN, 0));
 	}
 
 	return skb;
@@ -194,14 +217,20 @@ static struct sk_buff *strip_vlan(struct sk_buff *skb,
 }
 
 static struct sk_buff *set_dl_addr(struct sk_buff *skb,
+				   struct odp_flow_key *key,
 				   const struct odp_action_dl_addr *a,
 				   gfp_t gfp)
 {
 	skb = make_writable(skb, 0, gfp);
 	if (skb) {
 		struct ethhdr *eh = eth_hdr(skb);
-		memcpy(a->type == ODPAT_SET_DL_SRC ? eh->h_source : eh->h_dest,
-		       a->dl_addr, ETH_ALEN);
+		if (a->type == ODPAT_SET_DL_SRC) {
+			memcpy(eh->h_source, a->dl_addr, ETH_ALEN);
+			memcpy(key->dl_src, a->dl_addr, ETH_ALEN);
+		} else {
+			memcpy(eh->h_dest, a->dl_addr, ETH_ALEN);
+			memcpy(key->dl_dst, a->dl_addr, ETH_ALEN);
+		}
 	}
 	return skb;
 }
@@ -215,42 +244,10 @@ static void update_csum(__sum16 *sum, struct sk_buff *skb,
 {
 	__be32 diff[] = { ~from, to };
 
-/* 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) {
+	if (OVS_CB(skb)->ip_summed != OVS_CSUM_PARTIAL) {
 		*sum = csum_fold(csum_partial((char *)diff, sizeof(diff),
 				~csum_unfold(*sum)));
-		if (csum_type == CSUM_COMPLETE && pseudohdr)
+		if (OVS_CB(skb)->ip_summed == OVS_CSUM_COMPLETE && pseudohdr)
 			skb->csum = ~csum_partial((char *)diff, sizeof(diff),
 						~skb->csum);
 	} else if (pseudohdr)
@@ -282,6 +279,11 @@ static struct sk_buff *set_nw_addr(struct sk_buff *skb,
 		}
 		update_csum(&nh->check, skb, old, new, 0);
 		*f = new;
+
+		if (a->type == ODPAT_SET_NW_SRC)
+			key->nw_src = a->nw_addr;
+		else
+			key->nw_dst = a->nw_addr;
 	}
 	return skb;
 }
@@ -302,10 +304,11 @@ static struct sk_buff *set_nw_tos(struct sk_buff *skb,
 		u8 new;
 
 		/* Set the DSCP bits and preserve the ECN bits. */
-		new = (a->nw_tos & ~INET_ECN_MASK) | (nh->tos & INET_ECN_MASK);
+		new = a->nw_tos | (nh->tos & INET_ECN_MASK);
 		update_csum(&nh->check, skb, htons((uint16_t)old),
 				htons((uint16_t)new), 0);
 		*f = new;
+		key->nw_tos = a->nw_tos;
 	}
 	return skb;
 }
@@ -336,6 +339,10 @@ set_tp_port(struct sk_buff *skb, struct odp_flow_key *key,
 		update_csum((u16*)(skb_transport_header(skb) + check_ofs), 
 				skb, old, new, 0);
 		*f = new;
+		if (a->type == ODPAT_SET_TP_SRC)
+			key->tp_src = a->tp_port;
+		else
+			key->tp_dst = a->tp_port;
 	}
 	return skb;
 }
@@ -508,7 +515,7 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb,
 
 		case ODPAT_SET_DL_SRC:
 		case ODPAT_SET_DL_DST:
-			skb = set_dl_addr(skb, &a->dl_addr, gfp);
+			skb = set_dl_addr(skb, key, &a->dl_addr, gfp);
 			break;
 
 		case ODPAT_SET_NW_SRC: