Skip to content

iommu: Clean up cookie and sw_msi in struct iommu_domain

Nicolin Chen linux-iommu lkml 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest3 patches 3 repliesIn review
  2. v43 patches 21 repliesApplied
  3. v33 patches 8 repliesSuperseded

Patches in v5 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3iommu: Sort out domain user datadrivers/iommu/dma-iommu.c drivers/iommu/dma-iommu.h drivers/iommu/iommu-sva.c +3 more+143 -980 replies
2/3iommufd: Move iommufd_sw_msi and related functions to driver.cdrivers/iommu/iommu-priv.h drivers/iommu/iommufd/Kconfig drivers/iommu/iommufd/device.c +2 more+153 -1260 replies
3/3iommu: Drop sw_msi from iommu_domaindrivers/iommu/dma-iommu.c drivers/iommu/dma-iommu.h drivers/iommu/iommu.c +2 more+27 -320 replies

Reviews trailers per patch

All 3 patches have a Reviewed-by or Acked-by.

PatchKevin TianJason GunthorpeRobin Murphy
1/3R-b R-b
2/3R-b R-b
3/3R-b R-b 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 3 reviewers.

Read the v5 thread

Cover letter [PATCH v5 0/3] iommu: Clean up cookie and sw_msi in struct iommu_domain

A few things in iommu_domain structure (such as iova_cookie, iommufd_hwpt, fault handler, and etc) are exclusive to certain types of iommu_domains. So, all of them can be seen as domain cookies in different cookie types.

Furthermore, iova_cookie is shared with the msi_cookie use case. It could be cleaner by decoupling these too.

Define an enum iommu_domain_cookie_type to fit all those cookies in.

Since there are only two sw_msi implementations, check domain->cookie_type in iommu_dma_prepare_msi() to call the corresponding sw_msi function.

This is a clean-up series for the previous sw_msi Part-1 core series. It's on github:
https://github.com/nicolinc/iommufd/commits/iommufd_msi_cleanup-v5

Changelog
v5
* Add IMPORT line for IOMMUFD_INTERNAL and change IOMMUFD_DRIVER_CORE to a "bool" module, fixing build module errors reported by Arnd:
https://lore.kernel.org/all/[email protected]/
* In iommu_dma_prepare_msi(), let all IDENTITY DOMAINs pass through, fixing the regression with IDENTITY domains reported by Nathan:
https://lore.kernel.org/linux-iommu/20250324162558.GA198799@ax162/
v4
https://lore.kernel.org/all/[email protected]/
* Rebase on top of a bug fix for hwpt_iommufd cookie
https://lore.kernel.org/all/[email protected]/
* Add Reviewed-by from Robin and Kevin
* Add missing "break;" in iommu_domain_free()
* Drop "linux/msi.h" header from the iommufd/device code
* Set iommufd_sw_msi_install's SYMBOL to "IOMMUFD_INTERNAL"
* Update commit messages for typo fixing and size comparison
* Add a local msi_page_list to cache cookie_msi_pages(domain) return
* Add an inline iommufd_group_setup_msi() for !CONFIG_IRQ_MSI_IOMMU
v3
https://lore.kernel.org/all/[email protected]/
* Integrate Robin's patch
https://lore.kernel.org/linux-iommu/4e68d5820be06adc1b34fc0d1c9399481151daee.1740742271.git.robin.murphy@arm.com/
replacing private_data_owner with the new cookie_type
* Move iommu_sw_msi stub from the public header to iommu-priv.h
v2
https://lore.kernel.org/all/[email protected]/
* Drop sw_msi function pointer
* Add a new private_data_owner tag in iommu_domain
* Let iommu core call the two sw_msi implementations directly
v1
https://lore.kernel.org/all/[email protected]/

Thanks
Nicolin

Nicolin Chen (2):
iommufd: Move iommufd_sw_msi and related functions to driver.c
iommu: Drop sw_msi from iommu_domain

Robin Murphy (1):
iommu: Sort out domain user data

 drivers/iommu/iommufd/Kconfig           |   2 +-
 drivers/iommu/dma-iommu.h               |  14 ++
 drivers/iommu/iommu-priv.h              |  13 ++
 drivers/iommu/iommufd/iommufd_private.h |   7 +-
 include/linux/iommu.h                   |  35 ++--
 drivers/iommu/dma-iommu.c               | 208 ++++++++++++------------
 drivers/iommu/iommu-sva.c               |   1 +
 drivers/iommu/iommu.c                   |  36 +++-
 drivers/iommu/iommufd/device.c          | 131 +--------------
 drivers/iommu/iommufd/driver.c          | 126 ++++++++++++++
 drivers/iommu/iommufd/hw_pagetable.c    |   6 +-
 11 files changed, 323 insertions(+), 256 deletions(-)

base-commit: da0c56520e880441d0503d0cf0d6853dcfb5f1a4

Signature · 1 line
2.43.0