riscv: Add remaining module relocations and tests
Subsystems (3)
v9 cover riscv: Add remaining module relocations and tests
A handful of module relocations were missing, this patch includes the remaining ones. I also wrote some test cases to ensure that module loading works properly. Some relocations cannot be supported in the kernel, these include the ones that rely on thread local storage and dynamic linking.
This patch also overhauls the implementation of ADD/SUB/SET/ULEB128 relocations to handle overflow. "Overflow" is different for ULEB128 since it is a variable-length encoding that the compiler can be expected to generate enough space for. Instead of overflowing, ULEB128 will expand into the next 8-bit segment of the location.
A psABI proposal [1] was merged that mandates that SET_ULEB128 and SUB_ULEB128 are paired, however the discussion following the merging of the pull request revealed that while the pull request was valid, it would be better for linkers to properly handle this overflow. This patch proactively implements this methodology for future compatibility.
This can be tested by enabling KUNIT, RUNTIME_KERNEL_TESTING_MENU, and RISCV_MODULE_LINKING_KUNIT.
[1] https://github.com/riscv-non-isa/riscv-elf-psabi-doc/pull/403
---
Changes in v9:
- Use uintptr_t where applicable (Emil)
- Split up insn_rmw changes into correct patch (Emil)
- Make reloc_handlers const and simplify struct (Emil)
- Link to v8: https://lore.kernel.org/r/[email protected]
Changes in v8:
- Fix up riscv_insn_rmw to work with big-endian systems (Andreas/Emil)
- Improve readability of bitops throughout module.c (Emil)
- Consolidate all relocation handler functions into a single struct so
array doesn't need to be duplicated 3 times
- Use .space assember op instead of .rept
- Fix up name of uleb128 testcase
- Define prototypes of some new functions to conform to -Wmissing-prototypes
- Remove unused variable "first"
- Link to v7: https://lore.kernel.org/r/[email protected]
Changes in v7:
- Overhaul ADD/SUB/SET/ULEB128 relocations
- Fix ULEB128 so it produces correct values when more than 1 byte is
needed
- Link to v6: https://lore.kernel.org/r/[email protected]
Changes in v6:
- Use (void *) instead of (u32 *) for handler type
- Constrain ULEB128 to be consecutive relocations
- Link to v5: https://lore.kernel.org/r/[email protected]
Changes in v5:
- Brought in patch by Emil and fixed it up to force little endian
- Fixed up issues with apply_r_riscv_32_pcrel_rela and
apply_r_riscv_plt32_rela (Samuel)
- Added u8 cast in apply_r_riscv_sub6_rela (Andreas)
- Link to v4: https://lore.kernel.org/r/[email protected]
Changes in v4:
- Complete removal of R_RISCV_RVC_LUI
- Fix bug in R_RISCV_SUB6 linking
- Only build ULEB128 tests if supported by toolchain
- Link to v3: https://lore.kernel.org/r/[email protected]
Changes in v3:
- Add prototypes to test_module_linking_main as recommended by intel
zero day bot
- Improve efficiency of ULEB128 pair matching
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- Added ULEB128 relocations
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Charlie Jenkins (2):
riscv: Add remaining module relocations
riscv: Add tests for riscv module loading
Emil Renner Berthing (1):
riscv: Avoid unaligned access when relocating modules
arch/riscv/Kconfig.debug | 1 + arch/riscv/include/uapi/asm/elf.h | 5 +- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/module.c | 603 +++++++++++++++++---- arch/riscv/kernel/tests/Kconfig.debug | 35 ++ arch/riscv/kernel/tests/Makefile | 1 + arch/riscv/kernel/tests/module_test/Makefile | 15 + .../tests/module_test/test_module_linking_main.c | 88 +++ arch/riscv/kernel/tests/module_test/test_set16.S | 23 + arch/riscv/kernel/tests/module_test/test_set32.S | 20 + arch/riscv/kernel/tests/module_test/test_set6.S | 23 + arch/riscv/kernel/tests/module_test/test_set8.S | 23 + arch/riscv/kernel/tests/module_test/test_sub16.S | 20 + arch/riscv/kernel/tests/module_test/test_sub32.S | 20 + arch/riscv/kernel/tests/module_test/test_sub6.S | 20 + arch/riscv/kernel/tests/module_test/test_sub64.S | 25 + arch/riscv/kernel/tests/module_test/test_sub8.S | 20 + arch/riscv/kernel/tests/module_test/test_uleb128.S | 31 ++ 18 files changed, 869 insertions(+), 105 deletions(-)
---
base-commit: 3bcce01fcbcd868b8cf3a5632fde283e122d7213
change-id: 20230908-module_relocations-f63ced651bd7
Signature · 1 line
- Charlie
PATCH v9 1/3 riscv: Avoid unaligned access when relocating modules
From: Emil Renner Berthing <[email protected]>
With the C-extension regular 32bit instructions are not necessarily aligned on 4-byte boundaries. RISC-V instructions are in fact an ordered list of 16bit little-endian "parcels", so access the instruction as such.
This should also make the code work in case someone builds a big-endian RISC-V machine.
--- arch/riscv/kernel/module.c | 157 +++++++++++++++++++++++---------------------- 1 file changed, 81 insertions(+), 76 deletions(-)
arch/riscv/kernel/module.c +81 -76
@@ -27,68 +27,90 @@ static bool riscv_insn_valid_32bit_offset(ptrdiff_t val)#endif } -static int apply_r_riscv_32_rela (struct module *me,u32 *location,Elf_Addr v) +static int riscv_insn_rmw (void *location,u32 keep,u32 set) +{ +u16 *parcel = location; +u32 insn = (u32 )le16_to_cpu (parcel[0 ]) | (u32 )le16_to_cpu (parcel[1 ]) <<16 ; + + insn &= keep; + insn |= set; + + parcel[0 ] =cpu_to_le16 (insn); + parcel[1 ] =cpu_to_le16 (insn >>16 ); +return 0 ; +} + +static int riscv_insn_rvc_rmw (void *location,u16 keep,u16 set) +{ +u16 *parcel = location; +u16 insn =le16_to_cpu (*parcel); + + insn &= keep; + insn |= set; + + *parcel =cpu_to_le16 (insn); +return 0 ; +} + +static int apply_r_riscv_32_rela (struct module *me,void *location,Elf_Addr v) {if (v != (u32 )v) {pr_err ("%s: value %016llx out of range for 32-bit field\n" , me->name, (long long )v);return -EINVAL ; } - *location = v; + *(u32 *)location = v;return 0 ; } -static int apply_r_riscv_64_rela (struct module *me,u32 *location,Elf_Addr v) +static int apply_r_riscv_64_rela (struct module *me,void *location,Elf_Addr v) { *(u64 *)location = v;return 0 ; } -static int apply_r_riscv_branch_rela (struct module *me,u32 *location, +static int apply_r_riscv_branch_rela (struct module *me,void *location,Elf_Addr v) { -ptrdiff_t offset = (void *)v - (void *)location; +ptrdiff_t offset = (void *)v - location;u32 imm12 = (offset &0x1000 ) << (31 -12 );u32 imm11 = (offset &0x800 ) >> (11 -7 );u32 imm10_5 = (offset &0x7e0 ) << (30 -10 );u32 imm4_1 = (offset &0x1e ) << (11 -4 ); - *location = (*location &0x1fff07f ) | imm12 | imm11 | imm10_5 | imm4_1; -return 0 ; +return riscv_insn_rmw (location,0x1fff07f , imm12 | imm11 | imm10_5 | imm4_1); } -static int apply_r_riscv_jal_rela (struct module *me,u32 *location, +static int apply_r_riscv_jal_rela (struct module *me,void *location,Elf_Addr v) { -ptrdiff_t offset = (void *)v - (void *)location; +ptrdiff_t offset = (void *)v - location;u32 imm20 = (offset &0x100000 ) << (31 -20 );u32 imm19_12 = (offset &0xff000 );u32 imm11 = (offset &0x800 ) << (20 -11 );u32 imm10_1 = (offset &0x7fe ) << (30 -10 ); - *location = (*location &0xfff ) | imm20 | imm19_12 | imm11 | imm10_1; -return 0 ; +return riscv_insn_rmw (location,0xfff , imm20 | imm19_12 | imm11 | imm10_1); } -static int apply_r_riscv_rvc_branch_rela (struct module *me,u32 *location, +static int apply_r_riscv_rvc_branch_rela (struct module *me,void *location,Elf_Addr v) { -ptrdiff_t offset = (void *)v - (void *)location; +ptrdiff_t offset = (void *)v - location;u16 imm8 = (offset &0x100 ) << (12 -8 );u16 imm7_6 = (offset &0xc0 ) >> (6 -5 );u16 imm5 = (offset &0x20 ) >> (5 -2 );u16 imm4_3 = (offset &0x18 ) << (12 -5 );u16 imm2_1 = (offset &0x6 ) << (12 -10 ); - *(u16 *)location = (*(u16 *)location &0xe383 ) | - imm8 | imm7_6 | imm5 | imm4_3 | imm2_1; -return 0 ; +return riscv_insn_rvc_rmw (location,0xe383 , + imm8 | imm7_6 | imm5 | imm4_3 | imm2_1); } -static int apply_r_riscv_rvc_jump_rela (struct module *me,u32 *location, +static int apply_r_riscv_rvc_jump_rela (struct module *me,void *location,Elf_Addr v) { -ptrdiff_t offset = (void *)v - (void *)location; +ptrdiff_t offset = (void *)v - location;u16 imm11 = (offset &0x800 ) << (12 -11 );u16 imm10 = (offset &0x400 ) >> (10 -8 );u16 imm9_8 = (offset &0x300 ) << (12 -11 );
@@ -98,16 +120,14 @@ static int apply_r_riscv_rvc_jump_rela(struct module *me, u32 *location,u16 imm4 = (offset &0x10 ) << (12 -5 );u16 imm3_1 = (offset &0xe ) << (12 -10 ); - *(u16 *)location = (*(u16 *)location &0xe003 ) | - imm11 | imm10 | imm9_8 | imm7 | imm6 | imm5 | imm4 | imm3_1; -return 0 ; +return riscv_insn_rvc_rmw (location,0xe003 , + imm11 | imm10 | imm9_8 | imm7 | imm6 | imm5 | imm4 | imm3_1); } -static int apply_r_riscv_pcrel_hi20_rela (struct module *me,u32 *location, +static int apply_r_riscv_pcrel_hi20_rela (struct module *me,void *location,Elf_Addr v) { -ptrdiff_t offset = (void *)v - (void *)location; -s32 hi20; +ptrdiff_t offset = (void *)v - location;if (!riscv_insn_valid_32bit_offset (offset)) { pr_err(
@@ -116,23 +136,20 @@ static int apply_r_riscv_pcrel_hi20_rela(struct module *me, u32 *location,return -EINVAL ; } - hi20 = (offset +0x800 ) &0xfffff000 ; - *location = (*location &0xfff ) | hi20; -return 0 ; +return riscv_insn_rmw (location,0xfff , (offset +0x800 ) &0xfffff000 ); } -static int apply_r_riscv_pcrel_lo12_i_rela (struct module *me,u32 *location, +static int apply_r_riscv_pcrel_lo12_i_rela (struct module *me,void *location,Elf_Addr v) {/* * v is the lo12 value to fill. It is calculated before calling this * handler. */ - *location = (*location &0xfffff ) | ((v &0xfff ) <<20 ); -return 0 ; +return riscv_insn_rmw (location,0xfffff , (v &0xfff ) <<20 ); } -static int apply_r_riscv_pcrel_lo12_s_rela (struct module *me,u32 *location, +static int apply_r_riscv_pcrel_lo12_s_rela (struct module *me,void *location,Elf_Addr v) {/*
@@ -142,15 +159,12 @@ static int apply_r_riscv_pcrel_lo12_s_rela(struct module *me, u32 *location,u32 imm11_5 = (v &0xfe0 ) << (31 -11 );u32 imm4_0 = (v &0x1f ) << (11 -4 ); - *location = (*location &0x1fff07f ) | imm11_5 | imm4_0; -return 0 ; +return riscv_insn_rmw (location,0x1fff07f , imm11_5 | imm4_0); } -static int apply_r_riscv_hi20_rela (struct module *me,u32 *location, +static int apply_r_riscv_hi20_rela (struct module *me,void *location,Elf_Addr v) { -s32 hi20; -if (IS_ENABLED (CONFIG_CMODEL_MEDLOW )) { pr_err( "%s: target %016llx can not be addressed by the 32-bit offset from PC = %p\n",
@@ -158,22 +172,20 @@ static int apply_r_riscv_hi20_rela(struct module *me, u32 *location,return -EINVAL ; } - hi20 = ((s32 )v +0x800 ) &0xfffff000 ; - *location = (*location &0xfff ) | hi20; -return 0 ; +return riscv_insn_rmw (location,0xfff , ((s32 )v +0x800 ) &0xfffff000 ); } -static int apply_r_riscv_lo12_i_rela (struct module *me,u32 *location, +static int apply_r_riscv_lo12_i_rela (struct module *me,void *location,Elf_Addr v) {/* Skip medlow checking because of filtering by HI20 already */ s32 hi20 = ((s32 )v +0x800 ) &0xfffff000 ;s32 lo12 = ((s32 )v - hi20); - *location = (*location &0xfffff ) | ((lo12 &0xfff ) <<20 ); -return 0 ; + +return riscv_insn_rmw (location,0xfffff , (lo12 &0xfff ) <<20 ); } -static int apply_r_riscv_lo12_s_rela (struct module *me,u32 *location, +static int apply_r_riscv_lo12_s_rela (struct module *me,void *location,Elf_Addr v) {/* Skip medlow checking because of filtering by HI20 already */
@@ -181,20 +193,18 @@ static int apply_r_riscv_lo12_s_rela(struct module *me, u32 *location,s32 lo12 = ((s32 )v - hi20);u32 imm11_5 = (lo12 &0xfe0 ) << (31 -11 );u32 imm4_0 = (lo12 &0x1f ) << (11 -4 ); - *location = (*location &0x1fff07f ) | imm11_5 | imm4_0; -return 0 ; + +return riscv_insn_rmw (location,0x1fff07f , imm11_5 | imm4_0); } -static int apply_r_riscv_got_hi20_rela (struct module *me,u32 *location, +static int apply_r_riscv_got_hi20_rela (struct module *me,void *location,Elf_Addr v) { -ptrdiff_t offset = (void *)v - (void *)location; -s32 hi20; +ptrdiff_t offset = (void *)v - location;/* Always emit the got entry */ if (IS_ENABLED (CONFIG_MODULE_SECTIONS )) { - offset =module_emit_got_entry (me, v); - offset = (void *)offset - (void *)location; + offset = (void *)module_emit_got_entry (me, v) - location; }else { pr_err( "%s: can not generate the GOT entry for symbol = %016llx from PC = %p\n",
@@ -202,22 +212,19 @@ static int apply_r_riscv_got_hi20_rela(struct module *me, u32 *location,return -EINVAL ; } - hi20 = (offset +0x800 ) &0xfffff000 ; - *location = (*location &0xfff ) | hi20; -return 0 ; +return riscv_insn_rmw (location,0xfff , (offset +0x800 ) &0xfffff000 ); } -static int apply_r_riscv_call_plt_rela (struct module *me,u32 *location, +static int apply_r_riscv_call_plt_rela (struct module *me,void *location,Elf_Addr v) { -ptrdiff_t offset = (void *)v - (void *)location; +ptrdiff_t offset = (void *)v - location;u32 hi20, lo12;if (!riscv_insn_valid_32bit_offset (offset)) {/* Only emit the plt entry if offset over 32-bit range */ if (IS_ENABLED (CONFIG_MODULE_SECTIONS )) { - offset =module_emit_plt_entry (me, v); - offset = (void *)offset - (void *)location; + offset = (void *)module_emit_plt_entry (me, v) - location; }else { pr_err( "%s: target %016llx can not be addressed by the 32-bit offset from PC = %p\n",
@@ -228,15 +235,14 @@ static int apply_r_riscv_call_plt_rela(struct module *me, u32 *location, hi20 = (offset +0x800 ) &0xfffff000 ; lo12 = (offset - hi20) &0xfff ; - *location = (*location &0xfff ) | hi20; - *(location +1 ) = (*(location +1 ) &0xfffff ) | (lo12 <<20 ); -return 0 ; +riscv_insn_rmw (location,0xfff , hi20); +return riscv_insn_rmw (location +4 ,0xfffff , lo12 <<20 ); } -static int apply_r_riscv_call_rela (struct module *me,u32 *location, +static int apply_r_riscv_call_rela (struct module *me,void *location,Elf_Addr v) { -ptrdiff_t offset = (void *)v - (void *)location; +ptrdiff_t offset = (void *)v - location;u32 hi20, lo12;if (!riscv_insn_valid_32bit_offset (offset)) {
@@ -248,18 +254,17 @@ static int apply_r_riscv_call_rela(struct module *me, u32 *location, hi20 = (offset +0x800 ) &0xfffff000 ; lo12 = (offset - hi20) &0xfff ; - *location = (*location &0xfff ) | hi20; - *(location +1 ) = (*(location +1 ) &0xfffff ) | (lo12 <<20 ); -return 0 ; +riscv_insn_rmw (location,0xfff , hi20); +return riscv_insn_rmw (location +4 ,0xfffff , lo12 <<20 ); } -static int apply_r_riscv_relax_rela (struct module *me,u32 *location, +static int apply_r_riscv_relax_rela (struct module *me,void *location,Elf_Addr v) {return 0 ; } -static int apply_r_riscv_align_rela (struct module *me,u32 *location, +static int apply_r_riscv_align_rela (struct module *me,void *location,Elf_Addr v) { pr_err(
@@ -268,49 +273,49 @@ static int apply_r_riscv_align_rela(struct module *me, u32 *location,return -EINVAL ; } -static int apply_r_riscv_add16_rela (struct module *me,u32 *location, +static int apply_r_riscv_add16_rela (struct module *me,void *location,Elf_Addr v) { *(u16 *)location += (u16 )v;return 0 ; } -static int apply_r_riscv_add32_rela (struct module *me,u32 *location, +static int apply_r_riscv_add32_rela (struct module *me,void *location,Elf_Addr v) { *(u32 *)location += (u32 )v;return 0 ; } -static int apply_r_riscv_add64_rela (struct module *me,u32 *location, +static int apply_r_riscv_add64_rela (struct module *me,void *location,Elf_Addr v) { *(u64 *)location += (u64 )v;return 0 ; } -static int apply_r_riscv_sub16_rela (struct module *me,u32 *location, +static int apply_r_riscv_sub16_rela (struct module *me,void *location,Elf_Addr v) { *(u16 *)location -= (u16 )v;return 0 ; } -static int apply_r_riscv_sub32_rela (struct module *me,u32 *location, +static int apply_r_riscv_sub32_rela (struct module *me,void *location,Elf_Addr v) { *(u32 *)location -= (u32 )v;return 0 ; } -static int apply_r_riscv_sub64_rela (struct module *me,u32 *location, +static int apply_r_riscv_sub64_rela (struct module *me,void *location,Elf_Addr v) { *(u64 *)location -= (u64 )v;return 0 ; } -static int (*reloc_handlers_rela[]) (struct module *me,u32 *location, +static int (*reloc_handlers_rela[]) (struct module *me,void *location,Elf_Addr v) = { [R_RISCV_32 ] = apply_r_riscv_32_rela, [R_RISCV_64 ] = apply_r_riscv_64_rela,
@@ -342,9 +347,9 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, struct module *me) {Elf_Rela *rel = (void *) sechdrs[relsec].sh_addr; -int (*handler)(struct module *me,u32 *location,Elf_Addr v); +int (*handler)(struct module *me,void *location,Elf_Addr v);Elf_Sym *sym; -u32 *location; +void *location;unsigned int i, type;Elf_Addr v;int res;
Signature · 1 line
2.34.1
PATCH v9 2/3 riscv: Add remaining module relocations
In reply to Charlie JenkinsAdd all final module relocations and add error logs explaining the ones that are not supported. Implement overflow checks for ADD/SUB/SET/ULEB128 relocations.
--- arch/riscv/include/uapi/asm/elf.h | 5 +- arch/riscv/kernel/module.c | 448 +++++++++++++++++++++++++++++++++++--- 2 files changed, 423 insertions(+), 30 deletions(-)
arch/riscv/include/uapi/asm/elf.h +4 -1
@@ -49,6 +49,7 @@ typedef union __riscv_fp_state elf_fpregset_t;#define R_RISCV_TLS_DTPREL64 9#define R_RISCV_TLS_TPREL32 10#define R_RISCV_TLS_TPREL64 11 +#define R_RISCV_IRELATIVE 58/* Relocation types not used by the dynamic linker */ #define R_RISCV_BRANCH 16
@@ -81,7 +82,6 @@ typedef union __riscv_fp_state elf_fpregset_t;#define R_RISCV_ALIGN 43#define R_RISCV_RVC_BRANCH 44#define R_RISCV_RVC_JUMP 45 -#define R_RISCV_LUI 46#define R_RISCV_GPREL_I 47#define R_RISCV_GPREL_S 48#define R_RISCV_TPREL_I 49
@@ -93,6 +93,9 @@ typedef union __riscv_fp_state elf_fpregset_t;#define R_RISCV_SET16 55#define R_RISCV_SET32 56#define R_RISCV_32_PCREL 57 +#define R_RISCV_PLT32 59 +#define R_RISCV_SET_ULEB128 60 +#define R_RISCV_SUB_ULEB128 61#endif /* _UAPI_ASM_RISCV_ELF_H */
arch/riscv/kernel/module.c +419 -29
506 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v9 3/3 riscv: Add tests for riscv module loading
In reply to Charlie JenkinsAdd test cases for the two main groups of relocations added: SUB and SET, along with uleb128.
--- arch/riscv/Kconfig.debug | 1 + arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/tests/Kconfig.debug | 35 +++++++++ arch/riscv/kernel/tests/Makefile | 1 + arch/riscv/kernel/tests/module_test/Makefile | 15 ++++ .../tests/module_test/test_module_linking_main.c | 88 ++++++++++++++++++++++ arch/riscv/kernel/tests/module_test/test_set16.S | 23 ++++++ arch/riscv/kernel/tests/module_test/test_set32.S | 20 +++++ arch/riscv/kernel/tests/module_test/test_set6.S | 23 ++++++ arch/riscv/kernel/tests/module_test/test_set8.S | 23 ++++++ arch/riscv/kernel/tests/module_test/test_sub16.S | 20 +++++ arch/riscv/kernel/tests/module_test/test_sub32.S | 20 +++++ arch/riscv/kernel/tests/module_test/test_sub6.S | 20 +++++ arch/riscv/kernel/tests/module_test/test_sub64.S | 25 ++++++ arch/riscv/kernel/tests/module_test/test_sub8.S | 20 +++++ arch/riscv/kernel/tests/module_test/test_uleb128.S | 31 ++++++++ 16 files changed, 366 insertions(+)
arch/riscv/Kconfig.debug +1 -0
@@ -0,0 +1 @@ +source "arch/riscv/kernel/tests/Kconfig.debug"
arch/riscv/kernel/Makefile +1 -0
@@ -57,6 +57,7 @@ obj-y += stacktrace.o obj-y += cacheinfo.o obj-y += patch.o obj-y += probes/ +obj-y += tests/ obj-$(CONFIG_MMU) += vdso.o vdso/ obj-$(CONFIG_RISCV_M_MODE) += traps_misaligned.o
arch/riscv/kernel/tests/Kconfig.debug new file +35 -0
@@ -0,0 +1,35 @@ +# SPDX-License-Identifier: GPL-2.0-only +menu "arch/riscv/kernel Testing and Coverage" + +config AS_HAS_ULEB128 + def_bool $(as-instr,.reloc label$(comma) R_RISCV_SET_ULEB128$(comma) 127\n.reloc label$(comma) R_RISCV_SUB_ULEB128$(comma) 127\nlabel:\n.word 0) + +menuconfig RUNTIME_KERNEL_TESTING_MENU + bool "arch/riscv/kernel runtime Testing" + def_bool y + help + Enable riscv kernel runtime testing. + +if RUNTIME_KERNEL_TESTING_MENU + +config RISCV_MODULE_LINKING_KUNIT + bool "KUnit test riscv module linking at runtime" if !KUNIT_ALL_TESTS + depends on KUNIT + default KUNIT_ALL_TESTS + help + Enable this option to test riscv module linking at boot. This will + enable a module called "test_module_linking". + + KUnit tests run during boot and output the results to the debug log + in TAP format (http://testanything.org/). Only useful for kernel devs + running the KUnit test harness, and not intended for inclusion into a + production build. + + For more information on KUnit and unit tests in general please refer + to the KUnit documentation in Documentation/dev-tools/kunit/. + + If unsure, say N. + +endif # RUNTIME_TESTING_MENU + +endmenu # "arch/riscv/kernel runtime Testing"
arch/riscv/kernel/tests/Makefile new file +1 -0
@@ -0,0 +1 @@ +obj-$(CONFIG_RISCV_MODULE_LINKING_KUNIT) += module_test/
arch/riscv/kernel/tests/module_test/Makefile new file +15 -0
@@ -0,0 +1,15 @@ +obj-m += test_module_linking.o + +test_sub := test_sub6.o test_sub8.o test_sub16.o test_sub32.o test_sub64.o + +test_set := test_set6.o test_set8.o test_set16.o test_set32.o + +test_module_linking-objs += $(test_sub) + +test_module_linking-objs += $(test_set) + +ifeq ($(CONFIG_AS_HAS_ULEB128),y) +test_module_linking-objs += test_uleb128.o +endif + +test_module_linking-objs += test_module_linking_main.o
arch/riscv/kernel/tests/module_test/test_module_linking_main.c new file +88 -0
88 lines not on this page · raw message
arch/riscv/kernel/tests/module_test/test_set16.S new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_set16 +test_set16: + lw a0, set16 + la t0, set16 +#ifdef CONFIG_32BIT + slli t0, t0, 16 + srli t0, t0, 16 +#else + slli t0, t0, 48 + srli t0, t0, 48 +#endif + sub a0, a0, t0 + ret +.data +set16: + .reloc set16, R_RISCV_SET16, set16 + .word 0
arch/riscv/kernel/tests/module_test/test_set32.S new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_set32 +test_set32: + lw a0, set32 + la t0, set32 +#ifndef CONFIG_32BIT + slli t0, t0, 32 + srli t0, t0, 32 +#endif + sub a0, a0, t0 + ret +.data +set32: + .reloc set32, R_RISCV_SET32, set32 + .word 0
arch/riscv/kernel/tests/module_test/test_set6.S new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_set6 +test_set6: + lw a0, set6 + la t0, set6 +#ifdef CONFIG_32BIT + slli t0, t0, 26 + srli t0, t0, 26 +#else + slli t0, t0, 58 + srli t0, t0, 58 +#endif + sub a0, a0, t0 + ret +.data +set6: + .reloc set6, R_RISCV_SET6, set6 + .word 0
arch/riscv/kernel/tests/module_test/test_set8.S new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_set8 +test_set8: + lw a0, set8 + la t0, set8 +#ifdef CONFIG_32BIT + slli t0, t0, 24 + srli t0, t0, 24 +#else + slli t0, t0, 56 + srli t0, t0, 56 +#endif + sub a0, a0, t0 + ret +.data +set8: + .reloc set8, R_RISCV_SET8, set8 + .word 0
arch/riscv/kernel/tests/module_test/test_sub16.S new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_sub16 +test_sub16: + lh a0, sub16 + addi a0, a0, -32 + ret +first: + .space 32 +second: + +.data +sub16: + .reloc sub16, R_RISCV_ADD16, second + .reloc sub16, R_RISCV_SUB16, first + .half 0
arch/riscv/kernel/tests/module_test/test_sub32.S new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_sub32 +test_sub32: + lw a0, sub32 + addi a0, a0, -32 + ret +first: + .space 32 +second: + +.data +sub32: + .reloc sub32, R_RISCV_ADD32, second + .reloc sub32, R_RISCV_SUB32, first + .word 0
arch/riscv/kernel/tests/module_test/test_sub6.S new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_sub6 +test_sub6: + lb a0, sub6 + addi a0, a0, -32 + ret +first: + .space 32 +second: + +.data +sub6: + .reloc sub6, R_RISCV_SET6, second + .reloc sub6, R_RISCV_SUB6, first + .byte 0
arch/riscv/kernel/tests/module_test/test_sub64.S new file +25 -0
@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_sub64 +test_sub64: +#ifdef CONFIG_32BIT + lw a0, sub64 +#else + ld a0, sub64 +#endif + addi a0, a0, -32 + ret +first: + .space 32 +second: + +.data +sub64: + .reloc sub64, R_RISCV_ADD64, second + .reloc sub64, R_RISCV_SUB64, first + .word 0 + .word 0
arch/riscv/kernel/tests/module_test/test_sub8.S new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_sub8 +test_sub8: + lb a0, sub8 + addi a0, a0, -32 + ret +first: + .space 32 +second: + +.data +sub8: + .reloc sub8, R_RISCV_ADD8, second + .reloc sub8, R_RISCV_SUB8, first + .byte 0
arch/riscv/kernel/tests/module_test/test_uleb128.S new file +31 -0
@@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +.text +.global test_uleb_basic +test_uleb_basic: + ld a0, second + addi a0, a0, -127 + ret + +.global test_uleb_large +test_uleb_large: + ld a0, fourth + addi a0, a0, -0x07e8 + ret + +.data +first: + .space 127 +second: + .reloc second, R_RISCV_SET_ULEB128, second + .reloc second, R_RISCV_SUB_ULEB128, first + .dword 0 +third: + .space 1000 +fourth: + .reloc fourth, R_RISCV_SET_ULEB128, fourth + .reloc fourth, R_RISCV_SUB_ULEB128, third + .dword 0
Signature · 1 line
2.34.1
This series was applied to riscv/linux.git (for-next) by Palmer Dabbelt <[email protected]>:
Hello:
This series was applied to riscv/linux.git (for-next) by Palmer Dabbelt <[email protected]>:
Quoted 6 lines · On Wed, 01 Nov 2023 11:32:58 -0700 you wrote:
A handful of module relocations were missing, this patch includes the remaining ones. I also wrote some test cases to ensure that module loading works properly. Some relocations cannot be supported in the kernel, these include the ones that rely on thread local storage and dynamic linking.
Quoted 7 lines
This patch also overhauls the implementation of ADD/SUB/SET/ULEB128 relocations to handle overflow. "Overflow" is different for ULEB128 since it is a variable-length encoding that the compiler can be expected to generate enough space for. Instead of overflowing, ULEB128 will expand into the next 8-bit segment of the location.
[...]
Here is the summary with links:
- [v9,1/3] riscv: Avoid unaligned access when relocating modules
https://git.kernel.org/riscv/c/8cbe0accc4a6 - [v9,2/3] riscv: Add remaining module relocations https://git.kernel.org/riscv/c/8fd6c5142395 - [v9,3/3] riscv: Add tests for riscv module loading https://git.kernel.org/riscv/c/af71bc194916
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html