detach concat, list and set expression layouts
Pablo Neira Ayuso
maintainercover detach concat, list and set expression layouts
Hi,
These three expressions use the same layout but they have a different purpose, it is better to split them in independent layouts.
The compound expression still remains in place, there, the initial layout to store the list of expressions and size is still in the same in these expressions.
The initial three patch address type confusions uncovered by patch 4/4 in this series.
This is implicitly reducing the size of one of the largest structs in the union area of struct expr, still EXPR_SET_ELEM remains the largest so no gain is achieved in this iteration.
Pablo Neira Ayuso (4):
evaluate: mappings require set expression
evaluate: validate set expression type before accessing flags
src: convert set to list expression
src: detach set, list and concatenation expression layout
include/expression.h | 22 ++++- src/cmd.c | 5 +- src/evaluate.c | 185 ++++++++++++++++++++++++-------------- src/expression.c | 41 ++++----- src/intervals.c | 80 ++++++++--------- src/json.c | 10 +-- src/mergesort.c | 2 +- src/mnl.c | 13 ++- src/monitor.c | 2 +- src/netlink.c | 26 +++--- src/netlink_delinearize.c | 14 +-- src/netlink_linearize.c | 2 +- src/optimize.c | 22 ++--- src/parser_bison.y | 2 +- src/parser_json.c | 5 +- src/rule.c | 4 +- src/segtree.c | 22 ++--- 17 files changed, 261 insertions(+), 196 deletions(-)
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 1/4 evaluate: mappings require set expression
While EXPR_CONCAT and EXPR_LIST share the same layout in struct expr, these expressions are not possible at this stage.
Fall back to error out with "invalid mapping expression".
--- src/evaluate.c | 2 -- 1 file changed, 2 deletions(-)
src/evaluate.c +0 -2
@@ -2211,8 +2211,6 @@ static int expr_evaluate_map(struct eval_ctx *ctx, struct expr **expr) mappings = map->mappings;switch (map->mappings->etype) { -case EXPR_CONCAT : -case EXPR_LIST :case EXPR_SET : set_flags |= mappings->set_flags;/* fallthrough */
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/4 evaluate: validate set expression type before accessing flags
In reply to Pablo Neira AyusoValidate set->init is of EXPR_SET before accessing set_flags.
--- src/evaluate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
src/evaluate.c +2 -1
@@ -5290,7 +5290,8 @@ static int set_evaluate(struct eval_ctx *ctx, struct set *set) set->flags |=NFT_SET_EXPR ;if (set_is_anonymous (set->flags)) { -if (set_is_interval (set->init->set_flags) && +if (set->init->etype ==EXPR_SET && +set_is_interval (set->init->set_flags) && !(set->init->set_flags &NFT_SET_CONCAT ) &&interval_set_eval (ctx, set, set->init) <0 )return -1 ;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 3/4 src: convert set to list expression
In reply to Pablo Neira AyusoThe following definition:
define xyz = { "dummy0", "dummy1" }
is represented as a set expression to ease integration with sets.
However, this definition can be used in chains and flowtables to specify the devices, for instance:
table netdev x {
chain y {
type filter hook ingress devices = $xyz priority 0; policy drop;
}
}in this context, $xyz defines a _list_ of devices, not a set.
Transform the set to list expression from the evaluation step for chains and flowtables.
This patch also handles:
define xyz = { "dummy0", $abc }
where $abc is also transformed to a list expression in the context of chains and flowtables.
--- src/evaluate.c | 66 +++++++++++++++++++++++++++++++++++++++++++------- src/mnl.c | 1 - 2 files changed, 57 insertions(+), 10 deletions(-)
src/evaluate.c +57 -9
@@ -5393,9 +5393,54 @@ static bool evaluate_expr_variable(struct eval_ctx *ctx, struct expr **exprp)return true; } -static bool evaluate_device_expr (struct eval_ctx *ctx,struct expr **dev_expr) +static struct expr *expr_set_to_list (struct eval_ctx *ctx,struct expr *dev_expr) {struct expr *expr, *next, *key; +struct location loc; +LIST_HEAD (tmp); + +list_for_each_entry_safe (expr, next, &dev_expr->expressions, list) { +list_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->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 : +break ; + } + +list_add (&expr->list, &tmp); + } + + loc = dev_expr->location; +expr_free (dev_expr); + dev_expr =compound_expr_alloc (&loc,EXPR_LIST ); +list_splice_init (&tmp, &dev_expr->expressions); + +return dev_expr; +} + +static bool evaluate_device_expr (struct eval_ctx *ctx,struct expr **dev_expr) +{ +struct expr *expr, *next;LIST_HEAD (tmp);if ((*dev_expr)->etype ==EXPR_VARIABLE ) {
@@ -5405,9 +5450,10 @@ static bool evaluate_device_expr(struct eval_ctx *ctx, struct expr **dev_expr)return false; } -if ((*dev_expr)->etype !=EXPR_SET && - (*dev_expr)->etype !=EXPR_LIST ) -return true; +if ((*dev_expr)->etype ==EXPR_SET ) + *dev_expr =expr_set_to_list (ctx, *dev_expr); + +assert ((*dev_expr)->etype ==EXPR_LIST );list_for_each_entry_safe (expr, next, &(*dev_expr)->expressions, list) {list_del (&expr->list);
@@ -5418,11 +5464,13 @@ static bool evaluate_device_expr(struct eval_ctx *ctx, struct expr **dev_expr) IFNAMSIZ * BITS_PER_BYTE);if (!evaluate_expr_variable (ctx, &expr))return false; -break ; -case EXPR_SET_ELEM : - key =expr_clone (expr->key); -expr_free (expr); - expr = key; + +if (expr->etype ==EXPR_SET ) { + expr =expr_set_to_list (ctx, expr); +list_splice_init (&expr->expressions, &tmp); +expr_free (expr); +continue ; + }break ;case EXPR_VALUE :break ;
src/mnl.c +0 -1
@@ -757,7 +757,6 @@ static struct nft_dev *nft_dev_array(const struct expr *dev_expr, int *num_devs)struct expr *expr;switch (dev_expr->etype) { -case EXPR_SET :case EXPR_LIST :list_for_each_entry (expr, &dev_expr->expressions, list) len++;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 4/4 src: detach set, list and concatenation expression layout
In reply to Pablo Neira AyusoThese three expressions use the same layout, but they have a different purpose. Several fields are specific of a given expression:
- set_flags is only required by set expressions.
- field_len and field_count are only used by concatenation expressions.
Add accessors to validate the expression type before accessing the union fields:
#define expr_set(__expr) (assert((__expr)->etype == EXPR_SET), &(__expr)->expr_set) #define expr_concat(__expr) (assert((__expr)->etype == EXPR_CONCAT), &(__expr)->expr_concat) #define expr_list(__expr) (assert((__expr)->etype == EXPR_LIST), &(__expr)->expr_list)
This should help catch subtle bugs due to type confusion.
assert() could be later enabled only in debugging builds to run tests, keep it by now.
compound_expr_*() still works and it needs the same initial layout for all of these expressions:
struct list_head expressions;
unsigned int size;--- include/expression.h | 22 +++++-- src/cmd.c | 5 +- src/evaluate.c | 124 +++++++++++++++++++------------------- src/expression.c | 41 +++++++------ src/intervals.c | 80 ++++++++++++------------ src/json.c | 10 +-- src/mergesort.c | 2 +- src/mnl.c | 12 ++-- src/monitor.c | 2 +- src/netlink.c | 26 ++++---- src/netlink_delinearize.c | 14 ++--- src/netlink_linearize.c | 2 +- src/optimize.c | 22 +++---- src/parser_bison.y | 2 +- src/parser_json.c | 5 +- src/rule.c | 4 +- src/segtree.c | 22 +++---- 17 files changed, 207 insertions(+), 188 deletions(-)
include/expression.h +18 -4
@@ -293,14 +293,24 @@ struct expr {struct expr *prefix;unsigned int prefix_len; }; -struct { -/* EXPR_CONCAT, EXPR_LIST, EXPR_SET */ +struct expr_concat { +/* EXPR_CONCAT */ struct list_head expressions;unsigned int size; -uint32_t set_flags;uint8_t field_len[NFT_REG32_COUNT ];uint8_t field_count; - }; + } expr_concat; +struct expr_set { +/* EXPR_SET */ +struct list_head expressions; +unsigned int size; +uint32_t set_flags; + } expr_set; +struct expr_list { +/* EXPR_LIST */ +struct list_head expressions; +unsigned int size; + } expr_list;struct {/* EXPR_SET_REF */ struct set *set;
@@ -403,6 +413,10 @@ struct expr { }; }; +#define expr_set (__expr) (assert((__expr)->etype == EXPR_SET), &(__expr)->expr_set) +#define expr_concat (__expr) (assert((__expr)->etype == EXPR_CONCAT), &(__expr)->expr_concat) +#define expr_list (__expr) (assert((__expr)->etype == EXPR_LIST), &(__expr)->expr_list) + extern struct expr *expr_alloc(const struct location *loc, enum expr_types etype, const struct datatype *dtype,
src/cmd.c +3 -2
@@ -398,8 +398,9 @@ bool nft_cmd_collapse_elems(enum cmd_ops op, struct list_head *cmds, strcmp(last_cmd->handle.set.name, handle->set.name))return false; -list_splice_tail_init (&init->expressions, &last_cmd->expr->expressions); - last_cmd->expr->size += init->size; +list_splice_tail_init (&expr_set (init)->expressions, + &expr_set (last_cmd->expr)->expressions); +expr_set (last_cmd->expr)->size +=expr_set (init)->size;return true; }
src/evaluate.c +63 -61
394 lines not on this page · raw message
src/expression.c +21 -20
134 lines not on this page · raw message
src/intervals.c +40 -40
265 lines not on this page · raw message
src/json.c +5 -5
@@ -232,11 +232,11 @@ static json_t *set_print_json(struct output_ctx *octx, const struct set *set)if (set->automerge)json_object_set_new (root,"auto-merge" ,json_true ()); -if (!nft_output_terse (octx) && set->init && set->init->size >0 ) { +if (!nft_output_terse (octx) && set->init &&expr_set (set->init)->size >0 ) {json_t *array =json_array ();const struct expr *i; -list_for_each_entry (i, &set->init->expressions, list) +list_for_each_entry (i, &expr_set (set->init)->expressions, list)json_array_append_new (array,expr_print_json (i, octx));json_object_set_new (root,"elem" , array);
@@ -658,7 +658,7 @@ json_t *concat_expr_json(const struct expr *expr, struct output_ctx *octx)json_t *array =json_array ();const struct expr *i; -list_for_each_entry (i, &expr->expressions, list) +list_for_each_entry (i, &expr_concat (expr)->expressions, list)json_array_append_new (array,expr_print_json (i, octx));return nft_json_pack ("{s:o}" ,"concat" , array);
@@ -669,7 +669,7 @@ json_t *set_expr_json(const struct expr *expr, struct output_ctx *octx)json_t *array =json_array ();const struct expr *i; -list_for_each_entry (i, &expr->expressions, list) +list_for_each_entry (i, &expr_set (expr)->expressions, list)json_array_append_new (array,expr_print_json (i, octx));return nft_json_pack ("{s:o}" ,"set" , array);
@@ -738,7 +738,7 @@ json_t *list_expr_json(const struct expr *expr, struct output_ctx *octx)json_t *array =json_array ();const struct expr *i; -list_for_each_entry (i, &expr->expressions, list) +list_for_each_entry (i, &expr_list (expr)->expressions, list)json_array_append_new (array,expr_print_json (i, octx));//return nft_json_pack("{s:s, s:o}", "type", "list", "val", array);
src/mergesort.c +1 -1
@@ -18,7 +18,7 @@ static void concat_expr_msort_value(const struct expr *expr, mpz_t value)const struct expr *i;char data[512 ]; -list_for_each_entry (i, &expr->expressions, list) { +list_for_each_entry (i, &expr_concat (expr)->expressions, list) { ilen =div_round_up (i->len,BITS_PER_BYTE );mpz_export_data (data + len, i->value, i->byteorder, ilen); len += ilen;
src/mnl.c +6 -6
@@ -758,12 +758,12 @@ static struct nft_dev *nft_dev_array(const struct expr *dev_expr, int *num_devs)switch (dev_expr->etype) {case EXPR_LIST : -list_for_each_entry (expr, &dev_expr->expressions, list) +list_for_each_entry (expr, &expr_list (dev_expr)->expressions, list) len++; dev_array =xmalloc (sizeof (struct nft_dev ) * len); -list_for_each_entry (expr, &dev_expr->expressions, list) { +list_for_each_entry (expr, &expr_list (dev_expr)->expressions, list) {nft_dev_add (dev_array, expr, i); i++; }
@@ -1793,7 +1793,7 @@ static int mnl_nft_setelem_batch(const struct nftnl_set *nls, struct cmd *cmd, flags |=NLM_F_CREATE ;if (init) - expr = list_first_entry(&init->expressions, struct expr, list); + expr = list_first_entry(&expr_set(init)->expressions, struct expr, list); next: nlh = nftnl_nlmsg_build_hdr(nftnl_batch_buffer(batch), msg_type,
@@ -1813,16 +1813,16 @@ next: htonl(nftnl_set_get_u32(nls, NFTNL_SET_ID))); } -if (!init ||list_empty (&init->expressions)) +if (!init ||list_empty (&expr_set (init)->expressions))return 0 ;assert (expr); nest1 =mnl_attr_nest_start (nlh,NFTA_SET_ELEM_LIST_ELEMENTS ); -list_for_each_entry_from (expr, &init->expressions, list) { +list_for_each_entry_from (expr, &expr_set (init)->expressions, list) {if (set_is_non_concat_range (set)) {if (set_is_anonymous (set->flags) && - !list_is_last (&expr->list, &init->expressions)) + !list_is_last (&expr->list, &expr_set (init)->expressions)) next =list_next_entry (expr, list);else next =NULL ;
src/monitor.c +1 -1
@@ -402,7 +402,7 @@ static bool netlink_event_range_cache(struct set *cached_set, }/* don't cache half-open range elements */ - elem = list_entry(dummyset->init->expressions.prev, struct expr, list); + elem = list_entry(expr_set(dummyset->init)->expressions.prev, struct expr, list);if (!set_elem_is_open_interval (elem) && dummyset->desc.field_count <=1 ) { cached_set->rg_cache =expr_clone (elem);
src/netlink.c +13 -13
@@ -134,8 +134,8 @@ struct nftnl_set_elem *alloc_nftnl_setelem(const struct expr *set,case EXPR_SET_ELEM_CATCHALL :break ;default : -if (set->set_flags &NFT_SET_INTERVAL && - key->etype ==EXPR_CONCAT && key->field_count >1 ) { +if (expr_set (set)->set_flags &NFT_SET_INTERVAL && + key->etype ==EXPR_CONCAT &&expr_concat (key)->field_count >1 ) { key->flags |=EXPR_F_INTERVAL ;netlink_gen_key (key, &nld); key->flags &= ~EXPR_F_INTERVAL ;
@@ -201,7 +201,7 @@ struct nftnl_set_elem *alloc_nftnl_setelem(const struct expr *set, nftnl_udata_buf_len(udbuf));nftnl_udata_buf_free (udbuf); } -if (set_is_datamap (set->set_flags) && data !=NULL ) { +if (set_is_datamap (expr_set (set)->set_flags) && data !=NULL ) {__netlink_gen_data (data, &nld, !(data->flags &EXPR_F_SINGLETON ));switch (data->etype) {case EXPR_VERDICT :
@@ -226,7 +226,7 @@ struct nftnl_set_elem *alloc_nftnl_setelem(const struct expr *set,break ; } } -if (set_is_objmap (set->set_flags) && data !=NULL ) { +if (set_is_objmap (expr_set (set)->set_flags) && data !=NULL ) {netlink_gen_data (data, &nld);nftnl_set_elem_set (nlse,NFTNL_SET_ELEM_OBJREF , nld.value, nld.len);
@@ -361,7 +361,7 @@ static void netlink_gen_concat_key(const struct expr *expr,memset (data,0 ,sizeof (data)); -list_for_each_entry (i, &expr->expressions, list) +list_for_each_entry (i, &expr_concat (expr)->expressions, list) offset +=__netlink_gen_concat_key (expr->flags, i, data + offset);nft_data_memcpy (nld, data, len);
@@ -425,10 +425,10 @@ static void __netlink_gen_concat_expand(const struct expr *expr,memset (data,0 ,sizeof (data)); -list_for_each_entry (i, &expr->expressions, list) +list_for_each_entry (i, &expr_concat (expr)->expressions, list) offset +=__netlink_gen_concat_data (false, i, data + offset); -list_for_each_entry (i, &expr->expressions, list) +list_for_each_entry (i, &expr_concat (expr)->expressions, list) offset +=__netlink_gen_concat_data (true, i, data + offset);nft_data_memcpy (nld, data, len);
@@ -447,7 +447,7 @@ static void __netlink_gen_concat(const struct expr *expr,memset (data,0 ,sizeof (data)); -list_for_each_entry (i, &expr->expressions, list) +list_for_each_entry (i, &expr_concat (expr)->expressions, list) offset +=__netlink_gen_concat_data (expr->flags, i, data + offset);nft_data_memcpy (nld, data, len);
@@ -1215,7 +1215,7 @@ void alloc_setelem_cache(const struct expr *set, struct nftnl_set *nls)struct nftnl_set_elem *nlse;const struct expr *expr; -list_for_each_entry (expr, &set->expressions, list) { +list_for_each_entry (expr, &expr_set (set)->expressions, list) { nlse =alloc_nftnl_setelem (set, expr);nftnl_set_elem_add (nls, nlse); }
@@ -1362,7 +1362,7 @@ static struct expr *netlink_parse_concat_elem_key(const struct set *set,int off = dtype->subtypes;if (set->key->etype ==EXPR_CONCAT ) - n = list_first_entry(&set->key->expressions, struct expr, list); + n = list_first_entry(&expr_concat(set->key)->expressions, struct expr, list); concat =concat_expr_alloc (&data->location);while (off >0 ) {
@@ -1410,7 +1410,7 @@ static struct expr *netlink_parse_concat_elem(const struct set *set, }assert (list_empty (&expressions)); }else { -list_splice_tail (&expressions, &concat->expressions); +list_splice_tail (&expressions, &expr_concat (concat)->expressions); }expr_free (data);
@@ -1681,7 +1681,7 @@ int netlink_list_setelems(struct netlink_ctx *ctx, const struct handle *h,else if (set->flags &NFT_SET_INTERVAL )interval_map_decompose (set->init);else -list_expr_sort (&ctx->set->init->expressions); +list_expr_sort (&expr_set (ctx->set->init)->expressions);nftnl_set_free (nls); ctx->set =NULL ;
@@ -1725,7 +1725,7 @@ int netlink_get_setelem(struct netlink_ctx *ctx, const struct handle *h,else if (set->flags &NFT_SET_INTERVAL ) err =get_set_decompose (cache_set, set);else -list_expr_sort (&ctx->set->init->expressions); +list_expr_sort (&expr_set (ctx->set->init)->expressions);nftnl_set_free (nls);nftnl_set_free (nls_out);
src/netlink_delinearize.c +7 -7
@@ -2186,10 +2186,10 @@ static void payload_match_postprocess(struct rule_pp_ctx *ctx,if (set_is_anonymous (set->flags) && set->init && - !list_empty (&set->init->expressions)) { + !list_empty (&expr_set (set->init)->expressions)) {struct expr *elem; - elem = list_first_entry(&set->init->expressions, struct expr, list); + elem = list_first_entry(&expr_set(set->init)->expressions, struct expr, list);if (elem->etype ==EXPR_SET_ELEM && elem->key->etype ==EXPR_VALUE )
@@ -2476,7 +2476,7 @@ static void binop_adjust(const struct expr *binop, struct expr *right,if (!set_is_anonymous (right->set->flags))break ; -list_for_each_entry (i, &right->set->init->expressions, list) { +list_for_each_entry (i, &expr_set (right->set->init)->expressions, list) {switch (i->key->etype) {case EXPR_VALUE :binop_adjust_one (binop, i->key, shift);
@@ -2822,7 +2822,7 @@ static void expr_postprocess_concat(struct rule_pp_ctx *ctx, struct expr **exprpassert (expr->etype ==EXPR_CONCAT ); ctx->flags |=RULE_PP_IN_CONCATENATION ; -list_for_each_entry_safe (i, n, &expr->expressions, list) { +list_for_each_entry_safe (i, n, &expr_concat (expr)->expressions, list) {if (type) { dtype =concat_subtype_lookup (type, --off);expr_set_type (i, dtype, dtype->byteorder);
@@ -2834,7 +2834,7 @@ static void expr_postprocess_concat(struct rule_pp_ctx *ctx, struct expr **exprp ntype =concat_subtype_add (ntype, i->dtype->type); } ctx->flags &= ~RULE_PP_IN_CONCATENATION ; -list_splice (&tmp, &expr->expressions); +list_splice (&tmp, &expr_concat (expr)->expressions);__datatype_set (expr,concat_type_alloc (ntype)); }
@@ -2861,7 +2861,7 @@ static void expr_postprocess(struct rule_pp_ctx *ctx, struct expr **exprp)expr_postprocess (ctx, &expr->right);break ;case EXPR_SET : -list_for_each_entry (i, &expr->expressions, list) +list_for_each_entry (i, &expr_set (expr)->expressions, list)expr_postprocess (ctx, &i);break ;case EXPR_CONCAT :
@@ -3432,7 +3432,7 @@ static bool has_inner_desc(const struct expr *expr)case EXPR_BINOP :return has_inner_desc (expr->left);case EXPR_CONCAT : -list_for_each_entry (i, &expr->expressions, list) { +list_for_each_entry (i, &expr_concat (expr)->expressions, list) {if (has_inner_desc (i))return true; }
src/netlink_linearize.c +1 -1
@@ -123,7 +123,7 @@ static void netlink_gen_concat(struct netlink_linearize_ctx *ctx, {const struct expr *i; -list_for_each_entry (i, &expr->expressions, list) { +list_for_each_entry (i, &expr_concat (expr)->expressions, list) {netlink_gen_expr (ctx, i, dreg); dreg +=netlink_register_space (i->len); }
src/optimize.c +11 -11
@@ -565,7 +565,7 @@ static void merge_expr_stmts(const struct optimize_ctx *ctx,uint32_t i; set =set_expr_alloc (&internal_location,NULL ); - set->set_flags |=NFT_SET_ANONYMOUS ; +expr_set (set)->set_flags |=NFT_SET_ANONYMOUS ; expr_a = stmt_a->expr->right; elem =set_elem_expr_alloc (&internal_location,expr_get (expr_a));
@@ -588,7 +588,7 @@ static void merge_vmap(const struct optimize_ctx *ctx,struct expr *mappings, *mapping, *expr; mappings = stmt_b->expr->mappings; -list_for_each_entry (expr, &mappings->expressions, list) { +list_for_each_entry (expr, &expr_set (mappings)->expressions, list) { mapping =expr_clone (expr);compound_expr_add (stmt_a->expr->mappings, mapping); }
@@ -654,7 +654,7 @@ static void __merge_concat(const struct optimize_ctx *ctx, uint32_t i, 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) { +list_for_each_entry (expr, &expr_set (stmt_a->expr->right)->expressions, list) { concat_clone =expr_clone (concat); clone =expr_clone (expr->key);compound_expr_add (concat_clone, clone);
@@ -673,7 +673,7 @@ static void __merge_concat(const struct optimize_ctx *ctx, uint32_t i,compound_expr_add (concat, clone);break ;case EXPR_LIST : -list_for_each_entry (expr, &stmt_a->expr->right->expressions, list) { +list_for_each_entry (expr, &expr_list (stmt_a->expr->right)->expressions, list) { concat_clone =expr_clone (concat); clone =expr_clone (expr);compound_expr_add (concat_clone, clone);
@@ -727,7 +727,7 @@ static void merge_concat_stmts(const struct optimize_ctx *ctx,/* build set data contenation, eg. { eth0 . 1.1.1.1 . 22 } */ set =set_expr_alloc (&internal_location,NULL ); - set->set_flags |=NFT_SET_ANONYMOUS ; +expr_set (set)->set_flags |=NFT_SET_ANONYMOUS ;for (i = from; i <= to; i++)__merge_concat_stmts (ctx, i, merge, set);
@@ -750,7 +750,7 @@ static void build_verdict_map(struct expr *expr, struct stmt *verdict,switch (expr->etype) {case EXPR_LIST : -list_for_each_entry (item, &expr->expressions, list) { +list_for_each_entry (item, &expr_list (expr)->expressions, list) { elem =set_elem_expr_alloc (&internal_location,expr_get (item));if (counter) { counter_elem =counter_stmt_alloc (&counter->location);
@@ -764,7 +764,7 @@ static void build_verdict_map(struct expr *expr, struct stmt *verdict,stmt_free (counter);break ;case EXPR_SET : -list_for_each_entry (item, &expr->expressions, list) { +list_for_each_entry (item, &expr_set (expr)->expressions, list) { elem =set_elem_expr_alloc (&internal_location,expr_get (item->key));if (counter) { counter_elem =counter_stmt_alloc (&counter->location);
@@ -851,7 +851,7 @@ static void merge_stmts_vmap(const struct optimize_ctx *ctx,assert (k >=0 ); set =set_expr_alloc (&internal_location,NULL ); - set->set_flags |=NFT_SET_ANONYMOUS ; +expr_set (set)->set_flags |=NFT_SET_ANONYMOUS ; expr_a = stmt_a->expr->right; verdict_a = ctx->stmt_matrix[from][k];
@@ -925,7 +925,7 @@ static void merge_concat_stmts_vmap(const struct optimize_ctx *ctx,/* build set data contenation, eg. { eth0 . 1.1.1.1 . 22 : accept } */ set =set_expr_alloc (&internal_location,NULL ); - set->set_flags |=NFT_SET_ANONYMOUS ; +expr_set (set)->set_flags |=NFT_SET_ANONYMOUS ;for (i = from; i <= to; i++) { verdict = ctx->stmt_matrix[i][k];
@@ -1050,7 +1050,7 @@ static void merge_nat(const struct optimize_ctx *ctx,assert (k >=0 ); set =set_expr_alloc (&internal_location,NULL ); - set->set_flags |=NFT_SET_ANONYMOUS ; +expr_set (set)->set_flags |=NFT_SET_ANONYMOUS ;for (i = from; i <= to; i++) { stmt = ctx->stmt_matrix[i][merge->stmt[0 ]];
@@ -1102,7 +1102,7 @@ static void merge_concat_nat(const struct optimize_ctx *ctx,assert (k >=0 ); set =set_expr_alloc (&internal_location,NULL ); - set->set_flags |=NFT_SET_ANONYMOUS ; +expr_set (set)->set_flags |=NFT_SET_ANONYMOUS ;for (i = from; i <= to; i++) {
src/parser_bison.y +1 -1
@@ -2073,7 +2073,7 @@ chain_block : /* empty */ { $$ = $<chain>-1; } | chain_block DEVICES '=' flowtable_expr stmt_separator { if ($$->dev_expr) { - list_splice_init(&$4->expressions, &$$->dev_expr->expressions); + list_splice_init(&expr_list($4)->expressions, &expr_list($$->dev_expr)->expressions); expr_free($4); break; }
src/parser_json.c +3 -2
@@ -1286,10 +1286,11 @@ static struct expr *json_parse_binop_expr(struct json_ctx *ctx,static struct expr *json_check_concat_expr (struct json_ctx *ctx,struct expr *e) { -if (e->size >=2 ) +if (expr_concat (e)->size >=2 )return e; -json_error (ctx,"Concatenation with %d elements is illegal" , e->size); +json_error (ctx,"Concatenation with %d elements is illegal" , +expr_concat (e)->size);expr_free (e);return NULL ; }
src/rule.c +2 -2
@@ -424,7 +424,7 @@ static void do_set_print(const struct set *set, struct print_fmt_options *opts,return ; } -if (set->init !=NULL && set->init->size >0 ) { +if (set->init !=NULL &&expr_set (set->init)->size >0 ) {nft_print (octx,"%s%selements = " , opts->tab, opts->tab); if (set->timeout || set->elem_has_comment ||
@@ -1459,7 +1459,7 @@ void cmd_free(struct cmd *cmd)static int __do_add_elements (struct netlink_ctx *ctx,struct cmd *cmd,struct set *set,struct expr *expr,uint32_t flags) { - expr->set_flags |= set->flags; +expr_set (expr)->set_flags |= set->flags;if (mnl_nft_setelem_add (ctx, cmd, set, expr, flags) <0 )return -1 ;
src/segtree.c +11 -11
@@ -77,9 +77,9 @@ struct expr *get_set_intervals(const struct set *set, const struct expr *init)mpz_init2 (low, set->key->len);mpz_init2 (high, set->key->len); - new_init =list_expr_alloc (&internal_location); + new_init =set_expr_alloc (&internal_location,NULL ); -list_for_each_entry (i, &init->expressions, list) { +list_for_each_entry (i, &expr_set (init)->expressions, list) {switch (i->key->etype) {case EXPR_VALUE : set_elem_add(set, new_init, i->key->value,
@@ -135,7 +135,7 @@ static struct expr *get_set_interval_find(const struct set *cache_set,mpz_init2 (val, set->key->len); -list_for_each_entry (i, &set->init->expressions, list) { +list_for_each_entry (i, &expr_set (set->init)->expressions, list) { key =expr_value (i);switch (key->etype) {case EXPR_VALUE :
@@ -236,7 +236,7 @@ int get_set_decompose(struct set *cache_set, struct set *set) new_init =set_expr_alloc (&internal_location, set); -list_for_each_entry_safe (i, next, &set->init->expressions, list) { +list_for_each_entry_safe (i, next, &expr_set (set->init)->expressions, list) {if (i->flags &EXPR_F_INTERVAL_END && left) {list_del (&left->list);list_del (&i->list);
@@ -354,7 +354,7 @@ void concat_range_aggregate(struct expr *set)int prefix_len, free_r1;mpz_t range, p; -list_for_each_entry_safe (i, next, &set->expressions, list) { +list_for_each_entry_safe (i, next, &expr_set (set)->expressions, list) {if (!start) { start = i;continue ;
@@ -366,10 +366,10 @@ void concat_range_aggregate(struct expr *set)* store them by replacing r2 expressions, and free r1 * expressions. */ - r2 =list_first_entry (&expr_value (end)->expressions, + r2 =list_first_entry (&expr_concat (expr_value (end))->expressions, struct expr, list);list_for_each_entry_safe (r1, r1_next, - &expr_value (start)->expressions, + &expr_concat (expr_value (start))->expressions, list) {bool string_type = false;
@@ -564,15 +564,15 @@ void interval_map_decompose(struct expr *set)unsigned int n, m, size;bool interval; -if (set->size ==0 ) +if (expr_set (set)->size ==0 )return ; - elements =xmalloc_array (set->size,sizeof (struct expr *)); - ranges =xmalloc_array (set->size *2 ,sizeof (struct expr *)); + elements =xmalloc_array (expr_set (set)->size,sizeof (struct expr *)); + ranges =xmalloc_array (expr_set (set)->size *2 ,sizeof (struct expr *));/* Sort elements */ n =0 ; -list_for_each_entry_safe (i, next, &set->expressions, list) { +list_for_each_entry_safe (i, next, &expr_set (set)->expressions, list) { key =NULL ;if (i->etype ==EXPR_SET_ELEM ) key = i->key;
Signature · 1 line
2.30.2
Florian Westphal
maintainerQuoted 2 lines · Pablo Neira Ayuso
These three expressions use the same layout but they have a different purpose, it is better to split them in independent layouts.
Agreed.
Quoted 3 lines
This is implicitly reducing the size of one of the largest structs in the union area of struct expr, still
EXPR_SET_ELEMremains the largest so no gain is achieved in this iteration.
Still, I'm all for reducing the number of anon structs in the union and remove the SET/LIST/CONCAT joint struct.
Please, feel free to push this out.