mirror/tinyusb
3
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2026-08-18 02:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

usbd: clear endpoint busy/claimed when a completion event is dropped

Browse Source 
An XFER_COMPLETE dropped by a full event queue leaves its endpoint's
BUSY|CLAIMED state set forever - the consumer that normally clears it
never sees the event, so usbd_edpt_claim()/usbd_edpt_xfer() fail from
then on and the class never re-arms the endpoint. Clear both flags when
the enqueue fails: the completion is lost either way, but the endpoint
stays usable.

Unit test: arm a bulk endpoint, drop its completion against a full
queue, verify the endpoint can be claimed and re-armed.
This commit is contained in:
hathach
2026-08-12 23:05:59 +07:00
parent a52562b2be
commit 91fbbd192c
2 changed files with 59 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
test/unit-test/test/device/usbd/test_usbd.c
View File

@ -29,6 +29,7 @@
#include "tusb_fifo.h"
#include "tusb.h"
#include "usbd.h"
#include "device/usbd_pvt.h"
TEST_SOURCE_FILE("usbd.c")
// Mock File
@ -308,6 +309,52 @@ void test_usbd_setup_dropped_by_full_queue_recovers(void)
tud_task();
}
//--------------------------------------------------------------------+
// Transfer completion dropped by full event queue
//--------------------------------------------------------------------+
// When the event queue is full, queue_event() drops the XFER_COMPLETE event. The endpoint's
// busy/claimed state must not survive the dropped completion: a leaked BUSY makes every later
// usbd_edpt_claim()/usbd_edpt_xfer() on that endpoint fail, so the class never re-arms it.
void test_usbd_xfer_complete_dropped_by_full_queue_recovers(void)
{
// fillers drain through usbd_reset -> class reset
mscd_reset_Ignore();
// open + claim + arm a bulk OUT endpoint the way a class driver would
tusb_desc_endpoint_t desc_ep = {
.bLength = sizeof(tusb_desc_endpoint_t),
.bDescriptorType = TUSB_DESC_ENDPOINT,
.bEndpointAddress = 0x01,
.bmAttributes = { .xfer = TUSB_XFER_BULK },
.wMaxPacketSize = 64,
.bInterval = 0
};
static uint8_t xfer_buf[64];
dcd_edpt_open_ExpectAndReturn(rhport, &desc_ep, true);
TEST_ASSERT_TRUE(usbd_edpt_open(rhport, &desc_ep));
TEST_ASSERT_TRUE(usbd_edpt_claim(rhport, 0x01));
dcd_edpt_xfer_ExpectAndReturn(rhport, 0x01, xfer_buf, 64, false, true);
TEST_ASSERT_TRUE(usbd_edpt_xfer(rhport, 0x01, xfer_buf, 64, false));
// fill the queue to the brim, then complete the transfer: queue_event() drops it
for (unsigned i = 0; i < CFG_TUD_TASK_QUEUE_SZ; i++) {
dcd_event_bus_signal(rhport, DCD_EVENT_UNPLUGGED, false);
}
dcd_event_xfer_complete(rhport, 0x01, 64, XFER_RESULT_SUCCESS, false);
// the endpoint must be re-armable: the dropped completion must not leak busy/claimed
TEST_ASSERT_TRUE(usbd_edpt_claim(rhport, 0x01));
dcd_edpt_xfer_ExpectAndReturn(rhport, 0x01, xfer_buf, 64, false, true);
TEST_ASSERT_TRUE(usbd_edpt_xfer(rhport, 0x01, xfer_buf, 64, false));
// drain the fillers so later tests start from an empty queue
for (unsigned i = 0; i < (CFG_TUD_TASK_QUEUE_SZ / CFG_TUD_TASK_EVENTS_PER_RUN) + 1; i++) {
tud_task();
}
}
//--------------------------------------------------------------------+
// Control OUT data stage host overrun
//--------------------------------------------------------------------+