iommu/vt-d: Fixes for v6.16-rc
Subsystems (2)
Lu Baolu
maintainerHi Joerg,
The following fix has been queued for v6.16-rc4:
- Assign devtlb cache tag on ATS enablement
It fixes a critical cache invalidation issue for ATS-capable devices. It has been reviewed and is ready for merge. Can you please consider it?
Best regards,
baolu
Lu Baolu (1):
iommu/vt-d: Assign devtlb cache tag on ATS enablement
drivers/iommu/intel/cache.c | 5 ++--- drivers/iommu/intel/iommu.c | 11 ++++++++++- drivers/iommu/intel/iommu.h | 2 ++ 3 files changed, 14 insertions(+), 4 deletions(-)
Signature · 1 line
2.43.0
Lu Baolu
maintainerPATCH 1/1 iommu/vt-d: Assign devtlb cache tag on ATS enablement
Commit <4f1492efb495> ("iommu/vt-d: Revert ATS timing change to fix boot failure") placed the enabling of ATS in the probe_finalize callback. This occurs after the default domain attachment, which is when the ATS cache tag is assigned. Consequently, the device TLB cache tag is missed when the domain is attached, leading to the device TLB not being invalidated in the iommu_unmap paths.
Fix this by assigning the CACHE_TAG_DEVTLB cache tag when ATS is enabled.
--- drivers/iommu/intel/cache.c | 5 ++--- drivers/iommu/intel/iommu.c | 11 ++++++++++- drivers/iommu/intel/iommu.h | 2 ++ 3 files changed, 14 insertions(+), 4 deletions(-)
drivers/iommu/intel/cache.c +2 -3
@@ -40,9 +40,8 @@ static bool cache_tage_match(struct cache_tag *tag, u16 domain_id, }/* Assign a cache tag with specified type to domain. */ -static int cache_tag_assign (struct dmar_domain *domain,u16 did, -struct device *dev,ioasid_t pasid, -enum cache_tag_type type) +int cache_tag_assign (struct dmar_domain *domain,u16 did,struct device *dev, +ioasid_t pasid,enum cache_tag_type type) {struct device_domain_info *info =dev_iommu_priv_get (dev);struct intel_iommu *iommu = info->iommu;
drivers/iommu/intel/iommu.c +10 -1
@@ -3780,8 +3780,17 @@ static void intel_iommu_probe_finalize(struct device *dev) !pci_enable_pasid(to_pci_dev(dev), info->pasid_supported & ~1)) info->pasid_enabled = 1; -if (sm_supported (iommu) && !dev_is_real_dma_subdevice (dev)) +if (sm_supported (iommu) && !dev_is_real_dma_subdevice (dev)) {iommu_enable_pci_ats (info); +/* Assign a DEVTLB cache tag to the default domain. */ +if (info->ats_enabled && info->domain) { +u16 did =domain_id_iommu (info->domain, iommu); + +if (cache_tag_assign (info->domain, did, dev, +IOMMU_NO_PASID ,CACHE_TAG_DEVTLB )) +iommu_disable_pci_ats (info); + } + }iommu_enable_pci_pri (info); }
drivers/iommu/intel/iommu.h +2 -0
@@ -1289,6 +1289,8 @@ struct cache_tag {unsigned int users; }; +int cache_tag_assign (struct dmar_domain *domain,u16 did,struct device *dev, +ioasid_t pasid,enum cache_tag_type type);int cache_tag_assign_domain (struct dmar_domain *domain,struct device *dev,ioasid_t pasid); void cache_tag_unassign_domain(struct dmar_domain *domain,
Signature · 1 line
2.43.0
Quoted 13 lines · Lu Baolu
Hi Joerg,
The following fix has been queued for v6.16-rc4:
- Assign devtlb cache tag on ATS enablement
It fixes a critical cache invalidation issue for ATS-capable devices. It has been reviewed and is ready for merge. Can you please consider it?
Best regards,
baolu
Quoted 7 lines
Lu Baolu (1):
iommu/vt-d: Assign devtlb cache tag on ATS enablementdrivers/iommu/intel/cache.c | 5 ++--- drivers/iommu/intel/iommu.c | 11 ++++++++++- drivers/iommu/intel/iommu.h | 2 ++ 3 files changed, 14 insertions(+), 4 deletions(-)
Applied, thanks Baolu.