Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1200906

[PATCH 14/26] iommu/vt-d: Move context-mapping into dmar_insert_dev_info

Show all headers | View raw

From: Joerg Roedel <jroedel@suse.de>

Do the context-mapping of devices from a single place in the
call-path and clean up the other call-sites.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
 drivers/iommu/intel-iommu.c | 33 ++++++++-------------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 265b02e..0d4b700 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -2325,6 +2325,12 @@ static struct dmar_domain *dmar_insert_dev_info(struct intel_iommu *iommu,
 		dev->archdata.iommu = info;
 	spin_unlock_irqrestore(&device_domain_lock, flags);
 
+	if (dev && domain_context_mapping(domain, dev)) {
+		pr_err("Domain context map for %s failed\n", dev_name(dev));
+		domain_remove_one_dev_info(domain, dev);
+		return NULL;
+	}
+
 	return domain;
 }
 
@@ -2337,11 +2343,11 @@ static int get_last_alias(struct pci_dev *pdev, u16 alias, void *opaque)
 /* domain is initialized */
 static struct dmar_domain *get_domain_for_dev(struct device *dev, int gaw)
 {
+	struct device_domain_info *info = NULL;
 	struct dmar_domain *domain, *tmp;
 	struct intel_iommu *iommu;
-	struct device_domain_info *info;
-	u16 dma_alias;
 	unsigned long flags;
+	u16 dma_alias;
 	u8 bus, devfn;
 
 	domain = find_domain(dev);
@@ -2490,11 +2496,6 @@ static int iommu_prepare_identity_map(struct device *dev,
 	if (ret)
 		goto error;
 
-	/* context entry init */
-	ret = domain_context_mapping(domain, dev);
-	if (ret)
-		goto error;
-
 	return 0;
 
  error:
@@ -2590,7 +2591,6 @@ static int domain_add_dev_info(struct dmar_domain *domain, struct device *dev)
 	struct dmar_domain *ndomain;
 	struct intel_iommu *iommu;
 	u8 bus, devfn;
-	int ret;
 
 	iommu = device_to_iommu(dev, &bus, &devfn);
 	if (!iommu)
@@ -2600,12 +2600,6 @@ static int domain_add_dev_info(struct dmar_domain *domain, struct device *dev)
 	if (ndomain != domain)
 		return -EBUSY;
 
-	ret = domain_context_mapping(domain, dev);
-	if (ret) {
-		domain_remove_one_dev_info(domain, dev);
-		return ret;
-	}
-
 	return 0;
 }
 
@@ -3261,7 +3255,6 @@ static struct iova *intel_alloc_iova(struct device *dev,
 static struct dmar_domain *__get_valid_domain_for_dev(struct device *dev)
 {
 	struct dmar_domain *domain;
-	int ret;
 
 	domain = get_domain_for_dev(dev, DEFAULT_DOMAIN_ADDRESS_WIDTH);
 	if (!domain) {
@@ -3270,16 +3263,6 @@ static struct dmar_domain *__get_valid_domain_for_dev(struct device *dev)
 		return NULL;
 	}
 
-	/* make sure context mapping is ok */
-	if (unlikely(!domain_context_mapped(dev))) {
-		ret = domain_context_mapping(domain, dev);
-		if (ret) {
-			pr_err("Domain context map for %s failed\n",
-			       dev_name(dev));
-			return NULL;
-		}
-	}
-
 	return domain;
 }
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/26] iommu/vt-d: Clean up device<->domain  attachment Joerg Roedel <joro@8bytes.org> - 2015-08-05 17:30 +0200
  [PATCH 03/26] iommu/vt-d: Split up iommu->domains array Joerg Roedel <joro@8bytes.org> - 2015-08-05 17:30 +0200
    Re: [PATCH 03/26] iommu/vt-d: Split up iommu->domains array Alex Williamson <alex.williamson@redhat.com> - 2015-08-07 00:40 +0200
      Re: [PATCH 03/26] iommu/vt-d: Split up iommu->domains array Joerg Roedel <joro@8bytes.org> - 2015-08-07 13:20 +0200
  [PATCH 14/26] iommu/vt-d: Move context-mapping  into dmar_insert_dev_info Joerg Roedel <joro@8bytes.org> - 2015-08-05 17:40 +0200
  [PATCH 11/26] iommu/vt-d: Simplify io/tlb flushing in intel_iommu_unmap Joerg Roedel <joro@8bytes.org> - 2015-08-05 17:40 +0200
  [PATCH 13/26] iommu/vt-d: Simplify domain_remove_dev_info() Joerg Roedel <joro@8bytes.org> - 2015-08-05 17:40 +0200
  [PATCH 10/26] iommu/vt-d: Replace iommu_bmp with a refcount Joerg Roedel <joro@8bytes.org> - 2015-08-05 17:40 +0200
    Re: [PATCH 10/26] iommu/vt-d: Replace iommu_bmp with a refcount Alex Williamson <alex.williamson@redhat.com> - 2015-08-06 21:30 +0200
      Re: [PATCH 10/26] iommu/vt-d: Replace iommu_bmp with a refcount Joerg Roedel <joro@8bytes.org> - 2015-08-07 13:20 +0200
  [PATCH 12/26] iommu/vt-d: Simplify domain_remove_one_dev_info() Joerg Roedel <joro@8bytes.org> - 2015-08-05 17:40 +0200
  [PATCH 16/26] iommu/vt-d: Rename domain_remove_one_dev_info() Joerg Roedel <joro@8bytes.org> - 2015-08-05 17:40 +0200
  [PATCH 17/26] iommu/vt-d: Rename iommu_detach_dependent_devices() Joerg Roedel <joro@8bytes.org> - 2015-08-05 17:40 +0200
  [PATCH 21/26] iommu/vt-d: Only call domain_remove_one_dev_info to detach old domain Joerg Roedel <joro@8bytes.org> - 2015-08-05 17:40 +0200
  [PATCH 23/26] iommu/vt-d: Remove dmar_global_lock from device_notifier Joerg Roedel <joro@8bytes.org> - 2015-08-05 17:40 +0200
  Re: [PATCH 00/26] iommu/vt-d: Clean up device<->domain  attachment Alex Williamson <alex.williamson@redhat.com> - 2015-08-06 23:10 +0200
    Re: [PATCH 00/26] iommu/vt-d: Clean up device<->domain  attachment Joerg Roedel <joro@8bytes.org> - 2015-08-07 13:30 +0200

csiph-web