From 362566880fb749375bc9035d938b57e58b71a4b9 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Fri, 27 Mar 2015 11:44:55 +0100 Subject: [PATCH] virLXCControllerSetupResourceLimits: Call virNuma*() iff needed Like we are doing in qemu driver (ea576ee543d6fb95583), lets call virNumaSetupMemoryPolicy() only if really needed. Problem is, if we numa_set_membind() child, there's no way to change it from the daemon afterwards. So any later attempts to change the pinning will fail. But in very weird way - CGroups will be set, but due to membind child will not allocate memory from any other node. Signed-off-by: Michal Privoznik --- src/lxc/lxc_controller.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 8545f29d06..2b5c9dacee 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -742,16 +742,26 @@ static int virLXCControllerSetupResourceLimits(virLXCControllerPtr ctrl) virBitmapPtr nodeset = NULL; virDomainNumatuneMemMode mode; - VIR_DEBUG("Setting up process resource limits"); + mode = virDomainNumatuneGetMode(ctrl->def->numa, -1); - if (virLXCControllerGetNumadAdvice(ctrl, &auto_nodeset) < 0) - goto cleanup; + if (mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT && + virCgroupControllerAvailable(VIR_CGROUP_CONTROLLER_CPUSET)) { + /* Use virNuma* API iff necessary. Once set and child is exec()-ed, + * there's no way for us to change it. Rely on cgroups (if available + * and enabled in the config) rather then virNuma*. */ + VIR_DEBUG("Relying on CGroups for memory binding"); + } else { - nodeset = virDomainNumatuneGetNodeset(ctrl->def->numa, auto_nodeset, -1); - mode = virDomainNumatuneGetMode(ctrl->def->numa, -1); + VIR_DEBUG("Setting up process resource limits"); - if (virNumaSetupMemoryPolicy(mode, nodeset) < 0) - goto cleanup; + if (virLXCControllerGetNumadAdvice(ctrl, &auto_nodeset) < 0) + goto cleanup; + + nodeset = virDomainNumatuneGetNodeset(ctrl->def->numa, auto_nodeset, -1); + + if (virNumaSetupMemoryPolicy(mode, nodeset) < 0) + goto cleanup; + } if (virLXCControllerSetupCpuAffinity(ctrl) < 0) goto cleanup; -- GitLab