Bluetooth: hci_conn: Consolidate code for aborting connections
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v2 1/2 Bluetooth: hci_conn: Consolidate code for aborting connections
From: Luiz Augusto von Dentz <[email protected]>
This consolidates code for aborting connections using hci_cmd_sync_queue so it is synchronized with other threads, but because of the fact that some commands may block the cmd_sync_queue while waiting specific events this attempt to cancel those requests by using hci_cmd_sync_cancel.
--- include/net/bluetooth/hci_core.h | 2 +- net/bluetooth/hci_conn.c | 160 +++++++------------------------ net/bluetooth/hci_sync.c | 20 ++-- net/bluetooth/mgmt.c | 15 +-- 4 files changed, 48 insertions(+), 149 deletions(-)
include/net/bluetooth/hci_core.h +1 -1
@@ -741,6 +741,7 @@ struct hci_conn {unsigned long flags;enum conn_reasons conn_reason; +__u8 abort_reason;__u32 clock;__u16 clock_accuracy;
@@ -760,7 +761,6 @@ struct hci_conn {struct delayed_work auto_accept_work;struct delayed_work idle_work;struct delayed_work le_conn_timeout; -struct work_struct le_scan_cleanup;struct device dev;struct dentry *debugfs;
net/bluetooth/hci_conn.c +33 -127
191 lines not on this page · raw message
net/bluetooth/hci_sync.c +13 -7
@@ -5271,10 +5271,13 @@ static int hci_disconnect_sync(struct hci_dev *hdev, struct hci_conn *conn, }static int hci_le_connect_cancel_sync (struct hci_dev *hdev, -struct hci_conn *conn) +struct hci_conn *conn,u8 reason) { +/* Return reason if scanning since the connection shall probably be +* cleanup directly. +*/ if (test_bit (HCI_CONN_SCANNING , &conn->flags)) -return 0 ; +return reason;if (test_and_set_bit (HCI_CONN_CANCEL , &conn->flags))return 0 ;
@@ -5283,10 +5286,11 @@ static int hci_le_connect_cancel_sync(struct hci_dev *hdev, 0, NULL, HCI_CMD_TIMEOUT); } -static int hci_connect_cancel_sync (struct hci_dev *hdev,struct hci_conn *conn) +static int hci_connect_cancel_sync (struct hci_dev *hdev,struct hci_conn *conn, +u8 reason) {if (conn->type ==LE_LINK ) -return hci_le_connect_cancel_sync (hdev, conn); +return hci_le_connect_cancel_sync (hdev, conn, reason);if (hdev->hci_ver <BLUETOOTH_VER_1_2 )return 0 ;
@@ -5339,9 +5343,11 @@ int hci_abort_conn_sync(struct hci_dev *hdev, struct hci_conn *conn, u8 reason)case BT_CONFIG :return hci_disconnect_sync (hdev, conn, reason);case BT_CONNECT : - err =hci_connect_cancel_sync (hdev, conn); + err =hci_connect_cancel_sync (hdev, conn, reason);/* Cleanup hci_conn object if it cannot be cancelled as it -* likelly means the controller and host stack are out of sync. +* likelly means the controller and host stack are out of sync +* or in case of LE it was still scanning so it can be cleanup +* safely. */ if (err) {hci_dev_lock (hdev);
@@ -6255,7 +6261,7 @@ int hci_le_create_conn_sync(struct hci_dev *hdev, struct hci_conn *conn) done:if (err == -ETIMEDOUT ) -hci_le_connect_cancel_sync (hdev, conn); +hci_le_connect_cancel_sync (hdev, conn,0x00 );/* Re-enable advertising after the connection attempt is finished. */ hci_resume_advertising_sync (hdev);
net/bluetooth/mgmt.c +1 -14
@@ -3586,18 +3586,6 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,return err; } -static int abort_conn_sync (struct hci_dev *hdev,void *data) -{ -struct hci_conn *conn; -u16 handle =PTR_ERR (data); - - conn =hci_conn_hash_lookup_handle (hdev, handle); -if (!conn) -return 0 ; - -return hci_abort_conn_sync (hdev, conn,HCI_ERROR_REMOTE_USER_TERM ); -} -static int cancel_pair_device (struct sock *sk,struct hci_dev *hdev,void *data,u16 len) {
@@ -3648,8 +3636,7 @@ static int cancel_pair_device(struct sock *sk, struct hci_dev *hdev, void *data, le_addr_type(addr->type));if (conn->conn_reason ==CONN_REASON_PAIR_DEVICE ) -hci_cmd_sync_queue (hdev, abort_conn_sync,ERR_PTR (conn->handle), -NULL ); +hci_abort_conn (conn,HCI_ERROR_REMOTE_USER_TERM ); unlock:hci_dev_unlock (hdev);
Signature · 1 line
2.40.1
Luiz Augusto von Dentz
maintainerPATCH v2 2/2 Bluetooth: hci_sync: Fix not handling ISO_LINK in hci_abort_conn_sync
From: Luiz Augusto von Dentz <[email protected]>
ISO_LINK connections where not being handled properly on hci_abort_conn_sync which sometimes resulted in sending the wrong commands, or in case of having the reject command being sent by the socket code (iso.c) which is sort of a layer violation.
--- net/bluetooth/hci_sync.c | 34 ++++++++++++++++++++++++++++++++++ net/bluetooth/iso.c | 14 -------------- 2 files changed, 34 insertions(+), 14 deletions(-)
net/bluetooth/hci_sync.c +34 -0
@@ -5292,6 +5292,24 @@ static int hci_connect_cancel_sync(struct hci_dev *hdev, struct hci_conn *conn,if (conn->type ==LE_LINK )return hci_le_connect_cancel_sync (hdev, conn, reason); +if (conn->type ==ISO_LINK ) { +/* BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E +* page 1857: +* +* If this command is issued for a CIS on the Central and the +* CIS is successfully terminated before being established, +* then an HCI_LE_CIS_Established event shall also be sent for +* this CIS with the Status Operation Cancelled by Host (0x44). +*/ +if (test_bit (HCI_CONN_CREATE_CIS , &conn->flags)) +return hci_disconnect_sync (hdev, conn, reason); + +/* There is no way to cancel a BIS without terminating the BIG +* which is done later on connection cleanup. +*/ +return 0 ; + } +if (hdev->hci_ver <BLUETOOTH_VER_1_2 )return 0 ;
@@ -5318,11 +5336,27 @@ static int hci_reject_sco_sync(struct hci_dev *hdev, struct hci_conn *conn, sizeof(cp), &cp, HCI_CMD_TIMEOUT); } +static int hci_le_reject_cis_sync (struct hci_dev *hdev,struct hci_conn *conn, +u8 reason) +{ +struct hci_cp_le_reject_cis cp; + +memset (&cp,0 ,sizeof (cp)); + cp.handle =cpu_to_le16 (conn->handle); + cp.reason = reason; + +return __hci_cmd_sync_status (hdev,HCI_OP_LE_REJECT_CIS , +sizeof (cp), &cp,HCI_CMD_TIMEOUT ); +} +static int hci_reject_conn_sync (struct hci_dev *hdev,struct hci_conn *conn,u8 reason) {struct hci_cp_reject_conn_req cp; +if (conn->type ==ISO_LINK ) +return hci_le_reject_cis_sync (hdev, conn, reason); +if (conn->type ==SCO_LINK || conn->type ==ESCO_LINK )return hci_reject_sco_sync (hdev, conn, reason);
net/bluetooth/iso.c +0 -14
@@ -614,18 +614,6 @@ static void iso_sock_kill(struct sock *sk)sock_put (sk); } -static void iso_conn_defer_reject (struct hci_conn *conn) -{ -struct hci_cp_le_reject_cis cp; - -BT_DBG ("conn %p" , conn); - -memset (&cp,0 ,sizeof (cp)); - cp.handle =cpu_to_le16 (conn->handle); - cp.reason =HCI_ERROR_REJ_BAD_ADDR ; -hci_send_cmd (conn->hdev,HCI_OP_LE_REJECT_CIS ,sizeof (cp), &cp); -} -static void __iso_sock_close (struct sock *sk) {BT_DBG ("sk %p state %d socket %p" , sk, sk->sk_state, sk->sk_socket);
@@ -650,8 +638,6 @@ static void __iso_sock_close(struct sock *sk)break ;case BT_CONNECT2 : -if (iso_pi (sk)->conn->hcon) -iso_conn_defer_reject (iso_pi (sk)->conn->hcon);iso_chan_del (sk,ECONNRESET );break ;case BT_CONNECT :
Signature · 1 line
2.40.1
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/project/bluetooth/list/?series=760761
---Test result---
Test Summary:
CheckPatch PASS 2.31 seconds GitLint PASS 0.61 seconds SubjectPrefix PASS 0.19 seconds BuildKernel PASS 41.59 seconds CheckAllWarning PASS 45.27 seconds CheckSparse PASS 51.43 seconds CheckSmatch PASS 137.24 seconds BuildKernel32 PASS 40.21 seconds TestRunnerSetup PASS 567.22 seconds TestRunner_l2cap-tester PASS 20.55 seconds TestRunner_iso-tester PASS 28.88 seconds TestRunner_bnep-tester PASS 6.63 seconds TestRunner_mgmt-tester PASS 153.95 seconds TestRunner_rfcomm-tester PASS 11.36 seconds TestRunner_sco-tester PASS 12.37 seconds TestRunner_ioctl-tester PASS 12.72 seconds TestRunner_mesh-tester PASS 9.11 seconds TestRunner_smp-tester PASS 9.90 seconds TestRunner_userchan-tester PASS 7.43 seconds IncrementalBuild PASS 45.57 seconds
---
Regards,
Linux Bluetooth