Skip to content

Commit a257e97

Browse files
Zqianghtejun
authored andcommitted
sched_ext: Fix possible deadlock in the deferred_irq_workfn()
For PREEMPT_RT=y kernels, the deferred_irq_workfn() is executed in the per-cpu irq_work/* task context and not disable-irq, if the rq returned by container_of() is current CPU's rq, the following scenarios may occur: lock(&rq->__lock); <Interrupt> lock(&rq->__lock); This commit use IRQ_WORK_INIT_HARD() to replace init_irq_work() to initialize rq->scx.deferred_irq_work, make the deferred_irq_workfn() is always invoked in hard-irq context. Signed-off-by: Zqiang <[email protected]> Signed-off-by: Tejun Heo <[email protected]>
1 parent c87488a commit a257e97

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/sched/ext.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5321,7 +5321,7 @@ void __init init_sched_ext_class(void)
53215321
BUG_ON(!zalloc_cpumask_var_node(&rq->scx.cpus_to_kick_if_idle, GFP_KERNEL, n));
53225322
BUG_ON(!zalloc_cpumask_var_node(&rq->scx.cpus_to_preempt, GFP_KERNEL, n));
53235323
BUG_ON(!zalloc_cpumask_var_node(&rq->scx.cpus_to_wait, GFP_KERNEL, n));
5324-
init_irq_work(&rq->scx.deferred_irq_work, deferred_irq_workfn);
5324+
rq->scx.deferred_irq_work = IRQ_WORK_INIT_HARD(deferred_irq_workfn);
53255325
init_irq_work(&rq->scx.kick_cpus_irq_work, kick_cpus_irq_workfn);
53265326

53275327
if (cpu_online(cpu))

0 commit comments

Comments
 (0)