The patch titled
freezer: use wait queue instead of busy looping
has been removed from the -mm tree. Its filename was
freezer-use-wait-queue-instead-of-busy-looping.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: freezer: use wait queue instead of busy looping
From: Rafael J. Wysocki <rjw@xxxxxxx>
Use the observation that try_to_freeze_tasks() need not loop while waiting for
the freezing tasks to enter the refrigerator and make it use a wait queue.
The idea is that after sending freeze requests to the tasks regarded as
freezable try_to_freeze_tasks() can go to sleep and wait until at least one
task enters the refrigerator. The first task that does it wakes up
try_to_freeze_tasks() and the procedure is repeated. If the refrigerator is
not entered by any tasks before TIMEOUT expires, the freezing of tasks fails.
This way, try_to_freeze_tasks() doesn't occupy the CPU unnecessarily when some
freezing tasks are waiting for I/O to complete.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Acked-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/power/process.c | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletion(-)
diff -puN kernel/power/process.c~freezer-use-wait-queue-instead-of-busy-looping kernel/power/process.c
--- a/kernel/power/process.c~freezer-use-wait-queue-instead-of-busy-looping
+++ a/kernel/power/process.c
@@ -19,6 +19,12 @@
*/
#define TIMEOUT (20 * HZ)
+/*
+ * Time to wait until one or more tasks enter the refrigerator after sending
+ * freeze requests to them.
+ */
+#define WAIT_TIME (HZ / 5)
+
#define FREEZER_KERNEL_THREADS 0
#define FREEZER_USER_SPACE 1
@@ -43,6 +49,18 @@ static inline void frozen_process(void)
clear_freeze_flag(current);
}
+/*
+ * Wait queue head used by try_to_freeze_tasks() to wait for tasks to enter the
+ * refrigerator.
+ */
+static DECLARE_WAIT_QUEUE_HEAD(refrigerator_waitq);
+
+/*
+ * Used to notify try_to_freeze_tasks() that the refrigerator has been entered
+ * by a task.
+ */
+static int refrigerator_called;
+
/* Refrigerator is place where frozen processes are stored :-). */
void refrigerator(void)
{
@@ -58,6 +76,10 @@ void refrigerator(void)
task_unlock(current);
return;
}
+
+ refrigerator_called = 1;
+ wake_up(&refrigerator_waitq);
+
save = current->state;
pr_debug("%s entered refrigerator\n", current->comm);
@@ -170,6 +192,7 @@ static int try_to_freeze_tasks(int freez
unsigned int todo;
end_time = jiffies + TIMEOUT;
+ refrigerator_called = 0;
do {
todo = 0;
read_lock(&tasklist_lock);
@@ -189,7 +212,16 @@ static int try_to_freeze_tasks(int freez
todo++;
} while_each_thread(g, p);
read_unlock(&tasklist_lock);
- yield(); /* Yield is okay here */
+
+ if (todo) {
+ unsigned long ret;
+
+ ret = wait_event_timeout(refrigerator_waitq,
+ refrigerator_called, WAIT_TIME);
+ if (ret)
+ refrigerator_called = 0;
+ }
+
if (time_after(jiffies, end_time))
break;
} while (todo);
_
Patches currently in -mm which might be from rjw@xxxxxxx are
origin.patch
pm-move-definition-of-struct-pm_ops-to-suspendh.patch
pm-rename-struct-pm_ops-and-related-things.patch
pm-rework-struct-platform_suspend_ops.patch
pm-make-suspend_ops-static.patch
pm-rework-struct-hibernation_ops.patch
pm-rename-hibernation_ops-to-platform_hibernation_ops.patch
freezer-document-relationship-with-memory-shrinking.patch
freezer-do-not-sync-filesystems-from-freeze_processes.patch
freezer-prevent-new-tasks-from-inheriting-tif_freeze-set.patch
freezer-introduce-freezer-firendly-waiting-macros.patch
freezer-do-not-send-signals-to-kernel-threads.patch
unexport-pm_power_off_prepare.patch
pm_trace-displays-the-wrong-time-from-the-rtc.patch
freezer-be-more-verbose.patch
freezer-use-wait-queue-instead-of-busy-looping.patch
freezer-use-wait-queue-instead-of-busy-looping-updated.patch
freezer-measure-freezing-time.patch
shrink_slab-handle-bad-shrinkers.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
