Changeset 80284 in vbox

Timestamp:

Aug 15, 2019 9:03:16 AM (6 years ago)

Author:

vboxsync

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

132739

Message:

tstMMHyperHeap: Fixes related to VM/GVM work. bugref:9217

File:

• trunk/src/VBox/VMM/testcase/tstMMHyperHeap.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/testcase/tstMMHyperHeap.cpp

@@ -24 +24 @@
 #include <VBox/vmm/vm.h>
 #include <VBox/vmm/uvm.h>
+#include <VBox/vmm/gvm.h>
 #include <VBox/sup.h>
 #include <VBox/param.h>
@@ -35 +36 @@
 #include <iprt/string.h>
 
-/* does not work for more CPUs as SUPR3LowAlloc() would refuse to allocate more pages */
 #define NUM_CPUS  16
 
@@ -49 +49 @@
      * Init runtime.
      */
-    RTR3InitExe(argc, &argv, 0);
+    int rc = RTR3InitExe(argc, &argv, 0);
+    AssertRCReturn(rc, RTEXITCODE_INIT);
 
     /*
@@ -56 +57 @@
     void       *pvVM = NULL;
     RTR0PTR     pvR0 = NIL_RTR0PTR;
-    SUPPAGE     aPages[RT_ALIGN_Z(sizeof(VM) + NUM_CPUS * sizeof(VMCPU), PAGE_SIZE) >> PAGE_SHIFT];
-    int rc = SUPR3Init(NULL);
-    if (RT_SUCCESS(rc))
-        //rc = SUPR3LowAlloc(RT_ELEMENTS(aPages), (void **)&pVM, &pvR0, &aPages[0]);
-        rc = SUPR3PageAllocEx(RT_ELEMENTS(aPages), 0, &pvVM, &pvR0, &aPages[0]);
-    if (RT_FAILURE(rc))
-    {
-        RTPrintf("Fatal error: SUP Failure! rc=%Rrc\n", rc);
+#ifdef VBOX_BUGREF_9217
+    SUPPAGE     aPages[(sizeof(GVM) + NUM_CPUS * sizeof(GVMCPU)) >> PAGE_SHIFT];
+#else
+    SUPPAGE     aPages[(sizeof(VM) + NUM_CPUS * sizeof(VMCPU)) >> PAGE_SHIFT];
+#endif
+    rc = SUPR3Init(NULL);
+    if (RT_FAILURE(rc))
+    {
+        RTPrintf("Fatal error: SUP failure! rc=%Rrc\n", rc);
+        return RTEXITCODE_FAILURE;
+    }
+    rc = SUPR3PageAllocEx(RT_ELEMENTS(aPages), 0, &pvVM, &pvR0, &aPages[0]);
+    if (RT_FAILURE(rc))
+    {
+        RTPrintf("Fatal error: Allocation failure! rc=%Rrc\n", rc);
         return RTEXITCODE_FAILURE;
     }
@@ -69 +77 @@
     PVM  pVM = (PVM)pvVM;
     pVM->paVMPagesR3 = aPages;
+#ifdef VBOX_BUGREF_9217
+    pVM->pVMR0ForCall = pvR0;
+#else
     pVM->pVMR0 = pvR0;
+#endif
 
     PUVM pUVM = (PUVM)RTMemPageAllocZ(RT_ALIGN_Z(sizeof(*pUVM), PAGE_SIZE));
@@ -82 +94 @@
 
     pVM->cCpus = NUM_CPUS;
+#ifdef VBOX_BUGREF_9217
+    pVM->cbSelf = sizeof(VM);
+    pVM->cbVCpu = sizeof(VMCPU);
+    PVMCPU pVCpu = (PVMCPU)((uintptr_t)pVM + sizeof(GVM));
+    for (VMCPUID idCpu = 0; idCpu < NUM_CPUS; idCpu++)
+    {
+        pVM->apCpusR3[idCpu] = pVCpu;
+        pVCpu = (PVMCPU)((uintptr_t)pVCpu + sizeof(GVMCPU));
+    }
+#else
     pVM->cbSelf = RT_UOFFSETOF_DYN(VM, aCpus[pVM->cCpus]);
+    for (VMCPUID idCpu = 0; idCpu < NUM_CPUS; idCpu++)
+        pVM->apCpusR3[idCpu] = &pVM->aCpus[idCpu];
+#endif
 
     rc = STAMR3InitUVM(pUVM);