From 7c4ee4b1708fcd1b9fbfcb9de1be66c8294e6bbb Mon Sep 17 00:00:00 2001

Message-Id: <7c4ee4b1708fcd1b9fbfcb9de1be66c8294e6bbb@dist-git>

From: Michal Privoznik <mprivozn@redhat.com>

Date: Tue, 13 Jun 2017 18:12:13 +0200

Subject: [PATCH] qemu: Allow memAccess for hugepages again

https://bugzilla.redhat.com/show_bug.cgi?id=1214369

https://bugzilla.redhat.com/show_bug.cgi?id=1458638

Historically, we've always supported memAccess for domains backed

by hugepages. However, somewhere along the way we've regressed

and stopped allowing such configuration. Fix it.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

(cherry picked from commit 671d18594f42f24f7cb3f1b2c574ff4ddba0b183)

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

---

 src/qemu/qemu_command.c                            | 18 ++-----

 .../qemuxml2argv-fd-memory-numa-topology2.args     |  2 +-

 .../qemuxml2argv-hugepages-memaccess.args          | 42 +++++++++++++++

 .../qemuxml2argv-hugepages-memaccess.xml           | 62 ++++++++++++++++++++++

 tests/qemuxml2argvtest.c                           |  3 ++

 .../qemuxml2xmlout-hugepages-memaccess.xml         |  1 +

 tests/qemuxml2xmltest.c                            |  1 +

 7 files changed, 114 insertions(+), 15 deletions(-)

 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.args

 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.xml

 create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess.xml

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c

index e220bf5ba0..c791214528 100644

--- a/src/qemu/qemu_command.c

+++ b/src/qemu/qemu_command.c

@@ -3345,6 +3345,9 @@ qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps,

         memAccess = virDomainNumaGetNodeMemoryAccessMode(def->numa, mem->targetNode);

     }

+    if (memAccess == VIR_DOMAIN_MEMORY_ACCESS_DEFAULT)

+        memAccess = def->mem.access;

+

     if (virDomainNumatuneGetMode(def->numa, mem->targetNode, &mode) < 0 &&

         virDomainNumatuneGetMode(def->numa, -1, &mode) < 0)

         mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT;

@@ -3402,7 +3405,7 @@ qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps,

     if (!(props = virJSONValueNewObject()))

         return -1;

-    if (pagesize || mem->nvdimmPath ||

+    if (pagesize || mem->nvdimmPath || memAccess ||

         def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE) {

         *backendType = "memory-backend-file";

@@ -3439,23 +3442,10 @@ qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps,

             break;

         case VIR_DOMAIN_MEMORY_ACCESS_DEFAULT:

-            if (def->mem.access == VIR_DOMAIN_MEMORY_ACCESS_SHARED) {

-                if (virJSONValueObjectAdd(props, "b:share", true, NULL) < 0)

-                    goto cleanup;

-            }

-            break;

-

         case VIR_DOMAIN_MEMORY_ACCESS_LAST:

             break;

         }

     } else {

-        if (memAccess) {

-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

-                           _("Shared memory mapping is supported "

-                             "only with hugepages"));

-            goto cleanup;

-        }

-

         *backendType = "memory-backend-ram";

     }

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.args b/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.args

index 4420b9ab22..e36f98b907 100644

--- a/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.args

+++ b/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.args

@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \

 -mem-prealloc \

 -smp 20,sockets=1,cores=8,threads=1 \

 -object memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram,\

-size=15032385536 \

+share=no,size=15032385536 \

 -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \

 -object memory-backend-file,id=ram-node1,mem-path=/var/lib/libvirt/qemu/ram,\

 share=yes,size=15032385536 \

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.args

new file mode 100644

index 0000000000..d584d465b5

--- /dev/null

+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.args

@@ -0,0 +1,42 @@

+LC_ALL=C \

+PATH=/bin \

+HOME=/home/test \

+USER=test \

+LOGNAME=test \

+QEMU_AUDIO_DRV=none \

+/usr/bin/qemu-system-i686 \

+-name QEMUGuest1 \

+-S \

+-M pc \

+-m size=4194304k,slots=16,maxmem=8388608k \

+-smp 4,sockets=4,cores=1,threads=1 \

+-object memory-backend-file,id=ram-node0,prealloc=yes,\

+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,size=1073741824,\

+host-nodes=0-3,policy=bind \

+-numa node,nodeid=0,cpus=0,memdev=ram-node0 \

+-object memory-backend-file,id=ram-node1,prealloc=yes,\

+mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,size=1073741824,\

+host-nodes=0-3,policy=bind \

+-numa node,nodeid=1,cpus=1,memdev=ram-node1 \

+-object memory-backend-file,id=ram-node2,prealloc=yes,\

+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,size=1073741824,\

+host-nodes=0-3,policy=bind \

+-numa node,nodeid=2,cpus=2,memdev=ram-node2 \

+-object memory-backend-file,id=ram-node3,prealloc=yes,\

+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,size=1073741824,\

+host-nodes=3,policy=bind \

+-numa node,nodeid=3,cpus=3,memdev=ram-node3 \

+-object memory-backend-file,id=memdimm0,prealloc=yes,\

+mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,size=536870912,\

+host-nodes=0-3,policy=bind \

+-device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \

+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \

+-nographic \

+-nodefaults \

+-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

+-no-acpi \

+-boot c \

+-usb \

+-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \

+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \

+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.xml

new file mode 100644

index 0000000000..db9b9430e1

--- /dev/null

+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.xml

@@ -0,0 +1,62 @@

+<domain type='qemu'>

+  <name>QEMUGuest1</name>

+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>

+  <maxMemory slots='16' unit='KiB'>8388608</maxMemory>

+  <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>

+    <access mode='private'/>

+  </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' unit='KiB'/>

+      <cell id='1' cpus='1' memory='1048576' unit='KiB' memAccess='shared'/>

+      <cell id='2' cpus='2' memory='1048576' unit='KiB' memAccess='private'/>

+      <cell id='3' cpus='3' memory='1048576' 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-i686</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'>

+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>

+    </controller>

+    <controller type='ide' index='0'>

+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>

+    </controller>

+    <controller type='pci' index='0' model='pci-root'/>

+    <input type='mouse' bus='ps2'/>

+    <input type='keyboard' bus='ps2'/>

+    <memballoon model='virtio'>

+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

+    </memballoon>

+    <memory model='dimm'>

+      <target>

+        <size unit='KiB'>524288</size>

+        <node>1</node>

+      </target>

+      <address type='dimm' slot='0' base='0x100000000'/>

+    </memory>

+  </devices>

+</domain>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c

index 175037bf96..77e52bd33b 100644

--- a/tests/qemuxml2argvtest.c

+++ b/tests/qemuxml2argvtest.c

@@ -827,6 +827,9 @@ mymain(void)

             QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE);

     DO_TEST("hugepages-pages5", QEMU_CAPS_MEM_PATH);

     DO_TEST("hugepages-pages6", NONE);

+    DO_TEST("hugepages-memaccess", QEMU_CAPS_OBJECT_MEMORY_FILE,

+            QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_DEVICE_PC_DIMM,

+            QEMU_CAPS_NUMA);

     DO_TEST("nosharepages", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MEM_MERGE);

     DO_TEST("disk-cdrom", NONE);

     DO_TEST("disk-iscsi", NONE);

diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess.xml

new file mode 120000

index 0000000000..23cef8e67d

--- /dev/null

+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess.xml

@@ -0,0 +1 @@

+../qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.xml

\ No newline at end of file

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c

index 72eac5e716..511d1b3fb9 100644

--- a/tests/qemuxml2xmltest.c

+++ b/tests/qemuxml2xmltest.c

@@ -420,6 +420,7 @@ mymain(void)

     DO_TEST("hugepages-pages2", NONE);

     DO_TEST("hugepages-pages3", NONE);

     DO_TEST("hugepages-shared", NONE);

+    DO_TEST("hugepages-memaccess", NONE);

     DO_TEST("nosharepages", NONE);

     DO_TEST("restore-v2", NONE);

     DO_TEST("migrate", NONE);

-- 

2.13.1