Re: [PATCH v11 09/13] PCI: liveupdate: Adopt ACS controls in incoming preserved devices
From: Alex Williamson
Date: Thu Nov 19 2026 - 19:10:53 EST
On Wed, 18 Nov 2026 22:37:00 +0000
David Matlack <dmatlack@xxxxxxxxxx> wrote:
> Adopt Access Control Services (ACS) controls on all incoming preserved
> devices (endpoints and upstream bridges) during a Live Update.
>
> Adopting ACS controls avoids changing routing rules while memory
> transactions are in flight from preserved devices. It also keeps IOMMU
> groups from changing during or after Live Update.
>
> The adopted controls are recorded by the pci_save_state() call in
> pci_bus_add_device(), which runs before drivers bind, so they are
> reapplied by pci_restore_state() if the device is reset. Allocate the
> ACS save buffer for incoming preserved devices even if they match a
> device-specific ACS quirk, since their adopted controls live in the ACS
> capability, and panic if it could not be allocated.
>
> To simplify ACS adoption, reject preserving any devices that require
> quirks to enable ACS as those quirks would also have to take Live Update
> into account. If such a quirk matches an incoming preserved device
> anyway, e.g. because it was added in the new kernel, log a warning and
> adopt the device's ACS controls regardless, rather than reprogram a
> device in the path of a preserved device's memory transactions.
>
> Signed-off-by: David Matlack <dmatlack@xxxxxxxxxx>
> ---
> drivers/pci/liveupdate.c | 75 ++++++++++++++++++++++++++++++++++++++++
> drivers/pci/liveupdate.h | 16 +++++++++
> drivers/pci/pci.c | 13 +++++--
> 3 files changed, 102 insertions(+), 2 deletions(-)
Reviewed-by: Alex Williamson <alex.williamson@xxxxxxxxxx>
>
> diff --git a/drivers/pci/liveupdate.c b/drivers/pci/liveupdate.c
> index 00d6fa5236e9..b99a88c2c199 100644
> --- a/drivers/pci/liveupdate.c
> +++ b/drivers/pci/liveupdate.c
> @@ -123,6 +123,9 @@
> *
> * * The device cannot be a Virtual Function (VF).
> *
> + * * The device cannot require device-specific quirks to enable Access
> + * Control Services (ACS).
> + *
> * Driver Binding
> * ==============
> *
> @@ -174,6 +177,17 @@
> * bus, since the bus numbers of the failed bridge can no longer be read from
> * hardware and handing them to another bridge would let an unrelated device
> * inherit the BDF of a preserved device.
> + *
> + * Handling Preserved Devices
> + * ==========================
> + *
> + * The PCI core handles preserved devices differently in the following ways:
> + *
> + * * The PCI core adopts all ACS controls enabled on incoming preserved devices
> + * rather than assigning new ones, so TLP routing and IOMMU groups stay the
> + * same after Live Update. Note that a device will use its adopted ACS
> + * controls for the lifetime of its struct pci_dev (i.e. even after
> + * pci_liveupdate_finish()).
> */
>
> #define pr_fmt(fmt) "PCI: liveupdate: " fmt
> @@ -189,6 +203,7 @@
> #include <linux/slab.h>
>
> #include "liveupdate.h"
> +#include "pci.h"
>
> /**
> * struct pci_liveupdate_global - Global state for PCI Live Update support
> @@ -540,6 +555,15 @@ static int pci_liveupdate_preserve_device(struct pci_flb_outgoing *outgoing,
> return -EINVAL;
> }
>
> + /*
> + * Do not preserve devices that rely on device-specific ACS equivalents
> + * since that would complicate keeping ACS constant across Live Update.
> + */
> + if (pci_need_dev_specific_enable_acs(dev)) {
> + pci_warn(dev, "Refusing to preserve device that relies on ACS quirks\n");
> + return -EINVAL;
> + }
> +
> if (dev_ser) {
> /*
> * Endpoint devices can only be preserved once. Bridges are
> @@ -816,6 +840,57 @@ void pci_liveupdate_finish(struct pci_dev *dev)
> }
> EXPORT_SYMBOL_GPL(pci_liveupdate_finish);
>
> +/**
> + * pci_liveupdate_adopt_acs() - Adopt ACS controls
> + * @dev: The PCI device to adopt ACS controls for
> + *
> + * For devices preserved across a Live Update, leave the ACS controls
> + * established by the previous kernel alone instead of programming new ones.
> + * The adopted controls are recorded by the pci_save_state() call in
> + * pci_bus_add_device(), so they are reapplied by pci_restore_state() if the
> + * device is subsequently reset.
> + *
> + * Panics if the device has an ACS capability but no ACS save buffer, since the
> + * adopted controls would be lost on the first reset.
> + *
> + * Return: 0 if the ACS controls were adopted, or -EINVAL if the device was not
> + * preserved.
> + */
> +int pci_liveupdate_adopt_acs(struct pci_dev *dev)
> +{
> + /*
> + * Check if the device was preserved over a previous Live Update (even
> + * if it has already gone through pci_liveupdate_finish()). This ensures
> + * that the device continues to use the ACS controls established by the
> + * previous kernel.
> + */
> + if (!dev->liveupdate.was_incoming)
> + return -EINVAL;
> +
> + /*
> + * The previous kernel does not preserve devices that require
> + * device-specific quirks to enable ACS, so the controls being adopted
> + * live entirely in the ACS capability. If such a quirk matches anyway
> + * (e.g. it was added in the current kernel), ignore it rather than
> + * reprogram a device in the path of a preserved device's memory
> + * transactions.
> + */
> + if (pci_need_dev_specific_enable_acs(dev))
> + pci_warn(dev, "Ignoring device-specific ACS quirk, adopting ACS controls from previous kernel\n");
> +
> + /*
> + * The adopted controls must be captured in the ACS save buffer so that
> + * they are reapplied if the device is later reset. Without it, e.g.
> + * because it could not be allocated, the first reset would silently
> + * drop them.
> + */
> + if (dev->acs_cap && !pci_find_saved_ext_cap(dev, PCI_EXT_CAP_ID_ACS))
> + panic("%s: No ACS save buffer for preserved device\n",
> + pci_name(dev));
> +
> + return 0;
> +}
> +
> /**
> * pci_liveupdate_is_incoming() - Check if a device is incoming-preserved
> * @dev: The PCI device to check
> diff --git a/drivers/pci/liveupdate.h b/drivers/pci/liveupdate.h
> index e5d2a19d2ca2..c643f2664296 100644
> --- a/drivers/pci/liveupdate.h
> +++ b/drivers/pci/liveupdate.h
> @@ -15,6 +15,12 @@ void pci_liveupdate_setup_device(struct pci_dev *dev);
> void pci_liveupdate_cleanup_device(struct pci_dev *dev);
> bool pci_liveupdate_preserve_bus_numbers(void);
> bool pci_liveupdate_refuse_bus_numbers(struct pci_bus *bus, struct pci_dev *dev);
> +int pci_liveupdate_adopt_acs(struct pci_dev *dev);
> +
> +static inline bool pci_liveupdate_was_incoming(struct pci_dev *dev)
> +{
> + return dev->liveupdate.was_incoming;
> +}
> #else
> static inline void pci_liveupdate_setup_device(struct pci_dev *dev)
> {
> @@ -34,6 +40,16 @@ static inline bool pci_liveupdate_refuse_bus_numbers(struct pci_bus *bus,
> {
> return false;
> }
> +
> +static inline int pci_liveupdate_adopt_acs(struct pci_dev *dev)
> +{
> + return -EINVAL;
> +}
> +
> +static inline bool pci_liveupdate_was_incoming(struct pci_dev *dev)
> +{
> + return false;
> +}
> #endif
>
> #endif /* DRIVERS_PCI_LIVEUPDATE_H */
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index fc4307a2327d..ebc565b4780a 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -35,6 +35,8 @@
> #include <linux/aer.h>
> #include <linux/bitfield.h>
> #include <linux/suspend.h>
> +
> +#include "liveupdate.h"
> #include "pci.h"
>
> DEFINE_MUTEX(pci_slot_mutex);
> @@ -1071,9 +1073,13 @@ 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.
> + * 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.
> */
> - if (pci_need_dev_specific_enable_acs(dev))
> + if (pci_need_dev_specific_enable_acs(dev) &&
> + !pci_liveupdate_was_incoming(dev))
> return;
>
> /* dev->acs_cap is not set yet, pci_acs_init() runs later */
> @@ -1170,6 +1176,9 @@ void pci_enable_acs(struct pci_dev *dev)
> bool enable_acs = false;
> int pos;
>
> + if (!pci_liveupdate_adopt_acs(dev))
> + return;
> +
> /* If an iommu is present we start with kernel default caps */
> if (pci_acs_enable) {
> if (pci_dev_specific_enable_acs(dev))