m 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 4dVNbS58KNz3VDK for ; Mon, 15 Dec 2025 15:03:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765810980; 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=Sqhq0O1rZRww1oSkTp31lFqgJt8XSOi+inkh5zNi+Qs=; b=PlpwEQrviCliJQcqKlMczZNAAmatEnEEUnnrCbAPtrIymfnqidpDtzEMD0WDxJsfrG19O0 UWi4ipDU4YDgrbV91ltPX8n6lLsAELiT18t4VgsdMKbXwkAU4H32GY9AUIMvaFad8d+cuP JRG7gyCQbJjw1Ca/rdKicUxdej99MnbSzwRlKIuDDUJRW4uQ33tML1hh4pQF9DlINJEhxI sooSbTLa2v23p3c05li65iYMYzY2/jXlaShQDUp2/2kiUY6Kfe+7nhfMaeYPnPiOp8NmXL 87SlXaIFEDpKhrqBEscr4Poghp1l/28QsQ/UhFXCWoZ2QJcvD2CNQ5WsqYHIrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765810980; 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=Sqhq0O1rZRww1oSkTp31lFqgJt8XSOi+inkh5zNi+Qs=; b=fhqWRqFYnt7u+zoJx1Bx3f9JKI44ry6+tm9sHCDMDitEZwwF6sNanr3ErYIaNQKZn8GrLb hAXS4MomW5JGATe+DCueJGzlb6MHoNNqUvh/fzctyajk9TKs0EWedm2U/alFzmqYq969OB n/ey9jLo99vd2elfNB6UVXJAv97rH0xMudcgRacnFxSOEE9lx8gMeUho97ohEMllCH0FpU dA8mrJ9W9OMOBhWn0u95fQKGv/lt0CmJVqP1grBek9ehTXBknaEYhDQIMO/kLK3PKZE2EG HRUkqhAjY/cyx7YQHQ3RMcJwgxmhvuNxUNvRjmEAz3iZDjgoRJBuQEWON+lqhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765810980; a=rsa-sha256; cv=none; b=N0DGjAJmX1iGIcVp6lGQIcn/99lCb0SGsr9Wc3XozmN7fHBlkPnBQAlau5zOefj76mil7F GaoEvcljrllWcsMcS1RPHfktm4IFNYD6PE83U6yTdpIUKnMWjklfLGARvebmAJI80XFdDL /H5eQ4hSuSNQ5aB9MJTJy8hkT6q7lLQGBAm15nPfiXkEV7MsNu02PKjBrK+nZJ4BDJbIBC ZzZFqVgV70YbsLsjx5yYDdqHC/v8jobv/neQrhYaDMapzjdRhKEE4n0hpyguOfOWyEDgoI pLXLNb4agHSCrkOYq7gTn6XE9YnvNNHSr4Leb3jurmAwFajXV0DQql5SkkE1QQ== 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 4dVNbS4RMVz90c for ; Mon, 15 Dec 2025 15:03:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a4f9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 15:03:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron From: Ed Maste Subject: git: c5445540995f - stable/15 - linuxkpi: Take const root in read-only radix tree functions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: c5445540995fd37c390ad371a2e95d300ee83988 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 15:03:00 +0000 Message-Id: <69402324.3a4f9.494b71e2@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c5445540995fd37c390ad371a2e95d300ee83988 commit c5445540995fd37c390ad371a2e95d300ee83988 Author: Jean-Sébastien Pédron AuthorDate: 2025-09-07 16:40:49 +0000 Commit: Ed Maste CommitDate: 2025-12-15 15:02:09 +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 (cherry picked from commit cf39b51d36d82214ebdfd03055d321ddd2d85274) --- 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;