* [PATCH] block: initialize the bounce pool if high memory may be added later
@ 2011-10-11 11:53 David Vrabel
2011-10-20 15:27 ` David Vrabel
0 siblings, 1 reply; 3+ messages in thread
From: David Vrabel @ 2011-10-11 11:53 UTC (permalink / raw)
To: linux-kernel; +Cc: Jens Axboe, David Vrabel
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 <david.vrabel@citrix.com>
---
mm/bounce.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/mm/bounce.c b/mm/bounce.c
index 1481de6..434fb4f 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;
#ifdef CONFIG_HIGHMEM
static __init int init_emergency_pool(void)
{
- struct sysinfo i;
- si_meminfo(&i);
- si_swapinfo(&i);
-
- if (!i.totalhigh)
+#ifndef CONFIG_MEMORY_HOTPLUG
+ if (max_pfn <= max_low_pfn)
return 0;
+#endif
page_pool = mempool_create_page_pool(POOL_SIZE, 0);
BUG_ON(!page_pool);
--
1.7.2.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] block: initialize the bounce pool if high memory may be added later
2011-10-11 11:53 [PATCH] block: initialize the bounce pool if high memory may be added later David Vrabel
@ 2011-10-20 15:27 ` David Vrabel
2011-10-20 19:21 ` Jens Axboe
0 siblings, 1 reply; 3+ messages in thread
From: David Vrabel @ 2011-10-20 15:27 UTC (permalink / raw)
To: David Vrabel; +Cc: linux-kernel@vger.kernel.org, Jens Axboe, Andrew Morton
On 11/10/11 12:53, David Vrabel wrote:
> 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).
Jens, you don't seem to have picked up this patch yet. Should it have
gone via Andrew Morton instead?
David
> Signed-off-by: David Vrabel <david.vrabel@citrix.com>
> ---
> mm/bounce.c | 9 ++++-----
> 1 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/mm/bounce.c b/mm/bounce.c
> index 1481de6..434fb4f 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;
> #ifdef CONFIG_HIGHMEM
> static __init int init_emergency_pool(void)
> {
> - struct sysinfo i;
> - si_meminfo(&i);
> - si_swapinfo(&i);
> -
> - if (!i.totalhigh)
> +#ifndef CONFIG_MEMORY_HOTPLUG
> + if (max_pfn <= max_low_pfn)
> return 0;
> +#endif
>
> page_pool = mempool_create_page_pool(POOL_SIZE, 0);
> BUG_ON(!page_pool);
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] block: initialize the bounce pool if high memory may be added later
2011-10-20 15:27 ` David Vrabel
@ 2011-10-20 19:21 ` Jens Axboe
0 siblings, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2011-10-20 19:21 UTC (permalink / raw)
To: David Vrabel; +Cc: linux-kernel@vger.kernel.org, Andrew Morton
On 2011-10-20 17:27, David Vrabel wrote:
> On 11/10/11 12:53, David Vrabel wrote:
>> 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).
>
> Jens, you don't seem to have picked up this patch yet. Should it have
> gone via Andrew Morton instead?
Added now for 3.2.
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-10-20 19:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-11 11:53 [PATCH] block: initialize the bounce pool if high memory may be added later David Vrabel
2011-10-20 15:27 ` David Vrabel
2011-10-20 19:21 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).