Changeset 11370

Timestamp:

08/12/08 19:50:18 (3 months ago)

Author:

vboxsync

Message:

Deal with flushing of pgm pool pages when an injected event triggers faults on the stack

Files:

• trunk/include/VBox/hwaccm.h (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/HWACCMAll.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (2 diffs)

trunk/include/VBox/hwaccm.h

@@ -75 +75 @@
-HWACCMDECL(int) HWACCMInvalidatePage(PVM pVM, RTGCPTR GCVirt);
-
+/**
+ * Checks if an interrupt event is currently pending. 
+ *
+ * @returns Interrupt event pending state.
+ * @param   pVM         The VM to operate on.
+ */
+HWACCMDECL(bool) HWACCMHasPendingIrq(PVM pVM);
+
-#ifndef IN_GC
-/**

trunk/src/VBox/VMM/VMMAll/HWACCMAll.cpp

@@ -73 +73 @@
-    if (pVM->hwaccm.s.svm.fSupported)
-    {
+        Log(("HWACCMFlushTLB\n"));
-        pVM->hwaccm.s.svm.fForceTLBFlush = true;
-        STAM_COUNTER_INC(&pVM->hwaccm.s.StatFlushTLBManual);
@@ -130 +131 @@
-    return VINF_SUCCESS;
-}
+
+/**
+ * Checks if an interrupt event is currently pending. 
+ *
+ * @returns Interrupt event pending state.
+ * @param   pVM         The VM to operate on.
+ */
+HWACCMDECL(bool) HWACCMHasPendingIrq(PVM pVM)
+{
+    return pVM->hwaccm.s.Event.fPending;
+}
+

trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp

@@ -692 +692 @@
- * @returns true if we consider the page as being reused for a different purpose.
- * @returns false if we consider it to still be a paging page.
+ * @param   pVM         VM Handle.
- * @param   pPage       The page in question.
- * @param   pRegFrame   Trap register frame.
-ur
+ru
- * @param   pvFault     The fault address.
- *
- * @remark  The REP prefix check is left to the caller because of STOSD/W.
- */
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    switch (pCpu->pCurInstr->opcode)
-    {
@@ -958 +971 @@
-    if (    (   pPage->cModifications < 48   /** @todo #define */ /** @todo need to check that it's not mapping EIP. */ /** @todo adjust this! */
-             || pPage->fCR3Mix)
-
+VM, p
-        &&  !pgmPoolMonitorIsForking(pPool, &Cpu, GCPhysFault & PAGE_OFFSET_MASK))
-    {