Skip to content

Commit 9bde7c3

Browse files
iulia-tanasescuVudentz
authored andcommittedDec 12, 2024
Bluetooth: iso: Fix recursive locking warning
This updates iso_sock_accept to use nested locking for the parent socket, to avoid lockdep warnings caused because the parent and child sockets are locked by the same thread: [ 41.585683] ============================================ [ 41.585688] WARNING: possible recursive locking detected [ 41.585694] 6.12.0-rc6+ #22 Not tainted [ 41.585701] -------------------------------------------- [ 41.585705] iso-tester/3139 is trying to acquire lock: [ 41.585711] ffff988b29530a58 (sk_lock-AF_BLUETOOTH) at: bt_accept_dequeue+0xe3/0x280 [bluetooth] [ 41.585905] but task is already holding lock: [ 41.585909] ffff988b29533a58 (sk_lock-AF_BLUETOOTH) at: iso_sock_accept+0x61/0x2d0 [bluetooth] [ 41.586064] other info that might help us debug this: [ 41.586069] Possible unsafe locking scenario: [ 41.586072] CPU0 [ 41.586076] ---- [ 41.586079] lock(sk_lock-AF_BLUETOOTH); [ 41.586086] lock(sk_lock-AF_BLUETOOTH); [ 41.586093] *** DEADLOCK *** [ 41.586097] May be due to missing lock nesting notation [ 41.586101] 1 lock held by iso-tester/3139: [ 41.586107] #0: ffff988b29533a58 (sk_lock-AF_BLUETOOTH) at: iso_sock_accept+0x61/0x2d0 [bluetooth] Fixes: ccf74f2 ("Bluetooth: Add BTPROTO_ISO socket type") Signed-off-by: Iulia Tanasescu <iulia.tanasescu@nxp.com> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
1 parent 9c76fff commit 9bde7c3

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed
 

‎net/bluetooth/iso.c

+6-2
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,11 @@ static int iso_sock_accept(struct socket *sock, struct socket *newsock,
12251225
long timeo;
12261226
int err = 0;
12271227

1228-
lock_sock(sk);
1228+
/* Use explicit nested locking to avoid lockdep warnings generated
1229+
* because the parent socket and the child socket are locked on the
1230+
* same thread.
1231+
*/
1232+
lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
12291233

12301234
timeo = sock_rcvtimeo(sk, arg->flags & O_NONBLOCK);
12311235

@@ -1256,7 +1260,7 @@ static int iso_sock_accept(struct socket *sock, struct socket *newsock,
12561260
release_sock(sk);
12571261

12581262
timeo = wait_woken(&wait, TASK_INTERRUPTIBLE, timeo);
1259-
lock_sock(sk);
1263+
lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
12601264
}
12611265
remove_wait_queue(sk_sleep(sk), &wait);
12621266

0 commit comments

Comments
 (0)
Please sign in to comment.