| Message ID | 1410487848-6027-7-git-send-email-jiang.liu@linux.intel.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On 2014/9/12 10:10, Jiang Liu wrote: > 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> > --- > drivers/iommu/intel_irq_remapping.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c > index 7cf31a29f77a..81f110aae6df 100644 > --- a/drivers/iommu/intel_irq_remapping.c > +++ b/drivers/iommu/intel_irq_remapping.c > @@ -701,9 +701,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"); Reviewed-by: Yijing Wang <wangyijing@huawei.com> >
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index 7cf31a29f77a..81f110aae6df 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -701,9 +701,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");
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> --- drivers/iommu/intel_irq_remapping.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)