flow: Add cfg for optional flow reuse during low memory #10232
Closed
Conversation
This file contains 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
By default, force flow reuse to reuse an existing flows no matter the state of the flow. Add a configuration option flow.force-reuse, enabled by default, that can turn off the above behaviour. Ticket: OISF#6293
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #10232 +/- ##
==========================================
+ Coverage 82.18% 82.24% +0.05%
==========================================
Files 977 977
Lines 271894 271900 +6
==========================================
+ Hits 223465 223617 +152
+ Misses 48429 48283 -146
Flags with carried forward coverage won't be shown. Click here to find out more. |
victorjulien
requested changes
Jan 24, 2024
| @@ -687,6 +687,10 @@ static Flow *FlowGetNew(ThreadVars *tv, FlowLookupStruct *fls, Packet *p) | |||
| FlowWakeupFlowManagerThread(); | |||
| } | |||
|
|
|||
| if (!flow_config.force_reuse) { | |||
There was a problem hiding this comment.
how should this behave in IPS mode? We don't call NoFlowHandleIPS() here
There was a problem hiding this comment.
I think we could also enforce this option at the start of FlowGetUsedFlow
| @@ -286,6 +286,7 @@ typedef struct FlowCnf_ | |||
| uint32_t hash_rand; | |||
| uint32_t hash_size; | |||
| uint32_t prealloc; | |||
| int force_reuse; | |||
There was a problem hiding this comment.
also, please add a line to document the field
| @@ -1424,6 +1424,7 @@ flow: | |||
| emergency-recovery: 30 | |||
| #managers: 1 # default to one flow manager | |||
| #recyclers: 1 # default to one flow recycler thread | |||
| force-reuse: 1 # Default to forcing flow reuse in low memory conditions | |||
There was a problem hiding this comment.
we can enable it by default in the code, and leave it commented out here
additionally, it should use true/false instead of suggesting it is a numeric value
|
Updated in #10257 |
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.
By default, force flow reuse to reuse an existing flows no matter the state of the flow.
Add a configuration option flow.force-reuse, enabled by default, that can turn off the above behavior.
Ticket: #6293
Make sure these boxes are signed before submitting your Pull Request -- thank you.
https://docs.suricata.io/en/latest/devguide/contributing/contribution-process.html
https://suricata.io/about/contribution-agreement/ (note: this is only required once)
Link to redmine ticket:
https://redmine.openinfosecfoundation.org/issues/6293
Describe changes:
Add a configuration option flow.force-reuse, enabled by default, that can turn off flow reuse in low memory situations.
Provide values to any of the below to override the defaults.