Messages in this thread Patch in this message | | | From | Yinghai Lu <> | Subject | [PATCH v2 02/10] IOMMU: Fix tboot force iommu logic | Date | Thu, 2 Jan 2014 16:08:09 -0800 |
| |
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 <yinghai@kernel.org> Cc: David Woodhouse <dwmw2@infradead.org> Cc: iommu@lists.linux-foundation.org --- drivers/iommu/intel-iommu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index a3eb689..865a65c 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -3681,6 +3681,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"); @@ -3707,9 +3710,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.8.4
| |