|
 |
397dc2 |
From b96501e90f7b3fbea1427ab6adeade7d8e707d07 Mon Sep 17 00:00:00 2001
|
|
|
397dc2 |
Message-Id: <b96501e90f7b3fbea1427ab6adeade7d8e707d07@dist-git>
|
|
|
397dc2 |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
397dc2 |
Date: Thu, 21 Jan 2021 10:24:05 -0300
|
|
|
397dc2 |
Subject: [PATCH] vircgroupv2: use defines for cpu period and quota limits
|
|
|
397dc2 |
|
|
|
397dc2 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
397dc2 |
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
|
|
397dc2 |
(cherry picked from commit 98a09ca48ed4fc011abf2aa290e02ce1b8f1bb5f)
|
|
|
397dc2 |
|
|
|
397dc2 |
https://bugzilla.redhat.com/1915733
|
|
|
397dc2 |
|
|
|
397dc2 |
Signed-off-by: Daniel Henrique Barboza <dbarboza@redhat.com>
|
|
|
397dc2 |
Message-Id: <20210121132406.337681-4-dbarboza@redhat.com>
|
|
|
397dc2 |
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
397dc2 |
---
|
|
|
397dc2 |
src/util/vircgroupv2.c | 25 +++++++++++++------------
|
|
|
397dc2 |
1 file changed, 13 insertions(+), 12 deletions(-)
|
|
|
397dc2 |
|
|
|
397dc2 |
diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
|
|
|
397dc2 |
index 1d8c599f6a..92ae3ec839 100644
|
|
|
397dc2 |
--- a/src/util/vircgroupv2.c
|
|
|
397dc2 |
+++ b/src/util/vircgroupv2.c
|
|
|
397dc2 |
@@ -1476,12 +1476,12 @@ virCgroupV2SetCpuCfsPeriod(virCgroupPtr group,
|
|
|
397dc2 |
g_autofree char *str = NULL;
|
|
|
397dc2 |
char *tmp;
|
|
|
397dc2 |
|
|
|
397dc2 |
- /* The cfs_period should be greater or equal than 1ms, and less or equal
|
|
|
397dc2 |
- * than 1s.
|
|
|
397dc2 |
- */
|
|
|
397dc2 |
- if (cfs_period < 1000 || cfs_period > 1000000) {
|
|
|
397dc2 |
+ if (cfs_period < VIR_CGROUP_CPU_PERIOD_MIN ||
|
|
|
397dc2 |
+ cfs_period > VIR_CGROUP_CPU_PERIOD_MAX) {
|
|
|
397dc2 |
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
397dc2 |
- _("cfs_period '%llu' must be in range (1000, 1000000)"),
|
|
|
397dc2 |
+ _("cfs_period '%llu' must be in range (%llu, %llu)"),
|
|
|
397dc2 |
+ VIR_CGROUP_CPU_PERIOD_MIN,
|
|
|
397dc2 |
+ VIR_CGROUP_CPU_PERIOD_MAX,
|
|
|
397dc2 |
cfs_period);
|
|
|
397dc2 |
return -1;
|
|
|
397dc2 |
}
|
|
|
397dc2 |
@@ -1537,17 +1537,18 @@ static int
|
|
|
397dc2 |
virCgroupV2SetCpuCfsQuota(virCgroupPtr group,
|
|
|
397dc2 |
long long cfs_quota)
|
|
|
397dc2 |
{
|
|
|
397dc2 |
- /* The cfs_quota should be greater or equal than 1ms */
|
|
|
397dc2 |
if (cfs_quota >= 0 &&
|
|
|
397dc2 |
- (cfs_quota < 1000 ||
|
|
|
397dc2 |
- cfs_quota > ULLONG_MAX / 1000)) {
|
|
|
397dc2 |
+ (cfs_quota < VIR_CGROUP_CPU_QUOTA_MIN ||
|
|
|
397dc2 |
+ cfs_quota > VIR_CGROUP_CPU_QUOTA_MAX)) {
|
|
|
397dc2 |
virReportError(VIR_ERR_INVALID_ARG,
|
|
|
397dc2 |
- _("cfs_quota '%lld' must be in range (1000, %llu)"),
|
|
|
397dc2 |
- cfs_quota, ULLONG_MAX / 1000);
|
|
|
397dc2 |
+ _("cfs_quota '%lld' must be in range (%llu, %llu)"),
|
|
|
397dc2 |
+ cfs_quota,
|
|
|
397dc2 |
+ VIR_CGROUP_CPU_QUOTA_MIN,
|
|
|
397dc2 |
+ VIR_CGROUP_CPU_QUOTA_MAX);
|
|
|
397dc2 |
return -1;
|
|
|
397dc2 |
}
|
|
|
397dc2 |
|
|
|
397dc2 |
- if (cfs_quota == ULLONG_MAX / 1000) {
|
|
|
397dc2 |
+ if (cfs_quota == VIR_CGROUP_CPU_QUOTA_MAX) {
|
|
|
397dc2 |
return virCgroupSetValueStr(group,
|
|
|
397dc2 |
VIR_CGROUP_CONTROLLER_CPU,
|
|
|
397dc2 |
"cpu.max", "max");
|
|
|
397dc2 |
@@ -1572,7 +1573,7 @@ virCgroupV2GetCpuCfsQuota(virCgroupPtr group,
|
|
|
397dc2 |
}
|
|
|
397dc2 |
|
|
|
397dc2 |
if (STREQLEN(str, "max", 3)) {
|
|
|
397dc2 |
- *cfs_quota = ULLONG_MAX / 1000;
|
|
|
397dc2 |
+ *cfs_quota = VIR_CGROUP_CPU_QUOTA_MAX;
|
|
|
397dc2 |
return 0;
|
|
|
397dc2 |
}
|
|
|
397dc2 |
|
|
|
397dc2 |
--
|
|
|
397dc2 |
2.30.0
|
|
|
397dc2 |
|