From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758174Ab1KRQXZ (ORCPT ); Fri, 18 Nov 2011 11:23:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50834 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758090Ab1KRQXO (ORCPT ); Fri, 18 Nov 2011 11:23:14 -0500 From: Stanislaw Gruszka To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, Mel Gorman , Andrea Arcangeli , Andrew Morton , "Rafael J. Wysocki" , Christoph Lameter , Stanislaw Gruszka Subject: [PATCH v2 2/3] PM / Hibernate : do not count debug pages as savable Date: Fri, 18 Nov 2011 17:25:06 +0100 Message-Id: <1321633507-13614-2-git-send-email-sgruszka@redhat.com> In-Reply-To: <1321633507-13614-1-git-send-email-sgruszka@redhat.com> References: <1321633507-13614-1-git-send-email-sgruszka@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When debugging with CONFIG_DEBUG_PAGEALLOC and debug_guardpage_minorder > 0, we have lot of free pages that are not marked so. Snapshot code account them as savable, what cause hibernate memory preallocation failure. It is pretty hard to make hibernate allocation succeed with debug_guardpage_minorder=1. This change at least make it possible when system has relatively big amount of RAM. v1 -> v2: - change "corrupt" name to guard page Acked-by: Rafael J. Wysocki Signed-off-by: Stanislaw Gruszka --- kernel/power/snapshot.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index cbe2c14..1cf8890 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -858,6 +858,9 @@ static struct page *saveable_highmem_page(struct zone *zone, unsigned long pfn) PageReserved(page)) return NULL; + if (page_is_guard(page)) + return NULL; + return page; } @@ -920,6 +923,9 @@ static struct page *saveable_page(struct zone *zone, unsigned long pfn) && (!kernel_page_present(page) || pfn_is_nosave(pfn))) return NULL; + if (page_is_guard(page)) + return NULL; + return page; } -- 1.7.1