From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx183.postini.com [74.125.245.183]) by kanga.kvack.org (Postfix) with SMTP id 6B5F36B0005 for ; Thu, 28 Feb 2013 16:27:02 -0500 (EST) Received: from /spool/local by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 28 Feb 2013 14:27:01 -0700 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 0D8B719D8042 for ; Thu, 28 Feb 2013 14:26:57 -0700 (MST) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r1SLQsH2173014 for ; Thu, 28 Feb 2013 14:26:55 -0700 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r1SLQpga018301 for ; Thu, 28 Feb 2013 14:26:51 -0700 From: Cody P Schafer Subject: [PATCH 12/24] page_alloc: when dynamic numa is enabled, don't check that all pages in a block belong to the same zone Date: Thu, 28 Feb 2013 13:26:09 -0800 Message-Id: <1362086781-16725-3-git-send-email-cody@linux.vnet.ibm.com> In-Reply-To: <1362086781-16725-1-git-send-email-cody@linux.vnet.ibm.com> References: <1362086781-16725-1-git-send-email-cody@linux.vnet.ibm.com> In-Reply-To: <1362084272-11282-1-git-send-email-cody@linux.vnet.ibm.com> References: <1362084272-11282-1-git-send-email-cody@linux.vnet.ibm.com> Sender: owner-linux-mm@kvack.org List-ID: To: Linux MM Cc: Cody P Schafer , David Hansen When dynamic numa is enabled, the last or first page in a pageblock may have been transplanted to a new zone (or may not yet be transplanted to a new zone). Disable a BUG_ON() which checks that the start_page and end_page are in the same zone, if they are not in the proper zone they will simply be skipped. Signed-off-by: Cody P Schafer --- mm/page_alloc.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 972d7cc..274826c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -966,13 +966,16 @@ int move_freepages(struct zone *zone, int pages_moved = 0; int zone_nid = zone_to_nid(zone); -#ifndef CONFIG_HOLES_IN_ZONE +#if !defined(CONFIG_HOLES_IN_ZONE) && !defined(CONFIG_DYNAMIC_NUMA) /* - * page_zone is not safe to call in this context when - * CONFIG_HOLES_IN_ZONE is set. This bug check is probably redundant - * anyway as we check zone boundaries in move_freepages_block(). - * Remove at a later date when no bug reports exist related to - * grouping pages by mobility + * With CONFIG_HOLES_IN_ZONE set, this check is unsafe as start_page or + * end_page may not be "valid". + * With CONFIG_DYNAMIC_NUMA set, this condition is a valid occurence & + * not a bug. + * + * This bug check is probably redundant anyway as we check zone + * boundaries in move_freepages_block(). Remove at a later date when + * no bug reports exist related to grouping pages by mobility */ BUG_ON(page_zone(start_page) != page_zone(end_page)); #endif -- 1.8.1.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