Changeset 20869 in vbox

Timestamp:

Jun 24, 2009 12:27:17 AM (15 years ago)

Author:

vboxsync

Message:

VMMR3RawRunGC: cause guru meditation if cr3 mismatches. EMR3FatalError: change to guru meditation or we risk resuming execution and blowing up.

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• src/VBox/VMM/DBGFSym.cpp (modified) (1 diff)
• src/VBox/VMM/EM.cpp (modified) (4 diffs)
• src/VBox/VMM/VMM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/REMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMGuruMeditation.cpp (modified) (1 diff)

trunk/include/VBox/err.h

@@ -815 +815 @@
 /** Reason for leaving R0: Hit a ring-0 assertion on EMT. */
 #define VERR_VMM_RING0_ASSERTION            (-2701)
+/** The hyper CR3 differs between PGM and CPUM. */
+#define VERR_VMM_HYPER_CR3_MISMATCH         (-2702)
 /** @} */
 

trunk/src/VBox/VMM/DBGFSym.cpp

@@ -25 +25 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_DBGF
-#if defined(RT_OS_WINDOWS) && 0 //defined(DEBUG_bird) // enabled this is you want to debug win32 guests, the hypervisor of EFI.
+#if defined(RT_OS_WINDOWS) && 1 //defined(DEBUG_bird) // enabled this is you want to debug win32 guests, the hypervisor of EFI.
 # include <Windows.h>
 # define _IMAGEHLP64

trunk/src/VBox/VMM/EM.cpp

@@ -627 +627 @@
 VMMR3DECL(void) EMR3FatalError(PVMCPU pVCpu, int rc)
 {
+    pVCpu->em.s.enmState = EMSTATE_GURU_MEDITATION;
     longjmp(pVCpu->em.s.u.FatalLongJump, rc);
     AssertReleaseMsgFailed(("longjmp returned!\n"));
@@ -825 +826 @@
                         case VERR_TRPM_DONT_PANIC:
                         case VERR_VMM_RING0_ASSERTION:
+                        case VERR_VMM_HYPER_CR3_MISMATCH:
                             return rcLast;
                     }
@@ -841 +843 @@
                 case VERR_TRPM_DONT_PANIC:
                 case VERR_VMM_RING0_ASSERTION:
+                case VERR_VMM_HYPER_CR3_MISMATCH:
                 case VERR_INTERNAL_ERROR:
                 case VERR_INTERNAL_ERROR_2:
@@ -2570 +2573 @@
         case VERR_TRPM_PANIC:
         case VERR_VMM_RING0_ASSERTION:
+        case VERR_VMM_HYPER_CR3_MISMATCH:
             break;
 

trunk/src/VBox/VMM/VMM.cpp

@@ -1136 +1136 @@
     for (;;)
     {
-        Assert(CPUMGetHyperCR3(pVCpu) && CPUMGetHyperCR3(pVCpu) == PGMGetHyperCR3(pVCpu));
 #ifdef VBOX_STRICT
+        if (RT_UNLIKELY(!CPUMGetHyperCR3(pVCpu) || CPUMGetHyperCR3(pVCpu) != PGMGetHyperCR3(pVCpu)))
+            EMR3FatalError(pVCpu, VERR_VMM_HYPER_CR3_MISMATCH);
         PGMMapCheck(pVM);
 #endif

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

@@ -145 +145 @@
 
     VM_FF_SET(pVM, VM_FF_REM_HANDLER_NOTIFY);
+
+#if 0 /* Enable this to trigger odd flush bugs. */
+    remFlushHandlerNotifications(pVM);
+#endif
 }
 

trunk/src/VBox/VMM/VMMGuruMeditation.cpp

@@ -270 +270 @@
         case VINF_EM_DBG_HYPER_BREAKPOINT:
         case VINF_EM_DBG_HYPER_STEPPED:
+        case VERR_VMM_HYPER_CR3_MISMATCH:
         {
             /*