kernel/sched/deadline.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
sysctl_sched_dl_period_max and sysctl_sched_dl_period_min are unsigned
integer, but proc_dointvec() wouldn't return error even if we set a
negative number.
Use proc_douintvec_minmax() instead of proc_dointvec(). Add extra1 for
sysctl_sched_dl_period_max and extra2 for sysctl_sched_dl_period_min.
It's just an optimization for match data and proc_handler in struct
ctl_table. The 'if (period < min || period > max)' in __checkparam_dl()
will work fine even if there hasn't this patch.
v2:
- update the log message.
Signed-off-by: Yajun Deng <yajun.deng@linux.dev>
---
kernel/sched/deadline.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index b5152961b743..5867e186c39a 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -30,14 +30,16 @@ static struct ctl_table sched_dl_sysctls[] = {
.data = &sysctl_sched_dl_period_max,
.maxlen = sizeof(unsigned int),
.mode = 0644,
- .proc_handler = proc_dointvec,
+ .proc_handler = proc_douintvec_minmax,
+ .extra1 = (void *)&sysctl_sched_dl_period_min,
},
{
.procname = "sched_deadline_period_min_us",
.data = &sysctl_sched_dl_period_min,
.maxlen = sizeof(unsigned int),
.mode = 0644,
- .proc_handler = proc_dointvec,
+ .proc_handler = proc_douintvec_minmax,
+ .extra2 = (void *)&sysctl_sched_dl_period_max,
},
{}
};
--
2.25.1
Hi, On 07/06/22 18:18, Yajun Deng wrote: > sysctl_sched_dl_period_max and sysctl_sched_dl_period_min are unsigned > integer, but proc_dointvec() wouldn't return error even if we set a > negative number. > > Use proc_douintvec_minmax() instead of proc_dointvec(). Add extra1 for > sysctl_sched_dl_period_max and extra2 for sysctl_sched_dl_period_min. > > It's just an optimization for match data and proc_handler in struct > ctl_table. The 'if (period < min || period > max)' in __checkparam_dl() > will work fine even if there hasn't this patch. > > v2: > - update the log message. > > Signed-off-by: Yajun Deng <yajun.deng@linux.dev> > --- Guess I'm not opposed to the change, even if, as the changelog also says, we should be already checking for sane values. That said, Acked-by: Juri Lelli <juri.lelli@redhat.com> Thanks, Juri
On 6/9/22 08:28, Juri Lelli wrote: > Guess I'm not opposed to the change, even if, as the changelog also > says, we should be already checking for sane values. I share this opinion. -- Daniel
On 6/7/22 12:18, Yajun Deng wrote: > sysctl_sched_dl_period_max and sysctl_sched_dl_period_min are unsigned > integer, but proc_dointvec() wouldn't return error even if we set a > negative number. > > Use proc_douintvec_minmax() instead of proc_dointvec(). Add extra1 for > sysctl_sched_dl_period_max and extra2 for sysctl_sched_dl_period_min. > > It's just an optimization for match data and proc_handler in struct > ctl_table. The 'if (period < min || period > max)' in __checkparam_dl() > will work fine even if there hasn't this patch. > > v2: > - update the log message. > > Signed-off-by: Yajun Deng <yajun.deng@linux.dev> Reviewed-by: Daniel Bristot de Oliveira <bristot@kernel.org> -- Daniel
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 2ed81e765417ec2526f901366167a13294ef09ce
Gitweb: https://git.kernel.org/tip/2ed81e765417ec2526f901366167a13294ef09ce
Author: Yajun Deng <yajun.deng@linux.dev>
AuthorDate: Tue, 07 Jun 2022 18:18:07 +08:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Mon, 13 Jun 2022 10:30:00 +02:00
sched/deadline: Use proc_douintvec_minmax() limit minimum value
sysctl_sched_dl_period_max and sysctl_sched_dl_period_min are unsigned
integer, but proc_dointvec() wouldn't return error even if we set a
negative number.
Use proc_douintvec_minmax() instead of proc_dointvec(). Add extra1 for
sysctl_sched_dl_period_max and extra2 for sysctl_sched_dl_period_min.
It's just an optimization for match data and proc_handler in struct
ctl_table. The 'if (period < min || period > max)' in __checkparam_dl()
will work fine even if there hasn't this patch.
Signed-off-by: Yajun Deng <yajun.deng@linux.dev>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Daniel Bristot de Oliveira <bristot@kernel.org>
Link: https://lore.kernel.org/r/20220607101807.249965-1-yajun.deng@linux.dev
---
kernel/sched/deadline.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index b515296..5867e18 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -30,14 +30,16 @@ static struct ctl_table sched_dl_sysctls[] = {
.data = &sysctl_sched_dl_period_max,
.maxlen = sizeof(unsigned int),
.mode = 0644,
- .proc_handler = proc_dointvec,
+ .proc_handler = proc_douintvec_minmax,
+ .extra1 = (void *)&sysctl_sched_dl_period_min,
},
{
.procname = "sched_deadline_period_min_us",
.data = &sysctl_sched_dl_period_min,
.maxlen = sizeof(unsigned int),
.mode = 0644,
- .proc_handler = proc_dointvec,
+ .proc_handler = proc_douintvec_minmax,
+ .extra2 = (void *)&sysctl_sched_dl_period_max,
},
{}
};
© 2016 - 2026 Red Hat, Inc.