Changeset 48194 in vbox for trunk/src/VBox

Timestamp:

Aug 30, 2013 2:33:38 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Even without preemption hooks, we can now load the guest-state before disabling interrupts.
Better handling of triple faults conditions (don't leave with interrupts disabled).

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (5 diffs)

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

@@ -7209 +7209 @@
 DECLINLINE(void) hmR0VmxLoadGuestStateOptimal(PVM pVM, PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
+    HMVMX_ASSERT_PREEMPT_SAFE();
+
     Log5(("LoadFlags=%#RX32\n", pVCpu->hm.s.fContextUseFlags));
 #ifdef HMVMX_SYNC_FULL_GUEST_STATE
@@ -7303 +7305 @@
 #endif /* !IEM_VERIFICATION_MODE_FULL */
 
-    /*
-     * When thread-context hooks are used, load the required guest-state bits here
-     * before we go ahead and disable interrupts. We can handle getting preempted
-     * while loading the guest state.
-     */
-    if (VMMR0ThreadCtxHooksAreRegistered(pVCpu))
-        hmR0VmxLoadGuestStateOptimal(pVM, pVCpu, pMixedCtx);
+    /* Load the guest state bits, we can handle longjmps/getting preempted here. */
+    hmR0VmxLoadGuestStateOptimal(pVM, pVCpu, pMixedCtx);
 
     /*
@@ -7345 +7342 @@
     }
 
-    /* Indicate the start of guest execution. No more longjmps or returns to ring-3 from this point!!! */
-    VMCPU_ASSERT_STATE(pVCpu, VMCPUSTATE_STARTED_HM);
-    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_EXEC);
-
     /*
+     * No more longjmps or returns to ring-3 (that can continue guest execution) from this point!!!
+     *
      * Event injection might result in triple-faulting the VM (real-on-v86 case), which is why it's
      * done here and not in hmR0VmxPreRunGuestCommitted() which doesn't expect failures.
      */
     rc = hmR0VmxInjectPendingEvent(pVCpu, pMixedCtx);
+    if (RT_UNLIKELY(rc != VINF_SUCCESS))
+        ASMSetFlags(pVmxTransient->uEflags);
     return rc;
 }
@@ -7379 +7376 @@
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
+    VMCPU_ASSERT_STATE(pVCpu, VMCPUSTATE_STARTED_HM);
+    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_EXEC);            /* Indicate the start of guest execution. */
+
     /*
      * Load the host state bits as we may've been preempted (only happens when
@@ -7392 +7392 @@
 
     /*
-     * When thread-context hooks are -not- used we need to load the required
-     * guest state bits here i.e. when we can no longer be rescheduled.
+     * If we are injecting events to a real-on-v86 mode guest, we may have to update
+     * RIP and some other registers, i.e. hmR0VmxInjectPendingEvent()->hmR0VmxInjectEventVmcs().
+     * Reload only the necessary state, the assertion will catch if other parts of the code
+     * change.
      */
-    if (!VMMR0ThreadCtxHooksAreRegistered(pVCpu))
-        hmR0VmxLoadGuestStateOptimal(pVM, pVCpu, pMixedCtx);
-    else
-    {
-        /*
-         * If we are injecting events to a real-on-v86 mode guest, we may have to update
-         * RIP and some other registers, i.e. hmR0VmxInjectPendingEvent()->hmR0VmxInjectEventVmcs().
-         * Reload only the necessary state, the assertion will catch if other parts of the code
-         * change.
-         */
-        if (pVCpu->hm.s.vmx.RealMode.fRealOnV86Active)
-        {
-            hmR0VmxLoadGuestRipRspRflags(pVCpu, pMixedCtx);
-            hmR0VmxLoadGuestSegmentRegs(pVCpu, pMixedCtx);
-        }
+    if (pVCpu->hm.s.vmx.RealMode.fRealOnV86Active)
+    {
+        hmR0VmxLoadGuestRipRspRflags(pVCpu, pMixedCtx);
+        hmR0VmxLoadGuestSegmentRegs(pVCpu, pMixedCtx);
     }