Changeset 90379 in vbox for trunk/include/VBox/vmm

Timestamp:

Jul 28, 2021 8:00:43 PM (3 years ago)

Author:

vboxsync

Message:

VMM: Implementing blocking on critical sections in ring-0 HM context (actual code is disabled). bugref:6695

Location:

trunk/include/VBox/vmm

Files:

• gvm.h (modified) (1 diff)
• gvm.mac (modified) (1 diff)
• vmm.h (modified) (2 diffs)

trunk/include/VBox/vmm/gvm.h

@@ -109 +109 @@
         struct VMMR0PERVCPU s;
 #endif
-        uint8_t             padding[64];
+        uint8_t             padding[128];
     } vmmr0;
 
     /** Padding the structure size to page boundrary. */
 #ifdef VBOX_WITH_NEM_R0
-    uint8_t                 abPadding2[4096 - 64 - 64 - 1024 - 64 - 64];
+    uint8_t                 abPadding2[4096 - 64 - 64 - 1024 - 64 - 128];
 #else
-    uint8_t                 abPadding2[4096 - 64 - 64 - 1024 - 64];
+    uint8_t                 abPadding2[4096 - 64 - 64 - 1024 - 128];
 #endif
 } GVMCPU;

trunk/include/VBox/vmm/gvm.mac

@@ -46 +46 @@
         .nemr0              resb 64
 %endif
+        alignb 64
+        .vmmr0              resb 128
         alignb 4096
 endstruc

trunk/include/VBox/vmm/vmm.h

@@ -473 +473 @@
 
 #if defined(IN_RING0) || defined(DOXYGEN_RUNNING)
+
+/**
+ * Structure VMMR0EmtPrepareToBlock uses to pass info to
+ * VMMR0EmtResumeAfterBlocking.
+ */
+typedef struct VMMR0EMTBLOCKCTX
+{
+    /** Magic value (VMMR0EMTBLOCKCTX_MAGIC). */
+    uint32_t    uMagic;
+    /** Set if we were in HM context, clear if not. */
+    bool        fWasInHmContext;
+} VMMR0EMTBLOCKCTX;
+/** Pointer to a VMMR0EmtPrepareToBlock context structure. */
+typedef VMMR0EMTBLOCKCTX *PVMMR0EMTBLOCKCTX;
+/** Magic value for VMMR0EMTBLOCKCTX::uMagic (Paul Desmond). */
+#define VMMR0EMTBLOCKCTX_MAGIC          UINT32_C(0x19261125)
+/** Magic value for VMMR0EMTBLOCKCTX::uMagic when its out of context. */
+#define VMMR0EMTBLOCKCTX_MAGIC_DEAD     UINT32_C(0x19770530)
+
 VMMR0DECL(void)      VMMR0EntryFast(PGVM pGVM, PVMCC pVM, VMCPUID idCpu, VMMR0OPERATION enmOperation);
 VMMR0DECL(int)       VMMR0EntryEx(PGVM pGVM, PVMCC pVM, VMCPUID idCpu, VMMR0OPERATION enmOperation,
                                   PSUPVMMR0REQHDR pReq, uint64_t u64Arg, PSUPDRVSESSION);
+VMMR0_INT_DECL(void) VMMR0InitPerVMData(PGVM pGVM);
 VMMR0_INT_DECL(int)  VMMR0TermVM(PGVM pGVM, VMCPUID idCpu);
 VMMR0_INT_DECL(bool) VMMR0IsLongJumpArmed(PVMCPUCC pVCpu);
@@ -483 +503 @@
 VMMR0_INT_DECL(void) VMMR0ThreadCtxHookDisable(PVMCPUCC pVCpu);
 VMMR0_INT_DECL(bool) VMMR0ThreadCtxHookIsEnabled(PVMCPUCC pVCpu);
+VMMR0_INT_DECL(int)  VMMR0EmtPrepareToBlock(PVMCPUCC pVCpu, int rcBusy, const char *pszCaller, void *pvLock,
+                                            PVMMR0EMTBLOCKCTX pCtx);
+VMMR0_INT_DECL(void) VMMR0EmtResumeAfterBlocking(PVMCPUCC pVCpu, PVMMR0EMTBLOCKCTX pCtx);
 VMMR0_INT_DECL(PRTLOGGER) VMMR0GetReleaseLogger(PVMCPUCC pVCpu);