mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-10-31 18:09:19 +00:00
page_alloc: bootmem limit with movablecore_map
Ensure the bootmem will not allocate memory from areas that may be ZONE_MOVABLE. The map info is from movablecore_map boot option. Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com> Reviewed-by: Wen Congyang <wency@cn.fujitsu.com> Reviewed-by: Lai Jiangshan <laijs@cn.fujitsu.com> Tested-by: Lin Feng <linfeng@cn.fujitsu.com> Cc: Wu Jianguo <wujianguo@huawei.com> Cc: Mel Gorman <mel@csn.ul.ie> Cc: Ingo Molnar <mingo@elte.hu> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
42f47e27e7
commit
fb06bc8e5f
2 changed files with 18 additions and 1 deletions
|
@ -42,6 +42,7 @@ struct memblock {
|
|||
|
||||
extern struct memblock memblock;
|
||||
extern int memblock_debug;
|
||||
extern struct movablemem_map movablemem_map;
|
||||
|
||||
#define memblock_dbg(fmt, ...) \
|
||||
if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
|
||||
|
|
|
@ -101,6 +101,7 @@ phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t start,
|
|||
{
|
||||
phys_addr_t this_start, this_end, cand;
|
||||
u64 i;
|
||||
int curr = movablemem_map.nr_map - 1;
|
||||
|
||||
/* pump up @end */
|
||||
if (end == MEMBLOCK_ALLOC_ACCESSIBLE)
|
||||
|
@ -114,13 +115,28 @@ phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t start,
|
|||
this_start = clamp(this_start, start, end);
|
||||
this_end = clamp(this_end, start, end);
|
||||
|
||||
if (this_end < size)
|
||||
restart:
|
||||
if (this_end <= this_start || this_end < size)
|
||||
continue;
|
||||
|
||||
for (; curr >= 0; curr--) {
|
||||
if ((movablemem_map.map[curr].start_pfn << PAGE_SHIFT)
|
||||
< this_end)
|
||||
break;
|
||||
}
|
||||
|
||||
cand = round_down(this_end - size, align);
|
||||
if (curr >= 0 &&
|
||||
cand < movablemem_map.map[curr].end_pfn << PAGE_SHIFT) {
|
||||
this_end = movablemem_map.map[curr].start_pfn
|
||||
<< PAGE_SHIFT;
|
||||
goto restart;
|
||||
}
|
||||
|
||||
if (cand >= this_start)
|
||||
return cand;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue