Changeset 79625 in vbox

Timestamp:

Jul 9, 2019 4:41:50 AM (5 years ago)

Author:

vboxsync

Message:

VMM/HMSVMR0: Added missing StatInjectPendingInterpret and newly added StatInjectPendingNPF.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (3 diffs)

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

@@ -7218 +7218 @@
          */
         if (pVCpu->hm.s.Event.fPending)
+        {
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectPendingInterpret);
             return VINF_EM_RAW_INJECT_TRPM_EVENT;
+        }
 
         HMSVM_CPUMCTX_IMPORT_STATE(pVCpu, CPUMCTX_EXTRN_CS | CPUMCTX_EXTRN_RIP);
@@ -7270 +7273 @@
     }
 
+    /*
+     * Nested page-fault.
+     */
     TRPMAssertXcptPF(pVCpu, GCPhysFaultAddr, u32ErrCode);
     int rc = PGMR0Trap0eHandlerNestedPaging(pVM, pVCpu, enmNestedPagingMode, u32ErrCode, CPUMCTX2CORE(pCtx), GCPhysFaultAddr);
@@ -7287 +7293 @@
         rc = VINF_SUCCESS;
     }
+
+    /*
+     * If delivering an event causes an #NPF (and not MMIO), we shall resolve the fault and
+     * re-inject the original event.
+     */
+    if (pVCpu->hm.s.Event.fPending)
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectPendingNPF);
 
     return rc;