linux-stable.git/include/net/bluetooth/l2cap.h, branch v3.3

Bluetooth: Remove usage of __cancel_delayed_work()

2012-02-15T11:09:26+00:00

__cancel_delayed_work() is being used in some paths where we cannot
sleep waiting for the delayed work to finish. However, that function
might return while the timer is running and the work will be queued
again. Replace the calls with safer cancel_delayed_work() version
which spins until the timer handler finishes on other CPUs and
cancels the delayed work.

Signed-off-by: Ulisses Furquim 
Acked-by: Marcel Holtmann 
Signed-off-by: Johan Hedberg

Bluetooth: l2cap_set_timer needs jiffies as timeout value

2012-02-15T11:09:25+00:00

After moving L2CAP timers to workqueues l2cap_set_timer expects timeout
value to be specified in jiffies but constants defined in miliseconds
are used. This makes timeouts unreliable when CONFIG_HZ is not set to
1000.

__set_chan_timer macro still uses jiffies as input to avoid multiple
conversions from/to jiffies for sk_sndtimeo value which is already
specified in jiffies.

Signed-off-by: Andrzej Kaczmarek 
Ackec-by: Marcel Holtmann 
Signed-off-by: Johan Hedberg

Bluetooth: Remove bogus inline declaration from l2cap_chan_connect

2012-02-15T11:09:25+00:00

As reported by Dan Carpenter this function causes a Sparse warning and
shouldn't be declared inline:

include/net/bluetooth/l2cap.h:837:30 error: marked inline, but without a
definition"

Reported-by: Dan Carpenter 
Signed-off-by: Johan Hedberg 
Acked-by: Marcel Holtmann

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2012-01-03T20:16:34+00:00

Conflicts:
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c

Bluetooth: Fix deadlocks with sock lock and L2CAP timers locks

2011-12-22T16:15:09+00:00

When cancelling a delayed work (timer) in L2CAP we can not sleep holding
the sock mutex otherwise we might deadlock with an L2CAP timer handler.
This is possible because RX/TX and L2CAP timers run in different workqueues.
The scenario below illustrates the problem. Thus we are now avoiding to
sleep on the timers locks.

 ======================================================
 [ INFO: possible circular locking dependency detected ]
 3.1.0-05270-ga978dc7-dirty #239
 -------------------------------------------------------
 kworker/1:1/873 is trying to acquire lock:
  (sk_lock-AF_BLUETOOTH-BTPROTO_L2CAP){+.+...}, at: [] l2cap_chan_timeout+0x3c/0xe0 [bluetooth]

 but task is already holding lock:
  ((&(&chan->chan_timer)->work)){+.+...}, at: [] process_one_work+0x126/0x450

 which lock already depends on the new lock.

 the existing dependency chain (in reverse order) is:

 -> #1 ((&(&chan->chan_timer)->work)){+.+...}:
        [] check_prevs_add+0xf6/0x170
        [] validate_chain+0x613/0x790
        [] __lock_acquire+0x4be/0xac0
        [] lock_acquire+0x8d/0xb0
        [] wait_on_work+0x4f/0x160
        [] __cancel_work_timer+0x73/0x80
        [] cancel_delayed_work_sync+0xd/0x10
        [] l2cap_chan_connect+0x22d/0x470 [bluetooth]
        [] l2cap_sock_connect+0xb1/0x140 [bluetooth]
        [] kernel_connect+0xb/0x10
        [] rfcomm_session_create+0x12a/0x1c0 [rfcomm]
        [] __rfcomm_dlc_open+0x1c7/0x240 [rfcomm]
        [] rfcomm_dlc_open+0x42/0x70 [rfcomm]
        [] rfcomm_sock_connect+0x103/0x150 [rfcomm]
        [] sys_connect+0xae/0xc0
        [] compat_sys_socketcall+0xb2/0x220
        [] sysenter_dispatch+0x7/0x30

 -> #0 (sk_lock-AF_BLUETOOTH-BTPROTO_L2CAP){+.+...}:
        [] check_prev_add+0x6cd/0x6e0
        [] check_prevs_add+0xf6/0x170
        [] validate_chain+0x613/0x790
        [] __lock_acquire+0x4be/0xac0
        [] lock_acquire+0x8d/0xb0
        [] lock_sock_nested+0x8a/0xa0
        [] l2cap_chan_timeout+0x3c/0xe0 [bluetooth]
        [] process_one_work+0x184/0x450
        [] worker_thread+0x15e/0x340
        [] kthread+0x96/0xa0
        [] kernel_thread_helper+0x4/0x10

 other info that might help us debug this:

  Possible unsafe locking scenario:

        CPU0                    CPU1
        ----                    ----
   lock((&(&chan->chan_timer)->work));
                                lock(sk_lock-AF_BLUETOOTH-BTPROTO_L2CAP);
                                lock((&(&chan->chan_timer)->work));
   lock(sk_lock-AF_BLUETOOTH-BTPROTO_L2CAP);

  *** DEADLOCK ***

 2 locks held by kworker/1:1/873:
  #0:  (events){.+.+.+}, at: [] process_one_work+0x126/0x450
  #1:  ((&(&chan->chan_timer)->work)){+.+...}, at: [] process_one_work+0x126/0x450

 stack backtrace:
 Pid: 873, comm: kworker/1:1 Not tainted 3.1.0-05270-ga978dc7-dirty #239
 Call Trace:
  [] print_circular_bug+0xd2/0xe3
  [] check_prev_add+0x6cd/0x6e0
  [] check_prevs_add+0xf6/0x170
  [] validate_chain+0x613/0x790
  [] __lock_acquire+0x4be/0xac0
  [] ? lock_sock_nested+0x66/0xa0
  [] ? lock_release_nested+0x100/0x110
  [] ? lock_sock_nested+0x66/0xa0
  [] lock_acquire+0x8d/0xb0
  [] ? l2cap_chan_timeout+0x3c/0xe0 [bluetooth]
  [] lock_sock_nested+0x8a/0xa0
  [] ? l2cap_chan_timeout+0x3c/0xe0 [bluetooth]
  [] ? process_one_work+0x126/0x450
  [] l2cap_chan_timeout+0x3c/0xe0 [bluetooth]
  [] process_one_work+0x184/0x450
  [] ? process_one_work+0x126/0x450
  [] ? l2cap_security_cfm+0x4e0/0x4e0 [bluetooth]
  [] worker_thread+0x15e/0x340
  [] ? manage_workers+0x110/0x110
  [] kthread+0x96/0xa0
  [] kernel_thread_helper+0x4/0x10
  [] ? retint_restore_args+0xe/0xe
  [] ? __init_kthread_worker+0x70/0x70
  [] ? gs_change+0xb/0xb

Signed-off-by: Ulisses Furquim 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Rename info_work to info_timer

2011-12-20T19:07:16+00:00

It makes more sense this way, since info_timer is a timer using delayed
work API.

Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: convert security timer to delayed_work

2011-12-20T19:07:03+00:00

This one also needs to run in process context

Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Move l2cap_{set,clear}_timer to l2cap.h

2011-12-20T19:06:30+00:00

It is the only place where it is used.

Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

module_param: make bool parameters really bool (net & drivers/net)

2011-12-20T03:27:29+00:00

module_param(bool) used to counter-intuitively take an int.  In
fddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy
trick.

It's time to remove the int/unsigned int option.  For this version
it'll simply give a warning, but it'll break next kernel version.

(Thanks to Joe Perches for suggesting coccinelle for 0/1 -> true/false).

Cc: "David S. Miller" 
Cc: netdev@vger.kernel.org
Signed-off-by: Rusty Russell 
Signed-off-by: David S. Miller

Bluetooth: invert locking order in connect path

2011-12-18T19:07:57+00:00

This move some checking code that was in l2cap_sock_connect() to
l2cap_chan_connect(). Thus we can invert the lock calls, i.e., call
lock_sock() before hci_dev_lock() to avoid a deadlock scenario.

Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan