PCI: Fix finding bridge window in pci_reassign_bridge_resources()

pci_reassign_bridge_resources() walks upwards in the PCI bus hierarchy,
locates the relevant bridge window on each level using flags check, and
attempts to release the bridge window. The flags-based check is fragile due
to various fallbacks in the bridge window selection logic. As such, the
algorithm might not locate the correct bridge window.

Refactor pci_reassign_bridge_resources() to determine the correct bridge
window using pbus_select_window(), which contains logic to handle all
fallback cases correctly. Change function prefix to pbus as it now inputs
struct bus and resource for which to locate the bridge window.

The main purpose is to make bridge window selection logic consistent across
the entire PCI core (one step at a time). While this technically also fixes
the commit 8bb705e3e79d ("PCI: Add pci_resize_resource() for resizing
BARs") making the bridge window walk algorithm more robust, the normal
setup having a 64-bit resizable BAR underneath bridge(s) with 64-bit
prefetchable windows does not need to use any fallbacks. As such, the
practical impact is low (requiring BAR resize use case and a non-typical
bridge device).

The way to detect if unrelated resource failed again is left to use the
type based approximation which should not behave worse than before.

Fixes: 8bb705e3e79d ("PCI: Add pci_resize_resource() for resizing BARs")
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://patch.msgid.link/20250829131113.36754-14-ilpo.jarvinen@linux.intel.com

diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index cbd40f05c39c744ed40974f6d9bad8227895e1f6..0d96a91412278e71e76f02f56dc70f7fa6b55709 100644 (file)
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -334,7 +334,7 @@ struct device *pci_get_host_bridge_device(struct pci_dev *dev);
 void pci_put_host_bridge_device(struct device *dev);
 
 unsigned int pci_rescan_bus_bridge_resize(struct pci_dev *bridge);
-int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type);
+int pbus_reassign_bridge_resources(struct pci_bus *bus, struct resource *res);
 int __must_check pci_reassign_resource(struct pci_dev *dev, int i, resource_size_t add_size, resource_size_t align);
 
 int pci_configure_extended_tags(struct pci_dev *dev, void *ign);

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 913fd41e1d0d124b12626c2eca669130313d4a53..4b08b9cecab3f3858672d854284b31427b006383 100644 (file)
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -2522,10 +2522,16 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
 }
 EXPORT_SYMBOL_GPL(pci_assign_unassigned_bridge_resources);
 
-int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type)
+/*
+ * Walk to the root bus, find the bridge window relevant for @res and
+ * release it when possible. If the bridge window contains assigned
+ * resources, it cannot be released.
+ */
+int pbus_reassign_bridge_resources(struct pci_bus *bus, struct resource *res)
 {
+       unsigned long type = res->flags;
        struct pci_dev_resource *dev_res;
-       struct pci_dev *next;
+       struct pci_dev *bridge;
        LIST_HEAD(saved);
        LIST_HEAD(added);
        LIST_HEAD(failed);
@@ -2534,33 +2540,25 @@ int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type)
 
        down_read(&pci_bus_sem);
 
-       /* Walk to the root hub, releasing bridge BARs when possible */
-       next = bridge;
-       do {
-               bridge = next;
-               for (i = PCI_BRIDGE_RESOURCES; i < PCI_BRIDGE_RESOURCE_END;
-                    i++) {
-                       struct resource *res = &bridge->resource[i];
-
-                       if ((res->flags ^ type) & PCI_RES_TYPE_MASK)
-                               continue;
+       while (!pci_is_root_bus(bus)) {
+               bridge = bus->self;
+               res = pbus_select_window(bus, res);
+               if (!res)
+                       break;
 
-                       /* Ignore BARs which are still in use */
-                       if (res->child)
-                               continue;
+               i = pci_resource_num(bridge, res);
 
+               /* Ignore BARs which are still in use */
+               if (!res->child) {
                        ret = add_to_list(&saved, bridge, res, 0, 0);
                        if (ret)
                                goto cleanup;
 
                        pci_release_resource(bridge, i);
-                       break;
                }
-               if (i == PCI_BRIDGE_RESOURCE_END)
-                       break;
 
-               next = bridge->bus ? bridge->bus->self : NULL;
-       } while (next);
+               bus = bus->parent;
+       }
 
        if (list_empty(&saved)) {
                up_read(&pci_bus_sem);

diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 21f77e5c647c16287a0cad1b5e3c4ac7afd03f20..c3ba4ccecd433d414c5423dd8db1fecaf0539c90 100644 (file)
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -496,7 +496,7 @@ int pci_resize_resource(struct pci_dev *dev, int resno, int size)
 
        /* Check if the new config works by trying to assign everything. */
        if (dev->bus->self) {
-               ret = pci_reassign_bridge_resources(dev->bus->self, res->flags);
+               ret = pbus_reassign_bridge_resources(dev->bus, res);
                if (ret)
                        goto error_resize;
        }