Re: [PATCH v11 00/13] PCI: liveupdate: PCI core support for Live Update
From: David Matlack
Date: Fri Nov 20 2026 - 18:36:46 EST
On Wed Nov 18, 2026 at 2:36 PM PST, David Matlack wrote:
> Merge Plan
> ----------
>
> This series is intended to go through liveupdate.git, the tree listed in
> the new PCI LIVE UPDATE MAINTAINERS entry.
>
> v10 and a follow-up patch were applied to the lu-pci-preservation branch
> of liveupdate.git. This version is meant to replace them, and applies on
> v7.4-rc1, the base of that branch.
Patches 08 and 09 have Reviewed-by tags from Alex now. I have a v12
prepped with some small fixes from Sashiko and a comment cleanup from
Pranjal.
Mike do you want me to send a v12 with these changes or send separate
fixes for you to apply on top?
Here is the diff from v11 to v12:
diff --git a/drivers/pci/liveupdate.c b/drivers/pci/liveupdate.c
index 493576119a76..76e939ea52eb 100644
--- a/drivers/pci/liveupdate.c
+++ b/drivers/pci/liveupdate.c
@@ -127,7 +127,7 @@
* Control Services (ACS).
*
* In addition, a device cannot be preserved or unpreserved once the PCI core
- * has started shutting it down (pci_device_shutdown()).
+ * has started shutting it down for kexec (pci_device_shutdown()).
*
* Driver Binding
* ==============
@@ -409,7 +409,8 @@ static void pci_flb_finish(struct liveupdate_flb_op_args *args)
{
struct pci_flb_incoming *incoming = args->obj;
- pr_debug("Finished struct pci_ser (0x%llx)\n", args->data);
+ pr_debug("Finished struct pci_ser (0x%llx)\n",
+ (u64)virt_to_phys(incoming->ser));
pci_check_all_devices_released(incoming->ser, &incoming->block_set);
xa_destroy(&incoming->xa);
@@ -937,9 +938,14 @@ int pci_liveupdate_adopt_ari(struct pci_dev *dev)
/*
* Unlike ACS, only adopt ARI while the bridge is incoming-preserved.
- * Once all devices below the bridge have finished, recomputing ARI
- * Forwarding Enable yields the same result for the same device, and
- * must be allowed to change if a different device is hot-plugged.
+ * Once all devices below the bridge have finished, pci_configure_ari()
+ * configures ARI Forwarding Enable as usual the next time a device is
+ * added below the bridge, e.g. if a different device is hot-plugged.
+ *
+ * The exception is pci=noari, where pci_configure_ari() does not touch
+ * the bridge, so the adopted ARI Forwarding Enable persists after the
+ * preserved devices finish, even if a device without ARI is later
+ * hot-plugged below the bridge.
*/
if (!dev->liveupdate.incoming)
return -EINVAL;
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 08b768b9e905..2748ca22e9cf 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -560,7 +560,8 @@ static void pci_device_shutdown(struct device *dev)
struct pci_dev *pci_dev = to_pci_dev(dev);
struct pci_driver *drv = pci_dev->driver;
- pci_liveupdate_freeze(pci_dev);
+ if (kexec_in_progress)
+ pci_liveupdate_freeze(pci_dev);
pm_runtime_resume(dev);
if (drv && drv->shutdown)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index b5b578355a1b..f3d58b5e7a5d 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1073,10 +1073,14 @@ static void pci_allocate_acs_save_buffer(struct pci_dev *dev)
/*
* Devices that rely on device-specific quirks to enable an ACS
* equivalent keep that configuration outside of the ACS Control
- * register, so they are configured from scratch on restore. The
- * exception is devices preserved across a Live Update, which always
- * adopt the ACS controls established by the previous kernel and need
- * the buffer to keep them across resets.
+ * register, so they are configured from scratch on restore.
+ *
+ * The exception is devices preserved across a Live Update. The
+ * previous kernel refuses to preserve devices that need such a quirk,
+ * so a quirk can only match here if the previous kernel did not apply
+ * it (e.g. the quirk is new in this kernel). The previous kernel then
+ * programmed the standard ACS Control register, so save it to keep
+ * the adopted controls across resets.
*/
if (pci_need_dev_specific_enable_acs(dev) &&
!pci_liveupdate_was_incoming(dev))