context_tracking: Rename context_tracking_is_enabled() => context_tracking_enabled()
Remove the superfluous "is" in the middle of the name. We want to standardize the naming so that it can be expanded through suffixes: context_tracking_enabled() context_tracking_enabled_cpu() context_tracking_enabled_this_cpu() 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-6-frederic@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
0ca167c056
commit
74c578759f
|
@ -354,7 +354,7 @@ For 32-bit we have the following conventions - kernel is built with
|
||||||
.macro CALL_enter_from_user_mode
|
.macro CALL_enter_from_user_mode
|
||||||
#ifdef CONFIG_CONTEXT_TRACKING
|
#ifdef CONFIG_CONTEXT_TRACKING
|
||||||
#ifdef CONFIG_JUMP_LABEL
|
#ifdef CONFIG_JUMP_LABEL
|
||||||
STATIC_JUMP_IF_FALSE .Lafter_call_\@, context_tracking_enabled, def=0
|
STATIC_JUMP_IF_FALSE .Lafter_call_\@, context_tracking_key, def=0
|
||||||
#endif
|
#endif
|
||||||
call enter_from_user_mode
|
call enter_from_user_mode
|
||||||
.Lafter_call_\@:
|
.Lafter_call_\@:
|
||||||
|
|
|
@ -22,26 +22,26 @@ extern void context_tracking_user_exit(void);
|
||||||
|
|
||||||
static inline void user_enter(void)
|
static inline void user_enter(void)
|
||||||
{
|
{
|
||||||
if (context_tracking_is_enabled())
|
if (context_tracking_enabled())
|
||||||
context_tracking_enter(CONTEXT_USER);
|
context_tracking_enter(CONTEXT_USER);
|
||||||
|
|
||||||
}
|
}
|
||||||
static inline void user_exit(void)
|
static inline void user_exit(void)
|
||||||
{
|
{
|
||||||
if (context_tracking_is_enabled())
|
if (context_tracking_enabled())
|
||||||
context_tracking_exit(CONTEXT_USER);
|
context_tracking_exit(CONTEXT_USER);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Called with interrupts disabled. */
|
/* Called with interrupts disabled. */
|
||||||
static inline void user_enter_irqoff(void)
|
static inline void user_enter_irqoff(void)
|
||||||
{
|
{
|
||||||
if (context_tracking_is_enabled())
|
if (context_tracking_enabled())
|
||||||
__context_tracking_enter(CONTEXT_USER);
|
__context_tracking_enter(CONTEXT_USER);
|
||||||
|
|
||||||
}
|
}
|
||||||
static inline void user_exit_irqoff(void)
|
static inline void user_exit_irqoff(void)
|
||||||
{
|
{
|
||||||
if (context_tracking_is_enabled())
|
if (context_tracking_enabled())
|
||||||
__context_tracking_exit(CONTEXT_USER);
|
__context_tracking_exit(CONTEXT_USER);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ static inline enum ctx_state exception_enter(void)
|
||||||
{
|
{
|
||||||
enum ctx_state prev_ctx;
|
enum ctx_state prev_ctx;
|
||||||
|
|
||||||
if (!context_tracking_is_enabled())
|
if (!context_tracking_enabled())
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
prev_ctx = this_cpu_read(context_tracking.state);
|
prev_ctx = this_cpu_read(context_tracking.state);
|
||||||
|
@ -61,7 +61,7 @@ static inline enum ctx_state exception_enter(void)
|
||||||
|
|
||||||
static inline void exception_exit(enum ctx_state prev_ctx)
|
static inline void exception_exit(enum ctx_state prev_ctx)
|
||||||
{
|
{
|
||||||
if (context_tracking_is_enabled()) {
|
if (context_tracking_enabled()) {
|
||||||
if (prev_ctx != CONTEXT_KERNEL)
|
if (prev_ctx != CONTEXT_KERNEL)
|
||||||
context_tracking_enter(prev_ctx);
|
context_tracking_enter(prev_ctx);
|
||||||
}
|
}
|
||||||
|
@ -77,7 +77,7 @@ static inline void exception_exit(enum ctx_state prev_ctx)
|
||||||
*/
|
*/
|
||||||
static inline enum ctx_state ct_state(void)
|
static inline enum ctx_state ct_state(void)
|
||||||
{
|
{
|
||||||
return context_tracking_is_enabled() ?
|
return context_tracking_enabled() ?
|
||||||
this_cpu_read(context_tracking.state) : CONTEXT_DISABLED;
|
this_cpu_read(context_tracking.state) : CONTEXT_DISABLED;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
@ -90,7 +90,7 @@ static inline void exception_exit(enum ctx_state prev_ctx) { }
|
||||||
static inline enum ctx_state ct_state(void) { return CONTEXT_DISABLED; }
|
static inline enum ctx_state ct_state(void) { return CONTEXT_DISABLED; }
|
||||||
#endif /* !CONFIG_CONTEXT_TRACKING */
|
#endif /* !CONFIG_CONTEXT_TRACKING */
|
||||||
|
|
||||||
#define CT_WARN_ON(cond) WARN_ON(context_tracking_is_enabled() && (cond))
|
#define CT_WARN_ON(cond) WARN_ON(context_tracking_enabled() && (cond))
|
||||||
|
|
||||||
#ifdef CONFIG_CONTEXT_TRACKING_FORCE
|
#ifdef CONFIG_CONTEXT_TRACKING_FORCE
|
||||||
extern void context_tracking_init(void);
|
extern void context_tracking_init(void);
|
||||||
|
@ -108,7 +108,7 @@ static inline void guest_enter_irqoff(void)
|
||||||
else
|
else
|
||||||
current->flags |= PF_VCPU;
|
current->flags |= PF_VCPU;
|
||||||
|
|
||||||
if (context_tracking_is_enabled())
|
if (context_tracking_enabled())
|
||||||
__context_tracking_enter(CONTEXT_GUEST);
|
__context_tracking_enter(CONTEXT_GUEST);
|
||||||
|
|
||||||
/* KVM does not hold any references to rcu protected data when it
|
/* KVM does not hold any references to rcu protected data when it
|
||||||
|
@ -124,7 +124,7 @@ static inline void guest_enter_irqoff(void)
|
||||||
|
|
||||||
static inline void guest_exit_irqoff(void)
|
static inline void guest_exit_irqoff(void)
|
||||||
{
|
{
|
||||||
if (context_tracking_is_enabled())
|
if (context_tracking_enabled())
|
||||||
__context_tracking_exit(CONTEXT_GUEST);
|
__context_tracking_exit(CONTEXT_GUEST);
|
||||||
|
|
||||||
if (vtime_accounting_cpu_enabled())
|
if (vtime_accounting_cpu_enabled())
|
||||||
|
|
|
@ -23,12 +23,12 @@ struct context_tracking {
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef CONFIG_CONTEXT_TRACKING
|
#ifdef CONFIG_CONTEXT_TRACKING
|
||||||
extern struct static_key_false context_tracking_enabled;
|
extern struct static_key_false context_tracking_key;
|
||||||
DECLARE_PER_CPU(struct context_tracking, context_tracking);
|
DECLARE_PER_CPU(struct context_tracking, context_tracking);
|
||||||
|
|
||||||
static inline bool context_tracking_is_enabled(void)
|
static inline bool context_tracking_enabled(void)
|
||||||
{
|
{
|
||||||
return static_branch_unlikely(&context_tracking_enabled);
|
return static_branch_unlikely(&context_tracking_key);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool context_tracking_cpu_is_enabled(void)
|
static inline bool context_tracking_cpu_is_enabled(void)
|
||||||
|
@ -42,7 +42,7 @@ static inline bool context_tracking_in_user(void)
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
static inline bool context_tracking_in_user(void) { return false; }
|
static inline bool context_tracking_in_user(void) { return false; }
|
||||||
static inline bool context_tracking_is_enabled(void) { return false; }
|
static inline bool context_tracking_enabled(void) { return false; }
|
||||||
static inline bool context_tracking_cpu_is_enabled(void) { return false; }
|
static inline bool context_tracking_cpu_is_enabled(void) { return false; }
|
||||||
#endif /* CONFIG_CONTEXT_TRACKING */
|
#endif /* CONFIG_CONTEXT_TRACKING */
|
||||||
|
|
||||||
|
|
|
@ -174,7 +174,7 @@ extern cpumask_var_t tick_nohz_full_mask;
|
||||||
|
|
||||||
static inline bool tick_nohz_full_enabled(void)
|
static inline bool tick_nohz_full_enabled(void)
|
||||||
{
|
{
|
||||||
if (!context_tracking_is_enabled())
|
if (!context_tracking_enabled())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
return tick_nohz_full_running;
|
return tick_nohz_full_running;
|
||||||
|
|
|
@ -28,7 +28,7 @@ extern void vtime_task_switch(struct task_struct *prev);
|
||||||
*/
|
*/
|
||||||
static inline bool vtime_accounting_enabled(void)
|
static inline bool vtime_accounting_enabled(void)
|
||||||
{
|
{
|
||||||
return context_tracking_is_enabled();
|
return context_tracking_enabled();
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool vtime_accounting_cpu_enabled(void)
|
static inline bool vtime_accounting_cpu_enabled(void)
|
||||||
|
|
|
@ -25,8 +25,8 @@
|
||||||
#define CREATE_TRACE_POINTS
|
#define CREATE_TRACE_POINTS
|
||||||
#include <trace/events/context_tracking.h>
|
#include <trace/events/context_tracking.h>
|
||||||
|
|
||||||
DEFINE_STATIC_KEY_FALSE(context_tracking_enabled);
|
DEFINE_STATIC_KEY_FALSE(context_tracking_key);
|
||||||
EXPORT_SYMBOL_GPL(context_tracking_enabled);
|
EXPORT_SYMBOL_GPL(context_tracking_key);
|
||||||
|
|
||||||
DEFINE_PER_CPU(struct context_tracking, context_tracking);
|
DEFINE_PER_CPU(struct context_tracking, context_tracking);
|
||||||
EXPORT_SYMBOL_GPL(context_tracking);
|
EXPORT_SYMBOL_GPL(context_tracking);
|
||||||
|
@ -192,7 +192,7 @@ void __init context_tracking_cpu_set(int cpu)
|
||||||
|
|
||||||
if (!per_cpu(context_tracking.active, cpu)) {
|
if (!per_cpu(context_tracking.active, cpu)) {
|
||||||
per_cpu(context_tracking.active, cpu) = true;
|
per_cpu(context_tracking.active, cpu) = true;
|
||||||
static_branch_inc(&context_tracking_enabled);
|
static_branch_inc(&context_tracking_key);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (initialized)
|
if (initialized)
|
||||||
|
|
Loading…
Reference in New Issue