Commit 075e3f72 authored by Tejun Heo's avatar Tejun Heo
Browse files

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



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

 05e63305 ("sched_ext: Fix scx_kick_pseqs corruption on concurrent scheduler loads")

to avoid conflicts with planned cgroup sub-sched support.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parents 5aff3b31 a3c4a0a4

kernel/sched/ext.c

+6 −6
Original line number Diff line number Diff line
@@ -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);



	ret = alloc_kick_pseqs();

	if (ret)

		goto err_unlock;



	if (scx_enable_state() != SCX_DISABLED) {

		ret = -EBUSY;

		goto err_free_pseqs;

		goto err_unlock;

	}



	ret = alloc_kick_pseqs();

	if (ret)

		goto err_unlock;



	sch = scx_alloc_and_add_sched(ops);

	if (IS_ERR(sch)) {

		ret = PTR_ERR(sch);