Browse Source

iommu: Fix trace_unmap() to report original iova

iommu_unmap() calls trace_unmap() with changed iova and original
size. trace_unmap() should report original iova instead. Change
iommu_unmap() to call trace_unmap() with original iova.

Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Reported-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Shuah Khan 10 years ago
parent
commit
6fd492fd74
1 changed files with 2 additions and 1 deletions
  1. 2 1
      drivers/iommu/iommu.c

+ 2 - 1
drivers/iommu/iommu.c

@@ -1094,6 +1094,7 @@ size_t iommu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size)
 {
 {
 	size_t unmapped_page, unmapped = 0;
 	size_t unmapped_page, unmapped = 0;
 	unsigned int min_pagesz;
 	unsigned int min_pagesz;
+	unsigned long orig_iova = iova;
 
 
 	if (unlikely(domain->ops->unmap == NULL ||
 	if (unlikely(domain->ops->unmap == NULL ||
 		     domain->ops->pgsize_bitmap == 0UL))
 		     domain->ops->pgsize_bitmap == 0UL))
@@ -1133,7 +1134,7 @@ size_t iommu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size)
 		unmapped += unmapped_page;
 		unmapped += unmapped_page;
 	}
 	}
 
 
-	trace_unmap(iova, 0, size);
+	trace_unmap(orig_iova, 0, size);
 	return unmapped;
 	return unmapped;
 }
 }
 EXPORT_SYMBOL_GPL(iommu_unmap);
 EXPORT_SYMBOL_GPL(iommu_unmap);