2022-02-18 09:05:04

by Fangrui Song

[permalink] [raw]
Subject: [PATCH] riscv module: remove (NOLOAD)

On ELF, (NOLOAD) sets the section type to SHT_NOBITS[1]. It is conceptually
inappropriate for .plt, .got, and .got.plt 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/riscv/include/asm/module.lds.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/riscv/include/asm/module.lds.h b/arch/riscv/include/asm/module.lds.h
index 4254ff2ff049..1075beae1ac6 100644
--- a/arch/riscv/include/asm/module.lds.h
+++ b/arch/riscv/include/asm/module.lds.h
@@ -2,8 +2,8 @@
/* Copyright (C) 2017 Andes Technology Corporation */
#ifdef CONFIG_MODULE_SECTIONS
SECTIONS {
- .plt (NOLOAD) : { BYTE(0) }
- .got (NOLOAD) : { BYTE(0) }
- .got.plt (NOLOAD) : { BYTE(0) }
+ .plt : { BYTE(0) }
+ .got : { BYTE(0) }
+ .got.plt : { BYTE(0) }
}
#endif
--
2.35.1.265.g69c8d7142f-goog


2022-02-20 15:05:50

by Nathan Chancellor

[permalink] [raw]
Subject: Re: [PATCH] riscv module: remove (NOLOAD)

On Fri, Feb 18, 2022 at 12:26:11AM -0800, Fangrui Song wrote:
> On ELF, (NOLOAD) sets the section type to SHT_NOBITS[1]. It is conceptually
> inappropriate for .plt, .got, and .got.plt 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.

Thank you for the patch! As mentioned on the arm64 patch, this needs
your Signed-off-by tag. With that provided:

Cc: [email protected]
Reviewed-by: Nathan Chancellor <[email protected]>
Tested-by: Nathan Chancellor <[email protected]>

This needs to go to stable so that older trees with a newer toolchain do
not warn.

> ---
> arch/riscv/include/asm/module.lds.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/riscv/include/asm/module.lds.h b/arch/riscv/include/asm/module.lds.h
> index 4254ff2ff049..1075beae1ac6 100644
> --- a/arch/riscv/include/asm/module.lds.h
> +++ b/arch/riscv/include/asm/module.lds.h
> @@ -2,8 +2,8 @@
> /* Copyright (C) 2017 Andes Technology Corporation */
> #ifdef CONFIG_MODULE_SECTIONS
> SECTIONS {
> - .plt (NOLOAD) : { BYTE(0) }
> - .got (NOLOAD) : { BYTE(0) }
> - .got.plt (NOLOAD) : { BYTE(0) }
> + .plt : { BYTE(0) }
> + .got : { BYTE(0) }
> + .got.plt : { BYTE(0) }
> }
> #endif
> --
> 2.35.1.265.g69c8d7142f-goog
>
>

2022-03-19 16:16:36

by Palmer Dabbelt

[permalink] [raw]
Subject: Re: [PATCH] riscv module: remove (NOLOAD)

On Sat, 19 Feb 2022 08:45:10 PST (-0800), [email protected] wrote:
> On Fri, Feb 18, 2022 at 12:26:11AM -0800, Fangrui Song wrote:
>> On ELF, (NOLOAD) sets the section type to SHT_NOBITS[1]. It is conceptually
>> inappropriate for .plt, .got, and .got.plt 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.
>
> Thank you for the patch! As mentioned on the arm64 patch, this needs
> your Signed-off-by tag. With that provided:
>
> Cc: [email protected]
> Reviewed-by: Nathan Chancellor <[email protected]>
> Tested-by: Nathan Chancellor <[email protected]>
>
> This needs to go to stable so that older trees with a newer toolchain do
> not warn.

Yep, just checking on that SOB line. A

Fixes: 596b0474d3d9 ("kbuild: preprocess module linker script")

seems appropriate as well.

Thanks!

>
>> ---
>> arch/riscv/include/asm/module.lds.h | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/riscv/include/asm/module.lds.h b/arch/riscv/include/asm/module.lds.h
>> index 4254ff2ff049..1075beae1ac6 100644
>> --- a/arch/riscv/include/asm/module.lds.h
>> +++ b/arch/riscv/include/asm/module.lds.h
>> @@ -2,8 +2,8 @@
>> /* Copyright (C) 2017 Andes Technology Corporation */
>> #ifdef CONFIG_MODULE_SECTIONS
>> SECTIONS {
>> - .plt (NOLOAD) : { BYTE(0) }
>> - .got (NOLOAD) : { BYTE(0) }
>> - .got.plt (NOLOAD) : { BYTE(0) }
>> + .plt : { BYTE(0) }
>> + .got : { BYTE(0) }
>> + .got.plt : { BYTE(0) }
>> }
>> #endif
>> --
>> 2.35.1.265.g69c8d7142f-goog
>>
>>

2022-03-22 01:52:37

by Fangrui Song

[permalink] [raw]
Subject: [PATCH v2] riscv module: remove (NOLOAD)

On ELF, (NOLOAD) sets the section type to SHT_NOBITS[1]. It is conceptually
inappropriate for .plt, .got, and .got.plt 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 (later changed to a warning). Just remove (NOLOAD) to
fix the warning.

[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.

Link: https://github.com/ClangBuiltLinux/linux/issues/1597
Fixes: ab1ef68e5401 ("RISC-V: Add sections of PLT and GOT for kernel module")
Reported-by: Nathan Chancellor <[email protected]>
Signed-off-by: Fangrui Song <[email protected]>
---
arch/riscv/include/asm/module.lds.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/riscv/include/asm/module.lds.h b/arch/riscv/include/asm/module.lds.h
index 4254ff2ff049..1075beae1ac6 100644
--- a/arch/riscv/include/asm/module.lds.h
+++ b/arch/riscv/include/asm/module.lds.h
@@ -2,8 +2,8 @@
/* Copyright (C) 2017 Andes Technology Corporation */
#ifdef CONFIG_MODULE_SECTIONS
SECTIONS {
- .plt (NOLOAD) : { BYTE(0) }
- .got (NOLOAD) : { BYTE(0) }
- .got.plt (NOLOAD) : { BYTE(0) }
+ .plt : { BYTE(0) }
+ .got : { BYTE(0) }
+ .got.plt : { BYTE(0) }
}
#endif
--
2.35.1.894.gb6a874cedc-goog

2022-03-22 02:16:29

by Nathan Chancellor

[permalink] [raw]
Subject: Re: [PATCH v2] riscv module: remove (NOLOAD)

On Mon, Mar 21, 2022 at 06:26:17PM -0700, Fangrui Song wrote:
> On ELF, (NOLOAD) sets the section type to SHT_NOBITS[1]. It is conceptually
> inappropriate for .plt, .got, and .got.plt 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 (later changed to a warning). Just remove (NOLOAD) to
> fix the warning.
>
> [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.
>
> Link: https://github.com/ClangBuiltLinux/linux/issues/1597
> Fixes: ab1ef68e5401 ("RISC-V: Add sections of PLT and GOT for kernel module")
> Reported-by: Nathan Chancellor <[email protected]>
> Signed-off-by: Fangrui Song <[email protected]>

Thank you for the resend! I think the Fixes: tag you chose is more
accurate than Palmer's suggested one. Same tags as v1, if Palmer would
not mind taking them while applying:

Cc: [email protected]
Reviewed-by: Nathan Chancellor <[email protected]>
Tested-by: Nathan Chancellor <[email protected]>

> ---
> arch/riscv/include/asm/module.lds.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/riscv/include/asm/module.lds.h b/arch/riscv/include/asm/module.lds.h
> index 4254ff2ff049..1075beae1ac6 100644
> --- a/arch/riscv/include/asm/module.lds.h
> +++ b/arch/riscv/include/asm/module.lds.h
> @@ -2,8 +2,8 @@
> /* Copyright (C) 2017 Andes Technology Corporation */
> #ifdef CONFIG_MODULE_SECTIONS
> SECTIONS {
> - .plt (NOLOAD) : { BYTE(0) }
> - .got (NOLOAD) : { BYTE(0) }
> - .got.plt (NOLOAD) : { BYTE(0) }
> + .plt : { BYTE(0) }
> + .got : { BYTE(0) }
> + .got.plt : { BYTE(0) }
> }
> #endif
> --
> 2.35.1.894.gb6a874cedc-goog
>

2022-03-30 20:33:05

by Palmer Dabbelt

[permalink] [raw]
Subject: Re: [PATCH v2] riscv module: remove (NOLOAD)

On Mon, 21 Mar 2022 18:26:17 PDT (-0700), [email protected] wrote:
> On ELF, (NOLOAD) sets the section type to SHT_NOBITS[1]. It is conceptually
> inappropriate for .plt, .got, and .got.plt 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 (later changed to a warning). Just remove (NOLOAD) to
> fix the warning.
>
> [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.
>
> Link: https://github.com/ClangBuiltLinux/linux/issues/1597
> Fixes: ab1ef68e5401 ("RISC-V: Add sections of PLT and GOT for kernel module")
> Reported-by: Nathan Chancellor <[email protected]>
> Signed-off-by: Fangrui Song <[email protected]>
> ---
> arch/riscv/include/asm/module.lds.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/riscv/include/asm/module.lds.h b/arch/riscv/include/asm/module.lds.h
> index 4254ff2ff049..1075beae1ac6 100644
> --- a/arch/riscv/include/asm/module.lds.h
> +++ b/arch/riscv/include/asm/module.lds.h
> @@ -2,8 +2,8 @@
> /* Copyright (C) 2017 Andes Technology Corporation */
> #ifdef CONFIG_MODULE_SECTIONS
> SECTIONS {
> - .plt (NOLOAD) : { BYTE(0) }
> - .got (NOLOAD) : { BYTE(0) }
> - .got.plt (NOLOAD) : { BYTE(0) }
> + .plt : { BYTE(0) }
> + .got : { BYTE(0) }
> + .got.plt : { BYTE(0) }
> }
> #endif

Thanks, this is on for-next (it'd be OK for fixes as well, but it's the
merge window so I'm just on one branch).