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 <jroedel@suse.de>

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 1186571f77e1f9c7ff7e64659992988ca21f60af..49b5d3115e56de7c183b52b36386b262a0bc2468 100644 (file)
--- 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 e2b342e65a7b86ea75f8c1b8bb8826ac0e7b3018..eae0741f72dce2fcea771e415a986b062515c7fc 100644 (file)
--- 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) ? \