]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
perf unwind-libunwind: Make libunwind register reading cross platform
authorIan Rogers <irogers@google.com>
Wed, 13 May 2026 23:31:48 +0000 (16:31 -0700)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 15 May 2026 19:18:36 +0000 (16:18 -0300)
Move the libunwind register to perf register mapping functions in
arch/../util/unwind-libunwind.c into a new libunwind-arch
directory. Rename the functions to
__get_perf_regnum_for_unw_regnum_<arch>. Add untested ppc32 and s390
functions. Add a get_perf_regnum_for_unw_regnum function that takes an
ELF machine as well as a register number and chooses the appropriate
architecture implementation.

Split the x86 and powerpc 32 and 64-bit implementations apart so that
a single libunwind-<arch>.h header is included.

Move the e_machine into the unwind_info struct to make it easier to
pass.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Andrew Jones <andrew.jones@oss.qualcomm.com>
Cc: Athira Rajeev <atrajeev@linux.ibm.com>
Cc: Dapeng Mi <dapeng1.mi@linux.intel.com>
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: Florian Fainelli <florian.fainelli@broadcom.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: Leo Yan <leo.yan@linux.dev>
Cc: Li Guan <guanli.oerv@isrc.iscas.ac.cn>
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: Shimin Guo <shimin.guo@skydio.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Tomas Glozar <tglozar@redhat.com>
Cc: Will Deacon <will@kernel.org>
[ Map UNW_PPC32_NIP to PERF_REG_POWERPC_NIP like done for 64-bit, pointed out by a local sashiko ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
30 files changed:
tools/perf/arch/arm/util/Build
tools/perf/arch/arm/util/unwind-libunwind.c [deleted file]
tools/perf/arch/arm64/util/Build
tools/perf/arch/arm64/util/unwind-libunwind.c [deleted file]
tools/perf/arch/loongarch/util/Build
tools/perf/arch/loongarch/util/unwind-libunwind.c [deleted file]
tools/perf/arch/mips/Build [deleted file]
tools/perf/arch/mips/util/Build [deleted file]
tools/perf/arch/mips/util/unwind-libunwind.c [deleted file]
tools/perf/arch/powerpc/util/Build
tools/perf/arch/powerpc/util/unwind-libunwind.c [deleted file]
tools/perf/arch/x86/util/Build
tools/perf/arch/x86/util/unwind-libunwind.c [deleted file]
tools/perf/util/Build
tools/perf/util/libunwind-arch/Build [new file with mode: 0644]
tools/perf/util/libunwind-arch/libunwind-arch.c [new file with mode: 0644]
tools/perf/util/libunwind-arch/libunwind-arch.h [new file with mode: 0644]
tools/perf/util/libunwind-arch/libunwind-arm.c [new file with mode: 0644]
tools/perf/util/libunwind-arch/libunwind-arm64.c [new file with mode: 0644]
tools/perf/util/libunwind-arch/libunwind-i386.c [new file with mode: 0644]
tools/perf/util/libunwind-arch/libunwind-loongarch.c [new file with mode: 0644]
tools/perf/util/libunwind-arch/libunwind-mips.c [new file with mode: 0644]
tools/perf/util/libunwind-arch/libunwind-ppc32.c [new file with mode: 0644]
tools/perf/util/libunwind-arch/libunwind-ppc64.c [new file with mode: 0644]
tools/perf/util/libunwind-arch/libunwind-s390.c [new file with mode: 0644]
tools/perf/util/libunwind-arch/libunwind-x86_64.c [new file with mode: 0644]
tools/perf/util/libunwind/arm64.c
tools/perf/util/libunwind/x86_32.c
tools/perf/util/unwind-libunwind-local.c
tools/perf/util/unwind.h

index b94bf3c5279a13d6f808cb8e75b2bf79b9802176..768ae5d1655333da15e6d1b4f1ace0326282a1b5 100644 (file)
@@ -1,3 +1 @@
-perf-util-$(CONFIG_LOCAL_LIBUNWIND)    += unwind-libunwind.o
-
 perf-util-y += pmu.o auxtrace.o cs-etm.o
diff --git a/tools/perf/arch/arm/util/unwind-libunwind.c b/tools/perf/arch/arm/util/unwind-libunwind.c
deleted file mode 100644 (file)
index 438906b..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-#include <errno.h>
-#include <libunwind.h>
-#include "perf_regs.h"
-#include "../../../util/unwind.h"
-#include "../../../util/debug.h"
-
-int libunwind__arch_reg_id(int regnum)
-{
-       switch (regnum) {
-       case UNW_ARM_R0:
-               return PERF_REG_ARM_R0;
-       case UNW_ARM_R1:
-               return PERF_REG_ARM_R1;
-       case UNW_ARM_R2:
-               return PERF_REG_ARM_R2;
-       case UNW_ARM_R3:
-               return PERF_REG_ARM_R3;
-       case UNW_ARM_R4:
-               return PERF_REG_ARM_R4;
-       case UNW_ARM_R5:
-               return PERF_REG_ARM_R5;
-       case UNW_ARM_R6:
-               return PERF_REG_ARM_R6;
-       case UNW_ARM_R7:
-               return PERF_REG_ARM_R7;
-       case UNW_ARM_R8:
-               return PERF_REG_ARM_R8;
-       case UNW_ARM_R9:
-               return PERF_REG_ARM_R9;
-       case UNW_ARM_R10:
-               return PERF_REG_ARM_R10;
-       case UNW_ARM_R11:
-               return PERF_REG_ARM_FP;
-       case UNW_ARM_R12:
-               return PERF_REG_ARM_IP;
-       case UNW_ARM_R13:
-               return PERF_REG_ARM_SP;
-       case UNW_ARM_R14:
-               return PERF_REG_ARM_LR;
-       case UNW_ARM_R15:
-               return PERF_REG_ARM_PC;
-       default:
-               pr_err("unwind: invalid reg id %d\n", regnum);
-               return -EINVAL;
-       }
-
-       return -EINVAL;
-}
index 638aa6948ab51725a4d6492c9946f6d4e4d4e7f1..15b7340b70f7ca77bad58f9fbf30f07de6bea862 100644 (file)
@@ -1,4 +1,3 @@
-perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o
 perf-util-y += ../../arm/util/auxtrace.o
 perf-util-y += ../../arm/util/cs-etm.o
 perf-util-y += ../../arm/util/pmu.o
diff --git a/tools/perf/arch/arm64/util/unwind-libunwind.c b/tools/perf/arch/arm64/util/unwind-libunwind.c
deleted file mode 100644 (file)
index 871af59..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include <errno.h>
-
-#ifndef REMOTE_UNWIND_LIBUNWIND
-#include <libunwind.h>
-#include "perf_regs.h"
-#include "../../../util/unwind.h"
-#endif
-#include "../../../util/debug.h"
-
-int LIBUNWIND__ARCH_REG_ID(int regnum)
-{
-       if (regnum < 0 || regnum >= PERF_REG_ARM64_EXTENDED_MAX)
-               return -EINVAL;
-
-       return regnum;
-}
index 8d91e78d31c94e30f5b36a7734379147b5ed9f26..2328fb9a30a367b32d3560659b86b9bc1826ee5e 100644 (file)
@@ -1,3 +1 @@
 perf-util-y += header.o
-
-perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o
diff --git a/tools/perf/arch/loongarch/util/unwind-libunwind.c b/tools/perf/arch/loongarch/util/unwind-libunwind.c
deleted file mode 100644 (file)
index f693167..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-#include <errno.h>
-#include <libunwind.h>
-#include "perf_regs.h"
-#include "../../util/unwind.h"
-#include "util/debug.h"
-
-int libunwind__arch_reg_id(int regnum)
-{
-       switch (regnum) {
-       case UNW_LOONGARCH64_R1:
-               return PERF_REG_LOONGARCH_R1;
-       case UNW_LOONGARCH64_R2:
-               return PERF_REG_LOONGARCH_R2;
-       case UNW_LOONGARCH64_R3:
-               return PERF_REG_LOONGARCH_R3;
-       case UNW_LOONGARCH64_R4:
-               return PERF_REG_LOONGARCH_R4;
-       case UNW_LOONGARCH64_R5:
-               return PERF_REG_LOONGARCH_R5;
-       case UNW_LOONGARCH64_R6:
-               return PERF_REG_LOONGARCH_R6;
-       case UNW_LOONGARCH64_R7:
-               return PERF_REG_LOONGARCH_R7;
-       case UNW_LOONGARCH64_R8:
-               return PERF_REG_LOONGARCH_R8;
-       case UNW_LOONGARCH64_R9:
-               return PERF_REG_LOONGARCH_R9;
-       case UNW_LOONGARCH64_R10:
-               return PERF_REG_LOONGARCH_R10;
-       case UNW_LOONGARCH64_R11:
-               return PERF_REG_LOONGARCH_R11;
-       case UNW_LOONGARCH64_R12:
-               return PERF_REG_LOONGARCH_R12;
-       case UNW_LOONGARCH64_R13:
-               return PERF_REG_LOONGARCH_R13;
-       case UNW_LOONGARCH64_R14:
-               return PERF_REG_LOONGARCH_R14;
-       case UNW_LOONGARCH64_R15:
-               return PERF_REG_LOONGARCH_R15;
-       case UNW_LOONGARCH64_R16:
-               return PERF_REG_LOONGARCH_R16;
-       case UNW_LOONGARCH64_R17:
-               return PERF_REG_LOONGARCH_R17;
-       case UNW_LOONGARCH64_R18:
-               return PERF_REG_LOONGARCH_R18;
-       case UNW_LOONGARCH64_R19:
-               return PERF_REG_LOONGARCH_R19;
-       case UNW_LOONGARCH64_R20:
-               return PERF_REG_LOONGARCH_R20;
-       case UNW_LOONGARCH64_R21:
-               return PERF_REG_LOONGARCH_R21;
-       case UNW_LOONGARCH64_R22:
-               return PERF_REG_LOONGARCH_R22;
-       case UNW_LOONGARCH64_R23:
-               return PERF_REG_LOONGARCH_R23;
-       case UNW_LOONGARCH64_R24:
-               return PERF_REG_LOONGARCH_R24;
-       case UNW_LOONGARCH64_R25:
-               return PERF_REG_LOONGARCH_R25;
-       case UNW_LOONGARCH64_R26:
-               return PERF_REG_LOONGARCH_R26;
-       case UNW_LOONGARCH64_R27:
-               return PERF_REG_LOONGARCH_R27;
-       case UNW_LOONGARCH64_R28:
-               return PERF_REG_LOONGARCH_R28;
-       case UNW_LOONGARCH64_R29:
-               return PERF_REG_LOONGARCH_R29;
-       case UNW_LOONGARCH64_R30:
-               return PERF_REG_LOONGARCH_R30;
-       case UNW_LOONGARCH64_R31:
-               return PERF_REG_LOONGARCH_R31;
-       case UNW_LOONGARCH64_PC:
-               return PERF_REG_LOONGARCH_PC;
-       default:
-               pr_err("unwind: invalid reg id %d\n", regnum);
-               return -EINVAL;
-       }
-
-       return -EINVAL;
-}
diff --git a/tools/perf/arch/mips/Build b/tools/perf/arch/mips/Build
deleted file mode 100644 (file)
index e63eabc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-perf-util-y += util/
diff --git a/tools/perf/arch/mips/util/Build b/tools/perf/arch/mips/util/Build
deleted file mode 100644 (file)
index 818b808..0000000
+++ /dev/null
@@ -1 +0,0 @@
-perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o
diff --git a/tools/perf/arch/mips/util/unwind-libunwind.c b/tools/perf/arch/mips/util/unwind-libunwind.c
deleted file mode 100644 (file)
index 0d8c99c..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-#include <errno.h>
-#include <libunwind.h>
-#include "perf_regs.h"
-#include "../../util/unwind.h"
-#include "util/debug.h"
-
-int libunwind__arch_reg_id(int regnum)
-{
-       switch (regnum) {
-       case UNW_MIPS_R1 ... UNW_MIPS_R25:
-               return regnum - UNW_MIPS_R1 + PERF_REG_MIPS_R1;
-       case UNW_MIPS_R28 ... UNW_MIPS_R31:
-               return regnum - UNW_MIPS_R28 + PERF_REG_MIPS_R28;
-       case UNW_MIPS_PC:
-               return PERF_REG_MIPS_PC;
-       default:
-               pr_err("unwind: invalid reg id %d\n", regnum);
-               return -EINVAL;
-       }
-}
index d66574cbb9a9514f1624715b78f413e86b759a86..ae928050e07a519d054b1a2ad4077dd7ffab6b0d 100644 (file)
@@ -6,5 +6,4 @@ perf-util-y += evsel.o
 
 perf-util-$(CONFIG_LIBDW) += skip-callchain-idx.o
 
-perf-util-$(CONFIG_LIBUNWIND) += unwind-libunwind.o
 perf-util-y += auxtrace.o
diff --git a/tools/perf/arch/powerpc/util/unwind-libunwind.c b/tools/perf/arch/powerpc/util/unwind-libunwind.c
deleted file mode 100644 (file)
index 90a6bed..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright 2016 Chandan Kumar, IBM Corporation.
- */
-
-#include <errno.h>
-#include <libunwind.h>
-#include <asm/perf_regs.h>
-#include "../../util/unwind.h"
-#include "../../util/debug.h"
-
-int libunwind__arch_reg_id(int regnum)
-{
-       switch (regnum) {
-       case UNW_PPC64_R0:
-               return PERF_REG_POWERPC_R0;
-       case UNW_PPC64_R1:
-               return PERF_REG_POWERPC_R1;
-       case UNW_PPC64_R2:
-               return PERF_REG_POWERPC_R2;
-       case UNW_PPC64_R3:
-               return PERF_REG_POWERPC_R3;
-       case UNW_PPC64_R4:
-               return PERF_REG_POWERPC_R4;
-       case UNW_PPC64_R5:
-               return PERF_REG_POWERPC_R5;
-       case UNW_PPC64_R6:
-               return PERF_REG_POWERPC_R6;
-       case UNW_PPC64_R7:
-               return PERF_REG_POWERPC_R7;
-       case UNW_PPC64_R8:
-               return PERF_REG_POWERPC_R8;
-       case UNW_PPC64_R9:
-               return PERF_REG_POWERPC_R9;
-       case UNW_PPC64_R10:
-               return PERF_REG_POWERPC_R10;
-       case UNW_PPC64_R11:
-               return PERF_REG_POWERPC_R11;
-       case UNW_PPC64_R12:
-               return PERF_REG_POWERPC_R12;
-       case UNW_PPC64_R13:
-               return PERF_REG_POWERPC_R13;
-       case UNW_PPC64_R14:
-               return PERF_REG_POWERPC_R14;
-       case UNW_PPC64_R15:
-               return PERF_REG_POWERPC_R15;
-       case UNW_PPC64_R16:
-               return PERF_REG_POWERPC_R16;
-       case UNW_PPC64_R17:
-               return PERF_REG_POWERPC_R17;
-       case UNW_PPC64_R18:
-               return PERF_REG_POWERPC_R18;
-       case UNW_PPC64_R19:
-               return PERF_REG_POWERPC_R19;
-       case UNW_PPC64_R20:
-               return PERF_REG_POWERPC_R20;
-       case UNW_PPC64_R21:
-               return PERF_REG_POWERPC_R21;
-       case UNW_PPC64_R22:
-               return PERF_REG_POWERPC_R22;
-       case UNW_PPC64_R23:
-               return PERF_REG_POWERPC_R23;
-       case UNW_PPC64_R24:
-               return PERF_REG_POWERPC_R24;
-       case UNW_PPC64_R25:
-               return PERF_REG_POWERPC_R25;
-       case UNW_PPC64_R26:
-               return PERF_REG_POWERPC_R26;
-       case UNW_PPC64_R27:
-               return PERF_REG_POWERPC_R27;
-       case UNW_PPC64_R28:
-               return PERF_REG_POWERPC_R28;
-       case UNW_PPC64_R29:
-               return PERF_REG_POWERPC_R29;
-       case UNW_PPC64_R30:
-               return PERF_REG_POWERPC_R30;
-       case UNW_PPC64_R31:
-               return PERF_REG_POWERPC_R31;
-       case UNW_PPC64_LR:
-               return PERF_REG_POWERPC_LINK;
-       case UNW_PPC64_CTR:
-               return PERF_REG_POWERPC_CTR;
-       case UNW_PPC64_XER:
-               return PERF_REG_POWERPC_XER;
-       case UNW_PPC64_NIP:
-               return PERF_REG_POWERPC_NIP;
-       default:
-               pr_err("unwind: invalid reg id %d\n", regnum);
-               return -EINVAL;
-       }
-       return -EINVAL;
-}
index b94c91984c664a937ca604e3d606e7889f318a3c..7f89fffe461586a3e591f760c43bf466d61791d3 100644 (file)
@@ -8,9 +8,6 @@ perf-util-y += evlist.o
 perf-util-y += mem-events.o
 perf-util-y += evsel.o
 perf-util-y += iostat.o
-
-perf-util-$(CONFIG_LOCAL_LIBUNWIND)    += unwind-libunwind.o
-
 perf-util-y += auxtrace.o
 perf-util-y += intel-pt.o
 perf-util-y += intel-bts.o
diff --git a/tools/perf/arch/x86/util/unwind-libunwind.c b/tools/perf/arch/x86/util/unwind-libunwind.c
deleted file mode 100644 (file)
index 4735797..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-#include <errno.h>
-#include "../../util/debug.h"
-#ifndef REMOTE_UNWIND_LIBUNWIND
-#include <libunwind.h>
-#include "perf_regs.h"
-#include "../../util/unwind.h"
-#endif
-
-#ifdef HAVE_ARCH_X86_64_SUPPORT
-int LIBUNWIND__ARCH_REG_ID(int regnum)
-{
-       int id;
-
-       switch (regnum) {
-       case UNW_X86_64_RAX:
-               id = PERF_REG_X86_AX;
-               break;
-       case UNW_X86_64_RDX:
-               id = PERF_REG_X86_DX;
-               break;
-       case UNW_X86_64_RCX:
-               id = PERF_REG_X86_CX;
-               break;
-       case UNW_X86_64_RBX:
-               id = PERF_REG_X86_BX;
-               break;
-       case UNW_X86_64_RSI:
-               id = PERF_REG_X86_SI;
-               break;
-       case UNW_X86_64_RDI:
-               id = PERF_REG_X86_DI;
-               break;
-       case UNW_X86_64_RBP:
-               id = PERF_REG_X86_BP;
-               break;
-       case UNW_X86_64_RSP:
-               id = PERF_REG_X86_SP;
-               break;
-       case UNW_X86_64_R8:
-               id = PERF_REG_X86_R8;
-               break;
-       case UNW_X86_64_R9:
-               id = PERF_REG_X86_R9;
-               break;
-       case UNW_X86_64_R10:
-               id = PERF_REG_X86_R10;
-               break;
-       case UNW_X86_64_R11:
-               id = PERF_REG_X86_R11;
-               break;
-       case UNW_X86_64_R12:
-               id = PERF_REG_X86_R12;
-               break;
-       case UNW_X86_64_R13:
-               id = PERF_REG_X86_R13;
-               break;
-       case UNW_X86_64_R14:
-               id = PERF_REG_X86_R14;
-               break;
-       case UNW_X86_64_R15:
-               id = PERF_REG_X86_R15;
-               break;
-       case UNW_X86_64_RIP:
-               id = PERF_REG_X86_IP;
-               break;
-       default:
-               pr_err("unwind: invalid reg id %d\n", regnum);
-               return -EINVAL;
-       }
-
-       return id;
-}
-#else
-int LIBUNWIND__ARCH_REG_ID(int regnum)
-{
-       int id;
-
-       switch (regnum) {
-       case UNW_X86_EAX:
-               id = PERF_REG_X86_AX;
-               break;
-       case UNW_X86_EDX:
-               id = PERF_REG_X86_DX;
-               break;
-       case UNW_X86_ECX:
-               id = PERF_REG_X86_CX;
-               break;
-       case UNW_X86_EBX:
-               id = PERF_REG_X86_BX;
-               break;
-       case UNW_X86_ESI:
-               id = PERF_REG_X86_SI;
-               break;
-       case UNW_X86_EDI:
-               id = PERF_REG_X86_DI;
-               break;
-       case UNW_X86_EBP:
-               id = PERF_REG_X86_BP;
-               break;
-       case UNW_X86_ESP:
-               id = PERF_REG_X86_SP;
-               break;
-       case UNW_X86_EIP:
-               id = PERF_REG_X86_IP;
-               break;
-       default:
-               pr_err("unwind: invalid reg id %d\n", regnum);
-               return -EINVAL;
-       }
-
-       return id;
-}
-#endif /* HAVE_ARCH_X86_64_SUPPORT */
index 01edfccebb88e060b878eb8c9e037887889faf16..bf4204135ccb46883c39e77921bd23b1bb5649f0 100644 (file)
@@ -228,6 +228,7 @@ perf-util-$(CONFIG_LIBDW) += unwind-libdw.o
 
 perf-util-$(CONFIG_LOCAL_LIBUNWIND)    += unwind-libunwind-local.o
 perf-util-$(CONFIG_LIBUNWIND)          += unwind-libunwind.o
+perf-util-$(CONFIG_LIBUNWIND)          += libunwind-arch/
 perf-util-$(CONFIG_LIBUNWIND_X86)      += libunwind/x86_32.o
 perf-util-$(CONFIG_LIBUNWIND_AARCH64)  += libunwind/arm64.o
 
diff --git a/tools/perf/util/libunwind-arch/Build b/tools/perf/util/libunwind-arch/Build
new file mode 100644 (file)
index 0000000..87fd657
--- /dev/null
@@ -0,0 +1,10 @@
+perf-util-$(CONFIG_LIBUNWIND) += libunwind-arch.o
+perf-util-$(CONFIG_LIBUNWIND) += libunwind-arm64.o
+perf-util-$(CONFIG_LIBUNWIND) += libunwind-arm.o
+perf-util-$(CONFIG_LIBUNWIND) += libunwind-loongarch.o
+perf-util-$(CONFIG_LIBUNWIND) += libunwind-mips.o
+perf-util-$(CONFIG_LIBUNWIND) += libunwind-ppc32.o
+perf-util-$(CONFIG_LIBUNWIND) += libunwind-ppc64.o
+perf-util-$(CONFIG_LIBUNWIND) += libunwind-s390.o
+perf-util-$(CONFIG_LIBUNWIND) += libunwind-i386.o
+perf-util-$(CONFIG_LIBUNWIND) += libunwind-x86_64.o
diff --git a/tools/perf/util/libunwind-arch/libunwind-arch.c b/tools/perf/util/libunwind-arch/libunwind-arch.c
new file mode 100644 (file)
index 0000000..5439bf9
--- /dev/null
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "libunwind-arch.h"
+#include "../debug.h"
+#include <elf.h>
+#include <errno.h>
+
+int get_perf_regnum_for_unw_regnum(unsigned int e_machine, int unw_regnum)
+{
+       switch (e_machine) {
+       case EM_ARM:
+               return __get_perf_regnum_for_unw_regnum_arm(unw_regnum);
+       case EM_AARCH64:
+               return __get_perf_regnum_for_unw_regnum_arm64(unw_regnum);
+       case EM_LOONGARCH:
+               return __get_perf_regnum_for_unw_regnum_loongarch(unw_regnum);
+       case EM_MIPS:
+               return __get_perf_regnum_for_unw_regnum_mips(unw_regnum);
+       case EM_PPC:
+               return __get_perf_regnum_for_unw_regnum_ppc32(unw_regnum);
+       case EM_PPC64:
+               return __get_perf_regnum_for_unw_regnum_ppc64(unw_regnum);
+       case EM_S390:
+               return __get_perf_regnum_for_unw_regnum_s390(unw_regnum);
+       case EM_386:
+               return __get_perf_regnum_for_unw_regnum_i386(unw_regnum);
+       case EM_X86_64:
+               return __get_perf_regnum_for_unw_regnum_x86_64(unw_regnum);
+       default:
+               pr_err("ELF MACHINE %x is not supported.\n", e_machine);
+               return -EINVAL;
+       }
+}
diff --git a/tools/perf/util/libunwind-arch/libunwind-arch.h b/tools/perf/util/libunwind-arch/libunwind-arch.h
new file mode 100644 (file)
index 0000000..e1009c6
--- /dev/null
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __LIBUNWIND_ARCH_H
+#define __LIBUNWIND_ARCH_H
+
+int __get_perf_regnum_for_unw_regnum_arm(int unw_regnum);
+int __get_perf_regnum_for_unw_regnum_arm64(int unw_regnum);
+int __get_perf_regnum_for_unw_regnum_loongarch(int unw_regnum);
+int __get_perf_regnum_for_unw_regnum_mips(int unw_regnum);
+int __get_perf_regnum_for_unw_regnum_ppc32(int unw_regnum);
+int __get_perf_regnum_for_unw_regnum_ppc64(int unw_regnum);
+int __get_perf_regnum_for_unw_regnum_s390(int unw_regnum);
+int __get_perf_regnum_for_unw_regnum_i386(int unw_regnum);
+int __get_perf_regnum_for_unw_regnum_x86_64(int unw_regnum);
+int get_perf_regnum_for_unw_regnum(unsigned int e_machine, int unw_regnum);
+
+#endif /* __LIBUNWIND_ARCH_H */
diff --git a/tools/perf/util/libunwind-arch/libunwind-arm.c b/tools/perf/util/libunwind-arch/libunwind-arm.c
new file mode 100644 (file)
index 0000000..6740ee5
--- /dev/null
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "libunwind-arch.h"
+#include "../debug.h"
+#include "../../../arch/arm/include/uapi/asm/perf_regs.h"
+#include <linux/compiler.h>
+#include <errno.h>
+
+int __get_perf_regnum_for_unw_regnum_arm(int unw_regnum)
+{
+       if (unw_regnum < 0 || unw_regnum >= PERF_REG_ARM_MAX) {
+               pr_err("unwind: invalid reg id %d\n", unw_regnum);
+               return -EINVAL;
+       }
+       return unw_regnum;
+}
diff --git a/tools/perf/util/libunwind-arch/libunwind-arm64.c b/tools/perf/util/libunwind-arch/libunwind-arm64.c
new file mode 100644 (file)
index 0000000..53b1877
--- /dev/null
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "libunwind-arch.h"
+#include "../debug.h"
+#include "../../../arch/arm64/include/uapi/asm/perf_regs.h"
+#include <errno.h>
+
+int __get_perf_regnum_for_unw_regnum_arm64(int unw_regnum)
+{
+       if (unw_regnum < 0 || unw_regnum >= PERF_REG_ARM64_EXTENDED_MAX) {
+               pr_err("unwind: invalid reg id %d\n", unw_regnum);
+               return -EINVAL;
+       }
+       return unw_regnum;
+}
diff --git a/tools/perf/util/libunwind-arch/libunwind-i386.c b/tools/perf/util/libunwind-arch/libunwind-i386.c
new file mode 100644 (file)
index 0000000..a41f7c3
--- /dev/null
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "libunwind-arch.h"
+#include "../debug.h"
+#include "../../../arch/x86/include/uapi/asm/perf_regs.h"
+#include <linux/compiler.h>
+#include <linux/kernel.h>
+#include <errno.h>
+
+#ifdef HAVE_LIBUNWIND_X86_SUPPORT
+#include <libunwind-x86.h>
+#endif
+
+int __get_perf_regnum_for_unw_regnum_i386(int unw_regnum __maybe_unused)
+{
+#ifndef HAVE_LIBUNWIND_X86_SUPPORT
+       return -EINVAL;
+#else
+       static const int perf_i386_regnums[] = {
+#define REGNUM(reg) [UNW_X86_E ## reg] = PERF_REG_X86_ ## reg
+               REGNUM(AX),
+               REGNUM(DX),
+               REGNUM(CX),
+               REGNUM(BX),
+               REGNUM(SI),
+               REGNUM(DI),
+               REGNUM(BP),
+               REGNUM(SP),
+               REGNUM(IP),
+#undef REGNUM
+       };
+
+       if (unw_regnum == UNW_X86_EAX)
+               return PERF_REG_X86_AX;
+
+       if (unw_regnum <  0 || unw_regnum >= (int)ARRAY_SIZE(perf_i386_regnums) ||
+           perf_i386_regnums[unw_regnum] == 0) {
+               pr_err("unwind: invalid reg id %d\n", unw_regnum);
+               return -EINVAL;
+       }
+
+       return perf_i386_regnums[unw_regnum];
+#endif // HAVE_LIBUNWIND_X86_SUPPORT
+}
diff --git a/tools/perf/util/libunwind-arch/libunwind-loongarch.c b/tools/perf/util/libunwind-arch/libunwind-loongarch.c
new file mode 100644 (file)
index 0000000..0431757
--- /dev/null
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "libunwind-arch.h"
+#include "../debug.h"
+#include "../../../arch/loongarch/include/uapi/asm/perf_regs.h"
+#include <linux/compiler.h>
+#include <errno.h>
+
+#ifdef HAVE_LIBUNWIND_LOONGARCH64_SUPPORT
+#include <libunwind-loongarch64.h>
+#endif
+
+int __get_perf_regnum_for_unw_regnum_loongarch(int unw_regnum __maybe_unused)
+{
+#ifndef HAVE_LIBUNWIND_LOONGARCH64_SUPPORT
+       return -EINVAL;
+#else
+       switch (unw_regnum) {
+       case UNW_LOONGARCH64_R1 ... UNW_LOONGARCH64_R31:
+               return unw_regnum - UNW_LOONGARCH64_R1 + PERF_REG_LOONGARCH_R1;
+       case UNW_LOONGARCH64_PC:
+               return PERF_REG_LOONGARCH_PC;
+       default:
+               pr_err("unwind: invalid reg id %d\n", unw_regnum);
+               return -EINVAL;
+       }
+#endif // HAVE_LIBUNWIND_LOONGARCH64_SUPPORT
+}
diff --git a/tools/perf/util/libunwind-arch/libunwind-mips.c b/tools/perf/util/libunwind-arch/libunwind-mips.c
new file mode 100644 (file)
index 0000000..01a506c
--- /dev/null
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "libunwind-arch.h"
+#include "../debug.h"
+#include "../../../arch/mips/include/uapi/asm/perf_regs.h"
+#include <linux/compiler.h>
+#include <errno.h>
+
+#ifdef HAVE_LIBUNWIND_MIPS_SUPPORT
+#include <libunwind-mips.h>
+#endif
+
+int __get_perf_regnum_for_unw_regnum_mips(int unw_regnum __maybe_unused)
+{
+#ifndef HAVE_LIBUNWIND_MIPS_SUPPORT
+       return -EINVAL;
+#else
+       switch (unw_regnum) {
+       case UNW_MIPS_R1 ... UNW_MIPS_R25:
+               return unw_regnum - UNW_MIPS_R1 + PERF_REG_MIPS_R1;
+       case UNW_MIPS_R28 ... UNW_MIPS_R31:
+               return unw_regnum - UNW_MIPS_R28 + PERF_REG_MIPS_R28;
+       case UNW_MIPS_PC:
+               return PERF_REG_MIPS_PC;
+       default:
+               pr_err("unwind: invalid reg id %d\n", unw_regnum);
+               return -EINVAL;
+       }
+#endif // HAVE_LIBUNWIND_MIPS_SUPPORT
+}
diff --git a/tools/perf/util/libunwind-arch/libunwind-ppc32.c b/tools/perf/util/libunwind-arch/libunwind-ppc32.c
new file mode 100644 (file)
index 0000000..976a160
--- /dev/null
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "libunwind-arch.h"
+#include "../debug.h"
+#include "../../../arch/powerpc/include/uapi/asm/perf_regs.h"
+#include <linux/compiler.h>
+#include <errno.h>
+
+#ifdef HAVE_LIBUNWIND_PPC32_SUPPORT
+#include <libunwind-ppc32.h>
+#endif
+
+int __get_perf_regnum_for_unw_regnum_ppc32(int unw_regnum __maybe_unused)
+{
+#ifndef HAVE_LIBUNWIND_PPC32_SUPPORT
+       return -EINVAL;
+#else
+       switch (unw_regnum) {
+       case UNW_PPC32_R0 ... UNW_PPC32_R31:
+               return unw_regnum - UNW_PPC32_R0 + PERF_REG_POWERPC_R0;
+       case UNW_PPC32_LR:
+               return PERF_REG_POWERPC_LINK;
+       case UNW_PPC32_CTR:
+               return PERF_REG_POWERPC_CTR;
+       case UNW_PPC32_XER:
+               return PERF_REG_POWERPC_XER;
+       case UNW_PPC32_NIP:
+               return PERF_REG_POWERPC_NIP;
+       default:
+               pr_err("unwind: invalid reg id %d\n", unw_regnum);
+               return -EINVAL;
+       }
+#endif // HAVE_LIBUNWIND_PPC32_SUPPORT
+}
diff --git a/tools/perf/util/libunwind-arch/libunwind-ppc64.c b/tools/perf/util/libunwind-arch/libunwind-ppc64.c
new file mode 100644 (file)
index 0000000..c508dc8
--- /dev/null
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "libunwind-arch.h"
+#include "../debug.h"
+#include "../../../arch/powerpc/include/uapi/asm/perf_regs.h"
+#include <linux/compiler.h>
+#include <errno.h>
+
+#ifdef HAVE_LIBUNWIND_PPC64_SUPPORT
+#include <libunwind-ppc64.h>
+#endif
+
+int __get_perf_regnum_for_unw_regnum_ppc64(int unw_regnum __maybe_unused)
+{
+#ifndef HAVE_LIBUNWIND_PPC64_SUPPORT
+       return -EINVAL;
+#else
+       switch (unw_regnum) {
+       case UNW_PPC64_R0 ... UNW_PPC64_R31:
+               return unw_regnum - UNW_PPC64_R0 + PERF_REG_POWERPC_R0;
+       case UNW_PPC64_LR:
+               return PERF_REG_POWERPC_LINK;
+       case UNW_PPC64_CTR:
+               return PERF_REG_POWERPC_CTR;
+       case UNW_PPC64_XER:
+               return PERF_REG_POWERPC_XER;
+       case UNW_PPC64_NIP:
+               return PERF_REG_POWERPC_NIP;
+       default:
+               pr_err("unwind: invalid reg id %d\n", unw_regnum);
+               return -EINVAL;
+       }
+#endif // HAVE_LIBUNWIND_PPC64_SUPPORT
+}
diff --git a/tools/perf/util/libunwind-arch/libunwind-s390.c b/tools/perf/util/libunwind-arch/libunwind-s390.c
new file mode 100644 (file)
index 0000000..7088991
--- /dev/null
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "libunwind-arch.h"
+#include "../debug.h"
+#include "../../../arch/s390/include/uapi/asm/perf_regs.h"
+#include <linux/compiler.h>
+#include <errno.h>
+
+#ifdef HAVE_LIBUNWIND_S390X_SUPPORT
+#include <libunwind-s390x.h>
+#endif
+
+int __get_perf_regnum_for_unw_regnum_s390(int unw_regnum __maybe_unused)
+{
+#ifndef HAVE_LIBUNWIND_S390X_SUPPORT
+       return -EINVAL;
+#else
+       switch (unw_regnum) {
+       case UNW_S390X_R0 ... UNW_S390X_R15:
+               return unw_regnum - UNW_S390X_R0 + PERF_REG_S390_R0;
+       case UNW_S390X_F0 ... UNW_S390X_F15:
+               return unw_regnum - UNW_S390X_F0 + PERF_REG_S390_FP0;
+       case UNW_S390X_IP:
+               return PERF_REG_S390_PC;
+       default:
+               pr_err("unwind: invalid reg id %d\n", unw_regnum);
+               return -EINVAL;
+       }
+#endif // HAVE_LIBUNWIND_S390X_SUPPORT
+}
diff --git a/tools/perf/util/libunwind-arch/libunwind-x86_64.c b/tools/perf/util/libunwind-arch/libunwind-x86_64.c
new file mode 100644 (file)
index 0000000..82dfb2c
--- /dev/null
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "libunwind-arch.h"
+#include "../debug.h"
+#include "../../../arch/x86/include/uapi/asm/perf_regs.h"
+#include <linux/compiler.h>
+#include <linux/kernel.h>
+#include <errno.h>
+
+#ifdef HAVE_LIBUNWIND_X86_64_SUPPORT
+#include <libunwind-x86_64.h>
+#endif
+
+int __get_perf_regnum_for_unw_regnum_x86_64(int unw_regnum __maybe_unused)
+{
+#ifndef HAVE_LIBUNWIND_X86_64_SUPPORT
+       return -EINVAL;
+#else
+       static const int perf_x86_64_regnums[] = {
+#define REGNUM(reg) [UNW_X86_64_R ## reg] = PERF_REG_X86_ ## reg
+               REGNUM(AX),
+               REGNUM(DX),
+               REGNUM(CX),
+               REGNUM(BX),
+               REGNUM(SI),
+               REGNUM(DI),
+               REGNUM(BP),
+               REGNUM(SP),
+               REGNUM(IP),
+#undef REGNUM
+#define REGNUM(reg) [UNW_X86_64_ ## reg] = PERF_REG_X86_ ## reg
+               REGNUM(R8),
+               REGNUM(R9),
+               REGNUM(R10),
+               REGNUM(R11),
+               REGNUM(R12),
+               REGNUM(R13),
+               REGNUM(R14),
+               REGNUM(R15),
+#undef REGNUM
+       };
+
+       if (unw_regnum == UNW_X86_64_RAX)
+               return PERF_REG_X86_AX;
+
+       if (unw_regnum <  0 || unw_regnum >= (int)ARRAY_SIZE(perf_x86_64_regnums) ||
+            perf_x86_64_regnums[unw_regnum] == 0) {
+               pr_err("unwind: invalid reg id %d\n", unw_regnum);
+               return -EINVAL;
+       }
+       return perf_x86_64_regnums[unw_regnum];
+#endif // HAVE_LIBUNWIND_X86_64_SUPPORT
+}
index 37ecef0c53b962b35083e91bb4bf606385bd37ae..15670a9644956a710359b5beb5ea88f54451687e 100644 (file)
 
 #define REMOTE_UNWIND_LIBUNWIND
 
-/* Define arch specific functions & regs for libunwind, should be
- * defined before including "unwind.h"
- */
-#define LIBUNWIND__ARCH_REG_ID(regnum) libunwind__arm64_reg_id(regnum)
-
 #include "unwind.h"
 #include "libunwind-aarch64.h"
 #define perf_event_arm_regs perf_event_arm64_regs
index 1697dece1b74316c7e95305a3fd12f0f3655cb71..1e9fb8bfec447ab9d91556a4707ec2f31fc55e46 100644 (file)
 
 #define REMOTE_UNWIND_LIBUNWIND
 
-/* Define arch specific functions & regs for libunwind, should be
- * defined before including "unwind.h"
- */
-#define LIBUNWIND__ARCH_REG_ID(regnum) libunwind__x86_reg_id(regnum)
-
 #include "unwind.h"
 #include "libunwind-x86.h"
-#include <../../../../arch/x86/include/uapi/asm/perf_regs.h>
-
-/* HAVE_ARCH_X86_64_SUPPORT is used in'arch/x86/util/unwind-libunwind.c'
- * for x86_32, we undef it to compile code for x86_32 only.
- */
-#undef HAVE_ARCH_X86_64_SUPPORT
-#include "../../arch/x86/util/unwind-libunwind.c"
 
 /* Explicitly define NO_LIBUNWIND_DEBUG_FRAME, because non-ARM has no
  * dwarf_find_debug_frame() function.
index 27e2f7b317895469cc292c3ddf7376e4282eb718..adc6e82b5f27b7978b1c3a918414ba5cc0059142 100644 (file)
@@ -39,6 +39,7 @@
 #include "debug.h"
 #include "asm/bug.h"
 #include "dso.h"
+#include "libunwind-arch/libunwind-arch.h"
 
 extern int
 UNW_OBJ(dwarf_search_unwind_table) (unw_addr_space_t as,
@@ -95,6 +96,7 @@ struct unwind_info {
        struct perf_sample      *sample;
        struct machine          *machine;
        struct thread           *thread;
+       uint16_t                 e_machine;
        bool                     best_effort;
 };
 
@@ -583,9 +585,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(thread__e_machine(ui->thread,
-                                                               ui->machine,
-                                                               /*e_flags=*/NULL)));
+                            perf_arch_reg_sp(ui->e_machine));
        if (ret)
                return ret;
 
@@ -633,7 +633,7 @@ static int access_reg(unw_addr_space_t __maybe_unused as,
                return 0;
        }
 
-       id = LIBUNWIND__ARCH_REG_ID(regnum);
+       id = get_perf_regnum_for_unw_regnum(ui->e_machine, regnum);
        if (id < 0)
                return -EINVAL;
 
@@ -734,7 +734,6 @@ 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)
 {
-       uint16_t e_machine = thread__e_machine(ui->thread, ui->machine, /*e_flags=*/NULL);
        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(e_machine));
+                            perf_arch_reg_ip(ui->e_machine));
        if (ret)
                return 0;
 
@@ -820,6 +819,7 @@ static int _unwind__get_entries(unwind_entry_cb_t cb, void *arg,
                .sample       = data,
                .thread       = thread,
                .machine      = maps__machine(thread__maps(thread)),
+               .e_machine    = thread__e_machine(thread, /*machine=*/NULL, /*e_flags=*/NULL),
                .best_effort  = best_effort
        };
 
index 69ba08afda792d17f352314a736a6f0c326d2b6e..ce256b00b6d2a9f8b1864e9191aa33e3da6f41df 100644 (file)
@@ -64,11 +64,6 @@ int libunwind__get_entries(unwind_entry_cb_t cb, void *arg,
                           struct thread *thread,
                           struct perf_sample *data, int max_stack,
                           bool best_effort);
-#ifndef LIBUNWIND__ARCH_REG_ID
-#define LIBUNWIND__ARCH_REG_ID(regnum) libunwind__arch_reg_id(regnum)
-#endif
-
-int LIBUNWIND__ARCH_REG_ID(int regnum);
 int unwind__prepare_access(struct maps *maps, struct map *map, bool *initialized);
 void unwind__flush_access(struct maps *maps);
 void unwind__finish_access(struct maps *maps);