arm64 module: remove (NOLOAD)
PATCH 1/1 arm64 module: remove (NOLOAD)
On ELF, (NOLOAD) sets the section type to SHT_NOBITS[1]. It is conceptually inappropriate for .plt and .text.* sections which are always SHT_PROGBITS.
In GNU ld, if PLT entries are needed, .plt will be SHT_PROGBITS anyway and (NOLOAD) will be essentially ignored. In ld.lld, since
https://reviews.llvm.org/D118840 ("[ELF] Support (TYPE=<value>) to customize the output section type"), ld.lld will report a section type mismatch error. Just remove (NOLOAD) to fix the error.
[1] https://lld.llvm.org/ELF/linker_script.html As of today, "The section should be marked as not loadable" on
https://sourceware.org/binutils/docs/ld/Output-Section-Type.html is outdated for ELF.
--- arch/arm64/include/asm/module.lds.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/include/asm/module.lds.h +3 -3
@@ -1,8 +1,8 @@ SECTIONS { #ifdef CONFIG_ARM64_MODULE_PLTS - .plt 0 (NOLOAD) : { BYTE(0) } - .init.plt 0 (NOLOAD) : { BYTE(0) } - .text.ftrace_trampoline 0 (NOLOAD) : { BYTE(0) } + .plt 0 : { BYTE(0) } + .init.plt 0 : { BYTE(0) } + .text.ftrace_trampoline 0 : { BYTE(0) } #endif #ifdef CONFIG_KASAN_SW_TAGS
Signature · 1 line
2.35.1.265.g69c8d7142f-goog
Quoted 11 lines · Fangrui Song
On ELF, (NOLOAD) sets the section type to SHT_NOBITS[1]. It is conceptually inappropriate for .plt and .text.* sections which are always
SHT_PROGBITS.In GNU ld, if PLT entries are needed, .plt will be
SHT_PROGBITSanyway and (NOLOAD) will be essentially ignored. In ld.lld, since
https://reviews.llvm.org/D118840 ("[ELF] Support (TYPE=<value>) to customize the output section type"), ld.lld will report asection type mismatcherror. Just remove (NOLOAD) to fix the error.
Quoted 4 lines
[1] https://lld.llvm.org/ELF/linker_script.html As of today, "The section should be marked as not loadable" on
https://sourceware.org/binutils/docs/ld/Output-Section-Type.html is outdated for ELF.
This patch lacks a SOB line.
With one added,
Quoted 23 lines
--- arch/arm64/include/asm/module.lds.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)arch/arm64/include/asm/module.lds.h +3
-4@@ -1,8 +1,8 @@ SECTIONS { #ifdef CONFIG_ARM64_MODULE_PLTS - .plt 0 (NOLOAD) : { BYTE(0) } - .init.plt 0 (NOLOAD) : { BYTE(0) } - .text.ftrace_trampoline 0 (NOLOAD) : { BYTE(0) } + .plt 0 : { BYTE(0) } + .init.plt 0 : { BYTE(0) } + .text.ftrace_trampoline 0 : { BYTE(0) } #endif #ifdef CONFIG_KASAN_SW_TAGS --2.35.1.265.g69c8d7142f-goog
Fangrui Song
Acked-by Ard BiesheuvelQuoted 17 lines · Ard Biesheuvel
Quoted 11 lines · Fangrui Song
On ELF, (NOLOAD) sets the section type to SHT_NOBITS[1]. It is conceptually inappropriate for .plt and .text.* sections which are always
SHT_PROGBITS.In GNU ld, if PLT entries are needed, .plt will be
SHT_PROGBITSanyway and (NOLOAD) will be essentially ignored. In ld.lld, since
https://reviews.llvm.org/D118840 ("[ELF] Support (TYPE=<value>) to customize the output section type"), ld.lld will report asection type mismatcherror. Just remove (NOLOAD) to fix the error.Quoted 4 lines
[1] https://lld.llvm.org/ELF/linker_script.html As of today, "The section should be marked as not loadable" on
https://sourceware.org/binutils/docs/ld/Output-Section-Type.html is outdated for ELF.
Quoted 5 lines
This patch lacks a SOB line.
With one added,
Acked-by Ard Biesheuvel <[email protected]>
Ah, yes. Sorry, I haven't sent a kernel patch for a while...
Quoted 23 lines
Quoted 23 lines
--- arch/arm64/include/asm/module.lds.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)arch/arm64/include/asm/module.lds.h +3
-4@@ -1,8 +1,8 @@ SECTIONS { #ifdef CONFIG_ARM64_MODULE_PLTS - .plt 0 (NOLOAD) : { BYTE(0) } - .init.plt 0 (NOLOAD) : { BYTE(0) } - .text.ftrace_trampoline 0 (NOLOAD) : { BYTE(0) } + .plt 0 : { BYTE(0) } + .init.plt 0 : { BYTE(0) } + .text.ftrace_trampoline 0 : { BYTE(0) } #endif #ifdef CONFIG_KASAN_SW_TAGS --2.35.1.265.g69c8d7142f-goog
Nathan Chancellor
Tested-byQuoted 22 lines · Fangrui Song
Quoted 21 lines · Ard Biesheuvel
Quoted 11 lines · Fangrui Song
On ELF, (NOLOAD) sets the section type to SHT_NOBITS[1]. It is conceptually inappropriate for .plt and .text.* sections which are always
SHT_PROGBITS.In GNU ld, if PLT entries are needed, .plt will be
SHT_PROGBITSanyway and (NOLOAD) will be essentially ignored. In ld.lld, since
https://reviews.llvm.org/D118840 ("[ELF] Support (TYPE=<value>) to customize the output section type"), ld.lld will report asection type mismatcherror. Just remove (NOLOAD) to fix the error.Quoted 4 lines
[1] https://lld.llvm.org/ELF/linker_script.html As of today, "The section should be marked as not loadable" on
https://sourceware.org/binutils/docs/ld/Output-Section-Type.html is outdated for ELF.This patch lacks a SOB line.
With one added,
Quoted 7 lines
Quoted 1 line
Acked-by Ard Biesheuvel <[email protected]>Ah, yes. Sorry, I haven't sent a kernel patch for a while...
Reported-by Nathan Chancellor <[email protected]>Signed-off-by Fangrui Song <[email protected]>Acked-by Ard Biesheuvel <[email protected]>
I am assuming this patch is the solution we want, as opposed to Ard's suggestion of renaming these sections at
https://reviews.llvm.org/D118840 (unless that was a tangential suggestion).
I have verified that modules still load. Additionally, this needs to go to stable so that groups who upgrade their toolchain to a revision that include the LLD patch don't get broken as well.
Quoted 24 lines
Quoted 23 lines
Quoted 23 lines
--- arch/arm64/include/asm/module.lds.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)arch/arm64/include/asm/module.lds.h +3
-4@@ -1,8 +1,8 @@ SECTIONS { #ifdef CONFIG_ARM64_MODULE_PLTS - .plt 0 (NOLOAD) : { BYTE(0) } - .init.plt 0 (NOLOAD) : { BYTE(0) } - .text.ftrace_trampoline 0 (NOLOAD) : { BYTE(0) } + .plt 0 : { BYTE(0) } + .init.plt 0 : { BYTE(0) } + .text.ftrace_trampoline 0 : { BYTE(0) } #endif #ifdef CONFIG_KASAN_SW_TAGS --2.35.1.265.g69c8d7142f-goog
Quoted 28 lines · Nathan Chancellor
Quoted 26 lines · Fangrui Song
Quoted 17 lines · Ard Biesheuvel
Quoted 11 lines · Fangrui Song
On ELF, (NOLOAD) sets the section type to SHT_NOBITS[1]. It is conceptually inappropriate for .plt and .text.* sections which are always
SHT_PROGBITS.In GNU ld, if PLT entries are needed, .plt will be
SHT_PROGBITSanyway and (NOLOAD) will be essentially ignored. In ld.lld, since
https://reviews.llvm.org/D118840 ("[ELF] Support (TYPE=<value>) to customize the output section type"), ld.lld will report asection type mismatcherror. Just remove (NOLOAD) to fix the error.Quoted 4 lines
[1] https://lld.llvm.org/ELF/linker_script.html As of today, "The section should be marked as not loadable" on
https://sourceware.org/binutils/docs/ld/Output-Section-Type.html is outdated for ELF.Quoted 5 lines
This patch lacks a SOB line.
With one added,
Acked-by Ard Biesheuvel <[email protected]>Ah, yes. Sorry, I haven't sent a kernel patch for a while...
Quoted 9 lines
Quoted 3 lines
Reported-by Nathan Chancellor <[email protected]>Signed-off-by Fangrui Song <[email protected]>Acked-by Ard Biesheuvel <[email protected]>I am assuming this patch is the solution we want, as opposed to Ard's suggestion of renaming these sections at
https://reviews.llvm.org/D118840 (unless that was a tangential suggestion).
Renaming will not make the problem go away. It will only clear up the confusion regarding the contents of these sections, which are not in fact linker emitted PLT entries, but branching veneers emitted by the kernel's module loader.
Quoted 32 lines
I have verified that modules still load. Additionally, this needs to go to stable so that groups who upgrade their toolchain to a revision that include the LLD patch don't get broken as well.
Quoted 24 lines
Quoted 23 lines
Quoted 23 lines
--- arch/arm64/include/asm/module.lds.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)arch/arm64/include/asm/module.lds.h +3
-4@@ -1,8 +1,8 @@ SECTIONS { #ifdef CONFIG_ARM64_MODULE_PLTS - .plt 0 (NOLOAD) : { BYTE(0) } - .init.plt 0 (NOLOAD) : { BYTE(0) } - .text.ftrace_trampoline 0 (NOLOAD) : { BYTE(0) } + .plt 0 : { BYTE(0) } + .init.plt 0 : { BYTE(0) } + .text.ftrace_trampoline 0 : { BYTE(0) } #endif #ifdef CONFIG_KASAN_SW_TAGS --2.35.1.265.g69c8d7142f-goog
Quoted 11 lines · Fangrui Song
On ELF, (NOLOAD) sets the section type to SHT_NOBITS[1]. It is conceptually inappropriate for .plt and .text.* sections which are always
SHT_PROGBITS.In GNU ld, if PLT entries are needed, .plt will be
SHT_PROGBITSanyway and (NOLOAD) will be essentially ignored. In ld.lld, since
https://reviews.llvm.org/D118840 ("[ELF] Support (TYPE=<value>) to customize the output section type"), ld.lld will report asection type mismatcherror. Just remove (NOLOAD) to fix the error.[...]
Applied to arm64 (for-next/linkage), thanks!
[1/1] arm64: module: remove (NOLOAD) from linker script
https://git.kernel.org/arm64/c/4013e26670c5
Cheers,
Signature · 5 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev
[tip: x86/core] arm64: module: remove (NOLOAD) from linker script
In reply to Fangrui SongThe following commit has been merged into the x86/core branch of tip:
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 4013e26670c590944abdab56c4fa797527b74325 Gitweb: https://git.kernel.org/tip/4013e26670c590944abdab56c4fa797527b74325 Author: Fangrui Song <[email protected]> AuthorDate: Fri, 18 Feb 2022 00:12:09 -08:00 Committer: Will Deacon <[email protected]> CommitterDate: Fri, 25 Feb 2022 14:06:50
arm64: module: remove (NOLOAD) from linker script
On ELF, (NOLOAD) sets the section type to SHT_NOBITS[1]. It is conceptually inappropriate for .plt and .text.* sections which are always SHT_PROGBITS.
In GNU ld, if PLT entries are needed, .plt will be SHT_PROGBITS anyway and (NOLOAD) will be essentially ignored. In ld.lld, since
https://reviews.llvm.org/D118840 ("[ELF] Support (TYPE=<value>) to customize the output section type"), ld.lld will report a section type mismatch error. Just remove (NOLOAD) to fix the error.
[1] https://lld.llvm.org/ELF/linker_script.html As of today, "The section should be marked as not loadable" on
https://sourceware.org/binutils/docs/ld/Output-Section-Type.html is outdated for ELF.
--- arch/arm64/include/asm/module.lds.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/include/asm/module.lds.h +3 -3
@@ -1,8 +1,8 @@ SECTIONS { #ifdef CONFIG_ARM64_MODULE_PLTS - .plt 0 (NOLOAD) : { BYTE(0) } - .init.plt 0 (NOLOAD) : { BYTE(0) } - .text.ftrace_trampoline 0 (NOLOAD) : { BYTE(0) } + .plt 0 : { BYTE(0) } + .init.plt 0 : { BYTE(0) } + .text.ftrace_trampoline 0 : { BYTE(0) } #endif #ifdef CONFIG_KASAN_SW_TAGS