Changeset 12579 in vbox

Timestamp:

Sep 18, 2008 3:58:14 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

36801

Message:

VMM: Outlined the per CPU data.

Location:

trunk

Files:

• include/VBox/vm.h (modified) (2 diffs)
• src/VBox/VMM/MMHyper.cpp (modified) (2 diffs)
• src/VBox/VMM/VM.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (1 diff)
• src/VBox/VMM/testcase/tstVMStructSize.cpp (modified) (1 diff)

trunk/include/VBox/vm.h

@@ -42 +42 @@
  * @{
  */
+
+
+/**
+ * The state of a virtual CPU.
+ *
+ * The VM running states are a sub-states of the VMSTATE_RUNNING state. While
+ * VMCPUSTATE_NOT_RUNNING is a place holder for the other VM states.
+ */
+typedef enum VMCPUSTATE
+{
+    /** The customary invalid zero. */
+    VMCPUSTATE_INVALID = 0,
+
+    /** Running guest code (VM running). */
+    VMCPUSTATE_RUN_EXEC,
+    /** Running guest code in the recompiler (VM running). */
+    VMCPUSTATE_RUN_EXEC_REM,
+    /** Halted (VM running). */
+    VMCPUSTATE_RUN_HALTED,
+    /** All the other bits we do while running a VM (VM running). */
+    VMCPUSTATE_RUN_MISC,
+    /** VM not running, we're servicing requests or whatever. */
+    VMCPUSTATE_NOT_RUNNING,
+    /** The end of valid virtual CPU states. */
+    VMCPUSTATE_END,
+
+    /** Ensure 32-bit type. */
+    VMCPUSTATE_32BIT_HACK = 0x7fffffff
+} VMCPUSTATE;
+
+
+/**
+ * Per virtual CPU data.
+ */
+typedef struct VMCPU
+{
+    /** Per CPU forced action.
+     * See the VMCPU_FF_* \#defines. Updated atomically. */
+    uint32_t volatile   fForcedActions;
+    /** The CPU state. */
+    VMCPUSTATE volatile enmState;
+
+    /** Ring-3 Host Context VM Pointer. */
+    PVMR3               pVMR3;
+    /** Ring-0 Host Context VM Pointer. */
+    PVMR0               pVMR0;
+    /** Raw-mode Context VM Pointer. */
+    PVMRC               pVMRC;
+    /** The CPU ID.
+     * This is the index into the VM::aCpus array. */
+    uint32_t            idCpu;
+    /** The ring-3 thread handle of the emulation thread for this CPU.
+     * @todo Use the VM_IS_EMT() macro to check if executing in EMT? */
+    RTTHREAD            hThreadR3;
+    /** The native ring-3 handle. */
+    RTNATIVETHREAD      hNativeThreadR3;
+    /** The native ring-0 handle. */
+    RTNATIVETHREAD      hNativeThreadR0;
+
+    /** Align the next bit on a 64-byte boundrary. */
+    uint32_t            au32Alignment[HC_ARCH_BITS == 32 ? 7 : 2];
+
+    /** CPUM part. */
+    union
+    {
+#if 0 /*def ___CPUMInternal_h */
+        struct VMCPUCPUM    s;
+#endif
+        char                padding[64];
+    } cpum;
+} VMCPU;
+
 
 /** The name of the Guest Context VMM Core module. */
@@ -562 +634 @@
 #endif
     } rem;
+
+#if HC_ARCH_BITS == 64
+    /** Padding for aligning the cpu array on a 64 byte boundrary. */
+    uint32_t u32Reserved2[HC_ARCH_BITS == 32 ? 0 : 8];
+#endif
+
+    /**
+     * Per virtual CPU state.
+     */
+    VMCPU aCpus[1];
 } VM;
 

trunk/src/VBox/VMM/MMHyper.cpp

@@ -105 +105 @@
         {
             pVM->pVMGC = (RTGCPTR32)GCPtr;
+            for (uint32_t i = 0; i < pVM->cCPUs; i++)
+                pVM->aCpus[i].pVMRC = pVM->pVMGC;
 
             /* Reserve a page for fencing. */
@@ -282 +284 @@
             pVM->mm.s.pHyperHeapHC->pbHeapGC    += offDelta;
             pVM->mm.s.pHyperHeapHC->pVMGC       += pVM->pVMGC;
+            for (uint32_t i = 0; i < pVM->cCPUs; i++)
+                pVM->aCpus[i].pVMRC = pVM->pVMGC;
 
             /* relocate the rest. */

trunk/src/VBox/VMM/VM.cpp

@@ -293 +293 @@
                                   "If you have built VirtualBox yourself, make sure that you do "
                                   "not have the vboxdrv kernel module from a different install loaded.");
-# endif 
+# endif
 #endif
                     break;
@@ -438 +438 @@
          */
         pVM->pUVM = pUVM;
-        pVM->ThreadEMT = pUVM->vm.s.ThreadEMT;
-        pVM->NativeThreadEMT = pUVM->vm.s.NativeThreadEMT;
+        pVM->ThreadEMT = pVM->aCpus[0].hThreadR3 = pUVM->vm.s.ThreadEMT;
+        pVM->NativeThreadEMT = pVM->aCpus[0].hNativeThreadR3 = pUVM->vm.s.NativeThreadEMT;
 
         pVM->vm.s.offVM = RT_OFFSETOF(VM, vm.s);

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

@@ -602 +602 @@
                                     pVM->pVMR3 = RTR0MemObjAddressR3(pGVM->gvmm.s.VMMapObj);
                                     AssertPtr((void *)pVM->pVMR3);
+
+                                    /** @todo SMP - need to get the cpu count and initialize all the VM pointers. */
+                                    pVM->aCpus[0].pVMR0 = pVM;
+                                    pVM->aCpus[0].pVMR3 = pVM->pVMR3;
 
                                     rc = RTR0MemObjMapUser(&pGVM->gvmm.s.VMPagesMapObj, pGVM->gvmm.s.VMPagesMemObj, (RTR3PTR)-1, 0,

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

@@ -169 +169 @@
     CHECK_MEMBER_ALIGNMENT(VM, rem.s.StatsInQEMU, 8);
     CHECK_MEMBER_ALIGNMENT(VM, rem.s.Env, 32);
+    CHECK_MEMBER_ALIGNMENT(VM, aCpus, 64);
+
+    /* vmcpu */
+    CHECK_MEMBER_ALIGNMENT(VMCPU, cpum, 64);
+    CHECK_SIZE_ALIGNMENT(VMCPU, 64);
 
     /* cpumctx */