Changeset 22355 in vbox for trunk/src

Timestamp:

Aug 19, 2009 8:09:45 PM (15 years ago)

Author:

vboxsync

Message:

Runtime/Linux: don't allow to pass pages above 4GB to remap_page_range(); some remarks about GFP_USER

Location:

trunk/src/VBox/Runtime/r0drv/linux

Files:

• alloc-r0drv-linux.c (modified) (1 diff)
• memobj-r0drv-linux.c (modified) (4 diffs)

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

@@ -239 +239 @@
     cPages = cb >> PAGE_SHIFT;
     cOrder = CalcPowerOf2Order(cPages);
-#ifdef RT_ARCH_AMD64 /** @todo check out if there is a correct way of getting memory below 4GB (physically). */
+#ifdef RT_ARCH_AMD64
+    /** @todo check out if there is a correct way of getting memory below 4GB (physically).
+     * GFP_DMA32 is available since Linux 2.6.15 */
     paPages = alloc_pages(GFP_DMA, cOrder);
 #else
+    /** XXX Wrong: GFP_USER can return page frames above 4GB! */
     paPages = alloc_pages(GFP_USER, cOrder);
 #endif

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

@@ -531 +531 @@
         rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_LOW, cb, GFP_DMA, false /* non-contiguous */);
 #else
+    /** XXX Wrong: GFP_USER can return page frames above 4GB! */
     rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_LOW, cb, GFP_USER, false /* non-contiguous */);
 #endif
@@ -1174 +1175 @@
                 for (iPage = 0; iPage < cPages; iPage++, ulAddrCur += PAGE_SIZE)
                 {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 11)
+                    uint64_t u64Phys = page_to_phys(pMemLnxToMap->apPages[iPage]);
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) || defined(HAVE_26_STYLE_REMAP_PAGE_RANGE)
                     struct vm_area_struct *vma = find_vma(pTask->mm, ulAddrCur); /* this is probably the same for all the pages... */
                     AssertBreakStmt(vma, rc = VERR_INTERNAL_ERROR);
+#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 11) && defined(RT_ARCH_X86)
+                    /* remap_page_range() limitation on x86 */
+                    AssertBreakStmt(u64Phys < _4G, rc = VERR_NO_MEMORY);
 #endif
 
@@ -1185 +1193 @@
                     rc = remap_pfn_range(vma, ulAddrCur, page_to_pfn(pMemLnxToMap->apPages[iPage]), PAGE_SIZE, fPg);
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) || defined(HAVE_26_STYLE_REMAP_PAGE_RANGE)
-                    rc = remap_page_range(vma, ulAddrCur, page_to_phys(pMemLnxToMap->apPages[iPage]), PAGE_SIZE, fPg);
+                    rc = remap_page_range(vma, ulAddrCur, u64Phys, PAGE_SIZE, fPg);
 #else /* 2.4 */
-                    rc = remap_page_range(ulAddrCur, page_to_phys(pMemLnxToMap->apPages[iPage]), PAGE_SIZE, fPg);
+                    rc = remap_page_range(ulAddrCur, u64Phys, PAGE_SIZE, fPg);
 #endif
                     if (rc)
@@ -1213 +1221 @@
                         AssertBreakStmt(vma, rc = VERR_INTERNAL_ERROR);
 #endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 11) && defined(RT_ARCH_X86)
+                        /* remap_page_range() limitation on x86 */
+                        AssertBreakStmt(Phys < _4G, rc = VERR_NO_MEMORY);
+#endif
 
 #if   LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)