* [PATCH] tracing: Have all triggers expect a file parameter
@ 2026-02-06 15:13 Steven Rostedt
2026-02-08 4:06 ` Masami Hiramatsu
2026-02-08 22:49 ` Tom Zanussi
0 siblings, 2 replies; 3+ messages in thread
From: Steven Rostedt @ 2026-02-06 15:13 UTC (permalink / raw)
To: LKML, Linux Trace Kernel; +Cc: Masami Hiramatsu, Mathieu Desnoyers, Tom Zanussi
From: Steven Rostedt <rostedt@goodmis.org>
When the triggers were first created, they may not have had a file
parameter passed to them and things needed to be done generically.
But today, all triggers have a file parameter passed to them. Remove the
generic code and add a "if (WARN_ON_ONCE(!file))" to each trigger.
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
kernel/trace/trace_events_trigger.c | 62 +++++++++++------------------
1 file changed, 24 insertions(+), 38 deletions(-)
diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
index 06b75bcfc7b8..7fa26327c9c7 100644
--- a/kernel/trace/trace_events_trigger.c
+++ b/kernel/trace/trace_events_trigger.c
@@ -1347,18 +1347,13 @@ traceon_trigger(struct event_trigger_data *data,
{
struct trace_event_file *file = data->private_data;
- if (file) {
- if (tracer_tracing_is_on(file->tr))
- return;
-
- tracer_tracing_on(file->tr);
+ if (WARN_ON_ONCE(!file))
return;
- }
- if (tracing_is_on())
+ if (tracer_tracing_is_on(file->tr))
return;
- tracing_on();
+ tracer_tracing_on(file->tr);
}
static bool
@@ -1368,13 +1363,11 @@ traceon_count_func(struct event_trigger_data *data,
{
struct trace_event_file *file = data->private_data;
- if (file) {
- if (tracer_tracing_is_on(file->tr))
- return false;
- } else {
- if (tracing_is_on())
- return false;
- }
+ if (WARN_ON_ONCE(!file))
+ return false;
+
+ if (tracer_tracing_is_on(file->tr))
+ return false;
if (!data->count)
return false;
@@ -1392,18 +1385,13 @@ traceoff_trigger(struct event_trigger_data *data,
{
struct trace_event_file *file = data->private_data;
- if (file) {
- if (!tracer_tracing_is_on(file->tr))
- return;
-
- tracer_tracing_off(file->tr);
+ if (WARN_ON_ONCE(!file))
return;
- }
- if (!tracing_is_on())
+ if (!tracer_tracing_is_on(file->tr))
return;
- tracing_off();
+ tracer_tracing_off(file->tr);
}
static bool
@@ -1413,13 +1401,11 @@ traceoff_count_func(struct event_trigger_data *data,
{
struct trace_event_file *file = data->private_data;
- if (file) {
- if (!tracer_tracing_is_on(file->tr))
- return false;
- } else {
- if (!tracing_is_on())
- return false;
- }
+ if (WARN_ON_ONCE(!file))
+ return false;
+
+ if (!tracer_tracing_is_on(file->tr))
+ return false;
if (!data->count)
return false;
@@ -1481,10 +1467,10 @@ snapshot_trigger(struct event_trigger_data *data,
{
struct trace_event_file *file = data->private_data;
- if (file)
- tracing_snapshot_instance(file->tr);
- else
- tracing_snapshot();
+ if (WARN_ON_ONCE(!file))
+ return;
+
+ tracing_snapshot_instance(file->tr);
}
static int
@@ -1570,10 +1556,10 @@ stacktrace_trigger(struct event_trigger_data *data,
{
struct trace_event_file *file = data->private_data;
- if (file)
- __trace_stack(file->tr, tracing_gen_ctx_dec(), STACK_SKIP);
- else
- trace_dump_stack(STACK_SKIP);
+ if (WARN_ON_ONCE(!file))
+ return;
+
+ __trace_stack(file->tr, tracing_gen_ctx_dec(), STACK_SKIP);
}
static int
--
2.51.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] tracing: Have all triggers expect a file parameter
2026-02-06 15:13 [PATCH] tracing: Have all triggers expect a file parameter Steven Rostedt
@ 2026-02-08 4:06 ` Masami Hiramatsu
2026-02-08 22:49 ` Tom Zanussi
1 sibling, 0 replies; 3+ messages in thread
From: Masami Hiramatsu @ 2026-02-08 4:06 UTC (permalink / raw)
To: Steven Rostedt
Cc: LKML, Linux Trace Kernel, Masami Hiramatsu, Mathieu Desnoyers,
Tom Zanussi
On Fri, 6 Feb 2026 10:13:51 -0500
Steven Rostedt <rostedt@goodmis.org> wrote:
> From: Steven Rostedt <rostedt@goodmis.org>
>
> When the triggers were first created, they may not have had a file
> parameter passed to them and things needed to be done generically.
>
> But today, all triggers have a file parameter passed to them. Remove the
> generic code and add a "if (WARN_ON_ONCE(!file))" to each trigger.
>
Looks good to me.
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Thanks,
> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
> ---
> kernel/trace/trace_events_trigger.c | 62 +++++++++++------------------
> 1 file changed, 24 insertions(+), 38 deletions(-)
>
> diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
> index 06b75bcfc7b8..7fa26327c9c7 100644
> --- a/kernel/trace/trace_events_trigger.c
> +++ b/kernel/trace/trace_events_trigger.c
> @@ -1347,18 +1347,13 @@ traceon_trigger(struct event_trigger_data *data,
> {
> struct trace_event_file *file = data->private_data;
>
> - if (file) {
> - if (tracer_tracing_is_on(file->tr))
> - return;
> -
> - tracer_tracing_on(file->tr);
> + if (WARN_ON_ONCE(!file))
> return;
> - }
>
> - if (tracing_is_on())
> + if (tracer_tracing_is_on(file->tr))
> return;
>
> - tracing_on();
> + tracer_tracing_on(file->tr);
> }
>
> static bool
> @@ -1368,13 +1363,11 @@ traceon_count_func(struct event_trigger_data *data,
> {
> struct trace_event_file *file = data->private_data;
>
> - if (file) {
> - if (tracer_tracing_is_on(file->tr))
> - return false;
> - } else {
> - if (tracing_is_on())
> - return false;
> - }
> + if (WARN_ON_ONCE(!file))
> + return false;
> +
> + if (tracer_tracing_is_on(file->tr))
> + return false;
>
> if (!data->count)
> return false;
> @@ -1392,18 +1385,13 @@ traceoff_trigger(struct event_trigger_data *data,
> {
> struct trace_event_file *file = data->private_data;
>
> - if (file) {
> - if (!tracer_tracing_is_on(file->tr))
> - return;
> -
> - tracer_tracing_off(file->tr);
> + if (WARN_ON_ONCE(!file))
> return;
> - }
>
> - if (!tracing_is_on())
> + if (!tracer_tracing_is_on(file->tr))
> return;
>
> - tracing_off();
> + tracer_tracing_off(file->tr);
> }
>
> static bool
> @@ -1413,13 +1401,11 @@ traceoff_count_func(struct event_trigger_data *data,
> {
> struct trace_event_file *file = data->private_data;
>
> - if (file) {
> - if (!tracer_tracing_is_on(file->tr))
> - return false;
> - } else {
> - if (!tracing_is_on())
> - return false;
> - }
> + if (WARN_ON_ONCE(!file))
> + return false;
> +
> + if (!tracer_tracing_is_on(file->tr))
> + return false;
>
> if (!data->count)
> return false;
> @@ -1481,10 +1467,10 @@ snapshot_trigger(struct event_trigger_data *data,
> {
> struct trace_event_file *file = data->private_data;
>
> - if (file)
> - tracing_snapshot_instance(file->tr);
> - else
> - tracing_snapshot();
> + if (WARN_ON_ONCE(!file))
> + return;
> +
> + tracing_snapshot_instance(file->tr);
> }
>
> static int
> @@ -1570,10 +1556,10 @@ stacktrace_trigger(struct event_trigger_data *data,
> {
> struct trace_event_file *file = data->private_data;
>
> - if (file)
> - __trace_stack(file->tr, tracing_gen_ctx_dec(), STACK_SKIP);
> - else
> - trace_dump_stack(STACK_SKIP);
> + if (WARN_ON_ONCE(!file))
> + return;
> +
> + __trace_stack(file->tr, tracing_gen_ctx_dec(), STACK_SKIP);
> }
>
> static int
> --
> 2.51.0
>
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] tracing: Have all triggers expect a file parameter
2026-02-06 15:13 [PATCH] tracing: Have all triggers expect a file parameter Steven Rostedt
2026-02-08 4:06 ` Masami Hiramatsu
@ 2026-02-08 22:49 ` Tom Zanussi
1 sibling, 0 replies; 3+ messages in thread
From: Tom Zanussi @ 2026-02-08 22:49 UTC (permalink / raw)
To: Steven Rostedt, LKML, Linux Trace Kernel
Cc: Masami Hiramatsu, Mathieu Desnoyers
Hi Steve,
On Fri, 2026-02-06 at 10:13 -0500, Steven Rostedt wrote:
> From: Steven Rostedt <rostedt@goodmis.org>
>
> When the triggers were first created, they may not have had a file
> parameter passed to them and things needed to be done generically.
>
> But today, all triggers have a file parameter passed to them. Remove the
> generic code and add a "if (WARN_ON_ONCE(!file))" to each trigger.
>
Makes sense.
Reviewed-by: Tom Zanussi <zanussi@kernel.org>
> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
> ---
> kernel/trace/trace_events_trigger.c | 62 +++++++++++------------------
> 1 file changed, 24 insertions(+), 38 deletions(-)
>
> diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
> index 06b75bcfc7b8..7fa26327c9c7 100644
> --- a/kernel/trace/trace_events_trigger.c
> +++ b/kernel/trace/trace_events_trigger.c
> @@ -1347,18 +1347,13 @@ traceon_trigger(struct event_trigger_data *data,
> {
> struct trace_event_file *file = data->private_data;
>
> - if (file) {
> - if (tracer_tracing_is_on(file->tr))
> - return;
> -
> - tracer_tracing_on(file->tr);
> + if (WARN_ON_ONCE(!file))
> return;
> - }
>
> - if (tracing_is_on())
> + if (tracer_tracing_is_on(file->tr))
> return;
>
> - tracing_on();
> + tracer_tracing_on(file->tr);
> }
>
> static bool
> @@ -1368,13 +1363,11 @@ traceon_count_func(struct event_trigger_data *data,
> {
> struct trace_event_file *file = data->private_data;
>
> - if (file) {
> - if (tracer_tracing_is_on(file->tr))
> - return false;
> - } else {
> - if (tracing_is_on())
> - return false;
> - }
> + if (WARN_ON_ONCE(!file))
> + return false;
> +
> + if (tracer_tracing_is_on(file->tr))
> + return false;
>
> if (!data->count)
> return false;
> @@ -1392,18 +1385,13 @@ traceoff_trigger(struct event_trigger_data *data,
> {
> struct trace_event_file *file = data->private_data;
>
> - if (file) {
> - if (!tracer_tracing_is_on(file->tr))
> - return;
> -
> - tracer_tracing_off(file->tr);
> + if (WARN_ON_ONCE(!file))
> return;
> - }
>
> - if (!tracing_is_on())
> + if (!tracer_tracing_is_on(file->tr))
> return;
>
> - tracing_off();
> + tracer_tracing_off(file->tr);
> }
>
> static bool
> @@ -1413,13 +1401,11 @@ traceoff_count_func(struct event_trigger_data *data,
> {
> struct trace_event_file *file = data->private_data;
>
> - if (file) {
> - if (!tracer_tracing_is_on(file->tr))
> - return false;
> - } else {
> - if (!tracing_is_on())
> - return false;
> - }
> + if (WARN_ON_ONCE(!file))
> + return false;
> +
> + if (!tracer_tracing_is_on(file->tr))
> + return false;
>
> if (!data->count)
> return false;
> @@ -1481,10 +1467,10 @@ snapshot_trigger(struct event_trigger_data *data,
> {
> struct trace_event_file *file = data->private_data;
>
> - if (file)
> - tracing_snapshot_instance(file->tr);
> - else
> - tracing_snapshot();
> + if (WARN_ON_ONCE(!file))
> + return;
> +
> + tracing_snapshot_instance(file->tr);
> }
>
> static int
> @@ -1570,10 +1556,10 @@ stacktrace_trigger(struct event_trigger_data *data,
> {
> struct trace_event_file *file = data->private_data;
>
> - if (file)
> - __trace_stack(file->tr, tracing_gen_ctx_dec(), STACK_SKIP);
> - else
> - trace_dump_stack(STACK_SKIP);
> + if (WARN_ON_ONCE(!file))
> + return;
> +
> + __trace_stack(file->tr, tracing_gen_ctx_dec(), STACK_SKIP);
> }
>
> static int
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-02-08 22:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-06 15:13 [PATCH] tracing: Have all triggers expect a file parameter Steven Rostedt
2026-02-08 4:06 ` Masami Hiramatsu
2026-02-08 22:49 ` Tom Zanussi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox