[v1] Support more options for intel-iommu

[libvirt] [PATCHv2 5/6] conf: add caching attribute to iommu device

Posted by Ján Tomko 8 years, 9 months ago

Add a new attribute to control the caching mode.

https://bugzilla.redhat.com/show_bug.cgi?id=1427005
---
 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.xml           | 28 ++++++++++++++++++++++
 .../qemuxml2xmlout-intel-iommu-caching.xml         |  1 +
 tests/qemuxml2xmltest.c                            |  1 +
 7 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching.xml
 create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching.xml

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index f5a8e76..dbca316 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -7364,6 +7364,15 @@ qemu-kvm -net nic,model=? /dev/null
               (QEMU only)
             </p>
           </dd>
+          <dt><code>caching</code></dt>
+          <dd>
+            <p>
+              The <code>caching</code> attribute with possible values
+              <code>on</code> and <code>off</code> can be used to
+              turn on the caching mode. <span class="since">Since 3.3.0</span>
+              (QEMU only)
+            </p>
+          </dd>
         </dl>
       </dd>
     </dl>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 7930d85..b237140 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -3896,6 +3896,11 @@
               <ref name="virOnOff"/>
             </attribute>
           </optional>
+          <optional>
+            <attribute name="caching">
+              <ref name="virOnOff"/>
+            </attribute>
+          </optional>
         </element>
       </optional>
     </element>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d40d129..cdeb60b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -14092,6 +14092,15 @@ virDomainIOMMUDefParseXML(xmlNodePtr node,
         iommu->intremap = val;
     }
 
+    VIR_FREE(tmp);
+    if ((tmp = virXPathString("string(./driver/@caching)", ctxt))) {
+        if ((val = virTristateSwitchTypeFromString(tmp)) < 0) {
+            virReportError(VIR_ERR_XML_ERROR, _("unknown caching value: %s"), tmp);
+            goto cleanup;
+        }
+        iommu->caching = val;
+    }
+
     ret = iommu;
     iommu = NULL;
 
@@ -24037,9 +24046,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 != VIR_TRISTATE_SWITCH_ABSENT) {
+        virBufferAddLit(&childBuf, "<driver");
+        if (iommu->intremap) {
+            virBufferAsprintf(&childBuf, " intremap='%s'",
+                              virTristateSwitchTypeToString(iommu->intremap));
+        }
+        if (iommu->caching != VIR_TRISTATE_SWITCH_ABSENT) {
+            virBufferAsprintf(&childBuf, " caching='%s'",
+                              virTristateSwitchTypeToString(iommu->caching));
+        }
+        virBufferAddLit(&childBuf, "/>\n");
     }
 
     virBufferAsprintf(buf, "<iommu model='%s'",
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index f95649c..1afbaff 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2212,6 +2212,7 @@ typedef enum {
 struct _virDomainIOMMUDef {
     virDomainIOMMUModel model;
     virTristateSwitch intremap;
+    virTristateSwitch caching;
 };
 /*
  * Guest VM main configuration
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching.xml b/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching.xml
new file mode 100644
index 0000000..bab4fcb
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching.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'>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='sata' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+    </controller>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <memballoon model='none'/>
+    <iommu model='intel'>
+      <driver intremap='on' caching='on'/>
+    </iommu>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching.xml
new file mode 120000
index 0000000..6935d93
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/qemuxml2argv-intel-iommu-caching.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index c7d4788..a4d5e97 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1122,6 +1122,7 @@ mymain(void)
             QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACHINE_IOMMU);
     DO_TEST("intel-iommu-irqchip", NONE);
+    DO_TEST("intel-iommu-caching", NONE);
 
     DO_TEST("cpu-check-none", NONE);
     DO_TEST("cpu-check-partial", NONE);
-- 
2.10.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCHv2 5/6] conf: add caching attribute to iommu device

Posted by John Ferlan 8 years, 9 months ago


On 04/20/2017 08:19 AM, Ján Tomko wrote:
> Add a new attribute to control the caching mode.
> 
> https://bugzilla.redhat.com/show_bug.cgi?id=1427005
> ---
>  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.xml           | 28 ++++++++++++++++++++++
>  .../qemuxml2xmlout-intel-iommu-caching.xml         |  1 +
>  tests/qemuxml2xmltest.c                            |  1 +
>  7 files changed, 66 insertions(+), 3 deletions(-)
>  create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching.xml
>  create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching.xml
> 
> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
> index f5a8e76..dbca316 100644
> --- a/docs/formatdomain.html.in
> +++ b/docs/formatdomain.html.in
> @@ -7364,6 +7364,15 @@ qemu-kvm -net nic,model=? /dev/null
>                (QEMU only)
>              </p>
>            </dd>
> +          <dt><code>caching</code></dt>
> +          <dd>
> +            <p>
> +              The <code>caching</code> attribute with possible values
> +              <code>on</code> and <code>off</code> can be used to
> +              turn on the caching mode. <span class="since">Since 3.3.0</span>
> +              (QEMU only)

Useful for what?  Required for what?  A bit more description about the
relationship with intremap might be nice as well.

Is there a relationship with the irqmode settings?  If so, then I would
think there should be checks in domain post processing that ensure that
if this is on, then the irqmode setting is adjusted appropriately.


> +            </p>
> +          </dd>
>          </dl>
>        </dd>
>      </dl>



> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching.xml b/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching.xml
> new file mode 100644
> index 0000000..bab4fcb
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching.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'>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='sata' index='0'>
> +      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
> +    </controller>
> +    <input type='mouse' bus='ps2'/>
> +    <input type='keyboard' bus='ps2'/>
> +    <memballoon model='none'/>
> +    <iommu model='intel'>
> +      <driver intremap='on' caching='on'/>
> +    </iommu>
> +  </devices>
> +</domain>

Maybe this is the XML that gets more devices added that prove the
ordering is correct.  IDC which one, but we should "ensure" the ordering
is right..

John

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCHv2 1/6] conf: add <irqchip mode> to <features>
[libvirt] [PATCHv2 2/6] qemu: format kernel_irqchip on the command line
[libvirt] [PATCHv2 3/6] conf: add <driver intremap> to <iommu>
[libvirt] [PATCHv2 4/6] qemu: format intremap= on intel-iommu command line
[libvirt] [PATCHv2 5/6] conf: add caching attribute to iommu device
[libvirt] [PATCHv2 6/6] qemu: format caching-mode on iommu command line