Commit f6bec26c authored by Mike Rapoport (IBM)'s avatar Mike Rapoport (IBM) Committed by Luis Chamberlain
Browse files

mm/execmem, arch: convert simple overrides of module_alloc to execmem 



Several architectures override module_alloc() only to define address
range for code allocations different than VMALLOC address space.

Provide a generic implementation in execmem that uses the parameters for
address space ranges, required alignment and page protections provided
by architectures.

The architectures must fill execmem_info structure and implement
execmem_arch_setup() that returns a pointer to that structure. This way the
execmem initialization won't be called from every architecture, but rather
from a central place, namely a core_initcall() in execmem.

The execmem provides execmem_alloc() API that wraps __vmalloc_node_range()
with the parameters defined by the architectures.  If an architecture does
not implement execmem_arch_setup(), execmem_alloc() will fall back to
module_alloc().

Signed-off-by: default avatarMike Rapoport (IBM) <rppt@kernel.org>
Acked-by: default avatarSong Liu <song@kernel.org>
Reviewed-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent 12af2b83

arch/loongarch/kernel/module.c

+16 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/ftrace.h>

#include <linux/string.h>

#include <linux/kernel.h>

#include <linux/execmem.h>

#include <asm/alternative.h>

#include <asm/inst.h>

#include <asm/unwind.h>
@@ -490,10 +491,22 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, 
	return 0;

}



void *module_alloc(unsigned long size)

static struct execmem_info execmem_info __ro_after_init;



struct execmem_info __init *execmem_arch_setup(void)

{

	return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,

			GFP_KERNEL, PAGE_KERNEL, 0, NUMA_NO_NODE, __builtin_return_address(0));

	execmem_info = (struct execmem_info){

		.ranges = {

			[EXECMEM_DEFAULT] = {

				.start	= MODULES_VADDR,

				.end	= MODULES_END,

				.pgprot	= PAGE_KERNEL,

				.alignment = 1,

			},

		},

	};



	return &execmem_info;

}



static void module_init_ftrace_plt(const Elf_Ehdr *hdr,

arch/mips/kernel/module.c

+16 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/kernel.h>

#include <linux/spinlock.h>

#include <linux/jump_label.h>

#include <linux/execmem.h>

#include <asm/jump_label.h>



struct mips_hi16 {
@@ -32,11 +33,22 @@ static LIST_HEAD(dbe_list); 
static DEFINE_SPINLOCK(dbe_lock);



#ifdef MODULES_VADDR

void *module_alloc(unsigned long size)

static struct execmem_info execmem_info __ro_after_init;



struct execmem_info __init *execmem_arch_setup(void)

{

	return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,

				GFP_KERNEL, PAGE_KERNEL, 0, NUMA_NO_NODE,

				__builtin_return_address(0));

	execmem_info = (struct execmem_info){

		.ranges = {

			[EXECMEM_DEFAULT] = {

				.start	= MODULES_VADDR,

				.end	= MODULES_END,

				.pgprot	= PAGE_KERNEL,

				.alignment = 1,

			},

		},

	};



	return &execmem_info;

}

#endif

arch/nios2/kernel/module.c

+16 −5
Original line number Diff line number Diff line
@@ -18,15 +18,26 @@ 
#include <linux/fs.h>

#include <linux/string.h>

#include <linux/kernel.h>

#include <linux/execmem.h>



#include <asm/cacheflush.h>



void *module_alloc(unsigned long size)

static struct execmem_info execmem_info __ro_after_init;



struct execmem_info __init *execmem_arch_setup(void)

{

	return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,

				    GFP_KERNEL, PAGE_KERNEL_EXEC,

				    VM_FLUSH_RESET_PERMS, NUMA_NO_NODE,

				    __builtin_return_address(0));

	execmem_info = (struct execmem_info){

		.ranges = {

			[EXECMEM_DEFAULT] = {

				.start	= MODULES_VADDR,

				.end	= MODULES_END,

				.pgprot	= PAGE_KERNEL_EXEC,

				.alignment = 1,

			},

		},

	};



	return &execmem_info;

}



int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,

arch/parisc/kernel/module.c

+16 −8
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <linux/bug.h>

#include <linux/mm.h>

#include <linux/slab.h>

#include <linux/execmem.h>



#include <asm/unwind.h>

#include <asm/sections.h>
@@ -173,15 +174,22 @@ static inline int reassemble_22(int as22) 
		((as22 & 0x0003ff) << 3));

}



void *module_alloc(unsigned long size)

static struct execmem_info execmem_info __ro_after_init;



struct execmem_info __init *execmem_arch_setup(void)

{

	/* using RWX means less protection for modules, but it's

	 * easier than trying to map the text, data, init_text and

	 * init_data correctly */

	return __vmalloc_node_range(size, 1, VMALLOC_START, VMALLOC_END,

				    GFP_KERNEL,

				    PAGE_KERNEL_RWX, 0, NUMA_NO_NODE,

				    __builtin_return_address(0));

	execmem_info = (struct execmem_info){

		.ranges = {

			[EXECMEM_DEFAULT] = {

				.start	= VMALLOC_START,

				.end	= VMALLOC_END,

				.pgprot	= PAGE_KERNEL_RWX,

				.alignment = 1,

			},

		},

	};



	return &execmem_info;

}



#ifndef CONFIG_64BIT

arch/riscv/kernel/module.c

+17 −7
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/vmalloc.h>

#include <linux/sizes.h>

#include <linux/pgtable.h>

#include <linux/execmem.h>

#include <asm/alternative.h>

#include <asm/sections.h>
@@ -906,13 +907,22 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, 
}



#if defined(CONFIG_MMU) && defined(CONFIG_64BIT)

void *module_alloc(unsigned long size)

{

	return __vmalloc_node_range(size, 1, MODULES_VADDR,

				    MODULES_END, GFP_KERNEL,

				    PAGE_KERNEL, VM_FLUSH_RESET_PERMS,

				    NUMA_NO_NODE,

				    __builtin_return_address(0));

static struct execmem_info execmem_info __ro_after_init;



struct execmem_info __init *execmem_arch_setup(void)

{

	execmem_info = (struct execmem_info){

		.ranges = {

			[EXECMEM_DEFAULT] = {

				.start	= MODULES_VADDR,

				.end	= MODULES_END,

				.pgprot	= PAGE_KERNEL,

				.alignment = 1,

			},

		},

	};



	return &execmem_info;

}

#endif