Changeset 80321 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Aug 16, 2019 9:20:57 AM (5 years ago)

Author:

vboxsync

Message:

IPRT/memobj-r0drv-linux.c: Implemented mapping or sub-ranges as required for joining GVM and VM. bugref:9217

File:

• trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c (modified) (7 diffs)

trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c

@@ -1550 +1550 @@
     if (uAlignment > PAGE_SIZE)
         return VERR_NOT_SUPPORTED;
-    AssertMsgReturn(!offSub && !cbSub, ("%#zx %#zx\n", offSub, cbSub), VERR_NOT_SUPPORTED); /** @todo implement sub maps */
 
 #ifdef VBOX_USE_PAE_HACK
@@ -1569 +1568 @@
      * Create the IPRT memory object.
      */
-    pMemLnx = (PRTR0MEMOBJLNX)rtR0MemObjNew(sizeof(*pMemLnx), RTR0MEMOBJTYPE_MAPPING, NULL, pMemLnxToMap->Core.cb);
+    if (cbSub == 0)
+        cbSub = pMemLnxToMap->Core.cb;
+    pMemLnx = (PRTR0MEMOBJLNX)rtR0MemObjNew(sizeof(*pMemLnx), RTR0MEMOBJTYPE_MAPPING, NULL, cbSub);
     if (pMemLnx)
     {
@@ -1576 +1577 @@
          */
         void *pv;
-        pv = rtR0MemObjLinuxDoMmap(R3PtrFixed, pMemLnxToMap->Core.cb, uAlignment, pTask, fProt);
+        pv = rtR0MemObjLinuxDoMmap(R3PtrFixed, cbSub, uAlignment, pTask, fProt);
         if (pv != (void *)-1)
         {
@@ -1583 +1584 @@
              * This is generic, paranoid and not very efficient.
              */
-            pgprot_t        fPg = rtR0MemObjLinuxConvertProt(fProt, false /* user */);
+            pgprot_t        fPg       = rtR0MemObjLinuxConvertProt(fProt, false /* user */);
             unsigned long   ulAddrCur = (unsigned long)pv;
-            const size_t    cPages = pMemLnxToMap->Core.cb >> PAGE_SHIFT;
+            const size_t    cPages    = (offSub + cbSub) >> PAGE_SHIFT;
             size_t          iPage;
 
@@ -1593 +1594 @@
             if (pMemLnxToMap->cPages)
             {
-                for (iPage = 0; iPage < cPages; iPage++, ulAddrCur += PAGE_SIZE)
+                for (iPage = offSub >> PAGE_SHIFT; iPage < cPages; iPage++, ulAddrCur += PAGE_SIZE)
                 {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 11)
@@ -1648 +1649 @@
                 if (Phys != NIL_RTHCPHYS)
                 {
-                    for (iPage = 0; iPage < cPages; iPage++, ulAddrCur += PAGE_SIZE, Phys += PAGE_SIZE)
+                    for (iPage = offSub >> PAGE_SHIFT; iPage < cPages; iPage++, ulAddrCur += PAGE_SIZE, Phys += PAGE_SIZE)
                     {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) || defined(HAVE_26_STYLE_REMAP_PAGE_RANGE)
@@ -1722 +1723 @@
              * Bail out.
              */
-            rtR0MemObjLinuxDoMunmap(pv, pMemLnxToMap->Core.cb, pTask);
+            rtR0MemObjLinuxDoMunmap(pv, cbSub, pTask);
         }
         rtR0MemObjDelete(&pMemLnx->Core);