Changeset 71344 in vbox

Timestamp:

Mar 15, 2018 9:15:57 AM (7 years ago)

Author:

vboxsync

Message:

VMM/HM: Add nested-guest exit reason stat array for SVM R0 execution.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMSVMR0.cpp (modified) (3 diffs)
• VMMR3/HM.cpp (modified) (2 diffs)
• include/HMInternal.h (modified) (2 diffs)

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

@@ -58 +58 @@
             STAM_COUNTER_INC(&pVCpu->hm.s.paStatExitReasonR0[(u64ExitCode) & MASK_EXITREASON_STAT]); \
         } while (0)
+
+# ifdef VBOX_WITH_NESTED_HWVIRT
+#  define HMSVM_NESTED_EXITCODE_STAM_COUNTER_INC(u64ExitCode) do { \
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatExitAll); \
+        if ((u64ExitCode) == SVM_EXIT_NPF) \
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatNestedExitReasonNpf); \
+        else \
+            STAM_COUNTER_INC(&pVCpu->hm.s.paStatNestedExitReasonR0[(u64ExitCode) & MASK_EXITREASON_STAT]); \
+        } while (0)
+# endif
 #else
-# define HMSVM_EXITCODE_STAM_COUNTER_INC(u64ExitCode) do { } while (0)
-#endif
+# define HMSVM_EXITCODE_STAM_COUNTER_INC(u64ExitCode)           do { } while (0)
+# ifdef VBOX_WITH_NESTED_HWVIRT
+#  define HMSVM_NESTED_EXITCODE_STAM_COUNTER_INC(u64ExitCode)   do { } while (0)
+# endif
+#endif /* !VBOX_WITH_STATISTICS */
+
 
 /** If we decide to use a function table approach this can be useful to
@@ -2538 +2552 @@
      * Guest Virtual GIF (Global Interrupt Flag).
      */
-    if (   pVmcb->ctrl.IntCtrl.n.u1VGifEnable == 1
-        && !CPUMIsGuestInSvmNestedHwVirtMode(pMixedCtx))
+    if (pVmcb->ctrl.IntCtrl.n.u1VGifEnable == 1)
     {
         Assert(pVCpu->CTX_SUFF(pVM)->hm.s.svm.fVGif);
+        Assert(!CPUMIsGuestInSvmNestedHwVirtMode(pMixedCtx));
         pMixedCtx->hwvirt.fGif = pVmcb->ctrl.IntCtrl.n.u1VGif;
     }
@@ -4879 +4893 @@
 
         /* Handle the #VMEXIT. */
-        HMSVM_EXITCODE_STAM_COUNTER_INC(SvmTransient.u64ExitCode);
+        HMSVM_NESTED_EXITCODE_STAM_COUNTER_INC(SvmTransient.u64ExitCode);
         STAM_PROFILE_ADV_STOP_START(&pVCpu->hm.s.StatExit1, &pVCpu->hm.s.StatExit2, x);
         VBOXVMM_R0_HMSVM_VMEXIT(pVCpu, pCtx, SvmTransient.u64ExitCode, pCtx->hwvirt.svm.CTX_SUFF(pVmcb));

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

@@ -1043 +1043 @@
 #undef HM_REG_COUNTER
 
+        const char *const *papszDesc = ASMIsIntelCpu() || ASMIsViaCentaurCpu() ? &g_apszVTxExitReasons[0]
+                                                                               : &g_apszAmdVExitReasons[0];
+
+        /*
+         * Guest Exit reason stats.
+         */
         pVCpu->hm.s.paStatExitReason = NULL;
-
         rc = MMHyperAlloc(pVM, MAX_EXITREASON_STAT * sizeof(*pVCpu->hm.s.paStatExitReason), 0 /* uAlignment */, MM_TAG_HM,
                           (void **)&pVCpu->hm.s.paStatExitReason);
-        AssertRC(rc);
-        if (RT_SUCCESS(rc))
-        {
-            const char *const *papszDesc = ASMIsIntelCpu() || ASMIsViaCentaurCpu() ?
-                                           &g_apszVTxExitReasons[0] : &g_apszAmdVExitReasons[0];
-            for (int j = 0; j < MAX_EXITREASON_STAT; j++)
+        AssertRCReturn(rc, rc);
+        for (int j = 0; j < MAX_EXITREASON_STAT; j++)
+        {
+            if (papszDesc[j])
             {
-                if (papszDesc[j])
-                {
-                    rc = STAMR3RegisterF(pVM, &pVCpu->hm.s.paStatExitReason[j], STAMTYPE_COUNTER, STAMVISIBILITY_USED,
-                                         STAMUNIT_OCCURENCES, papszDesc[j], "/HM/CPU%d/Exit/Reason/%02x", i, j);
-                    AssertRC(rc);
-                }
+                rc = STAMR3RegisterF(pVM, &pVCpu->hm.s.paStatExitReason[j], STAMTYPE_COUNTER, STAMVISIBILITY_USED,
+                                     STAMUNIT_OCCURENCES, papszDesc[j], "/HM/CPU%d/Exit/Reason/%02x", i, j);
+                AssertRCReturn(rc, rc);
             }
-            rc = STAMR3RegisterF(pVM, &pVCpu->hm.s.StatExitReasonNpf, STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES,
-                                 "Nested page fault", "/HM/CPU%d/Exit/Reason/#NPF", i);
-            AssertRC(rc);
-        }
+        }
+        rc = STAMR3RegisterF(pVM, &pVCpu->hm.s.StatExitReasonNpf, STAMTYPE_COUNTER, STAMVISIBILITY_USED, STAMUNIT_OCCURENCES,
+                             "Nested page fault", "/HM/CPU%d/Exit/Reason/#NPF", i);
+        AssertRCReturn(rc, rc);
         pVCpu->hm.s.paStatExitReasonR0 = MMHyperR3ToR0(pVM, pVCpu->hm.s.paStatExitReason);
 # ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
@@ -1072 +1072 @@
 # endif
 
+#ifdef VBOX_WITH_NESTED_HWVIRT
+        /*
+         * Nested-guest Exit reason stats.
+         */
+        pVCpu->hm.s.paStatNestedExitReason = NULL;
+        rc = MMHyperAlloc(pVM, MAX_EXITREASON_STAT * sizeof(*pVCpu->hm.s.paStatNestedExitReason), 0 /* uAlignment */, MM_TAG_HM,
+                          (void **)&pVCpu->hm.s.paStatNestedExitReason);
+        AssertRCReturn(rc, rc);
+        for (int j = 0; j < MAX_EXITREASON_STAT; j++)
+        {
+            if (papszDesc[j])
+            {
+                rc = STAMR3RegisterF(pVM, &pVCpu->hm.s.paStatNestedExitReason[j], STAMTYPE_COUNTER, STAMVISIBILITY_USED,
+                                     STAMUNIT_OCCURENCES, papszDesc[j], "/HM/CPU%d/NestedExit/Reason/%02x", i, j);
+                AssertRC(rc);
+            }
+        }
+        rc = STAMR3RegisterF(pVM, &pVCpu->hm.s.StatNestedExitReasonNpf, STAMTYPE_COUNTER, STAMVISIBILITY_USED,
+                             STAMUNIT_OCCURENCES, "Nested page fault", "/HM/CPU%d/NestedExit/Reason/#NPF", i);
+        AssertRCReturn(rc, rc);
+        pVCpu->hm.s.paStatNestedExitReasonR0 = MMHyperR3ToR0(pVM, pVCpu->hm.s.paStatNestedExitReason);
+# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
+        Assert(pVCpu->hm.s.paStatNestedExitReasonR0 != NIL_RTR0PTR || !HMIsEnabled(pVM));
+# else
+        Assert(pVCpu->hm.s.paStatNestedExitReasonR0 != NIL_RTR0PTR);
+# endif
+#endif
+
+        /*
+         * Injected events stats.
+         */
         rc = MMHyperAlloc(pVM, sizeof(STAMCOUNTER) * 256, 8, MM_TAG_HM, (void **)&pVCpu->hm.s.paStatInjectedIrqs);
         AssertRCReturn(rc, rc);

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

@@ -1095 +1095 @@
     STAMCOUNTER             StatVmxCheckPmOk;
 
+    STAMCOUNTER             StatNestedExitReasonNpf;
+
 #if HC_ARCH_BITS == 32 && defined(VBOX_ENABLE_64_BITS_GUESTS)
     STAMCOUNTER             StatFpu64SwitchBack;
@@ -1105 +1107 @@
     R3PTRTYPE(PSTAMCOUNTER) paStatInjectedIrqs;
     R0PTRTYPE(PSTAMCOUNTER) paStatInjectedIrqsR0;
+    R3PTRTYPE(PSTAMCOUNTER) paStatNestedExitReason;
+    R0PTRTYPE(PSTAMCOUNTER) paStatNestedExitReasonR0;
 #endif
 #ifdef HM_PROFILE_EXIT_DISPATCH