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

Timestamp:

Feb 6, 2022 7:35:04 AM (3 years ago)

Author:

vboxsync

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

149760

Message:

VMM/DBGR3Trace: Replaced MMR3HyperAllocOnceNoRel call with direct SUPR3PageAllocEx call. bugref:10093

File:

• trunk/src/VBox/VMM/VMMR3/DBGFR3Trace.cpp (modified) (1 diff)

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

@@ -115 +115 @@
      *       as the heap block.
      */
-    cbBlock = RT_ALIGN_Z(cbBlock, GUEST_PAGE_SIZE); /** @todo page size */
-    void *pvBlock;
-    rc = MMR3HyperAllocOnceNoRel(pVM, cbBlock, GUEST_PAGE_SIZE, MM_TAG_DBGF, &pvBlock);
+    cbBlock = RT_ALIGN_Z(cbBlock, HOST_PAGE_SIZE);
+    RTR0PTR pvBlockR0 = NIL_RTR0PTR;
+    void   *pvBlockR3 = NULL;
+    rc = SUPR3PageAllocEx(cbBlock >> HOST_PAGE_SHIFT, 0, &pvBlockR3, &pvBlockR0, NULL);
     if (RT_FAILURE(rc))
         return rc;
 
-    rc = RTTraceBufCarve(&hTraceBuf, cEntries, cbEntry, 0 /*fFlags*/, pvBlock, &cbBlock);
+    rc = RTTraceBufCarve(&hTraceBuf, cEntries, cbEntry, 0 /*fFlags*/, pvBlockR3, &cbBlock);
     AssertRCReturn(rc, rc);
-    AssertRelease(hTraceBuf == (RTTRACEBUF)pvBlock);
-    AssertRelease((void *)hTraceBuf == pvBlock);
+    AssertReleaseReturn(hTraceBuf == (RTTRACEBUF)pvBlockR3, VERR_INTERNAL_ERROR_3);
+    AssertReleaseReturn((void *)hTraceBuf == pvBlockR3, VERR_INTERNAL_ERROR_3);
 
     pVM->hTraceBufR3 = hTraceBuf;
-    pVM->hTraceBufR0 = MMHyperCCToR0(pVM, hTraceBuf);
+    pVM->hTraceBufR0 = pvBlockR0;
     return VINF_SUCCESS;
 }