Skip to content

Commit

Permalink
ring-buffer: Fix refcount setting of boot mapped buffers
Browse files Browse the repository at this point in the history
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 <[email protected]>
Link: https://lore.kernel.org/[email protected]
Fixes: e645535 ("tracing: Add option to use memmapped memory for trace boot instance")
Reviewed-by: Masami Hiramatsu (Google) <[email protected]>
Signed-off-by: Steven Rostedt (Google) <[email protected]>
  • Loading branch information
rostedt committed Oct 14, 2024
1 parent 912da2c commit 2cf9733
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions kernel/trace/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 2cf9733

Please sign in to comment.