From: Liu Yi L <yi.l.liu@intel.com>

Date: Thu, 7 Jan 2021 00:03:57 +0800

Subject: iommu/vt-d: Fix ineffective devTLB invalidation for subdevices

Git-commit: 7c29ada5e70083805bc3a68daa23441df421fbee

Patch-mainline: v5.11-rc3

References: bsc#1183284

iommu_flush_dev_iotlb() is called to invalidate caches on a device but

only loops over the devices which are fully-attached to the domain. For

sub-devices, this is ineffective and can result in invalid caching

entries left on the device.

Fix the missing invalidation by adding a loop over the subdevices and

ensuring that 'domain->has_iotlb_device' is updated when attaching to

subdevices.

Fixes: 67b8e02b5e76 ("iommu/vt-d: Aux-domain specific domain attach/detach")

Signed-off-by: Liu Yi L <yi.l.liu@intel.com>

Acked-by: Lu Baolu <baolu.lu@linux.intel.com>

Link: https://lore.kernel.org/r/1609949037-25291-4-git-send-email-yi.l.liu@intel.com

Signed-off-by: Will Deacon <will@kernel.org>

Acked-by: Joerg Roedel <jroedel@suse.de>

---

 drivers/iommu/intel-iommu.c |   53 ++++++++++++++++++++++++++++++--------------

 1 file changed, 37 insertions(+), 16 deletions(-)

--- a/drivers/iommu/intel-iommu.c

+++ b/drivers/iommu/intel-iommu.c

@@ -723,6 +723,8 @@ static int domain_update_device_node(str

 	return nid;

 }

+static void domain_update_iotlb(struct dmar_domain *domain);

+

 /* Some capabilities may be different across iommus */

 static void domain_update_iommu_cap(struct dmar_domain *domain)

 {

@@ -736,6 +738,8 @@ static void domain_update_iommu_cap(stru

 	 */

 	if (domain->nid == NUMA_NO_NODE)

 		domain->nid = domain_update_device_node(domain);

+

+	domain_update_iotlb(domain);

 }

 struct context_entry *iommu_context_addr(struct intel_iommu *iommu, u8 bus,

@@ -1418,17 +1422,22 @@ static void domain_update_iotlb(struct d

 	assert_spin_locked(&device_domain_lock);

-	list_for_each_entry(info, &domain->devices, link) {

-		struct pci_dev *pdev;

-

-		if (!info->dev || !dev_is_pci(info->dev))

-			continue;

-

-		pdev = to_pci_dev(info->dev);

-		if (pdev->ats_enabled) {

+	list_for_each_entry(info, &domain->devices, link)

+		if (info->ats_enabled) {

 			has_iotlb_device = true;

 			break;

 		}

+

+	if (!has_iotlb_device) {

+		struct subdev_domain_info *sinfo;

+

+		list_for_each_entry(sinfo, &domain->subdevices, link_domain) {

+			info = get_domain_info(sinfo->pdev);

+			if (info && info->ats_enabled) {

+				has_iotlb_device = true;

+				break;

+			}

+		}

 	}

 	domain->has_iotlb_device = has_iotlb_device;

@@ -1510,25 +1519,37 @@ static void iommu_disable_dev_iotlb(stru

 #endif

 }

+static void __iommu_flush_dev_iotlb(struct device_domain_info *info,

+				    u64 addr, unsigned int mask)

+{

+	u16 sid, qdep;

+

+	if (!info || !info->ats_enabled)

+		return;

+

+	sid = info->bus << 8 | info->devfn;

+	qdep = info->ats_qdep;

+	qi_flush_dev_iotlb(info->iommu, sid, info->pfsid,

+			   qdep, addr, mask);

+}

+

 static void iommu_flush_dev_iotlb(struct dmar_domain *domain,

 				  u64 addr, unsigned mask)

 {

-	u16 sid, qdep;

 	unsigned long flags;

 	struct device_domain_info *info;

+	struct subdev_domain_info *sinfo;

 	if (!domain->has_iotlb_device)

 		return;

 	spin_lock_irqsave(&device_domain_lock, flags);

-	list_for_each_entry(info, &domain->devices, link) {

-		if (!info->ats_enabled)

-			continue;

+	list_for_each_entry(info, &domain->devices, link)

+		__iommu_flush_dev_iotlb(info, addr, mask);

-		sid = info->bus << 8 | info->devfn;

-		qdep = info->ats_qdep;

-		qi_flush_dev_iotlb(info->iommu, sid, info->pfsid,

-				qdep, addr, mask);

+	list_for_each_entry(sinfo, &domain->subdevices, link_domain) {

+		info = get_domain_info(sinfo->pdev);

+		__iommu_flush_dev_iotlb(info, addr, mask);

 	}

 	spin_unlock_irqrestore(&device_domain_lock, flags);

 }