iommu/vt-d: Fix error handling in sva enable/disable paths
Subsystems (2)
Lu Baolu
maintainerPATCH 1/1 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 d5b9e4bfe0d8 ("iommu/vt-d: Report prq to io-pgfault framework")
Signed-off-by Lu Baolu <[email protected]>
--- drivers/iommu/intel/iommu.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/iommu/intel/iommu.c +12 -4
@@ -4650,8 +4650,12 @@ static int intel_iommu_enable_sva(struct device *dev)return -EINVAL ; ret =iopf_queue_add_device (iommu->iopf_queue, dev); -if (!ret) - ret =iommu_register_device_fault_handler (dev, iommu_queue_iopf, dev); +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; }
@@ -4663,8 +4667,12 @@ static int intel_iommu_disable_sva(struct device *dev)int ret; ret =iommu_unregister_device_fault_handler (dev); -if (!ret) - ret =iopf_queue_remove_device (iommu->iopf_queue, dev); +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; }
Signature · 1 line
2.34.1
Quoted 8 lines
From: Lu Baolu <[email protected]>
Sent: Wednesday, February 8, 2023 1:16 PMRoll back all previous actions in error paths of
intel_iommu_enable_sva()andintel_iommu_disable_sva().Fixes d5b9e4bfe0d8 ("iommu/vt-d: Report prq to io-pgfault framework")Signed-off-by Lu Baolu <[email protected]>
Reviewed-by Kevin Tian <[email protected]>