--optimize fixes
Pablo Neira Ayuso
maintainercover --optimize fixes
Hi,
Two more fixes for the -o/--optimize infrastructure, reported by users after the release:
1) do not hit assert() when concatenation already exists in the ruleset.
2) do not merge rules unless they contain at least one mergeable statement.
Both patches come with tests to illustrate the issues.
Pablo Neira Ayuso (2):
optimize: merging concatenation is unsupported
optimize: check for mergeable rules
src/optimize.c | 32 ++++++++++++++++++- .../dumps/merge_stmts_concat.nft | 1 + .../optimizations/dumps/not_mergeable.nft | 12 +++++++ .../optimizations/merge_stmts_concat | 1 + .../testcases/optimizations/not_mergeable | 16 ++++++++++ 5 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 tests/shell/testcases/optimizations/dumps/not_mergeable.nft create mode 100755 tests/shell/testcases/optimizations/not_mergeable
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 1/2 optimize: merging concatenation is unsupported
Existing concatenation cannot be merge at this stage, skip them otherwise this assertion is hit:
nft: optimize.c:434: rule_build_stmt_matrix_stmts: Assertion `k >= 0' failed
Extend existing test to cover this.
--- src/optimize.c | 4 ++++ .../testcases/optimizations/dumps/merge_stmts_concat.nft | 1 + tests/shell/testcases/optimizations/merge_stmts_concat | 1 + 3 files changed, 6 insertions(+)
src/optimize.c +4 -0
@@ -352,6 +352,10 @@ static int rule_collect_stmts(struct optimize_ctx *ctx, struct rule *rule) clone->ops = &unsupported_stmt_ops;break ; } +if (stmt->expr->left->etype ==EXPR_CONCAT ) { + clone->ops = &unsupported_stmt_ops; +break ; + }case STMT_VERDICT : clone->expr =expr_get (stmt->expr);break ;
tests/shell/testcases/optimizations/dumps/merge_stmts_concat.nft +1 -0
@@ -1,5 +1,6 @@ table ip x { chain y { iifname . ip saddr . ip daddr { "eth1" . 1.1.1.1 . 2.2.2.3, "eth1" . 1.1.1.2 . 2.2.2.4, "eth2" . 1.1.1.3 . 2.2.2.5 } accept + ip protocol . th dport { tcp . 22, udp . 67 } } }
tests/shell/testcases/optimizations/merge_stmts_concat +1 -0
@@ -7,6 +7,7 @@ RULESET="table ip x { 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.4 accept meta iifname eth2 ip saddr 1.1.1.3 ip daddr 2.2.2.5 accept + ip protocol . th dport { tcp . 22, udp . 67 } } }"
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/2 optimize: check for mergeable rules
In reply to Pablo Neira AyusoRules that are equal need to have at least one mergeable statement.
--- src/optimize.c | 28 ++++++++++++++++++- .../optimizations/dumps/not_mergeable.nft | 12 ++++++++ .../testcases/optimizations/not_mergeable | 16 +++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 tests/shell/testcases/optimizations/dumps/not_mergeable.nft create mode 100755 tests/shell/testcases/optimizations/not_mergeable
src/optimize.c +27 -1
@@ -1011,15 +1011,41 @@ static bool stmt_type_eq(const struct stmt *stmt_a, const struct stmt *stmt_b)return __stmt_type_eq (stmt_a, stmt_b, true); } +static bool stmt_is_mergeable (const struct stmt *stmt) +{ +if (!stmt) +return false; + +switch (stmt->ops->type) { +case STMT_VERDICT : +if (stmt->expr->etype ==EXPR_MAP ) +return true; +break ; +case STMT_EXPRESSION : +case STMT_NAT : +return true; +default : +break ; + } + +return false; +} +static bool rules_eq (const struct optimize_ctx *ctx,int i,int j) { -uint32_t k; +uint32_t k, mergeable =0 ;for (k =0 ; k < ctx->num_stmts; k++) { +if (stmt_is_mergeable (ctx->stmt_matrix[i][k])) + mergeable++; +if (!stmt_type_eq (ctx->stmt_matrix[i][k], ctx->stmt_matrix[j][k]))return false; } +if (mergeable ==0 ) +return false; +return true; }
tests/shell/testcases/optimizations/dumps/not_mergeable.nft new file +12 -0
@@ -0,0 +1,12 @@ +table ip x { + chain t1 { + } + + chain t2 { + } + + chain y { + counter packets 0 bytes 0 jump t1 + counter packets 0 bytes 0 jump t2 + } +}
tests/shell/testcases/optimizations/not_mergeable new file +16 -0
@@ -0,0 +1,16 @@ +#!/bin/bash + +set -e + +RULESET="table ip x { + chain t1 { + } + chain t2 { + } + chain y { + counter jump t1 + counter jump t2 + } +}" + +$NFT -o -f - <<< $RULESET
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerQuoted 9 lines · Pablo Neira Ayuso
Hi,
Two more fixes for the -o/--optimize infrastructure, reported by users after the release:
1) do not hit
assert()when concatenation already exists in the ruleset.
2) do not merge rules unless they contain at least one mergeable statement.Both patches come with tests to illustrate the issues.
I have pushed out these fixes.