From patchwork Tue Oct 19 11:20:46 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: 515952 Delivered-To: patch@linaro.org Received: by 2002:ac0:cd8c:0:0:0:0:0 with SMTP id d12csp552480imp; Tue, 19 Oct 2021 04:48:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0PukjYhHJxTFJR0/WDmJMsdcOb197XWrZLBY03x70ueRRi4kCxuMKryjqmvLIoARdkeht X-Received: by 2002:a05:6122:ca5:: with SMTP id ba37mr8457328vkb.13.1634644109321; Tue, 19 Oct 2021 04:48:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634644109; cv=none; d=google.com; s=arc-20160816; b=s7h8Wan2Pu+u0E5W5ugc+lTBNTs4cvDH98ap6A4g7eKScZOWnGs11glK3udZ3Xm33D 0QIXc48pM1W1yaMqNiPKcBgungNUR9TQGD8nVoAAl0MupMfopezI43Y0QsntZEIrZ6JL +MHB7nzdCsOPfN8sduUuSI219K4BFntL/4iGXKjfsDpKNsnf5vioyXyNQjhXSAA7PBc+ 5V2dtuRvnOc0RGYP7rlbb7OskyuHbI8+Oy/xKWKfmI1Sxe/TLMpoFNwFAhbLSD5VLJ6L yjydhlvgpOTvNbJIZYW/sKIMpPaXyNxrarDF7wkmoP3/mehRfGIVUMopQwsw/PNvarZ/ HPTA== 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=E2xfg0vd6yk92EAWfN+Ycvpdbtpqnd7s0OtO3e9vzKmZ8egXXhSgyoxldKLROdjXm9 KOBRy+Vx4MH8S0V9iLmkz7UgswJLShn0Qm38kGsX3jGJ+MylEEe0cOOoTVxL1Aq9pCDn JF4zpxrla8RGoKMwnGbKEsd6UNrUr1lGYmdqerVundNlTQdSD9caoYZ1/KIvEXSOhCiN Ov7siVBfrYbfewB27jTxafdwHGNzS/4XLPJEcC2VKORAHuArNkrwGG9Jux4/IV8HLXX9 RyBM9f8UNL4Vpx9HPGrZx1esDIbaQ2Vv2+I63gL2xCf0ShOOqMDzHBy1NumgoE0pS6Fh lt7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=YWz0fCYB; 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 b16si15819913uav.220.2021.10.19.04.48.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Oct 2021 04:48:29 -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=YWz0fCYB; 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]:39988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcnbY-0004la-K1 for patch@linaro.org; Tue, 19 Oct 2021 07:48:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcnB0-0000S6-1y for qemu-devel@nongnu.org; Tue, 19 Oct 2021 07:21:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:36994) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcnAr-0002Zp-26 for qemu-devel@nongnu.org; Tue, 19 Oct 2021 07:21:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634642451; 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=YWz0fCYB7PR4aiMdWseeJ9WisfaSXeAhkWBT2U3Z5EyXSmsm6D5oKjPmhKQDuB+JHG/9Yi rMyKIzxFl8LFjlWmwthPTAU3sp82KomBcgHxsZHpTWfhIUix9LxY2a/UoDbolbupYeHfwx 5R/n7hSvWGtQDc9+fHeUzH1mmo2rMpg= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-592-Dp5_xeQMNKmbCSmJ5YlS0g-1; Tue, 19 Oct 2021 07:20:50 -0400 X-MC-Unique: Dp5_xeQMNKmbCSmJ5YlS0g-1 Received: by mail-ed1-f72.google.com with SMTP id a3-20020a50da43000000b003dca31dcfc2so861058edk.14 for ; Tue, 19 Oct 2021 04:20:50 -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=6YuXBMCt1Fn0if4JGmmFhRSMX4+YBxqak+I8AgaQej6yiXM4+m0TIR6ZLE7NpGzL/x sus9HgPXqGmMO/qlv6HqjrRMdySNgTeRX5OfqXLdv+uaGKropA8eIuzZBLckLneTNze4 SVQZsEK90IKKrV/9EeOMCkNoCugq19hlgxrtUS3AIWmYiPej5TAvetLab5sSRSbXu74/ mUUJkBcQ5UzEFCt7qxWmOlP1djpo807RQJ5y+ZHd6XFpmXHN0tTQyVxOVY8H03CkgUgz VSbErH4Gb7GKA4emx65o5ZXy/tMXqtvR1gu0G9qb1oBevHZznAYaH2CZ/uCDeiZhLv5f f1wg== X-Gm-Message-State: AOAM531QuydLl1fcKzKb4052jbWWcG0xtEvSUf6D9VWriv5xYUB4SWdP Qg+1gkbwIP+TYzBDuC9Bl0I4ceuJnH3PyY+PLv1qhSw8KJH0TM7AdanUKVONbNKTyrggV+gLUAz jj8Yn9DRlvGiElkRbanKPVPyLY4h9xBIN9CQMZrcg+fQBn5aJ8nEo5I8SzFzk X-Received: by 2002:a17:907:9870:: with SMTP id ko16mr38608639ejc.99.1634642448762; Tue, 19 Oct 2021 04:20:48 -0700 (PDT) X-Received: by 2002:a17:907:9870:: with SMTP id ko16mr38608596ejc.99.1634642448370; Tue, 19 Oct 2021 04:20:48 -0700 (PDT) Received: from redhat.com ([2.55.24.172]) by smtp.gmail.com with ESMTPSA id e23sm10812705edq.88.2021.10.19.04.20.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 04:20:48 -0700 (PDT) Date: Tue, 19 Oct 2021 07:20:46 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 23/29] vhost-user-rng-pci: Add vhost-user-rng-pci implementation Message-ID: <20211019111923.679826-24-mst@redhat.com> References: <20211019111923.679826-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20211019111923.679826-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'))