From nobody Wed Feb 11 16:49:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11EF4C77B6F for ; Mon, 10 Apr 2023 07:09:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229672AbjDJHJX (ORCPT ); Mon, 10 Apr 2023 03:09:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229575AbjDJHJT (ORCPT ); Mon, 10 Apr 2023 03:09:19 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C66BA30D6; Mon, 10 Apr 2023 00:09:18 -0700 (PDT) Received: from kwepemi500013.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Pw0QC2d9PzKxq8; Mon, 10 Apr 2023 15:06:43 +0800 (CST) Received: from M910t.huawei.com (10.110.54.157) by kwepemi500013.china.huawei.com (7.221.188.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 10 Apr 2023 15:09:15 +0800 From: Changbin Du To: Arnaldo Carvalho de Melo , Peter Zijlstra , Ingo Molnar CC: Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , , , Hui Wang , Changbin Du Subject: [PATCH v3 1/2] perf script: print raw ip instead of binary offset for callchain Date: Mon, 10 Apr 2023 15:08:57 +0800 Message-ID: <20230410070858.4051548-2-changbin.du@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230410070858.4051548-1-changbin.du@huawei.com> References: <20230410070858.4051548-1-changbin.du@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.110.54.157] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemi500013.china.huawei.com (7.221.188.120) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Before this, the raw ip is printed for non-callchain and dso offset for callchain. This inconsistent output for address may confuse people. And mostly what we expect is the raw ip. 'dso offset' is printed in callchain: $ perf script ... ls 1341034 2739463.008343: 2162417 cycles: ffffffff99d657a7 [unknown] ([unknown]) ffffffff99e00b67 [unknown] ([unknown]) 235d3 memset+0x53 (/usr/lib/x86_64-linux-gnu/ld-2.31.so)= # dso offset a61b _dl_map_object+0x1bb (/usr/lib/x86_64-linux-gnu/ld= -2.31.so) raw ip is printed for non-callchain: $ perf script -G ... ls 1341034 2739463.008876: 2053304 cycles: ffffffffc1596923 [un= known] ([unknown]) ls 1341034 2739463.009381: 1917049 cycles: 14def8e149e6 __s= trcoll_l+0xd96 (/usr/lib/x86_64-linux-gnu/libc-2.31.so) # raw ip Let's have consistent output for it. Later I'll add a new field 'dsoff' to print dso offset. Signed-off-by: Changbin Du --- tools/perf/util/evsel_fprintf.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/evsel_fprintf.c b/tools/perf/util/evsel_fprint= f.c index bd22c4932d10..1fb8044d402e 100644 --- a/tools/perf/util/evsel_fprintf.c +++ b/tools/perf/util/evsel_fprintf.c @@ -153,13 +153,8 @@ int sample__fprintf_callchain(struct perf_sample *samp= le, int left_alignment, if (map) addr =3D map->map_ip(map, node->ip); =20 - if (print_ip) { - /* Show binary offset for userspace addr */ - if (map && !map->dso->kernel) - printed +=3D fprintf(fp, "%c%16" PRIx64, s, addr); - else - printed +=3D fprintf(fp, "%c%16" PRIx64, s, node->ip); - } + if (print_ip) + printed +=3D fprintf(fp, "%c%16" PRIx64, s, node->ip); =20 if (print_sym) { printed +=3D fprintf(fp, " "); --=20 2.25.1 From nobody Wed Feb 11 16:49:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4CEBC77B61 for ; Mon, 10 Apr 2023 07:09:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229699AbjDJHJZ (ORCPT ); Mon, 10 Apr 2023 03:09:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229642AbjDJHJV (ORCPT ); Mon, 10 Apr 2023 03:09:21 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A02630C8; Mon, 10 Apr 2023 00:09:20 -0700 (PDT) Received: from kwepemi500013.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Pw0QD4qBSzKxnw; Mon, 10 Apr 2023 15:06:44 +0800 (CST) Received: from M910t.huawei.com (10.110.54.157) by kwepemi500013.china.huawei.com (7.221.188.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 10 Apr 2023 15:09:16 +0800 From: Changbin Du To: Arnaldo Carvalho de Melo , Peter Zijlstra , Ingo Molnar CC: Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , , , Hui Wang , Changbin Du Subject: [PATCH v3 2/2] perf: script: add new output field 'dsoff' to print dso offset Date: Mon, 10 Apr 2023 15:08:58 +0800 Message-ID: <20230410070858.4051548-3-changbin.du@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230410070858.4051548-1-changbin.du@huawei.com> References: <20230410070858.4051548-1-changbin.du@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.110.54.157] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemi500013.china.huawei.com (7.221.188.120) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This adds a new 'dsoff' field to print dso offset for resolved symbols, and the offset is appended to dso name. Default output: $ perf script ls 2695501 3011030.487017: 500000 cycles: 152cc73ef4b5 get_= common_indices.constprop.0+0x155 (/usr/lib/x86_64-linux-gnu/ld-2.31.so) ls 2695501 3011030.487018: 500000 cycles: ffffffff99045b3e [unk= nown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffff9968e107 [unk= nown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffffc1f54afb [unk= nown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffff9968382f [unk= nown] ([unknown]) ls 2695501 3011030.487019: 500000 cycles: ffffffff99e00094 [unk= nown] ([unknown]) ls 2695501 3011030.487019: 500000 cycles: 152cc718a8d0 __er= rno_location@plt+0x0 (/usr/lib/x86_64-linux-gnu/libselinux.so.1) Display 'dsoff' field: $ perf script -F +dsoff ls 2695501 3011030.487017: 500000 cycles: 152cc73ef4b5 get_= common_indices.constprop.0+0x155 (/usr/lib/x86_64-linux-gnu/ld-2.31.so+0x1c= 4b5) ls 2695501 3011030.487018: 500000 cycles: ffffffff99045b3e [unk= nown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffff9968e107 [unk= nown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffffc1f54afb [unk= nown] ([unknown]) ls 2695501 3011030.487018: 500000 cycles: ffffffff9968382f [unk= nown] ([unknown]) ls 2695501 3011030.487019: 500000 cycles: ffffffff99e00094 [unk= nown] ([unknown]) ls 2695501 3011030.487019: 500000 cycles: 152cc718a8d0 __er= rno_location@plt+0x0 (/usr/lib/x86_64-linux-gnu/libselinux.so.1+0x68d0) ls 2695501 3011030.487019: 500000 cycles: ffffffff992a6db0 [unk= nown] ([unknown]) Signed-off-by: Changbin Du --- tools/perf/Documentation/perf-script.txt | 2 +- tools/perf/builtin-script.c | 9 ++++++++- tools/perf/util/evsel_fprintf.c | 6 ++++++ tools/perf/util/evsel_fprintf.h | 1 + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Document= ation/perf-script.txt index 777a0d8ba7d1..ff9a52e44688 100644 --- a/tools/perf/Documentation/perf-script.txt +++ b/tools/perf/Documentation/perf-script.txt @@ -130,7 +130,7 @@ OPTIONS -F:: --fields:: Comma separated list of fields to print. Options are: - comm, tid, pid, time, cpu, event, trace, ip, sym, dso, addr, symof= f, + comm, tid, pid, time, cpu, event, trace, ip, sym, dso, dsoff, addr= , symoff, srcline, period, iregs, uregs, brstack, brstacksym, flags, bpf-out= put, brstackinsn, brstackinsnlen, brstackoff, callindent, insn, insnlen= , synth, phys_addr, metric, misc, srccode, ipc, data_page_size, code_page_s= ize, ins_lat, diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index a792214d1af8..bdc5de94cf43 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -133,6 +133,7 @@ enum perf_output_field { PERF_OUTPUT_VCPU =3D 1ULL << 38, PERF_OUTPUT_CGROUP =3D 1ULL << 39, PERF_OUTPUT_RETIRE_LAT =3D 1ULL << 40, + PERF_OUTPUT_DSOFF =3D 1ULL << 41, }; =20 struct perf_script { @@ -174,6 +175,7 @@ struct output_option { {.str =3D "ip", .field =3D PERF_OUTPUT_IP}, {.str =3D "sym", .field =3D PERF_OUTPUT_SYM}, {.str =3D "dso", .field =3D PERF_OUTPUT_DSO}, + {.str =3D "dsoff", .field =3D PERF_OUTPUT_DSOFF}, {.str =3D "addr", .field =3D PERF_OUTPUT_ADDR}, {.str =3D "symoff", .field =3D PERF_OUTPUT_SYMOFFSET}, {.str =3D "srcline", .field =3D PERF_OUTPUT_SRCLINE}, @@ -574,6 +576,11 @@ static void set_print_ip_opts(struct perf_event_attr *= attr) if (PRINT_FIELD(DSO)) output[type].print_ip_opts |=3D EVSEL__PRINT_DSO; =20 + if (PRINT_FIELD(DSOFF)) { + /* 'dsoff' implys 'dso' field for printing */ + output[type].print_ip_opts |=3D EVSEL__PRINT_DSO | EVSEL__PRINT_DSOFF; + } + if (PRINT_FIELD(SYMOFFSET)) output[type].print_ip_opts |=3D EVSEL__PRINT_SYMOFFSET; =20 @@ -3881,7 +3888,7 @@ int cmd_script(int argc, const char **argv) "comma separated output fields prepend with 'type:'. " "+field to add and -field to remove." "Valid types: hw,sw,trace,raw,synth. " - "Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso," + "Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso,dsoff" "addr,symoff,srcline,period,iregs,uregs,brstack," "brstacksym,flags,data_src,weight,bpf-output,brstackinsn," "brstackinsnlen,brstackoff,callindent,insn,insnlen,synth," diff --git a/tools/perf/util/evsel_fprintf.c b/tools/perf/util/evsel_fprint= f.c index 1fb8044d402e..ae8333772c76 100644 --- a/tools/perf/util/evsel_fprintf.c +++ b/tools/perf/util/evsel_fprintf.c @@ -116,6 +116,7 @@ int sample__fprintf_callchain(struct perf_sample *sampl= e, int left_alignment, int print_ip =3D print_opts & EVSEL__PRINT_IP; int print_sym =3D print_opts & EVSEL__PRINT_SYM; int print_dso =3D print_opts & EVSEL__PRINT_DSO; + int print_dsoff =3D print_opts & EVSEL__PRINT_DSOFF; int print_symoffset =3D print_opts & EVSEL__PRINT_SYMOFFSET; int print_oneline =3D print_opts & EVSEL__PRINT_ONELINE; int print_srcline =3D print_opts & EVSEL__PRINT_SRCLINE; @@ -174,6 +175,8 @@ int sample__fprintf_callchain(struct perf_sample *sampl= e, int left_alignment, if (print_dso && (!sym || !sym->inlined)) { printed +=3D fprintf(fp, " ("); printed +=3D map__fprintf_dsoname(map, fp); + if (print_dsoff && map && map->dso) + printed +=3D fprintf(fp, "+0x%lx", addr); printed +=3D fprintf(fp, ")"); } =20 @@ -209,6 +212,7 @@ int sample__fprintf_sym(struct perf_sample *sample, str= uct addr_location *al, int print_ip =3D print_opts & EVSEL__PRINT_IP; int print_sym =3D print_opts & EVSEL__PRINT_SYM; int print_dso =3D print_opts & EVSEL__PRINT_DSO; + int print_dsoff =3D print_opts & EVSEL__PRINT_DSOFF; int print_symoffset =3D print_opts & EVSEL__PRINT_SYMOFFSET; int print_srcline =3D print_opts & EVSEL__PRINT_SRCLINE; int print_unknown_as_addr =3D print_opts & EVSEL__PRINT_UNKNOWN_AS_ADDR; @@ -237,6 +241,8 @@ int sample__fprintf_sym(struct perf_sample *sample, str= uct addr_location *al, if (print_dso) { printed +=3D fprintf(fp, " ("); printed +=3D map__fprintf_dsoname(al->map, fp); + if (print_dsoff && al->map && al->map->dso) + printed +=3D fprintf(fp, "+0x%lx", al->addr); printed +=3D fprintf(fp, ")"); } =20 diff --git a/tools/perf/util/evsel_fprintf.h b/tools/perf/util/evsel_fprint= f.h index 3093d096c29f..c8a9fac2f2dd 100644 --- a/tools/perf/util/evsel_fprintf.h +++ b/tools/perf/util/evsel_fprintf.h @@ -26,6 +26,7 @@ int evsel__fprintf(struct evsel *evsel, struct perf_attr_= details *details, FILE #define EVSEL__PRINT_UNKNOWN_AS_ADDR (1<<6) #define EVSEL__PRINT_CALLCHAIN_ARROW (1<<7) #define EVSEL__PRINT_SKIP_IGNORED (1<<8) +#define EVSEL__PRINT_DSOFF (1<<9) =20 struct addr_location; struct perf_event_attr; --=20 2.25.1