diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2017-04-27 11:19:02 -0700 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2017-05-11 14:43:40 +0100 |
| commit | 0c2cf6d9487cb90be6ad7fac66044dfa8e8e5243 (patch) | |
| tree | 2acb02c06ce98a0093b1b6f32fae3848a5380e7b /arch | |
| parent | 75d24d968af8913f641c612930c96acc5399e427 (diff) | |
| download | linux-stable-0c2cf6d9487cb90be6ad7fac66044dfa8e8e5243.tar.gz linux-stable-0c2cf6d9487cb90be6ad7fac66044dfa8e8e5243.tar.bz2 linux-stable-0c2cf6d9487cb90be6ad7fac66044dfa8e8e5243.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kernel/module.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm64/kernel/module.c b/arch/arm64/kernel/module.c index c9a2ab446dc6..f035ff6fb223 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; + /* 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, 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) && |