[PATCH 1/2] ARM: Silence non PLT allocation with CONFIG_ARM_MODULE_PLTS=y

From	Florian Fainelli <f.fainelli@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH 1/2] ARM: Silence non PLT allocation with CONFIG_ARM_MODULE_PLTS=y
Date	2017-04-26 00:40 +0200
Message-ID	<tAhhM-2cM-31@gated-at.bofh.it> (permalink)
References	<tAhhL-2cM-9@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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, since that scares people out.

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..503d1a39464a 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;
+
+#if IS_ENABLED(CONFIG_ARM_MODULE_PLTS)
+	/* Silence the initial allocation */
+	gfp_mask |= __GFP_NOWARN;
+#endif
+	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;
-- 
2.9.3

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

Thread

[PATCH 0/3] ARM/ARM64: silence large module first time allocation Florian Fainelli <f.fainelli@gmail.com> - 2017-04-26 00:40 +0200
  [PATCH 1/2] ARM: Silence first allocation with CONFIG_ARM_MODULE_PLTS=y Florian Fainelli <f.fainelli@gmail.com> - 2017-04-26 00:40 +0200
  [PATCH 2/2] mm: Silence vmap() allocation failures based on caller gfp_flags Florian Fainelli <f.fainelli@gmail.com> - 2017-04-26 00:40 +0200
  [PATCH 1/2] ARM: Silence non PLT allocation with CONFIG_ARM_MODULE_PLTS=y Florian Fainelli <f.fainelli@gmail.com> - 2017-04-26 00:40 +0200

csiph-web