Implement handling of per-domain bandwidth settings

Signed-off-by: Alexander Burluka <aburluka@virtuozzo.com>

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 8a529afa3a9fa13f091160c7dada0684a643844d..763dc0e30694c2a6ff6a04f05436cf8c2325798e 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -8782,7 +8782,7 @@ static char *qemuDomainGetSchedulerType(virDomainPtr dom,
     /* Domain not running, thus no cgroups - return defaults */
     if (!virDomainObjIsActive(vm)) {
         if (nparams)
-            *nparams = 5;
+            *nparams = 7;
         ignore_value(VIR_STRDUP(ret, "posix"));
         goto cleanup;
     }
@@ -8795,7 +8795,7 @@ static char *qemuDomainGetSchedulerType(virDomainPtr dom,
 
     if (nparams) {
         if (virCgroupSupportsCpuBW(priv->cgroup))
-            *nparams = 5;
+            *nparams = 7;
         else
             *nparams = 1;
     }
@@ -10114,6 +10114,19 @@ qemuDomainGetNumaParameters(virDomainPtr dom,
     return ret;
 }
 
+static int
+qemuSetGlobalBWLive(virCgroupPtr cgroup, unsigned long long period,
+                    long long quota)
+{
+    if (period == 0 && quota == 0)
+        return 0;
+
+    if (qemuSetupCgroupVcpuBW(cgroup, period, quota) < 0)
+        return -1;
+
+    return 0;
+}
+
 static int
 qemuSetVcpusBWLive(virDomainObjPtr vm, virCgroupPtr cgroup,
                    unsigned long long period, long long quota)
@@ -10215,6 +10228,10 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom,
                                VIR_TYPED_PARAM_ULLONG,
                                VIR_DOMAIN_SCHEDULER_VCPU_QUOTA,
                                VIR_TYPED_PARAM_LLONG,
+                               VIR_DOMAIN_SCHEDULER_GLOBAL_PERIOD,
+                               VIR_TYPED_PARAM_ULLONG,
+                               VIR_DOMAIN_SCHEDULER_GLOBAL_QUOTA,
+                               VIR_TYPED_PARAM_LLONG,
                                VIR_DOMAIN_SCHEDULER_EMULATOR_PERIOD,
                                VIR_TYPED_PARAM_ULLONG,
                                VIR_DOMAIN_SCHEDULER_EMULATOR_QUOTA,
@@ -10331,6 +10348,46 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom,
             if (flags & VIR_DOMAIN_AFFECT_CONFIG)
                 vmdef->cputune.quota = value_l;
 
+        } else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_GLOBAL_PERIOD)) {
+            SCHED_RANGE_CHECK(value_ul, VIR_DOMAIN_SCHEDULER_GLOBAL_PERIOD,
+                              QEMU_SCHED_MIN_PERIOD, QEMU_SCHED_MAX_PERIOD);
+
+            if (flags & VIR_DOMAIN_AFFECT_LIVE && value_ul) {
+                if ((rc = qemuSetGlobalBWLive(priv->cgroup, value_ul, 0)))
+                    goto endjob;
+
+                vm->def->cputune.global_period = value_ul;
+
+                if (virTypedParamsAddULLong(&eventParams, &eventNparams,
+                                            &eventMaxNparams,
+                                            VIR_DOMAIN_TUNABLE_CPU_GLOBAL_PERIOD,
+                                            value_ul) < 0)
+                    goto endjob;
+            }
+
+            if (flags & VIR_DOMAIN_AFFECT_CONFIG)
+                vmdef->cputune.period = params[i].value.ul;
+
+        } else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_GLOBAL_QUOTA)) {
+            SCHED_RANGE_CHECK(value_l, VIR_DOMAIN_SCHEDULER_GLOBAL_QUOTA,
+                              QEMU_SCHED_MIN_QUOTA, QEMU_SCHED_MAX_QUOTA);
+
+            if (flags & VIR_DOMAIN_AFFECT_LIVE && value_l) {
+                if ((rc = qemuSetGlobalBWLive(priv->cgroup, 0, value_l)))
+                    goto endjob;
+
+                vm->def->cputune.global_quota = value_l;
+
+                if (virTypedParamsAddLLong(&eventParams, &eventNparams,
+                                           &eventMaxNparams,
+                                           VIR_DOMAIN_TUNABLE_CPU_GLOBAL_QUOTA,
+                                           value_l) < 0)
+                    goto endjob;
+            }
+
+            if (flags & VIR_DOMAIN_AFFECT_CONFIG)
+                vmdef->cputune.global_quota = value_l;
+
         } else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_EMULATOR_PERIOD)) {
             SCHED_RANGE_CHECK(value_ul, VIR_DOMAIN_SCHEDULER_EMULATOR_PERIOD,
                               QEMU_SCHED_MIN_PERIOD, QEMU_SCHED_MAX_PERIOD);
@@ -10494,6 +10551,16 @@ qemuGetEmulatorBandwidthLive(virCgroupPtr cgroup,
     return ret;
 }
 
+static int
+qemuGetGlobalBWLive(virCgroupPtr cgroup, unsigned long long *period,
+                    long long *quota)
+{
+    if (qemuGetVcpuBWLive(cgroup, period, quota) < 0)
+        return -1;
+
+    return 0;
+}
+
 static int
 qemuDomainGetSchedulerParametersFlags(virDomainPtr dom,
                                       virTypedParameterPtr params,
@@ -10505,6 +10572,8 @@ qemuDomainGetSchedulerParametersFlags(virDomainPtr dom,
     unsigned long long shares;
     unsigned long long period;
     long long quota;
+    unsigned long long global_period;
+    long long global_quota;
     unsigned long long emulator_period;
     long long emulator_quota;
     int ret = -1;
@@ -10551,6 +10620,8 @@ qemuDomainGetSchedulerParametersFlags(virDomainPtr dom,
         if (*nparams > 1) {
             period = persistentDef->cputune.period;
             quota = persistentDef->cputune.quota;
+            global_period = persistentDef->cputune.global_period;
+            global_quota = persistentDef->cputune.global_quota;
             emulator_period = persistentDef->cputune.emulator_period;
             emulator_quota = persistentDef->cputune.emulator_quota;
             cpu_bw_status = true; /* Allow copy of data to params[] */
@@ -10580,6 +10651,12 @@ qemuDomainGetSchedulerParametersFlags(virDomainPtr dom,
             goto cleanup;
     }
 
+    if (*nparams > 5 && cpu_bw_status) {
+        rc = qemuGetGlobalBWLive(priv->cgroup, &global_period, &global_quota);
+        if (rc != 0)
+            goto cleanup;
+    }
+
  out:
     if (virTypedParameterAssign(&params[0], VIR_DOMAIN_SCHEDULER_CPU_SHARES,
                                 VIR_TYPED_PARAM_ULLONG, shares) < 0)
@@ -10620,6 +10697,22 @@ qemuDomainGetSchedulerParametersFlags(virDomainPtr dom,
                 goto cleanup;
             saved_nparams++;
         }
+
+        if (*nparams > saved_nparams) {
+            if (virTypedParameterAssign(&params[5],
+                                        VIR_DOMAIN_SCHEDULER_GLOBAL_PERIOD,
+                                        VIR_TYPED_PARAM_ULLONG, global_period) < 0)
+                goto cleanup;
+            saved_nparams++;
+        }
+
+        if (*nparams > saved_nparams) {
+            if (virTypedParameterAssign(&params[6],
+                                        VIR_DOMAIN_SCHEDULER_GLOBAL_QUOTA,
+                                        VIR_TYPED_PARAM_LLONG, global_quota) < 0)
+                goto cleanup;
+            saved_nparams++;
+        }
     }
 
     *nparams = saved_nparams;