x86/speculation: Add RETPOLINE_AMD support to the inline-asm CALL_NOSPEC
Subsystems (2)
PATCH v2 1/1 x86/speculation: Add RETPOLINE_AMD support to the inline-asm CALL_NOSPEC
..so that they match the asm CALL_NOSPEC.
Add the missing ANNOTATE_NOSPEC_ALTERNATIVE in CALL_NOSPEC.
Signed-off-by Zhenzhong Duan <[email protected]>
--- arch/x86/include/asm/nospec-branch.h | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-)
arch/x86/include/asm/nospec-branch.h +13 -4
@@ -170,11 +170,15 @@*/ # define CALL_NOSPEC \ ANNOTATE_NOSPEC_ALTERNATIVE \ - ALTERNATIVE( \ + ALTERNATIVE_2( \ ANNOTATE_RETPOLINE_SAFE \ "call *%[thunk_target]\n", \ "call __x86_indirect_thunk_%V[thunk_target]\n", \ - X86_FEATURE_RETPOLINE) + X86_FEATURE_RETPOLINE, \ + "lfence;\n" \ + ANNOTATE_RETPOLINE_SAFE \ + "call *%[thunk_target]\n", \ + X86_FEATURE_RETPOLINE_AMD)# define THUNK_TARGET (addr) [thunk_target] "r" (addr)#elif defined(CONFIG_X86_32 ) && defined(CONFIG_RETPOLINE )
@@ -184,7 +188,8 @@* here, anyway. */ # define CALL_NOSPEC \ - ALTERNATIVE( \ + ANNOTATE_NOSPEC_ALTERNATIVE \ + ALTERNATIVE_2( \ ANNOTATE_RETPOLINE_SAFE \ "call *%[thunk_target]\n", \ " jmp 904f;\n" \
@@ -199,7 +204,11 @@ " ret;\n" \ " .align 16\n" \ "904: call 901b;\n", \ - X86_FEATURE_RETPOLINE) + X86_FEATURE_RETPOLINE, \ + "lfence;\n" \ + ANNOTATE_RETPOLINE_SAFE \ + "call *%[thunk_target]\n", \ + X86_FEATURE_RETPOLINE_AMD)# define THUNK_TARGET (addr) [thunk_target] "rm" (addr)#else /* No retpoline for C / inline asm */
Signature · 1 line
1.7.3
tip-bot for Zhenzhong Duan
merge bot[tip:x86/pti] x86/speculation: Add RETPOLINE_AMD support to the inline asm CALL_NOSPEC variant
x86/speculation: Add RETPOLINE_AMD support to the inline asm CALL_NOSPEC variant
Commit-ID: 0cbb76d6285794f30953bfa3ab831714b59dd700 Gitweb: https://git.kernel.org/tip/0cbb76d6285794f30953bfa3ab831714b59dd700 Author: Zhenzhong Duan <[email protected]> AuthorDate: Tue, 18 Sep 2018 07:45:00 -0700 Committer: Borislav Petkov <[email protected]> CommitDate: Sun, 23 Sep 2018 15:25:28 +0200
x86/speculation: Add RETPOLINE_AMD support to the inline asm CALL_NOSPEC variant
..so that they match their asm counterpart.
Add the missing ANNOTATE_NOSPEC_ALTERNATIVE in CALL_NOSPEC, while at it.
Signed-off-by Zhenzhong Duan <[email protected]>
Signed-off-by Borislav Petkov <[email protected]>
Cc Daniel Borkmann <[email protected]>
Cc David Woodhouse <[email protected]>
Cc H. Peter Anvin <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Konrad Rzeszutek Wilk <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Wang YanQing <[email protected]>
--- arch/x86/include/asm/nospec-branch.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
arch/x86/include/asm/nospec-branch.h +13 -4
@@ -170,11 +170,15 @@*/ # define CALL_NOSPEC \ ANNOTATE_NOSPEC_ALTERNATIVE \ - ALTERNATIVE( \ + ALTERNATIVE_2( \ ANNOTATE_RETPOLINE_SAFE \ "call *%[thunk_target]\n", \ "call __x86_indirect_thunk_%V[thunk_target]\n", \ - X86_FEATURE_RETPOLINE) + X86_FEATURE_RETPOLINE, \ + "lfence;\n" \ + ANNOTATE_RETPOLINE_SAFE \ + "call *%[thunk_target]\n", \ + X86_FEATURE_RETPOLINE_AMD)# define THUNK_TARGET (addr) [thunk_target] "r" (addr)#elif defined(CONFIG_X86_32 ) && defined(CONFIG_RETPOLINE )
@@ -184,7 +188,8 @@* here, anyway. */ # define CALL_NOSPEC \ - ALTERNATIVE( \ + ANNOTATE_NOSPEC_ALTERNATIVE \ + ALTERNATIVE_2( \ ANNOTATE_RETPOLINE_SAFE \ "call *%[thunk_target]\n", \ " jmp 904f;\n" \
@@ -199,7 +204,11 @@ " ret;\n" \ " .align 16\n" \ "904: call 901b;\n", \ - X86_FEATURE_RETPOLINE) + X86_FEATURE_RETPOLINE, \ + "lfence;\n" \ + ANNOTATE_RETPOLINE_SAFE \ + "call *%[thunk_target]\n", \ + X86_FEATURE_RETPOLINE_AMD)# define THUNK_TARGET (addr) [thunk_target] "rm" (addr)#else /* No retpoline for C / inline asm */