* [PATCH] arm64: vmlinux.lds.S: Drop redundant *.init.rodata.*
@ 2020-11-19 1:45 Youling Tang
2020-11-19 7:18 ` Ard Biesheuvel
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Youling Tang @ 2020-11-19 1:45 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon
Cc: Mark Rutland, linux-kernel, Ingo Molnar, James Morse,
linux-arm-kernel, David Brazdil, Ard Biesheuvel, Mike Rapoport
We currently try to emit *.init.rodata.* twice, once in INIT_DATA, and once
in the line immediately following it. As the two section definitions are
identical, the latter is redundant and can be dropped.
This patch drops the redundant *.init.rodata.* section definition.
Signed-off-by: Youling Tang <tangyouling@loongson.cn>
---
arch/arm64/kernel/vmlinux.lds.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
index 1bda604..7dba3c4 100644
--- a/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@@ -201,7 +201,7 @@ SECTIONS
INIT_CALLS
CON_INITCALL
INIT_RAM_FS
- *(.init.rodata.* .init.bss) /* from the EFI stub */
+ *(.init.bss) /* from the EFI stub */
}
.exit.data : {
EXIT_DATA
--
2.1.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] arm64: vmlinux.lds.S: Drop redundant *.init.rodata.*
2020-11-19 1:45 [PATCH] arm64: vmlinux.lds.S: Drop redundant *.init.rodata.* Youling Tang
@ 2020-11-19 7:18 ` Ard Biesheuvel
2020-11-19 8:32 ` Youling Tang
2020-11-19 9:07 ` Will Deacon
2020-11-27 19:12 ` Catalin Marinas
2 siblings, 1 reply; 6+ messages in thread
From: Ard Biesheuvel @ 2020-11-19 7:18 UTC (permalink / raw)
To: Youling Tang
Cc: Mark Rutland, Catalin Marinas, Linux Kernel Mailing List,
James Morse, Linux ARM, David Brazdil, Will Deacon, Ingo Molnar,
Mike Rapoport
On Thu, 19 Nov 2020 at 02:45, Youling Tang <tangyouling@loongson.cn> wrote:
>
> We currently try to emit *.init.rodata.* twice, once in INIT_DATA, and once
> in the line immediately following it. As the two section definitions are
> identical, the latter is redundant and can be dropped.
>
> This patch drops the redundant *.init.rodata.* section definition.
>
> Signed-off-by: Youling Tang <tangyouling@loongson.cn>
.init.rodata.* was added to INIT_DATA in
266ff2a8f51f02b429a987d87634697eb0d01d6a, so removing it here seems
reasonable. However, it does conflict with the for-next/lto branch in
the arm64 tree.
> ---
> arch/arm64/kernel/vmlinux.lds.S | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
> index 1bda604..7dba3c4 100644
> --- a/arch/arm64/kernel/vmlinux.lds.S
> +++ b/arch/arm64/kernel/vmlinux.lds.S
> @@ -201,7 +201,7 @@ SECTIONS
> INIT_CALLS
> CON_INITCALL
> INIT_RAM_FS
> - *(.init.rodata.* .init.bss) /* from the EFI stub */
> + *(.init.bss) /* from the EFI stub */
> }
> .exit.data : {
> EXIT_DATA
> --
> 2.1.0
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] arm64: vmlinux.lds.S: Drop redundant *.init.rodata.*
2020-11-19 7:18 ` Ard Biesheuvel
@ 2020-11-19 8:32 ` Youling Tang
2020-11-19 9:06 ` Will Deacon
0 siblings, 1 reply; 6+ messages in thread
From: Youling Tang @ 2020-11-19 8:32 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: Mark Rutland, Catalin Marinas, Linux Kernel Mailing List,
James Morse, Linux ARM, David Brazdil, Will Deacon, Ingo Molnar,
Mike Rapoport
Hi, Ard
On 11/19/2020 03:18 PM, Ard Biesheuvel wrote:
> On Thu, 19 Nov 2020 at 02:45, Youling Tang <tangyouling@loongson.cn> wrote:
>> We currently try to emit *.init.rodata.* twice, once in INIT_DATA, and once
>> in the line immediately following it. As the two section definitions are
>> identical, the latter is redundant and can be dropped.
>>
>> This patch drops the redundant *.init.rodata.* section definition.
>>
>> Signed-off-by: Youling Tang <tangyouling@loongson.cn>
> .init.rodata.* was added to INIT_DATA in
> 266ff2a8f51f02b429a987d87634697eb0d01d6a, so removing it here seems
> reasonable. However, it does conflict with the for-next/lto branch in
> the arm64 tree.
>
The possible causes of the conflict are e35123d83ee submit.
master branch code as follows:
...
INIT_RAM_FS
*(.init.rodata.* .init.bss) /* from the EFI stub */
for-next/lto branch code as follows:
...
INIT_RAM_FS
*(.init.altinstructions .init.rodata.* .init.bss) /* from the EFI
stub */
Thanks,
Youling
>> ---
>> arch/arm64/kernel/vmlinux.lds.S | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
>> index 1bda604..7dba3c4 100644
>> --- a/arch/arm64/kernel/vmlinux.lds.S
>> +++ b/arch/arm64/kernel/vmlinux.lds.S
>> @@ -201,7 +201,7 @@ SECTIONS
>> INIT_CALLS
>> CON_INITCALL
>> INIT_RAM_FS
>> - *(.init.rodata.* .init.bss) /* from the EFI stub */
>> + *(.init.bss) /* from the EFI stub */
>> }
>> .exit.data : {
>> EXIT_DATA
>> --
>> 2.1.0
>>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] arm64: vmlinux.lds.S: Drop redundant *.init.rodata.*
2020-11-19 8:32 ` Youling Tang
@ 2020-11-19 9:06 ` Will Deacon
0 siblings, 0 replies; 6+ messages in thread
From: Will Deacon @ 2020-11-19 9:06 UTC (permalink / raw)
To: Youling Tang
Cc: Mark Rutland, Catalin Marinas, Linux Kernel Mailing List,
Ingo Molnar, James Morse, Linux ARM, David Brazdil,
Ard Biesheuvel, Mike Rapoport
On Thu, Nov 19, 2020 at 04:32:48PM +0800, Youling Tang wrote:
> On 11/19/2020 03:18 PM, Ard Biesheuvel wrote:
> > On Thu, 19 Nov 2020 at 02:45, Youling Tang <tangyouling@loongson.cn> wrote:
> > > We currently try to emit *.init.rodata.* twice, once in INIT_DATA, and once
> > > in the line immediately following it. As the two section definitions are
> > > identical, the latter is redundant and can be dropped.
> > >
> > > This patch drops the redundant *.init.rodata.* section definition.
> > >
> > > Signed-off-by: Youling Tang <tangyouling@loongson.cn>
> > .init.rodata.* was added to INIT_DATA in
> > 266ff2a8f51f02b429a987d87634697eb0d01d6a, so removing it here seems
> > reasonable. However, it does conflict with the for-next/lto branch in
> > the arm64 tree.
> >
> The possible causes of the conflict are e35123d83ee submit.
>
> master branch code as follows:
> ...
> INIT_RAM_FS
> *(.init.rodata.* .init.bss) /* from the EFI stub */
>
> for-next/lto branch code as follows:
> ...
> INIT_RAM_FS
> *(.init.altinstructions .init.rodata.* .init.bss) /* from the EFI stub
That looks trivial enough for us to sort out, especially if this patch can
wait until 5.11 (I think it can).
Will
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] arm64: vmlinux.lds.S: Drop redundant *.init.rodata.*
2020-11-19 1:45 [PATCH] arm64: vmlinux.lds.S: Drop redundant *.init.rodata.* Youling Tang
2020-11-19 7:18 ` Ard Biesheuvel
@ 2020-11-19 9:07 ` Will Deacon
2020-11-27 19:12 ` Catalin Marinas
2 siblings, 0 replies; 6+ messages in thread
From: Will Deacon @ 2020-11-19 9:07 UTC (permalink / raw)
To: Youling Tang
Cc: Mark Rutland, Catalin Marinas, linux-kernel, Ingo Molnar,
James Morse, linux-arm-kernel, David Brazdil, Ard Biesheuvel,
Mike Rapoport
On Thu, Nov 19, 2020 at 09:45:40AM +0800, Youling Tang wrote:
> We currently try to emit *.init.rodata.* twice, once in INIT_DATA, and once
> in the line immediately following it. As the two section definitions are
> identical, the latter is redundant and can be dropped.
>
> This patch drops the redundant *.init.rodata.* section definition.
>
> Signed-off-by: Youling Tang <tangyouling@loongson.cn>
> ---
> arch/arm64/kernel/vmlinux.lds.S | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
> index 1bda604..7dba3c4 100644
> --- a/arch/arm64/kernel/vmlinux.lds.S
> +++ b/arch/arm64/kernel/vmlinux.lds.S
> @@ -201,7 +201,7 @@ SECTIONS
> INIT_CALLS
> CON_INITCALL
> INIT_RAM_FS
> - *(.init.rodata.* .init.bss) /* from the EFI stub */
> + *(.init.bss) /* from the EFI stub */
Acked-by: Will Deacon <will@kernel.org>
Will
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] arm64: vmlinux.lds.S: Drop redundant *.init.rodata.*
2020-11-19 1:45 [PATCH] arm64: vmlinux.lds.S: Drop redundant *.init.rodata.* Youling Tang
2020-11-19 7:18 ` Ard Biesheuvel
2020-11-19 9:07 ` Will Deacon
@ 2020-11-27 19:12 ` Catalin Marinas
2 siblings, 0 replies; 6+ messages in thread
From: Catalin Marinas @ 2020-11-27 19:12 UTC (permalink / raw)
To: Youling Tang, Will Deacon
Cc: Mark Rutland, linux-kernel, Ard Biesheuvel, James Morse,
Mike Rapoport, David Brazdil, Ingo Molnar, linux-arm-kernel
On Thu, 19 Nov 2020 09:45:40 +0800, Youling Tang wrote:
> We currently try to emit *.init.rodata.* twice, once in INIT_DATA, and once
> in the line immediately following it. As the two section definitions are
> identical, the latter is redundant and can be dropped.
>
> This patch drops the redundant *.init.rodata.* section definition.
Applied to arm64 (for-next/misc), thanks!
[1/1] arm64: vmlinux.lds.S: Drop redundant *.init.rodata.*
https://git.kernel.org/arm64/c/344f2db2a18a
--
Catalin
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-11-27 19:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-19 1:45 [PATCH] arm64: vmlinux.lds.S: Drop redundant *.init.rodata.* Youling Tang
2020-11-19 7:18 ` Ard Biesheuvel
2020-11-19 8:32 ` Youling Tang
2020-11-19 9:06 ` Will Deacon
2020-11-19 9:07 ` Will Deacon
2020-11-27 19:12 ` Catalin Marinas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox