aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/perf_event.c
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-03-15 14:37:10 +0100
committerIngo Molnar <mingo@elte.hu>2011-03-16 14:04:14 +0100
commit38b435b16c36b0d863efcf3f07b34a6fac9873fd (patch)
tree017a36f9883767175f8018f43fac937a9fc22a24 /kernel/perf_event.c
parentee643c4179c3a18b018de3a4c07a7bb3a75c8e4e (diff)
downloadkernel_samsung_espresso10-38b435b16c36b0d863efcf3f07b34a6fac9873fd.zip
kernel_samsung_espresso10-38b435b16c36b0d863efcf3f07b34a6fac9873fd.tar.gz
kernel_samsung_espresso10-38b435b16c36b0d863efcf3f07b34a6fac9873fd.tar.bz2
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 <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>
Diffstat (limited to 'kernel/perf_event.c')
-rw-r--r--kernel/perf_event.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 533f715..3472bb1 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -6722,17 +6722,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_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);
}