From nobody Tue Sep 16 00:28:17 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 A8C98C54EBC for ; Mon, 9 Jan 2023 01:58:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234022AbjAIB6H (ORCPT ); Sun, 8 Jan 2023 20:58:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233656AbjAIB6C (ORCPT ); Sun, 8 Jan 2023 20:58:02 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED10D10077 for ; Sun, 8 Jan 2023 17:58:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673229481; x=1704765481; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=er1mwQFmjpqAn37x8zwY2h6Q9EPKtK229QoVf7N6fXA=; b=EL4nQ8JxOspExqj+/PceTagTlHWW5hFQmvQQd43W4+jbesEBEF+tEO9G LD0dDKs1PtM7A/5IaYJ2e3DPQ1Lyd9/Q6Ql5w81BNM8+1Qq92FqOC68m7 u9U3ZbvGDI23UpEaMEJhH/t+XZDAZ0AlfTvlRHnE1ipeJxuOH0sFBHyhf O5W/x3spm43nVEpx7EYTfLWb9elTo1hoSEAdbBl/S7SJYutdUvPfsG1+g 4MAFD0AXOJpOqAfs/+tkySFsP3Y3NKirSA1PcBmtc7klpo8Hzz3aID4Ka 0+BdSAGBlJlB5GEl11vvu0SwQeelYawUf83IgsfYQ9q/KwNqlQhykOeAX g==; X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="322848721" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="322848721" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jan 2023 17:57:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="649867413" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="649867413" Received: from allen-box.sh.intel.com ([10.239.159.48]) by orsmga007.jf.intel.com with ESMTP; 08 Jan 2023 17:57:47 -0800 From: Lu Baolu To: iommu@lists.linux.dev Cc: Joerg Roedel , Will Deacon , Robin Murphy , Kevin Tian , linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH 1/4] iommu/vt-d: Remove include/linux/intel-svm.h Date: Mon, 9 Jan 2023 09:49:52 +0800 Message-Id: <20230109014955.147068-2-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230109014955.147068-1-baolu.lu@linux.intel.com> References: <20230109014955.147068-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There's no need to have a public header for Intel SVA implementation. The device driver should interact with Intel SVA implementation via the IOMMU generic APIs. Signed-off-by: Lu Baolu Reviewed-by: Kevin Tian --- include/linux/intel-svm.h | 16 ---------------- drivers/iommu/intel/iommu.h | 5 +++++ drivers/iommu/intel/iommu.c | 1 - drivers/iommu/intel/svm.c | 1 - MAINTAINERS | 1 - 5 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 include/linux/intel-svm.h diff --git a/include/linux/intel-svm.h b/include/linux/intel-svm.h deleted file mode 100644 index f9a0d44f6fdb..000000000000 --- a/include/linux/intel-svm.h +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright =C2=A9 2015 Intel Corporation. - * - * Authors: David Woodhouse - */ - -#ifndef __INTEL_SVM_H__ -#define __INTEL_SVM_H__ - -/* Page Request Queue depth */ -#define PRQ_ORDER 4 -#define PRQ_RING_MASK ((0x1000 << PRQ_ORDER) - 0x20) -#define PRQ_DEPTH ((0x1000 << PRQ_ORDER) >> 5) - -#endif /* __INTEL_SVM_H__ */ diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index 06e61e474856..f89f63d7a72a 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -438,6 +438,11 @@ struct q_inval { int free_cnt; }; =20 +/* Page Request Queue depth */ +#define PRQ_ORDER 4 +#define PRQ_RING_MASK ((0x1000 << PRQ_ORDER) - 0x20) +#define PRQ_DEPTH ((0x1000 << PRQ_ORDER) >> 5) + struct dmar_pci_notify_info; =20 #ifdef CONFIG_IRQ_REMAP diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 59df7e42fd53..317af67b6098 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index c76b66263467..d38a54396c23 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include diff --git a/MAINTAINERS b/MAINTAINERS index a36df9ed283d..43fd97f0e1df 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10459,7 +10459,6 @@ L: iommu@lists.linux.dev S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git F: drivers/iommu/intel/ -F: include/linux/intel-svm.h =20 INTEL IPU3 CSI-2 CIO2 DRIVER M: Yong Zhi --=20 2.34.1 From nobody Tue Sep 16 00:28:17 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 B9B73C54EBD for ; Mon, 9 Jan 2023 01:58:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234098AbjAIB6M (ORCPT ); Sun, 8 Jan 2023 20:58:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233886AbjAIB6E (ORCPT ); Sun, 8 Jan 2023 20:58:04 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF3E010072 for ; Sun, 8 Jan 2023 17:58:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673229482; x=1704765482; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=puzEiCLaFj6PIN4/Wwibk3XN7n6katY+/NOVoiu348c=; b=aB7r5kzPBbVrdi3uF9g3K5g0YSvKx5pU+53ZFldWqHHvBUSUNwxyq0ta HI9Zvci+mY62TMe/ReHoC0DYFcnKJDt7aCPXnbGq6Yjp7mLmh7TlLI9vm Qr4C8Y9hUZ1/0fDO1BF12tEl4PBtTmpPbdIxc1EGO798QUN6DIkZ+V07H NiIM6L+DfvApLhrPCIDw9j/VfsIhySGZ9JnP3XDPuRmDD41FpPUKCuChA UJflsZoTFJhOnLm6MXp2KD3B/xBfQJBuAtwkZ/38nYTFXdyrEQ6anPCn2 su+u4lNUJnUoDa/unUPlSkIA7HBt2b/GefXYlVc0BRnNjZxJWJU8Sfi7J A==; X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="322848730" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="322848730" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jan 2023 17:57:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="649867421" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="649867421" Received: from allen-box.sh.intel.com ([10.239.159.48]) by orsmga007.jf.intel.com with ESMTP; 08 Jan 2023 17:57:50 -0800 From: Lu Baolu To: iommu@lists.linux.dev Cc: Joerg Roedel , Will Deacon , Robin Murphy , Kevin Tian , linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH 2/4] iommu/vt-d: Remove unused fields in svm structures Date: Mon, 9 Jan 2023 09:49:53 +0800 Message-Id: <20230109014955.147068-3-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230109014955.147068-1-baolu.lu@linux.intel.com> References: <20230109014955.147068-1-baolu.lu@linux.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" They aren't used anywhere. Remove them to avoid dead code. Signed-off-by: Lu Baolu Reviewed-by: Kevin Tian --- drivers/iommu/intel/iommu.h | 4 ---- drivers/iommu/intel/svm.c | 2 -- 2 files changed, 6 deletions(-) diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index f89f63d7a72a..e7c732979364 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -762,18 +762,14 @@ struct intel_svm_dev { struct device *dev; struct intel_iommu *iommu; struct iommu_sva sva; - u32 pasid; int users; u16 did; - u16 dev_iotlb:1; u16 sid, qdep; }; =20 struct intel_svm { struct mmu_notifier notifier; struct mm_struct *mm; - - unsigned int flags; u32 pasid; struct list_head devs; }; diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index d38a54396c23..d1e445f03aa6 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -351,11 +351,9 @@ static struct iommu_sva *intel_svm_bind_mm(struct inte= l_iommu *iommu, sdev->did =3D FLPT_DEFAULT_DID; sdev->sid =3D PCI_DEVID(info->bus, info->devfn); sdev->users =3D 1; - sdev->pasid =3D svm->pasid; sdev->sva.dev =3D dev; init_rcu_head(&sdev->rcu); if (info->ats_enabled) { - sdev->dev_iotlb =3D 1; sdev->qdep =3D info->ats_qdep; if (sdev->qdep >=3D QI_DEV_EIOTLB_MAX_INVS) sdev->qdep =3D 0; --=20 2.34.1 From nobody Tue Sep 16 00:28:17 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 3D10DC54EBD for ; Mon, 9 Jan 2023 01:58:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230219AbjAIB6R (ORCPT ); Sun, 8 Jan 2023 20:58:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233922AbjAIB6E (ORCPT ); Sun, 8 Jan 2023 20:58:04 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C991101DC for ; Sun, 8 Jan 2023 17:58:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673229484; x=1704765484; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GDYJ6Y89oJ5wOsjNTY7g9ajEpmKqwp+GoMmPOL3dWqA=; b=j7qHp4Srfs6buZIe/EC0QuQLO3ZsAiYKVx5u9nPErXp8z3LHKRvjhVxg glqmPFApKNccqHQKCnXge4gBSrZDFleI++Ha2jUOiv7+tIeMbO5/UEWVy wIimRgvaqkZ4BAYdYAGnI/qLIZQh6WoJ9XSsrr8FOAc0IhDrfNmcXcHFy jq1QSgYSnajV6jEggrgv5J00Wj1NMxAhwmAh4+GuAlYXYR0ntD//5iMQ0 +FALEKeJkQODDC/yO3+Zwp+x56U/bVx5bQx9ET8821ziq7rLb6H4CXj8g mMJFgD9h8FblHnzj62X0+Z2wret4MYg5lTL3eKNj4PpxItt1nahACdmM4 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="322848739" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="322848739" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jan 2023 17:57:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="649867430" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="649867430" Received: from allen-box.sh.intel.com ([10.239.159.48]) by orsmga007.jf.intel.com with ESMTP; 08 Jan 2023 17:57:52 -0800 From: Lu Baolu To: iommu@lists.linux.dev Cc: Joerg Roedel , Will Deacon , Robin Murphy , Kevin Tian , linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH 3/4] iommu/vt-d: Remove users from intel_svm_dev Date: Mon, 9 Jan 2023 09:49:54 +0800 Message-Id: <20230109014955.147068-4-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230109014955.147068-1-baolu.lu@linux.intel.com> References: <20230109014955.147068-1-baolu.lu@linux.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" It was used as a reference counter of an existing bond between device and user application memory address. Commit be51b1d6bbff ("iommu/sva: Refactoring iommu_sva_bind/unbind_device()") has added this in iommu core. Remove it to avoid duplicate code. Signed-off-by: Lu Baolu Reviewed-by: Kevin Tian --- drivers/iommu/intel/iommu.h | 1 - drivers/iommu/intel/svm.c | 62 ++++++++++++++++--------------------- 2 files changed, 27 insertions(+), 36 deletions(-) diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index e7c732979364..2a1619ff0d79 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -762,7 +762,6 @@ struct intel_svm_dev { struct device *dev; struct intel_iommu *iommu; struct iommu_sva sva; - int users; u16 did; u16 sid, qdep; }; diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index d1e445f03aa6..c7dc53e40c26 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -333,13 +333,6 @@ static struct iommu_sva *intel_svm_bind_mm(struct inte= l_iommu *iommu, } } =20 - /* Find the matching device in svm list */ - sdev =3D svm_lookup_device_by_dev(svm, dev); - if (sdev) { - sdev->users++; - goto success; - } - sdev =3D kzalloc(sizeof(*sdev), GFP_KERNEL); if (!sdev) { ret =3D -ENOMEM; @@ -350,7 +343,6 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel= _iommu *iommu, sdev->iommu =3D iommu; sdev->did =3D FLPT_DEFAULT_DID; sdev->sid =3D PCI_DEVID(info->bus, info->devfn); - sdev->users =3D 1; sdev->sva.dev =3D dev; init_rcu_head(&sdev->rcu); if (info->ats_enabled) { @@ -367,7 +359,7 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel= _iommu *iommu, goto free_sdev; =20 list_add_rcu(&sdev->list, &svm->devs); -success: + return &sdev->sva; =20 free_sdev: @@ -401,32 +393,32 @@ static int intel_svm_unbind_mm(struct device *dev, u3= 2 pasid) mm =3D svm->mm; =20 if (sdev) { - sdev->users--; - if (!sdev->users) { - list_del_rcu(&sdev->list); - /* Flush the PASID cache and IOTLB for this device. - * Note that we do depend on the hardware *not* using - * the PASID any more. Just as we depend on other - * devices never using PASIDs that they have no right - * to use. We have a *shared* PASID table, because it's - * large and has to be physically contiguous. So it's - * hard to be as defensive as we might like. */ - intel_pasid_tear_down_entry(iommu, dev, - svm->pasid, false); - intel_svm_drain_prq(dev, svm->pasid); - kfree_rcu(sdev, rcu); - - if (list_empty(&svm->devs)) { - if (svm->notifier.ops) - mmu_notifier_unregister(&svm->notifier, mm); - pasid_private_remove(svm->pasid); - /* We mandate that no page faults may be outstanding - * for the PASID when intel_svm_unbind_mm() is called. - * If that is not obeyed, subtle errors will happen. - * Let's make them less subtle... */ - memset(svm, 0x6b, sizeof(*svm)); - kfree(svm); - } + list_del_rcu(&sdev->list); + /* + * Flush the PASID cache and IOTLB for this device. + * Note that we do depend on the hardware *not* using + * the PASID any more. Just as we depend on other + * devices never using PASIDs that they have no right + * to use. We have a *shared* PASID table, because it's + * large and has to be physically contiguous. So it's + * hard to be as defensive as we might like. + */ + intel_pasid_tear_down_entry(iommu, dev, svm->pasid, false); + intel_svm_drain_prq(dev, svm->pasid); + kfree_rcu(sdev, rcu); + + if (list_empty(&svm->devs)) { + if (svm->notifier.ops) + mmu_notifier_unregister(&svm->notifier, mm); + pasid_private_remove(svm->pasid); + /* + * We mandate that no page faults may be outstanding + * for the PASID when intel_svm_unbind_mm() is called. + * If that is not obeyed, subtle errors will happen. + * Let's make them less subtle... + */ + memset(svm, 0x6b, sizeof(*svm)); + kfree(svm); } } out: --=20 2.34.1 From nobody Tue Sep 16 00:28:17 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 A25D0C54EBC for ; Mon, 9 Jan 2023 01:58:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234209AbjAIB6X (ORCPT ); Sun, 8 Jan 2023 20:58:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233961AbjAIB6F (ORCPT ); Sun, 8 Jan 2023 20:58:05 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AB62101DD for ; Sun, 8 Jan 2023 17:58:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673229484; x=1704765484; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nBq2eOVotOHuuNbaX+AJBZNl0TFASfXTuzkriWWUcT4=; b=OZAxV0RgsEE3PyfJOVwOolCjD8lee4F9jRvEJ4E/VcHJly74mZhbr8vi WUh20d8415JsoO+3wwPYWCOkbqqubJ4VphYL+BDelKcSpiVra08DDWQfY /h6+tTwrGk3Ousw5iumSwlHF+yH4OgRY7j77AgLPP/rIwtMUlUmOukSwG GYOayvaH8Pw/ub1nWpsMTzErqJxWCSf636e7KkHe8B6JorfpHLeyrqDeX 2ZZQ71YFeqHVDH3lcuaM2oJ/5128OJc7q718PUnVYN8KHPnhKM4yhfayM Y3z2kYyTCVuJ92l6jVZNPQNSFk6pXgkPylmaYSvL9x6w3GJMv7+pdfYNJ g==; X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="322848746" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="322848746" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jan 2023 17:57:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="649867438" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="649867438" Received: from allen-box.sh.intel.com ([10.239.159.48]) by orsmga007.jf.intel.com with ESMTP; 08 Jan 2023 17:57:55 -0800 From: Lu Baolu To: iommu@lists.linux.dev Cc: Joerg Roedel , Will Deacon , Robin Murphy , Kevin Tian , linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH 4/4] iommu/vt-d: Remove sva from intel_svm_dev Date: Mon, 9 Jan 2023 09:49:55 +0800 Message-Id: <20230109014955.147068-5-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230109014955.147068-1-baolu.lu@linux.intel.com> References: <20230109014955.147068-1-baolu.lu@linux.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" After commit be51b1d6bbff ("iommu/sva: Refactoring iommu_sva_bind/unbind_device()"), the iommu driver doesn't need to return an iommu_sva pointer anymore. This removes the sva field from intel_svm_dev and cleanups the code accordingly. Signed-off-by: Lu Baolu Reviewed-by: Kevin Tian --- drivers/iommu/intel/iommu.h | 1 - drivers/iommu/intel/svm.c | 23 +++++++++-------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index 2a1619ff0d79..f0222ad38757 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -761,7 +761,6 @@ struct intel_svm_dev { struct rcu_head rcu; struct device *dev; struct intel_iommu *iommu; - struct iommu_sva sva; u16 did; u16 sid, qdep; }; diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c index c7dc53e40c26..e7b9bedebcc0 100644 --- a/drivers/iommu/intel/svm.c +++ b/drivers/iommu/intel/svm.c @@ -298,9 +298,8 @@ static int pasid_to_svm_sdev(struct device *dev, unsign= ed int pasid, return 0; } =20 -static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu, - struct device *dev, - struct mm_struct *mm) +static int intel_svm_bind_mm(struct intel_iommu *iommu, struct device *dev, + struct mm_struct *mm) { struct device_domain_info *info =3D dev_iommu_priv_get(dev); struct intel_svm_dev *sdev; @@ -312,7 +311,7 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel= _iommu *iommu, if (!svm) { svm =3D kzalloc(sizeof(*svm), GFP_KERNEL); if (!svm) - return ERR_PTR(-ENOMEM); + return -ENOMEM; =20 svm->pasid =3D mm->pasid; svm->mm =3D mm; @@ -322,14 +321,14 @@ static struct iommu_sva *intel_svm_bind_mm(struct int= el_iommu *iommu, ret =3D mmu_notifier_register(&svm->notifier, mm); if (ret) { kfree(svm); - return ERR_PTR(ret); + return ret; } =20 ret =3D pasid_private_add(svm->pasid, svm); if (ret) { mmu_notifier_unregister(&svm->notifier, mm); kfree(svm); - return ERR_PTR(ret); + return ret; } } =20 @@ -343,7 +342,6 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel= _iommu *iommu, sdev->iommu =3D iommu; sdev->did =3D FLPT_DEFAULT_DID; sdev->sid =3D PCI_DEVID(info->bus, info->devfn); - sdev->sva.dev =3D dev; init_rcu_head(&sdev->rcu); if (info->ats_enabled) { sdev->qdep =3D info->ats_qdep; @@ -360,7 +358,7 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel= _iommu *iommu, =20 list_add_rcu(&sdev->list, &svm->devs); =20 - return &sdev->sva; + return 0; =20 free_sdev: kfree(sdev); @@ -371,7 +369,7 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel= _iommu *iommu, kfree(svm); } =20 - return ERR_PTR(ret); + return ret; } =20 /* Caller must hold pasid_mutex */ @@ -843,13 +841,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; - struct iommu_sva *sva; - int ret =3D 0; + int ret; =20 mutex_lock(&pasid_mutex); - sva =3D intel_svm_bind_mm(iommu, dev, mm); - if (IS_ERR(sva)) - ret =3D PTR_ERR(sva); + ret =3D intel_svm_bind_mm(iommu, dev, mm); mutex_unlock(&pasid_mutex); =20 return ret; --=20 2.34.1