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>

diff --git a/arch/x86/entry/calling.h b/arch/x86/entry/calling.h
index 515c0ceeb4a3608bbdd0cb9afad747417e8a7f88..0789e13ece905c1c8c006fe27d4df96ef98d98cf 100644 (file)
--- a/arch/x86/entry/calling.h
+++ b/arch/x86/entry/calling.h
@@ -354,7 +354,7 @@ For 32-bit we have the following conventions - kernel is built with
 .macro CALL_enter_from_user_mode
 #ifdef CONFIG_CONTEXT_TRACKING
 #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
        call enter_from_user_mode
 .Lafter_call_\@:

diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h
index 558a209c247d8bdfa89aab225e84bb1ce54f7533..f1601bac08dc9d26cdd98246633ff7fc9c20ad23 100644 (file)
--- a/include/linux/context_tracking.h
+++ b/include/linux/context_tracking.h
@@ -22,26 +22,26 @@ extern void context_tracking_user_exit(void);
 
 static inline void user_enter(void)
 {
-       if (context_tracking_is_enabled())
+       if (context_tracking_enabled())
                context_tracking_enter(CONTEXT_USER);
 
 }
 static inline void user_exit(void)
 {
-       if (context_tracking_is_enabled())
+       if (context_tracking_enabled())
                context_tracking_exit(CONTEXT_USER);
 }
 
 /* Called with interrupts disabled.  */
 static inline void user_enter_irqoff(void)
 {
-       if (context_tracking_is_enabled())
+       if (context_tracking_enabled())
                __context_tracking_enter(CONTEXT_USER);
 
 }
 static inline void user_exit_irqoff(void)
 {
-       if (context_tracking_is_enabled())
+       if (context_tracking_enabled())
                __context_tracking_exit(CONTEXT_USER);
 }
 
@@ -49,7 +49,7 @@ static inline enum ctx_state exception_enter(void)
 {
        enum ctx_state prev_ctx;
 
-       if (!context_tracking_is_enabled())
+       if (!context_tracking_enabled())
                return 0;
 
        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)
 {
-       if (context_tracking_is_enabled()) {
+       if (context_tracking_enabled()) {
                if (prev_ctx != CONTEXT_KERNEL)
                        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)
 {
-       return context_tracking_is_enabled() ?
+       return context_tracking_enabled() ?
                this_cpu_read(context_tracking.state) : CONTEXT_DISABLED;
 }
 #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; }
 #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
 extern void context_tracking_init(void);
@@ -108,7 +108,7 @@ static inline void guest_enter_irqoff(void)
        else
                current->flags |= PF_VCPU;
 
-       if (context_tracking_is_enabled())
+       if (context_tracking_enabled())
                __context_tracking_enter(CONTEXT_GUEST);
 
        /* 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)
 {
-       if (context_tracking_is_enabled())
+       if (context_tracking_enabled())
                __context_tracking_exit(CONTEXT_GUEST);
 
        if (vtime_accounting_cpu_enabled())

diff --git a/include/linux/context_tracking_state.h b/include/linux/context_tracking_state.h
index f4633c2c29a53dc3f5dc02f84ba23e9a325d6da7..91250bdf206065409c9a19a582432b318874ca6e 100644 (file)
--- a/include/linux/context_tracking_state.h
+++ b/include/linux/context_tracking_state.h
@@ -23,12 +23,12 @@ struct 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);
 
-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)
@@ -42,7 +42,7 @@ static inline bool context_tracking_in_user(void)
 }
 #else
 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; }
 #endif /* CONFIG_CONTEXT_TRACKING */
 

diff --git a/include/linux/tick.h b/include/linux/tick.h
index f92a10b5e11285ce4efbb508daf5ad35817d45a9..7e050a356cc51a3ddcdd0fc753bf3d81d47c3b24 100644 (file)
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
@@ -174,7 +174,7 @@ extern cpumask_var_t tick_nohz_full_mask;
 
 static inline bool tick_nohz_full_enabled(void)
 {
-       if (!context_tracking_is_enabled())
+       if (!context_tracking_enabled())
                return false;
 
        return tick_nohz_full_running;

diff --git a/include/linux/vtime.h b/include/linux/vtime.h
index d9160ab3667ae26f43e2b5c5b78eebe76049f960..0fc7f11f7aa4224106d42602c3dc01231554a5f0 100644 (file)
--- a/include/linux/vtime.h
+++ b/include/linux/vtime.h
@@ -28,7 +28,7 @@ extern void vtime_task_switch(struct task_struct *prev);
  */
 static inline bool vtime_accounting_enabled(void)
 {
-       return context_tracking_is_enabled();
+       return context_tracking_enabled();
 }
 
 static inline bool vtime_accounting_cpu_enabled(void)

diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c
index be01a4d627c9e9c1c3dd94c5c64544f9c8ff2074..0296b4bda8f1fb5f87c549edbf83093644ebaabf 100644 (file)
--- a/kernel/context_tracking.c
+++ b/kernel/context_tracking.c
@@ -25,8 +25,8 @@
 #define CREATE_TRACE_POINTS
 #include <trace/events/context_tracking.h>
 
-DEFINE_STATIC_KEY_FALSE(context_tracking_enabled);
-EXPORT_SYMBOL_GPL(context_tracking_enabled);
+DEFINE_STATIC_KEY_FALSE(context_tracking_key);
+EXPORT_SYMBOL_GPL(context_tracking_key);
 
 DEFINE_PER_CPU(struct context_tracking, 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)) {
                per_cpu(context_tracking.active, cpu) = true;
-               static_branch_inc(&context_tracking_enabled);
+               static_branch_inc(&context_tracking_key);
        }
 
        if (initialized)