mm/vmalloc.c: optimize to reduce arguments of alloc_vmap_area()
Subsystems (2)
PATCH 1/1 mm/vmalloc.c: optimize to reduce arguments of alloc_vmap_area()
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().
Signed-off-by Baoquan He <[email protected]>
Reviewed-by Uladzislau Rezki (Sony) <[email protected]>
---
Note:
- This is made on top of Rulin's below v8 patch:
[PATCH v8] mm/vmalloc: Eliminated the lock contention from twice to once
mm/vmalloc.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
mm/vmalloc.c +12 -8
@@ -1924,8 +1924,7 @@ static struct vmap_area *alloc_vmap_area(unsigned long size,unsigned long align, unsigned long vstart, unsigned long vend, int node, gfp_t gfp_mask, - unsigned long va_flags, struct vm_struct *vm, - unsigned long flags, const void *caller) + unsigned long va_flags, struct vm_struct *vm) { struct vmap_node *vn;struct vmap_area *va;
@@ -1988,8 +1987,11 @@ static struct vmap_area *alloc_vmap_area(unsigned long size, va->vm =NULL ; va->flags = (va_flags | vn_id); -if (vm) -setup_vmalloc_vm (vm, va, flags, caller); +if (vm) { + vm->addr = (void *)va->va_start; + vm->size = va->va_end - va->va_start; + va->vm = vm; + } vn =addr_to_node (va->va_start);
@@ -2565,8 +2567,7 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask) va =alloc_vmap_area (VMAP_BLOCK_SIZE ,VMAP_BLOCK_SIZE ,VMALLOC_START ,VMALLOC_END , node, gfp_mask, -VMAP_RAM |VMAP_BLOCK ,NULL , -0 ,NULL ); +VMAP_RAM |VMAP_BLOCK ,NULL );if (IS_ERR (va)) {kfree (vb);return ERR_CAST (va);
@@ -2924,7 +2925,7 @@ void *vm_map_ram(struct page **pages, unsigned int count, int node) va =alloc_vmap_area (size,PAGE_SIZE ,VMALLOC_START ,VMALLOC_END , node,GFP_KERNEL ,VMAP_RAM , -NULL ,0 ,NULL ); +NULL );if (IS_ERR (va))return NULL ;
@@ -3063,7 +3064,10 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,if (!(flags &VM_NO_GUARD )) 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)) {kfree (area);return NULL ;
Signature · 1 line
2.41.0