libqos: add VIRTIO PCI 1.0 support
cover libqos: add VIRTIO PCI 1.0 support
New VIRTIO devices are Non-Transitional. This means they only expose the VIRTIO 1.0 PCI register interface.
The libqos virtio-pci.c code only supports Legacy and Transitional devices (in Legacy mode). This patch series add VIRTIO PCI 1.0 support so that tests can run against Non-Transitional devices too.
Note that this does not actually add VIRTIO 1.0 support to our tests. That would require extending feature negotiation (VIRTIO_F_VERSION_1). I will look at this as a separate step but the most pressing issue is getting libqos to work with Non-Transitional virtio-pci devices.
Stefan Hajnoczi (7):
libqos: extract Legacy virtio-pci.c code
libqos: add iteration support to qpci_find_capability()
libqos: pass full QVirtQueue to set_queue_address()
libqos: add MSI-X callbacks to QVirtioPCIDevice
libqos: expose common virtqueue setup/cleanup functions
libqos: make the virtio-pci BAR index configurable
libqos: add VIRTIO PCI 1.0 support
tests/Makefile.include | 1 + tests/libqos/pci.h | 2 +- tests/libqos/virtio-pci-modern.h | 17 ++ tests/libqos/virtio-pci.h | 34 ++- tests/libqos/virtio.h | 2 +- tests/libqos/pci.c | 18 +- tests/libqos/virtio-mmio.c | 6 +- tests/libqos/virtio-pci-modern.c | 405 +++++++++++++++++++++++++++++++ tests/libqos/virtio-pci.c | 91 ++++--- 9 files changed, 529 insertions(+), 47 deletions(-) create mode 100644 tests/libqos/virtio-pci-modern.h create mode 100644 tests/libqos/virtio-pci-modern.c
Signature · 1 line
2.21.0
PATCH 1/7 libqos: extract Legacy virtio-pci.c code
The current libqos virtio-pci.c code implements the VIRTIO Legacy interface. Extract existing code in preparation for VIRTIO 1.0 support.
--- tests/libqos/virtio-pci.h | 2 -- tests/libqos/virtio-pci.c | 25 ++++++++++--------------- 2 files changed, 10 insertions(+), 17 deletions(-)
tests/libqos/virtio-pci.h +0 -2
@@ -31,8 +31,6 @@ typedef struct QVirtQueuePCI {uint32_t msix_data; } QVirtQueuePCI; -extern const QVirtioBus qvirtio_pci; -void virtio_pci_init (QVirtioPCIDevice *dev,QPCIBus *bus,QPCIAddress * addr);QVirtioPCIDevice *virtio_pci_new (QPCIBus *bus,QPCIAddress * addr);
tests/libqos/virtio-pci.c +10 -15
@@ -35,14 +35,6 @@* original qvirtio_pci_destructor and qvirtio_pci_start_hw. */ -static inline bool qvirtio_pci_is_big_endian (QVirtioPCIDevice *dev) -{ -QPCIBus *bus = dev->pdev->bus; - -/* FIXME: virtio 1.0 is always little-endian */ -return qtest_big_endian (bus->qts); -} -#define CONFIG_BASE (dev) (VIRTIO_PCI_CONFIG_OFF((dev)->pdev->msix_enabled))static uint8_t qvirtio_pci_config_readb (QVirtioDevice *d,uint64_t off)
@@ -55,8 +47,7 @@ static uint8_t qvirtio_pci_config_readb(QVirtioDevice *d, uint64_t off)* but virtio ( < 1.0) is in guest order * so with a big-endian guest the order has been reversed, * reverse it again -* virtio-1.0 is always little-endian, like PCI, but this -* case will be managed inside qvirtio_pci_is_big_endian() +* virtio-1.0 is always little-endian, like PCI */ static uint16_t qvirtio_pci_config_readw (QVirtioDevice *d,uint64_t off)
@@ -258,7 +249,7 @@ static void qvirtio_pci_virtqueue_kick(QVirtioDevice *d, QVirtQueue *vq)qpci_io_writew (dev->pdev, dev->bar,VIRTIO_PCI_QUEUE_NOTIFY , vq->index); } -const QVirtioBus qvirtio_pci = { +static const QVirtioBus qvirtio_pci_legacy = { .config_readb = qvirtio_pci_config_readb, .config_readw = qvirtio_pci_config_readw, .config_readl = qvirtio_pci_config_readl,
@@ -374,15 +365,19 @@ void qvirtio_pci_start_hw(QOSGraphObject *obj)qvirtio_start_device (&dev->vdev); } +static void qvirtio_pci_init_legacy (QVirtioPCIDevice *dev) +{ + dev->vdev.device_type =qpci_config_readw (dev->pdev,PCI_SUBSYSTEM_ID ); + dev->vdev.bus = &qvirtio_pci_legacy; + dev->vdev.big_endian =qtest_big_endian (dev->pdev->bus->qts); +} +static void qvirtio_pci_init_from_pcidev (QVirtioPCIDevice *dev,QPCIDevice *pci_dev) { dev->pdev = pci_dev; - dev->vdev.device_type =qpci_config_readw (pci_dev,PCI_SUBSYSTEM_ID ); - dev->config_msix_entry =-1 ; - dev->vdev.bus = &qvirtio_pci; - dev->vdev.big_endian =qvirtio_pci_is_big_endian (dev); +qvirtio_pci_init_legacy (dev);/* each virtio-xxx-pci device should override at least this function */ dev->obj.get_driver =NULL ;
Signature · 1 line
2.21.0
PATCH 2/7 libqos: add iteration support to qpci_find_capability()
In reply to Stefan HajnocziVIRTIO 1.0 PCI devices have multiple PCI_CAP_ID_VNDR capabilities so we need a way to iterate over them. Extend qpci_find_capability() to take the last address.
--- tests/libqos/pci.h | 2 +- tests/libqos/pci.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-)
tests/libqos/pci.h +1 -1
@@ -86,7 +86,7 @@ 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 qpci_find_capability (QPCIDevice *dev,uint8_t id,uint8_t start_addr);void qpci_msix_enable (QPCIDevice *dev);void qpci_msix_disable (QPCIDevice *dev);bool qpci_msix_pending (QPCIDevice *dev,uint16_t entry);
tests/libqos/pci.c +12 -6
@@ -115,10 +115,16 @@ void qpci_device_enable(QPCIDevice *dev) g_assert_cmphex(cmd & PCI_COMMAND_MASTER, ==, PCI_COMMAND_MASTER); } -uint8_t qpci_find_capability (QPCIDevice *dev,uint8_t id) +uint8_t qpci_find_capability (QPCIDevice *dev,uint8_t id,uint8_t start_addr) {uint8_t cap; -uint8_t addr =qpci_config_readb (dev,PCI_CAPABILITY_LIST ); +uint8_t addr; + +if (start_addr) { + addr =qpci_config_readb (dev, start_addr +PCI_CAP_LIST_NEXT ); + }else { + addr =qpci_config_readb (dev,PCI_CAPABILITY_LIST ); + } do { cap = qpci_config_readb(dev, addr);
@@ -138,7 +144,7 @@ void qpci_msix_enable(QPCIDevice *dev)uint8_t bir_table;uint8_t bir_pba; - addr =qpci_find_capability (dev,PCI_CAP_ID_MSIX ); + addr =qpci_find_capability (dev,PCI_CAP_ID_MSIX ,0 ); g_assert_cmphex(addr, !=, 0); val =qpci_config_readw (dev, addr +PCI_MSIX_FLAGS );
@@ -167,7 +173,7 @@ void qpci_msix_disable(QPCIDevice *dev)uint16_t val;g_assert (dev->msix_enabled); - addr =qpci_find_capability (dev,PCI_CAP_ID_MSIX ); + addr =qpci_find_capability (dev,PCI_CAP_ID_MSIX ,0 ); g_assert_cmphex(addr, !=, 0); val =qpci_config_readw (dev, addr +PCI_MSIX_FLAGS ); qpci_config_writew(dev, addr + PCI_MSIX_FLAGS,
@@ -203,7 +209,7 @@ bool qpci_msix_masked(QPCIDevice *dev, uint16_t entry)uint64_t vector_off = dev->msix_table_off + entry *PCI_MSIX_ENTRY_SIZE ;g_assert (dev->msix_enabled); - addr =qpci_find_capability (dev,PCI_CAP_ID_MSIX ); + addr =qpci_find_capability (dev,PCI_CAP_ID_MSIX ,0 ); g_assert_cmphex(addr, !=, 0); val =qpci_config_readw (dev, addr +PCI_MSIX_FLAGS );
@@ -221,7 +227,7 @@ uint16_t qpci_msix_table_size(QPCIDevice *dev)uint8_t addr;uint16_t control; - addr =qpci_find_capability (dev,PCI_CAP_ID_MSIX ); + addr =qpci_find_capability (dev,PCI_CAP_ID_MSIX ,0 ); g_assert_cmphex(addr, !=, 0); control =qpci_config_readw (dev, addr +PCI_MSIX_FLAGS );
Signature · 1 line
2.21.0
PATCH 3/7 libqos: pass full QVirtQueue to set_queue_address()
In reply to Stefan HajnocziInstead of just passing the vring page frame number, pass the full QVirtQueue. This will allow the VIRTIO 1.0 transport to program the fine-grained vring address registers in the future.
--- tests/libqos/virtio.h | 2 +- tests/libqos/virtio-mmio.c | 6 ++++-- tests/libqos/virtio-pci.c | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-)
tests/libqos/virtio.h +1 -1
@@ -79,7 +79,7 @@ struct QVirtioBus {uint16_t (*get_queue_size)(QVirtioDevice *d);/* Set the address of the selected queue */ -void (*set_queue_address)(QVirtioDevice *d,uint32_t pfn); +void (*set_queue_address)(QVirtioDevice *d,QVirtQueue *vq);/* Setup the virtqueue specified by index */ QVirtQueue *(*virtqueue_setup)(QVirtioDevice *d, QGuestAllocator *alloc,
tests/libqos/virtio-mmio.c +4 -2
@@ -127,9 +127,11 @@ static uint16_t qvirtio_mmio_get_queue_size(QVirtioDevice *d)return (uint16_t )qtest_readl (dev->qts, dev->addr +QVIRTIO_MMIO_QUEUE_NUM_MAX ); } -static void qvirtio_mmio_set_queue_address (QVirtioDevice *d,uint32_t pfn) +static void qvirtio_mmio_set_queue_address (QVirtioDevice *d,QVirtQueue *vq) {QVirtioMMIODevice *dev =container_of (d, QVirtioMMIODevice, vdev); +uint64_t pfn = vq->desc / dev->page_size; +qtest_writel (dev->qts, dev->addr +QVIRTIO_MMIO_QUEUE_PFN , pfn); }
@@ -162,7 +164,7 @@ static QVirtQueue *qvirtio_mmio_virtqueue_setup(QVirtioDevice *d, addr =guest_alloc (alloc,qvring_size (vq->size, dev->page_size));qvring_init (dev->qts, alloc, vq, addr); -qvirtio_mmio_set_queue_address (d, vq->desc / dev->page_size); +qvirtio_mmio_set_queue_address (d, vq);return vq; }
tests/libqos/virtio-pci.c +4 -2
@@ -190,9 +190,11 @@ static uint16_t qvirtio_pci_get_queue_size(QVirtioDevice *d)return qpci_io_readw (dev->pdev, dev->bar,VIRTIO_PCI_QUEUE_NUM ); } -static void qvirtio_pci_set_queue_address (QVirtioDevice *d,uint32_t pfn) +static void qvirtio_pci_set_queue_address (QVirtioDevice *d,QVirtQueue *vq) {QVirtioPCIDevice *dev =container_of (d, QVirtioPCIDevice, vdev); +uint64_t pfn = vq->desc /VIRTIO_PCI_VRING_ALIGN ; +qpci_io_writel (dev->pdev, dev->bar,VIRTIO_PCI_QUEUE_PFN , pfn); }
@@ -229,7 +231,7 @@ static QVirtQueue *qvirtio_pci_virtqueue_setup(QVirtioDevice *d, addr =guest_alloc (alloc,qvring_size (vqpci->vq.size,VIRTIO_PCI_VRING_ALIGN ));qvring_init (qvpcidev->pdev->bus->qts, alloc, &vqpci->vq, addr); -qvirtio_pci_set_queue_address (d, vqpci->vq.desc /VIRTIO_PCI_VRING_ALIGN ); +qvirtio_pci_set_queue_address (d, &vqpci->vq);return &vqpci->vq; }
Signature · 1 line
2.21.0
PATCH 4/7 libqos: add MSI-X callbacks to QVirtioPCIDevice
In reply to Stefan HajnocziThe MSI-X vectors are programmed differently in the VIRTIO 1.0 and Legacy interfaces. Introduce callbacks so different implementations can be used depending on the interface version.
--- tests/libqos/virtio-pci.h | 12 ++++++++++++ tests/libqos/virtio-pci.c | 36 +++++++++++++++++++++++++++--------- 2 files changed, 39 insertions(+), 9 deletions(-)
tests/libqos/virtio-pci.h +12 -0
@@ -14,16 +14,28 @@#include "libqos/pci.h" #include "libqos/qgraph.h" +typedef struct QVirtioPCIMSIXOps QVirtioPCIMSIXOps ; +typedef struct QVirtioPCIDevice {QOSGraphObject obj;QVirtioDevice vdev;QPCIDevice *pdev;QPCIBar bar; +const QVirtioPCIMSIXOps *msix_ops;uint16_t config_msix_entry;uint64_t config_msix_addr;uint32_t config_msix_data; }QVirtioPCIDevice ; +struct QVirtioPCIMSIXOps { +/* Set the Configuration Vector for MSI-X */ +void (*set_config_vector)(QVirtioPCIDevice *d,uint16_t entry); + +/* Set the Queue Vector for MSI-X */ +void (*set_queue_vector)(QVirtioPCIDevice *d,uint16_t vq_idx, +uint16_t entry); +}; + typedef struct QVirtQueuePCI { QVirtQueue vq; uint16_t msix_entry;
tests/libqos/virtio-pci.c +27 -9
@@ -271,6 +271,30 @@ static const QVirtioBus qvirtio_pci_legacy = { .virtqueue_kick = qvirtio_pci_virtqueue_kick, }; +static void qvirtio_pci_set_config_vector (QVirtioPCIDevice *d,uint16_t entry) +{ +uint16_t vector; + +qpci_io_writew (d->pdev, d->bar,VIRTIO_MSI_CONFIG_VECTOR , entry); + vector =qpci_io_readw (d->pdev, d->bar,VIRTIO_MSI_CONFIG_VECTOR ); + g_assert_cmphex(vector, !=, VIRTIO_MSI_NO_VECTOR); +} + +static void qvirtio_pci_set_queue_vector (QVirtioPCIDevice *d,uint16_t vq_idx,uint16_t entry) +{ +uint16_t vector; + +qvirtio_pci_queue_select (&d->vdev, vq_idx); +qpci_io_writew (d->pdev, d->bar,VIRTIO_MSI_QUEUE_VECTOR , entry); + vector =qpci_io_readw (d->pdev, d->bar,VIRTIO_MSI_QUEUE_VECTOR ); + g_assert_cmphex(vector, !=, VIRTIO_MSI_NO_VECTOR); +} + +static const QVirtioPCIMSIXOps qvirtio_pci_msix_ops_legacy = { + .set_config_vector = qvirtio_pci_set_config_vector, + .set_queue_vector = qvirtio_pci_set_queue_vector, +}; +void qvirtio_pci_device_enable (QVirtioPCIDevice *d) {qpci_device_enable (d->pdev);
@@ -285,7 +309,6 @@ void qvirtio_pci_device_disable(QVirtioPCIDevice *d)void qvirtqueue_pci_msix_setup (QVirtioPCIDevice *d,QVirtQueuePCI *vqpci,QGuestAllocator *alloc,uint16_t entry) { -uint16_t vector;uint32_t control;uint64_t off;
@@ -311,16 +334,12 @@ void qvirtqueue_pci_msix_setup(QVirtioPCIDevice *d, QVirtQueuePCI *vqpci, off +PCI_MSIX_ENTRY_VECTOR_CTRL , control & ~PCI_MSIX_ENTRY_CTRL_MASKBIT); -qvirtio_pci_queue_select (&d->vdev, vqpci->vq.index); -qpci_io_writew (d->pdev, d->bar,VIRTIO_MSI_QUEUE_VECTOR , entry); - vector =qpci_io_readw (d->pdev, d->bar,VIRTIO_MSI_QUEUE_VECTOR ); - g_assert_cmphex(vector, !=, VIRTIO_MSI_NO_VECTOR); + d->msix_ops->set_queue_vector (d, vqpci->vq.index, entry); }void qvirtio_pci_set_msix_configuration_vector (QVirtioPCIDevice *d,QGuestAllocator *alloc,uint16_t entry) { -uint16_t vector;uint32_t control;uint64_t off;
@@ -348,9 +367,7 @@ void qvirtio_pci_set_msix_configuration_vector(QVirtioPCIDevice *d, off +PCI_MSIX_ENTRY_VECTOR_CTRL , control & ~PCI_MSIX_ENTRY_CTRL_MASKBIT); -qpci_io_writew (d->pdev, d->bar,VIRTIO_MSI_CONFIG_VECTOR , entry); - vector =qpci_io_readw (d->pdev, d->bar,VIRTIO_MSI_CONFIG_VECTOR ); - g_assert_cmphex(vector, !=, VIRTIO_MSI_NO_VECTOR); + d->msix_ops->set_config_vector (d, entry); }void qvirtio_pci_destructor (QOSGraphObject *obj)
@@ -371,6 +388,7 @@ static void qvirtio_pci_init_legacy(QVirtioPCIDevice *dev) { dev->vdev.device_type =qpci_config_readw (dev->pdev,PCI_SUBSYSTEM_ID ); dev->vdev.bus = &qvirtio_pci_legacy; + dev->msix_ops = &qvirtio_pci_msix_ops_legacy; dev->vdev.big_endian =qtest_big_endian (dev->pdev->bus->qts); }
Signature · 1 line
2.21.0
PATCH 5/7 libqos: expose common virtqueue setup/cleanup functions
In reply to Stefan HajnocziThe VIRTIO 1.0 code will need to perform additional steps but it will reuse the common virtqueue setup/cleanup code. Make these functions public.
Make sure to invoke callbacks via QVirtioBus instead of directly calling the virtio-pci Legacy versions of these functions.
--- tests/libqos/virtio-pci.h | 8 ++++++++ tests/libqos/virtio-pci.c | 19 ++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-)
tests/libqos/virtio-pci.h +8 -0
@@ -63,4 +63,12 @@ void qvirtio_pci_set_msix_configuration_vector(QVirtioPCIDevice *d, QGuestAllocator *alloc, uint16_t entry);void qvirtqueue_pci_msix_setup (QVirtioPCIDevice *d,QVirtQueuePCI *vqpci,QGuestAllocator *alloc,uint16_t entry); + +/* Used by Legacy and Modern virtio-pci code */ +QVirtQueue *qvirtio_pci_virtqueue_setup_common (QVirtioDevice *d, +QGuestAllocator *alloc, +uint16_t index); +void qvirtio_pci_virtqueue_cleanup_common (QVirtQueue *vq, +QGuestAllocator *alloc); +#endif
tests/libqos/virtio-pci.c +10 -9
@@ -198,8 +198,9 @@ static void qvirtio_pci_set_queue_address(QVirtioDevice *d, QVirtQueue *vq)qpci_io_writel (dev->pdev, dev->bar,VIRTIO_PCI_QUEUE_PFN , pfn); } -static QVirtQueue *qvirtio_pci_virtqueue_setup (QVirtioDevice *d, -QGuestAllocator *alloc,uint16_t index) +QVirtQueue *qvirtio_pci_virtqueue_setup_common (QVirtioDevice *d, +QGuestAllocator *alloc, +uint16_t index) {uint32_t feat;uint64_t addr;
@@ -207,11 +208,11 @@ static QVirtQueue *qvirtio_pci_virtqueue_setup(QVirtioDevice *d,QVirtioPCIDevice *qvpcidev =container_of (d, QVirtioPCIDevice, vdev); vqpci =g_malloc0 (sizeof (*vqpci)); - feat =qvirtio_pci_get_guest_features (d); + feat = d->bus->get_guest_features (d); -qvirtio_pci_queue_select (d, index); + d->bus->queue_select (d, index); vqpci->vq.index = index; - vqpci->vq.size =qvirtio_pci_get_queue_size (d); + vqpci->vq.size = d->bus->get_queue_size (d); vqpci->vq.free_head =0 ; vqpci->vq.num_free = vqpci->vq.size; vqpci->vq.align =VIRTIO_PCI_VRING_ALIGN ;
@@ -231,12 +232,12 @@ static QVirtQueue *qvirtio_pci_virtqueue_setup(QVirtioDevice *d, addr =guest_alloc (alloc,qvring_size (vqpci->vq.size,VIRTIO_PCI_VRING_ALIGN ));qvring_init (qvpcidev->pdev->bus->qts, alloc, &vqpci->vq, addr); -qvirtio_pci_set_queue_address (d, &vqpci->vq); + d->bus->set_queue_address (d, &vqpci->vq);return &vqpci->vq; } -static void qvirtio_pci_virtqueue_cleanup (QVirtQueue *vq, +void qvirtio_pci_virtqueue_cleanup_common (QVirtQueue *vq,QGuestAllocator *alloc) {QVirtQueuePCI *vqpci =container_of (vq, QVirtQueuePCI, vq);
@@ -266,8 +267,8 @@ static const QVirtioBus qvirtio_pci_legacy = { .queue_select = qvirtio_pci_queue_select, .get_queue_size = qvirtio_pci_get_queue_size, .set_queue_address = qvirtio_pci_set_queue_address, - .virtqueue_setup = qvirtio_pci_virtqueue_setup, - .virtqueue_cleanup = qvirtio_pci_virtqueue_cleanup, + .virtqueue_setup = qvirtio_pci_virtqueue_setup_common, + .virtqueue_cleanup = qvirtio_pci_virtqueue_cleanup_common, .virtqueue_kick = qvirtio_pci_virtqueue_kick, };
Signature · 1 line
2.21.0
PATCH 6/7 libqos: make the virtio-pci BAR index configurable
In reply to Stefan HajnocziThe Legacy virtio-pci interface always uses BAR 0. VIRTIO 1.0 may need to use a different BAR index, so make it configurable.
--- tests/libqos/virtio-pci.h | 2 ++ tests/libqos/virtio-pci.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-)
tests/libqos/virtio-pci.h +2 -0
@@ -25,6 +25,8 @@ typedef struct QVirtioPCIDevice {uint16_t config_msix_entry;uint64_t config_msix_addr;uint32_t config_msix_data; + +uint8_t bar_idx; } QVirtioPCIDevice;struct QVirtioPCIMSIXOps {
tests/libqos/virtio-pci.c +2 -1
@@ -299,7 +299,7 @@ static const QVirtioPCIMSIXOps qvirtio_pci_msix_ops_legacy = {void qvirtio_pci_device_enable (QVirtioPCIDevice *d) {qpci_device_enable (d->pdev); - d->bar =qpci_iomap (d->pdev,0 ,NULL ); + d->bar =qpci_iomap (d->pdev, d->bar_idx,NULL ); }void qvirtio_pci_device_disable (QVirtioPCIDevice *d)
@@ -388,6 +388,7 @@ void qvirtio_pci_start_hw(QOSGraphObject *obj)static void qvirtio_pci_init_legacy (QVirtioPCIDevice *dev) { dev->vdev.device_type =qpci_config_readw (dev->pdev,PCI_SUBSYSTEM_ID ); + dev->bar_idx =0 ; dev->vdev.bus = &qvirtio_pci_legacy; dev->msix_ops = &qvirtio_pci_msix_ops_legacy; dev->vdev.big_endian =qtest_big_endian (dev->pdev->bus->qts);
Signature · 1 line
2.21.0
PATCH 7/7 libqos: add VIRTIO PCI 1.0 support
In reply to Stefan HajnocziImplement the VIRTIO 1.0 virtio-pci interface. The main change here is that the register layout is no longer a fixed layout in BAR 0. Instead we have to iterate of PCI Capabilities to find descriptions of where various registers are located. The vring registers are also more fine-grained, allowing for more flexible vring layouts, but we don't take advantage of that.
Note that test cases do not negotiate VIRTIO_F_VERSION_1 yet and are therefore not running in VIRTIO 1.0 mode.
--- tests/Makefile.include | 1 + tests/libqos/virtio-pci-modern.h | 17 ++ tests/libqos/virtio-pci.h | 10 + tests/libqos/virtio-pci-modern.c | 405 +++++++++++++++++++++++++++++++ tests/libqos/virtio-pci.c | 6 +- 5 files changed, 438 insertions(+), 1 deletion(-) create mode 100644 tests/libqos/virtio-pci-modern.h create mode 100644 tests/libqos/virtio-pci-modern.c
tests/Makefile.include +1 -0
@@ -715,6 +715,7 @@ qos-test-obj-y += tests/libqos/virtio-blk.o qos-test-obj-y += tests/libqos/virtio-mmio.o qos-test-obj-y += tests/libqos/virtio-net.o qos-test-obj-y += tests/libqos/virtio-pci.o +qos-test-obj-y += tests/libqos/virtio-pci-modern.o qos-test-obj-y += tests/libqos/virtio-rng.o qos-test-obj-y += tests/libqos/virtio-scsi.o qos-test-obj-y += tests/libqos/virtio-serial.o
tests/libqos/virtio-pci-modern.h new file +17 -0
@@ -0,0 +1,17 @@ +/* +* libqos virtio PCI VIRTIO 1.0 definitions +* +* Copyright (c) 2019 Red Hat, Inc +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#ifndef LIBQOS_VIRTIO_PCI_MODERN_H +#define LIBQOS_VIRTIO_PCI_MODERN_H + +#include "virtio-pci.h" + +bool qvirtio_pci_init_virtio_1 (QVirtioPCIDevice *dev); + +#endif /* LIBQOS_VIRTIO_PCI_MODERN_H */
tests/libqos/virtio-pci.h +10 -0
@@ -27,6 +27,13 @@ typedef struct QVirtioPCIDevice {uint32_t config_msix_data;uint8_t bar_idx; + +/* VIRTIO 1.0 */ +uint32_t common_cfg_offset; +uint32_t notify_cfg_offset; +uint32_t notify_off_multiplier; +uint32_t isr_cfg_offset; +uint32_t device_cfg_offset; } QVirtioPCIDevice;struct QVirtioPCIMSIXOps {
@@ -43,6 +50,9 @@ typedef struct QVirtQueuePCI {uint16_t msix_entry;uint64_t msix_addr;uint32_t msix_data; + +/* VIRTIO 1.0 */ +uint64_t notify_offset; } QVirtQueuePCI;void virtio_pci_init (QVirtioPCIDevice *dev,QPCIBus *bus,QPCIAddress * addr);
tests/libqos/virtio-pci-modern.c new file +405 -0
405 lines not on this page · raw message
tests/libqos/virtio-pci.c +5 -1
@@ -22,6 +22,8 @@#include "hw/pci/pci.h" #include "hw/pci/pci_regs.h" +#include "virtio-pci-modern.h" +/* virtio-pci is a superclass of all virtio-xxx-pci devices; * the relation between virtio-pci and virtio-xxx-pci is implicit, * and therefore virtio-pci does not produce virtio and is not
@@ -399,7 +401,9 @@ static void qvirtio_pci_init_from_pcidev(QVirtioPCIDevice *dev, QPCIDevice *pci_ dev->pdev = pci_dev; dev->config_msix_entry =-1 ; -qvirtio_pci_init_legacy (dev); +if (!qvirtio_pci_init_virtio_1 (dev)) { +qvirtio_pci_init_legacy (dev); + }/* each virtio-xxx-pci device should override at least this function */ dev->obj.get_driver =NULL ;
Signature · 1 line
2.21.0
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Subject: [PATCH 0/7] libqos: add VIRTIO PCI 1.0 support
Type: series
Message-id: [email protected]
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Switched to a new branch 'test'
f7c9309 libqos: add VIRTIO PCI 1.0 support
f382525 libqos: make the virtio-pci BAR index configurable e0aeef1 libqos: expose common virtqueue setup/cleanup functions e3477ab libqos: add MSI-X callbacks to QVirtioPCIDevice 0042dff libqos: pass full QVirtQueue to set_queue_address() 631d620 libqos: add iteration support to qpci_find_capability() 29a23f9 libqos: extract Legacy virtio-pci.c code
=== OUTPUT BEGIN ===
1/7 Checking commit 29a23f95d7cf (libqos: extract Legacy virtio-pci.c code)
2/7 Checking commit 631d6200075a (libqos: add iteration support to qpci_find_capability()) 3/7 Checking commit 0042dff221ea (libqos: pass full QVirtQueue to set_queue_address()) 4/7 Checking commit e3477ab2dc8e (libqos: add MSI-X callbacks to QVirtioPCIDevice)
ERROR: line over 90 characters
#31: FILE: tests/libqos/virtio-pci.c:283:
+static void qvirtio_pci_set_queue_vector(QVirtioPCIDevice *d, uint16_t vq_idx, uint16_t entry)
total: 1 errors, 0 warnings, 99 lines checked
Patch 4/7 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
5/7 Checking commit e0aeef123dc1 (libqos: expose common virtqueue setup/cleanup functions) 6/7 Checking commit f382525d6da2 (libqos: make the virtio-pci BAR index configurable) 7/7 Checking commit f7c93099d7df (libqos: add VIRTIO PCI 1.0 support)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #33:
new file mode 100644
ERROR: line over 90 characters
#235: FILE: tests/libqos/virtio-pci-modern.c:198:
+static QVirtQueue *virtqueue_setup(QVirtioDevice *d, QGuestAllocator *alloc, uint16_t index)
WARNING: line over 80 characters
#298: FILE: tests/libqos/virtio-pci-modern.c:261:
+static void set_queue_vector(QVirtioPCIDevice *d, uint16_t vq_idx, uint16_t entry)
WARNING: Block comments use a leading /* on a separate line #328: FILE: tests/libqos/virtio-pci-modern.c:291:
+ /* "Any PCI device with ... PCI Device ID 0x1000 through 0x107F inclusive
WARNING: Block comments use a leading /* on a separate line #336: FILE: tests/libqos/virtio-pci-modern.c:299:
+ /* "Devices MAY utilize a Transitional PCI Device ID range, 0x1000 to
WARNING: Block comments use a leading /* on a separate line #340: FILE: tests/libqos/virtio-pci-modern.c:303:
+ /* "Transitional devices MUST have the PCI Subsystem Device ID matching
WARNING: Block comments use a leading /* on a separate line #345: FILE: tests/libqos/virtio-pci-modern.c:308:
+ /* "The PCI Device ID is calculated by adding 0x1040 to the Virtio
WARNING: Block comments use a leading /* on a separate line #393: FILE: tests/libqos/virtio-pci-modern.c:356:
+ /* Due to the qpci_iomap() API we only support devices that put all
total: 1 errors, 7 warnings, 469 lines checked
Patch 7/7 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Quoted 4 lines · On Thu, Oct 10, 2019 at 02:12:00PM -0700, [email protected] wrote:
4/7 Checking commit
e3477ab2dc8e(libqos: add MSI-X callbacks to QVirtioPCIDevice)
ERROR: line over 90 characters
#31: FILE:tests/libqos/virtio-pci.c:283:
+static voidqvirtio_pci_set_queue_vector(QVirtioPCIDevice *d, uint16_t vq_idx, uint16_t entry)
[...]
Quoted 2 lines
7/7 Checking commit
f7c93099d7df(libqos: add VIRTIO PCI 1.0 support)
WARNING: added, moved or deleted file(s), doesMAINTAINERSneed updating?
[...]
Quoted 20 lines
ERROR: line over 90 characters
#235: FILE:tests/libqos/virtio-pci-modern.c:198:
+static QVirtQueue *virtqueue_setup(QVirtioDevice *d, QGuestAllocator *alloc,uint16_tindex)WARNING: line over 80 characters
#298: FILE:tests/libqos/virtio-pci-modern.c:261:
+static voidset_queue_vector(QVirtioPCIDevice *d, uint16_t vq_idx, uint16_t entry)WARNING: Block comments use a leading /* on a separate line #328: FILE:
tests/libqos/virtio-pci-modern.c:291:
+ /* "Any PCI device with ... PCI Device ID0x1000through0x107FinclusiveWARNING: Block comments use a leading /* on a separate line #336: FILE:
tests/libqos/virtio-pci-modern.c:299:
+ /* "Devices MAY utilize a Transitional PCI Device ID range,0x1000toWARNING: Block comments use a leading /* on a separate line #340: FILE:
tests/libqos/virtio-pci-modern.c:303:
+ /* "Transitional devices MUST have the PCI Subsystem Device ID matching
Quoted 7 lines
WARNING: Block comments use a leading /* on a separate line #345: FILE:
tests/libqos/virtio-pci-modern.c:308:
+ /* "The PCI Device ID is calculated by adding0x1040to the VirtioWARNING: Block comments use a leading /* on a separate line #393: FILE:
tests/libqos/virtio-pci-modern.c:356:
+ /* Due to theqpci_iomap()API we only support devices that put all
Will fix these in v2.