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

inet: move inet->is_icsk to inet->inet_flags 



We move single bit fields to inet->inet_flags to avoid races.

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 4bd0623f

include/net/inet_connection_sock.h

+2 −2
Original line number Diff line number Diff line
@@ -342,9 +342,9 @@ static inline bool inet_csk_in_pingpong_mode(struct sock *sk) 
	return inet_csk(sk)->icsk_ack.pingpong >= TCP_PINGPONG_THRESH;

}



static inline bool inet_csk_has_ulp(struct sock *sk)

static inline bool inet_csk_has_ulp(const struct sock *sk)

{

	return inet_sk(sk)->is_icsk && !!inet_csk(sk)->icsk_ulp_ops;

	return inet_test_bit(IS_ICSK, sk) && !!inet_csk(sk)->icsk_ulp_ops;

}



#endif /* _INET_CONNECTION_SOCK_H */

include/net/inet_sock.h

+2 −3
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ struct rtable; 
 * @inet_id - ID counter for DF pkts

 * @tos - TOS

 * @mc_ttl - Multicasting TTL

 * @is_icsk - is this an inet_connection_sock?

 * @uc_index - Unicast outgoing device index

 * @mc_index - Multicast device index

 * @mc_list - Group array
@@ -230,8 +229,7 @@ struct inet_sock { 
	__u8			min_ttl;

	__u8			mc_ttl;

	__u8			pmtudisc;

	__u8			is_icsk:1,

				nodefrag:1;

	__u8			nodefrag:1;

	__u8			bind_address_no_port:1,

				defer_connect:1; /* Indicates that fastopen_connect is set

						  * and cookie exists so we defer connect
@@ -271,6 +269,7 @@ enum { 
	INET_FLAGS_MC_LOOP	= 13,

	INET_FLAGS_MC_ALL	= 14,

	INET_FLAGS_TRANSPARENT	= 15,

	INET_FLAGS_IS_ICSK	= 16,

};



/* cmsg flags for inet */

net/ipv4/af_inet.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static int inet_create(struct net *net, struct socket *sock, int protocol, 
		sk->sk_reuse = SK_CAN_REUSE;



	inet = inet_sk(sk);

	inet->is_icsk = (INET_PROTOSW_ICSK & answer_flags) != 0;

	inet_assign_bit(IS_ICSK, sk, INET_PROTOSW_ICSK & answer_flags);



	inet->nodefrag = 0;

net/ipv4/cipso_ipv4.c

+2 −2
Original line number Diff line number Diff line
@@ -1881,7 +1881,7 @@ int cipso_v4_sock_setattr(struct sock *sk, 


	old = rcu_dereference_protected(sk_inet->inet_opt,

					lockdep_sock_is_held(sk));

	if (sk_inet->is_icsk) {

	if (inet_test_bit(IS_ICSK, sk)) {

		sk_conn = inet_csk(sk);

		if (old)

			sk_conn->icsk_ext_hdr_len -= old->opt.optlen;
@@ -2051,7 +2051,7 @@ void cipso_v4_sock_delattr(struct sock *sk) 
	sk_inet = inet_sk(sk);



	hdr_delta = cipso_v4_delopt(&sk_inet->inet_opt);

	if (sk_inet->is_icsk && hdr_delta > 0) {

	if (inet_test_bit(IS_ICSK, sk) && hdr_delta > 0) {

		struct inet_connection_sock *sk_conn = inet_csk(sk);

		sk_conn->icsk_ext_hdr_len -= hdr_delta;

		sk_conn->icsk_sync_mss(sk, sk_conn->icsk_pmtu_cookie);

net/ipv4/inet_diag.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb, 


	memset(&inet_sockopt, 0, sizeof(inet_sockopt));

	inet_sockopt.recverr	= inet_test_bit(RECVERR, sk);

	inet_sockopt.is_icsk	= inet->is_icsk;

	inet_sockopt.is_icsk	= inet_test_bit(IS_ICSK, sk);

	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);