mm, page_alloc: allow hugepage fallback to remote nodes when madvised

[linux-2.6-block.git] / mm / mempolicy.c

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 547cd403ed020eb17f260829942be7b0c35d5e47..8caab1f81a52efc3b4d5fe222433b0754dfd511f 100644 (file)
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -2133,6 +2133,17 @@ alloc_pages_vma(gfp_t gfp, int order, struct vm_area_struct *vma,
                        mpol_cond_put(pol);
                        page = __alloc_pages_node(hpage_node,
                                                gfp | __GFP_THISNODE, order);
+
+                       /*
+                        * If hugepage allocations are configured to always
+                        * synchronous compact or the vma has been madvised
+                        * to prefer hugepage backing, retry allowing remote
+                        * memory as well.
+                        */
+                       if (!page && (gfp & __GFP_DIRECT_RECLAIM))
+                               page = __alloc_pages_node(hpage_node,
+                                               gfp | __GFP_NORETRY, order);
+
                        goto out;
                }
        }