From nobody Fri Dec 19 21:48:53 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 5887CC4332F for ; Fri, 18 Nov 2022 13:33:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242158AbiKRNc6 (ORCPT ); Fri, 18 Nov 2022 08:32:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242098AbiKRNcR (ORCPT ); Fri, 18 Nov 2022 08:32:17 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 136AB725C0 for ; Fri, 18 Nov 2022 05:32:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668778337; x=1700314337; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8S80uWfDgSB0BEFNRpbkXlNBuJDV0mgSaia/IS252F8=; b=I3uRHK2sDuAhFwvFrpYfVywNDh9QmoKuLvUy/FZnNt4Og7VD7wtLfK81 05wv+rBcptZ1v2Q0hKMuRTyLSqS5NKefBCQwzmH1DgkFwDaxMyaBD0I68 sAxajvWFbzwIVqlz6pnNrKT/pKFzFziEp4g5REyDCS8WbzRWHStMFg82c lCmNrtppuXTzbS0NLbCmEgJuYYrITlVrT6Y78xzjSTzs15ohnLzNDT1q/ BWK12x+55p+rgYesAqLlOdk0VptfOZr6MwTV1flo001oh50OOZMaD2tXb E4dkMvYC3Pk8LZrPLsHa6u81x4O2kPBu6Z8WArgB15Caj/MHWNBVkToUZ g==; X-IronPort-AV: E=McAfee;i="6500,9779,10534"; a="314285099" X-IronPort-AV: E=Sophos;i="5.96,174,1665471600"; d="scan'208";a="314285099" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2022 05:32:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10534"; a="642512020" X-IronPort-AV: E=Sophos;i="5.96,174,1665471600"; d="scan'208";a="642512020" Received: from allen-box.sh.intel.com ([10.239.159.48]) by fmsmga007.fm.intel.com with ESMTP; 18 Nov 2022 05:32:11 -0800 From: Lu Baolu To: iommu@lists.linux.dev Cc: Joerg Roedel , Kevin Tian , Will Deacon , Robin Murphy , Liu Yi L , Jacob jun Pan , linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH v4 3/7] iommu/vt-d: Add blocking domain support Date: Fri, 18 Nov 2022 21:24:47 +0800 Message-Id: <20221118132451.114406-4-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221118132451.114406-1-baolu.lu@linux.intel.com> References: <20221118132451.114406-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" The Intel IOMMU hardwares support blocking DMA transactions by clearing the translation table entries. This implements a real blocking domain to avoid using an empty UNMANAGED domain. The detach_dev callback of the domain ops is not used in any path. Remove it to avoid dead code as well. Signed-off-by: Lu Baolu Reviewed-by: Kevin Tian --- drivers/iommu/intel/iommu.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 6aafb86ef5c3..25c772e8106f 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -278,6 +278,7 @@ static LIST_HEAD(dmar_satc_units); list_for_each_entry(rmrr, &dmar_rmrr_units, list) =20 static void device_block_translation(struct device *dev); +static void intel_iommu_domain_free(struct iommu_domain *domain); =20 int dmar_disabled =3D !IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_ON); int intel_iommu_sm =3D IS_ENABLED(CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT= _ON); @@ -4162,12 +4163,28 @@ static int md_domain_init(struct dmar_domain *domai= n, int guest_width) return 0; } =20 +static int blocking_domain_attach_dev(struct iommu_domain *domain, + struct device *dev) +{ + device_block_translation(dev); + return 0; +} + +static struct iommu_domain blocking_domain =3D { + .ops =3D &(const struct iommu_domain_ops) { + .attach_dev =3D blocking_domain_attach_dev, + .free =3D intel_iommu_domain_free + } +}; + static struct iommu_domain *intel_iommu_domain_alloc(unsigned type) { struct dmar_domain *dmar_domain; struct iommu_domain *domain; =20 switch (type) { + case IOMMU_DOMAIN_BLOCKED: + return &blocking_domain; case IOMMU_DOMAIN_DMA: case IOMMU_DOMAIN_DMA_FQ: case IOMMU_DOMAIN_UNMANAGED: @@ -4200,7 +4217,7 @@ static struct iommu_domain *intel_iommu_domain_alloc(= unsigned type) =20 static void intel_iommu_domain_free(struct iommu_domain *domain) { - if (domain !=3D &si_domain->domain) + if (domain !=3D &si_domain->domain && domain !=3D &blocking_domain) domain_exit(to_dmar_domain(domain)); } =20 @@ -4274,12 +4291,6 @@ static int intel_iommu_attach_device(struct iommu_do= main *domain, return domain_add_dev_info(to_dmar_domain(domain), dev); } =20 -static void intel_iommu_detach_device(struct iommu_domain *domain, - struct device *dev) -{ - dmar_remove_one_dev_info(dev); -} - static int intel_iommu_map(struct iommu_domain *domain, unsigned long iova, phys_addr_t hpa, size_t size, int iommu_prot, gfp_t gfp) @@ -4767,7 +4778,6 @@ const struct iommu_ops intel_iommu_ops =3D { #endif .default_domain_ops =3D &(const struct iommu_domain_ops) { .attach_dev =3D intel_iommu_attach_device, - .detach_dev =3D intel_iommu_detach_device, .map_pages =3D intel_iommu_map_pages, .unmap_pages =3D intel_iommu_unmap_pages, .iotlb_sync_map =3D intel_iommu_iotlb_sync_map, --=20 2.34.1