8:20 a.m.
Changes to v1:
- 1/3 is now not connected to the rest of the patches any more
- whitespaces
- memShared='on/off' -> memAccess='private/shared'
Martin Kletzander (3):
schemas: finish virTristate{Bool,Switch} transition
docs, conf, schema: add support for shared memory mapping
qemu: add support for shared memory mapping
docs/formatdomain.html.in | 7 +-
docs/schemas/basictypes.rng | 19 ++-
docs/schemas/capability.rng | 10 +-
docs/schemas/domaincaps.rng | 5 +-
docs/schemas/domaincommon.rng | 163 +++++----------------
docs/schemas/interface.rng | 19 +--
docs/schemas/network.rng | 29 +---
docs/schemas/nwfilter.rng | 5 +-
docs/schemas/secret.rng | 10 +-
src/conf/cpu_conf.c | 30 +++-
src/conf/cpu_conf.h | 17 ++-
src/qemu/qemu_command.c | 27 ++++
.../qemuxml2argv-cpu-numa-memshared.xml | 28 ++++
.../qemuxml2argv-hugepages-shared.args | 16 ++
.../qemuxml2argv-hugepages-shared.xml | 45 ++++++
tests/qemuxml2argvtest.c | 5 +
tests/qemuxml2xmltest.c | 2 +
17 files changed, 240 insertions(+), 197 deletions(-)
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.xml
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.xml
--
2.1.0
8:20 a.m.
New subject: [libvirt] [PATCH v2 1/3] schemas: finish virTristate{Bool, Switch} transition
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
Notes:
v2:
- s/virBool/virYesNo/
- s/virSwitch/virOnOff/
docs/schemas/basictypes.rng | 19 ++++--
docs/schemas/capability.rng | 10 +--
docs/schemas/domaincaps.rng | 5 +-
docs/schemas/domaincommon.rng | 155 +++++++++---------------------------------
docs/schemas/interface.rng | 19 +-----
docs/schemas/network.rng | 29 ++------
docs/schemas/nwfilter.rng | 5 +-
docs/schemas/secret.rng | 10 +--
8 files changed, 61 insertions(+), 191 deletions(-)
diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng
index 75d5238..14245c9 100644
--- a/docs/schemas/basictypes.rng
+++ b/docs/schemas/basictypes.rng
@@ -77,10 +77,7 @@
</attribute>
<optional>
<attribute name="multifunction">
- <choice>
- <value>on</value>
- <value>off</value>
- </choice>
+ <ref name="virOnOff"/>
</attribute>
</optional>
</define>
@@ -446,4 +443,18 @@
</optional>
</define>
+ <define name="virYesNo">
+ <choice>
+ <value>yes</value>
+ <value>no</value>
+ </choice>
+ </define>
+
+ <define name="virOnOff">
+ <choice>
+ <value>on</value>
+ <value>off</value>
+ </choice>
+ </define>
+
</grammar>
diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
index f954599..5f3ec70 100644
--- a/docs/schemas/capability.rng
+++ b/docs/schemas/capability.rng
@@ -405,16 +405,10 @@
<define name='featuretoggle'>
<attribute name='toggle'>
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
<attribute name='default'>
- <choice>
- <value>on</value>
- <value>off</value>
- </choice>
+ <ref name="virOnOff"/>
</attribute>
</define>
diff --git a/docs/schemas/domaincaps.rng b/docs/schemas/domaincaps.rng
index 627b699..72e19f1 100644
--- a/docs/schemas/domaincaps.rng
+++ b/docs/schemas/domaincaps.rng
@@ -66,10 +66,7 @@
<define name='supported'>
<attribute name='supported'>
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</define>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 6ae940a..a024602 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -118,10 +118,7 @@
</attribute>
<optional>
<attribute name='relabel'>
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<interleave>
@@ -282,10 +279,7 @@
<optional>
<element name="bootmenu">
<attribute name="enable">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
<optional>
<attribute name="timeout">
@@ -584,10 +578,7 @@
<ref name='scaledInteger'/>
<optional>
<attribute name="dumpCore">
- <choice>
- <value>on</value>
- <value>off</value>
- </choice>
+ <ref name="virOnOff"/>
</attribute>
</optional>
</element>
@@ -1000,10 +991,7 @@
</choice>
<optional>
<attribute name="present">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<empty/>
@@ -1253,10 +1241,7 @@
</attribute>
<optional>
<attribute name="rawio">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<optional>
@@ -1524,10 +1509,7 @@
</optional>
<optional>
<attribute name="removable">
- <choice>
- <value>on</value>
- <value>off</value>
- </choice>
+ <ref name="virOnOff"/>
</attribute>
</optional>
</element>
@@ -1660,26 +1642,17 @@
</define>
<define name="ioeventfd">
<attribute name="ioeventfd">
- <choice>
- <value>on</value>
- <value>off</value>
- </choice>
+ <ref name="virOnOff"/>
</attribute>
</define>
<define name="event_idx">
<attribute name="event_idx">
- <choice>
- <value>on</value>
- <value>off</value>
- </choice>
+ <ref name="virOnOff"/>
</attribute>
</define>
<define name="copy_on_read">
<attribute name='copy_on_read'>
- <choice>
- <value>on</value>
- <value>off</value>
- </choice>
+ <ref name="virOnOff"/>
</attribute>
</define>
<define name="discard">
@@ -2210,20 +2183,14 @@
</attribute>
<optional>
<attribute name="managed">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<interleave>
<element name="source">
<optional>
<attribute name="missing">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<choice>
@@ -2446,10 +2413,7 @@
</optional>
<optional>
<attribute name="fullscreen">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
</group>
@@ -2466,10 +2430,7 @@
</optional>
<optional>
<attribute name="autoport">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<optional>
@@ -2540,10 +2501,7 @@
</optional>
<optional>
<attribute name="autoport">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<optional>
@@ -2652,10 +2610,7 @@
<optional>
<element name="playback">
<attribute name="compression">
- <choice>
- <value>on</value>
- <value>off</value>
- </choice>
+ <ref name="virOnOff"/>
</attribute>
<empty/>
</element>
@@ -2675,10 +2630,7 @@
<optional>
<element name="clipboard">
<attribute name="copypaste">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
<empty/>
</element>
@@ -2697,10 +2649,7 @@
<optional>
<element name="filetransfer">
<attribute name="enable">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
<empty/>
</element>
@@ -2718,26 +2667,17 @@
</optional>
<optional>
<attribute name="autoport">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<optional>
<attribute name="replaceUser">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<optional>
<attribute name="multiUser">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<optional>
@@ -2758,10 +2698,7 @@
</optional>
<optional>
<attribute name="fullscreen">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
</group>
@@ -2840,28 +2777,19 @@
</optional>
<optional>
<attribute name="primary">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<optional>
<element name="acceleration">
<optional>
<attribute name="accel3d">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<optional>
<attribute name="accel2d">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
</element>
@@ -2987,10 +2915,7 @@
<define name="suspendChoices">
<optional>
<attribute name="enabled">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
</define>
@@ -3082,10 +3007,7 @@
<define name="usbdevfilter">
<element name="usbdev">
<attribute name="allow">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
<optional>
<attribute name="class">
@@ -3545,10 +3467,7 @@
</optional>
<optional>
<attribute name="managed">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<choice>
@@ -3888,10 +3807,7 @@
<element name="apic">
<optional>
<attribute name="eoi">
- <choice>
- <value>on</value>
- <value>off</value>
- </choice>
+ <ref name="virOnOff"/>
</attribute>
</optional>
</element>
@@ -4185,10 +4101,7 @@
<element name="bios">
<optional>
<attribute name="useserial">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<optional>
@@ -4258,10 +4171,7 @@
<element name="rom">
<optional>
<attribute name="bar">
- <choice>
- <value>on</value>
- <value>off</value>
- </choice>
+ <ref name="virOnOff"/>
</attribute>
</optional>
<optional>
@@ -4731,10 +4641,7 @@
<define name="featurestate">
<attribute name="state">
- <choice>
- <value>on</value>
- <value>off</value>
- </choice>
+ <ref name="virOnOff"/>
</attribute>
</define>
diff --git a/docs/schemas/interface.rng b/docs/schemas/interface.rng
index 0f577d6..d78f877 100644
--- a/docs/schemas/interface.rng
+++ b/docs/schemas/interface.rng
@@ -127,7 +127,7 @@
<element name="bridge">
<optional>
<attribute name="stp">
- <ref name="on-or-off"/>
+ <ref name="virOnOff"/>
</attribute>
</optional>
<!-- Bridge forward delay (see 'brctl setfd') -->
@@ -376,7 +376,7 @@
<element name="dhcp">
<optional>
<attribute name="peerdns">
- <ref name="yes-or-no"/>
+ <ref name="virYesNo"/>
</attribute>
</optional>
</element>
@@ -415,21 +415,6 @@
instead of destination and nexthop instead of gateway.
-->
- <!-- Auxiliary definitions -->
- <define name="on-or-off">
- <choice>
- <value>on</value>
- <value>off</value>
- </choice>
- </define>
-
- <define name="yes-or-no">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
- </define>
-
<!-- Type library -->
<define name="timeval">
diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng
index 0e7da89..d84ccc0 100644
--- a/docs/schemas/network.rng
+++ b/docs/schemas/network.rng
@@ -21,12 +21,9 @@
with no gateways addresses specified -->
<optional>
<attribute name="ipv6">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
- </attribute>
- </optional>
+ <ref name="virYesNo"/>
+ </attribute>
+ </optional>
<interleave>
<!-- The name of the network, used to refer to it through the API
@@ -53,10 +50,7 @@
<optional>
<attribute name="stp">
- <choice>
- <value>on</value>
- <value>off</value>
- </choice>
+ <ref name="virOnOff"/>
</attribute>
</optional>
@@ -104,10 +98,7 @@
<optional>
<attribute name="managed">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<interleave>
@@ -203,10 +194,7 @@
</attribute>
<optional>
<attribute name="default">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<interleave>
@@ -236,10 +224,7 @@
<element name="dns">
<optional>
<attribute name="forwardPlainNames">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<interleave>
diff --git a/docs/schemas/nwfilter.rng b/docs/schemas/nwfilter.rng
index f1aa699..2b54fd5 100644
--- a/docs/schemas/nwfilter.rng
+++ b/docs/schemas/nwfilter.rng
@@ -377,10 +377,7 @@
<interleave>
<optional>
<attribute name="match">
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
</interleave>
diff --git a/docs/schemas/secret.rng b/docs/schemas/secret.rng
index d7b8f83..e21e700 100644
--- a/docs/schemas/secret.rng
+++ b/docs/schemas/secret.rng
@@ -11,18 +11,12 @@
<element name='secret'>
<optional>
<attribute name='ephemeral'>
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<optional>
<attribute name='private'>
- <choice>
- <value>yes</value>
- <value>no</value>
- </choice>
+ <ref name="virYesNo"/>
</attribute>
</optional>
<interleave>
--
2.1.0
8:20 a.m.
New subject: [libvirt] [PATCH v2 2/3] docs, conf, schema: add support for shared memory mapping
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
Notes:
v2:
- memShared='o{n|ff}' -> memAccess='{shared|private}'
- whitespaces
docs/formatdomain.html.in | 7 +++-
docs/schemas/domaincommon.rng | 8 ++++
src/conf/cpu_conf.c | 30 ++++++++++++++-
src/conf/cpu_conf.h | 17 ++++++--
.../qemuxml2argv-cpu-numa-memshared.xml | 28 ++++++++++++++
.../qemuxml2argv-hugepages-shared.xml | 45 ++++++++++++++++++++++
tests/qemuxml2xmltest.c | 2 +
7 files changed, 131 insertions(+), 6 deletions(-)
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.xml
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.xml
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 5081be3..2035148 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1123,7 +1123,7 @@
...
<numa>
<cell id='0' cpus='0-3' memory='512000'/>
- <cell id='1' cpus='4-7' memory='512000'/>
+ <cell id='1' cpus='4-7' memory='512000'
memAccess='shared'/>
</numa>
...
</cpu>
@@ -1140,6 +1140,11 @@
assigned <code>id</code>s in the increasing order starting from
0. Mixing cells with and without the <code>id</code> attribute
is not recommended as it may result in unwanted behaviour.
+
+ <span class='since'>Since 1.2.9</span> the optional attribute
+ <code>memAccess</code> can control whether the memory is to be
+ mapped as "shared" or "private". This is valid only for
+ hugepages-backed memory.
</p>
<p>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index a024602..fa54f45 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -4008,6 +4008,14 @@
<attribute name="memory">
<ref name="memoryKB"/>
</attribute>
+ <optional>
+ <attribute name="memAccess">
+ <choice>
+ <value>shared</value>
+ <value>private</value>
+ </choice>
+ </attribute>
+ </optional>
</element>
</define>
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 5003cf1..e190641 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -56,6 +56,11 @@ VIR_ENUM_IMPL(virCPUFeaturePolicy, VIR_CPU_FEATURE_LAST,
"disable",
"forbid")
+VIR_ENUM_IMPL(virMemAccess, VIR_MEM_ACCESS_LAST,
+ "default",
+ "shared",
+ "private")
+
void ATTRIBUTE_NONNULL(1)
virCPUDefFreeModel(virCPUDefPtr def)
@@ -435,7 +440,7 @@ virCPUDefParseXML(xmlNodePtr node,
def->ncells = n;
for (i = 0; i < n; i++) {
- char *cpus, *memory;
+ char *cpus, *memory, *memAccessStr;
int ret, ncpus = 0;
unsigned int cur_cell;
char *tmp = NULL;
@@ -491,7 +496,7 @@ virCPUDefParseXML(xmlNodePtr node,
goto error;
}
- ret = virStrToLong_ui(memory, NULL, 10, &def->cells[cur_cell].mem);
+ ret = virStrToLong_ui(memory, NULL, 10, &def->cells[cur_cell].mem);
if (ret == -1) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Invalid 'memory' attribute in NUMA
cell"));
@@ -499,6 +504,22 @@ virCPUDefParseXML(xmlNodePtr node,
goto error;
}
VIR_FREE(memory);
+
+ memAccessStr = virXMLPropString(nodes[i], "memAccess");
+ if (memAccessStr) {
+ def->cells[cur_cell].memAccess =
+ virMemAccessTypeFromString(memAccessStr);
+
+ if (def->cells[cur_cell].memAccess <= 0) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Invalid 'memAccess' attribute "
+ "value '%s'"),
+ memAccessStr);
+ VIR_FREE(memAccessStr);
+ goto cleanup;
+ }
+ VIR_FREE(memAccessStr);
+ }
}
}
@@ -674,10 +695,15 @@ virCPUDefFormatBuf(virBufferPtr buf,
virBufferAddLit(buf, "<numa>\n");
virBufferAdjustIndent(buf, 2);
for (i = 0; i < def->ncells; i++) {
+ virMemAccess memAccess = def->cells[i].memAccess;
+
virBufferAddLit(buf, "<cell");
virBufferAsprintf(buf, " id='%zu'", i);
virBufferAsprintf(buf, " cpus='%s'",
def->cells[i].cpustr);
virBufferAsprintf(buf, " memory='%d'",
def->cells[i].mem);
+ if (memAccess)
+ virBufferAsprintf(buf, " memAccess='%s'",
+ virMemAccessTypeToString(memAccess));
virBufferAddLit(buf, "/>\n");
}
virBufferAdjustIndent(buf, -2);
diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 2d538db..d45210b 100644
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -83,6 +83,16 @@ typedef enum {
VIR_ENUM_DECL(virCPUFeaturePolicy)
+typedef enum {
+ VIR_MEM_ACCESS_DEFAULT,
+ VIR_MEM_ACCESS_SHARED,
+ VIR_MEM_ACCESS_PRIVATE,
+
+ VIR_MEM_ACCESS_LAST,
+} virMemAccess;
+
+VIR_ENUM_DECL(virMemAccess)
+
typedef struct _virCPUFeatureDef virCPUFeatureDef;
typedef virCPUFeatureDef *virCPUFeatureDefPtr;
struct _virCPUFeatureDef {
@@ -93,9 +103,10 @@ struct _virCPUFeatureDef {
typedef struct _virCellDef virCellDef;
typedef virCellDef *virCellDefPtr;
struct _virCellDef {
- virBitmapPtr cpumask; /* CPUs that are part of this node */
- char *cpustr; /* CPUs stored in string form for dumpxml */
- unsigned int mem; /* Node memory in kB */
+ virBitmapPtr cpumask; /* CPUs that are part of this node */
+ char *cpustr; /* CPUs stored in string form for dumpxml */
+ unsigned int mem; /* Node memory in kB */
+ virMemAccess memAccess;
};
typedef struct _virCPUDef virCPUDef;
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.xml
b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.xml
new file mode 100644
index 0000000..cf7c040
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.xml
@@ -0,0 +1,28 @@
+<domain type='qemu'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219100</memory>
+ <currentMemory unit='KiB'>219100</currentMemory>
+ <vcpu placement='static'>16</vcpu>
+ <os>
+ <type arch='x86_64' machine='pc'>hvm</type>
+ <boot dev='network'/>
+ </os>
+ <cpu>
+ <topology sockets='2' cores='4' threads='2'/>
+ <numa>
+ <cell id='0' cpus='0-7' memory='109550'
memAccess='shared'/>
+ <cell id='1' cpus='8-15' memory='109550'
memAccess='private'/>
+ </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</emulator>
+ <controller type='usb' index='0'/>
+ <controller type='pci' index='0' model='pci-root'/>
+ <memballoon model='virtio'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.xml
b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.xml
new file mode 100644
index 0000000..e7db69c
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.xml
@@ -0,0 +1,45 @@
+<domain type='qemu'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>4194304</memory>
+ <currentMemory unit='KiB'>4194304</currentMemory>
+ <memoryBacking>
+ <hugepages>
+ <page size='2048' unit='KiB' nodeset='1'/>
+ <page size='1048576' unit='KiB' nodeset='0,2-3'/>
+ </hugepages>
+ </memoryBacking>
+ <vcpu placement='static'>4</vcpu>
+ <numatune>
+ <memory mode='strict' nodeset='0-3'/>
+ <memnode cellid='3' mode='strict' nodeset='3'/>
+ </numatune>
+ <os>
+ <type arch='i686' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <cpu>
+ <numa>
+ <cell id='0' cpus='0' memory='1048576'/>
+ <cell id='1' cpus='1' memory='1048576'
memAccess='shared'/>
+ <cell id='2' cpus='2' memory='1048576'
memAccess='private'/>
+ <cell id='3' cpus='3' memory='1048576'/>
+ </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</emulator>
+ <disk type='block' device='disk'>
+ <source dev='/dev/HostVG/QEMUGuest1'/>
+ <target dev='hda' bus='ide'/>
+ <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
+ </disk>
+ <controller type='usb' index='0'/>
+ <controller type='ide' index='0'/>
+ <controller type='pci' index='0' model='pci-root'/>
+ <memballoon model='virtio'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 34cdb97..352d65e 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -205,6 +205,7 @@ mymain(void)
DO_TEST("hugepages-pages");
DO_TEST("hugepages-pages2");
DO_TEST("hugepages-pages3");
+ DO_TEST("hugepages-shared");
DO_TEST("nosharepages");
DO_TEST("disk-aio");
DO_TEST("disk-cdrom");
@@ -391,6 +392,7 @@ mymain(void)
DO_TEST_DIFFERENT("cpu-numa1");
DO_TEST_DIFFERENT("cpu-numa2");
DO_TEST("cpu-numa-disjoint");
+ DO_TEST("cpu-numa-memshared");
DO_TEST_DIFFERENT("numatune-auto-prefer");
DO_TEST_DIFFERENT("numatune-memnode");
--
2.1.0
8:20 a.m.
New subject: [libvirt] [PATCH v2 3/3] qemu: add support for shared memory mapping
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
Notes:
v2:
- memShared -> memAccess
src/qemu/qemu_command.c | 27 ++++++++++++++++++++++
.../qemuxml2argv-hugepages-shared.args | 16 +++++++++++++
tests/qemuxml2argvtest.c | 5 ++++
3 files changed, 48 insertions(+)
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index e5270bd..4b89809 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6545,6 +6545,7 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
for (i = 0; i < def->cpu->ncells; i++) {
int cellmem = VIR_DIV_UP(def->cpu->cells[i].mem, 1024);
def->cpu->cells[i].mem = cellmem * 1024;
+ virTristateSwitch memAccess = def->cpu->cells[i].memAccess;
VIR_FREE(cpumask);
VIR_FREE(nodemask);
@@ -6623,7 +6624,26 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
virBufferAsprintf(&buf,
"memory-backend-file,prealloc=yes,mem-path=%s",
mem_path);
+
+ switch (memAccess) {
+ case VIR_MEM_ACCESS_SHARED:
+ virBufferAddLit(&buf, ",share=on");
+ case VIR_MEM_ACCESS_PRIVATE:
+ virBufferAddLit(&buf, ",share=off");
+ break;
+
+ case VIR_MEM_ACCESS_DEFAULT:
+ case VIR_MEM_ACCESS_LAST:
+ break;
+ }
+
} else {
+ if (memAccess) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("Shared memory mapping is supported "
+ "only with hugepages"));
+ goto cleanup;
+ }
virBufferAddLit(&buf, "memory-backend-ram");
}
@@ -6654,6 +6674,13 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
virCommandAddArg(cmd, "-object");
virCommandAddArgBuffer(cmd, &buf);
+ } else {
+ if (memAccess) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("Shared memory mapping is not supported "
+ "with this QEMU"));
+ goto cleanup;
+ }
}
virCommandAddArg(cmd, "-numa");
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args
b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args
new file mode 100644
index 0000000..a7c7d92
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args
@@ -0,0 +1,16 @@
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
+/usr/bin/qemu -S -M pc -m 4096 -smp 4 \
+-object memory-backend-file,prealloc=yes,mem-path=/dev/hugepages1G/libvirt/qemu,\
+size=1024M,id=ram-node0,host-nodes=0-3,policy=bind \
+-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
+-object memory-backend-file,prealloc=yes,mem-path=/dev/hugepages2M/libvirt/qemu,\
+share=on,size=1024M,id=ram-node1,host-nodes=0-3,policy=bind \
+-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
+-object memory-backend-file,prealloc=yes,mem-path=/dev/hugepages1G/libvirt/qemu,\
+share=off,size=1024M,id=ram-node2,host-nodes=0-3,policy=bind \
+-numa node,nodeid=2,cpus=2,memdev=ram-node2 \
+-object memory-backend-file,prealloc=yes,mem-path=/dev/hugepages1G/libvirt/qemu,\
+size=1024M,id=ram-node3,host-nodes=3,policy=bind \
+-numa node,nodeid=3,cpus=3,memdev=ram-node3 \
+-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
+-hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 5c28253..515058e 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -684,6 +684,8 @@ mymain(void)
QEMU_CAPS_OBJECT_MEMORY_FILE);
DO_TEST("hugepages-pages3", QEMU_CAPS_MEM_PATH,
QEMU_CAPS_OBJECT_MEMORY_RAM,
QEMU_CAPS_OBJECT_MEMORY_FILE);
+ DO_TEST("hugepages-shared", QEMU_CAPS_MEM_PATH,
QEMU_CAPS_OBJECT_MEMORY_RAM,
+ QEMU_CAPS_OBJECT_MEMORY_FILE);
DO_TEST("nosharepages", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MEM_MERGE);
DO_TEST("disk-cdrom", NONE);
DO_TEST("disk-cdrom-network-http", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE,
@@ -1207,6 +1209,9 @@ mymain(void)
DO_TEST_PARSE_ERROR("cpu-numa3", NONE);
DO_TEST_FAILURE("cpu-numa-disjoint", NONE);
DO_TEST("cpu-numa-disjoint", QEMU_CAPS_NUMA);
+ DO_TEST_FAILURE("cpu-numa-memshared", QEMU_CAPS_SMP_TOPOLOGY,
+ QEMU_CAPS_OBJECT_MEMORY_RAM);
+ DO_TEST_FAILURE("cpu-numa-memshared", QEMU_CAPS_SMP_TOPOLOGY);
DO_TEST("cpu-host-model", NONE);
skipLegacyCPUs = true;
DO_TEST("cpu-host-model-fallback", NONE);
--
2.1.0
10:44 a.m.
On 09/15/2014 03:20 PM, Martin Kletzander wrote:
Changes to v1:
- 1/3 is now not connected to the rest of the patches any more
- whitespaces
- memShared='on/off' -> memAccess='private/shared'
Martin Kletzander (3):
schemas: finish virTristate{Bool,Switch} transition
docs, conf, schema: add support for shared memory mapping
qemu: add support for shared memory mapping
ACK series from me, that's the most beautiful attribute name I've ACKed today
(sorry, John).
Jan
3721
days inactive
3721
days old
4 comments
2 participants
participants (2)
-
Ján Tomko -
Martin Kletzander