From 4dad2e01b0158b17d28dee82a5c184e9811f8e27 Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Mon, 29 Apr 2013 15:06:11 -0700
Subject: [PATCH] --- yaml --- r: 365343 b: refs/heads/master c:
 4b59e6c4730978679b414a8da61514a2518da512 h: refs/heads/master i:   365341:
 bd2870ed5ac8423e28470388ddf4ce76e39e555b   365339:
 624394aa5eeccc142a52cb8a54d76d32108de81c   365335:
 87a29203a68769c450709d3e3b194ac57900f1cd   365327:
 d4287faece9ac14cec666e03f8c2a042371eefc3   365311:
 6535af670fc31a4200fdb19a4b6194cec0a75dc1 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/mm/init.c       | 3 +++
 trunk/arch/ia64/mm/contig.c    | 2 ++
 trunk/arch/ia64/mm/discontig.c | 2 ++
 trunk/arch/parisc/mm/init.c    | 2 ++
 trunk/arch/unicore32/mm/init.c | 3 +++
 trunk/include/linux/mm.h       | 3 ++-
 trunk/lib/show_mem.c           | 3 +++
 trunk/mm/page_alloc.c          | 7 +++++++
 9 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1143944d0557..4b95ad3e3109 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe0bfaaff84429a35e4447d4ccd646aecf5999fb
+refs/heads/master: 4b59e6c4730978679b414a8da61514a2518da512
diff --git a/trunk/arch/arm/mm/init.c b/trunk/arch/arm/mm/init.c
index ad722f1208a5..ad9a9f3f0322 100644
--- a/trunk/arch/arm/mm/init.c
+++ b/trunk/arch/arm/mm/init.c
@@ -99,6 +99,9 @@ void show_mem(unsigned int filter)
 	printk("Mem-info:\n");
 	show_free_areas(filter);
 
+	if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
+		return;
+
 	for_each_bank (i, mi) {
 		struct membank *bank = &mi->bank[i];
 		unsigned int pfn1, pfn2;
diff --git a/trunk/arch/ia64/mm/contig.c b/trunk/arch/ia64/mm/contig.c
index 80dab509dfb0..67c59ebec899 100644
--- a/trunk/arch/ia64/mm/contig.c
+++ b/trunk/arch/ia64/mm/contig.c
@@ -47,6 +47,8 @@ void show_mem(unsigned int filter)
 	printk(KERN_INFO "Mem-info:\n");
 	show_free_areas(filter);
 	printk(KERN_INFO "Node memory in pages:\n");
+	if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
+		return;
 	for_each_online_pgdat(pgdat) {
 		unsigned long present;
 		unsigned long flags;
diff --git a/trunk/arch/ia64/mm/discontig.c b/trunk/arch/ia64/mm/discontig.c
index c2e955ee79a8..a57436e5d405 100644
--- a/trunk/arch/ia64/mm/discontig.c
+++ b/trunk/arch/ia64/mm/discontig.c
@@ -623,6 +623,8 @@ void show_mem(unsigned int filter)
 
 	printk(KERN_INFO "Mem-info:\n");
 	show_free_areas(filter);
+	if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
+		return;
 	printk(KERN_INFO "Node memory in pages:\n");
 	for_each_online_pgdat(pgdat) {
 		unsigned long present;
diff --git a/trunk/arch/parisc/mm/init.c b/trunk/arch/parisc/mm/init.c
index 3ac462de53a4..cf2da13c41e6 100644
--- a/trunk/arch/parisc/mm/init.c
+++ b/trunk/arch/parisc/mm/init.c
@@ -697,6 +697,8 @@ void show_mem(unsigned int filter)
 
 	printk(KERN_INFO "Mem-info:\n");
 	show_free_areas(filter);
+	if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
+		return;
 #ifndef CONFIG_DISCONTIGMEM
 	i = max_mapnr;
 	while (i-- > 0) {
diff --git a/trunk/arch/unicore32/mm/init.c b/trunk/arch/unicore32/mm/init.c
index de186bde8975..644482882bae 100644
--- a/trunk/arch/unicore32/mm/init.c
+++ b/trunk/arch/unicore32/mm/init.c
@@ -66,6 +66,9 @@ void show_mem(unsigned int filter)
 	printk(KERN_DEFAULT "Mem-info:\n");
 	show_free_areas(filter);
 
+	if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
+		return;
+
 	for_each_bank(i, mi) {
 		struct membank *bank = &mi->bank[i];
 		unsigned int pfn1, pfn2;
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
index e2091b88d24c..f3c7b1f9d1d8 100644
--- a/trunk/include/linux/mm.h
+++ b/trunk/include/linux/mm.h
@@ -899,7 +899,8 @@ extern void pagefault_out_of_memory(void);
  * Flags passed to show_mem() and show_free_areas() to suppress output in
  * various contexts.
  */
-#define SHOW_MEM_FILTER_NODES	(0x0001u)	/* filter disallowed nodes */
+#define SHOW_MEM_FILTER_NODES		(0x0001u)	/* disallowed nodes */
+#define SHOW_MEM_FILTER_PAGE_COUNT	(0x0002u)	/* page type count */
 
 extern void show_free_areas(unsigned int flags);
 extern bool skip_free_areas_node(unsigned int flags, int nid);
diff --git a/trunk/lib/show_mem.c b/trunk/lib/show_mem.c
index 4407f8c9b1f7..b7c72311ad0c 100644
--- a/trunk/lib/show_mem.c
+++ b/trunk/lib/show_mem.c
@@ -18,6 +18,9 @@ void show_mem(unsigned int filter)
 	printk("Mem-Info:\n");
 	show_free_areas(filter);
 
+	if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
+		return;
+
 	for_each_online_pgdat(pgdat) {
 		unsigned long i, flags;
 
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 7ff1536f01b8..da7a2fe7332e 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -2002,6 +2002,13 @@ void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...)
 	    debug_guardpage_minorder() > 0)
 		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