Changeset 73280 in vbox for trunk

Timestamp:

Jul 20, 2018 7:50:17 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

123887

Message:

HM,PGM: Clarify VINF_PGM_CHANGE_MODE return and update assertions. bugref:9044.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAll.cpp (modified) (3 diffs)
• VMMR0/HMSVMR0.cpp (modified) (2 diffs)
• VMMR0/HMVMXR0.cpp (modified) (4 diffs)

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

@@ -2549 +2549 @@
     PGM_A20_APPLY_TO_VAR(pVCpu, GCPhysCR3);
 
-    if (pVCpu->pgm.s.GCPhysCR3 != GCPhysCR3)
-    {
-        RTGCPHYS const GCPhysOldCR3 = pVCpu->pgm.s.GCPhysCR3;
-
+    RTGCPHYS const GCPhysOldCR3 = pVCpu->pgm.s.GCPhysCR3;
+    if (GCPhysOldCR3 != GCPhysCR3)
+    {
         uintptr_t const idxBth = pVCpu->pgm.s.idxBothModeData;
         AssertReturn(idxBth < RT_ELEMENTS(g_aPgmBothModeData), VERR_PGM_MODE_IPE);
@@ -2832 +2831 @@
  *          VM scheduling.
  * @retval  VINF_SUCCESS if the was no change, or it was successfully dealt with.
- * @retval  VINF_PGM_CHANGE_MODE if we're in RC or R0 and the mode changes.
- *          (I.e. not in R3.)
+ * @retval  VINF_PGM_CHANGE_MODE if we're in RC the mode changes.  This will
+ *          NOT be returned in ring-3 or ring-0.
  * @retval  VINF_EM_SUSPEND or VINF_EM_OFF on a fatal runtime error. (R3 only)
  *
@@ -2891 +2890 @@
     PGM_INVL_VCPU_TLBS(pVCpu);
 
-#if defined(IN_RING3) || defined(IN_RING0)
+#ifndef IN_RC
     return PGMHCChangeMode(pVCpu->CTX_SUFF(pVM), pVCpu, enmGuestMode);
 #else

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -6519 +6519 @@
     VBOXSTRICTRC rcStrict = IEMExecOne(pVCpu);
     AssertMsg(   rcStrict == VINF_SUCCESS
-              || rcStrict == VINF_PGM_CHANGE_MODE
               || rcStrict == VINF_PGM_SYNC_CR3
               || rcStrict == VINF_IEM_RAISED_XCPT,
@@ -6623 +6622 @@
     }
     else
-        Assert(rcStrict == VERR_EM_INTERPRETER || rcStrict == VINF_PGM_CHANGE_MODE || rcStrict == VINF_PGM_SYNC_CR3);
+        Assert(rcStrict == VERR_EM_INTERPRETER || rcStrict == VINF_PGM_SYNC_CR3);
     return VBOXSTRICTRC_TODO(rcStrict);
 }

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -11882 +11882 @@
  *
  * @retval VINF_SUCCESS when guest execution can continue.
- * @retval VINF_PGM_CHANGE_MODE when shadow paging mode changed, back to ring-3.
  * @retval VINF_PGM_SYNC_CR3 CR3 sync is required, back to ring-3.
  * @retval VERR_EM_INTERPRETER when something unexpected happened, fallback to
@@ -11911 +11910 @@
             AssertMsg(   rcStrict == VINF_SUCCESS
                       || rcStrict == VINF_IEM_RAISED_XCPT
-                      || rcStrict == VINF_PGM_CHANGE_MODE
                       || rcStrict == VINF_PGM_SYNC_CR3, ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
 
@@ -12038 +12036 @@
         case VMX_EXIT_QUAL_CRX_ACCESS_LMSW:        /* LMSW (Load Machine-Status Word into CR0) */
         {
+            /* Note! LMSW cannot clear CR0.PE, so no fRealOnV86Active kludge needed here. */
             rcStrict = IEMExecDecodedLmsw(pVCpu, pVmxTransient->cbInstr,
                                           VMX_EXIT_QUAL_CRX_LMSW_DATA(uExitQualification));
             AssertMsg(   rcStrict == VINF_SUCCESS
                       || rcStrict == VINF_IEM_RAISED_XCPT
-                      || rcStrict == VINF_PGM_CHANGE_MODE,
-                      ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
+                      , ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
 
             ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_GUEST_RIP | HM_CHANGED_GUEST_RFLAGS | HM_CHANGED_GUEST_CR0);
@@ -13187 +13185 @@
               || rc == VINF_EM_HALT
               || rc == VINF_EM_RESCHEDULE
-              || rc == VINF_PGM_CHANGE_MODE
               , ("#GP Unexpected rc=%Rrc\n", rc));
     return rc;