From nobody Sat Jun 14 19:33:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bKRJ33WhCz5phWV; Sat, 14 Jun 2025 19:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bKRJ32m3zz3RC8; Sat, 14 Jun 2025 19:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749929587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=88kZrFfXYh3LkmZtZh8CwEKc6RFtdkWqLML/FQQHHII=; b=vbNM9K/W+roj9yadzU0RVBH6YOl4WfOUdQV7lWgoHS7PD7D/+wryda2+CIP4QeS6FYP4Oe eJgc7JYNK5BzA4m05ROKwm5asGUcGI1lsCGd2VcvZ7AZiUthdzmJHIkmXqMCqG30QL+FHi hChcn/6r0cJ01dI+SsVwckhsN1zSQxwJRMdYrBVw2EBNp8pNbpzMHkJZ1SYdL21sZI5VRr xKDtmVqSlCE9GbJ3DMqw2Io/4uQThUCceSNRER0lDcs4OpcnWRtF36BJCBu0ZmsxGM0wfN RyRUVMZBkFKqls7CxXaipECROGrE554AINMmmsH0iQDvX2hwnzA4wruzW3o87w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749929587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=88kZrFfXYh3LkmZtZh8CwEKc6RFtdkWqLML/FQQHHII=; b=ArGlyfbmEMct+EJJA6qWSqE8Qfw4Ao61DdWfNVA28Eh5swamkpwz5ol/rCYbDNFiLmqcVF 2LLdTPQE0DmAgDECss8Pd41Jk7fMzVhBxJmCQZ9AU9SdhXkjYwXmBjSuh7Al6LuI9B4GTe /WaAxW4x2AqlMZu1x8ZWWcUnhIMlAofY8ZcD+ftB6dB4DHw/b/2DRmphKcAIa9FpUPpHeh h+ZTtmT9+YIsiFk5iIMfIp6r2RVgAYhnrN+0Qs/ZHK+WY4sWr/IZNOFMJebIrwx3+Z0tbS hPlw13bOeafQbbQ3rGzlCmLEEfTkoLQNqRCtzEZU19zxnjliU6ZUWanirEVgkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749929587; a=rsa-sha256; cv=none; b=Q5iNeJpOXn3nYSvLyYEINR92RcB/38jsy4dtI869wAC3jpMERJGA1bCeQKIIhchMNFjsGc AIWpVDFxwDZad5XzPGBa+T8NCkxDOl3+xT0V3iZ+YiNXo5gVXFQo4sE2GUj6KWBAkbDSRH QeIWPhuAcJ5NfqlVgVL5Zg6f4ZbjiuKDTHDe61qepqa3kJlnCrSqCh8zcB+z5AokcdNrvJ Z5HDpK7zIgHVTo0W4T1jiboFZ+PkVvIqM2J93NHfPsnlYw4SuEgsp8sISw+35Zt1iWRk5b MkClFEzEvGf7G3pBJvS+ede0+bvn0jcdD9KDZ206VPs8nHrBxsdJxcvSJzbc7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bKRJ31tnKzhD1; Sat, 14 Jun 2025 19:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55EJX7Ah037372; Sat, 14 Jun 2025 19:33:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55EJX7If037369; Sat, 14 Jun 2025 19:33:07 GMT (envelope-from git) Date: Sat, 14 Jun 2025 19:33:07 GMT Message-Id: <202506141933.55EJX7If037369@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 7458fac87831 - main - pctrie: simplify lookup_node List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7458fac87831d922c25b981097bfc428f6256faa Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=7458fac87831d922c25b981097bfc428f6256faa commit 7458fac87831d922c25b981097bfc428f6256faa Author: Doug Moore AuthorDate: 2025-06-14 19:32:08 +0000 Commit: Doug Moore CommitDate: 2025-06-14 19:32:08 +0000 pctrie: simplify lookup_node Change _pctrie_lookup_node to simplify it, avoiding lookup up the root node when it's already been traversed. Reviewed by: alc Differential Revision: https://reviews.freebsd.org/D50750 --- sys/kern/subr_pctrie.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c index cb813cfbd847..e8098c6052e3 100644 --- a/sys/kern/subr_pctrie.c +++ b/sys/kern/subr_pctrie.c @@ -489,29 +489,28 @@ _pctrie_lookup_node(struct pctrie *ptree, struct pctrie_node *node, struct pctrie_node *parent; int slot; + parent = node; + if (parent == NULL) + node = pctrie_root_load(ptree, smr, access); + /* * Climb the search path to find the lowest node from which to start the * search for a value matching 'index'. */ - while (node != NULL) { - KASSERT(access == PCTRIE_SMR || !powerof2(node->pn_popmap), + while (parent != NULL) { + KASSERT(access == PCTRIE_SMR || !powerof2(parent->pn_popmap), ("%s: freed node in iter path", __func__)); + node = parent; if (!pctrie_keybarr(node, index, &slot)) break; - node = pctrie_parent(node); - } - - if (node == NULL) { - parent = NULL; - node = pctrie_root_load(ptree, smr, access); - } else { - parent = node; - node = pctrie_node_load(&node->pn_child[slot], smr, access); + parent = pctrie_parent(node); } /* Seek a node that matches index. */ while (!pctrie_isleaf(node) && !pctrie_keybarr(node, index, &slot)) { parent = node; + KASSERT(access == PCTRIE_SMR || !powerof2(parent->pn_popmap), + ("%s: freed node in iter path", __func__)); node = pctrie_node_load(&node->pn_child[slot], smr, access); } *parent_out = parent; @@ -527,9 +526,9 @@ pctrie_iter_lookup(struct pctrie_iter *it, uint64_t index) { struct pctrie_node *node; - it->index = index; node = _pctrie_lookup_node(it->ptree, it->node, index, &it->node, NULL, PCTRIE_LOCKED); + it->index = index; return (pctrie_match_value(node, index)); } @@ -543,9 +542,9 @@ pctrie_iter_insert_lookup(struct pctrie_iter *it, uint64_t *val) { struct pctrie_node *node; - it->index = *val; node = _pctrie_lookup_node(it->ptree, it->node, *val, &it->node, NULL, PCTRIE_LOCKED); + it->index = *val; if (node == PCTRIE_NULL) { if (it->node == NULL) pctrie_node_store(pctrie_root(it->ptree),