qemu: New XML to disable memory merge at guest startup

QEMU introduced command line "-mem-merge=on|off" (defaults to on) to
enable/disable the memory merge (KSM) at guest startup. This exposes
it by new XML:
  <memoryBacking>
    <nosharepages/>
  </memoryBacking>

The XML tag is same with what we used internally for old RHEL.

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 9ade5072bdb3725337f546376dcba5961f97b1c8..df772b5322f9863b8f0b61744552ee5fee19e302 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -561,6 +561,7 @@
   ...
   <memoryBacking>
     <hugepages/>
+    <nosharepages/>
   </memoryBacking>
   ...
 </domain>
@@ -568,10 +569,15 @@
 
     <dl>
       <dt><code>memoryBacking</code></dt>
-      <dd>The optional <code>memoryBacking</code> element, may have an
-        <code>hugepages</code> element set within it. This tells the
-        hypervisor that the guest should have its memory allocated using
-        hugepages instead of the normal native page size.</dd>
+      <dd>The optional <code>memoryBacking</code> element has two
+        optional elements. The element <code>hugepages</code> tells
+        the hypervisor that the guest should have its memory allocated
+        using hugepages instead of the normal native page size. And the
+        optional element <code>nosharepages</code>
+        (<span class="since">since 1.0.6</span>) tells the hypervisor
+        that share pages (memory merge, KSM) should be disabled on guest
+        startup.
+      </dd>
     </dl>
 
 

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 800442896e7cb56e1308abb18bf99358e7b1c1c3..b40cb9008dec449504668deda3231834a90cd821 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -490,11 +490,18 @@
       </optional>
       <optional>
         <element name="memoryBacking">
-          <optional>
-            <element name="hugepages">
-              <empty/>
-            </element>
-          </optional>
+          <interleave>
+            <optional>
+              <element name="hugepages">
+                <empty/>
+              </element>
+            </optional>
+            <optional>
+              <element name="nosharepages">
+                <empty/>
+              </element>
+            </optional>
+          </interleave>
         </element>
       </optional>
 

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 862b9970cbf008023e74b8b410d9d84e09ae4685..2ab1bf8266d066de777dbfd4516c7c0a692c4d28 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10306,6 +10306,9 @@ virDomainDefParseXML(xmlDocPtr xml,
     if ((node = virXPathNode("./memoryBacking/hugepages", ctxt)))
         def->mem.hugepage_backed = true;
 
+    if ((node = virXPathNode("./memoryBacking/nosharepages", ctxt)))
+        def->mem.nosharepages = true;
+
     /* Extract blkio cgroup tunables */
     if (virXPathUInt("string(./blkiotune/weight)", ctxt,
                      &def->blkio.weight) < 0)
@@ -15662,12 +15665,17 @@ virDomainDefFormatInternal(virDomainDefPtr def,
         def->mem.swap_hard_limit)
         virBufferAddLit(buf, "  </memtune>\n");
 
-    if (def->mem.hugepage_backed) {
-        virBufferStrcat(buf,
-                        "  <memoryBacking>\n",
-                        "    <hugepages/>\n",
-                        "  </memoryBacking>\n", NULL);
-    }
+    if (def->mem.hugepage_backed || def->mem.nosharepages)
+        virBufferAddLit(buf, "  <memoryBacking>\n");
+
+    if (def->mem.hugepage_backed)
+        virBufferAddLit(buf, "    <hugepages/>\n");
+
+    if (def->mem.nosharepages)
+        virBufferAddLit(buf, "    <nosharepages/>\n");
+
+    if (def->mem.hugepage_backed || def->mem.nosharepages)
+        virBufferAddLit(buf, "  </memoryBacking>\n");
 
     virBufferAddLit(buf, "  <vcpu");
     virBufferAsprintf(buf, " placement='%s'",

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index a9d34105d9470699237f7f5865ac089459b4899a..11511114a3a0ff5be5b9495a96fbf9f37d73d35f 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1850,6 +1850,7 @@ struct _virDomainDef {
         unsigned long long max_balloon; /* in kibibytes */
         unsigned long long cur_balloon; /* in kibibytes */
         bool hugepage_backed;
+        bool nosharepages;
         int dump_core; /* enum virDomainMemDump */
         unsigned long long hard_limit; /* in kibibytes */
         unsigned long long soft_limit; /* in kibibytes */

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 36b264b114bb51ac02d74c73c494862c1504f392..5941f706bdb334ed37f5bbd61739448df86e272a 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5845,6 +5845,14 @@ qemuBuildMachineArgStr(virCommandPtr cmd,
                              "with this QEMU binary"));
             return -1;
         }
+
+        if (def->mem.nosharepages) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("disable shared memory is not available "
+                             "with this QEMU binary"));
+             return -1;
+        }
+
         obsoleteAccel = true;
     } else {
         virBuffer buf = VIR_BUFFER_INITIALIZER;
@@ -5878,6 +5886,18 @@ qemuBuildMachineArgStr(virCommandPtr cmd,
                               virDomainMemDumpTypeToString(def->mem.dump_core));
         }
 
+        if (def->mem.nosharepages) {
+            if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MEM_MERGE)) {
+                virBufferAddLit(&buf, ",mem-merge=off");
+            } else {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                               _("disable shared memory is not available "
+                                 "with this QEMU binary"));
+                virBufferFreeAndReset(&buf);
+                return -1;
+            }
+        }
+
         virCommandAddArgBuffer(cmd, &buf);
     }
 
@@ -10183,6 +10203,8 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps,
                             def->mem.dump_core = VIR_DOMAIN_MEM_DUMP_DEFAULT;
                         if (params)
                             VIR_FREE(tmp);
+                    } else if (STRPREFIX(tmp, "mem-merge=off")) {
+                        def->mem.nosharepages = true;
                     }
                 }
             }

diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
index 005aa0cfe83dc107b3a532cb66e540c57d06394c..528b8bf65f465afbf63c18d073af6b03d1c20169 100644 (file)
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -246,6 +246,8 @@ mymain(void)
 
     DO_TEST("pseries-nvram");
 
+    DO_TEST("nosharepages");
+
     DO_TEST_FULL("restore-v1", 0, "stdio");
     DO_TEST_FULL("restore-v2", 0, "stdio");
     DO_TEST_FULL("restore-v2", 0, "exec:cat");

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args
new file mode 100644 (file)
index 0000000..a32dfe5
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args
@@ -0,0 +1,4 @@
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \
+-S -machine pc,accel=tcg,mem-merge=off -m 215 -smp 1 -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/qemuxml2argvdata/qemuxml2argv-nosharepages.xml b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.xml
new file mode 100644 (file)
index 0000000..5e54cd0
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.xml
@@ -0,0 +1,31 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219200</memory>
+  <currentMemory unit='KiB'>219200</currentMemory>
+  <memoryBacking>
+    <nosharepages/>
+  </memoryBacking>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <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'>
+      <driver name='qemu' type='raw'/>
+      <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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index a373ed3ba1d8dc8d0c1c756d55619c909ddfc9b3..a2226f8dcf2a4966f5c7ffe929c36c6cebd83e6a 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -439,6 +439,7 @@ mymain(void)
     DO_TEST("hyperv", NONE);
 
     DO_TEST("hugepages", QEMU_CAPS_MEM_PATH);
+    DO_TEST("nosharepages", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MEM_MERGE);
     DO_TEST("disk-cdrom", NONE);
     DO_TEST("disk-cdrom-empty", QEMU_CAPS_DRIVE);
     DO_TEST("disk-cdrom-tray",

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 492ac601021f31f806860452fdc30a08ad794cd8..ddf3230d38be498c807bf5937520d0fcc68e8908 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -158,6 +158,7 @@ mymain(void)
     DO_TEST("hyperv");
 
     DO_TEST("hugepages");
+    DO_TEST("nosharepages");
     DO_TEST("disk-aio");
     DO_TEST("disk-cdrom");
     DO_TEST("disk-floppy");