stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tom Saeger <tom.saeger@oracle.com>
To: Naresh Kamboju <naresh.kamboju@linaro.org>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
	Rich Felker <dalias@libc.org>,
	Masahiro Yamada <masahiroy@kernel.org>,
	Ard Biesheuvel <ardb@kernel.org>,
	Nathan Chancellor <nathan@kernel.org>,
	Dennis Gilmore <dennis@ausil.us>,
	Palmer Dabbelt <palmer@rivosinc.com>,
	Arnd Bergmann <arnd@arndb.de>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Tom Saeger <tom.saeger@oracle.com>,
	stable@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-sh@vger.kernel.org
Subject: [PATCH 5.4 fix build id for arm64 1/6] x86, vmlinux.lds: Add RUNTIME_DISCARD_EXIT to generic DISCARDS
Date: Tue, 24 Jan 2023 14:14:18 -0700	[thread overview]
Message-ID: <92564d1254985c3983353204bf56fa6c5f507d33.1674588616.git.tom.saeger@oracle.com> (raw)
In-Reply-To: <cover.1674588616.git.tom.saeger@oracle.com>

From: "H.J. Lu" <hjl.tools@gmail.com>

commit 84d5f77fc2ee4e010c2c037750e32f06e55224b0 upstream.

In the x86 kernel, .exit.text and .exit.data sections are discarded at
runtime, not by the linker. Add RUNTIME_DISCARD_EXIT to generic DISCARDS
and define it in the x86 kernel linker script to keep them.

The sections are added before the DISCARD directive so document here
only the situation explicitly as this change doesn't have any effect on
the generated kernel. Also, other architectures like ARM64 will use it
too so generalize the approach with the RUNTIME_DISCARD_EXIT define.

 [ bp: Massage and extend commit message. ]

Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lkml.kernel.org/r/20200326193021.255002-1-hjl.tools@gmail.com
Signed-off-by: Tom Saeger <tom.saeger@oracle.com>
---
 arch/x86/kernel/vmlinux.lds.S     |  1 +
 include/asm-generic/vmlinux.lds.h | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 1afe211d7a7c..0ae3cd9a25ea 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -21,6 +21,7 @@
 #define LOAD_OFFSET __START_KERNEL_map
 #endif
 
+#define RUNTIME_DISCARD_EXIT
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index c3bcac22c389..2d45d98773e2 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -900,10 +900,17 @@
  * section definitions so that such archs put those in earlier section
  * definitions.
  */
+#ifdef RUNTIME_DISCARD_EXIT
+#define EXIT_DISCARDS
+#else
+#define EXIT_DISCARDS							\
+	EXIT_TEXT							\
+	EXIT_DATA
+#endif
+
 #define DISCARDS							\
 	/DISCARD/ : {							\
-	EXIT_TEXT							\
-	EXIT_DATA							\
+	EXIT_DISCARDS							\
 	EXIT_CALL							\
 	*(.discard)							\
 	*(.discard.*)							\
-- 
2.39.1


  reply	other threads:[~2023-01-24 21:15 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-24 21:14 [PATCH 5.4 fix build id for arm64 with CONFIG_MODVERSIONS 0/6] Tom Saeger
2023-01-24 21:14 ` Tom Saeger [this message]
2023-01-24 21:14 ` [PATCH 5.4 fix build id for arm64 2/6] arch: fix broken BuildID for arm64 and riscv Tom Saeger
2023-01-24 21:14 ` [PATCH 5.4 fix build id for arm64 3/6] powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT Tom Saeger
2023-01-24 21:14 ` [PATCH 5.4 fix build id for arm64 4/6] powerpc/vmlinux.lds: Don't discard .rela* for relocatable builds Tom Saeger
2023-01-24 21:14 ` [PATCH 5.4 fix build id for arm64 5/6] s390: define RUNTIME_DISCARD_EXIT to fix link error with GNU ld < 2.36 Tom Saeger
2023-01-24 21:14 ` [PATCH 5.4 fix build id for arm64 6/6] sh: define RUNTIME_DISCARD_EXIT Tom Saeger
2023-01-24 21:17   ` kernel test robot
2023-01-27  7:29   ` Greg Kroah-Hartman
2023-01-27 13:25     ` Tom Saeger
2023-01-27 13:29       ` John Paul Adrian Glaubitz
2023-01-27 13:32       ` Greg Kroah-Hartman
2023-01-27  2:08 ` [PATCH 5.4 fix build id for arm64 with CONFIG_MODVERSIONS 0/6] Sasha Levin
2023-01-27  7:28   ` Greg Kroah-Hartman
2023-01-27 13:40     ` Tom Saeger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=92564d1254985c3983353204bf56fa6c5f507d33.1674588616.git.tom.saeger@oracle.com \
    --to=tom.saeger@oracle.com \
    --cc=ardb@kernel.org \
    --cc=arnd@arndb.de \
    --cc=dalias@libc.org \
    --cc=dennis@ausil.us \
    --cc=glaubitz@physik.fu-berlin.de \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=masahiroy@kernel.org \
    --cc=naresh.kamboju@linaro.org \
    --cc=nathan@kernel.org \
    --cc=palmer@rivosinc.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).