riscv: Support R_RISCV_ADD64 and R_RISCV_SUB64 relocs
Subsystems (3)
PATCH v3 1/2 riscv: Support R_RISCV_ADD64 and R_RISCV_SUB64 relocs
These are needed for the __jump_table in modules using static keys/jump-labels with the layout from HAVE_ARCH_JUMP_LABEL_RELATIVE on 64bit kernels.
---
Tested on the HiFive Unleashed board.
No changes since v2.
This patch is new in v2. It fixes an error loading modules containing static keys found by Björn Töpel.
arch/riscv/kernel/module.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/riscv/kernel/module.c +16 -0
@@ -263,6 +263,13 @@ static int apply_r_riscv_add32_rela(struct module *me, u32 *location,return 0 ; } +static int apply_r_riscv_add64_rela (struct module *me,u32 *location, +Elf_Addr v) +{ + *(u64 *)location += (u64 )v; +return 0 ; +} +static int apply_r_riscv_sub32_rela (struct module *me,u32 *location,Elf_Addr v) {
@@ -270,6 +277,13 @@ static int apply_r_riscv_sub32_rela(struct module *me, u32 *location,return 0 ; } +static int apply_r_riscv_sub64_rela (struct module *me,u32 *location, +Elf_Addr v) +{ + *(u64 *)location -= (u64 )v; +return 0 ; +} +static int (*reloc_handlers_rela[]) (struct module *me,u32 *location,Elf_Addr v) = { [R_RISCV_32 ] = apply_r_riscv_32_rela,
@@ -290,7 +304,9 @@ static int (*reloc_handlers_rela[]) (struct module *me, u32 *location, [R_RISCV_RELAX] = apply_r_riscv_relax_rela, [R_RISCV_ALIGN] = apply_r_riscv_align_rela, [R_RISCV_ADD32] = apply_r_riscv_add32_rela, + [R_RISCV_ADD64] = apply_r_riscv_add64_rela, [R_RISCV_SUB32] = apply_r_riscv_sub32_rela, + [R_RISCV_SUB64] = apply_r_riscv_sub64_rela, }; int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
Signature · 1 line
2.27.0
PATCH v3 2/2 riscv: Add jump-label implementation
Add jump-label implementation based on the ARM64 version and add CONFIG_JUMP_LABEL=y to the defconfigs.
---
Tested on the HiFive Unleashed board.
Changes since v2:
- Add missing asm/asm.h include.
Changes since v1:
- WARN and give up gracefully if the jump offset cannot be represented in a JAL instruction.
- Add missing braces.
- Add CONFIG_JUMP_LABEL=y to defconfigs.
All suggested by Björn Töpel.
Changes since RFC:
- Use RISCV_PTR and RISCV_LGPTR macros to match struct jump_table also in 32bit kernels.
- Remove unneeded branch ? 1 : 0, thanks Björn
- Fix \n\n instead of \n\t mistake
.../core/jump-labels/arch-support.txt | 2 +- arch/riscv/Kconfig | 2 + arch/riscv/configs/defconfig | 1 + arch/riscv/configs/nommu_k210_defconfig | 1 + arch/riscv/configs/nommu_virt_defconfig | 1 + arch/riscv/configs/rv32_defconfig | 1 + arch/riscv/include/asm/jump_label.h | 60 +++++++++++++++++++ arch/riscv/kernel/Makefile | 2 + arch/riscv/kernel/jump_label.c | 49 +++++++++++++++ 9 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 arch/riscv/include/asm/jump_label.h create mode 100644 arch/riscv/kernel/jump_label.c
Documentation/features/core/jump-labels/arch-support.txt +1 -1
@@ -23,7 +23,7 @@ | openrisc: | TODO | | parisc: | ok | | powerpc: | ok | - | riscv: | TODO | + | riscv: | ok | | s390: | ok | | sh: | TODO | | sparc: | ok |
arch/riscv/Kconfig +2 -0
@@ -48,6 +48,8 @@ config RISCV select GENERIC_TIME_VSYSCALL if MMU && 64BIT select HANDLE_DOMAIN_IRQ select HAVE_ARCH_AUDITSYSCALL + select HAVE_ARCH_JUMP_LABEL + select HAVE_ARCH_JUMP_LABEL_RELATIVE select HAVE_ARCH_KASAN if MMU && 64BIT select HAVE_ARCH_KGDB select HAVE_ARCH_KGDB_QXFER_PKT
arch/riscv/configs/defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_BPF_SYSCALL=y CONFIG_SOC_SIFIVE=y CONFIG_SOC_VIRT=y CONFIG_SMP=y +CONFIG_JUMP_LABEL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_NET=y
arch/riscv/configs/nommu_k210_defconfig +1 -0
@@ -33,6 +33,7 @@ CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_CMDLINE="earlycon console=ttySIF0" CONFIG_CMDLINE_FORCE=y +CONFIG_JUMP_LABEL=y # CONFIG_BLOCK is not set CONFIG_BINFMT_FLAT=y # CONFIG_COREDUMP is not set
arch/riscv/configs/nommu_virt_defconfig +1 -0
@@ -30,6 +30,7 @@ CONFIG_MAXPHYSMEM_2GB=y CONFIG_SMP=y CONFIG_CMDLINE="root=/dev/vda rw earlycon=uart8250,mmio,0x10000000,115200n8 console=ttyS0" CONFIG_CMDLINE_FORCE=y +CONFIG_JUMP_LABEL=y # CONFIG_BLK_DEV_BSG is not set CONFIG_PARTITION_ADVANCED=y # CONFIG_MSDOS_PARTITION is not set
arch/riscv/configs/rv32_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_BPF_SYSCALL=y CONFIG_SOC_VIRT=y CONFIG_ARCH_RV32I=y CONFIG_SMP=y +CONFIG_JUMP_LABEL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_NET=y
arch/riscv/include/asm/jump_label.h new file +60 -0
60 lines not on this page · raw message
arch/riscv/kernel/Makefile +2 -0
@@ -53,4 +53,6 @@ endif obj-$(CONFIG_HOTPLUG_CPU) += cpu-hotplug.o obj-$(CONFIG_KGDB) += kgdb.o +obj-$(CONFIG_JUMP_LABEL) += jump_label.o + clean:
arch/riscv/kernel/jump_label.c new file +49 -0
49 lines not on this page · raw message
Signature · 1 line
2.27.0
Palmer Dabbelt
maintainerQuoted 7 lines · On Tue, 14 Jul 2020 00:40:43 PDT (-0700), [email protected] wrote:
These are needed for the
__jump_tablein modules using static keys/jump-labels with the layout fromHAVE_ARCH_JUMP_LABEL_RELATIVEon 64bit kernels.Signed-off-by Emil Renner Berthing <[email protected]>Reviewed-by Björn Töpel <[email protected]>Tested-by Björn Töpel <[email protected]>
These are on for-next. Thanks!
Quoted 53 lines
---
Tested on the HiFive Unleashed board.No changes since v2.
This patch is new in v2. It fixes an error loading modules containing static keys found by Björn Töpel.
arch/riscv/kernel/module.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)arch/riscv/kernel/module.c +16
-0@@ -263,6 +263,13 @@ static int apply_r_riscv_add32_rela(struct module *me, u32 *location,return 0 ; } +static int apply_r_riscv_add64_rela (struct module *me,u32 *location, +Elf_Addr v) +{ + *(u64 *)location += (u64 )v; +return 0 ; +} +static int apply_r_riscv_sub32_rela (struct module *me,u32 *location,Elf_Addr v) {@@ -270,6 +277,13 @@ static int apply_r_riscv_sub32_rela(struct module *me, u32 *location,return 0 ; } +static int apply_r_riscv_sub64_rela (struct module *me,u32 *location, +Elf_Addr v) +{ + *(u64 *)location -= (u64 )v; +return 0 ; +} +static int (*reloc_handlers_rela[]) (struct module *me,u32 *location,Elf_Addr v) = { [R_RISCV_32 ] = apply_r_riscv_32_rela,@@ -290,7 +304,9 @@ static int (*reloc_handlers_rela[]) (struct module *me, u32 *location, [R_RISCV_RELAX] = apply_r_riscv_relax_rela, [R_RISCV_ALIGN] = apply_r_riscv_align_rela, [R_RISCV_ADD32] = apply_r_riscv_add32_rela, + [R_RISCV_ADD64] = apply_r_riscv_add64_rela, [R_RISCV_SUB32] = apply_r_riscv_sub32_rela, + [R_RISCV_SUB64] = apply_r_riscv_sub64_rela, }; int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,