From: Christoph Hellwig <hch@lst.de>
To: Jason Gunthorpe <jgg@nvidia.com>
Cc: kvm@vger.kernel.org, linux-doc@vger.kernel.org,
David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org,
Kirti Wankhede <kwankhede@nvidia.com>,
Max Gurtovoy <mgurtovoy@nvidia.com>,
Vineeth Vijayan <vneethv@linux.ibm.com>,
Diana Craciun <diana.craciun@oss.nxp.com>,
Leon Romanovsky <leonro@nvidia.com>,
Christoph Hellwig <hch@lst.de>,
linux-s390@vger.kernel.org,
Matthew Rosato <mjrosato@linux.ibm.com>,
Jonathan Corbet <corbet@lwn.net>,
Halil Pasic <pasic@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
intel-gfx@lists.freedesktop.org,
Jason Herne <jjherne@linux.ibm.com>,
Eric Farman <farman@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Heiko Carstens <hca@linux.ibm.com>,
Eric Auger <eric.auger@redhat.com>,
Harald Freudenberger <freude@linux.ibm.com>,
intel-gvt-dev@lists.freedesktop.org, "Raj,
Ashok" <ashok.raj@intel.com>,
Tony Krowiak <akrowiak@linux.ibm.com>,
Yishai Hadas <yishaih@nvidia.com>,
Cornelia Huck <cohuck@redhat.com>,
Peter Oberparleiter <oberpar@linux.ibm.com>
Subject: Re: [Intel-gfx] [PATCH v2 08/14] vfio/pci: Move to the device set infrastructure
Date: Fri, 23 Jul 2021 09:47:49 +0200 [thread overview]
Message-ID: <20210723074749.GC2795@lst.de> (raw)
In-Reply-To: <8-v2-b6a5582525c9+ff96-vfio_reflck_jgg@nvidia.com>
On Tue, Jul 20, 2021 at 02:42:54PM -0300, Jason Gunthorpe wrote:
> From: Yishai Hadas <yishaih@nvidia.com>
>
> PCI wants to have the usual open/close_device() logic with the slight
> twist that the open/close_device() must be done under a singelton lock
> shared by all of the vfio_devices that are in the PCI "reset group".
>
> The reset group, and thus the device set, is determined by what devices
> pci_reset_bus() touches, which is either the entire bus or only the slot.
>
> Rely on the core code to do everything reflck was doing and delete reflck
> entirely.
>
> Signed-off-by: Yishai Hadas <yishaih@nvidia.com>
> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
> ---
> drivers/vfio/pci/vfio_pci.c | 156 ++++++----------------------
> drivers/vfio/pci/vfio_pci_private.h | 7 --
> 2 files changed, 31 insertions(+), 132 deletions(-)
>
> diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
> index fab3715d60d4ba..22774e447b5f4a 100644
> --- a/drivers/vfio/pci/vfio_pci.c
> +++ b/drivers/vfio/pci/vfio_pci.c
> @@ -530,53 +530,40 @@ static void vfio_pci_vf_token_user_add(struct vfio_pci_device *vdev, int val)
> vfio_device_put(&pf_vdev->vdev);
> }
>
> -static void vfio_pci_release(struct vfio_device *core_vdev)
> +static void vfio_pci_close_device(struct vfio_device *core_vdev)
> {
> struct vfio_pci_device *vdev =
> container_of(core_vdev, struct vfio_pci_device, vdev);
>
> - mutex_lock(&vdev->reflck->lock);
> -
> - if (!(--vdev->refcnt)) {
> - vfio_pci_vf_token_user_add(vdev, -1);
> - vfio_spapr_pci_eeh_release(vdev->pdev);
> - vfio_pci_disable(vdev);
> + vfio_pci_vf_token_user_add(vdev, -1);
> + vfio_spapr_pci_eeh_release(vdev->pdev);
> + vfio_pci_disable(vdev);
>
> - mutex_lock(&vdev->igate);
> - if (vdev->err_trigger) {
> - eventfd_ctx_put(vdev->err_trigger);
> - vdev->err_trigger = NULL;
> - }
> - if (vdev->req_trigger) {
> - eventfd_ctx_put(vdev->req_trigger);
> - vdev->req_trigger = NULL;
> - }
> - mutex_unlock(&vdev->igate);
> + mutex_lock(&vdev->igate);
> + if (vdev->err_trigger) {
> + eventfd_ctx_put(vdev->err_trigger);
> + vdev->err_trigger = NULL;
> }
> -
> - mutex_unlock(&vdev->reflck->lock);
> + if (vdev->req_trigger) {
> + eventfd_ctx_put(vdev->req_trigger);
> + vdev->req_trigger = NULL;
> + }
> + mutex_unlock(&vdev->igate);
> }
>
> -static int vfio_pci_open(struct vfio_device *core_vdev)
> +static int vfio_pci_open_device(struct vfio_device *core_vdev)
> {
> struct vfio_pci_device *vdev =
> container_of(core_vdev, struct vfio_pci_device, vdev);
> int ret = 0;
>
> - mutex_lock(&vdev->reflck->lock);
> -
> - if (!vdev->refcnt) {
> - ret = vfio_pci_enable(vdev);
> - if (ret)
> - goto error;
> + ret = vfio_pci_enable(vdev);
> + if (ret)
> + return ret;
>
> - vfio_spapr_pci_eeh_open(vdev->pdev);
> - vfio_pci_vf_token_user_add(vdev, 1);
> - }
> - vdev->refcnt++;
> -error:
> - mutex_unlock(&vdev->reflck->lock);
> - return ret;
> + vfio_spapr_pci_eeh_open(vdev->pdev);
> + vfio_pci_vf_token_user_add(vdev, 1);
> + return 0;
> }
>
> static int vfio_pci_get_irq_count(struct vfio_pci_device *vdev, int irq_type)
> @@ -1870,8 +1857,8 @@ static int vfio_pci_match(struct vfio_device *core_vdev, char *buf)
>
> static const struct vfio_device_ops vfio_pci_ops = {
> .name = "vfio-pci",
> - .open = vfio_pci_open,
> - .release = vfio_pci_release,
> + .open_device = vfio_pci_open_device,
> + .close_device = vfio_pci_close_device,
> .ioctl = vfio_pci_ioctl,
> .read = vfio_pci_read,
> .write = vfio_pci_write,
> @@ -1880,9 +1867,6 @@ static const struct vfio_device_ops vfio_pci_ops = {
> .match = vfio_pci_match,
> };
>
> -static int vfio_pci_reflck_attach(struct vfio_pci_device *vdev);
> -static void vfio_pci_reflck_put(struct vfio_pci_reflck *reflck);
> -
> static int vfio_pci_bus_notifier(struct notifier_block *nb,
> unsigned long action, void *data)
> {
> @@ -2020,12 +2004,17 @@ static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> INIT_LIST_HEAD(&vdev->vma_list);
> init_rwsem(&vdev->memory_lock);
>
> - ret = vfio_pci_reflck_attach(vdev);
> + if (pci_is_root_bus(pdev->bus))
> + ret = vfio_assign_device_set(&vdev->vdev, vdev);
> + else if (!pci_probe_reset_slot(pdev->slot))
> + ret = vfio_assign_device_set(&vdev->vdev, pdev->slot);
> + else
> + ret = vfio_assign_device_set(&vdev->vdev, pdev->bus);
Maybe invert this and add a comment:
if (pci_is_root_bus(pdev->bus))
ret = vfio_assign_device_set(&vdev->vdev, vdev);
/*
* If there is no slot reset support for this device, the whole
* bus needs to be grouped together to support bus-wide resets.
*/
else if (pci_probe_reset_slot(pdev->slot) < 0)
ret = vfio_assign_device_set(&vdev->vdev, pdev->bus);
else
ret = vfio_assign_device_set(&vdev->vdev, pdev->slot);
Otherwise looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-07-23 7:47 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-20 17:42 [Intel-gfx] [PATCH v2 00/14] Provide core infrastructure for managing open/release Jason Gunthorpe
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 01/14] vfio/samples: Remove module get/put Jason Gunthorpe
2021-07-23 7:18 ` Christoph Hellwig
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 02/14] vfio/mbochs: Fix missing error unwind in mbochs_probe() Jason Gunthorpe
2021-07-20 22:01 ` Alex Williamson
2021-07-20 22:49 ` Jason Gunthorpe
2021-07-20 22:54 ` Alex Williamson
2021-07-21 9:18 ` Cornelia Huck
2021-07-21 9:16 ` Cornelia Huck
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 03/14] vfio: Introduce a vfio_uninit_group_dev() API call Jason Gunthorpe
2021-07-21 11:33 ` Cornelia Huck
2021-07-23 7:18 ` Christoph Hellwig
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 04/14] vfio: Provide better generic support for open/release vfio_device_ops Jason Gunthorpe
2021-07-22 14:42 ` Cornelia Huck
2021-07-23 7:39 ` Christoph Hellwig
2021-07-23 14:38 ` Jason Gunthorpe
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 05/14] vfio/samples: Delete useless open/close Jason Gunthorpe
2021-07-23 7:39 ` Christoph Hellwig
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 06/14] vfio/fsl: Move to the device set infrastructure Jason Gunthorpe
2021-07-23 7:44 ` Christoph Hellwig
2021-07-23 12:22 ` Jason Gunthorpe
2021-07-23 12:29 ` Christoph Hellwig
2021-07-23 13:11 ` Jason Gunthorpe
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 07/14] vfio/platform: Use open_device() instead of open coding a refcnt scheme Jason Gunthorpe
2021-07-22 14:48 ` Cornelia Huck
2021-07-23 7:45 ` Christoph Hellwig
2021-07-23 12:23 ` Jason Gunthorpe
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 08/14] vfio/pci: Move to the device set infrastructure Jason Gunthorpe
2021-07-23 7:47 ` Christoph Hellwig [this message]
2021-07-23 12:59 ` Jason Gunthorpe
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 09/14] vfio/pci: Change vfio_pci_try_bus_reset() to use the dev_set Jason Gunthorpe
2021-07-23 8:05 ` Christoph Hellwig
2021-07-23 13:30 ` Jason Gunthorpe
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 10/14] vfio/pci: Reorganize VFIO_DEVICE_PCI_HOT_RESET to use the device set Jason Gunthorpe
2021-07-23 8:12 ` Christoph Hellwig
2021-07-23 13:31 ` Jason Gunthorpe
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 11/14] vfio/mbochs: Fix close when multiple device FDs are open Jason Gunthorpe
2021-07-23 8:13 ` Christoph Hellwig
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 12/14] vfio/ap, ccw: Fix open/close " Jason Gunthorpe
2021-07-20 17:42 ` [Intel-gfx] [PATCH v2 13/14] vfio/gvt: " Jason Gunthorpe
2021-07-23 8:14 ` Christoph Hellwig
2021-07-20 17:43 ` [Intel-gfx] [PATCH v2 14/14] vfio: Remove struct vfio_device_ops open/release Jason Gunthorpe
2021-07-23 8:14 ` Christoph Hellwig
2021-07-20 17:55 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Provide core infrastructure for managing open/release (rev4) Patchwork
2021-07-20 17:59 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2021-07-20 18:25 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-07-20 19:53 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-07-20 22:22 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Provide core infrastructure for managing open/release (rev5) Patchwork
2021-07-23 9:41 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Provide core infrastructure for managing open/release (rev6) Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210723074749.GC2795@lst.de \
--to=hch@lst.de \
--cc=airlied@linux.ie \
--cc=akrowiak@linux.ibm.com \
--cc=ashok.raj@intel.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=corbet@lwn.net \
--cc=diana.craciun@oss.nxp.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=eric.auger@redhat.com \
--cc=farman@linux.ibm.com \
--cc=freude@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-gvt-dev@lists.freedesktop.org \
--cc=jgg@nvidia.com \
--cc=jjherne@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=kwankhede@nvidia.com \
--cc=leonro@nvidia.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=mgurtovoy@nvidia.com \
--cc=mjrosato@linux.ibm.com \
--cc=oberpar@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=vneethv@linux.ibm.com \
--cc=yishaih@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).