diff options
authorDavid Vrabel <>2011-10-20 21:24:30 +0200
committerJens Axboe <>2011-10-20 21:24:30 +0200
commit3bcfeaf93f44112053e1c36aa681d9efc1185ddc (patch)
parentc9a929dde3913780b5c416f4bb9d9ed804f509ce (diff)
block: initialize the bounce pool if high memory may be added later
init_emergency_pool() does not create the page pool for bouncing block requests if the current count of high pages is zero. If high memory may be added later (either via memory hotplug or a balloon driver in a virtualized system) then a oops occurs if a request with a high page need bouncing because the pool does not exist. So, always create the pool if memory hotplug is enabled and change the test so it's valid even if all high pages are currently in the balloon (the balloon drivers adjust totalhigh_pages but not max_pfn). Signed-off-by: David Vrabel <> Signed-off-by: Jens Axboe <>
1 files changed, 4 insertions, 5 deletions
diff --git a/mm/bounce.c b/mm/bounce.c
index 1481de68184b..434fb4f0c5e4 100644
--- a/mm/bounce.c
+++ b/mm/bounce.c
@@ -14,6 +14,7 @@
#include <linux/init.h>
#include <linux/hash.h>
#include <linux/highmem.h>
+#include <linux/bootmem.h>
#include <asm/tlbflush.h>
#include <trace/events/block.h>
@@ -26,12 +27,10 @@ static mempool_t *page_pool, *isa_page_pool;
static __init int init_emergency_pool(void)
- struct sysinfo i;
- si_meminfo(&i);
- si_swapinfo(&i);
- if (!i.totalhigh)
+ if (max_pfn <= max_low_pfn)
return 0;
page_pool = mempool_create_page_pool(POOL_SIZE, 0);