KVM: vmx: Introduce handle_unexpected_vmexit and handle WAITPKG vmexit
PATCH v9 1/1 KVM: vmx: Introduce handle_unexpected_vmexit and handle WAITPKG vmexit
As the latest Intel 64 and IA-32 Architectures Software Developer's Manual, UMWAIT and TPAUSE instructions cause a VM exit if the RDTSC exiting and enable user wait and pause VM-execution controls are both 1.
Because KVM never enable RDTSC exiting, the vm-exit for UMWAIT and TPAUSE should never happen. Considering EXIT_REASON_XSAVES and EXIT_REASON_XRSTORS is also unexpected VM-exit for KVM. Reuse the code of 'commit 7396d337cfad ("KVM: x86: Return to userspace with internal error on unexpected exit reason"), and introduce a common exit helper handle_unexpected_vmexit() to handle these unexpected VM-exit.
Suggested-by Sean Christopherson <[email protected]>
Co-developed-by Jingqi Liu <[email protected]>
Signed-off-by Jingqi Liu <[email protected]>
Signed-off-by Tao Xu <[email protected]>
--- arch/x86/include/uapi/asm/vmx.h | 6 +++- arch/x86/kvm/vmx/nested.c | 4 +++ arch/x86/kvm/vmx/vmx.c | 51 ++++++++++++++++----------------- 3 files changed, 33 insertions(+), 28 deletions(-)
arch/x86/include/uapi/asm/vmx.h +5 -1
@@ -86,6 +86,8 @@#define EXIT_REASON_PML_FULL 62#define EXIT_REASON_XSAVES 63#define EXIT_REASON_XRSTORS 64 +#define EXIT_REASON_UMWAIT 67 +#define EXIT_REASON_TPAUSE 68#define VMX_EXIT_REASONS \ { EXIT_REASON_EXCEPTION_NMI, "EXCEPTION_NMI" }, \
@@ -144,7 +146,9 @@ { EXIT_REASON_RDSEED, "RDSEED" }, \ { EXIT_REASON_PML_FULL, "PML_FULL" }, \ { EXIT_REASON_XSAVES, "XSAVES" }, \ - { EXIT_REASON_XRSTORS, "XRSTORS" } + { EXIT_REASON_XRSTORS, "XRSTORS" }, \ + { EXIT_REASON_UMWAIT, "UMWAIT" }, \ + { EXIT_REASON_TPAUSE, "TPAUSE" } #define VMX_ABORT_SAVE_GUEST_MSR_FAIL 1#define VMX_ABORT_LOAD_HOST_PDPTE_FAIL 2
arch/x86/kvm/vmx/nested.c +4 -0
@@ -5479,6 +5479,10 @@ bool nested_vmx_exit_reflected(struct kvm_vcpu *vcpu, u32 exit_reason)case EXIT_REASON_ENCLS :/* SGX is never exposed to L1 */ return false; +case EXIT_REASON_UMWAIT : +case EXIT_REASON_TPAUSE : +return nested_cpu_has2 (vmcs12, +SECONDARY_EXEC_ENABLE_USR_WAIT_PAUSE );default :return true; }
arch/x86/kvm/vmx/vmx.c +24 -27
80 lines not on this page · raw message
Signature · 1 line
2.20.1