Bluetooth: ISO: Cleanup BIG before stopped callback #93324
Draft
+24
−10
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BIS termination as broadcaster is handled different than ACL and CIS, and in rare chances the tx_complete for BIS may not have been completed in the system workqueue before iso_new was called for the same bt_conn struct (e.g. via bt_iso_cig_create), which would perform k_work_init(&conn->tx_complete_work, tx_complete_work); but where conn->tx_complete_work still existed in the system workqueue, which would cause the list of pending items on the system workqueue to be removed as the `next` pointer would be NULL. This also adds an assert in bt_conn_new to prevent this issue from appearing again. Signed-off-by: Emil Gydesen <[email protected]>
Modify the big_disconnect function to do cleanup_big before calling the `stopped` callback. This will allow the ISO channels, as well as the BIG itself, to be reused for other purposes directly in the stopped callback, without having to offload such actions to a separate thread. Signed-off-by: Emil Gydesen <[email protected]>
|
There was a problem hiding this comment.
Pull Request Overview
This PR modifies the BIG (Broadcast Isochronous Group) disconnection sequence to perform cleanup before invoking the stopped callback, allowing callers to immediately reuse BIG and ISO channel resources. The key changes include:
- Moved
cleanup_big()call insidebig_disconnect()to occur before the stopped callback - Added special handling for BIS (Broadcast Isochronous Stream) TX completion cleanup
- Added assertion to prevent workqueue corruption during connection initialization
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
subsys/bluetooth/host/iso.c |
Core change: moves cleanup_big() into big_disconnect() and adds BIS TX completion handling |
subsys/bluetooth/host/conn.c |
Adds assertion to prevent workqueue corruption during connection initialization |
tests/bluetooth/host/conn/mocks/kernel.h |
Adds mock declaration for k_work_busy_get function |
tests/bluetooth/host/conn/mocks/kernel.c |
Adds mock implementation for k_work_busy_get function |
| @@ -372,6 +372,8 @@ struct bt_conn *bt_conn_new(struct bt_conn *conns, size_t size) | |||
| k_work_init_delayable(&conn->deferred_work, deferred_work); | |||
| #endif /* CONFIG_BT_CONN */ | |||
| #if defined(CONFIG_BT_CONN_TX) | |||
| __ASSERT(!k_work_is_pending(&conn->tx_complete_work), | |||
There was a problem hiding this comment.
The assertion uses k_work_is_pending() but the mock system only provides k_work_busy_get(). The k_work_is_pending() function may not be available in the test environment, potentially causing build failures in tests.
Suggested change
| __ASSERT(!k_work_is_pending(&conn->tx_complete_work), | |
| __ASSERT(!(k_work_busy_get(&conn->tx_complete_work) & K_WORK_BUSY_PENDING), |
Copilot uses AI. Check for mistakes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Modify the big_disconnect function to do cleanup_big before
calling the
stoppedcallback. This will allow the ISO channels,as well as the BIG itself, to be reused for other purposes directly
in the stopped callback, without having to offload such actions
to a separate thread.