Skip to content

Comments

Flow drops/60x/v1#8958

Merged
victorjulien merged 10 commits intoOISF:master-6.0.xfrom
victorjulien:flow-drops/60x/v1
Jun 5, 2023
Merged

Flow drops/60x/v1#8958
victorjulien merged 10 commits intoOISF:master-6.0.xfrom
victorjulien:flow-drops/60x/v1

Conversation

@victorjulien
Copy link
Member

SV_BRANCH=pr/1228

Issue drop to packet as early as possible.

(cherry picked from commit 71a033a)
Now that flow drop is applied to packets before other processing,
no drop has to be issued on a packet.

(cherry picked from commit 85ddba6)
Remove logic to apply flow drop, as this is now handled in the
flow engine.

However, keep the logic that frees/cleans the session state.

(cherry picked from commit d91a1e8)
When a flow is in the drop flow state, don't use pseudo packets
when it is timing out. There should be no work left to do at this
point.

(cherry picked from commit 2a95154)
(cherry picked from commit 95bf724)
@victorjulien victorjulien requested a review from a team as a code owner June 3, 2023 06:30
@victorjulien
Copy link
Member Author

commit check fails due to unknown cherry pick(s) for not yet merged from #8951

@suricata-qa
Copy link

WARNING:

field baseline test %
SURI_TLPR1_stats_chk
.flow.memuse 579234048 907792768 156.72%

Pipeline 14219

Test broke after recent changes. Functionality is tested in
suricata-verify, so just remove the test.

(cherry picked from commit 8a535a0)
@suricata-qa
Copy link

WARNING:

field baseline test %
SURI_TLPW1_stats_chk
.uptime 141 211 149.65%
.tcp.rst 81627 89913 110.15%

Pipeline 14226

@victorjulien victorjulien requested a review from jasonish as a code owner June 4, 2023 17:22
(cherry picked from commit fd93f00)
@suricata-qa
Copy link

WARNING:

field baseline test %
SURI_TLPR1_stats_chk
.flow.spare 2155079 2019024 93.69%

Pipeline 14232

@suricata-qa
Copy link

WARNING:

field baseline test %
SURI_TLPR1_stats_chk
.flow.memuse 579234048 707307968 122.11%
TREX_GENERIC_stats_chk
.capture.kernel_drops 0 234 0.00

Pipeline 14233

@victorjulien victorjulien merged commit ad041da into OISF:master-6.0.x Jun 5, 2023
@victorjulien victorjulien deleted the flow-drops/60x/v1 branch July 17, 2023 11:14
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