From: Wang Nan <wangnan0@huawei.com>
To: <acme@kernel.org>, <masami.hiramatsu.pt@hitachi.com>,
<rostedt@goodmis.org>
Cc: <mingo@redhat.com>, <namhyung@kernel.org>, <pi3orama@163.com>,
<lizefan@huawei.com>, <linux-kernel@vger.kernel.org>,
Wang Nan <wangnan0@huawei.com>
Subject: [PATCH v3 6/6] tracing/uprobes: Do not print '0x (null)' when offset is 0
Date: Wed, 26 Aug 2015 10:57:46 +0000 [thread overview]
Message-ID: <1440586666-235233-8-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1440586666-235233-1-git-send-email-wangnan0@huawei.com>
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: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
---
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);
--
1.8.3.4
next prev parent reply other threads:[~2015-08-26 10:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-26 10:57 [PATCH v3 0/6] perf probe, tracing/uprobes: Support probing at absolute address Wang Nan
2015-08-26 10:57 ` [PATCH v3 1/6] perf probe: Prevent segfault when reading probe point with " Wang Nan
2015-08-26 10:57 ` [PATCH v3 2/6] perf probe: Fix list result when neither dwarf nor map can't find symbol Wang Nan
2015-08-26 11:03 ` Wangnan (F)
2015-08-26 10:57 ` [PATCH v3 2/6] perf probe: Fix list result when symbol can't be found Wang Nan
2015-08-26 12:27 ` 平松雅巳 / HIRAMATU,MASAMI
2015-08-28 6:41 ` [tip:perf/core] perf probe: Fix list result when symbol can' t " tip-bot for Wang Nan
2015-08-26 10:57 ` [PATCH v3 3/6] perf probe: Fix list result when address is zero Wang Nan
2015-08-26 12:14 ` 平松雅巳 / HIRAMATU,MASAMI
2015-08-28 6:42 ` [tip:perf/core] " tip-bot for Wang Nan
2015-08-26 10:57 ` [PATCH v3 4/6] perf probe: Fix error reported when offset without function Wang Nan
2015-08-26 12:21 ` 平松雅巳 / HIRAMATU,MASAMI
2015-08-28 6:42 ` [tip:perf/core] " tip-bot for Wang Nan
2015-08-26 10:57 ` [PATCH v3 5/6] perf probe: Support probing at absolute address Wang Nan
2015-08-26 12:16 ` 平松雅巳 / HIRAMATU,MASAMI
2015-08-28 6:42 ` [tip:perf/core] " tip-bot for Wang Nan
2015-08-26 10:57 ` Wang Nan [this message]
2015-08-28 6:43 ` [tip:perf/core] tracing/uprobes: Do not print '0x (null)' when offset is 0 tip-bot for Wang Nan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440586666-235233-8-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=acme@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=pi3orama@163.com \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®