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

inet: move inet->transparent to inet->inet_flags 



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

v2: removed unused issk variable in mptcp_setsockopt_sol_ip_set_transparent()
v4: rebased after commit 3f326a82 ("mptcp: change the mpc check helper to return a sk")

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Acked-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Reviewed-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 307b4ac6

include/net/inet_sock.h

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

	__u8			pmtudisc;

	__u8			is_icsk:1,

				transparent:1,

				nodefrag:1;

	__u8			bind_address_no_port:1,

				defer_connect:1; /* Indicates that fastopen_connect is set
@@ -271,6 +270,7 @@ enum { 
	INET_FLAGS_HDRINCL	= 12,

	INET_FLAGS_MC_LOOP	= 13,

	INET_FLAGS_MC_ALL	= 14,

	INET_FLAGS_TRANSPARENT	= 15,

};



/* cmsg flags for inet */
@@ -397,7 +397,7 @@ static inline __u8 inet_sk_flowi_flags(const struct sock *sk) 
{

	__u8 flags = 0;



	if (inet_sk(sk)->transparent || inet_test_bit(HDRINCL, sk))

	if (inet_test_bit(TRANSPARENT, sk) || inet_test_bit(HDRINCL, sk))

		flags |= FLOWI_FLAG_ANYSRC;

	return flags;

}
@@ -424,7 +424,7 @@ static inline bool inet_can_nonlocal_bind(struct net *net, 
{

	return READ_ONCE(net->ipv4.sysctl_ip_nonlocal_bind) ||

		test_bit(INET_FLAGS_FREEBIND, &inet->inet_flags) ||

		inet->transparent;

		test_bit(INET_FLAGS_TRANSPARENT, &inet->inet_flags);

}



static inline bool inet_addr_valid_or_nonlocal(struct net *net,

include/net/ipv6.h

+1 −1
Original line number Diff line number Diff line
@@ -938,7 +938,7 @@ static inline bool ipv6_can_nonlocal_bind(struct net *net, 
{

	return net->ipv6.sysctl.ip_nonlocal_bind ||

		test_bit(INET_FLAGS_FREEBIND, &inet->inet_flags) ||

		inet->transparent;

		test_bit(INET_FLAGS_TRANSPARENT, &inet->inet_flags);

}



/* Sysctl settings for net ipv6.auto_flowlabels */

include/net/route.h

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst, 
{

	__u8 flow_flags = 0;



	if (inet_sk(sk)->transparent)

	if (inet_test_bit(TRANSPARENT, sk))

		flow_flags |= FLOWI_FLAG_ANYSRC;



	flowi4_init_output(fl4, oif, READ_ONCE(sk->sk_mark), ip_sock_rt_tos(sk),

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -2031,7 +2031,7 @@ static inline bool inet_sk_transparent(const struct sock *sk) 
	case TCP_NEW_SYN_RECV:

		return inet_rsk(inet_reqsk(sk))->no_srccheck;

	}

	return inet_sk(sk)->transparent;

	return inet_test_bit(TRANSPARENT, sk);

}



/* Determines whether this is a thin stream (which may suffer from

net/ipv4/inet_diag.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb, 
	inet_sockopt.freebind	= inet_test_bit(FREEBIND, sk);

	inet_sockopt.hdrincl	= inet_test_bit(HDRINCL, sk);

	inet_sockopt.mc_loop	= inet_test_bit(MC_LOOP, sk);

	inet_sockopt.transparent = inet->transparent;

	inet_sockopt.transparent = inet_test_bit(TRANSPARENT, sk);

	inet_sockopt.mc_all	= inet_test_bit(MC_ALL, sk);

	inet_sockopt.nodefrag	= inet->nodefrag;

	inet_sockopt.bind_address_no_port = inet->bind_address_no_port;