From nobody Wed Nov 5 10:47:35 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 1534156115991659.2907766167319; Mon, 13 Aug 2018 03:28:35 -0700 (PDT) Received: from localhost ([::1]:38586 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpA5S-0002Ii-M9 for importer@patchew.org; Mon, 13 Aug 2018 06:28:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fp9sw-0007UX-NA for qemu-devel@nongnu.org; Mon, 13 Aug 2018 06:15:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fp9sv-0002Q0-3a for qemu-devel@nongnu.org; Mon, 13 Aug 2018 06:15:38 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:35274) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fp9su-0002OV-LV; Mon, 13 Aug 2018 06:15:37 -0400 Received: by mail-ed1-x543.google.com with SMTP id e6-v6so7968583edr.2; Mon, 13 Aug 2018 03:15:36 -0700 (PDT) Received: from localhost.localdomain ([194.230.159.125]) by smtp.gmail.com with ESMTPSA id s27-v6sm11670006edb.73.2018.08.13.03.15.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Aug 2018 03:15:34 -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=WM6lsvBfapYpMUkVkCVzfwVFf/q99oyBLQoJxPtZviE=; b=HzLH4mB/qaKVGcAoLe45IAz2coRCAg05dfmeeIGn/hyh1fm01yiSATVyFLA1p/1C+I ucYsN4Vynbr0hDoP0qrTmNcHJcHhTDf98sdU7SxgBmWps9Fv/bVRKealCkxb4in5xQ6n O+Hvcq4M3rSNUbMprMnKGS91KJ/11MavZTUHz3kK0s9Hk5cB4pVq07iEs3mj0SzLl4WX HhB7qg/bGREUaJ4kdN28Xh3eMSfY/QRZEfIMxB21jyEdc36TWJt+Z0HIT6qBKRY3cJqC KVQ7xYKJGvqhgavoH5oq2/DqCP32Gb1YCgthtp3Qg2MJ9WvSI0JbhKhAyrLF8annclNm DerQ== 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=WM6lsvBfapYpMUkVkCVzfwVFf/q99oyBLQoJxPtZviE=; b=erkqLHjnT62uKQg4qNKDDBYhmUQy0DGXCUeNxmFpXlQ+9tsP+uDw3Y+YmmZX3THeQD MBXF7yFtu52/9lcQdV0+32WnyRDa2Y6Wzh+YcQASycjqTqea6WwHg4GSqcmErjWrr+60 wlN1pBXLB5jYkoB+3PFJHdpJGLgZtCGemkjZdHRQdbB9owW16tqzOiiPVRxN7Wuahn0f YE3b7pwhV1KlwXbdL12FiJXEgAPLHirYVzIk0HK2UWOiJ4Ggz/NkZPSW79rozewO34Xl AJQr7t8unx4ubwj5Iezisc3ZN6qW3QQj2/Oppa7q79WSDvB/YOficzOty+r7HtucoWRE nmKA== X-Gm-Message-State: AOUpUlF+tcgI+M36U2UaUASOTKs0hJNXRKEBRSwul50D6SU2BXDOM9HS ojHDEg1iOWVR7nEuQVp63lEKM7Hxy7Y= X-Google-Smtp-Source: AA+uWPynrSGNfRun6DpIZnCQDz5IG3cC1NIgZtic6wxYJzDR6AIZL3ZJUOd9dsD3kBp4TG0hW6KcbA== X-Received: by 2002:aa7:c306:: with SMTP id l6-v6mr21027815edq.53.1534155335336; Mon, 13 Aug 2018 03:15:35 -0700 (PDT) From: Emanuele Giuseppe Esposito To: qemu-devel@nongnu.org Date: Mon, 13 Aug 2018 12:14:34 +0200 Message-Id: <20180813101453.10200-15-e.emanuelegiuseppe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180813101453.10200-1-e.emanuelegiuseppe@gmail.com> References: <20180813101453.10200-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 14/33] tests/qgraph: virtio-pci driver and interface nodes 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 , Fam Zheng , qemu-block@nongnu.org, "Michael S. Tsirkin" , Jason Wang , Amit Shah , Emanuele Giuseppe Esposito , Alexander Graf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Greg Kurz , qemu-ppc@nongnu.org, Gerd Hoffmann , Stefan Hajnoczi , Paolo Bonzini , John Snow , David Gibson 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" Add QOSGraphObject to QVirtioPCIDevice structure, with a basic constructor. virtio-pci is not present in qgraph, since it will be used as starting point by its subclasses (virtio-*-pci) Signed-off-by: Emanuele Giuseppe Esposito --- tests/Makefile.include | 2 +- tests/libqos/virtio-pci.c | 80 +++++++++++++++++++++++++++++++-------- tests/libqos/virtio-pci.h | 12 ++++++ 3 files changed, 77 insertions(+), 17 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index e18796d8d8..5220136473 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -771,7 +771,7 @@ libqgraph-machines-obj-y =3D tests/libqos/x86_64_pc-mac= hine.o libqgraph-machines-obj-y +=3D tests/libqos/raspi2-machine.o libqgraph-machines-obj-y +=3D tests/libqos/ppc64_pseries-machine.o =20 -libqgraph-pci-obj-y =3D $(libqos-pc-obj-y) $(libqos-spapr-obj-y) +libqgraph-pci-obj-y =3D $(libqos-virtio-obj-y) libqgraph-pci-obj-y +=3D $(libqgraph-machines-obj-y) libqgraph-pci-obj-y +=3D tests/libqos/sdhci.o libqgraph-pci-obj-y +=3D tests/libqos/e1000e.o diff --git a/tests/libqos/virtio-pci.c b/tests/libqos/virtio-pci.c index 550dede0a2..86860c47c8 100644 --- a/tests/libqos/virtio-pci.c +++ b/tests/libqos/virtio-pci.c @@ -15,12 +15,26 @@ #include "libqos/pci-pc.h" #include "libqos/malloc.h" #include "libqos/malloc-pc.h" +#include "libqos/qgraph.h" #include "standard-headers/linux/virtio_ring.h" #include "standard-headers/linux/virtio_pci.h" =20 #include "hw/pci/pci.h" #include "hw/pci/pci_regs.h" =20 +/* 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 + * reached by any edge, not even as a "contains" edge. + * In facts, every device is a QVirtioPCIDevice with + * additional fields, since every one has its own + * number of queues and various attributes. + * Virtio-pci provides default functions to start the + * hw and destroy the object, and nodes that want to + * override them should always remember to call the + * original qvirtio_pci_destructor and qvirtio_pci_start_hw. + */ + typedef struct QVirtioPCIForeachData { void (*func)(QVirtioDevice *d, void *data); uint16_t device_type; @@ -32,7 +46,6 @@ typedef struct QVirtioPCIForeachData { void qvirtio_pci_device_free(QVirtioPCIDevice *dev) { g_free(dev->pdev); - g_free(dev); } =20 static QVirtioPCIDevice *qpcidevice_to_qvirtiodevice(QPCIDevice *pdev) @@ -76,7 +89,7 @@ static void qvirtio_pci_assign_device(QVirtioDevice *d, v= oid *data) =20 static uint8_t qvirtio_pci_config_readb(QVirtioDevice *d, uint64_t off) { - QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; + QVirtioPCIDevice *dev =3D container_of(d, QVirtioPCIDevice, vdev); return qpci_io_readb(dev->pdev, dev->bar, CONFIG_BASE(dev) + off); } =20 @@ -90,7 +103,7 @@ static uint8_t qvirtio_pci_config_readb(QVirtioDevice *d= , uint64_t off) =20 static uint16_t qvirtio_pci_config_readw(QVirtioDevice *d, uint64_t off) { - QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; + QVirtioPCIDevice *dev =3D container_of(d, QVirtioPCIDevice, vdev); uint16_t value; =20 value =3D qpci_io_readw(dev->pdev, dev->bar, CONFIG_BASE(dev) + off); @@ -102,7 +115,7 @@ static uint16_t qvirtio_pci_config_readw(QVirtioDevice = *d, uint64_t off) =20 static uint32_t qvirtio_pci_config_readl(QVirtioDevice *d, uint64_t off) { - QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; + QVirtioPCIDevice *dev =3D container_of(d, QVirtioPCIDevice, vdev); uint32_t value; =20 value =3D qpci_io_readl(dev->pdev, dev->bar, CONFIG_BASE(dev) + off); @@ -114,7 +127,7 @@ static uint32_t qvirtio_pci_config_readl(QVirtioDevice = *d, uint64_t off) =20 static uint64_t qvirtio_pci_config_readq(QVirtioDevice *d, uint64_t off) { - QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; + QVirtioPCIDevice *dev =3D container_of(d, QVirtioPCIDevice, vdev); uint64_t val; =20 val =3D qpci_io_readq(dev->pdev, dev->bar, CONFIG_BASE(dev) + off); @@ -127,37 +140,37 @@ static uint64_t qvirtio_pci_config_readq(QVirtioDevic= e *d, uint64_t off) =20 static uint32_t qvirtio_pci_get_features(QVirtioDevice *d) { - QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; + QVirtioPCIDevice *dev =3D container_of(d, QVirtioPCIDevice, vdev); return qpci_io_readl(dev->pdev, dev->bar, VIRTIO_PCI_HOST_FEATURES); } =20 static void qvirtio_pci_set_features(QVirtioDevice *d, uint32_t features) { - QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; + QVirtioPCIDevice *dev =3D container_of(d, QVirtioPCIDevice, vdev); qpci_io_writel(dev->pdev, dev->bar, VIRTIO_PCI_GUEST_FEATURES, feature= s); } =20 static uint32_t qvirtio_pci_get_guest_features(QVirtioDevice *d) { - QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; + QVirtioPCIDevice *dev =3D container_of(d, QVirtioPCIDevice, vdev); return qpci_io_readl(dev->pdev, dev->bar, VIRTIO_PCI_GUEST_FEATURES); } =20 static uint8_t qvirtio_pci_get_status(QVirtioDevice *d) { - QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; + QVirtioPCIDevice *dev =3D container_of(d, QVirtioPCIDevice, vdev); return qpci_io_readb(dev->pdev, dev->bar, VIRTIO_PCI_STATUS); } =20 static void qvirtio_pci_set_status(QVirtioDevice *d, uint8_t status) { - QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; + QVirtioPCIDevice *dev =3D container_of(d, QVirtioPCIDevice, vdev); qpci_io_writeb(dev->pdev, dev->bar, VIRTIO_PCI_STATUS, status); } =20 static bool qvirtio_pci_get_queue_isr_status(QVirtioDevice *d, QVirtQueue = *vq) { - QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; + QVirtioPCIDevice *dev =3D container_of(d, QVirtioPCIDevice, vdev); QVirtQueuePCI *vqpci =3D (QVirtQueuePCI *)vq; uint32_t data; =20 @@ -182,7 +195,7 @@ static bool qvirtio_pci_get_queue_isr_status(QVirtioDev= ice *d, QVirtQueue *vq) =20 static bool qvirtio_pci_get_config_isr_status(QVirtioDevice *d) { - QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; + QVirtioPCIDevice *dev =3D container_of(d, QVirtioPCIDevice, vdev); uint32_t data; =20 if (dev->pdev->msix_enabled) { @@ -206,19 +219,19 @@ static bool qvirtio_pci_get_config_isr_status(QVirtio= Device *d) =20 static void qvirtio_pci_queue_select(QVirtioDevice *d, uint16_t index) { - QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; + QVirtioPCIDevice *dev =3D container_of(d, QVirtioPCIDevice, vdev); qpci_io_writeb(dev->pdev, dev->bar, VIRTIO_PCI_QUEUE_SEL, index); } =20 static uint16_t qvirtio_pci_get_queue_size(QVirtioDevice *d) { - QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; + QVirtioPCIDevice *dev =3D container_of(d, QVirtioPCIDevice, vdev); return qpci_io_readw(dev->pdev, dev->bar, VIRTIO_PCI_QUEUE_NUM); } =20 static void qvirtio_pci_set_queue_address(QVirtioDevice *d, uint32_t pfn) { - QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; + QVirtioPCIDevice *dev =3D container_of(d, QVirtioPCIDevice, vdev); qpci_io_writel(dev->pdev, dev->bar, VIRTIO_PCI_QUEUE_PFN, pfn); } =20 @@ -270,7 +283,7 @@ static void qvirtio_pci_virtqueue_cleanup(QVirtQueue *v= q, =20 static void qvirtio_pci_virtqueue_kick(QVirtioDevice *d, QVirtQueue *vq) { - QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; + QVirtioPCIDevice *dev =3D container_of(d, QVirtioPCIDevice, vdev); qpci_io_writew(dev->pdev, dev->bar, VIRTIO_PCI_QUEUE_NOTIFY, vq->index= ); } =20 @@ -294,6 +307,7 @@ const QVirtioBus qvirtio_pci =3D { .virtqueue_kick =3D qvirtio_pci_virtqueue_kick, }; =20 +/* TODO: delete this once qgraph is completed */ static void qvirtio_pci_foreach(QPCIBus *bus, uint16_t device_type, bool has_slot, int slot, void (*func)(QVirtioDevice *d, void *data), void *data) @@ -416,3 +430,37 @@ void qvirtio_pci_set_msix_configuration_vector(QVirtio= PCIDevice *d, vector =3D qpci_io_readw(d->pdev, d->bar, VIRTIO_MSI_CONFIG_VECTOR); g_assert_cmphex(vector, !=3D, VIRTIO_MSI_NO_VECTOR); } + +void qvirtio_pci_destructor(QOSGraphObject *obj) +{ + QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)obj; + qvirtio_pci_device_disable(dev); + qvirtio_pci_device_free(dev); +} + +void qvirtio_pci_start_hw(QOSGraphObject *obj) +{ + QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)obj; + qvirtio_pci_device_enable(dev); + qvirtio_start_device(&dev->vdev); +} + +void virtio_pci_init(QVirtioPCIDevice *dev, QPCIBus *bus, QPCIAddress * ad= dr) +{ + QPCIDevice *pci_dev; + QVirtioPCIDevice *tmp; + + pci_dev =3D qpci_device_find(bus, addr->devfn); + g_assert_nonnull(pci_dev); + tmp =3D qpcidevice_to_qvirtiodevice(pci_dev); + memcpy(dev, tmp, sizeof(QVirtioPCIDevice)); + dev->pdev =3D pci_dev; + dev->vdev.bus =3D &qvirtio_pci; + + /* each virtio-xxx-pci device should override at least this function */ + dev->obj.get_driver =3D NULL; + dev->obj.start_hw =3D qvirtio_pci_start_hw; + dev->obj.destructor =3D qvirtio_pci_destructor; + + g_free(tmp); +} diff --git a/tests/libqos/virtio-pci.h b/tests/libqos/virtio-pci.h index 6ef19094cb..8b619c5133 100644 --- a/tests/libqos/virtio-pci.h +++ b/tests/libqos/virtio-pci.h @@ -12,8 +12,10 @@ =20 #include "libqos/virtio.h" #include "libqos/pci.h" +#include "libqos/qgraph.h" =20 typedef struct QVirtioPCIDevice { + QOSGraphObject obj; QVirtioDevice vdev; QPCIDevice *pdev; QPCIBar bar; @@ -31,10 +33,20 @@ typedef struct QVirtQueuePCI { =20 extern const QVirtioBus qvirtio_pci; =20 +void virtio_pci_init(QVirtioPCIDevice *dev, QPCIBus *bus, QPCIAddress * ad= dr); QVirtioPCIDevice *qvirtio_pci_device_find(QPCIBus *bus, uint16_t device_ty= pe); QVirtioPCIDevice *qvirtio_pci_device_find_slot(QPCIBus *bus, uint16_t device_type, int s= lot); void qvirtio_pci_device_free(QVirtioPCIDevice *dev); +/* virtio-pci object functions available for subclasses that + * override the original start_hw and destroy + * function. All virtio-xxx-pci subclass that override must + * take care of calling these two functions in the respective + * places + */ +void qvirtio_pci_destructor(QOSGraphObject *obj); +void qvirtio_pci_start_hw(QOSGraphObject *obj); + =20 void qvirtio_pci_device_enable(QVirtioPCIDevice *d); void qvirtio_pci_device_disable(QVirtioPCIDevice *d); --=20 2.17.1