diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-09-02 13:29:56 +0400 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-09-03 12:57:08 +0400 |
commit | d99407f42f05843ae9e23696ea6d91529d9600db (patch) | |
tree | 0cc353bb9c13a169dc9ce0ab2516713098f6d39f | |
parent | 39f390167e9ca73c009d3c8e2d6c3b4286b02ab6 (diff) | |
download | linux-d99407f42f05843ae9e23696ea6d91529d9600db.tar.xz |
netfilter: nft_rbtree: no need for spinlock from set destroy path
The sets are released from the rcu callback, after the rule is removed
from the chain list, which implies that nfnetlink cannot update the
rbtree and no packets are walking on the set anymore. Thus, we can get
rid of the spinlock in the set destroy path there.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Reviewied-by: Thomas Graf <tgraf@suug.ch>
-rw-r--r-- | net/netfilter/nft_rbtree.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/netfilter/nft_rbtree.c b/net/netfilter/nft_rbtree.c index e1836ff88199..46214f245665 100644 --- a/net/netfilter/nft_rbtree.c +++ b/net/netfilter/nft_rbtree.c @@ -234,13 +234,11 @@ static void nft_rbtree_destroy(const struct nft_set *set) struct nft_rbtree_elem *rbe; struct rb_node *node; - spin_lock_bh(&nft_rbtree_lock); while ((node = priv->root.rb_node) != NULL) { rb_erase(node, &priv->root); rbe = rb_entry(node, struct nft_rbtree_elem, node); nft_rbtree_elem_destroy(set, rbe); } - spin_unlock_bh(&nft_rbtree_lock); } static bool nft_rbtree_estimate(const struct nft_set_desc *desc, u32 features, |