Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755788Ab2HFJYM (ORCPT ); Mon, 6 Aug 2012 05:24:12 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:42420 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1755751Ab2HFJYF (ORCPT ); Mon, 6 Aug 2012 05:24:05 -0400 X-IronPort-AV: E=Sophos;i="4.77,719,1336320000"; d="scan'208";a="5560151" From: Lai Jiangshan To: Mel Gorman , linux-kernel@vger.kernel.org Cc: Lai Jiangshan , Greg Kroah-Hartman , Christoph Lameter , Hillf Danton , Andrew Morton , Jan Beulich , Seth Jennings , Dan Magenheimer , Michal Hocko , KAMEZAWA Hiroyuki , Minchan Kim , linux-mm@kvack.org Subject: [RFC V3 PATCH 19/25] numa: add CONFIG_MOVABLE_NODE for movable-dedicated node Date: Mon, 6 Aug 2012 17:23:13 +0800 Message-Id: <1344244999-5081-20-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:27, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/08/06 17:24:29, Serialize complete at 2012/08/06 17:24:29 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2669 Lines: 92 All are prepared, we can actually introduce N_MEMORY. add CONFIG_MOVABLE_NODE make we can use it for movable-dedicated node Signed-off-by: Lai Jiangshan --- drivers/base/node.c | 6 ++++++ include/linux/nodemask.h | 4 ++++ mm/Kconfig | 8 ++++++++ mm/page_alloc.c | 3 +++ 4 files changed, 21 insertions(+), 0 deletions(-) diff --git a/drivers/base/node.c b/drivers/base/node.c index 4c3aa7c..653b5e2 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -620,6 +620,9 @@ static struct node_attr node_state_attr[] = { #ifdef CONFIG_HIGHMEM [N_HIGH_MEMORY] = _NODE_ATTR(has_high_memory, N_HIGH_MEMORY), #endif +#ifdef CONFIG_MOVABLE_NODE + [N_MEMORY] = _NODE_ATTR(has_memory, N_MEMORY), +#endif [N_CPU] = _NODE_ATTR(has_cpu, N_CPU), }; @@ -630,6 +633,9 @@ static struct attribute *node_state_attrs[] = { #ifdef CONFIG_HIGHMEM &node_state_attr[N_HIGH_MEMORY].attr.attr, #endif +#ifdef CONFIG_MOVABLE_NODE + &node_state_attr[N_MEMORY].attr.attr, +#endif &node_state_attr[N_CPU].attr.attr, NULL }; diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h index c6ebdc9..4e2cbfa 100644 --- a/include/linux/nodemask.h +++ b/include/linux/nodemask.h @@ -380,7 +380,11 @@ enum node_states { #else N_HIGH_MEMORY = N_NORMAL_MEMORY, #endif +#ifdef CONFIG_MOVABLE_NODE + N_MEMORY, /* The node has memory(regular, high, movable) */ +#else N_MEMORY = N_HIGH_MEMORY, +#endif N_CPU, /* The node has one or more cpus */ NR_NODE_STATES }; diff --git a/mm/Kconfig b/mm/Kconfig index 82fed4e..4371c65 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -140,6 +140,14 @@ config ARCH_DISCARD_MEMBLOCK config NO_BOOTMEM boolean +config MOVABLE_NODE + boolean "Enable to assign a node has only movable memory" + depends on HAVE_MEMBLOCK + depends on NO_BOOTMEM + depends on X86_64 + depends on NUMA + default y + # eventually, we can have this option just 'select SPARSEMEM' config MEMORY_HOTPLUG bool "Allow for memory hot-add" diff --git a/mm/page_alloc.c b/mm/page_alloc.c index edffc35..03ad63d 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -91,6 +91,9 @@ nodemask_t node_states[NR_NODE_STATES] __read_mostly = { #ifdef CONFIG_HIGHMEM [N_HIGH_MEMORY] = { { [0] = 1UL } }, #endif +#ifdef CONFIG_MOVABLE_NODE + [N_MEMORY] = { { [0] = 1UL } }, +#endif [N_CPU] = { { [0] = 1UL } }, #endif /* NUMA */ }; -- 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/