diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2022-06-28 00:21:17 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2022-06-29 17:43:41 +0200 |
| commit | f43b9876e857c739d407bc56df288b0ebe1a9164 (patch) | |
| tree | 22fcf2716b615556869c460a71ed3fd9b1393bd6 /arch/x86/lib | |
| parent | x86/cpu/amd: Enumerate BTC_NO (diff) | |
| download | linux-f43b9876e857c739d407bc56df288b0ebe1a9164.tar.xz linux-f43b9876e857c739d407bc56df288b0ebe1a9164.zip | |
x86/retbleed: Add fine grained Kconfig knobs
Do fine-grained Kconfig for all the various retbleed parts.
NOTE: if your compiler doesn't support return thunks this will
silently 'upgrade' your mitigation to IBPB, you might not like this.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/retpoline.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index fdd16163b996..073289a55f84 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -72,6 +72,8 @@ SYM_CODE_END(__x86_indirect_thunk_array) * This function name is magical and is used by -mfunction-return=thunk-extern * for the compiler to generate JMPs to it. */ +#ifdef CONFIG_RETHUNK + .section .text.__x86.return_thunk /* @@ -136,3 +138,5 @@ SYM_FUNC_END(zen_untrain_ret) __EXPORT_THUNK(zen_untrain_ret) EXPORT_SYMBOL(__x86_return_thunk) + +#endif /* CONFIG_RETHUNK */ |