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

Timestamp:

Feb 24, 2010 9:36:49 PM (15 years ago)

Author:

vboxsync

Message:

IPRT/memobj-r0drv-freebsd: Do not use vtophys to get the physical address for virtual userspace addresses. pmap_extract is the correct function

File:

• trunk/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c (modified) (1 diff)

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

@@ -740 +740 @@
             /* fall thru*/
         case RTR0MEMOBJTYPE_PAGE:
+        {
+            vm_offset_t pb = (vm_offset_t)pMemFreeBSD->Core.pv + (iPage << PAGE_SHIFT);
+            return vtophys(pb);
+        }
         case RTR0MEMOBJTYPE_MAPPING:
         {
-            uint8_t *pb = (uint8_t *)pMemFreeBSD->Core.pv + (iPage << PAGE_SHIFT);
-            return vtophys(pb);
+            vm_offset_t pb = (vm_offset_t)pMemFreeBSD->Core.pv + (iPage << PAGE_SHIFT);
+
+            if (pMemFreeBSD->Core.u.Mapping.R0Process != NIL_RTR0PROCESS)
+            {
+                struct proc    *pProc     = (struct proc *)pMemFreeBSD->Core.u.Mapping.R0Process;
+                struct vm_map  *pProcMap  = &pProc->p_vmspace->vm_map;
+                pmap_t pPhysicalMap       = pProcMap->pmap;
+
+                return pmap_extract(pPhysicalMap, pb);
+            }
+            else
+                return vtophys(pb);
         }