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.129.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 3F6644A3412 for ; Wed, 6 May 2026 18:22:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778091751; cv=none; b=hB5jkG4c8ILQ/fKq0s8ONIccwD6csjii5NBO5JDibIcpWz0ODggWB9X6uYztkiZBk3LzzDPh76cRs9wcRWU+hECiRNzVxZKG1C+I/crj3U1s6NDfmJvFtD0igCDT4q2w3nCg0BXVsXrxsnlSdOAScs+FuSnRKbStF9ubJOC2SdQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778091751; c=relaxed/simple; bh=FGHeaS35rM2YcRvdcXWJjSOcm8iXPGTJn/N6rUq7dqw=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=N//D4NZE6L+g6rWOrT89WsIYM4xoD/hEL6+M0GMTAbcF4Nl3xSK3hzl5reTzaOPoYyQngRt00kbIvmvbz8O0XfJUSpJrOvS8ph1acKwxNWlACFF07UraUce4R3WXG7dY7PaOnxPW+N8Q7XLzHPYV4wlER6f5iX4muGDdMiHXBTw= 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=ZVKYpp1B; arc=none smtp.client-ip=170.10.129.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="ZVKYpp1B" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778091749; 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=MEwKi/yEAVBufitkI7q1YFn1s0vNFnHu/rXcw0dUDa0=; b=ZVKYpp1B0bYTpfOi/y+fuPACkxpcTKXC1tRRbYLNnFfVC63wogzrZfIRq05OojIyK4k6A5 tQKG4M7GA+xcrUlP+9btR6Vu0kP1B9y8TPgKfM9FZXZ4jE1S1+5wvw1Ys0tydbAFdcLIE2 N1GYxSIZ9MnyNJMR4wjux63VMI5eIic= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-235-XwdJGs8ZMFau9DabPT9ryg-1; Wed, 06 May 2026 14:22:26 -0400 X-MC-Unique: XwdJGs8ZMFau9DabPT9ryg-1 X-Mimecast-MFC-AGG-ID: XwdJGs8ZMFau9DabPT9ryg_1778091745 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-8d4c2906fdfso782322785a.2 for ; Wed, 06 May 2026 11:22:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778091745; x=1778696545; h=content-transfer-encoding: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; bh=MEwKi/yEAVBufitkI7q1YFn1s0vNFnHu/rXcw0dUDa0=; b=KfKNKM5GPVlTsqJJx4nG6hBdSEILHVO+BJ4CDt05/9BtePmhcsLIGzrbvJPGTKwDjh xrHSAdLhfUMlwst0G1409IVhPOEYwfGu55/2dwxTYWTnO/4v9mGpGSLs8JZm6Lad0Bgo oVIV2xmi7ULY8E34PmA1VX5JYwxsHCjKkkZLgOCYoAZ0OQplMx0htXBqL8fKwl2KZ28c wlWiGPpUgKqtUlbFUoDF6xfy4AZkQwtfKd8YlZyi0GY0typdQsqLItpL72rpF2DSGcT7 eD+tXCgio1Q8/ICctc7uLrn9vv1wLOr6OxlGG8YeUX8M/t0qKug25ERuWIePB+ndpeb/ qdKA== X-Gm-Message-State: AOJu0YxCx5Rht8L06YmtZcVKWIkFZe6C7tleDfL6b7196D4Te/tZSzDH uAgjOGodssAiGnb46QFK8jbqq6lUjmk+LZGgA7SbF1NwLfC8qrVu6+rqN6E++oxLTxozzwDGTwc DYkxvrQjaO7WEDWia4tp+aCGHVq585A8sjhEMqdxLdsYft+Z016k/sqtMLFuR/qWlYfcS3I4mgv VRIUzme6QpNPvKg1BslC4Anaq0P8mCsRKu3lbFEGr/7q9vzkQbovc= X-Gm-Gg: AeBDieuTG3wkVIq1fCbTeRec7DrY+4x2VpbhyBuoBAiTM4mz/6vMQ95Qgup9la/DRpg fIskw3Ynp8lJ3dVIiS0vEH3f5isX7AzavN7gGv1TJG/01QsPrBi5VSgMTq2G0viay1AqWi346pF uF8AJyyYpIbWjdjFfYdTBgOItoxXLNAqflXFJDXZs5zDMPAOurAUHdxiekFDbeKvsILG/dvOZ4I PkN6xI+hlPpr8R1lwjsTFYL02z2W2cE4dixHHUL2gQfzJWIkVtFP4ZrCgVCr6d0Y7aToa7i9m0u dNsgGGajkIOnHcawhIG7uZS2OoAruqR2QynYIdot8yHTDgBXlZhNy1PHI4k6RR4BP7r5iDzV6Kb iiZ+LROMHoR0aeKA7AaXz8lGECuCMkoHWcmdjOqN+hQn/Bw== X-Received: by 2002:a05:620a:2849:b0:8e3:4182:6c4e with SMTP id af79cd13be357-904d69d8fd1mr673163785a.49.1778091744922; Wed, 06 May 2026 11:22:24 -0700 (PDT) X-Received: by 2002:a05:620a:2849:b0:8e3:4182:6c4e with SMTP id af79cd13be357-904d69d8fd1mr673153785a.49.1778091744151; Wed, 06 May 2026 11:22:24 -0700 (PDT) Received: from [192.168.2.110] ([70.53.202.134]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8fc2cd04de9sm1746500785a.44.2026.05.06.11.22.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 06 May 2026 11:22:23 -0700 (PDT) Message-ID: <415c4158-f87d-4a61-8aab-9f957b1fe1c8@redhat.com> Date: Wed, 6 May 2026 14:22:12 -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: (sashiko review) Re: [PATCH v4 7/9] 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, dave.hansen@linux.intel.com, djbw@kernel.org, vishal.l.verma@intel.com, dave.jiang@intel.com, akpm@linux-foundation.org, lorenzo.stoakes@oracle.com References: <85674af7934cd363ceadd1d4f2b784d833a183cc.1777663129.git.luizcap@redhat.com> Content-Language: en-US, en-CA In-Reply-To: <85674af7934cd363ceadd1d4f2b784d833a183cc.1777663129.git.luizcap@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2026-05-01 15:18, 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. > > 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 fa7b935f947c..a97b788315e2 100644 > --- a/arch/mips/include/asm/pgtable.h > +++ b/arch/mips/include/asm/pgtable.h > @@ -615,8 +615,8 @@ unsigned long io_remap_pfn_range_pfn(unsigned long pfn, unsigned long size); > /* We don't have hardware dirty/accessed bits, generic_pmdp_establish is fine.*/ > #define pmdp_establish generic_pmdp_establish > > -#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); > > static inline int pmd_trans_huge(pmd_t pmd) > { > diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c > index 24fe85fa169d..c423b5784337 100644 > --- a/arch/mips/mm/tlb-r4k.c > +++ b/arch/mips/mm/tlb-r4k.c > @@ -434,7 +434,7 @@ void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1, > > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > > -int has_transparent_hugepage(void) > +int arch_has_pmd_leaves(void) > { > static unsigned int mask = -1; > > @@ -450,7 +450,7 @@ int has_transparent_hugepage(void) > } > return mask == PM_HUGE_MASK; > } > -EXPORT_SYMBOL(has_transparent_hugepage); > +EXPORT_SYMBOL(arch_has_pmd_leaves); > > #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ > > diff --git a/arch/powerpc/include/asm/book3s/64/hash-4k.h b/arch/powerpc/include/asm/book3s/64/hash-4k.h > index 8e5bd9902bed..6744c2287199 100644 > --- a/arch/powerpc/include/asm/book3s/64/hash-4k.h > +++ b/arch/powerpc/include/asm/book3s/64/hash-4k.h > @@ -165,7 +165,7 @@ extern void hash__pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp, > extern pgtable_t hash__pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp); > extern pmd_t hash__pmdp_huge_get_and_clear(struct mm_struct *mm, > unsigned long addr, pmd_t *pmdp); > -extern int hash__has_transparent_hugepage(void); > +extern int hash__arch_has_pmd_leaves(void); > #endif > > #endif /* !__ASSEMBLER__ */ > diff --git a/arch/powerpc/include/asm/book3s/64/hash-64k.h b/arch/powerpc/include/asm/book3s/64/hash-64k.h > index 7deb3a66890b..9392aba5e5dc 100644 > --- a/arch/powerpc/include/asm/book3s/64/hash-64k.h > +++ b/arch/powerpc/include/asm/book3s/64/hash-64k.h > @@ -278,7 +278,7 @@ extern void hash__pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp, > extern pgtable_t hash__pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp); > extern pmd_t hash__pmdp_huge_get_and_clear(struct mm_struct *mm, > unsigned long addr, pmd_t *pmdp); > -extern int hash__has_transparent_hugepage(void); > +extern int hash__arch_has_pmd_leaves(void); > #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ > > #endif /* __ASSEMBLER__ */ > diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h > index e67e64ac6e8c..b6629c041e75 100644 > --- a/arch/powerpc/include/asm/book3s/64/pgtable.h > +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h > @@ -1121,14 +1121,14 @@ static inline void update_mmu_cache_pud(struct vm_area_struct *vma, > { > } > > -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 > > static inline int has_transparent_pud_hugepage(void) > { > diff --git a/arch/powerpc/include/asm/book3s/64/radix.h b/arch/powerpc/include/asm/book3s/64/radix.h > index da954e779744..c884a119cbd9 100644 > --- a/arch/powerpc/include/asm/book3s/64/radix.h > +++ b/arch/powerpc/include/asm/book3s/64/radix.h > @@ -298,7 +298,7 @@ extern pmd_t radix__pmdp_huge_get_and_clear(struct mm_struct *mm, > pud_t radix__pudp_huge_get_and_clear(struct mm_struct *mm, > unsigned long addr, pud_t *pudp); > > -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 d9b5b751d7b7..88a4a2eab513 100644 > --- a/arch/powerpc/mm/book3s64/hash_pgtable.c > +++ b/arch/powerpc/mm/book3s64/hash_pgtable.c > @@ -391,7 +391,7 @@ pmd_t hash__pmdp_huge_get_and_clear(struct mm_struct *mm, > return old_pmd; > } > > -int hash__has_transparent_hugepage(void) > +int hash__arch_has_pmd_leaves(void) > { > > if (!mmu_has_feature(MMU_FTR_16M_PAGE)) > @@ -420,7 +420,7 @@ int hash__has_transparent_hugepage(void) > > return 1; > } > -EXPORT_SYMBOL_GPL(hash__has_transparent_hugepage); > +EXPORT_SYMBOL_GPL(hash__arch_has_pmd_leaves); > > #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ > > diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h > index 2c6cee8241e0..33b165dbf3db 100644 > --- a/arch/s390/include/asm/pgtable.h > +++ b/arch/s390/include/asm/pgtable.h > @@ -1799,8 +1799,8 @@ static inline int pmd_trans_huge(pmd_t pmd) > return pmd_leaf(pmd); > } > > -#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 2187e9cfcefa..2edd6c9d789c 100644 > --- a/arch/x86/include/asm/pgtable.h > +++ b/arch/x86/include/asm/pgtable.h > @@ -306,8 +306,8 @@ static inline int pud_trans_huge(pud_t pud) > } > #endif > > -#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 b365be3516bf..3d7eeb50c183 100644 > --- a/include/linux/pgtable.h > +++ b/include/linux/pgtable.h > @@ -2273,8 +2273,8 @@ static inline void __init init_arch_has_pmd_leaves(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_ENABLED(CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE) > #endif > > #ifndef has_transparent_pud_hugepage > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 970e077019b7..4da10e94bbb6 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -969,7 +969,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 90b2d9e84320..c62fce83b8d0 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -169,7 +169,7 @@ EXPORT_SYMBOL(__arch_has_pmd_leaves_key); > > void __init init_arch_has_pmd_leaves(void) > { > - if (!has_transparent_hugepage()) > + if (!arch_has_pmd_leaves()) > static_branch_disable(&__arch_has_pmd_leaves_key); > } >