From nobody Fri Dec 19 10:56:11 2025 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 21C35C83F13 for ; Sun, 27 Aug 2023 08:45:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230368AbjH0Ioz (ORCPT ); Sun, 27 Aug 2023 04:44:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230252AbjH0IoX (ORCPT ); Sun, 27 Aug 2023 04:44:23 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 854A3BF for ; Sun, 27 Aug 2023 01:44:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693125861; x=1724661861; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Vcs7iit32/oFn+7o+m4hBLaWyhJquQoYWn/5bok0fDw=; b=iQIWkaXU2VSpJLyPcx3e2cctXliFe4YqcDXbQyhRRqqkcIoZ70ThbASV Hir2yM8edmHHCE3WMZC8NJDeiUUYbdkWGu0hAagkfdMwy+H5WyE7V0gIQ tADnovZzC5AcIQTGSVOjnNpF4qqT+B0wOLlU6N3OeZT/LRRDWP8ugwOv4 ZvyI/Kdq3ElU5ci+LMSeGJhePa5VDZU9QAHiAVE/3IJFgiHu6hBt64mRe fMQC6z5dlFJ0e5EddYWa5UiNW3HhBnh6cHkBvkMFp2vw3vEgbPZ4O4LRr nnqFLcJXm+lr5aKx8EQjyLoGcy9IDBlmUrjCp34bRMk+RgxozQxkuinPX w==; X-IronPort-AV: E=McAfee;i="6600,9927,10814"; a="359919892" X-IronPort-AV: E=Sophos;i="6.02,204,1688454000"; d="scan'208";a="359919892" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Aug 2023 01:44:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10814"; a="984561794" X-IronPort-AV: E=Sophos;i="6.02,204,1688454000"; d="scan'208";a="984561794" Received: from yzhu-ivm3.ccr.corp.intel.com (HELO tinazhan-desk1.intel.com) ([10.254.213.44]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Aug 2023 01:44:19 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu , Michael Shavit Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [PATCH v2 1/5] iommu: Add mm_get_enqcmd_pasid() helper function Date: Sun, 27 Aug 2023 16:43:57 +0800 Message-Id: <20230827084401.819852-2-tina.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230827084401.819852-1-tina.zhang@intel.com> References: <20230827084401.819852-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_enqcmd_pasid() is for getting enqcmd pasid value. The motivation is to replace mm->pasid with an iommu private data structure that is introduced in a later patch. v2: change mm_get_pasid() to mm_get_enqcmd_pasid() Signed-off-by: Tina Zhang Reviewed-by: Lu Baolu --- arch/x86/kernel/traps.c | 2 +- include/linux/iommu.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 4a817d20ce3bb..d9034b1bbfdd6 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_enqcmd_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 d316425966759..ab9919746fd33 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -1180,6 +1180,10 @@ static inline bool mm_valid_pasid(struct mm_struct *= mm) { return mm->pasid !=3D IOMMU_PASID_INVALID; } +static inline u32 mm_get_enqcmd_pasid(struct mm_struct *mm) +{ + return mm->pasid; +} void mm_pasid_drop(struct mm_struct *mm); struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_struct *mm); @@ -1202,6 +1206,10 @@ 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_enqcmd_pasid(struct mm_struct *mm) +{ + return IOMMU_PASID_INVALID; +} static inline void mm_pasid_drop(struct mm_struct *mm) {} #endif /* CONFIG_IOMMU_SVA */ =20 --=20 2.34.1 From nobody Fri Dec 19 10:56:11 2025 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 2BD56C83F11 for ; Sun, 27 Aug 2023 08:45:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230383AbjH0IpD (ORCPT ); Sun, 27 Aug 2023 04:45:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230253AbjH0Io1 (ORCPT ); Sun, 27 Aug 2023 04:44:27 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3E57BF for ; Sun, 27 Aug 2023 01:44:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693125863; x=1724661863; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rTnym3uAenQpoBEnWSdPc8m4YIARmXNjtx9oZQ9Vckw=; b=Fyv7wNoMj0bQ07ITJfAhP+ET1f8GZsEPdq3aBqWJxIX9RMMM9vGwSTzz luaDUca3Ipp/uO2D/UZzTAUqLIwnD95cE86BGzwMwN6rajZpLDSo9Qn77 ZCHyHUYeaq8HjYqTI7lx82YfYQWJtrLJKggXlwEh62G3RFrPngiiKR6mQ Vf7mJ3oPXoBq8tvZ0T2phIJeuwJOGudP42nxu6mpX8bfefcU1Q9g4f0Gg 31ijoE0V/fgdvQ3wUWJBdMCDqEPPRAMUyQEkUOqYu6XQ5wAEc5cuC3JuY vObOY8Xv737Bm0ocmKULeoIWWZRUe6FQ3hGg0YkltJXOkFOClcdoaDgmj w==; X-IronPort-AV: E=McAfee;i="6600,9927,10814"; a="359919901" X-IronPort-AV: E=Sophos;i="6.02,204,1688454000"; d="scan'208";a="359919901" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Aug 2023 01:44:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10814"; a="984561801" X-IronPort-AV: E=Sophos;i="6.02,204,1688454000"; d="scan'208";a="984561801" Received: from yzhu-ivm3.ccr.corp.intel.com (HELO tinazhan-desk1.intel.com) ([10.254.213.44]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Aug 2023 01:44:21 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu , Michael Shavit Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [PATCH v2 2/5] iommu: Introduce mm_get_pasid() helper function Date: Sun, 27 Aug 2023 16:43:58 +0800 Message-Id: <20230827084401.819852-3-tina.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230827084401.819852-1-tina.zhang@intel.com> References: <20230827084401.819852-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 a mm assigned pasid value. The motivation is to replace mm->pasid with an iommu private data structure that is introduced in a later patch. v2: - Update commit message - Let mm_get_enqcmd_pasid() call mm_get_pasid() to get pasid Signed-off-by: Tina Zhang Reviewed-by: Lu Baolu --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 12 ++++++------ drivers/iommu/intel/svm.c | 8 ++++---- drivers/iommu/iommu-sva.c | 14 +++++++------- include/linux/iommu.h | 10 +++++++++- 4 files changed, 26 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 05c0fb2acbc44..0a4a1ed40814c 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; } @@ -71,7 +71,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); @@ -82,7 +82,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); @@ -101,7 +101,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; @@ -133,7 +133,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); @@ -150,7 +150,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 @@ -217,5 +217,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)); } diff --git a/include/linux/iommu.h b/include/linux/iommu.h index ab9919746fd33..ab8784dfdbd98 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -1180,10 +1180,14 @@ static inline bool mm_valid_pasid(struct mm_struct = *mm) { return mm->pasid !=3D IOMMU_PASID_INVALID; } -static inline u32 mm_get_enqcmd_pasid(struct mm_struct *mm) +static inline u32 mm_get_pasid(struct mm_struct *mm) { return mm->pasid; } +static inline u32 mm_get_enqcmd_pasid(struct mm_struct *mm) +{ + return mm_get_pasid(mm); +} void mm_pasid_drop(struct mm_struct *mm); struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_struct *mm); @@ -1206,6 +1210,10 @@ 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 u32 mm_get_enqcmd_pasid(struct mm_struct *mm) { return IOMMU_PASID_INVALID; --=20 2.34.1 From nobody Fri Dec 19 10:56:11 2025 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 2D03AC83F15 for ; Sun, 27 Aug 2023 08:45:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230337AbjH0IpP (ORCPT ); Sun, 27 Aug 2023 04:45:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230262AbjH0Io2 (ORCPT ); Sun, 27 Aug 2023 04:44:28 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6013BBF for ; Sun, 27 Aug 2023 01:44:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693125866; x=1724661866; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=70XGMLhmcN9XLJ88A4WPccc77MlMNOgnetntb6B7rBs=; b=dw2PaDw2/7mOq6BR/IHkvYfjcAHrokZmGHFS//EHA888nTbshtwUkv6y uDkDac2dpEWmGorUkJEBFBLYleKjHehdQHVUIdn7+3FmbpUgqQ/CleHrS GvrKV2rmeZBVdOqnhrMA9wWP884LIgsyehRkZJmxOFNrR4+SMynbQWNnf WMpTFstPDnHNtwpJxQJ9iYl7a44My2BrgRSV9nQ0CeVDMdZLiHHw4bIsL gHp9dZhjkPvBbWpJl0jeejG/eFiI6JeroPPOeWbD1Vc4YOwEhaqrSqiTt jAQYP5q5KwRzjSf0QSa62n13NCyKhaI/KWHSjMDWuZKx+CEJ0Bnx7E7t8 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10814"; a="359919921" X-IronPort-AV: E=Sophos;i="6.02,204,1688454000"; d="scan'208";a="359919921" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Aug 2023 01:44:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10814"; a="984561811" X-IronPort-AV: E=Sophos;i="6.02,204,1688454000"; d="scan'208";a="984561811" Received: from yzhu-ivm3.ccr.corp.intel.com (HELO tinazhan-desk1.intel.com) ([10.254.213.44]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Aug 2023 01:44:23 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu , Michael Shavit Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [PATCH v2 3/5] mm: Add structure to keep sva information Date: Sun, 27 Aug 2023 16:43:59 +0800 Message-Id: <20230827084401.819852-4-tina.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230827084401.819852-1-tina.zhang@intel.com> References: <20230827084401.819852-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" Introduce iommu_mm_data structure to keep sva information (pasid and the related sva domains). Add iommu_mm pointer, pointing to an instance of iommu_mm_data structure, to mm. Signed-off-by: Tina Zhang --- include/linux/iommu.h | 5 +++++ include/linux/mm_types.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/include/linux/iommu.h b/include/linux/iommu.h index ab8784dfdbd98..937f3abc26f2e 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -670,6 +670,11 @@ struct iommu_sva { struct iommu_domain *domain; }; =20 +struct iommu_mm_data { + u32 pasid; + struct list_head sva_domains; +}; + 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); diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 5e74ce4a28cd6..3fd65b7537f0e 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -595,6 +595,7 @@ struct mm_cid { #endif =20 struct kioctx_table; +struct iommu_mm_data; struct mm_struct { struct { /* @@ -808,6 +809,7 @@ struct mm_struct { =20 #ifdef CONFIG_IOMMU_SVA u32 pasid; + struct iommu_mm_data *iommu_mm; #endif #ifdef CONFIG_KSM /* --=20 2.34.1 From nobody Fri Dec 19 10:56:11 2025 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 BFC4BC83F01 for ; Sun, 27 Aug 2023 08:45:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230378AbjH0IpS (ORCPT ); Sun, 27 Aug 2023 04:45:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230274AbjH0Ioc (ORCPT ); Sun, 27 Aug 2023 04:44:32 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3C8FDE for ; Sun, 27 Aug 2023 01:44:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693125868; x=1724661868; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vP2SDOEhoRg4DNQ7bUW10qzAxsj44O2ZOX0nemJ4Jlo=; b=iGFgZNWtw4mozMtDEeL4IOAv0v1aVdnjiXM/tXdWq5NjszpaWidE3MIe mlkcef9xBq0F10jNSz7E0rhpBe4lQZUSAq7Zr2R021bMgBVNbw3wmC8Kw ufo/ERLwvTL8+b99AVA3qhvGotZ09pWnXjxdGhMcuiDHuV6P7vhO7cpu4 hyflezx6O9RCmt/CSfuDqqnBmgoR/pk/hDOUAnDKCKzJtelzJuqcrK34g 5Pah8WpllMdaBixGx/3PQBJD+LP8Do8MSrTHjKbNNvgmVPNHqqAMkeme9 vzdCzJidLm6O0Y6mbknDTx20+fkJwoZMjvo/Kp/jKB1lR5wtI2c3+lkwp g==; X-IronPort-AV: E=McAfee;i="6600,9927,10814"; a="359919929" X-IronPort-AV: E=Sophos;i="6.02,204,1688454000"; d="scan'208";a="359919929" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Aug 2023 01:44:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10814"; a="984561825" X-IronPort-AV: E=Sophos;i="6.02,204,1688454000"; d="scan'208";a="984561825" Received: from yzhu-ivm3.ccr.corp.intel.com (HELO tinazhan-desk1.intel.com) ([10.254.213.44]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Aug 2023 01:44:26 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu , Michael Shavit Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [PATCH v2 4/5] iommu: Support mm PASID 1:n with sva domains Date: Sun, 27 Aug 2023 16:44:00 +0800 Message-Id: <20230827084401.819852-5-tina.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230827084401.819852-1-tina.zhang@intel.com> References: <20230827084401.819852-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 corresponding sva domains allocated in iommu_sva_bind_device(), which are referenced by iommu_mm field of the mm. The PASID is released in __mmdrop(), while a sva domain is released when no one is using it (the reference count is decremented in iommu_sva_unbind_device()). Since the required info of PASID and sva domains is kept in struct iommu_mm_data of a mm, use mm->iommu_mm field instead of the old pasid field in mm struct. The sva domain list is protected by iommu_sva_lock. Besides, this patch removes mm_pasid_init(), as with the introduced iommu_mm structure, initializing mm pasid in mm_init() is unnecessary. Signed-off-by: Tina Zhang Reviewed-by: Lu Baolu --- drivers/iommu/iommu-sva.c | 38 +++++++++++++++++++++++++------------- include/linux/iommu.h | 10 +++------- kernel/fork.c | 1 - 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/drivers/iommu/iommu-sva.c b/drivers/iommu/iommu-sva.c index 0a4a1ed40814c..35366f51ad27d 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,11 +34,22 @@ static int iommu_sva_alloc_pasid(struct mm_struct *mm, = ioasid_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; + } + ret =3D ida_alloc_range(&iommu_global_pasid_ida, min, max, GFP_KERNEL); - if (ret < 0) + if (ret < 0) { + kfree(iommu_mm); goto out; + } + + iommu_mm->pasid =3D ret; + mm->iommu_mm =3D iommu_mm; + INIT_LIST_HEAD(&mm->iommu_mm->sva_domains); =20 - mm->pasid =3D ret; ret =3D 0; out: mutex_unlock(&iommu_sva_lock); @@ -82,16 +94,12 @@ struct iommu_sva *iommu_sva_bind_device(struct device *= dev, 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_get_pasid(mm), - IOMMU_DOMAIN_SVA); - if (IS_ERR(domain)) { - ret =3D PTR_ERR(domain); - goto out_unlock; - } - - if (domain) { - domain->users++; - goto out; + list_for_each_entry(domain, &mm->iommu_mm->sva_domains, next) { + ret =3D iommu_attach_device_pasid(domain, dev, mm_get_pasid(mm)); + if (!ret) { + domain->users++; + goto out; + } } =20 /* Allocate a new domain and set it on device pasid. */ @@ -105,6 +113,8 @@ struct iommu_sva *iommu_sva_bind_device(struct device *= dev, struct mm_struct *mm if (ret) goto out_free_domain; domain->users =3D 1; + list_add(&domain->next, &mm->iommu_mm->sva_domains); + out: mutex_unlock(&iommu_sva_lock); handle->dev =3D dev; @@ -137,8 +147,9 @@ void iommu_sva_unbind_device(struct iommu_sva *handle) struct device *dev =3D handle->dev; =20 mutex_lock(&iommu_sva_lock); + iommu_detach_device_pasid(domain, dev, pasid); if (--domain->users =3D=3D 0) { - iommu_detach_device_pasid(domain, dev, pasid); + list_del(&domain->next); iommu_domain_free(domain); } mutex_unlock(&iommu_sva_lock); @@ -218,4 +229,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/include/linux/iommu.h b/include/linux/iommu.h index 937f3abc26f2e..cfbd35ceb375f 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -109,6 +109,7 @@ struct iommu_domain { struct { /* IOMMU_DOMAIN_SVA */ struct mm_struct *mm; int users; + struct list_head next; }; }; }; @@ -1177,17 +1178,13 @@ static inline bool tegra_dev_iommu_get_stream_id(st= ruct device *dev, u32 *stream } =20 #ifdef CONFIG_IOMMU_SVA -static inline void mm_pasid_init(struct mm_struct *mm) -{ - mm->pasid =3D IOMMU_PASID_INVALID; -} static inline bool mm_valid_pasid(struct mm_struct *mm) { - return mm->pasid !=3D IOMMU_PASID_INVALID; + return mm->iommu_mm ? true : false; } static inline u32 mm_get_pasid(struct mm_struct *mm) { - return mm->pasid; + return mm->iommu_mm ? mm->iommu_mm->pasid : IOMMU_PASID_INVALID; } static inline u32 mm_get_enqcmd_pasid(struct mm_struct *mm) { @@ -1213,7 +1210,6 @@ static inline u32 iommu_sva_get_pasid(struct iommu_sv= a *handle) { return IOMMU_PASID_INVALID; } -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) { diff --git a/kernel/fork.c b/kernel/fork.c index d2e12b6d2b180..f06392dd1ca8a 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1274,7 +1274,6 @@ static struct mm_struct *mm_init(struct mm_struct *mm= , struct task_struct *p, mm_init_cpumask(mm); mm_init_aio(mm); mm_init_owner(mm, p); - mm_pasid_init(mm); RCU_INIT_POINTER(mm->exe_file, NULL); mmu_notifier_subscriptions_init(mm); init_tlb_flush_pending(mm); --=20 2.34.1 From nobody Fri Dec 19 10:56:11 2025 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 D48ACC83F17 for ; Sun, 27 Aug 2023 08:45:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230394AbjH0IpU (ORCPT ); Sun, 27 Aug 2023 04:45:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230265AbjH0Ioc (ORCPT ); Sun, 27 Aug 2023 04:44:32 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB490BF for ; Sun, 27 Aug 2023 01:44:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693125871; x=1724661871; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0/clqt9D3Bd4HIrGF9A8iz0CPvepE+kYUo7cjHUhPfg=; b=Zx3JCRN9JnUj4C/uH1zpPxYRFxGjAeoMyNOGgYlA051whMrQlrmk+Sss JxXz8ur3IF6Sbbp/kR62jVuREO7DUtZKXAQTOYo3/aJFpeNKwTmDgiY/C EY658lfmRZo53Kzwn6oKknCrZNdZp7BSgxznyhhwVUV5Dk4Nd7vwflhtu PlssX7uBWkNxx0SZsDYnCMXww9j+O+b4JMpPnR9RZyNkQ02xIbQmp4mxk Jhgc1KdcuWlIhwN4yOiz9gqHtrDMCEzZ72ooVhpAtV5lx7ZvJqlBYer1t n1HYQk0XxpZz92tE/K7SnTa3gUOk05NwMUz5NkN8HY3oBeXZO/so1wxMv g==; X-IronPort-AV: E=McAfee;i="6600,9927,10814"; a="359919944" X-IronPort-AV: E=Sophos;i="6.02,204,1688454000"; d="scan'208";a="359919944" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Aug 2023 01:44:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10814"; a="984561832" X-IronPort-AV: E=Sophos;i="6.02,204,1688454000"; d="scan'208";a="984561832" Received: from yzhu-ivm3.ccr.corp.intel.com (HELO tinazhan-desk1.intel.com) ([10.254.213.44]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Aug 2023 01:44:28 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu , Michael Shavit Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [PATCH v2 5/5] mm: Deprecate pasid field Date: Sun, 27 Aug 2023 16:44:01 +0800 Message-Id: <20230827084401.819852-6-tina.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230827084401.819852-1-tina.zhang@intel.com> References: <20230827084401.819852-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 Reviewed-by: Lu Baolu --- include/linux/mm_types.h | 1 - mm/init-mm.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 3fd65b7537f0e..6cb5cc53c4803 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -808,7 +808,6 @@ struct mm_struct { struct work_struct async_put_work; =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..69719291463ed 100644 --- a/mm/init-mm.c +++ b/mm/init-mm.c @@ -42,9 +42,6 @@ struct mm_struct init_mm =3D { #endif .user_ns =3D &init_user_ns, .cpu_bitmap =3D CPU_BITS_NONE, -#ifdef CONFIG_IOMMU_SVA - .pasid =3D IOMMU_PASID_INVALID, -#endif INIT_MM_CONTEXT(init_mm) }; =20 --=20 2.34.1