perf dwarf-regs: Add ARM perf to dwarf register number mapping functions

These functions allow the generic initial register state code in
unwind-libdw to be used.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Aditya Bodkhe <aditya.b1@linux.ibm.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.ibm.com>
Cc: Chun-Tse Shao <ctshao@google.com>
Cc: Dmitriy Vyukov <dvyukov@google.com>
Cc: Dr. David Alan Gilbert <linux@treblig.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Haibo Xu <haibo1.xu@intel.com>
Cc: Howard Chu <howardchu95@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Krzysztof Łopatowski <krzysztof.m.lopatowski@gmail.com>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Mark Wielaard <mark@klomp.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <pjw@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sergei Trofimovich <slyich@gmail.com>
Cc: Shimin Guo <shimin.guo@skydio.com>
Cc: Stephen Brennan <stephen.s.brennan@oracle.com>
Cc: Thomas Falcon <thomas.falcon@intel.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/dwarf-regs-arch/Build b/tools/perf/util/dwarf-regs-arch/Build
index 98bec0032606432f49c10f3c8c4a547fb931ff0b..3f19a9ec47c784306d78cab0a43640a231bc768b 100644 (file)
--- 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 (file)
index 0000000..42c6c06
--- /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 (file)
index 0000000..593ca7d
--- /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 dffa0c8bdd145f147b490332776f70a3d87bd0d4..c472ec5e4d1aa9f18a141a25ad2f475658f64b0f 100644 (file)
--- 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 a120c97a5fac8159fb9d85db396745837b42dddb..a52df8d1b138438b063d7c6b2a2691d05ab07a15 100644 (file)
--- 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 5b56820299531f2b743211b6eb20c9ca9c137bfb..79c3bbdc2dee9f3e4a2a3d4968dfd612043c2b82 100644 (file)
--- 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 (file)
index 56e9b59..0000000
--- 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 (file)
index 29b6833..0000000
--- 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 055dab921442c014c1a810615360aee2e54d60f2..8f291f9f9469b2c62a4bb87e6d023371fdba381d 100644 (file)
--- 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 496e5898e7efa429b5b7e43ce134438b10d8d1cb..fe3ae2a768ada9890287561a5af011f275c7fa29 100644 (file)
--- 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);