Skip to content

Commit

Permalink
module: introduce module_alloc_huge
Browse files Browse the repository at this point in the history
Introduce module_alloc_huge, which allocates huge page backed memory in
module memory space. The primary user of this memory is bpf_prog_pack
(multiple BPF programs sharing a huge page).

Signed-off-by: Song Liu <song@kernel.org>
  • Loading branch information
liu-song-6 authored and intel-lab-lkp committed Apr 22, 2022
1 parent 239fb9c commit 8a0dfde
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 0 deletions.
21 changes: 21 additions & 0 deletions arch/x86/kernel/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,27 @@ void *module_alloc(unsigned long size)
return p;
}

void *module_alloc_huge(unsigned long size)
{
gfp_t gfp_mask = GFP_KERNEL;
void *p;

if (PAGE_ALIGN(size) > MODULES_LEN)
return NULL;

p = __vmalloc_node_range(size, MODULE_ALIGN,
MODULES_VADDR + get_module_load_offset(),
MODULES_END, gfp_mask, PAGE_KERNEL,
VM_DEFER_KMEMLEAK | VM_ALLOW_HUGE_VMAP,
NUMA_NO_NODE, __builtin_return_address(0));
if (p && (kasan_alloc_module_shadow(p, size, gfp_mask) < 0)) {
vfree(p);
return NULL;
}

return p;
}

#ifdef CONFIG_X86_32
int apply_relocate(Elf32_Shdr *sechdrs,
const char *strtab,
Expand Down
5 changes: 5 additions & 0 deletions include/linux/moduleloader.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
sections. Returns NULL on failure. */
void *module_alloc(unsigned long size);

/* Allocator used for allocating memory in module memory space. If size is
* greater than PMD_SIZE, allow using huge pages. Returns NULL on failure.
*/
void *module_alloc_huge(unsigned long size);

/* Free memory returned from module_alloc. */
void module_memfree(void *module_region);

Expand Down
8 changes: 8 additions & 0 deletions kernel/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -2839,6 +2839,14 @@ void * __weak module_alloc(unsigned long size)
NUMA_NO_NODE, __builtin_return_address(0));
}

void * __weak module_alloc_huge(unsigned long size)
{
return __vmalloc_node_range(size, 1, VMALLOC_START, VMALLOC_END,
GFP_KERNEL, PAGE_KERNEL_EXEC,
VM_FLUSH_RESET_PERMS | VM_ALLOW_HUGE_VMAP,
NUMA_NO_NODE, __builtin_return_address(0));
}

bool __weak module_init_section(const char *name)
{
return strstarts(name, ".init");
Expand Down

0 comments on commit 8a0dfde

Please sign in to comment.