From nobody Wed Dec 17 19:02:43 2025 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 38714C77B71 for ; Tue, 18 Apr 2023 03:19:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230332AbjDRDTH (ORCPT ); Mon, 17 Apr 2023 23:19:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230170AbjDRDSu (ORCPT ); Mon, 17 Apr 2023 23:18:50 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C2EB59DF; Mon, 17 Apr 2023 20:18:48 -0700 (PDT) Received: from kwepemi500013.china.huawei.com (unknown [7.221.188.120]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Q0pyX3K6xzKs83; Tue, 18 Apr 2023 11:17:56 +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; Tue, 18 Apr 2023 11:18:45 +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 v5 1/3] perf script: print raw ip instead of binary offset for callchain Date: Tue, 18 Apr 2023 11:18:23 +0800 Message-ID: <20230418031825.1262579-2-changbin.du@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230418031825.1262579-1-changbin.du@huawei.com> References: <20230418031825.1262579-1-changbin.du@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.110.54.157] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500013.china.huawei.com (7.221.188.120) 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 Acked-by: Adrian Hunter --- 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 a09ac00810b7..cc80ec554c0a 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(map)->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 Dec 17 19:02:43 2025 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 9C868C77B71 for ; Tue, 18 Apr 2023 03:19:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230143AbjDRDTT (ORCPT ); Mon, 17 Apr 2023 23:19:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230106AbjDRDSz (ORCPT ); Mon, 17 Apr 2023 23:18:55 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 850F55FC5; Mon, 17 Apr 2023 20:18:49 -0700 (PDT) Received: from kwepemi500013.china.huawei.com (unknown [7.221.188.120]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Q0pvF2R4zzncDk; Tue, 18 Apr 2023 11:15:05 +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; Tue, 18 Apr 2023 11:18:46 +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 v5 2/3] perf: add helper map__fprintf_dsoname_dsoff Date: Tue, 18 Apr 2023 11:18:24 +0800 Message-ID: <20230418031825.1262579-3-changbin.du@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230418031825.1262579-1-changbin.du@huawei.com> References: <20230418031825.1262579-1-changbin.du@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.110.54.157] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500013.china.huawei.com (7.221.188.120) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This adds a helper function map__fprintf_dsoname_dsoff() to print dsoname with optional dso offset. Suggested-by: Adrian Hunter Signed-off-by: Changbin Du Acked-by: Adrian Hunter --- tools/perf/util/map.c | 13 +++++++++++++ tools/perf/util/map.h | 1 + 2 files changed, 14 insertions(+) diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index d81b6ca18ee9..7da96b41100f 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -445,6 +445,19 @@ size_t map__fprintf_dsoname(struct map *map, FILE *fp) return fprintf(fp, "%s", dsoname); } =20 +size_t map__fprintf_dsoname_dsoff(struct map *map, bool print_off, u64 add= r, FILE *fp) +{ + int printed =3D 0; + + printed +=3D fprintf(fp, " ("); + printed +=3D map__fprintf_dsoname(map, fp); + if (print_off && map && map__dso(map) && !map__dso(map)->kernel) + printed +=3D fprintf(fp, "+0x%" PRIx64, addr); + printed +=3D fprintf(fp, ")"); + + return printed; +} + char *map__srcline(struct map *map, u64 addr, struct symbol *sym) { if (map =3D=3D NULL) diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h index f89ab7c2d327..4cca211b6e66 100644 --- a/tools/perf/util/map.h +++ b/tools/perf/util/map.h @@ -175,6 +175,7 @@ static inline void __map__zput(struct map **map) =20 size_t map__fprintf(struct map *map, FILE *fp); size_t map__fprintf_dsoname(struct map *map, FILE *fp); +size_t map__fprintf_dsoname_dsoff(struct map *map, bool print_off, u64 add= r, FILE *fp); char *map__srcline(struct map *map, u64 addr, struct symbol *sym); int map__fprintf_srcline(struct map *map, u64 addr, const char *prefix, FILE *fp); --=20 2.25.1 From nobody Wed Dec 17 19:02:43 2025 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 8FCF6C77B71 for ; Tue, 18 Apr 2023 03:19:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230378AbjDRDTX (ORCPT ); Mon, 17 Apr 2023 23:19:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230248AbjDRDS4 (ORCPT ); Mon, 17 Apr 2023 23:18:56 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7026E6; Mon, 17 Apr 2023 20:18:50 -0700 (PDT) Received: from kwepemi500013.china.huawei.com (unknown [7.221.188.120]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Q0pxq3z4hzsR8C; Tue, 18 Apr 2023 11:17:19 +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; Tue, 18 Apr 2023 11:18:47 +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 v5 3/3] perf: script: add new output field 'dsoff' to print dso offset Date: Tue, 18 Apr 2023 11:18:25 +0800 Message-ID: <20230418031825.1262579-4-changbin.du@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230418031825.1262579-1-changbin.du@huawei.com> References: <20230418031825.1262579-1-changbin.du@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.110.54.157] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500013.china.huawei.com (7.221.188.120) 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 Acked-by: Adrian Hunter --- tools/perf/Documentation/perf-script.txt | 2 +- tools/perf/builtin-script.c | 60 ++++++++++-------------- tools/perf/util/evsel_fprintf.c | 16 +++---- tools/perf/util/evsel_fprintf.h | 1 + 4 files changed, 32 insertions(+), 47 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 8fba247b798c..e7cb8d904eb5 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,9 @@ static void set_print_ip_opts(struct perf_event_attr *a= ttr) if (PRINT_FIELD(DSO)) output[type].print_ip_opts |=3D EVSEL__PRINT_DSO; =20 + if (PRINT_FIELD(DSOFF)) + output[type].print_ip_opts |=3D EVSEL__PRINT_DSOFF; + if (PRINT_FIELD(SYMOFFSET)) output[type].print_ip_opts |=3D EVSEL__PRINT_SYMOFFSET; =20 @@ -627,6 +632,10 @@ static int perf_session__check_output_opt(struct perf_= session *session) if (evsel =3D=3D NULL) continue; =20 + /* 'dsoff' implys 'dso' field */ + if (output[j].fields & PERF_OUTPUT_DSOFF) + output[j].fields |=3D PERF_OUTPUT_DSO; + set_print_ip_opts(&evsel->core.attr); tod |=3D output[j].fields & PERF_OUTPUT_TOD; } @@ -929,18 +938,12 @@ static int perf_sample__fprintf_brstack(struct perf_s= ample *sample, } =20 printed +=3D fprintf(fp, " 0x%"PRIx64, from); - if (PRINT_FIELD(DSO)) { - printed +=3D fprintf(fp, "("); - printed +=3D map__fprintf_dsoname(alf.map, fp); - printed +=3D fprintf(fp, ")"); - } + if (PRINT_FIELD(DSO)) + printed +=3D map__fprintf_dsoname_dsoff(alf.map, PRINT_FIELD(DSOFF), al= f.addr, fp); =20 printed +=3D fprintf(fp, "/0x%"PRIx64, to); - if (PRINT_FIELD(DSO)) { - printed +=3D fprintf(fp, "("); - printed +=3D map__fprintf_dsoname(alt.map, fp); - printed +=3D fprintf(fp, ")"); - } + if (PRINT_FIELD(DSO)) + printed +=3D map__fprintf_dsoname_dsoff(alt.map, PRINT_FIELD(DSOFF), al= t.addr, fp); =20 printed +=3D print_bstack_flags(fp, entries + i); } @@ -972,18 +975,12 @@ static int perf_sample__fprintf_brstacksym(struct per= f_sample *sample, thread__find_symbol_fb(thread, sample->cpumode, to, &alt); =20 printed +=3D symbol__fprintf_symname_offs(alf.sym, &alf, fp); - if (PRINT_FIELD(DSO)) { - printed +=3D fprintf(fp, "("); - printed +=3D map__fprintf_dsoname(alf.map, fp); - printed +=3D fprintf(fp, ")"); - } + if (PRINT_FIELD(DSO)) + printed +=3D map__fprintf_dsoname_dsoff(alf.map, PRINT_FIELD(DSOFF), al= f.addr, fp); printed +=3D fprintf(fp, "%c", '/'); printed +=3D symbol__fprintf_symname_offs(alt.sym, &alt, fp); - if (PRINT_FIELD(DSO)) { - printed +=3D fprintf(fp, "("); - printed +=3D map__fprintf_dsoname(alt.map, fp); - printed +=3D fprintf(fp, ")"); - } + if (PRINT_FIELD(DSO)) + printed +=3D map__fprintf_dsoname_dsoff(alt.map, PRINT_FIELD(DSOFF), al= t.addr, fp); printed +=3D print_bstack_flags(fp, entries + i); } =20 @@ -1019,17 +1016,11 @@ static int perf_sample__fprintf_brstackoff(struct p= erf_sample *sample, to =3D map__dso_map_ip(alt.map, to); =20 printed +=3D fprintf(fp, " 0x%"PRIx64, from); - if (PRINT_FIELD(DSO)) { - printed +=3D fprintf(fp, "("); - printed +=3D map__fprintf_dsoname(alf.map, fp); - printed +=3D fprintf(fp, ")"); - } + if (PRINT_FIELD(DSO)) + printed +=3D map__fprintf_dsoname_dsoff(alf.map, PRINT_FIELD(DSOFF), al= f.addr, fp); printed +=3D fprintf(fp, "/0x%"PRIx64, to); - if (PRINT_FIELD(DSO)) { - printed +=3D fprintf(fp, "("); - printed +=3D map__fprintf_dsoname(alt.map, fp); - printed +=3D fprintf(fp, ")"); - } + if (PRINT_FIELD(DSO)) + printed +=3D map__fprintf_dsoname_dsoff(alt.map, PRINT_FIELD(DSOFF), al= t.addr, fp); printed +=3D print_bstack_flags(fp, entries + i); } =20 @@ -1394,11 +1385,8 @@ static int perf_sample__fprintf_addr(struct perf_sam= ple *sample, printed +=3D symbol__fprintf_symname(al.sym, fp); } =20 - if (PRINT_FIELD(DSO)) { - printed +=3D fprintf(fp, " ("); - printed +=3D map__fprintf_dsoname(al.map, fp); - printed +=3D fprintf(fp, ")"); - } + if (PRINT_FIELD(DSO)) + printed +=3D map__fprintf_dsoname_dsoff(al.map, PRINT_FIELD(DSOFF), al.a= ddr, fp); out: return printed; } @@ -3877,7 +3865,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 cc80ec554c0a..79e42d66f55b 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; @@ -171,11 +172,8 @@ int sample__fprintf_callchain(struct perf_sample *samp= le, int left_alignment, } } =20 - if (print_dso && (!sym || !sym->inlined)) { - printed +=3D fprintf(fp, " ("); - printed +=3D map__fprintf_dsoname(map, fp); - printed +=3D fprintf(fp, ")"); - } + if (print_dso && (!sym || !sym->inlined)) + printed +=3D map__fprintf_dsoname_dsoff(map, print_dsoff, addr, fp); =20 if (print_srcline) printed +=3D map__fprintf_srcline(map, addr, "\n ", fp); @@ -209,6 +207,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; @@ -234,11 +233,8 @@ int sample__fprintf_sym(struct perf_sample *sample, st= ruct addr_location *al, } } =20 - if (print_dso) { - printed +=3D fprintf(fp, " ("); - printed +=3D map__fprintf_dsoname(al->map, fp); - printed +=3D fprintf(fp, ")"); - } + if (print_dso) + printed +=3D map__fprintf_dsoname_dsoff(al->map, print_dsoff, al->addr,= fp); =20 if (print_srcline) printed +=3D map__fprintf_srcline(al->map, al->addr, "\n ", fp); 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