Skip to content

Commit

Permalink
Bluetooth: convert tx_task to workqueue
Browse files Browse the repository at this point in the history
This should simplify Bluetooth core processing a lot.

Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
  • Loading branch information
Gustavo F. Padovan committed Dec 18, 2011
1 parent c347b76 commit 3eff45e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 19 deletions.
2 changes: 1 addition & 1 deletion include/net/bluetooth/hci_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ struct hci_dev {

struct work_struct rx_work;
struct work_struct cmd_work;
struct tasklet_struct tx_task;
struct work_struct tx_work;

struct sk_buff_head rx_q;
struct sk_buff_head raw_q;
Expand Down
20 changes: 9 additions & 11 deletions net/bluetooth/hci_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ int enable_hs;

static void hci_rx_work(struct work_struct *work);
static void hci_cmd_work(struct work_struct *work);
static void hci_tx_task(unsigned long arg);
static void hci_tx_work(struct work_struct *work);

static DEFINE_MUTEX(hci_task_lock);

Expand Down Expand Up @@ -547,7 +547,7 @@ int hci_dev_open(__u16 dev)
}
} else {
/* Init failed, cleanup */
tasklet_kill(&hdev->tx_task);
flush_work(&hdev->tx_work);
flush_work(&hdev->cmd_work);
flush_work(&hdev->rx_work);

Expand Down Expand Up @@ -585,8 +585,8 @@ static int hci_dev_do_close(struct hci_dev *hdev)
return 0;
}

/* Kill RX and TX tasks */
tasklet_kill(&hdev->tx_task);
/* Flush RX and TX works */
flush_work(&hdev->tx_work);
flush_work(&hdev->rx_work);

if (hdev->discov_timeout > 0) {
Expand Down Expand Up @@ -672,7 +672,6 @@ int hci_dev_reset(__u16 dev)
return -ENODEV;

hci_req_lock(hdev);
tasklet_disable(&hdev->tx_task);

if (!test_bit(HCI_UP, &hdev->flags))
goto done;
Expand All @@ -697,7 +696,6 @@ int hci_dev_reset(__u16 dev)
msecs_to_jiffies(HCI_INIT_TIMEOUT));

done:
tasklet_enable(&hdev->tx_task);
hci_req_unlock(hdev);
hci_dev_put(hdev);
return ret;
Expand Down Expand Up @@ -1459,8 +1457,8 @@ int hci_register_dev(struct hci_dev *hdev)

INIT_WORK(&hdev->rx_work, hci_rx_work);
INIT_WORK(&hdev->cmd_work, hci_cmd_work);
INIT_WORK(&hdev->tx_work, hci_tx_work);

tasklet_init(&hdev->tx_task, hci_tx_task, (unsigned long) hdev);

skb_queue_head_init(&hdev->rx_q);
skb_queue_head_init(&hdev->cmd_q);
Expand Down Expand Up @@ -2012,7 +2010,7 @@ void hci_send_acl(struct hci_chan *chan, struct sk_buff *skb, __u16 flags)

hci_queue_acl(conn, &chan->data_q, skb, flags);

tasklet_schedule(&hdev->tx_task);
queue_work(hdev->workqueue, &hdev->tx_work);
}
EXPORT_SYMBOL(hci_send_acl);

Expand All @@ -2035,7 +2033,7 @@ void hci_send_sco(struct hci_conn *conn, struct sk_buff *skb)
bt_cb(skb)->pkt_type = HCI_SCODATA_PKT;

skb_queue_tail(&conn->data_q, skb);
tasklet_schedule(&hdev->tx_task);
queue_work(hdev->workqueue, &hdev->tx_work);
}
EXPORT_SYMBOL(hci_send_sco);

Expand Down Expand Up @@ -2399,9 +2397,9 @@ static inline void hci_sched_le(struct hci_dev *hdev)
hci_prio_recalculate(hdev, LE_LINK);
}

static void hci_tx_task(unsigned long arg)
static void hci_tx_work(struct work_struct *work)
{
struct hci_dev *hdev = (struct hci_dev *) arg;
struct hci_dev *hdev = container_of(work, struct hci_dev, tx_work);
struct sk_buff *skb;

mutex_lock(&hci_task_lock);
Expand Down
6 changes: 1 addition & 5 deletions net/bluetooth/hci_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -2239,8 +2239,6 @@ static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *s
return;
}

tasklet_disable(&hdev->tx_task);

for (i = 0, ptr = (__le16 *) skb->data; i < ev->num_hndl; i++) {
struct hci_conn *conn;
__u16 handle, count;
Expand Down Expand Up @@ -2274,9 +2272,7 @@ static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *s
}
}

tasklet_schedule(&hdev->tx_task);

tasklet_enable(&hdev->tx_task);
queue_work(hdev->workqueue, &hdev->tx_work);
}

static inline void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
Expand Down
4 changes: 2 additions & 2 deletions net/bluetooth/hci_sock.c
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock,

if (test_bit(HCI_RAW, &hdev->flags) || (ogf == 0x3f)) {
skb_queue_tail(&hdev->raw_q, skb);
tasklet_schedule(&hdev->tx_task);
queue_work(hdev->workqueue, &hdev->tx_work);
} else {
skb_queue_tail(&hdev->cmd_q, skb);
queue_work(hdev->workqueue, &hdev->cmd_work);
Expand All @@ -547,7 +547,7 @@ static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
}

skb_queue_tail(&hdev->raw_q, skb);
tasklet_schedule(&hdev->tx_task);
queue_work(hdev->workqueue, &hdev->tx_work);
}

err = len;
Expand Down

0 comments on commit 3eff45e

Please sign in to comment.