iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit 60b1daa3b1 ]

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

Fixes: d5b9e4bfe0 ("iommu/vt-d: Report prq to io-pgfault framework")
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20230208051559.700109-1-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Lu Baolu
2023-02-16 21:08:13 +08:00
committed by Greg Kroah-Hartman
parent 0bb33c5fe4
commit db05a58ed4
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/iommu/intel/iommu.c
View File

@ -5405,8 +5405,12 @@ static int intel_iommu_enable_sva(struct device *dev)
return -EINVAL; return -EINVAL;
ret = iopf_queue_add_device(iommu->iopf_queue, dev); ret = iopf_queue_add_device(iommu->iopf_queue, dev);
if (!ret) if (ret)
ret = iommu_register_device_fault_handler(dev, iommu_queue_iopf, dev); 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; return ret;
} }
@ -5418,8 +5422,12 @@ static int intel_iommu_disable_sva(struct device *dev)
int ret; int ret;
ret = iommu_unregister_device_fault_handler(dev); ret = iommu_unregister_device_fault_handler(dev);
if (!ret) if (ret)
ret = iopf_queue_remove_device(iommu->iopf_queue, dev); 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; return ret;
} }