On Thu, Feb 01, 2018 at 04:11:36PM +0100, Peter Zijlstra wrote: > On Thu, Feb 01, 2018 at 02:55:26PM +0000, David Woodhouse wrote: > > > > > > On Thu, 2018-02-01 at 15:34 +0100, Peter Zijlstra wrote: > > > > > > * These are the bare retpoline primitives for indirect jmp and call. > > > * Do not use these directly; they only exist to make the ALTERNATIVE > > > * invocation below less ugly. > > > @@ -102,9 +114,9 @@ > > > .macro JMP_NOSPEC reg:req > > > #ifdef CONFIG_RETPOLINE > > > ANNOTATE_NOSPEC_ALTERNATIVE > > > - ALTERNATIVE_2 __stringify(jmp *\reg), \ > > > + ALTERNATIVE_2 __stringify(ANNOTATE_RETPOLINE_SAFE; jmp *\reg), \ > > > __stringify(RETPOLINE_JMP \reg), X86_FEATURE_RETPOLINE, \ > > > - __stringify(lfence; jmp *\reg), X86_FEATURE_RETPOLINE_AMD > > > + __stringify(lfence; ANNOTATE_RETPOLINE_SAFE; jmp *\reg), > > > X86_FEATURE_RETPOLINE_AMD > > > #else > > > jmp *\reg > > > #endif > > > > The first one, yes. But the second one for the AMD retpoline is > > redundant, isn't it? Objtool isn't going to look there. > > It was when I wrote it.. lemme try again.
Insta complaint: arch/x86/entry/.tmp_entry_64.o: warning: objtool: .altinstr_replacement+0x19: indirect jump found in RETPOLINE build
