Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c2e24e1 authored by Pravin B Shelar's avatar Pravin B Shelar Committed by David S. Miller
Browse files

vxlan: Restructure vxlan socket apis. 



Restructure vxlan-socket management APIs so that it can be
shared between vxlan and ovs modules.
This patch does not change any functionality.

Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
v6-v7:
 - get rid of zero refcnt vs from hashtable.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7559fb2f

drivers/net/vxlan.c

+51 −41
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static inline struct vxlan_rdst *first_remote_rtnl(struct vxlan_fdb *fdb) 
}



/* Find VXLAN socket based on network namespace and UDP port */

static struct vxlan_sock *vxlan_find_port(struct net *net, __be16 port)

static struct vxlan_sock *vxlan_find_sock(struct net *net, __be16 port)

{

	struct vxlan_sock *vs;
@@ -205,7 +205,7 @@ static struct vxlan_dev *vxlan_find_vni(struct net *net, u32 id, __be16 port) 
	struct vxlan_sock *vs;

	struct vxlan_dev *vxlan;



	vs = vxlan_find_port(net, port);

	vs = vxlan_find_sock(net, port);

	if (!vs)

		return NULL;
@@ -1365,25 +1365,31 @@ static void vxlan_cleanup(unsigned long arg) 
	mod_timer(&vxlan->age_timer, next_timer);

}



static void vxlan_vs_add_dev(struct vxlan_sock *vs, struct vxlan_dev *vxlan)

{

	__u32 vni = vxlan->default_dst.remote_vni;



	vxlan->vn_sock = vs;

	hlist_add_head_rcu(&vxlan->hlist, vni_head(vs, vni));

}



/* Setup stats when device is created */

static int vxlan_init(struct net_device *dev)

{

	struct vxlan_dev *vxlan = netdev_priv(dev);

	struct vxlan_net *vn = net_generic(dev_net(dev), vxlan_net_id);

	struct vxlan_sock *vs;

	__u32 vni = vxlan->default_dst.remote_vni;



	dev->tstats = alloc_percpu(struct pcpu_tstats);

	if (!dev->tstats)

		return -ENOMEM;



	spin_lock(&vn->sock_lock);

	vs = vxlan_find_port(dev_net(dev), vxlan->dst_port);

	vs = vxlan_find_sock(dev_net(dev), vxlan->dst_port);

	if (vs) {

		/* If we have a socket with same port already, reuse it */

		atomic_inc(&vs->refcnt);

		vxlan->vn_sock = vs;

		hlist_add_head_rcu(&vxlan->hlist, vni_head(vs, vni));

		vxlan_vs_add_dev(vs, vxlan);

	} else {

		/* otherwise make new socket outside of RTNL */

		dev_hold(dev);
@@ -1633,6 +1639,7 @@ static void vxlan_del_work(struct work_struct *work) 


static struct vxlan_sock *vxlan_socket_create(struct net *net, __be16 port)

{

	struct vxlan_net *vn = net_generic(net, vxlan_net_id);

	struct vxlan_sock *vs;

	struct sock *sk;

	struct sockaddr_in vxlan_addr = {
@@ -1644,8 +1651,10 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, __be16 port) 
	unsigned int h;



	vs = kmalloc(sizeof(*vs), GFP_KERNEL);

	if (!vs)

	if (!vs) {

		pr_debug("memory alocation failure\n");

		return ERR_PTR(-ENOMEM);

	}



	for (h = 0; h < VNI_HASH_SIZE; ++h)

		INIT_HLIST_HEAD(&vs->vni_list[h]);
@@ -1673,57 +1682,57 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, __be16 port) 
		kfree(vs);

		return ERR_PTR(rc);

	}

	atomic_set(&vs->refcnt, 1);



	/* Disable multicast loopback */

	inet_sk(sk)->mc_loop = 0;

	spin_lock(&vn->sock_lock);

	hlist_add_head_rcu(&vs->hlist, vs_head(net, port));

	spin_unlock(&vn->sock_lock);



	/* Mark socket as an encapsulation socket. */

	udp_sk(sk)->encap_type = 1;

	udp_sk(sk)->encap_rcv = vxlan_udp_encap_recv;

	udp_encap_enable();

	atomic_set(&vs->refcnt, 1);

	return vs;

}



static struct vxlan_sock *vxlan_sock_add(struct net *net, __be16 port)

{

	struct vxlan_net *vn = net_generic(net, vxlan_net_id);

	struct vxlan_sock *vs;



	vs = vxlan_socket_create(net, port);

	if (!IS_ERR(vs))

		return vs;



	spin_lock(&vn->sock_lock);

	vs = vxlan_find_sock(net, port);

	if (vs)

		atomic_inc(&vs->refcnt);

	else

		vs = ERR_PTR(-EINVAL);



	spin_unlock(&vn->sock_lock);

	return vs;

}



/* Scheduled at device creation to bind to a socket */

static void vxlan_sock_work(struct work_struct *work)

{

	struct vxlan_dev *vxlan

		= container_of(work, struct vxlan_dev, sock_work);

	struct net_device *dev = vxlan->dev;

	struct net *net = dev_net(dev);

	__u32 vni = vxlan->default_dst.remote_vni;

	__be16 port = vxlan->dst_port;

	struct vxlan_dev *vxlan = container_of(work, struct vxlan_dev, sock_work);

	struct net *net = dev_net(vxlan->dev);

	struct vxlan_net *vn = net_generic(net, vxlan_net_id);

	struct vxlan_sock *nvs, *ovs;



	nvs = vxlan_socket_create(net, port);

	if (IS_ERR(nvs)) {

		netdev_err(vxlan->dev, "Can not create UDP socket, %ld\n",

			   PTR_ERR(nvs));

		goto out;

	}

	__be16 port = vxlan->dst_port;

	struct vxlan_sock *nvs;



	nvs = vxlan_sock_add(net, port);

	spin_lock(&vn->sock_lock);

	/* Look again to see if can reuse socket */

	ovs = vxlan_find_port(net, port);

	if (ovs) {

		atomic_inc(&ovs->refcnt);

		vxlan->vn_sock = ovs;

		hlist_add_head_rcu(&vxlan->hlist, vni_head(ovs, vni));

	if (!IS_ERR(nvs))

		vxlan_vs_add_dev(nvs, vxlan);

	spin_unlock(&vn->sock_lock);



		sk_release_kernel(nvs->sock->sk);

		kfree(nvs);

	} else {

		vxlan->vn_sock = nvs;

		hlist_add_head_rcu(&nvs->hlist, vs_head(net, port));

		hlist_add_head_rcu(&vxlan->hlist, vni_head(nvs, vni));

		spin_unlock(&vn->sock_lock);

	}

out:

	dev_put(dev);

	dev_put(vxlan->dev);

}



static int vxlan_newlink(struct net *net, struct net_device *dev,
@@ -1838,6 +1847,7 @@ static void vxlan_dellink(struct net_device *dev, struct list_head *head) 
	struct vxlan_dev *vxlan = netdev_priv(dev);



	spin_lock(&vn->sock_lock);

	if (!hlist_unhashed(&vxlan->hlist))

		hlist_del_rcu(&vxlan->hlist);

	spin_unlock(&vn->sock_lock);