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

inet: move inet->mc_loop to inet->inet_frags 



IP_MULTICAST_LOOP socket option can now be set/read
without locking the socket.

v3: fix build bot error reported in ipvs set_mcast_loop()

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cafbe182

include/net/inet_sock.h

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,6 @@ struct inet_sock { 
	__u8			mc_ttl;

	__u8			pmtudisc;

	__u8			is_icsk:1,

				mc_loop:1,

				transparent:1,

				mc_all:1,

				nodefrag:1;
@@ -271,6 +270,7 @@ enum { 
	INET_FLAGS_RECVERR_RFC4884 = 10,

	INET_FLAGS_FREEBIND	= 11,

	INET_FLAGS_HDRINCL	= 12,

	INET_FLAGS_MC_LOOP	= 13,

};



/* cmsg flags for inet */

net/core/sock.c

+1 −1
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ bool sk_mc_loop(struct sock *sk) 
		return true;

	switch (sk->sk_family) {

	case AF_INET:

		return inet_sk(sk)->mc_loop;

		return inet_test_bit(MC_LOOP, sk);

#if IS_ENABLED(CONFIG_IPV6)

	case AF_INET6:

		return inet6_sk(sk)->mc_loop;

net/ipv4/af_inet.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static int inet_create(struct net *net, struct socket *sock, int protocol, 
	sk->sk_txrehash = READ_ONCE(net->core.sysctl_txrehash);



	inet->uc_ttl	= -1;

	inet->mc_loop	= 1;

	inet_set_bit(MC_LOOP, sk);

	inet->mc_ttl	= 1;

	inet->mc_all	= 1;

	inet->mc_index	= 0;

net/ipv4/inet_diag.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb, 
	inet_sockopt.is_icsk	= inet->is_icsk;

	inet_sockopt.freebind	= inet_test_bit(FREEBIND, sk);

	inet_sockopt.hdrincl	= inet_test_bit(HDRINCL, sk);

	inet_sockopt.mc_loop	= inet->mc_loop;

	inet_sockopt.mc_loop	= inet_test_bit(MC_LOOP, sk);

	inet_sockopt.transparent = inet->transparent;

	inet_sockopt.mc_all	= inet->mc_all;

	inet_sockopt.nodefrag	= inet->nodefrag;

net/ipv4/ip_sockglue.c

+8 −8
Original line number Diff line number Diff line
@@ -993,6 +993,11 @@ int do_ip_setsockopt(struct sock *sk, int level, int optname, 
			return -ENOPROTOOPT;

		inet_assign_bit(HDRINCL, sk, val);

		return 0;

	case IP_MULTICAST_LOOP:

		if (optlen < 1)

			return -EINVAL;

		inet_assign_bit(MC_LOOP, sk, val);

		return 0;

	}



	err = 0;
@@ -1083,11 +1088,6 @@ int do_ip_setsockopt(struct sock *sk, int level, int optname, 
			goto e_inval;

		inet->mc_ttl = val;

		break;

	case IP_MULTICAST_LOOP:

		if (optlen < 1)

			goto e_inval;

		inet->mc_loop = !!val;

		break;

	case IP_UNICAST_IF:

	{

		struct net_device *dev = NULL;
@@ -1579,6 +1579,9 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname, 
	case IP_HDRINCL:

		val = inet_test_bit(HDRINCL, sk);

		goto copyval;

	case IP_MULTICAST_LOOP:

		val = inet_test_bit(MC_LOOP, sk);

		goto copyval;

	}



	if (needs_rtnl)
@@ -1653,9 +1656,6 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname, 
	case IP_MULTICAST_TTL:

		val = inet->mc_ttl;

		break;

	case IP_MULTICAST_LOOP:

		val = inet->mc_loop;

		break;

	case IP_UNICAST_IF:

		val = (__force int)htonl((__u32) inet->uc_index);

		break;