X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Factions.c;h=945c461cdc01c6dd965ddc9a9a20ecb24ac569e7;hb=6d23c6f42206809f985d3fc7d95fca0589522836;hp=ed61039a0a3d6dee88d762ea62934ce95dcf2e67;hpb=5b95ab0edf18e44d6624c8aa98b658df2fbb48f2;p=openvswitch

diff --git a/datapath/actions.c b/datapath/actions.c
index ed61039a..945c461c 100644
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -8,6 +8,8 @@
 
 /* Functions for executing flow actions. */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/skbuff.h>
 #include <linux/in.h>
 #include <linux/ip.h>
@@ -23,13 +25,12 @@
 #include "actions.h"
 #include "checksum.h"
 #include "datapath.h"
-#include "loop_counter.h"
 #include "openvswitch/datapath-protocol.h"
 #include "vlan.h"
 #include "vport.h"
 
-static int do_execute_actions(struct datapath *, struct sk_buff *,
-			      struct sw_flow_actions *acts);
+static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
+			const struct nlattr *attr, int len, bool keep_skb);
 
 static int make_writable(struct sk_buff *skb, int write_len)
 {
@@ -39,20 +40,13 @@ static int make_writable(struct sk_buff *skb, int write_len)
 	return pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
 }
 
-static int strip_vlan(struct sk_buff *skb)
+/* remove VLAN header from packet and update csum accrodingly. */
+static int __pop_vlan_tci(struct sk_buff *skb, __be16 *current_tci)
 {
 	struct ethhdr *eh;
+	struct vlan_ethhdr *veth;
 	int err;
 
-	if (vlan_tx_tag_present(skb)) {
-		vlan_set_tci(skb, 0);
-		return 0;
-	}
-
-	if (unlikely(skb->protocol != htons(ETH_P_8021Q) ||
-	    skb->len < VLAN_ETH_HLEN))
-		return 0;
-
 	err = make_writable(skb, VLAN_ETH_HLEN);
 	if (unlikely(err))
 		return err;
@@ -61,9 +55,12 @@ static int strip_vlan(struct sk_buff *skb)
 		skb->csum = csum_sub(skb->csum, csum_partial(skb->data
 					+ ETH_HLEN, VLAN_HLEN, 0));
 
+	veth = (struct vlan_ethhdr *) skb->data;
+	*current_tci = veth->h_vlan_TCI;
+
 	memmove(skb->data + VLAN_HLEN, skb->data, 2 * ETH_ALEN);
 
-	eh = (struct ethhdr *)skb_pull(skb, VLAN_HLEN);
+	eh = (struct ethhdr *)__skb_pull(skb, VLAN_HLEN);
 
 	skb->protocol = eh->h_proto;
 	skb->mac_header += VLAN_HLEN;
@@ -71,21 +68,52 @@ static int strip_vlan(struct sk_buff *skb)
 	return 0;
 }
 
-static int modify_vlan_tci(struct sk_buff *skb, __be16 tci)
+static int pop_vlan(struct sk_buff *skb)
 {
-	if (!vlan_tx_tag_present(skb) && skb->protocol == htons(ETH_P_8021Q)) {
-		int err;
+	__be16 tci;
+	int err;
 
-		if (unlikely(skb->len < VLAN_ETH_HLEN))
+	if (likely(vlan_tx_tag_present(skb))) {
+		vlan_set_tci(skb, 0);
+	} else {
+		if (unlikely(skb->protocol != htons(ETH_P_8021Q) ||
+		    skb->len < VLAN_ETH_HLEN))
 			return 0;
 
-		err = strip_vlan(skb);
-		if (unlikely(err))
+		err = __pop_vlan_tci(skb, &tci);
+		if (err)
 			return err;
 	}
+	/* move next vlan tag to hw accel tag */
+	if (likely(skb->protocol != htons(ETH_P_8021Q) ||
+	    skb->len < VLAN_ETH_HLEN))
+		return 0;
+
+	err = __pop_vlan_tci(skb, &tci);
+	if (unlikely(err))
+		return err;
 
 	__vlan_hwaccel_put_tag(skb, ntohs(tci));
+	return 0;
+}
+
+static int push_vlan(struct sk_buff *skb, __be16 new_tci)
+{
+	if (unlikely(vlan_tx_tag_present(skb))) {
+		u16 current_tag;
 
+		/* push down current VLAN tag */
+		current_tag = vlan_tx_tag_get(skb);
+
+		if (!__vlan_put_tag(skb, current_tag))
+			return -ENOMEM;
+
+		if (get_ip_summed(skb) == OVS_CSUM_COMPLETE)
+			skb->csum = csum_add(skb->csum, csum_partial(skb->data
+					+ ETH_HLEN, VLAN_HLEN, 0));
+
+	}
+	__vlan_hwaccel_put_tag(skb, ntohs(new_tci));
 	return 0;
 }
 
@@ -126,7 +154,7 @@ static int set_nw_addr(struct sk_buff *skb, const struct nlattr *a)
 		return err;
 
 	nh = ip_hdr(skb);
-	nwaddr = nla_type(a) == ODP_ACTION_ATTR_SET_NW_SRC ? &nh->saddr : &nh->daddr;
+	nwaddr = nla_type(a) == OVS_ACTION_ATTR_SET_NW_SRC ? &nh->saddr : &nh->daddr;
 
 	check = get_l4_checksum(skb);
 	if (likely(check))
@@ -192,7 +220,7 @@ static int set_tp_port(struct sk_buff *skb, const struct nlattr *a)
 	 * supports those protocols.
 	 */
 	th = udp_hdr(skb);
-	port = nla_type(a) == ODP_ACTION_ATTR_SET_TP_SRC ? &th->source : &th->dest;
+	port = nla_type(a) == OVS_ACTION_ATTR_SET_TP_SRC ? &th->source : &th->dest;
 	inet_proto_csum_replace2(check, skb, *port, nla_get_be16(a), 0);
 	*port = nla_get_be16(a);
 	skb_clear_rxhash(skb);
@@ -200,44 +228,61 @@ static int set_tp_port(struct sk_buff *skb, const struct nlattr *a)
 	return 0;
 }
 
-static void do_output(struct datapath *dp, struct sk_buff *skb, int out_port)
+static int do_output(struct datapath *dp, struct sk_buff *skb, int out_port)
 {
-	struct vport *p;
-
-	if (!skb)
-		goto error;
+	struct vport *vport;
 
-	p = rcu_dereference(dp->ports[out_port]);
-	if (!p)
-		goto error;
+	if (unlikely(!skb))
+		return -ENOMEM;
 
-	vport_send(p, skb);
-	return;
+	vport = rcu_dereference(dp->ports[out_port]);
+	if (unlikely(!vport)) {
+		kfree_skb(skb);
+		return -ENODEV;
+	}
 
-error:
-	kfree_skb(skb);
+	vport_send(vport, skb);
+	return 0;
 }
 
-static int output_control(struct datapath *dp, struct sk_buff *skb, u64 arg)
+static int output_userspace(struct datapath *dp, struct sk_buff *skb, u64 arg)
 {
 	struct dp_upcall_info upcall;
 
-	skb = skb_clone(skb, GFP_ATOMIC);
-	if (!skb)
-		return -ENOMEM;
-
-	upcall.cmd = ODP_PACKET_CMD_ACTION;
+	upcall.cmd = OVS_PACKET_CMD_ACTION;
 	upcall.key = &OVS_CB(skb)->flow->key;
 	upcall.userdata = arg;
-	upcall.sample_pool = 0;
-	upcall.actions = NULL;
-	upcall.actions_len = 0;
 	return dp_upcall(dp, skb, &upcall);
 }
 
+static int sample(struct datapath *dp, struct sk_buff *skb,
+		  const struct nlattr *attr)
+{
+	const struct nlattr *acts_list = NULL;
+	const struct nlattr *a;
+	int rem;
+
+	for (a = nla_data(attr), rem = nla_len(attr); rem > 0;
+		 a = nla_next(a, &rem)) {
+		switch (nla_type(a)) {
+		case OVS_SAMPLE_ATTR_PROBABILITY:
+			if (net_random() >= nla_get_u32(a))
+				return 0;
+			break;
+
+		case OVS_SAMPLE_ATTR_ACTIONS:
+			acts_list = a;
+			break;
+		}
+	}
+
+	return do_execute_actions(dp, skb, nla_data(acts_list),
+						 nla_len(acts_list), true);
+}
+
 /* Execute a list of actions against 'skb'. */
 static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
-			      struct sw_flow_actions *acts)
+			const struct nlattr *attr, int len, bool keep_skb)
 {
 	/* Every output action needs a separate clone of 'skb', but the common
 	 * case is just a single output action, so that doing a clone and
@@ -248,7 +293,7 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
 	const struct nlattr *a;
 	int rem;
 
-	for (a = acts->actions, rem = acts->actions_len; rem > 0;
+	for (a = attr, rem = len; rem > 0;
 	     a = nla_next(a, &rem)) {
 		int err = 0;
 
@@ -258,100 +303,102 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
 		}
 
 		switch (nla_type(a)) {
-		case ODP_ACTION_ATTR_OUTPUT:
+		case OVS_ACTION_ATTR_OUTPUT:
 			prev_port = nla_get_u32(a);
 			break;
 
-		case ODP_ACTION_ATTR_CONTROLLER:
-			err = output_control(dp, skb, nla_get_u64(a));
+		case OVS_ACTION_ATTR_USERSPACE:
+			output_userspace(dp, skb, nla_get_u64(a));
 			break;
 
-		case ODP_ACTION_ATTR_SET_TUNNEL:
+		case OVS_ACTION_ATTR_SET_TUNNEL:
 			OVS_CB(skb)->tun_id = nla_get_be64(a);
 			break;
 
-		case ODP_ACTION_ATTR_SET_DL_TCI:
-			err = modify_vlan_tci(skb, nla_get_be16(a));
+		case OVS_ACTION_ATTR_PUSH_VLAN:
+			err = push_vlan(skb, nla_get_be16(a));
+			if (unlikely(err)) /* skb already freed */
+				return err;
 			break;
 
-		case ODP_ACTION_ATTR_STRIP_VLAN:
-			err = strip_vlan(skb);
+		case OVS_ACTION_ATTR_POP_VLAN:
+			err = pop_vlan(skb);
 			break;
 
-		case ODP_ACTION_ATTR_SET_DL_SRC:
+		case OVS_ACTION_ATTR_SET_DL_SRC:
 			err = make_writable(skb, ETH_HLEN);
 			if (likely(!err))
 				memcpy(eth_hdr(skb)->h_source, nla_data(a), ETH_ALEN);
 			break;
 
-		case ODP_ACTION_ATTR_SET_DL_DST:
+		case OVS_ACTION_ATTR_SET_DL_DST:
 			err = make_writable(skb, ETH_HLEN);
 			if (likely(!err))
 				memcpy(eth_hdr(skb)->h_dest, nla_data(a), ETH_ALEN);
 			break;
 
-		case ODP_ACTION_ATTR_SET_NW_SRC:
-		case ODP_ACTION_ATTR_SET_NW_DST:
+		case OVS_ACTION_ATTR_SET_NW_SRC:
+		case OVS_ACTION_ATTR_SET_NW_DST:
 			err = set_nw_addr(skb, a);
 			break;
 
-		case ODP_ACTION_ATTR_SET_NW_TOS:
+		case OVS_ACTION_ATTR_SET_NW_TOS:
 			err = set_nw_tos(skb, nla_get_u8(a));
 			break;
 
-		case ODP_ACTION_ATTR_SET_TP_SRC:
-		case ODP_ACTION_ATTR_SET_TP_DST:
+		case OVS_ACTION_ATTR_SET_TP_SRC:
+		case OVS_ACTION_ATTR_SET_TP_DST:
 			err = set_tp_port(skb, a);
 			break;
 
-		case ODP_ACTION_ATTR_SET_PRIORITY:
+		case OVS_ACTION_ATTR_SET_PRIORITY:
 			skb->priority = nla_get_u32(a);
 			break;
 
-		case ODP_ACTION_ATTR_POP_PRIORITY:
+		case OVS_ACTION_ATTR_POP_PRIORITY:
 			skb->priority = priority;
 			break;
-		}
 
+		case OVS_ACTION_ATTR_SAMPLE:
+			err = sample(dp, skb, a);
+			break;
+
+		}
 		if (unlikely(err)) {
 			kfree_skb(skb);
 			return err;
 		}
 	}
 
-	if (prev_port != -1)
+	if (prev_port != -1) {
+		if (keep_skb)
+			skb = skb_clone(skb, GFP_ATOMIC);
+
 		do_output(dp, skb, prev_port);
-	else
+	} else if (!keep_skb)
 		consume_skb(skb);
 
 	return 0;
 }
 
-static void sflow_sample(struct datapath *dp, struct sk_buff *skb,
-			 struct sw_flow_actions *acts)
-{
-	struct sk_buff *nskb;
-	struct vport *p = OVS_CB(skb)->vport;
-	struct dp_upcall_info upcall;
+/* We limit the number of times that we pass into execute_actions()
+ * to avoid blowing out the stack in the event that we have a loop. */
+#define MAX_LOOPS 5
 
-	if (unlikely(!p))
-		return;
+struct loop_counter {
+	u8 count;		/* Count. */
+	bool looping;		/* Loop detected? */
+};
 
-	atomic_inc(&p->sflow_pool);
-	if (net_random() >= dp->sflow_probability)
-		return;
+static DEFINE_PER_CPU(struct loop_counter, loop_counters);
 
-	nskb = skb_clone(skb, GFP_ATOMIC);
-	if (unlikely(!nskb))
-		return;
-
-	upcall.cmd = ODP_PACKET_CMD_SAMPLE;
-	upcall.key = &OVS_CB(skb)->flow->key;
-	upcall.userdata = 0;
-	upcall.sample_pool = atomic_read(&p->sflow_pool);
-	upcall.actions = acts->actions;
-	upcall.actions_len = acts->actions_len;
-	dp_upcall(dp, nskb, &upcall);
+static int loop_suppress(struct datapath *dp, struct sw_flow_actions *actions)
+{
+	if (net_ratelimit())
+		pr_warn("%s: flow looped %d times, dropping\n",
+				dp_name(dp), MAX_LOOPS);
+	actions->actions_len = 0;
+	return -ELOOP;
 }
 
 /* Execute a list of actions against 'skb'. */
@@ -362,7 +409,7 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb)
 	int error;
 
 	/* Check whether we've looped too much. */
-	loop = loop_get_counter();
+	loop = &__get_cpu_var(loop_counters);
 	if (unlikely(++loop->count > MAX_LOOPS))
 		loop->looping = true;
 	if (unlikely(loop->looping)) {
@@ -371,11 +418,9 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb)
 		goto out_loop;
 	}
 
-	/* Really execute actions. */
-	if (dp->sflow_probability)
-		sflow_sample(dp, skb, acts);
 	OVS_CB(skb)->tun_id = 0;
-	error = do_execute_actions(dp, skb, acts);
+	error = do_execute_actions(dp, skb, acts->actions,
+					 acts->actions_len, false);
 
 	/* Check whether sub-actions looped too much. */
 	if (unlikely(loop->looping))
@@ -385,7 +430,6 @@ out_loop:
 	/* Decrement loop counter. */
 	if (!--loop->count)
 		loop->looping = false;
-	loop_put_counter();
 
 	return error;
 }