The patch titled
Subject: arch/x86: drop own definition of pgd,p4d_leaf
has been added to the -mm mm-unstable branch. Its filename is
arch-x86-drop-own-definition-of-pgdp4d_leaf.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/arch-x86-drop-own-definition-of-pgdp4d_leaf.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Oscar Salvador <osalvador@xxxxxxx>
Subject: arch/x86: drop own definition of pgd,p4d_leaf
Date: Wed, 10 Jul 2024 09:51:20 +0200
We provide generic definitions of pXd_leaf in pgtable.h when the arch do
not define their own, where the generic pXd_leaf always return false.
Although x86 defines {pgd,p4d}_leaf, they end up being a no-op, so drop
them and make them fallback to the generic one.
Link: https://lkml.kernel.org/r/bcd6ab8246348f18fdc77694e321ee6458f05781.1720597744.git.christophe.leroy@xxxxxxxxxx
Signed-off-by: Oscar Salvador <osalvador@xxxxxxx>
Signed-off-by: Christophe Leroy <christophe.leroy@xxxxxxxxxx>
Reviewed-by: Peter Xu <peterx@xxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Borislav Petkov (AMD) <bp@xxxxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/include/asm/pgtable.h | 10 ----------
1 file changed, 10 deletions(-)
--- a/arch/x86/include/asm/pgtable.h~arch-x86-drop-own-definition-of-pgdp4d_leaf
+++ a/arch/x86/include/asm/pgtable.h
@@ -252,13 +252,6 @@ static inline unsigned long pgd_pfn(pgd_
return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
}
-#define p4d_leaf p4d_leaf
-static inline bool p4d_leaf(p4d_t p4d)
-{
- /* No 512 GiB pages yet */
- return 0;
-}
-
#define pte_page(pte) pfn_to_page(pte_pfn(pte))
#define pmd_leaf pmd_leaf
@@ -1396,9 +1389,6 @@ static inline bool pgdp_maps_userspace(v
return (((ptr & ~PAGE_MASK) / sizeof(pgd_t)) < PGD_KERNEL_START);
}
-#define pgd_leaf pgd_leaf
-static inline bool pgd_leaf(pgd_t pgd) { return false; }
-
#ifdef CONFIG_MITIGATION_PAGE_TABLE_ISOLATION
/*
* All top-level MITIGATION_PAGE_TABLE_ISOLATION page tables are order-1 pages
_
Patches currently in -mm which might be from osalvador@xxxxxxx are
arch-x86-drop-own-definition-of-pgdp4d_leaf.patch
