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: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index ad1895e32e7d9bbad4ce210bda9698328e026b18..6c4eeca59f608ff18e5f05dec33700189d6e2198 100644 (file)
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -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 */

diff --git a/net/core/sock.c b/net/core/sock.c
index 525619776c6f4945552d5c4117c5742fe7e14f5e..22d94394335fb75f12da65368e87c5a65167cc0e 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -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;

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 5785fe9de58c2ef1ba8248afbfd3ef06aee4d107..e847822df9b6157d85379550e75c3cd6a6a82eb5 100644 (file)
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -356,7 +356,7 @@ lookup_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;

diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index 98f3eb0ce16ab32daccf3c2407630622e9cdb71d..cc797261893b902f626b5a36074e4b4bf7535063 100644 (file)
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -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;

diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 763456fd4f4faac8e46d649a281f178be05a7cef..be569032b612bef1277e802400a1ee6ec20e877a 100644 (file)
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -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;

diff --git a/net/ipv4/udp_tunnel_core.c b/net/ipv4/udp_tunnel_core.c
index 5f8104cf082d0e25a204f1d7ae5c27d9961914ea..9b18f371af0d49bd3ee9a440f222d03efd8a4911 100644 (file)
--- a/net/ipv4/udp_tunnel_core.c
+++ b/net/ipv4/udp_tunnel_core.c
@@ -63,7 +63,7 @@ void setup_udp_tunnel_sock(struct net *net, struct socket *sock,
        struct sock *sk = sock->sk;
 
        /* Disable multicast loopback */
-       inet_sk(sk)->mc_loop = 0;
+       inet_clear_bit(MC_LOOP, sk);
 
        /* Enable CHECKSUM_UNNECESSARY to CHECKSUM_COMPLETE conversion */
        inet_inc_convert_csum(sk);

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index ed9d207080ac871690b2fec43676a2c1c7ea74ce..8e9d4c1f0e837cb0ba32af244576461c90d9d97a 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -229,7 +229,7 @@ lookup_protocol:
         */
        inet->uc_ttl    = -1;
 
-       inet->mc_loop   = 1;
+       inet_set_bit(MC_LOOP, sk);
        inet->mc_ttl    = 1;
        inet->mc_index  = 0;
        RCU_INIT_POINTER(inet->mc_list, NULL);

diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index 264f2f87a43760a459dbb3c3fe5354d89799c1cb..da5af28ff57b5254c0ec8976c4180113037c96a0 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -1297,11 +1297,9 @@ static void set_sock_size(struct sock *sk, int mode, int val)
  */
 static void set_mcast_loop(struct sock *sk, u_char loop)
 {
-       struct inet_sock *inet = inet_sk(sk);
-
        /* setsockopt(sock, SOL_IP, IP_MULTICAST_LOOP, &loop, sizeof(loop)); */
        lock_sock(sk);
-       inet->mc_loop = loop ? 1 : 0;
+       inet_assign_bit(MC_LOOP, sk, loop);
 #ifdef CONFIG_IP_VS_IPV6
        if (sk->sk_family == AF_INET6) {
                struct ipv6_pinfo *np = inet6_sk(sk);

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 6e3d28aa587cdb64f7a1ac384fa28a34d4c6739c..04b390892827b8abbb7e7433d71f4f54dd1dac21 100644 (file)
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -9482,7 +9482,7 @@ void sctp_copy_sock(struct sock *newsk, struct sock *sk,
        newinet->inet_id = get_random_u16();
 
        newinet->uc_ttl = inet->uc_ttl;
-       newinet->mc_loop = 1;
+       inet_set_bit(MC_LOOP, newsk);
        newinet->mc_ttl = 1;
        newinet->mc_index = 0;
        newinet->mc_list = NULL;