Messages in this thread Patch in this message | | | Date | Thu, 20 Apr 2023 11:39:21 +0300 | Subject | Re: [PATCH v5 2/3] perf: add helper map__fprintf_dsoname_dsoff | From | Adrian Hunter <> |
| |
On 20/04/23 05:55, Changbin Du wrote: > On Wed, Apr 19, 2023 at 09:58:10PM +0300, Adrian Hunter wrote: >> On 18/04/23 06:18, Changbin Du wrote: >>> This adds a helper function map__fprintf_dsoname_dsoff() to print dsoname >>> with optional dso offset. >>> >>> Suggested-by: Adrian Hunter <adrian.hunter@intel.com> >>> Signed-off-by: Changbin Du <changbin.du@huawei.com> >>> --- >>> 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); >>> } >>> >>> +size_t map__fprintf_dsoname_dsoff(struct map *map, bool print_off, u64 addr, FILE *fp) >>> +{ >>> + int printed = 0; >>> + >>> + printed += fprintf(fp, " ("); >>> + printed += map__fprintf_dsoname(map, fp); >>> + if (print_off && map && map__dso(map) && !map__dso(map)->kernel) >> >> That will also block vmlinux offsets not just [kernel.kallsyms] >> Is that what was intended? >> > Not only vmlinux, modules are also blocked. We'd better print offset for > vmlinux and modules. > > $ sudo perf script -k vmlinux -F +dsoff > perf-exec 2531039 4120893.685967: 1 cycles: ffffffff99094ec4 [unknown] (vmlinux) > perf-exec 2531039 4120893.685970: 1 cycles: ffffffff99094ec4 [unknown] (vmlinux) > perf-exec 2531039 4120893.685972: 9 cycles: ffffffff99094ec4 [unknown] (vmlinux) > perf-exec 2531039 4120893.685973: 194 cycles: ffffffff99094ec6 [unknown] (vmlinux) > perf-exec 2531039 4120893.685974: 4605 cycles: ffffffff99094ec4 [unknown] (vmlinux) > perf-exec 2531039 4120893.685976: 108083 cycles: ffffffff9928e8d0 [unknown] (vmlinux) > ls 2531039 4120893.686003: 2197682 cycles: ffffffff993c92bc [unknown] (vmlinux) > ls 2531039 4120893.686554: 4497190 cycles: ffffffffc159692b strcasestr+0x7b (/lib/modules/5.15.0-60-generic/extra/isac_ipc.ko) > ls 2531039 4120893.687700: 4189758 cycles: ffffffffc18a5d66 delete_net_reject_cache+0x76 (/lib/modules/5.15.0-60-generic/extra/isac_networkfilter.ko) > ls 2531039 4120893.688786: 3780376 cycles: ffffffffc18a67de delete_net_process_info+0x5e (/lib/modules/5.15.0-60-generic/extra/isac_networkfilter.ko) > ls 2531039 4120893.689716: 3416607 cycles: ffffffffc18a67de delete_net_process_info+0x5e (/lib/modules/5.15.0-60-generic/extra/isac_networkfilter.ko) > > But I found addr returned by map__dso_map_ip() for 'vmlinux' is not a 'dso > offset'. > > $ sudo perf script -k vmlinux -F +dsoff > perf-exec 2531039 4120893.685967: 1 cycles: ffffffff99094ec4 [unknown] (vmlinux+0xffffffff99094ec4) > perf-exec 2531039 4120893.685970: 1 cycles: ffffffff99094ec4 [unknown] (vmlinux+0xffffffff99094ec4) > perf-exec 2531039 4120893.685972: 9 cycles: ffffffff99094ec4 [unknown] (vmlinux+0xffffffff99094ec4) > perf-exec 2531039 4120893.685973: 194 cycles: ffffffff99094ec6 [unknown] (vmlinux+0xffffffff99094ec6) > > Do you have better idea? >
What do you get if you try below diff on top of your patches:
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index c7bf1ac14e90..df0d21141185 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -576,8 +576,11 @@ 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(DSOFF)) + if (PRINT_FIELD(DSOFF)) { output[type].print_ip_opts |= EVSEL__PRINT_DSOFF; + /* DSO offset is relative to dso->longname */ + symbol_conf.show_kernel_path = true; + } if (PRINT_FIELD(SYMOFFSET)) output[type].print_ip_opts |= EVSEL__PRINT_SYMOFFSET; diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index a86614599269..19ebfd3468cc 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -67,6 +67,42 @@ char dso__symtab_origin(const struct dso *dso) return origin[dso->symtab_type]; } +bool dso__is_file(const struct dso *dso) +{ + switch (dso->binary_type) { + case DSO_BINARY_TYPE__KALLSYMS: + case DSO_BINARY_TYPE__GUEST_KALLSYMS: + return false; + case DSO_BINARY_TYPE__VMLINUX: + case DSO_BINARY_TYPE__GUEST_VMLINUX: + return true; + case DSO_BINARY_TYPE__JAVA_JIT: + return false; + case DSO_BINARY_TYPE__DEBUGLINK: + case DSO_BINARY_TYPE__BUILD_ID_CACHE: + case DSO_BINARY_TYPE__BUILD_ID_CACHE_DEBUGINFO: + case DSO_BINARY_TYPE__FEDORA_DEBUGINFO: + case DSO_BINARY_TYPE__UBUNTU_DEBUGINFO: + case DSO_BINARY_TYPE__MIXEDUP_UBUNTU_DEBUGINFO: + case DSO_BINARY_TYPE__BUILDID_DEBUGINFO: + case DSO_BINARY_TYPE__SYSTEM_PATH_DSO: + case DSO_BINARY_TYPE__GUEST_KMODULE: + case DSO_BINARY_TYPE__GUEST_KMODULE_COMP: + case DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE: + case DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE_COMP: + case DSO_BINARY_TYPE__KCORE: + case DSO_BINARY_TYPE__GUEST_KCORE: + case DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO: + return true; + case DSO_BINARY_TYPE__BPF_PROG_INFO: + case DSO_BINARY_TYPE__BPF_IMAGE: + case DSO_BINARY_TYPE__OOL: + case DSO_BINARY_TYPE__NOT_FOUND: + default: + return false; + } +} + int dso__read_binary_type_filename(const struct dso *dso, enum dso_binary_type type, char *root_dir, char *filename, size_t size) diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h index 0b7c7633b9f6..fb33f5224fb6 100644 --- a/tools/perf/util/dso.h +++ b/tools/perf/util/dso.h @@ -396,6 +396,8 @@ static inline bool dso__is_kallsyms(struct dso *dso) return dso->kernel && dso->long_name[0] != '/'; } +bool dso__is_file(const struct dso *dso); + void dso__free_a2l(struct dso *dso); enum dso_type dso__type(struct dso *dso, struct machine *machine); diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index 7da96b41100f..9b79f88d371c 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -447,11 +447,12 @@ size_t map__fprintf_dsoname(struct map *map, FILE *fp) size_t map__fprintf_dsoname_dsoff(struct map *map, bool print_off, u64 addr, FILE *fp) { + const struct dso *dso = map ? map__dso(map) : NULL; int printed = 0; printed += fprintf(fp, " ("); printed += map__fprintf_dsoname(map, fp); - if (print_off && map && map__dso(map) && !map__dso(map)->kernel) + if (print_off && dso && dso__is_file(dso)) printed += fprintf(fp, "+0x%" PRIx64, addr); printed += fprintf(fp, ")");
| |