Changeset 76290 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Dec 19, 2018 9:11:47 AM (6 years ago)

Author:

vboxsync

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

127568

Message:

VMM/HM: Nested VMX: bugref:9180 Added a new pre-init VMM call, invoked from HMR3Init() to copy VMX features to the VM structures earlier than HMR0InitVM does. This way
the VMX features are available at the time of CPUMR3Init.

File:

• trunk/src/VBox/VMM/VMMR3/HM.cpp (modified) (7 diffs)

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

@@ -46 +46 @@
 #include <VBox/vmm/pgm.h>
 #include <VBox/vmm/ssm.h>
+#include <VBox/vmm/gim.h>
 #include <VBox/vmm/trpm.h>
 #include <VBox/vmm/dbgf.h>
@@ -400 +401 @@
 static DECLCALLBACK(void) hmR3Info(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
 static DECLCALLBACK(void) hmR3InfoEventPending(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
-static int                hmR3InitCPU(PVM pVM);
+static int                hmR3InitFinalizeR3(PVM pVM);
 static int                hmR3InitFinalizeR0(PVM pVM);
 static int                hmR3InitFinalizeR0Intel(PVM pVM);
@@ -702 +703 @@
             if (fCaps & SUPVTCAPS_AMD_V)
             {
+                rc = SUPR3CallVMMR0Ex(pVM->pVMR0, 0 /*idCpu*/, VMMR0_DO_HM_PRE_INIT, 0, NULL);
+                AssertRCReturn(rc, rc);
+                Assert(pVM->hm.s.svm.fSupported);
+
                 LogRel(("HM: HMR3Init: AMD-V%s\n", fCaps & SUPVTCAPS_NESTED_PAGING ? " w/ nested paging" : ""));
-                pVM->hm.s.svm.fSupported = true;
                 VM_SET_MAIN_EXECUTION_ENGINE(pVM, VM_EXEC_ENGINE_HW_VIRT);
             }
@@ -712 +716 @@
                 if (RT_SUCCESS(rc))
                 {
+                    rc = SUPR3CallVMMR0Ex(pVM->pVMR0, 0 /*idCpu*/, VMMR0_DO_HM_PRE_INIT, 0, NULL);
+                    AssertRCReturn(rc, rc);
+                    Assert(pVM->hm.s.vmx.fSupported);
+
                     LogRel(("HM: HMR3Init: VT-x%s%s%s\n",
                             fCaps & SUPVTCAPS_NESTED_PAGING ? " w/ nested paging" : "",
                             fCaps & SUPVTCAPS_VTX_UNRESTRICTED_GUEST ? " and unrestricted guest execution" : "",
                             (fCaps & (SUPVTCAPS_NESTED_PAGING | SUPVTCAPS_VTX_UNRESTRICTED_GUEST)) ? " hw support" : ""));
-                    pVM->hm.s.vmx.fSupported = true;
                     VM_SET_MAIN_EXECUTION_ENGINE(pVM, VM_EXEC_ENGINE_HW_VIRT);
                 }
@@ -844 +851 @@
 
 /**
- * Initializes the per-VCPU HM.
+ * Initializes HM components after ring-3 phase has been fully initialized.
  *
  * @returns VBox status code.
  * @param   pVM         The cross context VM structure.
  */
-static int hmR3InitCPU(PVM pVM)
+static int hmR3InitFinalizeR3(PVM pVM)
 {
     LogFlow(("HMR3InitCPU\n"));
@@ -860 +867 @@
         PVMCPU pVCpu = &pVM->aCpus[i];
         pVCpu->hm.s.fActive = false;
+        pVCpu->hm.s.fGIMTrapXcptUD = GIMShouldTrapXcptUD(pVCpu);    /* Is safe to call now since GIMR3Init() has completed. */
     }
 
@@ -1180 +1188 @@
     {
         case VMINITCOMPLETED_RING3:
-            return hmR3InitCPU(pVM);
+            return hmR3InitFinalizeR3(pVM);
         case VMINITCOMPLETED_RING0:
             return hmR3InitFinalizeR0(pVM);