Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751372AbXFDVZq (ORCPT ); Mon, 4 Jun 2007 17:25:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754071AbXFDVZW (ORCPT ); Mon, 4 Jun 2007 17:25:22 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:40856 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750903AbXFDVZU (ORCPT ); Mon, 4 Jun 2007 17:25:20 -0400 From: "Rafael J. Wysocki" To: Andrew Morton Subject: [PATCH -mm 2/2] PM: Disable usermode helper before hibernation and suspend Date: Mon, 4 Jun 2007 23:28:27 +0200 User-Agent: KMail/1.9.5 Cc: LKML , Nigel Cunningham , Pavel Machek References: <200706042325.28965.rjw@sisk.pl> In-Reply-To: <200706042325.28965.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200706042328.27887.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2839 Lines: 93 From: Rafael J. Wysocki Use a hibernation and suspend notifier to disable the user mode helper before a hibernation/suspend and enable it after the operation. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek --- kernel/kmod.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) Index: linux-2.6.22-rc3/kernel/kmod.c =================================================================== --- linux-2.6.22-rc3.orig/kernel/kmod.c 2007-05-31 00:00:37.000000000 +0200 +++ linux-2.6.22-rc3/kernel/kmod.c 2007-06-02 00:01:47.000000000 +0200 @@ -33,6 +33,8 @@ #include #include #include +#include +#include #include 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(struct complete(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); } - 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/