* [PATCH v2] PCI: Protect pci_reassign_bridge_resources() against concurrent addition/removal
@ 2019-09-25 1:16 Benjamin Herrenschmidt
2019-09-27 10:25 ` Bjorn Helgaas
0 siblings, 1 reply; 2+ messages in thread
From: Benjamin Herrenschmidt @ 2019-09-25 1:16 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: linux-pci, Dan Carpenter
pci_reassign_bridge_resources() can be called by pci_resize_resource()
at runtime.
It will walk the PCI tree up and down, and isn't currently protected
against any changes or hotplug operation.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
v2: Fix a missing exit case
Reported by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/pci/setup-bus.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 79b1fa6519be..871dad7d02ea 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -2066,6 +2066,8 @@ int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type)
unsigned int i;
int ret;
+ down_read(&pci_bus_sem);
+
/* Walk to the root hub, releasing bridge BARs when possible */
next = bridge;
do {
@@ -2100,8 +2102,10 @@ int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type)
next = bridge->bus ? bridge->bus->self : NULL;
} while (next);
- if (list_empty(&saved))
+ if (list_empty(&saved)) {
+ up_read(&pci_bus_sem);
return -ENOENT;
+ }
__pci_bus_size_bridges(bridge->subordinate, &added);
__pci_bridge_assign_resources(bridge, &added, &failed);
@@ -2122,6 +2126,7 @@ int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type)
}
free_list(&saved);
+ up_read(&pci_bus_sem);
return 0;
cleanup:
@@ -2150,6 +2155,7 @@ int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type)
pci_setup_bridge(bridge->subordinate);
}
free_list(&saved);
+ up_read(&pci_bus_sem);
return ret;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] PCI: Protect pci_reassign_bridge_resources() against concurrent addition/removal
2019-09-25 1:16 [PATCH v2] PCI: Protect pci_reassign_bridge_resources() against concurrent addition/removal Benjamin Herrenschmidt
@ 2019-09-27 10:25 ` Bjorn Helgaas
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Helgaas @ 2019-09-27 10:25 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linux-pci, Dan Carpenter
On Wed, Sep 25, 2019 at 11:16:55AM +1000, Benjamin Herrenschmidt wrote:
> pci_reassign_bridge_resources() can be called by pci_resize_resource()
> at runtime.
>
> It will walk the PCI tree up and down, and isn't currently protected
> against any changes or hotplug operation.
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Applied to pci/resource for v5.5, thanks!
> ---
>
> v2: Fix a missing exit case
> Reported by: Dan Carpenter <dan.carpenter@oracle.com>
>
> ---
> drivers/pci/setup-bus.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
> index 79b1fa6519be..871dad7d02ea 100644
> --- a/drivers/pci/setup-bus.c
> +++ b/drivers/pci/setup-bus.c
> @@ -2066,6 +2066,8 @@ int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type)
> unsigned int i;
> int ret;
>
> + down_read(&pci_bus_sem);
> +
> /* Walk to the root hub, releasing bridge BARs when possible */
> next = bridge;
> do {
> @@ -2100,8 +2102,10 @@ int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type)
> next = bridge->bus ? bridge->bus->self : NULL;
> } while (next);
>
> - if (list_empty(&saved))
> + if (list_empty(&saved)) {
> + up_read(&pci_bus_sem);
> return -ENOENT;
> + }
>
> __pci_bus_size_bridges(bridge->subordinate, &added);
> __pci_bridge_assign_resources(bridge, &added, &failed);
> @@ -2122,6 +2126,7 @@ int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type)
> }
>
> free_list(&saved);
> + up_read(&pci_bus_sem);
> return 0;
>
> cleanup:
> @@ -2150,6 +2155,7 @@ int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type)
> pci_setup_bridge(bridge->subordinate);
> }
> free_list(&saved);
> + up_read(&pci_bus_sem);
>
> return ret;
> }
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-09-27 10:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-25 1:16 [PATCH v2] PCI: Protect pci_reassign_bridge_resources() against concurrent addition/removal Benjamin Herrenschmidt
2019-09-27 10:25 ` Bjorn Helgaas
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).