context_tracking, rcu: Rename ct_dynticks() into ct_rcu_watching()

The context_tracking.state RCU_DYNTICKS subvariable has been renamed to
RCU_WATCHING, reflect that change in the related helpers.

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 94d6a935af3beb2df637741d3f44bf889cd8d9aa..cb90d8c1781041d8bddde3c005dd43756cc26fa1 100644 (file)
--- a/include/linux/context_tracking_state.h
+++ b/include/linux/context_tracking_state.h
@@ -56,7 +56,7 @@ static __always_inline int __ct_state(void)
 #endif
 
 #ifdef CONFIG_CONTEXT_TRACKING_IDLE
-static __always_inline int ct_dynticks(void)
+static __always_inline int ct_rcu_watching(void)
 {
        return atomic_read(this_cpu_ptr(&context_tracking.state)) & CT_RCU_WATCHING_MASK;
 }

diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c
index b2589bc59e1869c4658d2cfa86804234a1a353f9..868ae0bcd4bed3785b710087383dbd5cddf8e267 100644 (file)
--- a/kernel/context_tracking.c
+++ b/kernel/context_tracking.c
@@ -137,7 +137,7 @@ static void noinstr ct_kernel_exit(bool user, int offset)
 
        instrumentation_begin();
        lockdep_assert_irqs_disabled();
-       trace_rcu_dyntick(TPS("Start"), ct_dynticks_nesting(), 0, ct_dynticks());
+       trace_rcu_dyntick(TPS("Start"), ct_dynticks_nesting(), 0, ct_rcu_watching());
        WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) && !user && !is_idle_task(current));
        rcu_preempt_deferred_qs(current);
 
@@ -182,7 +182,7 @@ static void noinstr ct_kernel_enter(bool user, int offset)
        // instrumentation for the noinstr ct_kernel_enter_state()
        instrument_atomic_write(&ct->state, sizeof(ct->state));
 
-       trace_rcu_dyntick(TPS("End"), ct_dynticks_nesting(), 1, ct_dynticks());
+       trace_rcu_dyntick(TPS("End"), ct_dynticks_nesting(), 1, ct_rcu_watching());
        WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) && !user && !is_idle_task(current));
        WRITE_ONCE(ct->dynticks_nesting, 1);
        WARN_ON_ONCE(ct_dynticks_nmi_nesting());
@@ -220,7 +220,7 @@ void noinstr ct_nmi_exit(void)
         */
        if (ct_dynticks_nmi_nesting() != 1) {
                trace_rcu_dyntick(TPS("--="), ct_dynticks_nmi_nesting(), ct_dynticks_nmi_nesting() - 2,
-                                 ct_dynticks());
+                                 ct_rcu_watching());
                WRITE_ONCE(ct->dynticks_nmi_nesting, /* No store tearing. */
                           ct_dynticks_nmi_nesting() - 2);
                instrumentation_end();
@@ -228,7 +228,7 @@ void noinstr ct_nmi_exit(void)
        }
 
        /* This NMI interrupted an RCU-idle CPU, restore RCU-idleness. */
-       trace_rcu_dyntick(TPS("Startirq"), ct_dynticks_nmi_nesting(), 0, ct_dynticks());
+       trace_rcu_dyntick(TPS("Startirq"), ct_dynticks_nmi_nesting(), 0, ct_rcu_watching());
        WRITE_ONCE(ct->dynticks_nmi_nesting, 0); /* Avoid store tearing. */
 
        // instrumentation for the noinstr ct_kernel_exit_state()
@@ -296,7 +296,7 @@ void noinstr ct_nmi_enter(void)
 
        trace_rcu_dyntick(incby == 1 ? TPS("Endirq") : TPS("++="),
                          ct_dynticks_nmi_nesting(),
-                         ct_dynticks_nmi_nesting() + incby, ct_dynticks());
+                         ct_dynticks_nmi_nesting() + incby, ct_rcu_watching());
        instrumentation_end();
        WRITE_ONCE(ct->dynticks_nmi_nesting, /* Prevent store tearing. */
                   ct_dynticks_nmi_nesting() + incby);

diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 04f87c44385c7f0fc2d07f6a4b3cbcda48dc3f58..3a2f0325aa4325cc2d0a086636122f77bbf19222 100644 (file)
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -294,7 +294,7 @@ void rcu_softirq_qs(void)
  */
 static void rcu_dynticks_eqs_online(void)
 {
-       if (ct_dynticks() & CT_RCU_WATCHING)
+       if (ct_rcu_watching() & CT_RCU_WATCHING)
                return;
        ct_state_inc(CT_RCU_WATCHING);
 }