sched/rt: fix the case where sched_rt_period_us is non-positive
PATCH 1/1 sched/rt: fix the case where sched_rt_period_us is non-positive
The proc_dointvec() in sched_rt_handler() is for integer, but sysctl_sched_rt_period is a unsigned integer. sched_rt_handler() would cover a non-positive number to positive number, so both proc_dointvec() and sched_rt_global_validate() aren't return error when we set a non-positive number.
Use proc_dointvec_minmax() instead of proc_dointvec(), and add extra for sched_rt_period_us/sched_rt_runtime_us/sched_rr_timeslice_ms.
--- kernel/sched/rt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
kernel/sched/rt.c +6 -6
@@ -37,6 +37,7 @@ static struct ctl_table sched_rt_sysctls[] = { .maxlen = sizeof(unsigned int), .mode = 0644, .proc_handler = sched_rt_handler, + .extra1 = SYSCTL_ONE, }, { .procname = "sched_rt_runtime_us",
@@ -44,6 +45,8 @@ static struct ctl_table sched_rt_sysctls[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = sched_rt_handler, + .extra1 = SYSCTL_NEG_ONE, + .extra2 = (void *)&sysctl_sched_rt_period, }, { .procname = "sched_rr_timeslice_ms",
@@ -51,6 +54,7 @@ static struct ctl_table sched_rt_sysctls[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = sched_rr_handler, + .extra1 = SYSCTL_ONE, }, {} };
@@ -2959,9 +2963,6 @@ static int sched_rt_global_constraints(void)#ifdef CONFIG_SYSCTL static int sched_rt_global_validate (void ) { -if (sysctl_sched_rt_period <=0 ) -return -EINVAL ; - if ((sysctl_sched_rt_runtime != RUNTIME_INF) && ((sysctl_sched_rt_runtime > sysctl_sched_rt_period) || ((u64)sysctl_sched_rt_runtime *
@@ -2992,7 +2993,7 @@ static int sched_rt_handler(struct ctl_table *table, int write, void *buffer, old_period = sysctl_sched_rt_period; old_runtime = sysctl_sched_rt_runtime; - ret =proc_dointvec (table, write, buffer, lenp, ppos); + ret =proc_dointvec_minmax (table, write, buffer, lenp, ppos);if (!ret && write) { ret =sched_rt_global_validate ();
@@ -3027,14 +3028,13 @@ static int sched_rr_handler(struct ctl_table *table, int write, void *buffer,static DEFINE_MUTEX (mutex);mutex_lock (&mutex); - ret =proc_dointvec (table, write, buffer, lenp, ppos); + ret =proc_dointvec_minmax (table, write, buffer, lenp, ppos);/* * Make sure that internally we keep jiffies. * Also, writing zero resets the timeslice to default: */ if (!ret && write) { sched_rr_timeslice = - sysctl_sched_rr_timeslice <=0 ?RR_TIMESLICE :msecs_to_jiffies (sysctl_sched_rr_timeslice); }mutex_unlock (&mutex);
Signature · 1 line
2.25.1
Valentin Schneider
reviewerQuoted 20 lines · Yajun Deng
The
proc_dointvec()insched_rt_handler()is for integer, butsysctl_sched_rt_periodis a unsigned integer.sched_rt_handler()would cover a non-positive number to positive number, so bothproc_dointvec()andsched_rt_global_validate()aren't return error when we set a non-positive number.Use
proc_dointvec_minmax()instead ofproc_dointvec(), and add extra for sched_rt_period_us/sched_rt_runtime_us/sched_rr_timeslice_ms.Fixes 391e43da797a ("sched: Move all scheduler bits into kernel/sched/")Signed-off-by Yajun Deng <[email protected]>--- kernel/sched/rt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)kernel/sched/rt.c +0
-0
kernel/sched/rt.c static struct ctl_table sched_rt_sysctls[] = { · line 41
Quoted 5 lines
kernel/sched/rt.c +1
-0@@ -37,6 +37,7 @@ static struct ctl_table sched_rt_sysctls[] = { .maxlen = sizeof(unsigned int), .mode = 0644, .proc_handler = sched_rt_handler, + .extra1 = SYSCTL_ONE, },
Err, what kernel is this based on? AFAICT those have always lived in kernel/sysctl.c, not kernel/sched/rt.c
Quoted 12 lines
kernel/sched/rt.c +2
-0{ .procname = "sched_rt_runtime_us",@@ -44,6 +45,8 @@ static struct ctl_table sched_rt_sysctls[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = sched_rt_handler, + .extra1 = SYSCTL_NEG_ONE, + .extra2 = (void *)&sysctl_sched_rt_period, }, { .procname = "sched_rr_timeslice_ms",
kernel/sched/rt.c static struct ctl_table sched_rt_sysctls[] = { · line 57
Quoted 4 lines
kernel/sched/rt.c +1
-0@@ -51,6 +54,7 @@ static struct ctl_table sched_rt_sysctls[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = sched_rr_handler, + .extra1 = SYSCTL_ONE,
Per upstream state of sched_rr_handler:
* Also, writing zero resets the timeslice to default:
which doesn't happen with that new constraint.
Quoted 40 lines
kernel/sched/rt.c +2
-7}, {} };@@ -2959,9 +2963,6 @@ static int sched_rt_global_constraints(void)#ifdef CONFIG_SYSCTL static int sched_rt_global_validate (void ) { -if (sysctl_sched_rt_period <=0 ) -return -EINVAL ; - if ((sysctl_sched_rt_runtime != RUNTIME_INF) && ((sysctl_sched_rt_runtime > sysctl_sched_rt_period) || ((u64)sysctl_sched_rt_runtime *@@ -2992,7 +2993,7 @@ static int sched_rt_handler(struct ctl_table *table, int write, void *buffer, old_period = sysctl_sched_rt_period; old_runtime = sysctl_sched_rt_runtime; - ret =proc_dointvec (table, write, buffer, lenp, ppos); + ret =proc_dointvec_minmax (table, write, buffer, lenp, ppos);if (!ret && write) { ret =sched_rt_global_validate ();@@ -3027,14 +3028,13 @@ static int sched_rr_handler(struct ctl_table *table, int write, void *buffer,static DEFINE_MUTEX (mutex);mutex_lock (&mutex); - ret =proc_dointvec (table, write, buffer, lenp, ppos); + ret =proc_dointvec_minmax (table, write, buffer, lenp, ppos);/* * Make sure that internally we keep jiffies. * Also, writing zero resets the timeslice to default: */ if (!ret && write) { sched_rr_timeslice = - sysctl_sched_rr_timeslice <=0 ?RR_TIMESLICE :msecs_to_jiffies (sysctl_sched_rr_timeslice); }mutex_unlock (&mutex); --2.25.1
Valentin Schneider
reviewerQuoted 15 lines · Valentin Schneider
kernel/sched/rt.c static struct ctl_table sched_rt_sysctls[] = { · line 41
Quoted 10 lines · Yajun Deng
kernel/sched/rt.c +1
-0@@ -37,6 +37,7 @@ static struct ctl_table sched_rt_sysctls[] = { .maxlen = sizeof(unsigned int), .mode = 0644, .proc_handler = sched_rt_handler, + .extra1 = SYSCTL_ONE, },Err, what kernel is this based on? AFAICT those have always lived in
kernel/sysctl.c, notkernel/sched/rt.c
Nevermind, Peter pointed out this has recently been changed and is apparent in linux-next.