michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: att: Fix deadlock on meta data context allocation

Browse source 
This fixes deadlock that happened waiting for meta data in system
workqueue.
The meta data always get freed in the system workqueue,
so if we're in the same workqueue but there are no immediate
contexts available, there's no chance we'll get one by waiting.

Fixes: #53455
Signed-off-by: Mariusz Skamra <mariusz.skamra@codecoup.pl>
This commit is contained in:
Mariusz Skamra 2023-01-04 11:40:25 +01:00 • committed by Carles Cufí
commit 9148fb65d7
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
subsys/bluetooth/host/att.c
View file

@ -158,6 +158,14 @@ K_FIFO_DEFINE(free_att_tx_meta_data);
static struct bt_att_tx_meta_data *tx_meta_data_alloc(k_timeout_t timeout)
{
/* The meta data always get freed in the system workqueue,
* so if we're in the same workqueue but there are no immediate
* contexts available, there's no chance we'll get one by waiting.
*/
if (k_current_get() == &k_sys_work_q.thread) {
return k_fifo_get(&free_att_tx_meta_data, K_NO_WAIT);
}
return k_fifo_get(&free_att_tx_meta_data, timeout);
}