PCI: Serialize bridge window sizing and resource assignment
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest16 patches 1 replyIn review
- v113 patches 16 repliesSuperseded
Changes in v2 from the cover letter
- Expand BAR Resize lock coverage to include the parent window acquire (sashiko)
- Add pci_assign_unassigned_slot_resources()
- Refactor acpiphp, replaces sizing call in the loop with one pci_assign_unassigned_slot_resources() after the loop to not hold locks across scan
- Keep pci_res_setup_lock local to setup-bus.c (drops setup-cardbus.c assert that was of minor importance anyway)
- Minor language tweaks to changelogs
Patches in v2 No applies recorded yet
Reviews trailers per patch
7 of 16 patches have a Reviewed-by or Acked-by.
| Patch | Rafael J. Wysocki (Intel) | Magnus Lindholm | Denis Benato | Michael Kelley |
|---|---|---|---|---|
| 1/16 | A-b | |||
| 2/16 | A-b | |||
| 3/16 | ||||
| 4/16 | ||||
| 5/16 | A-b | |||
| 6/16 | ||||
| 7/16 | A-b | |||
| 8/16 | ||||
| 9/16 | ||||
| 10/16 | R-b | |||
| 11/16 | R-b | |||
| 12/16 | ||||
| 13/16 | ||||
| 14/16 | ||||
| 15/16 | T-b R-b | |||
| 16/16 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.
Cover letter [PATCH v2 00/16] PCI: Serialize bridge window sizing and resource assignment
Hi all,
Bridge window sizing and resource assignment can be started from multiple entrypoints: rescan and hotplug under pci_rescan_remove_lock, and BAR resize from sysfs or driver probe under device_lock() only. As the entrypoints hold pci_bus_sem at most for read, nothing prevents two sizing and assignment passes from running concurrently on the same bridge windows and BARs.
Multiple issues due to these races could be reproduced some on a real host and more in QEMU with a synthetic PCI host bridge (not part of this series) by looping BAR resize against a rescan through sysfs. The failures include spurious BAR resize failures, a WARN in pci_dev_res_restore(), a NULL pointer dereference in __release_resource(), and a bridge window programmed over RAM. None of them occurred with this series applied.
The series adds pci_bus_size_and_assign_resources() and pci_assign_unassigned_slot_resources() so that PCI core can hold the locks across both phases. It converts the callers (alpha nautilus retains an extra sizing call to avoid complex refactoring). The entrypoints are made to consistently hold pci_bus_sem for read and use guard(). pci_res_setup_lock is added to serialize the sizing and assignment passes. Last, the series converts the remaining pci_bus_assign_resources() users and removes it.
Drivers that call pci_assign_resource() or pci_release_resource() directly are not covered by this series.
I've another series coming up which will add struct pci_setup_data that is to be held across the entire sizing and assignment algorithm, which is another reason why those actions have to be kept together going forward. The goal of that upcoming series is to size also assigned bridge windows properly and we need a place to keep the alignment because STARTALIGN is lost when a resource gets assigned.
v2:
- Expand BAR Resize lock coverage to include the parent window acquire (sashiko)
- Add pci_assign_unassigned_slot_resources()
- Refactor acpiphp, replaces sizing call in the loop with one pci_assign_unassigned_slot_resources() after the loop to not hold locks across scan
- Keep pci_res_setup_lock local to setup-bus.c (drops setup-cardbus.c assert that was of minor importance anyway)
- Minor language tweaks to changelogs
Ilpo Järvinen (16):
PCI: Add pci_bus_size_and_assign_resources() alpha/PCI: Convert to pci_bus_size_and_assign_resources()
PCI: Use guard() for pci_bus_sem in
pci_do_resource_release_and_resize()
PCI: Add pci_assign_unassigned_slot_resources()
PCI: acpiphp: Use pci_assign_unassigned_slot_resources()
PCI: Hold pci_bus_sem across sizing and assignment entrypoints
PCI: Serialize bridge window sizing and resource assignment
PCI: Make internal sizing and assignment functions static EDAC/i82875p: Convert to pci_assign_unassigned_bus_resources() platform/x86: asus-wmi: Convert to
pci_assign_unassigned_bus_resources()
platform/x86: eeepc-laptop: Convert to
pci_assign_unassigned_bus_resources()
parisc/PCI: Convert to pci_assign_unassigned_bus_resources()
PCI: octep_hp: Convert to pci_assign_unassigned_bus_resources()
PCI: ftpci100: Convert to pci_assign_unassigned_bus_resources()
PCI: hv: Convert to pci_assign_unassigned_bus_resources()
PCI: Remove pci_bus_assign_resources()
arch/alpha/kernel/sys_nautilus.c | 2 +- arch/arm/kernel/bios32.c | 5 +- arch/m68k/coldfire/pci.c | 3 +- arch/mips/pci/pci-legacy.c | 5 +- arch/sh/drivers/pci/pci.c | 3 +- drivers/edac/i82875p_edac.c | 2 +- drivers/parisc/dino.c | 2 +- drivers/parisc/lba_pci.c | 7 +- drivers/pci/controller/pci-ftpci100.c | 2 +- drivers/pci/controller/pci-hyperv.c | 2 +- drivers/pci/hotplug/acpiphp_glue.c | 8 +- drivers/pci/hotplug/octep_hp.c | 2 +- drivers/pci/pci.h | 6 +- drivers/pci/setup-bus.c | 128 +++++++++++++++++++++----- drivers/pcmcia/cardbus.c | 3 +- drivers/platform/x86/asus-wmi.c | 2 +- drivers/platform/x86/eeepc-laptop.c | 2 +- include/linux/pci.h | 2 +- 18 files changed, 126 insertions(+), 60 deletions(-)
base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4
Signature · 1 line
2.47.3