Commit 3f005e7d authored Jul 26, 2016 by Mark Rutland Committed by Ingo Molnar Aug 10, 2016

perf/core: Sched out groups atomically



Groups of events are supposed to be scheduled atomically, such that it
is possible to derive meaningful ratios between their values.

We take great pains to achieve this when scheduling event groups to a
PMU in group_sched_in(), calling {start,commit}_txn() (which fall back
to perf_pmu_{disable,enable}() if necessary) to provide this guarantee.
However we don't mirror this in group_sched_out(), and in some cases
events will not be scheduled out atomically.

For example, if we disable an event group with PERF_EVENT_IOC_DISABLE,
we'll cross-call __perf_event_disable() for the group leader, and will
call group_sched_out() without having first disabled the relevant PMU.
We will disable/enable the PMU around each pmu->del() call, but between
each call the PMU will be enabled and events may count.

Avoid this by explicitly disabling and enabling the PMU around event
removal in group_sched_out(), mirroring what we do in group_sched_in().

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.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>
Link: http://lkml.kernel.org/r/1469553141-28314-1-git-send-email-mark.rutland@arm.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent db4a8356

kernel/events/core.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1796,6 +1796,8 @@ group_sched_out(struct perf_event *group_event,
	struct perf_event *event;		struct perf_event *event;
	int state = group_event->state;		int state = group_event->state;

			perf_pmu_disable(ctx->pmu);

	event_sched_out(group_event, cpuctx, ctx);		event_sched_out(group_event, cpuctx, ctx);

	/*		/*
	@@ -1804,6 +1806,8 @@ group_sched_out(struct perf_event *group_event,
	list_for_each_entry(event, &group_event->sibling_list, group_entry)		list_for_each_entry(event, &group_event->sibling_list, group_entry)
	event_sched_out(event, cpuctx, ctx);		event_sched_out(event, cpuctx, ctx);

			perf_pmu_enable(ctx->pmu);

	if (state == PERF_EVENT_STATE_ACTIVE && group_event->attr.exclusive)		if (state == PERF_EVENT_STATE_ACTIVE && group_event->attr.exclusive)
	cpuctx->exclusive = 0;		cpuctx->exclusive = 0;
	}		}

Admin message