Commit 1e364520 authored Jul 19, 2023 by Eric Dumazet Committed by sanglipeng Dec 01, 2023

tcp: annotate data-races around tp->tcp_tx_delay

stable inclusion
from stable-v5.10.188
commit 1d4f2c4be1365afdb1411884d71bf3b04a2c9b1e
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8KYFP

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=1d4f2c4be1365afdb1411884d71bf3b04a2c9b1e



--------------------------------

[ Upstream commit 348b81b6 ]

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

Fixes: a842fe14 ("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>
Signed-off-by: sanglipeng <sanglipeng1@jd.com>

parent fd4a70cc

net/ipv4/tcp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3446,7 +3446,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname,
		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;
		@@ -3902,7 +3902,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: