PM: Hibernation and suspend notifiers
Subsystems (2)
cover PM: Hibernation and suspend notifiers
Hi,
The first of the following two patches introduces hibernation and suspend notifiers that can be used by subsystems to perform tasks related to suspend and/or hibernation that cannot be done from device drivers' .suspend() and .resume() callbacks.
The second one uses the notifiers to disable the user mode helper functionality before a hibernation/suspend.
Greetings,
Rafael
Signature · 1 line
"Premature optimization is the root of all evil." - Donald Knuth
PATCH 1/2 PM: Introduce hibernation and suspend notifiers
From: Rafael J. Wysocki <[email protected]>
Make it possible to register hibernation and suspend notifiers, so that subsystems can perform hibernation-related or suspend-related operations that should not be carried out by device drivers' .suspend() and .resume() routines.
--- Documentation/power/notifiers.txt | 50 ++++++++++++++++++++++++++++++++++++++ include/linux/notifier.h | 6 ++++ include/linux/suspend.h | 37 +++++++++++++++++++++++++--- kernel/power/disk.c | 16 +++++++++--- kernel/power/main.c | 9 ++++++ kernel/power/power.h | 10 +++++++ kernel/power/user.c | 11 ++++++-- 7 files changed, 129 insertions(+), 10 deletions(-)
include/linux/suspend.h +34 -3
@@ -54,7 +54,8 @@ struct hibernation_ops {void (*restore_cleanup)(void ); }; -#if defined(CONFIG_PM ) && defined(CONFIG_SOFTWARE_SUSPEND ) +#ifdef CONFIG_PM +#ifdef CONFIG_SOFTWARE_SUSPEND /* kernel/power/snapshot.c */ extern void __register_nosave_region (unsigned long b,unsigned long e,int km);static inline void register_nosave_region (unsigned long b,unsigned long e)
@@ -72,7 +73,7 @@ extern unsigned long get_safe_page(gfp_textern void hibernation_set_ops (struct hibernation_ops *ops);extern int hibernate (void ); -#else +#else /* CONFIG_SOFTWARE_SUSPEND */ static inline void register_nosave_region (unsigned long b,unsigned long e) {}static inline void register_nosave_region_late (unsigned long b,unsigned long e) {}static inline int swsusp_page_is_forbidden (struct page *p) {return 0 ; }
@@ -81,7 +82,7 @@ static inline void swsusp_unset_page_frestatic inline void hibernation_set_ops (struct hibernation_ops *ops) {}static inline int hibernate (void ) {return -ENOSYS ; } -#endif /* defined(CONFIG_PM) && defined(CONFIG_SOFTWARE_SUSPEND) */ +#endif /* CONFIG_SOFTWARE_SUSPEND */ void save_processor_state (void );void restore_processor_state (void );
@@ -89,4 +90,34 @@ struct saved_context;void __save_processor_state (struct saved_context *ctxt);void __restore_processor_state (struct saved_context *ctxt); +/* kernel/power/main.c */ +extern struct blocking_notifier_head pm_chain_head; + +static inline int register_pm_notifier (struct notifier_block *nb) +{ +return blocking_notifier_chain_register (&pm_chain_head, nb); +} + +static inline int unregister_pm_notifier (struct notifier_block *nb) +{ +return blocking_notifier_chain_unregister (&pm_chain_head, nb); +} + +#define pm_notifier (fn, pri) { \ + static struct notifier_block fn##_nb = \ + { .notifier_call = fn, .priority = pri }; \ + register_pm_notifier(&fn##_nb); \ +} +#else /* CONFIG_PM */ +static inline int register_pm_notifier (struct notifier_block *nb) { +return 0 ; +} + +static inline int unregister_pm_notifier (struct notifier_block *nb) { +return 0 ; +} + +#define pm_notifier (fn, pri) do { (void)(fn); } while (0) +#endif /* CONFIG_PM */ +#endif /* _LINUX_SWSUSP_H */
kernel/power/power.h +10 -0
@@ -173,5 +173,15 @@ extern void swsusp_close(void);extern int suspend_enter (suspend_state_t state);struct timeval ; +/* kernel/power/swsusp.c */ extern void swsusp_show_speed (struct timeval *,struct timeval *,unsigned int ,char *); + +/* kernel/power/main.c */ +extern struct blocking_notifier_head pm_chain_head; + +static inline int pm_notifier_call_chain (unsigned long val) +{ +return (blocking_notifier_call_chain (&pm_chain_head, val,NULL ) + ==NOTIFY_BAD ) ? -EINVAL :0 ; +}
include/linux/notifier.h +6 -0
@@ -209,5 +209,11 @@ extern int __srcu_notifier_call_chain(st#define CPU_DOWN_FAILED_FROZEN (CPU_DOWN_FAILED | CPU_TASKS_FROZEN)#define CPU_DEAD_FROZEN (CPU_DEAD | CPU_TASKS_FROZEN) +/* Hibernation and suspend events */ +#define PM_HIBERNATION_PREPARE 0x0001/* Going to hibernate */ +#define PM_POST_HIBERNATION 0x0002/* Hibernation finished */ +#define PM_SUSPEND_PREPARE 0x0003/* Going to suspend the system */ +#define PM_POST_SUSPEND 0x0004/* Suspend finished */ +#endif /* __KERNEL__ */ #endif /* _LINUX_NOTIFIER_H */
kernel/power/disk.c +12 -4
@@ -281,9 +281,16 @@ int hibernate(void) {int error; +mutex_lock (&pm_mutex);/* The snapshot device should not be opened while we're running */ -if (!atomic_add_unless (&snapshot_device_available,-1 ,0 )) -return -EBUSY ; +if (!atomic_add_unless (&snapshot_device_available,-1 ,0 )) { + error = -EBUSY ; + goto Unlock; + } + + error =pm_notifier_call_chain (PM_HIBERNATION_PREPARE ); +if (error) + goto Exit;/* Allocate memory management structures */ error =create_basic_memory_bitmaps ();
@@ -294,7 +301,6 @@ int hibernate(void)if (error) goto Finish; -mutex_lock (&pm_mutex);if (hibernation_mode ==HIBERNATION_TESTPROC ) {printk ("swsusp debug: Waiting for 5 seconds.\n" );mdelay (5000 );
@@ -316,12 +322,14 @@ int hibernate(void)swsusp_free (); } Thaw: -mutex_unlock (&pm_mutex);unprepare_processes (); Finish:free_basic_memory_bitmaps (); Exit: +pm_notifier_call_chain (PM_POST_HIBERNATION );atomic_inc (&snapshot_device_available); + Unlock: +mutex_unlock (&pm_mutex);return error; }
kernel/power/main.c +9 -0
@@ -24,6 +24,8 @@#include "power.h" +BLOCKING_NOTIFIER_HEAD (pm_chain_head); +/*This is just an arbitrary number */ #define FREE_PAGE_NUMBER (100)
@@ -82,6 +84,10 @@ static int suspend_prepare(suspend_stateif (!pm_ops || !pm_ops->enter)return -EPERM ; + error =pm_notifier_call_chain (PM_SUSPEND_PREPARE ); +if (error) + goto Finish; +pm_prepare_console ();if (freeze_processes ()) {
@@ -124,6 +130,8 @@ static int suspend_prepare(suspend_state Thaw:thaw_processes ();pm_restore_console (); + Finish: +pm_notifier_call_chain (PM_POST_SUSPEND );return error; }
@@ -175,6 +183,7 @@ static void suspend_finish(suspend_stateresume_console ();thaw_processes ();pm_restore_console (); +pm_notifier_call_chain (PM_POST_SUSPEND ); }
kernel/power/user.c +8 -3
@@ -149,10 +149,14 @@ static int snapshot_ioctl(struct inode *if (data->frozen)break ;mutex_lock (&pm_mutex); -if (freeze_processes ()) { -thaw_processes (); - error = -EBUSY ; + error =pm_notifier_call_chain (PM_HIBERNATION_PREPARE ); +if (!error) { + error =freeze_processes (); +if (error) +thaw_processes (); } +if (error) +pm_notifier_call_chain (PM_POST_HIBERNATION );mutex_unlock (&pm_mutex);if (!error) data->frozen =1 ;
@@ -163,6 +167,7 @@ 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 ;
Documentation/power/notifiers.txt new file +50 -0
50 lines not on this page · raw message
PATCH 2/2 PM: Disable usermode helper before hibernation and suspend
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
Use a hibernation and suspend notifier to disable the user mode helper before a hibernation/suspend and enable it after the operation.
--- kernel/kmod.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)
kernel/kmod.c +31 -2
@@ -33,6 +33,8 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/resource.h> +#include <linux/notifier.h> +#include <linux/suspend.h> #include <asm/uaccess.h> extern int max_threads;
@@ -46,6 +48,14 @@ static struct workqueue_struct *khelper_*/ char modprobe_path[KMOD_PATH_LEN ] ="/sbin/modprobe" ; +/* +* If set, both call_usermodehelper_keys() and call_usermodehelper_pipe() exit +* immediately returning -EBUSY. Used for preventing user land processes from +* being created after the user land has been frozen during a system-wide +* hibernation or suspend operation. +*/ +static int usermodehelper_disabled; +/** * request_module - try to load a kernel module * @fmt: printf style format string for the name of the module
@@ -251,6 +261,24 @@ static void __call_usermodehelper(structcomplete (sub_info->complete); } +static int usermodehelper_pm_callback (struct notifier_block *nfb, +unsigned long action, +void *ignored) +{ +switch (action) { +case PM_HIBERNATION_PREPARE : +case PM_SUSPEND_PREPARE : + usermodehelper_disabled =1 ; +return NOTIFY_OK ; +case PM_POST_HIBERNATION : +case PM_POST_SUSPEND : + usermodehelper_disabled =0 ; +return NOTIFY_OK ; + } + +return NOTIFY_DONE ; +} +/** * call_usermodehelper_keys - start a usermode application * @path: pathname for the application
@@ -276,7 +304,7 @@ int call_usermodehelper_keys(char *path,struct subprocess_info *sub_info;int retval; -if (!khelper_wq) +if (!khelper_wq || usermodehelper_disabled)return -EBUSY ;if (path[0 ] =='\0' )
@@ -319,7 +347,7 @@ int call_usermodehelper_pipe(char *path, };struct file *f; -if (!khelper_wq) +if (!khelper_wq || usermodehelper_disabled)return -EBUSY ;if (path[0 ] =='\0' )
@@ -347,4 +375,5 @@ void __init usermodehelper_init(void) { khelper_wq =create_singlethread_workqueue ("khelper" );BUG_ON (!khelper_wq); +pm_notifier (usermodehelper_pm_callback,0 ); }
Re: [PATCH -mm 2/2] PM: Disable usermode helper before hibernation and suspend
Ack.
Regards,
Nigel
Re: [PATCH -mm 2/2] PM: Disable usermode helper before hibernation and suspend
In reply to Rafael J. WysockiQuoted 5 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Use a hibernation and suspend notifier to disable the user mode helper before a hibernation/suspend and enable it after the operation.
Hi Rafael,
I have a couple of questions, regarding this patch ...
kernel/kmod.c int call_usermodehelper_keys(char *path, · line 308
Quoted 3 lines
kernel/kmod.c +1
-1-if (!khelper_wq) +if (!khelper_wq || usermodehelper_disabled)return -EBUSY ;
1) how about not returning -EBUSY here, if (wait == UMH_NO_WAIT)?
2) how does your patch prevent wait_for_completion(&done) to hang during freezing if usermodehelper_pm_callback is called _after_ the above check?
Regards
Uli
Re: [PATCH -mm 2/2] PM: Disable usermode helper before hibernation and suspend
Quoted 6 lines · Uli Luckas
Quoted 5 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Use a hibernation and suspend notifier to disable the user mode helper before a hibernation/suspend and enable it after the operation.
Quoted 6 lines
Hi Rafael,
I have a couple of questions, regarding this patch ...kernel/kmod.c int call_usermodehelper_keys(char *path, · line 308
Quoted 3 lines
kernel/kmod.c +1
-1-if (!khelper_wq) +if (!khelper_wq || usermodehelper_disabled)return -EBUSY ;1) how about not returning
-EBUSYhere, if (wait ==UMH_NO_WAIT)?
Yes, this would make sense.
Quoted 2 lines
2) how does your patch prevent
wait_for_completion(&done)to hang during freezing ifusermodehelper_pm_callbackis called _after_ the above check?
It doesn't. Once the helper is running, we can't distinguish it from any other user land process.
Still, it narrows the window quite a bit.
Greetings,
Rafael
Signature · 1 line
"Premature optimization is the root of all evil." - Donald Knuth
Re: [PATCH -mm 2/2] PM: Disable usermode helper before hibernation and suspend
Quoted 7 lines · Rafael J. Wysocki
Quoted 6 lines · Uli Luckas
Quoted 5 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Use a hibernation and suspend notifier to disable the user mode helper before a hibernation/suspend and enable it after the operation.
Quoted 8 lines
Quoted 6 lines
Hi Rafael,
I have a couple of questions, regarding this patch ...Review
Quoted 3 lines
(quoted diff) +1
-1- if (!khelper_wq) + if (!khelper_wq || usermodehelper_disabled) return -EBUSY;1) how about not returning
-EBUSYhere, if (wait ==UMH_NO_WAIT)?Yes, this would make sense.
I know why I didn't do that from the start: my patch was against -rc4 and UMH_NO_WAIT is mm-only.
Quoted 7 lines
Quoted 2 lines
2) how does your patch prevent
wait_for_completion(&done)to hang during freezing ifusermodehelper_pm_callbackis called _after_ the above check?It doesn't. Once the helper is running, we can't distinguish it from any other user land process.
Still, it narrows the window quite a bit.
Okay, I think we can help it a bit. Please tell me what you think of the following patch (on top of 2.6.22-rc4-mm2).
Greetings,
Rafael
--- kernel/kmod.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)
kernel/kmod.c +22 -2
@@ -49,6 +49,15 @@ static struct workqueue_struct *khelper_*/ static int usermodehelper_disabled; +/* Number of helpers running */ +static atomic_t running_helpers =ATOMIC_INIT (0 ); + +/* +* Time to wait for running_helpers to become zero before the setting of +* usermodehelper_disabled in usermodehelper_pm_callback() fails +*/ +#define RUNNING_HELPERS_TIMEOUT (5 * HZ) +#ifdef CONFIG_KMOD /*
@@ -279,11 +288,20 @@ static int usermodehelper_pm_callback(stunsigned long action, void *ignored) { +DECLARE_WAIT_QUEUE_HEAD_ONSTACK (waiting ); +switch (action) {case PM_HIBERNATION_PREPARE :case PM_SUSPEND_PREPARE : usermodehelper_disabled =1 ; -return NOTIFY_OK ; +wait_event_timeout (waiting,atomic_read (&running_helpers) ==0 , +RUNNING_HELPERS_TIMEOUT ); +if (atomic_read (&running_helpers) ==0 ) { +return NOTIFY_OK ; + }else { + usermodehelper_disabled =0 ; +return NOTIFY_BAD ; + }case PM_POST_HIBERNATION :case PM_POST_SUSPEND : usermodehelper_disabled =0 ;
@@ -397,12 +415,13 @@ int call_usermodehelper_exec(struct subpDECLARE_COMPLETION_ONSTACK (done);int retval; +atomic_inc (&running_helpers);if (sub_info->path[0 ] =='\0' ) { retval =0 ; goto out; } -if (!khelper_wq || usermodehelper_disabled) { +if (!khelper_wq || (wait !=UMH_NO_WAIT && usermodehelper_disabled)) { retval = -EBUSY ; goto out; }
@@ -418,6 +437,7 @@ int call_usermodehelper_exec(struct subp out:call_usermodehelper_freeinfo (sub_info); +atomic_dec (&running_helpers);return retval; }EXPORT_SYMBOL (call_usermodehelper_exec);
Re: [PATCH -mm 2/2] PM: Disable usermode helper before hibernation and suspend
Quoted 16 lines · you
Quoted 15 lines · Rafael J. Wysocki
Quoted 13 lines · Uli Luckas
Quoted 5 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Use a hibernation and suspend notifier to disable the user mode helper before a hibernation/suspend and enable it after the operation.
Hi Rafael,
I have a couple of questions, regarding this patch ...2) how does your patch prevent
wait_for_completion(&done)to hang during freezing ifusermodehelper_pm_callbackis called _after_ the above check?
Quoted 8 lines
Quoted 4 lines
It doesn't. Once the helper is running, we can't distinguish it from any other user land process.
Still, it narrows the window quite a bit.
Okay, I think we can help it a bit. Please tell me what you think of the following patch (on top of 2.6.22-rc4-mm2).
Hi Rafael,
Thanks for your work. I haven't found the time to actually test your patch but in general it looks like a valid aproach.
I think there is one problem though. You need to have your wait queue woken up when you update (atomic_dec) running_helpers. Otherwise you end up always waiting the full RUNNING_HELPERS_TIMEOUT.
Quoted 65 lines
Index:
linux-2.6.22-rc4-mm2/kernel/kmod.c
===================================================================kernel/kmod.c +22
-2@@ -49,6 +49,15 @@ static struct workqueue_struct *khelper_*/ static int usermodehelper_disabled; +/* Number of helpers running */ +static atomic_t running_helpers =ATOMIC_INIT (0 ); + +/* +* Time to wait for running_helpers to become zero before the setting of +* usermodehelper_disabled in usermodehelper_pm_callback() fails +*/ +#define RUNNING_HELPERS_TIMEOUT (5 * HZ) +#ifdef CONFIG_KMOD /* @@ -279,11 +288,20 @@ static int usermodehelper_pm_callback(stunsigned long action, void *ignored) { +DECLARE_WAIT_QUEUE_HEAD_ONSTACK (waiting ); +switch (action) {case PM_HIBERNATION_PREPARE :case PM_SUSPEND_PREPARE : usermodehelper_disabled =1 ; -return NOTIFY_OK ; +wait_event_timeout (waiting,atomic_read (&running_helpers) ==0 , +RUNNING_HELPERS_TIMEOUT ); +if (atomic_read (&running_helpers) ==0 ) { +return NOTIFY_OK ; + }else { + usermodehelper_disabled =0 ; +return NOTIFY_BAD ; + }case PM_POST_HIBERNATION :case PM_POST_SUSPEND : usermodehelper_disabled =0 ;@@ -397,12 +415,13 @@ int call_usermodehelper_exec(struct subpDECLARE_COMPLETION_ONSTACK (done);int retval; +atomic_inc (&running_helpers);if (sub_info->path[0 ] =='\0' ) { retval =0 ; goto out; } -if (!khelper_wq || usermodehelper_disabled) { +if (!khelper_wq || (wait !=UMH_NO_WAIT && usermodehelper_disabled)) { retval = -EBUSY ; goto out; }@@ -418,6 +437,7 @@ int call_usermodehelper_exec(struct subp out:call_usermodehelper_freeinfo (sub_info); +atomic_dec (&running_helpers);return retval; }EXPORT_SYMBOL (call_usermodehelper_exec);
Signature · 12 lines
------- ROAD ...the handyPC Company - - - ) ) ) Uli Luckas Software Development ROAD GmbH Bennigsenstr. 14 | 12159 Berlin | Germany fon: +49 (30) 230069 - 64 | fax: +49 (30) 230069 - 69 url: www.road.de Amtsgericht Charlottenburg: HRB 96688 B Managing directors: Hans-Peter Constien, Hubertus von Streit
Re: [PATCH -mm 2/2] PM: Disable usermode helper before hibernation and suspend
Quoted 25 lines · Uli Luckas
Quoted 16 lines · you
Quoted 15 lines · Rafael J. Wysocki
Quoted 13 lines · Uli Luckas
Quoted 5 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Use a hibernation and suspend notifier to disable the user mode helper before a hibernation/suspend and enable it after the operation.
Hi Rafael,
I have a couple of questions, regarding this patch ...2) how does your patch prevent
wait_for_completion(&done)to hang during freezing ifusermodehelper_pm_callbackis called _after_ the above check?Quoted 8 lines
Quoted 4 lines
It doesn't. Once the helper is running, we can't distinguish it from any other user land process.
Still, it narrows the window quite a bit.
Okay, I think we can help it a bit. Please tell me what you think of the following patch (on top of 2.6.22-rc4-mm2).
Quoted 6 lines
Hi Rafael,
Thanks for your work. I haven't found the time to actually test your patch but in general it looks like a valid aproach.
I think there is one problem though. You need to have your wait queue woken up when you update (atomic_dec)running_helpers. Otherwise you end up always waiting the fullRUNNING_HELPERS_TIMEOUT.
Yeah, right. I tend to forget about obvious things. :-(
Besides, I think that the _pm_callback need not be compiled if CONFIG_PM is unset. If you can, please have a look at the next version of the patch (appended).
Greetings,
Rafael
--- kernel/kmod.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 66 insertions(+), 10 deletions(-)
kernel/kmod.c +66 -10
@@ -41,14 +41,6 @@ extern int max_threads;static struct workqueue_struct *khelper_wq; -/* -* If set, both call_usermodehelper_keys() and call_usermodehelper_pipe() exit -* immediately returning -EBUSY. Used for preventing user land processes from -* being created after the user land has been frozen during a system-wide -* hibernation or suspend operation. -*/ -static int usermodehelper_disabled; -#ifdef CONFIG_KMOD /*
@@ -275,6 +267,30 @@ static void __call_usermodehelper(struct } } +#ifdef CONFIG_PM +/* +* If set and if call_usermodehelper_exec() is supposed to wait, it will exit +* immediately returning -EBUSY (used for preventing user land processes from +* being created after the user land has been frozen during a system-wide +* hibernation or suspend operation). +*/ +static int usermodehelper_disabled; + +/* Number of helpers running */ +static atomic_t running_helpers =ATOMIC_INIT (0 ); + +/* +* Wait queue head used by usermodehelper_pm_callback() to wait for all running +* helpers to finish. +*/ +static DECLARE_WAIT_QUEUE_HEAD (running_helpers_waitq); + +/* +* Time to wait for running_helpers to become zero before the setting of +* usermodehelper_disabled in usermodehelper_pm_callback() fails +*/ +#define RUNNING_HELPERS_TIMEOUT (5 * HZ) +static int usermodehelper_pm_callback (struct notifier_block *nfb,unsigned long action,void *ignored)
@@ -283,7 +299,15 @@ static int usermodehelper_pm_callback(stcase PM_HIBERNATION_PREPARE :case PM_SUSPEND_PREPARE : usermodehelper_disabled =1 ; -return NOTIFY_OK ; +wait_event_timeout (running_helpers_waitq, +atomic_read (&running_helpers) ==0 , +RUNNING_HELPERS_TIMEOUT ); +if (atomic_read (&running_helpers) ==0 ) { +return NOTIFY_OK ; + }else { + usermodehelper_disabled =0 ; +return NOTIFY_BAD ; + }case PM_POST_HIBERNATION :case PM_POST_SUSPEND : usermodehelper_disabled =0 ;
@@ -293,6 +317,36 @@ static int usermodehelper_pm_callback(st return NOTIFY_DONE; } +static void new_helper (void ) +{ +atomic_inc (&running_helpers); +} + +static void helper_finished (void ) +{ +if (atomic_dec_and_test (&running_helpers)) +wake_up (&running_helpers_waitq); +} + +#else /* CONFIG_PM */ +#define usermodehelper_disabled 0 + +static inline int usermodehelper_pm_callback (struct notifier_block *nfb, +unsigned long action, +void *ignored) +{ +return 0 ; +} + +static inline void new_helper (void ) +{ +} + +static inline void helper_finished (void ) +{ +} +#endif /* CONFIG_PM */ +/** * call_usermodehelper_setup - prepare to call a usermode helper * @path - path to usermode executable
@@ -397,12 +451,13 @@ int call_usermodehelper_exec(struct subpDECLARE_COMPLETION_ONSTACK (done);int retval; +new_helper ();if (sub_info->path[0 ] =='\0' ) { retval =0 ; goto out; } -if (!khelper_wq || usermodehelper_disabled) { +if (!khelper_wq || (wait !=UMH_NO_WAIT && usermodehelper_disabled)) { retval = -EBUSY ; goto out; }
@@ -418,6 +473,7 @@ int call_usermodehelper_exec(struct subp out:call_usermodehelper_freeinfo (sub_info); +helper_finished ();return retval; }EXPORT_SYMBOL (call_usermodehelper_exec);
Re: [PATCH -mm 2/2] PM: Disable usermode helper before hibernation and suspend
Quoted 26 lines · you
Quoted 25 lines · Uli Luckas
Quoted 23 lines · you
Quoted 11 lines · Rafael J. Wysocki
Quoted 10 lines · Uli Luckas
Quoted 5 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Use a hibernation and suspend notifier to disable the user mode helper before a hibernation/suspend and enable it after the operation.
Hi Rafael,
I have a couple of questions, regarding this patch ...Quoted 8 lines
Quoted 3 lines
2) how does your patch prevent
wait_for_completion(&done)to hang during freezing ifusermodehelper_pm_callbackis called _after_ the above check?It doesn't. Once the helper is running, we can't distinguish it from any other user land process.
Still, it narrows the window quite a bit.
Okay, I think we can help it a bit. Please tell me what you think of the following patch (on top of 2.6.22-rc4-mm2).
Quoted 9 lines
Quoted 6 lines
Hi Rafael,
Thanks for your work. I haven't found the time to actually test your patch but in general it looks like a valid aproach.
I think there is one problem though. You need to have your wait queue woken up when you update (atomic_dec)running_helpers. Otherwise you end up always waiting the fullRUNNING_HELPERS_TIMEOUT.Yeah, right. I tend to forget about obvious things. :-(
Great. As far as I can see, this patch should now fix the situation except under heavy load where it would abort the attempted suspend. I can live with that and it is a whole lot better than it was before - Thanks.
Quoted 3 lines
Besides, I think that the
_pm_callbackneed not be compiled ifCONFIG_PMis unset.
Should work but is probably beneath what you intended to do. I'll comment further down...
Quoted 3 lines
If you can, please have a look at the next version of the patch (appended).
One more topic to keep in mind for the future. None of the callers of call_usermode_helper* expect a return value of EBUSY nor do they handle it correctly. If auto loading of a module for example fails, a permanent error is usually assumed and no retry attempts are made.
Quoted 86 lines
Greetings,
RafaelSigned-off-by Rafael J. Wysocki <[email protected]>--- kernel/kmod.c | 76++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 66 insertions(+), 10 deletions(-)
Index:
linux-2.6.22-rc4-mm2/kernel/kmod.c
===================================================================kernel/kmod.c +0
-2@@ -41,14 +41,6 @@ extern int max_threads;static struct workqueue_struct *khelper_wq; -/* -* If set, both call_usermodehelper_keys() and call_usermodehelper_pipe() exit - * immediately returning
-EBUSY. Used for preventing user land processes from - * being created after the user land has been frozen during a system-wide - * hibernation or suspend operation.
- */kernel/kmod.c +3
-2-static int usermodehelper_disabled; -#ifdef CONFIG_KMOD /* @@ -275,6 +267,30 @@ static void __call_usermodehelper(struct } } +#ifdef CONFIG_PM +/* +* If set and if call_usermodehelper_exec() is supposed to wait, it will exit + * immediately returning
-EBUSY(used for preventing user land processes from + * being created after the user land has been frozen during a system-wide + * hibernation or suspend operation).
+ */kernel/kmod.c +7
-0+static int usermodehelper_disabled; + +/* Number of helpers running */ +static atomic_t running_helpers =ATOMIC_INIT (0 ); + +/* +* Wait queue head used by usermodehelper_pm_callback() to wait for all running + * helpers to finish.
+ */kernel/kmod.c +22
-1+static DECLARE_WAIT_QUEUE_HEAD (running_helpers_waitq); + +/* +* Time to wait for running_helpers to become zero before the setting of +* usermodehelper_disabled in usermodehelper_pm_callback() fails +*/ +#define RUNNING_HELPERS_TIMEOUT (5 * HZ) +static int usermodehelper_pm_callback (struct notifier_block *nfb,unsigned long action,void *ignored)@@ -283,7 +299,15 @@ static int usermodehelper_pm_callback(stcase PM_HIBERNATION_PREPARE :case PM_SUSPEND_PREPARE : usermodehelper_disabled =1 ; -return NOTIFY_OK ; +wait_event_timeout (running_helpers_waitq, +atomic_read (&running_helpers) ==0 , +RUNNING_HELPERS_TIMEOUT ); +if (atomic_read (&running_helpers) ==0 ) { +return NOTIFY_OK ; + }else { + usermodehelper_disabled =0 ; +return NOTIFY_BAD ; + }case PM_POST_HIBERNATION :case PM_POST_SUSPEND : usermodehelper_disabled =0 ;@@ -293,6 +317,36 @@ static int usermodehelper_pm_callback(streturn NOTIFY_DONE ; } +static void new_helper (void ) +{ +atomic_inc (&running_helpers); +} +
kernel/kmod.c static int usermodehelper_pm_callback(st · line 334
Quoted 10 lines
kernel/kmod.c +10
-0+static void helper_finished (void ) +{ +if (atomic_dec_and_test (&running_helpers)) +wake_up (&running_helpers_waitq); +} + +#else /* CONFIG_PM */ +#define usermodehelper_disabled 0 + +static inline int usermodehelper_pm_callback(struct notifier_block *nfb,
^^^^^^
This kind of implies, the compiler might optimize this function away. Further down you call "pm_notifier(usermodehelper_pm_callback, 0);", thereby passing a pointer to usermodehelper_pm_callback which can't be inlined nor optimized away. If instead you had an inline function register_usermodehelper_pm_callback which called pm_notifier if CONFIG_PM was defined and did nothing otherwise...
Quoted 41 lines
kernel/kmod.c +18
-1+ unsigned long action, + void *ignored) +{ +return 0 ; +} + +static inline void new_helper (void ) +{ +} + +static inline void helper_finished (void ) +{ +} +#endif /* CONFIG_PM */ +/** * call_usermodehelper_setup - prepare to call a usermode helper * @path - path to usermode executable @@ -397,12 +451,13 @@ int call_usermodehelper_exec(struct subpDECLARE_COMPLETION_ONSTACK (done);int retval; +new_helper ();if (sub_info->path[0 ] =='\0' ) { retval =0 ; goto out; } -if (!khelper_wq || usermodehelper_disabled) { +if (!khelper_wq || (wait !=UMH_NO_WAIT && usermodehelper_disabled)) { retval = -EBUSY ; goto out; }@@ -418,6 +473,7 @@ int call_usermodehelper_exec(struct subp out:call_usermodehelper_freeinfo (sub_info); +helper_finished ();return retval; }EXPORT_SYMBOL (call_usermodehelper_exec);
Signature · 12 lines
------- ROAD ...the handyPC Company - - - ) ) ) Uli Luckas Software Development ROAD GmbH Bennigsenstr. 14 | 12159 Berlin | Germany fon: +49 (30) 230069 - 64 | fax: +49 (30) 230069 - 69 url: www.road.de Amtsgericht Charlottenburg: HRB 96688 B Managing directors: Hans-Peter Constien, Hubertus von Streit