iommu/arm-smmu-v3: Clean up more on probe failure

[ Upstream commit fcbd621567420b3a2f21f49bbc056de8b273c625 ]

kmemleak noticed that the iopf queue allocated deep down within
arm_smmu_init_structures() can be leaked by a subsequent error return
from arm_smmu_device_probe(). Furthermore, after arm_smmu_device_reset()
we will also leave the SMMU enabled with an empty Stream Table, silently
blocking all DMA. This proves rather annoying for debugging said probe
failure, so let's handle it a bit better by putting the SMMU back into
(more or less) the same state as if it hadn't probed at all.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/5137901958471cf67f2fad5c2229f8a8f1ae901a.1733406914.git.robin.murphy@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
index 45b43f729f8954d94b206eff95b93e304b090f5e..96b72f3dad0d0e4ce6590b98b5d2d0ee7fdf11f6 100644 (file)
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -3880,7 +3880,7 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
        /* Initialise in-memory data structures */
        ret = arm_smmu_init_structures(smmu);
        if (ret)
-               return ret;
+               goto err_free_iopf;
 
        /* Record our private device structure */
        platform_set_drvdata(pdev, smmu);
@@ -3891,22 +3891,29 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
        /* Reset the device */
        ret = arm_smmu_device_reset(smmu, bypass);
        if (ret)
-               return ret;
+               goto err_disable;
 
        /* And we're up. Go go go! */
        ret = iommu_device_sysfs_add(&smmu->iommu, dev, NULL,
                                     "smmu3.%pa", &ioaddr);
        if (ret)
-               return ret;
+               goto err_disable;
 
        ret = iommu_device_register(&smmu->iommu, &arm_smmu_ops, dev);
        if (ret) {
                dev_err(dev, "Failed to register iommu\n");
-               iommu_device_sysfs_remove(&smmu->iommu);
-               return ret;
+               goto err_free_sysfs;
        }
 
        return 0;
+
+err_free_sysfs:
+       iommu_device_sysfs_remove(&smmu->iommu);
+err_disable:
+       arm_smmu_device_disable(smmu);
+err_free_iopf:
+       iopf_queue_free(smmu->evtq.iopf);
+       return ret;
 }
 
 static int arm_smmu_device_remove(struct platform_device *pdev)