2019-07-01 16:35:22

by Ross Zwisler

[permalink] [raw]
Subject: [PATCH] Revert "x86/build: Move _etext to actual end of .text"

This reverts commit 392bef709659abea614abfe53cf228e7a59876a4.

Per the discussion here:

https://lkml.org/lkml/2019/6/20/830

the above referenced commit breaks kernel compilation with old GCC
toolchains as well as current versions of the Gold linker. Revert it so
we don't regress and lose the ability to compile the kernel with these
tools.

Signed-off-by: Ross Zwisler <[email protected]>
---
arch/x86/kernel/vmlinux.lds.S | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 0850b5149345..4d1517022a14 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -141,10 +141,10 @@ SECTIONS
*(.text.__x86.indirect_thunk)
__indirect_thunk_end = .;
#endif
- } :text = 0x9090

- /* End of text section */
- _etext = .;
+ /* End of text section */
+ _etext = .;
+ } :text = 0x9090

NOTES :text :note

--
2.20.1


2019-07-01 16:55:45

by Guenter Roeck

[permalink] [raw]
Subject: Re: [PATCH] Revert "x86/build: Move _etext to actual end of .text"

On Mon, Jul 1, 2019 at 8:52 AM Ross Zwisler <[email protected]> wrote:
>
> This reverts commit 392bef709659abea614abfe53cf228e7a59876a4.
>
> Per the discussion here:
>
> https://lkml.org/lkml/2019/6/20/830
>
> the above referenced commit breaks kernel compilation with old GCC
> toolchains as well as current versions of the Gold linker. Revert it so
> we don't regress and lose the ability to compile the kernel with these
> tools.
>
> Signed-off-by: Ross Zwisler <[email protected]>

Reviewed-by: Guenter Roeck <[email protected]>

> ---
> arch/x86/kernel/vmlinux.lds.S | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
> index 0850b5149345..4d1517022a14 100644
> --- a/arch/x86/kernel/vmlinux.lds.S
> +++ b/arch/x86/kernel/vmlinux.lds.S
> @@ -141,10 +141,10 @@ SECTIONS
> *(.text.__x86.indirect_thunk)
> __indirect_thunk_end = .;
> #endif
> - } :text = 0x9090
>
> - /* End of text section */
> - _etext = .;
> + /* End of text section */
> + _etext = .;
> + } :text = 0x9090
>
> NOTES :text :note
>
> --
> 2.20.1

Subject: [tip:x86/urgent] Revert "x86/build: Move _etext to actual end of .text"

Commit-ID: 77a1619947ab31564aed54621d5b1e34af9b395d
Gitweb: https://git.kernel.org/tip/77a1619947ab31564aed54621d5b1e34af9b395d
Author: Ross Zwisler <[email protected]>
AuthorDate: Mon, 1 Jul 2019 09:52:08 -0600
Committer: Thomas Gleixner <[email protected]>
CommitDate: Tue, 2 Jul 2019 21:09:44 +0200

Revert "x86/build: Move _etext to actual end of .text"

This reverts commit 392bef709659abea614abfe53cf228e7a59876a4.

Per the discussion here:

https://lkml.kernel.org/r/201906201042.3BF5CD6@keescook

the above referenced commit breaks kernel compilation with old GCC
toolchains as well as current versions of the Gold linker.

Revert it to fix the regression and to keep the ability to compile the
kernel with these tools.

Signed-off-by: Ross Zwisler <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Kees Cook <[email protected]>
Cc: Johannes Hirte <[email protected]>
Cc: Klaus Kusche <[email protected]>
Cc: [email protected]
Cc: Guenter Roeck <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]

---
arch/x86/kernel/vmlinux.lds.S | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 0850b5149345..4d1517022a14 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -141,10 +141,10 @@ SECTIONS
*(.text.__x86.indirect_thunk)
__indirect_thunk_end = .;
#endif
- } :text = 0x9090

- /* End of text section */
- _etext = .;
+ /* End of text section */
+ _etext = .;
+ } :text = 0x9090

NOTES :text :note

2019-07-03 01:24:56

by Kees Cook

[permalink] [raw]
Subject: Re: [PATCH] Revert "x86/build: Move _etext to actual end of .text"

On Mon, Jul 01, 2019 at 09:52:08AM -0600, Ross Zwisler wrote:
> This reverts commit 392bef709659abea614abfe53cf228e7a59876a4.
>
> Per the discussion here:
>
> https://lkml.org/lkml/2019/6/20/830
>
> the above referenced commit breaks kernel compilation with old GCC
> toolchains as well as current versions of the Gold linker. Revert it so
> we don't regress and lose the ability to compile the kernel with these
> tools.
>
> Signed-off-by: Ross Zwisler <[email protected]>

Acked-by: Kees Cook <[email protected]>

-Kees

> ---
> arch/x86/kernel/vmlinux.lds.S | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
> index 0850b5149345..4d1517022a14 100644
> --- a/arch/x86/kernel/vmlinux.lds.S
> +++ b/arch/x86/kernel/vmlinux.lds.S
> @@ -141,10 +141,10 @@ SECTIONS
> *(.text.__x86.indirect_thunk)
> __indirect_thunk_end = .;
> #endif
> - } :text = 0x9090
>
> - /* End of text section */
> - _etext = .;
> + /* End of text section */
> + _etext = .;
> + } :text = 0x9090
>
> NOTES :text :note
>
> --
> 2.20.1

--
Kees Cook

Subject: [tip:x86/urgent] Revert "x86/build: Move _etext to actual end of .text"

Commit-ID: 013c66edf207ddb78422b8b636f56c87939c9e34
Gitweb: https://git.kernel.org/tip/013c66edf207ddb78422b8b636f56c87939c9e34
Author: Ross Zwisler <[email protected]>
AuthorDate: Mon, 1 Jul 2019 09:52:08 -0600
Committer: Ingo Molnar <[email protected]>
CommitDate: Tue, 9 Jul 2019 13:57:31 +0200

Revert "x86/build: Move _etext to actual end of .text"

This reverts commit 392bef709659abea614abfe53cf228e7a59876a4.

Per the discussion here:

https://lkml.kernel.org/r/201906201042.3BF5CD6@keescook

the above referenced commit breaks kernel compilation with old GCC
toolchains as well as current versions of the Gold linker.

Revert it to fix the regression and to keep the ability to compile the
kernel with these tools.

Signed-off-by: Ross Zwisler <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Cc: <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Kees Cook <[email protected]>
Cc: Johannes Hirte <[email protected]>
Cc: Klaus Kusche <[email protected]>
Cc: [email protected]
Cc: Guenter Roeck <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/kernel/vmlinux.lds.S | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 0850b5149345..4d1517022a14 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -141,10 +141,10 @@ SECTIONS
*(.text.__x86.indirect_thunk)
__indirect_thunk_end = .;
#endif
- } :text = 0x9090

- /* End of text section */
- _etext = .;
+ /* End of text section */
+ _etext = .;
+ } :text = 0x9090

NOTES :text :note