From nobody Sun Feb 8 02:55:57 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 560BBEB64DC for ; Fri, 7 Jul 2023 01:35:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229802AbjGGBfF (ORCPT ); Thu, 6 Jul 2023 21:35:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229470AbjGGBfC (ORCPT ); Thu, 6 Jul 2023 21:35:02 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAD061BDB for ; Thu, 6 Jul 2023 18:35:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688693701; x=1720229701; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=w9KMIa9FeqUiMJ7hHb6xqUyUsuqFNPtVvcMNCNqbITA=; b=YBp/TkGNbvvUfW95TUSywl1jB/MT3fSuzbYJjS6vjZ5iENKxmvDiYVMV AsffmE/WAjmoTTxYunt71QKnhOWY1aTvAZdaSSN6nYPlRJpR5DuKEr0He DqRAxu2MgkGFO0gTKxfltlVE2eZbKToIJNUs7mMy1LISQ/La9tvBSv2Hg KETUvya5BM9j1iFHugNv/PTFh4tHN2F2g6dbfXJvaMJ5K0zTLmWSNT1rS DURrZsmNA0lyLyrH61Ijcoo7RewjkZS1AGiY37O4htuLcT+zEQsGyXbVY U5jHES+Uo3Wwknnjpbmms5iaBltbJPBi5vrVKXRE8ew+6WR6/G5qx4qnN w==; X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="429832245" X-IronPort-AV: E=Sophos;i="6.01,187,1684825200"; d="scan'208";a="429832245" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2023 18:35:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="893791292" X-IronPort-AV: E=Sophos;i="6.01,187,1684825200"; d="scan'208";a="893791292" Received: from fengj-mobl.ccr.corp.intel.com (HELO tinazhan-desk1.www.tendawifi.com) ([10.254.210.124]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2023 18:34:58 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Joerg Roedel , Will Deacon , Lu Baolu , Michael Shavit Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [RFC PATCH 1/6] iommu: Add two pasid helper functions Date: Fri, 7 Jul 2023 09:34:36 +0800 Message-Id: <20230707013441.365583-2-tina.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707013441.365583-1-tina.zhang@intel.com> References: <20230707013441.365583-1-tina.zhang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" mm_get_pasid() is for getting mm pasid value and mm_set_pasid() is for setting mm pasid value. The motivation is to replace mm->pasid with an iommu private data structure that is introduced in a later patch. Signed-off-by: Tina Zhang --- arch/x86/kernel/traps.c | 2 +- include/linux/iommu.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 58b1f208eff51..8587461c43664 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -678,7 +678,7 @@ static bool try_fixup_enqcmd_gp(void) if (!mm_valid_pasid(current->mm)) return false; =20 - pasid =3D current->mm->pasid; + pasid =3D mm_get_pasid(current->mm); =20 /* * Did this thread already have its PASID activated? diff --git a/include/linux/iommu.h b/include/linux/iommu.h index e8c9a7da10609..d39e647219eb8 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -1174,6 +1174,15 @@ static inline bool mm_valid_pasid(struct mm_struct *= mm) { return mm->pasid !=3D IOMMU_PASID_INVALID; } +static inline u32 mm_get_pasid(struct mm_struct *mm) +{ + return mm->pasid; +} + +static inline void mm_set_pasid(struct mm_struct *mm, u32 pasid) +{ + mm->pasid =3D pasid; +} void mm_pasid_drop(struct mm_struct *mm); struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_struct *mm); @@ -1196,6 +1205,11 @@ static inline u32 iommu_sva_get_pasid(struct iommu_s= va *handle) } static inline void mm_pasid_init(struct mm_struct *mm) {} static inline bool mm_valid_pasid(struct mm_struct *mm) { return false; } +static inline u32 mm_get_pasid(struct mm_struct *mm) +{ + return IOMMU_PASID_INVALID; +} +static inline void mm_set_pasid(struct mm_struct *mm, u32 pasid) {} static inline void mm_pasid_drop(struct mm_struct *mm) {} #endif /* CONFIG_IOMMU_SVA */ =20 --=20 2.34.1 From nobody Sun Feb 8 02:55:57 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7E0EEB64D9 for ; Fri, 7 Jul 2023 01:35:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231909AbjGGBfK (ORCPT ); Thu, 6 Jul 2023 21:35:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231895AbjGGBfG (ORCPT ); Thu, 6 Jul 2023 21:35:06 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 304861BF4 for ; Thu, 6 Jul 2023 18:35:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688693705; x=1720229705; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=M4yHvqOjBvNXxYpbH9KMyRDRPz6GZ0HRmaDFz16Hw8M=; b=iMkOG0cdzZxE0YBkisSQc6MRTRxq0LRfWcof/ixYu60hOto1Bwe3W/Hb Pj3sc+yg1WFOAKuuK6OnbRJjDakz5gSjf/XPkaiCp6Qtp7cpG2TeuoPhN TjHK065Tj+v4MWyByoRtvpbuGl5Yz3rW5293mNbKYQxMZtIihuEjmkYJD qZ2Oo9vbTaP3A/6g7xOTiJvuVAEWfCR+GWgJ5pc5BRy27nMrQj1eEBNd9 xYVU/D5pv5/WgPYIzhSABOz1BYBI1riarm0/msESLCNa8tcDaP27k1NDs cqXxNwADiaqph9GAU26cHcJdrpvFmG6ynd/8x8IpLAb19yiqxVD7GufYZ A==; X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="429832259" X-IronPort-AV: E=Sophos;i="6.01,187,1684825200"; d="scan'208";a="429832259" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2023 18:35:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="893791308" X-IronPort-AV: E=Sophos;i="6.01,187,1684825200"; d="scan'208";a="893791308" Received: from fengj-mobl.ccr.corp.intel.com (HELO tinazhan-desk1.www.tendawifi.com) ([10.254.210.124]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2023 18:35:01 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Joerg Roedel , Will Deacon , Lu Baolu , Michael Shavit Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [RFC PATCH 2/6] iommu: Call helper functions to get/set assigned pasid value Date: Fri, 7 Jul 2023 09:34:37 +0800 Message-Id: <20230707013441.365583-3-tina.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707013441.365583-1-tina.zhang@intel.com> References: <20230707013441.365583-1-tina.zhang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use the helper function mm_get_pasid() to get the mm assigned pasid value and mm_set_pasid() to set the mm assigned pasid value. Signed-off-by: Tina Zhang --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 12 ++++++------ drivers/iommu/intel/svm.c | 8 ++++---- drivers/iommu/iommu-sva.c | 16 ++++++++-------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c b/drivers/iomm= u/arm/arm-smmu-v3/arm-smmu-v3-sva.c index a5a63b1c947eb..0b455654d3650 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c @@ -204,7 +204,7 @@ static void arm_smmu_mm_invalidate_range(struct mmu_not= ifier *mn, if (!(smmu_domain->smmu->features & ARM_SMMU_FEAT_BTM)) arm_smmu_tlb_inv_range_asid(start, size, smmu_mn->cd->asid, PAGE_SIZE, false, smmu_domain); - arm_smmu_atc_inv_domain(smmu_domain, mm->pasid, start, size); + arm_smmu_atc_inv_domain(smmu_domain, mm_get_pasid(mm), start, size); } =20 static void arm_smmu_mm_release(struct mmu_notifier *mn, struct mm_struct = *mm) @@ -222,10 +222,10 @@ static void arm_smmu_mm_release(struct mmu_notifier *= mn, struct mm_struct *mm) * DMA may still be running. Keep the cd valid to avoid C_BAD_CD events, * but disable translation. */ - arm_smmu_write_ctx_desc(smmu_domain, mm->pasid, &quiet_cd); + arm_smmu_write_ctx_desc(smmu_domain, mm_get_pasid(mm), &quiet_cd); =20 arm_smmu_tlb_inv_asid(smmu_domain->smmu, smmu_mn->cd->asid); - arm_smmu_atc_inv_domain(smmu_domain, mm->pasid, 0, 0); + arm_smmu_atc_inv_domain(smmu_domain, mm_get_pasid(mm), 0, 0); =20 smmu_mn->cleared =3D true; mutex_unlock(&sva_lock); @@ -279,7 +279,7 @@ arm_smmu_mmu_notifier_get(struct arm_smmu_domain *smmu_= domain, goto err_free_cd; } =20 - ret =3D arm_smmu_write_ctx_desc(smmu_domain, mm->pasid, cd); + ret =3D arm_smmu_write_ctx_desc(smmu_domain, mm_get_pasid(mm), cd); if (ret) goto err_put_notifier; =20 @@ -304,7 +304,7 @@ static void arm_smmu_mmu_notifier_put(struct arm_smmu_m= mu_notifier *smmu_mn) return; =20 list_del(&smmu_mn->list); - arm_smmu_write_ctx_desc(smmu_domain, mm->pasid, NULL); + arm_smmu_write_ctx_desc(smmu_domain, mm_get_pasid(mm), NULL); =20 /* * If we went through clear(), we've already invalidated, and no @@ -312,7 +312,7 @@ static void arm_smmu_mmu_notifier_put(struct arm_smmu_m= mu_notifier *smmu_mn) */ if (!smmu_mn->cleared) { arm_smmu_tlb_inv_asid(smmu_domain->smmu, cd->asid); - arm_smmu_atc_inv_domain(smmu_domain, mm->pasid, 0, 0); + arm_smmu_atc_inv_domain(smmu_domain, mm_get_pasid(mm), 0, 0); } =20 /* Frees smmu_mn */ diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index e95b339e9cdc0..e6377cff6a935 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -306,13 +306,13 @@ static int intel_svm_bind_mm(struct intel_iommu *iomm= u, struct device *dev, unsigned long sflags; int ret =3D 0; =20 - svm =3D pasid_private_find(mm->pasid); + svm =3D pasid_private_find(mm_get_pasid(mm)); if (!svm) { svm =3D kzalloc(sizeof(*svm), GFP_KERNEL); if (!svm) return -ENOMEM; =20 - svm->pasid =3D mm->pasid; + svm->pasid =3D mm_get_pasid(mm); svm->mm =3D mm; INIT_LIST_HEAD_RCU(&svm->devs); =20 @@ -350,7 +350,7 @@ static int intel_svm_bind_mm(struct intel_iommu *iommu,= struct device *dev, =20 /* Setup the pasid table: */ sflags =3D cpu_feature_enabled(X86_FEATURE_LA57) ? PASID_FLAG_FL5LP : 0; - ret =3D intel_pasid_setup_first_level(iommu, dev, mm->pgd, mm->pasid, + ret =3D intel_pasid_setup_first_level(iommu, dev, mm->pgd, mm_get_pasid(m= m), FLPT_DEFAULT_DID, sflags); if (ret) goto free_sdev; @@ -364,7 +364,7 @@ static int intel_svm_bind_mm(struct intel_iommu *iommu,= struct device *dev, free_svm: if (list_empty(&svm->devs)) { mmu_notifier_unregister(&svm->notifier, mm); - pasid_private_remove(mm->pasid); + pasid_private_remove(mm_get_pasid(mm)); kfree(svm); } =20 diff --git a/drivers/iommu/iommu-sva.c b/drivers/iommu/iommu-sva.c index 9821bc44f5ac1..7a41b6510e385 100644 --- a/drivers/iommu/iommu-sva.c +++ b/drivers/iommu/iommu-sva.c @@ -28,7 +28,7 @@ static int iommu_sva_alloc_pasid(struct mm_struct *mm, io= asid_t min, ioasid_t ma mutex_lock(&iommu_sva_lock); /* Is a PASID already associated with this mm? */ if (mm_valid_pasid(mm)) { - if (mm->pasid < min || mm->pasid > max) + if (mm_get_pasid(mm) < min || mm_get_pasid(mm) > max) ret =3D -EOVERFLOW; goto out; } @@ -36,7 +36,7 @@ static int iommu_sva_alloc_pasid(struct mm_struct *mm, io= asid_t min, ioasid_t ma ret =3D ida_alloc_range(&iommu_global_pasid_ida, min, max, GFP_KERNEL); if (ret < min) goto out; - mm->pasid =3D ret; + mm_set_pasid(mm, ret); ret =3D 0; out: mutex_unlock(&iommu_sva_lock); @@ -70,7 +70,7 @@ struct iommu_sva *iommu_sva_bind_device(struct device *de= v, struct mm_struct *mm if (!max_pasids) return ERR_PTR(-EOPNOTSUPP); =20 - /* Allocate mm->pasid if necessary. */ + /* Allocate pasid if necessary. */ ret =3D iommu_sva_alloc_pasid(mm, 1, max_pasids - 1); if (ret) return ERR_PTR(ret); @@ -81,7 +81,7 @@ struct iommu_sva *iommu_sva_bind_device(struct device *de= v, struct mm_struct *mm =20 mutex_lock(&iommu_sva_lock); /* Search for an existing domain. */ - domain =3D iommu_get_domain_for_dev_pasid(dev, mm->pasid, + domain =3D iommu_get_domain_for_dev_pasid(dev, mm_get_pasid(mm), IOMMU_DOMAIN_SVA); if (IS_ERR(domain)) { ret =3D PTR_ERR(domain); @@ -100,7 +100,7 @@ struct iommu_sva *iommu_sva_bind_device(struct device *= dev, struct mm_struct *mm goto out_unlock; } =20 - ret =3D iommu_attach_device_pasid(domain, dev, mm->pasid); + ret =3D iommu_attach_device_pasid(domain, dev, mm_get_pasid(mm)); if (ret) goto out_free_domain; domain->users =3D 1; @@ -132,7 +132,7 @@ EXPORT_SYMBOL_GPL(iommu_sva_bind_device); void iommu_sva_unbind_device(struct iommu_sva *handle) { struct iommu_domain *domain =3D handle->domain; - ioasid_t pasid =3D domain->mm->pasid; + ioasid_t pasid =3D mm_get_pasid(domain->mm); struct device *dev =3D handle->dev; =20 mutex_lock(&iommu_sva_lock); @@ -149,7 +149,7 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle) { struct iommu_domain *domain =3D handle->domain; =20 - return domain->mm->pasid; + return mm_get_pasid(domain->mm); } EXPORT_SYMBOL_GPL(iommu_sva_get_pasid); =20 @@ -216,5 +216,5 @@ void mm_pasid_drop(struct mm_struct *mm) if (likely(!mm_valid_pasid(mm))) return; =20 - ida_free(&iommu_global_pasid_ida, mm->pasid); + ida_free(&iommu_global_pasid_ida, mm_get_pasid(mm)); } --=20 2.34.1 From nobody Sun Feb 8 02:55:57 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8532AEB64D9 for ; Fri, 7 Jul 2023 01:35:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231962AbjGGBfP (ORCPT ); Thu, 6 Jul 2023 21:35:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231918AbjGGBfN (ORCPT ); Thu, 6 Jul 2023 21:35:13 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B61751BFC for ; Thu, 6 Jul 2023 18:35:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688693709; x=1720229709; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JfdYLppNc9eLDWu4uhQ6N/Y+k4M58Rts/UgDTo8w0sg=; b=nubovSnnAYjxeAk/5Effg9ptGHCTnHx0xH1eRB6LtoUUs0h6pLiSIq7+ 3ekT+u8MTk8pOhVdMIh4/zJrENAhX0ggFDS0N7Jz8kNNK79c1e6HuuvI5 8BSpsaS6KP/gLRTsgKTtpX5oY6PjpAKKF3jxYJzBKquBiidCJ1wfxrDtf XxCV7d/N92YdMWIbVxDPj5rkW5oSFEGCL5ZcGZLBqyTPnyBec7SVq6fb6 fKcOSq+lFjg0KxVvovXzqF4OB2PZT/itAU6comSL3uyGD/M3gtSLPr62b CaynUUMwvvUDynEa2iVxK3n8G0AGfNgDNwz7uzneHc7Hc0DD0SJ2tK+6n Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="429832273" X-IronPort-AV: E=Sophos;i="6.01,187,1684825200"; d="scan'208";a="429832273" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2023 18:35:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="893791324" X-IronPort-AV: E=Sophos;i="6.01,187,1684825200"; d="scan'208";a="893791324" Received: from fengj-mobl.ccr.corp.intel.com (HELO tinazhan-desk1.www.tendawifi.com) ([10.254.210.124]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2023 18:35:05 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Joerg Roedel , Will Deacon , Lu Baolu , Michael Shavit Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [RFC PATCH 3/6] iommu: Introduce struct iommu_mm_data Date: Fri, 7 Jul 2023 09:34:38 +0800 Message-Id: <20230707013441.365583-4-tina.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707013441.365583-1-tina.zhang@intel.com> References: <20230707013441.365583-1-tina.zhang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" To make sva domain 1:1 with mm pasid, mm needs to keep reference to the sva domain as well as keeping the information of mm pasid. Introduce struct iommu_mm_data to wrap the information up. When a process is created, the mm pasid is initialized as IOMMU_PASID_ INVALID. The default_iommu_mms is introduced to initialize an mm pasid with that default value. Signed-off-by: Tina Zhang --- drivers/iommu/iommu.c | 2 ++ include/linux/iommu.h | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index f1dcfa3f1a1b4..35fa1c1b12826 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -83,6 +83,8 @@ static const char * const iommu_group_resv_type_string[] = =3D { [IOMMU_RESV_SW_MSI] =3D "msi", }; =20 +struct iommu_mm_data default_iommu_mm =3D { IOMMU_PASID_INVALID, NULL }; + #define IOMMU_CMD_LINE_DMA_API BIT(0) #define IOMMU_CMD_LINE_STRICT BIT(1) =20 diff --git a/include/linux/iommu.h b/include/linux/iommu.h index d39e647219eb8..20135912584ba 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -42,6 +42,8 @@ struct iommu_sva; struct iommu_fault_event; struct iommu_dma_cookie; =20 +extern struct iommu_mm_data default_iommu_mm; + /* iommu fault flags */ #define IOMMU_FAULT_READ 0x0 #define IOMMU_FAULT_WRITE 0x1 @@ -664,6 +666,11 @@ struct iommu_sva { struct iommu_domain *domain; }; =20 +struct iommu_mm_data { + u32 pasid; + struct iommu_domain *sva_domain; +}; + int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwno= de, const struct iommu_ops *ops); void iommu_fwspec_free(struct device *dev); --=20 2.34.1 From nobody Sun Feb 8 02:55:57 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE0C5EB64D9 for ; Fri, 7 Jul 2023 01:35:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231978AbjGGBfW (ORCPT ); Thu, 6 Jul 2023 21:35:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231921AbjGGBfQ (ORCPT ); Thu, 6 Jul 2023 21:35:16 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 509A51FEA for ; Thu, 6 Jul 2023 18:35:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688693712; x=1720229712; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eBd7C5+K4RvrvJS52RC+bdvbj/BI96OctjrNMXfnImA=; b=nGBR/EbTzL/yTpcBukdROfD2zoHTn/wUCgYJkjQnggTkE820TsLdBEYm n22giaZIetQb3TVEs6Ln+gTWZK7GKAQmgPuqhnDaF7i4Hp/MlFozv62K1 kb7/nGvJ2FR+0LVoNhc+9kA74ufvmgUUb/dNtYFBpqrfiUsIoZn57rwuO ZodWQUY4ZEcRxxJfP72E5gg7IUZXNC3cKVq3HnJbebmofsoGH8rIjE0cx WpvCmjdzaP0YJYcPnw5bkiZZV2kGqqrY1XzgEbPS83jEc7SfM5X3IL2bG sjzhdJFLw47ZcHYuXeC+noTXCSH5axoSEEamm+stI6wiTKRU0gxeIybBY g==; X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="429832288" X-IronPort-AV: E=Sophos;i="6.01,187,1684825200"; d="scan'208";a="429832288" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2023 18:35:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="893791346" X-IronPort-AV: E=Sophos;i="6.01,187,1684825200"; d="scan'208";a="893791346" Received: from fengj-mobl.ccr.corp.intel.com (HELO tinazhan-desk1.www.tendawifi.com) ([10.254.210.124]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2023 18:35:08 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Joerg Roedel , Will Deacon , Lu Baolu , Michael Shavit Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [RFC PATCH 4/6] mm: Add iommu_mm field to mm_struct Date: Fri, 7 Jul 2023 09:34:39 +0800 Message-Id: <20230707013441.365583-5-tina.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707013441.365583-1-tina.zhang@intel.com> References: <20230707013441.365583-1-tina.zhang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The iommu_mm field has all the information needed for managing sva domain 1:1 with mm pasid. Add it to the mm_struct as the sva-related field and use default_iommu_mm to initialize init_mm pasid. Signed-off-by: Tina Zhang --- include/linux/mm_types.h | 2 ++ mm/init-mm.c | 1 + 2 files changed, 3 insertions(+) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 306a3d1a0fa65..bb00caa078335 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -581,6 +581,7 @@ struct mm_cid { #endif =20 struct kioctx_table; +struct iommu_mm_data; struct mm_struct { struct { struct maple_tree mm_mt; @@ -773,6 +774,7 @@ struct mm_struct { =20 #ifdef CONFIG_IOMMU_SVA u32 pasid; + struct iommu_mm_data *iommu_mm; #endif #ifdef CONFIG_KSM /* diff --git a/mm/init-mm.c b/mm/init-mm.c index efa97b57acfd8..c43b7d0347312 100644 --- a/mm/init-mm.c +++ b/mm/init-mm.c @@ -44,6 +44,7 @@ struct mm_struct init_mm =3D { .cpu_bitmap =3D CPU_BITS_NONE, #ifdef CONFIG_IOMMU_SVA .pasid =3D IOMMU_PASID_INVALID, + .iommu_mm =3D &default_iommu_mm, #endif INIT_MM_CONTEXT(init_mm) }; --=20 2.34.1 From nobody Sun Feb 8 02:55:57 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A57B9EB64DC for ; Fri, 7 Jul 2023 01:35:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231991AbjGGBf3 (ORCPT ); Thu, 6 Jul 2023 21:35:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231921AbjGGBf0 (ORCPT ); Thu, 6 Jul 2023 21:35:26 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E1BC2101 for ; Thu, 6 Jul 2023 18:35:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688693715; x=1720229715; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1h7edKtoFv8FxuKLDfoJ9kk0foTEvF67RC9h6LudYHI=; b=FupDQZbQ2il+emcJsNbzJnh7q1PNZADTE1NrfJ7FYPnGsq7w2vQerWhn e7lFkZKYqHzqZGmJj273GfbtmqNfQiFIaEJgczfrppK8mRjA4W0J7nTeN unPUdmxEdGHUd8gCdkBH/BYkfw1kxbViFb8ZaAKZ2zp+ke6B5e9llS0DE JJlzUfU8LwnXMNplaeUFtODQI79OEY5lOM4XhhNXa/m24LeoDq+f+K0uE Z6S+1TWuFk3X/MV39hXlK9OEd3Ca2ZJJ8lZVbfIqTZCFY9/1RE/IAbuTe vgEbg9DXuhV0i2YGA6hyh1TocFtkDGU2sATcI1ngu9LXwydIkcAJKNVUz Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="429832309" X-IronPort-AV: E=Sophos;i="6.01,187,1684825200"; d="scan'208";a="429832309" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2023 18:35:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="893791362" X-IronPort-AV: E=Sophos;i="6.01,187,1684825200"; d="scan'208";a="893791362" Received: from fengj-mobl.ccr.corp.intel.com (HELO tinazhan-desk1.www.tendawifi.com) ([10.254.210.124]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2023 18:35:11 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Joerg Roedel , Will Deacon , Lu Baolu , Michael Shavit Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [RFC PATCH 5/6] iommu: Support mm PASID 1:1 with sva domain Date: Fri, 7 Jul 2023 09:34:40 +0800 Message-Id: <20230707013441.365583-6-tina.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707013441.365583-1-tina.zhang@intel.com> References: <20230707013441.365583-1-tina.zhang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Each mm bound to devices gets a PASID and a corresponding sva domain allocated in iommu_sva_bind_device(), which are referenced by iommu_mm field of the mm. And that PASID and sva domain get released in iommu_sva_ unbind_device() when no devices are binding to that mm. As a result, during the life cycle, sva domain has 1:1 with mm PASID. Since the required info of PASID and sva domain are kept in struct iommu_mm_data of a mm, use mm->iommu_mm field instead of the old pasid field in mm struct. Signed-off-by: Tina Zhang --- drivers/iommu/iommu-sva.c | 54 +++++++++++++++++++++++++++------------ drivers/iommu/iommu.c | 1 + include/linux/iommu.h | 8 +++--- 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/drivers/iommu/iommu-sva.c b/drivers/iommu/iommu-sva.c index 7a41b6510e385..342d8ba9ab479 100644 --- a/drivers/iommu/iommu-sva.c +++ b/drivers/iommu/iommu-sva.c @@ -15,6 +15,7 @@ static DEFINE_IDA(iommu_global_pasid_ida); /* Allocate a PASID for the mm within range (inclusive) */ static int iommu_sva_alloc_pasid(struct mm_struct *mm, ioasid_t min, ioasi= d_t max) { + struct iommu_mm_data *iommu_mm =3D NULL; int ret =3D 0; =20 if (min =3D=3D IOMMU_PASID_INVALID || @@ -33,9 +34,18 @@ static int iommu_sva_alloc_pasid(struct mm_struct *mm, i= oasid_t min, ioasid_t ma goto out; } =20 + iommu_mm =3D kzalloc(sizeof(struct iommu_mm_data), GFP_KERNEL); + if (!iommu_mm) { + ret =3D -ENOMEM; + goto out; + } + mm->iommu_mm =3D iommu_mm; + ret =3D ida_alloc_range(&iommu_global_pasid_ida, min, max, GFP_KERNEL); - if (ret < min) + if (ret < min) { + kfree(iommu_mm); goto out; + } mm_set_pasid(mm, ret); ret =3D 0; out: @@ -61,7 +71,7 @@ static int iommu_sva_alloc_pasid(struct mm_struct *mm, io= asid_t min, ioasid_t ma */ struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_stru= ct *mm) { - struct iommu_domain *domain; + struct iommu_domain *domain, *sva_domain =3D mm->iommu_mm->sva_domain; struct iommu_sva *handle; ioasid_t max_pasids; int ret; @@ -88,31 +98,41 @@ struct iommu_sva *iommu_sva_bind_device(struct device *= dev, struct mm_struct *mm goto out_unlock; } =20 - if (domain) { - domain->users++; - goto out; + if (unlikely(domain)) { + /* Re-attach the device to the same domain? */ + if (domain =3D=3D sva_domain) { + goto out; + } else { + /* Didn't get detached from the previous domain? */ + ret =3D -EBUSY; + goto out_unlock; + } } =20 - /* Allocate a new domain and set it on device pasid. */ - domain =3D iommu_sva_domain_alloc(dev, mm); - if (!domain) { - ret =3D -ENOMEM; - goto out_unlock; + if (sva_domain) { + sva_domain->users++; + } else { + /* Allocate a new domain and set it on device pasid. */ + sva_domain =3D iommu_sva_domain_alloc(dev, mm); + if (!sva_domain) { + ret =3D -ENOMEM; + goto out_unlock; + } + sva_domain->users =3D 1; } =20 - ret =3D iommu_attach_device_pasid(domain, dev, mm_get_pasid(mm)); + ret =3D iommu_attach_device_pasid(sva_domain, dev, mm_get_pasid(mm)); if (ret) goto out_free_domain; - domain->users =3D 1; out: mutex_unlock(&iommu_sva_lock); handle->dev =3D dev; - handle->domain =3D domain; + handle->domain =3D sva_domain; =20 return handle; =20 out_free_domain: - iommu_domain_free(domain); + iommu_domain_free(sva_domain); out_unlock: mutex_unlock(&iommu_sva_lock); kfree(handle); @@ -136,10 +156,9 @@ void iommu_sva_unbind_device(struct iommu_sva *handle) struct device *dev =3D handle->dev; =20 mutex_lock(&iommu_sva_lock); - if (--domain->users =3D=3D 0) { - iommu_detach_device_pasid(domain, dev, pasid); + iommu_detach_device_pasid(domain, dev, pasid); + if (--domain->users =3D=3D 0) iommu_domain_free(domain); - } mutex_unlock(&iommu_sva_lock); kfree(handle); } @@ -217,4 +236,5 @@ void mm_pasid_drop(struct mm_struct *mm) return; =20 ida_free(&iommu_global_pasid_ida, mm_get_pasid(mm)); + kfree(mm->iommu_mm); } diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 35fa1c1b12826..2f55a157b1f15 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -3393,5 +3393,6 @@ struct iommu_domain *iommu_sva_domain_alloc(struct de= vice *dev, domain->iopf_handler =3D iommu_sva_handle_iopf; domain->fault_data =3D mm; =20 + mm->iommu_mm->sva_domain =3D domain; return domain; } diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 20135912584ba..1511ded7bc910 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -1175,20 +1175,20 @@ static inline bool tegra_dev_iommu_get_stream_id(st= ruct device *dev, u32 *stream #ifdef CONFIG_IOMMU_SVA static inline void mm_pasid_init(struct mm_struct *mm) { - mm->pasid =3D IOMMU_PASID_INVALID; + mm->iommu_mm =3D &default_iommu_mm; } static inline bool mm_valid_pasid(struct mm_struct *mm) { - return mm->pasid !=3D IOMMU_PASID_INVALID; + return mm->iommu_mm->pasid !=3D IOMMU_PASID_INVALID; } static inline u32 mm_get_pasid(struct mm_struct *mm) { - return mm->pasid; + return mm->iommu_mm->pasid; } =20 static inline void mm_set_pasid(struct mm_struct *mm, u32 pasid) { - mm->pasid =3D pasid; + mm->iommu_mm->pasid =3D pasid; } void mm_pasid_drop(struct mm_struct *mm); struct iommu_sva *iommu_sva_bind_device(struct device *dev, --=20 2.34.1 From nobody Sun Feb 8 02:55:57 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 327FFEB64D9 for ; Fri, 7 Jul 2023 01:36:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232079AbjGGBgq (ORCPT ); Thu, 6 Jul 2023 21:36:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229536AbjGGBgn (ORCPT ); Thu, 6 Jul 2023 21:36:43 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6572B2115 for ; Thu, 6 Jul 2023 18:36:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688693779; x=1720229779; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TX3zfSSKDYdQMJ/lhBfeXvJtyWDmev5GpUgBT8vYQ+w=; b=Qwiy4Tm94fhp/tANMqil7VWuQSE71JB3YMFKorbV58HyopeSkjJ1KwnM 4Bxc1XpsT+lZC5y2ghouq5oTJyjpVwtExXjnswhQNKpWcc+FEUluHF3ZW 0BYZY/VTplsLvEJxilzQCjiDt22YHPDLZte6dHLZHvjfwi3XuFRVg4R8r TT3+yeQHPSLiJ62nP5CdVim5HCntWUdnZh5p4kdSCAzwzGdiH8aWMapne uvChwHtZI/gVaakXab7GIpR6PGNaWOFs2tyB/Q6lh9hIh2GkLxlOQGyPh I3IkDFpp3Woh3FA+Lm1Ln2452S8venTgLvoGDF1/ARI3UKylZ+yzI0jn2 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="429832329" X-IronPort-AV: E=Sophos;i="6.01,187,1684825200"; d="scan'208";a="429832329" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2023 18:35:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10763"; a="893791373" X-IronPort-AV: E=Sophos;i="6.01,187,1684825200"; d="scan'208";a="893791373" Received: from fengj-mobl.ccr.corp.intel.com (HELO tinazhan-desk1.www.tendawifi.com) ([10.254.210.124]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2023 18:35:15 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Joerg Roedel , Will Deacon , Lu Baolu , Michael Shavit Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [RFC PATCH 6/6] mm: Deprecate pasid field Date: Fri, 7 Jul 2023 09:34:41 +0800 Message-Id: <20230707013441.365583-7-tina.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230707013441.365583-1-tina.zhang@intel.com> References: <20230707013441.365583-1-tina.zhang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Drop the pasid field, as all the information needed for sva domain management has been moved to the newly added iommu_mm field. Signed-off-by: Tina Zhang --- mm/init-mm.c | 1 - 1 file changed, 1 deletion(-) diff --git a/mm/init-mm.c b/mm/init-mm.c index c43b7d0347312..50824dd5a949a 100644 --- a/mm/init-mm.c +++ b/mm/init-mm.c @@ -43,7 +43,6 @@ struct mm_struct init_mm =3D { .user_ns =3D &init_user_ns, .cpu_bitmap =3D CPU_BITS_NONE, #ifdef CONFIG_IOMMU_SVA - .pasid =3D IOMMU_PASID_INVALID, .iommu_mm =3D &default_iommu_mm, #endif INIT_MM_CONTEXT(init_mm) --=20 2.34.1