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

Commit 8cf7e0e2 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf: Make perf_callchain function static 



And move it to core.c, because there's no caller of this function other
than the one in core.c

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180107160356.28203-6-jolsa@kernel.org


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

kernel/events/callchain.c

+0 −15
Original line number Diff line number Diff line
@@ -178,21 +178,6 @@ put_callchain_entry(int rctx) 
	put_recursion_context(this_cpu_ptr(callchain_recursion), rctx);

}



struct perf_callchain_entry *

perf_callchain(struct perf_event *event, struct pt_regs *regs)

{

	bool kernel = !event->attr.exclude_callchain_kernel;

	bool user   = !event->attr.exclude_callchain_user;

	/* Disallow cross-task user callchains. */

	bool crosstask = event->ctx->task && event->ctx->task != current;

	const u32 max_stack = event->attr.sample_max_stack;



	if (!kernel && !user)

		return NULL;



	return get_perf_callchain(regs, 0, kernel, user, max_stack, crosstask, true);

}



struct perf_callchain_entry *

get_perf_callchain(struct pt_regs *regs, u32 init_nr, bool kernel, bool user,

		   u32 max_stack, bool crosstask, bool add_mark)

kernel/events/core.c

+16 −0
Original line number Diff line number Diff line
@@ -5980,6 +5980,22 @@ static u64 perf_virt_to_phys(u64 virt) 
	return phys_addr;

}



static struct perf_callchain_entry *

perf_callchain(struct perf_event *event, struct pt_regs *regs)

{

	bool kernel = !event->attr.exclude_callchain_kernel;

	bool user   = !event->attr.exclude_callchain_user;

	/* Disallow cross-task user callchains. */

	bool crosstask = event->ctx->task && event->ctx->task != current;

	const u32 max_stack = event->attr.sample_max_stack;



	if (!kernel && !user)

		return NULL;



	return get_perf_callchain(regs, 0, kernel, user,

				  max_stack, crosstask, true);

}



void perf_prepare_sample(struct perf_event_header *header,

			 struct perf_sample_data *data,

			 struct perf_event *event,

kernel/events/internal.h

+0 −4
Original line number Diff line number Diff line
@@ -201,10 +201,6 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n) 


DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)



/* Callchain handling */

extern struct perf_callchain_entry *

perf_callchain(struct perf_event *event, struct pt_regs *regs);



static inline int get_recursion_context(int *recursion)

{

	int rctx;