Skip to content

Commit f017899

Browse files
committed
mm: vmalloc: don't account for number of nodes for HUGE_VMAP allocations
jira LE-4694 Rebuild_History Non-Buildable kernel-6.12.0-55.43.1.el10_0 commit-author Mike Rapoport (Microsoft) <[email protected]> commit c82be0b 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. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Mike Rapoport (Microsoft) <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: Uladzislau Rezki (Sony) <[email protected]> Reviewed-by: Luis Chamberlain <[email protected]> Tested-by: kdevops <[email protected]> Cc: Andreas Larsson <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Ard Biesheuvel <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Borislav Petkov (AMD) <[email protected]> Cc: Brian Cain <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: Christophe Leroy <[email protected]> Cc: Dave Hansen <[email protected]> Cc: Dinh Nguyen <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: Guo Ren <[email protected]> Cc: Helge Deller <[email protected]> Cc: Huacai Chen <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Johannes Berg <[email protected]> Cc: John Paul Adrian Glaubitz <[email protected]> Cc: Kent Overstreet <[email protected]> Cc: Liam R. Howlett <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Masami Hiramatsu (Google) <[email protected]> Cc: Matt Turner <[email protected]> Cc: Max Filippov <[email protected]> Cc: Michael Ellerman <[email protected]> Cc: Michal Simek <[email protected]> Cc: Oleg Nesterov <[email protected]> Cc: Palmer Dabbelt <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Richard Weinberger <[email protected]> Cc: Russell King <[email protected]> Cc: Song Liu <[email protected]> Cc: Stafford Horne <[email protected]> Cc: Steven Rostedt (Google) <[email protected]> Cc: Suren Baghdasaryan <[email protected]> Cc: Thomas Bogendoerfer <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Vineet Gupta <[email protected]> Cc: Will Deacon <[email protected]> Signed-off-by: Andrew Morton <[email protected]> (cherry picked from commit c82be0b) Signed-off-by: Jonathan Maple <[email protected]>
1 parent 1e03304 commit f017899

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

mm/vmalloc.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3779,22 +3779,17 @@ void *__vmalloc_node_range_noprof(unsigned long size, unsigned long align,
37793779
}
37803780

37813781
if (vmap_allow_huge && (vm_flags & VM_ALLOW_HUGE_VMAP)) {
3782-
unsigned long size_per_node;
3783-
37843782
/*
37853783
* Try huge pages. Only try for PAGE_KERNEL allocations,
37863784
* others like modules don't yet expect huge pages in
37873785
* their allocations due to apply_to_page_range not
37883786
* supporting them.
37893787
*/
37903788

3791-
size_per_node = size;
3792-
if (node == NUMA_NO_NODE)
3793-
size_per_node /= num_online_nodes();
3794-
if (arch_vmap_pmd_supported(prot) && size_per_node >= PMD_SIZE)
3789+
if (arch_vmap_pmd_supported(prot) && size >= PMD_SIZE)
37953790
shift = PMD_SHIFT;
37963791
else
3797-
shift = arch_vmap_pte_supported_shift(size_per_node);
3792+
shift = arch_vmap_pte_supported_shift(size);
37983793

37993794
align = max(real_align, 1UL << shift);
38003795
size = ALIGN(real_size, 1UL << shift);

0 commit comments

Comments
 (0)