[PATCH v2 00/22] iommu: Refactoring domain allocation interface

Lu Baolu
2024-06-04T01:53:56Z

The IOMMU subsystem has undergone some changes, including the removal
of iommu_ops from the bus structure. Consequently, the existing domain
allocation interface, which relies on a bus type argument, is no longer
relevant:

struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)

This series is designed to refactor the use of this interface. It
proposes two new interfaces to replace iommu_domain_alloc():

- iommu_user_domain_alloc(): This interface is intended for allocating
iommu domains managed by userspace for device passthrough scenarios,
such as those used by iommufd, vfio, and vdpa. It clearly indicates
that the domain is for user-managed device DMA.

If an IOMMU driver does not implement iommu_ops->domain_alloc_user,
this interface will rollback to the generic paging domain allocation.

- iommu_paging_domain_alloc(): This interface is for allocating iommu
domains managed by kernel drivers for kernel DMA purposes. It takes a
device pointer as a parameter, which better reflects the current
design of the IOMMU subsystem.

The majority of device drivers currently using iommu_domain_alloc() do
so to allocate a domain for a specific device and then attach that
domain to the device. These cases can be straightforwardly migrated to
the new interfaces.

The drm/tegra driver is a bit different in that the device pointer
passed to the helper, which allocates the iommu domain, is not the one
that will be used for the kernel DMA API. Move the existing logic in
iommu_domain_alloc() into the driver to ensure it works as intended.

Now that all consumers of iommu_domain_alloc() have switched to the new
interfaces, we can finally remove iommu_domain_alloc(). This removal
paves the way for the IOMMU subsystem to support multiple iommu drivers.
Additionally, the individual iommu driver implementation for domain
allocation could also be simplified, as there will always be a valid
device pointer passed along the path.

The whole series is also available on GitHub:
https://github.com/LuBaolu/intel-iommu/commits/iommu-domain-allocation-refactor-v2

Change log:

v2:
- Drop the vt-d patches which implement paging domain support from this
series. I will post them in a separate series later.
- Convert all drivers that call iommu_domain_alloc() to use the new
interface and remove iommu_domain_alloc() from the tree.
- For the drm/msm driver, make the code compatible with the no-IOMMU
case.
- Various cleanups and refinements.

v1: https://lore.kernel.org/linux-iommu/20240529053250.91284-1-baolu.lu@linux.intel.com/

Lu Baolu (21):
iommu: Add iommu_user_domain_alloc() interface
iommufd: Use iommu_user_domain_alloc()
vfio/type1: Use iommu_user_domain_alloc()
vhost-vdpa: Use iommu_user_domain_alloc()
iommu: Add iommu_paging_domain_alloc() interface
drm/msm: Use iommu_paging_domain_alloc()
drm/nouveau/tegra: Use iommu_paging_domain_alloc()
gpu: host1x: Use iommu_paging_domain_alloc()
media: nvidia: tegra: Use iommu_paging_domain_alloc()
media: venus: firmware: Use iommu_paging_domain_alloc()
ath10k: Use iommu_paging_domain_alloc()
wifi: ath11k: Use iommu_paging_domain_alloc()
remoteproc: Use iommu_paging_domain_alloc()
soc/fsl/qbman: Use iommu_paging_domain_alloc()
RDMA/usnic: Use iommu_paging_domain_alloc()
iommu/vt-d: Add helper to allocate paging domain
ARM: dma-mapping: Use iommu_paging_domain_alloc()
drm/rockchip: Use iommu_paging_domain_alloc()
drm/tegra: Remove call to iommu_domain_alloc()
iommu: Remove iommu_present()
iommu: Remove iommu_domain_alloc()

Robin Murphy (1):
ARM: dma-mapping: Pass device to arm_iommu_create_mapping()

include/linux/iommu.h | 18 +--
arch/arm/include/asm/dma-iommu.h | 2 +-
arch/arm/mm/dma-mapping.c | 12 +-
drivers/gpu/drm/exynos/exynos_drm_dma.c | 2 +-
drivers/gpu/drm/msm/msm_iommu.c | 7 +-
.../drm/nouveau/nvkm/engine/device/tegra.c | 4 +-
drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 10 +-
drivers/gpu/drm/tegra/drm.c | 34 ++++--
drivers/gpu/host1x/dev.c | 7 +-
drivers/infiniband/hw/usnic/usnic_uiom.c | 6 +-
drivers/iommu/intel/iommu.c | 87 +++++++++++++--
drivers/iommu/iommu.c | 103 +++++++++---------
drivers/iommu/iommufd/hw_pagetable.c | 20 +---
drivers/iommu/ipmmu-vmsa.c | 3 +-
drivers/iommu/mtk_iommu_v1.c | 3 +-
.../media/platform/nvidia/tegra-vde/iommu.c | 7 +-
drivers/media/platform/qcom/venus/firmware.c | 6 +-
drivers/media/platform/ti/omap3isp/isp.c | 2 +-
drivers/net/wireless/ath/ath10k/snoc.c | 6 +-
drivers/net/wireless/ath/ath11k/ahb.c | 6 +-
drivers/remoteproc/remoteproc_core.c | 6 +-
drivers/soc/fsl/qbman/qman_portal.c | 5 +-
drivers/vfio/vfio_iommu_type1.c | 7 +-
drivers/vhost/vdpa.c | 14 +--
24 files changed, 231 insertions(+), 146 deletions(-)

--
2.34.1