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

iommu: Pass old domain to set_dev_pasid op 



To support domain replacement for pasid, the underlying iommu driver needs
to know the old domain hence be able to clean up the existing attachment.
It would be much convenient for iommu layer to pass down the old domain.
Otherwise, iommu drivers would need to track domain for pasids by
themselves, this would duplicate code among the iommu drivers. Or iommu
drivers would rely group->pasid_array to get domain, which may not always
the correct one.

Suggested-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Reviewed-by: default avatarVasant Hegde <vasant.hegde@amd.com>
Signed-off-by: default avatarYi Liu <yi.l.liu@intel.com>
Link: https://lore.kernel.org/r/20241107122234.7424-2-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>
parent c43e1ccd

drivers/iommu/amd/amd_iommu.h

+2 −1
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ struct iommu_domain *amd_iommu_domain_alloc_sva(struct device *dev, 
						struct mm_struct *mm);

void amd_iommu_domain_free(struct iommu_domain *dom);

int iommu_sva_set_dev_pasid(struct iommu_domain *domain,

			    struct device *dev, ioasid_t pasid);

			    struct device *dev, ioasid_t pasid,

			    struct iommu_domain *old);

void amd_iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid,

				struct iommu_domain *domain);

drivers/iommu/amd/pasid.c

+2 −1
Original line number Diff line number Diff line
@@ -100,7 +100,8 @@ static const struct mmu_notifier_ops sva_mn = { 
};



int iommu_sva_set_dev_pasid(struct iommu_domain *domain,

			    struct device *dev, ioasid_t pasid)

			    struct device *dev, ioasid_t pasid,

			    struct iommu_domain *old)

{

	struct pdom_dev_data *pdom_dev_data;

	struct protection_domain *sva_pdom = to_pdomain(domain);

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

+2 −1
Original line number Diff line number Diff line
@@ -332,7 +332,8 @@ void arm_smmu_sva_notifier_synchronize(void) 
}



static int arm_smmu_sva_set_dev_pasid(struct iommu_domain *domain,

				      struct device *dev, ioasid_t id)

				      struct device *dev, ioasid_t id,

				      struct iommu_domain *old)

{

	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);

	struct arm_smmu_master *master = dev_iommu_priv_get(dev);

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

+2 −1
Original line number Diff line number Diff line
@@ -2856,7 +2856,8 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) 
}



static int arm_smmu_s1_set_dev_pasid(struct iommu_domain *domain,

				      struct device *dev, ioasid_t id)

				     struct device *dev, ioasid_t id,

				     struct iommu_domain *old)

{

	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);

	struct arm_smmu_master *master = dev_iommu_priv_get(dev);

drivers/iommu/intel/iommu.c

+4 −2
Original line number Diff line number Diff line
@@ -4070,7 +4070,8 @@ static void intel_iommu_remove_dev_pasid(struct device *dev, ioasid_t pasid, 
}



static int intel_iommu_set_dev_pasid(struct iommu_domain *domain,

				     struct device *dev, ioasid_t pasid)

				     struct device *dev, ioasid_t pasid,

				     struct iommu_domain *old)

{

	struct device_domain_info *info = dev_iommu_priv_get(dev);

	struct dmar_domain *dmar_domain = to_dmar_domain(domain);
@@ -4356,7 +4357,8 @@ static int identity_domain_attach_dev(struct iommu_domain *domain, struct device 
}



static int identity_domain_set_dev_pasid(struct iommu_domain *domain,

					 struct device *dev, ioasid_t pasid)

					 struct device *dev, ioasid_t pasid,

					 struct iommu_domain *old)

{

	struct device_domain_info *info = dev_iommu_priv_get(dev);

	struct intel_iommu *iommu = info->iommu;