From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F283B39CD12 for ; Fri, 24 Jul 2026 18:55:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784919353; cv=none; b=I3U2Aw0cg1/Nz9kpdo0XFDvo1+xj8JYLwhiCPUV0FTrHnE8HdTKl9wKo1jQ5JuQh9Qgpc7wE+tHwZIlcs7E4j4i24EEJwFC/Kq+hv0yyMTOUnNIQObW1sZS7GTGpZkqGl19lhEUCOsi7BKGCVCsg0iJNuAwiDztRBN5/IqDFT1w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784919353; c=relaxed/simple; bh=WHArCh5LRT4nO+ws31A0nsEJwveNXSN68rxfW3p695Q=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=WBSpuBUU2OuRr2ic/uVL5x9+0StxRfWOmPEG7BmH5slKtVZ97yTDTYpeoA7WgerL3yj4jGgmRLTihCfV/iVk+M7KwPu+BH/s3akBKBFvnfgSLnD7fj6SQgD3yJWu+mMKA8BF+7iGYrMhnkqU/o/8hT+HQIcjPresPmPb4i4bYYM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=LIjnvt8x; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LIjnvt8x" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784919350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FPHtkNUMgxa/OR2MtUUZl4a87NDGmPOsJ6CY7gp7UTQ=; b=LIjnvt8xK/zXgZHPAj/kwvwGAw7BWzeB3RCPHLRzYsETX3xpyel+5AGV5gIBytr3yRzjKb 0TTjTyE+8jUEZ5oOv1IHXHHNybfpe19wV0mOrSr/2Q8Rdi7L5R/iPZFEHrPsrz0bq0CBI5 bNVLydCrEqAhv95YeQZDYU1dW7at1so= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-544--6fFhweJO2Sl8lNZw8B49w-1; Fri, 24 Jul 2026 14:55:49 -0400 X-MC-Unique: -6fFhweJO2Sl8lNZw8B49w-1 X-Mimecast-MFC-AGG-ID: -6fFhweJO2Sl8lNZw8B49w_1784919349 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-8f08560ea44so12215706d6.1 for ; Fri, 24 Jul 2026 11:55:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784919349; x=1785524149; h=content-transfer-encoding:content-type:in-reply-to:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=FPHtkNUMgxa/OR2MtUUZl4a87NDGmPOsJ6CY7gp7UTQ=; b=YK1veETfl1WfxmbcHSH7+YHa3kpM4/pbwVaG+RYl8sF0F4+gO0iKQcn2Q8ch42j7Wx xfegUxneXnHioN8qucal8ghxjSw5TZUYpDptxvtftRs5sgdNXi9kbxgv1ZcDOcGE3O9M tHeTL3q0g5HEgDGjXmewm2pm301wAXl42ow4tKIK0HjtfKC8pV/SuJwAZbpqGwuGowV+ 1a09kIafqM0DFNXJfFtfcXqNDcBPHPZzPi+hdvX6mBT+Gu7u9jk/BqkEaAizL+IvfqPQ anGEUmf/nn2ZaUxqZctZL82WG36NTREYEXuHwLbz0hzRFVZcBcMgt24XceOWs0o4aJZZ V6vw== X-Gm-Message-State: AOJu0YyPnvJEqCnqp6Du3pN6e7n6cBRWPR7TbQ7yY55rBG+657vcNFDv nlCIZu+sdaqJti8h6V7WAcljF52KbDlGHUu2smoEltrf0Btpdd+XvO1KmG46nf89UOmxg17dxUp Y+0K066WiWz3q3PYiqIPeY0GDt4NudsIqeSnwiQXN68CgEdxUH6m1S4hl+WZYDjX5IpLqMg1yqP Y/0OuTqv8PGDzefSgT0tYcfNBfO5Rtt1db2QJ/ci5E0xRz44z1tmQ= X-Gm-Gg: AR+sD10y6v67exFXOCHg68lOv1JMFRxh2WbjGggBRY3X3hVpyZLau9f8+4JFPajzJaJ V/geC+Ei4kbQAht0dK/pIovrSm0FYfxQPrHhAB8CH7nreUd39PJCAUM36AS2krXf5hrCkWNvcO0 pzgNt7nRa/vW9G8LjmXJ+Lr/FKqFIEoA99fyJUaeJl+OyoA9xYOQ10+Ia6kocnzTkk0oEkJc6A7 le2GLu4mWp9ok9Hpi5D/ODPkqF/QMMJfa9KQBfh3zIJUDSdq8FKjq1WJzL6rfM4pwFKCEQ7+jNL jPksqKNa31PTUUV61keOhkww4mvHDy88ijDSWZ5cmqs5yws9zMRR9dJyOwkuC54kJkUlmQxEr8F 5 X-Received: by 2002:a05:6214:4283:b0:8f2:9be8:f444 with SMTP id 6a1803df08f44-907ca28fce9mr111232556d6.8.1784919349017; Fri, 24 Jul 2026 11:55:49 -0700 (PDT) X-Received: by 2002:a05:6214:4283:b0:8f2:9be8:f444 with SMTP id 6a1803df08f44-907ca28fce9mr111231796d6.8.1784919348404; Fri, 24 Jul 2026 11:55:48 -0700 (PDT) Received: from [192.168.2.110] ([70.49.81.60]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-907e86d7a94sm4173806d6.40.2026.07.24.11.55.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Jul 2026 11:55:48 -0700 (PDT) Message-ID: <4190508a-4783-4ee9-8a82-acb9d1f71b87@redhat.com> Date: Fri, 24 Jul 2026 14:55:36 -0400 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v6 12/14] treewide: introduce arch_has_pmd_leaves() From: Luiz Capitulino 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 References: Content-Language: en-US, en-CA In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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 > --- > 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); > } >