1 files changed, 16 insertions, 1 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 36be3ba4bbed..2aaafe82f513 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1714,6 +1714,20 @@ try_next_zone:
         return page;
 }
 
+/*
+ * Large machines with many possible nodes should not always dump per-node
+ * meminfo in irq context.
+ */
+static inline bool should_suppress_show_mem(void)
+{
+        bool ret = false;
+
+#if NODES_SHIFT > 8
+        ret = in_interrupt();
+#endif
+        return ret;
+}
+
 static inline int
 should_alloc_retry(gfp_t gfp_mask, unsigned int order,
                                 unsigned long pages_reclaimed)
@@ -2161,7 +2175,8 @@ nopage:
                         " order:%d, mode:0x%x\n",
                         current->comm, order, gfp_mask);
                 dump_stack();
-                show_mem();
+                if (!should_suppress_show_mem())
+                        show_mem();
         }
         return page;
 got_pg: