diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2012-04-11 11:54:13 +1000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-02-23 03:51:04 +0000 |
| commit | 5cc2ccd8af44dec092919615262b7dbe5850dcbb (patch) | |
| tree | d8db342e0f0699e03b45029a2c3b6b68b1c1c5c5 /kernel | |
| parent | 72bc3e471e03421dd6e1dd71762b3208af8e02a5 (diff) | |
perf: Fix perf_event_for_each() to use sibling
commit 724b6daa13e100067c30cfc4d1ad06629609dc4e upstream.
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 75f937f24bd9 ("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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 8141883163e5..6fb4a3649433 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -3326,7 +3326,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); } |