Merge branch 'kvm-tsx-ctrl' into HEAD

Conflicts:
	arch/x86/kvm/vmx/vmx.c

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc arch/arm64/kernel/cpu_errata.c
Simple merge

diff --cc arch/x86/include/asm/kvm_host.h
Simple merge

diff --cc arch/x86/kvm/lapic.c
Simple merge

diff --cc arch/x86/kvm/lapic.h
Simple merge

diff --cc arch/x86/kvm/mmu.c
Simple merge

diff --cc arch/x86/kvm/svm.c
Simple merge

diff --cc arch/x86/kvm/vmx/nested.c
Simple merge

diff --cc arch/x86/kvm/vmx/nested.h
index b9e5198,6280f33..fc874d4
--- 1/arch/x86/kvm/vmx/nested.h
--- 2/arch/x86/kvm/vmx/nested.h
+++ b/arch/x86/kvm/vmx/nested.h
@@@ -11,9 -21,10 +21,10 @@@ void nested_vmx_setup_ctls_msrs(struct 
                                bool apicv);
  void nested_vmx_hardware_unsetup(void);
  __init int nested_vmx_hardware_setup(int (*exit_handlers[])(struct kvm_vcpu *));
 -void nested_vmx_vcpu_setup(void);
 +void nested_vmx_set_vmcs_shadowing_bitmap(void);
  void nested_vmx_free_vcpu(struct kvm_vcpu *vcpu);
- int nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, bool from_vmentry);
+ enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu,
+                                                    bool from_vmentry);
  bool nested_vmx_exit_reflected(struct kvm_vcpu *vcpu, u32 exit_reason);
  void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason,
                       u32 exit_intr_info, unsigned long exit_qualification);

diff --cc arch/x86/kvm/vmx/vmx.c
index 89253d6,813171b..d39475e
--- 1/arch/x86/kvm/vmx/vmx.c
--- 2/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@@ -6703,21 -6791,6 +6738,34 @@@ static struct kvm_vcpu *vmx_create_vcpu
        if (!vmx->guest_msrs)
                goto free_pml;
  
-               vmx->guest_msrs[j].mask = -1ull;
 +      for (i = 0; i < ARRAY_SIZE(vmx_msr_index); ++i) {
 +              u32 index = vmx_msr_index[i];
 +              u32 data_low, data_high;
 +              int j = vmx->nmsrs;
 +
 +              if (rdmsr_safe(index, &data_low, &data_high) < 0)
 +                      continue;
 +              if (wrmsr_safe(index, data_low, data_high) < 0)
 +                      continue;
++
 +              vmx->guest_msrs[j].index = i;
 +              vmx->guest_msrs[j].data = 0;
++              switch (index) {
++              case MSR_IA32_TSX_CTRL:
++                      /*
++                       * No need to pass TSX_CTRL_CPUID_CLEAR through, so
++                       * let's avoid changing CPUID bits under the host
++                       * kernel's feet.
++                       */
++                      vmx->guest_msrs[j].mask = ~(u64)TSX_CTRL_CPUID_CLEAR;
++                      break;
++              default:
++                      vmx->guest_msrs[j].mask = -1ull;
++                      break;
++              }
 +              ++vmx->nmsrs;
 +      }
 +
        err = alloc_loaded_vmcs(&vmx->vmcs01);
        if (err < 0)
                goto free_msrs;

diff --cc arch/x86/kvm/vmx/vmx.h
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc include/linux/kvm_host.h
Simple merge

diff --cc include/linux/perf_event.h
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge