Commit 86038c5e authored by Peter Zijlstra (Intel)'s avatar Peter Zijlstra (Intel) Committed by Ingo Molnar
Browse files

perf: Avoid horrible stack usage 



Both Linus (most recent) and Steve (a while ago) reported that perf
related callbacks have massive stack bloat.

The problem is that software events need a pt_regs in order to
properly report the event location and unwind stack. And because we
could not assume one was present we allocated one on stack and filled
it with minimal bits required for operation.

Now, pt_regs is quite large, so this is undesirable. Furthermore it
turns out that most sites actually have a pt_regs pointer available,
making this even more onerous, as the stack space is pointless waste.

This patch addresses the problem by observing that software events
have well defined nesting semantics, therefore we can use static
per-cpu storage instead of on-stack.

Linus made the further observation that all but the scheduler callers
of perf_sw_event() have a pt_regs available, so we change the regular
perf_sw_event() to require a valid pt_regs (where it used to be
optional) and add perf_sw_event_sched() for the scheduler.

We have a scheduler specific call instead of a more generic _noregs()
like construct because we can assume non-recursion from the scheduler
and thereby simplify the code further (_noregs would have to put the
recursion context call inline in order to assertain which __perf_regs
element to use).

One last note on the implementation of perf_trace_buf_prepare(); we
allow .regs = NULL for those cases where we already have a pt_regs
pointer available and do not need another.

Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Reported-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Javi Merino <javi.merino@arm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Petr Mladek <pmladek@suse.cz>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Tom Zanussi <tom.zanussi@linux.intel.com>
Cc: Vaibhav Nagarnaik <vnagarnaik@google.com>
Link: http://lkml.kernel.org/r/20141216115041.GW3337@twins.programming.kicks-ass.net


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 188c9019

include/linux/ftrace_event.h

+1 −1
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ extern int ftrace_profile_set_filter(struct perf_event *event, int event_id, 
				     char *filter_str);

extern void ftrace_profile_free_filter(struct perf_event *event);

extern void *perf_trace_buf_prepare(int size, unsigned short type,

				    struct pt_regs *regs, int *rctxp);

				    struct pt_regs **regs, int *rctxp);



static inline void

perf_trace_buf_submit(void *raw_data, int size, int rctx, u64 addr,

include/linux/perf_event.h

+21 −7
Original line number Diff line number Diff line
@@ -665,6 +665,7 @@ static inline int is_software_event(struct perf_event *event) 


extern struct static_key perf_swevent_enabled[PERF_COUNT_SW_MAX];



extern void ___perf_sw_event(u32, u64, struct pt_regs *, u64);

extern void __perf_sw_event(u32, u64, struct pt_regs *, u64);



#ifndef perf_arch_fetch_caller_regs
@@ -689,14 +690,25 @@ static inline void perf_fetch_caller_regs(struct pt_regs *regs) 
static __always_inline void

perf_sw_event(u32 event_id, u64 nr, struct pt_regs *regs, u64 addr)

{

	struct pt_regs hot_regs;

	if (static_key_false(&perf_swevent_enabled[event_id]))

		__perf_sw_event(event_id, nr, regs, addr);

}



DECLARE_PER_CPU(struct pt_regs, __perf_regs[4]);



/*

 * 'Special' version for the scheduler, it hard assumes no recursion,

 * which is guaranteed by us not actually scheduling inside other swevents

 * because those disable preemption.

 */

static __always_inline void

perf_sw_event_sched(u32 event_id, u64 nr, u64 addr)

{

	if (static_key_false(&perf_swevent_enabled[event_id])) {

		if (!regs) {

			perf_fetch_caller_regs(&hot_regs);

			regs = &hot_regs;

		}

		__perf_sw_event(event_id, nr, regs, addr);

		struct pt_regs *regs = this_cpu_ptr(&__perf_regs[0]);



		perf_fetch_caller_regs(regs);

		___perf_sw_event(event_id, nr, regs, addr);

	}

}
@@ -712,7 +724,7 @@ static inline void perf_event_task_sched_in(struct task_struct *prev, 
static inline void perf_event_task_sched_out(struct task_struct *prev,

					     struct task_struct *next)

{

	perf_sw_event(PERF_COUNT_SW_CONTEXT_SWITCHES, 1, NULL, 0);

	perf_sw_event_sched(PERF_COUNT_SW_CONTEXT_SWITCHES, 1, 0);



	if (static_key_false(&perf_sched_events.key))

		__perf_event_task_sched_out(prev, next);
@@ -823,6 +835,8 @@ static inline int perf_event_refresh(struct perf_event *event, int refresh) 
static inline void

perf_sw_event(u32 event_id, u64 nr, struct pt_regs *regs, u64 addr)	{ }

static inline void

perf_sw_event_sched(u32 event_id, u64 nr, u64 addr)			{ }

static inline void

perf_bp_event(struct perf_event *event, void *data)			{ }



static inline int perf_register_guest_info_callbacks

include/trace/ftrace.h

+4 −3
Original line number Diff line number Diff line
@@ -763,7 +763,7 @@ perf_trace_##call(void *__data, proto) \ 
	struct ftrace_event_call *event_call = __data;			\

	struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\

	struct ftrace_raw_##call *entry;				\

	struct pt_regs __regs;						\

	struct pt_regs *__regs;						\

	u64 __addr = 0, __count = 1;					\

	struct task_struct *__task = NULL;				\

	struct hlist_head *head;					\
@@ -782,18 +782,19 @@ perf_trace_##call(void *__data, proto) \ 
			     sizeof(u64));				\

	__entry_size -= sizeof(u32);					\

									\

	perf_fetch_caller_regs(&__regs);				\

	entry = perf_trace_buf_prepare(__entry_size,			\

			event_call->event.type, &__regs, &rctx);	\

	if (!entry)							\

		return;							\

									\

	perf_fetch_caller_regs(__regs);					\

									\

	tstruct								\

									\

	{ assign; }							\

									\

	perf_trace_buf_submit(entry, __entry_size, rctx, __addr,	\

		__count, &__regs, head, __task);			\

		__count, __regs, head, __task);				\

}



/*

kernel/events/core.c

+17 −6
Original line number Diff line number Diff line
@@ -5889,6 +5889,8 @@ end: 
	rcu_read_unlock();

}



DEFINE_PER_CPU(struct pt_regs, __perf_regs[4]);



int perf_swevent_get_recursion_context(void)

{

	struct swevent_htable *swhash = this_cpu_ptr(&swevent_htable);
@@ -5904,21 +5906,30 @@ inline void perf_swevent_put_recursion_context(int rctx) 
	put_recursion_context(swhash->recursion, rctx);

}



void __perf_sw_event(u32 event_id, u64 nr, struct pt_regs *regs, u64 addr)

void ___perf_sw_event(u32 event_id, u64 nr, struct pt_regs *regs, u64 addr)

{

	struct perf_sample_data data;

	int rctx;



	preempt_disable_notrace();

	rctx = perf_swevent_get_recursion_context();

	if (rctx < 0)

	if (WARN_ON_ONCE(!regs))

		return;



	perf_sample_data_init(&data, addr, 0);



	do_perf_sw_event(PERF_TYPE_SOFTWARE, event_id, nr, &data, regs);

}



void __perf_sw_event(u32 event_id, u64 nr, struct pt_regs *regs, u64 addr)

{

	int rctx;



	preempt_disable_notrace();

	rctx = perf_swevent_get_recursion_context();

	if (unlikely(rctx < 0))

		goto fail;



	___perf_sw_event(event_id, nr, regs, addr);



	perf_swevent_put_recursion_context(rctx);

fail:

	preempt_enable_notrace();

}

kernel/sched/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1082,7 +1082,7 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu) 
		if (p->sched_class->migrate_task_rq)

			p->sched_class->migrate_task_rq(p, new_cpu);

		p->se.nr_migrations++;

		perf_sw_event(PERF_COUNT_SW_CPU_MIGRATIONS, 1, NULL, 0);

		perf_sw_event_sched(PERF_COUNT_SW_CPU_MIGRATIONS, 1, 0);

	}



	__set_task_cpu(p, new_cpu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE