From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx171.postini.com [74.125.245.171]) by kanga.kvack.org (Postfix) with SMTP id 478F56B002B for ; Wed, 26 Sep 2012 02:47:04 -0400 (EDT) From: Minchan Kim Subject: [PATCH] CMA: decrease cc.nr_migratepages after reclaiming pagelist Date: Wed, 26 Sep 2012 15:50:12 +0900 Message-Id: <1348642212-29394-1-git-send-email-minchan@kernel.org> Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Minchan Kim , Mel Gorman , Michal Nazarewicz , Bartlomiej Zolnierkiewicz , Marek Szyprowski The reclaim_clean_pages_from_list reclaims clean pages before migration so cc.nr_migratepages should be updated. Currently, there is no problem but it can be wrong if we try to use the vaule in future. Cc: Mel Gorman Cc: Michal Nazarewicz Cc: Bartlomiej Zolnierkiewicz Cc: Marek Szyprowski Signed-off-by: Minchan Kim --- I found this problem during I develop new feature. :( mm/page_alloc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 296bea9..4b7dced 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5669,7 +5669,7 @@ static unsigned long pfn_max_align_up(unsigned long pfn) static int __alloc_contig_migrate_range(unsigned long start, unsigned long end) { /* This function is based on compact_zone() from compaction.c. */ - + unsigned long nr_reclaimed; unsigned long pfn = start; unsigned int tries = 0; int ret = 0; @@ -5705,7 +5705,9 @@ static int __alloc_contig_migrate_range(unsigned long start, unsigned long end) break; } - reclaim_clean_pages_from_list(cc.zone, &cc.migratepages); + nr_reclaimed = reclaim_clean_pages_from_list(cc.zone, + &cc.migratepages); + cc.nr_migratepages -= nr_reclaimed; ret = migrate_pages(&cc.migratepages, alloc_migrate_target, -- 1.7.9.5 -- 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