From: Daniel Bristot de Oliveira <bristot@kernel.org>
Date: Sun, 20 Feb 2022 23:49:57 +0100
Subject: tracing: Dump stacktrace trigger to the corresponding instance
Git-commit: ce33c845b030c9cf768370c951bc699470b09fa7
Patch-mainline: v5.17-rc6
References: git-fixes

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>
[ mb: adapted to older code base ]
Acked-by: Miroslav Benes <mbenes@suse.cz>
---
 kernel/trace/trace_events_trigger.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

--- a/kernel/trace/trace_events_trigger.c
+++ b/kernel/trace/trace_events_trigger.c
@@ -1162,7 +1162,17 @@ static __init int register_trigger_snaps
 static void
 stacktrace_trigger(struct event_trigger_data *data, void *rec)
 {
-	trace_dump_stack(STACK_SKIP);
+	struct trace_event_file *file = data->private_data;
+	unsigned long flags;
+	int pc;
+
+	if (file) {
+		local_save_flags(flags);
+		pc = preempt_count();
+		__trace_stack(file->tr, flags, STACK_SKIP, pc);
+	} else {
+		trace_dump_stack(STACK_SKIP);
+	}
 }
 
 static void