Skip to content

Intel RETBleed mitigations for 4.19.

Suleiman Souhlal kvm stable 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest34 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/34Revert "x86/speculation: Add RSB VM Exit protections"Documentation/admin-guide/hw-vuln/spectre.rst arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/msr-index.h +4 more+7 -1030 replies
2/34Revert "x86/cpu: Add a steppings field to struct x86_cpu_id"arch/x86/include/asm/cpu_device_id.h arch/x86/kernel/cpu/match.c include/linux/mod_devicetable.h+1 -390 replies
3/34x86/cpufeature: Add facility to check for min microcode revisionsarch/x86/include/asm/cpu_device_id.h arch/x86/kernel/cpu/match.c+59 -00 replies
4/34x86/cpufeature: Fix various quality problems in the <asm/cpu_device_hd.h> headerarch/x86/include/asm/cpu_device_id.h+15 -160 replies
5/34x86/devicetable: Move x86 specific macro out of generic codearch/x86/include/asm/cpu_device_id.h arch/x86/kvm/svm.c arch/x86/kvm/vmx.c +3 more+17 -40 replies
6/34x86/cpu: Add consistent CPU match macrosarch/x86/include/asm/cpu_device_id.h arch/x86/include/asm/intel-family.h arch/x86/kernel/cpu/match.c+146 -130 replies
7/34x86/cpu: Add a steppings field to struct x86_cpu_idarch/x86/include/asm/cpu_device_id.h arch/x86/kernel/cpu/match.c arch/x86/kvm/vmx.c +3 more+42 -100 replies
8/34x86/cpufeatures: Move RETPOLINE flags to word 11arch/x86/include/asm/cpufeatures.h+10 -20 replies
9/34x86/bugs: Report AMD retbleed vulnerabilityarch/x86/include/asm/cpufeatures.h arch/x86/kernel/cpu/bugs.c arch/x86/kernel/cpu/common.c +2 more+39 -00 replies
10/34x86/bugs: Add AMD retbleed= boot parameterDocumentation/admin-guide/kernel-parameters.txt arch/x86/kernel/cpu/bugs.c+85 -10 replies
11/34x86/bugs: Keep a per-CPU IA32_SPEC_CTRL valuearch/x86/include/asm/nospec-branch.h arch/x86/kernel/cpu/bugs.c arch/x86/kernel/process.c+25 -60 replies
12/34x86/entry: Remove skip_r11rcxarch/x86/entry/calling.h arch/x86/entry/entry_64.S+2 -110 replies
13/34x86/entry: Add kernel IBRS implementationarch/x86/entry/calling.h arch/x86/entry/entry_64.S arch/x86/entry/entry_64_compat.S +1 more+97 -30 replies
14/34x86/bugs: Optimize SPEC_CTRL MSR writesarch/x86/include/asm/nospec-branch.h arch/x86/kernel/cpu/bugs.c arch/x86/kernel/process.c+14 -80 replies
15/34x86/speculation: Add spectre_v2=ibrs option to support Kernel IBRSDocumentation/admin-guide/kernel-parameters.txt arch/x86/include/asm/nospec-branch.h arch/x86/kernel/cpu/bugs.c+54 -140 replies
16/34x86/bugs: Split spectre_v2_select_mitigation() and spectre_v2_user_select_mitigation()arch/x86/kernel/cpu/bugs.c+17 -80 replies
17/34x86/bugs: Report Intel retbleed vulnerabilityarch/x86/include/asm/msr-index.h arch/x86/kernel/cpu/bugs.c arch/x86/kernel/cpu/common.c+44 -170 replies
18/34intel_idle: Disable IBRS during long idlearch/x86/include/asm/nospec-branch.h arch/x86/kernel/cpu/bugs.c drivers/idle/intel_idle.c+44 -60 replies
19/34x86/speculation: Change FILL_RETURN_BUFFER to work with objtoolarch/x86/include/asm/nospec-branch.h+5 -50 replies
20/34x86/speculation: Fix RSB filling with CONFIG_RETPOLINE=narch/x86/entry/entry_32.S arch/x86/entry/entry_64.S arch/x86/include/asm/nospec-branch.h+0 -60 replies
21/34x86/speculation: Fix firmware entry SPEC_CTRL handlingarch/x86/include/asm/nospec-branch.h+4 -60 replies
22/34x86/speculation: Fix SPEC_CTRL write on SMT state changearch/x86/kernel/cpu/bugs.c+2 -10 replies
23/34x86/speculation: Use cached host SPEC_CTRL value for guest entry/exitarch/x86/kernel/cpu/bugs.c+1 -110 replies
24/34x86/speculation: Remove x86_spec_ctrl_maskarch/x86/kernel/cpu/bugs.c+1 -300 replies
25/34KVM: VMX: Prevent guest RSB poisoning attacks with eIBRSarch/x86/include/asm/nospec-branch.h arch/x86/kernel/cpu/bugs.c arch/x86/kvm/vmx.c+46 -70 replies
26/34KVM: VMX: Fix IBRS handling after vmexitarch/x86/kvm/vmx.c+6 -20 replies
27/34x86/speculation: Fill RSB on vmexit for IBRSarch/x86/include/asm/cpufeatures.h arch/x86/include/asm/nospec-branch.h arch/x86/kernel/cpu/bugs.c +1 more+62 -90 replies
28/34x86/common: Stamp out the stepping madnessarch/x86/kernel/cpu/common.c+16 -220 replies
29/34x86/cpu/amd: Enumerate BTC_NOarch/x86/include/asm/cpufeatures.h arch/x86/kernel/cpu/amd.c arch/x86/kernel/cpu/common.c+20 -80 replies
30/34x86/bugs: Add Cannon lake to RETBleed affected CPU listarch/x86/kernel/cpu/common.c+1 -00 replies
31/34x86/speculation: Disable RRSBA behaviorarch/x86/include/asm/cpufeatures.h arch/x86/include/asm/msr-index.h arch/x86/kernel/cpu/bugs.c +1 more+37 -10 replies
32/34x86/speculation: Use DECLARE_PER_CPU for x86_spec_ctrl_currentarch/x86/include/asm/nospec-branch.h+2 -10 replies
33/34x86/bugs: Warn when "ibrs" mitigation is selected on Enhanced IBRS partsarch/x86/kernel/cpu/bugs.c+3 -00 replies
34/34x86/speculation: Add RSB VM Exit protectionsDocumentation/admin-guide/hw-vuln/spectre.rst arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/msr-index.h +5 more+103 -300 replies

Reviews trailers per patch

18 of 34 patches have a Reviewed-by or Acked-by.

PatchAndi KleenBorislav PetkovGreg Kroah-HartmanTony LuckJosh PoimboeufAlexandre ChartrePaolo BonziniDave HansenThadeu Lima de Souza Cascardo
1/34
2/34
3/34Originally-by A-b
4/34
5/34R-b
6/34R-b
7/34R-b R-b
8/34R-b
9/34R-b
10/34R-b
11/34R-b
12/34
13/34R-b
14/34R-b
15/34R-b
16/34R-b
17/34R-b
18/34R-b
19/34A-b R-b
20/34
21/34
22/34
23/34
24/34R-b
25/34
26/34
27/34
28/34A-b
29/34
30/34
31/34
32/34
33/34R-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.

Read the v1 thread

Cover letter [PATCH 4.19 00/34] Intel RETBleed mitigations for 4.19.

This series backports the mitigations for RETBleed for Intel CPUs to the 4.19 kernel.

It's based on the 5.4 [1] and 4.14 [2] backports.

Tested on Skylake Chromebook.

[1] https://lore.kernel.org/stable/[email protected]/
[2] https://lore.kernel.org/kvm/[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 (4):
x86/speculation: Add spectre_v2=ibrs option to support Kernel IBRS 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 (10):
x86/cpufeatures: Move RETPOLINE flags to word 11 x86/bugs: Keep a per-CPU IA32_SPEC_CTRL value x86/entry: Remove skip_r11rcx
x86/entry: Add kernel IBRS implementation
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
intel_idle: Disable IBRS during long idle x86/speculation: Change FILL_RETURN_BUFFER to work with objtool x86/common: Stamp out the stepping madness

Suleiman Souhlal (2):
Revert "x86/speculation: Add RSB VM Exit protections" Revert "x86/cpu: Add a steppings field to struct x86_cpu_id"

Thomas Gleixner (2):
x86/devicetable: Move x86 specific macro out of generic code x86/cpu: Add consistent CPU match macros

 .../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                     |  34 +-
 arch/x86/entry/entry_64_compat.S              |  11 +-
 arch/x86/include/asm/cpu_device_id.h          | 168 +++++++-
 arch/x86/include/asm/cpufeatures.h            |  18 +-
 arch/x86/include/asm/intel-family.h           |   6 +
 arch/x86/include/asm/msr-index.h              |  10 +
 arch/x86/include/asm/nospec-branch.h          |  53 ++-
 arch/x86/kernel/cpu/amd.c                     |  21 +-
 arch/x86/kernel/cpu/bugs.c                    | 368 ++++++++++++++----
 arch/x86/kernel/cpu/common.c                  |  60 +--
 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                            |  53 ++-
 arch/x86/kvm/x86.c                            |   4 +-
 drivers/base/cpu.c                            |   8 +
 drivers/cpufreq/acpi-cpufreq.c                |   1 +
 drivers/cpufreq/amd_freq_sensitivity.c        |   1 +
 drivers/idle/intel_idle.c                     |  43 +-
 include/linux/cpu.h                           |   2 +
 include/linux/kvm_host.h                      |   2 +-
 include/linux/mod_devicetable.h               |   4 +-
 tools/arch/x86/include/asm/cpufeatures.h      |   1 +
 27 files changed, 813 insertions(+), 186 deletions(-)
Signature · 1 line
2.38.1.431.g37b22c650d-goog