The patch titled
swsusp: thaw userspace and kernel space separately
has been added to the -mm tree. Its filename is
swsusp-thaw-userspace-and-kernel-space-separately.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: swsusp: thaw userspace and kernel space separately
From: Nigel Cunningham <ncunningham@xxxxxxxxxxxxx>
Modify process thawing so that we can thaw kernel space without thawing
userspace, and thaw kernelspace first. This will be useful in later
patches, where I intend to get swsusp thawing kernel threads only before
seeking to free memory.
Signed-off-by: Nigel Cunningham <nigel@xxxxxxxxxxxx>
Cc: Pavel Machek <pavel@xxxxxx>
Cc: "Rafael J. Wysocki" <rjw@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/freezer.h | 9 ++++++++-
kernel/power/process.c | 25 ++++++++++++++++++-------
2 files changed, 26 insertions(+), 8 deletions(-)
diff -puN include/linux/freezer.h~swsusp-thaw-userspace-and-kernel-space-separately include/linux/freezer.h
--- a/include/linux/freezer.h~swsusp-thaw-userspace-and-kernel-space-separately
+++ a/include/linux/freezer.h
@@ -1,5 +1,8 @@
/* Freezer declarations */
+#define FREEZER_KERNEL_THREADS 0
+#define FREEZER_ALL_THREADS 1
+
#ifdef CONFIG_PM
/*
* Check if a process has been frozen
@@ -57,7 +60,8 @@ static inline void frozen_process(struct
extern void refrigerator(void);
extern int freeze_processes(void);
-extern void thaw_processes(void);
+#define thaw_processes() do { thaw_some_processes(FREEZER_ALL_THREADS); } while(0)
+#define thaw_kernel_threads() do { thaw_some_processes(FREEZER_KERNEL_THREADS); } while(0)
static inline int try_to_freeze(void)
{
@@ -67,6 +71,9 @@ static inline int try_to_freeze(void)
} else
return 0;
}
+
+extern void thaw_some_processes(int all);
+
#else
static inline int frozen(struct task_struct *p) { return 0; }
static inline int freezing(struct task_struct *p) { return 0; }
diff -puN kernel/power/process.c~swsusp-thaw-userspace-and-kernel-space-separately kernel/power/process.c
--- a/kernel/power/process.c~swsusp-thaw-userspace-and-kernel-space-separately
+++ a/kernel/power/process.c
@@ -153,18 +153,29 @@ int freeze_processes(void)
return 0;
}
-void thaw_processes(void)
+void thaw_some_processes(int all)
{
struct task_struct *g, *p;
+ int pass = 0; /* Pass 0 = Kernel space, 1 = Userspace */
printk("Restarting tasks... ");
read_lock(&tasklist_lock);
- do_each_thread(g, p) {
- if (!freezeable(p))
- continue;
- if (!thaw_process(p))
- printk(KERN_INFO "Strange, %s not stopped\n", p->comm);
- } while_each_thread(g, p);
+ do {
+ do_each_thread(g, p) {
+ /*
+ * is_user = 0 if kernel thread or borrowed mm,
+ * 1 otherwise.
+ */
+ int is_user = !!(p->mm && !(p->flags & PF_BORROWED_MM));
+ if (!freezeable(p) || (is_user != pass))
+ continue;
+ if (!thaw_process(p))
+ printk(KERN_INFO
+ "Strange, %s not stopped\n", p->comm);
+ } while_each_thread(g, p);
+
+ pass++;
+ } while (pass < 2 && all);
read_unlock(&tasklist_lock);
schedule();
_
Patches currently in -mm which might be from ncunningham@xxxxxxxxxxxxx are
add-include-linux-freezerh-and-move-definitions-from.patch
quieten-freezer-if-config_pm_debug.patch
swsusp-cleanup-whitespace-in-freezer-output.patch
swsusp-thaw-userspace-and-kernel-space-separately.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
