1 files changed, 7 insertions, 0 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 7ff1536f01b8..da7a2fe7332e 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2003,6 +2003,13 @@ void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...)
                 return;
 
         /*
+         * Walking all memory to count page types is very expensive and should
+         * be inhibited in non-blockable contexts.
+         */
+        if (!(gfp_mask & __GFP_WAIT))
+                filter |= SHOW_MEM_FILTER_PAGE_COUNT;
+
+        /*
          * This documents exceptions given to allocations in certain
          * contexts that are allowed to allocate outside current's set
          * of allowed nodes.