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>
63 lines
1.3 KiB
C
63 lines
1.3 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <string.h>
|
|
#include "perf_regs.h"
|
|
#include "thread.h"
|
|
#include "map.h"
|
|
#include "maps.h"
|
|
#include "event.h"
|
|
#include "debug.h"
|
|
#include "tests/tests.h"
|
|
|
|
#define STACK_SIZE 8192
|
|
|
|
static int sample_ustack(struct perf_sample *sample,
|
|
struct thread *thread, u64 *regs)
|
|
{
|
|
struct stack_dump *stack = &sample->user_stack;
|
|
struct map *map;
|
|
unsigned long sp;
|
|
u64 stack_size, *buf;
|
|
|
|
buf = malloc(STACK_SIZE);
|
|
if (!buf) {
|
|
pr_debug("failed to allocate sample uregs data\n");
|
|
return -1;
|
|
}
|
|
|
|
sp = (unsigned long) regs[PERF_REG_ARM64_SP];
|
|
|
|
map = maps__find(thread__maps(thread), (u64)sp);
|
|
if (!map) {
|
|
pr_debug("failed to get stack map\n");
|
|
free(buf);
|
|
return -1;
|
|
}
|
|
|
|
stack_size = map__end(map) - sp;
|
|
stack_size = stack_size > STACK_SIZE ? STACK_SIZE : stack_size;
|
|
|
|
memcpy(buf, (void *) sp, stack_size);
|
|
stack->data = (char *) buf;
|
|
stack->size = stack_size;
|
|
return 0;
|
|
}
|
|
|
|
int test__arch_unwind_sample(struct perf_sample *sample,
|
|
struct thread *thread)
|
|
{
|
|
struct regs_dump *regs = perf_sample__user_regs(sample);
|
|
u64 *buf;
|
|
|
|
buf = calloc(1, sizeof(u64) * PERF_REGS_MAX);
|
|
if (!buf) {
|
|
pr_debug("failed to allocate sample uregs data\n");
|
|
return -1;
|
|
}
|
|
|
|
perf_regs_load(buf);
|
|
regs->abi = PERF_SAMPLE_REGS_ABI;
|
|
regs->regs = buf;
|
|
regs->mask = PERF_REGS_MASK;
|
|
|
|
return sample_ustack(sample, thread, buf);
|
|
}
|