Gu Zheng 3a41c5dbe8 fb: reorder the lock sequence to fix potential dead lock ... Following commits: 50e244cc79 fb: rework locking to fix lock ordering on takeover e93a9a8687 fb: Yet another band-aid for fixing lockdep mess 054430e773 fbcon: fix locking harder reworked locking to fix related lock ordering on takeover, and introduced console_lock into fbmem, but it seems that the new lock sequence(fb_info->lock ---> console_lock) is against with the one in console_callback(console_lock ---> fb_info->lock), and leads to a potential dead lock as following: [ 601.079000] ====================================================== [ 601.079000] [ INFO: possible circular locking dependency detected ] [ 601.079000] 3.11.0 #189 Not tainted [ 601.079000] ------------------------------------------------------- [ 601.079000] kworker/0:3/619 is trying to acquire lock: [ 601.079000] (&fb_info->lock){+.+.+.}, at: [<ffffffff81397566>] lock_fb_info+0x26/0x60 [ 601.079000] but task is already holding lock: [ 601.079000] (console_lock){+.+.+.}, at: [<ffffffff8141aae3>] console_callback+0x13/0x160 [ 601.079000] which lock already depends on the new lock. [ 601.079000] the existing dependency chain (in reverse order) is: [ 601.079000] -> #1 (console_lock){+.+.+.}: [ 601.079000] [<ffffffff810dc971>] lock_acquire+0xa1/0x140 [ 601.079000] [<ffffffff810c6267>] console_lock+0x77/0x80 [ 601.079000] [<ffffffff81399448>] register_framebuffer+0x1d8/0x320 [ 601.079000] [<ffffffff81cfb4c8>] efifb_probe+0x408/0x48f [ 601.079000] [<ffffffff8144a963>] platform_drv_probe+0x43/0x80 [ 601.079000] [<ffffffff8144853b>] driver_probe_device+0x8b/0x390 [ 601.079000] [<ffffffff814488eb>] __driver_attach+0xab/0xb0 [ 601.079000] [<ffffffff814463bd>] bus_for_each_dev+0x5d/0xa0 [ 601.079000] [<ffffffff81447e6e>] driver_attach+0x1e/0x20 [ 601.079000] [<ffffffff81447a07>] bus_add_driver+0x117/0x290 [ 601.079000] [<ffffffff81448fea>] driver_register+0x7a/0x170 [ 601.079000] [<ffffffff8144a10a>] __platform_driver_register+0x4a/0x50 [ 601.079000] [<ffffffff8144a12d>] platform_driver_probe+0x1d/0xb0 [ 601.079000] [<ffffffff81cfb0a1>] efifb_init+0x273/0x292 [ 601.079000] [<ffffffff81002132>] do_one_initcall+0x102/0x1c0 [ 601.079000] [<ffffffff81cb80a6>] kernel_init_freeable+0x15d/0x1ef [ 601.079000] [<ffffffff8166d2de>] kernel_init+0xe/0xf0 [ 601.079000] [<ffffffff816914ec>] ret_from_fork+0x7c/0xb0 [ 601.079000] -> #0 (&fb_info->lock){+.+.+.}: [ 601.079000] [<ffffffff810dc1d8>] __lock_acquire+0x1e18/0x1f10 [ 601.079000] [<ffffffff810dc971>] lock_acquire+0xa1/0x140 [ 601.079000] [<ffffffff816835ca>] mutex_lock_nested+0x7a/0x3b0 [ 601.079000] [<ffffffff81397566>] lock_fb_info+0x26/0x60 [ 601.079000] [<ffffffff813a4aeb>] fbcon_blank+0x29b/0x2e0 [ 601.079000] [<ffffffff81418658>] do_blank_screen+0x1d8/0x280 [ 601.079000] [<ffffffff8141ab34>] console_callback+0x64/0x160 [ 601.079000] [<ffffffff8108d855>] process_one_work+0x1f5/0x540 [ 601.079000] [<ffffffff8108e04c>] worker_thread+0x11c/0x370 [ 601.079000] [<ffffffff81095fbd>] kthread+0xed/0x100 [ 601.079000] [<ffffffff816914ec>] ret_from_fork+0x7c/0xb0 [ 601.079000] other info that might help us debug this: [ 601.079000] Possible unsafe locking scenario: [ 601.079000] CPU0 CPU1 [ 601.079000] ---- ---- [ 601.079000] lock(console_lock); [ 601.079000] lock(&fb_info->lock); [ 601.079000] lock(console_lock); [ 601.079000] lock(&fb_info->lock); [ 601.079000] *** DEADLOCK *** so we reorder the lock sequence the same as it in console_callback() to avoid this issue. And following Tomi's suggestion, fix these similar issues all in fb subsystem. Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>		2013-11-11 15:52:59 +02:00
..
accessibility
acpi	ACPI and power management fixes for 3.12-rc1	2013-09-12 11:22:45 -07:00
amba
ata
atm
auxdisplay	framebuffer: Use fb_<level>	2013-10-29 12:53:07 +02:00
base	thp: account anon transparent huge pages into NR_ANON_PAGES	2013-09-12 15:38:03 -07:00
bcma
block	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
bluetooth
bus	ARM: SoC platform changes for 3.12	2013-09-06 13:30:06 -07:00
cdrom
char	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
clk	The common clk framework changes for 3.12 are dominated by clock driver	2013-09-09 15:49:04 -07:00
clocksource	Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-09-16 16:10:26 -04:00
connector
cpufreq	Merge branch 'pm-cpufreq'	2013-09-12 13:04:11 +02:00
cpuidle	ACPI and power management fixes for 3.12-rc1	2013-09-12 11:22:45 -07:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux	2013-09-07 12:53:35 +10:00
dca
devfreq
dio
dma	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
edac	Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2013-09-06 11:14:33 -07:00
eisa
extcon
firewire
firmware	firmware/dmi_scan: drop OOM messages	2013-09-11 15:58:51 -07:00
fmc
gpio	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
gpu	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-09-12 15:01:38 -07:00
hid	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
hsi
hv
hwmon	hwmon: (k10temp) remove unnecessary pci_set_drvdata()	2013-09-12 08:17:40 -07:00
hwspinlock
i2c	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
ide	ide: sgiioc4: Staticize ioc4_ide_attach_one()	2013-09-05 15:21:30 -04:00
idle
iio	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
infiniband	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2013-09-15 07:13:39 -04:00
iommu	IOMMU Updates for Linux v3.12	2013-09-12 11:29:26 -07:00
ipack
irqchip	ARM: SoC late changes for v3.12	2013-09-09 16:35:29 -07:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-09-05 14:54:29 -07:00
leds	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds	2013-09-12 11:35:33 -07:00
lguest	lguest: fix guest kernel stack overflow when TF bit set.	2013-09-06 08:09:27 +09:30
macintosh
mailbox
md	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-09-12 15:01:38 -07:00
media	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
memory	ARM: SoC platform changes for 3.12	2013-09-06 13:30:06 -07:00
memstick	memstick: add support for legacy memorysticks	2013-09-11 15:59:35 -07:00
message
mfd	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
misc	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
mmc	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
mtd	Just a single fastmap fix plus a regression fix.	2013-09-16 15:37:52 -04:00
net	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2013-09-15 17:45:52 -04:00
nfc
ntb	ntb: clean up unnecessary MSI/MSI-X capability find	2013-09-05 11:08:01 -07:00
nubus
of	Merge branch 'for-v3.12-fix' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping	2013-09-11 19:11:59 -07:00
oprofile
parisc
parport
pci	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
pcmcia
pinctrl
platform	Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86	2013-09-15 17:42:59 -04:00
pnp	pnp: change pnp bus pm_ops to invoke pnp driver dev_pm_ops if specified	2013-09-11 15:58:15 -07:00
power	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
pps	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
ps3
ptp
pwm	ARM: SoC cleanups for 3.12	2013-09-06 13:21:16 -07:00
rapidio
regulator
remoteproc
reset
rpmsg
rtc	rtc: simplify devm_request_mem_region/devm_ioremap	2013-09-11 15:58:59 -07:00
s390	s390/vmcore: use vmcore for zfcpdump	2013-09-11 15:59:15 -07:00
sbus
scsi	SCSI misc on 20130915	2013-09-15 17:41:30 -04:00
sfi
sh
sn
spi	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
ssb
staging	Merge git://git.kvack.org/~bcrl/aio-next	2013-09-13 10:55:58 -07:00
target	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2013-09-12 16:11:45 -07:00
tc
thermal
tty	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
uio
usb	Merge git://git.kvack.org/~bcrl/aio-next	2013-09-13 10:55:58 -07:00
uwb
vfio
vhost	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2013-09-12 16:11:45 -07:00
video	fb: reorder the lock sequence to fix potential dead lock	2013-11-11 15:52:59 +02:00
virt
virtio	virtio_pci: pm: Use CONFIG_PM_SLEEP instead of CONFIG_PM	2013-09-09 10:02:53 +09:30
vlynq
vme
w1	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
watchdog	Merge git://www.linux-watchdog.org/linux-watchdog	2013-09-12 08:45:53 -07:00
xen	Bug-fixes:	2013-09-12 11:28:24 -07:00
zorro
Kconfig
Makefile