Commit d010b332 authored by Stephane Eranian's avatar Stephane Eranian Committed by Ingo Molnar
Browse files

perf: Add callback to flush branch_stack on context switch 



With branch stack sampling, it is possible to filter by priv levels.

In system-wide mode, that means it is possible to capture only user
level branches. The builtin SW LBR filter needs to disassemble code
based on LBR captured addresses. For that, it needs to know the task
the addresses are associated with. Because of context switches, the
content of the branch stack buffer may contain addresses from
different tasks.

We need a callback on context switch to either flush the branch stack
or save it. This patch adds a new callback in struct pmu which is called
during context switches. The callback is called only when necessary.
That is when a system-wide context has, at least, one event which
uses PERF_SAMPLE_BRANCH_STACK. The callback is never called for
per-thread context.

In this version, the Intel x86 code simply flushes (resets) the LBR
on context switches (fills it with zeroes). Those zeroed branches are
then filtered out by the SW filter.

Signed-off-by: default avatarStephane Eranian <eranian@google.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1328826068-11713-11-git-send-email-eranian@google.com


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 2481c5fa

arch/x86/kernel/cpu/perf_event.c

+14 −7
Original line number Diff line number Diff line
@@ -1671,6 +1671,12 @@ static const struct attribute_group *x86_pmu_attr_groups[] = { 
	NULL,

};



static void x86_pmu_flush_branch_stack(void)

{

	if (x86_pmu.flush_branch_stack)

		x86_pmu.flush_branch_stack();

}



static struct pmu pmu = {

	.pmu_enable		= x86_pmu_enable,

	.pmu_disable		= x86_pmu_disable,
@@ -1690,6 +1696,7 @@ static struct pmu pmu = { 
	.commit_txn	= x86_pmu_commit_txn,



	.event_idx	= x86_pmu_event_idx,

	.flush_branch_stack	= x86_pmu_flush_branch_stack,

};



void perf_update_user_clock(struct perf_event_mmap_page *userpg, u64 now)

arch/x86/kernel/cpu/perf_event.h

+1 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ struct x86_pmu { 
	void		(*cpu_starting)(int cpu);

	void		(*cpu_dying)(int cpu);

	void		(*cpu_dead)(int cpu);

	void		(*flush_branch_stack)(void);



	/*

	 * Intel Arch Perfmon v2+

arch/x86/kernel/cpu/perf_event_intel.c

+13 −0
Original line number Diff line number Diff line
@@ -1539,6 +1539,18 @@ static void intel_pmu_cpu_dying(int cpu) 
	fini_debug_store_on_cpu(cpu);

}



static void intel_pmu_flush_branch_stack(void)

{

	/*

	 * Intel LBR does not tag entries with the

	 * PID of the current task, then we need to

	 * flush it on ctxsw

	 * For now, we simply reset it

	 */

	if (x86_pmu.lbr_nr)

		intel_pmu_lbr_reset();

}



static __initconst const struct x86_pmu intel_pmu = {

	.name			= "Intel",

	.handle_irq		= intel_pmu_handle_irq,
@@ -1566,6 +1578,7 @@ static __initconst const struct x86_pmu intel_pmu = { 
	.cpu_starting		= intel_pmu_cpu_starting,

	.cpu_dying		= intel_pmu_cpu_dying,

	.guest_get_msrs		= intel_guest_get_msrs,

	.flush_branch_stack	= intel_pmu_flush_branch_stack,

};



static __init void intel_clovertown_quirk(void)

include/linux/perf_event.h

+8 −1
Original line number Diff line number Diff line
@@ -746,6 +746,11 @@ struct pmu { 
	 * if no implementation is provided it will default to: event->hw.idx + 1.

	 */

	int (*event_idx)		(struct perf_event *event); /*optional */



	/*

	 * flush branch stack on context-switches (needed in cpu-wide mode)

	 */

	void (*flush_branch_stack)	(void);

};



/**
@@ -979,7 +984,8 @@ struct perf_event_context { 
	u64				parent_gen;

	u64				generation;

	int				pin_count;

	int				nr_cgroups; /* cgroup events present */

	int				nr_cgroups;	 /* cgroup evts */

	int				nr_branch_stack; /* branch_stack evt */

	struct rcu_head			rcu_head;

};
@@ -1044,6 +1050,7 @@ perf_event_create_kernel_counter(struct perf_event_attr *attr, 
extern u64 perf_event_read_value(struct perf_event *event,

				 u64 *enabled, u64 *running);





struct perf_sample_data {

	u64				type;

kernel/events/core.c

+85 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ enum event_type_t { 
 */

struct static_key_deferred perf_sched_events __read_mostly;

static DEFINE_PER_CPU(atomic_t, perf_cgroup_events);

static DEFINE_PER_CPU(atomic_t, perf_branch_stack_events);



static atomic_t nr_mmap_events __read_mostly;

static atomic_t nr_comm_events __read_mostly;
@@ -888,6 +889,9 @@ list_add_event(struct perf_event *event, struct perf_event_context *ctx) 
	if (is_cgroup_event(event))

		ctx->nr_cgroups++;



	if (has_branch_stack(event))

		ctx->nr_branch_stack++;



	list_add_rcu(&event->event_entry, &ctx->event_list);

	if (!ctx->nr_events)

		perf_pmu_rotate_start(ctx->pmu);
@@ -1027,6 +1031,9 @@ list_del_event(struct perf_event *event, struct perf_event_context *ctx) 
			cpuctx->cgrp = NULL;

	}



	if (has_branch_stack(event))

		ctx->nr_branch_stack--;



	ctx->nr_events--;

	if (event->attr.inherit_stat)

		ctx->nr_stat--;
@@ -2201,6 +2208,66 @@ static void perf_event_context_sched_in(struct perf_event_context *ctx, 
	perf_pmu_rotate_start(ctx->pmu);

}



/*

 * When sampling the branck stack in system-wide, it may be necessary

 * to flush the stack on context switch. This happens when the branch

 * stack does not tag its entries with the pid of the current task.

 * Otherwise it becomes impossible to associate a branch entry with a

 * task. This ambiguity is more likely to appear when the branch stack

 * supports priv level filtering and the user sets it to monitor only

 * at the user level (which could be a useful measurement in system-wide

 * mode). In that case, the risk is high of having a branch stack with

 * branch from multiple tasks. Flushing may mean dropping the existing

 * entries or stashing them somewhere in the PMU specific code layer.

 *

 * This function provides the context switch callback to the lower code

 * layer. It is invoked ONLY when there is at least one system-wide context

 * with at least one active event using taken branch sampling.

 */

static void perf_branch_stack_sched_in(struct task_struct *prev,

				       struct task_struct *task)

{

	struct perf_cpu_context *cpuctx;

	struct pmu *pmu;

	unsigned long flags;



	/* no need to flush branch stack if not changing task */

	if (prev == task)

		return;



	local_irq_save(flags);



	rcu_read_lock();



	list_for_each_entry_rcu(pmu, &pmus, entry) {

		cpuctx = this_cpu_ptr(pmu->pmu_cpu_context);



		/*

		 * check if the context has at least one

		 * event using PERF_SAMPLE_BRANCH_STACK

		 */

		if (cpuctx->ctx.nr_branch_stack > 0

		    && pmu->flush_branch_stack) {



			pmu = cpuctx->ctx.pmu;



			perf_ctx_lock(cpuctx, cpuctx->task_ctx);



			perf_pmu_disable(pmu);



			pmu->flush_branch_stack();



			perf_pmu_enable(pmu);



			perf_ctx_unlock(cpuctx, cpuctx->task_ctx);

		}

	}



	rcu_read_unlock();



	local_irq_restore(flags);

}



/*

 * Called from scheduler to add the events of the current task

 * with interrupts disabled.
@@ -2232,6 +2299,10 @@ void __perf_event_task_sched_in(struct task_struct *prev, 
	 */

	if (atomic_read(&__get_cpu_var(perf_cgroup_events)))

		perf_cgroup_sched_in(prev, task);



	/* check for system-wide branch_stack events */

	if (atomic_read(&__get_cpu_var(perf_branch_stack_events)))

		perf_branch_stack_sched_in(prev, task);

}



static u64 perf_calculate_period(struct perf_event *event, u64 nsec, u64 count)
@@ -2798,6 +2869,14 @@ static void free_event(struct perf_event *event) 
			atomic_dec(&per_cpu(perf_cgroup_events, event->cpu));

			static_key_slow_dec_deferred(&perf_sched_events);

		}



		if (has_branch_stack(event)) {

			static_key_slow_dec_deferred(&perf_sched_events);

			/* is system-wide event */

			if (!(event->attach_state & PERF_ATTACH_TASK))

				atomic_dec(&per_cpu(perf_branch_stack_events,

						    event->cpu));

		}

	}



	if (event->rb) {
@@ -5924,6 +6003,12 @@ done: 
				return ERR_PTR(err);

			}

		}

		if (has_branch_stack(event)) {

			static_key_slow_inc(&perf_sched_events.key);

			if (!(event->attach_state & PERF_ATTACH_TASK))

				atomic_inc(&per_cpu(perf_branch_stack_events,

						    event->cpu));

		}

	}



	return event;

CRA Git | Maintained and supported by SUSTech CRA and CCSE