rcu: Rename rcu_implicit_dynticks_qs() into rcu_watching_snap_recheck()

valschneider · Neeraj Upadhyay · commit 3b18eb3f9f9e · 2024-08-15T21:30:42.000+05:30
The context_tracking.state RCU_DYNTICKS subvariable has been renamed to
RCU_WATCHING, drop the dyntick reference and update the name of this helper
to express that it rechecks rdp-&gt;watching_snap after an earlier
rcu_watching_snap_save().

Signed-off-by: Valentin Schneider &lt;vschneid@redhat.com&gt;
Reviewed-by: Frederic Weisbecker &lt;frederic@kernel.org&gt;
Signed-off-by: Neeraj Upadhyay &lt;neeraj.upadhyay@kernel.org&gt;
diff --git a/Documentation/RCU/Design/Memory-Ordering/TreeRCU-dyntick.svg b/Documentation/RCU/Design/Memory-Ordering/TreeRCU-dyntick.svg
@@ -537,7 +537,7 @@
        font-style="normal"
        y="-8368.1475"
        x="2463.3262"
-       xml:space="preserve">rcu_implicit_dynticks_qs()</text>
+       xml:space="preserve">rcu_watching_snap_recheck()</text>
   </g>
   <g
      id="g4504"
diff --git a/Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-fqs.svg b/Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-fqs.svg
@@ -899,7 +899,7 @@
      font-style="normal"
      y="1858.8729"
      x="4414.1836"
-     xml:space="preserve">rcu_implicit_dynticks_qs()</text>
+     xml:space="preserve">rcu_watching_snap_recheck()</text>
   <text
      xml:space="preserve"
      x="14659.87"
diff --git a/Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp.svg b/Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp.svg
@@ -3029,7 +3029,7 @@
        font-style="normal"
        y="38425.035"
        x="-337.79462"
-       xml:space="preserve">rcu_implicit_dynticks_qs()</text>
+       xml:space="preserve">rcu_watching_snap_recheck()</text>
     <text
        xml:space="preserve"
        x="9907.8887"
diff --git a/Documentation/RCU/Design/Memory-Ordering/TreeRCU-hotplug.svg b/Documentation/RCU/Design/Memory-Ordering/TreeRCU-hotplug.svg
@@ -525,7 +525,7 @@
        font-style="normal"
        y="-8368.1475"
        x="2463.3262"
-       xml:space="preserve">rcu_implicit_dynticks_qs()</text>
+       xml:space="preserve">rcu_watching_snap_recheck()</text>
     <text
        sodipodi:linespacing="125%"
        style="font-size:192px;font-style:normal;font-weight:bold;line-height:125%;text-anchor:start;fill:#000000;stroke-width:0.025in;font-family:Courier"
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
@@ -812,7 +812,7 @@ static int rcu_watching_snap_save(struct rcu_data *rdp)
  *
  * Returns zero otherwise.
  */
-static int rcu_implicit_dynticks_qs(struct rcu_data *rdp)
+static int rcu_watching_snap_recheck(struct rcu_data *rdp)
 {
 	unsigned long jtsq;
 	int ret = 0;
@@ -1998,7 +1998,7 @@ static void rcu_gp_fqs(bool first_time)
 		force_qs_rnp(rcu_watching_snap_save);
 	} else {
 		/* Handle dyntick-idle and offline CPUs. */
-		force_qs_rnp(rcu_implicit_dynticks_qs);
+		force_qs_rnp(rcu_watching_snap_recheck);
 	}
 	/* Clear flag to prevent immediate re-entry. */
 	if (READ_ONCE(rcu_state.gp_flags) & RCU_GP_FLAG_FQS) {

Original file line number	Diff line number	Diff line change
`@@ -812,7 +812,7 @@ static int rcu_watching_snap_save(struct rcu_data *rdp)`
`812`	`812`	`*`
`813`	`813`	`* Returns zero otherwise.`
`814`	`814`	`*/`
`815`		`-static int rcu_implicit_dynticks_qs(struct rcu_data *rdp)`
	`815`	`+static int rcu_watching_snap_recheck(struct rcu_data *rdp)`
`816`	`816`	`{`
`817`	`817`	`unsigned long jtsq;`
`818`	`818`	`int ret = 0;`
`@@ -1998,7 +1998,7 @@ static void rcu_gp_fqs(bool first_time)`
`1998`	`1998`	`force_qs_rnp(rcu_watching_snap_save);`
`1999`	`1999`	`} else {`
`2000`	`2000`	`/* Handle dyntick-idle and offline CPUs. */`
`2001`		`- force_qs_rnp(rcu_implicit_dynticks_qs);`
	`2001`	`+ force_qs_rnp(rcu_watching_snap_recheck);`
`2002`	`2002`	`}`
`2003`	`2003`	`/* Clear flag to prevent immediate re-entry. */`
`2004`	`2004`	`if (READ_ONCE(rcu_state.gp_flags) & RCU_GP_FLAG_FQS) {`