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

Commit 544a773a authored by Hannes Frederic Sowa's avatar Hannes Frederic Sowa Committed by David S. Miller
Browse files

vxlan: reduce usage of synchronize_net in ndo_stop 



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: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0412bd93

drivers/net/vxlan.c

+20 −8
Original line number Diff line number Diff line
@@ -1037,14 +1037,14 @@ static bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev) 
	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;



	if (!vs)

		return;

		return false;

	if (!atomic_dec_and_test(&vs->refcnt))

		return;

		return false;



	vn = net_generic(sock_net(vs->sock->sk), vxlan_net_id);

	spin_lock(&vn->sock_lock);
@@ -1052,16 +1052,28 @@ static void __vxlan_sock_release(struct vxlan_sock *vs) 
	vxlan_notify_del_rx_port(vs);

	spin_unlock(&vn->sock_lock);



	synchronize_net();

	udp_tunnel_sock_release(vs->sock);

	kfree(vs);

	return true;

}



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)

	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)

	__vxlan_sock_release(vxlan->vn6_sock);

	if (ipv6) {

		udp_tunnel_sock_release(vxlan->vn6_sock->sock);

		kfree(vxlan->vn6_sock);

	}

#endif

}