Changeset 30646 in vbox

Timestamp:

Jul 6, 2010 8:00:31 AM (15 years ago)

Author:

vboxsync

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

63381

Message:

Reregister all shared modules after VM restore

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• include/VBox/types.h (modified) (2 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR0/GMMR0.cpp (modified) (1 diff)

trunk/include/VBox/err.h

@@ -479 +479 @@
 /** Inconsistent local and global registration records. */
 #define VERR_PGM_SHARED_MODULE_REGISTRATION_INCONSISTENCY (-1650)
+/** No registered modules. */
+#define VINF_PGM_SHARED_MODULE_NONE_REGISTERED  (1651)
 /** @} */
 

trunk/include/VBox/types.h

@@ -826 +826 @@
  * Page mapping lock.
  *
- * @remarks This doesn't work in structures shared between
- *          ring-3, ring-0 and/or GC.
  */
 typedef struct PGMPAGEMAPLOCK
@@ -835 +833 @@
     /** Just a dummy for the time being. */
     uint32_t    u32Dummy;
+    uint32_t    u32Dummy1;
+# if HC_ARCH_BITS == 64
+    uint32_t    u32Align[2];
+# endif
 #else
     /** Pointer to the PGMPAGE and lock type.

trunk/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp

@@ -85 +85 @@
 
 
-static DECLCALLBACK(int) VBoxServicePageSharingEmptyTreeCallback(PAVLPVNODECORE pNode, void *);
+static DECLCALLBACK(int) VBoxServicePageSharingEmptyTreeCallback(PAVLPVNODECORE pNode, void *pvUser);
 
 static PAVLPVNODECORE   pKnownModuleTree = NULL;
@@ -487 +487 @@
 
     /* Check all registered modules. */
-    VbglR3CheckSharedModules();
-
-    /* Activate new module tree. */
-    pKnownModuleTree = pNewTree;
+    int rc = VbglR3CheckSharedModules();
+    if (rc == VINF_PGM_SHARED_MODULE_NONE_REGISTERED)
+    {
+        bool fUnregister = false;
+        /* The VM was restored, so reregister all modules the next time. */
+        RTAvlPVDestroy(&pKnownModuleTree, VBoxServicePageSharingEmptyTreeCallback, &fUnregister);
+        pKnownModuleTree = NULL;
+    }
+    else
+    {
+        /* Activate new module tree. */
+        pKnownModuleTree = pNewTree;
+    }
 }
 
@@ -496 +505 @@
  * RTAvlPVDestroy callback.
  */
-static DECLCALLBACK(int) VBoxServicePageSharingEmptyTreeCallback(PAVLPVNODECORE pNode, void *)
+static DECLCALLBACK(int) VBoxServicePageSharingEmptyTreeCallback(PAVLPVNODECORE pNode, void *pvUser)
 {
     PKNOWN_MODULE pModule = (PKNOWN_MODULE)pNode;
+    bool *pfUnregister = (bool *)pvUser;
 
     VBoxServiceVerbose(3, "VBoxServicePageSharingEmptyTreeCallback %s %s\n", pModule->Info.szModule, pModule->szFileVersion);
 
-    /* Defererence module in the hypervisor. */
-    int rc = VbglR3UnregisterSharedModule(pModule->Info.szModule, pModule->szFileVersion, (RTGCPTR64)pModule->Info.modBaseAddr, pModule->Info.modBaseSize);
-    AssertRC(rc);
+    /* Dereference module in the hypervisor. */
+    if (    !pfUnregister
+        ||  *pfUnregister == true)
+    {
+    #ifdef RT_ARCH_X86
+        int rc = VbglR3UnregisterSharedModule(pModule->Info.szModule, pModule->szFileVersion, (RTGCPTR32)pModule->Info.modBaseAddr, pModule->Info.modBaseSize);
+    #else
+        int rc = VbglR3UnregisterSharedModule(pModule->Info.szModule, pModule->szFileVersion, (RTGCPTR64)pModule->Info.modBaseAddr, pModule->Info.modBaseSize);
+    #endif
+        AssertRC(rc);
+    }
 
     if (pModule->hModule)

trunk/src/VBox/VMM/VMMR0/GMMR0.cpp

@@ -4169 +4169 @@
 
         Log(("GMMR0CheckSharedModules\n"));
-        Info.pGVM     = pGVM;
-        Info.idCpu    = pVCpu->idCpu;
-
-        RTAvlGCPtrDoWithAll(&pGVM->gmm.s.pSharedModuleTree, true /* fFromLeft */, gmmR0CheckSharedModule, &Info);
+        if (pGVM->gmm.s.pSharedModuleTree != NULL)
+        {
+            Info.pGVM     = pGVM;
+            Info.idCpu    = pVCpu->idCpu;
+
+            RTAvlGCPtrDoWithAll(&pGVM->gmm.s.pSharedModuleTree, true /* fFromLeft */, gmmR0CheckSharedModule, &Info);
+            rc = VINF_SUCCESS;
+        }
+        else
+            rc = VINF_PGM_SHARED_MODULE_NONE_REGISTERED;
 
         Log(("GMMR0CheckSharedModules done!\n"));
-        rc = VINF_SUCCESS;
+
         GMM_CHECK_SANITY_UPON_LEAVING(pGMM);
     }