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

Commit 09fd0de5 authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Bluetooth: Replace spin_lock by mutex in hci_dev 



Now we run everything in HCI in process context, so it's a better idea use
mutex instead spin_lock. The macro remains hci_dev_lock() (and I got rid
of hci_dev_lock_bh()), of course.

Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent b78752cc

include/net/bluetooth/hci_core.h

+3 −5
Original line number Original line Diff line number Diff line
@@ -117,7 +117,7 @@ struct adv_entry { 
#define NUM_REASSEMBLY 4

#define NUM_REASSEMBLY 4

struct hci_dev {

struct hci_dev {

	struct list_head list;

	struct list_head list;

	spinlock_t	lock;

	struct mutex	lock;

	atomic_t	refcnt;

	atomic_t	refcnt;





	char		name[8];

	char		name[8];
@@ -566,10 +566,8 @@ static inline struct hci_dev *hci_dev_hold(struct hci_dev *d) 
	return NULL;

	return NULL;

}

}





#define hci_dev_lock(d)		spin_lock(&d->lock)

#define hci_dev_lock(d)		mutex_lock(&d->lock)

#define hci_dev_unlock(d)	spin_unlock(&d->lock)

#define hci_dev_unlock(d)	mutex_unlock(&d->lock)

#define hci_dev_lock_bh(d)	spin_lock_bh(&d->lock)

#define hci_dev_unlock_bh(d)	spin_unlock_bh(&d->lock)





struct hci_dev *hci_dev_get(int index);

struct hci_dev *hci_dev_get(int index);

struct hci_dev *hci_get_route(bdaddr_t *src, bdaddr_t *dst);

struct hci_dev *hci_get_route(bdaddr_t *src, bdaddr_t *dst);

net/bluetooth/hci_conn.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -876,7 +876,7 @@ int hci_get_conn_list(void __user *arg) 




	ci = cl->conn_info;

	ci = cl->conn_info;





	hci_dev_lock_bh(hdev);

	hci_dev_lock(hdev);

	list_for_each_entry(c, &hdev->conn_hash.list, list) {

	list_for_each_entry(c, &hdev->conn_hash.list, list) {

		bacpy(&(ci + n)->bdaddr, &c->dst);

		bacpy(&(ci + n)->bdaddr, &c->dst);

		(ci + n)->handle = c->handle;

		(ci + n)->handle = c->handle;
@@ -887,7 +887,7 @@ int hci_get_conn_list(void __user *arg) 
		if (++n >= req.conn_num)

		if (++n >= req.conn_num)

			break;

			break;

	}

	}

	hci_dev_unlock_bh(hdev);

	hci_dev_unlock(hdev);





	cl->dev_id = hdev->id;

	cl->dev_id = hdev->id;

	cl->conn_num = n;

	cl->conn_num = n;
@@ -911,7 +911,7 @@ int hci_get_conn_info(struct hci_dev *hdev, void __user *arg) 
	if (copy_from_user(&req, arg, sizeof(req)))

	if (copy_from_user(&req, arg, sizeof(req)))

		return -EFAULT;

		return -EFAULT;





	hci_dev_lock_bh(hdev);

	hci_dev_lock(hdev);

	conn = hci_conn_hash_lookup_ba(hdev, req.type, &req.bdaddr);

	conn = hci_conn_hash_lookup_ba(hdev, req.type, &req.bdaddr);

	if (conn) {

	if (conn) {

		bacpy(&ci.bdaddr, &conn->dst);

		bacpy(&ci.bdaddr, &conn->dst);
@@ -921,7 +921,7 @@ int hci_get_conn_info(struct hci_dev *hdev, void __user *arg) 
		ci.state = conn->state;

		ci.state = conn->state;

		ci.link_mode = conn->link_mode;

		ci.link_mode = conn->link_mode;

	}

	}

	hci_dev_unlock_bh(hdev);

	hci_dev_unlock(hdev);





	if (!conn)

	if (!conn)

		return -ENOENT;

		return -ENOENT;
@@ -937,11 +937,11 @@ int hci_get_auth_info(struct hci_dev *hdev, void __user *arg) 
	if (copy_from_user(&req, arg, sizeof(req)))

	if (copy_from_user(&req, arg, sizeof(req)))

		return -EFAULT;

		return -EFAULT;





	hci_dev_lock_bh(hdev);

	hci_dev_lock(hdev);

	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &req.bdaddr);

	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &req.bdaddr);

	if (conn)

	if (conn)

		req.type = conn->auth_type;

		req.type = conn->auth_type;

	hci_dev_unlock_bh(hdev);

	hci_dev_unlock(hdev);





	if (!conn)

	if (!conn)

		return -ENOENT;

		return -ENOENT;

net/bluetooth/hci_core.c

+19 −19
Original line number Original line Diff line number Diff line
@@ -433,14 +433,14 @@ int hci_inquiry(void __user *arg) 
	if (!hdev)

	if (!hdev)

		return -ENODEV;

		return -ENODEV;





	hci_dev_lock_bh(hdev);

	hci_dev_lock(hdev);

	if (inquiry_cache_age(hdev) > INQUIRY_CACHE_AGE_MAX ||

	if (inquiry_cache_age(hdev) > INQUIRY_CACHE_AGE_MAX ||

				inquiry_cache_empty(hdev) ||

				inquiry_cache_empty(hdev) ||

				ir.flags & IREQ_CACHE_FLUSH) {

				ir.flags & IREQ_CACHE_FLUSH) {

		inquiry_cache_flush(hdev);

		inquiry_cache_flush(hdev);

		do_inquiry = 1;

		do_inquiry = 1;

	}

	}

	hci_dev_unlock_bh(hdev);

	hci_dev_unlock(hdev);





	timeo = ir.length * msecs_to_jiffies(2000);

	timeo = ir.length * msecs_to_jiffies(2000);
@@ -462,9 +462,9 @@ int hci_inquiry(void __user *arg) 
		goto done;

		goto done;

	}

	}





	hci_dev_lock_bh(hdev);

	hci_dev_lock(hdev);

	ir.num_rsp = inquiry_cache_dump(hdev, max_rsp, buf);

	ir.num_rsp = inquiry_cache_dump(hdev, max_rsp, buf);

	hci_dev_unlock_bh(hdev);

	hci_dev_unlock(hdev);





	BT_DBG("num_rsp %d", ir.num_rsp);

	BT_DBG("num_rsp %d", ir.num_rsp);
@@ -541,9 +541,9 @@ int hci_dev_open(__u16 dev) 
		set_bit(HCI_UP, &hdev->flags);

		set_bit(HCI_UP, &hdev->flags);

		hci_notify(hdev, HCI_DEV_UP);

		hci_notify(hdev, HCI_DEV_UP);

		if (!test_bit(HCI_SETUP, &hdev->flags)) {

		if (!test_bit(HCI_SETUP, &hdev->flags)) {

			hci_dev_lock_bh(hdev);

			hci_dev_lock(hdev);

			mgmt_powered(hdev, 1);

			mgmt_powered(hdev, 1);

			hci_dev_unlock_bh(hdev);

			hci_dev_unlock(hdev);

		}

		}

	} else {

	} else {

		/* Init failed, cleanup */

		/* Init failed, cleanup */
@@ -597,10 +597,10 @@ static int hci_dev_do_close(struct hci_dev *hdev) 
	if (test_and_clear_bit(HCI_AUTO_OFF, &hdev->flags))

	if (test_and_clear_bit(HCI_AUTO_OFF, &hdev->flags))

		cancel_delayed_work(&hdev->power_off);

		cancel_delayed_work(&hdev->power_off);





	hci_dev_lock_bh(hdev);

	hci_dev_lock(hdev);

	inquiry_cache_flush(hdev);

	inquiry_cache_flush(hdev);

	hci_conn_hash_flush(hdev);

	hci_conn_hash_flush(hdev);

	hci_dev_unlock_bh(hdev);

	hci_dev_unlock(hdev);





	hci_notify(hdev, HCI_DEV_DOWN);

	hci_notify(hdev, HCI_DEV_DOWN);
@@ -636,9 +636,9 @@ static int hci_dev_do_close(struct hci_dev *hdev) 
	 * and no tasks are scheduled. */

	 * and no tasks are scheduled. */

	hdev->close(hdev);

	hdev->close(hdev);





	hci_dev_lock_bh(hdev);

	hci_dev_lock(hdev);

	mgmt_powered(hdev, 0);

	mgmt_powered(hdev, 0);

	hci_dev_unlock_bh(hdev);

	hci_dev_unlock(hdev);





	/* Clear flags */

	/* Clear flags */

	hdev->flags = 0;

	hdev->flags = 0;
@@ -681,10 +681,10 @@ int hci_dev_reset(__u16 dev) 
	skb_queue_purge(&hdev->rx_q);

	skb_queue_purge(&hdev->rx_q);

	skb_queue_purge(&hdev->cmd_q);

	skb_queue_purge(&hdev->cmd_q);





	hci_dev_lock_bh(hdev);

	hci_dev_lock(hdev);

	inquiry_cache_flush(hdev);

	inquiry_cache_flush(hdev);

	hci_conn_hash_flush(hdev);

	hci_conn_hash_flush(hdev);

	hci_dev_unlock_bh(hdev);

	hci_dev_unlock(hdev);





	if (hdev->flush)

	if (hdev->flush)

		hdev->flush(hdev);

		hdev->flush(hdev);
@@ -967,13 +967,13 @@ static void hci_discov_off(struct work_struct *work) 




	BT_DBG("%s", hdev->name);

	BT_DBG("%s", hdev->name);





	hci_dev_lock_bh(hdev);

	hci_dev_lock(hdev);





	hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, sizeof(scan), &scan);

	hci_send_cmd(hdev, HCI_OP_WRITE_SCAN_ENABLE, sizeof(scan), &scan);





	hdev->discov_timeout = 0;

	hdev->discov_timeout = 0;





	hci_dev_unlock_bh(hdev);

	hci_dev_unlock(hdev);

}

}





int hci_uuids_clear(struct hci_dev *hdev)

int hci_uuids_clear(struct hci_dev *hdev)
@@ -1443,7 +1443,7 @@ int hci_register_dev(struct hci_dev *hdev) 
	list_add_tail(&hdev->list, head);

	list_add_tail(&hdev->list, head);





	atomic_set(&hdev->refcnt, 1);

	atomic_set(&hdev->refcnt, 1);

	spin_lock_init(&hdev->lock);

	mutex_init(&hdev->lock);





	hdev->flags = 0;

	hdev->flags = 0;

	hdev->dev_flags = 0;

	hdev->dev_flags = 0;
@@ -1558,9 +1558,9 @@ void hci_unregister_dev(struct hci_dev *hdev) 




	if (!test_bit(HCI_INIT, &hdev->flags) &&

	if (!test_bit(HCI_INIT, &hdev->flags) &&

					!test_bit(HCI_SETUP, &hdev->flags)) {

					!test_bit(HCI_SETUP, &hdev->flags)) {

		hci_dev_lock_bh(hdev);

		hci_dev_lock(hdev);

		mgmt_index_removed(hdev);

		mgmt_index_removed(hdev);

		hci_dev_unlock_bh(hdev);

		hci_dev_unlock(hdev);

	}

	}





	/* mgmt_index_removed should take care of emptying the

	/* mgmt_index_removed should take care of emptying the
@@ -1580,13 +1580,13 @@ void hci_unregister_dev(struct hci_dev *hdev) 




	destroy_workqueue(hdev->workqueue);

	destroy_workqueue(hdev->workqueue);





	hci_dev_lock_bh(hdev);

	hci_dev_lock(hdev);

	hci_blacklist_clear(hdev);

	hci_blacklist_clear(hdev);

	hci_uuids_clear(hdev);

	hci_uuids_clear(hdev);

	hci_link_keys_clear(hdev);

	hci_link_keys_clear(hdev);

	hci_remote_oob_data_clear(hdev);

	hci_remote_oob_data_clear(hdev);

	hci_adv_entries_clear(hdev);

	hci_adv_entries_clear(hdev);

	hci_dev_unlock_bh(hdev);

	hci_dev_unlock(hdev);





	__hci_dev_put(hdev);

	__hci_dev_put(hdev);

}

}

net/bluetooth/hci_sock.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -188,11 +188,11 @@ static int hci_sock_blacklist_add(struct hci_dev *hdev, void __user *arg) 
	if (copy_from_user(&bdaddr, arg, sizeof(bdaddr)))

	if (copy_from_user(&bdaddr, arg, sizeof(bdaddr)))

		return -EFAULT;

		return -EFAULT;





	hci_dev_lock_bh(hdev);

	hci_dev_lock(hdev);





	err = hci_blacklist_add(hdev, &bdaddr);

	err = hci_blacklist_add(hdev, &bdaddr);





	hci_dev_unlock_bh(hdev);

	hci_dev_unlock(hdev);





	return err;

	return err;

}

}
@@ -205,11 +205,11 @@ static int hci_sock_blacklist_del(struct hci_dev *hdev, void __user *arg) 
	if (copy_from_user(&bdaddr, arg, sizeof(bdaddr)))

	if (copy_from_user(&bdaddr, arg, sizeof(bdaddr)))

		return -EFAULT;

		return -EFAULT;





	hci_dev_lock_bh(hdev);

	hci_dev_lock(hdev);





	err = hci_blacklist_del(hdev, &bdaddr);

	err = hci_blacklist_del(hdev, &bdaddr);





	hci_dev_unlock_bh(hdev);

	hci_dev_unlock(hdev);





	return err;

	return err;

}

}

net/bluetooth/hci_sysfs.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -402,7 +402,7 @@ static int inquiry_cache_show(struct seq_file *f, void *p) 
	struct inquiry_cache *cache = &hdev->inq_cache;

	struct inquiry_cache *cache = &hdev->inq_cache;

	struct inquiry_entry *e;

	struct inquiry_entry *e;





	hci_dev_lock_bh(hdev);

	hci_dev_lock(hdev);





	for (e = cache->list; e; e = e->next) {

	for (e = cache->list; e; e = e->next) {

		struct inquiry_data *data = &e->data;

		struct inquiry_data *data = &e->data;
@@ -415,7 +415,7 @@ static int inquiry_cache_show(struct seq_file *f, void *p) 
			   data->rssi, data->ssp_mode, e->timestamp);

			   data->rssi, data->ssp_mode, e->timestamp);

	}

	}





	hci_dev_unlock_bh(hdev);

	hci_dev_unlock(hdev);





	return 0;

	return 0;

}

}
@@ -437,12 +437,12 @@ static int blacklist_show(struct seq_file *f, void *p) 
	struct hci_dev *hdev = f->private;

	struct hci_dev *hdev = f->private;

	struct bdaddr_list *b;

	struct bdaddr_list *b;





	hci_dev_lock_bh(hdev);

	hci_dev_lock(hdev);





	list_for_each_entry(b, &hdev->blacklist, list)

	list_for_each_entry(b, &hdev->blacklist, list)

		seq_printf(f, "%s\n", batostr(&b->bdaddr));

		seq_printf(f, "%s\n", batostr(&b->bdaddr));





	hci_dev_unlock_bh(hdev);

	hci_dev_unlock(hdev);





	return 0;

	return 0;

}

}
@@ -481,12 +481,12 @@ static int uuids_show(struct seq_file *f, void *p) 
	struct hci_dev *hdev = f->private;

	struct hci_dev *hdev = f->private;

	struct bt_uuid *uuid;

	struct bt_uuid *uuid;





	hci_dev_lock_bh(hdev);

	hci_dev_lock(hdev);





	list_for_each_entry(uuid, &hdev->uuids, list)

	list_for_each_entry(uuid, &hdev->uuids, list)

		print_bt_uuid(f, uuid->uuid);

		print_bt_uuid(f, uuid->uuid);





	hci_dev_unlock_bh(hdev);

	hci_dev_unlock(hdev);





	return 0;

	return 0;

}

}
@@ -507,11 +507,11 @@ static int auto_accept_delay_set(void *data, u64 val) 
{

{

	struct hci_dev *hdev = data;

	struct hci_dev *hdev = data;





	hci_dev_lock_bh(hdev);

	hci_dev_lock(hdev);





	hdev->auto_accept_delay = val;

	hdev->auto_accept_delay = val;





	hci_dev_unlock_bh(hdev);

	hci_dev_unlock(hdev);





	return 0;

	return 0;

}

}
@@ -520,11 +520,11 @@ static int auto_accept_delay_get(void *data, u64 *val) 
{

{

	struct hci_dev *hdev = data;

	struct hci_dev *hdev = data;





	hci_dev_lock_bh(hdev);

	hci_dev_lock(hdev);





	*val = hdev->auto_accept_delay;

	*val = hdev->auto_accept_delay;





	hci_dev_unlock_bh(hdev);

	hci_dev_unlock(hdev);





	return 0;

	return 0;

}

}