From: Ian Rogers <irogers@google.com>
To: "Peter Zijlstra" <peterz@infradead.org>,
"Ingo Molnar" <mingo@redhat.com>,
"Arnaldo Carvalho de Melo" <acme@kernel.org>,
"Namhyung Kim" <namhyung@kernel.org>,
"Jiri Olsa" <jolsa@kernel.org>, "Ian Rogers" <irogers@google.com>,
"Adrian Hunter" <adrian.hunter@intel.com>,
"James Clark" <james.clark@linaro.org>,
"John Garry" <john.g.garry@oracle.com>,
"Will Deacon" <will@kernel.org>, "Leo Yan" <leo.yan@linux.dev>,
"Guo Ren" <guoren@kernel.org>, "Paul Walmsley" <pjw@kernel.org>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Albert Ou" <aou@eecs.berkeley.edu>,
"Alexandre Ghiti" <alex@ghiti.fr>,
"Shimin Guo" <shimin.guo@skydio.com>,
"Athira Rajeev" <atrajeev@linux.ibm.com>,
"Stephen Brennan" <stephen.s.brennan@oracle.com>,
"Howard Chu" <howardchu95@gmail.com>,
"Thomas Falcon" <thomas.falcon@intel.com>,
"Andi Kleen" <ak@linux.intel.com>,
"Dr. David Alan Gilbert" <linux@treblig.org>,
"Dmitry Vyukov" <dvyukov@google.com>,
"Krzysztof Łopatowski" <krzysztof.m.lopatowski@gmail.com>,
"Chun-Tse Shao" <ctshao@google.com>,
"Aditya Bodkhe" <aditya.b1@linux.ibm.com>,
"Haibo Xu" <haibo1.xu@intel.com>,
"Sergei Trofimovich" <slyich@gmail.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org,
linux-riscv@lists.infradead.org, "Mark Wielaard" <mark@klomp.org>
Subject: [PATCH v1 14/23] perf dwarf-regs: Add ARM perf to dwarf register number mapping functions
Date: Fri, 16 Jan 2026 21:28:40 -0800 [thread overview]
Message-ID: <20260117052849.2205545-15-irogers@google.com> (raw)
In-Reply-To: <20260117052849.2205545-1-irogers@google.com>
These functions allow the generic initial register state code in
unwind-libdw to be used.
Signed-off-by: Ian Rogers <irogers@google.com>
---
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
diff --git a/tools/perf/util/dwarf-regs-arch/Build b/tools/perf/util/dwarf-regs-arch/Build
index 98bec0032606..3f19a9ec47c7 100644
--- a/tools/perf/util/dwarf-regs-arch/Build
+++ b/tools/perf/util/dwarf-regs-arch/Build
@@ -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
diff --git a/tools/perf/util/dwarf-regs-arch/dwarf-regs-arm.c b/tools/perf/util/dwarf-regs-arch/dwarf-regs-arm.c
new file mode 100644
index 000000000000..42c6c0635612
--- /dev/null
+++ b/tools/perf/util/dwarf-regs-arch/dwarf-regs-arm.c
@@ -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;
+}
diff --git a/tools/perf/util/dwarf-regs-arch/dwarf-regs-arm64.c b/tools/perf/util/dwarf-regs-arch/dwarf-regs-arm64.c
new file mode 100644
index 000000000000..593ca7d4fccc
--- /dev/null
+++ b/tools/perf/util/dwarf-regs-arch/dwarf-regs-arm64.c
@@ -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;
+}
diff --git a/tools/perf/util/dwarf-regs.c b/tools/perf/util/dwarf-regs.c
index dffa0c8bdd14..c472ec5e4d1a 100644
--- a/tools/perf/util/dwarf-regs.c
+++ b/tools/perf/util/dwarf-regs.c
@@ -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;
diff --git a/tools/perf/util/include/dwarf-regs.h b/tools/perf/util/include/dwarf-regs.h
index a120c97a5fac..a52df8d1b138 100644
--- a/tools/perf/util/include/dwarf-regs.h
+++ b/tools/perf/util/include/dwarf-regs.h
@@ -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
diff --git a/tools/perf/util/unwind-libdw-arch/Build b/tools/perf/util/unwind-libdw-arch/Build
index 5b5682029953..79c3bbdc2dee 100644
--- a/tools/perf/util/unwind-libdw-arch/Build
+++ b/tools/perf/util/unwind-libdw-arch/Build
@@ -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
diff --git a/tools/perf/util/unwind-libdw-arch/unwind-libdw-arm.c b/tools/perf/util/unwind-libdw-arch/unwind-libdw-arm.c
deleted file mode 100644
index 56e9b5975bcc..000000000000
--- a/tools/perf/util/unwind-libdw-arch/unwind-libdw-arm.c
+++ /dev/null
@@ -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);
-}
diff --git a/tools/perf/util/unwind-libdw-arch/unwind-libdw-arm64.c b/tools/perf/util/unwind-libdw-arch/unwind-libdw-arm64.c
deleted file mode 100644
index 29b6833e036c..000000000000
--- a/tools/perf/util/unwind-libdw-arch/unwind-libdw-arm64.c
+++ /dev/null
@@ -1,61 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include <elfutils/libdwfl.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_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);
- Dwarf_Word dwarf_regs[PERF_REG_ARM64_MAX], dwarf_pc;
-
-#define REG(r) ({ \
- Dwarf_Word val = 0; \
- perf_reg_value(&val, user_regs, PERF_REG_ARM64_##r); \
- val; \
-})
-
- dwarf_regs[0] = REG(X0);
- dwarf_regs[1] = REG(X1);
- dwarf_regs[2] = REG(X2);
- dwarf_regs[3] = REG(X3);
- dwarf_regs[4] = REG(X4);
- dwarf_regs[5] = REG(X5);
- dwarf_regs[6] = REG(X6);
- dwarf_regs[7] = REG(X7);
- dwarf_regs[8] = REG(X8);
- dwarf_regs[9] = REG(X9);
- dwarf_regs[10] = REG(X10);
- dwarf_regs[11] = REG(X11);
- dwarf_regs[12] = REG(X12);
- dwarf_regs[13] = REG(X13);
- dwarf_regs[14] = REG(X14);
- dwarf_regs[15] = REG(X15);
- dwarf_regs[16] = REG(X16);
- dwarf_regs[17] = REG(X17);
- dwarf_regs[18] = REG(X18);
- dwarf_regs[19] = REG(X19);
- dwarf_regs[20] = REG(X20);
- dwarf_regs[21] = REG(X21);
- dwarf_regs[22] = REG(X22);
- dwarf_regs[23] = REG(X23);
- dwarf_regs[24] = REG(X24);
- dwarf_regs[25] = REG(X25);
- dwarf_regs[26] = REG(X26);
- dwarf_regs[27] = REG(X27);
- dwarf_regs[28] = REG(X28);
- dwarf_regs[29] = REG(X29);
- dwarf_regs[30] = REG(LR);
- dwarf_regs[31] = REG(SP);
-
- if (!dwfl_thread_state_registers(thread, 0, PERF_REG_ARM64_MAX,
- dwarf_regs))
- return false;
-
- dwarf_pc = REG(PC);
- dwfl_thread_state_register_pc(thread, dwarf_pc);
-
- return true;
-}
diff --git a/tools/perf/util/unwind-libdw.c b/tools/perf/util/unwind-libdw.c
index 055dab921442..8f291f9f9469 100644
--- a/tools/perf/util/unwind-libdw.c
+++ b/tools/perf/util/unwind-libdw.c
@@ -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;
diff --git a/tools/perf/util/unwind-libdw.h b/tools/perf/util/unwind-libdw.h
index 496e5898e7ef..fe3ae2a768ad 100644
--- a/tools/perf/util/unwind-libdw.h
+++ b/tools/perf/util/unwind-libdw.h
@@ -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);
--
2.52.0.457.g6b5491de43-goog
next prev parent reply other threads:[~2026-01-17 5:31 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-17 5:28 [PATCH v1 00/23] perf dwarf/libdw extra support, speed and clean ups Ian Rogers
2026-01-17 5:28 ` [PATCH v1 01/23] perf symbol-elf: Fix leak of ELF files with GNU debugdata Ian Rogers
2026-01-17 5:28 ` [PATCH v1 02/23] perf dso: Extra validity checks that e_machine is valid Ian Rogers
2026-01-17 5:28 ` [PATCH v1 03/23] perf record: Disable inline frames when marking build IDs Ian Rogers
2026-01-17 5:28 ` [PATCH v1 04/23] perf unwind-libdw: fix a cross-arch unwinding bug Ian Rogers
2026-01-20 16:02 ` Arnaldo Carvalho de Melo
2026-01-20 17:53 ` Ian Rogers
2026-01-17 5:28 ` [PATCH v1 05/23] perf libdw_addr2line: Fixes to srcline memory allocation Ian Rogers
2026-01-17 5:28 ` [PATCH v1 06/23] perf unwind-libdw: Correct argument to dwfl_attach_state Ian Rogers
2026-01-17 5:28 ` [PATCH v1 07/23] perf powerpc: Unify the skip-callchain-idx libdw with that for addr2line Ian Rogers
2026-01-17 5:28 ` [PATCH v1 08/23] perf perf_regs: Switch from arch string to int e_machine Ian Rogers
2026-01-20 18:49 ` Arnaldo Carvalho de Melo
2026-01-21 6:58 ` Mi, Dapeng
2026-01-21 7:10 ` Ian Rogers
2026-01-17 5:28 ` [PATCH v1 09/23] perf dwarf-regs: Add util/dwarf-regs-arch for consistency with perf-regs Ian Rogers
2026-01-17 5:28 ` [PATCH v1 10/23] perf dwarf-regs: Remove get_arch_regnum Ian Rogers
2026-01-17 5:28 ` [PATCH v1 11/23] perf dwarf-regs: Clean up x86 dwarf_regnum code Ian Rogers
2026-01-17 5:28 ` [PATCH v1 12/23] perf dwarf-regs: Add get_dwarf_regnum_for_perf_regnum and use for x86 unwinding Ian Rogers
2026-01-17 5:42 ` Ian Rogers
2026-01-17 5:28 ` [PATCH v1 13/23] perf dwarf-regs: Add basic get_dwarf_regnum for most architectures Ian Rogers
2026-01-17 5:28 ` Ian Rogers [this message]
2026-01-17 5:28 ` [PATCH v1 15/23] perf dwarf-regs: Add csky perf to dwarf register number mapping functions Ian Rogers
2026-01-17 5:28 ` [PATCH v1 16/23] perf dwarf-regs: Add loongarch " Ian Rogers
2026-01-17 5:28 ` [PATCH v1 17/23] perf dwarf-regs: Add powerpc " Ian Rogers
2026-01-17 5:28 ` [PATCH v1 18/23] perf dwarf-regs: Add RISC-V " Ian Rogers
2026-01-17 5:28 ` [PATCH v1 19/23] perf dwarf-regs: Add S390 " Ian Rogers
2026-01-17 5:28 ` [PATCH v1 20/23] perf dwarf-regs: Add MIPS " Ian Rogers
2026-01-17 5:28 ` [PATCH v1 21/23] perf build: Remove NO_LIBDW_DWARF_UNWIND option Ian Rogers
2026-01-17 5:28 ` [PATCH v1 22/23] perf unwind-libdw: Don't discard loaded ELF/Dwarf after every unwind Ian Rogers
2026-01-27 17:42 ` Serhei Makarov
2026-01-27 18:08 ` Ian Rogers
2026-01-17 5:28 ` [PATCH v1 23/23] perf machine: Add inline information to frame pointer and LBR callchains Ian Rogers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260117052849.2205545-15-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=aditya.b1@linux.ibm.com \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alex@ghiti.fr \
--cc=aou@eecs.berkeley.edu \
--cc=atrajeev@linux.ibm.com \
--cc=ctshao@google.com \
--cc=dvyukov@google.com \
--cc=guoren@kernel.org \
--cc=haibo1.xu@intel.com \
--cc=howardchu95@gmail.com \
--cc=james.clark@linaro.org \
--cc=john.g.garry@oracle.com \
--cc=jolsa@kernel.org \
--cc=krzysztof.m.lopatowski@gmail.com \
--cc=leo.yan@linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-csky@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux@treblig.org \
--cc=mark@klomp.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=palmer@dabbelt.com \
--cc=peterz@infradead.org \
--cc=pjw@kernel.org \
--cc=shimin.guo@skydio.com \
--cc=slyich@gmail.com \
--cc=stephen.s.brennan@oracle.com \
--cc=thomas.falcon@intel.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox