netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kuniyuki Iwashima <kuniyu@amazon.com>
To: "David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	David Ahern <dsahern@kernel.org>
Cc: Kuniyuki Iwashima <kuniyu@amazon.com>,
	Kuniyuki Iwashima <kuni1840@gmail.com>, <netdev@vger.kernel.org>,
	Yuchung Cheng <ycheng@google.com>
Subject: [PATCH v1 net 13/15] tcp: Fix a data-race around sysctl_tcp_min_rtt_wlen.
Date: Wed, 20 Jul 2022 09:50:24 -0700	[thread overview]
Message-ID: <20220720165026.59712-14-kuniyu@amazon.com> (raw)
In-Reply-To: <20220720165026.59712-1-kuniyu@amazon.com>

While reading sysctl_tcp_min_rtt_wlen, it can be changed concurrently.
Thus, we need to add READ_ONCE() to its reader.

Fixes: f672258391b4 ("tcp: track min RTT using windowed min-filter")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
---
CC: Yuchung Cheng <ycheng@google.com>
---
 net/ipv4/tcp_input.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index d386a69b1c05..96d11f8ab729 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3058,7 +3058,7 @@ static void tcp_fastretrans_alert(struct sock *sk, const u32 prior_snd_una,
 
 static void tcp_update_rtt_min(struct sock *sk, u32 rtt_us, const int flag)
 {
-	u32 wlen = sock_net(sk)->ipv4.sysctl_tcp_min_rtt_wlen * HZ;
+	u32 wlen = READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_min_rtt_wlen) * HZ;
 	struct tcp_sock *tp = tcp_sk(sk);
 
 	if ((flag & FLAG_ACK_MAYBE_DELAYED) && rtt_us > tcp_min_rtt(tp)) {
-- 
2.30.2


  parent reply	other threads:[~2022-07-20 16:54 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-20 16:50 [PATCH v1 net 00/15] sysctl: Fix data-races around ipv4_net_table (Round 5) Kuniyuki Iwashima
2022-07-20 16:50 ` [PATCH v1 net 01/15] tcp: Fix data-races around sysctl_tcp_dsack Kuniyuki Iwashima
2022-07-20 16:50 ` [PATCH v1 net 02/15] tcp: Fix a data-race around sysctl_tcp_app_win Kuniyuki Iwashima
2022-07-20 16:50 ` [PATCH v1 net 03/15] tcp: Fix a data-race around sysctl_tcp_adv_win_scale Kuniyuki Iwashima
2022-07-20 16:50 ` [PATCH v1 net 04/15] tcp: Fix a data-race around sysctl_tcp_frto Kuniyuki Iwashima
2022-07-20 16:50 ` [PATCH v1 net 05/15] tcp: Fix a data-race around sysctl_tcp_nometrics_save Kuniyuki Iwashima
2022-07-20 16:50 ` [PATCH v1 net 06/15] tcp: Fix data-races around sysctl_tcp_no_ssthresh_metrics_save Kuniyuki Iwashima
2022-07-20 16:50 ` [PATCH v1 net 07/15] tcp: Fix data-races around sysctl_tcp_moderate_rcvbuf Kuniyuki Iwashima
2022-07-20 16:50 ` [PATCH v1 net 08/15] tcp: Fix data-races around sysctl_tcp_workaround_signed_windows Kuniyuki Iwashima
2022-07-20 16:50 ` [PATCH v1 net 09/15] tcp: Fix a data-race around sysctl_tcp_limit_output_bytes Kuniyuki Iwashima
2022-07-20 16:50 ` [PATCH v1 net 10/15] tcp: Fix a data-race around sysctl_tcp_challenge_ack_limit Kuniyuki Iwashima
2022-07-20 16:50 ` [PATCH v1 net 11/15] tcp: Fix a data-race around sysctl_tcp_min_tso_segs Kuniyuki Iwashima
2022-07-20 16:50 ` [PATCH v1 net 12/15] tcp: Fix a data-race around sysctl_tcp_tso_rtt_log Kuniyuki Iwashima
2022-07-20 16:50 ` Kuniyuki Iwashima [this message]
2022-07-20 16:50 ` [PATCH v1 net 14/15] tcp: Fix a data-race around sysctl_tcp_autocorking Kuniyuki Iwashima
2022-07-20 16:50 ` [PATCH v1 net 15/15] tcp: Fix a data-race around sysctl_tcp_invalid_ratelimit Kuniyuki Iwashima
2022-07-20 17:17 ` [PATCH v1 net 00/15] sysctl: Fix data-races around ipv4_net_table (Round 5) Eric Dumazet
2022-07-22 11:10 ` patchwork-bot+netdevbpf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220720165026.59712-14-kuniyu@amazon.com \
    --to=kuniyu@amazon.com \
    --cc=davem@davemloft.net \
    --cc=dsahern@kernel.org \
    --cc=edumazet@google.com \
    --cc=kuba@kernel.org \
    --cc=kuni1840@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=ycheng@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).