Re: [PATCH] tracing: Fix DECLARE_TRACE_CONDITION

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

On Tue, 28 Jan 2025 12:19:26 +0100
Gabriele Monaco <gmonaco@redhat.com> wrote:

> Commit 287050d39026 ("tracing: Add TRACE_EVENT_CONDITIONAL()") adds
> macros to define conditional trace events (TRACE_EVENT_CONDITIONAL) and
> tracepoints (DECLARE_TRACE_CONDITION), but sets up functionality for
> direct use only for the former.
> Any attempt to use DECLARE_TRACE_CONDITION fails the build.
> 
> Add preprocessor bits in define_trace.h to allow usage of
> DECLARE_TRACE_CONDITION just like DECLARE_TRACE.
> 
> Fixes: 287050d39026 ("tracing: Add TRACE_EVENT_CONDITIONAL()")
> Signed-off-by: Gabriele Monaco <gmonaco@redhat.com>

Looks good to me.

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

Thank you,

> ---
>  include/trace/define_trace.h | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h
> index e1c1079f8c8d..ed52d0506c69 100644
> --- a/include/trace/define_trace.h
> +++ b/include/trace/define_trace.h
> @@ -76,6 +76,10 @@
>  #define DECLARE_TRACE(name, proto, args)	\
>  	DEFINE_TRACE(name, PARAMS(proto), PARAMS(args))
>  
> +#undef DECLARE_TRACE_CONDITION
> +#define DECLARE_TRACE_CONDITION(name, proto, args, cond)	\
> +	DEFINE_TRACE(name, PARAMS(proto), PARAMS(args))
> +
>  /* If requested, create helpers for calling these tracepoints from Rust. */
>  #ifdef CREATE_RUST_TRACE_POINTS
>  #undef DEFINE_RUST_DO_TRACE
> @@ -108,6 +112,8 @@
>  /* Make all open coded DECLARE_TRACE nops */
>  #undef DECLARE_TRACE
>  #define DECLARE_TRACE(name, proto, args)
> +#undef DECLARE_TRACE_CONDITION
> +#define DECLARE_TRACE_CONDITION(name, proto, args, cond)
>  
>  #ifdef TRACEPOINTS_ENABLED
>  #include <trace/trace_events.h>
> @@ -129,6 +135,7 @@
>  #undef DEFINE_EVENT_CONDITION
>  #undef TRACE_HEADER_MULTI_READ
>  #undef DECLARE_TRACE
> +#undef DECLARE_TRACE_CONDITION
>  
>  /* Only undef what we defined in this file */
>  #ifdef UNDEF_TRACE_INCLUDE_FILE
> 
> base-commit: 9c5968db9e625019a0ee5226c7eebef5519d366a
> -- 
> 2.48.1
> 


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