Changeset 45732 in vbox

Timestamp:

Apr 25, 2013 2:39:46 PM (12 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Don't trash CR2 for VM-exits caused due to a #PF delivery when not intercepting #PFs (i.e. Nested Paging).

File:

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

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

@@ -4619 +4619 @@
         /* See Intel spec. 30.7.1.1 "Reflecting Exceptions to Guest Software". */
         VMXREFLECTXCPT enmReflect     = VMXREFLECTXCPT_NONE;
-        RTGCUINTPTR GCPtrFaultAddress = 0;
         if (uIntType == VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT)
         {
             enmReflect = VMXREFLECTXCPT_XCPT;
+#if 0
             if (   hmR0VmxIsContributoryXcpt(uIdtVector)
                 && uExitVector == X86_XCPT_PF)
             {
-                GCPtrFaultAddress = pMixedCtx->cr2;
                 Log(("IDT: Contributory #PF uCR2=%#RGv\n", pMixedCtx->cr2));
             }
-            else if (   uExitVector == X86_XCPT_PF
-                     && uIdtVector == X86_XCPT_PF)
+            else
+#endif
+            if (   uExitVector == X86_XCPT_PF
+                && uIdtVector == X86_XCPT_PF)
             {
                 pVmxTransient->fVectoringPF = true;
-                GCPtrFaultAddress = pMixedCtx->cr2;
                 Log(("IDT: Vectoring #PF uCR2=%#RGv\n", pMixedCtx->cr2));
             }
@@ -4668 +4668 @@
                     u32ErrCode = pVmxTransient->uIdtVectoringErrorCode;
                 }
+
+                /* If uExitVector is #PF, CR2 value will be updated from the VMCS if it's a guest #PF. See hmR0VmxExitXcptPF(). */
                 hmR0VmxSetPendingEvent(pVCpu, VMX_ENTRY_INTR_INFO_FROM_EXIT_IDT_INFO(pVmxTransient->uIdtVectoringInfo),
-                                       0 /* cbInstr */,  u32ErrCode, GCPtrFaultAddress);
+                                       0 /* cbInstr */,  u32ErrCode, pMixedCtx->cr2);
                 rc = VINF_SUCCESS;
                 Log(("IDT: Pending vectoring event %#RX64 Err=%#RX32\n", pVCpu->hm.s.Event.u64IntrInfo, pVCpu->hm.s.Event.u32ErrCode));