Repository navigation
Conversation
Signed-off-by: bdm-k <kokusyunn@gmail.com>
bdm-k
added
the
need-patch-update
bdm-k
requested review from
Koichi98,
atsushi421,
kobayu858,
ruth561 and
sykwer
as code owners
November 2, 2026 10:46
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
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.
Description
When a subscription is destroyed, its entry in
id2_callback_infowas erased while holdingid2_callback_info_mtx. If the storedCallbackInfohappened to own the last reference to another subscription (for example, aClientcaptured by a relayed service callback), destroying that entry under the lock would run the nested subscription destructor, which re-acquires the same mutex on the same thread and deadlocks.This change moves the
CallbackInfoentry out under the lock but defers its destruction until after the lock is released, breaking the self-deadlock.A regression test in
test_agnocast_subscription.cppconstructs an outer subscription whose callback captures an inner subscription and asserts that resetting the outer does not deadlock and that the inner is destroyed.Related links
closes #1687
How was this PR tested?
bash scripts/test/e2e_test_1to1.bash(required)bash scripts/test/e2e_test_2to2.bash(required)bash scripts/test/run_requires_kernel_module_tests.bash(required)Notes for reviewers
Post-merge checklist
agnocast_docafter merging (if documentation needs updating)