]> git.karo-electronics.de Git - linux-beck.git/commitdiff
perf_counter: Fix counter inheritance
authorPeter Zijlstra <a.p.zijlstra@chello.nl>
Fri, 15 May 2009 18:45:59 +0000 (20:45 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 17 May 2009 05:52:24 +0000 (07:52 +0200)
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@in.ibm.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/exit.c

index 4741376c8decc439c6133007536211667b8b4bb5..16d74f13a3e799c71a644aa594b45194fcdaad3f 100644 (file)
@@ -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);
 
        /*