From: Dexuan Cui <decui@microsoft.com>
To: bhelgaas@google.com, wei.liu@kernel.org, kys@microsoft.com,
haiyangz@microsoft.com, lpieralisi@kernel.org,
linux-pci@vger.kernel.org
Cc: linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org,
Boqun.Feng@microsoft.com, sunilmut@microsoft.com,
ssengar@microsoft.com, Dexuan Cui <decui@microsoft.com>
Subject: [PATCH] PCI: Add a mutex to protect the global list pci_domain_busn_res_list
Date: Thu, 18 Apr 2024 18:53:02 -0700 [thread overview]
Message-ID: <20240419015302.13871-1-decui@microsoft.com> (raw)
There has been an effort to make the pci-hyperv driver support
async-probing to reduce the boot time. With async-probing, multiple
kernel threads can be running hv_pci_probe() -> create_root_hv_pci_bus() ->
pci_scan_root_bus_bridge() -> pci_bus_insert_busn_res() at the same time to
update the global list, causing list corruption.
Add a mutex to protect the list.
Signed-off-by: Dexuan Cui <decui@microsoft.com>
---
drivers/pci/probe.c | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index e19b79821dd6..1327fd820b24 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -37,6 +37,7 @@ LIST_HEAD(pci_root_buses);
EXPORT_SYMBOL(pci_root_buses);
static LIST_HEAD(pci_domain_busn_res_list);
+static DEFINE_MUTEX(pci_domain_busn_res_list_lock);
struct pci_domain_busn_res {
struct list_head list;
@@ -47,14 +48,22 @@ struct pci_domain_busn_res {
static struct resource *get_pci_domain_busn_res(int domain_nr)
{
struct pci_domain_busn_res *r;
+ struct resource *ret;
- list_for_each_entry(r, &pci_domain_busn_res_list, list)
- if (r->domain_nr == domain_nr)
- return &r->res;
+ mutex_lock(&pci_domain_busn_res_list_lock);
+
+ list_for_each_entry(r, &pci_domain_busn_res_list, list) {
+ if (r->domain_nr == domain_nr) {
+ ret = &r->res;
+ goto out;
+ }
+ }
r = kzalloc(sizeof(*r), GFP_KERNEL);
- if (!r)
- return NULL;
+ if (!r) {
+ ret = NULL;
+ goto out;
+ }
r->domain_nr = domain_nr;
r->res.start = 0;
@@ -62,8 +71,10 @@ static struct resource *get_pci_domain_busn_res(int domain_nr)
r->res.flags = IORESOURCE_BUS | IORESOURCE_PCI_FIXED;
list_add_tail(&r->list, &pci_domain_busn_res_list);
-
- return &r->res;
+ ret = &r->res;
+out:
+ mutex_unlock(&pci_domain_busn_res_list_lock);
+ return ret;
}
/*
--
2.25.1
next reply other threads:[~2024-04-19 1:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-19 1:53 Dexuan Cui [this message]
2024-04-19 15:07 ` [PATCH] PCI: Add a mutex to protect the global list pci_domain_busn_res_list Haiyang Zhang
2024-04-19 15:12 ` Frank Li
2024-04-25 22:51 ` Bjorn Helgaas
2024-04-29 17:03 ` 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=20240419015302.13871-1-decui@microsoft.com \
--to=decui@microsoft.com \
--cc=Boqun.Feng@microsoft.com \
--cc=bhelgaas@google.com \
--cc=haiyangz@microsoft.com \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=ssengar@microsoft.com \
--cc=sunilmut@microsoft.com \
--cc=wei.liu@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).