virtio-fs: fix MSI-X nvectors calculation
PATCH 1/1 virtio-fs: fix MSI-X nvectors calculation
The following MSI-X vectors are required:
* VIRTIO Configuration Change
* hiprio virtqueue
* requests virtqueues
Fix the calculation to reserve enough MSI-X vectors. Otherwise guest drivers fall back to a sub-optional configuration where all virtqueues share a single vector.
This change does not break live migration compatibility since vhost-user-fs-pci devices are not migratable yet.
--- hw/virtio/vhost-user-fs-pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
hw/virtio/vhost-user-fs-pci.c +2 -1
@@ -40,7 +40,8 @@ static void vhost_user_fs_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)DeviceState *vdev =DEVICE (&dev->vdev);if (vpci_dev->nvectors ==DEV_NVECTORS_UNSPECIFIED ) { - vpci_dev->nvectors = dev->vdev.conf.num_request_queues +1 ; +/* Also reserve config change and hiprio queue vectors */ + vpci_dev->nvectors = dev->vdev.conf.num_request_queues +2 ; }qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus));
Signature · 1 line
2.23.0
Quoted 9 lines · * Stefan Hajnoczi ([email protected]) wrote:
The following MSI-X vectors are required:
* VIRTIO Configuration Change
* hiprio virtqueue
* requests virtqueuesFix the calculation to reserve enough MSI-X vectors. Otherwise guest drivers fall back to a sub-optional configuration where all virtqueues share a single vector.
Quoted 5 lines
This change does not break live migration compatibility since vhost-user-fs-pci devices are not migratable yet.
Reported-by Vivek Goyal <[email protected]>Signed-off-by Stefan Hajnoczi <[email protected]>
Quoted 21 lines
--- hw/virtio/vhost-user-fs-pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)hw/virtio/vhost-user-fs-pci.c +2
-1@@ -40,7 +40,8 @@ static void vhost_user_fs_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)DeviceState *vdev =DEVICE (&dev->vdev);if (vpci_dev->nvectors ==DEV_NVECTORS_UNSPECIFIED ) { - vpci_dev->nvectors = dev->vdev.conf.num_request_queues +1 ; +/* Also reserve config change and hiprio queue vectors */ + vpci_dev->nvectors = dev->vdev.conf.num_request_queues +2 ; }qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus));Signature · 1 line
2.23.0
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===
Submodule 'dtc' (https://git.qemu.org/git/dtc.git) registered for path 'dtc'
Cloning into 'dtc'...
remote: Counting objects: 5280, done.
error: RPC failed; result=18, HTTP code = 200
fatal: The remote end hung up unexpectedly
fatal: protocol error: bad pack header
Clone of 'https://git.qemu.org/git/dtc.git' into submodule path 'dtc' failed
failed to update submodule dtc
Submodule 'dtc' (https://git.qemu.org/git/dtc.git) unregistered for path 'dtc' make[1]: *** [/var/tmp/patchew-tester-tmp-x3rpl899/src/docker-src.2019-12-09-14.16.12.15965] Error 1 make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-x3rpl899/src'
make: *** [docker-run-test-quick@centos7] Error 2
real 5m24.090s
user 0m2.544s
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#! /bin/bash
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-mingw@fedora J=14 NETWORK=1
=== TEST SCRIPT END ===
Submodule 'dtc' (https://git.qemu.org/git/dtc.git) registered for path 'dtc'
Cloning into 'dtc'...
remote: Counting objects: 5280, done.
error: RPC failed; result=18, HTTP code = 200
fatal: The remote end hung up unexpectedly
fatal: protocol error: bad pack header
Clone of 'https://git.qemu.org/git/dtc.git' into submodule path 'dtc' failed
failed to update submodule dtc
Submodule 'dtc' (https://git.qemu.org/git/dtc.git) unregistered for path 'dtc' make[1]: *** [/var/tmp/patchew-tester-tmp-qf8_kdog/src/docker-src.2019-12-09-14.22.17.17018] Error 1 make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-qf8_kdog/src'
make: *** [docker-run-test-mingw@fedora] Error 2
real 4m26.482s
user 0m2.275s
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Quoted 9 lines · Stefan Hajnoczi
The following MSI-X vectors are required:
* VIRTIO Configuration Change
* hiprio virtqueue
* requests virtqueuesFix the calculation to reserve enough MSI-X vectors. Otherwise guest drivers fall back to a sub-optional configuration where all virtqueues share a single vector.
Quoted 5 lines
This change does not break live migration compatibility since vhost-user-fs-pci devices are not migratable yet.
Reported-by Vivek Goyal <[email protected]>Signed-off-by Stefan Hajnoczi <[email protected]>
Quoted 20 lines
--- hw/virtio/vhost-user-fs-pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)hw/virtio/vhost-user-fs-pci.c +2
-1@@ -40,7 +40,8 @@ static void vhost_user_fs_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)DeviceState *vdev =DEVICE (&dev->vdev);if (vpci_dev->nvectors ==DEV_NVECTORS_UNSPECIFIED ) { - vpci_dev->nvectors = dev->vdev.conf.num_request_queues +1 ; +/* Also reserve config change and hiprio queue vectors */ + vpci_dev->nvectors = dev->vdev.conf.num_request_queues +2 ; }qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus));Signature · 1 line
2.23.0
Quoted 9 lines · * Stefan Hajnoczi ([email protected]) wrote:
The following MSI-X vectors are required:
* VIRTIO Configuration Change
* hiprio virtqueue
* requests virtqueuesFix the calculation to reserve enough MSI-X vectors. Otherwise guest drivers fall back to a sub-optional configuration where all virtqueues share a single vector.
Quoted 5 lines
This change does not break live migration compatibility since vhost-user-fs-pci devices are not migratable yet.
Reported-by Vivek Goyal <[email protected]>Signed-off-by Stefan Hajnoczi <[email protected]>
Queued for virtiofs
Quoted 22 lines
--- hw/virtio/vhost-user-fs-pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)hw/virtio/vhost-user-fs-pci.c +2
-1@@ -40,7 +40,8 @@ static void vhost_user_fs_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)DeviceState *vdev =DEVICE (&dev->vdev);if (vpci_dev->nvectors ==DEV_NVECTORS_UNSPECIFIED ) { - vpci_dev->nvectors = dev->vdev.conf.num_request_queues +1 ; +/* Also reserve config change and hiprio queue vectors */ + vpci_dev->nvectors = dev->vdev.conf.num_request_queues +2 ; }qdev_set_parent_bus (vdev,BUS (&vpci_dev->bus));Signature · 1 line
2.23.0
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Stefan Hajnoczi
AppliedQuoted 9 lines · Stefan Hajnoczi
The following MSI-X vectors are required:
* VIRTIO Configuration Change
* hiprio virtqueue
* requests virtqueuesFix the calculation to reserve enough MSI-X vectors. Otherwise guest drivers fall back to a sub-optional configuration where all virtqueues share a single vector.
Quoted 8 lines
This change does not break live migration compatibility since vhost-user-fs-pci devices are not migratable yet.
Reported-by Vivek Goyal <[email protected]>Signed-off-by Stefan Hajnoczi <[email protected]>--- hw/virtio/vhost-user-fs-pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block
Stefan