From patchwork Wed Oct 20 10:20:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 516001 Delivered-To: patch@linaro.org Received: by 2002:adf:a11e:0:0:0:0:0 with SMTP id o30csp1637037wro; Wed, 20 Oct 2021 03:48:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxah9P/BNN+mr0X3uSq4HaaDinuiWPXXYTiS+8/rBkT+LWIY7Yce4qe0TM60CE1c8bbLpWV X-Received: by 2002:ab0:3010:: with SMTP id f16mr6081659ual.11.1634726922250; Wed, 20 Oct 2021 03:48:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634726922; cv=none; d=google.com; s=arc-20160816; b=BQcwYKkmfMuPun3YTtk2OL8aiIiloBghStRgRew8SutJejk48GaLd58w3V3/gwJNgk 613aElakHt0bMXRtHbhJw2dCN+9kPKO4vhM7mr1tXPdyuTw0z+umEQmcKQzPJsfvWxlo XovQfj593YHN0eHrpEQD29M70MMhHVcr2cZJQrxW2wxEECvoSvM7rFZekitK40Ooa3vS LRiQwOERw1gZ+4zFdEWbHxKwmZwbbLgiLr7akmIioPQVz/b7EsuvEmwzlxPJ4Q2NaOqf J9gMQD1FjAPRcjwLKSsxePBmg0219IDVV+bBeXmJREbSwMqCAsGIGgUXn8azmQYkzziJ tX8A== 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 :content-disposition:in-reply-to:mime-version:references:message-id :subject:to:from:date:dkim-signature; bh=jYEn3VZIxvZ4Dxo5UlkZgMWK5p2ofZWjA/KPLo/RDe4=; b=UJ1xWoJ6gR2Ss/ak3BeQp/0fLC+jWcXFCrYXJzx62RFzKljvtblITM95mfvsYNwxgG cF81Qwvv8bruOAFo4D7vNEonTUYgONzALrBUszXkMz5947QBdzTkGJq1y5sJrhphlCgz N+ipp7LzFUbnRJ7/gFEz2/ZTHtq7ixW5y+gzEZtkH33DAw6mORNfsLP8dMWQAqgzHS2s rJC9TBP0biQzqAGZyG5L1vyszS3OqKLjxRyPvxzNCLJ1QxOO1wjAjme9mkvcF9w1bGfJ R6ZbcboWEOODW5ea3n7S0+vxiu5z7rJolPb6kLD0O4OhUTPmNNUHl4oEKnjAjEW82kTy MAKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=Y7JvgTub; 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=fail (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 u6si1814482vsj.273.2021.10.20.03.48.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Oct 2021 03:48:42 -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=fail header.i=@redhat.com header.s=mimecast20190719 header.b=Y7JvgTub; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:40810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1md99F-00005p-JO for patch@linaro.org; Wed, 20 Oct 2021 06:48:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48352) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1md8ht-0004TC-Ih for qemu-devel@nongnu.org; Wed, 20 Oct 2021 06:20:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:49613) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1md8hr-0003Sv-Mr for qemu-devel@nongnu.org; Wed, 20 Oct 2021 06:20:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634725223; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jYEn3VZIxvZ4Dxo5UlkZgMWK5p2ofZWjA/KPLo/RDe4=; b=Y7JvgTubUZlnqNhLspX2xTzgWIcPOEztlxo0oONgSQyToP+k1R1GokEGTrJDMBISFo6Ldo VBlaz0aVN52DmbsoenA40N5qb3dW/tUY44M1RxiLB+QVerG6gScknN0NXURAfwJxRbFjXH SuSYJ/evFzIznAb+OW13I/0T7yey/BU= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-540-1_EMN9N1MxSigoTpv_HveQ-1; Wed, 20 Oct 2021 06:20:21 -0400 X-MC-Unique: 1_EMN9N1MxSigoTpv_HveQ-1 Received: by mail-ed1-f69.google.com with SMTP id r25-20020a05640216d900b003dca3501ab4so4076734edx.15 for ; Wed, 20 Oct 2021 03:20:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=jYEn3VZIxvZ4Dxo5UlkZgMWK5p2ofZWjA/KPLo/RDe4=; b=8QGUkDXf5pTl3cBktLYvQn+lO5zZ4daZ+8cphAPHUjBVtH8ZY+19FFbYCMY1/qIX/f PYb2zRQQ9mjlYEZUjq5MWqV1DAJg15ITesNKLx+OwNd62iaQ0vKW05jOi9CA1nlwG3Z2 obH89m7LXkiz5Di9+Y9QBxH+6+1frtRzZumjVfHI3r+jHubEQz21TjQHoEsuPj8X84PG aHY7KDOyg/a5+wSygQPRgzdEGdT4PHgmzw0I0gOhFwqdMZGd9vs8cwFc2RLNR+HL5jfW YRbIFiPsP5ZKn0iT22DAkQfpC5MQr2+KzygtrTrCFvSALRbFUbXEkTDeGO4IcE4CThEG 5KLg== X-Gm-Message-State: AOAM530R+G1LrVEokAHS7VAemIjdezwKNQMHLaPspFvp1UTvPUt/vISa n+0DkKZrR1B1BlOn9XJL1M3ZfIrDv7OcCzhkVQ0vkVGnvxwRD5h4G4pqY8zkBVtQ3Ol6tgX19RC 6D1f4tQ8/nbcp/ah3ri+vcQFaBCFAL78fvHJQGLw6sH1tLXaNNXp+UHJn6dBb X-Received: by 2002:a05:6402:3509:: with SMTP id b9mr60813697edd.187.1634725220375; Wed, 20 Oct 2021 03:20:20 -0700 (PDT) X-Received: by 2002:a05:6402:3509:: with SMTP id b9mr60813667edd.187.1634725220155; Wed, 20 Oct 2021 03:20:20 -0700 (PDT) Received: from redhat.com ([2.55.24.172]) by smtp.gmail.com with ESMTPSA id w1sm415196edd.17.2021.10.20.03.20.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Oct 2021 03:20:19 -0700 (PDT) Date: Wed, 20 Oct 2021 06:20:17 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v2 23/44] vhost-user-rng-pci: Add vhost-user-rng-pci implementation Message-ID: <20211020101844.988480-24-mst@redhat.com> References: <20211020101844.988480-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20211020101844.988480-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=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-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 , Alex =?utf-8?q?Benn=C3=A9e?= , 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 backend. Reviewed-by: Alex Bennée Signed-off-by: Mathieu Poirier Message-Id: <20211012205904.4106769-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..c83dc86813 --- /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_OTHERS; +} + +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 ae6b2cde10..521f7d64a8 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -28,6 +28,7 @@ virtio_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem.c')) virtio_ss.add(when: 'CONFIG_VHOST_USER_I2C', if_true: files('vhost-user-i2c.c')) virtio_ss.add(when: ['CONFIG_VIRTIO_PCI', 'CONFIG_VHOST_USER_I2C'], if_true: files('vhost-user-i2c-pci.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'))