From: Chris Li <chrisl@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Danilo Krummrich <dakr@kernel.org>, Len Brown <lenb@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
linux-acpi@vger.kernel.org, David Matlack <dmatlack@google.com>,
Pasha Tatashin <tatashin@google.com>,
Jason Miu <jasonmiu@google.com>,
Vipin Sharma <vipinsh@google.com>,
Saeed Mahameed <saeedm@nvidia.com>,
Adithya Jayachandran <ajayachandra@nvidia.com>,
Parav Pandit <parav@nvidia.com>, William Tu <witu@nvidia.com>,
Mike Rapoport <rppt@kernel.org>, Chris Li <chrisl@kernel.org>,
Jason Gunthorpe <jgg@ziepe.ca>,
Leon Romanovsky <leon@kernel.org>
Subject: [PATCH RFC 05/25] PCI/LUO: Restore state at PCI enumeration
Date: Mon, 28 Jul 2025 01:24:35 -0700 [thread overview]
Message-ID: <20250728-luo-pci-v1-5-955b078dd653@kernel.org> (raw)
In-Reply-To: <20250728-luo-pci-v1-0-955b078dd653@kernel.org>
Add a PCI device saved state member to indicate the device is requested
vs depended.
Restore the PCI subsystem saved state folio during PCI enumeration.
When a new PCI device is created, restore the per device state pointer
into the dev->lu.dev_state if the device is found in the saved
devices array, by matching the device path.
Also restore the dev->lu.requested or dev->lu.depended base on the saved
"requested" field. Add such devices to the "probed_devices" list.
Signed-off-by: Chris Li <chrisl@kernel.org>
---
drivers/pci/liveupdate.c | 54 ++++++++++++++++++++++++++++++++++++++++++
drivers/pci/pci.h | 6 +++++
drivers/pci/probe.c | 2 ++
include/linux/dev_liveupdate.h | 2 ++
4 files changed, 64 insertions(+)
diff --git a/drivers/pci/liveupdate.c b/drivers/pci/liveupdate.c
index bbff9b314f99185dfe8941b711cdf0db16b1ed8a..4d13071f5edd6520adb64003262f08d1f79e26c4 100644
--- a/drivers/pci/liveupdate.c
+++ b/drivers/pci/liveupdate.c
@@ -16,6 +16,7 @@
#define PCI_SUBSYSTEM_NAME "pci"
static LIST_HEAD(preserved_devices);
+static LIST_HEAD(probe_devices);
struct pci_dev_ser {
u32 path; /* domain + bus + slot + fn */
@@ -91,6 +92,7 @@ static int build_liveupdate_devices(struct list_head *head)
static void dev_cleanup_liveupdate(struct device *dev)
{
dev->lu.depended = 0;
+ dev->lu.dev_state = NULL;
list_del_init(&dev->lu.lu_next);
}
@@ -310,6 +312,58 @@ struct liveupdate_subsystem pci_liveupdate_ops = {
.name = PCI_SUBSYSTEM_NAME,
};
+static struct pci_ser *pci_state_get(void)
+{
+ static struct pci_ser *pci_state;
+ struct folio *folio;
+ phys_addr_t data = 0;
+ int ret;
+
+ if (pci_state)
+ return pci_state;
+
+ ret = liveupdate_get_subsystem_data(&pci_liveupdate_ops, &data);
+ if (ret || !data)
+ panic("PCI liveupdate: get subsystem data: [%llx] ret: %d", data, ret);
+
+ folio = kho_restore_folio(data);
+ if (!folio)
+ panic("PCI liveupdate: restore folio from %llx failed", data);
+
+ /* Cache the value for future callers. */
+ pci_state = folio_address(folio);
+ return pci_state;
+}
+
+static void pci_dev_do_restore(struct pci_dev *dev, struct pci_dev_ser *s)
+{
+ dev->dev.lu.dev_state = s;
+ if (s->requested)
+ dev->dev.lu.requested = 1;
+ else
+ dev->dev.lu.depended = 1;
+ pci_info(dev, "liveupdate restore [%s] data: [%llx]\n",
+ s->requested ? "requested" : "depended",
+ s->driver_data);
+ list_move_tail(&dev->dev.lu.lu_next, &probe_devices);
+}
+
+void pci_liveupdate_restore(struct pci_dev *dev)
+{
+ int path;
+ struct pci_dev_ser *s, *end;
+
+ if (!liveupdate_state_updated())
+ return;
+
+ path = pci_get_device_path(dev);
+ s = pci_state_get()->devs;
+ end = s + pci_state_get()->count;
+ for (; s < end; s++)
+ if (s->path == path)
+ return pci_dev_do_restore(dev, s);
+}
+
static int __init pci_liveupdate_init(void)
{
int ret;
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 12215ee72afb682b669c0e3a582b5379828e70c4..c9a7383753949994e031dc362920286a475fe2ab 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -1159,4 +1159,10 @@ static inline int pci_msix_write_tph_tag(struct pci_dev *pdev, unsigned int inde
(PCI_CONF1_ADDRESS(bus, dev, func, reg) | \
PCI_CONF1_EXT_REG(reg))
+#ifdef CONFIG_LIVEUPDATE
+void pci_liveupdate_restore(struct pci_dev *dev);
+#else
+static inline void pci_liveupdate_restore(struct pci_dev *dev) {}
+#endif
+
#endif /* DRIVERS_PCI_H */
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index dddd7ebc03d1a6e6ee456e0bf02ab9833a819509..a0605af1a699cd07b09897172803dcba1d2da9f9 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2017,6 +2017,8 @@ int pci_setup_device(struct pci_dev *dev)
if (pci_early_dump)
early_dump_pci_device(dev);
+ pci_liveupdate_restore(dev);
+
/* Need to have dev->class ready */
dev->cfg_size = pci_cfg_space_size(dev);
diff --git a/include/linux/dev_liveupdate.h b/include/linux/dev_liveupdate.h
index fa664976f9f5e90b8a5a17cfbed8bd2fdc87b7a1..dc65e2b2d92c02bf15440b6745c62cd748721eef 100644
--- a/include/linux/dev_liveupdate.h
+++ b/include/linux/dev_liveupdate.h
@@ -19,6 +19,7 @@ struct device;
* @lu_next: List head for linking the device into live update
* related lists (e.g., a list of devices participating
* in a live update sequence).
+ * @dev_state: Set to the device state at restore.
* @requested: Set if a live update has been requested for this
* device (i.e. device will participate in live update).
* @depended: Set if the device participtate the live update due to
@@ -32,6 +33,7 @@ struct device;
*/
struct dev_liveupdate {
struct list_head lu_next;
+ void *dev_state;
bool requested:1;
bool depended:1;
bool visited:1;
--
2.50.1.487.gc89ff58d15-goog
next prev parent reply other threads:[~2025-07-28 8:24 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-28 8:24 [RFC PATCH 00/25] Live Update Orchestrator: PCI subsystem Chris Li
2025-07-28 8:24 ` [PATCH RFC 01/25] PCI/LUO: Register with Liveupdate Orchestrator Chris Li
2025-07-28 8:24 ` [PATCH RFC 02/25] PCI/LUO: Add struct dev_liveupdate Chris Li
2025-07-28 8:24 ` [PATCH RFC 03/25] PCI/LUO: Create requested liveupdate device list Chris Li
2025-07-28 8:24 ` [PATCH RFC 04/25] PCI/LUO: Forward prepare()/freeze()/cancel() callbacks to driver Chris Li
2025-07-28 8:24 ` Chris Li [this message]
2025-07-28 8:24 ` [PATCH RFC 06/25] PCI/LUO: Forward finish callbacks to drivers Chris Li
2025-07-28 8:24 ` [PATCH RFC 07/25] PCI/LUO: Save and restore driver name Chris Li
2025-07-28 8:24 ` [PATCH RFC 08/25] PCI/LUO: Add liveupdate to pcieport driver Chris Li
2025-07-28 8:24 ` [PATCH RFC 09/25] PCI/LUO: Save SR-IOV number of VF Chris Li
2025-07-28 8:24 ` [PATCH RFC 10/25] PCI/LUO: Add pci_liveupdate_get_driver_data() Chris Li
2025-07-28 8:24 ` [PATCH RFC 11/25] PCI: pci-lu-stub: Add a stub driver for Live Update testing Chris Li
2025-07-28 8:24 ` [PATCH RFC 12/25] PCI/LUO: Save struct pci_dev info during prepare phase chrisl
2025-07-28 8:24 ` [PATCH RFC 13/25] PCI/LUO: Check the device function numbers in restoration chrisl
2025-07-28 8:24 ` [PATCH RFC 14/25] PCI/LUO: Restore power state of a PCI device chrisl
2025-07-28 8:24 ` [PATCH RFC 15/25] PCI/LUO: Restore PM related fields chrisl
2025-07-28 8:24 ` [PATCH RFC 16/25] PCI/LUO: Restore the pme_poll flag chrisl
2025-07-28 8:24 ` [PATCH RFC 17/25] PCI/LUO: Restore the no_d3cold flag chrisl
2025-07-28 8:24 ` [PATCH RFC 18/25] PCI/LUO: Restore pci_dev fields during probe chrisl
2025-07-28 8:24 ` [PATCH RFC 19/25] PCI/LUO: Track liveupdate buses Chris Li
2025-07-28 8:24 ` [PATCH RFC 20/25] PCI/LUO: Avoid write to liveupdate devices at boot Chris Li
2025-07-28 17:23 ` Thomas Gleixner
2025-07-28 23:50 ` Jason Gunthorpe
2025-07-30 4:13 ` Chris Li
2025-07-30 1:51 ` Chris Li
2025-07-31 15:01 ` Jason Gunthorpe
2025-08-01 23:04 ` Chris Li
2025-08-02 13:50 ` Jason Gunthorpe
2025-08-07 0:50 ` Chris Li
2025-07-28 8:24 ` [PATCH RFC 21/25] PCI/LUO: Save and restore the PCI resource chrisl
2025-07-28 8:24 ` [PATCH RFC 22/25] PCI/LUO: Save PCI bus and host bridge states chrisl
2025-07-28 8:24 ` [PATCH RFC 23/25] PCI/LUO: Check the PCI bus state after restoration chrisl
2025-07-28 8:24 ` [PATCH RFC 24/25] PCI: pci-lu-pf-stub: Add a PF stub driver for Live Update testing Chris Li
2025-07-28 8:24 ` [PATCH RFC 25/25] PCI/LUO: Clean up PCI_SER_GET() chrisl
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=20250728-luo-pci-v1-5-955b078dd653@kernel.org \
--to=chrisl@kernel.org \
--cc=ajayachandra@nvidia.com \
--cc=bhelgaas@google.com \
--cc=dakr@kernel.org \
--cc=dmatlack@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=jasonmiu@google.com \
--cc=jgg@ziepe.ca \
--cc=lenb@kernel.org \
--cc=leon@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=parav@nvidia.com \
--cc=rafael@kernel.org \
--cc=rppt@kernel.org \
--cc=saeedm@nvidia.com \
--cc=tatashin@google.com \
--cc=vipinsh@google.com \
--cc=witu@nvidia.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;
as well as URLs for NNTP newsgroup(s).