conf: Add support for iothread to queue mapping config for 'virtio-scsi'

Upcoming qemu release will support configuring mapping iothreads to
virtio queues for 'virtio-scsi' controllers in order to improve
performance.

Reuse the infrastructure we have from the same configuration for
'virti-blk' to implement the conf support for this feature.

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

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 9c6bb08726eee83059c84895b6d86cdfd9658c62..f07c6a2e6261aa96b78019c1233ed37d8ef67b18 100644 (file)
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -4168,6 +4168,45 @@ An optional sub-element ``driver`` can specify the driver specific options:
    If a specific IOThread is desired for a specific SCSI ``disk``, then multiple
    controllers must be defined each having a specific ``iothread`` value. The
    ``iothread`` value must be within the range 1 to the domain iothreads value.
+``iothreads``
+   Supported for ``virtio-scsi`` controllers using ``address`` types ``pci`` and
+   ``ccw``. :since:`since 11.2.0 (QEMU 10.0).` Mutually exclusive with ``iothread``.
+
+   The optional ``iothreads`` sub-element allows specifying multiple IOThreads
+   via the ``iothread`` sub-element with attribute ``id``  the ``virtio-scsi``
+   controller will use for I/O operations. The virt queues (see ``queues``
+   attribute of ``driver``) are automatically distributed among the configured
+   iothreads.
+
+   Optionally the ``iothread`` element can have multiple ``queue``
+   subelements with mandatory ``id`` atribute specifying that the iothread
+   should be used to handle given virt queue. If queue mapping is present
+   the ``queues`` attribute of  ``driver`` must be configured and all
+   configured virt queues must be included in the mapping. The
+   ``virtio-scsi`` device exposes request virt queues ``0`` to ``N-1`` where
+   N is the number of queues configured for the device.
+
+      Example::
+
+        <driver queues='4>
+          <iothreads>
+            <iothread id='2'/>
+            <iothread id='3'/>
+          </iothreads>
+        </driver>
+
+        <driver queues='3'>
+          <iothreads>
+            <iothread id='2'>
+              <queue id='1'/>
+            </iothread>
+            <iothread id='3'>
+              <queue id='0'/>
+              <queue id='2'/>
+            </iothread>
+          </iothreads>
+        </driver>
+
 virtio options
    For virtio controllers, `Virtio-related options`_ can
    also be set. ( :since:`Since 3.5.0` )

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d05e68dd41e89cc97303b386e081ada6539f9f51..bf466e7a3275b5e3eb342780d0d14f6cc9340dfa 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2567,6 +2567,8 @@ void virDomainControllerDefFree(virDomainControllerDef *def)
     if (!def)
         return;
 
+    g_slist_free_full(def->iothreads, (GDestroyNotify) virDomainIothreadMappingDefFree);
+
     virDomainDeviceInfoClear(&def->info);
     g_free(def->virtio);
 
@@ -8641,6 +8643,9 @@ virDomainControllerDefParseXML(virDomainXMLOption *xmlopt,
                            &def->iothread) < 0)
             return NULL;
 
+        if (virDomainIothreadMappingDefParse(driver, &def->iothreads) < 0)
+            return NULL;
+
         if (virDomainVirtioOptionsParseXML(driver, &def->virtio) < 0)
             return NULL;
     }
@@ -23496,6 +23501,7 @@ virDomainControllerDriverFormat(virBuffer *buf,
                                 virDomainControllerDef *def)
 {
     g_auto(virBuffer) driverBuf = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) driverChildBuf = VIR_BUFFER_INIT_CHILD(buf);
 
     if (def->queues)
         virBufferAsprintf(&driverBuf, " queues='%u'", def->queues);
@@ -23514,9 +23520,11 @@ virDomainControllerDriverFormat(virBuffer *buf,
     if (def->iothread)
         virBufferAsprintf(&driverBuf, " iothread='%u'", def->iothread);
 
+    virDomainIothreadMappingDefFormat(&driverChildBuf, def->iothreads);
+
     virDomainVirtioOptionsFormat(&driverBuf, def->virtio);
 
-    virXMLFormatElement(buf, "driver", &driverBuf, NULL);
+    virXMLFormatElement(buf, "driver", &driverBuf, &driverChildBuf);
 }
 
 

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index cbad1b7f7d709b6d9b8464d0519c292651e85572..2babcd253146a3ac965d90812d3a7410575f2f91 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -764,6 +764,7 @@ struct _virDomainControllerDef {
     unsigned int max_sectors;
     virTristateSwitch ioeventfd;
     unsigned int iothread; /* unused = 0, > 0 specific thread # */
+    GSList *iothreads; /* List of virDomainIothreadMappingDef */
     union {
         virDomainVirtioSerialOpts vioserial;
         virDomainPCIControllerOpts pciopts;

diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 7b901da593c8a0ad6a47cbc3157d0bfd2358d879..83cf2c99cf3c459739cfea241ec2451576167ede 100644 (file)
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -1267,7 +1267,7 @@ virDomainControllerDefValidate(const virDomainControllerDef *controller)
         }
     }
 
-    if (controller->iothread != 0) {
+    if (controller->iothread != 0 || controller->iothreads) {
         if (controller->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI ||
             !(controller->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI ||
               controller->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_TRANSITIONAL ||
@@ -1276,6 +1276,14 @@ virDomainControllerDefValidate(const virDomainControllerDef *controller)
                            _("iothreads are supported only by 'virtio-scsi' controllers"));
             return -1;
         }
+
+        /* configuring both <driver iothread='n'> and it's <iothreads> sub-element
+         * isn't supported */
+        if (controller->iothread && controller->iothreads) {
+            virReportError(VIR_ERR_XML_ERROR, "%s",
+                           _("controller driver 'iothread' attribute can't be used together with 'iothreads' subelement"));
+            return -1;
+        }
     }
 
     return 0;

diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index 7ef45a17318b8be28fcc0ecfc62022db4554c3f3..a8aabecab30b867276731ab276fbae1fd6cb2eb7 100644 (file)
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -3064,6 +3064,9 @@
             <optional>
               <ref name="driverIOThread"/>
             </optional>
+            <optional>
+              <ref name="iothreadMapping"/>
+            </optional>
             <ref name="virtioOptions"/>
           </element>
         </optional>

diff --git a/src/hypervisor/domain_driver.c b/src/hypervisor/domain_driver.c
index b7499a376ff3eb06a4e354dbba8a4be349cb378f..29ba358477e060d14456adb73ad509ff59869f53 100644 (file)
--- a/src/hypervisor/domain_driver.c
+++ b/src/hypervisor/domain_driver.c
@@ -585,7 +585,8 @@ virDomainDriverDelIOThreadCheck(virDomainDef *def,
     }
 
     for (i = 0; i < def->ncontrollers; i++) {
-        if (def->controllers[i]->iothread == iothread_id) {
+        if (virDomainIothreadMappingDefHasIothread(def->controllers[i]->iothreads, iothread_id) ||
+            def->controllers[i]->iothread == iothread_id) {
             virReportError(VIR_ERR_INVALID_ARG,
                            _("cannot remove IOThread '%1$u' since it is being used by controller"),
                            iothread_id);