Unverified Commit 29e405cd authored by Zong Li's avatar Zong Li Committed by Palmer Dabbelt
Browse files

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: default avatarZong Li <zong@andestech.com>
Signed-off-by: default avatarPalmer Dabbelt <palmer@sifive.com>
parent 56ea45ae

arch/riscv/kernel/module.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -240,6 +240,15 @@ static int apply_r_riscv_relax_rela(struct module *me, u32 *location, 
	return 0;

	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,

static int (*reloc_handlers_rela[]) (struct module *me, u32 *location,

				Elf_Addr v) = {

				Elf_Addr v) = {

	[R_RISCV_64]			= apply_r_riscv_64_rela,

	[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_PLT]		= apply_r_riscv_call_plt_rela,

	[R_RISCV_CALL]			= apply_r_riscv_call_rela,

	[R_RISCV_CALL]			= apply_r_riscv_call_rela,

	[R_RISCV_RELAX]			= apply_r_riscv_relax_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,

int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,

CRA Git | Maintained and supported by SUSTech CRA and CCSE