From patchwork Tue Jul 16 15:31:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 11046333 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BEFE81510 for ; Tue, 16 Jul 2019 15:32:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB72A28640 for ; Tue, 16 Jul 2019 15:32:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F4DB28641; Tue, 16 Jul 2019 15:32:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30B832864F for ; Tue, 16 Jul 2019 15:32:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728390AbfGPPcE (ORCPT ); Tue, 16 Jul 2019 11:32:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58856 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727796AbfGPPcD (ORCPT ); Tue, 16 Jul 2019 11:32:03 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 020B52F8BCC; Tue, 16 Jul 2019 15:32:03 +0000 (UTC) Received: from redhat.com (ovpn-122-108.rdu2.redhat.com [10.10.122.108]) by smtp.corp.redhat.com (Postfix) with SMTP id 96BE15B681; Tue, 16 Jul 2019 15:31:52 +0000 (UTC) Date: Tue, 16 Jul 2019 11:31:51 -0400 From: "Michael S. Tsirkin" To: Linus Torvalds Cc: kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, aarcange@redhat.com, bharat.bhushan@nxp.com, bhelgaas@google.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, davem@davemloft.net, eric.auger@redhat.com, gustavo@embeddedor.com, hch@infradead.org, ihor.matushchak@foobox.net, James.Bottomley@hansenpartnership.com, jasowang@redhat.com, jean-philippe.brucker@arm.com, jglisse@redhat.com, mst@redhat.com, natechancellor@gmail.com Subject: [PULL] virtio, vhost: fixes, features, performance Message-ID: <20190716113151-mutt-send-email-mst@kernel.org> MIME-Version: 1.0 Content-Disposition: inline X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 16 Jul 2019 15:32:03 +0000 (UTC) Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The following changes since commit c1ea02f15ab5efb3e93fc3144d895410bf79fcf2: vhost: scsi: add weight support (2019-05-27 11:08:23 -0400) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus for you to fetch changes up to 5e663f0410fa2f355042209154029842ba1abd43: virtio-mmio: add error check for platform_get_irq (2019-07-11 16:22:29 -0400) ---------------------------------------------------------------- virtio, vhost: fixes, features, performance new iommu device vhost guest memory access using vmap (just meta-data for now) minor fixes Signed-off-by: Michael S. Tsirkin Note: due to code driver changes the driver-core tree, the following patch is needed when merging tree with commit 92ce7e83b4e5 ("driver_find_device: Unify the match function with class_find_device()") in the driver-core tree: From: Nathan Chancellor Subject: [PATCH] iommu/virtio: Constify data parameter in viommu_match_node After commit 92ce7e83b4e5 ("driver_find_device: Unify the match function with class_find_device()") in the driver-core tree. Signed-off-by: Nathan Chancellor Signed-off-by: Michael S. Tsirkin --- drivers/iommu/virtio-iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------- Gustavo A. R. Silva (1): scsi: virtio_scsi: Use struct_size() helper Ihor Matushchak (1): virtio-mmio: add error check for platform_get_irq Jason Wang (6): vhost: generalize adding used elem vhost: fine grain userspace memory accessors vhost: rename vq_iotlb_prefetch() to vq_meta_prefetch() vhost: introduce helpers to get the size of metadata area vhost: factor out setting vring addr and num vhost: access vq metadata through kernel virtual address Jean-Philippe Brucker (7): dt-bindings: virtio-mmio: Add IOMMU description dt-bindings: virtio: Add virtio-pci-iommu node of: Allow the iommu-map property to omit untranslated devices PCI: OF: Initialize dev->fwnode appropriately iommu: Add virtio-iommu driver iommu/virtio: Add probe request iommu/virtio: Add event queue Michael S. Tsirkin (1): vhost: fix clang build warning Documentation/devicetree/bindings/virtio/iommu.txt | 66 ++ Documentation/devicetree/bindings/virtio/mmio.txt | 30 + MAINTAINERS | 7 + drivers/iommu/Kconfig | 11 + drivers/iommu/Makefile | 1 + drivers/iommu/virtio-iommu.c | 1158 ++++++++++++++++++++ drivers/of/base.c | 10 +- drivers/pci/of.c | 8 + drivers/scsi/virtio_scsi.c | 2 +- drivers/vhost/net.c | 4 +- drivers/vhost/vhost.c | 850 +++++++++++--- drivers/vhost/vhost.h | 43 +- drivers/virtio/virtio_mmio.c | 7 +- include/uapi/linux/virtio_ids.h | 1 + include/uapi/linux/virtio_iommu.h | 161 +++ 15 files changed, 2228 insertions(+), 131 deletions(-) create mode 100644 Documentation/devicetree/bindings/virtio/iommu.txt create mode 100644 drivers/iommu/virtio-iommu.c create mode 100644 include/uapi/linux/virtio_iommu.h diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c index 4620dd221ffd..433f4d2ee956 100644 --- a/drivers/iommu/virtio-iommu.c +++ b/drivers/iommu/virtio-iommu.c @@ -839,7 +839,7 @@ static void viommu_put_resv_regions(struct device *dev, struct list_head *head) static struct iommu_ops viommu_ops; static struct virtio_driver virtio_iommu_drv; -static int viommu_match_node(struct device *dev, void *data) +static int viommu_match_node(struct device *dev, const void *data) { return dev->parent->fwnode == data; }