Changeset 87550 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Feb 3, 2021 9:54:10 AM (4 years ago)

Author:

vboxsync

Message:

VMM/HMVMX: Copied the fUsePreemptTimer member from HM::vmx to HMR0PERVM::vmx. bugref:9217

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMR0.cpp (modified) (1 diff)
• HMVMXR0.cpp (modified) (3 diffs)

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

@@ -1161 +1161 @@
     if (pVM->hm.s.vmx.fSupported)
     {
-        pVM->hm.s.vmx.fUsePreemptTimer     &= g_fHmVmxUsePreemptTimer; /* Can be overridden by CFGM in HMR3Init(). */
+        pVM->hmr0.s.vmx.fUsePreemptTimer    = pVM->hm.s.vmx.fUsePreemptTimerCfg && g_fHmVmxUsePreemptTimer;
+        pVM->hm.s.vmx.fUsePreemptTimerCfg   = pVM->hmr0.s.vmx.fUsePreemptTimer;
         pVM->hm.s.vmx.cPreemptTimerShift    = g_cHmVmxPreemptTimerShift;
         pVM->hm.s.vmx.u64HostCr4            = g_uHmVmxHostCr4;

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

@@ -3814 +3814 @@
 
     /* Enable the VMX-preemption timer. */
-    if (pVM->hm.s.vmx.fUsePreemptTimer)
+    if (pVM->hmr0.s.vmx.fUsePreemptTimer)
     {
         Assert(g_HmMsrs.u.vmx.PinCtls.n.allowed1 & VMX_PIN_CTLS_PREEMPT_TIMER);
@@ -5118 +5118 @@
              * For nested-guests, currently not exposed/used.
              */
-            if (    pVM->hm.s.vmx.fUsePreemptTimer
-                && (g_HmMsrs.u.vmx.ExitCtls.n.allowed1 & VMX_EXIT_CTLS_SAVE_PREEMPT_TIMER))
+            if (pVM->hmr0.s.vmx.fUsePreemptTimer)
+            {
+                Assert(g_HmMsrs.u.vmx.ExitCtls.n.allowed1 & VMX_EXIT_CTLS_SAVE_PREEMPT_TIMER);
                 fVal |= VMX_EXIT_CTLS_SAVE_PREEMPT_TIMER;
+            }
 
             /* Don't acknowledge external interrupts on VM-exit. We want to let the host do that. */
@@ -7122 +7124 @@
     PVMXVMCSINFO pVmcsInfo = hmGetVmxActiveVmcsInfo(pVCpu);
 
-    if (pVM->hm.s.vmx.fUsePreemptTimer)
+    if (pVM->hmr0.s.vmx.fUsePreemptTimer)
     {
         uint64_t cTicksToDeadline = TMCpuTickGetDeadlineAndTscOffset(pVM, pVCpu, &uTscOffset, &fOffsettedTsc, &fParavirtTsc);