Changeset 43045 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Aug 28, 2012 2:21:43 PM (12 years ago)

Author:

vboxsync

Message:

PGM: Employ the 4 unused PGMPHYSPAGE bits for checksumming shared pages in strict builds.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• GMMR0.cpp (modified) (8 diffs)
• PGMR0SharedPage.cpp (modified) (1 diff)

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

@@ -3288 +3288 @@
     Assert(pGMM->cAllocatedPages > 0);
     Assert(!pPage->Shared.cRefs);
-#if defined(VBOX_WITH_PAGE_SHARING) && defined(VBOX_STRICT) && HC_ARCH_BITS == 64
-    if (pPage->Shared.u14Checksum)
-    {
-        uint32_t uChecksum = gmmR0StrictPageChecksum(pGMM, pGVM, idPage);
-        uChecksum &= UINT32_C(0x00003fff);
-        AssertMsg(!uChecksum || uChecksum == pPage->Shared.u14Checksum,
-                  ("%#x vs %#x - idPage=%#x\n", uChecksum, pPage->Shared.u14Checksum, idPage));
-    }
-#endif
 
     pChunk->cShared--;
@@ -3404 +3395 @@
             {
                 Assert(pGVM->gmm.s.Stats.cSharedPages);
+                Assert(pPage->Shared.cRefs);
+#if defined(VBOX_WITH_PAGE_SHARING) && defined(VBOX_STRICT) && HC_ARCH_BITS == 64
+                if (pPage->Shared.u14Checksum)
+                {
+                    uint32_t uChecksum = gmmR0StrictPageChecksum(pGMM, pGVM, idPage);
+                    uChecksum &= UINT32_C(0x00003fff);
+                    AssertMsg(!uChecksum || uChecksum == pPage->Shared.u14Checksum,
+                              ("%#x vs %#x - idPage=%#x\n", uChecksum, pPage->Shared.u14Checksum, idPage));
+                }
+#endif
                 pGVM->gmm.s.Stats.cSharedPages--;
-                Assert(pPage->Shared.cRefs);
                 if (!--pPage->Shared.cRefs)
                     gmmR0FreeSharedPage(pGMM, pGVM, idPage, pPage);
@@ -4706 +4706 @@
  * @param   pPage       The page structure.
  */
-DECLINLINE(void) gmmR0ConvertToSharedPage(PGMM pGMM, PGVM pGVM, RTHCPHYS HCPhys, uint32_t idPage, PGMMPAGE pPage)
+DECLINLINE(void) gmmR0ConvertToSharedPage(PGMM pGMM, PGVM pGVM, RTHCPHYS HCPhys, uint32_t idPage, PGMMPAGE pPage,
+                                          PGMMSHAREDPAGEDESC pPageDesc)
 {
     PGMMCHUNK pChunk = gmmR0GetChunk(pGMM, idPage >> GMM_CHUNKID_SHIFT);
@@ -4725 +4726 @@
     pPage->Shared.cRefs       = 1;
 #ifdef VBOX_STRICT
-    pPage->Shared.u14Checksum = gmmR0StrictPageChecksum(pGMM, pGVM, idPage);
+    pPageDesc->u32StrictChecksum = gmmR0StrictPageChecksum(pGMM, pGVM, idPage);
+    pPage->Shared.u14Checksum = pPageDesc->u32StrictChecksum;
 #else
     pPage->Shared.u14Checksum = 0;
@@ -4745 +4747 @@
     AssertMsg(pPageDesc->GCPhys == (pPage->Private.pfn << 12), ("desc %RGp gmm %RGp\n", pPageDesc->HCPhys, (pPage->Private.pfn << 12)));
 
-    gmmR0ConvertToSharedPage(pGMM, pGVM, pPageDesc->HCPhys, pPageDesc->idPage, pPage);
+    gmmR0ConvertToSharedPage(pGMM, pGVM, pPageDesc->HCPhys, pPageDesc->idPage, pPage, pPageDesc);
 
     /* Keep track of these references. */
@@ -4779 +4781 @@
     PGMM    pGMM;
     GMM_GET_VALID_INSTANCE(pGMM, VERR_GMM_INSTANCE);
+    pPageDesc->u32StrictChecksum = 0;
 
     AssertMsgReturn(idxRegion < pModule->cRegions,
@@ -4873 +4876 @@
     }
     uint8_t *pbSharedPage = pbChunk + ((pGlobalRegion->paidPages[idxPage] & GMM_PAGEID_IDX_MASK) << PAGE_SHIFT);
+
 #ifdef VBOX_STRICT
-    if (pPage->Shared.u14Checksum)
-    {
-        uint32_t uChecksum = RTCrc32(pbSharedPage, PAGE_SIZE) & UINT32_C(0x00003fff);
-        AssertMsg(!uChecksum || uChecksum == pPage->Shared.u14Checksum,
-                  ("%#x vs %#x - idPage=%# - %s %s\n", uChecksum, pPage->Shared.u14Checksum,
-                   pGlobalRegion->paidPages[idxPage], pModule->szName, pModule->szVersion));
-    }
+    pPageDesc->u32StrictChecksum = RTCrc32(pbSharedPage, PAGE_SIZE);
+    uint32_t uChecksum = pPageDesc->u32StrictChecksum & UINT32_C(0x00003fff);
+    AssertMsg(!uChecksum || uChecksum == pPage->Shared.u14Checksum || !pPage->Shared.u14Checksum,
+              ("%#x vs %#x - idPage=%# - %s %s\n", uChecksum, pPage->Shared.u14Checksum,
+               pGlobalRegion->paidPages[idxPage], pModule->szName, pModule->szVersion));
 #endif
 
@@ -4948 +4950 @@
     RTAvlGCPtrDestroy(&pGVM->gmm.s.pSharedModuleTree, gmmR0CleanupSharedModule, &Args);
 
-    Assert(pGVM->gmm.s.Stats.cShareableModules == 0);
+    AssertMsg(pGVM->gmm.s.Stats.cShareableModules == 0, ("%d\n", pGVM->gmm.s.Stats.cShareableModules));
     pGVM->gmm.s.Stats.cShareableModules = 0;
 

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

@@ -130 +130 @@
                         pVM->pgm.s.cPrivatePages--;
                         PGM_PAGE_SET_STATE(pVM, pPage, PGM_PAGE_STATE_SHARED);
+
+# ifdef VBOX_STRICT /* check sum hack */
+                        pPage->s.u2Unused0 = PageDesc.u32StrictChecksum        & 3;
+                        pPage->s.u2Unused1 = (PageDesc.u32StrictChecksum >> 8) & 3;
+# endif
                     }
                 }