Changeset 87777 in vbox

Timestamp:

Feb 17, 2021 1:48:25 PM (4 years ago)

Author:

vboxsync

Message:

VMM/TRPM: Reduced the VM structure footprint by > 3K and eliminated a hyper heap allocation. bugref:9517

Location:

trunk

Files:

• include/VBox/vmm/vm.h (modified) (2 diffs)
• include/VBox/vmm/vm.mac (modified) (2 diffs)
• src/VBox/VMM/VMMR3/TRPM.cpp (modified) (2 diffs)
• src/VBox/VMM/include/TRPMInternal.h (modified) (1 diff)

trunk/include/VBox/vmm/vm.h

@@ -1301 +1301 @@
         struct TRPM s;
 #endif
-        uint8_t     padding[5248];      /* multiple of 64 */
+        uint8_t     padding[2048];      /* multiple of 64 */
     } trpm;
 
@@ -1463 +1463 @@
 
     /** Padding for aligning the structure size on a page boundrary. */
-    uint8_t         abAlignment2[4568 - sizeof(PVMCPUR3) * VMM_MAX_CPU_COUNT];
+    uint8_t         abAlignment2[3672 - sizeof(PVMCPUR3) * VMM_MAX_CPU_COUNT];
 
     /* ---- end small stuff ---- */

trunk/include/VBox/vmm/vm.mac

@@ -124 +124 @@
     .pgm                    resb 21120
     .hm                     resb 5504
-    .trpm                   resb 5248
+    .trpm                   resb 2048
     .selm                   resb 768
     .mm                     resb 192
@@ -140 +140 @@
     .R0Stats                resb 64
 
-    .abAlignment2           resb 4568 - RTR0PTR_CB * VMM_MAX_CPU_COUNT
-
-    alignb RTR0PTR_CB * VMM_MAX_CPU_COUNT ; ASSUMES VMM_MAX_CPU_COUNT is a power of two.
+    times ((($ + VMM_MAX_CPU_COUNT * RTR0PTR_CB + 4095) & ~4095) - ($ + VMM_MAX_CPU_COUNT * RTR0PTR_CB)) resb 1
     .apCpusR3               RTR3PTR_RES VMM_MAX_CPU_COUNT
     alignb 4096

trunk/src/VBox/VMM/VMMR3/TRPM.cpp

@@ -162 +162 @@
      * Statistics.
      */
-#ifdef VBOX_WITH_STATISTICS
-    rc = MMHyperAlloc(pVM, sizeof(STAMCOUNTER) * 256, sizeof(STAMCOUNTER), MM_TAG_TRPM, (void **)&pVM->trpm.s.paStatForwardedIRQR3);
-    AssertRCReturn(rc, rc);
     for (unsigned i = 0; i < 256; i++)
-        STAMR3RegisterF(pVM, &pVM->trpm.s.paStatForwardedIRQR3[i], STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES, "Forwarded interrupts.",
-                        i < 0x20 ? "/TRPM/ForwardRaw/TRAP/%02X" : "/TRPM/ForwardRaw/IRQ/%02X", i);
-#endif
+        STAMR3RegisterF(pVM, &pVM->trpm.s.aStatForwardedIRQ[i], STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES,
+                        "Forwarded interrupts.", i < 0x20 ? "/TRPM/ForwardRaw/TRAP/%02X" : "/TRPM/ForwardRaw/IRQ/%02X", i);
 
     return 0;
@@ -399 +395 @@
                 return VBOXSTRICTRC_TODO(rcStrict);
         }
-        STAM_COUNTER_INC(&pVM->trpm.s.paStatForwardedIRQR3[u8Interrupt]);
+        STAM_COUNTER_INC(&pVM->trpm.s.aStatForwardedIRQ[u8Interrupt]);
     }
     else

trunk/src/VBox/VMM/include/TRPMInternal.h

@@ -45 +45 @@
 {
 #ifdef VBOX_WITH_STATISTICS
-    /** Statistics for interrupt handlers (allocated on the hypervisor heap) - R3
-     * pointer. */
-    R3PTRTYPE(PSTAMCOUNTER) paStatForwardedIRQR3;
+    /** Statistics for interrupt handlers. */
+    STAMCOUNTER             aStatForwardedIRQ[256];
+#else
+    uint64_t                uWhatever;
 #endif
-    uint64_t                u64Dummy;
 } TRPM;