sched/cputime: Fix omitted ticks passed in parameter
authorFrederic Weisbecker <fweisbec@gmail.com>
Thu, 11 Aug 2016 12:58:24 +0000 (14:58 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 11 Aug 2016 14:34:37 +0000 (16:34 +0200)
Commit:

  f9bcf1e0e014 ("sched/cputime: Fix steal time accounting")

... fixes a leak on steal time accounting but forgets to account
the ticks passed in parameters, assuming there is only one to
take into account.

Let's consider that parameter back.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Acked-by: Wanpeng Li <kernellwp@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Radim <rkrcmar@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Cc: linux-tip-commits@vger.kernel.org
Link: http://lkml.kernel.org/r/20160811125822.GB4214@lerouge
Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/sched/cputime.c

index 8b9bcc5a58faddc51687ec1ee84c17ec6217e2ce..9858266fb0b32b07158b2b9e8f66e7fa2f482eb7 100644 (file)
@@ -509,12 +509,13 @@ void account_process_tick(struct task_struct *p, int user_tick)
 void account_idle_ticks(unsigned long ticks)
 {
        cputime_t cputime, steal;
+
        if (sched_clock_irqtime) {
                irqtime_account_idle_ticks(ticks);
                return;
        }
 
-       cputime = cputime_one_jiffy;
+       cputime = jiffies_to_cputime(ticks);
        steal = steal_account_process_time(cputime);
 
        if (steal >= cputime)