On Tue, Mar 05, 2024 at 12:37:43PM +0800, peterx@xxxxxxxxxx wrote:
> From: Peter Xu <peterx@xxxxxxxxxx>
>
> p4d_large() is always defined as p4d_leaf(). Merge their usages. Chose
> p4d_leaf() because p4d_leaf() is a global API, while p4d_large() is not.
>
> Only x86 has p4d_leaf() defined as of now. So it also means after this
> patch we removed all p4d_large() usages.
>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: Ingo Molnar <mingo@xxxxxxxxxx>
> Cc: Borislav Petkov <bp@xxxxxxxxx>
> Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
> Cc: x86@xxxxxxxxxx
> Reviewed-by: Jason Gunthorpe <jgg@xxxxxxxxxx>
> Signed-off-by: Peter Xu <peterx@xxxxxxxxxx>
Reviewed-by: Mike Rapoport (IBM) <rppt@xxxxxxxxxx>
> ---
> arch/x86/mm/fault.c | 4 ++--
> arch/x86/mm/init_64.c | 2 +-
> arch/x86/mm/pat/set_memory.c | 4 ++--
> arch/x86/mm/pti.c | 2 +-
> arch/x86/power/hibernate.c | 2 +-
> arch/x86/xen/mmu_pv.c | 2 +-
> 6 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
> index 679b09cfe241..8b69ce3f4115 100644
> --- a/arch/x86/mm/fault.c
> +++ b/arch/x86/mm/fault.c
> @@ -368,7 +368,7 @@ static void dump_pagetable(unsigned long address)
> goto bad;
>
> pr_cont("P4D %lx ", p4d_val(*p4d));
> - if (!p4d_present(*p4d) || p4d_large(*p4d))
> + if (!p4d_present(*p4d) || p4d_leaf(*p4d))
> goto out;
>
> pud = pud_offset(p4d, address);
> @@ -1039,7 +1039,7 @@ spurious_kernel_fault(unsigned long error_code, unsigned long address)
> if (!p4d_present(*p4d))
> return 0;
>
> - if (p4d_large(*p4d))
> + if (p4d_leaf(*p4d))
> return spurious_kernel_fault_check(error_code, (pte_t *) p4d);
>
> pud = pud_offset(p4d, address);
> diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
> index ebdbcae48011..d691e7992a9a 100644
> --- a/arch/x86/mm/init_64.c
> +++ b/arch/x86/mm/init_64.c
> @@ -1197,7 +1197,7 @@ remove_p4d_table(p4d_t *p4d_start, unsigned long addr, unsigned long end,
> if (!p4d_present(*p4d))
> continue;
>
> - BUILD_BUG_ON(p4d_large(*p4d));
> + BUILD_BUG_ON(p4d_leaf(*p4d));
>
> pud_base = pud_offset(p4d, 0);
> remove_pud_table(pud_base, addr, next, altmap, direct);
> diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c
> index e9b448d1b1b7..5359a9c88099 100644
> --- a/arch/x86/mm/pat/set_memory.c
> +++ b/arch/x86/mm/pat/set_memory.c
> @@ -676,7 +676,7 @@ pte_t *lookup_address_in_pgd(pgd_t *pgd, unsigned long address,
> return NULL;
>
> *level = PG_LEVEL_512G;
> - if (p4d_large(*p4d) || !p4d_present(*p4d))
> + if (p4d_leaf(*p4d) || !p4d_present(*p4d))
> return (pte_t *)p4d;
>
> pud = pud_offset(p4d, address);
> @@ -739,7 +739,7 @@ pmd_t *lookup_pmd_address(unsigned long address)
> return NULL;
>
> p4d = p4d_offset(pgd, address);
> - if (p4d_none(*p4d) || p4d_large(*p4d) || !p4d_present(*p4d))
> + if (p4d_none(*p4d) || p4d_leaf(*p4d) || !p4d_present(*p4d))
> return NULL;
>
> pud = pud_offset(p4d, address);
> diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c
> index 669ba1c345b3..dc0a81f5f60e 100644
> --- a/arch/x86/mm/pti.c
> +++ b/arch/x86/mm/pti.c
> @@ -206,7 +206,7 @@ static pmd_t *pti_user_pagetable_walk_pmd(unsigned long address)
> if (!p4d)
> return NULL;
>
> - BUILD_BUG_ON(p4d_large(*p4d) != 0);
> + BUILD_BUG_ON(p4d_leaf(*p4d) != 0);
> if (p4d_none(*p4d)) {
> unsigned long new_pud_page = __get_free_page(gfp);
> if (WARN_ON_ONCE(!new_pud_page))
> diff --git a/arch/x86/power/hibernate.c b/arch/x86/power/hibernate.c
> index 6f955eb1e163..28153789f873 100644
> --- a/arch/x86/power/hibernate.c
> +++ b/arch/x86/power/hibernate.c
> @@ -165,7 +165,7 @@ int relocate_restore_code(void)
> pgd = (pgd_t *)__va(read_cr3_pa()) +
> pgd_index(relocated_restore_code);
> p4d = p4d_offset(pgd, relocated_restore_code);
> - if (p4d_large(*p4d)) {
> + if (p4d_leaf(*p4d)) {
> set_p4d(p4d, __p4d(p4d_val(*p4d) & ~_PAGE_NX));
> goto out;
> }
> diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c
> index e21974f2cf2d..12a43a4abebf 100644
> --- a/arch/x86/xen/mmu_pv.c
> +++ b/arch/x86/xen/mmu_pv.c
> @@ -1104,7 +1104,7 @@ static void __init xen_cleanmfnmap_p4d(p4d_t *p4d, bool unpin)
> pud_t *pud_tbl;
> int i;
>
> - if (p4d_large(*p4d)) {
> + if (p4d_leaf(*p4d)) {
> pa = p4d_val(*p4d) & PHYSICAL_PAGE_MASK;
> xen_free_ro_pages(pa, P4D_SIZE);
> return;
> --
> 2.44.0
>
>
--
Sincerely yours,
Mike.
