From: David Matlack <dmatlack@google.com>
To: kexec@lists.infradead.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linux-pci@vger.kernel.org
Cc: Adithya Jayachandran <ajayachandra@nvidia.com>,
Alexander Graf <graf@amazon.com>,
Alex Williamson <alex@shazbot.org>,
Alex Williamson <alex.williamson@nvidia.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Chris Down <chris@chrisdown.name>, Chris Li <chrisl@kernel.org>,
David Matlack <dmatlack@google.com>,
David Rientjes <rientjes@google.com>,
Jacob Pan <jacob.pan@linux.microsoft.com>,
Jason Gunthorpe <jgg@nvidia.com>,
Jonathan Corbet <corbet@lwn.net>,
Josh Hilke <jrhilke@google.com>,
Leon Romanovsky <leonro@nvidia.com>,
Lukas Wunner <lukas@wunner.de>, Mike Rapoport <rppt@kernel.org>,
Parav Pandit <parav@nvidia.com>,
Pasha Tatashin <pasha.tatashin@soleen.com>,
Pranjal Shrivastava <praan@google.com>,
Pratyush Yadav <pratyush@kernel.org>,
Randy Dunlap <rdunlap@infradead.org>,
Saeed Mahameed <saeedm@nvidia.com>,
Samiullah Khawaja <skhawaja@google.com>,
Shuah Khan <skhan@linuxfoundation.org>,
Vipin Sharma <vipinsh@google.com>, William Tu <witu@nvidia.com>,
Yi Liu <yi.l.liu@intel.com>
Subject: [PATCH v11 05/13] PCI: liveupdate: Auto-preserve upstream bridges across Live Update
Date: Wed, 18 Nov 2026 22:36:56 +0000 [thread overview]
Message-ID: <20261118223704.3286085-6-dmatlack@google.com> (raw)
In-Reply-To: <20261118223704.3286085-1-dmatlack@google.com>
Automatically preserve every bridge between a preserved device and its
root port when the device is preserved.
Subsequent commits use this to ensure that preserved devices can
continue performing memory transactions without a disruption or change
in routing.
Track the number of preserved devices at or below each bridge with a
reference count in struct pci_dev_ser. A bridge stays preserved until
all of its downstream preserved devices are unpreserved or finish their
participation in the Live Update.
struct pci_ser::nr_devices counts the struct pci_dev_ser entries that are
in use, so it only changes when a device's entry is allocated or
released, i.e. when its reference count goes from 0 to 1 or from 1 to 0,
not on every preserve and unpreserve.
Signed-off-by: David Matlack <dmatlack@google.com>
Reviewed-by: Pasha Tatashin <pasha.tatashin@soleen.com>
Reviewed-by: Pranjal Shrivastava <praan@google.com>
Reviewed-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/liveupdate.c | 125 +++++++++++++++++++++++++++++----------
include/linux/pci.h | 3 +
2 files changed, 97 insertions(+), 31 deletions(-)
diff --git a/drivers/pci/liveupdate.c b/drivers/pci/liveupdate.c
index d1b4000c3e78..ad2bb73e1d05 100644
--- a/drivers/pci/liveupdate.c
+++ b/drivers/pci/liveupdate.c
@@ -122,7 +122,6 @@
* preserved. These may be relaxed in the future:
*
* * The device cannot be a Virtual Function (VF).
- * * The device cannot be behind a PCI-to-PCI bridge.
*
* Driver Binding
* ==============
@@ -137,6 +136,18 @@
* bound to the correct driver. The PCI core does not protect against a device
* getting preserved by driver A in the outgoing kernel and then getting bound
* to driver B in the incoming kernel.
+ *
+ * PCI-to-PCI Bridges
+ * ==================
+ *
+ * Any PCI-to-PCI bridges upstream of a preserved device are automatically
+ * preserved when the device is preserved. The PCI core keeps track of the
+ * number of downstream devices that are preserved under a bridge so that the
+ * bridge is only unpreserved once all downstream devices are unpreserved.
+ *
+ * This lets the PCI core keep the bridges above preserved devices forwarding
+ * their memory transactions, without changes in routing, throughout the Live
+ * Update.
*/
#define pr_fmt(fmt) "PCI: liveupdate: " fmt
@@ -437,7 +448,8 @@ static struct pci_dev_ser *pci_liveupdate_alloc_dev_ser(
}
/*
- * Stop preserving @dev by releasing its struct pci_dev_ser.
+ * Stop preserving @dev by releasing its struct pci_dev_ser. The caller must
+ * have dropped the last reference on it.
*/
static void pci_liveupdate_free_dev_ser(struct pci_flb_outgoing *outgoing,
struct pci_dev *dev)
@@ -450,43 +462,71 @@ static void pci_liveupdate_free_dev_ser(struct pci_flb_outgoing *outgoing,
dev->liveupdate.outgoing = NULL;
}
-static void pci_liveupdate_unpreserve_device(struct pci_flb_outgoing *outgoing,
- struct pci_dev *dev)
+static int pci_liveupdate_unpreserve_device(struct pci_flb_outgoing *outgoing,
+ struct pci_dev *dev)
{
struct pci_dev_ser *dev_ser = dev->liveupdate.outgoing;
if (!dev_ser) {
pci_warn(dev, "Cannot unpreserve device that is not preserved\n");
- return;
+ return -EINVAL;
}
+ if (!dev_ser->refcount) {
+ pci_WARN(dev, 1, "Preserved device has a 0 refcount!\n");
+ return -EINVAL;
+ }
+
+ if (--dev_ser->refcount)
+ return 0;
+
pci_liveupdate_free_dev_ser(outgoing, dev);
+ return 0;
+}
+
+static void pci_liveupdate_unpreserve_path(struct pci_flb_outgoing *outgoing,
+ struct pci_dev *dev,
+ struct pci_dev *end)
+{
+ for_each_pci_dev_in_path(dev) {
+ if (dev == end)
+ break;
+
+ if (pci_liveupdate_unpreserve_device(outgoing, dev))
+ return;
+ }
}
static int pci_liveupdate_preserve_device(struct pci_flb_outgoing *outgoing,
struct pci_dev *dev)
{
- struct pci_dev_ser *dev_ser;
+ struct pci_dev_ser *dev_ser = dev->liveupdate.outgoing;
if (dev->is_virtfn) {
pci_warn(dev, "Cannot preserve Virtual Functions\n");
return -EINVAL;
}
- if (dev->liveupdate.outgoing) {
- pci_warn(dev, "Device is already preserved\n");
- return -EBUSY;
+ if (dev_ser) {
+ /*
+ * Endpoint devices can only be preserved once. Bridges are
+ * preserved once for every preserved device below them.
+ */
+ if (!dev->subordinate) {
+ pci_warn(dev, "Device is already preserved\n");
+ return -EBUSY;
+ }
+
+ if (!dev_ser->refcount) {
+ pci_WARN(dev, 1, "Preserved device with 0 refcount!\n");
+ return -EINVAL;
+ }
+ } else {
+ dev_ser = pci_liveupdate_alloc_dev_ser(outgoing, dev);
+ if (IS_ERR(dev_ser))
+ return PTR_ERR(dev_ser);
}
- if (!pci_is_root_bus(dev->bus)) {
- pci_warn(dev, "Cannot preserve devices behind bridges\n");
- return -EINVAL;
- }
-
- dev_ser = pci_liveupdate_alloc_dev_ser(outgoing, dev);
- if (IS_ERR(dev_ser))
- return PTR_ERR(dev_ser);
-
dev_ser->refcount++;
return 0;
}
@@ -500,12 +540,16 @@ static int pci_liveupdate_preserve_device(struct pci_flb_outgoing *outgoing,
* pci_liveupdate_preserve() from their struct liveupdate_file_handler
* preserve() callback to ensure the outgoing struct pci_ser is already set up.
*
+ * pci_liveupdate_preserve() automatically preserves all bridges upstream of
+ * @dev.
+ *
* Return: 0 on success, <0 on failure.
*/
int pci_liveupdate_preserve(struct pci_dev *dev)
{
struct pci_flb_outgoing *outgoing = NULL;
- int ret;
+ struct pci_dev *start = dev;
+ int ret = -ENODEV;
guard(rwsem_write)(&pci_liveupdate.rwsem);
@@ -513,7 +557,13 @@ int pci_liveupdate_preserve(struct pci_dev *dev)
if (IS_ERR(outgoing))
return PTR_ERR(outgoing);
- ret = pci_liveupdate_preserve_device(outgoing, dev);
+ for_each_pci_dev_in_path(dev) {
+ ret = pci_liveupdate_preserve_device(outgoing, dev);
+ if (ret) {
+ pci_liveupdate_unpreserve_path(outgoing, start, dev);
+ break;
+ }
+ }
pci_liveupdate_flb_put_outgoing();
return ret;
@@ -528,6 +578,9 @@ EXPORT_SYMBOL_GPL(pci_liveupdate_preserve);
* longer be preserved across the next Live Update. Drivers are expected to call
* pci_liveupdate_unpreserve() from their struct liveupdate_file_handler
* unpreserve() callback, while the outgoing struct pci_ser still exists.
+ *
+ * pci_liveupdate_unpreserve() drops @dev's reference on each bridge upstream of
+ * @dev, unpreserving bridges that have no other preserved devices below them.
*/
void pci_liveupdate_unpreserve(struct pci_dev *dev)
{
@@ -541,7 +594,7 @@ void pci_liveupdate_unpreserve(struct pci_dev *dev)
return;
}
- pci_liveupdate_unpreserve_device(outgoing, dev);
+ pci_liveupdate_unpreserve_path(outgoing, dev, /*end=*/NULL);
pci_liveupdate_flb_put_outgoing();
}
EXPORT_SYMBOL_GPL(pci_liveupdate_unpreserve);
@@ -621,28 +674,30 @@ void pci_liveupdate_cleanup_device(struct pci_dev *dev)
pci_WARN(dev, 1, "Destroying incoming-preserved device!\n");
}
-static void pci_liveupdate_finish_device(struct pci_ser *ser, struct pci_dev *dev)
+static int pci_liveupdate_finish_device(struct pci_ser *ser, struct pci_dev *dev)
{
if (!dev->liveupdate.incoming) {
pci_warn(dev, "Cannot finish preserving an unpreserved device\n");
- return;
+ return -EINVAL;
}
- if (dev->liveupdate.incoming->refcount != 1) {
- pci_WARN(dev, 1, "Preserved device has a corrupted refcount!\n");
- return;
+ if (!dev->liveupdate.incoming->refcount) {
+ pci_WARN(dev, 1, "Preserved device has a 0 refcount!\n");
+ return -EINVAL;
}
/*
- * Drop the refcount so this device does not get treated as an incoming
- * device again, e.g. in case pci_liveupdate_setup_device() gets called
- * again because the device is hot-plugged.
+ * Once the refcount reaches 0 the device is no longer treated as
+ * incoming, e.g. if pci_liveupdate_setup_device() gets called again
+ * because the device is hot-plugged.
*/
- dev->liveupdate.incoming->refcount = 0;
+ if (--dev->liveupdate.incoming->refcount)
+ return 0;
pci_info(dev, "Device is finished participating in Live Update\n");
dev->liveupdate.incoming = NULL;
ser->nr_devices--;
+ return 0;
}
/**
@@ -654,6 +709,10 @@ static void pci_liveupdate_finish_device(struct pci_ser *ser, struct pci_dev *de
* Update. Drivers must call pci_liveupdate_finish() from their struct
* liveupdate_file_handler finish() callback, while the incoming struct pci_ser
* is still available.
+ *
+ * pci_liveupdate_finish() drops @dev's reference on each bridge upstream of
+ * @dev, finishing bridges that have no other incoming preserved devices below
+ * them.
*/
void pci_liveupdate_finish(struct pci_dev *dev)
{
@@ -667,7 +726,11 @@ void pci_liveupdate_finish(struct pci_dev *dev)
return;
}
- pci_liveupdate_finish_device(incoming->ser, dev);
+ for_each_pci_dev_in_path(dev) {
+ if (pci_liveupdate_finish_device(incoming->ser, dev))
+ break;
+ }
+
pci_liveupdate_flb_put_incoming();
}
EXPORT_SYMBOL_GPL(pci_liveupdate_finish);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index bb500623ca3e..6482549a8417 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -840,6 +840,9 @@ static inline struct pci_dev *pci_upstream_bridge(struct pci_dev *dev)
return dev->bus->self;
}
+#define for_each_pci_dev_in_path(dev) \
+ for (; dev; dev = pci_upstream_bridge(dev))
+
#ifdef CONFIG_PCI_MSI
static inline bool pci_dev_msi_enabled(struct pci_dev *pci_dev)
{
--
2.56.1.703.gf848ed807c-goog
next prev parent reply other threads:[~2026-11-18 22:37 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 22:36 [PATCH v11 00/13] PCI: liveupdate: PCI core support for Live Update David Matlack
2026-11-18 22:36 ` [PATCH v11 01/13] PCI: liveupdate: Set up FLB handler for the PCI core David Matlack
2026-11-18 22:36 ` [PATCH v11 02/13] PCI: liveupdate: Track outgoing preserved PCI devices David Matlack
2026-11-18 22:36 ` [PATCH v11 03/13] PCI: liveupdate: Track incoming " David Matlack
2026-11-18 22:36 ` [PATCH v11 04/13] PCI: liveupdate: Document driver binding responsibilities David Matlack
2026-11-18 22:36 ` David Matlack [this message]
2026-11-18 22:36 ` [PATCH v11 06/13] PCI: liveupdate: Preserve bus numbers during Live Update David Matlack
2026-11-18 22:36 ` [PATCH v11 07/13] PCI: Refactor matching logic for pci_dev_acs_ops David Matlack
2026-11-18 22:36 ` [PATCH v11 08/13] PCI: Save and restore the ACS Control register and Egress Control Vector David Matlack
2026-11-18 22:37 ` [PATCH v11 09/13] PCI: liveupdate: Adopt ACS controls in incoming preserved devices David Matlack
2026-11-18 22:37 ` [PATCH v11 10/13] PCI: liveupdate: Adopt ARI Forwarding Enable on preserved bridges David Matlack
2026-11-18 22:37 ` [PATCH v11 11/13] PCI: liveupdate: Freeze preservation status during shutdown David Matlack
2026-11-18 22:37 ` [PATCH v11 13/13] Documentation: PCI: Add documentation for Live Update David Matlack
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=20261118223704.3286085-6-dmatlack@google.com \
--to=dmatlack@google.com \
--cc=ajayachandra@nvidia.com \
--cc=alex.williamson@nvidia.com \
--cc=alex@shazbot.org \
--cc=bhelgaas@google.com \
--cc=chris@chrisdown.name \
--cc=chrisl@kernel.org \
--cc=corbet@lwn.net \
--cc=graf@amazon.com \
--cc=jacob.pan@linux.microsoft.com \
--cc=jgg@nvidia.com \
--cc=jrhilke@google.com \
--cc=kexec@lists.infradead.org \
--cc=leonro@nvidia.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-pci@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=parav@nvidia.com \
--cc=pasha.tatashin@soleen.com \
--cc=praan@google.com \
--cc=pratyush@kernel.org \
--cc=rdunlap@infradead.org \
--cc=rientjes@google.com \
--cc=rppt@kernel.org \
--cc=saeedm@nvidia.com \
--cc=skhan@linuxfoundation.org \
--cc=skhawaja@google.com \
--cc=vipinsh@google.com \
--cc=witu@nvidia.com \
--cc=yi.l.liu@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