Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [91.216.245.30]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD2DF3FF893 for ; Wed, 3 Jun 2026 11:25:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.216.245.30 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780485935; cv=none; b=iDbwDHyuQgOhMaK3/zs5roLIq363hrDeZvoyUCzPcPTHnN/j5tTEJavgm2/NcikhyqjehFo2oaAufRf+cl555Pw4xgi2SvWbxiHsg4N3fm5za6+BnCrvNjVuS9/GQRuBHMEd+NAk8rRA+b8rcL/OF7k9yDgt0evAWeIPFIBj/i0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780485935; c=relaxed/simple; bh=hV77bCYDC7P6rZ6b/MKokA+i2VrzlXsn/xkJqXr7Umo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UWWQQQFMwu6kals072Stcp0XMLEDiQIe1Pzcy8c9eAQSRy4yXGVxVSro0zbKp48k10atpjbOLan/prjy8IrD39RueV8CeJ4h5mgKTpoYa+I2i/elEdSVPwYGAm1cCqwKCGt8qO+OdZxySP+cNaQ0jrdmDUx83fkpxVAKDUWiJNU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strlen.de; spf=pass smtp.mailfrom=Chamillionaire.breakpoint.cc; arc=none smtp.client-ip=91.216.245.30 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=strlen.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=Chamillionaire.breakpoint.cc Received: by Chamillionaire.breakpoint.cc (Postfix, from userid 1003) id 10353602F8; Wed, 03 Jun 2026 13:25:32 +0200 (CEST) From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH nf-next 2/3] netfilter: nf_conncount: split count_tree_node rbtree walk into helper Date: Wed, 3 Jun 2026 13:24:59 +0200 Message-ID: <20260603112513.2263-3-fw@strlen.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260603112513.2263-1-fw@strlen.de> References: <20260603112513.2263-1-fw@strlen.de> Precedence: bulk X-Mailing-List: netfilter-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add find_tree_node() helper that fetches a matching rbtree node. This is used by followup patch to optionally search the tree again while preventing concurrent updates via tree lock. Signed-off-by: Florian Westphal --- net/netfilter/nf_conncount.c | 96 ++++++++++++++++++++++-------------- 1 file changed, 58 insertions(+), 38 deletions(-) diff --git a/net/netfilter/nf_conncount.c b/net/netfilter/nf_conncount.c index d3866393b4f5..8d9c24b69dc9 100644 --- a/net/netfilter/nf_conncount.c +++ b/net/netfilter/nf_conncount.c @@ -488,23 +488,15 @@ insert_tree(struct net *net, return count; } -static unsigned int -count_tree(struct net *net, - const struct sk_buff *skb, - u16 l3num, - struct nf_conncount_data *data, - const u32 *key) +static struct nf_conncount_rb * +find_tree_node(struct nf_conncount_root *root, struct nf_conncount_data *data, + const u32 *key) { - struct nf_conncount_root *root; struct rb_node *parent; - struct nf_conncount_rb *rbconn; - unsigned int hash; - - hash = jhash2(key, data->keylen, data->initval) % CONNCOUNT_SLOTS; - root = &data->root[hash]; parent = rcu_dereference_raw(root->root.rb_node); while (parent) { + struct nf_conncount_rb *rbconn; int diff; rbconn = rb_entry(parent, struct nf_conncount_rb, node); @@ -515,40 +507,68 @@ count_tree(struct net *net, } else if (diff > 0) { parent = rcu_dereference_raw(parent->rb_right); } else { - int ret; + return rbconn; + } + } - if (!skb) { - nf_conncount_gc_list(net, &rbconn->list); - return rbconn->list.count; - } + return ERR_PTR(-ENOENT); +} - spin_lock_bh(&rbconn->list.list_lock); - /* Node might be about to be free'd. - * We need to defer to insert_tree() in this case. - */ - if (rbconn->list.count == 0) { - spin_unlock_bh(&rbconn->list.list_lock); - break; - } +static unsigned int +count_tree(struct net *net, + const struct sk_buff *skb, + u16 l3num, + struct nf_conncount_data *data, + const u32 *key) +{ + struct nf_conncount_root *root; + struct nf_conncount_rb *rbconn; + unsigned int hash; + int ret; - /* same source network -> be counted! */ - ret = __nf_conncount_add(net, skb, l3num, &rbconn->list); - spin_unlock_bh(&rbconn->list.list_lock); - if (ret && ret != -EEXIST) { - return 0; /* hotdrop */ - } else { - /* -EEXIST means add was skipped, update the list */ - if (ret == -EEXIST) - nf_conncount_gc_list(net, &rbconn->list); - return rbconn->list.count; - } + hash = jhash2(key, data->keylen, data->initval) % CONNCOUNT_SLOTS; + root = &data->root[hash]; + + rbconn = find_tree_node(root, data, key); + if (IS_ERR(rbconn)) { + if (PTR_ERR(rbconn) == -ENOENT) { + if (!skb) + return 0; + + return insert_tree(net, skb, l3num, data, hash, key); } + DEBUG_NET_WARN_ON_ONCE(IS_ERR(rbconn)); } - if (!skb) + DEBUG_NET_WARN_ON_ONCE(IS_ERR_OR_NULL(rbconn)); + if (IS_ERR_OR_NULL(rbconn)) return 0; - return insert_tree(net, skb, l3num, data, hash, key); + if (!skb) { + nf_conncount_gc_list(net, &rbconn->list); + return rbconn->list.count; + } + + spin_lock_bh(&rbconn->list.list_lock); + /* Node might be about to be free'd. + * We need to defer to insert_tree() in this case. + */ + if (rbconn->list.count == 0) { + spin_unlock_bh(&rbconn->list.list_lock); + return insert_tree(net, skb, l3num, data, hash, key); + } + + /* same source network -> be counted! */ + ret = __nf_conncount_add(net, skb, l3num, &rbconn->list); + spin_unlock_bh(&rbconn->list.list_lock); + + if (ret && ret != -EEXIST) + return 0; /* hotdrop */ + /* -EEXIST means add was skipped, update the list */ + if (ret == -EEXIST) + nf_conncount_gc_list(net, &rbconn->list); + + return rbconn->list.count; } static void tree_gc_worker(struct work_struct *work) -- 2.53.0