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

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

vxlan: Optimize vxlan rcv 



vxlan-udp-recv function lookup vxlan_sock struct on every packet
recv by using udp-port number. we can use sk->sk_user_data to
store vxlan_sock and avoid lookup.
I have open coded rcu-api to store and read vxlan_sock from
sk_user_data to avoid sparse warning as sk_user_data is not
__rcu pointer.

Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f8de3104

drivers/net/vxlan.c

+6 −1
Original line number Diff line number Diff line
@@ -916,6 +916,8 @@ void vxlan_sock_release(struct vxlan_sock *vs) 


	spin_lock(&vn->sock_lock);

	hlist_del_rcu(&vs->hlist);

	smp_wmb();

	vs->sock->sk->sk_user_data = NULL;

	spin_unlock(&vn->sock_lock);



	queue_work(vxlan_wq, &vs->del_work);
@@ -1009,7 +1011,8 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb) 


	port = inet_sk(sk)->inet_sport;



	vs = vxlan_find_sock(sock_net(sk), port);

	smp_read_barrier_depends();

	vs = (struct vxlan_sock *)sk->sk_user_data;

	if (!vs)

		goto drop;
@@ -2236,6 +2239,8 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, __be16 port, 
	atomic_set(&vs->refcnt, 1);

	vs->rcv = rcv;

	vs->data = data;

	smp_wmb();

	vs->sock->sk->sk_user_data = vs;



	spin_lock(&vn->sock_lock);

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