michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Fix transport tx and rx

Browse source 
Fix seg_tx occupy when no segment not send
and allocate rx_seg when receive such message.

Fixes: #24101

Signed-off-by: Lingao Meng <mengabc1086@gmail.com>
This commit is contained in:
Lingao Meng 2020-04-05 10:10:45 -07:00 • committed by Johan Hedberg
commit 5b991aa09a
1 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

38
subsys/bluetooth/mesh/transport.c
View file

@ -406,8 +406,7 @@ static void seg_tx_send_unacked(struct seg_tx *tx)
BUF_TIMEOUT);
if (!seg) {
BT_DBG("Allocating segment failed");
tx->sending = 0U;
return;
goto end;
}
net_buf_reserve(seg, BT_MESH_NET_HDR_LEN);
@ -421,13 +420,19 @@ static void seg_tx_send_unacked(struct seg_tx *tx)
if (err) {
BT_DBG("Sending segment failed");
tx->seg_pending--;
tx->sending = 0U;
return;
goto end;
}
}
tx->sending = 0U;
tx->seg_o = 0U;
end:
if (!tx->seg_pending) {
k_delayed_work_submit(&tx->retransmit,
SEG_RETRANSMIT_TIMEOUT(tx));
}
tx->sending = 0U;
tx->attempts--;
}
@ -1342,6 +1347,10 @@ static void seg_rx_reset(struct seg_rx *rx, bool full_reset)
}
for (i = 0; i <= rx->seg_n; i++) {
if (!rx->seg[i]) {
continue;
}
k_mem_slab_free(&segs, &rx->seg[i]);
rx->seg[i] = NULL;
}
@ -1450,12 +1459,12 @@ static struct seg_rx *seg_rx_alloc(struct bt_mesh_net_rx *net_rx,
const u8_t *hdr, const u64_t *seq_auth,
u8_t seg_n)
{
int i, j;
int i;
/* No race condition on this check, as this function only executes in
* the collaborative Bluetooth rx thread:
*/
if (k_mem_slab_num_free_get(&segs) < seg_n) {
if (k_mem_slab_num_free_get(&segs) < 1) {
BT_WARN("Not enough segments for incoming message");
return NULL;
}
@ -1478,14 +1487,6 @@ static struct seg_rx *seg_rx_alloc(struct bt_mesh_net_rx *net_rx,
rx->dst = net_rx->ctx.recv_dst;
rx->block = 0U;
/* Allocating everything at the beginning to avoid any failures
* after initial rx. Could reduce overall buffer usage by
* allocating as we go?
*/
for (j = 0; j <= seg_n; j++) {
k_mem_slab_alloc(&segs, &rx->seg[j], K_NO_WAIT);
}
BT_DBG("New RX context. Block Complete 0x%08x",
BLOCK_COMPLETE(seg_n));
@ -1673,6 +1674,13 @@ found_rx:
k_delayed_work_submit(&rx->ack, ack_timeout(rx));
}
/* Allocated segment here */
err = k_mem_slab_alloc(&segs, &rx->seg[seg_o], K_NO_WAIT);
if (err) {
BT_WARN("Unable allocate buffer for Seg %u", seg_o);
return -ENOBUFS;
}
memcpy(rx->seg[seg_o], buf->data, buf->len);
BT_DBG("Received %u/%u", seg_o, seg_n);