Skip to contentSkip to conversation

x86/cpu changes for v5.6

GIT PULL Merged Ingo Molnar 3 participants 4 messages Jan 28, 2020 – Jan 29, 2020

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-cpu-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cpu-for-linus

# HEAD: 283bab9809786cf41798512f5c1e97f4b679ba96 x86/cpu: Remove redundant cpu_detect_cache_sizes() call

The biggest change in this cycle was a large series from Sean Christopherson to clean up the handling of VMX features. This both fixes bugs/inconsistencies and makes the code more coherent and future-proof.

There are also two cleanups and a minor TSX syslog messages enhancement.

Thanks,

Ingo

------------------>
Borislav Petkov (2):
x86/bugs: Move enum taa_mitigations to bugs.c x86/cpu/tsx: Define pr_fmt()

Sean Christopherson (20):
x86/msr-index: Clean up bit defines for IA32_FEATURE_CONTROL MSR selftests, kvm: Replace manual MSR defs with common msr-index.h tools/x86: Sync msr-index.h from kernel sources
x86/intel: Initialize IA32_FEAT_CTL MSR at boot
x86/mce: WARN once if IA32_FEAT_CTL MSR is left unlocked x86/centaur: Use common IA32_FEAT_CTL MSR initialization x86/zhaoxin: Use common IA32_FEAT_CTL MSR initialization x86/cpu: Clear VMX feature flag if VMX is not fully enabled x86/vmx: Introduce VMX_FEATURES_*
x86/cpu: Detect VMX features on Intel, Centaur and Zhaoxin CPUs x86/cpu: Print VMX flags in /proc/cpuinfo using VMX_FEATURES_* x86/cpu: Set synthetic VMX cpufeatures during init_ia32_feat_ctl() x86/cpufeatures: Add flag to track whether MSR IA32_FEAT_CTL is configured
KVM: VMX: Drop initialization of IA32_FEAT_CTL MSR
KVM: VMX: Use VMX feature flag to query BIOS enabling
KVM: VMX: Check for full VMX support when verifying CPU compatibility
KVM: VMX: Use VMX_FEATURE_* flags to define VMCS control bits perf/x86: Provide stubs of KVM helpers for non-Intel CPUs
KVM: VMX: Allow KVM_INTEL when building for Centaur and/or Zhaoxin CPUs x86/cpu: Print "VMX disabled" error message iff KVM is enabled

Tony W Wang-oc (1):
x86/cpu: Remove redundant cpu_detect_cache_sizes() call

#1 lore raw
Quoted 2 lines · Ingo Molnar

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cpu-for-linus

No diffstat in the pull request?

The shortlog does match, and the diffstat I get looks sane, so I'm pulling it, but please fix whatever thing that caused the diffstat to not show in the email..

Linus

merge bot Merged
#3 lore raw
In reply to Ingo Molnar
The pull request you sent on Tue, 28 Jan 2020 18:57:51 +0100:

The pull request you sent on Tue, 28 Jan 2020 18:57:51 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cpu-for-linus

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/c0275ae758f8ce72306da200b195d1e1d66d0a8d

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
#2 lore raw
In reply to Linus Torvalds
Quoted 11 lines · Linus Torvalds
Quoted 2 lines · Ingo Molnar

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cpu-for-linus

No diffstat in the pull request?

The shortlog does match, and the diffstat I get looks sane, so I'm pulling it, but please fix whatever thing that caused the diffstat to not show in the email..

Linus

My bad: I erased the patch part manually and went too far accidentally. :-/

Just for the record, this looks good:

commit c0275ae758f8ce72306da200b195d1e1d66d0a8d
Merge: f6170f0afbe2 283bab980978
Author: Linus Torvalds <[email protected]>
Date: Tue Jan 28 12:46:42 2020 -0800

And the missing diffstat is attached below.

Thanks,

Ingo

=============>

 MAINTAINERS                                            |   2 +-
 arch/x86/Kconfig.cpu                                   |   8 ++
 arch/x86/boot/mkcpustr.c                               |   1 +
 arch/x86/include/asm/cpufeatures.h                     |   1 +
 arch/x86/include/asm/msr-index.h                       |  14 +--
 arch/x86/include/asm/perf_event.h                      |  22 +++--
 arch/x86/include/asm/processor.h                       |  11 +--
 arch/x86/include/asm/vmx.h                             | 105 ++++++++++----------
 arch/x86/include/asm/vmxfeatures.h                     |  86 ++++++++++++++++
 arch/x86/kernel/cpu/Makefile                           |   6 +-
 arch/x86/kernel/cpu/bugs.c                             |   7 ++
 arch/x86/kernel/cpu/centaur.c                          |  37 +------
 arch/x86/kernel/cpu/common.c                           |   3 +
 arch/x86/kernel/cpu/cpu.h                              |   4 +
 arch/x86/kernel/cpu/feat_ctl.c                         | 145 +++++++++++++++++++++++++++
 arch/x86/kernel/cpu/intel.c                            |  49 +--------
 arch/x86/kernel/cpu/mce/intel.c                        |  15 +--
 arch/x86/kernel/cpu/mkcapflags.sh                      |  15 ++-
 arch/x86/kernel/cpu/proc.c                             |  15 +++
 arch/x86/kernel/cpu/tsx.c                              |   5 +-
 arch/x86/kernel/cpu/zhaoxin.c                          |  37 +------
 arch/x86/kvm/Kconfig                                   |  10 +-
 arch/x86/kvm/vmx/nested.c                              |   4 +-
 arch/x86/kvm/vmx/vmx.c                                 |  67 ++++---------
 arch/x86/kvm/vmx/vmx.h                                 |   2 +-
 arch/x86/kvm/x86.c                                     |   2 +-
 drivers/idle/intel_idle.c                              |   2 +-
 tools/arch/x86/include/asm/msr-index.h                 |  14 +--
 tools/power/x86/turbostat/turbostat.c                  |   4 +-
 tools/testing/selftests/kvm/Makefile                   |   4 +-
 tools/testing/selftests/kvm/include/x86_64/processor.h | 726 +------------------------------------------------------------------------------------------------------------------------------------
 tools/testing/selftests/kvm/lib/x86_64/vmx.c           |   8 +-
 32 files changed, 432 insertions(+), 999 deletions(-)
 create mode 100644 arch/x86/include/asm/vmxfeatures.h
 create mode 100644 arch/x86/kernel/cpu/feat_ctl.c