From nobody Wed May 14 23:57:45 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 4ZyVdj61brz5w1VF; Wed, 14 May 2025 23:57:45 +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 4ZyVdj5V8Tz3mdh; Wed, 14 May 2025 23:57:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747267065; 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=ijAbNV0rr2gf43UuyHVzwXJzvFF5G2//VF53/arhTA8=; b=Pee8vuHijGGNyatWTfQV9HOJyYU2tyw+TFaQGsS7JoslN6yzQTMnkRNtAE2DhtPU5Lqn7z Sh9ZI4OdMZXYKRK7u9ml/1iQY3Hferhy79WN1gJLCrH2keKf6fkDS2NP9+XH/VDG0l7AqR IL2KCzEsKDgiQUnjIEuS7XPQaM7tifZvj3qdwjanBBKI+eRauPqX9TaVyJSO6qkoYZ04i5 L/9mjeLpspZDes+Or1QZbe7IkzumJHU1Na/6JchfUtO81CD6DltXnxlLwoWR7GmoLv5brK YEJoqzy2AsNzIq+bdugwLNKgViVVYMu9MaXHJB8rnuRzjmk6Xc1XnK2Bveooig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747267065; 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=ijAbNV0rr2gf43UuyHVzwXJzvFF5G2//VF53/arhTA8=; b=q4OeqPeukGPM4ei5Ebr/3Oy5upZ1KbJYaDshFLWYu3D0k9C630gV9q6p2GYr7N8fi3ZeSY YZRZMBAq2BNZNX0OPC1kY+abW7JnmdIhFJ5a8kB6qGqSBZPWN73N6dhj5qh43LYqTdv20H +5V990tNMIEWhaKnItdeOeLNgN2fhocTuolEYCB+MljFjMcAnoDQ21RsJ0NSlsbest+eRl SqfnePr771DGXoZtqWrQpR6pVoWi81gJXSZVoBX3UgTnGLAFYAEZxfMbNXR1DRmvCnm7an 2NG/ZcUv7HA4V4wTxXMsZeKA1/T5U22uM3mVAUN+oeOIJvcou9SqWwRpL7u0GQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747267065; a=rsa-sha256; cv=none; b=TZw9vFvrJ7g/0ZUh1VpX0Z36BUq8qEvIbjkN1tkRgUlAbr40n3lUevZxVYLyyeSb3S+zQf 3obhSpYN6wZY804VBMyQcdoAYHq8Va4tpZu8Rp3n9q2HAFfMtWZcLAmatdDxbDSAiMWmmk 7Ov8uvnxbArrmCgG9TgzuqIF39wIwEMSAu5tUi1bOwnS14HAEtvvNgRJsoL3AZSv9EgA3X Xi9Jp2fRcA7BpLKtCToVjz66dZBFfnFF+JeXZV8rRUGsxWGzytabKs1zYyOTcBxBaoAmow dXahe0Xe5GKt/gbsOGfH0hVhyfnzkJcqG08lCl7z95DarvHPHSG8pHh3K6rteg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZyVdj4YD1ztng; Wed, 14 May 2025 23:57:45 +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 54ENvj1o027813; Wed, 14 May 2025 23:57:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54ENvjcB027810; Wed, 14 May 2025 23:57:45 GMT (envelope-from git) Date: Wed, 14 May 2025 23:57:45 GMT Message-Id: <202505142357.54ENvjcB027810@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: cb205f5ed808 - main - pctrie_lookup_range: don't write the null 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: cb205f5ed80867be747335e98cffad75873ba60b Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=cb205f5ed80867be747335e98cffad75873ba60b commit cb205f5ed80867be747335e98cffad75873ba60b Author: Doug Moore AuthorDate: 2025-05-14 23:56:34 +0000 Commit: Doug Moore CommitDate: 2025-05-14 23:56:34 +0000 pctrie_lookup_range: don't write the null There's no reason to write the NULL pointer value into the array when pctrie_lookup_range finds an item missing. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D50353 --- sys/kern/subr_pctrie.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c index e91966652f80..67566a2d1bfe 100644 --- a/sys/kern/subr_pctrie.c +++ b/sys/kern/subr_pctrie.c @@ -617,16 +617,16 @@ _pctrie_lookup_range(struct pctrie *ptree, struct pctrie_node *node, struct pctrie_node **parent_out, smr_t smr, enum pctrie_access access) { struct pctrie_node *parent; + uint64_t *val; int base, end, i; parent = node; for (i = 0; i < count;) { node = _pctrie_lookup_node(ptree, parent, index + i, &parent, smr, access); - value[i] = pctrie_match_value(node, index + i); - if (value[i] == NULL) + if ((val = pctrie_match_value(node, index + i)) == NULL) break; - ++i; + value[i++] = val; base = (index + i) % PCTRIE_COUNT; if (base == 0 || parent == NULL || parent->pn_clev != 0) continue; @@ -634,10 +634,9 @@ _pctrie_lookup_range(struct pctrie *ptree, struct pctrie_node *node, while (i < end) { node = pctrie_node_load(&parent->pn_child[base++], smr, access); - value[i] = pctrie_toval(node); - if (value[i] == NULL) + if ((val = pctrie_toval(node)) == NULL) break; - ++i; + value[i++] = val; } if (i < end) break;