PCI: Fix deadlocks when enabling ASPM
Status from this message: Applied to for-linus for v6.7, thanks, Johan!
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest6 patches 16 repliesApplied
- v16 patches 17 repliesSuperseded
Changes in v2 from the cover letter
- fix up the function name in a kernel doc comment as reported by the kernel test robot <[email protected]>
Patches in v2 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/6 | PCI/ASPM: Add locked helper for enabling link statedrivers/ include/ | +43 | 10 replies | |
| 2/6 | PCI: vmd: Fix deadlock when enabling ASPMdrivers/ | +1 | 0 replies | |
| 3/6 | PCI: qcom: Fix deadlock when enabling ASPMdrivers/ | +1 | 0 replies | |
| 4/6 | PCI: qcom: Clean up ASPM commentdrivers/ | +4 | 0 replies | |
| 5/6 | PCI/ASPM: Clean up disable link state parameterdrivers/ | +5 | 0 replies | |
| 6/6 | PCI/ASPM: Add lockdep assert to link state helperdrivers/ | +2 | 0 replies |
Reviews trailers per patch
5 of 6 patches have a Reviewed-by or Acked-by.
| Patch | Manivannan Sadhasivam |
|---|---|
| 1/6 | R-b |
| 2/6 | R-b |
| 3/6 | R-b |
| 4/6 | |
| 5/6 | R-b |
| 6/6 | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v2 0/6] PCI: Fix deadlocks when enabling ASPM
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 <[email protected]>
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(-)
Signature · 1 line
2.41.0