From patchwork Wed May 31 12:55:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 101433 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2857219vqr; Wed, 31 May 2023 05:58:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ54pYpLfNdlIXgi00/1Z3qc7kXwDLZeaXxucVeEStaNhxJz6rKHSd1aO0PXTSVdbMkbFyca X-Received: by 2002:a05:620a:8296:b0:75b:23a1:8346 with SMTP id ox22-20020a05620a829600b0075b23a18346mr5309312qkn.65.1685537939725; Wed, 31 May 2023 05:58:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685537939; cv=none; d=google.com; s=arc-20160816; b=BzjiC4gMrc5XzoHSyLKWOJljOpoMcKALVrp7AttF8e/2ajkkwXKzuTMxs0hykorj/4 zPrhbQjoCy26SYu5fi1E/h3f6EdNM9WnpSe+xs5UCW3fy2p73BuALGYxUh9AJFTvNYjs 5NAeLQkuPkaGXK2fFUap4bDCtNrJkgTwjyzIgTMcChQwf4nqsBWYQfbS4apuDJI7n/Og cXCKBJb+FXMNlYFuLkjCQSFw6A9NCxwy+uCIr2GegE8V/f6DOub2VfEng0jrxf0k744r pc2sSA8Q8LaV38jLWbJmwPe1KN4aDlPv0SnnY5z3VBamEncfbozADL3IUh9BrZgzyH7q s8Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/mNIMohr1uFpuUxrcr17WPn+hv1s0+EROxi7hXvr1PA=; b=pdpTq6vX0Ej0ANU4Wyy8AutU6m7egdIeGx5hc+1ld3J7cp5XrQteZH+4+yio88dZFC MGZPRcTWJiNqBM6fdQXGxQ3JsUbqcW5CypOlsU88rkuFyBmdSrFT8pkLm5xE/ZvoJrES HryLUAmfMfO9NFG4pIUmOSS/VIsOFvNoeX3waY0ZKs2dxGz+dHfsBNb2EQ+Lve0bez+F rcS76Qb7HX0AQCk6Vs0X60t6mOj22vEwBKhkpZVUDQ0dhE0O4XU1oIAyTcYRVq2JYDC7 cgBai7LjFVsdO+avKH3hyhUxRLoCwLAqWoU1xbQ7gMnfuDo36ElWgUtOUjKJyS9HFSik rddA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=u866lGd1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e9-20020a636909000000b0050bd71e8618si865071pgc.848.2023.05.31.05.58.46; Wed, 31 May 2023 05:58:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=u866lGd1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236118AbjEaM4i (ORCPT + 99 others); Wed, 31 May 2023 08:56:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235040AbjEaM4c (ORCPT ); Wed, 31 May 2023 08:56:32 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E55CC1B7; Wed, 31 May 2023 05:56:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=/mNIMohr1uFpuUxrcr17WPn+hv1s0+EROxi7hXvr1PA=; b=u866lGd1Vz7A5VVdyUkbO2/gwY 20+X8LAEch7ckqxwPd5twS1ieR8YO9Pyl8P0njz7Koi7E19RrjR7KdpYcR2VbOsZnJkMo7uc1zi8Y ehBF6YjjGmfvesKB0EFJs3dRbXGFQO3umTFm7dOgfL3O7S9ONK5X2xB5fHgDOdFxMa7bAITF/SaxW H70Y9lzqVxCdLcINYJtFs9PzXJX277XJlAGwf/ATadOumBCdPmN5ZtWQv5yO3E2kogKMJjOOCA93W 9+nH+RyxDLMjHiyMuGQmeKbWyqvh2pFsqDeQ/iEyG7iZKo7XPhcZrSCVYBroFw22V3mKj+QhdIFXn I3Gu4kNg==; Received: from [2001:4bb8:182:6d06:2e49:a56:513a:92ee] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1q4LMk-00HQwo-2V; Wed, 31 May 2023 12:55:51 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Greg Kroah-Hartman , "Rafael J. Wysocki" , Mike Snitzer , Joern Engel , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Pavel Machek , Loic Poulain , dm-devel@redhat.com, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-mtd@lists.infradead.org, linux-pm@vger.kernel.org Subject: [PATCH 02/24] PM: hibernate: factor out a helper to find the resume device Date: Wed, 31 May 2023 14:55:13 +0200 Message-Id: <20230531125535.676098-3-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531125535.676098-1-hch@lst.de> References: <20230531125535.676098-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767414630822913407?= X-GMAIL-MSGID: =?utf-8?q?1767414630822913407?= Split the logic to find the resume device out software_resume and into a separate helper to start unwindig the convoluted goto logic. Signed-off-by: Christoph Hellwig Acked-by: Rafael J. Wysocki --- kernel/power/hibernate.c | 72 +++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 30d1274f03f625..07279506366255 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -910,6 +910,41 @@ int hibernate_quiet_exec(int (*func)(void *data), void *data) } EXPORT_SYMBOL_GPL(hibernate_quiet_exec); +static int find_resume_device(void) +{ + if (!strlen(resume_file)) + return -ENOENT; + + pm_pr_dbg("Checking hibernation image partition %s\n", resume_file); + + if (resume_delay) { + pr_info("Waiting %dsec before reading resume device ...\n", + resume_delay); + ssleep(resume_delay); + } + + /* Check if the device is there */ + swsusp_resume_device = name_to_dev_t(resume_file); + if (swsusp_resume_device) + return 0; + + /* + * Some device discovery might still be in progress; we need to wait for + * this to finish. + */ + wait_for_device_probe(); + if (resume_wait) { + while (!(swsusp_resume_device = name_to_dev_t(resume_file))) + msleep(10); + async_synchronize_full(); + } + + swsusp_resume_device = name_to_dev_t(resume_file); + if (!swsusp_resume_device) + return -ENODEV; + return 0; +} + /** * software_resume - Resume from a saved hibernation image. * @@ -949,45 +984,12 @@ static int software_resume(void) snapshot_test = false; - if (swsusp_resume_device) - goto Check_image; - - if (!strlen(resume_file)) { - error = -ENOENT; - goto Unlock; - } - - pm_pr_dbg("Checking hibernation image partition %s\n", resume_file); - - if (resume_delay) { - pr_info("Waiting %dsec before reading resume device ...\n", - resume_delay); - ssleep(resume_delay); - } - - /* Check if the device is there */ - swsusp_resume_device = name_to_dev_t(resume_file); if (!swsusp_resume_device) { - /* - * Some device discovery might still be in progress; we need - * to wait for this to finish. - */ - wait_for_device_probe(); - - if (resume_wait) { - while ((swsusp_resume_device = name_to_dev_t(resume_file)) == 0) - msleep(10); - async_synchronize_full(); - } - - swsusp_resume_device = name_to_dev_t(resume_file); - if (!swsusp_resume_device) { - error = -ENODEV; + error = find_resume_device(); + if (error) goto Unlock; - } } - Check_image: pm_pr_dbg("Hibernation image partition %d:%d present\n", MAJOR(swsusp_resume_device), MINOR(swsusp_resume_device));