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

vtime: Remove the underscore prefix invasion 



Prepending irq-unsafe vtime APIs with underscores was actually
a bad idea as the result is a big mess in the API namespace that
is even waiting to be further extended. Also these helpers
are always called from irq safe callers except kvm. Just
provide a vtime_account_system_irqsafe() for this specific
case so that we can remove the underscore prefix on other
vtime functions.

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 38ca9c92

arch/ia64/kernel/time.c

+4 −4
Original line number Diff line number Diff line
@@ -106,9 +106,9 @@ void vtime_task_switch(struct task_struct *prev) 
	struct thread_info *ni = task_thread_info(current);



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

		__vtime_account_system(prev);

		vtime_account_system(prev);

	else

		__vtime_account_idle(prev);

		vtime_account_idle(prev);



	vtime_account_user(prev);
@@ -135,14 +135,14 @@ static cputime_t vtime_delta(struct task_struct *tsk) 
	return delta_stime;

}



void __vtime_account_system(struct task_struct *tsk)

void vtime_account_system(struct task_struct *tsk)

{

	cputime_t delta = vtime_delta(tsk);



	account_system_time(tsk, 0, delta, delta);

}



void __vtime_account_idle(struct task_struct *tsk)

void vtime_account_idle(struct task_struct *tsk)

{

	account_idle_time(vtime_delta(tsk));

}

arch/powerpc/kernel/time.c

+2 −2
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static u64 vtime_delta(struct task_struct *tsk, 
	return delta;

}



void __vtime_account_system(struct task_struct *tsk)

void vtime_account_system(struct task_struct *tsk)

{

	u64 delta, sys_scaled, stolen;
@@ -346,7 +346,7 @@ void __vtime_account_system(struct task_struct *tsk) 
		account_steal_time(stolen);

}



void __vtime_account_idle(struct task_struct *tsk)

void vtime_account_idle(struct task_struct *tsk)

{

	u64 delta, sys_scaled, stolen;

arch/s390/kernel/vtime.c

+2 −2
Original line number Diff line number Diff line
@@ -140,9 +140,9 @@ void vtime_account(struct task_struct *tsk) 
}

EXPORT_SYMBOL_GPL(vtime_account);



void __vtime_account_system(struct task_struct *tsk)

void vtime_account_system(struct task_struct *tsk)

__attribute__((alias("vtime_account")));

EXPORT_SYMBOL_GPL(__vtime_account_system);

EXPORT_SYMBOL_GPL(vtime_account_system);



void __kprobes vtime_stop_cpu(void)

{

include/linux/kvm_host.h

+2 −2
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ static inline void kvm_guest_enter(void) 
	 * This is running in ioctl context so we can avoid

	 * the call to vtime_account() with its unnecessary idle check.

	 */

	vtime_account_system(current);

	vtime_account_system_irqsafe(current);

	current->flags |= PF_VCPU;

	/* KVM does not hold any references to rcu protected data when it

	 * switches CPU into a guest mode. In fact switching to a guest mode
@@ -759,7 +759,7 @@ static inline void kvm_guest_exit(void) 
	 * This is running in ioctl context so we can avoid

	 * the call to vtime_account() with its unnecessary idle check.

	 */

	vtime_account_system(current);

	vtime_account_system_irqsafe(current);

	current->flags &= ~PF_VCPU;

}

include/linux/vtime.h

+4 −4
Original line number Diff line number Diff line
@@ -5,14 +5,14 @@ struct task_struct; 


#ifdef CONFIG_VIRT_CPU_ACCOUNTING

extern void vtime_task_switch(struct task_struct *prev);

extern void __vtime_account_system(struct task_struct *tsk);

extern void vtime_account_system(struct task_struct *tsk);

extern void __vtime_account_idle(struct task_struct *tsk);

extern void vtime_account_system_irqsafe(struct task_struct *tsk);

extern void vtime_account_idle(struct task_struct *tsk);

extern void vtime_account(struct task_struct *tsk);

#else

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_system(struct task_struct *tsk) { }

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

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

#endif
@@ -40,7 +40,7 @@ static inline void vtime_account_irq_enter(struct task_struct *tsk) 
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);

	vtime_account_system(tsk);

	irqtime_account_irq(tsk);

}