Commit 9bd999eb authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

tcp: annotate data-races around icsk->icsk_probes_out 



icsk->icsk_probes_out is read locklessly from inet_sk_diag_fill(),
get_tcp4_sock() and get_tcp6_sock().

Add corresponding READ_ONCE()/WRITE_ONCE() annotations.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarNeal Cardwell <ncardwell@google.com>
Link: https://patch.msgid.link/20250822091727.835869-3-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e6f178be

net/ipv4/inet_diag.c

+2 −2
Original line number Diff line number Diff line
@@ -318,12 +318,12 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk, 
			jiffies_delta_to_msecs(icsk_timeout(icsk) - jiffies);

	} else if (icsk_pending == ICSK_TIME_PROBE0) {

		r->idiag_timer = 4;

		r->idiag_retrans = icsk->icsk_probes_out;

		r->idiag_retrans = READ_ONCE(icsk->icsk_probes_out);

		r->idiag_expires =

			jiffies_delta_to_msecs(icsk_timeout(icsk) - jiffies);

	} else if (timer_pending(&sk->sk_timer)) {

		r->idiag_timer = 2;

		r->idiag_retrans = icsk->icsk_probes_out;

		r->idiag_retrans = READ_ONCE(icsk->icsk_probes_out);

		r->idiag_expires =

			jiffies_delta_to_msecs(sk->sk_timer.expires - jiffies);

	}

net/ipv4/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -3376,7 +3376,7 @@ int tcp_disconnect(struct sock *sk, int flags) 
	WRITE_ONCE(tp->write_seq, seq);



	icsk->icsk_backoff = 0;

	icsk->icsk_probes_out = 0;

	WRITE_ONCE(icsk->icsk_probes_out, 0);

	icsk->icsk_probes_tstamp = 0;

	icsk->icsk_rto = TCP_TIMEOUT_INIT;

	WRITE_ONCE(icsk->icsk_rto_min, TCP_RTO_MIN);

net/ipv4/tcp_input.c

+1 −1
Original line number Diff line number Diff line
@@ -3913,7 +3913,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) 
	 * log. Something worked...

	 */

	WRITE_ONCE(sk->sk_err_soft, 0);

	icsk->icsk_probes_out = 0;

	WRITE_ONCE(icsk->icsk_probes_out, 0);

	tp->rcv_tstamp = tcp_jiffies32;

	if (!prior_packets)

		goto no_queue;

net/ipv4/tcp_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -2960,7 +2960,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i) 
		jiffies_delta_to_clock_t(timer_expires - jiffies),

		READ_ONCE(icsk->icsk_retransmits),

		from_kuid_munged(seq_user_ns(f), sk_uid(sk)),

		icsk->icsk_probes_out,

		READ_ONCE(icsk->icsk_probes_out),

		sock_i_ino(sk),

		refcount_read(&sk->sk_refcnt), sk,

		jiffies_to_clock_t(icsk->icsk_rto),

net/ipv4/tcp_output.c

+2 −2
Original line number Diff line number Diff line
@@ -4394,13 +4394,13 @@ void tcp_send_probe0(struct sock *sk) 


	if (tp->packets_out || tcp_write_queue_empty(sk)) {

		/* Cancel probe timer, if it is not required. */

		icsk->icsk_probes_out = 0;

		WRITE_ONCE(icsk->icsk_probes_out, 0);

		icsk->icsk_backoff = 0;

		icsk->icsk_probes_tstamp = 0;

		return;

	}



	icsk->icsk_probes_out++;

	WRITE_ONCE(icsk->icsk_probes_out, icsk->icsk_probes_out + 1);

	if (err <= 0) {

		if (icsk->icsk_backoff < READ_ONCE(net->ipv4.sysctl_tcp_retries2))

			icsk->icsk_backoff++;