sched_ext: Fix stale errno in scx_sub_enable_workfn()
Subsystems (2)
PATCH 1/1 sched_ext: Fix stale errno in scx_sub_enable_workfn()
scx_sub_enable_workfn() drops the return value of validate_ops(). When validate_ops() fails, the function jumps to err_disable with ret still holding 0 from the previous call, 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 validate_ops() records its own scx_error() first and the first error wins, but it leaves the fallback broken for this path. Save the return value into ret, like scx_root_enable_workfn() already does.
The nesting depth check and the cgroup online check also reach err_disable without setting ret. Set -EINVAL and -ENODEV there so the fallback always reports a real errno.
--- kernel/sched/ext/ext.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/sched/ext/ext.c +4 -1
@@ -7559,6 +7559,7 @@ static 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; }
@@ -7580,7 +7581,8 @@ static void scx_sub_enable_workfn(struct kthread_work *work)if (ret) goto err_disable; -if (validate_ops (sch, ops)) + ret =validate_ops (sch, ops); +if (ret) goto err_disable;struct scx_sub_attach_args sub_attach_args = {
@@ -7613,6 +7615,7 @@ static 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; }
base-commit: 1229e2e57a5c2980ccd457b9b53ea0eed5a22ab3
Signature · 1 line
2.34.1
Andrea Righi
reviewerHi Cui,
Quoted 12 lines · Cui Jian
scx_sub_enable_workfn()drops the return value ofvalidate_ops(). Whenvalidate_ops()fails, the function jumps toerr_disablewith ret still holding 0 from the previous call, so the fallback error added by commitdb4e9defd2e8("sched_ext: Record an error on errno-only sub-enable failure") reports "scx_sub_enable()failed (0)".This is currently harmless because
validate_ops()records its ownscx_error()first and the first error wins, but it leaves the fallback broken for this path. Save the return value into ret, likescx_root_enable_workfn()already does.
Quoted 5 lines
The nesting depth check and the cgroup online check also reach
err_disablewithout setting ret. Set-EINVALand-ENODEVthere so the fallback always reports a real errno.Signed-off-by Cui Jian <[email protected]>
This doesn't apply anymore, but the logic should still be valid. Can you rebase it to the latest branch?
git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git for-7.3
Thanks,
-Andrea
Quoted 39 lines
--- kernel/sched/ext/ext.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)kernel/sched/ext/ext.c +4
-1@@ -7559,6 +7559,7 @@ static 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; }@@ -7580,7 +7581,8 @@ static void scx_sub_enable_workfn(struct kthread_work *work)if (ret) goto err_disable; -if (validate_ops (sch, ops)) + ret =validate_ops (sch, ops); +if (ret) goto err_disable;struct scx_sub_attach_args sub_attach_args = {@@ -7613,6 +7615,7 @@ static 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; }base-commit:
1229e2e57a5c2980ccd457b9b53ea0eed5a22ab3Signature · 1 line
2.34.1
PATCH v2 1/1 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.
--- kernel/sched/ext/sub.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/sched/ext/sub.c +2 -0
@@ -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; }
Signature · 1 line
2.34.1
Hi Cui,
Quoted 11 lines · Cui Jian
The nesting depth check and the cgroup online check in
scx_sub_enable_workfn()reacherr_disablewithout setting ret, so the fallback error added by commitdb4e9defd2e8("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-EINVALand-ENODEVthere so the fallback always reports a real errno.
Quoted 5 lines
v2: The
validate_ops()path from v1 is already fixed in for-7.3
(sub.calready has ret =scx_validate_ops()), so only the two remaining paths are addressed.Signed-off-by Cui Jian <[email protected]>
Looks good to me now.
Thanks,
-Andrea
Quoted 27 lines
--- kernel/sched/ext/sub.c | 2 ++ 1 file changed, 2 insertions(+)kernel/sched/ext/sub.c +2
-0@@ -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; }Signature · 1 line
2.34.1
Hello,
Quoted 5 lines · Cui Jian
The nesting depth check and the cgroup online check in
scx_sub_enable_workfn()reacherr_disablewithout setting ret, so the fallback error added by commitdb4e9defd2e8("sched_ext: Record an error on errno-only sub-enable failure") reports "scx_sub_enable()failed (0)".
Applied to sched_ext/for-7.3.
Thanks.
Signature · 1 line
tejun