riscv: Avoid unaligned access when relocating modules
PATCH 1/2 riscv: Avoid unaligned access when relocating modules
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 native-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.
Fix rcv -> rvc typo while we're at it.
--- arch/riscv/kernel/module.c | 155 +++++++++++++++++++------------------ 1 file changed, 79 insertions(+), 76 deletions(-)
arch/riscv/kernel/module.c +79 -76
@@ -13,68 +13,86 @@#include <linux/pgtable.h> #include <asm/sections.h> -static int apply_r_riscv_32_rela (struct module *me,u32 *location,Elf_Addr v) +static int riscv_insn_rmw (u8 *location,u32 keep,u32 set) +{ +u16 *parcel = (u16 *)location; +u32 insn = (u32 )parcel[0 ] | (u32 )parcel[1 ] <<16 ; + + insn &= keep; + insn |= set; + + parcel[0 ] = insn; + parcel[1 ] = insn >>16 ; +return 0 ; +} + +static int riscv_insn_rvc_rmw (u8 *location,u16 keep,u16 set) +{ +u16 *parcel = (u16 *)location; + + *parcel = (*parcel & keep) | set; +return 0 ; +} + +static int apply_r_riscv_32_rela (struct module *me,u8 *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,u8 *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,u8 *location,Elf_Addr v) { -ptrdiff_t offset = (void *)v - (void *)location; +ptrdiff_t offset = (u8 *)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,u8 *location,Elf_Addr v) { -ptrdiff_t offset = (void *)v - (void *)location; +ptrdiff_t offset = (u8 *)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_rcv_branch_rela (struct module *me,u32 *location, +static int apply_r_riscv_rvc_branch_rela (struct module *me,u8 *location,Elf_Addr v) { -ptrdiff_t offset = (void *)v - (void *)location; +ptrdiff_t offset = (u8 *)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,u8 *location,Elf_Addr v) { -ptrdiff_t offset = (void *)v - (void *)location; +ptrdiff_t offset = (u8 *)v - location;u16 imm11 = (offset &0x800 ) << (12 -11 );u16 imm10 = (offset &0x400 ) >> (10 -8 );u16 imm9_8 = (offset &0x300 ) << (12 -11 );
@@ -84,16 +102,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,u8 *location,Elf_Addr v) { -ptrdiff_t offset = (void *)v - (void *)location; -s32 hi20; +ptrdiff_t offset = (u8 *)v - location;if (offset != (s32 )offset) { pr_err(
@@ -102,23 +118,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,u8 *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,u8 *location,Elf_Addr v) {/*
@@ -128,15 +141,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,u8 *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",
@@ -144,22 +154,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,u8 *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,u8 *location,Elf_Addr v) {/* Skip medlow checking because of filtering by HI20 already */
@@ -167,20 +175,19 @@ 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,u8 *location,Elf_Addr v) { -ptrdiff_t offset = (void *)v - (void *)location; -s32 hi20; +ptrdiff_t offset = (u8 *)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; +unsigned long entry =module_emit_got_entry (me, v); + offset = (u8 *)entry - location; }else { pr_err( "%s: can not generate the GOT entry for symbol = %016llx from PC = %p\n",
@@ -188,23 +195,21 @@ 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,u8 *location,Elf_Addr v) { -ptrdiff_t offset = (void *)v - (void *)location; +ptrdiff_t offset = (u8 *)v - location;s32 fill_v = offset;u32 hi20, lo12;if (offset != fill_v) {/* 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; +unsigned long entry =module_emit_plt_entry (me, v); + offset = (u8 *)entry - location; }else { pr_err( "%s: target %016llx can not be addressed by the 32-bit offset from PC = %p\n",
@@ -215,15 +220,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,u8 *location,Elf_Addr v) { -ptrdiff_t offset = (void *)v - (void *)location; +ptrdiff_t offset = (u8 *)v - location;s32 fill_v = offset;u32 hi20, lo12;
@@ -236,18 +240,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,u8 *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,u8 *location,Elf_Addr v) { pr_err(
@@ -256,41 +259,41 @@ static int apply_r_riscv_align_rela(struct module *me, u32 *location,return -EINVAL ; } -static int apply_r_riscv_add32_rela (struct module *me,u32 *location, +static int apply_r_riscv_add32_rela (struct module *me,u8 *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,u8 *location,Elf_Addr v) { *(u64 *)location += (u64 )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,u8 *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,u8 *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,u8 *location,Elf_Addr v) = { [R_RISCV_32 ] = apply_r_riscv_32_rela, [R_RISCV_64 ] = apply_r_riscv_64_rela, [R_RISCV_BRANCH ] = apply_r_riscv_branch_rela, [R_RISCV_JAL ] = apply_r_riscv_jal_rela, - [R_RISCV_RVC_BRANCH ] = apply_r_riscv_rcv_branch_rela, + [R_RISCV_RVC_BRANCH ] = apply_r_riscv_rvc_branch_rela, [R_RISCV_RVC_JUMP ] = apply_r_riscv_rvc_jump_rela, [R_RISCV_PCREL_HI20 ] = apply_r_riscv_pcrel_hi20_rela, [R_RISCV_PCREL_LO12_I ] = apply_r_riscv_pcrel_lo12_i_rela,
@@ -314,9 +317,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,u8 *location,Elf_Addr v);Elf_Sym *sym; -u32 *location; +u8 *location;unsigned int i, type;Elf_Addr v;int res;
@@ -326,7 +329,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,for (i =0 ; i < sechdrs[relsec].sh_size /sizeof (*rel); i++) {/* This is where to make the change */ - location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + location = (u8 *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;/* This is the symbol it is referring to */ sym = (Elf_Sym *)sechdrs[symindex].sh_addr
Signature · 1 line
2.27.0
PATCH 2/2 riscv: Clean up module relocations
Factor out generation of different types of immediates.
Also RISC-V has a number of instruction pairs to generate 32bit immediates or jump/call offsets. Eg.:
lui rd, hi20
addi rd, rd, lo12
..where hi20 is the upper 20bits to load into register rd and lo12 is the lower 12bits. However lo12 is interpreted as a signed 12bit value. Hence the old code calculates hi20 and lo12 for 32bit immediates imm like this:
hi20 = (imm + 0x800) & 0xfffff000;
lo12 = (imm - hi20) & 0xfff;
This patch simplifies it to:
hi20 = (imm + 0x800) & 0xfffff000;
lo12 = imm & 0xfff;
..which amounts to the same: imm - hi20 may be become negative/underflow, but it doesn't change the lower 12 bits.
---
My hope is that we can eventually factor out the code to generate immediates and instructions so it can be reused both here, in the jump-label code and in the bpf-jit code, but let's take it one step at a time.
/Emil
arch/riscv/kernel/module.c | 290 +++++++++++++++++++++---------------- 1 file changed, 163 insertions(+), 127 deletions(-)
arch/riscv/kernel/module.c +163 -127
@@ -2,8 +2,10 @@/* * * Copyright (C) 2017 Zihao Yu +* Copyright (C) 2020 Emil Renner Berthing */ +#include <linux/bits.h> #include <linux/elf.h> #include <linux/err.h> #include <linux/errno.h>
@@ -13,24 +15,91 @@#include <linux/pgtable.h> #include <asm/sections.h> -static int riscv_insn_rmw (u8 *location,u32 keep,u32 set) +#define RISCV_INSN_I_IMM_MASK 0xfff00000U +#define RISCV_INSN_S_IMM_MASK 0xfe000f80U +#define RISCV_INSN_B_IMM_MASK 0xfe000f80U +#define RISCV_INSN_U_IMM_MASK 0xfffff000U +#define RISCV_INSN_J_IMM_MASK 0xfffff000U + +#define RISCV_INSN_CI_IMM_MASK 0x107cU +#define RISCV_INSN_CSS_IMM_MASK 0x1f80U +#define RISCV_INSN_CIW_IMM_MASK 0x1fe0U +#define RISCV_INSN_CL_IMM_MASK 0x1c60U +#define RISCV_INSN_CS_IMM_MASK 0x1c60U +#define RISCV_INSN_CB_IMM_MASK 0x1c7cU +#define RISCV_INSN_CJ_IMM_MASK 0x1ffcU + +static u32 riscv_insn_i_imm (u32 imm) +{ +return (imm &GENMASK (11 ,0 )) <<20 ; +} + +static u32 riscv_insn_s_imm (u32 imm) +{ +return (imm &GENMASK (4 ,0 )) << (7 -0 ) | + (imm &GENMASK (11 ,5 )) << (25 -5 ); +} + +static u32 riscv_insn_b_imm (u32 imm) +{ +return (imm &GENMASK (11 ,11 )) >> (11 -7 ) | + (imm &GENMASK (4 ,1 )) << (8 -1 ) | + (imm &GENMASK (10 ,5 )) << (25 -5 ) | + (imm &GENMASK (12 ,12 )) << (31 -12 ); +} + +static u32 riscv_insn_u_imm (u32 imm) +{ +return imm &GENMASK (31 ,12 ); +} + +static u32 riscv_insn_j_imm (u32 imm) +{ +return (imm &GENMASK (19 ,12 )) << (12 -12 ) | + (imm &GENMASK (11 ,11 )) << (20 -11 ) | + (imm &GENMASK (10 ,1 )) << (21 -1 ) | + (imm &GENMASK (20 ,20 )) << (31 -20 ); +} + +static u16 riscv_insn_rvc_branch_imm (u16 imm) +{ +return (imm &GENMASK (5 ,5 )) >> (5 -2 ) | + (imm &GENMASK (2 ,1 )) << (3 -1 ) | + (imm &GENMASK (7 ,6 )) >> (6 -5 ) | + (imm &GENMASK (4 ,3 )) << (10 -3 ) | + (imm &GENMASK (8 ,8 )) << (12 -8 ); +} + +static u16 riscv_insn_rvc_jump_imm (u16 imm) +{ +return (imm &GENMASK (5 ,5 )) >> (5 -2 ) | + (imm &GENMASK (3 ,1 )) << (3 -1 ) | + (imm &GENMASK (7 ,7 )) >> (7 -6 ) | + (imm &GENMASK (6 ,6 )) << (7 -6 ) | + (imm &GENMASK (10 ,10 )) >> (10 -8 ) | + (imm &GENMASK (9 ,8 )) << (9 -8 ) | + (imm &GENMASK (4 ,4 )) << (11 -4 ) | + (imm &GENMASK (11 ,11 )) << (12 -11 ); +} + +static int riscv_insn_rmw (u8 *location,u32 mask,u32 value) {u16 *parcel = (u16 *)location;u32 insn = (u32 )parcel[0 ] | (u32 )parcel[1 ] <<16 ; - insn &= keep; - insn |= set; + insn &= ~mask; + insn |= value; parcel[0 ] = insn; parcel[1 ] = insn >>16 ;return 0 ; } -static int riscv_insn_rvc_rmw (u8 *location,u16 keep,u16 set) +static int riscv_insn_rvc_rmw (u8 *location,u16 mask,u16 value) {u16 *parcel = (u16 *)location; - *parcel = (*parcel & keep) | set; + *parcel = (*parcel & ~mask) | value;return 0 ; }
@@ -55,55 +124,40 @@ static int apply_r_riscv_branch_rela(struct module *me, u8 *location, Elf_Addr v) {ptrdiff_t offset = (u8 *)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 ); -return riscv_insn_rmw (location,0x1fff07f , imm12 | imm11 | imm10_5 | imm4_1); +return riscv_insn_rmw (location, +RISCV_INSN_B_IMM_MASK , +riscv_insn_b_imm (offset)); }static int apply_r_riscv_jal_rela (struct module *me,u8 *location,Elf_Addr v) {ptrdiff_t offset = (u8 *)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 ); -return riscv_insn_rmw (location,0xfff , imm20 | imm19_12 | imm11 | imm10_1); +return riscv_insn_rmw (location, +RISCV_INSN_J_IMM_MASK , +riscv_insn_j_imm (offset)); }static int apply_r_riscv_rvc_branch_rela (struct module *me,u8 *location,Elf_Addr v) {ptrdiff_t offset = (u8 *)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 ); -return riscv_insn_rvc_rmw (location,0xe383 , - imm8 | imm7_6 | imm5 | imm4_3 | imm2_1); +return riscv_insn_rvc_rmw (location, +RISCV_INSN_CB_IMM_MASK , +riscv_insn_rvc_branch_imm (offset)); }static int apply_r_riscv_rvc_jump_rela (struct module *me,u8 *location,Elf_Addr v) {ptrdiff_t offset = (u8 *)v - location; -u16 imm11 = (offset &0x800 ) << (12 -11 ); -u16 imm10 = (offset &0x400 ) >> (10 -8 ); -u16 imm9_8 = (offset &0x300 ) << (12 -11 ); -u16 imm7 = (offset &0x80 ) >> (7 -6 ); -u16 imm6 = (offset &0x40 ) << (12 -11 ); -u16 imm5 = (offset &0x20 ) >> (5 -2 ); -u16 imm4 = (offset &0x10 ) << (12 -5 ); -u16 imm3_1 = (offset &0xe ) << (12 -10 ); -return riscv_insn_rvc_rmw (location,0xe003 , - imm11 | imm10 | imm9_8 | imm7 | imm6 | imm5 | imm4 | imm3_1); +return riscv_insn_rvc_rmw (location, +RISCV_INSN_CJ_IMM_MASK , +riscv_insn_rvc_jump_imm (offset)); } static int apply_r_riscv_pcrel_hi20_rela(struct module *me, u8 *location,
@@ -118,30 +172,27 @@ static int apply_r_riscv_pcrel_hi20_rela(struct module *me, u8 *location,return -EINVAL ; } -return riscv_insn_rmw (location,0xfff , (offset +0x800 ) &0xfffff000 ); +return riscv_insn_rmw (location, +RISCV_INSN_U_IMM_MASK , +riscv_insn_u_imm (offset +0x800 )); }static int apply_r_riscv_pcrel_lo12_i_rela (struct module *me,u8 *location,Elf_Addr v) { -/* -* v is the lo12 value to fill. It is calculated before calling this -* handler. -*/ -return riscv_insn_rmw (location,0xfffff , (v &0xfff ) <<20 ); +/* v is already the relative offset */ +return riscv_insn_rmw (location, +RISCV_INSN_I_IMM_MASK , +riscv_insn_i_imm (v)); }static int apply_r_riscv_pcrel_lo12_s_rela (struct module *me,u8 *location,Elf_Addr v) { -/* -* v is the lo12 value to fill. It is calculated before calling this -* handler. -*/ -u32 imm11_5 = (v &0xfe0 ) << (31 -11 ); -u32 imm4_0 = (v &0x1f ) << (11 -4 ); - -return riscv_insn_rmw (location,0x1fff07f , imm11_5 | imm4_0); +/* v is already the relative offset */ +return riscv_insn_rmw (location, +RISCV_INSN_S_IMM_MASK , +riscv_insn_s_imm (v)); } static int apply_r_riscv_hi20_rela(struct module *me, u8 *location,
@@ -154,29 +205,27 @@ static int apply_r_riscv_hi20_rela(struct module *me, u8 *location,return -EINVAL ; } -return riscv_insn_rmw (location,0xfff , ((s32 )v +0x800 ) &0xfffff000 ); +return riscv_insn_rmw (location, +RISCV_INSN_U_IMM_MASK , +riscv_insn_u_imm (v +0x800 )); }static int apply_r_riscv_lo12_i_rela (struct module *me,u8 *location,Elf_Addr v) {/* Skip medlow checking because of filtering by HI20 already */ -s32 hi20 = ((s32 )v +0x800 ) &0xfffff000 ; -s32 lo12 = ((s32 )v - hi20); - -return riscv_insn_rmw (location,0xfffff , (lo12 &0xfff ) <<20 ); +return riscv_insn_rmw (location, +RISCV_INSN_I_IMM_MASK , +riscv_insn_i_imm (v)); }static int apply_r_riscv_lo12_s_rela (struct module *me,u8 *location,Elf_Addr v) {/* Skip medlow checking because of filtering by HI20 already */ -s32 hi20 = ((s32 )v +0x800 ) &0xfffff000 ; -s32 lo12 = ((s32 )v - hi20); -u32 imm11_5 = (lo12 &0xfe0 ) << (31 -11 ); -u32 imm4_0 = (lo12 &0x1f ) << (11 -4 ); - -return riscv_insn_rmw (location,0x1fff07f , imm11_5 | imm4_0); +return riscv_insn_rmw (location, +RISCV_INSN_S_IMM_MASK , +riscv_insn_s_imm (v)); } static int apply_r_riscv_got_hi20_rela(struct module *me, u8 *location,
@@ -195,17 +244,17 @@ static int apply_r_riscv_got_hi20_rela(struct module *me, u8 *location,return -EINVAL ; } -return riscv_insn_rmw (location,0xfff , (offset +0x800 ) &0xfffff000 ); +return riscv_insn_rmw (location, +RISCV_INSN_U_IMM_MASK , +riscv_insn_u_imm (offset +0x800 )); }static int apply_r_riscv_call_plt_rela (struct module *me,u8 *location,Elf_Addr v) {ptrdiff_t offset = (u8 *)v - location; -s32 fill_v = offset; -u32 hi20, lo12; -if (offset != fill_v) { +if (offset != (s32 )offset) {/* Only emit the plt entry if offset over 32-bit range */ if (IS_ENABLED (CONFIG_MODULE_SECTIONS )) {unsigned long entry =module_emit_plt_entry (me, v);
@@ -218,30 +267,32 @@ static int apply_r_riscv_call_plt_rela(struct module *me, u8 *location, } } - hi20 = (offset +0x800 ) &0xfffff000 ; - lo12 = (offset - hi20) &0xfff ; -riscv_insn_rmw (location,0xfff , hi20); -return riscv_insn_rmw (location +4 ,0xfffff , lo12 <<20 ); +riscv_insn_rmw (location, +RISCV_INSN_U_IMM_MASK , +riscv_insn_u_imm (offset +0x800 )); +return riscv_insn_rmw (location +4 , +RISCV_INSN_I_IMM_MASK , +riscv_insn_i_imm (offset)); }static int apply_r_riscv_call_rela (struct module *me,u8 *location,Elf_Addr v) {ptrdiff_t offset = (u8 *)v - location; -s32 fill_v = offset; -u32 hi20, lo12; -if (offset != fill_v) { +if (offset != (s32 )offset) {pr_err ("%s: target %016llx can not be addressed by the 32-bit offset from PC = %p\n" , me->name, (long long )v, location);return -EINVAL ; } - hi20 = (offset +0x800 ) &0xfffff000 ; - lo12 = (offset - hi20) &0xfff ; -riscv_insn_rmw (location,0xfff , hi20); -return riscv_insn_rmw (location +4 ,0xfffff , lo12 <<20 ); +riscv_insn_rmw (location, +RISCV_INSN_U_IMM_MASK , +riscv_insn_u_imm (offset +0x800 )); +return riscv_insn_rmw (location +4 , +RISCV_INSN_I_IMM_MASK , +riscv_insn_i_imm (offset)); } static int apply_r_riscv_relax_rela(struct module *me, u8 *location,
@@ -287,7 +338,7 @@ static int apply_r_riscv_sub64_rela(struct module *me, u8 *location,return 0 ; } -static int (*reloc_handlers_rela[]) (struct module *me,u8 *location, +static int (*reloc_handlers_rela[])(struct module *me,u8 *location,Elf_Addr v) = { [R_RISCV_32 ] = apply_r_riscv_32_rela, [R_RISCV_64 ] = apply_r_riscv_64_rela,
@@ -316,24 +367,23 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, unsigned int symindex, unsigned int relsec, struct module *me) { - Elf_Rela *rel = (void *) sechdrs[relsec].sh_addr; -int (*handler)(struct module *me,u8 *location,Elf_Addr v); -Elf_Sym *sym; -u8 *location; -unsigned int i, type; -Elf_Addr v; -int res; + Elf_Rela *rel = (Elf_Rela *)sechdrs[relsec].sh_addr; +unsigned int entries = sechdrs[relsec].sh_size /sizeof (*rel); +unsigned int i;pr_debug ("Applying relocate section %u to %u\n" , relsec, sechdrs[relsec].sh_info); -for (i =0 ; i < sechdrs[relsec].sh_size /sizeof (*rel); i++) { -/* This is where to make the change */ - location = (u8 *)sechdrs[sechdrs[relsec].sh_info].sh_addr - + rel[i].r_offset; -/* This is the symbol it is referring to */ - sym = (Elf_Sym *)sechdrs[symindex].sh_addr +for (i =0 ; i < entries; i++) { +Elf_Sym *sym = (Elf_Sym *)sechdrs[symindex].sh_addr +ELF_RISCV_R_SYM (rel[i].r_info); +Elf_Addr loc = sechdrs[sechdrs[relsec].sh_info].sh_addr + + rel[i].r_offset; +unsigned int type =ELF_RISCV_R_TYPE (rel[i].r_info); +int (*handler)(struct module *me,u8 *location,Elf_Addr v); +Elf_Addr v; +int res; +if (IS_ERR_VALUE (sym->st_value)) {/* Ignore unresolved weak symbol */ if (ELF_ST_BIND (sym->st_info) ==STB_WEAK )
@@ -343,8 +393,6 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,return -ENOENT ; } - type =ELF_RISCV_R_TYPE (rel[i].r_info); -if (type <ARRAY_SIZE (reloc_handlers_rela)) handler = reloc_handlers_rela[type];else
@@ -361,48 +409,36 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,if (type ==R_RISCV_PCREL_LO12_I || type ==R_RISCV_PCREL_LO12_S ) {unsigned int j; -for (j =0 ; j < sechdrs[relsec].sh_size /sizeof (*rel); j++) { -unsigned long hi20_loc = - sechdrs[sechdrs[relsec].sh_info].sh_addr +/* find the corresponding HI20 entry */ +for (j =0 ; j < entries; j++) { +Elf_Sym *hi20_sym = (Elf_Sym *)sechdrs[symindex].sh_addr + +ELF_RISCV_R_SYM (rel[j].r_info); +Elf_Addr hi20_loc = sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[j].r_offset; -u32 hi20_type =ELF_RISCV_R_TYPE (rel[j].r_info); - -/* Find the corresponding HI20 relocation entry */ -if (hi20_loc == sym->st_value - && (hi20_type ==R_RISCV_PCREL_HI20 - || hi20_type ==R_RISCV_GOT_HI20 )) { -s32 hi20, lo12; -Elf_Sym *hi20_sym = - (Elf_Sym *)sechdrs[symindex].sh_addr - +ELF_RISCV_R_SYM (rel[j].r_info); -unsigned long hi20_sym_val = - hi20_sym->st_value - + rel[j].r_addend; - -/* Calculate lo12 */ -size_t offset = hi20_sym_val - hi20_loc; -if (IS_ENABLED (CONFIG_MODULE_SECTIONS ) - && hi20_type ==R_RISCV_GOT_HI20 ) { - offset =module_emit_got_entry ( - me, hi20_sym_val); - offset = offset - hi20_loc; - } - hi20 = (offset +0x800 ) &0xfffff000 ; - lo12 = offset - hi20; - v = lo12; - -break ; - } - } -if (j == sechdrs[relsec].sh_size /sizeof (*rel)) { -pr_err ( -"%s: Can not find HI20 relocation information\n" , - me->name); -return -EINVAL ; +unsigned int hi20_type =ELF_RISCV_R_TYPE (rel[j].r_info); + +if (hi20_loc != sym->st_value || + (hi20_type !=R_RISCV_PCREL_HI20 && + hi20_type !=R_RISCV_GOT_HI20 )) +continue ; + +/* calculate relative offset */ + v = hi20_sym->st_value + rel[j].r_addend; + +if (IS_ENABLED (CONFIG_MODULE_SECTIONS ) && + hi20_type ==R_RISCV_GOT_HI20 ) + v =module_emit_got_entry (me, v); + + v -= hi20_loc; + goto handle_reloc; } - } - res =handler (me, location, v); +pr_err ("%s: Cannot find HI20 relocation information\n" , + me->name); +return -EINVAL ; + } +handle_reloc: + res =handler (me, (u8 *)loc, v);if (res)return res; }
Signature · 1 line
2.27.0
Re: [PATCH v1 2/2] riscv: Clean up module relocations
Thanks for the patch!
Quoted 5 lines
Also RISC-V has a number of instruction pairs to generate 32bit immediates or jump/call offsets. Eg.:
lui rd, hi20
addi rd, rd, lo12
On RV64, both hi20 from lui and lo12 from addi are sign-extended to 64 bits. This means that there are some 32-bit signed offsets (in the range [2^31-2^11, 2^31-1])
that are not encodable using (lui+addi), (auipc+jalr), etc. (see discussion at [1]).
The following note is from the ISA manual:
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Note that the set of address offsets that can be formed by pairing LUI with LD, AUIPC with JALR, etc. in RV64I is [−2^31−2^11, 2^31−2^11−1].
The existing code and the new code both seem buggy if the offset happens to be a 32-bit int but falls outside of the encodable range.
Review
Quoted 4 lines
(quoted diff) +2
-0+ if (offset != (s32)offset) { + if (offset != (s32)offset) {
These checks should probably be replaced with something similar to what's used in the RV64 BPF JIT here: [2],
except that this code should check if using RV32 or RV64, since the encodable range differs for each.
Quoted 4 lines
My hope is that we can eventually factor out the code to generate immediates and instructions so it can be reused both here, in the jump-label code and in the bpf-jit code, but let's take it one step at a time.
This sounds great! Having fewer copies of RISC-V encoding logic around will hopefully decrease the likelihood of bugs :) Some other archs already have shared
infrastructure for doing instruction encoding (e.g., in arch/arm64/kernel/insn.c);
we should consider doing something similar for RISC-V.
- Luke Nelson
[1]: https://groups.google.com/a/groups.riscv.org/forum/#!topic/isa-dev/bwWFhBnnZFQ
[2]: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/commit/?id=489553dd13a88d8a882db10622ba8b9b58582ce4
Re: [PATCH v1 2/2] riscv: Clean up module relocations
Quoted 9 lines · Luke Nelson
Thanks for the patch!
Quoted 5 lines
Also RISC-V has a number of instruction pairs to generate 32bit immediates or jump/call offsets. Eg.:
lui rd, hi20
addi rd, rd, lo12
Quoted 9 lines
On RV64, both hi20 from lui and lo12 from addi are sign-extended to 64 bits. This means that there are some 32-bit signed offsets (in the range [2^31-2^11, 2^31-1])
that are not encodable using (lui+addi), (auipc+jalr), etc. (see discussion at [1]).The following note is from the ISA manual:
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Note that the set of address offsets that can be formed by pairing LUI with LD, AUIPC with JALR, etc. in RV64I is [−2^31−2^11, 2^31−2^11−1].
Good point!
Quoted 8 lines
The existing code and the new code both seem buggy if the offset happens to be a 32-bit int but falls outside of the encodable range.
Review
Quoted 4 lines
(quoted diff) +2
-0+ if (offset != (s32)offset) { + if (offset != (s32)offset) {
Quoted 4 lines
These checks should probably be replaced with something similar to what's used in the RV64 BPF JIT here: [2],
except that this code should check if using RV32 or RV64, since the encodable range differs for each.
Yeah, I decided to leave these checks as they are to not change everything at once, but I'll see if I can improve on those in the next version.
Quoted 11 lines
Quoted 4 lines
My hope is that we can eventually factor out the code to generate immediates and instructions so it can be reused both here, in the jump-label code and in the bpf-jit code, but let's take it one step at a time.
This sounds great! Having fewer copies of RISC-V encoding logic around will hopefully decrease the likelihood of bugs :) Some other archs already have shared
infrastructure for doing instruction encoding (e.g., inarch/arm64/kernel/insn.c);
we should consider doing something similar for RISC-V.
Exactly this. I've even tried to copy the naming from arm64 as well. I'll send a 2nd version of this after -rc1.
Quoted 5 lines
- Luke Nelson
[1]: https://groups.google.com/a/groups.riscv.org/forum/#!topic/isa-dev/bwWFhBnnZFQ
[2]: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/commit/?id=489553dd13a88d8a882db10622ba8b9b58582ce4
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv