diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-05-27 13:10:29 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-05-27 13:10:29 -0400 |
| commit | 7529e767c2a94b33a689ff9c1293e351ecc234ee (patch) | |
| tree | 6e1728c2270378a1fcde485d1d10a86f255c339a /arch/x86/kvm/vmx | |
| parent | 4c7ccc3bf746c625cfb352a1d6082f6460cbbce0 (diff) | |
| parent | e7581caca4c105d81a490a3e15cf46d6407e3fa7 (diff) | |
Merge branch 'kvm-master' into HEAD
Merge AMD fixes before doing more development work.
Diffstat (limited to 'arch/x86/kvm/vmx')
| -rw-r--r-- | arch/x86/kvm/vmx/vmx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 6a03c27ff314..0ea5a225a579 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -4233,8 +4233,7 @@ static void ept_set_mmio_spte_mask(void) * EPT Misconfigurations can be generated if the value of bits 2:0 * of an EPT paging-structure entry is 110b (write/execute). */ - kvm_mmu_set_mmio_spte_mask(VMX_EPT_RWX_MASK, - VMX_EPT_MISCONFIG_WX_VALUE, 0); + kvm_mmu_set_mmio_spte_mask(VMX_EPT_MISCONFIG_WX_VALUE, 0); } #define VMX_XSS_EXIT_BITMAP 0 @@ -7300,6 +7299,9 @@ static __init void vmx_set_cpu_caps(void) /* CPUID 0x80000001 */ if (!cpu_has_vmx_rdtscp()) kvm_cpu_cap_clear(X86_FEATURE_RDTSCP); + + if (vmx_waitpkg_supported()) + kvm_cpu_cap_check_and_set(X86_FEATURE_WAITPKG); } static void vmx_request_immediate_exit(struct kvm_vcpu *vcpu) |