Commit 4fe79e71 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

x86/retpoline: Remove unused replacement symbols 



Now that objtool no longer creates alternatives, these replacement
symbols are no longer needed, remove them.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Tested-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/r/20211026120309.915051744@infradead.org
parent 134ab5bd

arch/x86/include/asm/asm-prototypes.h

+0 −10
Original line number Diff line number Diff line
@@ -24,14 +24,4 @@ extern void cmpxchg8b_emu(void); 
	extern asmlinkage void __x86_indirect_thunk_ ## reg (void);

#include <asm/GEN-for-each-reg.h>



#undef GEN

#define GEN(reg) \

	extern asmlinkage void __x86_indirect_alt_call_ ## reg (void);

#include <asm/GEN-for-each-reg.h>



#undef GEN

#define GEN(reg) \

	extern asmlinkage void __x86_indirect_alt_jmp_ ## reg (void);

#include <asm/GEN-for-each-reg.h>



#endif /* CONFIG_RETPOLINE */

arch/x86/lib/retpoline.S

+0 −42
Original line number Diff line number Diff line
@@ -40,36 +40,6 @@ SYM_FUNC_END(__x86_indirect_thunk_\reg) 


.endm



/*

 * This generates .altinstr_replacement symbols for use by objtool. They,

 * however, must not actually live in .altinstr_replacement since that will be

 * discarded after init, but module alternatives will also reference these

 * symbols.

 *

 * Their names matches the "__x86_indirect_" prefix to mark them as retpolines.

 */

.macro ALT_THUNK reg



	.align 1



SYM_FUNC_START_NOALIGN(__x86_indirect_alt_call_\reg)

	ANNOTATE_RETPOLINE_SAFE

1:	call	*%\reg

2:	.skip	5-(2b-1b), 0x90

SYM_FUNC_END(__x86_indirect_alt_call_\reg)



STACK_FRAME_NON_STANDARD(__x86_indirect_alt_call_\reg)



SYM_FUNC_START_NOALIGN(__x86_indirect_alt_jmp_\reg)

	ANNOTATE_RETPOLINE_SAFE

1:	jmp	*%\reg

2:	.skip	5-(2b-1b), 0x90

SYM_FUNC_END(__x86_indirect_alt_jmp_\reg)



STACK_FRAME_NON_STANDARD(__x86_indirect_alt_jmp_\reg)



.endm



/*

 * Despite being an assembler file we can't just use .irp here

 * because __KSYM_DEPS__ only uses the C preprocessor and would
@@ -92,15 +62,3 @@ STACK_FRAME_NON_STANDARD(__x86_indirect_alt_jmp_\reg) 
#undef GEN

#define GEN(reg) EXPORT_THUNK(reg)

#include <asm/GEN-for-each-reg.h>
 


#undef GEN

#define GEN(reg) ALT_THUNK reg

#include <asm/GEN-for-each-reg.h>



#undef GEN

#define GEN(reg) __EXPORT_THUNK(__x86_indirect_alt_call_ ## reg)

#include <asm/GEN-for-each-reg.h>



#undef GEN

#define GEN(reg) __EXPORT_THUNK(__x86_indirect_alt_jmp_ ## reg)

#include <asm/GEN-for-each-reg.h>