Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1215142

[tip:perf/core] tracing/uprobes: Do not print '0x (null)' when offset is 0

Show all headers | View raw

Commit-ID:  a2fb3382edbea83c6f2bf6ac15e3673b2e254aad
Gitweb:     http://git.kernel.org/tip/a2fb3382edbea83c6f2bf6ac15e3673b2e254aad
Author:     Wang Nan <wangnan0@huawei.com>
AuthorDate: Wed, 26 Aug 2015 10:57:46 +0000
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 26 Aug 2015 10:43:01 -0300

tracing/uprobes: Do not print '0x (null)' when offset is 0

When manually added uprobe point with zero address, 'uprobe_events'
output '(null)' instead of 0x00000000:

  # echo p:probe_libc/abs_0 /path/to/lib.bin:0x0 arg1=%ax > \
            /sys/kernel/debug/tracing/uprobe_events

  # cat /sys/kernel/debug/tracing/uprobe_events
    p:probe_libc/abs_0 /path/to/lib.bin:0x          (null) arg1=%ax

 This patch fixes this behavior:

  # cat /sys/kernel/debug/tracing/uprobe_events
  p:probe_libc/abs_0 /path/to/lib.bin:0x0000000000000000

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1440586666-235233-8-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 kernel/trace/trace_uprobe.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index f97479f..d2f6d0b 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -601,7 +601,22 @@ static int probes_seq_show(struct seq_file *m, void *v)
 
 	seq_printf(m, "%c:%s/%s", c, tu->tp.call.class->system,
 			trace_event_name(&tu->tp.call));
-	seq_printf(m, " %s:0x%p", tu->filename, (void *)tu->offset);
+	seq_printf(m, " %s:", tu->filename);
+
+	/* Don't print "0x  (null)" when offset is 0 */
+	if (tu->offset) {
+		seq_printf(m, "0x%p", (void *)tu->offset);
+	} else {
+		switch (sizeof(void *)) {
+		case 4:
+			seq_printf(m, "0x00000000");
+			break;
+		case 8:
+		default:
+			seq_printf(m, "0x0000000000000000");
+			break;
+		}
+	}
 
 	for (i = 0; i < tu->tp.nr_args; i++)
 		seq_printf(m, " %s=%s", tu->tp.args[i].name, tu->tp.args[i].comm);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/6] perf probe, tracing/uprobes: Support probing at absolute address Wang Nan <wangnan0@huawei.com> - 2015-08-26 13:00 +0200
  [PATCH v3 6/6] tracing/uprobes: Do not print '0x (null)' when offset is 0 Wang Nan <wangnan0@huawei.com> - 2015-08-26 13:00 +0200
    [tip:perf/core] tracing/uprobes: Do not print '0x (null)'   when offset is 0 tip-bot for Wang Nan <tipbot@zytor.com> - 2015-08-28 08:50 +0200
  [PATCH v3 2/6] perf probe: Fix list result when symbol can't be found Wang Nan <wangnan0@huawei.com> - 2015-08-26 13:00 +0200
    RE: [PATCH v3 2/6] perf probe: Fix list result when symbol can't be  found 平松雅巳 / HIRAMATU，MASAMI   <masami.hiramatsu.pt@hitachi.com> - 2015-08-26 14:30 +0200
    [tip:perf/core] perf probe: Fix list result when symbol can'  t be found tip-bot for Wang Nan <tipbot@zytor.com> - 2015-08-28 08:50 +0200
  [PATCH v3 5/6] perf probe: Support probing at absolute address Wang Nan <wangnan0@huawei.com> - 2015-08-26 13:00 +0200
    RE: [PATCH v3 5/6] perf probe: Support probing at absolute address 平松雅巳 / HIRAMATU，MASAMI   <masami.hiramatsu.pt@hitachi.com> - 2015-08-26 14:20 +0200
    [tip:perf/core] perf probe: Support probing at absolute address tip-bot for Wang Nan <tipbot@zytor.com> - 2015-08-28 08:50 +0200
  [PATCH v3 4/6] perf probe: Fix error reported when offset without function Wang Nan <wangnan0@huawei.com> - 2015-08-26 13:00 +0200
    RE: [PATCH v3 4/6] perf probe: Fix error reported when offset  without function 平松雅巳 / HIRAMATU，MASAMI   <masami.hiramatsu.pt@hitachi.com> - 2015-08-26 14:30 +0200
    [tip:perf/core] perf probe:   Fix error reported when offset without function tip-bot for Wang Nan <tipbot@zytor.com> - 2015-08-28 08:50 +0200
  [PATCH v3 3/6] perf probe: Fix list result when address is zero Wang Nan <wangnan0@huawei.com> - 2015-08-26 13:10 +0200
    RE: [PATCH v3 3/6] perf probe: Fix list result when address is zero 平松雅巳 / HIRAMATU，MASAMI   <masami.hiramatsu.pt@hitachi.com> - 2015-08-26 14:20 +0200
    [tip:perf/core] perf probe: Fix list result when address is zero tip-bot for Wang Nan <tipbot@zytor.com> - 2015-08-28 08:50 +0200
  Re: [PATCH v3 2/6] perf probe: Fix list result when neither dwarf  nor map can't find symbol "Wangnan (F)" <wangnan0@huawei.com> - 2015-08-26 13:10 +0200
  [PATCH v3 2/6] perf probe: Fix list result when neither dwarf nor map can't find symbol Wang Nan <wangnan0@huawei.com> - 2015-08-26 13:10 +0200

csiph-web