From: Jason Gunthorpe <jgg@nvidia.com>
To: David Airlie <airlied@linux.ie>,
Tony Krowiak <akrowiak@linux.ibm.com>,
Alex Williamson <alex.williamson@redhat.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Cornelia Huck <cohuck@redhat.com>,
Jonathan Corbet <corbet@lwn.net>, Daniel Vetter <daniel@ffwll.ch>,
Diana Craciun <diana.craciun@oss.nxp.com>,
dri-devel@lists.freedesktop.org,
Eric Auger <eric.auger@redhat.com>,
Eric Farman <farman@linux.ibm.com>,
Harald Freudenberger <freude@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Heiko Carstens <hca@linux.ibm.com>,
intel-gfx@lists.freedesktop.org,
intel-gvt-dev@lists.freedesktop.org,
Jani Nikula <jani.nikula@linux.intel.com>,
Jason Herne <jjherne@linux.ibm.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
kvm@vger.kernel.org, Kirti Wankhede <kwankhede@nvidia.com>,
linux-doc@vger.kernel.org, linux-s390@vger.kernel.org,
Matthew Rosato <mjrosato@linux.ibm.com>,
Peter Oberparleiter <oberpar@linux.ibm.com>,
Halil Pasic <pasic@linux.ibm.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Vineeth Vijayan <vneethv@linux.ibm.com>,
Zhi Wang <zhi.a.wang@intel.com>
Cc: "Raj, Ashok" <ashok.raj@intel.com>,
Christoph Hellwig <hch@lst.de>,
Leon Romanovsky <leonro@nvidia.com>,
Max Gurtovoy <mgurtovoy@nvidia.com>,
Yishai Hadas <yishaih@nvidia.com>,
Zhenyu Wang <zhenyuw@linux.intel.com>
Subject: [PATCH v2 09/14] vfio/pci: Change vfio_pci_try_bus_reset() to use the dev_set
Date: Tue, 20 Jul 2021 14:42:55 -0300 [thread overview]
Message-ID: <9-v2-b6a5582525c9+ff96-vfio_reflck_jgg@nvidia.com> (raw)
In-Reply-To: <0-v2-b6a5582525c9+ff96-vfio_reflck_jgg@nvidia.com>
Keep track of all the vfio_devices that have been added to the device set
and use this list in vfio_pci_try_bus_reset() instead of trying to work
backwards from the pci_device.
The dev_set->lock directly prevents devices from joining/leaving the set,
which further implies the pci_device cannot change drivers or that the
vfio_device be freed, eliminating the need for get/put's.
Completeness of the device set can be directly measured by checking if
every PCI device in the reset group is also in the device set - which
proves that VFIO drivers are attached to everything.
This restructuring corrects a call to pci_dev_driver() without holding the
device_lock() and removes a hard wiring to &vfio_pci_driver.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
---
drivers/vfio/pci/vfio_pci.c | 110 ++++++++++++++----------------------
drivers/vfio/vfio.c | 10 ++++
include/linux/vfio.h | 2 +
3 files changed, 53 insertions(+), 69 deletions(-)
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index 22774e447b5f4a..fbc20f6d2dd412 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -404,6 +404,9 @@ static void vfio_pci_disable(struct vfio_pci_device *vdev)
struct vfio_pci_ioeventfd *ioeventfd, *ioeventfd_tmp;
int i, bar;
+ /* For needs_reset */
+ lockdep_assert_held(&vdev->vdev.dev_set->lock);
+
/* Stop the device from further DMA */
pci_clear_master(pdev);
@@ -2139,34 +2142,17 @@ static struct pci_driver vfio_pci_driver = {
.err_handler = &vfio_err_handlers,
};
-static int vfio_pci_get_unused_devs(struct pci_dev *pdev, void *data)
+static int vfio_pci_check_all_devices_bound(struct pci_dev *pdev, void *data)
{
- struct vfio_devices *devs = data;
- struct vfio_device *device;
- struct vfio_pci_device *vdev;
-
- if (devs->cur_index == devs->max_index)
- return -ENOSPC;
+ struct vfio_device_set *dev_set = data;
+ struct vfio_device *cur;
- device = vfio_device_get_from_dev(&pdev->dev);
- if (!device)
- return -EINVAL;
-
- if (pci_dev_driver(pdev) != &vfio_pci_driver) {
- vfio_device_put(device);
- return -EBUSY;
- }
-
- vdev = container_of(device, struct vfio_pci_device, vdev);
-
- /* Fault if the device is not unused */
- if (device->open_count) {
- vfio_device_put(device);
- return -EBUSY;
- }
+ lockdep_assert_held(&dev_set->lock);
- devs->devices[devs->cur_index++] = vdev;
- return 0;
+ list_for_each_entry(cur, &dev_set->device_list, dev_set_list)
+ if (cur->dev == &pdev->dev)
+ return 0;
+ return -EBUSY;
}
static int vfio_pci_try_zap_and_vma_lock_cb(struct pci_dev *pdev, void *data)
@@ -2210,8 +2196,7 @@ static int vfio_pci_try_zap_and_vma_lock_cb(struct pci_dev *pdev, void *data)
* needs_reset (such as by lack of FLR support)
* Then attempt to perform that bus or slot reset. Callers are required
* to hold vdev->dev_set->lock, protecting the bus/slot reset group from
- * concurrent opens. A vfio_device reference is acquired for each device
- * to prevent unbinds during the reset operation.
+ * concurrent opens.
*
* NB: vfio-core considers a group to be viable even if some devices are
* bound to drivers like pci-stub or pcieport. Here we require all devices
@@ -2220,61 +2205,48 @@ static int vfio_pci_try_zap_and_vma_lock_cb(struct pci_dev *pdev, void *data)
*/
static void vfio_pci_try_bus_reset(struct vfio_pci_device *vdev)
{
- struct vfio_devices devs = { .cur_index = 0 };
- int i = 0, ret = -EINVAL;
- bool slot = false;
- struct vfio_pci_device *tmp;
-
- if (!pci_probe_reset_slot(vdev->pdev->slot))
- slot = true;
- else if (pci_probe_reset_bus(vdev->pdev->bus))
- return;
+ struct vfio_device_set *dev_set = vdev->vdev.dev_set;
+ struct vfio_pci_device *to_reset = NULL;
+ struct vfio_pci_device *cur;
+ int ret;
- if (vfio_pci_for_each_slot_or_bus(vdev->pdev, vfio_pci_count_devs,
- &i, slot) || !i)
+ if (pci_probe_reset_slot(vdev->pdev->slot) &&
+ pci_probe_reset_bus(vdev->pdev->bus))
return;
- devs.max_index = i;
- devs.devices = kcalloc(i, sizeof(struct vfio_device *), GFP_KERNEL);
- if (!devs.devices)
- return;
+ lockdep_assert_held(&vdev->vdev.dev_set->lock);
- if (vfio_pci_for_each_slot_or_bus(vdev->pdev,
- vfio_pci_get_unused_devs,
- &devs, slot))
- goto put_devs;
+ /* All VFIO devices have a closed FD */
+ list_for_each_entry(cur, &dev_set->device_list, vdev.dev_set_list)
+ if (cur->vdev.open_count)
+ return;
+
+ /* All devices in the group to be reset need VFIO devices */
+ if (vfio_pci_for_each_slot_or_bus(
+ vdev->pdev, vfio_pci_check_all_devices_bound, dev_set,
+ !pci_probe_reset_slot(vdev->pdev->slot)))
+ return;
/* Does at least one need a reset? */
- for (i = 0; i < devs.cur_index; i++) {
- tmp = devs.devices[i];
- if (tmp->needs_reset) {
- ret = pci_reset_bus(vdev->pdev);
+ list_for_each_entry(cur, &dev_set->device_list, vdev.dev_set_list) {
+ if (cur->needs_reset) {
+ to_reset = cur;
break;
}
}
+ if (!to_reset)
+ return;
-put_devs:
- for (i = 0; i < devs.cur_index; i++) {
- tmp = devs.devices[i];
-
- /*
- * If reset was successful, affected devices no longer need
- * a reset and we should return all the collateral devices
- * to low power. If not successful, we either didn't reset
- * the bus or timed out waiting for it, so let's not touch
- * the power state.
- */
- if (!ret) {
- tmp->needs_reset = false;
+ ret = pci_reset_bus(to_reset->pdev);
+ if (ret)
+ return;
- if (tmp != vdev && !disable_idle_d3)
- vfio_pci_set_power_state(tmp, PCI_D3hot);
- }
+ list_for_each_entry(cur, &dev_set->device_list, vdev.dev_set_list) {
+ cur->needs_reset = false;
- vfio_device_put(&tmp->vdev);
+ if (cur != to_reset && !disable_idle_d3)
+ vfio_pci_set_power_state(cur, PCI_D3hot);
}
-
- kfree(devs.devices);
}
static void __exit vfio_pci_cleanup(void)
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
index 8572d943320214..7e352d68b1b01d 100644
--- a/drivers/vfio/vfio.c
+++ b/drivers/vfio/vfio.c
@@ -129,7 +129,12 @@ int vfio_assign_device_set(struct vfio_device *device, void *set_id)
if (dev_set) {
dev_set->device_count++;
xa_unlock(&vfio_device_set_xa);
+
+ mutex_lock(&dev_set->lock);
device->dev_set = dev_set;
+ list_add_tail(&device->dev_set_list, &dev_set->device_list);
+ mutex_unlock(&dev_set->lock);
+
if (dev_set != alloc_dev_set)
kfree(alloc_dev_set);
return 0;
@@ -143,6 +148,7 @@ int vfio_assign_device_set(struct vfio_device *device, void *set_id)
if (!alloc_dev_set)
return -ENOMEM;
mutex_init(&alloc_dev_set->lock);
+ INIT_LIST_HEAD(&alloc_dev_set->device_list);
alloc_dev_set->set_id = set_id;
goto again;
}
@@ -155,6 +161,10 @@ static void vfio_release_device_set(struct vfio_device *device)
if (!dev_set)
return;
+ mutex_lock(&dev_set->lock);
+ list_del(&device->dev_set_list);
+ mutex_unlock(&dev_set->lock);
+
xa_lock(&vfio_device_set_xa);
dev_set->device_count--;
if (!dev_set->device_count) {
diff --git a/include/linux/vfio.h b/include/linux/vfio.h
index 128b4db00adc57..f0e6a72875e471 100644
--- a/include/linux/vfio.h
+++ b/include/linux/vfio.h
@@ -23,6 +23,7 @@
struct vfio_device_set {
void *set_id;
struct mutex lock;
+ struct list_head device_list;
unsigned int device_count;
};
@@ -31,6 +32,7 @@ struct vfio_device {
const struct vfio_device_ops *ops;
struct vfio_group *group;
struct vfio_device_set *dev_set;
+ struct list_head dev_set_list;
/* Members below here are private, not for driver use */
refcount_t refcount;
--
2.32.0
next prev parent reply other threads:[~2021-07-20 17:46 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-20 17:42 [PATCH v2 00/14] Provide core infrastructure for managing open/release Jason Gunthorpe
2021-07-20 17:42 ` [PATCH v2 01/14] vfio/samples: Remove module get/put Jason Gunthorpe
2021-07-23 7:18 ` Christoph Hellwig
2021-07-20 17:42 ` [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 ` [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 ` [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 ` [PATCH v2 05/14] vfio/samples: Delete useless open/close Jason Gunthorpe
2021-07-23 7:39 ` Christoph Hellwig
2021-07-20 17:42 ` [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 ` [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 ` [PATCH v2 08/14] vfio/pci: Move to the device set infrastructure Jason Gunthorpe
2021-07-23 7:47 ` Christoph Hellwig
2021-07-23 12:59 ` Jason Gunthorpe
2021-07-20 17:42 ` Jason Gunthorpe [this message]
2021-07-23 8:05 ` [PATCH v2 09/14] vfio/pci: Change vfio_pci_try_bus_reset() to use the dev_set Christoph Hellwig
2021-07-23 13:30 ` Jason Gunthorpe
2021-07-20 17:42 ` [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 ` [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 ` [PATCH v2 12/14] vfio/ap,ccw: Fix open/close " Jason Gunthorpe
2021-07-20 17:42 ` [PATCH v2 13/14] vfio/gvt: " Jason Gunthorpe
2021-07-23 8:14 ` Christoph Hellwig
2021-07-20 17:43 ` [PATCH v2 14/14] vfio: Remove struct vfio_device_ops open/release Jason Gunthorpe
2021-07-23 8:14 ` Christoph Hellwig
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=9-v2-b6a5582525c9+ff96-vfio_reflck_jgg@nvidia.com \
--to=jgg@nvidia.com \
--cc=airlied@linux.ie \
--cc=akrowiak@linux.ibm.com \
--cc=alex.williamson@redhat.com \
--cc=ashok.raj@intel.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=corbet@lwn.net \
--cc=daniel@ffwll.ch \
--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=hch@lst.de \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-gvt-dev@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=jjherne@linux.ibm.com \
--cc=joonas.lahtinen@linux.intel.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=rodrigo.vivi@intel.com \
--cc=vneethv@linux.ibm.com \
--cc=yishaih@nvidia.com \
--cc=zhenyuw@linux.intel.com \
--cc=zhi.a.wang@intel.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).