evaluate: simplify set to list normalisation for device expressions
Pablo Neira Ayuso
maintainerPATCH 1/2 evaluate: simplify set to list normalisation for device expressions
When evaluating the list of devices, two expressions are possible:
- EXPR_LIST, which is the expected expression type to store the list of chain/flowtable devices.
- EXPR_SET, in case that a variable is used to express the device list. This is because it is not possible to know if the variable defines set elements or devices. Since sets are more common, EXPR_SET is used.
In the latter case, this list expressed as EXPR_SET gets translated to EXPR_LIST. Before such translation, the EXPR_VARIABLE is evaluated, therefore all variables are gone and only EXPR_SET_ELEM are possible in expr_set_to_list().
Remove the EXPR_VALUE and EXPR_VARIABLE cases in expr_set_to_list() since those are never seen. Add BUG() in case any other expressions than EXPR_SET_ELEM is seen.
---
This can be postponed after 1.1.5 including the JSON regression fix is released.
src/evaluate.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
src/evaluate.c +1 -15
@@ -5460,27 +5460,13 @@ static struct expr *expr_set_to_list(struct eval_ctx *ctx, struct expr *dev_exprlist_del (&expr->list);switch (expr->etype) { -case EXPR_VARIABLE : -expr_set_context (&ctx->ectx, &ifname_type, -IFNAMSIZ *BITS_PER_BYTE ); -if (!evaluate_expr_variable (ctx, &expr)) -return false; - -if (expr->etype ==EXPR_SET ) { - expr =expr_set_to_list (ctx, expr); -list_splice_init (&expr_list (expr)->expressions, &tmp); -expr_free (expr); -continue ; - } -break ;case EXPR_SET_ELEM : key =expr_clone (expr->key);expr_free (expr); expr = key;break ; -case EXPR_VALUE : -break ;default : +BUG ("invalid expression type %s\n" ,expr_name (expr));break ; }
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/2 tests: shell: combine flowtable devices with variable expression
Expand test with flowtable devices defined with variables to improve coverage.
--- .../flowtable/0012flowtable_variable_0 | 34 ++++++++++++++++++ .../dumps/0012flowtable_variable_0.json-nft | 36 +++++++++++++++++++ .../dumps/0012flowtable_variable_0.nft | 14 ++++++++ 3 files changed, 84 insertions(+)
tests/shell/testcases/flowtable/0012flowtable_variable_0 +34 -0
@@ -9,14 +9,20 @@ ft_deldev() { } iface_cleanup() { + ip link del dummy0 &>/dev/null || : ip link del dummy1 &>/dev/null || : if [ "$NFT_TEST_HAVE_ifname_based_hooks" = y ]; then ft_deldev filter1 Main_ft1 dummy1 ft_deldev filter2 Main_ft2 dummy1 + ft_deldev filter3 Main_ft3 dummy0 + ft_deldev filter3 Main_ft3 dummy1 + ft_deldev filter4 Main_ft4 dummy0 + ft_deldev filter4 Main_ft4 dummy1 fi } trap 'iface_cleanup' EXIT +ip link add name dummy0 type dummy ip link add name dummy1 type dummy EXPECTED="define if_main = { lo, dummy1 }
@@ -42,3 +48,31 @@ table filter2 { }" $NFT -f - <<< $EXPECTED + +RULESET="define var1 = \"dummy0\" +define var2 = { dummy1 } +define var3 = { lo, \$var1, \$var2 } + +table filter3 { + flowtable Main_ft3 { + hook ingress priority filter + counter + devices = { \$var3 } + } +}" + +$NFT -f - <<< $RULESET + +RULESET="define var1 = \"dummy0\" +define var2 = { dummy1 } +define var3 = { lo, \$var1, \$var2 } + +table filter4 { + flowtable Main_ft4 { + hook ingress priority filter + counter + devices = \$var3 + } +}" + +$NFT -f - <<< $RULESET
tests/shell/testcases/flowtable/dumps/0012flowtable_variable_0.json-nft +36 -0
@@ -42,6 +42,42 @@ "prio": 0, "dev": "lo" } + }, + { + "table": { + "family": "ip", + "name": "filter3", + "handle": 0 + } + }, + { + "flowtable": { + "family": "ip", + "name": "Main_ft3", + "table": "filter3", + "handle": 0, + "hook": "ingress", + "prio": 0, + "dev": "lo" + } + }, + { + "table": { + "family": "ip", + "name": "filter4", + "handle": 0 + } + }, + { + "flowtable": { + "family": "ip", + "name": "Main_ft4", + "table": "filter4", + "handle": 0, + "hook": "ingress", + "prio": 0, + "dev": "lo" + } } ] }
tests/shell/testcases/flowtable/dumps/0012flowtable_variable_0.nft +14 -0
@@ -12,3 +12,17 @@ table ip filter2 { counter } } +table ip filter3 { + flowtable Main_ft3 { + hook ingress priority filter + devices = { "lo" } + counter + } +} +table ip filter4 { + flowtable Main_ft4 { + hook ingress priority filter + devices = { "lo" } + counter + } +}
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerQuoted 9 lines · Pablo Neira Ayuso
When evaluating the list of devices, two expressions are possible:
-
EXPR_LIST, which is the expected expression type to store the list of chain/flowtable devices.-
EXPR_SET, in case that a variable is used to express the device list. This is because it is not possible to know if the variable defines set elements or devices. Since sets are more common,EXPR_SETis used.
Quoted 8 lines
In the latter case, this list expressed as
EXPR_SETgets translated toEXPR_LIST. Before such translation, theEXPR_VARIABLEis evaluated, therefore all variables are gone and onlyEXPR_SET_ELEMare possible inexpr_set_to_list().Remove the
EXPR_VALUEandEXPR_VARIABLEcases inexpr_set_to_list()since those are never seen. AddBUG()in case any other expressions thanEXPR_SET_ELEMis seen.
Applied this series too.