From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f201.google.com (mail-qt1-f201.google.com [209.85.160.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3217D3EDAA2 for ; Thu, 16 Apr 2026 20:03:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776369822; cv=none; b=j39UOIY2Q26XqnxWr2BTf5deQ4KRn2e9b5G225veeljxtNb5fl2SrdSAApyPEmErDN28RL1unCFoIbQ5BRy7LsIBu6I3WU75S08Jci81Yed4YM7ApUFf1mlqxxWnBbNItmr1cGx3jmQrDDXQ/e4eBZEHwUlXlXuIvYNyUUWf/+I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776369822; c=relaxed/simple; bh=qY8HkWtP8tWPzrAonGqOBbu4o0gnoM0kRBXIfv6d1qA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=bFoBVG7L9EWixx0jhqMZShFW2BNbb0HQy8m0a0iNqRlsO5f7AuuKXWebtQgziHeums1bxw01ytoscPphKJrH2OALU7kA936/awoeiUBiLMBWyNmY/Drqb/RtSAjtekAs+x7apcUW+/LEt7hiTxEUzTms7wJzKP+i9bh2N5hh+AI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=N2worae9; arc=none smtp.client-ip=209.85.160.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--edumazet.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="N2worae9" Received: by mail-qt1-f201.google.com with SMTP id d75a77b69052e-50b4661881eso41185711cf.0 for ; Thu, 16 Apr 2026 13:03:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1776369816; x=1776974616; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=wdFbUlju5PJVTlC8Kj7WdWGlKy+SiuySC2V9ecBtjTc=; b=N2worae9ShtBxjUP7F1TzDDMB4yzY1PNkgpxNZDg2+km06IpSIToGvMQubjcZHs6Uj s4kUeEFTkz234vwUXs6x/eO0H4vU1QTy6QKcrYGCVfoJeNk9/zMAOjWjeudOnudA8jvo 7wcZm5pQVZIxpm603soItMJDRMlyRAv4mOwLfkKN/90yEoC3IoKxdniPqwy1vxEaVQCV JvrA6yaHqBT/uMnGsiXBPuFjEYMmJS4yYPwRI1OxTcDuSW1iVNilhctl6GH/0pejtw17 nQvRz4jib+hUnmrZaUxyT59+mWEWkw8/f97I6ZgQCjYUosb6dl3ehroHcW0nijTUESUR RLuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776369816; x=1776974616; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wdFbUlju5PJVTlC8Kj7WdWGlKy+SiuySC2V9ecBtjTc=; b=C+UD7Bflvt8BxW4gabqQPTgfwnbnp1nnKaCOzNZ0dcIC23OMJAu2fSPb/Ed9174c0y znA7fCabRDrXht0DpyZBNBQg6H3VPywO3rnIE3b0PAN/cABQpfji8Y1XJLaaQjhkiYyS K/1QpOvs08aDRBpYdW9HY8bqrmyJB7cg0FXV/GfvBNcfuz5p1vUQqHKwtlEOa83DozOI Qd9lU5XmrAFQeN3H4/mc2sLY/cp4IO+wDqfbeODimIE48JyfxJIywku+PuShaET0hJrg gsWq2CyisZYm4tEqsW03rZmVMJ2KPQ+12Nhm5aRM/hRbKRCtcwFNakUVlof2iFmQxpNU NP4w== X-Forwarded-Encrypted: i=1; AFNElJ9KYSzmsgtnnuFRyVNTyb/rlxVSaDEtDkOKh6hDjc7n11MepSTRdq4/F+eVdbqz35CUq/FyvMs=@vger.kernel.org X-Gm-Message-State: AOJu0YwsXccoIV0bwLEolHZ50XIgObEVTf4lfLJ3PWCri+M7g0EfK8Xb WL+mDuahF83YanGmjERByLrdvayj+wtl54/eQh7KxfoCV5D3yLWFZpRuf4qsJZT4HTcNxeEYAh8 jVKyzfAiTP+rMLA== X-Received: from qtxi11.prod.google.com ([2002:ac8:5e4b:0:b0:50d:6642:db29]) (user=edumazet job=prod-delivery.src-stubby-dispatcher) by 2002:a05:622a:4287:b0:50d:a8f5:1c02 with SMTP id d75a77b69052e-50e34a16658mr9154891cf.41.1776369815450; Thu, 16 Apr 2026 13:03:35 -0700 (PDT) Date: Thu, 16 Apr 2026 20:03:14 +0000 In-Reply-To: <20260416200319.3608680-1-edumazet@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260416200319.3608680-1-edumazet@google.com> X-Mailer: git-send-email 2.54.0.rc1.513.gad8abe7a5a-goog Message-ID: <20260416200319.3608680-10-edumazet@google.com> Subject: [PATCH net 09/14] tcp: annotate data-races around tp->dsack_dups From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: Simon Horman , Neal Cardwell , Kuniyuki Iwashima , netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet Content-Type: text/plain; charset="UTF-8" tcp_get_timestamping_opt_stats() intentionally runs lockless, we must add READ_ONCE() and WRITE_ONCE() annotations to keep KCSAN happy. Fixes: 7e10b6554ff2 ("tcp: add dsack blocks received stats") Signed-off-by: Eric Dumazet --- net/ipv4/tcp.c | 2 +- net/ipv4/tcp_input.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 8c84639dc54bb8d8aa6f3eeb2b7c1fea16ebfcb5..57c4dcc8bfe948e895f713cadaad20409a9b8f14 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -4465,7 +4465,7 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk, TCP_NLA_PAD); nla_put_u64_64bit(stats, TCP_NLA_BYTES_RETRANS, READ_ONCE(tp->bytes_retrans), TCP_NLA_PAD); - nla_put_u32(stats, TCP_NLA_DSACK_DUPS, tp->dsack_dups); + nla_put_u32(stats, TCP_NLA_DSACK_DUPS, READ_ONCE(tp->dsack_dups)); nla_put_u32(stats, TCP_NLA_REORD_SEEN, tp->reord_seen); nla_put_u32(stats, TCP_NLA_SRTT, tp->srtt_us >> 3); nla_put_u16(stats, TCP_NLA_TIMEOUT_REHASH, tp->timeout_rehash); diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index edb5013873e0c4a9ba2f8a81a43eff5fb6e7a47b..65b3ecc6be4b57f97a62d0e5737a96ddb16dd14d 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -1246,7 +1246,7 @@ static u32 tcp_dsack_seen(struct tcp_sock *tp, u32 start_seq, else if (tp->tlp_high_seq && tp->tlp_high_seq == end_seq) state->flag |= FLAG_DSACK_TLP; - tp->dsack_dups += dup_segs; + WRITE_ONCE(tp->dsack_dups, tp->dsack_dups + dup_segs); /* Skip the DSACK if dup segs weren't retransmitted by sender */ if (tp->dsack_dups > tp->total_retrans) return 0; -- 2.54.0.rc1.513.gad8abe7a5a-goog