* [PATCH] scheduler: fix rate limit range checking
@ 2012-12-07 11:01 Jan Beulich
2012-12-07 15:09 ` Keir Fraser
0 siblings, 1 reply; 2+ messages in thread
From: Jan Beulich @ 2012-12-07 11:01 UTC (permalink / raw)
To: xen-devel
[-- Attachment #1: Type: text/plain, Size: 2750 bytes --]
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>
--- a/xen/common/sched_credit.c
+++ b/xen/common/sched_credit.c
@@ -835,8 +835,9 @@ csched_sys_cntl(const struct scheduler *
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 )
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -1324,6 +1324,18 @@ void __init scheduler_init(void)
if ( SCHED_OP(&ops, init) )
panic("scheduler returned error on init\n");
+ if ( sched_ratelimit_us &&
+ (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;
+ }
+
idle_domain = domain_create(DOMID_IDLE, 0, 0);
BUG_ON(IS_ERR(idle_domain));
idle_domain->vcpu = idle_vcpu;
[-- Attachment #2: sched-ratelimit-check.patch --]
[-- Type: text/plain, Size: 2788 bytes --]
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>
--- a/xen/common/sched_credit.c
+++ b/xen/common/sched_credit.c
@@ -835,8 +835,9 @@ csched_sys_cntl(const struct scheduler *
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 )
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -1324,6 +1324,18 @@ void __init scheduler_init(void)
if ( SCHED_OP(&ops, init) )
panic("scheduler returned error on init\n");
+ if ( sched_ratelimit_us &&
+ (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;
+ }
+
idle_domain = domain_create(DOMID_IDLE, 0, 0);
BUG_ON(IS_ERR(idle_domain));
idle_domain->vcpu = idle_vcpu;
[-- Attachment #3: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] scheduler: fix rate limit range checking
2012-12-07 11:01 [PATCH] scheduler: fix rate limit range checking Jan Beulich
@ 2012-12-07 15:09 ` Keir Fraser
0 siblings, 0 replies; 2+ messages in thread
From: Keir Fraser @ 2012-12-07 15:09 UTC (permalink / raw)
To: Jan Beulich, xen-devel
On 07/12/2012 11:01, "Jan Beulich" <JBeulich@suse.com> wrote:
> 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>
> --- a/xen/common/sched_credit.c
> +++ b/xen/common/sched_credit.c
> @@ -835,8 +835,9 @@ csched_sys_cntl(const struct scheduler *
> 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 )
> --- a/xen/common/schedule.c
> +++ b/xen/common/schedule.c
> @@ -1324,6 +1324,18 @@ void __init scheduler_init(void)
> if ( SCHED_OP(&ops, init) )
> panic("scheduler returned error on init\n");
>
> + if ( sched_ratelimit_us &&
> + (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;
> + }
> +
> idle_domain = domain_create(DOMID_IDLE, 0, 0);
> BUG_ON(IS_ERR(idle_domain));
> idle_domain->vcpu = idle_vcpu;
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-12-07 15:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-07 11:01 [PATCH] scheduler: fix rate limit range checking Jan Beulich
2012-12-07 15:09 ` Keir Fraser
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).