Changeset 92721 in vbox for trunk/src/VBox

Timestamp:

Dec 2, 2021 10:42:04 PM (3 years ago)

Author:

vboxsync

Message:

VMM: Made driverless adjustments to the halt and cleanup code. bugref:10138

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• GMM.cpp (modified) (2 diffs)
• GVMMR3.cpp (modified) (2 diffs)
• PGMPhys.cpp (modified) (1 diff)
• VM.cpp (modified) (1 diff)
• VMEmt.cpp (modified) (4 diffs)

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

@@ -266 +266 @@
 GMMR3DECL(int)  GMMR3BalloonedPages(PVM pVM, GMMBALLOONACTION enmAction, uint32_t cBalloonedPages)
 {
-    GMMBALLOONEDPAGESREQ Req;
-    Req.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
-    Req.Hdr.cbReq = sizeof(Req);
-    Req.enmAction = enmAction;
-    Req.cBalloonedPages = cBalloonedPages;
-
-    return VMMR3CallR0(pVM, VMMR0_DO_GMM_BALLOONED_PAGES, 0, &Req.Hdr);
+    int rc;
+    if (!SUPR3IsDriverless())
+    {
+        GMMBALLOONEDPAGESREQ Req;
+        Req.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+        Req.Hdr.cbReq = sizeof(Req);
+        Req.enmAction = enmAction;
+        Req.cBalloonedPages = cBalloonedPages;
+
+        rc = VMMR3CallR0(pVM, VMMR0_DO_GMM_BALLOONED_PAGES, 0, &Req.Hdr);
+    }
+    /*
+     * Ignore reset and fail all other requests.
+     */
+    else if (enmAction == GMMBALLOONACTION_RESET && cBalloonedPages == 0)
+        rc = VINF_SUCCESS;
+    else
+        rc = VERR_SUP_DRIVERLESS;
+    return rc;
 }
 
@@ -395 +407 @@
 GMMR3DECL(int) GMMR3ResetSharedModules(PVM pVM)
 {
-    return VMMR3CallR0(pVM, VMMR0_DO_GMM_RESET_SHARED_MODULES, 0, NULL);
+    if (!SUPR3IsDriverless())
+        return VMMR3CallR0(pVM, VMMR0_DO_GMM_RESET_SHARED_MODULES, 0, NULL);
+    return VINF_SUCCESS;
 }
 

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

@@ -118 +118 @@
  * @returns VBox status code.
  * @param   pUVM    The user mode VM handle.
- */
-VMMR3_INT_DECL(int) GVMMR3DestroyVM(PUVM pUVM)
-{
-    PVM pVM = pUVM->pVM;
+ * @param   pVM     The cross context VM structure.
+ */
+VMMR3_INT_DECL(int) GVMMR3DestroyVM(PUVM pUVM, PVM pVM)
+{
     AssertPtrReturn(pVM, VERR_INVALID_VM_HANDLE);
     Assert(pUVM->cCpus == pVM->cCpus);
+    RT_NOREF(pUVM);
 
     int rc;
@@ -156 +157 @@
             LogRel(("idCpu=%u rc=%Rrc\n", idCpu, rc));
     }
+    else
+        rc = VINF_SUCCESS;
+    return rc;
+}
+
+
+/**
+ * Deregister the calling EMT from GVM.
+ *
+ * @returns VBox status code.
+ * @param   pVM         The cross context VM structure.
+ * @param   idCpu       The Virtual CPU ID.
+ * @thread  EMT(idCpu)
+ * @see     GVMMR0DeregisterVCpu
+ */
+VMMR3_INT_DECL(int) GVMMR3DeregisterVCpu(PVM pVM, VMCPUID idCpu)
+{
+    Assert(VMMGetCpuId(pVM) == idCpu);
+    int rc;
+    if (!SUPR3IsDriverless())
+        rc = SUPR3CallVMMR0Ex(VMCC_GET_VMR0_FOR_CALL(pVM), idCpu, VMMR0_DO_GVMM_DEREGISTER_VMCPU, 0, NULL);
     else
         rc = VINF_SUCCESS;

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

@@ -2174 +2174 @@
      * in there.  (Not unlikely if the VM shuts down, apparently.)
      */
-    rc = VMMR3CallR0(pVM, VMMR0_DO_PGM_FLUSH_HANDY_PAGES, 0, NULL);
+# ifdef VBOX_WITH_PGM_NEM_MODE
+    if (!pVM->pgm.s.fNemMode)
+# endif
+        rc = VMMR3CallR0(pVM, VMMR0_DO_PGM_FLUSH_HANDY_PAGES, 0, NULL);
 #endif
 

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

@@ -708 +708 @@
         }
 
-        int rc2 = GVMMR3DestroyVM(pUVM);
+        int rc2 = GVMMR3DestroyVM(pUVM, pVM);
         AssertRC(rc2);
     }

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

@@ -24 +24 @@
 #include <VBox/vmm/dbgf.h>
 #include <VBox/vmm/em.h>
+#include <VBox/vmm/gvmm.h>
 #include <VBox/vmm/nem.h>
 #include <VBox/vmm/pdmapi.h>
@@ -285 +286 @@
         }
 
-        int rc2 = SUPR3CallVMMR0Ex(VMCC_GET_VMR0_FOR_CALL(pVM), 0 /*idCpu*/, VMMR0_DO_GVMM_DESTROY_VM, 0, NULL);
+        int rc2 = GVMMR3DestroyVM(pUVM, pVM);
         AssertLogRelRC(rc2);
     }
@@ -292 +293 @@
              && (pVM = pUVM->pVM) != NULL)
     {
-        int rc2 = SUPR3CallVMMR0Ex(VMCC_GET_VMR0_FOR_CALL(pVM), idCpu, VMMR0_DO_GVMM_DEREGISTER_VMCPU, 0, NULL);
+        int rc2 = GVMMR3DeregisterVCpu(pVM, idCpu);
         AssertLogRelRC(rc2);
     }
@@ -1347 +1348 @@
             //enmHaltMethod = VMHALTMETHOD_OLD;
     }
-    LogRel(("VMEmt: Halt method %s (%d)\n", vmR3GetHaltMethodName(enmHaltMethod), enmHaltMethod));
+
+    /*
+     * The global halt method doesn't work in driverless mode, so fall back on
+     * method #1 instead.
+     */
+    if (!SUPR3IsDriverless() || enmHaltMethod != VMHALTMETHOD_GLOBAL_1)
+        LogRel(("VMEmt: Halt method %s (%d)\n", vmR3GetHaltMethodName(enmHaltMethod), enmHaltMethod));
+    else
+    {
+        LogRel(("VMEmt: Halt method %s (%d) not available in driverless mode, using %s (%d) instead\n",
+                vmR3GetHaltMethodName(enmHaltMethod), enmHaltMethod, vmR3GetHaltMethodName(VMHALTMETHOD_1), VMHALTMETHOD_1));
+        enmHaltMethod = VMHALTMETHOD_1;
+    }
+
 
     /*