Changeset 1830 in vbox for trunk/src/VBox/VMM/PATM

Timestamp:

Mar 30, 2007 2:16:35 PM (18 years ago)

Author:

vboxsync

Message:

Preparation for new code page detection.

Location:

trunk/src/VBox/VMM/PATM

Files:

• CSAM.cpp (modified) (5 diffs)
• CSAMInternal.h (modified) (2 diffs)
• VMMAll/CSAMAll.cpp (modified) (2 diffs)
• VMMGC/CSAMGC.cpp (modified) (1 diff)

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

@@ -226 +226 @@
     pVM->csam.s.fScanningStarted = false;
 
-    VM_FF_CLEAR(pVM, VM_FF_CSAM_FLUSH_DIRTY_PAGE);
+    VM_FF_CLEAR(pVM, VM_FF_CSAM_PENDING_ACTION);
     pVM->csam.s.cDirtyPages = 0;
     /* not necessary */
@@ -462 +462 @@
     memcpy(pVM->csam.s.pvDirtyBasePage,  csamInfo.pvDirtyBasePage, sizeof(pVM->csam.s.pvDirtyBasePage));
     memcpy(pVM->csam.s.pvDirtyFaultPage, csamInfo.pvDirtyFaultPage, sizeof(pVM->csam.s.pvDirtyFaultPage));
+
+     /* Restore possible code page  */
+    pVM->csam.s.cPossibleCodePages = csamInfo.cPossibleCodePages;
+    memcpy(pVM->csam.s.pvPossibleCodePage,  csamInfo.pvPossibleCodePage, sizeof(pVM->csam.s.pvPossibleCodePage));
 
     /* Restore pgdir bitmap (we'll change the pointers next). */
@@ -2008 +2012 @@
  * @param   fScanned    Mark as scanned or not
  */
-CSAMDECL(int) CSAMR3MarkCode(PVM pVM, RTGCPTR pInstr, uint32_t opsize, bool fScanned)
+CSAMR3DECL(int) CSAMR3MarkCode(PVM pVM, RTGCPTR pInstr, uint32_t opsize, bool fScanned)
 {
     PCSAMPAGE pPage = 0;
@@ -2104 +2108 @@
  * @param   pVM         The VM to operate on.
  */
-CSAMR3DECL(int) CSAMR3FlushDirtyPages(PVM pVM)
+static int csamR3FlushDirtyPages(PVM pVM)
 {
     STAM_PROFILE_START(&pVM->csam.s.StatFlushDirtyPages, a);
@@ -2142 +2146 @@
     }
     pVM->csam.s.cDirtyPages = 0;
-    VM_FF_CLEAR(pVM, VM_FF_CSAM_FLUSH_DIRTY_PAGE);
     STAM_PROFILE_STOP(&pVM->csam.s.StatFlushDirtyPages, a);
+    return VINF_SUCCESS;
+}
+
+/**
+ * Flush potential new code pages
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ */
+static int csamR3FlushCodePages(PVM pVM)
+{
+    for (uint32_t i=0;i<pVM->csam.s.cPossibleCodePages;i++)
+    {
+        int          rc;
+        RTGCPTR      GCPtr = pVM->csam.s.pvPossibleCodePage[i];
+
+        GCPtr = GCPtr & PAGE_BASE_GC_MASK;
+
+        CSAMMarkPage(pVM, GCPtr, false);
+        PGMInvalidatePage(pVM, GCPtr);
+        PGMPrefetchPage(pVM, GCPtr);
+
+        CSAMMarkPage(pVM, GCPtr, true);
+    }
+    pVM->csam.s.cPossibleCodePages = 0;
+    return VINF_SUCCESS;
+}
+
+/**
+ * Perform any pending actions
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ */
+CSAMR3DECL(int) CSAMR3DoPendingAction(PVM pVM)
+{
+    csamR3FlushDirtyPages(pVM);
+    csamR3FlushCodePages(pVM);
+
+    VM_FF_CLEAR(pVM, VM_FF_CSAM_PENDING_ACTION);
     return VINF_SUCCESS;
 }

trunk/src/VBox/VMM/PATM/CSAMInternal.h

@@ -40 +40 @@
 /** Scanned and approved by CSAM (tm). */
 /** NOTE: Must be identical to the one defined in PGMInternal.h!! */
-#define PGM_PTFLAGS_CSAM_VALIDATED  BIT64(11)
+#define PGM_PTFLAGS_CSAM_VALIDATED              BIT64(11)
 #endif
 
 /** @} */
 
-#define CSAM_SSM_VERSION                       13
-
-#define CSAM_PGDIRBMP_CHUNKS                   1024
-
-#define CSAM_PAGE_BITMAP_SIZE                  (PAGE_SIZE/(sizeof(uint8_t)*8))
+#define CSAM_SSM_VERSION                        14
+
+#define CSAM_PGDIRBMP_CHUNKS                    1024
+
+#define CSAM_PAGE_BITMAP_SIZE                   (PAGE_SIZE/(sizeof(uint8_t)*8))
 
 /* Maximum nr of dirty page that are cached. */
-#define CSAM_MAX_DIRTY_PAGES                   32
+#define CSAM_MAX_DIRTY_PAGES                    32
 
 /* Maximum number of cached addresses of dangerous instructions that have been scanned before. */
-#define CSAM_MAX_DANGR_INSTR                   16 /* power of two! */
-#define CSAM_MAX_DANGR_INSTR_MASK              (CSAM_MAX_DANGR_INSTR-1)
-
-
-#define CSAM_MAX_CALLEXIT_RET                  16
+#define CSAM_MAX_DANGR_INSTR                    16 /* power of two! */
+#define CSAM_MAX_DANGR_INSTR_MASK               (CSAM_MAX_DANGR_INSTR-1)
+
+/* Maximum number of possible dangerous code pages that we'll flush after a world switch */
+#define CSAM_MAX_CODE_PAGES_FLUSH               32
+
+#define CSAM_MAX_CALLEXIT_RET                   16
 
 /* copy from PATMInternal.h */
-#define SIZEOF_NEARJUMP32                  5 //opcode byte + 4 byte relative offset
+#define SIZEOF_NEARJUMP32                       5 //opcode byte + 4 byte relative offset
 
 typedef struct
@@ -174 +176 @@
     RTGCPTR             pvDirtyBasePage[CSAM_MAX_DIRTY_PAGES];
     RTGCPTR             pvDirtyFaultPage[CSAM_MAX_DIRTY_PAGES];
+
+    /* To keep track of possible code pages */
+    uint32_t            cPossibleCodePages;
+    RTGCPTR             pvPossibleCodePage[CSAM_MAX_CODE_PAGES_FLUSH];
 
     /* Set when scanning has started. */

trunk/src/VBox/VMM/PATM/VMMAll/CSAMAll.cpp

@@ -175 +175 @@
  * @returns false if the page was already scanned.
  * @param   pVM         The VM to operate on.
- * @param   GCPtr       GC pointer of page table entry
+ * @param   GCPtr       GC pointer of page
  */
 CSAMDECL(bool) CSAMDoesPageNeedScanning(PVM pVM, RTGCPTR GCPtr)
@@ -189 +189 @@
 }
 
+
+/**
+ * Remember a possible code page for later inspection
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ * @param   GCPtr       GC pointer of page
+ */
+CSAMDECL(void) CSAMMarkPossibleCodePage(PVM pVM, RTGCPTR GCPtr)
+{
+    if (pVM->csam.s.cPossibleCodePages < RT_ELEMENTS(pVM->csam.s.pvPossibleCodePage))
+    {
+        pVM->csam.s.pvPossibleCodePage[pVM->csam.s.cPossibleCodePages++] = GCPtr;
+    }
+    return;
+}
+
+
 /**
  * Turn on code scanning

trunk/src/VBox/VMM/PATM/VMMGC/CSAMGC.cpp

@@ -114 +114 @@
     }
 
-    VM_FF_SET(pVM, VM_FF_CSAM_FLUSH_DIRTY_PAGE);
+    VM_FF_SET(pVM, VM_FF_CSAM_PENDING_ACTION);
 
     /* Note that pvFault might be a different address in case of aliases. So use pvRange + offset instead!. */