[PATCH 0/3] Speculation CPU feature cleanups

[David Woodhouse <dwmw@amazon.co.uk>]

Fix up the cpufeatures so that only the hardware features are visible in
/proc/cpuinfo. as "ibpb", "ibrs" and "stibp". The virtual features, and
software flags which are only in X86_FEATURE_* because that's the only
way to use alternatives, get masked away. We don't *want* to show that
stuff to all users in /proc/cpuinfo; it's available to a more restricted
audience in the sysfs vulnerability files instead.

(We should probably remove PTI too, but that can be done separately.)

Boris also wants to put things out of line to reduce the size of the
ALTERNATIVE blocks and simplify backports to older kernels, so tweak
and apply his patches for that too.

Borislav Petkov (2):
  x86/retpoline: Simplify vmexit_fill_RSB()
  x86/speculation: Simplify indirect_branch_prediction_barrier()

David Woodhouse (1):
  x86/cpufeatures: Clean up Spectre v2 related CPUID flags

 arch/x86/entry/entry_32.S             |  3 +-
 arch/x86/entry/entry_64.S             |  3 +-
 arch/x86/include/asm/asm-prototypes.h |  3 ++
 arch/x86/include/asm/cpufeatures.h    | 18 ++++----
 arch/x86/include/asm/nospec-branch.h  | 83 +++++------------------------------
 arch/x86/include/asm/processor.h      |  3 ++
 arch/x86/kernel/cpu/bugs.c            | 11 +++--
 arch/x86/kernel/cpu/intel.c           | 31 ++++++++-----
 arch/x86/lib/Makefile                 |  1 +
 arch/x86/lib/retpoline.S              | 56 +++++++++++++++++++++++
 10 files changed, 116 insertions(+), 96 deletions(-)

-- 
2.7.4