|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v2] xen/sched: validate RTDS putinfo period and budget
The RTDS domain-wide XEN_DOMCTL_SCHEDOP_putinfo path only checks for
zero values before applying period and budget to all vCPUs in the
domain.
This is weaker than the per-vCPU XEN_DOMCTL_SCHEDOP_putvcpuinfo path,
which already rejects values below the minimum, above the maximum, and
cases where budget exceeds period.
Use the same validation rules for putinfo as for putvcpuinfo, so
invalid domain-wide updates are rejected with -EINVAL instead of being
applied inconsistently.
Signed-off-by: Oleksii Moisieiev <oleksii_moisieiev@xxxxxxxx>
---
Changes in v2:
- introduce rt_validate_params helper function to check period and budget
xen/common/sched/rt.c | 37 ++++++++++++++++++++++++-------------
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/xen/common/sched/rt.c b/xen/common/sched/rt.c
index 7b1f64a779..645b091de7 100644
--- a/xen/common/sched/rt.c
+++ b/xen/common/sched/rt.c
@@ -1362,6 +1362,20 @@ out:
unit_schedule_unlock_irq(lock, unit);
}
+static int
+rt_validate_params(uint32_t period_us, uint32_t budget_us,
+ s_time_t *period, s_time_t *budget)
+{
+ *period = MICROSECS(period_us);
+ *budget = MICROSECS(budget_us);
+
+ if ( *period > RTDS_MAX_PERIOD || *budget < RTDS_MIN_BUDGET ||
+ *budget > *period || *period < RTDS_MIN_PERIOD )
+ return -EINVAL;
+
+ return 0;
+}
+
/*
* set/get each unit info of each domain
*/
@@ -1388,17 +1402,17 @@ rt_dom_cntl(
op->u.rtds.budget = RTDS_DEFAULT_BUDGET / MICROSECS(1);
break;
case XEN_DOMCTL_SCHEDOP_putinfo:
- if ( op->u.rtds.period == 0 || op->u.rtds.budget == 0 )
- {
- rc = -EINVAL;
+ rc = rt_validate_params(op->u.rtds.period, op->u.rtds.budget,
+ &period, &budget);
+ if ( rc )
break;
- }
+
spin_lock_irqsave(&prv->lock, flags);
for_each_sched_unit ( d, unit )
{
svc = rt_unit(unit);
- svc->period = MICROSECS(op->u.rtds.period); /* transfer to nanosec
*/
- svc->budget = MICROSECS(op->u.rtds.budget);
+ svc->period = period;
+ svc->budget = budget;
}
spin_unlock_irqrestore(&prv->lock, flags);
break;
@@ -1440,14 +1454,11 @@ rt_dom_cntl(
}
else
{
- period = MICROSECS(local_sched.u.rtds.period);
- budget = MICROSECS(local_sched.u.rtds.budget);
- if ( period > RTDS_MAX_PERIOD || budget < RTDS_MIN_BUDGET ||
- budget > period || period < RTDS_MIN_PERIOD )
- {
- rc = -EINVAL;
+ rc = rt_validate_params(local_sched.u.rtds.period,
+ local_sched.u.rtds.budget,
+ &period, &budget);
+ if ( rc )
break;
- }
spin_lock_irqsave(&prv->lock, flags);
svc = rt_unit(d->vcpu[local_sched.vcpuid]->sched_unit);
--
2.43.0
base-commit: a7bf8ff218ca05eb3674fdfd2817f6cff471e96a
branch: amoi_rtds_SCHEDOP_putinfov2
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |