From nobody Sun Nov 9 22:26:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551983108138797.966940190115; Thu, 7 Mar 2019 10:25:08 -0800 (PST) Received: from localhost ([127.0.0.1]:56877 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1xhY-0006U3-T7 for importer@patchew.org; Thu, 07 Mar 2019 13:25:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1wr4-0003WV-Fh for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:30:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1wr2-0008LB-Vg for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:30:50 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:52928) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1wr2-0008KN-J7 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 12:30:48 -0500 Received: by mail-wm1-x343.google.com with SMTP id f65so10068740wma.2 for ; Thu, 07 Mar 2019 09:30:48 -0800 (PST) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id d206sm9979753wmc.11.2019.03.07.09.30.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Mar 2019 09:30:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=bd4rlS5il2ZmWiFTOohYxq9m4sCk4jxjMwaQAk41v/0=; b=oQI48oAXm5dbCWpmuxtgNvdIVsfzbKebpGlktc6fNqwNaV42oNXdwPgw8FVnyme/jP 2o2gTvanH0xNPbt/rdEKhrRqtun5/jVB2hnMRXR9eAmu/+g5/fcWdalS4UmVmuHmx2p5 +bWh5wvtD0p11YwcZacO/vpwpwr2qvzPgrZg/qaNjOesexn3fAZLtoZKyGkpznVlNCTH CxdnXdoUodD4WOJaFCbQecKc+Bg0CAxp//nlOwwNw+DN6bS90cj2eXcRf9sOFADUOGtX aGn2jrX2EqPhZx5Bh/PL6gWoOnlLFyDIAGR1EMCJ05bEubi56nqp60RHNb7YuXD9ULfH ZbxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=bd4rlS5il2ZmWiFTOohYxq9m4sCk4jxjMwaQAk41v/0=; b=USlAgpCzQn0i6IupIZtke1/dY+nH88GGX+Q2zAqJQpm2LN/0E3rV4qI8pAQRn6WxfL VpXha+twFAKu/0vdq38X3e9z+zPaPX0oX5ThR1UAbnlU0ZcKgcOdMiuOsGKwKInppDvh VX4fWH+v6Jpv+ymtb0KM5zPFAnsGrVz9WDwdIde2x6RAjVc5ti2Atgt9wv+sd0BKrXk4 XHKocFy1ZxX0xoh2rrubc3VSF3EUkfZYspA3U8zQ/3rsmWN62oW0BnAN1qj/XQziZcDj GIM0usqKMjgHljdhRJEZGn3TS+GTwmZpxTsArimuLpJFayvZM28f6z69bnEjvFvKDiQg 9AEQ== X-Gm-Message-State: APjAAAXBcrpb1x8MWfIyXvmdh1gtu5m4t9rm2gpEun2adcwAssQCoOAA Rvks6xFGc9DRZQ2b9eDTSHA6UK1h X-Google-Smtp-Source: APXvYqy2BIpU/G7SfRGjT1EWrXxTHCgKnUBXffb5o4Ct1sywvXLW2qzbbkcin71/2dVlMUL+Ex/LJQ== X-Received: by 2002:a1c:b709:: with SMTP id h9mr6818062wmf.114.1551979847233; Thu, 07 Mar 2019 09:30:47 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 18:29:44 +0100 Message-Id: <1551979804-6060-38-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551979804-6060-1-git-send-email-pbonzini@redhat.com> References: <1551979804-6060-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PULL 37/57] qos-test: virtio-net 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: thuth@redhat.com, Emanuele Giuseppe Esposito , lviver@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Emanuele Giuseppe Esposito Convert tests/virtio-net-test in qgraph test node, virtio-net-test. This test consumes a virtio-net interface and checks that its function return the expected values. Some functions are implemented only for virtio-net-pci, so they don't consume virtio-net, but virtio-net-pci Note that this test does not allocate any virtio-net structure, it's all done by the qtest walking graph mechanism Signed-off-by: Emanuele Giuseppe Esposito Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 3 +- tests/virtio-net-test.c | 224 ++++++++++++++++----------------------------= ---- 2 files changed, 75 insertions(+), 152 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index ec23364..f45d115 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -153,7 +153,6 @@ check-qtest-generic-y +=3D tests/cdrom-test$(EXESUF) =20 check-qtest-ipack-y +=3D tests/ipoctal232-test$(EXESUF) =20 -check-qtest-virtio-y +=3D tests/virtio-net-test$(EXESUF) check-qtest-virtio-y +=3D tests/virtio-scsi-test$(EXESUF) =20 check-qtest-pci-y +=3D tests/e1000-test$(EXESUF) @@ -764,6 +763,7 @@ qos-test-obj-y +=3D tests/sdhci-test.o qos-test-obj-y +=3D tests/virtio-test.o qos-test-obj-$(CONFIG_VIRTFS) +=3D tests/virtio-9p-test.o qos-test-obj-y +=3D tests/virtio-blk-test.o +qos-test-obj-y +=3D tests/virtio-net-test.o qos-test-obj-y +=3D tests/virtio-rng-test.o qos-test-obj-y +=3D tests/virtio-serial-test.o =20 @@ -812,7 +812,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-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) tests/tpci200-test$(EXESUF): tests/tpci200-test.o tests/display-vga-test$(EXESUF): tests/display-vga-test.o diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c index 653148e..2d3630c 100644 --- a/tests/virtio-net-test.c +++ b/tests/virtio-net-test.c @@ -9,18 +9,11 @@ =20 #include "qemu/osdep.h" #include "libqtest.h" -#include "qemu-common.h" -#include "qemu/sockets.h" #include "qemu/iov.h" -#include "libqos/libqos-pc.h" -#include "libqos/libqos-spapr.h" -#include "libqos/virtio.h" -#include "libqos/virtio-pci.h" #include "qapi/qmp/qdict.h" -#include "qemu/bswap.h" #include "hw/virtio/virtio-net.h" -#include "standard-headers/linux/virtio_ids.h" -#include "standard-headers/linux/virtio_ring.h" +#include "libqos/qgraph.h" +#include "libqos/virtio-net.h" =20 #define PCI_SLOT_HP 0x06 #define PCI_SLOT 0x04 @@ -28,63 +21,8 @@ #define QVIRTIO_NET_TIMEOUT_US (30 * 1000 * 1000) #define VNET_HDR_SIZE sizeof(struct virtio_net_hdr_mrg_rxbuf) =20 -static void test_end(void) -{ - qtest_end(); -} - #ifndef _WIN32 =20 -static QVirtioPCIDevice *virtio_net_pci_init(QPCIBus *bus, int slot) -{ - QVirtioPCIDevice *dev; - - dev =3D qvirtio_pci_device_find(bus, VIRTIO_ID_NET); - g_assert(dev !=3D NULL); - g_assert_cmphex(dev->vdev.device_type, =3D=3D, VIRTIO_ID_NET); - - qvirtio_pci_device_enable(dev); - qvirtio_start_device(&dev->vdev); - - return dev; -} - -GCC_FMT_ATTR(1, 2) -static QOSState *pci_test_start(const char *cmd, ...) -{ - QOSState *qs; - va_list ap; - const char *arch =3D qtest_get_arch(); - - if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { - va_start(ap, cmd); - qs =3D qtest_pc_vboot(cmd, ap); - va_end(ap); - } else if (strcmp(arch, "ppc64") =3D=3D 0) { - va_start(ap, cmd); - qs =3D qtest_spapr_vboot(cmd, ap); - va_end(ap); - } else { - g_printerr("virtio-net tests are only available on x86 or ppc64\n"= ); - exit(EXIT_FAILURE); - } - global_qtest =3D qs->qts; - return qs; -} - -static void driver_init(QVirtioDevice *dev) -{ - uint32_t features; - - 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)); - qvirtio_set_features(dev, features); - - qvirtio_set_driver_ok(dev); -} - static void rx_test(QVirtioDevice *dev, QGuestAllocator *alloc, QVirtQueue *vq, int socket) @@ -194,128 +132,114 @@ static void rx_stop_cont_test(QVirtioDevice *dev, guest_free(alloc, req_addr); } =20 -static void send_recv_test(QVirtioDevice *dev, - QGuestAllocator *alloc, QVirtQueue *rvq, - QVirtQueue *tvq, int socket) +static void send_recv_test(void *obj, void *data, QGuestAllocator *t_alloc) { - rx_test(dev, alloc, rvq, socket); - tx_test(dev, alloc, tvq, socket); + QVirtioNet *net_if =3D obj; + QVirtioDevice *dev =3D net_if->vdev; + QVirtQueue *rx =3D net_if->rx; + QVirtQueue *tx =3D net_if->tx; + int *sv =3D data; + + rx_test(dev, t_alloc, rx, sv[0]); + tx_test(dev, t_alloc, tx, sv[0]); } =20 -static void stop_cont_test(QVirtioDevice *dev, - QGuestAllocator *alloc, QVirtQueue *rvq, - QVirtQueue *tvq, int socket) +static void stop_cont_test(void *obj, void *data, QGuestAllocator *t_alloc) { - rx_stop_cont_test(dev, alloc, rvq, socket); + QVirtioNet *net_if =3D obj; + QVirtioDevice *dev =3D net_if->vdev; + QVirtQueue *rx =3D net_if->rx; + int *sv =3D data; + + rx_stop_cont_test(dev, t_alloc, rx, sv[0]); } =20 -static void pci_basic(gconstpointer data) -{ - QVirtioPCIDevice *dev; - QOSState *qs; - QVirtQueuePCI *tx, *rx; - void (*func) (QVirtioDevice *dev, - QGuestAllocator *alloc, - QVirtQueue *rvq, - QVirtQueue *tvq, - int socket) =3D data; - int sv[2], ret; +#endif =20 - ret =3D socketpair(PF_UNIX, SOCK_STREAM, 0, sv); - g_assert_cmpint(ret, !=3D, -1); +static void hotplug(void *obj, void *data, QGuestAllocator *t_alloc) +{ + const char *arch =3D qtest_get_arch(); =20 - qs =3D pci_test_start("-netdev socket,fd=3D%d,id=3Dhs0 -device " - "virtio-net-pci,netdev=3Dhs0", sv[1]); - dev =3D virtio_net_pci_init(qs->pcibus, PCI_SLOT); + qtest_qmp_device_add("virtio-net-pci", "net1", + "{'addr': %s}", stringify(PCI_SLOT_HP)); =20 - rx =3D (QVirtQueuePCI *)qvirtqueue_setup(&dev->vdev, &qs->alloc, 0); - tx =3D (QVirtQueuePCI *)qvirtqueue_setup(&dev->vdev, &qs->alloc, 1); + if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { + qpci_unplug_acpi_device_test("net1", PCI_SLOT_HP); + } +} =20 - driver_init(&dev->vdev); - func(&dev->vdev, &qs->alloc, &rx->vq, &tx->vq, sv[0]); +static void virtio_net_test_cleanup(void *sockets) +{ + int *sv =3D sockets; =20 - /* End test */ close(sv[0]); - qvirtqueue_cleanup(dev->vdev.bus, &tx->vq, &qs->alloc); - qvirtqueue_cleanup(dev->vdev.bus, &rx->vq, &qs->alloc); - qvirtio_pci_device_disable(dev); - g_free(dev->pdev); - g_free(dev); - qtest_shutdown(qs); + qos_invalidate_command_line(); + close(sv[1]); + g_free(sv); +} + +static void *virtio_net_test_setup(GString *cmd_line, void *arg) +{ + int ret; + int *sv =3D g_new(int, 2); + + ret =3D socketpair(PF_UNIX, SOCK_STREAM, 0, sv); + g_assert_cmpint(ret, !=3D, -1); + + g_string_append_printf(cmd_line, " -netdev socket,fd=3D%d,id=3Dhs0 ", = sv[1]); + + g_test_queue_destroy(virtio_net_test_cleanup, sv); + return sv; } =20 -static void large_tx(gconstpointer data) +static void large_tx(void *obj, void *data, QGuestAllocator *t_alloc) { - QVirtioPCIDevice *dev; - QOSState *qs; - QVirtQueuePCI *tx, *rx; - QVirtQueue *vq; + QVirtioNet *dev =3D obj; + QVirtQueue *vq =3D dev->queues[1]; uint64_t req_addr; uint32_t free_head; size_t alloc_size =3D (size_t)data / 64; int i; =20 - qs =3D pci_test_start("-netdev hubport,id=3Dhp0,hubid=3D0 " - "-device virtio-net-pci,netdev=3Dhp0"); - dev =3D virtio_net_pci_init(qs->pcibus, PCI_SLOT); - - rx =3D (QVirtQueuePCI *)qvirtqueue_setup(&dev->vdev, qs->alloc, 0); - tx =3D (QVirtQueuePCI *)qvirtqueue_setup(&dev->vdev, qs->alloc, 1); - - driver_init(&dev->vdev); - vq =3D &tx->vq; - /* Bypass the limitation by pointing several descriptors to a single * smaller area */ - req_addr =3D guest_alloc(qs->alloc, alloc_size); + req_addr =3D guest_alloc(t_alloc, alloc_size); free_head =3D qvirtqueue_add(vq, req_addr, alloc_size, false, true); =20 for (i =3D 0; i < 64; i++) { qvirtqueue_add(vq, req_addr, alloc_size, false, i !=3D 63); } - qvirtqueue_kick(&dev->vdev, vq, free_head); + qvirtqueue_kick(dev->vdev, vq, free_head); =20 - qvirtio_wait_used_elem(&dev->vdev, vq, free_head, NULL, + qvirtio_wait_used_elem(dev->vdev, vq, free_head, NULL, QVIRTIO_NET_TIMEOUT_US); - - qvirtqueue_cleanup(dev->vdev.bus, &tx->vq, qs->alloc); - qvirtqueue_cleanup(dev->vdev.bus, &rx->vq, qs->alloc); - qvirtio_pci_device_disable(dev); - g_free(dev->pdev); - g_free(dev); - qtest_shutdown(qs); + guest_free(t_alloc, req_addr); } -#endif =20 -static void hotplug(void) +static void *virtio_net_test_setup_nosocket(GString *cmd_line, void *arg) { - const char *arch =3D qtest_get_arch(); - - qtest_start("-device virtio-net-pci"); - - qtest_qmp_device_add("virtio-net-pci", "net1", - "{'addr': %s}", stringify(PCI_SLOT_HP)); - - if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { - qpci_unplug_acpi_device_test("net1", PCI_SLOT_HP); - } - - test_end(); + g_string_append(cmd_line, " -netdev hubport,hubid=3D0,id=3Dhs0 "); + return arg; } =20 -int main(int argc, char **argv) +static void register_virtio_net_test(void) { - g_test_init(&argc, &argv, NULL); + QOSGraphTestOptions opts =3D { + .before =3D virtio_net_test_setup, + }; + + qos_add_test("hotplug", "virtio-pci", hotplug, &opts); #ifndef _WIN32 - qtest_add_data_func("/virtio/net/pci/basic", send_recv_test, pci_basic= ); - qtest_add_data_func("/virtio/net/pci/rx_stop_cont", - stop_cont_test, pci_basic); - qtest_add_data_func("/virtio/net/pci/large_tx_uint_max", - (gconstpointer)UINT_MAX, large_tx); - qtest_add_data_func("/virtio/net/pci/large_tx_net_bufsize", - (gconstpointer)NET_BUFSIZE, large_tx); + qos_add_test("basic", "virtio-net", send_recv_test, &opts); + qos_add_test("rx_stop_cont", "virtio-net", stop_cont_test, &opts); #endif - qtest_add_func("/virtio/net/pci/hotplug", hotplug); =20 - return g_test_run(); + /* These tests do not need a loopback backend. */ + opts.before =3D virtio_net_test_setup_nosocket; + opts.arg =3D (gpointer)UINT_MAX; + qos_add_test("large_tx/uint_max", "virtio-net", large_tx, &opts); + opts.arg =3D (gpointer)NET_BUFSIZE; + qos_add_test("large_tx/net_bufsize", "virtio-net", large_tx, &opts); } + +libqos_init(register_virtio_net_test); --=20 1.8.3.1