Skip to content

ruleset optimization infrastructure

Pablo Neira Ayuso netfilter-devel 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest7 patches 3 repliesIn review
  2. v13 patches 2 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7erec: expose print_location() and line_location()include/erec.h include/rule.h src/erec.c+56 -310 replies
2/7src: error reporting with -f and read from stdininclude/nftables.h src/erec.c src/libnftables.c +1 more+54 -60 replies
3/7src: remove '$' in symbol_expr_printsrc/expression.c+1 -20 replies
4/7src: add ruleset optimization infrastructuredoc/nft.txt include/nftables.h include/nftables/libnftables.h +7 more+581 -110 replies
5/7optimize: merge rules with same selectors into a concatenationsrc/optimize.c tests/shell/testcases/optimizations/dumps/merge_stmts_concat.nft tests/shell/testcases/optimizations/merge_stmts_concat+61 -10 replies
6/7optimize: merge same selector with different verdict into verdict mapsrc/optimize.c tests/shell/testcases/optimizations/dumps/merge_stmts_vmap.nft tests/shell/testcases/optimizations/merge_stmts_vmap+164 -150 replies
7/7optimize: merge several selectors with different verdict into verdict mapsrc/expression.c src/optimize.c tests/shell/testcases/optimizations/dumps/merge_stmts_concat_vmap.nft +1 more+102 -30 replies

Reviews trailers per patch

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

Read the v2 thread

Cover letter [PATCH nftables,v2 0/7] ruleset optimization infrastructure

Hi,

This patchset adds a new -o/--optimize option to enable ruleset optimization. Two type of optimizations are supported in this batch:

* Use a set to compact several rules with the same selector using a set, for example:

      meta iifname eth1 ip saddr 1.1.1.1 ip daddr 2.2.2.3 accept
      meta iifname eth1 ip saddr 1.1.1.2 ip daddr 2.2.2.5 accept
      meta iifname eth2 ip saddr 1.1.1.3 ip daddr 2.2.2.6 accept

into:

      meta iifname . ip saddr . ip daddr { eth1 . 1.1.1.1 . 2.2.2.6, eth1 . 1.1.1.2 . 2.2.2.5 , eth1 . 1.1.1.3 . 2.2.2.6 } accept

* Use a verdict map to compact rules with same selectors but different verdicts, for example:

      ip saddr 1.1.1.1 ip daddr 2.2.2.2 accept
      ip saddr 2.2.2.2 ip daddr 3.3.3.3 drop

into:

      ip saddr . ip daddr vmap { 1.1.1.1 . 2.2.2.2 : accept, 2.2.2.2 . 3.3.3.3 : drop }

Updates since last patch series:

- display information on the rule merges that are proposed, this can be combined with -c to inspect the proposed ruleset updates.

  # nft -c -o -f ruleset.nft

This allows sysadmins to review the proposed optimization without actually loading the ruleset, in case they prefer to manually edit their rulesets to apply the proposed optimizations (requested by Arturo).

- tests/py and tests/shell run fine after this new iteration.

- fix error reporting with /dev/stdin, which is a prerequisite for this series.

- fixes.

Pablo Neira Ayuso (7):
erec: expose print_location() and line_location()
src: error reporting with -f and read from stdin
src: remove '$' in symbol_expr_print
src: add ruleset optimization infrastructure
optimize: merge rules with same selectors into a concatenation
optimize: merge same selector with different verdict into verdict map
optimize: merge several selectors with different verdict into verdict map

 doc/nft.txt                                   |   5 +
 include/erec.h                                |   5 +
 include/nftables.h                            |   5 +
 include/nftables/libnftables.h                |   7 +
 include/rule.h                                |   1 -
 src/Makefile.am                               |   1 +
 src/erec.c                                    |  87 ++-
 src/expression.c                              |  33 +-
 src/libnftables.c                             | 109 ++-
 src/libnftables.map                           |   5 +
 src/main.c                                    |   9 +-
 src/optimize.c                                | 698 ++++++++++++++++++
 src/scanner.l                                 |   2 +-
 .../optimizations/dumps/merge_stmts.nft       |   5 +
 .../dumps/merge_stmts_concat.nft              |   5 +
 .../dumps/merge_stmts_concat_vmap.nft         |   5 +
 .../optimizations/dumps/merge_stmts_vmap.nft  |   5 +
 .../shell/testcases/optimizations/merge_stmts |  13 +
 .../optimizations/merge_stmts_concat          |  13 +
 .../optimizations/merge_stmts_concat_vmap     |  13 +
 .../testcases/optimizations/merge_stmts_vmap  |  12 +
 21 files changed, 992 insertions(+), 46 deletions(-)
 create mode 100644 src/optimize.c
 create mode 100644 tests/shell/testcases/optimizations/dumps/merge_stmts.nft
 create mode 100644 tests/shell/testcases/optimizations/dumps/merge_stmts_concat.nft
 create mode 100644 tests/shell/testcases/optimizations/dumps/merge_stmts_concat_vmap.nft
 create mode 100644 tests/shell/testcases/optimizations/dumps/merge_stmts_vmap.nft
 create mode 100755 tests/shell/testcases/optimizations/merge_stmts
 create mode 100755 tests/shell/testcases/optimizations/merge_stmts_concat
 create mode 100755 tests/shell/testcases/optimizations/merge_stmts_concat_vmap
 create mode 100755 tests/shell/testcases/optimizations/merge_stmts_vmap