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

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



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: default avatarFrederic Weisbecker <frederic@kernel.org>
Signed-off-by: default avatarPeter 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: default avatarIngo Molnar <mingo@kernel.org>
parent 097f2541

include/linux/context_tracking.h

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static inline void context_tracking_init(void) { } 
/* must be called with irqs disabled */

static inline void guest_enter_irqoff(void)

{

	if (vtime_accounting_cpu_enabled())

	if (vtime_accounting_enabled_this_cpu())

		vtime_guest_enter(current);

	else

		current->flags |= PF_VCPU;
@@ -127,7 +127,7 @@ static inline void guest_exit_irqoff(void) 
	if (context_tracking_enabled())

		__context_tracking_exit(CONTEXT_GUEST);



	if (vtime_accounting_cpu_enabled())

	if (vtime_accounting_enabled_this_cpu())

		vtime_guest_exit(current);

	else

		current->flags &= ~PF_VCPU;

include/linux/vtime.h

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



/*

 * vtime_accounting_cpu_enabled() definitions/declarations

 * vtime_accounting_enabled_this_cpu() definitions/declarations

 */

#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);



#elif defined(CONFIG_VIRT_CPU_ACCOUNTING_GEN)
@@ -31,7 +31,7 @@ static inline bool vtime_accounting_enabled(void) 
	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 (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)

{

	if (vtime_accounting_cpu_enabled())

	if (vtime_accounting_enabled_this_cpu())

		vtime_task_switch_generic(prev);

}



#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) { }



#endif

kernel/sched/cputime.c

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ void account_process_tick(struct task_struct *p, int user_tick) 
	u64 cputime, steal;

	struct rq *rq = this_rq();



	if (vtime_accounting_cpu_enabled())

	if (vtime_accounting_enabled_this_cpu())

		return;



	if (sched_clock_irqtime) {

kernel/time/tick-sched.c

+1 −1
Original line number Diff line number Diff line
@@ -1119,7 +1119,7 @@ static void tick_nohz_account_idle_ticks(struct tick_sched *ts) 
#ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE

	unsigned long ticks;



	if (vtime_accounting_cpu_enabled())

	if (vtime_accounting_enabled_this_cpu())

		return;

	/*

	 * We stopped the tick in idle. Update process times would miss the

CRA Git | Maintained and supported by SUSTech CRA and CCSE