From nobody Mon Feb 9 10:26:06 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (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 BC67C32D7C7 for ; Sat, 17 Jan 2026 05:29:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768627789; cv=none; b=AsLgGFXD6j2vI1JFuWdr62a85QqBhPbh16imKbMXhKGLpbtrb+MfzJMrZfxnUcnqqh8rco1fDs++NlFSOLrSvrd0FOI3Mn6ADyuAqAodgQAy9aN4CZpTw1IvIzDlbsnKoz5e+FGtVZlSFdlVXLVjXTkz5CTR7qnMmcg378hERV8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768627789; c=relaxed/simple; bh=JGRW69Ebv9XpmUXKYhV6JdipsoyGaj5JSbeie+Z5J8A=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=AvJADsAE0ln9UCX/igTqrFyhHznj4gBGwWAwP+Z2bq2dGxvoeDVcKYqrlU9d0lR2vi45g+GHcf32RyqXhZxNDeWnb3eOFfE/HpX0pFsujd0Q6tHcCrjWt/sPth+1kN4TE6yuPAiOKUM9qnd/4pNQLktkuRK3JrM9n/Zj6CEDMvo= 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=Y3IgMpwN; arc=none smtp.client-ip=74.125.82.202 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="Y3IgMpwN" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2b6af3eb78dso8726028eec.0 for ; Fri, 16 Jan 2026 21:29:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1768627787; x=1769232587; 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=eHsNO/7z8jjFX1Qc/WXEy+tfgyKsRWXmvXzihFXmRbQ=; b=Y3IgMpwNzeTtx4sNdwCF7CDGAlcZteG2gEWoeDrmfKZzJrNhjKPfo6LNT023FAdg8X nhrRKVcPnn9SmHto8elHJcEja/TGEM3mqvPcF5UjuU4qsta1tb+nNHLbrdErSySml4W/ +jVZbynwySmnpqz6mXiIIdikdAgfn6hd0UdBCfRDGf8B23JYFZXvRQr8ka+hm8425tY8 B0K+EF9yDAK0L8TKz+kimu+GRrfm51/BMfG20UjmppKQp0jypsMMwmFYdt5CoxpA5Xx6 Yv3UKjdFNtmDHtoveWMg6o+R1jMWmAUohnbCu9j+NR6cLOxK+OoQgZXgX+3U+Z6qmB4u PA1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768627787; x=1769232587; 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=eHsNO/7z8jjFX1Qc/WXEy+tfgyKsRWXmvXzihFXmRbQ=; b=QNJx/1Lg/Y1XreoGKmcoRgyr/CXDw3zh2hmsGoPKJMzBxF+nviWvHr+Ux/2JNaKNoE J2O2coeL+ZLj5qFyRC8SFCUceJMIJK079iAVq6jzRy2bAEjcZmWjkUzz4MKHy7vnM9e3 vVQDZ6Apm5th3jbYJNFIBg2IG7c59UfUkJVeVYBc29n8D+uvEclou4jVMUSy2/gy0TS2 NRy2Lfyg8ZWSbmfCC4WHUKaKJzGmA4uovMVpUO5XrqIcukDfstuY/zqpc4AlpE2S9wxc 3Hsa6v0RPm8Ojnr/8UIzD7JCd/sgOg/w9boF5quvfpQOPcQ5OTNydGsa+luaJ4aZFm3q DqOA== X-Forwarded-Encrypted: i=1; AJvYcCVs7xk3cWn0qHLobewm18w0TpTb+KfH4Pvziz/G9tWEMJewIXcfz9bhN+jTheiJTLFQnGdF5KTrPMlglbg=@vger.kernel.org X-Gm-Message-State: AOJu0Yzps9n/y4RE0TR88cRa1btSjntUId3MBOJ6JTBYdaFtBgxnRn3d dMihX19cqG0yULkDK7qKhUKtnWkBwO9jc/TyIT9dhq7vmWcig8D3PZyQvV2u6khlrcpTC/0qg24 WQoY9+pKm+A== X-Received: from dycue5.prod.google.com ([2002:a05:7300:85:b0:2b6:c560:337]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:5787:b0:2ac:22ac:30 with SMTP id 5a478bee46e88-2b6b4103759mr4377004eec.34.1768627786832; Fri, 16 Jan 2026 21:29:46 -0800 (PST) Date: Fri, 16 Jan 2026 21:28:41 -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-16-irogers@google.com> Subject: [PATCH v1 15/23] perf dwarf-regs: Add csky 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 --- .../util/dwarf-regs-arch/dwarf-regs-csky.c | 58 ++++++++++++++ tools/perf/util/dwarf-regs.c | 3 + tools/perf/util/include/dwarf-regs.h | 2 + tools/perf/util/unwind-libdw-arch/Build | 1 - .../unwind-libdw-arch/unwind-libdw-csky.c | 78 ------------------- tools/perf/util/unwind-libdw.c | 5 +- tools/perf/util/unwind-libdw.h | 1 - 7 files changed, 64 insertions(+), 84 deletions(-) delete mode 100644 tools/perf/util/unwind-libdw-arch/unwind-libdw-csky.c diff --git a/tools/perf/util/dwarf-regs-arch/dwarf-regs-csky.c b/tools/perf= /util/dwarf-regs-arch/dwarf-regs-csky.c index 86394ed46397..cb44b774f8d9 100644 --- a/tools/perf/util/dwarf-regs-arch/dwarf-regs-csky.c +++ b/tools/perf/util/dwarf-regs-arch/dwarf-regs-csky.c @@ -5,6 +5,10 @@ #include #include #include +// Ensure the V2 perf reg definitions are included. +#undef __CSKYABIV2__ +#define __CSKYABIV2__ 1 +#include "../../../arch/csky/include/uapi/asm/perf_regs.h" =20 #define CSKY_ABIV2_MAX_REGS 73 static const char * const csky_dwarf_regs_table_abiv2[CSKY_ABIV2_MAX_REGS]= =3D { @@ -66,3 +70,57 @@ int __get_csky_regnum(const char *name, unsigned int fla= gs) =20 return __get_dwarf_regnum(csky_dwarf_regs_table_abiv1, CSKY_ABIV1_MAX_REG= S, name); } + +int __get_dwarf_regnum_for_perf_regnum_csky(int perf_regnum, unsigned int = flags) +{ + static const int dwarf_csky_regnums[][2] =3D { + [PERF_REG_CSKY_TLS] =3D {-ENOENT, 31}, + [PERF_REG_CSKY_LR] =3D {15, 15}, + [PERF_REG_CSKY_PC] =3D {-ENOENT, 32}, + /* TODO: PERF_REG_CSKY_SR */ + [PERF_REG_CSKY_SP] =3D {0, 14}, + /* TODO: PERF_REG_CSKY_ORIG_A0 */ + [PERF_REG_CSKY_A0] =3D {2, 0}, + [PERF_REG_CSKY_A1] =3D {3, 1}, + [PERF_REG_CSKY_A2] =3D {4, 2}, + [PERF_REG_CSKY_A3] =3D {5, 3}, + [PERF_REG_CSKY_REGS0] =3D {6, 4}, + [PERF_REG_CSKY_REGS1] =3D {7, 5}, + [PERF_REG_CSKY_REGS2] =3D {8, 6}, + [PERF_REG_CSKY_REGS3] =3D {9, 7}, + [PERF_REG_CSKY_REGS4] =3D {10, 8}, + [PERF_REG_CSKY_REGS5] =3D {11, 9}, + [PERF_REG_CSKY_REGS6] =3D {12, 10}, + [PERF_REG_CSKY_REGS7] =3D {13, 11}, + [PERF_REG_CSKY_REGS8] =3D {14, 12}, + [PERF_REG_CSKY_REGS9] =3D {1, 13}, + [PERF_REG_CSKY_EXREGS0] =3D {-ENOENT, 16}, + [PERF_REG_CSKY_EXREGS1] =3D {-ENOENT, 17}, + [PERF_REG_CSKY_EXREGS2] =3D {-ENOENT, 18}, + [PERF_REG_CSKY_EXREGS3] =3D {-ENOENT, 19}, + [PERF_REG_CSKY_EXREGS4] =3D {-ENOENT, 20}, + [PERF_REG_CSKY_EXREGS5] =3D {-ENOENT, 21}, + [PERF_REG_CSKY_EXREGS6] =3D {-ENOENT, 22}, + [PERF_REG_CSKY_EXREGS7] =3D {-ENOENT, 23}, + [PERF_REG_CSKY_EXREGS8] =3D {-ENOENT, 24}, + [PERF_REG_CSKY_EXREGS9] =3D {-ENOENT, 25}, + [PERF_REG_CSKY_EXREGS10] =3D {-ENOENT, 26}, + [PERF_REG_CSKY_EXREGS11] =3D {-ENOENT, 27}, + [PERF_REG_CSKY_EXREGS12] =3D {-ENOENT, 28}, + [PERF_REG_CSKY_EXREGS13] =3D {-ENOENT, 29}, + [PERF_REG_CSKY_EXREGS14] =3D {-ENOENT, 30}, + /* TODO: PERF_REG_CSKY_HI */ + /* TODO: PERF_REG_CSKY_LO */ + /* TODO: PERF_REG_CSKY_DCSR */ + }; + int idx =3D 0; + + if (flags & EF_CSKY_ABIV2) + idx++; + + if (perf_regnum < 0 || perf_regnum > (int)ARRAY_SIZE(dwarf_csky_regnums)= || + dwarf_csky_regnums[perf_regnum][idx] =3D=3D 0) + return -ENOENT; + + return dwarf_csky_regnums[perf_regnum][idx]; +} diff --git a/tools/perf/util/dwarf-regs.c b/tools/perf/util/dwarf-regs.c index c472ec5e4d1a..7fa0930fd298 100644 --- a/tools/perf/util/dwarf-regs.c +++ b/tools/perf/util/dwarf-regs.c @@ -202,6 +202,9 @@ int get_dwarf_regnum_for_perf_regnum(int perf_regnum, u= nsigned int machine, case EM_AARCH64: reg =3D __get_dwarf_regnum_for_perf_regnum_arm64(perf_regnum); break; + case EM_CSKY: + reg =3D __get_dwarf_regnum_for_perf_regnum_csky(perf_regnum, flags); + 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 a52df8d1b138..7780bc07e70e 100644 --- a/tools/perf/util/include/dwarf-regs.h +++ b/tools/perf/util/include/dwarf-regs.h @@ -108,6 +108,8 @@ 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); =20 +int __get_dwarf_regnum_for_perf_regnum_csky(int perf_regnum, unsigned int = flags); + /* * 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 79c3bbdc2dee..5fa1754fca8d 100644 --- a/tools/perf/util/unwind-libdw-arch/Build +++ b/tools/perf/util/unwind-libdw-arch/Build @@ -1,4 +1,3 @@ -perf-util-y +=3D unwind-libdw-csky.o perf-util-y +=3D unwind-libdw-loongarch.o perf-util-y +=3D unwind-libdw-powerpc.o perf-util-y +=3D unwind-libdw-riscv.o diff --git a/tools/perf/util/unwind-libdw-arch/unwind-libdw-csky.c b/tools/= perf/util/unwind-libdw-arch/unwind-libdw-csky.c deleted file mode 100644 index 2556d034c32a..000000000000 --- a/tools/perf/util/unwind-libdw-arch/unwind-libdw-csky.c +++ /dev/null @@ -1,78 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -// Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd. - -#include -#include "../arch/csky/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_csky(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_CSKY_MAX]; - -#define REG(r) ({ \ - Dwarf_Word val =3D 0; \ - perf_reg_value(&val, user_regs, PERF_REG_CSKY_##r); \ - val; \ -}) - -#if defined(__CSKYABIV2__) - dwarf_regs[0] =3D REG(A0); - dwarf_regs[1] =3D REG(A1); - dwarf_regs[2] =3D REG(A2); - dwarf_regs[3] =3D REG(A3); - dwarf_regs[4] =3D REG(REGS0); - dwarf_regs[5] =3D REG(REGS1); - dwarf_regs[6] =3D REG(REGS2); - dwarf_regs[7] =3D REG(REGS3); - dwarf_regs[8] =3D REG(REGS4); - dwarf_regs[9] =3D REG(REGS5); - dwarf_regs[10] =3D REG(REGS6); - dwarf_regs[11] =3D REG(REGS7); - dwarf_regs[12] =3D REG(REGS8); - dwarf_regs[13] =3D REG(REGS9); - dwarf_regs[14] =3D REG(SP); - dwarf_regs[15] =3D REG(LR); - dwarf_regs[16] =3D REG(EXREGS0); - dwarf_regs[17] =3D REG(EXREGS1); - dwarf_regs[18] =3D REG(EXREGS2); - dwarf_regs[19] =3D REG(EXREGS3); - dwarf_regs[20] =3D REG(EXREGS4); - dwarf_regs[21] =3D REG(EXREGS5); - dwarf_regs[22] =3D REG(EXREGS6); - dwarf_regs[23] =3D REG(EXREGS7); - dwarf_regs[24] =3D REG(EXREGS8); - dwarf_regs[25] =3D REG(EXREGS9); - dwarf_regs[26] =3D REG(EXREGS10); - dwarf_regs[27] =3D REG(EXREGS11); - dwarf_regs[28] =3D REG(EXREGS12); - dwarf_regs[29] =3D REG(EXREGS13); - dwarf_regs[30] =3D REG(EXREGS14); - dwarf_regs[31] =3D REG(TLS); - dwarf_regs[32] =3D REG(PC); -#else - dwarf_regs[0] =3D REG(SP); - dwarf_regs[1] =3D REG(REGS9); - dwarf_regs[2] =3D REG(A0); - dwarf_regs[3] =3D REG(A1); - dwarf_regs[4] =3D REG(A2); - dwarf_regs[5] =3D REG(A3); - dwarf_regs[6] =3D REG(REGS0); - dwarf_regs[7] =3D REG(REGS1); - dwarf_regs[8] =3D REG(REGS2); - dwarf_regs[9] =3D REG(REGS3); - dwarf_regs[10] =3D REG(REGS4); - dwarf_regs[11] =3D REG(REGS5); - dwarf_regs[12] =3D REG(REGS6); - dwarf_regs[13] =3D REG(REGS7); - dwarf_regs[14] =3D REG(REGS8); - dwarf_regs[15] =3D REG(LR); -#endif - dwfl_thread_state_register_pc(thread, REG(PC)); - - return dwfl_thread_state_registers(thread, 0, PERF_REG_CSKY_MAX, - dwarf_regs); -} diff --git a/tools/perf/util/unwind-libdw.c b/tools/perf/util/unwind-libdw.c index 8f291f9f9469..a193163da707 100644 --- a/tools/perf/util/unwind-libdw.c +++ b/tools/perf/util/unwind-libdw.c @@ -292,7 +292,6 @@ static const Dwfl_Thread_Callbacks callbacks_generic = =3D { .set_initial_registers =3D libdw_set_initial_registers_generic, }; =20 -DEFINE_DWFL_THREAD_CALLBACKS(csky); DEFINE_DWFL_THREAD_CALLBACKS(loongarch); DEFINE_DWFL_THREAD_CALLBACKS(powerpc); DEFINE_DWFL_THREAD_CALLBACKS(riscv); @@ -300,9 +299,7 @@ DEFINE_DWFL_THREAD_CALLBACKS(s390); =20 static const Dwfl_Thread_Callbacks *get_thread_callbacks(const char *arch) { - if (!strcmp(arch, "csky")) - return &callbacks_csky; - else if (!strcmp(arch, "loongarch")) + if (!strcmp(arch, "loongarch")) return &callbacks_loongarch; else if (!strcmp(arch, "powerpc")) return &callbacks_powerpc; diff --git a/tools/perf/util/unwind-libdw.h b/tools/perf/util/unwind-libdw.h index fe3ae2a768ad..ee56f1e827e5 100644 --- a/tools/perf/util/unwind-libdw.h +++ b/tools/perf/util/unwind-libdw.h @@ -9,7 +9,6 @@ struct machine; struct perf_sample; struct thread; =20 -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); --=20 2.52.0.457.g6b5491de43-goog