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

linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH] Revert "x86/build: Move _etext to actual end of .text"
@ 2019-07-01 15:52 Ross Zwisler
  2019-07-01 16:32 ` Guenter Roeck
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Ross Zwisler @ 2019-07-01 15:52 UTC (permalink / raw)
  To: linux-kernel
  Cc: Ross Zwisler, H. Peter Anvin, Borislav Petkov, Ingo Molnar,
	Thomas Gleixner, x86, Kees Cook, Johannes Hirte, Klaus Kusche,
	samitolvanen, Guenter Roeck

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 <zwisler@google.com>
---
 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

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] Revert "x86/build: Move _etext to actual end of .text"
  2019-07-01 15:52 [PATCH] Revert "x86/build: Move _etext to actual end of .text" Ross Zwisler
@ 2019-07-01 16:32 ` Guenter Roeck
  2019-07-01 21:51 ` Kees Cook
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Guenter Roeck @ 2019-07-01 16:32 UTC (permalink / raw)
  To: Ross Zwisler
  Cc: linux-kernel, Ross Zwisler, H. Peter Anvin, Borislav Petkov,
	Ingo Molnar, Thomas Gleixner, x86, Kees Cook, Johannes Hirte,
	Klaus Kusche, Sami Tolvanen

On Mon, Jul 1, 2019 at 8:52 AM Ross Zwisler <zwisler@chromium.org> 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 <zwisler@google.com>

Reviewed-by: Guenter Roeck <groeck@chromium.org>

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] Revert "x86/build: Move _etext to actual end of .text"
  2019-07-01 15:52 [PATCH] Revert "x86/build: Move _etext to actual end of .text" Ross Zwisler
  2019-07-01 16:32 ` Guenter Roeck
@ 2019-07-01 21:51 ` Kees Cook
  2019-07-02 19:13 ` [tip:x86/urgent] " tip-bot for Ross Zwisler
  2019-07-09 12:03 ` tip-bot for Ross Zwisler
  3 siblings, 0 replies; 5+ messages in thread
From: Kees Cook @ 2019-07-01 21:51 UTC (permalink / raw)
  To: Ingo Molnar, Thomas Gleixner, Borislav Petkov
  Cc: linux-kernel, Ross Zwisler, Ross Zwisler, H. Peter Anvin, x86,
	Johannes Hirte, Klaus Kusche, samitolvanen, Guenter Roeck

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 <zwisler@google.com>

Acked-by: Kees Cook <keescook@chromium.org>

-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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [tip:x86/urgent] Revert "x86/build: Move _etext to actual end of .text"
  2019-07-01 15:52 [PATCH] Revert "x86/build: Move _etext to actual end of .text" Ross Zwisler
  2019-07-01 16:32 ` Guenter Roeck
  2019-07-01 21:51 ` Kees Cook
@ 2019-07-02 19:13 ` tip-bot for Ross Zwisler
  2019-07-09 12:03 ` tip-bot for Ross Zwisler
  3 siblings, 0 replies; 5+ messages in thread
From: tip-bot for Ross Zwisler @ 2019-07-02 19:13 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: klaus.kusche, groeck, zwisler, linux-kernel, mingo, keescook,
	groeck, johannes.hirte, hpa, bp, tglx, zwisler

Commit-ID:  77a1619947ab31564aed54621d5b1e34af9b395d
Gitweb:     https://git.kernel.org/tip/77a1619947ab31564aed54621d5b1e34af9b395d
Author:     Ross Zwisler <zwisler@chromium.org>
AuthorDate: Mon, 1 Jul 2019 09:52:08 -0600
Committer:  Thomas Gleixner <tglx@linutronix.de>
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 <zwisler@google.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Kees Cook <keescook@chromium.org>
Cc: Johannes Hirte <johannes.hirte@datenkhaos.de>
Cc: Klaus Kusche <klaus.kusche@computerix.info>
Cc: samitolvanen@google.com
Cc: Guenter Roeck <groeck@google.com>
Link: https://lkml.kernel.org/r/20190701155208.211815-1-zwisler@google.com

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

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [tip:x86/urgent] Revert "x86/build: Move _etext to actual end of .text"
  2019-07-01 15:52 [PATCH] Revert "x86/build: Move _etext to actual end of .text" Ross Zwisler
                   ` (2 preceding siblings ...)
  2019-07-02 19:13 ` [tip:x86/urgent] " tip-bot for Ross Zwisler
@ 2019-07-09 12:03 ` tip-bot for Ross Zwisler
  3 siblings, 0 replies; 5+ messages in thread
From: tip-bot for Ross Zwisler @ 2019-07-09 12:03 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: zwisler, zwisler, johannes.hirte, tglx, bp, hpa, groeck, stable,
	mingo, linux-kernel, keescook, klaus.kusche, groeck

Commit-ID:  013c66edf207ddb78422b8b636f56c87939c9e34
Gitweb:     https://git.kernel.org/tip/013c66edf207ddb78422b8b636f56c87939c9e34
Author:     Ross Zwisler <zwisler@chromium.org>
AuthorDate: Mon, 1 Jul 2019 09:52:08 -0600
Committer:  Ingo Molnar <mingo@kernel.org>
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 <zwisler@google.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Cc: <stable@vger.kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Kees Cook <keescook@chromium.org>
Cc: Johannes Hirte <johannes.hirte@datenkhaos.de>
Cc: Klaus Kusche <klaus.kusche@computerix.info>
Cc: samitolvanen@google.com
Cc: Guenter Roeck <groeck@google.com>
Link: https://lkml.kernel.org/r/20190701155208.211815-1-zwisler@google.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 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
 

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-07-09 12:04 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-01 15:52 [PATCH] Revert "x86/build: Move _etext to actual end of .text" Ross Zwisler
2019-07-01 16:32 ` Guenter Roeck
2019-07-01 21:51 ` Kees Cook
2019-07-02 19:13 ` [tip:x86/urgent] " tip-bot for Ross Zwisler
2019-07-09 12:03 ` tip-bot for Ross Zwisler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).