Skip to content

Commit 32a9f26

Browse files
valschneiderNeeraj Upadhyay
authored andcommitted
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 <[email protected]> Reviewed-by: Frederic Weisbecker <[email protected]> Signed-off-by: Neeraj Upadhyay <[email protected]>
1 parent 3b18eb3 commit 32a9f26

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

include/linux/rcutiny.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ void rcu_scheduler_starting(void);
158158
static inline void rcu_end_inkernel_boot(void) { }
159159
static inline bool rcu_inkernel_boot_has_ended(void) { return true; }
160160
static inline bool rcu_is_watching(void) { return true; }
161-
static inline void rcu_momentary_dyntick_idle(void) { }
161+
static inline void rcu_momentary_eqs(void) { }
162162
static inline void kfree_rcu_scheduler_running(void) { }
163163
static inline bool rcu_gp_might_be_stalled(void) { return false; }
164164

include/linux/rcutree.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void synchronize_rcu_expedited(void);
3737
void kvfree_call_rcu(struct rcu_head *head, void *ptr);
3838

3939
void rcu_barrier(void);
40-
void rcu_momentary_dyntick_idle(void);
40+
void rcu_momentary_eqs(void);
4141
void kfree_rcu_scheduler_running(void);
4242
bool rcu_gp_might_be_stalled(void);
4343

kernel/rcu/rcutorture.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2680,7 +2680,7 @@ static unsigned long rcu_torture_fwd_prog_cbfree(struct rcu_fwd *rfp)
26802680
rcu_torture_fwd_prog_cond_resched(freed);
26812681
if (tick_nohz_full_enabled()) {
26822682
local_irq_save(flags);
2683-
rcu_momentary_dyntick_idle();
2683+
rcu_momentary_eqs();
26842684
local_irq_restore(flags);
26852685
}
26862686
}
@@ -2830,7 +2830,7 @@ static void rcu_torture_fwd_prog_cr(struct rcu_fwd *rfp)
28302830
rcu_torture_fwd_prog_cond_resched(n_launders + n_max_cbs);
28312831
if (tick_nohz_full_enabled()) {
28322832
local_irq_save(flags);
2833-
rcu_momentary_dyntick_idle();
2833+
rcu_momentary_eqs();
28342834
local_irq_restore(flags);
28352835
}
28362836
}

kernel/rcu/tree.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ bool rcu_watching_zero_in_eqs(int cpu, int *vp)
367367
*
368368
* The caller must have disabled interrupts and must not be idle.
369369
*/
370-
notrace void rcu_momentary_dyntick_idle(void)
370+
notrace void rcu_momentary_eqs(void)
371371
{
372372
int seq;
373373

@@ -377,7 +377,7 @@ notrace void rcu_momentary_dyntick_idle(void)
377377
WARN_ON_ONCE(!(seq & CT_RCU_WATCHING));
378378
rcu_preempt_deferred_qs(current);
379379
}
380-
EXPORT_SYMBOL_GPL(rcu_momentary_dyntick_idle);
380+
EXPORT_SYMBOL_GPL(rcu_momentary_eqs);
381381

382382
/**
383383
* rcu_is_cpu_rrupt_from_idle - see if 'interrupted' from idle

kernel/rcu/tree_nocb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -917,7 +917,7 @@ static void nocb_cb_wait(struct rcu_data *rdp)
917917
WARN_ON_ONCE(!rcu_rdp_is_offloaded(rdp));
918918

919919
local_irq_save(flags);
920-
rcu_momentary_dyntick_idle();
920+
rcu_momentary_eqs();
921921
local_irq_restore(flags);
922922
/*
923923
* Disable BH to provide the expected environment. Also, when

kernel/rcu/tree_plugin.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,7 @@ static void rcu_qs(void)
869869

870870
/*
871871
* Register an urgently needed quiescent state. If there is an
872-
* emergency, invoke rcu_momentary_dyntick_idle() to do a heavy-weight
872+
* emergency, invoke rcu_momentary_eqs() to do a heavy-weight
873873
* dyntick-idle quiescent state visible to other CPUs, which will in
874874
* some cases serve for expedited as well as normal grace periods.
875875
* Either way, register a lightweight quiescent state.
@@ -889,7 +889,7 @@ void rcu_all_qs(void)
889889
this_cpu_write(rcu_data.rcu_urgent_qs, false);
890890
if (unlikely(raw_cpu_read(rcu_data.rcu_need_heavy_qs))) {
891891
local_irq_save(flags);
892-
rcu_momentary_dyntick_idle();
892+
rcu_momentary_eqs();
893893
local_irq_restore(flags);
894894
}
895895
rcu_qs();
@@ -909,7 +909,7 @@ void rcu_note_context_switch(bool preempt)
909909
goto out;
910910
this_cpu_write(rcu_data.rcu_urgent_qs, false);
911911
if (unlikely(raw_cpu_read(rcu_data.rcu_need_heavy_qs)))
912-
rcu_momentary_dyntick_idle();
912+
rcu_momentary_eqs();
913913
out:
914914
rcu_tasks_qs(current, preempt);
915915
trace_rcu_utilization(TPS("End context switch"));

kernel/stop_machine.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ static int multi_cpu_stop(void *data)
251251
*/
252252
touch_nmi_watchdog();
253253
}
254-
rcu_momentary_dyntick_idle();
254+
rcu_momentary_eqs();
255255
} while (curstate != MULTI_STOP_EXIT);
256256

257257
local_irq_restore(flags);

kernel/trace/trace_osnoise.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1535,7 +1535,7 @@ static int run_osnoise(void)
15351535
* This will eventually cause unwarranted noise as PREEMPT_RCU
15361536
* will force preemption as the means of ending the current
15371537
* grace period. We avoid this problem by calling
1538-
* rcu_momentary_dyntick_idle(), which performs a zero duration
1538+
* rcu_momentary_eqs(), which performs a zero duration
15391539
* EQS allowing PREEMPT_RCU to end the current grace period.
15401540
* This call shouldn't be wrapped inside an RCU critical
15411541
* section.
@@ -1547,7 +1547,7 @@ static int run_osnoise(void)
15471547
if (!disable_irq)
15481548
local_irq_disable();
15491549

1550-
rcu_momentary_dyntick_idle();
1550+
rcu_momentary_eqs();
15511551

15521552
if (!disable_irq)
15531553
local_irq_enable();

0 commit comments

Comments
 (0)