From nobody Mon Feb 9 02:55:18 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B657C13D891; Wed, 24 Dec 2025 02:19:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766542790; cv=none; b=BRTfrfBhlj4aE/f4Q7jJZoT99dqGxVndn1bxI+TyUHkQ58MayzyB/7Tuwv1KR2IZG1QfoOHR1xKF8lBTXf+1KzA/2blzhZUOcVrXayIDovIVeW6EQpSZzngN+9fhqU+qBJxu8r3eACqp9UnxvbwC81E4KcVifv/VWvlgPkzr0Kk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766542790; c=relaxed/simple; bh=jFjY83/tq6vO4+ip+94yK8xiJZpXbCXttEYX8/RAqLM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=uVnpmE2cYUFZFYxfW+UPAypgiJk5c+VH3XXkuZQyX5mmMoGrNEtCLnoyGCHXRCi4HA5RI+NHGJtTGX7FEkZotbuc6Yn0uIcjh6gZ9IXEIOvqFch6O9FMIgb1hU/0q93EMqduRy5L8vlfW2M3CIGycN0z7cQ6TuG8lXOQtY6P32c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Agvazgmd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Agvazgmd" Received: by smtp.kernel.org (Postfix) with ESMTPS id 3FC31C113D0; Wed, 24 Dec 2025 02:19:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1766542789; bh=jFjY83/tq6vO4+ip+94yK8xiJZpXbCXttEYX8/RAqLM=; h=From:Date:Subject:To:Cc:Reply-To:From; b=AgvazgmdrmAxLc8vZbTwceZAiRLDAL2iQ23Y8cbC8FcbpQL8Z2npAZteI0JB+RhMa J8WX6i2D4yh9m+cijnv1poPlwfMtvKnoSZXX/UzzjW59K8xSaSzPnFgUyBGeiAS2Fu zgh8by5xioBumPiRgc3J2t0edFFnzV9b9kV93Wym5ha195Kp2LHAwPUu41BspGhBIF qqiYIkATGpNtsjge5HpgtceaCMTWqBNI7nyJ9aUwUg0xT/YZT8sjXvN59fP8xhm6XP y01twwDWR+SaWq416hPFBdmn5QgZ6L1U4unayL5ClRUbNwODAoWoj/xKTN7MofbD0l /HP751m0UkVjA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28E77E6B279; Wed, 24 Dec 2025 02:19:49 +0000 (UTC) From: Shimin Guo via B4 Relay Date: Tue, 23 Dec 2025 18:19:20 -0800 Subject: [PATCH] perf unwind-libdw: fix a cross-arch unwinding bug Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251223-cross-arch-unwind-v1-1-4d71ee7db512@skydio.com> X-B4-Tracking: v=1; b=H4sIAKdNS2kC/x3MPQqAMAxA4atIZgO1UlGvIg6lTTVLlQR/QLy7x fEb3ntASZgUxuoBoZOVt1zQ1BWE1eeFkGMxWGNdY22LQTZV9BJWPPLFOWLsBxM771IyHkq3CyW +/+c0v+8H4U6nRmMAAAA= X-Change-ID: 20251223-cross-arch-unwind-d890d6a5ff0a To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, Shimin Guo X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1766542788; l=19257; i=shimin.guo@skydio.com; s=20251223; h=from:subject:message-id; bh=40l5ccksJqGw/oklYl5GdK5u9+8khusrwGKRvaYo8Io=; b=H0qgSn3q7iB5y/m+k86ynjJ8+Q2MTyPUnmcUHlF1csDTtiEy2F3JSv4yUl49aAX0mHAw2j7oH DEwdAef3RW2DVfuKbTLk6pgd+HTSwShevokQaTdegQ0Bx29t6Y8WJwB X-Developer-Key: i=shimin.guo@skydio.com; a=ed25519; pk=nzTBfI+uHpVtYV5Am25mRvAeY5o5049QH/QxFAGK6VM= X-Endpoint-Received: by B4 Relay for shimin.guo@skydio.com/20251223 with auth_id=584 X-Original-From: Shimin Guo Reply-To: shimin.guo@skydio.com From: Shimin Guo 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. Signed-off-by: Shimin Guo --- checkpatch flagged three issues: > tools/perf/util/unwind-libdw-arch/Build:232: WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? Not sure what to do about that. > checkpatch.pl: tools/perf/util/unwind-libdw.c:228: WARNING: Non-declarative macros with multiple statements should be enclosed in a do - while loop > checkpatch.pl: tools/perf/util/unwind-libdw.c:228: WARNING: macros should not use a trailing semicolon Are these two false positives? I'm defining static global variables with the macro. --- 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} | 4 +- .../unwind-libdw-arch/unwind-libdw-arm64.c} | 4 +- .../unwind-libdw-arch/unwind-libdw-csky.c} | 6 +-- .../unwind-libdw-arch/unwind-libdw-loongarch.c} | 4 +- .../unwind-libdw-arch/unwind-libdw-powerpc.c} | 4 +- .../unwind-libdw-arch/unwind-libdw-riscv.c} | 4 +- .../unwind-libdw-arch/unwind-libdw-s390.c} | 6 +-- .../unwind-libdw-arch/unwind-libdw-x86.c} | 2 +- tools/perf/util/unwind-libdw.c | 49 ++++++++++++++++++= +--- tools/perf/util/unwind-libdw.h | 10 ++++- 19 files changed, 79 insertions(+), 32 deletions(-) diff --git a/tools/perf/arch/arm/util/Build b/tools/perf/arch/arm/util/Build index fd695e1fdaee2ccc300a206131b8b38a763b00ce..3291f893b943df0722dff583523= fff4ae79919bc 100644 --- a/tools/perf/arch/arm/util/Build +++ b/tools/perf/arch/arm/util/Build @@ -1,6 +1,5 @@ perf-util-y +=3D perf_regs.o =20 perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o =20 perf-util-y +=3D pmu.o auxtrace.o cs-etm.o diff --git a/tools/perf/arch/arm64/util/Build b/tools/perf/arch/arm64/util/= Build index d63881081d2eb1e9a83eabf82104d75308f7fc79..0177af19cc00038d6a6005592dd= c530bf7eb1557 100644 --- a/tools/perf/arch/arm64/util/Build +++ b/tools/perf/arch/arm64/util/Build @@ -1,4 +1,3 @@ -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o perf-util-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o perf-util-y +=3D ../../arm/util/auxtrace.o diff --git a/tools/perf/arch/csky/util/Build b/tools/perf/arch/csky/util/Bu= ild index 5e6ea82c42021d3d5651ca4c4a3a6e5138574e4e..6b2d0e021b11464e46d6b539742= 60d32ea969732 100644 --- a/tools/perf/arch/csky/util/Build +++ b/tools/perf/arch/csky/util/Build @@ -1,3 +1 @@ perf-util-y +=3D perf_regs.o - -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o diff --git a/tools/perf/arch/powerpc/util/Build b/tools/perf/arch/powerpc/u= til/Build index 3d0d5427aef7f26a8c05c883cc7ad763f08cbb30..5fd28ec713a4db74ecd1d26866a= 65ddb20e94bd3 100644 --- a/tools/perf/arch/powerpc/util/Build +++ b/tools/perf/arch/powerpc/util/Build @@ -9,5 +9,4 @@ perf-util-y +=3D evsel.o perf-util-$(CONFIG_LIBDW) +=3D skip-callchain-idx.o =20 perf-util-$(CONFIG_LIBUNWIND) +=3D unwind-libunwind.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o perf-util-y +=3D auxtrace.o diff --git a/tools/perf/arch/riscv/util/Build b/tools/perf/arch/riscv/util/= Build index 58a672246024dd0f72e767d11e9958bd9913ec3c..628b9ebd418bde8cdf1ab1332bf= 79f7c9d50760e 100644 --- a/tools/perf/arch/riscv/util/Build +++ b/tools/perf/arch/riscv/util/Build @@ -2,4 +2,3 @@ perf-util-y +=3D perf_regs.o perf-util-y +=3D header.o =20 perf-util-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o diff --git a/tools/perf/arch/s390/util/Build b/tools/perf/arch/s390/util/Bu= ild index c64eb18dbdae93adafabf8542e4c9a763ecfe057..5391d26fedd46b7d30a1bef0bff= 2ec2d58ec30ed 100644 --- a/tools/perf/arch/s390/util/Build +++ b/tools/perf/arch/s390/util/Build @@ -2,8 +2,6 @@ perf-util-y +=3D header.o perf-util-$(CONFIG_LIBTRACEEVENT) +=3D kvm-stat.o perf-util-y +=3D perf_regs.o =20 -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o - perf-util-y +=3D machine.o perf-util-y +=3D pmu.o =20 diff --git a/tools/perf/arch/x86/util/Build b/tools/perf/arch/x86/util/Build index c0dc5965f3624a6f02525a04d287dff755356d20..fad256252bb95a8f8350b6bb1a5= 4e8074eaebbec 100644 --- a/tools/perf/arch/x86/util/Build +++ b/tools/perf/arch/x86/util/Build @@ -12,7 +12,6 @@ perf-util-y +=3D evsel.o perf-util-y +=3D iostat.o =20 perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind.o -perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o =20 perf-util-y +=3D auxtrace.o perf-util-y +=3D archinsn.o diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 1c2a43e1dc68e7f751ec6082352b10de9ffeea62..15f8a4f4b24a46b6300e824f672= dd9c0d5b7865f 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -226,6 +226,7 @@ perf-util-$(CONFIG_LIBDW) +=3D debuginfo.o perf-util-$(CONFIG_LIBDW) +=3D annotate-data.o =20 perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw-arch/ perf-util-$(CONFIG_LOCAL_LIBUNWIND) +=3D unwind-libunwind-local.o perf-util-$(CONFIG_LIBUNWIND) +=3D unwind-libunwind.o perf-util-$(CONFIG_LIBUNWIND_X86) +=3D libunwind/x86_32.o diff --git a/tools/perf/util/unwind-libdw-arch/Build b/tools/perf/util/unwi= nd-libdw-arch/Build new file mode 100644 index 0000000000000000000000000000000000000000..e016d54ae2a40ecba47156c8f09= cb72156105727 --- /dev/null +++ b/tools/perf/util/unwind-libdw-arch/Build @@ -0,0 +1,8 @@ +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw-x86.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw-arm.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw-arm64.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw-csky.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw-loongarch.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw-powerpc.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw-riscv.o +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) +=3D unwind-libdw-s390.o \ No newline at end of file diff --git a/tools/perf/arch/arm/util/unwind-libdw.c b/tools/perf/util/unwi= nd-libdw-arch/unwind-libdw-arm.c similarity index 88% rename from tools/perf/arch/arm/util/unwind-libdw.c rename to tools/perf/util/unwind-libdw-arch/unwind-libdw-arm.c index fbb643f224ec4b27ce9d67051fe0bc4ad555b05e..c2718d6b6cff131cd67883e24bb= 0d3d963c8095a 100644 --- a/tools/perf/arch/arm/util/unwind-libdw.c +++ b/tools/perf/util/unwind-libdw-arch/unwind-libdw-arm.c @@ -1,11 +1,11 @@ // SPDX-License-Identifier: GPL-2.0 #include -#include "perf_regs.h" +#include "../../../arch/arm/include/uapi/asm/perf_regs.h" #include "../../../util/unwind-libdw.h" #include "../../../util/perf_regs.h" #include "../../../util/sample.h" =20 -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 =3D arg; struct regs_dump *user_regs =3D perf_sample__user_regs(ui->sample); diff --git a/tools/perf/arch/arm64/util/unwind-libdw.c b/tools/perf/util/un= wind-libdw-arch/unwind-libdw-arm64.c similarity index 92% rename from tools/perf/arch/arm64/util/unwind-libdw.c rename to tools/perf/util/unwind-libdw-arch/unwind-libdw-arm64.c index b89b0a7e5ad919fed23643d219fbdc3d84deff1e..87602503e057badc6efd37169cc= 60c96cf3949ab 100644 --- a/tools/perf/arch/arm64/util/unwind-libdw.c +++ b/tools/perf/util/unwind-libdw-arch/unwind-libdw-arm64.c @@ -1,11 +1,11 @@ // SPDX-License-Identifier: GPL-2.0 #include -#include "perf_regs.h" +#include "../../../arch/arm64/include/uapi/asm/perf_regs.h" #include "../../../util/unwind-libdw.h" #include "../../../util/perf_regs.h" #include "../../../util/sample.h" =20 -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 =3D arg; struct regs_dump *user_regs =3D perf_sample__user_regs(ui->sample); diff --git a/tools/perf/arch/csky/util/unwind-libdw.c b/tools/perf/util/unw= ind-libdw-arch/unwind-libdw-csky.c similarity index 92% rename from tools/perf/arch/csky/util/unwind-libdw.c rename to tools/perf/util/unwind-libdw-arch/unwind-libdw-csky.c index b20b1569783d7e982e91b1b40120d29ccf2f01d1..889d3b788931f3af55b03ef8b91= d5def364972e5 100644 --- a/tools/perf/arch/csky/util/unwind-libdw.c +++ b/tools/perf/util/unwind-libdw-arch/unwind-libdw-csky.c @@ -2,12 +2,12 @@ // Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd. =20 #include -#include "perf_regs.h" +#include "../../../arch/csky/include/uapi/asm/perf_regs.h" #include "../../util/unwind-libdw.h" #include "../../util/perf_regs.h" -#include "../../util/event.h" +#include "../../util/sample.h" =20 -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 =3D arg; struct regs_dump *user_regs =3D perf_sample__user_regs(ui->sample); diff --git a/tools/perf/arch/loongarch/util/unwind-libdw.c b/tools/perf/uti= l/unwind-libdw-arch/unwind-libdw-loongarch.c similarity index 91% rename from tools/perf/arch/loongarch/util/unwind-libdw.c rename to tools/perf/util/unwind-libdw-arch/unwind-libdw-loongarch.c index 60b1144bedd5f325e1512eeab05c29a1e8de2b03..1c5753ace6f63be771aa92365d3= 174ad8ed3a6fd 100644 --- a/tools/perf/arch/loongarch/util/unwind-libdw.c +++ b/tools/perf/util/unwind-libdw-arch/unwind-libdw-loongarch.c @@ -2,12 +2,12 @@ /* Copyright (C) 2020-2023 Loongson Technology Corporation Limited */ =20 #include -#include "perf_regs.h" +#include "../../../arch/loongarch/include/uapi/asm/perf_regs.h" #include "../../util/unwind-libdw.h" #include "../../util/perf_regs.h" #include "../../util/sample.h" =20 -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 =3D arg; struct regs_dump *user_regs =3D perf_sample__user_regs(ui->sample); diff --git a/tools/perf/arch/powerpc/util/unwind-libdw.c b/tools/perf/util/= unwind-libdw-arch/unwind-libdw-powerpc.c similarity index 93% rename from tools/perf/arch/powerpc/util/unwind-libdw.c rename to tools/perf/util/unwind-libdw-arch/unwind-libdw-powerpc.c index 82d0c28ae3459ecdb0039cac1f534420d142739b..28635af3c4aa420faa4de7e5342= 8d82917f78021 100644 --- a/tools/perf/arch/powerpc/util/unwind-libdw.c +++ b/tools/perf/util/unwind-libdw-arch/unwind-libdw-powerpc.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include #include -#include "perf_regs.h" +#include "../../../arch/powerpc/include/uapi/asm/perf_regs.h" #include "../../../util/unwind-libdw.h" #include "../../../util/perf_regs.h" #include "../../../util/sample.h" @@ -13,7 +13,7 @@ static const int special_regs[3][2] =3D { { 109, PERF_REG_POWERPC_CTR }, }; =20 -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 =3D arg; struct regs_dump *user_regs =3D perf_sample__user_regs(ui->sample); diff --git a/tools/perf/arch/riscv/util/unwind-libdw.c b/tools/perf/util/un= wind-libdw-arch/unwind-libdw-riscv.c similarity index 92% rename from tools/perf/arch/riscv/util/unwind-libdw.c rename to tools/perf/util/unwind-libdw-arch/unwind-libdw-riscv.c index dc1476e16321736de897ad53a00fbc813bd706db..2a5442b3b5bdc27252378de0073= deb8a620f8779 100644 --- a/tools/perf/arch/riscv/util/unwind-libdw.c +++ b/tools/perf/util/unwind-libdw-arch/unwind-libdw-riscv.c @@ -2,12 +2,12 @@ /* Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd. */ =20 #include -#include "perf_regs.h" +#include "../../../arch/riscv/include/uapi/asm/perf_regs.h" #include "../../util/unwind-libdw.h" #include "../../util/perf_regs.h" #include "../../util/sample.h" =20 -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 =3D arg; struct regs_dump *user_regs =3D perf_sample__user_regs(ui->sample); diff --git a/tools/perf/arch/s390/util/unwind-libdw.c b/tools/perf/util/unw= ind-libdw-arch/unwind-libdw-s390.c similarity index 89% rename from tools/perf/arch/s390/util/unwind-libdw.c rename to tools/perf/util/unwind-libdw-arch/unwind-libdw-s390.c index c27c7a0d1076c890c35ba19543932c4ed5ac9c2a..18d44074a55bc1c7fa2d7150afc= 1f1a93d4eadf8 100644 --- a/tools/perf/arch/s390/util/unwind-libdw.c +++ b/tools/perf/util/unwind-libdw-arch/unwind-libdw-s390.c @@ -4,11 +4,11 @@ #include "../../util/perf_regs.h" #include "../../util/event.h" #include "../../util/sample.h" -#include "dwarf-regs-table.h" -#include "perf_regs.h" +#include "../../arch/s390/include/dwarf-regs-table.h" +#include "../../../arch/s390/include/uapi/asm/perf_regs.h" =20 =20 -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 =3D arg; struct regs_dump *user_regs =3D perf_sample__user_regs(ui->sample); diff --git a/tools/perf/arch/x86/util/unwind-libdw.c b/tools/perf/util/unwi= nd-libdw-arch/unwind-libdw-x86.c similarity index 94% rename from tools/perf/arch/x86/util/unwind-libdw.c rename to tools/perf/util/unwind-libdw-arch/unwind-libdw-x86.c index 798493e887d7308cb293e29e4ba11054d0fda722..822e799fe1543d82dab27a8efea= da3f5cde08a44 100644 --- a/tools/perf/arch/x86/util/unwind-libdw.c +++ b/tools/perf/util/unwind-libdw-arch/unwind-libdw-x86.c @@ -5,7 +5,7 @@ #include "../../../util/perf_regs.h" #include "util/sample.h" =20 -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 =3D arg; struct regs_dump *user_regs =3D perf_sample__user_regs(ui->sample); diff --git a/tools/perf/util/unwind-libdw.c b/tools/perf/util/unwind-libdw.c index ae70fb56a05729b9f06a411d162eabebbf29ac52..4a0f13bc5af99de446d440c551c= 718ef0187e195 100644 --- a/tools/perf/util/unwind-libdw.c +++ b/tools/perf/util/unwind-libdw.c @@ -225,12 +225,46 @@ static bool memory_read(Dwfl *dwfl __maybe_unused, Dw= arf_Addr addr, Dwarf_Word * return true; } =20 -static const Dwfl_Thread_Callbacks callbacks =3D { - .next_thread =3D next_thread, - .memory_read =3D memory_read, - .set_initial_registers =3D libdw__arch_set_initial_registers, +#define DEFINE_DWFL_THREAD_CALLBACKS(arch) \ +static const Dwfl_Thread_Callbacks callbacks_##arch =3D { \ + .next_thread =3D next_thread, \ + .memory_read =3D memory_read, \ + .set_initial_registers =3D libdw_set_initial_registers_##arch, \ }; =20 +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 =3D perf_env__arch(ui_buf.machine->env); Dwarf_Word ip; int err =3D -EINVAL, i; + const Dwfl_Thread_Callbacks *callbacks; =20 if (!data->user_regs || !data->user_regs->regs) return -EINVAL; @@ -300,7 +335,11 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *ar= g, if (err) goto out; =20 - err =3D !dwfl_attach_state(ui->dwfl, EM_NONE, thread__tid(thread), &callb= acks, ui); + callbacks =3D get_thread_callbacks(arch); + if (!callbacks) + goto out; + + err =3D !dwfl_attach_state(ui->dwfl, EM_NONE, thread__tid(thread), callba= cks, ui); if (err) goto out; =20 diff --git a/tools/perf/util/unwind-libdw.h b/tools/perf/util/unwind-libdw.h index 8c88bc4f2304b59561ffd482469ca63ce0f531f0..574b29848cce31e6bfd93021f75= 2b518cebf73b7 100644 --- a/tools/perf/util/unwind-libdw.h +++ b/tools/perf/util/unwind-libdw.h @@ -9,7 +9,15 @@ struct machine; struct perf_sample; struct thread; =20 -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); =20 struct unwind_info { Dwfl *dwfl; --- base-commit: cbd41c6d4c26c161a2b0e70ad411d3885ff13507 change-id: 20251223-cross-arch-unwind-d890d6a5ff0a Best regards, --=20 Shimin Guo