mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: BAREBOX <barebox@lists.infradead.org>
Cc: "Claude Sonnet 4.5" <noreply@anthropic.com>
Subject: [PATCH 05/19] riscv: implement elf_apply_relocations() for ELF relocation support
Date: Mon, 05 Jan 2026 12:26:46 +0100	[thread overview]
Message-ID: <20260105-pbl-load-elf-v1-5-e97853f98232@pengutronix.de> (raw)
In-Reply-To: <20260105-pbl-load-elf-v1-0-e97853f98232@pengutronix.de>

Add architecture-specific ELF relocation support for RISC-V,
enabling dynamic relocation of position-independent ELF binaries.

RISC-V implementation:
- Both RV32 and RV64 use RELA format with relocations:
  * R_RISCV_NONE (0): No operation
  * R_RISCV_32 (1): 32-bit absolute relocation (RV32)
  * R_RISCV_64 (2): 64-bit absolute relocation (RV64)
  * R_RISCV_RELATIVE (3): Base-relative adjustment
  * Parse the PT_DYNAMIC section to find relocation tables
  * Support both regular and PBL builds (obj-pbl-y)
  * Follow the same pattern as ARM32/ARM64 implementations
  * Validate ELF class matches architecture pointer size
  * Return appropriate error codes for unsupported relocations

The relocation constants are added to arch/*/include/asm/elf.h for
use by the dynamic linker and bootloader code.

These implementations enable support for loading position-independent
ELF binaries in barebox PBL, which will be used when the compressed
payload is switched from raw binary to ELF format (similar to the
recent ARM changes).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/riscv/lib/Makefile    |   1 +
 arch/riscv/lib/elf_reloc.c | 212 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 213 insertions(+)

diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile
index 693248080070338ce26952cb1d9a831937d7f388..ee53e4602126d2ce7da2cdc42f21f92b22232f1a 100644
--- a/arch/riscv/lib/Makefile
+++ b/arch/riscv/lib/Makefile
@@ -3,6 +3,7 @@
 extra-y += barebox.lds
 
 obj-y += dtb.o
+obj-pbl-$(CONFIG_ELF) += elf_reloc.o
 obj-pbl-y += sections.o setupc.o reloc.o sections.o runtime-offset.o
 obj-$(CONFIG_ARCH_HAS_SJLJ) += setjmp.o longjmp.o
 obj-$(CONFIG_RISCV_OPTIMZED_STRING_FUNCTIONS) += memcpy.o memset.o memmove.o
diff --git a/arch/riscv/lib/elf_reloc.c b/arch/riscv/lib/elf_reloc.c
new file mode 100644
index 0000000000000000000000000000000000000000..11e44e2c816185d7b4722f2ead698b32bd562de0
--- /dev/null
+++ b/arch/riscv/lib/elf_reloc.c
@@ -0,0 +1,212 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <common.h>
+#include <elf.h>
+#include <errno.h>
+#include <asm/elf.h>
+
+#if __SIZEOF_POINTER__ == 8
+
+/*
+ * Parse dynamic section and extract relocation info for RISC-V 64-bit
+ */
+static int parse_dynamic_section(struct elf_image *elf, Elf64_Dyn *dyn,
+				  Elf64_Rela **rela_out, u64 *relasz_out)
+{
+	Elf64_Rela *rela = NULL;
+	u64 relasz = 0, relaent = 0;
+	int i;
+	phys_addr_t base = (phys_addr_t)elf->reloc_offset;
+
+	/* Iterate through dynamic entries until DT_NULL */
+	for (i = 0; dyn[i].d_tag != DT_NULL; i++) {
+		switch (dyn[i].d_tag) {
+		case DT_RELA:
+			/* RELA table address - needs to be adjusted by load offset */
+			rela = (Elf64_Rela *)(base + dyn[i].d_un.d_ptr);
+			break;
+		case DT_RELASZ:
+			relasz = dyn[i].d_un.d_val;
+			break;
+		case DT_RELAENT:
+			relaent = dyn[i].d_un.d_val;
+			break;
+		case DT_REL:
+			pr_err("RISC-V 64 uses RELA, not REL relocations\n");
+			return -EINVAL;
+		default:
+			break;
+		}
+	}
+
+	if (!rela || !relasz || relaent != sizeof(Elf64_Rela)) {
+		pr_debug("No relocations or invalid relocation info\n");
+		return -EINVAL;
+	}
+
+	*rela_out = rela;
+	*relasz_out = relasz;
+	return 0;
+}
+
+/*
+ * Apply RISC-V 64-bit ELF relocations
+ */
+int elf_apply_relocations(struct elf_image *elf, void *dyn_seg)
+{
+	Elf64_Dyn *dyn = dyn_seg;
+	Elf64_Rela *rela;
+	u64 relasz;
+	phys_addr_t base = (phys_addr_t)elf->reloc_offset;
+	int ret;
+
+	if (elf->class != ELFCLASS64) {
+		pr_err("Wrong ELF class for RISC-V 64 relocation\n");
+		return -EINVAL;
+	}
+
+	ret = parse_dynamic_section(elf, dyn, &rela, &relasz);
+	if (ret)
+		return ret;
+
+	/* Apply each relocation */
+	while (relasz > 0) {
+		u64 *fixup_addr;
+		u32 reloc_type = ELF64_R_TYPE(rela->r_info);
+
+		/* Calculate address to fix up */
+		fixup_addr = (u64 *)(base + rela->r_offset);
+
+		switch (reloc_type) {
+		case R_RISCV_NONE:
+			/* No operation */
+			break;
+
+		case R_RISCV_RELATIVE:
+			/* B(P) = B + A */
+			/* For RELA format: A = r_addend, B = base */
+			*fixup_addr = base + rela->r_addend;
+			break;
+
+		case R_RISCV_64:
+			/* B(P) = S + A */
+			/* S is the symbol value, for PIE it's base + addend */
+			*fixup_addr = base + rela->r_addend;
+			break;
+
+		default:
+			pr_err("Unsupported RISC-V relocation type: %u at offset 0x%llx\n",
+			       reloc_type, rela->r_offset);
+			return -EINVAL;
+		}
+
+		rela++;
+		relasz -= sizeof(Elf64_Rela);
+	}
+
+	return 0;
+}
+
+#else /* 32-bit RISC-V */
+
+/*
+ * Parse dynamic section and extract relocation info for RISC-V 32-bit
+ */
+static int parse_dynamic_section(struct elf_image *elf, Elf32_Dyn *dyn,
+				  Elf32_Rela **rela_out, u64 *relasz_out)
+{
+	Elf32_Rela *rela = NULL;
+	u64 relasz = 0, relaent = 0;
+	int i;
+	phys_addr_t base = (phys_addr_t)elf->reloc_offset;
+
+	/* Iterate through dynamic entries until DT_NULL */
+	for (i = 0; dyn[i].d_tag != DT_NULL; i++) {
+		switch (dyn[i].d_tag) {
+		case DT_RELA:
+			/* RELA table address - needs to be adjusted by load offset */
+			rela = (Elf32_Rela *)(base + dyn[i].d_un.d_ptr);
+			break;
+		case DT_RELASZ:
+			relasz = dyn[i].d_un.d_val;
+			break;
+		case DT_RELAENT:
+			relaent = dyn[i].d_un.d_val;
+			break;
+		case DT_REL:
+			pr_err("RISC-V 32 uses RELA, not REL relocations\n");
+			return -EINVAL;
+		default:
+			break;
+		}
+	}
+
+	if (!rela || !relasz || relaent != sizeof(Elf32_Rela)) {
+		pr_debug("No relocations or invalid relocation info\n");
+		return -EINVAL;
+	}
+
+	*rela_out = rela;
+	*relasz_out = relasz;
+	return 0;
+}
+
+/*
+ * Apply RISC-V 32-bit ELF relocations
+ */
+int elf_apply_relocations(struct elf_image *elf, void *dyn_seg)
+{
+	Elf32_Dyn *dyn = dyn_seg;
+	Elf32_Rela *rela;
+	u64 relasz;
+	phys_addr_t base = (phys_addr_t)elf->reloc_offset;
+	int ret;
+
+	if (elf->class != ELFCLASS32) {
+		pr_err("Wrong ELF class for RISC-V 32 relocation\n");
+		return -EINVAL;
+	}
+
+	ret = parse_dynamic_section(elf, dyn, &rela, &relasz);
+	if (ret)
+		return ret;
+
+	/* Apply each relocation */
+	while (relasz > 0) {
+		u32 *fixup_addr;
+		u32 reloc_type = ELF32_R_TYPE(rela->r_info);
+
+		/* Calculate address to fix up */
+		fixup_addr = (u32 *)(base + rela->r_offset);
+
+		switch (reloc_type) {
+		case R_RISCV_NONE:
+			/* No operation */
+			break;
+
+		case R_RISCV_RELATIVE:
+			/* B(P) = B + A */
+			/* For RELA format: A = r_addend, B = base */
+			*fixup_addr = base + rela->r_addend;
+			break;
+
+		case R_RISCV_32:
+			/* B(P) = S + A */
+			/* S is the symbol value, for PIE it's base + addend */
+			*fixup_addr = base + rela->r_addend;
+			break;
+
+		default:
+			pr_err("Unsupported RISC-V relocation type: %u at offset 0x%x\n",
+			       reloc_type, rela->r_offset);
+			return -EINVAL;
+		}
+
+		rela++;
+		relasz -= sizeof(Elf32_Rela);
+	}
+
+	return 0;
+}
+
+#endif

-- 
2.47.3




  parent reply	other threads:[~2026-01-05 11:27 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-05 11:26 [PATCH 00/19] PBL: Add PBL ELF loading support with dynamic relocations Sascha Hauer
2026-01-05 11:26 ` [PATCH 01/19] elf: Use memcmp to make suitable for PBL Sascha Hauer
2026-01-05 11:46   ` Ahmad Fatoum
2026-01-05 11:26 ` [PATCH 02/19] elf: build for PBL as well Sascha Hauer
2026-01-05 11:26 ` [PATCH 03/19] elf: add dynamic relocation support Sascha Hauer
2026-01-05 14:05   ` Ahmad Fatoum
2026-01-05 11:26 ` [PATCH 04/19] ARM: implement elf_apply_relocations() for ELF " Sascha Hauer
2026-01-05 11:58   ` Ahmad Fatoum
2026-01-05 19:53     ` Sascha Hauer
2026-01-05 11:26 ` Sascha Hauer [this message]
2026-01-05 11:26 ` [PATCH 06/19] elf: implement elf_load_inplace() Sascha Hauer
2026-01-05 13:37   ` Ahmad Fatoum
2026-01-05 22:42     ` Sascha Hauer
2026-01-06  8:18       ` Ahmad Fatoum
2026-01-05 11:26 ` [PATCH 07/19] elf: create elf_open_binary_into() Sascha Hauer
2026-01-05 11:26 ` [PATCH 08/19] Makefile: add barebox.elf build target Sascha Hauer
2026-01-05 12:22   ` Ahmad Fatoum
2026-01-05 15:43     ` Sascha Hauer
2026-01-05 17:11       ` Ahmad Fatoum
2026-01-05 11:26 ` [PATCH 09/19] PBL: allow to link ELF image into PBL Sascha Hauer
2026-01-05 12:11   ` Ahmad Fatoum
2026-01-05 11:26 ` [PATCH 10/19] mmu: add MAP_CACHED_RO mapping type Sascha Hauer
2026-01-05 12:14   ` Ahmad Fatoum
2026-01-05 11:26 ` [PATCH 11/19] mmu: introduce pbl_remap_range() Sascha Hauer
2026-01-05 12:15   ` Ahmad Fatoum
2026-01-06  8:50     ` Ahmad Fatoum
2026-01-06  9:25       ` Sascha Hauer
2026-01-05 11:26 ` [PATCH 12/19] ARM: use relative jumps in exception table Sascha Hauer
2026-01-05 11:44   ` Ahmad Fatoum
2026-01-05 12:29     ` Sascha Hauer
2026-01-05 12:31       ` Ahmad Fatoum
2026-01-05 11:26 ` [PATCH 13/19] ARM: exceptions: make in-binary exception table const Sascha Hauer
2026-01-05 11:26 ` [PATCH 14/19] ARM: linker script: create separate PT_LOAD segments for text, rodata, and data Sascha Hauer
2026-01-05 13:11   ` Ahmad Fatoum
2026-01-05 23:01     ` Sascha Hauer
2026-01-06  7:59       ` Ahmad Fatoum
2026-01-05 11:26 ` [PATCH 15/19] ARM: link ELF image into PBL Sascha Hauer
2026-01-05 12:27   ` Ahmad Fatoum
2026-01-05 11:26 ` [PATCH 16/19] ARM: PBL: setup MMU with proper permissions from ELF segments Sascha Hauer
2026-01-05 12:58   ` Ahmad Fatoum
2026-01-05 11:26 ` [PATCH 17/19] riscv: link ELF image into PBL Sascha Hauer
2026-01-05 13:12   ` Ahmad Fatoum
2026-01-05 11:26 ` [PATCH 18/19] riscv: linker script: create separate PT_LOAD segments for text, rodata, and data Sascha Hauer
2026-01-05 13:40   ` Ahmad Fatoum
2026-01-05 11:27 ` [PATCH 19/19] riscv: add ELF segment-based memory protection with MMU Sascha Hauer
2026-01-05 13:58   ` Ahmad Fatoum
2026-01-05 14:08 ` [PATCH 00/19] PBL: Add PBL ELF loading support with dynamic relocations Ahmad Fatoum
2026-01-05 16:47   ` Sascha Hauer
2026-01-06  8:35     ` Ahmad Fatoum

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260105-pbl-load-elf-v1-5-e97853f98232@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=noreply@anthropic.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox