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

mm/arm: remove pmd_thp_or_huge() 

ARM/ARM64 used to define pmd_thp_or_huge().  Now this macro is completely
redundant.  Remove it and use pmd_leaf().

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


Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Cc: Bjorn Andersson <andersson@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Konrad Dybcio <konrad.dybcio@linaro.org>
Cc: Fabio Estevam <festevam@denx.de>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: Andreas Larsson <andreas@gaisler.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: David S. Miller <davem@davemloft.net>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
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: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 9636f055

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

+0 −1
Original line number Diff line number Diff line
@@ -241,7 +241,6 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr) 
 * define empty stubs for use by pin_page_for_write.

 */

#define pmd_hugewillfault(pmd)	(0)

#define pmd_thp_or_huge(pmd)	(0)



#endif /* __ASSEMBLY__ */

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

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ 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_leaf(pmd) || pmd_trans_huge(pmd))



#ifdef CONFIG_TRANSPARENT_HUGEPAGE

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

arch/arm/lib/uaccess_with_memcpy.c

+2 −2
Original line number Diff line number Diff line
@@ -56,10 +56,10 @@ pin_page_for_write(const void __user *_addr, pte_t **ptep, spinlock_t **ptlp) 
	 * to see that it's still huge and whether or not we will

	 * need to fault on write.

	 */

	if (unlikely(pmd_thp_or_huge(*pmd))) {

	if (unlikely(pmd_leaf(*pmd))) {

		ptl = &current->mm->page_table_lock;

		spin_lock(ptl);

		if (unlikely(!pmd_thp_or_huge(*pmd)

		if (unlikely(!pmd_leaf(*pmd)

			|| pmd_hugewillfault(*pmd))) {

			spin_unlock(ptl);

			return 0;

arch/arm64/include/asm/pgtable.h

+0 −2
Original line number Diff line number Diff line
@@ -517,8 +517,6 @@ static inline pmd_t pmd_mkinvalid(pmd_t pmd) 
	return pmd;

}



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



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



#define pmd_mkhuge(pmd)		(__pmd(pmd_val(pmd) & ~PMD_TABLE_BIT))