[PATCH v4 3/7] kprobes: Show address of kprobes if kallsyms does

[Masami Hiramatsu]

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 <mhira...@kernel.org>
Cc: sta...@vger.kernel.org
---
 kernel/kprobes.c |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 6ec1b5e024bf..548903deaee5 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -2326,6 +2326,7 @@ 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";
@@ -2334,13 +2335,16 @@ static void report_probe(struct seq_file *pi, struct 
kprobe *p,
        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;