arm64/mmu: add contiguous bit to sanity bug check

A mapping with the contiguous bit cannot be safely manipulated while
live, regardless of whether the bit changes between the old and new
mapping. So take this into account when deciding whether the change
is safe.

Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index ec23aec6433fb1f5f9240862a8a4e3bc3ad5013c..382ebd6ef46f43395e6149fdb684f36212e819ce 100644 (file)
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -103,7 +103,15 @@ static bool pgattr_change_is_safe(u64 old, u64 new)
         */
        static const pteval_t mask = PTE_PXN | PTE_RDONLY | PTE_WRITE;
 
-       return old  == 0 || new  == 0 || ((old ^ new) & ~mask) == 0;
+       /* creating or taking down mappings is always safe */
+       if (old == 0 || new == 0)
+               return true;
+
+       /* live contiguous mappings may not be manipulated at all */
+       if ((old | new) & PTE_CONT)
+               return false;
+
+       return ((old ^ new) & ~mask) == 0;
 }
 
 static void alloc_init_pte(pmd_t *pmd, unsigned long addr,