Commit fd53cf21 authored by Yi Liu's avatar Yi Liu Committed by Jason Zeng
Browse files

iommu/vt-d: Update iotlb in nested domain attach 

mainline inclusion
from mainline-v6.8-rc6
commit 29e10487d6df050afeee886b7c1da208f389cb5b
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I938E2
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=29e10487d6df050afeee886b7c1da208f389cb5b



--------------------------------

Should call domain_update_iotlb() to update the has_iotlb_device flag
of the domain after attaching device to nested domain. Without it, this
flag is not set properly and would result in missing device TLB flush.

Fixes: 9838f2bb6b6b ("iommu/vt-d: Set the nested domain to a device")
Signed-off-by: default avatarYi Liu <yi.l.liu@intel.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Link: https://lore.kernel.org/r/20240208082307.15759-5-yi.l.liu@intel.com


Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarJason Zeng <jason.zeng@intel.com>
parent dc013d2c

drivers/iommu/intel/iommu.c

+1 −3
Original line number Diff line number Diff line
@@ -395,8 +395,6 @@ static int domain_update_device_node(struct dmar_domain *domain) 
	return nid;

}



static void domain_update_iotlb(struct dmar_domain *domain);



/* Return the super pagesize bitmap if supported. */

static unsigned long domain_super_pgsize_bitmap(struct dmar_domain *domain)

{
@@ -1217,7 +1215,7 @@ domain_lookup_dev_info(struct dmar_domain *domain, 
	return NULL;

}



static void domain_update_iotlb(struct dmar_domain *domain)

void domain_update_iotlb(struct dmar_domain *domain)

{

	struct dev_pasid_info *dev_pasid;

	struct device_domain_info *info;

drivers/iommu/intel/iommu.h

+1 −0
Original line number Diff line number Diff line
@@ -1066,6 +1066,7 @@ int qi_submit_sync(struct intel_iommu *iommu, struct qi_desc *desc, 
 */

#define QI_OPT_WAIT_DRAIN		BIT(0)



void domain_update_iotlb(struct dmar_domain *domain);

int domain_attach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu);

void domain_detach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu);

void device_block_translation(struct device *dev);

drivers/iommu/intel/nested.c

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ static int intel_nested_attach_dev(struct iommu_domain *domain, 
	list_add(&info->link, &dmar_domain->devices);

	spin_unlock_irqrestore(&dmar_domain->lock, flags);



	domain_update_iotlb(dmar_domain);



	return 0;

}