From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qg0-f72.google.com (mail-qg0-f72.google.com [209.85.192.72]) by kanga.kvack.org (Postfix) with ESMTP id F1AC66B0253 for ; Fri, 13 May 2016 13:26:12 -0400 (EDT) Received: by mail-qg0-f72.google.com with SMTP id b14so147576279qge.2 for ; Fri, 13 May 2016 10:26:12 -0700 (PDT) Received: from mail-qg0-x243.google.com (mail-qg0-x243.google.com. [2607:f8b0:400d:c04::243]) by mx.google.com with ESMTPS id e97si12688641qgd.9.2016.05.13.10.26.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 May 2016 10:26:12 -0700 (PDT) Received: by mail-qg0-x243.google.com with SMTP id 90so8533931qgz.0 for ; Fri, 13 May 2016 10:26:12 -0700 (PDT) Message-ID: <57360e33.45c58c0a.91e0c.4cf1@mx.google.com> Date: Fri, 13 May 2016 10:26:11 -0700 (PDT) From: Yasuaki Ishimatsu Subject: Re: [PATCH 2/3] memory-hotplug: more general validation of zone during online In-Reply-To: <1462816419-4479-3-git-send-email-arbab@linux.vnet.ibm.com> References: <1462816419-4479-1-git-send-email-arbab@linux.vnet.ibm.com> <1462816419-4479-3-git-send-email-arbab@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: Reza Arbab Cc: Greg Kroah-Hartman , Andrew Morton , Daniel Kiper , Dan Williams , Vlastimil Babka , Tang Chen , Joonsoo Kim , David Vrabel , Vitaly Kuznetsov , David Rientjes , Andrew Banman , Chen Yucong , linux-mm@kvack.org, linux-kernel@vger.kernel.org On Mon, 9 May 2016 12:53:38 -0500 Reza Arbab wrote: > When memory is onlined, we are only able to rezone from ZONE_MOVABLE to > ZONE_KERNEL, or from (ZONE_MOVABLE - 1) to ZONE_MOVABLE. > > To be more flexible, use the following criteria instead; to online memory > from zone X into zone Y, > > * Any zones between X and Y must be unused. > * If X is lower than Y, the onlined memory must lie at the end of X. > * If X is higher than Y, the onlined memory must lie at the start of X. > > Add zone_can_shift() to make this determination. > > Signed-off-by: Reza Arbab > --- Looks good to me. Reviewd-by: Yasuaki Ishimatsu Thanks, Yasuaki Ishimatsu > include/linux/memory_hotplug.h | 2 ++ > mm/memory_hotplug.c | 42 +++++++++++++++++++++++++++++++++++------- > 2 files changed, 37 insertions(+), 7 deletions(-) > > diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h > index adbef58..7bff0f9 100644 > --- a/include/linux/memory_hotplug.h > +++ b/include/linux/memory_hotplug.h > @@ -284,5 +284,7 @@ extern void sparse_remove_one_section(struct zone *zone, struct mem_section *ms, > unsigned long map_offset); > extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map, > unsigned long pnum); > +extern int zone_can_shift(unsigned long pfn, unsigned long nr_pages, > + enum zone_type target); > > #endif /* __LINUX_MEMORY_HOTPLUG_H */ > diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c > index 6b4b005..b63cc28 100644 > --- a/mm/memory_hotplug.c > +++ b/mm/memory_hotplug.c > @@ -1032,6 +1032,37 @@ static void node_states_set_node(int node, struct memory_notify *arg) > node_set_state(node, N_MEMORY); > } > > +int zone_can_shift(unsigned long pfn, unsigned long nr_pages, > + enum zone_type target) > +{ > + struct zone *zone = page_zone(pfn_to_page(pfn)); > + enum zone_type idx = zone_idx(zone); > + int i; > + > + if (idx < target) { > + /* pages must be at end of current zone */ > + if (pfn + nr_pages != zone_end_pfn(zone)) > + return 0; > + > + /* no zones in use between current zone and target */ > + for (i = idx + 1; i < target; i++) > + if (zone_is_initialized(zone - idx + i)) > + return 0; > + } > + > + if (target < idx) { > + /* pages must be at beginning of current zone */ > + if (pfn != zone->zone_start_pfn) > + return 0; > + > + /* no zones in use between current zone and target */ > + for (i = target + 1; i < idx; i++) > + if (zone_is_initialized(zone - idx + i)) > + return 0; > + } > + > + return target - idx; > +} > > /* Must be protected by mem_hotplug_begin() */ > int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_type) > @@ -1057,13 +1088,10 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ > !can_online_high_movable(zone)) > return -EINVAL; > > - if (online_type == MMOP_ONLINE_KERNEL && > - zone_idx(zone) == ZONE_MOVABLE) > - zone_shift = -1; > - > - if (online_type == MMOP_ONLINE_MOVABLE && > - zone_idx(zone) == ZONE_MOVABLE - 1) > - zone_shift = 1; > + if (online_type == MMOP_ONLINE_KERNEL) > + zone_shift = zone_can_shift(pfn, nr_pages, ZONE_NORMAL); > + else if (online_type == MMOP_ONLINE_MOVABLE) > + zone_shift = zone_can_shift(pfn, nr_pages, ZONE_MOVABLE); > > zone = move_pfn_range(zone_shift, pfn, pfn + nr_pages); > if (!zone) > -- > 1.8.3.1 > > -- > 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 -- 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