Skip to content

Commit 5b890ad

Browse files
committed
Merge tag 'probes-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull probes update from Masami Hiramatsu: - Update the Kprobes trace event to show the actual function name in notrace-symbol warning. Instead of using the user specified symbol name, use "%ps" printk format to show the actual symbol at the probe address. Since kprobe event accepts the offset from symbol which is bigger than the symbol size, the user specified symbol may not be the actual probed symbol. * tag 'probes-v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: trace/kprobe: Display the actual notrace function when rejecting a probe
2 parents 302d185 + 9c556b7 commit 5b890ad

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

kernel/trace/trace_kprobe.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,8 +487,8 @@ static int __register_trace_kprobe(struct trace_kprobe *tk)
487487
return -EINVAL;
488488

489489
if (within_notrace_func(tk)) {
490-
pr_warn("Could not probe notrace function %s\n",
491-
trace_kprobe_symbol(tk));
490+
pr_warn("Could not probe notrace function %ps\n",
491+
(void *)trace_kprobe_address(tk));
492492
return -EINVAL;
493493
}
494494

0 commit comments

Comments
 (0)