| Message ID | 20170427181902.28829-3-f.fainelli@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 04/27/2017 11:19 AM, Florian Fainelli wrote: > When CONFIG_ARM_MODULE_PLTS is enabled, the first allocation using the > module space fails, because the module is too big, and then the module > allocation is attempted from vmalloc space. Silence the first allocation > failure in that case by setting __GFP_NOWARN. Russell, are you okay with this change? Do you have a preference as which tree should carry this patch series? Thanks > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> > --- > arch/arm/kernel/module.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c > index 80254b47dc34..3ff571c2c71c 100644 > --- a/arch/arm/kernel/module.c > +++ b/arch/arm/kernel/module.c > @@ -40,8 +40,15 @@ > #ifdef CONFIG_MMU > void *module_alloc(unsigned long size) > { > - void *p = __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, > - GFP_KERNEL, PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE, > + gfp_t gfp_mask = GFP_KERNEL; > + void *p; > + > + /* Silence the initial allocation */ > + if (IS_ENABLED(CONFIG_ARM_MODULE_PLTS)) > + gfp_mask |= __GFP_NOWARN; > + > + p = __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, > + gfp_mask, PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE, > __builtin_return_address(0)); > if (!IS_ENABLED(CONFIG_ARM_MODULE_PLTS) || p) > return p; >
On Tue, May 09, 2017 at 04:16:09PM -0700, Florian Fainelli wrote: > On 04/27/2017 11:19 AM, Florian Fainelli wrote: > > When CONFIG_ARM_MODULE_PLTS is enabled, the first allocation using the > > module space fails, because the module is too big, and then the module > > allocation is attempted from vmalloc space. Silence the first allocation > > failure in that case by setting __GFP_NOWARN. > > Russell, are you okay with this change? Do you have a preference as > which tree should carry this patch series? It looks sensible. Acked-by: Russell King <rmk+kernel@armlinux.org.uk> No preference which tree it goes through...
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index 80254b47dc34..3ff571c2c71c 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c @@ -40,8 +40,15 @@ #ifdef CONFIG_MMU void *module_alloc(unsigned long size) { - void *p = __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, - GFP_KERNEL, PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE, + gfp_t gfp_mask = GFP_KERNEL; + void *p; + + /* Silence the initial allocation */ + if (IS_ENABLED(CONFIG_ARM_MODULE_PLTS)) + gfp_mask |= __GFP_NOWARN; + + p = __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, + gfp_mask, PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE, __builtin_return_address(0)); if (!IS_ENABLED(CONFIG_ARM_MODULE_PLTS) || p) return p;
When CONFIG_ARM_MODULE_PLTS is enabled, the first allocation using the module space fails, because the module is too big, and then the module allocation is attempted from vmalloc space. Silence the first allocation failure in that case by setting __GFP_NOWARN. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- arch/arm/kernel/module.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)