Skip to content

x86: Add stright-line-speculation mitigations

Peter Zijlstra lkml 1 version Applied

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

Get series with b4
b4 am [email protected]

Versions newest first

  1. v2 Latest6 patches 1 replyApplied

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/6x86/atomic64_386_32: Rename thingsarch/x86/lib/atomic64_386_32.S+46 -380 replies
2/6x86: Prepare asm files for straight-line-speculationarch/x86/boot/compressed/efi_thunk_64.S arch/x86/boot/compressed/head_64.S arch/x86/boot/compressed/mem_encrypt.S +103 more+350 -3500 replies
3/6x86: Prepare inline-asm for straight-line-speculationarch/x86/include/asm/linkage.h arch/x86/include/asm/paravirt.h arch/x86/include/asm/qspinlock_paravirt.h +8 more+19 -140 replies
4/6objtool: Add straight-line-speculation validationtools/objtool/arch/x86/decode.c tools/objtool/builtin-check.c tools/objtool/check.c +2 more+27 -60 replies
5/6x86/alternative: Relax text_poke_bp() constraintarch/x86/kernel/alternative.c+30 -140 replies
6/6x86: Add straight-line-speculation mitigationarch/x86/Kconfig arch/x86/Makefile arch/x86/include/asm/linkage.h +7 more+38 -75 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/6] x86: Add stright-line-speculation mitigations

Respin and split of the SLS patch.

Since the old patch hit a snag, I've split up the patch as per popular demand.

New this time are patches 1 and 5 and some minor edits to the last patch, the rest is mostly identical.

Patch 1 removes a 32bit (abuse) of the RET macro; which got exposed by the build robot due to a change in the last patch (defining RET even for !CONFIG_SLS). It would've been possible to revert to the old method of relying on AS being case insensitive and RET being a valid instruction etc.. but I figured that code was convoluted enough to warrant cleaning up anyway.

Patch 5 is what made Boris' machine go BUG when he tried to use the SLS patch.

Combined it seems to boot and build a kernel for me, so it must be perfect this time (fingers crossed).