浏览代码

arm64: Silence first allocation with CONFIG_ARM64_MODULE_PLTS=y

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.

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Florian Fainelli 8 年之前
父节点
当前提交
0c2cf6d948
共有 1 个文件被更改,包括 6 次插入1 次删除
  1. 6 1
      arch/arm64/kernel/module.c

+ 6 - 1
arch/arm64/kernel/module.c

@@ -32,11 +32,16 @@
 
 
 void *module_alloc(unsigned long size)
 void *module_alloc(unsigned long size)
 {
 {
+	gfp_t gfp_mask = GFP_KERNEL;
 	void *p;
 	void *p;
 
 
+	/* Silence the initial allocation */
+	if (IS_ENABLED(CONFIG_ARM64_MODULE_PLTS))
+		gfp_mask |= __GFP_NOWARN;
+
 	p = __vmalloc_node_range(size, MODULE_ALIGN, module_alloc_base,
 	p = __vmalloc_node_range(size, MODULE_ALIGN, module_alloc_base,
 				module_alloc_base + MODULES_VSIZE,
 				module_alloc_base + MODULES_VSIZE,
-				GFP_KERNEL, PAGE_KERNEL_EXEC, 0,
+				gfp_mask, PAGE_KERNEL_EXEC, 0,
 				NUMA_NO_NODE, __builtin_return_address(0));
 				NUMA_NO_NODE, __builtin_return_address(0));
 
 
 	if (!p && IS_ENABLED(CONFIG_ARM64_MODULE_PLTS) &&
 	if (!p && IS_ENABLED(CONFIG_ARM64_MODULE_PLTS) &&