From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 860E4C2D0C3 for ; Fri, 27 Dec 2019 21:35:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3E93620828 for ; Fri, 27 Dec 2019 21:35:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="j2ZbZhjs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3E93620828 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id DD2708E0007; Fri, 27 Dec 2019 16:35:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D83248E0001; Fri, 27 Dec 2019 16:35:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C98E58E0007; Fri, 27 Dec 2019 16:35:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0231.hostedemail.com [216.40.44.231]) by kanga.kvack.org (Postfix) with ESMTP id B40278E0001 for ; Fri, 27 Dec 2019 16:35:01 -0500 (EST) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id 6A9B54DD4 for ; Fri, 27 Dec 2019 21:35:01 +0000 (UTC) X-FDA: 76312226802.20.watch07_48eabd1f5214a X-HE-Tag: watch07_48eabd1f5214a X-Filterd-Recvd-Size: 4568 Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Fri, 27 Dec 2019 21:35:00 +0000 (UTC) Received: by mail-qv1-f73.google.com with SMTP id d7so18864646qvq.12 for ; Fri, 27 Dec 2019 13:35:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=IWftFaF/7pwaE+hKN0rmHHTDccHnFs4MwoJXhQKr9TA=; b=j2ZbZhjs3hOO6ucFpKNQpPKj0PJ7FGG66PicVamPjsektFwYqzLwaElM2tU/wsn9gs YZDs01w5Iw9H0qKuecHCS4lQccEOUhnxRO8dkMgn+cscpUwRwo4HA1O4EIGacIpae/EK ClVqD/BGxW+N5EN5xit/7U7tpZ15uoVSxkhBGvilZ0V0g+QozdPWNBNnUTxs4MyaQpp6 XMOdGcI6nB9asY4wAFX+umCJyjlu/V+7aDGabXOHIe/Un6zJV45pkH7GQYXkIaw71tql JcZptg3U9/tkoV5xDPgzzMCKtr52nuTv+VbaE2vVr6boWDjIJJ9qj3w9NFMEKiBykvQD Fsew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=IWftFaF/7pwaE+hKN0rmHHTDccHnFs4MwoJXhQKr9TA=; b=L9/oH5P3OyZ+lAE5LZJD1v7QI4rhV5TkEhrd3PlmoGCoou+9ia479tJfY5WCDohrMZ c9eYsbuFNSFgtohMgtnc8yDWDbWbgXupX82THudyJbs7LzkJNix6F2qhMPHyMKEVVbV9 w2mfqBSV5TUgbpv00rK1BRM6h0LXWXu4CJd7RQhlaARc5omLscEyEPj3DiZxe2qT7lxm 1OgLy7KS0rkZPO4Iu06h1ABtYVKtZzPQLah326P+C8IQ9B7kjVfLH/VyLwQDBRzEKI3g Tplvog8vtnE+4sK/M5ONooIVHGF3NKYN3wJCJvUt+MhuQAadDUplbn0rNTaX/16sqYV7 MfZA== X-Gm-Message-State: APjAAAWOnRsIwosV6xTKhjD4pWyDIvT7aWZxyJeCwxIeLRL//KRmz97P 6jy9i8aanaqAC83wu+9Kjue/hQvyV/IF83gWW9fiSZrlp0hCXdbDuQe/Q1PXZ640vyeQycYhwk9 XrlZWM9Xke3l/SsbJ/DvWh0dAZvXnJbTbD2w60K0vUcmTa/LTbO5+mzPLZK190wuW X-Google-Smtp-Source: APXvYqzD6EZO33Q/AM+TrTee4j4zWqk0G57FoUeDXJVwkwBiOOqpDbSDXwxgNdVFdIEBuADvksMAc8tcAeyFWeg= X-Received: by 2002:aed:20c3:: with SMTP id 61mr40310913qtb.392.1577482500300; Fri, 27 Dec 2019 13:35:00 -0800 (PST) Date: Fri, 27 Dec 2019 13:34:39 -0800 In-Reply-To: <20191227213439.139123-1-semenzato@google.com> Message-Id: <20191227213439.139123-3-semenzato@google.com> Mime-Version: 1.0 References: <20191227213439.139123-1-semenzato@google.com> X-Mailer: git-send-email 2.24.1.735.g03f4e72817-goog Subject: [PATCH 2/2] pm: add more logging on hibernation failure From: Luigi Semenzato To: linux-mm@kvack.org Cc: Luigi Semenzato Content-Type: text/plain; charset="UTF-8" X-Bogosity: Ham, tests=bogofilter, spamicity=0.000217, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Hibernation fails when the kernel cannot allocate enough memory to copy all pages in use. This patch ensures that the failure reason is clearly logged. Signed-off-by: Luigi Semenzato --- kernel/power/snapshot.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 26b9168321e7..df498717a97e 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1705,16 +1705,20 @@ int hibernate_preallocate_memory(void) ktime_t start, stop; int error; - pr_info("Preallocating image memory... "); + pr_info("Preallocating hibernation image memory\n"); start = ktime_get(); error = memory_bm_create(&orig_bm, GFP_IMAGE, PG_ANY); - if (error) + if (error) { + pr_err("Cannot allocate original bitmap\n"); goto err_out; + } error = memory_bm_create(©_bm, GFP_IMAGE, PG_ANY); - if (error) + if (error) { + pr_err("Cannot allocate copy bitmap\n"); goto err_out; + } alloc_normal = 0; alloc_highmem = 0; @@ -1804,8 +1808,11 @@ int hibernate_preallocate_memory(void) alloc -= pages; pages += pages_highmem; pages_highmem = preallocate_image_highmem(alloc); - if (pages_highmem < alloc) + if (pages_highmem < alloc) { + pr_err("Image allocation is %lu pages short\n", + alloc - pages_highmem); goto err_out; + } pages += pages_highmem; /* * size is the desired number of saveable pages to leave in @@ -1836,13 +1843,12 @@ int hibernate_preallocate_memory(void) out: stop = ktime_get(); - pr_cont("done (allocated %lu pages)\n", pages); + pr_info("Allocated %lu pages for hibernation shapshot\n", pages); swsusp_show_speed(start, stop, pages, "Allocated"); return 0; err_out: - pr_cont("\n"); swsusp_free(); return -ENOMEM; } -- 2.24.1.735.g03f4e72817-goog