CHROMIUM: Merge 'v4.14.119' into chromeos-4.14

Merge of v4.14.119 into chromeos-4.14

Conflicts:
    drivers/powercap/intel_rapl.c
    arch/x86/kernel/cpu/common.c

Changelog:
----------------------------------------------------------------
Andi Kleen (2):
      x86/speculation/mds: Add basic bug infrastructure for MDS
      x86/kvm: Expose X86_FEATURE_MD_CLEAR to guests

Boris Ostrovsky (1):
      x86/speculation/mds: Fix comment

Dominik Brodowski (1):
      x86/speculation: Simplify the CPU bug detection logic

Eduardo Habkost (1):
      kvm: x86: Report STIBP on GET_SUPPORTED_CPUID

Greg Kroah-Hartman (1):
      Linux 4.14.119

Josh Poimboeuf (9):
      x86/speculation/mds: Add mds=full,nosmt cmdline option
      x86/speculation: Move arch_smt_update() call to after mitigation decisions
      x86/speculation/mds: Add SMT warning message
      cpu/speculation: Add 'mitigations=' cmdline option
      x86/speculation: Support 'mitigations=' cmdline option
      powerpc/speculation: Support 'mitigations=' cmdline option
      s390/speculation: Support 'mitigations=' cmdline option
      x86/speculation/mds: Add 'mitigations=' support for MDS
      x86/speculation/mds: Fix documentation typo

Konrad Rzeszutek Wilk (1):
      x86/speculation/mds: Print SMT vulnerable on MSBDS with mitigations off

Peter Zijlstra (1):
      x86/cpu: Sanitize FAM6_ATOM naming

Salvatore Bonaccorso (1):
      Documentation/l1tf: Fix small spelling typo

Thomas Gleixner (12):
      x86/msr-index: Cleanup bit defines
      x86/speculation: Consolidate CPU whitelists
      x86/speculation/mds: Add BUG_MSBDS_ONLY
      x86/speculation/mds: Add mds_clear_cpu_buffers()
      x86/speculation/mds: Clear CPU buffers on exit to user
      x86/kvm/vmx: Add MDS protection when L1D Flush is not active
      x86/speculation/mds: Conditionally clear CPU buffers on idle entry
      x86/speculation/mds: Add mitigation control for MDS
      x86/speculation/mds: Add sysfs reporting for MDS
      x86/speculation/mds: Add mitigation mode VMWERV
      Documentation: Move L1TF to separate directory
      Documentation: Add MDS vulnerability documentation

Tyler Hicks (1):
      Documentation: Correct the possible MDS sysfs values

Will Deacon (1):
      locking/atomics, asm-generic: Move some macros from <linux/bitops.h> to a new <linux/bits.h> file

Zubin Mithra (1):
      Merge branch 'stable-merge/linux/v4.14.119' into merge/chromeos-4.14-v4.14.119

speck for Pawan Gupta (1):
      x86/mds: Add MDSUM variant to the MDS documentation

 Documentation/ABI/testing/sysfs-devices-system-cpu |   4 +-
 Documentation/admin-guide/hw-vuln/index.rst        |  13 +
 Documentation/admin-guide/{ => hw-vuln}/l1tf.rst   |   3 +-
 Documentation/admin-guide/hw-vuln/mds.rst          | 308 +++++++++++++++++++++
 Documentation/admin-guide/index.rst                |   6 +-
 Documentation/admin-guide/kernel-parameters.txt    |  62 ++++-
 Documentation/index.rst                            |   1 +
 Documentation/x86/conf.py                          |  10 +
 Documentation/x86/index.rst                        |   8 +
 Documentation/x86/mds.rst                          | 225 +++++++++++++++
 Makefile                                           |   2 +-
 arch/powerpc/kernel/security.c                     |   6 +-
 arch/powerpc/kernel/setup_64.c                     |   2 +-
 arch/s390/kernel/nospec-branch.c                   |   9 +
 arch/x86/entry/common.c                            |   3 +
 arch/x86/include/asm/cpufeatures.h                 |   3 +
 arch/x86/include/asm/irqflags.h                    |   4 +
 arch/x86/include/asm/msr-index.h                   |  39 +--
 arch/x86/include/asm/mwait.h                       |   7 +
 arch/x86/include/asm/nospec-branch.h               |  50 ++++
 arch/x86/include/asm/processor.h                   |   6 +
 arch/x86/kernel/cpu/bugs.c                         | 147 +++++++++-
 arch/x86/kernel/cpu/common.c                       |  87 +++++-
 arch/x86/kernel/nmi.c                              |   4 +
 arch/x86/kernel/traps.c                            |   8 +
 arch/x86/kvm/cpuid.c                               |   5 +-
 arch/x86/kvm/vmx.c                                 |   7 +-
 arch/x86/mm/pti.c                                  |   4 +-
 drivers/base/cpu.c                                 |   8 +
 include/linux/bitops.h                             |  22 +-
 include/linux/bits.h                               |  26 ++
 include/linux/cpu.h                                |  26 ++
 kernel/cpu.c                                       |  15 +
 tools/power/x86/turbostat/Makefile                 |   2 +-
 tools/power/x86/x86_energy_perf_policy/Makefile    |   2 +-
 35 files changed, 1061 insertions(+), 73 deletions(-)
 create mode 100644 Documentation/admin-guide/hw-vuln/index.rst
 rename Documentation/admin-guide/{ => hw-vuln}/l1tf.rst (99%)
 create mode 100644 Documentation/admin-guide/hw-vuln/mds.rst
 create mode 100644 Documentation/x86/conf.py
 create mode 100644 Documentation/x86/index.rst
 create mode 100644 Documentation/x86/mds.rst
 create mode 100644 include/linux/bits.h

BUG=chromium:963028
TEST=Build and test on various affected systems
Cq-Depend: chromium:1617003

Change-Id: I2ea8cbf59f280e592365e10f77d6f99c8df0fb39
Signed-off-by: Zubin Mithra <zsm@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/1610551
Reviewed-by: Zubin Mithra <zsm@chromium.org>
Commit-Queue: Zubin Mithra <zsm@chromium.org>
Tested-by: Zubin Mithra <zsm@chromium.org>