Changeset 86426 in vbox

Timestamp:

Oct 2, 2020 3:47:58 PM (4 years ago)

Author:

vboxsync

Message:

VMM/PDMLdr: Don't try release .r0 objects till PDMR3TermUVM is called, then the VM structure + ring-0 object will be freed and VMMR0.r0 no longer in use. bugref:9841

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/PDM.cpp (modified) (2 diffs)
• VMMR3/PDMLdr.cpp (modified) (2 diffs)
• include/PDMInternal.h (modified) (1 diff)

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

@@ -884 +884 @@
      * Free modules.
      */
-    pdmR3LdrTermU(pVM->pUVM);
+    pdmR3LdrTermU(pVM->pUVM, false /*fFinal*/);
 
     /*
@@ -916 +916 @@
      * the first time, which is why we do it.
      */
-    pdmR3LdrTermU(pUVM);
+    pdmR3LdrTermU(pUVM, true /*fFinal*/);
 
     Assert(pUVM->pdm.s.pCritSects == NULL);

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

@@ -122 +122 @@
  *
  * @param   pUVM        The user mode VM structure.
+ * @param   fFinal      This is clear when in the PDMR3Term/vmR3Destroy call
+ *                      chain, and set when called from PDMR3TermUVM.
  *
  * @remarks This is normally called twice during termination.
  */
-void pdmR3LdrTermU(PUVM pUVM)
+void pdmR3LdrTermU(PUVM pUVM, bool fFinal)
 {
     /*
@@ -147 +149 @@
         {
             case PDMMOD_TYPE_R0:
-            {
-                Assert(pModule->ImageBase);
-                int rc2 = SUPR3FreeModule((void *)(uintptr_t)pModule->ImageBase);
-                AssertRC(rc2);
-                pModule->ImageBase = 0;
-                break;
-            }
+                if (fFinal)
+                {
+                    Assert(pModule->ImageBase);
+                    int rc2 = SUPR3FreeModule((void *)(uintptr_t)pModule->ImageBase);
+                    AssertRC(rc2);
+                    pModule->ImageBase = 0;
+                    break;
+                }
+
+                /* Postpone ring-0 module till the PDMR3TermUVM() phase as VMMR0.r0 is still
+                   busy when we're called the first time very very early in vmR3Destroy().  */
+                pModule = pModule->pNext;
+                continue;
 
 #ifdef VBOX_WITH_RAW_MODE_KEEP

trunk/src/VBox/VMM/include/PDMInternal.h

@@ -1608 +1608 @@
 
 int         pdmR3LdrInitU(PUVM pUVM);
-void        pdmR3LdrTermU(PUVM pUVM);
+void        pdmR3LdrTermU(PUVM pUVM, bool fFinal);
 char       *pdmR3FileR3(const char *pszFile, bool fShared);
 int         pdmR3LoadR3U(PUVM pUVM, const char *pszFilename, const char *pszName);