lkml.org 
[lkml]   [2019]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 134/148] iommu/vt-d: Handle domain agaw being less than iommu agaw
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Sohil Mehta <sohil.mehta@intel.com>

    commit 3569dd07aaad71920c5ea4da2d5cc9a167c1ffd4 upstream.

    The Intel IOMMU driver opportunistically skips a few top level page
    tables from the domain paging directory while programming the IOMMU
    context entry. However there is an implicit assumption in the code that
    domain's adjusted guest address width (agaw) would always be greater
    than IOMMU's agaw.

    The IOMMU capabilities in an upcoming platform cause the domain's agaw
    to be lower than IOMMU's agaw. The issue is seen when the IOMMU supports
    both 4-level and 5-level paging. The domain builds a 4-level page table
    based on agaw of 2. However the IOMMU's agaw is set as 3 (5-level). In
    this case the code incorrectly tries to skip page page table levels.
    This causes the IOMMU driver to avoid programming the context entry. The
    fix handles this case and programs the context entry accordingly.

    Fixes: de24e55395698 ("iommu/vt-d: Simplify domain_context_mapping_one")
    Cc: <stable@vger.kernel.org>
    Cc: Ashok Raj <ashok.raj@intel.com>
    Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
    Cc: Lu Baolu <baolu.lu@linux.intel.com>
    Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
    Reported-by: Ramos Falcon, Ernesto R <ernesto.r.ramos.falcon@intel.com>
    Tested-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
    Signed-off-by: Sohil Mehta <sohil.mehta@intel.com>
    Signed-off-by: Joerg Roedel <jroedel@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/iommu/intel-iommu.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/iommu/intel-iommu.c
    +++ b/drivers/iommu/intel-iommu.c
    @@ -2069,7 +2069,7 @@ static int domain_context_mapping_one(st
    * than default. Unnecessary for PT mode.
    */
    if (translation != CONTEXT_TT_PASS_THROUGH) {
    - for (agaw = domain->agaw; agaw != iommu->agaw; agaw--) {
    + for (agaw = domain->agaw; agaw > iommu->agaw; agaw--) {
    ret = -ENOMEM;
    pgd = phys_to_virt(dma_pte_addr(pgd));
    if (!dma_pte_present(pgd))
    @@ -2083,7 +2083,7 @@ static int domain_context_mapping_one(st
    translation = CONTEXT_TT_MULTI_LEVEL;

    context_set_address_root(context, virt_to_phys(pgd));
    - context_set_address_width(context, iommu->agaw);
    + context_set_address_width(context, agaw);
    } else {
    /*
    * In pass through mode, AW must be programmed to

    \
     
     \ /
      Last update: 2019-01-11 15:49    [W:4.080 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site