x86/cpu: Cleanup the untrain mess

Browse source

Since there can only be one active return_thunk, there only needs be
one (matching) untrain_ret. It fundamentally doesn't make sense to
allow multiple untrain_ret at the same time.

Fold all the 3 different untrain methods into a single (temporary)
helper stub.

Fixes: fb3bd914b3 ("x86/srso: Add a Speculative RAS Overflow mitigation")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230814121149.042774962@infradead.org

...

This commit is contained in:

Peter Zijlstra 2023-08-14 13:44:34 +02:00 • committed by Borislav Petkov (AMD)

parent 42be649dd1

commit e7c25c441e

3 changed files with 13 additions and 14 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

19

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

View file

1

arch/x86/kernel/cpu/bugs.c

View file

7

arch/x86/lib/retpoline.S

View file