[PATCH 6.1 00/15] 6.1.48-rc1 review
From: Greg Kroah-Hartman
Date: Thu Aug 24 2023 - 10:16:14 EST
This is the start of the stable review cycle for the 6.1.48 release.
There are 15 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 Sat, 26 Aug 2023 14:14:28 +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/v6.x/stable-review/patch-6.1.48-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-6.1.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Linux 6.1.48-rc1
Borislav Petkov (AMD) <bp@xxxxxxxxx>
x86/srso: Correct the mitigation status when SMT is disabled
Peter Zijlstra <peterz@xxxxxxxxxxxxx>
objtool/x86: Fixup frame-pointer vs rethunk
Petr Pavlu <petr.pavlu@xxxxxxxx>
x86/retpoline,kprobes: Fix position of thunk sections with CONFIG_LTO_CLANG
Borislav Petkov (AMD) <bp@xxxxxxxxx>
x86/srso: Disable the mitigation on unaffected configurations
Borislav Petkov (AMD) <bp@xxxxxxxxx>
x86/CPU/AMD: Fix the DIV(0) initial fix attempt
Sean Christopherson <seanjc@xxxxxxxxxx>
x86/retpoline: Don't clobber RFLAGS during srso_safe_ret()
Peter Zijlstra <peterz@xxxxxxxxxxxxx>
x86/static_call: Fix __static_call_fixup()
Borislav Petkov (AMD) <bp@xxxxxxxxx>
x86/srso: Explain the untraining sequences a bit more
Peter Zijlstra <peterz@xxxxxxxxxxxxx>
x86/cpu: Cleanup the untrain mess
Peter Zijlstra <peterz@xxxxxxxxxxxxx>
x86/cpu: Rename srso_(.*)_alias to srso_alias_\1
Peter Zijlstra <peterz@xxxxxxxxxxxxx>
x86/cpu: Rename original retbleed methods
Peter Zijlstra <peterz@xxxxxxxxxxxxx>
x86/cpu: Clean up SRSO return thunk mess
Peter Zijlstra <peterz@xxxxxxxxxxxxx>
x86/alternative: Make custom return thunk unconditional
Peter Zijlstra <peterz@xxxxxxxxxxxxx>
x86/cpu: Fix up srso_safe_ret() and __x86_return_thunk()
Peter Zijlstra <peterz@xxxxxxxxxxxxx>
x86/cpu: Fix __x86_return_thunk symbol type
-------------
Diffstat:
Documentation/admin-guide/hw-vuln/srso.rst | 4 +-
Makefile | 4 +-
arch/x86/include/asm/entry-common.h | 1 +
arch/x86/include/asm/nospec-branch.h | 28 +++---
arch/x86/kernel/cpu/amd.c | 1 +
arch/x86/kernel/cpu/bugs.c | 28 +++++-
arch/x86/kernel/static_call.c | 13 +++
arch/x86/kernel/traps.c | 2 -
arch/x86/kernel/vmlinux.lds.S | 20 ++--
arch/x86/kvm/svm/svm.c | 2 +
arch/x86/lib/retpoline.S | 141 ++++++++++++++++++++---------
tools/objtool/arch/x86/decode.c | 2 +-
tools/objtool/check.c | 21 +++--
13 files changed, 182 insertions(+), 85 deletions(-)