Changeset 72085 in vbox for trunk/src/VBox

Timestamp:

May 3, 2018 7:31:33 AM (7 years ago)

Author:

vboxsync

Message:

VMM/HMSVMR0: Nested hw.virt: VM-Exit transitions can happen with VINF_PGM_CHANGE_MODE as well as VINF_SVM_VMEXIT when done from ring-0.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (4 diffs)

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

@@ -4118 +4118 @@
 {
     HMSVM_ASSERT_PREEMPT_SAFE();
-
-    if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
-    {
+    HMSVM_ASSERT_IN_NESTED_GUEST(pCtx);
+
 #ifdef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
-        Log2(("hmR0SvmPreRunGuest: Rescheduling to IEM due to nested-hwvirt or forced IEM exec -> VINF_EM_RESCHEDULE_REM\n"));
-        return VINF_EM_RESCHEDULE_REM;
+    Log2(("hmR0SvmPreRunGuest: Rescheduling to IEM due to nested-hwvirt or forced IEM exec -> VINF_EM_RESCHEDULE_REM\n"));
+    return VINF_EM_RESCHEDULE_REM;
 #endif
-    }
-    else
-    {
-        /** @todo Remove this assertion after its sufficiently established that this
-         *        never happens. */
-        AssertFailedReturn(VERR_INVALID_STATE);
-    }
 
     /* Check force flag actions that might require us to go back to ring-3. */
@@ -4143 +4135 @@
     {
         VBOXSTRICTRC rcStrict = hmR0SvmEvaluatePendingEventNested(pVCpu, pCtx);
-        if (rcStrict != VINF_SUCCESS)
+        if (    rcStrict != VINF_SUCCESS
+            || !CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
             return VBOXSTRICTRC_VAL(rcStrict);
-        if (!CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
-            return VINF_SVM_VMEXIT;
-    }
+    }
+
+    HMSVM_ASSERT_IN_NESTED_GUEST(pCtx);
 
     /*
@@ -4831 +4824 @@
         STAM_PROFILE_ADV_START(&pVCpu->hm.s.StatEntry, x);
         rc = hmR0SvmPreRunGuestNested(pVM, pVCpu, pCtx, &SvmTransient);
-        if (   rc != VINF_SUCCESS
+        if (    rc != VINF_SUCCESS
             || !CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
         {
@@ -4871 +4864 @@
         rc = hmR0SvmHandleExitNested(pVCpu, pCtx, &SvmTransient);
         STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatExit2, x);
-        if (rc != VINF_SUCCESS)
+        if (    rc != VINF_SUCCESS
+            || !CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
             break;
         if (++(*pcLoops) >= pVM->hm.s.cMaxResumeLoops)