Commit 553ced03 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

ipv6: addrconf_disable_ipv6() optimization 



Writing over /proc/sys/net/ipv6/conf/default/disable_ipv6
does not need to hold RTNL.

v3: remove a wrong change (Jakub Kicinski feedback)

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d289ab65

net/ipv6/addrconf.c

+6 −7
Original line number Diff line number Diff line
@@ -6399,21 +6399,20 @@ static void addrconf_disable_change(struct net *net, __s32 newf) 


static int addrconf_disable_ipv6(struct ctl_table *table, int *p, int newf)

{

	struct net *net;

	struct net *net = (struct net *)table->extra2;

	int old;



	if (p == &net->ipv6.devconf_dflt->disable_ipv6) {

		WRITE_ONCE(*p, newf);

		return 0;

	}



	if (!rtnl_trylock())

		return restart_syscall();



	net = (struct net *)table->extra2;

	old = *p;

	WRITE_ONCE(*p, newf);



	if (p == &net->ipv6.devconf_dflt->disable_ipv6) {

		rtnl_unlock();

		return 0;

	}



	if (p == &net->ipv6.devconf_all->disable_ipv6) {

		WRITE_ONCE(net->ipv6.devconf_dflt->disable_ipv6, newf);

		addrconf_disable_change(net, newf);