Changeset 10502 in vbox

Timestamp:

Jul 11, 2008 9:31:15 AM (17 years ago)

Author:

vboxsync

Message:

Take precautions for being rescheduled to a different cpu due to long jumps to ring 3. (affects AMD-V only)

Location:

trunk/src/VBox/VMM

Files:

• HWACCMInternal.h (modified) (2 diffs)
• VMMR0/HWACCMR0.cpp (modified) (4 diffs)
• VMMR0/HWSVMR0.cpp (modified) (3 diffs)
• VMMR0/HWSVMR0.h (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (2 diffs)
• VMMR0/HWVMXR0.h (modified) (1 diff)

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -396 +396 @@
 
 #ifdef VBOX_STRICT
+/**
+ * Returns the cpu structure for the current cpu.
+ * Keep in mind that there is no guarantee it will stay the same (long jumps to ring 3!!!).
+ *
+ * @returns cpu structure pointer
+ * @param   pVM         The VM to operate on.
+ */
+HWACCMR0DECL(PHWACCM_CPUINFO) HWACCMR0GetCurrentCpu();
+
 HWACCMR0DECL(void) HWACCMDumpRegs(PCPUMCTX pCtx);
 HWACCMR0DECL(void) HWACCMR0DumpDescriptor(PX86DESCHC  Desc, RTSEL Sel, const char *pszMsg);
@@ -411 +420 @@
 HWACCMR0DECL(int) HWACCMR0DummyTermVM(PVM pVM);
 HWACCMR0DECL(int) HWACCMR0DummySetupVM(PVM pVM);
-HWACCMR0DECL(int) HWACCMR0DummyRunGuestCode(PVM pVM, CPUMCTX *pCtx, PHWACCM_CPUINFO pCpu);
+HWACCMR0DECL(int) HWACCMR0DummyRunGuestCode(PVM pVM, CPUMCTX *pCtx);
 HWACCMR0DECL(int) HWACCMR0DummySaveHostState(PVM pVM);
 HWACCMR0DECL(int) HWACCMR0DummyLoadGuestState(PVM pVM, CPUMCTX *pCtx);

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

@@ -67 +67 @@
     DECLR0CALLBACKMEMBER(int, pfnSaveHostState,(PVM pVM));
     DECLR0CALLBACKMEMBER(int, pfnLoadGuestState,(PVM pVM, CPUMCTX *pCtx));
-    DECLR0CALLBACKMEMBER(int, pfnRunGuestCode,(PVM pVM, CPUMCTX *pCtx, PHWACCM_CPUINFO pCpu));
+    DECLR0CALLBACKMEMBER(int, pfnRunGuestCode,(PVM pVM, CPUMCTX *pCtx));
     DECLR0CALLBACKMEMBER(int, pfnEnableCpu, (PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys));
     DECLR0CALLBACKMEMBER(int, pfnDisableCpu, (PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys));
@@ -795 +795 @@
 
     Assert(!VM_FF_ISPENDING(pVM, VM_FF_PGM_SYNC_CR3 | VM_FF_PGM_SYNC_CR3_NON_GLOBAL));
+    Assert(HWACCMR0Globals.aCpuInfo[idCpu].fConfigured);
 
     rc = CPUMQueryGuestCtxPtr(pVM, &pCtx);
@@ -800 +801 @@
         return rc;
 
-    return HWACCMR0Globals.pfnRunGuestCode(pVM, pCtx, &HWACCMR0Globals.aCpuInfo[idCpu]);
-}
-
+    return HWACCMR0Globals.pfnRunGuestCode(pVM, pCtx);
+}
+
+/**
+ * Returns the cpu structure for the current cpu.
+ * Keep in mind that there is no guarantee it will stay the same (long jumps to ring 3!!!).
+ *
+ * @returns cpu structure pointer
+ * @param   pVM         The VM to operate on.
+ */
+HWACCMR0DECL(PHWACCM_CPUINFO) HWACCMR0GetCurrentCpu()
+{
+    RTCPUID  idCpu = RTMpCpuId();
+
+    return &HWACCMR0Globals.aCpuInfo[idCpu];
+}
 
 #ifdef VBOX_STRICT
@@ -1047 +1061 @@
 }
 
-HWACCMR0DECL(int) HWACCMR0DummyRunGuestCode(PVM pVM, CPUMCTX *pCtx, PHWACCM_CPUINFO pCpu)
+HWACCMR0DECL(int) HWACCMR0DummyRunGuestCode(PVM pVM, CPUMCTX *pCtx)
 {
     return VINF_SUCCESS;

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

@@ -765 +765 @@
  * @param   pVM         The VM to operate on.
  * @param   pCtx        Guest context
- * @param   pCpu        CPU info struct
  */
-HWACCMR0DECL(int) SVMR0RunGuestCode(PVM pVM, CPUMCTX *pCtx, PHWACCM_CPUINFO pCpu)
+HWACCMR0DECL(int) SVMR0RunGuestCode(PVM pVM, CPUMCTX *pCtx)
 {
     int         rc = VINF_SUCCESS;
@@ -777 +776 @@
 
     STAM_PROFILE_ADV_START(&pVM->hwaccm.s.StatEntry, x);
-
-    AssertReturn(pCpu->fConfigured, VERR_EM_INTERNAL_ERROR);
 
     pVMCB = (SVM_VMCB *)pVM->hwaccm.s.svm.pVMCB;
@@ -879 +876 @@
      *       (until the actual world switch)
      */
+    PHWACCM_CPUINFO pCpu = HWACCMR0GetCurrentCpu();
     /* Force a TLB flush for the first world switch if the current cpu differs from the one we ran on last. */
     /* Note that this can happen both for start and resume due to long jumps back to ring 3. */

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

@@ -113 +113 @@
  * @param   pVM         The VM to operate on.
  * @param   pCtx        Guest context
- * @param   pCpu        CPU info struct
  */
-HWACCMR0DECL(int) SVMR0RunGuestCode(PVM pVM, CPUMCTX *pCtx, PHWACCM_CPUINFO pCpu);
+HWACCMR0DECL(int) SVMR0RunGuestCode(PVM pVM, CPUMCTX *pCtx);
 
 

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

@@ -1022 +1022 @@
  * @param   pVM         The VM to operate on.
  * @param   pCtx        Guest context
- * @param   pCpu        CPU info struct
  */
-HWACCMR0DECL(int) VMXR0RunGuestCode(PVM pVM, CPUMCTX *pCtx, PHWACCM_CPUINFO pCpu)
+HWACCMR0DECL(int) VMXR0RunGuestCode(PVM pVM, CPUMCTX *pCtx)
 {
     int         rc = VINF_SUCCESS;
@@ -1036 +1035 @@
 
     Log2(("\nE"));
-
-    AssertReturn(pCpu->fConfigured, VERR_EM_INTERNAL_ERROR);
 
     STAM_PROFILE_ADV_START(&pVM->hwaccm.s.StatEntry, x);

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

@@ -132 +132 @@
  * @param   pVM         The VM to operate on.
  * @param   pCtx        Guest context
- * @param   pCpu        CPU info struct
  */
-HWACCMR0DECL(int) VMXR0RunGuestCode(PVM pVM, CPUMCTX *pCtx, PHWACCM_CPUINFO pCpu);
+HWACCMR0DECL(int) VMXR0RunGuestCode(PVM pVM, CPUMCTX *pCtx);