Bluetooth: ISO: set BT_LISTEN before requesting a BIG sync
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH 1/1 Bluetooth: ISO: set BT_LISTEN before requesting a BIG sync
From: Luiz Augusto von Dentz <[email protected]>
A BIS connection is matched to its parent socket by looking for a socket in BT_LISTEN state with the same BIG handle:
iso_conn_ready()
if (test_bit(HCI_CONN_BIG_SYNC, &hcon->flags))
parent = iso_get_sock(hdev, &hcon->src, &hcon->dst,
BT_LISTEN, iso_match_big_hcon, hcon);The socket was only moved to BT_LISTEN after iso_conn_big_sync() returned, while the LE BIG Create Sync command has already been queued by then. If the BIG sync is established before the state is updated, which is easy to hit with an emulated controller as the command may complete in a few hundred microseconds, no parent is found and the BIS connections are never notified to the listening socket.
The user space is then left waiting for connections that never arrive, e.g. bluetoothd never completes a MediaTransport1.Acquire of a Broadcast Sink transport.
Move the socket to BT_LISTEN before requesting the BIG sync, so the state is visible by the time the command is queued, and restore the previous state if the request could not be started.
--- net/bluetooth/iso.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)
net/bluetooth/iso.c +19 -7
@@ -1737,6 +1737,13 @@ static int iso_sock_recvmsg(struct socket *sock, struct msghdr *msg,switch (sk->sk_state) {case BT_CONNECT2 :if (test_bit (BT_SK_PA_SYNC , &pi->flags)) { +/* Move to BT_LISTEN before requesting the BIG +* sync: the BIS connections are matched to a +* parent socket in BT_LISTEN state, and they +* may be notified before the request returns. +*/ + sk->sk_state =BT_LISTEN ; +release_sock (sk); err =iso_conn_big_sync (sk);lock_sock (sk);
@@ -1745,12 +1752,12 @@ static int iso_sock_recvmsg(struct socket *sock, struct msghdr *msg,* connection may have been torn down * meanwhile and iso_chan_del() may have * already moved the socket to BT_CLOSED. -* Only move on to BT_LISTEN if the BIG sync -* was actually started and nothing else has -* changed the state. +* Only move back if the BIG sync could not be +* started and nothing else has changed the +* state. */ -if (!err && sk->sk_state ==BT_CONNECT2 ) - sk->sk_state =BT_LISTEN ; +if (err && sk->sk_state ==BT_LISTEN ) + sk->sk_state =BT_CONNECT2 ; }else {iso_conn_defer_accept (pi->conn->hcon); sk->sk_state =BT_CONFIG ;
@@ -1760,12 +1767,17 @@ static int iso_sock_recvmsg(struct socket *sock, struct msghdr *msg,break ;case BT_CONNECTED :if (test_bit (BT_SK_PA_SYNC , &iso_pi (sk)->flags)) { +/* As above, the BIS connections may be +* notified before the request returns. +*/ + sk->sk_state =BT_LISTEN ; +release_sock (sk); err =iso_conn_big_sync (sk);lock_sock (sk); -if (!err && sk->sk_state ==BT_CONNECTED ) - sk->sk_state =BT_LISTEN ; +if (err && sk->sk_state ==BT_LISTEN ) + sk->sk_state =BT_CONNECTED ; early_ret = true; }
Signature · 1 line
2.55.0
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/series/1161500/
---Test result---
Test Summary:
CheckPatch PASS 0.75 seconds VerifyFixes PASS 0.12 seconds VerifySignedoff PASS 0.12 seconds GitLint PASS 0.32 seconds SubjectPrefix PASS 0.12 seconds BuildKernel PASS 28.34 seconds CheckAllWarning PASS 32.80 seconds CheckSparse PASS 34.98 seconds BuildKernel32 PASS 28.22 seconds CheckKernelLLVM PASS 34.16 seconds TestRunnerSetup PASS 755.24 seconds TestRunner_iso-tester PASS 92.40 seconds IncrementalBuild PASS 32.84 seconds
https://github.com/bluez/bluetooth-next/pull/748
---
Regards,
Linux Bluetooth