github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 16:12:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

sched_ext: Merge branch 'for-6.18-fixes' into for-6.19

Browse Source 
Pull sched_ext/for-6.18-fixes to sync trees to receive:

 05e63305c8 ("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>
This commit is contained in:
Tejun Heo 2025-10-16 08:34:12 -10:00
commit 075e3f7206
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/sched/ext.c
View File

@ -792,7 +792,7 @@ static void schedule_deferred(struct rq *rq)
return;
/* Don't do anything if there already is a deferred operation. */
if (rq->scx.flags & SCX_RQ_BAL_PENDING)
if (rq->scx.flags & SCX_RQ_BAL_CB_PENDING)
return;
/*
@ -4611,15 +4611,15 @@ static int scx_enable(struct sched_ext_ops *ops, struct bpf_link *link)
mutex_lock(&scx_enable_mutex);
if (scx_enable_state() != SCX_DISABLED) {
ret = -EBUSY;
goto err_unlock;
}
ret = alloc_kick_pseqs();
if (ret)
goto err_unlock;
if (scx_enable_state() != SCX_DISABLED) {
ret = -EBUSY;
goto err_free_pseqs;
}
sch = scx_alloc_and_add_sched(ops);
if (IS_ERR(sch)) {
ret = PTR_ERR(sch);