Changeset 45749 in vbox for trunk

Timestamp:

Apr 26, 2013 12:14:09 AM (12 years ago)

Author:

vboxsync

Message:

VMM: Introduced VMCPUSTATE_STARTED_HM for indicating that we're between HMR3Enter and HMR3Leave. Added HMIsInHwVirtCtx and VMMIsLongJumpArmed methods/macros.

Location:

trunk

Files:

• include/VBox/vmm/hm.h (modified) (1 diff)
• include/VBox/vmm/vm.h (modified) (1 diff)
• include/VBox/vmm/vmm.h (modified) (3 diffs)
• src/VBox/VMM/VMMAll/VMMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMR0.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/VMEmt.cpp (modified) (1 diff)

trunk/include/VBox/vmm/hm.h

@@ -88 +88 @@
  */
 #define HMCanEmulateIoBlockEx(a_pCtx)   (!CPUMIsGuestInPagedProtectedModeEx(a_pCtx))
+
+/**
+ * Checks whether we're in the special hardware virtualization context.
+ * @returns true / false.
+ * @param   a_pVCpu     The caller's cross context virtual CPU structure.
+ * @thread  EMT
+ */
+#ifdef IN_RING0
+# define HMIsInHwVirtCtx(a_pVCpu)       (VMCPU_GET_STATE(a_pVCpu) == VMCPUSTATE_STARTED_HM)
+#else
+# define HMIsInHwVirtCtx(a_pVCpu)       (false)
+#endif
+
 
 VMMDECL(bool)                   HMIsEnabledNotMacro(PVM pVM);

trunk/include/VBox/vmm/vm.h

@@ -69 +69 @@
     /** CPU started. */
     VMCPUSTATE_STARTED,
-    /** Executing guest code and can be poked. */
+    /** CPU started in HM context. */
+    VMCPUSTATE_STARTED_HM,
+    /** Executing guest code and can be poked (RC or STI bits of HM). */
     VMCPUSTATE_STARTED_EXEC,
     /** Executing guest code in the recompiler. */

trunk/include/VBox/vmm/vmm.h

@@ -230 +230 @@
 
 
+/**
+ * Checks whether we've armed the ring-0 long jump machinery.
+ *
+ * @returns @c true / @c false
+ * @param   pVCpu           The caller's cross context virtual CPU structure.
+ * @thread  EMT
+ * @sa      VMMR0IsLongJumpArmed
+ */
+#ifdef IN_RING0
+# define VMMIsLongJumpArmed(a_pVCpu)                VMMR0IsLongJumpArmed(a_pVCpu)
+#else
+# define VMMIsLongJumpArmed(a_pVCpu)                (false)
+#endif
+
+
 VMM_INT_DECL(RTRCPTR)       VMMGetStackRC(PVMCPU pVCpu);
 VMMDECL(VMCPUID)            VMMGetCpuId(PVM pVM);
@@ -238 +253 @@
 VMM_INT_DECL(uint32_t)      VMMGetSvnRev(void);
 VMM_INT_DECL(VMMSWITCHER)   VMMGetSwitcher(PVM pVM);
+VMM_INT_DECL(bool)          VMMIsInRing3Call(PVMCPU pVCpu);
 VMM_INT_DECL(void)          VMMTrashVolatileXMMRegs(void);
 
@@ -479 +495 @@
 VMMR0DECL(int)      VMMR0EntryEx(PVM pVM, VMCPUID idCpu, VMMR0OPERATION enmOperation, PSUPVMMR0REQHDR pReq, uint64_t u64Arg, PSUPDRVSESSION);
 VMMR0DECL(int)      VMMR0TermVM(PVM pVM, PGVM pGVM);
+VMMR0_INT_DECL(bool) VMMR0IsLongJumpArmed(PVMCPU pVCpu);
+
 
 #ifdef LOG_ENABLED

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

@@ -343 +343 @@
 }
 
+
+/**
+ * Checks whether we're in a ring-3 call or not.
+ *
+ * @returns true / false.
+ * @param   pVCpu               The caller's cross context VM structure.
+ * @thread  EMT
+ */
+VMM_INT_DECL(bool) VMMIsInRing3Call(PVMCPU pVCpu)
+{
+#ifdef RT_ARCH_X86
+    return pVCpu->vmm.s.CallRing3JmpBufR0.fInRing3Call;
+#else
+    return pVCpu->vmm.s.CallRing3JmpBufR0.fInRing3Call;
+#endif
+}
+

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

@@ -1491 +1491 @@
         CPUMR0SaveGuestFPU(pVM, pVCpu, pCtx);
 
-        pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_CR0;
+        pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_CR0; /** @todo r=bird: Why HM_CHANGED_GUEST_CR0?? */
         Assert(!CPUMIsGuestFPUStateActive(pVCpu));
     }

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

@@ -6487 +6487 @@
      * This is why this is done after all possible exits-to-ring-3 paths in this code.
      */
+    /** @todo r=bird: You reverse the effect of calling PDMGetInterrupt by
+     *        handing it over to TPRM like we do in REMR3StateBack using
+     *        TRPMAssertTrap and the other setters. */
     rc = hmR0VmxInjectPendingEvent(pVCpu, pMixedCtx);
     AssertRCReturn(rc, rc);
@@ -6612 +6615 @@
     TMNotifyEndOfExecution(pVCpu);                              /* Notify TM that the guest is no longer running. */
     Assert(!(ASMGetFlags() & X86_EFL_IF));
-    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED);
+    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_HM);
 
     /* Restore the effects of TPR patching if any. */

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

@@ -1544 +1544 @@
 
     TMNotifyEndOfExecution(pVCpu);
-    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED);
+    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_HM);
     STAM_PROFILE_ADV_STOP_START(&pVCpu->hm.s.StatInGC, &pVCpu->hm.s.StatExit1, x);
     ASMSetFlags(uOldEFlags);
@@ -2825 +2825 @@
 
     /* Just set the correct state here instead of trying to catch every goto above. */
-    VMCPU_CMPXCHG_STATE(pVCpu, VMCPUSTATE_STARTED, VMCPUSTATE_STARTED_EXEC);
+    VMCPU_CMPXCHG_STATE(pVCpu, VMCPUSTATE_STARTED_HM, VMCPUSTATE_STARTED_EXEC);
 
 #ifdef VBOX_WITH_VMMR0_DISABLE_PREEMPTION

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

@@ -3381 +3381 @@
 
     TMNotifyEndOfExecution(pVCpu);
-    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED);
+    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_HM);
     Assert(!(ASMGetFlags() & X86_EFL_IF));
 
@@ -5042 +5042 @@
 
     /* Just set the correct state here instead of trying to catch every goto above. */
-    VMCPU_CMPXCHG_STATE(pVCpu, VMCPUSTATE_STARTED, VMCPUSTATE_STARTED_EXEC);
+    VMCPU_CMPXCHG_STATE(pVCpu, VMCPUSTATE_STARTED_HM, VMCPUSTATE_STARTED_EXEC);
 
 #ifdef VBOX_WITH_VMMR0_DISABLE_PREEMPTION

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

@@ -762 +762 @@
                 if (RT_SUCCESS(rc))
                 {
+                    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_HM);
+
                     rc = vmmR0CallRing3SetJmp(&pVCpu->vmm.s.CallRing3JmpBufR0, HMR0RunGuestCode, pVM, pVCpu); /* this may resume code. */
                     int rc2 = HMR0Leave(pVM, pVCpu);
                     AssertRC(rc2);
+
+                    VMCPU_ASSERT_STATE(pVCpu, VMCPUSTATE_STARTED_HM);
+                    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED);
                 }
                 STAM_COUNTER_INC(&pVM->vmm.s.StatRunRC);
@@ -1368 +1373 @@
     return vmmR0EntryExWorker(pVM, idCpu, enmOperation, pReq, u64Arg, pSession);
 }
+
+
+/**
+ * Checks whether we've armed the ring-0 long jump machinery.
+ *
+ * @returns @c true / @c false
+ * @param   pVCpu           The caller's cross context virtual CPU structure.
+ * @thread  EMT
+ * @sa      VMMIsLongJumpArmed
+ */
+VMMR0_INT_DECL(bool) VMMR0IsLongJumpArmed(PVMCPU pVCpu)
+{
+#ifdef RT_ARCH_X86
+    return pVCpu->vmm.s.CallRing3JmpBufR0.eip
+        && !pVCpu->vmm.s.CallRing3JmpBufR0.fInRing3Call;
+#else
+    return pVCpu->vmm.s.CallRing3JmpBufR0.rip
+        && !pVCpu->vmm.s.CallRing3JmpBufR0.fInRing3Call;
+#endif
+}
+
 
 /**

trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

@@ -3335 +3335 @@
     if (pVM->cCpus > 1)
     {
-        /* We own the IOM lock here and could cause a deadlock by waiting for a VCPU that is blocking on the IOM lock. */
+        /* We might be holding locks here and could cause a deadlock since
+           VMR3PowerOff rendezvous with the other CPUs. */
         rc = VMR3ReqCallNoWait(pVM, VMCPUID_ANY_QUEUE, (PFNRT)VMR3PowerOff, 1, pVM->pUVM);
         AssertRC(rc);
         /* Set the VCPU state to stopped here as well to make sure no
-         * inconsistency with the EM state occurs.
-         */
+           inconsistency with the EM state occurs. */
         VMCPU_SET_STATE(VMMGetCpu(pVM), VMCPUSTATE_STOPPED);
         rc = VINF_EM_OFF;

trunk/src/VBox/VMM/VMMR3/VMEmt.cpp

@@ -1099 +1099 @@
      * Do the halt.
      */
-    Assert(VMCPU_GET_STATE(pVCpu) == VMCPUSTATE_STARTED);
+    VMCPU_ASSERT_STATE(pVCpu, VMCPUSTATE_STARTED);
     VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_HALTED);
     PUVM pUVM = pUVCpu->pUVM;