X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Factions.c;h=a6771b6c58c4d97c49725dde8dd2a82244259fad;hb=1f0af7586e9ffbdbafe00344aca56cd2663b1f62;hp=fed9830fe773c1244970a56cab232f4331364529;hpb=ff6402a9f0d9ee4c29567b62938c82924d502b92;p=openvswitch

diff --git a/datapath/actions.c b/datapath/actions.c
index fed9830f..a6771b6c 100644
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -24,10 +24,9 @@
 #include "openvswitch/datapath-protocol.h"
 #include "vport.h"
 
-static struct sk_buff *
-make_writable(struct sk_buff *skb, unsigned min_headroom, gfp_t gfp)
+static struct sk_buff *make_writable(struct sk_buff *skb, unsigned min_headroom, gfp_t gfp)
 {
-	if (skb_shared(skb) || skb_cloned(skb)) {
+	if (skb_cloned(skb)) {
 		struct sk_buff *nskb;
 		unsigned headroom = max(min_headroom, skb_headroom(skb));
 
@@ -47,14 +46,7 @@ make_writable(struct sk_buff *skb, unsigned min_headroom, gfp_t gfp)
 	return NULL;
 }
 
-static void set_tunnel(struct sk_buff *skb, struct odp_flow_key *key,
-		       __be32 tun_id)
-{
-	OVS_CB(skb)->tun_id = key->tun_id = tun_id;
-}
-
-static struct sk_buff *
-vlan_pull_tag(struct sk_buff *skb)
+static struct sk_buff *vlan_pull_tag(struct sk_buff *skb)
 {
 	struct vlan_ethhdr *vh = vlan_eth_hdr(skb);
 	struct ethhdr *eh;
@@ -77,22 +69,19 @@ vlan_pull_tag(struct sk_buff *skb)
 	return skb;
 }
 
-
-static struct sk_buff *
-modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
-		struct odp_flow_key *key, const union odp_action *a,
-		int n_actions, gfp_t gfp)
+static struct sk_buff *modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
+				       const struct odp_flow_key *key,
+				       const union odp_action *a, int n_actions,
+				       gfp_t gfp)
 {
 	u16 tci, mask;
 
 	if (a->type == ODPAT_SET_VLAN_VID) {
 		tci = ntohs(a->vlan_vid.vlan_vid);
 		mask = VLAN_VID_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);
@@ -113,6 +102,8 @@ modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
 						~skb->csum);
 		}
 	} else {
+		int err;
+
 		/* Add vlan header */
 
 		/* Set up checksumming pointers for checksum-deferred packets
@@ -120,7 +111,11 @@ modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
 		 * when we send the packet out on the wire, and it will fail at
 		 * that point because skb_checksum_setup() will not look inside
 		 * an 802.1Q header. */
-		vswitch_skb_checksum_setup(skb);
+		err = vswitch_skb_checksum_setup(skb);
+		if (unlikely(err)) {
+			kfree_skb(skb);
+			return ERR_PTR(err);
+		}	
 
 		/* GSO is not implemented for packets with an 802.1Q header, so
 		 * we have to do segmentation before we add that header.
@@ -157,9 +152,8 @@ modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
 				segs = __vlan_put_tag(segs, tci);
 				err = -ENOMEM;
 				if (segs) {
-					struct odp_flow_key segkey = *key;
 					err = execute_actions(dp, segs,
-							      &segkey, a + 1,
+							      key, a + 1,
 							      n_actions - 1,
 							      gfp);
 				}
@@ -199,32 +193,26 @@ modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
 	return skb;
 }
 
-static struct sk_buff *strip_vlan(struct sk_buff *skb,
-				  struct odp_flow_key *key, gfp_t gfp)
+static struct sk_buff *strip_vlan(struct sk_buff *skb, gfp_t gfp)
 {
 	skb = make_writable(skb, 0, gfp);
-	if (skb) {
+	if (skb)
 		vlan_pull_tag(skb);
-		key->dl_vlan = htons(ODP_VLAN_NONE);
-	}
+
 	return 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);
-		if (a->type == ODPAT_SET_DL_SRC) {
+		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 {
+		else
 			memcpy(eh->h_dest, a->dl_addr, ETH_ALEN);
-			memcpy(key->dl_dst, a->dl_addr, ETH_ALEN);
-		}
 	}
 	return skb;
 }
@@ -250,7 +238,7 @@ static void update_csum(__sum16 *sum, struct sk_buff *skb,
 }
 
 static struct sk_buff *set_nw_addr(struct sk_buff *skb,
-				   struct odp_flow_key *key,
+				   const struct odp_flow_key *key,
 				   const struct odp_action_nw_addr *a,
 				   gfp_t gfp)
 {
@@ -273,17 +261,12 @@ 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;
 }
 
 static struct sk_buff *set_nw_tos(struct sk_buff *skb,
-				   struct odp_flow_key *key,
+				   const struct odp_flow_key *key,
 				   const struct odp_action_nw_tos *a,
 				   gfp_t gfp)
 {
@@ -302,15 +285,13 @@ static struct sk_buff *set_nw_tos(struct sk_buff *skb,
 		update_csum(&nh->check, skb, htons((uint16_t)old),
 				htons((uint16_t)new), 0);
 		*f = new;
-		key->nw_tos = a->nw_tos;
 	}
 	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,
-	    gfp_t gfp)
+static struct sk_buff *set_tp_port(struct sk_buff *skb,
+				   const struct odp_flow_key *key,
+				   const struct odp_action_tp_port *a, gfp_t gfp)
 {
 	int check_ofs;
 
@@ -333,27 +314,13 @@ 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;
 }
 
-static inline unsigned packet_length(const struct sk_buff *skb)
-{
-	unsigned length = skb->len - ETH_HLEN;
-	if (skb->protocol == htons(ETH_P_8021Q))
-		length -= VLAN_HLEN;
-	return length;
-}
-
-static void
-do_output(struct datapath *dp, struct sk_buff *skb, int out_port)
+static void do_output(struct datapath *dp, struct sk_buff *skb, int out_port)
 {
 	struct dp_port *p;
-	int mtu;
 
 	if (!skb)
 		goto error;
@@ -362,13 +329,6 @@ do_output(struct datapath *dp, struct sk_buff *skb, int out_port)
 	if (!p)
 		goto error;
 
-	mtu = vport_get_mtu(p->vport);
-	if (packet_length(skb) > mtu && !skb_is_gso(skb)) {
-		printk(KERN_WARNING "%s: dropped over-mtu packet: %d > %d\n",
-		       dp_name(dp), packet_length(skb), mtu);
-		goto error;
-	}
-
 	vport_send(p->vport, skb);
 	return;
 
@@ -402,8 +362,8 @@ static int output_group(struct datapath *dp, __u16 group,
 	return prev_port;
 }
 
-static int
-output_control(struct datapath *dp, struct sk_buff *skb, u32 arg, gfp_t gfp)
+static int output_control(struct datapath *dp, struct sk_buff *skb, u32 arg,
+			  gfp_t gfp)
 {
 	skb = skb_clone(skb, gfp);
 	if (!skb)
@@ -435,7 +395,7 @@ static void sflow_sample(struct datapath *dp, struct sk_buff *skb,
 
 /* Execute a list of actions against 'skb'. */
 int execute_actions(struct datapath *dp, struct sk_buff *skb,
-		    struct odp_flow_key *key,
+		    const struct odp_flow_key *key,
 		    const union odp_action *a, int n_actions,
 		    gfp_t gfp)
 {
@@ -444,6 +404,7 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb,
 	 * then freeing the original skbuff is wasteful.  So the following code
 	 * is slightly obscure just to avoid that. */
 	int prev_port = -1;
+	u32 priority = skb->priority;
 	int err;
 
 	if (dp->sflow_probability) {
@@ -459,7 +420,6 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb,
 	OVS_CB(skb)->tun_id = 0;
 
 	for (; n_actions > 0; a++, n_actions--) {
-		WARN_ON_ONCE(skb_shared(skb));
 		if (prev_port != -1) {
 			do_output(dp, skb_clone(skb, gfp), prev_port);
 			prev_port = -1;
@@ -484,7 +444,7 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb,
 			break;
 
 		case ODPAT_SET_TUNNEL:
-			set_tunnel(skb, key, a->tunnel.tun_id);
+			OVS_CB(skb)->tun_id = a->tunnel.tun_id;
 			break;
 
 		case ODPAT_SET_VLAN_VID:
@@ -495,12 +455,12 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb,
 			break;
 
 		case ODPAT_STRIP_VLAN:
-			skb = strip_vlan(skb, key, gfp);
+			skb = strip_vlan(skb, gfp);
 			break;
 
 		case ODPAT_SET_DL_SRC:
 		case ODPAT_SET_DL_DST:
-			skb = set_dl_addr(skb, key, &a->dl_addr, gfp);
+			skb = set_dl_addr(skb, &a->dl_addr, gfp);
 			break;
 
 		case ODPAT_SET_NW_SRC:
@@ -516,6 +476,14 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb,
 		case ODPAT_SET_TP_DST:
 			skb = set_tp_port(skb, key, &a->tp_port, gfp);
 			break;
+
+		case ODPAT_SET_PRIORITY:
+			skb->priority = a->priority.priority;
+			break;
+
+		case ODPAT_POP_PRIORITY:
+			skb->priority = priority;
+			break;
 		}
 		if (!skb)
 			return -ENOMEM;