[SRU][Xenial][PATCH v2 0/4] Cleanups for CVE-2017-5715 (Spectre v2)

Juerg Haefliger juerg.haefliger at canonical.com
Thu Dec 13 13:20:58 UTC 2018


Changes v1 -> v2:
 - Merged the changes from 'UBUNTU: SAUCE: x86/speculation: Only report
   IBPB/IBRS state changes' into patches 1 and 2.
 - Added patch 3: Honor x86_spec_ctrl_base when messing with MSR_IA32_SPEC_CTRL
   in entry/exit code.
 - Disable IBRS runtime controls in enhanced IBRS mode.

This patchset cleans up the Ubuntu-specific IBRS and IBPB runtime controls.
The runtime controls from the embargoed patches are messy and spread all
over the place. These patches consolidate the modifications into the
proper places (commandline options in arch/x86/kernel/cpu/bugs.c instead of
kernel/smp.c, speculation macros in arch/x86/include/asm/nospec-branch.h
instead of open-coded) and merge them with the additional spectre-related
changes that went in recently.

In addition, the 2nd patch adds an entry to
/sys/devices/system/cpu/vulnerabilities/spectre_v2 when IBRS is enabled
via procfs to return the full set of enabled mitigations.

Signed-off-by: Juerg Haefliger <juergh at canonical.com>

Juerg Haefliger (4):
  UBUNTU: SAUCE: x86/speculation: Cleanup IBPB runtime control handling
  UBUNTU: SAUCE: x86/speculation: Cleanup IBRS runtime control handling
  UBUNTU: SAUCE: x86/speculation: Use x86_spec_ctrl_base in entry/exit
    code
  UBUNTU: SAUCE: x86/speculation: Move RSB_CTXSW hunk

 arch/x86/include/asm/mwait.h         |   6 +-
 arch/x86/include/asm/nospec-branch.h |  28 +++-
 arch/x86/include/asm/spec_ctrl.h     |  29 ++--
 arch/x86/kernel/cpu/amd.c            |   5 +-
 arch/x86/kernel/cpu/bugs.c           |  70 +++++----
 arch/x86/kernel/cpu/microcode/core.c |  23 ---
 arch/x86/kernel/process.c            |  10 +-
 arch/x86/kernel/smpboot.c            |   6 +-
 arch/x86/kvm/svm.c                   |   6 +-
 arch/x86/kvm/vmx.c                   |   3 +-
 arch/x86/lib/delay.c                 |   8 +-
 arch/x86/mm/tlb.c                    |   2 +-
 include/linux/smp.h                  |  83 -----------
 kernel/smp.c                         |  46 ------
 kernel/sysctl.c                      | 203 ++++++++++++++++-----------
 15 files changed, 222 insertions(+), 306 deletions(-)

-- 
2.19.1




More information about the kernel-team mailing list