lkml.org 
[lkml]   [2012]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -v3 03/47] IOMMU: Fix tboot force iommu logic
    Date
    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 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
    index 49eb412..7c71a3a 100644
    --- a/drivers/iommu/intel-iommu.c
    +++ b/drivers/iommu/intel-iommu.c
    @@ -3768,6 +3768,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");
    @@ -3780,9 +3783,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


    \
     
     \ /
      Last update: 2012-03-19 07:07    [W:0.026 / U:0.060 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site