Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
sched_ext: Merge branch 'for-6.18-fixes' into for-6.19
Pull sched_ext/for-6.18-fixes to sync trees to receive:
05e63305c85c ("sched_ext: Fix scx_kick_pseqs corruption on concurrent scheduler loads")
to avoid conflicts with planned cgroup sub-sched support.
Signed-off-by: Tejun Heo <tj@kernel.org>
+6
-6
+6
-6
kernel/sched/ext.c
+6
-6
kernel/sched/ext.c
···
792
792
return;
793
793
794
794
/* Don't do anything if there already is a deferred operation. */
795
-
if (rq->scx.flags & SCX_RQ_BAL_PENDING)
795
+
if (rq->scx.flags & SCX_RQ_BAL_CB_PENDING)
796
796
return;
797
797
798
798
/*
···
4611
4611
4612
4612
mutex_lock(&scx_enable_mutex);
4613
4613
4614
+
if (scx_enable_state() != SCX_DISABLED) {
4615
+
ret = -EBUSY;
4616
+
goto err_unlock;
4617
+
}
4618
+
4614
4619
ret = alloc_kick_pseqs();
4615
4620
if (ret)
4616
4621
goto err_unlock;
4617
-
4618
-
if (scx_enable_state() != SCX_DISABLED) {
4619
-
ret = -EBUSY;
4620
-
goto err_free_pseqs;
4621
-
}
4622
4622
4623
4623
sch = scx_alloc_and_add_sched(ops);
4624
4624
if (IS_ERR(sch)) {