iommu/vt-d: Enhance error recovery in function intel_enable_irq_remapping()

Enhance error recovery in function intel_enable_irq_remapping()
by tearing down all created data structures.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Reviewed-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
index 7af0b56dc2d1ae4cd315bf4bb3232cf9c4aa1e8a..27541d4408491a73a606bcc85fdd8bc785ed9906 100644 (file)
--- a/drivers/iommu/intel_irq_remapping.c
+++ b/drivers/iommu/intel_irq_remapping.c
@@ -702,9 +702,11 @@ static int __init intel_enable_irq_remapping(void)
        return eim ? IRQ_REMAP_X2APIC_MODE : IRQ_REMAP_XAPIC_MODE;
 
 error:
-       /*
-        * handle error condition gracefully here!
-        */
+       for_each_iommu(iommu, drhd)
+               if (ecap_ir_support(iommu->ecap)) {
+                       iommu_disable_irq_remapping(iommu);
+                       intel_teardown_irq_remapping(iommu);
+               }
 
        if (x2apic_present)
                pr_warn("Failed to enable irq remapping.  You are vulnerable to irq-injection attacks.\n");