riscv: module: Allocate PLT entries for R_RISCV_PLT32
authorSamuel Holland <samuel.holland@sifive.com>
Wed, 9 Apr 2025 17:14:50 +0000 (10:14 -0700)
committerAlexandre Ghiti <alexghiti@rivosinc.com>
Mon, 14 Apr 2025 13:07:07 +0000 (13:07 +0000)
apply_r_riscv_plt32_rela() may need to emit a PLT entry for the
referenced symbol, so there must be space allocated in the PLT.

Fixes: 8fd6c5142395 ("riscv: Add remaining module relocations")
Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Link: https://lore.kernel.org/r/20250409171526.862481-2-samuel.holland@sifive.com
Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
arch/riscv/kernel/module-sections.c

index e264e59e596e80d71166107f7b5763f74fbf02c8..91d0b355ceeff62e63e8d24ca8d935b9e17d25f7 100644 (file)
@@ -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;
                }
        }
 }