From nobody Tue Nov 4 22:00:41 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1533567785623776.213545857638; Mon, 6 Aug 2018 08:03:05 -0700 (PDT) Received: from localhost ([::1]:34521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmh29-0004dR-HM for importer@patchew.org; Mon, 06 Aug 2018 11:02:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmgbR-0005QK-2x for qemu-devel@nongnu.org; Mon, 06 Aug 2018 10:35:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fmgbP-00019k-5Z for qemu-devel@nongnu.org; Mon, 06 Aug 2018 10:35:20 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:38254) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fmgbO-000197-NS for qemu-devel@nongnu.org; Mon, 06 Aug 2018 10:35:18 -0400 Received: by mail-ed1-x541.google.com with SMTP id t2-v6so5250268edr.5 for ; Mon, 06 Aug 2018 07:35:18 -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.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 07:35:17 -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=QP7fDpLYLqXRdMPW3QqSvVurnFYrEqOkv1x2sFeJuOk=; b=CV07eOuax5YqM3nrZ+911JcP+KIplTzN/xHen+It4arnlaognZmHCi19ppk/dBy1V2 ETIpifpgy5zqe9V4ckyNpuPHGuTL9l/gNHpARo7ZrW/wQuZhefYyArO/0yyh7YwmfoZ7 E3cCK0Z1Aam/he3JrStwjjZB2nTNq+LmhVCCI0ff1B448z2AuADcbxkn0Ct/kd17JjOi dt7JU4adczkJUUbgJMdrqzKPxlCMldCVHCP25tyqfqlhvIDBjriOeZS5WGfMkVoGx+lQ d3TSXIbLqX15q1vK+Nq3Dvlu/EqXsbohgYMwOH9R2m6QviBsPGxMFZZxu2xd5yjbl9Iu vwmQ== 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=QP7fDpLYLqXRdMPW3QqSvVurnFYrEqOkv1x2sFeJuOk=; b=lgrAxTbufsZvWdTzybQyGxnmol9Q5mwYh2JbiPCAU3Ugbjqx7PubnSb89YV78zkl6v slRmCucZf8UkakJYl6Suts8yTM2gN4vbcGfMVvksSE88s7G+UTu3P+y33U5YP6LdiMcM DaMDvWdaQaLPtK6VwueWWGWuv+KMyh9xG0WhUGxlTALiqQrzGe3dDIfw+8NH6iv0alzX NXadKncZOqLrKa6kF1RLb+kmnJxPfYgL068t2rSEkRvFz+x29+fZ1A55tqpHjlEYvxKo vBRRa+fj6YMu/Lt19OGuI1P+IGzDNBtgzT+lsEmilTL7Oygsw5iNYDe5eye3D+lx88Hu 4kXg== X-Gm-Message-State: AOUpUlGnWabLt/x3OqluSLwy/9P4M0o5CSf14VrB0X/N8cLVHU3Nt4ET Rp4S3mjl1IUHiY7oyU0hQm8= X-Google-Smtp-Source: AAOMgpfMlHo0jeKwiQUuwJpTGOdUEUUxuUPnxTeqybm0r3tE8gMkTyex4JTLmIakBVIYacIMuF4JJg== X-Received: by 2002:a50:a347:: with SMTP id 65-v6mr18334289edn.299.1533566117593; Mon, 06 Aug 2018 07:35:17 -0700 (PDT) From: Emanuele Giuseppe Esposito To: Paolo Bonzini Date: Mon, 6 Aug 2018 16:34:11 +0200 Message-Id: <20180806143412.27722-34-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::541 Subject: [Qemu-devel] [PATCH v2 33/34] test/qgraph: virtio-scsi 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-scsi-test in qgraph test node, virtio-scsi-test. This test consumes a virtio-scsi interface and checks that its function return the expected values. Some functions are implemented only for virtio-scsi-pci, so they don't consume virtio-scsi, but virtio-scsi-pci Note that this test does not allocate any virtio-scsi structure, it's all done by the qtest walking graph mechanism Signed-off-by: Emanuele Giuseppe Esposito --- tests/Makefile.include | 3 +- tests/virtio-scsi-test.c | 153 +++++++++++++++++++-------------------- 2 files changed, 75 insertions(+), 81 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index c5aa9f18b7..69877b3702 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -194,7 +194,6 @@ gcov-files-virtio-y +=3D i386-softmmu/hw/net/virtio-net= .c gcov-files-virtio-y +=3D i386-softmmu/hw/virtio/virtio-balloon.c 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) gcov-files-virtio-y +=3D i386-softmmu/hw/scsi/virtio-scsi.c ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) gcov-files-virtio-y +=3D hw/9pfs/virtio-9p.c @@ -786,6 +785,7 @@ 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 libqgraph-tests-obj-y +=3D tests/virtio-net-test.o +libqgraph-tests-obj-y +=3D tests/virtio-scsi-test.o =20 check-unit-y +=3D tests/test-qgraph$(EXESUF) tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y) @@ -829,7 +829,6 @@ 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-ccw-test$(EXESUF): tests/virtio-ccw-test.o -tests/virtio-scsi-test$(EXESUF): tests/virtio-scsi-test.o $(libqos-virtio-= obj-y) tests/tpci200-test$(EXESUF): tests/tpci200-test.o tests/display-vga-test$(EXESUF): tests/display-vga-test.o tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o diff --git a/tests/virtio-scsi-test.c b/tests/virtio-scsi-test.c index 1581b6926c..29e75064c8 100644 --- a/tests/virtio-scsi-test.c +++ b/tests/virtio-scsi-test.c @@ -18,6 +18,8 @@ #include "standard-headers/linux/virtio_ids.h" #include "standard-headers/linux/virtio_pci.h" #include "standard-headers/linux/virtio_scsi.h" +#include "libqos/virtio-scsi.h" +#include "libqos/qgraph.h" =20 #define PCI_SLOT 0x02 #define PCI_FN 0x00 @@ -27,55 +29,28 @@ =20 typedef struct { QVirtioDevice *dev; - QOSState *qs; int num_queues; QVirtQueue *vq[MAX_NUM_QUEUES + 2]; -} QVirtIOSCSI; +} QVirtioSCSIQueues; =20 -static QOSState *qvirtio_scsi_start(const char *extra_opts) -{ - QOSState *qs; - const char *arch =3D qtest_get_arch(); - const char *cmd =3D "-drive id=3Ddrv0,if=3Dnone,file=3Dnull-co://,form= at=3Draw " - "-device virtio-scsi-pci,id=3Dvs0 " - "-device scsi-hd,bus=3Dvs0.0,drive=3Ddrv0 %s"; - - if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { - qs =3D qtest_pc_boot(cmd, extra_opts ? : ""); - } else if (strcmp(arch, "ppc64") =3D=3D 0) { - qs =3D qtest_spapr_boot(cmd, extra_opts ? : ""); - } else { - g_printerr("virtio-scsi tests are only available on x86 or ppc64\n= "); - exit(EXIT_FAILURE); - } - global_qtest =3D qs->qts; - return qs; -} +static QGuestAllocator *alloc; =20 -static void qvirtio_scsi_stop(QOSState *qs) -{ - qtest_shutdown(qs); -} - -static void qvirtio_scsi_pci_free(QVirtIOSCSI *vs) +static void qvirtio_scsi_pci_free(QVirtioSCSIQueues *vs) { int i; =20 for (i =3D 0; i < vs->num_queues + 2; i++) { - qvirtqueue_cleanup(vs->dev->bus, vs->vq[i], vs->qs->alloc); + qvirtqueue_cleanup(vs->dev->bus, vs->vq[i], alloc); } - qvirtio_pci_device_disable(container_of(vs->dev, QVirtioPCIDevice, vde= v)); - qvirtio_pci_device_free((QVirtioPCIDevice *)vs->dev); - qvirtio_scsi_stop(vs->qs); g_free(vs); } =20 -static uint64_t qvirtio_scsi_alloc(QVirtIOSCSI *vs, size_t alloc_size, +static uint64_t qvirtio_scsi_alloc(QVirtioSCSIQueues *vs, size_t alloc_siz= e, const void *data) { uint64_t addr; =20 - addr =3D guest_alloc(vs->qs->alloc, alloc_size); + addr =3D guest_alloc(alloc, alloc_size); if (data) { memwrite(addr, data, alloc_size); } @@ -83,7 +58,8 @@ static uint64_t qvirtio_scsi_alloc(QVirtIOSCSI *vs, size_= t alloc_size, return addr; } =20 -static uint8_t virtio_scsi_do_command(QVirtIOSCSI *vs, const uint8_t *cdb, +static uint8_t virtio_scsi_do_command(QVirtioSCSIQueues *vs, + const uint8_t *cdb, const uint8_t *data_in, size_t data_in_len, uint8_t *data_out, size_t data_out_l= en, @@ -133,40 +109,28 @@ static uint8_t virtio_scsi_do_command(QVirtIOSCSI *vs= , const uint8_t *cdb, memread(resp_addr, resp_out, sizeof(*resp_out)); } =20 - guest_free(vs->qs->alloc, req_addr); - guest_free(vs->qs->alloc, resp_addr); - guest_free(vs->qs->alloc, data_in_addr); - guest_free(vs->qs->alloc, data_out_addr); + guest_free(alloc, req_addr); + guest_free(alloc, resp_addr); + guest_free(alloc, data_in_addr); + guest_free(alloc, data_out_addr); return response; } =20 -static QVirtIOSCSI *qvirtio_scsi_pci_init(int slot) +static QVirtioSCSIQueues *qvirtio_scsi_init(QVirtioDevice *dev) { + QVirtioSCSIQueues *vs; const uint8_t test_unit_ready_cdb[VIRTIO_SCSI_CDB_SIZE] =3D {}; - QVirtIOSCSI *vs; - QVirtioPCIDevice *dev; struct virtio_scsi_cmd_resp resp; int i; =20 - vs =3D g_new0(QVirtIOSCSI, 1); - - vs->qs =3D qvirtio_scsi_start("-drive file=3Dblkdebug::null-co://," - "if=3Dnone,id=3Ddr1,format=3Draw,file.alig= n=3D4k " - "-device scsi-hd,drive=3Ddr1,lun=3D0,scsi-= id=3D1"); - dev =3D qvirtio_pci_device_find(vs->qs->pcibus, VIRTIO_ID_SCSI); - vs->dev =3D (QVirtioDevice *)dev; - g_assert(dev !=3D NULL); - g_assert_cmphex(vs->dev->device_type, =3D=3D, VIRTIO_ID_SCSI); - - qvirtio_pci_device_enable(dev); - qvirtio_start_device(vs->dev); - - vs->num_queues =3D qvirtio_config_readl(vs->dev, 0); + vs =3D g_new0(QVirtioSCSIQueues, 1); + vs->dev =3D dev; + vs->num_queues =3D qvirtio_config_readl(dev, 0); =20 g_assert_cmpint(vs->num_queues, <, MAX_NUM_QUEUES); =20 for (i =3D 0; i < vs->num_queues + 2; i++) { - vs->vq[i] =3D qvirtqueue_setup(vs->dev, vs->qs->alloc, i); + vs->vq[i] =3D qvirtqueue_setup(dev, alloc, i); } =20 /* Clear the POWER ON OCCURRED unit attention */ @@ -183,29 +147,23 @@ static QVirtIOSCSI *qvirtio_scsi_pci_init(int slot) } =20 /* Tests only initialization so far. TODO: Replace with functional tests */ -static void pci_nop(void) +static void pci_nop(void *obj, void *data, QGuestAllocator *alloc) { - QOSState *qs; =20 - qs =3D qvirtio_scsi_start(NULL); - qvirtio_scsi_stop(qs); } =20 -static void hotplug(void) +static void hotplug(void *obj, void *data, QGuestAllocator *alloc) { - QOSState *qs; - - qs =3D qvirtio_scsi_start( - "-drive id=3Ddrv1,if=3Dnone,file=3Dnull-co://,format=3Draw"); qtest_qmp_device_add("scsi-hd", "scsihd", "'drive': 'drv1'"); qtest_qmp_device_del("scsihd"); - qvirtio_scsi_stop(qs); } =20 /* Test WRITE SAME with the lba not aligned */ -static void test_unaligned_write_same(void) +static void test_unaligned_write_same(void *obj, void *data, + QGuestAllocator *t_alloc) { - QVirtIOSCSI *vs; + QVirtioSCSI *scsi =3D obj; + QVirtioSCSIQueues *vs; uint8_t buf1[512] =3D { 0 }; uint8_t buf2[512] =3D { 1 }; const uint8_t write_same_cdb_1[VIRTIO_SCSI_CDB_SIZE] =3D { @@ -218,27 +176,64 @@ static void test_unaligned_write_same(void) 0x41, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x33, 0x00, 0x00 }; =20 - vs =3D qvirtio_scsi_pci_init(PCI_SLOT); + alloc =3D t_alloc; + vs =3D qvirtio_scsi_init(scsi->vdev); =20 g_assert_cmphex(0, =3D=3D, - virtio_scsi_do_command(vs, write_same_cdb_1, NULL, 0, buf1, 512, N= ULL)); + virtio_scsi_do_command(vs, write_same_cdb_1, NULL, 0, buf1, 512, + NULL)); =20 g_assert_cmphex(0, =3D=3D, - virtio_scsi_do_command(vs, write_same_cdb_2, NULL, 0, buf2, 512, N= ULL)); + virtio_scsi_do_command(vs, write_same_cdb_2, NULL, 0, buf2, 512, + NULL)); =20 g_assert_cmphex(0, =3D=3D, - virtio_scsi_do_command(vs, write_same_cdb_ndob, NULL, 0, NULL, 0, = NULL)); + virtio_scsi_do_command(vs, write_same_cdb_ndob, NULL, 0, NULL, 0, + NULL)); =20 qvirtio_scsi_pci_free(vs); } =20 -int main(int argc, char **argv) +static void virtio_scsi_hotplug_setup(char **cmd_line) { - g_test_init(&argc, &argv, NULL); - qtest_add_func("/virtio/scsi/pci/nop", pci_nop); - qtest_add_func("/virtio/scsi/pci/hotplug", hotplug); - qtest_add_func("/virtio/scsi/pci/scsi-disk/unaligned-write-same", - test_unaligned_write_same); + char *new_cmdline; =20 - return g_test_run(); + new_cmdline =3D g_strdup_printf("%s -drive id=3Ddrv1,if=3Dnone,file=3D= null-co://," + "format=3Draw", *cmd_line); + + g_assert_nonnull(new_cmdline); + + g_free(*cmd_line); + *cmd_line =3D new_cmdline; } + +static void virtio_scsi_setup(char **cmd_line) +{ + char *new_cmdline; + + new_cmdline =3D g_strdup_printf("%s -drive file=3Dblkdebug::null-co://= ," + "if=3Dnone,id=3Ddr1,format=3Draw,file.al= ign=3D4k " + "-device scsi-hd,drive=3Ddr1,lun=3D0,scs= i-id=3D1", + *cmd_line); + + g_assert_nonnull(new_cmdline); + + g_free(*cmd_line); + *cmd_line =3D new_cmdline; +} + +static void virtio_scsi_test(void) +{ + QOSGraphTestOptions opts =3D { }; + + qos_add_test("scsi-nop", "virtio-scsi", pci_nop, NULL); + + opts.before =3D virtio_scsi_hotplug_setup; + qos_add_test("scsi-hotplug", "virtio-scsi", hotplug, &opts); + + opts.before =3D virtio_scsi_setup; + qos_add_test("scsi-unaligned-write-same", "virtio-scsi", + test_unaligned_write_same, &opts); +} + +libqos_init(virtio_scsi_test); --=20 2.17.1