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>
Subject: [PATCH v1 net 15/15] tcp: Fix data-races around sysctl_tcp_max_reordering.
Date: Mon, 18 Jul 2022 10:26:53 -0700 [thread overview]
Message-ID: <20220718172653.22111-16-kuniyu@amazon.com> (raw)
In-Reply-To: <20220718172653.22111-1-kuniyu@amazon.com>
While reading sysctl_tcp_max_reordering, it can be changed
concurrently. Thus, we need to add READ_ONCE() to its readers.
Fixes: dca145ffaa8d ("tcp: allow for bigger reordering level")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
---
net/ipv4/tcp_input.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 31a9d2b8ecdc..07dbcbae7782 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1051,7 +1051,7 @@ static void tcp_check_sack_reordering(struct sock *sk, const u32 low_seq,
tp->undo_marker ? tp->undo_retrans : 0);
#endif
tp->reordering = min_t(u32, (metric + mss - 1) / mss,
- sock_net(sk)->ipv4.sysctl_tcp_max_reordering);
+ READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_max_reordering));
}
/* This exciting event is worth to be remembered. 8) */
@@ -2030,7 +2030,7 @@ static void tcp_check_reno_reordering(struct sock *sk, const int addend)
return;
tp->reordering = min_t(u32, tp->packets_out + addend,
- sock_net(sk)->ipv4.sysctl_tcp_max_reordering);
+ READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_max_reordering));
tp->reord_seen++;
NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRENOREORDER);
}
--
2.30.2
next prev parent reply other threads:[~2022-07-18 17:30 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-18 17:26 [PATCH v1 net 00/15] sysctl: Fix data-races around ipv4_net_table (Round 4) Kuniyuki Iwashima
2022-07-18 17:26 ` [PATCH v1 net 01/15] ipv4: Fix a data-race around sysctl_fib_multipath_use_neigh Kuniyuki Iwashima
2022-07-18 17:26 ` [PATCH v1 net 02/15] ipv4: Fix data-races around sysctl_fib_multipath_hash_policy Kuniyuki Iwashima
2022-07-18 17:26 ` [PATCH v1 net 03/15] ipv4: Fix data-races around sysctl_fib_multipath_hash_fields Kuniyuki Iwashima
2022-07-19 9:38 ` Ido Schimmel
2022-07-18 17:26 ` [PATCH v1 net 04/15] ip: Fix data-races around sysctl_ip_prot_sock Kuniyuki Iwashima
2022-07-18 17:26 ` [PATCH v1 net 05/15] udp: Fix a data-race around sysctl_udp_l3mdev_accept Kuniyuki Iwashima
2022-07-18 17:26 ` [PATCH v1 net 06/15] tcp: Fix data-races around sysctl knobs related to SYN option Kuniyuki Iwashima
2022-07-18 17:26 ` [PATCH v1 net 07/15] tcp: Fix a data-race around sysctl_tcp_early_retrans Kuniyuki Iwashima
2022-07-18 17:26 ` [PATCH v1 net 08/15] tcp: Fix data-races around sysctl_tcp_recovery Kuniyuki Iwashima
2022-07-18 17:26 ` [PATCH v1 net 09/15] tcp: Fix a data-race around sysctl_tcp_thin_linear_timeouts Kuniyuki Iwashima
2022-07-18 17:26 ` [PATCH v1 net 10/15] tcp: Fix data-races around sysctl_tcp_slow_start_after_idle Kuniyuki Iwashima
2022-07-18 17:26 ` [PATCH v1 net 11/15] tcp: Fix a data-race around sysctl_tcp_retrans_collapse Kuniyuki Iwashima
2022-07-18 17:26 ` [PATCH v1 net 12/15] tcp: Fix a data-race around sysctl_tcp_stdurg Kuniyuki Iwashima
2022-07-18 17:26 ` [PATCH v1 net 13/15] tcp: Fix a data-race around sysctl_tcp_rfc1337 Kuniyuki Iwashima
2022-07-18 17:26 ` [PATCH v1 net 14/15] tcp: Fix a data-race around sysctl_tcp_abort_on_overflow Kuniyuki Iwashima
2022-07-18 17:26 ` Kuniyuki Iwashima [this message]
2022-07-20 9:30 ` [PATCH v1 net 00/15] sysctl: Fix data-races around ipv4_net_table (Round 4) 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=20220718172653.22111-16-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 \
/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).