Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

objtool: Use relative pointers for annotations

Browse Source 
They produce the needed relocations while using half the space.

Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/bed05c64e28200220c9b1754a2f3ce71f73076ea.1677683419.git.jpoimboe@kernel.org
This commit is contained in:
Josh Poimboeuf 2023-03-01 07:13:08 -08:00 committed by Peter Zijlstra
parent f7515d9fe8
commit 1c0c1faf56
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/include/asm/nospec-branch.h
View File

@ -194,9 +194,9 @@
* builds. * builds.
*/ */
.macro ANNOTATE_RETPOLINE_SAFE .macro ANNOTATE_RETPOLINE_SAFE
.Lannotate_\@: .Lhere_\@:
.pushsection .discard.retpoline_safe .pushsection .discard.retpoline_safe
_ASM_PTR .Lannotate_\@ .long .Lhere_\@ - .
.popsection .popsection
.endm .endm
@ -318,7 +318,7 @@
#define ANNOTATE_RETPOLINE_SAFE \ #define ANNOTATE_RETPOLINE_SAFE \
"999:\n\t" \ "999:\n\t" \
".pushsection .discard.retpoline_safe\n\t" \ ".pushsection .discard.retpoline_safe\n\t" \
_ASM_PTR " 999b\n\t" \ ".long 999b - .\n\t" \
".popsection\n\t" ".popsection\n\t"
typedef u8 retpoline_thunk_t[RETPOLINE_THUNK_SIZE]; typedef u8 retpoline_thunk_t[RETPOLINE_THUNK_SIZE];

12
include/linux/objtool.h
View File

@ -49,7 +49,7 @@
#define ANNOTATE_NOENDBR \ #define ANNOTATE_NOENDBR \
"986: \n\t" \ "986: \n\t" \
".pushsection .discard.noendbr\n\t" \ ".pushsection .discard.noendbr\n\t" \
_ASM_PTR " 986b\n\t" \ ".long 986b - .\n\t" \
".popsection\n\t" ".popsection\n\t"
#define ASM_REACHABLE \ #define ASM_REACHABLE \
@ -67,7 +67,7 @@
#define ANNOTATE_INTRA_FUNCTION_CALL \ #define ANNOTATE_INTRA_FUNCTION_CALL \
999: \ 999: \
.pushsection .discard.intra_function_calls; \ .pushsection .discard.intra_function_calls; \
.long 999b; \ .long 999b - .; \
.popsection; .popsection;
/* /*
@ -92,10 +92,10 @@
* inconsistencies. * inconsistencies.
*/ */
.macro UNWIND_HINT type:req sp_reg=0 sp_offset=0 signal=0 end=0 .macro UNWIND_HINT type:req sp_reg=0 sp_offset=0 signal=0 end=0
.Lunwind_hint_ip_\@: .Lhere_\@:
.pushsection .discard.unwind_hints .pushsection .discard.unwind_hints
/* struct unwind_hint */ /* struct unwind_hint */
.long .Lunwind_hint_ip_\@ - . .long .Lhere_\@ - .
.short \sp_offset .short \sp_offset
.byte \sp_reg .byte \sp_reg
.byte \type .byte \type
@ -107,7 +107,7 @@
.macro STACK_FRAME_NON_STANDARD func:req .macro STACK_FRAME_NON_STANDARD func:req
.pushsection .discard.func_stack_frame_non_standard, "aw" .pushsection .discard.func_stack_frame_non_standard, "aw"
_ASM_PTR \func .long \func - .
.popsection .popsection
.endm .endm
@ -120,7 +120,7 @@
.macro ANNOTATE_NOENDBR .macro ANNOTATE_NOENDBR
.Lhere_\@: .Lhere_\@:
.pushsection .discard.noendbr .pushsection .discard.noendbr
.quad .Lhere_\@ .long .Lhere_\@ - .
.popsection .popsection
.endm .endm