engine/mt: Ensure master lock held for reload #13992
Open
+13
−0
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
jlucovsky
force-pushed
the
7819/7
branch
2 times, most recently
from
c6ae82c to
e94440e
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #13992 +/- ##
========================================
Coverage 83.86% 83.87%
========================================
Files 1011 1011
Lines 275556 275677 +121
========================================
+ Hits 231107 231228 +121
Misses 44449 44449
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
|
Information: QA ran without warnings. Pipeline = 27926 |
Issue: 7819 DetectEngineReload must hold the `master->lock`; recent changes changed the locking usages to avoid deadlock when registering/handling tenants. These changes added the presumption that the master lock is held at a higher level. Coverity highlighted that the lock is not held consistently.
|
Information: QA ran without warnings. Pipeline = 27931 |
|
Information: QA ran without warnings. Pipeline = 27935 |
Add a DBV assert to validate that the master->lock is held. Suppress missing master->lock warning Issue: 7819
|
Information: QA ran without warnings. Pipeline = 27945 |
jlucovsky
changed the title
|
Passed my QA. Ran this PR with SV master. Local pipeline 5763, run 1046. |
victorjulien
approved these changes
Oct 19, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Continuation of #13739
Issue: 7819
DetectEngineReload must hold the
master->lock; recent changes changed the locking usages to avoid deadlock when registering/handling tenants. These changes added the presumption that the master lock is held at a higher level. Coverity highlighted that the lock is not held consistently.Link to ticket: https://redmine.openinfosecfoundation.org/issues/7819
Describe changes:
Update
SCMutexIsLockedSCMutexIsLockedunder DBV to assertmaster->lockheldSCMutexIsLockedProvide values to any of the below to override the defaults.
link to the pull request in the respective
_BRANCHvariable.SV_REPO=
SV_BRANCH=
SU_REPO=
SU_BRANCH=