Skip to content

Commit

Permalink
tcp: annotate data-races around tp->tcp_tx_delay
Browse files Browse the repository at this point in the history
[ Upstream commit 348b81b ]

do_tcp_getsockopt() reads tp->tcp_tx_delay while another cpu
might change its value.

Fixes: a842fe1 ("tcp: add optional per socket transmit delay")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20230719212857.3943972-2-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Eric Dumazet authored and Greg Kroah-Hartman committed Jul 27, 2023
1 parent c822536 commit 8ce44cf
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/ipv4/tcp.c
Original file line number Diff line number Diff line change
@@ -3177,7 +3177,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
case TCP_TX_DELAY:
if (val)
tcp_enable_tx_delay();
tp->tcp_tx_delay = val;
WRITE_ONCE(tp->tcp_tx_delay, val);
break;
default:
err = -ENOPROTOOPT;
@@ -3634,7 +3634,7 @@ static int do_tcp_getsockopt(struct sock *sk, int level,
break;

case TCP_TX_DELAY:
val = tp->tcp_tx_delay;
val = READ_ONCE(tp->tcp_tx_delay);
break;

case TCP_TIMESTAMP:

0 comments on commit 8ce44cf

Please sign in to comment.