Add RUNTIME_DISCARD_EXIT to generic DISCARDS
Subsystems (2)
PATCH 1/1 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
PATCH 1/1 Discard .note.gnu.property sections in generic NOTES
With the command-line option, -mx86-used-note=yes, the x86 assembler in binutils 2.32 and above generates a program property note in a note section, .note.gnu.property, to encode used x86 ISAs and features. But kernel linker script only contains a single NOTE segment:
PHDRS {
text PT_LOAD FLAGS(5);
data PT_LOAD FLAGS(6);
percpu PT_LOAD FLAGS(6);
init PT_LOAD FLAGS(7);
note PT_NOTE FLAGS(0);
}
SECTIONS
{
...
.notes : AT(ADDR(.notes) - 0xffffffff80000000) { __start_notes = .; KEEP(*(.not
e.*)) __stop_notes = .; } :text :note
...
}
The NOTE segment generated by kernel linker script is aligned to 4 bytes. But .note.gnu.property section must be aligned to 8 bytes on x86-64 and we get
[hjl@gnu-skx-1 linux]$ readelf -n vmlinux
Displaying notes found in: .notes
Owner Data size Description
Xen 0x00000006 Unknown note type: (0x00000006)
description data: 6c 69 6e 75 78 00
Xen 0x00000004 Unknown note type: (0x00000007)
description data: 32 2e 36 00
xen-3.0 0x00000005 Unknown note type: (0x006e6558)
description data: 08 00 00 00 03
readelf: Warning: note with invalid namesz and/or descsz found at offset 0x50
readelf: Warning: type: 0xffffffff, namesize: 0x006e6558, descsize:0x80000000, alignment: 8
[hjl@gnu-skx-1 linux]$
Since note.gnu.property section in kernel image is never used, this patch discards .note.gnu.property sections in kernel linker script by adding
/DISCARD/ : {
*(.note.gnu.property)
}
before kernel NOTE segment in generic NOTES.
--- include/asm-generic/vmlinux.lds.h | 7 +++++++ 1 file changed, 7 insertions(+)
include/asm-generic/vmlinux.lds.h +7 -0
@@ -818,7 +818,14 @@#define TRACEDATA #endif +/* +* Discard .note.gnu.property sections which are unused and have +* different alignment requirement from kernel note sections. +*/ #define NOTES \ + /DISCARD/ : { \ + *(.note.gnu.property) \ + } \ .notes : AT(ADDR(.notes) - LOAD_OFFSET) { \ __start_notes = .; \ KEEP(*(.note.*)) \
Signature · 1 line
2.24.1
Re: [PATCH] Discard .note.gnu.property sections in generic NOTES
Quoted 42 lines · H.J. Lu
With the command-line option, -mx86-used-note=yes, the x86 assembler in binutils 2.32 and above generates a program property note in a note section, .note.gnu.property, to encode used x86 ISAs and features. But kernel linker script only contains a single NOTE segment:
PHDRS {
textPT_LOADFLAGS(5);
dataPT_LOADFLAGS(6);
percpuPT_LOADFLAGS(6);
initPT_LOADFLAGS(7);
notePT_NOTEFLAGS(0);
}
SECTIONS
{
...
.notes : AT(ADDR(.notes) -0xffffffff80000000) {__start_notes= .; KEEP(*(.not
e.*))__stop_notes= .; } :text :note
...
}The NOTE segment generated by kernel linker script is aligned to 4 bytes. But .note.gnu.property section must be aligned to 8 bytes on x86-64 and we get
[hjl@gnu-skx-1 linux]$ readelf -n vmlinux
Displaying notes found in: .notes
Owner Data size Description
Xen0x00000006Unknown note type: (0x00000006)
description data: 6c 69 6e 75 78 00
Xen0x00000004Unknown note type: (0x00000007)
description data: 32 2e 36 00
xen-3.00x00000005Unknown note type: (0x006e6558)
description data: 08 00 00 00 03
readelf: Warning: note with invalid namesz and/or descsz found at offset0x50
readelf: Warning: type:0xffffffff, namesize:0x006e6558, descsize:0x80000000, alignment: 8
[hjl@gnu-skx-1 linux]$Since note.gnu.property section in kernel image is never used, this patch discards .note.gnu.property sections in kernel linker script by adding
Quoted 7 lines
/DISCARD/ : {
*(.note.gnu.property)
}before kernel NOTE segment in generic NOTES.
Signed-off-by H.J. Lu <[email protected]>
Thanks!
-Kees
Quoted 26 lines
--- include/asm-generic/vmlinux.lds.h | 7 +++++++ 1 file changed, 7 insertions(+)include/asm-generic/vmlinux.lds.h +7
-0@@ -818,7 +818,14 @@#define TRACEDATA #endif +/* +* Discard .note.gnu.property sections which are unused and have +* different alignment requirement from kernel note sections. +*/ #define NOTES \ + /DISCARD/ : { \ + *(.note.gnu.property) \ + } \ .notes : AT(ADDR(.notes) - LOAD_OFFSET) { \ __start_notes = .; \ KEEP(*(.note.*)) \Signature · 1 line
2.24.1
Signature · 1 line
Kees Cook