X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Ftunnel.c;h=ec3ad936f824fbaf6857a38ef9a79a1bb53b13df;hb=c24750a10235af1be9fd9196fc026ab4626ba2d4;hp=77f976fdc531aae6f2b4a40d3235ec6ff2d2ebdd;hpb=842cf6f472b236b6e61be04b41970116245b1759;p=openvswitch

diff --git a/datapath/tunnel.c b/datapath/tunnel.c
index 77f976fd..ec3ad936 100644
--- a/datapath/tunnel.c
+++ b/datapath/tunnel.c
@@ -29,6 +29,7 @@
 #include <net/xfrm.h>
 
 #include "actions.h"
+#include "checksum.h"
 #include "datapath.h"
 #include "table.h"
 #include "tunnel.h"
@@ -68,7 +69,7 @@
 #define CACHE_DATA_ALIGN 16
 
 /* Protected by RCU. */
-static struct tbl *port_table;
+static struct tbl *port_table __read_mostly;
 
 static void cache_cleaner(struct work_struct *work);
 DECLARE_DELAYED_WORK(cache_cleaner_wq, cache_cleaner);
@@ -78,10 +79,10 @@ DECLARE_DELAYED_WORK(cache_cleaner_wq, cache_cleaner);
  * synchronization because we could have just as easily read the value before
  * the port change happened.
  */
-static unsigned int key_local_remote_ports;
-static unsigned int key_remote_ports;
-static unsigned int local_remote_ports;
-static unsigned int remote_ports;
+static unsigned int key_local_remote_ports __read_mostly;
+static unsigned int key_remote_ports __read_mostly;
+static unsigned int local_remote_ports __read_mostly;
+static unsigned int remote_ports __read_mostly;
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
 #define rt_dst(rt) (rt->dst)
@@ -164,15 +165,11 @@ static unsigned int *find_port_pool(const struct tnl_mutable_config *mutable)
 	}
 }
 
-enum lookup_key {
-	LOOKUP_TUNNEL_TYPE	= 0,
-	LOOKUP_SADDR		= 1,
-	LOOKUP_DADDR		= 2,
-	LOOKUP_KEY		= 3,
-};
-
 struct port_lookup_key {
-	u32 vals[4];			/* Contains enum lookup_key keys. */
+	u32 tunnel_type;
+	__be32 saddr;
+	__be32 daddr;
+	__be32 key;
 	const struct tnl_mutable_config *mutable;
 };
 
@@ -187,25 +184,25 @@ static int port_cmp(const struct tbl_node *node, void *target)
 
 	lookup->mutable = rcu_dereference(tnl_vport->mutable);
 
-	return (lookup->mutable->tunnel_type == lookup->vals[LOOKUP_TUNNEL_TYPE]) &&
-	       lookup->mutable->port_config.daddr == lookup->vals[LOOKUP_DADDR] &&
-	       lookup->mutable->port_config.in_key == lookup->vals[LOOKUP_KEY] &&
-	       lookup->mutable->port_config.saddr == lookup->vals[LOOKUP_SADDR];
+	return (lookup->mutable->tunnel_type == lookup->tunnel_type &&
+		lookup->mutable->port_config.daddr == lookup->daddr &&
+		lookup->mutable->port_config.in_key == lookup->key &&
+		lookup->mutable->port_config.saddr == lookup->saddr);
 }
 
-static u32 port_hash(struct port_lookup_key *lookup)
+static u32 port_hash(struct port_lookup_key *k)
 {
-	return jhash2(lookup->vals, ARRAY_SIZE(lookup->vals), 0);
+	return jhash_3words(k->key, k->saddr, k->daddr, k->tunnel_type);
 }
 
 static u32 mutable_hash(const struct tnl_mutable_config *mutable)
 {
 	struct port_lookup_key lookup;
 
-	lookup.vals[LOOKUP_SADDR] = mutable->port_config.saddr;
-	lookup.vals[LOOKUP_DADDR] = mutable->port_config.daddr;
-	lookup.vals[LOOKUP_KEY] = mutable->port_config.in_key;
-	lookup.vals[LOOKUP_TUNNEL_TYPE] = mutable->tunnel_type;
+	lookup.saddr = mutable->port_config.saddr;
+	lookup.daddr = mutable->port_config.daddr;
+	lookup.key = mutable->port_config.in_key;
+	lookup.tunnel_type = mutable->tunnel_type;
 
 	return port_hash(&lookup);
 }
@@ -316,12 +313,12 @@ struct vport *tnl_find_port(__be32 saddr, __be32 daddr, __be32 key,
 	if (unlikely(!table))
 		return NULL;
 
-	lookup.vals[LOOKUP_SADDR] = saddr;
-	lookup.vals[LOOKUP_DADDR] = daddr;
+	lookup.saddr = saddr;
+	lookup.daddr = daddr;
 
 	if (tunnel_type & TNL_T_KEY_EXACT) {
-		lookup.vals[LOOKUP_KEY] = key;
-		lookup.vals[LOOKUP_TUNNEL_TYPE] = tunnel_type & ~TNL_T_KEY_MATCH;
+		lookup.key = key;
+		lookup.tunnel_type = tunnel_type & ~TNL_T_KEY_MATCH;
 
 		if (key_local_remote_ports) {
 			tbl_node = tbl_lookup(table, &lookup, port_hash(&lookup), port_cmp);
@@ -330,19 +327,19 @@ struct vport *tnl_find_port(__be32 saddr, __be32 daddr, __be32 key,
 		}
 
 		if (key_remote_ports) {
-			lookup.vals[LOOKUP_SADDR] = 0;
+			lookup.saddr = 0;
 
 			tbl_node = tbl_lookup(table, &lookup, port_hash(&lookup), port_cmp);
 			if (tbl_node)
 				goto found;
 
-			lookup.vals[LOOKUP_SADDR] = saddr;
+			lookup.saddr = saddr;
 		}
 	}
 
 	if (tunnel_type & TNL_T_KEY_MATCH) {
-		lookup.vals[LOOKUP_KEY] = 0;
-		lookup.vals[LOOKUP_TUNNEL_TYPE] = tunnel_type & ~TNL_T_KEY_EXACT;
+		lookup.key = 0;
+		lookup.tunnel_type = tunnel_type & ~TNL_T_KEY_EXACT;
 
 		if (local_remote_ports) {
 			tbl_node = tbl_lookup(table, &lookup, port_hash(&lookup), port_cmp);
@@ -351,7 +348,7 @@ struct vport *tnl_find_port(__be32 saddr, __be32 daddr, __be32 key,
 		}
 
 		if (remote_ports) {
-			lookup.vals[LOOKUP_SADDR] = 0;
+			lookup.saddr = 0;
 
 			tbl_node = tbl_lookup(table, &lookup, port_hash(&lookup), port_cmp);
 			if (tbl_node)
@@ -887,22 +884,17 @@ static struct tnl_cache *build_cache(struct vport *vport,
 #endif
 
 	if (is_internal_dev(rt_dst(rt).dev)) {
-		int err;
+		struct odp_flow_key flow_key;
+		struct tbl_node *flow_node;
 		struct vport *vport;
-		struct dp_port *dp_port;
 		struct sk_buff *skb;
 		bool is_frag;
-		struct odp_flow_key flow_key;
-		struct tbl_node *flow_node;
+		int err;
 
 		vport = internal_dev_get_vport(rt_dst(rt).dev);
 		if (!vport)
 			goto done;
 
-		dp_port = vport_get_dp_port(vport);
-		if (!dp_port)
-			goto done;
-
 		skb = alloc_skb(cache->len, GFP_ATOMIC);
 		if (!skb)
 			goto done;
@@ -910,13 +902,13 @@ static struct tnl_cache *build_cache(struct vport *vport,
 		__skb_put(skb, cache->len);
 		memcpy(skb->data, get_cached_header(cache), cache->len);
 
-		err = flow_extract(skb, dp_port->port_no, &flow_key, &is_frag);
+		err = flow_extract(skb, vport->port_no, &flow_key, &is_frag);
 
 		kfree_skb(skb);
 		if (err || is_frag)
 			goto done;
 
-		flow_node = tbl_lookup(rcu_dereference(dp_port->dp->table),
+		flow_node = tbl_lookup(rcu_dereference(vport->dp->table),
 				       &flow_key, flow_hash(&flow_key),
 				       flow_cmp);
 		if (flow_node) {
@@ -1099,6 +1091,7 @@ static int send_frags(struct sk_buff *skb,
 		int frag_len = skb->len - mutable->tunnel_hlen;
 
 		skb->next = NULL;
+		memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
 
 		err = ip_local_out(skb);
 		if (likely(net_xmit_eval(err) == 0))
@@ -1247,10 +1240,6 @@ int tnl_send(struct vport *vport, struct sk_buff *skb)
 				skb_dst_set(skb, unattached_dst);
 				unattached_dst = NULL;
 			}
-
-
-			memset(&IPCB(skb)->opt, 0, sizeof(IPCB(skb)->opt));
-			IPCB(skb)->flags = 0;
 		}
 		skb_set_transport_header(skb, skb_network_offset(skb) + sizeof(struct iphdr));
 
@@ -1269,11 +1258,10 @@ int tnl_send(struct vport *vport, struct sk_buff *skb)
 			struct vport *cache_vport = internal_dev_get_vport(rt_dst(rt).dev);
 
 			skb->protocol = htons(ETH_P_IP);
-
 			iph->tot_len = htons(skb->len - skb_network_offset(skb));
 			ip_send_check(iph);
 
-			if (likely(cache_vport)) {
+			if (cache_vport) {
 				OVS_CB(skb)->flow = cache->flow;
 				compute_ip_summed(skb, true);
 				vport_receive(cache_vport, skb);
@@ -1308,15 +1296,14 @@ out:
 	return sent_len;
 }
 
-static int set_config(const void __user *uconfig, const struct tnl_ops *tnl_ops,
+static int set_config(const void *config, const struct tnl_ops *tnl_ops,
 		      const struct vport *cur_vport,
 		      struct tnl_mutable_config *mutable)
 {
 	const struct vport *old_vport;
 	const struct tnl_mutable_config *old_mutable;
 
-	if (copy_from_user(&mutable->port_config, uconfig, sizeof(struct tnl_port_config)))
-		return -EFAULT;
+	mutable->port_config = *(struct tnl_port_config *)config;
 
 	if (mutable->port_config.daddr == 0)
 		return -EINVAL;
@@ -1352,7 +1339,7 @@ static int set_config(const void __user *uconfig, const struct tnl_ops *tnl_ops,
 	return 0;
 }
 
-struct vport *tnl_create(const char *name, const void __user *config,
+struct vport *tnl_create(const struct vport_parms *parms,
 			 const struct vport_ops *vport_ops,
 			 const struct tnl_ops *tnl_ops)
 {
@@ -1361,7 +1348,7 @@ struct vport *tnl_create(const char *name, const void __user *config,
 	int initial_frag_id;
 	int err;
 
-	vport = vport_alloc(sizeof(struct tnl_vport), vport_ops);
+	vport = vport_alloc(sizeof(struct tnl_vport), vport_ops, parms);
 	if (IS_ERR(vport)) {
 		err = PTR_ERR(vport);
 		goto error;
@@ -1369,7 +1356,7 @@ struct vport *tnl_create(const char *name, const void __user *config,
 
 	tnl_vport = tnl_vport_priv(vport);
 
-	strcpy(tnl_vport->name, name);
+	strcpy(tnl_vport->name, parms->name);
 	tnl_vport->tnl_ops = tnl_ops;
 
 	tnl_vport->mutable = kzalloc(sizeof(struct tnl_mutable_config), GFP_KERNEL);
@@ -1384,7 +1371,7 @@ struct vport *tnl_create(const char *name, const void __user *config,
 	get_random_bytes(&initial_frag_id, sizeof(int));
 	atomic_set(&tnl_vport->frag_id, initial_frag_id);
 
-	err = set_config(config, tnl_ops, NULL, tnl_vport->mutable);
+	err = set_config(parms->config, tnl_ops, NULL, tnl_vport->mutable);
 	if (err)
 		goto error_free_mutable;
 
@@ -1409,7 +1396,7 @@ error:
 	return ERR_PTR(err);
 }
 
-int tnl_modify(struct vport *vport, const void __user *config)
+int tnl_modify(struct vport *vport, struct odp_port *port)
 {
 	struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
 	struct tnl_mutable_config *mutable;
@@ -1421,7 +1408,7 @@ int tnl_modify(struct vport *vport, const void __user *config)
 		goto error;
 	}
 
-	err = set_config(config, tnl_vport->tnl_ops, vport, mutable);
+	err = set_config(port->config, tnl_vport->tnl_ops, vport, mutable);
 	if (err)
 		goto error_free;