Changeset 48227 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 2, 2013 11:54:23 AM (12 years ago)

Author:

vboxsync

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

88620

Message:

VMM: Ensure longjmps after hmR0[Vmx|Svm]LeaveSession() don't happen.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMSVMR0.cpp (modified) (5 diffs)
• VMMR0/HMVMXR0.cpp (modified) (6 diffs)
• VMMRZ/VMMRZ.cpp (modified) (1 diff)

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

@@ -301 +301 @@
  * @param   pvCpuPage       Pointer to the global CPU page.
  * @param   HCPhysCpuPage   Physical address of the global CPU page.
+ * @param   fEnabledByHost  Whether the host OS has already initialized AMD-V.
  * @param   pvArg           Unused on AMD-V.
  */
@@ -311 +312 @@
     AssertReturn(pvCpuPage, VERR_INVALID_PARAMETER);
     NOREF(pvArg);
+    NOREF(fEnabledByHost);
 
     /*
@@ -1587 +1589 @@
 
     LogFlowFunc(("pVM=%p pVCpu=%p\n", pVM, pVCpu));
+    Assert(pVCpu->hm.s.fContextUseFlags & (HM_CHANGED_HOST_CONTEXT | HM_CHANGED_HOST_GUEST_SHARED_STATE));
 
     pVCpu->hm.s.fLeaveDone = false;
@@ -2091 +2094 @@
     }
 
-    /* On our way back from ring-3 the following needs to be done. */
-    /** @todo This can change with preemption hooks. */
-    if (rcExit == VINF_EM_RAW_INTERRUPT)
-        pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_HOST_CONTEXT;
-    else
-        pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_HOST_CONTEXT | HM_CHANGED_ALL_GUEST;
+    /* On our way back from ring-3 reload the guest state if there is a possibility of it being changed. */
+    if (rcExit != VINF_EM_RAW_INTERRUPT)
+        pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_ALL_GUEST;
 
     STAM_COUNTER_INC(&pVCpu->hm.s.StatSwitchExitToR3);
+
+    /* We do -not- want any longjmp notifications after this! We must return to ring-3 ASAP. */
+    VMMRZCallRing3RemoveNotification(pVCpu);
     VMMRZCallRing3Enable(pVCpu);
 }
@@ -3066 +3069 @@
 
     hmR0SvmExitToRing3(pVM, pVCpu, pCtx, rc);
-    VMMRZCallRing3RemoveNotification(pVCpu);
+    Assert(!VMMRZCallRing3IsNotificationSet(pVCpu));
     return rc;
 }

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

@@ -1018 +1018 @@
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
+    /* Enable VT-x if it's not already enabled by the host. */
     if (!fEnabledByHost)
     {
@@ -6177 +6178 @@
 {
     HM_DISABLE_PREEMPT_IF_NEEDED();
+    HMVMX_ASSERT_CPU_SAFE();
     Assert(!VMMRZCallRing3IsEnabled(pVCpu));
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
@@ -6299 +6301 @@
      *        accessing APIC page in prot mode. */
 
-    /* On our way back from ring-3 the following needs to be done. */
-    if (rcExit == VINF_EM_RAW_INTERRUPT)
-        pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_HOST_CONTEXT;
-    else
-        pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_HOST_CONTEXT | HM_CHANGED_ALL_GUEST;
+    /* On our way back from ring-3 reload the guest state if there is a possibility of it being changed. */
+    if (rcExit != VINF_EM_RAW_INTERRUPT)
+        pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_ALL_GUEST;
 
     STAM_COUNTER_INC(&pVCpu->hm.s.StatSwitchExitToR3);
+
+    /* We do -not- want any longjmp notifications after this! We must return to ring-3 ASAP. */
+    VMMRZCallRing3RemoveNotification(pVCpu);
     VMMRZCallRing3Enable(pVCpu);
 }
@@ -6902 +6905 @@
 
     LogFlowFunc(("pVM=%p pVCpu=%p\n", pVM, pVCpu));
+    Assert(pVCpu->hm.s.fContextUseFlags & (HM_CHANGED_HOST_CONTEXT | HM_CHANGED_HOST_GUEST_SHARED_STATE));
 
 #ifdef VBOX_STRICT
@@ -7745 +7749 @@
 
     hmR0VmxExitToRing3(pVM, pVCpu, pCtx, rc);
-    VMMRZCallRing3RemoveNotification(pVCpu);
+    Assert(!VMMRZCallRing3IsNotificationSet(pVCpu));
     return rc;
 }
@@ -8588 +8592 @@
                         Assert(pVCpu->CTX_SUFF(pVM)->hm.s.vmx.pRealModeTSS);
                         Assert(PDMVmmDevHeapIsEnabled(pVCpu->CTX_SUFF(pVM)));
+                        Assert(CPUMIsGuestInRealModeEx(pMixedCtx));
+
                         rc  = hmR0VmxReadExitInstrLenVmcs(pVCpu, pVmxTransient);
                         rc |= hmR0VmxReadExitIntrErrorCodeVmcs(pVCpu, pVmxTransient);

trunk/src/VBox/VMM/VMMRZ/VMMRZ.cpp

@@ -214 +214 @@
 }
 
+
+/**
+ * Checks whether there is a ring-0 callback notification active.
+ *
+ * @param   pVCpu   Pointer to the VMCPU.
+ * @returns true if there the notification is active, false otherwise.
+ */
+VMMRZDECL(bool) VMMRZCallRing3IsNotificationSet(PVMCPU pVCpu)
+{
+    return !(pVCpu->vmm.s.pfnCallRing3CallbackR0 == NULL);
+}
+