Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755233Ab2KZMXU (ORCPT ); Mon, 26 Nov 2012 07:23:20 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:54440 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754733Ab2KZMXS (ORCPT ); Mon, 26 Nov 2012 07:23:18 -0500 Message-ID: <50B35F0E.1090905@gmail.com> Date: Mon, 26 Nov 2012 20:22:38 +0800 From: wujianguo User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:14.0) Gecko/20120713 Thunderbird/14.0 MIME-Version: 1.0 To: Tang Chen CC: hpa@zytor.com, akpm@linux-foundation.org, rob@landley.net, isimatu.yasuaki@jp.fujitsu.com, laijs@cn.fujitsu.com, wency@cn.fujitsu.com, linfeng@cn.fujitsu.com, jiang.liu@huawei.com, yinghai@kernel.org, kosaki.motohiro@jp.fujitsu.com, minchan.kim@gmail.com, mgorman@suse.de, rientjes@google.com, rusty@rustcorp.com.au, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-doc@vger.kernel.org Subject: Re: [PATCH v2 5/5] page_alloc: Bootmem limit with movablecore_map References: <1353667445-7593-1-git-send-email-tangchen@cn.fujitsu.com> <1353667445-7593-6-git-send-email-tangchen@cn.fujitsu.com> In-Reply-To: <1353667445-7593-6-git-send-email-tangchen@cn.fujitsu.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2504 Lines: 79 On 2012-11-23 18:44, Tang Chen wrote: > This patch make sure 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 > Signed-off-by: Lai Jiangshan > Reviewed-by: Wen Congyang > Tested-by: Lin Feng > --- > include/linux/memblock.h | 1 + > mm/memblock.c | 15 ++++++++++++++- > 2 files changed, 15 insertions(+), 1 deletions(-) > > diff --git a/include/linux/memblock.h b/include/linux/memblock.h > index d452ee1..6e25597 100644 > --- a/include/linux/memblock.h > +++ b/include/linux/memblock.h > @@ -42,6 +42,7 @@ struct memblock { > > extern struct memblock memblock; > extern int memblock_debug; > +extern struct movablecore_map movablecore_map; > > #define memblock_dbg(fmt, ...) \ > if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) > diff --git a/mm/memblock.c b/mm/memblock.c > index 6259055..33b3b4d 100644 > --- a/mm/memblock.c > +++ b/mm/memblock.c > @@ -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 = movablecore_map.nr_map - 1; > > /* pump up @end */ > if (end == MEMBLOCK_ALLOC_ACCESSIBLE) > @@ -114,13 +115,25 @@ 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 (movablecore_map.map[curr].start < this_end) movablecore_map[curr].start should be movablecore_map[curr].start << PAGE_SHIFT. May be you can change movablecore_map[].start/end to movablecore_map[].start_pfn/end_pfn to avoid confusion. > + break; > + } > + > cand = round_down(this_end - size, align); > + if (curr >= 0 && cand < movablecore_map.map[curr].end) { > + this_end = movablecore_map.map[curr].start; Ditto. > + goto restart; > + } > + > if (cand >= this_start) > return cand; > } > + > return 0; > } > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/