From 3b7b827deb9eb7f43f548aabd27c300ae24c7db3 Mon Sep 17 00:00:00 2001

Message-Id: <3b7b827deb9eb7f43f548aabd27c300ae24c7db3@dist-git>

From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>

Date: Tue, 16 May 2017 10:44:56 +0200

Subject: [PATCH] conf: add caching_mode attribute to iommu device

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Add a new attribute to control the caching mode.

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

(cherry picked from commit d12781b47eb0c9f3a498d88b632c327aa08aaf8a)

Signed-off-by: Ján Tomko <jtomko@redhat.com>

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

---

 docs/formatdomain.html.in                          |  9 ++++

 docs/schemas/domaincommon.rng                      |  5 +++

 src/conf/domain_conf.c                             | 24 +++++++++--

 src/conf/domain_conf.h                             |  1 +

 .../qemuxml2argv-intel-iommu-caching-mode.xml      | 50 ++++++++++++++++++++++

 .../qemuxml2xmlout-intel-iommu-caching-mode.xml    |  1 +

 tests/qemuxml2xmltest.c                            |  1 +

 7 files changed, 88 insertions(+), 3 deletions(-)

 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching-mode.xml

 create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching-mode.xml

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in

index 41b8bfb50..43a75c1ee 100644

--- a/docs/formatdomain.html.in

+++ b/docs/formatdomain.html.in

@@ -7424,6 +7424,15 @@ qemu-kvm -net nic,model=? /dev/null

               Since 3.4.0 (QEMU/KVM only)

+          
caching_mode

+          

+            

+              The caching_mode attribute with possible values

+              on and off can be used to

+              turn on the VT-d caching mode (useful for assigned devices).

+              Since 3.4.0 (QEMU/KVM only)

+            

+          

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng

index a400d961b..12ccbd4e2 100644

--- a/docs/schemas/domaincommon.rng

+++ b/docs/schemas/domaincommon.rng

@@ -3900,6 +3900,11 @@

               <ref name="virOnOff"/>

             </attribute>

           </optional>

+          <optional>

+            <attribute name="caching_mode">

+              <ref name="virOnOff"/>

+            </attribute>

+          </optional>

         </element>

       </optional>

     </element>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c

index 45473f65b..e77b542f3 100644

--- a/src/conf/domain_conf.c

+++ b/src/conf/domain_conf.c

@@ -14167,6 +14167,15 @@ virDomainIOMMUDefParseXML(xmlNodePtr node,

         iommu->intremap = val;

     }

+    VIR_FREE(tmp);

+    if ((tmp = virXPathString("string(./driver/@caching_mode)", ctxt))) {

+        if ((val = virTristateSwitchTypeFromString(tmp)) < 0) {

+            virReportError(VIR_ERR_XML_ERROR, _("unknown caching_mode value: %s"), tmp);

+            goto cleanup;

+        }

+        iommu->caching_mode = val;

+    }

+

     ret = iommu;

     iommu = NULL;

@@ -24114,9 +24123,18 @@ virDomainIOMMUDefFormat(virBufferPtr buf,

     virBufferAdjustIndent(&childBuf, virBufferGetIndent(buf, false) + 2);

-    if (iommu->intremap != VIR_TRISTATE_SWITCH_ABSENT) {

-        virBufferAsprintf(&childBuf, "<driver intremap='%s'/>\n",

-                          virTristateSwitchTypeToString(iommu->intremap));

+    if (iommu->intremap != VIR_TRISTATE_SWITCH_ABSENT ||

+        iommu->caching_mode != VIR_TRISTATE_SWITCH_ABSENT) {

+        virBufferAddLit(&childBuf, "

+        if (iommu->intremap != VIR_TRISTATE_SWITCH_ABSENT) {

+            virBufferAsprintf(&childBuf, " intremap='%s'",

+                              virTristateSwitchTypeToString(iommu->intremap));

+        }

+        if (iommu->caching_mode != VIR_TRISTATE_SWITCH_ABSENT) {

+            virBufferAsprintf(&childBuf, " caching_mode='%s'",

+                              virTristateSwitchTypeToString(iommu->caching_mode));

+        }

+        virBufferAddLit(&childBuf, "/>\n");

     }

     virBufferAsprintf(buf, "

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h

index 8eb422a57..825158a7d 100644

--- a/src/conf/domain_conf.h

+++ b/src/conf/domain_conf.h

@@ -2210,6 +2210,7 @@ typedef enum {

 struct _virDomainIOMMUDef {

     virDomainIOMMUModel model;

     virTristateSwitch intremap;

+    virTristateSwitch caching_mode;

 };

 /*

  * Guest VM main configuration

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching-mode.xml b/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching-mode.xml

new file mode 100644

index 000000000..5f3384da7

--- /dev/null

+++ b/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching-mode.xml

@@ -0,0 +1,50 @@

+<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'>1</vcpu>

+  <os>

+    <type arch='x86_64' machine='q35'>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-system-x86_64</emulator>

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

+    <controller type='pci' index='1' model='dmi-to-pci-bridge'>

+      <model name='i82801b11-bridge'/>

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

+    </controller>

+    <controller type='pci' index='2' model='pci-bridge'>

+      <model name='pci-bridge'/>

+      <target chassisNr='2'/>

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

+    </controller>

+    <controller type='pci' index='3' model='pcie-root-port'>

+      <model name='ioh3420'/>

+      <target chassis='3' port='0x10'/>

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

+    </controller>

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

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

+    </controller>

+    <controller type='usb' index='0' model='ich9-ehci1'>

+      <address type='pci' domain='0x0000' bus='0x02' slot='0x02' function='0x7'/>

+    </controller>

+    <interface type='user'>

+      <mac address='52:54:00:ab:0c:5c'/>

+      <model type='rtl8139'/>

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

+    </interface>

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

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

+    <memballoon model='none'/>

+    <iommu model='intel'>

+      <driver intremap='on' caching_mode='on'/>

+    </iommu>

+  </devices>

+</domain>

diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching-mode.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching-mode.xml

new file mode 120000

index 000000000..d971a35dc

--- /dev/null

+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching-mode.xml

@@ -0,0 +1 @@

+../qemuxml2argvdata/qemuxml2argv-intel-iommu-caching-mode.xml

\ No newline at end of file

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

index 0482ad9cb..e1938421a 100644

--- a/tests/qemuxml2xmltest.c

+++ b/tests/qemuxml2xmltest.c

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

             QEMU_CAPS_MACHINE_OPT,

             QEMU_CAPS_MACHINE_IOMMU);

     DO_TEST("intel-iommu-ioapic", NONE);

+    DO_TEST("intel-iommu-caching-mode", NONE);

     DO_TEST("cpu-check-none", NONE);

     DO_TEST("cpu-check-partial", NONE);

-- 

2.13.0