diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2024-01-18 14:21:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2024-01-18 14:21:22 -0800 |
| commit | 5b890ad456b16a5b45e7f86d9708d7248e73d0f8 (patch) | |
| tree | b9ccb1036930a1fe6668115ef4c65eb1039b14cd /kernel/trace | |
| parent | Merge tag 's390-6.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/... (diff) | |
| parent | trace/kprobe: Display the actual notrace function when rejecting a probe (diff) | |
| download | linux-5b890ad456b16a5b45e7f86d9708d7248e73d0f8.tar.gz linux-5b890ad456b16a5b45e7f86d9708d7248e73d0f8.tar.bz2 linux-5b890ad456b16a5b45e7f86d9708d7248e73d0f8.zip | |
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
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_kprobe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 52f8b537dd0a..c4c6e0e0068b 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -487,8 +487,8 @@ static int __register_trace_kprobe(struct trace_kprobe *tk) return -EINVAL; if (within_notrace_func(tk)) { - pr_warn("Could not probe notrace function %s\n", - trace_kprobe_symbol(tk)); + pr_warn("Could not probe notrace function %ps\n", + (void *)trace_kprobe_address(tk)); return -EINVAL; } |