Commit 8c47bf0c authored by Sohil Mehta's avatar Sohil Mehta Committed by Greg Kroah-Hartman

iommu/vt-d: Handle domain agaw being less than iommu agaw

commit 3569dd07 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: de24e553 ("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: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reported-by: default avatarRamos Falcon, Ernesto R <ernesto.r.ramos.falcon@intel.com>
Tested-by: default avatarRicardo Neri <ricardo.neri-calderon@linux.intel.com>
Signed-off-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent de3b4f54
...@@ -2044,7 +2044,7 @@ static int domain_context_mapping_one(struct dmar_domain *domain, ...@@ -2044,7 +2044,7 @@ static int domain_context_mapping_one(struct dmar_domain *domain,
* than default. Unnecessary for PT mode. * than default. Unnecessary for PT mode.
*/ */
if (translation != CONTEXT_TT_PASS_THROUGH) { if (translation != CONTEXT_TT_PASS_THROUGH) {
for (agaw = domain->agaw; agaw != iommu->agaw; agaw--) { for (agaw = domain->agaw; agaw > iommu->agaw; agaw--) {
ret = -ENOMEM; ret = -ENOMEM;
pgd = phys_to_virt(dma_pte_addr(pgd)); pgd = phys_to_virt(dma_pte_addr(pgd));
if (!dma_pte_present(pgd)) if (!dma_pte_present(pgd))
...@@ -2058,7 +2058,7 @@ static int domain_context_mapping_one(struct dmar_domain *domain, ...@@ -2058,7 +2058,7 @@ static int domain_context_mapping_one(struct dmar_domain *domain,
translation = CONTEXT_TT_MULTI_LEVEL; translation = CONTEXT_TT_MULTI_LEVEL;
context_set_address_root(context, virt_to_phys(pgd)); context_set_address_root(context, virt_to_phys(pgd));
context_set_address_width(context, iommu->agaw); context_set_address_width(context, agaw);
} else { } else {
/* /*
* In pass through mode, AW must be programmed to * In pass through mode, AW must be programmed to
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment