Changeset 51344 in vbox

Timestamp:

May 22, 2014 11:04:58 AM (11 years ago)

Author:

vboxsync

Message:

VMM/CPUM: Hyper heap fixes.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CPUMR3CpuId.cpp (modified) (3 diffs)
• CPUMR3Db.cpp (modified) (3 diffs)

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

@@ -567 +567 @@
 static PCPUMCPUIDLEAF cpumR3CpuIdEnsureSpace(PVM pVM, PCPUMCPUIDLEAF *ppaLeaves, uint32_t cLeaves)
 {
-    uint32_t cAllocated = RT_ALIGN(cLeaves, 16);
+    uint32_t cAllocated;
+    if (!pVM)
+        cAllocated = RT_ALIGN(cLeaves, 16);
+    else
+    {
+        /*
+         * We're using the hyper heap now, but when the arrays were copied over to it from
+         * the host-context heap, we only copy the exact size and not the ensured size.
+         * See @bugref{7270}.
+         */
+        cAllocated = cLeaves;
+    }
+
     if (cLeaves + 1 > cAllocated)
     {
@@ -585 +597 @@
                 pVM->cpum.s.GuestInfo.paCpuIdLeavesR0 = NIL_RTR0PTR;
                 pVM->cpum.s.GuestInfo.paCpuIdLeavesRC = NIL_RTRCPTR;
+                LogRel(("CPUM: cpumR3CpuIdEnsureSpace: MMR3HyperRealloc failed. rc=%Rrc\n", rc));
                 return NULL;
             }
-
-            /* Update the R0 and RC pointers. */
-            pVM->cpum.s.GuestInfo.paCpuIdLeavesR0 = MMHyperR3ToR0(pVM, *ppaLeaves);
-            pVM->cpum.s.GuestInfo.paCpuIdLeavesRC = MMHyperR3ToRC(pVM, *ppaLeaves);
+            *ppaLeaves = (PCPUMCPUIDLEAF)pvNew;
         }
         else
@@ -602 +612 @@
                 return NULL;
             }
-        }
-        *ppaLeaves   = (PCPUMCPUIDLEAF)pvNew;
-    }
+            *ppaLeaves = (PCPUMCPUIDLEAF)pvNew;
+        }
+    }
+
+#ifndef IN_VBOX_CPU_REPORT
+    /* Update the R0 and RC pointers. */
+    if (pVM)
+    {
+        Assert(ppaLeaves == &pVM->cpum.s.GuestInfo.paCpuIdLeavesR3);
+        pVM->cpum.s.GuestInfo.paCpuIdLeavesR0 = MMHyperR3ToR0(pVM, *ppaLeaves);
+        pVM->cpum.s.GuestInfo.paCpuIdLeavesRC = MMHyperR3ToRC(pVM, *ppaLeaves);
+    }
+#endif
+
     return *ppaLeaves;
 }

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

@@ -307 +307 @@
 static PCPUMMSRRANGE cpumR3MsrRangesEnsureSpace(PVM pVM, PCPUMMSRRANGE *ppaMsrRanges, uint32_t cMsrRanges, uint32_t cNewRanges)
 {
-    uint32_t cMsrRangesAllocated = RT_ALIGN_32(cMsrRanges, 16);
+    uint32_t cMsrRangesAllocated;
+    if (!pVM)
+        cMsrRangesAllocated = RT_ALIGN_32(cMsrRanges, 16);
+    else
+    {
+        /*
+         * We're using the hyper heap now, but when the range array was copied over to it from
+         * the host-context heap, we only copy the exact size and not the ensured size.
+         * See @bugref{7270}.
+         */
+        cMsrRangesAllocated = cMsrRanges;
+    }
     if (cMsrRangesAllocated < cMsrRanges + cNewRanges)
     {
@@ -325 +336 @@
                 pVM->cpum.s.GuestInfo.paMsrRangesR0 = NIL_RTR0PTR;
                 pVM->cpum.s.GuestInfo.paMsrRangesRC = NIL_RTRCPTR;
+                LogRel(("CPUM: cpumR3MsrRangesEnsureSpace: MMR3HyperRealloc failed. rc=%Rrc\n", rc));
                 return NULL;
             }
-
-            pVM->cpum.s.GuestInfo.paMsrRangesR0 = MMHyperR3ToR0(pVM, *ppaMsrRanges);
-            pVM->cpum.s.GuestInfo.paMsrRangesR0 = MMHyperR3ToRC(pVM, *ppaMsrRanges);
-            /** @todo Update R0 and RC pointers here?  */
+            *ppaMsrRanges = (PCPUMMSRRANGE)pvNew;
         }
         else
@@ -344 +353 @@
         *ppaMsrRanges = (PCPUMMSRRANGE)pvNew;
     }
+
+    if (pVM)
+    {
+        /* Update R0 and RC pointers. */
+        Assert(ppaMsrRanges == &pVM->cpum.s.GuestInfo.paMsrRangesR3);
+        pVM->cpum.s.GuestInfo.paMsrRangesR0 = MMHyperR3ToR0(pVM, *ppaMsrRanges);
+        pVM->cpum.s.GuestInfo.paMsrRangesRC = MMHyperR3ToRC(pVM, *ppaMsrRanges);
+    }
+
     return *ppaMsrRanges;
 }