Commit ebd032fa authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Florian Westphal
Browse files

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: 212ed75d ("netfilter: nf_tables: integrate pipapo into commit protocol")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
parent 50e49214

net/netfilter/nf_tables_api.c

+4 −1
Original line number Diff line number Diff line
@@ -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;

			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);