Changeset 73035 in vbox

Timestamp:

Jul 10, 2018 2:04:41 PM (7 years ago)

Author:

vboxsync

Message:

NEM/win: Poll timers from inner loop and adjust run/wait timeout to next timer deadline. Helps with rhel5 smoketest. bugref:9044

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/NEMAllNativeTemplate-win.cpp.h (modified) (4 diffs)
• VMMR0/NEMR0Native-win.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/NEMAllNativeTemplate-win.cpp.h

@@ -4086 +4086 @@
 # ifdef NEM_WIN_TEMPLATE_MODE_OWN_RUN_API
     VID_MESSAGE_MAPPING_HEADER volatile *pMappingHeader = (VID_MESSAGE_MAPPING_HEADER volatile *)pVCpu->nem.s.pvMsgSlotMapping;
-    uint32_t        cMillies            = 5000; /** @todo lower this later... */
 # endif
     const bool      fSingleStepping     = DBGFIsStepping(pVCpu);
@@ -4167 +4166 @@
 
         /*
-         * Run a bit.
+         * Poll timers and run for a bit.
+         *
+         * With the VID approach (ring-0 or ring-3) we can specify a timeout here,
+         * so we take the time of the next timer event and uses that as a deadline.
+         * The rounding heuristics are "tuned" so that rhel5 (1K timer) will boot fine.
          */
+        /** @todo See if we cannot optimize this TMTimerPollGIP by only redoing
+         *        the whole polling job when timers have changed... */
+        uint64_t       offDeltaIgnored;
+        uint64_t const nsNextTimerEvt = TMTimerPollGIP(pVM, pVCpu, &offDeltaIgnored); NOREF(nsNextTimerEvt);
         if (   !VM_FF_IS_PENDING(pVM, VM_FF_EMT_RENDEZVOUS | VM_FF_TM_VIRTUAL_SYNC)
             && !VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_HM_TO_R3_MASK))
@@ -4198 +4205 @@
             {
 # ifdef NEM_WIN_TEMPLATE_MODE_OWN_RUN_API
+                uint64_t const  nsNow           = RTTimeNanoTS();
+                int64_t const   cNsNextTimerEvt = nsNow - nsNextTimerEvt;
+                uint32_t        cMsWait;
+                if (cNsNextTimerEvt < 100000 /* ns */)
+                    cMsWait = 0;
+                else if ((uint64_t)cNsNextTimerEvt < RT_NS_1SEC)
+                {
+                    if ((uint32_t)cNsNextTimerEvt < 2*RT_NS_1MS)
+                        cMsWait = 1;
+                    else
+                        cMsWait = ((uint32_t)cNsNextTimerEvt - 100000 /*ns*/) / RT_NS_1MS;
+                }
+                else
+                    cMsWait = RT_MS_1SEC;
 #  ifdef IN_RING0
                 pVCpu->nem.s.uIoCtlBuf.MsgSlotHandleAndGetNext.iCpu     = pGVCpu->idCpu;
                 pVCpu->nem.s.uIoCtlBuf.MsgSlotHandleAndGetNext.fFlags   = pVCpu->nem.s.fHandleAndGetFlags;
-                pVCpu->nem.s.uIoCtlBuf.MsgSlotHandleAndGetNext.cMillies = cMillies;
+                pVCpu->nem.s.uIoCtlBuf.MsgSlotHandleAndGetNext.cMillies = cMsWait;
                 NTSTATUS rcNt = nemR0NtPerformIoControl(pGVM, pGVM->nem.s.IoCtlMessageSlotHandleAndGetNext.uFunction,
                                                         &pVCpu->nem.s.uIoCtlBuf.MsgSlotHandleAndGetNext,
@@ -4210 +4231 @@
 #  else
                 BOOL fRet = VidMessageSlotHandleAndGetNext(pVM->nem.s.hPartitionDevice, pVCpu->idCpu,
-                                                           pVCpu->nem.s.fHandleAndGetFlags, cMillies);
+                                                           pVCpu->nem.s.fHandleAndGetFlags, cMsWait);
                 VMCPU_CMPXCHG_STATE(pVCpu, VMCPUSTATE_STARTED_EXEC_NEM, VMCPUSTATE_STARTED_EXEC_NEM_WAIT);
                 if (fRet)

trunk/src/VBox/VMM/VMMR0/NEMR0Native-win.cpp

@@ -42 +42 @@
 #include <iprt/memobj.h>
 #include <iprt/string.h>
+#include <iprt/time.h>