Changeset 27231 in vbox for trunk/src

Timestamp:

Mar 9, 2010 8:16:59 PM (15 years ago)

Author:

vboxsync

Message:

Implemented mwait extension for breaking on external interrupt when IF=0; completely untested

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (4 diffs)
• EMInternal.h (modified) (2 diffs)
• HWACCMInternal.h (modified) (1 diff)
• VMMAll/EMAll.cpp (modified) (6 diffs)
• VMMR0/HWSVMR0.cpp (modified) (5 diffs)
• VMMR0/HWVMXR0.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/EM.cpp

@@ -522 +522 @@
         rc = SSMR3PutU32(pSSM, pVCpu->em.s.enmPrevState);
         AssertRCReturn(rc, rc);
+
+        /* Save mwait state. */
+        rc = SSMR3PutU32(pSSM, pVCpu->em.s.mwait.fWait);
+        AssertRCReturn(rc, rc);
+        rc = SSMR3PutGCPtr(pSSM, pVCpu->em.s.mwait.uMWaitEAX);
+        AssertRCReturn(rc, rc);
+        rc = SSMR3PutGCPtr(pSSM, pVCpu->em.s.mwait.uMWaitECX);
+        AssertRCReturn(rc, rc);
+        rc = SSMR3PutGCPtr(pSSM, pVCpu->em.s.mwait.uMonitorEAX);
+        AssertRCReturn(rc, rc);
+        rc = SSMR3PutGCPtr(pSSM, pVCpu->em.s.mwait.uMonitorECX);
+        AssertRCReturn(rc, rc);
+        rc = SSMR3PutGCPtr(pSSM, pVCpu->em.s.mwait.uMonitorEDX);
+        AssertRCReturn(rc, rc);
     }
     return VINF_SUCCESS;
@@ -542 +556 @@
      */
     if (    uVersion != EM_SAVED_STATE_VERSION
+        &&  uVersion != EM_SAVED_STATE_VERSION_PRE_MWAIT
         &&  uVersion != EM_SAVED_STATE_VERSION_PRE_SMP)
     {
@@ -570 +585 @@
             pVCpu->em.s.enmState = EMSTATE_SUSPENDED;
         }
+        if (uVersion > EM_SAVED_STATE_VERSION_PRE_MWAIT)
+        {
+            /* Load mwait state. */
+            rc = SSMR3GetU32(pSSM, &pVCpu->em.s.mwait.fWait);
+            AssertRCReturn(rc, rc);
+            rc = SSMR3GetGCPtr(pSSM, &pVCpu->em.s.mwait.uMWaitEAX);
+            AssertRCReturn(rc, rc);
+            rc = SSMR3GetGCPtr(pSSM, &pVCpu->em.s.mwait.uMWaitECX);
+            AssertRCReturn(rc, rc);
+            rc = SSMR3GetGCPtr(pSSM, &pVCpu->em.s.mwait.uMonitorEAX);
+            AssertRCReturn(rc, rc);
+            rc = SSMR3GetGCPtr(pSSM, &pVCpu->em.s.mwait.uMonitorECX);
+            AssertRCReturn(rc, rc);
+            rc = SSMR3GetGCPtr(pSSM, &pVCpu->em.s.mwait.uMonitorEDX);
+            AssertRCReturn(rc, rc);
+        }
+
         Assert(!pVCpu->em.s.pCliStatTree);
     }
@@ -1969 +2001 @@
                 {
                     STAM_REL_PROFILE_START(&pVCpu->em.s.StatHalted, y);
-                    rc = VMR3WaitHalted(pVM, pVCpu, !(CPUMGetGuestEFlags(pVCpu) & X86_EFL_IF));
+                    if (pVCpu->em.s.mwait.fWait & EMMWAIT_FLAG_ACTIVE)
+                    {
+                        /* mwait has a special extension where it's woken up when an interrupt is pending even when IF=0. */
+                        rc = VMR3WaitHalted(pVM, pVCpu, !(pVCpu->em.s.mwait.fWait & EMMWAIT_FLAG_BREAKIRQIF0) && !(CPUMGetGuestEFlags(pVCpu) & X86_EFL_IF));
+                        pVCpu->em.s.mwait.fWait &= ~(EMMWAIT_FLAG_ACTIVE | EMMWAIT_FLAG_BREAKIRQIF0);
+                    }
+                    else
+                        rc = VMR3WaitHalted(pVM, pVCpu, !(CPUMGetGuestEFlags(pVCpu) & X86_EFL_IF));
+
                     STAM_REL_PROFILE_STOP(&pVCpu->em.s.StatHalted, y);
                     break;

trunk/src/VBox/VMM/EMInternal.h

@@ -43 +43 @@
 
 /** The saved state version. */
-#define EM_SAVED_STATE_VERSION                          3
+#define EM_SAVED_STATE_VERSION                          4
+#define EM_SAVED_STATE_VERSION_PRE_MWAIT                3
 #define EM_SAVED_STATE_VERSION_PRE_SMP                  2
+
+
+/** 
+ * MWait state flags. 
+ */
+/* MWait activated. */
+#define EMMWAIT_FLAG_ACTIVE             RT_BIT(0)
+/* MWait will continue when an interrupt is pending even when IF=0. */
+#define EMMWAIT_FLAG_BREAKIRQIF0        RT_BIT(1)
+/* Monitor instruction was executed previously. */
+#define EMMWAIT_FLAG_MONITOR_ACTIVE     RT_BIT(2)
+
 
 /**
@@ -336 +349 @@
 #endif
 
+    /* MWait halt state. */
+    struct
+    {
+        uint32_t            fWait;          /* type of mwait; see EMMWAIT_FLAG_* */
+        uint32_t            a32Padding[1];
+        RTGCPTR             uMWaitEAX;      /* mwait hints */
+        RTGCPTR             uMWaitECX;      /* mwait extensions */
+        RTGCPTR             uMonitorEAX;    /* monitored address. */
+        RTGCPTR             uMonitorECX;    /* monitor extension. */
+        RTGCPTR             uMonitorEDX;    /* monitor hint. */
+    } mwait;
+
     union
     {

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -818 +818 @@
     STAMCOUNTER             StatExitHlt;
     STAMCOUNTER             StatExitMwait;
+    STAMCOUNTER             StatExitMonitor;
     STAMCOUNTER             StatExitLMSW;
     STAMCOUNTER             StatExitIOWrite;

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -2718 +2718 @@
  * MONITOR Emulation.
  */
-static int emInterpretMonitor(PVM pVM, PVMCPU pVCpu, PDISCPUSTATE pDis, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
+VMMDECL(int) EMInterpretMonitor(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame)
 {
     uint32_t u32Dummy, u32ExtFeatures, cpl;
 
-    Assert(pDis->mode != CPUMODE_64BIT);    /** @todo check */
     if (pRegFrame->ecx != 0)
+    {
+        Log(("emInterpretMonitor: unexpected ecx=%x -> recompiler!!\n", pRegFrame->ecx));
         return VERR_EM_INTERPRETER; /* illegal value. */
+    }
 
     /* Get the current privilege level. */
@@ -2735 +2737 @@
         return VERR_EM_INTERPRETER; /* not supported */
 
+    pVCpu->em.s.mwait.uMonitorEAX = pRegFrame->rax;
+    pVCpu->em.s.mwait.uMonitorECX = pRegFrame->rcx;
+    pVCpu->em.s.mwait.uMonitorEDX = pRegFrame->rdx;
+    pVCpu->em.s.mwait.fWait |= EMMWAIT_FLAG_MONITOR_ACTIVE;
     return VINF_SUCCESS;
 }
 
+static int emInterpretMonitor(PVM pVM, PVMCPU pVCpu, PDISCPUSTATE pDis, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
+{
+    return EMInterpretMonitor(pVM, pVCpu, pRegFrame);
+}
+
 
 /**
@@ -2744 +2755 @@
 VMMDECL(int) EMInterpretMWait(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame)
 {
-    uint32_t u32Dummy, u32ExtFeatures, cpl;
-
-    /* @todo bit 1 is supposed to tell the cpu to wake us up on interrupts even if IF is cleared.
-     * Not sure which models. Intel docs say ecx and eax must be zero for Pentium 4 CPUs
-     * CPUID.05H.ECX[0] defines support for power management extensions (eax)
-     */
-    if (pRegFrame->ecx != 0)
-        return VERR_EM_INTERPRETER; /* illegal value. */
+    uint32_t u32Dummy, u32ExtFeatures, cpl, u32MWaitFeatures;
 
     /* Get the current privilege level. */
@@ -2762 +2766 @@
         return VERR_EM_INTERPRETER; /* not supported */
 
+    /* 
+     * CPUID.05H.ECX[0] defines support for power management extensions (eax)
+     * CPUID.05H.ECX[1] defines support for interrupts as break events for mwait even when IF=0
+     */
+    CPUMGetGuestCpuId(pVCpu, 5, &u32Dummy, &u32Dummy, &u32MWaitFeatures, &u32Dummy);
+    if (pRegFrame->ecx > 1)
+    {
+        Log(("EMInterpretMWait: unexpected ecx value %x -> recompiler\n", pRegFrame->ecx));
+        return VERR_EM_INTERPRETER; /* illegal value. */
+    }
+
+    if (pRegFrame->ecx)
+    {
+        if (!(u32MWaitFeatures & X86_CPUID_MWAIT_ECX_BREAKIRQIF0))
+        {
+            Log(("EMInterpretMWait: unsupported X86_CPUID_MWAIT_ECX_BREAKIRQIF0 -> recompiler\n"));
+            return VERR_EM_INTERPRETER; /* illegal value. */
+        }
+
+        pVCpu->em.s.mwait.fWait = EMMWAIT_FLAG_ACTIVE | EMMWAIT_FLAG_BREAKIRQIF0;
+    }
+    else
+        pVCpu->em.s.mwait.fWait = EMMWAIT_FLAG_ACTIVE;
+
+    pVCpu->em.s.mwait.uMWaitEAX = pRegFrame->rax;
+    pVCpu->em.s.mwait.uMWaitECX = pRegFrame->rcx;
+
     /** @todo not completely correct */
     return VINF_EM_HALT;
@@ -2768 +2799 @@
 static int emInterpretMWait(PVM pVM, PVMCPU pVCpu, PDISCPUSTATE pDis, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
 {
-    Assert(pDis->mode != CPUMODE_64BIT);    /** @todo check */
-
     return EMInterpretMWait(pVM, pVCpu, pRegFrame);
 }
@@ -3500 +3529 @@
 }
 
+/**
+ * Determine if we should continue after encountering a hlt or mwait instruction
+ *
+ * @returns boolean
+ * @param   pVCpu           The VMCPU to operate on.
+ * @param   pCtx            Current CPU context
+ */
+VMMDECL(bool) EMShouldContinueAfterHalt(PVMCPU pVCpu, PCPUMCTX pCtx)
+{
+    if (    pCtx->eflags.Bits.u1IF
+        ||  ((pVCpu->em.s.mwait.fWait & (EMMWAIT_FLAG_ACTIVE | EMMWAIT_FLAG_BREAKIRQIF0)) == (EMMWAIT_FLAG_ACTIVE | EMMWAIT_FLAG_BREAKIRQIF0)))
+    {
+        pVCpu->em.s.mwait.fWait &= ~(EMMWAIT_FLAG_ACTIVE | EMMWAIT_FLAG_BREAKIRQIF0);
+        return !!VMCPU_FF_ISPENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC|VMCPU_FF_INTERRUPT_PIC));
+    }
+
+    return false;
+}
+

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

@@ -344 +344 @@
                                         | SVM_CTRL2_INTERCEPT_SKINIT
                                         | SVM_CTRL2_INTERCEPT_WBINVD
+                                        | SVM_CTRL2_INTERCEPT_MONITOR
                                         | SVM_CTRL2_INTERCEPT_MWAIT_UNCOND; /* don't execute mwait or else we'll idle inside the guest (host thinks the cpu load is high) */
                                         ;
@@ -2349 +2350 @@
         STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitHlt);
         pCtx->rip++;    /* skip hlt */
-        if (    pCtx->eflags.Bits.u1IF
-            &&  VMCPU_FF_ISPENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC|VMCPU_FF_INTERRUPT_PIC)))
+        if (EMShouldContinueAfterHalt(pVCpu, pCtx))
             goto ResumeExecution;
 
@@ -2369 +2369 @@
             if (    rc == VINF_SUCCESS
                 ||  (   rc == VINF_EM_HALT
-                     && pCtx->eflags.Bits.u1IF
-                     && VMCPU_FF_ISPENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC|VMCPU_FF_INTERRUPT_PIC)))
+                     && EMShouldContinueAfterHalt(pVCpu, pCtx))
                )
                 goto ResumeExecution;
@@ -2376 +2375 @@
         AssertMsg(rc == VERR_EM_INTERPRETER || rc == VINF_EM_HALT, ("EMU: mwait failed with %Rrc\n", rc));
         break;
+
+    case SVM_EXIT_MONITOR:
+    {
+        Log2(("SVM: monitor\n"));
+
+        STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitMonitor);
+        rc = EMInterpretMonitor(pVM, pVCpu, CPUMCTX2CORE(pCtx));
+        if (rc == VINF_SUCCESS)
+        {
+            /* Update EIP and continue execution. */
+            pCtx->rip += 3;     /* Note: hardcoded opcode size assumption! */
+            goto ResumeExecution;
+        }
+        AssertMsg(rc == VERR_EM_INTERPRETER, ("EMU: monitor failed with %Rrc\n", rc));
+        break;
+    }
+        
 
     case SVM_EXIT_VMMCALL:
@@ -2482 +2498 @@
         break;
 
-    case SVM_EXIT_MONITOR:
     case SVM_EXIT_PAUSE:
     case SVM_EXIT_MWAIT_ARMED:

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

@@ -413 +413 @@
                   | VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_UNCOND_IO_EXIT
                   | VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_RDPMC_EXIT
+                  | VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_MONITOR_EXIT
                   | VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_MWAIT_EXIT;    /* don't execute mwait or else we'll idle inside the guest (host thinks the cpu load is high) */
 
@@ -3530 +3531 @@
     }
 
+    case VMX_EXIT_MONITOR:              /* 39 Guest software attempted to execute MONITOR. */
+    {
+        Log2(("VMX: monitor\n"));
+
+        STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitMonitor);
+        rc = EMInterpretMonitor(pVM, pVCpu, CPUMCTX2CORE(pCtx));
+        if (rc == VINF_SUCCESS)
+        {
+            /* Update EIP and continue execution. */
+            pCtx->rip += cbInstr;
+            goto ResumeExecution;
+        }
+        AssertMsg(rc == VERR_EM_INTERPRETER, ("EMU: monitor failed with %Rrc\n", rc));
+        break;
+    }
+
     case VMX_EXIT_WRMSR:                /* 32 WRMSR. Guest software attempted to execute WRMSR. */
         /* When an interrupt is pending, we'll let MSR_K8_LSTAR writes fault in our TPR patch code. */
@@ -3975 +3992 @@
         STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitHlt);
         pCtx->rip++;    /* skip hlt */
-        if (    pCtx->eflags.Bits.u1IF
-            &&  VMCPU_FF_ISPENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC|VMCPU_FF_INTERRUPT_PIC)))
+        if (EMShouldContinueAfterHalt(pVCpu, pCtx))
             goto ResumeExecution;
 
@@ -3995 +4011 @@
             if (    rc == VINF_SUCCESS
                 ||  (   rc == VINF_EM_HALT
-                     && pCtx->eflags.Bits.u1IF
-                     && VMCPU_FF_ISPENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC|VMCPU_FF_INTERRUPT_PIC)))
+                     && EMShouldContinueAfterHalt(pVCpu, pCtx))
                )
                 goto ResumeExecution;
@@ -4047 +4062 @@
     case VMX_EXIT_RDMSR:                /* 31 RDMSR. Guest software attempted to execute RDMSR. */
     case VMX_EXIT_WRMSR:                /* 32 WRMSR. Guest software attempted to execute WRMSR. */
+    case VMX_EXIT_PAUSE:                /* 40 Guest software attempted to execute PAUSE. */
     case VMX_EXIT_MONITOR:              /* 39 Guest software attempted to execute MONITOR. */
-    case VMX_EXIT_PAUSE:                /* 40 Guest software attempted to execute PAUSE. */
         /* Note: If we decide to emulate them here, then we must sync the MSRs that could have been changed (sysenter, fs/gs base)!!! */
         rc = VERR_EM_INTERPRETER;