From nobody Thu Jun 26 22:54:53 2025 X-Original-To: dev-commits-src-main@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 4bSvCL0VJvz5yv9T; Thu, 26 Jun 2025 22:54:54 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bSvCL0244z3rc9; Thu, 26 Jun 2025 22:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750978494; 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=8g6dCCvH307UZuIUwYd/bidr6rj91AuuloJF7q3Krho=; b=xBJc1AuFJfNQAgsJhYLxjZbcsbbITYbd5GgKKn6zxVxwh0yk3Lcfg6rpp/QJoHdCJr6BdS S4sSKSDRUu2y0oAGS4I+qm+RdqSmceQBWu8XwSo15BW2/9vLKE/ctk8Lx/TccV7gf5+ZpU OqTyUrk7FYjXONEmcCxnFo/LHeC8bKpk7ZupBZvDruFQ7xSAZcHas3VkpgL2OQqIgjWNIK Ru0f0/zvIAqFJYe2I8zBrCi4ODOs1Ji53HxKzQVk3sF3gbNFlc4yagHKi/qsVmATllpGFC BvZjrfJW0kCdQ7tId/utrbSREi0xF7rDhTpte7UK7lyknFE+OdMLbIRFiNCaLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750978494; 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=8g6dCCvH307UZuIUwYd/bidr6rj91AuuloJF7q3Krho=; b=PbUHrXxyNUydMA6l2tdY0d8A7vc6cSWiWu0RcsFU+LNnjQbIH3eTyEMspxNqz9TAt+O263 ZbAkKlW9AojgLp1wDYb+RryUtLjpSV3TYOwoY3KmOelLxmsGUbviWi6FMLphsbJQtZy/QQ dS2GbEy6TV5ICH0u4k3Yf/cU7fzEH+3/HN/nvYpaTB7D4he4vZ+mzaE2A8nLpGd6L33OmD 2MgECZxHKNot0fg/1AHi9RpzD5RUtHAs907yYB5w/4xo1X6y51SvZf0Kq0RP+G5dnKg9U3 RSOJXzGA973tTNRrX7hDe6S6RZp2iBkt6EfdupnhtbnHo4g3fWmDNAqfW3amCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750978494; a=rsa-sha256; cv=none; b=OWb3MUNXl9XzjthFH8NYiSIh2npPyIifmhqDN50wHPhn1g8c6bSPDKawpOZxMbl4KCeRfs re+wfK1J3wJ5FTjtr94plu6qz6MF/tPpIrBH8Z63ONC/tcXm50AtfzegI6ir1qKpXsHI9O bdrBPEBZcXeAdLYqdFBg29xX72VV2LyrtnslujSp9zbByMC1Z651B19iZrje28EwsUSyet Akyea6ibIP4/2VXc7pZDjraFfC6FJDGGv/+BXY1P+9r7W8RTA73TtS9gy+SH/vljTmyzjh Oxixdd9Gbh4UatRS0hJT1HldZTHCmP7uP7bKWwAQwxHHQm5ztjCCoNi2mQQhTA== 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 4bSvCK5ztHz7MT; Thu, 26 Jun 2025 22:54:53 +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 55QMsrVr015020; Thu, 26 Jun 2025 22:54:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55QMsrVm015017; Thu, 26 Jun 2025 22:54:53 GMT (envelope-from git) Date: Thu, 26 Jun 2025 22:54:53 GMT Message-Id: <202506262254.55QMsrVm015017@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: 725eb0f85ea9 - main - pctrie: drop freenode param to pctrie_remove List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 725eb0f85ea9fb0c5745efe789f7dcfb1e9d78b3 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=725eb0f85ea9fb0c5745efe789f7dcfb1e9d78b3 commit 725eb0f85ea9fb0c5745efe789f7dcfb1e9d78b3 Author: Doug Moore AuthorDate: 2025-06-26 22:53:43 +0000 Commit: Doug Moore CommitDate: 2025-06-26 22:53:43 +0000 pctrie: drop freenode param to pctrie_remove Drop the freenode argument to pctrie_remove, and instead return a bool to the caller so that the caller can set a freenode value to NULL or something else. Reviewed by: alc, markj, kib Differential Revision: https://reviews.freebsd.org/D51057 --- sys/kern/subr_pctrie.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c index 194e96ced471..3a3548bad52b 100644 --- a/sys/kern/subr_pctrie.c +++ b/sys/kern/subr_pctrie.c @@ -872,19 +872,17 @@ pctrie_iter_jump_le(struct pctrie_iter *it, int64_t jump) * 'node'. If doing so causes 'node' to have only one child, purge it from the * pctrie and save it in *freenode for later disposal. */ -static void -pctrie_remove(struct pctrie *ptree, struct pctrie_node *node, uint64_t index, - struct pctrie_node **freenode) +static bool +pctrie_remove(struct pctrie *ptree, struct pctrie_node *node, uint64_t index) { smr_pctnode_t *parentp; struct pctrie_node *child; int slot; - *freenode = NULL; parentp = pctrie_child(ptree, node, index); if (node == NULL) { pctrie_node_store(parentp, PCTRIE_NULL, PCTRIE_LOCKED); - return; + return (false); } slot = pctrie_slot(node, index); KASSERT((node->pn_popmap & (1 << slot)) != 0, @@ -893,12 +891,11 @@ pctrie_remove(struct pctrie *ptree, struct pctrie_node *node, uint64_t index, node->pn_popmap ^= 1 << slot; if (!powerof2(node->pn_popmap)) { pctrie_node_store(parentp, PCTRIE_NULL, PCTRIE_LOCKED); - return; + return (false); } pctrie_node_store(parentp, PCTRIE_NULL, PCTRIE_UNSERIALIZED); KASSERT(node->pn_popmap != 0, ("%s: bad popmap all zeroes", __func__)); slot = ffs(node->pn_popmap) - 1; - *freenode = node; child = pctrie_node_load(&node->pn_child[slot], NULL, PCTRIE_LOCKED); KASSERT(child != PCTRIE_NULL, ("%s: bad popmap slot %d in node %p", __func__, slot, node)); @@ -907,6 +904,7 @@ pctrie_remove(struct pctrie *ptree, struct pctrie_node *node, uint64_t index, pctrie_setparent(child, node); parentp = pctrie_child(ptree, node, index); pctrie_node_store(parentp, child, PCTRIE_LOCKED); + return (true); } /* @@ -923,8 +921,8 @@ pctrie_remove_lookup(struct pctrie *ptree, uint64_t index, node = _pctrie_lookup_node(ptree, NULL, index, &parent, NULL, PCTRIE_LOCKED); m = pctrie_match_value(node, index); - if (m != NULL) - pctrie_remove(ptree, parent, index, freenode); + if (m != NULL && pctrie_remove(ptree, parent, index)) + *freenode = parent; else *freenode = NULL; return (m); @@ -941,9 +939,11 @@ pctrie_iter_remove(struct pctrie_iter *it, struct pctrie_node **freenode) it->ptree, it->node, it->index), NULL, PCTRIE_LOCKED), it->index), ("%s: removing value %jx not at iter", __func__, (uintmax_t)it->index)); - pctrie_remove(it->ptree, it->node, it->index, freenode); - if (*freenode != NULL) + if (pctrie_remove(it->ptree, it->node, it->index)) { + *freenode = it->node; it->node = pctrie_parent(it->node); + } else + *freenode = NULL; } /*