This is the start of the stable review cycle for the 4.9.306 release. There are 24 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 Fri, 11 Mar 2022 15:58:48 +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/v4.x/stable-review/patch-4.9.306-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-4.9.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Linux 4.9.306-rc1 Emmanuel Gil Peyrot <linkmauve@xxxxxxxxxxxx> ARM: fix build error when BPF_SYSCALL is disabled Russell King (Oracle) <rmk+kernel@xxxxxxxxxxxxxxx> ARM: include unprivileged BPF status in Spectre V2 reporting Russell King (Oracle) <rmk+kernel@xxxxxxxxxxxxxxx> ARM: Spectre-BHB workaround Russell King (Oracle) <rmk+kernel@xxxxxxxxxxxxxxx> ARM: use LOADADDR() to get load address of sections Russell King (Oracle) <rmk+kernel@xxxxxxxxxxxxxxx> ARM: early traps initialisation Russell King (Oracle) <rmk+kernel@xxxxxxxxxxxxxxx> ARM: report Spectre v2 status through sysfs Mark Rutland <mark.rutland@xxxxxxx> arm/arm64: smccc/psci: add arm_smccc_1_1_get_conduit() Steven Price <steven.price@xxxxxxx> arm/arm64: Provide a wrapper for SMCCC 1.1 calls Josh Poimboeuf <jpoimboe@xxxxxxxxxx> x86/speculation: Warn about eIBRS + LFENCE + Unprivileged eBPF + SMT Josh Poimboeuf <jpoimboe@xxxxxxxxxx> x86/speculation: Warn about Spectre v2 LFENCE mitigation Kim Phillips <kim.phillips@xxxxxxx> x86/speculation: Update link to AMD speculation whitepaper Kim Phillips <kim.phillips@xxxxxxx> x86/speculation: Use generic retpoline by default on AMD Josh Poimboeuf <jpoimboe@xxxxxxxxxx> x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting Peter Zijlstra <peterz@xxxxxxxxxxxxx> Documentation/hw-vuln: Update spectre doc Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86/speculation: Add eIBRS + Retpoline options Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> x86/speculation: Rename RETPOLINE_AMD to RETPOLINE_LFENCE Peter Zijlstra <peterz@xxxxxxxxxxxxx> x86,bugs: Unconditionally allow spectre_v2=retpoline,amd Borislav Petkov <bp@xxxxxxx> x86/speculation: Merge one test in spectre_v2_user_select_mitigation() Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx> Documentation: refer to config RANDOMIZE_BASE for kernel address-space randomization Josh Poimboeuf <jpoimboe@xxxxxxxxxx> Documentation: Add swapgs description to the Spectre v1 documentation Tim Chen <tim.c.chen@xxxxxxxxxxxxxxx> Documentation: Add section about CPU vulnerabilities for Spectre Zhenzhong Duan <zhenzhong.duan@xxxxxxxxxx> x86/retpoline: Remove minimal retpoline support Zhenzhong Duan <zhenzhong.duan@xxxxxxxxxx> x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support Zhenzhong Duan <zhenzhong.duan@xxxxxxxxxx> x86/speculation: Add RETPOLINE_AMD support to the inline asm CALL_NOSPEC variant ------------- Diffstat: Documentation/hw-vuln/index.rst | 1 + Documentation/hw-vuln/spectre.rst | 785 +++++++++++++++++++++++++++++++ Documentation/kernel-parameters.txt | 8 +- Makefile | 4 +- arch/arm/include/asm/assembler.h | 10 + arch/arm/include/asm/spectre.h | 32 ++ arch/arm/kernel/Makefile | 2 + arch/arm/kernel/entry-armv.S | 79 +++- arch/arm/kernel/entry-common.S | 24 + arch/arm/kernel/spectre.c | 71 +++ arch/arm/kernel/traps.c | 65 ++- arch/arm/kernel/vmlinux-xip.lds.S | 37 +- arch/arm/kernel/vmlinux.lds.S | 37 +- arch/arm/mm/Kconfig | 11 + arch/arm/mm/proc-v7-bugs.c | 198 ++++++-- arch/x86/Kconfig | 4 - arch/x86/Makefile | 5 +- arch/x86/include/asm/cpufeatures.h | 2 +- arch/x86/include/asm/nospec-branch.h | 41 +- arch/x86/kernel/cpu/bugs.c | 223 ++++++--- drivers/firmware/psci.c | 15 + include/linux/arm-smccc.h | 74 +++ include/linux/bpf.h | 11 + kernel/sysctl.c | 8 + tools/arch/x86/include/asm/cpufeatures.h | 2 +- 25 files changed, 1596 insertions(+), 153 deletions(-)
