Use the dedicated kpkeys allocator for early page tables (used to create the linear map) when the kpkeys_hardened_pgtables feature is enabled.
CPU features have not been detected at this stage so we use the early helper arm64_supports_kpkeys_hardened_pgtables(). This is not a concern as kpkeys_physmem_pgtable_alloc() does not itself use POE or set_memory_pkey(). Signed-off-by: Kevin Brodsky <[email protected]> --- arch/arm64/mm/mmu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 2cee0b7f8a56..7072d5ac0579 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -116,8 +116,11 @@ static phys_addr_t __init early_pgtable_alloc(enum pgtable_type pgtable_type) { phys_addr_t phys; - phys = memblock_phys_alloc_range(PAGE_SIZE, PAGE_SIZE, 0, - MEMBLOCK_ALLOC_NOLEAKTRACE); + if (arm64_supports_kpkeys_hardened_pgtables()) + phys = kpkeys_physmem_pgtable_alloc(); + else + phys = memblock_phys_alloc_range(PAGE_SIZE, PAGE_SIZE, 0, + MEMBLOCK_ALLOC_NOLEAKTRACE); if (!phys) panic("Failed to allocate page table page\n"); -- 2.51.2
