Commit bc84c535 authored by Roman Penyaev's avatar Roman Penyaev Committed by Linus Torvalds

mm/vmalloc: pass VM_USERMAP flags directly to __vmalloc_node_range()

vmalloc_user*() calls differ from normal vmalloc() only in that they set
VM_USERMAP flags for the area.  During the whole history of vmalloc.c
changes now it is possible simply to pass VM_USERMAP flags directly to
__vmalloc_node_range() call instead of finding the area (which obviously
takes time) after the allocation.

Link: http://lkml.kernel.org/r/20190103145954.16942-4-rpenyaev@suse.deSigned-off-by: default avatarRoman Penyaev <rpenyaev@suse.de>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Joe Perches <joe@perches.com>
Cc: "Luis R. Rodriguez" <mcgrof@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c67dc624
...@@ -1865,18 +1865,10 @@ EXPORT_SYMBOL(vzalloc); ...@@ -1865,18 +1865,10 @@ EXPORT_SYMBOL(vzalloc);
*/ */
void *vmalloc_user(unsigned long size) void *vmalloc_user(unsigned long size)
{ {
struct vm_struct *area; return __vmalloc_node_range(size, SHMLBA, VMALLOC_START, VMALLOC_END,
void *ret; GFP_KERNEL | __GFP_ZERO, PAGE_KERNEL,
VM_USERMAP, NUMA_NO_NODE,
ret = __vmalloc_node(size, SHMLBA, __builtin_return_address(0));
GFP_KERNEL | __GFP_ZERO,
PAGE_KERNEL, NUMA_NO_NODE,
__builtin_return_address(0));
if (ret) {
area = find_vm_area(ret);
area->flags |= VM_USERMAP;
}
return ret;
} }
EXPORT_SYMBOL(vmalloc_user); EXPORT_SYMBOL(vmalloc_user);
...@@ -1970,17 +1962,10 @@ EXPORT_SYMBOL(vmalloc_32); ...@@ -1970,17 +1962,10 @@ EXPORT_SYMBOL(vmalloc_32);
*/ */
void *vmalloc_32_user(unsigned long size) void *vmalloc_32_user(unsigned long size)
{ {
struct vm_struct *area; return __vmalloc_node_range(size, SHMLBA, VMALLOC_START, VMALLOC_END,
void *ret; GFP_VMALLOC32 | __GFP_ZERO, PAGE_KERNEL,
VM_USERMAP, NUMA_NO_NODE,
ret = __vmalloc_node(size, SHMLBA, GFP_VMALLOC32 | __GFP_ZERO, __builtin_return_address(0));
PAGE_KERNEL, NUMA_NO_NODE,
__builtin_return_address(0));
if (ret) {
area = find_vm_area(ret);
area->flags |= VM_USERMAP;
}
return ret;
} }
EXPORT_SYMBOL(vmalloc_32_user); EXPORT_SYMBOL(vmalloc_32_user);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment