From: Johan Hovold <johan+linaro@kernel.org>
To: "Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Krzysztof Wilczyński" <kw@linux.com>,
"Bjorn Helgaas" <bhelgaas@google.com>
Cc: Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Manivannan Sadhasivam <mani@kernel.org>,
Rob Herring <robh@kernel.org>,
Nirmal Patel <nirmal.patel@linux.intel.com>,
Jonathan Derrick <jonathan.derrick@linux.dev>,
linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org,
Johan Hovold <johan+linaro@kernel.org>
Subject: [PATCH v2 0/6] PCI: Fix deadlocks when enabling ASPM
Date: Tue, 28 Nov 2023 09:15:06 +0100 [thread overview]
Message-ID: <20231128081512.19387-1-johan+linaro@kernel.org> (raw)
The pci_enable_link_state() helper is currently only called from
pci_walk_bus(), something which can lead to a deadlock as both helpers
take a pci_bus_sem read lock.
Add a new locked helper which can be called with the read lock held and
fix up the two current users (the second is new in 6.7-rc1).
Note that there are no users left of the original unlocked variant after
this series, but I decided to leave it in place for now (e.g. to mirror
the corresponding helpers to disable link states).
Included are also a couple of related cleanups.
Johan
Changes in v2
- fix up the function name in a kernel doc comment as reported by the
kernel test robot <lkp@intel.com>
Johan Hovold (6):
PCI/ASPM: Add locked helper for enabling link state
PCI: vmd: Fix deadlock when enabling ASPM
PCI: qcom: Fix deadlock when enabling ASPM
PCI: qcom: Clean up ASPM comment
PCI/ASPM: Clean up disable link state parameter
PCI/ASPM: Add lockdep assert to link state helper
drivers/pci/controller/dwc/pcie-qcom.c | 7 ++-
drivers/pci/controller/vmd.c | 2 +-
drivers/pci/pcie/aspm.c | 65 +++++++++++++++++++-------
include/linux/pci.h | 3 ++
4 files changed, 56 insertions(+), 21 deletions(-)
--
2.41.0
next reply other threads:[~2023-11-28 8:15 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-28 8:15 Johan Hovold [this message]
2023-11-28 8:15 ` [PATCH v2 1/6] PCI/ASPM: Add locked helper for enabling link state Johan Hovold
2023-12-07 20:47 ` Bjorn Helgaas
2023-12-08 8:00 ` Johan Hovold
2023-12-08 17:39 ` Bjorn Helgaas
2023-12-12 9:25 ` Ilpo Järvinen
2023-12-12 3:48 ` Kai-Heng Feng
2023-12-12 21:27 ` Bjorn Helgaas
2023-12-13 19:48 ` David E. Box
2023-12-13 20:45 ` Bjorn Helgaas
2023-12-13 23:39 ` David E. Box
2023-12-14 17:28 ` Bjorn Helgaas
2023-11-28 8:15 ` [PATCH v2 2/6] PCI: vmd: Fix deadlock when enabling ASPM Johan Hovold
2023-11-28 8:15 ` [PATCH v2 3/6] PCI: qcom: " Johan Hovold
2023-11-28 8:15 ` [PATCH v2 4/6] PCI: qcom: Clean up ASPM comment Johan Hovold
2023-11-28 8:15 ` [PATCH v2 5/6] PCI/ASPM: Clean up disable link state parameter Johan Hovold
2023-11-28 8:15 ` [PATCH v2 6/6] PCI/ASPM: Add lockdep assert to link state helper Johan Hovold
2023-12-07 13:25 ` [PATCH v2 0/6] PCI: Fix deadlocks when enabling ASPM Johan Hovold
2023-12-10 12:35 ` Linux regression tracking #update (Thorsten Leemhuis)
2023-12-08 17:53 ` Bjorn Helgaas
2023-12-11 17:35 ` Johan Hovold
2023-12-11 18:11 ` Bjorn Helgaas
2023-12-11 20:13 ` Johan Hovold
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=20231128081512.19387-1-johan+linaro@kernel.org \
--to=johan+linaro@kernel.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=bhelgaas@google.com \
--cc=jonathan.derrick@linux.dev \
--cc=konrad.dybcio@linaro.org \
--cc=kw@linux.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=mani@kernel.org \
--cc=nirmal.patel@linux.intel.com \
--cc=robh@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).