From patchwork Tue Oct 16 08:39:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mel Gorman X-Patchwork-Id: 191755 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 576EE2C00A3 for ; Tue, 16 Oct 2012 19:39:53 +1100 (EST) Received: from localhost ([::1]:33245 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TO2go-00064G-VO for incoming@patchwork.ozlabs.org; Tue, 16 Oct 2012 04:39:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TO2gd-000642-VF for qemu-devel@nongnu.org; Tue, 16 Oct 2012 04:39:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TO2gX-0002y8-VR for qemu-devel@nongnu.org; Tue, 16 Oct 2012 04:39:39 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45448 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TO2gX-0002xt-PH for qemu-devel@nongnu.org; Tue, 16 Oct 2012 04:39:33 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id D5D18A398E; Tue, 16 Oct 2012 10:39:31 +0200 (CEST) Date: Tue, 16 Oct 2012 09:39:27 +0100 From: Mel Gorman To: Andrew Morton Message-ID: <20121016083927.GG29125@suse.de> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: Richard Davies , KVM , Arnd Bergmann , QEMU-devel , LKML , Linux-MM , Avi Kivity , Shaohua Li , Arm Kernel Mailing List Subject: [Qemu-devel] [PATCH] mm: compaction: Correct the nr_strict_isolated check for CMA X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Thierry reported that the "iron out" patch for isolate_freepages_block() had problems due to the strict check being too strict with "mm: compaction: Iron out isolate_freepages_block() and isolate_freepages_range() -fix1". It's possible that more pages than necessary are isolated but the check still fails and I missed that this fix was not picked up before RC1. This same problem has been identified in 3.7-RC1 by Tony Prisk and should be addressed by the following patch. Signed-off-by: Mel Gorman Tested-by: Tony Prisk Acked-by: Rik van Riel Acked-by: Minchan Kim --- mm/compaction.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/compaction.c b/mm/compaction.c index 2c4ce17..9eef558 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -346,7 +346,7 @@ static unsigned long isolate_freepages_block(struct compact_control *cc, * pages requested were isolated. If there were any failures, 0 is * returned and CMA will fail. */ - if (strict && nr_strict_required != total_isolated) + if (strict && nr_strict_required > total_isolated) total_isolated = 0; if (locked)