From patchwork Tue Jun 4 01:51:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolu Lu X-Patchwork-Id: 13684535 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7F0E3C25B75 for ; Tue, 4 Jun 2024 01:53:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B09D910E343; Tue, 4 Jun 2024 01:53:58 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="BonkdTCW"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id D978410E343 for ; Tue, 4 Jun 2024 01:53:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717466037; x=1749002037; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=FDw/JYGsFECGdpr3U7icWMaqh/hY73ji20ol+xtCKUk=; b=BonkdTCWLoXbtxQA+2rspaDvzmjAqGN0knxfu1cNnH8p/jCqDZAV8woV hhxlRBy/HHEmKyXAjLOfNCyaqL+dPXvfX49+XwFmZ1Jb7ayrB1Jp7v1Uq TEpjK+2zWpnAMwKRYZXkwuV3kCELe1tqnV4ZCHhacLWxKDW+QehaldNMA 5oBVQ3WZcuOImL2lT4a5KKlwH1bapvWKL/9GRc/EAtbmdrSg+LbCuEVgL lFs/wEdFd/FDujL0piiEwIJCYMrS724jfOvhmDVsB56iJxtbRL5jB1cff 7Mmo3F2XcyQvHw1jo0mxPJu94TcaqGVZcs9TqPhM+PVUtIy8+IDZswcCj Q==; X-CSE-ConnectionGUID: 3j/Co94BTECvHH3VbaGyuw== X-CSE-MsgGUID: PKgLS5E9SCKsadCiNENiag== X-IronPort-AV: E=McAfee;i="6600,9927,11092"; a="25384819" X-IronPort-AV: E=Sophos;i="6.08,212,1712646000"; d="scan'208";a="25384819" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2024 18:53:54 -0700 X-CSE-ConnectionGUID: puBVw6JySxmadLGN/9Xe0g== X-CSE-MsgGUID: tG6p/y8uStKjcWtzoSQveg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,212,1712646000"; d="scan'208";a="37661769" Received: from unknown (HELO allen-box.sh.intel.com) ([10.239.159.127]) by orviesa008.jf.intel.com with ESMTP; 03 Jun 2024 18:53:49 -0700 From: Lu Baolu To: Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Kevin Tian Cc: Yi Liu , David Airlie , Daniel Vetter , Kalle Valo , Bjorn Andersson , Mathieu Poirier , Alex Williamson , mst@redhat.com, Jason Wang , Thierry Reding , Jonathan Hunter , Mikko Perttunen , iommu@lists.linux.dev, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH v2 00/22] iommu: Refactoring domain allocation interface Date: Tue, 4 Jun 2024 09:51:12 +0800 Message-Id: <20240604015134.164206-1-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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(-)