From: Peter Zijlstra Date: Tue, 15 Mar 2011 13:37:10 +0000 (+0100) Subject: perf: Fix tear-down of inherited group events X-Git-Tag: v2.6.34.14~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebc8f5c86a76386df6ca4e335f6f504e218eead4;p=thirdparty%2Fkernel%2Fstable.git 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 Signed-off-by: Peter Zijlstra LKML-Reference: <1300196470.2203.61.camel@twins> Signed-off-by: Ingo Molnar Signed-off-by: Paul Gortmaker --- diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 0e4499e9b751f..30e164e21177e 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -5196,17 +5196,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); }