tests/qtest: Enable spapr dma tests
PATCH 2/4 tests/qtest: Fix virtio msix message endianness
In reply to Nicholas Pigginmsix messages are written to memory in little-endian order, so they should not be byteswapped depending on target endianness, but read as le and converted to host endian by the qtest.
--- tests/qtest/libqos/virtio-pci-modern.c | 4 +++- tests/qtest/libqos/virtio-pci.c | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-)
tests/qtest/libqos/virtio-pci-modern.c +3 -1
@@ -8,6 +8,7 @@*/ #include "qemu/osdep.h" +#include "qemu/bswap.h" #include "standard-headers/linux/pci_regs.h" #include "standard-headers/linux/virtio_pci.h" #include "standard-headers/linux/virtio_config.h"
@@ -136,7 +137,8 @@ static bool get_msix_status(QVirtioPCIDevice *dev, uint32_t msix_entry,return qpci_msix_pending (dev->pdev, msix_entry); } - data =qtest_readl (dev->pdev->bus->qts, msix_addr); +qtest_memread (dev->pdev->bus->qts, msix_addr, &data,4 ); + data =le32_to_cpu (data);if (data ==0 ) {return false; }
tests/qtest/libqos/virtio-pci.c +4 -2
@@ -131,7 +131,8 @@ static bool qvirtio_pci_get_queue_isr_status(QVirtioDevice *d, QVirtQueue *vq)/* No ISR checking should be done if masked, but read anyway */ return qpci_msix_pending (dev->pdev, vqpci->msix_entry); }else { - data =qtest_readl (dev->pdev->bus->qts, vqpci->msix_addr); +qtest_memread (dev->pdev->bus->qts, vqpci->msix_addr, &data,4 ); + data =le32_to_cpu (data);if (data ==0 ) {return false; }
@@ -156,7 +157,8 @@ static bool qvirtio_pci_get_config_isr_status(QVirtioDevice *d)/* No ISR checking should be done if masked, but read anyway */ return qpci_msix_pending (dev->pdev, dev->config_msix_entry); }else { - data =qtest_readl (dev->pdev->bus->qts, dev->config_msix_addr); +qtest_memread (dev->pdev->bus->qts, dev->config_msix_addr, &data,4 ); + data =le32_to_cpu (data);if (data ==0 ) {return false; }
Signature · 1 line
2.47.1
PATCH 1/4 tests/qtest: Enforce zero for the "un-fired" msix message value
In reply to Nicholas Pigginvirtio-pci detects an unmasked msix interrupt has fired by looking for the data payload value at the target address. If a value of zero is enforced for the memory value when an interrupt has not fired, then an assertion can be added to catch the case where something changed the memory to an unexpected value.
This catches an endian conversion bug in the message value when running these tests on a big endian target. Previously the test just times out waiting for interrupt, after this it fails nicely.
--- tests/qtest/libqos/virtio-pci-modern.c | 9 +++++---- tests/qtest/libqos/virtio-pci.c | 20 ++++++++++++-------- 2 files changed, 17 insertions(+), 12 deletions(-)
tests/qtest/libqos/virtio-pci-modern.c +5 -4
@@ -137,12 +137,13 @@ static bool get_msix_status(QVirtioPCIDevice *dev, uint32_t msix_entry, } data =qtest_readl (dev->pdev->bus->qts, msix_addr); -if (data == msix_data) { -qtest_writel (dev->pdev->bus->qts, msix_addr,0 ); -return true; - }else { +if (data ==0 ) {return false; } +/* got a message, ensure it matches expected value then clear it. */ + g_assert_cmphex(data, ==, msix_data); +qtest_writel (dev->pdev->bus->qts, msix_addr,0 ); +return true; }static bool get_queue_isr_status (QVirtioDevice *d,QVirtQueue *vq)
tests/qtest/libqos/virtio-pci.c +12 -8
@@ -132,12 +132,13 @@ static bool qvirtio_pci_get_queue_isr_status(QVirtioDevice *d, QVirtQueue *vq)return qpci_msix_pending (dev->pdev, vqpci->msix_entry); }else { data =qtest_readl (dev->pdev->bus->qts, vqpci->msix_addr); -if (data == vqpci->msix_data) { -qtest_writel (dev->pdev->bus->qts, vqpci->msix_addr,0 ); -return true; - }else { +if (data ==0 ) {return false; } +/* got a message, ensure it matches expected value then clear it. */ + g_assert_cmphex(data, ==, vqpci->msix_data); +qtest_writel (dev->pdev->bus->qts, vqpci->msix_addr,0 ); +return true; } }else {return qpci_io_readb (dev->pdev, dev->bar,VIRTIO_PCI_ISR ) &1 ;
@@ -156,12 +157,13 @@ static bool qvirtio_pci_get_config_isr_status(QVirtioDevice *d)return qpci_msix_pending (dev->pdev, dev->config_msix_entry); }else { data =qtest_readl (dev->pdev->bus->qts, dev->config_msix_addr); -if (data == dev->config_msix_data) { -qtest_writel (dev->pdev->bus->qts, dev->config_msix_addr,0 ); -return true; - }else { +if (data ==0 ) {return false; } +/* got a message, ensure it matches expected value then clear it. */ + g_assert_cmphex(data, ==, dev->config_msix_data); +qtest_writel (dev->pdev->bus->qts, dev->config_msix_addr,0 ); +return true; } }else {return qpci_io_readb (dev->pdev, dev->bar,VIRTIO_PCI_ISR ) &2 ;
@@ -323,6 +325,7 @@ void qvirtqueue_pci_msix_setup(QVirtioPCIDevice *d, QVirtQueuePCI *vqpci, vqpci->msix_entry = entry; vqpci->msix_addr =guest_alloc (alloc,4 ); +qtest_memset (d->pdev->bus->qts, vqpci->msix_addr,0 ,4 );qpci_io_writel (d->pdev, d->pdev->msix_table_bar, off +PCI_MSIX_ENTRY_LOWER_ADDR , vqpci->msix_addr & ~0UL ); qpci_io_writel(d->pdev, d->pdev->msix_table_bar,
@@ -355,6 +358,7 @@ void qvirtio_pci_set_msix_configuration_vector(QVirtioPCIDevice *d, d->config_msix_data =0x12345678 ; d->config_msix_addr =guest_alloc (alloc,4 ); +qtest_memset (d->pdev->bus->qts, d->config_msix_addr,0 ,4 );qpci_io_writel (d->pdev, d->pdev->msix_table_bar, off +PCI_MSIX_ENTRY_LOWER_ADDR , d->config_msix_addr & ~0UL );
Signature · 1 line
2.47.1
PATCH 3/4 tests/qtest: Add libqos function for testing msix interrupt status
In reply to Nicholas PigginThis function is duplicated 3 times, with more potential future users. Factor it into libqos, using qtest_memset instead of qtest_writel to clear the message just because that looks nicer with the qtest_memread used to read it.
--- tests/qtest/libqos/pci.h | 2 ++ tests/qtest/libqos/pci.c | 48 ++++++++++++++++++++++++++ tests/qtest/libqos/virtio-pci-modern.c | 31 +++-------------- tests/qtest/libqos/virtio-pci.c | 40 ++++----------------- 4 files changed, 62 insertions(+), 59 deletions(-)
tests/qtest/libqos/pci.h +2 -0
@@ -92,6 +92,8 @@ void qpci_msix_enable(QPCIDevice *dev);void qpci_msix_disable (QPCIDevice *dev);bool qpci_msix_pending (QPCIDevice *dev,uint16_t entry);bool qpci_msix_masked (QPCIDevice *dev,uint16_t entry); +bool qpci_msix_test_interrupt (QPCIDevice *dev,uint32_t msix_entry, +uint64_t msix_addr,uint32_t msix_data);uint16_t qpci_msix_table_size (QPCIDevice *dev);uint8_t qpci_config_readb (QPCIDevice *dev,uint8_t offset);
tests/qtest/libqos/pci.c +48 -0
54 lines not on this page · raw message
tests/qtest/libqos/virtio-pci-modern.c +5 -26
@@ -126,28 +126,6 @@ static void set_status(QVirtioDevice *d, uint8_t status) status); } -static bool get_msix_status (QVirtioPCIDevice *dev,uint32_t msix_entry, -uint32_t msix_addr,uint32_t msix_data) -{ -uint32_t data; - - g_assert_cmpint(msix_entry, !=, -1); -if (qpci_msix_masked (dev->pdev, msix_entry)) { -/* No ISR checking should be done if masked, but read anyway */ -return qpci_msix_pending (dev->pdev, msix_entry); - } - -qtest_memread (dev->pdev->bus->qts, msix_addr, &data,4 ); - data =le32_to_cpu (data); -if (data ==0 ) { -return false; - } -/* got a message, ensure it matches expected value then clear it. */ - g_assert_cmphex(data, ==, msix_data); -qtest_writel (dev->pdev->bus->qts, msix_addr,0 ); -return true; -} -static bool get_queue_isr_status (QVirtioDevice *d,QVirtQueue *vq) {QVirtioPCIDevice *dev =container_of (d, QVirtioPCIDevice, vdev);
@@ -155,8 +133,8 @@ static bool get_queue_isr_status(QVirtioDevice *d, QVirtQueue *vq)if (dev->pdev->msix_enabled) {QVirtQueuePCI *vqpci =container_of (vq, QVirtQueuePCI, vq); -return get_msix_status (dev, vqpci->msix_entry, vqpci->msix_addr, - vqpci->msix_data); +return qpci_msix_test_interrupt (dev->pdev, vqpci->msix_entry, + vqpci->msix_addr, vqpci->msix_data); }return qpci_io_readb (dev->pdev, dev->bar, dev->isr_cfg_offset) &1 ;
@@ -167,8 +145,9 @@ static bool get_config_isr_status(QVirtioDevice *d)QVirtioPCIDevice *dev =container_of (d, QVirtioPCIDevice, vdev);if (dev->pdev->msix_enabled) { -return get_msix_status (dev, dev->config_msix_entry, - dev->config_msix_addr, dev->config_msix_data); +return qpci_msix_test_interrupt (dev->pdev, dev->config_msix_entry, + dev->config_msix_addr, + dev->config_msix_data); }return qpci_io_readb (dev->pdev, dev->bar, dev->isr_cfg_offset) &2 ;
tests/qtest/libqos/virtio-pci.c +7 -33
@@ -122,25 +122,12 @@ static void qvirtio_pci_set_status(QVirtioDevice *d, uint8_t status)static bool qvirtio_pci_get_queue_isr_status (QVirtioDevice *d,QVirtQueue *vq) {QVirtioPCIDevice *dev =container_of (d, QVirtioPCIDevice, vdev); -QVirtQueuePCI *vqpci = (QVirtQueuePCI *)vq; -uint32_t data;if (dev->pdev->msix_enabled) { - g_assert_cmpint(vqpci->msix_entry, !=, -1); -if (qpci_msix_masked (dev->pdev, vqpci->msix_entry)) { -/* No ISR checking should be done if masked, but read anyway */ -return qpci_msix_pending (dev->pdev, vqpci->msix_entry); - }else { -qtest_memread (dev->pdev->bus->qts, vqpci->msix_addr, &data,4 ); - data =le32_to_cpu (data); -if (data ==0 ) { -return false; - } -/* got a message, ensure it matches expected value then clear it. */ - g_assert_cmphex(data, ==, vqpci->msix_data); -qtest_writel (dev->pdev->bus->qts, vqpci->msix_addr,0 ); -return true; - } +QVirtQueuePCI *vqpci = (QVirtQueuePCI *)vq; + +return qpci_msix_test_interrupt (dev->pdev, vqpci->msix_entry, + vqpci->msix_addr, vqpci->msix_data); }else {return qpci_io_readb (dev->pdev, dev->bar,VIRTIO_PCI_ISR ) &1 ; }
@@ -149,24 +136,11 @@ static bool qvirtio_pci_get_queue_isr_status(QVirtioDevice *d, QVirtQueue *vq)static bool qvirtio_pci_get_config_isr_status (QVirtioDevice *d) {QVirtioPCIDevice *dev =container_of (d, QVirtioPCIDevice, vdev); -uint32_t data;if (dev->pdev->msix_enabled) { - g_assert_cmpint(dev->config_msix_entry, !=, -1); -if (qpci_msix_masked (dev->pdev, dev->config_msix_entry)) { -/* No ISR checking should be done if masked, but read anyway */ -return qpci_msix_pending (dev->pdev, dev->config_msix_entry); - }else { -qtest_memread (dev->pdev->bus->qts, dev->config_msix_addr, &data,4 ); - data =le32_to_cpu (data); -if (data ==0 ) { -return false; - } -/* got a message, ensure it matches expected value then clear it. */ - g_assert_cmphex(data, ==, dev->config_msix_data); -qtest_writel (dev->pdev->bus->qts, dev->config_msix_addr,0 ); -return true; - } +return qpci_msix_test_interrupt (dev->pdev, dev->config_msix_entry, + dev->config_msix_addr, + dev->config_msix_data); }else {return qpci_io_readb (dev->pdev, dev->bar,VIRTIO_PCI_ISR ) &2 ; }
Signature · 1 line
2.47.1
PATCH 4/4 tests/qtest: Enable spapr dma with linear iommu map
In reply to Nicholas Pigginqtests spapr dma was broken because the iommu was not set up.
spapr requires hypercalls to set up the iommu (TCE tables), but there is no support for that or a side-channel to the iommu in qtests at the moment, so add a quick workaround in QEMU to have the spapr iommu provide a linear map to memory when running qtests.
The buggy msix checks can all be removed since the tests all work now.
--- tests/qtest/libqos/pci.h | 4 ---- hw/ppc/spapr_iommu.c | 9 ++++++++- tests/qtest/e1000e-test.c | 21 --------------------- tests/qtest/igb-test.c | 21 --------------------- tests/qtest/libqos/generic-pcihost.c | 1 - tests/qtest/libqos/pci-pc.c | 3 --- tests/qtest/libqos/pci-spapr.c | 7 ++++--- tests/qtest/libqos/pci.c | 14 -------------- tests/qtest/vhost-user-blk-test.c | 6 ------ tests/qtest/virtio-blk-test.c | 12 ------------ 10 files changed, 12 insertions(+), 86 deletions(-)
tests/qtest/libqos/pci.h +0 -4
@@ -51,7 +51,6 @@ struct QPCIBus {QTestState *qts;uint64_t pio_alloc_ptr, pio_limit;uint64_t mmio_alloc_ptr, mmio_limit; -bool has_buggy_msi;/* TRUE for spapr, FALSE for pci */ bool not_hotpluggable;/* TRUE if devices cannot be hotplugged */ };
@@ -83,9 +82,6 @@ QPCIDevice *qpci_device_find(QPCIBus *bus, int devfn);void qpci_device_init (QPCIDevice *dev,QPCIBus *bus,QPCIAddress *addr);int qpci_secondary_buses_init (QPCIBus *bus); -bool qpci_has_buggy_msi (QPCIDevice *dev); -bool qpci_check_buggy_msi (QPCIDevice *dev); -void qpci_device_enable (QPCIDevice *dev);uint8_t qpci_find_capability (QPCIDevice *dev,uint8_t id,uint8_t start_addr);void qpci_msix_enable (QPCIDevice *dev);
hw/ppc/spapr_iommu.c +8 -1
@@ -22,6 +22,7 @@#include "qemu/log.h" #include "qemu/module.h" #include "system/kvm.h" +#include "system/qtest.h" #include "kvm_ppc.h" #include "migration/vmstate.h" #include "system/dma.h"
@@ -125,7 +126,13 @@ static IOMMUTLBEntry spapr_tce_translate_iommu(IOMMUMemoryRegion *iommu, .perm = IOMMU_NONE, }; -if ((addr >> tcet->page_shift) < tcet->nb_table) { +if (qtest_enabled ()) { +/* spapr qtests does not set up the IOMMU, shortcut a linear map */ + ret.iova = addr &TARGET_PAGE_MASK ; + ret.translated_addr = addr &TARGET_PAGE_MASK ; + ret.addr_mask = ~TARGET_PAGE_MASK ; + ret.perm =IOMMU_RW ; + }else if ((addr >> tcet->page_shift) < tcet->nb_table) {/* Check if we are in bound */ hwaddr page_mask =IOMMU_PAGE_MASK (tcet->page_shift);
tests/qtest/e1000e-test.c +0 -21
@@ -139,13 +139,6 @@ static void test_e1000e_tx(void *obj, void *data, QGuestAllocator * alloc) {QE1000E_PCI *e1000e = obj;QE1000E *d = &e1000e->e1000e; -QOSGraphObject *e_object = obj; -QPCIDevice *dev = e_object->get_driver (e_object,"pci-device" ); - -/* FIXME: add spapr support */ -if (qpci_check_buggy_msi (dev)) { -return ; - }e1000e_send_verify (d, data, alloc); }
@@ -154,13 +147,6 @@ static void test_e1000e_rx(void *obj, void *data, QGuestAllocator * alloc) {QE1000E_PCI *e1000e = obj;QE1000E *d = &e1000e->e1000e; -QOSGraphObject *e_object = obj; -QPCIDevice *dev = e_object->get_driver (e_object,"pci-device" ); - -/* FIXME: add spapr support */ -if (qpci_check_buggy_msi (dev)) { -return ; - }e1000e_receive_verify (d, data, alloc); }
@@ -173,13 +159,6 @@ static void test_e1000e_multiple_transfers(void *obj, void *data,QE1000E_PCI *e1000e = obj;QE1000E *d = &e1000e->e1000e; -QOSGraphObject *e_object = obj; -QPCIDevice *dev = e_object->get_driver (e_object,"pci-device" ); - -/* FIXME: add spapr support */ -if (qpci_check_buggy_msi (dev)) { -return ; - }for (i =0 ; i < iterations; i++) {e1000e_send_verify (d, data, alloc);
tests/qtest/igb-test.c +0 -21
@@ -142,13 +142,6 @@ static void test_igb_tx(void *obj, void *data, QGuestAllocator * alloc) {QE1000E_PCI *e1000e = obj;QE1000E *d = &e1000e->e1000e; -QOSGraphObject *e_object = obj; -QPCIDevice *dev = e_object->get_driver (e_object,"pci-device" ); - -/* FIXME: add spapr support */ -if (qpci_check_buggy_msi (dev)) { -return ; - }igb_send_verify (d, data, alloc); }
@@ -157,13 +150,6 @@ static void test_igb_rx(void *obj, void *data, QGuestAllocator * alloc) {QE1000E_PCI *e1000e = obj;QE1000E *d = &e1000e->e1000e; -QOSGraphObject *e_object = obj; -QPCIDevice *dev = e_object->get_driver (e_object,"pci-device" ); - -/* FIXME: add spapr support */ -if (qpci_check_buggy_msi (dev)) { -return ; - }igb_receive_verify (d, data, alloc); }
@@ -176,13 +162,6 @@ static void test_igb_multiple_transfers(void *obj, void *data,QE1000E_PCI *e1000e = obj;QE1000E *d = &e1000e->e1000e; -QOSGraphObject *e_object = obj; -QPCIDevice *dev = e_object->get_driver (e_object,"pci-device" ); - -/* FIXME: add spapr support */ -if (qpci_check_buggy_msi (dev)) { -return ; - }for (i =0 ; i < iterations; i++) {igb_send_verify (d, data, alloc);
tests/qtest/libqos/generic-pcihost.c +0 -1
@@ -182,7 +182,6 @@ void qpci_init_generic(QGenericPCIBus *qpci, QTestState *qts, qpci->gpex_pio_base =0x3eff0000 ; qpci->bus.not_hotpluggable = !hotpluggable; - qpci->bus.has_buggy_msi = false; qpci->bus.pio_readb = qpci_generic_pio_readb; qpci->bus.pio_readw = qpci_generic_pio_readw;
tests/qtest/libqos/pci-pc.c +0 -3
@@ -124,9 +124,6 @@ void qpci_init_pc(QPCIBusPC *qpci, QTestState *qts, QGuestAllocator *alloc) {assert (qts); -/* tests can use pci-bus */ - qpci->bus.has_buggy_msi = false; - qpci->bus.pio_readb = qpci_pc_pio_readb; qpci->bus.pio_readw = qpci_pc_pio_readw; qpci->bus.pio_readl = qpci_pc_pio_readl;
tests/qtest/libqos/pci-spapr.c +4 -3
@@ -20,6 +20,10 @@* PCI devices are always little-endian * SPAPR by default is big-endian * so PCI accessors need to swap data endianness +* +* The spapr iommu model has a qtest_enabled() check that short-cuts +* the TCE table and provides a linear map for DMA, since qtests does +* not have a way to make hcalls to set up the TCE table. */ static uint8_t qpci_spapr_pio_readb (QPCIBus *bus,uint32_t addr)
@@ -155,9 +159,6 @@ void qpci_init_spapr(QPCIBusSPAPR *qpci, QTestState *qts, {assert (qts); -/* tests cannot use spapr, needs to be fixed first */ - qpci->bus.has_buggy_msi = true; - qpci->alloc = alloc; qpci->bus.pio_readb = qpci_spapr_pio_readb;
tests/qtest/libqos/pci.c +0 -14
@@ -53,20 +53,6 @@ void qpci_device_foreach(QPCIBus *bus, int vendor_id, int device_id, } } -bool qpci_has_buggy_msi (QPCIDevice *dev) -{ -return dev->bus->has_buggy_msi; -} - -bool qpci_check_buggy_msi (QPCIDevice *dev) -{ -if (qpci_has_buggy_msi (dev)) { -g_test_skip ("Skipping due to incomplete support for MSI" ); -return true; - } -return false; -} -static void qpci_device_set (QPCIDevice *dev,QPCIBus *bus,int devfn) {g_assert (dev);
tests/qtest/vhost-user-blk-test.c +0 -6
@@ -554,14 +554,8 @@ static void idx(void *obj, void *u_data, QGuestAllocator *t_alloc)uint32_t desc_idx;uint8_t status;char *data; -QOSGraphObject *blk_object = obj; -QPCIDevice *pci_dev = blk_object->get_driver (blk_object,"pci-device" );QTestState *qts = global_qtest; -if (qpci_check_buggy_msi (pci_dev)) { -return ; - } -qpci_msix_enable (pdev->pdev);qvirtio_pci_set_msix_configuration_vector (pdev, t_alloc,0 );
tests/qtest/virtio-blk-test.c +0 -12
@@ -474,14 +474,8 @@ static void msix(void *obj, void *u_data, QGuestAllocator *t_alloc)uint32_t free_head;uint8_t status;char *data; -QOSGraphObject *blk_object = obj; -QPCIDevice *pci_dev = blk_object->get_driver (blk_object,"pci-device" );QTestState *qts = global_qtest; -if (qpci_check_buggy_msi (pci_dev)) { -return ; - } -qpci_msix_enable (pdev->pdev);qvirtio_pci_set_msix_configuration_vector (pdev, t_alloc,0 );
@@ -584,14 +578,8 @@ static void idx(void *obj, void *u_data, QGuestAllocator *t_alloc)uint32_t desc_idx;uint8_t status;char *data; -QOSGraphObject *blk_object = obj; -QPCIDevice *pci_dev = blk_object->get_driver (blk_object,"pci-device" );QTestState *qts = global_qtest; -if (qpci_check_buggy_msi (pci_dev)) { -return ; - } -qpci_msix_enable (pdev->pdev);qvirtio_pci_set_msix_configuration_vector (pdev, t_alloc,0 );
Signature · 1 line
2.47.1
cover tests/qtest: Enable spapr dma tests
I kept R-B tags from Fabiano and Phil despite a little change in how patch 1 looks and splitting it, hope that is okay.
Since RFC:
- Split endian fix + invalid value assert into two paches.
- Changed the invalid message assertion in what is now patch 1 to use g_assert_cmphex so the failing value can be seen.
- Added patch 3 to factor duplicated code we just changed. Some patches I have for e1000e and xhci tests also want to use the same function...
- Fixed stray hunk from mis-rebase in the spapr patch.
Thanks,
Nick
Nicholas Piggin (4):
tests/qtest: Enforce zero for the "un-fired" msix message value tests/qtest: Fix virtio msix message endianness tests/qtest: Add libqos function for testing msix interrupt status tests/qtest: Enable spapr dma with linear iommu map
tests/qtest/libqos/pci.h | 6 +-- hw/ppc/spapr_iommu.c | 9 +++- tests/qtest/e1000e-test.c | 21 --------- tests/qtest/igb-test.c | 21 --------- tests/qtest/libqos/generic-pcihost.c | 1 - tests/qtest/libqos/pci-pc.c | 3 -- tests/qtest/libqos/pci-spapr.c | 7 +-- tests/qtest/libqos/pci.c | 62 ++++++++++++++++++++------ tests/qtest/libqos/virtio-pci-modern.c | 30 +++---------- tests/qtest/libqos/virtio-pci.c | 38 ++++------------ tests/qtest/vhost-user-blk-test.c | 6 --- tests/qtest/virtio-blk-test.c | 12 ----- 12 files changed, 77 insertions(+), 139 deletions(-)
Signature · 1 line
2.47.1
Re: [PATCH 3/4] tests/qtest: Add libqos function for testing msix interrupt status
In reply to Nicholas PigginQuoted 5 lines · Nicholas Piggin
This function is duplicated 3 times, with more potential future users. Factor it into libqos, using
qtest_memsetinstead ofqtest_writelto clear the message just because that looks nicer with theqtest_memreadused to read it.
Quoted 7 lines
Signed-off-by Nicholas Piggin <[email protected]>--- tests/qtest/libqos/pci.h | 2 ++ tests/qtest/libqos/pci.c | 48 ++++++++++++++++++++++++++ tests/qtest/libqos/virtio-pci-modern.c | 31 +++-------------- tests/qtest/libqos/virtio-pci.c | 40 ++++----------------- 4 files changed, 62 insertions(+), 59 deletions(-)
Nice cleanup.
Re: [PATCH 4/4] tests/qtest: Enable spapr dma with linear iommu map
In reply to Nicholas PigginQuoted 8 lines · Nicholas Piggin
qtests spapr dma was broken because the iommu was not set up.
spapr requires hypercalls to set up the iommu (TCE tables), but there is no support for that or a side-channel to the iommu in qtests at the moment, so add a quick workaround in QEMU to have the spapr iommu provide a linear map to memory when running qtests.
Quoted 4 lines
The buggy msix checks can all be removed since the tests all work now.
Signed-off-by Nicholas Piggin <[email protected]>
I'm off for the next two weeks, if you're in a rush feel free to merge this. It passes all the tests I do for the qtest tree.
There's a preexisting refcount bug on the ASAN build with:
QTEST_QEMU_BINARY=./qemu-system-ppc64 ./tests/qtest/qos-test -r \
/ppc64/pseries/spapr-pci-host-bridge/pci-bus-spapr/pci-bus/virtio-net-pci/virtio-net/virtio-net-tests/vhost-user/connect-fail
I'll report separately.