]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ring-buffer: Fix refcount setting of boot mapped buffers
authorSteven Rostedt <rostedt@goodmis.org>
Fri, 11 Oct 2024 20:52:24 +0000 (16:52 -0400)
committerSteven Rostedt (Google) <rostedt@goodmis.org>
Mon, 14 Oct 2024 18:30:59 +0000 (14:30 -0400)
A ring buffer which has its buffered mapped at boot up to fixed memory
should not be freed. Other buffers can be. The ref counting setup was
wrong for both. It made the not mapped buffers ref count have zero, and the
boot mapped buffer a ref count of 1. But an normally allocated buffer
should be 1, where it can be removed.

Keep the ref count of a normal boot buffer with its setup ref count (do
not decrement it), and increment the fixed memory boot mapped buffer's ref
count.

Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Link: https://lore.kernel.org/20241011165224.33dd2624@gandalf.local.home
Fixes: e645535a954ad ("tracing: Add option to use memmapped memory for trace boot instance")
Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
kernel/trace/trace.c

index 1c69ca1f108865e59ad42424890de6233d6161ae..a8f52b6527ca3aad4fb52945f5d221b4973b2e23 100644 (file)
@@ -10621,10 +10621,10 @@ __init static void enable_instances(void)
                 * cannot be deleted by user space, so keep the reference
                 * to it.
                 */
-               if (start)
+               if (start) {
                        tr->flags |= TRACE_ARRAY_FL_BOOT;
-               else
-                       trace_array_put(tr);
+                       tr->ref++;
+               }
 
                while ((tok = strsep(&curr_str, ","))) {
                        early_enable_events(tr, tok, true);