Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1638443

Re: [PATCH v3 2/3] ARM: Silence first allocation with CONFIG_ARM_MODULE_PLTS=y

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/3 v3] ARM/ARM64: silence large module first time allocation Florian Fainelli <f.fainelli@gmail.com> - 2017-04-27 20:20 +0200
  [PATCH v3 1/3] mm: Silence vmap() allocation failures based on caller gfp_flags Florian Fainelli <f.fainelli@gmail.com> - 2017-04-27 20:30 +0200
  [PATCH v3 3/3] arm64: Silence first allocation with CONFIG_ARM64_MODULE_PLTS=y Florian Fainelli <f.fainelli@gmail.com> - 2017-04-27 20:30 +0200
    Re: [PATCH v3 3/3] arm64: Silence first allocation with  CONFIG_ARM64_MODULE_PLTS=y Will Deacon <will.deacon@arm.com> - 2017-05-03 13:20 +0200
      Re: [PATCH v3 3/3] arm64: Silence first allocation with  CONFIG_ARM64_MODULE_PLTS=y Florian Fainelli <f.fainelli@gmail.com> - 2017-05-05 23:10 +0200
        Re: [PATCH v3 3/3] arm64: Silence first allocation with  CONFIG_ARM64_MODULE_PLTS=y Will Deacon <will.deacon@arm.com> - 2017-05-08 12:10 +0200
          Re: [PATCH v3 3/3] arm64: Silence first allocation with  CONFIG_ARM64_MODULE_PLTS=y Catalin Marinas <catalin.marinas@arm.com> - 2017-05-10 10:40 +0200
            Re: [PATCH v3 3/3] arm64: Silence first allocation with  CONFIG_ARM64_MODULE_PLTS=y Will Deacon <will.deacon@arm.com> - 2017-05-10 14:00 +0200
              Re: [PATCH v3 3/3] arm64: Silence first allocation with  CONFIG_ARM64_MODULE_PLTS=y Catalin Marinas <catalin.marinas@arm.com> - 2017-05-11 16:00 +0200
  Re: [PATCH 0/3 v3] ARM/ARM64: silence large module first time allocation Ard Biesheuvel <ard.biesheuvel@linaro.org> - 2017-04-27 20:30 +0200
    Re: [PATCH 0/3 v3] ARM/ARM64: silence large module first time  allocation Florian Fainelli <f.fainelli@gmail.com> - 2017-04-27 20:40 +0200
  [PATCH v3 2/3] ARM: Silence first allocation with CONFIG_ARM_MODULE_PLTS=y Florian Fainelli <f.fainelli@gmail.com> - 2017-04-27 20:30 +0200
    Re: [PATCH v3 2/3] ARM: Silence first allocation with  CONFIG_ARM_MODULE_PLTS=y Florian Fainelli <f.fainelli@gmail.com> - 2017-05-10 01:20 +0200
      Re: [PATCH v3 2/3] ARM: Silence first allocation with  CONFIG_ARM_MODULE_PLTS=y Russell King - ARM Linux <linux@armlinux.org.uk> - 2017-05-10 01:30 +0200

csiph-web