Commit 32d495b0 authored by Will Deacon's avatar Will Deacon
Browse files

Revert "arm64/mm: Drop redundant BUG_ON(!pgtable_alloc)" 

This reverts commit 9ed2b461.

Nathan reports early boot failures bisected to this change which look
related to the kPTI nG repainting. In any case, consolidating the
BUG_ON()s to a single location needs more thought, so revert the change
until this is figured out properly.

Link: https://lore.kernel.org/r/Y3pS5fdZ3MdLZ00t@dev-arch.thelio-3990X


Reported-by: default avatarNathan Chancellor <nathan@kernel.org>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 5b468dad

arch/arm64/mm/mmu.c

+3 −1
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ static void alloc_init_cont_pte(pmd_t *pmdp, unsigned long addr, 


		if (flags & NO_EXEC_MAPPINGS)

			pmdval |= PMD_TABLE_PXN;

		BUG_ON(!pgtable_alloc);

		pte_phys = pgtable_alloc(PAGE_SHIFT);

		__pmd_populate(pmdp, pte_phys, pmdval);

		pmd = READ_ONCE(*pmdp);
@@ -284,6 +285,7 @@ static void alloc_init_cont_pmd(pud_t *pudp, unsigned long addr, 


		if (flags & NO_EXEC_MAPPINGS)

			pudval |= PUD_TABLE_PXN;

		BUG_ON(!pgtable_alloc);

		pmd_phys = pgtable_alloc(PMD_SHIFT);

		__pud_populate(pudp, pmd_phys, pudval);

		pud = READ_ONCE(*pudp);
@@ -322,6 +324,7 @@ static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end, 


		if (flags & NO_EXEC_MAPPINGS)

			p4dval |= P4D_TABLE_PXN;

		BUG_ON(!pgtable_alloc);

		pud_phys = pgtable_alloc(PUD_SHIFT);

		__p4d_populate(p4dp, pud_phys, p4dval);

		p4d = READ_ONCE(*p4dp);
@@ -380,7 +383,6 @@ static void __create_pgd_mapping_locked(pgd_t *pgdir, phys_addr_t phys, 
	phys &= PAGE_MASK;

	addr = virt & PAGE_MASK;

	end = PAGE_ALIGN(virt + size);

	BUG_ON(!pgtable_alloc);



	do {

		next = pgd_addr_end(addr, end);