Changeset 19217 in vbox for trunk/include/VBox

Timestamp:

Apr 27, 2009 3:00:59 PM (16 years ago)

Author:

vboxsync

Message:

UVM splitup for SMP guests. Global and local request packets supported.

Location:

trunk/include/VBox

Files:

• types.h (modified) (1 diff)
• uvm.h (modified) (1 diff)
• vm.h (modified) (8 diffs)
• vm.mac (modified) (1 diff)
• vmapi.h (modified) (1 diff)

trunk/include/VBox/types.h

@@ -90 +90 @@
 /** Pointer to a ring-3 (user mode) VM structure. */
 typedef R3PTRTYPE(struct UVM *)     PUVM;
+
+/** Pointer to a ring-3 (user mode) VMCPU structure. */
+typedef R3PTRTYPE(struct UVMCPU *)  PUVMCPU;
 
 /** Virtual CPU ID. */

trunk/include/VBox/uvm.h

@@ -43 +43 @@
     /** Pointer to the UVM structure.  */
     PUVM                            pUVM;
+    /** Pointer to the VM structure.  */
+    PVM                             pVM;
+    /** Pointer to the VMCPU structure.  */
+    PVMCPU                          pVCpu;
     /** The virtual CPU ID.  */
     RTCPUID                         idCpu;

trunk/include/VBox/vm.h

@@ -86 +86 @@
     VMCPUSTATE volatile     enmState;
 
+    /** Pointer to the ring-3 UVMCPU structure. */
+    PUVMCPU                 pUVCpu;
     /** Ring-3 Host Context VM Pointer. */
     PVMR3                   pVMR3;
@@ -105 +107 @@
      *          following it (to grow into and align the struct size).
      *   */
-    uint32_t                au32Alignment[HC_ARCH_BITS == 32 ? 9 : 6];
+    uint32_t                au32Alignment[HC_ARCH_BITS == 32 ? 8 : 4];
 
     /** CPUM part. */
@@ -283 +285 @@
 #define VMCPU_FF_NORMAL_PRIORITY_POST_MASK      (VMCPU_FF_CSAM_SCAN_PAGE)
 
-/** Normal priority actions. */
+/** Normal priority VM actions. */
 #define VM_FF_NORMAL_PRIORITY_MASK              (VM_FF_REQUEST | VM_FF_PDM_QUEUES | VM_FF_PDM_DMA | VM_FF_REM_HANDLER_NOTIFY)
+/** Normal priority VMCPU actions. */
+#define VMCPU_FF_NORMAL_PRIORITY_MASK           (VMCPU_FF_REQUEST)
 
 /** Flags to clear before resuming guest execution. */
@@ -324 +328 @@
  * @param   fFlag   The flag to set.
  */
-#if 1 //def VBOX_WITH_SMP_GUESTS
-# define VMCPU_FF_SET(pVCpu, fFlag)    ASMAtomicOrU32(&(pVCpu)->fLocalForcedActions, (fFlag))
-#else
-# define VMCPU_FF_SET(pVCpu, fFlag)    ASMAtomicOrU32(&(pVCpu)->CTX_SUFF(pVM)->fGlobalForcedActions, (fFlag))
-#endif
+#define VMCPU_FF_SET(pVCpu, fFlag)    ASMAtomicOrU32(&(pVCpu)->fLocalForcedActions, (fFlag))
 
 /** @def VM_FF_CLEAR
@@ -351 +351 @@
  * @param   fFlag   The flag to clear.
  */
-#if 1 //def VBOX_WITH_SMP_GUESTS
-# define VMCPU_FF_CLEAR(pVCpu, fFlag)  ASMAtomicAndU32(&(pVCpu)->fLocalForcedActions, ~(fFlag))
-#else
-# define VMCPU_FF_CLEAR(pVCpu, fFlag)  ASMAtomicAndU32(&(pVCpu)->CTX_SUFF(pVM)->fGlobalForcedActions, ~(fFlag))
-#endif
+#define VMCPU_FF_CLEAR(pVCpu, fFlag)  ASMAtomicAndU32(&(pVCpu)->fLocalForcedActions, ~(fFlag))
 
 /** @def VM_FF_ISSET
@@ -371 +367 @@
  * @param   fFlag   The flag to check.
  */
-#if 1 //def VBOX_WITH_SMP_GUESTS
-# define VMCPU_FF_ISSET(pVCpu, fFlag)  (((pVCpu)->fLocalForcedActions & (fFlag)) == (fFlag))
-#else
-# define VMCPU_FF_ISSET(pVCpu, fFlag)  (((pVCpu)->CTX_SUFF(pVM)->fGlobalForcedActions & (fFlag)) == (fFlag))
-#endif
+#define VMCPU_FF_ISSET(pVCpu, fFlag)  (((pVCpu)->fLocalForcedActions & (fFlag)) == (fFlag))
 
 /** @def VM_FF_ISPENDING
@@ -391 +383 @@
  * @param   fFlags  The flags to check for.
  */
-#if 1 //def VBOX_WITH_SMP_GUESTS
-# define VMCPU_FF_ISPENDING(pVCpu, fFlags) ((pVCpu)->fLocalForcedActions & (fFlags))
-#else
-# define VMCPU_FF_ISPENDING(pVCpu, fFlags) ((pVCpu)->CTX_SUFF(pVM)->fGlobalForcedActions & (fFlags))
-#endif
+#define VMCPU_FF_ISPENDING(pVCpu, fFlags) ((pVCpu)->fLocalForcedActions & (fFlags))
 
 /** @def VM_FF_ISPENDING
@@ -415 +403 @@
  * @param   fExcpt  The flags that should not be set.
  */
-#if 1 //def VBOX_WITH_SMP_GUESTS
-# define VMCPU_FF_IS_PENDING_EXCEPT(pVCpu, fFlags, fExcpt) ( ((pVCpu)->fLocalForcedActions & (fFlags)) && !((pVCpu)->fLocalForcedActions & (fExcpt)) )
-#else
-# define VMCPU_FF_IS_PENDING_EXCEPT(pVCpu, fFlags, fExcpt) ( ((pVCpu)->CTX_SUFF(pVM)->fGlobalForcedActions & (fFlags)) && !((pVCpu)->CTX_SUFF(pVM)->fGlobalForcedActions & (fExcpt)) )
-#endif
+#define VMCPU_FF_IS_PENDING_EXCEPT(pVCpu, fFlags, fExcpt) ( ((pVCpu)->fLocalForcedActions & (fFlags)) && !((pVCpu)->fLocalForcedActions & (fExcpt)) )
 
 /** @def VM_IS_EMT

trunk/include/VBox/vm.mac

@@ -107 +107 @@
     .fLocalForcedActions resd 1
     .enmState            resd 1
+    .pUVCpu              RTR3PTR_RES 1
     .pVMR3               RTR3PTR_RES 1
     .pVMR0               RTR0PTR_RES 1

trunk/include/VBox/vmapi.h

@@ -434 +434 @@
 VMMR3DECL(int)  VMR3ReqWait(PVMREQ pReq, unsigned cMillies);
 VMMR3DECL(int)  VMR3ReqProcessU(PUVM pUVM, VMREQDEST enmDest);
-VMMR3DECL(void) VMR3NotifyFF(PVM pVM, bool fNotifiedREM);
-VMMR3DECL(void) VMR3NotifyFFU(PUVM pUVM, bool fNotifiedREM);
+VMMR3DECL(void) VMR3NotifyGlobalFF(PVM pVM, bool fNotifiedREM);
+VMMR3DECL(void) VMR3NotifyGlobalFFU(PUVM pUVM, bool fNotifiedREM);
+VMMR3DECL(void) VMR3NotifyCpuFF(PVMCPU pVCpu, bool fNotifiedREM);
+VMMR3DECL(void) VMR3NotifyCpuFFU(PUVMCPU pUVMCpu, bool fNotifiedREM);
 VMMR3DECL(int)  VMR3WaitHalted(PVM pVM, PVMCPU pVCpu, bool fIgnoreInterrupts);
-VMMR3DECL(int)  VMR3WaitU(PUVM pUVM);
+VMMR3DECL(int)  VMR3WaitU(PUVMCPU pUVMCpu);
 VMMR3DECL(RTCPUID)          VMR3GetVMCPUId(PVM pVM);
 VMMR3DECL(RTTHREAD)         VMR3GetVMCPUThread(PVM pVM);