Skip to content

Fix up SRSO stuff

Peter Zijlstra lkml 1 version Applied

Status from this message: The following commit has been merged into the x86/urgent branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first

  1. v2 Latest11 patches 43 repliesApplied

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/11x86/cpu: Fixup __x86_return_thunkarch/x86/lib/retpoline.S+3 -10 replies
2/11x86/cpu: Fix up srso_safe_ret() and __x86_return_thunk()arch/x86/lib/retpoline.S+2 -20 replies
3/11objtool/x86: Fix SRSO messtools/objtool/arch/x86/decode.c tools/objtool/check.c tools/objtool/include/objtool/arch.h +1 more+31 -65 replies
4/11x86/alternative: Make custom return thunk unconditionalarch/x86/include/asm/nospec-branch.h arch/x86/kernel/alternative.c+0 -60 replies
5/11x86/cpu: Clean up SRSO return thunk messarch/x86/include/asm/nospec-branch.h arch/x86/kernel/cpu/bugs.c arch/x86/kernel/vmlinux.lds.S +2 more+43 -2012 replies
6/11x86/cpu: Rename original retbleed methodsarch/x86/include/asm/nospec-branch.h arch/x86/kernel/cpu/bugs.c arch/x86/kernel/vmlinux.lds.S +3 more+23 -231 reply
7/11x86/cpu: Rename srso_(.*)_alias to srso_alias_\1arch/x86/include/asm/nospec-branch.h arch/x86/kernel/vmlinux.lds.S arch/x86/lib/retpoline.S+18 -180 replies
8/11x86/cpu: Cleanup the untrain messarch/x86/include/asm/nospec-branch.h arch/x86/kernel/cpu/bugs.c arch/x86/lib/retpoline.S+13 -140 replies
9/11x86/cpu/kvm: Provide UNTRAIN_RET_VMarch/x86/include/asm/nospec-branch.h arch/x86/kernel/cpu/bugs.c arch/x86/kvm/svm/vmenter.S+14 -50 replies
10/11x86/alternatives: Simplify ALTERNATIVE_n()arch/x86/include/asm/alternative.h arch/x86/kernel/alternative.c tools/objtool/arch/x86/special.c +1 more+100 -15822 replies
11/11x86/cpu: Use fancy alternatives to get rid of entry_untrain_ret()arch/x86/include/asm/nospec-branch.h arch/x86/kernel/cpu/bugs.c arch/x86/lib/retpoline.S+18 -230 replies

Reviews trailers per patch

2 of 11 patches have a Reviewed-by or Acked-by.

PatchNikolay BorisovJosh Poimboeuf
1/11
2/11
3/11A-b
4/11
5/11
6/11
7/11
8/11
9/11
10/11R-b
11/11

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 00/11] Fix up SRSO stuff

Hi!

Second version of the SRSO fixes/cleanup.

I've redone some, reorderd most and left out the interface bits entirely for now. Although I do strongly feel the extra interface is superfluous (and ugly).

This is based on top of current tip/x86/urgent 833fd800bf56.

The one open techinical issue I have with the mitigation is the alignment of the RET inside srso_safe_ret(). The details given for retbleed stated that RET should be on a 64byte boundary, which is not the case here.

I'll go prod at bringing the rest of the patches forward after I stare at some other email.