X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Factions.c;h=78712c6a9603e524423c8137514f263287ca196a;hb=db5b4525b20e0fd6a079831638b5eb3f9fb131f2;hp=b6b713534565bc6961c514a324df56dfebb0990d;hpb=a4af24751b4127ae0c5cb25262b4069a7c0842ae;p=sliver-openvswitch.git

diff --git a/datapath/actions.c b/datapath/actions.c
index b6b713534..78712c6a9 100644
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -31,44 +31,31 @@
 static int do_execute_actions(struct datapath *, struct sk_buff *,
 			      struct sw_flow_actions *acts);
 
-static struct sk_buff *make_writable(struct sk_buff *skb, unsigned min_headroom)
+static int make_writable(struct sk_buff *skb, int write_len)
 {
-	if (skb_cloned(skb)) {
-		struct sk_buff *nskb;
-		unsigned headroom = max(min_headroom, skb_headroom(skb));
+	if (!skb_cloned(skb) || skb_clone_writable(skb, write_len))
+		return 0;
 
-		nskb = skb_copy_expand(skb, headroom, skb_tailroom(skb), GFP_ATOMIC);
-		if (nskb) {
-			set_skb_csum_bits(skb, nskb);
-			kfree_skb(skb);
-			return nskb;
-		}
-	} else {
-		unsigned int hdr_len = (skb_transport_offset(skb)
-					+ sizeof(struct tcphdr));
-		if (pskb_may_pull(skb, min(hdr_len, skb->len)))
-			return skb;
-	}
-	kfree_skb(skb);
-	return NULL;
+	return pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
 }
 
-static struct sk_buff *strip_vlan(struct sk_buff *skb)
+static int strip_vlan(struct sk_buff *skb)
 {
 	struct ethhdr *eh;
+	int err;
 
 	if (vlan_tx_tag_present(skb)) {
 		vlan_set_tci(skb, 0);
-		return skb;
+		return 0;
 	}
 
-	if (unlikely(vlan_eth_hdr(skb)->h_vlan_proto != htons(ETH_P_8021Q) ||
+	if (unlikely(skb->protocol != htons(ETH_P_8021Q) ||
 	    skb->len < VLAN_ETH_HLEN))
-		return skb;
+		return 0;
 
-	skb = make_writable(skb, 0);
-	if (unlikely(!skb))
-		return NULL;
+	err = make_writable(skb, VLAN_ETH_HLEN);
+	if (unlikely(err))
+		return err;
 
 	if (get_ip_summed(skb) == OVS_CSUM_COMPLETE)
 		skb->csum = csum_sub(skb->csum, csum_partial(skb->data
@@ -81,46 +68,36 @@ static struct sk_buff *strip_vlan(struct sk_buff *skb)
 	skb->protocol = eh->h_proto;
 	skb->mac_header += VLAN_HLEN;
 
-	return skb;
+	return 0;
 }
 
-static struct sk_buff *modify_vlan_tci(struct sk_buff *skb, __be16 tci)
+static int modify_vlan_tci(struct sk_buff *skb, __be16 tci)
 {
-	struct vlan_ethhdr *vh;
-	__be16 old_tci;
-
-	if (vlan_tx_tag_present(skb) || skb->protocol != htons(ETH_P_8021Q))
-		return __vlan_hwaccel_put_tag(skb, ntohs(tci));
-
-	skb = make_writable(skb, 0);
-	if (unlikely(!skb))
-		return NULL;
-
-	if (unlikely(skb->len < VLAN_ETH_HLEN))
-		return skb;
+	if (!vlan_tx_tag_present(skb) && skb->protocol == htons(ETH_P_8021Q)) {
+		int err;
 
-	vh = vlan_eth_hdr(skb);
+		if (unlikely(skb->len < VLAN_ETH_HLEN))
+			return 0;
 
-	old_tci = vh->h_vlan_TCI;
-	vh->h_vlan_TCI = tci;
-
-	if (get_ip_summed(skb) == OVS_CSUM_COMPLETE) {
-		__be16 diff[] = { ~old_tci, vh->h_vlan_TCI };
-		skb->csum = ~csum_partial((char *)diff, sizeof(diff), ~skb->csum);
+		err = strip_vlan(skb);
+		if (unlikely(err))
+			return err;
 	}
 
-	return skb;
+	__vlan_hwaccel_put_tag(skb, ntohs(tci));
+
+	return 0;
 }
 
 static bool is_ip(struct sk_buff *skb)
 {
-	return (OVS_CB(skb)->flow->key.dl_type == htons(ETH_P_IP) &&
+	return (OVS_CB(skb)->flow->key.eth.type == htons(ETH_P_IP) &&
 		skb->transport_header > skb->network_header);
 }
 
 static __sum16 *get_l4_checksum(struct sk_buff *skb)
 {
-	u8 nw_proto = OVS_CB(skb)->flow->key.nw_proto;
+	u8 nw_proto = OVS_CB(skb)->flow->key.ip.proto;
 	int transport_len = skb->len - skb_transport_offset(skb);
 	if (nw_proto == IPPROTO_TCP) {
 		if (likely(transport_len >= sizeof(struct tcphdr)))
@@ -132,19 +109,21 @@ static __sum16 *get_l4_checksum(struct sk_buff *skb)
 	return NULL;
 }
 
-static struct sk_buff *set_nw_addr(struct sk_buff *skb, const struct nlattr *a)
+static int set_nw_addr(struct sk_buff *skb, const struct nlattr *a)
 {
 	__be32 new_nwaddr = nla_get_be32(a);
 	struct iphdr *nh;
 	__sum16 *check;
 	__be32 *nwaddr;
+	int err;
 
 	if (unlikely(!is_ip(skb)))
-		return skb;
+		return 0;
 
-	skb = make_writable(skb, 0);
-	if (unlikely(!skb))
-		return NULL;
+	err = make_writable(skb, skb_network_offset(skb) +
+				 sizeof(struct iphdr));
+	if (unlikely(err))
+		return err;
 
 	nh = ip_hdr(skb);
 	nwaddr = nla_type(a) == ODP_ACTION_ATTR_SET_NW_SRC ? &nh->saddr : &nh->daddr;
@@ -158,47 +137,52 @@ static struct sk_buff *set_nw_addr(struct sk_buff *skb, const struct nlattr *a)
 
 	*nwaddr = new_nwaddr;
 
-	return skb;
+	return 0;
 }
 
-static struct sk_buff *set_nw_tos(struct sk_buff *skb, u8 nw_tos)
+static int set_nw_tos(struct sk_buff *skb, u8 nw_tos)
 {
+	struct iphdr *nh = ip_hdr(skb);
+	u8 old, new;
+	int err;
+
 	if (unlikely(!is_ip(skb)))
-		return skb;
-
-	skb = make_writable(skb, 0);
-	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 = nw_tos | (nh->tos & INET_ECN_MASK);
-		csum_replace4(&nh->check, (__force __be32)old,
-					  (__force __be32)new);
-		*f = new;
-	}
-	return skb;
+		return 0;
+
+	err = make_writable(skb, skb_network_offset(skb) +
+				 sizeof(struct iphdr));
+	if (unlikely(err))
+		return err;
+
+	/* Set the DSCP bits and preserve the ECN bits. */
+	old = nh->tos;
+	new = nw_tos | (nh->tos & INET_ECN_MASK);
+	csum_replace4(&nh->check, (__force __be32)old,
+				  (__force __be32)new);
+	nh->tos = new;
+
+	return 0;
 }
 
-static struct sk_buff *set_tp_port(struct sk_buff *skb, const struct nlattr *a)
+static int set_tp_port(struct sk_buff *skb, const struct nlattr *a)
 {
 	struct udphdr *th;
 	__sum16 *check;
 	__be16 *port;
+	int err;
 
 	if (unlikely(!is_ip(skb)))
-		return skb;
+		return 0;
 
-	skb = make_writable(skb, 0);
-	if (unlikely(!skb))
-		return NULL;
+	err = make_writable(skb, skb_transport_offset(skb) +
+				 sizeof(struct tcphdr));
+	if (unlikely(err))
+		return err;
 
 	/* Must follow make_writable() since that can move the skb data. */
 	check = get_l4_checksum(skb);
 	if (unlikely(!check))
-		return skb;
+		return 0;
 
 	/*
 	 * Update port and checksum.
@@ -213,35 +197,7 @@ static struct sk_buff *set_tp_port(struct sk_buff *skb, const struct nlattr *a)
 	*port = nla_get_be16(a);
 	skb_clear_rxhash(skb);
 
-	return skb;
-}
-
-/**
- * is_spoofed_arp - check for invalid ARP packet
- *
- * @skb: skbuff containing an Ethernet packet, with network header pointing
- * just past the Ethernet and optional 802.1Q header.
- *
- * Returns true if @skb is an invalid Ethernet+IPv4 ARP packet: one with screwy
- * or truncated header fields or one whose inner and outer Ethernet address
- * differ.
- */
-static bool is_spoofed_arp(struct sk_buff *skb)
-{
-	struct arp_eth_header *arp;
-
-	if (OVS_CB(skb)->flow->key.dl_type != htons(ETH_P_ARP))
-		return false;
-
-	if (skb_network_offset(skb) + sizeof(struct arp_eth_header) > skb->len)
-		return true;
-
-	arp = (struct arp_eth_header *)skb_network_header(skb);
-	return (arp->ar_hrd != htons(ARPHRD_ETHER) ||
-		arp->ar_pro != htons(ETH_P_IP) ||
-		arp->ar_hln != ETH_ALEN ||
-		arp->ar_pln != 4 ||
-		compare_ether_addr(arp->ar_sha, eth_hdr(skb)->h_source));
+	return 0;
 }
 
 static void do_output(struct datapath *dp, struct sk_buff *skb, int out_port)
@@ -262,7 +218,7 @@ error:
 	kfree_skb(skb);
 }
 
-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;
 
@@ -290,10 +246,12 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
 	int prev_port = -1;
 	u32 priority = skb->priority;
 	const struct nlattr *a;
-	int rem, err;
+	int rem;
 
 	for (a = acts->actions, rem = acts->actions_len; rem > 0;
 	     a = nla_next(a, &rem)) {
+		int err = 0;
+
 		if (prev_port != -1) {
 			do_output(dp, skb_clone(skb, GFP_ATOMIC), prev_port);
 			prev_port = -1;
@@ -304,12 +262,8 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
 			prev_port = nla_get_u32(a);
 			break;
 
-		case ODP_ACTION_ATTR_CONTROLLER:
-			err = output_control(dp, skb, nla_get_u64(a));
-			if (err) {
-				kfree_skb(skb);
-				return err;
-			}
+		case ODP_ACTION_ATTR_USERSPACE:
+			err = output_userspace(dp, skb, nla_get_u64(a));
 			break;
 
 		case ODP_ACTION_ATTR_SET_TUNNEL:
@@ -317,39 +271,37 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
 			break;
 
 		case ODP_ACTION_ATTR_SET_DL_TCI:
-			skb = modify_vlan_tci(skb, nla_get_be16(a));
+			err = modify_vlan_tci(skb, nla_get_be16(a));
 			break;
 
 		case ODP_ACTION_ATTR_STRIP_VLAN:
-			skb = strip_vlan(skb);
+			err = strip_vlan(skb);
 			break;
 
 		case ODP_ACTION_ATTR_SET_DL_SRC:
-			skb = make_writable(skb, 0);
-			if (!skb)
-				return -ENOMEM;
-			memcpy(eth_hdr(skb)->h_source, nla_data(a), ETH_ALEN);
+			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:
-			skb = make_writable(skb, 0);
-			if (!skb)
-				return -ENOMEM;
-			memcpy(eth_hdr(skb)->h_dest, nla_data(a), ETH_ALEN);
+			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:
-			skb = set_nw_addr(skb, a);
+			err = set_nw_addr(skb, a);
 			break;
 
 		case ODP_ACTION_ATTR_SET_NW_TOS:
-			skb = set_nw_tos(skb, nla_get_u8(a));
+			err = set_nw_tos(skb, nla_get_u8(a));
 			break;
 
 		case ODP_ACTION_ATTR_SET_TP_SRC:
 		case ODP_ACTION_ATTR_SET_TP_DST:
-			skb = set_tp_port(skb, a);
+			err = set_tp_port(skb, a);
 			break;
 
 		case ODP_ACTION_ATTR_SET_PRIORITY:
@@ -359,20 +311,19 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
 		case ODP_ACTION_ATTR_POP_PRIORITY:
 			skb->priority = priority;
 			break;
+		}
 
-		case ODP_ACTION_ATTR_DROP_SPOOFED_ARP:
-			if (unlikely(is_spoofed_arp(skb)))
-				goto exit;
-			break;
+		if (unlikely(err)) {
+			kfree_skb(skb);
+			return err;
 		}
-		if (!skb)
-			return -ENOMEM;
 	}
-exit:
+
 	if (prev_port != -1)
 		do_output(dp, skb, prev_port);
 	else
-		kfree_skb(skb);
+		consume_skb(skb);
+
 	return 0;
 }