From patchwork Tue Jul 13 22:10:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 474706 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4400631jao; Tue, 13 Jul 2021 15:13:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJywHs4JZghb59YYh/9rrhWucEW/+gd4ir3FvqMRI9yj/Hb3D5zyPj4AQ1lyODtHXrVARjfU X-Received: by 2002:a9f:3526:: with SMTP id o35mr9024469uao.125.1626214403957; Tue, 13 Jul 2021 15:13:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626214403; cv=none; d=google.com; s=arc-20160816; b=CXBcS+C7CvVnDxvbWwMRu6dEHEmH8Yikweq1kCvWlCs6pk+9wswt9rX8h6kfuMD6uH rxLzFOSK1wRPqsVGENzl9E8A5ssZ2L5v4NeBLBG4XEZvZYETKRdZzyMNLCWQicUSsMI4 07dFZdDNe048R5pFMFGgjFaWWc6+Evq5SnVRGSeYrAYTsW1FTV3+xLccB5ergOfxX6gY GZ+d13Ti3ZlZsQbwq5R59u9ClHuuVDJ7yB1PAXwXDToDWc2P7TDuJ+CDtRZ99GD7wPdQ PpPJhMwSuH0zjmHljSxierg26BbbQK0JC3MITZIFXeKP7rfJ0oKKXYHXu6DhhUWW8qlH HGIg== 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-disposition:in-reply-to :mime-version:references:message-id:subject:to:from:date :dkim-signature; bh=eLX+VgoliycDY7YdStrkhro6BU4WBbY46NLKml+nghU=; b=xf0NgEEgtBeZpbSpPu4mQgGLVzfcaujiTqVw+8vwPLpRLK9niuQaTdwM+cuomUwCoC DH9nXP5tMMkFf88/3z3535VHCyQx6LvTIpACgCPcoEpYzYZ+EhW8no4pvY8HtwoEn45t zNHK78FCkLHT0td03/eMBHK5p7i6+HBd8SeSLWyCgtDfXtBBF7UPNDvxSYyxWIHhICrO 1IyGodseMvz1w1AOlPiJywOJPyYjvpMbvPd6YKG6jECUGycmabuBfii88z3ImJDHf40n ve2oSgENOuOATqjRUEhWuW5SHGFgt8HtEtoRgGO71dgqIc5H3eTglFskMnUCwzg8zebr YEmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=AmjupiUI; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v22si172724uaj.40.2021.07.13.15.13.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Jul 2021 15:13:23 -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=@redhat.com header.s=mimecast20190719 header.b=AmjupiUI; 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=redhat.com Received: from localhost ([::1]:42178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3QeZ-0004n7-8G for patch@linaro.org; Tue, 13 Jul 2021 18:13:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3Qbt-0006vl-UQ for qemu-devel@nongnu.org; Tue, 13 Jul 2021 18:10:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:47302) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3Qbs-0007no-3l for qemu-devel@nongnu.org; Tue, 13 Jul 2021 18:10:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626214235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=eLX+VgoliycDY7YdStrkhro6BU4WBbY46NLKml+nghU=; b=AmjupiUIUqoooYzmNrXL0ezqaENZ0ZIKqhP4IL5kipdTeW8u6hWA3TxjuvnN6qVXAgjf/X YX6hYpsDpb50YFzOe+PYt/45HrB67RN7m7j1gXbLpSLtdvHcbkw3HBBTe41s+ZGHECiqcw tTKFSjWO0toL6GN0wNMeLxG3Kvg15rA= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-379-sX_8-amNOpyT8qD3Zi5LPA-1; Tue, 13 Jul 2021 18:10:34 -0400 X-MC-Unique: sX_8-amNOpyT8qD3Zi5LPA-1 Received: by mail-wm1-f71.google.com with SMTP id j141-20020a1c23930000b0290212502cb19aso158219wmj.0 for ; Tue, 13 Jul 2021 15:10:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=eLX+VgoliycDY7YdStrkhro6BU4WBbY46NLKml+nghU=; b=C4F2srtPOO/V6knECowZke38JAxkHVVmNV/Mbi4uUQtbiwIByY4mWHtj0noYDPUrNp wyMTRvjaGI3iOIgIGszu0l4wYwOY+D3lxdoNhVvKt1S6FRIZ2BCLVzq4ddQZoJtjaiCR tRM5UN8Wq2alcAUu+Y63OFFuK9koXUZUrfLkWbc7hnVoTaJd1ZzmE1euYFOmqy3kWao2 LGnP2dQMK4ZRA6z+jmupJTH7QJpamcEozAOCkns4l/TDhwY+IuQWL7p9GY8ogywXDx33 fBnAntsvT5jFpZfpcoaUnet0J5KF2rZg6/zj2i/Orr8XvneMlLPH/ioP4QFUQWwuklec 1B8A== X-Gm-Message-State: AOAM5335W3c9wLQIYPxNCDLbIcBWkauXnx4bLsorjqweVAzBTf8+YVZF CYGPpCmM/iOl9a9vbFyUi6lFudzuNwXSIH0t3l4QNp9lEhcmzhtAqAj2jMgZTOY+04HunEnnzNV 2dmxZ4J1EpbWEPdogFyUbw4lB+tT9Nn0/c9Z3Z/NO0uDqq2rxentiMlLgPgGy X-Received: by 2002:a05:6000:186e:: with SMTP id d14mr8324503wri.188.1626214232629; Tue, 13 Jul 2021 15:10:32 -0700 (PDT) X-Received: by 2002:a05:6000:186e:: with SMTP id d14mr8324479wri.188.1626214232350; Tue, 13 Jul 2021 15:10:32 -0700 (PDT) Received: from redhat.com ([2.55.15.23]) by smtp.gmail.com with ESMTPSA id p8sm2301318wmc.24.2021.07.13.15.10.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jul 2021 15:10:31 -0700 (PDT) Date: Tue, 13 Jul 2021 18:10:29 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 08/23] vhost-user-rng-pci: Add vhost-user-rng-pci implementation Message-ID: <20210713220946.212562-9-mst@redhat.com> References: <20210713220946.212562-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210713220946.212562-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Peter Maydell , Mathieu Poirier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Mathieu Poirier 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 Message-Id: <20210710005929.1702431-3-mathieu.poirier@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/vhost-user-rng-pci.c | 79 ++++++++++++++++++++++++++++++++++ hw/virtio/meson.build | 1 + 2 files changed, 80 insertions(+) create mode 100644 hw/virtio/vhost-user-rng-pci.c -- MST diff --git a/hw/virtio/vhost-user-rng-pci.c b/hw/virtio/vhost-user-rng-pci.c new file mode 100644 index 0000000000..ffff2de39f --- /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); diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index e386791f2a..1430b370e6 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'))