X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Ftunnel.c;h=38004e9e50d717fad18207c77f4345548bfd4d0f;hb=a5d6fc245ed1e3e0796a82e947f5ce638becd4ef;hp=d8bcb0ff3bfc9579c2af11c648e46d4b996ae477;hpb=6569d3f419c96b18ea81a41ed13f2306119bcc00;p=openvswitch

diff --git a/datapath/tunnel.c b/datapath/tunnel.c
index d8bcb0ff..38004e9e 100644
--- a/datapath/tunnel.c
+++ b/datapath/tunnel.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Nicira Networks.
+ * Copyright (c) 2010, 2011 Nicira Networks.
  * Distributed under the terms of the GNU GPL version 2.
  *
  * Significant portions of this file may be copied from parts of the Linux
@@ -13,9 +13,11 @@
 #include <linux/in.h>
 #include <linux/in_route.h>
 #include <linux/jhash.h>
+#include <linux/list.h>
 #include <linux/kernel.h>
 #include <linux/version.h>
 #include <linux/workqueue.h>
+#include <linux/rculist.h>
 
 #include <net/dsfield.h>
 #include <net/dst.h>
@@ -31,8 +33,8 @@
 #include "actions.h"
 #include "checksum.h"
 #include "datapath.h"
-#include "table.h"
 #include "tunnel.h"
+#include "vlan.h"
 #include "vport.h"
 #include "vport-generic.h"
 #include "vport-internal_dev.h"
@@ -67,12 +69,13 @@
 #define CACHE_CLEANER_INTERVAL (5 * HZ)
 
 #define CACHE_DATA_ALIGN 16
+#define PORT_TABLE_SIZE  1024
 
-/* Protected by RCU. */
-static struct tbl *port_table __read_mostly;
+static struct hlist_head *port_table __read_mostly;
+static int port_table_count;
 
 static void cache_cleaner(struct work_struct *work);
-DECLARE_DELAYED_WORK(cache_cleaner_wq, cache_cleaner);
+static DECLARE_DELAYED_WORK(cache_cleaner_wq, cache_cleaner);
 
 /*
  * These are just used as an optimization: they don't require any kind of
@@ -95,9 +98,13 @@ static inline struct vport *tnl_vport_to_vport(const struct tnl_vport *tnl_vport
 	return vport_from_priv(tnl_vport);
 }
 
-static inline struct tnl_vport *tnl_vport_table_cast(const struct tbl_node *node)
+/* This is analogous to rtnl_dereference for the tunnel cache.  It checks that
+ * cache_lock is held, so it is only for update side code.
+ */
+static inline struct tnl_cache *cache_dereference(struct tnl_vport *tnl_vport)
 {
-	return container_of(node, struct tnl_vport, tbl_node);
+	return rcu_dereference_protected(tnl_vport->cache,
+					 lockdep_is_held(&tnl_vport->cache_lock));
 }
 
 static inline void schedule_cache_cleaner(void)
@@ -133,7 +140,7 @@ static void assign_config_rcu(struct vport *vport,
 	struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
 	struct tnl_mutable_config *old_config;
 
-	old_config = tnl_vport->mutable;
+	old_config = rtnl_dereference(tnl_vport->mutable);
 	rcu_assign_pointer(tnl_vport->mutable, new_config);
 	call_rcu(&old_config->rcu, free_config_rcu);
 }
@@ -143,7 +150,7 @@ static void assign_cache_rcu(struct vport *vport, struct tnl_cache *new_cache)
 	struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
 	struct tnl_cache *old_cache;
 
-	old_cache = tnl_vport->cache;
+	old_cache = cache_dereference(tnl_vport);
 	rcu_assign_pointer(tnl_vport->cache, new_cache);
 
 	if (old_cache)
@@ -152,232 +159,150 @@ static void assign_cache_rcu(struct vport *vport, struct tnl_cache *new_cache)
 
 static unsigned int *find_port_pool(const struct tnl_mutable_config *mutable)
 {
-	if (mutable->port_config.flags & TNL_F_IN_KEY_MATCH) {
-		if (mutable->port_config.saddr)
+	if (mutable->flags & TNL_F_IN_KEY_MATCH) {
+		if (mutable->key.saddr)
 			return &local_remote_ports;
 		else
 			return &remote_ports;
 	} else {
-		if (mutable->port_config.saddr)
+		if (mutable->key.saddr)
 			return &key_local_remote_ports;
 		else
 			return &key_remote_ports;
 	}
 }
 
-struct port_lookup_key {
-	u32 tunnel_type;
-	__be32 saddr;
-	__be32 daddr;
-	__be32 key;
-	const struct tnl_mutable_config *mutable;
-};
-
-/*
- * Modifies 'target' to store the rcu_dereferenced pointer that was used to do
- * the comparision.
- */
-static int port_cmp(const struct tbl_node *node, void *target)
+static u32 port_hash(const struct port_lookup_key *key)
 {
-	const struct tnl_vport *tnl_vport = tnl_vport_table_cast(node);
-	struct port_lookup_key *lookup = target;
-
-	lookup->mutable = rcu_dereference(tnl_vport->mutable);
-
-	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);
+	return jhash2((u32*)key, (PORT_KEY_LEN / sizeof(u32)), 0);
 }
 
-static u32 port_hash(struct port_lookup_key *k)
+static inline struct hlist_head *find_bucket(u32 hash)
 {
-	return jhash_3words(k->key, k->saddr, k->daddr, k->tunnel_type);
+	return &port_table[(hash & (PORT_TABLE_SIZE - 1))];
 }
 
-static u32 mutable_hash(const struct tnl_mutable_config *mutable)
+static void port_table_add_port(struct vport *vport)
 {
-	struct port_lookup_key lookup;
+	struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
+	const struct tnl_mutable_config *mutable;
+	u32 hash;
 
-	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;
+	if (port_table_count == 0)
+		schedule_cache_cleaner();
 
-	return port_hash(&lookup);
-}
+	mutable = rtnl_dereference(tnl_vport->mutable);
+	hash = port_hash(&mutable->key);
+	hlist_add_head_rcu(&tnl_vport->hash_node, find_bucket(hash));
+	port_table_count++;
 
-static void check_table_empty(void)
-{
-	if (tbl_count(port_table) == 0) {
-		struct tbl *old_table = port_table;
-
-		cancel_delayed_work_sync(&cache_cleaner_wq);
-		rcu_assign_pointer(port_table, NULL);
-		tbl_deferred_destroy(old_table, NULL);
-	}
+	(*find_port_pool(rtnl_dereference(tnl_vport->mutable)))++;
 }
 
-static int add_port(struct vport *vport)
+static void port_table_move_port(struct vport *vport,
+		      struct tnl_mutable_config *new_mutable)
 {
 	struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
-	int err;
-
-	if (!port_table) {
-		struct tbl *new_table;
-
-		new_table = tbl_create(0);
-		if (!new_table)
-			return -ENOMEM;
-
-		rcu_assign_pointer(port_table, new_table);
-		schedule_cache_cleaner();
-
-	} else if (tbl_count(port_table) > tbl_n_buckets(port_table)) {
-		struct tbl *old_table = port_table;
-		struct tbl *new_table;
-
-		new_table = tbl_expand(old_table);
-		if (IS_ERR(new_table))
-			return PTR_ERR(new_table);
-
-		rcu_assign_pointer(port_table, new_table);
-		tbl_deferred_destroy(old_table, NULL);
-	}
-
-	err = tbl_insert(port_table, &tnl_vport->tbl_node, mutable_hash(tnl_vport->mutable));
-	if (err) {
-		(*find_port_pool(tnl_vport->mutable))--;
-		check_table_empty();
-		return err;
-	}
+	u32 hash;
 
-	(*find_port_pool(tnl_vport->mutable))++;
+	hash = port_hash(&new_mutable->key);
+	hlist_del_init_rcu(&tnl_vport->hash_node);
+	hlist_add_head_rcu(&tnl_vport->hash_node, find_bucket(hash));
 
-	return 0;
+	(*find_port_pool(rtnl_dereference(tnl_vport->mutable)))--;
+	assign_config_rcu(vport, new_mutable);
+	(*find_port_pool(rtnl_dereference(tnl_vport->mutable)))++;
 }
 
-static int move_port(struct vport *vport, struct tnl_mutable_config *new_mutable)
+static void port_table_remove_port(struct vport *vport)
 {
-	int err;
 	struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
-	u32 hash;
 
-	hash = mutable_hash(new_mutable);
-	if (hash == tnl_vport->tbl_node.hash)
-		goto table_updated;
+	hlist_del_init_rcu(&tnl_vport->hash_node);
 
-	/*
-	 * Ideally we should make this move atomic to avoid having gaps in
-	 * finding tunnels or the possibility of failure.  However, if we do
-	 * find a tunnel it will always be consistent.
-	 */
-	err = tbl_remove(port_table, &tnl_vport->tbl_node);
-	if (err)
-		return err;
-
-	err = tbl_insert(port_table, &tnl_vport->tbl_node, hash);
-	if (err) {
-		check_table_empty();
-		return err;
-	}
-
-table_updated:
-	(*find_port_pool(tnl_vport->mutable))--;
-	assign_config_rcu(vport, new_mutable);
-	(*find_port_pool(tnl_vport->mutable))++;
+	port_table_count--;
+	if (port_table_count == 0)
+		cancel_delayed_work_sync(&cache_cleaner_wq);
 
-	return 0;
+	(*find_port_pool(rtnl_dereference(tnl_vport->mutable)))--;
 }
 
-static int del_port(struct vport *vport)
+static struct vport *port_table_lookup(struct port_lookup_key *key,
+				       const struct tnl_mutable_config **pmutable)
 {
-	struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
-	int err;
+	struct hlist_node *n;
+	struct hlist_head *bucket;
+	u32 hash = port_hash(key);
+	struct tnl_vport * tnl_vport;
 
-	err = tbl_remove(port_table, &tnl_vport->tbl_node);
-	if (err)
-		return err;
+	bucket = find_bucket(hash);
 
-	check_table_empty();
-	(*find_port_pool(tnl_vport->mutable))--;
+	hlist_for_each_entry_rcu(tnl_vport, n, bucket, hash_node) {
+		struct tnl_mutable_config *mutable;
 
-	return 0;
+		mutable = rcu_dereference_rtnl(tnl_vport->mutable);
+		if (!memcmp(&mutable->key, key, PORT_KEY_LEN)) {
+			*pmutable = mutable;
+			return tnl_vport_to_vport(tnl_vport);
+		}
+	}
+
+	return NULL;
 }
 
-struct vport *tnl_find_port(__be32 saddr, __be32 daddr, __be32 key,
+struct vport *tnl_find_port(__be32 saddr, __be32 daddr, __be64 key,
 			    int tunnel_type,
 			    const struct tnl_mutable_config **mutable)
 {
 	struct port_lookup_key lookup;
-	struct tbl *table = rcu_dereference(port_table);
-	struct tbl_node *tbl_node;
-
-	if (unlikely(!table))
-		return NULL;
+	struct vport *vport;
 
 	lookup.saddr = saddr;
 	lookup.daddr = daddr;
 
-	if (tunnel_type & TNL_T_KEY_EXACT) {
-		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);
-			if (tbl_node)
-				goto found;
-		}
-
-		if (key_remote_ports) {
-			lookup.saddr = 0;
-
-			tbl_node = tbl_lookup(table, &lookup, port_hash(&lookup), port_cmp);
-			if (tbl_node)
-				goto found;
-
-			lookup.saddr = saddr;
-		}
+	/* First try for exact match on in_key. */
+	lookup.in_key = key;
+	lookup.tunnel_type = tunnel_type | TNL_T_KEY_EXACT;
+	if (key_local_remote_ports) {
+		vport = port_table_lookup(&lookup, mutable);
+		if (vport)
+			return vport;
 	}
+	if (key_remote_ports) {
+		lookup.saddr = 0;
+		vport = port_table_lookup(&lookup, mutable);
+		if (vport)
+			return vport;
 
-	if (tunnel_type & TNL_T_KEY_MATCH) {
-		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);
-			if (tbl_node)
-				goto found;
-		}
-
-		if (remote_ports) {
-			lookup.saddr = 0;
+		lookup.saddr = saddr;
+	}
 
-			tbl_node = tbl_lookup(table, &lookup, port_hash(&lookup), port_cmp);
-			if (tbl_node)
-				goto found;
-		}
+	/* Then try matches that wildcard in_key. */
+	lookup.in_key = 0;
+	lookup.tunnel_type = tunnel_type | TNL_T_KEY_MATCH;
+	if (local_remote_ports) {
+		vport = port_table_lookup(&lookup, mutable);
+		if (vport)
+			return vport;
+	}
+	if (remote_ports) {
+		lookup.saddr = 0;
+		vport = port_table_lookup(&lookup, mutable);
+		if (vport)
+			return vport;
 	}
 
 	return NULL;
-
-found:
-	*mutable = lookup.mutable;
-	return tnl_vport_to_vport(tnl_vport_table_cast(tbl_node));
 }
 
-static inline void ecn_decapsulate(struct sk_buff *skb)
+static void ecn_decapsulate(struct sk_buff *skb, u8 tos)
 {
-	/* This is accessing the outer IP header of the tunnel, which we've
-	 * already validated to be OK.  skb->data is currently set to the start
-	 * of the inner Ethernet header, and we've validated ETH_HLEN.
-	 */
-	if (unlikely(INET_ECN_is_ce(ip_hdr(skb)->tos))) {
+	if (unlikely(INET_ECN_is_ce(tos))) {
 		__be16 protocol = skb->protocol;
 
 		skb_set_network_header(skb, ETH_HLEN);
 
-		if (skb->protocol == htons(ETH_P_8021Q)) {
+		if (protocol == htons(ETH_P_8021Q)) {
 			if (unlikely(!pskb_may_pull(skb, VLAN_ETH_HLEN)))
 				return;
 
@@ -404,17 +329,27 @@ static inline void ecn_decapsulate(struct sk_buff *skb)
 	}
 }
 
-/* Called with rcu_read_lock. */
-void tnl_rcv(struct vport *vport, struct sk_buff *skb)
+/**
+ *	tnl_rcv - ingress point for generic tunnel code
+ *
+ * @vport: port this packet was received on
+ * @skb: received packet
+ * @tos: ToS from encapsulating IP packet, used to copy ECN bits
+ *
+ * Must be called with rcu_read_lock.
+ *
+ * Packets received by this function are in the following state:
+ * - skb->data points to the inner Ethernet header.
+ * - The inner Ethernet header is in the linear data area.
+ * - skb->csum does not include the inner Ethernet header.
+ * - The layer pointers are undefined.
+ */
+void tnl_rcv(struct vport *vport, struct sk_buff *skb, u8 tos)
 {
-	/* Packets received by this function are in the following state:
-	 * - skb->data points to the inner Ethernet header.
-	 * - The inner Ethernet header is in the linear data area.
-	 * - skb->csum does not include the inner Ethernet header.
-	 * - The layer pointers point at the outer headers.
-	 */
+	struct ethhdr *eh;
 
-	struct ethhdr *eh = (struct ethhdr *)skb->data;
+	skb_reset_mac_header(skb);
+	eh = eth_hdr(skb);
 
 	if (likely(ntohs(eh->h_proto) >= 1536))
 		skb->protocol = eh->h_proto;
@@ -423,10 +358,16 @@ void tnl_rcv(struct vport *vport, struct sk_buff *skb)
 
 	skb_dst_drop(skb);
 	nf_reset(skb);
+	skb_clear_rxhash(skb);
 	secpath_reset(skb);
 
-	ecn_decapsulate(skb);
-	compute_ip_summed(skb, false);
+	ecn_decapsulate(skb, tos);
+	vlan_set_tci(skb, 0);
+
+	if (unlikely(compute_ip_summed(skb, false))) {
+		kfree_skb(skb);
+		return;
+	}
 
 	vport_receive(vport, skb);
 }
@@ -598,7 +539,7 @@ static void ipv6_build_icmp(struct sk_buff *skb, struct sk_buff *nskb,
 #endif /* IPv6 */
 
 bool tnl_frag_needed(struct vport *vport, const struct tnl_mutable_config *mutable,
-		     struct sk_buff *skb, unsigned int mtu, __be32 flow_key)
+		     struct sk_buff *skb, unsigned int mtu, __be64 flow_key)
 {
 	unsigned int eth_hdr_len = ETH_HLEN;
 	unsigned int total_length = 0, header_length = 0, payload_length;
@@ -651,7 +592,6 @@ bool tnl_frag_needed(struct vport *vport, const struct tnl_mutable_config *mutab
 	}
 #endif
 
-	total_length = min(total_length, mutable->mtu);
 	payload_length = total_length - header_length;
 
 	nskb = dev_alloc_skb(NET_IP_ALIGN + eth_hdr_len + header_length +
@@ -671,7 +611,8 @@ bool tnl_frag_needed(struct vport *vport, const struct tnl_mutable_config *mutab
 
 		vh->h_vlan_TCI = vlan_eth_hdr(skb)->h_vlan_TCI;
 		vh->h_vlan_encapsulated_proto = skb->protocol;
-	}
+	} else
+		vlan_set_tci(nskb, vlan_get_tci(skb));
 	skb_reset_mac_header(nskb);
 
 	/* Protocol */
@@ -689,11 +630,15 @@ bool tnl_frag_needed(struct vport *vport, const struct tnl_mutable_config *mutab
 	 * not symmetric then PMTUD needs to be disabled since we won't have
 	 * any way of synthesizing packets.
 	 */
-	if ((mutable->port_config.flags & (TNL_F_IN_KEY_MATCH | TNL_F_OUT_KEY_ACTION)) ==
+	if ((mutable->flags & (TNL_F_IN_KEY_MATCH | TNL_F_OUT_KEY_ACTION)) ==
 	    (TNL_F_IN_KEY_MATCH | TNL_F_OUT_KEY_ACTION))
 		OVS_CB(nskb)->tun_id = flow_key;
 
-	compute_ip_summed(nskb, false);
+	if (unlikely(compute_ip_summed(nskb, false))) {
+		kfree_skb(nskb);
+		return false;
+	}
+
 	vport_receive(vport, nskb);
 
 	return true;
@@ -704,54 +649,69 @@ static bool check_mtu(struct sk_buff *skb,
 		      const struct tnl_mutable_config *mutable,
 		      const struct rtable *rt, __be16 *frag_offp)
 {
-	int mtu;
-	__be16 frag_off;
+	bool df_inherit = mutable->flags & TNL_F_DF_INHERIT;
+	bool pmtud = mutable->flags & TNL_F_PMTUD;
+	__be16 frag_off = mutable->flags & TNL_F_DF_DEFAULT ? htons(IP_DF) : 0;
+	int mtu = 0;
+	unsigned int packet_length = skb->len - ETH_HLEN;
+
+	/* Allow for one level of tagging in the packet length. */
+	if (!vlan_tx_tag_present(skb) &&
+	    eth_hdr(skb)->h_proto == htons(ETH_P_8021Q))
+		packet_length -= VLAN_HLEN;
+
+	if (pmtud) {
+		int vlan_header = 0;
+
+		/* The tag needs to go in packet regardless of where it
+		 * currently is, so subtract it from the MTU.
+		 */
+		if (vlan_tx_tag_present(skb) ||
+		    eth_hdr(skb)->h_proto == htons(ETH_P_8021Q))
+			vlan_header = VLAN_HLEN;
 
-	frag_off = (mutable->port_config.flags & TNL_F_PMTUD) ? htons(IP_DF) : 0;
-	if (frag_off)
 		mtu = dst_mtu(&rt_dst(rt))
 			- ETH_HLEN
 			- mutable->tunnel_hlen
-			- (eth_hdr(skb)->h_proto == htons(ETH_P_8021Q) ? VLAN_HLEN : 0);
-	else
-		mtu = mutable->mtu;
+			- vlan_header;
+	}
 
 	if (skb->protocol == htons(ETH_P_IP)) {
-		struct iphdr *old_iph = ip_hdr(skb);
+		struct iphdr *iph = ip_hdr(skb);
 
-		frag_off |= old_iph->frag_off & htons(IP_DF);
-		mtu = max(mtu, IP_MIN_MTU);
+		if (df_inherit)
+			frag_off = iph->frag_off & htons(IP_DF);
 
-		if ((old_iph->frag_off & htons(IP_DF)) &&
-		    mtu < ntohs(old_iph->tot_len)) {
-			if (tnl_frag_needed(vport, mutable, skb, mtu, OVS_CB(skb)->tun_id))
-				goto drop;
+		if (pmtud && iph->frag_off & htons(IP_DF)) {
+			mtu = max(mtu, IP_MIN_MTU);
+
+			if (packet_length > mtu &&
+			    tnl_frag_needed(vport, mutable, skb, mtu,
+					    OVS_CB(skb)->tun_id))
+				return false;
 		}
 	}
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 	else if (skb->protocol == htons(ETH_P_IPV6)) {
-		unsigned int packet_length = skb->len - ETH_HLEN
-			- (eth_hdr(skb)->h_proto == htons(ETH_P_8021Q) ? VLAN_HLEN : 0);
-
-		mtu = max(mtu, IPV6_MIN_MTU);
-
-		/* IPv6 requires PMTUD if the packet is above the minimum MTU. */
-		if (packet_length > IPV6_MIN_MTU)
+		/* IPv6 requires end hosts to do fragmentation
+		 * if the packet is above the minimum MTU.
+		 */
+		if (df_inherit && packet_length > IPV6_MIN_MTU)
 			frag_off = htons(IP_DF);
 
-		if (mtu < packet_length) {
-			if (tnl_frag_needed(vport, mutable, skb, mtu, OVS_CB(skb)->tun_id))
-				goto drop;
+		if (pmtud) {
+			mtu = max(mtu, IPV6_MIN_MTU);
+
+			if (packet_length > mtu &&
+			    tnl_frag_needed(vport, mutable, skb, mtu,
+					    OVS_CB(skb)->tun_id))
+				return false;
 		}
 	}
 #endif
 
 	*frag_offp = frag_off;
 	return true;
-
-drop:
-	*frag_offp = 0;
-	return false;
 }
 
 static void create_tunnel_header(const struct vport *vport,
@@ -765,12 +725,12 @@ static void create_tunnel_header(const struct vport *vport,
 	iph->ihl	= sizeof(struct iphdr) >> 2;
 	iph->frag_off	= htons(IP_DF);
 	iph->protocol	= tnl_vport->tnl_ops->ipproto;
-	iph->tos	= mutable->port_config.tos;
+	iph->tos	= mutable->tos;
 	iph->daddr	= rt->rt_dst;
 	iph->saddr	= rt->rt_src;
-	iph->ttl	= mutable->port_config.ttl;
+	iph->ttl	= mutable->ttl;
 	if (!iph->ttl)
-		iph->ttl = dst_metric(&rt_dst(rt), RTAX_HOPLIMIT);
+		iph->ttl = ip4_dst_hoplimit(&rt_dst(rt));
 
 	tnl_vport->tnl_ops->build_header(vport, mutable, iph + 1);
 }
@@ -798,10 +758,10 @@ static inline bool check_cache_valid(const struct tnl_cache *cache,
 		(cache->flow && !cache->flow->dead));
 }
 
-static int cache_cleaner_cb(struct tbl_node *tbl_node, void *aux)
+static void __cache_cleaner(struct tnl_vport *tnl_vport)
 {
-	struct tnl_vport *tnl_vport = tnl_vport_table_cast(tbl_node);
-	const struct tnl_mutable_config *mutable = rcu_dereference(tnl_vport->mutable);
+	const struct tnl_mutable_config *mutable =
+			rcu_dereference(tnl_vport->mutable);
 	const struct tnl_cache *cache = rcu_dereference(tnl_vport->cache);
 
 	if (cache && !check_cache_valid(cache, mutable) &&
@@ -809,16 +769,24 @@ static int cache_cleaner_cb(struct tbl_node *tbl_node, void *aux)
 		assign_cache_rcu(tnl_vport_to_vport(tnl_vport), NULL);
 		spin_unlock_bh(&tnl_vport->cache_lock);
 	}
-
-	return 0;
 }
 
 static void cache_cleaner(struct work_struct *work)
 {
+	int i;
+
 	schedule_cache_cleaner();
 
 	rcu_read_lock();
-	tbl_foreach(port_table, cache_cleaner_cb, NULL);
+	for (i = 0; i < PORT_TABLE_SIZE; i++) {
+		struct hlist_node *n;
+		struct hlist_head *bucket;
+		struct tnl_vport  *tnl_vport;
+
+		bucket = &port_table[i];
+		hlist_for_each_entry_rcu(tnl_vport, n, bucket, hash_node)
+			__cache_cleaner(tnl_vport);
+	}
 	rcu_read_unlock();
 }
 
@@ -839,9 +807,9 @@ static inline void create_eth_hdr(struct tnl_cache *cache,
 
 	cache->hh_seq = hh_seq;
 #else
-	read_lock_bh(&rt_dst(rt).hh->hh_lock);
+	read_lock(&rt_dst(rt).hh->hh_lock);
 	memcpy(cache_data, (void *)rt_dst(rt).hh->hh_data + hh_off, hh_len);
-	read_unlock_bh(&rt_dst(rt).hh->hh_lock);
+	read_unlock(&rt_dst(rt).hh->hh_lock);
 #endif
 }
 
@@ -854,7 +822,7 @@ static struct tnl_cache *build_cache(struct vport *vport,
 	void *cache_data;
 	int cache_len;
 
-	if (!(mutable->port_config.flags & TNL_F_HDR_CACHE))
+	if (!(mutable->flags & TNL_F_HDR_CACHE))
 		return NULL;
 
 	/*
@@ -868,10 +836,10 @@ static struct tnl_cache *build_cache(struct vport *vport,
 	 * If lock is contended fall back to directly building the header.
 	 * We're not going to help performance by sitting here spinning.
 	 */
-	if (!spin_trylock_bh(&tnl_vport->cache_lock))
+	if (!spin_trylock(&tnl_vport->cache_lock))
 		return NULL;
 
-	cache = tnl_vport->cache;
+	cache = cache_dereference(tnl_vport);
 	if (check_cache_valid(cache, mutable))
 		goto unlock;
 	else
@@ -898,15 +866,16 @@ static struct tnl_cache *build_cache(struct vport *vport,
 #endif
 
 	if (is_internal_dev(rt_dst(rt).dev)) {
-		struct odp_flow_key flow_key;
-		struct tbl_node *flow_node;
-		struct vport *vport;
+		struct sw_flow_key flow_key;
+		struct vport *dst_vport;
 		struct sk_buff *skb;
 		bool is_frag;
 		int err;
+		int flow_key_len;
+		struct sw_flow *flow;
 
-		vport = internal_dev_get_vport(rt_dst(rt).dev);
-		if (!vport)
+		dst_vport = internal_dev_get_vport(rt_dst(rt).dev);
+		if (!dst_vport)
 			goto done;
 
 		skb = alloc_skb(cache->len, GFP_ATOMIC);
@@ -916,18 +885,16 @@ 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, vport->port_no, &flow_key, &is_frag);
+		err = flow_extract(skb, dst_vport->port_no, &flow_key,
+				   &flow_key_len, &is_frag);
 
-		kfree_skb(skb);
+		consume_skb(skb);
 		if (err || is_frag)
 			goto done;
 
-		flow_node = tbl_lookup(rcu_dereference(vport->dp->table),
-				       &flow_key, flow_hash(&flow_key),
-				       flow_cmp);
-		if (flow_node) {
-			struct sw_flow *flow = flow_cast(flow_node);
-
+		flow = flow_tbl_lookup(rcu_dereference(dst_vport->dp->table),
+					 &flow_key, flow_key_len);
+		if (flow) {
 			cache->flow = flow;
 			flow_hold(flow);
 		}
@@ -937,7 +904,7 @@ done:
 	assign_cache_rcu(vport, cache);
 
 unlock:
-	spin_unlock_bh(&tnl_vport->cache_lock);
+	spin_unlock(&tnl_vport->cache_lock);
 
 	return cache;
 }
@@ -952,49 +919,38 @@ static struct rtable *find_route(struct vport *vport,
 	*cache = NULL;
 	tos = RT_TOS(tos);
 
-	if (likely(tos == mutable->port_config.tos &&
-		   check_cache_valid(cur_cache, mutable))) {
+	if (likely(tos == mutable->tos && check_cache_valid(cur_cache, mutable))) {
 		*cache = cur_cache;
 		return cur_cache->rt;
 	} else {
 		struct rtable *rt;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
 		struct flowi fl = { .nl_u = { .ip4_u =
-					      { .daddr = mutable->port_config.daddr,
-						.saddr = mutable->port_config.saddr,
+					      { .daddr = mutable->key.daddr,
+						.saddr = mutable->key.saddr,
 						.tos = tos } },
 				    .proto = tnl_vport->tnl_ops->ipproto };
 
 		if (unlikely(ip_route_output_key(&init_net, &rt, &fl)))
 			return NULL;
+#else
+		struct flowi4 fl = { .daddr = mutable->key.daddr,
+				     .saddr = mutable->key.saddr,
+				     .flowi4_tos = tos,
+				     .flowi4_proto = tnl_vport->tnl_ops->ipproto };
 
-		if (likely(tos == mutable->port_config.tos))
+		rt = ip_route_output_key(&init_net, &fl);
+		if (IS_ERR(rt))
+			return NULL;
+#endif
+
+		if (likely(tos == mutable->tos))
 			*cache = build_cache(vport, mutable, rt);
 
 		return rt;
 	}
 }
 
-static struct sk_buff *check_headroom(struct sk_buff *skb, int headroom)
-{
-	if (skb_headroom(skb) < headroom || skb_header_cloned(skb)) {
-		struct sk_buff *nskb = skb_realloc_headroom(skb, headroom + 16);
-		if (unlikely(!nskb)) {
-			kfree_skb(skb);
-			return ERR_PTR(-ENOMEM);
-		}
-
-		set_skb_csum_bits(skb, nskb);
-
-		if (skb->sk)
-			skb_set_owner_w(nskb, skb->sk);
-
-		kfree_skb(skb);
-		return nskb;
-	}
-
-	return skb;
-}
-
 static inline bool need_linearize(const struct sk_buff *skb)
 {
 	int i;
@@ -1008,7 +964,7 @@ static inline bool need_linearize(const struct sk_buff *skb)
 	 * change them from underneath us and we can skip the linearization.
 	 */
 	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
-		if (unlikely(page_count(skb_shinfo(skb)->frags[0].page) > 1))
+		if (unlikely(page_count(skb_shinfo(skb)->frags[i].page) > 1))
 			return true;
 
 	return false;
@@ -1021,70 +977,53 @@ static struct sk_buff *handle_offloads(struct sk_buff *skb,
 	int min_headroom;
 	int err;
 
-	forward_ip_summed(skb);
-
-	err = vswitch_skb_checksum_setup(skb);
-	if (unlikely(err))
-		goto error_free;
-
 	min_headroom = LL_RESERVED_SPACE(rt_dst(rt).dev) + rt_dst(rt).header_len
-			+ mutable->tunnel_hlen;
+			+ mutable->tunnel_hlen
+			+ (vlan_tx_tag_present(skb) ? VLAN_HLEN : 0);
+
+	if (skb_headroom(skb) < min_headroom || skb_header_cloned(skb)) {
+		int head_delta = SKB_DATA_ALIGN(min_headroom -
+						skb_headroom(skb) +
+						16);
+		err = pskb_expand_head(skb, max_t(int, head_delta, 0),
+					0, GFP_ATOMIC);
+		if (unlikely(err))
+			goto error_free;
+	}
+
+	forward_ip_summed(skb, true);
 
 	if (skb_is_gso(skb)) {
 		struct sk_buff *nskb;
 
-		/*
-		 * If we are doing GSO on a pskb it is better to make sure that
-		 * the headroom is correct now.  We will only have to copy the
-		 * portion in the linear data area and GSO will preserve
-		 * headroom when it creates the segments.  This is particularly
-		 * beneficial on Xen where we get a lot of GSO pskbs.
-		 * Conversely, we avoid copying if it is just to get our own
-		 * writable clone because GSO will do the copy for us.
-		 */
-		if (skb_headroom(skb) < min_headroom) {
-			skb = check_headroom(skb, min_headroom);
-			if (unlikely(IS_ERR(skb))) {
-				err = PTR_ERR(skb);
-				goto error;
-			}
-		}
-
 		nskb = skb_gso_segment(skb, 0);
-		kfree_skb(skb);
-		if (unlikely(IS_ERR(nskb))) {
+		if (IS_ERR(nskb)) {
+			kfree_skb(skb);
 			err = PTR_ERR(nskb);
 			goto error;
 		}
 
+		consume_skb(skb);
 		skb = nskb;
-	} else {
-		skb = check_headroom(skb, min_headroom);
-		if (unlikely(IS_ERR(skb))) {
-			err = PTR_ERR(skb);
-			goto error;
-		}
-
-		if (skb->ip_summed == CHECKSUM_PARTIAL) {
-			/*
-			 * Pages aren't locked and could change at any time.
-			 * If this happens after we compute the checksum, the
-			 * checksum will be wrong.  We linearize now to avoid
-			 * this problem.
-			 */
-			if (unlikely(need_linearize(skb))) {
-				err = __skb_linearize(skb);
-				if (unlikely(err))
-					goto error_free;
-			}
-
-			err = skb_checksum_help(skb);
+	} else if (get_ip_summed(skb) == OVS_CSUM_PARTIAL) {
+		/* Pages aren't locked and could change at any time.
+		 * If this happens after we compute the checksum, the
+		 * checksum will be wrong.  We linearize now to avoid
+		 * this problem.
+		 */
+		if (unlikely(need_linearize(skb))) {
+			err = __skb_linearize(skb);
 			if (unlikely(err))
 				goto error_free;
-		} else if (skb->ip_summed == CHECKSUM_COMPLETE)
-			skb->ip_summed = CHECKSUM_NONE;
+		}
+
+		err = skb_checksum_help(skb);
+		if (unlikely(err))
+			goto error_free;
 	}
 
+	set_ip_summed(skb, OVS_CSUM_NONE);
+
 	return skb;
 
 error_free:
@@ -1097,25 +1036,21 @@ static int send_frags(struct sk_buff *skb,
 		      const struct tnl_mutable_config *mutable)
 {
 	int sent_len;
-	int err;
 
 	sent_len = 0;
 	while (skb) {
 		struct sk_buff *next = skb->next;
 		int frag_len = skb->len - mutable->tunnel_hlen;
+		int err;
 
 		skb->next = NULL;
 		memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
 
 		err = ip_local_out(skb);
-		if (likely(net_xmit_eval(err) == 0))
-			sent_len += frag_len;
-		else {
-			skb = next;
-			goto free_frags;
-		}
-
 		skb = next;
+		if (unlikely(net_xmit_eval(err)))
+			goto free_frags;
+		sent_len += frag_len;
 	}
 
 	return sent_len;
@@ -1140,13 +1075,14 @@ int tnl_send(struct vport *vport, struct sk_buff *skb)
 	struct dst_entry *unattached_dst = NULL;
 	struct tnl_cache *cache;
 	int sent_len = 0;
-	__be16 frag_off;
+	__be16 frag_off = 0;
 	u8 ttl;
 	u8 inner_tos;
 	u8 tos;
 
 	/* Validate the protocol headers before we try to use them. */
-	if (skb->protocol == htons(ETH_P_8021Q)) {
+	if (skb->protocol == htons(ETH_P_8021Q) &&
+	    !vlan_tx_tag_present(skb)) {
 		if (unlikely(!pskb_may_pull(skb, VLAN_ETH_HLEN)))
 			goto error_free;
 
@@ -1177,10 +1113,10 @@ int tnl_send(struct vport *vport, struct sk_buff *skb)
 	else
 		inner_tos = 0;
 
-	if (mutable->port_config.flags & TNL_F_TOS_INHERIT)
+	if (mutable->flags & TNL_F_TOS_INHERIT)
 		tos = inner_tos;
 	else
-		tos = mutable->port_config.tos;
+		tos = mutable->tos;
 
 	tos = INET_ECN_encapsulate(tos, inner_tos);
 
@@ -1195,10 +1131,11 @@ int tnl_send(struct vport *vport, struct sk_buff *skb)
 	nf_reset(skb);
 	secpath_reset(skb);
 	skb_dst_drop(skb);
+	skb_clear_rxhash(skb);
 
 	/* Offloading */
 	skb = handle_offloads(skb, mutable, rt);
-	if (unlikely(IS_ERR(skb)))
+	if (IS_ERR(skb))
 		goto error;
 
 	/* MTU */
@@ -1219,11 +1156,11 @@ int tnl_send(struct vport *vport, struct sk_buff *skb)
 	}
 
 	/* TTL */
-	ttl = mutable->port_config.ttl;
+	ttl = mutable->ttl;
 	if (!ttl)
-		ttl = dst_metric(&rt_dst(rt), RTAX_HOPLIMIT);
+		ttl = ip4_dst_hoplimit(&rt_dst(rt));
 
-	if (mutable->port_config.flags & TNL_F_TTL_INHERIT) {
+	if (mutable->flags & TNL_F_TTL_INHERIT) {
 		if (skb->protocol == htons(ETH_P_IP))
 			ttl = ip_hdr(skb)->ttl;
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
@@ -1237,6 +1174,9 @@ int tnl_send(struct vport *vport, struct sk_buff *skb)
 		struct sk_buff *next_skb = skb->next;
 		skb->next = NULL;
 
+		if (unlikely(vlan_deaccel_tag(skb)))
+			goto next;
+
 		if (likely(cache)) {
 			skb_push(skb, cache->len);
 			memcpy(skb->data, get_cached_header(cache), cache->len);
@@ -1272,21 +1212,26 @@ 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 = ip_hdr(skb);
 			iph->tot_len = htons(skb->len - skb_network_offset(skb));
 			ip_send_check(iph);
 
 			if (cache_vport) {
+				if (unlikely(compute_ip_summed(skb, true))) {
+					kfree_skb(skb);
+					goto next;
+				}
+
 				OVS_CB(skb)->flow = cache->flow;
-				compute_ip_summed(skb, true);
 				vport_receive(cache_vport, skb);
 				sent_len += orig_len;
 			} else {
-				int err;
+				int xmit_err;
 
 				skb->dev = rt_dst(rt).dev;
-				err = dev_queue_xmit(skb);
+				xmit_err = dev_queue_xmit(skb);
 
-				if (likely(net_xmit_eval(err) == 0))
+				if (likely(net_xmit_eval(xmit_err) == 0))
 					sent_len += orig_len;
 			}
 		} else
@@ -1304,52 +1249,81 @@ next:
 error_free:
 	tnl_free_linked_skbs(skb);
 error:
-	dst_release(unattached_dst);
 	vport_record_error(vport, err);
 out:
+	dst_release(unattached_dst);
 	return sent_len;
 }
 
-static int set_config(const void *config, const struct tnl_ops *tnl_ops,
-		      const struct vport *cur_vport,
-		      struct tnl_mutable_config *mutable)
+static const struct nla_policy tnl_policy[OVS_TUNNEL_ATTR_MAX + 1] = {
+	[OVS_TUNNEL_ATTR_FLAGS]    = { .type = NLA_U32 },
+	[OVS_TUNNEL_ATTR_DST_IPV4] = { .type = NLA_U32 },
+	[OVS_TUNNEL_ATTR_SRC_IPV4] = { .type = NLA_U32 },
+	[OVS_TUNNEL_ATTR_OUT_KEY]  = { .type = NLA_U64 },
+	[OVS_TUNNEL_ATTR_IN_KEY]   = { .type = NLA_U64 },
+	[OVS_TUNNEL_ATTR_TOS]      = { .type = NLA_U8 },
+	[OVS_TUNNEL_ATTR_TTL]      = { .type = NLA_U8 },
+};
+
+/* Sets OVS_TUNNEL_ATTR_* fields in 'mutable', which must initially be zeroed. */
+static int tnl_set_config(struct nlattr *options, 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;
+	struct nlattr *a[OVS_TUNNEL_ATTR_MAX + 1];
+	int err;
 
-	mutable->port_config = *(struct tnl_port_config *)config;
-
-	if (mutable->port_config.daddr == 0)
+	if (!options)
 		return -EINVAL;
 
-	if (mutable->port_config.tos != RT_TOS(mutable->port_config.tos))
+	err = nla_parse_nested(a, OVS_TUNNEL_ATTR_MAX, options, tnl_policy);
+	if (err)
+		return err;
+
+	if (!a[OVS_TUNNEL_ATTR_FLAGS] || !a[OVS_TUNNEL_ATTR_DST_IPV4])
 		return -EINVAL;
 
-	mutable->tunnel_hlen = tnl_ops->hdr_len(&mutable->port_config);
+	mutable->flags = nla_get_u32(a[OVS_TUNNEL_ATTR_FLAGS]) & TNL_F_PUBLIC;
+
+	if (a[OVS_TUNNEL_ATTR_SRC_IPV4])
+		mutable->key.saddr = nla_get_be32(a[OVS_TUNNEL_ATTR_SRC_IPV4]);
+	mutable->key.daddr = nla_get_be32(a[OVS_TUNNEL_ATTR_DST_IPV4]);
+
+	if (a[OVS_TUNNEL_ATTR_TOS]) {
+		mutable->tos = nla_get_u8(a[OVS_TUNNEL_ATTR_TOS]);
+		if (mutable->tos != RT_TOS(mutable->tos))
+			return -EINVAL;
+	}
+
+	if (a[OVS_TUNNEL_ATTR_TTL])
+		mutable->ttl = nla_get_u8(a[OVS_TUNNEL_ATTR_TTL]);
+
+	mutable->key.tunnel_type = tnl_ops->tunnel_type;
+	if (!a[OVS_TUNNEL_ATTR_IN_KEY]) {
+		mutable->key.tunnel_type |= TNL_T_KEY_MATCH;
+		mutable->flags |= TNL_F_IN_KEY_MATCH;
+	} else {
+		mutable->key.tunnel_type |= TNL_T_KEY_EXACT;
+		mutable->key.in_key = nla_get_be64(a[OVS_TUNNEL_ATTR_IN_KEY]);
+	}
+
+	if (!a[OVS_TUNNEL_ATTR_OUT_KEY])
+		mutable->flags |= TNL_F_OUT_KEY_ACTION;
+	else
+		mutable->out_key = nla_get_be64(a[OVS_TUNNEL_ATTR_OUT_KEY]);
+
+	mutable->tunnel_hlen = tnl_ops->hdr_len(mutable);
 	if (mutable->tunnel_hlen < 0)
 		return mutable->tunnel_hlen;
 
 	mutable->tunnel_hlen += sizeof(struct iphdr);
 
-	mutable->tunnel_type = tnl_ops->tunnel_type;
-	if (mutable->port_config.flags & TNL_F_IN_KEY_MATCH) {
-		mutable->tunnel_type |= TNL_T_KEY_MATCH;
-		mutable->port_config.in_key = 0;
-	} else
-		mutable->tunnel_type |= TNL_T_KEY_EXACT;
-
-	old_vport = tnl_find_port(mutable->port_config.saddr,
-				  mutable->port_config.daddr,
-				  mutable->port_config.in_key,
-				  mutable->tunnel_type,
-				  &old_mutable);
-
+	old_vport = port_table_lookup(&mutable->key, &old_mutable);
 	if (old_vport && old_vport != cur_vport)
 		return -EEXIST;
 
-	if (mutable->port_config.flags & TNL_F_OUT_KEY_ACTION)
-		mutable->port_config.out_key = 0;
-
 	return 0;
 }
 
@@ -1359,6 +1333,7 @@ struct vport *tnl_create(const struct vport_parms *parms,
 {
 	struct vport *vport;
 	struct tnl_vport *tnl_vport;
+	struct tnl_mutable_config *mutable;
 	int initial_frag_id;
 	int err;
 
@@ -1373,19 +1348,18 @@ struct vport *tnl_create(const struct vport_parms *parms,
 	strcpy(tnl_vport->name, parms->name);
 	tnl_vport->tnl_ops = tnl_ops;
 
-	tnl_vport->mutable = kzalloc(sizeof(struct tnl_mutable_config), GFP_KERNEL);
-	if (!tnl_vport->mutable) {
+	mutable = kzalloc(sizeof(struct tnl_mutable_config), GFP_KERNEL);
+	if (!mutable) {
 		err = -ENOMEM;
 		goto error_free_vport;
 	}
 
-	vport_gen_rand_ether_addr(tnl_vport->mutable->eth_addr);
-	tnl_vport->mutable->mtu = ETH_DATA_LEN;
+	vport_gen_rand_ether_addr(mutable->eth_addr);
 
 	get_random_bytes(&initial_frag_id, sizeof(int));
 	atomic_set(&tnl_vport->frag_id, initial_frag_id);
 
-	err = set_config(parms->config, tnl_ops, NULL, tnl_vport->mutable);
+	err = tnl_set_config(parms->options, tnl_ops, NULL, mutable);
 	if (err)
 		goto error_free_mutable;
 
@@ -1393,45 +1367,48 @@ struct vport *tnl_create(const struct vport_parms *parms,
 
 #ifdef NEED_CACHE_TIMEOUT
 	tnl_vport->cache_exp_interval = MAX_CACHE_EXP -
-					(net_random() % (MAX_CACHE_EXP / 2));
+				       (net_random() % (MAX_CACHE_EXP / 2));
 #endif
 
-	err = add_port(vport);
-	if (err)
-		goto error_free_mutable;
+	rcu_assign_pointer(tnl_vport->mutable, mutable);
 
+	port_table_add_port(vport);
 	return vport;
 
 error_free_mutable:
-	kfree(tnl_vport->mutable);
+	kfree(mutable);
 error_free_vport:
 	vport_free(vport);
 error:
 	return ERR_PTR(err);
 }
 
-int tnl_modify(struct vport *vport, struct odp_port *port)
+int tnl_set_options(struct vport *vport, struct nlattr *options)
 {
 	struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
+	const struct tnl_mutable_config *old_mutable;
 	struct tnl_mutable_config *mutable;
 	int err;
 
-	mutable = kmemdup(tnl_vport->mutable, sizeof(struct tnl_mutable_config), GFP_KERNEL);
+	mutable = kzalloc(sizeof(struct tnl_mutable_config), GFP_KERNEL);
 	if (!mutable) {
 		err = -ENOMEM;
 		goto error;
 	}
 
-	err = set_config(port->config, tnl_vport->tnl_ops, vport, mutable);
-	if (err)
-		goto error_free;
+	/* Copy fields whose values should be retained. */
+	old_mutable = rtnl_dereference(tnl_vport->mutable);
+	mutable->seq = old_mutable->seq + 1;
+	memcpy(mutable->eth_addr, old_mutable->eth_addr, ETH_ALEN);
 
-	mutable->seq++;
-
-	err = move_port(vport, mutable);
+	/* Parse the others configured by userspace. */
+	err = tnl_set_config(options, tnl_vport->tnl_ops, vport, mutable);
 	if (err)
 		goto error_free;
 
+	if (port_hash(&mutable->key) != port_hash(&old_mutable->key))
+		port_table_move_port(vport, mutable);
+
 	return 0;
 
 error_free:
@@ -1440,48 +1417,49 @@ error:
 	return err;
 }
 
-static void free_port_rcu(struct rcu_head *rcu)
+int tnl_get_options(const struct vport *vport, struct sk_buff *skb)
 {
-	struct tnl_vport *tnl_vport = container_of(rcu, struct tnl_vport, rcu);
+	const struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
+	const struct tnl_mutable_config *mutable = rcu_dereference_rtnl(tnl_vport->mutable);
+
+	NLA_PUT_U32(skb, OVS_TUNNEL_ATTR_FLAGS, mutable->flags & TNL_F_PUBLIC);
+	NLA_PUT_BE32(skb, OVS_TUNNEL_ATTR_DST_IPV4, mutable->key.daddr);
+
+	if (!(mutable->flags & TNL_F_IN_KEY_MATCH))
+		NLA_PUT_BE64(skb, OVS_TUNNEL_ATTR_IN_KEY, mutable->key.in_key);
+	if (!(mutable->flags & TNL_F_OUT_KEY_ACTION))
+		NLA_PUT_BE64(skb, OVS_TUNNEL_ATTR_OUT_KEY, mutable->out_key);
+	if (mutable->key.saddr)
+		NLA_PUT_BE32(skb, OVS_TUNNEL_ATTR_SRC_IPV4, mutable->key.saddr);
+	if (mutable->tos)
+		NLA_PUT_U8(skb, OVS_TUNNEL_ATTR_TOS, mutable->tos);
+	if (mutable->ttl)
+		NLA_PUT_U8(skb, OVS_TUNNEL_ATTR_TTL, mutable->ttl);
 
-	spin_lock_bh(&tnl_vport->cache_lock);
-	free_cache(tnl_vport->cache);
-	spin_unlock_bh(&tnl_vport->cache_lock);
+	return 0;
 
-	kfree(tnl_vport->mutable);
-	vport_free(tnl_vport_to_vport(tnl_vport));
+nla_put_failure:
+	return -EMSGSIZE;
 }
 
-int tnl_destroy(struct vport *vport)
+static void free_port_rcu(struct rcu_head *rcu)
 {
-	struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
-	const struct tnl_mutable_config *old_mutable;
-
-	if (vport == tnl_find_port(tnl_vport->mutable->port_config.saddr,
-	    tnl_vport->mutable->port_config.daddr,
-	    tnl_vport->mutable->port_config.in_key,
-	    tnl_vport->mutable->tunnel_type,
-	    &old_mutable))
-		del_port(vport);
-
-	call_rcu(&tnl_vport->rcu, free_port_rcu);
+	struct tnl_vport *tnl_vport = container_of(rcu,
+						   struct tnl_vport, rcu);
 
-	return 0;
+	free_cache((struct tnl_cache __force *)tnl_vport->cache);
+	kfree((struct tnl_mutable __force *)tnl_vport->mutable);
+	vport_free(tnl_vport_to_vport(tnl_vport));
 }
 
-int tnl_set_mtu(struct vport *vport, int mtu)
+void tnl_destroy(struct vport *vport)
 {
 	struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
-	struct tnl_mutable_config *mutable;
-
-	mutable = kmemdup(tnl_vport->mutable, sizeof(struct tnl_mutable_config), GFP_KERNEL);
-	if (!mutable)
-		return -ENOMEM;
-
-	mutable->mtu = mtu;
-	assign_config_rcu(vport, mutable);
+	const struct tnl_mutable_config *mutable;
 
-	return 0;
+	mutable = rtnl_dereference(tnl_vport->mutable);
+	port_table_remove_port(vport);
+	call_rcu(&tnl_vport->rcu, free_port_rcu);
 }
 
 int tnl_set_addr(struct vport *vport, const unsigned char *addr)
@@ -1489,7 +1467,8 @@ int tnl_set_addr(struct vport *vport, const unsigned char *addr)
 	struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
 	struct tnl_mutable_config *mutable;
 
-	mutable = kmemdup(tnl_vport->mutable, sizeof(struct tnl_mutable_config), GFP_KERNEL);
+	mutable = kmemdup(rtnl_dereference(tnl_vport->mutable),
+			  sizeof(struct tnl_mutable_config), GFP_KERNEL);
 	if (!mutable)
 		return -ENOMEM;
 
@@ -1508,23 +1487,48 @@ const char *tnl_get_name(const struct vport *vport)
 const unsigned char *tnl_get_addr(const struct vport *vport)
 {
 	const struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
-	return rcu_dereference(tnl_vport->mutable)->eth_addr;
-}
-
-int tnl_get_mtu(const struct vport *vport)
-{
-	const struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
-	return rcu_dereference(tnl_vport->mutable)->mtu;
+	return rcu_dereference_rtnl(tnl_vport->mutable)->eth_addr;
 }
 
 void tnl_free_linked_skbs(struct sk_buff *skb)
 {
-	if (unlikely(!skb))
-		return;
-
 	while (skb) {
 		struct sk_buff *next = skb->next;
 		kfree_skb(skb);
 		skb = next;
 	}
 }
+
+int tnl_init(void)
+{
+	int i;
+
+	port_table = kmalloc(PORT_TABLE_SIZE * sizeof(struct hlist_head *),
+			GFP_KERNEL);
+	if (!port_table)
+		return -ENOMEM;
+
+	for (i = 0; i < PORT_TABLE_SIZE; i++)
+		INIT_HLIST_HEAD(&port_table[i]);
+
+	return 0;
+}
+
+void tnl_exit(void)
+{
+	int i;
+
+	for (i = 0; i < PORT_TABLE_SIZE; i++) {
+		struct tnl_vport * tnl_vport;
+		struct hlist_head *hash_head;
+		struct hlist_node *n;
+
+		hash_head = &port_table[i];
+		hlist_for_each_entry(tnl_vport, n, hash_head, hash_node) {
+			BUG();
+			goto out;
+		}
+	}
+out:
+	kfree(port_table);
+}