Changeset 76876 in vbox

Timestamp:

Jan 18, 2019 8:35:13 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Sped up IEM-only execution of VMX instructions by executing them in ring-0.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (10 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 */
 
@@ -13475 +13493 @@
     return rcStrict;
 #else
-    return VERR_EM_INTERPRETER;
+    HMVMX_IEM_EXEC_VMX_INSTR_RET(pVCpu);
 #endif
 }
@@ -13499 +13517 @@
     return rcStrict;
 #else
-    return VERR_EM_INTERPRETER;
+    HMVMX_IEM_EXEC_VMX_INSTR_RET(pVCpu);
 #endif
 }
@@ -13538 +13556 @@
     return rcStrict;
 #else
-    return VERR_EM_INTERPRETER;
+    HMVMX_IEM_EXEC_VMX_INSTR_RET(pVCpu);
 #endif
 }
@@ -13577 +13595 @@
     return rcStrict;
 #else
-    return VERR_EM_INTERPRETER;
+    HMVMX_IEM_EXEC_VMX_INSTR_RET(pVCpu);
 #endif
 }
@@ -13617 +13635 @@
     return rcStrict;
 #else
-    return VERR_EM_INTERPRETER;
+    HMVMX_IEM_EXEC_VMX_INSTR_RET(pVCpu);
 #endif
 }
@@ -13641 +13659 @@
     return rcStrict;
 #else
-    return VERR_EM_INTERPRETER;
+    HMVMX_IEM_EXEC_VMX_INSTR_RET(pVCpu);
 #endif
 }
@@ -13681 +13699 @@
     return rcStrict;
 #else
-    return VERR_EM_INTERPRETER;
+    HMVMX_IEM_EXEC_VMX_INSTR_RET(pVCpu);
 #endif
 }
@@ -13712 +13730 @@
     return rcStrict;
 #else
-    return VERR_EM_INTERPRETER;
+    HMVMX_IEM_EXEC_VMX_INSTR_RET(pVCpu);
 #endif
 }
@@ -13751 +13769 @@
     return rcStrict;
 #else
-    return VERR_EM_INTERPRETER;
+    HMVMX_IEM_EXEC_VMX_INSTR_RET(pVCpu);
 #endif
 }