Changeset 72526 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jun 12, 2018 1:06:02 PM (6 years ago)

Author:

vboxsync

Message:

NEM,TM: More TSC adjustments for NEM/win. bugref:9044

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• NEMR3.cpp (modified) (1 diff)
• NEMR3Native-win.cpp (modified) (1 diff)
• TM.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/VMMR3/NEMR3.cpp

@@ -307 +307 @@
 
 
+/**
+ * Indicates to TM that TMTSCMODE_NATIVE_API should be used for TSC.
+ *
+ * @returns true if TMTSCMODE_NATIVE_API must be used, otherwise @c false.
+ * @param   pVM     The cross context VM structure.
+ */
+VMMR3_INT_DECL(bool) NEMR3NeedSpecialTscMode(PVM pVM)
+{
+#ifdef VBOX_WITH_NATIVE_NEM
+# ifdef RT_OS_WINDOWS
+    if (VM_IS_NEM_ENABLED(pVM))
+        return true;
+# endif
+#else
+    RT_NOREF(pVM);
+#endif
+    return false;
+}
+
+
+
 VMMR3_INT_DECL(VBOXSTRICTRC) NEMR3RunGC(PVM pVM, PVMCPU pVCpu)
 {

trunk/src/VBox/VMM/VMMR3/NEMR3Native-win.cpp

@@ -1238 +1238 @@
                             STAMR3RegisterF(pVM, &pNemCpu->StatImportOnReturn,      STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES, "Number of state imports on loop return", "/NEM/CPU%u/ImportOnReturn", iCpu);
                             STAMR3RegisterF(pVM, &pNemCpu->StatImportOnReturnSkipped, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES, "Number of skipped state imports on loop return", "/NEM/CPU%u/ImportOnReturnSkipped", iCpu);
+                            STAMR3RegisterF(pVM, &pNemCpu->StatQueryCpuTick,        STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES, "Number of TSC queries",                  "/NEM/CPU%u/QueryCpuTick", iCpu);
                         }
 

trunk/src/VBox/VMM/VMMR3/TM.cpp

@@ -127 +127 @@
 #include <VBox/vmm/mm.h>
 #include <VBox/vmm/hm.h>
+#include <VBox/vmm/nem.h>
 #include <VBox/vmm/gim.h>
 #include <VBox/vmm/ssm.h>
@@ -381 +382 @@
          * without any kind of coordination) will lead to inconsistent TSC behavior with
          * guest SMP, including TSC going backwards. */
-        pVM->tm.s.enmTSCMode = pVM->cCpus == 1 && tmR3HasFixedTSC(pVM) ? TMTSCMODE_DYNAMIC : TMTSCMODE_VIRT_TSC_EMULATED;
+        pVM->tm.s.enmTSCMode = NEMR3NeedSpecialTscMode(pVM) ? TMTSCMODE_NATIVE_API
+                             : pVM->cCpus == 1 && tmR3HasFixedTSC(pVM) ? TMTSCMODE_DYNAMIC : TMTSCMODE_VIRT_TSC_EMULATED;
     }
     else if (RT_FAILURE(rc))
@@ -395 +397 @@
         else
             return VMSetError(pVM, rc, RT_SRC_POS, N_("Configuration error: Unrecognized TM TSC mode value \"%s\""), szTSCMode);
+        if (NEMR3NeedSpecialTscMode(pVM))
+        {
+            LogRel(("TM: NEM overrides the /TM/TSCMode=%s settings.\n", szTSCMode));
+            pVM->tm.s.enmTSCMode = TMTSCMODE_NATIVE_API;
+        }
     }
 
@@ -411 +418 @@
     else if (RT_FAILURE(rc))
         return VMSetError(pVM, rc, RT_SRC_POS, N_("Configuration error: Failed to querying bool value \"TSCModeSwitchAllowed\""));
+    if (pVM->tm.s.fTSCModeSwitchAllowed && pVM->tm.s.enmTSCMode == TMTSCMODE_NATIVE_API)
+    {
+        LogRel(("TM: NEM overrides the /TM/TSCModeSwitchAllowed setting.\n"));
+        pVM->tm.s.fTSCModeSwitchAllowed = false;
+    }
 
     /** @cfgm{/TM/TSCTicksPerSecond, uint32_t, Current TSC frequency from GIP}
@@ -420 +432 @@
     {
         pVM->tm.s.cTSCTicksPerSecond = tmR3CalibrateTSC();
-        if (   pVM->tm.s.enmTSCMode != TMTSCMODE_REAL_TSC_OFFSET
+        if (   (   pVM->tm.s.enmTSCMode == TMTSCMODE_DYNAMIC
+                || pVM->tm.s.enmTSCMode == TMTSCMODE_VIRT_TSC_EMULATED)
             && pVM->tm.s.cTSCTicksPerSecond >= _4G)
         {
@@ -435 +448 @@
                           N_("Configuration error: \"TSCTicksPerSecond\" = %RI64 is not in the range 1MHz..4GHz-1"),
                           pVM->tm.s.cTSCTicksPerSecond);
+    else if (pVM->tm.s.enmTSCMode != TMTSCMODE_NATIVE_API)
+        pVM->tm.s.enmTSCMode = TMTSCMODE_VIRT_TSC_EMULATED;
     else
-        pVM->tm.s.enmTSCMode = TMTSCMODE_VIRT_TSC_EMULATED;
+    {
+        LogRel(("TM: NEM overrides the /TM/TSCTicksPerSecond=%RU64 setting.\n", pVM->tm.s.cTSCTicksPerSecond));
+        pVM->tm.s.cTSCTicksPerSecond = tmR3CalibrateTSC();
+    }
 
     /** @cfgm{/TM/TSCTiedToExecution, bool, false}
@@ -449 +467 @@
         return VMSetError(pVM, rc, RT_SRC_POS,
                           N_("Configuration error: Failed to querying bool value \"TSCTiedToExecution\""));
+    if (pVM->tm.s.fTSCTiedToExecution && pVM->tm.s.enmTSCMode == TMTSCMODE_NATIVE_API)
+        return VMSetError(pVM, VERR_INVALID_PARAMETER, RT_SRC_POS, N_("/TM/TSCTiedToExecution is not supported in NEM mode!"));
     if (pVM->tm.s.fTSCTiedToExecution)
         pVM->tm.s.enmTSCMode = TMTSCMODE_VIRT_TSC_EMULATED;
 
-    /** @cfgm{/TM/TSCNotTiedToHalt, bool, true}
-     * For overriding the default of TM/TSCTiedToExecution, i.e. set this to false
-     * to make the TSC freeze during HLT. */
+
+    /** @cfgm{/TM/TSCNotTiedToHalt, bool, false}
+     * This is used with /TM/TSCTiedToExecution to control how TSC operates
+     * accross HLT instructions.  When true HLT is considered execution time and
+     * TSC continues to run, while when false (default) TSC stops during halt. */
     rc = CFGMR3QueryBoolDef(pCfgHandle, "TSCNotTiedToHalt", &pVM->tm.s.fTSCNotTiedToHalt, false);
     if (RT_FAILURE(rc))
@@ -572 +594 @@
     if (pVM->tm.s.fVirtualWarpDrive)
     {
-        pVM->tm.s.enmTSCMode = TMTSCMODE_VIRT_TSC_EMULATED;
-        LogRel(("TM: Warp-drive active. u32VirtualWarpDrivePercentage=%RI32\n", pVM->tm.s.u32VirtualWarpDrivePercentage));
+        if (pVM->tm.s.enmTSCMode == TMTSCMODE_NATIVE_API)
+            LogRel(("TM: Warp-drive active, escept for TSC which is in NEM mode. u32VirtualWarpDrivePercentage=%RI32\n",
+                    pVM->tm.s.u32VirtualWarpDrivePercentage));
+        else
+        {
+            pVM->tm.s.enmTSCMode = TMTSCMODE_VIRT_TSC_EMULATED;
+            LogRel(("TM: Warp-drive active. u32VirtualWarpDrivePercentage=%RI32\n", pVM->tm.s.u32VirtualWarpDrivePercentage));
+        }
     }