Skip to content

fixes and improvements for -o/--optimize

Pablo Neira Ayuso netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest18 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/18optimize: do not compare relational expression rhs when collecting statementssrc/optimize.c+21 -180 replies
2/18optimize: do not merge rules with set reference in rhssrc/optimize.c tests/shell/testcases/optimizations/dumps/skip_merge.nft tests/shell/testcases/optimizations/skip_merge+67 -00 replies
3/18optimize: do not print stateful informationsrc/optimize.c+4 -00 replies
4/18optimize: remove comment after mergingsrc/optimize.c tests/shell/testcases/optimizations/merge_stmts+8 -30 replies
5/18optimize: fix reject statementsrc/optimize.c tests/shell/testcases/optimizations/dumps/merge_reject.nft tests/shell/testcases/optimizations/merge_reject+38 -30 replies
6/18optimize: fix verdict map mergingsrc/optimize.c+7 -40 replies
7/18optimize: add osf expression supportsrc/optimize.c+6 -00 replies
8/18optimize: add xfrm expression supportsrc/optimize.c+6 -00 replies
9/18optimize: add fib expression supportsrc/optimize.c+6 -00 replies
10/18optimize: add binop expression supportsrc/optimize.c+2 -00 replies
11/18optimize: add numgen expression supportsrc/optimize.c+8 -00 replies
12/18optimize: add hash expression supportsrc/optimize.c+12 -00 replies
13/18optimize: add unsupported statementsrc/optimize.c tests/shell/testcases/optimizations/dumps/skip_unsupported.nft tests/shell/testcases/optimizations/skip_unsupported+73 -40 replies
14/18tests: shell: run -c -o on rulesettests/shell/testcases/optimizations/ruleset+168 -00 replies
15/18optimize: only merge OP_IMPLICIT and OP_EQ relationalsrc/optimize.c tests/shell/testcases/optimizations/dumps/skip_non_eq.nft tests/shell/testcases/optimizations/skip_non_eq+28 -00 replies
16/18optimize: assume verdict is same when rules have no verdictsrc/optimize.c tests/shell/testcases/optimizations/dumps/merge_reject.nft tests/shell/testcases/optimizations/merge_reject+19 -10 replies
17/18optimize: limit statement is not supported yetsrc/optimize.c+0 -120 replies
18/18libnftables: release top level scopesrc/libnftables.c tests/shell/testcases/optimizations/variables+17 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH nft 00/18] fixes and improvements for -o/--optimize

Hi,

The following patchset contains a batch with fix/improvements for -o/--optimize.

1) Fix statement comparison, leading to incorrect rule matching to be merged.

2) Do not merge rules using set reference.

3) Do not print stateful information, eg. counter packets 0 bytes 0

4) Drop comments when merging.

5) Fix reject statement comparison.

6) Do not fully compare verdict statement, otherwise statement vs rule matrix gets multiple occurrences of this statement.

7) Add missing expressions used in relationals: osf, xfrm, fib, numgen, hash.

8) Add binary expression support.

9) Add unsupported statement, to avoid merging rules with statements that are not yet supported.

10) Only merge relationals with OP_IMPLICIT and OP_EQ.

11) Assume verdict is the same when rule specifies no verdict.

12) Remove support for limit statement, not actually supported yet. Merging rules with the limit statement require a new class of transformation not yet supported.

13) Release top level scope to avoid a bogus variable redefinition error when using -c and -o.

And many new tests.

This infrastructure is new code, please help testing and reporting bugs running it on your existing rulesets.

Thanks.

Pablo Neira Ayuso (18):
optimize: do not compare relational expression rhs when collecting statements
optimize: do not merge rules with set reference in rhs
optimize: do not print stateful information
optimize: remove comment after merging
optimize: fix reject statement
optimize: fix verdict map merging
optimize: add osf expression support
optimize: add xfrm expression support
optimize: add fib expression support
optimize: add binop expression support
optimize: add numgen expression support
optimize: add hash expression support
optimize: add unsupported statement
tests: shell: run -c -o on ruleset
optimize: only merge OP_IMPLICIT and OP_EQ relational
optimize: assume verdict is same when rules have no verdict
optimize: limit statement is not supported yet
libnftables: release top level scope

 src/libnftables.c                             |   2 +
 src/optimize.c                                | 205 ++++++++++++++----
 .../optimizations/dumps/merge_reject.nft      |  13 ++
 .../optimizations/dumps/skip_merge.nft        |  23 ++
 .../optimizations/dumps/skip_non_eq.nft       |   6 +
 .../optimizations/dumps/skip_unsupported.nft  |   7 +
 .../testcases/optimizations/merge_reject      |  26 +++
 .../shell/testcases/optimizations/merge_stmts |   6 +-
 tests/shell/testcases/optimizations/ruleset   | 168 ++++++++++++++
 .../shell/testcases/optimizations/skip_merge  |  34 +++
 .../shell/testcases/optimizations/skip_non_eq |  12 +
 .../testcases/optimizations/skip_unsupported  |  14 ++
 tests/shell/testcases/optimizations/variables |  15 ++
 13 files changed, 488 insertions(+), 43 deletions(-)
 create mode 100644 tests/shell/testcases/optimizations/dumps/merge_reject.nft
 create mode 100644 tests/shell/testcases/optimizations/dumps/skip_merge.nft
 create mode 100644 tests/shell/testcases/optimizations/dumps/skip_non_eq.nft
 create mode 100644 tests/shell/testcases/optimizations/dumps/skip_unsupported.nft
 create mode 100755 tests/shell/testcases/optimizations/merge_reject
 create mode 100755 tests/shell/testcases/optimizations/ruleset
 create mode 100755 tests/shell/testcases/optimizations/skip_merge
 create mode 100755 tests/shell/testcases/optimizations/skip_non_eq
 create mode 100755 tests/shell/testcases/optimizations/skip_unsupported
 create mode 100755 tests/shell/testcases/optimizations/variables
Signature · 1 line
2.30.2