Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755842Ab2HFJYY (ORCPT ); Mon, 6 Aug 2012 05:24:24 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:42455 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1755806Ab2HFJYS (ORCPT ); Mon, 6 Aug 2012 05:24:18 -0400 X-IronPort-AV: E=Sophos;i="4.77,719,1336320000"; d="scan'208";a="5560155" From: Lai Jiangshan To: Mel Gorman , linux-kernel@vger.kernel.org Cc: Yasuaki Ishimatsu , Lai Jiangshan , Tejun Heo , Andrew Morton , Yinghai Lu , Sam Ravnborg , Ingo Molnar , Gavin Shan , Michal Hocko , KAMEZAWA Hiroyuki , Minchan Kim , linux-mm@kvack.org Subject: [RFC V3 PATCH 23/25] memblock: limit memory address from memblock Date: Mon, 6 Aug 2012 17:23:17 +0800 Message-Id: <1344244999-5081-24-git-send-email-laijs@cn.fujitsu.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1344244999-5081-1-git-send-email-laijs@cn.fujitsu.com> References: <1343887288-8866-1-git-send-email-laijs@cn.fujitsu.com> <1344244999-5081-1-git-send-email-laijs@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/08/06 17:24:39, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/08/06 17:24:40, Serialize complete at 2012/08/06 17:24:40 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2692 Lines: 76 From: Yasuaki Ishimatsu Setting kernelcore_max_pfn means all memory which is bigger than the boot parameter is allocated as ZONE_MOVABLE. So memory which is allocated by memblock also should be limited by the parameter. The patch limits memory from memblock. Signed-off-by: Yasuaki Ishimatsu Signed-off-by: Lai Jiangshan --- include/linux/memblock.h | 1 + mm/memblock.c | 5 ++++- mm/page_alloc.c | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 19dc455..f2977ae 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 phys_addr_t memblock_limit; #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 5cc6731..663b805 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -931,7 +931,10 @@ int __init_memblock memblock_is_region_reserved(phys_addr_t base, phys_addr_t si void __init_memblock memblock_set_current_limit(phys_addr_t limit) { - memblock.current_limit = limit; + if (!memblock_limit || (memblock_limit > limit)) + memblock.current_limit = limit; + else + memblock.current_limit = memblock_limit; } static void __init_memblock memblock_dump(struct memblock_type *type, char *name) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 65ac5c9..c4d3aa0 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -209,6 +209,8 @@ static unsigned long __initdata required_kernelcore; static unsigned long __initdata required_movablecore; static unsigned long __meminitdata zone_movable_pfn[MAX_NUMNODES]; +phys_addr_t memblock_limit; + /* movable_zone is the "real" zone pages in ZONE_MOVABLE are taken from */ int movable_zone; EXPORT_SYMBOL(movable_zone); @@ -4876,7 +4878,9 @@ static int __init cmdline_parse_core(char *p, unsigned long *core) */ static int __init cmdline_parse_kernelcore_max_addr(char *p) { - return cmdline_parse_core(p, &required_kernelcore_max_pfn); + cmdline_parse_core(p, &required_kernelcore_max_pfn); + memblock_limit = required_kernelcore_max_pfn << PAGE_SHIFT; + return 0; } early_param("kernelcore_max_addr", cmdline_parse_kernelcore_max_addr); #endif -- 1.7.4.4 -- 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/