Skip to content

Commit eb54be2

Browse files
jpoimboebp3tk0v
authored andcommitted
x86/srso: Unexport untraining functions
These functions aren't called outside of retpoline.S. Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Acked-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/1ae080f95ce7266c82cba6d2adde82349b832654.1693889988.git.jpoimboe@kernel.org
1 parent aa730cf commit eb54be2

2 files changed

Lines changed: 2 additions & 9 deletions

File tree

arch/x86/include/asm/nospec-branch.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,10 +352,6 @@ extern void retbleed_return_thunk(void);
352352
extern void srso_return_thunk(void);
353353
extern void srso_alias_return_thunk(void);
354354

355-
extern void retbleed_untrain_ret(void);
356-
extern void srso_untrain_ret(void);
357-
extern void srso_alias_untrain_ret(void);
358-
359355
extern void entry_untrain_ret(void);
360356
extern void entry_ibpb(void);
361357

arch/x86/lib/retpoline.S

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ SYM_START(srso_alias_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE)
157157
lfence
158158
jmp srso_alias_return_thunk
159159
SYM_FUNC_END(srso_alias_untrain_ret)
160-
__EXPORT_THUNK(srso_alias_untrain_ret)
161160

162161
.section .text..__x86.rethunk_safe
163162
#else
@@ -215,7 +214,7 @@ SYM_CODE_END(srso_alias_return_thunk)
215214
*/
216215
.align 64
217216
.skip 64 - (retbleed_return_thunk - retbleed_untrain_ret), 0xcc
218-
SYM_START(retbleed_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE)
217+
SYM_START(retbleed_untrain_ret, SYM_L_LOCAL, SYM_A_NONE)
219218
ANNOTATE_NOENDBR
220219
/*
221220
* As executed from retbleed_untrain_ret, this is:
@@ -263,7 +262,6 @@ SYM_CODE_END(retbleed_return_thunk)
263262
jmp retbleed_return_thunk
264263
int3
265264
SYM_FUNC_END(retbleed_untrain_ret)
266-
__EXPORT_THUNK(retbleed_untrain_ret)
267265

268266
/*
269267
* SRSO untraining sequence for Zen1/2, similar to retbleed_untrain_ret()
@@ -277,7 +275,7 @@ __EXPORT_THUNK(retbleed_untrain_ret)
277275
*/
278276
.align 64
279277
.skip 64 - (srso_safe_ret - srso_untrain_ret), 0xcc
280-
SYM_START(srso_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE)
278+
SYM_START(srso_untrain_ret, SYM_L_LOCAL, SYM_A_NONE)
281279
ANNOTATE_NOENDBR
282280
.byte 0x48, 0xb8
283281

@@ -298,7 +296,6 @@ SYM_INNER_LABEL(srso_safe_ret, SYM_L_GLOBAL)
298296
ud2
299297
SYM_CODE_END(srso_safe_ret)
300298
SYM_FUNC_END(srso_untrain_ret)
301-
__EXPORT_THUNK(srso_untrain_ret)
302299

303300
SYM_CODE_START(srso_return_thunk)
304301
UNWIND_HINT_FUNC

0 commit comments

Comments
 (0)