Commit eb54be26 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Borislav Petkov (AMD)

x86/srso: Unexport untraining functions

These functions aren't called outside of retpoline.S.
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Acked-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/1ae080f95ce7266c82cba6d2adde82349b832654.1693889988.git.jpoimboe@kernel.org
parent aa730cff
...@@ -352,10 +352,6 @@ extern void retbleed_return_thunk(void); ...@@ -352,10 +352,6 @@ extern void retbleed_return_thunk(void);
extern void srso_return_thunk(void); extern void srso_return_thunk(void);
extern void srso_alias_return_thunk(void); extern void srso_alias_return_thunk(void);
extern void retbleed_untrain_ret(void);
extern void srso_untrain_ret(void);
extern void srso_alias_untrain_ret(void);
extern void entry_untrain_ret(void); extern void entry_untrain_ret(void);
extern void entry_ibpb(void); extern void entry_ibpb(void);
......
...@@ -157,7 +157,6 @@ SYM_START(srso_alias_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE) ...@@ -157,7 +157,6 @@ SYM_START(srso_alias_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE)
lfence lfence
jmp srso_alias_return_thunk jmp srso_alias_return_thunk
SYM_FUNC_END(srso_alias_untrain_ret) SYM_FUNC_END(srso_alias_untrain_ret)
__EXPORT_THUNK(srso_alias_untrain_ret)
.section .text..__x86.rethunk_safe .section .text..__x86.rethunk_safe
#else #else
...@@ -215,7 +214,7 @@ SYM_CODE_END(srso_alias_return_thunk) ...@@ -215,7 +214,7 @@ SYM_CODE_END(srso_alias_return_thunk)
*/ */
.align 64 .align 64
.skip 64 - (retbleed_return_thunk - retbleed_untrain_ret), 0xcc .skip 64 - (retbleed_return_thunk - retbleed_untrain_ret), 0xcc
SYM_START(retbleed_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE) SYM_START(retbleed_untrain_ret, SYM_L_LOCAL, SYM_A_NONE)
ANNOTATE_NOENDBR ANNOTATE_NOENDBR
/* /*
* As executed from retbleed_untrain_ret, this is: * As executed from retbleed_untrain_ret, this is:
...@@ -263,7 +262,6 @@ SYM_CODE_END(retbleed_return_thunk) ...@@ -263,7 +262,6 @@ SYM_CODE_END(retbleed_return_thunk)
jmp retbleed_return_thunk jmp retbleed_return_thunk
int3 int3
SYM_FUNC_END(retbleed_untrain_ret) SYM_FUNC_END(retbleed_untrain_ret)
__EXPORT_THUNK(retbleed_untrain_ret)
/* /*
* SRSO untraining sequence for Zen1/2, similar to retbleed_untrain_ret() * SRSO untraining sequence for Zen1/2, similar to retbleed_untrain_ret()
...@@ -277,7 +275,7 @@ __EXPORT_THUNK(retbleed_untrain_ret) ...@@ -277,7 +275,7 @@ __EXPORT_THUNK(retbleed_untrain_ret)
*/ */
.align 64 .align 64
.skip 64 - (srso_safe_ret - srso_untrain_ret), 0xcc .skip 64 - (srso_safe_ret - srso_untrain_ret), 0xcc
SYM_START(srso_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE) SYM_START(srso_untrain_ret, SYM_L_LOCAL, SYM_A_NONE)
ANNOTATE_NOENDBR ANNOTATE_NOENDBR
.byte 0x48, 0xb8 .byte 0x48, 0xb8
...@@ -298,7 +296,6 @@ SYM_INNER_LABEL(srso_safe_ret, SYM_L_GLOBAL) ...@@ -298,7 +296,6 @@ SYM_INNER_LABEL(srso_safe_ret, SYM_L_GLOBAL)
ud2 ud2
SYM_CODE_END(srso_safe_ret) SYM_CODE_END(srso_safe_ret)
SYM_FUNC_END(srso_untrain_ret) SYM_FUNC_END(srso_untrain_ret)
__EXPORT_THUNK(srso_untrain_ret)
SYM_CODE_START(srso_return_thunk) SYM_CODE_START(srso_return_thunk)
UNWIND_HINT_FUNC UNWIND_HINT_FUNC
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment