diff mbox series

arm64: mm: Make PUD folding check in set_pud() a runtime check

Message ID 20240216235944.3677178-2-ardb+git@google.com (mailing list archive)
State New, archived
Headers show
Series arm64: mm: Make PUD folding check in set_pud() a runtime check | expand

Commit Message

Ard Biesheuvel Feb. 16, 2024, 11:59 p.m. UTC 
From: Ard Biesheuvel <ardb@kernel.org>

When set_pud() is called on a 4-level paging build config that runs with
3 levels at runtime (which happens with 16k page size builds with
support for LPA2), the updated entry is in fact a PGD in
swapper_pg_dir[], and this is mapped read-only after boot.

So in this case, the existing check needs to be performed as well, even
though __PAGETABLE_PUD_FOLDED is not #define'd. So replace the #ifdef
with a call to pgtable_l4_enabled().

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 arch/arm64/include/asm/pgtable.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Catalin Marinas Feb. 19, 2024, 4:48 p.m. UTC | #1 
On Sat, 17 Feb 2024 00:59:44 +0100, Ard Biesheuvel wrote:
> When set_pud() is called on a 4-level paging build config that runs with
> 3 levels at runtime (which happens with 16k page size builds with
> support for LPA2), the updated entry is in fact a PGD in
> swapper_pg_dir[], and this is mapped read-only after boot.
> 
> So in this case, the existing check needs to be performed as well, even
> though __PAGETABLE_PUD_FOLDED is not #define'd. So replace the #ifdef
> with a call to pgtable_l4_enabled().
> 
> [...]

Applied to arm64 (for-next/stage1-lpa2), thanks!

[1/1] arm64: mm: Make PUD folding check in set_pud() a runtime check
      https://git.kernel.org/arm64/c/90e636f60b76
diff mbox series

Patch

diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
index b3c716fa8121..8bec85350865 100644
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@ -699,14 +699,14 @@  static inline unsigned long pmd_page_vaddr(pmd_t pmd)
 #define pud_user(pud)		pte_user(pud_pte(pud))
 #define pud_user_exec(pud)	pte_user_exec(pud_pte(pud))
 
+static inline bool pgtable_l4_enabled(void);
+
 static inline void set_pud(pud_t *pudp, pud_t pud)
 {
-#ifdef __PAGETABLE_PUD_FOLDED
-	if (in_swapper_pgdir(pudp)) {
+	if (!pgtable_l4_enabled() && in_swapper_pgdir(pudp)) {
 		set_swapper_pgd((pgd_t *)pudp, __pgd(pud_val(pud)));
 		return;
 	}
-#endif /* __PAGETABLE_PUD_FOLDED */
 
 	WRITE_ONCE(*pudp, pud);