Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932699AbcDYNgB (ORCPT ); Mon, 25 Apr 2016 09:36:01 -0400 Received: from mx2.suse.de ([195.135.220.15]:41983 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932502AbcDYNf5 (ORCPT ); Mon, 25 Apr 2016 09:35:57 -0400 From: Vlastimil Babka To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Michal Hocko , Joonsoo Kim , Hugh Dickins , Rik van Riel , stable@vger.kernel.org, Vlastimil Babka Subject: [PATCH 4.6 1/3] mm, cma: prevent nr_isolated_* counters from going negative Date: Mon, 25 Apr 2016 15:35:48 +0200 Message-Id: <1461591350-28700-2-git-send-email-vbabka@suse.cz> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461591350-28700-1-git-send-email-vbabka@suse.cz> References: <1461591269-28615-1-git-send-email-vbabka@suse.cz> <1461591350-28700-1-git-send-email-vbabka@suse.cz> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1851 Lines: 49 From: Hugh Dickins /proc/sys/vm/stat_refresh warns nr_isolated_anon and nr_isolated_file go increasingly negative under compaction: which would add delay when should be none, or no delay when should delay. The bug in compaction was due to a recent mmotm patch, but much older instance of the bug was also noticed in isolate_migratepages_range() which is used for CMA and gigantic hugepage allocations. The bug is caused by putback_movable_pages() in an error path decrementing the isolated counters without them being previously incremented by acct_isolated(). Fix isolate_migratepages_range() by removing the error-path putback, thus reaching acct_isolated() with migratepages still isolated, and leaving putback to caller like most other places do. [vbabka@suse.cz: expanded the changelog] Fixes: edc2ca612496 ("mm, compaction: move pageblock checks up from isolate_migratepages_range()") Cc: stable@vger.kernel.org Cc: Joonsoo Kim Signed-off-by: Hugh Dickins Signed-off-by: Vlastimil Babka --- mm/compaction.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 2427fe547a20..759c3ac73ced 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -924,16 +924,8 @@ isolate_migratepages_range(struct compact_control *cc, unsigned long start_pfn, pfn = isolate_migratepages_block(cc, pfn, block_end_pfn, ISOLATE_UNEVICTABLE); - /* - * In case of fatal failure, release everything that might - * have been isolated in the previous iteration, and signal - * the failure back to caller. - */ - if (!pfn) { - putback_movable_pages(&cc->migratepages); - cc->nr_migratepages = 0; + if (!pfn) break; - } if (cc->nr_migratepages == COMPACT_CLUSTER_MAX) break; -- 2.8.1