From: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
To: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Linux PM list <linux-pm@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>, Jan Kara <jack@suse.cz>,
linux-fsdevel@vger.kernel.org, Dave Chinner <david@fromorbit.com>,
Nigel Cunningham <nigel@tuxonice.net>,
Pavel Machek <pavel@ucw.cz>,
Martin@lichtvoll.de
Subject: Re: [RFC][PATCH] PM / Sleep: Freeze filesystems during system suspend/hibernation
Date: Sun, 29 Jan 2012 21:58:05 +0530 [thread overview]
Message-ID: <4F257395.9070804@linux.vnet.ibm.com> (raw)
In-Reply-To: <201201281445.49377.rjw@sisk.pl>
On 01/28/2012 07:15 PM, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rjw@sisk.pl>
>
> Freeze all filesystems during system suspend and (kernel-driven)
> hibernation by calling freeze_supers() for all superblocks and thaw
> them during the subsequent resume with the help of thaw_supers().
>
> This makes filesystems stay in a consistent state in case something
> goes wrong between system suspend (or hibernation) and the subsequent
> resume (e.g. journal replays won't be necessary in those cases). In
> particular, this should help to solve a long-standing issue that, in
> some cases, during resume from hibernation the boot loader causes the
> journal to be replied for the filesystem containing the kernel image
> and/or initrd causing it to become inconsistent with the information
> stored in the hibernation image.
>
> The user-space-driven hibernation (s2disk) is not covered by this
> change, because the freezing of filesystems prevents s2disk from
> accessing device special files it needs to do its job.
>
> This change is based on earlier work by Nigel Cunningham.
>
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> ---
> fs/super.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++
> include/linux/fs.h | 3 +
> kernel/power/hibernate.c | 11 +++++--
> kernel/power/power.h | 23 --------------
> kernel/power/suspend.c | 42 +++++++++++++++++++++++++++
> 5 files changed, 128 insertions(+), 24 deletions(-)
>
...
> Index: linux/kernel/power/suspend.c
> ===================================================================
> --- linux.orig/kernel/power/suspend.c
> +++ linux/kernel/power/suspend.c
> @@ -29,6 +29,48 @@
>
> #include "power.h"
>
> +#ifdef CONFIG_SUSPEND_FREEZER
> +
> +static inline int suspend_freeze_processes(void)
> +{
> + int error;
> +
> + error = freeze_processes();
> + if (error)
> + return error;
> +
> + error = freeze_supers();
> + if (error) {
> + thaw_processes();
> + return error;
> + }
> +
> + error = freeze_kernel_threads();
> + if (error)
> + thaw_supers();
> +
If freezing of kernel threads fails, freeze_kernel_threads() calls
thaw_processes(), which means, even userspace processes get thawed.
So, there would be a time-window in which userspace is thawed but the
filesystems are still frozen. That is not very desirable right?
If that is right, then modifying freeze_kernel_threads() to call
thaw_kernel_threads() instead of thaw_processes() would fix it
(and of course, we would need to explicitly call thaw_processes
above).
BTW, after your patch posted at https://lkml.org/lkml/2012/1/27/501,
I very much wanted to write a patch to convert the semantics of
freeze/thaw to something like:
freeze_processes() calls thaw_processes on error.
//Both touch only userspace processes.
freeze_kernel_threads() calls thaw_kernel_threads() on error.
//Both touch only kernel threads.
Of course, such a patch would need to do a lot of fixing up at several
places, but IMHO, it would really help make the overall code more logical
and easier to understand.
I can write it up and post it soon, but then you'll have to rebase
your patch (this one) on top of that. What do you say?
Regards,
Srivatsa S. Bhat
> + return error;
> +}
> +
> +static inline void suspend_thaw_processes(void)
> +{
> + thaw_supers();
> + thaw_processes();
> +}
> +
> +#else /* !CONFIG_SUSPEND_FREEZER */
> +
> +static inline int suspend_freeze_processes(void)
> +{
> + return 0;
> +}
> +
> +static inline void suspend_thaw_processes(void)
> +{
> +}
> +
> +#endif /* !CONFIG_SUSPEND_FREEZER */
> +
> const char *const pm_states[PM_SUSPEND_MAX] = {
> [PM_SUSPEND_STANDBY] = "standby",
> [PM_SUSPEND_MEM] = "mem",
> Index: linux/kernel/power/hibernate.c
> ===================================================================
> --- linux.orig/kernel/power/hibernate.c
> +++ linux/kernel/power/hibernate.c
> @@ -626,12 +626,17 @@ int hibernate(void)
> if (error)
> goto Finish;
>
> - error = hibernation_snapshot(hibernation_mode == HIBERNATION_PLATFORM);
> + error = freeze_supers();
> if (error)
> goto Thaw;
> +
> + error = hibernation_snapshot(hibernation_mode == HIBERNATION_PLATFORM);
> + if (error)
> + goto Thaw_fs;
> +
> if (freezer_test_done) {
> freezer_test_done = false;
> - goto Thaw;
> + goto Thaw_fs;
> }
>
> if (in_suspend) {
> @@ -655,6 +660,8 @@ int hibernate(void)
> pr_debug("PM: Image restored successfully.\n");
> }
>
> + Thaw_fs:
> + thaw_supers();
> Thaw:
> thaw_processes();
> Finish:
>
next prev parent reply other threads:[~2012-01-29 16:28 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-28 13:45 [RFC][PATCH] PM / Sleep: Freeze filesystems during system suspend/hibernation Rafael J. Wysocki
2012-01-28 21:23 ` Nigel Cunningham
2012-01-29 15:55 ` Martin Steigerwald
2012-01-29 19:53 ` Rafael J. Wysocki
2012-01-29 16:28 ` Srivatsa S. Bhat [this message]
2012-01-29 19:53 ` Rafael J. Wysocki
2012-01-30 23:24 ` Srivatsa S. Bhat
2012-01-30 20:00 ` Jan Kara
2012-01-30 21:05 ` Rafael J. Wysocki
2012-01-30 21:10 ` Nigel Cunningham
2012-01-31 0:03 ` Jan Kara
2012-01-30 23:58 ` Jan Kara
2012-02-01 13:36 ` Pavel Machek
2012-02-01 15:29 ` Alan Stern
2012-02-10 2:52 ` Jamie Lokier
2012-02-10 9:03 ` Jan Kara
2012-02-02 3:17 ` Nigel Cunningham
2012-02-17 15:41 ` Josh Boyer
2012-02-17 18:33 ` Josh Boyer
2012-02-17 20:59 ` Rafael J. Wysocki
2012-05-25 16:55 ` Josh Boyer
2012-05-25 19:13 ` Rafael J. Wysocki
2013-12-17 16:03 ` Josh Boyer
2013-12-17 16:04 ` Josh Boyer
2013-12-17 23:08 ` Pavel Machek
2013-12-17 23:31 ` Dave Chinner
2013-12-18 0:01 ` Pavel Machek
2013-12-18 12:39 ` Dave Chinner
2013-12-18 14:08 ` Pavel Machek
2013-12-19 0:22 ` Dave Chinner
2013-12-21 23:33 ` Pavel Machek
2013-12-23 3:48 ` Dave Chinner
2013-12-18 0:52 ` Rafael J. Wysocki
2013-12-18 1:00 ` Josh Boyer
2013-12-18 1:16 ` Rafael J. Wysocki
2013-12-18 12:31 ` Josh Boyer
2013-12-18 21:40 ` Rafael J. Wysocki
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=4F257395.9070804@linux.vnet.ibm.com \
--to=srivatsa.bhat@linux.vnet.ibm.com \
--cc=Martin@lichtvoll.de \
--cc=david@fromorbit.com \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=nigel@tuxonice.net \
--cc=pavel@ucw.cz \
--cc=rjw@sisk.pl \
/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).