FAILED: patch "[PATCH] kprobes: Show address of kprobes if kallsyms does" failed to apply to 4.18-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 4.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
81365a947de453bcaba2558f8de5dadcffe05bc1Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <[email protected]>
Date: Sat, 28 Apr 2018 21:36:02 +0900
Subject: [PATCH] kprobes: Show address of kprobes if kallsyms does
Show probed address in debugfs kprobe list file as same as kallsyms does. This information is used for checking kprobes are placed in the expected address. So it should be able to compared with address in kallsyms.
Signed-off-by Masami Hiramatsu <[email protected]>
Cc Ananth N Mavinakayanahalli <[email protected]>
Cc Anil S Keshavamurthy <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc David Howells <[email protected]>
Cc David S . Miller <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Jon Medhurst <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Thomas Richter <[email protected]>
Cc Tobin C . Harding <[email protected]>
Cc Will Deacon <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
kernel/kprobes.c +9 -5
@@ -2226,19 +2226,23 @@ static void report_probe(struct seq_file *pi, struct kprobe *p, const char *sym, int offset, char *modname, struct kprobe *pp) { char *kprobe_type; +void *addr = p->addr;if (p->pre_handler == pre_handler_kretprobe) kprobe_type ="r" ;else kprobe_type ="k" ; +if (!kallsyms_show_value ()) + addr =NULL ; +if (sym) -seq_printf (pi,"%p %s %s+0x%x %s " , - p->addr, kprobe_type, sym, offset, +seq_printf (pi,"%px %s %s+0x%x %s " , + addr, kprobe_type, sym, offset, (modname ? modname :" " )); -else -seq_printf (pi,"%p %s %p " , - p->addr, kprobe_type, p->addr); +else /* try to use %pS */ +seq_printf (pi,"%px %s %pS " , + addr, kprobe_type, p->addr);if (!pp) pp = p;