From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH nft 2/2] intervals: fix deletion of multiple ranges with automerge
Date: Thu, 14 Apr 2022 18:21:58 +0200 [thread overview]
Message-ID: <20220414162158.636939-2-pablo@netfilter.org> (raw)
In-Reply-To: <20220414162158.636939-1-pablo@netfilter.org>
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 <pablo@netfilter.org>
---
src/intervals.c | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/intervals.c b/src/intervals.c
index 590a2967c0f3..7254a23ccf7c 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -454,34 +454,43 @@ 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) {
+ expr_free(add);
+ return err;
+ }
}
if (debug_mask & NFT_DEBUG_SEGTREE) {
--
2.30.2
prev parent reply other threads:[~2022-04-14 16:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-14 16:21 [PATCH nft 1/2] intervals: add elements with EXPR_F_KERNEL to purge list only Pablo Neira Ayuso
2022-04-14 16:21 ` Pablo Neira Ayuso [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220414162158.636939-2-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.