1 files changed, 11 insertions, 3 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 64b7d82a9b1a..6d30e914afb6 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3284,6 +3284,14 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order,
         /* The OOM killer will not help higher order allocs */
         if (order > PAGE_ALLOC_COSTLY_ORDER)
                 goto out;
+        /*
+         * We have already exhausted all our reclaim opportunities without any
+         * success so it is time to admit defeat. We will skip the OOM killer
+         * because it is very likely that the caller has a more reasonable
+         * fallback than shooting a random task.
+         */
+        if (gfp_mask & __GFP_RETRY_MAYFAIL)
+                goto out;
         /* The OOM killer does not needlessly kill tasks for lowmem */
         if (ac->high_zoneidx < ZONE_NORMAL)
                 goto out;
@@ -3413,7 +3421,7 @@ should_compact_retry(struct alloc_context *ac, int order, int alloc_flags,
         }
 
         /*
-         * !costly requests are much more important than __GFP_REPEAT
+         * !costly requests are much more important than __GFP_RETRY_MAYFAIL
          * costly ones because they are de facto nofail and invoke OOM
          * killer to move on while costly can fail and users are ready
          * to cope with that. 1/4 retries is rather arbitrary but we
@@ -3920,9 +3928,9 @@ retry:
 
         /*
          * Do not retry costly high order allocations unless they are
-         * __GFP_REPEAT
+         * __GFP_RETRY_MAYFAIL
          */
-        if (costly_order && !(gfp_mask & __GFP_REPEAT))
+        if (costly_order && !(gfp_mask & __GFP_RETRY_MAYFAIL))
                 goto nopage;
 
         if (should_reclaim_retry(gfp_mask, order, ac, alloc_flags,