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

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

sched/cputime: Rename vtime_account_user() to vtime_flush() 



CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y used to accumulate user time and
account it on ticks and context switches only through the
vtime_account_user() function.

Now this model has been generalized on the 3 archs for all kind of
cputime (system, irq, ...) and all the cputime flushing happens under
vtime_account_user().

So let's rename this function to better reflect its new role.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
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: Tony Luck <tony.luck@intel.com>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>
Link: http://lkml.kernel.org/r/1483636310-6557-11-git-send-email-fweisbec@gmail.com


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

arch/ia64/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static struct clocksource *itc_clocksource; 


extern cputime_t cycle_to_cputime(u64 cyc);



void vtime_account_user(struct task_struct *tsk)

void vtime_flush(struct task_struct *tsk)

{

	struct thread_info *ti = task_thread_info(tsk);

	cputime_t delta;

arch/powerpc/kernel/time.c

+2 −4
Original line number Diff line number Diff line
@@ -382,15 +382,13 @@ void vtime_account_idle(struct task_struct *tsk) 
}



/*

 * Transfer the user time accumulated in the paca

 * by the exception entry and exit code to the generic

 * process user time records.

 * Account the whole cputime accumulated in the paca

 * Must be called with interrupts disabled.

 * Assumes that vtime_account_system/idle() has been called

 * recently (i.e. since the last entry from usermode) so that

 * get_paca()->user_time_scaled is up to date.

 */

void vtime_account_user(struct task_struct *tsk)

void vtime_flush(struct task_struct *tsk)

{

	struct cpu_accounting_data *acct = get_accounting(tsk);

arch/s390/kernel/vtime.c

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ void vtime_task_switch(struct task_struct *prev) 
 * accounting system time in order to correctly compute

 * the stolen time accounting.

 */

void vtime_account_user(struct task_struct *tsk)

void vtime_flush(struct task_struct *tsk)

{

	if (do_account_vtime(tsk))

		virt_timer_expire();

include/linux/kernel_stat.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ extern void account_idle_time(cputime_t); 
#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE

static inline void account_process_tick(struct task_struct *tsk, int user)

{

	vtime_account_user(tsk);

	vtime_flush(tsk);

}

#else

extern void account_process_tick(struct task_struct *, int user);

include/linux/vtime.h

+5 −2
Original line number Diff line number Diff line
@@ -58,27 +58,28 @@ static inline void vtime_task_switch(struct task_struct *prev) 


extern void vtime_account_system(struct task_struct *tsk);

extern void vtime_account_idle(struct task_struct *tsk);

extern void vtime_account_user(struct task_struct *tsk);



#else /* !CONFIG_VIRT_CPU_ACCOUNTING */



static inline void vtime_task_switch(struct task_struct *prev) { }

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

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

#endif /* !CONFIG_VIRT_CPU_ACCOUNTING */



#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN

extern void arch_vtime_task_switch(struct task_struct *tsk);

extern void vtime_account_user(struct task_struct *tsk);

extern void vtime_user_enter(struct task_struct *tsk);



static inline void vtime_user_exit(struct task_struct *tsk)

{

	vtime_account_user(tsk);

}



extern void vtime_guest_enter(struct task_struct *tsk);

extern void vtime_guest_exit(struct task_struct *tsk);

extern void vtime_init_idle(struct task_struct *tsk, int cpu);

#else /* !CONFIG_VIRT_CPU_ACCOUNTING_GEN  */

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

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

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

static inline void vtime_guest_enter(struct task_struct *tsk) { }
@@ -93,9 +94,11 @@ static inline void vtime_account_irq_exit(struct task_struct *tsk) 
	/* On hard|softirq exit we always account to hard|softirq cputime */

	vtime_account_system(tsk);

}

extern void vtime_flush(struct task_struct *tsk);

#else /* !CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */

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

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

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

#endif