From nobody Mon Feb 9 12:01:01 2026 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 6D875136E3F for ; Sun, 23 Mar 2025 05:08:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742706535; cv=none; b=luqKcTYKYjuObxggHGzwdcM1KlNaVUPwTA7BZZSPUVaK0616In1n3mHHypw7RwiaX0a1MMF2JhT23ukqFiVqLPpkkKtCOw7f2fxG5jjU5WJFmTTpjAOZ5qAAqwc5kn5meBaYmZLj1OMzJ8crj0t56ofW1v4EmbYT7/SxJYRKIEc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742706535; c=relaxed/simple; bh=P50jUIRYNPDF1+7DYvV/qhb2YN3tv7N1DLLjMTixseI=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=rnJLxZMHhol+TycV5MqNiRjQOVKh7BMgyTmJueMUPe2Tuy87HmiGTzRqS5vJpzhqwvFpQD6c28FpLVet8Ef2KJKTP+6OVLoDzfz2F5FveqWGAdVjnp8dr5prVqBlLm/h6qMGPQqymcPmmz2t0pto6DZRLpw7iNIe4KCmHMc5+qA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED812C4CEE2; Sun, 23 Mar 2025 05:08:54 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.98) (envelope-from ) id 1twDaX-00000001wzc-2RMf; Sun, 23 Mar 2025 01:09:33 -0400 Message-ID: <20250323050933.430831510@goodmis.org> User-Agent: quilt/0.68 Date: Sun, 23 Mar 2025 01:09:15 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton Subject: [for-next][PATCH 1/4] tracing: Fix a compilation error without CONFIG_MODULES References: <20250323050914.459621318@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: "Masami Hiramatsu (Google)" There are some code which depends on CONFIG_MODULES. #ifdef to enclose it. Cc: Mathieu Desnoyers Link: https://lore.kernel.org/174230515367.2909896.8132122175220657625.stgi= t@mhiramat.tok.corp.google.com Fixes: dca91c1c5468 ("tracing: Have persistent trace instances save module = addresses") Signed-off-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index c3c79908766e..68abea81e51a 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6001,6 +6001,7 @@ struct trace_scratch { =20 static DEFINE_MUTEX(scratch_mutex); =20 +#ifdef CONFIG_MODULES static int save_mod(struct module *mod, void *data) { struct trace_array *tr =3D data; @@ -6025,6 +6026,12 @@ static int save_mod(struct module *mod, void *data) =20 return 0; } +#else +static int save_mod(struct module *mod, void *data) +{ + return 0; +} +#endif =20 static void update_last_data(struct trace_array *tr) { --=20 2.47.2 From nobody Mon Feb 9 12:01:01 2026 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 9C21220102B for ; Sun, 23 Mar 2025 05:08:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742706535; cv=none; b=EbhN6qsiI0bMKQEPZKYQxpRiByH7UDgQRY6LGgGgKIRw9AancuYTzlSM5vfmTwFuO1EG1+lTcdcDLago5vXJmQUF6S17rQtkD1+4bCvwQw6MsKu5AbawamoryGdY6wOEdNeIEAcyoU3Rj3roNnd8HCPs3mM6RuWCqz1LI3fXWLw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742706535; c=relaxed/simple; bh=+s7BMcybeVwmnT3dHMb0ZKh1i0RPHR00Npbn+PrAVlM=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=UTMJN2iN39OtYYQ6ooLQ/CG2wmSkfW7gEQh0q6k7B+EJ5nx9yBtXhvFfEhH/lleOW4wnoz0UCw/58vpQzGAaii6KNWzJ3WMt5ngtl0M3j1ISlwYveB5qi0sbz2zwpsJpBTK3I7XY6zQjPTAvRr2HmeWB8zN46GRdGRf98FDtToM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3417EC4CEEF; Sun, 23 Mar 2025 05:08:55 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.98) (envelope-from ) id 1twDaX-00000001x06-38qj; Sun, 23 Mar 2025 01:09:33 -0400 Message-ID: <20250323050933.602569205@goodmis.org> User-Agent: quilt/0.68 Date: Sun, 23 Mar 2025 01:09:16 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Dan Carpenter Subject: [for-next][PATCH 2/4] tracing: Initialize scratch_size to zero to prevent UB References: <20250323050914.459621318@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 In allocate_trace_buffer() the following code: buf->buffer =3D ring_buffer_alloc_range(size, rb_flags, 0, tr->range_addr_start, tr->range_addr_size, struct_size(tscratch, entries, 128)); tscratch =3D ring_buffer_meta_scratch(buf->buffer, &scratch_size); setup_trace_scratch(tr, tscratch, scratch_size); Has undefined behavior if ring_buffer_alloc_range() fails because "scratch_size" is not initialize. If the allocation fails, then buf->buffer will be NULL. The ring_buffer_meta_scratch() will return NULL immediately if it is passed a NULL buffer and it will not update scratch_size. Then setup_trace_scratch() will return immediately if tscratch is NULL. Although there's no real issue here, but it is considered undefined behavior to pass an uninitialized variable to a function as input, and UBSan may complain about it. Just initialize scratch_size to zero to make the code defined behavior and a little more robust. Link: https://lore.kernel.org/all/44c5deaa-b094-4852-90f9-52f3fb10e67a@stan= ley.mountain/ Reported-by: Dan Carpenter Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 68abea81e51a..be97465485b3 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -9394,7 +9394,7 @@ allocate_trace_buffer(struct trace_array *tr, struct = array_buffer *buf, int size { enum ring_buffer_flags rb_flags; struct trace_scratch *tscratch; - unsigned int scratch_size; + unsigned int scratch_size =3D 0; =20 rb_flags =3D tr->trace_flags & TRACE_ITER_OVERWRITE ? RB_FL_OVERWRITE : 0; =20 --=20 2.47.2 From nobody Mon Feb 9 12:01:01 2026 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 9D6C220102C for ; Sun, 23 Mar 2025 05:08:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742706535; cv=none; b=dAacPqn0FUrOM+m5Kqo/huDa2DY68iN6bCchUouEsAh6oTZ/GR1zc/2dUuyZ1+YCvb+X10tKKhGFX2AoFEQtakeEH8TglWRiQlHTwi1BT/OBtRgt9yJNl0rcO5mFJBFmCdSU3FXVXFSRgyTReIWzuHO6zHdmpcFNpwJRJcirMB0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742706535; c=relaxed/simple; bh=bD8t0AIpqh8YqpWgl6s1KSM/pPLnaCgmd1WcfZa1bYc=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=apeRTaSItBxfS5s3Mvt3BX8WnLZYrBj+vyjc7po0Qm1AxLscMpvifH3OUShQaoYR4hLRsDomPJzK8OnuaxJqLTFDvPKSyb5BSCLEnwPND+5fPaj4i9lD/dj+NPm2SMQPvVliEOcFYfPLBpfnjLbiKw3HodzaBHP04+Rc2tSFx2c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B892C4CEF1; Sun, 23 Mar 2025 05:08:55 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.98) (envelope-from ) id 1twDaX-00000001x0a-3rTT; Sun, 23 Mar 2025 01:09:33 -0400 Message-ID: <20250323050933.770518233@goodmis.org> User-Agent: quilt/0.68 Date: Sun, 23 Mar 2025 01:09:17 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton Subject: [for-next][PATCH 3/4] tracing: Skip update_last_data() if cleared and remove active check for save_mod() References: <20250323050914.459621318@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: "Masami Hiramatsu (Google)" If the last boot data is already cleared, there is no reason to update it again. Skip if the TRACE_ARRAY_FL_LAST_BOOT is cleared. Also, for calling save_mod() when module loading, we don't need to check the trace is active or not because any module address can be on the stacktrace. Cc: Mark Rutland Cc: Mathieu Desnoyers Link: https://lore.kernel.org/174165660328.1173316.15529357882704817499.stg= it@devnote2 Signed-off-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index be97465485b3..0be048fecc89 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6040,6 +6040,12 @@ static void update_last_data(struct trace_array *tr) if (!(tr->flags & TRACE_ARRAY_FL_BOOT)) return; =20 + if (!(tr->flags & TRACE_ARRAY_FL_LAST_BOOT)) + return; + + /* Only if the buffer has previous boot data clear and update it. */ + tr->flags &=3D ~TRACE_ARRAY_FL_LAST_BOOT; + /* Reset the module list and reload them */ if (tr->scratch) { struct trace_scratch *tscratch =3D tr->scratch; @@ -6052,9 +6058,6 @@ static void update_last_data(struct trace_array *tr) module_for_each_mod(save_mod, tr); } =20 - if (!(tr->flags & TRACE_ARRAY_FL_LAST_BOOT)) - return; - /* * Need to clear all CPU buffers as there cannot be events * from the previous boot mixed with events with this boot @@ -6077,7 +6080,6 @@ static void update_last_data(struct trace_array *tr) #else tscratch->kaslr_addr =3D 0; #endif - tr->flags &=3D ~TRACE_ARRAY_FL_LAST_BOOT; } =20 /** @@ -10099,15 +10101,6 @@ static void trace_module_remove_evals(struct modul= e *mod) static inline void trace_module_remove_evals(struct module *mod) { } #endif /* CONFIG_TRACE_EVAL_MAP_FILE */ =20 -static bool trace_array_active(struct trace_array *tr) -{ - if (tr->current_trace !=3D &nop_trace) - return true; - - /* 0 is no events, 1 is all disabled */ - return trace_events_enabled(tr, NULL) > 1; -} - static void trace_module_record(struct module *mod) { struct trace_array *tr; @@ -10116,11 +10109,8 @@ static void trace_module_record(struct module *mod) /* Update any persistent trace array that has already been started */ if ((tr->flags & (TRACE_ARRAY_FL_BOOT | TRACE_ARRAY_FL_LAST_BOOT)) =3D= =3D TRACE_ARRAY_FL_BOOT) { - /* Only update if the trace array is active */ - if (trace_array_active(tr)) { - guard(mutex)(&scratch_mutex); - save_mod(mod, tr); - } + guard(mutex)(&scratch_mutex); + save_mod(mod, tr); } } } --=20 2.47.2 From nobody Mon Feb 9 12:01:01 2026 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 0AB06202993 for ; Sun, 23 Mar 2025 05:08:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742706537; cv=none; b=t62AEa0NVPEyZIbw+n76pPem5U1IERFiX7phi+kXuxOuvhIKKKM5s7XZCrTaRTUFwlhcx94W5NaIWMmmILgcHwfU3bn390r+Qx1uN6KVRi/SIGWrM59Yn4mSl7t81l5yBxospkcDKUAQLDAY1ncWJ2tX+NFF6obfkyMBeT72nX8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742706537; c=relaxed/simple; bh=z1CpyVs8YeB3s7kVIV8MfD1Z/fa0HB9KogiZjwRwKdE=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=JWdG40Vl9UhOZbeaJ1jH6P/RwLPXNH4zyhheUM1F0UE6IN1E/1bZR67b5Zd45l+tyynSer1FlSYYm7weUhJU/AfTPrGMmtI2T5mwioNDNmOEtRay1T6gMOjCnCR9MeEqRbuS8D67bUWPNinGD1bgJWuRI3R5OgW+DPbUcbIx50U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78FF6C4CEE4; Sun, 23 Mar 2025 05:08:55 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.98) (envelope-from ) id 1twDaY-00000001x14-0NLI; Sun, 23 Mar 2025 01:09:34 -0400 Message-ID: <20250323050933.941248766@goodmis.org> User-Agent: quilt/0.68 Date: Sun, 23 Mar 2025 01:09:18 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Abaci Robot , Jiapeng Chong Subject: [for-next][PATCH 4/4] ring-buffer: Remove the unused variable bmeta References: <20250323050914.459621318@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Jiapeng Chong Variable bmeta is not effectively used, so delete it. kernel/trace/ring_buffer.c:1952:27: warning: variable =E2=80=98bmeta=E2=80= =99 set but not used. Link: https://lore.kernel.org/20250317015524.3902-1-jiapeng.chong@linux.ali= baba.com Reported-by: Abaci Robot Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=3D19524 Signed-off-by: Jiapeng Chong Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ring_buffer.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 94be81edffd2..302b1404213c 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -1949,7 +1949,6 @@ static void rb_meta_validate_events(struct ring_buffe= r_per_cpu *cpu_buffer) static void rb_range_meta_init(struct trace_buffer *buffer, int nr_pages, = int scratch_size) { struct ring_buffer_cpu_meta *meta; - struct ring_buffer_meta *bmeta; unsigned long *subbuf_mask; unsigned long delta; void *subbuf; @@ -1964,8 +1963,6 @@ static void rb_range_meta_init(struct trace_buffer *b= uffer, int nr_pages, int sc if (rb_meta_init(buffer, scratch_size)) valid =3D true; =20 - bmeta =3D buffer->meta; - for (cpu =3D 0; cpu < nr_cpu_ids; cpu++) { void *next_meta; =20 --=20 2.47.2