iommu: Fix pci_dev_reset_iommu_prepare/done()
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v8 Latest8 patches 5 repliesIn review
- v76 patches 14 repliesSuperseded
- v61 patch 9 repliesSuperseded
Earlier versions · 5
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v5 | 1 patch | 3 replies | Superseded | |
| v4 | 1 patch | 2 replies | Superseded | |
| v3 | 1 patch | 1 reply | Superseded | |
| v2 | 1 patch | 7 replies | Superseded | |
| v1 | 1 patch | 6 replies | Superseded |
Changes in v8 from the cover letter
* Add Reviewed-by tags
* Fix NULL group->domain in done()
* Tidy goto cleanup when using guard()
* Update patch subject and commit message
* Add warning on premature unblocking in DMA alias cases
* Drop unreachable skip in __iommu_group_set_domain_internal() error path
Patches in v8 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/8 | iommu: Fix NULL group->domain dereference in pci_dev_reset_iommu_done()drivers/ | +7 | 1 reply | |
| 2/8 | iommu: Fix kdocs of pci_dev_reset_iommu_done()drivers/ | +3 | 0 replies | |
| 3/8 | iommu: Replace per-group resetting_domain with per-gdev blocked flagdrivers/ | +78 | 0 replies | |
| 4/8 | iommu: Fix pasid attach in pci_dev_reset_iommu_prepare/done()drivers/ | +18 | 1 reply | |
| 5/8 | iommu: Fix nested pci_dev_reset_iommu_prepare/done()drivers/ | +13 | 0 replies | |
| 6/8 | iommu: Fix ATS invalidation timeouts during __iommu_remove_group_pasid()drivers/ | +6 | 1 reply | |
| 7/8 | iommu: Fix WARN_ON in __iommu_group_set_domain_nofail() due to resetdrivers/ | +10 | 0 replies | |
| 8/8 | iommu: Warn on premature unblock during DMA aliased sibling resetdrivers/ | +49 | 1 reply |
Reviews trailers per patch
All 8 patches have a Reviewed-by or Acked-by.
| Patch | Shuai Xue | Jason Gunthorpe | Kevin Tian | Lu Baolu |
|---|---|---|---|---|
| 1/8 | R-b | |||
| 2/8 | R-b | R-b | R-b | R-b |
| 3/8 | R-b | R-b | R-b | R-b |
| 4/8 | R-b | R-b | R-b | R-b |
| 5/8 | R-b | R-b | R-b | R-b |
| 6/8 | R-b | R-b | ||
| 7/8 | R-b | R-b | ||
| 8/8 | R-b |
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 rc v8 0/8] iommu: Fix pci_dev_reset_iommu_prepare/done()
Shuai and Kevin found a few bugs in the pci_dev_reset_iommu_prepare/done() helpers when used to handle some corner cases:
- Nested callbacks
- Multi-device groups
- WARN_ON/UAF due to concurrent detach
This needs some substantial rework by tracking device reset states on a per gdev basis. This series includes a few patches addressing them. Most of the patches are reviewed previously in a single patch v6. As we found more bugs during the reviews, I split that v6 to smaller patches so each of them will be cleaner.
This is on Github:
https://github.com/nicolinc/iommufd/commits/fix_iommu_reset-v8
Note that concurrent reset of two DMA alias siblings (sharing the same RID) might prematurely unblock when one device is done while the other is still resetting. And it's a bit convoluted to support this case. Given that it's unclear whether real ATS devices might share RID, for now, add a warning in the done(). A future work can fix it properly if someone hits it.
Changelog
v8:
* Add Reviewed-by tags
* Fix NULL group->domain in done()
* Tidy goto cleanup when using guard()
* Update patch subject and commit message
* Add warning on premature unblocking in DMA alias cases
* Drop unreachable skip in __iommu_group_set_domain_internal() error path
v7:
https://lore.kernel.org/all/[email protected]/
* Add Reviewed-by tags
* Split v6 into smaller patches
* Add one patch to fix UAF during detach()
* Add one patch to fix unnecessary ATS invalidation
v6:
https://lore.kernel.org/all/[email protected]/
* Update inline comments and commit message
* Add "max_pasids > 0" condition in both helpers
v5:
https://lore.kernel.org/all/[email protected]/
* Add 'blocked' to fix iommu_driver_get_domain_for_dev() return.
v4:
https://lore.kernel.org/all/[email protected]/
* Rename 'reset_cnt' to 'recovery_cnt'
v3:
https://lore.kernel.org/all/[email protected]/
* Turn prepare()/done() to be per-gdev
* Use reset_depth to track nested re-entries
* Replace group->resetting_domain with a reset_cnt
v2:
https://lore.kernel.org/all/[email protected]/
* Fix in the helpers by allowing re-entry
v1:
https://lore.kernel.org/all/[email protected]/
Nicolin Chen (8):
iommu: Fix NULL group->domain dereference in
pci_dev_reset_iommu_done()
iommu: Fix kdocs of pci_dev_reset_iommu_done()
iommu: Replace per-group resetting_domain with per-gdev blocked flag
iommu: Fix pasid attach in pci_dev_reset_iommu_prepare/done()
iommu: Fix nested pci_dev_reset_iommu_prepare/done()
iommu: Fix ATS invalidation timeouts during
__iommu_remove_group_pasid()
iommu: Fix WARN_ON in __iommu_group_set_domain_nofail() due to reset
iommu: Warn on premature unblock during DMA aliased sibling reset
drivers/iommu/iommu.c | 223 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 181 insertions(+), 42 deletions(-)
Signature · 1 line
2.43.0