Changeset 70918 in vbox for trunk/src/VBox/VMM

Timestamp:

Feb 8, 2018 4:11:47 PM (7 years ago)

Author:

vboxsync

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

120746

Message:

VMM: NEM kick off.

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (2 diffs)
• VMMR3/HM.cpp (modified) (7 diffs)
• VMMR3/NEMR3.cpp (added)
• VMMR3/NEMR3Native-win.cpp (added)
• VMMR3/VM.cpp (modified) (8 diffs)
• VMMR3/VMM.cpp (modified) (2 diffs)
• include/NEMInternal.h (added)
• testcase/tstVMStruct.h (modified) (1 diff)
• testcase/tstVMStructDTrace.cpp (modified) (1 diff)
• testcase/tstVMStructRC.cpp (modified) (1 diff)
• testcase/tstVMStructSize.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -186 +186 @@
         VMMR3/MMPagePool.cpp \
         VMMR3/MMUkHeap.cpp \
+        VMMR3/NEMR3.cpp \
         VMMR3/PDM.cpp \
         VMMR3/PDMBlkCache.cpp \
@@ -307 +308 @@
         VMMSwitcher/AMD64Stub.asm
 
+VBoxVMM_SOURCES.win += VMMR3/NEMR3Native-win.cpp
+VBoxVMM_DEFS.win    += VBOX_WITH_NATIVE_NEM
+
 VBoxVMM_LIBS = \
         $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB)

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -51 +51 @@
 #include <VBox/vmm/csam.h>
 #include <VBox/vmm/selm.h>
+#include <VBox/vmm/nem.h>
 #ifdef VBOX_WITH_REM
 # include <VBox/vmm/rem.h>
@@ -394 +395 @@
  * Initializes the HM.
  *
- * This reads the config and check whether VT-x or AMD-V hardware is available
- * if configured to use it.  This is one of the very first components to be
- * initialized after CFGM, so that we can fall back to raw-mode early in the
- * initialization process.
+ * This is the very first component to really do init after CFGM so that we can
+ * establish the predominat execution engine for the VM prior to initializing
+ * other modules.  It takes care of NEM initialization if needed (HM disabled or
+ * not available in HW).
+ *
+ * If VT-x or AMD-V hardware isn't available, HM will try fall back on a native
+ * hypervisor API via NEM, and then back on raw-mode if that isn't available
+ * either.  The fallback to raw-mode will not happen if /HM/HMForced is set
+ * (like for guest using SMP or 64-bit as well as for complicated guest like OS
+ * X, OS/2 and others).
  *
  * Note that a lot of the set up work is done in ring-0 and thus postponed till
@@ -449 +456 @@
     rc = CFGMR3ValidateConfig(pCfgHm, "/HM/",
                               "HMForced"
+                              "|UseNEMInstead"
+                              "|FallbackToNEM"
                               "|EnableNestedPaging"
                               "|EnableUX"
@@ -492 +501 @@
 #endif /* !VBOX_WITH_RAW_MODE */
 
+    /** @cfgm{/HM/UseNEMInstead, bool, true}
+     * Don't use HM, use NEM instead. */
+    bool fUseNEMInstead = false;
+    rc = CFGMR3QueryBoolDef(pCfgHm, "UseNEMInstead", &fUseNEMInstead, false);
+    AssertRCReturn(rc, rc);
+    if (fUseNEMInstead && pVM->fHMEnabled)
+    {
+        LogRel(("HM: Setting fHMEnabled to false because fUseNEMInstead is set.\n"));
+        pVM->fHMEnabled = false;
+    }
+
+    /** @cfgm{/HM/FallbackToNEM, bool, true}
+     * Enables fallback on NEM. */
+    bool fFallbackToNEM = true;
+    rc = CFGMR3QueryBoolDef(pCfgHm, "FallbackToNEM", &fFallbackToNEM, true);
+    AssertRCReturn(rc, rc);
+
     /** @cfgm{/HM/EnableNestedPaging, bool, false}
      * Enables nested paging (aka extended page tables). */
@@ -643 +669 @@
             else if (fCaps & SUPVTCAPS_VT_X)
             {
-                rc = SUPR3QueryVTxSupported();
+                const char *pszWhy;
+                rc = SUPR3QueryVTxSupported(&pszWhy);
                 if (RT_SUCCESS(rc))
                 {
@@ -654 +681 @@
                 else
                 {
-#ifdef RT_OS_LINUX
-                    const char *pszMinReq = " Linux 2.6.13 or newer required!";
-#else
-                    const char *pszMinReq = "";
-#endif
-                    if (fHMForced)
-                        return VMSetError(pVM, rc, RT_SRC_POS, "The host kernel does not support VT-x.%s\n", pszMinReq);
-
-                    /* Fall back to raw-mode. */
-                    LogRel(("HM: HMR3Init: Falling back to raw-mode: The host kernel does not support VT-x.%s\n", pszMinReq));
+                    /*
+                     * Before failing, try fallback to NEM if we're allowed to do that.
+                     */
                     pVM->fHMEnabled = false;
+                    if (fFallbackToNEM)
+                    {
+                        LogRel(("HM: HMR3Init: Attempting fall back to NEM: The host kernel does not support VT-x - %s\n", pszWhy));
+                        int rc2 = NEMR3Init(pVM, true /*fFallback*/, fHMForced);
+                        if (   RT_SUCCESS(rc2)
+                            && pVM->fNEMActive)
+                            rc = VINF_SUCCESS;
+                    }
+                    if (RT_FAILURE(rc))
+                    {
+                        if (fHMForced)
+                            return VMSetError(pVM, rc, RT_SRC_POS, "The host kernel does not support VT-x: %s\n", pszWhy);
+
+                        /* Fall back to raw-mode. */
+                        LogRel(("HM: HMR3Init: Falling back to raw-mode: The host kernel does not support VT-x - %s\n", pszWhy));
+                    }
                 }
             }
@@ -738 +774 @@
 
                 default:
-                    pszMsg = NULL;
-                    break;
+                    return VMSetError(pVM, rc, RT_SRC_POS, "SUPR3QueryVTCaps failed with %Rrc", rc);
             }
-            if (fHMForced && pszMsg)
-                return VM_SET_ERROR(pVM, rc, pszMsg);
-            if (!pszMsg)
-                return VMSetError(pVM, rc, RT_SRC_POS, "SUPR3QueryVTCaps failed with %Rrc", rc);
-
-            /* Fall back to raw-mode. */
-            LogRel(("HM: HMR3Init: Falling back to raw-mode: %s\n", pszMsg));
+
+            /*
+             * Before failing, try fallback to NEM if we're allowed to do that.
+             */
             pVM->fHMEnabled = false;
+            if (fFallbackToNEM)
+            {
+                LogRel(("HM: HMR3Init: Attempting fall back to NEM: %s\n", pszMsg));
+                int rc2 = NEMR3Init(pVM, true /*fFallback*/, fHMForced);
+                if (   RT_SUCCESS(rc2)
+                    && pVM->fNEMActive)
+                    rc = VINF_SUCCESS;
+            }
+            if (RT_FAILURE(rc))
+            {
+                if (fHMForced)
+                    return VM_SET_ERROR(pVM, rc, pszMsg);
+
+                LogRel(("HM: HMR3Init: Falling back to raw-mode: %s\n", pszMsg));
+            }
         }
+    }
+    /*
+     * If NEM is supposed to be used instead, initialize it instead.
+     */
+    else if (fUseNEMInstead)
+    {
+        rc = NEMR3Init(pVM, false /*fFallback*/, fHMForced);
+        if (RT_FAILURE(rc))
+            return rc;
     }
 

trunk/src/VBox/VMM/VMMR3/VM.cpp

@@ -61 +61 @@
 # include <VBox/vmm/rem.h>
 #endif
+#include <VBox/vmm/nem.h>
 #include <VBox/vmm/apic.h>
 #include <VBox/vmm/tm.h>
@@ -925 +926 @@
     /*
      * Init all R3 components, the order here might be important.
-     * HM shall be initialized first!
-     */
-    rc = HMR3Init(pVM);
+     * NEM and HM shall be initialized first!
+     */
+    rc = NEMR3InitConfig(pVM);
+    if (RT_SUCCESS(rc))
+        rc = HMR3Init(pVM);
     if (RT_SUCCESS(rc))
     {
@@ -1076 +1079 @@
         AssertRC(rc2);
     }
-
+    NEMR3Term(pVM);
 
     LogFlow(("vmR3InitRing3: returns %Rrc\n", rc));
@@ -1168 +1171 @@
     if (RT_SUCCESS(rc))
         rc = HMR3InitCompleted(pVM, enmWhat);
+    if (RT_SUCCESS(rc))
+        rc = NEMR3InitCompleted(pVM, enmWhat);
     if (RT_SUCCESS(rc))
         rc = PGMR3InitCompleted(pVM, enmWhat);
@@ -2516 +2521 @@
         rc = HMR3Term(pVM);
         AssertRC(rc);
+        rc = NEMR3Term(pVM);
+        AssertRC(rc);
         rc = PGMR3Term(pVM);
         AssertRC(rc);
@@ -2804 +2811 @@
         EMR3Reset(pVM);
         HMR3Reset(pVM);                 /* This must come *after* PATM, CSAM, CPUM, SELM and TRPM. */
+        NEMR3Reset(pVM);
 
         /*
@@ -2907 +2915 @@
         EMR3Reset(pVM);
         HMR3Reset(pVM);                 /* This must come *after* PATM, CSAM, CPUM, SELM and TRPM. */
+        NEMR3Reset(pVM);
 
         /*
@@ -4632 +4641 @@
     EMR3ResetCpu(pVCpu);
     HMR3ResetCpu(pVCpu);
+    NEMR3ResetCpu(pVCpu);
     return VINF_EM_WAIT_SIPI;
 }

trunk/src/VBox/VMM/VMMR3/VMM.cpp

@@ -112 +112 @@
 #include <VBox/vmm/gim.h>
 #include <VBox/vmm/mm.h>
+#include <VBox/vmm/nem.h>
 #include <VBox/vmm/iom.h>
 #include <VBox/vmm/trpm.h>
@@ -1494 +1495 @@
     EMR3ResetCpu(pVCpu);
     HMR3ResetCpu(pVCpu);
+    NEMR3ResetCpu(pVCpu);
 
     /* This will trickle up on the target EMT. */

trunk/src/VBox/VMM/testcase/tstVMStruct.h

@@ -432 +432 @@
     GEN_CHECK_OFF_DOT(MMLOOKUPHYPER, u.MMIO2.off);
     GEN_CHECK_OFF(MMLOOKUPHYPER, pszDesc);
+
+    GEN_CHECK_SIZE(NEM);
+    GEN_CHECK_SIZE(NEMCPU);
 
     GEN_CHECK_SIZE(PDM);

trunk/src/VBox/VMM/testcase/tstVMStructDTrace.cpp

@@ -52 +52 @@
 #include "IEMInternal.h"
 #include "REMInternal.h"
+#include "NEMInternal.h"
 #ifdef VBOX_WITH_RAW_MODE
 # include "CSAMInternal.h"

trunk/src/VBox/VMM/testcase/tstVMStructRC.cpp

@@ -82 +82 @@
 #include "IEMInternal.h"
 #include "REMInternal.h"
+#include "NEMInternal.h"
 #include <VBox/vmm/vm.h>
 #include <VBox/vmm/hm_vmx.h>

trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp

@@ -53 +53 @@
 #include "IEMInternal.h"
 #include "REMInternal.h"
+#include "NEMInternal.h"
 #include "../VMMR0/GMMR0Internal.h"
 #include "../VMMR0/GVMMR0Internal.h"
@@ -227 +228 @@
     CHECK_PADDING_VM(64, em);
     /*CHECK_PADDING_VM(64, iem);*/
+    CHECK_PADDING_VM(64, nem);
     CHECK_PADDING_VM(64, tm);
     PRINT_OFFSET(VM, tm.s.VirtualSyncLock);
@@ -243 +245 @@
     CHECK_PADDING_VMCPU(64, hm);
     CHECK_PADDING_VMCPU(64, em);
+    CHECK_PADDING_VMCPU(64, nem);
     CHECK_PADDING_VMCPU(64, trpm);
     CHECK_PADDING_VMCPU(64, tm);