Skip to content

Commit 7ba36ec

Browse files
mrutland-armwildea01
authored andcommitted
arm64/mm: Inhibit huge-vmap with ptdump
The arm64 ptdump code can race with concurrent modification of the kernel page tables. At the time this was added, this was sound as: * Modifications to leaf entries could result in stale information being logged, but would not result in a functional problem. * Boot time modifications to non-leaf entries (e.g. freeing of initmem) were performed when the ptdump code cannot be invoked. * At runtime, modifications to non-leaf entries only occurred in the vmalloc region, and these were strictly additive, as intermediate entries were never freed. However, since commit: commit 324420b ("arm64: add support for ioremap() block mappings") ... it has been possible to create huge mappings in the vmalloc area at runtime, and as part of this existing intermediate levels of table my be removed and freed. It's possible for the ptdump code to race with this, and continue to walk tables which have been freed (and potentially poisoned or reallocated). As a result of this, the ptdump code may dereference bogus addresses, which could be fatal. Since huge-vmap is a TLB and memory optimization, we can disable it when the runtime ptdump code is in use to avoid this problem. Cc: Catalin Marinas <catalin.marinas@arm.com> Fixes: 324420b ("arm64: add support for ioremap() block mappings") Acked-by: Ard Biesheuvel <ard.biesheuvel@arm.com> Signed-off-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
1 parent 48caebf commit 7ba36ec

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

arch/arm64/mm/mmu.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -955,13 +955,18 @@ void *__init fixmap_remap_fdt(phys_addr_t dt_phys)
955955

956956
int __init arch_ioremap_pud_supported(void)
957957
{
958-
/* only 4k granule supports level 1 block mappings */
959-
return IS_ENABLED(CONFIG_ARM64_4K_PAGES);
958+
/*
959+
* Only 4k granule supports level 1 block mappings.
960+
* SW table walks can't handle removal of intermediate entries.
961+
*/
962+
return IS_ENABLED(CONFIG_ARM64_4K_PAGES) &&
963+
!IS_ENABLED(CONFIG_ARM64_PTDUMP_DEBUGFS);
960964
}
961965

962966
int __init arch_ioremap_pmd_supported(void)
963967
{
964-
return 1;
968+
/* See arch_ioremap_pud_supported() */
969+
return !IS_ENABLED(CONFIG_ARM64_PTDUMP_DEBUGFS);
965970
}
966971

967972
int pud_set_huge(pud_t *pudp, phys_addr_t phys, pgprot_t prot)

0 commit comments

Comments
 (0)