x86: Don't discard .exit.text and .exit.data at link-time
Subsystems (2)
PATCH 1/1 x86: Don't discard .exit.text and .exit.data at link-time
Since .exit.text and .exit.data sections are discarded at runtime, we should undefine EXIT_TEXT and EXIT_DATA to exclude .exit.text and .exit.data sections from default discarded sections.
--- arch/x86/kernel/vmlinux.lds.S | 6 ++++++ 1 file changed, 6 insertions(+)
arch/x86/kernel/vmlinux.lds.S +6 -0
@@ -416,6 +416,12 @@ SECTIONS STABS_DEBUG DWARF_DEBUG + /* Sections to be discarded. EXIT_TEXT and EXIT_DATA discard at runtime. + * not link time. */ +#undef EXIT_TEXT +#define EXIT_TEXT +#undef EXIT_DATA +#define EXIT_DATA DISCARDS /DISCARD/ : { *(.eh_frame)
Signature · 1 line
2.24.1
Quoted 3 lines · H.J. Lu
Since .exit.text and .exit.data sections are discarded at runtime, we should undefine
EXIT_TEXTandEXIT_DATAto exclude .exit.text and .exit.data sections from default discarded sections.
This is just a correctness fix, yes? The EXIT_TEXT and EXIT_DATA were already included before the /DISCARD/ section here, so there's no behavioral change with this patch, correct?
-Kees
Quoted 26 lines
Signed-off-by H.J. Lu <[email protected]>--- arch/x86/kernel/vmlinux.lds.S | 6 ++++++ 1 file changed, 6 insertions(+)arch/x86/kernel/vmlinux.lds.S +6
-0@@ -416,6 +416,12 @@ SECTIONS STABS_DEBUG DWARF_DEBUG + /* Sections to be discarded. EXIT_TEXT and EXIT_DATA discard at runtime. + * not link time. */ +#undef EXIT_TEXT +#define EXIT_TEXT +#undef EXIT_DATA +#define EXIT_DATA DISCARDS /DISCARD/ : { *(.eh_frame)Signature · 1 line
2.24.1
Signature · 1 line
Kees Cook
Quoted 9 lines · Kees Cook
Quoted 3 lines · H.J. Lu
Since .exit.text and .exit.data sections are discarded at runtime, we should undefine
EXIT_TEXTandEXIT_DATAto exclude .exit.text and .exit.data sections from default discarded sections.This is just a correctness fix, yes? The
EXIT_TEXTandEXIT_DATAwere already included before the /DISCARD/ section here, so there's no behavioral change with this patch, correct?
That is correct. I was confused by EXIT_TEXT and EXIT_DATA in generic
DISCARDS. My patch just makes it more explicit.
Quoted 31 lines
-Kees
Quoted 24 lines
Signed-off-by H.J. Lu <[email protected]>--- arch/x86/kernel/vmlinux.lds.S | 6 ++++++ 1 file changed, 6 insertions(+)arch/x86/kernel/vmlinux.lds.S +6
-1@@ -416,6 +416,12 @@ SECTIONS STABS_DEBUG DWARF_DEBUG + /* Sections to be discarded. EXIT_TEXT and EXIT_DATA discard at runtime. + * not link time. */ +#undef EXIT_TEXT +#define EXIT_TEXT +#undef EXIT_DATA +#define EXIT_DATA DISCARDS /DISCARD/ : { *(.eh_frame) --Quoted 2 lines
2.24.1
--
Kees Cook
Signature · 1 line
H.J.
Quoted 7 lines · H.J. Lu
Quoted 6 lines · Kees Cook
Quoted 3 lines · H.J. Lu
Since .exit.text and .exit.data sections are discarded at runtime, we should undefine
EXIT_TEXTandEXIT_DATAto exclude .exit.text and .exit.data sections from default discarded sections.
Quoted 6 lines
Quoted 3 lines
This is just a correctness fix, yes? The
EXIT_TEXTandEXIT_DATAwere already included before the /DISCARD/ section here, so there's no behavioral change with this patch, correct?That is correct. I was confused by
EXIT_TEXTandEXIT_DATAin generic
DISCARDS. My patch just makes it more explicit.
Okay, so to that end and because this isn't arch-specific, I'd like to see this be a behavioral flag, and then the generic DISCARDS macro can be adjusted. This lets all architectures implement this without having to scatter undef/define lines in each arch.
Something like this:
include/asm-generic/vmlinux.lds.h +9 -3
@@ -894,11 +894,17 @@* section definitions so that such archs put those in earlier section * definitions. */ -#define DISCARDS \ - /DISCARD/ : { \ +#ifdef RUNTIME_DISCARD_EXIT +#define EXIT_DISCARDS +#else +#define EXIT_DISCARDS \ EXIT_TEXT \ EXIT_DATA \ - EXIT_CALL \ + EXIT_CALL +#endif +#define DISCARDS \ + /DISCARD/ : { \ + EXIT_DISCARDS \ *(.discard) \ *(.discard.*) \ *(.modinfo) \
Then x86 and all other architectures that do this can just use #define RUNTIME_DISCARD_EXIT
at the top (like EMITS_PT_NOTE, etc).
-Kees
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
arch/x86/kernel/vmlinux.lds.S +6
-0@@ -416,6 +416,12 @@ SECTIONS STABS_DEBUG DWARF_DEBUG + /* Sections to be discarded. EXIT_TEXT and EXIT_DATA discard at runtime. + * not link time. */ +#undef EXIT_TEXT +#define EXIT_TEXT +#undef EXIT_DATA +#define EXIT_DATA DISCARDS /DISCARD/ : { *(.eh_frame)
Signature · 1 line
Kees Cook
Quoted 49 lines · Kees Cook
Quoted 7 lines · H.J. Lu
Quoted 6 lines · Kees Cook
Quoted 3 lines · H.J. Lu
Since .exit.text and .exit.data sections are discarded at runtime, we should undefine
EXIT_TEXTandEXIT_DATAto exclude .exit.text and .exit.data sections from default discarded sections.Quoted 6 lines
Quoted 3 lines
This is just a correctness fix, yes? The
EXIT_TEXTandEXIT_DATAwere already included before the /DISCARD/ section here, so there's no behavioral change with this patch, correct?That is correct. I was confused by
EXIT_TEXTandEXIT_DATAin generic
DISCARDS. My patch just makes it more explicit.Okay, so to that end and because this isn't arch-specific, I'd like to see this be a behavioral flag, and then the generic DISCARDS macro can be adjusted. This lets all architectures implement this without having to scatter undef/define lines in each arch.
Something like this:
include/asm-generic/vmlinux.lds.h +9
-3@@ -894,11 +894,17 @@* section definitions so that such archs put those in earlier section * definitions. */ -#define DISCARDS \ - /DISCARD/ : { \ +#ifdef RUNTIME_DISCARD_EXIT +#define EXIT_DISCARDS +#else +#define EXIT_DISCARDS \ EXIT_TEXT \ EXIT_DATA \ - EXIT_CALL \ + EXIT_CALL +#endif +#define DISCARDS \ + /DISCARD/ : { \ + EXIT_DISCARDS \ *(.discard) \ *(.discard.*) \ *(.modinfo) \
Quoted 4 lines
Then x86 and all other architectures that do this can just use #define
RUNTIME_DISCARD_EXIT
at the top (likeEMITS_PT_NOTE, etc).
It should work.
Thanks.
Signature · 1 line
H.J.
PATCH 1/1 Add RUNTIME_DISCARD_EXIT to generic DISCARDS
Quoted 36 lines · H.J. Lu
Quoted 34 lines · Kees Cook
Quoted 7 lines · H.J. Lu
Quoted 6 lines · Kees Cook
Quoted 3 lines · H.J. Lu
Since .exit.text and .exit.data sections are discarded at runtime, we should undefine
EXIT_TEXTandEXIT_DATAto exclude .exit.text and .exit.data sections from default discarded sections.Quoted 6 lines
Quoted 3 lines
This is just a correctness fix, yes? The
EXIT_TEXTandEXIT_DATAwere already included before the /DISCARD/ section here, so there's no behavioral change with this patch, correct?That is correct. I was confused by
EXIT_TEXTandEXIT_DATAin generic
DISCARDS. My patch just makes it more explicit.Okay, so to that end and because this isn't arch-specific, I'd like to see this be a behavioral flag, and then the generic DISCARDS macro can be adjusted. This lets all architectures implement this without having to scatter undef/define lines in each arch.
Something like this:
include/asm-generic/vmlinux.lds.h +1
-2@@ -894,11 +894,17 @@* section definitions so that such archs put those in earlier section * definitions. */ -#define DISCARDS \ - /DISCARD/ : { \ +#ifdef RUNTIME_DISCARD_EXIT
Quoted 8 lines
include/asm-generic/vmlinux.lds.h line 904
Quoted 8 lines
include/asm-generic/vmlinux.lds.h +5
-1+#define EXIT_DISCARDS +#else +#define EXIT_DISCARDS \ EXIT_TEXT \ EXIT_DATA \ -EXIT_CALL \ + EXIT_CALL +#endif
We should keep EXIT_CALL in DISCARDS. Only .exit.text and .exit.data sections are discarded at runtime.
Quoted 7 lines
Quoted 7 lines
include/asm-generic/vmlinux.lds.h +3
-0+#define DISCARDS \ + /DISCARD/ : { \ + EXIT_DISCARDS \ *(.discard) \ *(.discard.*) \ *(.modinfo) \
Quoted 6 lines
Quoted 4 lines
Then x86 and all other architectures that do this can just use #define
RUNTIME_DISCARD_EXIT
at the top (likeEMITS_PT_NOTE, etc).It should work.
Here is the patch to add RUNTIME_DISCARD_EXIT to generic DISCARDS.
Signature · 1 line
H.J.
From bde2821f5e01a5f49b227c6fb8ba6195c26381a9 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <[email protected]>
Date: Thu, 30 Jan 2020 12:31:22 -0800
Subject: [PATCH] Add RUNTIME_DISCARD_EXIT to generic DISCARDS
In x86 kernel, .exit.text and .exit.data sections are discarded at runtime not by linker. Add RUNTIME_DISCARD_EXIT to generic DISCARDS and define it in x86 kernel linker script to keep them.
--- arch/x86/kernel/vmlinux.lds.S | 1 + include/asm-generic/vmlinux.lds.h | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-)
arch/x86/kernel/vmlinux.lds.S +1 -0
@@ -21,6 +21,7 @@ #define LOAD_OFFSET __START_KERNEL_map #endif +#define RUNTIME_DISCARD_EXIT #define EMITS_PT_NOTE #define RO_EXCEPTION_TABLE_ALIGN 16
include/asm-generic/vmlinux.lds.h +8 -2
@@ -894,10 +894,16 @@* 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.*) \
Signature · 1 line
2.24.1
Re: [PATCH] Add RUNTIME_DISCARD_EXIT to generic DISCARDS
Quoted 8 lines · H.J. Lu
From
bde2821f5e01a5f49b227c6fb8ba6195c26381a9Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <[email protected]>
Date: Thu, 30 Jan 2020 12:31:22 -0800
Subject: [PATCH] AddRUNTIME_DISCARD_EXITto generic DISCARDSIn x86 kernel, .exit.text and .exit.data sections are discarded at runtime not by linker. Add
RUNTIME_DISCARD_EXITto generic DISCARDS and define it in x86 kernel linker script to keep them.
Thanks for doing this! :) (I wasn't sure about _CALL, thanks also for checking that.)
(The patch is missing your SoB?)
-Kees
Quoted 43 lines
--- arch/x86/kernel/vmlinux.lds.S | 1 + include/asm-generic/vmlinux.lds.h | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-)arch/x86/kernel/vmlinux.lds.S +1
-0@@ -21,6 +21,7 @@ #define LOAD_OFFSET __START_KERNEL_map #endif +#define RUNTIME_DISCARD_EXIT #define EMITS_PT_NOTE #define RO_EXCEPTION_TABLE_ALIGN 16include/asm-generic/vmlinux.lds.h +8
-2@@ -894,10 +894,16 @@* 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.*) \Signature · 1 line
2.24.1
Signature · 1 line
Kees Cook