From: Nigel Cunningham <nigel@suspend2.net>
To: linux-kernel@vger.kernel.org
To: linux-kernel@vger.kernel.org
Subject: [ 22/23] [Suspend2] Modify swsusp to thaw kernel threads while eating memory.
Date: Thu, 26 Jan 2006 13:46:11 +1000 [thread overview]
Message-ID: <20060126034610.3178.98553.stgit@localhost.localdomain> (raw)
In-Reply-To: <20060126034518.3178.55397.stgit@localhost.localdomain>
Modify swsusp so that while trying to eat memory, it allows kernel threads
to run. This avoids a deadlock that could otherwise occur if access to a
filesystem is needed while freeing the memory.
Signed-off-by: Nigel Cunningham <nigel@suspend2.net>
kernel/power/main.c | 4 ++++
kernel/power/swsusp.c | 3 +++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 6f854e4..2fed3dc 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -72,6 +72,8 @@ static int suspend_prepare(suspend_state
goto Thaw;
}
+ thaw_processes(FREEZER_KERNEL_THREADS);
+
if ((free_pages = nr_free_pages()) < FREE_PAGE_NUMBER) {
pr_debug("PM: free some memory\n");
shrink_all_memory(FREE_PAGE_NUMBER - free_pages);
@@ -82,6 +84,8 @@ static int suspend_prepare(suspend_state
}
}
+ freeze_processes();
+
if (pm_ops->prepare) {
if ((error = pm_ops->prepare(state)))
goto Thaw;
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index 55a18d2..3bc835a 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -575,6 +575,8 @@ int swsusp_shrink_memory(void)
unsigned int i = 0;
char *p = "-\\|/";
+ thaw_processes(FREEZER_KERNEL_THREADS);
+
printk("Shrinking memory... ");
do {
size = 2 * count_highmem_pages();
@@ -598,6 +600,7 @@ int swsusp_shrink_memory(void)
} while (tmp > 0);
printk("\bdone (%lu pages freed)\n", pages);
+ freeze_processes();
return 0;
}
--
Nigel Cunningham nigel at suspend2 dot net
next prev parent reply other threads:[~2006-01-26 3:50 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-26 3:45 [ 00/23] [Suspend2] Freezer Upgrade Patches Nigel Cunningham
2006-01-26 3:45 ` [ 01/23] [Suspend2] Make workqueues freezeable Nigel Cunningham
2006-01-26 23:17 ` Rafael J. Wysocki
2006-01-27 4:01 ` Nigel Cunningham
2006-01-26 3:45 ` [ 02/23] [Suspend2] Add new include/linux/freezer.h header Nigel Cunningham
2006-01-26 3:45 ` [ 03/23] [Suspend2] Allow a notifier to remove itself from the notifier list Nigel Cunningham
2006-01-26 3:45 ` [ 04/23] [Suspend2] Todo notifier for processes Nigel Cunningham
2006-01-26 3:45 ` [ 05/23] [Suspend2] Make the freezer use todo lists Nigel Cunningham
2006-01-26 3:45 ` [ 06/23] [Suspend2] Disable usermode helper invocations when the freezer is on Nigel Cunningham
2006-01-30 22:05 ` Rafael J. Wysocki
2006-01-31 3:24 ` Nigel Cunningham
2006-01-31 10:58 ` Rafael J. Wysocki
2006-01-31 23:21 ` Nigel Cunningham
2006-02-01 0:33 ` Rafael J. Wysocki
2006-01-26 3:45 ` [ 07/23] [Suspend2] Add which-to-thaw parameter to thaw_processes() calls Nigel Cunningham
2006-01-26 3:45 ` [ 08/23] [Suspend2] New freezer explanation for kernel/power/process.c Nigel Cunningham
2006-01-26 3:45 ` [ 09/23] [Suspend2] Quieten the freezer for normal operation Nigel Cunningham
2006-01-26 3:45 ` [ 10/23] [Suspend2] Add support for freezing filesystem bdevs Nigel Cunningham
2006-01-26 3:45 ` [ 11/23] [Suspend2] Modify freezeable for freezing kernel threads separately Nigel Cunningham
2006-01-26 3:45 ` [ 12/23] [Suspend2] Split freezing of threads according to whether user/kernelspace Nigel Cunningham
2006-01-26 3:45 ` [ 13/23] [Suspend2] Add support for thawing just kernel threads or all threads Nigel Cunningham
2006-01-26 3:45 ` [ 14/23] [Suspend2] Helper for counting freezeable threads of a type Nigel Cunningham
2006-01-26 3:45 ` [ 15/23] [Suspend2] Helper for counting uninterruptible " Nigel Cunningham
2006-01-30 22:18 ` Rafael J. Wysocki
2006-01-30 22:25 ` Pavel Machek
2006-01-31 0:02 ` Rafael J. Wysocki
2006-01-31 9:27 ` [RFC/RFT] finally solve "swsusp fails with mysqld" problem Pavel Machek
2006-01-31 16:17 ` Rafael J. Wysocki
2006-01-31 21:29 ` Pavel Machek
2006-01-31 22:30 ` Rafael J. Wysocki
2006-01-31 5:42 ` [ 15/23] [Suspend2] Helper for counting uninterruptible threads of a type Nigel Cunningham
2006-01-26 3:45 ` [ 16/23] [Suspend2] Helper to signal all " Nigel Cunningham
2006-01-26 3:46 ` [ 17/23] [Suspend2] Helper to prod processes that should have frozen but haven't Nigel Cunningham
2006-01-26 3:46 ` [ 18/23] [Suspend2] Helper: Did we fail to freeze all threads of a type? Nigel Cunningham
2006-01-26 3:46 ` [ 19/23] [Suspend2] Freeze all threads of a type Nigel Cunningham
2006-01-26 3:46 ` [ 20/23] [Suspend2] Modify process.c includes and export freezer state Nigel Cunningham
2006-01-26 3:46 ` [ 21/23] [Suspend2] Remove unused DEBUG undef Nigel Cunningham
2006-01-26 3:46 ` Nigel Cunningham [this message]
2006-01-26 3:46 ` [ 23/23] [Suspend2] Don't scan LRU while freezer is on Nigel Cunningham
2006-01-26 11:55 ` [ 00/23] [Suspend2] Freezer Upgrade Patches Pavel Machek
2006-01-26 21:49 ` Nigel Cunningham
2006-01-26 23:10 ` Rafael J. Wysocki
2006-01-27 4:04 ` Nigel Cunningham
2006-01-27 12:18 ` Rafael J. Wysocki
2006-01-27 19:20 ` Nigel Cunningham
2006-01-27 23:22 ` Pavel Machek
2006-01-30 5:54 ` Nigel Cunningham
2006-01-30 11:50 ` Pavel Machek
2006-01-30 7:53 ` Stefan Seyfried
2006-01-30 11:53 ` 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=20060126034610.3178.98553.stgit@localhost.localdomain \
--to=nigel@suspend2.net \
--cc=linux-kernel@vger.kernel.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: 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