Changeset 91265 in vbox

Timestamp:

Sep 15, 2021 8:46:11 PM (3 years ago)

Author:

vboxsync

Message:

VMM/HM: Moved various stats from the hyper heap and into the VM structure. bugref:10093

Location:

trunk

Files:

• include/VBox/vmm/vm.h (modified) (1 diff)
• include/VBox/vmm/vm.mac (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (4 diffs)
• src/VBox/VMM/VMMR3/HM.cpp (modified) (12 diffs)
• src/VBox/VMM/include/HMInternal.h (modified) (1 diff)

trunk/include/VBox/vmm/vm.h

@@ -183 +183 @@
         struct HMCPU    s;
 #endif
-        uint8_t             padding[5888];      /* multiple of 64 */
+        uint8_t             padding[9984];      /* multiple of 64 */
     } hm;
 

trunk/include/VBox/vmm/vm.mac

@@ -61 +61 @@
 
     alignb 64
-    .hm                     resb 5888
+    .hm                     resb 9984
     alignb 64
     .nem                    resb 512

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -56 +56 @@
             STAM_COUNTER_INC(&pVCpu->hm.s.StatExitReasonNpf); \
         else \
-            STAM_COUNTER_INC(&pVCpu->hm.s.paStatExitReasonR0[(u64ExitCode) & MASK_EXITREASON_STAT]); \
+            STAM_COUNTER_INC(&pVCpu->hm.s.aStatExitReason[(u64ExitCode) & MASK_EXITREASON_STAT]); \
         } while (0)
 
@@ -66 +66 @@
             STAM_COUNTER_INC(&pVCpu->hm.s.StatNestedExitReasonNpf); \
         else \
-            STAM_COUNTER_INC(&pVCpu->hm.s.paStatNestedExitReasonR0[(u64ExitCode) & MASK_EXITREASON_STAT]); \
+            STAM_COUNTER_INC(&pVCpu->hm.s.aStatNestedExitReason[(u64ExitCode) & MASK_EXITREASON_STAT]); \
         } while (0)
 # endif
@@ -3385 +3385 @@
     {
         Assert(pEvent->n.u8Vector <= X86_XCPT_LAST);
-        STAM_COUNTER_INC(&pVCpu->hm.s.paStatInjectedXcptsR0[pEvent->n.u8Vector]);
+        STAM_COUNTER_INC(&pVCpu->hm.s.aStatInjectedXcpts[pEvent->n.u8Vector]);
     }
     else
-        STAM_COUNTER_INC(&pVCpu->hm.s.paStatInjectedIrqsR0[pEvent->n.u8Vector & MASK_INJECT_IRQ_STAT]);
+        STAM_COUNTER_INC(&pVCpu->hm.s.aStatInjectedIrqs[pEvent->n.u8Vector & MASK_INJECT_IRQ_STAT]);
     RT_NOREF(pVCpu);
 

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -8847 +8847 @@
         Assert(uIntType != VMX_EXIT_INT_INFO_TYPE_NMI          || uVector == X86_XCPT_NMI);
         Assert(uIntType != VMX_EXIT_INT_INFO_TYPE_PRIV_SW_XCPT || uVector == X86_XCPT_DB);
-        STAM_COUNTER_INC(&pVCpu->hm.s.paStatInjectedXcptsR0[uVector]);
+        STAM_COUNTER_INC(&pVCpu->hm.s.aStatInjectedXcpts[uVector]);
     }
     else
-        STAM_COUNTER_INC(&pVCpu->hm.s.paStatInjectedIrqsR0[uVector & MASK_INJECT_IRQ_STAT]);
+        STAM_COUNTER_INC(&pVCpu->hm.s.aStatInjectedIrqs[uVector & MASK_INJECT_IRQ_STAT]);
 
     /*
@@ -11417 +11417 @@
         AssertMsg(VmxTransient.uExitReason <= VMX_EXIT_MAX, ("%#x\n", VmxTransient.uExitReason));
         STAM_COUNTER_INC(&pVCpu->hm.s.StatExitAll);
-        STAM_COUNTER_INC(&pVCpu->hm.s.paStatExitReasonR0[VmxTransient.uExitReason & MASK_EXITREASON_STAT]);
+        STAM_COUNTER_INC(&pVCpu->hm.s.aStatExitReason[VmxTransient.uExitReason & MASK_EXITREASON_STAT]);
         STAM_PROFILE_ADV_STOP_START(&pVCpu->hm.s.StatPreExit, &pVCpu->hm.s.StatExitHandling, x);
         HMVMX_START_EXIT_DISPATCH_PROF();
@@ -11530 +11530 @@
         STAM_COUNTER_INC(&pVCpu->hm.s.StatExitAll);
         STAM_COUNTER_INC(&pVCpu->hm.s.StatNestedExitAll);
-        STAM_COUNTER_INC(&pVCpu->hm.s.paStatNestedExitReasonR0[VmxTransient.uExitReason & MASK_EXITREASON_STAT]);
+        STAM_COUNTER_INC(&pVCpu->hm.s.aStatNestedExitReason[VmxTransient.uExitReason & MASK_EXITREASON_STAT]);
         STAM_PROFILE_ADV_STOP_START(&pVCpu->hm.s.StatPreExit, &pVCpu->hm.s.StatExitHandling, x);
         HMVMX_START_EXIT_DISPATCH_PROF();
@@ -12691 +12691 @@
         AssertMsg(VmxTransient.uExitReason <= VMX_EXIT_MAX, ("%#x\n", VmxTransient.uExitReason));
         STAM_COUNTER_INC(&pVCpu->hm.s.StatExitAll);
-        STAM_COUNTER_INC(&pVCpu->hm.s.paStatExitReasonR0[VmxTransient.uExitReason & MASK_EXITREASON_STAT]);
+        STAM_COUNTER_INC(&pVCpu->hm.s.aStatExitReason[VmxTransient.uExitReason & MASK_EXITREASON_STAT]);
         STAM_PROFILE_ADV_STOP_START(&pVCpu->hm.s.StatPreExit, &pVCpu->hm.s.StatExitHandling, x);
         HMVMX_START_EXIT_DISPATCH_PROF();

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

@@ -41 +41 @@
 #include <VBox/vmm/cpum.h>
 #include <VBox/vmm/stam.h>
-#include <VBox/vmm/mm.h>
 #include <VBox/vmm/em.h>
 #include <VBox/vmm/pdmapi.h>
@@ -886 +885 @@
          * Guest Exit reason stats.
          */
-        pHmCpu->paStatExitReason = NULL;
-        rc = MMHyperAlloc(pVM, MAX_EXITREASON_STAT * sizeof(*pHmCpu->paStatExitReason), 0 /* uAlignment */, MM_TAG_HM,
-                          (void **)&pHmCpu->paStatExitReason);
-        AssertRCReturn(rc, rc);
-
         if (fCpuSupportsVmx)
         {
@@ -898 +892 @@
                 if (pszExitName)
                 {
-                    rc = STAMR3RegisterF(pVM, &pHmCpu->paStatExitReason[j], STAMTYPE_COUNTER, STAMVISIBILITY_USED,
+                    rc = STAMR3RegisterF(pVM, &pHmCpu->aStatExitReason[j], STAMTYPE_COUNTER, STAMVISIBILITY_USED,
                                          STAMUNIT_OCCURENCES, pszExitName, "/HM/CPU%u/Exit/Reason/%02x", idCpu, j);
                     AssertRCReturn(rc, rc);
@@ -911 +905 @@
                 if (pszExitName)
                 {
-                    rc = STAMR3RegisterF(pVM, &pHmCpu->paStatExitReason[j], STAMTYPE_COUNTER, STAMVISIBILITY_USED,
+                    rc = STAMR3RegisterF(pVM, &pHmCpu->aStatExitReason[j], STAMTYPE_COUNTER, STAMVISIBILITY_USED,
                                          STAMUNIT_OCCURENCES, pszExitName, "/HM/CPU%u/Exit/Reason/%02x", idCpu, j);
                     AssertRC(rc);
@@ -919 +913 @@
         HM_REG_COUNTER(&pHmCpu->StatExitReasonNpf, "/HM/CPU%u/Exit/Reason/#NPF", "Nested page faults");
 
-        pHmCpu->paStatExitReasonR0 = MMHyperR3ToR0(pVM, pHmCpu->paStatExitReason);
-        Assert(pHmCpu->paStatExitReasonR0 != NIL_RTR0PTR);
-
 #if defined(VBOX_WITH_NESTED_HWVIRT_SVM) || defined(VBOX_WITH_NESTED_HWVIRT_VMX)
         /*
          * Nested-guest VM-exit reason stats.
          */
-        pHmCpu->paStatNestedExitReason = NULL;
-        rc = MMHyperAlloc(pVM, MAX_EXITREASON_STAT * sizeof(*pHmCpu->paStatNestedExitReason), 0 /* uAlignment */, MM_TAG_HM,
-                          (void **)&pHmCpu->paStatNestedExitReason);
-        AssertRCReturn(rc, rc);
         if (fCpuSupportsVmx)
         {
@@ -937 +924 @@
                 if (pszExitName)
                 {
-                    rc = STAMR3RegisterF(pVM, &pHmCpu->paStatNestedExitReason[j], STAMTYPE_COUNTER, STAMVISIBILITY_USED,
+                    rc = STAMR3RegisterF(pVM, &pHmCpu->aStatNestedExitReason, STAMTYPE_COUNTER, STAMVISIBILITY_USED,
                                          STAMUNIT_OCCURENCES, pszExitName, "/HM/CPU%u/Exit/NestedGuest/Reason/%02x", idCpu, j);
                     AssertRC(rc);
@@ -950 +937 @@
                 if (pszExitName)
                 {
-                    rc = STAMR3RegisterF(pVM, &pHmCpu->paStatNestedExitReason[j], STAMTYPE_COUNTER, STAMVISIBILITY_USED,
+                    rc = STAMR3RegisterF(pVM, &pHmCpu->aStatNestedExitReason[j], STAMTYPE_COUNTER, STAMVISIBILITY_USED,
                                          STAMUNIT_OCCURENCES, pszExitName, "/HM/CPU%u/Exit/NestedGuest/Reason/%02x", idCpu, j);
                     AssertRC(rc);
@@ -957 +944 @@
         }
         HM_REG_COUNTER(&pHmCpu->StatNestedExitReasonNpf, "/HM/CPU%u/Exit/NestedGuest/Reason/#NPF", "Nested page faults");
-        pHmCpu->paStatNestedExitReasonR0 = MMHyperR3ToR0(pVM, pHmCpu->paStatNestedExitReason);
-        Assert(pHmCpu->paStatNestedExitReasonR0 != NIL_RTR0PTR);
 #endif
 
@@ -964 +949 @@
          * Injected interrupts stats.
          */
-        {
-            uint32_t const cInterrupts = 0xff + 1;
-            rc = MMHyperAlloc(pVM, sizeof(STAMCOUNTER) * cInterrupts, 8, MM_TAG_HM, (void **)&pHmCpu->paStatInjectedIrqs);
-            AssertRCReturn(rc, rc);
-            pHmCpu->paStatInjectedIrqsR0 = MMHyperR3ToR0(pVM, pHmCpu->paStatInjectedIrqs);
-            Assert(pHmCpu->paStatInjectedIrqsR0 != NIL_RTR0PTR);
-            for (unsigned j = 0; j < cInterrupts; j++)
-            {
-                char aszIntrName[64];
-                RTStrPrintf(&aszIntrName[0], sizeof(aszIntrName),  "Interrupt %u", j);
-                rc = STAMR3RegisterF(pVM, &pHmCpu->paStatInjectedIrqs[j], STAMTYPE_COUNTER, STAMVISIBILITY_USED,
-                                     STAMUNIT_OCCURENCES, aszIntrName,
-                                     "/HM/CPU%u/EventInject/InjectIntr/%02X", idCpu, j);
-                AssertRC(rc);
-            }
+        char szDesc[64];
+        for (unsigned j = 0; j < RT_ELEMENTS(pHmCpu->aStatInjectedIrqs); j++)
+        {
+            RTStrPrintf(&szDesc[0], sizeof(szDesc),  "Interrupt %u", j);
+            rc = STAMR3RegisterF(pVM, &pHmCpu->aStatInjectedIrqs[j], STAMTYPE_COUNTER, STAMVISIBILITY_USED,
+                                 STAMUNIT_OCCURENCES, szDesc, "/HM/CPU%u/EventInject/InjectIntr/%02X", idCpu, j);
+            AssertRC(rc);
         }
 
@@ -984 +961 @@
          * Injected exception stats.
          */
-        {
-            uint32_t const cXcpts = X86_XCPT_LAST + 1;
-            rc = MMHyperAlloc(pVM, sizeof(STAMCOUNTER) * cXcpts, 8, MM_TAG_HM, (void **)&pHmCpu->paStatInjectedXcpts);
-            AssertRCReturn(rc, rc);
-            pHmCpu->paStatInjectedXcptsR0 = MMHyperR3ToR0(pVM, pHmCpu->paStatInjectedXcpts);
-            Assert(pHmCpu->paStatInjectedXcptsR0 != NIL_RTR0PTR);
-            for (unsigned j = 0; j < cXcpts; j++)
-            {
-                char aszXcptName[64];
-                RTStrPrintf(&aszXcptName[0], sizeof(aszXcptName),  "%s exception", hmR3GetXcptName(j));
-                rc = STAMR3RegisterF(pVM, &pHmCpu->paStatInjectedXcpts[j], STAMTYPE_COUNTER, STAMVISIBILITY_USED,
-                                     STAMUNIT_OCCURENCES, aszXcptName,
-                                     "/HM/CPU%u/EventInject/InjectXcpt/%02X", idCpu, j);
-                AssertRC(rc);
-            }
+        for (unsigned j = 0; j < RT_ELEMENTS(pHmCpu->aStatInjectedXcpts); j++)
+        {
+            RTStrPrintf(&szDesc[0], sizeof(szDesc),  "%s exception", hmR3GetXcptName(j));
+            rc = STAMR3RegisterF(pVM, &pHmCpu->aStatInjectedXcpts[j], STAMTYPE_COUNTER, STAMVISIBILITY_USED,
+                                 STAMUNIT_OCCURENCES, szDesc, "/HM/CPU%u/EventInject/InjectXcpt/%02X", idCpu, j);
+            AssertRC(rc);
         }
 
@@ -1946 +1914 @@
 VMMR3_INT_DECL(void) HMR3Relocate(PVM pVM)
 {
-    Log(("HMR3Relocate to %RGv\n", MMHyperGetArea(pVM, 0)));
-
     /* Fetch the current paging mode during the relocate callback during state loading. */
     if (VMR3GetState(pVM) == VMSTATE_LOADING)
@@ -1989 +1955 @@
 static int hmR3TermCPU(PVM pVM)
 {
-#ifdef VBOX_WITH_STATISTICS
-    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
-    {
-        PVMCPU pVCpu = pVM->apCpusR3[idCpu]; NOREF(pVCpu);
-        if (pVCpu->hm.s.paStatExitReason)
-        {
-            MMHyperFree(pVM, pVCpu->hm.s.paStatExitReason);
-            pVCpu->hm.s.paStatExitReason   = NULL;
-            pVCpu->hm.s.paStatExitReasonR0 = NIL_RTR0PTR;
-        }
-        if (pVCpu->hm.s.paStatInjectedIrqs)
-        {
-            MMHyperFree(pVM, pVCpu->hm.s.paStatInjectedIrqs);
-            pVCpu->hm.s.paStatInjectedIrqs   = NULL;
-            pVCpu->hm.s.paStatInjectedIrqsR0 = NIL_RTR0PTR;
-        }
-        if (pVCpu->hm.s.paStatInjectedXcpts)
-        {
-            MMHyperFree(pVM, pVCpu->hm.s.paStatInjectedXcpts);
-            pVCpu->hm.s.paStatInjectedXcpts   = NULL;
-            pVCpu->hm.s.paStatInjectedXcptsR0 = NIL_RTR0PTR;
-        }
-# if defined(VBOX_WITH_NESTED_HWVIRT_SVM) || defined(VBOX_WITH_NESTED_HWVIRT_VMX)
-        if (pVCpu->hm.s.paStatNestedExitReason)
-        {
-            MMHyperFree(pVM, pVCpu->hm.s.paStatNestedExitReason);
-            pVCpu->hm.s.paStatNestedExitReason   = NULL;
-            pVCpu->hm.s.paStatNestedExitReasonR0 = NIL_RTR0PTR;
-        }
-# endif
-    }
-#else
     RT_NOREF(pVM);
-#endif
     return VINF_SUCCESS;
 }

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

@@ -1328 +1328 @@
 
 #ifdef VBOX_WITH_STATISTICS
-    R3PTRTYPE(PSTAMCOUNTER) paStatExitReason;
-    R0PTRTYPE(PSTAMCOUNTER) paStatExitReasonR0;
-    R3PTRTYPE(PSTAMCOUNTER) paStatInjectedIrqs;
-    R0PTRTYPE(PSTAMCOUNTER) paStatInjectedIrqsR0;
-    R3PTRTYPE(PSTAMCOUNTER) paStatInjectedXcpts;
-    R0PTRTYPE(PSTAMCOUNTER) paStatInjectedXcptsR0;
-    R3PTRTYPE(PSTAMCOUNTER) paStatNestedExitReason;
-    R0PTRTYPE(PSTAMCOUNTER) paStatNestedExitReasonR0;
+    STAMCOUNTER             aStatExitReason[MAX_EXITREASON_STAT];
+    STAMCOUNTER             aStatNestedExitReason[MAX_EXITREASON_STAT];
+    STAMCOUNTER             aStatInjectedIrqs[256];
+    STAMCOUNTER             aStatInjectedXcpts[X86_XCPT_LAST + 1];
 #endif
 #ifdef HM_PROFILE_EXIT_DISPATCH