Merge tag 'iommu-fix-v6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

torvalds · torvalds · commit 888cf78c29e2 · 2023-10-27T05:43:05.000-10:00
Pull iommu fix from Joerg Roedel:

 - Fix boot regression for Sapphire Rapids with Intel VT-d driver

* tag 'iommu-fix-v6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu: Avoid unnecessary cache invalidations
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
@@ -1108,7 +1108,8 @@ static int iommu_create_device_direct_mappings(struct iommu_domain *domain,
 
 	}
 
-	iommu_flush_iotlb_all(domain);
+	if (!list_empty(&mappings) && iommu_is_dma_domain(domain))
+		iommu_flush_iotlb_all(domain);
 
 out:
 	iommu_put_resv_regions(dev, &mappings);

Original file line number	Diff line number	Diff line change
`@@ -1108,7 +1108,8 @@ static int iommu_create_device_direct_mappings(struct iommu_domain *domain,`
`1108`	`1108`
`1109`	`1109`	`}`
`1110`	`1110`
`1111`		`- iommu_flush_iotlb_all(domain);`
	`1111`	`+ if (!list_empty(&mappings) && iommu_is_dma_domain(domain))`
	`1112`	`+ iommu_flush_iotlb_all(domain);`
`1112`	`1113`
`1113`	`1114`	`out:`
`1114`	`1115`	`iommu_put_resv_regions(dev, &mappings);`