Skip to contentSkip to conversation

Fix the combination of CONFIG_RELOCATABLE=y and CONFIG_MIPS_ELF_APPENDED_DTB=y

PATCH Applied Yasha Cherikovsky 2 participants 5 messages Mar 8, 2019 – Mar 11, 2019 MIPS

lore
Share & tools
lore
#0 lore raw

cover Fix the combination of CONFIG_RELOCATABLE=y and CONFIG_MIPS_ELF_APPENDED_DTB=y

Hi,

I sent this patch almost 5 months ago but received no response [1]. I'm sending it again now, on top of v5.0.

Full details are in the commit message.
Please review.

Thanks,
Yasha

[1] https://lkml.org/lkml/2018/10/20/175

Yasha Cherikovsky (1):
MIPS: Ensure ELF appended dtb is relocated

 arch/mips/kernel/vmlinux.lds.S | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/1 MIPS: Ensure ELF appended dtb is relocated

This fixes booting with the combination of CONFIG_RELOCATABLE=y and CONFIG_MIPS_ELF_APPENDED_DTB=y.

Sections that appear after the relocation table are not relocated on system boot (except .bss, which has special handling).

With CONFIG_MIPS_ELF_APPENDED_DTB, the dtb is part of the vmlinux ELF, so it must be relocated together with everything else.

Fixes 069fd766271d ("MIPS: Reserve space for relocation table")
Cc Ralf Baechle <[email protected]>
Cc Paul Burton <[email protected]>
Cc James Hogan <[email protected]>
---
 arch/mips/kernel/vmlinux.lds.S | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
arch/mips/kernel/vmlinux.lds.S +7 -5
index cb7e9ed7a453..33ee0d18fb0a 100644
@@ -140,6 +140,13 @@ SECTIONS
 	PERCPU_SECTION(1 << CONFIG_MIPS_L1_CACHE_SHIFT)
 #endif
 
+#ifdef CONFIG_MIPS_ELF_APPENDED_DTB
+	.appended_dtb : AT(ADDR(.appended_dtb) - LOAD_OFFSET) {
+		*(.appended_dtb)
+		KEEP(*(.appended_dtb))
+	}
+#endif
+
 #ifdef CONFIG_RELOCATABLE
 	. = ALIGN(4);
 
@@ -164,11 +171,6 @@ SECTIONS
 	__appended_dtb = .;
 	/* leave space for appended DTB */
 	. += 0x100000;
-#elif defined(CONFIG_MIPS_ELF_APPENDED_DTB)
-	.appended_dtb : AT(ADDR(.appended_dtb) - LOAD_OFFSET) {
-		*(.appended_dtb)
-		KEEP(*(.appended_dtb))
-	}
 #endif
 	/*
 	 * Align to 64K in attempt to eliminate holes before the
Signature · 1 line
2.21.0
#2 lore raw

Re: [PATCH 1/1] MIPS: Ensure ELF appended dtb is relocated

Hi Yasha,

Quoted 8 lines · Yasha Cherikovsky

This fixes booting with the combination of CONFIG_RELOCATABLE=y and CONFIG_MIPS_ELF_APPENDED_DTB=y.

Sections that appear after the relocation table are not relocated on system boot (except .bss, which has special handling).

With CONFIG_MIPS_ELF_APPENDED_DTB, the dtb is part of the vmlinux ELF, so it must be relocated together with everything else.

Do you have any ideas how CONFIG_RELOCATABLE interacts with CONFIG_MIPS_RAW_APPENDED_DTB? I'm wondering whether we should move both variants of appended DTB to before .data.reloc, but haven't yet thought it through.

Thanks,
Paul

Quoted 44 lines
Fixes 069fd766271d ("MIPS: Reserve space for relocation table")
Cc Ralf Baechle <[email protected]>
Cc Paul Burton <[email protected]>
Cc James Hogan <[email protected]>
---
 arch/mips/kernel/vmlinux.lds.S | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
arch/mips/kernel/vmlinux.lds.S +7 -5
index cb7e9ed7a453..33ee0d18fb0a 100644
@@ -140,6 +140,13 @@ SECTIONS
 	PERCPU_SECTION(1 << CONFIG_MIPS_L1_CACHE_SHIFT)
 #endif
 
+#ifdef CONFIG_MIPS_ELF_APPENDED_DTB
+	.appended_dtb : AT(ADDR(.appended_dtb) - LOAD_OFFSET) {
+		*(.appended_dtb)
+		KEEP(*(.appended_dtb))
+	}
+#endif
+
 #ifdef CONFIG_RELOCATABLE
 	. = ALIGN(4);
 
@@ -164,11 +171,6 @@ SECTIONS
 	__appended_dtb = .;
 	/* leave space for appended DTB */
 	. += 0x100000;
-#elif defined(CONFIG_MIPS_ELF_APPENDED_DTB)
-	.appended_dtb : AT(ADDR(.appended_dtb) - LOAD_OFFSET) {
-		*(.appended_dtb)
-		KEEP(*(.appended_dtb))
-	}
 #endif
 	/*
 	 * Align to 64K in attempt to eliminate holes before the
Signature · 1 line
2.21.0
#3 lore raw

Re: [PATCH 1/1] MIPS: Ensure ELF appended dtb is relocated

Hi Paul,

Quoted 12 lines · Paul Burton

Hi Yasha,

Quoted 8 lines · Yasha Cherikovsky

This fixes booting with the combination of CONFIG_RELOCATABLE=y and CONFIG_MIPS_ELF_APPENDED_DTB=y.

Sections that appear after the relocation table are not relocated on system boot (except .bss, which has special handling).

With CONFIG_MIPS_ELF_APPENDED_DTB, the dtb is part of the vmlinux ELF, so it must be relocated together with everything else.

Quoted 8 lines

Do you have any ideas how CONFIG_RELOCATABLE interacts with CONFIG_MIPS_RAW_APPENDED_DTB? I'm wondering whether we should move both variants of appended DTB to before .data.reloc, but haven't yet thought it through.

Thanks,
Paul

I booted now a image with RELOCATABLE and MIPS_RAW_APPENDED_DTB and it works.

Behind the scenes it's complicated:

1. MIPS_RAW_APPENDED_DTB works this way (the way I understand it):
In run time, the dtb appears in memory right after the original vmlinux.bin image (the one that "make" created).
If the dtb was concatenated to vmlinuz.bin: at run time, after vmlinuz extracts vmlinux.bin,
it takes care of copying the dtb to the end of vmlinux.bin in memory. If the dtb was concatenated to vmlinux.bin at build time, no run-time work is needed.

2. Therefore, the __appended_dtb pointer in the linker script must point to the end of the actual data in vmlinux.bin.
So we can't move it to before .data.reloc.

3. When the kernel relocates itself, it doesn't copy the appended dtb along with the kernel.
This behavior is documented, see this code comment: [1].

Yasha

[1]
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/mips/kernel/relocate.c?h=v5.0#n339

Quoted 45 lines
Quoted 45 lines
Fixes 069fd766271d ("MIPS: Reserve space for relocation table")
Cc Ralf Baechle <[email protected]>
Cc Paul Burton <[email protected]>
Cc James Hogan <[email protected]>
---
 arch/mips/kernel/vmlinux.lds.S | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
arch/mips/kernel/vmlinux.lds.S +7 -5
index cb7e9ed7a453..33ee0d18fb0a 100644
@@ -140,6 +140,13 @@ SECTIONS
 	PERCPU_SECTION(1 << CONFIG_MIPS_L1_CACHE_SHIFT)
 #endif
 
+#ifdef CONFIG_MIPS_ELF_APPENDED_DTB
+	.appended_dtb : AT(ADDR(.appended_dtb) - LOAD_OFFSET) {
+		*(.appended_dtb)
+		KEEP(*(.appended_dtb))
+	}
+#endif
+
 #ifdef CONFIG_RELOCATABLE
 	. = ALIGN(4);
 
@@ -164,11 +171,6 @@ SECTIONS
 	__appended_dtb = .;
 	/* leave space for appended DTB */
 	. += 0x100000;
-#elif defined(CONFIG_MIPS_ELF_APPENDED_DTB)
-	.appended_dtb : AT(ADDR(.appended_dtb) - LOAD_OFFSET) {
-		*(.appended_dtb)
-		KEEP(*(.appended_dtb))
-	}
 #endif
 	/*
 	 * Align to 64K in attempt to eliminate holes before the
Signature · 1 line
2.21.0
Applied
#4 lore raw

Re: [PATCH 1/1] MIPS: Ensure ELF appended dtb is relocated

In reply to Yasha Cherikovsky

Hello,

Quoted 9 lines · Yasha Cherikovsky

This fixes booting with the combination of CONFIG_RELOCATABLE=y and CONFIG_MIPS_ELF_APPENDED_DTB=y.

Sections that appear after the relocation table are not relocated on system boot (except .bss, which has special handling).

With CONFIG_MIPS_ELF_APPENDED_DTB, the dtb is part of the vmlinux ELF, so it must be relocated together with everything else.

Quoted 7 lines
Fixes 069fd766271d ("MIPS: Reserve space for relocation table")
Cc Ralf Baechle <[email protected]>
Cc Paul Burton <[email protected]>
Cc James Hogan <[email protected]>

Applied to mips-fixes.

Thanks,
Paul

[ This message was auto-generated; if you believe anything is incorrect
then please email [email protected] to report it. ]