rcu: Rename rcu_momentary_dyntick_idle() into rcu_momentary_eqs()

The context_tracking.state RCU_DYNTICKS subvariable has been renamed to
RCU_WATCHING, replace "dyntick_idle" into "eqs" to drop the dyntick
reference.

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/rcutiny.h b/include/linux/rcutiny.h
index d9ac7b136aeab2379eb5f7656e3319607d335cc1..cf2b5a188f783655c520fcc67447c7e691eed249 100644 (file)
--- a/include/linux/rcutiny.h
+++ b/include/linux/rcutiny.h
@@ -158,7 +158,7 @@ void rcu_scheduler_starting(void);
 static inline void rcu_end_inkernel_boot(void) { }
 static inline bool rcu_inkernel_boot_has_ended(void) { return true; }
 static inline bool rcu_is_watching(void) { return true; }
-static inline void rcu_momentary_dyntick_idle(void) { }
+static inline void rcu_momentary_eqs(void) { }
 static inline void kfree_rcu_scheduler_running(void) { }
 static inline bool rcu_gp_might_be_stalled(void) { return false; }
 

diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h
index 254244202ea9764d40f59733d900b5644c189381..7dbde2b6f714ab119766ba7937a56cb6d5c3ca0e 100644 (file)
--- a/include/linux/rcutree.h
+++ b/include/linux/rcutree.h
@@ -37,7 +37,7 @@ void synchronize_rcu_expedited(void);
 void kvfree_call_rcu(struct rcu_head *head, void *ptr);
 
 void rcu_barrier(void);
-void rcu_momentary_dyntick_idle(void);
+void rcu_momentary_eqs(void);
 void kfree_rcu_scheduler_running(void);
 bool rcu_gp_might_be_stalled(void);
 

diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index 08bf7c669dd3dbf8088328c1f87d7b25ab80122c..ef757c3e84a27f72bbec67cc36c2773024f44e7c 100644 (file)
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -2680,7 +2680,7 @@ static unsigned long rcu_torture_fwd_prog_cbfree(struct rcu_fwd *rfp)
                rcu_torture_fwd_prog_cond_resched(freed);
                if (tick_nohz_full_enabled()) {
                        local_irq_save(flags);
-                       rcu_momentary_dyntick_idle();
+                       rcu_momentary_eqs();
                        local_irq_restore(flags);
                }
        }
@@ -2830,7 +2830,7 @@ static void rcu_torture_fwd_prog_cr(struct rcu_fwd *rfp)
                rcu_torture_fwd_prog_cond_resched(n_launders + n_max_cbs);
                if (tick_nohz_full_enabled()) {
                        local_irq_save(flags);
-                       rcu_momentary_dyntick_idle();
+                       rcu_momentary_eqs();
                        local_irq_restore(flags);
                }
        }

diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index b53b354417aeb33a8f8c544d0b99a7182f431ea1..e0f6fc272906fb238d201252c5fa3aba8d28b99d 100644 (file)
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -367,7 +367,7 @@ bool rcu_watching_zero_in_eqs(int cpu, int *vp)
  *
  * The caller must have disabled interrupts and must not be idle.
  */
-notrace void rcu_momentary_dyntick_idle(void)
+notrace void rcu_momentary_eqs(void)
 {
        int seq;
 
@@ -377,7 +377,7 @@ notrace void rcu_momentary_dyntick_idle(void)
        WARN_ON_ONCE(!(seq & CT_RCU_WATCHING));
        rcu_preempt_deferred_qs(current);
 }
-EXPORT_SYMBOL_GPL(rcu_momentary_dyntick_idle);
+EXPORT_SYMBOL_GPL(rcu_momentary_eqs);
 
 /**
  * rcu_is_cpu_rrupt_from_idle - see if 'interrupted' from idle

diff --git a/kernel/rcu/tree_nocb.h b/kernel/rcu/tree_nocb.h
index 3ce30841119ade393f00a9245e0922f1a2159b50..e629646ac6f52fe9cd311c9d1805122c342f7730 100644 (file)
--- a/kernel/rcu/tree_nocb.h
+++ b/kernel/rcu/tree_nocb.h
@@ -917,7 +917,7 @@ static void nocb_cb_wait(struct rcu_data *rdp)
        WARN_ON_ONCE(!rcu_rdp_is_offloaded(rdp));
 
        local_irq_save(flags);
-       rcu_momentary_dyntick_idle();
+       rcu_momentary_eqs();
        local_irq_restore(flags);
        /*
         * Disable BH to provide the expected environment.  Also, when

diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
index c569da65b42157915d8cacba011cca3cab726238..354fbf2e411cef92359ca85cacbc880de9be4dcd 100644 (file)
--- a/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
@@ -869,7 +869,7 @@ static void rcu_qs(void)
 
 /*
  * Register an urgently needed quiescent state.  If there is an
- * emergency, invoke rcu_momentary_dyntick_idle() to do a heavy-weight
+ * emergency, invoke rcu_momentary_eqs() to do a heavy-weight
  * dyntick-idle quiescent state visible to other CPUs, which will in
  * some cases serve for expedited as well as normal grace periods.
  * Either way, register a lightweight quiescent state.
@@ -889,7 +889,7 @@ void rcu_all_qs(void)
        this_cpu_write(rcu_data.rcu_urgent_qs, false);
        if (unlikely(raw_cpu_read(rcu_data.rcu_need_heavy_qs))) {
                local_irq_save(flags);
-               rcu_momentary_dyntick_idle();
+               rcu_momentary_eqs();
                local_irq_restore(flags);
        }
        rcu_qs();
@@ -909,7 +909,7 @@ void rcu_note_context_switch(bool preempt)
                goto out;
        this_cpu_write(rcu_data.rcu_urgent_qs, false);
        if (unlikely(raw_cpu_read(rcu_data.rcu_need_heavy_qs)))
-               rcu_momentary_dyntick_idle();
+               rcu_momentary_eqs();
 out:
        rcu_tasks_qs(current, preempt);
        trace_rcu_utilization(TPS("End context switch"));

diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index cedb17ba158a9bf57f3510fbfc8141adbd12b74b..da821ce258ea7f8e65e6692cc0bb68fe45279bb5 100644 (file)
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -251,7 +251,7 @@ static int multi_cpu_stop(void *data)
                         */
                        touch_nmi_watchdog();
                }
-               rcu_momentary_dyntick_idle();
+               rcu_momentary_eqs();
        } while (curstate != MULTI_STOP_EXIT);
 
        local_irq_restore(flags);

diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c
index 66a871553d4a122fdf9d09f84ea3768c08a74ad1..ad86b1ba2e433117a46a14802ae44379ca4c84d8 100644 (file)
--- a/kernel/trace/trace_osnoise.c
+++ b/kernel/trace/trace_osnoise.c
@@ -1535,7 +1535,7 @@ static int run_osnoise(void)
                 * This will eventually cause unwarranted noise as PREEMPT_RCU
                 * will force preemption as the means of ending the current
                 * grace period. We avoid this problem by calling
-                * rcu_momentary_dyntick_idle(), which performs a zero duration
+                * rcu_momentary_eqs(), which performs a zero duration
                 * EQS allowing PREEMPT_RCU to end the current grace period.
                 * This call shouldn't be wrapped inside an RCU critical
                 * section.
@@ -1547,7 +1547,7 @@ static int run_osnoise(void)
                        if (!disable_irq)
                                local_irq_disable();
 
-                       rcu_momentary_dyntick_idle();
+                       rcu_momentary_eqs();
 
                        if (!disable_irq)
                                local_irq_enable();