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

mm/treewide: replace pXd_huge() with pXd_leaf() 

Now after we're sure all pXd_huge() definitions are the same as pXd_leaf(),
reuse it.  Luckily, pXd_huge() isn't widely used.

Link: https://lkml.kernel.org/r/20240318200404.448346-12-peterx@redhat.com


Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Bjorn Andersson <andersson@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Fabio Estevam <festevam@denx.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: Konrad Dybcio <konrad.dybcio@linaro.org>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Mark Salter <msalter@redhat.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Mike Rapoport (IBM) <rppt@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Naoya Horiguchi <nao.horiguchi@gmail.com>
Cc: "Naveen N. Rao" <naveen.n.rao@linux.ibm.com>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 7db86dc3

arch/arm/include/asm/pgtable-3level.h

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static inline pte_t pte_mkspecial(pte_t pte) 
#define pmd_dirty(pmd)		(pmd_isset((pmd), L_PMD_SECT_DIRTY))



#define pmd_hugewillfault(pmd)	(!pmd_young(pmd) || !pmd_write(pmd))

#define pmd_thp_or_huge(pmd)	(pmd_huge(pmd) || pmd_trans_huge(pmd))

#define pmd_thp_or_huge(pmd)	(pmd_leaf(pmd) || pmd_trans_huge(pmd))



#ifdef CONFIG_TRANSPARENT_HUGEPAGE

#define pmd_trans_huge(pmd)	(pmd_val(pmd) && !pmd_table(pmd))

arch/arm64/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ static inline pmd_t pmd_mkinvalid(pmd_t pmd) 
	return pmd;

}



#define pmd_thp_or_huge(pmd)	(pmd_huge(pmd) || pmd_trans_huge(pmd))

#define pmd_thp_or_huge(pmd)	(pmd_leaf(pmd) || pmd_trans_huge(pmd))



#define pmd_write(pmd)		pte_write(pmd_pte(pmd))

arch/arm64/mm/hugetlbpage.c

+2 −2
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, 
	if (sz != PUD_SIZE && pud_none(pud))

		return NULL;

	/* hugepage or swap? */

	if (pud_huge(pud) || !pud_present(pud))

	if (pud_leaf(pud) || !pud_present(pud))

		return (pte_t *)pudp;

	/* table; check the next level */
@@ -333,7 +333,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, 
	if (!(sz == PMD_SIZE || sz == CONT_PMD_SIZE) &&

	    pmd_none(pmd))

		return NULL;

	if (pmd_huge(pmd) || !pmd_present(pmd))

	if (pmd_leaf(pmd) || !pmd_present(pmd))

		return (pte_t *)pmdp;



	if (sz == CONT_PTE_SIZE)

arch/loongarch/mm/hugetlbpage.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ uint64_t pmd_to_entrylo(unsigned long pmd_val) 
{

	uint64_t val;

	/* PMD as PTE. Must be huge page */

	if (!pmd_huge(__pmd(pmd_val)))

	if (!pmd_leaf(__pmd(pmd_val)))

		panic("%s", __func__);



	val = pmd_val ^ _PAGE_HUGE;

arch/mips/mm/tlb-r4k.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte) 
	idx = read_c0_index();

#ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT

	/* this could be a huge page  */

	if (pmd_huge(*pmdp)) {

	if (pmd_leaf(*pmdp)) {

		unsigned long lo;

		write_c0_pagemask(PM_HUGE_MASK);

		ptep = (pte_t *)pmdp;