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 75B0AC433FE for ; Fri, 18 Nov 2022 13:33:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242059AbiKRNdK (ORCPT ); Fri, 18 Nov 2022 08:33:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241422AbiKRNcW (ORCPT ); Fri, 18 Nov 2022 08:32:22 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88117FC for ; Fri, 18 Nov 2022 05:32:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668778341; x=1700314341; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yUafzpnLyJgsHBRq17y9522W4lhffFNC0HRDUpuX5cs=; b=HIt/Q779uIgJ6jWpOf6WTwUzVEtwv4zDNhnI0VqApTZH9rOZH7mTsknW 7SNUxKf8DC14uxW95acCJKQaxvKNI8crcqjVuUCFLxec4GfMJTu9FoqqK klZq5wZjOaY9p4HTOcxEW3svjDVqzPjRvhqL9flQXXLOQVNOefD/+Z1Y4 BJ7Chl+XSHCvY+s4y/6hj/VAkmGQDUkZfK/TpdbSP435cJgjbEBcVsH/k 4Lxz64St4/4yrGrBSo8/o1Jd/CM7YHEIcswinqDz8OnFnuCXEQ/XiX3cx sRG+nYCW3ZPtRVbOnxizB6eAzInuPHA3mto/XDy5Ynm7zkuEqAf0zxBbY A==; X-IronPort-AV: E=McAfee;i="6500,9779,10534"; a="314285119" X-IronPort-AV: E=Sophos;i="5.96,174,1665471600"; d="scan'208";a="314285119" 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:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10534"; a="642512050" X-IronPort-AV: E=Sophos;i="5.96,174,1665471600"; d="scan'208";a="642512050" Received: from allen-box.sh.intel.com ([10.239.159.48]) by fmsmga007.fm.intel.com with ESMTP; 18 Nov 2022 05:32:19 -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 6/7] iommu/vt-d: Remove unnecessary domain_context_mapped() Date: Fri, 18 Nov 2022 21:24:50 +0800 Message-Id: <20221118132451.114406-7-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 device_domain_info::domain accurately records the domain attached to the device. It is unnecessary to check whether the context is present in the attach_dev path. Remove it to make the code neat. Signed-off-by: Lu Baolu Reviewed-by: Kevin Tian --- drivers/iommu/intel/iommu.c | 47 +++---------------------------------- 1 file changed, 3 insertions(+), 44 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 3bd79ae238f2..3b37f1b3b6de 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -780,19 +780,6 @@ static void domain_flush_cache(struct dmar_domain *dom= ain, clflush_cache_range(addr, size); } =20 -static int device_context_mapped(struct intel_iommu *iommu, u8 bus, u8 dev= fn) -{ - struct context_entry *context; - int ret =3D 0; - - spin_lock(&iommu->lock); - context =3D iommu_context_addr(iommu, bus, devfn, 0); - if (context) - ret =3D context_present(context); - spin_unlock(&iommu->lock); - return ret; -} - static void free_context_table(struct intel_iommu *iommu) { struct context_entry *context; @@ -2097,30 +2084,6 @@ domain_context_mapping(struct dmar_domain *domain, s= truct device *dev) &domain_context_mapping_cb, &data); } =20 -static int domain_context_mapped_cb(struct pci_dev *pdev, - u16 alias, void *opaque) -{ - struct intel_iommu *iommu =3D opaque; - - return !device_context_mapped(iommu, PCI_BUS_NUM(alias), alias & 0xff); -} - -static int domain_context_mapped(struct device *dev) -{ - struct intel_iommu *iommu; - u8 bus, devfn; - - iommu =3D device_to_iommu(dev, &bus, &devfn); - if (!iommu) - return -ENODEV; - - if (!dev_is_pci(dev)) - return device_context_mapped(iommu, bus, devfn); - - return !pci_for_each_dma_alias(to_pci_dev(dev), - domain_context_mapped_cb, iommu); -} - /* Returns a number of VTD pages, but aligned to MM page size */ static inline unsigned long aligned_nrpages(unsigned long host_addr, size_t size) @@ -4269,6 +4232,7 @@ static int prepare_domain_attach_device(struct iommu_= domain *domain, static int intel_iommu_attach_device(struct iommu_domain *domain, struct device *dev) { + struct device_domain_info *info =3D dev_iommu_priv_get(dev); int ret; =20 if (domain->type =3D=3D IOMMU_DOMAIN_UNMANAGED && @@ -4277,13 +4241,8 @@ static int intel_iommu_attach_device(struct iommu_do= main *domain, return -EPERM; } =20 - /* normally dev is not mapped */ - if (unlikely(domain_context_mapped(dev))) { - struct device_domain_info *info =3D dev_iommu_priv_get(dev); - - if (info->domain) - device_block_translation(dev); - } + if (info->domain) + device_block_translation(dev); =20 ret =3D prepare_domain_attach_device(domain, dev); if (ret) --=20 2.34.1