sched/cputime: Fix cpu_timer_sample_group() double accounting
authorPeter Zijlstra <peterz@infradead.org>
Wed, 12 Nov 2014 11:37:37 +0000 (12:37 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 16 Nov 2014 09:04:18 +0000 (10:04 +0100)
commit23cfa361f3e54a3e184a5e126bbbdd95f984881a
tree05586994df46de68033653c1180f081ed45ae0be
parent7af683350cb0ddd0e9d3819b4eb7abe9e2d3e709
sched/cputime: Fix cpu_timer_sample_group() double accounting

While looking over the cpu-timer code I found that we appear to add
the delta for the calling task twice, through:

  cpu_timer_sample_group()
    thread_group_cputimer()
      thread_group_cputime()
        times->sum_exec_runtime += task_sched_runtime();

    *sample = cputime.sum_exec_runtime + task_delta_exec();

Which would make the sample run ahead, making the sleep short.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Tejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/20141112113737.GI10476@twins.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
include/linux/kernel_stat.h
kernel/sched/core.c
kernel/time/posix-cpu-timers.c