context_tracking, rcu: Rename DYNTICK_IRQ_NONIDLE into CT_NESTING_IRQ_NONIDLE

The context_tracking.state RCU_DYNTICKS subvariable has been renamed to
RCU_WATCHING, and the 'dynticks' prefix can be dropped without losing any
meaning.

Signed-off-by: Valentin Schneider <vschneid@redhat.com>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Signed-off-by: Neeraj Upadhyay <neeraj.upadhyay@kernel.org>

diff --git a/include/linux/context_tracking_state.h b/include/linux/context_tracking_state.h
index 34fd504e53a86bc672cc30018b85517cf90f9d33..0dbda59c9f37234ba75ec14386f75ef3fb460174 100644 (file)
--- a/include/linux/context_tracking_state.h
+++ b/include/linux/context_tracking_state.h
@@ -7,7 +7,7 @@
 #include <linux/context_tracking_irq.h>
 
 /* Offset to allow distinguishing irq vs. task-based idle entry/exit. */
-#define DYNTICK_IRQ_NONIDLE    ((LONG_MAX / 2) + 1)
+#define CT_NESTING_IRQ_NONIDLE ((LONG_MAX / 2) + 1)
 
 enum ctx_state {
        CT_STATE_DISABLED       = -1,   /* returned by ct_state() if unknown */

diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c
index 115843eeb0309d9021e132d90c96cb037a52c10f..8262f57a436365b2a51a93eae58110a06227cb5b 100644 (file)
--- a/kernel/context_tracking.c
+++ b/kernel/context_tracking.c
@@ -29,7 +29,7 @@
 DEFINE_PER_CPU(struct context_tracking, context_tracking) = {
 #ifdef CONFIG_CONTEXT_TRACKING_IDLE
        .nesting = 1,
-       .nmi_nesting = DYNTICK_IRQ_NONIDLE,
+       .nmi_nesting = CT_NESTING_IRQ_NONIDLE,
 #endif
        .state = ATOMIC_INIT(CT_RCU_WATCHING),
 };
@@ -125,7 +125,7 @@ static void noinstr ct_kernel_exit(bool user, int offset)
 {
        struct context_tracking *ct = this_cpu_ptr(&context_tracking);
 
-       WARN_ON_ONCE(ct_nmi_nesting() != DYNTICK_IRQ_NONIDLE);
+       WARN_ON_ONCE(ct_nmi_nesting() != CT_NESTING_IRQ_NONIDLE);
        WRITE_ONCE(ct->nmi_nesting, 0);
        WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) &&
                     ct_nesting() == 0);
@@ -156,7 +156,7 @@ static void noinstr ct_kernel_exit(bool user, int offset)
  * Exit an RCU extended quiescent state, which can be either the
  * idle loop or adaptive-tickless usermode execution.
  *
- * We crowbar the ->nmi_nesting field to DYNTICK_IRQ_NONIDLE to
+ * We crowbar the ->nmi_nesting field to CT_NESTING_IRQ_NONIDLE to
  * allow for the possibility of usermode upcalls messing up our count of
  * interrupt nesting level during the busy period that is just now starting.
  */
@@ -186,7 +186,7 @@ static void noinstr ct_kernel_enter(bool user, int offset)
        WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) && !user && !is_idle_task(current));
        WRITE_ONCE(ct->nesting, 1);
        WARN_ON_ONCE(ct_nmi_nesting());
-       WRITE_ONCE(ct->nmi_nesting, DYNTICK_IRQ_NONIDLE);
+       WRITE_ONCE(ct->nmi_nesting, CT_NESTING_IRQ_NONIDLE);
        instrumentation_end();
 }
 

diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 14cc314eedad021a96b8b213755e15ccc568f54b..4778c873f4acbdfccf06be2e327aaa1d09de66b2 100644 (file)
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -599,7 +599,7 @@ void rcu_irq_exit_check_preempt(void)
        RCU_LOCKDEP_WARN(ct_nesting() <= 0,
                         "RCU nesting counter underflow/zero!");
        RCU_LOCKDEP_WARN(ct_nmi_nesting() !=
-                        DYNTICK_IRQ_NONIDLE,
+                        CT_NESTING_IRQ_NONIDLE,
                         "Bad RCU  nmi_nesting counter\n");
        RCU_LOCKDEP_WARN(rcu_dynticks_curr_cpu_in_eqs(),
                         "RCU in extended quiescent state!");