iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vxlan: reduce usage of synchronize_net in ndo_stop

Browse Source 
We only need to do the synchronize_net dance once for both, ipv4 and
ipv6 sockets, thus removing one synchronize_net in case both sockets get
dismantled.

Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Hannes Frederic Sowa 2016-04-09 12:46:23 +02:00 committed by David S. Miller
parent 0412bd931f
commit 544a773a01
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/vxlan.c
View File

@ -1037,14 +1037,14 @@ static bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev)
return false; return false;
} }
static void __vxlan_sock_release(struct vxlan_sock *vs) static bool __vxlan_sock_release_prep(struct vxlan_sock *vs)
{ {
struct vxlan_net *vn; struct vxlan_net *vn;
if (!vs) if (!vs)
return; return false;
if (!atomic_dec_and_test(&vs->refcnt)) if (!atomic_dec_and_test(&vs->refcnt))
return; return false;
vn = net_generic(sock_net(vs->sock->sk), vxlan_net_id); vn = net_generic(sock_net(vs->sock->sk), vxlan_net_id);
spin_lock(&vn->sock_lock); spin_lock(&vn->sock_lock);
@ -1052,16 +1052,28 @@ static void __vxlan_sock_release(struct vxlan_sock *vs)
vxlan_notify_del_rx_port(vs); vxlan_notify_del_rx_port(vs);
spin_unlock(&vn->sock_lock); spin_unlock(&vn->sock_lock);
synchronize_net(); return true;
udp_tunnel_sock_release(vs->sock);
kfree(vs);
} }
static void vxlan_sock_release(struct vxlan_dev *vxlan) static void vxlan_sock_release(struct vxlan_dev *vxlan)
{ {
__vxlan_sock_release(vxlan->vn4_sock); bool ipv4 = __vxlan_sock_release_prep(vxlan->vn4_sock);
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
__vxlan_sock_release(vxlan->vn6_sock); bool ipv6 = __vxlan_sock_release_prep(vxlan->vn6_sock);
#endif
synchronize_net();
if (ipv4) {
udp_tunnel_sock_release(vxlan->vn4_sock->sock);
kfree(vxlan->vn4_sock);
}
#if IS_ENABLED(CONFIG_IPV6)
if (ipv6) {
udp_tunnel_sock_release(vxlan->vn6_sock->sock);
kfree(vxlan->vn6_sock);
}
#endif #endif
} }