From nobody Mon Feb 9 00:54:09 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D3F531C576 for ; Sat, 17 Jan 2026 05:29:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768627787; cv=none; b=tukjTQBsBJpqNSgGc/1aiiz8sbiun8LhKd0pL1aBPBVks0sMnMyFBQb7MdJS8EeaDICf3p976wQhMfVc1LHLwIl+qd1eJUUvIBBszbJQ7G1uKSzde6j0km7b73Nnq6nR8jHdD+lmXAOwnPS3XhEjoA9zXjsIJcIuaC1+c3um0/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768627787; c=relaxed/simple; bh=R1M3dDsAVl7DyE1NbBGh3oIiHphyh+StcvM6+r2grwc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=QIxmBrDRZxnbPylbCrIQytVzYMd9bkDDMKPDY386le3YmP1bWkkE3pfR3z/xvNyQLOuEhN53fx3DKnSK1HKXv7J1ltXtYI4cELzeSXDZev/f+NI768nOpiIirHQwLnCB+wmRri9pVjHQVEuOhRJteVpHv92PAgKxnpFWAinSD7o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=0++iWftb; arc=none smtp.client-ip=74.125.82.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="0++iWftb" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2ae56205588so4575584eec.1 for ; Fri, 16 Jan 2026 21:29:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1768627785; x=1769232585; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=+mdebosKkRDkwjrbfsOd2ME6cbYys2wY/+PUeL1P9Rc=; b=0++iWftb/0iBcgaGSv9GzhKbUpXCLCbVD29aawI1xsPOwzy2JflIKPKbY3fC7CLF/8 MbCTpeQ9SUpNnFJnCZbtBYBcqQGx2f0aeRMjRZOXTmeCYKKTH7Yja/F3/Ey4kgsEdBQn iqSFQCv23w6RGI1ybEZr5kxIdgoBtya7SwAJjBzdgUX9xKJoR60ZF2ulm8NyIuDBCTRp UoQD6kZfTZWMu7/w2An9wYIWHvIZj/wtRy016prRzsIvH9Zw+WGM2doAFLL2gC2bN9V9 /HvY42L8bsFjfztzxQPf2K9ouUStzO03hKUEaiVZq3vOFrz7pXhyT2vhAZhwtEeZmwUi stzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768627785; x=1769232585; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+mdebosKkRDkwjrbfsOd2ME6cbYys2wY/+PUeL1P9Rc=; b=aB/Po6u8DMIFqQHl4ZOLD2bWPxiu0Fwp/LqI2jng2XQ7C0JlVpx15ORzPbUN6AZoe9 ckgIT/DDUbLxO+mvkol8c39joBGyYQD9yRIJi/9iONHWIdGs7Cow9zWg6ABsvXI2JJrt 4TdFq3zCCxUbxZZCl9JX+pVGMRWSkrAE3lHWgirFTvGoTRnHK+KXetL1dVjhCsiRUF3N 9Ltl8KdklOVXysJrRMcyWG2Rtyn7Gzu+aS8sgb9rO9NmsCu8EDdfPiGqXpBsMsUgLuXf aOQthcIyXBOEx3QBbwRcn+5Hmw8vzKAXgmWyT+cbeAhy/B+PDyg7OPs6qsHIvCb2v7hh 1Gcg== X-Forwarded-Encrypted: i=1; AJvYcCVHr1dFatdM1gbX/w94EuCrhdesznfUfA/O5PEFLQ/2OYLGCN84yak4TRX0WWFcm9e2gaSTWbx+pxaC/bY=@vger.kernel.org X-Gm-Message-State: AOJu0YyG/xmgG4olfs1I4WgnMd8vmou9w8EQCS5g35LywZjh4ep0YQdg m4kdVAiHJsvXEtWshQJJTi0CK1/cl/jFRCLxzih6gpa0mksb9qy4EUxNXNPbLr0hHYxW7GGUrdr zx44MwQc2RA== X-Received: from dlag22.prod.google.com ([2002:a05:701b:2516:b0:124:4ff9:fb25]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:90b:b0:119:e56c:18a0 with SMTP id a92af1059eb24-1244a71467dmr4281835c88.8.1768627785240; Fri, 16 Jan 2026 21:29:45 -0800 (PST) Date: Fri, 16 Jan 2026 21:28:40 -0800 In-Reply-To: <20260117052849.2205545-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260117052849.2205545-1-irogers@google.com> X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260117052849.2205545-15-irogers@google.com> Subject: [PATCH v1 14/23] perf dwarf-regs: Add ARM perf to dwarf register number mapping functions From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , John Garry , Will Deacon , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Shimin Guo , Athira Rajeev , Stephen Brennan , Howard Chu , Thomas Falcon , Andi Kleen , "Dr. David Alan Gilbert" , Dmitry Vyukov , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , Chun-Tse Shao , Aditya Bodkhe , Haibo Xu , Sergei Trofimovich , 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" These functions allow the generic initial register state code in unwind-libdw to be used. Signed-off-by: Ian Rogers --- 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) +=3D dwarf-regs-arm64.o +perf-util-$(CONFIG_LIBDW) +=3D dwarf-regs-arm.o perf-util-$(CONFIG_LIBDW) +=3D dwarf-regs-csky.o perf-util-$(CONFIG_LIBDW) +=3D dwarf-regs-powerpc.o perf-util-$(CONFIG_LIBDW) +=3D 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 +#include +#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 >=3D PERF_REG_ARM_MAX) + return -ENOENT; + + return perf_regnum; +} diff --git a/tools/perf/util/dwarf-regs-arch/dwarf-regs-arm64.c b/tools/per= f/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 +#include +#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 >=3D 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 =3D __get_dwarf_regnum_for_perf_regnum_i386(perf_regnum); break; + case EM_ARM: + reg =3D __get_dwarf_regnum_for_perf_regnum_arm(perf_regnum); + break; + case EM_AARCH64: + reg =3D __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); =20 +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/unwi= nd-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 +=3D unwind-libdw-arm.o -perf-util-y +=3D unwind-libdw-arm64.o perf-util-y +=3D unwind-libdw-csky.o perf-util-y +=3D unwind-libdw-loongarch.o perf-util-y +=3D unwind-libdw-powerpc.o diff --git a/tools/perf/util/unwind-libdw-arch/unwind-libdw-arm.c b/tools/p= erf/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 -#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 =3D arg; - struct regs_dump *user_regs =3D perf_sample__user_regs(ui->sample); - Dwarf_Word dwarf_regs[PERF_REG_ARM_MAX]; - -#define REG(r) ({ \ - Dwarf_Word val =3D 0; \ - perf_reg_value(&val, user_regs, PERF_REG_ARM_##r); \ - val; \ -}) - - dwarf_regs[0] =3D REG(R0); - dwarf_regs[1] =3D REG(R1); - dwarf_regs[2] =3D REG(R2); - dwarf_regs[3] =3D REG(R3); - dwarf_regs[4] =3D REG(R4); - dwarf_regs[5] =3D REG(R5); - dwarf_regs[6] =3D REG(R6); - dwarf_regs[7] =3D REG(R7); - dwarf_regs[8] =3D REG(R8); - dwarf_regs[9] =3D REG(R9); - dwarf_regs[10] =3D REG(R10); - dwarf_regs[11] =3D REG(FP); - dwarf_regs[12] =3D REG(IP); - dwarf_regs[13] =3D REG(SP); - dwarf_regs[14] =3D REG(LR); - dwarf_regs[15] =3D 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 -#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 =3D arg; - struct regs_dump *user_regs =3D perf_sample__user_regs(ui->sample); - Dwarf_Word dwarf_regs[PERF_REG_ARM64_MAX], dwarf_pc; - -#define REG(r) ({ \ - Dwarf_Word val =3D 0; \ - perf_reg_value(&val, user_regs, PERF_REG_ARM64_##r); \ - val; \ -}) - - dwarf_regs[0] =3D REG(X0); - dwarf_regs[1] =3D REG(X1); - dwarf_regs[2] =3D REG(X2); - dwarf_regs[3] =3D REG(X3); - dwarf_regs[4] =3D REG(X4); - dwarf_regs[5] =3D REG(X5); - dwarf_regs[6] =3D REG(X6); - dwarf_regs[7] =3D REG(X7); - dwarf_regs[8] =3D REG(X8); - dwarf_regs[9] =3D REG(X9); - dwarf_regs[10] =3D REG(X10); - dwarf_regs[11] =3D REG(X11); - dwarf_regs[12] =3D REG(X12); - dwarf_regs[13] =3D REG(X13); - dwarf_regs[14] =3D REG(X14); - dwarf_regs[15] =3D REG(X15); - dwarf_regs[16] =3D REG(X16); - dwarf_regs[17] =3D REG(X17); - dwarf_regs[18] =3D REG(X18); - dwarf_regs[19] =3D REG(X19); - dwarf_regs[20] =3D REG(X20); - dwarf_regs[21] =3D REG(X21); - dwarf_regs[22] =3D REG(X22); - dwarf_regs[23] =3D REG(X23); - dwarf_regs[24] =3D REG(X24); - dwarf_regs[25] =3D REG(X25); - dwarf_regs[26] =3D REG(X26); - dwarf_regs[27] =3D REG(X27); - dwarf_regs[28] =3D REG(X28); - dwarf_regs[29] =3D REG(X29); - dwarf_regs[30] =3D REG(LR); - dwarf_regs[31] =3D REG(SP); - - if (!dwfl_thread_state_registers(thread, 0, PERF_REG_ARM64_MAX, - dwarf_regs)) - return false; - - dwarf_pc =3D 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 = =3D { .set_initial_registers =3D libdw_set_initial_registers_generic, }; =20 -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); =20 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; =20 -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); --=20 2.52.0.457.g6b5491de43-goog