[libvirt] [PATCH 06/13] Introduce qemuSetupCgroupHypervisorPin and synchronize hypervisorpin info to cgroup.

tangchen tangchen at cn.fujitsu.com
Tue Jul 10 09:15:58 UTC 2012


Introduce qemuSetupCgroupHypervisorPin() function to add hypervisor threads
pin info to cpuset cgroup, the same as vcpupin.

Signed-off-by: Tang Chen <tangchen at cn.fujitsu.com>
---
 src/qemu/qemu_cgroup.c |   36 ++++++++++++++++++++++++++++++++++++
 src/qemu/qemu_cgroup.h |    1 +
 2 files changed, 37 insertions(+)

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 6c811ce..cef7901 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -517,6 +517,36 @@ cleanup:
     return rc;
 }
 
+int qemuSetupCgroupHypervisorPin(virCgroupPtr cgroup, virDomainDefPtr def)
+{
+    int rc = 0;
+    char *new_cpus = NULL;
+
+    if (!def->cputune.hypervisorpin)
+        return 0;
+
+    new_cpus = virDomainCpuSetFormat(def->cputune.hypervisorpin->cpumask,
+                                     VIR_DOMAIN_CPUMASK_LEN);
+    if (!new_cpus) {
+        qemuReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("failed to convert cpu mask"));
+        rc = -1;
+        goto cleanup;
+    }
+
+    rc = virCgroupSetCpusetCpus(cgroup, new_cpus);
+    if (rc < 0) {
+        virReportSystemError(-rc,
+                             "%s",
+                             _("Unable to set cpuset.cpus"));
+        goto cleanup;
+    }
+
+cleanup:
+    VIR_FREE(new_cpus);
+    return rc;
+}
+
 int qemuSetupCgroupForVcpu(struct qemud_driver *driver, virDomainObjPtr vm)
 {
     virCgroupPtr cgroup = NULL;
@@ -627,6 +657,7 @@ int qemuSetupCgroupForHypervisor(struct qemud_driver *driver,
 {
     virCgroupPtr cgroup = NULL;
     virCgroupPtr cgroup_hypervisor = NULL;
+    virDomainDefPtr def = vm->def;
     int rc, i;
 
     if (driver->cgroup == NULL)
@@ -659,6 +690,11 @@ int qemuSetupCgroupForHypervisor(struct qemud_driver *driver,
         }
     }
 
+    if (def->cputune.hypervisorpin &&
+        qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPUSET) &&
+        qemuSetupCgroupHypervisorPin(cgroup_hypervisor, def) < 0)
+        goto cleanup;
+
     virCgroupFree(&cgroup_hypervisor);
     virCgroupFree(&cgroup);
     return 0;
diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h
index 91d5632..12444c3 100644
--- a/src/qemu/qemu_cgroup.h
+++ b/src/qemu/qemu_cgroup.h
@@ -55,6 +55,7 @@ int qemuSetupCgroupVcpuBW(virCgroupPtr cgroup,
                           long long quota);
 int qemuSetupCgroupVcpuPin(virCgroupPtr cgroup, virDomainDefPtr def,
                            int vcpuid);
+int qemuSetupCgroupHypervisorPin(virCgroupPtr cgroup, virDomainDefPtr def);
 int qemuSetupCgroupForVcpu(struct qemud_driver *driver, virDomainObjPtr vm);
 int qemuSetupCgroupForHypervisor(struct qemud_driver *driver,
                                  virDomainObjPtr vm);
-- 
1.7.10.2




More information about the libvir-list mailing list