Retbleed & PBRSB Mitigations
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest34 patches 1 replyIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/34 | Revert "x86/cpu: Add a steppings field to struct x86_cpu_id"arch/ arch/ include/ | +1 | 0 replies | |
| 2/34 | x86/cpufeature: Add facility to check for min microcode revisionsarch/ arch/ | +59 | 0 replies | |
| 3/34 | x86/cpufeature: Fix various quality problems in the <asm/cpu_device_hd.h> headerarch/ | +15 | 0 replies | |
| 4/34 | x86/devicetable: Move x86 specific macro out of generic codearch/ arch/ arch/ +3 more | +17 | 0 replies | |
| 5/34 | x86/cpu: Add consistent CPU match macrosarch/ arch/ arch/ | +146 | 0 replies | |
| 6/34 | x86/cpu: Add a steppings field to struct x86_cpu_idarch/ arch/ include/ | +39 | 0 replies | |
| 7/34 | x86/entry: Remove skip_r11rcxarch/ arch/ | +2 | 0 replies | |
| 8/34 | x86/cpufeatures: Move RETPOLINE flags to word 11arch/ | +10 | 0 replies | |
| 9/34 | x86/bugs: Report AMD retbleed vulnerabilityarch/ arch/ arch/ +2 more | +39 | 0 replies | |
| 10/34 | x86/bugs: Add AMD retbleed= boot parameterDocumentation/ arch/ | +81 | 0 replies | |
| 11/34 | x86/bugs: Keep a per-CPU IA32_SPEC_CTRL valuearch/ arch/ arch/ | +25 | 0 replies | |
| 12/34 | x86/entry: Add kernel IBRS implementationarch/ arch/ arch/ +1 more | +103 | 0 replies | |
| 13/34 | x86/bugs: Optimize SPEC_CTRL MSR writesarch/ arch/ arch/ | +14 | 0 replies | |
| 14/34 | x86/speculation: Add spectre_v2=ibrs option to support Kernel IBRSDocumentation/ arch/ arch/ | +54 | 0 replies | |
| 15/34 | x86/bugs: Split spectre_v2_select_mitigation() and spectre_v2_user_select_mitigation()arch/ | +17 | 0 replies | |
| 16/34 | x86/bugs: Report Intel retbleed vulnerabilityarch/ arch/ arch/ | +48 | 0 replies | |
| 17/34 | entel_idle: Disable IBRS during long idlearch/ arch/ drivers/ | +46 | 0 replies | |
| 18/34 | x86/speculation: Change FILL_RETURN_BUFFER to work with objtoolarch/ | +6 | 0 replies | |
| 19/34 | x86/speculation: Add LFENCE to RSB fill sequencearch/ | +3 | 0 replies | |
| 20/34 | x86/speculation: Fix RSB filling with CONFIG_RETPOLINE=narch/ arch/ arch/ | +0 | 0 replies | |
| 21/34 | x86/speculation: Fix firmware entry SPEC_CTRL handlingarch/ | +4 | 0 replies | |
| 22/34 | x86/speculation: Fix SPEC_CTRL write on SMT state changearch/ | +2 | 0 replies | |
| 23/34 | x86/speculation: Use cached host SPEC_CTRL value for guest entry/exitarch/ | +1 | 0 replies | |
| 24/34 | x86/speculation: Remove x86_spec_ctrl_maskarch/ | +1 | 0 replies | |
| 25/34 | KVM: VMX: Prevent guest RSB poisoning attacks with eIBRSarch/ arch/ arch/ | +45 | 0 replies | |
| 26/34 | KVM: VMX: Fix IBRS handling after vmexitarch/ | +6 | 0 replies | |
| 27/34 | x86/speculation: Fill RSB on vmexit for IBRSarch/ arch/ arch/ +1 more | +62 | 0 replies | |
| 28/34 | x86/common: Stamp out the stepping madnessarch/ | +16 | 0 replies | |
| 29/34 | x86/cpu/amd: Enumerate BTC_NOarch/ arch/ arch/ | +20 | 0 replies | |
| 30/34 | x86/bugs: Add Cannon lake to RETBleed affected CPU listarch/ | +1 | 0 replies | |
| 31/34 | x86/speculation: Disable RRSBA behaviorarch/ arch/ arch/ +1 more | +37 | 0 replies | |
| 32/34 | x86/speculation: Use DECLARE_PER_CPU for x86_spec_ctrl_currentarch/ | +2 | 0 replies | |
| 33/34 | x86/bugs: Warn when "ibrs" mitigation is selected on Enhanced IBRS partsarch/ | +3 | 0 replies | |
| 34/34 | x86/speculation: Add RSB VM Exit protectionsDocumentation/ arch/ arch/ +5 more | +103 | 0 replies |
Reviews trailers per patch
18 of 34 patches have a Reviewed-by or Acked-by.
| Patch | Andi Kleen | Borislav Petkov | Josh Poimboeuf | Greg Kroah-Hartman | Tony Luck | Alexandre Chartre | Paolo Bonzini | Dave Hansen | Thadeu Lima de Souza Cascardo |
|---|---|---|---|---|---|---|---|---|---|
| 1/34 | |||||||||
| 2/34 | Originally-by | A-b | |||||||
| 3/34 | |||||||||
| 4/34 | R-b | ||||||||
| 5/34 | R-b | ||||||||
| 6/34 | R-b | R-b | |||||||
| 7/34 | |||||||||
| 8/34 | R-b | ||||||||
| 9/34 | R-b | ||||||||
| 10/34 | R-b | ||||||||
| 11/34 | R-b | ||||||||
| 12/34 | R-b | ||||||||
| 13/34 | R-b | ||||||||
| 14/34 | R-b | ||||||||
| 15/34 | R-b | ||||||||
| 16/34 | R-b | ||||||||
| 17/34 | R-b | ||||||||
| 18/34 | A-b | R-b | |||||||
| 19/34 | |||||||||
| 20/34 | |||||||||
| 21/34 | |||||||||
| 22/34 | |||||||||
| 23/34 | |||||||||
| 24/34 | R-b | ||||||||
| 25/34 | |||||||||
| 26/34 | |||||||||
| 27/34 | |||||||||
| 28/34 | A-b | ||||||||
| 29/34 | |||||||||
| 30/34 | |||||||||
| 31/34 | |||||||||
| 32/34 | |||||||||
| 33/34 | R-b | ||||||||
| 34/34 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 9 reviewers.
Cover letter [PATCH 4.14 00/34] Retbleed & PBRSB Mitigations
This backport adds support for Retbleed and PBRSB mitigations for Intel parts.
Some AMD parts are added to simplify context however support for IBPB or UNRET is not included in this series. The reporting of whether a cpu is affected should be correct however.
Most patches applied cleanly or required only context changes, the major difference between this series and upstream is the fact that the kvm entry path is in inline asm in the 4.14 tree and so this had to be accommodated in patches:
- x86/speculation: Fill RSB on vmexit for IBRS
- x86/speculation: Add RSB VM Exit protections
This series is unsurprisingly very similar to that for the 5.4 backport [1].
Boot tested on a variety of Intel and AMD systems.
Tested correct reporting of vulnerabilities and mitigation selection on Skylake, Cascade Lake, Ice Lake and Zen3 parts.
[1] https://lore.kernel.org/stable/[email protected]/
Alexandre Chartre (2):
x86/bugs: Report AMD retbleed vulnerability
x86/bugs: Add AMD retbleed= boot parameter
Andrew Cooper (1):
x86/cpu/amd: Enumerate BTC_NO
Daniel Sneddon (1):
x86/speculation: Add RSB VM Exit protections
Ingo Molnar (1):
x86/cpufeature: Fix various quality problems in the
<asm/cpu_device_hd.h> header
Josh Poimboeuf (8):
x86/speculation: Fix RSB filling with CONFIG_RETPOLINE=n x86/speculation: Fix firmware entry SPEC_CTRL handling x86/speculation: Fix SPEC_CTRL write on SMT state change x86/speculation: Use cached host SPEC_CTRL value for guest entry/exit x86/speculation: Remove x86_spec_ctrl_mask
KVM: VMX: Prevent guest RSB poisoning attacks with eIBRS
KVM: VMX: Fix IBRS handling after vmexit
x86/speculation: Fill RSB on vmexit for IBRS
Kan Liang (1):
x86/cpufeature: Add facility to check for min microcode revisions
Mark Gross (1):
x86/cpu: Add a steppings field to struct x86_cpu_id
Nathan Chancellor (1):
x86/speculation: Use DECLARE_PER_CPU for x86_spec_ctrl_current
Pawan Gupta (5):
x86/speculation: Add spectre_v2=ibrs option to support Kernel IBRS x86/speculation: Add LFENCE to RSB fill sequence x86/bugs: Add Cannon lake to RETBleed affected CPU list x86/speculation: Disable RRSBA behavior
x86/bugs: Warn when "ibrs" mitigation is selected on Enhanced IBRS
parts
Peter Zijlstra (9):
x86/entry: Remove skip_r11rcx
x86/cpufeatures: Move RETPOLINE flags to word 11 x86/bugs: Keep a per-CPU IA32_SPEC_CTRL value x86/bugs: Optimize SPEC_CTRL MSR writes
x86/bugs: Split spectre_v2_select_mitigation() and
spectre_v2_user_select_mitigation()
x86/bugs: Report Intel retbleed vulnerability
entel_idle: Disable IBRS during long idle x86/speculation: Change FILL_RETURN_BUFFER to work with objtool x86/common: Stamp out the stepping madness
Suraj Jitindar Singh (1):
Revert "x86/cpu: Add a steppings field to struct x86_cpu_id"
Thadeu Lima de Souza Cascardo (1):
x86/entry: Add kernel IBRS implementation
Thomas Gleixner (2):
x86/devicetable: Move x86 specific macro out of generic code x86/cpu: Add consistent CPU match macros
Documentation/admin-guide/hw-vuln/spectre.rst | 8 + .../admin-guide/kernel-parameters.txt | 13 + arch/x86/entry/calling.h | 68 ++- arch/x86/entry/entry_32.S | 2 - arch/x86/entry/entry_64.S | 38 +- arch/x86/entry/entry_64_compat.S | 12 +- arch/x86/include/asm/cpu_device_id.h | 168 ++++++- arch/x86/include/asm/cpufeatures.h | 16 +- arch/x86/include/asm/intel-family.h | 6 + arch/x86/include/asm/msr-index.h | 14 + arch/x86/include/asm/nospec-branch.h | 48 +- arch/x86/kernel/cpu/amd.c | 21 +- arch/x86/kernel/cpu/bugs.c | 415 +++++++++++++++--- arch/x86/kernel/cpu/common.c | 68 ++- arch/x86/kernel/cpu/match.c | 44 +- arch/x86/kernel/cpu/scattered.c | 1 + arch/x86/kernel/process.c | 2 +- arch/x86/kvm/svm.c | 1 + arch/x86/kvm/vmx.c | 51 ++- drivers/base/cpu.c | 8 + drivers/cpufreq/acpi-cpufreq.c | 1 + drivers/cpufreq/amd_freq_sensitivity.c | 1 + drivers/idle/intel_idle.c | 45 +- include/linux/cpu.h | 2 + include/linux/mod_devicetable.h | 4 +- tools/arch/x86/include/asm/cpufeatures.h | 1 + 26 files changed, 897 insertions(+), 161 deletions(-)
Signature · 1 line
2.17.1