On Thu 03-01-19 15:59:54, Roman Penyaev wrote:
> 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.
Yes, this looks correct and a nice cleanup
> Signed-off-by: Roman Penyaev <rpenyaev@xxxxxxx>
> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Cc: Michal Hocko <mhocko@xxxxxxxx>
> Cc: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx>
> Cc: Joe Perches <joe@xxxxxxxxxxx>
> Cc: "Luis R. Rodriguez" <mcgrof@xxxxxxxxxx>
> Cc: linux-mm@xxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
> ---
> mm/vmalloc.c | 30 ++++++++----------------------
> 1 file changed, 8 insertions(+), 22 deletions(-)
>
> diff --git a/mm/vmalloc.c b/mm/vmalloc.c
> index dc6a62bca503..83fa4c642f5e 100644
> --- a/mm/vmalloc.c
> +++ b/mm/vmalloc.c
> @@ -1865,18 +1865,10 @@ EXPORT_SYMBOL(vzalloc);
> */
> void *vmalloc_user(unsigned long size)
> {
> - struct vm_struct *area;
> - void *ret;
> -
> - ret = __vmalloc_node(size, SHMLBA,
> - 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;
> + return __vmalloc_node_range(size, SHMLBA, VMALLOC_START, VMALLOC_END,
> + GFP_KERNEL | __GFP_ZERO, PAGE_KERNEL,
> + VM_USERMAP, NUMA_NO_NODE,
> + __builtin_return_address(0));
> }
> EXPORT_SYMBOL(vmalloc_user);
>
> @@ -1970,16 +1962,10 @@ EXPORT_SYMBOL(vmalloc_32);
> */
> void *vmalloc_32_user(unsigned long size)
> {
> - struct vm_struct *area;
> - void *ret;
> -
> - ret = __vmalloc_node(size, 1, GFP_VMALLOC32 | __GFP_ZERO, PAGE_KERNEL,
> - NUMA_NO_NODE, __builtin_return_address(0));
> - if (ret) {
> - area = find_vm_area(ret);
> - area->flags |= VM_USERMAP;
> - }
> - return ret;
> + return __vmalloc_node_range(size, 1, VMALLOC_START, VMALLOC_END,
> + GFP_VMALLOC32 | __GFP_ZERO, PAGE_KERNEL,
> + VM_USERMAP, NUMA_NO_NODE,
> + __builtin_return_address(0));
> }
> EXPORT_SYMBOL(vmalloc_32_user);
>
> --
> 2.19.1
--
Michal Hocko
SUSE Labs
