From: Bjorn Helgaas <helgaas@kernel.org>
To: Bartosz Golaszewski <brgl@bgdev.pl>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
Konrad Dybcio <konradybcio@kernel.org>
Subject: Re: [PATCH] PCI: take the rescan lock when adding devices during host probe
Date: Tue, 1 Oct 2024 16:11:02 -0500 [thread overview]
Message-ID: <20241001211102.GA227022@bhelgaas> (raw)
In-Reply-To: <20240926130924.36409-1-brgl@bgdev.pl>
On Thu, Sep 26, 2024 at 03:09:23PM +0200, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
>
> Since adding the PCI power control code, we may end up with a race
> between the pwrctl platform device rescanning the bus and the host
> controller probe function. The latter needs to take the rescan lock when
> adding devices or may crash.
>
> Reported-by: Konrad Dybcio <konradybcio@kernel.org>
> Fixes: 4565d2652a37 ("PCI/pwrctl: Add PCI power control core code")
> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> ---
> drivers/pci/probe.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
> index 4f68414c3086..f1615805f5b0 100644
> --- a/drivers/pci/probe.c
> +++ b/drivers/pci/probe.c
> @@ -3105,7 +3105,9 @@ int pci_host_probe(struct pci_host_bridge *bridge)
> list_for_each_entry(child, &bus->children, node)
> pcie_bus_configure_settings(child);
>
> + pci_lock_rescan_remove();
> pci_bus_add_devices(bus);
> + pci_unlock_rescan_remove();
Seems like we do need locking here, but don't we need a more
comprehensive change? There are many other callers of
pci_bus_add_devices(), and most of them look similarly unprotected.
> return 0;
> }
> EXPORT_SYMBOL_GPL(pci_host_probe);
> --
> 2.30.2
>
next prev parent reply other threads:[~2024-10-01 21:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-26 13:09 [PATCH] PCI: take the rescan lock when adding devices during host probe Bartosz Golaszewski
2024-09-30 16:09 ` Konrad Dybcio
2024-10-01 21:11 ` Bjorn Helgaas [this message]
2024-10-02 8:36 ` Bartosz Golaszewski
2024-10-02 20:31 ` Konrad Dybcio
2024-10-02 20:53 ` Bjorn Helgaas
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=20241001211102.GA227022@bhelgaas \
--to=helgaas@kernel.org \
--cc=bartosz.golaszewski@linaro.org \
--cc=bhelgaas@google.com \
--cc=brgl@bgdev.pl \
--cc=konradybcio@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).