tcp: annotate data-races around icsk_retransmits and icsk_probes_out
Subsystems (4)
cover tcp: annotate data-races around icsk_retransmits and icsk_probes_out
icsk->icsk_retransmits is read locklessly from inet_sk_diag_fill(), tcp_get_timestamping_opt_stats, get_tcp4_sock() and get_tcp6_sock().
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.
Eric Dumazet (2):
tcp: annotate data-races around icsk->icsk_retransmits
tcp: annotate data-races around icsk->icsk_probes_out
net/ipv4/inet_diag.c | 6 +++--- net/ipv4/tcp.c | 5 +++-- net/ipv4/tcp_input.c | 8 ++++---- net/ipv4/tcp_ipv4.c | 4 ++-- net/ipv4/tcp_output.c | 6 +++--- net/ipv4/tcp_timer.c | 6 +++--- net/ipv6/tcp_ipv6.c | 4 ++-- net/mptcp/protocol.c | 3 ++- 8 files changed, 22 insertions(+), 20 deletions(-)
Signature · 1 line
2.51.0.rc2.233.g662b1ed5c5-goog
PATCH 1/2 tcp: annotate data-races around icsk->icsk_retransmits
icsk->icsk_retransmits is read locklessly from inet_sk_diag_fill(), tcp_get_timestamping_opt_stats, get_tcp4_sock() and get_tcp6_sock().
Add corresponding READ_ONCE()/WRITE_ONCE() annotations.
--- net/ipv4/inet_diag.c | 2 +- net/ipv4/tcp.c | 3 ++- net/ipv4/tcp_input.c | 6 +++--- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/tcp_output.c | 2 +- net/ipv4/tcp_timer.c | 2 +- net/ipv6/tcp_ipv6.c | 2 +- net/mptcp/protocol.c | 3 ++- 8 files changed, 12 insertions(+), 10 deletions(-)
net/ipv4/inet_diag.c +1 -1
@@ -313,7 +313,7 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk, icsk_pending == ICSK_TIME_REO_TIMEOUT || icsk_pending == ICSK_TIME_LOSS_PROBE) { r->idiag_timer =1 ; - r->idiag_retrans = icsk->icsk_retransmits; + r->idiag_retrans =READ_ONCE (icsk->icsk_retransmits); r->idiag_expires =jiffies_delta_to_msecs (icsk_timeout (icsk) - jiffies); } else if (icsk_pending == ICSK_TIME_PROBE0) {
net/ipv4/tcp.c +2 -1
@@ -4348,7 +4348,8 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk,nla_put_u32 (stats,TCP_NLA_REORDERING , tp->reordering);nla_put_u32 (stats,TCP_NLA_MIN_RTT ,tcp_min_rtt (tp)); -nla_put_u8 (stats,TCP_NLA_RECUR_RETRANS ,inet_csk (sk)->icsk_retransmits); +nla_put_u8 (stats,TCP_NLA_RECUR_RETRANS , +READ_ONCE (inet_csk (sk)->icsk_retransmits));nla_put_u8 (stats,TCP_NLA_DELIVERY_RATE_APP_LMT , !!tp->rate_app_limited);nla_put_u32 (stats,TCP_NLA_SND_SSTHRESH , tp->snd_ssthresh);nla_put_u32 (stats,TCP_NLA_DELIVERED , tp->delivered);
net/ipv4/tcp_input.c +3 -3
@@ -2569,7 +2569,7 @@ static bool tcp_try_undo_loss(struct sock *sk, bool frto_undo)if (frto_undo)NET_INC_STATS (sock_net (sk),LINUX_MIB_TCPSPURIOUSRTOS ); -inet_csk (sk)->icsk_retransmits =0 ; +WRITE_ONCE (inet_csk (sk)->icsk_retransmits,0 );if (tcp_is_non_sack_preventing_reopen (sk))return true;if (frto_undo ||tcp_is_sack (tp)) {
@@ -3851,7 +3851,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)if (after (ack, prior_snd_una)) { flag |=FLAG_SND_UNA_ADVANCED ; - icsk->icsk_retransmits =0 ; +WRITE_ONCE (icsk->icsk_retransmits,0 );#if IS_ENABLED (CONFIG_TLS_DEVICE )if (static_branch_unlikely (&clean_acked_data_enabled.key))
@@ -6636,7 +6636,7 @@ static void tcp_rcv_synrecv_state_fastopen(struct sock *sk)tcp_try_undo_recovery (sk);tcp_update_rto_time (tp); -inet_csk (sk)->icsk_retransmits =0 ; +WRITE_ONCE (inet_csk (sk)->icsk_retransmits,0 );/* In tcp_fastopen_synack_timer() on the first SYNACK RTO we set * retrans_stamp but don't enter CA_Loss, so in case that happened we * need to zero retrans_stamp here to prevent spurious
net/ipv4/tcp_ipv4.c +1 -1
@@ -2958,7 +2958,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i) rx_queue, timer_active,jiffies_delta_to_clock_t (timer_expires - jiffies), - icsk->icsk_retransmits, +READ_ONCE (icsk->icsk_retransmits),from_kuid_munged (seq_user_ns (f),sk_uid (sk)), icsk->icsk_probes_out, sock_i_ino(sk),
net/ipv4/tcp_output.c +1 -1
@@ -3954,7 +3954,7 @@ static void tcp_connect_init(struct sock *sk)WRITE_ONCE (tp->copied_seq, tp->rcv_nxt);inet_csk (sk)->icsk_rto =tcp_timeout_init (sk); -inet_csk (sk)->icsk_retransmits =0 ; +WRITE_ONCE (inet_csk (sk)->icsk_retransmits,0 );tcp_clear_retrans (tp); }
net/ipv4/tcp_timer.c +1 -1
@@ -444,7 +444,7 @@ static void tcp_update_rto_stats(struct sock *sk) tp->total_rto_recoveries++; tp->rto_stamp =tcp_time_stamp_ms (tp); } - icsk->icsk_retransmits++; +WRITE_ONCE (icsk->icsk_retransmits, icsk->icsk_retransmits +1 ); tp->total_rto++; }
net/ipv6/tcp_ipv6.c +1 -1
@@ -2230,7 +2230,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) rx_queue, timer_active,jiffies_delta_to_clock_t (timer_expires - jiffies), - icsk->icsk_retransmits, +READ_ONCE (icsk->icsk_retransmits),from_kuid_munged (seq_user_ns (seq),sk_uid (sp)), icsk->icsk_probes_out, sock_i_ino(sp),
net/mptcp/protocol.c +2 -1
@@ -2587,7 +2587,8 @@ static void __mptcp_retrans(struct sock *sk)if (mptcp_data_fin_enabled (msk)) {struct inet_connection_sock *icsk =inet_csk (sk); - icsk->icsk_retransmits++; +WRITE_ONCE (icsk->icsk_retransmits, + icsk->icsk_retransmits +1 );mptcp_set_datafin_timeout (sk);mptcp_send_ack (msk);
Signature · 1 line
2.51.0.rc2.233.g662b1ed5c5-goog
Re: [PATCH net-next 1/2] tcp: annotate data-races around icsk->icsk_retransmits
Quoted 7 lines · Eric Dumazet
icsk->icsk_retransmitsis read locklessly frominet_sk_diag_fill(),tcp_get_timestamping_opt_stats,get_tcp4_sock()andget_tcp6_sock().Add corresponding READ_ONCE()/WRITE_ONCE() annotations.
Signed-off-by Eric Dumazet <[email protected]>
Thanks, Eric!
neal
PATCH 2/2 tcp: annotate data-races around icsk->icsk_probes_out
In reply to Eric Dumazeticsk->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.
--- net/ipv4/inet_diag.c | 4 ++-- net/ipv4/tcp.c | 2 +- net/ipv4/tcp_input.c | 2 +- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/tcp_output.c | 4 ++-- net/ipv4/tcp_timer.c | 4 ++-- net/ipv6/tcp_ipv6.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-)
net/ipv4/inet_diag.c +2 -2
@@ -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
@@ -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
@@ -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
@@ -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
@@ -4392,13 +4392,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++;
net/ipv4/tcp_timer.c +2 -2
@@ -392,7 +392,7 @@ static void tcp_probe_timer(struct sock *sk)int max_probes;if (tp->packets_out || !skb) { - icsk->icsk_probes_out =0 ; +WRITE_ONCE (icsk->icsk_probes_out,0 ); icsk->icsk_probes_tstamp =0 ;return ; }
@@ -839,7 +839,7 @@ static void tcp_keepalive_timer(struct timer_list *t) goto out; }if (tcp_write_wakeup (sk,LINUX_MIB_TCPKEEPALIVE ) <=0 ) { - icsk->icsk_probes_out++; +WRITE_ONCE (icsk->icsk_probes_out, icsk->icsk_probes_out +1 ); elapsed =keepalive_intvl_when (tp); }else {/* If keepalive was lost due to local congestion,
net/ipv6/tcp_ipv6.c +1 -1
@@ -2232,7 +2232,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)jiffies_delta_to_clock_t (timer_expires - jiffies),READ_ONCE (icsk->icsk_retransmits),from_kuid_munged (seq_user_ns (seq),sk_uid (sp)), - icsk->icsk_probes_out, +READ_ONCE (icsk->icsk_probes_out),sock_i_ino (sp),refcount_read (&sp->sk_refcnt), sp, jiffies_to_clock_t(icsk->icsk_rto),
Signature · 1 line
2.51.0.rc2.233.g662b1ed5c5-goog
Neal Cardwell
maintainerRe: [PATCH net-next 2/2] tcp: annotate data-races around icsk->icsk_probes_out
net/ipv4/tcp_output.c void tcp_send_probe0(struct sock *sk) · line 4401
Quoted 11 lines · Eric Dumazet
icsk->icsk_probes_outis read locklessly frominet_sk_diag_fill(),get_tcp4_sock()andget_tcp6_sock().Add corresponding READ_ONCE()/WRITE_ONCE() annotations.
Signed-off-by Eric Dumazet <[email protected]>net/ipv4/tcp_output.c +2
-0+WRITE_ONCE (icsk->icsk_probes_out, icsk->icsk_probes_out +1 ); +WRITE_ONCE (icsk->icsk_probes_out, icsk->icsk_probes_out +1 );
Do we want a READ_ONCE as well for those 2 cases? Like:
WRITE_ONCE(icsk->icsk_probes_out, READ_ONCE (icsk->icsk_probes_out) + 1);
Perhaps it's not strictly necessary, though I see several places in the code base that use this approach for increments...
neal
Re: [PATCH net-next 2/2] tcp: annotate data-races around icsk->icsk_probes_out
Quoted 10 lines · Neal Cardwell
Quoted 7 lines · Eric Dumazet
icsk->icsk_probes_outis read locklessly frominet_sk_diag_fill(),get_tcp4_sock()andget_tcp6_sock().Add corresponding READ_ONCE()/WRITE_ONCE() annotations.
Signed-off-by Eric Dumazet <[email protected]>
Quoted 8 lines
net/ipv4/tcp_output.c void tcp_send_probe0(struct sock *sk) · line 4401
Quoted 3 lines
net/ipv4/tcp_output.c +2
-0+WRITE_ONCE (icsk->icsk_probes_out, icsk->icsk_probes_out +1 ); +WRITE_ONCE (icsk->icsk_probes_out, icsk->icsk_probes_out +1 );Do we want a
READ_ONCEas well for those 2 cases? Like:
WRITE_ONCE(icsk->icsk_probes_out, READ_ONCE (icsk->icsk_probes_out) + 1);
READ_ONCE() here is not needed, because we own the socket lock.
Quoted 2 lines
Perhaps it's not strictly necessary, though I see several places in the code base that use this approach for increments...
Maybe in contexts where the read can conflict with another parallel write
__inet_hash_connect
...WRITE_ONCE(table_perturb[index], READ_ONCE(table_perturb[index]) + i + step);
In this case, we do not own a lock on table_perturb[index]
Re: [PATCH net-next 2/2] tcp: annotate data-races around icsk->icsk_probes_out
In reply to Eric DumazetQuoted 7 lines · Eric Dumazet
icsk->icsk_probes_outis read locklessly frominet_sk_diag_fill(),get_tcp4_sock()andget_tcp6_sock().Add corresponding READ_ONCE()/WRITE_ONCE() annotations.
Signed-off-by Eric Dumazet <[email protected]>
Thanks, Eric!
neal
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Fri, 22 Aug 2025 09:17:24 +0000 you wrote:
icsk->icsk_retransmitsis read locklessly frominet_sk_diag_fill(),tcp_get_timestamping_opt_stats,get_tcp4_sock()andget_tcp6_sock().
icsk->icsk_probes_outis read locklessly frominet_sk_diag_fill(),get_tcp4_sock()andget_tcp6_sock().Add corresponding READ_ONCE()/WRITE_ONCE() annotations.
[...]
Here is the summary with links:
- [net-next,1/2] tcp: annotate data-races around icsk->icsk_retransmits
https://git.kernel.org/netdev/net-next/c/e6f178be3c12 - [net-next,2/2] tcp: annotate data-races around icsk->icsk_probes_out https://git.kernel.org/netdev/net-next/c/9bd999eb35cf
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html