Skip to content

Commit

Permalink
PM: Print a warning if firmware is requested when tasks are frozen
Browse files Browse the repository at this point in the history
Some drivers erroneously use request_firmware() from their ->resume()
(or ->thaw(), or ->restore()) callbacks, which is not going to work
unless the firmware has been built in.  This causes system resume to
stall until the firmware-loading timeout expires, which makes users
think that the resume has failed and reboot their machines
unnecessarily.  For this reason, make _request_firmware() print a
warning and return immediately with error code if it has been called
when tasks are frozen and it's impossible to start any new usermode
helpers.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Reviewed-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
  • Loading branch information
rjwysocki committed May 17, 2011
1 parent e1866b3 commit a144c6a
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/base/firmware_class.c
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,11 @@ static int _request_firmware(const struct firmware **firmware_p,
if (!firmware_p)
return -EINVAL;

if (WARN_ON(usermodehelper_is_disabled())) {
dev_err(device, "firmware: %s will not be loaded\n", name);
return -EBUSY;
}

*firmware_p = firmware = kzalloc(sizeof(*firmware), GFP_KERNEL);
if (!firmware) {
dev_err(device, "%s: kmalloc(struct firmware) failed\n",
Expand Down
5 changes: 5 additions & 0 deletions include/linux/kmod.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,12 @@ call_usermodehelper(char *path, char **argv, char **envp, enum umh_wait wait)

extern void usermodehelper_init(void);

#ifdef CONFIG_PM_SLEEP
extern int usermodehelper_disable(void);
extern void usermodehelper_enable(void);
extern bool usermodehelper_is_disabled(void);
#else
static inline bool usermodehelper_is_disabled(void) { return false; }
#endif

#endif /* __LINUX_KMOD_H__ */
9 changes: 9 additions & 0 deletions kernel/kmod.c
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,15 @@ void usermodehelper_enable(void)
usermodehelper_disabled = 0;
}

/**
* usermodehelper_is_disabled - check if new helpers are allowed to be started
*/
bool usermodehelper_is_disabled(void)
{
return usermodehelper_disabled;
}
EXPORT_SYMBOL_GPL(usermodehelper_is_disabled);

static void helper_lock(void)
{
atomic_inc(&running_helpers);
Expand Down

0 comments on commit a144c6a

Please sign in to comment.