context_tracking, rcu: Rename ct_dynticks_nesting() into ct_nesting()

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

Suggested-by: Frederic Weisbecker <frederic@kernel.org>
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 65290e7677e6cce4b5ec8f909577a7c7725928a0..586c1ff22c2e9c93609b9390ba9d441175a458b8 100644 (file)
--- a/include/linux/context_tracking_state.h
+++ b/include/linux/context_tracking_state.h
@@ -75,7 +75,7 @@ static __always_inline int ct_rcu_watching_cpu_acquire(int cpu)
        return atomic_read_acquire(&ct->state) & CT_RCU_WATCHING_MASK;
 }
 
-static __always_inline long ct_dynticks_nesting(void)
+static __always_inline long ct_nesting(void)
 {
        return __this_cpu_read(context_tracking.nesting);
 }

diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c
index 5cfdfc03b4018614f2da3da38a8660b0f10610a6..a951bde0bbcbb52af1c3f1f85c9cfa1f4d88ae16 100644 (file)
--- a/kernel/context_tracking.c
+++ b/kernel/context_tracking.c
@@ -128,8 +128,8 @@ static void noinstr ct_kernel_exit(bool user, int offset)
        WARN_ON_ONCE(ct_dynticks_nmi_nesting() != DYNTICK_IRQ_NONIDLE);
        WRITE_ONCE(ct->dynticks_nmi_nesting, 0);
        WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) &&
-                    ct_dynticks_nesting() == 0);
-       if (ct_dynticks_nesting() != 1) {
+                    ct_nesting() == 0);
+       if (ct_nesting() != 1) {
                // RCU will still be watching, so just do accounting and leave.
                ct->nesting--;
                return;
@@ -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_rcu_watching());
+       trace_rcu_dyntick(TPS("Start"), ct_nesting(), 0, ct_rcu_watching());
        WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) && !user && !is_idle_task(current));
        rcu_preempt_deferred_qs(current);
 
@@ -166,7 +166,7 @@ static void noinstr ct_kernel_enter(bool user, int offset)
        long oldval;
 
        WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) && !raw_irqs_disabled());
-       oldval = ct_dynticks_nesting();
+       oldval = ct_nesting();
        WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) && oldval < 0);
        if (oldval) {
                // RCU was already watching, so just do accounting and leave.
@@ -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_rcu_watching());
+       trace_rcu_dyntick(TPS("End"), ct_nesting(), 1, ct_rcu_watching());
        WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) && !user && !is_idle_task(current));
        WRITE_ONCE(ct->nesting, 1);
        WARN_ON_ONCE(ct_dynticks_nmi_nesting());

diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 0d5a539acd58abafdc75b477d7fbcc07005e6699..cf69a234080f6b64cc4ba401a5016423cd58a04b 100644 (file)
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -388,7 +388,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
        lockdep_assert_irqs_disabled();
 
        /* Check for counter underflows */
-       RCU_LOCKDEP_WARN(ct_dynticks_nesting() < 0,
+       RCU_LOCKDEP_WARN(ct_nesting() < 0,
                         "RCU nesting counter underflow!");
        RCU_LOCKDEP_WARN(ct_dynticks_nmi_nesting() <= 0,
                         "RCU dynticks_nmi_nesting counter underflow/zero!");
@@ -404,7 +404,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
        WARN_ON_ONCE(!nesting && !is_idle_task(current));
 
        /* Does CPU appear to be idle from an RCU standpoint? */
-       return ct_dynticks_nesting() == 0;
+       return ct_nesting() == 0;
 }
 
 #define DEFAULT_RCU_BLIMIT (IS_ENABLED(CONFIG_RCU_STRICT_GRACE_PERIOD) ? 1000 : 10)
@@ -596,7 +596,7 @@ void rcu_irq_exit_check_preempt(void)
 {
        lockdep_assert_irqs_disabled();
 
-       RCU_LOCKDEP_WARN(ct_dynticks_nesting() <= 0,
+       RCU_LOCKDEP_WARN(ct_nesting() <= 0,
                         "RCU nesting counter underflow/zero!");
        RCU_LOCKDEP_WARN(ct_dynticks_nmi_nesting() !=
                         DYNTICK_IRQ_NONIDLE,