| Date | Mon, 14 Aug 2023 15:02:31 +0200 | From | Borislav Petkov <> | Subject | Re: [PATCH v2 05/11] x86/cpu: Clean up SRSO return thunk mess |
| |
On Mon, Aug 14, 2023 at 01:44:31PM +0200, Peter Zijlstra wrote: > --- a/arch/x86/kernel/cpu/bugs.c > +++ b/arch/x86/kernel/cpu/bugs.c > @@ -1034,6 +1034,7 @@ static void __init retbleed_select_mitig > case RETBLEED_MITIGATION_UNRET: > setup_force_cpu_cap(X86_FEATURE_RETHUNK); > setup_force_cpu_cap(X86_FEATURE_UNRET); > + x86_return_thunk = zen_return_thunk; > > if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD && > boot_cpu_data.x86_vendor != X86_VENDOR_HYGON) > @@ -2451,10 +2452,13 @@ static void __init srso_select_mitigatio
Note to self: When applying, add a comment that srso_select_mitigation() depends on and must run after retbleed_select_mitigation().
-- Regards/Gruss, Boris.
https://people.kernel.org/tglx/notes-about-netiquette
|