intervals: add elements with EXPR_F_KERNEL to purge list only
Pablo Neira Ayuso
maintainerPATCH v2 1/3 intervals: add elements with EXPR_F_KERNEL to purge list only
Do not add elements to purge list which are not in the kernel, otherwise, bogus ENOENT is reported.
Fixes 3e8d934e4f722 ("intervals: support to partial deletion with automerge")
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: no changes
src/intervals.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
src/intervals.c +7 -3
@@ -329,8 +329,10 @@ static void split_range(struct set *set, struct expr *prev, struct expr *i, {struct expr *clone; - clone =expr_clone (prev); -list_move_tail (&clone->list, &purge->expressions); +if (prev->flags &EXPR_F_KERNEL ) { + clone =expr_clone (prev); +list_move_tail (&clone->list, &purge->expressions); + } prev->flags &= ~EXPR_F_KERNEL ; clone =expr_clone (prev);
@@ -413,7 +415,9 @@ static int setelem_delete(struct list_head *msgs, struct set *set,if (mpz_cmp (prev_range.low, range.low) ==0 &&mpz_cmp (prev_range.high, range.high) ==0 ) {if (i->flags &EXPR_F_REMOVE ) { -list_move_tail (&prev->list, &purge->expressions); +if (prev->flags &EXPR_F_KERNEL ) +list_move_tail (&prev->list, &purge->expressions); +list_del (&i->list);expr_free (i); }
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 2/3 intervals: fix deletion of multiple ranges with automerge
Iterate over the list of elements to be deleted, then splice one EXPR_F_REMOVE element at a time to update the list of existing sets incrementally.
Fixes 3e8d934e4f722 ("intervals: support to partial deletion with automerge")
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: fix memleak in __set_delete() error path
src/intervals.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-)
src/intervals.c +22 -12
@@ -454,34 +454,44 @@ static void automerge_delete(struct list_head *msgs, struct set *set,expr_free (ctx.purge); } +static int __set_delete (struct list_head *msgs,struct expr *i,struct set *set, +struct expr *add,struct expr *init, +struct set *existing_set,unsigned int debug_mask) +{ + i->flags |=EXPR_F_REMOVE ; +list_move (&i->list, &existing_set->init->expressions); +list_expr_sort (&existing_set->init->expressions); + +return setelem_delete (msgs, set, add, init, existing_set->init, debug_mask); +} +/* detection for unexisting intervals already exists in Linux kernels >= 5.7. */ int set_delete (struct list_head *msgs,struct cmd *cmd,struct set *set,struct expr *init,unsigned int debug_mask) {struct set *existing_set = set->existing_set; -struct expr *i, *add; +struct expr *i, *next, *add;struct handle h = {};struct cmd *add_cmd; +LIST_HEAD (del_list);int err;set_to_range (init);if (set->automerge)automerge_delete (msgs, set, init, debug_mask); -list_for_each_entry (i, &init->expressions, list) - i->flags |=EXPR_F_REMOVE ; -set_to_range (existing_set->init); -list_splice_init (&init->expressions, &existing_set->init->expressions); - -list_expr_sort (&existing_set->init->expressions); - add =set_expr_alloc (&internal_location, set); - err =setelem_delete (msgs, set, add, init, existing_set->init, debug_mask); -if (err <0 ) { -expr_free (add); -return err; +list_splice_init (&init->expressions, &del_list); + +list_for_each_entry_safe (i, next, &del_list, list) { + err =__set_delete (msgs, i, set, add, init, existing_set, debug_mask); +if (err <0 ) { +list_splice (&del_list, &init->expressions); +expr_free (add); +return err; + } }if (debug_mask &NFT_DEBUG_SEGTREE ) {
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 3/3 intervals: build list of elements to be added from cache
In reply to Pablo Neira AyusoLoop over the set cache and add elements that have no EXPR_F_KERNEL, meaning that these are new elements in the set that have resulted from adjusting/split existing ranges.
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: new in this series.
src/intervals.c | 70 +++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 40 deletions(-)
src/intervals.c +30 -40
@@ -274,58 +274,46 @@ static void remove_elem(struct expr *prev, struct set *set, struct expr *purge) } } -static void __adjust_elem_left (struct set *set,struct expr *prev,struct expr *i, -struct expr *add) +static void __adjust_elem_left (struct set *set,struct expr *prev,struct expr *i) { prev->flags &= ~EXPR_F_KERNEL ;expr_free (prev->key->left); prev->key->left =expr_get (i->key->right);mpz_add_ui (prev->key->left->value, prev->key->left->value,1 ); -list_move (&prev->list, &add->expressions); +list_move (&prev->list, &set->existing_set->init->expressions); }static void adjust_elem_left (struct set *set,struct expr *prev,struct expr *i, -struct expr *add,struct expr *purge) +struct expr *purge) { -struct expr *clone; -remove_elem (prev, set, purge); -__adjust_elem_left (set, prev, i, add); +__adjust_elem_left (set, prev, i);list_del (&i->list);expr_free (i); - - clone =expr_clone (prev); -list_add_tail (&clone->list, &set->existing_set->init->expressions); } -static void __adjust_elem_right (struct set *set,struct expr *prev,struct expr *i, -struct expr *add) +static void __adjust_elem_right (struct set *set,struct expr *prev,struct expr *i) { prev->flags &= ~EXPR_F_KERNEL ;expr_free (prev->key->right); prev->key->right =expr_get (i->key->left);mpz_sub_ui (prev->key->right->value, prev->key->right->value,1 ); -list_move (&prev->list, &add->expressions); +list_move (&prev->list, &set->existing_set->init->expressions); }static void adjust_elem_right (struct set *set,struct expr *prev,struct expr *i, -struct expr *add,struct expr *purge) +struct expr *purge) { -struct expr *clone; -remove_elem (prev, set, purge); -__adjust_elem_right (set, prev, i, add); +__adjust_elem_right (set, prev, i);list_del (&i->list);expr_free (i); - - clone =expr_clone (prev); -list_add_tail (&clone->list, &set->existing_set->init->expressions); }static void split_range (struct set *set,struct expr *prev,struct expr *i, -struct expr *add,struct expr *purge) +struct expr *purge) {struct expr *clone;
@@ -339,37 +327,33 @@ static void split_range(struct set *set, struct expr *prev, struct expr *i,expr_free (clone->key->left); clone->key->left =expr_get (i->key->right);mpz_add_ui (clone->key->left->value, i->key->right->value,1 ); -list_move (&clone->list, &add->expressions); - clone =expr_clone (clone);list_add_tail (&clone->list, &set->existing_set->init->expressions);expr_free (prev->key->right); prev->key->right =expr_get (i->key->left);mpz_sub_ui (prev->key->right->value, i->key->left->value,1 ); -list_move (&prev->list, &add->expressions); - clone =expr_clone (prev); -list_add_tail (&clone->list, &set->existing_set->init->expressions); +list_move (&prev->list, &set->existing_set->init->expressions);list_del (&i->list);expr_free (i); } -static int setelem_adjust (struct set *set,struct expr *add,struct expr *purge, +static int setelem_adjust (struct set *set,struct expr *purge,struct range *prev_range,struct range *range,struct expr *prev,struct expr *i) {if (mpz_cmp (prev_range->low, range->low) ==0 &&mpz_cmp (prev_range->high, range->high) >0 ) {if (i->flags &EXPR_F_REMOVE ) -adjust_elem_left (set, prev, i, add, purge); +adjust_elem_left (set, prev, i, purge); }else if (mpz_cmp (prev_range->low, range->low) <0 &&mpz_cmp (prev_range->high, range->high) ==0 ) {if (i->flags &EXPR_F_REMOVE ) -adjust_elem_right (set, prev, i, add, purge); +adjust_elem_right (set, prev, i, purge); }else if (mpz_cmp (prev_range->low, range->low) <0 &&mpz_cmp (prev_range->high, range->high) >0 ) {if (i->flags &EXPR_F_REMOVE ) -split_range (set, prev, i, add, purge); +split_range (set, prev, i, purge); }else {return -1 ; }
@@ -378,8 +362,8 @@ static int setelem_adjust(struct set *set, struct expr *add, struct expr *purge, }static int setelem_delete (struct list_head *msgs,struct set *set, -struct expr *add,struct expr *purge, -struct expr *elems,unsigned int debug_mask) +struct expr *purge,struct expr *elems, +unsigned int debug_mask) {struct expr *i, *next, *prev =NULL ;struct range range, prev_range;
@@ -422,7 +406,7 @@ static int setelem_delete(struct list_head *msgs, struct set *set,expr_free (i); } }else if (set->automerge && -setelem_adjust (set, add, purge, &prev_range, &range, prev, i) <0 ) { +setelem_adjust (set, purge, &prev_range, &range, prev, i) <0 ) {expr_error (msgs, i,"element does not exist" ); err =-1 ; goto err;
@@ -455,14 +439,14 @@ static void automerge_delete(struct list_head *msgs, struct set *set, }static int __set_delete (struct list_head *msgs,struct expr *i,struct set *set, -struct expr *add,struct expr *init, -struct set *existing_set,unsigned int debug_mask) +struct expr *init,struct set *existing_set, +unsigned int debug_mask) { i->flags |=EXPR_F_REMOVE ;list_move (&i->list, &existing_set->init->expressions);list_expr_sort (&existing_set->init->expressions); -return setelem_delete (msgs, set, add, init, existing_set->init, debug_mask); +return setelem_delete (msgs, set, init, existing_set->init, debug_mask); }/* detection for unexisting intervals already exists in Linux kernels >= 5.7. */
@@ -470,7 +454,7 @@ int set_delete(struct list_head *msgs, struct cmd *cmd, struct set *set, struct expr *init, unsigned int debug_mask) { struct set *existing_set = set->existing_set; -struct expr *i, *next, *add; +struct expr *i, *next, *add, *clone;struct handle h = {};struct cmd *add_cmd;LIST_HEAD (del_list);
@@ -481,19 +465,25 @@ int set_delete(struct list_head *msgs, struct cmd *cmd, struct set *set,automerge_delete (msgs, set, init, debug_mask);set_to_range (existing_set->init); - add =set_expr_alloc (&internal_location, set);list_splice_init (&init->expressions, &del_list);list_for_each_entry_safe (i, next, &del_list, list) { - err =__set_delete (msgs, i, set, add, init, existing_set, debug_mask); + err =__set_delete (msgs, i, set, init, existing_set, debug_mask);if (err <0 ) {list_splice (&del_list, &init->expressions); -expr_free (add);return err; } } + add =set_expr_alloc (&internal_location, set); +list_for_each_entry (i, &existing_set->init->expressions, list) { +if (!(i->flags &EXPR_F_KERNEL )) { + clone =expr_clone (i); +list_add_tail (&clone->list, &add->expressions); + } + } +if (debug_mask &NFT_DEBUG_SEGTREE ) {list_for_each_entry (i, &init->expressions, list) gmp_printf("remove: [%Zx-%Zx]\n",
Signature · 1 line
2.30.2