From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Sender: "Gustavo F. Padovan" From: "Gustavo F. Padovan" To: linux-bluetooth@vger.kernel.org Cc: marcel@holtmann.org, "Gustavo F. Padovan" Subject: [PATCH] Bluetooth: Fix inconsistent lock state with RFCOMM Date: Sat, 14 Aug 2010 11:46:53 -0300 Message-Id: <1281797213-10940-1-git-send-email-gustavo@padovan.org> List-ID: From: Gustavo F. Padovan When receiving a rfcomm connection with the old dund deamon the following inconsistent lock state happens: [ 811.702999] ================================= [ 811.702999] [ INFO: inconsistent lock state ] [ 811.702999] 2.6.35-rc1-01743-g41069ad-dirty #1 [ 811.702999] --------------------------------- [ 811.702999] inconsistent {IN-SOFTIRQ-W} -> {SOFTIRQ-ON-W} usage. [ 811.702999] krfcommd/3892 [HC0[0]:SC0[0]:HE1:SE1] takes: [ 811.702999] (slock-AF_BLUETOOTH){+.?...}, at: [] rfcomm_sk_state_change+0x46/0x170 [rfcomm] [ 811.702999] {IN-SOFTIRQ-W} state was registered at: [ 811.702999] [] __lock_acquire+0x5b6/0x1560 [ 811.702999] [] lock_acquire+0x5a/0x70 [ 811.702999] [] _raw_spin_lock+0x2c/0x40 [ 811.702999] [] 0xffffffffa0043092 [ 811.702999] [] 0xffffffffa0044a3f [ 811.702999] [] 0xffffffffa0047183 [ 811.702999] [] 0xffffffffa004798b [ 811.702999] [] 0xffffffffa000db4b [ 811.702999] [] tasklet_action+0xcb/0xe0 [ 811.702999] [] __do_softirq+0xae/0x150 [ 811.702999] [] call_softirq+0x1c/0x30 [ 811.702999] [] do_softirq+0x75/0xb0 [ 811.702999] [] irq_exit+0x8d/0xa0 [ 811.702999] [] do_IRQ+0x70/0xf0 [ 811.702999] [] ret_from_intr+0x0/0xf [ 811.702999] [] cpu_idle+0x5a/0xb0 [ 811.702999] [] start_secondary+0x211/0x254 [ 811.702999] irq event stamp: 411 [ 811.702999] hardirqs last enabled at (411): [] local_bh_enable_ip+0x82/0xe0 [ 811.702999] hardirqs last disabled at (409): [] __do_softirq+0xce/0x150 [ 811.702999] softirqs last enabled at (410): [] __do_softirq+0xfe/0x150 [ 811.702999] softirqs last disabled at (391): [] call_softirq+0x1c/0x30 [ 811.702999] [ 811.702999] other info that might help us debug this: [ 811.702999] 2 locks held by krfcommd/3892: [ 811.702999] #0: (rfcomm_mutex){+.+.+.}, at: [] rfcomm_run+0x174/0xb20 [rfcomm] [ 811.702999] #1: (&(&d->lock)->rlock){+.+...}, at: [] rfcomm_dlc_accept+0x53/0x100 [rfcomm] [ 811.702999] [ 811.702999] stack backtrace: [ 811.702999] Pid: 3892, comm: krfcommd Tainted: G W 2.6.35-rc1-01743-g41069ad-dirty #1 [ 811.702999] Call Trace: [ 811.702999] [] print_usage_bug+0x171/0x180 [ 811.702999] [] mark_lock+0x333/0x400 [ 811.702999] [] __lock_acquire+0x63a/0x1560 [ 811.702999] [] ? __lock_acquire+0xb25/0x1560 [ 811.702999] [] lock_acquire+0x5a/0x70 [ 811.702999] [] ? rfcomm_sk_state_change+0x46/0x170 [rfcomm] [ 811.702999] [] _raw_spin_lock+0x2c/0x40 [ 811.702999] [] ? rfcomm_sk_state_change+0x46/0x170 [rfcomm] [ 811.702999] [] rfcomm_sk_state_change+0x46/0x170 [rfcomm] [ 811.702999] [] rfcomm_dlc_accept+0x69/0x100 [rfcomm] [ 811.702999] [] rfcomm_check_accept+0x59/0xd0 [rfcomm] [ 811.702999] [] rfcomm_recv_frame+0x9fb/0x1320 [rfcomm] [ 811.702999] [] ? _raw_spin_unlock_irqrestore+0x3b/0x60 [ 811.702999] [] ? trace_hardirqs_on_caller+0x13d/0x180 [ 811.702999] [] ? trace_hardirqs_on+0xd/0x10 [ 811.702999] [] rfcomm_run+0x221/0xb20 [rfcomm] [ 811.702999] [] ? schedule+0x267/0x5d0 [ 811.702999] [] ? rfcomm_run+0x0/0xb20 [rfcomm] [ 811.702999] [] kthread+0x8e/0xa0 [ 811.702999] [] kernel_thread_helper+0x4/0x10 [ 811.702999] [] ? restore_args+0x0/0x30 [ 811.702999] [] ? kthread+0x0/0xa0 [ 811.702999] [] ? kernel_thread_helper+0x0/0x10 Signed-off-by: Gustavo F. Padovan --- net/bluetooth/rfcomm/sock.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 44a6232..30cd80b 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c @@ -82,12 +82,14 @@ static void rfcomm_sk_data_ready(struct rfcomm_dlc *d, struct sk_buff *skb) static void rfcomm_sk_state_change(struct rfcomm_dlc *d, int err) { struct sock *sk = d->owner, *parent; + unsigned long flags; + if (!sk) return; BT_DBG("dlc %p state %ld err %d", d, d->state, err); - bh_lock_sock(sk); + spin_lock_irqsave(&sk->sk_lock.slock, flags); if (err) sk->sk_err = err; @@ -107,7 +109,7 @@ static void rfcomm_sk_state_change(struct rfcomm_dlc *d, int err) sk->sk_state_change(sk); } - bh_unlock_sock(sk); + spin_unlock_irqrestore(&sk->sk_lock.slock, flags); if (parent && sock_flag(sk, SOCK_ZAPPED)) { /* We have to drop DLC lock here, otherwise -- 1.7.1.1