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

[ Upstream commit 60b1daa3b168fbc648ae2ad28a84759223e49e18 ]

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")
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>

diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 644ca49..494a872 100644 (file)
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -4636,8 +4636,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;
 }
@@ -4649,8 +4653,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;
 }