From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC467C33C9E for ; Fri, 31 Jan 2020 02:22:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 989282067C for ; Fri, 31 Jan 2020 02:22:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727959AbgAaCWA (ORCPT ); Thu, 30 Jan 2020 21:22:00 -0500 Received: from mga03.intel.com ([134.134.136.65]:17541 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727817AbgAaCV7 (ORCPT ); Thu, 30 Jan 2020 21:21:59 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Jan 2020 18:21:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,384,1574150400"; d="scan'208";a="262395768" Received: from joy-optiplex-7040.sh.intel.com ([10.239.13.16]) by fmsmga002.fm.intel.com with ESMTP; 30 Jan 2020 18:21:56 -0800 From: Yan Zhao To: alex.williamson@redhat.com Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, cohuck@redhat.com, zhenyuw@linux.intel.com, zhi.a.wang@intel.com, kevin.tian@intel.com, shaopeng.he@intel.com, yi.l.liu@intel.com, Yan Zhao Subject: [RFC PATCH v2 6/9] vfio/pci: export vfio_pci_setup_barmap Date: Thu, 30 Jan 2020 21:12:39 -0500 Message-Id: <20200131021239.27886-1-yan.y.zhao@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200131020803.27519-1-yan.y.zhao@intel.com> References: <20200131020803.27519-1-yan.y.zhao@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This allows vendor driver to read/write to bars directly, which is useful in security checking condition. E.g. if a value is invalid, vendor driver can modify the value before writing to hardware; if a value is valid, vendor driver calls default vfio_pci_write(). Cc: Kevin Tian Signed-off-by: Yan Zhao --- drivers/vfio/pci/vfio_pci_rdwr.c | 26 +++++++++++++------------- include/linux/vfio.h | 2 ++ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/drivers/vfio/pci/vfio_pci_rdwr.c b/drivers/vfio/pci/vfio_pci_rdwr.c index d68e860a2603..c50f2c80ede3 100644 --- a/drivers/vfio/pci/vfio_pci_rdwr.c +++ b/drivers/vfio/pci/vfio_pci_rdwr.c @@ -129,29 +129,30 @@ static ssize_t do_io_rw(void __iomem *io, char __user *buf, return done; } -static int vfio_pci_setup_barmap(struct vfio_pci_device *vdev, int bar) +void __iomem *vfio_pci_setup_barmap(struct vfio_pci_device *vdev, int bar) { struct pci_dev *pdev = vdev->pdev; int ret; void __iomem *io; if (vdev->priv->barmap[bar]) - return 0; + return vdev->priv->barmap[bar]; ret = pci_request_selected_regions(pdev, 1 << bar, "vfio"); if (ret) - return ret; + return NULL; io = pci_iomap(pdev, bar, 0); if (!io) { pci_release_selected_regions(pdev, 1 << bar); - return -ENOMEM; + return NULL; } vdev->priv->barmap[bar] = io; - return 0; + return io; } +EXPORT_SYMBOL_GPL(vfio_pci_setup_barmap); ssize_t vfio_pci_bar_rw(struct vfio_pci_device *vdev, char __user *buf, size_t count, loff_t *ppos, bool iswrite) @@ -188,11 +189,9 @@ ssize_t vfio_pci_bar_rw(struct vfio_pci_device *vdev, char __user *buf, return -ENOMEM; x_end = end; } else { - int ret = vfio_pci_setup_barmap(vdev, bar); - if (ret) - return ret; - - io = vdev->priv->barmap[bar]; + io = vfio_pci_setup_barmap(vdev, bar); + if (!io) + return -EFAULT; } if (bar == vdev->priv->msix_bar) { @@ -305,6 +304,7 @@ long vfio_pci_ioeventfd(struct vfio_pci_device *vdev, loff_t offset, loff_t pos = offset & VFIO_PCI_OFFSET_MASK; int ret, bar = VFIO_PCI_OFFSET_TO_INDEX(offset); struct vfio_pci_ioeventfd *ioeventfd; + void __iomem *io; /* Only support ioeventfds into BARs */ if (bar > VFIO_PCI_BAR5_REGION_INDEX) @@ -324,9 +324,9 @@ long vfio_pci_ioeventfd(struct vfio_pci_device *vdev, loff_t offset, return -EINVAL; #endif - ret = vfio_pci_setup_barmap(vdev, bar); - if (ret) - return ret; + io = vfio_pci_setup_barmap(vdev, bar); + if (!io) + return -EFAULT; mutex_lock(&vdev->priv->ioeventfds_lock); diff --git a/include/linux/vfio.h b/include/linux/vfio.h index 4bb101ac3fff..1dcafde951ec 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -227,6 +227,8 @@ extern int vfio_pci_mmap(void *device_data, struct vm_area_struct *vma); extern void vfio_pci_request(void *device_data, unsigned int count); extern int vfio_pci_open(void *device_data); extern void vfio_pci_release(void *device_data); +extern void __iomem *vfio_pci_setup_barmap(struct vfio_pci_device *vdev, + int bar); #define vfio_pci_register_vendor_driver(__name, __probe, __remove, \ __device_ops) \ -- 2.17.1