From: Anchal Agarwal <anchalag@amazon.com> To: <tglx@linutronix.de>, <mingo@redhat.com>, <bp@alien8.de>, <hpa@zytor.com>, <x86@kernel.org>, <boris.ostrovsky@oracle.com>, <jgross@suse.com>, <linux-pm@vger.kernel.org>, <linux-mm@kvack.org>, <kamatam@amazon.com>, <sstabellini@kernel.org>, <konrad.wilk@oracle.com>, <roger.pau@citrix.com>, <axboe@kernel.dk>, <davem@davemloft.net>, <rjw@rjwysocki.net>, <len.brown@intel.com>, <pavel@ucw.cz>, <peterz@infradead.org>, <eduval@amazon.com>, <sblbir@amazon.com>, <anchalag@amazon.com>, <xen-devel@lists.xenproject.org>, <vkuznets@redhat.com>, <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <dwmw@amazon.co.uk>, <fllinden@amaozn.com>, <benh@kernel.crashing.org> Subject: [RFC PATCH v3 12/12] PM / hibernate: update the resume offset on SNAPSHOT_SET_SWAP_AREA Date: Fri, 14 Feb 2020 23:28:07 +0000 [thread overview] Message-ID: <4659d20be8f27e40ef39adfa06b0c759c2d6cd78.1581721799.git.anchalag@amazon.com> (raw) In-Reply-To: <cover.1581721799.git.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> --- 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 77438954cc2b..d396e313cb7b 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c @@ -374,8 +374,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.24.1.AMZN
WARNING: multiple messages have this Message-ID (diff)
From: Anchal Agarwal <anchalag@amazon.com> To: <tglx@linutronix.de>, <mingo@redhat.com>, <bp@alien8.de>, <hpa@zytor.com>, <x86@kernel.org>, <boris.ostrovsky@oracle.com>, <jgross@suse.com>, <linux-pm@vger.kernel.org>, <linux-mm@kvack.org>, <kamatam@amazon.com>, <sstabellini@kernel.org>, <konrad.wilk@oracle.com>, <roger.pau@citrix.com>, <axboe@kernel.dk>, <davem@davemloft.net>, <rjw@rjwysocki.net>, <len.brown@intel.com>, <pavel@ucw.cz>, <peterz@infradead.org>, <eduval@amazon.com>, <sblbir@amazon.com>, <anchalag@amazon.com>, <xen-devel@lists.xenproject.org>, <vkuznets@redhat.com>, <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <dwmw@amazon.co.uk>, <fllinden@amaozn.com>, <benh@kernel.crashing.org> Subject: [Xen-devel] [RFC PATCH v3 12/12] PM / hibernate: update the resume offset on SNAPSHOT_SET_SWAP_AREA Date: Fri, 14 Feb 2020 23:28:07 +0000 [thread overview] Message-ID: <4659d20be8f27e40ef39adfa06b0c759c2d6cd78.1581721799.git.anchalag@amazon.com> (raw) In-Reply-To: <cover.1581721799.git.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> --- 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 77438954cc2b..d396e313cb7b 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c @@ -374,8 +374,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.24.1.AMZN _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2020-02-14 23:28 UTC|newest] Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-14 23:21 [RFC RESEND PATCH v3 00/12] Enable PM hibernation on guest VMs Anchal Agarwal 2020-02-14 23:21 ` [Xen-devel] " Anchal Agarwal 2020-02-14 23:22 ` [RFC PATCH v3 01/12] xen/manage: keep track of the on-going suspend mode Anchal Agarwal 2020-02-14 23:22 ` [Xen-devel] " Anchal Agarwal 2020-02-14 23:23 ` [RFC PATCH v3 02/12] xenbus: add freeze/thaw/restore callbacks support Anchal Agarwal 2020-02-14 23:23 ` [Xen-devel] " Anchal Agarwal 2020-02-14 23:23 ` [RFC PATCH v3 03/12] x86/xen: Introduce new function to map HYPERVISOR_shared_info on Resume Anchal Agarwal 2020-02-14 23:23 ` [Xen-devel] " Anchal Agarwal 2020-02-14 23:24 ` [RFC PATCH v3 04/12] x86/xen: add system core suspend and resume callbacks Anchal Agarwal 2020-02-14 23:24 ` [Xen-devel] " Anchal Agarwal 2020-02-14 23:24 ` [RFC PATCH v3 05/12] xen-netfront: add callbacks for PM suspend and hibernation support Anchal Agarwal 2020-02-14 23:24 ` [Xen-devel] " Anchal Agarwal 2020-02-14 23:25 ` [RFC PATCH v3 06/12] xen-blkfront: add callbacks for PM suspend and hibernation Anchal Agarwal 2020-02-14 23:25 ` [Xen-devel] " Anchal Agarwal 2020-02-17 10:05 ` Roger Pau Monné 2020-02-17 10:05 ` [Xen-devel] " Roger Pau Monné 2020-02-17 23:05 ` Anchal Agarwal 2020-02-17 23:05 ` [Xen-devel] " Anchal Agarwal 2020-02-18 9:16 ` Roger Pau Monné 2020-02-18 9:16 ` [Xen-devel] " Roger Pau Monné 2020-02-19 18:04 ` Anchal Agarwal 2020-02-19 18:04 ` [Xen-devel] " Anchal Agarwal 2020-02-20 8:39 ` Roger Pau Monné 2020-02-20 8:39 ` [Xen-devel] " Roger Pau Monné 2020-02-20 8:54 ` Durrant, Paul 2020-02-20 8:54 ` Durrant, Paul 2020-02-20 15:45 ` Roger Pau Monné 2020-02-20 15:45 ` Roger Pau Monné 2020-02-20 16:23 ` Durrant, Paul 2020-02-20 16:23 ` Durrant, Paul 2020-02-20 16:48 ` Roger Pau Monné 2020-02-20 16:48 ` Roger Pau Monné 2020-02-20 17:01 ` Durrant, Paul 2020-02-20 17:01 ` Durrant, Paul 2020-02-21 0:49 ` Anchal Agarwal 2020-02-21 0:49 ` Anchal Agarwal 2020-02-21 9:47 ` Roger Pau Monné 2020-02-21 9:47 ` Roger Pau Monné 2020-02-21 9:22 ` Roger Pau Monné 2020-02-21 9:22 ` Roger Pau Monné 2020-02-21 9:56 ` Durrant, Paul 2020-02-21 9:56 ` Durrant, Paul 2020-02-21 10:21 ` Roger Pau Monné 2020-02-21 10:21 ` Roger Pau Monné 2020-02-21 10:33 ` Durrant, Paul 2020-02-21 10:33 ` Durrant, Paul 2020-02-21 11:51 ` Roger Pau Monné 2020-02-21 11:51 ` Roger Pau Monné 2020-02-21 14:24 ` Roger Pau Monné 2020-02-21 14:24 ` [Xen-devel] " Roger Pau Monné 2020-03-06 18:40 ` Anchal Agarwal 2020-03-06 18:40 ` [Xen-devel] " Anchal Agarwal 2020-03-09 9:54 ` Roger Pau Monné 2020-03-09 9:54 ` [Xen-devel] " Roger Pau Monné [not found] ` <FA688A68-5372-4757-B075-A69A45671CB9@amazon.com> [not found] ` <20200312090435.GK24449@Air-de-Roger.citrite.net> 2020-03-13 17:21 ` Anchal Agarwal 2020-03-13 17:21 ` [Xen-devel] " Anchal Agarwal 2020-02-14 23:25 ` [RFC PATCH v3 07/12] genirq: Shutdown irq chips in suspend/resume during hibernation Anchal Agarwal 2020-02-14 23:25 ` [Xen-devel] " Anchal Agarwal 2020-03-06 23:03 ` Thomas Gleixner 2020-03-06 23:03 ` [Xen-devel] " Thomas Gleixner 2020-03-09 22:37 ` [EXTERNAL][RFC " Anchal Agarwal 2020-03-09 22:37 ` [Xen-devel] " Anchal Agarwal 2020-02-14 23:26 ` [RFC PATCH v3 08/12] xen/time: introduce xen_{save,restore}_steal_clock Anchal Agarwal 2020-02-14 23:26 ` [Xen-devel] [RFC PATCH v3 08/12] xen/time: introduce xen_{save, restore}_steal_clock Anchal Agarwal 2020-02-14 23:27 ` [RFC PATCH v3 09/12] x86/xen: save and restore steal clock Anchal Agarwal 2020-02-14 23:27 ` [Xen-devel] " Anchal Agarwal 2020-02-14 23:27 ` [RFC PATCH v3 10/12] xen: Introduce wrapper for save/restore sched clock offset Anchal Agarwal 2020-02-14 23:27 ` [Xen-devel] " Anchal Agarwal 2020-02-14 23:27 ` [RFC PATCH v3 11/12] xen: Update sched clock offset to avoid system instability in hibernation Anchal Agarwal 2020-02-14 23:27 ` [Xen-devel] " Anchal Agarwal 2020-02-14 23:28 ` Anchal Agarwal [this message] 2020-02-14 23:28 ` [Xen-devel] [RFC PATCH v3 12/12] PM / hibernate: update the resume offset on SNAPSHOT_SET_SWAP_AREA Anchal Agarwal -- strict thread matches above, loose matches on Subject: below -- 2020-02-12 22:35 Anchal Agarwal
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=4659d20be8f27e40ef39adfa06b0c759c2d6cd78.1581721799.git.anchalag@amazon.com \ --to=anchalag@amazon.com \ --cc=axboe@kernel.dk \ --cc=benh@kernel.crashing.org \ --cc=boris.ostrovsky@oracle.com \ --cc=bp@alien8.de \ --cc=davem@davemloft.net \ --cc=dwmw@amazon.co.uk \ --cc=eduval@amazon.com \ --cc=fllinden@amaozn.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-mm@kvack.org \ --cc=linux-pm@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=netdev@vger.kernel.org \ --cc=pavel@ucw.cz \ --cc=peterz@infradead.org \ --cc=rjw@rjwysocki.net \ --cc=roger.pau@citrix.com \ --cc=sblbir@amazon.com \ --cc=sstabellini@kernel.org \ --cc=tglx@linutronix.de \ --cc=vkuznets@redhat.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.