On Fri, 11 Oct 2024 16:52:24 -0400 Steven Rostedt <[email protected]> wrote:
> From: Steven Rostedt <[email protected]> > > 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. > Looks good to me. Reviewed-by: Masami Hiramatsu (Google) <[email protected]> Thank you, > Fixes: e645535a954ad ("tracing: Add option to use memmapped memory for trace > boot instance") > Signed-off-by: Steven Rostedt (Google) <[email protected]> > --- > kernel/trace/trace.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c > index c01375adc471..5ba40f39c8b5 100644 > --- a/kernel/trace/trace.c > +++ b/kernel/trace/trace.c > @@ -10610,10 +10610,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); > -- > 2.45.2 > -- Masami Hiramatsu (Google) <[email protected]>
