Changeset 79626 in vbox for trunk/src/VBox/VMM

Timestamp:

Jul 9, 2019 4:43:00 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Add newly added StatInjectPendingNPF, comments.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (4 diffs)

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

@@ -14804 +14804 @@
     {
         if (rcStrict == VINF_HM_DOUBLE_FAULT)
+        {
+            Assert(pVCpu->hm.s.Event.fPending);
             rcStrict = VINF_SUCCESS;
+        }
         STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatExitXcptNmi, y3);
         return rcStrict;
@@ -16198 +16201 @@
     {
         if (rcStrict1 == VINF_HM_DOUBLE_FAULT)
+        {
+            Assert(pVCpu->hm.s.Event.fPending);
             rcStrict1 = VINF_SUCCESS;
+        }
         return rcStrict1;
     }
@@ -16361 +16367 @@
     {
         /*
-         * If event delivery causes an EPT misconfig (MMIO), go back to instruction emulation. Otherwise,
-         * injecting the original event would most likely cause the same EPT misconfig VM-exit again.
+         * In the unlikely case where delivering an event causes an EPT misconfig (MMIO), go back to
+         * instruction emulation to inject the original event. Otherwise, injecting the original event
+         * using hardware-assisted VMX would would trigger the same EPT misconfig VM-exit again.
          */
         if (RT_UNLIKELY(pVCpu->hm.s.Event.fPending))
@@ -16448 +16455 @@
     if (RT_LIKELY(rcStrict1 == VINF_SUCCESS))
     {
-        /* In the unlikely case that the EPT violation happened as a result of delivering an event, log it. */
-        if (RT_UNLIKELY(pVCpu->hm.s.Event.fPending))
-            Log4Func(("EPT violation with an event pending u64IntInfo=%#RX64\n", pVCpu->hm.s.Event.u64IntInfo));
+        /*
+         * If delivery of an event causes an EPT violation (true nested #PF and not MMIO),
+         * we shall resolve the nested #PF and re-inject the original event.
+         */
+        if (pVCpu->hm.s.Event.fPending)
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectPendingNPF);
     }
     else
     {
         if (rcStrict1 == VINF_HM_DOUBLE_FAULT)
+        {
+            Assert(pVCpu->hm.s.Event.fPending);
             rcStrict1 = VINF_SUCCESS;
+        }
         return rcStrict1;
     }