At the moment, in case of a surprise removal, the regular remove
callback is invoked, exclusively. This works well, because mostly, the
cleanup would be the same.
However, there's a race: imagine device removal was initiated by a user
action, such as driver unbind, and it in turn initiated some cleanup and
is now waiting for an interrupt from the device. If the device is now
surprise-removed, that never arrives and the remove callback hangs
forever.
For example, this was reported for virtio-blk:
1. the graceful removal is ongoing in the remove() callback, where disk
deletion del_gendisk() is ongoing, which waits for the requests +to
complete,
2. Now few requests are yet to complete, and surprise removal started.
At this point, virtio block driver will not get notified by the driver
core layer, because it is likely serializing remove() happening by
+user/driver unload and PCI hotplug driver-initiated device removal. So
vblk driver doesn't know that device is removed, block layer is waiting
for requests completions to arrive which it never gets. So
del_gendisk() gets stuck.
Drivers can artificially add timeouts to handle that, but it can be
flaky.
Instead, let's add a way for the driver to be notified about the
disconnect. It can then do any necessary cleanup, knowing that the
device is inactive.
Since cleanups can take a long time, this takes an approach
of a work struct that the driver initiates and enables
on probe, and tears down on remove.
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
---
Compile tested only.
Note: this minimizes core code. I considered a more elaborate API
that would be easier to use, but decided to be conservative until
there are multiple users.
changes from v2
v2 was corrupted, fat fingers :(
changes from v1:
switched to a WQ, with APIs to enable/disable
added motivation
drivers/pci/pci.h | 6 ++++++
include/linux/pci.h | 27 +++++++++++++++++++++++++++
2 files changed, 33 insertions(+)
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index b81e99cd4b62..208b4cab534b 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -549,6 +549,12 @@ static inline int pci_dev_set_disconnected(struct pci_dev *dev, void *unused)
pci_dev_set_io_state(dev, pci_channel_io_perm_failure);
pci_doe_disconnected(dev);
+ if (READ_ONCE(dev->disconnect_work_enable)) {
+ /* Make sure work is up to date. */
+ smp_rmb();
+ schedule_work(&dev->disconnect_work);
+ }
+
return 0;
}
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 51e2bd6405cd..b2168c5d0679 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -550,6 +550,10 @@ struct pci_dev {
/* These methods index pci_reset_fn_methods[] */
u8 reset_methods[PCI_NUM_RESET_METHODS]; /* In priority order */
+ /* Report disconnect events */
+ u8 disconnect_work_enable;
+ struct work_struct disconnect_work;
+
#ifdef CONFIG_PCIE_TPH
u16 tph_cap; /* TPH capability offset */
u8 tph_mode; /* TPH mode */
@@ -2657,6 +2661,29 @@ static inline bool pci_is_dev_assigned(struct pci_dev *pdev)
return (pdev->dev_flags & PCI_DEV_FLAGS_ASSIGNED) == PCI_DEV_FLAGS_ASSIGNED;
}
+/*
+ * Caller must initialize @pdev->disconnect_work before invoking this.
+ * Caller also must check pci_device_is_present afterwards, since
+ * if device is already gone when this is called, work will not run.
+ */
+static inline void pci_set_disconnect_work(struct pci_dev *pdev)
+{
+ /* Make sure WQ has been initialized already */
+ smp_wmb();
+
+ WRITE_ONCE(pdev->disconnect_work_enable, 0x1);
+}
+
+static inline void pci_clear_disconnect_work(struct pci_dev *pdev)
+{
+ WRITE_ONCE(pdev->disconnect_work_enable, 0x0);
+
+ /* Make sure to stop using work from now on. */
+ smp_wmb();
+
+ cancel_work_sync(&pdev->disconnect_work);
+}
+
/**
* pci_ari_enabled - query ARI forwarding status
* @bus: the PCI bus
--
MST
