Skip to contentSkip to conversation

sched/core: handle affine_move_task failure case gracefully

PATCH In review Daniel Vacek 2 participants 2 messages Aug 14, 2024 – Aug 20, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 sched/core: handle affine_move_task failure case gracefully

CPU hangs were reported while offlining/onlining CPUs on s390.

Analyzing the vmcore data shows stop_one_cpu_nowait() in affine_move_task() can fail when racing with off-/on-lining resulting in a deadlock waiting for the pending migration stop work completion which is never done.

Fix this by gracefully handling such condition.

Fixes 9e81889c7648 ("sched: Fix affine_move_task() self-concurrency")
---
 kernel/sched/core.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)
kernel/sched/core.c +19 -2
index f3951e4a55e5b..40a3c9ff74077 100644
@@ -2871,8 +2871,25 @@ static int affine_move_task(struct rq *rq, struct task_struct *p, struct rq_flag
 		preempt_disable();
 		task_rq_unlock(rq, p, rf);
 		if (!stop_pending) {
-			stop_one_cpu_nowait(cpu_of(rq), migration_cpu_stop,
-					    &pending->arg, &pending->stop_work);
+			stop_pending =
+				stop_one_cpu_nowait(cpu_of(rq), migration_cpu_stop,
+						    &pending->arg, &pending->stop_work);
+			/*
+			 * The state resulting in this failure is not expected
+			 * at this point. At least report a WARNING to be able
+			 * to panic and further debug if reproduced.
+			 */
+			if (WARN_ON(!stop_pending)) {
+				/*
+				 * Then try to handle the failure gracefully
+				 * to prevent the deadlock a few lines later.
+				 */
+				rq = task_rq_lock(p, rf);
+				pending->stop_pending = false;
+				p->migration_pending = NULL;
+				task_rq_unlock(rq, p, rf);
+				complete_all(&pending->done);
+			}
 		}
 		preempt_enable();
 
Signature · 1 line
2.43.0
#1 lore raw
Quoted 26 lines · Daniel Vacek

CPU hangs were reported while offlining/onlining CPUs on s390.

Analyzing the vmcore data shows stop_one_cpu_nowait() in affine_move_task() can fail when racing with off-/on-lining resulting in a deadlock waiting for the pending migration stop work completion which is never done.

Fix this by gracefully handling such condition.

Fixes 9e81889c7648 ("sched: Fix affine_move_task() self-concurrency")
---
 kernel/sched/core.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)
kernel/sched/core.c +0 -1
index f3951e4a55e5b..40a3c9ff74077 100644
@@ -2871,8 +2871,25 @@ static int affine_move_task(struct rq *rq, struct task_struct *p, struct rq_flag
              preempt_disable();
              task_rq_unlock(rq, p, rf);
              if (!stop_pending) {
-			stop_one_cpu_nowait(cpu_of(rq), migration_cpu_stop,

kernel/sched/core.c static int affine_move_task(struct rq *rq, struct task_struct *p, struct rq_flag · line 2882

Quoted 10 lines
kernel/sched/core.c +9 -1
-					    &pending->arg, &pending->stop_work);
+			stop_pending =
+				stop_one_cpu_nowait(cpu_of(rq), migration_cpu_stop,
+						    &pending->arg, &pending->stop_work);
+			/*
+			 * The state resulting in this failure is not expected
+			 * at this point. At least report a WARNING to be able
+			 * to panic and further debug if reproduced.
+			 */
+			if (WARN_ON(!stop_pending)) {

I don't think it can happen when @p's CPU is being hot-unplugged, because takedown_cpu()->take_cpu_down() is done via stop_machine_cpuslocked(), so that task waking/running on that CPU implies the stopper is enabled.

I'm thinking there may be a window somewhere during hotplug, something like so?

CPU0                       CPU1                       CPU2
----                       ----                       ----

secondary_start_kernel()
set_cpu_online(true)
wake_up_process(p)
WRITE_ONCE(p->__state, TASK_WAKING); set_task_cpu(p, CPU1) // CPU1 is prev CPU

  ttwu_queue_wakelist();
                                                     affine_move_task(p)
                                                       stop_one_cpu_nowait() // FAILS

                             cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);
                               cpuhp_online_idle()
                                 stop_machine_unpark(); // <-- too late