[PATCH 2/3] qemu: Explicitly forbid changing nodeset for strict numatune
Let's imagine a guest that's configured with strict numatune:
<numatune>
<memory mode='strict' nodeset='0'/>
</numatune>
For guests with NUMA:
Depending on machine type used (see commit v6.4.0-rc1~75) we
generate either:
1) -object
'{"qom-type":"memory-backend-ram","id":"ram-node0",\
"size":20971520,"host-nodes":[0],"policy":"preferred"}'
\
-numa node,nodeid=0,cpus=0,memdev=ram-node0
or
2) -numa node,nodeid=0,cpus=0,mem=20480
Later, when QEMU boots up and cpuset CGroup controller is
available we further restrict QEMU there too. But there's a
behaviour difference hidden: while in case 1) QEMU is restricted
from beginning, in case 2) it is not and thus it may happen that
it will allocate memory from different NUMA node and even though
CGroup will try to migrate it, it may fail to do so (e.g. because
memory is locked). Therefore, one can argue that case 2) is
broken. NB, case 2) is exactly what mode 'restrictive' is for.
However, in case 1) we are unable to update QEMU with new
host-nodes, simply because it's lacking a command to do so.
For guests without NUMA:
It's very close to case 2) from above. We have commit
v7.10.0-rc1~163 that prevents us from outputting host-nodes when
generating memory-backend-* for system memory, but that simply
allows QEMU to allocate memory anywhere and then relies on
CGroups to move it to desired location.
Due to all of this, there is no reliable way to change nodeset
for mode 'strict'. Let's forbid it.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/qemu/qemu_driver.c | 35 ++++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e884dde721..0354e1474c 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -8777,10 +8777,9 @@ qemuDomainSetNumaParamsLive(virDomainObj *vm,
size_t i = 0;
if (virDomainNumatuneGetMode(vm->def->numa, -1, &mode) == 0 &&
- mode != VIR_DOMAIN_NUMATUNE_MEM_STRICT &&
mode != VIR_DOMAIN_NUMATUNE_MEM_RESTRICTIVE) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
- _("change of nodeset for running domain requires strict or
restrictive numa mode"));
+ _("change of nodeset for running domain requires restrictive
numa mode"));
return -1;
}
@@ -8913,17 +8912,31 @@ qemuDomainSetNumaParameters(virDomainPtr dom,
goto endjob;
}
- if (nodeset &&
- qemuDomainSetNumaParamsLive(vm, nodeset) < 0)
- goto endjob;
+ if (mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) {
+ virBitmap *config_nodeset = NULL;
- if (virDomainNumatuneSet(def->numa,
- def->placement_mode ==
- VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC,
- -1, mode, nodeset) < 0)
- goto endjob;
+ if (virDomainNumatuneMaybeGetNodeset(def->numa, priv->autoNodeset,
+ &config_nodeset, -1) < 0)
+ goto endjob;
- qemuDomainSaveStatus(vm);
+ if (!virBitmapEqual(nodeset, config_nodeset)) {
+ virReportError(VIR_ERR_OPERATION_INVALID, "%s",
+ _("can't change nodeset for strict mode for
running domain"));
+ goto endjob;
+ }
+ } else {
+ if (nodeset &&
+ qemuDomainSetNumaParamsLive(vm, nodeset) < 0)
+ goto endjob;
+
+ if (virDomainNumatuneSet(def->numa,
+ def->placement_mode ==
+ VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC,
+ -1, mode, nodeset) < 0)
+ goto endjob;
+
+ qemuDomainSaveStatus(vm);
+ }
}
if (persistentDef) {
--
2.32.0