https://github.com/torvalds/linux
Revision 40fea92ffb5fa0ef26d10ae0fe5688bc8e61c791 authored by Stephen Boyd on 13 August 2013, 21:12:40 UTC, committed by Rafael J. Wysocki on 13 August 2013, 22:42:05 UTC
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. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Reviewed-by: Tejun Heo <tj@kernel.org> Cc: 3.9+ <stable@vger.kernel.org> # 3.9+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent d4e4ab8
Tip revision: 40fea92ffb5fa0ef26d10ae0fe5688bc8e61c791 authored by Stephen Boyd on 13 August 2013, 21:12:40 UTC
PM / QoS: Fix workqueue deadlock when using pm_qos_update_request_timeout()
PM / QoS: Fix workqueue deadlock when using pm_qos_update_request_timeout()
Tip revision: 40fea92
| File | Mode | Size |
|---|---|---|
| basic | ||
| coccinelle | ||
| dtc | ||
| genksyms | ||
| kconfig | ||
| ksymoops | ||
| mod | ||
| package | ||
| rt-tester | ||
| selinux | ||
| tracing | ||
| .gitignore | -rw-r--r-- | 122 bytes |
| Kbuild.include | -rw-r--r-- | 10.1 KB |
| Lindent | -rwxr-xr-x | 460 bytes |
| Makefile | -rw-r--r-- | 1.4 KB |
| Makefile.asm-generic | -rw-r--r-- | 684 bytes |
| Makefile.build | -rw-r--r-- | 15.1 KB |
| Makefile.clean | -rw-r--r-- | 3.2 KB |
| Makefile.fwinst | -rw-r--r-- | 2.0 KB |
| Makefile.headersinst | -rw-r--r-- | 4.7 KB |
| Makefile.help | -rw-r--r-- | 68 bytes |
| Makefile.host | -rw-r--r-- | 6.5 KB |
| Makefile.lib | -rw-r--r-- | 13.4 KB |
| Makefile.modbuiltin | -rw-r--r-- | 1.8 KB |
| Makefile.modinst | -rw-r--r-- | 1.2 KB |
| Makefile.modpost | -rw-r--r-- | 5.1 KB |
| Makefile.modsign | -rw-r--r-- | 1003 bytes |
| asn1_compiler.c | -rw-r--r-- | 33.8 KB |
| bin2c.c | -rw-r--r-- | 702 bytes |
| bloat-o-meter | -rwxr-xr-x | 1.8 KB |
| bootgraph.pl | -rw-r--r-- | 5.6 KB |
| checkincludes.pl | -rwxr-xr-x | 1.8 KB |
| checkkconfigsymbols.sh | -rwxr-xr-x | 1.8 KB |
| checkpatch.pl | -rwxr-xr-x | 112.7 KB |
| checkstack.pl | -rwxr-xr-x | 5.3 KB |
| checksyscalls.sh | -rwxr-xr-x | 5.5 KB |
| checkversion.pl | -rwxr-xr-x | 1.9 KB |
| cleanfile | -rwxr-xr-x | 3.4 KB |
| cleanpatch | -rwxr-xr-x | 5.0 KB |
| coccicheck | -rwxr-xr-x | 4.6 KB |
| config | -rwxr-xr-x | 3.7 KB |
| conmakehash.c | -rw-r--r-- | 6.0 KB |
| decodecode | -rwxr-xr-x | 2.1 KB |
| depmod.sh | -rwxr-xr-x | 1.7 KB |
| diffconfig | -rwxr-xr-x | 3.6 KB |
| docproc.c | -rw-r--r-- | 14.1 KB |
| export_report.pl | -rw-r--r-- | 4.5 KB |
| extract-ikconfig | -rwxr-xr-x | 1.6 KB |
| extract-vmlinux | -rwxr-xr-x | 1.6 KB |
| gcc-goto.sh | -rw-r--r-- | 465 bytes |
| gcc-version.sh | -rw-r--r-- | 822 bytes |
| gcc-x86_32-has-stack-protector.sh | -rw-r--r-- | 184 bytes |
| gcc-x86_64-has-stack-protector.sh | -rw-r--r-- | 200 bytes |
| gen_initramfs_list.sh | -rw-r--r-- | 7.4 KB |
| get_maintainer.pl | -rwxr-xr-x | 54.1 KB |
| gfp-translate | -rwxr-xr-x | 1.7 KB |
| headerdep.pl | -rwxr-xr-x | 3.5 KB |
| headers.sh | -rwxr-xr-x | 530 bytes |
| headers_check.pl | -rw-r--r-- | 3.5 KB |
| headers_install.sh | -rw-r--r-- | 1.3 KB |
| kallsyms.c | -rw-r--r-- | 15.2 KB |
| kernel-doc | -rwxr-xr-x | 71.4 KB |
| link-vmlinux.sh | -rw-r--r-- | 5.5 KB |
| makelst | -rwxr-xr-x | 773 bytes |
| markup_oops.pl | -rw-r--r-- | 8.1 KB |
| mkcompile_h | -rwxr-xr-x | 2.5 KB |
| mkmakefile | -rw-r--r-- | 1.2 KB |
| mksysmap | -rw-r--r-- | 1.3 KB |
| mkuboot.sh | -rwxr-xr-x | 379 bytes |
| mkversion | -rw-r--r-- | 74 bytes |
| module-common.lds | -rw-r--r-- | 737 bytes |
| namespace.pl | -rwxr-xr-x | 13.0 KB |
| patch-kernel | -rwxr-xr-x | 9.9 KB |
| pnmtologo.c | -rw-r--r-- | 11.9 KB |
| profile2linkerlist.pl | -rw-r--r-- | 375 bytes |
| recordmcount.c | -rw-r--r-- | 12.4 KB |
| recordmcount.h | -rw-r--r-- | 16.3 KB |
| recordmcount.pl | -rwxr-xr-x | 17.5 KB |
| setlocalversion | -rwxr-xr-x | 3.8 KB |
| show_delta | -rwxr-xr-x | 3.0 KB |
| sign-file | -rwxr-xr-x | 12.2 KB |
| sortextable.c | -rw-r--r-- | 6.8 KB |
| sortextable.h | -rw-r--r-- | 4.9 KB |
| tags.sh | -rwxr-xr-x | 9.5 KB |
| unifdef.c | -rw-r--r-- | 34.8 KB |
| ver_linux | -rwxr-xr-x | 3.1 KB |
| xz_wrap.sh | -rw-r--r-- | 562 bytes |
Computing file changes ...
