From patchwork Sat Jul 10 00:59:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 472314 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp803451jao; Fri, 9 Jul 2021 18:01:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0gFet0ce6/DP6NIJbkRsLewsYR/rnwdR6edvjLl2r536G7f5l+5gDZiP94NZVhrCemJ6Y X-Received: by 2002:ab0:72d8:: with SMTP id g24mr22376383uap.115.1625878888458; Fri, 09 Jul 2021 18:01:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625878888; cv=none; d=google.com; s=arc-20160816; b=vbIPMnhf2uavH+dAWwi10JqSL3IoeoEVVRbuQRmZYDMPHVqJAbQEMafWiB4sv8fLnT ejUsBA1DpzG8jXn3g4tLJ8gO79u1BwCBMUiw6uboi+KerOq4FxKzm46x0QVMH5p641QC hzy6j7ZDyud/R37UzITO/Ap2DCZMYzkCkotXSyZBq4hB9Mnl0rtyafuqSa8UPFfkadKF J71otdQ/QWr9ko9P1pidGA6BFDnqLmTtTmtYVP/ZULAdzEX4MBNke/DUfIZsInoHMmbl bGXseT24nhIWCVmMmEdwB3leBO3NY3Yy62UMj1I59yzf6u7XsUaqcJYs9bLARCpRQGoK ChJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=S/O1M1xy8qnEH5DkM7qojc/M8Nl3BQRdLguDgKBWfTs=; b=Wn4w0OUBdd2HI/il3EgI3lFdRfCmgZg4Dw2PljnD6iQlD+DzUzP4590ZBsekyMhqj4 PD6zRTFopH/nk0kKuWjG2t+Zeus3S0+Jpky6r9zQISm7jTVhjzORVRdniNvtkZiw4Ox5 tqyDRoywB3JG8u9mkADyQo5Ytw9IAGLdSEND37Uk3buJ6xfqhTGoUmP1tIAn/XrA+yS3 nOxdcKTQzpOtJNGQEPypkdHSQjak2seSB2YjROOej1mcINckZoTZiqRfa/U7YCf3aYr9 3e6pk8OdY2jTe+tNzM9bGUhzdUsi0TxzgskOTLQufdQRHGu0loB1yqlDUIzSDQLojaTR +awg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cTWOoiDu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x7si9693981uar.173.2021.07.09.18.01.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 09 Jul 2021 18:01:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cTWOoiDu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m21N1-00017c-NL for patch@linaro.org; Fri, 09 Jul 2021 21:01:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m21LE-000138-Uq for qemu-devel@nongnu.org; Fri, 09 Jul 2021 20:59:36 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]:38791) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m21LD-0005cI-B9 for qemu-devel@nongnu.org; Fri, 09 Jul 2021 20:59:36 -0400 Received: by mail-pj1-x102f.google.com with SMTP id cs1-20020a17090af501b0290170856e1a8aso9200481pjb.3 for ; Fri, 09 Jul 2021 17:59:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S/O1M1xy8qnEH5DkM7qojc/M8Nl3BQRdLguDgKBWfTs=; b=cTWOoiDuwJb6mWBxpCNxVx4PRab9shfbdyjfjCF3sShoeIiC6FBBPkV1rvjLHAWdc6 FTf+7XtoW3Hz0slu8/7JrZOoeiyRUg7uTqD/isbMZeuFCowgPlJKn0O+HGH+annQLKg1 nXX8tINp3tbIEY1ydly6QgHKeFrZfO73Wj9jgboG1pKcTTOtINYsWDTf3xJr2d/g3RTZ E1QCy+GW1gARXc8LXzI8aku2XgT/eK6WSfMiygUjjO5sRZtRZYXJoKv4fML1BiyxDtD5 0w9ShKQ4nxgWplNg3+eyyd18CQS1EDnqrohUB+0KSdZHmzOk33Sa/X7hZtpHwiwzrRTA fIHQ== 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:mime-version:content-transfer-encoding; bh=S/O1M1xy8qnEH5DkM7qojc/M8Nl3BQRdLguDgKBWfTs=; b=pL+49roPOm6m0srqaI6wJzk8WKEQCmmwGC+fBCcQRhYIxqkCjb/UG9PBYSYSLTmEUo 3Pt7dp6etW2kojSxzd3I5jDKsxiQxWSRTc0RfcVIXNbk3oXmhjOJwx+qfZKJXcbXV+ZD ThCCErCKbHfVnpslTSeB+6ENJCtU1bhHNhe20nRDpJo16K7cJESfNwtjM5HLGSR79KS3 3T35Aq4ewxroEGFTVg54bh2M74kmvjQ7wKrP9t8hN/M78+GWP4IbzLF59/ln6uBFELrd rWZYRc8tiTwd3bDwPAkm/tNyvgyXEbdzwM9kjAcCoL3VnvImXSKfyKY+U+E085Yhb5jS zanQ== X-Gm-Message-State: AOAM531MDQGksP7Tniy9QebPE4eY97Ljk1htp8mR/lay2vVzOHYe/wWx iYt8cqvsCFYc3IMk/F1Cf3nctw== X-Received: by 2002:a17:90b:1097:: with SMTP id gj23mr18228658pjb.65.1625878773987; Fri, 09 Jul 2021 17:59:33 -0700 (PDT) Received: from p14s.cg.shawcable.net (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id w2sm6420932pjq.5.2021.07.09.17.59.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 17:59:33 -0700 (PDT) From: Mathieu Poirier To: mst@redhat.com, alex.bennee@linaro.org Subject: [PATCH v3 2/4] vhost-user-rng-pci: Add vhost-user-rng-pci implementation Date: Fri, 9 Jul 2021 18:59:27 -0600 Message-Id: <20210710005929.1702431-3-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210710005929.1702431-1-mathieu.poirier@linaro.org> References: <20210710005929.1702431-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=mathieu.poirier@linaro.org; helo=mail-pj1-x102f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This patch provides a PCI bus interface to the vhost-user-rng backed. The implentation is similar to what was done for vhost-user-i2c-pci and vhost-user-fs-pci. Signed-off-by: Mathieu Poirier --- hw/virtio/meson.build | 1 + hw/virtio/vhost-user-rng-pci.c | 79 ++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 hw/virtio/vhost-user-rng-pci.c -- 2.25.1 Reviewed-by: Alex Bennée diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index e386791f2a05..1430b370e64d 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -26,6 +26,7 @@ virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng.c')) virtio_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu.c')) virtio_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem.c')) virtio_ss.add(when: 'CONFIG_VHOST_USER_RNG', if_true: files('vhost-user-rng.c')) +virtio_ss.add(when: ['CONFIG_VHOST_USER_RNG', 'CONFIG_VIRTIO_PCI'], if_true: files('vhost-user-rng-pci.c')) virtio_pci_ss = ss.source_set() virtio_pci_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-pci.c')) diff --git a/hw/virtio/vhost-user-rng-pci.c b/hw/virtio/vhost-user-rng-pci.c new file mode 100644 index 000000000000..ffff2de39fd4 --- /dev/null +++ b/hw/virtio/vhost-user-rng-pci.c @@ -0,0 +1,79 @@ +/* + * Vhost-user RNG virtio device PCI glue + * + * Copyright (c) 2021 Mathieu Poirier + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "hw/qdev-properties.h" +#include "hw/virtio/vhost-user-rng.h" +#include "virtio-pci.h" + +struct VHostUserRNGPCI { + VirtIOPCIProxy parent_obj; + VHostUserRNG vdev; +}; + +typedef struct VHostUserRNGPCI VHostUserRNGPCI; + +#define TYPE_VHOST_USER_RNG_PCI "vhost-user-rng-pci-base" + +DECLARE_INSTANCE_CHECKER(VHostUserRNGPCI, VHOST_USER_RNG_PCI, + TYPE_VHOST_USER_RNG_PCI) + +static Property vhost_user_rng_pci_properties[] = { + DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, + DEV_NVECTORS_UNSPECIFIED), + DEFINE_PROP_END_OF_LIST(), +}; + +static void vhost_user_rng_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) +{ + VHostUserRNGPCI *dev = VHOST_USER_RNG_PCI(vpci_dev); + DeviceState *vdev = DEVICE(&dev->vdev); + + if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) { + vpci_dev->nvectors = 1; + } + + qdev_realize(vdev, BUS(&vpci_dev->bus), errp); +} + +static void vhost_user_rng_pci_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass); + PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass); + k->realize = vhost_user_rng_pci_realize; + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); + device_class_set_props(dc, vhost_user_rng_pci_properties); + pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET; + pcidev_k->device_id = 0; /* Set by virtio-pci based on virtio id */ + pcidev_k->revision = 0x00; + pcidev_k->class_id = PCI_CLASS_COMMUNICATION_OTHER; +} + +static void vhost_user_rng_pci_instance_init(Object *obj) +{ + VHostUserRNGPCI *dev = VHOST_USER_RNG_PCI(obj); + + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), + TYPE_VHOST_USER_RNG); +} + +static const VirtioPCIDeviceTypeInfo vhost_user_rng_pci_info = { + .base_name = TYPE_VHOST_USER_RNG_PCI, + .non_transitional_name = "vhost-user-rng-pci", + .instance_size = sizeof(VHostUserRNGPCI), + .instance_init = vhost_user_rng_pci_instance_init, + .class_init = vhost_user_rng_pci_class_init, +}; + +static void vhost_user_rng_pci_register(void) +{ + virtio_pci_types_register(&vhost_user_rng_pci_info); +} + +type_init(vhost_user_rng_pci_register);