From: Anchal Agarwal <anchalag@amazon.com>
To: <tglx@linutronix.de>, <mingo@redhat.com>, <hpa@zytor.com>,
<x86@kernel.org>
Cc: <boris.ostrovsky@oracle.com>, <konrad.wilk@oracle.com>,
<roger.pau@citrix.com>, <netdev@vger.kernel.org>,
<jgross@suse.com>, <xen-devel@lists.xenproject.org>,
<linux-kernel@vger.kernel.org>, <kamatam@amazon.com>,
<anchalag@amazon.com>, <fllinden@amazon.com>,
<vallish@amazon.com>, <guruanb@amazon.com>, <eduval@amazon.com>,
<rjw@rjwysocki.net>, <pavel@ucw.cz>, <len.brown@intel.com>,
<linux-pm@vger.kernel.org>, <cyberax@amazon.com>
Subject: [RFC PATCH 12/12] PM / hibernate: update the resume offset on SNAPSHOT_SET_SWAP_AREA
Date: Tue, 12 Jun 2018 20:56:19 +0000 [thread overview]
Message-ID: <20180612205619.28156-13-anchalag@amazon.com> (raw)
In-Reply-To: <20180612205619.28156-1-anchalag@amazon.com>
From: Aleksei Besogonov <cyberax@amazon.com>
The SNAPSHOT_SET_SWAP_AREA is supposed to be used to set the hibernation
offset on a running kernel to enable hibernating to a swap file.
However, it doesn't actually update the swsusp_resume_block variable. As
a result, the hibernation fails at the last step (after all the data is
written out) in the validation of the swap signature in
mark_swapfiles().
Before this patch, the command line processing was the only place where
swsusp_resume_block was set.
Signed-off-by: Aleksei Besogonov <cyberax@amazon.com>
Signed-off-by: Munehisa Kamata <kamatam@amazon.com>
Signed-off-by: Anchal Agarwal <anchalag@amazon.com>
Reviewed-by: Munehisa Kamata <kamatam@amazon.com>
Reviewed-by: Eduardo Valentin <eduval@amazon.com>
---
kernel/power/user.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/kernel/power/user.c b/kernel/power/user.c
index abd2255..b522a42 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -379,8 +379,12 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
if (swdev) {
offset = swap_area.offset;
data->swap = swap_type_of(swdev, offset, NULL);
- if (data->swap < 0)
+ if (data->swap < 0) {
error = -ENODEV;
+ } else {
+ swsusp_resume_device = swdev;
+ swsusp_resume_block = offset;
+ }
} else {
data->swap = -1;
error = -EINVAL;
--
2.7.4
next prev parent reply other threads:[~2018-06-12 20:57 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-12 20:56 [RFC PATCH 00/12] Enable PM hibernation on guest VMs Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 01/12] xen/manage: keep track of the on-going suspend mode Anchal Agarwal
2018-06-13 16:42 ` Balbir Singh
2018-06-12 20:56 ` [RFC PATCH 02/12] xen/manage: introduce helper function to know " Anchal Agarwal
2018-06-13 17:41 ` Balbir Singh
2018-06-12 20:56 ` [RFC PATCH 03/12] xenbus: add freeze/thaw/restore callbacks support Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 04/12] x86/xen: Introduce new function to map HYPERVISOR_shared_info on Resume Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 05/12] x86/xen: add system core suspend and resume callbacks Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 06/12] xen-blkfront: add callbacks for PM suspend and hibernation Anchal Agarwal
2018-06-13 8:24 ` Roger Pau Monné
[not found] ` <20180613222048.GB33296@kaos-source-ops-60001.pdx1.amazon.com>
2018-06-14 8:43 ` Roger Pau Monné
2018-06-12 20:56 ` [RFC PATCH 07/12] xen-netfront: add callbacks for PM suspend and hibernation support Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 08/12] xen-time-introduce-xen_-save-restore-_steal_clock Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 09/12] x86/xen: save and restore steal clock Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 10/12] xen/events: add xen_shutdown_pirqs helper function Anchal Agarwal
2018-06-12 20:56 ` [RFC PATCH 11/12] x86/xen: close event channels for PIRQs in system core suspend callback Anchal Agarwal
2018-06-12 20:56 ` Anchal Agarwal [this message]
2018-06-14 19:45 ` [RFC PATCH 12/12] PM / hibernate: update the resume offset on SNAPSHOT_SET_SWAP_AREA Pavel Machek
2018-06-14 19:50 ` Besogonov, Aleksei
2018-06-12 21:09 ` [RFC PATCH 00/12] Enable PM hibernation on guest VMs Konrad Rzeszutek Wilk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180612205619.28156-13-anchalag@amazon.com \
--to=anchalag@amazon.com \
--cc=boris.ostrovsky@oracle.com \
--cc=cyberax@amazon.com \
--cc=eduval@amazon.com \
--cc=fllinden@amazon.com \
--cc=guruanb@amazon.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=kamatam@amazon.com \
--cc=konrad.wilk@oracle.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
--cc=roger.pau@citrix.com \
--cc=tglx@linutronix.de \
--cc=vallish@amazon.com \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).