Bluetooth: hci_event: Clear explicit connect state on LE connection
Subsystems (2)
PATCH v2 1/1 Bluetooth: hci_event: Clear explicit connect state on LE connection
Since commit 6cd29ec6ae5e ("Bluetooth: hci_sync: Wait for proper events when connecting LE"), create_le_conn_complete() only runs once the LE Connection Complete event has been handled, and le_conn_complete_evt() has already removed the connection parameters from pend_le_conns by then. hci_connect_le_scan_cleanup() looks the parameters up in pend_le_conns, so after a successful connection it no longer clears explicit_connect, nor deletes the parameters that were only created for the explicit connect.
The parameters of every device connected through an explicit connect, such as an L2CAP or ATT connect or MGMT Pair Device, are thus left with explicit_connect set. MGMT Remove Device for all devices then keeps them as HCI_AUTO_CONN_EXPLICIT instead of freeing them, and if the device was set to auto-connect and is disconnected, they also stay onpend_le_conns: the kernel keeps scanning for the device and connects to it as soon as it advertises, although no one asked for it any more.
Do the cleanup in le_conn_complete_evt() instead, where the explicit connect request is fulfilled: clear explicit_connect, delete the parameters if they only existed for it, and put report parameters back on pend_le_reports. Auto-connect parameters are added back to pend_le_conns on disconnection, as before. Update the comment in hci_explicit_conn_params_set() that names hci_connect_le_scan_cleanup() as the only place deleting them.
---
v2:
- Update the comment in hci_explicit_conn_params_set() (Sashiko)
- Rebase on bluetooth-next 27731ba091
- No change for the subrate case Sashiko also raised, see the reply to v1
v1: https://lore.kernel.org/linux-bluetooth/[email protected]/
net/bluetooth/hci_conn.c | 5 +++-- net/bluetooth/hci_event.c | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-)
net/bluetooth/hci_conn.c +3 -2
@@ -1614,8 +1614,9 @@ static int hci_explicit_conn_params_set(struct hci_dev *hdev,if (!params)return -ENOMEM ; -/* If we created new params, mark them to be deleted in -* hci_connect_le_scan_cleanup. It's different case than +/* If we created new params, mark them to be deleted once the +* explicit connect is done, see le_conn_complete_evt() and +* hci_connect_le_scan_cleanup(). It's different case than * existing disabled params, those will stay after cleanup. */ params->auto_connect =HCI_AUTO_CONN_EXPLICIT ;
net/bluetooth/hci_event.c +22 -0
@@ -6041,6 +6041,28 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status,hci_conn_put (params->conn); params->conn =NULL ; } + +/* An explicit connect request is complete once connected, so +* clean it up here: hci_connect_le_scan_cleanup() no longer +* finds the params since they have just been removed from +* pend_le_conns. +*/ +if (params->explicit_connect) { + params->explicit_connect = false; + +switch (params->auto_connect) { +case HCI_AUTO_CONN_EXPLICIT : +hci_conn_params_del (hdev, &conn->dst, + conn->dst_type); +break ; +case HCI_AUTO_CONN_REPORT : +hci_pend_le_list_add (params, + &hdev->pend_le_reports); +break ; +default : +break ; + } + } }/* If we are central and have subrate parameters stored, queue a
base-commit: 27731ba091954eccddb2657053b590d2113e8d98
Signature · 1 line
2.53.0
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 10 lines · On Fri, 23 Oct 2026 12:14:37 -0700 you wrote:
Since commit
6cd29ec6ae5e("Bluetooth:hci_sync: Wait for proper events when connecting LE"),create_le_conn_complete()only runs once the LE Connection Complete event has been handled, andle_conn_complete_evt()has already removed the connection parameters frompend_le_connsby then.hci_connect_le_scan_cleanup()looks the parameters up inpend_le_conns, so after a successful connection it no longer clearsexplicit_connect, nor deletes the parameters that were only created for the explicit connect.[...]
Here is the summary with links:
- [v2] Bluetooth: hci_event: Clear explicit connect state on LE connection
https://git.kernel.org/bluetooth/bluetooth-next/c/083c4a113833
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
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/1192371/
---Test result---
Test Summary:
CheckPatch PASS 0.83 seconds VerifyFixes PASS 0.07 seconds VerifySignedoff PASS 0.07 seconds GitLint PASS 0.23 seconds SubjectPrefix PASS 0.07 seconds BuildKernel PASS 30.53 seconds CheckAllWarning PASS 38.20 seconds CheckSparse WARNING 37.42 seconds BuildKernel32 PASS 30.58 seconds CheckKernelLLVM PASS 34.56 seconds TestRunnerSetup PASS 725.40 seconds TestRunner_l2cap-tester PASS 12.88 seconds TestRunner_iso-tester PASS 10.87 seconds TestRunner_bnep-tester PASS 3.10 seconds TestRunner_mgmt-tester PASS 88.06 seconds TestRunner_rfcomm-tester PASS 4.49 seconds TestRunner_sco-tester PASS 5.68 seconds TestRunner_ioctl-tester PASS 4.70 seconds TestRunner_mesh-tester PASS 5.56 seconds TestRunner_smp-tester PASS 4.38 seconds TestRunner_userchan-tester PASS 3.23 seconds TestRunner_6lowpan-tester PASS 4.46 seconds IncrementalBuild PASS 30.83 seconds
Details
##############################
Test: CheckSparse - WARNING
Desc: Run sparse tool with linux kernel
Output:net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):
https://github.com/bluez/bluetooth-next/pull/991
---
Regards,
Linux Bluetooth