korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-12 05:48:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

sched/vtime: Rename vtime_accounting_cpu_enabled() to vtime_accounting_enabled_this_cpu()

Browse Source 
Standardize the naming on top of the vtime_accounting_enabled_*() base.
Also make it clear we are checking the vtime state of the
*current* CPU with this function. We'll need to add an API to check that
state on remote CPUs as well, so we must disambiguate the naming.

Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J . Wysocki <rjw@rjwysocki.net>
Cc: Rik van Riel <riel@surriel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Wanpeng Li <wanpengli@tencent.com>
Cc: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Link: https://lkml.kernel.org/r/20191016025700.31277-9-frederic@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Frederic Weisbecker 2019-10-16 04:56:54 +02:00 committed by Ingo Molnar
parent 097f2541c6
commit e44fcb4b7a
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/context_tracking.h
View File

@ -103,7 +103,7 @@ static inline void context_tracking_init(void) { }
/* must be called with irqs disabled */ /* must be called with irqs disabled */
static inline void guest_enter_irqoff(void) static inline void guest_enter_irqoff(void)
{ {
if (vtime_accounting_cpu_enabled()) if (vtime_accounting_enabled_this_cpu())
vtime_guest_enter(current); vtime_guest_enter(current);
else else
current->flags |= PF_VCPU; current->flags |= PF_VCPU;
@ -127,7 +127,7 @@ static inline void guest_exit_irqoff(void)
if (context_tracking_enabled()) if (context_tracking_enabled())
__context_tracking_exit(CONTEXT_GUEST); __context_tracking_exit(CONTEXT_GUEST);
if (vtime_accounting_cpu_enabled()) if (vtime_accounting_enabled_this_cpu())
vtime_guest_exit(current); vtime_guest_exit(current);
else else
current->flags &= ~PF_VCPU; current->flags &= ~PF_VCPU;

10
include/linux/vtime.h
View File

@ -11,11 +11,11 @@
struct task_struct; struct task_struct;
/* /*
* vtime_accounting_cpu_enabled() definitions/declarations * vtime_accounting_enabled_this_cpu() definitions/declarations
*/ */
#if defined(CONFIG_VIRT_CPU_ACCOUNTING_NATIVE) #if defined(CONFIG_VIRT_CPU_ACCOUNTING_NATIVE)
static inline bool vtime_accounting_cpu_enabled(void) { return true; } static inline bool vtime_accounting_enabled_this_cpu(void) { return true; }
extern void vtime_task_switch(struct task_struct *prev); extern void vtime_task_switch(struct task_struct *prev);
#elif defined(CONFIG_VIRT_CPU_ACCOUNTING_GEN) #elif defined(CONFIG_VIRT_CPU_ACCOUNTING_GEN)
@ -31,7 +31,7 @@ static inline bool vtime_accounting_enabled(void)
return context_tracking_enabled(); return context_tracking_enabled();
} }
static inline bool vtime_accounting_cpu_enabled(void) static inline bool vtime_accounting_enabled_this_cpu(void)
{ {
if (vtime_accounting_enabled()) { if (vtime_accounting_enabled()) {
if (context_tracking_enabled_this_cpu()) if (context_tracking_enabled_this_cpu())
@ -45,13 +45,13 @@ extern void vtime_task_switch_generic(struct task_struct *prev);
static inline void vtime_task_switch(struct task_struct *prev) static inline void vtime_task_switch(struct task_struct *prev)
{ {
if (vtime_accounting_cpu_enabled()) if (vtime_accounting_enabled_this_cpu())
vtime_task_switch_generic(prev); vtime_task_switch_generic(prev);
} }
#else /* !CONFIG_VIRT_CPU_ACCOUNTING */ #else /* !CONFIG_VIRT_CPU_ACCOUNTING */
static inline bool vtime_accounting_cpu_enabled(void) { return false; } static inline bool vtime_accounting_enabled_this_cpu(void) { return false; }
static inline void vtime_task_switch(struct task_struct *prev) { } static inline void vtime_task_switch(struct task_struct *prev) { }
#endif #endif

2
kernel/sched/cputime.c
View File

@ -475,7 +475,7 @@ void account_process_tick(struct task_struct *p, int user_tick)
u64 cputime, steal; u64 cputime, steal;
struct rq *rq = this_rq(); struct rq *rq = this_rq();
if (vtime_accounting_cpu_enabled()) if (vtime_accounting_enabled_this_cpu())
return; return;
if (sched_clock_irqtime) { if (sched_clock_irqtime) {

2
kernel/time/tick-sched.c
View File

@ -1119,7 +1119,7 @@ static void tick_nohz_account_idle_ticks(struct tick_sched *ts)
#ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE #ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
unsigned long ticks; unsigned long ticks;
if (vtime_accounting_cpu_enabled()) if (vtime_accounting_enabled_this_cpu())
return; return;
/* /*
* We stopped the tick in idle. Update process times would miss the * We stopped the tick in idle. Update process times would miss the