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 3F3FFC2D0C2 for ; Thu, 2 Jan 2020 20:01:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id F0A9722525 for ; Thu, 2 Jan 2020 20:01:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ETFtyUbG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F0A9722525 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 9891E8E0007; Thu, 2 Jan 2020 15:01:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 916A78E0003; Thu, 2 Jan 2020 15:01:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 803008E0007; Thu, 2 Jan 2020 15:01:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0094.hostedemail.com [216.40.44.94]) by kanga.kvack.org (Postfix) with ESMTP id 647A78E0003 for ; Thu, 2 Jan 2020 15:01:16 -0500 (EST) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id 1D66D2C07 for ; Thu, 2 Jan 2020 20:01:16 +0000 (UTC) X-FDA: 76333763352.09.cloth58_2821a9006a760 X-HE-Tag: cloth58_2821a9006a760 X-Filterd-Recvd-Size: 4584 Received: from mail-vs1-f73.google.com (mail-vs1-f73.google.com [209.85.217.73]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Thu, 2 Jan 2020 20:01:15 +0000 (UTC) Received: by mail-vs1-f73.google.com with SMTP id i1so1194509vsp.4 for ; Thu, 02 Jan 2020 12:01:15 -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=ETFtyUbGasImdWusI7+XxX+jtfzy6TbJUp8B/J87NDJKrN0tpvcu+AhRbowiMtcdgg bgjYmyFMHeiZP1YyPkOJe2abYtU+18pqk98PIqIpdmXhiL+NCzGaUfwooMn7yIw2l2sK XNt0kZnYXtKpSNWS81hh9vYloEblPeBm9UO7rjtiG9Mnbfl6BL6rQonfw28PD19VxaYB AtHFPgoQq9kWjklvzY6rcLgQZVIhOxkgZQILADhE/vJ2AnmTJgZg/Nokpsq0P1dpwgGQ hJ0Kkj0DAet+gYl0w8PbWpXOWeuJ4xr8D2GffvLt2+nHrPQgHnWpO70Z1VvVu5hp/FdP hVzQ== 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=VXGza9W/eRaknIC3QP/CzG8d7X/+MGHMKLPRVSa25UDirMoKBzkeHLK+nUF6KRssgR EwPksIwQ9LWI/BZwl7zHK6IAhxd1ob9lN4JRlsYS2ef4or3jyDnAJvU8X5TzMpGxAqkp cm1DznwMNa/a36aWrafGYVaj3uM0SZVF5mpfB6wB9II8mCzNe49QV9aQKU+i8QGTaXMJ kSfgGeZnDT/jUyA5gvIGy4A5IIlC7ohM+HPebxuFh7NJ+cxyM+QqcVRmWOO8jq7TYTdg Kj3o44hx9Im3Yj9n9ggwe8dj/rtnW/F41kFY+bKo0f4FB//JRzUDjuGnV9yC6QFLP41/ sIdA== X-Gm-Message-State: APjAAAVrKVwSoB5046smvN9SkQvu3r78Qfodoyd4vnXsEozGVWIzoyMd p7y2+G9QMRmu6CqQ271nGUh0VqiaczuxSeY= X-Google-Smtp-Source: APXvYqwtC1Uvje2fbb36HVwCkmW0QcIlFAti3E9fgJHG6wwvnd7vXeyx2pz2lLd6Iz8RTxqnfNJndL5sU4NFASA= X-Received: by 2002:a1f:d904:: with SMTP id q4mr43772171vkg.13.1577995274922; Thu, 02 Jan 2020 12:01:14 -0800 (PST) Date: Thu, 2 Jan 2020 12:00:52 -0800 In-Reply-To: <20200102200052.51182-1-semenzato@google.com> Message-Id: <20200102200052.51182-3-semenzato@google.com> Mime-Version: 1.0 References: <20200102200052.51182-1-semenzato@google.com> X-Mailer: git-send-email 2.24.1.735.g03f4e72817-goog Subject: [PATCH v2 2/2] pm: add more logging on hibernation failure From: Luigi Semenzato To: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org, rafael@kernel.org, gpike@google.com, Luigi Semenzato Content-Type: text/plain; charset="UTF-8" X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, 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