diff options
| author | Cui Jian <cjian720@163.com> | 2026-07-22 18:03:52 +0800 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-07-22 08:31:30 -1000 |
| commit | 00a08ddfb48bb85885a8665bc56716c4d2f9bd82 (patch) | |
| tree | cc1a4511996a84f2bad7855536d109014a33bc43 | |
| parent | 2abee44c7db9fa7c2d380fc25866617f59a9c1e0 (diff) | |
| download | linux-next-00a08ddfb48bb85885a8665bc56716c4d2f9bd82.tar.gz linux-next-00a08ddfb48bb85885a8665bc56716c4d2f9bd82.zip | |
sched_ext: Fix stale errno in scx_sub_enable_workfn()
The nesting depth check and the cgroup online check in
scx_sub_enable_workfn() reach err_disable without setting ret, so
the fallback error added by commit db4e9defd2e8 ("sched_ext: Record
an error on errno-only sub-enable failure") reports
"scx_sub_enable() failed (0)".
This is currently harmless because both paths record their own
scx_error() first and the first error wins, but it leaves the
fallback broken for these paths. Set -EINVAL and -ENODEV there
so the fallback always reports a real errno.
v2: The validate_ops() path from v1 is already fixed in for-7.3
(sub.c already has ret = scx_validate_ops()), so only the two
remaining paths are addressed.
Signed-off-by: Cui Jian <cjian720@163.com>
Reviewed-by: Andrea Righi <arighi@nvidia.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
| -rw-r--r-- | kernel/sched/ext/sub.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched/ext/sub.c b/kernel/sched/ext/sub.c index d7842a609d96..6da6c91e4287 100644 --- a/kernel/sched/ext/sub.c +++ b/kernel/sched/ext/sub.c @@ -1331,6 +1331,7 @@ void scx_sub_enable_workfn(struct kthread_work *work) if (sch->level >= SCX_SUB_MAX_DEPTH) { scx_error(sch, "max nesting depth %d violated", SCX_SUB_MAX_DEPTH); + ret = -EINVAL; goto err_disable; } @@ -1378,6 +1379,7 @@ void scx_sub_enable_workfn(struct kthread_work *work) set_cgroup_sched(sch_cgroup(sch), sch); if (!(cgrp->self.flags & CSS_ONLINE)) { scx_error(sch, "cgroup is not online"); + ret = -ENODEV; goto err_unlock_and_disable; } |