Commit 60b1daa3 authored by Lu Baolu's avatar Lu Baolu Committed by Joerg Roedel
Browse files

iommu/vt-d: Fix error handling in sva enable/disable paths 



Roll back all previous actions in error paths of intel_iommu_enable_sva()
and intel_iommu_disable_sva().

Fixes: d5b9e4bf ("iommu/vt-d: Report prq to io-pgfault framework")
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20230208051559.700109-1-baolu.lu@linux.intel.com


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

drivers/iommu/intel/iommu.c

+12 −4
Original line number Diff line number Diff line
@@ -4644,8 +4644,12 @@ static int intel_iommu_enable_sva(struct device *dev) 
		return -EINVAL;



	ret = iopf_queue_add_device(iommu->iopf_queue, dev);

	if (!ret)

	if (ret)

		return ret;



	ret = iommu_register_device_fault_handler(dev, iommu_queue_iopf, dev);

	if (ret)

		iopf_queue_remove_device(iommu->iopf_queue, dev);



	return ret;

}
@@ -4657,8 +4661,12 @@ static int intel_iommu_disable_sva(struct device *dev) 
	int ret;



	ret = iommu_unregister_device_fault_handler(dev);

	if (!ret)

	if (ret)

		return ret;



	ret = iopf_queue_remove_device(iommu->iopf_queue, dev);

	if (ret)

		iommu_register_device_fault_handler(dev, iommu_queue_iopf, dev);



	return ret;

}