From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Vincent Chen <vincent.chen@sifive.com>,
Alexandre Ghiti <alex@ghiti.fr>, Anup Patel <anup@brainfault.org>,
Carlos de Paula <me@carlosedp.com>,
Palmer Dabbelt <palmerdabbelt@google.com>,
Sasha Levin <sashal@kernel.org>,
linux-riscv@lists.infradead.org
Subject: [PATCH AUTOSEL 5.4 24/35] riscv: avoid the PIC offset of static percpu data in module beyond 2G limits
Date: Sun, 15 Mar 2020 22:34:00 -0400 [thread overview]
Message-ID: <20200316023411.1263-24-sashal@kernel.org> (raw)
In-Reply-To: <20200316023411.1263-1-sashal@kernel.org>
From: Vincent Chen <vincent.chen@sifive.com>
[ Upstream commit 0cff8bff7af886af0923d5c91776cd51603e531f ]
The compiler uses the PIC-relative method to access static variables
instead of GOT when the code model is PIC. Therefore, the limitation of
the access range from the instruction to the symbol address is +-2GB.
Under this circumstance, the kernel cannot load a kernel module if this
module has static per-CPU symbols declared by DEFINE_PER_CPU(). The reason
is that kernel relocates the .data..percpu section of the kernel module to
the end of kernel's .data..percpu. Hence, the distance between the per-CPU
symbols and the instruction will exceed the 2GB limits. To solve this
problem, the kernel should place the loaded module in the memory area
[&_end-2G, VMALLOC_END].
Signed-off-by: Vincent Chen <vincent.chen@sifive.com>
Suggested-by: Alexandre Ghiti <alex@ghiti.fr>
Suggested-by: Anup Patel <anup@brainfault.org>
Tested-by: Alexandre Ghiti <alex@ghiti.fr>
Tested-by: Carlos de Paula <me@carlosedp.com>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/riscv/kernel/module.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c
index 70bb94ae61c59..6bf5b16743843 100644
--- a/arch/riscv/kernel/module.c
+++ b/arch/riscv/kernel/module.c
@@ -8,6 +8,10 @@
#include <linux/err.h>
#include <linux/errno.h>
#include <linux/moduleloader.h>
+#include <linux/vmalloc.h>
+#include <linux/sizes.h>
+#include <asm/pgtable.h>
+#include <asm/sections.h>
static int apply_r_riscv_32_rela(struct module *me, u32 *location, Elf_Addr v)
{
@@ -386,3 +390,15 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
return 0;
}
+
+#if defined(CONFIG_MMU) && defined(CONFIG_64BIT)
+#define VMALLOC_MODULE_START \
+ max(PFN_ALIGN((unsigned long)&_end - SZ_2G), VMALLOC_START)
+void *module_alloc(unsigned long size)
+{
+ return __vmalloc_node_range(size, 1, VMALLOC_MODULE_START,
+ VMALLOC_END, GFP_KERNEL,
+ PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
+ __builtin_return_address(0));
+}
+#endif
--
2.20.1
next prev parent reply other threads:[~2020-03-16 2:39 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-16 2:33 [PATCH AUTOSEL 5.4 01/35] spi: spi-omap2-mcspi: Handle DMA size restriction on AM65x Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 02/35] spi: spi-omap2-mcspi: Support probe deferral for DMA channels Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 03/35] drm/mediatek: Find the cursor plane instead of hard coding it Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 04/35] ARM: dts: imx6dl-colibri-eval-v3: fix sram compatible properties Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 05/35] phy: ti: gmii-sel: fix set of copy-paste errors Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 06/35] phy: ti: gmii-sel: do not fail in case of gmii Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 07/35] ARM: dts: dra7-l4: mark timer13-16 as pwm capable Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 08/35] ASoC: meson: g12a: add tohdmitx reset Sasha Levin
2020-03-16 8:28 ` Jerome Brunet
2020-03-22 18:31 ` Jerome Brunet
2020-03-22 19:39 ` Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 09/35] spi: qup: call spi_qup_pm_resume_runtime before suspending Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 10/35] powerpc: Include .BTF section Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 11/35] cifs: fix potential mismatch of UNC paths Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 12/35] cifs: add missing mount option to /proc/mounts Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 13/35] ARM: dts: dra7: Add "dma-ranges" property to PCIe RC DT nodes Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 14/35] spi: pxa2xx: Add CS control clock quirk Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 15/35] spi/zynqmp: remove entry that causes a cs glitch Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 16/35] drm/exynos: dsi: propagate error value and silence meaningless warning Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 17/35] drm/exynos: dsi: fix workaround for the legacy clock name Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 18/35] drm/exynos: hdmi: don't leak enable HDMI_EN regulator if probe fails Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 19/35] drivers/perf: fsl_imx8_ddr: Correct the CLEAR bit definition Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 20/35] drivers/perf: arm_pmu_acpi: Fix incorrect checking of gicc pointer Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 21/35] altera-stapl: altera_get_note: prevent write beyond end of 'key' Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 22/35] dm bio record: save/restore bi_end_io and bi_integrity Sasha Levin
2020-03-16 2:33 ` [PATCH AUTOSEL 5.4 23/35] dm integrity: use dm_bio_record and dm_bio_restore Sasha Levin
2020-03-16 2:34 ` Sasha Levin [this message]
2020-03-16 2:34 ` [PATCH AUTOSEL 5.4 25/35] ASoC: stm32: sai: manage rebind issue Sasha Levin
2020-03-16 2:34 ` [PATCH AUTOSEL 5.4 26/35] spi: spi_register_controller(): free bus id on error paths Sasha Levin
2020-03-16 2:34 ` [PATCH AUTOSEL 5.4 27/35] riscv: Force flat memory model with no-mmu Sasha Levin
2020-03-16 2:34 ` [PATCH AUTOSEL 5.4 28/35] riscv: Fix range looking for kernel image memblock Sasha Levin
2020-03-16 2:34 ` [PATCH AUTOSEL 5.4 29/35] drm/amdgpu: clean wptr on wb when gpu recovery Sasha Levin
2020-03-16 2:34 ` [PATCH AUTOSEL 5.4 30/35] drm/amd/display: Clear link settings on MST disable connector Sasha Levin
2020-03-16 2:34 ` [PATCH AUTOSEL 5.4 31/35] drm/amd/display: fix dcc swath size calculations on dcn1 Sasha Levin
2020-03-16 2:34 ` [PATCH AUTOSEL 5.4 32/35] xenbus: req->body should be updated before req->state Sasha Levin
2020-03-16 2:34 ` [PATCH AUTOSEL 5.4 33/35] xenbus: req->err " Sasha Levin
2020-03-16 2:34 ` [PATCH AUTOSEL 5.4 34/35] block, bfq: fix overwrite of bfq_group pointer in bfq_find_set_group() Sasha Levin
2020-03-16 2:34 ` [PATCH AUTOSEL 5.4 35/35] parse-maintainers: Mark as executable Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200316023411.1263-24-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=alex@ghiti.fr \
--cc=anup@brainfault.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=me@carlosedp.com \
--cc=palmerdabbelt@google.com \
--cc=stable@vger.kernel.org \
--cc=vincent.chen@sifive.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).