From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx166.postini.com [74.125.245.166]) by kanga.kvack.org (Postfix) with SMTP id 3BE5D6B0062 for ; Fri, 27 Jul 2012 13:57:04 -0400 (EDT) Received: by mail-pb0-f41.google.com with SMTP id rp2so6139790pbb.14 for ; Fri, 27 Jul 2012 10:57:03 -0700 (PDT) From: Joonsoo Kim Subject: [RESEND PATCH 3/4 v3] mm: fix return value in __alloc_contig_migrate_range() Date: Sat, 28 Jul 2012 02:55:02 +0900 Message-Id: <1343411703-2720-3-git-send-email-js1304@gmail.com> In-Reply-To: <1343411703-2720-1-git-send-email-js1304@gmail.com> References: <1343411703-2720-1-git-send-email-js1304@gmail.com> Sender: owner-linux-mm@kvack.org List-ID: To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Joonsoo Kim , Michal Nazarewicz , Marek Szyprowski , Minchan Kim , Christoph Lameter migrate_pages() can return positive value while at the same time emptying the list of pages it was called with. Such situation means that it went through all the pages on the list some of which failed to be migrated. If that happens, __alloc_contig_migrate_range()'s loop may finish without "++tries == 5" never being checked. This in turn means that at the end of the function, ret may have a positive value, which should be treated as an error. This patch changes __alloc_contig_migrate_range() so that the return statement converts positive ret value into -EBUSY error. Signed-off-by: Joonsoo Kim Cc: Michal Nazarewicz Cc: Marek Szyprowski Cc: Minchan Kim Cc: Christoph Lameter Acked-by: Christoph Lameter Acked-by: Michal Nazarewicz diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 4403009..02d4519 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5673,7 +5673,6 @@ static int __alloc_contig_migrate_range(unsigned long start, unsigned long end) } tries = 0; } else if (++tries == 5) { - ret = ret < 0 ? ret : -EBUSY; break; } @@ -5683,7 +5682,7 @@ static int __alloc_contig_migrate_range(unsigned long start, unsigned long end) } putback_lru_pages(&cc.migratepages); - return ret > 0 ? 0 : ret; + return ret <= 0 ? ret : -EBUSY; } /* -- 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