Changeset 19434 in vbox

Timestamp:

May 6, 2009 1:58:35 PM (16 years ago)

Author:

vboxsync

Message:

Further splitup of VMM (ring 0 jump buffer).

Location:

trunk

Files:

• include/VBox/vm.h (modified) (2 diffs)
• src/VBox/VMM/VMM.cpp (modified) (34 diffs)
• src/VBox/VMM/VMMAll/VMMAll.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMGC/VMMGC.cpp (modified) (1 diff)
• src/VBox/VMM/VMMGuruMeditation.cpp (modified) (1 diff)
• src/VBox/VMM/VMMInternal.h (modified) (3 diffs)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (10 diffs)
• src/VBox/VMM/VMMTests.cpp (modified) (5 diffs)
• src/VBox/VMM/testcase/tstVMStructGC.cpp (modified) (2 diffs)
• src/VBox/VMM/testcase/tstVMStructSize.cpp (modified) (1 diff)

trunk/include/VBox/vm.h

@@ -161 +161 @@
     } tm;
 
-    /** VMM part.
-     * @todo Combine this with other tiny structures. */
+    /** VMM part. */
     union
     {
@@ -168 +167 @@
         struct VMMCPU       s;
 #endif
-        char                padding[64];        /* multiple of 64 */
+        char                padding[256];       /* multiple of 64 */
     } vmm;
 

trunk/src/VBox/VMM/VMM.cpp

@@ -107 +107 @@
 static DECLCALLBACK(int)    vmmR3Load(PVM pVM, PSSMHANDLE pSSM, uint32_t u32Version);
 static DECLCALLBACK(void)   vmmR3YieldEMT(PVM pVM, PTMTIMER pTimer, void *pvUser);
-static int                  vmmR3ServiceCallHostRequest(PVM pVM);
+static int                  vmmR3ServiceCallHostRequest(PVM pVM, PVMCPU pVCpu);
 static DECLCALLBACK(void)   vmmR3InfoFF(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
 
@@ -125 +125 @@
      */
     AssertMsg(pVM->vmm.s.offVM == 0, ("Already initialized!\n"));
-    AssertMsg(sizeof(pVM->vmm.padding) >= sizeof(pVM->vmm.s),
-              ("pVM->vmm.padding is too small! vmm.padding %d while vmm.s is %d\n",
-               sizeof(pVM->vmm.padding), sizeof(pVM->vmm.s)));
+    AssertCompile(sizeof(pVM->vmm.s) <= sizeof(pVM->vmm.padding));
+    AssertCompile(sizeof(pVM->aCpus[0].vmm.s) <= sizeof(pVM->aCpus[0].vmm.padding));
 
     /*
@@ -218 +217 @@
 static int vmmR3InitStacks(PVM pVM)
 {
-    /** @todo SMP: One stack per vCPU. */
+    int rc = VINF_SUCCESS;
+
+    for (unsigned idCpu = 0; idCpu < pVM->cCPUs; idCpu++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[idCpu];
+
 #ifdef VBOX_STRICT_VMM_STACK
-    int rc = MMR3HyperAllocOnceNoRel(pVM, VMM_STACK_SIZE + PAGE_SIZE + PAGE_SIZE, PAGE_SIZE, MM_TAG_VMM, (void **)&pVM->vmm.s.pbEMTStackR3);
+        rc = MMR3HyperAllocOnceNoRel(pVM, VMM_STACK_SIZE + PAGE_SIZE + PAGE_SIZE, PAGE_SIZE, MM_TAG_VMM, (void **)&pVCpu->vmm.s.pbEMTStackR3);
 #else
-    int rc = MMR3HyperAllocOnceNoRel(pVM, VMM_STACK_SIZE, PAGE_SIZE, MM_TAG_VMM, (void **)&pVM->vmm.s.pbEMTStackR3);
-#endif
-    if (RT_SUCCESS(rc))
-    {
+        rc = MMR3HyperAllocOnceNoRel(pVM, VMM_STACK_SIZE, PAGE_SIZE, MM_TAG_VMM, (void **)&pVCpu->vmm.s.pbEMTStackR3);
+#endif
+        if (RT_SUCCESS(rc))
+        {
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
-        /* MMHyperR3ToR0 returns R3 when not doing hardware assisted virtualization. */
-        if (!VMMIsHwVirtExtForced(pVM))
-            pVM->vmm.s.CallHostR0JmpBuf.pvSavedStack = NIL_RTR0PTR;
-        else
-#endif
-            pVM->vmm.s.CallHostR0JmpBuf.pvSavedStack = MMHyperR3ToR0(pVM, pVM->vmm.s.pbEMTStackR3);
-        pVM->vmm.s.pbEMTStackRC = MMHyperR3ToRC(pVM, pVM->vmm.s.pbEMTStackR3);
-        pVM->vmm.s.pbEMTStackBottomRC = pVM->vmm.s.pbEMTStackRC + VMM_STACK_SIZE;
-        AssertRelease(pVM->vmm.s.pbEMTStackRC);
-
-        for (unsigned i=0;i<pVM->cCPUs;i++)
-        {
-            PVMCPU pVCpu = &pVM->aCpus[i];
-            CPUMSetHyperESP(pVCpu, pVM->vmm.s.pbEMTStackBottomRC);
+            /* MMHyperR3ToR0 returns R3 when not doing hardware assisted virtualization. */
+            if (!VMMIsHwVirtExtForced(pVM))
+                pVCpu->vmm.s.CallHostR0JmpBuf.pvSavedStack = NIL_RTR0PTR;
+            else
+#endif
+                pVCpu->vmm.s.CallHostR0JmpBuf.pvSavedStack = MMHyperR3ToR0(pVM, pVCpu->vmm.s.pbEMTStackR3);
+            pVCpu->vmm.s.pbEMTStackRC       = MMHyperR3ToRC(pVM, pVCpu->vmm.s.pbEMTStackR3);
+            pVCpu->vmm.s.pbEMTStackBottomRC = pVCpu->vmm.s.pbEMTStackRC + VMM_STACK_SIZE;
+            AssertRelease(pVCpu->vmm.s.pbEMTStackRC);
+
+            CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC);
         }
     }
@@ -389 +390 @@
 VMMR3DECL(int) VMMR3InitFinalize(PVM pVM)
 {
+    int rc = VINF_SUCCESS;
+
+    for (unsigned idCpu = 0; idCpu < pVM->cCPUs; idCpu++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[idCpu];
+
 #ifdef VBOX_STRICT_VMM_STACK
-    /*
-     * Two inaccessible pages at each sides of the stack to catch over/under-flows.
-     */
-    memset(pVM->vmm.s.pbEMTStackR3 - PAGE_SIZE, 0xcc, PAGE_SIZE);
-    PGMMapSetPage(pVM, MMHyperR3ToRC(pVM, pVM->vmm.s.pbEMTStackR3 - PAGE_SIZE), PAGE_SIZE, 0);
-    RTMemProtect(pVM->vmm.s.pbEMTStackR3 - PAGE_SIZE, PAGE_SIZE, RTMEM_PROT_NONE);
-
-    memset(pVM->vmm.s.pbEMTStackR3 + VMM_STACK_SIZE, 0xcc, PAGE_SIZE);
-    PGMMapSetPage(pVM, MMHyperR3ToRC(pVM, pVM->vmm.s.pbEMTStackR3 + VMM_STACK_SIZE), PAGE_SIZE, 0);
-    RTMemProtect(pVM->vmm.s.pbEMTStackR3 + VMM_STACK_SIZE, PAGE_SIZE, RTMEM_PROT_NONE);
-#endif
-
-    /*
-     * Set page attributes to r/w for stack pages.
-     */
-    int rc = PGMMapSetPage(pVM, pVM->vmm.s.pbEMTStackRC, VMM_STACK_SIZE, X86_PTE_P | X86_PTE_A | X86_PTE_D | X86_PTE_RW);
-    AssertRC(rc);
+        /*
+         * Two inaccessible pages at each sides of the stack to catch over/under-flows.
+         */
+        memset(pVCpu->vmm.s.pbEMTStackR3 - PAGE_SIZE, 0xcc, PAGE_SIZE);
+        PGMMapSetPage(pVM, MMHyperR3ToRC(pVM, pVCpu->vmm.s.pbEMTStackR3 - PAGE_SIZE), PAGE_SIZE, 0);
+        RTMemProtect(pVCpu->vmm.s.pbEMTStackR3 - PAGE_SIZE, PAGE_SIZE, RTMEM_PROT_NONE);
+
+        memset(pVCpu->vmm.s.pbEMTStackR3 + VMM_STACK_SIZE, 0xcc, PAGE_SIZE);
+        PGMMapSetPage(pVM, MMHyperR3ToRC(pVM, pVCpu->vmm.s.pbEMTStackR3 + VMM_STACK_SIZE), PAGE_SIZE, 0);
+        RTMemProtect(pVCpu->vmm.s.pbEMTStackR3 + VMM_STACK_SIZE, PAGE_SIZE, RTMEM_PROT_NONE);
+#endif
+
+        /*
+        * Set page attributes to r/w for stack pages.
+        */
+        rc = PGMMapSetPage(pVM, pVCpu->vmm.s.pbEMTStackRC, VMM_STACK_SIZE, X86_PTE_P | X86_PTE_A | X86_PTE_D | X86_PTE_RW);
+        AssertRC(rc);
+        if (RT_FAILURE(rc))
+            break;
+    }
     if (RT_SUCCESS(rc))
     {
@@ -437 +447 @@
 VMMR3DECL(int) VMMR3InitR0(PVM pVM)
 {
-    int rc;
+    int    rc;
+    PVMCPU pVCpu = VMMGetCpu(pVM);
+    Assert(pVCpu && pVCpu->idCpu == 0);
 
     /*
@@ -466 +478 @@
         if (rc != VINF_VMM_CALL_HOST)
             break;
-        rc = vmmR3ServiceCallHostRequest(pVM);
+        rc = vmmR3ServiceCallHostRequest(pVM, pVCpu);
         if (RT_FAILURE(rc) || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST))
             break;
@@ -491 +503 @@
 {
     PVMCPU pVCpu = VMMGetCpu(pVM);
-    Assert(pVCpu);
+    Assert(pVCpu && pVCpu->idCpu == 0);
 
     /* In VMX mode, there's no need to init RC. */
@@ -510 +522 @@
     {
         CPUMHyperSetCtxCore(pVCpu, NULL);
-        CPUMSetHyperESP(pVCpu, pVM->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
+        CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
         uint64_t u64TS = RTTimeProgramStartNanoTS();
         CPUMPushHyper(pVCpu, (uint32_t)(u64TS >> 32));    /* Param 3: The program startup TS - Hi. */
@@ -543 +555 @@
             if (rc != VINF_VMM_CALL_HOST)
                 break;
-            rc = vmmR3ServiceCallHostRequest(pVM);
+            rc = vmmR3ServiceCallHostRequest(pVM, pVCpu);
             if (RT_FAILURE(rc) || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST))
                 break;
@@ -568 +580 @@
 VMMR3DECL(int) VMMR3Term(PVM pVM)
 {
+    PVMCPU pVCpu = VMMGetCpu(pVM);
+    Assert(pVCpu && pVCpu->idCpu == 0);
+
     /*
      * Call Ring-0 entry with termination code.
@@ -585 +600 @@
         if (rc != VINF_VMM_CALL_HOST)
             break;
-        rc = vmmR3ServiceCallHostRequest(pVM);
+        rc = vmmR3ServiceCallHostRequest(pVM, pVCpu);
         if (RT_FAILURE(rc) || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST))
             break;
@@ -650 +665 @@
 
         CPUMSetHyperESP(pVCpu, CPUMGetHyperESP(pVCpu) + offDelta);
-    }
-
-    pVM->vmm.s.pbEMTStackRC = MMHyperR3ToRC(pVM, pVM->vmm.s.pbEMTStackR3);
-    pVM->vmm.s.pbEMTStackBottomRC = pVM->vmm.s.pbEMTStackRC + VMM_STACK_SIZE;
+
+        pVCpu->vmm.s.pbEMTStackRC       = MMHyperR3ToRC(pVM, pVCpu->vmm.s.pbEMTStackR3);
+        pVCpu->vmm.s.pbEMTStackBottomRC = pVCpu->vmm.s.pbEMTStackRC + VMM_STACK_SIZE;
+    }
+
 
     /*
@@ -810 +826 @@
     LogFlow(("vmmR3Save:\n"));
 
-    /*
-     * The hypervisor stack.
-     * Note! See not in vmmR3Load.
-     */
-    SSMR3PutRCPtr(pSSM, pVM->vmm.s.pbEMTStackBottomRC);
-
     for (unsigned i=0;i<pVM->cCPUs;i++)
     {
         PVMCPU pVCpu = &pVM->aCpus[i];
 
+        /*
+         * The hypervisor stack.
+         * Note! See not in vmmR3Load.
+         */
+        SSMR3PutRCPtr(pSSM, pVCpu->vmm.s.pbEMTStackBottomRC);
+
         RTRCPTR RCPtrESP = CPUMGetHyperESP(pVCpu);
-        AssertMsg(pVM->vmm.s.pbEMTStackBottomRC - RCPtrESP <= VMM_STACK_SIZE, ("Bottom %RRv ESP=%RRv\n", pVM->vmm.s.pbEMTStackBottomRC, RCPtrESP));
+        AssertMsg(pVCpu->vmm.s.pbEMTStackBottomRC - RCPtrESP <= VMM_STACK_SIZE, ("Bottom %RRv ESP=%RRv\n", pVCpu->vmm.s.pbEMTStackBottomRC, RCPtrESP));
         SSMR3PutRCPtr(pSSM, RCPtrESP);
-    }
-    SSMR3PutMem(pSSM, pVM->vmm.s.pbEMTStackR3, VMM_STACK_SIZE);
+
+        SSMR3PutMem(pSSM, pVCpu->vmm.s.pbEMTStackR3, VMM_STACK_SIZE);
+    }
     return SSMR3PutU32(pSSM, ~0); /* terminator */
 }
@@ -865 +882 @@
 
     /* restore the stack.  */
-    SSMR3GetMem(pSSM, pVM->vmm.s.pbEMTStackR3, VMM_STACK_SIZE);
+    for (unsigned i=0;i<pVM->cCPUs;i++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[i];
+
+        SSMR3GetMem(pSSM, pVCpu->vmm.s.pbEMTStackR3, VMM_STACK_SIZE);
+    }
 
     /* terminator */
@@ -1025 +1047 @@
                     ? pVM->vmm.s.pfnCPUMRCResumeGuestV86
                     : pVM->vmm.s.pfnCPUMRCResumeGuest);
-    CPUMSetHyperESP(pVCpu, pVM->vmm.s.pbEMTStackBottomRC);
+    CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC);
 
     /*
@@ -1067 +1089 @@
             return rc;
         }
-        rc = vmmR3ServiceCallHostRequest(pVM);
+        rc = vmmR3ServiceCallHostRequest(pVM, pVCpu);
         if (RT_FAILURE(rc))
             return rc;
@@ -1113 +1135 @@
             return rc;
         }
-        rc = vmmR3ServiceCallHostRequest(pVM);
+        rc = vmmR3ServiceCallHostRequest(pVM, pVCpu);
         if (RT_FAILURE(rc))
             return rc;
@@ -1159 +1181 @@
      */
     CPUMHyperSetCtxCore(pVCpu, NULL);
-    memset(pVM->vmm.s.pbEMTStackR3, 0xaa, VMM_STACK_SIZE); /* Clear the stack. */
-    CPUMSetHyperESP(pVCpu, pVM->vmm.s.pbEMTStackBottomRC - cArgs * sizeof(RTGCUINTPTR32));
-    PRTGCUINTPTR32 pFrame = (PRTGCUINTPTR32)(pVM->vmm.s.pbEMTStackR3 + VMM_STACK_SIZE) - cArgs;
+    memset(pVCpu->vmm.s.pbEMTStackR3, 0xaa, VMM_STACK_SIZE); /* Clear the stack. */
+    CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC - cArgs * sizeof(RTGCUINTPTR32));
+    PRTGCUINTPTR32 pFrame = (PRTGCUINTPTR32)(pVCpu->vmm.s.pbEMTStackR3 + VMM_STACK_SIZE) - cArgs;
     int i = cArgs;
     while (i-- > 0)
@@ -1209 +1231 @@
             return rc;
         }
-        rc = vmmR3ServiceCallHostRequest(pVM);
+        rc = vmmR3ServiceCallHostRequest(pVM, pVCpu);
         if (RT_FAILURE(rc))
             return rc;
@@ -1248 +1270 @@
         if (rc != VINF_VMM_CALL_HOST)
             break;
-        rc = vmmR3ServiceCallHostRequest(pVM);
+        rc = vmmR3ServiceCallHostRequest(pVM, pVCpu);
         if (RT_FAILURE(rc) || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST))
             break;
@@ -1313 +1335 @@
             return rc;
         }
-        rc = vmmR3ServiceCallHostRequest(pVM);
+        rc = vmmR3ServiceCallHostRequest(pVM, pVCpu);
         if (RT_FAILURE(rc))
             return rc;
@@ -1325 +1347 @@
  * @returns VBox status code.
  * @param   pVM     VM handle.
+ * @param   pVCpu   VMCPU handle
  * @remark  Careful with critsects.
  */
-static int vmmR3ServiceCallHostRequest(PVM pVM)
-{
-    switch (pVM->vmm.s.enmCallHostOperation)
+static int vmmR3ServiceCallHostRequest(PVM pVM, PVMCPU pVCpu)
+{
+    switch (pVCpu->vmm.s.enmCallHostOperation)
     {
         /*
@@ -1336 +1359 @@
         case VMMCALLHOST_PDM_LOCK:
         {
-            pVM->vmm.s.rcCallHost = PDMR3LockCall(pVM);
+            pVCpu->vmm.s.rcCallHost = PDMR3LockCall(pVM);
             break;
         }
@@ -1346 +1369 @@
         {
             PDMR3QueueFlushWorker(pVM, NULL);
-            pVM->vmm.s.rcCallHost = VINF_SUCCESS;
+            pVCpu->vmm.s.rcCallHost = VINF_SUCCESS;
             break;
         }
@@ -1355 +1378 @@
         case VMMCALLHOST_PGM_POOL_GROW:
         {
-            pVM->vmm.s.rcCallHost = PGMR3PoolGrow(pVM);
+            pVCpu->vmm.s.rcCallHost = PGMR3PoolGrow(pVM);
             break;
         }
@@ -1364 +1387 @@
         case VMMCALLHOST_PGM_MAP_CHUNK:
         {
-            pVM->vmm.s.rcCallHost = PGMR3PhysChunkMap(pVM, pVM->vmm.s.u64CallHostArg);
+            pVCpu->vmm.s.rcCallHost = PGMR3PhysChunkMap(pVM, pVCpu->vmm.s.u64CallHostArg);
             break;
         }
@@ -1373 +1396 @@
         case VMMCALLHOST_PGM_ALLOCATE_HANDY_PAGES:
         {
-            pVM->vmm.s.rcCallHost = PGMR3PhysAllocateHandyPages(pVM);
+            pVCpu->vmm.s.rcCallHost = PGMR3PhysAllocateHandyPages(pVM);
             break;
         }
@@ -1382 +1405 @@
         case VMMCALLHOST_PGM_LOCK:
         {
-            pVM->vmm.s.rcCallHost = PGMR3LockCall(pVM);
+            pVCpu->vmm.s.rcCallHost = PGMR3LockCall(pVM);
             break;
         }
@@ -1392 +1415 @@
         {
             REMR3ReplayHandlerNotifications(pVM);
-            pVM->vmm.s.rcCallHost = VINF_SUCCESS;
+            pVCpu->vmm.s.rcCallHost = VINF_SUCCESS;
             break;
         }
@@ -1401 +1424 @@
          */
         case VMMCALLHOST_VMM_LOGGER_FLUSH:
-            pVM->vmm.s.rcCallHost = VINF_SUCCESS;
+            pVCpu->vmm.s.rcCallHost = VINF_SUCCESS;
             LogAlways(("*FLUSH*\n"));
             break;
@@ -1410 +1433 @@
         case VMMCALLHOST_VM_SET_ERROR:
             VMR3SetErrorWorker(pVM);
-            pVM->vmm.s.rcCallHost = VINF_SUCCESS;
+            pVCpu->vmm.s.rcCallHost = VINF_SUCCESS;
             break;
 
@@ -1417 +1440 @@
          */
         case VMMCALLHOST_VM_SET_RUNTIME_ERROR:
-            pVM->vmm.s.rcCallHost = VMR3SetRuntimeErrorWorker(pVM);
+            pVCpu->vmm.s.rcCallHost = VMR3SetRuntimeErrorWorker(pVM);
             break;
 
@@ -1425 +1448 @@
          */
         case VMMCALLHOST_VM_R0_ASSERTION:
-            pVM->vmm.s.enmCallHostOperation = VMMCALLHOST_INVALID;
-            pVM->vmm.s.CallHostR0JmpBuf.fInRing3Call = false;
+            pVCpu->vmm.s.enmCallHostOperation = VMMCALLHOST_INVALID;
+            pVCpu->vmm.s.CallHostR0JmpBuf.fInRing3Call = false;
 #ifdef RT_ARCH_X86
-            pVM->vmm.s.CallHostR0JmpBuf.eip = 0;
+            pVCpu->vmm.s.CallHostR0JmpBuf.eip = 0;
 #else
-            pVM->vmm.s.CallHostR0JmpBuf.rip = 0;
+            pVCpu->vmm.s.CallHostR0JmpBuf.rip = 0;
 #endif
             LogRel((pVM->vmm.s.szRing0AssertMsg1));
@@ -1440 +1463 @@
          */
         case VMMCALLHOST_VM_R0_PREEMPT:
-            pVM->vmm.s.rcCallHost = VINF_SUCCESS;
+            pVCpu->vmm.s.rcCallHost = VINF_SUCCESS;
             break;
 
         default:
-            AssertMsgFailed(("enmCallHostOperation=%d\n", pVM->vmm.s.enmCallHostOperation));
+            AssertMsgFailed(("enmCallHostOperation=%d\n", pVCpu->vmm.s.enmCallHostOperation));
             return VERR_INTERNAL_ERROR;
     }
 
-    pVM->vmm.s.enmCallHostOperation = VMMCALLHOST_INVALID;
+    pVCpu->vmm.s.enmCallHostOperation = VMMCALLHOST_INVALID;
     return VINF_SUCCESS;
 }

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

@@ -28 +28 @@
 #include "VMMInternal.h"
 #include <VBox/vm.h>
+#include <VBox/vmm.h>
 #include <VBox/param.h>
 #include <VBox/hwaccm.h>
@@ -43 +44 @@
 VMMDECL(RTRCPTR) VMMGetStackRC(PVM pVM)
 {
-    return (RTRCPTR)pVM->vmm.s.pbEMTStackBottomRC;
+    PVMCPU pVCpu = VMMGetCpu(pVM);
+    Assert(pVCpu);
+
+    return (RTRCPTR)pVCpu->vmm.s.pbEMTStackBottomRC;
 }
 

trunk/src/VBox/VMM/VMMGC/VMMGC.cpp

@@ -244 +244 @@
 VMMRCDECL(int) VMMGCCallHost(PVM pVM, VMMCALLHOST enmOperation, uint64_t uArg)
 {
+    PVMCPU pVCpu = VMMGetCpu0(pVM);
+
 /** @todo profile this! */
-    pVM->vmm.s.enmCallHostOperation = enmOperation;
-    pVM->vmm.s.u64CallHostArg = uArg;
-    pVM->vmm.s.rcCallHost = VERR_INTERNAL_ERROR;
+    pVCpu->vmm.s.enmCallHostOperation = enmOperation;
+    pVCpu->vmm.s.u64CallHostArg = uArg;
+    pVCpu->vmm.s.rcCallHost = VERR_INTERNAL_ERROR;
     pVM->vmm.s.pfnGuestToHostRC(VINF_VMM_CALL_HOST);
-    return pVM->vmm.s.rcCallHost;
+    return pVCpu->vmm.s.rcCallHost;
 }
 

trunk/src/VBox/VMM/VMMGuruMeditation.cpp

@@ -385 +385 @@
                                 "!!\n"
                                 "%.*Rhxd\n",
-                                pVM->vmm.s.pbEMTStackRC, pVM->vmm.s.pbEMTStackBottomRC,
-                                VMM_STACK_SIZE, pVM->vmm.s.pbEMTStackR3);
+                                pVCpu->vmm.s.pbEMTStackRC, pVCpu->vmm.s.pbEMTStackBottomRC,
+                                VMM_STACK_SIZE, pVCpu->vmm.s.pbEMTStackR3);
             } /* !HWACCMR3IsActive */
             break;

trunk/src/VBox/VMM/VMMInternal.h

@@ -214 +214 @@
     R0PTRTYPE(PFNVMMSWITCHERHC) pfnHostToGuestR0;
     /** @}  */
-
-    /** VMM stack, pointer to the top of the stack in R3.
-     * Stack is allocated from the hypervisor heap and is page aligned
-     * and always writable in RC. */
-    R3PTRTYPE(uint8_t *)        pbEMTStackR3;
-    /** Pointer to the bottom of the stack - needed for doing relocations. */
-    RCPTRTYPE(uint8_t *)        pbEMTStackRC;
-    /** Pointer to the bottom of the stack - needed for doing relocations. */
-    RCPTRTYPE(uint8_t *)        pbEMTStackBottomRC;
 
     /** @name Logging
@@ -262 +253 @@
     /** The timestamp of the previous yield. (nano) */
     uint64_t                    u64LastYield;
-
-    /** @name CallHost
-     * @todo SMP: per vCPU
-     * @{ */
-    /** The pending operation. */
-    VMMCALLHOST                 enmCallHostOperation;
-    /** The result of the last operation. */
-    int32_t                     rcCallHost;
-    /** The argument to the operation. */
-    uint64_t                    u64CallHostArg;
-    /** The Ring-0 jmp buffer. */
-    VMMR0JMPBUF                 CallHostR0JmpBuf;
-    /** @} */
 
     /** Buffer for storing the standard assertion message for a ring-0 assertion.
@@ -353 +331 @@
      * See VMM2VMCPU(). */
     RTINT                       offVMCPU;
+
+    /** VMM stack, pointer to the top of the stack in R3.
+     * Stack is allocated from the hypervisor heap and is page aligned
+     * and always writable in RC. */
+    R3PTRTYPE(uint8_t *)        pbEMTStackR3;
+    /** Pointer to the bottom of the stack - needed for doing relocations. */
+    RCPTRTYPE(uint8_t *)        pbEMTStackRC;
+    /** Pointer to the bottom of the stack - needed for doing relocations. */
+    RCPTRTYPE(uint8_t *)        pbEMTStackBottomRC;
+
+    /** @name CallHost
+     * @{ */
+    /** The pending operation. */
+    VMMCALLHOST                 enmCallHostOperation;
+    /** The result of the last operation. */
+    int32_t                     rcCallHost;
+    /** The argument to the operation. */
+    uint64_t                    u64CallHostArg;
+    /** The Ring-0 jmp buffer. */
+    VMMR0JMPBUF                 CallHostR0JmpBuf;
+    /** @} */
+
 } VMMCPU;
 /** Pointer to VMMCPU. */

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

@@ -308 +308 @@
 VMMR0DECL(int) VMMR0CallHost(PVM pVM, VMMCALLHOST enmOperation, uint64_t uArg)
 {
+    PVMCPU pVCpu = VMMGetCpu(pVM);
+
 /** @todo profile this! */
-    pVM->vmm.s.enmCallHostOperation = enmOperation;
-    pVM->vmm.s.u64CallHostArg = uArg;
-    pVM->vmm.s.rcCallHost = VERR_INTERNAL_ERROR;
-    int rc = vmmR0CallHostLongJmp(&pVM->vmm.s.CallHostR0JmpBuf, VINF_VMM_CALL_HOST);
+    pVCpu->vmm.s.enmCallHostOperation = enmOperation;
+    pVCpu->vmm.s.u64CallHostArg = uArg;
+    pVCpu->vmm.s.rcCallHost = VERR_INTERNAL_ERROR;
+    int rc = vmmR0CallHostLongJmp(&pVCpu->vmm.s.CallHostR0JmpBuf, VINF_VMM_CALL_HOST);
     if (rc == VINF_SUCCESS)
-        rc = pVM->vmm.s.rcCallHost;
+        rc = pVCpu->vmm.s.rcCallHost;
     return rc;
 }
@@ -323 +325 @@
  * Record return code statistics
  * @param   pVM         The VM handle.
+ * @param   pVCpu       The VMCPU handle.
  * @param   rc          The status code.
  */
-static void vmmR0RecordRC(PVM pVM, int rc)
+static void vmmR0RecordRC(PVM pVM, PVMCPU pVCpu, int rc)
 {
     /*
@@ -438 +441 @@
             break;
         case VINF_VMM_CALL_HOST:
-            switch (pVM->vmm.s.enmCallHostOperation)
+            switch (pVCpu->vmm.s.enmCallHostOperation)
             {
                 case VMMCALLHOST_PDM_LOCK:
@@ -590 +593 @@
 #ifdef VBOX_WITH_STATISTICS
                 STAM_COUNTER_INC(&pVM->vmm.s.StatRunRC);
-                vmmR0RecordRC(pVM, rc);
+                vmmR0RecordRC(pVM, pVCpu, rc);
 #endif
             }
@@ -623 +626 @@
                 if (RT_SUCCESS(rc))
                 {
-                    rc = vmmR0CallHostSetJmp(&pVM->vmm.s.CallHostR0JmpBuf, HWACCMR0RunGuestCode, pVM, pVCpu); /* this may resume code. */
+                    rc = vmmR0CallHostSetJmp(&pVCpu->vmm.s.CallHostR0JmpBuf, HWACCMR0RunGuestCode, pVM, pVCpu); /* this may resume code. */
                     int rc2 = HWACCMR0Leave(pVM, pVCpu);
                     AssertRC(rc2);
@@ -639 +642 @@
 
 #ifdef VBOX_WITH_STATISTICS
-            vmmR0RecordRC(pVM, rc);
+            vmmR0RecordRC(pVM, pVCpu, rc);
 #endif
             /* No special action required for external interrupts, just return. */
@@ -1084 +1087 @@
             case VMMR0_DO_VMMR0_TERM:
             {
-                if (!pVM->vmm.s.CallHostR0JmpBuf.pvSavedStack)
+                PVMCPU pVCpu = &pVM->aCpus[idCpu];
+
+                if (!pVCpu->vmm.s.CallHostR0JmpBuf.pvSavedStack)
                     break;
 
@@ -1095 +1100 @@
                 Args.u64Arg = u64Arg;
                 Args.pSession = pSession;
-                return vmmR0CallHostSetJmpEx(&pVM->vmm.s.CallHostR0JmpBuf, vmmR0EntryExWrapper, &Args);
+                return vmmR0CallHostSetJmpEx(&pVCpu->vmm.s.CallHostR0JmpBuf, vmmR0EntryExWrapper, &Args);
             }
 
@@ -1141 +1146 @@
     }
 
+    PVMCPU pVCpu = VMMGetCpu(pVM);
+
     /*
      * Check that the jump buffer is armed.
      */
 #ifdef RT_ARCH_X86
-    if (    !pVM->vmm.s.CallHostR0JmpBuf.eip
-        ||  pVM->vmm.s.CallHostR0JmpBuf.fInRing3Call)
+    if (    !pVCpu->vmm.s.CallHostR0JmpBuf.eip
+        ||  pVCpu->vmm.s.CallHostR0JmpBuf.fInRing3Call)
 #else
-    if (    !pVM->vmm.s.CallHostR0JmpBuf.rip
-        ||  pVM->vmm.s.CallHostR0JmpBuf.fInRing3Call)
+    if (    !pVCpu->vmm.s.CallHostR0JmpBuf.rip
+        ||  pVCpu->vmm.s.CallHostR0JmpBuf.fInRing3Call)
 #endif
     {
@@ -1200 +1207 @@
     if (pVM)
     {
+        PVMCPU pVCpu = VMMGetCpu(pVM);
+
 #ifdef RT_ARCH_X86
-        if (    pVM->vmm.s.CallHostR0JmpBuf.eip
-            &&  !pVM->vmm.s.CallHostR0JmpBuf.fInRing3Call)
+        if (    pVCpu->vmm.s.CallHostR0JmpBuf.eip
+            &&  !pVCpu->vmm.s.CallHostR0JmpBuf.fInRing3Call)
 #else
-        if (    pVM->vmm.s.CallHostR0JmpBuf.rip
-            &&  !pVM->vmm.s.CallHostR0JmpBuf.fInRing3Call)
+        if (    pVCpu->vmm.s.CallHostR0JmpBuf.rip
+            &&  !pVCpu->vmm.s.CallHostR0JmpBuf.fInRing3Call)
 #endif
         {

trunk/src/VBox/VMM/VMMTests.cpp

@@ -64 +64 @@
 
     CPUMHyperSetCtxCore(pVCpu, NULL);
-    memset(pVM->vmm.s.pbEMTStackR3, 0xaa, VMM_STACK_SIZE);
-    CPUMSetHyperESP(pVCpu, pVM->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
+    memset(pVCpu->vmm.s.pbEMTStackR3, 0xaa, VMM_STACK_SIZE);
+    CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
     CPUMPushHyper(pVCpu, uVariation);
     CPUMPushHyper(pVCpu, enmTestcase);
@@ -104 +104 @@
 
     CPUMHyperSetCtxCore(pVCpu, NULL);
-    memset(pVM->vmm.s.pbEMTStackR3, 0xaa, VMM_STACK_SIZE);
-    CPUMSetHyperESP(pVCpu, pVM->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
+    memset(pVCpu->vmm.s.pbEMTStackR3, 0xaa, VMM_STACK_SIZE);
+    CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
     CPUMPushHyper(pVCpu, uVariation);
     CPUMPushHyper(pVCpu, u8Trap + VMMGC_DO_TESTCASE_TRAP_FIRST);
@@ -342 +342 @@
          */
         CPUMHyperSetCtxCore(pVCpu, NULL);
-        CPUMSetHyperESP(pVCpu, pVM->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
+        CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
         CPUMPushHyper(pVCpu, 0);
         CPUMPushHyper(pVCpu, VMMGC_DO_TESTCASE_HYPER_INTERRUPT);
@@ -406 +406 @@
         {
             CPUMHyperSetCtxCore(pVCpu, NULL);
-            CPUMSetHyperESP(pVCpu, pVM->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
+            CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
             CPUMPushHyper(pVCpu, 0);
             CPUMPushHyper(pVCpu, VMMGC_DO_TESTCASE_NOP);
@@ -540 +540 @@
             CPUMHyperSetCtxCore(pVCpu, NULL);
 
-            CPUMSetHyperESP(pVCpu, pVM->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
+            CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
             CPUMPushHyper(pVCpu, 0);
             CPUMPushHyper(pVCpu, VMMGC_DO_TESTCASE_HWACCM_NOP);

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

@@ -873 +873 @@
     GEN_CHECK_OFF(VMM, pfnCPUMRCResumeGuestV86);
     GEN_CHECK_OFF(VMM, iLastGZRc);
-    GEN_CHECK_OFF(VMM, pbEMTStackR3);
-    GEN_CHECK_OFF(VMM, pbEMTStackRC);
-    GEN_CHECK_OFF(VMM, pbEMTStackBottomRC);
+    GEN_CHECK_OFF(VMMCPU, pbEMTStackR3);
+    GEN_CHECK_OFF(VMMCPU, pbEMTStackRC);
+    GEN_CHECK_OFF(VMMCPU, pbEMTStackBottomRC);
     GEN_CHECK_OFF(VMM, pRCLoggerRC);
     GEN_CHECK_OFF(VMM, pRCLoggerR3);
@@ -884 +884 @@
     GEN_CHECK_OFF(VMM, cYieldResumeMillies);
     GEN_CHECK_OFF(VMM, cYieldEveryMillies);
-    GEN_CHECK_OFF(VMM, enmCallHostOperation);
-    GEN_CHECK_OFF(VMM, rcCallHost);
-    GEN_CHECK_OFF(VMM, u64CallHostArg);
-    GEN_CHECK_OFF(VMM, CallHostR0JmpBuf);
-    GEN_CHECK_OFF(VMM, CallHostR0JmpBuf.SpCheck);
-    GEN_CHECK_OFF(VMM, CallHostR0JmpBuf.SpResume);
+    GEN_CHECK_OFF(VMMCPU, enmCallHostOperation);
+    GEN_CHECK_OFF(VMMCPU, rcCallHost);
+    GEN_CHECK_OFF(VMMCPU, u64CallHostArg);
+    GEN_CHECK_OFF(VMMCPU, CallHostR0JmpBuf);
+    GEN_CHECK_OFF(VMMCPU, CallHostR0JmpBuf.SpCheck);
+    GEN_CHECK_OFF(VMMCPU, CallHostR0JmpBuf.SpResume);
     GEN_CHECK_OFF(VMM, StatRunRC);
     GEN_CHECK_OFF(VMM, StatRZCallPGMLock);

trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp

@@ -196 +196 @@
     CHECK_MEMBER_ALIGNMENT(VM, cpum.s.GuestEntry, 64);
 
-    CHECK_MEMBER_ALIGNMENT(VM, vmm.s.CallHostR0JmpBuf, 8);
+    CHECK_MEMBER_ALIGNMENT(VMCPU, vmm.s.CallHostR0JmpBuf, 8);
     CHECK_MEMBER_ALIGNMENT(VM, vmm.s.StatRunRC, 8);
     CHECK_MEMBER_ALIGNMENT(VM, StatTotalQemuToGC, 8);