Commit 79805c1b authored by Yi Liu's avatar Yi Liu Committed by Jason Gunthorpe
Browse files

iommu: Set iommu_attach_handle->domain in core 

The IOMMU core sets the iommu_attach_handle->domain for the
iommu_attach_group_handle() path, while the iommu_replace_group_handle()
sets it on the caller side. Make the two paths aligned on it.

Link: https://patch.msgid.link/r/20240908114256.979518-3-yi.l.liu@intel.com


Signed-off-by: default avatarYi Liu <yi.l.liu@intel.com>
Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent d9dfb5e6

drivers/iommu/iommu.c

+1 −0
Original line number Diff line number Diff line
@@ -3578,6 +3578,7 @@ int iommu_replace_group_handle(struct iommu_group *group, 
		ret = xa_reserve(&group->pasid_array, IOMMU_NO_PASID, GFP_KERNEL);

		if (ret)

			goto err_unlock;

		handle->domain = new_domain;

	}



	ret = __iommu_group_set_domain(group, new_domain);

drivers/iommu/iommufd/fault.c

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ static int __fault_domain_replace_dev(struct iommufd_device *idev, 
		if (!handle)

			return -ENOMEM;



		handle->handle.domain = hwpt->domain;

		handle->idev = idev;

		ret = iommu_replace_group_handle(idev->igroup->group,

						 hwpt->domain, &handle->handle);