Commit 7c29ada5 authored by Liu Yi L's avatar Liu Yi L Committed by Will Deacon
Browse files

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



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: 67b8e02b ("iommu/vt-d: Aux-domain specific domain attach/detach")
Signed-off-by: default avatarLiu Yi L <yi.l.liu@intel.com>
Acked-by: default avatarLu 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: default avatarWill Deacon <will@kernel.org>
parent 18abda7a

drivers/iommu/intel/iommu.c

+37 −16
Original line number Original line Diff line number Diff line
@@ -719,6 +719,8 @@ static int domain_update_device_node(struct dmar_domain *domain) 
	return nid;

	return nid;

}

}





static void domain_update_iotlb(struct dmar_domain *domain);



/* Some capabilities may be different across iommus */

/* Some capabilities may be different across iommus */

static void domain_update_iommu_cap(struct dmar_domain *domain)

static void domain_update_iommu_cap(struct dmar_domain *domain)

{

{
@@ -744,6 +746,8 @@ static void domain_update_iommu_cap(struct dmar_domain *domain) 
		domain->domain.geometry.aperture_end = __DOMAIN_MAX_ADDR(domain->gaw - 1);

		domain->domain.geometry.aperture_end = __DOMAIN_MAX_ADDR(domain->gaw - 1);

	else

	else

		domain->domain.geometry.aperture_end = __DOMAIN_MAX_ADDR(domain->gaw);

		domain->domain.geometry.aperture_end = __DOMAIN_MAX_ADDR(domain->gaw);



	domain_update_iotlb(domain);

}

}





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

struct context_entry *iommu_context_addr(struct intel_iommu *iommu, u8 bus,
@@ -1464,18 +1468,23 @@ static void domain_update_iotlb(struct dmar_domain *domain) 




	assert_spin_locked(&device_domain_lock);

	assert_spin_locked(&device_domain_lock);





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

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

		struct pci_dev *pdev;

		if (info->ats_enabled) {

			has_iotlb_device = true;

			break;

		}





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

	if (!has_iotlb_device) {

			continue;

		struct subdev_domain_info *sinfo;





		pdev = to_pci_dev(info->dev);

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

		if (pdev->ats_enabled) {

			info = get_domain_info(sinfo->pdev);

			if (info && info->ats_enabled) {

				has_iotlb_device = true;

				has_iotlb_device = true;

				break;

				break;

			}

			}

		}

		}

	}





	domain->has_iotlb_device = has_iotlb_device;

	domain->has_iotlb_device = has_iotlb_device;

}

}
@@ -1555,25 +1564,37 @@ static void iommu_disable_dev_iotlb(struct device_domain_info *info) 
#endif

#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,

static void iommu_flush_dev_iotlb(struct dmar_domain *domain,

				  u64 addr, unsigned mask)

				  u64 addr, unsigned mask)

{

{

	u16 sid, qdep;

	unsigned long flags;

	unsigned long flags;

	struct device_domain_info *info;

	struct device_domain_info *info;

	struct subdev_domain_info *sinfo;





	if (!domain->has_iotlb_device)

	if (!domain->has_iotlb_device)

		return;

		return;





	spin_lock_irqsave(&device_domain_lock, flags);

	spin_lock_irqsave(&device_domain_lock, flags);

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

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

		if (!info->ats_enabled)

		__iommu_flush_dev_iotlb(info, addr, mask);

			continue;





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

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

		qdep = info->ats_qdep;

		info = get_domain_info(sinfo->pdev);

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

		__iommu_flush_dev_iotlb(info, addr, mask);

				qdep, addr, mask);

	}

	}

	spin_unlock_irqrestore(&device_domain_lock, flags);

	spin_unlock_irqrestore(&device_domain_lock, flags);

}

}