Commit 72763ea3 authored by Tejun Heo's avatar Tejun Heo
Browse files

sched_ext: Fix unsafe list iteration in process_ddsp_deferred_locals() 



process_ddsp_deferred_locals() executes deferred direct dispatches to the
local DSQs of remote CPUs. It iterates the tasks on
rq->scx.ddsp_deferred_locals list, removing and calling
dispatch_to_local_dsq() on each. However, the list is protected by the rq
lock that can be dropped by dispatch_to_local_dsq() temporarily, so the list
can be modified during the iteration, which can lead to oopses and other
failures.

Fix it by popping from the head of the list instead of iterating the list.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Fixes: 5b26f7b9 ("sched_ext: Allow SCX_DSQ_LOCAL_ON for direct dispatches")
Acked-by: default avatarDavid Vernet <void@manifault.com>
parent 2c390dda

kernel/sched/ext.c

+6 −4
Original line number Diff line number Diff line
@@ -2726,17 +2726,19 @@ static void set_next_task_scx(struct rq *rq, struct task_struct *p, bool first) 


static void process_ddsp_deferred_locals(struct rq *rq)

{

	struct task_struct *p, *tmp;

	struct task_struct *p;



	lockdep_assert_rq_held(rq);



	/*

	 * Now that @rq can be unlocked, execute the deferred enqueueing of

	 * tasks directly dispatched to the local DSQs of other CPUs. See

	 * direct_dispatch().

	 * direct_dispatch(). Keep popping from the head instead of using

	 * list_for_each_entry_safe() as dispatch_local_dsq() may unlock @rq

	 * temporarily.

	 */

	list_for_each_entry_safe(p, tmp, &rq->scx.ddsp_deferred_locals,

				 scx.dsq_list.node) {

	while ((p = list_first_entry_or_null(&rq->scx.ddsp_deferred_locals,

				struct task_struct, scx.dsq_list.node))) {

		s32 ret;



		list_del_init(&p->scx.dsq_list.node);