ring-buffer: Fix refcount setting of boot mapped buffers

Commit Message

Steven Rostedt Oct. 11, 2024, 8:52 p.m. UTC

From: Steven Rostedt <[e-mail]>

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.

Fixes: e645535a954ad ("tracing: Add option to use memmapped memory for trace boot instance")
Signed-off-by: Steven Rostedt (Google) <[e-mail]>
---
 kernel/trace/trace.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Masami Hiramatsu (Google) Oct. 12, 2024, 5:20 a.m. UTC | #1

On Fri, 11 Oct 2024 16:52:24 -0400
Steven Rostedt <[e-mail]> wrote:

> From: Steven Rostedt <[e-mail]>
> 
> 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) <[e-mail]>

Thank you,

> Fixes: e645535a954ad ("tracing: Add option to use memmapped memory for trace boot instance")
> Signed-off-by: Steven Rostedt (Google) <[e-mail]>
> ---
>  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
>

Patch

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);