diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-01-29 20:35:52 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-13 11:16:55 -0800 |
| commit | d483054fe4c66eeb7a03fdc97519b07edb1dc803 (patch) | |
| tree | 8bb2bda4e5e658fdb4f129bc247ce17e916c717a /kernel | |
| parent | 9da11afefb6f8ccc0f7731831f7ad73106fc87f3 (diff) | |
PM / Hibernate: Fix s2disk regression related to freezing workqueues
commit 181e9bdef37bfcaa41f3ab6c948a2a0d60a268b5 upstream.
Commit 2aede851ddf08666f68ffc17be446420e9d2a056
PM / Hibernate: Freeze kernel threads after preallocating memory
introduced a mechanism by which kernel threads were frozen after
the preallocation of hibernate image memory to avoid problems with
frozen kernel threads not responding to memory freeing requests.
However, it overlooked the s2disk code path in which the
SNAPSHOT_CREATE_IMAGE ioctl was run directly after SNAPSHOT_FREE,
which caused freeze_workqueues_begin() to BUG(), because it saw
that worqueues had been already frozen.
Although in principle this issue might be addressed by removing
the relevant BUG_ON() from freeze_workqueues_begin(), that would
reintroduce the very problem that commit 2aede851ddf08666f68ffc17be4
attempted to avoid into that particular code path. For this reason,
to fix the issue at hand, introduce thaw_kernel_threads() and make
the SNAPSHOT_FREE ioctl execute it.
Special thanks to Srivatsa S. Bhat for detailed analysis of the
problem.
Reported-and-tested-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/process.c | 9 | ||||
| -rw-r--r-- | kernel/power/user.c | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c index addbbe5531bc..3d4b9544eeba 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c @@ -203,3 +203,12 @@ void thaw_processes(void) printk("done.\n"); } +void thaw_kernel_threads(void) +{ + printk("Restarting kernel threads ... "); + thaw_workqueues(); + thaw_tasks(true); + schedule(); + printk("done.\n"); +} + diff --git a/kernel/power/user.c b/kernel/power/user.c index 6d8f535c2b88..3565b1521c17 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c @@ -303,6 +303,15 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, swsusp_free(); memset(&data->handle, 0, sizeof(struct snapshot_handle)); data->ready = 0; + /* + * It is necessary to thaw kernel threads here, because + * SNAPSHOT_CREATE_IMAGE may be invoked directly after + * SNAPSHOT_FREE. In that case, if kernel threads were not + * thawed, the preallocation of memory carried out by + * hibernation_snapshot() might run into problems (i.e. it + * might fail or even deadlock). + */ + thaw_kernel_threads(); break; case SNAPSHOT_SET_IMAGE_SIZE: |