diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 19c4aa5e2e..991d45672a 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -3367,6 +3367,7 @@ A directory on the host that can be accessed directly from the guest. + @@ -3500,6 +3501,11 @@ A directory on the host that can be accessed directly from the guest. ``chroot``, see the `virtiofsd documentation `__ for more details. ( :since:`Since 7.2.0` ) + Element ``thread_pool`` accepts one attribute ``size`` which defines the + maximum thread pool size. A value of "0" disables the pool. + The thread pool helps increase the number of requests in flight when used with + storage that has a higher latency. However, it has an overhead, and so for + fast, low latency filesystems, it may be best to turn it off. ( :since:`Since 8.5.0` ) ``source`` The resource on the host that is being accessed in the guest. The ``name`` attribute must be used with ``type='template'``, and the ``dir`` attribute diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 015ce0bce1..9fe930a5d8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2472,6 +2472,8 @@ virDomainFSDefNew(virDomainXMLOption *xmlopt) ret->src = virStorageSourceNew(); + ret->thread_pool_size = -1; + if (xmlopt && xmlopt->privateData.fsNew && !(ret->privateData = xmlopt->privateData.fsNew())) @@ -9910,6 +9912,7 @@ virDomainFSDefParseXML(virDomainXMLOption *xmlopt, if (def->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS) { g_autofree char *queue_size = virXPathString("string(./driver/@queue)", ctxt); g_autofree char *binary = virXPathString("string(./binary/@path)", ctxt); + g_autofree char *thread_pool_size = virXPathString("string(./binary/thread_pool/@size)", ctxt); xmlNodePtr binary_node = virXPathNode("./binary", ctxt); xmlNodePtr binary_lock_node = virXPathNode("./binary/lock", ctxt); xmlNodePtr binary_cache_node = virXPathNode("./binary/cache", ctxt); @@ -9922,6 +9925,14 @@ virDomainFSDefParseXML(virDomainXMLOption *xmlopt, goto error; } + if (thread_pool_size && + virStrToLong_i(thread_pool_size, NULL, 10, &def->thread_pool_size) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("cannot parse thread pool size '%s' for virtiofs"), + queue_size); + goto error; + } + if (binary) def->binary = virFileSanitizePath(binary); @@ -24258,6 +24269,10 @@ virDomainFSDefFormat(virBuffer *buf, } virXMLFormatElement(&binaryBuf, "lock", &lockAttrBuf, NULL); + + if (def->thread_pool_size >= 0) + virBufferAsprintf(&binaryBuf, "\n", def->thread_pool_size); + } virDomainVirtioOptionsFormat(&driverAttrBuf, def->virtio); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 612ebc80b7..4c8c42b7eb 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -905,6 +905,7 @@ struct _virDomainFSDef { virTristateSwitch posix_lock; virTristateSwitch flock; virDomainFSSandboxMode sandbox; + int thread_pool_size; virDomainVirtioOptions *virtio; virObject *privateData; }; diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng index 3ba4da46a4..e2246e6b63 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -3137,6 +3137,15 @@ + + + + + + + + + diff --git a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml index abddf0870b..81de8c0dd7 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml +++ b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml @@ -32,6 +32,7 @@ +