Commit 7da89495 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt (VMware)
Browse files

tracing: Show kretprobe unknown indicator only for kretprobe_trampoline 

ftrace shows "[unknown/kretprobe'd]" indicator all addresses in the
kretprobe_trampoline, but the modified address by kretprobe should
be only kretprobe_trampoline+0.

Link: https://lkml.kernel.org/r/163163056044.489837.794883849706638013.stgit@devnote2



Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Acked-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Tested-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 19138af1

kernel/trace/trace_output.c

+4 −13
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/ftrace.h>

#include <linux/kprobes.h>

#include <linux/sched/clock.h>

#include <linux/sched/mm.h>
@@ -346,22 +347,12 @@ int trace_output_call(struct trace_iterator *iter, char *name, char *fmt, ...) 
}

EXPORT_SYMBOL_GPL(trace_output_call);



#ifdef CONFIG_KRETPROBES

static inline const char *kretprobed(const char *name)

static inline const char *kretprobed(const char *name, unsigned long addr)

{

	static const char tramp_name[] = "__kretprobe_trampoline";

	int size = sizeof(tramp_name);



	if (strncmp(tramp_name, name, size) == 0)

	if (is_kretprobe_trampoline(addr))

		return "[unknown/kretprobe'd]";

	return name;

}

#else

static inline const char *kretprobed(const char *name)

{

	return name;

}

#endif /* CONFIG_KRETPROBES */



void

trace_seq_print_sym(struct trace_seq *s, unsigned long address, bool offset)
@@ -374,7 +365,7 @@ trace_seq_print_sym(struct trace_seq *s, unsigned long address, bool offset) 
		sprint_symbol(str, address);

	else

		kallsyms_lookup(address, NULL, NULL, NULL, str);

	name = kretprobed(str);

	name = kretprobed(str, address);



	if (name && strlen(name)) {

		trace_seq_puts(s, name);