From: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
To: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: pm list <linux-pm@lists.linux-foundation.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
Kernel Testers List <kernel-testers@vger.kernel.org>,
Mel Gorman <mel@csn.ul.ie>, Pavel Machek <pavel@ucw.cz>
Subject: [PATCH] uswsusp: automatically free the in-memory image once s2disk has finished with it
Date: Wed, 02 Dec 2009 14:28:12 +0000 [thread overview]
Message-ID: <4B16797C.3010304@tuffmail.co.uk> (raw)
In-Reply-To: <20091202122019.GD1457@csn.ul.ie>
The original in-kernel suspend (swsusp) frees the in-memory hibernation
image before powering off the machine. s2disk doesn't, so there is
_much_ less free memory when it tries to power off.
This is a gratuitous difference. The userspace suspend interface
/dev/snapshot only allows the hibernation image to be read once.
Once the s2disk program has read the last page, we can free the entire
image.
This avoids a hang after writing the hibernation image which was
triggered by commit 5f8dcc21211a3d4e3a7a5ca366b469fb88117f61
"page-allocator: split per-cpu list into one-list-per-migrate-type":
[top of trace lost due to screen height]
? shrink_zone
? try_to_free_pages
? isolate_pages_global
? __alloc_pages_nodemask
? kthread
? __get_free_pages
? copy_process
? kthread
? do_fork
...
INFO: task s2disk:2036 blocked for more than 120 seconds
...
Call Trace:
...
? wait_for_common
? default_wake_function
? kthread_create
? worker_thread
? create_workqueue_thread
? worker_thread
? __create_workqueue_key
? stop_machine_create
? disable_nonboot_cpus
? hibernation_platform_enter
? snapshot_ioctl
...
? sys_ioctl
...
Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
---
kernel/power/user.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/kernel/power/user.c b/kernel/power/user.c
index bf0014d..94d0210 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -165,6 +165,10 @@ static ssize_t snapshot_read(struct file *filp, char __user *buf,
res = -EFAULT;
else
*offp = data->handle.offset;
+ } else {
+ swsusp_free();
+ memset(&data->handle, 0, sizeof(struct snapshot_handle));
+ data->ready = 0;
}
Unlock:
--
1.6.3.3
next prev parent reply other threads:[~2009-12-02 14:28 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-01 19:59 Bisected: s2disk (uswsusp only) hangs just before poweroff Alan Jenkins
2009-12-01 20:24 ` Justin P. Mattock
2009-12-01 20:27 ` Alan Jenkins
2009-12-01 21:14 ` Justin P. Mattock
2009-12-01 21:45 ` Mel Gorman
2009-12-01 21:53 ` Rafael J. Wysocki
2009-12-02 11:49 ` Alan Jenkins
2009-12-02 12:20 ` Mel Gorman
2009-12-02 14:25 ` Alan Jenkins
2009-12-02 14:28 ` Alan Jenkins [this message]
2009-12-02 21:11 ` [PATCH] uswsusp: automatically free the in-memory image once s2disk has finished with it Pavel Machek
2009-12-02 22:07 ` Mel Gorman
2009-12-02 22:15 ` Pavel Machek
2009-12-02 22:25 ` Mel Gorman
2009-12-02 23:22 ` Rafael J. Wysocki
2009-12-03 7:53 ` Pavel Machek
2009-12-03 12:57 ` Alan Jenkins
2009-12-03 14:50 ` Mel Gorman
2009-12-08 0:37 ` Alan Jenkins
2009-12-11 10:53 ` Mel Gorman
2009-12-14 11:08 ` Pavel Machek
2009-12-03 19:50 ` Rafael J. Wysocki
2009-12-03 20:16 ` Pavel Machek
2009-12-02 21:47 ` Rafael J. Wysocki
2009-12-02 8:57 ` Bisected: s2disk (uswsusp only) hangs just before poweroff Alan Jenkins
2009-12-02 10:35 ` Mel Gorman
2009-12-02 11:35 ` Alan Jenkins
2009-12-02 11:11 ` Alan Jenkins
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=4B16797C.3010304@tuffmail.co.uk \
--to=alan-jenkins@tuffmail.co.uk \
--cc=kernel-testers@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=mel@csn.ul.ie \
--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