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

Commit cfbcf468 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf core: Pass max stack as a perf_callchain_entry context 

This makes perf_callchain_{user,kernel}() receive the max stack
as context for the perf_callchain_entry, instead of accessing
the global sysctl_perf_event_max_stack.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: Wang Nan <wangnan0@huawei.com>
Cc: Zefan Li <lizefan@huawei.com>
Link: http://lkml.kernel.org/n/tip-kolmn1yo40p7jhswxwrc7rrd@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a831100a

arch/arc/kernel/perf_event.c

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct arc_callchain_trace { 
static int callchain_trace(unsigned int addr, void *data)

{

	struct arc_callchain_trace *ctrl = data;

	struct perf_callchain_entry *entry = ctrl->perf_stuff;

	struct perf_callchain_entry_ctx *entry = ctrl->perf_stuff;

	perf_callchain_store(entry, addr);



	if (ctrl->depth++ < 3)
@@ -58,7 +58,7 @@ static int callchain_trace(unsigned int addr, void *data) 
}



void

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

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

{

	struct arc_callchain_trace ctrl = {

		.depth = 0,
@@ -69,7 +69,7 @@ perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs) 
}



void

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

perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)

{

	/*

	 * User stack can't be unwound trivially with kernel dwarf unwinder

arch/arm/kernel/perf_callchain.c

+5 −5
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct frame_tail { 
 */

static struct frame_tail __user *

user_backtrace(struct frame_tail __user *tail,

	       struct perf_callchain_entry *entry)

	       struct perf_callchain_entry_ctx *entry)

{

	struct frame_tail buftail;

	unsigned long err;
@@ -59,7 +59,7 @@ user_backtrace(struct frame_tail __user *tail, 
}



void

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

perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)

{

	struct frame_tail __user *tail;
@@ -75,7 +75,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs) 


	tail = (struct frame_tail __user *)regs->ARM_fp - 1;



	while ((entry->nr < sysctl_perf_event_max_stack) &&

	while ((entry->entry->nr < entry->max_stack) &&

	       tail && !((unsigned long)tail & 0x3))

		tail = user_backtrace(tail, entry);

}
@@ -89,13 +89,13 @@ static int 
callchain_trace(struct stackframe *fr,

		void *data)

{

	struct perf_callchain_entry *entry = data;

	struct perf_callchain_entry_ctx *entry = data;

	perf_callchain_store(entry, fr->pc);

	return 0;

}



void

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

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

{

	struct stackframe fr;

arch/arm64/kernel/perf_callchain.c

+7 −7
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct frame_tail { 
 */

static struct frame_tail __user *

user_backtrace(struct frame_tail __user *tail,

	       struct perf_callchain_entry *entry)

	       struct perf_callchain_entry_ctx *entry)

{

	struct frame_tail buftail;

	unsigned long err;
@@ -76,7 +76,7 @@ struct compat_frame_tail { 


static struct compat_frame_tail __user *

compat_user_backtrace(struct compat_frame_tail __user *tail,

		      struct perf_callchain_entry *entry)

		      struct perf_callchain_entry_ctx *entry)

{

	struct compat_frame_tail buftail;

	unsigned long err;
@@ -106,7 +106,7 @@ compat_user_backtrace(struct compat_frame_tail __user *tail, 
}

#endif /* CONFIG_COMPAT */



void perf_callchain_user(struct perf_callchain_entry *entry,

void perf_callchain_user(struct perf_callchain_entry_ctx *entry,

			 struct pt_regs *regs)

{

	if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
@@ -122,7 +122,7 @@ void perf_callchain_user(struct perf_callchain_entry *entry, 


		tail = (struct frame_tail __user *)regs->regs[29];



		while (entry->nr < sysctl_perf_event_max_stack &&

		while (entry->entry->nr < entry->max_stack &&

		       tail && !((unsigned long)tail & 0xf))

			tail = user_backtrace(tail, entry);

	} else {
@@ -132,7 +132,7 @@ void perf_callchain_user(struct perf_callchain_entry *entry, 


		tail = (struct compat_frame_tail __user *)regs->compat_fp - 1;



		while ((entry->nr < sysctl_perf_event_max_stack) &&

		while ((entry->entry->nr < entry->max_stack) &&

			tail && !((unsigned long)tail & 0x3))

			tail = compat_user_backtrace(tail, entry);

#endif
@@ -146,12 +146,12 @@ void perf_callchain_user(struct perf_callchain_entry *entry, 
 */

static int callchain_trace(struct stackframe *frame, void *data)

{

	struct perf_callchain_entry *entry = data;

	struct perf_callchain_entry_ctx *entry = data;

	perf_callchain_store(entry, frame->pc);

	return 0;

}



void perf_callchain_kernel(struct perf_callchain_entry *entry,

void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,

			   struct pt_regs *regs)

{

	struct stackframe frame;

arch/metag/kernel/perf_callchain.c

+5 −5
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static bool is_valid_call(unsigned long calladdr) 


static struct metag_frame __user *

user_backtrace(struct metag_frame __user *user_frame,

	       struct perf_callchain_entry *entry)

	       struct perf_callchain_entry_ctx *entry)

{

	struct metag_frame frame;

	unsigned long calladdr;
@@ -56,7 +56,7 @@ user_backtrace(struct metag_frame __user *user_frame, 
}



void

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

perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)

{

	unsigned long sp = regs->ctx.AX[0].U0;

	struct metag_frame __user *frame;
@@ -65,7 +65,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs) 


	--frame;



	while ((entry->nr < sysctl_perf_event_max_stack) && frame)

	while ((entry->entry->nr < entry->max_stack) && frame)

		frame = user_backtrace(frame, entry);

}
@@ -78,13 +78,13 @@ static int 
callchain_trace(struct stackframe *fr,

		void *data)

{

	struct perf_callchain_entry *entry = data;

	struct perf_callchain_entry_ctx *entry = data;

	perf_callchain_store(entry, fr->pc);

	return 0;

}



void

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

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

{

	struct stackframe fr;

arch/mips/kernel/perf_event.c

+6 −6
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
 * the user stack callchains, we will add it here.

 */



static void save_raw_perf_callchain(struct perf_callchain_entry *entry,

static void save_raw_perf_callchain(struct perf_callchain_entry_ctx *entry,

				    unsigned long reg29)

{

	unsigned long *sp = (unsigned long *)reg29;
@@ -35,13 +35,13 @@ static void save_raw_perf_callchain(struct perf_callchain_entry *entry, 
		addr = *sp++;

		if (__kernel_text_address(addr)) {

			perf_callchain_store(entry, addr);

			if (entry->nr >= sysctl_perf_event_max_stack)

			if (entry->entry->nr >= entry->max_stack)

				break;

		}

	}

}



void perf_callchain_kernel(struct perf_callchain_entry *entry,

void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,

			   struct pt_regs *regs)

{

	unsigned long sp = regs->regs[29];
@@ -59,7 +59,7 @@ void perf_callchain_kernel(struct perf_callchain_entry *entry, 
	}

	do {

		perf_callchain_store(entry, pc);

		if (entry->nr >= sysctl_perf_event_max_stack)

		if (entry->entry->nr >= entry->max_stack)

			break;

		pc = unwind_stack(current, &sp, pc, &ra);

	} while (pc);