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 630516B0037 for ; Fri, 2 Aug 2013 12:06:45 -0400 (EDT) From: Andrea Arcangeli Subject: [PATCH 4/9] mm: zone_reclaim: compaction: reset before initializing the scan cursors Date: Fri, 2 Aug 2013 18:06:31 +0200 Message-Id: <1375459596-30061-5-git-send-email-aarcange@redhat.com> In-Reply-To: <1375459596-30061-1-git-send-email-aarcange@redhat.com> References: <1375459596-30061-1-git-send-email-aarcange@redhat.com> Sender: owner-linux-mm@kvack.org List-ID: To: linux-mm@kvack.org Cc: Johannes Weiner , Mel Gorman , Rik van Riel , Hugh Dickins , Richard Davies , Shaohua Li , Rafael Aquini , Andrew Morton , Hush Bensen Correct the location where we reset the scan cursors, otherwise the first iteration of compaction (after restarting it) will only do a partial scan. Signed-off-by: Andrea Arcangeli Reviewed-by: Rik van Riel Acked-by: Mel Gorman Acked-by: Rafael Aquini --- mm/compaction.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 525baaa..afaf692 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -934,6 +934,17 @@ static int compact_zone(struct zone *zone, struct compact_control *cc) } /* + * Clear pageblock skip if there were failures recently and + * compaction is about to be retried after being + * deferred. kswapd does not do this reset and it will wait + * direct compaction to do so either when the cursor meets + * after one compaction pass is complete or if compaction is + * restarted after being deferred for a while. + */ + if ((compaction_restarting(zone, cc->order)) && !current_is_kswapd()) + __reset_isolation_suitable(zone); + + /* * Setup to move all movable pages to the end of the zone. Used cached * information on where the scanners should start but check that it * is initialised by ensuring the values are within zone boundaries. @@ -949,14 +960,6 @@ static int compact_zone(struct zone *zone, struct compact_control *cc) zone->compact_cached_migrate_pfn = cc->migrate_pfn; } - /* - * Clear pageblock skip if there were failures recently and compaction - * is about to be retried after being deferred. kswapd does not do - * this reset as it'll reset the cached information when going to sleep. - */ - if (compaction_restarting(zone, cc->order) && !current_is_kswapd()) - __reset_isolation_suitable(zone); - migrate_prep_local(); while ((ret = compact_finished(zone, cc)) == COMPACT_CONTINUE) { -- 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