Commit 2f709f7b authored Mar 05, 2024 by Peter Xu Committed by Andrew Morton Mar 06, 2024

mm/treewide: replace pmd_large() with pmd_leaf()

pmd_large() is always defined as pmd_leaf().  Merge their usages.  Chose
pmd_leaf() because pmd_leaf() is a global API, while pmd_large() is not.

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


Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>
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: Borislav Petkov <bp@alien8.de>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Ingo Molnar <mingo@redhat.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: Thomas Gleixner <tglx@linutronix.de>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Yang Shi <shy828301@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

parent b6c9d5a9

arch/arm/mm/dump.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -349,12 +349,12 @@ static void walk_pmd(struct pg_state st, pud_t pud, unsigned long start)
		for (i = 0; i < PTRS_PER_PMD; i++, pmd++) {
		addr = start + i * PMD_SIZE;
		domain = get_domain_name(pmd);
		if (pmd_none(pmd) \|\| pmd_large(pmd) \|\| !pmd_present(*pmd))
		if (pmd_none(pmd) \|\| pmd_leaf(pmd) \|\| !pmd_present(*pmd))
		note_page(st, addr, 4, pmd_val(*pmd), domain);
		else
		walk_pte(st, pmd, addr, domain);

		if (SECTION_SIZE < PMD_SIZE && pmd_large(pmd[1])) {
		if (SECTION_SIZE < PMD_SIZE && pmd_leaf(pmd[1])) {
		addr += SECTION_SIZE;
		pmd++;
		domain = get_domain_name(pmd);

arch/powerpc/mm/book3s64/pgtable.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ void set_pmd_at(struct mm_struct *mm, unsigned long addr,

		WARN_ON(pte_hw_valid(pmd_pte(pmdp)) && !pte_protnone(pmd_pte(pmdp)));
		assert_spin_locked(pmd_lockptr(mm, pmdp));
		WARN_ON(!(pmd_large(pmd)));
		WARN_ON(!(pmd_leaf(pmd)));
		#endif
		trace_hugepage_set_pmd(addr, pmd_val(pmd));
		return set_pte_at(mm, addr, pmdp_ptep(pmdp), pmd_pte(pmd));

arch/powerpc/mm/book3s64/radix_pgtable.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -924,7 +924,7 @@ bool vmemmap_can_optimize(struct vmem_altmap altmap, struct dev_pagemap pgmap)
		int __meminit vmemmap_check_pmd(pmd_t *pmdp, int node,
		unsigned long addr, unsigned long next)
		{
		int large = pmd_large(*pmdp);
		int large = pmd_leaf(*pmdp);

		if (large)
		vmemmap_verify(pmdp_ptep(pmdp), node, addr, next);

arch/powerpc/mm/pgtable_64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ struct page *pmd_page(pmd_t pmd)
		* enabled so these checks can't be used.
		*/
		if (!IS_ENABLED(CONFIG_HAVE_ARCH_HUGE_VMAP))
		VM_WARN_ON(!(pmd_large(pmd) \|\| pmd_huge(pmd)));
		VM_WARN_ON(!(pmd_leaf(pmd) \|\| pmd_huge(pmd)));
		return pte_page(pmd_pte(pmd));
		}
		return virt_to_page(pmd_page_vaddr(pmd));

arch/s390/boot/vmem.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -333,7 +333,7 @@ static void pgtable_pmd_populate(pud_t *pud, unsigned long addr, unsigned long e
		}
		pte = boot_pte_alloc();
		pmd_populate(&init_mm, pmd, pte);
		} else if (pmd_large(*pmd)) {
		} else if (pmd_leaf(*pmd)) {
		continue;
		}
		pgtable_pte_populate(pmd, addr, next, mode);