On Fri, 2011-03-18 at 15:27 -0700, [email protected] wrote: > > The patch below does not apply to the .38-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to <[email protected]>.
Sorry for the delay, fell ill. > ------------------ original commit in Linus's tree ------------------ > > From 38b435b16c36b0d863efcf3f07b34a6fac9873fd Mon Sep 17 00:00:00 2001 > From: Peter Zijlstra <[email protected]> > Date: Tue, 15 Mar 2011 14:37:10 +0100 > Subject: [PATCH] perf: Fix tear-down of inherited group events > > 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 <[email protected]> > Signed-off-by: Peter Zijlstra <[email protected]> > Cc: <[email protected]> # .35+ > LKML-Reference: <1300196470.2203.61.camel@twins> > Signed-off-by: Ingo Molnar <[email protected]> --- Index: linux-2.6/kernel/perf_event.c =================================================================== --- linux-2.6.orig/kernel/perf_event.c +++ linux-2.6/kernel/perf_event.c @@ -6115,17 +6115,20 @@ __perf_event_exit_task(struct perf_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); } _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
