2021-03-25 03:38:43

by Rasmus Villemoes

Subject: [PATCH 1/2] sched: stop using magic values in sched_dynamic_mode

Use the enum names which are also what is used in the switch() in
sched_dynamic_update().

Signed-off-by: Rasmus Villemoes <[email protected]>
---
kernel/sched/core.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 98191218d891..3959481261bb 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5370,13 +5370,13 @@ static int preempt_dynamic_mode = preempt_dynamic_full;
static int sched_dynamic_mode(const char *str)
{
if (!strcmp(str, "none"))
- return 0;
+ return preempt_dynamic_none;

if (!strcmp(str, "voluntary"))
- return 1;
+ return preempt_dynamic_voluntary;

if (!strcmp(str, "full"))
- return 2;
+ return preempt_dynamic_full;

return -1;
}
--
2.29.2

2021-03-25 03:40:38

by Rasmus Villemoes

Subject: [PATCH 2/2] sched: use -EINVAL in sched_dynamic_mode

-1 is -EPERM which is a somewhat odd error to return from
sched_dynamic_write(). No other callers care about which negative
value is used.

Signed-off-by: Rasmus Villemoes <[email protected]>
---
kernel/sched/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 3959481261bb..5b29261668a6 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5378,7 +5378,7 @@ static int sched_dynamic_mode(const char *str)
if (!strcmp(str, "full"))
return preempt_dynamic_full;

- return -1;
+ return -EINVAL;
}

static void sched_dynamic_update(int mode)
--
2.29.2

2021-03-25 07:50:03

by Peter Zijlstra

Subject: Re: [PATCH 1/2] sched: stop using magic values in sched_dynamic_mode

On Thu, Mar 25, 2021 at 01:45:14AM +0100, Rasmus Villemoes wrote:
> Use the enum names which are also what is used in the switch() in
> sched_dynamic_update().
>
> Signed-off-by: Rasmus Villemoes <[email protected]>

Thanks for both!

2021-03-25 11:10:31

by tip-bot2 for Alexey Makhalov

Subject: [tip: sched/core] sched/core: Stop using magic values in sched_dynamic_mode()

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

Commit-ID: 7e1b2eb74928b2478fd0630ce6c664334b480d00
Gitweb: https://git.kernel.org/tip/7e1b2eb74928b2478fd0630ce6c664334b480d00
Author: Rasmus Villemoes <[email protected]>
AuthorDate: Thu, 25 Mar 2021 01:45:14 +01:00
Committer: Ingo Molnar <[email protected]>
CommitterDate: Thu, 25 Mar 2021 11:39:12 +01:00

sched/core: Stop using magic values in sched_dynamic_mode()

Use the enum names which are also what is used in the switch() in
sched_dynamic_update().

Signed-off-by: Rasmus Villemoes <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Acked-by: Peter Zijlstra <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
kernel/sched/core.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 3384ea7..1fe9d3f 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5376,13 +5376,13 @@ static int preempt_dynamic_mode = preempt_dynamic_full;
static int sched_dynamic_mode(const char *str)
{
if (!strcmp(str, "none"))
- return 0;
+ return preempt_dynamic_none;

if (!strcmp(str, "voluntary"))
- return 1;
+ return preempt_dynamic_voluntary;

if (!strcmp(str, "full"))
- return 2;
+ return preempt_dynamic_full;

return -1;
}

2021-03-25 11:10:33

by tip-bot2 for Alexey Makhalov

Subject: [tip: sched/core] sched/core: Use -EINVAL in sched_dynamic_mode()

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

Commit-ID: c4681f3f1cfcfde0c95ff72f0bdb43f9ffd7f00e
Gitweb: https://git.kernel.org/tip/c4681f3f1cfcfde0c95ff72f0bdb43f9ffd7f00e
Author: Rasmus Villemoes <[email protected]>
AuthorDate: Thu, 25 Mar 2021 01:45:15 +01:00
Committer: Ingo Molnar <[email protected]>
CommitterDate: Thu, 25 Mar 2021 11:39:13 +01:00

sched/core: Use -EINVAL in sched_dynamic_mode()

-1 is -EPERM which is a somewhat odd error to return from
sched_dynamic_write(). No other callers care about which negative
value is used.

Signed-off-by: Rasmus Villemoes <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Acked-by: Peter Zijlstra <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
kernel/sched/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 1fe9d3f..95bd6ab 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5384,7 +5384,7 @@ static int sched_dynamic_mode(const char *str)
if (!strcmp(str, "full"))
return preempt_dynamic_full;

- return -1;
+ return -EINVAL;
}

static void sched_dynamic_update(int mode)