GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-04-02 20:33:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

perf: Fix tear-down of inherited group events

Browse source 
When destroying inherited events, we need to destroy groups too,
otherwise the event iteration in perf_event_exit_task_context() will
miss group siblings and we leak events with all the consequences.

Reported-and-tested-by: Vince Weaver <vweaver1@eecs.utk.edu>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: <stable@kernel.org> # .35+
LKML-Reference: <1300196470.2203.61.camel@twins>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra 2011-03-15 14:37:10 +01:00 • committed by Ingo Molnar
parent ee643c4179
commit 38b435b16c
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
kernel/perf_event.c
View file

@ -6722,17 +6722,20 @@ __perf_event_exit_task(struct perf_event *child_event,
struct perf_event_context *child_ctx, struct perf_event_context *child_ctx,
struct task_struct *child) struct task_struct *child)
{ {
struct perf_event *parent_event; if (child_event->parent) {
raw_spin_lock_irq(&child_ctx->lock);
perf_group_detach(child_event);
raw_spin_unlock_irq(&child_ctx->lock);
}
perf_remove_from_context(child_event); perf_remove_from_context(child_event);
parent_event = child_event->parent;
/* /*
* It can happen that parent exits first, and has events * It can happen that the parent exits first, and has events
* that are still around due to the child reference. These * that are still around due to the child reference. These
* events need to be zapped - but otherwise linger. * events need to be zapped.
*/ */
if (parent_event) { if (child_event->parent) {
sync_child_event(child_event, child); sync_child_event(child_event, child);
free_event(child_event); free_event(child_event);
} }