From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52154) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eviw3-00004y-LM for qemu-devel@nongnu.org; Tue, 13 Mar 2018 08:21:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eviw0-00082J-Du for qemu-devel@nongnu.org; Tue, 13 Mar 2018 08:21:43 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:44298 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eviw0-000828-9T for qemu-devel@nongnu.org; Tue, 13 Mar 2018 08:21:40 -0400 From: Auger Eric References: <20180228195504.25283.45666.stgit@gimli.home> <20180228201446.25283.82272.stgit@gimli.home> Message-ID: Date: Tue, 13 Mar 2018 13:21:31 +0100 MIME-Version: 1.0 In-Reply-To: <20180228201446.25283.82272.stgit@gimli.home> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/3] vfio/pci: Pull BAR mapping setup from read-write path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex Williamson , kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, qemu-devel@nongnu.org, peterx@redhat.com, aik@ozlabs.ru Hi Alex, On 28/02/18 21:14, Alex Williamson wrote: > This creates a common helper that we'll use for ioeventfd setup. > > Signed-off-by: Alex Williamson Reviewed-by: Eric Auger Thanks Eric > --- > drivers/vfio/pci/vfio_pci_rdwr.c | 39 ++++++++++++++++++++++++++------------ > 1 file changed, 27 insertions(+), 12 deletions(-) > > diff --git a/drivers/vfio/pci/vfio_pci_rdwr.c b/drivers/vfio/pci/vfio_pci_rdwr.c > index 357243d76f10..5f2b376dcebd 100644 > --- a/drivers/vfio/pci/vfio_pci_rdwr.c > +++ b/drivers/vfio/pci/vfio_pci_rdwr.c > @@ -113,6 +113,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) > +{ > + struct pci_dev *pdev = vdev->pdev; > + int ret; > + void __iomem *io; > + > + if (vdev->barmap[bar]) > + return 0; > + > + ret = pci_request_selected_regions(pdev, 1 << bar, "vfio"); > + if (ret) > + return ret; > + > + io = pci_iomap(pdev, bar, 0); > + if (!io) { > + pci_release_selected_regions(pdev, 1 << bar); > + return -ENOMEM; > + } > + > + vdev->barmap[bar] = io; > + > + return 0; > +} > + > ssize_t vfio_pci_bar_rw(struct vfio_pci_device *vdev, char __user *buf, > size_t count, loff_t *ppos, bool iswrite) > { > @@ -147,22 +171,13 @@ ssize_t vfio_pci_bar_rw(struct vfio_pci_device *vdev, char __user *buf, > if (!io) > return -ENOMEM; > x_end = end; > - } else if (!vdev->barmap[bar]) { > - int ret; > - > - ret = pci_request_selected_regions(pdev, 1 << bar, "vfio"); > + } else { > + int ret = vfio_pci_setup_barmap(vdev, bar); > if (ret) > return ret; > > - io = pci_iomap(pdev, bar, 0); > - if (!io) { > - pci_release_selected_regions(pdev, 1 << bar); > - return -ENOMEM; > - } > - > - vdev->barmap[bar] = io; > - } else > io = vdev->barmap[bar]; > + } > > if (bar == vdev->msix_bar) { > x_start = vdev->msix_offset; >