Changeset 70948 in vbox for trunk/include

Timestamp:

Feb 10, 2018 3:38:12 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

120791

Message:

VMM: Added a bMainExecutionEngine member to the VM structure for use instead of fHMEnabled and fNEMEnabled. Changed a lot of HMIsEnabled invocations to use the new macros VM_IS_RAW_MODE_ENABLED and VM_IS_HM_OR_NEM_ENABLED. Eliminated fHMEnabledFixed. Fixed inverted test for raw-mode debug register sanity checking. Some other minor cleanups.

Location:

trunk/include/VBox/vmm

Files:

• cpum.h (modified) (1 diff)
• hm.h (modified) (1 diff)
• vm.h (modified) (4 diffs)
• vm.mac (modified) (2 diffs)

trunk/include/VBox/vmm/cpum.h

@@ -1695 +1695 @@
 VMMR3DECL(void)         CPUMR3ResetCpu(PVM pVM, PVMCPU pVCpu);
 VMMDECL(bool)           CPUMR3IsStateRestorePending(PVM pVM);
-VMMR3DECL(void)         CPUMR3SetHWVirtEx(PVM pVM, bool fHWVirtExEnabled);
 VMMR3DECL(int)          CPUMR3SetCR4Feature(PVM pVM, RTHCUINTREG fOr, RTHCUINTREG fAnd);
 

trunk/include/VBox/vmm/hm.h

@@ -46 +46 @@
  *
  * @retval  true if used.
- * @retval  false if software virtualization (raw-mode) is used.
+ * @retval  false if software virtualization (raw-mode) or NEM is used.
  *
  * @param   a_pVM       The cross context VM structure.
- * @sa      HMIsEnabledNotMacro, HMR3IsEnabled
+ * @sa      VM_IS_HM_OR_NEM_ENABLED, VM_IS_RAW_MODE_ENABLED,
+ *          HMIsEnabledNotMacro, HMR3IsEnabled
  * @internal
  */

trunk/include/VBox/vmm/vm.h

@@ -931 +931 @@
 
 
+/** @name VM_EXEC_ENGINE_XXX - VM::bMainExecutionEngine values.
+ * @{ */
+/** Has not yet been set. */
+#define VM_EXEC_ENGINE_NOT_SET              UINT8_C(0)
+/** Raw-mode. */
+#define VM_EXEC_ENGINE_RAW_MODE             UINT8_C(1)
+/** Hardware assisted virtualization thru HM. */
+#define VM_EXEC_ENGINE_HW_VIRT              UINT8_C(2)
+/** Hardware assisted virtualization thru native API (NEM). */
+#define VM_EXEC_ENGINE_NATIVE_API           UINT8_C(3)
+/** @} */
+
+/**
+ * Helper that HM and NEM uses for safely modifying VM::bMainExecutionEngine.
+ *
+ * ONLY HM and NEM MAY USE THIS!
+ *
+ * @param   a_pVM       The cross context VM structure.
+ * @param   a_bValue    The new value.
+ * @internal
+ */
+#define VM_SET_MAIN_EXECUTION_ENGINE(a_pVM, a_bValue) \
+    do { \
+        *const_cast<uint8_t *>(&(a_pVM)->bMainExecutionEngine) = (a_bValue); \
+        ASMCompilerBarrier(); /* just to be on the safe side */ \
+    } while (0)
+
+/**
+ * Checks whether raw-mode is used.
+ *
+ * @retval  true if either is used.
+ * @retval  false if software virtualization (raw-mode) is used.
+ *
+ * @param   a_pVM       The cross context VM structure.
+ * @sa      HMR3IsEnabled, HMIsEnabled
+ * @internal
+ */
+#ifdef VBOX_WITH_RAW_MODE
+# define VM_IS_RAW_MODE_ENABLED(a_pVM)      ((a_pVM)->bMainExecutionEngine == VM_EXEC_ENGINE_RAW_MODE)
+#else
+# define VM_IS_RAW_MODE_ENABLED(a_pVM)      (false)
+#endif
+
+/**
+ * Checks whether HM (VT-x/AMD-V) or NEM is being used by this VM.
+ *
+ * @retval  true if either is used.
+ * @retval  false if software virtualization (raw-mode) is used.
+ *
+ * @param   a_pVM       The cross context VM structure.
+ * @sa      VM_IS_RAW_MODE_ENABLED, HMIsEnabled, HMR3IsEnabled
+ * @internal
+ */
+#define VM_IS_HM_OR_NEM_ENABLED(a_pVM)      ((a_pVM)->bMainExecutionEngine != VM_EXEC_ENGINE_RAW_MODE)
+
 
 /**
@@ -1010 +1065 @@
     /** @name Various items that are frequently accessed.
      * @{ */
+    /** The main execution engine, VM_EXEC_ENGINE_XXX.
+     * This is set early during vmR3InitRing3 by HM or NEM.  */
+    uint8_t const               bMainExecutionEngine;
+
     /** Whether to recompile user mode code or run it raw/hm. */
     bool                        fRecompileUser;
@@ -1024 +1083 @@
     /** Hardware VM support is available and enabled.
      * Determined very early during init.
-     * This is placed here for performance reasons. */
+     * This is placed here for performance reasons.
+     * @todo obsoleted by bMainExecutionEngine, eliminate. */
     bool                        fHMEnabled;
-    /** For asserting on fHMEnable usage. */
-    bool                        fHMEnabledFixed;
     /** Hardware VM support requires a minimal raw-mode context.
      * This is never set on 64-bit hosts, only 32-bit hosts requires it. */
     bool                        fHMNeedRawModeCtx;
-    /** NEM (native execution manager) active flag.
-     * This means we'll use NEM instead of HM when running guest code.  */
-    bool                        fNEMActive;
     /** Set when this VM is the master FT node.
      * @todo This doesn't need to be here, FTM should store it in it's own
@@ -1045 +1100 @@
 
     /** Alignment padding. */
-    uint8_t                     uPadding1[1];
+    uint8_t                     uPadding1[2];
 
     /** @name Debugging

trunk/include/VBox/vmm/vm.mac

@@ -104 +104 @@
     .pfnVMMRCToHostAsm      resd 1
     .pfnVMMRCToHostAsmNoReturn resd 1
+    .bMainExecutionEngine   resb 1
     .fRecompileUser         resb 1
     .fRecompileSupervisor   resb 1
@@ -110 +111 @@
     .fCSAMEnabled           resb 1
     .fHMEnabled             resb 1
-    .fHMEnabledFixed        resb 1
     .fHMNeedRawModeCtx      resb 1
-    .fNEMActive             resb 1
     .fFaultTolerantMaster   resb 1
     .fUseLargePages         resb 1
 
-    .uPadding1              resb 1
+    .uPadding1              resb 2
 
     .hTraceBufRC            RTRCPTR_RES 1