Changeset 80281 in vbox for trunk/src/VBox/VMM/VMMR3/MMHyper.cpp

Timestamp:

Aug 15, 2019 7:29:37 AM (5 years ago)

Author:

vboxsync

Message:

VMM,++: Refactoring code to use VMMC & VMMCPUCC. bugref:9217

File:

• trunk/src/VBox/VMM/VMMR3/MMHyper.cpp (modified) (3 diffs)

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

@@ -28 +28 @@
 #include "MMInternal.h"
 #include <VBox/vmm/vm.h>
+#include <VBox/vmm/gvm.h>
 #include <VBox/err.h>
 #include <VBox/param.h>
@@ -152 +153 @@
         /*
          * Map the VM structure into the hypervisor space.
+         * Note! Keeping the mappings here for now in case someone is using
+         *       MMHyperR3ToR0 or similar.
          */
+        AssertCompileSizeAlignment(VM, PAGE_SIZE);
+        AssertCompileSizeAlignment(VMCPU, PAGE_SIZE);
 #ifdef VBOX_BUGREF_9217
-        AssertRelease(pVM->cbSelf >= sizeof(VMCPU) * pVM->cCpus + sizeof(*pVM));
+        AssertCompileSizeAlignment(GVM, PAGE_SIZE);
+        AssertCompileSizeAlignment(GVMCPU, PAGE_SIZE);
+        AssertRelease(pVM->cbSelf == sizeof(VM));
+        AssertRelease(pVM->cbVCpu == sizeof(VMCPU));
+        RTGCPTR GCPtr;
+        rc = MMR3HyperMapPages(pVM, pVM, pVM->pVMR0ForCall, sizeof(VM) >> PAGE_SHIFT, pVM->paVMPagesR3, "VM", &GCPtr);
+        uint32_t offPages = RT_UOFFSETOF(GVM, aCpus) >> PAGE_SHIFT;
+        for (uint32_t idCpu = 0; idCpu < pVM->cCpus && RT_SUCCESS(rc); idCpu++, offPages += sizeof(GVMCPU) >> PAGE_SHIFT)
+        {
+            PVMCPU pVCpu = pVM->apCpusR3[idCpu];
+            RTGCPTR GCPtrIgn;
+            rc = MMR3HyperMapPages(pVM, pVCpu, pVM->pVMR0ForCall + offPages * PAGE_SIZE,
+                                   sizeof(VMCPU) >> PAGE_SHIFT, &pVM->paVMPagesR3[offPages], "VMCPU", &GCPtrIgn);
+        }
 #else
         AssertRelease(pVM->cbSelf >= sizeof(VMCPU));
+        RTGCPTR GCPtr;
+        rc = MMR3HyperMapPages(pVM, pVM, pVM->pVMR0,
+                               RT_ALIGN_Z(pVM->cbSelf, PAGE_SIZE) >> PAGE_SHIFT, pVM->paVMPagesR3, "VM",
+                               &GCPtr);
 #endif
-        RTGCPTR GCPtr;
-        rc = MMR3HyperMapPages(pVM, pVM, pVM->pVMR0, RT_ALIGN_Z(pVM->cbSelf, PAGE_SIZE) >> PAGE_SHIFT, pVM->paVMPagesR3, "VM",
-                               &GCPtr);
         if (RT_SUCCESS(rc))
         {
@@ -876 +895 @@
         //pHeap->pbHeapRC           = 0; // set by mmR3HyperHeapMap()
         pHeap->pVMR3                = pVM;
+#ifdef VBOX_BUGREF_9217
+        pHeap->pVMR0                = pVM->pVMR0ForCall;
+#else
         pHeap->pVMR0                = pVM->pVMR0;
+#endif
         pHeap->pVMRC                = pVM->pVMRC;
         pHeap->cbHeap               = cbAligned - MMYPERHEAP_HDR_SIZE;