Changeset 79880 in vbox

Timestamp:

Jul 19, 2019 10:08:07 AM (6 years ago)

Author:

vboxsync

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

132282

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Always intercept Mov DRx accesses for the nested-guests for now.

File:

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

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

@@ -6149 +6149 @@
         int rc = VMXWriteVmcs32(VMX_VMCS_GUEST_DR7, CPUMGetGuestDR7(pVCpu));
         AssertRCReturn(rc, rc);
+
+        /* Always intercept Mov DRx accesses for the nested-guest for now. */
+        pVmcsInfo->u32ProcCtls |= VMX_PROC_CTLS_MOV_DR_EXIT;
+        rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_PROC_EXEC, pVmcsInfo->u32ProcCtls);
+        AssertRCReturn(rc, rc);
         return VINF_SUCCESS;
     }
@@ -10911 +10916 @@
      */
     PVMXVMCSINFO pVmcsInfoNstGst = &pVCpu->hm.s.vmx.VmcsInfoNstGst;
-    RTHCPHYS HCPhysVirtApic;
-    uint32_t u32TprThreshold;
+    RTHCPHYS     HCPhysVirtApic;
+    uint32_t     u32TprThreshold;
     if (u32ProcCtls & VMX_PROC_CTLS_USE_TPR_SHADOW)
     {
@@ -16320 +16325 @@
 {
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
-
-    /* We should -not- get this VM-exit if the guest's debug registers were active. */
-    if (pVmxTransient->fWasGuestDebugStateActive)
-    {
-        AssertMsgFailed(("Unexpected MOV DRx exit\n"));
-        HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient->uExitReason);
-    }
-
     PVMXVMCSINFO pVmcsInfo = pVmxTransient->pVmcsInfo;
-    if (   !pVCpu->hm.s.fSingleInstruction
-        && !pVmxTransient->fWasHyperDebugStateActive)
-    {
-        Assert(!DBGFIsStepping(pVCpu));
-        Assert(pVmcsInfo->u32XcptBitmap & RT_BIT(X86_XCPT_DB));
-
-        /* Don't intercept MOV DRx any more. */
-        pVmcsInfo->u32ProcCtls &= ~VMX_PROC_CTLS_MOV_DR_EXIT;
-        int rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_PROC_EXEC, pVmcsInfo->u32ProcCtls);
-        AssertRCReturn(rc, rc);
-
-        /* We're playing with the host CPU state here, make sure we can't preempt or longjmp. */
-        VMMRZCallRing3Disable(pVCpu);
-        HM_DISABLE_PREEMPT(pVCpu);
-
-        /* Save the host & load the guest debug state, restart execution of the MOV DRx instruction. */
-        CPUMR0LoadGuestDebugState(pVCpu, true /* include DR6 */);
-        Assert(CPUMIsGuestDebugStateActive(pVCpu) || HC_ARCH_BITS == 32);
-
-        HM_RESTORE_PREEMPT();
-        VMMRZCallRing3Enable(pVCpu);
+
+    /* We might get this VM-exit if the nested-guest is not intercepting MOV DRx accesses. */
+    if (!pVmxTransient->fIsNestedGuest)
+    {
+        /* We should -not- get this VM-exit if the guest's debug registers were active. */
+        if (pVmxTransient->fWasGuestDebugStateActive)
+        {
+            AssertMsgFailed(("Unexpected MOV DRx exit\n"));
+            HMVMX_UNEXPECTED_EXIT_RET(pVCpu, pVmxTransient->uExitReason);
+        }
+
+        if (   !pVCpu->hm.s.fSingleInstruction
+            && !pVmxTransient->fWasHyperDebugStateActive)
+        {
+            Assert(!DBGFIsStepping(pVCpu));
+            Assert(pVmcsInfo->u32XcptBitmap & RT_BIT(X86_XCPT_DB));
+
+            /* Don't intercept MOV DRx any more. */
+            pVmcsInfo->u32ProcCtls &= ~VMX_PROC_CTLS_MOV_DR_EXIT;
+            int rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_PROC_EXEC, pVmcsInfo->u32ProcCtls);
+            AssertRCReturn(rc, rc);
+
+            /* We're playing with the host CPU state here, make sure we can't preempt or longjmp. */
+            VMMRZCallRing3Disable(pVCpu);
+            HM_DISABLE_PREEMPT(pVCpu);
+
+            /* Save the host & load the guest debug state, restart execution of the MOV DRx instruction. */
+            CPUMR0LoadGuestDebugState(pVCpu, true /* include DR6 */);
+            Assert(CPUMIsGuestDebugStateActive(pVCpu) || HC_ARCH_BITS == 32);
+
+            HM_RESTORE_PREEMPT();
+            VMMRZCallRing3Enable(pVCpu);
 
 #ifdef VBOX_WITH_STATISTICS
-        rc = hmR0VmxReadExitQualVmcs(pVCpu, pVmxTransient);
-        AssertRCReturn(rc, rc);
-        if (VMX_EXIT_QUAL_DRX_DIRECTION(pVmxTransient->uExitQual) == VMX_EXIT_QUAL_DRX_DIRECTION_WRITE)
-            STAM_COUNTER_INC(&pVCpu->hm.s.StatExitDRxWrite);
-        else
-            STAM_COUNTER_INC(&pVCpu->hm.s.StatExitDRxRead);
+            rc = hmR0VmxReadExitQualVmcs(pVCpu, pVmxTransient);
+            AssertRCReturn(rc, rc);
+            if (VMX_EXIT_QUAL_DRX_DIRECTION(pVmxTransient->uExitQual) == VMX_EXIT_QUAL_DRX_DIRECTION_WRITE)
+                STAM_COUNTER_INC(&pVCpu->hm.s.StatExitDRxWrite);
+            else
+                STAM_COUNTER_INC(&pVCpu->hm.s.StatExitDRxRead);
 #endif
-        STAM_COUNTER_INC(&pVCpu->hm.s.StatDRxContextSwitch);
-        return VINF_SUCCESS;
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatDRxContextSwitch);
+            return VINF_SUCCESS;
+        }
     }