From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751566AbeDIM6G (ORCPT ); Mon, 9 Apr 2018 08:58:06 -0400 Received: from smtprelay0223.hostedemail.com ([216.40.44.223]:51865 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750759AbeDIM6F (ORCPT ); Mon, 9 Apr 2018 08:58:05 -0400 X-Session-Marker: 7368656140736865616C6576792E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,,:::::::::,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1345:1431:1437:1534:1542:1711:1730:1747:1777:1792:1981:2194:2199:2393:2559:2562:3138:3139:3140:3141:3142:3353:3865:3866:3867:3868:3870:3872:3874:4321:4605:5007:6261:7875:7903:8603:10004:10848:11026:11232:11473:11657:11658:11914:12043:12296:12438:12555:12895:12986:13180:13229:14096:14181:14394:14721:21080:21433:21451:21627:21740:30025:30054,0,RBL:71.235.10.46:@shealevy.com:.lbl8.mailshell.net-62.4.0.191 64.201.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:ff,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:20,LUA_SUMMARY:none X-HE-Tag: cook66_6371064ab193f X-Filterd-Recvd-Size: 2705 From: Shea Levy To: linux-riscv@lists.infradead.org Cc: Shea Levy , Palmer Dabbelt , Albert Ou , linux-kernel@vger.kernel.org Subject: [PATCH] RISC-V: Load modules within relative jump range of the kernel text. Date: Mon, 9 Apr 2018 08:58:00 -0400 Message-Id: <20180409125800.5000-1-shea@shealevy.com> X-Mailer: git-send-email 2.16.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Shea Levy --- Note that this patch worked in my old modules patchset and seems to be working now, but my kernel boot locks up on top of riscv-for-linus-4.17-mw0 and I don't know if it's due to this patch or something else that's changed in the mean time. --- arch/riscv/include/asm/pgtable.h | 9 +++++++++ arch/riscv/kernel/module.c | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 16301966d65b..b08ded13364a 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -25,6 +25,7 @@ #include #include #include +#include #ifdef CONFIG_64BIT #include @@ -425,6 +426,14 @@ static inline void pgtable_cache_init(void) #define TASK_SIZE VMALLOC_START #endif +/* + * The module space lives between the addresses given by TASK_SIZE + * and PAGE_OFFSET - it must be within 2G of the kernel text. + */ +#define MODULES_SIZE (SZ_128M) +#define MODULES_VADDR (PAGE_OFFSET - MODULES_SIZE) +#define MODULES_END (VMALLOC_END) + #include #endif /* !__ASSEMBLY__ */ diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c index 5dddba301d0a..1b382c7de095 100644 --- a/arch/riscv/kernel/module.c +++ b/arch/riscv/kernel/module.c @@ -16,6 +16,8 @@ #include #include #include +#include +#include static int apply_r_riscv_64_rela(struct module *me, u32 *location, Elf_Addr v) { @@ -382,3 +384,12 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, return 0; } + +void *module_alloc(unsigned long size) +{ + return __vmalloc_node_range(size, 1, MODULES_VADDR, + MODULES_END, GFP_KERNEL, + PAGE_KERNEL_EXEC, 0, + NUMA_NO_NODE, + __builtin_return_address(0)); +} -- 2.16.2