Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756689AbbHZKAq (ORCPT ); Wed, 26 Aug 2015 06:00:46 -0400 Received: from mail9.hitachi.co.jp ([133.145.228.44]:56204 "EHLO mail9.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756643AbbHZKAo (ORCPT ); Wed, 26 Aug 2015 06:00:44 -0400 From: =?utf-8?B?5bmz5p2+6ZuF5bezIC8gSElSQU1BVFXvvIxNQVNBTUk=?= To: "'Wang Nan'" , "acme@kernel.org" , "rostedt@goodmis.org" CC: "mingo@redhat.com" , "namhyung@kernel.org" , "pi3orama@163.com" , "linux-kernel@vger.kernel.org" , sysp-manager Subject: RE: [PATCH v2 4/4] tracing/uprobes: Do not print '0x (null)' when offset is 0 Thread-Topic: [PATCH v2 4/4] tracing/uprobes: Do not print '0x (null)' when offset is 0 Thread-Index: AQHQ39KJ3QRuJpyLxEOhqusvJ7znmp4d+kLA Date: Wed, 26 Aug 2015 10:00:40 +0000 Message-ID: <50399556C9727B4D88A595C8584AAB37524EC7FA@GSjpTKYDCembx32.service.hitachi.net> References: <1440574825-221187-1-git-send-email-wangnan0@huawei.com> <1440574825-221187-5-git-send-email-wangnan0@huawei.com> In-Reply-To: <1440574825-221187-5-git-send-email-wangnan0@huawei.com> Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.198.219.51] Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id t7QA0oWt024107 Content-Length: 2117 Lines: 66 > From: Wang Nan [mailto: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 Looks Good to me :) Acked-by: Masami Hiramatsu Thanks! > > Signed-off-by: Wang Nan > Cc: Arnaldo Carvalho de Melo > Cc: Ingo Molnar > Cc: Masami Hiramatsu > Cc: Namhyung Kim > Cc: Steven Rostedt > --- > 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 ????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m???? ????????I?