Commit fb8b049c authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

sched/cputime: Push time to account_system_time() in nsecs 



This is one more step toward converting cputime accounting to pure nsecs.

Signed-off-by: default avatarFrederic 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-25-git-send-email-fweisbec@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 18b43a9b

arch/ia64/kernel/time.c

+6 −5
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/timex.h>

#include <linux/timekeeper_internal.h>

#include <linux/platform_device.h>

#include <linux/cputime.h>



#include <asm/machvec.h>

#include <asm/delay.h>
@@ -64,29 +65,29 @@ extern cputime_t cycle_to_cputime(u64 cyc); 
void vtime_flush(struct task_struct *tsk)

{

	struct thread_info *ti = task_thread_info(tsk);

	cputime_t delta;

	u64 delta;



	if (ti->utime)

		account_user_time(tsk, cputime_to_nsecs(cycle_to_cputime(ti->utime)));



	if (ti->gtime)

		account_guest_time(tsk, cycle_to_cputime(ti->gtime));

		account_guest_time(tsk, cputime_to_nsecs(cycle_to_cputime(ti->gtime)));



	if (ti->idle_time)

		account_idle_time(cputime_to_nsecs(cycle_to_cputime(ti->idle_time)));



	if (ti->stime) {

		delta = cycle_to_cputime(ti->stime);

		delta = cputime_to_nsecs(cycle_to_cputime(ti->stime));

		account_system_index_time(tsk, delta, CPUTIME_SYSTEM);

	}



	if (ti->hardirq_time) {

		delta = cycle_to_cputime(ti->hardirq_time);

		delta = cputime_to_nsecs(cycle_to_cputime(ti->hardirq_time));

		account_system_index_time(tsk, delta, CPUTIME_IRQ);

	}



	if (ti->softirq_time) {

		delta = cycle_to_cputime(ti->softirq_time);

		delta = cputime_to_nsecs(cycle_to_cputime(ti->softirq_time));

		account_system_index_time(tsk, delta, CPUTIME_SOFTIRQ);

	}

arch/powerpc/kernel/time.c

+8 −7
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#include <linux/clk-provider.h>

#include <linux/suspend.h>

#include <linux/rtc.h>

#include <linux/cputime.h>

#include <asm/trace.h>



#include <asm/io.h>
@@ -72,7 +73,6 @@ 
#include <asm/smp.h>

#include <asm/vdso_datapage.h>

#include <asm/firmware.h>

#include <asm/cputime.h>

#include <asm/asm-prototypes.h>



/* powerpc clocksource/clockevent code */
@@ -399,7 +399,7 @@ void vtime_flush(struct task_struct *tsk) 
		tsk->utimescaled += cputime_to_nsecs(acct->utime_scaled);



	if (acct->gtime)

		account_guest_time(tsk, acct->gtime);

		account_guest_time(tsk, cputime_to_nsecs(acct->gtime));



	if (acct->steal_time)

		account_steal_time(cputime_to_nsecs(acct->steal_time));
@@ -408,16 +408,17 @@ void vtime_flush(struct task_struct *tsk) 
		account_idle_time(cputime_to_nsecs(acct->idle_time));



	if (acct->stime)

		account_system_index_time(tsk, acct->stime, CPUTIME_SYSTEM);



		account_system_index_time(tsk, cputime_to_nsecs(acct->stime),

					  CPUTIME_SYSTEM);

	if (acct->stime_scaled)

		tsk->stimescaled += cputime_to_nsecs(acct->stime_scaled);



	if (acct->hardirq_time)

		account_system_index_time(tsk, acct->hardirq_time, CPUTIME_IRQ);



		account_system_index_time(tsk, cputime_to_nsecs(acct->hardirq_time),

					  CPUTIME_IRQ);

	if (acct->softirq_time)

		account_system_index_time(tsk, acct->softirq_time, CPUTIME_SOFTIRQ);

		account_system_index_time(tsk, cputime_to_nsecs(acct->softirq_time),

					  CPUTIME_SOFTIRQ);



	acct->utime = 0;

	acct->utime_scaled = 0;

arch/s390/kernel/idle.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <linux/notifier.h>

#include <linux/init.h>

#include <linux/cpu.h>

#include <asm/cputime.h>

#include <linux/cputime.h>

#include <asm/nmi.h>

#include <asm/smp.h>

#include "entry.h"

arch/s390/kernel/vtime.c

+3 −3
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ 
 */



#include <linux/kernel_stat.h>

#include <linux/cputime.h>

#include <linux/export.h>

#include <linux/kernel.h>

#include <linux/timex.h>

#include <linux/types.h>

#include <linux/time.h>



#include <asm/cputime.h>

#include <asm/vtimer.h>

#include <asm/vtime.h>

#include <asm/cpu_mf.h>
@@ -115,7 +115,7 @@ static void account_system_index_scaled(struct task_struct *p, 
					enum cpu_usage_stat index)

{

	p->stimescaled += cputime_to_nsecs(scaled);

	account_system_index_time(p, cputime, index);

	account_system_index_time(p, cputime_to_nsecs(cputime), index);

}



/*
@@ -171,7 +171,7 @@ static int do_account_vtime(struct task_struct *tsk) 
	}



	if (guest) {

		account_guest_time(tsk, guest);

		account_guest_time(tsk, cputime_to_nsecs(guest));

		tsk->utimescaled += cputime_to_nsecs(scale_vtime(guest));

	}

include/linux/kernel_stat.h

+3 −4
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <linux/sched.h>

#include <linux/vtime.h>

#include <asm/irq.h>

#include <linux/cputime.h>



/*

 * 'kernel_stat.h' contains the definitions needed for doing
@@ -79,9 +78,9 @@ static inline unsigned int kstat_cpu_irqs_sum(unsigned int cpu) 
}



extern void account_user_time(struct task_struct *, u64);

extern void account_guest_time(struct task_struct *, cputime_t);

extern void account_system_time(struct task_struct *, int, cputime_t);

extern void account_system_index_time(struct task_struct *, cputime_t,

extern void account_guest_time(struct task_struct *, u64);

extern void account_system_time(struct task_struct *, int, u64);

extern void account_system_index_time(struct task_struct *, u64,

				      enum cpu_usage_stat);

extern void account_steal_time(u64);

extern void account_idle_time(u64);

CRA Git | Maintained and supported by SUSTech CRA and CCSE