| Message ID | 20200618064307.32739-4-hch@lst.de (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 7a0e27b2a0ce2735e27e21ebc8b777550fe0ed81 |
| Headers | show |
| Series | [1/3] x86/hyperv: allocate the hypercall page with only read and execute bits | expand |
On 18.06.20 08:43, Christoph Hellwig wrote: > Merge vmalloc_exec into its only caller. Note that for !CONFIG_MMU > __vmalloc_node_range maps to __vmalloc, which directly clears the > __GFP_HIGHMEM added by the vmalloc_exec stub anyway. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > include/linux/vmalloc.h | 1 - > kernel/module.c | 4 +++- > mm/nommu.c | 17 ----------------- > mm/vmalloc.c | 20 -------------------- > 4 files changed, 3 insertions(+), 39 deletions(-) > > diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h > index 48bb681e6c2aed..0221f852a7e1a3 100644 > --- a/include/linux/vmalloc.h > +++ b/include/linux/vmalloc.h > @@ -106,7 +106,6 @@ extern void *vzalloc(unsigned long size); > extern void *vmalloc_user(unsigned long size); > extern void *vmalloc_node(unsigned long size, int node); > extern void *vzalloc_node(unsigned long size, int node); > -extern void *vmalloc_exec(unsigned long size); > extern void *vmalloc_32(unsigned long size); > extern void *vmalloc_32_user(unsigned long size); > extern void *__vmalloc(unsigned long size, gfp_t gfp_mask); > diff --git a/kernel/module.c b/kernel/module.c > index e8a198588f26ee..0c6573b98c3662 100644 > --- a/kernel/module.c > +++ b/kernel/module.c > @@ -2783,7 +2783,9 @@ static void dynamic_debug_remove(struct module *mod, struct _ddebug *debug) > > void * __weak module_alloc(unsigned long size) > { > - return vmalloc_exec(size); > + return __vmalloc_node_range(size, 1, VMALLOC_START, VMALLOC_END, > + GFP_KERNEL, PAGE_KERNEL_EXEC, VM_FLUSH_RESET_PERMS, > + NUMA_NO_NODE, __func__); > } > > bool __weak module_init_section(const char *name) > diff --git a/mm/nommu.c b/mm/nommu.c > index cdcad5d61dd194..f32a69095d509e 100644 > --- a/mm/nommu.c > +++ b/mm/nommu.c > @@ -290,23 +290,6 @@ void *vzalloc_node(unsigned long size, int node) > } > EXPORT_SYMBOL(vzalloc_node); > > -/** > - * vmalloc_exec - allocate virtually contiguous, executable memory > - * @size: allocation size > - * > - * Kernel-internal function to allocate enough pages to cover @size > - * the page level allocator and map them into contiguous and > - * executable kernel virtual space. > - * > - * For tight control over page level allocator and protection flags > - * use __vmalloc() instead. > - */ > - > -void *vmalloc_exec(unsigned long size) > -{ > - return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM); > -} > - > /** > * vmalloc_32 - allocate virtually contiguous memory (32bit addressable) > * @size: allocation size > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index 3091c2ca60dfd1..f60948aac0d0e4 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -2696,26 +2696,6 @@ void *vzalloc_node(unsigned long size, int node) > } > EXPORT_SYMBOL(vzalloc_node); > > -/** > - * vmalloc_exec - allocate virtually contiguous, executable memory > - * @size: allocation size > - * > - * Kernel-internal function to allocate enough pages to cover @size > - * the page level allocator and map them into contiguous and > - * executable kernel virtual space. > - * > - * For tight control over page level allocator and protection flags > - * use __vmalloc() instead. > - * > - * Return: pointer to the allocated memory or %NULL on error > - */ > -void *vmalloc_exec(unsigned long size) > -{ > - return __vmalloc_node_range(size, 1, VMALLOC_START, VMALLOC_END, > - GFP_KERNEL, PAGE_KERNEL_EXEC, VM_FLUSH_RESET_PERMS, > - NUMA_NO_NODE, __builtin_return_address(0)); > -} > - > #if defined(CONFIG_64BIT) && defined(CONFIG_ZONE_DMA32) > #define GFP_VMALLOC32 (GFP_DMA32 | GFP_KERNEL) > #elif defined(CONFIG_64BIT) && defined(CONFIG_ZONE_DMA) > LGTM Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 48bb681e6c2aed..0221f852a7e1a3 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -106,7 +106,6 @@ extern void *vzalloc(unsigned long size); extern void *vmalloc_user(unsigned long size); extern void *vmalloc_node(unsigned long size, int node); extern void *vzalloc_node(unsigned long size, int node); -extern void *vmalloc_exec(unsigned long size); extern void *vmalloc_32(unsigned long size); extern void *vmalloc_32_user(unsigned long size); extern void *__vmalloc(unsigned long size, gfp_t gfp_mask); diff --git a/kernel/module.c b/kernel/module.c index e8a198588f26ee..0c6573b98c3662 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -2783,7 +2783,9 @@ static void dynamic_debug_remove(struct module *mod, struct _ddebug *debug) void * __weak module_alloc(unsigned long size) { - return vmalloc_exec(size); + return __vmalloc_node_range(size, 1, VMALLOC_START, VMALLOC_END, + GFP_KERNEL, PAGE_KERNEL_EXEC, VM_FLUSH_RESET_PERMS, + NUMA_NO_NODE, __func__); } bool __weak module_init_section(const char *name) diff --git a/mm/nommu.c b/mm/nommu.c index cdcad5d61dd194..f32a69095d509e 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -290,23 +290,6 @@ void *vzalloc_node(unsigned long size, int node) } EXPORT_SYMBOL(vzalloc_node); -/** - * vmalloc_exec - allocate virtually contiguous, executable memory - * @size: allocation size - * - * Kernel-internal function to allocate enough pages to cover @size - * the page level allocator and map them into contiguous and - * executable kernel virtual space. - * - * For tight control over page level allocator and protection flags - * use __vmalloc() instead. - */ - -void *vmalloc_exec(unsigned long size) -{ - return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM); -} - /** * vmalloc_32 - allocate virtually contiguous memory (32bit addressable) * @size: allocation size diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 3091c2ca60dfd1..f60948aac0d0e4 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -2696,26 +2696,6 @@ void *vzalloc_node(unsigned long size, int node) } EXPORT_SYMBOL(vzalloc_node); -/** - * vmalloc_exec - allocate virtually contiguous, executable memory - * @size: allocation size - * - * Kernel-internal function to allocate enough pages to cover @size - * the page level allocator and map them into contiguous and - * executable kernel virtual space. - * - * For tight control over page level allocator and protection flags - * use __vmalloc() instead. - * - * Return: pointer to the allocated memory or %NULL on error - */ -void *vmalloc_exec(unsigned long size) -{ - return __vmalloc_node_range(size, 1, VMALLOC_START, VMALLOC_END, - GFP_KERNEL, PAGE_KERNEL_EXEC, VM_FLUSH_RESET_PERMS, - NUMA_NO_NODE, __builtin_return_address(0)); -} - #if defined(CONFIG_64BIT) && defined(CONFIG_ZONE_DMA32) #define GFP_VMALLOC32 (GFP_DMA32 | GFP_KERNEL) #elif defined(CONFIG_64BIT) && defined(CONFIG_ZONE_DMA)
Merge vmalloc_exec into its only caller. Note that for !CONFIG_MMU __vmalloc_node_range maps to __vmalloc, which directly clears the __GFP_HIGHMEM added by the vmalloc_exec stub anyway. Signed-off-by: Christoph Hellwig <hch@lst.de> --- include/linux/vmalloc.h | 1 - kernel/module.c | 4 +++- mm/nommu.c | 17 ----------------- mm/vmalloc.c | 20 -------------------- 4 files changed, 3 insertions(+), 39 deletions(-)