From: 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 23/25] PCI/LUO: Check the PCI bus state after restoration
Date: Mon, 28 Jul 2025 01:24:53 -0700 [thread overview]
Message-ID: <20250728-luo-pci-v1-23-955b078dd653@kernel.org> (raw)
In-Reply-To: <20250728-luo-pci-v1-0-955b078dd653@kernel.org>
From: Jason Miu <jasonmiu@google.com>
After the LUO reboot, check if the bus topology assoicated with the
current PCI device is matching with the bus states saved in LUO. We like
to verify:
- The domain and bus numbers.
- The parent bus domain and number.
- The bus type, which can be PCI-PCI bridge, host bridge, or virtual bus.
- PCI bridge resource of host bridge, as different from PCI-PCI bridge
which the resource is restorated from the PCI bridge device, we check
if the host bridge resource is changed from the last boot.
Tested:
- QEMU VM liveupdate boot test with pci-lu-stub
Signed-off-by: Chris Li <chrisl@kernel.org>
---
drivers/pci/liveupdate.c | 123 ++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 110 insertions(+), 13 deletions(-)
diff --git a/drivers/pci/liveupdate.c b/drivers/pci/liveupdate.c
index be22af7a2db3a9bb06d8e100603a59f11b7fa5f8..739de5f655dba04024c9cf8db2bf6ea5e136cf5f 100644
--- a/drivers/pci/liveupdate.c
+++ b/drivers/pci/liveupdate.c
@@ -43,6 +43,45 @@ struct pci_ser {
/* struct pci_bus_ser buses[] */
};
+static struct pci_bus_ser *get_saved_pci_bus_state(struct pci_ser *state,
+ u16 domain, u8 number)
+{
+ int i;
+ struct pci_bus_ser *bus_state =
+ (struct pci_bus_ser *)(state->devs + state->dev_count);
+
+ for (i = 0; i < state->bus_count; i++, bus_state++) {
+ if (bus_state->domain == domain &&
+ bus_state->number == number)
+ return bus_state;
+ }
+
+ return NULL;
+}
+
+static enum pci_bus_ser_bridge_type get_bus_ser_bridge_type(struct pci_bus *bus)
+{
+ /* This bus is a virtual bus if no physical bridge is being referred. */
+ if (!bus->bridge)
+ return PCI_BUS_SER_NULL_BRIDGE;
+
+ return pci_is_root_bus(bus) ?
+ PCI_BUS_SER_PCI_HOST_BRIDGE : PCI_BUS_SER_PCI_BRIDGE;
+}
+
+static char *bus_ser_bridge_type_to_string(enum pci_bus_ser_bridge_type bt)
+{
+ switch (bt) {
+ case PCI_BUS_SER_NULL_BRIDGE:
+ return "PCI_BUS_SER_NULL_BRIDGE";
+ case PCI_BUS_SER_PCI_BRIDGE:
+ return "PCI_BUS_SER_PCI_BRIDGE";
+ case PCI_BUS_SER_PCI_HOST_BRIDGE:
+ return "PCI_BUS_SER_PCI_HOST_BRIDGE";
+ }
+ return "PCI_BUS_SER_INVALID";
+}
+
static void stack_push_buses(struct list_head *stack, struct list_head *buses)
{
struct pci_bus *bus;
@@ -183,6 +222,71 @@ static void save_device_resource(struct pci_resource_ser *dest,
dest->desc = src->desc;
}
+static void check_saved_bus_state(struct pci_dev *dev, struct pci_ser *pci_state)
+{
+ int i;
+ const struct resource *res;
+ const struct pci_resource_ser *saved_res;
+ const struct pci_bus_ser *bus_state =
+ get_saved_pci_bus_state(pci_state,
+ pci_domain_nr(dev->bus),
+ dev->bus->number);
+ struct pci_bus *bus = dev->bus;
+
+ if (!bus_state) {
+ panic("The bus of PCI device %s was not preserved by Liveupdate",
+ pci_name(dev));
+ }
+
+ if (get_bus_ser_bridge_type(bus) != bus_state->bridge_type) {
+ panic("The bus (%04x:%02x) bridge type (%s) of PCI device (%s) is changed. "
+ "Liveupdate preserved %s",
+ pci_domain_nr(bus), bus->number,
+ bus_ser_bridge_type_to_string(get_bus_ser_bridge_type(bus)),
+ pci_name(dev),
+ bus_ser_bridge_type_to_string(bus_state->bridge_type));
+ }
+
+ if (bus->parent) {
+ if (pci_domain_nr(bus->parent) != bus_state->parent_domain ||
+ bus->parent->number != bus_state->parent_number) {
+ panic("The parent bus (%04x:%02x) of PCI device (%s) is changed. "
+ "Liveupdate preserved %04x:%02x",
+ pci_domain_nr(bus->parent), bus->parent->number,
+ pci_name(dev),
+ bus_state->parent_domain, bus_state->parent_number);
+ }
+
+ /* Checkings of PCI-PCI bridge and Virtual bus ends. */
+ return;
+ }
+
+ /* This is a host bridge device */
+ for (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; i++) {
+
+ res = bus->resource[i];
+ if (res == NULL ||
+ res->name == NULL ||
+ strlen(res->name) == 0)
+ continue;
+
+ /* check its PCI bridge resource */
+ saved_res = &bus_state->resource[i];
+ if (res->start != saved_res->start ||
+ res->end != saved_res->end ||
+ res->flags != saved_res->flags ||
+ res->desc != saved_res->desc ||
+ strncmp(res->name, saved_res->name, sizeof(saved_res->name)) != 0) {
+ panic("Host bridge resource %pr is changed. "
+ "Liveupdate preserved "
+ "[mem 0x%016llx-0x%016llx flags 0x%016llx desc 0x%016llx name %s]",
+ res,
+ saved_res->start, saved_res->end,
+ saved_res->flags, saved_res->desc, saved_res->name);
+ }
+ }
+}
+
static int pci_save_device_state(struct device *dev, struct pci_dev_ser *s)
{
struct pci_dev *pdev = to_pci_dev(dev);
@@ -238,22 +342,13 @@ static void pci_save_bus_state(struct pci_bus *bus, struct pci_bus_ser *s)
s->domain = pci_domain_nr(bus);
s->number = bus->number;
+ s->bridge_type = get_bus_ser_bridge_type(bus);
+
if (bus->parent) {
s->parent_domain = pci_domain_nr(bus->parent);
s->parent_number = bus->parent->number;
}
- /* This bus is a virtual bus if no physical bridge is being referred. */
- if (!bus->bridge) {
- s->bridge_type = PCI_BUS_SER_NULL_BRIDGE;
- return;
- }
-
- if (!pci_is_root_bus(bus)) {
- s->bridge_type = PCI_BUS_SER_PCI_BRIDGE;
- return;
- }
-
/* This bridge is a PCI host bridge. Saves its resource. */
for (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; i++) {
/* This resource region is not claimed, skip. */
@@ -264,7 +359,6 @@ static void pci_save_bus_state(struct pci_bus *bus, struct pci_bus_ser *s)
save_device_resource(s->resource + i, bus->resource[i]);
}
- s->bridge_type = PCI_BUS_SER_PCI_HOST_BRIDGE;
}
static int pci_call_prepare(struct pci_ser *pci_state,
@@ -531,8 +625,11 @@ void pci_liveupdate_restore(struct pci_dev *dev)
s = pci_state->devs;
end = s + pci_state->dev_count;
for (; s < end; s++)
- if (s->path == path)
+ if (s->path == path) {
+ /* If the bus state checking fails, kernel panics */
+ check_saved_bus_state(dev, pci_state);
return pci_dev_do_restore(dev, s);
+ }
}
int pci_liveupdate_get_driver_data(struct pci_dev *pdev, u64 *data)
--
2.50.1.487.gc89ff58d15-goog
next prev parent reply other threads:[~2025-07-28 8:25 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 ` [PATCH RFC 05/25] PCI/LUO: Restore state at PCI enumeration Chris Li
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 ` chrisl [this message]
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-23-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
all inboxes | Powered by JetHome®