From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH nft,v4 7/7] intervals: support to partial deletion with automerge
Date: Wed, 13 Apr 2022 16:38:02 +0200 [thread overview]
Message-ID: <YlbgSp+Y+gbaNEDQ@orbyte.nwl.cc> (raw)
In-Reply-To: <Ylbduy44WgQSI2o9@salvia>
On Wed, Apr 13, 2022 at 04:27:07PM +0200, Pablo Neira Ayuso wrote:
[...]
> > The one with EXPR_F_REMOVE comes *after* the one to be removed, right?
>
> Right, the other way around actually.
>
> > My question again: Is it possible for 'prev' to have EXPR_F_REMOVE set?
> > Maybe I miss something, but to me it looks like not although the code
> > expects it.
>
> prev never has EXPR_F_REMOVE, so it points to an existing element.
So below change should be fine?
diff --git a/src/intervals.c b/src/intervals.c
index 451bc4dd4dd45..c0077c06880ff 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -265,14 +265,12 @@ static void remove_elem(struct expr *prev, struct set *set, struct expr *purge)
{
struct expr *clone;
- if (!(prev->flags & EXPR_F_REMOVE)) {
- if (prev->flags & EXPR_F_KERNEL) {
- clone = expr_clone(prev);
- list_move_tail(&clone->list, &purge->expressions);
- } else {
- list_del(&prev->list);
- expr_free(prev);
- }
+ if (prev->flags & EXPR_F_KERNEL) {
+ clone = expr_clone(prev);
+ list_move_tail(&clone->list, &purge->expressions);
+ } else {
+ list_del(&prev->list);
+ expr_free(prev);
}
}
@@ -360,18 +358,15 @@ static int setelem_adjust(struct set *set, struct expr *add, struct expr *purge,
{
if (mpz_cmp(prev_range->low, range->low) == 0 &&
mpz_cmp(prev_range->high, range->high) > 0) {
- if (!(prev->flags & EXPR_F_REMOVE) &&
- i->flags & EXPR_F_REMOVE)
+ if (i->flags & EXPR_F_REMOVE)
adjust_elem_left(set, prev, i, add, purge);
} else if (mpz_cmp(prev_range->low, range->low) < 0 &&
mpz_cmp(prev_range->high, range->high) == 0) {
- if (!(prev->flags & EXPR_F_REMOVE) &&
- i->flags & EXPR_F_REMOVE)
+ if (i->flags & EXPR_F_REMOVE)
adjust_elem_right(set, prev, i, add, purge);
} else if (mpz_cmp(prev_range->low, range->low) < 0 &&
mpz_cmp(prev_range->high, range->high) > 0) {
- if (!(prev->flags & EXPR_F_REMOVE) &&
- i->flags & EXPR_F_REMOVE)
+ if (i->flags & EXPR_F_REMOVE)
split_range(set, prev, i, add, purge);
} else {
return -1;
@@ -417,8 +412,7 @@ 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 (!(prev->flags & EXPR_F_REMOVE) &&
- i->flags & EXPR_F_REMOVE) {
+ if (i->flags & EXPR_F_REMOVE) {
list_move_tail(&prev->list, &purge->expressions);
list_del(&i->list);
expr_free(i);
next prev parent reply other threads:[~2022-04-13 14:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-12 14:47 [PATCH nft,v4 0/7] revisit overlap/automerge codebase Pablo Neira Ayuso
2022-04-12 14:47 ` [PATCH nft,v4 1/7] src: add EXPR_F_KERNEL to identify expression in the kernel Pablo Neira Ayuso
2022-04-12 14:47 ` [PATCH nft,v4 2/7] src: replace interval segment tree overlap and automerge Pablo Neira Ayuso
2022-04-12 14:47 ` [PATCH nft,v4 3/7] src: remove rbtree datastructure Pablo Neira Ayuso
2022-04-12 14:47 ` [PATCH nft,v4 4/7] mnl: update mnl_nft_setelem_del() to allow for more reuse Pablo Neira Ayuso
2022-04-12 14:47 ` [PATCH nft,v4 5/7] intervals: add support to automerge with kernel elements Pablo Neira Ayuso
2022-04-12 14:47 ` [PATCH nft,v4 6/7] evaluate: allow for zero length ranges Pablo Neira Ayuso
2022-04-12 14:47 ` [PATCH nft,v4 7/7] intervals: support to partial deletion with automerge Pablo Neira Ayuso
2022-04-13 12:54 ` Phil Sutter
2022-04-13 13:13 ` Pablo Neira Ayuso
2022-04-13 14:02 ` Phil Sutter
2022-04-13 14:27 ` Pablo Neira Ayuso
2022-04-13 14:38 ` Phil Sutter [this message]
2022-04-13 14:45 ` Pablo Neira Ayuso
2022-04-13 14:47 ` Pablo Neira Ayuso
2022-04-13 14:54 ` Pablo Neira Ayuso
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=YlbgSp+Y+gbaNEDQ@orbyte.nwl.cc \
--to=phil@nwl.cc \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.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.