tracing: Update function trace addresses with module addresses

Now that module addresses are saved in the persistent ring buffer, their
addresses can be used to adjust the address in the persistent ring buffer
to the address of the module that is currently loaded.

Instead of blindly using the text_delta that only works for core kernel
code, call the trace_adjust_address() that will see if the address matches
an address saved in the persistent ring buffer, and then uses that against
the matching module if it is loaded.

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: https://lore.kernel.org/20250506111648.5df7f3ec@gandalf.local.home
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index b9ab06c9954323a427217835aece13f6bb420f34..aab6816f02495b3be82d4ff324865e26ee11f1e0 100644 (file)
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -1086,11 +1086,11 @@ enum print_line_t trace_nop_print(struct trace_iterator *iter, int flags,
 }
 
 static void print_fn_trace(struct trace_seq *s, unsigned long ip,
-                          unsigned long parent_ip, long delta,
-                          unsigned long *args, int flags)
+                          unsigned long parent_ip, unsigned long *args,
+                          struct trace_array *tr, int flags)
 {
-       ip += delta;
-       parent_ip += delta;
+       ip = trace_adjust_address(tr, ip);
+       parent_ip = trace_adjust_address(tr, parent_ip);
 
        seq_print_ip_sym(s, ip, flags);
        if (args)
@@ -1119,8 +1119,7 @@ static enum print_line_t trace_fn_trace(struct trace_iterator *iter, int flags,
        else
                args = NULL;
 
-       print_fn_trace(s, field->ip, field->parent_ip, iter->tr->text_delta,
-                      args, flags);
+       print_fn_trace(s, field->ip, field->parent_ip, args, iter->tr, flags);
        trace_seq_putc(s, '\n');
 
        return trace_handle_return(s);
@@ -1706,7 +1705,7 @@ static enum print_line_t trace_print_print(struct trace_iterator *iter,
 
        trace_assign_type(field, iter->ent);
 
-       ip = field->ip + iter->tr->text_delta;
+       ip = trace_adjust_address(iter->tr, field->ip);
 
        seq_print_ip_sym(s, ip, flags);
        trace_seq_printf(s, ": %s", field->buf);
@@ -1792,7 +1791,7 @@ trace_func_repeats_print(struct trace_iterator *iter, int flags,
 
        trace_assign_type(field, iter->ent);
 
-       print_fn_trace(s, field->ip, field->parent_ip, iter->tr->text_delta, NULL, flags);
+       print_fn_trace(s, field->ip, field->parent_ip, NULL, iter->tr, flags);
        trace_seq_printf(s, " (repeats: %u, last_ts:", field->count);
        trace_print_time(s, iter,
                         iter->ts - FUNC_REPEATS_GET_DELTA_TS(field));