android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netfilter: nft_set_rbtree: use read spinlock to avoid datapath contention

Browse Source 
commit 96b33300fba880ec0eafcf3d82486f3463b4b6da upstream.

rbtree GC does not modify the datastructure, instead it collects expired
elements and it enqueues a GC transaction. Use a read spinlock instead
to avoid data contention while GC worker is running.

Fixes: f6c383b8c31a ("netfilter: nf_tables: adapt set backend to use GC transaction API")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Pablo Neira Ayuso 2023-09-22 19:01:15 +02:00 committed by Greg Kroah-Hartman
parent c323ed65f6
commit b796c4e4bf
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/netfilter/nft_set_rbtree.c
View File

@ -624,8 +624,7 @@ static void nft_rbtree_gc(struct work_struct *work)
if (!gc) if (!gc)
goto done; goto done;
write_lock_bh(&priv->lock); read_lock_bh(&priv->lock);
write_seqcount_begin(&priv->count);
for (node = rb_first(&priv->root); node != NULL; node = rb_next(node)) { for (node = rb_first(&priv->root); node != NULL; node = rb_next(node)) {
/* Ruleset has been updated, try later. */ /* Ruleset has been updated, try later. */
@ -672,8 +671,7 @@ static void nft_rbtree_gc(struct work_struct *work)
nft_trans_gc_elem_add(gc, rbe); nft_trans_gc_elem_add(gc, rbe);
} }
try_later: try_later:
write_seqcount_end(&priv->count); read_unlock_bh(&priv->lock);
write_unlock_bh(&priv->lock);
if (gc) if (gc)
nft_trans_gc_queue_async_done(gc); nft_trans_gc_queue_async_done(gc);