From mboxrd@z Thu Jan 1 00:00:00 1970 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 81250C76196 for ; Mon, 3 Apr 2023 05:28:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231539AbjDCF24 (ORCPT ); Mon, 3 Apr 2023 01:28:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231645AbjDCF2g (ORCPT ); Mon, 3 Apr 2023 01:28:36 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1692AF1C; Sun, 2 Apr 2023 22:28:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680499711; x=1712035711; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=le+O/PrvEkVwQJt/tAGkSelzcpfdorfo4LA7xpkF21Y=; b=hzOTHpZ7L8wRoP/FY9bBxVCRic7uwMa4TgJYTlZqJ7swUE3+WgYDukIw PWXkKPAoJK/K3oZ6i4cg7ofrl0Gw31AazpdLdTv3sZOX4L8oxWQoOCYDQ bV/bV3UsS4pWDzKlI2+TZ70P2eb6tNa2zFaZM/mxqxN7Iss573KQxwF3D 9tof1NtIfSpxaF+3XFi3zI/oxxy5i+A5YuXEtOIijoMIRLOifnv6xKQmC KUCtSkq8dOhS0xdehkGi6d5PF7DV5txxYqepSVJ9bpMyiFJohrMKqNY/c J/cLluIu1qnQQhBoo5+il/HCNowuB5sx6UtFO3aecpkV0v8JYPoEyAgVl Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10668"; a="369619476" X-IronPort-AV: E=Sophos;i="5.98,314,1673942400"; d="scan'208";a="369619476" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2023 22:28:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10668"; a="663081261" X-IronPort-AV: E=Sophos;i="5.98,314,1673942400"; d="scan'208";a="663081261" Received: from ailichev-mobl1.ccr.corp.intel.com (HELO [10.0.2.15]) ([10.252.40.243]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2023 22:28:26 -0700 Message-ID: Date: Mon, 3 Apr 2023 08:28:23 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0 Thunderbird/102.9.1 Subject: Re: [PATCH] perf: script: add new output field 'dsoip' Content-Language: en-US To: Changbin Du , Arnaldo Carvalho de Melo , Peter Zijlstra , Ingo Molnar Cc: Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Hui Wang References: <20230331084418.3910903-1-changbin.du@huawei.com> From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki In-Reply-To: <20230331084418.3910903-1-changbin.du@huawei.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org On 31/03/23 11:44, Changbin Du wrote: > The goal of this change is to achieve consistent output for address. Before > this, the raw ip is printed for non-callchain and binary offset for > callchain. Mostly what we expect is the raw ip. > > This patch does two changes: > - Always print raw ip for symbols. > - Add a new 'dsoip' field if we really need the binary offset, and the IP stands for instruction pointer, which is always a memory address, so 'dsoip' does not seem like a good name. What about 'dso_offset'? > offset is appended to dso name. > > Default output now: > $ perf script > perf-exec 171459 5380927.621499: 1 cycles: ffffffff8c66e1b8 [unknown] ([unknown]) > perf-exec 171459 5380927.621524: 1 cycles: ffffffff8c66e1b8 [unknown] ([unknown]) > perf-exec 171459 5380927.621527: 2 cycles: ffffffff8c66e1b8 [unknown] ([unknown]) > perf-exec 171459 5380927.621530: 17 cycles: ffffffff8c66e1b8 [unknown] ([unknown]) > perf-exec 171459 5380927.621533: 194 cycles: ffffffff8c66e1bf [unknown] ([unknown]) > perf-exec 171459 5380927.621536: 2153 cycles: ffffffff8c6375fe [unknown] ([unknown]) > perf-exec 171459 5380927.621540: 23135 cycles: ffffffff8d001ac4 [unknown] ([unknown]) > perf-exec 171459 5380927.621555: 224703 cycles: ffffffff8c7a5153 [unknown] ([unknown]) > ls 171459 5380927.621686: 587397 cycles: ffffffff8c7c43de [unknown] ([unknown]) > ls 171459 5380927.622016: 653693 cycles: 7fe1e47278c7 _dl_map_object_deps+0x307 (/lib/x86_64-linux-gnu/ld-2.27.so) > ls 171459 5380927.622382: 633896 cycles: 7fe1e41bd0d0 __wmemchr_ifunc+0x0 (/lib/x86_64-linux-gnu/libc-2.27.so) > ls 171459 5380927.622737: 608856 cycles: 7fe1e4194594 _int_malloc+0x264 (/lib/x86_64-linux-gnu/libc-2.27.so) > ls 171459 5380927.623078: 586376 cycles: 55ff5293d27c [unknown] (/bin/ls) > ls 171459 5380927.623405: 566812 cycles: 55ff5293b202 [unknown] (/bin/ls) > ls 171459 5380927.623723: 549960 cycles: ffffffff8c82b138 [unknown] ([unknown]) > > Display 'dsoip' field: > $ perf script -F +dsoip > perf-exec 171459 5380927.621499: 1 cycles: ffffffff8c66e1b8 [unknown] ([unknown]+0x0) > perf-exec 171459 5380927.621524: 1 cycles: ffffffff8c66e1b8 [unknown] ([unknown]+0x0) > perf-exec 171459 5380927.621527: 2 cycles: ffffffff8c66e1b8 [unknown] ([unknown]+0x0) > perf-exec 171459 5380927.621530: 17 cycles: ffffffff8c66e1b8 [unknown] ([unknown]+0x0) > perf-exec 171459 5380927.621533: 194 cycles: ffffffff8c66e1bf [unknown] ([unknown]+0x0) > perf-exec 171459 5380927.621536: 2153 cycles: ffffffff8c6375fe [unknown] ([unknown]+0x0) > perf-exec 171459 5380927.621540: 23135 cycles: ffffffff8d001ac4 [unknown] ([unknown]+0x0) > perf-exec 171459 5380927.621555: 224703 cycles: ffffffff8c7a5153 [unknown] ([unknown]+0x0) > ls 171459 5380927.621686: 587397 cycles: ffffffff8c7c43de [unknown] ([unknown]+0x0) > ls 171459 5380927.622016: 653693 cycles: 7fe1e47278c7 _dl_map_object_deps+0x307 (/lib/x86_64-linux-gnu/ld-2.27.so+0xe8c7) > ls 171459 5380927.622382: 633896 cycles: 7fe1e41bd0d0 __wmemchr_ifunc+0x0 (/lib/x86_64-linux-gnu/libc-2.27.so+0xbd0d0) > ls 171459 5380927.622737: 608856 cycles: 7fe1e4194594 _int_malloc+0x264 (/lib/x86_64-linux-gnu/libc-2.27.so+0x94594) > ls 171459 5380927.623078: 586376 cycles: 55ff5293d27c [unknown] (/bin/ls+0x1227c) > ls 171459 5380927.623405: 566812 cycles: 55ff5293b202 [unknown] (/bin/ls+0x10202) > ls 171459 5380927.623723: 549960 cycles: ffffffff8c82b138 [unknown] ([unknown]+0x0) > > Signed-off-by: Changbin Du > --- > tools/perf/Documentation/perf-script.txt | 2 +- > tools/perf/builtin-script.c | 5 +++++ > tools/perf/util/evsel_fprintf.c | 26 ++++++++++++------------ > tools/perf/util/evsel_fprintf.h | 13 ++++++------ > 4 files changed, 26 insertions(+), 20 deletions(-) > > diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt > index 777a0d8ba7d1..ef392785f776 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, symoff, > + comm, tid, pid, time, cpu, event, trace, ip, sym, dso, dsoip, addr, symoff, > srcline, period, iregs, uregs, brstack, brstacksym, flags, bpf-output, > brstackinsn, brstackinsnlen, brstackoff, callindent, insn, insnlen, synth, > phys_addr, metric, misc, srccode, ipc, data_page_size, code_page_size, ins_lat, > diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c > index a792214d1af8..a181decf7922 100644 > --- a/tools/perf/builtin-script.c > +++ b/tools/perf/builtin-script.c > @@ -133,6 +133,7 @@ enum perf_output_field { > PERF_OUTPUT_VCPU = 1ULL << 38, > PERF_OUTPUT_CGROUP = 1ULL << 39, > PERF_OUTPUT_RETIRE_LAT = 1ULL << 40, > + PERF_OUTPUT_DSOIP = 1ULL << 41, > }; > > struct perf_script { > @@ -174,6 +175,7 @@ struct output_option { > {.str = "ip", .field = PERF_OUTPUT_IP}, > {.str = "sym", .field = PERF_OUTPUT_SYM}, > {.str = "dso", .field = PERF_OUTPUT_DSO}, > + {.str = "dsoip", .field = PERF_OUTPUT_DSOIP}, > {.str = "addr", .field = PERF_OUTPUT_ADDR}, > {.str = "symoff", .field = PERF_OUTPUT_SYMOFFSET}, > {.str = "srcline", .field = PERF_OUTPUT_SRCLINE}, > @@ -574,6 +576,9 @@ static void set_print_ip_opts(struct perf_event_attr *attr) > if (PRINT_FIELD(DSO)) > output[type].print_ip_opts |= EVSEL__PRINT_DSO; > > + if (PRINT_FIELD(DSOIP)) > + output[type].print_ip_opts |= EVSEL__PRINT_DSOIP; > + > if (PRINT_FIELD(SYMOFFSET)) > output[type].print_ip_opts |= EVSEL__PRINT_SYMOFFSET; > > diff --git a/tools/perf/util/evsel_fprintf.c b/tools/perf/util/evsel_fprintf.c > index bd22c4932d10..fd1791fab051 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 *sample, int left_alignment, > int print_ip = print_opts & EVSEL__PRINT_IP; > int print_sym = print_opts & EVSEL__PRINT_SYM; > int print_dso = print_opts & EVSEL__PRINT_DSO; > + int print_dsoip = print_opts & EVSEL__PRINT_DSOIP; > int print_symoffset = print_opts & EVSEL__PRINT_SYMOFFSET; > int print_oneline = print_opts & EVSEL__PRINT_ONELINE; > int print_srcline = print_opts & EVSEL__PRINT_SRCLINE; > @@ -133,7 +134,7 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment, > while (1) { > struct symbol *sym; > struct map *map; > - u64 addr = 0; > + u64 dso_ip = 0; Renaming 'addr' just makes the patch more complicated. Just leave it as 'addr' > > node = callchain_cursor_current(cursor); > if (!node) > @@ -141,6 +142,8 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment, > > sym = node->ms.sym; > map = node->ms.map; > + if (map) > + dso_ip = map->map_ip(map, node->ip); There does not seem to be any reason to move these lines of code. > > if (sym && sym->ignore && print_skip_ignored) > goto next; > @@ -150,20 +153,12 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment, > if (print_arrow && !first) > printed += fprintf(fp, " <-"); > > - if (map) > - addr = map->map_ip(map, node->ip); > - > - if (print_ip) { > - /* Show binary offset for userspace addr */ > - if (map && !map->dso->kernel) I would have expected to keep existing functionality unchanged i.e. - if (map && !map->dso->kernel) + if (!print_dsoip && map && !map->dso->kernel) > - printed += fprintf(fp, "%c%16" PRIx64, s, addr); > - else > - printed += fprintf(fp, "%c%16" PRIx64, s, node->ip); > - } > + if (print_ip) > + printed += fprintf(fp, "%c%16" PRIx64, s, node->ip); > > if (print_sym) { > printed += fprintf(fp, " "); > - node_al.addr = addr; > + node_al.addr = dso_ip; > node_al.map = map; > > if (print_symoffset) { > @@ -179,11 +174,13 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment, > if (print_dso && (!sym || !sym->inlined)) { > printed += fprintf(fp, " ("); > printed += map__fprintf_dsoname(map, fp); > + if (print_dsoip) Better to avoid '[unknown]+0x0' i.e. if (print_dsoip && map && map->dso) > + printed += fprintf(fp, "+0x%lx", (map && map->dso) ? dso_ip : 0); > printed += fprintf(fp, ")"); > } > > if (print_srcline) > - printed += map__fprintf_srcline(map, addr, "\n ", fp); > + printed += map__fprintf_srcline(map, dso_ip, "\n ", fp); > > if (sym && sym->inlined) > printed += fprintf(fp, " (inlined)"); > @@ -214,6 +211,7 @@ int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al, > int print_ip = print_opts & EVSEL__PRINT_IP; > int print_sym = print_opts & EVSEL__PRINT_SYM; > int print_dso = print_opts & EVSEL__PRINT_DSO; > + int print_dsoip = print_opts & EVSEL__PRINT_DSOIP; > int print_symoffset = print_opts & EVSEL__PRINT_SYMOFFSET; > int print_srcline = print_opts & EVSEL__PRINT_SRCLINE; > int print_unknown_as_addr = print_opts & EVSEL__PRINT_UNKNOWN_AS_ADDR; > @@ -242,6 +240,8 @@ int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al, > if (print_dso) { > printed += fprintf(fp, " ("); > printed += map__fprintf_dsoname(al->map, fp); > + if (print_dsoip) Better to avoid '[unknown]+0x0' i.e. if (print_dsoip && al->map && al->map->dso) > + printed += fprintf(fp, "+0x%lx", (al->map && al->map->dso) ? al->addr : 0); > printed += fprintf(fp, ")"); > } > > diff --git a/tools/perf/util/evsel_fprintf.h b/tools/perf/util/evsel_fprintf.h > index 3093d096c29f..3f282c5840da 100644 > --- a/tools/perf/util/evsel_fprintf.h > +++ b/tools/perf/util/evsel_fprintf.h > @@ -20,12 +20,13 @@ int evsel__fprintf(struct evsel *evsel, struct perf_attr_details *details, FILE > #define EVSEL__PRINT_IP (1<<0) > #define EVSEL__PRINT_SYM (1<<1) > #define EVSEL__PRINT_DSO (1<<2) > -#define EVSEL__PRINT_SYMOFFSET (1<<3) > -#define EVSEL__PRINT_ONELINE (1<<4) > -#define EVSEL__PRINT_SRCLINE (1<<5) > -#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_DSOIP (1<<3) > +#define EVSEL__PRINT_SYMOFFSET (1<<4) > +#define EVSEL__PRINT_ONELINE (1<<5) > +#define EVSEL__PRINT_SRCLINE (1<<6) > +#define EVSEL__PRINT_UNKNOWN_AS_ADDR (1<<7) > +#define EVSEL__PRINT_CALLCHAIN_ARROW (1<<8) > +#define EVSEL__PRINT_SKIP_IGNORED (1<<9) > > struct addr_location; > struct perf_event_attr;