michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: ieee802154: fix freeing Rx buffer

Browse source 
This commit fixes a bug where an already received Rx frame could not be
processed by the IEEE 802.15.4 driver.

In the current implementation, buffer is marked as free and released to
the buffer pool after `nrf_802154_buffer_free_raw` finishes executing.
However, delays caused by thread scheduling might result in a new frame
being already received and provided to the driver before
`nrf_802154_buffer_free_raw` returns. Such a situation ends in an
assertion now.

This commit changes that behavior by marking the buffer as free before
calling `nrf_802154_buffer_free_raw`.

Signed-off-by: Jedrzej Ciupis <jedrzej.ciupis@nordicsemi.no>
This commit is contained in:
Jedrzej Ciupis 2022-06-07 14:28:26 +02:00 • committed by Carles Cufí
commit 8ed202b43d
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/ieee802154/ieee802154_nrf5.c
View file

@ -127,6 +127,7 @@ static void nrf5_rx_thread(void *arg1, void *arg2, void *arg3)
struct net_pkt *pkt;
struct nrf5_802154_rx_frame *rx_frame;
uint8_t pkt_len;
uint8_t *psdu;
ARG_UNUSED(arg2);
ARG_UNUSED(arg3);
@ -190,8 +191,9 @@ static void nrf5_rx_thread(void *arg1, void *arg2, void *arg3)
goto drop;
}
nrf_802154_buffer_free_raw(rx_frame->psdu);
psdu = rx_frame->psdu;
rx_frame->psdu = NULL;
nrf_802154_buffer_free_raw(psdu);
if (LOG_LEVEL >= LOG_LEVEL_DBG) {
log_stack_usage(&nrf5_radio->rx_thread);
@ -200,8 +202,9 @@ static void nrf5_rx_thread(void *arg1, void *arg2, void *arg3)
continue;
drop:
nrf_802154_buffer_free_raw(rx_frame->psdu);
psdu = rx_frame->psdu;
rx_frame->psdu = NULL;
nrf_802154_buffer_free_raw(psdu);
net_pkt_unref(pkt);
}