From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f197.google.com (mail-wr0-f197.google.com [209.85.128.197]) by kanga.kvack.org (Postfix) with ESMTP id 7EDBA6B0038 for ; Thu, 27 Apr 2017 14:07:35 -0400 (EDT) Received: by mail-wr0-f197.google.com with SMTP id r3so3786120wrb.19 for ; Thu, 27 Apr 2017 11:07:35 -0700 (PDT) Received: from mail-wr0-x22f.google.com (mail-wr0-x22f.google.com. [2a00:1450:400c:c0c::22f]) by mx.google.com with ESMTPS id g73si3283567wrd.149.2017.04.27.11.07.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Apr 2017 11:07:34 -0700 (PDT) Received: by mail-wr0-x22f.google.com with SMTP id z52so21706530wrc.2 for ; Thu, 27 Apr 2017 11:07:33 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (1.0) Subject: Re: [PATCH v2 3/3] arm64: Silence first allocation with CONFIG_ARM64_MODULE_PLTS=y From: Ard Biesheuvel In-Reply-To: <20170427173900.2538-4-f.fainelli@gmail.com> Date: Thu, 27 Apr 2017 19:07:25 +0100 Content-Transfer-Encoding: 7bit Message-Id: References: <20170427173900.2538-1-f.fainelli@gmail.com> <20170427173900.2538-4-f.fainelli@gmail.com> Sender: owner-linux-mm@kvack.org List-ID: To: Florian Fainelli Cc: linux-arm-kernel@lists.infradead.org, Russell King , Catalin Marinas , Will Deacon , Andrew Morton , Michal Hocko , zijun_hu , "Kirill A. Shutemov" , Andrey Ryabinin , Chris Wilson , open list , "open list:MEMORY MANAGEMENT" , angus@angusclark.org > On 27 Apr 2017, at 18:39, Florian Fainelli wrote: > > When CONFIG_ARM64_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 > --- > arch/arm64/kernel/module.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/kernel/module.c b/arch/arm64/kernel/module.c > index 7f316982ce00..58bd5cfdd544 100644 > --- a/arch/arm64/kernel/module.c > +++ b/arch/arm64/kernel/module.c > @@ -32,11 +32,16 @@ > > void *module_alloc(unsigned long size) > { > + gfp_t gfp_mask = GFP_KERNEL; > void *p; > > +#if IS_ENABLED(CONFIG_ARM64_MODULE_PLTS) > + /* Silence the initial allocation */ > + gfp_mask |= __GFP_NOWARN; > +#endif Please use IS_ENABLED() instead here > p = __vmalloc_node_range(size, MODULE_ALIGN, module_alloc_base, > module_alloc_base + MODULES_VSIZE, > - GFP_KERNEL, PAGE_KERNEL_EXEC, 0, > + gfp_mask, PAGE_KERNEL_EXEC, 0, > NUMA_NO_NODE, __builtin_return_address(0)); > > if (!p && IS_ENABLED(CONFIG_ARM64_MODULE_PLTS) && > -- > 2.9.3 > Other than that, and with Michal's nit addressed: Reviewed-by: Ard Biesheuvel -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org