| Message ID | 20240610085555.88197-1-baolu.lu@linux.intel.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | iommu: Refactoring domain allocation interface | expand |
On Mon, Jun 10, 2024 at 04:55:34PM +0800, Lu Baolu wrote: > Lu Baolu (20): > iommu: Add iommu_paging_domain_alloc() interface > iommufd: Use iommu_paging_domain_alloc() > vfio/type1: Use iommu_paging_domain_alloc() > drm/msm: Use iommu_paging_domain_alloc() > wifi: ath10k: Use iommu_paging_domain_alloc() > wifi: ath11k: Use iommu_paging_domain_alloc() > RDMA/usnic: Use iommu_paging_domain_alloc() Joerg, can you pick at least the above patches for this cycle? Hopefully more will get tags and can go as well. If you want to try for more tags on the rest I suggest Lu can send patches to the subsystem trees and hope the maintainers merge them. At v6.11-rc5 we declare the remainder unmaintained and you take anything that hasn't been merged so we can finish the iommu core work. Thanks, Jason
On Mon, 10 Jun 2024 16:55:34 +0800, Lu Baolu wrote: > 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) > > [...] Applied a few of these to iommu (iommufd/paging-domain-alloc), thanks! [01/21] iommu: Add iommu_paging_domain_alloc() interface https://git.kernel.org/iommu/c/a27bf2743cb8 [02/21] iommufd: Use iommu_paging_domain_alloc() https://git.kernel.org/iommu/c/26a581606fab [03/21] vfio/type1: Use iommu_paging_domain_alloc() https://git.kernel.org/iommu/c/60ffc4501722 [04/21] vhost-vdpa: Use iommu_paging_domain_alloc() https://git.kernel.org/iommu/c/9c159f6de1ae [05/21] drm/msm: Use iommu_paging_domain_alloc() https://git.kernel.org/iommu/c/45acf35af200 [10/21] wifi: ath10k: Use iommu_paging_domain_alloc() https://git.kernel.org/iommu/c/d5b7485588df [11/21] wifi: ath11k: Use iommu_paging_domain_alloc() https://git.kernel.org/iommu/c/ef50d41fbf1c [14/21] RDMA/usnic: Use iommu_paging_domain_alloc() https://git.kernel.org/iommu/c/3b10f25704be [15/21] iommu/vt-d: Add helper to allocate paging domain https://git.kernel.org/iommu/c/9e9ba576c259 Cheers,
On 2024/7/4 22:18, Will Deacon wrote: > On Mon, 10 Jun 2024 16:55:34 +0800, Lu Baolu wrote: >> 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) >> >> [...] > Applied a few of these to iommu (iommufd/paging-domain-alloc), thanks! > > [01/21] iommu: Add iommu_paging_domain_alloc() interface > https://git.kernel.org/iommu/c/a27bf2743cb8 > [02/21] iommufd: Use iommu_paging_domain_alloc() > https://git.kernel.org/iommu/c/26a581606fab > [03/21] vfio/type1: Use iommu_paging_domain_alloc() > https://git.kernel.org/iommu/c/60ffc4501722 > [04/21] vhost-vdpa: Use iommu_paging_domain_alloc() > https://git.kernel.org/iommu/c/9c159f6de1ae > [05/21] drm/msm: Use iommu_paging_domain_alloc() > https://git.kernel.org/iommu/c/45acf35af200 > > [10/21] wifi: ath10k: Use iommu_paging_domain_alloc() > https://git.kernel.org/iommu/c/d5b7485588df > [11/21] wifi: ath11k: Use iommu_paging_domain_alloc() > https://git.kernel.org/iommu/c/ef50d41fbf1c > > [14/21] RDMA/usnic: Use iommu_paging_domain_alloc() > https://git.kernel.org/iommu/c/3b10f25704be > [15/21] iommu/vt-d: Add helper to allocate paging domain > https://git.kernel.org/iommu/c/9e9ba576c259 Will, the patch [15/21] has already been included in my VT-d update pull request. I have also addressed Yi's comment in that patch. So can you please remove it from this branch? Thanks, baolu
On Thu, Jul 04, 2024 at 10:24:52PM +0800, Baolu Lu wrote: > On 2024/7/4 22:18, Will Deacon wrote: > > On Mon, 10 Jun 2024 16:55:34 +0800, Lu Baolu wrote: > > > 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) > > > > > > [...] > > Applied a few of these to iommu (iommufd/paging-domain-alloc), thanks! > > > > [01/21] iommu: Add iommu_paging_domain_alloc() interface > > https://git.kernel.org/iommu/c/a27bf2743cb8 > > [02/21] iommufd: Use iommu_paging_domain_alloc() > > https://git.kernel.org/iommu/c/26a581606fab > > [03/21] vfio/type1: Use iommu_paging_domain_alloc() > > https://git.kernel.org/iommu/c/60ffc4501722 > > [04/21] vhost-vdpa: Use iommu_paging_domain_alloc() > > https://git.kernel.org/iommu/c/9c159f6de1ae > > [05/21] drm/msm: Use iommu_paging_domain_alloc() > > https://git.kernel.org/iommu/c/45acf35af200 > > > > [10/21] wifi: ath10k: Use iommu_paging_domain_alloc() > > https://git.kernel.org/iommu/c/d5b7485588df > > [11/21] wifi: ath11k: Use iommu_paging_domain_alloc() > > https://git.kernel.org/iommu/c/ef50d41fbf1c > > > > [14/21] RDMA/usnic: Use iommu_paging_domain_alloc() > > https://git.kernel.org/iommu/c/3b10f25704be > > [15/21] iommu/vt-d: Add helper to allocate paging domain > > https://git.kernel.org/iommu/c/9e9ba576c259 > > Will, the patch [15/21] has already been included in my VT-d update pull > request. I have also addressed Yi's comment in that patch. So can you > please remove it from this branch? Heh, was just about to say the same thing as I noticed when I was re-creating 'next'. Yes, I'll drop it now. Since it's on the end, the other SHAs will remain the same. Sorry about that, Will
On Thu, Jul 04, 2024 at 03:18:56PM +0100, Will Deacon wrote: > On Mon, 10 Jun 2024 16:55:34 +0800, Lu Baolu wrote: > > 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) > > > > [...] > > Applied a few of these to iommu (iommufd/paging-domain-alloc), thanks! > > [01/21] iommu: Add iommu_paging_domain_alloc() interface > https://git.kernel.org/iommu/c/a27bf2743cb8 > [02/21] iommufd: Use iommu_paging_domain_alloc() > https://git.kernel.org/iommu/c/26a581606fab > [03/21] vfio/type1: Use iommu_paging_domain_alloc() > https://git.kernel.org/iommu/c/60ffc4501722 > [04/21] vhost-vdpa: Use iommu_paging_domain_alloc() > https://git.kernel.org/iommu/c/9c159f6de1ae > [05/21] drm/msm: Use iommu_paging_domain_alloc() > https://git.kernel.org/iommu/c/45acf35af200 > > [10/21] wifi: ath10k: Use iommu_paging_domain_alloc() > https://git.kernel.org/iommu/c/d5b7485588df > [11/21] wifi: ath11k: Use iommu_paging_domain_alloc() > https://git.kernel.org/iommu/c/ef50d41fbf1c > > [14/21] RDMA/usnic: Use iommu_paging_domain_alloc() > https://git.kernel.org/iommu/c/3b10f25704be > [15/21] iommu/vt-d: Add helper to allocate paging domain > https://git.kernel.org/iommu/c/9e9ba576c259 Great, Lu can you please split the remaining by subsystem and try to get them to go through subsystem trees? Joerg can take the leftovers at rc6/7 or something like that so we can finish this. I think this is enough that Intel and AMD could now assert that dev is non-null? Jason
On 7/9/24 12:34 AM, Jason Gunthorpe wrote: > On Thu, Jul 04, 2024 at 03:18:56PM +0100, Will Deacon wrote: >> On Mon, 10 Jun 2024 16:55:34 +0800, Lu Baolu wrote: >>> 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) >>> >>> [...] >> Applied a few of these to iommu (iommufd/paging-domain-alloc), thanks! >> >> [01/21] iommu: Add iommu_paging_domain_alloc() interface >> https://git.kernel.org/iommu/c/a27bf2743cb8 >> [02/21] iommufd: Use iommu_paging_domain_alloc() >> https://git.kernel.org/iommu/c/26a581606fab >> [03/21] vfio/type1: Use iommu_paging_domain_alloc() >> https://git.kernel.org/iommu/c/60ffc4501722 >> [04/21] vhost-vdpa: Use iommu_paging_domain_alloc() >> https://git.kernel.org/iommu/c/9c159f6de1ae >> [05/21] drm/msm: Use iommu_paging_domain_alloc() >> https://git.kernel.org/iommu/c/45acf35af200 >> >> [10/21] wifi: ath10k: Use iommu_paging_domain_alloc() >> https://git.kernel.org/iommu/c/d5b7485588df >> [11/21] wifi: ath11k: Use iommu_paging_domain_alloc() >> https://git.kernel.org/iommu/c/ef50d41fbf1c >> >> [14/21] RDMA/usnic: Use iommu_paging_domain_alloc() >> https://git.kernel.org/iommu/c/3b10f25704be >> [15/21] iommu/vt-d: Add helper to allocate paging domain >> https://git.kernel.org/iommu/c/9e9ba576c259 > Great, Lu can you please split the remaining by subsystem and try to > get them to go through subsystem trees? Joerg can take the leftovers > at rc6/7 or something like that so we can finish this. Yes, sure. I guess I need to wait until 6.11-rc1 is out. It's a bit late in the cycle for the subsystem trees to accept brand new changes. > I think this is enough that Intel and AMD could now assert that dev is > non-null? Yes. Thanks, baolu
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 a new interface iommu_paging_domain_alloc() to replace iommu_domain_alloc(). This interface is for allocating iommu paging domains for kernel drivers. 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 interface. 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 interface, 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-v3 Change log: v3: - Remove the proposed iommu_user_domain_alloc() interface. v2: https://lore.kernel.org/linux-iommu/20240604015134.164206-1-baolu.lu@linux.intel.com/ - 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 (20): iommu: Add iommu_paging_domain_alloc() interface iommufd: Use iommu_paging_domain_alloc() vfio/type1: Use iommu_paging_domain_alloc() vhost-vdpa: Use iommu_paging_domain_alloc() 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() wifi: 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 | 12 +-- 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 | 63 +++----------- drivers/iommu/iommufd/hw_pagetable.c | 7 +- 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, 183 insertions(+), 135 deletions(-)