From nobody Tue Nov 4 22:00:42 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1533567611406903.0802748408632; Mon, 6 Aug 2018 08:00:11 -0700 (PDT) Received: from localhost ([::1]:34487 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmgzS-00026E-2S for importer@patchew.org; Mon, 06 Aug 2018 11:00:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmgbN-0005Ny-6h for qemu-devel@nongnu.org; Mon, 06 Aug 2018 10:35:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fmgbK-000157-0G for qemu-devel@nongnu.org; Mon, 06 Aug 2018 10:35:17 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:45783) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fmgbJ-00013a-Il for qemu-devel@nongnu.org; Mon, 06 Aug 2018 10:35:13 -0400 Received: by mail-ed1-x543.google.com with SMTP id s16-v6so5240131edq.12 for ; Mon, 06 Aug 2018 07:35:13 -0700 (PDT) Received: from localhost.localdomain ([194.230.159.126]) by smtp.gmail.com with ESMTPSA id x13-v6sm14615157edx.17.2018.08.06.07.35.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 07:35:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uC78Qrdq4vT4TcUicBfLKxSBFFW3hAZHdO/v7rNlyBY=; b=lt8TXQTmlLANlnRJGXlOrl43mPg2KgkRrpifZ1I1gEG+NLpuuF23bX0fbxcfDHEeW9 kagsnelaBeFbqsBtK/vDpPiFfK8fUBiujo7mjN3S5vxHlpqy+AYpi6Q/X2DNX+jfTpuw x2DRHPPPEzmBOmjCyN9+ygQOIv+WaTQuQtAWmG9gochFjBzOCjGkvJSd5LpSa7QwE0Xq cq16ro0unvJxdJDJWFuTOYse6e3CykoH9o0Tfs+R7rk/EuwWaJulsQwNWPwxjZ0DI5Ho 1Is1magvht3Rtc16u5qiHkjQ59loGP4yHb5GfsRaMyQ3m0h55sywCNgAYD9nyh5OTpND J9lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uC78Qrdq4vT4TcUicBfLKxSBFFW3hAZHdO/v7rNlyBY=; b=qy3fLPf+yicSRPjMHHr/5waMG9LC9kChC9kAu//BeqhWJYJurxKCYRqaXGlih0tFlN ivhKGMLdVAwYjqlnhiybfmN5+zZyg2Jr8mnWaUA/aB1/cm3DBqFzrToL5U8MpcshPayH Aob7z02o5cqYgQ+q5xQhfAu/Eytiahd1GQQSBqWdvmiGhXfe2i+y18MCN6pEo7UWpsjf 98neopPPvvB5VOgxAD0WEFhcoi+7JvFHnjwT/HqRlqQ8XGkbnqhH80z6agPdO3EwlFy2 C3OeMyMon0I+Zwam8G1JFsLtaGWg68ObKpSzKn5gikKK1PabKWPspZRjZl/1zY4kmTsq iUsg== X-Gm-Message-State: AOUpUlEM9AeYe3meAQGxK+CSy84d+vyRli8eWd5tqh3apP4fp52R1RKY uaU7OnRj7hGd9qVlVgQ3Pzo= X-Google-Smtp-Source: AAOMgpeF4uXuOFGa6AzGvCtIqIbvy9uKB6ngsvBJJXBA7kbDQX5qQ8vzFN5F/ZQ1fxfz1cqK3g9umw== X-Received: by 2002:a50:8406:: with SMTP id 6-v6mr18402351edp.97.1533566112303; Mon, 06 Aug 2018 07:35:12 -0700 (PDT) From: Emanuele Giuseppe Esposito To: Paolo Bonzini Date: Mon, 6 Aug 2018 16:34:07 +0200 Message-Id: <20180806143412.27722-30-e.emanuelegiuseppe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180806143412.27722-1-e.emanuelegiuseppe@gmail.com> References: <20180806143412.27722-1-e.emanuelegiuseppe@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::543 Subject: [Qemu-devel] [PATCH v2 29/34] test/qgraph: virtio-blk test node X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Stefan Hajnoczi , Emanuele Giuseppe Esposito , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Convert tests/virtio-blk-test in qgraph test node, virtio-blk-test. This test consumes a virtio-blk interface and checks that its function return the expected values. Some functions are implemented only for virtio-blk-pci, so they don't consume virtio-blk, but virtio-blk-pci Note that this test does not allocate any virtio-blk structure, it's all done by the qtest walking graph mechanism Signed-off-by: Emanuele Giuseppe Esposito --- tests/Makefile.include | 4 +- tests/virtio-blk-test.c | 459 ++++++++++++++++------------------------ 2 files changed, 186 insertions(+), 277 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 1d68e7d223..b628d2b821 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -193,7 +193,6 @@ gcov-files-virtio-y +=3D i386-softmmu/hw/virtio/virtio.c check-qtest-virtio-y +=3D tests/virtio-net-test$(EXESUF) gcov-files-virtio-y +=3D i386-softmmu/hw/net/virtio-net.c gcov-files-virtio-y +=3D i386-softmmu/hw/virtio/virtio-balloon.c -check-qtest-virtio-y +=3D tests/virtio-blk-test$(EXESUF) gcov-files-virtio-y +=3D i386-softmmu/hw/block/virtio-blk.c gcov-files-virtio-y +=3D hw/virtio/virtio-rng.c check-qtest-virtio-y +=3D tests/virtio-scsi-test$(EXESUF) @@ -373,7 +372,6 @@ check-qtest-arm-y +=3D tests/pca9552-test$(EXESUF) check-qtest-arm-y +=3D tests/ds1338-test$(EXESUF) check-qtest-arm-y +=3D tests/m25p80-test$(EXESUF) gcov-files-arm-y +=3D hw/misc/tmp105.c -check-qtest-arm-y +=3D tests/virtio-blk-test$(EXESUF) gcov-files-arm-y +=3D arm-softmmu/hw/block/virtio-blk.c check-qtest-arm-y +=3D tests/test-arm-mptimer$(EXESUF) gcov-files-arm-y +=3D hw/timer/arm_mptimer.c @@ -785,6 +783,7 @@ libqgraph-tests-obj-y +=3D tests/virtio-console-test.o libqgraph-tests-obj-y +=3D tests/virtio-9p-test.o libqgraph-tests-obj-y +=3D tests/virtio-balloon-test.o libqgraph-tests-obj-y +=3D tests/virtio-rng-test.o +libqgraph-tests-obj-y +=3D tests/virtio-blk-test.o =20 check-unit-y +=3D tests/test-qgraph$(EXESUF) tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y) @@ -827,7 +826,6 @@ tests/vmxnet3-test$(EXESUF): tests/vmxnet3-test.o tests/ne2000-test$(EXESUF): tests/ne2000-test.o tests/wdt_ib700-test$(EXESUF): tests/wdt_ib700-test.o tests/tco-test$(EXESUF): tests/tco-test.o $(libqos-pc-obj-y) -tests/virtio-blk-test$(EXESUF): tests/virtio-blk-test.o $(libqos-virtio-ob= j-y) tests/virtio-ccw-test$(EXESUF): tests/virtio-ccw-test.o tests/virtio-net-test$(EXESUF): tests/virtio-net-test.o $(libqos-pc-obj-y)= $(libqos-virtio-obj-y) tests/virtio-scsi-test$(EXESUF): tests/virtio-scsi-test.o $(libqos-virtio-= obj-y) diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c index 267cf28376..37c10b8152 100644 --- a/tests/virtio-blk-test.c +++ b/tests/virtio-blk-test.c @@ -10,29 +10,17 @@ =20 #include "qemu/osdep.h" #include "libqtest.h" -#include "libqos/libqos-pc.h" -#include "libqos/libqos-spapr.h" -#include "libqos/virtio.h" -#include "libqos/virtio-pci.h" -#include "libqos/virtio-mmio.h" -#include "libqos/malloc-generic.h" -#include "qemu/bswap.h" -#include "standard-headers/linux/virtio_ids.h" -#include "standard-headers/linux/virtio_config.h" -#include "standard-headers/linux/virtio_ring.h" + #include "qemu/bswap.h" #include "standard-headers/linux/virtio_blk.h" #include "standard-headers/linux/virtio_pci.h" +#include "libqos/qgraph.h" +#include "libqos/virtio-blk.h" =20 #define TEST_IMAGE_SIZE (64 * 1024 * 1024) #define QVIRTIO_BLK_TIMEOUT_US (30 * 1000 * 1000) #define PCI_SLOT_HP 0x06 -#define PCI_SLOT 0x04 -#define PCI_FN 0x00 =20 -#define MMIO_PAGE_SIZE 4096 -#define MMIO_DEV_BASE_ADDR 0x0A003E00 -#define MMIO_RAM_ADDR 0x40000000 -#define MMIO_RAM_SIZE 0x20000000 +static char *tmp_path; =20 typedef struct QVirtioBlkReq { uint32_t type; @@ -45,75 +33,16 @@ typedef struct QVirtioBlkReq { static char *drive_create(void) { int fd, ret; - char *tmp_path =3D g_strdup("/tmp/qtest.XXXXXX"); + char *t_path =3D g_strdup("/tmp/qtest.XXXXXX"); =20 /* Create a temporary raw image */ - fd =3D mkstemp(tmp_path); + fd =3D mkstemp(t_path); g_assert_cmpint(fd, >=3D, 0); ret =3D ftruncate(fd, TEST_IMAGE_SIZE); g_assert_cmpint(ret, =3D=3D, 0); close(fd); =20 - return tmp_path; -} - -static QOSState *pci_test_start(void) -{ - QOSState *qs; - const char *arch =3D qtest_get_arch(); - char *tmp_path; - const char *cmd =3D "-drive if=3Dnone,id=3Ddrive0,file=3D%s,format=3Dr= aw " - "-drive if=3Dnone,id=3Ddrive1,file=3Dnull-co://,form= at=3Draw " - "-device virtio-blk-pci,id=3Ddrv0,drive=3Ddrive0," - "addr=3D%x.%x"; - - tmp_path =3D drive_create(); - - if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { - qs =3D qtest_pc_boot(cmd, tmp_path, PCI_SLOT, PCI_FN); - } else if (strcmp(arch, "ppc64") =3D=3D 0) { - qs =3D qtest_spapr_boot(cmd, tmp_path, PCI_SLOT, PCI_FN); - } else { - g_printerr("virtio-blk tests are only available on x86 or ppc64\n"= ); - exit(EXIT_FAILURE); - } - global_qtest =3D qs->qts; - unlink(tmp_path); - g_free(tmp_path); - return qs; -} - -static void arm_test_start(void) -{ - char *tmp_path; - - tmp_path =3D drive_create(); - - global_qtest =3D qtest_startf("-machine virt " - "-drive if=3Dnone,id=3Ddrive0,file=3D%s,fo= rmat=3Draw " - "-device virtio-blk-device,drive=3Ddrive0", - tmp_path); - unlink(tmp_path); - g_free(tmp_path); -} - -static void test_end(void) -{ - qtest_end(); -} - -static QVirtioPCIDevice *virtio_blk_pci_init(QPCIBus *bus, int slot) -{ - QVirtioPCIDevice *dev; - - dev =3D qvirtio_pci_device_find_slot(bus, VIRTIO_ID_BLOCK, slot); - g_assert(dev !=3D NULL); - g_assert_cmphex(dev->vdev.device_type, =3D=3D, VIRTIO_ID_BLOCK); - g_assert_cmphex(dev->pdev->devfn, =3D=3D, ((slot << 3) | PCI_FN)); - - qvirtio_pci_device_enable(dev); - qvirtio_start_device(&dev->vdev); - return dev; + return t_path; } =20 static inline void virtio_blk_fix_request(QVirtioDevice *d, QVirtioBlkReq = *req) @@ -275,31 +204,21 @@ static void test_basic(QVirtioDevice *dev, QGuestAllo= cator *alloc, } } =20 -static void pci_basic(void) +static void basic(void *obj, void *data, QGuestAllocator *t_alloc) { - QVirtioPCIDevice *dev; - QOSState *qs; - QVirtQueuePCI *vqpci; - - qs =3D pci_test_start(); - dev =3D virtio_blk_pci_init(qs->pcibus, PCI_SLOT); - - vqpci =3D (QVirtQueuePCI *)qvirtqueue_setup(&dev->vdev, qs->alloc, 0); - - test_basic(&dev->vdev, qs->alloc, &vqpci->vq); + QVirtioBlk *blk_if =3D obj; + QVirtQueue *vq; + vq =3D qvirtqueue_setup(blk_if->vdev, t_alloc, 0); + test_basic(blk_if->vdev, t_alloc, vq); + qvirtqueue_cleanup(blk_if->vdev->bus, vq, t_alloc); =20 - /* End test */ - qvirtqueue_cleanup(dev->vdev.bus, &vqpci->vq, qs->alloc); - qvirtio_pci_device_disable(dev); - qvirtio_pci_device_free(dev); - qtest_shutdown(qs); } =20 -static void pci_indirect(void) +static void indirect(void *obj, void *u_data, QGuestAllocator *t_alloc) { - QVirtioPCIDevice *dev; - QVirtQueuePCI *vqpci; - QOSState *qs; + QVirtQueue *vq; + QVirtioBlk *blk_if =3D obj; + QVirtioDevice *dev =3D blk_if->vdev; QVirtioBlkReq req; QVRingIndirectDesc *indirect; uint64_t req_addr; @@ -309,21 +228,17 @@ static void pci_indirect(void) uint8_t status; char *data; =20 - qs =3D pci_test_start(); - - dev =3D virtio_blk_pci_init(qs->pcibus, PCI_SLOT); - - capacity =3D qvirtio_config_readq(&dev->vdev, 0); + capacity =3D qvirtio_config_readq(dev, 0); g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); =20 - features =3D qvirtio_get_features(&dev->vdev); + features =3D qvirtio_get_features(dev); g_assert_cmphex(features & (1u << VIRTIO_RING_F_INDIRECT_DESC), !=3D, = 0); features =3D features & ~(QVIRTIO_F_BAD_FEATURE | (1u << VIRTIO_RING_F_EVENT_IDX) | (1u << VIRTIO_BLK_F_SCSI)); - qvirtio_set_features(&dev->vdev, features); + qvirtio_set_features(dev, features); =20 - vqpci =3D (QVirtQueuePCI *)qvirtqueue_setup(&dev->vdev, qs->alloc, 0); + vq =3D qvirtqueue_setup(dev, t_alloc, 0); =20 /* Write request */ req.type =3D VIRTIO_BLK_T_OUT; @@ -332,23 +247,23 @@ static void pci_indirect(void) req.data =3D g_malloc0(512); strcpy(req.data, "TEST"); =20 - req_addr =3D virtio_blk_request(qs->alloc, &dev->vdev, &req, 512); + req_addr =3D virtio_blk_request(t_alloc, dev, &req, 512); =20 g_free(req.data); =20 - indirect =3D qvring_indirect_desc_setup(&dev->vdev, qs->alloc, 2); + indirect =3D qvring_indirect_desc_setup(dev, t_alloc, 2); qvring_indirect_desc_add(indirect, req_addr, 528, false); qvring_indirect_desc_add(indirect, req_addr + 528, 1, true); - free_head =3D qvirtqueue_add_indirect(&vqpci->vq, indirect); - qvirtqueue_kick(&dev->vdev, &vqpci->vq, free_head); + free_head =3D qvirtqueue_add_indirect(vq, indirect); + qvirtqueue_kick(dev, vq, free_head); =20 - qvirtio_wait_used_elem(&dev->vdev, &vqpci->vq, free_head, NULL, + qvirtio_wait_used_elem(dev, vq, free_head, NULL, QVIRTIO_BLK_TIMEOUT_US); status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); =20 g_free(indirect); - guest_free(qs->alloc, req_addr); + guest_free(t_alloc, req_addr); =20 /* Read request */ req.type =3D VIRTIO_BLK_T_IN; @@ -357,17 +272,17 @@ static void pci_indirect(void) req.data =3D g_malloc0(512); strcpy(req.data, "TEST"); =20 - req_addr =3D virtio_blk_request(qs->alloc, &dev->vdev, &req, 512); + req_addr =3D virtio_blk_request(t_alloc, dev, &req, 512); =20 g_free(req.data); =20 - indirect =3D qvring_indirect_desc_setup(&dev->vdev, qs->alloc, 2); + indirect =3D qvring_indirect_desc_setup(dev, t_alloc, 2); qvring_indirect_desc_add(indirect, req_addr, 16, false); qvring_indirect_desc_add(indirect, req_addr + 16, 513, true); - free_head =3D qvirtqueue_add_indirect(&vqpci->vq, indirect); - qvirtqueue_kick(&dev->vdev, &vqpci->vq, free_head); + free_head =3D qvirtqueue_add_indirect(vq, indirect); + qvirtqueue_kick(dev, vq, free_head); =20 - qvirtio_wait_used_elem(&dev->vdev, &vqpci->vq, free_head, NULL, + qvirtio_wait_used_elem(dev, vq, free_head, NULL, QVIRTIO_BLK_TIMEOUT_US); status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); @@ -378,48 +293,35 @@ static void pci_indirect(void) g_free(data); =20 g_free(indirect); - guest_free(qs->alloc, req_addr); - - /* End test */ - qvirtqueue_cleanup(dev->vdev.bus, &vqpci->vq, qs->alloc); - qvirtio_pci_device_disable(dev); - qvirtio_pci_device_free(dev); - qtest_shutdown(qs); + guest_free(t_alloc, req_addr); + qvirtqueue_cleanup(dev->bus, vq, t_alloc); } =20 -static void pci_config(void) +static void config(void *obj, void *data, QGuestAllocator *t_alloc) { - QVirtioPCIDevice *dev; - QOSState *qs; + QVirtioBlk *blk_if =3D obj; + QVirtioDevice *dev =3D blk_if->vdev; int n_size =3D TEST_IMAGE_SIZE / 2; uint64_t capacity; =20 - qs =3D pci_test_start(); - - dev =3D virtio_blk_pci_init(qs->pcibus, PCI_SLOT); - - capacity =3D qvirtio_config_readq(&dev->vdev, 0); + capacity =3D qvirtio_config_readq(dev, 0); g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); =20 qmp_discard_response("{ 'execute': 'block_resize', " " 'arguments': { 'device': 'drive0', " " 'size': %d } }", n_size); - qvirtio_wait_config_isr(&dev->vdev, QVIRTIO_BLK_TIMEOUT_US); + qvirtio_wait_config_isr(dev, QVIRTIO_BLK_TIMEOUT_US); =20 - capacity =3D qvirtio_config_readq(&dev->vdev, 0); + capacity =3D qvirtio_config_readq(dev, 0); g_assert_cmpint(capacity, =3D=3D, n_size / 512); - - qvirtio_pci_device_disable(dev); - qvirtio_pci_device_free(dev); - - qtest_shutdown(qs); } =20 -static void pci_msix(void) +static void msix(void *obj, void *u_data, QGuestAllocator *t_alloc) { - QVirtioPCIDevice *dev; - QOSState *qs; - QVirtQueuePCI *vqpci; + QVirtQueue *vq; + QVirtioBlkPCI *blk =3D obj; + QVirtioPCIDevice *pdev =3D &blk->pci_vdev; + QVirtioDevice *dev =3D &pdev->vdev; QVirtioBlkReq req; int n_size =3D TEST_IMAGE_SIZE / 2; uint64_t req_addr; @@ -428,34 +330,37 @@ static void pci_msix(void) uint32_t free_head; uint8_t status; char *data; + QOSGraphObject *blk_object =3D obj; + QPCIDevice *pci_dev =3D blk_object->get_driver(blk_object, "pci-device= "); =20 - qs =3D pci_test_start(); - - dev =3D virtio_blk_pci_init(qs->pcibus, PCI_SLOT); - qpci_msix_enable(dev->pdev); + /* FIXME: add spapr support */ + if (qpci_has_buggy_msi(pci_dev)) { + return; + } =20 - qvirtio_pci_set_msix_configuration_vector(dev, qs->alloc, 0); + qpci_msix_enable(pdev->pdev); + qvirtio_pci_set_msix_configuration_vector(pdev, t_alloc, 0); =20 - capacity =3D qvirtio_config_readq(&dev->vdev, 0); + capacity =3D qvirtio_config_readq(dev, 0); g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); =20 - features =3D qvirtio_get_features(&dev->vdev); + features =3D qvirtio_get_features(dev); features =3D features & ~(QVIRTIO_F_BAD_FEATURE | (1u << VIRTIO_RING_F_INDIRECT_DESC) | (1u << VIRTIO_RING_F_EVENT_IDX) | (1u << VIRTIO_BLK_F_SCSI)); - qvirtio_set_features(&dev->vdev, features); + qvirtio_set_features(dev, features); =20 - vqpci =3D (QVirtQueuePCI *)qvirtqueue_setup(&dev->vdev, qs->alloc, 0); - qvirtqueue_pci_msix_setup(dev, vqpci, qs->alloc, 1); + vq =3D qvirtqueue_setup(dev, t_alloc, 0); + qvirtqueue_pci_msix_setup(pdev, (QVirtQueuePCI *)vq, t_alloc, 1); =20 qmp_discard_response("{ 'execute': 'block_resize', " " 'arguments': { 'device': 'drive0', " " 'size': %d } }", n_size); =20 - qvirtio_wait_config_isr(&dev->vdev, QVIRTIO_BLK_TIMEOUT_US); + qvirtio_wait_config_isr(dev, QVIRTIO_BLK_TIMEOUT_US); =20 - capacity =3D qvirtio_config_readq(&dev->vdev, 0); + capacity =3D qvirtio_config_readq(dev, 0); g_assert_cmpint(capacity, =3D=3D, n_size / 512); =20 /* Write request */ @@ -465,22 +370,22 @@ static void pci_msix(void) req.data =3D g_malloc0(512); strcpy(req.data, "TEST"); =20 - req_addr =3D virtio_blk_request(qs->alloc, &dev->vdev, &req, 512); + req_addr =3D virtio_blk_request(t_alloc, dev, &req, 512); =20 g_free(req.data); =20 - free_head =3D qvirtqueue_add(&vqpci->vq, req_addr, 16, false, true); - qvirtqueue_add(&vqpci->vq, req_addr + 16, 512, false, true); - qvirtqueue_add(&vqpci->vq, req_addr + 528, 1, true, false); - qvirtqueue_kick(&dev->vdev, &vqpci->vq, free_head); + free_head =3D qvirtqueue_add(vq, req_addr, 16, false, true); + qvirtqueue_add(vq, req_addr + 16, 512, false, true); + qvirtqueue_add(vq, req_addr + 528, 1, true, false); + qvirtqueue_kick(dev, vq, free_head); =20 - qvirtio_wait_used_elem(&dev->vdev, &vqpci->vq, free_head, NULL, + qvirtio_wait_used_elem(dev, vq, free_head, NULL, QVIRTIO_BLK_TIMEOUT_US); =20 status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); =20 - guest_free(qs->alloc, req_addr); + guest_free(t_alloc, req_addr); =20 /* Read request */ req.type =3D VIRTIO_BLK_T_IN; @@ -488,18 +393,18 @@ static void pci_msix(void) req.sector =3D 0; req.data =3D g_malloc0(512); =20 - req_addr =3D virtio_blk_request(qs->alloc, &dev->vdev, &req, 512); + req_addr =3D virtio_blk_request(t_alloc, dev, &req, 512); =20 g_free(req.data); =20 - free_head =3D qvirtqueue_add(&vqpci->vq, req_addr, 16, false, true); - qvirtqueue_add(&vqpci->vq, req_addr + 16, 512, true, true); - qvirtqueue_add(&vqpci->vq, req_addr + 528, 1, true, false); + free_head =3D qvirtqueue_add(vq, req_addr, 16, false, true); + qvirtqueue_add(vq, req_addr + 16, 512, true, true); + qvirtqueue_add(vq, req_addr + 528, 1, true, false); =20 - qvirtqueue_kick(&dev->vdev, &vqpci->vq, free_head); + qvirtqueue_kick(dev, vq, free_head); =20 =20 - qvirtio_wait_used_elem(&dev->vdev, &vqpci->vq, free_head, NULL, + qvirtio_wait_used_elem(dev, vq, free_head, NULL, QVIRTIO_BLK_TIMEOUT_US); =20 status =3D readb(req_addr + 528); @@ -510,21 +415,19 @@ static void pci_msix(void) g_assert_cmpstr(data, =3D=3D, "TEST"); g_free(data); =20 - guest_free(qs->alloc, req_addr); + guest_free(t_alloc, req_addr); =20 /* End test */ - qvirtqueue_cleanup(dev->vdev.bus, &vqpci->vq, qs->alloc); - qpci_msix_disable(dev->pdev); - qvirtio_pci_device_disable(dev); - qvirtio_pci_device_free(dev); - qtest_shutdown(qs); + qpci_msix_disable(pdev->pdev); + qvirtqueue_cleanup(dev->bus, vq, t_alloc); } =20 -static void pci_idx(void) +static void idx(void *obj, void *u_data, QGuestAllocator *t_alloc) { - QVirtioPCIDevice *dev; - QOSState *qs; - QVirtQueuePCI *vqpci; + QVirtQueue *vq; + QVirtioBlkPCI *blk =3D obj; + QVirtioPCIDevice *pdev =3D &blk->pci_vdev; + QVirtioDevice *dev =3D &pdev->vdev; QVirtioBlkReq req; uint64_t req_addr; uint64_t capacity; @@ -534,26 +437,29 @@ static void pci_idx(void) uint32_t desc_idx; uint8_t status; char *data; + QOSGraphObject *blk_object =3D obj; + QPCIDevice *pci_dev =3D blk_object->get_driver(blk_object, "pci-device= "); =20 - qs =3D pci_test_start(); - - dev =3D virtio_blk_pci_init(qs->pcibus, PCI_SLOT); - qpci_msix_enable(dev->pdev); + /* FIXME: add spapr support */ + if (qpci_has_buggy_msi(pci_dev)) { + return; + } =20 - qvirtio_pci_set_msix_configuration_vector(dev, qs->alloc, 0); + qpci_msix_enable(pdev->pdev); + qvirtio_pci_set_msix_configuration_vector(pdev, t_alloc, 0); =20 - capacity =3D qvirtio_config_readq(&dev->vdev, 0); + capacity =3D qvirtio_config_readq(dev, 0); g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); =20 - features =3D qvirtio_get_features(&dev->vdev); + features =3D qvirtio_get_features(dev); features =3D features & ~(QVIRTIO_F_BAD_FEATURE | (1u << VIRTIO_RING_F_INDIRECT_DESC) | (1u << VIRTIO_F_NOTIFY_ON_EMPTY) | (1u << VIRTIO_BLK_F_SCSI)); - qvirtio_set_features(&dev->vdev, features); + qvirtio_set_features(dev, features); =20 - vqpci =3D (QVirtQueuePCI *)qvirtqueue_setup(&dev->vdev, qs->alloc, 0); - qvirtqueue_pci_msix_setup(dev, vqpci, qs->alloc, 1); + vq =3D qvirtqueue_setup(dev, t_alloc, 0); + qvirtqueue_pci_msix_setup(pdev, (QVirtQueuePCI *)vq, t_alloc, 1); =20 /* Write request */ req.type =3D VIRTIO_BLK_T_OUT; @@ -562,16 +468,16 @@ static void pci_idx(void) req.data =3D g_malloc0(512); strcpy(req.data, "TEST"); =20 - req_addr =3D virtio_blk_request(qs->alloc, &dev->vdev, &req, 512); + req_addr =3D virtio_blk_request(t_alloc, dev, &req, 512); =20 g_free(req.data); =20 - free_head =3D qvirtqueue_add(&vqpci->vq, req_addr, 16, false, true); - qvirtqueue_add(&vqpci->vq, req_addr + 16, 512, false, true); - qvirtqueue_add(&vqpci->vq, req_addr + 528, 1, true, false); - qvirtqueue_kick(&dev->vdev, &vqpci->vq, free_head); + free_head =3D qvirtqueue_add(vq, req_addr, 16, false, true); + qvirtqueue_add(vq, req_addr + 16, 512, false, true); + qvirtqueue_add(vq, req_addr + 528, 1, true, false); + qvirtqueue_kick(dev, vq, free_head); =20 - qvirtio_wait_used_elem(&dev->vdev, &vqpci->vq, free_head, NULL, + qvirtio_wait_used_elem(dev, vq, free_head, NULL, QVIRTIO_BLK_TIMEOUT_US); =20 /* Write request */ @@ -581,25 +487,25 @@ static void pci_idx(void) req.data =3D g_malloc0(512); strcpy(req.data, "TEST"); =20 - req_addr =3D virtio_blk_request(qs->alloc, &dev->vdev, &req, 512); + req_addr =3D virtio_blk_request(t_alloc, dev, &req, 512); =20 g_free(req.data); =20 /* Notify after processing the third request */ - qvirtqueue_set_used_event(&vqpci->vq, 2); - free_head =3D qvirtqueue_add(&vqpci->vq, req_addr, 16, false, true); - qvirtqueue_add(&vqpci->vq, req_addr + 16, 512, false, true); - qvirtqueue_add(&vqpci->vq, req_addr + 528, 1, true, false); - qvirtqueue_kick(&dev->vdev, &vqpci->vq, free_head); + qvirtqueue_set_used_event(vq, 2); + free_head =3D qvirtqueue_add(vq, req_addr, 16, false, true); + qvirtqueue_add(vq, req_addr + 16, 512, false, true); + qvirtqueue_add(vq, req_addr + 528, 1, true, false); + qvirtqueue_kick(dev, vq, free_head); write_head =3D free_head; =20 /* No notification expected */ - status =3D qvirtio_wait_status_byte_no_isr(&dev->vdev, - &vqpci->vq, req_addr + 528, + status =3D qvirtio_wait_status_byte_no_isr(dev, + vq, req_addr + 528, QVIRTIO_BLK_TIMEOUT_US); g_assert_cmpint(status, =3D=3D, 0); =20 - guest_free(qs->alloc, req_addr); + guest_free(t_alloc, req_addr); =20 /* Read request */ req.type =3D VIRTIO_BLK_T_IN; @@ -607,20 +513,20 @@ static void pci_idx(void) req.sector =3D 1; req.data =3D g_malloc0(512); =20 - req_addr =3D virtio_blk_request(qs->alloc, &dev->vdev, &req, 512); + req_addr =3D virtio_blk_request(t_alloc, dev, &req, 512); =20 g_free(req.data); =20 - free_head =3D qvirtqueue_add(&vqpci->vq, req_addr, 16, false, true); - qvirtqueue_add(&vqpci->vq, req_addr + 16, 512, true, true); - qvirtqueue_add(&vqpci->vq, req_addr + 528, 1, true, false); + free_head =3D qvirtqueue_add(vq, req_addr, 16, false, true); + qvirtqueue_add(vq, req_addr + 16, 512, true, true); + qvirtqueue_add(vq, req_addr + 528, 1, true, false); =20 - qvirtqueue_kick(&dev->vdev, &vqpci->vq, free_head); + qvirtqueue_kick(dev, vq, free_head); =20 /* We get just one notification for both requests */ - qvirtio_wait_used_elem(&dev->vdev, &vqpci->vq, write_head, NULL, + qvirtio_wait_used_elem(dev, vq, write_head, NULL, QVIRTIO_BLK_TIMEOUT_US); - g_assert(qvirtqueue_get_buf(&vqpci->vq, &desc_idx, NULL)); + g_assert(qvirtqueue_get_buf(vq, &desc_idx, NULL)); g_assert_cmpint(desc_idx, =3D=3D, free_head); =20 status =3D readb(req_addr + 528); @@ -631,121 +537,126 @@ static void pci_idx(void) g_assert_cmpstr(data, =3D=3D, "TEST"); g_free(data); =20 - guest_free(qs->alloc, req_addr); + guest_free(t_alloc, req_addr); =20 /* End test */ - qvirtqueue_cleanup(dev->vdev.bus, &vqpci->vq, qs->alloc); - qpci_msix_disable(dev->pdev); - qvirtio_pci_device_disable(dev); - qvirtio_pci_device_free(dev); - qtest_shutdown(qs); + qpci_msix_disable(pdev->pdev); + + qvirtqueue_cleanup(dev->bus, vq, t_alloc); } =20 -static void pci_hotplug(void) +static void pci_hotplug(void *obj, void *data, QGuestAllocator *t_alloc) { + QVirtioBlkPCI *blk =3D obj; + QVirtioPCIDevice *pdev =3D &blk->pci_vdev; QVirtioPCIDevice *dev; - QOSState *qs; - const char *arch =3D qtest_get_arch(); - - qs =3D pci_test_start(); =20 /* plug secondary disk */ qpci_plug_device_test("virtio-blk-pci", "drv1", PCI_SLOT_HP, "'drive': 'drive1'"); =20 - dev =3D virtio_blk_pci_init(qs->pcibus, PCI_SLOT_HP); + dev =3D qvirtio_pci_device_find_slot(pdev->pdev->bus, VIRTIO_ID_BLOCK, + PCI_SLOT_HP); g_assert(dev); qvirtio_pci_device_disable(dev); qvirtio_pci_device_free(dev); =20 /* unplug secondary disk */ - if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { - qpci_unplug_acpi_device_test("drv1", PCI_SLOT_HP); - } - qtest_shutdown(qs); + qpci_unplug_acpi_device_test("drv1", PCI_SLOT_HP); } =20 /* * Check that setting the vring addr on a non-existent virtqueue does * not crash. */ -static void test_nonexistent_virtqueue(void) +static void test_nonexistent_virtqueue(void *obj, void *data, + QGuestAllocator *t_alloc) { + QVirtioBlkPCI *blk =3D obj; + QVirtioPCIDevice *pdev =3D &blk->pci_vdev; QPCIBar bar0; - QOSState *qs; QPCIDevice *dev; =20 - qs =3D pci_test_start(); - dev =3D qpci_device_find(qs->pcibus, QPCI_DEVFN(4, 0)); + dev =3D qpci_device_find(pdev->pdev->bus, QPCI_DEVFN(4, 0)); g_assert(dev !=3D NULL); - qpci_device_enable(dev); + bar0 =3D qpci_iomap(dev, 0, NULL); =20 qpci_io_writeb(dev, bar0, VIRTIO_PCI_QUEUE_SEL, 2); qpci_io_writel(dev, bar0, VIRTIO_PCI_QUEUE_PFN, 1); =20 + g_free(dev); - qtest_shutdown(qs); } =20 -static void mmio_basic(void) +static void basic_resize(void *obj, void *data, QGuestAllocator *t_alloc) { - QVirtioMMIODevice *dev; - QVirtQueue *vq; - QGuestAllocator *alloc; + QVirtioBlk *blk_if =3D obj; + QVirtioDevice *dev =3D blk_if->vdev; int n_size =3D TEST_IMAGE_SIZE / 2; uint64_t capacity; + QVirtQueue *vq; =20 - arm_test_start(); - - dev =3D qvirtio_mmio_device_new(MMIO_DEV_BASE_ADDR, MMIO_PAGE_SIZE); - g_assert(dev !=3D NULL); - g_assert_cmphex(dev->vdev.device_type, =3D=3D, VIRTIO_ID_BLOCK); - - qvirtio_start_device(&dev->vdev); - - alloc =3D generic_alloc_init(MMIO_RAM_ADDR, MMIO_RAM_SIZE, MMIO_PAGE_S= IZE); - vq =3D qvirtqueue_setup(&dev->vdev, alloc, 0); + vq =3D qvirtqueue_setup(dev, t_alloc, 0); =20 - test_basic(&dev->vdev, alloc, vq); + test_basic(dev, t_alloc, vq); =20 qmp_discard_response("{ 'execute': 'block_resize', " " 'arguments': { 'device': 'drive0', " " 'size': %d } }", n_size); =20 - qvirtio_wait_queue_isr(&dev->vdev, vq, QVIRTIO_BLK_TIMEOUT_US); + qvirtio_wait_queue_isr(dev, vq, QVIRTIO_BLK_TIMEOUT_US); =20 - capacity =3D qvirtio_config_readq(&dev->vdev, 0); + capacity =3D qvirtio_config_readq(dev, 0); g_assert_cmpint(capacity, =3D=3D, n_size / 512); =20 - /* End test */ - qvirtqueue_cleanup(dev->vdev.bus, vq, alloc); - g_free(dev); - generic_alloc_uninit(alloc); - test_end(); + qvirtqueue_cleanup(dev->bus, vq, t_alloc); + } =20 -int main(int argc, char **argv) +static void virtio_blk_test_setup(char **cmd_line) { - const char *arch =3D qtest_get_arch(); - - g_test_init(&argc, &argv, NULL); - - if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0 || - strcmp(arch, "ppc64") =3D=3D 0) { - qtest_add_func("/virtio/blk/pci/basic", pci_basic); - qtest_add_func("/virtio/blk/pci/indirect", pci_indirect); - qtest_add_func("/virtio/blk/pci/config", pci_config); - qtest_add_func("/virtio/blk/pci/nxvirtq", test_nonexistent_virtque= ue); - if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D= 0) { - qtest_add_func("/virtio/blk/pci/msix", pci_msix); - qtest_add_func("/virtio/blk/pci/idx", pci_idx); - } - qtest_add_func("/virtio/blk/pci/hotplug", pci_hotplug); - } else if (strcmp(arch, "arm") =3D=3D 0) { - qtest_add_func("/virtio/blk/mmio/basic", mmio_basic); - } + char *new_cmdline; + + tmp_path =3D drive_create(); =20 - return g_test_run(); + new_cmdline =3D + g_strdup_printf("%s " + "-drive if=3Dnone,id=3Ddrive0,file=3D%s,format=3Dr= aw " + "-drive if=3Dnone,id=3Ddrive1,file=3Dnull-co://,fo= rmat=3Draw ", + *cmd_line, tmp_path); + + g_assert_nonnull(new_cmdline); + + g_free(*cmd_line); + *cmd_line =3D new_cmdline; } + +static void virtio_blk_test_cleanup(void) +{ + unlink(tmp_path); + g_free(tmp_path); +} + +static void virtio_blk_test(void) +{ + QOSGraphTestOptions opts =3D { + .before =3D virtio_blk_test_setup, + .after =3D virtio_blk_test_cleanup, + }; + + qos_add_test("blk-indirect", "virtio-blk", indirect, &opts); + qos_add_test("blk-config", "virtio-blk", config, &opts); + qos_add_test("blk-basic", "virtio-blk", basic, &opts); + qos_add_test("blk-basic-resize", "virtio-blk", basic_resize, &opts); + + /* tests just for virtio-blk-pci */ + qos_add_test("blk-msix", "virtio-blk-pci", msix, &opts); + qos_add_test("blk-idx", "virtio-blk-pci", idx, &opts); + qos_add_test("blk-nxvirtq", "virtio-blk-pci", + test_nonexistent_virtqueue, &opts); + qos_add_test("blk-hotplug", "virtio-blk-pci", pci_hotplug, &opts); +} + +libqos_init(virtio_blk_test); --=20 2.17.1