From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wang Nan Date: Fri, 18 Jul 2014 09:52:12 +0000 Subject: Re: [PATCH 2/5] memory-hotplug: x86_32: suitable memory should go to ZONE_MOVABLE Message-Id: <53C8EE4C.1000204@huawei.com> List-Id: References: <1405670163-53747-1-git-send-email-wangnan0@huawei.com> <1405670163-53747-3-git-send-email-wangnan0@huawei.com> In-Reply-To: <1405670163-53747-3-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Ingo Molnar , Yinghai Lu , Mel Gorman , Andrew Morton Cc: Pei Feiyue , linux-mm@kvack.org, x86@kernel.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org On 2014/7/18 15:56, Wang Nan wrote: > This patch add new memory to ZONE_MOVABLE if movable zone is setup > and lower than newly added memory for x86_32. > > Signed-off-by: Wang Nan > --- > arch/x86/mm/init_32.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c > index e395048..dd69833 100644 > --- a/arch/x86/mm/init_32.c > +++ b/arch/x86/mm/init_32.c > @@ -826,9 +826,15 @@ int arch_add_memory(int nid, u64 start, u64 size) > { > struct pglist_data *pgdata = NODE_DATA(nid); > struct zone *zone = pgdata->node_zones + ZONE_HIGHMEM; > + struct zone *movable_zone = pgdat->node_zones + ZONE_MOVABLE; Sorry. pgdat should be pgdata. > unsigned long start_pfn = start >> PAGE_SHIFT; > unsigned long nr_pages = size >> PAGE_SHIFT; > > + if (!zone_is_empty(movable_zone)) > + if (zone_spans_pfn(movable_zone, start_pfn) || > + (zone_end_pfn(movable_zone) <= start_pfn)) > + zone = movable_zone; > + > return __add_pages(nid, zone, start_pfn, nr_pages); > } > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [119.145.14.64]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id EEC8D1A07E0 for ; Fri, 18 Jul 2014 19:52:31 +1000 (EST) Message-ID: <53C8EE4C.1000204@huawei.com> Date: Fri, 18 Jul 2014 17:52:12 +0800 From: Wang Nan MIME-Version: 1.0 To: Ingo Molnar , Yinghai Lu , "Mel Gorman" , Andrew Morton Subject: Re: [PATCH 2/5] memory-hotplug: x86_32: suitable memory should go to ZONE_MOVABLE References: <1405670163-53747-1-git-send-email-wangnan0@huawei.com> <1405670163-53747-3-git-send-email-wangnan0@huawei.com> In-Reply-To: <1405670163-53747-3-git-send-email-wangnan0@huawei.com> Content-Type: text/plain; charset="GB2312" Cc: linux-ia64@vger.kernel.org, Pei Feiyue , linux-sh@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On 2014/7/18 15:56, Wang Nan wrote: > This patch add new memory to ZONE_MOVABLE if movable zone is setup > and lower than newly added memory for x86_32. > > Signed-off-by: Wang Nan > --- > arch/x86/mm/init_32.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c > index e395048..dd69833 100644 > --- a/arch/x86/mm/init_32.c > +++ b/arch/x86/mm/init_32.c > @@ -826,9 +826,15 @@ int arch_add_memory(int nid, u64 start, u64 size) > { > struct pglist_data *pgdata = NODE_DATA(nid); > struct zone *zone = pgdata->node_zones + ZONE_HIGHMEM; > + struct zone *movable_zone = pgdat->node_zones + ZONE_MOVABLE; Sorry. pgdat should be pgdata. > unsigned long start_pfn = start >> PAGE_SHIFT; > unsigned long nr_pages = size >> PAGE_SHIFT; > > + if (!zone_is_empty(movable_zone)) > + if (zone_spans_pfn(movable_zone, start_pfn) || > + (zone_end_pfn(movable_zone) <= start_pfn)) > + zone = movable_zone; > + > return __add_pages(nid, zone, start_pfn, nr_pages); > } > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f174.google.com (mail-pd0-f174.google.com [209.85.192.174]) by kanga.kvack.org (Postfix) with ESMTP id 12DE56B0035 for ; Fri, 18 Jul 2014 05:53:50 -0400 (EDT) Received: by mail-pd0-f174.google.com with SMTP id fp1so4774369pdb.33 for ; Fri, 18 Jul 2014 02:53:49 -0700 (PDT) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com. [119.145.14.64]) by mx.google.com with ESMTPS id wu6si4226638pab.61.2014.07.18.02.53.47 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 18 Jul 2014 02:53:49 -0700 (PDT) Message-ID: <53C8EE4C.1000204@huawei.com> Date: Fri, 18 Jul 2014 17:52:12 +0800 From: Wang Nan MIME-Version: 1.0 Subject: Re: [PATCH 2/5] memory-hotplug: x86_32: suitable memory should go to ZONE_MOVABLE References: <1405670163-53747-1-git-send-email-wangnan0@huawei.com> <1405670163-53747-3-git-send-email-wangnan0@huawei.com> In-Reply-To: <1405670163-53747-3-git-send-email-wangnan0@huawei.com> Content-Type: text/plain; charset="GB2312" Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: Ingo Molnar , Yinghai Lu , Mel Gorman , Andrew Morton Cc: Pei Feiyue , linux-mm@kvack.org, x86@kernel.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org On 2014/7/18 15:56, Wang Nan wrote: > This patch add new memory to ZONE_MOVABLE if movable zone is setup > and lower than newly added memory for x86_32. > > Signed-off-by: Wang Nan > --- > arch/x86/mm/init_32.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c > index e395048..dd69833 100644 > --- a/arch/x86/mm/init_32.c > +++ b/arch/x86/mm/init_32.c > @@ -826,9 +826,15 @@ int arch_add_memory(int nid, u64 start, u64 size) > { > struct pglist_data *pgdata = NODE_DATA(nid); > struct zone *zone = pgdata->node_zones + ZONE_HIGHMEM; > + struct zone *movable_zone = pgdat->node_zones + ZONE_MOVABLE; Sorry. pgdat should be pgdata. > unsigned long start_pfn = start >> PAGE_SHIFT; > unsigned long nr_pages = size >> PAGE_SHIFT; > > + if (!zone_is_empty(movable_zone)) > + if (zone_spans_pfn(movable_zone, start_pfn) || > + (zone_end_pfn(movable_zone) <= start_pfn)) > + zone = movable_zone; > + > return __add_pages(nid, zone, start_pfn, nr_pages); > } > > -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761146AbaGRJwa (ORCPT ); Fri, 18 Jul 2014 05:52:30 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:35942 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934416AbaGRJw1 (ORCPT ); Fri, 18 Jul 2014 05:52:27 -0400 Message-ID: <53C8EE4C.1000204@huawei.com> Date: Fri, 18 Jul 2014 17:52:12 +0800 From: Wang Nan User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Thunderbird/24.0.1 MIME-Version: 1.0 To: Ingo Molnar , Yinghai Lu , "Mel Gorman" , Andrew Morton CC: Pei Feiyue , , , , , , Subject: Re: [PATCH 2/5] memory-hotplug: x86_32: suitable memory should go to ZONE_MOVABLE References: <1405670163-53747-1-git-send-email-wangnan0@huawei.com> <1405670163-53747-3-git-send-email-wangnan0@huawei.com> In-Reply-To: <1405670163-53747-3-git-send-email-wangnan0@huawei.com> Content-Type: text/plain; charset="GB2312" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.111.69.90] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2014/7/18 15:56, Wang Nan wrote: > This patch add new memory to ZONE_MOVABLE if movable zone is setup > and lower than newly added memory for x86_32. > > Signed-off-by: Wang Nan > --- > arch/x86/mm/init_32.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c > index e395048..dd69833 100644 > --- a/arch/x86/mm/init_32.c > +++ b/arch/x86/mm/init_32.c > @@ -826,9 +826,15 @@ int arch_add_memory(int nid, u64 start, u64 size) > { > struct pglist_data *pgdata = NODE_DATA(nid); > struct zone *zone = pgdata->node_zones + ZONE_HIGHMEM; > + struct zone *movable_zone = pgdat->node_zones + ZONE_MOVABLE; Sorry. pgdat should be pgdata. > unsigned long start_pfn = start >> PAGE_SHIFT; > unsigned long nr_pages = size >> PAGE_SHIFT; > > + if (!zone_is_empty(movable_zone)) > + if (zone_spans_pfn(movable_zone, start_pfn) || > + (zone_end_pfn(movable_zone) <= start_pfn)) > + zone = movable_zone; > + > return __add_pages(nid, zone, start_pfn, nr_pages); > } > >