mirror of
https://github.com/torvalds/linux
synced 2024-10-04 10:26:40 +00:00
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: 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>
This commit is contained in:
parent
d8a7c0cf05
commit
60b1daa3b1
|
@ -4644,8 +4644,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;
|
||||||
}
|
}
|
||||||
|
@ -4657,8 +4661,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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue