From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from acsinet15.oracle.com ([141.146.126.227]:21878 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754236Ab2DCCVY (ORCPT ); Mon, 2 Apr 2012 22:21:24 -0400 From: Yinghai Lu To: Bjorn Helgaas , Len Brown , Jiang Liu , Suresh Siddha , x86 Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu , David Woodhouse , iommu@lists.linux-foundation.org Subject: [RFC PATCH 06/14] IOMMU: Fix tboot force iommu logic Date: Mon, 2 Apr 2012 19:19:33 -0700 Message-Id: <1333419581-7836-7-git-send-email-yinghai@kernel.org> In-Reply-To: <1333419581-7836-1-git-send-email-yinghai@kernel.org> References: <1333419581-7836-1-git-send-email-yinghai@kernel.org> Sender: linux-pci-owner@vger.kernel.org List-ID: Should check dmar_disabled just after tboot_force_iommu. Otherwise when tboot is not used, and intel_iommu=off, and nointrmap still get dmar_table_init() called. that will cause some get_device calling, and it will have some device refcount leaking. Signed-off-by: Yinghai Lu Cc: David Woodhouse Cc: iommu@lists.linux-foundation.org --- drivers/iommu/intel-iommu.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index be867e6..b7e5a7e 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -3630,6 +3630,9 @@ int __init intel_iommu_init(void) /* VT-d is required for a TXT/tboot launch, so enforce that */ force_on = tboot_force_iommu(); + if (no_iommu || dmar_disabled) + return -ENODEV; + if (dmar_table_init()) { if (force_on) panic("tboot: Failed to initialize DMAR table\n"); @@ -3642,9 +3645,6 @@ int __init intel_iommu_init(void) return -ENODEV; } - if (no_iommu || dmar_disabled) - return -ENODEV; - if (iommu_init_mempool()) { if (force_on) panic("tboot: Failed to initialize iommu memory\n"); -- 1.7.7