diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2011-03-15 14:37:10 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-27 11:36:35 -0700 |
| commit | 144a4ea712041e818df28a2bea81431143164da8 (patch) | |
| tree | 1eedc1d72ba3f611206d7fadb80faa11a4c962d0 | |
| parent | 0b62527f8258ce04782469e4521b43d4dd5fc5f0 (diff) | |
perf: Fix tear-down of inherited group events
commit 38b435b16c36b0d863efcf3f07b34a6fac9873fd upstream.
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>
LKML-Reference: <1300196470.2203.61.camel@twins>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | kernel/perf_event.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index b22a2ef75c8..ad02feadb6b 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -6115,17 +6115,20 @@ __perf_event_exit_task(struct perf_event *child_event, struct perf_event_context *child_ctx, 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_event_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 - * 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); free_event(child_event); } |