Commit dba8e6f3 authored by Peter Xu's avatar Peter Xu Committed by Andrew Morton
Browse files

mm/x86: replace p4d_large() with p4d_leaf() 

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.

Link: https://lkml.kernel.org/r/20240305043750.93762-4-peterx@redhat.com


Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarMike Rapoport (IBM) <rppt@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@kernel.org>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Kirill A. Shutemov <kirill@shutemov.name>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: "Naveen N. Rao" <naveen.n.rao@linux.ibm.com>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Yang Shi <shy828301@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent bd18b688

arch/x86/mm/fault.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

arch/x86/mm/init_64.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/x86/mm/pat/set_memory.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

arch/x86/mm/pti.c

+1 −1
Original line number Diff line number Diff line
@@ -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))

arch/x86/power/hibernate.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}