Changeset 80274 in vbox for trunk/include

Timestamp:

Aug 14, 2019 2:34:38 PM (5 years ago)

Author:

vboxsync

Message:

VMM: Refactoring VMMR0/* and VMMRZ/* to use VMCC & VMMCPUCC. bugref:9217

Location:

trunk/include/VBox/vmm

Files:

• gvm.h (modified) (4 diffs)
• gvmm.h (modified) (2 diffs)
• vm.h (modified) (3 diffs)
• vmcc.h (modified) (3 diffs)
• vmm.h (modified) (2 diffs)

trunk/include/VBox/vmm/gvm.h

@@ -56 +56 @@
 
     /** VCPU id (0 - (pVM->cCpus - 1). */
-#ifdef VBOX_BUGREF_9217
-    VMCPUID         idCpuSafe;
-#else
     VMCPUID         idCpu;
-#endif
     /** Padding. */
     uint32_t        uPadding;
@@ -77 +73 @@
     /** Pointer to the GVM structure, for CTX_SUFF use in VMMAll code.  */
     PGVM            pVMR0;
+    /** The ring-3 address of this structure (only VMCPU part). */
+    PVMCPUR3        pVCpuR3;
 #endif
 
     /** Padding so gvmm starts on a 64 byte boundrary.
      * @note Keeping this working for 32-bit header syntax checking.  */
-#ifdef VBOX_BUGREF_9217
-    uint8_t         abPadding[HC_ARCH_BITS == 32 ? 44 : 32];
-#else
     uint8_t         abPadding[HC_ARCH_BITS == 32 ? 40 : 24];
-#endif
 
     /** The GVMM per vcpu data. */
@@ -158 +152 @@
     uint32_t        u32Magic;
     /** The global VM handle for this VM. */
-#ifdef VBOX_BUGREF_9217
-    uint32_t        hSelfSafe;
-#else
     uint32_t        hSelf;
-#endif
-#ifndef VBOX_BUGREF_9217
+#ifdef VBOX_BUGREF_9217
+    /** Pointer to this structure (for validation purposes). */
+    PGVM            pSelf;
+#else
     /** The ring-0 mapping of the VM structure. */
     PVM             pVM;
@@ -170 +163 @@
     PVMR3           pVMR3;
     /** The support driver session the VM is associated with. */
-#ifdef VBOX_BUGREF_9217
-    PSUPDRVSESSION  pSessionSafe;
-#else
     PSUPDRVSESSION  pSession;
-#endif
     /** Number of Virtual CPUs, i.e. how many entries there are in aCpus.
      * Same same as VM::cCpus. */
     uint32_t        cCpus;
     /** Padding so gvmm starts on a 64 byte boundrary.   */
-#ifdef VBOX_BUGREF_9217
-    uint8_t         abPadding[HC_ARCH_BITS == 32 ? 12 + 28 + 4 : 28 + 8];
-#else
     uint8_t         abPadding[HC_ARCH_BITS == 32 ? 12 + 28 : 28];
-#endif
 
     /** The GVMM per vm data. */

trunk/include/VBox/vmm/gvmm.h

@@ -162 +162 @@
 GVMMR0DECL(int)     GVMMR0QueryConfig(PSUPDRVSESSION pSession, const char *pszName, uint64_t *pu64Value);
 
-GVMMR0DECL(int)     GVMMR0CreateVM(PSUPDRVSESSION pSession, uint32_t cCpus, PVM *ppVM);
+GVMMR0DECL(int)     GVMMR0CreateVM(PSUPDRVSESSION pSession, uint32_t cCpus, PVMCC *ppVM);
 GVMMR0DECL(int)     GVMMR0InitVM(PGVM pGVM);
 GVMMR0DECL(void)    GVMMR0DoneInitVM(PGVM pGVM);
@@ -173 +173 @@
 GVMMR0DECL(int)     GVMMR0ValidateGVMandVM(PGVM pGVM, PVM pVM);
 GVMMR0DECL(int)     GVMMR0ValidateGVMandVMandEMT(PGVM pGVM, PVM pVM, VMCPUID idCpu);
-GVMMR0DECL(PVM)     GVMMR0GetVMByEMT(RTNATIVETHREAD hEMT);
+GVMMR0DECL(PVMCC)   GVMMR0GetVMByEMT(RTNATIVETHREAD hEMT);
 GVMMR0DECL(PGVMCPU) GVMMR0GetGVCpuByEMT(RTNATIVETHREAD hEMT);
 GVMMR0DECL(int)     GVMMR0SchedHalt(PGVM pGVM, PVM pVM, PGVMCPU pGVCpu, uint64_t u64ExpireGipTime);

trunk/include/VBox/vmm/vm.h

@@ -167 +167 @@
     /** The CPU ID.
      * This is the index into the VM::aCpu array. */
+#ifdef VBOX_BUGREF_9217
+    VMCPUID                 idCpuUnsafe;
+#else
     VMCPUID                 idCpu;
+#endif
 
     /** Align the structures below bit on a 64-byte boundary and make sure it starts
@@ -1156 +1160 @@
     R3PTRTYPE(PSUPPAGE)         paVMPagesR3;
     /** Session handle. For use when calling SUPR0 APIs. */
+#ifdef VBOX_BUGREF_9217
+    PSUPDRVSESSION              pSessionUnsafe;
+#else
     PSUPDRVSESSION              pSession;
+#endif
     /** Pointer to the ring-3 VM structure. */
     PUVM                        pUVM;
@@ -1173 +1181 @@
 
     /** The GVM VM handle. Only the GVM should modify this field. */
+#ifdef VBOX_BUGREF_9217
+    uint32_t                    hSelfUnsafe;
+#else
     uint32_t                    hSelf;
+#endif
     /** Number of virtual CPUs. */
 #if defined(VBOX_BUGREF_9217) && defined(IN_RING0)

trunk/include/VBox/vmm/vmcc.h

@@ -76 +76 @@
  * For enumerating VCpus in ascending order, avoiding unnecessary apCpusR0
  * access in ring-0, caching the CPU count and not checking for CPU \#0.
- * @note Close loop with VMCC_FOR_EACH_VMCPU_END. */
-/** @def VMCC_FOR_EACH_VMCPU_END
- * Ends a VMCC_FOR_EACH_VMCPU loop. */
+ *
+ * Defines local variables @c idCpu, @c pVCpu and @c cCpus.
+ *
+ * @param   a_pVM   The VM handle.
+ *
+ * @note    Close loop with VMCC_FOR_EACH_VMCPU_END.
+ */
 #define VMCC_FOR_EACH_VMCPU(a_pVM) \
-    { \
+    do { \
         VMCPUID         idCpu = 0; \
         VMCPUID const   cCpus = (a_pVM)->cCpus; \
@@ -86 +90 @@
         for (;;) \
         {
+
+/** @def VMCC_FOR_EACH_VMCPU_END
+ * Ends a VMCC_FOR_EACH_VMCPU loop.
+ * @param   a_pVM   The VM handle.
+ */
 #define VMCC_FOR_EACH_VMCPU_END(a_pVM) \
             /* advance */ \
@@ -92 +101 @@
             pVCpu = VMCC_GET_CPU(pVM, idCpu); \
         } \
-    } do { } while(0)
+    } while (0)
+
+/**
+ * Execute the given statement for each virtual CPU in an environment with
+ * @c pVCpu and @c idCpu variables.
+ *
+ * @param   a_pVM   The VM handle.
+ * @param   a_Stmt  The statement to execute.
+ */
+#define VMCC_FOR_EACH_VMCPU_STMT(a_pVM, a_Stmt) VMCC_FOR_EACH_VMCPU(pVM) { a_Stmt; } VMCC_FOR_EACH_VMCPU_END(pVM)
 
 #endif /* !VBOX_INCLUDED_vmm_vmcc_h */

trunk/include/VBox/vmm/vmm.h

@@ -100 +100 @@
  * @param   pvUser          The user argument.
  */
-typedef DECLCALLBACK(int) FNVMMR0CALLRING3NOTIFICATION(PVMCPU pVCpu, VMMCALLRING3 enmOperation, void *pvUser);
+typedef DECLCALLBACK(int) FNVMMR0CALLRING3NOTIFICATION(PVMCPUCC pVCpu, VMMCALLRING3 enmOperation, void *pvUser);
 /** Pointer to a FNRTMPNOTIFICATION(). */
 typedef FNVMMR0CALLRING3NOTIFICATION *PFNVMMR0CALLRING3NOTIFICATION;
@@ -530 +530 @@
  * @{
  */
-VMMRZDECL(int)      VMMRZCallRing3(PVM pVM, PVMCPU pVCpu, VMMCALLRING3 enmOperation, uint64_t uArg);
-VMMRZDECL(int)      VMMRZCallRing3NoCpu(PVM pVM, VMMCALLRING3 enmOperation, uint64_t uArg);
-VMMRZDECL(void)     VMMRZCallRing3Disable(PVMCPU pVCpu);
-VMMRZDECL(void)     VMMRZCallRing3Enable(PVMCPU pVCpu);
-VMMRZDECL(bool)     VMMRZCallRing3IsEnabled(PVMCPU pVCpu);
-VMMRZDECL(int)      VMMRZCallRing3SetNotification(PVMCPU pVCpu, R0PTRTYPE(PFNVMMR0CALLRING3NOTIFICATION) pfnCallback, RTR0PTR pvUser);
-VMMRZDECL(void)     VMMRZCallRing3RemoveNotification(PVMCPU pVCpu);
-VMMRZDECL(bool)     VMMRZCallRing3IsNotificationSet(PVMCPU pVCpu);
+VMMRZDECL(int)      VMMRZCallRing3(PVMCC pVMCC, PVMCPU pVCpu, VMMCALLRING3 enmOperation, uint64_t uArg);
+VMMRZDECL(int)      VMMRZCallRing3NoCpu(PVMCC pVM, VMMCALLRING3 enmOperation, uint64_t uArg);
+VMMRZDECL(void)     VMMRZCallRing3Disable(PVMCPUCC pVCpu);
+VMMRZDECL(void)     VMMRZCallRing3Enable(PVMCPUCC pVCpu);
+VMMRZDECL(bool)     VMMRZCallRing3IsEnabled(PVMCPUCC pVCpu);
+VMMRZDECL(int)      VMMRZCallRing3SetNotification(PVMCPUCC pVCpu, R0PTRTYPE(PFNVMMR0CALLRING3NOTIFICATION) pfnCallback, RTR0PTR pvUser);
+VMMRZDECL(void)     VMMRZCallRing3RemoveNotification(PVMCPUCC pVCpu);
+VMMRZDECL(bool)     VMMRZCallRing3IsNotificationSet(PVMCPUCC pVCpu);
 /** @} */
 #endif