Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756766AbbHZMOe (ORCPT ); Wed, 26 Aug 2015 08:14:34 -0400 Received: from mail4.hitachi.co.jp ([133.145.228.5]:60018 "EHLO mail4.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751288AbbHZMOc (ORCPT ); Wed, 26 Aug 2015 08:14:32 -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" , "lizefan@huawei.com" , "linux-kernel@vger.kernel.org" , sysp-manager Subject: RE: [PATCH v3 3/6] perf probe: Fix list result when address is zero Thread-Topic: [PATCH v3 3/6] perf probe: Fix list result when address is zero Thread-Index: AQHQ3+4qsySwrKe2jk2+xJlgB+w4n54eHpjg Date: Wed, 26 Aug 2015 12:14:29 +0000 Message-ID: <50399556C9727B4D88A595C8584AAB37524EC9E2@GSjpTKYDCembx32.service.hitachi.net> References: <1440586666-235233-1-git-send-email-wangnan0@huawei.com> <1440586666-235233-5-git-send-email-wangnan0@huawei.com> In-Reply-To: <1440586666-235233-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 t7QCEeEU024661 Content-Length: 2631 Lines: 82 > From: Wang Nan [mailto:wangnan0@huawei.com] > > When manually added uprobe point with zero address, 'perf probe -l' > reports error. For example: > > # echo p:probe_libc/abs_0 /path/to/lib.bin:0x0 arg1=%ax > \ > /sys/kernel/debug/tracing/uprobe_events > > # perf probe -l > Error: Failed to show event list. > > Probing at 0x0 is possible and useful when lib.bin is not a normal > shared object but is manually mapped. However, in this case kernel > report: > > # cat /sys/kernel/debug/tracing/uprobe_events > p:probe_libc/abs_0 /path/to/lib.bin:0x (null) arg1=%ax > > This patch supports the above kernel output. OK, 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 > --- > tools/perf/util/probe-event.c | 28 +++++++++++++++++++++++++--- > 1 file changed, 25 insertions(+), 3 deletions(-) > > diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c > index f7bacbb..926bcec 100644 > --- a/tools/perf/util/probe-event.c > +++ b/tools/perf/util/probe-event.c > @@ -1519,9 +1519,31 @@ int parse_probe_trace_command(const char *cmd, struct probe_trace_event *tev) > } else > p = argv[1]; > fmt1_str = strtok_r(p, "+", &fmt); > - if (fmt1_str[0] == '0') /* only the address started with 0x */ > - tp->address = strtoul(fmt1_str, NULL, 0); > - else { > + /* only the address started with 0x */ > + if (fmt1_str[0] == '0') { > + /* > + * Fix a special case: > + * if address == 0, kernel reports something like: > + * p:probe_libc/abs_0 /lib/libc-2.18.so:0x (null) arg1=%ax > + * Newer kernel may fix that, but we want to > + * support old kernel also. > + */ > + if (strcmp(fmt1_str, "0x") == 0) { > + if (!argv[2] || strcmp(argv[2], "(null)")) { > + ret = -EINVAL; > + goto out; > + } > + tp->address = 0; > + > + free(argv[2]); > + for (i = 2; argv[i + 1] != NULL; i++) > + argv[i] = argv[i + 1]; > + > + argv[i] = NULL; > + argc -= 1; > + } else > + tp->address = strtoul(fmt1_str, NULL, 0); > + } else { > /* Only the symbol-based probe has offset */ > tp->symbol = strdup(fmt1_str); > if (tp->symbol == NULL) { > -- > 1.8.3.4 ????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m???? ????????I?