Previous commit 'perf x86: Fix perf to use non-executable stack, again' moved stack map into MAP__VARIABLE map type again. Fixing the dwarf unwind test stack map lookup appropriately. Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Jean Pihet <jean.pihet@linaro.org> Link: http://lkml.kernel.org/n/tip-ttzyhbe4zls24z7ednkmhvxl@git.kernel.org Signed-off-by: Jiri Olsa <jolsa@kernel.org>
61 lines
1.3 KiB
C
61 lines
1.3 KiB
C
#include <string.h>
|
|
#include "perf_regs.h"
|
|
#include "thread.h"
|
|
#include "map.h"
|
|
#include "event.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_X86_SP];
|
|
|
|
map = map_groups__find(&thread->mg, MAP__VARIABLE, (u64) sp);
|
|
if (!map) {
|
|
pr_debug("failed to get stack map\n");
|
|
free(buf);
|
|
return -1;
|
|
}
|
|
|
|
stack_size = map->end - 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 = &sample->user_regs;
|
|
u64 *buf;
|
|
|
|
buf = malloc(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);
|
|
}
|