[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20080312182240.db32c858.akpm@linux-foundation.org>
Date: Wed, 12 Mar 2008 18:22:40 -0700
From: Andrew Morton <akpm@...ux-foundation.org>
To: "Yinghai Lu" <yhlu.kernel@...il.com>
Cc: mingo@...e.hu, clameter@....com, linux-kernel@...r.kernel.org,
Andi Kleen <ak@...e.de>, Yasunori Goto <y-goto@...fujitsu.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>
Subject: Re: [PATCH] mm: fix boundary checking in free_bootmem_core
On Wed, 12 Mar 2008 18:11:41 -0700 "Yinghai Lu" <yhlu.kernel@...il.com> wrote:
> > <looks at it>
> >
> > Sorry, but I find the changelog very hard to amke sense of. I presently
> > have:
> >
> >
> > So call it when numa is enabled, we don't know which node have that
> > range. and make it more robust.
> >
> > Try to trim it to get valid sidx, and eidx.
> >
> > Could you please expand on this?
>
> please check following...
>
Heaps better, thanks ;) Below is what I now have.
(cc's people)
Guys, could you please review this? Maybe test it a bit?
Thanks.
From: "Yinghai Lu" <yhlu.kernel@...il.com>
With numa enabled, some callers could have a range o fmemory on one node but
try to free that on other node. This can cause some pages to be freed
wrongly.
For example: when we try to allocate 128g boot ram early for gart/swiotlb, and
free that range later so gart/swiotlb can get some range afterwards.
With this patch, we don't need to care which node holds the range, just loop
to call free_bootmem_node for all online nodes.
This patch make free_bootmem_core() more robust by trimming the sidx and eidx
according the ram range that the node has.
Signed-off-by: Yinghai Lu <yhlu.kernel@...il.com>
Cc: Andi Kleen <ak@...e.de>
Cc: Yasunori Goto <y-goto@...fujitsu.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>
Cc: Ingo Molnar <mingo@...e.hu>
Cc: Christoph Lameter <clameter@....com>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---
mm/bootmem.c | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff -puN mm/bootmem.c~mm-fix-boundary-checking-in-free_bootmem_core mm/bootmem.c
--- a/mm/bootmem.c~mm-fix-boundary-checking-in-free_bootmem_core
+++ a/mm/bootmem.c
@@ -125,6 +125,7 @@ static int __init reserve_bootmem_core(b
BUG_ON(!size);
BUG_ON(PFN_DOWN(addr) >= bdata->node_low_pfn);
BUG_ON(PFN_UP(addr + size) > bdata->node_low_pfn);
+ BUG_ON(addr < bdata->node_boot_start);
sidx = PFN_DOWN(addr - bdata->node_boot_start);
eidx = PFN_UP(addr + size - bdata->node_boot_start);
@@ -156,21 +157,31 @@ static void __init free_bootmem_core(boo
unsigned long sidx, eidx;
unsigned long i;
+ BUG_ON(!size);
+
+ /* out range */
+ if (addr + size < bdata->node_boot_start ||
+ PFN_DOWN(addr) > bdata->node_low_pfn)
+ return;
/*
* round down end of usable mem, partially free pages are
* considered reserved.
*/
- BUG_ON(!size);
- BUG_ON(PFN_DOWN(addr + size) > bdata->node_low_pfn);
- if (addr < bdata->last_success)
+ if (addr >= bdata->node_boot_start && addr < bdata->last_success)
bdata->last_success = addr;
/*
- * Round up the beginning of the address.
+ * Round up to index to the range.
*/
- sidx = PFN_UP(addr) - PFN_DOWN(bdata->node_boot_start);
+ if (PFN_UP(addr) > PFN_DOWN(bdata->node_boot_start))
+ sidx = PFN_UP(addr) - PFN_DOWN(bdata->node_boot_start);
+ else
+ sidx = 0;
+
eidx = PFN_DOWN(addr + size - bdata->node_boot_start);
+ if (eidx > bdata->node_low_pfn - PFN_DOWN(bdata->node_boot_start))
+ eidx = bdata->node_low_pfn - PFN_DOWN(bdata->node_boot_start);
for (i = sidx; i < eidx; i++) {
if (unlikely(!test_and_clear_bit(i, bdata->node_bootmem_map)))
_
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists