Skip to content

riscv: Add remaining module relocations #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xmzzz wants to merge 12 commits into
base: rvck-6.6
Choose a base branch
from
+588 −158
Open

riscv: Add remaining module relocations #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9edcccb
Revert "riscv: kernel: Optimize apply_relocate_add()"
xmzzz Jul 14, 2026
9d63fc7
riscv: Avoid unaligned access when relocating modules
esmil Nov 1, 2023
0c7620a
riscv: Add remaining module relocations
charlie-rivos Nov 1, 2023
3945c63
RISC-V: Don't rely on positional structure initialization
palmer-dabbelt Nov 7, 2023
d65c48d
riscv: Safely remove entries from relocation list
charlie-rivos Nov 27, 2023
ad12f9d
riscv: Correct type casting in module loading
charlie-rivos Nov 27, 2023
4beeee5
riscv: module: Allocate PLT entries for R_RISCV_PLT32
SiFiveHolland Apr 9, 2025
b58e392
riscv: Fix module loading free order
charlie-rivos Jan 4, 2024
343b159
riscv: Correctly free relocation hashtable on error
charlie-rivos Jan 4, 2024
1b788c0
riscv: Fix relocation_hashtable size
charlie-rivos Jan 4, 2024
95c1bfc
riscv: module: remove relocation_head rel_entry member allocation
clementleger Nov 28, 2024
d182f33
riscv: Use kvmalloc_array on relocation_hashtable
Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion arch/riscv/include/uapi/asm/elf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 */
13 changes: 7 additions & 6 deletions arch/riscv/kernel/module-sections.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,17 @@ static bool duplicate_rela(const Elf_Rela *rela, int idx)
static void count_max_entries(Elf_Rela *relas, int num,
unsigned int *plts, unsigned int *gots)
{
unsigned int type, i;

for (i = 0; i < num; i++) {
type = ELF_RISCV_R_TYPE(relas[i].r_info);
if (type == R_RISCV_CALL_PLT) {
for (int i = 0; i < num; i++) {
switch (ELF_R_TYPE(relas[i].r_info)) {
case R_RISCV_CALL_PLT:
case R_RISCV_PLT32:
if (!duplicate_rela(relas, i))
(*plts)++;
} else if (type == R_RISCV_GOT_HI20) {
break;
case R_RISCV_GOT_HI20:
if (!duplicate_rela(relas, i))
(*gots)++;
break;
}
}
}
Expand Down
Loading
Loading