External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-30 11:25:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf, docs, schema: Add support for 'restrictive' mode in numatune

Browse Source 
This allows users to restrict memory nodes without setting any specific
memory policy, then 'restrictive' mode is useful.

Signed-off-by: Luyao Zhong <luyao.zhong@intel.com>
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Luyao Zhong 2021-04-13 14:38:06 +08:00 committed by Martin Kletzander
parent 69a4cd9249
commit 6213d52384
12 changed files with 99 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/formatdomain.rst
View File

@ -1112,8 +1112,11 @@ NUMA Node Tuning
``memory``
The optional ``memory`` element specifies how to allocate memory for the
domain process on a NUMA host. It contains several optional attributes.
Attribute ``mode`` is either 'interleave', 'strict', or 'preferred', defaults
to 'strict'. Attribute ``nodeset`` specifies the NUMA nodes, using the same
Attribute ``mode`` is either 'interleave', 'strict', 'preferred', or
'restrictive', defaults to 'strict'. The value 'restrictive' specifies
using system default policy and only cgroups is used to restrict the
memory nodes, and it requires setting mode to 'restrictive' in ``memnode``
elements. Attribute ``nodeset`` specifies the NUMA nodes, using the same
syntax as attribute ``cpuset`` of element ``vcpu``. Attribute ``placement`` (
:since:`since 0.9.12` ) can be used to indicate the memory placement mode for
domain process, its value can be either "static" or "auto", defaults to

2
docs/schemas/domaincommon.rng
View File

@ -1107,6 +1107,7 @@
<value>strict</value>
<value>preferred</value>
<value>interleave</value>
<value>restrictive</value>
</choice>
</attribute>
</optional>
@ -1139,6 +1140,7 @@
<value>strict</value>
<value>preferred</value>
<value>interleave</value>
<value>restrictive</value>
</choice>
</attribute>
<attribute name="nodeset">

1
include/libvirt/libvirt-domain.h
View File

@ -1527,6 +1527,7 @@ typedef enum {
VIR_DOMAIN_NUMATUNE_MEM_STRICT = 0,
VIR_DOMAIN_NUMATUNE_MEM_PREFERRED = 1,
VIR_DOMAIN_NUMATUNE_MEM_INTERLEAVE = 2,
VIR_DOMAIN_NUMATUNE_MEM_RESTRICTIVE = 3,
# ifdef VIR_ENUM_SENTINELS
VIR_DOMAIN_NUMATUNE_MEM_LAST /* This constant is subject to change */

9
src/conf/numa_conf.c
View File

@ -43,6 +43,7 @@ VIR_ENUM_IMPL(virDomainNumatuneMemMode,
"strict",
"preferred",
"interleave",
"restrictive",
);
VIR_ENUM_IMPL(virDomainNumatunePlacement,
@ -230,6 +231,14 @@ virDomainNumatuneNodeParseXML(virDomainNuma *numa,
_("Invalid mode attribute in memnode element"));
goto cleanup;
}
if (numa->memory.mode == VIR_DOMAIN_NUMATUNE_MEM_RESTRICTIVE &&
mode != VIR_DOMAIN_NUMATUNE_MEM_RESTRICTIVE) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("'restrictive' mode is required in memnode element "
"when mode is 'restrictive' in memory element"));
goto cleanup;
}
VIR_FREE(tmp);
mem_node->mode = mode;
}

1
src/qemu/qemu_command.c
View File

@ -175,6 +175,7 @@ VIR_ENUM_IMPL(qemuNumaPolicy,
"bind",
"preferred",
"interleave",
"restrictive",
);
VIR_ENUM_DECL(qemuAudioDriver);

3
src/util/virnuma.c
View File

@ -152,6 +152,9 @@ virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode,
numa_set_interleave_mask(&mask);
break;
case VIR_DOMAIN_NUMATUNE_MEM_RESTRICTIVE:
break;
case VIR_DOMAIN_NUMATUNE_MEM_LAST:
break;
}

1
tests/qemuxml2argvdata/numatune-memnode-invalid-mode.err Normal file
View File

@ -0,0 +1 @@
XML error: 'restrictive' mode is required in memnode element when mode is 'restrictive' in memory element

33
tests/qemuxml2argvdata/numatune-memnode-invalid-mode.xml Normal file
View File

@ -0,0 +1,33 @@
<domain type='qemu'>
<name>QEMUGuest</name>
<uuid>9f4b6512-e73a-4a25-93e8-5307802821ce</uuid>
<memory unit='KiB'>24682468</memory>
<currentMemory unit='KiB'>24682468</currentMemory>
<vcpu placement='static'>32</vcpu>
<numatune>
<memory mode='restrictive' nodeset='0-7'/>
<memnode cellid='0' mode='restrictive' nodeset='3'/>
<memnode cellid='2' mode='strict' nodeset='1-2,5-7,^6'/>
</numatune>
<os>
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
<numa>
<cell id='0' cpus='0' memory='20002' unit='KiB'/>
<cell id='1' cpus='1-27,29' memory='660066' unit='KiB'/>
<cell id='2' cpus='28,30-31' memory='24002400' unit='KiB'/>
</numa>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<memballoon model='virtio'/>
</devices>
</domain>

41
tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.xml Normal file
View File

@ -0,0 +1,41 @@
<domain type='qemu'>
<name>QEMUGuest</name>
<uuid>9f4b6512-e73a-4a25-93e8-5307802821ce</uuid>
<memory unit='KiB'>24682468</memory>
<currentMemory unit='KiB'>24682468</currentMemory>
<vcpu placement='static'>32</vcpu>
<numatune>
<memory mode='restrictive' nodeset='0-7'/>
<memnode cellid='0' mode='restrictive' nodeset='3'/>
<memnode cellid='2' mode='restrictive' nodeset='1-2,5,7'/>
</numatune>
<os>
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>qemu64</model>
<numa>
<cell id='0' cpus='0' memory='20002' unit='KiB'/>
<cell id='1' cpus='1-27,29' memory='660066' unit='KiB'/>
<cell id='2' cpus='28,30-31' memory='24002400' unit='KiB'/>
</numa>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<audio id='1' type='none'/>
<memballoon model='virtio'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</memballoon>
</devices>
</domain>

1
tests/qemuxml2argvtest.c
View File

@ -2171,6 +2171,7 @@ mymain(void)
DO_TEST_PARSE_ERROR("numatune-memnode", NONE);
DO_TEST_CAPS_VER("numatune-memnode", "5.2.0");
DO_TEST_CAPS_LATEST("numatune-memnode");
DO_TEST_PARSE_ERROR("numatune-memnode-invalid-mode", NONE);
DO_TEST("numatune-memnode-no-memory",
QEMU_CAPS_NUMA,

1
tests/qemuxml2xmloutdata/numatune-memnode-restrictive-mode.x86_64-latest.xml Symbolic link
View File

@ -0,0 +1 @@
../qemuxml2argvdata/numatune-memnode-restrictive-mode.xml

1
tests/qemuxml2xmltest.c
View File

@ -1125,6 +1125,7 @@ mymain(void)
DO_TEST("numatune-distances", QEMU_CAPS_NUMA, QEMU_CAPS_NUMA_DIST);
DO_TEST("numatune-no-vcpu", QEMU_CAPS_NUMA);
DO_TEST("numatune-hmat", QEMU_CAPS_NUMA_HMAT, QEMU_CAPS_OBJECT_MEMORY_RAM);
DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode");
DO_TEST("bios-nvram", NONE);
DO_TEST("bios-nvram-os-interleave", NONE);