Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0a21265 authored by David Rientjes's avatar David Rientjes Committed by Linus Torvalds
Browse files

mm: unify module_alloc code for vmalloc 



Four architectures (arm, mips, sparc, x86) use __vmalloc_area() for
module_init().  Much of the code is duplicated and can be generalized in a
globally accessible function, __vmalloc_node_range().

__vmalloc_node() now calls into __vmalloc_node_range() with a range of
[VMALLOC_START, VMALLOC_END) for functionally equivalent behavior.

Each architecture may then use __vmalloc_node_range() directly to remove
the duplication of code.

Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ec3f64fc

arch/arm/kernel/module.c

+3 −11
Original line number Diff line number Diff line
@@ -38,17 +38,9 @@ 
#ifdef CONFIG_MMU

void *module_alloc(unsigned long size)

{

	struct vm_struct *area;



	size = PAGE_ALIGN(size);

	if (!size)

		return NULL;



	area = __get_vm_area(size, VM_ALLOC, MODULES_VADDR, MODULES_END);

	if (!area)

		return NULL;



	return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL_EXEC);

	return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,

				GFP_KERNEL, PAGE_KERNEL_EXEC, -1,

				__builtin_return_address(0));

}

#else /* CONFIG_MMU */

void *module_alloc(unsigned long size)

arch/mips/kernel/module.c

+3 −11
Original line number Diff line number Diff line
@@ -46,17 +46,9 @@ static DEFINE_SPINLOCK(dbe_lock); 
void *module_alloc(unsigned long size)

{

#ifdef MODULE_START

	struct vm_struct *area;



	size = PAGE_ALIGN(size);

	if (!size)

		return NULL;



	area = __get_vm_area(size, VM_ALLOC, MODULE_START, MODULE_END);

	if (!area)

		return NULL;



	return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);

	return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,

				GFP_KERNEL, PAGE_KERNEL, -1,

				__builtin_return_address(0));

#else

	if (size == 0)

		return NULL;

arch/sparc/kernel/module.c

+4 −10
Original line number Diff line number Diff line
@@ -23,17 +23,11 @@ 


static void *module_map(unsigned long size)

{

	struct vm_struct *area;



	size = PAGE_ALIGN(size);

	if (!size || size > MODULES_LEN)

		return NULL;



	area = __get_vm_area(size, VM_ALLOC, MODULES_VADDR, MODULES_END);

	if (!area)

	if (PAGE_ALIGN(size) > MODULES_LEN)

		return NULL;



	return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);

	return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,

				GFP_KERNEL, PAGE_KERNEL, -1,

				__builtin_return_address(0));

}



static char *dot2underscore(char *name)

arch/x86/kernel/module.c

+4 −13
Original line number Diff line number Diff line
@@ -37,20 +37,11 @@ 


void *module_alloc(unsigned long size)

{

	struct vm_struct *area;



	if (!size)

		return NULL;

	size = PAGE_ALIGN(size);

	if (size > MODULES_LEN)

	if (PAGE_ALIGN(size) > MODULES_LEN)

		return NULL;



	area = __get_vm_area(size, VM_ALLOC, MODULES_VADDR, MODULES_END);

	if (!area)

		return NULL;



	return __vmalloc_area(area, GFP_KERNEL | __GFP_HIGHMEM,

					PAGE_KERNEL_EXEC);

	return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,

				GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,

				-1, __builtin_return_address(0));

}



/* Free memory returned from module_alloc */

include/linux/vmalloc.h

+3 −2
Original line number Diff line number Diff line
@@ -59,8 +59,9 @@ extern void *vmalloc_exec(unsigned long size); 
extern void *vmalloc_32(unsigned long size);

extern void *vmalloc_32_user(unsigned long size);

extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);

extern void *__vmalloc_area(struct vm_struct *area, gfp_t gfp_mask,

				pgprot_t prot);

extern void *__vmalloc_node_range(unsigned long size, unsigned long align,

			unsigned long start, unsigned long end, gfp_t gfp_mask,

			pgprot_t prot, int node, void *caller);

extern void vfree(const void *addr);



extern void *vmap(struct page **pages, unsigned int count,