Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f72c1a93 authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

perf: Factorize callchain context handling 



Store the kernel and user contexts from the generic layer instead
of archs, this gathers some repetitive code.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Acked-by: default avatarPaul Mackerras <paulus@samba.org>
Tested-by: default avatarWill Deacon <will.deacon@arm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: David Miller <davem@davemloft.net>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Borislav Petkov <bp@amd64.org>
parent 56962b44

arch/arm/kernel/perf_event.c

+0 −2
Original line number Diff line number Diff line
@@ -3049,7 +3049,6 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs) 
{

	struct frame_tail *tail;



	perf_callchain_store(entry, PERF_CONTEXT_USER);



	tail = (struct frame_tail *)regs->ARM_fp - 1;
@@ -3076,7 +3075,6 @@ perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs) 
{

	struct stackframe fr;



	perf_callchain_store(entry, PERF_CONTEXT_KERNEL);

	fr.fp = regs->ARM_fp;

	fr.sp = regs->ARM_sp;

	fr.lr = regs->ARM_lr;

arch/powerpc/kernel/perf_callchain.c

+0 −3
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs) 


	lr = regs->link;

	sp = regs->gpr[1];

	perf_callchain_store(entry, PERF_CONTEXT_KERNEL);

	perf_callchain_store(entry, regs->nip);



	if (!validate_sp(sp, current, STACK_FRAME_OVERHEAD))
@@ -234,7 +233,6 @@ static void perf_callchain_user_64(struct perf_callchain_entry *entry, 
	next_ip = regs->nip;

	lr = regs->link;

	sp = regs->gpr[1];

	perf_callchain_store(entry, PERF_CONTEXT_USER);

	perf_callchain_store(entry, next_ip);



	for (;;) {
@@ -435,7 +433,6 @@ static void perf_callchain_user_32(struct perf_callchain_entry *entry, 
	next_ip = regs->nip;

	lr = regs->link;

	sp = regs->gpr[1];

	perf_callchain_store(entry, PERF_CONTEXT_USER);

	perf_callchain_store(entry, next_ip);



	while (entry->nr < PERF_MAX_STACK_DEPTH) {

arch/sh/kernel/perf_callchain.c

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ static const struct stacktrace_ops callchain_ops = { 
void

perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs)

{

	perf_callchain_store(entry, PERF_CONTEXT_KERNEL);

	perf_callchain_store(entry, regs->pc);



	unwind_stack(NULL, regs, NULL, &callchain_ops, entry);

arch/sparc/kernel/perf_event.c

+0 −3
Original line number Diff line number Diff line
@@ -1293,7 +1293,6 @@ void perf_callchain_kernel(struct perf_callchain_entry *entry, 


	stack_trace_flush();



	perf_callchain_store(entry, PERF_CONTEXT_KERNEL);

	perf_callchain_store(entry, regs->tpc);



	ksp = regs->u_regs[UREG_I6];
@@ -1337,7 +1336,6 @@ static void perf_callchain_user_64(struct perf_callchain_entry *entry, 
{

	unsigned long ufp;



	perf_callchain_store(entry, PERF_CONTEXT_USER);

	perf_callchain_store(entry, regs->tpc);



	ufp = regs->u_regs[UREG_I6] + STACK_BIAS;
@@ -1360,7 +1358,6 @@ static void perf_callchain_user_32(struct perf_callchain_entry *entry, 
{

	unsigned long ufp;



	perf_callchain_store(entry, PERF_CONTEXT_USER);

	perf_callchain_store(entry, regs->tpc);



	ufp = regs->u_regs[UREG_I6] & 0xffffffffUL;

arch/x86/kernel/cpu/perf_event.c

+0 −2
Original line number Diff line number Diff line
@@ -1608,7 +1608,6 @@ static const struct stacktrace_ops backtrace_ops = { 
void

perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs)

{

	perf_callchain_store(entry, PERF_CONTEXT_KERNEL);

	perf_callchain_store(entry, regs->ip);



	dump_trace(NULL, regs, NULL, regs->bp, &backtrace_ops, entry);
@@ -1660,7 +1659,6 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs) 


	fp = (void __user *)regs->bp;



	perf_callchain_store(entry, PERF_CONTEXT_USER);

	perf_callchain_store(entry, regs->ip);



	if (perf_callchain_user32(regs, entry))