From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yijing Wang Date: Mon, 15 Sep 2014 02:25:04 +0000 Subject: Re: [Patch Part3 V5 6/8] iommu/vt-d: Enhance error recovery in function intel_enable_irq_remapping() Message-Id: <54164E00.6080109@huawei.com> List-Id: References: <1410487848-6027-1-git-send-email-jiang.liu@linux.intel.com> <1410487848-6027-7-git-send-email-jiang.liu@linux.intel.com> In-Reply-To: <1410487848-6027-7-git-send-email-jiang.liu@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Jiang Liu , Joerg Roedel , David Woodhouse , Yinghai Lu , Bjorn Helgaas , Dan Williams , Vinod Koul , "Rafael J . Wysocki" Cc: Ashok Raj , Tony Luck , iommu@lists.linux-foundation.org, linux-pci@vger.kernel.org, linux-hotplug@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org 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 > --- > 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 > -- Thanks! Yijing