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

inet: move inet->mc_all to inet->inet_frags

Browse Source 
IP_MULTICAST_ALL socket option can now be set/read
without locking the socket.

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>
This commit is contained in:
Eric Dumazet 2023-08-16 08:15:40 +00:00 committed by David S. Miller
parent b09bde5c35
commit 307b4ac6dc
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/inet_sock.h
View File

@ -232,7 +232,6 @@ struct inet_sock {
__u8 pmtudisc; __u8 pmtudisc;
__u8 is_icsk:1, __u8 is_icsk:1,
transparent:1, transparent:1,
mc_all:1,
nodefrag:1; nodefrag:1;
__u8 bind_address_no_port:1, __u8 bind_address_no_port:1,
defer_connect:1; /* Indicates that fastopen_connect is set defer_connect:1; /* Indicates that fastopen_connect is set
@ -271,6 +270,7 @@ enum {
INET_FLAGS_FREEBIND = 11, INET_FLAGS_FREEBIND = 11,
INET_FLAGS_HDRINCL = 12, INET_FLAGS_HDRINCL = 12,
INET_FLAGS_MC_LOOP = 13, INET_FLAGS_MC_LOOP = 13,
INET_FLAGS_MC_ALL = 14,
}; };
/* cmsg flags for inet */ /* cmsg flags for inet */

2
net/ipv4/af_inet.c
View File

@ -358,7 +358,7 @@ lookup_protocol:
inet->uc_ttl = -1; inet->uc_ttl = -1;
inet_set_bit(MC_LOOP, sk); inet_set_bit(MC_LOOP, sk);
inet->mc_ttl = 1; inet->mc_ttl = 1;
inet->mc_all = 1; inet_set_bit(MC_ALL, sk);
inet->mc_index = 0; inet->mc_index = 0;
inet->mc_list = NULL; inet->mc_list = NULL;
inet->rcv_tos = 0; inet->rcv_tos = 0;

2
net/ipv4/igmp.c
View File

@ -2658,7 +2658,7 @@ int ip_mc_sf_allow(const struct sock *sk, __be32 loc_addr, __be32 rmt_addr,
(sdif && pmc->multi.imr_ifindex == sdif))) (sdif && pmc->multi.imr_ifindex == sdif)))
break; break;
} }
ret = inet->mc_all; ret = inet_test_bit(MC_ALL, sk);
if (!pmc) if (!pmc)
goto unlock; goto unlock;
psl = rcu_dereference(pmc->sflist); psl = rcu_dereference(pmc->sflist);

2
net/ipv4/inet_diag.c
View File

@ -188,7 +188,7 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb,
inet_sockopt.hdrincl = inet_test_bit(HDRINCL, sk); inet_sockopt.hdrincl = inet_test_bit(HDRINCL, sk);
inet_sockopt.mc_loop = inet_test_bit(MC_LOOP, sk); inet_sockopt.mc_loop = inet_test_bit(MC_LOOP, sk);
inet_sockopt.transparent = inet->transparent; inet_sockopt.transparent = inet->transparent;
inet_sockopt.mc_all = inet->mc_all; inet_sockopt.mc_all = inet_test_bit(MC_ALL, sk);
inet_sockopt.nodefrag = inet->nodefrag; inet_sockopt.nodefrag = inet->nodefrag;
inet_sockopt.bind_address_no_port = inet->bind_address_no_port; inet_sockopt.bind_address_no_port = inet->bind_address_no_port;
inet_sockopt.recverr_rfc4884 = inet_test_bit(RECVERR_RFC4884, sk); inet_sockopt.recverr_rfc4884 = inet_test_bit(RECVERR_RFC4884, sk);

22
net/ipv4/ip_sockglue.c
View File

@ -998,6 +998,14 @@ int do_ip_setsockopt(struct sock *sk, int level, int optname,
return -EINVAL; return -EINVAL;
inet_assign_bit(MC_LOOP, sk, val); inet_assign_bit(MC_LOOP, sk, val);
return 0; return 0;
case IP_MULTICAST_ALL:
if (optlen < 1)
return -EINVAL;
if (val != 0 && val != 1)
return -EINVAL;
inet_assign_bit(MC_ALL, sk, val);
return 0;
} }
err = 0; err = 0;
@ -1303,14 +1311,6 @@ int do_ip_setsockopt(struct sock *sk, int level, int optname,
else else
err = ip_set_mcast_msfilter(sk, optval, optlen); err = ip_set_mcast_msfilter(sk, optval, optlen);
break; break;
case IP_MULTICAST_ALL:
if (optlen < 1)
goto e_inval;
if (val != 0 && val != 1)
goto e_inval;
inet->mc_all = val;
break;
case IP_IPSEC_POLICY: case IP_IPSEC_POLICY:
case IP_XFRM_POLICY: case IP_XFRM_POLICY:
err = -EPERM; err = -EPERM;
@ -1582,6 +1582,9 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname,
case IP_MULTICAST_LOOP: case IP_MULTICAST_LOOP:
val = inet_test_bit(MC_LOOP, sk); val = inet_test_bit(MC_LOOP, sk);
goto copyval; goto copyval;
case IP_MULTICAST_ALL:
val = inet_test_bit(MC_ALL, sk);
goto copyval;
} }
if (needs_rtnl) if (needs_rtnl)
@ -1694,9 +1697,6 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname,
else else
err = ip_get_mcast_msfilter(sk, optval, optlen, len); err = ip_get_mcast_msfilter(sk, optval, optlen, len);
goto out; goto out;
case IP_MULTICAST_ALL:
val = inet->mc_all;
break;
case IP_PKTOPTIONS: case IP_PKTOPTIONS:
{ {
struct msghdr msg; struct msghdr msg;