1 files changed, 13 insertions, 0 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 076463cb21ba..61290ea721c8 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1128,6 +1128,19 @@ again:
                 list_del(&page->lru);
                 pcp->count--;
         } else {
+                if (unlikely(gfp_flags & __GFP_NOFAIL)) {
+                        /*
+                         * __GFP_NOFAIL is not to be used in new code.
+                         *
+                         * All __GFP_NOFAIL callers should be fixed so that they
+                         * properly detect and handle allocation failures.
+                         *
+                         * We most definitely don't want callers attempting to
+                         * allocate greater than single-page units with
+                         * __GFP_NOFAIL.
+                         */
+                        WARN_ON_ONCE(order > 0);
+                }
                 spin_lock_irqsave(&zone->lock, flags);
                 page = __rmqueue(zone, order, migratetype);
                 __mod_zone_page_state(zone, NR_FREE_PAGES, -(1 << order));