2021-12-03 23:33:22

by Andrew Halaney

Subject: [PATCH] preempt/dynamic: Fix setup_preempt_mode() return value

__setup() callbacks expect 1 for success and 0 for failure. Correct the
usage here to reflect that.

Fixes: 826bfeb37bb4 ("preempt/dynamic: Support dynamic preempt with preempt= boot option")
Reported-by: Mark Rutland <[email protected]>
Signed-off-by: Andrew Halaney <[email protected]>
---
kernel/sched/core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 3592942ea29c..d4f60583be6e 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -6730,11 +6730,11 @@ static int __init setup_preempt_mode(char *str)
int mode = sched_dynamic_mode(str);
if (mode < 0) {
pr_warn("Dynamic Preempt: unsupported mode: %s\n", str);
- return 1;
+ return 0;
}

sched_dynamic_update(mode);
- return 0;
+ return 1;
}
__setup("preempt=", setup_preempt_mode);

--
2.31.1

2021-12-04 09:41:21

by Peter Zijlstra

Subject: Re: [PATCH] preempt/dynamic: Fix setup_preempt_mode() return value

On Fri, Dec 03, 2021 at 05:32:03PM -0600, Andrew Halaney wrote:
> __setup() callbacks expect 1 for success and 0 for failure. Correct the
> usage here to reflect that.
>
> Fixes: 826bfeb37bb4 ("preempt/dynamic: Support dynamic preempt with preempt= boot option")
> Reported-by: Mark Rutland <[email protected]>
> Signed-off-by: Andrew Halaney <[email protected]>

Thanks!

2021-12-04 13:40:13

by tip-bot2 for Alexey Makhalov

Subject: [tip: sched/urgent] preempt/dynamic: Fix setup_preempt_mode() return value

The following commit has been merged into the sched/urgent branch of tip:

Commit-ID: 9ed20bafc85806ca6c97c9128cec46c3ef80ae86
Gitweb: https://git.kernel.org/tip/9ed20bafc85806ca6c97c9128cec46c3ef80ae86
Author: Andrew Halaney <[email protected]>
AuthorDate: Fri, 03 Dec 2021 17:32:03 -06:00
Committer: Peter Zijlstra <[email protected]>
CommitterDate: Sat, 04 Dec 2021 10:56:18 +01:00

preempt/dynamic: Fix setup_preempt_mode() return value

__setup() callbacks expect 1 for success and 0 for failure. Correct the
usage here to reflect that.

Fixes: 826bfeb37bb4 ("preempt/dynamic: Support dynamic preempt with preempt= boot option")
Reported-by: Mark Rutland <[email protected]>
Signed-off-by: Andrew Halaney <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
kernel/sched/core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 76f9dee..814c52d 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -6617,11 +6617,11 @@ static int __init setup_preempt_mode(char *str)
int mode = sched_dynamic_mode(str);
if (mode < 0) {
pr_warn("Dynamic Preempt: unsupported mode: %s\n", str);
- return 1;
+ return 0;
}

sched_dynamic_update(mode);
- return 0;
+ return 1;
}
__setup("preempt=", setup_preempt_mode);