This is a note to let you know that I've just added the patch titled
netfilter: nf_tables: do not remove elements if set backend implements .abort
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
netfilter-nf_tables-do-not-remove-elements-if-set-backend-implements-.abort.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From ebd032fa881882fef2acb9da1bbde48d8233241d Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
Date: Wed, 4 Oct 2023 13:12:58 +0200
Subject: netfilter: nf_tables: do not remove elements if set backend implements .abort
From: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
commit ebd032fa881882fef2acb9da1bbde48d8233241d upstream.
pipapo set backend maintains two copies of the datastructure, removing
the elements from the copy that is going to be discarded slows down
the abort path significantly, from several minutes to few seconds after
this patch.
Fixes: 212ed75dc5fb ("netfilter: nf_tables: integrate pipapo into commit protocol")
Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
Signed-off-by: Florian Westphal <fw@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/netfilter/nf_tables_api.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -9931,7 +9931,10 @@ static int __nf_tables_abort(struct net
break;
}
te = (struct nft_trans_elem *)trans->data;
- nft_setelem_remove(net, te->set, &te->elem);
+ if (!te->set->ops->abort ||
+ nft_setelem_is_catchall(te->set, &te->elem))
+ nft_setelem_remove(net, te->set, &te->elem);
+
if (!nft_setelem_is_catchall(te->set, &te->elem))
atomic_dec(&te->set->nelems);
Patches currently in stable-queue which might be from pablo@xxxxxxxxxxxxx are
queue-6.1/netfilter-nf_tables-revert-do-not-remove-elements-if-set-backend-implements-.abort.patch
queue-6.1/netfilter-nft_set_rbtree-.deactivate-fails-if-element-has-expired.patch
queue-6.1/netfilter-nf_tables-do-not-remove-elements-if-set-backend-implements-.abort.patch
