From nobody Sun Feb 8 22:06:36 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 6D01732B9BC for ; Sat, 17 Jan 2026 05:29:42 +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=1768627784; cv=none; b=T9vB+gFVnUH/j4v/xsLRhiGwPYvFGEvrFvDoay7S6pcDRpEloc0o/j4o0jYeiVLaiS1wYEZLfayNB4EZCRiyedS/wQrr4b3U0p2Z6/7BzcvIlhHieu8w6ZcWQKfF1+Ea9d+lXyQVgVGPTDVrmvvuoBkwliv6ZcR7YEgcydg5tf4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768627784; c=relaxed/simple; bh=rUvI1Qb97pub0GL8ptyOPPqUXRm0+59YXuX5c9irLLA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=cqUe2Ei7vaIrA9Qs5fyixSzeF1ZQEnJElAZEP3KzrLXT94z5qCkRs6idYAABy2F2byuOqNNig2DpyJvevMjxYqmwp+ur+KuBWRwRwYTkKQ3dN+b9mxEG1h0htL2D8WvThuZW7T8Fv8ECCBetB+7giDeooF8nKh7t/Frq6loAx+g= 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=aOp/aQ82; 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="aOp/aQ82" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2ae26a77b76so4881009eec.0 for ; Fri, 16 Jan 2026 21:29:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1768627782; x=1769232582; 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=j0hLW1UHbXT+qiQ2vPFChWMybpQvL2qtJZcRy5QYVbE=; b=aOp/aQ82IUKD6C71x5Mo3JQ8/GVI9Zf3XzoD7wcOtccBjsCSpxyEeiB2epjkcSObzG +j1Prvmvw41ddG+C/5wy8fz86lgQWae4c4YMLDUoXfBD03611CQErgjeMQ22etQUzx1G ZneGHKqf6HtsC1qqgJGCCSUBZb9H4M50nsg+2FBo/q4UDcXHxVIPHndFZ0Qo4gzspEwX 4wHcyBBc/y8oEcAnkPb43d7nqLSp2/hCyhsOuDMofcMtu4DUjeQy/Z5t297yQt+a6h1r d6JGZB7e0dAT8dY0GUvJuS85Rn9+L18scARv+QczdqazUVNEwbyJM92dJsg4GCreeNH2 3izw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768627782; x=1769232582; 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=j0hLW1UHbXT+qiQ2vPFChWMybpQvL2qtJZcRy5QYVbE=; b=jVBlcUOiAfni9QcIOgpD5jZVurucALyG5Nshk9eaZIAABAUZHU8kh4lsO7/HsRKG8L OOZATxQTVZ8MgB20syoJt48hPajUd4dtCCwaQWeX3ThITLfbMNQX2ZMgYbYp6s6lhlQ3 bDa7kDJ2QmIbiI86GSH+1SRUSISw3NlEctUNuysvPg2Z3lSg7NYSvksCvULjb2KWW2lg NHBqswA0RQQxX+RT9UId/h4PfmkuFIkFwXRjXce6iuZLOng0riR67IeWzUfOcbzoBD4T gghZebS4hnbfnEl3b89eaiUlzNMR5cShsQuDa2oBKkpIZEohsooi38S+cIadz6T4/9nh 3lQA== X-Forwarded-Encrypted: i=1; AJvYcCWHONqijPB18XTzAd4BO61K2wNFxl4UirjvizNxI98OQUBk/wwuoEECNY7AtAtW95S7/0AAuLje0TsMN14=@vger.kernel.org X-Gm-Message-State: AOJu0YzAvbXcBJfyuwy2SWFw/YyEzzpWg4LPlNZ/GRk9OOEebUQR4wBD vQPWHIWPOjHiUYFROOiRwJIHP0sE67SRfyxFYW5soiVKPmuAZhAVJLweZWgo/oriNRP4K95sssd EU/eiM1PAgQ== X-Received: from dlbqq14.prod.google.com ([2002:a05:7022:ed0e:b0:119:78ff:fe0f]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:6089:b0:11b:9386:8268 with SMTP id a92af1059eb24-1244b37c27fmr3504641c88.45.1768627781426; Fri, 16 Jan 2026 21:29:41 -0800 (PST) Date: Fri, 16 Jan 2026 21:28:38 -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-13-irogers@google.com> Subject: [PATCH v1 12/23] perf dwarf-regs: Add get_dwarf_regnum_for_perf_regnum and use for x86 unwinding 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" Add a utility to map a perf register number to a dwarf register number for a particular ELF machine type. Create a generic unwind-libdw initial register initialization routine that uses this function and thereby avoids arch specific initialization. The unwind-libdw code does: 1) compute the maximum dwarf register from the set of sampled user register= s, 2) allocates a set of dwarf registers, 3) copies the sample registers into the appropriate dwarf registers. This generic solution is initially implemented for use with x86 as only get_dwarf_regnum_for_perf_regnum support for x86 is currently present. Signed-off-by: Ian Rogers --- .../util/dwarf-regs-arch/dwarf-regs-x86.c | 95 +++++++++++++++++++ tools/perf/util/dwarf-regs.c | 55 +++++++++++ tools/perf/util/include/dwarf-regs.h | 8 ++ tools/perf/util/unwind-libdw-arch/Build | 1 - .../util/unwind-libdw-arch/unwind-libdw-x86.c | 54 ----------- tools/perf/util/unwind-libdw.c | 70 ++++++++++++-- tools/perf/util/unwind-libdw.h | 2 +- 7 files changed, 222 insertions(+), 63 deletions(-) delete mode 100644 tools/perf/util/unwind-libdw-arch/unwind-libdw-x86.c diff --git a/tools/perf/util/dwarf-regs-arch/dwarf-regs-x86.c b/tools/perf/= util/dwarf-regs-arch/dwarf-regs-x86.c index f0c42e4d7423..cadef120aeb4 100644 --- a/tools/perf/util/dwarf-regs-arch/dwarf-regs-x86.c +++ b/tools/perf/util/dwarf-regs-arch/dwarf-regs-x86.c @@ -10,6 +10,7 @@ #include /* for strcmp */ #include /* for ARRAY_SIZE */ #include +#include "../../../arch/x86/include/uapi/asm/perf_regs.h" =20 struct dwarf_regs_idx { const char *name; @@ -163,3 +164,97 @@ int __get_dwarf_regnum_x86_64(const char *name) { return get_regnum(x86_64_regidx_table, ARRAY_SIZE(x86_64_regidx_table), n= ame); } + +int __get_dwarf_regnum_for_perf_regnum_i386(int perf_regnum) +{ + static const int dwarf_i386_regnums[] =3D { + [PERF_REG_X86_AX] =3D 0, + [PERF_REG_X86_BX] =3D 3, + [PERF_REG_X86_CX] =3D 1, + [PERF_REG_X86_DX] =3D 2, + [PERF_REG_X86_SI] =3D 6, + [PERF_REG_X86_DI] =3D 7, + [PERF_REG_X86_BP] =3D 5, + [PERF_REG_X86_SP] =3D 4, + [PERF_REG_X86_IP] =3D 8, + [PERF_REG_X86_FLAGS] =3D 9, + [PERF_REG_X86_CS] =3D 41, + [PERF_REG_X86_SS] =3D 42, + [PERF_REG_X86_DS] =3D 43, + [PERF_REG_X86_ES] =3D 40, + [PERF_REG_X86_FS] =3D 44, + [PERF_REG_X86_GS] =3D 45, + [PERF_REG_X86_XMM0] =3D 21, + [PERF_REG_X86_XMM1] =3D 22, + [PERF_REG_X86_XMM2] =3D 23, + [PERF_REG_X86_XMM3] =3D 24, + [PERF_REG_X86_XMM4] =3D 25, + [PERF_REG_X86_XMM5] =3D 26, + [PERF_REG_X86_XMM6] =3D 27, + [PERF_REG_X86_XMM7] =3D 28, + }; + + if (perf_regnum =3D=3D 0) + return 0; + + if (perf_regnum < 0 || perf_regnum > (int)ARRAY_SIZE(dwarf_i386_regnums)= || + dwarf_i386_regnums[perf_regnum] =3D=3D 0) + return -ENOENT; + + return dwarf_i386_regnums[perf_regnum]; +} + +int __get_dwarf_regnum_for_perf_regnum_x86_64(int perf_regnum) +{ + static const int dwarf_x86_64_regnums[] =3D { + [PERF_REG_X86_AX] =3D 0, + [PERF_REG_X86_BX] =3D 3, + [PERF_REG_X86_CX] =3D 2, + [PERF_REG_X86_DX] =3D 1, + [PERF_REG_X86_SI] =3D 4, + [PERF_REG_X86_DI] =3D 5, + [PERF_REG_X86_BP] =3D 6, + [PERF_REG_X86_SP] =3D 7, + [PERF_REG_X86_IP] =3D 16, + [PERF_REG_X86_FLAGS] =3D 49, + [PERF_REG_X86_CS] =3D 51, + [PERF_REG_X86_SS] =3D 52, + [PERF_REG_X86_DS] =3D 53, + [PERF_REG_X86_ES] =3D 50, + [PERF_REG_X86_FS] =3D 54, + [PERF_REG_X86_GS] =3D 55, + [PERF_REG_X86_R8] =3D 8, + [PERF_REG_X86_R9] =3D 9, + [PERF_REG_X86_R10] =3D 10, + [PERF_REG_X86_R11] =3D 11, + [PERF_REG_X86_R12] =3D 12, + [PERF_REG_X86_R13] =3D 13, + [PERF_REG_X86_R14] =3D 14, + [PERF_REG_X86_R15] =3D 15, + [PERF_REG_X86_XMM0] =3D 17, + [PERF_REG_X86_XMM1] =3D 18, + [PERF_REG_X86_XMM2] =3D 19, + [PERF_REG_X86_XMM3] =3D 20, + [PERF_REG_X86_XMM4] =3D 21, + [PERF_REG_X86_XMM5] =3D 22, + [PERF_REG_X86_XMM6] =3D 23, + [PERF_REG_X86_XMM7] =3D 24, + [PERF_REG_X86_XMM8] =3D 25, + [PERF_REG_X86_XMM9] =3D 26, + [PERF_REG_X86_XMM10] =3D 27, + [PERF_REG_X86_XMM11] =3D 28, + [PERF_REG_X86_XMM12] =3D 29, + [PERF_REG_X86_XMM13] =3D 30, + [PERF_REG_X86_XMM14] =3D 31, + [PERF_REG_X86_XMM15] =3D 32, + }; + + if (perf_regnum =3D=3D 0) + return 0; + + if (perf_regnum < 0 || perf_regnum > (int)ARRAY_SIZE(dwarf_x86_64_regnum= s) || + dwarf_x86_64_regnums[perf_regnum] =3D=3D 0) + return -ENOENT; + + return dwarf_x86_64_regnums[perf_regnum]; +} diff --git a/tools/perf/util/dwarf-regs.c b/tools/perf/util/dwarf-regs.c index ef249dd589e3..1f7d892612df 100644 --- a/tools/perf/util/dwarf-regs.c +++ b/tools/perf/util/dwarf-regs.c @@ -103,3 +103,58 @@ int get_dwarf_regnum(const char *name, unsigned int ma= chine, unsigned int flags free(regname); return reg; } + +static int get_libdw_frame_nregs(unsigned int machine, unsigned int flags = __maybe_unused) +{ + switch (machine) { + case EM_X86_64: + return 17; + case EM_386: + return 9; + case EM_ARM: + return 16; + case EM_AARCH64: + return 97; + case EM_CSKY: + return 38; + case EM_S390: + return 32; + case EM_PPC: + case EM_PPC64: + return 145; + case EM_RISCV: + return 66; + case EM_SPARC: + case EM_SPARCV9: + return 103; + case EM_LOONGARCH: + return 74; + default: + return 0; + } +} + +int get_dwarf_regnum_for_perf_regnum(int perf_regnum, unsigned int machine, + unsigned int flags, bool only_libdw_supported) +{ + int reg; + + switch (machine) { + case EM_X86_64: + reg =3D __get_dwarf_regnum_for_perf_regnum_x86_64(perf_regnum); + break; + case EM_386: + reg =3D __get_dwarf_regnum_for_perf_regnum_i386(perf_regnum); + break; + default: + pr_err("ELF MACHINE %x is not supported.\n", machine); + return -ENOENT; + } + if (reg >=3D 0 && only_libdw_supported) { + int nregs =3D get_libdw_frame_nregs(machine, flags); + + if (reg >=3D nregs) + reg =3D -ENOENT; + } + return reg; +} diff --git a/tools/perf/util/include/dwarf-regs.h b/tools/perf/util/include= /dwarf-regs.h index bb5413b0fee4..00881f1d45d6 100644 --- a/tools/perf/util/include/dwarf-regs.h +++ b/tools/perf/util/include/dwarf-regs.h @@ -101,6 +101,8 @@ const char *get_dwarf_regstr(unsigned int n, unsigned i= nt machine, unsigned int =20 int __get_dwarf_regnum_i386(const char *name); 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 /* * get_dwarf_regnum - Returns DWARF regnum from register name @@ -109,6 +111,12 @@ int __get_dwarf_regnum_x86_64(const char *name); */ int get_dwarf_regnum(const char *name, unsigned int machine, unsigned int = flags); =20 +/* + * get_dwarf_regnum - Returns DWARF regnum from perf register number. + */ +int get_dwarf_regnum_for_perf_regnum(int perf_regnum, unsigned int machine= , unsigned int flags, + bool only_libdw_supported); + void get_powerpc_regs(u32 raw_insn, int is_source, struct annotated_op_loc= *op_loc); =20 #else /* HAVE_LIBDW_SUPPORT */ diff --git a/tools/perf/util/unwind-libdw-arch/Build b/tools/perf/util/unwi= nd-libdw-arch/Build index ef17a83a7813..5b5682029953 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-x86.o perf-util-y +=3D unwind-libdw-arm.o perf-util-y +=3D unwind-libdw-arm64.o perf-util-y +=3D unwind-libdw-csky.o diff --git a/tools/perf/util/unwind-libdw-arch/unwind-libdw-x86.c b/tools/p= erf/util/unwind-libdw-arch/unwind-libdw-x86.c deleted file mode 100644 index dd27545a4a68..000000000000 --- a/tools/perf/util/unwind-libdw-arch/unwind-libdw-x86.c +++ /dev/null @@ -1,54 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include -#include "../arch/x86/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_x86(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[17]; - unsigned nregs; - -#define REG(r) ({ \ - Dwarf_Word val =3D 0; \ - perf_reg_value(&val, user_regs, PERF_REG_X86_##r); \ - val; \ -}) - - if (user_regs->abi =3D=3D PERF_SAMPLE_REGS_ABI_32) { - dwarf_regs[0] =3D REG(AX); - dwarf_regs[1] =3D REG(CX); - dwarf_regs[2] =3D REG(DX); - dwarf_regs[3] =3D REG(BX); - dwarf_regs[4] =3D REG(SP); - dwarf_regs[5] =3D REG(BP); - dwarf_regs[6] =3D REG(SI); - dwarf_regs[7] =3D REG(DI); - dwarf_regs[8] =3D REG(IP); - nregs =3D 9; - } else { - dwarf_regs[0] =3D REG(AX); - dwarf_regs[1] =3D REG(DX); - dwarf_regs[2] =3D REG(CX); - dwarf_regs[3] =3D REG(BX); - dwarf_regs[4] =3D REG(SI); - dwarf_regs[5] =3D REG(DI); - dwarf_regs[6] =3D REG(BP); - dwarf_regs[7] =3D REG(SP); - dwarf_regs[8] =3D REG(R8); - dwarf_regs[9] =3D REG(R9); - dwarf_regs[10] =3D REG(R10); - dwarf_regs[11] =3D REG(R11); - dwarf_regs[12] =3D REG(R12); - dwarf_regs[13] =3D REG(R13); - dwarf_regs[14] =3D REG(R14); - dwarf_regs[15] =3D REG(R15); - dwarf_regs[16] =3D REG(IP); - nregs =3D 17; - } - - return dwfl_thread_state_registers(thread, 0, nregs, dwarf_regs); -} diff --git a/tools/perf/util/unwind-libdw.c b/tools/perf/util/unwind-libdw.c index c25190cdceb4..055dab921442 100644 --- a/tools/perf/util/unwind-libdw.c +++ b/tools/perf/util/unwind-libdw.c @@ -6,6 +6,7 @@ #include #include "debug.h" #include "dso.h" +#include #include "unwind.h" #include "unwind-libdw.h" #include "machine.h" @@ -225,6 +226,59 @@ static bool memory_read(Dwfl *dwfl __maybe_unused, Dwa= rf_Addr addr, Dwarf_Word * return true; } =20 +static bool libdw_set_initial_registers_generic(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; + int max_dwarf_reg =3D 0; + bool ret; + uint16_t e_machine =3D ui->e_machine; + int e_flags =3D 0; + uint64_t ip_perf_reg =3D perf_arch_reg_ip(e_machine); + Dwarf_Word val =3D 0; + + + /* + * For every possible perf register in the bitmap determine the dwarf + * register and use to compute the max. + */ + for (int perf_reg =3D 0; perf_reg < 64; perf_reg++) { + if (user_regs->mask & (1ULL << perf_reg)) { + int dwarf_reg =3D + get_dwarf_regnum_for_perf_regnum(perf_reg, e_machine, + e_flags, + /*only_libdw_supported=3D*/true); + if (dwarf_reg > max_dwarf_reg) + max_dwarf_reg =3D dwarf_reg; + } + } + + dwarf_regs =3D calloc(max_dwarf_reg + 1, sizeof(*dwarf_regs)); + if (!dwarf_regs) + return false; + + for (int perf_reg =3D 0; perf_reg < 64; perf_reg++) { + if (user_regs->mask & (1ULL << perf_reg)) { + int dwarf_reg =3D + get_dwarf_regnum_for_perf_regnum(perf_reg, e_machine, + e_flags, + /*only_libdw_supported=3D*/true); + if (dwarf_reg >=3D 0) { + val =3D 0; + if (perf_reg_value(&val, user_regs, perf_reg) =3D=3D 0) + dwarf_regs[dwarf_reg] =3D val; + } + } + } + if (perf_reg_value(&val, user_regs, ip_perf_reg) =3D=3D 0) + dwfl_thread_state_register_pc(thread, val); + + ret =3D dwfl_thread_state_registers(thread, 0, max_dwarf_reg + 1, dwarf_r= egs); + free(dwarf_regs); + return ret; +} + #define DEFINE_DWFL_THREAD_CALLBACKS(arch) \ static const Dwfl_Thread_Callbacks callbacks_##arch =3D { \ .next_thread =3D next_thread, \ @@ -232,7 +286,12 @@ static const Dwfl_Thread_Callbacks callbacks_##arch = =3D { \ .set_initial_registers =3D libdw_set_initial_registers_##arch, \ } =20 -DEFINE_DWFL_THREAD_CALLBACKS(x86); +static const Dwfl_Thread_Callbacks callbacks_generic =3D { + .next_thread =3D next_thread, + .memory_read =3D memory_read, + .set_initial_registers =3D libdw_set_initial_registers_generic, +}; + DEFINE_DWFL_THREAD_CALLBACKS(arm); DEFINE_DWFL_THREAD_CALLBACKS(arm64); DEFINE_DWFL_THREAD_CALLBACKS(csky); @@ -257,12 +316,8 @@ static const Dwfl_Thread_Callbacks *get_thread_callbac= ks(const char *arch) return &callbacks_riscv; else if (!strcmp(arch, "s390")) return &callbacks_s390; - else if (!strcmp(arch, "x86")) - return &callbacks_x86; =20 - pr_err("Fail to get thread callbacks for arch %s, returns NULL\n", - arch); - return NULL; + return &callbacks_generic; } =20 static int @@ -301,6 +356,7 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg, bool best_effort) { struct machine *machine =3D maps__machine(thread__maps(thread)); + uint16_t e_machine =3D thread__e_machine(thread, machine); struct unwind_info *ui, ui_buf =3D { .sample =3D data, .thread =3D thread, @@ -308,9 +364,9 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg, .cb =3D cb, .arg =3D arg, .max_stack =3D max_stack, + .e_machine =3D e_machine, .best_effort =3D best_effort }; - uint16_t e_machine =3D thread__e_machine(thread, machine); const char *arch =3D perf_env__arch(machine->env); Dwarf_Word ip; int err =3D -EINVAL, i; diff --git a/tools/perf/util/unwind-libdw.h b/tools/perf/util/unwind-libdw.h index 574b29848cce..496e5898e7ef 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_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); @@ -28,6 +27,7 @@ struct unwind_info { void *arg; int max_stack; int idx; + uint16_t e_machine; bool best_effort; struct unwind_entry entries[]; }; --=20 2.52.0.457.g6b5491de43-goog