From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CABCE14A62B; Sat, 30 May 2026 17:21:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780161665; cv=none; b=kqRNwkWq/wI63JWkjg9iP0Mo8/vQFvblyKTu276LHnL6uYEnLnyVZChX1S2NB7+b0fgdyjOBQcTxgkoUK35ffrbQVMJ+j7JUQF3vfUcdQGLjDviVysWAanACwHHoxaNpnj1bn5vV1ALWEr6z+6NkHlx3oWWt8trfNDPc0RpJDx0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780161665; c=relaxed/simple; bh=IJqHAO3DBsykUbrdPhU/eg1i9DeP5nMa2ZYy88c4MUY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nRNBOrR8WmwSIfC6IoelNGlyPJYR+SLR4xk3zIR1a2brgY6OEz+uMgDpxLiLpiXZboAQ7a2BFMSqHj76r95pZIOe3ikrK6siB//mlGYHAyKjefg/CUWFdJB5uzwokRmAQlJgWfqxk01K125jyLpQTf1YVYsIzzK1d1ebJ/P0dlY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=r6Zg4aXF; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="r6Zg4aXF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A2A31F00893; Sat, 30 May 2026 17:21:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780161664; bh=5lw4hW9B24PbLfPLz6vTcQk746Ye1wMRGExJHv9hlyk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=r6Zg4aXF7WjsA0RU4+nDCT6LDg1PK4KrooT+Mi+y9IsarzYhs8tCRzPTCq717fIgH XGO6bBjVaYThM0k9+GH/yfUJojgygS9z7bRf4H4YQLOE5tzwHq8FiVrlWTLSXDgkJR D19tH3IiI/dtIIARt/Gih+exwBbJ9BhpJgLyNTIU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1 690/969] tcp: annotate data-races around tp->bytes_sent Date: Sat, 30 May 2026 18:03:34 +0200 Message-ID: <20260530160319.563988220@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit ee43e957ce2ec77b2ec47fef28f3c0df6ab01a31 ] tcp_get_timestamping_opt_stats() intentionally runs lockless, we must add READ_ONCE() and WRITE_ONCE() annotations to keep KCSAN happy. Fixes: ba113c3aa79a ("tcp: add data bytes sent stats") Signed-off-by: Eric Dumazet Link: https://patch.msgid.link/20260416200319.3608680-8-edumazet@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ipv4/tcp.c | 2 +- net/ipv4/tcp_output.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 17e6f5e90b1af..eb59c3d022bb7 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -4108,7 +4108,7 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk, nla_put_u32(stats, TCP_NLA_SNDQ_SIZE, tp->write_seq - tp->snd_una); nla_put_u8(stats, TCP_NLA_CA_STATE, inet_csk(sk)->icsk_ca_state); - nla_put_u64_64bit(stats, TCP_NLA_BYTES_SENT, tp->bytes_sent, + nla_put_u64_64bit(stats, TCP_NLA_BYTES_SENT, READ_ONCE(tp->bytes_sent), TCP_NLA_PAD); nla_put_u64_64bit(stats, TCP_NLA_BYTES_RETRANS, tp->bytes_retrans, TCP_NLA_PAD); diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index bff8b08a11ba5..bb023a07cb1fc 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1382,7 +1382,8 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, tcp_event_data_sent(tp, sk); WRITE_ONCE(tp->data_segs_out, tp->data_segs_out + tcp_skb_pcount(skb)); - tp->bytes_sent += skb->len - tcp_header_size; + WRITE_ONCE(tp->bytes_sent, + tp->bytes_sent + skb->len - tcp_header_size); } if (after(tcb->end_seq, tp->snd_nxt) || tcb->seq == tcb->end_seq) -- 2.53.0