Changeset 760 in vbox

Timestamp:

Feb 7, 2007 6:29:33 PM (18 years ago)

Author:

vboxsync

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

18421

Message:

Enhanced detection of changed pages.

File:

• trunk/src/VBox/VMM/PATM/CSAM.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PATM/CSAM.cpp

@@ -72 +72 @@
 
 bool                csamIsCodeScanned(PVM pVM, RTGCPTR pInstr, PCSAMPAGE *pPage);
-int                 csamR3FlushPageRecord(PVM pVM, PCSAMPAGE pPage);
 int                 csamR3CheckPageRecord(PVM pVM, RTGCPTR pInstr);
 static PCSAMPAGE    csamCreatePageRecord(PVM pVM, RTGCPTR GCPtr, CSAMTAG enmTag, bool fCode32, bool fMonitorInvalidation = false);
@@ -1388 +1387 @@
 
 /**
- * Flush a page record
- *
- * @returns VBox status code. (trap handled or not)
- * @param   pVM         The VM to operate on.
- * @param   pPage       Page record ptr
- */
-int csamR3FlushPageRecord(PVM pVM, PCSAMPAGE pPage)
-{
-    RTGCPHYS oldPhys = pPage->GCPhys;
-    Log(("csamR3FlushPageRecord: page %VGv has changed -> FLUSH\n", pPage->pPageGC));
-
-    int rc = PGMGstGetPage(pVM, pPage->pPageGC, &pPage->fFlags, &pPage->GCPhys);
-    AssertMsg(VBOX_SUCCESS(rc) || rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT, ("rc = %Vrc\n", rc));
-
-    Log(("Old GCPhys %VGp new %VGp\n", oldPhys, pPage->GCPhys));
-    if (pPage->pBitmap == NULL)
-    {
-        pPage->pBitmap = (uint8_t *)MMR3HeapAllocZ(pVM, MM_TAG_CSAM_PATCH, CSAM_PAGE_BITMAP_SIZE);
-        Assert(pPage->pBitmap);
-        if (pPage->pBitmap == NULL)
-        {
-            return VERR_NO_MEMORY;
-        }
-    }
-    else
-    {
-        memset(pPage->pBitmap, 0, CSAM_PAGE_BITMAP_SIZE);
-    }
-    pPage->u64Hash  = csamR3CalcPageHash(pVM, pPage->pPageGC);
-
-    return VINF_SUCCESS;
-}
-
-/**
  * Notify CSAM of a page flush
  *
@@ -1501 +1466 @@
             if (rc == VINF_SUCCESS)
                 pPageRec->page.u64Hash = csamR3CalcPageHash(pVM, addr);
+
+            if (pPageRec->page.pBitmap == NULL)
+            {
+                pPageRec->page.pBitmap = (uint8_t *)MMR3HeapAllocZ(pVM, MM_TAG_CSAM_PATCH, CSAM_PAGE_BITMAP_SIZE);
+                Assert(pPageRec->page.pBitmap);
+                if (pPageRec->page.pBitmap == NULL)
+                    return VERR_NO_MEMORY;
+            }
+            else
+                memset(pPageRec->page.pBitmap, 0, CSAM_PAGE_BITMAP_SIZE);
         }
 
@@ -1550 +1525 @@
         u64hash = csamR3CalcPageHash(pVM, pInstrGC);
         if (u64hash != pPageRec->page.u64Hash)
-        {
-            csamR3FlushPageRecord(pVM, &pPageRec->page);
-        }
+            csamFlushPage(pVM, pInstrGC, false /* don't remove page record */);
     }
     else
-    {
         return VWRN_CSAM_PAGE_NOT_FOUND;
-    }
+
     return VINF_SUCCESS;
 }