Changeset 73263 in vbox for trunk/src

Timestamp:

Jul 20, 2018 11:20:08 AM (7 years ago)

Author:

vboxsync

Message:

PGM,HM: Prepping for moving PGMR3ModeChange into ring-0... bugref:9044

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/HMAll.cpp (modified) (1 diff)
• VMMR3/HM.cpp (modified) (1 diff)
• VMMR3/PGM.cpp (modified) (11 diffs)

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

@@ -542 +542 @@
 }
 
+
+/**
+ * Notification callback which is called whenever there is a chance that a CR3
+ * value might have changed.
+ *
+ * This is called by PGM.
+ *
+ * @param   pVCpu          The cross context virtual CPU structure.
+ * @param   enmShadowMode  New shadow paging mode.
+ * @param   enmGuestMode   New guest paging mode.
+ */
+VMM_INT_DECL(void) HMPagingModeChanged(PVMCPU pVCpu, PGMMODE enmShadowMode, PGMMODE enmGuestMode)
+{
+#ifdef IN_RING3
+    /* Ignore page mode changes during state loading. */
+    if (VMR3GetState(pVCpu->pVMR3) == VMSTATE_LOADING)
+        return;
+#endif
+
+    pVCpu->hm.s.enmShadowMode = enmShadowMode;
+
+    /*
+     * If the guest left protected mode VMX execution, we'll have to be
+     * extra careful if/when the guest switches back to protected mode.
+     */
+    if (enmGuestMode == PGMMODE_REAL)
+        pVCpu->hm.s.vmx.fWasInRealMode = true;
+
+    Log4(("HMR3PagingModeChanged: Guest paging mode '%s', shadow paging mode '%s'\n", PGMGetModeName(enmGuestMode),
+          PGMGetModeName(enmShadowMode)));
+}
+

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -1919 +1919 @@
 
 /**
- * Notification callback which is called whenever there is a chance that a CR3
- * value might have changed.
- *
- * This is called by PGM.
- *
- * @param   pVM            The cross context VM structure.
- * @param   pVCpu          The cross context virtual CPU structure.
- * @param   enmShadowMode  New shadow paging mode.
- * @param   enmGuestMode   New guest paging mode.
- */
-VMMR3_INT_DECL(void) HMR3PagingModeChanged(PVM pVM, PVMCPU pVCpu, PGMMODE enmShadowMode, PGMMODE enmGuestMode)
-{
-    RT_NOREF_PV(pVM);
-
-    /* Ignore page mode changes during state loading. */
-    if (VMR3GetState(pVCpu->pVMR3) == VMSTATE_LOADING)
-        return;
-
-    pVCpu->hm.s.enmShadowMode = enmShadowMode;
-
-    /*
-     * If the guest left protected mode VMX execution, we'll have to be
-     * extra careful if/when the guest switches back to protected mode.
-     */
-    if (enmGuestMode == PGMMODE_REAL)
-        pVCpu->hm.s.vmx.fWasInRealMode = true;
-
-    Log4(("HMR3PagingModeChanged: Guest paging mode '%s', shadow paging mode '%s'\n", PGMGetModeName(enmGuestMode),
-          PGMGetModeName(enmShadowMode)));
-}
-
-
-/**
  * Terminates the HM.
  *

trunk/src/VBox/VMM/VMMR3/PGM.cpp

@@ -681 +681 @@
 static FNVMATSTATE        pgmR3ResetNoMorePhysWritesFlag;
 #endif
-static PGMMODE            pgmR3CalcShadowMode(PVM pVM, PGMMODE enmGuestMode, SUPPAGINGMODE enmHostMode, PGMMODE enmShadowMode, VMMSWITCHER *penmSwitcher);
 
 #ifdef VBOX_WITH_DEBUGGER
@@ -3268 +3267 @@
  *                          VMMSWITCHER_INVALID means no change.
  */
-static PGMMODE pgmR3CalcShadowMode(PVM pVM, PGMMODE enmGuestMode, SUPPAGINGMODE enmHostMode, PGMMODE enmShadowMode, VMMSWITCHER *penmSwitcher)
+static PGMMODE pgmCalcShadowMode(PVM pVM, PGMMODE enmGuestMode, SUPPAGINGMODE enmHostMode, PGMMODE enmShadowMode,
+                                 VMMSWITCHER *penmSwitcher)
 {
     VMMSWITCHER enmSwitcher = VMMSWITCHER_INVALID;
@@ -3301 +3301 @@
                     enmShadowMode = PGMMODE_PAE;
                     enmSwitcher = VMMSWITCHER_PAE_TO_PAE;
-#ifdef DEBUG_bird
-                    if (RTEnvExist("VBOX_32BIT"))
-                    {
-                        enmShadowMode = PGMMODE_32_BIT;
-                        enmSwitcher = VMMSWITCHER_PAE_TO_32;
-                    }
-#endif
                     break;
 
@@ -3316 +3309 @@
                     enmShadowMode = PGMMODE_PAE;
                     enmSwitcher = VMMSWITCHER_AMD64_TO_PAE;
-#ifdef DEBUG_bird
-                    if (RTEnvExist("VBOX_32BIT"))
-                    {
-                        enmShadowMode = PGMMODE_32_BIT;
-                        enmSwitcher = VMMSWITCHER_AMD64_TO_32;
-                    }
-#endif
                     break;
 
-                default: AssertMsgFailed(("enmHostMode=%d\n", enmHostMode)); break;
+                default:
+                    AssertLogRelMsgFailedReturnStmt(("enmHostMode=%d\n", enmHostMode),
+                                                    *penmSwitcher = VMMSWITCHER_INVALID, PGMMODE_INVALID);
             }
             break;
@@ -3344 +3332 @@
                     enmShadowMode = PGMMODE_PAE;
                     enmSwitcher = VMMSWITCHER_PAE_TO_PAE;
-#ifdef DEBUG_bird
-                    if (RTEnvExist("VBOX_32BIT"))
-                    {
-                        enmShadowMode = PGMMODE_32_BIT;
-                        enmSwitcher = VMMSWITCHER_PAE_TO_32;
-                    }
-#endif
                     break;
 
@@ -3359 +3340 @@
                     enmShadowMode = PGMMODE_PAE;
                     enmSwitcher = VMMSWITCHER_AMD64_TO_PAE;
-#ifdef DEBUG_bird
-                    if (RTEnvExist("VBOX_32BIT"))
-                    {
-                        enmShadowMode = PGMMODE_32_BIT;
-                        enmSwitcher = VMMSWITCHER_AMD64_TO_32;
-                    }
-#endif
                     break;
 
-                default: AssertMsgFailed(("enmHostMode=%d\n", enmHostMode)); break;
+                default:
+                    AssertLogRelMsgFailedReturnStmt(("enmHostMode=%d\n", enmHostMode),
+                                                    *penmSwitcher = VMMSWITCHER_INVALID, PGMMODE_INVALID);
             }
             break;
@@ -3398 +3374 @@
                     break;
 
-                default: AssertMsgFailed(("enmHostMode=%d\n", enmHostMode)); break;
+                default:
+                    AssertLogRelMsgFailedReturnStmt(("enmHostMode=%d\n", enmHostMode),
+                                                    *penmSwitcher = VMMSWITCHER_INVALID, PGMMODE_INVALID);
             }
             break;
@@ -3428 +3406 @@
                     break;
 
-                default: AssertMsgFailed(("enmHostMode=%d\n", enmHostMode)); break;
+                default:
+                    AssertLogRelMsgFailedReturnStmt(("enmHostMode=%d\n", enmHostMode),
+                                                    *penmSwitcher = VMMSWITCHER_INVALID, PGMMODE_INVALID);
             }
             break;
 
-
         default:
-            AssertLogRelMsgFailed(("enmGuestMode=%d\n", enmGuestMode));
-            *penmSwitcher = VMMSWITCHER_INVALID;
-            return PGMMODE_INVALID;
+            AssertLogRelMsgFailedReturnStmt(("enmGuestMode=%d\n", enmGuestMode),
+                                            *penmSwitcher = VMMSWITCHER_INVALID, PGMMODE_INVALID);
     }
 
@@ -3486 +3464 @@
 #endif
                         default:
-                            AssertLogRelFailedReturn(PGMMODE_INVALID);
+                            AssertLogRelMsgFailedReturnStmt(("enmHostMode=%d\n", pVM->pgm.s.enmHostMode),
+                                                            *penmSwitcher = VMMSWITCHER_INVALID, PGMMODE_INVALID);
                     }
             }
@@ -3519 +3498 @@
     VMMSWITCHER enmSwitcher   = VMMSWITCHER_INVALID;
     PGMMODE     enmShadowMode = PGMMODE_INVALID;
-    enmShadowMode = pgmR3CalcShadowMode(pVM, enmGuestMode, pVM->pgm.s.enmHostMode, pVCpu->pgm.s.enmShadowMode, &enmSwitcher);
-
-#ifdef VBOX_WITH_RAW_MODE
+    enmShadowMode = pgmCalcShadowMode(pVM, enmGuestMode, pVM->pgm.s.enmHostMode, pVCpu->pgm.s.enmShadowMode, &enmSwitcher);
+
+#ifdef VBOX_WITH_RAW_MODE_NOT_R0
     if (   enmSwitcher != VMMSWITCHER_INVALID
         && VM_IS_RAW_MODE_ENABLED(pVM))
@@ -3674 +3653 @@
      * Notify HM.
      */
-    HMR3PagingModeChanged(pVM, pVCpu, pVCpu->pgm.s.enmShadowMode, pVCpu->pgm.s.enmGuestMode);
+    HMPagingModeChanged(pVCpu, pVCpu->pgm.s.enmShadowMode, pVCpu->pgm.s.enmGuestMode);
     return rc;
 }