perf dwarf/libdw extra support, speed and clean ups
Subsystems (4)
Ian Rogers
reviewercover perf dwarf/libdw extra support, speed and clean ups
The first 6 patches are minor tweaks addressing a memory leak, correctness and performance. Patch 5 incorportes the reviewed patch by Shimin Guo [1] that makes the libdw unwinding support cross architecture. The cross architecture files will be refactored in this series.
Patch 7 unifies the dwfl for dsos and addr2line with that for the powerpc skip-callchain-idx. An issue described in:
https://lore.kernel.org/lkml/CAP-5=fX+zw-CUEYEtrPA6vYUKqpp4LZp-p==QsbZaNwLcX0Whw@mail.gmail.com/
Patch 8 migrates the perf regs code away from using an architecture substring to using the ELF machine, which is both more efficient and more accurate.
Patches 9 to 21 clean up the libdw and dwarf register code removing the need for different libdw dwarf register initialization routines by introducing a perf reg to dwarf register mapping function. This function is added for all perf register supporting architectures.
Patch 22 avoids discarding the dwfl for every libdw unwind, it can speed up perf report by amounts like 18x.
Patch 23 adds inline information for frame pointers, an issue described here:
https://lore.kernel.org/lkml/CAP-5=fWh5=AWq_Mav7B9nsuZ0TS2qPMMAwYhQKpt_BYFJRnf2w@mail.gmail.com/
[1] https://lore.kernel.org/lkml/[email protected]/
Ian Rogers (22):
perf symbol-elf: Fix leak of ELF files with GNU debugdata perf dso: Extra validity checks that e_machine is valid perf record: Disable inline frames when marking build IDs perf libdw_addr2line: Fixes to srcline memory allocation perf unwind-libdw: Correct argument to dwfl_attach_state perf powerpc: Unify the skip-callchain-idx libdw with that for
addr2line
perf perf_regs: Switch from arch string to int e_machine perf dwarf-regs: Add util/dwarf-regs-arch for consistency with
perf-regs
perf dwarf-regs: Remove get_arch_regnum
perf dwarf-regs: Clean up x86 dwarf_regnum code
perf dwarf-regs: Add get_dwarf_regnum_for_perf_regnum and use for x86
unwinding
perf dwarf-regs: Add basic get_dwarf_regnum for most architectures perf dwarf-regs: Add ARM perf to dwarf register number mapping
functions
perf dwarf-regs: Add csky perf to dwarf register number mapping
functions
perf dwarf-regs: Add loongarch perf to dwarf register number mapping
functions
perf dwarf-regs: Add powerpc perf to dwarf register number mapping
functions
perf dwarf-regs: Add RISC-V perf to dwarf register number mapping
functions
perf dwarf-regs: Add S390 perf to dwarf register number mapping
functions
perf dwarf-regs: Add MIPS perf to dwarf register number mapping
functions
perf build: Remove NO_LIBDW_DWARF_UNWIND option
perf unwind-libdw: Don't discard loaded ELF/Dwarf after every unwind perf machine: Add inline information to frame pointer and LBR
callchains
Shimin Guo (1):
perf unwind-libdw: fix a cross-arch unwinding bug
tools/perf/Makefile.config | 19 +- tools/perf/arch/arm/util/Build | 1 - tools/perf/arch/arm/util/unwind-libdw.c | 39 --- tools/perf/arch/arm64/util/Build | 1 - tools/perf/arch/arm64/util/unwind-libdw.c | 61 ---- tools/perf/arch/csky/util/Build | 2 - tools/perf/arch/csky/util/unwind-libdw.c | 78 ------ tools/perf/arch/loongarch/util/unwind-libdw.c | 57 ---- tools/perf/arch/powerpc/util/Build | 1 - .../arch/powerpc/util/skip-callchain-idx.c | 52 +--- tools/perf/arch/powerpc/util/unwind-libdw.c | 76 ----- tools/perf/arch/riscv/util/Build | 1 - tools/perf/arch/riscv/util/unwind-libdw.c | 58 ---- tools/perf/arch/s390/util/Build | 2 - tools/perf/arch/s390/util/unwind-libdw.c | 65 ----- tools/perf/arch/x86/util/Build | 1 - tools/perf/arch/x86/util/unwind-libdw.c | 54 ---- tools/perf/builtin-record.c | 3 +- tools/perf/builtin-script.c | 17 +- tools/perf/tests/make | 3 +- tools/perf/tests/shell/addr2line_inlines.sh | 31 ++- tools/perf/util/Build | 6 +- tools/perf/util/dso.c | 33 ++- tools/perf/util/dso.h | 23 +- tools/perf/util/dwarf-regs-arch/Build | 9 + .../util/dwarf-regs-arch/dwarf-regs-arm.c | 12 + .../util/dwarf-regs-arch/dwarf-regs-arm64.c | 12 + .../util/dwarf-regs-arch/dwarf-regs-csky.c | 126 +++++++++ .../dwarf-regs-arch/dwarf-regs-loongarch.c | 12 + .../util/dwarf-regs-arch/dwarf-regs-mips.c | 14 + .../util/dwarf-regs-arch/dwarf-regs-powerpc.c | 136 +++++++++ .../util/dwarf-regs-arch/dwarf-regs-riscv.c | 12 + .../util/dwarf-regs-arch/dwarf-regs-s390.c | 53 ++++ .../util/dwarf-regs-arch/dwarf-regs-x86.c | 260 ++++++++++++++++++ tools/perf/util/dwarf-regs-csky.c | 50 ---- tools/perf/util/dwarf-regs-powerpc.c | 61 ---- tools/perf/util/dwarf-regs-x86.c | 50 ---- tools/perf/util/dwarf-regs.c | 151 +++++++++- tools/perf/util/evsel.c | 14 +- tools/perf/util/include/dwarf-regs.h | 28 +- tools/perf/util/libdw.c | 115 ++++---- tools/perf/util/libdw.h | 12 +- tools/perf/util/machine.c | 104 ++++--- tools/perf/util/maps.c | 36 ++- tools/perf/util/maps.h | 4 + tools/perf/util/perf_regs.c | 105 ++++--- tools/perf/util/perf_regs.h | 10 +- .../scripting-engines/trace-event-python.c | 21 +- tools/perf/util/session.c | 65 +++-- tools/perf/util/session.h | 1 + tools/perf/util/srcline.c | 2 +- tools/perf/util/symbol-elf.c | 2 +- tools/perf/util/unwind-libdw.c | 154 +++++++++-- tools/perf/util/unwind-libdw.h | 10 +- tools/perf/util/unwind-libunwind-local.c | 7 +- 55 files changed, 1347 insertions(+), 985 deletions(-) delete mode 100644 tools/perf/arch/arm/util/unwind-libdw.c delete mode 100644 tools/perf/arch/arm64/util/unwind-libdw.c delete mode 100644 tools/perf/arch/csky/util/unwind-libdw.c delete mode 100644 tools/perf/arch/loongarch/util/unwind-libdw.c delete mode 100644 tools/perf/arch/powerpc/util/unwind-libdw.c delete mode 100644 tools/perf/arch/riscv/util/unwind-libdw.c delete mode 100644 tools/perf/arch/s390/util/unwind-libdw.c delete mode 100644 tools/perf/arch/x86/util/unwind-libdw.c create mode 100644 tools/perf/util/dwarf-regs-arch/Build create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-arm.c create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-arm64.c create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-csky.c create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-loongarch.c create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-mips.c create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-powerpc.c create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-riscv.c create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-s390.c create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-x86.c delete mode 100644 tools/perf/util/dwarf-regs-csky.c delete mode 100644 tools/perf/util/dwarf-regs-powerpc.c delete mode 100644 tools/perf/util/dwarf-regs-x86.c
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 1/23 perf symbol-elf: Fix leak of ELF files with GNU debugdata
The processing of DSO_BINARY_TYPE__GNU_DEBUGDATA in symsrc__init happens with an open ELF file but the error path only closes the associate fd. Fix the goto so that the ELF file is also ended and memory released.
--- tools/perf/util/symbol-elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/symbol-elf.c +1 -1
@@ -1173,7 +1173,7 @@ int symsrc__init(struct symsrc *ss, struct dso *dso, const char *name,Elf *embedded =read_gnu_debugdata (dso, elf, name, &new_fd);if (!embedded) - goto out_close; + goto out_elf_end;elf_end (elf);close (fd);
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 2/23 perf dso: Extra validity checks that e_machine is valid
In reply to Ian RogersBetter ensure a read e_machine is valid by checking the file appears like an ELF file and the read e_machine value is less than EM_NUM. This better avoids spurious e_machine values when looking for an e_machine in say a thread.
--- tools/perf/util/dso.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-)
tools/perf/util/dso.c +21 -10
@@ -1236,17 +1236,28 @@ uint16_t dso__e_machine(struct dso *dso, struct machine *machine)try_to_open_dso (dso, machine); fd =dso__data (dso)->fd;if (fd >=0 ) { -_Static_assert (offsetof(Elf32_Ehdr , e_machine) ==18 ,"Unexpected offset" ); -_Static_assert (offsetof(Elf64_Ehdr , e_machine) ==18 ,"Unexpected offset" ); -if (dso__needs_swap (dso) ==DSO_SWAP__UNSET ) { -unsigned char eidata; - -if (pread (fd, &eidata,sizeof (eidata),EI_DATA ) ==sizeof (eidata)) -dso__swap_init (dso, eidata); +unsigned char e_ident[EI_NIDENT ]; + +_Static_assert (offsetof(Elf32_Ehdr , e_ident) ==0 ,"Unexpected offset" ); +_Static_assert (offsetof(Elf64_Ehdr , e_ident) ==0 ,"Unexpected offset" ); +if (pread (fd, &e_ident,sizeof (e_ident),0 ) ==sizeof (e_ident) && +memcmp (e_ident,ELFMAG ,SELFMAG ) ==0 && + e_ident[EI_CLASS ] >ELFCLASSNONE && e_ident[EI_CLASS ] <ELFCLASSNUM && + e_ident[EI_DATA ] >ELFDATANONE && e_ident[EI_DATA ] <ELFDATANUM && + e_ident[EI_VERSION ] ==EV_CURRENT ) { +_Static_assert (offsetof(Elf32_Ehdr , e_machine) ==18 ,"Unexpected offset" ); +_Static_assert (offsetof(Elf64_Ehdr , e_machine) ==18 ,"Unexpected offset" ); + +if (dso__needs_swap (dso) ==DSO_SWAP__UNSET ) +dso__swap_init (dso, e_ident[EI_DATA ]); + +if (dso__needs_swap (dso) !=DSO_SWAP__UNSET && +pread (fd, &e_machine,sizeof (e_machine),18 ) ==sizeof (e_machine) && + e_machine <EM_NUM ) + e_machine =DSO__SWAP (dso, uint16_t, e_machine); +else + e_machine =EM_NONE ; } -if (dso__needs_swap (dso) !=DSO_SWAP__UNSET && -pread (fd, &e_machine,sizeof (e_machine),18 ) ==sizeof (e_machine)) - e_machine =DSO__SWAP (dso, uint16_t, e_machine); }mutex_unlock (dso__data_open_lock ());return e_machine;
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 3/23 perf record: Disable inline frames when marking build IDs
In reply to Ian RogersMarking DSOs doesn't need inline frames traversing as the inline frames are all part of the same DSO. Disable to improve performance and also to avoid potential issues with dwarf information.
--- tools/perf/builtin-record.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/perf/builtin-record.c +2 -1
@@ -1509,6 +1509,8 @@ static int process_buildids(struct record *rec)if (perf_data__size (&rec->data) ==0 )return 0 ; +/* A single DSO is needed and not all inline frames. */ + symbol_conf.inline_name = false;/* * During this process, it'll load kernel map and replace the * dso->long_name to a real pathname it found. In this case
@@ -1519,7 +1521,6 @@ static int process_buildids(struct record *rec)* $HOME/.debug/.build-id/f0/6e17aa50adf4d00b88925e03775de107611551 */ symbol_conf.ignore_vmlinux_buildid = true; -/* * If --buildid-all is given, it marks all DSO regardless of hits, * so no need to process samples. But if timestamp_boundary is enabled,
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 4/23 perf unwind-libdw: fix a cross-arch unwinding bug
In reply to Ian RogersFrom: Shimin Guo <[email protected]>
The set_initial_registers field of Dwfl_Thread_Callbacks needs to be set according to the arch of the stack samples being analyzed, not the arch that perf itself is built for. Currently perf fails to unwind stack samples collected from archs different from that of the host perf is running on. This patch moves the arch-specific implementations of set_initial_registers from tools/perf/arch to tools/perf/utli/unwind-libdw-arch, similar to the way the perf-regs-arch folder contains arch-specific functions related to registers, and chooses the implementation based on the arch of the data being processed.
---
tools/perf/arch/arm/util/Build | 1 -
tools/perf/arch/arm64/util/Build | 1 -
tools/perf/arch/csky/util/Build | 2 -
tools/perf/arch/powerpc/util/Build | 1 -
tools/perf/arch/riscv/util/Build | 1 -
tools/perf/arch/s390/util/Build | 2 -
tools/perf/arch/x86/util/Build | 1 -
tools/perf/util/Build | 1 +
tools/perf/util/unwind-libdw-arch/Build | 8 +++
.../unwind-libdw-arch/unwind-libdw-arm.c} | 10 ++--
.../unwind-libdw-arch/unwind-libdw-arm64.c} | 10 ++--
.../unwind-libdw-arch/unwind-libdw-csky.c} | 10 ++--
.../unwind-libdw-loongarch.c} | 10 ++--
.../unwind-libdw-arch/unwind-libdw-powerpc.c} | 10 ++--
.../unwind-libdw-arch/unwind-libdw-riscv.c} | 10 ++--
.../unwind-libdw-arch/unwind-libdw-s390.c} | 14 ++---
.../unwind-libdw-arch/unwind-libdw-x86.c} | 8 +--
tools/perf/util/unwind-libdw.c | 51 ++++++++++++++++---
tools/perf/util/unwind-libdw.h | 10 +++-
19 files changed, 104 insertions(+), 57 deletions(-)
create mode 100644 tools/perf/util/unwind-libdw-arch/Build
rename tools/perf/{arch/arm/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-arm.c} (80%)
rename tools/perf/{arch/arm64/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-arm64.c} (87%)
rename tools/perf/{arch/csky/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-csky.c} (90%)
rename tools/perf/{arch/loongarch/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-loongarch.c} (86%)
rename tools/perf/{arch/powerpc/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-powerpc.c} (89%)
rename tools/perf/{arch/riscv/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-riscv.c} (87%)
rename tools/perf/{arch/s390/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-s390.c} (84%)
rename tools/perf/{arch/x86/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-x86.c} (87%)tools/perf/arch/arm/util/Build +0 -1
@@ -1,6 +1,5 @@ perf-util-y += perf_regs.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o perf-util-y += pmu.o auxtrace.o cs-etm.o
tools/perf/arch/arm64/util/Build +0 -1
@@ -1,4 +1,3 @@ -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o perf-util-y += ../../arm/util/auxtrace.o
tools/perf/arch/csky/util/Build +0 -2
@@ -1,3 +1 @@ perf-util-y += perf_regs.o - -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
tools/perf/arch/powerpc/util/Build +0 -1
@@ -9,5 +9,4 @@ perf-util-y += evsel.o perf-util-$(CONFIG_LIBDW) += skip-callchain-idx.o perf-util-$(CONFIG_LIBUNWIND) += unwind-libunwind.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o perf-util-y += auxtrace.o
tools/perf/arch/riscv/util/Build +0 -1
@@ -2,4 +2,3 @@ perf-util-y += perf_regs.o perf-util-y += header.o perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
tools/perf/arch/s390/util/Build +0 -2
@@ -2,8 +2,6 @@ perf-util-y += header.o perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o perf-util-y += perf_regs.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o - perf-util-y += machine.o perf-util-y += pmu.o
tools/perf/arch/x86/util/Build +0 -1
@@ -12,7 +12,6 @@ perf-util-y += evsel.o perf-util-y += iostat.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o perf-util-y += auxtrace.o perf-util-y += archinsn.o
tools/perf/util/Build +1 -0
@@ -227,6 +227,7 @@ perf-util-$(CONFIG_LIBDW) += annotate-data.o perf-util-$(CONFIG_LIBDW) += libdw.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw-arch/ perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind-local.o perf-util-$(CONFIG_LIBUNWIND) += unwind-libunwind.o perf-util-$(CONFIG_LIBUNWIND_X86) += libunwind/x86_32.o
tools/perf/util/unwind-libdw-arch/Build new file +8 -0
@@ -0,0 +1,8 @@ +perf-util-y += unwind-libdw-x86.o +perf-util-y += unwind-libdw-arm.o +perf-util-y += unwind-libdw-arm64.o +perf-util-y += unwind-libdw-csky.o +perf-util-y += unwind-libdw-loongarch.o +perf-util-y += unwind-libdw-powerpc.o +perf-util-y += unwind-libdw-riscv.o +perf-util-y += unwind-libdw-s390.o
tools/perf/util/unwind-libdw-arch/unwind-libdw-arm.c renamed from tools/perf/arch/arm/util/unwind-libdw.c +5 -5
@@ -1,11 +1,11 @@// SPDX-License-Identifier: GPL-2.0 #include <elfutils/libdwfl.h> -#include "perf_regs.h" -#include "../../../util/unwind-libdw.h" -#include "../../../util/perf_regs.h" -#include "../../../util/sample.h" +#include "../arch/arm/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/sample.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_arm (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);
tools/perf/util/unwind-libdw-arch/unwind-libdw-arm64.c renamed from tools/perf/arch/arm64/util/unwind-libdw.c +5 -5
@@ -1,11 +1,11 @@// SPDX-License-Identifier: GPL-2.0 #include <elfutils/libdwfl.h> -#include "perf_regs.h" -#include "../../../util/unwind-libdw.h" -#include "../../../util/perf_regs.h" -#include "../../../util/sample.h" +#include "../arch/arm64/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/sample.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_arm64 (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);
tools/perf/util/unwind-libdw-arch/unwind-libdw-csky.c renamed from tools/perf/arch/csky/util/unwind-libdw.c +5 -5
@@ -2,12 +2,12 @@// Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd. #include <elfutils/libdwfl.h> -#include "perf_regs.h" -#include "../../util/unwind-libdw.h" -#include "../../util/perf_regs.h" -#include "../../util/event.h" +#include "../arch/csky/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/sample.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_csky (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);
tools/perf/util/unwind-libdw-arch/unwind-libdw-loongarch.c renamed from tools/perf/arch/loongarch/util/unwind-libdw.c +5 -5
@@ -2,12 +2,12 @@/* Copyright (C) 2020-2023 Loongson Technology Corporation Limited */ #include <elfutils/libdwfl.h> -#include "perf_regs.h" -#include "../../util/unwind-libdw.h" -#include "../../util/perf_regs.h" -#include "../../util/sample.h" +#include "../arch/loongarch/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/sample.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_loongarch (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);
tools/perf/util/unwind-libdw-arch/unwind-libdw-powerpc.c renamed from tools/perf/arch/powerpc/util/unwind-libdw.c +5 -5
@@ -1,10 +1,10 @@// SPDX-License-Identifier: GPL-2.0 #include <elfutils/libdwfl.h> #include <linux/kernel.h> -#include "perf_regs.h" -#include "../../../util/unwind-libdw.h" -#include "../../../util/perf_regs.h" -#include "../../../util/sample.h" +#include "../arch/powerpc/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/sample.h" /* See backends/ppc_initreg.c and backends/ppc_regs.c in elfutils. */ static const int special_regs[3 ][2 ] = {
@@ -13,7 +13,7 @@ static const int special_regs[3][2] = { { 109, PERF_REG_POWERPC_CTR }, }; -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_powerpc (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);
tools/perf/util/unwind-libdw-arch/unwind-libdw-riscv.c renamed from tools/perf/arch/riscv/util/unwind-libdw.c +5 -5
@@ -2,12 +2,12 @@/* Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd. */ #include <elfutils/libdwfl.h> -#include "perf_regs.h" -#include "../../util/unwind-libdw.h" -#include "../../util/perf_regs.h" -#include "../../util/sample.h" +#include "../arch/riscv/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/sample.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_riscv (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);
tools/perf/util/unwind-libdw-arch/unwind-libdw-s390.c renamed from tools/perf/arch/s390/util/unwind-libdw.c +7 -7
@@ -1,14 +1,14 @@#include <linux/kernel.h> #include <elfutils/libdwfl.h> -#include "../../util/unwind-libdw.h" -#include "../../util/perf_regs.h" -#include "../../util/event.h" -#include "../../util/sample.h" -#include "dwarf-regs-table.h" -#include "perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/event.h" +#include "util/sample.h" +#include "../arch/s390/include/dwarf-regs-table.h" +#include "../arch/s390/include/uapi/asm/perf_regs.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_s390 (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);
tools/perf/util/unwind-libdw-arch/unwind-libdw-x86.c renamed from tools/perf/arch/x86/util/unwind-libdw.c +4 -4
@@ -1,11 +1,11 @@// SPDX-License-Identifier: GPL-2.0 #include <elfutils/libdwfl.h> -#include "perf_regs.h" -#include "../../../util/unwind-libdw.h" -#include "../../../util/perf_regs.h" +#include "../arch/x86/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" #include "util/sample.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_x86 (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);
tools/perf/util/unwind-libdw.c +45 -6
69 lines not on this page · raw message
tools/perf/util/unwind-libdw.h +9 -1
@@ -9,7 +9,15 @@ struct machine;struct perf_sample ;struct thread ; -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_x86 (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_arm (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_arm64 (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_csky (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_loongarch (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_mips (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_powerpc (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_riscv (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_s390 (Dwfl_Thread *thread,void *arg);struct unwind_info {Dwfl *dwfl;
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v1 04/23] perf unwind-libdw: fix a cross-arch unwinding bug
Quoted 11 lines · Ian Rogers
From: Shimin Guo <[email protected]>
The
set_initial_registersfield ofDwfl_Thread_Callbacksneeds to be set according to the arch of the stack samples being analyzed, not the arch that perf itself is built for. Currently perf fails to unwind stack samples collected from archs different from that of the host perf is running on. This patch moves the arch-specific implementations ofset_initial_registersfromtools/perf/archtotools/perf/utli/unwind-libdw-arch, similar to the way the perf-regs-arch folder contains arch-specific functions related to registers, and chooses the implementation based on the arch of the data being processed.
Since this one is coming thru you, we need your:
Ok?
I'm adding it here, please ack.
- Arnaldo
Quoted 438 lines
Signed-off-by Shimin Guo <[email protected]>Reviewed-by Ian Rogers <[email protected]>Acked-by Namhyung Kim <[email protected]>--- tools/perf/arch/arm/util/Build | 1 - tools/perf/arch/arm64/util/Build | 1 - tools/perf/arch/csky/util/Build | 2 - tools/perf/arch/powerpc/util/Build | 1 - tools/perf/arch/riscv/util/Build | 1 - tools/perf/arch/s390/util/Build | 2 - tools/perf/arch/x86/util/Build | 1 - tools/perf/util/Build | 1 + tools/perf/util/unwind-libdw-arch/Build | 8 +++ .../unwind-libdw-arch/unwind-libdw-arm.c} | 10 ++-- .../unwind-libdw-arch/unwind-libdw-arm64.c} | 10 ++-- .../unwind-libdw-arch/unwind-libdw-csky.c} | 10 ++-- .../unwind-libdw-loongarch.c} | 10 ++-- .../unwind-libdw-arch/unwind-libdw-powerpc.c} | 10 ++-- .../unwind-libdw-arch/unwind-libdw-riscv.c} | 10 ++-- .../unwind-libdw-arch/unwind-libdw-s390.c} | 14 ++--- .../unwind-libdw-arch/unwind-libdw-x86.c} | 8 +-- tools/perf/util/unwind-libdw.c | 51 ++++++++++++++++--- tools/perf/util/unwind-libdw.h | 10 +++- 19 files changed, 104 insertions(+), 57 deletions(-) create mode 100644 tools/perf/util/unwind-libdw-arch/Build rename tools/perf/{arch/arm/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-arm.c} (80%) rename tools/perf/{arch/arm64/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-arm64.c} (87%) rename tools/perf/{arch/csky/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-csky.c} (90%) rename tools/perf/{arch/loongarch/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-loongarch.c} (86%) rename tools/perf/{arch/powerpc/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-powerpc.c} (89%) rename tools/perf/{arch/riscv/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-riscv.c} (87%) rename tools/perf/{arch/s390/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-s390.c} (84%) rename tools/perf/{arch/x86/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-x86.c} (87%)tools/perf/arch/arm/util/Build +0
-1@@ -1,6 +1,5 @@ perf-util-y += perf_regs.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o perf-util-y += pmu.o auxtrace.o cs-etm.otools/perf/arch/arm64/util/Build +0
-1@@ -1,4 +1,3 @@ -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o perf-util-y += ../../arm/util/auxtrace.otools/perf/arch/csky/util/Build +0
-2@@ -1,3 +1 @@ perf-util-y += perf_regs.o - -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.otools/perf/arch/powerpc/util/Build +0
-1@@ -9,5 +9,4 @@ perf-util-y += evsel.o perf-util-$(CONFIG_LIBDW) += skip-callchain-idx.o perf-util-$(CONFIG_LIBUNWIND) += unwind-libunwind.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o perf-util-y += auxtrace.otools/perf/arch/riscv/util/Build +0
-1@@ -2,4 +2,3 @@ perf-util-y += perf_regs.o perf-util-y += header.o perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.otools/perf/arch/s390/util/Build +0
-2@@ -2,8 +2,6 @@ perf-util-y += header.o perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o perf-util-y += perf_regs.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o - perf-util-y += machine.o perf-util-y += pmu.otools/perf/arch/x86/util/Build +0
-1@@ -12,7 +12,6 @@ perf-util-y += evsel.o perf-util-y += iostat.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o perf-util-y += auxtrace.o perf-util-y += archinsn.otools/perf/util/Build +1
-0@@ -227,6 +227,7 @@ perf-util-$(CONFIG_LIBDW) += annotate-data.o perf-util-$(CONFIG_LIBDW) += libdw.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw-arch/ perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind-local.o perf-util-$(CONFIG_LIBUNWIND) += unwind-libunwind.o perf-util-$(CONFIG_LIBUNWIND_X86) += libunwind/x86_32.otools/perf/util/unwind-libdw-arch/Build new file +8
-0@@ -0,0 +1,8 @@ +perf-util-y += unwind-libdw-x86.o +perf-util-y += unwind-libdw-arm.o +perf-util-y += unwind-libdw-arm64.o +perf-util-y += unwind-libdw-csky.o +perf-util-y += unwind-libdw-loongarch.o +perf-util-y += unwind-libdw-powerpc.o +perf-util-y += unwind-libdw-riscv.o +perf-util-y += unwind-libdw-s390.otools/perf/util/unwind-libdw-arch/unwind-libdw-arm.c renamed from tools/perf/arch/arm/util/unwind-libdw.c +5
-5@@ -1,11 +1,11 @@// SPDX-License-Identifier: GPL-2.0 #include <elfutils/libdwfl.h> -#include "perf_regs.h" -#include "../../../util/unwind-libdw.h" -#include "../../../util/perf_regs.h" -#include "../../../util/sample.h" +#include "../arch/arm/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/sample.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_arm (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);tools/perf/util/unwind-libdw-arch/unwind-libdw-arm64.c renamed from tools/perf/arch/arm64/util/unwind-libdw.c +5
-5@@ -1,11 +1,11 @@// SPDX-License-Identifier: GPL-2.0 #include <elfutils/libdwfl.h> -#include "perf_regs.h" -#include "../../../util/unwind-libdw.h" -#include "../../../util/perf_regs.h" -#include "../../../util/sample.h" +#include "../arch/arm64/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/sample.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_arm64 (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);tools/perf/util/unwind-libdw-arch/unwind-libdw-csky.c renamed from tools/perf/arch/csky/util/unwind-libdw.c +5
-5@@ -2,12 +2,12 @@// Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd. #include <elfutils/libdwfl.h> -#include "perf_regs.h" -#include "../../util/unwind-libdw.h" -#include "../../util/perf_regs.h" -#include "../../util/event.h" +#include "../arch/csky/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/sample.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_csky (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);tools/perf/util/unwind-libdw-arch/unwind-libdw-loongarch.c renamed from tools/perf/arch/loongarch/util/unwind-libdw.c +5
-5@@ -2,12 +2,12 @@/* Copyright (C) 2020-2023 Loongson Technology Corporation Limited */ #include <elfutils/libdwfl.h> -#include "perf_regs.h" -#include "../../util/unwind-libdw.h" -#include "../../util/perf_regs.h" -#include "../../util/sample.h" +#include "../arch/loongarch/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/sample.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_loongarch (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);tools/perf/util/unwind-libdw-arch/unwind-libdw-powerpc.c renamed from tools/perf/arch/powerpc/util/unwind-libdw.c +5
-5@@ -1,10 +1,10 @@// SPDX-License-Identifier: GPL-2.0 #include <elfutils/libdwfl.h> #include <linux/kernel.h> -#include "perf_regs.h" -#include "../../../util/unwind-libdw.h" -#include "../../../util/perf_regs.h" -#include "../../../util/sample.h" +#include "../arch/powerpc/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/sample.h" /* See backends/ppc_initreg.c and backends/ppc_regs.c in elfutils. */ static const int special_regs[3 ][2 ] = {@@ -13,7 +13,7 @@ static const int special_regs[3][2] = { { 109, PERF_REG_POWERPC_CTR }, }; -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_powerpc (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);tools/perf/util/unwind-libdw-arch/unwind-libdw-riscv.c renamed from tools/perf/arch/riscv/util/unwind-libdw.c +5
-5@@ -2,12 +2,12 @@/* Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd. */ #include <elfutils/libdwfl.h> -#include "perf_regs.h" -#include "../../util/unwind-libdw.h" -#include "../../util/perf_regs.h" -#include "../../util/sample.h" +#include "../arch/riscv/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/sample.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_riscv (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);tools/perf/util/unwind-libdw-arch/unwind-libdw-s390.c renamed from tools/perf/arch/s390/util/unwind-libdw.c +7
-7@@ -1,14 +1,14 @@#include <linux/kernel.h> #include <elfutils/libdwfl.h> -#include "../../util/unwind-libdw.h" -#include "../../util/perf_regs.h" -#include "../../util/event.h" -#include "../../util/sample.h" -#include "dwarf-regs-table.h" -#include "perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/event.h" +#include "util/sample.h" +#include "../arch/s390/include/dwarf-regs-table.h" +#include "../arch/s390/include/uapi/asm/perf_regs.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_s390 (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);tools/perf/util/unwind-libdw-arch/unwind-libdw-x86.c renamed from tools/perf/arch/x86/util/unwind-libdw.c +4
-4@@ -1,11 +1,11 @@// SPDX-License-Identifier: GPL-2.0 #include <elfutils/libdwfl.h> -#include "perf_regs.h" -#include "../../../util/unwind-libdw.h" -#include "../../../util/perf_regs.h" +#include "../arch/x86/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" #include "util/sample.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_x86 (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);tools/perf/util/unwind-libdw.c +45
-6@@ -225,11 +225,45 @@ static bool memory_read(Dwfl *dwfl __maybe_unused, Dwarf_Addr addr, Dwarf_Word *return true; } -static const Dwfl_Thread_Callbacks callbacks = { - .next_thread = next_thread, - .memory_read = memory_read, - .set_initial_registers = libdw__arch_set_initial_registers, -}; +#define DEFINE_DWFL_THREAD_CALLBACKS (arch) \ +static const Dwfl_Thread_Callbacks callbacks_##arch = { \ + .next_thread = next_thread, \ + .memory_read = memory_read, \ + .set_initial_registers = libdw_set_initial_registers_##arch, \ +} + +DEFINE_DWFL_THREAD_CALLBACKS (x86); +DEFINE_DWFL_THREAD_CALLBACKS (arm); +DEFINE_DWFL_THREAD_CALLBACKS (arm64); +DEFINE_DWFL_THREAD_CALLBACKS (csky); +DEFINE_DWFL_THREAD_CALLBACKS (loongarch); +DEFINE_DWFL_THREAD_CALLBACKS (powerpc); +DEFINE_DWFL_THREAD_CALLBACKS (riscv); +DEFINE_DWFL_THREAD_CALLBACKS (s390); + +static const Dwfl_Thread_Callbacks *get_thread_callbacks (const char *arch) +{ +if (!strcmp (arch,"arm" )) +return &callbacks_arm; +else if (!strcmp (arch,"arm64" )) +return &callbacks_arm64; +else if (!strcmp (arch,"csky" )) +return &callbacks_csky; +else if (!strcmp (arch,"loongarch" )) +return &callbacks_loongarch; +else if (!strcmp (arch,"powerpc" )) +return &callbacks_powerpc; +else if (!strcmp (arch,"riscv" )) +return &callbacks_riscv; +else if (!strcmp (arch,"s390" )) +return &callbacks_s390; +else if (!strcmp (arch,"x86" )) +return &callbacks_x86; + +pr_err ("Fail to get thread callbacks for arch %s, returns NULL\n" , + arch); +return NULL ; +}static int frame_callback (Dwfl_Frame *state,void *arg)@@ -278,6 +312,7 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg,const char *arch =perf_env__arch (ui_buf.machine->env);Dwarf_Word ip;int err = -EINVAL , i; +const Dwfl_Thread_Callbacks *callbacks;if (!data->user_regs || !data->user_regs->regs)return -EINVAL ;@@ -300,7 +335,11 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg,if (err) goto out; - err = !dwfl_attach_state (ui->dwfl,EM_NONE ,thread__tid (thread), &callbacks, ui); + callbacks =get_thread_callbacks (arch); +if (!callbacks) + goto out; + + err = !dwfl_attach_state (ui->dwfl,EM_NONE ,thread__tid (thread), callbacks, ui);if (err) goto out;tools/perf/util/unwind-libdw.h +9
-1@@ -9,7 +9,15 @@ struct machine;struct perf_sample ;struct thread ; -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_x86 (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_arm (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_arm64 (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_csky (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_loongarch (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_mips (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_powerpc (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_riscv (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_s390 (Dwfl_Thread *thread,void *arg);struct unwind_info {Dwfl *dwfl;Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerRe: [PATCH v1 04/23] perf unwind-libdw: fix a cross-arch unwinding bug
Quoted 14 lines · Arnaldo Carvalho de Melo
Quoted 11 lines · Ian Rogers
From: Shimin Guo <[email protected]>
The
set_initial_registersfield ofDwfl_Thread_Callbacksneeds to be set according to the arch of the stack samples being analyzed, not the arch that perf itself is built for. Currently perf fails to unwind stack samples collected from archs different from that of the host perf is running on. This patch moves the arch-specific implementations ofset_initial_registersfromtools/perf/archtotools/perf/utli/unwind-libdw-arch, similar to the way the perf-regs-arch folder contains arch-specific functions related to registers, and chooses the implementation based on the arch of the data being processed.
Quoted 7 lines
Since this one is coming thru you, we need your:
Signed-off-by Ian Rogers <[email protected]>Ok?
I'm adding it here, please ack.
Acked. Sorry for the problem.
Ian
Quoted 440 lines
- Arnaldo
Quoted 438 lines
Signed-off-by Shimin Guo <[email protected]>Reviewed-by Ian Rogers <[email protected]>Acked-by Namhyung Kim <[email protected]>--- tools/perf/arch/arm/util/Build | 1 - tools/perf/arch/arm64/util/Build | 1 - tools/perf/arch/csky/util/Build | 2 - tools/perf/arch/powerpc/util/Build | 1 - tools/perf/arch/riscv/util/Build | 1 - tools/perf/arch/s390/util/Build | 2 - tools/perf/arch/x86/util/Build | 1 - tools/perf/util/Build | 1 + tools/perf/util/unwind-libdw-arch/Build | 8 +++ .../unwind-libdw-arch/unwind-libdw-arm.c} | 10 ++-- .../unwind-libdw-arch/unwind-libdw-arm64.c} | 10 ++-- .../unwind-libdw-arch/unwind-libdw-csky.c} | 10 ++-- .../unwind-libdw-loongarch.c} | 10 ++-- .../unwind-libdw-arch/unwind-libdw-powerpc.c} | 10 ++-- .../unwind-libdw-arch/unwind-libdw-riscv.c} | 10 ++-- .../unwind-libdw-arch/unwind-libdw-s390.c} | 14 ++--- .../unwind-libdw-arch/unwind-libdw-x86.c} | 8 +-- tools/perf/util/unwind-libdw.c | 51 ++++++++++++++++--- tools/perf/util/unwind-libdw.h | 10 +++- 19 files changed, 104 insertions(+), 57 deletions(-) create mode 100644 tools/perf/util/unwind-libdw-arch/Build rename tools/perf/{arch/arm/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-arm.c} (80%) rename tools/perf/{arch/arm64/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-arm64.c} (87%) rename tools/perf/{arch/csky/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-csky.c} (90%) rename tools/perf/{arch/loongarch/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-loongarch.c} (86%) rename tools/perf/{arch/powerpc/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-powerpc.c} (89%) rename tools/perf/{arch/riscv/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-riscv.c} (87%) rename tools/perf/{arch/s390/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-s390.c} (84%) rename tools/perf/{arch/x86/util/unwind-libdw.c => util/unwind-libdw-arch/unwind-libdw-x86.c} (87%)tools/perf/arch/arm/util/Build +0
-1@@ -1,6 +1,5 @@ perf-util-y += perf_regs.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o perf-util-y += pmu.o auxtrace.o cs-etm.otools/perf/arch/arm64/util/Build +0
-1@@ -1,4 +1,3 @@ -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o perf-util-y += ../../arm/util/auxtrace.otools/perf/arch/csky/util/Build +0
-2@@ -1,3 +1 @@ perf-util-y += perf_regs.o - -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.otools/perf/arch/powerpc/util/Build +0
-1@@ -9,5 +9,4 @@ perf-util-y += evsel.o perf-util-$(CONFIG_LIBDW) += skip-callchain-idx.o perf-util-$(CONFIG_LIBUNWIND) += unwind-libunwind.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o perf-util-y += auxtrace.otools/perf/arch/riscv/util/Build +0
-1@@ -2,4 +2,3 @@ perf-util-y += perf_regs.o perf-util-y += header.o perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.otools/perf/arch/s390/util/Build +0
-2@@ -2,8 +2,6 @@ perf-util-y += header.o perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o perf-util-y += perf_regs.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o - perf-util-y += machine.o perf-util-y += pmu.otools/perf/arch/x86/util/Build +0
-1@@ -12,7 +12,6 @@ perf-util-y += evsel.o perf-util-y += iostat.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o perf-util-y += auxtrace.o perf-util-y += archinsn.otools/perf/util/Build +1
-0@@ -227,6 +227,7 @@ perf-util-$(CONFIG_LIBDW) += annotate-data.o perf-util-$(CONFIG_LIBDW) += libdw.o perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw-arch/ perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind-local.o perf-util-$(CONFIG_LIBUNWIND) += unwind-libunwind.o perf-util-$(CONFIG_LIBUNWIND_X86) += libunwind/x86_32.otools/perf/util/unwind-libdw-arch/Build new file +8
-0@@ -0,0 +1,8 @@ +perf-util-y += unwind-libdw-x86.o +perf-util-y += unwind-libdw-arm.o +perf-util-y += unwind-libdw-arm64.o +perf-util-y += unwind-libdw-csky.o +perf-util-y += unwind-libdw-loongarch.o +perf-util-y += unwind-libdw-powerpc.o +perf-util-y += unwind-libdw-riscv.o +perf-util-y += unwind-libdw-s390.otools/perf/util/unwind-libdw-arch/unwind-libdw-arm.c renamed from tools/perf/arch/arm/util/unwind-libdw.c +5
-5@@ -1,11 +1,11 @@// SPDX-License-Identifier: GPL-2.0 #include <elfutils/libdwfl.h> -#include "perf_regs.h" -#include "../../../util/unwind-libdw.h" -#include "../../../util/perf_regs.h" -#include "../../../util/sample.h" +#include "../arch/arm/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/sample.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_arm (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);tools/perf/util/unwind-libdw-arch/unwind-libdw-arm64.c renamed from tools/perf/arch/arm64/util/unwind-libdw.c +5
-5@@ -1,11 +1,11 @@// SPDX-License-Identifier: GPL-2.0 #include <elfutils/libdwfl.h> -#include "perf_regs.h" -#include "../../../util/unwind-libdw.h" -#include "../../../util/perf_regs.h" -#include "../../../util/sample.h" +#include "../arch/arm64/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/sample.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_arm64 (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);tools/perf/util/unwind-libdw-arch/unwind-libdw-csky.c renamed from tools/perf/arch/csky/util/unwind-libdw.c +5
-5@@ -2,12 +2,12 @@// Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd. #include <elfutils/libdwfl.h> -#include "perf_regs.h" -#include "../../util/unwind-libdw.h" -#include "../../util/perf_regs.h" -#include "../../util/event.h" +#include "../arch/csky/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/sample.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_csky (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);tools/perf/util/unwind-libdw-arch/unwind-libdw-loongarch.c renamed from tools/perf/arch/loongarch/util/unwind-libdw.c +5
-5@@ -2,12 +2,12 @@/* Copyright (C) 2020-2023 Loongson Technology Corporation Limited */ #include <elfutils/libdwfl.h> -#include "perf_regs.h" -#include "../../util/unwind-libdw.h" -#include "../../util/perf_regs.h" -#include "../../util/sample.h" +#include "../arch/loongarch/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/sample.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_loongarch (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);tools/perf/util/unwind-libdw-arch/unwind-libdw-powerpc.c renamed from tools/perf/arch/powerpc/util/unwind-libdw.c +5
-5@@ -1,10 +1,10 @@// SPDX-License-Identifier: GPL-2.0 #include <elfutils/libdwfl.h> #include <linux/kernel.h> -#include "perf_regs.h" -#include "../../../util/unwind-libdw.h" -#include "../../../util/perf_regs.h" -#include "../../../util/sample.h" +#include "../arch/powerpc/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/sample.h" /* See backends/ppc_initreg.c and backends/ppc_regs.c in elfutils. */ static const int special_regs[3 ][2 ] = {@@ -13,7 +13,7 @@ static const int special_regs[3][2] = { { 109, PERF_REG_POWERPC_CTR }, }; -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_powerpc (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);tools/perf/util/unwind-libdw-arch/unwind-libdw-riscv.c renamed from tools/perf/arch/riscv/util/unwind-libdw.c +5
-5@@ -2,12 +2,12 @@/* Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd. */ #include <elfutils/libdwfl.h> -#include "perf_regs.h" -#include "../../util/unwind-libdw.h" -#include "../../util/perf_regs.h" -#include "../../util/sample.h" +#include "../arch/riscv/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/sample.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_riscv (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);tools/perf/util/unwind-libdw-arch/unwind-libdw-s390.c renamed from tools/perf/arch/s390/util/unwind-libdw.c +7
-7@@ -1,14 +1,14 @@#include <linux/kernel.h> #include <elfutils/libdwfl.h> -#include "../../util/unwind-libdw.h" -#include "../../util/perf_regs.h" -#include "../../util/event.h" -#include "../../util/sample.h" -#include "dwarf-regs-table.h" -#include "perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" +#include "util/event.h" +#include "util/sample.h" +#include "../arch/s390/include/dwarf-regs-table.h" +#include "../arch/s390/include/uapi/asm/perf_regs.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_s390 (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);tools/perf/util/unwind-libdw-arch/unwind-libdw-x86.c renamed from tools/perf/arch/x86/util/unwind-libdw.c +4
-4@@ -1,11 +1,11 @@// SPDX-License-Identifier: GPL-2.0 #include <elfutils/libdwfl.h> -#include "perf_regs.h" -#include "../../../util/unwind-libdw.h" -#include "../../../util/perf_regs.h" +#include "../arch/x86/include/uapi/asm/perf_regs.h" +#include "util/unwind-libdw.h" +#include "util/perf_regs.h" #include "util/sample.h" -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg) +bool libdw_set_initial_registers_x86 (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);tools/perf/util/unwind-libdw.c +45
-6@@ -225,11 +225,45 @@ static bool memory_read(Dwfl *dwfl __maybe_unused, Dwarf_Addr addr, Dwarf_Word *return true; } -static const Dwfl_Thread_Callbacks callbacks = { - .next_thread = next_thread, - .memory_read = memory_read, - .set_initial_registers = libdw__arch_set_initial_registers, -}; +#define DEFINE_DWFL_THREAD_CALLBACKS (arch) \ +static const Dwfl_Thread_Callbacks callbacks_##arch = { \ + .next_thread = next_thread, \ + .memory_read = memory_read, \ + .set_initial_registers = libdw_set_initial_registers_##arch, \ +} + +DEFINE_DWFL_THREAD_CALLBACKS (x86); +DEFINE_DWFL_THREAD_CALLBACKS (arm); +DEFINE_DWFL_THREAD_CALLBACKS (arm64); +DEFINE_DWFL_THREAD_CALLBACKS (csky); +DEFINE_DWFL_THREAD_CALLBACKS (loongarch); +DEFINE_DWFL_THREAD_CALLBACKS (powerpc); +DEFINE_DWFL_THREAD_CALLBACKS (riscv); +DEFINE_DWFL_THREAD_CALLBACKS (s390); + +static const Dwfl_Thread_Callbacks *get_thread_callbacks (const char *arch) +{ +if (!strcmp (arch,"arm" )) +return &callbacks_arm; +else if (!strcmp (arch,"arm64" )) +return &callbacks_arm64; +else if (!strcmp (arch,"csky" )) +return &callbacks_csky; +else if (!strcmp (arch,"loongarch" )) +return &callbacks_loongarch; +else if (!strcmp (arch,"powerpc" )) +return &callbacks_powerpc; +else if (!strcmp (arch,"riscv" )) +return &callbacks_riscv; +else if (!strcmp (arch,"s390" )) +return &callbacks_s390; +else if (!strcmp (arch,"x86" )) +return &callbacks_x86; + +pr_err ("Fail to get thread callbacks for arch %s, returns NULL\n" , + arch); +return NULL ; +}static int frame_callback (Dwfl_Frame *state,void *arg)@@ -278,6 +312,7 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg,const char *arch =perf_env__arch (ui_buf.machine->env);Dwarf_Word ip;int err = -EINVAL , i; +const Dwfl_Thread_Callbacks *callbacks;if (!data->user_regs || !data->user_regs->regs)return -EINVAL ;@@ -300,7 +335,11 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg,if (err) goto out; - err = !dwfl_attach_state (ui->dwfl,EM_NONE ,thread__tid (thread), &callbacks, ui); + callbacks =get_thread_callbacks (arch); +if (!callbacks) + goto out; + + err = !dwfl_attach_state (ui->dwfl,EM_NONE ,thread__tid (thread), callbacks, ui);if (err) goto out;tools/perf/util/unwind-libdw.h +9
-2@@ -9,7 +9,15 @@ struct machine;struct perf_sample ;struct thread ; -bool libdw__arch_set_initial_registers (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_x86 (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_arm (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_arm64 (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_csky (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_loongarch (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_mips (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_powerpc (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_riscv (Dwfl_Thread *thread,void *arg); +bool libdw_set_initial_registers_s390 (Dwfl_Thread *thread,void *arg);struct unwind_info {Dwfl *dwfl; --2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 5/23 perf libdw_addr2line: Fixes to srcline memory allocation
In reply to Ian RogersSome irregular stack traces are causing double frees and memory leaks. Make the code robust by proactively freeing and being more careful with the memory management of the leaf_srcline.
--- tools/perf/util/libdw.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
tools/perf/util/libdw.c +11 -3
@@ -42,16 +42,24 @@ static int libdw_a2l_cb(Dwarf_Die *die, void *_args) call_srcline =srcline_from_fileline (call_fname,die_get_call_lineno (die));list_for_each_entry (ilist, &args->node->val, list) { +if (args->leaf_srcline == ilist->srcline) + args->leaf_srcline_used = false; +else if (ilist->srcline != srcline__unknown) +free (ilist->srcline); ilist->srcline = call_srcline; call_srcline =NULL ;break ; } -if (call_srcline && call_fname) +if (call_srcline && call_srcline != srcline__unknown)free (call_srcline);/* Add this symbol to the chain as the leaf. */ -inline_list__append_tail (inline_sym, args->leaf_srcline, args->node); - args->leaf_srcline_used = true; +if (!args->leaf_srcline_used) { +inline_list__append_tail (inline_sym, args->leaf_srcline, args->node); + args->leaf_srcline_used = true; + }else { +inline_list__append_tail (inline_sym,strdup (args->leaf_srcline), args->node); + }return 0 ; }
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 6/23 perf unwind-libdw: Correct argument to dwfl_attach_state
In reply to Ian RogersArgument is a pointer but EM_NONE (0) was being passed. Correct by passing NULL.
--- tools/perf/util/unwind-libdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/unwind-libdw.c +1 -1
@@ -339,7 +339,7 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg,if (!callbacks) goto out; - err = !dwfl_attach_state (ui->dwfl,EM_NONE ,thread__tid (thread), callbacks, ui); + err = !dwfl_attach_state (ui->dwfl,/*elf=*/ NULL ,thread__tid (thread), callbacks, ui);if (err) goto out;
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 7/23 perf powerpc: Unify the skip-callchain-idx libdw with that for addr2line
In reply to Ian RogersRather than have 2 Dwfl unify the Dwfl in skip-callchain-idx with that is used by libdw__addr2line. Rename that variable in struct dso from a2l_libdw to just libdw as it is now used in more than addr2line.
The Dwfl in skip-callchain-idx uses a map address when being read with dwfl_report_elf (rather than dwfl_report_offline that addr2line uses). skip-callchain-idx is wrong as the map address can vary between processes because of ASLR, ie it should need a different Dwfl per process. In the code after this patch the base address becomes 0 and the mapped PC is used with the dwfl functions. This should increase the accuracy of skip-callchain-idx, but the impact has only been build tested.
--- .../arch/powerpc/util/skip-callchain-idx.c | 52 ++------- tools/perf/util/dso.c | 2 +- tools/perf/util/dso.h | 23 ++-- tools/perf/util/libdw.c | 101 ++++++++++-------- tools/perf/util/libdw.h | 12 +-- tools/perf/util/srcline.c | 2 +- 6 files changed, 89 insertions(+), 103 deletions(-)
tools/perf/arch/powerpc/util/skip-callchain-idx.c +11 -41
@@ -30,14 +30,6 @@* The libdwfl code in this file is based on code from elfutils * (libdwfl/argp-std.c, libdwfl/tests/addrcfi.c, etc). */ -static char *debuginfo_path; - -static const Dwfl_Callbacks offline_callbacks = { - .debuginfo_path = &debuginfo_path, - .find_debuginfo = dwfl_standard_find_debuginfo, - .section_address = dwfl_offline_section_address, -}; -/* * Use the DWARF expression for the Call-frame-address and determine
@@ -149,44 +141,22 @@ static Dwarf_Frame *get_dwarf_frame(Dwfl_Module *mod, Dwarf_Addr pc)* yet used) * -1 in case of errors */ -static int check_return_addr (struct dso *dso,u64 map_start,Dwarf_Addr pc) +static int check_return_addr (struct dso *dso,Dwarf_Addr mapped_pc) {int rc =-1 ;Dwfl *dwfl;Dwfl_Module *mod;Dwarf_Frame *frame;int ra_regno; -Dwarf_Addr start = pc; -Dwarf_Addr end = pc; +Dwarf_Addr start = mapped_pc; +Dwarf_Addr end = mapped_pc;bool signalp; -const char *exec_file =dso__long_name (dso); - - dwfl =RC_CHK_ACCESS (dso)->dwfl; - -if (!dwfl) { - dwfl =dwfl_begin (&offline_callbacks); -if (!dwfl) { -pr_debug ("dwfl_begin() failed: %s\n" ,dwarf_errmsg (-1 )); -return -1 ; - } - - mod =dwfl_report_elf (dwfl, exec_file, exec_file,-1 , - map_start, false); -if (!mod) { -pr_debug ("dwfl_report_elf() failed %s\n" , -dwarf_errmsg (-1 )); -/* -* We normally cache the DWARF debug info and never -* call dwfl_end(). But to prevent fd leak, free in -* case of error. -*/ -dwfl_end (dwfl); - goto out; - } -RC_CHK_ACCESS (dso)->dwfl = dwfl; - } - mod =dwfl_addrmodule (dwfl, pc); + dwfl =dso__libdw_dwfl (dso); +if (!dwfl) +return -1 ; + + mod =dwfl_addrmodule (dwfl, mapped_pc);if (!mod) {pr_debug ("dwfl_addrmodule() failed, %s\n" ,dwarf_errmsg (-1 )); goto out;
@@ -196,9 +166,9 @@ static int check_return_addr(struct dso *dso, u64 map_start, Dwarf_Addr pc)* To work with split debug info files (eg: glibc), check both * .eh_frame and .debug_frame sections of the ELF header. */ - frame =get_eh_frame (mod, pc); + frame =get_eh_frame (mod, mapped_pc);if (!frame) { - frame =get_dwarf_frame (mod, pc); + frame =get_dwarf_frame (mod, mapped_pc);if (!frame) goto out; }
@@ -264,7 +234,7 @@ int arch_skip_callchain_idx(struct thread *thread, struct ip_callchain *chain)return skip_slot; } - rc =check_return_addr (dso,map__start (al.map), ip); + rc =check_return_addr (dso,map__map_ip (al.map, ip));pr_debug ("[DSO %s, sym %s, ip 0x%" PRIx64"] rc %d\n" ,dso__long_name (dso), al.sym->name, ip, rc);
tools/perf/util/dso.c +1 -1
@@ -1612,7 +1612,7 @@ void dso__delete(struct dso *dso)auxtrace_cache__free (RC_CHK_ACCESS (dso)->auxtrace_cache);dso_cache__free (dso);dso__free_a2l (dso); -dso__free_a2l_libdw (dso); +dso__free_libdw (dso);dso__free_symsrc_filename (dso);nsinfo__zput (RC_CHK_ACCESS (dso)->nsinfo);mutex_destroy (dso__lock (dso));
tools/perf/util/dso.h +15 -8
@@ -268,11 +268,8 @@ DECLARE_RC_STRUCT(dso) {const char *short_name;const char *long_name;void *a2l; -void *a2l_libdw; +void *libdw;char *symsrc_filename; -#if defined(__powerpc__) -void *dwfl;/* DWARF debug info */ -#endif struct nsinfo *nsinfo;struct auxtrace_cache *auxtrace_cache;union {/* Tool specific area */
@@ -335,16 +332,26 @@ static inline void dso__set_a2l(struct dso *dso, void *val)RC_CHK_ACCESS (dso)->a2l = val; } -static inline void *dso__a2l_libdw (const struct dso *dso) +static inline void *dso__libdw (const struct dso *dso) { -return RC_CHK_ACCESS (dso)->a2l_libdw; +return RC_CHK_ACCESS (dso)->libdw; } -static inline void dso__set_a2l_libdw (struct dso *dso,void *val) +static inline void dso__set_libdw (struct dso *dso,void *val) { -RC_CHK_ACCESS (dso)->a2l_libdw = val; +RC_CHK_ACCESS (dso)->libdw = val; } +struct Dwfl ; +#ifdef HAVE_LIBDW_SUPPORT +struct Dwfl *dso__libdw_dwfl (struct dso *dso); +#else +static inline struct Dwfl *dso__libdw_dwfl (struct dso *dso__maybe_unused ) +{ +return NULL ; +} +#endif +static inline unsigned int dso__a2l_fails (const struct dso *dso) {return RC_CHK_ACCESS (dso)->a2l_fails;
tools/perf/util/libdw.c +56 -45
128 lines not on this page · raw message
tools/perf/util/libdw.h +5 -7
@@ -11,7 +11,6 @@ struct symbol;#ifdef HAVE_LIBDW_SUPPORT /* * libdw__addr2line - Convert address to source location using libdw -* @dso_name: Name of the DSO * @addr: Address to resolve * @file: Pointer to return filename (caller must free) * @line_nr: Pointer to return line number
@@ -26,23 +25,22 @@ struct symbol;* * Returns 1 on success (found), 0 on failure (not found). */ -int libdw__addr2line (const char *dso_name,u64 addr,char **file, +int libdw__addr2line (u64 addr,char **file,unsigned int *line_nr,struct dso *dso,bool unwind_inlines,struct inline_node *node,struct symbol *sym);/* -* dso__free_a2l_libdw - Free libdw resources associated with the DSO +* dso__free_libdw - Free libdw resources associated with the DSO * @dso: The dso to free resources for * * This function cleans up the Dwfl context used for addr2line lookups. */ -void dso__free_a2l_libdw (struct dso *dso); +void dso__free_libdw (struct dso *dso);#else /* HAVE_LIBDW_SUPPORT */ -static inline int libdw__addr2line(const char *dso_name __maybe_unused, - u64 addr __maybe_unused, char **file __maybe_unused, +static inline int libdw__addr2line(u64 addr __maybe_unused, char **file __maybe_unused, unsigned int *line_nr __maybe_unused, struct dso *dso __maybe_unused, bool unwind_inlines __maybe_unused,
@@ -52,7 +50,7 @@ static inline int libdw__addr2line(const char *dso_name __maybe_unused, return 0; } -static inline void dso__free_a2l_libdw (struct dso *dso__maybe_unused ) +static inline void dso__free_libdw (struct dso *dso__maybe_unused ) { }#endif /* HAVE_LIBDW_SUPPORT */
tools/perf/util/srcline.c +1 -1
@@ -161,7 +161,7 @@ static int addr2line(const char *dso_name, u64 addr, char **file, unsigned int *for (size_t i =0 ; i <ARRAY_SIZE (symbol_conf.addr2line_style); i++) {switch (symbol_conf.addr2line_style[i]) {case A2L_STYLE_LIBDW : - ret =libdw__addr2line (dso_name, addr, file, line_nr, dso, unwind_inlines, + ret =libdw__addr2line (addr, file, line_nr, dso, unwind_inlines, node, sym);break ;case A2L_STYLE_LLVM :
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 8/23 perf perf_regs: Switch from arch string to int e_machine
In reply to Ian RogersThe arch string requires multiple strcmp to identify things like the IP and SP. Switch to passing in an e_machine that in the bulk of cases is computed using a current thread load. The e_machine also allows identification of 32-bit vs 64-bit processes.
--- tools/perf/builtin-script.c | 17 ++- tools/perf/util/evsel.c | 14 ++- tools/perf/util/perf_regs.c | 105 +++++++++++------- tools/perf/util/perf_regs.h | 10 +- .../scripting-engines/trace-event-python.c | 21 ++-- tools/perf/util/session.c | 65 ++++++++--- tools/perf/util/session.h | 1 + tools/perf/util/unwind-libdw.c | 12 +- tools/perf/util/unwind-libunwind-local.c | 7 +- 9 files changed, 164 insertions(+), 88 deletions(-)
tools/perf/builtin-script.c +8 -9
@@ -717,7 +717,7 @@ static int perf_session__check_output_opt(struct perf_session *session)return 0 ; } -static int perf_sample__fprintf_regs (struct regs_dump *regs,uint64_t mask,const char *arch, +static int perf_sample__fprintf_regs (struct regs_dump *regs,uint64_t mask,uint16_t e_machine,FILE *fp) {unsigned i =0 , r;
@@ -730,7 +730,7 @@ static int perf_sample__fprintf_regs(struct regs_dump *regs, uint64_t mask, consfor_each_set_bit (r, (unsigned long *) &mask,sizeof (mask) *8 ) {u64 val = regs->regs[i++]; - printed +=fprintf (fp,"%5s:0x%" PRIx64" " ,perf_reg_name (r, arch), val); + printed +=fprintf (fp,"%5s:0x%" PRIx64" " ,perf_reg_name (r, e_machine), val); }return printed;
@@ -787,23 +787,23 @@ tod_scnprintf(struct perf_script *script, char *buf, int buflen, }static int perf_sample__fprintf_iregs (struct perf_sample *sample, -struct perf_event_attr *attr,const char *arch,FILE *fp) +struct perf_event_attr *attr,uint16_t e_machine,FILE *fp) {if (!sample->intr_regs)return 0 ;return perf_sample__fprintf_regs (perf_sample__intr_regs (sample), - attr->sample_regs_intr, arch, fp); + attr->sample_regs_intr, e_machine, fp); }static int perf_sample__fprintf_uregs (struct perf_sample *sample, -struct perf_event_attr *attr,const char *arch,FILE *fp) +struct perf_event_attr *attr,uint16_t e_machine,FILE *fp) {if (!sample->user_regs)return 0 ;return perf_sample__fprintf_regs (perf_sample__user_regs (sample), - attr->sample_regs_user, arch, fp); + attr->sample_regs_user, e_machine, fp); } static int perf_sample__fprintf_start(struct perf_script *script,
@@ -2418,7 +2418,6 @@ static void process_event(struct perf_script *script,struct evsel_script *es = evsel->priv;FILE *fp = es->fp;char str[PAGE_SIZE_NAME_LEN ]; -const char *arch =perf_env__arch (machine->env);if (output[type].fields ==0 )return ;
@@ -2506,10 +2505,10 @@ static void process_event(struct perf_script *script, }if (PRINT_FIELD (IREGS )) -perf_sample__fprintf_iregs (sample, attr, arch, fp); +perf_sample__fprintf_iregs (sample, attr,thread__e_machine (thread, machine), fp);if (PRINT_FIELD (UREGS )) -perf_sample__fprintf_uregs (sample, attr, arch, fp); +perf_sample__fprintf_uregs (sample, attr,thread__e_machine (thread, machine), fp);if (PRINT_FIELD (BRSTACK ))perf_sample__fprintf_brstack (sample, thread, evsel, fp);
tools/perf/util/evsel.c +11 -3
@@ -34,6 +34,7 @@#include "callchain.h" #include "cgroup.h" #include "counts.h" +#include "dwarf-regs.h" #include "event.h" #include "evsel.h" #include "time-utils.h"
@@ -1007,6 +1008,13 @@ int evsel__group_desc(struct evsel *evsel, char *buf, size_t size)return ret; } +static uint16_t evsel__e_machine (struct evsel *evsel) +{ +struct perf_session *session =evsel__session (evsel); + +return session ?perf_session__e_machine (session) :EM_HOST ; +} +static void __evsel__config_callchain (struct evsel *evsel,struct record_opts *opts,struct callchain_param *param) {
@@ -1042,13 +1050,13 @@ static void __evsel__config_callchain(struct evsel *evsel, struct record_opts *oif (param->record_mode ==CALLCHAIN_DWARF ) {if (!function) { -const char *arch =perf_env__arch (evsel__env (evsel)); +uint16_t e_machine =evsel__e_machine (evsel);evsel__set_sample_bit (evsel,REGS_USER );evsel__set_sample_bit (evsel,STACK_USER );if (opts->sample_user_regs && -DWARF_MINIMAL_REGS (arch) !=arch__user_reg_mask ()) { - attr->sample_regs_user |=DWARF_MINIMAL_REGS (arch); +DWARF_MINIMAL_REGS (e_machine) !=arch__user_reg_mask ()) { + attr->sample_regs_user |=DWARF_MINIMAL_REGS (e_machine);pr_warning ("WARNING: The use of --call-graph=dwarf may require all the user registers, " "specifying a subset with --user-regs may render DWARF unwinding unreliable, " "so the minimal registers set (IP, SP) is explicitly forced.\n" );
tools/perf/util/perf_regs.c +66 -39
152 lines not on this page · raw message
tools/perf/util/perf_regs.h +5 -5
@@ -28,10 +28,10 @@ uint64_t arch__intr_reg_mask(void);uint64_t arch__user_reg_mask (void );const struct sample_reg *arch__sample_reg_masks (void ); -const char *perf_reg_name (int id,const char *arch); +const char *perf_reg_name (int id,uint16_t e_machine);int perf_reg_value (u64 *valp,struct regs_dump *regs,int id); -uint64_t perf_arch_reg_ip (const char *arch); -uint64_t perf_arch_reg_sp (const char *arch); +uint64_t perf_arch_reg_ip (uint16_t e_machine); +uint64_t perf_arch_reg_sp (uint16_t e_machine);const char *__perf_reg_name_arm64 (int id);uint64_t __perf_reg_ip_arm64 (void );uint64_t __perf_reg_sp_arm64 (void );
@@ -60,9 +60,9 @@ const char *__perf_reg_name_x86(int id);uint64_t __perf_reg_ip_x86 (void );uint64_t __perf_reg_sp_x86 (void ); -static inline uint64_t DWARF_MINIMAL_REGS (const char *arch) +static inline uint64_t DWARF_MINIMAL_REGS (uint16_t e_machine) { -return (1ULL <<perf_arch_reg_ip (arch)) | (1ULL <<perf_arch_reg_sp (arch)); +return (1ULL <<perf_arch_reg_ip (e_machine)) | (1ULL <<perf_arch_reg_sp (e_machine)); }#endif /* __PERF_REGS_H */
tools/perf/util/scripting-engines/trace-event-python.c +14 -7
@@ -50,6 +50,7 @@#include "../thread-stack.h" #include "../trace-event.h" #include "../call-path.h" +#include "dwarf-regs.h" #include "map.h" #include "symbol.h" #include "thread_map.h"
@@ -713,7 +714,7 @@ static void set_sample_datasrc_in_dict(PyObject *dict, _PyUnicode_FromString(decode)); } -static void regs_map (struct regs_dump *regs,uint64_t mask,const char *arch,char *bf,int size) +static void regs_map (struct regs_dump *regs,uint64_t mask,uint16_t e_machine,char *bf,int size) {unsigned int i =0 , r;int printed =0 ;
@@ -731,7 +732,7 @@ static void regs_map(struct regs_dump *regs, uint64_t mask, const char *arch, ch printed +=scnprintf (bf + printed, size - printed,"%5s:0x%" PRIx64" " , -perf_reg_name (r, arch), val); +perf_reg_name (r, e_machine), val); } }
@@ -739,10 +740,10 @@ static void regs_map(struct regs_dump *regs, uint64_t mask, const char *arch, chstatic int set_regs_in_dict (PyObject *dict,struct perf_sample *sample, -struct evsel *evsel) +struct evsel *evsel, +uint16_t e_machine) {struct perf_event_attr *attr = &evsel->core.attr; -const char *arch =perf_env__arch (evsel__env (evsel));int size = (__sw_hweight64 (attr->sample_regs_intr) *MAX_REG_SIZE ) +1 ;char *bf =NULL ;
@@ -752,7 +753,7 @@ static int set_regs_in_dict(PyObject *dict,if (!bf)return -1 ; -regs_map (sample->intr_regs, attr->sample_regs_intr, arch, bf, size); +regs_map (sample->intr_regs, attr->sample_regs_intr, e_machine, bf, size);pydict_set_item_string_decref (dict,"iregs" ,_PyUnicode_FromString (bf));
@@ -764,7 +765,7 @@ static int set_regs_in_dict(PyObject *dict,if (!bf)return -1 ; } -regs_map (sample->user_regs, attr->sample_regs_user, arch, bf, size); +regs_map (sample->user_regs, attr->sample_regs_user, e_machine, bf, size);pydict_set_item_string_decref (dict,"uregs" ,_PyUnicode_FromString (bf));
@@ -834,6 +835,8 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample, PyObject *callchain) {PyObject *dict, *dict_sample, *brstack, *brstacksym; +struct machine *machine; +uint16_t e_machine =EM_HOST ; dict =PyDict_New ();if (!dict)
@@ -920,7 +923,11 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample, PyLong_FromUnsignedLongLong(sample->cyc_cnt)); } -if (set_regs_in_dict (dict, sample, evsel)) +if (al->thread) { + machine =maps__machine (thread__maps (al->thread)); + e_machine =thread__e_machine (al->thread, machine); + } +if (set_regs_in_dict (dict, sample, evsel, e_machine))Py_FatalError ("Failed to setting regs in dict" );return dict;
tools/perf/util/session.c +49 -16
147 lines not on this page · raw message
tools/perf/util/session.h +1 -0
@@ -211,5 +211,6 @@ int perf_event__process_finished_round(const struct perf_tool *tool, struct ordered_events *oe);struct perf_env *perf_session__env (struct perf_session *session); +uint16_t perf_session__e_machine (struct perf_session *session);#endif /* __PERF_SESSION_H */
tools/perf/util/unwind-libdw.c +7 -5
@@ -187,7 +187,7 @@ static bool memory_read(Dwfl *dwfl __maybe_unused, Dwarf_Addr addr, Dwarf_Word * void *arg) {struct unwind_info *ui = arg; -const char *arch =perf_env__arch (ui->machine->env); +uint16_t e_machine =thread__e_machine (ui->thread, ui->machine);struct stack_dump *stack = &ui->sample->user_stack;u64 start, end;int offset;
@@ -197,7 +197,7 @@ static bool memory_read(Dwfl *dwfl __maybe_unused, Dwarf_Addr addr, Dwarf_Word *return false; ret =perf_reg_value (&start, ui->sample->user_regs, -perf_arch_reg_sp (arch)); +perf_arch_reg_sp (e_machine));if (ret)return false;
@@ -300,16 +300,18 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg, int max_stack, bool best_effort) { +struct machine *machine =maps__machine (thread__maps (thread));struct unwind_info *ui, ui_buf = { .sample = data, .thread = thread, - .machine =maps__machine ((thread__maps (thread))), + .machine = machine, .cb = cb, .arg = arg, .max_stack = max_stack, .best_effort = best_effort }; -const char *arch =perf_env__arch (ui_buf.machine->env); +uint16_t e_machine =thread__e_machine (thread, machine); +const char *arch =perf_env__arch (machine->env);Dwarf_Word ip;int err = -EINVAL , i;const Dwfl_Thread_Callbacks *callbacks;
@@ -327,7 +329,7 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg,if (!ui->dwfl) goto out; - err =perf_reg_value (&ip, data->user_regs,perf_arch_reg_ip (arch)); + err =perf_reg_value (&ip, data->user_regs,perf_arch_reg_ip (e_machine));if (err) goto out;
tools/perf/util/unwind-libunwind-local.c +3 -4
@@ -572,7 +572,6 @@ static int access_mem(unw_addr_space_t __maybe_unused as, int __write, void *arg) { struct unwind_info *ui = arg; -const char *arch =perf_env__arch (ui->machine->env);struct stack_dump *stack = &ui->sample->user_stack;u64 start, end;int offset;
@@ -585,7 +584,7 @@ static int access_mem(unw_addr_space_t __maybe_unused as, } ret =perf_reg_value (&start,perf_sample__user_regs (ui->sample), -perf_arch_reg_sp (arch)); +perf_arch_reg_sp (thread__e_machine (ui->thread, ui->machine)));if (ret)return ret;
@@ -734,7 +733,7 @@ static void _unwind__finish_access(struct maps *maps)static int get_entries (struct unwind_info *ui,unwind_entry_cb_t cb,void *arg,int max_stack) { -const char *arch =perf_env__arch (ui->machine->env); +uint16_t e_machine =thread__e_machine (ui->thread, ui->machine);u64 val;unw_word_t ips[max_stack];unw_addr_space_t addr_space;
@@ -742,7 +741,7 @@ static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb,int ret, i =0 ; ret =perf_reg_value (&val,perf_sample__user_regs (ui->sample), -perf_arch_reg_ip (arch)); +perf_arch_reg_ip (e_machine));if (ret)return ret;
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v1 08/23] perf perf_regs: Switch from arch string to int e_machine
Quoted 10 lines · Ian Rogers
The arch string requires multiple strcmp to identify things like the IP and SP. Switch to passing in an
e_machinethat in the bulk of cases is computed using a current thread load. Thee_machinealso allows identification of 32-bit vs 64-bit processes.Signed-off-by Ian Rogers <[email protected]>--- tools/perf/builtin-script.c | 17 ++- tools/perf/util/evsel.c | 14 ++- tools/perf/util/perf_regs.c | 105 +++++++++++-------
[ Include dwarf-regs.h to get conditional defines for EM_CSKY and EM_LOONGARCH, not available in old distros ]
- Arnaldo
Re: [PATCH v1 08/23] perf perf_regs: Switch from arch string to int e_machine
Quoted 6 lines · Arnaldo Carvalho de Melo
Quoted 5 lines · Ian Rogers
The arch string requires multiple strcmp to identify things like the IP and SP. Switch to passing in an
e_machinethat in the bulk of cases is computed using a current thread load. Thee_machinealso allows identification of 32-bit vs 64-bit processes.
Quoted 8 lines
Quoted 5 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/builtin-script.c | 17 ++- tools/perf/util/evsel.c | 14 ++- tools/perf/util/perf_regs.c | 105 +++++++++++-------[ Include
dwarf-regs.hto get conditional defines forEM_CSKYandEM_LOONGARCH, not available in old distros ]- Arnaldo
Seems the change would introduce the below building error.
util/perf_regs.c: In function ‘perf_reg_name’:util/perf_regs.c:48:14: error: ‘EM_LOONGARCH’ undeclared (first use in this function)
48 | case EM_LOONGARCH:
| ^~~~~~~~~~~~util/perf_regs.c:48:14: note: each undeclared identifier is reported only once for each function it appears inutil/perf_regs.c: In function ‘perf_arch_reg_ip’:util/perf_regs.c:114:14: error: ‘EM_LOONGARCH’ undeclared (first use in this function)
114 | case EM_LOONGARCH:
| ^~~~~~~~~~~~util/perf_regs.c: In function ‘perf_arch_reg_sp’:util/perf_regs.c:143:14: error: ‘EM_LOONGARCH’ undeclared (first use in this function)
143 | case EM_LOONGARCH:
| ^~~~~~~~~~~~
It looks EM_LOONGARCH is not defined in the <elf.h> header file, not sure which one is better, include dwarf-regs.h suggested by Arnaldo or direct add the define,
tools/perf/util/perf_regs.c +0 -0
@@ -6,6 +6,10 @@
#include "util/sample.h"
#include "debug.h"
+#ifndef EM_LOONGARCH
+#define EM_LOONGARCH 258
+#endif
+
int __weak arch_sdt_arg_parse_op(char *old_op __maybe_unused, char **new_op __maybe_unused) {
Quoted 1 line
Ian Rogers
reviewerRe: [PATCH v1 08/23] perf perf_regs: Switch from arch string to int e_machine
Quoted 47 lines · Dapeng
Quoted 6 lines · Arnaldo Carvalho de Melo
Quoted 5 lines · Ian Rogers
The arch string requires multiple strcmp to identify things like the IP and SP. Switch to passing in an
e_machinethat in the bulk of cases is computed using a current thread load. Thee_machinealso allows identification of 32-bit vs 64-bit processes.Quoted 8 lines
Quoted 5 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/builtin-script.c | 17 ++- tools/perf/util/evsel.c | 14 ++- tools/perf/util/perf_regs.c | 105 +++++++++++-------[ Include
dwarf-regs.hto get conditional defines forEM_CSKYandEM_LOONGARCH, not available in old distros ]- Arnaldo
Seems the change would introduce the below building error.
util/perf_regs.c: In function ‘perf_reg_name’:util/perf_regs.c:48:14: error: ‘EM_LOONGARCH’ undeclared (first use in this function)
48 | caseEM_LOONGARCH:| ^~~~~~~~~~~~
util/perf_regs.c:48:14: note: each undeclared identifier is reported only once for each function it appears inutil/perf_regs.c: In function ‘perf_arch_reg_ip’:util/perf_regs.c:114:14: error: ‘EM_LOONGARCH’ undeclared (first use in this function)
114 | caseEM_LOONGARCH:| ^~~~~~~~~~~~
util/perf_regs.c: In function ‘perf_arch_reg_sp’:util/perf_regs.c:143:14: error: ‘EM_LOONGARCH’ undeclared (first use in this function)
143 | caseEM_LOONGARCH:| ^~~~~~~~~~~~It looks
EM_LOONGARCHis not defined in the <elf.h> header file, not sure which one is better, includedwarf-regs.hsuggested by Arnaldo or direct add the define,tools/perf/util/perf_regs.c +0
-0
tools/perf/util/perf_regs.c line 11
Quoted 6 lines
tools/perf/util/perf_regs.c +3
-0@@ -6,6 +6,10 @@#include "util/sample.h" #include "debug.h" +#ifndef EM_LOONGARCH +#define EM_LOONGARCH 258 +#endif
Or #include <dwarf-regs.h> which I think is the fix Arnaldo is carrying at the moment.
Thanks,
Ian
Quoted 7 lines
tools/perf/util/perf_regs.c +1
-0+int __weak arch_sdt_arg_parse_op (char *old_op__maybe_unused ,char **new_op__maybe_unused ) {Quoted 3 lines
Ian Rogers
reviewerPATCH 9/23 perf dwarf-regs: Add util/dwarf-regs-arch for consistency with perf-regs
In reply to Ian Rogersperf_regs.h has cross architecture functions for operating with the differing perf register constants. dwarf-regs.h is similar but for cross architecture dwarf notions of registers. For consistency move the arch parts of dwarf-regs out of util and into its own directory.
---
tools/perf/util/Build | 4 +---
tools/perf/util/dwarf-regs-arch/Build | 3 +++
tools/perf/util/{ => dwarf-regs-arch}/dwarf-regs-csky.c | 0
tools/perf/util/{ => dwarf-regs-arch}/dwarf-regs-powerpc.c | 0
tools/perf/util/{ => dwarf-regs-arch}/dwarf-regs-x86.c | 0
5 files changed, 4 insertions(+), 3 deletions(-)
create mode 100644 tools/perf/util/dwarf-regs-arch/Build
rename tools/perf/util/{ => dwarf-regs-arch}/dwarf-regs-csky.c (100%)
rename tools/perf/util/{ => dwarf-regs-arch}/dwarf-regs-powerpc.c (100%)
rename tools/perf/util/{ => dwarf-regs-arch}/dwarf-regs-x86.c (100%)tools/perf/util/Build +1 -3
@@ -219,9 +219,7 @@ endif perf-util-$(CONFIG_LIBDW) += probe-finder.o perf-util-$(CONFIG_LIBDW) += dwarf-aux.o perf-util-$(CONFIG_LIBDW) += dwarf-regs.o -perf-util-$(CONFIG_LIBDW) += dwarf-regs-csky.o -perf-util-$(CONFIG_LIBDW) += dwarf-regs-powerpc.o -perf-util-$(CONFIG_LIBDW) += dwarf-regs-x86.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs-arch/ perf-util-$(CONFIG_LIBDW) += debuginfo.o perf-util-$(CONFIG_LIBDW) += annotate-data.o perf-util-$(CONFIG_LIBDW) += libdw.o
tools/perf/util/dwarf-regs-arch/Build new file +3 -0
@@ -0,0 +1,3 @@ +perf-util-$(CONFIG_LIBDW) += dwarf-regs-csky.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs-powerpc.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs-x86.o
tools/perf/util/dwarf-regs-arch/dwarf-regs-csky.c renamed from tools/perf/util/dwarf-regs-csky.c +0 -0
tools/perf/util/dwarf-regs-arch/dwarf-regs-powerpc.c renamed from tools/perf/util/dwarf-regs-powerpc.c +0 -0
tools/perf/util/dwarf-regs-arch/dwarf-regs-x86.c renamed from tools/perf/util/dwarf-regs-x86.c +0 -0
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 10/23 perf dwarf-regs: Remove get_arch_regnum
In reply to Ian RogersExcept in dwarf-regs the function is never called. The weak function has no strong arch implementations. Remove so that the fall-through case applies.
--- tools/perf/util/dwarf-regs.c | 12 ------------ tools/perf/util/include/dwarf-regs.h | 4 ---- 2 files changed, 16 deletions(-)
tools/perf/util/dwarf-regs.c +0 -12
@@ -71,13 +71,6 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned intreturn NULL ; } -#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 -__weak int get_arch_regnum (const char *name__maybe_unused ) -{ -return -ENOTSUP ; -} -#endif -/* Return DWARF register number from architecture register name */ int get_dwarf_regnum (const char *name,unsigned int machine,unsigned int flags__maybe_unused ) {
@@ -98,11 +91,6 @@ int get_dwarf_regnum(const char *name, unsigned int machine, unsigned int flags machine =EM_HOST ; }switch (machine) { -#if EM_HOST !=EM_X86_64 &&EM_HOST !=EM_386 -case EM_HOST : - reg =get_arch_regnum (regname); -break ; -#endif case EM_X86_64 : fallthrough;case EM_386 :
tools/perf/util/include/dwarf-regs.h +0 -4
@@ -101,10 +101,6 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned intint get_x86_regnum (const char *name); -#if !defined(__x86_64__) && !defined(__i386__) -int get_arch_regnum (const char *name); -#endif -/* * get_dwarf_regnum - Returns DWARF regnum from register name * name: architecture register name
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 11/23 perf dwarf-regs: Clean up x86 dwarf_regnum code
In reply to Ian RogersThe i386 and x86-64 register numbers differ on x86, but previously x86 was a single arch string and so this couldn't be handled. The transition to using ELF EM_* values means we can translate x86 registers correctly for either the x86-64 dwarf register mappings (from the System V ABI) or i386 register mappings. Correct the mappings.
--- .../util/dwarf-regs-arch/dwarf-regs-x86.c | 133 ++++++++++++++++-- tools/perf/util/dwarf-regs.c | 5 +- tools/perf/util/include/dwarf-regs.h | 3 +- 3 files changed, 129 insertions(+), 12 deletions(-)
tools/perf/util/dwarf-regs-arch/dwarf-regs-x86.c +124 -9
@@ -13,10 +13,65 @@struct dwarf_regs_idx {const char *name; -int idx; +int dwarf_regnum; }; -static const struct dwarf_regs_idx x86_regidx_table[] = { +static const struct dwarf_regs_idx i386_regidx_table[] = { + {"eax" ,0 }, {"ax" ,0 }, {"al" ,0 }, + {"ecx" ,1 }, {"cx" ,1 }, {"cl" ,1 }, + {"edx" ,2 }, {"dx" ,2 }, {"dl" ,2 }, + {"ebx" ,3 }, {"bx" ,3 }, {"bl" ,3 }, + {"esp" ,4 }, {"sp" ,4 }, {"$stack" ,4 }, + {"ebp" ,5 }, {"bp" ,5 }, + {"esi" ,6 }, {"si" ,6 }, + {"edi" ,7 }, {"di" ,7 }, +// 8 - Return Address RA + {"eflags" ,9 }, {"flags" ,9 }, +// 10 - reserved + {"st0" ,11 }, + {"st1" ,12 }, + {"st2" ,13 }, + {"st3" ,14 }, + {"st4" ,15 }, + {"st5" ,16 }, + {"st6" ,17 }, + {"st7" ,18 }, +// 19-20 - reserved + {"xmm0" ,21 }, + {"xmm1" ,22 }, + {"xmm2" ,23 }, + {"xmm3" ,24 }, + {"xmm4" ,25 }, + {"xmm5" ,26 }, + {"xmm6" ,27 }, + {"xmm7" ,28 }, + {"mm0" ,29 }, + {"mm1" ,30 }, + {"mm2" ,31 }, + {"mm3" ,32 }, + {"mm4" ,33 }, + {"mm5" ,34 }, + {"mm6" ,35 }, + {"mm7" ,36 }, +// 37-38 - unknown + {"mxcsr" ,39 },// 128-bit Media Control and Status + {"es" ,40 }, + {"cs" ,41 }, + {"ss" ,42 }, + {"ds" ,43 }, + {"fs" ,44 }, + {"gs" ,45 }, +// 46-47 - reserved + {"tr" ,48 },// Task Register + {"ldtr" ,49 },// LDT Register +// 50-92 - reserved + {"fs.base" ,92 }, + {"gs.base" ,93 }, +// End of regular dwarf registers. + {"eip" ,DWARF_REG_PC }, {"ip" ,DWARF_REG_PC }, +}; + +static const struct dwarf_regs_idx x86_64_regidx_table[] = { {"rax" ,0 }, {"eax" ,0 }, {"ax" ,0 }, {"al" ,0 }, {"rdx" ,1 }, {"edx" ,1 }, {"dx" ,1 }, {"dl" ,1 }, {"rcx" ,2 }, {"ecx" ,2 }, {"cx" ,2 }, {"cl" ,2 },
@@ -33,18 +88,78 @@ static const struct dwarf_regs_idx x86_regidx_table[] = { { "r13", 13 }, { "r13d", 13 }, { "r13w", 13 }, { "r13b", 13 }, { "r14", 14 }, { "r14d", 14 }, { "r14w", 14 }, { "r14b", 14 }, { "r15", 15 }, { "r15d", 15 }, { "r15w", 15 }, { "r15b", 15 }, - { "rip", DWARF_REG_PC }, +// 16 - Return Address RA + { "xmm0", 17}, + { "xmm1", 18}, + { "xmm2", 19}, + { "xmm3", 20}, + { "xmm4", 21}, + { "xmm5", 22}, + { "xmm6", 23}, + { "xmm7", 24}, + { "xmm8", 25}, + { "xmm9", 26}, + { "xmm10", 27}, + { "xmm11", 28}, + { "xmm12", 29}, + { "xmm13", 30}, + { "xmm14", 31}, + { "xmm15", 32}, + { "st0", 33}, + { "st1", 34}, + { "st2", 35}, + { "st3", 36}, + { "st4", 37}, + { "st5", 38}, + { "st6", 39}, + { "st7", 40}, + { "mm0", 41}, + { "mm1", 42}, + { "mm2", 43}, + { "mm3", 44}, + { "mm4", 45}, + { "mm5", 46}, + { "mm6", 47}, + { "mm7", 48}, + { "rflags", 49}, { "eflags", 49}, { "flags", 49}, + { "es", 50}, + { "cs", 51}, + { "ss", 52}, + { "ds", 53}, + { "fs", 54}, + { "gs", 55}, +// 56-47 - reserved + { "fs.base", 58}, + { "gs.base", 59}, +// 60-61 - reserved + { "tr", 62}, // Task Register + { "ldtr", 63}, // LDT Register + { "mxcsr", 64}, // 128-bit Media Control and Status + { "fcw", 65}, // x87 Control Word + { "fsw", 66}, // x87 Status Word +// End of regular dwarf registers. + { "rip", DWARF_REG_PC }, { "eip", DWARF_REG_PC }, { "ip", DWARF_REG_PC }, }; -int get_x86_regnum (const char *name) +static int get_regnum (const struct dwarf_regs_idx *entries,size_t num_entries,const char *name) { -unsigned int i; -if (*name !='%' )return -EINVAL ; -for (i =0 ; i <ARRAY_SIZE (x86_regidx_table); i++) -if (!strcmp (x86_regidx_table[i].name, name +1 )) -return x86_regidx_table[i].idx; + name++; +for (size_t i =0 ; i < num_entries; i++) { +if (!strcmp (entries[i].name, name)) +return entries[i].dwarf_regnum; + }return -ENOENT ; } + +int __get_dwarf_regnum_i386 (const char *name) +{ +return get_regnum (i386_regidx_table,ARRAY_SIZE (i386_regidx_table), name); +} + +int __get_dwarf_regnum_x86_64 (const char *name) +{ +return get_regnum (x86_64_regidx_table,ARRAY_SIZE (x86_64_regidx_table), name); +}
tools/perf/util/dwarf-regs.c +3 -2
@@ -92,9 +92,10 @@ int get_dwarf_regnum(const char *name, unsigned int machine, unsigned int flags }switch (machine) {case EM_X86_64 : - fallthrough; + reg =__get_dwarf_regnum_x86_64 (name); +break ;case EM_386 : - reg =get_x86_regnum (regname); + reg =__get_dwarf_regnum_i386 (name);break ;default :pr_err ("ELF MACHINE %x is not supported.\n" , machine);
tools/perf/util/include/dwarf-regs.h +2 -1
@@ -99,7 +99,8 @@ const char *get_csky_regstr(unsigned int n, unsigned int flags);*/ const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags); -int get_x86_regnum (const char *name); +int __get_dwarf_regnum_i386 (const char *name); +int __get_dwarf_regnum_x86_64 (const char *name);/* * get_dwarf_regnum - Returns DWARF regnum from register name
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 12/23 perf dwarf-regs: Add get_dwarf_regnum_for_perf_regnum and use for x86 unwinding
In reply to Ian RogersAdd a utility to map a perf register number to a dwarf register number for a particular ELF machine type.
Create a generic unwind-libdw initial register initialization routine that uses this function and thereby avoids arch specific initialization. The unwind-libdw code does:
1) compute the maximum dwarf register from the set of sampled user registers,
2) allocates a set of dwarf registers,
3) copies the sample registers into the appropriate dwarf registers.
This generic solution is initially implemented for use with x86 as only get_dwarf_regnum_for_perf_regnum support for x86 is currently present.
--- .../util/dwarf-regs-arch/dwarf-regs-x86.c | 95 +++++++++++++++++++ tools/perf/util/dwarf-regs.c | 55 +++++++++++ tools/perf/util/include/dwarf-regs.h | 8 ++ tools/perf/util/unwind-libdw-arch/Build | 1 - .../util/unwind-libdw-arch/unwind-libdw-x86.c | 54 ----------- tools/perf/util/unwind-libdw.c | 70 ++++++++++++-- tools/perf/util/unwind-libdw.h | 2 +- 7 files changed, 222 insertions(+), 63 deletions(-) delete mode 100644 tools/perf/util/unwind-libdw-arch/unwind-libdw-x86.c
tools/perf/util/dwarf-regs-arch/dwarf-regs-x86.c +95 -0
@@ -10,6 +10,7 @@#include <string.h> /* for strcmp */ #include <linux/kernel.h> /* for ARRAY_SIZE */ #include <dwarf-regs.h> +#include "../../../arch/x86/include/uapi/asm/perf_regs.h" struct dwarf_regs_idx {const char *name;
@@ -163,3 +164,97 @@ int __get_dwarf_regnum_x86_64(const char *name) {return get_regnum (x86_64_regidx_table,ARRAY_SIZE (x86_64_regidx_table), name); } + +int __get_dwarf_regnum_for_perf_regnum_i386 (int perf_regnum) +{ +static const int dwarf_i386_regnums[] = { + [PERF_REG_X86_AX ] =0 , + [PERF_REG_X86_BX ] =3 , + [PERF_REG_X86_CX ] =1 , + [PERF_REG_X86_DX ] =2 , + [PERF_REG_X86_SI ] =6 , + [PERF_REG_X86_DI ] =7 , + [PERF_REG_X86_BP ] =5 , + [PERF_REG_X86_SP ] =4 , + [PERF_REG_X86_IP ] =8 , + [PERF_REG_X86_FLAGS ] =9 , + [PERF_REG_X86_CS ] =41 , + [PERF_REG_X86_SS ] =42 , + [PERF_REG_X86_DS ] =43 , + [PERF_REG_X86_ES ] =40 , + [PERF_REG_X86_FS ] =44 , + [PERF_REG_X86_GS ] =45 , + [PERF_REG_X86_XMM0 ] =21 , + [PERF_REG_X86_XMM1 ] =22 , + [PERF_REG_X86_XMM2 ] =23 , + [PERF_REG_X86_XMM3 ] =24 , + [PERF_REG_X86_XMM4 ] =25 , + [PERF_REG_X86_XMM5 ] =26 , + [PERF_REG_X86_XMM6 ] =27 , + [PERF_REG_X86_XMM7 ] =28 , + }; + +if (perf_regnum ==0 ) +return 0 ; + +if (perf_regnum <0 || perf_regnum > (int )ARRAY_SIZE (dwarf_i386_regnums) || + dwarf_i386_regnums[perf_regnum] ==0 ) +return -ENOENT ; + +return dwarf_i386_regnums[perf_regnum]; +} + +int __get_dwarf_regnum_for_perf_regnum_x86_64 (int perf_regnum) +{ +static const int dwarf_x86_64_regnums[] = { + [PERF_REG_X86_AX ] =0 , + [PERF_REG_X86_BX ] =3 , + [PERF_REG_X86_CX ] =2 , + [PERF_REG_X86_DX ] =1 , + [PERF_REG_X86_SI ] =4 , + [PERF_REG_X86_DI ] =5 , + [PERF_REG_X86_BP ] =6 , + [PERF_REG_X86_SP ] =7 , + [PERF_REG_X86_IP ] =16 , + [PERF_REG_X86_FLAGS ] =49 , + [PERF_REG_X86_CS ] =51 , + [PERF_REG_X86_SS ] =52 , + [PERF_REG_X86_DS ] =53 , + [PERF_REG_X86_ES ] =50 , + [PERF_REG_X86_FS ] =54 , + [PERF_REG_X86_GS ] =55 , + [PERF_REG_X86_R8 ] =8 , + [PERF_REG_X86_R9 ] =9 , + [PERF_REG_X86_R10 ] =10 , + [PERF_REG_X86_R11 ] =11 , + [PERF_REG_X86_R12 ] =12 , + [PERF_REG_X86_R13 ] =13 , + [PERF_REG_X86_R14 ] =14 , + [PERF_REG_X86_R15 ] =15 , + [PERF_REG_X86_XMM0 ] =17 , + [PERF_REG_X86_XMM1 ] =18 , + [PERF_REG_X86_XMM2 ] =19 , + [PERF_REG_X86_XMM3 ] =20 , + [PERF_REG_X86_XMM4 ] =21 , + [PERF_REG_X86_XMM5 ] =22 , + [PERF_REG_X86_XMM6 ] =23 , + [PERF_REG_X86_XMM7 ] =24 , + [PERF_REG_X86_XMM8 ] =25 , + [PERF_REG_X86_XMM9 ] =26 , + [PERF_REG_X86_XMM10 ] =27 , + [PERF_REG_X86_XMM11 ] =28 , + [PERF_REG_X86_XMM12 ] =29 , + [PERF_REG_X86_XMM13 ] =30 , + [PERF_REG_X86_XMM14 ] =31 , + [PERF_REG_X86_XMM15 ] =32 , + }; + +if (perf_regnum ==0 ) +return 0 ; + +if (perf_regnum <0 || perf_regnum > (int )ARRAY_SIZE (dwarf_x86_64_regnums) || + dwarf_x86_64_regnums[perf_regnum] ==0 ) +return -ENOENT ; + +return dwarf_x86_64_regnums[perf_regnum]; +}
tools/perf/util/dwarf-regs.c +55 -0
58 lines not on this page · raw message
tools/perf/util/include/dwarf-regs.h +8 -0
@@ -101,6 +101,8 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned intint __get_dwarf_regnum_i386 (const char *name);int __get_dwarf_regnum_x86_64 (const char *name); +int __get_dwarf_regnum_for_perf_regnum_i386 (int perf_regnum); +int __get_dwarf_regnum_for_perf_regnum_x86_64 (int perf_regnum);/* * get_dwarf_regnum - Returns DWARF regnum from register name
@@ -109,6 +111,12 @@ int __get_dwarf_regnum_x86_64(const char *name);*/ int get_dwarf_regnum (const char *name,unsigned int machine,unsigned int flags); +/* +* get_dwarf_regnum - Returns DWARF regnum from perf register number. +*/ +int get_dwarf_regnum_for_perf_regnum (int perf_regnum,unsigned int machine,unsigned int flags, +bool only_libdw_supported); +void get_powerpc_regs (u32 raw_insn,int is_source,struct annotated_op_loc *op_loc);#else /* HAVE_LIBDW_SUPPORT */
tools/perf/util/unwind-libdw-arch/Build +0 -1
@@ -1,4 +1,3 @@ -perf-util-y += unwind-libdw-x86.o perf-util-y += unwind-libdw-arm.o perf-util-y += unwind-libdw-arm64.o perf-util-y += unwind-libdw-csky.o
tools/perf/util/unwind-libdw-arch/unwind-libdw-x86.c deleted +0 -54
54 lines not on this page · raw message
tools/perf/util/unwind-libdw.c +63 -7
109 lines not on this page · raw message
tools/perf/util/unwind-libdw.h +1 -1
@@ -9,7 +9,6 @@ struct machine;struct perf_sample ;struct thread ; -bool libdw_set_initial_registers_x86 (Dwfl_Thread *thread,void *arg);bool libdw_set_initial_registers_arm (Dwfl_Thread *thread,void *arg);bool libdw_set_initial_registers_arm64 (Dwfl_Thread *thread,void *arg);bool libdw_set_initial_registers_csky (Dwfl_Thread *thread,void *arg);
@@ -28,6 +27,7 @@ struct unwind_info {void *arg;int max_stack;int idx; +uint16_t e_machine;bool best_effort;struct unwind_entry entries[]; };
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerRe: [PATCH v1 12/23] perf dwarf-regs: Add get_dwarf_regnum_for_perf_regnum and use for x86 unwinding
Quoted 349 lines · Ian Rogers
Add a utility to map a perf register number to a dwarf register number for a particular ELF machine type.
Create a generic unwind-libdw initial register initialization routine that uses this function and thereby avoids arch specific initialization. The unwind-libdw code does:
1) compute the maximum dwarf register from the set of sampled user registers,
2) allocates a set of dwarf registers,
3) copies the sample registers into the appropriate dwarf registers.This generic solution is initially implemented for use with x86 as only
get_dwarf_regnum_for_perf_regnumsupport for x86 is currently present.Signed-off-by Ian Rogers <[email protected]>--- .../util/dwarf-regs-arch/dwarf-regs-x86.c | 95 +++++++++++++++++++ tools/perf/util/dwarf-regs.c | 55 +++++++++++ tools/perf/util/include/dwarf-regs.h | 8 ++ tools/perf/util/unwind-libdw-arch/Build | 1 - .../util/unwind-libdw-arch/unwind-libdw-x86.c | 54 ----------- tools/perf/util/unwind-libdw.c | 70 ++++++++++++-- tools/perf/util/unwind-libdw.h | 2 +- 7 files changed, 222 insertions(+), 63 deletions(-) delete mode 100644 tools/perf/util/unwind-libdw-arch/unwind-libdw-x86.ctools/perf/util/dwarf-regs-arch/dwarf-regs-x86.c +95
-0@@ -10,6 +10,7 @@#include <string.h> /* for strcmp */ #include <linux/kernel.h> /* for ARRAY_SIZE */ #include <dwarf-regs.h> +#include "../../../arch/x86/include/uapi/asm/perf_regs.h" struct dwarf_regs_idx {const char *name;@@ -163,3 +164,97 @@ int __get_dwarf_regnum_x86_64(const char *name) {return get_regnum (x86_64_regidx_table,ARRAY_SIZE (x86_64_regidx_table), name); } + +int __get_dwarf_regnum_for_perf_regnum_i386 (int perf_regnum) +{ +static const int dwarf_i386_regnums[] = { + [PERF_REG_X86_AX ] =0 , + [PERF_REG_X86_BX ] =3 , + [PERF_REG_X86_CX ] =1 , + [PERF_REG_X86_DX ] =2 , + [PERF_REG_X86_SI ] =6 , + [PERF_REG_X86_DI ] =7 , + [PERF_REG_X86_BP ] =5 , + [PERF_REG_X86_SP ] =4 , + [PERF_REG_X86_IP ] =8 , + [PERF_REG_X86_FLAGS ] =9 , + [PERF_REG_X86_CS ] =41 , + [PERF_REG_X86_SS ] =42 , + [PERF_REG_X86_DS ] =43 , + [PERF_REG_X86_ES ] =40 , + [PERF_REG_X86_FS ] =44 , + [PERF_REG_X86_GS ] =45 , + [PERF_REG_X86_XMM0 ] =21 , + [PERF_REG_X86_XMM1 ] =22 , + [PERF_REG_X86_XMM2 ] =23 , + [PERF_REG_X86_XMM3 ] =24 , + [PERF_REG_X86_XMM4 ] =25 , + [PERF_REG_X86_XMM5 ] =26 , + [PERF_REG_X86_XMM6 ] =27 , + [PERF_REG_X86_XMM7 ] =28 , + }; + +if (perf_regnum ==0 ) +return 0 ; + +if (perf_regnum <0 || perf_regnum > (int )ARRAY_SIZE (dwarf_i386_regnums) || + dwarf_i386_regnums[perf_regnum] ==0 ) +return -ENOENT ; + +return dwarf_i386_regnums[perf_regnum]; +} + +int __get_dwarf_regnum_for_perf_regnum_x86_64 (int perf_regnum) +{ +static const int dwarf_x86_64_regnums[] = { + [PERF_REG_X86_AX ] =0 , + [PERF_REG_X86_BX ] =3 , + [PERF_REG_X86_CX ] =2 , + [PERF_REG_X86_DX ] =1 , + [PERF_REG_X86_SI ] =4 , + [PERF_REG_X86_DI ] =5 , + [PERF_REG_X86_BP ] =6 , + [PERF_REG_X86_SP ] =7 , + [PERF_REG_X86_IP ] =16 , + [PERF_REG_X86_FLAGS ] =49 , + [PERF_REG_X86_CS ] =51 , + [PERF_REG_X86_SS ] =52 , + [PERF_REG_X86_DS ] =53 , + [PERF_REG_X86_ES ] =50 , + [PERF_REG_X86_FS ] =54 , + [PERF_REG_X86_GS ] =55 , + [PERF_REG_X86_R8 ] =8 , + [PERF_REG_X86_R9 ] =9 , + [PERF_REG_X86_R10 ] =10 , + [PERF_REG_X86_R11 ] =11 , + [PERF_REG_X86_R12 ] =12 , + [PERF_REG_X86_R13 ] =13 , + [PERF_REG_X86_R14 ] =14 , + [PERF_REG_X86_R15 ] =15 , + [PERF_REG_X86_XMM0 ] =17 , + [PERF_REG_X86_XMM1 ] =18 , + [PERF_REG_X86_XMM2 ] =19 , + [PERF_REG_X86_XMM3 ] =20 , + [PERF_REG_X86_XMM4 ] =21 , + [PERF_REG_X86_XMM5 ] =22 , + [PERF_REG_X86_XMM6 ] =23 , + [PERF_REG_X86_XMM7 ] =24 , + [PERF_REG_X86_XMM8 ] =25 , + [PERF_REG_X86_XMM9 ] =26 , + [PERF_REG_X86_XMM10 ] =27 , + [PERF_REG_X86_XMM11 ] =28 , + [PERF_REG_X86_XMM12 ] =29 , + [PERF_REG_X86_XMM13 ] =30 , + [PERF_REG_X86_XMM14 ] =31 , + [PERF_REG_X86_XMM15 ] =32 , + }; + +if (perf_regnum ==0 ) +return 0 ; + +if (perf_regnum <0 || perf_regnum > (int )ARRAY_SIZE (dwarf_x86_64_regnums) || + dwarf_x86_64_regnums[perf_regnum] ==0 ) +return -ENOENT ; + +return dwarf_x86_64_regnums[perf_regnum]; +}tools/perf/util/dwarf-regs.c +55
-0@@ -103,3 +103,58 @@ int get_dwarf_regnum(const char *name, unsigned int machine, unsigned int flagsfree (regname);return reg; } + +static int get_libdw_frame_nregs (unsigned int machine,unsigned int flags__maybe_unused ) +{ +switch (machine) { +case EM_X86_64 : +return 17 ; +case EM_386 : +return 9 ; +case EM_ARM : +return 16 ; +case EM_AARCH64 : +return 97 ; +case EM_CSKY : +return 38 ; +case EM_S390 : +return 32 ; +case EM_PPC : +case EM_PPC64 : +return 145 ; +case EM_RISCV : +return 66 ; +case EM_SPARC : +case EM_SPARCV9 : +return 103 ; +case EM_LOONGARCH : +return 74 ; +default : +return 0 ; + } +} + +int get_dwarf_regnum_for_perf_regnum (int perf_regnum,unsigned int machine, +unsigned int flags,bool only_libdw_supported) +{ +int reg; + +switch (machine) { +case EM_X86_64 : + reg =__get_dwarf_regnum_for_perf_regnum_x86_64 (perf_regnum); +break ; +case EM_386 : + reg =__get_dwarf_regnum_for_perf_regnum_i386 (perf_regnum); +break ; +default : +pr_err ("ELF MACHINE %x is not supported.\n" , machine); +return -ENOENT ; + } +if (reg >=0 && only_libdw_supported) { +int nregs =get_libdw_frame_nregs (machine, flags); + +if (reg >= nregs) + reg = -ENOENT ; + } +return reg; +}tools/perf/util/include/dwarf-regs.h +8
-0@@ -101,6 +101,8 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned intint __get_dwarf_regnum_i386 (const char *name);int __get_dwarf_regnum_x86_64 (const char *name); +int __get_dwarf_regnum_for_perf_regnum_i386 (int perf_regnum); +int __get_dwarf_regnum_for_perf_regnum_x86_64 (int perf_regnum);/* * get_dwarf_regnum - Returns DWARF regnum from register name @@ -109,6 +111,12 @@ int __get_dwarf_regnum_x86_64(const char *name);*/ int get_dwarf_regnum (const char *name,unsigned int machine,unsigned int flags); +/* +* get_dwarf_regnum - Returns DWARF regnum from perf register number. +*/ +int get_dwarf_regnum_for_perf_regnum (int perf_regnum,unsigned int machine,unsigned int flags, +bool only_libdw_supported); +void get_powerpc_regs (u32 raw_insn,int is_source,struct annotated_op_loc *op_loc);#else /* HAVE_LIBDW_SUPPORT */ tools/perf/util/unwind-libdw-arch/Build +0
-1@@ -1,4 +1,3 @@ -perf-util-y += unwind-libdw-x86.o perf-util-y += unwind-libdw-arm.o perf-util-y += unwind-libdw-arm64.o perf-util-y += unwind-libdw-csky.otools/perf/util/unwind-libdw-arch/unwind-libdw-x86.c deleted +0
-54@@ -1,54 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include <elfutils/libdwfl.h> -#include "../arch/x86/include/uapi/asm/perf_regs.h" -#include "util/unwind-libdw.h" -#include "util/perf_regs.h" -#include "util/sample.h" - -bool libdw_set_initial_registers_x86 (Dwfl_Thread *thread,void *arg) -{ -struct unwind_info *ui = arg; -struct regs_dump *user_regs =perf_sample__user_regs (ui->sample); -Dwarf_Word dwarf_regs[17 ]; -unsigned nregs; - -#define REG (r) ({ \ - Dwarf_Word val = 0; \ - perf_reg_value(&val, user_regs, PERF_REG_X86_##r); \ - val; \ -}) - -if (user_regs->abi ==PERF_SAMPLE_REGS_ABI_32 ) { - dwarf_regs[0 ] =REG (AX ); - dwarf_regs[1 ] =REG (CX ); - dwarf_regs[2 ] =REG (DX ); - dwarf_regs[3 ] =REG (BX ); - dwarf_regs[4 ] =REG (SP ); - dwarf_regs[5 ] =REG (BP ); - dwarf_regs[6 ] =REG (SI ); - dwarf_regs[7 ] =REG (DI ); - dwarf_regs[8 ] =REG (IP ); - nregs =9 ; - }else { - dwarf_regs[0 ] =REG (AX ); - dwarf_regs[1 ] =REG (DX ); - dwarf_regs[2 ] =REG (CX ); - dwarf_regs[3 ] =REG (BX ); - dwarf_regs[4 ] =REG (SI ); - dwarf_regs[5 ] =REG (DI ); - dwarf_regs[6 ] =REG (BP ); - dwarf_regs[7 ] =REG (SP ); - dwarf_regs[8 ] =REG (R8 ); - dwarf_regs[9 ] =REG (R9 ); - dwarf_regs[10 ] =REG (R10 ); - dwarf_regs[11 ] =REG (R11 ); - dwarf_regs[12 ] =REG (R12 ); - dwarf_regs[13 ] =REG (R13 ); - dwarf_regs[14 ] =REG (R14 ); - dwarf_regs[15 ] =REG (R15 ); - dwarf_regs[16 ] =REG (IP ); - nregs =17 ; - } - -return dwfl_thread_state_registers (thread,0 , nregs, dwarf_regs); -}tools/perf/util/unwind-libdw.c +40
-0@@ -6,6 +6,7 @@#include <errno.h> #include "debug.h" #include "dso.h" +#include <dwarf-regs.h> #include "unwind.h" #include "unwind-libdw.h" #include "machine.h" @@ -225,6 +226,59 @@ static bool memory_read(Dwfl *dwfl __maybe_unused, Dwarf_Addr addr, Dwarf_Word *return true; } +static bool libdw_set_initial_registers_generic (Dwfl_Thread *thread,void *arg) +{ +struct unwind_info *ui = arg; +struct regs_dump *user_regs =perf_sample__user_regs (ui->sample); +Dwarf_Word *dwarf_regs; +int max_dwarf_reg =0 ; +bool ret; +uint16_t e_machine = ui->e_machine; +int e_flags =0 ; +uint64_t ip_perf_reg =perf_arch_reg_ip (e_machine); +Dwarf_Word val =0 ; + + +/* +* For every possible perf register in the bitmap determine the dwarf +* register and use to compute the max. +*/ +for (int perf_reg =0 ; perf_reg <64 ; perf_reg++) { +if (user_regs->mask & (1ULL << perf_reg)) { +int dwarf_reg = +get_dwarf_regnum_for_perf_regnum (perf_reg, e_machine, + e_flags, +/*only_libdw_supported=*/ true); +if (dwarf_reg > max_dwarf_reg) + max_dwarf_reg = dwarf_reg; + } + } + + dwarf_regs =calloc (max_dwarf_reg +1 ,sizeof (*dwarf_regs)); +if (!dwarf_regs) +return false; + +for (int perf_reg =0 ; perf_reg <64 ; perf_reg++) { +if (user_regs->mask & (1ULL << perf_reg)) { +int dwarf_reg = +get_dwarf_regnum_for_perf_regnum (perf_reg, e_machine, + e_flags, +/*only_libdw_supported=*/ true); +if (dwarf_reg >=0 ) {
tools/perf/util/unwind-libdw.c static bool memory_read(Dwfl *dwfl __maybe_unused, Dwarf_Addr addr, Dwarf_Word * · line 277
Quoted 10 lines
tools/perf/util/unwind-libdw.c +10
-0+ val =0 ; +if (perf_reg_value (&val, user_regs, perf_reg) ==0 ) + dwarf_regs[dwarf_reg] = val; + } + } + } +if (perf_reg_value (&val, user_regs, ip_perf_reg) ==0 ) +dwfl_thread_state_register_pc (thread, val); + + ret =dwfl_thread_state_registers (thread,0 , max_dwarf_reg +1 , dwarf_regs);
I always forget something. There's possibly a TODO/alternative here where rather than computing the max dwarf register, copying the registers and calling dwfl_thread_state_registers, the code could read the register then call dwfl_thread_state_registers just for that 1 register. The code as it is here is closest to the code as it was before the change, but removing a memory allocation/free may have some benefit.
Thanks,
Ian
Quoted 77 lines
tools/perf/util/unwind-libdw.c +13
-7+free (dwarf_regs); +return ret; +} +#define DEFINE_DWFL_THREAD_CALLBACKS (arch) \ static const Dwfl_Thread_Callbacks callbacks_##arch = { \ .next_thread = next_thread, \@@ -232,7 +286,12 @@ static const Dwfl_Thread_Callbacks callbacks_##arch = { \ .set_initial_registers = libdw_set_initial_registers_##arch, \ } -DEFINE_DWFL_THREAD_CALLBACKS (x86); +static const Dwfl_Thread_Callbacks callbacks_generic = { + .next_thread = next_thread, + .memory_read = memory_read, + .set_initial_registers = libdw_set_initial_registers_generic, +}; +DEFINE_DWFL_THREAD_CALLBACKS (arm);DEFINE_DWFL_THREAD_CALLBACKS (arm64);DEFINE_DWFL_THREAD_CALLBACKS (csky);@@ -257,12 +316,8 @@ static const Dwfl_Thread_Callbacks *get_thread_callbacks(const char *arch)return &callbacks_riscv; else if (!strcmp(arch, "s390"))return &callbacks_s390; - else if (!strcmp(arch, "x86")) -return &callbacks_x86; -pr_err ("Fail to get thread callbacks for arch %s, returns NULL\n" , - arch); -return NULL ; +return &callbacks_generic; } static int@@ -301,6 +356,7 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg, bool best_effort) {struct machine *machine =maps__machine (thread__maps (thread)); +uint16_t e_machine =thread__e_machine (thread, machine);struct unwind_info *ui, ui_buf = { .sample = data, .thread = thread,@@ -308,9 +364,9 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg, .cb = cb, .arg = arg, .max_stack = max_stack, + .e_machine = e_machine, .best_effort = best_effort }; -uint16_t e_machine =thread__e_machine (thread, machine);const char *arch =perf_env__arch (machine->env);Dwarf_Word ip;int err = -EINVAL , i;tools/perf/util/unwind-libdw.h +1
-2@@ -9,7 +9,6 @@ struct machine;struct perf_sample ;struct thread ; -bool libdw_set_initial_registers_x86 (Dwfl_Thread *thread,void *arg);bool libdw_set_initial_registers_arm (Dwfl_Thread *thread,void *arg);bool libdw_set_initial_registers_arm64 (Dwfl_Thread *thread,void *arg);bool libdw_set_initial_registers_csky (Dwfl_Thread *thread,void *arg);@@ -28,6 +27,7 @@ struct unwind_info {void *arg;int max_stack;int idx; +uint16_t e_machine;bool best_effort;struct unwind_entry entries[]; }; --2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 13/23 perf dwarf-regs: Add basic get_dwarf_regnum for most architectures
In reply to Ian RogersAdd a basic get_dwarf_regnum implementation for most architectures by using the get_dwarf_regstr tables and returning the index of the name within the table.
Some minor name and constification clean up for csky.
--- .../util/dwarf-regs-arch/dwarf-regs-csky.c | 24 +++++++- tools/perf/util/dwarf-regs.c | 58 +++++++++++++++++-- tools/perf/util/include/dwarf-regs.h | 5 +- 3 files changed, 78 insertions(+), 9 deletions(-)
tools/perf/util/dwarf-regs-arch/dwarf-regs-csky.c +21 -3
@@ -2,11 +2,12 @@// Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd. // Mapping of DWARF debug register numbers into register names. +#include <errno.h> #include <stddef.h> #include <dwarf-regs.h> #define CSKY_ABIV2_MAX_REGS 73 -const char *csky_dwarf_regs_table_abiv2[CSKY_ABIV2_MAX_REGS ] = { +static const char *const csky_dwarf_regs_table_abiv2[CSKY_ABIV2_MAX_REGS ] = {/* r0 ~ r8 */ "%a0" ,"%a1" ,"%a2" ,"%a3" ,"%regs0" ,"%regs1" ,"%regs2" ,"%regs3" ,/* r9 ~ r15 */
@@ -27,7 +28,7 @@ const char *csky_dwarf_regs_table_abiv2[CSKY_ABIV2_MAX_REGS] = { };#define CSKY_ABIV1_MAX_REGS 57 -const char *csky_dwarf_regs_table_abiv1[CSKY_ABIV1_MAX_REGS ] = { +static const char *const csky_dwarf_regs_table_abiv1[CSKY_ABIV1_MAX_REGS ] = {/* r0 ~ r8 */ "%sp" ,"%regs9" ,"%a0" ,"%a1" ,"%a2" ,"%a3" ,"%regs0" ,"%regs1" ,/* r9 ~ r15 */
@@ -41,10 +42,27 @@ const char *csky_dwarf_regs_table_abiv1[CSKY_ABIV1_MAX_REGS] = { "%epc", }; -const char *get_csky_regstr (unsigned int n,unsigned int flags) +const char *__get_csky_regstr (unsigned int n,unsigned int flags) {if (flags &EF_CSKY_ABIV2 )return (n <CSKY_ABIV2_MAX_REGS ) ? csky_dwarf_regs_table_abiv2[n] :NULL ;return (n <CSKY_ABIV1_MAX_REGS ) ? csky_dwarf_regs_table_abiv1[n] :NULL ; } + +static int __get_dwarf_regnum (const char *const *regstr,size_t num_regstr,const char *name) +{ +for (size_t i =0 ; i < num_regstr; i++) { +if (regstr[i] && !strcmp (regstr[i], name)) +return i; + } +return -ENOENT ; +} + +int __get_csky_regnum (const char *name,unsigned int flags) +{ +if (flags &EF_CSKY_ABIV2 ) +return __get_dwarf_regnum (csky_dwarf_regs_table_abiv2,CSKY_ABIV2_MAX_REGS , name); + +return __get_dwarf_regnum (csky_dwarf_regs_table_abiv1,CSKY_ABIV1_MAX_REGS , name); +}
tools/perf/util/dwarf-regs.c +54 -4
98 lines not on this page · raw message
tools/perf/util/include/dwarf-regs.h +3 -2
@@ -89,8 +89,6 @@#define DWARF_REG_FB 0xd3affb/* random number */ #ifdef HAVE_LIBDW_SUPPORT -const char *get_csky_regstr (unsigned int n,unsigned int flags); -/** * get_dwarf_regstr() - Returns ftrace register string from DWARF regnum. * @n: DWARF register number.
@@ -99,6 +97,9 @@ const char *get_csky_regstr(unsigned int n, unsigned int flags);*/ const char *get_dwarf_regstr (unsigned int n,unsigned int machine,unsigned int flags); +const char *__get_csky_regstr (unsigned int n,unsigned int flags); +int __get_csky_regnum (const char *name,unsigned int flags); +int __get_dwarf_regnum_i386 (const char *name);int __get_dwarf_regnum_x86_64 (const char *name);int __get_dwarf_regnum_for_perf_regnum_i386 (int perf_regnum);
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 14/23 perf dwarf-regs: Add ARM perf to dwarf register number mapping functions
In reply to Ian RogersThese functions allow the generic initial register state code in unwind-libdw to be used.
--- tools/perf/util/dwarf-regs-arch/Build | 2 + .../util/dwarf-regs-arch/dwarf-regs-arm.c | 12 ++++ .../util/dwarf-regs-arch/dwarf-regs-arm64.c | 12 ++++ tools/perf/util/dwarf-regs.c | 6 ++ tools/perf/util/include/dwarf-regs.h | 3 + tools/perf/util/unwind-libdw-arch/Build | 2 - .../util/unwind-libdw-arch/unwind-libdw-arm.c | 39 ------------ .../unwind-libdw-arch/unwind-libdw-arm64.c | 61 ------------------- tools/perf/util/unwind-libdw.c | 8 +-- tools/perf/util/unwind-libdw.h | 2 - 10 files changed, 36 insertions(+), 111 deletions(-) create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-arm.c create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-arm64.c delete mode 100644 tools/perf/util/unwind-libdw-arch/unwind-libdw-arm.c delete mode 100644 tools/perf/util/unwind-libdw-arch/unwind-libdw-arm64.c
tools/perf/util/dwarf-regs-arch/Build +2 -0
@@ -1,3 +1,5 @@ +perf-util-$(CONFIG_LIBDW) += dwarf-regs-arm64.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs-arm.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-csky.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-powerpc.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-x86.o
tools/perf/util/dwarf-regs-arch/dwarf-regs-arm.c new file +12 -0
@@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <errno.h> +#include <dwarf-regs.h> +#include "../../../arch/arm/include/uapi/asm/perf_regs.h" + +int __get_dwarf_regnum_for_perf_regnum_arm (int perf_regnum) +{ +if (perf_regnum <0 || perf_regnum >=PERF_REG_ARM_MAX ) +return -ENOENT ; + +return perf_regnum; +}
tools/perf/util/dwarf-regs-arch/dwarf-regs-arm64.c new file +12 -0
@@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <errno.h> +#include <dwarf-regs.h> +#include "../../../arch/arm64/include/uapi/asm/perf_regs.h" + +int __get_dwarf_regnum_for_perf_regnum_arm64 (int perf_regnum) +{ +if (perf_regnum <0 || perf_regnum >=PERF_REG_ARM64_MAX ) +return -ENOENT ; + +return perf_regnum; +}
tools/perf/util/dwarf-regs.c +6 -0
@@ -196,6 +196,12 @@ int get_dwarf_regnum_for_perf_regnum(int perf_regnum, unsigned int machine,case EM_386 : reg =__get_dwarf_regnum_for_perf_regnum_i386 (perf_regnum);break ; +case EM_ARM : + reg =__get_dwarf_regnum_for_perf_regnum_arm (perf_regnum); +break ; +case EM_AARCH64 : + reg =__get_dwarf_regnum_for_perf_regnum_arm64 (perf_regnum); +break ;default :pr_err ("ELF MACHINE %x is not supported.\n" , machine);return -ENOENT ;
tools/perf/util/include/dwarf-regs.h +3 -0
@@ -105,6 +105,9 @@ int __get_dwarf_regnum_x86_64(const char *name);int __get_dwarf_regnum_for_perf_regnum_i386 (int perf_regnum);int __get_dwarf_regnum_for_perf_regnum_x86_64 (int perf_regnum); +int __get_dwarf_regnum_for_perf_regnum_arm (int perf_regnum); +int __get_dwarf_regnum_for_perf_regnum_arm64 (int perf_regnum); +/* * get_dwarf_regnum - Returns DWARF regnum from register name * name: architecture register name
tools/perf/util/unwind-libdw-arch/Build +0 -2
@@ -1,5 +1,3 @@ -perf-util-y += unwind-libdw-arm.o -perf-util-y += unwind-libdw-arm64.o perf-util-y += unwind-libdw-csky.o perf-util-y += unwind-libdw-loongarch.o perf-util-y += unwind-libdw-powerpc.o
tools/perf/util/unwind-libdw-arch/unwind-libdw-arm.c deleted +0 -39
@@ -1,39 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include <elfutils/libdwfl.h> -#include "../arch/arm/include/uapi/asm/perf_regs.h" -#include "util/unwind-libdw.h" -#include "util/perf_regs.h" -#include "util/sample.h" - -bool libdw_set_initial_registers_arm (Dwfl_Thread *thread,void *arg) -{ -struct unwind_info *ui = arg; -struct regs_dump *user_regs =perf_sample__user_regs (ui->sample); -Dwarf_Word dwarf_regs[PERF_REG_ARM_MAX ]; - -#define REG (r) ({ \ - Dwarf_Word val = 0; \ - perf_reg_value(&val, user_regs, PERF_REG_ARM_##r); \ - val; \ -}) - - dwarf_regs[0 ] =REG (R0 ); - dwarf_regs[1 ] =REG (R1 ); - dwarf_regs[2 ] =REG (R2 ); - dwarf_regs[3 ] =REG (R3 ); - dwarf_regs[4 ] =REG (R4 ); - dwarf_regs[5 ] =REG (R5 ); - dwarf_regs[6 ] =REG (R6 ); - dwarf_regs[7 ] =REG (R7 ); - dwarf_regs[8 ] =REG (R8 ); - dwarf_regs[9 ] =REG (R9 ); - dwarf_regs[10 ] =REG (R10 ); - dwarf_regs[11 ] =REG (FP ); - dwarf_regs[12 ] =REG (IP ); - dwarf_regs[13 ] =REG (SP ); - dwarf_regs[14 ] =REG (LR ); - dwarf_regs[15 ] =REG (PC ); - -return dwfl_thread_state_registers (thread,0 ,PERF_REG_ARM_MAX , - dwarf_regs); -}
tools/perf/util/unwind-libdw-arch/unwind-libdw-arm64.c deleted +0 -61
61 lines not on this page · raw message
tools/perf/util/unwind-libdw.c +1 -7
@@ -292,8 +292,6 @@ static const Dwfl_Thread_Callbacks callbacks_generic = { .set_initial_registers = libdw_set_initial_registers_generic, }; -DEFINE_DWFL_THREAD_CALLBACKS (arm); -DEFINE_DWFL_THREAD_CALLBACKS (arm64);DEFINE_DWFL_THREAD_CALLBACKS (csky);DEFINE_DWFL_THREAD_CALLBACKS (loongarch);DEFINE_DWFL_THREAD_CALLBACKS (powerpc);
@@ -302,11 +300,7 @@ DEFINE_DWFL_THREAD_CALLBACKS(s390);static const Dwfl_Thread_Callbacks *get_thread_callbacks (const char *arch) { -if (!strcmp (arch,"arm" )) -return &callbacks_arm; -else if (!strcmp (arch,"arm64" )) -return &callbacks_arm64; -else if (!strcmp (arch,"csky" )) +if (!strcmp (arch,"csky" ))return &callbacks_csky;else if (!strcmp (arch,"loongarch" ))return &callbacks_loongarch;
tools/perf/util/unwind-libdw.h +0 -2
@@ -9,8 +9,6 @@ struct machine;struct perf_sample ;struct thread ; -bool libdw_set_initial_registers_arm (Dwfl_Thread *thread,void *arg); -bool libdw_set_initial_registers_arm64 (Dwfl_Thread *thread,void *arg);bool libdw_set_initial_registers_csky (Dwfl_Thread *thread,void *arg);bool libdw_set_initial_registers_loongarch (Dwfl_Thread *thread,void *arg);bool libdw_set_initial_registers_mips (Dwfl_Thread *thread,void *arg);
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 15/23 perf dwarf-regs: Add csky perf to dwarf register number mapping functions
In reply to Ian RogersThese functions allow the generic initial register state code in unwind-libdw to be used.
--- .../util/dwarf-regs-arch/dwarf-regs-csky.c | 58 ++++++++++++++ tools/perf/util/dwarf-regs.c | 3 + tools/perf/util/include/dwarf-regs.h | 2 + tools/perf/util/unwind-libdw-arch/Build | 1 - .../unwind-libdw-arch/unwind-libdw-csky.c | 78 ------------------- tools/perf/util/unwind-libdw.c | 5 +- tools/perf/util/unwind-libdw.h | 1 - 7 files changed, 64 insertions(+), 84 deletions(-) delete mode 100644 tools/perf/util/unwind-libdw-arch/unwind-libdw-csky.c
tools/perf/util/dwarf-regs-arch/dwarf-regs-csky.c +58 -0
@@ -5,6 +5,10 @@#include <errno.h> #include <stddef.h> #include <dwarf-regs.h> +// Ensure the V2 perf reg definitions are included. +#undef __CSKYABIV2__ +#define __CSKYABIV2__ 1 +#include "../../../arch/csky/include/uapi/asm/perf_regs.h" #define CSKY_ABIV2_MAX_REGS 73static const char *const csky_dwarf_regs_table_abiv2[CSKY_ABIV2_MAX_REGS ] = {
@@ -66,3 +70,57 @@ int __get_csky_regnum(const char *name, unsigned int flags)return __get_dwarf_regnum (csky_dwarf_regs_table_abiv1,CSKY_ABIV1_MAX_REGS , name); } + +int __get_dwarf_regnum_for_perf_regnum_csky (int perf_regnum,unsigned int flags) +{ +static const int dwarf_csky_regnums[][2 ] = { + [PERF_REG_CSKY_TLS ] = {-ENOENT ,31 }, + [PERF_REG_CSKY_LR ] = {15 ,15 }, + [PERF_REG_CSKY_PC ] = {-ENOENT ,32 }, +/* TODO: PERF_REG_CSKY_SR */ + [PERF_REG_CSKY_SP ] = {0 ,14 }, +/* TODO: PERF_REG_CSKY_ORIG_A0 */ + [PERF_REG_CSKY_A0 ] = {2 ,0 }, + [PERF_REG_CSKY_A1 ] = {3 ,1 }, + [PERF_REG_CSKY_A2 ] = {4 ,2 }, + [PERF_REG_CSKY_A3 ] = {5 ,3 }, + [PERF_REG_CSKY_REGS0 ] = {6 ,4 }, + [PERF_REG_CSKY_REGS1 ] = {7 ,5 }, + [PERF_REG_CSKY_REGS2 ] = {8 ,6 }, + [PERF_REG_CSKY_REGS3 ] = {9 ,7 }, + [PERF_REG_CSKY_REGS4 ] = {10 ,8 }, + [PERF_REG_CSKY_REGS5 ] = {11 ,9 }, + [PERF_REG_CSKY_REGS6 ] = {12 ,10 }, + [PERF_REG_CSKY_REGS7 ] = {13 ,11 }, + [PERF_REG_CSKY_REGS8 ] = {14 ,12 }, + [PERF_REG_CSKY_REGS9 ] = {1 ,13 }, + [PERF_REG_CSKY_EXREGS0 ] = {-ENOENT ,16 }, + [PERF_REG_CSKY_EXREGS1 ] = {-ENOENT ,17 }, + [PERF_REG_CSKY_EXREGS2 ] = {-ENOENT ,18 }, + [PERF_REG_CSKY_EXREGS3 ] = {-ENOENT ,19 }, + [PERF_REG_CSKY_EXREGS4 ] = {-ENOENT ,20 }, + [PERF_REG_CSKY_EXREGS5 ] = {-ENOENT ,21 }, + [PERF_REG_CSKY_EXREGS6 ] = {-ENOENT ,22 }, + [PERF_REG_CSKY_EXREGS7 ] = {-ENOENT ,23 }, + [PERF_REG_CSKY_EXREGS8 ] = {-ENOENT ,24 }, + [PERF_REG_CSKY_EXREGS9 ] = {-ENOENT ,25 }, + [PERF_REG_CSKY_EXREGS10 ] = {-ENOENT ,26 }, + [PERF_REG_CSKY_EXREGS11 ] = {-ENOENT ,27 }, + [PERF_REG_CSKY_EXREGS12 ] = {-ENOENT ,28 }, + [PERF_REG_CSKY_EXREGS13 ] = {-ENOENT ,29 }, + [PERF_REG_CSKY_EXREGS14 ] = {-ENOENT ,30 }, +/* TODO: PERF_REG_CSKY_HI */ +/* TODO: PERF_REG_CSKY_LO */ +/* TODO: PERF_REG_CSKY_DCSR */ + }; +int idx =0 ; + +if (flags &EF_CSKY_ABIV2 ) + idx++; + +if (perf_regnum <0 || perf_regnum > (int )ARRAY_SIZE (dwarf_csky_regnums) || + dwarf_csky_regnums[perf_regnum][idx] ==0 ) +return -ENOENT ; + +return dwarf_csky_regnums[perf_regnum][idx]; +}
tools/perf/util/dwarf-regs.c +3 -0
@@ -202,6 +202,9 @@ int get_dwarf_regnum_for_perf_regnum(int perf_regnum, unsigned int machine,case EM_AARCH64 : reg =__get_dwarf_regnum_for_perf_regnum_arm64 (perf_regnum);break ; +case EM_CSKY : + reg =__get_dwarf_regnum_for_perf_regnum_csky (perf_regnum, flags); +break ;default :pr_err ("ELF MACHINE %x is not supported.\n" , machine);return -ENOENT ;
tools/perf/util/include/dwarf-regs.h +2 -0
@@ -108,6 +108,8 @@ int __get_dwarf_regnum_for_perf_regnum_x86_64(int perf_regnum);int __get_dwarf_regnum_for_perf_regnum_arm (int perf_regnum);int __get_dwarf_regnum_for_perf_regnum_arm64 (int perf_regnum); +int __get_dwarf_regnum_for_perf_regnum_csky (int perf_regnum,unsigned int flags); +/* * get_dwarf_regnum - Returns DWARF regnum from register name * name: architecture register name
tools/perf/util/unwind-libdw-arch/Build +0 -1
@@ -1,4 +1,3 @@ -perf-util-y += unwind-libdw-csky.o perf-util-y += unwind-libdw-loongarch.o perf-util-y += unwind-libdw-powerpc.o perf-util-y += unwind-libdw-riscv.o
tools/perf/util/unwind-libdw-arch/unwind-libdw-csky.c deleted +0 -78
78 lines not on this page · raw message
tools/perf/util/unwind-libdw.c +1 -4
@@ -292,7 +292,6 @@ static const Dwfl_Thread_Callbacks callbacks_generic = { .set_initial_registers = libdw_set_initial_registers_generic, }; -DEFINE_DWFL_THREAD_CALLBACKS (csky);DEFINE_DWFL_THREAD_CALLBACKS (loongarch);DEFINE_DWFL_THREAD_CALLBACKS (powerpc);DEFINE_DWFL_THREAD_CALLBACKS (riscv);
@@ -300,9 +299,7 @@ DEFINE_DWFL_THREAD_CALLBACKS(s390);static const Dwfl_Thread_Callbacks *get_thread_callbacks (const char *arch) { -if (!strcmp (arch,"csky" )) -return &callbacks_csky; -else if (!strcmp (arch,"loongarch" )) +if (!strcmp (arch,"loongarch" ))return &callbacks_loongarch;else if (!strcmp (arch,"powerpc" ))return &callbacks_powerpc;
tools/perf/util/unwind-libdw.h +0 -1
@@ -9,7 +9,6 @@ struct machine;struct perf_sample ;struct thread ; -bool libdw_set_initial_registers_csky (Dwfl_Thread *thread,void *arg);bool libdw_set_initial_registers_loongarch (Dwfl_Thread *thread,void *arg);bool libdw_set_initial_registers_mips (Dwfl_Thread *thread,void *arg);bool libdw_set_initial_registers_powerpc (Dwfl_Thread *thread,void *arg);
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 16/23 perf dwarf-regs: Add loongarch perf to dwarf register number mapping functions
In reply to Ian RogersThese functions allow the generic initial register state code in unwind-libdw to be used.
--- tools/perf/util/dwarf-regs-arch/Build | 1 + .../dwarf-regs-arch/dwarf-regs-loongarch.c | 12 ++++ tools/perf/util/dwarf-regs.c | 3 + tools/perf/util/include/dwarf-regs.h | 1 + tools/perf/util/unwind-libdw-arch/Build | 1 - .../unwind-libdw-loongarch.c | 57 ------------------- tools/perf/util/unwind-libdw.c | 5 +- tools/perf/util/unwind-libdw.h | 1 - 8 files changed, 18 insertions(+), 63 deletions(-) create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-loongarch.c delete mode 100644 tools/perf/util/unwind-libdw-arch/unwind-libdw-loongarch.c
tools/perf/util/dwarf-regs-arch/Build +1 -0
@@ -1,5 +1,6 @@ perf-util-$(CONFIG_LIBDW) += dwarf-regs-arm64.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-arm.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-csky.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs-loongarch.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-powerpc.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-x86.o
tools/perf/util/dwarf-regs-arch/dwarf-regs-loongarch.c new file +12 -0
@@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <errno.h> +#include <dwarf-regs.h> +#include "../../../arch/loongarch/include/uapi/asm/perf_regs.h" + +int __get_dwarf_regnum_for_perf_regnum_loongarch (int perf_regnum) +{ +if (perf_regnum <0 || perf_regnum >=PERF_REG_LOONGARCH_MAX ) +return -ENOENT ; + +return perf_regnum; +}
tools/perf/util/dwarf-regs.c +3 -0
@@ -205,6 +205,9 @@ int get_dwarf_regnum_for_perf_regnum(int perf_regnum, unsigned int machine,case EM_CSKY : reg =__get_dwarf_regnum_for_perf_regnum_csky (perf_regnum, flags);break ; +case EM_LOONGARCH : + reg =__get_dwarf_regnum_for_perf_regnum_loongarch (perf_regnum); +break ;default :pr_err ("ELF MACHINE %x is not supported.\n" , machine);return -ENOENT ;
tools/perf/util/include/dwarf-regs.h +1 -0
@@ -109,6 +109,7 @@ int __get_dwarf_regnum_for_perf_regnum_arm(int perf_regnum);int __get_dwarf_regnum_for_perf_regnum_arm64 (int perf_regnum);int __get_dwarf_regnum_for_perf_regnum_csky (int perf_regnum,unsigned int flags); +int __get_dwarf_regnum_for_perf_regnum_loongarch (int perf_regnum);/* * get_dwarf_regnum - Returns DWARF regnum from register name
tools/perf/util/unwind-libdw-arch/Build +0 -1
@@ -1,4 +1,3 @@ -perf-util-y += unwind-libdw-loongarch.o perf-util-y += unwind-libdw-powerpc.o perf-util-y += unwind-libdw-riscv.o perf-util-y += unwind-libdw-s390.o
tools/perf/util/unwind-libdw-arch/unwind-libdw-loongarch.c deleted +0 -57
57 lines not on this page · raw message
tools/perf/util/unwind-libdw.c +1 -4
@@ -292,16 +292,13 @@ static const Dwfl_Thread_Callbacks callbacks_generic = { .set_initial_registers = libdw_set_initial_registers_generic, }; -DEFINE_DWFL_THREAD_CALLBACKS (loongarch);DEFINE_DWFL_THREAD_CALLBACKS (powerpc);DEFINE_DWFL_THREAD_CALLBACKS (riscv);DEFINE_DWFL_THREAD_CALLBACKS (s390);static const Dwfl_Thread_Callbacks *get_thread_callbacks (const char *arch) { -if (!strcmp (arch,"loongarch" )) -return &callbacks_loongarch; -else if (!strcmp (arch,"powerpc" )) +if (!strcmp (arch,"powerpc" ))return &callbacks_powerpc;else if (!strcmp (arch,"riscv" ))return &callbacks_riscv;
tools/perf/util/unwind-libdw.h +0 -1
@@ -9,7 +9,6 @@ struct machine;struct perf_sample ;struct thread ; -bool libdw_set_initial_registers_loongarch (Dwfl_Thread *thread,void *arg);bool libdw_set_initial_registers_mips (Dwfl_Thread *thread,void *arg);bool libdw_set_initial_registers_powerpc (Dwfl_Thread *thread,void *arg);bool libdw_set_initial_registers_riscv (Dwfl_Thread *thread,void *arg);
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 17/23 perf dwarf-regs: Add powerpc perf to dwarf register number mapping functions
In reply to Ian RogersThese functions allow the generic initial register state code in unwind-libdw to be used. Note, the link register was being coped to dwarf register 65 that the SysV ABI spec claims is FPSCR. It is corrected here to 108, but this is unlikely to matter as FPSCR has little to no impact on unwinding.
--- .../util/dwarf-regs-arch/dwarf-regs-powerpc.c | 77 ++++++++++++++++++- tools/perf/util/dwarf-regs.c | 4 + tools/perf/util/include/dwarf-regs.h | 1 + tools/perf/util/unwind-libdw-arch/Build | 1 - .../unwind-libdw-arch/unwind-libdw-powerpc.c | 76 ------------------ tools/perf/util/unwind-libdw.c | 5 +- tools/perf/util/unwind-libdw.h | 1 - 7 files changed, 82 insertions(+), 83 deletions(-) delete mode 100644 tools/perf/util/unwind-libdw-arch/unwind-libdw-powerpc.c
tools/perf/util/dwarf-regs-arch/dwarf-regs-powerpc.c +76 -1
@@ -4,8 +4,9 @@* * Copyright (C) 2010 Ian Munsie, IBM Corporation. */ - +#include <errno.h> #include <dwarf-regs.h> +#include "../../../arch/powerpc/include/uapi/asm/perf_regs.h" #define PPC_OP (op) (((op) >> 26) & 0x3F)#define PPC_RA (a) (((a) >> 16) & 0x1f)
@@ -59,3 +60,77 @@ void get_powerpc_regs(u32 raw_insn, int is_source,if ((op_loc->mem_ref) && (PPC_OP (raw_insn) !=31 )) op_loc->offset =get_offset_opcode (raw_insn); } + +int __get_dwarf_regnum_for_perf_regnum_powerpc (int perf_regnum) +{ +static const int dwarf_powerpc_regnums[] = { + [PERF_REG_POWERPC_R0 ] =0 , + [PERF_REG_POWERPC_R1 ] =1 , + [PERF_REG_POWERPC_R2 ] =2 , + [PERF_REG_POWERPC_R3 ] =3 , + [PERF_REG_POWERPC_R4 ] =4 , + [PERF_REG_POWERPC_R5 ] =5 , + [PERF_REG_POWERPC_R6 ] =6 , + [PERF_REG_POWERPC_R7 ] =7 , + [PERF_REG_POWERPC_R8 ] =8 , + [PERF_REG_POWERPC_R9 ] =9 , + [PERF_REG_POWERPC_R10 ] =10 , + [PERF_REG_POWERPC_R11 ] =11 , + [PERF_REG_POWERPC_R12 ] =12 , + [PERF_REG_POWERPC_R13 ] =13 , + [PERF_REG_POWERPC_R14 ] =14 , + [PERF_REG_POWERPC_R15 ] =15 , + [PERF_REG_POWERPC_R16 ] =16 , + [PERF_REG_POWERPC_R17 ] =17 , + [PERF_REG_POWERPC_R18 ] =18 , + [PERF_REG_POWERPC_R19 ] =19 , + [PERF_REG_POWERPC_R20 ] =20 , + [PERF_REG_POWERPC_R21 ] =21 , + [PERF_REG_POWERPC_R22 ] =22 , + [PERF_REG_POWERPC_R23 ] =23 , + [PERF_REG_POWERPC_R24 ] =24 , + [PERF_REG_POWERPC_R25 ] =25 , + [PERF_REG_POWERPC_R26 ] =26 , + [PERF_REG_POWERPC_R27 ] =27 , + [PERF_REG_POWERPC_R28 ] =28 , + [PERF_REG_POWERPC_R29 ] =29 , + [PERF_REG_POWERPC_R30 ] =30 , + [PERF_REG_POWERPC_R31 ] =31 , +/* TODO: PERF_REG_POWERPC_NIP */ + [PERF_REG_POWERPC_MSR ] =66 , +/* TODO: PERF_REG_POWERPC_ORIG_R3 */ + [PERF_REG_POWERPC_CTR ] =109 , + [PERF_REG_POWERPC_LINK ] =108 ,/* Note, previously in perf encoded as 65? */ + [PERF_REG_POWERPC_XER ] =101 , +/* TODO: PERF_REG_POWERPC_CCR */ +/* TODO: PERF_REG_POWERPC_SOFTE */ +/* TODO: PERF_REG_POWERPC_TRAP */ +/* TODO: PERF_REG_POWERPC_DAR */ +/* TODO: PERF_REG_POWERPC_DSISR */ +/* TODO: PERF_REG_POWERPC_SIER */ +/* TODO: PERF_REG_POWERPC_MMCRA */ +/* TODO: PERF_REG_POWERPC_MMCR0 */ +/* TODO: PERF_REG_POWERPC_MMCR1 */ +/* TODO: PERF_REG_POWERPC_MMCR2 */ +/* TODO: PERF_REG_POWERPC_MMCR3 */ +/* TODO: PERF_REG_POWERPC_SIER2 */ +/* TODO: PERF_REG_POWERPC_SIER3 */ +/* TODO: PERF_REG_POWERPC_PMC1 */ +/* TODO: PERF_REG_POWERPC_PMC2 */ +/* TODO: PERF_REG_POWERPC_PMC3 */ +/* TODO: PERF_REG_POWERPC_PMC4 */ +/* TODO: PERF_REG_POWERPC_PMC5 */ +/* TODO: PERF_REG_POWERPC_PMC6 */ +/* TODO: PERF_REG_POWERPC_SDAR */ +/* TODO: PERF_REG_POWERPC_SIAR */ + }; + +if (perf_regnum ==0 ) +return 0 ; + +if (perf_regnum <0 || perf_regnum > (int )ARRAY_SIZE (dwarf_powerpc_regnums) || + dwarf_powerpc_regnums[perf_regnum] ==0 ) +return -ENOENT ; + +return dwarf_powerpc_regnums[perf_regnum]; +}
tools/perf/util/dwarf-regs.c +4 -0
@@ -205,6 +205,10 @@ int get_dwarf_regnum_for_perf_regnum(int perf_regnum, unsigned int machine,case EM_CSKY : reg =__get_dwarf_regnum_for_perf_regnum_csky (perf_regnum, flags);break ; +case EM_PPC : +case EM_PPC64 : + reg =__get_dwarf_regnum_for_perf_regnum_powerpc (perf_regnum); +break ;case EM_LOONGARCH : reg =__get_dwarf_regnum_for_perf_regnum_loongarch (perf_regnum);break ;
tools/perf/util/include/dwarf-regs.h +1 -0
@@ -110,6 +110,7 @@ int __get_dwarf_regnum_for_perf_regnum_arm64(int perf_regnum);int __get_dwarf_regnum_for_perf_regnum_csky (int perf_regnum,unsigned int flags);int __get_dwarf_regnum_for_perf_regnum_loongarch (int perf_regnum); +int __get_dwarf_regnum_for_perf_regnum_powerpc (int perf_regnum);/* * get_dwarf_regnum - Returns DWARF regnum from register name
tools/perf/util/unwind-libdw-arch/Build +0 -1
@@ -1,3 +1,2 @@ -perf-util-y += unwind-libdw-powerpc.o perf-util-y += unwind-libdw-riscv.o perf-util-y += unwind-libdw-s390.o
tools/perf/util/unwind-libdw-arch/unwind-libdw-powerpc.c deleted +0 -76
76 lines not on this page · raw message
tools/perf/util/unwind-libdw.c +1 -4
@@ -292,15 +292,12 @@ static const Dwfl_Thread_Callbacks callbacks_generic = { .set_initial_registers = libdw_set_initial_registers_generic, }; -DEFINE_DWFL_THREAD_CALLBACKS (powerpc);DEFINE_DWFL_THREAD_CALLBACKS (riscv);DEFINE_DWFL_THREAD_CALLBACKS (s390);static const Dwfl_Thread_Callbacks *get_thread_callbacks (const char *arch) { -if (!strcmp (arch,"powerpc" )) -return &callbacks_powerpc; -else if (!strcmp (arch,"riscv" )) +if (!strcmp (arch,"riscv" ))return &callbacks_riscv;else if (!strcmp (arch,"s390" ))return &callbacks_s390;
tools/perf/util/unwind-libdw.h +0 -1
@@ -10,7 +10,6 @@ struct perf_sample;struct thread ;bool libdw_set_initial_registers_mips (Dwfl_Thread *thread,void *arg); -bool libdw_set_initial_registers_powerpc (Dwfl_Thread *thread,void *arg);bool libdw_set_initial_registers_riscv (Dwfl_Thread *thread,void *arg);bool libdw_set_initial_registers_s390 (Dwfl_Thread *thread,void *arg);
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 18/23 perf dwarf-regs: Add RISC-V perf to dwarf register number mapping functions
In reply to Ian RogersThese functions allow the generic initial register state code in unwind-libdw to be used.
--- tools/perf/util/dwarf-regs-arch/Build | 1 + .../util/dwarf-regs-arch/dwarf-regs-riscv.c | 12 ++++ tools/perf/util/dwarf-regs.c | 3 + tools/perf/util/include/dwarf-regs.h | 1 + tools/perf/util/unwind-libdw-arch/Build | 1 - .../unwind-libdw-arch/unwind-libdw-riscv.c | 58 ------------------- tools/perf/util/unwind-libdw.c | 5 +- tools/perf/util/unwind-libdw.h | 1 - 8 files changed, 18 insertions(+), 64 deletions(-) create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-riscv.c delete mode 100644 tools/perf/util/unwind-libdw-arch/unwind-libdw-riscv.c
tools/perf/util/dwarf-regs-arch/Build +1 -0
@@ -3,4 +3,5 @@ perf-util-$(CONFIG_LIBDW) += dwarf-regs-arm.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-csky.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-loongarch.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-powerpc.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs-riscv.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-x86.o
tools/perf/util/dwarf-regs-arch/dwarf-regs-riscv.c new file +12 -0
@@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <errno.h> +#include <dwarf-regs.h> +#include "../../../arch/riscv/include/uapi/asm/perf_regs.h" + +int __get_dwarf_regnum_for_perf_regnum_riscv (int perf_regnum) +{ +if (perf_regnum <0 || perf_regnum >=PERF_REG_RISCV_MAX ) +return -ENOENT ; + +return perf_regnum; +}
tools/perf/util/dwarf-regs.c +3 -0
@@ -209,6 +209,9 @@ int get_dwarf_regnum_for_perf_regnum(int perf_regnum, unsigned int machine,case EM_PPC64 : reg =__get_dwarf_regnum_for_perf_regnum_powerpc (perf_regnum);break ; +case EM_RISCV : + reg =__get_dwarf_regnum_for_perf_regnum_riscv (perf_regnum); +break ;case EM_LOONGARCH : reg =__get_dwarf_regnum_for_perf_regnum_loongarch (perf_regnum);break ;
tools/perf/util/include/dwarf-regs.h +1 -0
@@ -111,6 +111,7 @@ int __get_dwarf_regnum_for_perf_regnum_arm64(int perf_regnum);int __get_dwarf_regnum_for_perf_regnum_csky (int perf_regnum,unsigned int flags);int __get_dwarf_regnum_for_perf_regnum_loongarch (int perf_regnum);int __get_dwarf_regnum_for_perf_regnum_powerpc (int perf_regnum); +int __get_dwarf_regnum_for_perf_regnum_riscv (int perf_regnum);/* * get_dwarf_regnum - Returns DWARF regnum from register name
tools/perf/util/unwind-libdw-arch/Build +0 -1
@@ -1,2 +1 @@ -perf-util-y += unwind-libdw-riscv.o perf-util-y += unwind-libdw-s390.o
tools/perf/util/unwind-libdw-arch/unwind-libdw-riscv.c deleted +0 -58
58 lines not on this page · raw message
tools/perf/util/unwind-libdw.c +1 -4
@@ -292,14 +292,11 @@ static const Dwfl_Thread_Callbacks callbacks_generic = { .set_initial_registers = libdw_set_initial_registers_generic, }; -DEFINE_DWFL_THREAD_CALLBACKS (riscv);DEFINE_DWFL_THREAD_CALLBACKS (s390);static const Dwfl_Thread_Callbacks *get_thread_callbacks (const char *arch) { -if (!strcmp (arch,"riscv" )) -return &callbacks_riscv; -else if (!strcmp (arch,"s390" )) +if (!strcmp (arch,"s390" ))return &callbacks_s390;return &callbacks_generic;
tools/perf/util/unwind-libdw.h +0 -1
@@ -10,7 +10,6 @@ struct perf_sample;struct thread ;bool libdw_set_initial_registers_mips (Dwfl_Thread *thread,void *arg); -bool libdw_set_initial_registers_riscv (Dwfl_Thread *thread,void *arg);bool libdw_set_initial_registers_s390 (Dwfl_Thread *thread,void *arg);struct unwind_info {
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 19/23 perf dwarf-regs: Add S390 perf to dwarf register number mapping functions
In reply to Ian RogersThese functions allow the generic initial register state code in unwind-libdw to be used. Now the non-generic code in unwind-libdw has no uses remove it.
--- tools/perf/util/dwarf-regs-arch/Build | 1 + .../util/dwarf-regs-arch/dwarf-regs-s390.c | 53 +++++++++++++++ tools/perf/util/dwarf-regs.c | 3 + tools/perf/util/include/dwarf-regs.h | 1 + tools/perf/util/unwind-libdw-arch/Build | 1 - .../unwind-libdw-arch/unwind-libdw-s390.c | 65 ------------------- tools/perf/util/unwind-libdw.c | 31 ++------- tools/perf/util/unwind-libdw.h | 1 - 8 files changed, 62 insertions(+), 94 deletions(-) create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-s390.c delete mode 100644 tools/perf/util/unwind-libdw-arch/Build delete mode 100644 tools/perf/util/unwind-libdw-arch/unwind-libdw-s390.c
tools/perf/util/dwarf-regs-arch/Build +1 -0
@@ -4,4 +4,5 @@ perf-util-$(CONFIG_LIBDW) += dwarf-regs-csky.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-loongarch.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-powerpc.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-riscv.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs-s390.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-x86.o
tools/perf/util/dwarf-regs-arch/dwarf-regs-s390.c new file +53 -0
53 lines not on this page · raw message
tools/perf/util/dwarf-regs.c +3 -0
@@ -212,6 +212,9 @@ int get_dwarf_regnum_for_perf_regnum(int perf_regnum, unsigned int machine,case EM_RISCV : reg =__get_dwarf_regnum_for_perf_regnum_riscv (perf_regnum);break ; +case EM_S390 : + reg =__get_dwarf_regnum_for_perf_regnum_s390 (perf_regnum); +break ;case EM_LOONGARCH : reg =__get_dwarf_regnum_for_perf_regnum_loongarch (perf_regnum);break ;
tools/perf/util/include/dwarf-regs.h +1 -0
@@ -112,6 +112,7 @@ int __get_dwarf_regnum_for_perf_regnum_csky(int perf_regnum, unsigned int flags)int __get_dwarf_regnum_for_perf_regnum_loongarch (int perf_regnum);int __get_dwarf_regnum_for_perf_regnum_powerpc (int perf_regnum);int __get_dwarf_regnum_for_perf_regnum_riscv (int perf_regnum); +int __get_dwarf_regnum_for_perf_regnum_s390 (int perf_regnum);/* * get_dwarf_regnum - Returns DWARF regnum from register name
tools/perf/util/unwind-libdw-arch/Build deleted +0 -1
@@ -1 +0,0 @@ -perf-util-y += unwind-libdw-s390.o
tools/perf/util/unwind-libdw-arch/unwind-libdw-s390.c deleted +0 -65
65 lines not on this page · raw message
tools/perf/util/unwind-libdw.c +4 -27
@@ -226,7 +226,7 @@ static bool memory_read(Dwfl *dwfl __maybe_unused, Dwarf_Addr addr, Dwarf_Word *return true; } -static bool libdw_set_initial_registers_generic (Dwfl_Thread *thread,void *arg) +static bool libdw_set_initial_registers (Dwfl_Thread *thread,void *arg) {struct unwind_info *ui = arg;struct regs_dump *user_regs =perf_sample__user_regs (ui->sample);
@@ -279,29 +279,12 @@ static bool libdw_set_initial_registers_generic(Dwfl_Thread *thread, void *arg)return ret; } -#define DEFINE_DWFL_THREAD_CALLBACKS (arch) \ -static const Dwfl_Thread_Callbacks callbacks_##arch = { \ - .next_thread = next_thread, \ - .memory_read = memory_read, \ - .set_initial_registers = libdw_set_initial_registers_##arch, \ -} - -static const Dwfl_Thread_Callbacks callbacks_generic = { +static const Dwfl_Thread_Callbacks callbacks = { .next_thread = next_thread, .memory_read = memory_read, - .set_initial_registers = libdw_set_initial_registers_generic, + .set_initial_registers = libdw_set_initial_registers, }; -DEFINE_DWFL_THREAD_CALLBACKS (s390); - -static const Dwfl_Thread_Callbacks *get_thread_callbacks (const char *arch) -{ -if (!strcmp (arch,"s390" )) -return &callbacks_s390; - -return &callbacks_generic; -} -static int frame_callback (Dwfl_Frame *state,void *arg) {
@@ -349,10 +332,8 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg, .e_machine = e_machine, .best_effort = best_effort }; -const char *arch =perf_env__arch (machine->env);Dwarf_Word ip;int err = -EINVAL , i; -const Dwfl_Thread_Callbacks *callbacks;if (!data->user_regs || !data->user_regs->regs)return -EINVAL ;
@@ -375,11 +356,7 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg,if (err) goto out; - callbacks =get_thread_callbacks (arch); -if (!callbacks) - goto out; - - err = !dwfl_attach_state (ui->dwfl,/*elf=*/ NULL ,thread__tid (thread), callbacks, ui); + err = !dwfl_attach_state (ui->dwfl,/*elf=*/ NULL ,thread__tid (thread), &callbacks, ui);if (err) goto out;
tools/perf/util/unwind-libdw.h +0 -1
@@ -10,7 +10,6 @@ struct perf_sample;struct thread ;bool libdw_set_initial_registers_mips (Dwfl_Thread *thread,void *arg); -bool libdw_set_initial_registers_s390 (Dwfl_Thread *thread,void *arg);struct unwind_info {Dwfl *dwfl;
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 20/23 perf dwarf-regs: Add MIPS perf to dwarf register number mapping functions
In reply to Ian RogersDespite an unused function declaration, there was no unwind-libdw for MIPS but there is a perf_regs.h and a libdw implementation. Fill in the pieces so hopefully MIPS unwinding with libdw works.
--- tools/perf/util/dwarf-regs-arch/Build | 1 + tools/perf/util/dwarf-regs-arch/dwarf-regs-mips.c | 14 ++++++++++++++ tools/perf/util/dwarf-regs.c | 5 +++++ tools/perf/util/include/dwarf-regs.h | 1 + tools/perf/util/unwind-libdw.h | 2 -- 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-mips.c
tools/perf/util/dwarf-regs-arch/Build +1 -0
@@ -2,6 +2,7 @@ perf-util-$(CONFIG_LIBDW) += dwarf-regs-arm64.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-arm.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-csky.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-loongarch.o +perf-util-$(CONFIG_LIBDW) += dwarf-regs-mips.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-powerpc.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-riscv.o perf-util-$(CONFIG_LIBDW) += dwarf-regs-s390.o
tools/perf/util/dwarf-regs-arch/dwarf-regs-mips.c new file +14 -0
@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <errno.h> +#include <dwarf-regs.h> +#include "../../../arch/mips/include/uapi/asm/perf_regs.h" + +int __get_dwarf_regnum_for_perf_regnum_mips (int perf_regnum) +{ +if (perf_regnum ==PERF_REG_MIPS_PC ) +return 37 ; +if (perf_regnum <0 || perf_regnum >=PERF_REG_MIPS_MAX ) +return -ENOENT ; + +return perf_regnum; +}
tools/perf/util/dwarf-regs.c +5 -0
@@ -179,6 +179,8 @@ static int get_libdw_frame_nregs(unsigned int machine, unsigned int flags __maybreturn 103 ;case EM_LOONGARCH :return 74 ; +case EM_MIPS : +return 71 ;default :return 0 ; }
@@ -218,6 +220,9 @@ int get_dwarf_regnum_for_perf_regnum(int perf_regnum, unsigned int machine,case EM_LOONGARCH : reg =__get_dwarf_regnum_for_perf_regnum_loongarch (perf_regnum);break ; +case EM_MIPS : + reg =__get_dwarf_regnum_for_perf_regnum_mips (perf_regnum); +break ;default :pr_err ("ELF MACHINE %x is not supported.\n" , machine);return -ENOENT ;
tools/perf/util/include/dwarf-regs.h +1 -0
@@ -113,6 +113,7 @@ int __get_dwarf_regnum_for_perf_regnum_loongarch(int perf_regnum);int __get_dwarf_regnum_for_perf_regnum_powerpc (int perf_regnum);int __get_dwarf_regnum_for_perf_regnum_riscv (int perf_regnum);int __get_dwarf_regnum_for_perf_regnum_s390 (int perf_regnum); +int __get_dwarf_regnum_for_perf_regnum_mips (int perf_regnum);/* * get_dwarf_regnum - Returns DWARF regnum from register name
tools/perf/util/unwind-libdw.h +0 -2
@@ -9,8 +9,6 @@ struct machine;struct perf_sample ;struct thread ; -bool libdw_set_initial_registers_mips (Dwfl_Thread *thread,void *arg); -struct unwind_info {Dwfl *dwfl;struct perf_sample *sample;
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 21/23 perf build: Remove NO_LIBDW_DWARF_UNWIND option
In reply to Ian RogersLibdw unwinding support is present for every architecture that has a perf_regs.h - perf registers are needed for the initial frame to unwind. Elfutils also supports sparc, arc and m68k but there is no support in the Linux kernel for perf registers on these architectures. As the perf supported dwarf unwinding architectures are a subset of the elfutils ones, remove NO_LIBDW_DWARF_UNWIND as there isn't a case of elfutils lacking the support need for perf.
--- tools/perf/Makefile.config | 19 +------------------ tools/perf/tests/make | 3 +-- tools/perf/util/Build | 3 +-- 3 files changed, 3 insertions(+), 22 deletions(-)
tools/perf/Makefile.config +1 -18
@@ -118,14 +118,6 @@ ifeq ($(ARCH),mips) endif endif -# So far there's only x86 and arm libdw unwind support merged in perf. -# Disable it on all other architectures in case libdw unwind -# support is detected in system. Add supported architectures -# to the check. -ifneq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc s390 csky riscv loongarch)) - NO_LIBDW_DWARF_UNWIND := 1 -endif - ifneq ($(LIBUNWIND),1) NO_LIBUNWIND := 1 endif
@@ -456,7 +448,6 @@ endif ifdef NO_LIBELF NO_LIBDW := 1 NO_LIBUNWIND := 1 - NO_LIBDW_DWARF_UNWIND := 1 NO_LIBBPF := 1 NO_JVMTI := 1 else
@@ -504,10 +495,6 @@ ifeq ($(feature-libaio), 1) endif endif -ifdef NO_LIBDW - NO_LIBDW_DWARF_UNWIND := 1 -endif - ifeq ($(feature-scandirat), 1) # Ignore having scandirat with memory sanitizer that lacks an interceptor. ifeq ($(filter s% -fsanitize=memory%,$(EXTRA_CFLAGS),),)
@@ -757,7 +744,7 @@ dwarf-post-unwind-text := BUG # setup DWARF post unwinder ifdef NO_LIBUNWIND - ifdef NO_LIBDW_DWARF_UNWIND + ifdef NO_LIBDW $(warning Disabling post unwind, no support found.) dwarf-post-unwind := 0 else
@@ -767,10 +754,6 @@ ifdef NO_LIBUNWIND else dwarf-post-unwind-text := libunwind $(call detected,CONFIG_LIBUNWIND) - # Enable libunwind support by default. - ifndef NO_LIBDW_DWARF_UNWIND - NO_LIBDW_DWARF_UNWIND := 1 - endif endif ifeq ($(dwarf-post-unwind),1)
tools/perf/tests/make +1 -2
@@ -83,7 +83,6 @@ make_no_demangle := NO_DEMANGLE=1 make_no_libelf := NO_LIBELF=1 make_no_libdw := NO_LIBDW=1 make_libunwind := LIBUNWIND=1 -make_no_libdw_dwarf_unwind := NO_LIBDW_DWARF_UNWIND=1 make_no_backtrace := NO_BACKTRACE=1 make_no_libcapstone := NO_CAPSTONE=1 make_no_libnuma := NO_LIBNUMA=1
@@ -120,7 +119,7 @@ make_static := LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX3 make_minimal := NO_LIBPYTHON=1 NO_GTK2=1 make_minimal += NO_DEMANGLE=1 NO_LIBELF=1 NO_BACKTRACE=1 make_minimal += NO_LIBNUMA=1 NO_LIBBIONIC=1 NO_LIBDW=1 -make_minimal += NO_LIBDW_DWARF_UNWIND=1 NO_LIBBPF=1 +make_minimal += NO_LIBBPF=1 make_minimal += NO_SDT=1 NO_JVMTI=1 NO_LIBZSTD=1 make_minimal += NO_LIBCAP=1 NO_CAPSTONE=1
tools/perf/util/Build +1 -2
@@ -223,9 +223,8 @@ perf-util-$(CONFIG_LIBDW) += dwarf-regs-arch/ perf-util-$(CONFIG_LIBDW) += debuginfo.o perf-util-$(CONFIG_LIBDW) += annotate-data.o perf-util-$(CONFIG_LIBDW) += libdw.o +perf-util-$(CONFIG_LIBDW) += unwind-libdw.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw-arch/ perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind-local.o perf-util-$(CONFIG_LIBUNWIND) += unwind-libunwind.o perf-util-$(CONFIG_LIBUNWIND_X86) += libunwind/x86_32.o
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH 22/23 perf unwind-libdw: Don't discard loaded ELF/Dwarf after every unwind
In reply to Ian RogersThe unwind-libdw dwfl has ELF binaries associated with mmap addresses. Experimenting with using the per dso dwfl it is required to alter the address to be 0 based variant. Unfortunately libdwfl doesn't allow a single unwind and then an update to the return address to be 0 based as there are assertions that registers aren't updated once an unwind has started, etc.
As removing the dwfl didn't prove possible, an alternative is to just not discard the dwfl when the unwind ends. The dwfl is valid for a process unless a dso is loaded at the same address as a previous one. So keep the dwfl with the maps, invalidate it if a map is removed (in case a new map replaces it) and recycle the dwfl in the unwinding code. A wrinkly in the implementation of this is that the attached thread argument is remembered by the dwfl and so it needs to be a pointer to memory that also persists with the dwfl (struct dwfl_ui_thread_info in the code).
Recording 10 seconds of system wide data with --call-graph=dwarf and then processing with perf report shows a total runtime improvement from 41.583s to 2.279s (an 18x speedup).
--- tools/perf/util/maps.c | 36 +++++++++++++- tools/perf/util/maps.h | 4 ++ tools/perf/util/unwind-libdw.c | 90 +++++++++++++++++++++++++--------- tools/perf/util/unwind-libdw.h | 9 +++- 4 files changed, 112 insertions(+), 27 deletions(-)
tools/perf/util/maps.c +34 -2
@@ -10,6 +10,7 @@#include "thread.h" #include "ui/ui.h" #include "unwind.h" +#include "unwind-libdw.h" #include <internal/rc_check.h> /*
@@ -39,6 +40,9 @@ DECLARE_RC_STRUCT(maps) {#ifdef HAVE_LIBUNWIND_SUPPORT void *addr_space;const struct unwind_libunwind_ops *unwind_libunwind_ops; +#endif +#ifdef HAVE_LIBDW_SUPPORT +void *libdw_addr_space_dwfl;#endif refcount_t refcnt;/**
@@ -203,6 +207,17 @@ void maps__set_unwind_libunwind_ops(struct maps *maps, const struct unwind_libun RC_CHK_ACCESS(maps)->unwind_libunwind_ops = ops; }#endif +#ifdef HAVE_LIBDW_SUPPORT +void *maps__libdw_addr_space_dwfl (const struct maps *maps) +{ +return RC_CHK_ACCESS (maps)->libdw_addr_space_dwfl; +} + +void maps__set_libdw_addr_space_dwfl (struct maps *maps,void *dwfl) +{ +RC_CHK_ACCESS (maps)->libdw_addr_space_dwfl = dwfl; +} +#endif static struct rw_semaphore *maps__lock (struct maps *maps) {
@@ -218,6 +233,9 @@ static void maps__init(struct maps *maps, struct machine *machine)#ifdef HAVE_LIBUNWIND_SUPPORT RC_CHK_ACCESS (maps)->addr_space =NULL ;RC_CHK_ACCESS (maps)->unwind_libunwind_ops =NULL ; +#endif +#ifdef HAVE_LIBDW_SUPPORT +RC_CHK_ACCESS (maps)->libdw_addr_space_dwfl =NULL ;#endif refcount_set (maps__refcnt (maps),1 );RC_CHK_ACCESS (maps)->nr_maps =0 ;
@@ -240,6 +258,9 @@ static void maps__exit(struct maps *maps)zfree (&maps_by_address);zfree (&maps_by_name);unwind__finish_access (maps); +#ifdef HAVE_LIBDW_SUPPORT +libdw__invalidate_dwfl (maps,maps__libdw_addr_space_dwfl (maps)); +#endif }struct maps *maps__new (struct machine *machine)
@@ -549,6 +570,9 @@ void maps__remove(struct maps *maps, struct map *map)__maps__remove (maps, map);check_invariants (maps);up_write (maps__lock (maps)); +#ifdef HAVE_LIBDW_SUPPORT +libdw__invalidate_dwfl (maps,maps__libdw_addr_space_dwfl (maps)); +#endif }bool maps__empty (struct maps *maps)
@@ -604,18 +628,26 @@ int maps__for_each_map(struct maps *maps, int (*cb)(struct map *map, void *data)void maps__remove_maps (struct maps *maps,bool (*cb)(struct map *map,void *data),void *data) {struct map **maps_by_address; +bool removed = false;down_write (maps__lock (maps)); maps_by_address =maps__maps_by_address (maps);for (unsigned int i =0 ; i <maps__nr_maps (maps);) { -if (cb (maps_by_address[i], data)) +if (cb (maps_by_address[i], data)) {__maps__remove (maps, maps_by_address[i]); -else + removed = true; + }else { i++; + } }check_invariants (maps);up_write (maps__lock (maps)); +if (removed) { +#ifdef HAVE_LIBDW_SUPPORT +libdw__invalidate_dwfl (maps,maps__libdw_addr_space_dwfl (maps)); +#endif + } }struct symbol *maps__find_symbol (struct maps *maps,u64 addr,struct map **mapp)
tools/perf/util/maps.h +4 -0
@@ -52,6 +52,10 @@ void maps__set_addr_space(struct maps *maps, void *addr_space);const struct unwind_libunwind_ops *maps__unwind_libunwind_ops (const struct maps *maps);void maps__set_unwind_libunwind_ops (struct maps *maps,const struct unwind_libunwind_ops *ops);#endif +#ifdef HAVE_LIBDW_SUPPORT +void *maps__libdw_addr_space_dwfl (const struct maps *maps); +void maps__set_libdw_addr_space_dwfl (struct maps *maps,void *dwfl); +#endif size_t maps__fprintf (struct maps *maps,FILE *fp);
tools/perf/util/unwind-libdw.c +67 -23
144 lines not on this page · raw message
tools/perf/util/unwind-libdw.h +7 -2
@@ -2,15 +2,17 @@ #ifndef __PERF_UNWIND_LIBDW_H #define __PERF_UNWIND_LIBDW_H -#include <elfutils/libdwfl.h> +#include <stdint.h> #include "unwind.h" struct machine; struct perf_sample; struct thread; +#ifdef HAVE_LIBDW_SUPPORT + struct unwind_info { - Dwfl *dwfl; + void *dwfl; struct perf_sample *sample; struct machine *machine; struct thread *thread;
@@ -23,4 +25,7 @@ struct unwind_info {struct unwind_entry entries[]; }; +void libdw__invalidate_dwfl (struct maps *maps,void *dwfl); +#endif +#endif /* __PERF_UNWIND_LIBDW_H */
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Re: [PATCH v1 22/23] perf unwind-libdw: Don't discard loaded ELF/Dwarf after every unwind
Quoted 1 line
As removing the dwfl didn't prove possible, an alternative is to just not discard the dwfl when the unwind ends. The dwfl is valid for a process unless a dso is loaded at the same address as a previous one. So keep the dwfl with the maps, invalidate it if a map is removed (in case a new map replaces it) and recycle the dwfl in the unwinding code.
Relevant note:
I'm looking at whether elfutils libdwfl_stacktrace might further help with these issues. The libdwfl_stacktrace library is currently shipped as an experimental addon to libdwfl in elfutils 0.194, but I'm intending to stabilize the API this year. There's code for some analogous functions: translating perf->dwarf register files, and caching Dwfl and Elf data to speed up unwinding across multiple processes. (Thus, if unwinding a collection of perf_events from 16 processes that use libc, we don't need to load the CFI for libc.so 16 times.)
I think once I've stabilized the libdwfl_stacktrace API and expanded the register support to a larger set of perf-supported architectures, it makes sense for me to author a corresponding set of patches for perf. I'll see if it's worth adding more libdwflst functionality to elfutils 0.195 in anticipation of this.
-- Serhei Makarov
Ian Rogers
reviewerRe: [PATCH v1 22/23] perf unwind-libdw: Don't discard loaded ELF/Dwarf after every unwind
Quoted 8 lines · Serhei Makarov
Quoted 2 lines
As removing the dwfl didn't prove possible, an alternative is to just not discard the dwfl when the unwind ends. The dwfl is valid for a process unless a dso is loaded at the same address as a previous one. So keep the dwfl with the maps, invalidate it if a map is removed (in case a new map replaces it) and recycle the dwfl in the unwinding code.
Relevant note:
I'm looking at whether elfutils
libdwfl_stacktracemight further help with these issues. Thelibdwfl_stacktracelibrary is currently shipped as an experimental addon to libdwfl in elfutils 0.194, but I'm intending to stabilize the API this year. There's code for some analogous functions: translatingperf->dwarfregister files, and caching Dwfl and Elf data to speed up unwinding across multiple processes. (Thus, if unwinding a collection ofperf_eventsfrom 16 processes that use libc, we don't need to load the CFI for libc.so 16 times.)I think once I've stabilized the
libdwfl_stacktraceAPI and expanded the register support to a larger set of perf-supported architectures, it makes sense for me to author a corresponding set of patches for perf. I'll see if it's worth adding more libdwflst functionality to elfutils 0.195 in anticipation of this.
Thanks Serhei, this would be really awesome! I've done my best wrt trying to optimize around libdwfl, but I wasn't able to have a single dwfl for the addr2line case with a dso and the stack unwinding code. Just to give too many details :-)
With addr2line we have the dso and an offset into the dso of some point in code. We want to get the symbol for that address and inline information. The "bias" notion in dwfl was something of a speed bump in writing that code and was broken in an early version:
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/libdw.c?h=perf-tools-next#n133
Just documenting libdw/libdwfl addresses better to say whether a bias is or isn't necessary would be useful. Walking the inline information is also (strangely to me) done outside of libdw, which makes me wonder about support for things like partial compilation units:
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/dwarf-aux.c?h=perf-tools-next#n147
For the unwinding:
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/unwind-libdw.c?h=perf-tools-next#n407
I experimented with failing each unwind step so that then I could take the return PC, make it an offset into a dso and reuse the dso dwfl. This breaks many asserts in libdwfl and so I gave it up.
There's also the use of a dwfl for type profiling and probes in debuginfo:
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/debuginfo.c?h=perf-tools-next#n55
For making the code generic we needed mapping functions between perf and dwarf numbering, as well as number and string mapping. A problem with the generic code was that if a register was encoded that libdwfl didn't support it broke libdwfl. This led to clipping the registers:
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/dwarf-regs.c?h=perf-tools-next#n157
but this feels like code that's going to bitrot, cause elfutil version problems, etc.
Something I noticed is that there was a reduction in crashes from 0.192 to 0.194. I'm a little concerned that people may package perf without updating elfutils and witness crashes because of these recent perf changes. Hopefully distributions will move forward to 0.194 asap.
Thanks,
Ian
Quoted 1 line
-- Serhei Makarov
Ian Rogers
reviewerPATCH 23/23 perf machine: Add inline information to frame pointer and LBR callchains
In reply to Ian RogersUse append_inlines in frame pointer and LBR cases. Update the addr2line test to also test frame pointers. LBR is also updated but inaccuracy in the branched to IP means the inline information is missing in the leaf. Leave LBR callchains untested for now.
--- tools/perf/tests/shell/addr2line_inlines.sh | 31 +++++- tools/perf/util/machine.c | 104 +++++++++++--------- 2 files changed, 86 insertions(+), 49 deletions(-)
tools/perf/tests/shell/addr2line_inlines.sh +26 -5
@@ -21,8 +21,28 @@ trap_cleanup() { } trap trap_cleanup EXIT TERM INT -test_inlinedloop() { - echo "Inline unwinding verification test" +test_fp() { + echo "Inline unwinding fp verification test" + # Record data. Currently only dwarf callchains support inlined functions. + perf record --call-graph fp -e task-clock:u -o "${perf_data}" -- perf test -w inlineloop 1 + + # Check output with inline (default) and srcline + perf script -i "${perf_data}" --fields +srcline > "${perf_script_txt}" + + # Expect the leaf and middle functions to occur on lines in the 20s, with + # the non-inlined parent function on a line in the 30s. + if grep -q "inlineloop.c:2. (inlined)" "${perf_script_txt}" && + grep -q "inlineloop.c:3.$" "${perf_script_txt}" + then + echo "Inline unwinding fp verification test [Success]" + else + echo "Inline unwinding fp verification test [Failed missing inlined functions]" + err=1 + fi +} + +test_dwarf() { + echo "Inline unwinding dwarf verification test" # Record data. Currently only dwarf callchains support inlined functions. perf record --call-graph dwarf -e task-clock:u -o "${perf_data}" -- perf test -w inlineloop 1
@@ -34,14 +54,15 @@ test_inlinedloop() { if grep -q "inlineloop.c:2. (inlined)" "${perf_script_txt}" && grep -q "inlineloop.c:3.$" "${perf_script_txt}" then - echo "Inline unwinding verification test [Success]" + echo "Inline unwinding dwarf verification test [Success]" else - echo "Inline unwinding verification test [Failed missing inlined functions]" + echo "Inline unwinding dwarf verification test [Failed missing inlined functions]" err=1 fi } -test_inlinedloop +test_fp +test_dwarf cleanup exit $err
tools/perf/util/machine.c +60 -44
128 lines not on this page · raw message
Signature · 1 line
2.52.0.457.g6b5491de43-goog