Commit 1c0c1faf authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Peter Zijlstra
Browse files

objtool: Use relative pointers for annotations 



They produce the needed relocations while using half the space.

Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/bed05c64e28200220c9b1754a2f3ce71f73076ea.1677683419.git.jpoimboe@kernel.org
parent f7515d9f

arch/x86/include/asm/nospec-branch.h

+3 −3
Original line number Diff line number Diff line
@@ -194,9 +194,9 @@ 
 * builds.

 */

.macro ANNOTATE_RETPOLINE_SAFE

	.Lannotate_\@:

.Lhere_\@:

	.pushsection .discard.retpoline_safe

	_ASM_PTR .Lannotate_\@

	.long .Lhere_\@ - .

	.popsection

.endm
@@ -318,7 +318,7 @@ 
#define ANNOTATE_RETPOLINE_SAFE					\

	"999:\n\t"						\

	".pushsection .discard.retpoline_safe\n\t"		\

	_ASM_PTR " 999b\n\t"					\

	".long 999b - .\n\t"					\

	".popsection\n\t"



typedef u8 retpoline_thunk_t[RETPOLINE_THUNK_SIZE];

include/linux/objtool.h

+6 −6
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
#define ANNOTATE_NOENDBR					\

	"986: \n\t"						\

	".pushsection .discard.noendbr\n\t"			\

	_ASM_PTR " 986b\n\t"					\

	".long 986b - .\n\t"					\

	".popsection\n\t"



#define ASM_REACHABLE							\
@@ -67,7 +67,7 @@ 
#define ANNOTATE_INTRA_FUNCTION_CALL				\

	999:							\

	.pushsection .discard.intra_function_calls;		\

	.long 999b;						\

	.long 999b - .;						\

	.popsection;



/*
@@ -92,10 +92,10 @@ 
 * inconsistencies.

 */

.macro UNWIND_HINT type:req sp_reg=0 sp_offset=0 signal=0 end=0

.Lunwind_hint_ip_\@:

.Lhere_\@:

	.pushsection .discard.unwind_hints

		/* struct unwind_hint */

		.long .Lunwind_hint_ip_\@ - .

		.long .Lhere_\@ - .

		.short \sp_offset

		.byte \sp_reg

		.byte \type
@@ -107,7 +107,7 @@ 


.macro STACK_FRAME_NON_STANDARD func:req

	.pushsection .discard.func_stack_frame_non_standard, "aw"

	_ASM_PTR \func

	.long \func - .

	.popsection

.endm
@@ -120,7 +120,7 @@ 
.macro ANNOTATE_NOENDBR

.Lhere_\@:

	.pushsection .discard.noendbr

	.quad	.Lhere_\@

	.long	.Lhere_\@ - .

	.popsection

.endm