Messages in this thread | | | Subject | Re: [PATCH v3 2/3] ARM: Silence first allocation with CONFIG_ARM_MODULE_PLTS=y | From | Florian Fainelli <> | Date | Tue, 9 May 2017 16:16:09 -0700 |
| |
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; >
-- Florian
| |