You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
sched/cputime: Push time to account_idle_time() in nsecs
This is one more step toward converting cputime accounting to pure nsecs. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rik van Riel <riel@redhat.com> Cc: Stanislaw Gruszka <sgruszka@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: Wanpeng Li <wanpeng.li@hotmail.com> Link: http://lkml.kernel.org/r/1485832191-26889-24-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
committed by
Ingo Molnar
parent
be9095ed4f
commit
18b43a9bd7
@@ -218,15 +218,15 @@ void account_steal_time(u64 cputime)
|
||||
* Account for idle time.
|
||||
* @cputime: the cpu time spent in idle wait
|
||||
*/
|
||||
void account_idle_time(cputime_t cputime)
|
||||
void account_idle_time(u64 cputime)
|
||||
{
|
||||
u64 *cpustat = kcpustat_this_cpu->cpustat;
|
||||
struct rq *rq = this_rq();
|
||||
|
||||
if (atomic_read(&rq->nr_iowait) > 0)
|
||||
cpustat[CPUTIME_IOWAIT] += cputime_to_nsecs(cputime);
|
||||
cpustat[CPUTIME_IOWAIT] += cputime;
|
||||
else
|
||||
cpustat[CPUTIME_IDLE] += cputime_to_nsecs(cputime);
|
||||
cpustat[CPUTIME_IDLE] += cputime;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -392,7 +392,7 @@ static void irqtime_account_process_tick(struct task_struct *p, int user_tick,
|
||||
} else if (user_tick) {
|
||||
account_user_time(p, cputime);
|
||||
} else if (p == rq->idle) {
|
||||
account_idle_time(old_cputime);
|
||||
account_idle_time(cputime);
|
||||
} else if (p->flags & PF_VCPU) { /* System time or guest time */
|
||||
|
||||
account_guest_time(p, old_cputime);
|
||||
@@ -504,7 +504,7 @@ void account_process_tick(struct task_struct *p, int user_tick)
|
||||
else if ((p != rq->idle) || (irq_count() != HARDIRQ_OFFSET))
|
||||
account_system_time(p, HARDIRQ_OFFSET, old_cputime);
|
||||
else
|
||||
account_idle_time(old_cputime);
|
||||
account_idle_time(cputime);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -513,15 +513,15 @@ void account_process_tick(struct task_struct *p, int user_tick)
|
||||
*/
|
||||
void account_idle_ticks(unsigned long ticks)
|
||||
{
|
||||
cputime_t cputime, steal;
|
||||
u64 cputime, steal;
|
||||
|
||||
if (sched_clock_irqtime) {
|
||||
irqtime_account_idle_ticks(ticks);
|
||||
return;
|
||||
}
|
||||
|
||||
cputime = jiffies_to_cputime(ticks);
|
||||
steal = steal_account_process_time(ULONG_MAX);
|
||||
cputime = ticks * TICK_NSEC;
|
||||
steal = cputime_to_nsecs(steal_account_process_time(ULONG_MAX));
|
||||
|
||||
if (steal >= cputime)
|
||||
return;
|
||||
@@ -787,7 +787,7 @@ void vtime_account_idle(struct task_struct *tsk)
|
||||
{
|
||||
cputime_t delta_cpu = get_vtime_delta(tsk);
|
||||
|
||||
account_idle_time(delta_cpu);
|
||||
account_idle_time(cputime_to_nsecs(delta_cpu));
|
||||
}
|
||||
|
||||
void arch_vtime_task_switch(struct task_struct *prev)
|
||||
|
||||
Reference in New Issue
Block a user