Commit-ID: 856d56b9e5de650a64a6c41c17aaed702b55d578
Gitweb: http://git.kernel.org/tip/856d56b9e5de650a64a6c41c17aaed702b55d578
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
AuthorDate: Fri, 15 May 2009 20:45:59 +0200
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Sun, 17 May 2009 07:52:24 +0200
perf_counter: Fix counter inheritance
Srivatsa Vaddagiri reported that a Java workload triggers this
warning in kernel/exit.c:
WARN_ON_ONCE(!list_empty(&tsk->perf_counter_ctx.counter_list));
Add the inherited counter propagation on self-detach, this could
cause counter leaks and incomplete stats in threaded code like
the below:
#include <pthread.h>
#include <unistd.h>
void *thread(void *arg)
{
sleep(5);
return NULL;
}
void main(void)
{
pthread_t thr;
pthread_create(&thr, NULL, thread, NULL);
}
Reported-by: Srivatsa Vaddagiri <vatsa@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Corey Ashford <cjashfor@xxxxxxxxxxxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Marcelo Tosatti <mtosatti@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
kernel/exit.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/kernel/exit.c b/kernel/exit.c
index 4741376..16d74f1 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -128,6 +128,12 @@ static void __exit_signal(struct task_struct *tsk)
sig = NULL; /* Marker for below. */
}
+ /*
+ * Flush inherited counters to the parent - before the parent
+ * gets woken up by child-exit notifications.
+ */
+ perf_counter_exit_task(tsk);
+
__unhash_process(tsk);
/*
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|