mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
d18c882f85
Since the commitdc6d2bc2d8("perf sample: Make user_regs and intr_regs optional"), the building for Arm64 reports error: arch/arm64/util/unwind-libdw.c: In function ‘libdw__arch_set_initial_registers’: arch/arm64/util/unwind-libdw.c:11:32: error: initialization of ‘struct regs_dump *’ from incompatible pointer type ‘struct regs_dump **’ [-Werror=incompatible-pointer-types] 11 | struct regs_dump *user_regs = &ui->sample->user_regs; | ^ cc1: all warnings being treated as errors make[6]: *** [/home/niayan01/linux/tools/build/Makefile.build:85: arch/arm64/util/unwind-libdw.o] Error 1 make[5]: *** [/home/niayan01/linux/tools/build/Makefile.build:138: util] Error 2 arch/arm64/tests/dwarf-unwind.c: In function ‘test__arch_unwind_sample’: arch/arm64/tests/dwarf-unwind.c:48:27: error: initialization of ‘struct regs_dump *’ from incompatible pointer type ‘struct regs_dump **’ [-Werror=incompatible-pointer-types] 48 | struct regs_dump *regs = &sample->user_regs; | ^ To fix the issue, use the helper perf_sample__user_regs() to retrieve the user_regs. Fixes:dc6d2bc2d8("perf sample: Make user_regs and intr_regs optional") Signed-off-by: Leo Yan <leo.yan@arm.com> Reviewed-by: James Clark <james.clark@linaro.org> Link: https://lore.kernel.org/r/20250214111025.14478-1-leo.yan@arm.com Signed-off-by: Namhyung Kim <namhyung@kernel.org>
61 lines
1.6 KiB
C
61 lines
1.6 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <elfutils/libdwfl.h>
|
|
#include "perf_regs.h"
|
|
#include "../../../util/unwind-libdw.h"
|
|
#include "../../../util/perf_regs.h"
|
|
#include "../../../util/sample.h"
|
|
|
|
bool libdw__arch_set_initial_registers(Dwfl_Thread *thread, void *arg)
|
|
{
|
|
struct unwind_info *ui = arg;
|
|
struct regs_dump *user_regs = perf_sample__user_regs(ui->sample);
|
|
Dwarf_Word dwarf_regs[PERF_REG_ARM64_MAX], dwarf_pc;
|
|
|
|
#define REG(r) ({ \
|
|
Dwarf_Word val = 0; \
|
|
perf_reg_value(&val, user_regs, PERF_REG_ARM64_##r); \
|
|
val; \
|
|
})
|
|
|
|
dwarf_regs[0] = REG(X0);
|
|
dwarf_regs[1] = REG(X1);
|
|
dwarf_regs[2] = REG(X2);
|
|
dwarf_regs[3] = REG(X3);
|
|
dwarf_regs[4] = REG(X4);
|
|
dwarf_regs[5] = REG(X5);
|
|
dwarf_regs[6] = REG(X6);
|
|
dwarf_regs[7] = REG(X7);
|
|
dwarf_regs[8] = REG(X8);
|
|
dwarf_regs[9] = REG(X9);
|
|
dwarf_regs[10] = REG(X10);
|
|
dwarf_regs[11] = REG(X11);
|
|
dwarf_regs[12] = REG(X12);
|
|
dwarf_regs[13] = REG(X13);
|
|
dwarf_regs[14] = REG(X14);
|
|
dwarf_regs[15] = REG(X15);
|
|
dwarf_regs[16] = REG(X16);
|
|
dwarf_regs[17] = REG(X17);
|
|
dwarf_regs[18] = REG(X18);
|
|
dwarf_regs[19] = REG(X19);
|
|
dwarf_regs[20] = REG(X20);
|
|
dwarf_regs[21] = REG(X21);
|
|
dwarf_regs[22] = REG(X22);
|
|
dwarf_regs[23] = REG(X23);
|
|
dwarf_regs[24] = REG(X24);
|
|
dwarf_regs[25] = REG(X25);
|
|
dwarf_regs[26] = REG(X26);
|
|
dwarf_regs[27] = REG(X27);
|
|
dwarf_regs[28] = REG(X28);
|
|
dwarf_regs[29] = REG(X29);
|
|
dwarf_regs[30] = REG(LR);
|
|
dwarf_regs[31] = REG(SP);
|
|
|
|
if (!dwfl_thread_state_registers(thread, 0, PERF_REG_ARM64_MAX,
|
|
dwarf_regs))
|
|
return false;
|
|
|
|
dwarf_pc = REG(PC);
|
|
dwfl_thread_state_register_pc(thread, dwarf_pc);
|
|
|
|
return true;
|
|
}
|