Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3942ba0 authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

vtime: Consolidate a bit the ctx switch code 



On ia64 and powerpc, vtime context switch only consists
in flushing system and user pending time, plus a few
arch housekeeping.

Consolidate that into a generic implementation. s390 is
a special case because pending user and system time accounting
there is hard to dissociate. So it's keeping its own implementation.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Reviewed-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
parent bcebdf84

arch/ia64/include/asm/cputime.h

+2 −0
Original line number Diff line number Diff line
@@ -103,5 +103,7 @@ static inline void cputime_to_timeval(const cputime_t ct, struct timeval *val) 
#define cputime64_to_clock_t(__ct)	\

	cputime_to_clock_t((__force cputime_t)__ct)



extern void arch_vtime_task_switch(struct task_struct *tsk);



#endif /* CONFIG_VIRT_CPU_ACCOUNTING */

#endif /* __IA64_CPUTIME_H */

arch/ia64/kernel/time.c

+1 −8
Original line number Diff line number Diff line
@@ -100,18 +100,11 @@ void vtime_account_user(struct task_struct *tsk) 
 * accumulated times to the current process, and to prepare accounting on

 * the next process.

 */

void vtime_task_switch(struct task_struct *prev)

void arch_vtime_task_switch(struct task_struct *prev)

{

	struct thread_info *pi = task_thread_info(prev);

	struct thread_info *ni = task_thread_info(current);



	if (idle_task(smp_processor_id()) != prev)

		vtime_account_system(prev);

	else

		vtime_account_idle(prev);



	vtime_account_user(prev);



	pi->ac_stamp = ni->ac_stamp;

	ni->ac_stime = ni->ac_utime = 0;

}

arch/powerpc/include/asm/cputime.h

+2 −0
Original line number Diff line number Diff line
@@ -228,6 +228,8 @@ static inline cputime_t clock_t_to_cputime(const unsigned long clk) 


#define cputime64_to_clock_t(ct)	cputime_to_clock_t((cputime_t)(ct))



static inline void arch_vtime_task_switch(struct task_struct *tsk) { }



#endif /* __KERNEL__ */

#endif /* CONFIG_VIRT_CPU_ACCOUNTING */

#endif /* __POWERPC_CPUTIME_H */

arch/powerpc/kernel/time.c

+0 −6
Original line number Diff line number Diff line
@@ -375,12 +375,6 @@ void vtime_account_user(struct task_struct *tsk) 
	account_user_time(tsk, utime, utimescaled);

}



void vtime_task_switch(struct task_struct *prev)

{

	vtime_account(prev);

	vtime_account_user(prev);

}



#else /* ! CONFIG_VIRT_CPU_ACCOUNTING */

#define calc_cputime_factors()

#endif

arch/s390/include/asm/cputime.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 




#define __ARCH_HAS_VTIME_ACCOUNT

#define __ARCH_HAS_VTIME_TASK_SWITCH



/* We want to use full resolution of the CPU timer: 2**-12 micro-seconds. */