hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Frederic Weisbecker <fweisbec@gmail.com>
Reviewed-by: Steven 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>
This commit is contained in:
Frederic Weisbecker 2012-11-13 18:21:22 +01:00
parent 38ca9c927c
commit fd25b4c2f2
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/ia64/kernel/time.c
View File

@ -106,9 +106,9 @@ void vtime_task_switch(struct task_struct *prev)
struct thread_info *ni = task_thread_info(current); struct thread_info *ni = task_thread_info(current);
if (idle_task(smp_processor_id()) != prev) if (idle_task(smp_processor_id()) != prev)
__vtime_account_system(prev); vtime_account_system(prev);
else else
__vtime_account_idle(prev); vtime_account_idle(prev);
vtime_account_user(prev); vtime_account_user(prev);
@ -135,14 +135,14 @@ static cputime_t vtime_delta(struct task_struct *tsk)
return delta_stime; 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); cputime_t delta = vtime_delta(tsk);
account_system_time(tsk, 0, delta, delta); 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)); account_idle_time(vtime_delta(tsk));
} }

4
arch/powerpc/kernel/time.c
View File

@ -336,7 +336,7 @@ static u64 vtime_delta(struct task_struct *tsk,
return delta; return delta;
} }
void __vtime_account_system(struct task_struct *tsk) void vtime_account_system(struct task_struct *tsk)
{ {
u64 delta, sys_scaled, stolen; u64 delta, sys_scaled, stolen;
@ -346,7 +346,7 @@ void __vtime_account_system(struct task_struct *tsk)
account_steal_time(stolen); 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; u64 delta, sys_scaled, stolen;

4
arch/s390/kernel/vtime.c
View File

@ -140,9 +140,9 @@ void vtime_account(struct task_struct *tsk)
} }
EXPORT_SYMBOL_GPL(vtime_account); 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"))); __attribute__((alias("vtime_account")));
EXPORT_SYMBOL_GPL(__vtime_account_system); EXPORT_SYMBOL_GPL(vtime_account_system);
void __kprobes vtime_stop_cpu(void) void __kprobes vtime_stop_cpu(void)
{ {

4
include/linux/kvm_host.h
View File

@ -741,7 +741,7 @@ static inline void kvm_guest_enter(void)
* This is running in ioctl context so we can avoid * This is running in ioctl context so we can avoid
* the call to vtime_account() with its unnecessary idle check. * the call to vtime_account() with its unnecessary idle check.
*/ */
vtime_account_system(current); vtime_account_system_irqsafe(current);
current->flags |= PF_VCPU; current->flags |= PF_VCPU;
/* KVM does not hold any references to rcu protected data when it /* 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 * 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 * This is running in ioctl context so we can avoid
* the call to vtime_account() with its unnecessary idle check. * the call to vtime_account() with its unnecessary idle check.
*/ */
vtime_account_system(current); vtime_account_system_irqsafe(current);
current->flags &= ~PF_VCPU; current->flags &= ~PF_VCPU;
} }

8
include/linux/vtime.h
View File

@ -5,14 +5,14 @@ struct task_struct;
#ifdef CONFIG_VIRT_CPU_ACCOUNTING #ifdef CONFIG_VIRT_CPU_ACCOUNTING
extern void vtime_task_switch(struct task_struct *prev); 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_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); extern void vtime_account(struct task_struct *tsk);
#else #else
static inline void vtime_task_switch(struct task_struct *prev) { } 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(struct task_struct *tsk) { }
static inline void vtime_account_system_irqsafe(struct task_struct *tsk) { }
static inline void vtime_account(struct task_struct *tsk) { } static inline void vtime_account(struct task_struct *tsk) { }
#endif #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) static inline void vtime_account_irq_exit(struct task_struct *tsk)
{ {
/* On hard|softirq exit we always account to hard|softirq cputime */ /* On hard|softirq exit we always account to hard|softirq cputime */
__vtime_account_system(tsk); vtime_account_system(tsk);
irqtime_account_irq(tsk); irqtime_account_irq(tsk);
} }

12
kernel/sched/cputime.c
View File

@ -433,20 +433,20 @@ void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st)
*st = cputime.stime; *st = cputime.stime;
} }
void vtime_account_system(struct task_struct *tsk) void vtime_account_system_irqsafe(struct task_struct *tsk)
{ {
unsigned long flags; unsigned long flags;
local_irq_save(flags); local_irq_save(flags);
__vtime_account_system(tsk); vtime_account_system(tsk);
local_irq_restore(flags); local_irq_restore(flags);
} }
EXPORT_SYMBOL_GPL(vtime_account_system); EXPORT_SYMBOL_GPL(vtime_account_system_irqsafe);
/* /*
* Archs that account the whole time spent in the idle task * Archs that account the whole time spent in the idle task
* (outside irq) as idle time can rely on this and just implement * (outside irq) as idle time can rely on this and just implement
* __vtime_account_system() and __vtime_account_idle(). Archs that * vtime_account_system() and vtime_account_idle(). Archs that
* have other meaning of the idle time (s390 only includes the * have other meaning of the idle time (s390 only includes the
* time spent by the CPU when it's in low power mode) must override * time spent by the CPU when it's in low power mode) must override
* vtime_account(). * vtime_account().
@ -459,9 +459,9 @@ void vtime_account(struct task_struct *tsk)
local_irq_save(flags); local_irq_save(flags);
if (in_interrupt() || !is_idle_task(tsk)) if (in_interrupt() || !is_idle_task(tsk))
__vtime_account_system(tsk); vtime_account_system(tsk);
else else
__vtime_account_idle(tsk); vtime_account_idle(tsk);
local_irq_restore(flags); local_irq_restore(flags);
} }