Skip to content

Commit

Permalink
Bluetooth: Add a new workqueue for hci_request operations
Browse files Browse the repository at this point in the history
The hci_request function is blocking and cannot be called through the
usual per-HCI device workqueue (hdev->workqueue). While hci_request is
in progress any other work from the queue, including sending HCI
commands to the controller would be blocked and eventually cause the
hci_request call to time out.

This patch adds a second workqueue to be used by operations needing
hci_request and thereby avoiding issues with blocking other workqueue
users.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
  • Loading branch information
Johan Hedberg authored and Gustavo Padovan committed Jan 18, 2013
1 parent 52e0b01 commit 6ead1bb
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
1 change: 1 addition & 0 deletions include/net/bluetooth/hci_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ struct hci_dev {
unsigned long le_last_tx;

struct workqueue_struct *workqueue;
struct workqueue_struct *req_workqueue;

struct work_struct power_on;
struct delayed_work power_off;
Expand Down
11 changes: 11 additions & 0 deletions net/bluetooth/hci_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1799,6 +1799,15 @@ int hci_register_dev(struct hci_dev *hdev)
goto err;
}

hdev->req_workqueue = alloc_workqueue(hdev->name,
WQ_HIGHPRI | WQ_UNBOUND |
WQ_MEM_RECLAIM, 1);
if (!hdev->req_workqueue) {
destroy_workqueue(hdev->workqueue);
error = -ENOMEM;
goto err;
}

error = hci_add_sysfs(hdev);
if (error < 0)
goto err_wqueue;
Expand Down Expand Up @@ -1827,6 +1836,7 @@ int hci_register_dev(struct hci_dev *hdev)

err_wqueue:
destroy_workqueue(hdev->workqueue);
destroy_workqueue(hdev->req_workqueue);
err:
ida_simple_remove(&hci_index_ida, hdev->id);
write_lock(&hci_dev_list_lock);
Expand Down Expand Up @@ -1880,6 +1890,7 @@ void hci_unregister_dev(struct hci_dev *hdev)
hci_del_sysfs(hdev);

destroy_workqueue(hdev->workqueue);
destroy_workqueue(hdev->req_workqueue);

hci_dev_lock(hdev);
hci_blacklist_clear(hdev);
Expand Down

0 comments on commit 6ead1bb

Please sign in to comment.