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

Timestamp:

Feb 1, 2021 9:17:51 PM (4 years ago)

Author:

vboxsync

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

142544

Message:

VMM/HM: Make a R0 copy of HM::cMaxResumeLoopsCfg and do proper validation. bugref:9217

Location:

trunk/src/VBox/VMM/VMMR0

Files:

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

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

@@ -1185 +1185 @@
      * Can be overriden using CFGM.
      */
-    if (!pVM->hm.s.cMaxResumeLoops)
-    {
-        pVM->hm.s.cMaxResumeLoops       = 1024;
+    uint32_t cMaxResumeLoops = pVM->hm.s.cMaxResumeLoopsCfg;
+    if (!cMaxResumeLoops)
+    {
+        cMaxResumeLoops     = 1024;
         if (RTThreadPreemptIsPendingTrusty())
-            pVM->hm.s.cMaxResumeLoops   = 8192;
-    }
+            cMaxResumeLoops = 8192;
+    }
+    else if (cMaxResumeLoops > 16384)
+        cMaxResumeLoops = 16384;
+    else if (cMaxResumeLoops < 32)
+        cMaxResumeLoops = 32;
+    pVM->hm.s.cMaxResumeLoopsCfg = pVM->hmr0.s.cMaxResumeLoops = cMaxResumeLoops;
 
     /*

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

@@ -4475 +4475 @@
 static VBOXSTRICTRC hmR0SvmRunGuestCodeNormal(PVMCPUCC pVCpu, uint32_t *pcLoops)
 {
-    uint32_t const cMaxResumeLoops = pVCpu->CTX_SUFF(pVM)->hm.s.cMaxResumeLoops;
+    uint32_t const cMaxResumeLoops = pVCpu->CTX_SUFF(pVM)->hmr0.s.cMaxResumeLoops;
     Assert(pcLoops);
     Assert(*pcLoops <= cMaxResumeLoops);
@@ -4550 +4550 @@
 static VBOXSTRICTRC hmR0SvmRunGuestCodeStep(PVMCPUCC pVCpu, uint32_t *pcLoops)
 {
-    uint32_t const cMaxResumeLoops = pVCpu->CTX_SUFF(pVM)->hm.s.cMaxResumeLoops;
+    uint32_t const cMaxResumeLoops = pVCpu->CTX_SUFF(pVM)->hmr0.s.cMaxResumeLoops;
     Assert(pcLoops);
     Assert(*pcLoops <= cMaxResumeLoops);
@@ -4658 +4658 @@
     HMSVM_ASSERT_IN_NESTED_GUEST(pCtx);
     Assert(pcLoops);
-    Assert(*pcLoops <= pVCpu->CTX_SUFF(pVM)->hm.s.cMaxResumeLoops);
+    Assert(*pcLoops <= pVCpu->CTX_SUFF(pVM)->hmr0.s.cMaxResumeLoops);
 
     SVMTRANSIENT SvmTransient;
@@ -4725 +4725 @@
             else
             {
-                if (++(*pcLoops) <= pVCpu->CTX_SUFF(pVM)->hm.s.cMaxResumeLoops)
+                if (++(*pcLoops) <= pVCpu->CTX_SUFF(pVM)->hmr0.s.cMaxResumeLoops)
                     continue;
                 STAM_COUNTER_INC(&pVCpu->hm.s.StatSwitchMaxResumeLoops);
@@ -6357 +6357 @@
      */
     bool const fSupportsNextRipSave = hmR0SvmSupportsNextRipSave(pVCpu);
-    if (   pVCpu->CTX_SUFF(pVM)->hm.s.fTPRPatchingActive
-        && idMsr == MSR_K8_LSTAR)
+    if (   idMsr == MSR_K8_LSTAR
+        && pVCpu->CTX_SUFF(pVM)->hm.s.fTPRPatchingActive)
     {
         unsigned cbInstr;

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

@@ -11288 +11288 @@
 static VBOXSTRICTRC hmR0VmxRunGuestCodeNormal(PVMCPUCC pVCpu, uint32_t *pcLoops)
 {
-    uint32_t const cMaxResumeLoops = pVCpu->CTX_SUFF(pVM)->hm.s.cMaxResumeLoops;
+    uint32_t const cMaxResumeLoops = pVCpu->CTX_SUFF(pVM)->hmr0.s.cMaxResumeLoops;
     Assert(pcLoops);
     Assert(*pcLoops <= cMaxResumeLoops);
@@ -11401 +11401 @@
 static VBOXSTRICTRC hmR0VmxRunGuestCodeNested(PVMCPUCC pVCpu, uint32_t *pcLoops)
 {
-    uint32_t const cMaxResumeLoops = pVCpu->CTX_SUFF(pVM)->hm.s.cMaxResumeLoops;
+    uint32_t const cMaxResumeLoops = pVCpu->CTX_SUFF(pVM)->hmr0.s.cMaxResumeLoops;
     Assert(pcLoops);
     Assert(*pcLoops <= cMaxResumeLoops);
@@ -12563 +12563 @@
 static VBOXSTRICTRC hmR0VmxRunGuestCodeDebug(PVMCPUCC pVCpu, uint32_t *pcLoops)
 {
-    uint32_t const cMaxResumeLoops = pVCpu->CTX_SUFF(pVM)->hm.s.cMaxResumeLoops;
+    uint32_t const cMaxResumeLoops = pVCpu->CTX_SUFF(pVM)->hmr0.s.cMaxResumeLoops;
     Assert(pcLoops);
     Assert(*pcLoops <= cMaxResumeLoops);