From nobody Tue Dec 9 18:16:38 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 4dQn9f4BrMz6JKFF for ; Tue, 09 Dec 2025 18:16:38 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dQn9f3Vvxz3c5K for ; Tue, 09 Dec 2025 18:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765304198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dI+cgp1Ipzw4EPT4JktUFgGNasiJtMdZ8gn0v4hd2hU=; b=kNt+SiQ0sXEyONC4Ykmkytrxdn1YkjNhJDJ1aFraxVW+Hkr9aSiv5iGwVAio5hIo9s9Zqs xjzQFfW/8vVhv2pE74O+B64xpVfJ0+gX2oBsHNQ1IAkZfWft86y4BxejT5WyXHecTXLgjm kUzxEjc/UZv1aIbqKyJL6Wz91jqzuaxSu4i6n1M1d+bEQSUoljicQiqzsCRy+YxKO4vlBC nSxaV9s751mGa3oq2rjrRRN/Dmj9XS6zT5KXI1N5Fw4FATPlPjvUyN8tCkYJUgToznBl72 5IeP1NHNXAIGy4ibY5ey6qZJYJ55f3y8kdJhPeXNGZNbGsA8QmCTo9MAIFForQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765304198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dI+cgp1Ipzw4EPT4JktUFgGNasiJtMdZ8gn0v4hd2hU=; b=PNmQgfJV8q0+O5UWK3w1iiAtD/uSkl/AsumRoMyO6XFP0tPXSC9eLH1UpQgH1Ss+Qjzg8u IIY3Ex5YOZjU8Pi1LgA1OBmh7R1GlkKeedVMn0OqMpDSa48vHYos/0WOAwtAfu0MNTFhTu OweiSwU5U5DVS2rne3veQCnNYrfPDsxJ4rYd0VzT8wdc5TdrOsy/GsOkfAtlollcdW0X3A yCFulHegccmHXMbYqKSYxrgr/YbWZ4feSeuaEQMCa4vSJkt7e0fWF74qbG8bpI2pRGwA2H AXHM4TSpZShEBLxuO2yfeoXdb2raSeenL0BzJn2oYDTS9byYoR82l32XPaXBXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765304198; a=rsa-sha256; cv=none; b=PVXqHLsBGPfbYajoB+I6cmK/nYx43eXson5F1yzFZo1cesHW3hixauniu+vhSyvYpY2VeV l9IgyNLJb2rkLR/1ZZfePvWUOoJ55Asd8gmGeXkVoIO3667YJBXCLBx1w0QlDLOJ/JAwa3 jFGuFud+6JXgJ6ueLcjIbNMMwNYEB6AOGnywYjkxSM0eUiNI9wcBQXzOiMTyRPky302uwG Tj8T6t84P4qU/O/ddehKadhJ7+T+ho0QR/9rftULfX3ktu9LaPdkxFNq9qF/o/rixjw/UK 2MV4WvdZVHsPNcTiyV5D/rL8BYL17i3ocR6fCiGdSDbQw9Yy7Ty+wb3iFfYRcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dQn9f2q6bz18w7 for ; Tue, 09 Dec 2025 18:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24471 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Dec 2025 18:16:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron From: Ed Maste Subject: git: cf39b51d36d8 - main - linuxkpi: Take const root in read-only radix tree functions 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf39b51d36d82214ebdfd03055d321ddd2d85274 Auto-Submitted: auto-generated Date: Tue, 09 Dec 2025 18:16:38 +0000 Message-Id: <69386786.24471.48db54c3@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cf39b51d36d82214ebdfd03055d321ddd2d85274 commit cf39b51d36d82214ebdfd03055d321ddd2d85274 Author: Jean-Sébastien Pédron AuthorDate: 2025-09-07 16:40:49 +0000 Commit: Ed Maste CommitDate: 2025-12-09 18:16:16 +0000 linuxkpi: Take const root in read-only radix tree functions This is a preparation step for a future addition to this file. This is also closer to what Linux does. Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- sys/compat/linuxkpi/common/include/linux/radix-tree.h | 4 ++-- sys/compat/linuxkpi/common/src/linux_radix.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/radix-tree.h b/sys/compat/linuxkpi/common/include/linux/radix-tree.h index ea75836c26fb..1019697303db 100644 --- a/sys/compat/linuxkpi/common/include/linux/radix-tree.h +++ b/sys/compat/linuxkpi/common/include/linux/radix-tree.h @@ -74,11 +74,11 @@ radix_tree_exception(void *arg) return ((uintptr_t)arg & RADIX_TREE_ENTRY_MASK); } -void *radix_tree_lookup(struct radix_tree_root *, unsigned long); +void *radix_tree_lookup(const struct radix_tree_root *, unsigned long); void *radix_tree_delete(struct radix_tree_root *, unsigned long); int radix_tree_insert(struct radix_tree_root *, unsigned long, void *); int radix_tree_store(struct radix_tree_root *, unsigned long, void **); -bool radix_tree_iter_find(struct radix_tree_root *, struct radix_tree_iter *, void ***); +bool radix_tree_iter_find(const struct radix_tree_root *, struct radix_tree_iter *, void ***); void radix_tree_iter_delete(struct radix_tree_root *, struct radix_tree_iter *, void **); #endif /* _LINUXKPI_LINUX_RADIX_TREE_H_ */ diff --git a/sys/compat/linuxkpi/common/src/linux_radix.c b/sys/compat/linuxkpi/common/src/linux_radix.c index af53d8bff366..ee6b3a63c370 100644 --- a/sys/compat/linuxkpi/common/src/linux_radix.c +++ b/sys/compat/linuxkpi/common/src/linux_radix.c @@ -41,7 +41,7 @@ static MALLOC_DEFINE(M_RADIX, "radix", "Linux radix compat"); static inline unsigned long -radix_max(struct radix_tree_root *root) +radix_max(const struct radix_tree_root *root) { return ((1UL << (root->height * RADIX_TREE_MAP_SHIFT)) - 1UL); } @@ -64,7 +64,7 @@ radix_tree_clean_root_node(struct radix_tree_root *root) } void * -radix_tree_lookup(struct radix_tree_root *root, unsigned long index) +radix_tree_lookup(const struct radix_tree_root *root, unsigned long index) { struct radix_tree_node *node; void *item; @@ -85,8 +85,8 @@ out: } bool -radix_tree_iter_find(struct radix_tree_root *root, struct radix_tree_iter *iter, - void ***pppslot) +radix_tree_iter_find(const struct radix_tree_root *root, + struct radix_tree_iter *iter, void ***pppslot) { struct radix_tree_node *node; unsigned long index = iter->index;