Changeset 77463 in vbox for trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

Timestamp:

Feb 26, 2019 4:39:10 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Get rid of temporary IEMExecOne in-place of IEMExecDecodedXXX VMX instructions.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (21 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -234 +234 @@
     } while (0)
 
-# ifdef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
-/** Macro that executes a VMX instruction in IEM. */
-#  define HMVMX_IEM_EXEC_VMX_INSTR_RET(a_pVCpu) \
-    do { \
-        int rc = HMVMX_CPUMCTX_IMPORT_STATE((a_pVCpu), HMVMX_CPUMCTX_EXTRN_ALL); \
-        AssertRCReturn(rc, rc); \
-        VBOXSTRICTRC rcStrict = IEMExecOne((a_pVCpu)); \
-        if (rcStrict == VINF_SUCCESS) \
-            ASMAtomicUoOrU64(&(a_pVCpu)->hm.s.fCtxChanged, HM_CHANGED_ALL_GUEST); \
-        else if (rcStrict == VINF_IEM_RAISED_XCPT) \
-        { \
-            rcStrict = VINF_SUCCESS; \
-            ASMAtomicUoOrU64(&(a_pVCpu)->hm.s.fCtxChanged, HM_CHANGED_RAISED_XCPT_MASK); \
-        } \
-        return VBOXSTRICTRC_VAL(rcStrict); \
-    } while (0)
-
-# endif /* VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM */
 #endif /* VBOX_WITH_NESTED_HWVIRT_VMX */
 
@@ -5897 +5879 @@
 
 
-# ifndef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
 /**
  * Decodes the memory operand of an instruction that caused a VM-exit.
@@ -6163 +6144 @@
     return VINF_SUCCESS;
 }
-# endif /* !VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM */
 #endif /* VBOX_WITH_NESTED_HWVIRT_VMX */
 
@@ -13465 +13445 @@
 {
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
-#ifndef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+
     int rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
     rc    |= HMVMX_CPUMCTX_IMPORT_STATE(pVCpu, CPUMCTX_EXTRN_RSP | CPUMCTX_EXTRN_SREG_MASK
@@ -13492 +13472 @@
     }
     return rcStrict;
-#else
-    HMVMX_IEM_EXEC_VMX_INSTR_RET(pVCpu);
-#endif
 }
 
@@ -13504 +13481 @@
 {
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
-#ifndef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+
     int rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
     rc    |= HMVMX_CPUMCTX_IMPORT_STATE(pVCpu, IEM_CPUMCTX_EXTRN_VMX_VMENTRY_MASK);
@@ -13516 +13493 @@
     Assert(rcStrict != VINF_IEM_RAISED_XCPT);
     return rcStrict;
-#else
-    HMVMX_IEM_EXEC_VMX_INSTR_RET(pVCpu);
-#endif
 }
 
@@ -13528 +13502 @@
 {
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
-#ifndef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+
     int rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
     rc    |= HMVMX_CPUMCTX_IMPORT_STATE(pVCpu, CPUMCTX_EXTRN_RSP | CPUMCTX_EXTRN_SREG_MASK
@@ -13555 +13529 @@
     }
     return rcStrict;
-#else
-    HMVMX_IEM_EXEC_VMX_INSTR_RET(pVCpu);
-#endif
 }
 
@@ -13567 +13538 @@
 {
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
-#ifndef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+
     int rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
     rc    |= HMVMX_CPUMCTX_IMPORT_STATE(pVCpu, CPUMCTX_EXTRN_RSP | CPUMCTX_EXTRN_SREG_MASK
@@ -13594 +13565 @@
     }
     return rcStrict;
-#else
-    HMVMX_IEM_EXEC_VMX_INSTR_RET(pVCpu);
-#endif
 }
 
@@ -13606 +13574 @@
 {
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
-#ifndef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+
     int rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
     rc    |= HMVMX_CPUMCTX_IMPORT_STATE(pVCpu, CPUMCTX_EXTRN_RSP | CPUMCTX_EXTRN_SREG_MASK
@@ -13634 +13602 @@
     }
     return rcStrict;
-#else
-    HMVMX_IEM_EXEC_VMX_INSTR_RET(pVCpu);
-#endif
 }
 
@@ -13646 +13611 @@
 {
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
-#ifndef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+
     int rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
     rc    |= HMVMX_CPUMCTX_IMPORT_STATE(pVCpu, IEM_CPUMCTX_EXTRN_VMX_VMENTRY_MASK);
@@ -13658 +13623 @@
     Assert(rcStrict != VINF_IEM_RAISED_XCPT);
     return rcStrict;
-#else
-    HMVMX_IEM_EXEC_VMX_INSTR_RET(pVCpu);
-#endif
 }
 
@@ -13670 +13632 @@
 {
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
-#ifndef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+
     int rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
     rc    |= HMVMX_CPUMCTX_IMPORT_STATE(pVCpu, CPUMCTX_EXTRN_RSP | CPUMCTX_EXTRN_SREG_MASK
@@ -13698 +13660 @@
     }
     return rcStrict;
-#else
-    HMVMX_IEM_EXEC_VMX_INSTR_RET(pVCpu);
-#endif
 }
 
@@ -13710 +13669 @@
 {
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
-#ifndef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+
     int rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
     rc    |= HMVMX_CPUMCTX_IMPORT_STATE(pVCpu, CPUMCTX_EXTRN_CR4 | IEM_CPUMCTX_EXTRN_EXEC_DECODED_NO_MEM_MASK);
@@ -13729 +13688 @@
     }
     return rcStrict;
-#else
-    HMVMX_IEM_EXEC_VMX_INSTR_RET(pVCpu);
-#endif
 }
 
@@ -13741 +13697 @@
 {
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
-#ifndef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+
     int rc = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
     rc    |= HMVMX_CPUMCTX_IMPORT_STATE(pVCpu, CPUMCTX_EXTRN_RSP | CPUMCTX_EXTRN_SREG_MASK
@@ -13768 +13724 @@
     }
     return rcStrict;
-#else
-    HMVMX_IEM_EXEC_VMX_INSTR_RET(pVCpu);
-#endif
 }