linux-uconsole/kernel/power
Stephen Boyd 1dba303727 PM / QoS: Fix workqueue deadlock when using pm_qos_update_request_timeout()
commit 40fea92ffb upstream.

pm_qos_update_request_timeout() updates a qos and then schedules
a delayed work item to bring the qos back down to the default
after the timeout. When the work item runs, pm_qos_work_fn() will
call pm_qos_update_request() and deadlock because it tries to
cancel itself via cancel_delayed_work_sync(). Future callers of
that qos will also hang waiting to cancel the work that is
canceling itself. Let's extract the little bit of code that does
the real work of pm_qos_update_request() and call it from the
work function so that we don't deadlock.

Before ed1ac6e (PM: don't use [delayed_]work_pending()) this didn't
happen because the work function wouldn't try to cancel itself.

[backport to 3.10 - gregkh]

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Reviewed-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-20 08:43:05 -07:00
..
autosleep.c PM / Sleep: avoid 'autosleep' in shutdown progress 2013-07-28 16:30:21 -07:00
block_io.c block: kill off REQ_UNPLUG 2011-03-10 08:52:27 +01:00
console.c PM: make VT switching to the suspend console optional v3 2013-02-20 01:33:41 +01:00
hibernate.c Power management updates for 3.6 2012-07-22 13:36:52 -07:00
Kconfig PM / Domains: Add power off/on function for system core suspend stage 2012-09-04 01:36:01 +02:00
main.c suspend: enable freeze timeout configuration through sys 2013-02-09 22:32:48 +01:00
Makefile PM / Sleep: Add user space interface for manipulating wakeup sources, v3 2012-05-01 21:26:05 +02:00
power.h PM / Hibernate: Enable suspend to both for in-kernel hibernation. 2012-07-01 13:31:22 +02:00
poweroff.c power/sysrq: fix inconstistent help message of sysrq key 2013-04-30 17:04:10 -07:00
process.c suspend: enable freeze timeout configuration through sys 2013-02-09 22:32:48 +01:00
qos.c PM / QoS: Fix workqueue deadlock when using pm_qos_update_request_timeout() 2013-08-20 08:43:05 -07:00
snapshot.c Power management updates for 3.4 2012-03-21 10:15:51 -07:00
suspend.c PM / sleep: invalidate TEST_CPUS and TEST_CORE support for freeze state 2013-04-05 14:18:25 +02:00
suspend_test.c driver-core: constify data for class_find_device() 2013-02-06 12:18:56 -08:00
swap.c PM / Hibernate: use rb_entry 2012-11-15 00:37:08 +01:00
user.c Make wait_for_device_probe() also do scsi_complete_async_scans() 2012-07-18 18:15:46 -07:00
wakelock.c PM / Sleep: Require CAP_BLOCK_SUSPEND to use wake_lock/wake_unlock 2012-07-19 00:00:58 +02:00