| Message ID | 20220118203833.316741-5-eric.auger@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | qtests/libqos: Allow PCI tests to be run with virt-machine | expand |
On Tue, Jan 18, 2022 at 09:38:31PM +0100, Eric Auger wrote: > When run on ARM, basic and indirect tests currently fail with the > following error: > > ERROR:../tests/qtest/libqos/virtio.c:224:qvirtio_wait_used_elem: > assertion failed (got_desc_idx == desc_idx): (50331648 == 0) > Bail out! ERROR:../tests/qtest/libqos/virtio.c:224: qvirtio_wait_used_elem: > assertion failed (got_desc_idx == desc_idx): (50331648 == 0) > > Setting up and enabling MSIX fixes the issue. > > Also remove the useless libqos/libqos-pc.h header inclusion. > > Signed-off-by: Eric Auger <eric.auger@redhat.com> > Acked-by: Thomas Huth <thuth@redhat.com> Seems to cause a make check failure: ▶ 71/713 ERROR:../tests/qtest/libqos/pci.c:232:qpci_device_enable: assertion failed (cmd & PCI_COMMAND_IO == PCI_COMMAND_IO): (0x00000000 +== 0x00000001) ERROR ^CWARNING: Received SIGTERM, exiting > --- > tests/qtest/vhost-user-blk-test.c | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/tests/qtest/vhost-user-blk-test.c b/tests/qtest/vhost-user-blk-test.c > index 1316aae0fa..2606428df3 100644 > --- a/tests/qtest/vhost-user-blk-test.c > +++ b/tests/qtest/vhost-user-blk-test.c > @@ -19,7 +19,6 @@ > #include "standard-headers/linux/virtio_pci.h" > #include "libqos/qgraph.h" > #include "libqos/vhost-user-blk.h" > -#include "libqos/libqos-pc.h" > > #define TEST_IMAGE_SIZE (64 * 1024 * 1024) > #define QVIRTIO_BLK_TIMEOUT_US (30 * 1000 * 1000) > @@ -224,6 +223,10 @@ static QVirtQueue *test_basic(QVirtioDevice *dev, QGuestAllocator *alloc) > char *data; > QTestState *qts = global_qtest; > QVirtQueue *vq; > + QVirtioPCIDevice *vpcidev = container_of(dev, QVirtioPCIDevice, vdev); > + > + qpci_msix_enable(vpcidev->pdev); > + qvirtio_pci_set_msix_configuration_vector(vpcidev, alloc, 0); > > features = qvirtio_get_features(dev); > features = features & ~(QVIRTIO_F_BAD_FEATURE | > @@ -236,9 +239,12 @@ static QVirtQueue *test_basic(QVirtioDevice *dev, QGuestAllocator *alloc) > g_assert_cmpint(capacity, ==, TEST_IMAGE_SIZE / 512); > > vq = qvirtqueue_setup(dev, alloc, 0); > + qvirtqueue_pci_msix_setup(vpcidev, (QVirtQueuePCI *)vq, alloc, 1); > > qvirtio_set_driver_ok(dev); > > + qvirtio_wait_queue_isr(qts, dev, vq, QVIRTIO_BLK_TIMEOUT_US); > + > /* Write and read with 3 descriptor layout */ > /* Write request */ > req.type = VIRTIO_BLK_T_OUT; > @@ -468,6 +474,10 @@ static void indirect(void *obj, void *u_data, QGuestAllocator *t_alloc) > uint8_t status; > char *data; > QTestState *qts = global_qtest; > + QVirtioPCIDevice *vpcidev = container_of(dev, QVirtioPCIDevice, vdev); > + > + qpci_msix_enable(vpcidev->pdev); > + qvirtio_pci_set_msix_configuration_vector(vpcidev, t_alloc, 0); > > features = qvirtio_get_features(dev); > g_assert_cmphex(features & (1u << VIRTIO_RING_F_INDIRECT_DESC), !=, 0); > @@ -480,8 +490,12 @@ static void indirect(void *obj, void *u_data, QGuestAllocator *t_alloc) > g_assert_cmpint(capacity, ==, TEST_IMAGE_SIZE / 512); > > vq = qvirtqueue_setup(dev, t_alloc, 0); > + qvirtqueue_pci_msix_setup(vpcidev, (QVirtQueuePCI *)vq, t_alloc, 1); > + > qvirtio_set_driver_ok(dev); > > + qvirtio_wait_queue_isr(qts, dev, vq, QVIRTIO_BLK_TIMEOUT_US); > + > /* Write request */ > req.type = VIRTIO_BLK_T_OUT; > req.ioprio = 1; > -- > 2.26.3
diff --git a/tests/qtest/vhost-user-blk-test.c b/tests/qtest/vhost-user-blk-test.c index 1316aae0fa..2606428df3 100644 --- a/tests/qtest/vhost-user-blk-test.c +++ b/tests/qtest/vhost-user-blk-test.c @@ -19,7 +19,6 @@ #include "standard-headers/linux/virtio_pci.h" #include "libqos/qgraph.h" #include "libqos/vhost-user-blk.h" -#include "libqos/libqos-pc.h" #define TEST_IMAGE_SIZE (64 * 1024 * 1024) #define QVIRTIO_BLK_TIMEOUT_US (30 * 1000 * 1000) @@ -224,6 +223,10 @@ static QVirtQueue *test_basic(QVirtioDevice *dev, QGuestAllocator *alloc) char *data; QTestState *qts = global_qtest; QVirtQueue *vq; + QVirtioPCIDevice *vpcidev = container_of(dev, QVirtioPCIDevice, vdev); + + qpci_msix_enable(vpcidev->pdev); + qvirtio_pci_set_msix_configuration_vector(vpcidev, alloc, 0); features = qvirtio_get_features(dev); features = features & ~(QVIRTIO_F_BAD_FEATURE | @@ -236,9 +239,12 @@ static QVirtQueue *test_basic(QVirtioDevice *dev, QGuestAllocator *alloc) g_assert_cmpint(capacity, ==, TEST_IMAGE_SIZE / 512); vq = qvirtqueue_setup(dev, alloc, 0); + qvirtqueue_pci_msix_setup(vpcidev, (QVirtQueuePCI *)vq, alloc, 1); qvirtio_set_driver_ok(dev); + qvirtio_wait_queue_isr(qts, dev, vq, QVIRTIO_BLK_TIMEOUT_US); + /* Write and read with 3 descriptor layout */ /* Write request */ req.type = VIRTIO_BLK_T_OUT; @@ -468,6 +474,10 @@ static void indirect(void *obj, void *u_data, QGuestAllocator *t_alloc) uint8_t status; char *data; QTestState *qts = global_qtest; + QVirtioPCIDevice *vpcidev = container_of(dev, QVirtioPCIDevice, vdev); + + qpci_msix_enable(vpcidev->pdev); + qvirtio_pci_set_msix_configuration_vector(vpcidev, t_alloc, 0); features = qvirtio_get_features(dev); g_assert_cmphex(features & (1u << VIRTIO_RING_F_INDIRECT_DESC), !=, 0); @@ -480,8 +490,12 @@ static void indirect(void *obj, void *u_data, QGuestAllocator *t_alloc) g_assert_cmpint(capacity, ==, TEST_IMAGE_SIZE / 512); vq = qvirtqueue_setup(dev, t_alloc, 0); + qvirtqueue_pci_msix_setup(vpcidev, (QVirtQueuePCI *)vq, t_alloc, 1); + qvirtio_set_driver_ok(dev); + qvirtio_wait_queue_isr(qts, dev, vq, QVIRTIO_BLK_TIMEOUT_US); + /* Write request */ req.type = VIRTIO_BLK_T_OUT; req.ioprio = 1;