* [PATCH] PM/Hibernate: Thaw kernel threads in SNAPSHOT_CREATE_IMAGE ioctl path
@ 2012-01-30 21:54 Srivatsa S. Bhat
2012-01-30 22:50 ` Rafael J. Wysocki
0 siblings, 1 reply; 2+ messages in thread
From: Srivatsa S. Bhat @ 2012-01-30 21:54 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: pavel, len.brown, Tejun Heo, Linux PM mailing list, linux-kernel
In the SNAPSHOT_CREATE_IMAGE ioctl, if the call to hibernation_snapshot()
fails, the frozen tasks are not thawed.
And in the case of success, if we happen to exit due to a successful freezer
test, all tasks (including those of userspace) are thawed, whereas actually
we should have thawed only the kernel threads at that point. Fix both these
issues.
Cc: stable@vger.kernel.org
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
---
This applies on top of the patch posted at https://lkml.org/lkml/2012/1/27/501
kernel/power/user.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/kernel/power/user.c b/kernel/power/user.c
index e5a21a8..3e10007 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -249,13 +249,15 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
}
pm_restore_gfp_mask();
error = hibernation_snapshot(data->platform_support);
- if (!error) {
+ if (error) {
+ thaw_kernel_threads();
+ } else {
error = put_user(in_suspend, (int __user *)arg);
if (!error && !freezer_test_done)
data->ready = 1;
if (freezer_test_done) {
freezer_test_done = false;
- thaw_processes();
+ thaw_kernel_threads();
}
}
break;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] PM/Hibernate: Thaw kernel threads in SNAPSHOT_CREATE_IMAGE ioctl path
2012-01-30 21:54 [PATCH] PM/Hibernate: Thaw kernel threads in SNAPSHOT_CREATE_IMAGE ioctl path Srivatsa S. Bhat
@ 2012-01-30 22:50 ` Rafael J. Wysocki
0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2012-01-30 22:50 UTC (permalink / raw)
To: Srivatsa S. Bhat
Cc: pavel, len.brown, Tejun Heo, Linux PM mailing list, linux-kernel
On Monday, January 30, 2012, Srivatsa S. Bhat wrote:
> In the SNAPSHOT_CREATE_IMAGE ioctl, if the call to hibernation_snapshot()
> fails, the frozen tasks are not thawed.
>
> And in the case of success, if we happen to exit due to a successful freezer
> test, all tasks (including those of userspace) are thawed, whereas actually
> we should have thawed only the kernel threads at that point. Fix both these
> issues.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Applied.
Thanks,
Rafael
> ---
> This applies on top of the patch posted at https://lkml.org/lkml/2012/1/27/501
>
> kernel/power/user.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/power/user.c b/kernel/power/user.c
> index e5a21a8..3e10007 100644
> --- a/kernel/power/user.c
> +++ b/kernel/power/user.c
> @@ -249,13 +249,15 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
> }
> pm_restore_gfp_mask();
> error = hibernation_snapshot(data->platform_support);
> - if (!error) {
> + if (error) {
> + thaw_kernel_threads();
> + } else {
> error = put_user(in_suspend, (int __user *)arg);
> if (!error && !freezer_test_done)
> data->ready = 1;
> if (freezer_test_done) {
> freezer_test_done = false;
> - thaw_processes();
> + thaw_kernel_threads();
> }
> }
> break;
>
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-01-30 22:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-30 21:54 [PATCH] PM/Hibernate: Thaw kernel threads in SNAPSHOT_CREATE_IMAGE ioctl path Srivatsa S. Bhat
2012-01-30 22:50 ` Rafael J. Wysocki
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).