Changeset 74603 in vbox for trunk/include/VBox

Timestamp:

Oct 4, 2018 6:07:20 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM, HM: Nested VMX: bugref:9180 VM-exit bits; LMSW intercept. Separated VINF_HM_INTERCEPT_NOT_ACTIVE into VMX and SVM
specific codes. Adjusted IEMExecDecodedLmsw to supply the additional memory operand parameter from the VMCS guest-linear address
field.

Location:

trunk/include/VBox

Files:

• err.h (modified) (3 diffs)
• vmm/hm_vmx.h (modified) (2 diffs)
• vmm/iem.h (modified) (1 diff)

trunk/include/VBox/err.h

@@ -2104 +2104 @@
 /** Generic VM-exit failure. */
 #define VERR_VMX_VMEXIT_FAILED                      (-4034)
+/** The requested nested-guest VMX intercept is not active or not in
+ *  nested-guest execution mode. */
+#define VINF_VMX_INTERCEPT_NOT_ACTIVE               4035
 /** @} */
 
@@ -2145 +2148 @@
 #define VERR_SVM_VMEXIT_FAILED                      (-4066)
 /** An operation caused a nested-guest SVM \#VMEXIT. */
-#define VINF_SVM_VMEXIT                              4067
+#define VINF_SVM_VMEXIT                             4067
 /** VMRUN emulation succeeded, ready to immediately enter the nested-guest. */
-#define VINF_SVM_VMRUN                               4068
+#define VINF_SVM_VMRUN                              4068
+/** The requested nested-guest SVM intercept is not active or not in
+ *  nested-guest execution mode. */
+#define VINF_SVM_INTERCEPT_NOT_ACTIVE               4069
 /** @} */
 
@@ -2190 +2196 @@
 /** Resume guest execution after injecting a double-fault. */
 #define VINF_HM_DOUBLE_FAULT                        4117
-/** The requested nested-guest VM-exit intercept is not active or not in
- *  nested-guest execution mode. */
-#define VINF_HM_INTERCEPT_NOT_ACTIVE                4118
 /** Pending exception; continue guest execution. */
-#define VINF_HM_PENDING_XCPT                        4119
+#define VINF_HM_PENDING_XCPT                        4118
 /** @} */
 

trunk/include/VBox/vmm/hm_vmx.h

@@ -1815 +1815 @@
 #define VMX_VMCS_RO_IO_RDI                                      0x6406
 #define VMX_VMCS_RO_IO_RIP                                      0x6408
-#define VMX_VMCS_RO_EXIT_GUEST_LINEAR_ADDR                      0x640a
+#define VMX_VMCS_RO_GUEST_LINEAR_ADDR                           0x640a
 /** @} */
 
@@ -2634 +2634 @@
 /** 16-31: LMSW source data (else 0). */
 #define VMX_EXIT_QUAL_CRX_LMSW_DATA(a)                          (((a) >> 16) & 0xffff)
-/* Rest: reserved. */
+
+/** Bit fields for Exit qualification for control-register accesses. */
+#define VMX_BF_EXIT_QUAL_CRX_REGISTER_SHIFT                     0
+#define VMX_BF_EXIT_QUAL_CRX_REGISTER_MASK                      UINT64_C(0x000000000000000f)
+#define VMX_BF_EXIT_QUAL_CRX_ACCESS_SHIFT                       4
+#define VMX_BF_EXIT_QUAL_CRX_ACCESS_MASK                        UINT64_C(0x0000000000000030)
+#define VMX_BF_EXIT_QUAL_CRX_LMSW_OP_SHIFT                      6
+#define VMX_BF_EXIT_QUAL_CRX_LMSW_OP_MASK                       UINT64_C(0x0000000000000040)
+#define VMX_BF_EXIT_QUAL_CRX_RSVD_7_SHIFT                       7
+#define VMX_BF_EXIT_QUAL_CRX_RSVD_7_MASK                        UINT64_C(0x0000000000000080)
+#define VMX_BF_EXIT_QUAL_CRX_GENREG_SHIFT                       8
+#define VMX_BF_EXIT_QUAL_CRX_GENREG_MASK                        UINT64_C(0x0000000000000f00)
+#define VMX_BF_EXIT_QUAL_CRX_RSVD_12_15_SHIFT                   12
+#define VMX_BF_EXIT_QUAL_CRX_RSVD_12_15_MASK                    UINT64_C(0x000000000000f000)
+#define VMX_BF_EXIT_QUAL_CRX_LMSW_DATA_SHIFT                    16
+#define VMX_BF_EXIT_QUAL_CRX_LMSW_DATA_MASK                     UINT64_C(0x00000000ffff0000)
+#define VMX_BF_EXIT_QUAL_CRX_RSVD_32_63_SHIFT                   32
+#define VMX_BF_EXIT_QUAL_CRX_RSVD_32_63_MASK                    UINT64_C(0xffffffff00000000)
+RT_BF_ASSERT_COMPILE_CHECKS(VMX_BF_EXIT_QUAL_CRX_, UINT64_C(0), UINT64_MAX,
+                            (REGISTER, ACCESS, LMSW_OP, RSVD_7, GENREG, RSVD_12_15, LMSW_DATA, RSVD_32_63));
 /** @} */
 

trunk/include/VBox/vmm/iem.h

@@ -297 +297 @@
 VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedMovCRxRead(PVMCPU pVCpu, uint8_t cbInstr, uint8_t iGReg, uint8_t iCrReg);
 VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedClts(PVMCPU pVCpu, uint8_t cbInstr);
-VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedLmsw(PVMCPU pVCpu, uint8_t cbInstr, uint16_t uValue);
+VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedLmsw(PVMCPU pVCpu, uint8_t cbInstr, uint16_t uValue, RTGCPTR GCPtrEffDst);
 VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedXsetbv(PVMCPU pVCpu, uint8_t cbInstr);
 VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedWbinvd(PVMCPU pVCpu, uint8_t cbInstr);