optimize: expand implicit set element when merging into concatenation
Pablo Neira Ayuso
maintainerPATCH v2 1/1 optimize: expand implicit set element when merging into concatenation
Generalize the existing code to deal with implicit sets. When merging a ruleset like the following:
udp dport 128 iifname "foo" #1
udp dport { 67, 123 } iifname "bar" #2into a concatenation of statements, the following expansion need to be done for rule #2:
67 . "bar" 123 . "bar"
The expansion logic consists of cloning the existing concatenation being built and then append each element in the implicit set. A list of ongoing concatenations being built is maintained, so further expansions are also supported.
Extend test to cover for this use-case.
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: cover EXPR_VALUE case too to remedy a tests/shell assertion being reported.
Now all tests/shell pass successfully.
src/optimize.c | 62 ++++++++++++++++--- .../dumps/merge_stmts_concat.nft | 12 ++++ .../optimizations/merge_stmts_concat | 19 ++++++ 3 files changed, 83 insertions(+), 10 deletions(-)
src/optimize.c +52 -10
@@ -550,12 +550,60 @@ static void merge_stmts(const struct optimize_ctx *ctx, } } +static void __merge_concat_stmts (const struct optimize_ctx *ctx,uint32_t i, +const struct merge *merge,struct expr *set) +{ +struct expr *concat, *next, *expr, *concat_clone, *clone, *elem; +LIST_HEAD (pending_list); +LIST_HEAD (concat_list); +struct stmt *stmt_a; +uint32_t k; + + concat =concat_expr_alloc (&internal_location); +list_add (&concat->list, &concat_list); + +for (k =0 ; k < merge->num_stmts; k++) { +list_for_each_entry_safe (concat, next, &concat_list, list) { + stmt_a = ctx->stmt_matrix[i][merge->stmt[k]]; +switch (stmt_a->expr->right->etype) { +case EXPR_SET : +list_for_each_entry (expr, &stmt_a->expr->right->expressions, list) { + concat_clone =expr_clone (concat); + clone =expr_clone (expr->key); +compound_expr_add (concat_clone, clone); +list_add_tail (&concat_clone->list, &pending_list); + } +list_del (&concat->list); +expr_free (concat); +break ; +case EXPR_SYMBOL : +case EXPR_VALUE : + clone =expr_clone (stmt_a->expr->right); +compound_expr_add (concat, clone); +break ; +default : +assert (0 ); +break ; + } + } +list_splice_init (&pending_list, &concat_list); + } + +list_for_each_entry_safe (concat, next, &concat_list, list) { +list_del (&concat->list); + elem =set_elem_expr_alloc (&internal_location, concat); +compound_expr_add (set, elem); + } +} +static void merge_concat_stmts (const struct optimize_ctx *ctx,uint32_t from,uint32_t to,const struct merge *merge) { -struct expr *concat, *elem, *set;struct stmt *stmt, *stmt_a; +struct expr *concat, *set; +LIST_HEAD (pending_list); +LIST_HEAD (concat_list);uint32_t i, k; stmt = ctx->stmt_matrix[from][merge->stmt[0 ]];
@@ -573,15 +621,9 @@ static void merge_concat_stmts(const struct optimize_ctx *ctx, set =set_expr_alloc (&internal_location,NULL ); set->set_flags |=NFT_SET_ANONYMOUS ; -for (i = from; i <= to; i++) { - concat =concat_expr_alloc (&internal_location); -for (k =0 ; k < merge->num_stmts; k++) { - stmt_a = ctx->stmt_matrix[i][merge->stmt[k]]; -compound_expr_add (concat,expr_get (stmt_a->expr->right)); - } - elem =set_elem_expr_alloc (&internal_location, concat); -compound_expr_add (set, elem); - } +for (i = from; i <= to; i++) +__merge_concat_stmts (ctx, i, merge, set); +expr_free (stmt->expr->right); stmt->expr->right = set;
tests/shell/testcases/optimizations/dumps/merge_stmts_concat.nft +12 -0
@@ -3,4 +3,16 @@ table ip x { 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 } } + + chain c1 { + udp dport . iifname { 51820 . "foo", 514 . "bar", 67 . "bar" } accept + } + + chain c2 { + udp dport . iifname { 100 . "foo", 51820 . "foo", 514 . "bar", 67 . "bar" } accept + } + + chain c3 { + udp dport . iifname { 100 . "foo", 51820 . "foo", 514 . "bar", 67 . "bar", 100 . "test", 51820 . "test" } accept + } }
tests/shell/testcases/optimizations/merge_stmts_concat +19 -0
@@ -12,3 +12,22 @@ RULESET="table ip x { }" $NFT -o -f - <<< $RULESET + +RULESET="table ip x { + chain c1 { + udp dport 51820 iifname "foo" accept + udp dport { 67, 514 } iifname "bar" accept + } + + chain c2 { + udp dport { 51820, 100 } iifname "foo" accept + udp dport { 67, 514 } iifname "bar" accept + } + + chain c3 { + udp dport { 51820, 100 } iifname { "foo", "test" } accept + udp dport { 67, 514 } iifname "bar" accept + } +}" + +$NFT -o -f - <<< $RULESET
Signature · 1 line
2.30.2