External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 23:37:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Ensure the cpuset is formatted as expected before passing to cgroup

Browse Source 
The parameter value for cpuset could be in special format like
"0-10,^7", which is not recognized by cgroup. This patch is to
ensure the cpuset is formatted as expected before passing it to
cgroup. As a side effect, after the patch, it parses the cpuset
early before cgroup setting, to avoid the rollback if cpuset
parsing fails afterwards.
This commit is contained in:
Osier Yang 2012-08-16 11:35:04 +08:00
parent 9ef12b6ff5
commit 29d8ed7a61
1 changed files with 46 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/qemu/qemu_driver.c
View File

@ -6982,8 +6982,23 @@ qemuDomainSetNumaParameters(virDomainPtr dom,
} }
} else if (STREQ(param->field, VIR_DOMAIN_NUMA_NODESET)) { } else if (STREQ(param->field, VIR_DOMAIN_NUMA_NODESET)) {
int rc; int rc;
bool savedmask; char *nodeset = NULL;
char oldnodemask[VIR_DOMAIN_CPUMASK_LEN]; char *nodeset_str = NULL;
if (VIR_ALLOC_N(nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) {
virReportOOMError();
ret = -1;
goto cleanup;
};
if (virDomainCpuSetParse(params[i].value.s,
0, nodeset,
VIR_DOMAIN_CPUMASK_LEN) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Failed to parse nodeset"));
ret = -1;
continue;
}
if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (flags & VIR_DOMAIN_AFFECT_LIVE) {
if (vm->def->numatune.memory.mode != if (vm->def->numatune.memory.mode !=
@ -6991,72 +7006,62 @@ qemuDomainSetNumaParameters(virDomainPtr dom,
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("change of nodeset for running domain " _("change of nodeset for running domain "
"requires strict numa mode")); "requires strict numa mode"));
ret = -1; VIR_FREE(nodeset);
continue;
}
rc = virCgroupSetCpusetMems(group, params[i].value.s);
if (rc != 0) {
virReportSystemError(-rc, "%s",
_("unable to set numa tunable"));
ret = -1; ret = -1;
continue; continue;
} }
/* Ensure the cpuset string is formated before passing to cgroup */
if (!(nodeset_str = virDomainCpuSetFormat(nodeset,
VIR_DOMAIN_CPUMASK_LEN))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Failed to format nodeset"));
VIR_FREE(nodeset);
ret = -1;
continue;
}
if ((rc = virCgroupSetCpusetMems(group, nodeset_str) != 0)) {
virReportSystemError(-rc, "%s",
_("unable to set numa tunable"));
VIR_FREE(nodeset);
VIR_FREE(nodeset_str);
ret = -1;
continue;
}
VIR_FREE(nodeset_str);
/* update vm->def here so that dumpxml can read the new /* update vm->def here so that dumpxml can read the new
* values from vm->def. */ * values from vm->def. */
savedmask = false;
if (!vm->def->numatune.memory.nodemask) { if (!vm->def->numatune.memory.nodemask) {
if (VIR_ALLOC_N(vm->def->numatune.memory.nodemask, if (VIR_ALLOC_N(vm->def->numatune.memory.nodemask,
VIR_DOMAIN_CPUMASK_LEN) < 0) { VIR_DOMAIN_CPUMASK_LEN) < 0) {
virReportOOMError(); virReportOOMError();
VIR_FREE(nodeset);
ret = -1; ret = -1;
goto cleanup; goto cleanup;
} }
} else { } else {
memcpy(oldnodemask, vm->def->numatune.memory.nodemask, VIR_FREE(vm->def->numatune.memory.nodemask);
VIR_DOMAIN_CPUMASK_LEN);
savedmask = true;
}
if (virDomainCpuSetParse(params[i].value.s,
0,
vm->def->numatune.memory.nodemask,
VIR_DOMAIN_CPUMASK_LEN) < 0) {
if (savedmask)
memcpy(vm->def->numatune.memory.nodemask,
oldnodemask, VIR_DOMAIN_CPUMASK_LEN);
else
VIR_FREE(vm->def->numatune.memory.nodemask);
ret = -1;
continue;
} }
vm->def->numatune.memory.nodemask = nodeset;
} }
if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
savedmask = false;
if (!persistentDef->numatune.memory.nodemask) { if (!persistentDef->numatune.memory.nodemask) {
if (VIR_ALLOC_N(persistentDef->numatune.memory.nodemask, if (VIR_ALLOC_N(persistentDef->numatune.memory.nodemask,
VIR_DOMAIN_CPUMASK_LEN) < 0) { VIR_DOMAIN_CPUMASK_LEN) < 0) {
virReportOOMError(); virReportOOMError();
VIR_FREE(nodeset);
ret = -1; ret = -1;
goto cleanup; goto cleanup;
} }
} else { } else {
memcpy(oldnodemask, persistentDef->numatune.memory.nodemask, VIR_FREE(persistentDef->numatune.memory.nodemask);
VIR_DOMAIN_CPUMASK_LEN);
savedmask = true;
}
if (virDomainCpuSetParse(params[i].value.s,
0,
persistentDef->numatune.memory.nodemask,
VIR_DOMAIN_CPUMASK_LEN) < 0) {
if (savedmask)
memcpy(persistentDef->numatune.memory.nodemask,
oldnodemask, VIR_DOMAIN_CPUMASK_LEN);
else
VIR_FREE(persistentDef->numatune.memory.nodemask);
ret = -1;
continue;
} }
persistentDef->numatune.memory.nodemask = nodeset;
} }
} }
} }