From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751790AbcEIRxw (ORCPT ); Mon, 9 May 2016 13:53:52 -0400 Received: from e19.ny.us.ibm.com ([129.33.205.209]:55853 "EHLO e19.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751304AbcEIRxu (ORCPT ); Mon, 9 May 2016 13:53:50 -0400 X-IBM-Helo: d01dlp01.pok.ibm.com X-IBM-MailFrom: arbab@linux.vnet.ibm.com X-IBM-RcptTo: david.vrabel@citrix.com;tangchen@cn.fujitsu.com;slaoub@gmail.com;rientjes@google.com;dan.j.williams@intel.com;linux-mm@kvack.org;iamjoonsoo.kim@lge.com;akpm@linux-foundation.org;gregkh@linuxfoundation.org;daniel.kiper@oracle.com;vkuznets@redhat.com;abanman@sgi.com;vbabka@suse.cz;linux-kernel@vger.kernel.org From: Reza Arbab To: 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 Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Reza Arbab Subject: [PATCH 3/3] memory-hotplug: use zone_can_shift() for sysfs valid_zones attribute Date: Mon, 9 May 2016 12:53:39 -0500 Message-Id: <1462816419-4479-4-git-send-email-arbab@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1462816419-4479-1-git-send-email-arbab@linux.vnet.ibm.com> References: <1462816419-4479-1-git-send-email-arbab@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16050917-0057-0000-0000-000004435367 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since zone_can_shift() is being used to validate the target zone during onlining, it should also be used to determine the content of valid_zones. Signed-off-by: Reza Arbab --- drivers/base/memory.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 31e9c61..8e385ea 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -389,6 +389,7 @@ static ssize_t show_valid_zones(struct device *dev, unsigned long nr_pages = PAGES_PER_SECTION * sections_per_block; struct page *first_page; struct zone *zone; + int zone_shift = 0; start_pfn = section_nr_to_pfn(mem->start_section_nr); end_pfn = start_pfn + nr_pages; @@ -400,21 +401,26 @@ static ssize_t show_valid_zones(struct device *dev, zone = page_zone(first_page); - if (zone_idx(zone) == ZONE_MOVABLE - 1) { - /*The mem block is the last memoryblock of this zone.*/ - if (end_pfn == zone_end_pfn(zone)) - return sprintf(buf, "%s %s\n", - zone->name, (zone + 1)->name); + /* MMOP_ONLINE_KEEP */ + sprintf(buf, "%s", zone->name); + + /* MMOP_ONLINE_KERNEL */ + zone_shift = zone_can_shift(start_pfn, nr_pages, ZONE_NORMAL); + if (zone_shift) { + strcat(buf, " "); + strcat(buf, (zone + zone_shift)->name); } - if (zone_idx(zone) == ZONE_MOVABLE) { - /*The mem block is the first memoryblock of ZONE_MOVABLE.*/ - if (start_pfn == zone->zone_start_pfn) - return sprintf(buf, "%s %s\n", - zone->name, (zone - 1)->name); + /* MMOP_ONLINE_MOVABLE */ + zone_shift = zone_can_shift(start_pfn, nr_pages, ZONE_MOVABLE); + if (zone_shift) { + strcat(buf, " "); + strcat(buf, (zone + zone_shift)->name); } - return sprintf(buf, "%s\n", zone->name); + strcat(buf, "\n"); + + return strlen(buf); } static DEVICE_ATTR(valid_zones, 0444, show_valid_zones, NULL); #endif -- 1.8.3.1