cache updates
Pablo Neira Ayuso
maintainercover cache updates
Hi,
This batch contains updates for the cache infrastructure:
Patch #1 improves integration with objects and the existing netlink
dump filtering infrastructure.
Patch #2 updates rule dump per table, to avoid refetching rules
several times.
Patch #3 updates reset command to use the cache infrastructure.
Patch #4 and #5 extends test coverage.
Pablo Neira Ayuso (5):
cache: add filtering support for objects
cache: only dump rules for the given table
cache: consolidate reset command
tests: shell: cover anonymous set with reset command
tests: shell: cover reset command with counter and quota
include/cache.h | 12 +- include/netlink.h | 5 - src/cache.c | 165 ++++++++++++++---- src/evaluate.c | 2 + src/mnl.c | 7 +- src/netlink.c | 78 --------- src/parser_bison.y | 8 +- src/rule.c | 48 +---- tests/shell/testcases/listing/reset_objects | 104 +++++++++++ .../testcases/rule_management/0011reset_0 | 31 +++- 10 files changed, 283 insertions(+), 177 deletions(-) create mode 100755 tests/shell/testcases/listing/reset_objects
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 1/5 cache: add filtering support for objects
Currently, full ruleset flag is set on to fetch objects.
Follow a similar approach to these patches from Phil:
de961b930660 ("cache: Filter set list on server side") and cb4b07d0b628 ("cache: Support filtering for a specific flowtable")
in preparation to update the reset command to use the cache infrastructure.
--- include/cache.h | 2 + src/cache.c | 100 +++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 89 insertions(+), 13 deletions(-)
include/cache.h +2 -0
@@ -54,8 +54,10 @@ struct nft_cache_filter {uint32_t family;const char *table;const char *chain; +const char *obj;const char *set;const char *ft; +int obj_type;uint64_t rule_handle; } list;
src/cache.c +87 -13
162 lines not on this page · raw message
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/5 cache: only dump rules for the given table
In reply to Pablo Neira AyusoOnly family is set on in the dump request, set on table and chain otherwise, rules for the given family are fetched for each existing table.
--- src/cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
src/cache.c +1 -1
@@ -688,7 +688,7 @@ int rule_cache_dump(struct netlink_ctx *ctx, const struct handle *h, bool dump, bool reset) {struct nftnl_rule_list *rule_cache; -const char *table =NULL ; +const char *table = h->table.name;const char *chain =NULL ;uint64_t rule_handle =0 ;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 3/5 cache: consolidate reset command
In reply to Pablo Neira AyusoReset command does not utilize the cache infrastructure.
This implicitly fixes a crash with anonymous sets because elements are not fetched. I initially tried to fix it by toggling the missing cache flags, but then ASAN reports memleaks.
To address these issues relies on Phil's list filtering infrastructure which updates is expanded to accomodate filtering requirements of the reset commands, such as 'reset table ip' where only the family is sent to the kernel.
After this update, tests/shell reports a few inconsistencies between reset and list commands:
- reset rules chain t c2
display sets, but it should only list the given chain.
- reset rules table t
reset rules ip
do not list elements in the set. In both cases, these are fully listing a given table and family, elements should be included.
The consolidation also ensures list and reset will not differ.
A few more notes:
- CMD_OBJ_TABLE is used for:
rules family table
from the parser, due to the lack of a better enum, same applies to CMD_OBJ_CHAIN.
- CMD_OBJ_ELEMENTS still does not use the cache, but same occurs in the CMD_GET command case which needs to be consolidated.
--- include/cache.h | 10 ++- include/netlink.h | 5 -- src/cache.c | 65 ++++++++++++---- src/evaluate.c | 2 + src/mnl.c | 7 +- src/netlink.c | 78 ------------------- src/parser_bison.y | 8 +- src/rule.c | 48 +----------- .../testcases/rule_management/0011reset_0 | 10 +-- 9 files changed, 69 insertions(+), 164 deletions(-)
include/cache.h +6 -4
@@ -64,6 +64,12 @@ struct nft_cache_filter {struct {struct list_head head; } obj[NFT_CACHE_HSIZE ]; + +struct { +bool obj; +bool rule; +bool elem; + } reset; };struct nft_cache ;
@@ -149,8 +155,4 @@ struct netlink_ctx;void nft_chain_cache_update (struct netlink_ctx *ctx,struct table *table,const char *chain); -int rule_cache_dump (struct netlink_ctx *ctx,const struct handle *h, -const struct nft_cache_filter *filter, -bool dump,bool reset); -#endif /* _NFT_CACHE_H_ */
include/netlink.h +0 -5
@@ -176,8 +176,6 @@ extern int netlink_delinearize_setelem(struct nftnl_set_elem *nlse, struct nft_cache *cache);extern int netlink_list_objs (struct netlink_ctx *ctx,const struct handle *h); -extern int netlink_reset_objs (struct netlink_ctx *ctx,const struct cmd *cmd, -uint32_t type,bool dump);extern struct obj *netlink_delinearize_obj (struct netlink_ctx *ctx,struct nftnl_obj *nlo);
@@ -186,9 +184,6 @@ extern int netlink_list_flowtables(struct netlink_ctx *ctx,extern struct flowtable *netlink_delinearize_flowtable (struct netlink_ctx *ctx,struct nftnl_flowtable *nlo); -extern int netlink_reset_rules (struct netlink_ctx *ctx,const struct cmd *cmd, -bool dump); -extern void netlink_dump_chain (const struct nftnl_chain *nlc,struct netlink_ctx *ctx); extern void netlink_dump_rule(const struct nftnl_rule *nlr,
src/cache.c +48 -17
122 lines not on this page · raw message
src/evaluate.c +2 -0
@@ -5848,6 +5848,8 @@ static int cmd_evaluate_reset(struct eval_ctx *ctx, struct cmd *cmd)return 0 ;case CMD_OBJ_ELEMENTS :return setelem_evaluate (ctx, cmd); +case CMD_OBJ_TABLE : +case CMD_OBJ_CHAIN :case CMD_OBJ_SET :case CMD_OBJ_MAP :return cmd_evaluate_list (ctx, cmd);
src/mnl.c +5 -2
@@ -1163,8 +1163,11 @@ struct nftnl_table_list *mnl_nft_table_dump(struct netlink_ctx *ctx,if (!nlt)memory_allocation_error (); -nftnl_table_set_u32 (nlt,NFTNL_TABLE_FAMILY , family); -nftnl_table_set_str (nlt,NFTNL_TABLE_NAME , table); +if (family !=NFPROTO_UNSPEC ) +nftnl_table_set_u32 (nlt,NFTNL_TABLE_FAMILY , family); +if (table) +nftnl_table_set_str (nlt,NFTNL_TABLE_NAME , table); + flags =NLM_F_ACK ; }
src/netlink.c +0 -78
84 lines not on this page · raw message
src/parser_bison.y +4 -4
@@ -1757,21 +1757,21 @@ reset_cmd : COUNTERS ruleset_spec } | RULES table_spec { - $$ = cmd_alloc(CMD_RESET, CMD_OBJ_RULES, &$2, &@$, NULL); + $$ = cmd_alloc(CMD_RESET, CMD_OBJ_TABLE, &$2, &@$, NULL); } | RULES TABLE table_spec { /* alias of previous rule. */ - $$ = cmd_alloc(CMD_RESET, CMD_OBJ_RULES, &$3, &@$, NULL); + $$ = cmd_alloc(CMD_RESET, CMD_OBJ_TABLE, &$3, &@$, NULL); } | RULES chain_spec { - $$ = cmd_alloc(CMD_RESET, CMD_OBJ_RULES, &$2, &@$, NULL); + $$ = cmd_alloc(CMD_RESET, CMD_OBJ_CHAIN, &$2, &@$, NULL); } | RULES CHAIN chain_spec { /* alias of previous rule. */ - $$ = cmd_alloc(CMD_RESET, CMD_OBJ_RULES, &$3, &@$, NULL); + $$ = cmd_alloc(CMD_RESET, CMD_OBJ_CHAIN, &$3, &@$, NULL); } | RULE ruleid_spec {
src/rule.c +1 -47
59 lines not on this page · raw message
tests/shell/testcases/rule_management/0011reset_0 +3 -7
@@ -74,13 +74,6 @@ $DIFF -u <(echo "$EXPECT") <($NFT list ruleset) echo "resetting specific chain" EXPECT='table ip t { - set s { - type ipv4_addr - size 65535 - flags dynamic - counter - } - chain c2 { counter packets 3 bytes 13 accept counter packets 4 bytes 14 drop
@@ -95,6 +88,7 @@ EXPECT='table ip t { size 65535 flags dynamic counter + elements = { 1.1.1.1 counter packets 1 bytes 11 } } chain c {
@@ -116,6 +110,7 @@ EXPECT='table ip t { size 65535 flags dynamic counter + elements = { 1.1.1.1 counter packets 1 bytes 11 } } chain c {
@@ -143,6 +138,7 @@ EXPECT='table ip t { size 65535 flags dynamic counter + elements = { 1.1.1.1 counter packets 1 bytes 11 } } chain c {
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 4/5 tests: shell: cover anonymous set with reset command
In reply to Pablo Neira AyusoExtend existing test to reset counters for rules with anonymous set.
--- .../testcases/rule_management/0011reset_0 | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+)
tests/shell/testcases/rule_management/0011reset_0 +21 -0
@@ -4,6 +4,27 @@ set -e +echo "loading ruleset with anonymous set" +$NFT -f - <<EOF +table t { + chain dns-nat-pre { + type nat hook prerouting priority filter; policy accept; + meta l4proto { tcp, udp } th dport 53 ip saddr 10.24.0.0/24 ip daddr != 10.25.0.1 counter packets 1000 bytes 1000 dnat to 10.25.0.1 + } +} +EOF + +echo "resetting ruleset with anonymous set" +$NFT reset rules +EXPECT='table ip t { + chain dns-nat-pre { + type nat hook prerouting priority filter; policy accept; + meta l4proto { tcp, udp } th dport 53 ip saddr 10.24.0.0/24 ip daddr != 10.25.0.1 counter packets 0 bytes 0 dnat to 10.25.0.1 + } +}' +$DIFF -u <(echo "$EXPECT") <($NFT list ruleset) +$NFT flush ruleset + echo "loading ruleset" $NFT -f - <<EOF table ip t {
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 5/5 tests: shell: cover reset command with counter and quota
In reply to Pablo Neira Ayuso--- tests/shell/testcases/listing/reset_objects | 104 ++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100755 tests/shell/testcases/listing/reset_objects
tests/shell/testcases/listing/reset_objects new file +104 -0
@@ -0,0 +1,104 @@ +#!/bin/bash + +set -e + +load_ruleset() +{ + $NFT -f - <<EOF +table ip test { + quota https-quota { + 25 mbytes used 10 mbytes + } + counter https-counter { + packets 10 bytes 4096 + } +} +EOF +} + +check_list_quota() +{ + EXPECT="table ip test { + quota https-quota { + 25 mbytes + } +}" + $DIFF -u <(echo "$EXPECT") <($NFT list quotas) +} + +check_list_counter() +{ + EXPECT="table ip test { + counter https-counter { + packets 0 bytes 0 + } +}" + $DIFF -u <(echo "$EXPECT") <($NFT list counters) +} + +load_ruleset + +EXPECT="table ip test { + quota https-quota { + 25 mbytes used 10 mbytes + } +}" +$DIFF -u <(echo "$EXPECT") <($NFT reset quotas) + +check_list_quota +$NFT flush ruleset +load_ruleset + +EXPECT="table ip test { + quota https-quota { + 25 mbytes used 10 mbytes + } +}" +$DIFF -u <(echo "$EXPECT") <($NFT reset quotas ip) + +check_list_quota +$NFT flush ruleset +load_ruleset + +EXPECT="table ip test { + quota https-quota { + 25 mbytes used 10 mbytes + } +}" +$DIFF -u <(echo "$EXPECT") <($NFT reset quota ip test https-quota) + +check_list_quota +$NFT flush ruleset +load_ruleset + +EXPECT="table ip test { + counter https-counter { + packets 10 bytes 4096 + } +}" +$DIFF -u <(echo "$EXPECT") <($NFT reset counters) + +check_list_counter +$NFT flush ruleset +load_ruleset + +EXPECT="table ip test { + counter https-counter { + packets 10 bytes 4096 + } +}" +$DIFF -u <(echo "$EXPECT") <($NFT reset counters ip) + +check_list_counter +$NFT flush ruleset +load_ruleset + +EXPECT="table ip test { + counter https-counter { + packets 10 bytes 4096 + } +}" +$DIFF -u <(echo "$EXPECT") <($NFT reset counter ip test https-counter) + +check_list_counter +$NFT flush ruleset
Signature · 1 line
2.30.2