From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.216.54 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794025935; b=pcuEcjkrm02TpgoRIqboWmbAghmwCS7aCJvFJPq2/vLHPyJCrTF1F4sK9RWHOu5NUrLq xzZVeQ9aGmPiDmBF4fh9XCP6IqH+Zh/veUFnnhx0KzjL7PZG0ufgqSzQfSpq2cBm8Tfzx H53kZpyheo3/b+FR8WXcqR7SRRqPK7ZNM2kq99Aj1QNxAVy1Ovu+0ejY0TWah22tb7veH 7Lllh59G9aCy2pgu3kODflQSuhppwMqPCfI10HVk984wu5Rr1Hs9biqlvZAlg6Euo2Oys 3PNvVPNaXyYLL4e+qQvbfvucM2H7x6XqO5HsL3HWw9wzC0mgeELuGkkcjlPIjkFeAvw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794025935; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=EjmiDhGTyjFqhaR2vuKwqHt93n+hCHkzTadeMRKHv0k=; b=ko/tpngoW3EJenzwTB35D5C8Sgx+ddaNffGyZeS+PrkC0DJDZeItTvb9Mf8yLGeow9Lh MsgV4szAdBPvduYNNUAjSBkgvMujiVnPN6BPTRc0fIPhmKiMnu4kiCjpn39nX4nZQkV7f Yvm+vAhnODxmsWeyMdVSgQSbkwiZwOY3Pfk+WhNjbKAF1SnU1/EvpT3z/93MbtO7ekuYq Pc4JlkFeMNXoyBnqZ6IZpaaqaY5JMWy7G1ugOlxXehwFWJSnfGKQRkplbSFlacIuVDZdm u97B5BDOnMKdqDAcXblYWcmW1aSGLypLBc/VXqMVOKIL1M+JjvsmjeMGynKoM+/xH+Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass header.d=bytedance.com header.i=@bytedance.com header.a=rsa-sha256 header.s=google header.b=f79yToSS; arc=none smtp.remote-ip=209.85.216.54 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1B73C606A335 for ; Sat, 7 Nov 2026 04:32:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 1B73C606A335 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.a=rsa-sha256 header.s=google header.b=f79yToSS Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-3ae1d0caaedso607464a91.2 for ; Fri, 06 Nov 2026 20:32:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1794025934; x=1794630734; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=EjmiDhGTyjFqhaR2vuKwqHt93n+hCHkzTadeMRKHv0k=; b=f79yToSSurSiSMzxtroGBlJVoRi4X7WKuiNGjCBzhzOemiudbhjz3nISauTB2d6R++ mliwvp/FpOAnU6ddLBopbgEGAxbUJh2aMR3iq1f9vqU66Fg0BDk+sHkNE1nvtS7susms PRrS/qtywCqBnxydb3Ino6xoNIq4UPklnwQ05UQzFqqXYlsDd57TftswkQN7CrNLxP51 XUovR2yISU/0D/Ck6qFHnC1C0ZISkE1bcMoSWHa4tfX8mKMt9/l94D/JYJP0EmVNtfm3 YiotHxF0jHsibURsIqdd/IrpvqdTzO3lT7W5Ty0kFUSa3JMrOLTE7bWFQLg2WoYKmwoB bSxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794025934; x=1794630734; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=EjmiDhGTyjFqhaR2vuKwqHt93n+hCHkzTadeMRKHv0k=; b=vf0cjUPer4+3EzvTPH9BYBYVTgBg//yxiq/OMp9RZRMuMUPn03tIl85EQGkRPlacpW 4VuZEgHDsEhY8OLTPS1MiuAnsY9BnOs7RtXzRpms5Q2Rv7m2cvbKa4O14zwROyxH/EKt Vw2Vo6ZLDSFsUTdpByaRYcxv8/Q+Pa8mEMiEXTipbiIaQ5KYgx8GPAqECcWJOMtjdpLr iXH+tKPUxXk6gJFcMYLaueIHhkZY8JWwlh+PSdsYXouSuYmv/VAXMHhJV6bLEP46KPp5 tYm0154M5txi6aQ3jDkeLqPtInpH3NDbBYYUViq6ZgRbT1Ffto2m9wxjLkmH/3fU2LvJ 0+5g== X-Forwarded-Encrypted: i=1; AL+hErGK0bZ1vpIdmQHOQ/U9XP7b9njJYYkFwEnJuagKR+a/gtR85ntVZwxPDe9NeNEfnxQbUbQpGP9u5VcM+Dw=@vger.kernel.org X-Gm-Message-State: APuU4Z91eswiGKX+Rtg4KgQ/fInhPESvIDjNetdWvQlGoW7BRPWP/oA6 KatrXYR6nOXoNE90A/sFjyDY+5G+YaQtYXYzOByiTtDbYCqAhLMWm9BtTndR72ImBzI= X-Gm-Gg: AYBFou0oaXbNjgRqWnD9cvz96WgChVKVBHXqEhM/XOGWMTUcu1wvgrNW+y9OYOUXx1d 06P1Q0X/pCi2NolgL7jGVh6IDuT+L42uNtBQD0/OuYzRoz0ng2h9KoiXqXmckPmwKyLAYCKlnGD Z1GoGHpPYFZh7f35Q1vbJPjkTcVU4jgRPs2Z7zMlp0L9OYUr8HEdD3NXgV77nkmMbMJ96hvCGfi fUEnJUikr9JSX/uPfwnpMvE1bFcWrGC+G3Nq6HknE7gSQ9mGrgKyqVaP+rvOanzItTE57M0E8C8 EwOOlQ29jal5YgSqgqajBErsFo4KRzEcjd6jSUXKRNu9tGXDWidkxL/JQwhkBFnoUoZE4FKQ/T/ 5gaX9Z0mRYWPJMGs8ML8kY7o60QN26mNC86Z5SJljxuykC1+ViqjLdRo3iJwMr/GZJawjMxqW52 P8npL8E4l9myWXLLRHsecBeYojf4SnMQ+iaBC7qvVwEmpYfnWz/DZ/+MdQN3I9+eaWWPGq3Otpz d4fmb0F9++5Ar4lRk040P3cnjICNkbN4YAMdBhIvd3cCMG720D3ZE4y8LcrDCPwtMKJSPRImC9f 48I2YG+Du1qmCa1MWvLoclmGkrNCF6lGh4131QK+WGZN/AWKiBAil6oPT5Dx X-Received: by 2002:a17:90b:28c4:b0:3ac:8897:7baa with SMTP id 98e67ed59e1d1-3b0db7114f1mr4190441a91.40.1794025934315; Fri, 06 Nov 2026 20:32:14 -0800 (PST) Received: from G6L4RL2QG9 ([2409:8a00:1832:6900:c8de:13da:804b:a0fa]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3b10584b66bsm1578451a91.14.2026.11.06.20.32.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 06 Nov 2026 20:32:13 -0800 (PST) From: Muchun Song To: David Hildenbrand , Madhavan Srinivasan , Mike Rapoport , Andrew Morton Cc: Lance Yang , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Ritesh Harjani , Shrikanth Hegde , Oscar Salvador , Qi Zheng , Muchun Song , Huacai Chen , WANG Xuerui , linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-riscv@lists.infradead.org, x86@kernel.org, loongarch@lists.linux.dev, linux-s390@vger.kernel.org, Muchun Song Subject: [PATCH v3 2/5] powerpc/mm: drop powerpc vmemmap_can_optimize() Date: Sat, 7 Nov 2026 12:31:19 +0800 Message-ID: <20261107043122.25650-3-songmuchun@bytedance.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261107043122.25650-1-songmuchun@bytedance.com> References: <20261107043122.25650-1-songmuchun@bytedance.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Whether the optimized mapping can be used is now decided in the architecture-specific vmemmap_populate() path. When PowerPC has to fall back, such as on Hash MMU, it can disable optimization for the populated vmemmap range there. Add section_vmemmap_optimization_disable() to centralize this fallback, use it in the Hash MMU path, and drop the radix-specific vmemmap_can_optimize() override. Signed-off-by: Muchun Song --- v3: - Move section_vmemmap_optimization_disable() to mm/sparse-vmemmap.c to avoid the LoongArch header dependency (reported by Sashiko) v2: - Add section_vmemmap_optimization_disable() for architecture fallbacks - Use the helper for the PowerPC Hash MMU path - Include vmemmap-optimization.h directly (reported by Sashiko) --- arch/powerpc/include/asm/book3s/64/radix.h | 5 ----- arch/powerpc/mm/book3s64/radix_pgtable.c | 10 ---------- arch/powerpc/mm/init_64.c | 2 ++ include/linux/vmemmap-optimization.h | 6 ++++++ mm/sparse-vmemmap.c | 17 +++++++++++++++++ 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/arch/powerpc/include/asm/book3s/64/radix.h b/arch/powerpc/include/asm/book3s/64/radix.h index 8452a2714cb1..df67209b0c5b 100644 --- a/arch/powerpc/include/asm/book3s/64/radix.h +++ b/arch/powerpc/include/asm/book3s/64/radix.h @@ -351,10 +351,5 @@ int radix__create_section_mapping(unsigned long start, unsigned long end, int nid, pgprot_t prot); int radix__remove_section_mapping(unsigned long start, unsigned long end); #endif /* CONFIG_MEMORY_HOTPLUG */ - -#ifdef CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP -#define vmemmap_can_optimize vmemmap_can_optimize -bool vmemmap_can_optimize(struct vmem_altmap *altmap, struct dev_pagemap *pgmap); -#endif #endif /* __ASSEMBLER__ */ #endif diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c index 2924604fbb38..63f369d296b4 100644 --- a/arch/powerpc/mm/book3s64/radix_pgtable.c +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c @@ -978,16 +978,6 @@ int __meminit radix__vmemmap_create_mapping(unsigned long start, return 0; } -#ifdef CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP -bool vmemmap_can_optimize(struct vmem_altmap *altmap, struct dev_pagemap *pgmap) -{ - if (radix_enabled()) - return __vmemmap_can_optimize(altmap, pgmap); - - return false; -} -#endif - int __meminit vmemmap_check_pmd(pmd_t *pmdp, int node, unsigned long addr, unsigned long next) { diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index 0e777d7dc332..7329fcacdaf4 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -281,6 +282,7 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, if (radix_enabled()) return radix__vmemmap_populate(start, end, node, altmap); #endif + section_vmemmap_optimization_disable(start, end); return __vmemmap_populate(start, end, node, altmap); } diff --git a/include/linux/vmemmap-optimization.h b/include/linux/vmemmap-optimization.h index 858311a71b0c..22e5a322be0b 100644 --- a/include/linux/vmemmap-optimization.h +++ b/include/linux/vmemmap-optimization.h @@ -63,6 +63,7 @@ static inline unsigned int pfn_to_section_compound_order(unsigned long pfn) } struct page *vmemmap_shared_tail_page(unsigned int order, struct zone *zone); +void section_vmemmap_optimization_disable(unsigned long start, unsigned long end); #else static inline unsigned int section_compound_order(const struct mem_section *section) { @@ -79,6 +80,11 @@ static inline void section_set_compound_order_range(unsigned long pfn, { } +static inline void section_vmemmap_optimization_disable(unsigned long start, + unsigned long end) +{ +} + static inline unsigned int pfn_to_section_compound_order(unsigned long pfn) { return 0; diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index b8b55e12f5ba..57aa5c2d8034 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -232,6 +232,23 @@ struct page __ref *vmemmap_shared_tail_page(unsigned int order, struct zone *zon return page; } + +void __meminit section_vmemmap_optimization_disable(unsigned long start, + unsigned long end) +{ + unsigned long pfn = page_to_pfn((struct page *)start); + unsigned long nr_pages = (end - start) / sizeof(struct page); + struct mem_section *section = __pfn_to_section(pfn); + + if (nr_pages < PAGES_PER_SECTION) { + VM_WARN_ON_ONCE(section_vmemmap_optimizable(section)); + return; + } + + VM_WARN_ON_ONCE(!IS_ALIGNED(pfn, PAGES_PER_SECTION)); + VM_WARN_ON_ONCE(nr_pages != PAGES_PER_SECTION); + section_set_compound_order(section, 0); +} #endif static __meminit void *vmemmap_alloc_pte(unsigned long pfn, int node, -- 2.54.0