Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fba7ecf0 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Convert hci_cb_list_lock to a mutex 



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.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 00629e0f

include/net/bluetooth/hci_core.h

+9 −9
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

}