src: single cache_update() call to build cache before evaluation
Pablo Neira Ayuso
maintainerPATCH v2 4/4 src: single cache_update() call to build cache before evaluation
This patch allows us to make one single cache_update() call. Thus, there is not need to rebuild an incomplete cache from the middle of the batch processing.
Note that nft_run_cmd_from_filename() does not need a full netlink dump to build the cache anymore, this should speed nft -f with incremental updates and very large rulesets.
cache_evaluate() calculates the netlink dump to populate the cache that this batch needs.
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: Use max() approach per Phil.
Note: still handle_merge() to fix index, we can investigate this and amend
it in a follow up patch.
include/rule.h | 1 + src/Makefile.am | 1 + src/cache.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/evaluate.c | 76 +------------------------------ src/libnftables.c | 9 ++-- src/mnl.c | 8 +--- src/rule.c | 18 +------- 7 files changed, 144 insertions(+), 102 deletions(-) create mode 100644 src/cache.c
include/rule.h +1 -0
@@ -631,6 +631,7 @@ extern struct error_record *rule_postprocess(struct rule *rule);struct netlink_ctx ;extern int do_command (struct netlink_ctx *ctx,struct cmd *cmd); +extern int cache_evaluate (struct nft_ctx *nft,struct list_head *cmds);extern int cache_update (struct nft_ctx *ctx,enum cmd_ops cmd,struct list_head *msgs); extern void cache_flush(struct nft_ctx *ctx, enum cmd_ops cmd,
src/Makefile.am +1 -0
@@ -31,6 +31,7 @@ lib_LTLIBRARIES = libnftables.la libnftables_la_SOURCES = \ rule.c \ statement.c \ + cache.c \ datatype.c \ expression.c \ evaluate.c \
src/cache.c new file +133 -0
133 lines not on this page · raw message
src/evaluate.c +1 -75
185 lines not on this page · raw message
src/libnftables.c +5 -4
@@ -381,8 +381,13 @@ static int nft_parse_bison_filename(struct nft_ctx *nft, const char *filename,static int nft_evaluate (struct nft_ctx *nft,struct list_head *msgs,struct list_head *cmds) { +unsigned int completeness;struct cmd *cmd; + completeness =cache_evaluate (nft, cmds); +if (cache_update (nft, completeness, msgs) <0 ) +return -1 ; +list_for_each_entry (cmd, cmds, list) {struct eval_ctx ectx = { .nft = nft,
@@ -454,10 +459,6 @@ int nft_run_cmd_from_filename(struct nft_ctx *nft, const char *filename)LIST_HEAD (msgs);LIST_HEAD (cmds); - rc =cache_update (nft,CMD_INVALID , &msgs); -if (rc <0 ) -return -1 ; -if (!strcmp (filename,"-" )) filename ="/dev/stdin" ;
src/mnl.c +1 -7
@@ -394,15 +394,9 @@ int mnl_nft_rule_replace(struct netlink_ctx *ctx, const struct cmd *cmd)unsigned int flags =0 ;struct nftnl_rule *nlr;struct nlmsghdr *nlh; -int err; - -if (nft_output_echo (&ctx->nft->output)) { - err =cache_update (ctx->nft,CMD_INVALID , ctx->msgs); -if (err <0 ) -return err; +if (nft_output_echo (&ctx->nft->output)) flags |=NLM_F_ECHO ; - } nlr =nftnl_rule_alloc ();if (!nlr)
src/rule.c +2 -16
@@ -1501,15 +1501,8 @@ static int do_command_add(struct netlink_ctx *ctx, struct cmd *cmd, bool excl) {uint32_t flags = excl ?NLM_F_EXCL :0 ; -if (nft_output_echo (&ctx->nft->output)) { -int ret; - - ret =cache_update (ctx->nft, cmd->obj, ctx->msgs); -if (ret <0 ) -return ret; - +if (nft_output_echo (&ctx->nft->output)) flags |=NLM_F_ECHO ; - }switch (cmd->obj) {case CMD_OBJ_TABLE :
@@ -1552,15 +1545,8 @@ static int do_command_insert(struct netlink_ctx *ctx, struct cmd *cmd) {uint32_t flags =0 ; -if (nft_output_echo (&ctx->nft->output)) { -int ret; - - ret =cache_update (ctx->nft, cmd->obj, ctx->msgs); -if (ret <0 ) -return ret; - +if (nft_output_echo (&ctx->nft->output)) flags |=NLM_F_ECHO ; - }switch (cmd->obj) {case CMD_OBJ_RULE :
Signature · 1 line
2.11.0