Commit 0c66b0da authored by Tejun Heo's avatar Tejun Heo
Browse files

sched_ext: Fix cgroup double-put on sub-sched abort path 



The abort path in scx_sub_enable_workfn() fell through to out_put_cgrp,
double-putting the cgroup ref already owned by sch->cgrp. It also skipped
kthread_flush_work() needed to flush the disable path.

Relocate the abort block above err_unlock_and_disable so it falls through to
err_disable.

Fixes: 337ec00b ("sched_ext: Implement cgroup sub-sched enabling and disabling")
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reviewed-by: default avatarAndrea Righi <arighi@nvidia.com>
parent f96bc0fa

kernel/sched/ext.c

+7 −9
Original line number Diff line number Diff line
@@ -7050,6 +7050,13 @@ static void scx_sub_enable_workfn(struct kthread_work *work) 
	ret = 0;

	goto out_unlock;



out_put_cgrp:

	cgroup_put(cgrp);

out_unlock:

	mutex_unlock(&scx_enable_mutex);

	cmd->ret = ret;

	return;



abort:

	put_task_struct(p);

	scx_task_iter_stop(&sti);
@@ -7063,15 +7070,6 @@ static void scx_sub_enable_workfn(struct kthread_work *work) 
		}

	}

	scx_task_iter_stop(&sti);

	scx_cgroup_unlock();

	percpu_up_write(&scx_fork_rwsem);

out_put_cgrp:

	cgroup_put(cgrp);

out_unlock:

	mutex_unlock(&scx_enable_mutex);

	cmd->ret = ret;

	return;



err_unlock_and_disable:

	/* we'll soon enter disable path, keep bypass on */

	scx_cgroup_unlock();