Commit d2f85a26 authored by Yi Liu's avatar Yi Liu Committed by Joerg Roedel
Browse files

iommu: Pass domain to remove_dev_pasid() op 



Existing remove_dev_pasid() callbacks of the underlying iommu drivers
get the attached domain from the group->pasid_array. However, the domain
stored in group->pasid_array is not always correct in all scenarios.
A wrong domain may result in failure in remove_dev_pasid() callback.
To avoid such problems, it is more reliable to pass the domain to the
remove_dev_pasid() op.

Suggested-by: default avatarJason Gunthorpe <jgg@nvidia.com>
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/20240328122958.83332-3-yi.l.liu@intel.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent b025dea6

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+2 −7
Original line number Diff line number Diff line
@@ -3053,14 +3053,9 @@ static int arm_smmu_def_domain_type(struct device *dev) 
	return 0;

}



static void arm_smmu_remove_dev_pasid(struct device *dev, ioasid_t pasid)

static void arm_smmu_remove_dev_pasid(struct device *dev, ioasid_t pasid,

				      struct iommu_domain *domain)

{

	struct iommu_domain *domain;



	domain = iommu_get_domain_for_dev_pasid(dev, pasid, IOMMU_DOMAIN_SVA);

	if (WARN_ON(IS_ERR(domain)) || !domain)

		return;



	arm_smmu_sva_remove_dev_pasid(domain, dev, pasid);

}

drivers/iommu/intel/iommu.c

+3 −8
Original line number Diff line number Diff line
@@ -4587,19 +4587,15 @@ static int intel_iommu_iotlb_sync_map(struct iommu_domain *domain, 
	return 0;

}



static void intel_iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid)

static void intel_iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid,

					 struct iommu_domain *domain)

{

	struct device_domain_info *info = dev_iommu_priv_get(dev);

	struct dmar_domain *dmar_domain = to_dmar_domain(domain);

	struct dev_pasid_info *curr, *dev_pasid = NULL;

	struct intel_iommu *iommu = info->iommu;

	struct dmar_domain *dmar_domain;

	struct iommu_domain *domain;

	unsigned long flags;



	domain = iommu_get_domain_for_dev_pasid(dev, pasid, 0);

	if (WARN_ON_ONCE(!domain))

		goto out_tear_down;



	/*

	 * The SVA implementation needs to handle its own stuffs like the mm

	 * notification. Before consolidating that code into iommu core, let
@@ -4610,7 +4606,6 @@ static void intel_iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid) 
		goto out_tear_down;

	}



	dmar_domain = to_dmar_domain(domain);

	spin_lock_irqsave(&dmar_domain->lock, flags);

	list_for_each_entry(curr, &dmar_domain->dev_pasids, link_domain) {

		if (curr->dev == dev && curr->pasid == pasid) {

drivers/iommu/iommu.c

+5 −4
Original line number Diff line number Diff line
@@ -3335,20 +3335,21 @@ static int __iommu_set_group_pasid(struct iommu_domain *domain, 


		if (device == last_gdev)

			break;

		ops->remove_dev_pasid(device->dev, pasid);

		ops->remove_dev_pasid(device->dev, pasid, domain);

	}

	return ret;

}



static void __iommu_remove_group_pasid(struct iommu_group *group,

				       ioasid_t pasid)

				       ioasid_t pasid,

				       struct iommu_domain *domain)

{

	struct group_device *device;

	const struct iommu_ops *ops;



	for_each_group_device(group, device) {

		ops = dev_iommu_ops(device->dev);

		ops->remove_dev_pasid(device->dev, pasid);

		ops->remove_dev_pasid(device->dev, pasid, domain);

	}

}
@@ -3418,7 +3419,7 @@ void iommu_detach_device_pasid(struct iommu_domain *domain, struct device *dev, 
	struct iommu_group *group = dev->iommu_group;



	mutex_lock(&group->mutex);

	__iommu_remove_group_pasid(group, pasid);

	__iommu_remove_group_pasid(group, pasid, domain);

	WARN_ON(xa_erase(&group->pasid_array, pasid) != domain);

	mutex_unlock(&group->mutex);

}

include/linux/iommu.h

+2 −1
Original line number Diff line number Diff line
@@ -578,7 +578,8 @@ struct iommu_ops { 
			      struct iommu_page_response *msg);



	int (*def_domain_type)(struct device *dev);

	void (*remove_dev_pasid)(struct device *dev, ioasid_t pasid);

	void (*remove_dev_pasid)(struct device *dev, ioasid_t pasid,

				 struct iommu_domain *domain);



	const struct iommu_domain_ops *default_domain_ops;

	unsigned long pgsize_bitmap;