[PATCH 1/2] tracing: Exit out immediately after update_marker_trace()

Steven Rostedt posted 2 patches 1 month, 1 week ago
[PATCH 1/2] tracing: Exit out immediately after update_marker_trace()
Posted by Steven Rostedt 1 month, 1 week ago
From: Steven Rostedt <rostedt@goodmis.org>

The call to update_marker_trace() in set_tracer_flag() performs the update
to the tr->trace_flags. There's no reason to perform it again after it is
called. Return immediately instead.

Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
 kernel/trace/trace.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index dea1566b3301..07bd10808277 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -5285,8 +5285,11 @@ int set_tracer_flag(struct trace_array *tr, u64 mask, int enabled)
 		}
 	}
 
-	if (mask == TRACE_ITER(COPY_MARKER))
+	if (mask == TRACE_ITER(COPY_MARKER)) {
 		update_marker_trace(tr, enabled);
+		/* update_marker_trace updates the tr->trace_flags */
+		return 0;
+	}
 
 	if (enabled)
 		tr->trace_flags |= mask;
-- 
2.51.0
Re: [PATCH 1/2] tracing: Exit out immediately after update_marker_trace()
Posted by Masami Hiramatsu (Google) 1 month, 1 week ago
On Wed, 05 Nov 2025 19:33:25 -0500
Steven Rostedt <rostedt@kernel.org> wrote:

> From: Steven Rostedt <rostedt@goodmis.org>
> 
> The call to update_marker_trace() in set_tracer_flag() performs the update
> to the tr->trace_flags. There's no reason to perform it again after it is
> called. Return immediately instead.
> 

Looks good to me.

Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>

Thanks,

> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
> ---
>  kernel/trace/trace.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index dea1566b3301..07bd10808277 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -5285,8 +5285,11 @@ int set_tracer_flag(struct trace_array *tr, u64 mask, int enabled)
>  		}
>  	}
>  
> -	if (mask == TRACE_ITER(COPY_MARKER))
> +	if (mask == TRACE_ITER(COPY_MARKER)) {
>  		update_marker_trace(tr, enabled);
> +		/* update_marker_trace updates the tr->trace_flags */
> +		return 0;
> +	}
>  
>  	if (enabled)
>  		tr->trace_flags |= mask;
> -- 
> 2.51.0
> 
> 


-- 
Masami Hiramatsu (Google) <mhiramat@kernel.org>