[PATCH v2 03/16] PCI: Use guard() for pci_bus_sem in pci_do_resource_release_and_resize()
From: Ilpo Järvinen
Date: Fri Nov 20 2026 - 08:48:15 EST
pci_do_resource_release_and_resize() releases pci_bus_sem on its common
exit path, which it shares with freeing the saved resource list. Move
the body into __pci_do_resource_release_and_resize() and take
pci_bus_sem with guard() in pci_do_resource_release_and_resize() to make
adding more locking simpler without mixing goto-based cleanup with
guard().
pci_bus_sem now also covers selecting the bridge window.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
---
drivers/pci/setup-bus.c | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 29ec9ba59d92..10b9d3eb2864 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -26,6 +26,8 @@
#include <linux/ioport.h>
#include <linux/cache.h>
#include <linux/limits.h>
+#include <linux/lockdep.h>
+#include <linux/rwsem.h>
#include <linux/sizes.h>
#include <linux/slab.h>
#include <linux/acpi.h>
@@ -2374,8 +2376,9 @@ static int pbus_reassign_bridge_resources(struct pci_bus *bus, struct resource *
return 0;
}
-int pci_do_resource_release_and_resize(struct pci_dev *pdev, int resno, int size,
- int exclude_bars)
+static int __pci_do_resource_release_and_resize(struct pci_dev *pdev,
+ int resno, int size,
+ int exclude_bars)
{
struct resource *res = pci_resource_n(pdev, resno);
struct pci_dev_resource *dev_res;
@@ -2386,6 +2389,8 @@ int pci_do_resource_release_and_resize(struct pci_dev *pdev, int resno, int size
unsigned int i;
int old, ret;
+ lockdep_assert_held(&pci_bus_sem);
+
b_win = pbus_select_window(bus, res);
if (!b_win)
return -EINVAL;
@@ -2398,8 +2403,6 @@ int pci_do_resource_release_and_resize(struct pci_dev *pdev, int resno, int size
if (ret)
return ret;
- down_read(&pci_bus_sem);
-
pci_dev_for_each_resource(pdev, r, i) {
if (i >= PCI_BRIDGE_RESOURCES)
break;
@@ -2435,7 +2438,6 @@ int pci_do_resource_release_and_resize(struct pci_dev *pdev, int resno, int size
}
out:
- up_read(&pci_bus_sem);
pci_dev_res_free_list(&saved);
return ret;
@@ -2478,6 +2480,15 @@ int pci_do_resource_release_and_resize(struct pci_dev *pdev, int resno, int size
goto out;
}
+int pci_do_resource_release_and_resize(struct pci_dev *pdev, int resno, int size,
+ int exclude_bars)
+{
+ guard(rwsem_read)(&pci_bus_sem);
+
+ return __pci_do_resource_release_and_resize(pdev, resno, size,
+ exclude_bars);
+}
+
void pci_assign_unassigned_bus_resources(struct pci_bus *bus)
{
struct pci_dev *dev;
--
2.47.3