Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 14:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

mm/vmalloc.c: optimize to reduce arguments of alloc_vmap_area()

Browse Source 
If called by __get_vm_area_node(), by open coding the field assignments of
'struct vm_struct *vm', and move the vm->flags and vm->caller assignments
into __get_vm_area_node(), the passed in arguments 'flags' and 'caller'
can be removed.

This alleviates overloaded arguments passed in for alloc_vmap_area().

Link: https://lkml.kernel.org/r/20240309044454.648888-1-bhe@redhat.com
Signed-off-by: Baoquan He <bhe@redhat.com>
Reviewed-by: Uladzislau Rezki (Sony) <urezki@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Baoquan He 2024-03-09 12:44:54 +08:00 committed by Andrew Morton
parent 5c46d5319b
commit 4b68a773a7
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mm/vmalloc.c
View File

@ -1944,8 +1944,7 @@ static struct vmap_area *alloc_vmap_area(unsigned long size,
unsigned long align, unsigned long align,
unsigned long vstart, unsigned long vend, unsigned long vstart, unsigned long vend,
int node, gfp_t gfp_mask, int node, gfp_t gfp_mask,
unsigned long va_flags, struct vm_struct *vm, unsigned long va_flags, struct vm_struct *vm)
unsigned long flags, const void *caller)
{ {
struct vmap_node *vn; struct vmap_node *vn;
struct vmap_area *va; struct vmap_area *va;
@ -2008,8 +2007,11 @@ retry:
va->vm = NULL; va->vm = NULL;
va->flags = (va_flags | vn_id); va->flags = (va_flags | vn_id);
if (vm) if (vm) {
setup_vmalloc_vm(vm, va, flags, caller); vm->addr = (void *)va->va_start;
vm->size = va->va_end - va->va_start;
va->vm = vm;
}
vn = addr_to_node(va->va_start); vn = addr_to_node(va->va_start);
@ -2588,8 +2590,7 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)
va = alloc_vmap_area(VMAP_BLOCK_SIZE, VMAP_BLOCK_SIZE, va = alloc_vmap_area(VMAP_BLOCK_SIZE, VMAP_BLOCK_SIZE,
VMALLOC_START, VMALLOC_END, VMALLOC_START, VMALLOC_END,
node, gfp_mask, node, gfp_mask,
VMAP_RAM|VMAP_BLOCK, NULL, VMAP_RAM|VMAP_BLOCK, NULL);
0, NULL);
if (IS_ERR(va)) { if (IS_ERR(va)) {
kfree(vb); kfree(vb);
return ERR_CAST(va); return ERR_CAST(va);
@ -2947,7 +2948,7 @@ void *vm_map_ram(struct page **pages, unsigned int count, int node)
va = alloc_vmap_area(size, PAGE_SIZE, va = alloc_vmap_area(size, PAGE_SIZE,
VMALLOC_START, VMALLOC_END, VMALLOC_START, VMALLOC_END,
node, GFP_KERNEL, VMAP_RAM, node, GFP_KERNEL, VMAP_RAM,
NULL, 0, NULL); NULL);
if (IS_ERR(va)) if (IS_ERR(va))
return NULL; return NULL;
@ -3086,7 +3087,10 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
if (!(flags & VM_NO_GUARD)) if (!(flags & VM_NO_GUARD))
size += PAGE_SIZE; size += PAGE_SIZE;
va = alloc_vmap_area(size, align, start, end, node, gfp_mask, 0, area, flags, caller); area->flags = flags;
area->caller = caller;
va = alloc_vmap_area(size, align, start, end, node, gfp_mask, 0, area);
if (IS_ERR(va)) { if (IS_ERR(va)) {
kfree(area); kfree(area);
return NULL; return NULL;