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 BD417C2D0C0 for ; Thu, 26 Dec 2019 22:02:29 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7D68920828 for ; Thu, 26 Dec 2019 22:02:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="gkZdvYRI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7D68920828 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 106118E0007; Thu, 26 Dec 2019 17:02:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0DDCE8E0001; Thu, 26 Dec 2019 17:02:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F35B78E0007; Thu, 26 Dec 2019 17:02:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0129.hostedemail.com [216.40.44.129]) by kanga.kvack.org (Postfix) with ESMTP id E22A58E0001 for ; Thu, 26 Dec 2019 17:02:28 -0500 (EST) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id 9B91D2C07 for ; Thu, 26 Dec 2019 22:02:28 +0000 (UTC) X-FDA: 76308667176.08.seat37_6ce5a7644d61b X-HE-Tag: seat37_6ce5a7644d61b X-Filterd-Recvd-Size: 4669 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) by imf39.hostedemail.com (Postfix) with ESMTP for ; Thu, 26 Dec 2019 22:02:28 +0000 (UTC) Received: by mail-pg1-f202.google.com with SMTP id c8so14965153pgl.15 for ; Thu, 26 Dec 2019 14:02:28 -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=gkZdvYRIM6t/k5mvuiOx0NjfLs8crDbn+2OtfVQzXTnkf6e+nNttco+jq6a/qP5oON /y0+M3BAAzcRXG2LZrJNaLyKa4mG/9AELtjd4dIFKjBPJHtyGADgLZ1sr00z1SdXGSgG JbGc/Jq+Ka2wgAakUhGMqkpJWt0kpwqLiKmdvBoRlS8FKqN9nifvr/tgH4f91BcZX7iE ay1h92vcYGzo1FrWidKKBNdVSe3XO7qxM+pk28acwFCaeTARXxPMCCTl3TReEXPo0nrc W5ejQ61bxVlRc2bgokOjh4XqGPjlZan7anjbQY7eGeOMyaZdwEN9z3IzUbOF+9yn36Ns 8pbg== 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=N/R5FUoqqiX7ELzg5L53CSeCwK+ryjU34wpFZhpBdNqGsW60wCeU5zgp9kXEXzkDSZ M1YBW6UIG9otV2z3u/aFFAkwLSi3sKBiEIJbVWEohdM7c0WcFt8dltwkRrmve81Ea0JC bLqVVLknNrv4/u9F8SQZ77LjCkhIhJb6vwjozLxbukgZsrBrc6dqGjMzPeC3ZPawA5FX /EskSWCjMD++XSs5YHSM4H6BP4JBW3VVzUOLy7K5MY1Auir8fIR3/PsOMLtLWcmqTOub oi/TWKaYdSj40V75yhPLsn2T3q7Fp63mALwFIp1Kq2EgW3dnMPCnLzyiM1xqZNyI+mGR UJHg== X-Gm-Message-State: APjAAAWp9k4PET4eTdLnrf9Ti7ZwdvQVoYcWye7HSLaksIBC79mbFQBA e0PgZGPpBD+1fqPXv4hPYqf7HtvlX0M/tXnPOXQgBBRlVu12QWatRoL5Eyq3+l3CIJB3Ztja40t zX0sfF12ei2A21yp0fsWoN6lEtKj/MglWdgTRkpTuHkc+/3o0ay2crTzvV2zbnywe X-Google-Smtp-Source: APXvYqygoqLJ8SQsBJagXnXMwLThPZ1Q7K65Ic9rVUp5GhbxT0kZYEMJZGBoPByE7ohpqmcY8EDJJ7fSSmg5L4g= X-Received: by 2002:a63:1c5e:: with SMTP id c30mr51963594pgm.30.1577397747273; Thu, 26 Dec 2019 14:02:27 -0800 (PST) Date: Thu, 26 Dec 2019 14:02:05 -0800 In-Reply-To: <20191226220205.128664-1-semenzato@google.com> Message-Id: <20191226220205.128664-3-semenzato@google.com> Mime-Version: 1.0 References: <20191226220205.128664-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, linux-kernel@vger.kernel.org Cc: rafael@kernel.org, akpm@linux-foundation.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