From nobody Mon May 13 23:50:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1668234845; cv=none; d=zohomail.com; s=zohoarc; b=aHeZnt+1LS0TEqUqAPoTxGbF520W0lxRKJgouIB900dEFt44rcfOkfqthVswk39L0TfSZ1ugxEguRRgDnlh5rMdb6bTq9S/TqZNf9ayroHEH3oh160GKCAwRmxR+UImo2RwaixNwGZ0PSpb7YiS8gerwsMbtKxX8uOqty20Lc8c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1668234845; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=I6C+9hKQzlN30II8yPCFNcbh3dOvWdnAGRULb/Ai318=; b=kWcCXbVYrEeJ/cnJjk6X56gA1zLSAiEhixN86FfS8rFm1/EUucPch35h20bDbyaOQKpsM6vQz0H44Id2r2vlbYVX3Ja2+sPKd8j677xKKeqZI5C7EAZFe+FjMAw6/h9I42+aM+dp8IJmmeaD6i7+EsP/y0MxRU2Mj20V1LosVv4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1668234845977637.6590573256282; Fri, 11 Nov 2022 22:34:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1otk4j-0005VB-B3; Sat, 12 Nov 2022 01:33:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1otk4i-0005Uu-FE; Sat, 12 Nov 2022 01:33:08 -0500 Received: from mail-qk1-x730.google.com ([2607:f8b0:4864:20::730]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1otk4g-00059c-Fx; Sat, 12 Nov 2022 01:33:08 -0500 Received: by mail-qk1-x730.google.com with SMTP id k2so4584458qkk.7; Fri, 11 Nov 2022 22:33:05 -0800 (PST) Received: from lft-vm.tuyobwrpnb0enbtwqcvs3babjg.cx.internal.cloudapp.net ([20.94.93.94]) by smtp.gmail.com with ESMTPSA id i10-20020ac8488a000000b0039492d503cdsm2408495qtq.51.2022.11.11.22.33.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 22:33:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=I6C+9hKQzlN30II8yPCFNcbh3dOvWdnAGRULb/Ai318=; b=GkTbtBiWQarifhWJD1EJoMwsHTmR9j0Q/eiFjXdE/UIRWsNENYhh8XqSl+TaoGHYK3 u5IFzE8r1L60oLPXXU8HV4ikX8Wm7TR3xHnEVgTbiaEo1xO2uMbxETrmdhTcmRaSbMlR YyRerzVb4wCYfuMctEsk9ZfET2rfLg52blMjeKFuRjbpq9yJynmFpTZ3FSo+Ya8Mf35F kB/w/YEXc19ZvIo52U5LuHbBbBZRjaq384wSStHXjqICh5Y+yQFphknsM1uv1WpPdA6u COBgcgH5TzBTcBD8e7AKzoQURMG3/QYkmOu55xo37BpAzN4gwvySha+4No8JVpYqNa14 NfGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=I6C+9hKQzlN30II8yPCFNcbh3dOvWdnAGRULb/Ai318=; b=eQw0QcN0G4V82FJQ5T2f0ZqBdBp3d0bYx5Hxc7zAJofHpYEv30Hj7JNJgCWPQ/lsSn luOrL31RZKYcVla4J+mgosrKAmtrMNf6X4tVVOOYCwjp8CSMBBP/n0WSA5TOUV/5hp1a Nc1i5OCv/u9AOGKqN/mf1N3YlfA4yBcROf6eMojW0oSCvT3x6wMUL50w7T9CbVa3z5g+ fEPCdQHdDGmC/0CQf/Y3tlTXlmbT2vU6JhDewzEm5shCzCzyAZd1Vdt8nJalKC2eWIPR q8tUQpQ3QkNDwGc8unDSxtSA95uADkSx17/UhGkoWy/dRqIoyZbUtLoGhdeuK0OMXJci cGxQ== X-Gm-Message-State: ANoB5pmZR556W1Z6LU3V8Ejvrn0fnyR/9aWZoLt1wCQ5zCCckXAlTJRE 5RSrS0m82G3JI1Brhjtl9/ojLnMFu4Q= X-Google-Smtp-Source: AA0mqf5Vf5HYcdifPGN8BYcZYDd44y5bcWDgkSiXvuLcqIQ/FPRf0fSJMLYcmo/Pf/hopjk15iQNcA== X-Received: by 2002:a05:620a:1e9:b0:6fa:4d19:2419 with SMTP id x9-20020a05620a01e900b006fa4d192419mr4027963qkn.61.1668234784580; Fri, 11 Nov 2022 22:33:04 -0800 (PST) From: Daniel Hoffman To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Daniel Hoffman Subject: [PATCH] hw/virtio: added virtio-serial test cases Date: Sat, 12 Nov 2022 06:32:41 +0000 Message-Id: <20221112063241.2190502-1-dhoff749@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2607:f8b0:4864:20::730; envelope-from=dhoff749@gmail.com; helo=mail-qk1-x730.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1668234847654100003 Content-Type: text/plain; charset="utf-8" The previous test cases for virtio-serial only tested initialization of the device. I've included four new test cases: rx for virtconsole, tx for virtconsole, rx for virtserialport, tx for virtserialport. It follows the general pattern of virtio-net (i.e. chardev file descriptor backend with a socketpair connected via fork-exec). Signed-off-by: Daniel Hoffman --- tests/qtest/libqos/virtio-serial.c | 51 +++++++++ tests/qtest/libqos/virtio-serial.h | 2 + tests/qtest/virtio-serial-test.c | 177 ++++++++++++++++++++++++++++- 3 files changed, 228 insertions(+), 2 deletions(-) diff --git a/tests/qtest/libqos/virtio-serial.c b/tests/qtest/libqos/virtio= -serial.c index 1d689c3e38..8723bffe1b 100644 --- a/tests/qtest/libqos/virtio-serial.c +++ b/tests/qtest/libqos/virtio-serial.c @@ -22,6 +22,10 @@ #include "qgraph.h" #include "virtio-serial.h" =20 +#include "qemu/iov.h" + +static QGuestAllocator *alloc; + static void *qvirtio_serial_get_driver(QVirtioSerial *v_serial, const char *interface) { @@ -43,6 +47,33 @@ static void *qvirtio_serial_device_get_driver(void *obje= ct, return qvirtio_serial_get_driver(&v_serial->serial, interface); } =20 +static void virtio_serial_setup(QVirtioSerial *interface) +{ + QVirtioDevice *vdev =3D interface->vdev; + qvirtio_set_features(vdev, (1ULL << 1) | (1ULL << 32)); + + interface->n_queues =3D 6; + interface->queues =3D g_new(QVirtQueue*, interface->n_queues); + + for (int i =3D 0; i < interface->n_queues; i++) { + interface->queues[i] =3D qvirtqueue_setup(interface->vdev, alloc, = i); + } + + qvirtio_set_driver_ok(vdev); +} + +static void qvirtio_serial_device_destructor(QOSGraphObject *obj) +{ +} + +static void qvirtio_serial_device_start_hw(QOSGraphObject *obj) +{ + QVirtioSerialDevice *v_serial =3D (QVirtioSerialDevice *)obj; + QVirtioSerial *interface =3D &v_serial->serial; + + virtio_serial_setup(interface); +} + static void *virtio_serial_device_create(void *virtio_dev, QGuestAllocator *t_alloc, void *addr) @@ -51,13 +82,30 @@ static void *virtio_serial_device_create(void *virtio_d= ev, QVirtioSerial *interface =3D &virtio_device->serial; =20 interface->vdev =3D virtio_dev; + alloc =3D t_alloc; =20 + virtio_device->obj.destructor =3D qvirtio_serial_device_destructor; + virtio_device->obj.start_hw =3D qvirtio_serial_device_start_hw; virtio_device->obj.get_driver =3D qvirtio_serial_device_get_driver; =20 return &virtio_device->obj; } =20 /* virtio-serial-pci */ +static void qvirtio_serial_pci_destructor(QOSGraphObject *obj) +{ +} + +static void qvirtio_serial_pci_start_hw(QOSGraphObject *obj) +{ + QVirtioSerialPCI *v_serial =3D (QVirtioSerialPCI *) obj; + QVirtioSerial *interface =3D &v_serial->serial; + QOSGraphObject *pci_vobj =3D &v_serial->pci_vdev.obj; + + qvirtio_pci_start_hw(pci_vobj); + virtio_serial_setup(interface); +} + static void *qvirtio_serial_pci_get_driver(void *object, const char *inter= face) { QVirtioSerialPCI *v_serial =3D object; @@ -76,7 +124,10 @@ static void *virtio_serial_pci_create(void *pci_bus, QG= uestAllocator *t_alloc, =20 virtio_pci_init(&virtio_spci->pci_vdev, pci_bus, addr); interface->vdev =3D &virtio_spci->pci_vdev.vdev; + alloc =3D t_alloc; =20 + obj->destructor =3D qvirtio_serial_pci_destructor; + obj->start_hw =3D qvirtio_serial_pci_start_hw; obj->get_driver =3D qvirtio_serial_pci_get_driver; =20 return obj; diff --git a/tests/qtest/libqos/virtio-serial.h b/tests/qtest/libqos/virtio= -serial.h index 3db43b2bb8..ce6ae164cb 100644 --- a/tests/qtest/libqos/virtio-serial.h +++ b/tests/qtest/libqos/virtio-serial.h @@ -29,6 +29,8 @@ typedef struct QVirtioSerialDevice QVirtioSerialDevice; =20 struct QVirtioSerial { QVirtioDevice *vdev; + int n_queues; + QVirtQueue **queues; }; =20 struct QVirtioSerialPCI { diff --git a/tests/qtest/virtio-serial-test.c b/tests/qtest/virtio-serial-t= est.c index 2541034822..190075d6f5 100644 --- a/tests/qtest/virtio-serial-test.c +++ b/tests/qtest/virtio-serial-test.c @@ -11,6 +11,36 @@ #include "libqtest-single.h" #include "qemu/module.h" #include "libqos/virtio-serial.h" +#include "standard-headers/linux/virtio_console.h" +#include "qemu/iov.h" + +static void virtio_serial_test_cleanup(void *sockets) +{ + int *sv =3D sockets; + + close(sv[0]); + qos_invalidate_command_line(); + close(sv[1]); + g_free(sv); +} + +static void *virtio_serial_test_setup(GString *cmd_line, void *arg) +{ + int ret; + int *sv =3D g_new(int, 3); + + ret =3D socketpair(PF_UNIX, SOCK_STREAM, 0, sv); + g_assert_cmpint(ret, !=3D, -1); + + g_string_append_printf( + cmd_line, + " -chardev socket,fd=3D%d,id=3Dvirtioserial0", + sv[1]); + + sv[2] =3D arg ? 1 : 0; + g_test_queue_destroy(virtio_serial_test_cleanup, sv); + return sv; +} =20 /* Tests only initialization so far. TODO: Replace with functional tests */ static void virtio_serial_nop(void *obj, void *data, QGuestAllocator *allo= c) @@ -18,6 +48,132 @@ static void virtio_serial_nop(void *obj, void *data, QG= uestAllocator *alloc) /* no operation */ } =20 +static void tx_test( + QVirtioDevice *dev, + QGuestAllocator *alloc, + QVirtQueue *vq, + int socket) +{ + QTestState *qts =3D global_qtest; + uint64_t req_addr; + uint64_t free_head; + char test[] =3D "TEST"; + char buffer[5]; + struct iovec iov[] =3D { + { + .iov_base =3D buffer, + .iov_len =3D strlen(test) + } + }; + int ret; + + req_addr =3D guest_alloc(alloc, 4); + qtest_memwrite(qts, req_addr, test, strlen(test)); + + free_head =3D qvirtqueue_add(qts, vq, req_addr, 4, false, false); + qvirtqueue_kick(qts, dev, vq, free_head); + + ret =3D iov_recv(socket, iov, 1, 0, strlen(test)); + g_assert_cmpint(ret, =3D=3D, strlen(test)); + + buffer[strlen(test)] =3D '\0'; + g_assert_cmpstr(buffer, =3D=3D, test); + + guest_free(alloc, req_addr); +} + +static void rx_test( + QVirtioDevice *dev, + QGuestAllocator *alloc, + QVirtQueue *vq, + int socket) +{ + QTestState *qts =3D global_qtest; + uint64_t req_addr; + uint64_t free_head; + char test[] =3D "TEST"; + char buffer[5]; + struct iovec iov[] =3D { + { + .iov_base =3D test, + .iov_len =3D strlen(test) + } + }; + int ret; + + req_addr =3D guest_alloc(alloc, 4); + + free_head =3D qvirtqueue_add(qts, vq, req_addr, 4, true, false); + qvirtqueue_kick(qts, dev, vq, free_head); + + ret =3D iov_send(socket, iov, 1, 0, strlen(test)); + g_assert_cmpint(ret, =3D=3D, strlen(test)); + + qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL, 5 * 1000 * 1000); + qtest_memread(qts, req_addr, buffer, strlen(test)); + + buffer[strlen(test)] =3D '\0'; + g_assert_cmpstr(buffer, =3D=3D, test); + + guest_free(alloc, req_addr); +} + +static void send_recv_test(void *obj, void *data, QGuestAllocator *alloc) +{ + QVirtioSerial *serial_if =3D obj; + QVirtioDevice *dev =3D serial_if->vdev; + uint32_t port_open_addr, port_open_free_head; + int *sv =3D data; + + /* + * the first port is always virtconsole due to backwards compatibility + * consideraitons so we must use the multiport feature to add the corr= ect + * port + */ + QVirtQueue *rx =3D serial_if->queues[sv[2] =3D=3D 0 ? 0 : 4]; + QVirtQueue *tx =3D serial_if->queues[sv[2] =3D=3D 0 ? 1 : 5]; + QVirtQueue *control_tx =3D serial_if->queues[3]; + + port_open_addr =3D guest_alloc(alloc, 8); + + qtest_writel(global_qtest, port_open_addr + 0, sv[2]); + qtest_writew(global_qtest, port_open_addr + 4, VIRTIO_CONSOLE_PORT_REA= DY); + qtest_writew(global_qtest, port_open_addr + 6, 1); + port_open_free_head =3D qvirtqueue_add( + global_qtest, + control_tx, + port_open_addr, + 8, + false, + false); + qvirtqueue_kick( + global_qtest, + dev, + control_tx, + port_open_free_head); + + qtest_writel(global_qtest, port_open_addr + 0, sv[2]); + qtest_writew(global_qtest, port_open_addr + 4, VIRTIO_CONSOLE_PORT_OPE= N); + qtest_writew(global_qtest, port_open_addr + 6, 1); + port_open_free_head =3D qvirtqueue_add( + global_qtest, + control_tx, + port_open_addr, + 8, + false, + false); + qvirtqueue_kick( + global_qtest, + dev, + control_tx, + port_open_free_head); + + guest_free(alloc, port_open_addr); + + tx_test(dev, alloc, tx, sv[0]); + rx_test(dev, alloc, rx, sv[0]); +} + static void serial_hotplug(void *obj, void *data, QGuestAllocator *alloc) { qtest_qmp_device_add(global_qtest, "virtserialport", "hp-port", "{}"); @@ -28,12 +184,29 @@ static void register_virtio_serial_test(void) { QOSGraphTestOptions opts =3D { }; =20 - opts.edge.before_cmd_line =3D "-device virtconsole,bus=3Dvser0.0"; + opts.before =3D virtio_serial_test_setup; + + opts.arg =3D (gpointer)0; + opts.edge.before_cmd_line =3D + "-device virtconsole,bus=3Dvser0.0,chardev=3Dvirtioserial0"; qos_add_test("console-nop", "virtio-serial", virtio_serial_nop, &opts); + qos_add_test( + "console-send-recv", + "virtio-serial", + send_recv_test, + &opts); =20 - opts.edge.before_cmd_line =3D "-device virtserialport,bus=3Dvser0.0"; + opts.arg =3D (gpointer)1; + opts.edge.before_cmd_line =3D + "-device virtserialport,bus=3Dvser0.0,chardev=3Dvirtioserial0"; qos_add_test("serialport-nop", "virtio-serial", virtio_serial_nop, &op= ts); =20 + qos_add_test( + "serialport-send-recv", + "virtio-serial", + send_recv_test, + &opts); + qos_add_test("hotplug", "virtio-serial", serial_hotplug, NULL); } libqos_init(register_virtio_serial_test); --=20 2.34.1