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

mm/treewide: replace pud_large() with pud_leaf() 

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

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


Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.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: 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 2f709f7b

arch/powerpc/mm/book3s64/pgtable.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ void set_pud_at(struct mm_struct *mm, unsigned long addr, 


	WARN_ON(pte_hw_valid(pud_pte(*pudp)));

	assert_spin_locked(pud_lockptr(mm, pudp));

	WARN_ON(!(pud_large(pud)));

	WARN_ON(!(pud_leaf(pud)));

#endif

	trace_hugepage_set_pud(addr, pud_val(pud));

	return set_pte_at(mm, addr, pudp_ptep(pudp), pud_pte(pud));

arch/s390/boot/vmem.c

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static void pgtable_pud_populate(p4d_t *p4d, unsigned long addr, unsigned long e 
			}

			pmd = boot_crst_alloc(_SEGMENT_ENTRY_EMPTY);

			pud_populate(&init_mm, pud, pmd);

		} else if (pud_large(*pud)) {

		} else if (pud_leaf(*pud)) {

			continue;

		}

		pgtable_pmd_populate(pud, addr, next, mode);

arch/s390/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -730,7 +730,7 @@ static inline int pud_bad(pud_t pud) 
{

	unsigned long type = pud_val(pud) & _REGION_ENTRY_TYPE_MASK;



	if (type > _REGION_ENTRY_TYPE_R3 || pud_large(pud))

	if (type > _REGION_ENTRY_TYPE_R3 || pud_leaf(pud))

		return 1;

	if (type < _REGION_ENTRY_TYPE_R3)

		return 0;
@@ -1400,7 +1400,7 @@ static inline unsigned long pud_deref(pud_t pud) 
	unsigned long origin_mask;



	origin_mask = _REGION_ENTRY_ORIGIN;

	if (pud_large(pud))

	if (pud_leaf(pud))

		origin_mask = _REGION3_ENTRY_ORIGIN_LARGE;

	return (unsigned long)__va(pud_val(pud) & origin_mask);

}

arch/s390/mm/gmap.c

+1 −1
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ int __gmap_link(struct gmap *gmap, unsigned long gaddr, unsigned long vmaddr) 
	pud = pud_offset(p4d, vmaddr);

	VM_BUG_ON(pud_none(*pud));

	/* large puds cannot yet be handled */

	if (pud_large(*pud))

	if (pud_leaf(*pud))

		return -EFAULT;

	pmd = pmd_offset(pud, vmaddr);

	VM_BUG_ON(pmd_none(*pmd));

arch/s390/mm/hugetlbpage.c

+2 −2
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, 
		if (p4d_present(*p4dp)) {

			pudp = pud_offset(p4dp, addr);

			if (pud_present(*pudp)) {

				if (pud_large(*pudp))

				if (pud_leaf(*pudp))

					return (pte_t *) pudp;

				pmdp = pmd_offset(pudp, addr);

			}
@@ -240,7 +240,7 @@ int pmd_huge(pmd_t pmd) 


int pud_huge(pud_t pud)

{

	return pud_large(pud);

	return pud_leaf(pud);

}



bool __init arch_hugetlb_valid_size(unsigned long size)