Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sched_ext: Make scx_rq_online() also test cpu_active() in addition to SCX_RQ_ONLINE

scx_rq_online() currently only tests SCX_RQ_ONLINE. This isn't fully correct
- e.g. consume_dispatch_q() uses task_run_on_remote_rq() which tests
scx_rq_online() to see whether the current rq can run the task, and, if so,
calls consume_remote_task() to migrate the task to @rq. While the test
itself was done while locking @rq, @rq can be temporarily unlocked by
consume_remote_task() and nothing prevents SCX_RQ_ONLINE from going offline
before the migration takes place.

To address the issue, add cpu_active() test to scx_rq_online(). There is a
synchronize_rcu() between cpu_active() being cleared and the rq going
offline, so if an on-going scheduling operation sees cpu_active(), the
associated rq is guaranteed to not go offline until the scheduling operation
is complete.

Signed-off-by: Tejun Heo <tj@kernel.org>
Fixes: 60c27fb59f6c ("sched_ext: Implement sched_ext_ops.cpu_online/offline()")
Acked-by: David Vernet <void@manifault.com>

+8 -1
+8 -1
kernel/sched/ext.c
··· 1818 1818 1819 1819 static bool scx_rq_online(struct rq *rq) 1820 1820 { 1821 - return likely(rq->scx.flags & SCX_RQ_ONLINE); 1821 + /* 1822 + * Test both cpu_active() and %SCX_RQ_ONLINE. %SCX_RQ_ONLINE indicates 1823 + * the online state as seen from the BPF scheduler. cpu_active() test 1824 + * guarantees that, if this function returns %true, %SCX_RQ_ONLINE will 1825 + * stay set until the current scheduling operation is complete even if 1826 + * we aren't locking @rq. 1827 + */ 1828 + return likely((rq->scx.flags & SCX_RQ_ONLINE) && cpu_active(cpu_of(rq))); 1822 1829 } 1823 1830 1824 1831 static void do_enqueue_task(struct rq *rq, struct task_struct *p, u64 enq_flags,