diff options
| author | Zong Li <zong@andestech.com> | 2018-03-15 09:50:47 +0100 |
|---|---|---|
| committer | Palmer Dabbelt <palmer@sifive.com> | 2018-04-03 05:00:55 +0200 |
| commit | 29e405cd88c373ddcb3399687311aa869a7c8ee7 (patch) | |
| tree | d3c60f4aa52ca648f52fa0e19b63f3d90452927a /arch/riscv/kernel/module.c | |
| parent | RISC-V: Support RVC_BRANCH/JUMP relocation type in kernel modulewq (diff) | |
| download | linux-29e405cd88c373ddcb3399687311aa869a7c8ee7.tar.xz linux-29e405cd88c373ddcb3399687311aa869a7c8ee7.zip | |
RISC-V: Support ALIGN relocation type in kernel module
Just fail on align type. Kernel modules loader didn't do relax
like linker, it is difficult to remove or migrate the code,
but the remnant nop instructions harm the performaace of module.
We expect the building module with the no-relax option.
Signed-off-by: Zong Li <zong@andestech.com>
Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/riscv/kernel/module.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c index 7ab6a9b72384..957933e669b1 100644 --- a/arch/riscv/kernel/module.c +++ b/arch/riscv/kernel/module.c @@ -240,6 +240,15 @@ static int apply_r_riscv_relax_rela(struct module *me, u32 *location, return 0; } +static int apply_r_riscv_align_rela(struct module *me, u32 *location, + Elf_Addr v) +{ + pr_err( + "%s: The unexpected relocation type 'R_RISCV_ALIGN' from PC = %p\n", + me->name, location); + return -EINVAL; +} + static int (*reloc_handlers_rela[]) (struct module *me, u32 *location, Elf_Addr v) = { [R_RISCV_64] = apply_r_riscv_64_rela, @@ -257,6 +266,7 @@ static int (*reloc_handlers_rela[]) (struct module *me, u32 *location, [R_RISCV_CALL_PLT] = apply_r_riscv_call_plt_rela, [R_RISCV_CALL] = apply_r_riscv_call_rela, [R_RISCV_RELAX] = apply_r_riscv_relax_rela, + [R_RISCV_ALIGN] = apply_r_riscv_align_rela, }; int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab, |