3e1df4f506
vtime_account() doesn't have the same role in CONFIG_VIRT_CPU_ACCOUNTING and CONFIG_IRQ_TIME_ACCOUNTING. In the first case it handles time accounting in any context. In the second case it only handles irq time accounting. So when vtime_account() is called from outside vtime_account_irq_*() this call is pointless to CONFIG_IRQ_TIME_ACCOUNTING. To fix the confusion, change vtime_account() to irqtime_account_irq() in CONFIG_IRQ_TIME_ACCOUNTING. This way we ensure future account_vtime() calls won't waste useless cycles in the irqtime APIs. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> 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>
48 lines
1.7 KiB
C
48 lines
1.7 KiB
C
#ifndef _LINUX_KERNEL_VTIME_H
|
|
#define _LINUX_KERNEL_VTIME_H
|
|
|
|
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(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(struct task_struct *tsk) { }
|
|
#endif
|
|
|
|
#ifdef CONFIG_IRQ_TIME_ACCOUNTING
|
|
extern void irqtime_account_irq(struct task_struct *tsk);
|
|
#else
|
|
static inline void irqtime_account_irq(struct task_struct *tsk) { }
|
|
#endif
|
|
|
|
static inline void vtime_account_irq_enter(struct task_struct *tsk)
|
|
{
|
|
/*
|
|
* Hardirq can interrupt idle task anytime. So we need vtime_account()
|
|
* that performs the idle check in CONFIG_VIRT_CPU_ACCOUNTING.
|
|
* Softirq can also interrupt idle task directly if it calls
|
|
* local_bh_enable(). Such case probably don't exist but we never know.
|
|
* Ksoftirqd is not concerned because idle time is flushed on context
|
|
* switch. Softirqs in the end of hardirqs are also not a problem because
|
|
* the idle time is flushed on hardirq time already.
|
|
*/
|
|
vtime_account(tsk);
|
|
irqtime_account_irq(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);
|
|
irqtime_account_irq(tsk);
|
|
}
|
|
|
|
#endif /* _LINUX_KERNEL_VTIME_H */
|