This is the start of the stable review cycle for the 5.18.12 release. There are 61 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Thu, 14 Jul 2022 18:32:19 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.18.12-rc1.gz or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.18.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Linux 5.18.12-rc1 Thomas Gleixner <tglx@xxxxxxxxxxxxx> x86/static_call: Serialize __static_call_fixup() properly Pawan Gupta <pawan.kumar.gupta@xxxxxxxxxxxxxxx> x86/speculation: Disable RRSBA behavior Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> x86/kexec: Disable RET on kexec Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxx> x86/bugs: Do not enable IBPB-on-entry when IBPB is not supported Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/entry: Move PUSH_AND_CLEAR_REGS() back into error_entry Pawan Gupta <pawan.kumar.gupta@xxxxxxxxxxxxxxx> x86/bugs: Add Cannon lake to RETBleed affected CPU list Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/retbleed: Add fine grained Kconfig knobs Andrew Cooper <andrew.cooper3@xxxxxxxxxx> x86/cpu/amd: Enumerate BTC_NO Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/common: Stamp out the stepping madness Josh Poimboeuf <jpoimboe@xxxxxxxxxx> KVM: VMX: Prevent RSB underflow before vmenter Josh Poimboeuf <jpoimboe@xxxxxxxxxx> x86/speculation: Fill RSB on vmexit for IBRS Josh Poimboeuf <jpoimboe@xxxxxxxxxx> KVM: VMX: Fix IBRS handling after vmexit Josh Poimboeuf <jpoimboe@xxxxxxxxxx> KVM: VMX: Prevent guest RSB poisoning attacks with eIBRS Josh Poimboeuf <jpoimboe@xxxxxxxxxx> KVM: VMX: Convert launched argument to flags Josh Poimboeuf <jpoimboe@xxxxxxxxxx> KVM: VMX: Flatten __vmx_vcpu_run() Josh Poimboeuf <jpoimboe@xxxxxxxxxx> objtool: Re-add UNWIND_HINT_{SAVE_RESTORE} Josh Poimboeuf <jpoimboe@xxxxxxxxxx> x86/speculation: Remove x86_spec_ctrl_mask Josh Poimboeuf <jpoimboe@xxxxxxxxxx> x86/speculation: Use cached host SPEC_CTRL value for guest entry/exit Josh Poimboeuf <jpoimboe@xxxxxxxxxx> x86/speculation: Fix SPEC_CTRL write on SMT state change Josh Poimboeuf <jpoimboe@xxxxxxxxxx> x86/speculation: Fix firmware entry SPEC_CTRL handling Josh Poimboeuf <jpoimboe@xxxxxxxxxx> x86/speculation: Fix RSB filling with CONFIG_RETPOLINE=n Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/cpu/amd: Add Spectral Chicken Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxx> objtool: Add entry UNRET validation Josh Poimboeuf <jpoimboe@xxxxxxxxxx> x86/bugs: Do IBPB fallback check only once Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/bugs: Add retbleed=ibpb Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/xen: Add UNTRAIN_RET Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/xen: Rename SYS* entry points Peter Zijlstra <peterz@xxxxxxxxxxxxx> objtool: Update Retpoline validation Peter Zijlstra <peterz@xxxxxxxxxxxxx> intel_idle: Disable IBRS during long idle Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/bugs: Report Intel retbleed vulnerability Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/bugs: Split spectre_v2_select_mitigation() and spectre_v2_user_select_mitigation() Pawan Gupta <pawan.kumar.gupta@xxxxxxxxxxxxxxx> x86/speculation: Add spectre_v2=ibrs option to support Kernel IBRS Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/bugs: Optimize SPEC_CTRL MSR writes Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxx> x86/entry: Add kernel IBRS implementation Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/bugs: Keep a per-CPU IA32_SPEC_CTRL value Kim Phillips <kim.phillips@xxxxxxx> x86/bugs: Enable STIBP for JMP2RET Alexandre Chartre <alexandre.chartre@xxxxxxxxxx> x86/bugs: Add AMD retbleed= boot parameter Alexandre Chartre <alexandre.chartre@xxxxxxxxxx> x86/bugs: Report AMD retbleed vulnerability Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxx> x86: Add magic AMD return-thunk Peter Zijlstra <peterz@xxxxxxxxxxxxx> objtool: Treat .text.__x86.* as noinstr Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/entry: Avoid very early RET Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86: Use return-thunk in asm code Kim Phillips <kim.phillips@xxxxxxx> x86/sev: Avoid using __x86_return_thunk Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/vsyscall_emu/64: Don't use RET in vsyscall emulation Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/kvm: Fix SETcc emulation for return thunks Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/bpf: Use alternative RET encoding Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/ftrace: Use alternative RET encoding Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86,static_call: Use alternative RET encoding Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxx> objtool: skip non-text sections when adding return-thunk sites Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86,objtool: Create .return_sites Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86: Undo return-thunk damage Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/retpoline: Use -mfunction-return Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/retpoline: Swizzle retpoline thunk Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/retpoline: Cleanup some #ifdefery Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/cpufeatures: Move RETPOLINE flags to word 11 Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/kvm/vmx: Make noinstr clean Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/entry: Remove skip_r11rcx Lai Jiangshan <jiangshan.ljs@xxxxxxxxxxxx> x86/entry: Don't call error_entry() for XENPV Lai Jiangshan <jiangshan.ljs@xxxxxxxxxxxx> x86/entry: Move PUSH_AND_CLEAR_REGS out of error_entry() Lai Jiangshan <jiangshan.ljs@xxxxxxxxxxxx> x86/entry: Switch the stack after error_entry() returns Lai Jiangshan <jiangshan.ljs@xxxxxxxxxxxx> x86/traps: Use pt_regs directly in fixup_bad_iret() ------------- Diffstat: Documentation/admin-guide/kernel-parameters.txt | 25 ++ Makefile | 4 +- arch/x86/Kconfig | 103 +++-- arch/x86/Makefile | 6 + arch/x86/entry/Makefile | 2 +- arch/x86/entry/calling.h | 72 +++- arch/x86/entry/entry.S | 22 ++ arch/x86/entry/entry_32.S | 2 - arch/x86/entry/entry_64.S | 88 ++++- arch/x86/entry/entry_64_compat.S | 21 +- arch/x86/entry/vdso/Makefile | 1 + arch/x86/entry/vsyscall/vsyscall_emu_64.S | 9 +- arch/x86/include/asm/alternative.h | 1 + arch/x86/include/asm/cpufeatures.h | 12 +- arch/x86/include/asm/disabled-features.h | 21 +- arch/x86/include/asm/linkage.h | 8 + arch/x86/include/asm/msr-index.h | 13 + arch/x86/include/asm/nospec-branch.h | 68 +++- arch/x86/include/asm/static_call.h | 19 +- arch/x86/include/asm/traps.h | 2 +- arch/x86/include/asm/unwind_hints.h | 14 +- arch/x86/kernel/alternative.c | 69 ++++ arch/x86/kernel/asm-offsets.c | 6 + arch/x86/kernel/cpu/amd.c | 46 ++- arch/x86/kernel/cpu/bugs.c | 475 ++++++++++++++++++++---- arch/x86/kernel/cpu/common.c | 61 +-- arch/x86/kernel/cpu/cpu.h | 2 + arch/x86/kernel/cpu/hygon.c | 6 + arch/x86/kernel/cpu/scattered.c | 1 + arch/x86/kernel/ftrace.c | 7 +- arch/x86/kernel/head_64.S | 5 + arch/x86/kernel/module.c | 8 +- arch/x86/kernel/process.c | 2 +- arch/x86/kernel/relocate_kernel_32.S | 25 +- arch/x86/kernel/relocate_kernel_64.S | 23 +- arch/x86/kernel/static_call.c | 51 ++- arch/x86/kernel/traps.c | 19 +- arch/x86/kernel/vmlinux.lds.S | 9 +- arch/x86/kvm/emulate.c | 28 +- arch/x86/kvm/svm/vmenter.S | 18 + arch/x86/kvm/vmx/capabilities.h | 4 +- arch/x86/kvm/vmx/nested.c | 2 +- arch/x86/kvm/vmx/run_flags.h | 8 + arch/x86/kvm/vmx/vmenter.S | 194 ++++++---- arch/x86/kvm/vmx/vmx.c | 84 +++-- arch/x86/kvm/vmx/vmx.h | 10 +- arch/x86/kvm/vmx/vmx_ops.h | 2 +- arch/x86/kvm/x86.c | 4 +- arch/x86/lib/memmove_64.S | 7 +- arch/x86/lib/retpoline.S | 79 +++- arch/x86/mm/mem_encrypt_boot.S | 10 +- arch/x86/net/bpf_jit_comp.c | 26 +- arch/x86/xen/setup.c | 6 +- arch/x86/xen/xen-asm.S | 30 +- arch/x86/xen/xen-head.S | 1 + arch/x86/xen/xen-ops.h | 6 +- drivers/base/cpu.c | 8 + drivers/idle/intel_idle.c | 44 ++- include/linux/cpu.h | 2 + include/linux/kvm_host.h | 2 +- include/linux/objtool.h | 9 +- scripts/Makefile.build | 1 + scripts/link-vmlinux.sh | 3 + security/Kconfig | 11 - tools/arch/x86/include/asm/msr-index.h | 9 + tools/include/linux/objtool.h | 9 +- tools/objtool/arch/x86/decode.c | 5 + tools/objtool/builtin-check.c | 4 +- tools/objtool/check.c | 331 ++++++++++++++++- tools/objtool/include/objtool/arch.h | 1 + tools/objtool/include/objtool/builtin.h | 2 +- tools/objtool/include/objtool/check.h | 24 +- tools/objtool/include/objtool/elf.h | 1 + tools/objtool/include/objtool/objtool.h | 1 + tools/objtool/objtool.c | 1 + 75 files changed, 1890 insertions(+), 425 deletions(-)
