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

Timestamp:

Jul 4, 2023 7:00:26 AM (20 months ago)

Author:

vboxsync

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

158087

Message:

Runtime/RTR0MemObj*: Add PhysHighest parameter to RTR0MemObjAllocCont to indicate the maximum allowed physical address for an allocation, bugref:10457 [second attempt]

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• GIMR0Hv.cpp (modified) (1 diff)
• HMR0.cpp (modified) (3 diffs)
• HMSVMR0.cpp (modified) (6 diffs)

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

@@ -60 +60 @@
     AssertPtr(pHCPhys);
 
-    int rc = RTR0MemObjAllocCont(pMemObj, HOST_PAGE_SIZE, false /* fExecutable */);
+    int rc = RTR0MemObjAllocCont(pMemObj, HOST_PAGE_SIZE, NIL_RTHCPHYS /*PhysHighest*/, false /* fExecutable */);
     if (RT_FAILURE(rc))
         return rc;

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

@@ -421 +421 @@
             /* Allocate a temporary VMXON region. */
             RTR0MEMOBJ hScatchMemObj;
-            rc = RTR0MemObjAllocCont(&hScatchMemObj, HOST_PAGE_SIZE, false /* fExecutable */);
+            rc = RTR0MemObjAllocCont(&hScatchMemObj, HOST_PAGE_SIZE, NIL_RTHCPHYS /*PhysHighest*/, false /* fExecutable */);
             if (RT_FAILURE(rc))
             {
@@ -915 +915 @@
             {
                 /** @todo NUMA */
-                rc = RTR0MemObjAllocCont(&g_aHmCpuInfo[i].hMemObj, HOST_PAGE_SIZE, false /* executable R0 mapping */);
+                rc = RTR0MemObjAllocCont(&g_aHmCpuInfo[i].hMemObj, HOST_PAGE_SIZE, NIL_RTHCPHYS /*PhysHighest*/, false /* executable R0 mapping */);
                 AssertLogRelRCReturn(rc, rc);
 
@@ -928 +928 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_SVM
                 rc = RTR0MemObjAllocCont(&g_aHmCpuInfo[i].n.svm.hNstGstMsrpm, SVM_MSRPM_PAGES << X86_PAGE_4K_SHIFT,
-                                         false /* executable R0 mapping */);
+                                         NIL_RTHCPHYS /*PhysHighest*/, false /* executable R0 mapping */);
                 AssertLogRelRCReturn(rc, rc);
 

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

@@ -606 +606 @@
      */
     Assert(g_hMemObjIOBitmap == NIL_RTR0MEMOBJ);
-    int rc = RTR0MemObjAllocCont(&g_hMemObjIOBitmap, SVM_IOPM_PAGES << X86_PAGE_4K_SHIFT, false /* fExecutable */);
+    int rc = RTR0MemObjAllocCont(&g_hMemObjIOBitmap, SVM_IOPM_PAGES << X86_PAGE_4K_SHIFT,
+                                 NIL_RTHCPHYS /*PhysHighest*/, false /* fExecutable */);
     if (RT_FAILURE(rc))
         return rc;
@@ -766 +767 @@
          * FS, GS, Kernel GS Base, etc.) apart from the host-state save area specified in MSR_K8_VM_HSAVE_PA.
          */
-/** @todo Does this need to be below 4G? */
-        rc = RTR0MemObjAllocCont(&pVCpu->hmr0.s.svm.hMemObjVmcbHost, SVM_VMCB_PAGES << HOST_PAGE_SHIFT, false /* fExecutable */);
+        rc = RTR0MemObjAllocCont(&pVCpu->hmr0.s.svm.hMemObjVmcbHost, SVM_VMCB_PAGES << HOST_PAGE_SHIFT,
+                                 NIL_RTHCPHYS /*PhysHighest*/, false /* fExecutable */);
         if (RT_FAILURE(rc))
             goto failure_cleanup;
@@ -773 +774 @@
         void *pvVmcbHost                    = RTR0MemObjAddress(pVCpu->hmr0.s.svm.hMemObjVmcbHost);
         pVCpu->hmr0.s.svm.HCPhysVmcbHost    = RTR0MemObjGetPagePhysAddr(pVCpu->hmr0.s.svm.hMemObjVmcbHost, 0 /* iPage */);
-        Assert(pVCpu->hmr0.s.svm.HCPhysVmcbHost < _4G);
         RT_BZERO(pvVmcbHost, HOST_PAGE_SIZE);
 
@@ -779 +779 @@
          * Allocate one page for the guest-state VMCB.
          */
-/** @todo Does this need to be below 4G? */
-        rc = RTR0MemObjAllocCont(&pVCpu->hmr0.s.svm.hMemObjVmcb, SVM_VMCB_PAGES << HOST_PAGE_SHIFT, false /* fExecutable */);
+        rc = RTR0MemObjAllocCont(&pVCpu->hmr0.s.svm.hMemObjVmcb, SVM_VMCB_PAGES << HOST_PAGE_SHIFT,
+                                 NIL_RTHCPHYS /*PhysHighest*/, false /* fExecutable */);
         if (RT_FAILURE(rc))
             goto failure_cleanup;
@@ -786 +786 @@
         pVCpu->hmr0.s.svm.pVmcb             = (PSVMVMCB)RTR0MemObjAddress(pVCpu->hmr0.s.svm.hMemObjVmcb);
         pVCpu->hmr0.s.svm.HCPhysVmcb        = RTR0MemObjGetPagePhysAddr(pVCpu->hmr0.s.svm.hMemObjVmcb, 0 /* iPage */);
-        Assert(pVCpu->hmr0.s.svm.HCPhysVmcb < _4G);
         RT_BZERO(pVCpu->hmr0.s.svm.pVmcb, HOST_PAGE_SIZE);
 
@@ -793 +792 @@
          * SVM to not require one.
          */
-/** @todo Does this need to be below 4G? */
         rc = RTR0MemObjAllocCont(&pVCpu->hmr0.s.svm.hMemObjMsrBitmap, SVM_MSRPM_PAGES << HOST_PAGE_SHIFT,
-                                 false /* fExecutable */);
+                                 NIL_RTHCPHYS /*PhysHighest*/, false /* fExecutable */);
         if (RT_FAILURE(rc))
             goto failure_cleanup;