Skip to content

Commit d52d3a2

Browse files
joelagnelpaulmckrcu
authored andcommitted
torture: Fix hang during kthread shutdown phase
During rcutorture shutdown, the rcu_torture_cleanup() function calls torture_cleanup_begin(), which sets the fullstop global variable to FULLSTOP_RMMOD. This causes the rcutorture threads for readers and fakewriters to exit all of their "while" loops and start shutting down. They then call torture_kthread_stopping(), which in turn waits for kthread_stop() to be called. However, rcu_torture_cleanup() has not yet called kthread_stop() on those threads, and before it gets a chance to do so, multiple instances of torture_kthread_stopping() invoke schedule_timeout_interruptible(1) in a tight loop. Tracing confirms that TIMER_SOFTIRQ can then continuously execute timer callbacks. If that TIMER_SOFTIRQ preempts the task executing rcu_torture_cleanup(), that task might never invoke kthread_stop(). This commit improves this situation by increasing the timeout passed to schedule_timeout_interruptible() from one jiffy to 1/20th of a second. This change prevents TIMER_SOFTIRQ from monopolizing its CPU, thus allowing rcu_torture_cleanup() to carry out the needed kthread_stop() invocations. Testing has shown 100 runs of TREE07 passing reliably, as oppose to the tens-of-percent failure rates seen beforehand. Cc: Paul McKenney <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Zhouyi Zhou <[email protected]> Cc: <[email protected]> # 6.0.x Signed-off-by: Joel Fernandes (Google) <[email protected]> Tested-by: Zhouyi Zhou <[email protected]> Reviewed-by: Davidlohr Bueso <[email protected]> Signed-off-by: Paul E. McKenney <[email protected]>
1 parent 2736615 commit d52d3a2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/torture.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ void torture_kthread_stopping(char *title)
915915
VERBOSE_TOROUT_STRING(buf);
916916
while (!kthread_should_stop()) {
917917
torture_shutdown_absorb(title);
918-
schedule_timeout_uninterruptible(1);
918+
schedule_timeout_uninterruptible(HZ / 20);
919919
}
920920
}
921921
EXPORT_SYMBOL_GPL(torture_kthread_stopping);

0 commit comments

Comments
 (0)