diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2023-10-04 13:12:58 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2023-10-12 10:28:45 +0200 |
| commit | ebd032fa881882fef2acb9da1bbde48d8233241d (patch) | |
| tree | 83871ffff8fcb84c0ab1da4c3c01ffa91c3cb555 /net/netfilter | |
| parent | 50e492143374c17ad89c865a1a44837b3f5c8226 (diff) | |
| download | lwn-ebd032fa881882fef2acb9da1bbde48d8233241d.tar.gz lwn-ebd032fa881882fef2acb9da1bbde48d8233241d.zip | |
netfilter: nf_tables: do not remove elements if set backend implements .abort
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@netfilter.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nf_tables_api.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index a72b6aeefb1b..c3de3791cabd 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -10347,7 +10347,10 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action) 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); |