History

mm: remove vmalloc_user_node_flags

Open code it in __bpf_map_area_alloc, which is the only caller. Also clean up __bpf_map_area_alloc to have a single vmalloc call with slightly different flags instead of the current two different calls. For this to compile for the nommu case add a __vmalloc_node_range stub to nommu.c. [akpm@linux-foundation.org: fix nommu.c build] Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Cc: Christian Borntraeger <borntraeger@de.ibm.com> Cc: Christophe Leroy <christophe.leroy@c-s.fr> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: David Airlie <airlied@linux.ie> Cc: Gao Xiang <xiang@kernel.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: "K. Y. Srinivasan" <kys@microsoft.com> Cc: Laura Abbott <labbott@redhat.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Michael Kelley <mikelley@microsoft.com> Cc: Minchan Kim <minchan@kernel.org> Cc: Nitin Gupta <ngupta@vflare.org> Cc: Robin Murphy <robin.murphy@arm.com> Cc: Sakari Ailus <sakari.ailus@linux.intel.com> Cc: Stephen Hemminger <sthemmin@microsoft.com> Cc: Sumit Semwal <sumit.semwal@linaro.org> Cc: Wei Liu <wei.liu@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Paul Mackerras <paulus@ozlabs.org> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: Will Deacon <will@kernel.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Link: http://lkml.kernel.org/r/20200414131348.444715-27-hch@lst.de Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Christoph Hellwig committed 6 years ago

Commit 041de931 parent c3f896d4 files · +22 −37Browse files

Unified · Split

4 files
  1. include/linux/vmalloc.h +0 −1
  2. kernel/bpf/syscall.c +14 −10
  3. mm/nommu.c +8 −6
  4. mm/vmalloc.c +0 −20
include/linux/vmalloc.h+0−1
@@ -106,7 +106,6 @@ extern void *vzalloc(unsigned long size); · 105 unmodified lines
106106 extern void *vmalloc_user(unsigned long size);
107107 extern void *vmalloc_node(unsigned long size, int node);
108108 extern void *vzalloc_node(unsigned long size, int node);
109−extern void *vmalloc_user_node_flags(unsigned long size, int node, gfp_t flags);
110109 extern void *vmalloc_exec(unsigned long size);
111110 extern void *vmalloc_32(unsigned long size);
112111 extern void *vmalloc_32_user(unsigned long size);
kernel/bpf/syscall.c+14−10
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525 #include <linux/nospec.h>
2626 #include <linux/audit.h>
2727 #include <uapi/linux/btf.h>
28+#include <asm/pgtable.h>
2829 #include <linux/bpf_lsm.h>
2930
3031 #define IS_FD_ARRAY(map) ((map)->map_type == BPF_MAP_TYPE_PERF_EVENT_ARRAY || \
@@ -281,26 +282,29 @@ static void *__bpf_map_area_alloc(u64 size, int numa_node, bool mmapable) · 250 unmodified lines
281282 * __GFP_RETRY_MAYFAIL to avoid such situations.
282283 */
283284
284− const gfp_t flags = __GFP_NOWARN | __GFP_ZERO;
285+ const gfp_t gfp = __GFP_NOWARN | __GFP_ZERO;
286+ unsigned int flags = 0;
287+ unsigned long align = 1;
285288 void *area;
286289
287290 if (size >= SIZE_MAX)
288291 return NULL;
289292
290293 /* kmalloc()'ed memory can't be mmap()'ed */
291− if (!mmapable && size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER)) {
292− area = kmalloc_node(size, GFP_USER | __GFP_NORETRY | flags,
294+ if (mmapable) {
295+ BUG_ON(!PAGE_ALIGNED(size));
296+ align = SHMLBA;
297+ flags = VM_USERMAP;
298+ } else if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER)) {
299+ area = kmalloc_node(size, gfp | GFP_USER | __GFP_NORETRY,
293300 numa_node);
294301 if (area != NULL)
295302 return area;
296303 }
297− if (mmapable) {
298− BUG_ON(!PAGE_ALIGNED(size));
299− return vmalloc_user_node_flags(size, numa_node, GFP_KERNEL |
300− __GFP_RETRY_MAYFAIL | flags);
301− }
302− return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_RETRY_MAYFAIL | flags,
303− numa_node, __builtin_return_address(0));
304+
305+ return __vmalloc_node_range(size, align, VMALLOC_START, VMALLOC_END,
306+ gfp | GFP_KERNEL | __GFP_RETRY_MAYFAIL, PAGE_KERNEL,
307+ flags, numa_node, __builtin_return_address(0));
304308 }
305309
306310 void *bpf_map_area_alloc(u64 size, int numa_node)
mm/nommu.c+8−6
@@ -150,6 +150,14 @@ void *__vmalloc(unsigned long size, gfp_t gfp_mask) · 149 unmodified lines
150150 }
151151 EXPORT_SYMBOL(__vmalloc);
152152
153+void *__vmalloc_node_range(unsigned long size, unsigned long align,
154+ unsigned long start, unsigned long end, gfp_t gfp_mask,
155+ pgprot_t prot, unsigned long vm_flags, int node,
156+ const void *caller)
157+{
158+ return __vmalloc(size, gfp_mask);
159+}
160+
153161 void *__vmalloc_node(unsigned long size, unsigned long align, gfp_t gfp_mask,
154162 int node, const void *caller)
155163 {
@@ -180,12 +188,6 @@ void *vmalloc_user(unsigned long size) · 24 unmodified lines
180188 }
181189 EXPORT_SYMBOL(vmalloc_user);
182190
183−void *vmalloc_user_node_flags(unsigned long size, int node, gfp_t flags)
184−{
185− return __vmalloc_user_flags(size, flags | __GFP_ZERO);
186−}
187−EXPORT_SYMBOL(vmalloc_user_node_flags);
188−
189191 struct page *vmalloc_to_page(const void *addr)
190192 {
191193 return virt_to_page(addr);
mm/vmalloc.c+0−20
@@ -2659,26 +2659,6 @@ void *vzalloc_node(unsigned long size, int node) · 2658 unmodified lines
26592659 }
26602660 EXPORT_SYMBOL(vzalloc_node);
26612661
2662−/**
2663− * vmalloc_user_node_flags - allocate memory for userspace on a specific node
2664− * @size: allocation size
2665− * @node: numa node
2666− * @flags: flags for the page level allocator
2667− *
2668− * The resulting memory area is zeroed so it can be mapped to userspace
2669− * without leaking data.
2670− *
2671− * Return: pointer to the allocated memory or %NULL on error
2672− */
2673−void *vmalloc_user_node_flags(unsigned long size, int node, gfp_t flags)
2674−{
2675− return __vmalloc_node_range(size, SHMLBA, VMALLOC_START, VMALLOC_END,
2676− flags | __GFP_ZERO, PAGE_KERNEL,
2677− VM_USERMAP, node,
2678− __builtin_return_address(0));
2679−}
2680−EXPORT_SYMBOL(vmalloc_user_node_flags);
2681−
26822662 /**
26832663 * vmalloc_exec - allocate virtually contiguous, executable memory
26842664 * @size: allocation size