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

Nicolin Chen posted 3 patches 11 months, 1 week ago
There is a newer version of this series
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                   |  35 +++-
drivers/iommu/iommufd/device.c          | 131 +--------------
drivers/iommu/iommufd/driver.c          | 125 ++++++++++++++
drivers/iommu/iommufd/hw_pagetable.c    |   6 +-
10 files changed, 320 insertions(+), 255 deletions(-)
[PATCH v4 0/3] iommu: Clean up cookie and sw_msi in struct iommu_domain
Posted by Nicolin Chen 11 months, 1 week ago
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-v4

Changelog
v4
 * Rebase on top of a bug fix for hwpt_iommufd cookie
   https://lore.kernel.org/all/20250305211800.229465-1-nicolinc@nvidia.com/
 * 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/cover.1741034885.git.nicolinc@nvidia.com/
 * 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/cover.1740705776.git.nicolinc@nvidia.com/
 * 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/cover.1740600272.git.nicolinc@nvidia.com/

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/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                   |  35 +++-
 drivers/iommu/iommufd/device.c          | 131 +--------------
 drivers/iommu/iommufd/driver.c          | 125 ++++++++++++++
 drivers/iommu/iommufd/hw_pagetable.c    |   6 +-
 10 files changed, 320 insertions(+), 255 deletions(-)


base-commit: 4b022ff93d8b332891cae818a7331942db50610f
-- 
2.43.0
Re: [PATCH v4 0/3] iommu: Clean up cookie and sw_msi in struct iommu_domain
Posted by Jason Gunthorpe 10 months, 3 weeks ago
On Thu, Mar 06, 2025 at 01:00:46PM -0800, Nicolin Chen wrote:

> 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/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                   |  35 +++-
>  drivers/iommu/iommufd/device.c          | 131 +--------------
>  drivers/iommu/iommufd/driver.c          | 125 ++++++++++++++
>  drivers/iommu/iommufd/hw_pagetable.c    |   6 +-
>  10 files changed, 320 insertions(+), 255 deletions(-)

Applied 

Thanks,
Jason
Re: [PATCH v4 0/3] iommu: Clean up cookie and sw_msi in struct iommu_domain
Posted by Jason Gunthorpe 11 months ago
On Thu, Mar 06, 2025 at 01:00:46PM -0800, Nicolin Chen wrote:

> Changelog
> v4
>  * Rebase on top of a bug fix for hwpt_iommufd cookie
>    https://lore.kernel.org/all/20250305211800.229465-1-nicolinc@nvidia.com/

I suppose this means it needs to go to the iommufd tree?

Joerg OK?

Thanks,
Jason