[Patch Part3 V4 01/21] iommu/vt-d: Match segment number when searching for dev_iotlb capable devices

Jiang Liu <jiang.liu-VuQAYsv1563Yd54FQh9/[email protected]> Fri, 11 Jul 2014 14:19:25 +0800
Newsgroups gmane.linux.kernel.iommu,gmane.linux.kernel.pci,gmane.linux.hotplug.devel,gmane.linux.kernel
Message-ID <[email protected]>
For virtual machine and static identity domains, there may be devices
from different PCI segments associated with the same domain.
So function iommu_support_dev_iotlb() should also match PCI segment
number (iommu unit) when searching for dev_iotlb capable devices.

Signed-off-by: Jiang Liu <jiang.liu-VuQAYsv1563Yd54FQh9/[email protected]>
---
 drivers/iommu/intel-iommu.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 3664d0d00338..147ab1c0b573 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -1272,7 +1272,8 @@ iommu_support_dev_iotlb (struct dmar_domain *domain, struct intel_iommu *iommu,
 
 	spin_lock_irqsave(&device_domain_lock, flags);
 	list_for_each_entry(info, &domain->devices, link)
-		if (info->bus == bus && info->devfn == devfn) {
+		if (info->iommu == iommu && info->bus == bus &&
+		    info->devfn == devfn) {
 			found = 1;
 			break;
 		}
-- 
1.7.10.4