From: Luiz Capitulino <luizcap@redhat.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
david@kernel.org, baolin.wang@linux.alibaba.com, ziy@nvidia.com,
lance.yang@linux.dev
Cc: corbet@lwn.net, tsbogend@alpha.franken.de, maddy@linux.ibm.com,
mpe@ellerman.id.au, agordeev@linux.ibm.com,
gerald.schaefer@linux.ibm.com, hca@linux.ibm.com,
gor@linux.ibm.com, x86@kernel.org, tglx@kernel.org,
mingo@redhat.com, bp@alien8.de, ira.weiny@intel.com,
hughd@google.com, dave.hansen@linux.intel.com, djbw@kernel.org,
vishal.l.verma@intel.com, dave.jiang@intel.com,
akpm@linux-foundation.org, yintirui@huawei.com, ljs@kernel.org,
dev.jain@arm.com
Subject: Re: [PATCH v6 12/14] treewide: introduce arch_has_pmd_leaves()
Date: Fri, 24 Jul 2026 14:55:36 -0400 [thread overview]
Message-ID: <4190508a-4783-4ee9-8a82-acb9d1f71b87@redhat.com> (raw)
In-Reply-To: <b6799a44719adc8dee18810c0a2ee223e713f756.1784856856.git.luizcap@redhat.com>
On 2026-07-23 21:34, Luiz Capitulino wrote:
> Now that all the has_transparent_hugepage() callers have been converted
> to pgtable_has_pmd_leaves(), this commit does two things:
>
> 1. Rename has_transparent_hugepage() arch implementations to
> arch_has_pmd_leaves(), since that's what the helper checks for
>
> 2. Introduce the default implementation of arch_has_pmd_leaves() as
> IS_ENABLED(CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE). This means that if
> the arch doesn't implement arch_has_pmd_leaves() we default to checking
> CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE as a way to determine if
> PMD-sized pages are supported
>
> Note that arch_has_pmd_leaves() is supposed to be called only by
> init_arch_has_pmd_leaves(). The remaining exception is hugepage_init()
> which will be converted in a future commit.
s/init_arch_has_pmd_leaves/pgtable_leaf_support_init
Typo found by Sashiko, in case I don't need to send v7, can this be
fixed w/o a re-post?
>
> Signed-off-by: Luiz Capitulino <luizcap@redhat.com>
> ---
> arch/mips/include/asm/pgtable.h | 4 ++--
> arch/mips/mm/tlb-r4k.c | 4 ++--
> arch/powerpc/include/asm/book3s/64/hash-4k.h | 2 +-
> arch/powerpc/include/asm/book3s/64/hash-64k.h | 2 +-
> arch/powerpc/include/asm/book3s/64/pgtable.h | 10 +++++-----
> arch/powerpc/include/asm/book3s/64/radix.h | 2 +-
> arch/powerpc/mm/book3s64/hash_pgtable.c | 4 ++--
> arch/s390/include/asm/pgtable.h | 4 ++--
> arch/x86/include/asm/pgtable.h | 4 ++--
> include/linux/pgtable.h | 4 ++--
> mm/huge_memory.c | 2 +-
> mm/memory.c | 2 +-
> 12 files changed, 22 insertions(+), 22 deletions(-)
>
> diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
> index b038da872ec6..2a0a7ddf8bee 100644
> --- a/arch/mips/include/asm/pgtable.h
> +++ b/arch/mips/include/asm/pgtable.h
> @@ -740,8 +740,8 @@ static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm,
>
> #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
>
> -#define has_transparent_hugepage has_transparent_hugepage
> -extern int has_transparent_hugepage(void);
> +#define arch_has_pmd_leaves arch_has_pmd_leaves
> +extern int arch_has_pmd_leaves(void);
>
> #ifdef _PAGE_HUGE
> #define pmd_leaf(pmd) ((pmd_val(pmd) & _PAGE_HUGE) != 0)
> diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
> index f4e369342a56..9339ebb0815f 100644
> --- a/arch/mips/mm/tlb-r4k.c
> +++ b/arch/mips/mm/tlb-r4k.c
> @@ -432,7 +432,7 @@ void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,
> #endif
> }
>
> -int has_transparent_hugepage(void)
> +int arch_has_pmd_leaves(void)
> {
> static unsigned int mask = -1;
>
> @@ -448,7 +448,7 @@ int has_transparent_hugepage(void)
> }
> return mask == PM_HUGE_MASK;
> }
> -EXPORT_SYMBOL(has_transparent_hugepage);
> +EXPORT_SYMBOL(arch_has_pmd_leaves);
>
> /*
> * Used for loading TLB entries before trap_init() has started, when we
> diff --git a/arch/powerpc/include/asm/book3s/64/hash-4k.h b/arch/powerpc/include/asm/book3s/64/hash-4k.h
> index 79511e6abfca..d532e3f0dfc3 100644
> --- a/arch/powerpc/include/asm/book3s/64/hash-4k.h
> +++ b/arch/powerpc/include/asm/book3s/64/hash-4k.h
> @@ -167,7 +167,7 @@ extern pmd_t hash__pmdp_huge_get_and_clear(struct mm_struct *mm,
> unsigned long addr, pmd_t *pmdp);
> #endif
>
> -extern int hash__has_transparent_hugepage(void);
> +extern int hash__arch_has_pmd_leaves(void);
> #endif /* !__ASSEMBLER__ */
>
> #endif /* _ASM_POWERPC_BOOK3S_64_HASH_4K_H */
> diff --git a/arch/powerpc/include/asm/book3s/64/hash-64k.h b/arch/powerpc/include/asm/book3s/64/hash-64k.h
> index a4a44a112ff9..d523c80f44f7 100644
> --- a/arch/powerpc/include/asm/book3s/64/hash-64k.h
> +++ b/arch/powerpc/include/asm/book3s/64/hash-64k.h
> @@ -280,7 +280,7 @@ extern pmd_t hash__pmdp_huge_get_and_clear(struct mm_struct *mm,
> unsigned long addr, pmd_t *pmdp);
> #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
>
> -extern int hash__has_transparent_hugepage(void);
> +extern int hash__arch_has_pmd_leaves(void);
> #endif /* __ASSEMBLER__ */
>
> #endif /* _ASM_POWERPC_BOOK3S_64_HASH_64K_H */
> diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h
> index 2a795f6d9263..41166d44fa75 100644
> --- a/arch/powerpc/include/asm/book3s/64/pgtable.h
> +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h
> @@ -1432,14 +1432,14 @@ static inline bool arch_needs_pgtable_deposit(void)
>
> #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
>
> -extern int hash__has_transparent_hugepage(void);
> -static inline int has_transparent_hugepage(void)
> +extern int hash__arch_has_pmd_leaves(void);
> +static inline int arch_has_pmd_leaves(void)
> {
> if (radix_enabled())
> - return radix__has_transparent_hugepage();
> - return hash__has_transparent_hugepage();
> + return radix__arch_has_pmd_leaves();
> + return hash__arch_has_pmd_leaves();
> }
> -#define has_transparent_hugepage has_transparent_hugepage
> +#define arch_has_pmd_leaves arch_has_pmd_leaves
>
> #define __HAVE_ARCH_PTEP_MODIFY_PROT_TRANSACTION
> pte_t ptep_modify_prot_start(struct vm_area_struct *, unsigned long, pte_t *);
> diff --git a/arch/powerpc/include/asm/book3s/64/radix.h b/arch/powerpc/include/asm/book3s/64/radix.h
> index 50545cf519bd..e8b74528953f 100644
> --- a/arch/powerpc/include/asm/book3s/64/radix.h
> +++ b/arch/powerpc/include/asm/book3s/64/radix.h
> @@ -307,7 +307,7 @@ static inline int radix__has_transparent_pud_hugepage(void)
> }
> #endif
>
> -static inline int radix__has_transparent_hugepage(void)
> +static inline int radix__arch_has_pmd_leaves(void)
> {
> /* For radix 2M at PMD level means thp */
> if (mmu_psize_defs[MMU_PAGE_2M].shift == PMD_SHIFT)
> diff --git a/arch/powerpc/mm/book3s64/hash_pgtable.c b/arch/powerpc/mm/book3s64/hash_pgtable.c
> index 50316f3fc5d3..a67bc1723404 100644
> --- a/arch/powerpc/mm/book3s64/hash_pgtable.c
> +++ b/arch/powerpc/mm/book3s64/hash_pgtable.c
> @@ -393,7 +393,7 @@ pmd_t hash__pmdp_huge_get_and_clear(struct mm_struct *mm,
>
> #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
>
> -int hash__has_transparent_hugepage(void)
> +int hash__arch_has_pmd_leaves(void)
> {
>
> if (!mmu_has_feature(MMU_FTR_16M_PAGE))
> @@ -422,7 +422,7 @@ int hash__has_transparent_hugepage(void)
>
> return 1;
> }
> -EXPORT_SYMBOL_GPL(hash__has_transparent_hugepage);
> +EXPORT_SYMBOL_GPL(hash__arch_has_pmd_leaves);
>
> #ifdef CONFIG_STRICT_KERNEL_RWX
>
> diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
> index 5aa8f621df04..24ee90c7e9bf 100644
> --- a/arch/s390/include/asm/pgtable.h
> +++ b/arch/s390/include/asm/pgtable.h
> @@ -1827,8 +1827,8 @@ static inline int pmd_trans_huge(pmd_t pmd)
> }
> #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
>
> -#define has_transparent_hugepage has_transparent_hugepage
> -static inline int has_transparent_hugepage(void)
> +#define arch_has_pmd_leaves arch_has_pmd_leaves
> +static inline int arch_has_pmd_leaves(void)
> {
> return cpu_has_edat1() ? 1 : 0;
> }
> diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
> index 3c62b33147fa..3c6a641e6c21 100644
> --- a/arch/x86/include/asm/pgtable.h
> +++ b/arch/x86/include/asm/pgtable.h
> @@ -331,8 +331,8 @@ static inline pud_t pud_mkspecial(pud_t pud)
> #endif /* CONFIG_ARCH_SUPPORTS_PUD_PFNMAP */
> #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
>
> -#define has_transparent_hugepage has_transparent_hugepage
> -static inline int has_transparent_hugepage(void)
> +#define arch_has_pmd_leaves arch_has_pmd_leaves
> +static inline int arch_has_pmd_leaves(void)
> {
> return boot_cpu_has(X86_FEATURE_PSE);
> }
> diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h
> index 4c00cf53e183..d571d161a84b 100644
> --- a/include/linux/pgtable.h
> +++ b/include/linux/pgtable.h
> @@ -2344,8 +2344,8 @@ static inline void __init pgtable_leaf_support_init(void) { }
> #endif
> #endif
>
> -#ifndef has_transparent_hugepage
> -#define has_transparent_hugepage() IS_BUILTIN(CONFIG_TRANSPARENT_HUGEPAGE)
> +#ifndef arch_has_pmd_leaves
> +#define arch_has_pmd_leaves() IS_BUILTIN(CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE)
> #endif
>
> #ifndef has_transparent_pud_hugepage
> diff --git a/mm/huge_memory.c b/mm/huge_memory.c
> index 04e8a6b55343..3f3a929e3069 100644
> --- a/mm/huge_memory.c
> +++ b/mm/huge_memory.c
> @@ -1010,7 +1010,7 @@ static int __init hugepage_init(void)
> int err;
> struct kobject *hugepage_kobj;
>
> - if (!has_transparent_hugepage()) {
> + if (!arch_has_pmd_leaves()) {
> transparent_hugepage_flags = 1 << TRANSPARENT_HUGEPAGE_UNSUPPORTED;
> return -EINVAL;
> }
> diff --git a/mm/memory.c b/mm/memory.c
> index d6540d6d4ef9..b0d3a8a8a25d 100644
> --- a/mm/memory.c
> +++ b/mm/memory.c
> @@ -169,7 +169,7 @@ EXPORT_SYMBOL(__arch_has_pmd_leaves_key);
>
> void __init pgtable_leaf_support_init(void)
> {
> - if (!has_transparent_hugepage())
> + if (!arch_has_pmd_leaves())
> static_branch_disable(&__arch_has_pmd_leaves_key);
> }
>
next prev parent reply other threads:[~2026-07-24 18:55 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-24 1:34 [PATCH v6 00/14] mm: thp: always enable mTHP support Luiz Capitulino
2026-07-24 1:34 ` [PATCH v6 01/14] docs: tmpfs: remove implementation detail reference Luiz Capitulino
2026-07-24 1:34 ` [PATCH v6 02/14] mm: shmem: shmem_getattr(): set blksize to highest supported THP order Luiz Capitulino
2026-07-24 1:34 ` [PATCH v6 03/14] mm: introduce pgtable_has_pmd_leaves() Luiz Capitulino
2026-07-24 1:34 ` [PATCH v6 04/14] drivers: dax: use pgtable_has_pmd_leaves() Luiz Capitulino
2026-07-24 1:34 ` [PATCH v6 05/14] drivers: nvdimm: " Luiz Capitulino
2026-07-24 1:34 ` [PATCH v6 06/14] mm: debug_vm_pgtable: " Luiz Capitulino
2026-07-24 1:34 ` [PATCH v6 07/14] mm: shmem: allow THP support determination at folio allocation time Luiz Capitulino
2026-07-24 1:34 ` [PATCH v6 08/14] s390: move has_transparent_hugepage() out of THP guard Luiz Capitulino
2026-07-27 15:41 ` Alexander Gordeev
2026-07-27 17:06 ` Luiz Capitulino
2026-07-27 17:14 ` David Hildenbrand (Arm)
2026-07-27 17:25 ` Luiz Capitulino
2026-07-24 1:34 ` [PATCH v6 09/14] powerpc: " Luiz Capitulino
2026-07-24 1:34 ` [PATCH v6 10/14] mips: " Luiz Capitulino
2026-07-24 1:34 ` [PATCH v6 11/14] x86: " Luiz Capitulino
2026-07-24 1:34 ` [PATCH v6 12/14] treewide: introduce arch_has_pmd_leaves() Luiz Capitulino
2026-07-24 18:55 ` Luiz Capitulino [this message]
2026-07-24 1:34 ` [PATCH v6 13/14] mm: replace thp_disabled_by_hw() with pgtable_has_pmd_leaves() Luiz Capitulino
2026-07-24 1:34 ` [PATCH v6 14/14] mm: thp: always enable mTHP support Luiz Capitulino
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4190508a-4783-4ee9-8a82-acb9d1f71b87@redhat.com \
--to=luizcap@redhat.com \
--cc=agordeev@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=baolin.wang@linux.alibaba.com \
--cc=bp@alien8.de \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=dave.jiang@intel.com \
--cc=david@kernel.org \
--cc=dev.jain@arm.com \
--cc=djbw@kernel.org \
--cc=gerald.schaefer@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=hughd@google.com \
--cc=ira.weiny@intel.com \
--cc=lance.yang@linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=ljs@kernel.org \
--cc=maddy@linux.ibm.com \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=tglx@kernel.org \
--cc=tsbogend@alpha.franken.de \
--cc=vishal.l.verma@intel.com \
--cc=x86@kernel.org \
--cc=yintirui@huawei.com \
--cc=ziy@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox