Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mpm cleanups/v2 #9913

Closed
wants to merge 10 commits into from
Closed

Conversation

victorjulien
Copy link
Member

Remove "ac-bs" as it's not performing well enough.
Various mpm cleanups.

Replaces #9908 with some more cleanup commits.

https://redmine.openinfosecfoundation.org/issues/6586

MPM_HS does not need a guard.
Bring implementation in line with Hyperscan, which only counts unique matches.

Update test to reflect the new behavior.
Bring implementation in line with Hyperscan, which only counts unique matches.

Update test to reflect the new behavior.
Fall back to default matcher.

Ticket OISF#6586.
Avoid redundant pointer checks; instead check once.
Copy link

codecov bot commented Nov 28, 2023

Codecov Report

Merging #9913 (b092417) into master (d005fff) will decrease coverage by 0.10%.
Report is 2 commits behind head on master.
The diff coverage is 72.72%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #9913      +/-   ##
==========================================
- Coverage   82.45%   82.36%   -0.10%     
==========================================
  Files         972      970       -2     
  Lines      273057   271663    -1394     
==========================================
- Hits       225156   223751    -1405     
- Misses      47901    47912      +11     
Flag Coverage Δ
fuzzcorpus 64.42% <61.11%> (+0.05%) ⬆️
suricata-verify 61.33% <66.66%> (+0.24%) ⬆️
unittests 62.84% <68.18%> (-0.08%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

@victorjulien victorjulien mentioned this pull request Nov 28, 2023
@suricata-qa
Copy link

Information: QA ran without warnings.

Pipeline 16774

Copy link
Contributor

@lukashino lukashino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looking good

@@ -1132,7 +1132,6 @@ static int CheckMatch(const SCACTileSearchCtx *ctx, PrefilterRuleStore *pmq,
* pattern is "Foo" and the string is "Foo bar foo", matches would be reported
* as 2, when it should really be 1, since "foo" is not a true match.
*/
matches++;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you've removed the increment here, did you move it elsewhere outside this file? To me it would seem like it doesn't increment currently or it is somehow connected with the changes in the prior commit

But I guess likely the "SCACSearch" counts that for you

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the real unique matches were already counted elsewhere, but I realize I should remove the comment

@victorjulien victorjulien mentioned this pull request Dec 1, 2023
@victorjulien
Copy link
Member Author

replaced by #9935

@victorjulien victorjulien deleted the mpm-cleanups/v2 branch June 23, 2024 05:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants