diff options
| author | Jan Beulich <jbeulich@suse.com> | 2012-12-10 11:14:27 +0100 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2012-12-10 11:14:27 +0100 |
| commit | 62bc54ce1da4d0000277b94efc680b15fe9127f8 (patch) | |
| tree | 7f1821a3a52a5e582811c91d1a90043bc746894d /xen/common/sched_credit.c | |
| parent | fca1c2ebf1e4e35a92f619804e7c9941216ab9e2 (diff) | |
| download | xen-62bc54ce1da4d0000277b94efc680b15fe9127f8.tar.gz xen-62bc54ce1da4d0000277b94efc680b15fe9127f8.tar.bz2 xen-62bc54ce1da4d0000277b94efc680b15fe9127f8.zip | |
scheduler: fix rate limit range checking
For one, neither of the two checks permitted for the documented value
of zero (disabling the functionality altogether).
Second, the range checking of the command line parameter was done by
the credit scheduler's initialization code, despite it being a generic
scheduler option.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/common/sched_credit.c')
| -rw-r--r-- | xen/common/sched_credit.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index c42ff0e073..db31f1b8e7 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -835,8 +835,9 @@ csched_sys_cntl(const struct scheduler *ops, case XEN_SYSCTL_SCHEDOP_putinfo: if (params->tslice_ms > XEN_SYSCTL_CSCHED_TSLICE_MAX || params->tslice_ms < XEN_SYSCTL_CSCHED_TSLICE_MIN - || params->ratelimit_us > XEN_SYSCTL_SCHED_RATELIMIT_MAX - || params->ratelimit_us < XEN_SYSCTL_SCHED_RATELIMIT_MIN + || (params->ratelimit_us + && (params->ratelimit_us > XEN_SYSCTL_SCHED_RATELIMIT_MAX + || params->ratelimit_us < XEN_SYSCTL_SCHED_RATELIMIT_MIN)) || MICROSECS(params->ratelimit_us) > MILLISECS(params->tslice_ms) ) goto out; prv->tslice_ms = params->tslice_ms; @@ -1593,17 +1594,6 @@ csched_init(struct scheduler *ops) sched_credit_tslice_ms = CSCHED_DEFAULT_TSLICE_MS; } - if ( sched_ratelimit_us > XEN_SYSCTL_SCHED_RATELIMIT_MAX - || sched_ratelimit_us < XEN_SYSCTL_SCHED_RATELIMIT_MIN ) - { - printk("WARNING: sched_ratelimit_us outside of valid range [%d,%d].\n" - " Resetting to default %u\n", - XEN_SYSCTL_SCHED_RATELIMIT_MIN, - XEN_SYSCTL_SCHED_RATELIMIT_MAX, - SCHED_DEFAULT_RATELIMIT_US); - sched_ratelimit_us = SCHED_DEFAULT_RATELIMIT_US; - } - prv->tslice_ms = sched_credit_tslice_ms; prv->ticks_per_tslice = CSCHED_TICKS_PER_TSLICE; if ( prv->tslice_ms < prv->ticks_per_tslice ) |