openrisc: place exception table at the head of vmlinux
Subsystems (2)
PATCH 1/1 openrisc: place exception table at the head of vmlinux
Since commit 0043ecea2399 ("vmlinux.lds.h: Adjust symbol ordering in text output section"), the exception table in arch/openrisc/kernel/head.S is no longer positioned at the very beginning of the kernel image, which causes a boot failure.
Currently, the exception table resides in the regular .text section. Previously, it was placed at the head by relying on the linker receiving arch/openrisc/kernel/head.o as the first object. However, this behavior has changed because sections like .text.{asan,unknown,unlikely,hot} now precede the regular .text section.
The .head.text section is intended for entry points requiring special placement. However, in OpenRISC, this section has been misused: instead of the entry points, it contains boot code meant to be discarded after booting. This feature is typically handled by the .init.text section.
This commit addresses the issue by replacing the current __HEAD marker with __INIT and re-annotating the entry points with __HEAD. Additionally, it adds __REF to entry.S to suppress the following modpost warning:
WARNING: modpost: vmlinux: section mismatch in reference: _tng_kernel_start+0x70 (section: .text) -> _start (section: .init.text)
---
arch/openrisc/kernel/entry.S | 2 ++ arch/openrisc/kernel/head.S | 6 ++++-- arch/openrisc/kernel/vmlinux.lds.S | 3 +-- scripts/head-object-list.txt | 1 - 4 files changed, 7 insertions(+), 5 deletions(-)
arch/openrisc/kernel/entry.S +2 -0
@@ -239,6 +239,8 @@ handler: ;\ /* =====================================================[ exceptions] === */ + __REF + /* ---[ 0x100: RESET exception ]----------------------------------------- */ EXCEPTION_ENTRY(_tng_kernel_start)
arch/openrisc/kernel/head.S +4 -2
@@ -357,6 +357,8 @@ /* =====================================================[ exceptions] === */ + __HEAD + /* ---[ 0x100: RESET exception ]----------------------------------------- */ .org 0x100 /* Jump to .init code at _start which lives in the .head section
@@ -506,10 +508,10 @@ _dispatch_do_ipage_fault: /* .text*/ -/* This early stuff belongs in HEAD, but some of the functions below definitely +/* This early stuff belongs in the .init.text section, but some of the functions below definitely * don't... */ - __HEAD + __INIT .global _start _start: /* Init r0 to zero as per spec */
arch/openrisc/kernel/vmlinux.lds.S +1 -2
@@ -50,6 +50,7 @@ SECTIONS .text : AT(ADDR(.text) - LOAD_OFFSET) { _stext = .; + HEAD_TEXT TEXT_TEXT SCHED_TEXT LOCK_TEXT
@@ -83,8 +84,6 @@ SECTIONS . = ALIGN(PAGE_SIZE); __init_begin = .; - HEAD_TEXT_SECTION - /* Page aligned */ INIT_TEXT_SECTION(PAGE_SIZE)
scripts/head-object-list.txt +0 -1
@@ -24,7 +24,6 @@ arch/m68k/kernel/head.o arch/m68k/kernel/sun3-head.o arch/microblaze/kernel/head.o arch/nios2/kernel/head.o -arch/openrisc/kernel/head.o arch/parisc/kernel/head.o arch/powerpc/kernel/head_44x.o arch/powerpc/kernel/head_64.o
Signature · 1 line
2.43.0
Quoted 20 lines · Masahiro Yamada
Since commit
0043ecea2399("vmlinux.lds.h: Adjust symbol ordering in text output section"), the exception table inarch/openrisc/kernel/head.Sis no longer positioned at the very beginning of the kernel image, which causes a boot failure.Currently, the exception table resides in the regular .text section. Previously, it was placed at the head by relying on the linker receiving
arch/openrisc/kernel/head.oas the first object. However, this behavior has changed because sections like .text.{asan,unknown,unlikely,hot} now precede the regular .text section.The .head.text section is intended for entry points requiring special placement. However, in OpenRISC, this section has been misused: instead of the entry points, it contains boot code meant to be discarded after booting. This feature is typically handled by the .init.text section.
This commit addresses the issue by replacing the current
__HEADmarker with__INITand re-annotating the entry points with__HEAD. Additionally, it adds__REFtoentry.Sto suppress the following modpost warning:
Quoted 6 lines
WARNING: modpost: vmlinux: section mismatch in reference:
_tng_kernel_start+0x70(section: .text) ->_start(section: .init.text)Fixes 0043ecea2399 ("vmlinux.lds.h: Adjust symbol ordering in text output section")Reported-by Guenter Roeck <[email protected]>Signed-off-by Masahiro Yamada <[email protected]>
Guenter
Rong Xu
Reviewed-byThis looks good to me.
-Rong
Quoted 32 lines · Guenter Roeck
Quoted 20 lines · Masahiro Yamada
Since commit
0043ecea2399("vmlinux.lds.h: Adjust symbol ordering in text output section"), the exception table inarch/openrisc/kernel/head.Sis no longer positioned at the very beginning of the kernel image, which causes a boot failure.Currently, the exception table resides in the regular .text section. Previously, it was placed at the head by relying on the linker receiving
arch/openrisc/kernel/head.oas the first object. However, this behavior has changed because sections like .text.{asan,unknown,unlikely,hot} now precede the regular .text section.The .head.text section is intended for entry points requiring special placement. However, in OpenRISC, this section has been misused: instead of the entry points, it contains boot code meant to be discarded after booting. This feature is typically handled by the .init.text section.
This commit addresses the issue by replacing the current
__HEADmarker with__INITand re-annotating the entry points with__HEAD. Additionally, it adds__REFtoentry.Sto suppress the following modpost warning:Quoted 6 lines
WARNING: modpost: vmlinux: section mismatch in reference:
_tng_kernel_start+0x70(section: .text) ->_start(section: .init.text)Fixes 0043ecea2399 ("vmlinux.lds.h: Adjust symbol ordering in text output section")Reported-by Guenter Roeck <[email protected]>Signed-off-by Masahiro Yamada <[email protected]>Tested-by Guenter Roeck <[email protected]>Guenter
Stafford Horne
maintainerHello,
This looks ok to me too. I also confirmed that the symbols that end up in the .init.text of head.o are correct.
I will queue this to go in the next rc.
-Stafford
Quoted 39 lines · Rong Xu
This looks good to me.
Reviewed-by Rong Xu <[email protected]>-Rong
Quoted 32 lines · Guenter Roeck
Quoted 20 lines · Masahiro Yamada
Since commit
0043ecea2399("vmlinux.lds.h: Adjust symbol ordering in text output section"), the exception table inarch/openrisc/kernel/head.Sis no longer positioned at the very beginning of the kernel image, which causes a boot failure.Currently, the exception table resides in the regular .text section. Previously, it was placed at the head by relying on the linker receiving
arch/openrisc/kernel/head.oas the first object. However, this behavior has changed because sections like .text.{asan,unknown,unlikely,hot} now precede the regular .text section.The .head.text section is intended for entry points requiring special placement. However, in OpenRISC, this section has been misused: instead of the entry points, it contains boot code meant to be discarded after booting. This feature is typically handled by the .init.text section.
This commit addresses the issue by replacing the current
__HEADmarker with__INITand re-annotating the entry points with__HEAD. Additionally, it adds__REFtoentry.Sto suppress the following modpost warning:Quoted 6 lines
WARNING: modpost: vmlinux: section mismatch in reference:
_tng_kernel_start+0x70(section: .text) ->_start(section: .init.text)Fixes 0043ecea2399 ("vmlinux.lds.h: Adjust symbol ordering in text output section")Reported-by Guenter Roeck <[email protected]>Signed-off-by Masahiro Yamada <[email protected]>Tested-by Guenter Roeck <[email protected]>Guenter