All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lu Baolu <baolu.lu@linux.intel.com>
To: Joerg Roedel <joro@8bytes.org>
Cc: YueHaibing <yuehaibing@huawei.com>,
	Marco Bonelli <marco@mebeim.net>,
	iommu@lists.linux-foundation.org,
	Jason Gunthorpe <jgg@nvidia.com>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Christoph Hellwig <hch@lst.de>
Subject: [PATCH 02/12] iommu/vt-d: Remove finding domain in dmar_insert_one_dev_info()
Date: Tue,  1 Mar 2022 10:01:49 +0800	[thread overview]
Message-ID: <20220301020159.633356-3-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20220301020159.633356-1-baolu.lu@linux.intel.com>

The Intel IOMMU driver has already converted to use default domain
framework in iommu core. There's no need to find a domain for the
device in the domain attaching path. Cleanup that code.

Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20220214025704.3184654-1-baolu.lu@linux.intel.com
---
 drivers/iommu/intel/iommu.c | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index ff43c2a3a206..56fe9b22c576 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -2554,7 +2554,6 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
 						    struct device *dev,
 						    struct dmar_domain *domain)
 {
-	struct dmar_domain *found = NULL;
 	struct device_domain_info *info;
 	unsigned long flags;
 	int ret;
@@ -2605,26 +2604,6 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
 	}
 
 	spin_lock_irqsave(&device_domain_lock, flags);
-	if (dev)
-		found = find_domain(dev);
-
-	if (!found) {
-		struct device_domain_info *info2;
-		info2 = dmar_search_domain_by_dev_info(info->segment, info->bus,
-						       info->devfn);
-		if (info2) {
-			found      = info2->domain;
-			info2->dev = dev;
-		}
-	}
-
-	if (found) {
-		spin_unlock_irqrestore(&device_domain_lock, flags);
-		free_devinfo_mem(info);
-		/* Caller must free the original domain */
-		return found;
-	}
-
 	spin_lock(&iommu->lock);
 	ret = domain_attach_iommu(domain, iommu);
 	spin_unlock(&iommu->lock);
-- 
2.25.1

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

  parent reply	other threads:[~2022-03-01  2:03 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-01  2:01 [PATCH 00/12] [PULL REQUEST] Intel IOMMU updates for Linux v5.18 Lu Baolu
2022-03-01  2:01 ` [PATCH 01/12] iommu/vt-d: Remove intel_iommu::domains Lu Baolu
2022-03-01  2:01 ` Lu Baolu [this message]
2022-03-01  2:01 ` [PATCH 03/12] iommu/vt-d: Remove iova_cache_get/put() Lu Baolu
2022-03-01  2:01 ` [PATCH 04/12] iommu/vt-d: Remove domain and devinfo mempool Lu Baolu
2022-03-01  2:01 ` [PATCH 05/12] iommu/vt-d: Remove DEFER_DEVICE_DOMAIN_INFO Lu Baolu
2022-03-01  2:01 ` [PATCH 06/12] iommu/vt-d: Remove unnecessary includes Lu Baolu
2022-03-01  2:01 ` [PATCH 07/12] iommu/vt-d: Remove unnecessary prototypes Lu Baolu
2022-03-01  2:01 ` [PATCH 08/12] iommu/vt-d: Fix indentation of goto labels Lu Baolu
2022-03-01  2:01 ` [PATCH 09/12] iommu/vt-d: Move intel_iommu_ops to header file Lu Baolu
2022-03-01  2:01 ` [PATCH 10/12] iommu/vt-d: Add missing "__init" for rmrr_sanity_check() Lu Baolu
2022-03-01  2:01 ` [PATCH 11/12] iommu/vt-d: Remove unused function intel_svm_capable() Lu Baolu
2022-03-01  2:01 ` [PATCH 12/12] iommu/vt-d: Enable ATS for the devices in SATC table Lu Baolu
2022-03-04  9:37 ` [PATCH 00/12] [PULL REQUEST] Intel IOMMU updates for Linux v5.18 Joerg Roedel
2022-03-04 10:37   ` Lu Baolu
2022-03-04 15:47     ` Joerg Roedel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220301020159.633356-3-baolu.lu@linux.intel.com \
    --to=baolu.lu@linux.intel.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=hch@lst.de \
    --cc=iommu@lists.linux-foundation.org \
    --cc=jgg@nvidia.com \
    --cc=joro@8bytes.org \
    --cc=marco@mebeim.net \
    --cc=yuehaibing@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.