From nobody Sun Feb 8 02:55:48 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 012A9CA0FE9 for ; Tue, 5 Sep 2023 00:10:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242740AbjIEAKY (ORCPT ); Mon, 4 Sep 2023 20:10:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242778AbjIEAKU (ORCPT ); Mon, 4 Sep 2023 20:10:20 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1005B1707 for ; Mon, 4 Sep 2023 17:09:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693872597; x=1725408597; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=/dTUhYfeM2klMNq88hQ3YcjdcaNnjWoTfjR9d0kJiac=; b=g5D7ps1sk0ZoXoc0IiADbY3lZNJkoM0hf2E4P/xyPvDPAlary/rVRIfF H1+mvzgGG6OkhDwL2Lr8QWx3DOXAHowoe7dSdQjx5ECYKUnGkIoZFHvxc Yi3TNIGPh56jTU+xZADSCpZlxaniGhiOgMYzpx7TIhCmtaX+ksQrQBE1N UkagXm0Wmfj2T4ss9A9OMXde2ZrXQp1Od7p65dW3ZcB3HZaDjUo8rrQLy 3bvgnxDpUdqxKy6q6QZvCnTYfEiX4H6OuUitVFOvlOhqAETW1MqedzXiL EUReLIm02WxuRXlRUdyXWWHUaG2LkoEoRCGbK5OIpKrcC2hinLAI608yD A==; X-IronPort-AV: E=McAfee;i="6600,9927,10823"; a="463039957" X-IronPort-AV: E=Sophos;i="6.02,227,1688454000"; d="scan'208";a="463039957" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2023 17:09:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10823"; a="884125109" X-IronPort-AV: E=Sophos;i="6.02,227,1688454000"; d="scan'208";a="884125109" Received: from kechen-optiplex-9020.bj.intel.com ([10.238.157.62]) by fmsmga001.fm.intel.com with ESMTP; 04 Sep 2023 17:09:48 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: Michael Shavit , Vasant Hegde , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [PATCH v3 1/6] iommu: Add mm_get_enqcmd_pasid() helper function Date: Tue, 5 Sep 2023 08:09:25 +0800 Message-Id: <20230905000930.24515-2-tina.zhang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230905000930.24515-1-tina.zhang@intel.com> References: <20230905000930.24515-1-tina.zhang@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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. Reviewed-by: Lu Baolu Signed-off-by: Tina Zhang --- Changes in v2: - Change mm_get_pasid() to mm_get_enqcmd_pasid() 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 4a817d20ce3b..d9034b1bbfdd 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 d31642596675..ab9919746fd3 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.17.1 From nobody Sun Feb 8 02:55:48 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 737B0C71153 for ; Tue, 5 Sep 2023 00:10:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242829AbjIEAK0 (ORCPT ); Mon, 4 Sep 2023 20:10:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242831AbjIEAKW (ORCPT ); Mon, 4 Sep 2023 20:10:22 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CBB31712 for ; Mon, 4 Sep 2023 17:09:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693872599; x=1725408599; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=gcIIuTgtOMJEZvwbXHJ6P3esiHEE8x1c6wWwwWr22zw=; b=HJyG8u4/2i6WVvniXCi7Cpzwa4w4oRLIoE1AmqCq6/1hs2Ng5Zr6HHHI yblRMAwganx+MhvBTtlr6kiOGoDtF7O6mK1dlUz4doFdecHFxtf6RN5vl FAM+6AgKTNc3j9takVUjHvgJPPFZsJu+Em4aoHeTag6D6OkRNqwiQUoL0 usIkKmAdPuwuu69Xs7ks00sAI/nN0DDPZLV0//CEmhc+8UmpDo1wndoTn JdrxrfRliDaSBlljIyAt6n/cR7aMp5UipRlrfjow16ssNAXB2Ml8jrD4K o3cWEculgdozj5LhqZNQf+bTvGJjbTYu1Yq6c+p5+zgYPjbb+PZDupEJe Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10823"; a="463039963" X-IronPort-AV: E=Sophos;i="6.02,227,1688454000"; d="scan'208";a="463039963" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2023 17:09:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10823"; a="884125114" X-IronPort-AV: E=Sophos;i="6.02,227,1688454000"; d="scan'208";a="884125114" Received: from kechen-optiplex-9020.bj.intel.com ([10.238.157.62]) by fmsmga001.fm.intel.com with ESMTP; 04 Sep 2023 17:09:50 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: Michael Shavit , Vasant Hegde , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [PATCH v3 2/6] iommu/vt-d: Remove mm->pasid in intel_sva_bind_mm() Date: Tue, 5 Sep 2023 08:09:26 +0800 Message-Id: <20230905000930.24515-3-tina.zhang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230905000930.24515-1-tina.zhang@intel.com> References: <20230905000930.24515-1-tina.zhang@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The pasid is passed in as a parameter through .set_dev_pasid() callback. Thus, intel_sva_bind_mm() can directly use it instead of retrieving the pasid value from mm->pasid. Suggested-by: Lu Baolu Signed-off-by: Tina Zhang --- drivers/iommu/intel/svm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index e95b339e9cdc..3527f8833d84 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -298,21 +298,22 @@ static int pasid_to_svm_sdev(struct device *dev, unsi= gned int pasid, } =20 static int intel_svm_bind_mm(struct intel_iommu *iommu, struct device *dev, - struct mm_struct *mm) + struct iommu_domain *domain, ioasid_t pasid) { struct device_domain_info *info =3D dev_iommu_priv_get(dev); + struct mm_struct *mm =3D domain->mm; struct intel_svm_dev *sdev; struct intel_svm *svm; unsigned long sflags; int ret =3D 0; =20 - svm =3D pasid_private_find(mm->pasid); + svm =3D pasid_private_find(pasid); if (!svm) { svm =3D kzalloc(sizeof(*svm), GFP_KERNEL); if (!svm) return -ENOMEM; =20 - svm->pasid =3D mm->pasid; + svm->pasid =3D pasid; svm->mm =3D mm; INIT_LIST_HEAD_RCU(&svm->devs); =20 @@ -350,7 +351,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, pasid, FLPT_DEFAULT_DID, sflags); if (ret) goto free_sdev; @@ -364,7 +365,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(pasid); kfree(svm); } =20 @@ -839,11 +840,10 @@ static int intel_svm_set_dev_pasid(struct iommu_domai= n *domain, { struct device_domain_info *info =3D dev_iommu_priv_get(dev); struct intel_iommu *iommu =3D info->iommu; - struct mm_struct *mm =3D domain->mm; int ret; =20 mutex_lock(&pasid_mutex); - ret =3D intel_svm_bind_mm(iommu, dev, mm); + ret =3D intel_svm_bind_mm(iommu, dev, domain, pasid); mutex_unlock(&pasid_mutex); =20 return ret; --=20 2.17.1 From nobody Sun Feb 8 02:55:48 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 77450C71153 for ; Tue, 5 Sep 2023 00:10:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242866AbjIEAKi (ORCPT ); Mon, 4 Sep 2023 20:10:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242831AbjIEAKe (ORCPT ); Mon, 4 Sep 2023 20:10:34 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0277ACDC for ; Mon, 4 Sep 2023 17:10:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693872615; x=1725408615; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=Pvz3GjgnM5Ebh9fF4knA2p0WYHUQpi6IjVqQrxFdID8=; b=CVEbd0n3BGnuicpaILV2RWHVt942GztafSL8S4G4k1jq9H+soyUL/rZJ HLgYCO/OXajYaW7WJ+YQGnPfTwy26FCuhbVPEwoKg0kAy1w81ybZtcljb 1bOCBD9T+Nv9Rif4d/S4CfbOsy1zb2mMhR44R6P9YKoyglD05mSRiu8Z/ misHHWte2ZkEN5EccnFZxlYmxRUtA6x4JftNYgcls2MWt2paFKwS6jnML XNnglwf3VXPzyYKOd8Yfa1TuQ1+BunnEj5WfYI/j7hbXfdNnOPdPhCklo hbSXlgVgciVxA4+Kr+yJhmSX4udF1rd0yOVLRMgeIGPlO7ojH78xTmX9y A==; X-IronPort-AV: E=McAfee;i="6600,9927,10823"; a="463039970" X-IronPort-AV: E=Sophos;i="6.02,227,1688454000"; d="scan'208";a="463039970" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2023 17:10:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10823"; a="884125130" X-IronPort-AV: E=Sophos;i="6.02,227,1688454000"; d="scan'208";a="884125130" Received: from kechen-optiplex-9020.bj.intel.com ([10.238.157.62]) by fmsmga001.fm.intel.com with ESMTP; 04 Sep 2023 17:09:52 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: Michael Shavit , Vasant Hegde , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [PATCH v3 3/6] iommu: Introduce mm_get_pasid() helper function Date: Tue, 5 Sep 2023 08:09:27 +0800 Message-Id: <20230905000930.24515-4-tina.zhang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230905000930.24515-1-tina.zhang@intel.com> References: <20230905000930.24515-1-tina.zhang@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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. Reviewed-by: Lu Baolu Signed-off-by: Tina Zhang --- Changes in v2: - Update commit message - Let mm_get_enqcmd_pasid() call mm_get_pasid() to get pasid drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 12 ++++++------ drivers/iommu/iommu-sva.c | 14 +++++++------- include/linux/iommu.h | 10 +++++++++- 3 files changed, 22 insertions(+), 14 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 a5a63b1c947e..0b455654d365 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/iommu-sva.c b/drivers/iommu/iommu-sva.c index 05c0fb2acbc4..0a4a1ed40814 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 ab9919746fd3..ab8784dfdbd9 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.17.1 From nobody Sun Feb 8 02:55:48 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 0DBDAC71153 for ; Tue, 5 Sep 2023 00:10:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243027AbjIEAKg (ORCPT ); Mon, 4 Sep 2023 20:10:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242816AbjIEAKe (ORCPT ); Mon, 4 Sep 2023 20:10:34 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EAA69CE2 for ; Mon, 4 Sep 2023 17:10:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693872616; x=1725408616; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=69SRzUQvDZdG00nzwrRDO1edksKrqqQn3DhViP1IvTM=; b=KLBVbLhP/a9JXT+Hh+jHn4cv8fmrkRKoePjj1tYZcoZsZYaYSrcJ2Ai4 wRn59DFQ2j2h+T1RR3bzQQRtA/K7nIihXDNFshSKi5GUgZY40ag83oeFs HR0CrHRB8xigdaEBKRjxSZdO1mPfB5E42fRaDhyjwKkeMzYhAj9ZFbVP1 a4nYtIG3kbKhmfmpZcfEpHc1pBTy2335g3oITmNUfNk3YGDTUR1JYtYua SJhNrUqsDwLaCYzbDheLUIHfwcmnrah16SRhEuSNbvkd6LVdxpvxxvDbC ZkbCrrVKS/3Tl9P5GTSdHwxx8f++FRgVZIsoKSND/2/fKwzzLAmf+UP4c A==; X-IronPort-AV: E=McAfee;i="6600,9927,10823"; a="463039975" X-IronPort-AV: E=Sophos;i="6.02,227,1688454000"; d="scan'208";a="463039975" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2023 17:10:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10823"; a="884125137" X-IronPort-AV: E=Sophos;i="6.02,227,1688454000"; d="scan'208";a="884125137" Received: from kechen-optiplex-9020.bj.intel.com ([10.238.157.62]) by fmsmga001.fm.intel.com with ESMTP; 04 Sep 2023 17:09:55 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: Michael Shavit , Vasant Hegde , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [PATCH v3 4/6] mm: Add structure to keep sva information Date: Tue, 5 Sep 2023 08:09:28 +0800 Message-Id: <20230905000930.24515-5-tina.zhang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230905000930.24515-1-tina.zhang@intel.com> References: <20230905000930.24515-1-tina.zhang@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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 Reviewed-by: Vasant Hegde --- 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 ab8784dfdbd9..937f3abc26f2 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 7d30dc4ff0ff..b486f521afee 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.17.1 From nobody Sun Feb 8 02:55:48 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 795FCC83F33 for ; Tue, 5 Sep 2023 00:10:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242894AbjIEAKk (ORCPT ); Mon, 4 Sep 2023 20:10:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242896AbjIEAKe (ORCPT ); Mon, 4 Sep 2023 20:10:34 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88610CF6 for ; Mon, 4 Sep 2023 17:10:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693872618; x=1725408618; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=0kxt6FFlHw1DUH3cmrz8eMgVCP5TKfKG8u9aLn4wgcs=; b=YY3ZB9umdtnG7nq0o4BXQ8w8b4auuSqilEl6kNKNF6F8SgX7fgTXnBur ni7Y+f25SJuCOHkJM4SBBDxEaXPYltANAFwI5h7fZMVPs9vl6OlEfF/MF gaUejc1H2IslyFvaJyf0Fs202igGP25gJq3VgA2IxwsJPGwwoewpfM569 TcynRcO60UK85ylhjAhpiKo1HB9vj7m406FpA9KlmfqPbv+DWz4PdpayJ L33Hv5eHChRN7ZukntEXyY849pzlGZ9bLSKIMeo8zHaCtED386ef2/ty+ tt2BgTon4/jmZ1oM442oTQA+CLT+emGKbhCwFsWHE6L19e9hG/8ds0kGE Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10823"; a="463039982" X-IronPort-AV: E=Sophos;i="6.02,227,1688454000"; d="scan'208";a="463039982" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2023 17:10:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10823"; a="884125143" X-IronPort-AV: E=Sophos;i="6.02,227,1688454000"; d="scan'208";a="884125143" Received: from kechen-optiplex-9020.bj.intel.com ([10.238.157.62]) by fmsmga001.fm.intel.com with ESMTP; 04 Sep 2023 17:09:57 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: Michael Shavit , Vasant Hegde , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [PATCH v3 5/6] iommu: Support mm PASID 1:n with sva domains Date: Tue, 5 Sep 2023 08:09:29 +0800 Message-Id: <20230905000930.24515-6-tina.zhang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230905000930.24515-1-tina.zhang@intel.com> References: <20230905000930.24515-1-tina.zhang@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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()). However, although sva domains and their PASID are separate objects such that their own life cycles could be handled independently, an enqcmd use case may require releasing the PASID in releasing the mm (i.e., once a PASID is allocated for a mm, it will be permanently used by the mm and won't be released until the end of mm) and only allows to drop the PASID after the sva domains are released. To this end, mmgrab() is called in iommu_sva_domain_alloc() to increment the mm reference count and mmdrop() is invoked in iommu_domain_free() to decrement the mm reference count. 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. Reviewed-by: Lu Baolu Signed-off-by: Tina Zhang --- Changes in v3: - Add a comment describing domain->next. - Update the commit message. drivers/iommu/iommu-sva.c | 38 +++++++++++++++++++++++++------------- include/linux/iommu.h | 14 +++++++------- kernel/fork.c | 1 - 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/drivers/iommu/iommu-sva.c b/drivers/iommu/iommu-sva.c index 0a4a1ed40814..e7e3aeaa7055 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; 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; + INIT_LIST_HEAD(&iommu_mm->sva_domains); + mm->iommu_mm =3D iommu_mm; =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 937f3abc26f2..95ada53f24ec 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -109,6 +109,11 @@ struct iommu_domain { struct { /* IOMMU_DOMAIN_SVA */ struct mm_struct *mm; int users; + /* + * Next iommu_domain in mm->iommu_mm->sva-domains list + * protected by iommu_sva_lock. + */ + struct list_head next; }; }; }; @@ -1177,17 +1182,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 +1214,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 d2e12b6d2b18..f06392dd1ca8 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.17.1 From nobody Sun Feb 8 02:55:48 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 7D095C71153 for ; Tue, 5 Sep 2023 00:10:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242935AbjIEAKn (ORCPT ); Mon, 4 Sep 2023 20:10:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242863AbjIEAKf (ORCPT ); Mon, 4 Sep 2023 20:10:35 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF09910F9 for ; Mon, 4 Sep 2023 17:10:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693872624; x=1725408624; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=68L83X6aiWQ0u3NC5lLGeeqieoz7SK8pWWYp6gdXpkU=; b=YVj6gBTaLTRnvw3QEHmQAhHrYYwVGve4qRVh19CUyP0ZEeRp/N2/o/qB O0ddxis/U3QPWvGfXV2GYsrcJ+tMhc6PIfy91DwJfFn4tz5dxXUCMSGIy x4jIUyVlNskGvRpDkFHvSI9r+5nzRw2Gf20BpeEAJejI9E2SISR8uQYgN 0L25XFmyvOTb3xfQLyBSKpLEKVUtF6uuo1tpBZIHVg83Eh1jct8fXme58 Burf7TAUafcl4zSzpwpX5//+B7kiP7q/D0Hnv6YXqqOpu1fiw6YqbRgB1 RN0JkbFoyv1T4ziuaoXF5Vx1XgVbdt5/+MOb6B2CINFa+43bA/LrxXzNC w==; X-IronPort-AV: E=McAfee;i="6600,9927,10823"; a="463039990" X-IronPort-AV: E=Sophos;i="6.02,227,1688454000"; d="scan'208";a="463039990" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2023 17:10:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10823"; a="884125154" X-IronPort-AV: E=Sophos;i="6.02,227,1688454000"; d="scan'208";a="884125154" Received: from kechen-optiplex-9020.bj.intel.com ([10.238.157.62]) by fmsmga001.fm.intel.com with ESMTP; 04 Sep 2023 17:09:59 -0700 From: Tina Zhang To: Jason Gunthorpe , Kevin Tian , Lu Baolu Cc: Michael Shavit , Vasant Hegde , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Tina Zhang Subject: [PATCH v3 6/6] mm: Deprecate pasid field Date: Tue, 5 Sep 2023 08:09:30 +0800 Message-Id: <20230905000930.24515-7-tina.zhang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230905000930.24515-1-tina.zhang@intel.com> References: <20230905000930.24515-1-tina.zhang@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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. Reviewed-by: Lu Baolu Signed-off-by: Tina Zhang --- 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 b486f521afee..fb0e4416d9d7 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 efa97b57acfd..69719291463e 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.17.1