Changeset 24764 in vbox for trunk/src/VBox

Timestamp:

Nov 18, 2009 4:30:12 PM (15 years ago)

Author:

vboxsync

Message:

Handle missing page inconsistency with guest smp (instruction emulation)

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• EMAll.cpp (modified) (2 diffs)
• PGMAll.cpp (modified) (1 diff)
• PGMAllPool.cpp (modified) (1 diff)

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

@@ -173 +173 @@
     int rc = PGMPhysSimpleReadGCPtr(pVCpu, &State.aOpcode, InstrGC, sizeof(State.aOpcode));
     if (RT_SUCCESS(rc))
+    {
         State.GCPtr = InstrGC;
+    }
     else
+    {
+        if (PAGE_ADDRESS(InstrGC) == PAGE_ADDRESS(InstrGC + sizeof(State.aOpcode) - 1))
+        {
+           if (rc == VERR_PAGE_TABLE_NOT_PRESENT)
+              HWACCMInvalidatePage(pVCpu, InstrGC);
+
+           Log(("emDisCoreOne: read failed with %d\n", rc));
+           return rc; 
+        }
         State.GCPtr = NIL_RTGCPTR;
-
+    }
     return DISCoreOneEx(InstrGC, pDis->mode, EMReadBytes, &State, pDis, pOpsize);
 }
@@ -246 +257 @@
     rc = PGMPhysSimpleReadGCPtr(pVCpu, &State.aOpcode, GCPtrInstr, sizeof(State.aOpcode));
     if (RT_SUCCESS(rc))
+    {
         State.GCPtr = GCPtrInstr;
+    }
     else
+    {
+        if (PAGE_ADDRESS(GCPtrInstr) == PAGE_ADDRESS(GCPtrInstr + sizeof(State.aOpcode) - 1))
+        {
+           if (rc == VERR_PAGE_TABLE_NOT_PRESENT)
+              HWACCMInvalidatePage(pVCpu, GCPtrInstr);
+
+           Log(("EMInterpretDisasOneEx: read failed with %d\n", rc));
+           return rc; 
+        }
         State.GCPtr = NIL_RTGCPTR;
+    }
 #endif
 

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

@@ -460 +460 @@
 # ifdef IN_RING0
     /* Note: hack alert for difficult to reproduce problem. */
-    if (    rc == VERR_PAGE_TABLE_NOT_PRESENT           /* seen with UNI & SMP */
+    if (    rc == VERR_PAGE_NOT_PRESENT                 /* SMP only ; disassembly might fail. */
+        ||  rc == VERR_PAGE_TABLE_NOT_PRESENT           /* seen with UNI & SMP */
         ||  rc == VERR_PAGE_DIRECTORY_PTR_NOT_PRESENT   /* seen with SMP */
         ||  rc == VERR_PAGE_MAP_LEVEL4_NOT_PRESENT)     /* precaution */

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

@@ -1192 +1192 @@
     PDISCPUSTATE pDis = &pVCpu->pgm.s.DisState;
     int rc = EMInterpretDisasOne(pVM, pVCpu, pRegFrame, pDis, NULL);
-    AssertReturnStmt(rc == VINF_SUCCESS, pgmUnlock(pVM), rc);
+    if (RT_UNLIKELY(rc != VINF_SUCCESS))
+    {        
+        AssertMsg(rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT, ("Unexpected rc %d\n", rc));
+        pgmUnlock(pVM);
+        return rc;
+    }
 
     Assert(pPage->enmKind != PGMPOOLKIND_FREE);