Changeset 22508 in vbox for trunk/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c

Timestamp:

Aug 27, 2009 11:38:33 AM (15 years ago)

Author:

vboxsync

Message:

use GFP_DMA32 first on 32-bit PAE systems (like on 64-bit hosts) when allocating memory below 4GB

File:

• trunk/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c (modified) (1 diff)

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

@@ -239 +239 @@
     cPages = cb >> PAGE_SHIFT;
     cOrder = CalcPowerOf2Order(cPages);
+#if (defined(RT_ARCH_AMD64) || defined(CONFIG_X86_PAE)) && defined(GFP_DMA32)
+    paPages = alloc_pages(GFP_DMA32, cOrder);
+    if (!paPages)
+#endif
 #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);
+        paPages = alloc_pages(GFP_DMA, cOrder);
 #else
-    /** XXX Wrong: GFP_USER can return page frames above 4GB! */
-    paPages = alloc_pages(GFP_USER, cOrder);
+# if defined(CONFIG_X86_PAE)
+    /** GFP_USER can return page frames above 4GB on PAE systems => GFP_DMA? */
+# endif
+        paPages = alloc_pages(GFP_USER, cOrder);
 #endif
     if (paPages)