Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752813AbbH1Gnw (ORCPT ); Fri, 28 Aug 2015 02:43:52 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54838 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752765AbbH1Gn0 (ORCPT ); Fri, 28 Aug 2015 02:43:26 -0400 Date: Thu, 27 Aug 2015 23:43:09 -0700 From: tip-bot for Wang Nan Message-ID: Cc: rostedt@goodmis.org, wangnan0@huawei.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, lizefan@huawei.com, mingo@kernel.org, tglx@linutronix.de, acme@redhat.com, hpa@zytor.com, masami.hiramatsu.pt@hitachi.com Reply-To: namhyung@kernel.org, lizefan@huawei.com, linux-kernel@vger.kernel.org, rostedt@goodmis.org, wangnan0@huawei.com, mingo@kernel.org, acme@redhat.com, hpa@zytor.com, masami.hiramatsu.pt@hitachi.com, tglx@linutronix.de In-Reply-To: <1440586666-235233-8-git-send-email-wangnan0@huawei.com> References: <1440586666-235233-8-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tracing/uprobes: Do not print '0x (null)' when offset is 0 Git-Commit-ID: a2fb3382edbea83c6f2bf6ac15e3673b2e254aad X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2449 Lines: 68 Commit-ID: a2fb3382edbea83c6f2bf6ac15e3673b2e254aad Gitweb: http://git.kernel.org/tip/a2fb3382edbea83c6f2bf6ac15e3673b2e254aad Author: Wang Nan AuthorDate: Wed, 26 Aug 2015 10:57:46 +0000 Committer: Arnaldo Carvalho de Melo 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 Acked-by: Masami Hiramatsu Cc: Namhyung Kim Cc: Steven Rostedt Cc: Zefan Li 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 --- 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/