From nobody Sat Dec 27 20:36:30 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 098FC208D7; Sat, 16 Dec 2023 04:21:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DB796C433CA; Sat, 16 Dec 2023 04:21:54 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rEMCL-00000002yHF-3tRk; Fri, 15 Dec 2023 23:22:45 -0500 Message-ID: <20231216042245.708750639@goodmis.org> User-Agent: quilt/0.67 Date: Fri, 15 Dec 2023 23:22:28 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , stable@vger.kernel.org Subject: [for-linus][PATCH 14/15] ring-buffer: Have rb_time_cmpxchg() set the msb counter too References: <20231216042214.905262999@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Steven Rostedt (Google)" The rb_time_cmpxchg() on 32-bit architectures requires setting three 32-bit words to represent the 64-bit timestamp, with some salt for synchronization. Those are: msb, top, and bottom The issue is, the rb_time_cmpxchg() did not properly salt the msb portion, and the msb that was written was stale. Link: https://lore.kernel.org/linux-trace-kernel/20231215084114.20899342@ro= rschach.local.home Cc: stable@vger.kernel.org Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Mathieu Desnoyers Fixes: f03f2abce4f39 ("ring-buffer: Have 32 bit time stamps use all 64 bits= ") Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ring_buffer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index f22a849da179..f4679013289b 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -722,10 +722,12 @@ static bool rb_time_cmpxchg(rb_time_t *t, u64 expect,= u64 set) cnt2 =3D cnt + 1; =20 rb_time_split(val, &top, &bottom, &msb); + msb =3D rb_time_val_cnt(msb, cnt); top =3D rb_time_val_cnt(top, cnt); bottom =3D rb_time_val_cnt(bottom, cnt); =20 rb_time_split(set, &top2, &bottom2, &msb2); + msb2 =3D rb_time_val_cnt(msb2, cnt); top2 =3D rb_time_val_cnt(top2, cnt2); bottom2 =3D rb_time_val_cnt(bottom2, cnt2); =20 --=20 2.42.0