Commit 724b6daa authored Apr 11, 2012 by Michael Ellerman Committed by Ingo Molnar Apr 26, 2012

perf: Fix perf_event_for_each() to use sibling



In perf_event_for_each() we call a function on an event, and then
iterate over the siblings of the event.

However we don't call the function on the siblings, we call it
repeatedly on the original event - it seems "obvious" that we should
be calling it with sibling as the argument.

It looks like this broke in commit 75f937f2 ("Fix ctx->mutex
vs counter->mutex inversion").

The only effect of the bug is that the PERF_IOC_FLAG_GROUP parameter
to the ioctls doesn't work.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1334109253-31329-1-git-send-email-michael@ellerman.id.au


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

parent c716ef56

kernel/events/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3183,7 +3183,7 @@ static void perf_event_for_each(struct perf_event *event,
		perf_event_for_each_child(event, func);
		func(event);
		list_for_each_entry(sibling, &event->sibling_list, group_entry)
		perf_event_for_each_child(event, func);
		perf_event_for_each_child(sibling, func);
		mutex_unlock(&ctx->mutex);
		}

Admin message