* [PATCH] Hibernation: Add PM_RESTORE_PREPARE and PM_POST_RESTORE notifiers
@ 2007-11-01 22:47 Rafael J. Wysocki
2007-11-03 18:22 ` Pavel Machek
2007-11-05 22:47 ` Rafael J. Wysocki
0 siblings, 2 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2007-11-01 22:47 UTC (permalink / raw)
To: Len Brown; +Cc: Alan Stern, LKML, Nigel Cunningham, Pavel Machek, pm list
[Len, please add to the suspend branch.]
---
From: Alan Stern <stern@rowland.harvard.edu>
This patch (as1006) adds PM_RESTORE_PREPARE and PM_POST_RESTORE
notifiers to the PM core, to be used in analogy with the existing
PM_HIBERNATION_PREPARE and PM_POST_HIBERNATION notifiers.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
Signed-off-by: "Rafael J. Wysocki" <rjw@sisk.pl>
---
Documentation/power/notifiers.txt | 8 ++++++++
include/linux/notifier.h | 2 ++
kernel/power/disk.c | 6 ++++++
kernel/power/user.c | 27 +++++++++++++++------------
4 files changed, 31 insertions(+), 12 deletions(-)
Index: linux-2.6/Documentation/power/notifiers.txt
===================================================================
--- linux-2.6.orig/Documentation/power/notifiers.txt
+++ linux-2.6/Documentation/power/notifiers.txt
@@ -28,6 +28,14 @@ PM_POST_HIBERNATION The system memory st
hibernation. Device drivers' .resume() callbacks have
been executed and tasks have been thawed.
+PM_RESTORE_PREPARE The system is going to restore a hibernation image.
+ If all goes well the restored kernel will issue a
+ PM_POST_HIBERNATION notification.
+
+PM_POST_RESTORE An error occurred during the hibernation restore.
+ Device drivers' .resume() callbacks have been executed
+ and tasks have been thawed.
+
PM_SUSPEND_PREPARE The system is preparing for a suspend.
PM_POST_SUSPEND The system has just resumed or an error occured during
Index: linux-2.6/include/linux/notifier.h
===================================================================
--- linux-2.6.orig/include/linux/notifier.h
+++ linux-2.6/include/linux/notifier.h
@@ -230,6 +230,8 @@ static inline int notifier_to_errno(int
#define PM_POST_HIBERNATION 0x0002 /* Hibernation finished */
#define PM_SUSPEND_PREPARE 0x0003 /* Going to suspend the system */
#define PM_POST_SUSPEND 0x0004 /* Suspend finished */
+#define PM_RESTORE_PREPARE 0x0005 /* Going to restore a saved image */
+#define PM_POST_RESTORE 0x0006 /* Restore failed */
/* Console keyboard events.
* Note: KBD_KEYCODE is always sent before KBD_UNBOUND_KEYCODE, KBD_UNICODE and
Index: linux-2.6/kernel/power/disk.c
===================================================================
--- linux-2.6.orig/kernel/power/disk.c
+++ linux-2.6/kernel/power/disk.c
@@ -489,6 +489,10 @@ static int software_resume(void)
goto Unlock;
}
+ error = pm_notifier_call_chain(PM_RESTORE_PREPARE);
+ if (error)
+ goto Exit;
+
error = create_basic_memory_bitmaps();
if (error)
goto Finish;
@@ -512,6 +516,8 @@ static int software_resume(void)
Done:
free_basic_memory_bitmaps();
Finish:
+ pm_notifier_call_chain(PM_POST_RESTORE);
+ Exit:
atomic_inc(&snapshot_device_available);
/* For success case, the suspend path will release the lock */
Unlock:
Index: linux-2.6/kernel/power/user.c
===================================================================
--- linux-2.6.orig/kernel/power/user.c
+++ linux-2.6/kernel/power/user.c
@@ -67,6 +67,7 @@ atomic_t snapshot_device_available = ATO
static int snapshot_open(struct inode *inode, struct file *filp)
{
struct snapshot_data *data;
+ int error;
if (!atomic_add_unless(&snapshot_device_available, -1, 0))
return -EBUSY;
@@ -87,9 +88,15 @@ static int snapshot_open(struct inode *i
data->swap = swsusp_resume_device ?
swap_type_of(swsusp_resume_device, 0, NULL) : -1;
data->mode = O_RDONLY;
+ error = pm_notifier_call_chain(PM_RESTORE_PREPARE);
} else {
data->swap = -1;
data->mode = O_WRONLY;
+ error = pm_notifier_call_chain(PM_HIBERNATION_PREPARE);
+ }
+ if (error) {
+ atomic_inc(&snapshot_device_available);
+ return error;
}
data->frozen = 0;
data->ready = 0;
@@ -111,6 +118,8 @@ static int snapshot_release(struct inode
thaw_processes();
mutex_unlock(&pm_mutex);
}
+ pm_notifier_call_chain(data->mode == O_WRONLY ?
+ PM_POST_HIBERNATION : PM_POST_RESTORE);
atomic_inc(&snapshot_device_available);
return 0;
}
@@ -174,18 +183,13 @@ static int snapshot_ioctl(struct inode *
if (data->frozen)
break;
mutex_lock(&pm_mutex);
- error = pm_notifier_call_chain(PM_HIBERNATION_PREPARE);
- if (!error) {
- printk("Syncing filesystems ... ");
- sys_sync();
- printk("done.\n");
-
- error = freeze_processes();
- if (error)
- thaw_processes();
- }
+ printk("Syncing filesystems ... ");
+ sys_sync();
+ printk("done.\n");
+
+ error = freeze_processes();
if (error)
- pm_notifier_call_chain(PM_POST_HIBERNATION);
+ thaw_processes();
mutex_unlock(&pm_mutex);
if (!error)
data->frozen = 1;
@@ -196,7 +200,6 @@ static int snapshot_ioctl(struct inode *
break;
mutex_lock(&pm_mutex);
thaw_processes();
- pm_notifier_call_chain(PM_POST_HIBERNATION);
mutex_unlock(&pm_mutex);
data->frozen = 0;
break;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Hibernation: Add PM_RESTORE_PREPARE and PM_POST_RESTORE notifiers
2007-11-01 22:47 [PATCH] Hibernation: Add PM_RESTORE_PREPARE and PM_POST_RESTORE notifiers Rafael J. Wysocki
@ 2007-11-03 18:22 ` Pavel Machek
2007-11-05 22:47 ` Rafael J. Wysocki
1 sibling, 0 replies; 3+ messages in thread
From: Pavel Machek @ 2007-11-03 18:22 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Len Brown, Alan Stern, LKML, Nigel Cunningham, pm list
On Thu 2007-11-01 23:47:43, Rafael J. Wysocki wrote:
> [Len, please add to the suspend branch.]
> ---
> From: Alan Stern <stern@rowland.harvard.edu>
>
> This patch (as1006) adds PM_RESTORE_PREPARE and PM_POST_RESTORE
> notifiers to the PM core, to be used in analogy with the existing
> PM_HIBERNATION_PREPARE and PM_POST_HIBERNATION notifiers.
>
> Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
> Cc: Pavel Machek <pavel@ucw.cz>
> Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
> Signed-off-by: "Rafael J. Wysocki" <rjw@sisk.pl>
ACK.
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Hibernation: Add PM_RESTORE_PREPARE and PM_POST_RESTORE notifiers
2007-11-01 22:47 [PATCH] Hibernation: Add PM_RESTORE_PREPARE and PM_POST_RESTORE notifiers Rafael J. Wysocki
2007-11-03 18:22 ` Pavel Machek
@ 2007-11-05 22:47 ` Rafael J. Wysocki
1 sibling, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2007-11-05 22:47 UTC (permalink / raw)
To: Len Brown; +Cc: Alan Stern, LKML, Nigel Cunningham, Pavel Machek, pm list
On Thursday, 1 of November 2007, Rafael J. Wysocki wrote:
> [Len, please add to the suspend branch.]
> ---
> From: Alan Stern <stern@rowland.harvard.edu>
>
> This patch (as1006) adds PM_RESTORE_PREPARE and PM_POST_RESTORE
> notifiers to the PM core, to be used in analogy with the existing
> PM_HIBERNATION_PREPARE and PM_POST_HIBERNATION notifiers.
>
> Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
> Cc: Pavel Machek <pavel@ucw.cz>
> Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
> Signed-off-by: "Rafael J. Wysocki" <rjw@sisk.pl>
> ---
Please consider this version of the patch as obsolete. An update has just been
sent.
Greetings,
Rafael
> Documentation/power/notifiers.txt | 8 ++++++++
> include/linux/notifier.h | 2 ++
> kernel/power/disk.c | 6 ++++++
> kernel/power/user.c | 27 +++++++++++++++------------
> 4 files changed, 31 insertions(+), 12 deletions(-)
>
> Index: linux-2.6/Documentation/power/notifiers.txt
> ===================================================================
> --- linux-2.6.orig/Documentation/power/notifiers.txt
> +++ linux-2.6/Documentation/power/notifiers.txt
> @@ -28,6 +28,14 @@ PM_POST_HIBERNATION The system memory st
> hibernation. Device drivers' .resume() callbacks have
> been executed and tasks have been thawed.
>
> +PM_RESTORE_PREPARE The system is going to restore a hibernation image.
> + If all goes well the restored kernel will issue a
> + PM_POST_HIBERNATION notification.
> +
> +PM_POST_RESTORE An error occurred during the hibernation restore.
> + Device drivers' .resume() callbacks have been executed
> + and tasks have been thawed.
> +
> PM_SUSPEND_PREPARE The system is preparing for a suspend.
>
> PM_POST_SUSPEND The system has just resumed or an error occured during
> Index: linux-2.6/include/linux/notifier.h
> ===================================================================
> --- linux-2.6.orig/include/linux/notifier.h
> +++ linux-2.6/include/linux/notifier.h
> @@ -230,6 +230,8 @@ static inline int notifier_to_errno(int
> #define PM_POST_HIBERNATION 0x0002 /* Hibernation finished */
> #define PM_SUSPEND_PREPARE 0x0003 /* Going to suspend the system */
> #define PM_POST_SUSPEND 0x0004 /* Suspend finished */
> +#define PM_RESTORE_PREPARE 0x0005 /* Going to restore a saved image */
> +#define PM_POST_RESTORE 0x0006 /* Restore failed */
>
> /* Console keyboard events.
> * Note: KBD_KEYCODE is always sent before KBD_UNBOUND_KEYCODE, KBD_UNICODE and
> Index: linux-2.6/kernel/power/disk.c
> ===================================================================
> --- linux-2.6.orig/kernel/power/disk.c
> +++ linux-2.6/kernel/power/disk.c
> @@ -489,6 +489,10 @@ static int software_resume(void)
> goto Unlock;
> }
>
> + error = pm_notifier_call_chain(PM_RESTORE_PREPARE);
> + if (error)
> + goto Exit;
> +
> error = create_basic_memory_bitmaps();
> if (error)
> goto Finish;
> @@ -512,6 +516,8 @@ static int software_resume(void)
> Done:
> free_basic_memory_bitmaps();
> Finish:
> + pm_notifier_call_chain(PM_POST_RESTORE);
> + Exit:
> atomic_inc(&snapshot_device_available);
> /* For success case, the suspend path will release the lock */
> Unlock:
> Index: linux-2.6/kernel/power/user.c
> ===================================================================
> --- linux-2.6.orig/kernel/power/user.c
> +++ linux-2.6/kernel/power/user.c
> @@ -67,6 +67,7 @@ atomic_t snapshot_device_available = ATO
> static int snapshot_open(struct inode *inode, struct file *filp)
> {
> struct snapshot_data *data;
> + int error;
>
> if (!atomic_add_unless(&snapshot_device_available, -1, 0))
> return -EBUSY;
> @@ -87,9 +88,15 @@ static int snapshot_open(struct inode *i
> data->swap = swsusp_resume_device ?
> swap_type_of(swsusp_resume_device, 0, NULL) : -1;
> data->mode = O_RDONLY;
> + error = pm_notifier_call_chain(PM_RESTORE_PREPARE);
> } else {
> data->swap = -1;
> data->mode = O_WRONLY;
> + error = pm_notifier_call_chain(PM_HIBERNATION_PREPARE);
> + }
> + if (error) {
> + atomic_inc(&snapshot_device_available);
> + return error;
> }
> data->frozen = 0;
> data->ready = 0;
> @@ -111,6 +118,8 @@ static int snapshot_release(struct inode
> thaw_processes();
> mutex_unlock(&pm_mutex);
> }
> + pm_notifier_call_chain(data->mode == O_WRONLY ?
> + PM_POST_HIBERNATION : PM_POST_RESTORE);
> atomic_inc(&snapshot_device_available);
> return 0;
> }
> @@ -174,18 +183,13 @@ static int snapshot_ioctl(struct inode *
> if (data->frozen)
> break;
> mutex_lock(&pm_mutex);
> - error = pm_notifier_call_chain(PM_HIBERNATION_PREPARE);
> - if (!error) {
> - printk("Syncing filesystems ... ");
> - sys_sync();
> - printk("done.\n");
> -
> - error = freeze_processes();
> - if (error)
> - thaw_processes();
> - }
> + printk("Syncing filesystems ... ");
> + sys_sync();
> + printk("done.\n");
> +
> + error = freeze_processes();
> if (error)
> - pm_notifier_call_chain(PM_POST_HIBERNATION);
> + thaw_processes();
> mutex_unlock(&pm_mutex);
> if (!error)
> data->frozen = 1;
> @@ -196,7 +200,6 @@ static int snapshot_ioctl(struct inode *
> break;
> mutex_lock(&pm_mutex);
> thaw_processes();
> - pm_notifier_call_chain(PM_POST_HIBERNATION);
> mutex_unlock(&pm_mutex);
> data->frozen = 0;
> break;
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
>
--
"Premature optimization is the root of all evil." - Donald Knuth
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-11-05 22:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-11-01 22:47 [PATCH] Hibernation: Add PM_RESTORE_PREPARE and PM_POST_RESTORE notifiers Rafael J. Wysocki
2007-11-03 18:22 ` Pavel Machek
2007-11-05 22:47 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®