Changeset 11370 in vbox for trunk/src

Timestamp:

Aug 12, 2008 5:50:18 PM (16 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• HWACCMAll.cpp (modified) (2 diffs)
• PGMAllPool.cpp (modified) (2 diffs)

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.
- * @param   pCpu        The disassembly info for the faulting insturction.
+ * @param   pCpu        The disassembly info for the faulting instruction.
  * @param   pvFault     The fault address.
  *
  * @remark  The REP prefix check is left to the caller because of STOSD/W.
  */
-DECLINLINE(bool) pgmPoolMonitorIsReused(PPGMPOOLPAGE pPage, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu, RTGCPTR pvFault)
-{
+DECLINLINE(bool) pgmPoolMonitorIsReused(PVM pVM, PPGMPOOLPAGE pPage, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu, RTGCPTR pvFault)
+{
+#ifndef IN_GC
+    if (   HWACCMHasPendingIrq(pVM)
+        && (pRegFrame->rsp - pvFault) < 32)
+    {
+        /* Fault caused by stack writes while trying to inject an interrupt event. */
+        Log(("pgmPoolMonitorIsReused: reused %VGv for interrupt stack (rsp=%VGv).\n", pvFault, pRegFrame->rsp));
+        return true;
+    }
+#else
+    NOREF(pVM);
+#endif
+
     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)
-        &&  !(fReused = pgmPoolMonitorIsReused(pPage, pRegFrame, &Cpu, pvFault))
+        &&  !(fReused = pgmPoolMonitorIsReused(pVM, pPage, pRegFrame, &Cpu, pvFault))
         &&  !pgmPoolMonitorIsForking(pPool, &Cpu, GCPhysFault & PAGE_OFFSET_MASK))
     {