Gustavo F. Padovan fad003b6c8 Bluetooth: Fix inconsistent lock state with RFCOMM ... When receiving a rfcomm connection with the old dund deamon a inconsistent lock state happens. That's because interrupts were already disabled by l2cap_conn_start() when rfcomm_sk_state_change() try to lock the spin_lock. As result we may have a inconsistent lock state for l2cap_conn_start() after rfcomm_sk_state_change() calls bh_lock_sock() and disable interrupts as well. [ 2833.151999] [ 2833.151999] ================================= [ 2833.151999] [ INFO: inconsistent lock state ] [ 2833.151999] 2.6.36-rc3 #2 [ 2833.151999] --------------------------------- [ 2833.151999] inconsistent {IN-SOFTIRQ-W} -> {SOFTIRQ-ON-W} usage. [ 2833.151999] krfcommd/2306 [HC0[0]:SC0[0]:HE1:SE1] takes: [ 2833.151999] (slock-AF_BLUETOOTH){+.?...}, at: [<ffffffffa00bcb56>] rfcomm_sk_state_change+0x46/0x170 [rfcomm] [ 2833.151999] {IN-SOFTIRQ-W} state was registered at: [ 2833.151999] [<ffffffff81094346>] __lock_acquire+0x5b6/0x1560 [ 2833.151999] [<ffffffff8109534a>] lock_acquire+0x5a/0x70 [ 2833.151999] [<ffffffff81392b6c>] _raw_spin_lock+0x2c/0x40 [ 2833.151999] [<ffffffffa00a5092>] l2cap_conn_start+0x92/0x640 [l2cap] [ 2833.151999] [<ffffffffa00a6a3f>] l2cap_sig_channel+0x6bf/0x1320 [l2cap] [ 2833.151999] [<ffffffffa00a9173>] l2cap_recv_frame+0x133/0x770 [l2cap] [ 2833.151999] [<ffffffffa00a997b>] l2cap_recv_acldata+0x1cb/0x390 [l2cap] [ 2833.151999] [<ffffffffa000db4b>] hci_rx_task+0x2ab/0x450 [bluetooth] [ 2833.151999] [<ffffffff8106b22b>] tasklet_action+0xcb/0xe0 [ 2833.151999] [<ffffffff8106b91e>] __do_softirq+0xae/0x150 [ 2833.151999] [<ffffffff8102bc0c>] call_softirq+0x1c/0x30 [ 2833.151999] [<ffffffff8102ddb5>] do_softirq+0x75/0xb0 [ 2833.151999] [<ffffffff8106b56d>] irq_exit+0x8d/0xa0 [ 2833.151999] [<ffffffff8104484b>] smp_apic_timer_interrupt+0x6b/0xa0 [ 2833.151999] [<ffffffff8102b6d3>] apic_timer_interrupt+0x13/0x20 [ 2833.151999] [<ffffffff81029dfa>] cpu_idle+0x5a/0xb0 [ 2833.151999] [<ffffffff81381ded>] rest_init+0xad/0xc0 [ 2833.151999] [<ffffffff817ebc4d>] start_kernel+0x2dd/0x2e8 [ 2833.151999] [<ffffffff817eb2e6>] x86_64_start_reservations+0xf6/0xfa [ 2833.151999] [<ffffffff817eb3ce>] x86_64_start_kernel+0xe4/0xeb [ 2833.151999] irq event stamp: 731 [ 2833.151999] hardirqs last enabled at (731): [<ffffffff8106b762>] local_bh_enable_ip+0x82/0xe0 [ 2833.151999] hardirqs last disabled at (729): [<ffffffff8106b93e>] __do_softirq+0xce/0x150 [ 2833.151999] softirqs last enabled at (730): [<ffffffff8106b96e>] __do_softirq+0xfe/0x150 [ 2833.151999] softirqs last disabled at (711): [<ffffffff8102bc0c>] call_softirq+0x1c/0x30 [ 2833.151999] [ 2833.151999] other info that might help us debug this: [ 2833.151999] 2 locks held by krfcommd/2306: [ 2833.151999] #0: (rfcomm_mutex){+.+.+.}, at: [<ffffffffa00bb744>] rfcomm_run+0x174/0xb20 [rfcomm] [ 2833.151999] #1: (&(&d->lock)->rlock){+.+...}, at: [<ffffffffa00b9223>] rfcomm_dlc_accept+0x53/0x100 [rfcomm] [ 2833.151999] [ 2833.151999] stack backtrace: [ 2833.151999] Pid: 2306, comm: krfcommd Tainted: G W 2.6.36-rc3 #2 [ 2833.151999] Call Trace: [ 2833.151999] [<ffffffff810928e1>] print_usage_bug+0x171/0x180 [ 2833.151999] [<ffffffff810936c3>] mark_lock+0x333/0x400 [ 2833.151999] [<ffffffff810943ca>] __lock_acquire+0x63a/0x1560 [ 2833.151999] [<ffffffff810948b5>] ? __lock_acquire+0xb25/0x1560 [ 2833.151999] [<ffffffff8109534a>] lock_acquire+0x5a/0x70 [ 2833.151999] [<ffffffffa00bcb56>] ? rfcomm_sk_state_change+0x46/0x170 [rfcomm] [ 2833.151999] [<ffffffff81392b6c>] _raw_spin_lock+0x2c/0x40 [ 2833.151999] [<ffffffffa00bcb56>] ? rfcomm_sk_state_change+0x46/0x170 [rfcomm] [ 2833.151999] [<ffffffffa00bcb56>] rfcomm_sk_state_change+0x46/0x170 [rfcomm] [ 2833.151999] [<ffffffffa00b9239>] rfcomm_dlc_accept+0x69/0x100 [rfcomm] [ 2833.151999] [<ffffffffa00b9a49>] rfcomm_check_accept+0x59/0xd0 [rfcomm] [ 2833.151999] [<ffffffffa00bacab>] rfcomm_recv_frame+0x9fb/0x1320 [rfcomm] [ 2833.151999] [<ffffffff813932bb>] ? _raw_spin_unlock_irqrestore+0x3b/0x60 [ 2833.151999] [<ffffffff81093acd>] ? trace_hardirqs_on_caller+0x13d/0x180 [ 2833.151999] [<ffffffff81093b1d>] ? trace_hardirqs_on+0xd/0x10 [ 2833.151999] [<ffffffffa00bb7f1>] rfcomm_run+0x221/0xb20 [rfcomm] [ 2833.151999] [<ffffffff813905e7>] ? schedule+0x287/0x780 [ 2833.151999] [<ffffffffa00bb5d0>] ? rfcomm_run+0x0/0xb20 [rfcomm] [ 2833.151999] [<ffffffff81081026>] kthread+0x96/0xa0 [ 2833.151999] [<ffffffff8102bb14>] kernel_thread_helper+0x4/0x10 [ 2833.151999] [<ffffffff813936bc>] ? restore_args+0x0/0x30 [ 2833.151999] [<ffffffff81080f90>] ? kthread+0x0/0xa0 [ 2833.151999] [<ffffffff8102bb10>] ? kernel_thread_helper+0x0/0x10 Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>		2010-09-30 12:19:35 -03:00
..
9p	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-28 12:01:26 -07:00
802
8021q	vlan: Match underlying dev carrier on vlan add	2010-08-19 00:26:46 -07:00
appletalk
atm	br2684: fix scheduling while atomic	2010-09-26 18:29:18 -07:00
ax25	ax25: missplaced sock_put(sk)	2010-08-26 15:18:27 -07:00
bluetooth	Bluetooth: Fix inconsistent lock state with RFCOMM	2010-09-30 12:19:35 -03:00
bridge	bridge: Clear INET control block of SKBs passed into ip_fragment().	2010-09-01 19:17:34 -07:00
caif	net/caif/cfrfml.c: use asm/unaligned.h	2010-08-26 16:11:08 -07:00
can	can: add limit for nframes and clean up signed/unsigned variables	2010-08-11 16:12:35 -07:00
core	tcp: Fix >4GB writes on 64-bit.	2010-09-27 20:24:54 -07:00
dcb
dccp	net: dccp: fix sign bug	2010-07-18 15:07:14 -07:00
decnet	net-next: remove useless union keyword	2010-06-10 23:31:35 -07:00
dns_resolver	DNS: If the DNS server returns an error, allow that to be cached [ver #2]	2010-08-11 17:11:28 +00:00
dsa	phylib: available for any speed ethernet	2010-08-11 23:03:50 -07:00
econet	econet: fix locking	2010-06-11 18:37:08 -07:00
ethernet	Net: ethernet: pe2.c: fix EXPORT_SYMBOL macro code style issue	2010-07-14 18:27:09 -07:00
ieee802154	ieee802154: Fix possible NULL pointer dereference in wpan_phy_alloc	2010-05-23 23:11:07 -07:00
ipv4	tcp: Fix >4GB writes on 64-bit.	2010-09-27 20:24:54 -07:00
ipv6	ipv6: add IPv6 to neighbour table overflow warning	2010-09-27 15:02:18 -07:00
ipx
irda	irda: off by one	2010-09-07 13:57:22 -07:00
iucv	net: use __packed annotation	2010-06-03 03:21:52 -07:00
key	pfkey: add severity to printk	2010-05-17 23:23:13 -07:00
l2tp	l2tp: test for ethernet header in l2tp_eth_dev_recv()	2010-08-26 13:29:38 -07:00
lapb
llc	net/llc: storing negative error codes in unsigned short	2010-09-16 22:38:23 -07:00
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-07 14:06:10 -07:00
netfilter	netfilter: fix a race in nf_ct_ext_create()	2010-09-22 13:13:33 -07:00
netlabel	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00
netlink	netlink: Make NETLINK_USERSOCK work again.	2010-08-31 09:51:37 -07:00
netrom
packet	packet_mmap: expose hw packet timestamps to network packet capture utilities	2010-06-02 05:53:56 -07:00
phonet	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-07-20 18:25:24 -07:00
rds	net: fix a lockdep splat	2010-09-24 22:26:10 -07:00
rfkill
rose	rose: Fix signedness issues wrt. digi count.	2010-09-20 15:40:35 -07:00
rxrpc	Add a dummy printk function for the maintenance of unused printks	2010-08-12 09:51:35 -07:00
sched	sch_atm: Fix potential NULL deref.	2010-09-12 11:56:44 -07:00
sctp	sctp: Do not reset the packet during sctp_packet_config().	2010-09-17 16:47:56 -07:00
sunrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-28 12:01:26 -07:00
tipc	tipc: Reduce footprint by un-inlining tipc_msg_* routines	2010-05-12 23:02:29 -07:00
unix	UNIX: Do not loop forever at unix_autobind().	2010-09-07 13:57:23 -07:00
wanrouter	net: autoconvert trivial BKL users to private mutex	2010-07-12 20:21:47 -07:00
wimax	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-05-20 21:04:44 -07:00
wireless	wext: fix potential private ioctl memory content leak	2010-09-20 13:41:40 -04:00
x25	X25: Remove bkl in sockopts	2010-05-17 17:39:28 -07:00
xfrm	xfrm: Allow different selector family in temporary state	2010-09-20 11:11:38 -07:00
compat.c	From abbffa2aa9bd6f8df16d0d0a102af677510d8b9a Mon Sep 17 00:00:00 2001	2010-06-03 20:03:40 -07:00
Kconfig	net: RPS needs to depend upon USE_GENERIC_SMP_HELPERS	2010-09-14 21:42:22 -07:00
Makefile	DNS: Separate out CIFS DNS Resolver code	2010-08-05 17:17:51 +00:00
nonet.c
socket.c	net: support time stamping in phy devices.	2010-07-18 19:15:26 -07:00
sysctl_net.c	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00
TUNABLE