[PATCH v2 06/16] PCI: Hold pci_bus_sem across sizing and assignment entrypoints
From: Ilpo Järvinen
Date: Fri Nov 20 2026 - 08:50:20 EST
The bridge window sizing and resource assignment algorithm walks
bus->devices and inserts resources of the found devices into the
resource tree in many places. In addition, its internal datastructures
hold references to devices and resources it encountered while walking.
Most entrypoints to the algorithm do not hold pci_bus_sem, and
pci_assign_unassigned_bus_resources() drops it before the assignment
phase.
pci_rescan_remove_lock is not held by all callers and cannot be taken
by callers running under device_lock().
Protect the walks by holding pci_bus_sem for read across the entire
sizing and assignment operation right at the entrypoints.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
---
drivers/pci/setup-bus.c | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 7d135ddd93b2..966e0f243032 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1459,6 +1459,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct list_head *realloc_head)
void pci_bus_size_bridges(struct pci_bus *bus)
{
+ guard(rwsem_read)(&pci_bus_sem);
__pci_bus_size_bridges(bus, NULL);
}
EXPORT_SYMBOL(pci_bus_size_bridges);
@@ -1551,6 +1552,7 @@ void __pci_bus_assign_resources(const struct pci_bus *bus,
void pci_bus_assign_resources(const struct pci_bus *bus)
{
+ guard(rwsem_read)(&pci_bus_sem);
__pci_bus_assign_resources(bus, NULL, NULL);
}
EXPORT_SYMBOL(pci_bus_assign_resources);
@@ -1839,7 +1841,7 @@ static enum enable_type pci_realloc_detect(struct pci_bus *bus,
if (host->preserve_config)
return auto_disabled;
- pci_walk_bus(bus, iov_resources_unassigned, &unassigned);
+ pci_walk_bus_locked(bus, iov_resources_unassigned, &unassigned);
if (unassigned)
return auto_enabled;
@@ -2192,6 +2194,8 @@ void pci_assign_unassigned_root_bus_resources(struct pci_bus *bus)
int pci_try_num = 1;
enum enable_type enable_local;
+ guard(rwsem_read)(&pci_bus_sem);
+
/* Don't realloc if asked to do so */
enable_local = pci_realloc_detect(bus, pci_realloc_enable);
if (pci_realloc_enabled(enable_local)) {
@@ -2260,14 +2264,15 @@ void pci_assign_unassigned_resources(void)
}
}
-void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
+static void pci_bridge_size_and_assign_resources(struct pci_dev *bridge)
{
struct pci_bus *parent = bridge->subordinate;
/* List of resources that want additional resources */
LIST_HEAD(add_list);
int tried_times = 0;
LIST_HEAD(fail_head);
- int ret;
+
+ guard(rwsem_read)(&pci_bus_sem);
while (1) {
__pci_bus_size_bridges(parent, &add_list);
@@ -2294,6 +2299,13 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
pci_prepare_next_assign_round(&fail_head, tried_times,
whole_subtree);
}
+}
+
+void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
+{
+ int ret;
+
+ pci_bridge_size_and_assign_resources(bridge);
ret = pci_reenable_device(bridge);
if (ret)
@@ -2427,7 +2439,7 @@ static int __pci_do_resource_release_and_resize(struct pci_dev *pdev,
goto restore;
} else {
/* No bridge window to adjust; let the core reassign the bus. */
- pci_bus_assign_resources(bus);
+ __pci_bus_assign_resources(bus, NULL, NULL);
list_for_each_entry(dev_res, &saved, list) {
if (!resource_assigned(dev_res->res)) {
@@ -2504,7 +2516,7 @@ void pci_assign_unassigned_slot_resources(struct pci_bus *bus, u16 slot)
/* List of resources that want additional resources */
LIST_HEAD(add_list);
- down_read(&pci_bus_sem);
+ guard(rwsem_read)(&pci_bus_sem);
for_each_pci_bridge(dev, bus) {
if (slot != PCI_SLOT_ALL_DEVICES &&
PCI_SLOT(dev->devfn) != slot)
@@ -2513,7 +2525,6 @@ void pci_assign_unassigned_slot_resources(struct pci_bus *bus, u16 slot)
if (pci_has_subordinate(dev))
__pci_bus_size_bridges(dev->subordinate, &add_list);
}
- up_read(&pci_bus_sem);
__pci_bus_assign_resources(bus, &add_list, NULL);
}
@@ -2525,7 +2536,8 @@ EXPORT_SYMBOL_GPL(pci_assign_unassigned_bus_resources);
void pci_bus_size_and_assign_resources(struct pci_bus *bus)
{
- pci_bus_size_bridges(bus);
+ guard(rwsem_read)(&pci_bus_sem);
+ __pci_bus_size_bridges(bus, NULL);
__pci_bus_assign_resources(bus, NULL, NULL);
}
EXPORT_SYMBOL_GPL(pci_bus_size_and_assign_resources);
--
2.47.3