[PATCH 1/2] tracing: introduce TRACE_EVENT_FN_COND macro

[Denis Kirjanov]

On 11/24/15, Denis Kirjanov <kda at linux-powerpc.org> wrote:
> TRACE_EVENT_FN can't be used in some circumstances
> like invoking trace functions from offlined CPU due
> to RCU usage.
>
> This patch adds the TRACE_EVENT_FN_COND macro
> to make such trace points conditional.
>
> Signed-off-by: Denis Kirjanov <kda at linux-powerpc.org>

Hi Steven,
are you going to take this series through your tree?

Thanks!

> ---
>  include/linux/tracepoint.h   | 4 ++++
>  include/trace/define_trace.h | 6 ++++++
>  include/trace/trace_events.h | 6 ++++++
>  3 files changed, 16 insertions(+)
>
> diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
> index 696a339c..45b3fcf 100644
> --- a/include/linux/tracepoint.h
> +++ b/include/linux/tracepoint.h
> @@ -493,6 +493,10 @@ extern void syscall_unregfunc(void);
>  #define TRACE_EVENT_FN(name, proto, args, struct,		\
>  		assign, print, reg, unreg)			\
>  	DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
> +#define TRACE_EVENT_FN_COND(name, proto, args, cond, struct,		\
> +		assign, print, reg, unreg)			\
> +	DECLARE_TRACE_CONDITION(name, PARAMS(proto),	\
> +			PARAMS(args), PARAMS(cond))
>  #define TRACE_EVENT_CONDITION(name, proto, args, cond,		\
>  			      struct, assign, print)		\
>  	DECLARE_TRACE_CONDITION(name, PARAMS(proto),		\
> diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h
> index 2d8639e..6e3945f 100644
> --- a/include/trace/define_trace.h
> +++ b/include/trace/define_trace.h
> @@ -40,6 +40,11 @@
>  		assign, print, reg, unreg)			\
>  	DEFINE_TRACE_FN(name, reg, unreg)
>
> +#undef TRACE_EVENT_FN_COND
> +#define TRACE_EVENT_FN_COND(name, proto, args, cond, tstruct,		\
> +		assign, print, reg, unreg)			\
> +	DEFINE_TRACE_FN(name, reg, unreg)
> +
>  #undef DEFINE_EVENT
>  #define DEFINE_EVENT(template, name, proto, args) \
>  	DEFINE_TRACE(name)
> @@ -93,6 +98,7 @@
>
>  #undef TRACE_EVENT
>  #undef TRACE_EVENT_FN
> +#undef TRACE_EVENT_FN_COND
>  #undef TRACE_EVENT_CONDITION
>  #undef DECLARE_EVENT_CLASS
>  #undef DEFINE_EVENT
> diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h
> index de996cf..170c93b 100644
> --- a/include/trace/trace_events.h
> +++ b/include/trace/trace_events.h
> @@ -123,6 +123,12 @@ TRACE_MAKE_SYSTEM_STR();
>  	TRACE_EVENT(name, PARAMS(proto), PARAMS(args),			\
>  		PARAMS(tstruct), PARAMS(assign), PARAMS(print))		\
>
> +#undef TRACE_EVENT_FN_COND
> +#define TRACE_EVENT_FN_COND(name, proto, args, cond, tstruct,	\
> +		assign, print, reg, unreg)				\
> +	TRACE_EVENT_CONDITION(name, PARAMS(proto), PARAMS(args), PARAMS(cond),		\
> +		PARAMS(tstruct), PARAMS(assign), PARAMS(print))		\
> +
>  #undef TRACE_EVENT_FLAGS
>  #define TRACE_EVENT_FLAGS(name, value)					\
>  	__TRACE_EVENT_FLAGS(name, value)
> --
> 2.4.0
>
>