From 69be88520f9dc56d3ec29d7b7d988f55fd248008 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Fri, 9 Nov 2018 12:07:08 +0100 Subject: [PATCH] iommu/amd: Ignore page-mode 7 in free_sub_pt() The page-mode 7 is a special one as it marks a final PTE to a page with an intermediary size. Signed-off-by: Joerg Roedel --- drivers/iommu/amd_iommu.c | 4 ++++ drivers/iommu/amd_iommu_types.h | 1 + 2 files changed, 5 insertions(+) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 1186571f77e1..49b5d3115e56 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -1372,6 +1372,7 @@ static struct page *free_sub_pt(unsigned long root, int mode, { switch (mode) { case PAGE_MODE_NONE: + case PAGE_MODE_7_LEVEL: break; case PAGE_MODE_1_LEVEL: freelist = free_pt_page(root, freelist); @@ -1403,6 +1404,9 @@ static void free_pagetable(struct protection_domain *domain) unsigned long root = (unsigned long)domain->pt_root; struct page *freelist = NULL; + BUG_ON(domain->mode < PAGE_MODE_NONE || + domain->mode > PAGE_MODE_6_LEVEL); + free_sub_pt(root, domain->mode, freelist); free_page_list(freelist); diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h index e2b342e65a7b..eae0741f72dc 100644 --- a/drivers/iommu/amd_iommu_types.h +++ b/drivers/iommu/amd_iommu_types.h @@ -269,6 +269,7 @@ #define PAGE_MODE_4_LEVEL 0x04 #define PAGE_MODE_5_LEVEL 0x05 #define PAGE_MODE_6_LEVEL 0x06 +#define PAGE_MODE_7_LEVEL 0x07 #define PM_LEVEL_SHIFT(x) (12 + ((x) * 9)) #define PM_LEVEL_SIZE(x) (((x) < 6) ? \