Changeset 71344 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

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

Author:

vboxsync

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

121295

Message:

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

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (3 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));