From: Mike Rapoport <rppt@kernel•org>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Andreas Larsson <andreas@gaisler•com>,
Andy Lutomirski <luto@kernel•org>,
Ard Biesheuvel <ardb@kernel•org>, Arnd Bergmann <arnd@arndb•de>,
Borislav Petkov <bp@alien8•de>, Brian Cain <bcain@quicinc•com>,
Catalin Marinas <catalin.marinas@arm•com>,
Christoph Hellwig <hch@infradead•org>,
Christophe Leroy <christophe.leroy@csgroup•eu>,
Dave Hansen <dave.hansen@linux•intel.com>,
Dinh Nguyen <dinguyen@kernel•org>,
Geert Uytterhoeven <geert@linux-m68k•org>,
Guo Ren <guoren@kernel•org>, Helge Deller <deller@gmx•de>,
Huacai Chen <chenhuacai@kernel•org>,
Ingo Molnar <mingo@redhat•com>,
Johannes Berg <johannes@sipsolutions•net>,
John Paul Adrian Glaubitz <glaubitz@physik•fu-berlin.de>,
Kent Overstreet <kent.overstreet@linux•dev>,
"Liam R. Howlett" <Liam.Howlett@oracle•com>,
Luis Chamberlain <mcgrof@kernel•org>,
Mark Rutland <mark.rutland@arm•com>,
Masami Hiramatsu <mhiramat@kernel•org>,
Matt Turner <mattst88@gmail•com>,
Max Filippov <jcmvbkbc@gmail•com>,
Michael Ellerman <mpe@ellerman•id.au>,
Michal Simek <monstr@monstr•eu>, Mike Rapoport <rppt@kernel•org>,
Oleg Nesterov <oleg@redhat•com>,
Palmer Dabbelt <palmer@dabbelt•com>,
Peter Zijlstra <peterz@infradead•org>,
Richard Weinberger <richard@nod•at>,
Russell King <linux@armlinux•org.uk>, Song Liu <song@kernel•org>,
Stafford Horne <shorne@gmail•com>,
Steven Rostedt <rostedt@goodmis•org>,
Thomas Bogendoerfer <tsbogend@alpha•franken.de>,
Thomas Gleixner <tglx@linutronix•de>,
Uladzislau Rezki <urezki@gmail•com>,
Vineet Gupta <vgupta@kernel•org>, Will Deacon <will@kernel•org>,
bpf@vger•kernel.org, linux-alpha@vger•kernel.org,
linux-arch@vger•kernel.org, linux-arm-kernel@lists•infradead.org,
linux-csky@vger•kernel.org, linux-hexagon@vger•kernel.org,
linux-kernel@vger•kernel.org, linux-m68k@lists•linux-m68k.org,
linux-mips@vger•kernel.org, linux-mm@kvack•org,
linux-modules@vger•kernel.org, linux-openrisc@vger•kernel.org,
linux-parisc@vger•kernel.org, linux-riscv@lists•infradead.org,
linux-sh@vger•kernel.org, linux-snps-arc@lists•infradead.org,
linux-trace-kernel@vger•kernel.org, linux-um@lists•infradead.org,
linuxppc-dev@lists•ozlabs.org, loongarch@lists•linux.dev,
sparclinux@vger•kernel.org, x86@kernel•org
Subject: [PATCH v4 2/8] mm: vmalloc: don't account for number of nodes for HUGE_VMAP allocations
Date: Mon, 7 Oct 2024 09:28:52 +0300 [thread overview]
Message-ID: <20241007062858.44248-3-rppt@kernel.org> (raw)
In-Reply-To: <20241007062858.44248-1-rppt@kernel.org>
From: "Mike Rapoport (Microsoft)" <rppt@kernel•org>
vmalloc allocations with VM_ALLOW_HUGE_VMAP that do not explicitly
specify node ID will use huge pages only if size_per_node is larger than
a huge page.
Still the actual allocated memory is not distributed between nodes and
there is no advantage in such approach.
On the contrary, BPF allocates SZ_2M * num_possible_nodes() for each
new bpf_prog_pack, while it could do with a single huge page per pack.
Don't account for number of nodes for VM_ALLOW_HUGE_VMAP with
NUMA_NO_NODE and use huge pages whenever the requested allocation size
is larger than a huge page.
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel•org>
---
mm/vmalloc.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 634162271c00..86b2344d7461 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -3763,8 +3763,6 @@ void *__vmalloc_node_range_noprof(unsigned long size, unsigned long align,
}
if (vmap_allow_huge && (vm_flags & VM_ALLOW_HUGE_VMAP)) {
- unsigned long size_per_node;
-
/*
* Try huge pages. Only try for PAGE_KERNEL allocations,
* others like modules don't yet expect huge pages in
@@ -3772,13 +3770,10 @@ void *__vmalloc_node_range_noprof(unsigned long size, unsigned long align,
* supporting them.
*/
- size_per_node = size;
- if (node == NUMA_NO_NODE)
- size_per_node /= num_online_nodes();
- if (arch_vmap_pmd_supported(prot) && size_per_node >= PMD_SIZE)
+ if (arch_vmap_pmd_supported(prot) && size >= PMD_SIZE)
shift = PMD_SHIFT;
else
- shift = arch_vmap_pte_supported_shift(size_per_node);
+ shift = arch_vmap_pte_supported_shift(size);
align = max(real_align, 1UL << shift);
size = ALIGN(real_size, 1UL << shift);
--
2.43.0
next prev parent reply other threads:[~2024-10-07 6:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-07 6:28 [PATCH v4 0/8] x86/module: use large ROX pages for text allocations Mike Rapoport
2024-10-07 6:28 ` [PATCH v4 1/8] mm: vmalloc: group declarations depending on CONFIG_MMU together Mike Rapoport
2024-10-07 6:28 ` Mike Rapoport [this message]
2024-10-07 6:28 ` [PATCH v4 3/8] asm-generic: introduce text-patching.h Mike Rapoport
2024-10-07 6:28 ` [PATCH v4 4/8] module: prepare to handle ROX allocations for text Mike Rapoport
2024-10-07 6:28 ` [PATCH v4 5/8] arch: introduce set_direct_map_valid_noflush() Mike Rapoport
2024-10-08 2:11 ` Huacai Chen
2024-10-08 6:19 ` Mike Rapoport
2024-10-07 6:28 ` [PATCH v4 6/8] x86/module: perpare module loading for ROX allocations of text Mike Rapoport
2024-10-07 6:28 ` [PATCH v4 7/8] execmem: add support for cache of large ROX pages Mike Rapoport
2024-10-07 6:28 ` [PATCH v4 8/8] x86/module: enable ROX caches for module text Mike Rapoport
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=20241007062858.44248-3-rppt@kernel.org \
--to=rppt@kernel$(echo .)org \
--cc=Liam.Howlett@oracle$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=andreas@gaisler$(echo .)com \
--cc=ardb@kernel$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=bcain@quicinc$(echo .)com \
--cc=bp@alien8$(echo .)de \
--cc=bpf@vger$(echo .)kernel.org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=chenhuacai@kernel$(echo .)org \
--cc=christophe.leroy@csgroup$(echo .)eu \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=deller@gmx$(echo .)de \
--cc=dinguyen@kernel$(echo .)org \
--cc=geert@linux-m68k$(echo .)org \
--cc=glaubitz@physik$(echo .)fu-berlin.de \
--cc=guoren@kernel$(echo .)org \
--cc=hch@infradead$(echo .)org \
--cc=jcmvbkbc@gmail$(echo .)com \
--cc=johannes@sipsolutions$(echo .)net \
--cc=kent.overstreet@linux$(echo .)dev \
--cc=linux-alpha@vger$(echo .)kernel.org \
--cc=linux-arch@vger$(echo .)kernel.org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-csky@vger$(echo .)kernel.org \
--cc=linux-hexagon@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-m68k@lists$(echo .)linux-m68k.org \
--cc=linux-mips@vger$(echo .)kernel.org \
--cc=linux-mm@kvack$(echo .)org \
--cc=linux-modules@vger$(echo .)kernel.org \
--cc=linux-openrisc@vger$(echo .)kernel.org \
--cc=linux-parisc@vger$(echo .)kernel.org \
--cc=linux-riscv@lists$(echo .)infradead.org \
--cc=linux-sh@vger$(echo .)kernel.org \
--cc=linux-snps-arc@lists$(echo .)infradead.org \
--cc=linux-trace-kernel@vger$(echo .)kernel.org \
--cc=linux-um@lists$(echo .)infradead.org \
--cc=linux@armlinux$(echo .)org.uk \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=loongarch@lists$(echo .)linux.dev \
--cc=luto@kernel$(echo .)org \
--cc=mark.rutland@arm$(echo .)com \
--cc=mattst88@gmail$(echo .)com \
--cc=mcgrof@kernel$(echo .)org \
--cc=mhiramat@kernel$(echo .)org \
--cc=mingo@redhat$(echo .)com \
--cc=monstr@monstr$(echo .)eu \
--cc=mpe@ellerman$(echo .)id.au \
--cc=oleg@redhat$(echo .)com \
--cc=palmer@dabbelt$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=richard@nod$(echo .)at \
--cc=rostedt@goodmis$(echo .)org \
--cc=shorne@gmail$(echo .)com \
--cc=song@kernel$(echo .)org \
--cc=sparclinux@vger$(echo .)kernel.org \
--cc=tglx@linutronix$(echo .)de \
--cc=tsbogend@alpha$(echo .)franken.de \
--cc=urezki@gmail$(echo .)com \
--cc=vgupta@kernel$(echo .)org \
--cc=will@kernel$(echo .)org \
--cc=x86@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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