[RFC PATCH v3 20/20] vfio/pci: Enable recovery for supported native PCIe endpoints

From: Shameer Kolothum

Date: Thu Nov 12 2026 - 09:36:51 EST


Enable recovery for generic vfio-pci endpoints on the subordinate bus of
a PCIe Root Port or Downstream Port.

The recovery power helpers require pci_bus_sem held for reading. Native
PCI recovery provides this through its bus walk. Check the endpoint's
bus as well as its upstream port, since synthetic VF buses are outside
that walk. Exclude direct RCiEP and root-bus endpoints.

Exclude EEH-enabled builds and Xen PV because their callbacks do not
provide the required locking. Exclude s390 and CXL memory devices
because their recovery paths can omit completion callbacks. Variant
drivers remain unsupported until their hardware accesses are protected.

Exclude functions with VPD redirected to function zero. The lookup takes
pci_bus_sem inside SRCU and can deadlock with recovery when a bus writer
is queued.

Also exclude Intel Ethernet function zero devices with VPD. Redirected
accesses from sibling functions bypass the target's access checks.
Exclude potential targets even before siblings are probed so support
does not depend on probe order.

These restrictions affect only the new recovery feature. Ordinary
assignment and existing error notifications remain available.

Signed-off-by: Shameer Kolothum <skolothumtho@xxxxxxxxxx>
---
include/uapi/linux/vfio.h | 6 +++-
drivers/vfio/pci/vfio_pci.c | 61 +++++++++++++++++++++++++++++++++++++
2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h
index 86a3952ee302..f855d064c4b0 100644
--- a/include/uapi/linux/vfio.h
+++ b/include/uapi/linux/vfio.h
@@ -1558,7 +1558,11 @@ struct vfio_device_feature_zpci_err {
/*
* Report host PCI error recovery state for this device.
*
- * Userspace must probe the feature on each device before enabling it.
+ * Support is limited to PCIe endpoints on a Root Port or Downstream Port
+ * subordinate bus, using native PCI error recovery. Direct RCiEP, EEH, Xen
+ * PV, s390 and CXL memory recovery are not supported. Functions with
+ * VPD redirected to function zero, and Intel Ethernet function zero
+ * devices with VPD are excluded. Userspace must probe each device.
*
* VFIO_DEVICE_FEATURE_SET with a valid eventfd enables recovery for this
* open and requests notifications when each event starts and ends. SET
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index a5ba4bb11638..fe9b8b8decca 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -126,10 +126,70 @@ static int vfio_pci_open_device(struct vfio_device *core_vdev)
return 0;
}

+static bool vfio_pci_supports_recovery(struct pci_dev *pdev)
+{
+ struct pci_dev *bridge = pci_upstream_bridge(pdev);
+
+ /*
+ * Looking up function zero for VPD takes pci_bus_sem inside access_srcu.
+ * Recovery holds the bus read lock while waiting for these SRCU readers.
+ * A queued bus writer can leave both paths waiting for each other.
+ */
+ if (pdev->dev_flags & PCI_DEV_FLAGS_VPD_REF_F0)
+ return false;
+
+ /*
+ * quirk_f0_vpd_link() can redirect sibling VPD accesses to these devices
+ * without checking whether recovery has blocked function zero. Exclude
+ * them even if no redirecting sibling is present at probe.
+ */
+ if (!PCI_FUNC(pdev->devfn) && pdev->vpd.cap &&
+ pdev->vendor == PCI_VENDOR_ID_INTEL &&
+ (pdev->class >> 8) == PCI_CLASS_NETWORK_ETHERNET)
+ return false;
+
+ /*
+ * EEH and Xen PV can call recovery without the required bus locking.
+ * s390 recovery can omit completion callbacks.
+ */
+ if (IS_ENABLED(CONFIG_S390) || IS_ENABLED(CONFIG_EEH) ||
+ xen_pv_domain())
+ return false;
+
+ /*
+ * Recovery power helpers require pci_bus_sem held for reading.
+ * The native recovery walk holds it on a port's subordinate bus.
+ * Direct RCiEP recovery does not use that walk.
+ */
+ if (!pci_is_pcie(pdev))
+ return false;
+
+ if (pci_pcie_type(pdev) != PCI_EXP_TYPE_ENDPOINT &&
+ pci_pcie_type(pdev) != PCI_EXP_TYPE_LEG_END)
+ return false;
+
+ if (!bridge || !pci_is_pcie(bridge))
+ return false;
+
+ if (pci_pcie_type(bridge) != PCI_EXP_TYPE_ROOT_PORT &&
+ pci_pcie_type(bridge) != PCI_EXP_TYPE_DOWNSTREAM)
+ return false;
+
+ if (pdev->bus != bridge->subordinate)
+ return false;
+
+ /* CXL RCH recovery can omit completion callbacks. */
+ if ((pdev->class >> 8) == PCI_CLASS_MEMORY_CXL)
+ return false;
+
+ return true;
+}
+
static int vfio_pci_init_dev(struct vfio_device *core_vdev)
{
struct vfio_pci_core_device *vdev =
container_of(core_vdev, struct vfio_pci_core_device, vdev);
+ struct pci_dev *pdev = to_pci_dev(core_vdev->dev);

/*
* These behaviors originated in vfio-pci and moved into
@@ -140,6 +200,7 @@ static int vfio_pci_init_dev(struct vfio_device *core_vdev)
*/
vdev->nointxmask = nointxmask;
vdev->disable_idle_d3 = disable_idle_d3;
+ vdev->pci_recovery_supported = vfio_pci_supports_recovery(pdev);
#ifdef CONFIG_VFIO_PCI_VGA
vdev->disable_vga = disable_vga;
#endif
--
2.43.0