[merged,mm-stable] mm-vmalloc-dont-account-for-number-of-nodes-for-huge_vmap-allocations.patch removed from -mm tree

Commit Message

Andrew Morton Nov. 6, 2024, 1 a.m. UTC

The quilt patch titled
     Subject: mm: vmalloc: don't account for number of nodes for HUGE_VMAP allocations
has been removed from the -mm tree.  Its filename was
     mm-vmalloc-dont-account-for-number-of-nodes-for-huge_vmap-allocations.patch

This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: "Mike Rapoport (Microsoft)" <[e-mail]>
Subject: mm: vmalloc: don't account for number of nodes for HUGE_VMAP allocations
Date: Wed, 23 Oct 2024 19:27:05 +0300

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/[e-mail]
Signed-off-by: Mike Rapoport (Microsoft) <[e-mail]>
Reviewed-by: Christoph Hellwig <[e-mail]>
Reviewed-by: Uladzislau Rezki (Sony) <[e-mail]>
Reviewed-by: Luis Chamberlain <[e-mail]>
Tested-by: kdevops <[e-mail]>
Cc: Andreas Larsson <[e-mail]>
Cc: Andy Lutomirski <[e-mail]>
Cc: Ard Biesheuvel <[e-mail]>
Cc: Arnd Bergmann <[e-mail]>
Cc: Borislav Petkov (AMD) <[e-mail]>
Cc: Brian Cain <[e-mail]>
Cc: Catalin Marinas <[e-mail]>
Cc: Christophe Leroy <[e-mail]>
Cc: Dave Hansen <[e-mail]>
Cc: Dinh Nguyen <[e-mail]>
Cc: Geert Uytterhoeven <[e-mail]>
Cc: Guo Ren <[e-mail]>
Cc: Helge Deller <[e-mail]>
Cc: Huacai Chen <[e-mail]>
Cc: Ingo Molnar <[e-mail]>
Cc: Johannes Berg <[e-mail]>
Cc: John Paul Adrian Glaubitz <[e-mail]>
Cc: Kent Overstreet <[e-mail]>
Cc: Liam R. Howlett <[e-mail]>
Cc: Mark Rutland <[e-mail]>
Cc: Masami Hiramatsu (Google) <[e-mail]>
Cc: Matt Turner <[e-mail]>
Cc: Max Filippov <[e-mail]>
Cc: Michael Ellerman <[e-mail]>
Cc: Michal Simek <[e-mail]>
Cc: Oleg Nesterov <[e-mail]>
Cc: Palmer Dabbelt <[e-mail]>
Cc: Peter Zijlstra <[e-mail]>
Cc: Richard Weinberger <[e-mail]>
Cc: Russell King <[e-mail]>
Cc: Song Liu <[e-mail]>
Cc: Stafford Horne <[e-mail]>
Cc: Steven Rostedt (Google) <[e-mail]>
Cc: Suren Baghdasaryan <[e-mail]>
Cc: Thomas Bogendoerfer <[e-mail]>
Cc: Thomas Gleixner <[e-mail]>
Cc: Vineet Gupta <[e-mail]>
Cc: Will Deacon <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 mm/vmalloc.c |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

Patch

--- a/mm/vmalloc.c~mm-vmalloc-dont-account-for-number-of-nodes-for-huge_vmap-allocations
+++ a/mm/vmalloc.c
@@ -3779,8 +3779,6 @@  void *__vmalloc_node_range_noprof(unsign
 	}
 
 	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
@@ -3788,13 +3786,10 @@  void *__vmalloc_node_range_noprof(unsign
 		 * 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);