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

Timestamp:

Feb 18, 2021 6:38:24 PM (4 years ago)

Author:

vboxsync

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

142852

Message:

VMM/TM: Moved the timers off the hyper heap. Replaced the relative offset addressing with queue array indexing. bugref:9943

Location:

trunk/include/VBox/vmm

Files:

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

trunk/include/VBox/vmm/gvm.h

@@ -255 +255 @@
     } dbgfr0;
 
+    union
+    {
+#if defined(VMM_INCLUDED_SRC_include_TMInternal_h) && defined(IN_RING0)
+        TMR0PERVM           s;
+#endif
+        uint8_t             padding[128];
+    } tmr0;
+
     /** Padding so aCpus starts on a page boundrary.  */
 #ifdef VBOX_WITH_NEM_R0
-    uint8_t         abPadding2[4096*2 - 64 - 256 - 256 - 1024 - 256 - 64 - 2176 - 640 - 512 - 64 - 1024 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
+    uint8_t         abPadding2[4096*2 - 64 - 256 - 256 - 1024 - 256 - 64 - 2176 - 640 - 512 - 64 - 1024 - 128 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
 #else
-    uint8_t         abPadding2[4096*2 - 64 - 256 - 256 - 1024       - 64 - 2176 - 640 - 512 - 64 - 1024 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
+    uint8_t         abPadding2[4096*2 - 64 - 256 - 256 - 1024       - 64 - 2176 - 640 - 512 - 64 - 1024 - 128 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
 #endif
 

trunk/include/VBox/vmm/gvm.mac

@@ -82 +82 @@
         alignb 64
         .dbgfr0             resb 1024
+        alignb 64
+        .tmr0               resb 128
 
         times ((($ + VMM_MAX_CPU_COUNT * RTR0PTR_CB + 4095) & ~4095) - ($ + VMM_MAX_CPU_COUNT * RTR0PTR_CB)) resb 1

trunk/include/VBox/vmm/tm.h

@@ -262 +262 @@
 
 
-#ifdef IN_RING3
 /** @defgroup grp_tm_r3     The TM Host Context Ring-3 API
  * @{
@@ -296 +295 @@
 VMMR3_INT_DECL(bool)    TMR3CpuTickIsFixedRateMonotonic(PVM pVM, bool fWithParavirtEnabled);
 /** @} */
-#endif /* IN_RING3 */
+
+
+/** @defgroup grp_tm_r0     The TM Host Context Ring-0 API
+ * @{
+ */
+VMMR0_INT_DECL(void)    TMR0InitPerVMData(PGVM pGVM);
+VMMR0_INT_DECL(void)    TMR0CleanupVM(PGVM pGVM);
+VMMR0_INT_DECL(int)     TMR0TimerQueueGrow(PGVM pGVM, uint32_t idxQueue, uint32_t cMinTimers);
+/** @} */
 
 

trunk/include/VBox/vmm/vm.h

@@ -1364 +1364 @@
         struct TM   s;
 #endif
-        uint8_t     padding[7872];      /* multiple of 64 */
+        uint8_t     padding[9152];      /* multiple of 64 */
     } tm;
 
@@ -1463 +1463 @@
 
     /** Padding for aligning the structure size on a page boundrary. */
-    uint8_t         abAlignment2[3672 - sizeof(PVMCPUR3) * VMM_MAX_CPU_COUNT];
+    uint8_t         abAlignment2[2392 - sizeof(PVMCPUR3) * VMM_MAX_CPU_COUNT];
 
     /* ---- end small stuff ---- */

trunk/include/VBox/vmm/vm.mac

@@ -131 +131 @@
     .em                     resb 256
     .nem                    resb 128
-    .tm                     resb 7872
+    .tm                     resb 9152
     .dbgf                   resb 2432
     .ssm                    resb 128

trunk/include/VBox/vmm/vmm.h

@@ -424 +424 @@
     VMMR0_DO_IOM_SYNC_STATS_INDICES,
 
-    /** Official call we use for testing Ring-0 APIs. */
-    VMMR0_DO_TESTS = 704,
-
     /** Call DBGFR0TraceCreateReqHandler. */
-    VMMR0_DO_DBGF_TRACER_CREATE = 710,
+    VMMR0_DO_DBGF_TRACER_CREATE = 704,
     /** Call DBGFR0TraceCallReqHandler. */
     VMMR0_DO_DBGF_TRACER_CALL_REQ_HANDLER,
@@ -439 +436 @@
     /** Call DBGFR0BpOwnerInitReqHandler(). */
     VMMR0_DO_DBGF_BP_OWNER_INIT,
+
+    /** Grow a timer queue. */
+    VMMR0_DO_TM_GROW_TIMER_QUEUE = 768,
+
+    /** Official call we use for testing Ring-0 APIs. */
+    VMMR0_DO_TESTS = 2048,
 
     /** The usual 32-bit type blow up. */