Changeset 48394 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Sep 9, 2013 3:54:51 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Address possible deadlock situation with the PGM lock. Reenabled thread-context hooks again.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMVMXR0.cpp (modified) (4 diffs)
• VMMR0.cpp (modified) (1 diff)

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

@@ -6087 +6087 @@
  *
  * @returns VBox status code.
- * @param   pVM         Pointer to the VM.
- * @param   pVCpu       Pointer to the VMCPU.
- * @param   pMixedCtx   Pointer to the guest-CPU context. The data may be
- *                      out-of-sync. Make sure to update the required fields
- *                      before using them.
+ * @param   pVM                 Pointer to the VM.
+ * @param   pVCpu               Pointer to the VMCPU.
+ * @param   pMixedCtx           Pointer to the guest-CPU context. The data may
+ *                              be out-of-sync. Make sure to update the required
+ *                              fields before using them.
+ * @param   fSaveGuestState     Whether to save the guest state or not.
  *
  * @remarks No-long-jmp zone!!!
  */
-static int hmR0VmxLeave(PVM pVM, PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxLeave(PVM pVM, PVMCPU pVCpu, PCPUMCTX pMixedCtx, bool fSaveGuestState)
 {
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
@@ -6104 +6105 @@
 
     /* Save the guest state if necessary. */
-    if (pVCpu->hm.s.vmx.fUpdatedGuestState != HMVMX_UPDATED_GUEST_ALL)
+    if (   fSaveGuestState
+        && pVCpu->hm.s.vmx.fUpdatedGuestState != HMVMX_UPDATED_GUEST_ALL)
     {
         int rc = hmR0VmxSaveGuestState(pVCpu, pMixedCtx);
@@ -6194 +6196 @@
     if (!pVCpu->hm.s.fLeaveDone)
     {
-        int rc2 = hmR0VmxLeave(pVM, pVCpu, pMixedCtx);
+        int rc2 = hmR0VmxLeave(pVM, pVCpu, pMixedCtx, true /* fSaveGuestState */);
         AssertRCReturn(rc2, rc2);
         pVCpu->hm.s.fLeaveDone = true;
@@ -7011 +7013 @@
             Log4Func(("Preempting: HostCpuId=%u\n", RTMpCpuId()));
 
-            /* Save the guest-state, restore host-state (FPU, debug etc.). */
+            /*
+             * Restore host-state (FPU, debug etc.)
+             */
             if (!pVCpu->hm.s.fLeaveDone)
             {
-                hmR0VmxLeave(pVM, pVCpu, pMixedCtx);
+                /* Do -not- save guest-state here as we might already be in the middle of saving it (esp. bad if we are
+                   holding the PGM lock while saving the guest state (see hmR0VmxSaveGuestControlRegs()). */
+                hmR0VmxLeave(pVM, pVCpu, pMixedCtx, false /* fSaveGuestState */);
                 pVCpu->hm.s.fLeaveDone = true;
             }

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

@@ -450 +450 @@
     VMCPU_ASSERT_EMT(pVCpu);
     Assert(pVCpu->vmm.s.hR0ThreadCtx == NIL_RTTHREADCTX);
-#if 0  /* Not stable. */
+#if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS)
     int rc = RTThreadCtxHooksCreate(&pVCpu->vmm.s.hR0ThreadCtx);
     if (   RT_FAILURE(rc)