diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2020-07-28 17:57:20 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2020-07-29 23:40:58 +0200 |
| commit | ac4b25b3ca045fbbed86773a91da52d9d7ee3091 (patch) | |
| tree | 57024629c8e76a4ce911c84a0a209c3332cef2ff /include | |
| parent | 8eece29518257536711657c42047f14e22a7e8f2 (diff) | |
src: remove cache lookups after the evaluation phase
This patch adds a new field to the cmd structure for elements to store a
reference to the set. This saves an extra lookup in the netlink bytecode
generation step.
This patch also allows to incrementally update during the evaluation
phase according to the command actions, which is required by the follow
up ("evaluate: remove table from cache on delete table") bugfix patch.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/expression.h | 2 | ||||
| -rw-r--r-- | include/netlink.h | 2 | ||||
| -rw-r--r-- | include/rule.h | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/include/expression.h b/include/expression.h index 0210a3cb..130912a8 100644 --- a/include/expression.h +++ b/include/expression.h @@ -479,7 +479,7 @@ extern void interval_map_decompose(struct expr *set); extern struct expr *get_set_intervals(const struct set *set, const struct expr *init); struct table; -extern int get_set_decompose(struct table *table, struct set *set); +extern int get_set_decompose(struct set *cache_set, struct set *set); extern struct expr *mapping_expr_alloc(const struct location *loc, struct expr *from, struct expr *to); diff --git a/include/netlink.h b/include/netlink.h index 14fcec16..1077096e 100644 --- a/include/netlink.h +++ b/include/netlink.h @@ -149,7 +149,7 @@ extern struct stmt *netlink_parse_set_expr(const struct set *set, extern int netlink_list_setelems(struct netlink_ctx *ctx, const struct handle *h, struct set *set); extern int netlink_get_setelem(struct netlink_ctx *ctx, const struct handle *h, - const struct location *loc, struct table *table, + const struct location *loc, struct set *cache_set, struct set *set, struct expr *init); extern int netlink_delinearize_setelem(struct nftnl_set_elem *nlse, struct set *set, diff --git a/include/rule.h b/include/rule.h index 4de7a0d9..60eadfa3 100644 --- a/include/rule.h +++ b/include/rule.h @@ -683,6 +683,10 @@ struct cmd { void *data; struct expr *expr; struct set *set; + struct { + struct expr *expr; /* same offset as cmd->expr */ + struct set *set; + } elem; struct rule *rule; struct chain *chain; struct table *table; |