Skip to content

Commit af13e5e

Browse files
author
Peter Zijlstra
committed
sched: Fix the do_set_cpus_allowed() locking fix
Commit abfc010 ("sched: Fix do_set_cpus_allowed() locking") overlooked that __balance_push_cpu_stop() calls select_fallback_rq() with rq->lock held. This makes that set_cpus_allowed_force() will recursively take rq->lock and the machine locks up. Run select_fallback_rq() earlier, without holding rq->lock. This opens up a race window where a task could get migrated out from under us, but that is harmless, we want the task migrated. select_fallback_rq() itself will not be subject to concurrency as it will be fully serialized by p->pi_lock, so there is no chance of set_cpus_allowed_force() getting called with different arguments and selecting different fallback CPUs for one task. Fixes: abfc010 ("sched: Fix do_set_cpus_allowed() locking") Reported-by: Jan Polensky <japo@linux.ibm.com> Reported-by: kernel test robot <oliver.sang@intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Tested-by: Jan Polensky <japo@linux.ibm.com> Closes: https://lore.kernel.org/oe-lkp/202510271206.24495a68-lkp@intel.com Link: https://patch.msgid.link/20251027110133.GI3245006@noisy.programming.kicks-ass.net
1 parent 73cbcfe commit af13e5e

1 file changed

Lines changed: 7 additions & 10 deletions

File tree

kernel/sched/core.c

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8044,18 +8044,15 @@ static int __balance_push_cpu_stop(void *arg)
80448044
struct rq_flags rf;
80458045
int cpu;
80468046

8047-
raw_spin_lock_irq(&p->pi_lock);
8048-
rq_lock(rq, &rf);
8049-
8050-
update_rq_clock(rq);
8051-
8052-
if (task_rq(p) == rq && task_on_rq_queued(p)) {
8047+
scoped_guard (raw_spinlock_irq, &p->pi_lock) {
80538048
cpu = select_fallback_rq(rq->cpu, p);
8054-
rq = __migrate_task(rq, &rf, p, cpu);
8055-
}
80568049

8057-
rq_unlock(rq, &rf);
8058-
raw_spin_unlock_irq(&p->pi_lock);
8050+
rq_lock(rq, &rf);
8051+
update_rq_clock(rq);
8052+
if (task_rq(p) == rq && task_on_rq_queued(p))
8053+
rq = __migrate_task(rq, &rf, p, cpu);
8054+
rq_unlock(rq, &rf);
8055+
}
80598056

80608057
put_task_struct(p);
80618058

0 commit comments

Comments
 (0)