Changeset 100355 in vbox for trunk/src/VBox/Runtime/r0drv/os2

Timestamp:

Jul 4, 2023 6:37:35 AM (22 months ago)

Author:

vboxsync

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

158085

Message:

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

File:

• trunk/src/VBox/Runtime/r0drv/os2/memobj-r0drv-os2.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r0drv/os2/memobj-r0drv-os2.cpp

@@ -218 +218 @@
 
 
-DECLHIDDEN(int) rtR0MemObjNativeAllocCont(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, bool fExecutable, const char *pszTag)
+DECLHIDDEN(int) rtR0MemObjNativeAllocCont(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, RTHCPHYS PhysHighest,
+                                          bool fExecutable, const char *pszTag)
 {
     NOREF(fExecutable);
+    AssertMsgReturn(PhysHighest >= _16M - 1, ("PhysHigest=%RHp\n", PhysHighest), VERR_NOT_SUPPORTED);
 
     /* create the object. */
@@ -229 +231 @@
         /* do the allocation. */
         ULONG ulPhys = ~0UL;
-        int rc = KernVMAlloc(cb, VMDHA_FIXED | VMDHA_CONTIG, &pMemOs2->Core.pv, (PPVOID)&ulPhys, NULL);
+        int rc = KernVMAlloc(cb, VMDHA_FIXED | VMDHA_CONTIG | (PhysHighest < _4G - 1 ? VMDHA_16M : 0),
+                             &pMemOs2->Core.pv, (PPVOID)&ulPhys, NULL);
         if (!rc)
         {
@@ -248 +251 @@
                                           const char *pszTag)
 {
-    AssertMsgReturn(PhysHighest >= 16 *_1M, ("PhysHigest=%RHp\n", PhysHighest), VERR_NOT_SUPPORTED);
+    AssertMsgReturn(PhysHighest >= _16M - 1, ("PhysHigest=%RHp\n", PhysHighest), VERR_NOT_SUPPORTED);
 
     /** @todo alignment  */
@@ -261 +264 @@
         /* do the allocation. */
         ULONG ulPhys = ~0UL;
-        int rc = KernVMAlloc(cb, VMDHA_FIXED | VMDHA_CONTIG | (PhysHighest < _4G ? VMDHA_16M : 0),
+        int rc = KernVMAlloc(cb, VMDHA_FIXED | VMDHA_CONTIG | (PhysHighest < _4G - 1 ? VMDHA_16M : 0),
                              &pMemOs2->Core.pv, (PPVOID)&ulPhys, NULL);
         if (!rc)