niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

netfilter: nft_set_pipapo: call nft_trans_gc_queue_sync() in catchall GC

Browse source 
pipapo needs to enqueue GC transactions for catchall elements through
nft_trans_gc_queue_sync(). Add nft_trans_gc_catchall_sync() and
nft_trans_gc_catchall_async() to handle GC transaction queueing
accordingly.

Fixes: 5f68718b34 ("netfilter: nf_tables: GC transaction API to avoid race with control plane")
Fixes: f6c383b8c3 ("netfilter: nf_tables: adapt set backend to use GC transaction API")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Pablo Neira Ayuso 2023-09-06 15:07:53 +02:00
parent 96b33300fb
commit 4a9e12ea7e
5 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/net/netfilter/nf_tables.h
View file

@ -1700,8 +1700,9 @@ void nft_trans_gc_queue_sync_done(struct nft_trans_gc *trans);
void nft_trans_gc_elem_add(struct nft_trans_gc *gc, void *priv); void nft_trans_gc_elem_add(struct nft_trans_gc *gc, void *priv);
struct nft_trans_gc *nft_trans_gc_catchall(struct nft_trans_gc *gc, struct nft_trans_gc *nft_trans_gc_catchall_async(struct nft_trans_gc *gc,
unsigned int gc_seq); unsigned int gc_seq);
struct nft_trans_gc *nft_trans_gc_catchall_sync(struct nft_trans_gc *gc);
void nft_setelem_data_deactivate(const struct net *net, void nft_setelem_data_deactivate(const struct net *net,
const struct nft_set *set, const struct nft_set *set,

22
net/netfilter/nf_tables_api.c
View file

@ -9613,8 +9613,9 @@ void nft_trans_gc_queue_sync_done(struct nft_trans_gc *trans)
call_rcu(&trans->rcu, nft_trans_gc_trans_free); call_rcu(&trans->rcu, nft_trans_gc_trans_free);
} }
struct nft_trans_gc *nft_trans_gc_catchall(struct nft_trans_gc *gc, static struct nft_trans_gc *nft_trans_gc_catchall(struct nft_trans_gc *gc,
unsigned int gc_seq) unsigned int gc_seq,
bool sync)
{ {
struct nft_set_elem_catchall *catchall; struct nft_set_elem_catchall *catchall;
const struct nft_set *set = gc->set; const struct nft_set *set = gc->set;
@ -9630,7 +9631,11 @@ struct nft_trans_gc *nft_trans_gc_catchall(struct nft_trans_gc *gc,
nft_set_elem_dead(ext); nft_set_elem_dead(ext);
dead_elem: dead_elem:
gc = nft_trans_gc_queue_async(gc, gc_seq, GFP_ATOMIC); if (sync)
gc = nft_trans_gc_queue_sync(gc, GFP_ATOMIC);
else
gc = nft_trans_gc_queue_async(gc, gc_seq, GFP_ATOMIC);
if (!gc) if (!gc)
return NULL; return NULL;
@ -9640,6 +9645,17 @@ dead_elem:
return gc; return gc;
} }
struct nft_trans_gc *nft_trans_gc_catchall_async(struct nft_trans_gc *gc,
unsigned int gc_seq)
{
return nft_trans_gc_catchall(gc, gc_seq, false);
}
struct nft_trans_gc *nft_trans_gc_catchall_sync(struct nft_trans_gc *gc)
{
return nft_trans_gc_catchall(gc, 0, true);
}
static void nf_tables_module_autoload_cleanup(struct net *net) static void nf_tables_module_autoload_cleanup(struct net *net)
{ {
struct nftables_pernet *nft_net = nft_pernet(net); struct nftables_pernet *nft_net = nft_pernet(net);

2
net/netfilter/nft_set_hash.c
View file

@ -372,7 +372,7 @@ dead_elem:
nft_trans_gc_elem_add(gc, he); nft_trans_gc_elem_add(gc, he);
} }
gc = nft_trans_gc_catchall(gc, gc_seq); gc = nft_trans_gc_catchall_async(gc, gc_seq);
try_later: try_later:
/* catchall list iteration requires rcu read side lock. */ /* catchall list iteration requires rcu read side lock. */

2
net/netfilter/nft_set_pipapo.c
View file

@ -1610,7 +1610,7 @@ static void pipapo_gc(const struct nft_set *_set, struct nft_pipapo_match *m)
} }
} }
gc = nft_trans_gc_catchall(gc, 0); gc = nft_trans_gc_catchall_sync(gc);
if (gc) { if (gc) {
nft_trans_gc_queue_sync_done(gc); nft_trans_gc_queue_sync_done(gc);
priv->last_gc = jiffies; priv->last_gc = jiffies;

2
net/netfilter/nft_set_rbtree.c
View file

@ -669,7 +669,7 @@ dead_elem:
nft_trans_gc_elem_add(gc, rbe); nft_trans_gc_elem_add(gc, rbe);
} }
gc = nft_trans_gc_catchall(gc, gc_seq); gc = nft_trans_gc_catchall_async(gc, gc_seq);
try_later: try_later:
read_unlock_bh(&priv->lock); read_unlock_bh(&priv->lock);