Merge tag 'stop-machine.2025.01.28a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu

torvalds · torvalds · commit f785692ff545 · 2025-01-28T11:35:58.000-08:00
Pull stop_machine update from Paul McKenney:
 "Move a misplaced call to rcu_momentary_eqs() from multi_cpu_stop() to
  ensure that interrupts are disabled as required"

* tag 'stop-machine.2025.01.28a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu:
  stop_machine: Fix rcu_momentary_eqs() call in multi_cpu_stop()
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
@@ -250,8 +250,8 @@ static int multi_cpu_stop(void *data)
 			 * be detected and reported on their side.
 			 */
 			touch_nmi_watchdog();
+			rcu_momentary_eqs();
 		}
-		rcu_momentary_eqs();
 	} while (curstate != MULTI_STOP_EXIT);
 
 	local_irq_restore(flags);

Original file line number	Diff line number	Diff line change
`@@ -250,8 +250,8 @@ static int multi_cpu_stop(void *data)`
`250`	`250`	`* be detected and reported on their side.`
`251`	`251`	`*/`
`252`	`252`	`touch_nmi_watchdog();`
	`253`	`+ rcu_momentary_eqs();`
`253`	`254`	`}`
`254`		`- rcu_momentary_eqs();`
`255`	`255`	`} while (curstate != MULTI_STOP_EXIT);`
`256`	`256`
`257`	`257`	`local_irq_restore(flags);`