Bluetooth: Clean up hci_cb usage
Subsystems (2)
cover Bluetooth: Clean up hci_cb usage
Hi,
This set of patches cleans up the usage of the hci_cb list as well as the couple of unnecesasry layers of abstraction with hci_*_cb() calling hci_proto_*_cb() functions. These patches also pave the way for other modules, such as 6lowpan, to easily track the coming and going of connections, now that connect_cfm & disconn_cfm are accessible through the hci_cb list.
Johan
----------------------------------------------------------------
Johan Hedberg (5):
Bluetooth: Add new hci_cb entries to the tail rather than the head
Bluetooth: Convert hci_cb_list_lock to a mutex
Bluetooth: Convert L2CAP security callback to use hci_cb
Bluetooth: Convert connect_cfm to be triggered through hci_cb
Bluetooth: Convert disconn_cfm to be triggered through hci_cb
include/net/bluetooth/hci_core.h | 140 ++++++++++++------------------------ net/bluetooth/hci_conn.c | 6 +- net/bluetooth/hci_core.c | 12 ++-- net/bluetooth/hci_event.c | 38 +++++----- net/bluetooth/l2cap_core.c | 26 +++++-- net/bluetooth/sco.c | 21 +++++- 6 files changed, 113 insertions(+), 130 deletions(-)
PATCH 1/5 Bluetooth: Add new hci_cb entries to the tail rather than the head
From: Johan Hedberg <[email protected]>
When processing hci_cb entries we want first registered callbacks to be called first and later ones later. This is because eventually the L2CAP callbacks that are part of the core will use this list and get registered first. To keep the same order of calling L2CAP callbacks before e.g. RFCOMM the order of elements needs to be this way.
--- net/bluetooth/hci_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/hci_core.c +1 -1
@@ -3465,7 +3465,7 @@ int hci_register_cb(struct hci_cb *cb)BT_DBG ("%p name %s" , cb, cb->name);write_lock (&hci_cb_list_lock); -list_add (&cb->list, &hci_cb_list); +list_add_tail (&cb->list, &hci_cb_list);write_unlock (&hci_cb_list_lock);return 0 ;
Signature · 1 line
2.1.0
PATCH 2/5 Bluetooth: Convert hci_cb_list_lock to a mutex
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
We'll soon need to be able to sleep inside the loops that iterate the hci_cb list, so neither a spinlock, rwlock or rcu are usable. This patch changes the lock to a mutex which permits sleeping while holding the lock.
--- include/net/bluetooth/hci_core.h | 18 +++++++++--------- net/bluetooth/hci_core.c | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-)
include/net/bluetooth/hci_core.h +9 -9
@@ -499,7 +499,7 @@ struct hci_conn_params {extern struct list_head hci_dev_list;extern struct list_head hci_cb_list;extern rwlock_t hci_dev_list_lock; -extern rwlock_t hci_cb_list_lock; +extern struct mutex hci_cb_list_lock;/* ----- HCI interface to upper protocols ----- */ int l2cap_connect_ind (struct hci_dev *hdev,bdaddr_t *bdaddr);
@@ -1160,12 +1160,12 @@ static inline void hci_auth_cfm(struct hci_conn *conn, __u8 status) encrypt =test_bit (HCI_CONN_ENCRYPT , &conn->flags) ?0x01 :0x00 ; -read_lock (&hci_cb_list_lock); +mutex_lock (&hci_cb_list_lock);list_for_each_entry (cb, &hci_cb_list, list) {if (cb->security_cfm) cb->security_cfm (conn, status, encrypt); } -read_unlock (&hci_cb_list_lock); +mutex_unlock (&hci_cb_list_lock); } static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status,
@@ -1181,24 +1181,24 @@ static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status,hci_proto_encrypt_cfm (conn, status, encrypt); -read_lock (&hci_cb_list_lock); +mutex_lock (&hci_cb_list_lock);list_for_each_entry (cb, &hci_cb_list, list) {if (cb->security_cfm) cb->security_cfm (conn, status, encrypt); } -read_unlock (&hci_cb_list_lock); +mutex_unlock (&hci_cb_list_lock); }static inline void hci_key_change_cfm (struct hci_conn *conn,__u8 status) {struct hci_cb *cb; -read_lock (&hci_cb_list_lock); +mutex_lock (&hci_cb_list_lock);list_for_each_entry (cb, &hci_cb_list, list) {if (cb->key_change_cfm) cb->key_change_cfm (conn, status); } -read_unlock (&hci_cb_list_lock); +mutex_unlock (&hci_cb_list_lock); } static inline void hci_role_switch_cfm(struct hci_conn *conn, __u8 status,
@@ -1206,12 +1206,12 @@ static inline void hci_role_switch_cfm(struct hci_conn *conn, __u8 status, {struct hci_cb *cb; -read_lock (&hci_cb_list_lock); +mutex_lock (&hci_cb_list_lock);list_for_each_entry (cb, &hci_cb_list, list) {if (cb->role_switch_cfm) cb->role_switch_cfm (conn, status, role); } -read_unlock (&hci_cb_list_lock); +mutex_unlock (&hci_cb_list_lock); }static inline bool eir_has_data_type (u8 *data,size_t data_len,u8 type)
net/bluetooth/hci_core.c +5 -5
@@ -51,7 +51,7 @@ DEFINE_RWLOCK(hci_dev_list_lock);/* HCI callback list */ LIST_HEAD (hci_cb_list); -DEFINE_RWLOCK (hci_cb_list_lock); +DEFINE_MUTEX (hci_cb_list_lock);/* HCI ID Numbering */ static DEFINE_IDA (hci_index_ida);
@@ -3464,9 +3464,9 @@ int hci_register_cb(struct hci_cb *cb) {BT_DBG ("%p name %s" , cb, cb->name); -write_lock (&hci_cb_list_lock); +mutex_lock (&hci_cb_list_lock);list_add_tail (&cb->list, &hci_cb_list); -write_unlock (&hci_cb_list_lock); +mutex_unlock (&hci_cb_list_lock);return 0 ; }
@@ -3476,9 +3476,9 @@ int hci_unregister_cb(struct hci_cb *cb) {BT_DBG ("%p name %s" , cb, cb->name); -write_lock (&hci_cb_list_lock); +mutex_lock (&hci_cb_list_lock);list_del (&cb->list); -write_unlock (&hci_cb_list_lock); +mutex_unlock (&hci_cb_list_lock);return 0 ; }
Signature · 1 line
2.1.0
PATCH 3/5 Bluetooth: Convert L2CAP security callback to use hci_cb
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
There's no reason to have the custom hci_proto_auth/encrypt_cfm helpers when the hci_cb list works equally well. This patch adds L2CAP to the hci_cb list and makes l2cap_security_cfm a private function of l2cap_core.c.
--- include/net/bluetooth/hci_core.h | 40 ++++++---------------------------------- net/bluetooth/l2cap_core.c | 14 ++++++++++---- 2 files changed, 16 insertions(+), 38 deletions(-)
include/net/bluetooth/hci_core.h +6 -34
@@ -506,7 +506,6 @@ int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr);void l2cap_connect_cfm (struct hci_conn *hcon,u8 status);int l2cap_disconn_ind (struct hci_conn *hcon);void l2cap_disconn_cfm (struct hci_conn *hcon,u8 reason); -int l2cap_security_cfm (struct hci_conn *hcon,u8 status,u8 encrypt);int l2cap_recv_acldata (struct hci_conn *hcon,struct sk_buff *skb,u16 flags);int sco_connect_ind (struct hci_dev *hdev,bdaddr_t *bdaddr,__u8 *flags);
@@ -1107,35 +1106,6 @@ static inline void hci_proto_disconn_cfm(struct hci_conn *conn, __u8 reason) conn->disconn_cfm_cb (conn, reason); } -static inline void hci_proto_auth_cfm (struct hci_conn *conn,__u8 status) -{ -__u8 encrypt; - -if (conn->type !=ACL_LINK && conn->type !=LE_LINK ) -return ; - -if (test_bit (HCI_CONN_ENCRYPT_PEND , &conn->flags)) -return ; - - encrypt =test_bit (HCI_CONN_ENCRYPT , &conn->flags) ?0x01 :0x00 ; -l2cap_security_cfm (conn, status, encrypt); - -if (conn->security_cfm_cb) - conn->security_cfm_cb (conn, status); -} - -static inline void hci_proto_encrypt_cfm (struct hci_conn *conn,__u8 status, -__u8 encrypt) -{ -if (conn->type !=ACL_LINK && conn->type !=LE_LINK ) -return ; - -l2cap_security_cfm (conn, status, encrypt); - -if (conn->security_cfm_cb) - conn->security_cfm_cb (conn, status); -} -/* ----- HCI callbacks ----- */ struct hci_cb {struct list_head list;
@@ -1153,8 +1123,6 @@ static inline void hci_auth_cfm(struct hci_conn *conn, __u8 status)struct hci_cb *cb;__u8 encrypt; -hci_proto_auth_cfm (conn, status); -if (test_bit (HCI_CONN_ENCRYPT_PEND , &conn->flags))return ;
@@ -1166,6 +1134,9 @@ static inline void hci_auth_cfm(struct hci_conn *conn, __u8 status) cb->security_cfm (conn, status, encrypt); }mutex_unlock (&hci_cb_list_lock); + +if (conn->security_cfm_cb) + conn->security_cfm_cb (conn, status); } static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status,
@@ -1179,14 +1150,15 @@ static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status,if (conn->pending_sec_level > conn->sec_level) conn->sec_level = conn->pending_sec_level; -hci_proto_encrypt_cfm (conn, status, encrypt); -mutex_lock (&hci_cb_list_lock);list_for_each_entry (cb, &hci_cb_list, list) {if (cb->security_cfm) cb->security_cfm (conn, status, encrypt); }mutex_unlock (&hci_cb_list_lock); + +if (conn->security_cfm_cb) + conn->security_cfm_cb (conn, status); }static inline void hci_key_change_cfm (struct hci_conn *conn,__u8 status)
net/bluetooth/l2cap_core.c +10 -4
@@ -7345,13 +7345,13 @@ static inline void l2cap_check_encryption(struct l2cap_chan *chan, u8 encrypt) } } -int l2cap_security_cfm (struct hci_conn *hcon,u8 status,u8 encrypt) +static void l2cap_security_cfm (struct hci_conn *hcon,u8 status,u8 encrypt) {struct l2cap_conn *conn = hcon->l2cap_data;struct l2cap_chan *chan;if (!conn) -return 0 ; +return ;BT_DBG ("conn %p status 0x%2.2x encrypt %u" , conn, status, encrypt);
@@ -7434,8 +7434,6 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt) }mutex_unlock (&conn->chan_lock); - -return 0 ; }int l2cap_recv_acldata (struct hci_conn *hcon,struct sk_buff *skb,u16 flags)
@@ -7543,6 +7541,11 @@ drop:return 0 ; } +static struct hci_cb l2cap_cb = { + .name ="L2CAP" , + .security_cfm = l2cap_security_cfm, +}; +static int l2cap_debugfs_show (struct seq_file *f,void *p) {struct l2cap_chan *c;
@@ -7584,6 +7587,8 @@ int __init l2cap_init(void)if (err <0 )return err; +hci_register_cb (&l2cap_cb); +if (IS_ERR_OR_NULL (bt_debugfs))return 0 ;
@@ -7601,6 +7606,7 @@ int __init l2cap_init(void)void l2cap_exit (void ) {debugfs_remove (l2cap_debugfs); +hci_unregister_cb (&l2cap_cb);l2cap_cleanup_sockets (); }
Signature · 1 line
2.1.0
PATCH 4/5 Bluetooth: Convert connect_cfm to be triggered through hci_cb
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
This patch moves all the connect_cfm callbacks to be based on the hci_cb list. This means making l2cap_connect_cfm private to l2cap_core.c and sco_connect_cb private to sco.c respectively. Since the hci_conn type filtering isn't done any more on the wrapper level the callbacks themselves need to check that they were passed a relevant type of connection.
--- include/net/bluetooth/hci_core.h | 40 ++++++++++++++++------------------------ net/bluetooth/hci_conn.c | 4 ++-- net/bluetooth/hci_event.c | 36 ++++++++++++++++++------------------ net/bluetooth/l2cap_core.c | 6 +++++- net/bluetooth/sco.c | 15 ++++++++++++++- 5 files changed, 55 insertions(+), 46 deletions(-)
include/net/bluetooth/hci_core.h +16 -24
@@ -503,13 +503,11 @@ extern struct mutex hci_cb_list_lock;/* ----- HCI interface to upper protocols ----- */ int l2cap_connect_ind (struct hci_dev *hdev,bdaddr_t *bdaddr); -void l2cap_connect_cfm (struct hci_conn *hcon,u8 status);int l2cap_disconn_ind (struct hci_conn *hcon);void l2cap_disconn_cfm (struct hci_conn *hcon,u8 reason);int l2cap_recv_acldata (struct hci_conn *hcon,struct sk_buff *skb,u16 flags);int sco_connect_ind (struct hci_dev *hdev,bdaddr_t *bdaddr,__u8 *flags); -void sco_connect_cfm (struct hci_conn *hcon,__u8 status);void sco_disconn_cfm (struct hci_conn *hcon,__u8 reason);int sco_recv_scodata (struct hci_conn *hcon,struct sk_buff *skb);
@@ -1050,28 +1048,6 @@ static inline int hci_proto_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, } } -static inline void hci_proto_connect_cfm (struct hci_conn *conn,__u8 status) -{ -switch (conn->type) { -case ACL_LINK : -case LE_LINK : -l2cap_connect_cfm (conn, status); -break ; - -case SCO_LINK : -case ESCO_LINK : -sco_connect_cfm (conn, status); -break ; - -default : -BT_ERR ("unknown link type %d" , conn->type); -break ; - } - -if (conn->connect_cfm_cb) - conn->connect_cfm_cb (conn, status); -} -static inline int hci_proto_disconn_ind (struct hci_conn *conn) {if (conn->type !=ACL_LINK && conn->type !=LE_LINK )
@@ -1112,12 +1088,28 @@ struct hci_cb {char *name; +void (*connect_cfm) (struct hci_conn *conn,__u8 status);void (*security_cfm) (struct hci_conn *conn,__u8 status,__u8 encrypt);void (*key_change_cfm) (struct hci_conn *conn,__u8 status);void (*role_switch_cfm) (struct hci_conn *conn,__u8 status,__u8 role); }; +static inline void hci_connect_cfm (struct hci_conn *conn,__u8 status) +{ +struct hci_cb *cb; + +mutex_lock (&hci_cb_list_lock); +list_for_each_entry (cb, &hci_cb_list, list) { +if (cb->connect_cfm) + cb->connect_cfm (conn, status); + } +mutex_unlock (&hci_cb_list_lock); + +if (conn->connect_cfm_cb) + conn->connect_cfm_cb (conn, status); +} +static inline void hci_auth_cfm (struct hci_conn *conn,__u8 status) {struct hci_cb *cb;
net/bluetooth/hci_conn.c +2 -2
@@ -309,7 +309,7 @@ void hci_sco_setup(struct hci_conn *conn, __u8 status)else hci_add_sco (sco, conn->handle); }else { -hci_proto_connect_cfm (sco, status); +hci_connect_cfm (sco, status);hci_conn_del (sco); } }
@@ -618,7 +618,7 @@ void hci_le_conn_failed(struct hci_conn *conn, u8 status)mgmt_connect_failed (hdev, &conn->dst, conn->type, conn->dst_type, status); -hci_proto_connect_cfm (conn, status); +hci_connect_cfm (conn, status);hci_conn_del (conn);
net/bluetooth/hci_event.c +18 -18
@@ -1537,7 +1537,7 @@ static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)if (conn && conn->state ==BT_CONNECT ) {if (status !=0x0c || conn->attempt >2 ) { conn->state =BT_CLOSED ; -hci_proto_connect_cfm (conn, status); +hci_connect_cfm (conn, status);hci_conn_del (conn); }else conn->state =BT_CONNECT2 ;
@@ -1581,7 +1581,7 @@ static void hci_cs_add_sco(struct hci_dev *hdev, __u8 status)if (sco) { sco->state =BT_CLOSED ; -hci_proto_connect_cfm (sco, status); +hci_connect_cfm (sco, status);hci_conn_del (sco); } }
@@ -1608,7 +1608,7 @@ static void hci_cs_auth_requested(struct hci_dev *hdev, __u8 status) conn =hci_conn_hash_lookup_handle (hdev,__le16_to_cpu (cp->handle));if (conn) {if (conn->state ==BT_CONFIG ) { -hci_proto_connect_cfm (conn, status); +hci_connect_cfm (conn, status);hci_conn_drop (conn); } }
@@ -1635,7 +1635,7 @@ static void hci_cs_set_conn_encrypt(struct hci_dev *hdev, __u8 status) conn =hci_conn_hash_lookup_handle (hdev,__le16_to_cpu (cp->handle));if (conn) {if (conn->state ==BT_CONFIG ) { -hci_proto_connect_cfm (conn, status); +hci_connect_cfm (conn, status);hci_conn_drop (conn); } }
@@ -1811,7 +1811,7 @@ static void hci_cs_read_remote_features(struct hci_dev *hdev, __u8 status) conn =hci_conn_hash_lookup_handle (hdev,__le16_to_cpu (cp->handle));if (conn) {if (conn->state ==BT_CONFIG ) { -hci_proto_connect_cfm (conn, status); +hci_connect_cfm (conn, status);hci_conn_drop (conn); } }
@@ -1838,7 +1838,7 @@ static void hci_cs_read_remote_ext_features(struct hci_dev *hdev, __u8 status) conn =hci_conn_hash_lookup_handle (hdev,__le16_to_cpu (cp->handle));if (conn) {if (conn->state ==BT_CONFIG ) { -hci_proto_connect_cfm (conn, status); +hci_connect_cfm (conn, status);hci_conn_drop (conn); } }
@@ -1873,7 +1873,7 @@ static void hci_cs_setup_sync_conn(struct hci_dev *hdev, __u8 status)if (sco) { sco->state =BT_CLOSED ; -hci_proto_connect_cfm (sco, status); +hci_connect_cfm (sco, status);hci_conn_del (sco); } }
@@ -2255,10 +2255,10 @@ static void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)hci_sco_setup (conn, ev->status);if (ev->status) { -hci_proto_connect_cfm (conn, ev->status); +hci_connect_cfm (conn, ev->status);hci_conn_del (conn); }else if (ev->link_type !=ACL_LINK ) -hci_proto_connect_cfm (conn, ev->status); +hci_connect_cfm (conn, ev->status); unlock:hci_dev_unlock (hdev);
@@ -2366,7 +2366,7 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb) &cp); }else { conn->state =BT_CONNECT2 ; -hci_proto_connect_cfm (conn,0 ); +hci_connect_cfm (conn,0 ); } }
@@ -2501,7 +2501,7 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) &cp); }else { conn->state =BT_CONNECTED ; -hci_proto_connect_cfm (conn, ev->status); +hci_connect_cfm (conn, ev->status);hci_conn_drop (conn); } }else {
@@ -2629,12 +2629,12 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb)if (test_bit (HCI_SC_ONLY , &hdev->dev_flags) && (!test_bit (HCI_CONN_AES_CCM , &conn->flags) || conn->key_type !=HCI_LK_AUTH_COMBINATION_P256 )) { -hci_proto_connect_cfm (conn,HCI_ERROR_AUTH_FAILURE ); +hci_connect_cfm (conn,HCI_ERROR_AUTH_FAILURE );hci_conn_drop (conn); goto unlock; } -hci_proto_connect_cfm (conn, ev->status); +hci_connect_cfm (conn, ev->status);hci_conn_drop (conn); }else hci_encrypt_cfm (conn, ev->status, ev->encrypt);
@@ -2707,7 +2707,7 @@ static void hci_remote_features_evt(struct hci_dev *hdev,if (!hci_outgoing_auth_needed (hdev, conn)) { conn->state =BT_CONNECTED ; -hci_proto_connect_cfm (conn, ev->status); +hci_connect_cfm (conn, ev->status);hci_conn_drop (conn); }
@@ -3679,7 +3679,7 @@ static void hci_remote_ext_features_evt(struct hci_dev *hdev,if (!hci_outgoing_auth_needed (hdev, conn)) { conn->state =BT_CONNECTED ; -hci_proto_connect_cfm (conn, ev->status); +hci_connect_cfm (conn, ev->status);hci_conn_drop (conn); }
@@ -3738,7 +3738,7 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev,break ; } -hci_proto_connect_cfm (conn, ev->status); +hci_connect_cfm (conn, ev->status);if (ev->status)hci_conn_del (conn);
@@ -3849,7 +3849,7 @@ static void hci_key_refresh_complete_evt(struct hci_dev *hdev,if (!ev->status) conn->state =BT_CONNECTED ; -hci_proto_connect_cfm (conn, ev->status); +hci_connect_cfm (conn, ev->status);hci_conn_drop (conn); }else {hci_auth_cfm (conn, ev->status);
@@ -4512,7 +4512,7 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)hci_debugfs_create_conn (conn);hci_conn_add_sysfs (conn); -hci_proto_connect_cfm (conn, ev->status); +hci_connect_cfm (conn, ev->status); params =hci_pend_le_action_lookup (&hdev->pend_le_conns, &conn->dst, conn->dst_type);
net/bluetooth/l2cap_core.c +5 -1
@@ -7252,13 +7252,16 @@ static struct l2cap_chan *l2cap_global_fixed_chan(struct l2cap_chan *c,return NULL ; } -void l2cap_connect_cfm (struct hci_conn *hcon,u8 status) +static void l2cap_connect_cfm (struct hci_conn *hcon,u8 status) {struct hci_dev *hdev = hcon->hdev;struct l2cap_conn *conn;struct l2cap_chan *pchan;u8 dst_type; +if (hcon->type !=ACL_LINK && hcon->type !=LE_LINK ) +return ; +BT_DBG ("hcon %p bdaddr %pMR status %d" , hcon, &hcon->dst, status);if (status) {
@@ -7543,6 +7546,7 @@ drop:static struct hci_cb l2cap_cb = { .name ="L2CAP" , + .connect_cfm = l2cap_connect_cfm, .security_cfm = l2cap_security_cfm, };
net/bluetooth/sco.c +14 -1
@@ -1083,9 +1083,13 @@ int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags)return lm; } -void sco_connect_cfm (struct hci_conn *hcon,__u8 status) +static void sco_connect_cfm (struct hci_conn *hcon,__u8 status) { +if (hcon->type !=SCO_LINK && hcon->type !=ESCO_LINK ) +return ; +BT_DBG ("hcon %p bdaddr %pMR status %d" , hcon, &hcon->dst, status); +if (!status) {struct sco_conn *conn;
@@ -1122,6 +1126,11 @@ drop:return 0 ; } +static struct hci_cb sco_cb = { + .name ="SCO" , + .connect_cfm = sco_connect_cfm, +}; +static int sco_debugfs_show (struct seq_file *f,void *p) {struct sock *sk;
@@ -1203,6 +1212,8 @@ int __init sco_init(void)BT_INFO ("SCO socket layer initialized" ); +hci_register_cb (&sco_cb); +if (IS_ERR_OR_NULL (bt_debugfs))return 0 ;
@@ -1222,6 +1233,8 @@ void __exit sco_exit(void)debugfs_remove (sco_debugfs); +hci_unregister_cb (&sco_cb); +bt_sock_unregister (BTPROTO_SCO );proto_unregister (&sco_proto);
Signature · 1 line
2.1.0
PATCH 5/5 Bluetooth: Convert disconn_cfm to be triggered through hci_cb
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
This patch moves all the disconn_cfm callbacks to be based on the hci_cb list. This means making l2cap_disconn_cfm private to l2cap_core.c and sco_conn_cb private to sco.c respectively. Since the hci_conn type filtering isn't done any more on the wrapper level the callbacks themselves need to check that they were passed a relevant type of connection.
--- include/net/bluetooth/hci_core.h | 44 +++++++++++++++------------------------- net/bluetooth/hci_conn.c | 2 +- net/bluetooth/hci_event.c | 2 +- net/bluetooth/l2cap_core.c | 6 +++++- net/bluetooth/sco.c | 6 +++++- 5 files changed, 28 insertions(+), 32 deletions(-)
include/net/bluetooth/hci_core.h +16 -28
@@ -504,11 +504,9 @@ extern struct mutex hci_cb_list_lock;/* ----- HCI interface to upper protocols ----- */ int l2cap_connect_ind (struct hci_dev *hdev,bdaddr_t *bdaddr);int l2cap_disconn_ind (struct hci_conn *hcon); -void l2cap_disconn_cfm (struct hci_conn *hcon,u8 reason);int l2cap_recv_acldata (struct hci_conn *hcon,struct sk_buff *skb,u16 flags);int sco_connect_ind (struct hci_dev *hdev,bdaddr_t *bdaddr,__u8 *flags); -void sco_disconn_cfm (struct hci_conn *hcon,__u8 reason);int sco_recv_scodata (struct hci_conn *hcon,struct sk_buff *skb);/* ----- Inquiry cache ----- */
@@ -1056,32 +1054,6 @@ static inline int hci_proto_disconn_ind(struct hci_conn *conn)return l2cap_disconn_ind (conn); } -static inline void hci_proto_disconn_cfm (struct hci_conn *conn,__u8 reason) -{ -switch (conn->type) { -case ACL_LINK : -case LE_LINK : -l2cap_disconn_cfm (conn, reason); -break ; - -case SCO_LINK : -case ESCO_LINK : -sco_disconn_cfm (conn, reason); -break ; - -/* L2CAP would be handled for BREDR chan */ -case AMP_LINK : -break ; - -default : -BT_ERR ("unknown link type %d" , conn->type); -break ; - } - -if (conn->disconn_cfm_cb) - conn->disconn_cfm_cb (conn, reason); -} -/* ----- HCI callbacks ----- */ struct hci_cb {struct list_head list;
@@ -1089,6 +1061,7 @@ struct hci_cb {char *name;void (*connect_cfm) (struct hci_conn *conn,__u8 status); +void (*disconn_cfm) (struct hci_conn *conn,__u8 status);void (*security_cfm) (struct hci_conn *conn,__u8 status,__u8 encrypt);void (*key_change_cfm) (struct hci_conn *conn,__u8 status);
@@ -1110,6 +1083,21 @@ static inline void hci_connect_cfm(struct hci_conn *conn, __u8 status) conn->connect_cfm_cb (conn, status); } +static inline void hci_disconn_cfm (struct hci_conn *conn,__u8 reason) +{ +struct hci_cb *cb; + +mutex_lock (&hci_cb_list_lock); +list_for_each_entry (cb, &hci_cb_list, list) { +if (cb->disconn_cfm) + cb->disconn_cfm (conn, reason); + } +mutex_unlock (&hci_cb_list_lock); + +if (conn->disconn_cfm_cb) + conn->disconn_cfm_cb (conn, reason); +} +static inline void hci_auth_cfm (struct hci_conn *conn,__u8 status) {struct hci_cb *cb;
net/bluetooth/hci_conn.c +1 -1
@@ -1151,7 +1151,7 @@ void hci_conn_hash_flush(struct hci_dev *hdev)list_for_each_entry_safe (c, n, &h->list, list) { c->state =BT_CLOSED ; -hci_proto_disconn_cfm (c,HCI_ERROR_LOCAL_HOST_TERM ); +hci_disconn_cfm (c,HCI_ERROR_LOCAL_HOST_TERM );hci_conn_del (c); } }
net/bluetooth/hci_event.c +1 -1
@@ -2444,7 +2444,7 @@ static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) type = conn->type; -hci_proto_disconn_cfm (conn, ev->reason); +hci_disconn_cfm (conn, ev->reason);hci_conn_del (conn);/* Re-enable advertising if necessary, since it might
net/bluetooth/l2cap_core.c +5 -1
@@ -7324,8 +7324,11 @@ int l2cap_disconn_ind(struct hci_conn *hcon)return conn->disc_reason; } -void l2cap_disconn_cfm (struct hci_conn *hcon,u8 reason) +static void l2cap_disconn_cfm (struct hci_conn *hcon,u8 reason) { +if (hcon->type !=ACL_LINK && hcon->type !=LE_LINK ) +return ; +BT_DBG ("hcon %p reason %d" , hcon, reason);l2cap_conn_del (hcon,bt_to_errno (reason));
@@ -7547,6 +7550,7 @@ drop:static struct hci_cb l2cap_cb = { .name ="L2CAP" , .connect_cfm = l2cap_connect_cfm, + .disconn_cfm = l2cap_disconn_cfm, .security_cfm = l2cap_security_cfm, };
net/bluetooth/sco.c +5 -1
@@ -1100,8 +1100,11 @@ static void sco_connect_cfm(struct hci_conn *hcon, __u8 status)sco_conn_del (hcon,bt_to_errno (status)); } -void sco_disconn_cfm (struct hci_conn *hcon,__u8 reason) +static void sco_disconn_cfm (struct hci_conn *hcon,__u8 reason) { +if (hcon->type !=SCO_LINK && hcon->type !=ESCO_LINK ) +return ; +BT_DBG ("hcon %p reason %d" , hcon, reason);sco_conn_del (hcon,bt_to_errno (reason));
@@ -1129,6 +1132,7 @@ drop:static struct hci_cb sco_cb = { .name ="SCO" , .connect_cfm = sco_connect_cfm, + .disconn_cfm = sco_disconn_cfm, };static int sco_debugfs_show (struct seq_file *f,void *p)
Signature · 1 line
2.1.0
Marcel Holtmann
maintainerHi Johan,
Quoted 17 lines
This set of patches cleans up the usage of the
hci_cblist as well as the couple of unnecesasry layers of abstraction with hci_*_cb() calling hci_proto_*_cb() functions. These patches also pave the way for other modules, such as 6lowpan, to easily track the coming and going of connections, now thatconnect_cfm&disconn_cfmare accessible through thehci_cblist.Johan
----------------------------------------------------------------
Johan Hedberg (5):
Bluetooth: Add newhci_cbentries to the tail rather than the head
Bluetooth: Converthci_cb_list_lockto a mutex
Bluetooth: Convert L2CAP security callback to usehci_cb
Bluetooth: Convertconnect_cfmto be triggered throughhci_cb
Bluetooth: Convertdisconn_cfmto be triggered throughhci_cb
Quoted 7 lines
include/net/bluetooth/hci_core.h | 140 ++++++++++++------------------------ net/bluetooth/hci_conn.c | 6 +- net/bluetooth/hci_core.c | 12 ++-- net/bluetooth/hci_event.c | 38 +++++----- net/bluetooth/l2cap_core.c | 26 +++++-- net/bluetooth/sco.c | 21 +++++- 6 files changed, 113 insertions(+), 130 deletions(-)
all 5 patches have been applied to bluetooth-next tree.
Regards
Marcel