tracing: Dump stacktrace trigger to the corresponding instance
authorDaniel Bristot de Oliveira <bristot@kernel.org>
Sun, 20 Feb 2022 22:49:57 +0000 (23:49 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 Mar 2022 10:48:02 +0000 (11:48 +0100)
commit ce33c845b030c9cf768370c951bc699470b09fa7 upstream.

The stacktrace event trigger is not dumping the stacktrace to the instance
where it was enabled, but to the global "instance."

Use the private_data, pointing to the trigger file, to figure out the
corresponding trace instance, and use it in the trigger action, like
snapshot_trigger does.

Link: https://lkml.kernel.org/r/afbb0b4f18ba92c276865bc97204d438473f4ebc.1645396236.git.bristot@kernel.org
Cc: stable@vger.kernel.org
Fixes: ae63b31e4d0e2 ("tracing: Separate out trace events from global variables")
Reviewed-by: Tom Zanussi <zanussi@kernel.org>
Tested-by: Tom Zanussi <zanussi@kernel.org>
Signed-off-by: Daniel Bristot de Oliveira <bristot@kernel.org>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/trace/trace_events_trigger.c

index 3d5c072..1a41b68 100644 (file)
@@ -1200,7 +1200,12 @@ stacktrace_trigger(struct event_trigger_data *data,
                   struct trace_buffer *buffer,  void *rec,
                   struct ring_buffer_event *event)
 {
-       trace_dump_stack(STACK_SKIP);
+       struct trace_event_file *file = data->private_data;
+
+       if (file)
+               __trace_stack(file->tr, tracing_gen_ctx(), STACK_SKIP);
+       else
+               trace_dump_stack(STACK_SKIP);
 }
 
 static void