Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

execmem: add fallback for failures in vmalloc(VM_ALLOW_HUGE_VMAP)

When execmem populates ROX cache it uses vmalloc(VM_ALLOW_HUGE_VMAP).
Although vmalloc falls back to allocating base pages if high order
allocation fails, it may happen that it still cannot allocate enough
memory.

Right now ROX cache is only used by modules and in majority of cases the
allocations happen at boot time when there's plenty of free memory, but
upcoming enabling ROX cache for ftrace and kprobes would mean that execmem
allocations can happen when the system is under memory pressure and a
failure to allocate large page worth of memory becomes more likely.

Fallback to regular vmalloc() if vmalloc(VM_ALLOW_HUGE_VMAP) fails.

Link: https://lkml.kernel.org/r/20250713071730.4117334-6-rppt@kernel.org
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Daniel Gomez <da.gomez@samsung.com>
Cc: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Cc: Petr Pavlu <petr.pavlu@suse.com>
Cc: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Mike Rapoport (Microsoft) and committed by
Andrew Morton
3bd4e0ac 888b5a84

+6 -1
+6 -1
mm/execmem.c
··· 291 291 292 292 alloc_size = round_up(size, PMD_SIZE); 293 293 p = execmem_vmalloc(range, alloc_size, PAGE_KERNEL, vm_flags); 294 + if (!p) { 295 + alloc_size = size; 296 + p = execmem_vmalloc(range, alloc_size, PAGE_KERNEL, vm_flags); 297 + } 298 + 294 299 if (!p) 295 300 return err; 296 301 ··· 467 462 bool use_cache = range->flags & EXECMEM_ROX_CACHE; 468 463 vm_flags_t vm_flags = VM_FLUSH_RESET_PERMS; 469 464 pgprot_t pgprot = range->pgprot; 470 - void *p; 465 + void *p = NULL; 471 466 472 467 size = PAGE_ALIGN(size); 473 468