Merge pull request raspberrypi#127 from sched-ext/htejun

scx: rq should be locked when calling scx_ops_exit_task() from scx_cancel_fork()
0lxb · Jan 23, 2024 · 0c6e66d · 0c6e66d
2 parents 7f7f3c9 + 5046ce8
commit 0c6e66d
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c
@@ -2524,8 +2524,13 @@ void scx_post_fork(struct task_struct *p)
 void scx_cancel_fork(struct task_struct *p)
 {
 	if (scx_enabled()) {
+		struct rq *rq;
+		struct rq_flags rf;
+
+		rq = task_rq_lock(p, &rf);
 		WARN_ON_ONCE(scx_get_task_state(p) >= SCX_TASK_READY);
 		scx_ops_exit_task(p);
+		task_rq_unlock(rq, p, &rf);
 	}
 	percpu_up_read(&scx_fork_rwsem);
 }