From nobody Mon May 4 01:48:56 2026 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 4g84Lc2N0jz6c92d for ; Mon, 04 May 2026 01:48:56 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g84Lc1X0zz40Pb for ; Mon, 04 May 2026 01:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777859336; 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=YijwUJdjTKBekwWiySYVbHHyUPNnMQNerRb0pveO/04=; b=Rcpd2/Syy7JY/4GCdsD1+kNQG2+z0rsUjkbq0WDdxL5peJnge5aePZy/Uo6fiH5dZxtz0C z75XCuce5Nb5WwkcIx6w2aLuVOSjlewoNn7lIa3c8plC1g2FMmT+CeHjn/hJj2dxp4ok0d /zjjLnxFEYw+hLqJEDdQY0yMmCbn+TWL/MAB4+fFR2I/ddEGGsrZ33/cL3RwZ0V8M90GJF wv/hsNZrm0E0YvwxtZpXGk0b4zywY1pSbY7EM4JYz7brufYP+t8iSkfIUKKrgAxlXvZofe wHGI9uscji1wWJTUe19FM0kbygZ3Mze19sYt2xdMmvt9Jx+7D9paVWSRMJSrdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777859336; a=rsa-sha256; cv=none; b=TbqXty6Aib8V7XrDzBMvJ11lwCYjMb+PsfmYjwejuEOj7bEYG5lhlXDkorHnggdnxpB8J2 kwxG7jTq6GTvsvAn5p0G4C3Pg3hLMDC54/kL++/NcOGCJ7gFMDFCQwfWqdmh863O9jJZch 0h+GvRV5I7O3X1QjBrK1hsye9R8FvUJRz7W/uAjz8d4fNqvqJyokmf4nl9ioGjUNvR6JTY v6rMuE7TeOUXbOGCrihQSBfXx1FrnRgJVFSlluHKyK+W3Li/dHduChX27at2UyubWZ70ml rKlisV2v6d1qJdJ5EytRnYWUIcTG18o3F/HLxl6GpSiwaZh8+DKs9Y99kO7uJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777859336; 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=YijwUJdjTKBekwWiySYVbHHyUPNnMQNerRb0pveO/04=; b=OvaQSwhV3n3EzcoJ+jR9tKj1tSSxNp5mITSWF10KG9ZHD9Qy96J1/OPv0MQDOMZ0b+ELqn twhPInLkVgrvBwjfXq7vFoA5ZXs/KAtJbuF2ce6n2R9AWjt68IHE7fh//s7/TYzrv9RepD QOAWV9RiH/bul2jt9yKvSDCfqgLSn3XBTyI/0odlwPlKbNdU9HLioedRYusc7p91qZQrUM sqx7zJBfwToVW5GBRyIEdSmzAL4jVpRqv4jwvVBylvgodXhyN7dnd8KnMhDzD492vAtyZ/ AO70BbY0w6UL1QTk3g6zPHC/UpPhgZ9RZ2AOInCB0MTWCaNorpoxSY8rJL8zLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g84Lc110Fzygd for ; Mon, 04 May 2026 01:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bb6b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 01:48:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 7a40b8a89e7d - main - dpaa: Fix copyright headers 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a40b8a89e7da2a7e8d8e132bc37885b22e9bfb1 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 01:48:56 +0000 Message-Id: <69f7fb08.3bb6b.40509e12@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=7a40b8a89e7da2a7e8d8e132bc37885b22e9bfb1 commit 7a40b8a89e7da2a7e8d8e132bc37885b22e9bfb1 Author: Justin Hibbits AuthorDate: 2026-05-04 01:43:44 +0000 Commit: Justin Hibbits CommitDate: 2026-05-04 01:47:54 +0000 dpaa: Fix copyright headers Reported by: ziaee@ Fixes: fd8d34ce27 ("dpaa: Migrate from NCSW base to a home-grown driver") --- sys/dev/dpaa/bman.c | 4 ++-- sys/dev/dpaa/bman.h | 4 ++-- sys/dev/dpaa/bman_portals.c | 4 ++-- sys/dev/dpaa/bman_var.h | 4 ++-- sys/dev/dpaa/dpaa_common.c | 4 ++-- sys/dev/dpaa/dpaa_common.h | 4 ++-- sys/dev/dpaa/fman.c | 6 +++--- sys/dev/dpaa/fman_if.m | 2 +- sys/dev/dpaa/fman_muram.c | 4 ++-- sys/dev/dpaa/fman_parser.h | 4 ++-- sys/dev/dpaa/fman_port.c | 6 +++--- sys/dev/dpaa/fman_port.h | 6 +++--- sys/dev/dpaa/fman_port_if.m | 24 +----------------------- sys/dev/dpaa/fman_xmdio.c | 6 +++--- sys/dev/dpaa/if_memac.c | 6 +++--- sys/dev/dpaa/if_memac.h | 25 +++---------------------- sys/dev/dpaa/if_memac_fdt.c | 25 +++---------------------- sys/dev/dpaa/qman.c | 4 ++-- sys/dev/dpaa/qman_portal_if.m | 4 ++-- sys/dev/dpaa/qman_portals.c | 4 ++-- sys/dev/dpaa/qman_var.h | 4 ++-- 21 files changed, 47 insertions(+), 107 deletions(-) diff --git a/sys/dev/dpaa/bman.c b/sys/dev/dpaa/bman.c index 90095427f10d..3d1052f9ed9f 100644 --- a/sys/dev/dpaa/bman.c +++ b/sys/dev/dpaa/bman.c @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/sys/dev/dpaa/bman.h b/sys/dev/dpaa/bman.h index d8a76bfa672b..118c6f5938bc 100644 --- a/sys/dev/dpaa/bman.h +++ b/sys/dev/dpaa/bman.h @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ /*- diff --git a/sys/dev/dpaa/bman_portals.c b/sys/dev/dpaa/bman_portals.c index c4f6431857b9..b0c8200c1880 100644 --- a/sys/dev/dpaa/bman_portals.c +++ b/sys/dev/dpaa/bman_portals.c @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #include "opt_platform.h" diff --git a/sys/dev/dpaa/bman_var.h b/sys/dev/dpaa/bman_var.h index 67a0d7dd007a..91484da61ac3 100644 --- a/sys/dev/dpaa/bman_var.h +++ b/sys/dev/dpaa/bman_var.h @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #ifndef BMAN_VAR_H diff --git a/sys/dev/dpaa/dpaa_common.c b/sys/dev/dpaa/dpaa_common.c index 56345064dfca..c5055231298b 100644 --- a/sys/dev/dpaa/dpaa_common.c +++ b/sys/dev/dpaa/dpaa_common.c @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/sys/dev/dpaa/dpaa_common.h b/sys/dev/dpaa/dpaa_common.h index 1d81d63877a4..8fa43a034ef5 100644 --- a/sys/dev/dpaa/dpaa_common.h +++ b/sys/dev/dpaa/dpaa_common.h @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #ifndef DPAA_COMMON_H diff --git a/sys/dev/dpaa/fman.c b/sys/dev/dpaa/fman.c index c0c7ec8cb17b..b94c05fd7dbf 100644 --- a/sys/dev/dpaa/fman.c +++ b/sys/dev/dpaa/fman.c @@ -1,7 +1,7 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * +/* * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/sys/dev/dpaa/fman_if.m b/sys/dev/dpaa/fman_if.m index bdca87a2fe2c..e7412ca64195 100644 --- a/sys/dev/dpaa/fman_if.m +++ b/sys/dev/dpaa/fman_if.m @@ -1,4 +1,4 @@ -#- +# # SPDX-License-Identifier: BSD-2-Clause # # Copyright (c) 2026 Justin Hibbits diff --git a/sys/dev/dpaa/fman_muram.c b/sys/dev/dpaa/fman_muram.c index 35ea02065456..a3df993dbb98 100644 --- a/sys/dev/dpaa/fman_muram.c +++ b/sys/dev/dpaa/fman_muram.c @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/sys/dev/dpaa/fman_parser.h b/sys/dev/dpaa/fman_parser.h index 65dc5bcabe69..aff95b1ae9d9 100644 --- a/sys/dev/dpaa/fman_parser.h +++ b/sys/dev/dpaa/fman_parser.h @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #ifndef DPAA_FMAN_PARSER_H diff --git a/sys/dev/dpaa/fman_port.c b/sys/dev/dpaa/fman_port.c index 548557edc7f8..384d13a7b3a7 100644 --- a/sys/dev/dpaa/fman_port.c +++ b/sys/dev/dpaa/fman_port.c @@ -1,7 +1,7 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * +/* * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/sys/dev/dpaa/fman_port.h b/sys/dev/dpaa/fman_port.h index eea7019077e3..8803c5e5f7c9 100644 --- a/sys/dev/dpaa/fman_port.h +++ b/sys/dev/dpaa/fman_port.h @@ -1,7 +1,7 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * +/* * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #ifndef DPAA_FMAN_PORT_H diff --git a/sys/dev/dpaa/fman_port_if.m b/sys/dev/dpaa/fman_port_if.m index 2a5c939cc4a0..fe6159340c2c 100644 --- a/sys/dev/dpaa/fman_port_if.m +++ b/sys/dev/dpaa/fman_port_if.m @@ -1,29 +1,7 @@ -#- -# SPDX-License-Identifier: BSD-2-Clause # # Copyright (c) 2026 Justin Hibbits # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# +# SPDX-License-Identifier: BSD-2-Clause #include #include diff --git a/sys/dev/dpaa/fman_xmdio.c b/sys/dev/dpaa/fman_xmdio.c index 913f09781c85..521c30860dc5 100644 --- a/sys/dev/dpaa/fman_xmdio.c +++ b/sys/dev/dpaa/fman_xmdio.c @@ -1,7 +1,7 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * +/* * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/sys/dev/dpaa/if_memac.c b/sys/dev/dpaa/if_memac.c index dd338b318492..6d0fa3f5e337 100644 --- a/sys/dev/dpaa/if_memac.c +++ b/sys/dev/dpaa/if_memac.c @@ -1,7 +1,7 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * +/* * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/sys/dev/dpaa/if_memac.h b/sys/dev/dpaa/if_memac.h index a10e6f932d01..98942abaf79c 100644 --- a/sys/dev/dpaa/if_memac.h +++ b/sys/dev/dpaa/if_memac.h @@ -1,27 +1,8 @@ -/*- +/* + * Copyright (c) 2026 Justin Hibbits * Copyright (c) 2011-2012 Semihalf. - * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * SPDX-License-Identifier: BSD-2-Clause */ #ifndef IF_MEMAC_H_ diff --git a/sys/dev/dpaa/if_memac_fdt.c b/sys/dev/dpaa/if_memac_fdt.c index 455b021c52a4..f136608a906c 100644 --- a/sys/dev/dpaa/if_memac_fdt.c +++ b/sys/dev/dpaa/if_memac_fdt.c @@ -1,27 +1,8 @@ -/*- +/* + * Copyright (c) 2026 Justin Hibbits * Copyright (c) 2012 Semihalf. - * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/sys/dev/dpaa/qman.c b/sys/dev/dpaa/qman.c index 550f7e288a6b..9143ebde5cb4 100644 --- a/sys/dev/dpaa/qman.c +++ b/sys/dev/dpaa/qman.c @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ /*- * Copyright (c) 2011-2012 Semihalf. diff --git a/sys/dev/dpaa/qman_portal_if.m b/sys/dev/dpaa/qman_portal_if.m index 35bc087a4ec1..2efe31dd6980 100644 --- a/sys/dev/dpaa/qman_portal_if.m +++ b/sys/dev/dpaa/qman_portal_if.m @@ -1,7 +1,7 @@ -#- -# SPDX-License-Identifier: BSD-2-Clause # # Copyright (c) 2026 Justin Hibbits +# +# SPDX-License-Identifier: BSD-2-Clause #include #include diff --git a/sys/dev/dpaa/qman_portals.c b/sys/dev/dpaa/qman_portals.c index cce43fa8016e..3b64aca71cb7 100644 --- a/sys/dev/dpaa/qman_portals.c +++ b/sys/dev/dpaa/qman_portals.c @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #include "opt_platform.h" diff --git a/sys/dev/dpaa/qman_var.h b/sys/dev/dpaa/qman_var.h index c143dec1c327..8ed36bbb6a35 100644 --- a/sys/dev/dpaa/qman_var.h +++ b/sys/dev/dpaa/qman_var.h @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #ifndef QMAN_VAR_H From nobody Mon May 4 01:48:57 2026 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 4g84Ld3RJmz6c8x5 for ; Mon, 04 May 2026 01:48:57 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g84Ld284mz40bT for ; Mon, 04 May 2026 01:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777859337; 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=6oWRvkLZrng0hrHYyVxvG153DcZxPJYtxMxhoVCFvYg=; b=M5ZWzTBQB0CP8fSSoGM46UdH+kVDdlXXPxiTI+DmDGFdvdOyuQg9xYOfHP2AB8ZxHCumN4 6jLLriCW/lwNmvrdpPzvHxDzoIulZuW0LOgcFCTHd/nOPZarvRrfwC2GxYBuIPwj91AK5a d4lNLuAEQnY3jLkQNduseeg1D4vkIffLEgCHGOERDtU7PqYjVSJlSRngFfkmS2txmECbIX cp2/xbDFD+hOMEnlUdKV+eYTaG3U8tRxrhAPh5Fj169br+QzY6MFjqLPxpNncaZK5U/Oeb 6KO2y7TssRfsWgtTngcQnfWNomzNG1m3ZWhgW5mF5ZRSzok5PtjDgKKykDIl0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777859337; a=rsa-sha256; cv=none; b=OXOhYclycckoGfGgnQKMMM2Zld4SCyTPNt0wrDeZ6IpoWPTjlcDVxVoBrQbmmRsjvnyBTQ s3ic05kqQNLRxIRlSCCE7hn17K6o6sje1r4pIySkVSUP8sAYcXB+SjwQeXhL18U0meQg71 ilpXhOV+dr1rMr2zoUSdRh4FdgMUIzIN3QSA9PxVB4nIGNmiRH6yyl4uAShuXectlPUr8z lvWPZYy85kTTPSA6CZtNPZ+j1c1oE3r5379h0B4Mfe0kedPsz/xgOgEguSXzaVqt8nrwZC fz6OmDxBID3xbcQ1nNU1pAu3AzjN7IHiZjTlhfdnMn2qiJJG8Yj9Jgvwou71ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777859337; 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=6oWRvkLZrng0hrHYyVxvG153DcZxPJYtxMxhoVCFvYg=; b=tgJ+f89Ab0yu4QiiccB4UdXLIutlbjn1yUClY6SRypBkHvTObsPCs+tdFJ0HPn9wP7sdNB q6tfKJVjumjp+Lj+bHLLH82rziBt8C6xqmJ2L8M0C0UU9qBJX/FJRzV2UlmYmptKQzudhl eHBEYyl2d47x0Fz09ptmPH3Mce7LXGGnixzZEIKb/vzVb7MWnni1HP0JWT5nLT8jn1BnuR v9vaIrYigVbKHs8XwcfFxBXyu/xrSsUGlAlPsZtarAFmhU5CH5MiVks45s9mCx2+Gr7goU 2pCk+DP4ribfJe1MhSmaVUtcGJOtIVpILdl6uGb9dUs81Af4LeM4+4FxwOarEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g84Ld1jJpzyys for ; Mon, 04 May 2026 01:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cc2b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 01:48:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 7b5a23b12451 - main - rs5c372a: Fix copyright header 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b5a23b12451a71a8377c7ef674b716a54751e92 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 01:48:57 +0000 Message-Id: <69f7fb09.3cc2b.35950411@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=7b5a23b12451a71a8377c7ef674b716a54751e92 commit 7b5a23b12451a71a8377c7ef674b716a54751e92 Author: Justin Hibbits AuthorDate: 2026-05-04 01:45:11 +0000 Commit: Justin Hibbits CommitDate: 2026-05-04 01:47:54 +0000 rs5c372a: Fix copyright header Reported by: ziaee@ Fixes: d22051b18 ("iicbus/rtc: Add driver for the Ricoh rs5c372 RTC") --- sys/dev/iicbus/rtc/rs5c372a.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/sys/dev/iicbus/rtc/rs5c372a.c b/sys/dev/iicbus/rtc/rs5c372a.c index c5743e840d25..1511025801f5 100644 --- a/sys/dev/iicbus/rtc/rs5c372a.c +++ b/sys/dev/iicbus/rtc/rs5c372a.c @@ -1,27 +1,7 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * +/* * Copyright (c) 2026 Justin Hibbits * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * SPDX-License-Identifier: BSD-2-Clause */ #include From nobody Mon May 4 04:30:08 2026 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 4g87ww344hz6cRdh for ; Mon, 04 May 2026 04:30:24 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com [209.85.128.175]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g87wv428Hz4H3C for ; Mon, 04 May 2026 04:30:23 +0000 (UTC) (envelope-from rlibby@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of rlibby@gmail.com designates 209.85.128.175 as permitted sender) smtp.mailfrom=rlibby@gmail.com Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-79a46ebe2beso32913437b3.2 for ; Sun, 03 May 2026 21:30:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777869021; x=1778473821; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=P3gz5eAhj12DwD5LEMuq/smOGaJIM1fdauxUyGqOdSI=; b=tG300XbKr8haZ99f2qjDMLyrFaqYPV5lf7Ss3NSEapHxJI4h8aR/Hzy5/L8mQ3VYAE AoyxbK7e4+WLGoM19+yyYrsbUa1LDoXB6zoBKuJnIEf6FdUEWO9q+1uZ47xppHp+Jn4d mzsrarxNTa/TYzneYuyF5xlr4eusC8arky4tofsMt6r9QuXFoS//GnBFALnqAIf/+L+Z LOPC2+4QBaUnPpxlgASnIgDA7MyPTButh4NLaaERqXKAqQ9cJG/L1VFGbLQXoq26AkYD 7BhO14pPenfkQ//xJP67B7FoASQFt6yVNjRJy9dZ9m8GgKp+Hp15HisnD4cztdW2mdZf rSoQ== X-Forwarded-Encrypted: i=1; AFNElJ+kAHLABK/Cs04RH0uYhIzMVC64WtFfFiwbfyHv07B7RJd69nuKYNd1XuQT7fe5h5qreGia4G1ZFojfGu34HKOncX4eeQ==@freebsd.org X-Gm-Message-State: AOJu0Ywq8I2DS3JouDxg6jfXVotBrtLNMBBV8Xw7Q6M0JhEmfFv/1zb+ C46fY9HBuO3Fw2Q3PQk/KFdIje6CE/rlZpecMY/ku9fb9dcydui0++odnSV8Ng== X-Gm-Gg: AeBDiev0EK0kGro7H89tfK0njlT+gaXPArc4QbHo0T/oXibKvR/4I4qC9qfEQdbyFnr g6vy59fbqyrL0JFPGqdNeJqrts0Vb2QaoS1bvUGNG7gh39pRPa0LE1DY9q+kPAluXKC3To7z7NP Rs3GJQw1tKFnDB2zPf3mDV6pcfGgKfleroj6wbaw2HPd+ToJQbLZicVy8JKZ6EIYC5QE+H7APXv Sp/DAMSjc0dErV8tlT/HJhYIT0UqvvMCH6ze+5k3LA1/+OObJqK8RkkxVnKmrSSElCaUNHHSUAK WQK9Aux1Yl8M1Dx2ADktvR40G+L6F4zEBWee/1VzvcrWZp2QqW1ov6R1FV8IKAvNVyj5JJxaTGj vqJ54gwoHjmaaaEV40q856x167WYymUgHW9GGGh33iFqlbptCP0QqiYCE7oR31cFQrNdHO3DHpY PsRUbziV9NGcW2tDNmLidxZKgnEpSJNuiRgEdqv3vQwVifOVINYTP6ILGisLBZu1WvFjCd X-Received: by 2002:a05:690c:ec3:b0:7b3:3a49:756 with SMTP id 00721157ae682-7bd770df5a3mr86644267b3.25.1777869021011; Sun, 03 May 2026 21:30:21 -0700 (PDT) Received: from mail-yx1-f50.google.com (mail-yx1-f50.google.com. [74.125.224.50]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7bd6686ead7sm44757457b3.39.2026.05.03.21.30.20 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 03 May 2026 21:30:20 -0700 (PDT) Received: by mail-yx1-f50.google.com with SMTP id 956f58d0204a3-65c0bda7f15so3525436d50.0 for ; Sun, 03 May 2026 21:30:20 -0700 (PDT) X-Forwarded-Encrypted: i=1; AFNElJ9Dd3PGVvO7uSkL4lgUJPScbPodnQHC0PpvNIXq8vg96Fd8jZgJWuvwH3OgKB6lO/eemaZptexEjKk8hu1TLtVIwoMGOQ==@freebsd.org X-Received: by 2002:a05:690e:4090:b0:651:c264:dd61 with SMTP id 956f58d0204a3-65c3d9d0399mr8508734d50.7.1777869019535; Sun, 03 May 2026 21:30:19 -0700 (PDT) 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 References: <69ef4acf.1fcd2.4d4d3e54@gitrepo.freebsd.org> In-Reply-To: <69ef4acf.1fcd2.4d4d3e54@gitrepo.freebsd.org> From: Ryan Libby Date: Sun, 3 May 2026 21:30:08 -0700 X-Gmail-Original-Message-ID: X-Gm-Features: AVHnY4JpLlZ6WrMsndOgRIl76yOC-rr4-rkn1iF77kYK3PgjBnP_l9z3xKNuxUM Message-ID: Subject: Re: git: c16c95192f01 - main - virtio_net: Use bus_dma for rxq/txq buffers To: Andrew Turner Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Sarah Walker Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.86 / 15.00]; NEURAL_HAM_LONG(-1.00)[-0.996]; NEURAL_HAM_MEDIUM(-0.99)[-0.988]; NEURAL_HAM_SHORT(-0.97)[-0.974]; FORGED_SENDER(0.30)[rlibby@freebsd.org,rlibby@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; MISSING_XM_UA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.175:from,74.125.224.50:received]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[rlibby@freebsd.org,rlibby@gmail.com]; FREEFALL_USER(0.00)[rlibby]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.175:from]; R_DKIM_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_FIVE(0.00)[5] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4g87wv428Hz4H3C On Mon, Apr 27, 2026 at 4:39=E2=80=AFAM Andrew Turner = wrote: > > The branch main has been updated by andrew: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dc16c95192f01237a876eb7bc33= 6e3bbda9310171 > > commit c16c95192f01237a876eb7bc336e3bbda9310171 > Author: Sarah Walker > AuthorDate: 2026-02-16 14:19:13 +0000 > Commit: Andrew Turner > CommitDate: 2026-04-27 11:37:53 +0000 > > virtio_net: Use bus_dma for rxq/txq buffers > > While the majority of virtio platforms will be fully coherent, some m= ay > require cache maintenance or other specific device memory handling (e= g for > secure partitioning). Using bus_dma allows for these usecases. > > The virtio buffers are marked as coherent; this should ensure that sy= nc > calls are no-ops in the common cases. > > Reviewed by: andrew > Sponsored by: Arm Ltd > Differential Revision: https://reviews.freebsd.org/D55492 > --- > sys/dev/virtio/network/if_vtnet.c | 275 +++++++++++++++++++++++++++++= +++--- > sys/dev/virtio/network/if_vtnetvar.h | 10 ++ > 2 files changed, 268 insertions(+), 17 deletions(-) > > diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/i= f_vtnet.c > index ef01833b9e03..e88602a44664 100644 > --- a/sys/dev/virtio/network/if_vtnet.c > +++ b/sys/dev/virtio/network/if_vtnet.c > @@ -96,6 +96,17 @@ > #define VTNET_ETHER_ALIGN ETHER_ALIGN > #endif > > +/* > + * Worst case offset to ensure header doesn't share any cache lines with > + * payload. > + */ > +#define VTNET_RX_BUFFER_HEADER_OFFSET 128 > + > +struct vtnet_rx_buffer_header { > + bus_addr_t addr; > + bus_dmamap_t dmap; > +}; > + > static int vtnet_modevent(module_t, int, void *); > > static int vtnet_probe(device_t); > @@ -384,6 +395,17 @@ MODULE_DEPEND(vtnet, netmap, 1, 1, 1); > > VIRTIO_SIMPLE_PNPINFO(vtnet, VIRTIO_ID_NETWORK, "VirtIO Networking Adapt= er"); > > +static struct vtnet_rx_buffer_header * > +vtnet_mbuf_to_rx_buffer_header(struct vtnet_softc *sc, struct mbuf *m) > +{ > + if (VTNET_ETHER_ALIGN !=3D 0 && sc->vtnet_hdr_size % 4 =3D=3D 0) > + return (struct vtnet_rx_buffer_header *)((uintptr_t)m->m_= data - > + VTNET_RX_BUFFER_HEADER_OFFSET - VTNET_ETHER_ALIGN); > + else > + return (struct vtnet_rx_buffer_header *)((uintptr_t)m->m_= data - > + VTNET_RX_BUFFER_HEADER_OFFSET); > +} > + > static int > vtnet_modevent(module_t mod __unused, int type, void *unused __unused) > { > @@ -457,6 +479,60 @@ vtnet_attach(device_t dev) > goto fail; > } > > + mtx_init(&sc->vtnet_rx_mtx, device_get_nameunit(dev), > + "VirtIO Net RX lock", MTX_DEF); > + > + error =3D bus_dma_tag_create( > + bus_get_dma_tag(dev), /* parent */ > + sizeof(uint16_t), /* alignment */ > + 0, /* boundary */ > + BUS_SPACE_MAXADDR, /* lowaddr */ > + BUS_SPACE_MAXADDR, /* highaddr */ > + NULL, NULL, /* filter, filterarg */ > + MJUM9BYTES, /* max request size */ > + 1, /* max # segments */ > + MJUM9BYTES, /* maxsegsize - worst cas= e */ > + BUS_DMA_COHERENT, /* flags */ > + busdma_lock_mutex, /* lockfunc */ > + &sc->vtnet_rx_mtx, /* lockarg */ > + &sc->vtnet_rx_dmat); > + if (error) { > + device_printf(dev, "cannot create bus_dma_tag\n"); > + goto fail; > + } > + > + mtx_init(&sc->vtnet_tx_mtx, device_get_nameunit(dev), > + "VirtIO Net TX lock", MTX_DEF); > + > + error =3D bus_dma_tag_create( > + bus_get_dma_tag(dev), /* parent */ > + sizeof(uint16_t), /* alignment */ > + 0, /* boundary */ > + BUS_SPACE_MAXADDR, /* lowaddr */ > + BUS_SPACE_MAXADDR, /* highaddr */ > + NULL, NULL, /* filter, filterarg */ > + sc->vtnet_tx_nsegs * MJUM9BYTES, /* max request size */ > + sc->vtnet_tx_nsegs, /* max # segments */ > + MJUM9BYTES, /* maxsegsize */ > + BUS_DMA_COHERENT, /* flags */ > + busdma_lock_mutex, /* lockfunc */ > + &sc->vtnet_tx_mtx, /* lockarg */ > + &sc->vtnet_tx_dmat); > + if (error) { > + device_printf(dev, "cannot create bus_dma_tag\n"); > + goto fail; > + } > + > +#ifdef __powerpc__ > + /* > + * Virtio uses physical addresses rather than bus addresses, so = we > + * need to ask busdma to skip the iommu physical->bus mapping. = At > + * present, this is only a thing on the powerpc architectures. > + */ > + bus_dma_tag_set_iommu(sc->vtnet_rx_dmat, NULL, NULL); > + bus_dma_tag_set_iommu(sc->vtnet_tx_dmat, NULL, NULL); > +#endif > + > error =3D vtnet_alloc_rx_filters(sc); > if (error) { > device_printf(dev, "cannot allocate Rx filters\n"); > @@ -1545,6 +1621,11 @@ static struct mbuf * > vtnet_rx_alloc_buf(struct vtnet_softc *sc, int nbufs, struct mbuf **m_ta= ilp) > { > struct mbuf *m_head, *m_tail, *m; > + struct vtnet_rx_buffer_header *vthdr; > + bus_dma_segment_t segs[1]; > + bus_dmamap_t dmap; > + int nsegs; > + int err; > int i, size; > > m_head =3D NULL; > @@ -1562,13 +1643,43 @@ vtnet_rx_alloc_buf(struct vtnet_softc *sc, int nb= ufs, struct mbuf **m_tailp) > } > > m->m_len =3D size; > + vthdr =3D (struct vtnet_rx_buffer_header *)m->m_data; > + > + /* Reserve space for header */ > + m_adj(m, VTNET_RX_BUFFER_HEADER_OFFSET); > + > /* > * Need to offset the mbuf if the header we're going to a= dd > * will misalign. > */ > - if (VTNET_ETHER_ALIGN !=3D 0 && sc->vtnet_hdr_size % 4 = =3D=3D 0) { > + if (VTNET_ETHER_ALIGN !=3D 0 && sc->vtnet_hdr_size % 4 = =3D=3D 0) > m_adj(m, VTNET_ETHER_ALIGN); > + > + err =3D bus_dmamap_create(sc->vtnet_rx_dmat, 0, &dmap); > + if (err) { > + printf("Failed to create dmamap, err :%d\n", > + err); > + m_freem(m); > + return (NULL); > } > + > + nsegs =3D 0; > + err =3D bus_dmamap_load_mbuf_sg(sc->vtnet_rx_dmat, dmap, = m, segs, > + &nsegs, BUS_DMA_NOWAIT); > + if (err !=3D 0) { > + printf("Failed to map mbuf into DMA visible memor= y, err: %d\n", > + err); > + m_freem(m); > + bus_dmamap_destroy(sc->vtnet_rx_dmat, dmap); > + return (NULL); > + } > + KASSERT(nsegs =3D=3D 1, > + ("%s: unexpected number of DMA segments for rx buffer= : %d", > + __func__, nsegs)); > + > + vthdr->addr =3D segs[0].ds_addr; > + vthdr->dmap =3D dmap; > + > if (m_head !=3D NULL) { > m_tail->m_next =3D m; > m_tail =3D m; > @@ -1594,7 +1705,7 @@ vtnet_rxq_replace_lro_nomrg_buf(struct vtnet_rxq *r= xq, struct mbuf *m0, > int len, clustersz, nreplace, error; > > sc =3D rxq->vtnrx_sc; > - clustersz =3D sc->vtnet_rx_clustersz; > + clustersz =3D sc->vtnet_rx_clustersz - VTNET_RX_BUFFER_HEADER_OFF= SET; > /* > * Need to offset the mbuf if the header we're going to add will > * misalign, account for that here. > @@ -1709,9 +1820,12 @@ vtnet_rxq_replace_buf(struct vtnet_rxq *rxq, struc= t mbuf *m, int len) > static int > vtnet_rxq_enqueue_buf(struct vtnet_rxq *rxq, struct mbuf *m) > { > + struct vtnet_rx_buffer_header *hdr; > struct vtnet_softc *sc; > struct sglist *sg; > int header_inlined, error; > + bus_addr_t paddr; > + struct mbuf *mp; > > sc =3D rxq->vtnrx_sc; > sg =3D rxq->vtnrx_sg; > @@ -1724,28 +1838,38 @@ vtnet_rxq_enqueue_buf(struct vtnet_rxq *rxq, stru= ct mbuf *m) > header_inlined =3D vtnet_modern(sc) || > (sc->vtnet_flags & VTNET_FLAG_MRG_RXBUFS) !=3D 0; /* TODO: AN= Y_LAYOUT */ > > + hdr =3D vtnet_mbuf_to_rx_buffer_header(sc, m); > + paddr =3D hdr->addr; > + > /* > * Note: The mbuf has been already adjusted when we allocate it i= f we > * have to do strict alignment. > */ > - if (header_inlined) > - error =3D sglist_append_mbuf(sg, m); > - else { > - struct vtnet_rx_header *rxhdr =3D > - mtod(m, struct vtnet_rx_header *); > + if (header_inlined) { > + error =3D sglist_append_phys(sg, paddr, m->m_len); > + } else { > MPASS(sc->vtnet_hdr_size =3D=3D sizeof(struct virtio_net_= hdr)); > > /* Append the header and remaining mbuf data. */ > - error =3D sglist_append(sg, &rxhdr->vrh_hdr, sc->vtnet_hd= r_size); > + error =3D sglist_append_phys(sg, paddr, sc->vtnet_hdr_siz= e); > if (error) > return (error); > - error =3D sglist_append(sg, &rxhdr[1], > + error =3D sglist_append_phys(sg, > + paddr + sizeof(struct vtnet_rx_header), > m->m_len - sizeof(struct vtnet_rx_header)); > if (error) > return (error); > > - if (m->m_next !=3D NULL) > - error =3D sglist_append_mbuf(sg, m->m_next); > + mp =3D m->m_next; > + while (mp) { > + hdr =3D vtnet_mbuf_to_rx_buffer_header(sc, mp); > + paddr =3D hdr->addr; > + error =3D sglist_append_phys(sg, paddr, mp->m_len= ); > + if (error) > + return (error); > + > + mp =3D mp->m_next; > + } > } > > if (error) > @@ -1931,6 +2055,7 @@ vtnet_rxq_merged_eof(struct vtnet_rxq *rxq, struct = mbuf *m_head, int nbufs) > m_tail =3D m_head; > > while (--nbufs > 0) { > + struct vtnet_rx_buffer_header *vthdr; > struct mbuf *m; > uint32_t len; > > @@ -1940,6 +2065,10 @@ vtnet_rxq_merged_eof(struct vtnet_rxq *rxq, struct= mbuf *m_head, int nbufs) > goto fail; > } > > + vthdr =3D vtnet_mbuf_to_rx_buffer_header(sc, m); > + bus_dmamap_sync(sc->vtnet_rx_dmat, vthdr->dmap, > + BUS_DMASYNC_POSTREAD); > + > if (vtnet_rxq_new_buf(rxq) !=3D 0) { > rxq->vtnrx_stats.vrxs_iqdrops++; > vtnet_rxq_discard_buf(rxq, m); > @@ -2060,6 +2189,7 @@ static int > vtnet_rxq_eof(struct vtnet_rxq *rxq) > { > struct virtio_net_hdr lhdr, *hdr; > + struct vtnet_rx_buffer_header *vthdr; > struct vtnet_softc *sc; > if_t ifp; > struct virtqueue *vq; > @@ -2075,14 +2205,31 @@ vtnet_rxq_eof(struct vtnet_rxq *rxq) > > CURVNET_SET(if_getvnet(ifp)); > while (count-- > 0) { > - struct mbuf *m; > + struct mbuf *m, *mp; > uint32_t len, nbufs, adjsz; > + uint32_t synced; > > m =3D virtqueue_dequeue(vq, &len); > if (m =3D=3D NULL) > break; > deq++; > > + mp =3D m; > + > + /* > + * Sync all mbufs in this packet. There will only be a si= ngle > + * mbuf unless LRO is in use. > + */ > + synced =3D 0; > + while (mp && synced < len) { > + vthdr =3D vtnet_mbuf_to_rx_buffer_header(sc, mp); > + bus_dmamap_sync(sc->vtnet_rx_dmat, vthdr->dmap, > + BUS_DMASYNC_POSTREAD); > + > + synced +=3D mp->m_len; > + mp =3D mp->m_next; > + } > + > if (len < sc->vtnet_hdr_size + ETHER_HDR_LEN) { > rxq->vtnrx_stats.vrxs_ierrors++; > vtnet_rxq_discard_buf(rxq, m); > @@ -2342,6 +2489,14 @@ vtnet_txq_free_mbufs(struct vtnet_txq *txq) > > while ((txhdr =3D virtqueue_drain(vq, &last)) !=3D NULL) { > if (kring =3D=3D NULL) { > + bus_dmamap_unload(txq->vtntx_sc->vtnet_tx_dmat, > + txhdr->dmap); > + bus_dmamap_destroy(txq->vtntx_sc->vtnet_tx_dmat, > + txhdr->dmap); > + bus_dmamap_unload(txq->vtntx_sc->vtnet_tx_dmat, > + txhdr->hdr_dmap); > + bus_dmamap_destroy(txq->vtntx_sc->vtnet_tx_dmat, > + txhdr->hdr_dmap); > m_freem(txhdr->vth_mbuf); > uma_zfree(vtnet_tx_header_zone, txhdr); > } > @@ -2511,15 +2666,36 @@ drop: > return (NULL); > } > > +static void > +vtnet_txq_enqueue_callback(void *arg, bus_dma_segment_t *segs, > + int nsegs, int error) > +{ > + vm_paddr_t *hdr_paddr; > + > + if (error !=3D 0) > + return; > + > + KASSERT(nsegs =3D=3D 1, ("%s: %d segments returned!", __func__, n= segs)); > + > + hdr_paddr =3D (vm_paddr_t *)arg; > + *hdr_paddr =3D segs[0].ds_addr; > +} > + > static int > vtnet_txq_enqueue_buf(struct vtnet_txq *txq, struct mbuf **m_head, > struct vtnet_tx_header *txhdr) > { > + bus_dma_segment_t segs[VTNET_TX_SEGS_MAX]; > + int nsegs; > struct vtnet_softc *sc; > struct virtqueue *vq; > struct sglist *sg; > struct mbuf *m; > int error; > + vm_paddr_t hdr_paddr; > + bus_dmamap_t hdr_dmap; > + bus_dmamap_t dmap; > + int i; > > sc =3D txq->vtntx_sc; > vq =3D txq->vtntx_vq; > @@ -2527,15 +2703,55 @@ vtnet_txq_enqueue_buf(struct vtnet_txq *txq, stru= ct mbuf **m_head, > m =3D *m_head; > > sglist_reset(sg); > - error =3D sglist_append(sg, &txhdr->vth_uhdr, sc->vtnet_hdr_size)= ; > + > + error =3D bus_dmamap_create(sc->vtnet_tx_dmat, 0, &hdr_dmap); > + if (error) > + goto fail; > + > + error =3D bus_dmamap_load(sc->vtnet_tx_dmat, hdr_dmap, &txhdr->vt= h_uhdr, > + sc->vtnet_hdr_size, vtnet_txq_enqueue_callback, &hdr_paddr, > + BUS_DMA_NOWAIT); > + if (error) > + goto fail_hdr_dmamap_destroy; > + > + error =3D sglist_append_phys(sg, hdr_paddr, sc->vtnet_hdr_size); > if (error !=3D 0 || sg->sg_nseg !=3D 1) { > KASSERT(0, ("%s: cannot add header to sglist error %d nse= g %d", > __func__, error, sg->sg_nseg)); > - goto fail; > + goto fail_hdr_dmamap_unload; > } > > - error =3D sglist_append_mbuf(sg, m); > + bus_dmamap_sync(sc->vtnet_tx_dmat, hdr_dmap, BUS_DMASYNC_PREWRITE= ); > + > + error =3D bus_dmamap_create(sc->vtnet_tx_dmat, 0, &dmap); > + if (error) > + goto fail_hdr_dmamap_unload; > + > + nsegs =3D 0; > + error =3D bus_dmamap_load_mbuf_sg(sc->vtnet_tx_dmat, dmap, m, seg= s, > + &nsegs, BUS_DMA_NOWAIT); > + if (error !=3D 0) > + goto fail_dmamap_destroy; > + KASSERT(nsegs <=3D sc->vtnet_tx_nsegs, > + ("%s: unexpected number of DMA segments for tx buffer: %d (ma= x %d)", > + __func__, nsegs, sc->vtnet_tx_nsegs)); > + > + bus_dmamap_sync(sc->vtnet_tx_dmat, dmap, BUS_DMASYNC_PREWRITE); > + > + for (i =3D 0; i < nsegs && !error; i++) > + error =3D sglist_append_phys(sg, segs[i].ds_addr, segs[i]= .ds_len); > + > if (error) { > + sglist_reset(sg); > + bus_dmamap_unload(sc->vtnet_tx_dmat, dmap); > + > + error =3D sglist_append_phys(sg, hdr_paddr, sc->vtnet_hdr= _size); > + if (error !=3D 0 || sg->sg_nseg !=3D 1) { > + KASSERT(0, ("%s: cannot add header to sglist erro= r %d nseg %d", > + __func__, error, sg->sg_nseg)); > + goto fail_dmamap_destroy; > + } > + > m =3D m_defrag(m, M_NOWAIT); > if (m =3D=3D NULL) { > sc->vtnet_stats.tx_defrag_failed++; > @@ -2545,16 +2761,41 @@ vtnet_txq_enqueue_buf(struct vtnet_txq *txq, stru= ct mbuf **m_head, > *m_head =3D m; > sc->vtnet_stats.tx_defragged++; > > - error =3D sglist_append_mbuf(sg, m); > + nsegs =3D 0; > + error =3D bus_dmamap_load_mbuf_sg(sc->vtnet_tx_dmat, dmap= , m, > + segs, &nsegs, BUS_DMA_NOWAIT); > + if (error !=3D 0) > + goto fail_dmamap_destroy; > + KASSERT(nsegs <=3D sc->vtnet_tx_nsegs, > + ("%s: unexpected number of DMA segments for tx buffer= : %d (max %d)", > + __func__, nsegs, sc->vtnet_tx_nsegs)); > + > + bus_dmamap_sync(sc->vtnet_tx_dmat, dmap, BUS_DMASYNC_PREW= RITE); > + > + for (i =3D 0; i < nsegs && !error; i++) > + error =3D sglist_append_phys(sg, segs[i].ds_addr, > + segs[i].ds_len); > + > if (error) > - goto fail; > + goto fail_dmamap_unload; > } > > txhdr->vth_mbuf =3D m; > + txhdr->dmap =3D dmap; > + txhdr->hdr_dmap =3D hdr_dmap; > + > error =3D virtqueue_enqueue(vq, txhdr, sg, sg->sg_nseg, 0); > > return (error); > > +fail_dmamap_unload: > + bus_dmamap_unload(sc->vtnet_tx_dmat, dmap); > +fail_dmamap_destroy: > + bus_dmamap_destroy(sc->vtnet_tx_dmat, dmap); > +fail_hdr_dmamap_unload: > + bus_dmamap_unload(sc->vtnet_tx_dmat, hdr_dmap); > +fail_hdr_dmamap_destroy: > + bus_dmamap_destroy(sc->vtnet_tx_dmat, hdr_dmap); > fail: > m_freem(*m_head); > *m_head =3D NULL; > diff --git a/sys/dev/virtio/network/if_vtnetvar.h b/sys/dev/virtio/networ= k/if_vtnetvar.h > index eb5e6784b07f..6cafe827d733 100644 > --- a/sys/dev/virtio/network/if_vtnetvar.h > +++ b/sys/dev/virtio/network/if_vtnetvar.h > @@ -190,6 +190,12 @@ struct vtnet_softc { > struct mtx vtnet_mtx; > char vtnet_mtx_name[16]; > uint8_t vtnet_hwaddr[ETHER_ADDR_LEN]; > + > + bus_dma_tag_t vtnet_rx_dmat; > + struct mtx vtnet_rx_mtx; > + > + bus_dma_tag_t vtnet_tx_dmat; > + struct mtx vtnet_tx_mtx; > }; > /* vtnet flag descriptions for use with printf(9) %b identifier. */ > #define VTNET_FLAGS_BITS \ > @@ -273,6 +279,10 @@ struct vtnet_tx_header { > } vth_uhdr; > > struct mbuf *vth_mbuf; > + > + bus_dmamap_t dmap; > + > + bus_dmamap_t hdr_dmap; > }; > > /* > I believe this is causing a massive memory leak in the devbuf malloc type. I can't even get through a build over nfs on a VM without hitting OOM. Reverting b5bad6df467cc95bea641afe674c55cd5b9f1510 and c16c95192f01237a876eb7bc336e3bbda9310171 fixes the leak. Can you please fix or revert this? You can monitor the leak with something like vmstat -m | grep devbuf > @@ -1562,13 +1643,43 @@ vtnet_rx_alloc_buf(struct vtnet_softc *sc, int nb= ufs, struct mbuf **m_tailp) > } > > m->m_len =3D size; > + vthdr =3D (struct vtnet_rx_buffer_header *)m->m_data; > + > + /* Reserve space for header */ > + m_adj(m, VTNET_RX_BUFFER_HEADER_OFFSET); > + > /* > * Need to offset the mbuf if the header we're going to a= dd > * will misalign. > */ > - if (VTNET_ETHER_ALIGN !=3D 0 && sc->vtnet_hdr_size % 4 = =3D=3D 0) { > + if (VTNET_ETHER_ALIGN !=3D 0 && sc->vtnet_hdr_size % 4 = =3D=3D 0) > m_adj(m, VTNET_ETHER_ALIGN); > + > + err =3D bus_dmamap_create(sc->vtnet_rx_dmat, 0, &dmap); > + if (err) { > + printf("Failed to create dmamap, err :%d\n", > + err); > + m_freem(m); > + return (NULL); > } > + > + nsegs =3D 0; > + err =3D bus_dmamap_load_mbuf_sg(sc->vtnet_rx_dmat, dmap, = m, segs, > + &nsegs, BUS_DMA_NOWAIT); Where is the bus_dmamap_unload and bus_dmamap_destroy for the rx bufs? Ryan From nobody Mon May 4 06:57:06 2026 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 4g8CBT35ZGz6ckLk for ; Mon, 04 May 2026 06:57:21 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8CBT1xj7z3HTt for ; Mon, 04 May 2026 06:57:21 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777877841; 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: in-reply-to:in-reply-to:references:references; bh=6ZPWnnBxqmWURBFbR69tP+TnpXnrAahZw0uVquz05Z8=; b=ZTzbVYiesOnK9SahkdKOLl8s9YbEzANrPggWo+yUF0x9Khrap2H1Bf4ak2nlQINmATA/9t 8Z4cDxkqCwdw/En1K1Di2wpr3N+L70zkuf5PSOk9Hf/X3wpPDz2fZ/gDzBO7k950hUUW1x IHhKpCsWQjw89F3sL+skfY5HHtTfiMsB0nwTYP965XgBTFTAHGHUeIS0exPCWpSyFqZjwl B4r0QO+ZBUKlyCv9eAHMD4od3hgGCIeb9tVe434L3b1tzxWxH9k3v8EzQkuh8rfa+qnQsQ 4oSp1uh5svWxJg71rXPyuaQL0Ehx0wZXPX4xZ3Sqi9ThxIbx6PmtUmsDojOT6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777877841; a=rsa-sha256; cv=none; b=JPxe5kobfZXHyKFQxBLgPcRBuV/+U6G009z/r9jZ+y16sblRn3uhcD1d71ApovMXOvXpPN mo3CVf3EG37LKMtZ4OLXcbBZXSxG4NU+2SYM0jDKYUAzs55wSTP/Ma2JARe4oQTkSrACxU cd/7Nn9Jx2pCk/WvXjlmHtBkkU085+J9+lDOg84rjHh2fdrD7PocX1ZjO3LLO2tlGVUDD9 6mo/bwFPoH6hZbXyl7NO+xcZSub5w/9vvpaA642evCpf7ZJgdJq3D3s9lQGgSnIT+GIP4e pcNnLQV/20F80uRLv8Qt90OmAp/p/H01zIC/KimqP00amP1fLscEOGy1W9t35g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777877841; 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: in-reply-to:in-reply-to:references:references; bh=6ZPWnnBxqmWURBFbR69tP+TnpXnrAahZw0uVquz05Z8=; b=AynHIqYNbPiQJHODmGekR4IxTPifIKzsPNc+N3EXjFFWFiqbtKzZgaS4xxqTgkFROnQcmg ExGhYVgzTcE4kS39YTs3VMjuJj9RyeKhQzczz6y1tFGbvPRhbwL3oEHK+0Ys7tFRK1UE12 Do2CQ/5J7fusTw7aF313CuRSB1NugR5FUgkb2RNZnYP9x8vpcnQGpPpgdpyOIgDz3yytm0 CgS6Th4Z6OvzfYFY4sU2cSZCwxxOJUSYoEWMAUWJPGQEvV3uO7JG8fZ2p0kP/Ui19Omxhd krxuGLDQJCj/JAg3lP0KmIbRmrO8OyEnpvnPLtX6TuIBCjYpQGRIBC5mqwBtYQ== Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4g8CBT0Xw6zFpv for ; Mon, 04 May 2026 06:57:21 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5a4190174eeso591081e87.0 for ; Sun, 03 May 2026 23:57:21 -0700 (PDT) X-Forwarded-Encrypted: i=1; AFNElJ9x9uiqhRPDqPVA6if8H0xJIf3rRQ3YR/GcALM0gBrVXepgf07WV7i/UymbC70l6SqMeC5AKCMJSOQZ50fJ1eMTcXrGPw==@freebsd.org X-Gm-Message-State: AOJu0YyReGRwyaJFyJye4tyM2QUvlVZ0yHRyMen2xDThEzhmh4nR1MwB KMvgF6E2rP3S90hbM8lagRMe+G64ekwU2YT9s/s/tK1P1Xl2IWDYMD/OMeoC+qQw/mHzcxEFSFQ GXnhqqPGJSl5bVb87oAL2m0FodGTb++Q= X-Received: by 2002:a05:651c:503:b0:38a:365c:8416 with SMTP id 38308e7fff4ca-39378527a82mr10714991fa.3.1777877839406; Sun, 03 May 2026 23:57:19 -0700 (PDT) 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 References: <69f5387a.26bf3.36f56fa3@gitrepo.freebsd.org> <994cef06-a1c9-45b8-b807-3449517fe381@yahoo.com> In-Reply-To: <994cef06-a1c9-45b8-b807-3449517fe381@yahoo.com> From: Nuno Teixeira Date: Mon, 4 May 2026 07:57:06 +0100 X-Gmail-Original-Message-ID: X-Gm-Features: AVHnY4IFdgSBytzaWAouazBMfKvNvVswsMgavCW_oKWMfP4qUwWLiDwIIYvA5eM Message-ID: Subject: Re: git: c4f08d46c7f7 - main - llvm-*: Move all LLVM_BINUTILS symlinks to toolchain package To: Mark Millard Cc: jlduran@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Ed Maste Content-Type: multipart/alternative; boundary="000000000000126c0c0650f87163" --000000000000126c0c0650f87163 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello, Any clues if those symlinks are related? ``` # ./tools/build/stale-symlink-buildworld.sh stale symlink detected: lrwxr-xr-x 1 root wheel 12 May 4 07:53 /usr/obj/usr/src/amd64.amd64/tmp/usr/bin/c++filt -> llvm-cxxfilt stale symlink detected: lrwxr-xr-x 1 root wheel 8 May 4 07:53 /usr/obj/usr/src/amd64.amd64/tmp/usr/bin/gcov -> llvm-cov stale symlink detected: lrwxr-xr-x 1 root wheel 12 May 4 07:53 /usr/obj/usr/src/amd64.amd64/tmp/usr/bin/objdump -> llvm-objdump stale symlink detected: lrwxr-xr-x 1 root wheel 12 May 4 07:53 /usr/obj/usr/src/amd64.amd64/tmp/usr/bin/readelf -> llvm-readelf ``` Thanks Mark Millard escreveu (s=C3=A1bado, 2/05/2026 =C3=A0(s)= 05:45): > On 5/1/26 17:38, Jose Luis Duran wrote: > > On Fri, May 1, 2026 at 8:34=E2=80=AFPM Ed Maste wr= ote: > >> > >> The branch main has been updated by emaste: > >> > >> URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dc4f08d46c7f717cc8c66bf702c00676= 5a5b6b1a9 > >> > >> commit c4f08d46c7f717cc8c66bf702c006765a5b6b1a9 > >> Author: Ed Maste > >> AuthorDate: 2026-03-06 14:46:18 +0000 > >> Commit: Ed Maste > >> CommitDate: 2026-05-01 23:33:51 +0000 > >> > >> llvm-*: Move all LLVM_BINUTILS symlinks to toolchain package > >> > >> Some of the LLVM binary utilities were included in the Clang packa= ge > >> (because they did not set an explicit PACKAGE). > >> > >> Add a new Makefile under clang/toolchain to create the symlinks an= d > man > >> links for ar, c++filt, nm, and so on (without the llvm-* prefix) > when > >> LLVM_BINUTILS is enabled (as it is by default). > >> > >> PR: 293610 > >> Reviewed by: bapt, ivy, brooks > >> Sponsored by: The FreeBSD Foundation > >> Differential Revision: https://reviews.freebsd.org/D55692 > >> --- > >> ... > >> +.if ${MK_LLVM_BINUTILS} !=3D "no" > >> +PKG_DEPS.toolchain+=3D llvm > > > > Is there an llvm package (FreeBSD-llvm)? > > > > For reference, for main [so: 16 at this point]: > (context predates the above change) > > > # pkg search -rFreeBSD-base -g FreeBSD-llvm\* > # > > # pkg search -rFreeBSD-base -g FreeBSD-binutils\* > # > > So: no for FreeBSD-llvm . > > > But for things that do exist that internally are based on some of llvm: > (the context has all the FreeBSD-* base packages installed) > > # pkg info -dl FreeBSD-\* \ > | grep -v -e /contrib/ -e /src/ -e /man1/ \ > | grep -e ^FreeBSD- \ > -e llvm- \ > -e libprivateclang \ > -e libprivatellvm \ > -e libcompiler_rt \ > | grep -B1 -v ^FreeB > FreeBSD-clang-16.snap20260430194422 > FreeBSD-libcompiler_rt-dev-16.snap20260425150102 > /usr/bin/llvm-addr2line > /usr/bin/llvm-cov > /usr/bin/llvm-cxxfilt > /usr/bin/llvm-objcopy > /usr/bin/llvm-objdump > /usr/bin/llvm-profdata > /usr/bin/llvm-readelf > /usr/bin/llvm-readobj > /usr/bin/llvm-strings > /usr/bin/llvm-strip > /usr/bin/llvm-symbolizer > /usr/lib/libprivateclang.so.21 > /usr/lib/libprivatellvm.so.21 > FreeBSD-clang-dbg-16.snap20260430194422 > /usr/lib/debug/usr/bin/llvm-cov.debug > /usr/lib/debug/usr/bin/llvm-cxxfilt.debug > /usr/lib/debug/usr/bin/llvm-objcopy.debug > /usr/lib/debug/usr/bin/llvm-objdump.debug > /usr/lib/debug/usr/bin/llvm-profdata.debug > /usr/lib/debug/usr/bin/llvm-readobj.debug > /usr/lib/debug/usr/bin/llvm-strings.debug > /usr/lib/debug/usr/bin/llvm-symbolizer.debug > /usr/lib/debug/usr/lib/libprivateclang.so.21.debug > /usr/lib/debug/usr/lib/libprivatellvm.so.21.debug > FreeBSD-clang-dev-16.snap20260428205205 > FreeBSD-clang-16.snap20260430194422 (libprivatellvm.so.21) > /usr/lib/libprivateclang.so > /usr/lib/libprivatellvm.so > -- > FreeBSD-libcompiler_rt-dev-16.snap20260425150102 > /usr/lib/libcompiler_rt.a > FreeBSD-libcompiler_rt-dev-lib32-16.snap20260425150102 > /usr/lib32/libcompiler_rt.a > -- > FreeBSD-lld-16.snap20260430194422 > FreeBSD-clang-16.snap20260430194422 (libprivatellvm.so.21) > -- > FreeBSD-lldb-16.snap20260430194422 > FreeBSD-clang-16.snap20260430194422 (libprivateclang.so.21) > FreeBSD-clang-16.snap20260430194422 (libprivatellvm.so.21) > -- > FreeBSD-set-devel-16.snap20260424143247 > FreeBSD-libcompiler_rt-dev-16.snap20260425150102 > -- > FreeBSD-set-lib32-16.snap20260424143247 > FreeBSD-libcompiler_rt-dev-lib32-16.snap20260425150102 > -- > FreeBSD-toolchain-16.snap20260430194422 > FreeBSD-clang-16.snap20260430194422 (libprivatellvm.so.21) > /usr/bin/llvm-ar > /usr/bin/llvm-nm > /usr/bin/llvm-ranlib > /usr/bin/llvm-size > FreeBSD-toolchain-dbg-16.snap20260430194422 > /usr/lib/debug/usr/bin/llvm-ar.debug > /usr/lib/debug/usr/bin/llvm-nm.debug > /usr/lib/debug/usr/bin/llvm-size.debug > > > That should at least give an idea, even if it might be incomplete. > > > -- > =3D=3D=3D > Mark Millard > marklmi at yahoo.com > > --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --000000000000126c0c0650f87163 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello,

Any clues if those symlinks = are related?

```
# ./tools/build/stale-symlink-buildworld.sh
s= tale symlink detected: lrwxr-xr-x =C2=A01 root wheel 12 May =C2=A04 07:53 /= usr/obj/usr/src/amd64.amd64/tmp/usr/bin/c++filt -> llvm-cxxfilt
stale= symlink detected: lrwxr-xr-x =C2=A01 root wheel 8 May =C2=A04 07:53 /usr/o= bj/usr/src/amd64.amd64/tmp/usr/bin/gcov -> llvm-cov
stale symlink det= ected: lrwxr-xr-x =C2=A01 root wheel 12 May =C2=A04 07:53 /usr/obj/usr/src/= amd64.amd64/tmp/usr/bin/objdump -> llvm-objdump
stale symlink detecte= d: lrwxr-xr-x =C2=A01 root wheel 12 May =C2=A04 07:53 /usr/obj/usr/src/amd6= 4.amd64/tmp/usr/bin/readelf -> llvm-readelf
```

Thanks
Mark Millard <m= arklmi@yahoo.com> escreveu (s=C3=A1bado, 2/05/2026 =C3=A0(s) 05:45):=
On 5/1/26 17:38= , Jose Luis Duran wrote:
> On Fri, May 1, 2026 at 8:34=E2=80=AFPM Ed Maste <emaste@freebsd.org> wrote:
>>
>> The branch main has been updated by emaste:
>>
>> URL: http= s://cgit.FreeBSD.org/src/commit/?id=3Dc4f08d46c7f717cc8c66bf702c006765a5b6b= 1a9
>>
>> commit c4f08d46c7f717cc8c66bf702c006765a5b6b1a9
>> Author:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
>> AuthorDate: 2026-03-06 14:46:18 +0000
>> Commit:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
>> CommitDate: 2026-05-01 23:33:51 +0000
>>
>>=C2=A0 =C2=A0 =C2=A0llvm-*: Move all LLVM_BINUTILS symlinks to tool= chain package
>>
>>=C2=A0 =C2=A0 =C2=A0Some of the LLVM binary utilities were included= in the Clang package
>>=C2=A0 =C2=A0 =C2=A0(because they did not set an explicit PACKAGE).=
>>
>>=C2=A0 =C2=A0 =C2=A0Add a new Makefile under clang/toolchain to cre= ate the symlinks and man
>>=C2=A0 =C2=A0 =C2=A0links for ar, c++filt, nm, and so on (without t= he llvm-* prefix) when
>>=C2=A0 =C2=A0 =C2=A0LLVM_BINUTILS is enabled (as it is by default).=
>>
>>=C2=A0 =C2=A0 =C2=A0PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0293610
>>=C2=A0 =C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 bapt, ivy, brooks
>>=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0The FreeBSD Foundatio= n
>>=C2=A0 =C2=A0 =C2=A0Differential Revision: https://reviews= .freebsd.org/D55692
>> ---
>> ...
>> +.if ${MK_LLVM_BINUTILS} !=3D "no"
>> +PKG_DEPS.toolchain+=3D=C2=A0 =C2=A0llvm
>
> Is there an llvm package (FreeBSD-llvm)?
>

For reference, for main [so: 16 at this point]:
(context predates the above change)


# pkg search -rFreeBSD-base -g FreeBSD-llvm\*
#

# pkg search -rFreeBSD-base -g FreeBSD-binutils\*
#

So: no for FreeBSD-llvm .


But for things that do exist that internally are based on some of llvm:
(the context has all the FreeBSD-* base packages installed)

# pkg info -dl FreeBSD-\* \
| grep -v -e /contrib/ -e /src/ -e /man1/ \
| grep -e ^FreeBSD- \
=C2=A0 =C2=A0 =C2=A0 =C2=A0-e llvm- \
=C2=A0 =C2=A0 =C2=A0 =C2=A0-e libprivateclang \
=C2=A0 =C2=A0 =C2=A0 =C2=A0-e libprivatellvm \
=C2=A0 =C2=A0 =C2=A0 =C2=A0-e libcompiler_rt \
| grep -B1 -v ^FreeB
FreeBSD-clang-16.snap20260430194422
=C2=A0 =C2=A0 =C2=A0 =C2=A0 FreeBSD-libcompiler_rt-dev-16.snap2026042515010= 2
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/bin/llvm-addr2line
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/bin/llvm-cov
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/bin/llvm-cxxfilt
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/bin/llvm-objcopy
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/bin/llvm-objdump
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/bin/llvm-profdata
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/bin/llvm-readelf
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/bin/llvm-readobj
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/bin/llvm-strings
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/bin/llvm-strip
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/bin/llvm-symbolizer
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib/libprivateclang.so.21
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib/libprivatellvm.so.21
FreeBSD-clang-dbg-16.snap20260430194422
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib/debug/usr/bin/llvm-cov.debug
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib/debug/usr/bin/llvm-cxxfilt.debug
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib/debug/usr/bin/llvm-objcopy.debug
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib/debug/usr/bin/llvm-objdump.debug
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib/debug/usr/bin/llvm-profdata.debug
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib/debug/usr/bin/llvm-readobj.debug
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib/debug/usr/bin/llvm-strings.debug
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib/debug/usr/bin/llvm-symbolizer.debug =C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib/debug/usr/lib/libprivateclang.so.21.de= bug
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib/debug/usr/lib/libprivatellvm.so.21.deb= ug
FreeBSD-clang-dev-16.snap20260428205205
=C2=A0 =C2=A0 =C2=A0 =C2=A0 FreeBSD-clang-16.snap20260430194422 (libprivate= llvm.so.21)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib/libprivateclang.so
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib/libprivatellvm.so
--
FreeBSD-libcompiler_rt-dev-16.snap20260425150102
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib/libcompiler_rt.a
FreeBSD-libcompiler_rt-dev-lib32-16.snap20260425150102
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib32/libcompiler_rt.a
--
FreeBSD-lld-16.snap20260430194422
=C2=A0 =C2=A0 =C2=A0 =C2=A0 FreeBSD-clang-16.snap20260430194422 (libprivate= llvm.so.21)
--
FreeBSD-lldb-16.snap20260430194422
=C2=A0 =C2=A0 =C2=A0 =C2=A0 FreeBSD-clang-16.snap20260430194422 (libprivate= clang.so.21)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 FreeBSD-clang-16.snap20260430194422 (libprivate= llvm.so.21)
--
FreeBSD-set-devel-16.snap20260424143247
=C2=A0 =C2=A0 =C2=A0 =C2=A0 FreeBSD-libcompiler_rt-dev-16.snap2026042515010= 2
--
FreeBSD-set-lib32-16.snap20260424143247
=C2=A0 =C2=A0 =C2=A0 =C2=A0 FreeBSD-libcompiler_rt-dev-lib32-16.snap2026042= 5150102
--
FreeBSD-toolchain-16.snap20260430194422
=C2=A0 =C2=A0 =C2=A0 =C2=A0 FreeBSD-clang-16.snap20260430194422 (libprivate= llvm.so.21)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/bin/llvm-ar
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/bin/llvm-nm
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/bin/llvm-ranlib
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/bin/llvm-size
FreeBSD-toolchain-dbg-16.snap20260430194422
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib/debug/usr/bin/llvm-ar.debug
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib/debug/usr/bin/llvm-nm.debug
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /usr/lib/debug/usr/bin/llvm-size.debug


That should at least give an idea, even if it might be incomplete.


--
=3D=3D=3D
Mark Millard
marklmi at yahoo.com



--
Nuno Teixeira
=
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--000000000000126c0c0650f87163-- From nobody Mon May 4 12:09:07 2026 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 4g8L6C2LwNz6Rbmr for ; Mon, 04 May 2026 12:09: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8L6C1HYHz45yg for ; Mon, 04 May 2026 12:09:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777896547; 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=axksXvfyGT2/wnLEFuVgMUdOHkkAFKJFlKSUbXddfZI=; b=knR8FKegSsdaqojhD9zC9n5Uk26Cp66QS8El6GjeU3QbjHgdJ+eAsaghNqttfhfikWF2Bh TzFITMAZbF4t03vR6semr2k/61Tg+0pvdxab4pNGDBx9Myz6/4ODHlIz43sr1lZValS79C oM4VWL4O74oXrD8PVxTUEoRA3K0Lok9GEUvKAtgEYFZskGh/4apPZMI61hsBxs337edGyy x9QroR6PFLFSYH3NJ7Ntg8acMC90J1n2rYqTEjx5/Qk/SjQsFNSib2ZzFwZ1g3CzvOjvJv yapHa4rSi2qXmExYLMlILEyHx0ZPpiXJHI/OP2fqqDHRnQuqzJf5jbtmYx3MNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777896547; a=rsa-sha256; cv=none; b=TfnG8BMQIt3l/RV1hDBbqiSl8zqx1coFOd/VEUBC6Iu+hbpOIMjISgjNlFmG9zJKnVr520 ZbKLxbIDgZjZNYIIRomEI0GsYc1tvsXMg4aiMM4FkKBAfceSve1o6ceM+5Lnq0rTameF88 3+a5Hdsy6cX0NkNdpVAFonRI0ZDFLE4hzM8c7BEGQVdULsE6p5Dyrz+Limm5DLj3OhGa6p YldeOqIbbZ/4qEejZmk+J77IR7CE/EiGjfF8QADV7k3p/pelwfCOBI20QwWahE3nw9wMdL DiyamRYWlJfkfKuhgjTt+m4Ra7MAeJOR3iD9y6VV34Kxb1dPuOhWRejwx4bJdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777896547; 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=axksXvfyGT2/wnLEFuVgMUdOHkkAFKJFlKSUbXddfZI=; b=yNLmDhTOq/hN3FeN/95XEZ8EKnKDMG0gdYs7YGEGD28Xy307YRTtd0jeV9aXohFZg2MpRv StjZO0uvHTLIsFTsgU1pCSj4Kjt0vw9LltaZTJJA/fh45KGkQCauWdoBWpRRMxCSL68fjJ ieqV4XGRQYa3ENZ+tux6KpzPH/KjIQy+7/klguycnexCn1uwzXJexwCCO7lkgpB07WW98u UhkCl0cf00Gbl7um3fvAKi3bQBvenQJu2/dEoF6XcouTRh/aOhNxyr/zbO3xXr7bRisrkz ilN5saHHrQ8VqW0n5Ql8Tjb7WIkFlvXl8SYJt6frJKD2aKaD/8fv/H6QJpZ3vA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8L6C0v5Jz4Jr for ; Mon, 04 May 2026 12:09:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37733 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 12:09:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 8acc4c16c663 - main - vis.3: Try to better describe VIS_SAFE 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8acc4c16c6635c3cd8871d0ee1221b62d48d71b9 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 12:09:07 +0000 Message-Id: <69f88c63.37733.7fd2598@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8acc4c16c6635c3cd8871d0ee1221b62d48d71b9 commit 8acc4c16c6635c3cd8871d0ee1221b62d48d71b9 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-04 12:08:10 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-04 12:08:10 +0000 vis.3: Try to better describe VIS_SAFE The current text fails to draw the reader's attention to the fact that VIS_SAFE essentially exempts certain characters from being encoded. While here, fix some markup nits. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56716 --- contrib/libc-vis/vis.3 | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/contrib/libc-vis/vis.3 b/contrib/libc-vis/vis.3 index 18329589d940..9b7b8152be3e 100644 --- a/contrib/libc-vis/vis.3 +++ b/contrib/libc-vis/vis.3 @@ -29,7 +29,7 @@ .\" .\" @(#)vis.3 8.1 (Berkeley) 6/9/93 .\" -.Dd April 22, 2017 +.Dd May 3, 2026 .Dt VIS 3 .Os .Sh NAME @@ -246,19 +246,22 @@ alter this: Also encode double quotes .It Dv VIS_GLOB Also encode the magic characters -.Ql ( * , +.Po +.Ql * , .Ql \&? , .Ql \&[ , and -.Ql # ) +.Ql # +.Pc recognized by .Xr glob 3 . .It Dv VIS_SHELL Also encode the meta characters used by shells (in addition to the glob characters): -.Ql ( ' , +.Po +.Ql ' , .Ql ` , -.Ql \&" , +.Ql \&\(dq , .Ql \&; , .Ql & , .Ql < , @@ -272,7 +275,8 @@ characters): .Ql \&! , .Ql \&^ , and -.Ql ~ ) . +.Ql ~ +.Pc . .It Dv VIS_SP Also encode space. .It Dv VIS_TAB @@ -286,13 +290,15 @@ Synonym for Synonym for .Dv VIS_WHITE | VIS_GLOB | VIS_SHELL . .It Dv VIS_SAFE -Only encode -.Dq unsafe -characters. -Unsafe means control characters which may cause common terminals to perform -unexpected functions. -Currently this form allows space, tab, newline, backspace, bell, and -return \(em in addition to all graphic characters \(em unencoded. +Leave +.Dq safe +characters unencoded. +Characters are only considered unsafe if they cause common terminals +to perform unexpected functions. +Setting the +.Dv VIS_SAFE +flag exempts the backspace, bell, and return characters from being +encoded. .El .Pp (The above flags have no effect for From nobody Mon May 4 13:50:07 2026 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 4g8NLm1Dj2z6bCZf for ; Mon, 04 May 2026 13:50:08 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8NLm0FGLz3Lf9 for ; Mon, 04 May 2026 13:50:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777902608; 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=CyNerDDuREPBwudkbmSgs+5HaYzwB4bJ6Wh9rO8yYDg=; b=mQvX1ja4zohP2AsiwwpxZEGExaJM2Uu9vo94L8sodvwD+KKdM+MpzgujlStXOj6JU1pSWY Dyw6xxb/L57DPm6W9vytar4MKutcUB/WfAYJnM6GCDEUSeUoPXcXn0QuaskDX4n0G5z/O4 QWfWXEhZ5/AZoU0xEXBTEaRg5OOjx6zzX1mQkQJDa0QYW5hpMWG10wZYKaGxNyiXJxoSxq bo6RtgWWFKuBhcZ9XyLbEqvSvpR4BChPHlhAtqN7xI/TDB7WVhtvJcS0RCL7NR0Cz4MSId UPPAh0bVcO5eNXbubqe5zNij2Lhi6Cx93PDbC1O2gdFI+2+l/cJb8NyBxR1LVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777902608; a=rsa-sha256; cv=none; b=jmMHT8fBPGgrcKxsw+kdsUlZJL+RywdW8+e/nVJyqckVNN3WCfQaeoGRuRZ9Gl+gqPjjwR PU/u0QglbDc5TbJ+A0LQhsWvU5M5aCQOzFwolEwQ/PBH+zlwuE9sB1cceeBGyrmNkYPHVZ LGg1R2/t03yoyOpxmyACfM/vEzOXQSaFINVfwr7AMvbAERf7Mun5VxL5+0b/UeeDso8eMS H9a6d6CR0R6fBVMCZ1ua9J3NlVfl6UnzluqWgYpwYlx6tImQnJLi1Yt/ojqg1TEVuDr2fR y88j5WZUVTdpbfIsaHdmA2Jl23Dkju7DvcNO1YsnS0dNl2Omx11OG65IQAaDLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777902608; 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=CyNerDDuREPBwudkbmSgs+5HaYzwB4bJ6Wh9rO8yYDg=; b=Rx6mXi7nEJpfFAL718WNT42qmohQ+ausFIuV045G5YoOuzvYgzX+0BWjm9fcUbTfPsrqrZ vzgd9DjUVAwWkB/CpNtmiQGTxcZdFQ/tK7GvG0pw4GJljiA2SadaPPnL3b8LWQC9CkUSDm 75yclHQdOJueVspJz5FM1ZsDL5ds1oVtDtbWgSoBno2A5ObVS+xCORH8a+BHpOJNPghiVS o4Z72tsNiFnsVRH20BXGuJ9kJ4o8jPLq2E1qPS1E/T1A4pySsDpfXyFiVM50vxUFJ873cV jBAZ25XayedsSjoKzmAF6V9081s7cgz3giOFK9KcETBuH83cGYryEQXTtA5hEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8NLl6yC4z732 for ; Mon, 04 May 2026 13:50:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41fd7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 13:50:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 045a9ef829fa - main - llvm: Don't install /usr/bin/{gcov,objdump} twice 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 045a9ef829fa30c2ba7af47ab34d3b2443024207 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 13:50:07 +0000 Message-Id: <69f8a40f.41fd7.1637cbcf@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=045a9ef829fa30c2ba7af47ab34d3b2443024207 commit 045a9ef829fa30c2ba7af47ab34d3b2443024207 Author: Lexi Winter AuthorDate: 2026-05-04 13:49:20 +0000 Commit: Lexi Winter CommitDate: 2026-05-04 13:49:20 +0000 llvm: Don't install /usr/bin/{gcov,objdump} twice Commit c4f08d46c7f7 moved the symlinks for the LLVM binutils from LLVM itself to the toolchain (usr.bin/clang/toolchain), but did not remove the links for /usr/bin/gcov and /usr/bin/objdump from the llvm version, meaning we installed them twice, once in the clang package and once in the toolchain package. Remove the links from the llvm version and move the MLINKs to toolchain, which is where the other MLINKs dwell. While here, fix toolchain to use the correct build option for llvm-cov, MK_LLVM_COV. Fixes: c4f08d46c7f7 ("llvm-*: Move all LLVM_BINUTILS symlinks to toolchain package") Reported by: jrm Reviewed by: jrm, dim, emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56788 --- usr.bin/clang/Makefile | 1 + usr.bin/clang/llvm-cov/Makefile | 2 -- usr.bin/clang/llvm-objdump/Makefile | 3 --- usr.bin/clang/toolchain/Makefile | 4 ++++ 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile index d86508829533..1d80fad2936f 100644 --- a/usr.bin/clang/Makefile +++ b/usr.bin/clang/Makefile @@ -65,6 +65,7 @@ SUBDIR+= lldb-server .if ${MK_LLVM_COV} != "no" SUBDIR+= llvm-cov SUBDIR+= llvm-profdata +SUBDIR_DEPEND_toolchain= llvm-cov .endif .endif # TOOLS_PREFIX diff --git a/usr.bin/clang/llvm-cov/Makefile b/usr.bin/clang/llvm-cov/Makefile index 3c02d4b7d144..67a93fa593bb 100644 --- a/usr.bin/clang/llvm-cov/Makefile +++ b/usr.bin/clang/llvm-cov/Makefile @@ -1,8 +1,6 @@ .include PROG_CXX= llvm-cov -SYMLINKS= llvm-cov ${BINDIR}/gcov -MLINKS= llvm-cov.1 gcov.1 SRCDIR= llvm/tools/llvm-cov SRCS+= CodeCoverage.cpp diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index 86281217ee0a..c0c201b68085 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -29,7 +29,4 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} -SYMLINKS= llvm-objdump ${BINDIR}/objdump -MLINKS= llvm-objdump.1 objdump.1 - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/toolchain/Makefile b/usr.bin/clang/toolchain/Makefile index 1a7db32274e3..5f66ae1433b1 100644 --- a/usr.bin/clang/toolchain/Makefile +++ b/usr.bin/clang/toolchain/Makefile @@ -7,7 +7,10 @@ SYMLINKS+= llvm-ar ${BINDIR}/ar SYMLINKS+= llvm-ranlib ${BINDIR}/ranlib MLINKS+= llvm-ar.1 ar.1 llvm-ar.1 ranlib.1 +.if ${MK_LLVM_COV} != "no" SYMLINKS+= llvm-cov ${BINDIR}/gcov +MLINKS= llvm-cov.1 gcov.1 +.endif SYMLINKS+= llvm-cxxfilt ${BINDIR}/c++filt MLINKS+= llvm-cxxfilt.1 c++filt.1 @@ -21,6 +24,7 @@ MLINKS+= llvm-objcopy.1 objcopy.1 MLINKS+= llvm-objcopy.1 strip.1 SYMLINKS+= llvm-objdump ${BINDIR}/objdump +MLINKS= llvm-objdump.1 objdump.1 SYMLINKS+= llvm-readelf ${BINDIR}/readelf MLINKS+= llvm-readelf.1 readelf.1 From nobody Mon May 4 16:03:08 2026 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 4g8RJF3Sg3z6blYH for ; Mon, 04 May 2026 16:03:09 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8RJD40Ycz3ktv for ; Mon, 04 May 2026 16:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777910588; 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=lv0Uj6SlC/WQMAugmWNMIFjtbMOJ5cxQWhHJqBRBF5Q=; b=xll4ImVKrN9E7eVyvzhUoLn9ig1MuQX7fKKBIn2dSn7EC9s7+cEys00jIq8vM1yERXv6Ol KGgmGrbrsGj1mnTuYq6wMC8a94BGpXz6r6iOAjS9izOGK5Cl09hW/Zo+un0B1DtkazQXbu XfR/Y3/Nbyv7s1bYGgKgyrKJk22JpBL8szvn7HrHxGoAPMOS5xSo5pbN3vajz6unw0Dxi6 AP/9EygVHb/evIYhjD4HfJ8nLzotteDNx85iu2/QA7gQMjDDnVmvLF1FPSivEdO7y9SH3q 4cWCFF3diL2Vqgltpc4YZ0xLmrAe0qsS6R8+ft9xbjSw7UQB8gI7Y+ILeLbRJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777910588; a=rsa-sha256; cv=none; b=IcRNzIhHBgQgyB5fHu7RX4yYleGg7LAGTA2InqD2CDXgws6BO9XOHZY2iibgarxLXJY/Jr sXi12by2a6EILwW2guHSEBQjcwJ3YwFoZ/fJExW8INmuTIoFVGNHMgFkljMCaCkWy9PWaU sCrZP5VGu2CyXfzBAdFPpPSfXoYxYug3V+Y61rRWtaPy9aRE2t7f72UxT1K8EaZCux/M68 twI/gvHUxzEJPA7KYBgX7VwN07mmax2nStMkvqvjn2N+20Wp5WcQHX5pkXLYh3Uldl4mKI ea3iGpAg8Pub8UkmL5JLg0X4j2Zr0J55QSphPCrcxJ0Gn4wSjePMYN+RWdVU2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777910588; 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=lv0Uj6SlC/WQMAugmWNMIFjtbMOJ5cxQWhHJqBRBF5Q=; b=QJIeoihp9hrfULPIt/YHEnrnyY844vG/0pXIAJKCuMlDyk0zyiDINULZ5LqmXDJJTgW5Ud g802fadk40B4JurY6eVy0wRlT2ehkgcyqPfsNmhipFXJOBAYbhk+NDRO4BmV6+8OEnOgOt kInFOXMeR7ypI+13JkAVZ/dAxW677neaxoMsfHbnAZvT8MWnOg/gupKCEGGlnEdpsl5c7Y ckGPoN1P7WAJSN3FmKbbBsuqAf9XWSuNARauP2d84T/HkbJT4eYo7kr+nv4tiKsYEDE7N3 tJ5QUkyg6OaWFAmcrusrjwHSw6uyPjv9xYTL+5Q4J6VGi8oa4vgYjJ9YxsVVpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8RJD2tl7zBrh for ; Mon, 04 May 2026 16:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21d68 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 16:03:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: 36b399f55e3f - main - asmc: rename wol sysctl to auto_poweron 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36b399f55e3fa16063188b6f8ad8eaaf8c2215ab Auto-Submitted: auto-generated Date: Mon, 04 May 2026 16:03:08 +0000 Message-Id: <69f8c33c.21d68.546f46ca@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=36b399f55e3fa16063188b6f8ad8eaaf8c2215ab commit 36b399f55e3fa16063188b6f8ad8eaaf8c2215ab Author: Abdelkader Boudih AuthorDate: 2026-05-04 14:26:44 +0000 Commit: Adrian Chadd CommitDate: 2026-05-04 14:26:44 +0000 asmc: rename wol sysctl to auto_poweron Older SMC firmware exposed AUPO as a Wake-on-LAN control. On updated firmware, the key controls automatic power-on when AC power is restored after a power loss; WoL is handled by the GBE controller instead. Rename the sysctl to reflect the current semantics. No compatibility alias is provided as the sysctl has not appeared in any release. Reviewed by: ziaee, adrian Differential Revision: https://reviews.freebsd.org/D56747 --- share/man/man4/asmc.4 | 9 ++++++++- sys/dev/asmc/asmc.c | 24 ++++++++++-------------- sys/dev/asmc/asmcvar.h | 4 +++- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/share/man/man4/asmc.4 b/share/man/man4/asmc.4 index 9b42d021e1aa..e1dd4b09d647 100644 --- a/share/man/man4/asmc.4 +++ b/share/man/man4/asmc.4 @@ -1,4 +1,4 @@ -.\"- +.\" .\" Copyright (c) 2007, 2008, 2009 Rui Paulo .\" All rights reserved. .\" @@ -112,6 +112,13 @@ minimum fan speed, the minimum speed and the maximum speed respectively. .Pp All values are in RPM. +.Sh POWER MANAGEMENT +The +.Va dev.asmc.%d.auto_poweron +sysctl controls whether the machine automatically powers on when AC power +is restored after an unclean power loss +.Pq SMC key Dq AUPO . +A value of 1 enables automatic power-on; 0 disables it. .Sh RAW SMC KEY ACCESS When the kernel is compiled with the .Dv ASMC_DEBUG diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 5fe89d85be6d..8cd7842d03fd 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -123,7 +123,7 @@ static int asmc_mbp_sysctl_light_left(SYSCTL_HANDLER_ARGS); static int asmc_mbp_sysctl_light_right(SYSCTL_HANDLER_ARGS); static int asmc_mbp_sysctl_light_control(SYSCTL_HANDLER_ARGS); static int asmc_mbp_sysctl_light_left_10byte(SYSCTL_HANDLER_ARGS); -static int asmc_wol_sysctl(SYSCTL_HANDLER_ARGS); +static int asmc_aupo_sysctl(SYSCTL_HANDLER_ARGS); static int asmc_key_getinfo(device_t, const char *, uint8_t *, char *); @@ -793,14 +793,14 @@ asmc_init(device_t dev) device_printf(dev, "SMC revision: %x.%x%x%x\n", buf[0], buf[1], buf[2], ntohs(*(uint16_t *)buf + 4)); - /* Wake-on-LAN convenience sysctl */ + /* Auto power-on after AC power loss (AUPO). */ if (asmc_key_read(dev, ASMC_KEY_AUPO, buf, 1) == 0) { SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "wol", + OID_AUTO, "auto_poweron", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, - dev, 0, asmc_wol_sysctl, "I", - "Wake-on-LAN enable (0=off, 1=on)"); + dev, 0, asmc_aupo_sysctl, "I", + "Auto power-on after AC power loss (0=off, 1=on)"); } sc->sc_nfan = asmc_fan_count(dev); @@ -1222,7 +1222,7 @@ out: /* * Raw SMC key access sysctls - enables reading/writing any SMC key by name * Usage: - * sysctl dev.asmc.0.raw.key=AUPO # Set key, auto-detects length + * sysctl dev.asmc.0.raw.key=TC0P # Set key, auto-detects length * sysctl dev.asmc.0.raw.value # Read current value (hex bytes) * sysctl dev.asmc.0.raw.value=01 # Write new value */ @@ -2338,18 +2338,17 @@ asmc_mbp_sysctl_light_left_10byte(SYSCTL_HANDLER_ARGS) } /* - * Wake-on-LAN convenience sysctl. - * Reading returns 1 if WoL is enabled, 0 if disabled. - * Writing 1 enables WoL, 0 disables it. + * Auto power-on after AC power loss (AUPO key). + * When non-zero the machine boots automatically when AC is restored + * after an unclean power loss. Useful for always-on servers / home labs. */ static int -asmc_wol_sysctl(SYSCTL_HANDLER_ARGS) +asmc_aupo_sysctl(SYSCTL_HANDLER_ARGS) { device_t dev = (device_t)arg1; uint8_t aupo; int val, error; - /* Read current AUPO value */ if (asmc_key_read(dev, ASMC_KEY_AUPO, &aupo, 1) != 0) return (EIO); @@ -2358,10 +2357,7 @@ asmc_wol_sysctl(SYSCTL_HANDLER_ARGS) if (error != 0 || req->newptr == NULL) return (error); - /* Clamp to 0 or 1 */ aupo = (val != 0) ? 1 : 0; - - /* Write AUPO */ if (asmc_key_write(dev, ASMC_KEY_AUPO, &aupo, 1) != 0) return (EIO); diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index ae027ba33ae9..6388fc78fb69 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -175,7 +175,9 @@ struct asmc_softc { #define ASMC_KEY_CLAMSHELL "MSLD" /* RO; 1 byte */ /* - * Auto power on / Wake-on-LAN. + * Auto power-on after AC power loss (AUPO). + * When set, the machine boots automatically when AC power is restored + * after an unclean power loss. This is NOT Wake-on-LAN. */ #define ASMC_KEY_AUPO "AUPO" /* RW; 1 byte */ From nobody Mon May 4 16:57:35 2026 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 4g8SW371fwz6bsHS for ; Mon, 04 May 2026 16:57:35 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8SW362Vhz41kM for ; Mon, 04 May 2026 16:57:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913855; 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=VW4kyahdX4XyQO6paPtloN4vbTAEOg/xpqlj80yP+oE=; b=NklJo+1OxDYL+/VLiC59dhY6vC+mjYYEMWVOVZUsLdECyC3N4XE6ZQWpqKxtxfY5OPP5zX rwhG3Vaqp+stYggvrk6JwdKTjonpSE7bpO/yWVJwIJJLrRC0WOQSvt7nUTda4Z4/dZeL7A IeZnQkmNjPJ4x89SsSHvjOdVd52KXRnBBaYr1CI6UN4aUDqzMLjBG5xq27OQSbvd49duHA QlgIUJxxKbRQHi2TuWljiu1C0n78XB9ibkthu9leOu+sDiDlpVowpEUGVvFYkvS+rfo6nG G4cdwTzNnR/JehrvOXj8lQhGLDMJFNjEUCSxs4uVFbL1O3rhiNwxjCJBcH/Gxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777913855; a=rsa-sha256; cv=none; b=b2lHvms+6EW5LZoUexhf5sKwYqm0+7dcJL2zdnG1dIGFT1DAOZDvZ1NGdGTFJdmqRUi1Xx +bC4OBzlC3tuhUcC49KTQom72fRZpOKXzpYf2SIBmogtxoxS2YiBQW8QjEP+j1kAJNqg3R vvFSE3LKVhF5knYsTb+ERBr8qvtlb/a8MRBBQg3WPDuptm83LEmytZCZ6gz48mCBn9d1UZ 67moG93RtBBruJNrqKRcIsgTG6iC24v//cWAynWwW6IO4YKI+6L9lxoDrEccRO/p/4x/Rc mlAL2dkZBNSHGbXETImPi97Y5VQpk0dNg/98g4amyc3gj0AoKeJTZ8jdINAIog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913855; 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=VW4kyahdX4XyQO6paPtloN4vbTAEOg/xpqlj80yP+oE=; b=vSMnbLPY6yZxim88HofLvDexIY7rxAqcPCuUx03vi8U1FjDksCzUIQ3t1a3DjXHDDz1Gw4 fP5lvQkhUAJYBVhwUt80P9Rkkc9NNlvo8E0pnW7SON9zgm5dVAnZXf2+PxRPCUfFGtiHcN Epz/4NngYhj70CExKFTnfP0HuBmkuCvG1JHvqc0AbXJcuWS8mMWAQ2GAomn4M/3+DtFyG9 37eVjana0NypZM4kuWZsSzvHCoC51+kOY1MkAdvxy3F5LJJrYffLTh3p6sK8DohSp6zpvf Dj6Zdp73HAZt4OwBFcUpfUeZv8dx4pMJpSyZxVufDY/YDDrQHqm08bBODjaMqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8SW35WdZzCqD for ; Mon, 04 May 2026 16:57:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26d7b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 16:57:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: d5728351a58b - main - amd/int0x80 test: fix inline asm for gcc 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5728351a58b87764f3302eb8c4ca9f35e99e8b6 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 16:57:35 +0000 Message-Id: <69f8cfff.26d7b.61328eb3@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=d5728351a58b87764f3302eb8c4ca9f35e99e8b6 commit d5728351a58b87764f3302eb8c4ca9f35e99e8b6 Author: Ryan Libby AuthorDate: 2026-05-04 16:34:41 +0000 Commit: Ryan Libby CommitDate: 2026-05-04 16:34:41 +0000 amd/int0x80 test: fix inline asm for gcc Gcc complained about the unused %0 asm argument. Fixes: 2c2ec6bbc9cc ("tests/sys/arch/amd64: add a program to check INT $0x80 behavior on amd64") Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D56781 --- tests/sys/arch/amd64/int0x80.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/sys/arch/amd64/int0x80.c b/tests/sys/arch/amd64/int0x80.c index e03462a6dccd..fbe98fb341a1 100644 --- a/tests/sys/arch/amd64/int0x80.c +++ b/tests/sys/arch/amd64/int0x80.c @@ -46,12 +46,13 @@ fire(void) { int res; + res = SYS_getpid; asm volatile( ".globl\tafter_int0x80\n" "\tint\t$0x80\n" "after_int0x80:" - : "=a" (res) - : "%0" (SYS_getpid) + : "+a" (res) + : : "rdx", "memory", "cc"); return (res); } From nobody Mon May 4 17:28:21 2026 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 4g8TBY5Snhz6bwT3 for ; Mon, 04 May 2026 17:28:21 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8TBY4tcGz475r for ; Mon, 04 May 2026 17:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777915701; 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=QQsrTp0VFiL2UFaI6/46+ato6qXAfB/yvsL6I1GI86U=; b=FHf8pEAkvM2/TU+mDA4F85CVE8l61OQgAg8cFj/wCsPhwWoWNKGxeZeqVAlo3PAWDoZc88 N6Oh2z7hte9QdlbSgOIJGUV+5DOVYGMkFase07SWA7MdbI0C3bkMmh8DoexPBfUONUUJqI oP9uQopneAVMEXP2OLDlKYI6lJN/Kl+nmFfNUUB1yJ5zVS/kijHNN5W9Co/ZTCzDel5XGo 0hJQB35DdHLhM3uCmAjJInoeDtQoJpr8Kz+NNgzFH4UuJg8Zc7iZx/qCFKqQHXXXkX4uPt bqjnjwZ7sjuww3Z92CtzUjbxH3mdDIjfohRFXwNuL8jTFUh1riKNkKScAx7qRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777915701; a=rsa-sha256; cv=none; b=Wel+HUycG+Xa6DYNpEHzURCv4gIlTVf4vAAKnQsw/55kCrpahy7H+nLdpZWT+ZLE+VegQh 7rkxdo0Etz9/XYYSQ5OZmRaGqmL1s6gWB8WTZR/lGXp82nTQ4uotUPWR5ko0iqSRuSNbPA 8IjYPm/dWFtQwumh18t/uRrkna/qPRbPG9+dKo10CP9LuJKQhhEEoNzb2StCYAs9b+nuaE WP72V92QQ20HonvVsOgCENG8soCbGvfeRCXToW6Dhwyzhc+U5UVwPfwU0PS/69uqnUw56z y4wR8jyAVfsjodRq8sTnlZv0RabGOBjoLzATEOySlfrhfY9wNIwaMx00oUv0iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777915701; 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=QQsrTp0VFiL2UFaI6/46+ato6qXAfB/yvsL6I1GI86U=; b=yazLdTqwoeQwJnq5qKAfay+wZ70TKd4tJFDztjhs/8bO7xvPSDI+GzSZwBveZTOp3q9fK/ HuFr7H3RQxw0MRTN5v9g+3znDeP7IIuMURjcJxSMHhDWVY05vsXpgVNuiWZYuMKlkwyXfI x6Er7LULPNXWsFwqASf1gbSmNwvU5Uhc/hSBD3vFxJsoIxGK4GQvt6clN/uYUGOqGSWgqT H6iM9lAnlSyjNGPVdelBLUeNRTCthMcWdkdz8nm1RFajmUlTJ/ZI3M2TpYkuQeDRoonyk7 Xx0AQYCYJYetUtyze6sleqqWGh0jifQ88dH80DR0xPGJ8hAcMTr5h+FGztohpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8TBY47cpzTyv for ; Mon, 04 May 2026 17:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30a39 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 17:28:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: eca4dd133883 - main - execve: Add guard pages around execve KVA buffers 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eca4dd133883c9e9aaeca68e0119a638ba0aaca7 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 17:28:21 +0000 Message-Id: <69f8d735.30a39.330b25c8@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eca4dd133883c9e9aaeca68e0119a638ba0aaca7 commit eca4dd133883c9e9aaeca68e0119a638ba0aaca7 Author: Mark Johnston AuthorDate: 2026-05-04 15:38:54 +0000 Commit: Mark Johnston CommitDate: 2026-05-04 17:28:02 +0000 execve: Add guard pages around execve KVA buffers This helps ensure that overflows will trigger a panic instead of silently corrupting adjacent buffers, as happened in SA-26:13.exec. Extend kmap_alloc_wait() to support allocation of guard pages on both sides of a KVA allocation. Modify the exec_map setup accordingly. Add the "vm.exec_map_guard_pages" tunable to provide control over the guard page allocations. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56711 --- sys/kern/kern_exec.c | 3 ++- sys/vm/vm_extern.h | 2 +- sys/vm/vm_init.c | 8 ++++++-- sys/vm/vm_kern.c | 39 ++++++++++++++++++++++++++++++++------- sys/vm/vm_kern.h | 1 + 5 files changed, 42 insertions(+), 11 deletions(-) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 8e3b41170cab..958ec559fd8d 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1435,7 +1435,8 @@ exec_prealloc_args_kva(void *arg __unused) mtx_init(&exec_args_kva_mtx, "exec args kva", NULL, MTX_DEF); for (i = 0; i < exec_map_entries; i++) { argkva = malloc(sizeof(*argkva), M_PARGS, M_WAITOK); - argkva->addr = kmap_alloc_wait(exec_map, exec_map_entry_size); + argkva->addr = kmap_alloc_wait(exec_map, exec_map_entry_size, + ptoa(exec_map_guard_pages)); argkva->gen = exec_args_gen; SLIST_INSERT_HEAD(&exec_args_kva_freelist, argkva, next); } diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index 207eb721d129..799b89ce2fc8 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -51,7 +51,7 @@ void *kva_alloc_aligned(vm_size_t, vm_size_t); void kva_free(void *, vm_size_t); /* These operate on pageable virtual addresses. */ -void *kmap_alloc_wait(vm_map_t, vm_size_t); +void *kmap_alloc_wait(vm_map_t, vm_size_t, vm_size_t); void kmap_free_wakeup(vm_map_t, void *, vm_size_t); /* These operate on virtual addresses backed by memory. */ diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c index 40a001afb300..316b43c1c240 100644 --- a/sys/vm/vm_init.c +++ b/sys/vm/vm_init.c @@ -274,8 +274,12 @@ again: exec_map_entries = 2 * mp_ncpus + 4; #endif exec_map_entry_size = round_page(PATH_MAX + ARG_MAX); - kmem_subinit(exec_map, kernel_map, &minaddr, &maxaddr, - exec_map_entries * exec_map_entry_size + 64 * PAGE_SIZE, false); + exec_map_guard_pages = 1; + TUNABLE_INT_FETCH("vm.exec_map_guard_pages", &exec_map_guard_pages); + size = exec_map_entries * + (exec_map_entry_size + 2 * ptoa(exec_map_guard_pages)) + + 64 * PAGE_SIZE; + kmem_subinit(exec_map, kernel_map, &minaddr, &maxaddr, size, false); kmem_subinit(pipe_map, kernel_map, &minaddr, &maxaddr, maxpipekva, false); TSEXIT(); diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index 3a6fed6cb3e1..fc5d0de424bd 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -107,6 +107,7 @@ CTASSERT((ZERO_REGION_SIZE & PAGE_MASK) == 0); const u_long vm_maxuser_address = VM_MAXUSER_ADDRESS; u_int exec_map_entry_size; +u_int exec_map_guard_pages; u_int exec_map_entries; SYSCTL_ULONG(_vm, OID_AUTO, min_kernel_address, CTLFLAG_RD, @@ -706,34 +707,52 @@ kmem_free(void *addr, vm_size_t size) vmem_free(arena, (uintptr_t)addr, size); } +static void +kmap_alloc_map(vm_map_t map, vm_offset_t addr, vm_size_t size, + vm_prot_t prot, int flags) +{ + int error __diagused; + + error = vm_map_insert(map, NULL, 0, + addr, addr + size, prot, prot, flags); + KASSERT(error == KERN_SUCCESS, + ("%s: unexpected error %d", __func__, error)); +} + /* * kmap_alloc_wait: * * Allocates pageable memory from a sub-map of the kernel. If the submap * has no room, the caller sleeps waiting for more memory in the submap. + * If "guard_size" is non-zero, then unmapped KVA is left at the beginning + * and end of the allocated range. * * This routine may block. */ void * -kmap_alloc_wait(vm_map_t map, vm_size_t size) +kmap_alloc_wait(vm_map_t map, vm_size_t size, vm_size_t guard_size) { vm_offset_t addr; + vm_size_t total_size; + + KASSERT(size % PAGE_SIZE == 0 && guard_size % PAGE_SIZE == 0, + ("%s: size %zu guard_size %zu", __func__, size, guard_size)); - size = round_page(size); if (!swap_reserve(size)) return (NULL); + total_size = size + 2 * guard_size; for (;;) { /* * To make this work for more than one map, use the map's lock * to lock out sleepers/wakers. */ vm_map_lock(map); - addr = vm_map_findspace(map, vm_map_min(map), size); - if (addr + size <= vm_map_max(map)) + addr = vm_map_findspace(map, vm_map_min(map), total_size); + if (addr + total_size <= vm_map_max(map)) break; /* no space now; see if we can ever get space */ - if (vm_map_max(map) - vm_map_min(map) < size) { + if (vm_map_max(map) - vm_map_min(map) < total_size) { vm_map_unlock(map); swap_release(size); return (0); @@ -741,10 +760,16 @@ kmap_alloc_wait(vm_map_t map, vm_size_t size) vm_map_modflags(map, MAP_NEEDS_WAKEUP, 0); vm_map_unlock_and_wait(map, 0); } - vm_map_insert(map, NULL, 0, addr, addr + size, VM_PROT_RW, VM_PROT_RW, + if (guard_size != 0) { + kmap_alloc_map(map, addr, guard_size, + VM_PROT_NONE, MAP_CREATE_GUARD); + kmap_alloc_map(map, addr + guard_size + size, guard_size, + VM_PROT_NONE, MAP_CREATE_GUARD); + } + kmap_alloc_map(map, addr + guard_size, size, VM_PROT_RW, MAP_ACC_CHARGED); vm_map_unlock(map); - return ((void *)addr); + return ((void *)(addr + guard_size)); } /* diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h index 942c03480364..296a50ae0058 100644 --- a/sys/vm/vm_kern.h +++ b/sys/vm/vm_kern.h @@ -75,4 +75,5 @@ extern struct vmem *memguard_arena; extern u_long vm_kmem_size; extern u_int exec_map_entries; extern u_int exec_map_entry_size; +extern u_int exec_map_guard_pages; #endif /* _VM_VM_KERN_H_ */ From nobody Mon May 4 17:28:22 2026 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 4g8TBb1ZzMz6bwNp for ; Mon, 04 May 2026 17:28:23 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8TBZ5vy4z47Dt for ; Mon, 04 May 2026 17:28:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777915702; 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=JOqHTccQfLt80L7HNrXk9Zz6aQitVxmebS8+EOPoDig=; b=cX55IHfrI7y8jklEv3PcKjxLQeUPQOHpDWVUWokKUB6CJag2/vi7PKTjz5m0zDhV6/q/+f SkKkElmr9ZrbmSpsvt4I67oib0HiGeh/D+0Agguc+RvDDpmSOKi4rZ0GAuBVu83G2Zq6H0 IB6Oo3L/lFDZQkKhk4ju1GiQYS7y9Ja3TdSsg5/jVExhlSK9etB7v0mP4CPvIeaIUXxL/4 T4bliSzFQUKmcvka6Y5gj4fPKTDOVLD/BUyAnIUofp0Gqtdf0CY9HNd8TGbqSRmotHITtT wAx37zodnraCGppAR5O2RVzK4wVLrq4BYkVlItpELaGftKJXSPJWv+MfREUDdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777915702; a=rsa-sha256; cv=none; b=cH65iAmNt6KF9iWbktyWIMQYbGg7Led6oiVK1LyJWPZr2ZVq2Teh1VXR+rMSh4UHXvcr3z LfYuk1k/VWTTDq+kPhRcIuWLgrXJ9AR6zlJ5y6gc/tw3GuzOvozA2cAlRpBjdhdQIuYWmt mW8oYZbIsnp1unV4QChlNxBXFEzd7DIjmn9a5H3EMAiWMOhwS8OnfkXBtFX2azj5MAY6fn 5QcarLd9vZFiV8RNYmmjVO50qtVQ8qe15hV31nDaH4bbifm9Ur/JMi4SQpzq9sJs3EM+RH mLquzyuDN/aaxIXpqujo1N3ao+O8abjXgi1xMdh12f4Nw1CinyNSqgUYIQCikQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777915702; 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=JOqHTccQfLt80L7HNrXk9Zz6aQitVxmebS8+EOPoDig=; b=oDxTzkqvRRXhkU5MT/RlfXGFYngcBSqlOSAGaguOhyxKy/txETMr/C7qQ4bxfLBZW/jIyD 7Ckz/UDervJOqUQSMeRV84vTheSLANRRG1S0k00dXobziPyCkUS8skDHZ2ljlbialxQXVo 2Odyjuy8OKSbEPUuOnokV8hYZkQ5f85DdhS5GYVtulaRVEbGzsfIKW/BUWporxDzPVHRXV LXQuzUT9Yni6RWiDaVFYecppaJulB22gtUiLGYz83jjHuxO1R5lMAFgyr/UrIgPWtI10xL /FZYQ+uFl/t7nfu8+JVKJkd3lQsvaLjgMMlAJJYYQo9s9thJXmnkltyLAHCqow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8TBZ4yx5zVBX for ; Mon, 04 May 2026 17:28:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 322ba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 17:28:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 41b03932e590 - main - tests: Add a simple regression test for an execve overflow bug 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41b03932e59068decf03b7975889841f71c73ec4 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 17:28:22 +0000 Message-Id: <69f8d736.322ba.1871d479@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=41b03932e59068decf03b7975889841f71c73ec4 commit 41b03932e59068decf03b7975889841f71c73ec4 Author: Mark Johnston AuthorDate: 2026-05-04 15:39:55 +0000 Commit: Mark Johnston CommitDate: 2026-05-04 17:28:02 +0000 tests: Add a simple regression test for an execve overflow bug MFC after: 2 weeks --- tests/sys/kern/Makefile | 1 + tests/sys/kern/execve_overflow.c | 46 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index a5a2af67e39d..a06e8702f16d 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -17,6 +17,7 @@ ATF_TESTS_C+= kern_copyin ATF_TESTS_C+= kern_descrip_test # One test modifies the maxfiles limit, which can cause spurious test failures. TEST_METADATA.kern_descrip_test+= is_exclusive="true" +PLAIN_TESTS_C+= execve_overflow ATF_TESTS_C+= exterr_test ATF_TESTS_C+= fdgrowtable_test ATF_TESTS_C+= getdirentries_test diff --git a/tests/sys/kern/execve_overflow.c b/tests/sys/kern/execve_overflow.c new file mode 100644 index 000000000000..462f36ac5154 --- /dev/null +++ b/tests/sys/kern/execve_overflow.c @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2026 Mark Johnston + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +/* + * A minimal regression test for FreeBSD-SA-26:13.exec. + */ + +#include +#include +#include +#include +#include +#include + +#define SCRIPTNAME "script" +#define SCRIPTBODY "#!/bin/sh\nexit 0\n" + +int +main(void) +{ + char *argv; + size_t size; + int fd; + + fd = open(SCRIPTNAME, O_WRONLY | O_CREAT | O_TRUNC, 0700); + if (fd == -1) + err(1, "open"); + if (write(fd, SCRIPTBODY, sizeof(SCRIPTBODY) - 1) != + sizeof(SCRIPTBODY) - 1) + err(1, "write"); + close(fd); + + size = ARG_MAX / 2; + argv = malloc(size); + if (argv == NULL) + err(1, "malloc"); + memset(argv, 'a', size - 1); + argv[size - 1] = '\0'; + + execve(SCRIPTNAME, (char *[]){ argv, NULL }, (char *[]){ NULL }); + + exit(1); +} From nobody Mon May 4 18:31:20 2026 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 4g8VbD3xnHz6c3Vw for ; Mon, 04 May 2026 18:31:20 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8VbD30Ftz3H18 for ; Mon, 04 May 2026 18:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777919480; 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=Yn86SAOoCxbD8FasxVcJ0l+MKC2j0ZE/qrI2ldCPspU=; b=Ox9JjOzZZNu+5kWr2rMHhPXGMuPHBXm1Qno9TYvwfBNyF9i9zZsIs/uxE+plpyQVpVjd8t MUPtytGHt+GDydTqE+OB84eZAeCf+kBEHPSKe/R8vEeBFaG5dm+kuj7BUOEiTpRWIs94Hm PTMBx/T1fW2+G5+7xe+2wbSZXFxOQjjxBI+Hlbcgyoz9R51ip5Rx0KuOBtvy2X/zcHf6gN IK41pjFaq0NyKPZiKLQaoAd7SOJZH2Xek2ANdhUEyFTAI91D3fAa3SxEK/rgD6N5Kxmlst WhsUNeq5EFC7CQAs6zooozBM5Pk2IJuSZA+hKztElINz3ZB5j4FYPW+C1ck/8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777919480; a=rsa-sha256; cv=none; b=qnOW0ABHD0LApG5WGPAjaM9up0/1kSzGrhClqwLacJne1JmpCovacmzDig9pATUbB2INEt 3UB71l1m6wYe3xKc6mloMGg2pY9et7ZW7mbktns3qzNeV/oCCBG745KCHVuE04LdVsclq9 BcjkdUt2GRV+QahYyt5Q3DC6C+mE8zHEz6Si7gNov+9omiekv8786BwjL2PqGBYvjPKJSY 1+ThDg8GRg8jv/pwV3FTLNQwhGiaAu7Gk4/Hi1FbdFCNy0np4ubCDcCdinSX4Kh62S0hV8 aeNSOOI5kyhochAqVKhEAz9OwJSwggf+zy+lGYX3zJw3klk74Oi3e68tz26n3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777919480; 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=Yn86SAOoCxbD8FasxVcJ0l+MKC2j0ZE/qrI2ldCPspU=; b=IE6k7hv7tSlY8j0oao/EJYiWACppvoIFjQS/yzOdPLS4nz2OAnWSBd9VILEyUek7RdFji0 RifyO6ez1O7ZldrCCVuDQbZKjqNieJSxU236ox34eUEvlUWJapMIWwraHrcdhCL0ILMyUy 6oHeEC+lL4FFlBJBOrK1qxYHOXt4rBr3+wx+QeySfwRMZqHGWNej1kcgLlDul/QnSTujXX 3nCaGHmaRFf1HpK0QF/KXqagN2Xc+E/IJF/Mx6+CEbmXPSdvTHm4wI527ZlsouJiiefNJj O0xResvzn6uFl7BXbEdIJSmOZG3Le4AXj+U11A9hZZhIjdi8syWng/WdQSUOqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8VbD2bQCzYpL for ; Mon, 04 May 2026 18:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38745 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 18:31:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: c295f0263760 - main - zone.9: Add a missing newline 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c295f026376035fee1a9e44efa2af30d46b7884a Auto-Submitted: auto-generated Date: Mon, 04 May 2026 18:31:20 +0000 Message-Id: <69f8e5f8.38745.7da088ff@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=c295f026376035fee1a9e44efa2af30d46b7884a commit c295f026376035fee1a9e44efa2af30d46b7884a Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-05-04 18:28:36 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-04 18:29:48 +0000 zone.9: Add a missing newline MFC after: 3 days --- share/man/man9/zone.9 | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9 index 9f13cf0e504a..eeac1f241c29 100644 --- a/share/man/man9/zone.9 +++ b/share/man/man9/zone.9 @@ -484,6 +484,7 @@ Free items in the per-CPU caches are left alone. .It Dv UMA_RECLAIM_DRAIN_CPU Reclaim all cached items. .El +.Pp The .Fn uma_reclaim_domain and From nobody Mon May 4 18:34:47 2026 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 4g8VgP1rdSz6c3dG; Mon, 04 May 2026 18:34:57 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from mx0a-00273201.pphosted.com (mx0a-00273201.pphosted.com [208.84.65.16]) (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 "*.pphosted.com", Issuer "Sectigo Public Server Authentication CA OV R36" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8VgN3WLyz3HcC; Mon, 04 May 2026 18:34:56 +0000 (UTC) (envelope-from sjg@juniper.net) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=juniper.net header.s=PPS03102026 header.b=C3cvfG0L; dkim=none ("invalid DKIM record") header.d=juniper.net header.s=selector1 header.b="fuQs/cRO"; dmarc=pass (policy=reject) header.from=juniper.net; spf=pass (mx1.freebsd.org: domain of sjg@juniper.net designates 208.84.65.16 as permitted sender) smtp.mailfrom=sjg@juniper.net; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}") Received: from pps.filterd (m0108158.ppops.net [127.0.0.1]) by mx0a-00273201.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 644HugOQ2973979; Mon, 4 May 2026 11:34:55 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; h= cc:content-id:content-type:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=PPS03102026; bh=SzfkvGbl0 ACeTKHzVhu3Vi2zwnvmqccuOV39oAr8p6E=; b=C3cvfG0LHsXxOkVR+ckaEbjnf zfo2m7gX+I9gQ5ef8FLB4sg9Tu0/WHV8DsJjFh3XvF5vIK48As8/7fJ3zqEAkSe9 CwzfHuBRrj5CzCS6bQr9CGLg6j6QWhg9t89p/hEYj4Hsehpvwq6boWLkRfeScowS mgIjd/0PvFTypnBufqeTRA7MxSwEyiwUwERAifDFFcyOWzjiLB6T8PhcNNiqW193 91CnLcMmkb7wFXx71VLxLPyhBREddMNIKFY+3qnariY1/pU61+9R35EK0sYcDXNP M2TMinKihrToozO+2XroqR1HI6Byuu2QJSkPU9EjPQj7lt/hdcblYOe9tKmYw== Received: from cy3pr05cu001.outbound.protection.outlook.com (mail-westcentralusazon11013026.outbound.protection.outlook.com [40.93.201.26]) by mx0a-00273201.pphosted.com (PPS) with ESMTPS id 4dwkbqr07c-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 04 May 2026 11:34:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=a7uxa2gmghYr/bxeWzIQ4aKxt5RzNroe25XSJXKhV0aRmMvTuiVarc2UMMSvlfGpof3ZiEtOlLCbXCxVRf1NLExPahOjxnz+zexaV9TGtxCX6oFugdMuCn1JS5gHZ25+LP9kjAQlGlgyAh6pINMNE+UDVW0Y/FWUbLlNHBgkox7F6eyQRsaigWvRW6TG7U7VH6pVJuiSSXDFdQI+YOb2LQG4IM/kDrTCy1vMpCMVHirByzfuzgu1wDGkgJyviYH+ZssslsYOhKimoxA1upmW8Kxa97gkozedQzXzc4A9bdqgm2HxZwqwT39FZ4R8wXvhHHLxT8FnzoWFVaYfKSu6lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SzfkvGbl0ACeTKHzVhu3Vi2zwnvmqccuOV39oAr8p6E=; b=eTENmb6fhAt2jtRji/C6lopd+USdowmQht+pMUNVTiKRRA7RtqUgE8NftRMg5E1jMOFVI4mEWuPXpVOajkf5BMd3gzMc8djjA15qfrvVRy1b4z+gk25Fiuj9XtvxZR59q8tIVietIzEynS2tYYKlbF+MqfJUOzZOQjtwheHZ7EiaLP9iI0KaGx5/79lWlWp5S55+vs2Z50WRghfVJqG07OSxjsdn3nly6TgJzb54BYw4g7lu/snE02lWin7Ls4pAZve/RMeUguRhMd1eDcOCwCYxvQfw5cjX9a5qvloqfhKXcgiBnBJGuAeLgFk7LI2GBKJnUgaRzPgTHcr5hHKa6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 66.129.239.14) smtp.rcpttodomain=freebsd.org smtp.mailfrom=juniper.net; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=juniper.net; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SzfkvGbl0ACeTKHzVhu3Vi2zwnvmqccuOV39oAr8p6E=; b=fuQs/cROru3bPTFQMEuNiIRYJaXfyEHn4If0wCLnlotvXSy+4GrLMZWPVRGNaQ3FK5vlaMiuOBK0k5BwulrMXHqxQoPiooj7vpLot6RZs2+KodZok9MvS2ksovzCTBgRHCgSoYTzM8xaofyYmLYLhqIB6cAooCJPICOiKguTBdk= Received: from SJ0PR03CA0205.namprd03.prod.outlook.com (2603:10b6:a03:2ef::30) by CY5PR05MB9071.namprd05.prod.outlook.com (2603:10b6:930:3d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.26; Mon, 4 May 2026 18:34:48 +0000 Received: from SJ1PEPF000026CA.namprd04.prod.outlook.com (2603:10b6:a03:2ef:cafe::7f) by SJ0PR03CA0205.outlook.office365.com (2603:10b6:a03:2ef::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9870.25 via Frontend Transport; Mon, 4 May 2026 18:34:47 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 66.129.239.14) smtp.mailfrom=juniper.net; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=juniper.net; Received-SPF: Fail (protection.outlook.com: domain of juniper.net does not designate 66.129.239.14 as permitted sender) receiver=protection.outlook.com; client-ip=66.129.239.14; helo=juniper.net; Received: from juniper.net (66.129.239.14) by SJ1PEPF000026CA.mail.protection.outlook.com (10.167.244.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9891.9 via Frontend Transport; Mon, 4 May 2026 18:34:47 +0000 Received: from p-exchfe-eqx-03.jnpr.net (10.104.9.50) by p-exchfe-eqx-04.jnpr.net (10.104.9.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Mon, 4 May 2026 11:34:47 -0700 Received: from p-exchbe-eqx-04.jnpr.net (10.104.9.87) by p-exchfe-eqx-03.jnpr.net (10.104.9.50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Mon, 4 May 2026 11:34:47 -0700 Received: from kaos.jnpr.net (10.104.20.6) by p-exchbe-eqx-04.jnpr.net (10.104.9.87) with Microsoft SMTP Server id 15.2.2562.37 via Frontend Transport; Mon, 4 May 2026 11:34:47 -0700 Received: by kaos.jnpr.net (Postfix, from userid 1377) id 1DB19C8E7E; Mon, 04 May 2026 11:34:47 -0700 (PDT) Received: from kaos.jnpr.net (localhost [127.0.0.1]) by kaos.jnpr.net (Postfix) with ESMTP id 1C2DFC8DF0; Mon, 04 May 2026 11:34:47 -0700 (PDT) To: Oliver Pinter CC: "Enji Cooper (yaneurabeya)" , =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Subject: Re: git: 566cc005812b - main - safe_set treat ':' and '#' differently In-Reply-To: <6906.1777574491@kaos.jnpr.net> References: <69e8f964.39869.24418b55@gitrepo.freebsd.org> <86jyts1xzr.fsf@ltc.des.dev> <15177.1777314263@kaos.jnpr.net> <86bjf41chq.fsf@ltc.des.dev> <24831.1777314998@kaos.jnpr.net> <6875.1777333471@kaos.jnpr.net> <6906.1777574491@kaos.jnpr.net> Comments: In-reply-to: "Simon J. Gerraty" message dated "Thu, 30 Apr 2026 11:41:31 -0700." From: "Simon J. Gerraty" X-Mailer: MH-E 8.6+git; nmh 1.8; Emacs 30.2 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <11634.1777919687.1@kaos.jnpr.net> Date: Mon, 4 May 2026 11:34:47 -0700 Message-ID: <14577.1777919687@kaos.jnpr.net> X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000026CA:EE_|CY5PR05MB9071:EE_ X-MS-Office365-Filtering-Correlation-Id: 14c57f7f-4fa1-49ed-09d3-08deaa0bd1f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|36860700016|13003099007|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: e3GflaVVRAwENgZRktMQzjG/ri4OTofbaqE7G0xGqB7pO4uExIcqNGVJfJOeRmWaok83Nhj/eDOJVrymeKH1HvCei+VHdpjQli8VRzTFA1cEtfD3AoasariOLzs7n9oxzLtCnOUvv2AG5jVA2Ry+cR2CWmqU3i2YOabOEed88iavcYvDmFg/Lz7EWDHVKizA0zxycAC/pTRhoeRyWweXMHsLUEn4CCDpT+mybNai47GnLy2AnfCvTLkazVjpW2YsQwi326IyjvDQEDVor4lc7UTkkZYxbuCFD9byBYDxquLP1LRkUBmAHvbV+FJuiefMpIqwWMuCdssBU7a5zkUI0OblEKT2wOPGXd4Af+3x2983vLu5aYp+KyZYvsn8DWnqO+AfvRU6pI39wq303NmBbyJe1BmO00vd7/SKnWmgSogaSozBNfiLMyai0TzefGOzbPRT95sL72ouPo3nLnNGV6Q211/Fj1rg57m826X1vET3ILejHTBdf5zaHfVeHdQuuKXEeOZqo0br6MhyTv9EEFlmXvrZ1GtLglDrYg1edQIoNoS+5L7teTp5CiJNfntxZXa/NPlnvn2G8E2vs2tUUW/mWHyVz7NSfedE2etX7IjQ1ea2HO33imsyxRGAYncWLoNeqh1UIHZOAuL7vYx12TkB31KJ5y/CxF74qlVXulhYtCYgliBewToo2V4DjiVEywHnCSwb/tnDeS2K+7beB8JkotaVY3nhdLTNBlws1+2ca2gKXqvjMQAGyJzeaB2z X-Forefront-Antispam-Report: CIP:66.129.239.14;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:juniper.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(376014)(36860700016)(13003099007)(18002099003)(22082099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2/a/Sz7ZZzJVd/5ll7RMvpyYeOrhDQx/uviKhONIu8QamWD8VcaCZKtHkAS9sO3cKtbQXxpMT34hRtQdzot5qjGQYaHeMZbu0xh+HlkpuyLdTG7PX95dINKTOwsEiRIjLNIb6+nBfo3cTvuFZ5bkKK4rjV+ApiSB3ZL7kimCYXggPutg3w+z5HBITOK2hDRh8RkdqUg5HJCSJKjfd6pVjqnHxTcy5WfvbMGPC3cfOCKvUEm6Jg2enwqTm6eEl9ChsFhpyZ/VwA8sGQ6gKNIhsA1erM18GS/gZZx1nUjJ5XpWvunRi7hQ+CMiJuyDCCENZPcAXwbMiR5zg+6hMSGGM7lp6FFbTZMVLbRXSBfj5wd/v7q8KUBdjjMn+QvBZ1rwiguj005CyhteI16YOmrkaiUpbh/tffWJcswDXG0GE6ms84lY3NcWeMeirQTdJ37G X-Exchange-RoutingPolicyChecked: A02W3Es/py8Btagl9RaOgnPClkwvK8KjTEnyF77C2oM1jzHDzfC2MKy9DL6lrxP5mepaa9rtG65k1z+HKdL0xoRw40miRRZl+wsNPwOzDXnJwPZQKydh3i3VSDjumbwJb4w//rcEJyiKjrEbL6ocQAv240KHpb5j4dl9qxqpSeGrK67qKGbt39D2OxWSxOJgSCE20/4PyrclG5+M8JbQZtMsFcMsODDW6d4Fv/LbzRydwG5JotE9I55bj+TH6sfbeTJL9TbMnk4JXUaAsmLaObdfTfHdeatzSK4fF0703rhjcG8mWhpfV60eOcVw++Cuf8ZDsW79yD+Czqdv4q2J1g== X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2026 18:34:47.6880 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 14c57f7f-4fa1-49ed-09d3-08deaa0bd1f5 X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4;Ip=[66.129.239.14];Helo=[juniper.net] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000026CA.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR05MB9071 X-Proofpoint-GUID: 6gJoJbV6eu55IEAU4laXtyGKh4ooqbJe X-Authority-Analysis: v=2.4 cv=Rtz16imK c=1 sm=1 tr=0 ts=69f8e6ce cx=c_pps a=ThMr3hCQx13Nvzo14U/9jA==:117 a=f/rncuQqEjTEF/G1odkJ9w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=kj9zAlcOel0A:10 a=NGcC8JguVDcA:10 a=s63m1ICgrNkA:10 a=rhJc5-LppCAA:10 a=VkNPw1HP01LnGYTKEx00:22 a=7vL3O5uBSuztJ3xaqtyr:22 a=P7Xzg2ago1iBcVwzY-fE:22 a=6I5d2MoRAAAA:8 a=OUXY8nFuAAAA:8 a=pGLkceISAAAA:8 a=dGvunq7JNw21vi2BIywA:9 a=CjuIK1q_8ugA:10 a=zZCYzV9kfG8A:10 a=cAcMbU7R10T-QSRYIcO_:22 X-Proofpoint-ORIG-GUID: 6gJoJbV6eu55IEAU4laXtyGKh4ooqbJe X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTA0MDE2OCBTYWx0ZWRfX91AY6N/gry/q zoso7zrD2F+Rp/nDb2wn3Kkp627g5zsV1K2/Ui4AHw3CLee1xoAQNcJrcHJ+H1lFr8keutxDnsJ HeQZ2xoTQSGdhVncqAJbOamaKS8imxduX5E3b8GLvxPTXnEitL00Zf0t8ctVW4r02N9ATaL/eHW XOqJKnppLXrMee3Rf8QbOh2WxwBSTRb5YP4feP8fDMumYkYLfPigDBYeLR784npU3ULEh+G4tnm OFSx+G+trfnNs1qja7IkKrzYOpJPsWY3GxciEibBFyXQ+khNeA13OL3qGoCiCCquXSlKdm/el51 4RUjU+C7H5hx8cg+T3lLLfGE+EKuE4rzT7Qu9k06zVhucmwymHdcI2WmdFUyODX+In1HMHrYvOY oZhxa3ydM+g0u+DNkBESA4uY0jj1x0TpBWkCDJm387xbPdSJDFyJEBTp8dyFwHhV28Cgp39zD83 5kD1cYecvw6NsdT4qFQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-04_05,2026-04-30_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 clxscore=1015 priorityscore=1501 phishscore=0 bulkscore=0 adultscore=0 impostorscore=0 lowpriorityscore=0 spamscore=0 malwarescore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605040168 X-Spamd-Result: default: False [-2.91 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; ARC_REJECT(1.00)[signature check failed: fail, {[1] = sig:microsoft.com:reject}]; NEURAL_HAM_SHORT(-0.81)[-0.806]; DMARC_POLICY_ALLOW(-0.50)[juniper.net,reject]; R_DKIM_ALLOW(-0.20)[juniper.net:s=PPS03102026]; R_SPF_ALLOW(-0.20)[+ip4:208.84.65.16]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[208.84.65.16:from]; FREEMAIL_CC(0.00)[gmail.com,freebsd.org,juniper.net]; TO_DN_SOME(0.00)[]; FREEMAIL_TO(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; R_DKIM_PERMFAIL(0.00)[juniper.net:s=selector1]; FROM_HAS_DN(0.00)[]; DKIM_MIXED(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org,dev-commits-src-all@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[juniper.net:+,juniper.net:~]; RCPT_COUNT_SEVEN(0.00)[7]; ASN(0.00)[asn:26211, ipnet:208.84.65.0/24, country:US]; TAGGED_RCPT(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[40.93.201.26:received]; FREEFALL_USER(0.00)[sjg]; RCVD_COUNT_SEVEN(0.00)[10] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4g8VgN3WLyz3HcC Simon J. Gerraty wrote: > Oliver Pinter wrote: > > Could you please add some unit test for the supported use cases to > > avoid future confusions? > > Sure. safe_eval.sh is setup to support that. https://reviews.freebsd.org/D56795 Not sure if anything else needs updating. Tests work as expected from src tree. From nobody Mon May 4 19:27:48 2026 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 4g8WrT6kgcz6cCb9 for ; Mon, 04 May 2026 19:27:53 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8WrT3Qkjz3Nlt for ; Mon, 04 May 2026 19:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777922873; 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=UZ2dfS0sNcIPSdTI2PT29pIAtimhdMq/QZUY6HiAoSM=; b=WzgsV2hynAeJlZWxLlio0WVuO2cKCMc/GdfJ2ALiwGIBd8Bw8cPAyhAx4+kAh+jHCfxAlx a0/DMzbaeWJ1l27uCK9slGfpN0dqa4YmnrSe/NorUaOw5PcT94LPVjKnF2h2C3WM36eivB rAP77P8pQo3+qUUeYoTcOr4xvhT2MMnIh5KQHT3dRoLfM5X/ISdYT27kgwytsbUoWJ6Zr4 RTccMu2HA+T0x3fuEHNFK1EpNEFlac0GxrWF9HqPeZpRO/i/Zzj+m/1QDUXoEn1SxrKbPY aJaRccB0s7WFcJ/72B3Wn2qRyKCc+UTlilZKDfsW9vBHK3J0SlbLf2xM81WHNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777922873; a=rsa-sha256; cv=none; b=haaOgcd7sIfjt+zxrr2cCa4o2XBi/dV0GGpd84T+PNUNGOfTS72ajo4qaE1ibXlOHprPes 9bb+8ZMEhBUPZmxAFUmtKDnBC9E21ZVTD/rBnXMj1OE7OuYwTClc3ShSvpMW/k+hx6hfnQ 0AG3nzIPbp/uksXrsH9TfL2zat69m+eBAqGbs0+qE9FY4qUgu79Vr1q8Dcu07/hIdAaWuu zLIpWaKn+xZEoS6ESwO8fbKcpJDgiTg8vAEGriCurilpok8yGYnPOanR6vMN2Syrc4ILSN RGTYdwyouo9nolVo+j3vpBqawthjpG771g/zqoiv7GVYzd9GaKhBpdRJXJAvgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777922873; 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=UZ2dfS0sNcIPSdTI2PT29pIAtimhdMq/QZUY6HiAoSM=; b=cBQoc7sxxQaHgDfqqmiihppr2+o9kz/Jhs2ml8YGX+G8df6BFSsCIo0j6H/6tAyVpJcnIh PAa9bK5iT+21HrkQG6NXx/pxM6M6KehHjSxbbm1fmWh4m23fQD4BPv1rbtVIKj636Gn+Ub fJzULh+ofddkO20ZvBqP+4p+AYY3/rTZO/cNv39cXkv/MW9j7fQWonSMhbbntgn/vPOAnB 1xLqHWOWUViIVLK+dvsCfnBcM5despw0P4r8QfIQBeWsKTc6pfDEvPmskblw0uZOfvImIs v3FkCYDBOMTw5Nd1gTRUE0P0ZaPQqAJNw1f7jg+1JvgQ+QKpJqaJz+IpnQj0OQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8WrT2VXWzZDm for ; Mon, 04 May 2026 19:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e3a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 19:27:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: 658bb99db9c7 - main - linuxkpi: Implement `module_*()` APIs as static 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 658bb99db9c7872f92ccb86ed2674c72636436d2 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 19:27:48 +0000 Message-Id: <69f8f334.3e3a4.d717d55@gitrepo.freebsd.org> The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=658bb99db9c7872f92ccb86ed2674c72636436d2 commit 658bb99db9c7872f92ccb86ed2674c72636436d2 Author: Jean-Sébastien Pédron AuthorDate: 2026-05-04 07:45:38 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-05-04 19:13:43 +0000 linuxkpi: Implement `module_*()` APIs as static functions This fixes an "unused variable" warning when building DRM drivers. Reviewed by: emaste MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56780 --- sys/compat/linuxkpi/common/include/linux/module.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/module.h b/sys/compat/linuxkpi/common/include/linux/module.h index fbe57cbbed82..de4be1e9ebe9 100644 --- a/sys/compat/linuxkpi/common/include/linux/module.h +++ b/sys/compat/linuxkpi/common/include/linux/module.h @@ -136,9 +136,14 @@ _module_run(void *arg) #define module_exit_order(fn, order) \ SYSUNINIT(fn, SI_SUB_OFED_MODINIT, (order), _module_run, (fn)) -#define module_get(module) -#define module_put(module) -#define try_module_get(module) 1 +static inline void module_get(struct module *module) {} +static inline void module_put(struct module *module) {} + +static inline bool +try_module_get(struct module *module) +{ + return (true); +} #define postcore_initcall(fn) module_init(fn) From nobody Mon May 4 20:59:24 2026 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 4g8Yt91zK4z6cQxq for ; Mon, 04 May 2026 20:59:29 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from mail-yx1-xb132.google.com (mail-yx1-xb132.google.com [IPv6:2607:f8b0:4864:20::b132]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8Yt871Zvz3gdF for ; Mon, 04 May 2026 20:59:28 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yx1-xb132.google.com with SMTP id 956f58d0204a3-651c5d525f6so4191358d50.3 for ; Mon, 04 May 2026 13:59:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1777928366; cv=none; d=google.com; s=arc-20240605; b=Qy7FLt8Z6sG+FKx+SVZXsFtl8GSx9fUnicg01eYgjH99PzlaLHRNf4z2fkSIA+/HgH ltyAZIGWUjlkn7Yrg0mmKhzJtVfVlLKZRYnY5T6Ex/f8XbbJRIR+nhA1BLahn0wuwCcb TCAFd+gliL/YxJIvRvfL+y7JKaAEjPMvEwiTmRhMn5PCg1Os5biqxtGnpl7wrfhEauT1 g82tpoDvAGdJin9kJ4fOamhSlIRlj7hjquX5in1P+5jOAYC+fsg+mRLl2gDsgow3I9gJ y8umd1NdAYdZMFGxPsJ5eGsIHKJsBXCOVEnlGbzqFFa5mOIc02CXrkMV8Lz+DNqKwRcv Mr1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:dkim-signature; bh=+rAGedD6vDvl3FBbMUZx2Mw0OId1sF03Se0KPGkJ/FY=; fh=n9yYjyrZHwXFej3l/JsXbnVbQPBZs6Q+MPkIlKUoJBs=; b=XuROtfQp9yPJA1wFQejyhFUW2iuoROCdH2GT1NVhU/GkY1y3jJx6wDinfm2xEEoX4b ltEhpyFvAaL9Z/GWp+KUg5wbzE+DoWzQy2O8O2X7j8PaMLsD/xbTRDZpM8mR3llbnNBS 6OERoy9kPoi/kUZ49/TeRD0LL0smBFcfpYgSs45npm2xN0oizSw+ZcOqCFpWly0ztq7r khqrVeAXqeIM68S9APenXdtdceKZJFcXLZB6UN5akagsmkr2ZrJYIkJ3KGn3gODVg2fK Rm5KnX1+iUx3GLmLhTRfV78OCZH+a401FsE2F6UFtZVB7ErtEEgFNgitiGF4c6/kCck7 Yx3w==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777928366; x=1778533166; darn=freebsd.org; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=+rAGedD6vDvl3FBbMUZx2Mw0OId1sF03Se0KPGkJ/FY=; b=aQlZNACntaQV/ypMNWUVbBFK9SVzKNq64fnjHPAFrbpeg67TWFewQ7KaC0HwED9Bb3 a3KBpkobP4dt3MAzbtre2hjGH/cDatSPKZuSlXinriIOh6O1dVKnxMh+tUMnMMZ+4aX2 VRqx6nS9IenYVD5L3jFFzUQp7L95KdiZ/zS6euK1BrvOK4Pfl65Oy5LFn0syiOHxv0xt wtjY8tsKtDnz3rLWAZyWN0mGpT5QK8TiHSKFVnyNLrDi+TskIHzL554C1AUzuojZ2PpB 6lBFVjXMCNeZW2JHxEqkgm6NXIhJGJdDXu54+n4UJOncARc9W+ylhSxR2w8wjLp4tJW/ Z5rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777928366; x=1778533166; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=+rAGedD6vDvl3FBbMUZx2Mw0OId1sF03Se0KPGkJ/FY=; b=YhNL2jewvwt7m6Vc/gArgRqIAHqQ55yvzj0yrypR3sxWOWwPXUCoImyvfJFcWBV9Qj QJmy2/t4vQ74tbjQjLfJ/V0x/QrxJVdGe3FMCCOAvEkfaSoy52v1CysupFXX+BKmrqpY woC0M/bNaXfIPRyf+3I5atpcXgJpibVMUKXtDT25UWdbGCxnq1P3tM+9gyB3my3waGJ/ 2oCk1OIBEx+QuRs2U64mfKHjIzDfnswEig1L7Zuqp7xMq86n9IHBKZBDNjTX23xNKzRV TroMuFiOSadEqE9BQWgx1iIB4UXvsmEd1X/93tCWVV74FknQjiRW12/y0wHJxDIH2Z1p 4Lcw== X-Forwarded-Encrypted: i=1; AFNElJ9kWvVfuMFXm9MzNMGwWMSK/UQj+Pfgj6cY2kZ5CHogsu4CcNuewy4AxZgejAomiPjlmQB7AtEBeTUCOFWiYNyN88ZePw==@freebsd.org X-Gm-Message-State: AOJu0YxZkEZDx6BXDMJWVuOEzpfBi9TTqpau4vltVCtLA3Jf/FUVuyJj 0Cl/wLffVP5mV5xIHUj3fMnCp9AYAbyxdQqtawMIOGDKgMvcKRGoK/BxA1sFWcGVHaPbpLquHuk oAYqqH/7wmf8VriOPD7QfeIbRhlgaun8= X-Gm-Gg: AeBDiesXnQD6NuC9jgAWss+7rgEIQzZc1AD5PpGgxftrdtu6S0K6kbB0X/HBFfbjDV7 EscieNuLGdEo3aqEsWAiGlWroo8KAC4o+p17tc+kFLGday56PabvesWjdUNpHx0NRDdIbdVGcoX FAUuQZ7/vTtxwwjZ6pmDfQFskHES9J+Lcmua3wAFffI7e5f2JLewoD9P5MfMK9PEtKrUvsCFaBV kg9GZRCZjNWRF3fpPUdMS5MbbzsBlE8/Of3DwCEBVY+5Yf5kRZdOHPhpuhVuQQeQ0xB4byHngvW SRlai+B56TFoOcydTRF4o3tZqTFm0FS+IdRStkC4fxPAttAcoqs= X-Received: by 2002:a05:690e:d5a:b0:651:b67e:6e58 with SMTP id 956f58d0204a3-65c3d9a379amr10654700d50.7.1777928366164; Mon, 04 May 2026 13:59:26 -0700 (PDT) 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Received: by 2002:a05:7011:a1cb:b0:515:3e23:509f with HTTP; Mon, 4 May 2026 13:59:24 -0700 (PDT) In-Reply-To: <14577.1777919687@kaos.jnpr.net> References: <69e8f964.39869.24418b55@gitrepo.freebsd.org> <86jyts1xzr.fsf@ltc.des.dev> <15177.1777314263@kaos.jnpr.net> <86bjf41chq.fsf@ltc.des.dev> <24831.1777314998@kaos.jnpr.net> <6875.1777333471@kaos.jnpr.net> <6906.1777574491@kaos.jnpr.net> <14577.1777919687@kaos.jnpr.net> From: Oliver Pinter Date: Mon, 4 May 2026 21:59:24 +0100 X-Gm-Features: AVHnY4KqwATf_61TGu3cocY3DWtVNPynoPJq-WNDTVpUgDh_i3Gv5a7R1iXnqcQ Message-ID: Subject: Re: git: 566cc005812b - main - safe_set treat ':' and '#' differently To: "Simon J. Gerraty" Cc: "Enji Cooper (yaneurabeya)" , =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="000000000000b38fa80651043442" X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4g8Yt871Zvz3gdF X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated --000000000000b38fa80651043442 Content-Type: text/plain; charset="UTF-8" Hi! On Monday, May 4, 2026, Simon J. Gerraty wrote: > Simon J. Gerraty wrote: > > > Oliver Pinter wrote: > > > Could you please add some unit test for the supported use cases to > > > avoid future confusions? > > > > Sure. safe_eval.sh is setup to support that. > > https://reviews.freebsd.org/D56795 > > Not sure if anything else needs updating. Thanks! I've seen that it tests for ``, but what's about $()? Tests work as expected from src tree. > --000000000000b38fa80651043442 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi!

On Monday, May 4, 2026, Simon J. Gerraty <sjg@juniper.net> wrote:
Simon J. Gerraty <sjg@juniper.n= et> wrote:

> Oliver Pinter <oliver.pntr= @gmail.com> wrote:
> > Could you please add some unit test for the supported use cases t= o
> > avoid future confusions?
>
> Sure.=C2=A0 safe_eval.sh is setup to support that.

https://re= views.freebsd.org/D56795

Not sure if anything else needs updating.

T= hanks! I've seen that it tests for ``, but what's about $()?

Tests work as expected from src tree.
--000000000000b38fa80651043442-- From nobody Mon May 4 21:07:50 2026 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 4g8Z41150dz6cRXW for ; Mon, 04 May 2026 21:08:01 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic315-55.consmr.mail.gq1.yahoo.com (sonic315-55.consmr.mail.gq1.yahoo.com [98.137.65.31]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8Z405gyhz3hjT for ; Mon, 04 May 2026 21:08:00 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1777928874; bh=iigoFO8/ssFGkZVPjluNv5ZXu21zgwpCuSucA6ZQrVc=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From:Subject:Reply-To; b=XRrdT5SJZOigNirQbiHXF8SMIQe/jZurDP57hyffUJr37EJP+M4iu8lAYYrREFXHG4cms6Ecy2xs5x/RotETTXDhesosF9DrhhLnz4yAbZhaSmOKEj9XTBN/Igztk8GJz46frehtiZarHGWWAtv10WgsElLcpwHJognl2arbiai18SouCn0RY47jdItdLCdQmSdWlYiZlyu/2jI/Nr/PWJDZlHuUw6q2B69/SkwKziLBKBcglzdwQdN2McWTIN/2qQfAYg15svQwRMSzy+BWJtbJRcb/G+cS4iKGYqZGYvW8tDk9gwQGs+Xrv/c2LMBxJ6PCRQK7QHG3TYvOd61NXQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1777928874; bh=s3Od29s7BtysMosv7L7UBaHnHtYoGg7z3smjs15Z4r+=; h=X-Sonic-MF:Date:Subject:To:From:From:Subject; b=SuOTMiyzeLl0NvzjfVEkRnodd+BDpSXf033FnvCDXPJWgxFKdZtz9iusKO69MYKW5JK9F6Q5EiVLv8xW2UJG70jsdzqkaF2Xk4ZQzNApAX9BsWyBbGd1q5vboEzTLv6satFIgaqGzSnmRdGyglPG4TdsymAW5t5JaxK9dAF48OBDpC7gUivnxWBK7pA3UCSzxSSZiLd1vhijs2s69uX4dXmP2fZtw4JttdOHUUUW9gt3ly+wsd5lMUb/WzNXBM6oo3HsqbPf678dBlEQ6I4xu+eF9OHrzIxtdnNpQyCOuDbjWlsbx062TDq10wjokJDU3bvh3MBA0XQvDeD+zkW+DQ== X-YMail-OSG: JYYVXJwVM1koCzgerFW0nU2z165AR_dWl0nXxaRtNnzPtBtld62ERKXpF500jIF 4.k45m3T6tDuPsC5YROnoPd0qCZpapGyOfrnTISbN29Cn.l62qc3qHV2.RAqgOJa8QC4TU.JJJ_Y C4lNifDEV8SyzOjB6cd9UZQc0c0NFfXV8uFwHf.CCG46G0cBiW8QrPEG6I_ISyq30cA3I3xqmP5s 0ZBliUZzZmLQjUcBL31OxdsGcRcNCxXAtNbTTjoME_B5c3wfvkkC5uGc3pCE0tRHi9oQJNlhtenG wY2sSVE7X1nicNmW7a28L0Z8UNuPK8DMg9Z6rqTVDESc4CBPbpITzaqpfKGXCn1SxdAzyvhJn9Qe 2h.YZ9JlP.gbNWbFYkmxPy4828ttTexklmoW6Op3UaqAVaL1LcdScfwGPjluxU1npipwz2ybTBug gPEeh7YL_IuVJEmvMEVeWwcxcJ7GPIlU8rlVbBcx9nJtch6diFhyxX..I4NgRn0.X6P_SuYcaYnb wbKBwacyGjF4BhxRFzKhYEr0fkb6ROm2Xo9IFbJcLQqY9k5P93RLaldQ7lf_Z16ZBKbR0PRpZCi7 HG5z7ezwL.StbpHO6zfHUYRKxissUyp.wNY8hm9SO1Dc7uTeTpRDcsYwNovYc.GEKhsRTvLm6JJt I7bqGgtr5ytUQ_aM8dHnvqorIJCknkZYOYtPvqKgSjUOluyeedOlV3kCDunTHs1f80iud3S5psaT ohx5eH0upCM3kY7kytJx0029z9rCX9D9n6q5pT7VAwVaN3rGPaZBOrjGOAnz1_a3itQdR0tzsXqa DhYzWBbWvoSsoyJ.mmpfAoTfrjICgi5hB99RaENOlnmxpdldUfs7.jFWowD03V6fxS6rHMfNq7UJ mmlXCvVVIW4hJPu9VMm3Feq.FpRutDMpDZxthcJ66pVIn3azsqOEcc6.UyAQTB3XFsp1msNz3Lvm ECgQLWwTGiGFF2Fi6riAT_hLDsM5aJY.F3nAtV77mPuOMqs8dQeEP8dNW6uwPY6VY5zV83Cf8jBI oAwdQN.tkExH3FN0LdOS5W..MYHohI71OA19IVH_2qjA.rw2GKBi3R7JnO7eYBz4XSbwgHi8rf1p Y_67euCda7YnXOe5QsvTJNt5hY2H2HVLvoMKayZTB1uD5c_R1jivtv6X8DDHzZs47GppugumIbvI 4TXqQglBUShZ2H5ddn3K9pLSX11qZw7HIladhCctbaP0s5P1hGG4CqtziCkaZxs3jpYthSMfz542 RjERMe_3LB5Z4A9ufB6ENyws6j8iwvGnYZO2VGMr.aP3UME_9WOFr7Ig9IsnjVaw8iEQiNVZUqzi zKxgYl_kta2n6rd9E7kXEQUd87949MlrF8GzRQJxnv2.aar3LPhG_xB6EK3v1XojIcxOXNrWqB.2 x8b.jx4EWMp07kvn2nYNb8Q7kt_0oUbCWmActkquHOYeFQ0IjtxeEdH9dMLOPM_LlW7OmRkzid9E cb3FUS7IQfWwpQ0TgmFoIdUrJKP0GSMXO4hL_lpNXArLx9zwn98xOTrba98OqrmNXLswl9lN2XpB UIXmBpLvulxkYtQOjRLUROtkN4jThpqHMX.GbHASboG0vRBJ.B.gGMzZCHEbHRQ5c1bESxTb6xKf Ax_c13z.CZm.ifAoy7LSYwrf9e8xR_OxzxT.bQpb269bsk5YvprM99QYmAM09htln2Zb2HHDSDmK W.6GkhWhfdePS_yJ1ghjQe141eF9T1Bc3SL4gA.NatZGj1WC9W6TzAr83EUTCRLjKrWaai_vRpDw SCY_ZduXXvawAd1YGfatO_.pvCsqYaY2NzQyrRgC0gAHyeulaCDiaQKwXtKrLgo_TIuDtRmFgGDh IkGQ8n3nL.MAamD76tR3Ks.3soIHUWG.YBGofe5AtlkYMUXq_1EKdgjgP31sWe088bf03ci6tdiM JEz1h5uasVpBYE8FSPqG4Jl3ym3mnF042Ps7OcXjfB220Wb.Ap_74UFovtPrH5qYsftbY5ZPStlI x.1rYgzUadbvL9WdqWCp7abtam1eRMTmSCzLOaeC1ygShAI08NUW1EG47D6aupFqoAFG7hsJK0HW w1Am63Tz.XbKTvdxUZ7SonX2RDdeE8BzPGmefW.N6xojLcmpwRnAp4Uzzh0bnm_DeyE.lv6YascM IORnBH5k8ispO7g4A7J7UtrzgtFQHQ1cB86nUwrcjna5mG0WxKZXM9JXM.wvANGmRQKEcVit5lX1 1QXQOCGWu..xhRRo40xKJAKra1oX_sWDW7ZL2jWDCvLgAyBSoNQTpiABDKXyRdmmEDeaUps3Aha7 QO0T1nxZ7LMBMM4nHMrfDB8M5MsMmt8dbVQGq2bOJ2ow4GQ1xGo18Skkrd.SY07UFYLJUiPmh_Ts - X-Sonic-MF: X-Sonic-ID: 30e4303d-20cd-41bc-8ea8-5cca6d9b32b7 Received: from sonic.gate.mail.ne1.yahoo.com by sonic315.consmr.mail.gq1.yahoo.com with HTTP; Mon, 4 May 2026 21:07:54 +0000 Received: by hermes--production-gq1-7bb7df5c46-tkjt8 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 4f886f77a93cca6f6a2b24e257732c1e; Mon, 04 May 2026 21:07:51 +0000 (UTC) Message-ID: Date: Mon, 4 May 2026 14:07:50 -0700 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: c4f08d46c7f7 - main - llvm-*: Move all LLVM_BINUTILS symlinks to toolchain package To: Nuno Teixeira , Lexi Winter Cc: jlduran@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Ed Maste References: <69f5387a.26bf3.36f56fa3@gitrepo.freebsd.org> <994cef06-a1c9-45b8-b807-3449517fe381@yahoo.com> Content-Language: en-US From: Mark Millard In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailer: WebService/1.1.25559 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Queue-Id: 4g8Z405gyhz3hjT X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On 5/3/26 23:57, Nuno Teixeira wrote: > Hello, > > Any clues if those symlinks are related? > > ``` > # ./tools/build/stale-symlink-buildworld.sh > stale symlink detected: lrwxr-xr-x  1 root wheel 12 May  4 07:53 /usr/ > obj/usr/src/amd64.amd64/tmp/usr/bin/c++filt -> llvm-cxxfilt > stale symlink detected: lrwxr-xr-x  1 root wheel 8 May  4 07:53 /usr/ > obj/usr/src/amd64.amd64/tmp/usr/bin/gcov -> llvm-cov > stale symlink detected: lrwxr-xr-x  1 root wheel 12 May  4 07:53 /usr/ > obj/usr/src/amd64.amd64/tmp/usr/bin/objdump -> llvm-objdump > stale symlink detected: lrwxr-xr-x  1 root wheel 12 May  4 07:53 /usr/ > obj/usr/src/amd64.amd64/tmp/usr/bin/readelf -> llvm-readelf > ``` Hmm. Your list happens to overlap with the later fix: ("git: 045a9ef829fa - main - llvm: Don't install /usr/bin/{gcov,objdump} twice") I wonder if c++filt -> llvm-cxxfilt and readelf -> llvm-readelf might be similar in some way. > > Thanks > > Mark Millard > escreveu > (sábado, 2/05/2026 à(s) 05:45): > > On 5/1/26 17:38, Jose Luis Duran wrote: > > On Fri, May 1, 2026 at 8:34 PM Ed Maste > wrote: > >> > >> The branch main has been updated by emaste: > >> > >> URL: https://cgit.FreeBSD.org/src/commit/? > id=c4f08d46c7f717cc8c66bf702c006765a5b6b1a9 cgit.FreeBSD.org/src/commit/? > id=c4f08d46c7f717cc8c66bf702c006765a5b6b1a9> > >> > >> commit c4f08d46c7f717cc8c66bf702c006765a5b6b1a9 > >> Author:     Ed Maste > >> AuthorDate: 2026-03-06 14:46:18 +0000 > >> Commit:     Ed Maste > >> CommitDate: 2026-05-01 23:33:51 +0000 > >> > >>     llvm-*: Move all LLVM_BINUTILS symlinks to toolchain package > >> > >>     Some of the LLVM binary utilities were included in the Clang > package > >>     (because they did not set an explicit PACKAGE). > >> > >>     Add a new Makefile under clang/toolchain to create the > symlinks and man > >>     links for ar, c++filt, nm, and so on (without the llvm-* > prefix) when > >>     LLVM_BINUTILS is enabled (as it is by default). > >> > >>     PR:             293610 > >>     Reviewed by:    bapt, ivy, brooks > >>     Sponsored by:   The FreeBSD Foundation > >>     Differential Revision: https://reviews.freebsd.org/D55692 > > >> --- > >> ... > >> +.if ${MK_LLVM_BINUTILS} != "no" > >> +PKG_DEPS.toolchain+=   llvm > > > > Is there an llvm package (FreeBSD-llvm)? > > > > For reference, for main [so: 16 at this point]: > (context predates the above change) > > > # pkg search -rFreeBSD-base -g FreeBSD-llvm\* > # > > # pkg search -rFreeBSD-base -g FreeBSD-binutils\* > # > > So: no for FreeBSD-llvm . > > > But for things that do exist that internally are based on some of llvm: > (the context has all the FreeBSD-* base packages installed) > > # pkg info -dl FreeBSD-\* \ > | grep -v -e /contrib/ -e /src/ -e /man1/ \ > | grep -e ^FreeBSD- \ >        -e llvm- \ >        -e libprivateclang \ >        -e libprivatellvm \ >        -e libcompiler_rt \ > | grep -B1 -v ^FreeB > FreeBSD-clang-16.snap20260430194422 >         FreeBSD-libcompiler_rt-dev-16.snap20260425150102 >         /usr/bin/llvm-addr2line >         /usr/bin/llvm-cov >         /usr/bin/llvm-cxxfilt >         /usr/bin/llvm-objcopy >         /usr/bin/llvm-objdump >         /usr/bin/llvm-profdata >         /usr/bin/llvm-readelf >         /usr/bin/llvm-readobj >         /usr/bin/llvm-strings >         /usr/bin/llvm-strip >         /usr/bin/llvm-symbolizer >         /usr/lib/libprivateclang.so.21 >         /usr/lib/libprivatellvm.so.21 > FreeBSD-clang-dbg-16.snap20260430194422 >         /usr/lib/debug/usr/bin/llvm-cov.debug >         /usr/lib/debug/usr/bin/llvm-cxxfilt.debug >         /usr/lib/debug/usr/bin/llvm-objcopy.debug >         /usr/lib/debug/usr/bin/llvm-objdump.debug >         /usr/lib/debug/usr/bin/llvm-profdata.debug >         /usr/lib/debug/usr/bin/llvm-readobj.debug >         /usr/lib/debug/usr/bin/llvm-strings.debug >         /usr/lib/debug/usr/bin/llvm-symbolizer.debug >         /usr/lib/debug/usr/lib/libprivateclang.so.21.debug >         /usr/lib/debug/usr/lib/libprivatellvm.so.21.debug > FreeBSD-clang-dev-16.snap20260428205205 >         FreeBSD-clang-16.snap20260430194422 (libprivatellvm.so.21) >         /usr/lib/libprivateclang.so >         /usr/lib/libprivatellvm.so > -- > FreeBSD-libcompiler_rt-dev-16.snap20260425150102 >         /usr/lib/libcompiler_rt.a > FreeBSD-libcompiler_rt-dev-lib32-16.snap20260425150102 >         /usr/lib32/libcompiler_rt.a > -- > FreeBSD-lld-16.snap20260430194422 >         FreeBSD-clang-16.snap20260430194422 (libprivatellvm.so.21) > -- > FreeBSD-lldb-16.snap20260430194422 >         FreeBSD-clang-16.snap20260430194422 (libprivateclang.so.21) >         FreeBSD-clang-16.snap20260430194422 (libprivatellvm.so.21) > -- > FreeBSD-set-devel-16.snap20260424143247 >         FreeBSD-libcompiler_rt-dev-16.snap20260425150102 > -- > FreeBSD-set-lib32-16.snap20260424143247 >         FreeBSD-libcompiler_rt-dev-lib32-16.snap20260425150102 > -- > FreeBSD-toolchain-16.snap20260430194422 >         FreeBSD-clang-16.snap20260430194422 (libprivatellvm.so.21) >         /usr/bin/llvm-ar >         /usr/bin/llvm-nm >         /usr/bin/llvm-ranlib >         /usr/bin/llvm-size > FreeBSD-toolchain-dbg-16.snap20260430194422 >         /usr/lib/debug/usr/bin/llvm-ar.debug >         /usr/lib/debug/usr/bin/llvm-nm.debug >         /usr/lib/debug/usr/bin/llvm-size.debug > > > That should at least give an idea, even if it might be incomplete. > > > -- > === > Mark Millard > marklmi at yahoo.com > > > > -- > Nuno Teixeira > FreeBSD UNIX:     Web:  https://FreeBSD.org > -- === Mark Millard marklmi at yahoo.com From nobody Tue May 5 00:05:37 2026 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 4g8f0y1FQ5z6cmPM for ; Tue, 05 May 2026 00:05: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8f0y0WG9z42XH for ; Tue, 05 May 2026 00:05:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777939538; 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=HPgaMzkmKmYoAWzRfiqtDbS8/L6YGBXbG4RdCfqIuxM=; b=bTOGOvs+59WdafaUSJ6tYVCSrVfi1T5oinVF3oICeQLR6Lor1Fqy0Lq+MY82vvCAnTsezi CWAjtzLs2w6OqNAb+1/CIDJb9tS/Sx+BrEObulqmlq35FGDih18SPUidjA2iUpGGv8+BkV zdZ37a+b/tlDEqU0SRD92B3HygXmU6ak7q3l3CkkiYip7s7zV+oV8vpcPZA+ypiBMjn8gq 4mJf+SOnmFZDfNFEV6HLaG11FeDatQAlePsFmKiMJFaNGgEtscONzYZ6FeTRRv22+tExnf Ue4loCFjQwej3e7lGmAZ967XLNMzQEj6x3xe94XFXpBEIdFuksiWPVWfmqfvsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777939538; a=rsa-sha256; cv=none; b=vYqlE5pLWbC0sH280/w7OyRxFKoXnta4Tyw0HYQXvIj+qMYstXqSVUzgVsB5+oai9UQR5b ThOu0jy1/aFD65oQDZerCPR1e4vNDcqt/8uRzZ0ujlHTPG5fEWC+qPuirro3q6kJfiMPKk 3G3NBDGbCe0RGmUu8WckzGzyc5tmFIIP81YMafGry4ldXrOHR5M2Rg4IQRj4KndDHyosj4 rQ87TdiPA6Q1GJwNIbr5RX4dSukq73Pdjk4+FDt7vipz4qjptsYUrdLV92XSzm4LfEFdD1 zTZJ7/ysAn23h35Aq20FQoRRKlTbYN0ZjDWTCYNorp3W2CxtNPFZBs+FZqDd/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777939538; 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=HPgaMzkmKmYoAWzRfiqtDbS8/L6YGBXbG4RdCfqIuxM=; b=BBpK5iye5xNxhrKO4bMG7j+j+dIHS84JC1hpbi0AtvvBY8ablG3XRvyYD55hMLYCQZ4YMw r0Wwwrbde4s7u6qrtH3POc6uvKlrYSAG1RKxJVWolUxLQUxR/PfMuxYZZvfel9JMSZ8Ho1 RXwSQAGtXYmRCZ5I5KjpNB8/hYXGmN5VrTd0o+CuVscTBucE6L1ygeMWvagVo7t7cQ4ReB BfXpCEMAy4SHQkBOSMU7Sf0bRSvlW4gTYNolOT0DqrXYNtQGPizk1Y9/LRtdzldEgNwgR3 fGXKiwqOoxJjhTLeb4hyX53Qu6AiM2qFGG+AiR12k+n3vaesh3/6LhWZgDBHHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8f0x6wjdzjld for ; Tue, 05 May 2026 00:05:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33c96 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 00:05:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 03e9e83f3586 - main - nfs_nfsdserv.c: Clip number of callback slots 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03e9e83f358678bab5e4c1ddf9c9d8faa7183cbb Auto-Submitted: auto-generated Date: Tue, 05 May 2026 00:05:37 +0000 Message-Id: <69f93451.33c96.2c15b11d@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=03e9e83f358678bab5e4c1ddf9c9d8faa7183cbb commit 03e9e83f358678bab5e4c1ddf9c9d8faa7183cbb Author: Rick Macklem AuthorDate: 2026-05-05 00:04:00 +0000 Commit: Rick Macklem CommitDate: 2026-05-05 00:04:00 +0000 nfs_nfsdserv.c: Clip number of callback slots The client tells the server how many callback slots it can handle in the callback session. However, the NFSv4.1/4.2 server can only handle a maximum of NFSV4_SLOTS slots. This patch clips the client's value to that, to avoid using too high a slot# for a callback. Fortunately, I do not know of an extant client that specifies a value greater than NFSV4_SLOTS, so this patch is not really needed, as yet. Also, the client rarely uses a slot# above 0 when doing callbacks. MFC after: 2 weeks --- sys/fs/nfsserver/nfs_nfsdserv.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 855d018e72d2..ad0f495bbd69 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -4869,6 +4869,14 @@ nfsrvd_createsession(struct nfsrv_descript *nd, __unused int isdgram, *tl++ = txdr_unsigned(sep->sess_cbsess.nfsess_foreslots); *tl++ = txdr_unsigned(1); *tl = txdr_unsigned(0); /* No RDMA. */ + /* + * Although the client accepts slot#s up to + * sess_cbsess.nfsess_foreslots, the server can only use + * a maximum of NFSV4_SLOTS, so clip it to avoid ever using + * too high a slot. + */ + if (sep->sess_cbsess.nfsess_foreslots > NFSV4_SLOTS) + sep->sess_cbsess.nfsess_foreslots = NFSV4_SLOTS; } nfsmout: if (nd->nd_repstat != 0 && sep != NULL) From nobody Tue May 5 01:21:34 2026 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 4g8ghZ2Sbcz6ctnj for ; Tue, 05 May 2026 01:21:34 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8ghZ1LqMz4CYx for ; Tue, 05 May 2026 01:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777944094; 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=8//T+VaHqhczEYMX6uVuENe8UBEUqvLztIoGlFF3vY4=; b=smpLt6tyxjR+WRKmR0uXV+jsxW8A7z2dvhS//sR5RojJ7MlvX6bsGmtGnihfzaZ4IatOam 3icmwCV7ZgtPUJ8yYdnB8aXX4JPId3DB6a8N5V3Q8Gc1YoiCQBh04fX6aQz8LvP0D+1qg6 p61/8aWYHbxQV+NwzYEKc3GRbdubAaB20Yj+OrH9oIOV6OVUDYFYmikHEU5i61lMBJi1RO e5PdUrgVV9G8qRX8ru+tWwNzePglL9gIPqFS65zi4VqabWLg9A4X7XPEa+2jwl1LADVO4N vnG24nK41lbrW7sXH09A3sfZEOn2ejv7jfMGHnHqHdAtAWtvigVvYhwd8Cw87A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777944094; a=rsa-sha256; cv=none; b=rgvigQLZvIs2jut8yXb+pyfFuIeZdXboCapVXQPUSHFLNiu+KXh5fzR65QSbMNx13NjAbo jk/VcmW9qN3bmXfHgbMbZuvvdjOffuIHj/0gUlgsEG7YKUTYlUYP4/Hc4U5GXUl8645XqL Zv2hmHIevbaewhdNVko0UWdxvg+u6o0OBj7Jc2iFelwsf/65zwqZoW0m0ysH9xrMz9laUV Bd8DC3IU7TWg/2Y2XsQzVFhJoNOZx6fY1qVejx6bBOvcZ49sCcczuYAsDAybyE6mYbUuzJ dDWK3X8wAPQSXpSM9TOKJvqjFsjwFodGX6vm5u4DiajM5D3i6bE6+y3PYQfAeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777944094; 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=8//T+VaHqhczEYMX6uVuENe8UBEUqvLztIoGlFF3vY4=; b=uxSwXUPRjU2HbJNef7YcAB7eu7nUZedug05YApRP2wTDP0o3erI+m2AlFyR5xakcNS4pY9 qUYEB5LdRCrORYCIy9si3BWI2FmI7gaQIsGeDWf7DFy4ylNneSPnVDN1zFp/23pNThQWcV elmhQOmUmgC0nIXdBchI42lC8GrjUySsFnXm2WTc/TBHQSxfLZToyvUrn6qwaFirTkaycX 6VPw2LyqH5tI9M45PSiewFVX9u1+ZS1Ue9ouLz5Da+7ylw0oRmG0lZkJ6BSvPiexr2DvGL +WRFA/0MW8lefbhtyxz5c9CB3UHiBFTCjpj/eYuwce+I5PDQBCPOtP8NHLEoGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8ghZ0gNvzlmy for ; Tue, 05 May 2026 01:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ca3e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 01:21:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 8e8d87856241 - main - packages: Make create-sets.sh more robust during release 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e8d87856241f69c277dc5fab48c5c66312475d6 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 01:21:34 +0000 Message-Id: <69f9461e.3ca3e.480fc28@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=8e8d87856241f69c277dc5fab48c5c66312475d6 commit 8e8d87856241f69c277dc5fab48c5c66312475d6 Author: Lexi Winter AuthorDate: 2026-05-05 00:31:20 +0000 Commit: Lexi Winter CommitDate: 2026-05-05 00:32:34 +0000 packages: Make create-sets.sh more robust during release Commit d1c176fedfc9 made create-sets.sh exit when it encounters an error, instead of creating an empty repository. However, this turns out to cause some issues: 1. A package not having any sets is considered an error, but during the release build, we stuff a 'pkg' package into the repository which doesn't have any sets, which causes a failure. Avoid this by simply ignoring the pkg package. 2. No error was printed in this case, which made the problem hard to diagnose. Add an explicit error message. 3. A similar problem occurred running on a repository which already contained sets, which is not usually done during the build, but is not necessarly an inappropriate thing to do. Fix this one by ignoring set packages when looking for sets. While here, fix another issue that might cause packages to be wrongly skipped if the path to the repository contains a '-' character, since we didn't strip the path before testing the package name. PR: 294966 Fixes: d1c176fedfc9 ("packages: Make create-sets.sh more robust") MFC after: 2 weeks Reported by: Alastair Hogge Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56792 --- release/packages/create-sets.sh | 52 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 4 deletions(-) diff --git a/release/packages/create-sets.sh b/release/packages/create-sets.sh index 3dfd8f1a3388..88d4020d8413 100755 --- a/release/packages/create-sets.sh +++ b/release/packages/create-sets.sh @@ -35,17 +35,61 @@ repodir="$1"; shift # generate-set-ucl.lua. UCL_VARS="$@" +# Extract PKG_NAME_PREFIX so we can use it later. +PKG_NAME_PREFIX="" +set -- $UCL_VARS +while [ -n "$1" ]; do + case "$1" in + PKG_NAME_PREFIX) + shift + PKG_NAME_PREFIX="$1" + break;; + *) + shift; shift;; + esac +done +if [ -z "$PKG_NAME_PREFIX" ]; then + printf >&2 '%s: PKG_NAME_PREFIX must be specified\n' "$0" + exit 1 +fi + # Nothing is explicitly added to set-base, so it wouldn't get built unless # we list it here. SETS="base base-dbg base-jail base-jail-dbg" for pkg in "$repodir"/*.pkg; do - # If the package name doesn't containing a '-', then it's - # probably data.pkg or packagesite.pkg, which are not real - # packages. - { echo "$pkg" | grep -q '-'; } || continue + # Check if we should process this package. + case "${pkg##*/}" in + # When building release, we add a 'pkg' package to the repository, + # but this isn't a base package and doesn't have a set. To avoid + # this causing an error, skip it. + pkg-*) continue;; + + # Any existing set packages may also have no sets (and even if they + # do, they shouldn't be included here). + ${PKG_NAME_PREFIX}-set-*) + continue;; + + # If the package name contains a '-', process it. All "real" + # packages contain a '-', because the package filename format + # is -.pkg, so this skips files which aren't + # really packages, like data.pkg or packagesite.pkg. + # + *-*) ;; + *) continue;; + esac + + # Print a useful error message instead of failing silently if + # grep doesn't find any sets here. + set +e _tmp="$(${PKG_CMD} query -F "$pkg" '%At %n %Av' | grep '^set ')" + if [ -z "$_tmp" ]; then + printf >&2 '%s: package has no sets: %s\n' "$0" "$pkg" + exit 1 + fi + set -e + set -- $_tmp pkgname="$2" sets="$(echo "$3" | tr , ' ')" From nobody Tue May 5 04:21:51 2026 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 4g8lhc17t7z6dBsP for ; Tue, 05 May 2026 04:21:52 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8lhb6jW6z3Gc7 for ; Tue, 05 May 2026 04:21:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777954911; 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=M32RaCLva6dzgELnJ17K0C5nyLufvKf6e1cIlb9Uc2Q=; b=qZnZtzOf5YMeleT2oD1rytM+u75aLgeaVe9s7mTzP6LzOJOZlKuBpTKzrmDe4GQfTRfxp0 7E2OHSBYoeKDda5bWjjbil6AUNIcmAuv6nNPfGmMJ1QOYZMqI4anVdZVAGRB1hD9tG9zaQ RbXtD6pz2kepubHU4/4WSyggQ7aTFPd9WWud0qSrc1xzAJlDAXgkvOGPmg3A+NFBAfh3dJ +veAw4nRn1xoNpBMxI6WsKWcke2UJumvZLWS31MPvdyHnoYx1PKrpcshZpgOqEbsCPJS5T r1l48ItHyFUrH5mTTLeQxp1H59nPGSWwEcjM/qjW95uNpKDUdI0O+1b0cB5/cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777954911; a=rsa-sha256; cv=none; b=qhPvckgrsmTLq+5MCjDod6B3StdM08J/y8d+y4uKbRIFuPBi/U98/5y+RX+ZxVCjA/cAZp Wj6WqCug8nWZpAhYS8IzkPh3cjdGrmZUa797wwL+XF+x9pbdYCWhGAnghfzjXyT7eC6hZW 7Hdj/Iwz4O28E1yc67USu1gm7bOcGj5rDs4c5JKZbUeAwaa1c8mXRV5qLTYnNlj9eUSavr byBwqWqc57qkXRi9KUnpRrrrlYJxi4wGwCrKNlb+WM93NikyWGEO0s+ccfK6fqhFQt8o/y XBECc+r/iu6xi1gntw/FMBofRmFR+44AsxCY+KJDpMkeOokmna865ruuIMz2pQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777954911; 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=M32RaCLva6dzgELnJ17K0C5nyLufvKf6e1cIlb9Uc2Q=; b=VG8uTqHZjUz2ncpaFenO3Q2zZKgT9hLTuMEC/YGOCkboup3EBXbgh8CTBemuvOFrBBDSv2 rMBNW2nHMv5f18s0ZZlE6jVWQtc8VQkxMCv1+gYblJMl5TW/xcOWuhgUmxWs73HVrzbRuy d+vo5sPdr0maeaXdFXjW6ONmheIeSG2PsdoJu6l5g6mrs14FbYC8q5tkMS8wyrMc0xnh2U xMzsI+45eoKkr1+qb31spDjiokwY+xnAsNdGjgzd/YaVqQ4ArpnMPU4Dry462FExvqlI7S xe8/+GDCnpRKtqW3ARaBAIPpC7VpiJbebKCVWvxSQMXqK05IlotlMtYBCjgiBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8lhb5zrYzrmT for ; Tue, 05 May 2026 04:21:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3096a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 04:21:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 89b97931d6d4 - main - bsdinstall: Always use pkg.FreeBSD.org 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89b97931d6d415d7a2504d8ea2c99beafd77cf24 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 04:21:51 +0000 Message-Id: <69f9705f.3096a.42ac7292@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=89b97931d6d415d7a2504d8ea2c99beafd77cf24 commit 89b97931d6d415d7a2504d8ea2c99beafd77cf24 Author: Colin Percival AuthorDate: 2026-05-05 02:43:59 +0000 Commit: Colin Percival CommitDate: 2026-05-05 04:21:27 +0000 bsdinstall: Always use pkg.FreeBSD.org The FreeBSD-base bits are accessible via pkg.FreeBSD.org, even for releases, so there is no need to point at pkgbase.FreeBSD.org. MFC after: 3 days --- usr.sbin/bsdinstall/FreeBSD-base.conf.in | 2 +- usr.sbin/bsdinstall/Makefile | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bsdinstall/FreeBSD-base.conf.in b/usr.sbin/bsdinstall/FreeBSD-base.conf.in index 86ec8fabe253..13c94bbb8a64 100644 --- a/usr.sbin/bsdinstall/FreeBSD-base.conf.in +++ b/usr.sbin/bsdinstall/FreeBSD-base.conf.in @@ -1,5 +1,5 @@ FreeBSD-base: { - url: "pkg+https://%%PKGHOST%%.FreeBSD.org/${ABI}/%%SUBURL%%", + url: "pkg+https://pkg.FreeBSD.org/${ABI}/%%SUBURL%%", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/%%KEYSDIR%%", diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index a576f2d0794e..f796a8710c5b 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -21,26 +21,22 @@ _REVISION!= ${MAKE} -C ${SRCTOP}/release -V REVISION REVISION?= ${_REVISION} .if ${BRANCH} == CURRENT || ${BRANCH} == STABLE -PKGHOST= pkg KEYSDIR= pkg SUBURL= base_latest .elif ${BRANCH} == RELEASE -PKGHOST= pkgbase KEYSDIR= pkgbase-${REVISION:C/\.[0-9]+//} SUBURL= base_release_${REVISION:C/[0-9]+\.//} .elif ${BRANCH:C/[0-9]+$//} == BETA || \ ${BRANCH:C/[0-9]+$//} == RC -PKGHOST= pkgbase KEYSDIR= pkgbase-${REVISION:C/\.[0-9]+//} SUBURL= base_release_${REVISION:C/[0-9]+\.//}_${BRANCH:tl} .else .warning Invalid branch "${BRANCH}" -PKGHOST= pkg KEYSDIR= pkg SUBURL= base_latest .endif FreeBSD-base.conf: FreeBSD-base.conf.in - sed "s|%%PKGHOST%%|${PKGHOST}|;s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET} + sed "s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET} .include From nobody Tue May 5 06:06:19 2026 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 4g8p183skGz6dLnG for ; Tue, 05 May 2026 06:06:20 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8p18125Sz3R3G for ; Tue, 05 May 2026 06:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777961180; 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=jz7pCGDLcxHX/RuMdw7W9/NwKfWgNljp8iMOG/f3+n0=; b=MXk8e46BQTFH8hsyCnl+WPXC7xDY+045STlzwEORf3wV/jEChs5h/XMA+UKwY0fu98VKmw uAvaLbNE20+ClPiwUHcyupC+7LnN9N1csNkakVRG/4feIzHpTMef1b6cdOp5MSaZnlaVgw 6kUg3xyPWU8pz4J3cNLMY6EkRTQo7u1y04TIOrWLudO5TgxOOtU8XMa7C4EXnytlQgj0Wq t+iRYS4UUyX/reLg6Vo8B3e+p/B9P6R7QOQn4VYSXh73jdnldxaMrb908TN5cATcl6zI1J zvW/Vc2Q9CF/FCkhhK6EkOWfZTLFXHdjaKvrqo5fFqjsV7eUJ7WLivJPDnm9nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777961180; a=rsa-sha256; cv=none; b=CWKOGmLzZVNBu2nB5vT7ofdKnGaUJBqr+eOXBAcHL+wrFFXBetvGN+aG9lYO6dmtXrj0zi IjCfPyGgdNazLGJpNv58GMbG2hGCh+LTo/bGvxEMZcarOMC1aDmRvNkQaH40RCIv3bXP6U qU+sBhrMzERMCViPHebSTFHRjG49bp7vbG0rC+zmibOj77jLKl93qGDQxOPEcdYtGwOtxG kw27Xj+7KpFUi27jATZa1EwwV4XqHV8cGyGxKTmQYChgmV+iEHLYfose3CMWvmhHJJrnPW u8Jzhq6tLutEq4ouYLMJLQ5EDNKLZmUMw3Nm8mkxgskzcDFkIvPU3CKGbtKWtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777961180; 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=jz7pCGDLcxHX/RuMdw7W9/NwKfWgNljp8iMOG/f3+n0=; b=hjn3PR1qmhggjOlM6SvX2isTdL//PoO2dpBnZR2RnUtF/Amyc9uYo/1o7NyQB/RfPllImI IaCJwuNHaHg6ESs8OThUsFOrfQI6+GqFNopsIwwWoYgUTjZnBu98DVit27m+pN2MJ69KD1 Ds+MsVSY6AgdfMbV1TcbdhYv5LkJta42I/8dKwxdxAlyrtIqAxGQJFHKVYfxD2e55gXAN3 0MTyDYNXknd3q/iVOCO4nOwm17R5V1EVX0JEYS6Ci6rH7JyiRtWagbpCnn6GBqeh1lv41I BMXZNQcnEDMDRbVo9KFuayeMa2xUZNq3l+7xhrkeNEQvuIMTzTT5hLKRpCxNew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8p180KhxzvFy for ; Tue, 05 May 2026 06:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3adf4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 06:06:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 6f84579ae4d1 - main - nfs_pub: move from vfs_subr.c to vfs_export.c 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f84579ae4d107635e32fc3fcfc34669adc7b3f5 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 06:06:19 +0000 Message-Id: <69f988db.3adf4.6d8cba37@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=6f84579ae4d107635e32fc3fcfc34669adc7b3f5 commit 6f84579ae4d107635e32fc3fcfc34669adc7b3f5 Author: Ryan Libby AuthorDate: 2026-05-05 05:55:11 +0000 Commit: Ryan Libby CommitDate: 2026-05-05 05:55:11 +0000 nfs_pub: move from vfs_subr.c to vfs_export.c nfs_pub is used only in vfs_export.c. Reviewed by: kib, rmacklem Differential Revision: https://reviews.freebsd.org/D56777 --- sys/kern/vfs_export.c | 3 +++ sys/kern/vfs_subr.c | 3 --- sys/sys/mount.h | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index bd7caa01e153..566dd3d8770d 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -62,6 +62,9 @@ #include #include +/* Publicly exported FS */ +static struct nfs_public nfs_pub; + static MALLOC_DEFINE(M_NETADDR, "export_host", "Export host address structure"); #if defined(INET) || defined(INET6) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 58975f7ac932..823ccc6cab71 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -237,9 +237,6 @@ static struct mtx mntid_mtx; */ static struct mtx __exclusive_cache_line vnode_list_mtx; -/* Publicly exported FS */ -struct nfs_public nfs_pub; - static uma_zone_t buf_trie_zone; static smr_t buf_trie_smr; diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 18f85192f6c3..1ca492929813 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -1071,7 +1071,6 @@ int vfs_report_lockf(struct mount *mp, struct sbuf *sb); extern TAILQ_HEAD(mntlist, mount) mountlist; /* mounted filesystem list */ extern struct mtx_padalign mountlist_mtx; -extern struct nfs_public nfs_pub; extern struct sx vfsconf_sx; #define vfsconf_lock() sx_xlock(&vfsconf_sx) #define vfsconf_unlock() sx_xunlock(&vfsconf_sx) From nobody Tue May 5 08:35:20 2026 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 4g8sK42fT8z6RhYM for ; Tue, 05 May 2026 08:35:20 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8sK41yMSz3fdy for ; Tue, 05 May 2026 08:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777970120; 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=9R17gzRVXnEjbcwUurAsbeO0iYSyIXbhHlOeEUaXFus=; b=Oz/nWkge8fURjOdszv90ILJW51xXtnLq8TJsOHE0KrRFQMvZ6wqfYzB+2i89O5E4LOHnBE eX1/yE+rNhB4RvlAUErXK0sLuYp2n5VpQiJsMtPs3fvP2H9gimw+CXaHNcI3hVRhjZoLCv jX1lnbPr+QqYKhkmN1glF4FggYHTTL0g2HVkdrcayLKDJwcMvl5OVjp5+6WwzhVYhvvecc DORLnVsjt1gfEenvhJ4y060u1JKOPl79UCtku4eyugLzFACHybIBhBYZ7N/wlFISEEedzF VS6UCDaBofayuiM0FtdczDTXJLkClKQHOQJaPhp2zdTrKC5dIov+Q7djeHVcTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777970120; a=rsa-sha256; cv=none; b=TtoO8GugzS2rd4cFiJIblrzFlukVhb2MPffXtcpTZfg0u/2Ew8rSOud2SI2byp+PaRUq3b GO67E6oMxfx8IgF29PB5Sl7zdjOUoJwam5WtobJ2RqH5dqJxNiA1GpF5m/oXnEWjpq9t+9 LKcdC8J5HTj/5fCJ00PoSgz0zsgIOAXhHh/eowCDSB1i7aQ1NYqGPlc9vsjsKQ2RSCpCf3 ov+URaN5GWhuQ07DjVmFT3BxCX8qAaVQ5TTF8bYAGwb1MUjSJNBxGhTLbA78ZbcQJktjxQ PkTd4HXhqSYjZz2OjzL5MzvcqszinJLNAf2ucglOA4IYqRy4jfK5GKZZ2a7kvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777970120; 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=9R17gzRVXnEjbcwUurAsbeO0iYSyIXbhHlOeEUaXFus=; b=b1N1ujeUHbx1WjCAlvLwMB81nK+G4d4C6jf2H4C2Bc24sz3uvGAzcy1dIOjvS/QLz+N07u 21JW16D8UkA/UVaAk/JEhaODRZweyUltGZudri5E6TYheW8UcMvHXNuGzxowOIIUEZEeQ9 N5SaOQVyY9v9ITY//WS2AGl5enDYahORCndCxRypjfAhz8EC7gnBcevVmO2LXPsD/YJfYE IP4Ut1ndH9UdT8LOSkabt6vd961lU2HtwrUbGLMUOmenn9n2qO2oJEN1CB32okLbzxnHxQ 16cO7hZD5JZ9dXwU3w9Vd0DEK9AHANTfio1ol9pZnHmPv2bgBduXMPTOSCdnjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8sK41SZVz10N5 for ; Tue, 05 May 2026 08:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18ab2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 08:35:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: bf6d00afdb61 - main - pfsync: reject invalid SCTP states 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf6d00afdb6171ba04a1c5a7fde904cde87d212d Auto-Submitted: auto-generated Date: Tue, 05 May 2026 08:35:20 +0000 Message-Id: <69f9abc8.18ab2.14fea4eb@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=bf6d00afdb6171ba04a1c5a7fde904cde87d212d commit bf6d00afdb6171ba04a1c5a7fde904cde87d212d Author: Kristof Provost AuthorDate: 2026-05-04 16:08:35 +0000 Commit: Kristof Provost CommitDate: 2026-05-05 07:45:29 +0000 pfsync: reject invalid SCTP states SCTP states should always have a src scrub object associated with them. Crafted pfsync packets might not have this, leading to us derferencing a NULL pointer on cleanup. Validate the pfsync state insertion packet to make sure this is correct. PR: 294989 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/if_pfsync.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 3edf08aefeb5..a5f377e84307 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -873,6 +873,13 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) (st->act.rtableid >= 0 && st->act.rtableid < rt_numfibs))) goto cleanup; + if (sks->proto == IPPROTO_SCTP && st->src.scrub == NULL) { + if (V_pf_status.debug >= PF_DEBUG_MISC) + printf("%s: invalid SCTP state from creator id: %08x\n", __func__, + ntohl(sp->pfs_1301.creatorid)); + goto cleanup; + } + st->id = sp->pfs_1301.id; st->creatorid = sp->pfs_1301.creatorid; pf_state_peer_ntoh(&sp->pfs_1301.src, &st->src); From nobody Tue May 5 09:33:16 2026 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 4g8tbw3KCRz6bj1k for ; Tue, 05 May 2026 09:33:16 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8tbw0jR7z3nDw for ; Tue, 05 May 2026 09:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777973596; 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=tZn5I8TfBH7RUkNMW3axKnO55d6/A5FEh7Q+ReVJgtg=; b=P/IaAX9lXFp0dJEKGyyJ/TAvLyFHCbGuZKJHDukPbyFqzUktN+0ldY73lTUGh1CTWa7uyD EsoKFNBuwWlmhxElFN04b9/wm7cX9gvpvMpE3oZwnPVaEVsBr03wFeALe62pYLFVRKpAMk O4Trkx4nmORwk7Z97C4nMR49z2fQVVGLyZHFQdRTUHmMU9J/NcJKuPmDnkjvIi3XVjZ4cM Gu3G1i8R2VcawExTzMbMjzopbSzpTxsqTJC0ETfhZ8HlVj0dzD4D6gd5Ei5KI4DhblE08t o38Jsx5A0UQ8bGwjGBn24f8A30J83Dzi5X23OjEVMBecvaXfbDvE9O6IIRyOzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777973596; a=rsa-sha256; cv=none; b=dYIaUXffUZwYER4O5JZ6oep+fMsvprbcz6zYZMEFJHP5GDrm3JqviETywSkAPFuAG9L1Hm 5DnOGfTH5Xyo+KI0Repf8YyZDpUjdJ98T4KK0xdR1itn9Zef7iG83pa/g6duDFLVdOPFJW bKQgfM5ElE6NUBfZ5hvSwOAj1MrftDGKcL1MrjamluHIbF08vyyFpKNQ2rSiKT0RA79CXN axUQpH/hYZ8n6jEy8yaR9PNLt4TMhPbZf/B7Oaj+DjoEyZu900/BRHVy75r2TSS3+aQoZ9 MEpr0RM13rTzJDEINVtdGQUM368aDHuICHDLF1F4LnWZuLd6Hv7il0sjfQfMYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777973596; 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=tZn5I8TfBH7RUkNMW3axKnO55d6/A5FEh7Q+ReVJgtg=; b=a6QPorkAoA+6OkOW23cKftRTZP2Lrrxa9uoIXtVG/ic5oe3iyGc3hndi574CzYmChbdj/G /RJXMPwyZ077+ATaAbkarliowggEo0IpsJEBl5YFnW/aiscU2QWmHlem6aqPIIxxWwS1lX MwOwc/4OxKjXg7Jv6RdHzrNRD3YKP4clTsQUU3XtClZp5TIxVSszU1GygC/dWLMXuQvBcx Un+wFU2WCqnaifIYpMfFq0FGaEjHwOD6i5gTUyUYxor4k0hKmh4yxGlepvjbk21fZOIrEA Ourtq0aAQKdAhpn3+NZfQbcCMnNpMLYRW2htXS+IUwwwDIiqYeLFs4DFXPNuhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8tbw0JQwz12BF for ; Tue, 05 May 2026 09:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2111e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 09:33:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: c8167ebb742c - main - Revert "virtio_net: Use bus_dma for command/ack buffers" 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8167ebb742c36cb1fc32cc543afb4016b4fc174 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 09:33:16 +0000 Message-Id: <69f9b95c.2111e.46bab85c@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c8167ebb742c36cb1fc32cc543afb4016b4fc174 commit c8167ebb742c36cb1fc32cc543afb4016b4fc174 Author: Andrew Turner AuthorDate: 2026-05-05 09:16:23 +0000 Commit: Andrew Turner CommitDate: 2026-05-05 09:18:14 +0000 Revert "virtio_net: Use bus_dma for command/ack buffers" This reverts commit b5bad6df467cc95bea641afe674c55cd5b9f1510. Revert until we can fix reported issues --- sys/dev/virtio/network/if_vtnet.c | 336 ++++++----------------------------- sys/dev/virtio/network/if_vtnetvar.h | 6 - 2 files changed, 58 insertions(+), 284 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 40792482672c..e88602a44664 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -219,7 +219,7 @@ static void vtnet_init_locked(struct vtnet_softc *, int); static void vtnet_init(void *); static void vtnet_free_ctrl_vq(struct vtnet_softc *); -static int vtnet_exec_ctrl_cmd(struct vtnet_softc *, uint8_t *, +static void vtnet_exec_ctrl_cmd(struct vtnet_softc *, void *, struct sglist *, int, int); static int vtnet_ctrl_mac_cmd(struct vtnet_softc *, uint8_t *); static int vtnet_ctrl_guest_offloads(struct vtnet_softc *, uint64_t); @@ -523,50 +523,6 @@ vtnet_attach(device_t dev) goto fail; } - mtx_init(&sc->vtnet_hdr_mtx, device_get_nameunit(dev), - "VirtIO Net header lock", MTX_DEF); - - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* parent */ - sizeof(uint16_t), /* alignment */ - 0, /* boundary */ - BUS_SPACE_MAXADDR, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - PAGE_SIZE, /* max request size */ - 1, /* max # segments */ - PAGE_SIZE, /* maxsegsize */ - BUS_DMA_COHERENT, /* flags */ - busdma_lock_mutex, /* lockfunc */ - &sc->vtnet_hdr_mtx, /* lockarg */ - &sc->vtnet_hdr_dmat); - if (error) { - device_printf(dev, "cannot create bus_dma_tag\n"); - goto fail; - } - - mtx_init(&sc->vtnet_ack_mtx, device_get_nameunit(dev), - "VirtIO Net ACK lock", MTX_DEF); - - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* parent */ - sizeof(uint8_t), /* alignment */ - 0, /* boundary */ - BUS_SPACE_MAXADDR, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - sizeof(uint8_t), /* max request size */ - 1, /* max # segments */ - sizeof(uint8_t), /* maxsegsize */ - BUS_DMA_COHERENT, /* flags */ - busdma_lock_mutex, /* lockfunc */ - &sc->vtnet_ack_mtx, /* lockarg */ - &sc->vtnet_ack_dmat); - if (error) { - device_printf(dev, "cannot create bus_dma_tag\n"); - goto fail; - } - #ifdef __powerpc__ /* * Virtio uses physical addresses rather than bus addresses, so we @@ -575,8 +531,6 @@ vtnet_attach(device_t dev) */ bus_dma_tag_set_iommu(sc->vtnet_rx_dmat, NULL, NULL); bus_dma_tag_set_iommu(sc->vtnet_tx_dmat, NULL, NULL); - bus_dma_tag_set_iommu(sc->vtnet_hdr_dmat, NULL, NULL); - bus_dma_tag_set_iommu(sc->vtnet_ack_dmat, NULL, NULL); #endif error = vtnet_alloc_rx_filters(sc); @@ -3797,43 +3751,10 @@ vtnet_free_ctrl_vq(struct vtnet_softc *sc) } static void -vtnet_load_callback(void *arg, bus_dma_segment_t *segs, int nsegs, - int error) +vtnet_exec_ctrl_cmd(struct vtnet_softc *sc, void *cookie, + struct sglist *sg, int readable, int writable) { - bus_addr_t *paddr; - - if (error != 0) - return; - - KASSERT(nsegs == 1, ("%s: %d segments returned!", __func__, nsegs)); - - paddr = (bus_addr_t *)arg; - *paddr = segs[0].ds_addr; -} - -static int -vtnet_exec_ctrl_cmd(struct vtnet_softc *sc, uint8_t *ack, struct sglist *sg, - int readable, int writable) -{ - bus_dmamap_t ack_dmap; - bus_addr_t ack_paddr; struct virtqueue *vq; - int error; - - error = bus_dmamap_create(sc->vtnet_ack_dmat, 0, &ack_dmap); - if (error) - goto error_out; - - error = bus_dmamap_load(sc->vtnet_ack_dmat, ack_dmap, ack, - sizeof(uint8_t), vtnet_load_callback, &ack_paddr, BUS_DMA_NOWAIT); - if (error) - goto error_destroy; - - bus_dmamap_sync(sc->vtnet_ack_dmat, ack_dmap, BUS_DMASYNC_PREWRITE); - - error = sglist_append_phys(sg, ack_paddr, sizeof(uint8_t)); - if (error) - goto error_unload; vq = sc->vtnet_ctrl_vq; @@ -3841,237 +3762,152 @@ vtnet_exec_ctrl_cmd(struct vtnet_softc *sc, uint8_t *ack, struct sglist *sg, VTNET_CORE_LOCK_ASSERT(sc); if (!virtqueue_empty(vq)) - goto error_unload; + return; /* * Poll for the response, but the command is likely completed before * returning from the notify. */ - if (virtqueue_enqueue(vq, (void *)ack, sg, readable, writable) == 0) { + if (virtqueue_enqueue(vq, cookie, sg, readable, writable) == 0) { virtqueue_notify(vq); virtqueue_poll(vq, NULL); } - - bus_dmamap_sync(sc->vtnet_ack_dmat, ack_dmap, BUS_DMASYNC_POSTREAD); - -error_unload: - bus_dmamap_unload(sc->vtnet_ack_dmat, ack_dmap); -error_destroy: - bus_dmamap_destroy(sc->vtnet_ack_dmat, ack_dmap); -error_out: - return (error); } static int vtnet_ctrl_mac_cmd(struct vtnet_softc *sc, uint8_t *hwaddr) { struct sglist_seg segs[3]; - bus_dmamap_t hdr_dmap; - bus_addr_t hdr_paddr; struct sglist sg; struct { struct virtio_net_ctrl_hdr hdr __aligned(2); uint8_t pad1; uint8_t addr[ETHER_ADDR_LEN] __aligned(8); uint8_t pad2; + uint8_t ack; } s; - uint8_t ack; int error; - error = bus_dmamap_create(sc->vtnet_hdr_dmat, 0, &hdr_dmap); - if (error) - goto error_out; - - error = bus_dmamap_load(sc->vtnet_hdr_dmat, hdr_dmap, &s, - sizeof(s), vtnet_load_callback, &hdr_paddr, BUS_DMA_NOWAIT); - if (error) - goto error_destroy_hdr; - + error = 0; MPASS(sc->vtnet_flags & VTNET_FLAG_CTRL_MAC); s.hdr.class = VIRTIO_NET_CTRL_MAC; s.hdr.cmd = VIRTIO_NET_CTRL_MAC_ADDR_SET; bcopy(hwaddr, &s.addr[0], ETHER_ADDR_LEN); - ack = VIRTIO_NET_ERR; - bus_dmamap_sync(sc->vtnet_hdr_dmat, hdr_dmap, BUS_DMASYNC_PREWRITE); + s.ack = VIRTIO_NET_ERR; sglist_init(&sg, nitems(segs), segs); - error |= sglist_append_phys(&sg, hdr_paddr, - sizeof(struct virtio_net_ctrl_hdr)); - error |= sglist_append_phys(&sg, - hdr_paddr + ((uintptr_t)&s.addr - (uintptr_t)&s), - ETHER_ADDR_LEN); - MPASS(error == 0 && sg.sg_nseg == nitems(segs) - 1); + error |= sglist_append(&sg, &s.hdr, sizeof(struct virtio_net_ctrl_hdr)); + error |= sglist_append(&sg, &s.addr[0], ETHER_ADDR_LEN); + error |= sglist_append(&sg, &s.ack, sizeof(uint8_t)); + MPASS(error == 0 && sg.sg_nseg == nitems(segs)); if (error == 0) - error = vtnet_exec_ctrl_cmd(sc, &ack, &sg, sg.sg_nseg, 1); - if (error == 0) - error = (ack == VIRTIO_NET_OK ? 0 : EIO); + vtnet_exec_ctrl_cmd(sc, &s.ack, &sg, sg.sg_nseg - 1, 1); - bus_dmamap_unload(sc->vtnet_hdr_dmat, hdr_dmap); -error_destroy_hdr: - bus_dmamap_destroy(sc->vtnet_hdr_dmat, hdr_dmap); -error_out: - return (error); + return (s.ack == VIRTIO_NET_OK ? 0 : EIO); } static int vtnet_ctrl_guest_offloads(struct vtnet_softc *sc, uint64_t offloads) { struct sglist_seg segs[3]; - bus_dmamap_t hdr_dmap; - bus_addr_t hdr_paddr; struct sglist sg; struct { struct virtio_net_ctrl_hdr hdr __aligned(2); uint8_t pad1; uint64_t offloads __aligned(8); uint8_t pad2; + uint8_t ack; } s; - uint8_t ack; int error; - error = bus_dmamap_create(sc->vtnet_hdr_dmat, 0, &hdr_dmap); - if (error) - goto error_out; - - error = bus_dmamap_load(sc->vtnet_hdr_dmat, hdr_dmap, &s, - sizeof(s), vtnet_load_callback, &hdr_paddr, BUS_DMA_NOWAIT); - if (error) - goto error_destroy_hdr; - + error = 0; MPASS(sc->vtnet_features & VIRTIO_NET_F_CTRL_GUEST_OFFLOADS); s.hdr.class = VIRTIO_NET_CTRL_GUEST_OFFLOADS; s.hdr.cmd = VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET; s.offloads = vtnet_gtoh64(sc, offloads); - ack = VIRTIO_NET_ERR; - bus_dmamap_sync(sc->vtnet_hdr_dmat, hdr_dmap, BUS_DMASYNC_PREWRITE); + s.ack = VIRTIO_NET_ERR; sglist_init(&sg, nitems(segs), segs); - error |= sglist_append_phys(&sg, hdr_paddr, - sizeof(struct virtio_net_ctrl_hdr)); - error |= sglist_append_phys(&sg, - hdr_paddr + ((uintptr_t)&s.offloads - (uintptr_t)&s), - sizeof(uint64_t)); - MPASS(error == 0 && sg.sg_nseg == nitems(segs) - 1); + error |= sglist_append(&sg, &s.hdr, sizeof(struct virtio_net_ctrl_hdr)); + error |= sglist_append(&sg, &s.offloads, sizeof(uint64_t)); + error |= sglist_append(&sg, &s.ack, sizeof(uint8_t)); + MPASS(error == 0 && sg.sg_nseg == nitems(segs)); if (error == 0) - error = vtnet_exec_ctrl_cmd(sc, &ack, &sg, sg.sg_nseg, 1); - if (error == 0) - error = (ack == VIRTIO_NET_OK ? 0 : EIO); + vtnet_exec_ctrl_cmd(sc, &s.ack, &sg, sg.sg_nseg - 1, 1); - bus_dmamap_unload(sc->vtnet_hdr_dmat, hdr_dmap); -error_destroy_hdr: - bus_dmamap_destroy(sc->vtnet_hdr_dmat, hdr_dmap); -error_out: - return (error); + return (s.ack == VIRTIO_NET_OK ? 0 : EIO); } static int vtnet_ctrl_mq_cmd(struct vtnet_softc *sc, uint16_t npairs) { struct sglist_seg segs[3]; - bus_dmamap_t hdr_dmap; - bus_addr_t hdr_paddr; struct sglist sg; struct { struct virtio_net_ctrl_hdr hdr __aligned(2); uint8_t pad1; struct virtio_net_ctrl_mq mq __aligned(2); uint8_t pad2; + uint8_t ack; } s; - uint8_t ack; int error; - error = bus_dmamap_create(sc->vtnet_hdr_dmat, 0, &hdr_dmap); - if (error) - goto error_out; - - error = bus_dmamap_load(sc->vtnet_hdr_dmat, hdr_dmap, &s, - sizeof(s), vtnet_load_callback, &hdr_paddr, BUS_DMA_NOWAIT); - if (error) - goto error_destroy_hdr; - + error = 0; MPASS(sc->vtnet_flags & VTNET_FLAG_MQ); s.hdr.class = VIRTIO_NET_CTRL_MQ; s.hdr.cmd = VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET; s.mq.virtqueue_pairs = vtnet_gtoh16(sc, npairs); - ack = VIRTIO_NET_ERR; - bus_dmamap_sync(sc->vtnet_hdr_dmat, hdr_dmap, BUS_DMASYNC_PREWRITE); + s.ack = VIRTIO_NET_ERR; sglist_init(&sg, nitems(segs), segs); - error |= sglist_append_phys(&sg, hdr_paddr, - sizeof(struct virtio_net_ctrl_hdr)); - error |= sglist_append_phys(&sg, - hdr_paddr + ((uintptr_t)&s.mq - (uintptr_t)&s), - sizeof(struct virtio_net_ctrl_mq)); - MPASS(error == 0 && sg.sg_nseg == nitems(segs) - 1); + error |= sglist_append(&sg, &s.hdr, sizeof(struct virtio_net_ctrl_hdr)); + error |= sglist_append(&sg, &s.mq, sizeof(struct virtio_net_ctrl_mq)); + error |= sglist_append(&sg, &s.ack, sizeof(uint8_t)); + MPASS(error == 0 && sg.sg_nseg == nitems(segs)); if (error == 0) - error = vtnet_exec_ctrl_cmd(sc, &ack, &sg, sg.sg_nseg, 1); - if (error == 0) - error = (ack == VIRTIO_NET_OK ? 0 : EIO); + vtnet_exec_ctrl_cmd(sc, &s.ack, &sg, sg.sg_nseg - 1, 1); - bus_dmamap_unload(sc->vtnet_hdr_dmat, hdr_dmap); -error_destroy_hdr: - bus_dmamap_destroy(sc->vtnet_hdr_dmat, hdr_dmap); -error_out: - return (error); + return (s.ack == VIRTIO_NET_OK ? 0 : EIO); } static int vtnet_ctrl_rx_cmd(struct vtnet_softc *sc, uint8_t cmd, bool on) { struct sglist_seg segs[3]; - bus_dmamap_t hdr_dmap; - bus_addr_t hdr_paddr; struct sglist sg; struct { struct virtio_net_ctrl_hdr hdr __aligned(2); uint8_t pad1; uint8_t onoff; uint8_t pad2; + uint8_t ack; } s; - uint8_t ack; int error; - error = bus_dmamap_create(sc->vtnet_hdr_dmat, 0, &hdr_dmap); - if (error) - goto error_out; - - error = bus_dmamap_load(sc->vtnet_hdr_dmat, hdr_dmap, &s, - sizeof(s), vtnet_load_callback, &hdr_paddr, BUS_DMA_NOWAIT); - if (error) - goto error_destroy_hdr; - + error = 0; MPASS(sc->vtnet_flags & VTNET_FLAG_CTRL_RX); s.hdr.class = VIRTIO_NET_CTRL_RX; s.hdr.cmd = cmd; s.onoff = on; - ack = VIRTIO_NET_ERR; - bus_dmamap_sync(sc->vtnet_hdr_dmat, hdr_dmap, BUS_DMASYNC_PREWRITE); + s.ack = VIRTIO_NET_ERR; sglist_init(&sg, nitems(segs), segs); - error |= sglist_append_phys(&sg, hdr_paddr, - sizeof(struct virtio_net_ctrl_hdr)); - error |= sglist_append_phys(&sg, - hdr_paddr + ((uintptr_t)&s.onoff - (uintptr_t)&s), - sizeof(uint8_t)); - MPASS(error == 0 && sg.sg_nseg == nitems(segs) - 1); + error |= sglist_append(&sg, &s.hdr, sizeof(struct virtio_net_ctrl_hdr)); + error |= sglist_append(&sg, &s.onoff, sizeof(uint8_t)); + error |= sglist_append(&sg, &s.ack, sizeof(uint8_t)); + MPASS(error == 0 && sg.sg_nseg == nitems(segs)); if (error == 0) - error = vtnet_exec_ctrl_cmd(sc, &ack, &sg, sg.sg_nseg, 1); - if (error == 0) - error = (ack == VIRTIO_NET_OK ? 0 : EIO); + vtnet_exec_ctrl_cmd(sc, &s.ack, &sg, sg.sg_nseg - 1, 1); - bus_dmamap_unload(sc->vtnet_hdr_dmat, hdr_dmap); -error_destroy_hdr: - bus_dmamap_destroy(sc->vtnet_hdr_dmat, hdr_dmap); -error_out: - return (error); + return (s.ack == VIRTIO_NET_OK ? 0 : EIO); } static int @@ -4142,10 +3978,6 @@ vtnet_rx_filter_mac(struct vtnet_softc *sc) struct virtio_net_ctrl_hdr hdr __aligned(2); struct vtnet_mac_filter *filter; struct sglist_seg segs[4]; - bus_dmamap_t filter_dmap; - bus_addr_t filter_paddr; - bus_dmamap_t hdr_dmap; - bus_addr_t hdr_paddr; struct sglist sg; if_t ifp; bool promisc, allmulti; @@ -4185,25 +4017,6 @@ vtnet_rx_filter_mac(struct vtnet_softc *sc) if (promisc && allmulti) goto out; - error = bus_dmamap_create(sc->vtnet_hdr_dmat, 0, &hdr_dmap); - if (error) - goto out_error; - - error = bus_dmamap_load(sc->vtnet_hdr_dmat, hdr_dmap, &hdr, - sizeof(hdr), vtnet_load_callback, &hdr_paddr, BUS_DMA_NOWAIT); - if (error) - goto out_destroy_hdr; - - error = bus_dmamap_create(sc->vtnet_hdr_dmat, 0, &filter_dmap); - if (error) - goto out_unload_hdr; - - error = bus_dmamap_load(sc->vtnet_hdr_dmat, hdr_dmap, filter, - sizeof(*filter), vtnet_load_callback, &filter_paddr, - BUS_DMA_NOWAIT); - if (error) - goto out_destroy_filter; - filter->vmf_unicast.nentries = vtnet_gtoh32(sc, ucnt); filter->vmf_multicast.nentries = vtnet_gtoh32(sc, mcnt); @@ -4212,33 +4025,19 @@ vtnet_rx_filter_mac(struct vtnet_softc *sc) ack = VIRTIO_NET_ERR; sglist_init(&sg, nitems(segs), segs); - error |= sglist_append_phys(&sg, hdr_paddr, - sizeof(struct virtio_net_ctrl_hdr)); - error |= sglist_append_phys(&sg, - filter_paddr + ((uintptr_t)&filter->vmf_unicast - - (uintptr_t)filter), + error |= sglist_append(&sg, &hdr, sizeof(struct virtio_net_ctrl_hdr)); + error |= sglist_append(&sg, &filter->vmf_unicast, sizeof(uint32_t) + ucnt * ETHER_ADDR_LEN); - error |= sglist_append_phys(&sg, - filter_paddr + ((uintptr_t)&filter->vmf_multicast - - (uintptr_t)filter), + error |= sglist_append(&sg, &filter->vmf_multicast, sizeof(uint32_t) + mcnt * ETHER_ADDR_LEN); - MPASS(error == 0 && sg.sg_nseg == nitems(segs) - 1); + error |= sglist_append(&sg, &ack, sizeof(uint8_t)); + MPASS(error == 0 && sg.sg_nseg == nitems(segs)); if (error == 0) - error = vtnet_exec_ctrl_cmd(sc, &ack, &sg, sg.sg_nseg, 1); - if (error == 0) - error = (ack == VIRTIO_NET_OK ? 0 : EIO); - - bus_dmamap_unload(sc->vtnet_hdr_dmat, filter_dmap); -out_destroy_filter: - bus_dmamap_destroy(sc->vtnet_hdr_dmat, filter_dmap); -out_unload_hdr: - bus_dmamap_unload(sc->vtnet_hdr_dmat, hdr_dmap); -out_destroy_hdr: - bus_dmamap_destroy(sc->vtnet_hdr_dmat, hdr_dmap); -out_error: - if (error != 0) + vtnet_exec_ctrl_cmd(sc, &ack, &sg, sg.sg_nseg - 1, 1); + if (ack != VIRTIO_NET_OK) if_printf(ifp, "error setting host MAC filter table\n"); + out: if (promisc && vtnet_set_promisc(sc, true) != 0) if_printf(ifp, "cannot enable promiscuous mode\n"); @@ -4250,53 +4049,34 @@ static int vtnet_exec_vlan_filter(struct vtnet_softc *sc, int add, uint16_t tag) { struct sglist_seg segs[3]; - bus_dmamap_t hdr_dmap; - bus_addr_t hdr_paddr; struct sglist sg; struct { struct virtio_net_ctrl_hdr hdr __aligned(2); uint8_t pad1; uint16_t tag __aligned(2); uint8_t pad2; + uint8_t ack; } s; - uint8_t ack; int error; - error = bus_dmamap_create(sc->vtnet_hdr_dmat, 0, &hdr_dmap); - if (error) - goto error_out; - - error = bus_dmamap_load(sc->vtnet_hdr_dmat, hdr_dmap, &s, - sizeof(s), vtnet_load_callback, &hdr_paddr, BUS_DMA_NOWAIT); - if (error) - goto error_destroy_hdr; - + error = 0; MPASS(sc->vtnet_flags & VTNET_FLAG_VLAN_FILTER); s.hdr.class = VIRTIO_NET_CTRL_VLAN; s.hdr.cmd = add ? VIRTIO_NET_CTRL_VLAN_ADD : VIRTIO_NET_CTRL_VLAN_DEL; s.tag = vtnet_gtoh16(sc, tag); - ack = VIRTIO_NET_ERR; - bus_dmamap_sync(sc->vtnet_hdr_dmat, hdr_dmap, BUS_DMASYNC_PREWRITE); + s.ack = VIRTIO_NET_ERR; sglist_init(&sg, nitems(segs), segs); - error |= sglist_append_phys(&sg, hdr_paddr, - sizeof(struct virtio_net_ctrl_hdr)); - error |= sglist_append_phys(&sg, - hdr_paddr + ((uintptr_t)&s.tag - (uintptr_t)&s), - sizeof(uint16_t)); - MPASS(error == 0 && sg.sg_nseg == nitems(segs) - 1); + error |= sglist_append(&sg, &s.hdr, sizeof(struct virtio_net_ctrl_hdr)); + error |= sglist_append(&sg, &s.tag, sizeof(uint16_t)); + error |= sglist_append(&sg, &s.ack, sizeof(uint8_t)); + MPASS(error == 0 && sg.sg_nseg == nitems(segs)); if (error == 0) - error = vtnet_exec_ctrl_cmd(sc, &ack, &sg, sg.sg_nseg, 1); - if (error == 0) - error = (ack == VIRTIO_NET_OK ? 0 : EIO); + vtnet_exec_ctrl_cmd(sc, &s.ack, &sg, sg.sg_nseg - 1, 1); - bus_dmamap_unload(sc->vtnet_hdr_dmat, hdr_dmap); -error_destroy_hdr: - bus_dmamap_destroy(sc->vtnet_hdr_dmat, hdr_dmap); -error_out: - return (error); + return (s.ack == VIRTIO_NET_OK ? 0 : EIO); } static void diff --git a/sys/dev/virtio/network/if_vtnetvar.h b/sys/dev/virtio/network/if_vtnetvar.h index e445bdf6d6cb..6cafe827d733 100644 --- a/sys/dev/virtio/network/if_vtnetvar.h +++ b/sys/dev/virtio/network/if_vtnetvar.h @@ -196,12 +196,6 @@ struct vtnet_softc { bus_dma_tag_t vtnet_tx_dmat; struct mtx vtnet_tx_mtx; - - bus_dma_tag_t vtnet_hdr_dmat; - struct mtx vtnet_hdr_mtx; - - bus_dma_tag_t vtnet_ack_dmat; - struct mtx vtnet_ack_mtx; }; /* vtnet flag descriptions for use with printf(9) %b identifier. */ #define VTNET_FLAGS_BITS \ From nobody Tue May 5 09:33:17 2026 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 4g8tbx42zwz6bjQm for ; Tue, 05 May 2026 09:33:17 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8tbx1Yjcz3n6K for ; Tue, 05 May 2026 09:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777973597; 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=CSAtEM3wE9jANtOxxyBay6Z7AWCBIH1IJpUqxU1p3WY=; b=gUzGPdJ2asDqbFnpzJ3vvUS7/qJI4Jhz1eh1TV7dDE4u8b1zmr9wnwLnnjW2j0fbXPdV6/ 2Cl/lOZFPJr2FEUj/P9m2L1PwACUT9+Ta8ODe4a8Klbi+ArJ0yOgcNt+qZ0r2zpaYJAC9w 7ZzULisSCZq90WauOg/tzyyJvwetvkxEt9fXAWEKchicHcW0mwf87OZWPb4l65dG1mVd76 AukoORsmEYvJoycT9/5syxMwfUuquFBXCaLv1OJNGK0vLHHjU/OJfn+W4479hv6J4LUSNJ hmHtfld44h3EVMlJRALBN6Q92Eltj0DPh0ltFuKmiqxHAo1+q/5Q5h88xFQn+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777973597; a=rsa-sha256; cv=none; b=sxsnPSCXXpw7CcQMRpaPWaHrBdlu9UAL+QbmShABcf8ITGNdZ/Rn+5e+PKnQUTsvmZW2H7 fXrErJDAIXaw0sfL9tYbjjHJCadYGDS1TXV1nS9KR7NLVHuGOwru39x5Q5LeIEjJLK8+f1 2fNnsAnbw/Su7b/MBPUe5fppMA/uLk3sTJYhCKrIp4Iwb/NIiIy5KdI7plCm3hIooZ3VoI vEkrjCb8vB+sbGz0lYXd2iAXyMkRWU/ctdMrkeu0zf7Da763pXwY1GZbh8RKyqhcJib4C8 v8dy8UqHCbsZLhEPmUVKpkb7qXTBQFNd8kb6sDOBQkVYAvQst51WaaH2OntKeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777973597; 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=CSAtEM3wE9jANtOxxyBay6Z7AWCBIH1IJpUqxU1p3WY=; b=EYj3CtYoM93XjjfhaaVjYsa8jBpN286Cse370VLHi+Q3kqW+EFP8D5aW5c6WDajbSL7Vj8 NgxzaC3oq348hDtG0zKjoJ9tSRl11glnes7VGR/1k5ZzekmkEifpAgVBTzcp21hHV5kJcO vWG9RtnSFF363QVYleeuvcQG9Q1pabAuPPg9P25SwWefCfRjALuzqPjVh4aTK1YMN6TsLK j2QdEa9yUbxDa6Eaq31kmpo7NHzc5zuR5QqFzFWC3dpjAZqEnXnNnuws49oBY/ETRZbFOl sn7V575RTdKYSK2SzHiG4aDBoRMxr4u8YxguzzSEh3rKxvs2mbT31bBwP/T6/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8tbx19ltz11Kb for ; Tue, 05 May 2026 09:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 210a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 09:33:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: dc00f118405e - main - Revert "virtio_net: Use bus_dma for rxq/txq buffers" 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc00f118405e8638ceb13b288e14164a8a9ba669 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 09:33:17 +0000 Message-Id: <69f9b95d.210a4.71b90855@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=dc00f118405e8638ceb13b288e14164a8a9ba669 commit dc00f118405e8638ceb13b288e14164a8a9ba669 Author: Andrew Turner AuthorDate: 2026-05-05 09:17:51 +0000 Commit: Andrew Turner CommitDate: 2026-05-05 09:18:14 +0000 Revert "virtio_net: Use bus_dma for rxq/txq buffers" This reverts commit c16c95192f01237a876eb7bc336e3bbda9310171. Revert until we can fix reported issues --- sys/dev/virtio/network/if_vtnet.c | 275 +++-------------------------------- sys/dev/virtio/network/if_vtnetvar.h | 10 -- 2 files changed, 17 insertions(+), 268 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index e88602a44664..ef01833b9e03 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -96,17 +96,6 @@ #define VTNET_ETHER_ALIGN ETHER_ALIGN #endif -/* - * Worst case offset to ensure header doesn't share any cache lines with - * payload. - */ -#define VTNET_RX_BUFFER_HEADER_OFFSET 128 - -struct vtnet_rx_buffer_header { - bus_addr_t addr; - bus_dmamap_t dmap; -}; - static int vtnet_modevent(module_t, int, void *); static int vtnet_probe(device_t); @@ -395,17 +384,6 @@ MODULE_DEPEND(vtnet, netmap, 1, 1, 1); VIRTIO_SIMPLE_PNPINFO(vtnet, VIRTIO_ID_NETWORK, "VirtIO Networking Adapter"); -static struct vtnet_rx_buffer_header * -vtnet_mbuf_to_rx_buffer_header(struct vtnet_softc *sc, struct mbuf *m) -{ - if (VTNET_ETHER_ALIGN != 0 && sc->vtnet_hdr_size % 4 == 0) - return (struct vtnet_rx_buffer_header *)((uintptr_t)m->m_data - - VTNET_RX_BUFFER_HEADER_OFFSET - VTNET_ETHER_ALIGN); - else - return (struct vtnet_rx_buffer_header *)((uintptr_t)m->m_data - - VTNET_RX_BUFFER_HEADER_OFFSET); -} - static int vtnet_modevent(module_t mod __unused, int type, void *unused __unused) { @@ -479,60 +457,6 @@ vtnet_attach(device_t dev) goto fail; } - mtx_init(&sc->vtnet_rx_mtx, device_get_nameunit(dev), - "VirtIO Net RX lock", MTX_DEF); - - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* parent */ - sizeof(uint16_t), /* alignment */ - 0, /* boundary */ - BUS_SPACE_MAXADDR, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - MJUM9BYTES, /* max request size */ - 1, /* max # segments */ - MJUM9BYTES, /* maxsegsize - worst case */ - BUS_DMA_COHERENT, /* flags */ - busdma_lock_mutex, /* lockfunc */ - &sc->vtnet_rx_mtx, /* lockarg */ - &sc->vtnet_rx_dmat); - if (error) { - device_printf(dev, "cannot create bus_dma_tag\n"); - goto fail; - } - - mtx_init(&sc->vtnet_tx_mtx, device_get_nameunit(dev), - "VirtIO Net TX lock", MTX_DEF); - - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* parent */ - sizeof(uint16_t), /* alignment */ - 0, /* boundary */ - BUS_SPACE_MAXADDR, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - sc->vtnet_tx_nsegs * MJUM9BYTES, /* max request size */ - sc->vtnet_tx_nsegs, /* max # segments */ - MJUM9BYTES, /* maxsegsize */ - BUS_DMA_COHERENT, /* flags */ - busdma_lock_mutex, /* lockfunc */ - &sc->vtnet_tx_mtx, /* lockarg */ - &sc->vtnet_tx_dmat); - if (error) { - device_printf(dev, "cannot create bus_dma_tag\n"); - goto fail; - } - -#ifdef __powerpc__ - /* - * Virtio uses physical addresses rather than bus addresses, so we - * need to ask busdma to skip the iommu physical->bus mapping. At - * present, this is only a thing on the powerpc architectures. - */ - bus_dma_tag_set_iommu(sc->vtnet_rx_dmat, NULL, NULL); - bus_dma_tag_set_iommu(sc->vtnet_tx_dmat, NULL, NULL); -#endif - error = vtnet_alloc_rx_filters(sc); if (error) { device_printf(dev, "cannot allocate Rx filters\n"); @@ -1621,11 +1545,6 @@ static struct mbuf * vtnet_rx_alloc_buf(struct vtnet_softc *sc, int nbufs, struct mbuf **m_tailp) { struct mbuf *m_head, *m_tail, *m; - struct vtnet_rx_buffer_header *vthdr; - bus_dma_segment_t segs[1]; - bus_dmamap_t dmap; - int nsegs; - int err; int i, size; m_head = NULL; @@ -1643,43 +1562,13 @@ vtnet_rx_alloc_buf(struct vtnet_softc *sc, int nbufs, struct mbuf **m_tailp) } m->m_len = size; - vthdr = (struct vtnet_rx_buffer_header *)m->m_data; - - /* Reserve space for header */ - m_adj(m, VTNET_RX_BUFFER_HEADER_OFFSET); - /* * Need to offset the mbuf if the header we're going to add * will misalign. */ - if (VTNET_ETHER_ALIGN != 0 && sc->vtnet_hdr_size % 4 == 0) + if (VTNET_ETHER_ALIGN != 0 && sc->vtnet_hdr_size % 4 == 0) { m_adj(m, VTNET_ETHER_ALIGN); - - err = bus_dmamap_create(sc->vtnet_rx_dmat, 0, &dmap); - if (err) { - printf("Failed to create dmamap, err :%d\n", - err); - m_freem(m); - return (NULL); } - - nsegs = 0; - err = bus_dmamap_load_mbuf_sg(sc->vtnet_rx_dmat, dmap, m, segs, - &nsegs, BUS_DMA_NOWAIT); - if (err != 0) { - printf("Failed to map mbuf into DMA visible memory, err: %d\n", - err); - m_freem(m); - bus_dmamap_destroy(sc->vtnet_rx_dmat, dmap); - return (NULL); - } - KASSERT(nsegs == 1, - ("%s: unexpected number of DMA segments for rx buffer: %d", - __func__, nsegs)); - - vthdr->addr = segs[0].ds_addr; - vthdr->dmap = dmap; - if (m_head != NULL) { m_tail->m_next = m; m_tail = m; @@ -1705,7 +1594,7 @@ vtnet_rxq_replace_lro_nomrg_buf(struct vtnet_rxq *rxq, struct mbuf *m0, int len, clustersz, nreplace, error; sc = rxq->vtnrx_sc; - clustersz = sc->vtnet_rx_clustersz - VTNET_RX_BUFFER_HEADER_OFFSET; + clustersz = sc->vtnet_rx_clustersz; /* * Need to offset the mbuf if the header we're going to add will * misalign, account for that here. @@ -1820,12 +1709,9 @@ vtnet_rxq_replace_buf(struct vtnet_rxq *rxq, struct mbuf *m, int len) static int vtnet_rxq_enqueue_buf(struct vtnet_rxq *rxq, struct mbuf *m) { - struct vtnet_rx_buffer_header *hdr; struct vtnet_softc *sc; struct sglist *sg; int header_inlined, error; - bus_addr_t paddr; - struct mbuf *mp; sc = rxq->vtnrx_sc; sg = rxq->vtnrx_sg; @@ -1838,38 +1724,28 @@ vtnet_rxq_enqueue_buf(struct vtnet_rxq *rxq, struct mbuf *m) header_inlined = vtnet_modern(sc) || (sc->vtnet_flags & VTNET_FLAG_MRG_RXBUFS) != 0; /* TODO: ANY_LAYOUT */ - hdr = vtnet_mbuf_to_rx_buffer_header(sc, m); - paddr = hdr->addr; - /* * Note: The mbuf has been already adjusted when we allocate it if we * have to do strict alignment. */ - if (header_inlined) { - error = sglist_append_phys(sg, paddr, m->m_len); - } else { + if (header_inlined) + error = sglist_append_mbuf(sg, m); + else { + struct vtnet_rx_header *rxhdr = + mtod(m, struct vtnet_rx_header *); MPASS(sc->vtnet_hdr_size == sizeof(struct virtio_net_hdr)); /* Append the header and remaining mbuf data. */ - error = sglist_append_phys(sg, paddr, sc->vtnet_hdr_size); + error = sglist_append(sg, &rxhdr->vrh_hdr, sc->vtnet_hdr_size); if (error) return (error); - error = sglist_append_phys(sg, - paddr + sizeof(struct vtnet_rx_header), + error = sglist_append(sg, &rxhdr[1], m->m_len - sizeof(struct vtnet_rx_header)); if (error) return (error); - mp = m->m_next; - while (mp) { - hdr = vtnet_mbuf_to_rx_buffer_header(sc, mp); - paddr = hdr->addr; - error = sglist_append_phys(sg, paddr, mp->m_len); - if (error) - return (error); - - mp = mp->m_next; - } + if (m->m_next != NULL) + error = sglist_append_mbuf(sg, m->m_next); } if (error) @@ -2055,7 +1931,6 @@ vtnet_rxq_merged_eof(struct vtnet_rxq *rxq, struct mbuf *m_head, int nbufs) m_tail = m_head; while (--nbufs > 0) { - struct vtnet_rx_buffer_header *vthdr; struct mbuf *m; uint32_t len; @@ -2065,10 +1940,6 @@ vtnet_rxq_merged_eof(struct vtnet_rxq *rxq, struct mbuf *m_head, int nbufs) goto fail; } - vthdr = vtnet_mbuf_to_rx_buffer_header(sc, m); - bus_dmamap_sync(sc->vtnet_rx_dmat, vthdr->dmap, - BUS_DMASYNC_POSTREAD); - if (vtnet_rxq_new_buf(rxq) != 0) { rxq->vtnrx_stats.vrxs_iqdrops++; vtnet_rxq_discard_buf(rxq, m); @@ -2189,7 +2060,6 @@ static int vtnet_rxq_eof(struct vtnet_rxq *rxq) { struct virtio_net_hdr lhdr, *hdr; - struct vtnet_rx_buffer_header *vthdr; struct vtnet_softc *sc; if_t ifp; struct virtqueue *vq; @@ -2205,31 +2075,14 @@ vtnet_rxq_eof(struct vtnet_rxq *rxq) CURVNET_SET(if_getvnet(ifp)); while (count-- > 0) { - struct mbuf *m, *mp; + struct mbuf *m; uint32_t len, nbufs, adjsz; - uint32_t synced; m = virtqueue_dequeue(vq, &len); if (m == NULL) break; deq++; - mp = m; - - /* - * Sync all mbufs in this packet. There will only be a single - * mbuf unless LRO is in use. - */ - synced = 0; - while (mp && synced < len) { - vthdr = vtnet_mbuf_to_rx_buffer_header(sc, mp); - bus_dmamap_sync(sc->vtnet_rx_dmat, vthdr->dmap, - BUS_DMASYNC_POSTREAD); - - synced += mp->m_len; - mp = mp->m_next; - } - if (len < sc->vtnet_hdr_size + ETHER_HDR_LEN) { rxq->vtnrx_stats.vrxs_ierrors++; vtnet_rxq_discard_buf(rxq, m); @@ -2489,14 +2342,6 @@ vtnet_txq_free_mbufs(struct vtnet_txq *txq) while ((txhdr = virtqueue_drain(vq, &last)) != NULL) { if (kring == NULL) { - bus_dmamap_unload(txq->vtntx_sc->vtnet_tx_dmat, - txhdr->dmap); - bus_dmamap_destroy(txq->vtntx_sc->vtnet_tx_dmat, - txhdr->dmap); - bus_dmamap_unload(txq->vtntx_sc->vtnet_tx_dmat, - txhdr->hdr_dmap); - bus_dmamap_destroy(txq->vtntx_sc->vtnet_tx_dmat, - txhdr->hdr_dmap); m_freem(txhdr->vth_mbuf); uma_zfree(vtnet_tx_header_zone, txhdr); } @@ -2666,36 +2511,15 @@ drop: return (NULL); } -static void -vtnet_txq_enqueue_callback(void *arg, bus_dma_segment_t *segs, - int nsegs, int error) -{ - vm_paddr_t *hdr_paddr; - - if (error != 0) - return; - - KASSERT(nsegs == 1, ("%s: %d segments returned!", __func__, nsegs)); - - hdr_paddr = (vm_paddr_t *)arg; - *hdr_paddr = segs[0].ds_addr; -} - static int vtnet_txq_enqueue_buf(struct vtnet_txq *txq, struct mbuf **m_head, struct vtnet_tx_header *txhdr) { - bus_dma_segment_t segs[VTNET_TX_SEGS_MAX]; - int nsegs; struct vtnet_softc *sc; struct virtqueue *vq; struct sglist *sg; struct mbuf *m; int error; - vm_paddr_t hdr_paddr; - bus_dmamap_t hdr_dmap; - bus_dmamap_t dmap; - int i; sc = txq->vtntx_sc; vq = txq->vtntx_vq; @@ -2703,55 +2527,15 @@ vtnet_txq_enqueue_buf(struct vtnet_txq *txq, struct mbuf **m_head, m = *m_head; sglist_reset(sg); - - error = bus_dmamap_create(sc->vtnet_tx_dmat, 0, &hdr_dmap); - if (error) - goto fail; - - error = bus_dmamap_load(sc->vtnet_tx_dmat, hdr_dmap, &txhdr->vth_uhdr, - sc->vtnet_hdr_size, vtnet_txq_enqueue_callback, &hdr_paddr, - BUS_DMA_NOWAIT); - if (error) - goto fail_hdr_dmamap_destroy; - - error = sglist_append_phys(sg, hdr_paddr, sc->vtnet_hdr_size); + error = sglist_append(sg, &txhdr->vth_uhdr, sc->vtnet_hdr_size); if (error != 0 || sg->sg_nseg != 1) { KASSERT(0, ("%s: cannot add header to sglist error %d nseg %d", __func__, error, sg->sg_nseg)); - goto fail_hdr_dmamap_unload; + goto fail; } - bus_dmamap_sync(sc->vtnet_tx_dmat, hdr_dmap, BUS_DMASYNC_PREWRITE); - - error = bus_dmamap_create(sc->vtnet_tx_dmat, 0, &dmap); - if (error) - goto fail_hdr_dmamap_unload; - - nsegs = 0; - error = bus_dmamap_load_mbuf_sg(sc->vtnet_tx_dmat, dmap, m, segs, - &nsegs, BUS_DMA_NOWAIT); - if (error != 0) - goto fail_dmamap_destroy; - KASSERT(nsegs <= sc->vtnet_tx_nsegs, - ("%s: unexpected number of DMA segments for tx buffer: %d (max %d)", - __func__, nsegs, sc->vtnet_tx_nsegs)); - - bus_dmamap_sync(sc->vtnet_tx_dmat, dmap, BUS_DMASYNC_PREWRITE); - - for (i = 0; i < nsegs && !error; i++) - error = sglist_append_phys(sg, segs[i].ds_addr, segs[i].ds_len); - + error = sglist_append_mbuf(sg, m); if (error) { - sglist_reset(sg); - bus_dmamap_unload(sc->vtnet_tx_dmat, dmap); - - error = sglist_append_phys(sg, hdr_paddr, sc->vtnet_hdr_size); - if (error != 0 || sg->sg_nseg != 1) { - KASSERT(0, ("%s: cannot add header to sglist error %d nseg %d", - __func__, error, sg->sg_nseg)); - goto fail_dmamap_destroy; - } - m = m_defrag(m, M_NOWAIT); if (m == NULL) { sc->vtnet_stats.tx_defrag_failed++; @@ -2761,41 +2545,16 @@ vtnet_txq_enqueue_buf(struct vtnet_txq *txq, struct mbuf **m_head, *m_head = m; sc->vtnet_stats.tx_defragged++; - nsegs = 0; - error = bus_dmamap_load_mbuf_sg(sc->vtnet_tx_dmat, dmap, m, - segs, &nsegs, BUS_DMA_NOWAIT); - if (error != 0) - goto fail_dmamap_destroy; - KASSERT(nsegs <= sc->vtnet_tx_nsegs, - ("%s: unexpected number of DMA segments for tx buffer: %d (max %d)", - __func__, nsegs, sc->vtnet_tx_nsegs)); - - bus_dmamap_sync(sc->vtnet_tx_dmat, dmap, BUS_DMASYNC_PREWRITE); - - for (i = 0; i < nsegs && !error; i++) - error = sglist_append_phys(sg, segs[i].ds_addr, - segs[i].ds_len); - + error = sglist_append_mbuf(sg, m); if (error) - goto fail_dmamap_unload; + goto fail; } txhdr->vth_mbuf = m; - txhdr->dmap = dmap; - txhdr->hdr_dmap = hdr_dmap; - error = virtqueue_enqueue(vq, txhdr, sg, sg->sg_nseg, 0); return (error); -fail_dmamap_unload: - bus_dmamap_unload(sc->vtnet_tx_dmat, dmap); -fail_dmamap_destroy: - bus_dmamap_destroy(sc->vtnet_tx_dmat, dmap); -fail_hdr_dmamap_unload: - bus_dmamap_unload(sc->vtnet_tx_dmat, hdr_dmap); -fail_hdr_dmamap_destroy: - bus_dmamap_destroy(sc->vtnet_tx_dmat, hdr_dmap); fail: m_freem(*m_head); *m_head = NULL; diff --git a/sys/dev/virtio/network/if_vtnetvar.h b/sys/dev/virtio/network/if_vtnetvar.h index 6cafe827d733..eb5e6784b07f 100644 --- a/sys/dev/virtio/network/if_vtnetvar.h +++ b/sys/dev/virtio/network/if_vtnetvar.h @@ -190,12 +190,6 @@ struct vtnet_softc { struct mtx vtnet_mtx; char vtnet_mtx_name[16]; uint8_t vtnet_hwaddr[ETHER_ADDR_LEN]; - - bus_dma_tag_t vtnet_rx_dmat; - struct mtx vtnet_rx_mtx; - - bus_dma_tag_t vtnet_tx_dmat; - struct mtx vtnet_tx_mtx; }; /* vtnet flag descriptions for use with printf(9) %b identifier. */ #define VTNET_FLAGS_BITS \ @@ -279,10 +273,6 @@ struct vtnet_tx_header { } vth_uhdr; struct mbuf *vth_mbuf; - - bus_dmamap_t dmap; - - bus_dmamap_t hdr_dmap; }; /* From nobody Tue May 5 13:41:05 2026 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 4g905t20v1z6c7D3 for ; Tue, 05 May 2026 13:41:06 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g905s6tNtz3MXm for ; Tue, 05 May 2026 13:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777988466; 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=DDICFmOAKbGJMebl9e0mqBBfMn0Y67uMEaxyrDZ9YEY=; b=gwLnLwKX6LSpss/xq/ZKE/ymXDItTijtWBXQyfklHt46cQRher7XfxYic73PMV+J5gG67y d0XHmuBULZ5pepoIxoEHE4cYfwuVCfCPo/XQVnXLXXOxFAzmeriidJ29bK1VtifNDRVC3Q /zwHhdA1UwHUC5+YA4oQV62hZjjzvkk03TszyaKbZlEA3MA6Df+/Q6y10MHHGArhn6sZ7n qg72tPCLqiR6rpw5E/LHlwlAyybMdZst8pRovBDY9VnvpeJk6XKJsE7cMzm8YhhFhf5FJv JXaDvYYQXlOISI73UD0Kfmn1uNkL7u3rg/Yjfv+aLUYLFYbhNgqpGGojm3MvZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777988466; a=rsa-sha256; cv=none; b=VT8F50AXgMpSe0M9s0CnvRzcN40AgjFzaf98oG8qo1NPkwsqcZdN+8P356LCVF8uJAkFhC kOh6BhXyeYaSnhLvSfSQp4j6+ifVEeJwuLVD44m9BbECY8kndc4TowUJuHA/CPeUE/dNH3 EwmroVYcyM8FaVwAvim+CFTTz+dZNf9s8nxPBI7QLqf+OOM/1ugdrJDlX3M3a40fpc3WNf cmreoowFnGKuul4/M6z6wap/3yOIa9VS+zrIXZg5asT5zXVT7X3lRvsihdKxqIEibwwrBX 5Utu+fu0vnPv0PPZN6DUM6sLP5/ysNffYfbPwB3cksnKVyt/VFV43oZAgw5wiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777988466; 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=DDICFmOAKbGJMebl9e0mqBBfMn0Y67uMEaxyrDZ9YEY=; b=XinlraB2lHvBXCTh4/QDWsQMNtc8+/ZdOxAPyPV1Oi+jB62ZjYb7RjMcautOTMO4LMuAbl fgg9Ni5EBapVqdsqbuYWTq2aan1R/C11TJkBVgsqcsoNZRKftCzIFFOAQD+ZRrIwYimEtn c529SzLzJ1JrBzKneifnEXU4ibyErYXweONlgjr4UayVGYt3UonNoYa45enWlV2a1VUOqQ ewVCOz7MP5Q3Wu1ji12NYbs+LGd2FHHSswmRpDMV4Coz8uxuc0y6yMWNy7+1eo8hhIkkfu ZpPb59apnn80kIEIB6v4W9HViDk9deDsg9EIJvbqyZ0L1dJdsmG0QLKrBaA4oA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g905s6Qwrz181n for ; Tue, 05 May 2026 13:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4348c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 13:41:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 9f2ad7c09709 - main - init: allow to specify a custom path for rc(8) 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f2ad7c09709e01ff6b856df0315e91ddc20df32 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 13:41:05 +0000 Message-Id: <69f9f371.4348c.7e92a692@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=9f2ad7c09709e01ff6b856df0315e91ddc20df32 commit 9f2ad7c09709e01ff6b856df0315e91ddc20df32 Author: Baptiste Daroussin AuthorDate: 2026-05-05 12:00:41 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-05 13:39:58 +0000 init: allow to specify a custom path for rc(8) This is useful for testing alternative service managers without modifying /etc/rc MFC After: 1 weeks Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56828 --- sbin/init/init.8 | 10 +++++++++- sbin/init/init.c | 18 +++++++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/sbin/init/init.8 b/sbin/init/init.8 index 85b1db2ddf06..f562efde0b51 100644 --- a/sbin/init/init.8 +++ b/sbin/init/init.8 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 22, 2021 +.Dd May 5, 2026 .Dt INIT 8 .Os .Sh NAME @@ -396,6 +396,14 @@ back to the default, so that the .Pa /etc/rc script is executed with the standard shell .Pa /bin/sh . +.It Va init_rc +If set to a valid file name in the root file system, +overrides the default path to +.Xr rc 8 +.Pq Pa /etc/rc . +This is useful for testing alternative service managers +without modifying the default +.Pa /etc/rc . .It Va init_path Specifies the path used to search for the init binary. More than one binary can be listed in the string, diff --git a/sbin/init/init.c b/sbin/init/init.c index d28501053c7f..db680c7f73bd 100644 --- a/sbin/init/init.c +++ b/sbin/init/init.c @@ -1025,11 +1025,23 @@ static state_func_t runcom(void) { state_func_t next_transition; + char runcom_path[PATH_MAX]; + const char *rc_script; - BOOTTRACE("/etc/rc starting..."); - if ((next_transition = run_script(_PATH_RUNCOM)) != NULL) + /* + * Allow overriding /etc/rc via the init_rc kenv variable. + * This is useful for testing alternative service managers + * without modifying /etc/rc. + */ + if (kenv(KENV_GET, "init_rc", runcom_path, sizeof(runcom_path)) > 0) + rc_script = runcom_path; + else + rc_script = _PATH_RUNCOM; + + BOOTTRACE("%s starting...", rc_script); + if ((next_transition = run_script(rc_script)) != NULL) return next_transition; - BOOTTRACE("/etc/rc finished"); + BOOTTRACE("%s finished", rc_script); runcom_mode = AUTOBOOT; /* the default */ return (state_func_t) read_ttys; From nobody Tue May 5 15:23:04 2026 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 4g92MX1hMTz6cHgM for ; Tue, 05 May 2026 15:23:04 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g92MX0xFQz3jBt for ; Tue, 05 May 2026 15:23:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777994584; 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=o8GjDI3ZCe4hyBsInjd2g2AEqFdoQk/vboaElId5ZTc=; b=mhaW2E0UQ8pzpkFx91OhxLYJWfiVk9Jh2OI4O9rBv/1Tbj6LjYrDUl9AdD8gcOJ6JBDuu9 OsJdBqdQiSROgqw0VnzHfnyeDHU6v77DZ/aRsvIliQG4TUn15jp710YyiMjy4vtBZjlsu4 OBdEwn/11NdIZ1bVekd5KTwZYjPV0Pg90NFblRGPGiFRMYAH/0lDqoPKfELtpTFMoXD3ZL uTQpzrI3ZJyf9erXVsFCiCIoEZgGr1nft1NF4dkwKmcrzA9E+hnEEeEn/Th3TLE5tYMzSl 5qdpJhNTJ1bVpV+LGpAQBaePz/Cs9pASVGiV0rr4ob8p6hzn0ZyQV0RgM3gu1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777994584; a=rsa-sha256; cv=none; b=g2ZehxFZ/hnY9c5CoKfaC+svllRhZH2jJvxrOQ5omPP7pAj0ihN4gILxHxVGWLnFIfwvEy IjgN5aIaAKYFD3a5onvrQDShZTdvFxGd26xlPY+8Lh4daWhTUadQF1PlwqCVDaRd+E+eFq N8xag62DfbrD6Fbyo6ZfmnZrXxEN0MaUzxFmfbJSU5HTfQsF+lC33XyZ6Iw6RBIkPSmdmM aB9VrNH0rxowxGskeRS+Q4yCri763LZXWg+gvU2RIHFwR3EVWNNTCXwUdZrYK5l6jbQkbp pDJy0ULo8HI60eN9zbcyTZVSYpnLJt3o65hLuBmufoKxB8JAPQHZyjLwsCgERA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777994584; 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=o8GjDI3ZCe4hyBsInjd2g2AEqFdoQk/vboaElId5ZTc=; b=j8Np8GOSjBJmPLdIbpepCOAUhMpyWIcJezwJzWt0ZyavUsaTVl06e1QjfkljKD+hktUffH HtyoO/cL+zhnI/zysZJfygmM/Rb+gK5sAUVh1LRBFLAg0mDfHKnG5z2it76OpumtRrUL2s Hru9YOTddmtW81XdQEs70uiD/9iyaIerL/gOhCmvRWqNrhbAhFLmhH6JIcWLyR/MmfB2JM 2Eb4vvGgKZX7r7YYrBFdyKNRJSKc+Los7vGVtjTBUa8J5vSdqQX6jtn638re0MCZdGxPkF fjGy01F+LlwVbf8eZESrOsUeORo5PWcI0XldGXXtXZx1eZilZsE1noXLtD+LOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g92MX0V8Qz1C95 for ; Tue, 05 May 2026 15:23:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e127 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 15:23:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 261002908ffd - main - libusb: Add libusb_endpoint_transfer_type enum 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 261002908ffd9f13d19d1c6be6f82edac26b6938 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 15:23:04 +0000 Message-Id: <69fa0b58.1e127.63724f28@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=261002908ffd9f13d19d1c6be6f82edac26b6938 commit 261002908ffd9f13d19d1c6be6f82edac26b6938 Author: ShengYi Hung AuthorDate: 2026-05-05 14:39:29 +0000 Commit: ShengYi Hung CommitDate: 2026-05-05 15:22:47 +0000 libusb: Add libusb_endpoint_transfer_type enum MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- lib/libusb/libusb.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h index 623b56fb273b..46a2ed5eb8a6 100644 --- a/lib/libusb/libusb.h +++ b/lib/libusb/libusb.h @@ -119,6 +119,13 @@ enum libusb_endpoint_direction { #define LIBUSB_TRANSFER_TYPE_MASK 0x03 +enum libusb_endpoint_transfer_type { + LIBUSB_ENDPOINT_TRANSFER_TYPE_CONTROL = 0, + LIBUSB_ENDPOINT_TRANSFER_TYPE_ISOCHRONOUS = 1, + LIBUSB_ENDPOINT_TRANSFER_TYPE_BULK = 2, + LIBUSB_ENDPOINT_TRANSFER_TYPE_INTERRUPT = 3, +}; + enum libusb_transfer_type { LIBUSB_TRANSFER_TYPE_CONTROL = 0, LIBUSB_TRANSFER_TYPE_ISOCHRONOUS = 1, From nobody Tue May 5 15:26:59 2026 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 4g92S32wmfz6cJ3C for ; Tue, 05 May 2026 15:26:59 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g92S321N4z3jj8 for ; Tue, 05 May 2026 15:26:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777994819; 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=1yQggwSnSstC+QjvvNDCe+1+276N/sU1pCH/jrxFHTM=; b=ZEYX29HuQEFgeFth8LrqgQLTM4cMPkTi0WEAtmde+95XHk6He0uC1dp3ZNqwQgSb014+1N ddCY6hBNinwQaLfFQ2iAuiV59Z0GfXWtBYT8YeRWii5RyaFUAgYYHJNgh5wP53ayg69yyJ Y0ascO4ov5jdIYlVPBzLGKbmqcqRr8oisi2RUoVjWvrGCSH9XJRmDrn4dzH0MGtGY7vv3w knkR7j+vXtn5XAoZcQO0zuCrEBvwqDO2lwlcrANWyW3C+yw3t2PJE1UvDLpduC1FUZMgwJ WaB5VZy2oAmY9mNhwzbUJGJXDYD4ldvUB9l5wLD48+5XxlMKPUb4TW6vZJqxcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777994819; a=rsa-sha256; cv=none; b=oPhP+qZS5iBRHpU37roRdP77ezQg+h7qNR1mDeOLgCulyomloJo51CBro4UaAlDzUoxOBP WBLgafRI7ml40c7kwWhe/+9Q5J3WzDtdkxznHBhxSQQ9yUEDeB+cmqNaYJDotoKB9efRyi Chi9jN9xP8H0YJzHbLq25mxZoAgGicXA6tUmDqV7lXhp2moIkHkupdkgRhotU/MPPaS6FB iyhmB2trV7Qb1JQ8kksXcAoYI0f/qxd5WmQVGqejvXjJMH35vxg9u4f9G6PxmLJjqaNZub hfFe7+2qCwP/NCV3UoU2R/ufuB5RIfULhlx/JLtbQYLmjcJQ3wvHIb+APryaNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777994819; 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=1yQggwSnSstC+QjvvNDCe+1+276N/sU1pCH/jrxFHTM=; b=UrDzxpsElazbqKAgIWWcEtA8kWADgHZmKR+l5BjgJSo/BYIWgco3/7/yjYy+dbHVnQX32Q zQGO41NaHssefUtTYavBTzYvjHWdEKCbxUfdJDT8Jsl8dp9/QEOLcVRc0bvpXTONfzNUgc auoARJ2IqG7iUJhHEGsokVmwS1s0tu5G+ikR9ddAR9AjzzPOiviOkYfmkTjVQ5DQus69zX Rvx7C0t9jVv0VcAMdp+gQnNvaheTCL4tQ8BODrt3iOiwoNTsnmxQsPySXZFkP+myUhjEzl K0Vi/3Dm8BXX/FmSiZqHHaoss5Ievr1wb5srlfcujVAJsw1FOdeSXdz5BJQCbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g92S31RyZz1CNW for ; Tue, 05 May 2026 15:26:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e813 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 15:26:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: efc0ced5c46f - main - ath{10,11,12}k: Add missing header in Makefile 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efc0ced5c46f3332bf1847f2889659e7f5412852 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 15:26:59 +0000 Message-Id: <69fa0c43.1e813.2e5c61c6@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=efc0ced5c46f3332bf1847f2889659e7f5412852 commit efc0ced5c46f3332bf1847f2889659e7f5412852 Author: ShengYi Hung AuthorDate: 2026-04-28 14:27:21 +0000 Commit: ShengYi Hung CommitDate: 2026-05-05 15:26:48 +0000 ath{10,11,12}k: Add missing header in Makefile Reviewed by: bz MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56693 --- sys/modules/ath10k/Makefile | 2 ++ sys/modules/ath11k/Makefile | 2 ++ sys/modules/ath12k/Makefile | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sys/modules/ath10k/Makefile b/sys/modules/ath10k/Makefile index b28df768c3d5..becf42a6a79a 100644 --- a/sys/modules/ath10k/Makefile +++ b/sys/modules/ath10k/Makefile @@ -1,3 +1,5 @@ +.include + DEVATH10KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath10k .PATH: ${DEVATH10KDIR} diff --git a/sys/modules/ath11k/Makefile b/sys/modules/ath11k/Makefile index a2f0064c2ae9..eaf196af5b55 100644 --- a/sys/modules/ath11k/Makefile +++ b/sys/modules/ath11k/Makefile @@ -1,3 +1,5 @@ +.include + DEVATH11KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath11k .PATH: ${DEVATH11KDIR} diff --git a/sys/modules/ath12k/Makefile b/sys/modules/ath12k/Makefile index ecca0bc3b409..071bb88a8b37 100644 --- a/sys/modules/ath12k/Makefile +++ b/sys/modules/ath12k/Makefile @@ -1,3 +1,5 @@ +.include + DEVATH12KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath12k .PATH: ${DEVATH12KDIR} From nobody Tue May 5 15:48:44 2026 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 4g92x85CRCz6cKYK for ; Tue, 05 May 2026 15:48:44 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g92x84bMVz3mhF for ; Tue, 05 May 2026 15:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777996124; 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=7TM53kVeIKjv1fMaRkZbKGfxAGApDLYrUVnrhIvJx6w=; b=Nkg+B6VlDrmu60QOSk3xawDwGLwRmElI1gah7jct/Ml9cbNjkjcsB+OtnXErlNKRdzi8rZ kHvpmT+8qiYPuzDXJWbxkoBigXVGhgx8+siG4WtCSNLkI3lT8aiPP5KtVBYOKCGQ+aDt5k pcbMbXryBEUxa09MnlCIeuIBqwGcXhXaFkmMXDrgsPj4X1Mlv1H5DkZYDZP6NYHw7//PEp VO7D5jltpJOaJfTw6AGD+zWHGzVLAj9cUX2hS6ZTf4rGkzqodwsAFYPl/be87fbvYZ4bDr +pWO1Xcb91qwJP0JoYXN4R3fXJRXqO8K5icxSPO10ZvK4EQFB/BNsiPYk9I5dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777996124; a=rsa-sha256; cv=none; b=qB2mfYJgjRYAfAG8Kz7I0HTn3zRnn7iKANK/CtVJ+otO8SCCYFq2YaMzz8Dt1y1CxnSwVa ioh5zcNUS9GxVcCVcYw9sEqH0t4IzCl3J02MdTHlGH/KQyfXFzOPcyc/JJwtFJKrGkESaP zTNuavc6H3nrxp5NmPYagArG01BlUoAqj2MvlBHLovAx1F52CgS6KLFQxTGRpFvu3qOtW1 5OZn9loAM7u7l0BP+F4mPQBiYd2I1/jHtuNWCxLNBsSZH7jInIEES0I50E3iycgwOcKQb2 7hzbKFIqhNm/21eiTxJ46vpaX7pR/f2UdGXUwefkyW5yQ0h3u06cncH/T+roMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777996124; 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=7TM53kVeIKjv1fMaRkZbKGfxAGApDLYrUVnrhIvJx6w=; b=rHvJmVb6ebBa7SOyPoLhSqQ2Fyg3MZHgssTmt1qdK0nYpOlYD5xPHqaGSaNdHutHRTfSsn zKDrO5TI8vblsOERvdWbHs7IVC88Ys1B6JNKxFzD18M1cZjpbikDt9/SredGZmRqGPXnn9 BlMkgEaPsCIdcNaEx3BdfmTrO/GHKvTx7BxtKnM5CLJROXMy10v8nc3Hp6ZyT9PkOH89fq IEyRCICPiQglDWcuMi7s8GL+5Ql4AMoYAsKZootWV+SkBS5QXA/dRTQKhcRKBmBDJU9+s0 MeD/9NNC6FZoZHlhl5EC8QAkmnFnI9A+zailwiz1gh7am24CubpG2UbK9UC1rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g92x848Yfz1CRZ for ; Tue, 05 May 2026 15:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eae4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 15:48:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: ce9ced951a0b - main - libusb: change callback register handler to int 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce9ced951a0b9d004a3b007d4ac6e9087a1301a2 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 15:48:44 +0000 Message-Id: <69fa115c.1eae4.306694d3@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=ce9ced951a0b9d004a3b007d4ac6e9087a1301a2 commit ce9ced951a0b9d004a3b007d4ac6e9087a1301a2 Author: ShengYi Hung AuthorDate: 2025-12-13 15:12:11 +0000 Commit: ShengYi Hung CommitDate: 2026-05-05 15:48:22 +0000 libusb: change callback register handler to int libusb upstream uses int for register handler. This causes some library user (like pyusb) to assume that we have int in all implementations and therefore provides a 4 byte storage only. This causes Segmentation fault as we will right the pointer. Reviewed by: adrian Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54211 --- lib/libusb/libusb.h | 5 ++--- lib/libusb/libusb10.c | 1 + lib/libusb/libusb10.h | 2 ++ lib/libusb/libusb10_hotplug.c | 50 +++++++++++++++++++++++++++---------------- 4 files changed, 37 insertions(+), 21 deletions(-) diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h index 46a2ed5eb8a6..ec60ce336e5a 100644 --- a/lib/libusb/libusb.h +++ b/lib/libusb/libusb.h @@ -293,7 +293,6 @@ struct libusb_context; struct libusb_device; struct libusb_transfer; struct libusb_device_handle; -struct libusb_hotplug_callback_handle_struct; struct libusb_pollfd { int fd; @@ -322,7 +321,7 @@ typedef struct libusb_device_handle libusb_device_handle; typedef struct libusb_pollfd libusb_pollfd; typedef void (*libusb_pollfd_added_cb) (int fd, short events, void *user_data); typedef void (*libusb_pollfd_removed_cb) (int fd, void *user_data); -typedef struct libusb_hotplug_callback_handle_struct *libusb_hotplug_callback_handle; +typedef int libusb_hotplug_callback_handle; typedef struct libusb_device_descriptor { uint8_t bLength; @@ -632,7 +631,7 @@ typedef int (*libusb_hotplug_callback_fn)(libusb_context *ctx, libusb_device *device, libusb_hotplug_event event, void *user_data); int libusb_hotplug_register_callback(libusb_context *ctx, libusb_hotplug_event events, libusb_hotplug_flag flags, int vendor_id, int product_id, int dev_class, libusb_hotplug_callback_fn cb_fn, void *user_data, libusb_hotplug_callback_handle *handle); -void libusb_hotplug_deregister_callback(libusb_context *ctx, libusb_hotplug_callback_handle handle); +void libusb_hotplug_deregister_callback(libusb_context *ctx, libusb_hotplug_callback_handle callback_handle); void *libusb_hotplug_get_user_data(struct libusb_context *ctx, libusb_hotplug_callback_handle callback_handle); diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c index b3af017ab980..08e40541a907 100644 --- a/lib/libusb/libusb10.c +++ b/lib/libusb/libusb10.c @@ -205,6 +205,7 @@ libusb_init_context(libusb_context **context, memset(ctx, 0, sizeof(*ctx)); ctx->devd_pipe = -1; + ctx->next_callback_id = 1; debug = getenv("LIBUSB_DEBUG"); if (debug != NULL) { diff --git a/lib/libusb/libusb10.h b/lib/libusb/libusb10.h index eced364ef857..354ff003de3e 100644 --- a/lib/libusb/libusb10.h +++ b/lib/libusb/libusb10.h @@ -80,6 +80,7 @@ struct libusb_hotplug_callback_handle_struct { int devclass; libusb_hotplug_callback_fn fn; void *user_data; + int id; }; TAILQ_HEAD(libusb_device_head, libusb_device); @@ -118,6 +119,7 @@ struct libusb_context { libusb_pollfd_added_cb fd_added_cb; libusb_pollfd_removed_cb fd_removed_cb; void *fd_cb_user_data; + int next_callback_id; }; struct libusb_device { diff --git a/lib/libusb/libusb10_hotplug.c b/lib/libusb/libusb10_hotplug.c index 359c818b5720..fd979fd4db14 100644 --- a/lib/libusb/libusb10_hotplug.c +++ b/lib/libusb/libusb10_hotplug.c @@ -176,8 +176,9 @@ libusb_hotplug_equal(libusb_device *_adev, libusb_device *_bdev) } static int -libusb_hotplug_filter(libusb_context *ctx, libusb_hotplug_callback_handle pcbh, - libusb_device *dev, libusb_hotplug_event event) +libusb_hotplug_filter(libusb_context *ctx, + struct libusb_hotplug_callback_handle_struct *pcbh, libusb_device *dev, + libusb_hotplug_event event) { if (!(pcbh->events & event)) return (0); @@ -216,8 +217,7 @@ libusb_hotplug_scan(void *arg) { struct pollfd pfd; struct libusb_device_head hotplug_devs; - libusb_hotplug_callback_handle acbh; - libusb_hotplug_callback_handle bcbh; + struct libusb_hotplug_callback_handle_struct *acbh, *bcbh; libusb_context *ctx = arg; libusb_device *temp; libusb_device *adev; @@ -343,7 +343,7 @@ int libusb_hotplug_register_callback(libusb_context *ctx, libusb_hotplug_callback_fn cb_fn, void *user_data, libusb_hotplug_callback_handle *phandle) { - libusb_hotplug_callback_handle handle; + struct libusb_hotplug_callback_handle_struct *handle; struct libusb_device *adev; ctx = GET_CONTEXT(ctx); @@ -365,6 +365,17 @@ int libusb_hotplug_register_callback(libusb_context *ctx, if (handle == NULL) return (LIBUSB_ERROR_NO_MEM); + handle->events = events; + handle->vendor = vendor_id; + handle->product = product_id; + handle->devclass = dev_class; + handle->fn = cb_fn; + handle->user_data = user_data; + CTX_LOCK(ctx); + if ((handle->id = ctx->next_callback_id++) < 0) + handle->id = ctx->next_callback_id = 1; + CTX_UNLOCK(ctx); + HOTPLUG_LOCK(ctx); if (ctx->hotplug_handler == NO_THREAD) { libusb_hotplug_enumerate(ctx, &ctx->hotplug_devs); @@ -373,12 +384,6 @@ int libusb_hotplug_register_callback(libusb_context *ctx, &libusb_hotplug_scan, ctx) != 0) ctx->hotplug_handler = NO_THREAD; } - handle->events = events; - handle->vendor = vendor_id; - handle->product = product_id; - handle->devclass = dev_class; - handle->fn = cb_fn; - handle->user_data = user_data; if (flags & LIBUSB_HOTPLUG_ENUMERATE) { TAILQ_FOREACH(adev, &ctx->hotplug_devs, hotplug_entry) { @@ -395,23 +400,32 @@ int libusb_hotplug_register_callback(libusb_context *ctx, HOTPLUG_UNLOCK(ctx); if (phandle != NULL) - *phandle = handle; + *phandle = handle->id; return (LIBUSB_SUCCESS); } void libusb_hotplug_deregister_callback(libusb_context *ctx, - libusb_hotplug_callback_handle handle) + libusb_hotplug_callback_handle callback_handle) { - ctx = GET_CONTEXT(ctx); + struct libusb_hotplug_callback_handle_struct *handle; - if (ctx == NULL || handle == NULL) + ctx = GET_CONTEXT(ctx); + + if (ctx == NULL || callback_handle == 0) return; HOTPLUG_LOCK(ctx); + TAILQ_FOREACH(handle, &ctx->hotplug_cbh, entry) { + if (handle->id == callback_handle) + break; + } + if (handle == NULL) + goto clean; TAILQ_REMOVE(&ctx->hotplug_cbh, handle, entry); libusb_interrupt_event_handler(ctx); - HOTPLUG_UNLOCK(ctx); +clean: + HOTPLUG_UNLOCK(ctx); free(handle); } @@ -419,13 +433,13 @@ void * libusb_hotplug_get_user_data(struct libusb_context *ctx, libusb_hotplug_callback_handle callback_handle) { - libusb_hotplug_callback_handle handle; + struct libusb_hotplug_callback_handle_struct *handle; ctx = GET_CONTEXT(ctx); HOTPLUG_LOCK(ctx); TAILQ_FOREACH(handle, &ctx->hotplug_cbh, entry) { - if (handle == callback_handle) + if (handle->id == callback_handle) break; } HOTPLUG_UNLOCK(ctx); From nobody Tue May 5 15:52:55 2026 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 4g93235N5Cz6cKlN; Tue, 05 May 2026 15:52:59 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g93234gKpz3nMQ; Tue, 05 May 2026 15:52:59 +0000 (UTC) (envelope-from bapt@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777996379; 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: in-reply-to:in-reply-to:references:references; bh=t3pjM6V1LGv6cLRXonY/EVHpWPFIwY0QXJVwMX9Yffk=; b=L67Hcp/MPb2bELCBFtpsb2ONIgn9yaYUzh5E7vvqhf0ejYb0mPIkkzXz/OgQMK/SxoD8FH /EmajafiRsF2Dakhq3HCxtua94go6IIsHjZPsUhoGMfS7VFeFigKfWqaFPyTkBeRLNPN8N aR11TLht3MG307MkJbml0aE0c2cvKz43UyJM7rYOyuMf/HsWAeitBdJqJbNxIocIog5Zwr SBJohaIPWK5sH0ws8AFytD+Bbo0rd/91iu0IMpwGSrF9qSt+WYldkKhcWIj6/TrvA8DVet YdFK784Q5cV6WVAAxzyJChLRSmlYMgz7AiQjIFOZpKSWpetilBwbSD2+3ONOVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777996379; a=rsa-sha256; cv=none; b=hgInyUvQKCZ6++sTXizgaz59811frEeVV57qp9xbXkUj/r+zdU0cp9xdiL3cRU/L80EMHw vq8MkpDFQPh21OOdh+ShQtWCY6L7AS3sdn7qOcPjKJWRv5lKLhaPzLmo0FUbsurJqQAJKR aGO+bvHCtJ5Hd6aigSFTISokwd0R5GOlZsZtWed5t3I0pkguaaYklB9Xz0LgkvJc0V9hAz u3zkd3HjPQ7yoCSPETAevtzoSU2Ura3V/JKUPu6nPWBY8gE4eA2n1Jezx2k0ENPF6caTQE IMWCyaRmW3PiTyO6d0qjbyDhDl8aCQVRLcluOZ92WhuB5u+EHPmQVN8J0SR00A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777996379; 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: in-reply-to:in-reply-to:references:references; bh=t3pjM6V1LGv6cLRXonY/EVHpWPFIwY0QXJVwMX9Yffk=; b=bWk1ASaZgINCEamYNwm0vm8wmX38pxVjLziQ69VTBCMwvv7P+yUje9OXwXgWHV1NTNvSd0 I1CErmg6GDCn1nMsmTlH0LlU3ipGC4yqPjjEylMkealhIatwbGJl7eCS7qkI6LbwaQNvls sNWR3U3IvrwCDNaKGTCjPEmOmWTad3yubZ95/+9ql4tItyVaVrNed0UJ3kDTls7IFtOlw0 bSTaGaTz7DR5yC75EH/a6DjQw/v5pBPUHlBBaWePZsK6whzfnkzpr1NlrHNJYjpDmSrWiN Yq+AaeSCcwLKJLUXpZUWbcZ2VtS1leB5VW217Lf24n3BzXt7pbN070DX9FEd/A== Received: from b.nours.eu (b.nours.eu [IPv6:2001:41d0:303:5e39::1]) (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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4g93233d42z2Jc; Tue, 05 May 2026 15:52:59 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by b.nours.eu (Postfix, from userid 1001) id 56C86416CD; Tue, 05 May 2026 17:52:55 +0200 (CEST) Date: Tue, 5 May 2026 17:52:55 +0200 From: Baptiste Daroussin To: ShengYi Hung Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: ce9ced951a0b - main - libusb: change callback register handler to int Message-ID: References: <69fa115c.1eae4.306694d3@gitrepo.freebsd.org> 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <69fa115c.1eae4.306694d3@gitrepo.freebsd.org> On Tue 05 May 15:48, ShengYi Hung wrote: > The branch main has been updated by aokblast: > > URL: https://cgit.FreeBSD.org/src/commit/?id=ce9ced951a0b9d004a3b007d4ac6e9087a1301a2 > > commit ce9ced951a0b9d004a3b007d4ac6e9087a1301a2 > Author: ShengYi Hung > AuthorDate: 2025-12-13 15:12:11 +0000 > Commit: ShengYi Hung > CommitDate: 2026-05-05 15:48:22 +0000 > > libusb: change callback register handler to int > > libusb upstream uses int for register handler. This causes some library > user (like pyusb) to assume that we have int in all implementations and > therefore provides a 4 byte storage only. This causes Segmentation > fault as we will right the pointer. > > Reviewed by: adrian > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D54211 This breaks backward compatibility this is why I did: https://reviews.freebsd.org/D55686 https://reviews.freebsd.org/D55687 sorry I didn't catchup on it, and sorry I missed you version of the patch. we don't know if we don't have users relying on the previous ABI imho this should go via symbol versioning and then backward compat. Best regards, Bapt From nobody Tue May 5 15:59:01 2026 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 4g93913jg5z6cLTt for ; Tue, 05 May 2026 15:59:01 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g93912ddVz3ntt for ; Tue, 05 May 2026 15:59:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777996741; 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=R79P2SiznHVf/N3pJIEuK9NKLgtCUhWAmXQRjH3nkvY=; b=bAsRcVc14q1HR8AdL/xiOsTACEGlmLFNfVSMi5eB2fPL8q3tuf9Ap7KDQno9bnruIdH65k HgLQYYveUW3NUmqsKIQH7TN159ra7jYfv1iPKh0R1JElU7TIUV3PkH28FqK/txMDxUoi8Z 6OToq6q9xyX+qLQUg5T2hv2zA5jarcPtFSzMIHn9WhLjQZ9w2knFYNfcnLNO/CVKudelTY LJVpvcOszu3a1gVGvhv/95tt12tTgLRrkCUvr1ZYFKkznNaUSkiemwjyssMVDNzNGEgwD4 A+yzx/cHvL5tW3OiDTfugHZLa0tn5eDvvfQ6MAWRYx+DqiZrxnfLlnggUHH5Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777996741; a=rsa-sha256; cv=none; b=Yv5vz70oECwdAC4TwxFzrNquD79lFYZtH0pZefJm8iV68io98Sn953gAg0gHk04A2VbFBE LyAPtEjpvwMksnzPkYmr6UV5mXz4E6w1oCI27GboMxEyz0r69LRBsa4o7Nb+R3HaNbNPrO enxWwILEzYJKqiJBWjSLsj6YqQisR0O4b1/SZ0YKeGNy+a76fyvQi18xMl9+twPNxkadXG ON2xp80RifzQsig4BCJuY0clzKw5HHZ8US0pFmelq//JdMf5ImhD3h+OcUjoT2tjHnXAnv Z0CZvCGaLqcA2Y2VCuFIdsAEQ7Z0NVDBycheKI1YLLB6J7NJSGv9PnPEb8pLHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777996741; 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=R79P2SiznHVf/N3pJIEuK9NKLgtCUhWAmXQRjH3nkvY=; b=iyYvcu7/vz2/rrSP0fD7AJslI9C4V3rgl6YKmTegF2DJKuRoO6DI3tkwAS2rnU0QlxCj5x NR2hZ2HYMC8PrJVNrPtbQ19N3foYWICxZYg1Vq2Q2Q3yQ0erd+kKMY09WSG7CSVDFldISX QRydc2WDRdMkuAQGK/LSnuADD0h/g16puR0+5EkyVEuwV7HaueTxAhboaD13UElJ6ml66C Dm1bRXcN939G92aqpTVmk9cW7nI2gmWP6OD6JK0YH9GsXzFygVIRDGm/SR1Kffq7ZSH5Sa loBF7+Vl4mRoQjm/j2lV9/8rX+6V/Yt4zXpt4v/4WDCxT9657hT+r5D6BMqxnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g93911wLyz1D7m for ; Tue, 05 May 2026 15:59:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21791 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 15:59:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 06271366982e - main - libusb: fix incorrect status type when completion on cancel the events 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06271366982eb6fe59502fcdf95a1a22e0671d5f Auto-Submitted: auto-generated Date: Tue, 05 May 2026 15:59:01 +0000 Message-Id: <69fa13c5.21791.68fe6db9@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=06271366982eb6fe59502fcdf95a1a22e0671d5f commit 06271366982eb6fe59502fcdf95a1a22e0671d5f Author: ShengYi Hung AuthorDate: 2025-08-05 09:41:17 +0000 Commit: ShengYi Hung CommitDate: 2026-05-05 15:58:49 +0000 libusb: fix incorrect status type when completion on cancel the events Reviewed by: lwhsu, markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51736 --- lib/libusb/libusb10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c index 08e40541a907..517630900f34 100644 --- a/lib/libusb/libusb10.c +++ b/lib/libusb/libusb10.c @@ -1770,14 +1770,14 @@ libusb10_cancel_all_transfer_locked(struct libusb20_device *pdev, struct libusb_ if (sxfer == NULL) continue; /* complete pending transfer */ - libusb10_complete_transfer(xfer, sxfer, LIBUSB_TRANSFER_ERROR); + libusb10_complete_transfer(xfer, sxfer, LIBUSB_TRANSFER_CANCELLED); } while ((sxfer = TAILQ_FIRST(&dev->tr_head))) { TAILQ_REMOVE(&dev->tr_head, sxfer, entry); /* complete pending transfer */ - libusb10_complete_transfer(NULL, sxfer, LIBUSB_TRANSFER_ERROR); + libusb10_complete_transfer(NULL, sxfer, LIBUSB_TRANSFER_CANCELLED); } } From nobody Tue May 5 16:45:05 2026 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 4g94Bq1Nmkz6bwDY; Tue, 05 May 2026 16:45:39 +0000 (UTC) (envelope-from aokblast@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g94Bq0K5Bz3vPs; Tue, 05 May 2026 16:45:39 +0000 (UTC) (envelope-from aokblast@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777999539; 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: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=Tt1p6vIiP92E0eBwRNQkPMbmD9a/PqiU1fO2NNzxpMk=; b=Zq8Ah9NsAWGGwkpKd4KSkFcN5w9+t/PcfYURd8aPKVrcWxSWA2GDE2H81DfK4A/nX5Oinj zlJgrE16tjJHaAuEW3NEspAqGzg/1ILGBJMsIF15kib9QR/riaGZNS3XfV3f56Vmye7BBT zJYpvPelXP0hgvd07FXJGcZCyOwT8Emnrccc9pkb69KgkX8D9Q1ySIhBiCv1A4awcEK6JA gxIB2XKZC5mV5GJfvR8C/nDJzNLRT+fasFNx9rcpJ2BnYL4PVX9g85LOY1KwmVfyerBrw9 xztvNaaNmmWZtSpy/yG44r9VgUVDTPI3fwF8lZtTjzOVE+9p2cs/K4W7pccFIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777999539; a=rsa-sha256; cv=none; b=dsyAnSvma/5pdDAJYrMu55CkYrr/aanQ+ki4dD2ft9Ax8uUl0fxm28X87lPOSW0/jwZO+9 mSMYlYPeHlBugmiCUHhWFmkP6VUkmqO/ntprKuX80esLma/RMb5yKilBbbMB6zZ4QIgoJ6 CuAzdvbGMQKxdzYHm8aR10QyH9jdSchbbQBURtNFBnYjIJMEEn33HPj+S8XKVPoPOqo/pE Z4VV9yrTWfw2sROYn6ZlApDhDYbnCE7XawMqkldZLC+T3Mzh28lMszoz3ZoYogCd1NiY3s sDLlqJ4rGYb4RRholYsEs5lbwmHND5V3pmbfPuOUMr+aImJTIXj+w4QSHrAbog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777999539; 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: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=Tt1p6vIiP92E0eBwRNQkPMbmD9a/PqiU1fO2NNzxpMk=; b=JzAyJcbaTpBxKAYT4R7SBnT1S/B5gEeqpXYLhrNhl2ludOHxa8LijAKAmsrwjl+cDeztww 0CCBxaBo5IBrxH2+E46oUrykBhzEDzcBCEUAGgOsMtULqNtXeO3xp/q7ZfKDGQBOfuI/+x uUBcziL+3qX6aVn0jbXzh6Pe2rF80ePKuU1P9Qtu7dUYSArYIQ1gw8SAmcP1Zl7lL4bCVI SoxPzHUCXFzljZBdD0b83D7yjZfSZMEoUoFnWpSlFz5e5mmyUjh8bjsJ1fbAxLPMiIiIS9 njkNb+CqKcYtfHVi79w+7Eg0dCbaTbxmxJKsZaccjOwnxRKnHYBzT2AslqlzcQ== Received: from [IPV6:2001:b011:3808:7bbd:bd1d:650b:e094:4fed] (2001-b011-3808-7bbd-bd1d-650b-e094-4fed.dynamic-ip6.hinet.net [IPv6:2001:b011:3808:7bbd:bd1d:650b:e094:4fed]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: aokblast) by smtp.freebsd.org (Postfix) with ESMTPSA id 4g94Bn4qXHz3Ky; Tue, 05 May 2026 16:45:37 +0000 (UTC) (envelope-from aokblast@FreeBSD.org) Message-ID: <9cac5d8a-8dd3-439f-ad8e-6dd082c9843f@FreeBSD.org> Date: Wed, 6 May 2026 00:45:05 +0800 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: ce9ced951a0b - main - libusb: change callback register handler to int To: Baptiste Daroussin Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <69fa115c.1eae4.306694d3@gitrepo.freebsd.org> Content-Language: en-US From: ShengYi Hung Autocrypt: addr=aokblast@FreeBSD.org; keydata= xsDNBGhkuaEBDAD0a1Cu+ntw+v0/ZZnqTewGcd335T5tfktBEt22FsaoBqca7TSp/AvP/bWD 3YtJFlxi7TJQbb2H+ylPzusPaN/R1Sj6wQsRD1Fj+1AjF9EOqxdohXm0SoWs3sRRbMrMGp6q DTQQBMj3TEuSE26gLxmpadtiAsyNDcNCllMSXAZ7xlk+ra9x/pAqOR0TZvObwY8VUncCy6UW UIGmsUF5B7oR2v7i9rFk/3ILkcoIC1k+OlhMbxBpwPLA24Aj8sZX9dzFbwLn2wucqRUzE9Id zrwpQpRHxH0t849VBhLze+zP8s6IUtgKaTUjClmCfZXVVBpFswXJmxgDRo51Ed+X94K2y6FS DRMxwiz18vnJNWlB+aHH5wTbgoTKU+zOckXODBowNEEmYpQNVNYJs1nP6tGRmN4YwW5hcNQY dUmFKR44uYdJomcqxkzJjU4rv4NBOdzrQTw+h5gCUdQ5IvBBGTA1enEP1qMhCpwTOfMd53of 17BC3CMFNTu8rburHceMaU0AEQEAAc0jU2hlbmdZaSBIdW5nIDxhb2tibGFzdEBGcmVlQlNE Lm9yZz7CwRcEEwEIAEEWIQSIP4S1lgaPs34UknRfTtfYEmBsYAUCaGS5oQIbAwUJBaOagAUL CQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRBfTtfYEmBsYJKeDAC/aJjRjMM9k9n6uwUW HemoAUGjv5fxkIpHWYCltnZ9KMs+TZXLsUZrv9DxOV4E3ebEn7iMJbOAvIjjVK//qexo6/er 9EZow4e/EQJLIL/0xRDiF4Jg7l1jziAI26P6dyuMNzeHddFg7ALVfE9wPCFqn3QGbHqDVjI/ E9UcxXiwHktndAo1wJXdEq9F8Ufmtj1t9NasTip8ofNgKfWCGhyyZI0kvhvob5darflQMO8Y G61zmSteO5Es8i9sP+lOhwEgsgHl0L/gQtMrOko9Td1iOSMuaP9t3rx7pOnYLdKt+xw8kWnB IW6GNEzp5QVJxmzr4DiyvvuR4SxnYy2tZjzQV4W8njBvw8SmZs0oS40iP8XNAoc91xLBizDn Lne3BDYOMXgm4csmDnJBM8s7Gaoc+WMY+hDP9SKWSqhyJUg8tauVhmPP3sTEXJbHoD0TuXxO SwG9nEdKoeWQCA0XMXQGfYWHKy1qz3spYCFgXHqmF+WBLljqLaeHQsHmvUhUIuTOwM0EaGS5 oQEMAMiauBmqNndH0AaX9cqOCf660X6fj7iidxwPY9pSUBOgZ3c13pRJLiR6xsYnOWm+Dgf2 BbNOz5iEtwx3Msrjw70/LsTJ4FdByUXZPZwujaPZ2SfowLMXXZbEJrPkJ2HeamaDw/Gf5O/p aDtAS3i8sFkKiOHwBX4doaL5Rxy/oqSpYTYL8tBFUWMHHk4ji12P6Pw1aW2H81XzKTae1Tga 8ViuiWzqibbbk5ddHjr/L+6LfTDM00K7WTZVBnW0qsMZJ9PQpt8636cuJx6D3ITXxtg4IzFN z7HOKbPQazSGhaqsbdxKmtwcP2uZEycsX+hPhtoOS2FuF5nWIYRZSzWBxWiOopHdRLL4YfAL MsGhFdnPH/J3G9gyBroiCiq2moRl2OSgo9W6rMxLCm62657zsvCo8p/KxaGq/ynwCAoQ1wHQ aVerJkGMf0n5tLkbNm2SyAbRy3tA/EfbzT0Yufq5gu9zGN/Uxf5hgFO6UqDHrlPeSSz++6m/ OAj3yLIsl2GpDwARAQABwsD8BBgBCAAmFiEEiD+EtZYGj7N+FJJ0X07X2BJgbGAFAmhkuaEC GwwFCQWjmoAACgkQX07X2BJgbGAJswv/dODZRYTWb/Xx8Y/Ei1OXLZIoNxoUHvBVEqO1xR/F JPwYM8TVcihvhCfM5lLhYdY1pkLjXdlGbTKZtvdHWHLvs62jGVjUXij52z1jOurnX2u0x1vq 1zpklWBx4VQhd3sVtcyLNdDYBFi3epVf1NEctToWyfBys6ijtVkhjem3V/l0PI1WtkECzYfP TOA+guf4dmrGSHPOZpCyFwHPRcVI+4puva4s4tjCAYa5E56GkICUJLuT1x228iqr5OC8YA7F eOTN94L/GqII6joaX2HIrcpGDybRIhGty+BqXvRIpjp0z5PdDeHiFQFTnBAEnjiATAMDKd7S q8y7Pv8OD/ptOl7Fg5iexCGVoLc3idpo/5T5fEXEaEWcGF9HRUeRTrnqQ9yBnALsqoLLVfou eF5Cl7c3p1pwbdR0iSK9p4x6BDcnrnIE52vRCtCdivyxTNa+zKdjlI6gn7oNsRmOnQbkEXML 9WZi4YnrnITSzpkpCzeQCDI0gqUdsxsbt4Vi73Oq In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------lD7NZBMLf4JtjCf3Pz040EXs" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------lD7NZBMLf4JtjCf3Pz040EXs Content-Type: multipart/mixed; boundary="------------320WRgPxQz0dInaDWD4Q3Tuh"; protected-headers="v1"; hp="clear" Message-ID: <9cac5d8a-8dd3-439f-ad8e-6dd082c9843f@FreeBSD.org> Date: Wed, 6 May 2026 00:45:05 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: ce9ced951a0b - main - libusb: change callback register handler to int To: Baptiste Daroussin Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <69fa115c.1eae4.306694d3@gitrepo.freebsd.org> Content-Language: en-US From: ShengYi Hung Autocrypt: addr=aokblast@FreeBSD.org; keydata= xsDNBGhkuaEBDAD0a1Cu+ntw+v0/ZZnqTewGcd335T5tfktBEt22FsaoBqca7TSp/AvP/bWD 3YtJFlxi7TJQbb2H+ylPzusPaN/R1Sj6wQsRD1Fj+1AjF9EOqxdohXm0SoWs3sRRbMrMGp6q DTQQBMj3TEuSE26gLxmpadtiAsyNDcNCllMSXAZ7xlk+ra9x/pAqOR0TZvObwY8VUncCy6UW UIGmsUF5B7oR2v7i9rFk/3ILkcoIC1k+OlhMbxBpwPLA24Aj8sZX9dzFbwLn2wucqRUzE9Id zrwpQpRHxH0t849VBhLze+zP8s6IUtgKaTUjClmCfZXVVBpFswXJmxgDRo51Ed+X94K2y6FS DRMxwiz18vnJNWlB+aHH5wTbgoTKU+zOckXODBowNEEmYpQNVNYJs1nP6tGRmN4YwW5hcNQY dUmFKR44uYdJomcqxkzJjU4rv4NBOdzrQTw+h5gCUdQ5IvBBGTA1enEP1qMhCpwTOfMd53of 17BC3CMFNTu8rburHceMaU0AEQEAAc0jU2hlbmdZaSBIdW5nIDxhb2tibGFzdEBGcmVlQlNE Lm9yZz7CwRcEEwEIAEEWIQSIP4S1lgaPs34UknRfTtfYEmBsYAUCaGS5oQIbAwUJBaOagAUL CQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRBfTtfYEmBsYJKeDAC/aJjRjMM9k9n6uwUW HemoAUGjv5fxkIpHWYCltnZ9KMs+TZXLsUZrv9DxOV4E3ebEn7iMJbOAvIjjVK//qexo6/er 9EZow4e/EQJLIL/0xRDiF4Jg7l1jziAI26P6dyuMNzeHddFg7ALVfE9wPCFqn3QGbHqDVjI/ E9UcxXiwHktndAo1wJXdEq9F8Ufmtj1t9NasTip8ofNgKfWCGhyyZI0kvhvob5darflQMO8Y G61zmSteO5Es8i9sP+lOhwEgsgHl0L/gQtMrOko9Td1iOSMuaP9t3rx7pOnYLdKt+xw8kWnB IW6GNEzp5QVJxmzr4DiyvvuR4SxnYy2tZjzQV4W8njBvw8SmZs0oS40iP8XNAoc91xLBizDn Lne3BDYOMXgm4csmDnJBM8s7Gaoc+WMY+hDP9SKWSqhyJUg8tauVhmPP3sTEXJbHoD0TuXxO SwG9nEdKoeWQCA0XMXQGfYWHKy1qz3spYCFgXHqmF+WBLljqLaeHQsHmvUhUIuTOwM0EaGS5 oQEMAMiauBmqNndH0AaX9cqOCf660X6fj7iidxwPY9pSUBOgZ3c13pRJLiR6xsYnOWm+Dgf2 BbNOz5iEtwx3Msrjw70/LsTJ4FdByUXZPZwujaPZ2SfowLMXXZbEJrPkJ2HeamaDw/Gf5O/p aDtAS3i8sFkKiOHwBX4doaL5Rxy/oqSpYTYL8tBFUWMHHk4ji12P6Pw1aW2H81XzKTae1Tga 8ViuiWzqibbbk5ddHjr/L+6LfTDM00K7WTZVBnW0qsMZJ9PQpt8636cuJx6D3ITXxtg4IzFN z7HOKbPQazSGhaqsbdxKmtwcP2uZEycsX+hPhtoOS2FuF5nWIYRZSzWBxWiOopHdRLL4YfAL MsGhFdnPH/J3G9gyBroiCiq2moRl2OSgo9W6rMxLCm62657zsvCo8p/KxaGq/ynwCAoQ1wHQ aVerJkGMf0n5tLkbNm2SyAbRy3tA/EfbzT0Yufq5gu9zGN/Uxf5hgFO6UqDHrlPeSSz++6m/ OAj3yLIsl2GpDwARAQABwsD8BBgBCAAmFiEEiD+EtZYGj7N+FJJ0X07X2BJgbGAFAmhkuaEC GwwFCQWjmoAACgkQX07X2BJgbGAJswv/dODZRYTWb/Xx8Y/Ei1OXLZIoNxoUHvBVEqO1xR/F JPwYM8TVcihvhCfM5lLhYdY1pkLjXdlGbTKZtvdHWHLvs62jGVjUXij52z1jOurnX2u0x1vq 1zpklWBx4VQhd3sVtcyLNdDYBFi3epVf1NEctToWyfBys6ijtVkhjem3V/l0PI1WtkECzYfP TOA+guf4dmrGSHPOZpCyFwHPRcVI+4puva4s4tjCAYa5E56GkICUJLuT1x228iqr5OC8YA7F eOTN94L/GqII6joaX2HIrcpGDybRIhGty+BqXvRIpjp0z5PdDeHiFQFTnBAEnjiATAMDKd7S q8y7Pv8OD/ptOl7Fg5iexCGVoLc3idpo/5T5fEXEaEWcGF9HRUeRTrnqQ9yBnALsqoLLVfou eF5Cl7c3p1pwbdR0iSK9p4x6BDcnrnIE52vRCtCdivyxTNa+zKdjlI6gn7oNsRmOnQbkEXML 9WZi4YnrnITSzpkpCzeQCDI0gqUdsxsbt4Vi73Oq In-Reply-To: --------------320WRgPxQz0dInaDWD4Q3Tuh Content-Type: multipart/mixed; boundary="------------oYz4z26cJ8KarCUplCoCO5Xu" --------------oYz4z26cJ8KarCUplCoCO5Xu Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 SGkgYmFwdCwNCg0KSSBhbHNvIHRvdGFsbHkgZm9yZ2V0IEkgaGF2ZSByZXBsaWVkIHVuZGVy IHlvdXIgcGF0Y2guIEkgd2lsbCByZXZlcnQgbXkgDQp2ZXJzaW9uIHRvIGFkZHJlc3MgeW91 ciBwcm9ibGVtIGF0IGxlYXN0IGZvciBub3cuDQoNCkJlc3QsDQoNClNoZW5nWWkgSHVuZw0K DQpPbiA1LzUvMjYgMjM6NTIsIEJhcHRpc3RlIERhcm91c3NpbiB3cm90ZToNCj4gT24gVHVl IDA1IE1heSAxNTo0OCwgU2hlbmdZaSBIdW5nIHdyb3RlOg0KPj4gVGhlIGJyYW5jaCBtYWlu IGhhcyBiZWVuIHVwZGF0ZWQgYnkgYW9rYmxhc3Q6DQo+Pg0KPj4gVVJMOiBodHRwczovL2Nn aXQuRnJlZUJTRC5vcmcvc3JjL2NvbW1pdC8/aWQ9Y2U5Y2VkOTUxYTBiOWQwMDRhM2IwMDdk NGFjNmU5MDg3YTEzMDFhMg0KPj4NCj4+IGNvbW1pdCBjZTljZWQ5NTFhMGI5ZDAwNGEzYjAw N2Q0YWM2ZTkwODdhMTMwMWEyDQo+PiBBdXRob3I6ICAgICBTaGVuZ1lpIEh1bmcgPGFva2Js YXN0QEZyZWVCU0Qub3JnPg0KPj4gQXV0aG9yRGF0ZTogMjAyNS0xMi0xMyAxNToxMjoxMSAr MDAwMA0KPj4gQ29tbWl0OiAgICAgU2hlbmdZaSBIdW5nIDxhb2tibGFzdEBGcmVlQlNELm9y Zz4NCj4+IENvbW1pdERhdGU6IDIwMjYtMDUtMDUgMTU6NDg6MjIgKzAwMDANCj4+DQo+PiAg ICAgIGxpYnVzYjogY2hhbmdlIGNhbGxiYWNrIHJlZ2lzdGVyIGhhbmRsZXIgdG8gaW50DQo+ PiAgICAgIA0KPj4gICAgICBsaWJ1c2IgdXBzdHJlYW0gdXNlcyBpbnQgZm9yIHJlZ2lzdGVy IGhhbmRsZXIuIFRoaXMgY2F1c2VzIHNvbWUgbGlicmFyeQ0KPj4gICAgICB1c2VyIChsaWtl IHB5dXNiKSB0byBhc3N1bWUgdGhhdCB3ZSBoYXZlIGludCBpbiBhbGwgaW1wbGVtZW50YXRp b25zIGFuZA0KPj4gICAgICB0aGVyZWZvcmUgcHJvdmlkZXMgYSA0IGJ5dGUgc3RvcmFnZSBv bmx5LiBUaGlzIGNhdXNlcyBTZWdtZW50YXRpb24NCj4+ICAgICAgZmF1bHQgYXMgd2Ugd2ls bCByaWdodCB0aGUgcG9pbnRlci4NCj4+ICAgICAgDQo+PiAgICAgIFJldmlld2VkIGJ5OiAg ICBhZHJpYW4NCj4+ICAgICAgU3BvbnNvcmVkIGJ5OiAgIFRoZSBGcmVlQlNEIEZvdW5kYXRp b24NCj4+ICAgICAgRGlmZmVyZW50aWFsIFJldmlzaW9uOiBodHRwczovL3Jldmlld3MuZnJl ZWJzZC5vcmcvRDU0MjExDQo+IFRoaXMgYnJlYWtzIGJhY2t3YXJkIGNvbXBhdGliaWxpdHkg dGhpcyBpcyB3aHkgSSBkaWQ6DQo+IGMNCj4gaHR0cHM6Ly9yZXZpZXdzLmZyZWVic2Qub3Jn L0Q1NTY4Nw0KPg0KPiBzb3JyeSBJIGRpZG4ndCBjYXRjaHVwIG9uIGl0LCBhbmQgc29ycnkg SSBtaXNzZWQgeW91IHZlcnNpb24gb2YgdGhlIHBhdGNoLg0KPg0KPiB3ZSBkb24ndCBrbm93 IGlmIHdlIGRvbid0IGhhdmUgdXNlcnMgcmVseWluZyBvbiB0aGUgcHJldmlvdXMgQUJJIGlt aG8gdGhpcw0KPiBzaG91bGQgZ28gdmlhIHN5bWJvbCB2ZXJzaW9uaW5nIGFuZCB0aGVuIGJh Y2t3YXJkIGNvbXBhdC4NCj4NCj4gQmVzdCByZWdhcmRzLA0KPiBCYXB0DQo= --------------oYz4z26cJ8KarCUplCoCO5Xu Content-Type: application/pgp-keys; name="OpenPGP_0x5F4ED7D812606C60.asc" Content-Disposition: attachment; filename="OpenPGP_0x5F4ED7D812606C60.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: quoted-printable -----BEGIN PGP PUBLIC KEY BLOCK----- xsDNBGhkuaEBDAD0a1Cu+ntw+v0/ZZnqTewGcd335T5tfktBEt22FsaoBqca7TSp /AvP/bWD3YtJFlxi7TJQbb2H+ylPzusPaN/R1Sj6wQsRD1Fj+1AjF9EOqxdohXm0 SoWs3sRRbMrMGp6qDTQQBMj3TEuSE26gLxmpadtiAsyNDcNCllMSXAZ7xlk+ra9x /pAqOR0TZvObwY8VUncCy6UWUIGmsUF5B7oR2v7i9rFk/3ILkcoIC1k+OlhMbxBp wPLA24Aj8sZX9dzFbwLn2wucqRUzE9IdzrwpQpRHxH0t849VBhLze+zP8s6IUtgK aTUjClmCfZXVVBpFswXJmxgDRo51Ed+X94K2y6FSDRMxwiz18vnJNWlB+aHH5wTb goTKU+zOckXODBowNEEmYpQNVNYJs1nP6tGRmN4YwW5hcNQYdUmFKR44uYdJomcq xkzJjU4rv4NBOdzrQTw+h5gCUdQ5IvBBGTA1enEP1qMhCpwTOfMd53of17BC3CMF NTu8rburHceMaU0AEQEAAc0jU2hlbmdZaSBIdW5nIDxhb2tibGFzdEBGcmVlQlNE Lm9yZz7CwRcEEwEIAEEWIQSIP4S1lgaPs34UknRfTtfYEmBsYAUCaGS5oQIbAwUJ BaOagAULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRBfTtfYEmBsYJKeDAC/ aJjRjMM9k9n6uwUWHemoAUGjv5fxkIpHWYCltnZ9KMs+TZXLsUZrv9DxOV4E3ebE n7iMJbOAvIjjVK//qexo6/er9EZow4e/EQJLIL/0xRDiF4Jg7l1jziAI26P6dyuM NzeHddFg7ALVfE9wPCFqn3QGbHqDVjI/E9UcxXiwHktndAo1wJXdEq9F8Ufmtj1t 9NasTip8ofNgKfWCGhyyZI0kvhvob5darflQMO8YG61zmSteO5Es8i9sP+lOhwEg sgHl0L/gQtMrOko9Td1iOSMuaP9t3rx7pOnYLdKt+xw8kWnBIW6GNEzp5QVJxmzr 4DiyvvuR4SxnYy2tZjzQV4W8njBvw8SmZs0oS40iP8XNAoc91xLBizDnLne3BDYO MXgm4csmDnJBM8s7Gaoc+WMY+hDP9SKWSqhyJUg8tauVhmPP3sTEXJbHoD0TuXxO SwG9nEdKoeWQCA0XMXQGfYWHKy1qz3spYCFgXHqmF+WBLljqLaeHQsHmvUhUIuTO wM0EaGS5oQEMAMiauBmqNndH0AaX9cqOCf660X6fj7iidxwPY9pSUBOgZ3c13pRJ LiR6xsYnOWm+Dgf2BbNOz5iEtwx3Msrjw70/LsTJ4FdByUXZPZwujaPZ2SfowLMX XZbEJrPkJ2HeamaDw/Gf5O/paDtAS3i8sFkKiOHwBX4doaL5Rxy/oqSpYTYL8tBF UWMHHk4ji12P6Pw1aW2H81XzKTae1Tga8ViuiWzqibbbk5ddHjr/L+6LfTDM00K7 WTZVBnW0qsMZJ9PQpt8636cuJx6D3ITXxtg4IzFNz7HOKbPQazSGhaqsbdxKmtwc P2uZEycsX+hPhtoOS2FuF5nWIYRZSzWBxWiOopHdRLL4YfALMsGhFdnPH/J3G9gy BroiCiq2moRl2OSgo9W6rMxLCm62657zsvCo8p/KxaGq/ynwCAoQ1wHQaVerJkGM f0n5tLkbNm2SyAbRy3tA/EfbzT0Yufq5gu9zGN/Uxf5hgFO6UqDHrlPeSSz++6m/ OAj3yLIsl2GpDwARAQABwsD8BBgBCAAmFiEEiD+EtZYGj7N+FJJ0X07X2BJgbGAF AmhkuaECGwwFCQWjmoAACgkQX07X2BJgbGAJswv/dODZRYTWb/Xx8Y/Ei1OXLZIo NxoUHvBVEqO1xR/FJPwYM8TVcihvhCfM5lLhYdY1pkLjXdlGbTKZtvdHWHLvs62j GVjUXij52z1jOurnX2u0x1vq1zpklWBx4VQhd3sVtcyLNdDYBFi3epVf1NEctToW yfBys6ijtVkhjem3V/l0PI1WtkECzYfPTOA+guf4dmrGSHPOZpCyFwHPRcVI+4pu va4s4tjCAYa5E56GkICUJLuT1x228iqr5OC8YA7FeOTN94L/GqII6joaX2HIrcpG DybRIhGty+BqXvRIpjp0z5PdDeHiFQFTnBAEnjiATAMDKd7Sq8y7Pv8OD/ptOl7F g5iexCGVoLc3idpo/5T5fEXEaEWcGF9HRUeRTrnqQ9yBnALsqoLLVfoueF5Cl7c3 p1pwbdR0iSK9p4x6BDcnrnIE52vRCtCdivyxTNa+zKdjlI6gn7oNsRmOnQbkEXML 9WZi4YnrnITSzpkpCzeQCDI0gqUdsxsbt4Vi73Oq =3DVgUx -----END PGP PUBLIC KEY BLOCK----- --------------oYz4z26cJ8KarCUplCoCO5Xu-- --------------320WRgPxQz0dInaDWD4Q3Tuh-- --------------lD7NZBMLf4JtjCf3Pz040EXs Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- wsD5BAABCAAjFiEEiD+EtZYGj7N+FJJ0X07X2BJgbGAFAmn6HpIFAwAAAAAACgkQX07X2BJgbGBI qgwAs9bGM/gZhrlYMt3+F/jy18pFExw9bS9Gig9lgauBJ1arRfL5I45YDzosJwSTE5c9LMSW1kSm SCGg/c5IKZ0280/sPHEraS3l956OFwXt+S1SEEGiUfHXf1iwKAcvDNomN2hHxySOb0EPFdAU9hPm 7HE5b4NQyjnBVYED7SdHi5dT7tQjB2F6+ikMWX0H1nFWGysJ4eoY1U9z38PDskMAP0zxKkT2tGUH wRcRxbOm1pxXpAPV91Lm57xTc+JEfARJtnJsqlokCC/Fn40nj+pq3j23Dr3uDo1IKs4XqFcQyNf2 f+BAhoElCgtgCMz4WAUb7pWG6LW4nTVCerT2PWMGskDKDxVEhpXWu7Plwvwm7H81W5NcEZQLHJ0x SsHQwlcZpZT1db+1aXfAWvkP3o1Z8MKxV2Wex4GEMatjLtQ5za4iQU/AEKITCUBE20abk/vJiPKn QgOFNiXaSQMkuyBRNOJ2JoxVo475rewa8vEK8Bx8O2NRtnCGxfzMrP8O/1ET =BsvF -----END PGP SIGNATURE----- --------------lD7NZBMLf4JtjCf3Pz040EXs-- From nobody Tue May 5 16:49:04 2026 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 4g94Gn0yjdz6bwQN for ; Tue, 05 May 2026 16:49:05 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g94Gm6Ck8z3wfD for ; Tue, 05 May 2026 16:49:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777999744; 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=0H7CnDe30UDAuKxc3iBzs/n3QTnVDPe/FDHgdvzL91E=; b=mlc/LI7FIOuNH7cNfh+05hjFjOFBOCGG0odO59tLMc9lwQrPP2FsB85dvwsWUJZy/ryZ2h lnu35n6n+bKKYwzEoA6k3b2r9d49vfeXIPUG9dmCuANAquMIc4u+LZabpOLnQtupgDBU4l 8ksYsQ2sHzpnmWnIRBtFq4Z0B8Osj6cTguk4JxgOFA7jP0zhq2Q6yTAMw9z0H/O+SFq9uf b0vgdCH92iaKIzy+QMVLitciea9Qh3tHB9FNGTQ3SdZ1zzugM84ei4QOB4eP0p0iKhjjTJ MpOtDwT9ESaVWS7lGybHigz5wVm6vhp6h22p6TrPD5XsdW8agj5ebnGG6nVAyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777999744; a=rsa-sha256; cv=none; b=mCGDiFsdXTqao2krSXeTB7QKFBWgM8XqtU18RzQqJXA8I/in61wtAoZEjDSEuc7/9V7D5K j7Gir4+MLhQxpfLszFuxSsx2WuvBRXaEZKOggMrvIjPbj5NW5BOAG2sb58stItmJnLQ4DA ++PYyD0hD95jZlJZozy2DDDG6IIXC28/eqAMf5gPggpp1VdQOOHqCyFvySm2NlQ35gANiS m4X+CFl2yXCOYNxjnYyvPYjgF8MEyLiO0FgnsTWds1UuaSVNadXR6KVE60Oz5/CG8rDBGW E92D7+wLi71KHVDmfgOcbckr/Ut+OqeAW8RI8N5MGWRnWAJ17/njf56ncwGKiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777999744; 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=0H7CnDe30UDAuKxc3iBzs/n3QTnVDPe/FDHgdvzL91E=; b=nMhpNG8PrlaPGKJoDFX3PUitenHq+zAKxrEg2llOYXoXG0DLjtHZnttoo352oePCJTLP47 OmbiIOq2JRCZPAW6vhGrSS5yJkpWUJl1iEGBKa2AYS2fykWrPDZpttulssNnXUpSqIpxCM dZl9Akdgk5PHE0keMyqX+HfcVrvSjBmcxGdT7vCRiGI/zXMuqflTvkPIGxKccgoG//RieW btsRPTko6TcMQnbwS/Bl14Xur6Oq/huGPgSW9Q+ZjvubEJk+IXQpUDdscP7YWP1Uu/NnKV u0Zjd50W3lK2YuoAf9V2xZZdw5G3/FRy5SQFsXX+mQPyWf554Or5IqwNmy/+LA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g94Gm5lxnz1Dj0 for ; Tue, 05 May 2026 16:49:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 271bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 16:49:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: bf2c6d23ad09 - main - Revert "libusb: change callback register handler to int" 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf2c6d23ad0988a8b5dccebccdbc6fda9482c6a2 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 16:49:04 +0000 Message-Id: <69fa1f80.271bf.2ee93ad@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=bf2c6d23ad0988a8b5dccebccdbc6fda9482c6a2 commit bf2c6d23ad0988a8b5dccebccdbc6fda9482c6a2 Author: ShengYi Hung AuthorDate: 2026-05-05 16:46:07 +0000 Commit: ShengYi Hung CommitDate: 2026-05-05 16:48:46 +0000 Revert "libusb: change callback register handler to int" This reverts commit ce9ced951a0b9d004a3b007d4ac6e9087a1301a2. We should handle backward compatibility before introducing this patch as people may rely on old ABI. --- lib/libusb/libusb.h | 5 +++-- lib/libusb/libusb10.c | 1 - lib/libusb/libusb10.h | 2 -- lib/libusb/libusb10_hotplug.c | 50 ++++++++++++++++--------------------------- 4 files changed, 21 insertions(+), 37 deletions(-) diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h index ec60ce336e5a..46a2ed5eb8a6 100644 --- a/lib/libusb/libusb.h +++ b/lib/libusb/libusb.h @@ -293,6 +293,7 @@ struct libusb_context; struct libusb_device; struct libusb_transfer; struct libusb_device_handle; +struct libusb_hotplug_callback_handle_struct; struct libusb_pollfd { int fd; @@ -321,7 +322,7 @@ typedef struct libusb_device_handle libusb_device_handle; typedef struct libusb_pollfd libusb_pollfd; typedef void (*libusb_pollfd_added_cb) (int fd, short events, void *user_data); typedef void (*libusb_pollfd_removed_cb) (int fd, void *user_data); -typedef int libusb_hotplug_callback_handle; +typedef struct libusb_hotplug_callback_handle_struct *libusb_hotplug_callback_handle; typedef struct libusb_device_descriptor { uint8_t bLength; @@ -631,7 +632,7 @@ typedef int (*libusb_hotplug_callback_fn)(libusb_context *ctx, libusb_device *device, libusb_hotplug_event event, void *user_data); int libusb_hotplug_register_callback(libusb_context *ctx, libusb_hotplug_event events, libusb_hotplug_flag flags, int vendor_id, int product_id, int dev_class, libusb_hotplug_callback_fn cb_fn, void *user_data, libusb_hotplug_callback_handle *handle); -void libusb_hotplug_deregister_callback(libusb_context *ctx, libusb_hotplug_callback_handle callback_handle); +void libusb_hotplug_deregister_callback(libusb_context *ctx, libusb_hotplug_callback_handle handle); void *libusb_hotplug_get_user_data(struct libusb_context *ctx, libusb_hotplug_callback_handle callback_handle); diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c index 517630900f34..56c9caedab16 100644 --- a/lib/libusb/libusb10.c +++ b/lib/libusb/libusb10.c @@ -205,7 +205,6 @@ libusb_init_context(libusb_context **context, memset(ctx, 0, sizeof(*ctx)); ctx->devd_pipe = -1; - ctx->next_callback_id = 1; debug = getenv("LIBUSB_DEBUG"); if (debug != NULL) { diff --git a/lib/libusb/libusb10.h b/lib/libusb/libusb10.h index 354ff003de3e..eced364ef857 100644 --- a/lib/libusb/libusb10.h +++ b/lib/libusb/libusb10.h @@ -80,7 +80,6 @@ struct libusb_hotplug_callback_handle_struct { int devclass; libusb_hotplug_callback_fn fn; void *user_data; - int id; }; TAILQ_HEAD(libusb_device_head, libusb_device); @@ -119,7 +118,6 @@ struct libusb_context { libusb_pollfd_added_cb fd_added_cb; libusb_pollfd_removed_cb fd_removed_cb; void *fd_cb_user_data; - int next_callback_id; }; struct libusb_device { diff --git a/lib/libusb/libusb10_hotplug.c b/lib/libusb/libusb10_hotplug.c index fd979fd4db14..359c818b5720 100644 --- a/lib/libusb/libusb10_hotplug.c +++ b/lib/libusb/libusb10_hotplug.c @@ -176,9 +176,8 @@ libusb_hotplug_equal(libusb_device *_adev, libusb_device *_bdev) } static int -libusb_hotplug_filter(libusb_context *ctx, - struct libusb_hotplug_callback_handle_struct *pcbh, libusb_device *dev, - libusb_hotplug_event event) +libusb_hotplug_filter(libusb_context *ctx, libusb_hotplug_callback_handle pcbh, + libusb_device *dev, libusb_hotplug_event event) { if (!(pcbh->events & event)) return (0); @@ -217,7 +216,8 @@ libusb_hotplug_scan(void *arg) { struct pollfd pfd; struct libusb_device_head hotplug_devs; - struct libusb_hotplug_callback_handle_struct *acbh, *bcbh; + libusb_hotplug_callback_handle acbh; + libusb_hotplug_callback_handle bcbh; libusb_context *ctx = arg; libusb_device *temp; libusb_device *adev; @@ -343,7 +343,7 @@ int libusb_hotplug_register_callback(libusb_context *ctx, libusb_hotplug_callback_fn cb_fn, void *user_data, libusb_hotplug_callback_handle *phandle) { - struct libusb_hotplug_callback_handle_struct *handle; + libusb_hotplug_callback_handle handle; struct libusb_device *adev; ctx = GET_CONTEXT(ctx); @@ -365,17 +365,6 @@ int libusb_hotplug_register_callback(libusb_context *ctx, if (handle == NULL) return (LIBUSB_ERROR_NO_MEM); - handle->events = events; - handle->vendor = vendor_id; - handle->product = product_id; - handle->devclass = dev_class; - handle->fn = cb_fn; - handle->user_data = user_data; - CTX_LOCK(ctx); - if ((handle->id = ctx->next_callback_id++) < 0) - handle->id = ctx->next_callback_id = 1; - CTX_UNLOCK(ctx); - HOTPLUG_LOCK(ctx); if (ctx->hotplug_handler == NO_THREAD) { libusb_hotplug_enumerate(ctx, &ctx->hotplug_devs); @@ -384,6 +373,12 @@ int libusb_hotplug_register_callback(libusb_context *ctx, &libusb_hotplug_scan, ctx) != 0) ctx->hotplug_handler = NO_THREAD; } + handle->events = events; + handle->vendor = vendor_id; + handle->product = product_id; + handle->devclass = dev_class; + handle->fn = cb_fn; + handle->user_data = user_data; if (flags & LIBUSB_HOTPLUG_ENUMERATE) { TAILQ_FOREACH(adev, &ctx->hotplug_devs, hotplug_entry) { @@ -400,32 +395,23 @@ int libusb_hotplug_register_callback(libusb_context *ctx, HOTPLUG_UNLOCK(ctx); if (phandle != NULL) - *phandle = handle->id; + *phandle = handle; return (LIBUSB_SUCCESS); } void libusb_hotplug_deregister_callback(libusb_context *ctx, - libusb_hotplug_callback_handle callback_handle) + libusb_hotplug_callback_handle handle) { - struct libusb_hotplug_callback_handle_struct *handle; + ctx = GET_CONTEXT(ctx); - ctx = GET_CONTEXT(ctx); - - if (ctx == NULL || callback_handle == 0) + if (ctx == NULL || handle == NULL) return; HOTPLUG_LOCK(ctx); - TAILQ_FOREACH(handle, &ctx->hotplug_cbh, entry) { - if (handle->id == callback_handle) - break; - } - if (handle == NULL) - goto clean; TAILQ_REMOVE(&ctx->hotplug_cbh, handle, entry); libusb_interrupt_event_handler(ctx); - -clean: HOTPLUG_UNLOCK(ctx); + free(handle); } @@ -433,13 +419,13 @@ void * libusb_hotplug_get_user_data(struct libusb_context *ctx, libusb_hotplug_callback_handle callback_handle) { - struct libusb_hotplug_callback_handle_struct *handle; + libusb_hotplug_callback_handle handle; ctx = GET_CONTEXT(ctx); HOTPLUG_LOCK(ctx); TAILQ_FOREACH(handle, &ctx->hotplug_cbh, entry) { - if (handle->id == callback_handle) + if (handle == callback_handle) break; } HOTPLUG_UNLOCK(ctx); From nobody Tue May 5 16:59:52 2026 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 4g94WM0hBhz6bxXL; Tue, 05 May 2026 16:59:59 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g94WM01QYz3yDd; Tue, 05 May 2026 16:59:59 +0000 (UTC) (envelope-from bapt@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778000399; 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: in-reply-to:in-reply-to:references:references; bh=o3BSmiJJMkD2xsV3brFQdv/Ov95qf+1EqeQD6hl6S+s=; b=s/AU0zUMZhFuyAXh5ym0MC90krxnbn7ApFnS8NiOcMQUDzc0WZuJn4pMMRKH0kua9PMVz4 Clktz3s8tGDGjvpO4MSF3VjOJDgDp2uL4u/kqVooD3rK5SdUZ95IRmuJpcAJEIbxSw7X4a j8803gVdeXEMpJJBRYHgnS9q6zqEGopCGvfGVaxEC3cAbjpnw5FZkvCTxM+exRqo6bgLdN Q1kOo0QnyNf2IQrg8X6YPHZoX07E53KOx100Q9rKhyij5M6rw6Xg1yyT9huUQLK0Ujjd7S D3eSK8o/g9olC5S3EgLEStP7ggPOlkM+pgdSJHkDNz8sd/ibjg17BAvYDljpVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778000399; a=rsa-sha256; cv=none; b=TBGPDZE2qqGrlryl1YX+9BsPCebhGkfny9uH39L3KsAAAO69Wa25c9ve/WZ0oMEkumU3cN 3OhaL+GsE0PoTdwOosYPMQ2mHaiqhiKa/udoZyCt5hdQrsD6QICFAvlu1SNuBbAr0d15P5 d9q6nqIPGFqHiYDAUUAMmxAIzouCbjljKoW25Q0c1fE0ZvrWfdWgM20Kt8lVKMZAKNcxRp eJr255yezVD+yxLT85KNRx1hBFqMLgR/QbPEnGxGaTLSRcWs/4rxqvIbKx+3Utl7/b7gV/ /eScCeGPsqatp3pUfcfED2dODpIVYm01mc6elvSfUZiPLtPI0cdlGDaXv0/GWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778000399; 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: in-reply-to:in-reply-to:references:references; bh=o3BSmiJJMkD2xsV3brFQdv/Ov95qf+1EqeQD6hl6S+s=; b=CEV8Ga6FOnco6sCpZCd2eH6/fmGDzz2UGvLcEwlWSjUMOPPjL+WkQbKgB5QciyR+e1pZtk 6zPVv66sSiYSc4ZWw2Db3Ne1TGIO7/E7PQZhgEkpMJXRqx3lTo+MKA66X6RzjfZWVpURSQ iieQjvIqy/QS5Bmw2ve1qkKLbZllLE8Vs4zT3BUHMA1oLaQt6pDJhhVmKZkBoH3z9HSKbp rCIJMOEBstmI9Bp2ZxcIq4Pc5+4mpD1Vcyxs7rvxFntQWgA7fLxva4cFf5JEGBAQk+FUWX Mdd8noW7b2dVfDugTvw6pUpYzZSx2kOfpBHexE6OBe15HcHdAjEGefW/P2QZqA== Received: from b.nours.eu (b.nours.eu [IPv6:2001:41d0:303:5e39::1]) (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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4g94WL5prMz3L7; Tue, 05 May 2026 16:59:58 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by b.nours.eu (Postfix, from userid 1001) id 6DB72414E8; Tue, 05 May 2026 18:59:52 +0200 (CEST) Date: Tue, 5 May 2026 18:59:52 +0200 From: Baptiste Daroussin To: ShengYi Hung Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: ce9ced951a0b - main - libusb: change callback register handler to int Message-ID: References: <69fa115c.1eae4.306694d3@gitrepo.freebsd.org> <9cac5d8a-8dd3-439f-ad8e-6dd082c9843f@FreeBSD.org> 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <9cac5d8a-8dd3-439f-ad8e-6dd082c9843f@FreeBSD.org> On Wed 06 May 00:45, ShengYi Hung wrote: > Hi bapt, > > I also totally forget I have replied under your patch. I will revert my > version to address your problem at least for now. > > Best, > > ShengYi Hung > don't hesitate to takeover my proposal of change, as I don't have time now to finish it. Best regards, Bapt From nobody Tue May 5 17:27:28 2026 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 4g957K5C3Wz6c1NJ for ; Tue, 05 May 2026 17:27:41 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g957K4WR1z42rL for ; Tue, 05 May 2026 17:27:41 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778002061; 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: in-reply-to:in-reply-to:references:references; bh=QGZ48HlImxXV3tC0Yq4yjIi6sYHBtP4aTIPPssner6c=; b=Zfyr30V0oOsVf8xufoY2VZMABZFdY5zU5VTq4+EDRjni1ZFQLm1+0poM0TdAX2fa0/Cn6L 4M6b7X+EC0H5ZLYdWTG187Ztz5IrTEGOK0toz+zlvwT1H/K6UJ9bmrMJtREB5sgNoDno2h slUioUAvUjf5upaixqZ+hQO2juqupjraNhe1wsjEvvFxmsJVHShNbyAc1LIxqfymJ1kMaQ o1SP2IjkmUhxCdwB+pxm6Viz+b4xTlTKqbQ04/wcinEobEUWmGOuI8gxfR6bueermrrSwH QFW5QcnTAGNHjkKoVWOxKIvTYWu7s43f3M6/SV7JbklWgoUdoVoV7GhJLkxigg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778002061; a=rsa-sha256; cv=none; b=O5AwOzuCURDAeUduSDzl1x/xPUvFOf+mlO9PjQ/BxQjQ/nw8Vbe9/PBtK9fSYK1Y5PZvxC umz10L5hTiFk7sd7hAxmTHk3A0sG8Sf9hV2925BwotYOpP0hQXlj9waQa7aLwvM5FMeZv+ VsTGJSmjJjfctLaLliVr5Xr/oR+6OXAkHtwG4aCl2VSBA/rbQHCivVLthjYnHnoPi1ccYY H+j/20h+sOMMesLftr+zz9p5D6IS6ZpMgwRZhrkQO7f2U/k2FlRzFEkuarRgMZ0RTHe0IC tHU0ybpqWYibm6n7DSePD7DB4Jy/ZiqwkOhUVlhtjNWRjdA3RcKMYPRSsRthVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778002061; 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: in-reply-to:in-reply-to:references:references; bh=QGZ48HlImxXV3tC0Yq4yjIi6sYHBtP4aTIPPssner6c=; b=Zwn4TlBhAgGhozA1pnrClWgmEUZXs+B3u72kLtN0DmYCTqPxqF72Kqg+XSA0Js7WrQDuBz QFmp7cltiK+3oxcT2Wv7xXkVAVMdqm+SJdJ3Aw1DAZj92AaUYXkeNJD/cNBW5/Y7/xv0D6 /C/LsL0WMVEDKHGzEBxjNUcMEFVW3DZ+Fhd8B56hU8TOaPrxA/e0RFsOudBsvPA7tratz3 mJAUMbXss5a8xF5tRurKaH8vM1GKsz1j0thBbyw7FDFp0hUKVP7M6BcIoigP+O4kgOc6c+ TIju7kkrUYL66V+75mRtsgXGDF2fsqHwsOcmyl7CR9RXQdj02xc5q9q3DdAuuQ== Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4g957K3cw6z4HY for ; Tue, 05 May 2026 17:27:41 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-393841c70a2so3650721fa.2 for ; Tue, 05 May 2026 10:27:41 -0700 (PDT) X-Forwarded-Encrypted: i=1; AFNElJ8XZxvTIYstlhckUD1DGXoLYqUYg1JtbskoGk6SqzQp4AUiLERTJ66gKP3fMlzgX5GCIKSr9uVUDh5e+M5+mxNszgfnBw==@freebsd.org X-Gm-Message-State: AOJu0Yy69ucJJ+2DKJwrd3R+GaxOBhfCO42DOnqs2d/ivM+ge6EeLANo m58R3hn38uhhm7HIHNOGiVih0RTcCahMlpAhpWdJcwipzgokbSysbz61XnsPzh7L4CjQLpRLF6z Q7E3mb53Mom7Ke7ukBk6XOwgV9o7Wee0= X-Received: by 2002:a05:6512:1591:b0:5a8:7c42:bebe with SMTP id 2adb3069b0e04-5a87c42c066mr1143115e87.4.1778002060031; Tue, 05 May 2026 10:27:40 -0700 (PDT) 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 References: <69f5387a.26bf3.36f56fa3@gitrepo.freebsd.org> <994cef06-a1c9-45b8-b807-3449517fe381@yahoo.com> In-Reply-To: From: Nuno Teixeira Date: Tue, 5 May 2026 18:27:28 +0100 X-Gmail-Original-Message-ID: X-Gm-Features: AVHnY4K8AchGn1-naprbBLfN4x844oaW77v6fM6Vev1sjqdQVaUkNn7HUpvR_CU Message-ID: Subject: Re: git: c4f08d46c7f7 - main - llvm-*: Move all LLVM_BINUTILS symlinks to toolchain package To: Mark Millard Cc: Lexi Winter , jlduran@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Ed Maste Content-Type: multipart/alternative; boundary="00000000000032c7eb0651155d30" --00000000000032c7eb0651155d30 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Mark Millard escreveu (segunda, 4/05/2026 =C3=A0(s) 22:= 08): > > Hmm. Your list happens to overlap with the later fix: Yes, I see it at 045a9ef829 ("llvm: Don't install /usr/bin/{gcov,objdump} twice") on my rpi4 with worlds builded from scratch: ./tools/build/stale-symlink-buildworld.sh stale symlink detected: lrwxr-xr-x 1 root wheel 12 May 4 18:38 /usr/obj/usr/src/arm64.aarch64/tmp/usr/bin/c++filt -> llvm-cxxfilt stale symlink detected: lrwxr-xr-x 1 root wheel 12 May 4 18:38 /usr/obj/usr/src/arm64.aarch64/tmp/usr/bin/objdump -> llvm-objdump stale symlink detected: lrwxr-xr-x 1 root wheel 12 May 4 18:38 /usr/obj/usr/src/arm64.aarch64/tmp/usr/bin/readelf -> llvm-readelf Thanks, --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --00000000000032c7eb0651155d30 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


Mark Millard &l= t;marklmi@yahoo.com> escreveu (= segunda, 4/05/2026 =C3=A0(s) 22:08):

Hmm. Your list happens to overlap with the later fix:

=
Yes, I see it at=C2=A0045a9ef829 ("llvm: Don't install = /usr/bin/{gcov,objdump} twice") on my rpi4 with worlds builded from sc= ratch:

./tools/build/stale-symlink-buildworld.sh
stale symlink de= tected: lrwxr-xr-x =C2=A01 root wheel 12 May =C2=A04 18:38 /usr/obj/usr/src= /arm64.aarch64/tmp/usr/bin/c++filt -> llvm-cxxfilt
stale symlink dete= cted: lrwxr-xr-x =C2=A01 root wheel 12 May =C2=A04 18:38 /usr/obj/usr/src/a= rm64.aarch64/tmp/usr/bin/objdump -> llvm-objdump
stale symlink detect= ed: lrwxr-xr-x =C2=A01 root wheel 12 May =C2=A04 18:38 /usr/obj/usr/src/arm= 64.aarch64/tmp/usr/bin/readelf -> llvm-readelf

Thanks,=
=C2=A0
--
Nuno Teixeira
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--00000000000032c7eb0651155d30-- From nobody Tue May 5 17:30:16 2026 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 4g95BK1V8Yz6c1q0 for ; Tue, 05 May 2026 17:30:17 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g95BJ6CzTz4395 for ; Tue, 05 May 2026 17:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778002216; 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=DGTWj8n44XE+hpBAjQ5RtbOT4Kpsk1mVZ9b3jp4l6ck=; b=NUoYreDKON9MtWfq553JneUNFpJNEeS2rHCKL/U0l7lx7PZ35Ft2LdNCraZ5imn+9Qz5sS 9iQlotoTTKZQfYXD8DdzTzu2Kjc514+i2xX0NNrx1Pn8qCMDmuMB6zh17pvZSJTYTQZSJ1 WD/tlvDknvJxf3c2SdczKKfu9Vq+FdnBYMFH3CKNjOb0RzxNjykqfzeXKU2ILLnXqftcJe vPBTLEewmIhN9MYbZ6gyxdq9pE7xdo1UOk315p4lBnEUWr1EM7S9Sti0sc7YwJ3K95MVUX EihGCsxGpCZjRczR2hx/2gsLMoY+1W9alkJjlIvxFe7riHOg9B1Fx6/yrw3Xlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778002216; a=rsa-sha256; cv=none; b=u9kHlHR4s2izfY0CmjbR5hxKZIVqa0GTr4QWXiV8A8e5WvSDl+dNeBOIQMFa6JEmY0Gtdu SXJg4R0KheYBm2a2QRhHGzAWCXcJbleO9zOADWt04BMBGn7RVXsHM9VE6rb45E03BM6onV LMRBddmRo+Or19swg0+pgNb9AT/CC7CKj55MF66KYlnU0a95RJrHBvHKxHdsq6aCt0RXJK Rw9LqVssfm3IQZWhfOP1SC+iLgVamVslHNC6LAHq/NahZDvy7k4fYzsRAMSFuC/kAzYctP joxInoWDzNpvmL9uPqC0a+pkU9l7G5bg+WiCVBg6wv++A50GBM9tSN7s03DMww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778002216; 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=DGTWj8n44XE+hpBAjQ5RtbOT4Kpsk1mVZ9b3jp4l6ck=; b=F0CKXtULfEZfleGcC9DsjieinJMd6KWKe8ZD9qMO9m1HRbHteM5wmZdfSLqZQ5j9cfj0Qv +Tcku8sZfDJNWyEkNjzT6CayAi31T1SU2hfutJlyzQmQrHZQCDLvj9rvMzgIpJPAorhVCB 7bc2QQceotsovSvlZK/5dC4MxyJPbfoIHTQLbvyeZ8LCYtJ8oqA1jBjrNVCi/HEyk2IyML Uk+rygjSFQJFAVdiY/YjkIzU0l3nmGoEBJxQv91b1GjEiUdSDSTqBxp8K7c8a+uilw0YAA 96VXyMMu02mIRpkdGZrcRk8Cj99UGDVIWeEw9XsCAP/rxDc4l3PUFiECwV04aQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g95BJ5lMPz1FkV for ; Tue, 05 May 2026 17:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33b54 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 17:30:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: adad6862228d - main - mac_veriexec_priv_check block proc_write_*regs* 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: adad6862228d1799e7e12c724b2534b4184f7d45 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 17:30:16 +0000 Message-Id: <69fa2928.33b54.5ad14de3@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=adad6862228d1799e7e12c724b2534b4184f7d45 commit adad6862228d1799e7e12c724b2534b4184f7d45 Author: Simon J. Gerraty AuthorDate: 2026-05-05 17:29:54 +0000 Commit: Simon J. Gerraty CommitDate: 2026-05-05 17:29:54 +0000 mac_veriexec_priv_check block proc_write_*regs* Writing to /proc/$pid/regs can also be leveraged to mess with memory. Only allow a trusted process to do so. Sponsored by: Hewlett Packard Enterprise Development LP. Reviewed by: olce Differential Revision: https://reviews.freebsd.org/D56763 --- sys/kern/sys_process.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index c67996ad7df1..3a94f1c0ff20 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -72,6 +72,13 @@ /* Assert it's safe to unlock a process, e.g. to allocate working memory */ #define PROC_ASSERT_TRACEREQ(p) MPASS(((p)->p_flag2 & P2_PTRACEREQ) != 0) +#define PROC_PRIV_CHECK(priv) do { \ + int _error; \ + _error = priv_check(currthread, priv); \ + if (_error) \ + return (_error); \ + } while (0) + /* * Functions implemented below: * @@ -109,6 +116,7 @@ int proc_write_regs(struct thread *td, struct reg *regs) { PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); + PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); return (set_regs(td, regs)); } @@ -123,6 +131,7 @@ int proc_write_dbregs(struct thread *td, struct dbreg *dbregs) { PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); + PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); return (set_dbregs(td, dbregs)); } @@ -141,6 +150,7 @@ int proc_write_fpregs(struct thread *td, struct fpreg *fpregs) { PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); + PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); return (set_fpregs(td, fpregs)); } @@ -261,6 +271,8 @@ proc_write_regset(struct thread *td, int note, struct iovec *iov) if (regset->set == NULL) return (EINVAL); + PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + p = td->td_proc; /* Drop the proc lock while allocating the temp buffer */ @@ -294,6 +306,7 @@ int proc_write_regs32(struct thread *td, struct reg32 *regs32) { PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); + PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); return (set_regs32(td, regs32)); } @@ -308,6 +321,7 @@ int proc_write_dbregs32(struct thread *td, struct dbreg32 *dbregs32) { PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); + PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); return (set_dbregs32(td, dbregs32)); } @@ -322,6 +336,7 @@ int proc_write_fpregs32(struct thread *td, struct fpreg32 *fpregs32) { PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); + PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); return (set_fpregs32(td, fpregs32)); } #endif @@ -363,9 +378,7 @@ proc_rwmem(struct proc *p, struct uio *uio) fault_flags = writing ? VM_FAULT_DIRTY : VM_FAULT_NORMAL; if (writing) { - error = priv_check_cred(p->p_ucred, PRIV_PROC_MEM_WRITE); - if (error) - return (error); + PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); } /* From nobody Tue May 5 17:34:02 2026 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 4g95Gg12vzz6c2Mp for ; Tue, 05 May 2026 17:34:03 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g95Gg07CHz442t for ; Tue, 05 May 2026 17:34:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778002443; 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=F+vYEHBfZemLwCFJcUjE3z/D0aOwXK7MnQzkDne8EzE=; b=lo2OT1OKSOlYwsB1mUBtyMlVDpoVAVjEsQ1tnqd7AUZkxSfLEFZWu4BC9iyt64VW4RyBiA TOvaYGkiN+wEp05wE747UKeSGAC7aUgrI8Yp2uTqUrohAdxG+iXA9O7JUCEHa0sKEBdogO RYFdaJv5T6c/OYvQnTbQT7vXeX3Jzkjw8BRECAowgyRRQqohbLumk8ORXqh4VjF7eKhkib xKQC4e7EiIYdUg30ZJDMp4uVvd9pfxuNkCz4htZcE+H93WRI31ZJgk7rVfh22Ex6gV6XRK sLkxlLhaT60b8SRICaa+Iyv7KQuxWU2Jotj+atLt/4DSqQh+Q5r85yg33vBCzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778002443; a=rsa-sha256; cv=none; b=omXIrP1Nlf+dloneW0Xo2hW4yq5AAJYNxnK4nWkiUqYxiRHeunAtlBAInpVp0Lw55NROGg N26YdZM9hhs9wBDpSZSrPPwQUiwCtckVffgC1bHlRjqMzUi/S9mgBgrDqvyzdIhGdvG7fr 7s5D+XLo7F0TVE/PVe4yEBZg7U35bFWErNqBbDKJX+pKivuxEw00iv8ECQhgl9YJY+DU4Z Vv63aDp8GL/V46uuTZ+YvSPTMySezhIKGg0kq3fNOPwhm+H07e2h9hLxRqSUhN1Kan4cuT 5SoTdB7eVwsAkkYwiLlUkl+BSRN4F/XCvADsE9kmEgZLwmnHI28fWkEqediGVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778002443; 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=F+vYEHBfZemLwCFJcUjE3z/D0aOwXK7MnQzkDne8EzE=; b=Nvts2uESy9b4+GKrB0ViE09zneoMG5gbSeT48lpUCjJexTmwNV1NJwcefL09tiKtpNO/gR WI5z/oTz+zJpNqqcieq4yoC/9qdAugCfbs2Au6qF6GiqRkK/ceouZ9bdI4q2yPOGVx7mAs 4ItRPUWXvQaRWGgIRFnYY4PETGyrEwi+bxxbrA+8WabuQjg/lu2jTMYO49Gyejb/pZG2Xb HI12SapzfHWws2svX3tsTTrKbhPH32cgBcKDF+fGWcRfxuPU6MXGhfTYrIKCsexqt9DiA2 5RNs3GF5Xo9SzrNkhrxQO1XNcyJewi0WgxHv2mqekkFwmUiuu0a1r0tHSm6n6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g95Gf6kcfz1GV9 for ; Tue, 05 May 2026 17:34:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33d7a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 17:34:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 89c883c09ab5 - main - mii: Fix SMSC name 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 89c883c09ab5e0fdca7ac5dfe74fcc46b7669eb5 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 17:34:02 +0000 Message-Id: <69fa2a0a.33d7a.ce004a5@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=89c883c09ab5e0fdca7ac5dfe74fcc46b7669eb5 commit 89c883c09ab5e0fdca7ac5dfe74fcc46b7669eb5 Author: Ed Maste AuthorDate: 2026-05-04 23:13:44 +0000 Commit: Ed Maste CommitDate: 2026-05-05 17:33:39 +0000 mii: Fix SMSC name The LAN8700 / LAN8710 PHYs were Standard Microsystems Corporation (SMSC) parts. I presume SMC was chosen as an abbreviation, but the company always used SMSC as its short name. SMSC was acquired by Microchip in 2012. I kept the pre-acquisition name, as NetBSD (from where we obtained miidevs) uses SMSC. Reviewed by: adrian Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56819 --- sys/dev/mii/miidevs | 8 ++++---- sys/dev/mii/smscphy.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs index ca7e78a1cdd5..89d8e54a1843 100644 --- a/sys/dev/mii/miidevs +++ b/sys/dev/mii/miidevs @@ -72,7 +72,7 @@ oui RDC 0x00d02d RDC Semiconductor oui REALTEK 0x00e04c Realtek Semicondctor oui SEEQ 0x00a07d Seeq Technology oui SIS 0x00e006 Silicon Integrated Systems -oui SMC 0x00800f SMC +oui SMSC 0x00800f Microchip (formerly SMSC) oui TI 0x080028 Texas Instruments oui TSC 0x00c039 TDK Semiconductor oui VITESSE 0x0001c1 Vitesse Semiconductor @@ -361,6 +361,6 @@ model xxVITESSE VSC8514 0x0027 Vitesse VSC8514 10/100/1000TX PHY /* XaQti Corp. PHYs */ model xxXAQTI XMACII 0x0000 XaQti Corp. XMAC II gigabit interface -/* SMC */ -model SMC LAN8710A 0x000F SMC LAN8710A 10/100 interface -model SMC LAN8700 0x000C SMC LAN8700 10/100 interface +/* Microchip (formerly SMSC) */ +model SMSC LAN8710A 0x000F Microchip LAN8710A 10/100 interface +model SMSC LAN8700 0x000C Microchip LAN8700 10/100 interface diff --git a/sys/dev/mii/smscphy.c b/sys/dev/mii/smscphy.c index 4e0d3cd3e18e..d578242f5a61 100644 --- a/sys/dev/mii/smscphy.c +++ b/sys/dev/mii/smscphy.c @@ -74,8 +74,8 @@ static driver_t smscphy_driver = { DRIVER_MODULE(smscphy, miibus, smscphy_driver, 0, 0); static const struct mii_phydesc smscphys[] = { - MII_PHY_DESC(SMC, LAN8710A), - MII_PHY_DESC(SMC, LAN8700), + MII_PHY_DESC(SMSC, LAN8710A), + MII_PHY_DESC(SMSC, LAN8700), MII_PHY_END }; From nobody Tue May 5 17:59:53 2026 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 4g95rT5FWZz6c4Rg for ; Tue, 05 May 2026 17:59:53 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g95rT4VTzz47rK for ; Tue, 05 May 2026 17:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778003993; 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=Ez8bqK2UYur8sDk0zHaM52AK1e3O1SqXvHpTr/6ykNc=; b=GebwNfXgGL8H0dPeflO5aXMWG8xWhMnRUmnErDk42/9Zvh2I9ABcLba4/vd+EgDUeUEet/ 3ROieGebiJ/dl3X63zOy00dZNmOTLG0+clRF7A7KqVFiAvdFREjN9fadYB/pc86jznFsFO PomxfS0zlW0firBakKbRxIWHjYfiVadleQHJR0ygDyGX/+0Bv8s1ymNvNCbW2V1VQkMkXT aL0+kTI8tRierwJnVEyz0PhV+zOXqLGU1mZZ2ktq380E6+KkkJw0j2t4y7LH3xZWlJqhwL /mVvdrD5JYMYLjciVQFOyMsp9Ifp8WfyhsO3jPy8r2otc1DHESbd0RIAWhKGaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778003993; a=rsa-sha256; cv=none; b=ayeIWTaecJDitg0qo26R9KxYHGEgzIhrWHtEAimxVBiZqsn4BeL1kWt6tjxV2DZ7FNROnT N1rghgaF3PgC6fLUwY4DDiPnj+KuxrgIbcYoJ0VLlD95SLImQ1pVcNqxCQEGF3ats3OSPQ stj+wMTGKF5lz0fj+neUkW8442HqKDLlr6E4O9h/sK1jK0EM96kugHklT8ZWnRTVNrYC42 pCa5RzaMLMpTeyxiCyGec6jM6SCszu5p9xuFo7+mrM/2Etez6p5+9VHdHlaf4lafwH5e+k eg5nHyLz3yYQ1Lr21OrDWxR0plzEZcUBDp5TArX5l/p0agu7c9qdh5AJQjFvvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778003993; 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=Ez8bqK2UYur8sDk0zHaM52AK1e3O1SqXvHpTr/6ykNc=; b=wJkR1az2RUPR9o2plqm7MVdJpldZ2EN7PtUyo/M26cn3AKA8aUdv54v2WQy+j7nXXhCW0o VZRDZotAJPFHVMzgmcVn0tEQlnQ5QEEdTKq5mrfcM/l85es//nTY1AwNIDd2rFDBpFGdFe CtEoBYSdvfJS62YA3HxvD4DBWkoq8l9nECnQOP7B6mPjgV4GFGBzUPFNO0X4Xjbszym4/p npO2FexOsw0VPihjF7Ycd+UFvtoK3JcUEuAzHP2X6ABVVoqFAOvcj4hRY8cEFEUR+/A2Kg ux4z981A1fRq8/YU365mAbOdKlG4wh0kJNLZ+CXPC7EyTzB/NVWvg5IaX2e/mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g95rT3nCMz1Gm1 for ; Tue, 05 May 2026 17:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35fbc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 17:59:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 49e496d27768 - main - stat: Set the timezone before testing -t flag 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49e496d2776870fb36ed8ea4c8139b5eb9f7f747 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 17:59:53 +0000 Message-Id: <69fa3019.35fbc.736fd5e5@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=49e496d2776870fb36ed8ea4c8139b5eb9f7f747 commit 49e496d2776870fb36ed8ea4c8139b5eb9f7f747 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-05 17:59:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-05 17:59:36 +0000 stat: Set the timezone before testing -t flag The test assumes UTC, which is what I use on my development systems and clearly what is used on our CI runners. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D56836 --- usr.bin/stat/tests/stat_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/stat/tests/stat_test.sh b/usr.bin/stat/tests/stat_test.sh index f2de15cf4f9b..282efc91303f 100755 --- a/usr.bin/stat/tests/stat_test.sh +++ b/usr.bin/stat/tests/stat_test.sh @@ -1,7 +1,7 @@ # # Copyright (c) 2017 Dell EMC # All rights reserved. -# Copyright (c) 2025 Klara, Inc. +# Copyright (c) 2025-2026 Klara, Inc. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -234,9 +234,9 @@ t_flag_head() { atf_set "descr" "Verify the output format for -t" } - t_flag_body() { + export TZ=UTC atf_check touch foo atf_check touch -d 1970-01-01T00:00:42 foo atf_check -o inline:'42\n' \ From nobody Tue May 5 18:24:43 2026 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 4g96PN2fGPz6c7C8 for ; Tue, 05 May 2026 18:24:56 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic303-25.consmr.mail.gq1.yahoo.com (sonic303-25.consmr.mail.gq1.yahoo.com [98.137.64.206]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4g96PM60LPz3D6m for ; Tue, 05 May 2026 18:24:55 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1778005488; bh=fQQBZLojsrm7J2K+meo9uYpDq4t0eBz/BfJECKQMfDg=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From:Subject:Reply-To; b=j52IXg8gVORtQcRZ8qwZfcWLyIPfU1CbA32Kuwv9Qc2F2kLZbbbW6NCu0NcbyuvyAX5aImS3c45Nwsh3R4Z0OrfVqHBFHYy3b8/yuuoWpP63pdHCz1X7g8HIcYiO9At6Z8PcL1zlFk8unEFUB+VCWnF9C3Qftktal2DWrcPFuWb+hWtQPMS1ekWXrON5VahPRbWrNqasg2OyKSzy+kbyIk3gBkqlMwa4FRn+Mfw1qkAxuCz07nvBJ3e3GhtptHBNB9VuXlt9Aod0ACVmKnFTO1yoV+XIu6jYaUCAws1VN1SXHKK5soTm0kZVp8XivCRCoq/yiVftqAoDWmLOlkRAIQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1778005488; bh=o6sCjyDR1GHoSo8PwCQokm/e00Q9IKtBnXj2LOTDt7R=; h=X-Sonic-MF:Date:Subject:To:From:From:Subject; b=mtcwzQEjo3fJHQqGkn8V++YLKN59+dwi09XqVlpCJOt2prHATuCzYKMTx8SAxXYwmHJXbm016LywAYKdhn6hmN5/NGdJIcOZyEJk2qhbR//BcCEeSqHDNq/eowDnVOlTC/slNscXha0v4Dtr3eKClvh3xwglF6fWhz4CvsdONykJ+ANA+ZvspjIiGycuXnF5OyDKw8xiG3zqmON7LWvxC5ecIHynB+LKDfVwjk2nzQ5/of7bEob4+bHysIedbOWoO+tIAdlEmaRpsJjC4t2f+H++YFB//O5/bKrbYSP3dz9MBR9l9g9m5gkOGtEoP7SbvrxKNBgTanM+//JQXjD8ww== X-YMail-OSG: DiRGBicVM1kY0PAqB.7oLnmDWlxGTTCV1MEXVwlXR5KWNcKEDY3Qo6ChCjtPH2E 1DnUVDPWEC5Z_zzXyHcWGOrN46pCFD3DhCnNjZ_afEwZJR_oglMUv_O9PnKMwK21a7cfGvgon2mJ clHbHzkZACtTh3mRIc4zkadC7YN49oB6vvMmscgTdBrqwDiFmRnR7QtegfGtb0EWRWaCT5aGozv8 1KuAvXwXqvlesyTgEse5zPuexdpfpnmrViIOVbdEUA3jWpu.F_gjMU6nLZyH3EfQ1T1OtOZwAEfg YL_9B9xkP29GuoGL_rPoqT9C9QVIQTwP5qxmH1zJ6xiKxBCRg6NHMhdBjUkkpOts1injROOphaT. FiulmFoRIxZb93qZ0mrSowSSoJyRyy3ZsdwZoy9GujM3Lm05OhECfYl3BRp7oDzAmZJKBfqr0ptf v8joR2bV5WWFBCzLlr8dn5m5b.5dv0zDUfS0ZI3zdxBazoJKJqMPSHXWyy23cENpmBCqVu2Ly8er deK0TW77BOwpSU5XMm4yVdSlbFdyOUvv45mFmd9vvtytbYHzgJ15Nxz66q0kWIJezvEYCmfFT8r6 hfU88LIfHb.iO4EIyYJLCH3S96GKjRfyqWKpAucLxWdgY88GFUXjY8GTjHHE1MLcW1rkcWwqmswR kDCq2GdVQdUEmiiqDlkNdNng86zyXi0Xd7kkNSUMZLQhOQiBUk0fRrUfKprOKci4sfHMW1np6g.3 NFGbcu1pnFURNwVkO.rH3hlcEK2jQX7Orn_kVdzdAh33YyhiaPnPV9l8qY6.1yVM5anYB9V.2jIg eJ4jcqB949dqJjiwI6i.iO25uel1307NF8S3eNug_PGXzbvhgaMvMh.88xcas8YKVEXtRrcoHfSl kTeEC1k6g5qjFjg1JMSsLqS7wMLN98wKeTmq68QkuB3zsj1.CpnMowpRcA4d4FDXg7jYjTQ6kBmT LbciL4WznjPsnqPvONfJe2HrMMi02Gjb0yJEXudRI.Ft16ipWxuAdf7CRSALBLHz6nQ0k8V6ioVC plj.0jgc2uUNvGUmI4gLPnJJeXrPsib7EX4WDJ3OJmTbjCCjDyMIDG.RdJxMmGWy6r1C42tdG.B1 dPIEplKw9SCslCpqB9dqd8WbDqb1IVmwreTi6.uS026DlZVHDr_KL2qb02xPu6lR7JtZb4GmUsji rPduXsfSzxSOYXYupU2ZWZYYXCcIee5s9S9KqHnjyd7OUpQLtAChexs3qlvKBF15LdoZoosK8_zT Z7dRkMQqgcnlAS_n_uen_6Fco9_zvYzx2IpPIvfn3T.VTLzViKV44fptfbyj4u16h3bSIY_.IAte iKjXdi5_2El8JViM6DD27waD5XawmP1Hnkeid2lgSrorm0sW8oxi.TBjkUxd5XFfp0EcQLyAe.Vi fqX.PEFfAU8NKKDZGdSLk65zJgqz2lujg2F1YbRL4wRJjc7BxHW59taiF0b815XWPnvFb6Rqogh_ TFNSieIe_mxapeP5K5mYAIgxQX9i2OZ0LaCaAyxL0GSRe6W0ij.AUmdGhN5kdytzZ6tD3rdoZVTX ks4OyJO1BWrYy2HQDiwBuk3J9xL5RYOCJXShmLdRkOCEM4gS6wlG4Yi5WSjmkNpsIh4S86euhhu5 yryexHC5YidC0D44js4EuaNipaHvBeE9.SJGS.T9BsVYUDNnLQv4mLI_e5PYBz.RePDJn3yQL_ZY 28zC.RFSGdq30KGiZBPBaBk.QQN4S.3RDs2OdF8Pk9zGx6rFNvmYM24AlutivddIMqszhZYqUtKO OwfodWDaFmdhINJx4hluCUncRX6NOnCfAM2xz8qWeaJS6SwvHGUet2zJSEetODxTRGR7YIWHr31x s21lt8cJOMNZRy3ae7QHVzV1y3M9xhbft.4uVkTO1_Rqhx6Df8YuYKa5MfNx62nhGZZ2D6G.v15p ej6zgKWo30eUHPMXwvK93PB64UvcZEBNZ5T9Ru7tyOtwutyNjp5.1OAGrqURqWTzNA957FKgda9t 8TccyMTLwVHV.xMcaKMUkTmeuCpMTyEpSk.gU3kH3BPZ6YG17IM2.tAWuIv8qrrakHOUJMLDBPTF z2EHlPxcp3NpaqKqM7YK_7zDPCsR0K_dKPVAXOcARuRr_FQfwycvkeoHSGgytw7ZIBUCiYj6kB.P Np6dpTBVXQKF4DxE.EiCkd02KPFTBcnFUYGtM0B1OCFucHfWF8fB5upUaU5feITX5qyuOatBSdqQ iVuHwDMPAxiYDruMHJV9Y22uNSzMwETY9PKy8DBbapQHjw1r3uyyS8uofwRq8fyxBj2gfjvZYT4T 9QT5VrSRVCvec1ggShTMEP7qwjMBriUXBvHieCPPBr96A0OP1 X-Sonic-MF: X-Sonic-ID: e9ab4b7c-0df1-4ae7-8af0-626c7b23c5a0 Received: from sonic.gate.mail.ne1.yahoo.com by sonic303.consmr.mail.gq1.yahoo.com with HTTP; Tue, 5 May 2026 18:24:48 +0000 Received: by hermes--production-gq1-7bb7df5c46-bkqln (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 857fb219e78bd26237f7c6de75f4e53f; Tue, 05 May 2026 18:24:44 +0000 (UTC) Message-ID: Date: Tue, 5 May 2026 11:24:43 -0700 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: c4f08d46c7f7 - main - llvm-*: Move all LLVM_BINUTILS symlinks to toolchain package To: Nuno Teixeira Cc: Lexi Winter , jlduran@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Ed Maste References: <69f5387a.26bf3.36f56fa3@gitrepo.freebsd.org> <994cef06-a1c9-45b8-b807-3449517fe381@yahoo.com> Content-Language: en-US From: Mark Millard In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailer: WebService/1.1.25559 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Queue-Id: 4g96PM60LPz3D6m X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On 5/5/26 10:27, Nuno Teixeira wrote: > > > Mark Millard > escreveu > (segunda, 4/05/2026 à(s) 22:08): > > > Hmm. Your list happens to overlap with the later fix: > > > Yes, I see it at 045a9ef829 ("llvm: Don't install /usr/bin/ > {gcov,objdump} twice") on my rpi4 with worlds builded from scratch: > > ./tools/build/stale-symlink-buildworld.sh > stale symlink detected: lrwxr-xr-x  1 root wheel 12 May  4 18:38 /usr/ > obj/usr/src/arm64.aarch64/tmp/usr/bin/c++filt -> llvm-cxxfilt > stale symlink detected: lrwxr-xr-x  1 root wheel 12 May  4 18:38 /usr/ > obj/usr/src/arm64.aarch64/tmp/usr/bin/objdump -> llvm-objdump > stale symlink detected: lrwxr-xr-x  1 root wheel 12 May  4 18:38 /usr/ > obj/usr/src/arm64.aarch64/tmp/usr/bin/readelf -> llvm-readelf All those paths involve /usr/obj/usr/src/arm64.aarch64/tmp/ . In other words(?): they are from the bootstrap build stage that is sometimes used? May be what cleaned out those llvm-* under arm64.aarch64/tmp/... (or did not need to create them) did not clean out the links to them as well at the time. > > Thanks, >   > -- > Nuno Teixeira > FreeBSD UNIX:     Web:  https://FreeBSD.org > -- === Mark Millard marklmi at yahoo.com From nobody Tue May 5 18:41:02 2026 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 4g96mC2WSGz6c83W for ; Tue, 05 May 2026 18:41:15 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-oo1-f53.google.com (mail-oo1-f53.google.com [209.85.161.53]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g96mB1MQsz3HmK for ; Tue, 05 May 2026 18:41:14 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.161.53 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com; arc=pass ("google.com:s=arc-20240605:i=1") Received: by mail-oo1-f53.google.com with SMTP id 006d021491bc7-6949f3eeaf6so98245eaf.0 for ; Tue, 05 May 2026 11:41:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1778006473; cv=none; d=google.com; s=arc-20240605; b=ANId16bE6qtLSOgukuQLew4SELtt99s75Wrh4kzd6JzW0NPhuZPXIZJ7UhVoQvQGLI CaOVoEnpkzfBepTkXkRThODJh6tUb88URXpiV76/0epP+LEFjhfUSRKPUpHA8k7/Gdbz fxRhBCHpKluQVp/8g5nN2H+9Ysf6BtU/E40iWijnoY5Vbvnxv/n/0swILZzpTEViU6fh HJ2j9XiOMFsQfNggdGjCMr6v+BFe0QAGLw4NYQK8E20KDgFCh8UWobbNxt2eZA8FLAwD wm7XPYuJlfzd4zXZDAvdZPiVvFzlKv00Bj/n2hCVsIB+UXs4Y+4XTXSL4KlPQsSs+8o4 W65g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=to:subject:message-id:date:from:in-reply-to:references:mime-version; bh=1NYxSU6nUPwce6w/hGngtkUgucaC2MINAQrGGf+A2ko=; fh=0sNbY72RQDGs6BQFEQLJxxuuLcDZfXcr35dPL9B7wNA=; b=XYFhEPe/IWfuknSbrip8Va+WmR0HzWNOmDB52fWoG1SQqhHX8D6Ng5RaUeo2E9Wrvi mr/DLfgPa2dBzNXVVR43cOYiso3yDxwHc3sHCkOC9VPJwZZAeSYqHEzNA3dlQfrxhCDI ACcXqcK0j+lHHozQuVT69wWo8w0tAjcK/t+lIGyPbQzR4NJld4c7M2kB+MQHeTcjqxVa VL4u6F5ScPSkTmkJf7JRhd0NH5Iwx83VJO7LitSEw/cwT1XvryPjrnx95pz0riUEEJB8 bxVIvRlMaL1vFcdjsc3dsINl73MuqjXFnvImblYbiADobjvXCqifjWpFwVdQp5C9hxER EsFw==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778006473; x=1778611273; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1NYxSU6nUPwce6w/hGngtkUgucaC2MINAQrGGf+A2ko=; b=fQgoHf1fEbWKCHbiRYEl1M3yfZoc2SW3OTC+QnawTz+4qyJTInf/WYqT3M16YsLvNc GFJBWAJtFWyV0M79YBrkDggVE85GY/KlX1IFr4YF3V49IYTlNxE7JX9BWfiVgm9iDqDx Y7qN9bxwTWoy8AyINLswTfPkVjVWekhHL5BrWhITYbxcF10C29apyqONM/P56ffIpZIg oOFIvPcMsLgR5w1qtR8BxjNgMnihJTLN0E2K3fTBj7+I4qUHsuMzJ7vBX5uOraFaGpni 7j2Z9/vTy0oah+CFNGYNkEVmcF8TedXvCawsjSDhT/t8a6AEq1PA/NZAiEaTO/aAOE6O tgZA== X-Forwarded-Encrypted: i=1; AFNElJ9GeOUJYjCN2tCfahWjEcIP0GmTTxmi0LaBzF7sOaKm1vdEvIAo9uS6MV8J+erKQHmzVV8wJScKcsAtn7DsCQ1UsxX2wg==@freebsd.org X-Gm-Message-State: AOJu0Yx4JEwHKcQUV8jHd/bvWRebvEDGxt3qG7S3zevyNV3nTu3kY3O5 WGlsBGkl1/VU0dOgXvKB0WLJAfoR7rxINtHppCJzlP5J2v9uUwGNbilVIGfVlm5xoSXpCkuAgkn b6vdqwznKI8IRcsnAvil/3zs23WmoHkw= X-Gm-Gg: AeBDieuMeuhfSiXGFzXwYJHFtn8oGZKq8tmSfP9KQ0OosVObHDp1IWWIjZ5bomY+YSa yskYBzkkYD0BgP9iTsST/tDBBdT1vXaUjqOGeEuDDe1Bhb9jLpgimXJ/L3MN17c3pmHxs4q5HUa NwHl3knDhEE0pUIvZ9+pjLwvKB38ynJ7wQ0Ow0Qw1HH6+3lcGuwDMTfxx0iKkD6XIt2VesqTkkX nQVjlXtPlBXXtgdkf4fqlezPOkzQsn2VUlfy1bnwA1EHYq3zNSROPrbAS+99jVDNaFX0hk8mInV zcpIawXk8Qqz3Ss8eOLJqa9x1vvZ7YIcMDrCg+y87MqiZXmxcA== X-Received: by 2002:a05:6820:858c:20b0:694:8932:c794 with SMTP id 006d021491bc7-698876f0804mr1630600eaf.5.1778006473162; Tue, 05 May 2026 11:41:13 -0700 (PDT) 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 References: <69fa2a0a.33d7a.ce004a5@gitrepo.freebsd.org> In-Reply-To: <69fa2a0a.33d7a.ce004a5@gitrepo.freebsd.org> From: Ed Maste Date: Tue, 5 May 2026 14:41:02 -0400 X-Gm-Features: AVHnY4I0gW2mJpc9uOBpnhqsBR0sSUH6mf5-Gxod64DH2dySbXsvAcMqLKaxeXA Message-ID: Subject: Re: git: 89c883c09ab5 - main - mii: Fix SMSC name To: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [-2.54 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; ARC_ALLOW(-1.00)[google.com:s=arc-20240605:i=1]; NEURAL_HAM_SHORT(-0.95)[-0.946]; NEURAL_SPAM_MEDIUM(0.40)[0.404]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; MIME_GOOD(-0.10)[text/plain]; RWL_MAILSPIKE_GOOD(-0.10)[209.85.161.53:from]; MIME_TRACE(0.00)[0:+]; MISSING_XM_UA(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FREEFALL_USER(0.00)[carpeddiem]; RCVD_IN_DNSWL_NONE(0.00)[209.85.161.53:from]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_LAST(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; FROM_HAS_DN(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; RCPT_COUNT_THREE(0.00)[3]; R_DKIM_NA(0.00)[] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4g96mB1MQsz3HmK On Tue, 5 May 2026 at 13:34, Ed Maste wrote: > > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=89c883c09ab5e0fdca7ac5dfe74fcc46b7669eb5 > > commit 89c883c09ab5e0fdca7ac5dfe74fcc46b7669eb5 > Author: Ed Maste > AuthorDate: 2026-05-04 23:13:44 +0000 > Commit: Ed Maste > CommitDate: 2026-05-05 17:33:39 +0000 > > mii: Fix SMSC name > > The LAN8700 / LAN8710 PHYs were Standard Microsystems Corporation (SMSC) > parts. I presume SMC was chosen as an abbreviation, but the company > always used SMSC as its short name. It turns out this isn't completely correct. Standard Microsystems Corporation did use SMC in the 1990s when they produced complete NICs (e.g., the SMC EtherEZ 8416BTA). By the beginning of the 2000s they sold only networking ICs, not complete NICs, and exclusively used the SMSC name. The SMSC name was firmly established by the time the LAN8700 was introduced. From nobody Tue May 5 19:02:18 2026 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 4g97Df3zMxz6cBFd; Tue, 05 May 2026 19:02:26 +0000 (UTC) (envelope-from olce@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g97Df3BDsz3KgB; Tue, 05 May 2026 19:02:26 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778007746; 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: in-reply-to:in-reply-to:references:references; bh=d2Li/jA13aWyRFyPctNOyybo1wqU32JzIPtb2iI4l10=; b=yjB5qrPM8l+IlhIA8GQoAH1TwPujLB0dFQIAy7onDpdXjHgynBzbLHrOqTrUEdhKmLzoKc WBSz2fSrIFpug3sTt4YTBaAW8UTb2fVPxN0b+2fw9mWTm5/7fXbVe9lBnfJmracSkKTuFZ fEP9FhTbdaUFhScxHL7Va3Q0FsVOqGxXCsXbMU6QRUwyTM6l8YKW9Zi2F8pyE9F7WQdXjd O5Pn1OPITYAcFdiHMO3dMQ5OKxqnahMFwSMcMv1fsZwXzqbgAUUwnwgk52Ti7v12zsEAGW gOZH3+W8BGf6Nz1mfIb+nxdEUbbGyX1zcFWl1rrtldP1OtNDn5qugixrtn/Oog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778007746; a=rsa-sha256; cv=none; b=GK7qp5KGRuilnD68Id+bwhL+DWf3bGzAQ1GCUEaMBz/5znpvflYsmQewpK6DqMVfGL0fDJ O31FJCedHmjZCIw/fu6F6vs6XKR1Nk5D/yZ8+NBk2oT4FkNz/AcKY6pEx2oHJukb5c61oG q7r9MXB5TJZ8+E30OJLLFIVbZDoUdE8pPHtrINJ6f2Lqw1naW4mFFmTBgqxE1qDypKHYjh Ycb72smfJiU0gvNZOWRQZWt4RV1Y3o0hJYBUWhnEWLOmDd0Y7udmGMouawzMi5RU2xM5Ai hEgEjz2ZsoHe524DLAmF21DD1DM4FMvqOmsf5rqZkOkL9FdL9QojAzBsL1/w8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778007746; 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: in-reply-to:in-reply-to:references:references; bh=d2Li/jA13aWyRFyPctNOyybo1wqU32JzIPtb2iI4l10=; b=rB90eSIi+QRtearL+B76JOVGfEfaQCLaFI+MBZOJO9LMWbG3t+JzC6yHDYtYXHUaa9mt05 MQeO1tosztci89FMVa1vGpVSqpaJvuVzysS2OCCaD9D8jARmbd0Bb+oj75lcHfduLCJGZ1 XNiP6KUQ1gHtm/n/fgNdzEPiBwCuZJJH7jwooQucWzFOiiKT9LvDuyzdF/XunTmmYAFnva BcyTJYWBgam/6cb6+mLQgOqjEE4L5AHvcqby6iX5fiaJsv0Y83YVtBibBJJrFoJkXwOPYq k6cGA3eMAqG3RFxTNe5uTLPWR6RJlSAmAGaiJF7cwzRVB/vMrBkLE9p1vuGkQg== Received: from ravel.localnet (lfbn-nic-1-328-19.w90-116.abo.wanadoo.fr [90.116.162.19]) (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) (Authenticated sender: olce/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4g97Dd5Lkdz5mn; Tue, 05 May 2026 19:02:25 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: "Simon J. Gerraty" , src-committers@freebsd.org Cc: dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Konstantin Belousov Subject: Re: git: adad6862228d - main - mac_veriexec_priv_check block proc_write_*regs* Date: Tue, 05 May 2026 21:02:18 +0200 Message-ID: <2679361.0dHE6SNnxz@ravel> In-Reply-To: References: <69fa2928.33b54.5ad14de3@gitrepo.freebsd.org> 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart4271060.BRNeRiNLvY"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart4271060.BRNeRiNLvY Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Olivier Certner To: "Simon J. Gerraty" , src-committers@freebsd.org Date: Tue, 05 May 2026 21:02:18 +0200 Message-ID: <2679361.0dHE6SNnxz@ravel> In-Reply-To: MIME-Version: 1.0 Hi Simon, > > +#define PROC_PRIV_CHECK(priv) do { \ > > + int _error; \ > > + _error = priv_check(currthread, priv); \ > What is currthread? This is missing the last round of small changes requested along with the validation (https://reviews.freebsd.org/D56763) and I guess breaks the build. Regards. -- Olivier Certner --nextPart4271060.BRNeRiNLvY Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmn6ProACgkQjKEwQJce JiedrhAAqa3cnZwiZUy0/Qd1a+eZkQoUsdf7jNf4maNLsz+wosglOoNu2+JaWM0t juUYgS0xN0XYLCyEkaXg6LDyDgx759NjScuGGc1gVcF1xUcQdInv2nLQT8uKlKD6 DHcd5B982GrrRvRwwxGWt/cnuknr8qF44CaYkyKnmwsOGP79YnrVq87+i+WtqxHC fh/niqjAfjs+4xlj3tlHMhxq6U6IA6CmZk2pIqPl9GtdEGpylISUHlc4o5aP6/Dd eDCn0y4gU8rA18MRfnhAaB82n+hxNg0xNgrRehLdkVkZTaRefwe5TotUyKFuLslk pPvkKgTh5IHVm8GFFikoG4HtcojVi0eX22sRA1QSTDVntl4esfMcV3k8SgCwN4TE THh7nkCLdwUdMWbvEpS2ffrd8hECk8i5kTtBTd+IolZJtAuvVjjyWxOhR0ug2RRB LiK2hCPCZJEOqkuYFI9FCOgLpU+hC8iluFwQLV57wa28yL5b3Yc90laNkgwtYKx3 qv0ZyhyVFNMRbZ8jxxwE/RcD3ISBUB/Ecfq5FRYDkz9OCe+o8rAyngi/8JHRggWe hnTxzYKuEWr+nuU6vRXg6GxiFTEWzcsUXzpNaLtDbSi0HX3dzjMxVR2vBvkiRerL CBAi2xW/8xXGEBcf+G9qjav06NkpGq9EKiLHKiyqfKOdz8SLT+Q= =mz2B -----END PGP SIGNATURE----- --nextPart4271060.BRNeRiNLvY-- From nobody Tue May 5 19:44:46 2026 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 4g989V5ysJz6cFgZ for ; Tue, 05 May 2026 19:44:46 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g989V5NyVz3X61 for ; Tue, 05 May 2026 19:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778010286; 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=fF9WJbJyHFkQVRIR0KjyBR5E29ycG90DYqxwpgvvPu0=; b=loGumpbJVKdf65QQCFC6SFQr4HL+Pyu1IaTId3/J2r62lSSU+tdnm7RKACCtvpSIYMzoVf 3nu09xnhtDl/pFAbUWEHa1G+m7Q0ZZG39ElUjUUxsu6NHsYaTLwH5sTd8wBZnhozPxGejw QCnJUrK4E0Lj4+HO3v8UX9WM+aJLnnhtAI2bKp0HG73a1niZmbF+D6BJhGHWq7p97kS5/j jdYJjg3WgfZiBCxNMMbYVEq3ALSp0gsZgsJ11lHemoB3Vb7ZbH5wMCTIqVHLg4rHd2wGRq 3SV/YJmpAX4wi+RETAWMz/ShaPZQ21dETUGL0Ov+WRe8SViySVuhuzFI92Rs0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778010286; a=rsa-sha256; cv=none; b=VhfWjUCbUMXM1K5rtE0Or99glDbUoRMfqhyJfniVNDQZowKpML3Z05by2f1F+50iceNcOk Hg4Rlz1z7mgOnA8HDbQzgRy2VvlFWg4Nh2ysu7IXfvf4xZum6PwB0/Qwmf8BGxHtixw7Mg 9qQJMtLVaKNM32PE7WzqfiZc1DAqKsQElYj5NGdQltoI2WYpy/uO5I3KkZwVf7mWEsszou H/kGG7Sx1P5xiRJBfFtfsm4QS/EBmeTWdvOerL5bJ5eWhxfpzOikvb0VxEiEXCp7wpy0bm eAktLzTz2d8njq9QZ1yst2LwD+hbHwRp1guaEihddoJ7HdHmc4cUJeL9PbFP4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778010286; 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=fF9WJbJyHFkQVRIR0KjyBR5E29ycG90DYqxwpgvvPu0=; b=qqn36EkmFuasdempSlRX/B/8MabVMskOe9HrW8xxPWEQn194GRBTDfGeKOYWU0lVSbIpid 37IoGoJnbkSvvTcamCI/vNWBLazKUCJ/N9GNGNaYM/AmIeL2UVTEQNuJO9/HrTXyFbClGW /MLyj3U8jYIMsqadbPtDzmKK9XUL6O24xvZgIk5q9ko+jbWbtl4unzPFDtmmUdIAwiVGHy UtF7H6pLW7tuva3XSHn9OL6nlCPaishjBVgWaTolSzo+dAqZu091QoD/yMfFEe/x065+uN 6H5DkQP74x9I4s+8VRpWLZUBicf5uvEZ8FEcennNYUAYsCIOzt0JjBGx8E1v6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g989V4jNqz1Kcs for ; Tue, 05 May 2026 19:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 411ad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 19:44:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: fd386e76fa2b - main - md5: Don't generate test cases just to skip them 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd386e76fa2b29d99525c246cbfc05768a1f4a76 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 19:44:46 +0000 Message-Id: <69fa48ae.411ad.49d9df99@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fd386e76fa2b29d99525c246cbfc05768a1f4a76 commit fd386e76fa2b29d99525c246cbfc05768a1f4a76 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-05 19:44:29 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-05 19:44:29 +0000 md5: Don't generate test cases just to skip them Don't waste time generating Perl test cases for algorithms that are not supported in Perl mode only to skip them when they are run. MFC after: 1 week Reviewed by: ngie Differential Revision: https://reviews.freebsd.org/D56687 --- sbin/md5/tests/md5_test.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sbin/md5/tests/md5_test.sh b/sbin/md5/tests/md5_test.sh index 34bdf43f13ea..a7632664c7aa 100644 --- a/sbin/md5/tests/md5_test.sh +++ b/sbin/md5/tests/md5_test.sh @@ -176,6 +176,7 @@ out_7_skein1024="cf21a613620e6c119eca31fdfaad449a8e02f95ca256c21d2a105f8e4157048 out_8_skein1024="e6799b78db54085a2be7ff4c8007f147fa88d326abab30be0560b953396d8802feee9a15419b48a467574e9283be15685ca8a079ee52b27166b64dd70b124b1d4e4f6aca37224c3f2685e67e67baef9f94b905698adc794a09672aba977a61b20966912acdb08c21a2c37001785355dc884751a21f848ab36e590331ff938138" for alg in $algorithms ; do + eval "perl=\$name_perl_${alg}" # supported in Perl mode? eval " atf_test_case self_test_${alg} self_test_${alg}_head() { @@ -228,14 +229,13 @@ gnu_${alg}_vec${i}_body() { atf_check -o inline:\"\$out_${i}_${alg} -\0\" ${alg}sum -z - in atf_check -o inline:\"\$out_${i}_${alg} -\n\" shasum \$alg_perl_${alg} digests :>stdout :>stderr @@ -394,14 +393,15 @@ EOF atf_init_test_cases() { for alg in $algorithms ; do + eval "perl=\$name_perl_${alg}" # supported in Perl mode? atf_add_test_case self_test_${alg} for i in $(seq $n) ; do atf_add_test_case bsd_${alg}_vec${i} atf_add_test_case gnu_${alg}_vec${i} - atf_add_test_case perl_${alg}_vec${i} + [ -n "$perl" ] && atf_add_test_case perl_${alg}_vec${i} done atf_add_test_case gnu_check_${alg} - atf_add_test_case perl_check_${alg} + [ -n "$perl" ] && atf_add_test_case perl_check_${alg} done atf_add_test_case gnu_bflag atf_add_test_case gnu_cflag From nobody Tue May 5 19:52:40 2026 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 4g98Lc3kBgz6cGGm for ; Tue, 05 May 2026 19:52:40 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g98Lc2zCxz3YJv for ; Tue, 05 May 2026 19:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778010760; 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=5eW6mZTs1TUNd91ANTGgVpZHrOPsrISYx9KSUTnWTLs=; b=b8bMp6dXJq3oyyajzU/GJ5heqanBUEj9G4qcojvRQuqGkYRA4J8Bbgtpo1aBy7rTvikoKO g7c9k2FKWjor0fQWWfYvzsCRZynnCrN6I+EBiq/zH2xv3MhNVH2uq3UkdopzJZHEU/7cuO 4G2pNQnAoNI2SWVfBPHYOu3m9Wx6qx1tVvj7mZEj8y0vVyGDm0uH5imK88618QnKcZdd/k UEEnPss7CuHFz8Yo3/55Ied0O3HGZoOkKHsJ5TIwKojLq07niECb+WVNPKjr5JG4fWl9Qw oyG2W43t51CLoUPrd5QcWOmx5OOuQRF/jh1WS9zi0JqFM+25Yam463bfZBgG5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778010760; a=rsa-sha256; cv=none; b=c/JbYd/3adQ3FM7xkDAvDz3kcq5zxsQ7lAoIVMMSbdaBsAmjPEklubWHpMHMsNxDjzWjY5 nHvHCMSkuzpakbxHJlWcETHCLtDYUBsRP6JXZb2JL9Ym+hnZ1Nysod35/giKABKmpOnpvj 5jPwAEcjgZBDyOaS/XdGm3cz8Ucke8DaDbLP7CPCMg6nVtD/E4AVdWhqjmKJD4CBPVegiS S7O2rI1e69Ldkw2YFvjIMrXprEevaPlFq6pCNxZX69RfZfFuM+vE2zYpByiQiDrUYkrTgv eBcxqBxxMKj1FVJHNHDV1ccGC0Iud+t0w9XaD5EILqtePYkEWrK6BysfmQcKMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778010760; 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=5eW6mZTs1TUNd91ANTGgVpZHrOPsrISYx9KSUTnWTLs=; b=xk1djWGKYHnFkCSgatXEkYBdyatmKCz8ogra8iRmyXvANWeZDcL5GvpjRmY1N0W/U/ef8L yx0ljf3sKglyOvfFadTxfAEVZ/CwgaI13V0EMG4H0e7w6bcXOk4qWpC4HB8WL84ZiKrj59 uEwdGFjB3lz27pnV/q3MUoXIKWlxIDtYsdrr1svIlLkJYio63CLGppob6s2ppRjO07PIRL 02HpHS+D6Lk+OzqAUKNBGZ0xDbcmpzh/pwev4w0EQTRHIKiMOKfxKjiBTC5A9qSLODzxH5 QEtLMkj7DdssdJxWYkODKgC5UtRqPs6yPH3NHblNammd+nmKa3UEVJYVYJWKAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g98Lc2LWrz1Kxq for ; Tue, 05 May 2026 19:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 407d8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 19:52:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Enji Cooper Subject: git: 7619d14d08a0 - main - acpi_panasonic: acquire serial lock before calling hkey_sound_mute in shutdown 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7619d14d08a0036a07dce670f55b9568f8133b38 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 19:52:40 +0000 Message-Id: <69fa4a88.407d8.5b776998@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=7619d14d08a0036a07dce670f55b9568f8133b38 commit 7619d14d08a0036a07dce670f55b9568f8133b38 Author: Abdelkader Boudih AuthorDate: 2026-05-05 19:49:01 +0000 Commit: Enji Cooper CommitDate: 2026-05-05 19:51:38 +0000 acpi_panasonic: acquire serial lock before calling hkey_sound_mute in shutdown acpi_panasonic_shutdown() calls hkey_sound_mute() without holding the ACPI serial lock. Every other call site holds `ACPI_SERIAL_BEGIN(panasonic)` before calling it, as the locking model is caller-owned. This seems to affect the whole Panasonic Toughtbook lineup btw. Reviewed by: ngie Differential Revision: https://reviews.freebsd.org/D56718 --- sys/dev/acpi_support/acpi_panasonic.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/acpi_support/acpi_panasonic.c b/sys/dev/acpi_support/acpi_panasonic.c index 8fea47ee45e8..5f54ca07c5a6 100644 --- a/sys/dev/acpi_support/acpi_panasonic.c +++ b/sys/dev/acpi_support/acpi_panasonic.c @@ -233,7 +233,9 @@ acpi_panasonic_shutdown(device_t dev) /* Mute the main audio during reboot to prevent static burst to speaker. */ sc = device_get_softc(dev); mute = 1; + ACPI_SERIAL_BEGIN(panasonic); hkey_sound_mute(sc->handle, HKEY_SET, &mute); + ACPI_SERIAL_END(panasonic); return (0); } From nobody Tue May 5 20:08:17 2026 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 4g98j773dPz6cHs9; Tue, 05 May 2026 20:08:43 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from mx0b-00273201.pphosted.com (mx0b-00273201.pphosted.com [67.231.152.164]) (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 "*.pphosted.com", Issuer "Sectigo Public Server Authentication CA OV R36" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g98j74y9Mz3bGP; Tue, 05 May 2026 20:08:43 +0000 (UTC) (envelope-from sjg@juniper.net) Authentication-Results: mx1.freebsd.org; none Received: from pps.filterd (m0108163.ppops.net [127.0.0.1]) by mx0b-00273201.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 645JQGOL3607013; Tue, 5 May 2026 13:08:42 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; h= cc:content-id:content-type:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=PPS03102026; bh=uJ/I7VXKe sCuy+Pruyak06TExeOPRIWtY9cI2MnkKXA=; b=DC2K0bEhHo4aEsxR28vHTMbcX QfR1R3eK6730AsZfIJLMAulW6whjovRDGMxIqB06+pAjozZXY3OSoZNJAp5asFBI 02uGK27hA2mlkP0UHQm8h5aCk9mdBNcJ3yhTxQrqEXQIISRw1deJQkiRAaPfJrhc 6+BIGHO0hVMPlKe7azRy8fbDkHviLr/1HlnRuKg2z5oFrE2bcGhiSgDTMYpFssVW oUC00n/U+CuKjgtlihfVO/wJJeRzuVscKo+z6CcBjSimh/LhQM+hgj9KlWf1cwQd f9fHDo9T0BnWkRmvlwlj7FWgMeeRGPusFvHT9/txX6Usb8GE5eg1Rgq/M6UfQ== Received: from ch5pr02cu005.outbound.protection.outlook.com (mail-northcentralusazon11012055.outbound.protection.outlook.com [40.107.200.55]) by mx0b-00273201.pphosted.com (PPS) with ESMTPS id 4dyb1rvarp-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 05 May 2026 13:08:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eAUWhAANj8KpRuiyGcQ9W2yusBO0E2Czdkq6ewBOfANz/QfHqEONpNQcsh6PzJJTL3D+WE/DXTdOYXBMehNtPE8eVBVa1OlqwHf3MqSjJ9WarJLt+qRsakeUphOEigB7mNAwGvYpM9kZQlG84EU7koVofkVDa3OxsRsVKtXYCvE9JoZVHSdJ05VWjuUoMzhCn8qmaOAql9Av70U9dQyAwVWbFTwgliF5QkoxuE4YODX8/8MG9sZqU2WwSSpVLEuvKd9pIE9e/YpqAvGS6tz2CKx/kBEIPaI0vboZAeQw3qhAEHZ3gTA8ROkPBnDG112pjIQZs36U6WwX/kvPo8HO3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uJ/I7VXKesCuy+Pruyak06TExeOPRIWtY9cI2MnkKXA=; b=buL5rL45KHVrbgPd74TcdgtaDq4RyDU5FYPO+vyC/gB56lDOzasGdDR5ZhvfmDrvHADhiCS1qjZV6k3j8T+AwV3I+e57rlLAd2Iln/RPsRbej0cjXu4PoZBkj8HOToEstNKZK5LPLQW7HwsWZs66DSIj5ilTjseqIjZT6vZJ6zL4C9cS3PDn3qD3q8U64iRyoGAYg3YaMUjMFQf3FjPVJ+6CrF4BiT4TjUmSayAFJSQndeFGYoDEo4zFK08L6Nzj1zVGzDPyNn/vcRXHOK5DqTgKO4fXT9MW2+GnwUaKr6DWcebpeg2wvO7W6NfNDdga7PFGpS9GCb7WNYpehmyFfA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 66.129.239.14) smtp.rcpttodomain=freebsd.org smtp.mailfrom=juniper.net; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=juniper.net; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uJ/I7VXKesCuy+Pruyak06TExeOPRIWtY9cI2MnkKXA=; b=JwqcHb2cEOlsXOcL1J+A4/1HNVX3adQCW1TuaAh0FTwrG2Zn6eooC3Zk3ro9tR0LwlI6mM4SS0Ko1d9ZouIhxrYw1Pfkn8LII/ZdeKHMeKKuJYq9ypRKGdMLfiyKtHFOEkfb/5rov0Yy6Kg4i1gOmHHh2V3w/oNFDucGeIKitLE= Received: from PH8PR07CA0028.namprd07.prod.outlook.com (2603:10b6:510:2cf::23) by DM4PR05MB9392.namprd05.prod.outlook.com (2603:10b6:8:110::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9891.14; Tue, 5 May 2026 20:08:19 +0000 Received: from CY4PEPF0000E9DC.namprd05.prod.outlook.com (2603:10b6:510:2cf:cafe::ea) by PH8PR07CA0028.outlook.office365.com (2603:10b6:510:2cf::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9870.27 via Frontend Transport; Tue, 5 May 2026 20:08:19 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 66.129.239.14) smtp.mailfrom=juniper.net; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=juniper.net; Received-SPF: Fail (protection.outlook.com: domain of juniper.net does not designate 66.129.239.14 as permitted sender) receiver=protection.outlook.com; client-ip=66.129.239.14; helo=juniper.net; Received: from juniper.net (66.129.239.14) by CY4PEPF0000E9DC.mail.protection.outlook.com (10.167.241.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9891.9 via Frontend Transport; Tue, 5 May 2026 20:08:18 +0000 Received: from p-exchbe-eqx-04.jnpr.net (10.104.9.87) by p-exchfe-eqx-04.jnpr.net (10.104.9.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Tue, 5 May 2026 13:08:18 -0700 Received: from p-exchbe-eqx-04.jnpr.net (10.104.9.87) by p-exchbe-eqx-04.jnpr.net (10.104.9.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Tue, 5 May 2026 13:08:18 -0700 Received: from kaos.jnpr.net (10.104.20.6) by p-exchbe-eqx-04.jnpr.net (10.104.9.87) with Microsoft SMTP Server id 15.2.2562.37 via Frontend Transport; Tue, 5 May 2026 13:08:18 -0700 Received: by kaos.jnpr.net (Postfix, from userid 1377) id 04EFDC961D; Tue, 05 May 2026 13:08:18 -0700 (PDT) Received: from kaos.jnpr.net (localhost [127.0.0.1]) by kaos.jnpr.net (Postfix) with ESMTP id 0384EC93EF; Tue, 05 May 2026 13:08:18 -0700 (PDT) To: Konstantin Belousov CC: , , , Subject: Re: git: adad6862228d - main - mac_veriexec_priv_check block proc_write_*regs* In-Reply-To: References: <69fa2928.33b54.5ad14de3@gitrepo.freebsd.org> Comments: In-reply-to: Konstantin Belousov message dated "Tue, 05 May 2026 21:19:37 +0300." From: "Simon J. Gerraty" X-Mailer: MH-E 8.6+git; nmh 1.8; Emacs 30.2 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <83488.1778011697.1@kaos.jnpr.net> Date: Tue, 5 May 2026 13:08:17 -0700 Message-ID: <85671.1778011697@kaos.jnpr.net> X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9DC:EE_|DM4PR05MB9392:EE_ X-MS-Office365-Filtering-Correlation-Id: 8f84b100-8fe9-4b28-5304-08deaae20cf2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|82310400026|36860700016|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: pZhFKBjXSbvmzUA/z+zk4P+keYahbnf2V3H2YbIWnXou82Hqay2Aw2Nse3gOjJmjCTzTXI2+GyUiPoOvKSdeoNC0p4uz0/+CzrBpcf2jD/R1LKaLYUiZ/kXAQG+R7GnjkDQvNFTcliSJIqgsJy0KS6xLeZFefA6sjwZWIb29fP8gb6Z2xZLxPa8N48zEoFEzIdPZ7iIL7yZtICwlHBY5xba8wGjvWaOYGdqkmis29QssxpwGcoEOKDLbXPNtDgWO60c9dqJyTm9XtnRdUSpjSS7c/ea2vcp96mkoRBgSdXwjMGBkt++O2h/oQShIOjoaRdHVIdxLeapL8O/DcDk157vjblWFGtkjxuYOewHG6MJZ4AN9CumLYql+vhFBlOKhH/Tx4/SbhZk483usT+PHJLDTBimmXnNRcD1Se0mmux+RgCvwNQQVwoLSWOTSm/I6ed+cEZK9SW/+8dLyTJyPFCKgUUUHnqJcUMQV8pZP+0nnYH09kw7NSNCIixfKymzljGGbUzdZAL/oFfOEqN8+JmMzUXUSw79nkHZIo2U692xsucDJj+jxf3eauxPjadbZ+96d+ZDlCBk41Ly7OmaIbQpcA9d47WplcGvMUeQ1j/HgL3vtAyJ+6q4njZct05GLJ6GiLunSKod1SKzSG2eUdoLJqtda+Tllc0S+M9z2SxEjW+5kxzj/CiCWKwq8Hki6pSsOz9pHoQ4VY342eTJgPpQs+91wh0BeXpdpHsiVBJI= X-Forefront-Antispam-Report: CIP:66.129.239.14;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:juniper.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(1800799024)(82310400026)(36860700016)(18002099003)(22082099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oFrpFIVI9Ubaz/r3GxceGrytSiYdT/Z2h/6rctMWuUwcIwEAvETJ0sRkUZwMLS2WDfXjCWk7nesqy4DwbhnTPZfDFhIQS0R9ag0tD5DgPrG71iAFgYMjGPWCh4Fsyzw4LSR0OdIvpegKSuszspgfIVzAy4w06UYAhycM9HK4zvhrG8rzHYOne9zgAWL1HSXRvHuTgzF+hJl5uNQNoJChMiirqJXCnqIUJAKi29ssKlMC5kYFbm1ZYqyhuVuXkPSRUkLDtL4Gmt1zoMl50BNdU6GF4M1ZfojZu6uXdktBN7P91QyOa71k0aja/2SekkX9Pgd4iFEQ0zh9Es01iygHpCGtrW60jD64krmpkczBf+QA9XAWicfKkfQeo1XHB4lJyaq/3Zx5aJ7LNJxUn9mcVIgGLSauKylbGd2S46CJIS0M42vLVCLzdxF3afoHJHlw X-Exchange-RoutingPolicyChecked: a/AB+Agnxb85fLMgRqIV7Kf40oMniFS1DhstHLaaBoJt+ULF773V4UK4TOCuPOWgc3RMNL0SonsuC8bJEGV0St7aPHFr+j1+4py8qUiPeViXFR3s8IpBZcrfwtxBC3HLv/mR0FMvJct23S7BUBN+V1rGudg65JSw++qK4eYA/nDTYt0932DD15sa7wSj742VDHANa36Z3ZYELb8aP6ASAnVMY9oHT7t3OoPms6czDYjEEzcxzeiO7Ctr3ASE3gy6HCwxvGeaL3cdYI09mXz0UZk508k8ZJ/WpAGI9QfWDCxPatoqpugom1Kb9ELW+P1uJgl/IPnXBdUrx/11xTsnCg== X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2026 20:08:18.9121 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8f84b100-8fe9-4b28-5304-08deaae20cf2 X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4;Ip=[66.129.239.14];Helo=[juniper.net] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9DC.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR05MB9392 X-Authority-Analysis: v=2.4 cv=V4BNF+ni c=1 sm=1 tr=0 ts=69fa4e48 cx=c_pps a=JQIjQaBRt2POjw1IEeT7Rg==:117 a=f/rncuQqEjTEF/G1odkJ9w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=kj9zAlcOel0A:10 a=NGcC8JguVDcA:10 a=s63m1ICgrNkA:10 a=rhJc5-LppCAA:10 a=VkNPw1HP01LnGYTKEx00:22 a=7vL3O5uBSuztJ3xaqtyr:22 a=kT44gYg0zFKYNBFEzlFE:22 a=pGLkceISAAAA:8 a=YTchADhgnZfvhdZfOnsA:9 a=CjuIK1q_8ugA:10 a=qD59NlHBFxkA:10 a=QYH75iMubAgA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTA1MDE5NiBTYWx0ZWRfX6osZccAyk2UE biclFRdAHbWuHpUpYP8XA4fHTTVRWba6g6haIEAN0QtK1m7PdywlLBh3LC46FmrDlwcsizSy2eT zv8GJoKG02mQs1QnjCZjMF9VuImCdWZ0JROywtxwNxqZ79lAuOxIaJ7zIsjc1xZPV8pfQgJfMkR TUTR/oNXWoVL1zGgS0Rv1sc7zWOV3TatizYKujmxTBHQ9WLeMFp+Z1dPGhPLDF6xOuBid9DonA2 Q4EO9+vMrfrak6a1wRFkIjD6bijHu97n/va/c0V1yw5CMdn6Ckzh0nVJrNy1fmft+pfgpAZ373N z/+81BEny9QVMw1CY7wZdtH7ekQaMfmUe9P1R2PcPetQMZq+36phg0m0yu+oIRkoBJtjwRM77oX y+c7TmF2lESjmsPACG90p+a8Js4zwrVBUEi+KCYJy+jGF0/JABWy7sQAMdOPLpm5FzVArJ3+96l 1hst8uiPsMVCZ788Rsw== X-Proofpoint-GUID: y013QgHPRNzcNQg0Wf0Hf-QMy2hqHtWI X-Proofpoint-ORIG-GUID: y013QgHPRNzcNQg0Wf0Hf-QMy2hqHtWI X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-05_02,2026-04-30_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 adultscore=0 lowpriorityscore=0 bulkscore=0 suspectscore=0 spamscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 phishscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605050196 X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:22843, ipnet:67.231.152.0/24, country:US] X-Rspamd-Queue-Id: 4g98j74y9Mz3bGP X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated Konstantin Belousov wrote: > > +#define PROC_PRIV_CHECK(priv) do { \ > > + int _error; \ > > + _error = priv_check(currthread, priv); \ > What is currthread? fat fingers, sorry, fixing From nobody Tue May 5 20:14:45 2026 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 4g98r528RRz6cJg4 for ; Tue, 05 May 2026 20:14: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g98r51TThz3d3N for ; Tue, 05 May 2026 20:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778012085; 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=sSlPyHNlQdDHp43b66Dg0y6ys3Hu9yamnhfIqmXhuaE=; b=bzTIssM2l1LNRxCRgEHiiFLp3hMBk1Mvvp/zHDPl+Dzcf7RGmwjBkaIIqeQyIpDUKLysit 4/CjeVd+sH6CONR+vnfKo6E2idr5DPSaT1ds3ceIRYiNX7gDu7nGaP/9lzvmoVWa4kJTfB h41lvlb++TnSCrhNdOlEWpubcXixpN6/lXFZVwlO8GpIchMFCYy5t3Bq4htsYWMTOtthc/ f2NB9c88Ay9TIEKHii5YqSwKPIx3bQnMx+8nCPtaZpEms5UUCrs9wyWvB24pSE0SE9rNy7 9WvJ8rP3usA9bDA72RgwSpjeeW5Is+6gOstjbkgaGTKOevS3cEBzeDIl7NpfTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778012085; a=rsa-sha256; cv=none; b=HT07hIQUJs+FX/+z4O6aKnmrwXKekAy04gk3I9SII3bmk1GRzuTe8zlTp3pZOggUJx4dwN zOknPTcaFsksa0ZTdqOniIcMo+xd/KiZloAaaZwMzpG/D2evexXV4c1VLyM+sGXAzOD51U zVn7Ovlpv39Mrj9P/+kZuDBTPpZ0qN8xHpP7tXyb8ZOTU71IBPyiHbK9xyTXRzPuD3WlZf ECOkNP5ZNjuak6ztgfm5P+4xoDgz6OlD67sIxfvZyq5vJVt1YSu/mOZMIdOJDJySs3kOUq 272+1duvHZTbS5ao04jtGIPBaWv2O2eYQ+Va9oHkq2UQRchdmWAwYNETRsj+0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778012085; 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=sSlPyHNlQdDHp43b66Dg0y6ys3Hu9yamnhfIqmXhuaE=; b=Djm60PngJ4sIJ8mNjpuppTKlE4Fx0euZg8n2CDG1BX0JPoJ6xoL2z1SVECBqA1hw8c2Cfj TjSrB0m4j5VIrijAJlINrcRHVldwbcgBWTm457dSp3J5wUr2pu+85KnN3AIFebhDk2ZZQ8 MGVwyzZqueWMMosjjoyO79q9P+LVuspeJXR9+b/qBScN2j5hjr6qtru7rcrnaY0igQUhHH g5Ua9EiFrVumNaVj/IAMrKOs46J+bA5oEUHGrGMs5u3uW6WIKl4fdQFm1kdNcNAtZqdyDx yzyj0+TbXShDQBKe/3SRou8KbUfRnI5JqmsFp6QxCbPDSE+i+yXhxMpy3HX03Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g98r512drz1LYP for ; Tue, 05 May 2026 20:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44346 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 20:14:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: 8334d46162e4 - main - Fix typo in curthread 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8334d46162e46f400b04b93d79e310153380d643 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 20:14:45 +0000 Message-Id: <69fa4fb5.44346.2638bff6@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=8334d46162e46f400b04b93d79e310153380d643 commit 8334d46162e46f400b04b93d79e310153380d643 Author: Simon J. Gerraty AuthorDate: 2026-05-05 20:14:36 +0000 Commit: Simon J. Gerraty CommitDate: 2026-05-05 20:14:36 +0000 Fix typo in curthread --- sys/kern/sys_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 3a94f1c0ff20..487dc5d06614 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -74,7 +74,7 @@ #define PROC_PRIV_CHECK(priv) do { \ int _error; \ - _error = priv_check(currthread, priv); \ + _error = priv_check(curthread, priv); \ if (_error) \ return (_error); \ } while (0) From nobody Tue May 5 20:54:05 2026 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 4g99k25Jl7z6cNBD; Tue, 05 May 2026 20:54:34 +0000 (UTC) (envelope-from kib@freebsd.org) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4g99k22Brsz3kn1; Tue, 05 May 2026 20:54:34 +0000 (UTC) (envelope-from kib@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 645Ks52x080790; Tue, 5 May 2026 23:54:08 +0300 (EEST) (envelope-from kib@freebsd.org) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 645Ks52x080790 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 645Ks53w080789; Tue, 5 May 2026 23:54:05 +0300 (EEST) (envelope-from kib@freebsd.org) X-Authentication-Warning: tom.home: kostik set sender to kib@freebsd.org using -f Date: Tue, 5 May 2026 23:54:05 +0300 From: Konstantin Belousov To: "Simon J. Gerraty" Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: adad6862228d - main - mac_veriexec_priv_check block proc_write_*regs* Message-ID: References: <69fa2928.33b54.5ad14de3@gitrepo.freebsd.org> <85671.1778011697@kaos.jnpr.net> 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <85671.1778011697@kaos.jnpr.net> X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4g99k22Brsz3kn1 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On Tue, May 05, 2026 at 01:08:17PM -0700, Simon J. Gerraty wrote: > Konstantin Belousov wrote: > > > +#define PROC_PRIV_CHECK(priv) do { \ > > > + int _error; \ > > > + _error = priv_check(currthread, priv); \ > > What is currthread? > > fat fingers, sorry, fixing I must admit that I highly dislike this macro. It hides the non-local flow control (exit from the containing function) without any hints about it. Why not explicitly call priv_check() and return error ? It would be both cleaner, no potential local redefinition, and explicit. From nobody Tue May 5 21:26:19 2026 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 4g9BQg6rCDz6cgK3 for ; Tue, 05 May 2026 21:26:19 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9BQg6ChCz3x7S for ; Tue, 05 May 2026 21:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778016379; 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=P23Hvc8YDEoe40wXTXD8/zSoeRZRHkMCdfJcI4WAB6Q=; b=aueZT+TsIM7EY3RYts23Cp4Bzeq1L469FPUtfpL6qPvLk3Zfq12WnAm5vW11eZ1VpeQVEa lBwwIz+v6Wt/GXyO0bGgub5mtxhmBOHBwXq78GBOesrl5/LhJY6j1gKr8WEjLxP9zD2iP+ o+ibGQFSyfHUJH6GSrCXQ50aw0yeCFdYpj9z8geJYXGuLZL1d+pP9QfVyrMKJ4gpyRP3en 4oDYmGT1mO5fBctN3782d9BWw+jBbCpOUPNymHd7ePtym60/r6VtI2mtJYzNChKiy9UGUd ZCExadCi4ruVwZc/DL1HZ0dd6qJVqghMjxgO5Phz2uQc38QBhdXd+5b7Iv/jPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778016379; a=rsa-sha256; cv=none; b=vef6XQWeeL58ztyYFGmkBNhLL5y4N+JdLfPe0qRSfWJf/wlMGR9a6ixx3FDQ53JtiF3VW6 qohdLFiH1pSNpH/yhYI5jyIoI4V5z3jQXOoVOYU/442pY7mZOv52J4QwPCdkQZifLbSfLO jmYaim5j4VSPldsPx9M0wNlYlwJzjIV539pX1pA8Ogzcp0E2zXf/F+Ww7G6qyNHVIeGjfA rFw7zPvtOy2QHdgU7oqGQ28oIKLs+2HkcgxGUcyNQTucW2BP1lqNBK9BjijUWBTGFTMGxT drPOXJ3zoPAeArao+fuaoNvf5na4pZxySznIk5L8ktCsdRqAeOoyfUSwAKu8wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778016379; 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=P23Hvc8YDEoe40wXTXD8/zSoeRZRHkMCdfJcI4WAB6Q=; b=J9wNA2RqO30dINr1hkFzfNNZ30mnjk/5c5x01SJz7HoE784nDUAR1DS0AOqXkspgzAJmHv 7u23aGWYQwOlXY2BJny0OTLEjhmW/MbftxhH3ROJxpDt+ZGW4usBNcD5ndhfViObJ01aKm fnwzWNc9l9IyPEpTUA5SxMnPj0t3pG0EoV4m4YUG5zLUaDSnW1CmZb6rfUnBcOcokSEcJI nIlppt+/Q8mFAsJjkanGRRveISMyGq4/LQ9onfl/R4mNwS13VuStyHT4klND9CawG+U+Rc mv8RRzJSJOrEtrLFoz43zyQ6FWROX3EINJW1u7ejpyt2oLK8O1fJPM3aI527ww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9BQg5GVlz1NHV for ; Tue, 05 May 2026 21:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c32c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 21:26:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: a0e4c65f1814 - main - pf: do not reject rules with colliding hashes 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0e4c65f1814a7a677364dc29bb703f84323d175 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 21:26:19 +0000 Message-Id: <69fa607b.1c32c.2f8ad50@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a0e4c65f1814a7a677364dc29bb703f84323d175 commit a0e4c65f1814a7a677364dc29bb703f84323d175 Author: Kristof Provost AuthorDate: 2026-04-29 15:04:44 +0000 Commit: Kristof Provost CommitDate: 2026-05-05 20:20:42 +0000 pf: do not reject rules with colliding hashes We insert rules in pf_krule_global solely for the benefit of the 'keepcounters' feature. Failing to insert (beause the rule hash collides, or an identical rule already exists) would be worse than restoring counts to the wrong rule (or failing to restore them at all). PR: 282863, 294860, 294859, 294858 MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D56745 --- sys/netpfil/pf/pf_ioctl.c | 24 ++++++++---------------- tests/sys/netpfil/pf/match.sh | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 16 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index d3e60b137c1a..ab2140a60ce7 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -3226,14 +3226,12 @@ pf_ioctl_addrule(struct pf_krule *rule, uint32_t ticket, PF_RULES_WUNLOCK(); pf_hash_rule(rule); - if (RB_INSERT(pf_krule_global, ruleset->rules[rs_num].inactive.tree, rule) != NULL) { - PF_RULES_WLOCK(); - TAILQ_REMOVE(ruleset->rules[rs_num].inactive.ptr, rule, entries); - ruleset->rules[rs_num].inactive.rcount--; - pf_free_rule(rule); - rule = NULL; - ERROUT(EEXIST); - } + /** + * Note: rule hashes may collide. Accept this, because the worst that can + * happen is that we get counter preservation wrong. + * Failing to insert here would be worse. + **/ + RB_INSERT(pf_krule_global, ruleset->rules[rs_num].inactive.tree, rule); PF_CONFIG_UNLOCK(); return (0); @@ -4895,14 +4893,8 @@ DIOCGETRULENV_error: ruleset->rules[rs_num].active.rcount--; } else { pf_hash_rule(newrule); - if (RB_INSERT(pf_krule_global, - ruleset->rules[rs_num].active.tree, newrule) != NULL) { - pf_free_rule(newrule); - PF_RULES_WUNLOCK(); - PF_CONFIG_UNLOCK(); - error = EEXIST; - goto fail; - } + RB_INSERT(pf_krule_global, + ruleset->rules[rs_num].active.tree, newrule); if (oldrule == NULL) TAILQ_INSERT_TAIL( diff --git a/tests/sys/netpfil/pf/match.sh b/tests/sys/netpfil/pf/match.sh index 992e32d9f887..c732ec7c5c17 100644 --- a/tests/sys/netpfil/pf/match.sh +++ b/tests/sys/netpfil/pf/match.sh @@ -234,10 +234,46 @@ double_match_cleanup() pft_cleanup } +atf_test_case "duplicate_rules" "cleanup" +duplicate_rules_head() +{ + atf_set descr 'Test identical rules' + atf_set require.user root +} + +duplicate_rules_body() +{ + pft_init + + epair=$(vnet_mkepair) + vnet_mkjail alcatraz ${epair}b + + ifconfig ${epair}a 192.0.2.1/24 up + jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up + + # Sanity check + atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "block" \ + "pass tagged FOO" \ + "match tag FOO" \ + "pass tagged FOO" + + atf_check -s exit:0 -o ignore ping -c 3 192.0.2.2 +} + +duplicate_rules_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "dummynet" atf_add_test_case "quick" atf_add_test_case "allow_opts" atf_add_test_case "double_match" + atf_add_test_case "duplicate_rules" } From nobody Tue May 5 21:26:20 2026 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 4g9BQj0ttWz6cgGX for ; Tue, 05 May 2026 21:26:21 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9BQh6KySz3xCn for ; Tue, 05 May 2026 21:26:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778016380; 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=XbbLMahRjv/xIgolrWyITy0+Eln4CnAOChaPFK0jWcQ=; b=Hu7lU3wkzPaJMEbPstvgygFhKDaWGNNOszURVtTScEXcE2prAl+yD5elce8Xy03iUDn3y8 1MWC1bLGOOnp/PU2IYaMv1YNqf8B9VTBQbkbVhiUnx+IZEvoiMA7Iq0NxzR8dEeFnItBjn MSj/K70Y+s8ZKd6s3cohLF42ul58FsoRhyIGDSRoGVQMzwQNwOax5ELk6inMsD/o3lw+hb eT2c/uj1SywO94F9REzqtUiv+2HuQ9C2M0xX3Ng6tYmC2wWrrZTR2tOSABS8o1C+rbObzS Oj8zWuZU6s+vGHpGf9fS8IDqbqYb2IvqYxVlKgInTdOjMjjPY/AYx7U4R+oX4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778016380; a=rsa-sha256; cv=none; b=KHAeDDRQFYuE7ZootQYCyz89KyGH/GneZLMbARznzKv04OQIF8c4XXKpfIZLw3D8VkI/ve eGcZBIt3/4RfQ4O/xDzrYH12gQYoEsgQAmjxvGeCdnNT/oDfyS2fraKRZrG+Y3evml3oQU mLnSigqHPrV8Ngv+H05Ghio+yDc/DMAlC/So61nKJtqBPWW00T5oup5rvs9tfUm62kjl9T m7pCpBIDbGxkwoxPXuTmEF5/nkI0FRn49EWacrvx80xChDeZZJQkCrwIjDNrNtUrk4Dpm9 fJxuRopZUWT35VZZQ/E+9zO7E56o1bzeH5ocgxdnA3zQxLhuMntRmrNwxbBzHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778016380; 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=XbbLMahRjv/xIgolrWyITy0+Eln4CnAOChaPFK0jWcQ=; b=ktepjhxim815zgIsR7FpCN9v+cIZHdj0h9/YPoJxb0IhqR5ZELcMaaCoz3Wl18mzCXifVV IatZP7/qjTP+LkH+2Xh+p1TwgcjU4E2qJ1p9ilzElxeKEXxSCUbxEaSgKQM/Kys0YxnQLY wCPkZpMkTwKGasDwqqqRUSENIfLS05gKGnpfDf/UWGo8Hgi4wK5UUpK6G/VbDOLCv9RqRy kpJYCnpwbKda5EwxmJBIMiPMLovRGsakrgonpAvhzMVweCEG8SGWD+gL4SXUT3vhNlEZdH fhkB2hj4GvGW7HDMQZGLidy5Yk+yazc6bCFt6pp2lixrRcVLELsmqNYabwc9wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9BQh5tcvz1NHW for ; Tue, 05 May 2026 21:26:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c41b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 21:26:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: c24b1d9359b8 - main - pfctl: handle errors from PFNL_CMD_GETSTATES 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c24b1d9359b899c7532d5b296f37cf3d74a36942 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 21:26:20 +0000 Message-Id: <69fa607c.1c41b.4144044a@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c24b1d9359b899c7532d5b296f37cf3d74a36942 commit c24b1d9359b899c7532d5b296f37cf3d74a36942 Author: Kristof Provost AuthorDate: 2026-05-05 16:57:25 +0000 Commit: Kristof Provost CommitDate: 2026-05-05 20:20:42 +0000 pfctl: handle errors from PFNL_CMD_GETSTATES Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 2 +- sbin/pfctl/pfctl.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 59783592a370..ac60a924c228 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -2009,7 +2009,7 @@ pfctl_get_states_h(struct pfctl_handle *h, struct pfctl_state_filter *filter, pf return (ret); } - return (0); + return (e.error); } int diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index e84e7f9272d4..f35baf25ec35 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1991,6 +1991,7 @@ pfctl_show_states(int dev, const char *iface, int opts) { struct pfctl_show_state_arg arg; struct pfctl_state_filter filter = {}; + int ret; if (iface != NULL) strlcpy(filter.ifname, iface, IFNAMSIZ); @@ -1999,8 +2000,8 @@ pfctl_show_states(int dev, const char *iface, int opts) arg.dotitle = opts & PF_OPT_SHOWALL; arg.iface = iface; - if (pfctl_get_states_h(pfh, &filter, pfctl_show_state, &arg)) - return (-1); + if ((ret = pfctl_get_states_h(pfh, &filter, pfctl_show_state, &arg)) != 0) + errc(1, ret, "pfctl_get_states"); return (0); } From nobody Tue May 5 22:31:23 2026 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 4g9Csm04RFz6cmYl for ; Tue, 05 May 2026 22:31:24 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9Csl6H3Mz4Ql4 for ; Tue, 05 May 2026 22:31:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778020283; 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=vOWeIQJSmtA2Khd2mHwMKIG/YgJCvka+2Tkjsc3W3hc=; b=juyZ+U2N91sdc0ZG6szG0kbDuxYzkHg6ri0FL7gmLIjh1wKUUocQKKwERjylbJs/yh3T2I 0mzlSHJ+ZeDCI2FwL/YxOFd6A5JYOEO5SneBRrF1yRvWGm4hTZ4Vv1DpQhb3e3DKsguxi9 jWRLLzjvHg6zfh9AQoTOSSiaFZMoRyJDJqUdXyIag9dEMm6CbJgaSvK2/vlkxR1I217vGT aMTWG9+2Oc+yNGqDPUrBzB4RZhuZaVLu4Fm+2WcC/1xtAYVCNtAW7KHMj1XwC+DD8Wm6V1 MgRZvkMj35W03uaNLbLIBCuCNALkREnvpvFhiwFiS5w1X6tzLW2wKaumIA1Dkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778020283; a=rsa-sha256; cv=none; b=ats1eLZwsZwdIABPH1nAT3bOLiytRgSN1sxSpPEky/EyXWI/JcSeER02ixwqCaanE91veu O+CtNVE7z2THCdkZ4WahaSB58FUSB7hvyyYF+mXSn5q2gighdUqsIOEe+Lqmk1DvshlQN7 X0UqaOV8xH9VcPEYCGXR4nLayP4/d8wbPuBwBij/JfhYxp+gTsyqqUpCWHvinZRIKTqhwA 39NjdQzWiz83upm7MNllJhmUfDlg4fJM2IipB6Gteb37gAS3MBg1t26UbvTpLnSLIcknc3 cPnckHIMhUfVENxLEoDwx9O5qASWJ5r/c3YcMOR4HyquSX+6BFG7uXM5HaJObQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778020283; 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=vOWeIQJSmtA2Khd2mHwMKIG/YgJCvka+2Tkjsc3W3hc=; b=EB2ejf+UUWGnc3YYsmqRnyp3yHQFdF5lPDL1f6kkJhtmeIw/VOUaf6Bya/7QhyNFWtDRK2 hRJzaTD0M0mBKnvJCzP0U4pL2CJkXgvxd+U4r0SYpI36e1kxuvGIVP0jzx01GiG8w/mVUW iBDPmKjlm9UDmUp5LNaJpF1BVnCOeXQ60hQdszDzU4vwADKeJTCnzfnOY+DseZv/A44M0D k4zaN8yQvC0wq2dUufbWKFy3T31aaqUKRCuP6kXAVtFx9QrvJ3rdflpKY3tgz9/Y57UMz+ 24QtJE5qoXeS7lqjPCe4hmohiXuIYzsngxJFMOEfxwIL3QF7QdupFaiHf/yMCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9Csl5tRwz1Qnj for ; Tue, 05 May 2026 22:31:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22b19 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 22:31:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 2fef18ff5943 - main - certctl: Unstickify (un)trusted certificates 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2fef18ff594328a771b6aa659e8ffa5a7e076540 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 22:31:23 +0000 Message-Id: <69fa6fbb.22b19.f8209b6@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2fef18ff594328a771b6aa659e8ffa5a7e076540 commit 2fef18ff594328a771b6aa659e8ffa5a7e076540 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-05 22:30:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-05 22:30:52 +0000 certctl: Unstickify (un)trusted certificates Ever since certctl was rewritten in C, the rehash command has reingested TRUSTDESTDIR / UNTRUSTDESTDIR in addition to TRUSTPATH / UNTRUSTPATH. This seemed like a good idea at the time but was, in retrospect, a mistake, as it means a (un)trusted certificate remains (un)trusted forever (or at least until it expires) even if it is removed from (UN)TRUSTPATH. Among other issues, it causes ports QA to fail for any port that either installs certificates or depends on a port that does. Although this behavior was undocumented, the change may surprise users who have added certificates manually, so update the manual page to point it out and add prominent warnings to the trust and untrust commands. PR: 290078 MFC after: 1 week Reviewed by: kevans, bcr Differential Revision: https://reviews.freebsd.org/D56617 --- usr.sbin/certctl/certctl.8 | 15 ++++++- usr.sbin/certctl/certctl.c | 81 ++++++++++++++++++++++------------ usr.sbin/certctl/tests/certctl_test.sh | 3 +- 3 files changed, 67 insertions(+), 32 deletions(-) diff --git a/usr.sbin/certctl/certctl.8 b/usr.sbin/certctl/certctl.8 index 2d38ce020c04..7df89e4d35d0 100644 --- a/usr.sbin/certctl/certctl.8 +++ b/usr.sbin/certctl/certctl.8 @@ -24,7 +24,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 3, 2025 +.Dd April 24, 2026 .Dt CERTCTL 8 .Os .Sh NAME @@ -113,8 +113,19 @@ In addition, a bundle containing the trusted certificates is placed in .Ev BUNDLE . .It Ic untrust Add the specified file to the untrusted list. +Note that the next +.Ic rehash +will remove it unless a copy of it is also placed somewhere in a +directory included in +.Ev UNTRUSTPATH . .It Ic trust -Remove the specified file from the untrusted list. +Add the specified file to the trusted list, unless it is already +untrusted. +Note that the next +.Ic rehash +will remove it unless a copy of it is also placed somewhere in a +directory included in +.Ev TRUSTPATH . .El .Sh ENVIRONMENT .Bl -tag -width UNTRUSTDESTDIR diff --git a/usr.sbin/certctl/certctl.c b/usr.sbin/certctl/certctl.c index a53ed7b2b4b2..0a07703bf37b 100644 --- a/usr.sbin/certctl/certctl.c +++ b/usr.sbin/certctl/certctl.c @@ -636,23 +636,18 @@ write_bundle(const char *dir, const char *file, struct cert_tree *tree) * Returns the number of certificates loaded. */ static unsigned int -load_trusted(bool all, struct cert_tree *exclude) +load_trusted(void) { unsigned int i, n; int ret; /* load external trusted certs */ - for (i = n = 0; all && trusted_paths[i] != NULL; i++) { - ret = read_certs(trusted_paths[i], &trusted, exclude); + for (i = n = 0; trusted_paths[i] != NULL; i++) { + ret = read_certs(trusted_paths[i], &trusted, &untrusted); if (ret > 0) n += ret; } - /* load installed trusted certs */ - ret = read_certs(trusted_dest, &trusted, exclude); - if (ret > 0) - n += ret; - info("%d trusted certificates found", n); return (n); } @@ -663,24 +658,19 @@ load_trusted(bool all, struct cert_tree *exclude) * Returns the number of certificates loaded. */ static unsigned int -load_untrusted(bool all) +load_untrusted(void) { char *path; unsigned int i, n; int ret; /* load external untrusted certs */ - for (i = n = 0; all && untrusted_paths[i] != NULL; i++) { + for (i = n = 0; untrusted_paths[i] != NULL; i++) { ret = read_certs(untrusted_paths[i], &untrusted, NULL); if (ret > 0) n += ret; } - /* load installed untrusted certs */ - ret = read_certs(untrusted_dest, &untrusted, NULL); - if (ret > 0) - n += ret; - /* load legacy untrusted certs */ path = expand_path(LEGACY_PATH); ret = read_certs(path, &untrusted, NULL); @@ -796,8 +786,8 @@ certctl_list(int argc, char **argv __unused) { if (argc > 1) usage(); - /* load trusted certificates */ - load_trusted(false, NULL); + /* load installed trusted certificates */ + read_certs(trusted_dest, &trusted, NULL); /* list them */ list_certs(&trusted); free_certs(&trusted); @@ -814,8 +804,8 @@ certctl_untrusted(int argc, char **argv __unused) { if (argc > 1) usage(); - /* load untrusted certificates */ - load_untrusted(false); + /* load installed untrusted certificates */ + read_certs(untrusted_dest, &untrusted, NULL); /* list them */ list_certs(&untrusted); free_certs(&untrusted); @@ -842,10 +832,10 @@ certctl_rehash(int argc, char **argv __unused) } /* load untrusted certs first */ - load_untrusted(true); + load_untrusted(); /* load trusted certs, excluding any that are already untrusted */ - load_trusted(true, &untrusted); + load_trusted(); /* save everything */ ret = save_all(); @@ -859,7 +849,8 @@ certctl_rehash(int argc, char **argv __unused) } /* - * Manually add one or more certificates to the list of trusted certificates. + * Manually add one or more certificates to the list of trusted + * certificates. * * Returns 0 on success and -1 on failure. */ @@ -875,10 +866,10 @@ certctl_trust(int argc, char **argv) usage(); /* load untrusted certs first */ - load_untrusted(true); + load_untrusted(); /* load trusted certs, excluding any that are already untrusted */ - load_trusted(true, &untrusted); + load_trusted(); /* now load the additional trusted certificates */ n = 0; @@ -891,9 +882,9 @@ certctl_trust(int argc, char **argv) warnx("no new trusted certificates found"); free_certs(&untrusted); free_certs(&trusted); - free_certs(&extra); return (0); } + warnx("%u new trusted certificate%s found", n, n > 1 ? "s" : ""); /* * For each new trusted cert, move it from the extra list to the @@ -906,10 +897,16 @@ certctl_trust(int argc, char **argv) RB_INSERT(cert_tree, &trusted, cert); if ((other = RB_FIND(cert_tree, &untrusted, cert)) != NULL) { warnx("%s was previously untrusted", cert->name); + warnx("source of untrust: %s", other->path); RB_REMOVE(cert_tree, &untrusted, other); free_cert(other); } } + warnx("This operation is not persistent. To persistently add"); + warnx("trusted certificates to the system store, copy them to"); + warnx("one of these directories, then run `certctl rehash`:"); + for (i = 0; trusted_paths[i] != NULL; i++) + warnx(" %s", trusted_paths[i]); /* save everything */ ret = save_all(); @@ -929,6 +926,8 @@ certctl_trust(int argc, char **argv) static int certctl_untrust(int argc, char **argv) { + struct cert_tree extra = RB_INITIALIZER(&extra); + struct cert *cert, *other, *tmp; unsigned int n; int i, ret; @@ -936,23 +935,47 @@ certctl_untrust(int argc, char **argv) usage(); /* load untrusted certs first */ - load_untrusted(true); + load_untrusted(); + + /* load trusted certs, excluding any that are already untrusted */ + load_trusted(); /* now load the additional untrusted certificates */ n = 0; for (i = 1; i < argc; i++) { - ret = read_cert(argv[i], &untrusted, NULL); + ret = read_cert(argv[i], &extra, NULL); if (ret > 0) n += ret; } if (n == 0) { warnx("no new untrusted certificates found"); free_certs(&untrusted); + free_certs(&trusted); return (0); } + warnx("%u new untrusted certificate%s found", n, n > 1 ? "s" : ""); - /* load trusted certs, excluding any that are already untrusted */ - load_trusted(true, &untrusted); + /* + * For each new untrusted cert, move it from the extra list to the + * untrusted list, then check if a matching certificate exists on + * the trusted list. If that is the case, warn the user, then + * remove the matching certificate from the trusted list. + */ + RB_FOREACH_SAFE(cert, cert_tree, &extra, tmp) { + RB_REMOVE(cert_tree, &extra, cert); + RB_INSERT(cert_tree, &untrusted, cert); + if ((other = RB_FIND(cert_tree, &trusted, cert)) != NULL) { + warnx("%s was previously trusted", cert->name); + warnx("source of trust: %s", other->path); + RB_REMOVE(cert_tree, &trusted, other); + free_cert(other); + } + } + warnx("This operation is not persistent. To persistently add"); + warnx("untrusted certificates to the system store, copy them to"); + warnx("one of these directories, then run `certctl rehash`:"); + for (i = 0; untrusted_paths[i] != NULL; i++) + warnx(" %s", untrusted_paths[i]); /* save everything */ ret = save_all(); diff --git a/usr.sbin/certctl/tests/certctl_test.sh b/usr.sbin/certctl/tests/certctl_test.sh index 74749db0b3f5..133d65854c42 100644 --- a/usr.sbin/certctl/tests/certctl_test.sh +++ b/usr.sbin/certctl/tests/certctl_test.sh @@ -271,7 +271,8 @@ untrust_body() crtfile=usr/share/certs/trusted/${crtname}.crt check_trusted "${crtname}" check_in_bundle ${crtfile} - atf_check certctl untrust "${crtfile}" + atf_check -e match:"1 new untrusted" \ + certctl untrust "${crtfile}" check_untrusted "${crtname}" check_not_in_bundle ${crtfile} } From nobody Tue May 5 23:52:05 2026 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 4g9Ffs3SMLz6ctR2 for ; Tue, 05 May 2026 23:52:05 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9Ffs2g00z3SdB for ; Tue, 05 May 2026 23:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778025125; 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=Cga2CHxjTUb7tlMallb6rO+xzCZPFe7HWZbr2bDBTjE=; b=CklY9HkQdplMUc/ZC9fqnKpBH4t2Dylka1pdlHRhzcMVql+oosrgXo97N+BYAZcQx0w4r2 ZXpK0jYEt5mhhRKVZZ3rzak0ANwDhnVvbgYW3iNR/HCC9tM814BiclCuhE7lASQnd7ou9G +6vEHxrACIivcnMV5b2gz6+IvdWr+XvNRCVCZ29Bt4C1RIgJFe/UbTr3/TGvttIdMQFQ41 TT8nbFpwIawBdXSVfTrYpQF4VAW8GD2q18wnR1PDXuQXo3HropZUOuPUtY2ZMwmE7bjU2e Clybt3tnJqxN7HQOZq5rc8PLRQn1Ia6mqqRlRpHNqLZ69NGOmm+rIOpEDzR8/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778025125; a=rsa-sha256; cv=none; b=RWDssLiO8+h40bqsPaiBedC5TaDU6CsPfuuzimuf5QCOM/wryTkPQT498b/IH77/DVDZXS 8/0xshlg4vTCrpz2SOFwU4FPQfi4bXG+gy7xFmuraX6YyCwqXLYzG0evmZ2tLn2Vmu8Ubm MT5Fcu0hPn+e5vbg1LBS2tbSy4wU2Y2ctHm5lkRdh1/AmV/sVxlz/I/55wF0Mjxiq1HtxG Gcx4ajRVC3hh3Rhvxj9sxko0v8YaJW+iQGHKuy9blVJVQuFr0wu9InU+4fJzd0EUzQPVut H/lWtwyxHWT5CNQRissoSl0UzRe8OtY1jYKm6aUWch2GIifW8t2bQ76BsfqYwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778025125; 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=Cga2CHxjTUb7tlMallb6rO+xzCZPFe7HWZbr2bDBTjE=; b=iX0/VNnpAYiDhYnAUEYySxTdOPRGPHDx8XMC6welxgrngUTG/yAaFFBPMTEcCRSHcODGn+ AvGCaxDC1ixUc6UpSk0YmDaE0UuwySmnKwkdIF7Dtj5rVd9OqOT7BRZ18fxPqoomjDXnfk /CwlWahbmhLTpD3Nug9kPOLYJtu1NpvLWZsXAVmPROAN/z/hJxtmGsL5rNS9BG7zvkloY5 cUNOxIgsrVqXzHcG4GUAn0LDZpcLsL6yqnthpWPIK1YHoKbvMf1bleUv5Q/au5FfoO7p88 zUwsFO6muX8Swk66a57Xnd2HHuxy8bHoSTfgpF6U8sXPDxR3OpPouto23/qHHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9Ffs2CzszFM for ; Tue, 05 May 2026 23:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31bd9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 23:52:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0979bfb0ec80 - main - smsc: Add missing newline to PHY timeout error printf 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 0979bfb0ec804590a782ea33b787ec0989c1f1a4 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 23:52:05 +0000 Message-Id: <69fa82a5.31bd9.40b21eff@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0979bfb0ec804590a782ea33b787ec0989c1f1a4 commit 0979bfb0ec804590a782ea33b787ec0989c1f1a4 Author: Ed Maste AuthorDate: 2026-05-05 23:50:46 +0000 Commit: Ed Maste CommitDate: 2026-05-05 23:51:43 +0000 smsc: Add missing newline to PHY timeout error printf --- sys/dev/usb/net/if_smsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c index 8e16b8609144..c3c21fd22472 100644 --- a/sys/dev/usb/net/if_smsc.c +++ b/sys/dev/usb/net/if_smsc.c @@ -1296,7 +1296,7 @@ smsc_phy_init(struct smsc_softc *sc) } while ((bmcr & BMCR_RESET) && ((ticks - start_ticks) < max_ticks)); if (((usb_ticks_t)(ticks - start_ticks)) >= max_ticks) { - smsc_err_printf(sc, "PHY reset timed-out"); + smsc_err_printf(sc, "PHY reset timed-out\n"); return (EIO); } From nobody Wed May 6 01:32:02 2026 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 4g9HtH5kbRz6d2nC for ; Wed, 06 May 2026 01:32: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9HtH4yk9z3kYv for ; Wed, 06 May 2026 01:32:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778031127; 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=4k7T3EqCmHwKg6K5G8az8huWWRVgqFMH+4iuKpJzlP0=; b=mpfntIZK1NzTAn5QrpM5jCX2LVv5eVOHl5YQishyjff4Ln/vrTdVIeCWidqrpV4U3vq3Et i4r1O4p5AZrzMxFPf/wxiS/u8hIM1cPexOWzZXWAZ404RvZDuPFfGqI1+Wuy5QiJuY4p1Y aDsSMzUK9zRnAAU1rIcRXsaGyus0291MT/+b1wm0DpCyIBEPNJ/cntC3A42QvRuss9eO0i X2Aj3n27uhJApbgQpx1k4QDgP4moLY83V4DTSXoYjj3TmqlElGMs3xOmpRJ1OxujCuPAFV fm+DsKSgMNmQw4OBVXVoWaiqHLOOApRm0yjaqsUfa0sBkVUbWHx8ZzsBoycQbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778031127; a=rsa-sha256; cv=none; b=htHHKt9yxz5dDzezatyi95jtlbvzKGdRlpejZkn6vnf9j12T9ABvNRkK/tKMb0/u7CcZty 2KbBDJeHb007DeC+4QZXH5EjRt333XDxfk1MW4hHmIJSS/LlDbppAh8qOcDXT1ClHRhFK9 fsuLAGxJQJUButfrsppOHqT06HvaR5Nu0D6H/+JOzwnFC5WPpfO3pF6ho45MgITmdyyrom jjDwtXMgjWPICU21cxH3tvSRS6iJzMgifp69mbZfdQ8AEhKTR/8i2fo0VoALjFtjZaOK2Z MRYRQTPFnByVAh+EzvWm7m3gwpZ/HYzYDmx2HxZl23eSb2Qyx+0oUc0zmQL2RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778031127; 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=4k7T3EqCmHwKg6K5G8az8huWWRVgqFMH+4iuKpJzlP0=; b=co6HqMTmqOL/8HyWo06NYpV8trU9Y+gvrzM+979JslMQZ0Q4gbM8pMbRFzhaQJcZ37I4no MP3etSThCtZ1E6LisDvyYIoX+3veW6H3UERtZQqeUwtVM/6jYeosOynA5PdBJVVjiAe3tV S+BgMpcfruDnAC5oOxSwo5E3bOJ2ILZKx9eH++IWAFwcg8Gf/a/S0tM/XG0ZxsdBS4P/0W B069NK99+akzCJFvSn2nFFL9TYTLbnhdIUhRjInOwj+Gpe39pQqkFh39TaLE/Bt4vNomL/ fripd1PLB2pjW0EIWrmfHMoYWbdOX24ndY94rQoSZIyaJpi5Hj592OdYM8ZM2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9HtH4Rzkz2Yf for ; Wed, 06 May 2026 01:32:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d841 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 01:32:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: 081d3ab24e03 - main - ichsmb: add Ice Lake-LP (0x34a3) and Ice Lake-N (0x38a3) SMBus device IDs 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 081d3ab24e03d271a0de3b173802fbe71f52e8aa Auto-Submitted: auto-generated Date: Wed, 06 May 2026 01:32:02 +0000 Message-Id: <69fa9a12.3d841.9be5b2@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=081d3ab24e03d271a0de3b173802fbe71f52e8aa commit 081d3ab24e03d271a0de3b173802fbe71f52e8aa Author: Abdelkader Boudih AuthorDate: 2026-05-05 23:59:10 +0000 Commit: Adrian Chadd CommitDate: 2026-05-06 01:31:48 +0000 ichsmb: add Ice Lake-LP (0x34a3) and Ice Lake-N (0x38a3) SMBus device IDs Add PCI device IDs for two Ice Lake PCH SMBus controller variants: - 0x34a3 (Ice Lake-LP), previously listed as the generic "Ice Lake" entry (ID_ICELAKE), renamed to ID_ICELAKELP for clarity. - 0x38a3 (Ice Lake-N), a separate PCH variant not previously supported. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D56732 --- sys/dev/ichsmb/ichsmb_pci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/ichsmb/ichsmb_pci.c b/sys/dev/ichsmb/ichsmb_pci.c index af3e0f004b88..7f9409e4452c 100644 --- a/sys/dev/ichsmb/ichsmb_pci.c +++ b/sys/dev/ichsmb/ichsmb_pci.c @@ -110,7 +110,8 @@ #define ID_ELKHARTLAKE 0x4b23 #define ID_GEMINILAKE 0x31d4 #define ID_CEDARFORK 0x18df -#define ID_ICELAKE 0x34a3 +#define ID_ICELAKELP 0x34a3 +#define ID_ICELAKEN 0x38a3 #define ID_ALDERLAKE 0x7aa3 #define ID_ALDERLAKE2 0x51a3 #define ID_ALDERLAKE3 0x54a3 @@ -255,8 +256,10 @@ static const struct pci_device_table ichsmb_devices[] = { PCI_DESCR("Intel Gemini Lake SMBus controller") }, { PCI_DEV(PCI_VENDOR_INTEL, ID_CEDARFORK), PCI_DESCR("Intel Cedar Fork SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_ICELAKE), - PCI_DESCR("Intel Ice Lake SMBus controller") }, + { PCI_DEV(PCI_VENDOR_INTEL, ID_ICELAKELP), + PCI_DESCR("Intel Ice Lake-LP SMBus controller") }, + { PCI_DEV(PCI_VENDOR_INTEL, ID_ICELAKEN), + PCI_DESCR("Intel Ice Lake-N SMBus controller") }, { PCI_DEV(PCI_VENDOR_INTEL, ID_ALDERLAKE), .driver_data = (uintptr_t)ICHSMB_FEATURE_BLOCK_BUFFER, PCI_DESCR("Intel Alder Lake SMBus controller") }, From nobody Wed May 6 08:28:46 2026 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 4g9T726B2fz6RlGj for ; Wed, 06 May 2026 08:28:46 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9T725Ylhz3Y6q for ; Wed, 06 May 2026 08:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778056126; 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=p036GrhMvpR+K3bdvXcT+1FzgQIkhT4VPC5X2k9gmWo=; b=Ca8v51gmH6m7FZHS0jKXyV5hSeqtAJjxB3VjsBWeG0QXi4DizqLpJ7gOUsi9Zsi9MgsglX urXJlKr0zPBY2qNBbIBDEy2/sDEt5V1T0DDeTaFJTbAtvR4u/62jZdc1VbiARrsjuUEyt0 /+X8OGmXRSUJ2ifrvG5X5A2cXTn8svyKFIldQ+22r/inM/378j6QACDOvIuNG21jX9cmuH TQhZ9LeCxTv/JTQVbqL463GlNFqroI1z8iQ7Uh8YdQe3IzwKnEa6ED6DeGmYz5qtF0Defv 2CLe+7nMZRQ5AD2FutYdtJjMqHQ9Wt+fzEgHx8Z6F9t3wUslmjIPcx75ojya3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778056126; a=rsa-sha256; cv=none; b=s3Bdra6GDrKU3hzlubflcOlqMF+SsgwHrZI4JOIp2DHkvAlf2G5msc20kTsaiJKl25TPwn GXtN9S74oEiRhsAUB3aPGfPpq1EMn11ksAATmBd7Hr69aTCjW3S92X6j2HQzev1weA8cK3 HlUo5+RjEWuOYuvSNEuv1mf6Iu3VBCeZHmFzOfqhaF0JpsGZf1/5NUWwhSeIQtUVLmRCiU dLA/KhV14IPy09cswG9JRo7JXX2icGdf3p/nTqjADRXdRcy3f3RddfUDu63HfB57wLlUiG GFoN9LJtbedAn+nlOgvJUoaspVnAg0dLpSb5jVnb3zJE6UdtpKd29oNlHqrbPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778056126; 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=p036GrhMvpR+K3bdvXcT+1FzgQIkhT4VPC5X2k9gmWo=; b=ulWIwI2X71ryZR3Q7aIxzggK4XavnGR4zoqBfWvRlOq6Tbw4CrXXnI8IvVe6pVMI9QJHgu DEllsetI40jXRsg4FrKqFuVzMKkTHrjNNvMKkufK7HEYtBMaC8Eybe7j7950A3W3a64UpT 4uqu3+xm46f/Q/YT3/sgQNd8KjJIquDQeRz5s2rkwFIAiEAwjTXH6mH6N6R8CNdtnH9ahi 2S6fedlFTR45Q2h2OmxLXIdLVegWBGYLXFY2MFMz0fZgNIve7QiKSxhcMUNDW30+hUNz1Z RjnR7Heez0YQFRQaH2xhDPQfYGd4K+zFlDzW0IFOsRzuPG1L8Vb+TAiT+gj41A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9T724zThzX1B for ; Wed, 06 May 2026 08:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 181f2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 08:28:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 822366134658 - main - Revert "zstd: disable weak-symbol tracing hooks in the kernel" 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 822366134658ee59922d7f3e37db7bbb8956aaaf Auto-Submitted: auto-generated Date: Wed, 06 May 2026 08:28:46 +0000 Message-Id: <69fafbbe.181f2.72c3f3a@gitrepo.freebsd.org> The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=822366134658ee59922d7f3e37db7bbb8956aaaf commit 822366134658ee59922d7f3e37db7bbb8956aaaf Author: Xin LI AuthorDate: 2026-05-06 08:27:55 +0000 Commit: Xin LI CommitDate: 2026-05-06 08:27:55 +0000 Revert "zstd: disable weak-symbol tracing hooks in the kernel" This reverts commit de2ea5423cc63b62e7e42d11b667aa634109fc28 which is no longer needed after 1dddb580f950 . Tested by: mmel --- sys/conf/kern.pre.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index a5b21cdbe843..d1556660094a 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -157,11 +157,9 @@ NORMAL_FWO= ${CC:N${CCACHE_BIN}} -c ${ASM_CFLAGS} ${WERROR} -o ${.TARGET} \ NOSAN_C= ${NORMAL_C:N-fsanitize*:N-fno-sanitize*:N-fasan-shadow-offset*} # for ZSTD in the kernel (include zstd/lib/freebsd before other CFLAGS) -ZSTD_C= ${CC} -c -I$S/contrib/zstd/lib/freebsd ${CFLAGS} \ +ZSTD_C= ${CC} -c -DZSTD_HEAPMODE=1 -I$S/contrib/zstd/lib/freebsd ${CFLAGS} \ -I$S/contrib/zstd/lib -I$S/contrib/zstd/lib/common ${WERROR} \ - -Wno-missing-prototypes -U__BMI__ \ - -DZSTD_HEAPMODE=1 -DZSTD_NO_INTRINSICS -DZSTD_NO_TRACE \ - ${.IMPSRC} + -Wno-missing-prototypes -U__BMI__ -DZSTD_NO_INTRINSICS ${.IMPSRC} # https://github.com/facebook/zstd/commit/812e8f2a [zstd 1.4.1] # "Note that [GCC] autovectorization still does not do a good job on the # optimized version, so it's turned off via attribute and flag. I found From nobody Wed May 6 09:04:43 2026 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 4g9TwZ1j97z6byk5; Wed, 06 May 2026 09:04:46 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9TwZ194Mz3d7h; Wed, 06 May 2026 09:04:46 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778058286; 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: in-reply-to:in-reply-to:references:references; bh=UWh2HkTrNilfZNgyUI8xV0wJh3uoQLSFpnpWBkI1AHM=; b=PZos9P+TSXGirN8Ch/fcvgB0k9RjN51ZgnCFWaGpeOC6tdfFdzpHrigleYIxxEVTCW2My1 1nMOdHyVXW7Hbt3FFj2V1IMkKVaAwj6FQ6S9JMl1DTnADCD+C9FTD+fBheuuh1RO7MjhLz IReJ9ypI6hpIkQK9IX/0O0N0Y/eNyzG6eIFeORT4FFPG68ZAaGRG8O8vQjX78kmSqtoxEO Kyu93QmZ51KnDs0qQ7jgZy7j8KqZ/o/znTOqCmsvUipdI6XbqgOzsbRBZt2PG7OmKdygEB KWq8rLwcLoiqcsVvrH1Vr0A+cSiJVSL3agxUBS1B+0Wkz0s4TmBV/nuwiaB+zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778058286; a=rsa-sha256; cv=none; b=vDrv1v63bt8vjFs1H+AVUY/27wqxVcwVzOxauyDlXfr1UxXfOBGvHjUFQTb+C936SDQdWf B5/Rq+MGlf1laJ8RUZE4RvRV3RU2Q5u+WSleirBdjVydApeaSBLuOAJPAsVQ+q1H9mN3U5 hRxNG/VKHM03Burf8MB4lLG4pUgBhjxXg+wXnZfvzSXIIEJ3sxAR+9tEhOY3XvCBnalHIX nkSU0zoj3A7OxuSiBW1VXqgapwTS2VLgIdCTLYFYCdK4xfiJ9asRunt00WdQlqyQlzlkbD Pb8dURs38EsgfEcb/bPjVbboNmAfiEtyYDqIxT16eaju3DfD44AK5bEkWw8YIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778058286; 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: in-reply-to:in-reply-to:references:references; bh=UWh2HkTrNilfZNgyUI8xV0wJh3uoQLSFpnpWBkI1AHM=; b=jpITu49qtZBdn02iYEgiw/Okjekuxzlj6S/wlyJgUdKHs0Y+p3orGkNPz+odcLZsu4Nwl9 Zll332cSDLE5BxOLinkwrh90q2jIWjxIkSuNxKZ4CesJ3F1LAhyQUk5OHPXcwjN53qTjI9 AIokOZKa/AmIMxOHAuWDkHL3KRmz0ig6ybYH+vL2nPshkiUv9BHwOuvKJ7e2mxvhoNlJS2 IwFuERjda1orfjNjyk1wusje9LDxgp7A083LFXvzHK0Xm2Nvgx5MGYgJy+YaMY/Pwaxzwm DluM/qPp6FvgKkbhEmUbdZcjpverCH/zR2LgNdLtoEUl3YXdLwc0NnKBJmjTeg== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (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 (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R12" (not verified)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4g9TwY6vWFzNJM; Wed, 06 May 2026 09:04:45 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 31E47246DF; Wed, 06 May 2026 11:04:44 +0200 (CEST) From: Kristof Provost To: Alexander Leidinger Cc: Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: f9590540c524 - main - zfs: merge openzfs/zfs@84ffe564d Date: Wed, 06 May 2026 11:04:43 +0200 X-Mailer: MailMate (2.0r6272) Message-ID: In-Reply-To: <52564a71ee85973901e4bc236723cf75@FreeBSD.org> References: <69f5a5ed.38a16.18e2d48a@gitrepo.freebsd.org> <52564a71ee85973901e4bc236723cf75@FreeBSD.org> 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=_MailMate_42CC706C-4973-4FB2-9000-9AB1D8520480_=" --=_MailMate_42CC706C-4973-4FB2-9000-9AB1D8520480_= Content-Type: text/plain; charset=UTF-8; format=flowed; markup=markdown Content-Transfer-Encoding: quoted-printable On 2 May 2026, at 11:00, Alexander Leidinger wrote: > Am 2026-05-02 09:21, schrieb Martin Matuska: >> The branch main has been updated by mm: >> >> URL: = >> https://cgit.FreeBSD.org/src/commit/?id=3Df9590540c524607d22fa7e718c75= 8725c4365375 >> >> commit f9590540c524607d22fa7e718c758725c4365375 >> Merge: 069681afd58a 84ffe564dff1 >> Author: Martin Matuska >> AuthorDate: 2026-05-02 07:17:59 +0000 >> Commit: Martin Matuska >> CommitDate: 2026-05-02 07:18:34 +0000 >> >> zfs: merge openzfs/zfs@84ffe564d >> >> Notable upstream pull request merges: >> #18387 656285140 Handle raidz errors <=3D nparity rather than = >> ignoring >> #18401 1cebe8a38 libzfs: report invalid permission name in zfs = >> allow >> #18430 513710ed2 Fix "panic: cache_vop_rename: lingering = >> negative entry" >> #18440 37e3a260f dmu_direct: avoid UAF in = >> dmu_write_direct_done() >> #18445 2eee4ac1e Fix: draid autopkgtests fail on s390x = >> architecture >> #18448 8da472973 key lookup failure should always return EACCES >> #18456 4a58ab8ce zfs.4: document five missing module parameters >> >> Obtained from: OpenZFS >> OpenZFS commit: 84ffe564dff1b7f69d397817ef292cbe2c5ebad3 > > Are you aweare of = > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D294903 > > From the commit message I assume it is not fixed. > It looks like Alexander Motin fixed it upstream: = https://github.com/openzfs/zfs/pull/18489/changes/d1268512531de8b18f1b19c= b6e6e195c177adbfd I=E2=80=99m running a build with that fix in it now. Best regards, Kristof --=_MailMate_42CC706C-4973-4FB2-9000-9AB1D8520480_= Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

On 2 May 2026, at 11:00, Alexander Leidinger wrote:

Am 2026-05-02 09:21, schrieb Martin Matuska:

The branch main has been updated by mm:

URL: https://cgit.FreeBSD.org/src/co= mmit/?id=3Df9590540c524607d22fa7e718c758725c4365375

commit f9590540c524607d22fa7e718c758725c4365375
Merge: 069681afd58a 84ffe564dff1
Author: Martin Matuska mm@FreeBSD.o= rg
AuthorDate: 2026-05-02 07:17:59 +0000
Commit: Martin Matuska mm@FreeBSD.o= rg
CommitDate: 2026-05-02 07:18:34 +0000

zf=
s: merge openzfs/zfs@84ffe564d

Notable upstream pull request merges:
 #18387 656285140 Handle raidz errors <=3D nparity rather than ignorin=
g
 #18401 1cebe8a38 libzfs: report invalid permission name in zfs allow
 #18430 513710ed2 Fix "panic: cache_vop_rename: lingering negative e=
ntry"
 #18440 37e3a260f dmu_direct: avoid UAF in dmu_write_direct_done()
 #18445 2eee4ac1e Fix: draid autopkgtests fail on s390x architecture
 #18448 8da472973 key lookup failure should always return EACCES
 #18456 4a58ab8ce zfs.4: document five missing module parameters

Obtained from:  OpenZFS
OpenZFS commit: 84ffe564dff1b7f69d397817ef292cbe2c5ebad3

Are you aweare of https://bugs.freebsd.org/bugzilla/show_bu= g.cgi?id=3D294903

From the commit message I assume it is not fixed.

It looks like Alexander Motin fixed it upstream: https://github.com/openzfs/zfs/pull/18489/changes/d12= 68512531de8b18f1b19cb6e6e195c177adbfd

I=E2=80=99m running a build with that fix in it now.

Best regards,
Kristof

--=_MailMate_42CC706C-4973-4FB2-9000-9AB1D8520480_=-- From nobody Wed May 6 12:48:02 2026 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 4g9ZtC09zCz6cJfb for ; Wed, 06 May 2026 12:48:03 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9ZtB6hZQz42P2 for ; Wed, 06 May 2026 12:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778071682; 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=H/Za06wX1udosAb3tQ/eqGOElF9RqqjwAJ99jcQpYVQ=; b=Z0G53FfNHIVN/bitFa3vyxWudAzIbXcsEDSUj0uNkqxWapCjDYN5048HaxywBipgtXxPTr /Hw3IV6YsTKKwzQ9tYEZBMGDOGfGQioM/+YSPLpZ09jN2vPkt+sn/6kbCQySBeDGZ+ZRG9 8mhl3GPItlHjuKemvH8Nr+bJn8zaFbLn7RiIZys8DN9Tq8NiUPNUoG5KCvzJpJLQ7dYquu on/RIb4UBS+fiBwraYN7CvZrd8sWIx1fgVaoeOliutA78sYWET9LDObXKZDL54ibGmN6Bt 6AgNlY88vCPEgxDJEmunwtu3N2oRnhvDcfsFa9CagXzKw3XcQbVxtXouyjv4FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778071682; a=rsa-sha256; cv=none; b=vdQmssBWWLGt/2OkY/QdpVrBQ99io2xBWpTba6dp1gvClLgJz3XDhvBBNr7TpHP41CjfVF wUh17rMzZPTeL3PKM766WJVVhxv9pfUzIrtw5iP+E15e9MCEVhZYIY0ysIn5IaRZCXu4U1 k33Nw8IvK9YU6tDYzhAIgght12YEjDNlS5SweSYlVRjjFFMeFTXL2aZdhrsYyUkZ7CFUJr lceDF8DYUAhAPohtNK/XKlV1QgNO/NGj3SxVk/McTHGjDE1LSHZYT2gjLBo9d65O+44lFD 6D/x2DAwhQNXTICocBEQiM4zbTm9MzpKyX8XsHbASIe3llZdthPMSta93hyvfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778071682; 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=H/Za06wX1udosAb3tQ/eqGOElF9RqqjwAJ99jcQpYVQ=; b=sr23Ek5BODfmQ/I9Fq15HfTBnRH/DUy6iCNGugbV2XHhiihEMth42OUiVpf+18MzCcd9Nt MwvA/k1or/TpZzF1KFbfNg7ilj5RlGPVvkWt1JeqyP+7FFzFvfgoDsdesNzn4dJQWW5AaW Ph0QpiPavJlqprfaTPBrkdERBrFdt4VeO/BZtM+8vxTnwh0MOghgRYtamoeO4LbW6om4Zh 0ZlbJTsT3pHMFKfLr9Z7fEvYADkjOleySccNjmshWMLiBAAoS/e4odBXPHpnHcu/+nTRgy z3NP7ON4uoFNiMmXSZay1GujNixOMwsmb7/IonWfastznsfp0oUxL+LYQdZc/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9ZtB5xzGzgT6 for ; Wed, 06 May 2026 12:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3df15 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 12:48:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 735b16d490ae - main - eventhandler: Fix a race when pruning eventhandlers 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 735b16d490aee158beb54c415b716475a0d19cda Auto-Submitted: auto-generated Date: Wed, 06 May 2026 12:48:02 +0000 Message-Id: <69fb3882.3df15.6f5b09b7@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=735b16d490aee158beb54c415b716475a0d19cda commit 735b16d490aee158beb54c415b716475a0d19cda Author: Mark Johnston AuthorDate: 2026-05-06 11:48:05 +0000 Commit: Mark Johnston CommitDate: 2026-05-06 11:48:05 +0000 eventhandler: Fix a race when pruning eventhandlers By default, eventhandler_deregister() blocks until it reaches some point where no threads are invoking the event. At this point, it knows that 1) no threads are currently executing the handler, 2) some thread has freed the eventhandler structure by virtue of having called eventhandler_prune_list(), so it is safe to return. Suppose a thread is trying to deregister an event handler. A different thread prunes it, and wakes up the first thread. Before the first thread runs, a third thread grabs the event handler lock, and starts executing handlers. The first thread observes el_runcount > 0, and goes back to sleep. The third thread sees no event handlers to prune, and doesn't wake up the first thread, which sleeps forever. This change fixes the race and tries to make eventhandler_invoke() more efficient: keep a count of the number of dead list entries and only prune the list if there is at least one dead entry. Also, in eventhandler_deregister(), we only need to sleep if some dead entries are present, rather than sleeping whenever some thread is running handlers. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56767 --- sys/kern/subr_eventhandler.c | 18 ++++++++++++++---- sys/sys/eventhandler.h | 4 ++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/sys/kern/subr_eventhandler.c b/sys/kern/subr_eventhandler.c index 7568101dabd2..e91647648995 100644 --- a/sys/kern/subr_eventhandler.c +++ b/sys/kern/subr_eventhandler.c @@ -198,7 +198,10 @@ _eventhandler_deregister(struct eventhandler_list *list, eventhandler_tag tag, } else { CTR3(KTR_EVH, "%s: marking item %p from \"%s\" as dead", __func__, ep, list->el_name); + KASSERT(ep->ee_priority != EHE_DEAD_PRIORITY, + ("%s: handler for %s is dead", __func__, list->el_name)); ep->ee_priority = EHE_DEAD_PRIORITY; + list->el_deadcount++; } } else { /* remove entire list */ @@ -213,11 +216,15 @@ _eventhandler_deregister(struct eventhandler_list *list, eventhandler_tag tag, } else { CTR2(KTR_EVH, "%s: marking all items from \"%s\" as dead", __func__, list->el_name); - TAILQ_FOREACH(ep, &list->el_entries, ee_link) + TAILQ_FOREACH(ep, &list->el_entries, ee_link) { + KASSERT(ep->ee_priority != EHE_DEAD_PRIORITY, + ("%s: handler for %s is dead", __func__, list->el_name)); ep->ee_priority = EHE_DEAD_PRIORITY; + list->el_deadcount++; + } } } - while (wait && list->el_runcount > 0) + while (wait && list->el_deadcount > 0) mtx_sleep(list, &list->el_lock, 0, "evhrm", 0); EHL_UNLOCK(list); } @@ -292,8 +299,11 @@ eventhandler_prune_list(struct eventhandler_list *list) pruned++; } } - if (pruned > 0) - wakeup(list); + KASSERT(pruned == list->el_deadcount, + ("%s: pruned %u entries from \"%s\" but expected %u", + __func__, pruned, list->el_name, list->el_deadcount)); + list->el_deadcount = 0; + wakeup(list); } /* diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h index 29a16b393b52..f37b1150a7e8 100644 --- a/sys/sys/eventhandler.h +++ b/sys/sys/eventhandler.h @@ -46,7 +46,7 @@ struct eventhandler_entry_vimage { struct eventhandler_list { char *el_name; - int el_flags; /* Unused. */ + u_int el_deadcount; u_int el_runcount; struct mtx el_lock; TAILQ_ENTRY(eventhandler_list) el_link; @@ -82,7 +82,7 @@ struct eventhandler_list { KASSERT((list)->el_runcount > 0, \ ("eventhandler_invoke: runcount underflow")); \ (list)->el_runcount--; \ - if ((list)->el_runcount == 0) \ + if ((list)->el_runcount == 0 && (list)->el_deadcount != 0) \ eventhandler_prune_list(list); \ EHL_UNLOCK((list)); \ } while (0) From nobody Wed May 6 12:48:03 2026 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 4g9ZtD0pT0z6cJqx for ; Wed, 06 May 2026 12:48:04 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9ZtC6wBrz42X0 for ; Wed, 06 May 2026 12:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778071683; 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=dVF1upmuFotVbHdeasqH+Gl0XVHLwSRkuB8gIbY5VFM=; b=iX2Te9rzg9O8humlJvYPPAYFp5dP974bTLJMWlX/H8tmN4akk8FOmF4qo1EVjx6F1F+pvt GrcDYoUS8QOsnmkS2Y97FzPrFt9hKMyizw0C/LO4/rVKPLRCltmpUOEEKBU/Cg+996caSp VsEt98hVXoSKu6bneKMo4F+a3X+BIoA/xKb30iGLJ2MaTyDFFwylzY8b/NGaA+a/5CMahy X1BpbjmuG24bgSn+3JV4M2Kf3QMa/wdJH6yUJbfhA8ODZPs17YuJT1MLYWGY5CaGgMNOOX gaA+owhxLMSH1qax1QCKyKCtvjb2cMmEaZrCGylU12b1SGUowSYOQxStuc0OJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778071683; a=rsa-sha256; cv=none; b=Wd057XJSKUj1R74YMOoSTJNkdsOYJ9vljIYU5V9/kETbo8o7JdM20c+Ge6HFE+fHHuA+fB vVCK7n9mJsbLZpr/5o5Vwb754x2+Dvblc6JuR9fBRKWnvdVg1e86eo+B8UxQFM861aeETQ 8Ra51Kom3//tbVljYOJiJfs5ANnpqpZEzFGcRjqfq5AFiIyg3PDgzXsFh0GS+6tzTMfmW1 Amn7u7ZIIbQPX6HOP009aLai/MsoZu8TKc89r46OWE7IdF4O3ZGATc37S/L0t13qV28WDd r4ksxqxaA8KUXUBxMlN7Gk9T/rU6dl116TwT0a77H157VJxLZalNX7nFjAvoWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778071683; 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=dVF1upmuFotVbHdeasqH+Gl0XVHLwSRkuB8gIbY5VFM=; b=K6FCktXQKORzDJ1nJK7dIpmdE1ghwH3nNuOdc3OtqiIJxHDL3H86S6z49/leI6hBmir2hE oAkC7zo9fsUaweeEd4dQ1TYpkoZpV/0i0byta/SOZZkZ+6cLTHxe2+PdxD3Q3DvcNL8JI8 dOjEkSNBRHsbkPcCKKj8Ow0N79FN0rZrajQyx9DA4+BxHAf42kDwYWoteNx85EvpeIw+tc s96NchUePPg9crNADhLxl2FIoc4HdAUGoPyscLkRJVuUk1uiG+XYmAlvAVEwCTr/Y1K8RT Jh3siyGg3oyAyp3aA0vDWIiDvG8Itvm3blronPPu3fNRTlaba/Y10/ZBcolzzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9ZtC6DCNzgT7 for ; Wed, 06 May 2026 12:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e51e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 12:48:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 486c2dfaa7b9 - main - if_vlan: Use the exclusive lock everywhere 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 486c2dfaa7b9ed1ed79662584c9b0f4fd0c23d67 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 12:48:03 +0000 Message-Id: <69fb3883.3e51e.4290afc8@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=486c2dfaa7b9ed1ed79662584c9b0f4fd0c23d67 commit 486c2dfaa7b9ed1ed79662584c9b0f4fd0c23d67 Author: Mark Johnston AuthorDate: 2026-05-06 11:48:24 +0000 Commit: Mark Johnston CommitDate: 2026-05-06 11:48:24 +0000 if_vlan: Use the exclusive lock everywhere Running sys/net tests in parallel reveals some panics which look like the one below: ``` shared lock of (sx) vlan_sx @ /home/markj/sb/main/src/sys/net/if_vlan.c:2395 while exclusively locked from /home/markj/sb/main/src/sys/net/if_vlan.c:1850 panic: excl->share cpuid = 9 time = 1776467219 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe00d84e0780 vpanic() at vpanic+0x136/frame 0xfffffe00d84e08b0 panic() at panic+0x43/frame 0xfffffe00d84e0910 witness_checkorder() at witness_checkorder+0xdb1/frame 0xfffffe00d84e0ad0 _sx_slock_int() at _sx_slock_int+0x64/frame 0xfffffe00d84e0b10 vlan_ioctl() at vlan_ioctl+0x25c/frame 0xfffffe00d84e0b70 if_setflag() at if_setflag+0xdc/frame 0xfffffe00d84e0be0 ifpromisc() at ifpromisc+0x27/frame 0xfffffe00d84e0c00 vlan_setflags() at vlan_setflags+0x64/frame 0xfffffe00d84e0c30 vlan_unconfig_locked() at vlan_unconfig_locked+0xb7/frame 0xfffffe00d84e0c70 vlan_clone_destroy() at vlan_clone_destroy+0x5d/frame 0xfffffe00d84e0cb0 if_clone_destroyif_flags() at if_clone_destroyif_flags+0x8c/frame 0xfffffe00d84e0cf0 if_clone_detach() at if_clone_detach+0x106/frame 0xfffffe00d84e0d20 vnet_destroy() at vnet_destroy+0x154/frame 0xfffffe00d84e0d50 prison_deref() at prison_deref+0xaf5/frame 0xfffffe00d84e0dc0 sys_jail_remove() at sys_jail_remove+0x1a7/frame 0xfffffe00d84e0e00 amd64_syscall() at amd64_syscall+0x169/frame 0xfffffe00d84e0f30 fast_syscall_common() at fast_syscall_common+0xf8/frame 0xfffffe00d84e0f30 --- syscall (508, FreeBSD ELF64, jail_remove), rip = 0x25bd44705ca, rsp = 0x25bcfe72ab8, rbp = 0x25bcfe72b40 --- ``` All vlan interfaces are locked by a single recursive global lock. There are cases, like in the panic above where vlans are stacked on top of each other, where the driver tries to acquire an exclusive lock while holding a shared lock, and vice versa. With longer-term goals of making the networking regression test suites stable when run in parallel, and simplifying network control plane locking, which I find is quite complex and buggy, let's change if_vlan to use the exclusive lock everywhere. Reviewed by: pouria, zlei, kp, glebius MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56778 --- sys/net/if_vlan.c | 126 +++++++++++++++++++++++++----------------------------- 1 file changed, 58 insertions(+), 68 deletions(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index c254e2aa3107..ab05b4d075c7 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -236,25 +236,15 @@ static eventhandler_tag ifevent_tag; * must be sleepable and also have safe concurrent access to a vlan interface. * Since the sx(9) exists, it is used by default in most paths unless sleeping * is not permitted, or if it is not clear whether sleeping is permitted. - * */ -#define _VLAN_SX_ID ifv_sx - -static struct sx _VLAN_SX_ID; - -#define VLAN_LOCKING_INIT() \ - sx_init_flags(&_VLAN_SX_ID, "vlan_sx", SX_RECURSE) - -#define VLAN_LOCKING_DESTROY() \ - sx_destroy(&_VLAN_SX_ID) +static struct sx vlan_sx; -#define VLAN_SLOCK() sx_slock(&_VLAN_SX_ID) -#define VLAN_SUNLOCK() sx_sunlock(&_VLAN_SX_ID) -#define VLAN_XLOCK() sx_xlock(&_VLAN_SX_ID) -#define VLAN_XUNLOCK() sx_xunlock(&_VLAN_SX_ID) -#define VLAN_SLOCK_ASSERT() sx_assert(&_VLAN_SX_ID, SA_SLOCKED) -#define VLAN_XLOCK_ASSERT() sx_assert(&_VLAN_SX_ID, SA_XLOCKED) -#define VLAN_SXLOCK_ASSERT() sx_assert(&_VLAN_SX_ID, SA_LOCKED) +#define VLAN_LOCK_INIT() \ + sx_init_flags(&vlan_sx, "vlan_sx", SX_RECURSE) +#define VLAN_LOCK_DESTROY() sx_destroy(&vlan_sx) +#define VLAN_LOCK() sx_xlock(&vlan_sx) +#define VLAN_UNLOCK() sx_xunlock(&vlan_sx) +#define VLAN_LOCK_ASSERT() sx_assert(&vlan_sx, SA_XLOCKED) /* * We also have a per-trunk mutex that should be acquired when changing @@ -262,9 +252,9 @@ static struct sx _VLAN_SX_ID; */ #define TRUNK_LOCK_INIT(trunk) mtx_init(&(trunk)->lock, vlanname, NULL, MTX_DEF) #define TRUNK_LOCK_DESTROY(trunk) mtx_destroy(&(trunk)->lock) -#define TRUNK_WLOCK(trunk) mtx_lock(&(trunk)->lock) -#define TRUNK_WUNLOCK(trunk) mtx_unlock(&(trunk)->lock) -#define TRUNK_WLOCK_ASSERT(trunk) mtx_assert(&(trunk)->lock, MA_OWNED); +#define TRUNK_LOCK(trunk) mtx_lock(&(trunk)->lock) +#define TRUNK_UNLOCK(trunk) mtx_unlock(&(trunk)->lock) +#define TRUNK_LOCK_ASSERT(trunk) mtx_assert(&(trunk)->lock, MA_OWNED) /* * The VLAN_ARRAY substitutes the dynamic hash with a static array @@ -434,7 +424,7 @@ vlan_inshash(struct ifvlantrunk *trunk, struct ifvlan *ifv) int i, b; struct ifvlan *ifv2; - VLAN_XLOCK_ASSERT(); + VLAN_LOCK_ASSERT(); KASSERT(trunk->hwidth > 0, ("%s: hwidth not positive", __func__)); b = 1 << trunk->hwidth; @@ -464,7 +454,7 @@ vlan_remhash(struct ifvlantrunk *trunk, struct ifvlan *ifv) int i, b; struct ifvlan *ifv2; - VLAN_XLOCK_ASSERT(); + VLAN_LOCK_ASSERT(); KASSERT(trunk->hwidth > 0, ("%s: hwidth not positive", __func__)); b = 1 << (trunk->hwidth - 1); @@ -492,7 +482,7 @@ vlan_growhash(struct ifvlantrunk *trunk, int howmuch) struct ifvlanhead *hash2; int hwidth2, i, j, n, n2; - VLAN_XLOCK_ASSERT(); + VLAN_LOCK_ASSERT(); KASSERT(trunk->hwidth > 0, ("%s: hwidth not positive", __func__)); if (howmuch == 0) { @@ -603,7 +593,7 @@ vlan_inithash(struct ifvlantrunk *trunk) static void trunk_destroy(struct ifvlantrunk *trunk) { - VLAN_XLOCK_ASSERT(); + VLAN_LOCK_ASSERT(); vlan_freehash(trunk); trunk->parent->if_vlantrunk = NULL; @@ -629,7 +619,7 @@ vlan_setmulti(struct ifnet *ifp) struct vlan_mc_entry *mc; int error; - VLAN_XLOCK_ASSERT(); + VLAN_LOCK_ASSERT(); /* Find the parent. */ sc = ifp->if_softc; @@ -693,11 +683,11 @@ vlan_ifevent(void *arg __unused, struct ifnet *ifp, int event) return; } - TRUNK_WLOCK(trunk); + TRUNK_LOCK(trunk); VLAN_FOREACH(ifv, trunk) { ifv->ifv_ifp->if_baudrate = ifp->if_baudrate; } - TRUNK_WUNLOCK(trunk); + TRUNK_UNLOCK(trunk); NET_EPOCH_EXIT(et); } @@ -728,7 +718,7 @@ vlan_iflladdr(void *arg __unused, struct ifnet *ifp) * We need an exclusive lock here to prevent concurrent SIOCSIFLLADDR * ioctl calls on the parent garbling the lladdr of the child vlan. */ - TRUNK_WLOCK(trunk); + TRUNK_LOCK(trunk); VLAN_FOREACH(ifv, trunk) { /* * Copy new new lladdr into the ifv_ifp, enqueue a task @@ -744,7 +734,7 @@ vlan_iflladdr(void *arg __unused, struct ifnet *ifp) sdl->sdl_alen = ifp->if_addrlen; taskqueue_enqueue(taskqueue_thread, &ifv->lladdr_task); } - TRUNK_WUNLOCK(trunk); + TRUNK_UNLOCK(trunk); NET_EPOCH_EXIT(et); } @@ -761,10 +751,10 @@ vlan_ifdetach(void *arg __unused, struct ifnet *ifp) struct ifvlan *ifv; struct ifvlantrunk *trunk; - VLAN_XLOCK(); + VLAN_LOCK(); trunk = ifp->if_vlantrunk; if (trunk == NULL) { - VLAN_XUNLOCK(); + VLAN_UNLOCK(); return; } @@ -779,7 +769,7 @@ vlan_ifdetach(void *arg __unused, struct ifnet *ifp) /* Trunk should have been destroyed in vlan_unconfig(). */ KASSERT(ifp->if_vlantrunk == NULL, ("%s: purge failed", __func__)); - VLAN_XUNLOCK(); + VLAN_UNLOCK(); } /* @@ -916,7 +906,7 @@ vlan_modevent(module_t mod, int type, void *data) vlan_ifevent, NULL, EVENTHANDLER_PRI_ANY); if (ifevent_tag == NULL) return (ENOMEM); - VLAN_LOCKING_INIT(); + VLAN_LOCK_INIT(); vlan_input_p = vlan_input; vlan_link_state_p = vlan_link_state; vlan_trunk_cap_p = vlan_trunk_capabilities; @@ -954,7 +944,7 @@ vlan_modevent(module_t mod, int type, void *data) vlan_cookie_p = NULL; vlan_setcookie_p = NULL; vlan_devat_p = NULL; - VLAN_LOCKING_DESTROY(); + VLAN_LOCK_DESTROY(); if (bootverbose) printf("vlan: unloaded\n"); break; @@ -1343,9 +1333,9 @@ vlan_clone_dump_nl(struct ifnet *ifp, struct nl_writer *nw) uint16_t vlan_id = 0; uint16_t vlan_proto = 0; - VLAN_SLOCK(); + VLAN_LOCK(); if (__predict_false((ifv = ifp->if_softc) == NULL)) { - VLAN_SUNLOCK(); + VLAN_UNLOCK(); /* * XXXGL: the interface already went through if_dead(). This * check to be removed when we got better interface removal. @@ -1356,7 +1346,7 @@ vlan_clone_dump_nl(struct ifnet *ifp, struct nl_writer *nw) parent_index = PARENT(ifv)->if_index; vlan_id = ifv->ifv_vid; vlan_proto = ifv->ifv_proto; - VLAN_SUNLOCK(); + VLAN_UNLOCK(); if (parent_index != 0) nlattr_add_u32(nw, IFLA_LINK, parent_index); @@ -1696,7 +1686,7 @@ vlan_config(struct ifvlan *ifv, struct ifnet *p, uint16_t vid, if (trunk->parent != p) return (EBUSY); - VLAN_XLOCK(); + VLAN_LOCK(); ifv->ifv_proto = proto; @@ -1720,17 +1710,17 @@ vlan_config(struct ifvlan *ifv, struct ifnet *p, uint16_t vid, goto done; } - VLAN_XLOCK(); + VLAN_LOCK(); if (p->if_vlantrunk == NULL) { trunk = malloc(sizeof(struct ifvlantrunk), M_VLAN, M_WAITOK | M_ZERO); vlan_inithash(trunk); TRUNK_LOCK_INIT(trunk); - TRUNK_WLOCK(trunk); + TRUNK_LOCK(trunk); p->if_vlantrunk = trunk; trunk->parent = p; if_ref(trunk->parent); - TRUNK_WUNLOCK(trunk); + TRUNK_UNLOCK(trunk); } else { trunk = p->if_vlantrunk; } @@ -1838,7 +1828,7 @@ vlan_config(struct ifvlan *ifv, struct ifnet *p, uint16_t vid, done: if (error == 0) EVENTHANDLER_INVOKE(vlan_config, p, ifv->ifv_vid); - VLAN_XUNLOCK(); + VLAN_UNLOCK(); return (error); } @@ -1847,9 +1837,9 @@ static void vlan_unconfig(struct ifnet *ifp) { - VLAN_XLOCK(); + VLAN_LOCK(); vlan_unconfig_locked(ifp, 0); - VLAN_XUNLOCK(); + VLAN_UNLOCK(); } static void @@ -1861,7 +1851,7 @@ vlan_unconfig_locked(struct ifnet *ifp, int departing) struct ifnet *parent; int error; - VLAN_XLOCK_ASSERT(); + VLAN_LOCK_ASSERT(); ifv = ifp->if_softc; trunk = ifv->ifv_trunk; @@ -1935,7 +1925,7 @@ vlan_setflag(struct ifnet *ifp, int flag, int status, struct ifvlan *ifv; int error; - VLAN_SXLOCK_ASSERT(); + VLAN_LOCK_ASSERT(); ifv = ifp->if_softc; status = status ? (ifp->if_flags & flag) : 0; @@ -1994,13 +1984,13 @@ vlan_link_state(struct ifnet *ifp) return; } - TRUNK_WLOCK(trunk); + TRUNK_LOCK(trunk); VLAN_FOREACH(ifv, trunk) { ifv->ifv_ifp->if_baudrate = trunk->parent->if_baudrate; if_link_state_change(ifv->ifv_ifp, trunk->parent->if_link_state); } - TRUNK_WUNLOCK(trunk); + TRUNK_UNLOCK(trunk); NET_EPOCH_EXIT(et); } @@ -2011,7 +2001,7 @@ vlan_link_state(struct ifnet *ifp) int error; \ \ ifv = ifp->if_softc; \ - VLAN_SLOCK(); \ + VLAN_LOCK(); \ if (TRUNK(ifv) != NULL) { \ p = PARENT(ifv); \ if_ref(p); \ @@ -2020,7 +2010,7 @@ vlan_link_state(struct ifnet *ifp) } else { \ error = ENXIO; \ } \ - VLAN_SUNLOCK(); \ + VLAN_UNLOCK(); \ return (error); @@ -2091,7 +2081,7 @@ vlan_capabilities(struct ifvlan *ifv) u_long hwa = 0; NET_EPOCH_ASSERT(); - VLAN_SXLOCK_ASSERT(); + VLAN_LOCK_ASSERT(); p = PARENT(ifv); ifp = ifv->ifv_ifp; @@ -2222,17 +2212,17 @@ vlan_trunk_capabilities(struct ifnet *ifp) struct ifvlantrunk *trunk; struct ifvlan *ifv; - VLAN_SLOCK(); + VLAN_LOCK(); trunk = ifp->if_vlantrunk; if (trunk == NULL) { - VLAN_SUNLOCK(); + VLAN_UNLOCK(); return; } NET_EPOCH_ENTER(et); VLAN_FOREACH(ifv, trunk) vlan_capabilities(ifv); NET_EPOCH_EXIT(et); - VLAN_SUNLOCK(); + VLAN_UNLOCK(); } static int @@ -2267,7 +2257,7 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_addrlen); break; case SIOCGIFMEDIA: - VLAN_SLOCK(); + VLAN_LOCK(); if (TRUNK(ifv) != NULL) { p = PARENT(ifv); if_ref(p); @@ -2288,7 +2278,7 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) } else { error = EINVAL; } - VLAN_SUNLOCK(); + VLAN_UNLOCK(); break; case SIOCSIFMEDIA: @@ -2299,10 +2289,10 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) /* * Set the interface MTU. */ - VLAN_SLOCK(); + VLAN_LOCK(); trunk = TRUNK(ifv); if (trunk != NULL) { - TRUNK_WLOCK(trunk); + TRUNK_LOCK(trunk); if (ifr->ifr_mtu > (PARENT(ifv)->if_mtu - ifv->ifv_mtufudge) || ifr->ifr_mtu < @@ -2310,10 +2300,10 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) error = EINVAL; else ifp->if_mtu = ifr->ifr_mtu; - TRUNK_WUNLOCK(trunk); + TRUNK_UNLOCK(trunk); } else error = EINVAL; - VLAN_SUNLOCK(); + VLAN_UNLOCK(); break; case SIOCSETVLAN: @@ -2376,14 +2366,14 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) } #endif bzero(&vlr, sizeof(vlr)); - VLAN_SLOCK(); + VLAN_LOCK(); if (TRUNK(ifv) != NULL) { strlcpy(vlr.vlr_parent, PARENT(ifv)->if_xname, sizeof(vlr.vlr_parent)); vlr.vlr_tag = ifv->ifv_vid; vlr.vlr_proto = ifv->ifv_proto; } - VLAN_SUNLOCK(); + VLAN_UNLOCK(); error = copyout(&vlr, ifr_data_get_ptr(ifr), sizeof(vlr)); break; @@ -2392,10 +2382,10 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) * We should propagate selected flags to the parent, * e.g., promiscuous mode. */ - VLAN_SLOCK(); + VLAN_LOCK(); if (TRUNK(ifv) != NULL) error = vlan_setflags(ifp, 1); - VLAN_SUNLOCK(); + VLAN_UNLOCK(); break; case SIOCADDMULTI: @@ -2407,11 +2397,11 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) * XXX We need the rmlock here to avoid sleeping while * holding in6_multi_mtx. */ - VLAN_XLOCK(); + VLAN_LOCK(); trunk = TRUNK(ifv); if (trunk != NULL) error = vlan_setmulti(ifp); - VLAN_XUNLOCK(); + VLAN_UNLOCK(); break; case SIOCGVLANPCP: @@ -2445,7 +2435,7 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; case SIOCSIFCAP: - VLAN_SLOCK(); + VLAN_LOCK(); ifv->ifv_capenable = ifr->ifr_reqcap; trunk = TRUNK(ifv); if (trunk != NULL) { @@ -2455,7 +2445,7 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) vlan_capabilities(ifv); NET_EPOCH_EXIT(et); } - VLAN_SUNLOCK(); + VLAN_UNLOCK(); break; default: From nobody Wed May 6 14:17:03 2026 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 4g9crw08bwz6cggV for ; Wed, 06 May 2026 14:17:04 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9crv6Ykxz3H4s for ; Wed, 06 May 2026 14:17:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778077023; 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=IXHWoBGiWrSbgRhVCHSUhAnTyQCyd8KEY5j1Zfvtrso=; b=MWCtkEAUmrxFn4mqO9rC8pY/hRbDCueIODNyB8O9Nk5GWkZzKUhiDz1Jik+w9yMYsk2hOV b1Vr5nunWWG52j2v+KLMcwypUYo80x/ctZgaOfrdojO42myeKXT+HoBf/y05l8M5V02N3G NKeZ+0ll2CapGRywbDMHJAMxaAZxarW16FP9OJwHo5A1hPnZqDhBQEbKuY9D+NMC4umSRM RLt0Ks5sV0zm116+jQ8anCUHfvX8YfzzOXB6ulKUUBKHkylN4gQq4ZCUuICsRspaTS/1zH lOAGICsOOf+IZzXb/D73bz27izehahH23Y4WahVf9619RRtC5empOq9AKqZ6PA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778077023; a=rsa-sha256; cv=none; b=SAaVy1JxdblGOr6jLAVII9D90fM/Y2eM3vAWOd9aeUnvQisubaIyzqUmRE0fReik6RZ29m 4rmn4qr3KizrJ7ToOguSKn12t+i+RH0g/m0dTvTtdq2DMEyDWRB9W0fznIO6g3UCn4vJ3E UEAYa0uhVDOl/yR4JzrOXMItHDUwTuekGDkQwi+uoLaAnv75Fp69eGF3+HvYkLk0Nt3bjU 7nIeHCgIpGfMowDYxjPCqe+luXmo7w0nTpMnzP4XaTNQOHDUow75eyW46k1zP79IDTD3UE hBC3W6A7A9XBeJpWFF8lcIV9rcFk2Ds0sba53dKTJ6mJPVledoJQEPfcgCJwDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778077023; 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=IXHWoBGiWrSbgRhVCHSUhAnTyQCyd8KEY5j1Zfvtrso=; b=yA673FyRzrgL1ajeLPDehJI+xliUWW5o8LIG+cTUUkBFgI5E7oVNziDUdE+m0giXcniXWJ 6iYuvEJau6+oFHDlYi1Cfa0MU4b0U2AUBjggKzvXV4c8OQ37RCExeCIng+Ig6YXQe9z0dd MVjzY5hqHX1cUdUx5hHBIKdg5N/t29zFB83puT/y2SG5Is7/TAmL9707v9eYMN0UjFLBbF I+1UMxfRaMCvQs8ptFl+IKEykEciYLzJeDWf8CrHWQ4/GpA5xsEidjS1fCiK6s/zayVo7Q ILtRc/m4miuoGYhANPLPAwj/WpOeXuuf24a4Sw6tsaDLyLyq2rKjjkEIkM309Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9crv5JzHzjbQ for ; Wed, 06 May 2026 14:17:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46e02 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 14:17:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 748402ebf2d7 - main - devmatch: read linker.hints from all module paths 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 748402ebf2d7a08b13d0b21694afdaad55cfa9cd Auto-Submitted: auto-generated Date: Wed, 06 May 2026 14:17:03 +0000 Message-Id: <69fb4d5f.46e02.3c8fa9f9@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=748402ebf2d7a08b13d0b21694afdaad55cfa9cd commit 748402ebf2d7a08b13d0b21694afdaad55cfa9cd Author: Baptiste Daroussin AuthorDate: 2026-05-06 13:11:16 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-06 14:16:54 +0000 devmatch: read linker.hints from all module paths Previously, devmatch would stop at the first linker.hints file found in kern.module_path. This meant modules installed in /boot/modules/ were invisible to devmatch if /boot/kernel/ contained a linker.hints file (which it always does). Merge hints from all directories in kern.module_path. This allows third-party or out-of-tree kernel modules in /boot/modules/ to be auto-loaded by devmatch just like built-in modules. Reviewed by: imp Differential Revivion: https://reviews.freebsd.org/D56847 --- sbin/devmatch/devmatch.c | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c index 62bfc2c521ed..6c6c5f3bcf79 100644 --- a/sbin/devmatch/devmatch.c +++ b/sbin/devmatch/devmatch.c @@ -102,6 +102,9 @@ read_linker_hints(void) size_t buflen, len; if (linker_hints == NULL) { + void *all_hints = NULL; + size_t all_len = 0; + if (sysctlbyname("kern.module_path", NULL, &buflen, NULL, 0) < 0) errx(1, "Can't find kernel module path."); modpath = malloc(buflen); @@ -111,13 +114,39 @@ read_linker_hints(void) errx(1, "Can't find kernel module path."); p = modpath; while ((q = strsep(&p, ";")) != NULL) { + void *h; + snprintf(fn, sizeof(fn), "%s/linker.hints", q); - hints = read_hints(fn, &len); - if (hints == NULL) + h = read_hints(fn, &len); + if (h == NULL) continue; - break; + if (len < sizeof(int) || + *(int *)(intptr_t)h != LINKER_HINTS_VERSION) { + free(h); + continue; + } + if (all_hints == NULL) { + all_hints = h; + all_len = len; + } else { + void *merged; + + merged = realloc(all_hints, all_len + len - sizeof(int)); + if (merged == NULL) { + free(h); + continue; + } + all_hints = merged; + memcpy((char *)all_hints + all_len, + (char *)h + sizeof(int), + len - sizeof(int)); + all_len += len - sizeof(int); + free(h); + } } - if (q == NULL) { + hints = all_hints; + len = all_len; + if (hints == NULL) { if (quiet_flag) exit(EX_UNAVAILABLE); else From nobody Wed May 6 14:40:39 2026 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 4g9dNF0tjNz6chww for ; Wed, 06 May 2026 14:40: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9dNF0LBpz3L7P for ; Wed, 06 May 2026 14:40:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778078445; 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=iab0+dhGlBKo+5PzUlomE5Ed2J4fHml7WYcVA+maIWE=; b=jTx75O+nurc15q+7fJW9UHHEy/zhI2xwQKn8pA7LPmwTsfhJFM7f/YavjDMMx91YR4xGDS arWOgVEhABjDQ3ScA+jW0Yct8TfB/10Ml9rJpbRHy+PdRiDXJqvMvIE4B0khSg7w/MUu9S Iwsbb0cDj0goB88hUQVFIANKnaYQYYpWj2nqe4aUDCRpk/nS9UleV0mR9h5wam17IY+PPm Ax7UlxfA6KB/06wmTmPJOIrOhYsmuVNnYZWpudEEK3kgrR/QUAc2XnWPtctqQhHgqDtwq+ snsJT9TZYcw0hURmKIUtKhI2CadIkcJaQJ5oG/z44cgChmUN0wzEBPSGwKK+sA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778078445; a=rsa-sha256; cv=none; b=ckf6Ul3j60d2P5DfJpablUrnGHukikO8JUn6fCm+4Z5Tax/W6UpFYUDGJhrgnVrcY6sa0/ xpPOrcm749Hb46/jud8u+IIXAYdTRAgvp7JZ4SZH07dVJyuhpgrrw54sEVA6iEH1kHN8qA qVYwYjfsAOK5JHDtCgt8X8yPNQn6GaYWNPgTvMScpMqt0dqYiGMxWWsAZHZgoZffwDbwCi X+3X6Vt9S8FKq+LyuyQBE8gQRHYO7ARn9cKuEFwsuCNgD8XXQ98+p0C76HjcxFsh0/8eDD A7XDUzFRbwMtejOpFO/rNyhy7jg07m81rB02kwBqcuAAQw0C3NVpEqpAyRDziw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778078445; 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=iab0+dhGlBKo+5PzUlomE5Ed2J4fHml7WYcVA+maIWE=; b=lUh1sfn7zlsS8BSiVSsH71BU7tpo9lLzCteVxOhonbf0Ni7NnSyTkaHXGlJS/huRKXF5gp BWConXMA9/yg/eJBt8hFHsIAc/4aGmv3Orx2c53W3mKoMXcTilxajsrsZt9IPTaKAricsF UEBFPnCPxmt4FCKaBtN3K5QJ2IxsgNE3lz29AFfmXAj/FWrFRObAOuZC9Z7waR27Eposnp fItrgwQmNRkQJyZ/hvSH7yeRxPJ86SAsOfks5qm5AwxyVCW72//xCZibBOni2a7EP1jzsV O2QGUjGufiX0R7lp+pfN+wnshPKZHQkz3dTkOB3+lT/fHuoBIiuyMVqRBWscpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9dND6f0FzkTT for ; Wed, 06 May 2026 14:40:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19bc4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 14:40:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3d8928114c4f - main - eventhandler: Fix the NODEBUG build 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d8928114c4fec6cefbb1cd566ef8d1b3d2999e2 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 14:40:39 +0000 Message-Id: <69fb52e7.19bc4.7dd29db0@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3d8928114c4fec6cefbb1cd566ef8d1b3d2999e2 commit 3d8928114c4fec6cefbb1cd566ef8d1b3d2999e2 Author: Mark Johnston AuthorDate: 2026-05-06 14:39:52 +0000 Commit: Mark Johnston CommitDate: 2026-05-06 14:39:52 +0000 eventhandler: Fix the NODEBUG build Reported by: Michael Butler Fixes: 735b16d490ae ("eventhandler: Fix a race when pruning eventhandlers") --- sys/kern/subr_eventhandler.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_eventhandler.c b/sys/kern/subr_eventhandler.c index e91647648995..ccc62253d81e 100644 --- a/sys/kern/subr_eventhandler.c +++ b/sys/kern/subr_eventhandler.c @@ -288,10 +288,12 @@ void eventhandler_prune_list(struct eventhandler_list *list) { struct eventhandler_entry *ep, *en; - int pruned = 0; + int pruned __diagused; CTR2(KTR_EVH, "%s: pruning list \"%s\"", __func__, list->el_name); EHL_LOCK_ASSERT(list, MA_OWNED); + + pruned = 0; TAILQ_FOREACH_SAFE(ep, &list->el_entries, ee_link, en) { if (ep->ee_priority == EHE_DEAD_PRIORITY) { TAILQ_REMOVE(&list->el_entries, ep, ee_link); From nobody Wed May 6 14:46:49 2026 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 4g9dWF3xVVz6cjbw for ; Wed, 06 May 2026 14:46:49 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9dWF3Fzvz3MKw for ; Wed, 06 May 2026 14:46:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778078809; 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=zBJ8w2L+VtwtxIx9HWTcIClgHX4Rw3HXyvSgWbR9jaA=; b=t+o/UW58fZDifi1JH8CoOx+TErZ2Aiatg6IqIdqdI2EuLW1j4t6/r7Up+zkZrJ8wRDPUlf bZq87YMLa55mwZrE3SMHWlG7KSyB3xdSmUcrZHtT6K96am5qiSIAfTC/N6Nhmg0ZdJC+tO QKHqcKhvBNySU7sNo6x/BMyPxb+Ywyen5tO2vdVgf9hfIubTVs76HxsYcLiFLG3HacPc0q RHnEJLEALnhXR958qaW9fcz1JoJWDWX9pwRyp5JkEjK+42rU5XKJP9ODxwDbhE08ZjaAaD edeGaNonZ80EO8J74np+tnJ6VQtZi590dgjCiWXgrnhE7SnJXslg25ptj0w4HA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778078809; a=rsa-sha256; cv=none; b=jVoW4nHHN9rG9VnpuSNPN0uuHaRVv7jMNnPPfxh7zdnbFLJqE6139m20n5/2y4YCMDXdRk jNsy6a9cxDQmROyhDDMIn6NGIaVm40O1lBwgwB94TyhA2hwxD/gnnp9F+mYFD3jy04slYr YlUYFpW4iKwYVi3e3vZ7nhwsZ65RQ7Uj3qwDojkOIraShwqsbLaiGpkA9Mi3ZpKxVWu9ZS nnIeaBzcZ4q74deW9NZf3g310/yyUWtV+DZ68wLe2KWm3iarkJh3TMzuLieZPmvzj3SGAh o0wxf7ZMx2qWhJTIUM5OOGP0Nef/pz222Jbrofx1EfCqifV2pTmYbIJ4BXiIXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778078809; 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=zBJ8w2L+VtwtxIx9HWTcIClgHX4Rw3HXyvSgWbR9jaA=; b=pEMGAg5ojqyMtpwNNaS6Ms12JDzp4khUsa5kCk/eszKLYgR1u3Aj03A+5glZisssWUFDxp XzE7VQXIrHH3zv9Aq1c1hKQ+Pusxf7O1thNuDlJ5zOfSphF3rWdlomde/kxlVg1DMP52hl aueSqZI4U8hhcZ0VOJn6q4X50lXiPpej7EodQQJ77NCSfJRax0xAF/ZrxuA5vxv457WLys xKJjv+6VJH5OS2L/4+5fVITgEH8b+SNh53+zLJMlJMiP9X8x+3721AYNPcJaV2T/SEDFRV Rjj42rZXg0znib+8itantJb8i18nnl/y+DpzHngv4KJw2+Y1lA1B+sPXGF0Hug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9dWF2Kyqzkd0 for ; Wed, 06 May 2026 14:46:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a304 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 14:46:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: e3e5b86e3b9e - main - README.md: Add packages/ directory 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3e5b86e3b9e00f1fe89e54d13dcd665e63eb4c6 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 14:46:49 +0000 Message-Id: <69fb5459.1a304.3f1c1b86@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=e3e5b86e3b9e00f1fe89e54d13dcd665e63eb4c6 commit e3e5b86e3b9e00f1fe89e54d13dcd665e63eb4c6 Author: Lexi Winter AuthorDate: 2026-05-06 14:45:54 +0000 Commit: Lexi Winter CommitDate: 2026-05-06 14:46:29 +0000 README.md: Add packages/ directory Fixes: bb75b0d581f7 ("packages: Convert world to a subdir build") MFC after: 2 weeks Reviewed by: des, emaste Differential Revision: https://reviews.freebsd.org/D56839 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 737afe1566ec..160c91b387e6 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ Source Roadmap: | krb5 | Build system for Kerberos 5 (MIT). | | lib | System libraries. | | libexec | System commands intended to be executed by other commands or daemons. | +| packages | Base system packages. | | release | Makefiles and scripts used for building releases and VM images. | | rescue | Build system for statically linked /rescue commands. | | sbin | System commands. | From nobody Wed May 6 14:56:24 2026 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 4g9dkK0qTtz6ckJp for ; Wed, 06 May 2026 14:56:25 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9dkK0Bxkz3PhP for ; Wed, 06 May 2026 14:56:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778079385; 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=46yxfO9VL+m7lD80l/J80+2ja3Y2J0dXWFHDCz67RFY=; b=cRxJc6Tzynqt1s1erMFCd5q+B9hCw89zwbPBD1loDxA4KwZfezn+2AIMzN4H59v9MzFyzd yxayt26fdHq+NfcM8DVDhhaNC60ylLPzfAoApq7Z7U0ROPGPDonpEO2nIIk3YKsjvjIa6J RbHEuk7N7uChnRjk4Ch77PTw6kCaPhemNLc7qR0TKrJbrrsLgSxxUjBVzvRFu5v4N/mQxw /Umkfzhak2P3gbO503bUnio/e/nV1Bz3yh3asu9hAEG9qw64UgoXcwG/mNUhtQ0/AnUZFR wQ4QGeWZv0su6Pv87EovR5irp/XfDRqT1uLlmF9bTxMZKLxiL4k+GtnBSwCSmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778079385; a=rsa-sha256; cv=none; b=fFq104AG04TD501BgN2HTZwy1oJEItc/dsXDnbWZ73o+IX/3nwvTP9ckCmUc88tVvfUubk QTeWC6+OqWavONfjtXkDjXyMRBONMiTy/qla86jzdTPkyFhx64l5KSB/gc+MnsuRL+rMeG foHRAZLmwyzgJVbJmxl2TNwIiTwgXTL8OAp+H2Bj4cyEZYBi+h/31NO8JNyNmj+bw2B0DS HR3N6LMwE1W5cYGgWDK510r4tM2ELtdY3J7KlF8X7O3vr3/gVcozv1ZFM8i19Qo8ynMZr+ 4VzMHEZjFLtlgHBEOUtPl+q3zMl8RsPDNRNgAOOOTqDUcdtEMVa1iO2OU7gQ4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778079385; 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=46yxfO9VL+m7lD80l/J80+2ja3Y2J0dXWFHDCz67RFY=; b=GEgm0nYSDdaTOLeCPFkwdU/wBvEeTSxks6cVvD8HjgXfpS4eoVBz4xGebUB/k+s3Zfh2xi ZkDt79XCDnA/48XQfOyIUvUatc62fEWvaEqAwdSsQSredTnsKtdJf39SZW7ZYEeOvRkeNU AFPFmzpUEXCugvcIHyEn0tQGCWSXpEPtbxsfIQfX7s7DfjXxRRjdTeyhtN/FI24FYzZGqa 3uYmWzgds9OIuFsQfXzQafA6XTnJ9QrKx0PjslkaxLhSe+LqWHc87bYrPbUEvaABYOHyv7 P/tpnsL/EfSU1/PdPYEZCSbFIum++esP/WhpU7z7VCtoRdiONEIwhM/PLZYC4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9dkJ6w2bzkR7 for ; Wed, 06 May 2026 14:56:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 192f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 14:56:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 448b4c3f7f7d - main - nfs_clsubs.c: Fix ncl_getcookie() when "pos" is negative 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 448b4c3f7f7dd4c7e1707d7b833a26294c297182 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 14:56:24 +0000 Message-Id: <69fb5698.192f8.3f1d837b@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=448b4c3f7f7dd4c7e1707d7b833a26294c297182 commit 448b4c3f7f7dd4c7e1707d7b833a26294c297182 Author: Rick Macklem AuthorDate: 2026-05-06 14:54:55 +0000 Commit: Rick Macklem CommitDate: 2026-05-06 14:54:55 +0000 nfs_clsubs.c: Fix ncl_getcookie() when "pos" is negative In ncl_getcookie(), a very large value for "off" for a directory can result in "pos" being set to a bogus value (including a negative one), due to truncation. When "pos" is negative, is can skip past the while (pos >= NFSNUMCOOKIES) loop and return a bogus pointer instead of NULL. This patch changes the type to u_int and also adds a sanity check for a very large "off" to ensure that a NULL pointer is returned for this case. This bug has been in the code for decades and I am not aware of any report of it causing a problem for users. Reviewed by: markj Reported by: Joshua Rogers of AISLE Research Team MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56779 --- sys/fs/nfsclient/nfs_clsubs.c | 10 +++++++++- sys/fs/nfsclient/nfsnode.h | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clsubs.c b/sys/fs/nfsclient/nfs_clsubs.c index ae9fa51947cc..6361ae5f2901 100644 --- a/sys/fs/nfsclient/nfs_clsubs.c +++ b/sys/fs/nfsclient/nfs_clsubs.c @@ -263,9 +263,17 @@ nfsuint64 * ncl_getcookie(struct nfsnode *np, off_t off, int add) { struct nfsdmap *dp, *dp2; - int pos; + u_int pos; nfsuint64 *retval = NULL; + /* + * Limiting "off" to 50Gbytes sets a limit of 100 million directory + * entries of maximum filename length. Much more with shorter + * file names. This limit ensures "pos" will not be truncated + * in the devision below. + */ + if (off > 53687091200ull) + goto out; pos = (uoff_t)off / NFS_DIRBLKSIZ; if (pos == 0 || off < 0) { KASSERT(!add, ("nfs getcookie add at <= 0")); diff --git a/sys/fs/nfsclient/nfsnode.h b/sys/fs/nfsclient/nfsnode.h index 07c7ccb0ff10..cd9ded943c2f 100644 --- a/sys/fs/nfsclient/nfsnode.h +++ b/sys/fs/nfsclient/nfsnode.h @@ -61,7 +61,7 @@ struct sillyrename { struct nfsdmap { LIST_ENTRY(nfsdmap) ndm_list; - int ndm_eocookie; + u_int ndm_eocookie; union { nfsuint64 ndmu3_cookies[NFSNUMCOOKIES]; uint64_t ndmu4_cookies[NFSNUMCOOKIES]; From nobody Wed May 6 17:38:36 2026 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 4g9jKY3DgMz6cFnN for ; Wed, 06 May 2026 17:38:41 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9jKY29v6z3n4X for ; Wed, 06 May 2026 17:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778089121; 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=Vxf7V4NblRQ7CyEO0HtwZNymufl0yC5m+MCVzng54V4=; b=yX/Ho4iI/7qe+zQrgAkvQ7xRqZJ18GBccmcyEioXALQtpgGQcmXb/TQhGbNTRVvj1ZMWAw 3cjZkkqfcyZ3VGWaZuqY0UAXTp+iWmmeOIQUG9ZOuCvbCrU5d0OFp+VhfJ8t2x/WzruoY2 /GzXmIxY/Nz6A+BdOe1DUYPyrZMynOLI8uUysp+FAEAgwvQ0n0VbQjP28leCGOqipdsuey tvcIYuPhDb/2ofq8fx0C0T0qqDHtxbDBRT7TSILeRBrtqAC4HG30aqGB4UD5JgiEDBRnPy 9DD2OQfS0ladO5DEM7rSU3vV9r1CCwVK/hmfj4PHFEUjptu7ox+0lcC2iWaQnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778089121; a=rsa-sha256; cv=none; b=UwY7Dxo7qVOx2wJkqXT+WBH6IjYzSv+mTixYCR9GhyUjbzYxtbstUxiy8pcxS0cNjPAapa AurgI+lzwANpQpNVpgIiMpdXhb60AZRIoZgT4IxwQJiWCddvHAaZTjlxzCFGPdnyGoerlZ HS5d/bIMDAQ7pOIPb2zrcHcVakn5y8h5Z0xD8cjbKOy9tHfReFXRM5DpzviCk5qq2LvY/o cGqUzAb5X6XEzkSdmBvaNDN1GeYKnawKdWWsP5r4AxoIx08609U/BKPFvkKxj6jG7nJl9k qDz2DUMQ+A0o3hHmXaocSpXGw33B3dVXBVMuh2Rn2FCbLWxK9yHJ9gNxGLNiFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778089121; 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=Vxf7V4NblRQ7CyEO0HtwZNymufl0yC5m+MCVzng54V4=; b=krLwXZzXXcsIUCS83IhDMsBFQ7HBSDLymmh04yJ6Fu3QURlJfdbyUamC8PIxbv784Y/9fk JW8koLTE3RBbNxV+9pxh30NlrT4mc1hZKV+2U0IKNjXTH5dxo7rKMPJ0xB+flZUOAx14KJ IiUJph9y5T/MFxTiU45etvN/88V/rkX/m6GrCKqpSDfPlF8NwP0ZUoqB8P1FNPNpZQ/K8Y 7kTM0wHigIOtSgnfhQD0rqbMZ2ZIbodDvrhX36XlA1g6Wn/56qw98AfXSz0cM/6qSQ/nE0 TlulBFJ/VOTc60FVOZrIHTp5Z7tu95YnEj8BdjsiHM+2nfmyakeBbdKUyDBZ6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9jKY1l5czqBT for ; Wed, 06 May 2026 17:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33737 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 17:38:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Hans Rosenfeld From: Ed Maste Subject: git: bc9f667eb11d - main - bhyve/virtio-scsi: Don't invoke iov_to_buf() in an assert() expression 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: bc9f667eb11d9b47541f834faefbc6aac077cee2 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 17:38:36 +0000 Message-Id: <69fb7c9c.33737.73b4140e@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bc9f667eb11d9b47541f834faefbc6aac077cee2 commit bc9f667eb11d9b47541f834faefbc6aac077cee2 Author: Hans Rosenfeld AuthorDate: 2026-03-10 19:14:10 +0000 Commit: Ed Maste CommitDate: 2026-05-06 17:36:48 +0000 bhyve/virtio-scsi: Don't invoke iov_to_buf() in an assert() expression If anyone would build bhyve with -DNDEBUG, any code in the expression in assert() won't be executed. Instead put the return value in a temporary variable to assert that it has the expected value. Reviewed by: emaste, markj (earlier version) Fixes: 2a514d377b37 ("bhyve/virtio-scsi: Preallocate all I/O requests") Differential Revision: https://reviews.freebsd.org/D55803 --- usr.sbin/bhyve/pci_virtio_scsi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/pci_virtio_scsi.c b/usr.sbin/bhyve/pci_virtio_scsi.c index dafff50fa531..5fb867e5eae7 100644 --- a/usr.sbin/bhyve/pci_virtio_scsi.c +++ b/usr.sbin/bhyve/pci_virtio_scsi.c @@ -669,6 +669,7 @@ pci_vtscsi_queue_request(struct pci_vtscsi_softc *sc, struct vqueue_info *vq) struct pci_vtscsi_queue *q = &sc->vss_queues[vq->vq_num - 2]; struct pci_vtscsi_request *req; struct vi_req vireq; + size_t res __maybe_unused; int n; pthread_mutex_lock(&q->vsq_fmtx); @@ -747,8 +748,9 @@ pci_vtscsi_queue_request(struct pci_vtscsi_softc *sc, struct vqueue_info *vq) * This will have to change if we begin allowing config space writes * to change sense size. */ - assert(iov_to_buf(req->vsr_iov_in, req->vsr_niov_in, - (void **)&req->vsr_cmd_rd) == VTSCSI_IN_HEADER_LEN(q->vsq_sc)); + res = iov_to_buf(req->vsr_iov_in, req->vsr_niov_in, + (void **)&req->vsr_cmd_rd); + assert(res == VTSCSI_IN_HEADER_LEN(q->vsq_sc)); /* Make sure this request addresses a valid LUN. */ if (pci_vtscsi_check_lun(req->vsr_cmd_rd->lun) == false) { From nobody Wed May 6 17:51:36 2026 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 4g9jcS3vC9z6cGYJ for ; Wed, 06 May 2026 17:51:36 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9jcS3KMWz3pQf for ; Wed, 06 May 2026 17:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778089896; 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=TS84LBA943yAUD4bugGgj8ggyKNf/SMahrcWhj7iC+k=; b=xHnZ26jogXgnk8zCsR2/NhxxL+L4Uo1Vi/MKVMSbM+VJCV+vtuzkdNAUZOvkz0cs8Twc+o 5lgJB106FtTOq1ZlkXW8xuf8kLMvSVJmSJA/E6ha4riL1fHtqa2S1Lt3kfv+zlwJ1kjvP6 GAsTRtELGaUDLi1g7dz0k/aSOVpIoo3Vs4hx30HfrUqyEidLUebaiGk1j8ADNx+kVw6PIA KYbwMuwznZbuASTH/VoeKjROD1pyScs5AehjAwLWXA9nKutC77MtGPEmI1FzaRM+LWvl3l MujFp/66eHD4q1YK6bgz/ddeJpTA800Qw5jwARGBdUNbPdl4kYC/+KQH2+l2rA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778089896; a=rsa-sha256; cv=none; b=NQEwskpvx2Q/sOOShJ7Z8CGvzyoqaSkpSQR0MUVNGeLnPyRteWonfnG5HzzCH7oiX7REkR +sS0S8UJ1WuyD0/2RmDdwYxTeK74fSrvhYXw+GYgB3Hnv6VXtmECXFUyd9A/g4T+TfsS1O rWY+XSlv5ZRi8fCVx1lw8rrF917RHWzV+pAPEhkCbwvRTwZV9b7kUyaYtBXdt0BhQarHyx ecOZa7/Lcyh6RRM1SOb0qqb7VA/UJMqBLWP+HHC/ZkyFfXFTkFE9pR2Ax9Eh/6iYUyFifI K2Tl5r/RFyUIaUGDhMSAmjiroKh5epxhM1gBhDZfEmXocTwCdACIPEcDfTEBnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778089896; 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=TS84LBA943yAUD4bugGgj8ggyKNf/SMahrcWhj7iC+k=; b=cB8XP814eRDg/qz8buDrvPId99lPqhSVr2WQiOxQLpaLQhu1mpXISqBpA1xDp8lmW3vecO Uuu+L27x+R8Q56+XhJF4N/e6H9i9H4MvAfKKBJ9UnXkFRQYnuHsqIbFPbfZelI5nzqtliv clKRj11UqktB+SLw/kxplQzi40JpBmnuW4oL9NYTAeXbAcTy1lkFypchDGId1VIjdI0KXg GK0O6rf9Tsrpo1BctDOO/zG7W5fjfkDj1LSQZuURg4ovMFqB70GDCuWPJaki7a7ywGhxYj 5OXjhgs0zrUrk3GM+j0SAHuSj0CId+SDm+fyRfuyYyfKy4Ml7Zbg6PtAUicSfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9jcS2wrfzqFW for ; Wed, 06 May 2026 17:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36fcd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 17:51:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 76d756eaa682 - main - Makefile.vm: Split error condition 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 76d756eaa6823aad282cc53ec4e41a9777d89adc Auto-Submitted: auto-generated Date: Wed, 06 May 2026 17:51:36 +0000 Message-Id: <69fb7fa8.36fcd.7fc03439@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=76d756eaa6823aad282cc53ec4e41a9777d89adc commit 76d756eaa6823aad282cc53ec4e41a9777d89adc Author: Ed Maste AuthorDate: 2026-05-05 21:12:25 +0000 Commit: Ed Maste CommitDate: 2026-05-06 17:50:07 +0000 Makefile.vm: Split error condition Make it clear which of two possible cases applies. Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D56837 --- release/Makefile.vm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index d937783f02fe..8296fc47a477 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -99,9 +99,10 @@ QEMUTGT?= .if (defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE)) || \ (defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)) -.if (defined(WITHOUT_QEMU) && !defined(NO_ROOT)) || \ - (!defined(WITHOUT_QEMU) && defined(NO_ROOT)) -.error WITHOUT_QEMU requires NO_ROOT (and vice versa) +.if (defined(WITHOUT_QEMU) && !defined(NO_ROOT)) +.error WITHOUT_QEMU requires NO_ROOT +.elif (!defined(WITHOUT_QEMU) && defined(NO_ROOT)) +.error NO_ROOT requires WITHOUT_QEMU .endif .endif From nobody Wed May 6 19:19:24 2026 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 4g9lYt0dZxz6cPR9 for ; Wed, 06 May 2026 19:19:30 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9lYs6n52z3xdw for ; Wed, 06 May 2026 19:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778095170; 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=LHYwUNXJaFOyPjGpclBZKFhAqh2OorAQuYfnlyHX92g=; b=XGXNRly5g4ZvnPYenVXC/gA6i7p5IcdTMtH5AgCnC0FXXtZ5fn5DJYyhge8KkJl94VG4Kc S++v5pfbjKzsp8JmGYoE064O4OLqA6/Vgt4zCJgXKf3kj65WDHIE2kR6ZVw5WLgYSA37Vs afhZrUWaxgyH0zbqDUYxU3gU+G7KwdViOWGqP5oQJ1C5f0s5Db24OxJZVomseik37lb+aA kWrepnFYyVMSOAxbI+aW4M26dG6UscH7N4WWDZoeVWYZSLoCOYLIwBHryD+3vGbizvgFuE qIudzC5XCzMltbciAk0VE/nfjCphnYIe4qtpNbO0W6NdexrRPDxot2JgsF2KWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778095170; a=rsa-sha256; cv=none; b=GTYAg0g9IVTHtJghLfBv2e4LUJB/XwD+PMMsm6XY5MkC4HxIKbjoW2Yc2obhMaJXgFVXgq 1Q0dFi4rgi3UA2Grh7ctKPjMT9IQOwTIyLAcGPaPvwm1z0HvNYJUV+9QBwxW0sqgOk3wpF gjkq1mGttbHOyf/AGrKem0nPB1PXM0k0cvkJqdQKDgwkBiW+7PVzPBqa7hgWauJruxt5Cl 57cB5PGFW5GYLWrxvlFV4BMzf9pFTV6xvG7a6hcLihQK0qLprXetutHNIHZvWc2O6Mipxr Et1Yw9Bp2Aud7/I7qKiQH3NPw2hegQyomJZqzrLV6gqF01u7AHMQ8HdMuN/xuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778095170; 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=LHYwUNXJaFOyPjGpclBZKFhAqh2OorAQuYfnlyHX92g=; b=LxWpVvFbBwY63/PAnR4N8qVa7zZi8AFwoCp9FYg8SR+Z2jtAYZyqzHLEWCfZ26R3TnUAdZ tpHu05ttbjLzkVv80lVBioJGNhhzaBA2qQYraZvYf3diKkhLW6mOQdnggvnCIgE0Bcp0gn WcLs/HYL54qPQ4EJryu7QYmtQ+855GifKnbzcMEQzPZRLlPCb1PqQMK4S8kiqzABnCZr0Z 8XVtLUFp/V9uonSGfO3plRWoRuPN8q5Tsyhvx6DUX+x7/dm0w6EzffFo0hQnl52aFVx3SI B+Eil/lpGGlDdkZx4rB4q001c9aXMBeDnYFh1nOc6ieF8hT8IElF3K57I8nTEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9lYs69TCzshg for ; Wed, 06 May 2026 19:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ec65 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 19:19:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: tickerguy From: Pouria Mousavizadeh Tehrani Subject: git: 103f9883d1ed - main - rtadvd(8): Honor pltime/vltime in interface declarations 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 103f9883d1ed7431c432caa6ab9c61cd4d0831d0 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 19:19:24 +0000 Message-Id: <69fb943c.3ec65.33f6d40b@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=103f9883d1ed7431c432caa6ab9c61cd4d0831d0 commit 103f9883d1ed7431c432caa6ab9c61cd4d0831d0 Author: tickerguy AuthorDate: 2025-09-29 16:05:29 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-06 19:19:13 +0000 rtadvd(8): Honor pltime/vltime in interface declarations Currently rtadvd ignores interface pltime/vltime specifications unless the (static) address range is also included in the config file. This extends the validity of a pltime and/or vltime stanza in the config file for an interface to delegated addresses from an upstream provider. Signed-off-by: tickerguy PR: 288426 Reviewed by: pouria Pull Request: https://github.com/freebsd/freebsd-src/pull/1863 --- usr.sbin/rtadvd/config.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index 8b7079c17822..df4473841312 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -1107,6 +1107,7 @@ get_prefix(struct rainfo *rai) ifi = rai->rai_ifinfo; for (ifa = ifap; ifa; ifa = ifa->ifa_next) { + int64_t val64; int plen; if (strcmp(ifa->ifa_name, ifi->ifi_ifname) != 0) @@ -1155,9 +1156,26 @@ get_prefix(struct rainfo *rai) "<%s> add %s/%d to prefix list on %s", __func__, ntopbuf, pfx->pfx_prefixlen, ifi->ifi_ifname); + MAYHAVE(val64, "vltime", DEF_ADVVALIDLIFETIME); + if (val64 < 0 || val64 > 0xffffffff) { + syslog(LOG_WARNING, + "<%s> vltime (%" PRIu64 ") for %s/%d on %s " + "is out of range, use default value instead.", __func__, + val64, ntopbuf, pfx->pfx_prefixlen, ifi->ifi_ifname); + pfx->pfx_validlifetime = DEF_ADVVALIDLIFETIME; + } else + pfx->pfx_validlifetime = val64; + MAYHAVE(val64, "pltime", DEF_ADVPREFERREDLIFETIME); + if (val64 < 0 || val64 > 0xffffffff) { + syslog(LOG_WARNING, + "<%s> pltime (%" PRIu64 ") for %s/%d on %s " + "is out of range, use default value instead.", __func__, + val64, ntopbuf, pfx->pfx_prefixlen, ifi->ifi_ifname); + pfx->pfx_preflifetime = DEF_ADVPREFERREDLIFETIME; + } else + pfx->pfx_preflifetime = val64; + /* set other fields with protocol defaults */ - pfx->pfx_validlifetime = DEF_ADVVALIDLIFETIME; - pfx->pfx_preflifetime = DEF_ADVPREFERREDLIFETIME; pfx->pfx_onlinkflg = 1; pfx->pfx_autoconfflg = 1; pfx->pfx_origin = PREFIX_FROM_KERNEL; From nobody Wed May 6 19:52:19 2026 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 4g9mHl2pdGz6cjCZ for ; Wed, 06 May 2026 19:52:19 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9mHl1GC4z42Hx for ; Wed, 06 May 2026 19:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778097139; 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=ia0jmkQ4lCa8Ib5nZNQJceHnvj5TtIbiww/7eEzqlzs=; b=dCid2ydgnPs14GMKhQkdxGzvWCNNqrBAGgbYf7ob/hI0+ynT5hyCzZ/61zkVpFXDYDf7H7 kwpSvzQh1PXbKLcQP74OGAg3MRoHkGnWDmp4ihIgrN1/uHl60NgfLAVx3heH2TJtFjtmNZ 1qG1Dea8ytugT0BlOn0vRBgvuOarAboboUwvnkmmjrscQK93ZL8KBlzybMT8Asers07aJu KiqyXGFUyIR+WwOysyBLps9lK/6G/Lv7F/JiY3bxm6Jkv9dYz9rJEAermNnCAYlpPSBcFf fqlp8JZj2V3lX1bQJZ8Qqs5MSCAVntRNJ9IAsQlw+mvfVTalUjMcAj48jW+qKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778097139; a=rsa-sha256; cv=none; b=fcp18QseHCHcJEaCOIV6FnN3oaOcg+p9zyZYz4PwtcnJnrcOL2yGzk+eqCK9uLku7udks9 7KNHaCdJkAT7wmuA5uwRbBrf10a8o5BoUHlb0XAdadHHhFLz5yYANLPF3c8RaGvdqUziU6 z1bqXNBaaDdXAbo1dDXRWv9rtQtPzYEB2dzDfCJ/h1Qs5poBTMZcJQUV5vkalxE5YmzAXY i8GfETi/QKKfpd/4KzCs91y//EIBATg3V3uao+lWoAu6K0naOf1uFWcLdeLAS+a90TchkU Q0WPPQm+nDjdnLaUAkY2SFhhPNV/aEiIhiYcfTVUlDQc11WYPGIV8rIjQmaiEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778097139; 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=ia0jmkQ4lCa8Ib5nZNQJceHnvj5TtIbiww/7eEzqlzs=; b=At8B7rO84cvoOcfqLQ9ZXfo6DQeR+glsTs+bLDuF4u9k5ZvZJkc2Y0YAIhd94uCdDKh+dH +Ki+jnmYEVs7fNh+ctYEfO6qljiWNNdwtee1n+re/QrHKUzo7Y0UyfYi7LJBBxtEap+GFh YxcWrsIVuuZ/PLBPe/O9+nlj9R2BHfuBRs4prmGoGsuBbKwRgvAKhcyngRG40i/3uxJWVs KNYuLwR4TLtP9Wuioh5w7hho1LU0cVqH9SQi5Bk1cHLVt3fQekrsRolXH5xmAbipQbVrVQ lPH+JPzVPpMVbwONTcyppdtP7+ZA6m1qgbn7DJunzJZRdNKldRM/IRWmqQ9qmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9mHl0kdWztGG for ; Wed, 06 May 2026 19:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1be2b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 19:52:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Hans Rosenfeld From: Ed Maste Subject: git: 84a95741805d - main - sys/cdefs.h: Introduce __maybe_unused attribute 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 84a95741805d84f0074a34d61b93ccf86f422cf3 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 19:52:19 +0000 Message-Id: <69fb9bf3.1be2b.3d323559@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=84a95741805d84f0074a34d61b93ccf86f422cf3 commit 84a95741805d84f0074a34d61b93ccf86f422cf3 Author: Hans Rosenfeld AuthorDate: 2026-04-16 18:22:44 +0000 Commit: Ed Maste CommitDate: 2026-05-06 19:51:46 +0000 sys/cdefs.h: Introduce __maybe_unused attribute The __maybe_unused attribute should be used for variables which may or may not be used, such as when their only use is in an assertion. This attribute is functionally identical to __unused, suppressing compiler warnings for particular variable if it remains unused. Reviewed by: Minsoo Choo , imp Differential Revision: https://reviews.freebsd.org/D56517 --- share/man/man9/cdefs.9 | 6 ++++-- sys/compat/linuxkpi/common/include/linux/compiler_attributes.h | 1 - sys/sys/cdefs.h | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/share/man/man9/cdefs.9 b/share/man/man9/cdefs.9 index cc56e34d070a..2bda50c3f875 100644 --- a/share/man/man9/cdefs.9 +++ b/share/man/man9/cdefs.9 @@ -3,7 +3,7 @@ .\" .\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd May 9, 2025 +.Dd May 6, 2026 .Dt CDEFS 9 .Os .Sh NAME @@ -85,7 +85,9 @@ linkage. .It Sy __weak_symbol Ta Declare the symbol to be a weak symbol .It Sy __dead2 Ta Function will not return .It Sy __pure2 Ta Function has no side effects -.It Sy __unused Ta To Variable may be unused (usually arguments), so do not +.It Sy __unused Ta Variable may be unused (usually arguments), so do not +warn about it +.It Sy __maybe_unused Ta Variable may be unused (usually arguments), so do not warn about it .It Sy __used Ta Function really is used, so emit it even if it appears unused. .It Sy __deprecated Ta Function interface has been deprecated, and clients diff --git a/sys/compat/linuxkpi/common/include/linux/compiler_attributes.h b/sys/compat/linuxkpi/common/include/linux/compiler_attributes.h index 42908bb6c2b5..159c833802c5 100644 --- a/sys/compat/linuxkpi/common/include/linux/compiler_attributes.h +++ b/sys/compat/linuxkpi/common/include/linux/compiler_attributes.h @@ -39,7 +39,6 @@ #define noinline_for_stack __noinline -#define __maybe_unused __unused #define __always_unused __unused #define __must_check __result_use_check diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 132d4809b0ed..a08c50c8439a 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -152,6 +152,7 @@ #define __weak_symbol __attribute__((__weak__)) #define __dead2 __attribute__((__noreturn__)) #define __pure2 __attribute__((__const__)) +#define __maybe_unused __attribute__((__unused__)) #define __unused __attribute__((__unused__)) #define __used __attribute__((__used__)) #define __deprecated __attribute__((__deprecated__)) From nobody Wed May 6 20:20:54 2026 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 4g9mwk6VHZz6ckxd for ; Wed, 06 May 2026 20:20: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9mwk5nWSz452N for ; Wed, 06 May 2026 20:20:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778098854; 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=1Y5xzE+9+NQoP95W/ezvYCg/BPRVU6DCyXRyANqa6mA=; b=D098R7AUvvya7BOO3OCpc5AWJam5vRv+05syn+lIXyvvw/u0ZsDBBNqhwFua+mO90OA+kP ruZhlcuRYzmRdDRU+GGox+DVhHrss45rnjD04xp8D0t/P+LgGdMOb2RCvkbUV/Pmuh5zJn G1I2p59B/Do+K/UIlQqkCbHK/8LiEJaGE4m9sTMP+vrHTBSJx4Jfj7grG/UZwVcNq5ZYvN Rna3lHHB1lmCrQYXc9/CFu2pacPJpVjCYQtn+AlyrrtaxjI7NqjfvGpd2Q8KiC1SUS4+nY o7Uc1nqM99DcC21roF+1apO+zZiMTwmXki7hNuJs2MBsoo6klaQ4YazbzY9dWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778098854; a=rsa-sha256; cv=none; b=k8AgycuCKJQLMQeGFM1NGLuSCH3r05z0Tyn8QioPETgXbB2dd5J/MnY5F1WCTjMtS7Vilk cnHDzsl36WSLWzie6bjIfcRXwG8NNbBt6+2u+vR+RR7DOeslzLDcH1kNJ0GVDug9ur2CNW l8Y8bSFm3KdLO4ofgzXD8DwEFbT9V9OOVcBAnG0SG6pTu6CIvBRSet4o1e8h1p/7Lmzwmy 4nAefwNjWiN0UeJ6dFhMkrEpHaaDF4SECDpzZPqOkpnyaQ2SQV9OJftwjWZH9Xz5KQ6w2C 9/zpplYppd2LVaqlvzroV5gbxgPS1FRlE1XU6NkvS/ENrxSYpSdVvGKNT6s0Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778098854; 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=1Y5xzE+9+NQoP95W/ezvYCg/BPRVU6DCyXRyANqa6mA=; b=e2/akjAD44BFW3FDHHmkm7MkJKgRN+Cmw96dMgWEO6+mbL6YDzxCyfcsSMnIWcY8K1ubUh kvn+fuvNLH6CQHQOtq8TL/dDVL/XT/M8PSR30rYUrAo6U4EFC0bbNEAk7dakCC9MLdgPUl k7q2NPxsN+q6PrhHJiYAUNAjqIjDOPAdwCJOy6Zy0D3i7Vwrw4IX4229BGwJ1sFSf6nVom fre3zE3Kpwbivbw+xL7uOwNUyWA6Dz4I84PqkVMK8Vgl2ammBs6rrMYyWEl5xrpbbPlGtB ANe3ZbvFd4Vj6nWZhL7tF7jbAIah8+WZfgR6tnIXg5uxIutjDeotdh2HOd3PfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9mwk5LJJztpZ for ; Wed, 06 May 2026 20:20:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cfd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 20:20:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: c316ec259011 - main - nuageinit: only parse user_data as yaml when necessary 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c316ec259011e9e22e40eaa72d834f3bfac95c28 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 20:20:54 +0000 Message-Id: <69fba2a6.1cfd6.2ed0b178@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c316ec259011e9e22e40eaa72d834f3bfac95c28 commit c316ec259011e9e22e40eaa72d834f3bfac95c28 Author: Baptiste Daroussin AuthorDate: 2026-05-06 20:14:17 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-06 20:20:45 +0000 nuageinit: only parse user_data as yaml when necessary This fixes a regression introduced in cae280931c9e which prevents user_data as a shell script to be used PR: 295062 Reported by: Ross McKelvie MFC After: 1 day --- libexec/nuageinit/nuageinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index f7700f7d8e70..a1ebd3f52b25 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -727,7 +727,7 @@ local function load_userdata() f:close() local obj = nil - if ud then + if ud and line == "#cloud-config" then f = io.open(ni_path .. "/" .. ud) obj = yaml.load(f:read("*a")) f:close() From nobody Wed May 6 20:52:28 2026 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 4g9nd85nddz6cnnY for ; Wed, 06 May 2026 20:52:28 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9nd84k27z47xb for ; Wed, 06 May 2026 20:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778100748; 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=Mz7aCwAmLagYvkBWYzJa0hQbyvKScGi2w6AH1DYTsS0=; b=wgAO73UcY6Ga56YyyhFTxIeAC/WM5zErweXzL9Fza4txqEulb4zDpdx6x1K8zUKJofk6b9 kkL3Qgwa8Me3nhqXrzTjhfmYzsazz1tRl+ObJJPm3x1D8fTbVie+L/puaKG1sMK8RHIfMW kXsMeie3PIuFeDfHKZCk4M7lRG0ijvmv2rsBpyyS7R6F+Lttuqpba/DN478QnhZtYrabeH HQo1Ab/9cf6mK2grDfxGkehIZbdjSVExGT0CNSuvtpAL2az0gpOB/gcwTQHb3s8Z0Agi+D 7hSf7yOH+Wyqz/PLsJk4EpArNPCpN+Pm2y4ESL8dLIjrG7UZQwm3x1A7z9iXqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778100748; a=rsa-sha256; cv=none; b=qNaO7DthS6bRr2EzzwVuWto9h13yBwBj8/X1aF9U4Ua4W3U+LR1CwM4YJZoaP1PpmjnZat j/g9lqHnOf6exc0fFpIG5vKNdyvpkJJQb+gRz/ohhdUiUKUDK04bak5Q7eJ4EdGLcaohsB XsGyo7YvdX53OiUSabScHCtE9qszSbqB6eSDyJ1IWKQixeLaQhOAyo98RkUAyfW09nqhpG iBxAkcGV4V6FiqkqFTpskAJjXFtWHmOf9F01rk3R4Z/MErMMr8rou/loEDlkxePndD5igz FXauMrV0n9tb2nHT1P00wmzZ3p84tiDAyeX+zxF5f1RhFkvSbDTlccD6xdPnlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778100748; 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=Mz7aCwAmLagYvkBWYzJa0hQbyvKScGi2w6AH1DYTsS0=; b=vo6PFNfoeWBK/Y2PJNNBK399NPjJZpBR9XCX+MYFnRpdaOdYScUnLKd+XZViCmzVxCI6P5 MNAsQwD+m0Rk1aJqw8TMX5p96E3Ce9A28PNMely06GcCBwOMrHRemX85TH+dn9neNKK7d2 WScajOA40Fyz1SLWwJTwR7B1xCHk6pOHmn3oXBAKX3u9PKxi/t7LRUBPzGBYCHwHTfg8No sll62qIcWkv9GR7D1GEmyxlEBRqLjYRW7BKrmTNRTSal/BQN7yCr2FNoC4llVDYt+av1T7 aQ9LQq0K7r81zW54VZabFfY0Kd0sbUj96PAzWEnXSFd9JWmKcrLQhRqg+vjEwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9nd84F2Gzvww for ; Wed, 06 May 2026 20:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 229d5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 20:52:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ariel Ehrenberg From: Konstantin Belousov Subject: git: bf636accdde4 - main - mlx5en: destroy TIR before DEK during TLS RX teardown 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf636accdde4bb9af2c6c07af5420dffffd82332 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 20:52:28 +0000 Message-Id: <69fbaa0c.229d5.2dc77e0e@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bf636accdde4bb9af2c6c07af5420dffffd82332 commit bf636accdde4bb9af2c6c07af5420dffffd82332 Author: Ariel Ehrenberg AuthorDate: 2026-04-15 21:45:07 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-06 20:52:12 +0000 mlx5en: destroy TIR before DEK during TLS RX teardown Reorder the TLS RX teardown sequence so the TIR is destroyed before the DEK. DESTROY_TIR for a TLS-enabled TIR issues a TRA RX fence that drains all in-flight packets from the crypto pipeline. If the DEK is destroyed first, packets still in flight hit a TPT encryption error (vendor syndrome 0x55) because the key they reference is already gone. Reviewed by: kib Sponsored by: Nvidia networking MFC after: 1 week --- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c index 89d2010656c5..b6a9a0c01d09 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c @@ -596,14 +596,21 @@ mlx5e_tls_rx_work(struct work_struct *work) if (ptag->flow_rule != NULL) mlx5e_accel_fs_del_inpcb(ptag->flow_rule); + /* + * Destroy TIR before DEK. DESTROY_TIR for a TLS- + * enabled TIR issues a TRA RX fence that drains all + * in-flight packets from the crypto pipeline. If the + * DEK were destroyed first, packets still in flight + * would hit a TPT encryption error (vendor syndrome + * 0x55) because the key they reference is already gone. + */ + if (ptag->tirn != 0) + mlx5_tls_close_tir(priv->mdev, ptag->tirn); + /* try to destroy DEK context by ID */ if (ptag->dek_index_ok) mlx5_encryption_key_destroy(priv->mdev, ptag->dek_index); - /* try to destroy TIR context by ID */ - if (ptag->tirn != 0) - mlx5_tls_close_tir(priv->mdev, ptag->tirn); - /* free tag */ mlx5e_tls_rx_tag_zfree(ptag); break; From nobody Wed May 6 20:54:02 2026 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 4g9nfy6cdTz6cntW for ; Wed, 06 May 2026 20:54:02 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9nfy64m8z487Q for ; Wed, 06 May 2026 20:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778100842; 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=5Ny6nsfBT3HqP8103paARQMZD2nNs2G0mMWpMEBpRoY=; b=onL8WGALQu2DKu28Fzrf01E5+2OUGKJpQIwsvUO4PYWIQGZEgDu9H4fNUoK4XzQ8m8Ygbw Sb+pXeLg/F3B8QvBEwSjEdocd8tAUatLqWpoGFlEw/5QsWHYcSZoO1i3JMAWouiUhJ8wRK iMHhUF+Yjetnt6daySWWJ/E33D9ZwnJPvIixFH2f6/12EDUlgd4TqrVwXfTRZhMIx6O+S4 gPBF1ola93fXm2vZMjVz4wKXSxpPPtHO7obxi/LruWrXv9UR6Hcmj77IBR22/i4bloxjVa 4bSqjA/ext/oScYvG9eAu4Lv88qVMWr6iBnSoDOKPCRpsY8JoU1aiPuMzI+n9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778100842; a=rsa-sha256; cv=none; b=KBnF9BwFIcrOYRcz9q7L6KLcoKduE/IBkYoRfTmTDzCyv8lyC7RujZLibRHgK3MvAz6zRt 0S/fokyjKmZGXT8nrl/ZBvK4ur+cSaLoUhI1hzGwPUxyHPr6Ny9LH++mUFMoFHu1pxDaDV V65i7N6XoGZ/gqR1PsEMBBuT8S6MLU6nLqQq6VsEsfzBWFpCU7AMlRkUm/ngbjPtUqPGMP ZK2VNv5BkJ1aVrZP2uSzWPvXkGxRWCtVli0Gx0yZ8RsnJKlwfH3eqQGmkc1DXcofiPux4O 1a0eD22vyFbymK4/y1D0LqV3Y6kYbSNHGv19x1jaCIq3C7DIj/UWafCcf+4BLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778100842; 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=5Ny6nsfBT3HqP8103paARQMZD2nNs2G0mMWpMEBpRoY=; b=hBhOEp9883BL+2heckaMZ3199WTqq/7MgN+5N6PFS3Rqwdr8tuhrhAsOeu+GPCGj0tZ2Ez gjNqpC1u1LqsdOXxI+VMxk3x/Ka5IOyS5dXrFN4i1Ran6y574J4UEFztjU6rdpY8mgmWeN bzGevcBoGVFoLd03enRcCYPh0fEEOZlowGCVZXvvEckr/uY74i5CDXDj9EK7GJ3jgQQfed LAMLpb+yA/mU6V1AeatCdOM/3czYv+yadBAb3DLHL8kP1xyNynQKxqvnscJsUZwzmsqjB2 66VHqemtSrs9jqpzzh6iw46JdUhTsutPnTQ5G6nU76bU1xzjhTcbqNpcQkFH4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9nfy5XxZzwKb for ; Wed, 06 May 2026 20:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21d51 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 20:54:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5a6e5954d14b - main - kobj: Assert class passed to kobj_init_static is compiled 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a6e5954d14b589bcba0125d10a6c7b62b588f4b Auto-Submitted: auto-generated Date: Wed, 06 May 2026 20:54:02 +0000 Message-Id: <69fbaa6a.21d51.a89b380@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5a6e5954d14b589bcba0125d10a6c7b62b588f4b commit 5a6e5954d14b589bcba0125d10a6c7b62b588f4b Author: John Baldwin AuthorDate: 2026-05-06 20:53:46 +0000 Commit: John Baldwin CommitDate: 2026-05-06 20:53:46 +0000 kobj: Assert class passed to kobj_init_static is compiled Inspired by discussion in https://github.com/freebsd/freebsd-src/pull/2016 Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D56624 --- sys/kern/subr_kobj.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/subr_kobj.c b/sys/kern/subr_kobj.c index d97834b3fe58..09fd730660c4 100644 --- a/sys/kern/subr_kobj.c +++ b/sys/kern/subr_kobj.c @@ -317,6 +317,8 @@ void kobj_init_static(kobj_t obj, kobj_class_t cls) { + KASSERT(cls->ops != NULL, + ("%s: class %p is not compiled", __func__, cls)); KASSERT(kobj_mutex_inited == 0, ("%s: only supported during early cycles", __func__)); From nobody Wed May 6 20:54:03 2026 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 4g9ng01X59z6cnrp for ; Wed, 06 May 2026 20:54:04 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9nfz6TBFz48rj for ; Wed, 06 May 2026 20:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778100843; 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=JzUNN0updTA6xyDKf0FWSVtG1i+hsk/g2R1VeuHWez4=; b=P0Gtkv2z7cniQw4swsQRDhJMQVlJI7ej2sNn6mZE07vvC5LVXAIHxeMCCjdFo7eEiK3dwI rXwYIly7N3GAnr80p0TF4I+HH/F7BEOtEqHwMQ85eIZdEnt28diNZQ0hAuJIR0lSuBOYX/ 5g18DIJnATZj+kYIFQYsvNY0UyOW3IBrnV+BHlUi3qW0HKJdeRvtXhe+mOdhuEtxyjG9T/ Ult0LbJGlSeFiqwKcPk1uL0OOvFo3peo/E+/69LggwL/7SpYyhoioC3BohKA0eq4H1KHFS DAQFqpm4iL0D+N8vK9weXXB17UsmiIoXdgbazDndxVrI3hFya/iopmdfcpSX/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778100843; a=rsa-sha256; cv=none; b=en+xYN/uVSCHV9GRqTwWrq1ZeN8xu6qb07DQVqRHLtE9bN4e8B8ikUf8xPDNyluxQRo6wB S0OCl4V/Z2bSK2nfq7svVchlBNu1x4CUSmOmEJn341ZYdaOZxsl2EM1QMyZ+6mK8j5t9SZ KOJgk4OItmCb/OZvQ5wgi49fuZQPJDT3bblCPd7aoWsZfBSWy6iWz2hm9byv4vQClYpQzm HgNxEtrVNfhwdCdRYxshKPN9RVtesWJDmrTtC9VZA3Q6u0oklPnpE4+yYPoIJh9kd4CUGi aS0bDMu3opgds64f9fv3RyV1VuoKceHeYLr882i1XUkJm7vlY3SyABw0ikiM5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778100843; 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=JzUNN0updTA6xyDKf0FWSVtG1i+hsk/g2R1VeuHWez4=; b=Ep5AaL1HMsMe2Ky+h/icN2twIkyEYY3UJzQnQ+gxWPSkashwEHuQ5//ymUcoYKfMDSa3kw KXzQPVyt6yCm/mhc8quUaH/jDby/ozOGTg7pa9/wZDkMqo+YGIfPbpON3t/T5qMtU2IeBO cF8qyB8eOyuc3cY9rhEV1s2C6Gnk0sknLArMED2jtlJF7hAzvfb9OzWQBxRQBLjkrlpk6X qMNISOqVvkvLfeuyx42YY775ndrVH/bUQstOzuH/rPKxBp5tVqZ7CwOIBo/0ChkJOxbkko +WwudNBQKNqysKQn9MzS8FQQkip4xx8OSFgZ59fYcDPihuX0RC4p2YyhcdjUog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9nfz6478zvcS for ; Wed, 06 May 2026 20:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22e4c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 20:54:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5df7dae10dc0 - main - kobj: Use M_WAITOK in kobj_init 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5df7dae10dc02ade8639b0171e0d3cc8db790e41 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 20:54:03 +0000 Message-Id: <69fbaa6b.22e4c.bfab97@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5df7dae10dc02ade8639b0171e0d3cc8db790e41 commit 5df7dae10dc02ade8639b0171e0d3cc8db790e41 Author: John Baldwin AuthorDate: 2026-05-06 20:53:46 +0000 Commit: John Baldwin CommitDate: 2026-05-06 20:53:46 +0000 kobj: Use M_WAITOK in kobj_init Blocking allocation is safe in all of the current callers of kobj_init (most of them do a M_WAITOK malloc of the structure passed as the first argument to kobj_init just before calling it). kobj_init doesn't return an error code but instead panics if the nested malloc in kobj_class_compile1 fails, so using M_WAITOK here is more robust. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D56625 --- sys/kern/subr_kobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_kobj.c b/sys/kern/subr_kobj.c index 09fd730660c4..a88639289954 100644 --- a/sys/kern/subr_kobj.c +++ b/sys/kern/subr_kobj.c @@ -308,7 +308,7 @@ kobj_init(kobj_t obj, kobj_class_t cls) { int error; - error = kobj_init1(obj, cls, M_NOWAIT); + error = kobj_init1(obj, cls, M_WAITOK); if (error != 0) panic("kobj_init1 failed: error %d", error); } From nobody Wed May 6 21:16:48 2026 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 4g9p9F0f2yz6cqWK for ; Wed, 06 May 2026 21:16:49 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9p9D5nHgz4FDd for ; Wed, 06 May 2026 21:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778102208; 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=RH8tNjiaAlJr4M4SXOYy6i7IkgOOuTRu5N4DV6vUUkc=; b=NBFZmHFkIALBaMIpqeJrF0uDSgDGTJNH78Cq/Az5rLnTdO+KiET5iumYnckxEkJEejNLtR uRVwVBhCVfx0nHPNZy4UBk4owcx3mLixMj+appS96r7Th1bhLptGIrXQwNUK1Ajyic+1hV QtH6A89vdD8cJ/rRasLGGWGcmi+rLBaTLzVZuyGhTn061h0hoT3xh8spNZI33+av4fZike Y91IdnEOBbAO1FJPz17WSniUTj7W+IIyJdmYuNqLS8mlGyVPmxm0cpRyaXSDyrAzFraqK7 yG2OCBAjNbS6Kv1zZsNMZWbIo7+5Nw14OWbUA5UQPJ9Ns+0tQhl7lvY82FRmkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778102208; a=rsa-sha256; cv=none; b=nF5Na67nVun/OhJk0WHBIV6eMlMnTq1Gf7tmDTS0k5FK95Jmhg2ZabkTIHBv2Nv/cshf2C sr85faUt8jYQYFM7VpBR7KeJy0vJTFyDI7r67zb/R5c6M+u0DGvAvBaORZgqOzuCweG3Gj AvndAwT86nqKSIhoqqMym8G7yIp77MQ9XX/3aT2AxEl15ZH9OKRBxYOnJdV+OPnrG3jy9x 6QEXCgOih9ftLaoqkua2hs6yjQ6KbxKWsnZmh5z9W7sREkco1DMiMja7bkAgWaU7jZhoWH F8T9qOeFYfT898oE0Nx3S6DGHT9PwN1XSW422tJlk5q2OR4H56iUM5P6TeMwZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778102208; 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=RH8tNjiaAlJr4M4SXOYy6i7IkgOOuTRu5N4DV6vUUkc=; b=Om/Ao1MNmR6lBkacyaGHtN2PwKkQI6tJ6Tc9FrP+pMVowib5CzeElJusXd1OApOz923Dbz cyHp6GCDG+F7WV36hOBB+f7zuZYFu0i/v0E1bKPyNX20D1P72U5s2QyoXxzyHHC+e6FGL3 apI0Hf2ICvbTtodP1v+xe8v8DU+uekTUtpiqddZ6PFYhSeBm7TGdF2nV6//hJ1cYfyzqqQ ZcLcz73Pra4vV7BfI1eo+6hzlyq8MCmUa/gA0YAN04l1OCchD+ie6OrzClI34yFWvz8STU KxbNfLpoW4DXgNkoin4hW83gBwegMFOzgy8e7AV8zItKQoUaQOecViXzDaxQMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9p9D4NY7zwfZ for ; Wed, 06 May 2026 21:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2275d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 21:16:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 2a86992ab501 - main - nuageninit: modify the test to show the issue fixed inc316ec259011 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a86992ab5019b4997ccadf7427011ba44e33c97 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 21:16:48 +0000 Message-Id: <69fbafc0.2275d.6d4eafb6@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2a86992ab5019b4997ccadf7427011ba44e33c97 commit 2a86992ab5019b4997ccadf7427011ba44e33c97 Author: Baptiste Daroussin AuthorDate: 2026-05-06 20:45:50 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-06 21:16:37 +0000 nuageninit: modify the test to show the issue fixed inc316ec259011 Ensure the script used is invalid when parsed by libyaml which highlight the issue revealed in PR295062 while at here validate the mode of the file is properly changed PR: 295062 MFC After: 1 day --- libexec/nuageinit/tests/nuageinit.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 3a01413f8487..1fd68d5a178e 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -76,10 +76,12 @@ nocloud_userdata_script_body() { mkdir -p media/nuageinit printf "instance-id: iid-local01\n" > "${PWD}"/media/nuageinit/meta-data - printf "#!/bin/sh\necho yeah\n" > "${PWD}"/media/nuageinit/user-data - chmod 755 "${PWD}"/media/nuageinit/user-data + # ensure this is an invalid when parsed with the yaml parser + printf "#!/bin/sh\n: ${test:-yes}\necho $test\n" > "${PWD}"/media/nuageinit/user-data + chmod 644 "${PWD}"/media/nuageinit/user-data atf_check -s exit:0 /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud - atf_check -o inline:"#!/bin/sh\necho yeah\n" cat var/cache/nuageinit/user_data + atf_check test -x var/cache/nuageinit/user_data + atf_check -o inline:"#!/bin/sh\n: ${test:-yes}\necho $test\n" cat var/cache/nuageinit/user_data } nocloud_user_data_script_body() From nobody Wed May 6 21:29:26 2026 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 4g9pRp4czwz6crPL for ; Wed, 06 May 2026 21:29:26 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9pRp3wqGz4HBg for ; Wed, 06 May 2026 21:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778102966; 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=lWgWmeVNMh7yid+zI8SNZlMVbxwrnSM+0vJT2NmCLA4=; b=RnsqcxdFcpOmANJ7nVMDD52EphaWoxb/8CSsP4HFxgp7sFG8z26VQfeDake7IoMlje3+Ae bqg2LVTKWPOmWcmbFJwEeOZ43p2dc5gOhTZGOdVGqFahaFHe6CtPipvfm2TUymDeVa9Xob 6BhknBFpJlURMeu4Fq+woIuc+tFiD8tmDJzBgTB2V8kfouO7dNmovlFEe0/ooXCIoAgTtB 9mhrzStbzEiwwr5CDt5Qpjg1D3bLEDN5z/4VmHA9StPawRnHU29HYx08J4epVnSKAYQ1lO FHd6al8MI6Uxyx4QTSo23HiQmZ2YAKrskhRNgA1fEsmx5P1KZ2NzY5xAShZdOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778102966; a=rsa-sha256; cv=none; b=pFpRigtS66bMeRV2jldL3cjlOeKI7PlWHhzaf7PJtFBJRgLCYUwuQw15nGuJw0fGWzHzlB ut0fWyosfg2sYXICl6uh1kb2wA4zObEOHBwZatGEz0L72sKwQehMxa0SNDMt4dscBQHZyW GkiRwenhy6qDwAkjirTxlgYTzkfJ6FliHmOgql51cVkFRkPNT3sWXZoElNi/XtubAYrzdL dR0qzlAgg4x7j35J7zOtBnfnMVNwPHW6rj76K/ergHeCDsFSAhn48F8qGtLfoxHAnglXt5 8J1uJLXd0SHm+T790OvVJGgOppG+JUJENh1c3u2fMvsJ4aJhQphZrv/IjM+mcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778102966; 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=lWgWmeVNMh7yid+zI8SNZlMVbxwrnSM+0vJT2NmCLA4=; b=f/lNkvuHYJMyY8NoGb2PlQpae/wd6FcKCghKd8TR4535tZ/AtAE05Op/QsqERkTEMUtWGs uXT5BkJE3ICgSi/7PwUfR7reC8OpO5ZSsI+sRb5P+ZGPjB8ZtA6CYGpL+vSuS2Ux+WHXlQ pdCmx08QjiAnuwPGwxMJ6igclQVK8vU9uV7YHYWA5amDbBj2WOyYDWHTuvxjrmzMdkhTOx ojpJnKuVBImtkgY3YmS5wBu9JSF9Nl50ztEpzZv8ptrCe9TMgfb1du1sS6TLxh9HemqDli ZfWZlVp6vAQk+bXi5HefkS2Onu41GDqm3FnL4gmt5WP0QGZcuf9gNVX1xMeAzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9pRp3NpJzx3G for ; Wed, 06 May 2026 21:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 250ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 21:29:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: c4af3f13a4e9 - main - freebsd-base.7: Document adding a local repo 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4af3f13a4e9932968d92872aaf22312a6e79e4e Auto-Submitted: auto-generated Date: Wed, 06 May 2026 21:29:26 +0000 Message-Id: <69fbb2b6.250ac.6d9e436@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=c4af3f13a4e9932968d92872aaf22312a6e79e4e commit c4af3f13a4e9932968d92872aaf22312a6e79e4e Author: Alexander Ziaee AuthorDate: 2026-05-06 21:23:52 +0000 Commit: Alexander Ziaee CommitDate: 2026-05-06 21:25:26 +0000 freebsd-base.7: Document adding a local repo MFC after: 1 day Discussed with: bcr, ivy, kevans, ngie Differential Revision: https://reviews.freebsd.org/D56608 --- share/man/man7/freebsd-base.7 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/share/man/man7/freebsd-base.7 b/share/man/man7/freebsd-base.7 index 51de679ea9d1..d1857b2dbbec 100644 --- a/share/man/man7/freebsd-base.7 +++ b/share/man/man7/freebsd-base.7 @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd April 14, 2026 +.Dd April 23, 2026 .Dt FREEBSD-BASE 7 .Os .Sh NAME @@ -217,6 +217,27 @@ for a different target than the host system): pkg -r /ppcdev -oABI=FreeBSD:16:powerpc64le \e install FreeBSD-set-devel .Ed +.Ss Adding a locally built repository for snapshots +Disable the predefined repository, +and add a local repo for locally built base system packages: +.Bd -literal -offset indent +cat << EOF > /usr/local/etc/pkg/repos/FreeBSD.conf +FreeBSD-base: { enabled: no } +FreeBSD-local: { + url: "file:///usr/obj/usr/src/repo/${ABI}/latest", + enabled: yes +} +EOF +.Ed +.Pp +The packages are created by the +.Xr build 7 +system at +.Pa ${REPODIR}/${PKG_ABI}/ , +which defaults to the example directory. +.Pp +.Sy Note : +The repo must have a different name than the predefined repository. .Ss Unregister a currently running system Systems managed through .Xr pkg 8 From nobody Wed May 6 23:08:17 2026 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 4g9rdt28npz6d0Xy for ; Wed, 06 May 2026 23:08:18 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9rdt1s8rz3Hck for ; Wed, 06 May 2026 23:08:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778108898; 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=Vog4g9/2ztcl3i1N8UCBqR1JeM3NSxNzV1Zpfb37dYM=; b=u1648tSaw/SOfzdxXtyyZX/QAm+q+taFfBx8q3LjTV0/Con47VoMaEeNJChEv/iOkkKCTc m0yDRz2btKi82in6Aw4brsgVah/Lt7F6FyNdN7lONoUBAXuvtZzeI7BAjjUfER+LWgB5YG UDh/LWGIjMRoe8GUJ4gcCAqEiTP0aGVBV9qm2PzXAWR9N9YMStxX/Obxy95+KVP4mYEadh 4z56vvDu66dEA8JpHrjsRV5cyAkYMbWmlTMXeDSNBTGt1Myod/cotXcxheZ88H/zP4+NMp IoSNIk8/5LhjUsEkHDDiVnAktsT1aiqT8+wL5xkBJF5zCWqHo3h4k4M51se7sA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778108898; a=rsa-sha256; cv=none; b=J0OndaeRJ18IPSKlWVjXVdhLYTmP7eJwi/iCVPYkx8aIteQwROdiKws/VdXbNNsen2oVNK kVTjeDDcGOAbxcNlGhy95eFEmNu7I9CyLm1IqkfPXQ4ry62RQ996xvYs2CQgMd4u1w78sV 439TlDmbw/sWxd8w0Q/lCHxi6Jv2CoGnv7Yeh2d/EhzSeEDSKJmZG4sMlolPRpJ6BNigvN m7aUTHItkRAYCgiOibFFKhdA4wZpMq1eI1UD6liYQg78rumcR7Oxoop2xfiNlGLCV+qJfM +fKZumz/AczshBmLXt7HQYPeIDvLSwW7a+PFrI5Qj/Hs0dYH/l4KFdUAHce17g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778108898; 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=Vog4g9/2ztcl3i1N8UCBqR1JeM3NSxNzV1Zpfb37dYM=; b=q1qpqSEs5JsCvWpHP5EtEsohvsql3L5M8CuGU7jziJiQQqZSATyg8lYCUz+WJyKFovjRzI k7JMp3MVATVxdNzIQKGq0V4LjvgGT4Kd5s4fIVgOTquBGEmKNMPZgeJGqILpwnzFfyLwEH gizF+XGrHvhKh74cCUHse3rSt5DklFiMU98LTpux6bdDUruZRgXxWSKLI6mpQsOI0502B7 9no9O7cOp3WwkqpXXypMGBk02dHGKUPe7cmxPLiogMluJGr8Q5hKgkf1fCfuRlK3wREvUa 9aLKtcR/Wlbbk0IdyEkSju2PS7xUFG6nWrngv/TTOolQo0SLoieR0aVLMuQT6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9rdt1K06z10Ht for ; Wed, 06 May 2026 23:08:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38422 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 23:08:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: efa8679e7f69 - main - zfs: merge openzfs/zfs@a12c6ed62 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efa8679e7f69c9cc225613827d9f75644cca5b3b Auto-Submitted: auto-generated Date: Wed, 06 May 2026 23:08:17 +0000 Message-Id: <69fbc9e1.38422.61a698ec@gitrepo.freebsd.org> The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=efa8679e7f69c9cc225613827d9f75644cca5b3b commit efa8679e7f69c9cc225613827d9f75644cca5b3b Merge: c4af3f13a4e9 a12c6ed62fcd Author: Martin Matuska AuthorDate: 2026-05-06 21:46:01 +0000 Commit: Martin Matuska CommitDate: 2026-05-06 23:07:56 +0000 zfs: merge openzfs/zfs@a12c6ed62 Notable upstream pull request merges: #18473 b8d959640 Fix rare cksum errors after rebuild #18477 e78a51dd6 Fix off-by-one in PREVIOUSLY_REDACTED handler that drops last block #18482 d5099c330 Initialize vr_last_txg for rebuild #18483 872f01019 Zstd: rework ZSTD_isError symbol renaming #18489 366b1f9a3 Fix long POSIX_FADV_DONTNEED for single block files Obtained from: OpenZFS OpenZFS commit: a12c6ed62fcd06093b95616515e4716b0b0bc038 .../.github/workflows/scripts/qemu-2-start.sh | 16 ++- .../.github/workflows/zfs-qemu-packages.yml | 2 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 10 +- sys/contrib/openzfs/cmd/zed/zed_event.c | 2 +- sys/contrib/openzfs/cmd/zfs/zfs_main.c | 3 +- sys/contrib/openzfs/config/kernel-dentry-alias.m4 | 32 ++++++ sys/contrib/openzfs/config/kernel.m4 | 2 + .../system-generators/zfs-mount-generator.c | 5 +- .../include/os/linux/kernel/linux/dcache_compat.h | 2 + sys/contrib/openzfs/include/sys/vdev_rebuild.h | 1 + sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 18 ++-- sys/contrib/openzfs/lib/libzfs/libzfs_diff.c | 4 +- sys/contrib/openzfs/lib/libzfs/libzfs_impl.h | 1 + sys/contrib/openzfs/lib/libzfs/libzfs_mnttab.c | 70 +++++++----- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 2 +- .../lib/libzutil/os/linux/zutil_device_path_os.c | 16 +-- sys/contrib/openzfs/man/man4/spl.4 | 13 +++ sys/contrib/openzfs/man/man7/vdevprops.7 | 6 ++ sys/contrib/openzfs/man/man7/zfsprops.7 | 15 +++ sys/contrib/openzfs/module/nvpair/nvpair.c | 5 +- .../openzfs/module/os/linux/zfs/zfs_ctldir.c | 19 +++- .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 5 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 16 ++- sys/contrib/openzfs/module/zfs/dmu.c | 10 +- sys/contrib/openzfs/module/zfs/dmu_objset.c | 2 +- sys/contrib/openzfs/module/zfs/dmu_send.c | 2 +- sys/contrib/openzfs/module/zfs/dsl_bookmark.c | 18 ++-- sys/contrib/openzfs/module/zfs/dsl_dir.c | 2 +- sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 12 ++- .../module/zstd/include/zstd_compat_wrapper.h | 2 + .../openzfs/module/zstd/lib/common/zstd_common.c | 8 +- sys/contrib/openzfs/tests/runfiles/common.run | 5 +- sys/contrib/openzfs/tests/runfiles/sanity.run | 2 +- .../openzfs/tests/test-runner/bin/zts-report.py.in | 1 - sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore | 1 + .../openzfs/tests/zfs-tests/cmd/Makefile.am | 4 + .../zfs-tests/cmd/libzfs_mnttab_cache_check.c | 107 +++++++++++++++++++ .../openzfs/tests/zfs-tests/cmd/threadsappend.c | 8 +- .../openzfs/tests/zfs-tests/include/commands.cfg | 1 + .../openzfs/tests/zfs-tests/tests/Makefile.am | 2 + .../tests/functional/fadvise/fadvise_dontneed.ksh | 13 ++- .../functional/libzfs/libzfs_mnttab_cache.ksh | 26 +++++ .../redacted_send/redacted_max_blkid.ksh | 118 +++++++++++++++++++++ .../tests/functional/redundancy/redundancy.kshlib | 9 +- sys/modules/zfs/zfs_config.h | 7 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 47 files changed, 522 insertions(+), 107 deletions(-) diff --cc sys/contrib/openzfs/config/kernel-dentry-alias.m4 index 000000000000,0baf1a06d3ce..0baf1a06d3ce mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-dentry-alias.m4 +++ b/sys/contrib/openzfs/config/kernel-dentry-alias.m4 diff --cc sys/contrib/openzfs/tests/zfs-tests/cmd/libzfs_mnttab_cache_check.c index 000000000000,661c5ce43f66..661c5ce43f66 mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/cmd/libzfs_mnttab_cache_check.c +++ b/sys/contrib/openzfs/tests/zfs-tests/cmd/libzfs_mnttab_cache_check.c diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/libzfs/libzfs_mnttab_cache.ksh index 000000000000,2459e364c1d7..2459e364c1d7 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/libzfs/libzfs_mnttab_cache.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/libzfs/libzfs_mnttab_cache.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/redacted_send/redacted_max_blkid.ksh index 000000000000,13820b470222..13820b470222 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redacted_send/redacted_max_blkid.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redacted_send/redacted_max_blkid.ksh diff --cc sys/modules/zfs/zfs_config.h index 77c310c268f8,000000000000..b4e4c1e4d29b mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,962 -1,0 +1,965 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* __assign_str() has one arg */ +/* #undef HAVE_1ARG_ASSIGN_STR */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +/* Define if your assembler supports .cfi_negate_ra_state. */ +/* #undef HAVE_AS_CFI_PSEUDO_OP */ + +/* backtrace() is available */ +/* #undef HAVE_BACKTRACE */ + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_file_open_by_path() exists */ +/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* bdev_nr_bytes() is available */ +/* #undef HAVE_BDEV_NR_BYTES */ + +/* bdev_open_by_path() exists */ +/* #undef HAVE_BDEV_OPEN_BY_PATH */ + +/* bdev_release() exists */ +/* #undef HAVE_BDEV_RELEASE */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* __blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */ + +/* __blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */ + +/* blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() exists */ +/* #undef HAVE_BLKDEV_PUT */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* struct queue_limits has a features field */ +/* #undef HAVE_BLKDEV_QUEUE_LIMITS_FEATURES */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_disk() exists and takes 2 args */ +/* #undef HAVE_BLK_ALLOC_DISK_2ARG */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue hardware context is cached in struct request */ +/* #undef HAVE_BLK_MQ_RQ_HCTX */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* backing_dev_info is available through queue gendisk */ +/* #undef HAVE_BLK_QUEUE_DISK_BDI */ + +/* blk_queue_rot() is available */ +/* #undef HAVE_BLK_QUEUE_ROT */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if getgeo() in block_device_operations takes struct gendisk * as its + first arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_GETGEO_GENDISK */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + ++/* dentry aliases are in d_u member */ ++/* #undef HAVE_DENTRY_D_U_ALIASES */ ++ +/* 3-arg dequeue_signal() takes a type argument */ +/* #undef HAVE_DEQUEUE_SIGNAL_3ARG_TYPE */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* dops->d_revalidate() takes 4 args */ +/* #undef HAVE_D_REVALIDATE_4ARGS */ + +/* Define if d_set_d_op() is available */ +/* #undef HAVE_D_SET_D_OP */ + +/* Define to 1 if you have the 'execvpe' function. */ +#define HAVE_EXECVPE 1 + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* linux/filelock.h exists */ +/* #undef HAVE_FILELOCK_HEADER */ + +/* file->f_version exists */ +/* #undef HAVE_FILE_F_VERSION */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* fs_context exists */ +/* #undef HAVE_FS_CONTEXT */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* GENHD_FL_EXT_DEVT flag is available */ +/* #undef HAVE_GENHD_FL_EXT_DEVT */ + +/* GENHD_FL_NO_PART flag is available */ +/* #undef HAVE_GENHD_FL_NO_PART */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the 'gettid' function. */ +/* #undef HAVE_GETTID */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* mnt_idmap does not have user_namespace */ +/* #undef HAVE_IDMAP_NO_USERNS */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_generic_drop() exists */ +/* #undef HAVE_INODE_GENERIC_DROP */ + +/* inode_get_atime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_ATIME */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* inode_get_mtime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_MTIME */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_atime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_ATIME_TO_TS */ + +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_mtime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_MTIME_TO_TS */ + +/* inode_state_read_once() exists */ +/* #undef HAVE_INODE_STATE_READ_ONCE */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() returns struct dentry* */ +/* #undef HAVE_IOPS_MKDIR_DENTRY */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_get_pages2() is available */ +/* #undef HAVE_IOV_ITER_GET_PAGES2 */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* Define to 1 if you have the 'issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* iter_is_ubuf() is available */ +/* #undef HAVE_ITER_IS_UBUF */ + +/* kasan_enabled() is GPL-only */ +/* #undef HAVE_KASAN_ENABLED_GPL_ONLY */ + +/* Define if kernel toolchain supports AES */ +/* #undef HAVE_KERNEL_AES */ + +/* Define if kernel toolchain supports AVX */ +/* #undef HAVE_KERNEL_AVX */ + +/* Define if kernel toolchain supports AVX2 */ +/* #undef HAVE_KERNEL_AVX2 */ + +/* Define if kernel toolchain supports AVX512BW */ +/* #undef HAVE_KERNEL_AVX512BW */ + +/* Define if kernel toolchain supports AVX512F */ +/* #undef HAVE_KERNEL_AVX512F */ + +/* Define if kernel toolchain supports AVX512VL */ +/* #undef HAVE_KERNEL_AVX512VL */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel defines intptr_t */ +/* #undef HAVE_KERNEL_INTPTR_T */ + +/* Define if kernel toolchain supports MOVBE */ +/* #undef HAVE_KERNEL_MOVBE */ + +/* kernel has kernel_neon_* functions */ +/* #undef HAVE_KERNEL_NEON */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* Define if kernel toolchain supports PCLMULQDQ */ +/* #undef HAVE_KERNEL_PCLMULQDQ */ + +/* Define if kernel toolchain supports SHA512EXT */ +/* #undef HAVE_KERNEL_SHA512EXT */ + +/* Define if kernel toolchain supports SSE2 */ +/* #undef HAVE_KERNEL_SSE2 */ + +/* Define if kernel toolchain supports SSE4_1 */ +/* #undef HAVE_KERNEL_SSE4_1 */ + +/* Define if kernel toolchain supports SSSE3 */ +/* #undef HAVE_KERNEL_SSSE3 */ + +/* strlcpy() exists */ +/* #undef HAVE_KERNEL_STRLCPY */ + +/* Define if kernel toolchain supports VAES */ +/* #undef HAVE_KERNEL_VAES */ + +/* Define if kernel toolchain supports VPCLMULQDQ */ +/* #undef HAVE_KERNEL_VPCLMULQDQ */ + +/* Define if kernel toolchain supports XSAVE */ +/* #undef HAVE_KERNEL_XSAVE */ + +/* Define if kernel toolchain supports XSAVEOPT */ +/* #undef HAVE_KERNEL_XSAVEOPT */ + +/* Define if kernel toolchain supports XSAVES */ +/* #undef HAVE_KERNEL_XSAVES */ + +/* kernel has kmap_local_page */ +/* #undef HAVE_KMAP_LOCAL_PAGE */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [unwind] */ +/* #undef HAVE_LIBUNWIND */ + +/* libunwind has unw_get_elf_filename */ +/* #undef HAVE_LIBUNWIND_ELF */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* building against unsupported kernel version */ +/* #undef HAVE_LINUX_EXPERIMENTAL */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Define to 1 if you have the 'mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* 'flags' in 'struct page' is a struct */ +/* #undef HAVE_MM_PAGE_FLAGS_STRUCT */ + +/* PG_error flag is available */ +/* #undef HAVE_MM_PAGE_FLAG_ERROR */ + +/* page_mapping() is available */ +/* #undef HAVE_MM_PAGE_MAPPING */ + +/* page_size() is available */ +/* #undef HAVE_MM_PAGE_SIZE */ + +/* mount_setattr() and struct mount_attr are available */ +/* #undef HAVE_MOUNT_SETATTR */ + +/* Define if ns_type is accessible through ns_common */ +/* #undef HAVE_NS_COMMON_TYPE */ + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* readahead_page() exists */ +/* #undef HAVE_PAGEMAP_READAHEAD_PAGE */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* pin_user_pages_unlocked() is available */ +/* #undef HAVE_PIN_USER_PAGES_UNLOCKED */ + +/* posix_acl_to_xattr() allocates its result */ +/* #undef HAVE_POSIX_ACL_TO_XATTR_ALLOC */ + +/* proc_handler ctl_table arg is const */ +/* #undef HAVE_PROC_HANDLER_CTL_TABLE_CONST */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* If available, contains the Python version number currently in use. */ +/* #undef HAVE_PYTHON */ + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* register_sysctl_sz exists */ +/* #undef HAVE_REGISTER_SYSCTL_SZ */ + +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* Define if set_default_d_op() is available */ +/* #undef HAVE_SET_DEFAULT_D_OP */ + +/* shrinker_register exists */ +/* #undef HAVE_SHRINKER_REGISTER */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* sops->free_inode() exists */ +/* #undef HAVE_SOPS_FREE_INODE */ + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* STACK_FRAME_NON_STANDARD asm macro is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD_ASM */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* statx() is available */ +/* #undef HAVE_STATX */ + +/* STATX_MNT_ID is available */ +/* #undef HAVE_STATX_MNT_ID */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the 'strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the 'strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* have super_block s_shrink */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK */ + +/* have super_block s_shrink pointer */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK_PTR */ + +/* have super_block s_wb_err */ +/* #undef HAVE_SUPER_BLOCK_S_WB_ERR */ + +/* sync_blockdev() is declared in include/blkdev.h */ +/* #undef HAVE_SYNC_BLOCKDEV */ + +/* struct kobj_type has default_groups */ +/* #undef HAVE_SYSFS_DEFAULT_GROUPS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* timer_delete_sync is available */ +/* #undef HAVE_TIMER_DELETE_SYNC */ + +/* i_op->tmpfile() uses old dentry signature */ +/* #undef HAVE_TMPFILE_DENTRY */ + +/* i_op->tmpfile() has mnt_idmap */ +/* #undef HAVE_TMPFILE_IDMAP */ + +/* i_op->tmpfile() has userns */ +/* #undef HAVE_TMPFILE_USERNS */ + +/* Define if host toolchain supports AES */ +#define HAVE_TOOLCHAIN_AES 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_TOOLCHAIN_AVX 1 + +/* Define if host toolchain supports AVX2 */ +#define HAVE_TOOLCHAIN_AVX2 1 +#endif + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_TOOLCHAIN_AVX512BW 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_TOOLCHAIN_AVX512F 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_TOOLCHAIN_AVX512VL 1 +#endif + +/* Define if host toolchain supports MOVBE */ +#define HAVE_TOOLCHAIN_MOVBE 1 + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_TOOLCHAIN_PCLMULQDQ 1 + +/* Define if host toolchain supports SHA512EXT */ +#define HAVE_TOOLCHAIN_SHA512EXT 1 + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE2 */ +#define HAVE_TOOLCHAIN_SSE2 1 + +/* Define if host toolchain supports SSE4_1 */ +#define HAVE_TOOLCHAIN_SSE4_1 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_TOOLCHAIN_SSSE3 1 +#endif + +#ifdef __amd64__ +/* Define if host toolchain supports VAES */ +#define HAVE_TOOLCHAIN_VAES 1 + +/* Define if host toolchain supports VPCLMULQDQ */ +#define HAVE_TOOLCHAIN_VPCLMULQDQ 1 +#endif + +/* Define if host toolchain supports XSAVE */ +#define HAVE_TOOLCHAIN_XSAVE 1 + +/* Define if host toolchain supports XSAVEOPT */ +#define HAVE_TOOLCHAIN_XSAVEOPT 1 + +/* Define if host toolchain supports XSAVES */ +#define HAVE_TOOLCHAIN_XSAVES 1 + +/* totalhigh_pages() exists */ +/* #undef HAVE_TOTALHIGH_PAGES */ + +/* kernel has totalram_pages() */ +/* #undef HAVE_TOTALRAM_PAGES_FUNC */ + +/* Define to 1 if you have the 'udev_device_get_is_initialized' function. */ +/* #undef HAVE_UDEV_DEVICE_GET_IS_INITIALIZED */ + +/* kernel has __kernel_fpu_* functions */ +/* #undef HAVE_UNDERSCORE_KERNEL_FPU */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* iops->getattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_GETATTR */ + +/* iops->setattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_SETATTR */ + +/* fops->clone_file_range() is available */ +/* #undef HAVE_VFS_CLONE_FILE_RANGE */ + +/* fops->dedupe_file_range() is available */ +/* #undef HAVE_VFS_DEDUPE_FILE_RANGE */ + +/* filemap_dirty_folio exists */ +/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */ + +/* generic_copy_file_range() is available */ +/* #undef HAVE_VFS_GENERIC_COPY_FILE_RANGE */ + +/* migratepage exists */ +/* #undef HAVE_VFS_MIGRATEPAGE */ + +/* migrate_folio exists */ +/* #undef HAVE_VFS_MIGRATE_FOLIO */ + +/* address_space_operations->readpages exists */ +/* #undef HAVE_VFS_READPAGES */ + +/* read_folio exists */ +/* #undef HAVE_VFS_READ_FOLIO */ + +/* fops->remap_file_range() is available */ +/* #undef HAVE_VFS_REMAP_FILE_RANGE */ + +/* __set_page_dirty_nobuffers exists */ +/* #undef HAVE_VFS_SET_PAGE_DIRTY_NOBUFFERS */ + +/* splice_copy_file_range() is available */ +/* #undef HAVE_VFS_SPLICE_COPY_FILE_RANGE */ + +/* address_space_operations->writepage exists */ +/* #undef HAVE_VFS_WRITEPAGE */ + +/* __vmalloc page flags exists */ +/* #undef HAVE_VMALLOC_PAGE_KERNEL */ + +/* int (*writepage_t)() takes struct folio* */ +/* #undef HAVE_WRITEPAGE_T_FOLIO */ + +/* write_cache_pages() is available */ +/* #undef HAVE_WRITE_CACHE_PAGES */ + +/* xattr_handler->get() wants dentry and inode and flags */ +/* #undef HAVE_XATTR_GET_DENTRY_INODE_FLAGS */ + +/* xattr_handler->set() wants both dentry and inode */ +/* #undef HAVE_XATTR_SET_DENTRY_INODE */ + +/* xattr_handler->set() takes mnt_idmap */ +/* #undef HAVE_XATTR_SET_IDMAP */ + +/* xattr_handler->set() takes user_namespace */ +/* #undef HAVE_XATTR_SET_USERNS */ + +/* ZERO_PAGE() is GPL-only */ +/* #undef HAVE_ZERO_PAGE_GPL_ONLY */ + +/* Define if you have [z] */ +#define HAVE_ZLIB 1 + +/* libunwind is llvm libunwind */ +/* #undef IS_LIBUNWIND_LLVM */ + +/* kernel exports FPU functions */ +/* #undef KERNEL_EXPORTS_X86_FPU */ + +/* TBD: fetch(3) support */ +#if 0 +/* whether the chosen libfetch is to be loaded at run-time */ +#define LIBFETCH_DYNAMIC 1 + +/* libfetch is fetch(3) */ +#define LIBFETCH_IS_FETCH 1 + +/* libfetch is libcurl */ +#define LIBFETCH_IS_LIBCURL 0 + +/* soname of chosen libfetch */ +#define LIBFETCH_SONAME "libfetch.so.6" +#endif + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* make_request_fn() return type */ +/* #undef MAKE_REQUEST_FN_RET */ + +/* The size of 'off_t', as computed by sizeof. */ +/* #undef SIZEOF_OFF_T */ + +/* using complete_and_exit() instead */ +/* #undef SPL_KTHREAD_COMPLETE_AND_EXIT */ *** 87 LINES SKIPPED *** From nobody Wed May 6 23:14:10 2026 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 4g9rml6mXxz6d0nZ for ; Wed, 06 May 2026 23:14:15 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9rml6BYXz3JcB for ; Wed, 06 May 2026 23:14:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778109255; 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=p5JhwtjvcRTqR/qvWPZ5qDdblL46q+H+pdwhgODa/8U=; b=IxJRWgj6I4qFpvgSi0ig3OY1R61WBgMbWiMN1My+OUYMmW8nPTj/c2+lwmeBmSNpf+Pqsm VYJHcTDtjjHttelYdUWKZR334Nxfdck8ERL9JvpcPzltdNC2FGyEftNhV3HJMSWO5RwJIe qKufrFch1p0Qnb9N1EZyD2AuEsg1/r7pdH/x3SNbEWDRN4FLXQzABNzETG8jhgGaG3/VM7 D1WciCprCfKNd7QPCrN8oBVpFcmQckmtNqha7DEu3vJ2b5Kq3pZtVNqaewk3HcJZuu9rS9 NMXwt5xVF3a2JRmQyM20vRP40zwhZgBWTemBGO2QWdAmG0YPO2Vgw15d1yxsig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778109255; a=rsa-sha256; cv=none; b=YYEBGdVspNZ9JTCWEb+Rh7iyDUU5rl7ympxNksChQTqJut6XgHEmxeiNnIpHYLGMqSJ4+B j8Jnk4cluKZYv6N1dt3ylS6wU3K48VQgPOucqYlR9vL3VlviwnCLs/Y2tVd70v0a4f7roE Wgq1Gu0zz37lj1BapiF8Vgicky5R9S7376Fy9h1W4VA9BINS+4TlPVLsnVQ6BXgHqghuaK H5sIRqsA+oWAmAblVS6/6QDDf9UVpGn3UlaxTUfxGvT0dt1WfYdwdG43As2e7MlOSDy5Gf 0yk7qneFJNDWiiPj2BUzKnI6Orx/vDvaXPBGE5VCmXxLJ5rmx01IR5pY1TQyHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778109255; 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=p5JhwtjvcRTqR/qvWPZ5qDdblL46q+H+pdwhgODa/8U=; b=W32zhXkaU5YedIS1AZ8P7uJn7DgCPjsu+SQMAZAiuM1LzgGTDC4XFJYT5KKB4e6LtgYScr ZFkH6owe3FigZDSKtIzjG2BH9ByV/4+Dju4da2Qd8MGz1kSUO9NJ/p+EtpJyePXs/Dqnp2 ks1LE8emp4nQ4gZvAm2o8KFwnbSosZjUFbUBdMTjDZE7lJJ7pD27Q/mlcXqw+YukPnsEd3 W8duRvYprwYAMdB3YTihWr5B2cuyauDccxPdzIoBJEJ0yhzYUHWJmosnuYpqLW8qcrnjRt 3xF0G1E8D0Q22kqcoSX7H0ph5yoeAXVFooN/va3Pi0AuX0SoREA6IOsmD2XejA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9rml5Ykmz111K for ; Wed, 06 May 2026 23:14:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39ead by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 23:14:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 3348fa7a45fd - main - Revert "Skip sys.netinet6.frag6.frag6_19.frag6_19 in CI" 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3348fa7a45fdf14a7af509e306229bd211444f1e Auto-Submitted: auto-generated Date: Wed, 06 May 2026 23:14:10 +0000 Message-Id: <69fbcb42.39ead.23473c94@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=3348fa7a45fdf14a7af509e306229bd211444f1e commit 3348fa7a45fdf14a7af509e306229bd211444f1e Author: Enji Cooper AuthorDate: 2026-05-06 23:08:26 +0000 Commit: Enji Cooper CommitDate: 2026-05-06 23:08:26 +0000 Revert "Skip sys.netinet6.frag6.frag6_19.frag6_19 in CI" Per [siva@'s comment on the PR][1], this testcase now passes cleanly in CI. PR: 274941 MFC after: 1 week [1]: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=274941#c6 This reverts commit 86e87c3bd1b377242aafe7e2222ae17ca0be96d9. --- tests/sys/netinet6/frag6/frag6_19.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/sys/netinet6/frag6/frag6_19.sh b/tests/sys/netinet6/frag6/frag6_19.sh index 187876c4c2bc..34095ed74f7a 100755 --- a/tests/sys/netinet6/frag6/frag6_19.sh +++ b/tests/sys/netinet6/frag6/frag6_19.sh @@ -207,9 +207,6 @@ frag6_19_head() { } frag6_19_body() { - if [ "$(atf_config_get ci false)" = "true" ]; then - atf_skip "https://bugs.freebsd.org/274941" - fi frag6_body 19 frag6_19_check_stats } From nobody Wed May 6 23:29:17 2026 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 4g9s656lVnz6d1sh for ; Wed, 06 May 2026 23:29:17 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9s654yzlz3KZj for ; Wed, 06 May 2026 23:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778110157; 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=/ykTCWnnvC1cQS0WCSLVWqey3lN4C4/BgJyF4JSfvUM=; b=HT+bK8CqxAEh+F6QwBwTfq089+jAUYrqwHLF1ZrSHFo0RydOz3ifP2relXIZsX9wksvgTM fucX+O9NRKzbo12CsWptmxdo8rYRZHIudNNmRELzuNscc+4ot0r054RjRWFsFmjzQWb7rc U0GLVsLTa8heuvkGpSnqDT7hhRWiR11ZHBXYFGAUSZbpaeSHgwzVq5rQyouHNchV3qlBMu jE6ECcsMi2iV/1MW4znSJWEpsMkGhGfs6PgBRSFGsAqhTO445P88zrn8XT1yvwrLK3Qixo 7aAvu2w4dvt/QP52JK47i38xTdI/S7vDbqaHC6u78+b49QjRMIJFIxfLHB/5iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778110157; a=rsa-sha256; cv=none; b=H8VnTLsyUcaxwKXsA00l2cX32dXCEkJsSAGF+w071A4oviE2b+0jOch5lkaMXXSjZ98Ura uZ3e+qbmxLzIE9n3sJkWn0J/umZ5xOwFM5hsxmC8qLUr0U4syeBMF+4G8VmcAb/PLREsfM /uxzHvsnC88t2ycszwLO+zkJSYCvtcTnUVIC/lZMnIMJlP5DkPLLOc61CJC80MM7LS50bP HAzhSu2Axe9T4dcFjXy0YswVneiBWuKniBN1plxaD9S6VVOV17vAlV5utENKEX32/0eYbn 1la4hLWa+vAlFplSV7Uu72GJasQVjTlTOmhm382wI72Gtw13rjOj9zy1OqECRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778110157; 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=/ykTCWnnvC1cQS0WCSLVWqey3lN4C4/BgJyF4JSfvUM=; b=knUfFbOp39eaH+jJyrsij68OXwOZSdBEDmUftu0hIP7DqET1Oqcs77lraFuUrwalpgifba TKoRE1MmUF6CcOOVN99NQL0Yd/0ItyWojuZmGOhB8OAU5JOt8FUcHBtTxKtaZeXXHwkN6M mJCXbYJIRYDVurLVggpw/M5Kh3TU5ORVZMB3iepqSbQgfExzxsw/OAtsV2AVqLlyBUYjOp tR/imFVQu60G9cYWiNiO353smUQYT180ECQnxemI2aPqP7T5P+Sw+2BrhuqD3UzNWJE8YX Fxef1YRgItR8gluEV6TViXca3+x3Cntpz3hHDJ1oqpA0o0JYxgdCW9cpW+FBsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9s653lXvz11Cq for ; Wed, 06 May 2026 23:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3acf5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 23:29:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Jan Bramkamp From: Kyle Evans Subject: git: 58811b0ae096 - main - jail: open the fstab files with fopen("re") 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58811b0ae096c134af372bcf475aea1d8d0e3c08 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 23:29:17 +0000 Message-Id: <69fbcecd.3acf5.85ed4df@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=58811b0ae096c134af372bcf475aea1d8d0e3c08 commit 58811b0ae096c134af372bcf475aea1d8d0e3c08 Author: Jan Bramkamp AuthorDate: 2026-05-06 23:28:53 +0000 Commit: Kyle Evans CommitDate: 2026-05-06 23:28:53 +0000 jail: open the fstab files with fopen("re") This protects against accidentally leaking them past fork()+exec() in future refactorings. PR: 295052 Reviewed by: kevans --- usr.sbin/jail/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c index f1e2da215790..188f48732561 100644 --- a/usr.sbin/jail/config.c +++ b/usr.sbin/jail/config.c @@ -726,7 +726,7 @@ check_intparams(struct cfjail *j) TAILQ_FOREACH(s, &j->intparams[IP_MOUNT_FSTAB]->val, tq) { if (s->len == 0) continue; - f = fopen(s->s, "r"); + f = fopen(s->s, "re"); if (f == NULL) { jail_warnx(j, "mount.fstab: %s: %s", s->s, strerror(errno)); From nobody Wed May 6 23:29:16 2026 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 4g9s694Rbwz6d1p1 for ; Wed, 06 May 2026 23:29:21 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9s693WQNz3Kwb for ; Wed, 06 May 2026 23:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778110161; 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=5GnVnTd6CkL798zv+7s78DaDXKHml3qOnoxivu9Y7zg=; b=EYBd1fgvXhn71d9lWCc2BEvgjiDh413aOxehdKSwco2zHE7Z2Ps+15cuil7AFq36dsFCBq sxZjc8sZAo9RUNfd3ZxNUdq9J+L4yQ003hk01j++wibtntAdl1DmCq8e1IY2Y9gLyMPmwB ZITOFfK8pj3KKe6v7ViDoqFysw4Iuni6rgpS8jrWt0ppqgHTTlzG5oStYWy6eszX9VreDA mk4/hgC2dY+tbRTrolGvNE2BUgAfDlHC1jL3BsHgblIXEc3iMcDkq019f8daliIsckgjrr ENEXTw4ufC0HgUZ0JeOth+wUMoWvqeMtq1GEXxcAPnE/vzDF5HCiyohZ7H8LMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778110161; a=rsa-sha256; cv=none; b=IqNSLiWU5MANEmeSVQTvigOxwnhDGuW6GOle0ZytMYyLQ9Q3/oZUf90ZMwK9mLL2lYYdeZ Si+/W0qMYHG1olpiG+/JDjg9PHEV2P5xr0S3w93OZurSIq7aFkrgE/oQceA1I0GGHo1LLw 7WoE3B19dgPfjdTQNV2M/fyYQs3hr38/9Y+yMQBz200CQfol2653iXtIc6sXzSaFLcw/AK d5ndK9xq3zCtZmQk8sVbyQTWCiRxeJrgaGMmd/jLMoKjeH2NXVVjAYcunvsQYlxik9nEka DxqQFC8t7F3HwJN6hs0SArTnAMY9haUeW13h2D7QiZx+R721JPHiHEiJ8k/5JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778110161; 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=5GnVnTd6CkL798zv+7s78DaDXKHml3qOnoxivu9Y7zg=; b=kXu/YcwHxarj9kn57ofElLdhKQWYYSlQmv8jmdoLXusaDiiW7qZRsrZqYGbjy77WVV0hL+ EFr5nC8KHOUE/sa4VutBYh7A3ZNJjAifzXz4F3tNixetwc7H98W8Y+mqE4duCvJwxKfugM 7APvI/u4VtIoUn9e+ZmhpsWCBgfZgFcinaUVq3DGcZ6Rz2P8DhwZxuYuR8q3QKI6CiyX0I YHG9VdnmeRVn6NuGpTP4B5gQccLlO3CBpE2OLGDO8UFjXbA/vVQoPvNpxBCu/DfUaL2Jli +JoGVFxoXAp9iMwxRtlZeq3Mi/26eQ2ETfy2dHE5idem5NeiBE5/x2GnlhbBkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9s6931ltz114N for ; Wed, 06 May 2026 23:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38660 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 23:29:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Jan Bramkamp From: Kyle Evans Subject: git: 276d9b88a9e6 - main - jail: avoid leaking jail config fds to exec.* hooks 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 276d9b88a9e6fd6fd90e57c36444756ad297d2ab Auto-Submitted: auto-generated Date: Wed, 06 May 2026 23:29:16 +0000 Message-Id: <69fbcecc.38660.478a2629@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=276d9b88a9e6fd6fd90e57c36444756ad297d2ab commit 276d9b88a9e6fd6fd90e57c36444756ad297d2ab Author: Jan Bramkamp AuthorDate: 2026-05-06 23:28:53 +0000 Commit: Kyle Evans CommitDate: 2026-05-06 23:28:53 +0000 jail: avoid leaking jail config fds to exec.* hooks The jail(8) command must not leave parsed configuration files open since the file descriptors will be leaked to child processes including the untrusted exec.start or exec.stop hooks. While fopen() doesn't provide direct access to O_CLOEXEC, it does provide access to FD_CLOEXEC via "e" in the mode string which provides the desired defense in depth against leaking file descriptors into exec.* hooks since those always execve() into a shell. Jail configuration is potentially sensitive and some hooks execute from within the jail context, leaving some opening for the jail to exfiltrate information about the host environment. (Commit message wordsmithed by kevans) PR: 295052 Reviewed by: kevans MFC after: 3 days --- usr.sbin/jail/config.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c index 1bad04ccde68..f1e2da215790 100644 --- a/usr.sbin/jail/config.c +++ b/usr.sbin/jail/config.c @@ -321,6 +321,7 @@ static void parse_config(const char *cfname, int is_stdin) { struct cflex cflex = {.cfname = cfname, .error = 0}; + FILE *yfp = NULL; void *scanner; yylex_init_extra(&cflex, &scanner); @@ -328,7 +329,7 @@ parse_config(const char *cfname, int is_stdin) cflex.cfname = "STDIN"; yyset_in(stdin, scanner); } else { - FILE *yfp = fopen(cfname, "r"); + yfp = fopen(cfname, "re"); if (!yfp) err(1, "%s", cfname); yyset_in(yfp, scanner); @@ -336,6 +337,8 @@ parse_config(const char *cfname, int is_stdin) if (yyparse(scanner) || cflex.error) exit(1); yylex_destroy(scanner); + if (yfp != NULL) + fclose(yfp); } /* From nobody Thu May 7 01:29:41 2026 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 4g9vn712Ckz6d9yS for ; Thu, 07 May 2026 01:29:47 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9vn70JDMz3WHL for ; Thu, 07 May 2026 01:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778117387; 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=R+8DS4cEzSxNgOalqJguI3OuRFSjKYmwCKWFUClacRc=; b=CB6St/VzBdnCLXSuX0J+9Wgo96vf9PQVZad7WTXxkRhO7PapTKJjO4QjfAiSyB62G3VO7/ SmBkn2vDelgvoAq7SQ8/66iJQV5Xfqfyfocow2A5Z/Cav4ShMAKiVxRF4DqVbi/i5V/VQH UxIRJt62JFA1meee607EDhxd75Am3B9z8FNbd3ImqESLuCQt6ZuSyjyk3D0RYDAxe7/OGJ pNhqb1v7DHEOLPTw3LAI2pEBllTezsWAxj8d+4h3ur5MmfzPTkYo6MRPX0evbzzoiX/URR Rd8/67RmjVCiwD9CpJfvgHeLPQjXPyIhEiuNr4HIsgrGUrOqU/9ybfXr0rR7Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778117387; a=rsa-sha256; cv=none; b=Je1kOXlfYxNzRfuIpi9tEWVR6jJ91GpgPvFusTA/2WpRgco5BhtnVIDiDCRTx0o8Slcj1F oJxZdAUSZ4lQMS+anG2O9LtcD8kKZlYlQRkGVFvSTDPXQis0PZDV4nNL/bR7vB3b5pSQK/ Pyl5+PFgHvoupHYQWEUnbHoMbgZIq4boryMtcht2ZeQQXGtf1QvX1waBI2+ZaIO0cRvTVL /yiZZInG8oIQb0256Th0OcclgHjqt5cGrM5VymD5HbxVSP6sGOHK/czmgHTXCevIhT9zxl qUtmpFyhTnwefZ76k92QeTaIbLKEM0l8nDdSDJoeZgruMFwVgwRNfL/w8VgVzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778117387; 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=R+8DS4cEzSxNgOalqJguI3OuRFSjKYmwCKWFUClacRc=; b=dbOs17WKpCabmVEQqhXHNdE96BLBSA8ve0oE9A95I7NM2jm9E0U4/aJ62FW/njztAFNSG5 pv5Jpg+SXdg9YQsZ4MquLgfi6RwWGPYXbIu19nXzgRA/oSSNJzYKa0t7esPNayDEhbfsz0 n+eAA29H2dTImyrNlz77OB+ZIkA+PO+tiMTypsm0mJwDY/nCS6z8K96AmGkpNUy3GfhC5W FmizeC1TIvPDf6T345AiVNvejlwoS4dy2XcOD+m6bpSchAiGvhgZYVUMrieWaoeqOdBA+f ycoWeYmaKOJg0omy7KzFVOyLRIfbj5IpoLmeL30YYj4TGbqEMwiT1Fproz3rbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9vn6715Zz13bd for ; Thu, 07 May 2026 01:29:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46e3b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 01:29:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Marek Zarychta From: Kyle Evans Subject: git: b2e4da0b53ad - main - devd: Use PF_LOCAL instead of PF_INET 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2e4da0b53ad082768b8f6f83766e030fd00d02a Auto-Submitted: auto-generated Date: Thu, 07 May 2026 01:29:41 +0000 Message-Id: <69fbeb05.46e3b.1a7a83f@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b2e4da0b53ad082768b8f6f83766e030fd00d02a commit b2e4da0b53ad082768b8f6f83766e030fd00d02a Author: Marek Zarychta AuthorDate: 2026-05-07 01:28:08 +0000 Commit: Kyle Evans CommitDate: 2026-05-07 01:28:08 +0000 devd: Use PF_LOCAL instead of PF_INET Avoid dependency on INET (IPv4) by using PF_LOCAL, allowing media check to work on systems without INET support. PR: 295045 Reviewed by: kevans MFC after: 1 week --- sbin/devd/devd.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc index ee38fbb2ccee..cff50d2f8d80 100644 --- a/sbin/devd/devd.cc +++ b/sbin/devd/devd.cc @@ -369,7 +369,7 @@ media::do_match(config &c) retval = false; - s = socket(PF_INET, SOCK_DGRAM, 0); + s = socket(PF_LOCAL, SOCK_DGRAM, 0); if (s >= 0) { memset(&ifmr, 0, sizeof(ifmr)); strlcpy(ifmr.ifm_name, value.c_str(), sizeof(ifmr.ifm_name)); From nobody Thu May 7 01:51:39 2026 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 4g9wGT2lmGz6dCv2 for ; Thu, 07 May 2026 01:51: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9wGS72R0z3YjZ for ; Thu, 07 May 2026 01:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778118705; 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=kos/oe5PIjhrDMwIFpueBetXcH4EguOgav1C4poc9Dw=; b=YevGsqG2nHWATGwS8P+S8H8CeBkod3Gvb85PY7R15GTAB69O2TB/VE7S+xMvl5TwJKiRxB O/+KagGTIhCUrnDzSg5OuBMP3Pw6oyLE/VA+xngDYz15Zfdu1DQWE7foPKFT7yL/OSW1Ja +WEhfibjLAXsWe4+8yzMAqmYgFUELQii8u7FTkIqVekX5t9WRoHGAgL6X8RYFkJd8QF63W sGjdJz+oNjs+FmBSwPKHSu57zxKXBI4dq9YAwX5FKIM8JHU5Th5ww6haUvTweYEI6A4ipB VAyDGcEl16jQGTav9oQ8HLfVyqx9iHWgq+RpCqfukfLRaGFCdrjJLssQ518vNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778118705; a=rsa-sha256; cv=none; b=AzY2XSQ/t+3T1Pv6TO366TwhZ5G9hZnypW6Fke59RlOpjdj3bBO6grd2Y7cgk1RT9y4HLp Y0VBoZZDNbpW6+CE5aAH/beDJPYG9UfFf/zZ5/gwGl0gpSbVQmUi0sQtgWv9Irlv7kMVjW mTWE8OimJWCzYQcbxTDAfOEnvWsQ8nPCM/obK/GBSCyREntkWlKIi7LOW2m+pnYPWRXnC5 +YLnKQXBE1BT9HKUqSgqhtkqkdXnAe5e+z3LAiYuXahjTpHZK7RrMCBH9AaMEzfg63L7pK yQ5obQfcYeyvgkNr/69ERsft8xBZPPjdP9PnSTDng5VGLRYSDnpZ7h4DrJcCdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778118705; 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=kos/oe5PIjhrDMwIFpueBetXcH4EguOgav1C4poc9Dw=; b=mDUaL/kr1j7+UTsJRDPdHqU8FUAHYkrCZahg4osuduHEiq83re/22MjqOVwm3sWlOpJ0Dk gdXkihwBKjbbml1y9/CsOw/FrN+32dBlR2Zs4n6MPo5oklkYN3sy6x746Kv1qHhwZ5yHoD l483l5y78G3UydkJhilkp4pZE3RDtrg8W8mWGMwSGkqV7pg79YRBfPEifSpippke12rfia deg/6RQA/py2E2HVYxChV+8qsM8rnjnAaP2soR7NTc8G3QJ2xNoco9EmlO0UgUcQFt/D5d 17VQyjMhOYhfAVJFGExEen+ogsbMxJtTt2zajT16zHFxNXRFgaatIFrafu0aKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9wGS6bfMz14vf for ; Thu, 07 May 2026 01:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18f9d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 01:51:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 09d81767e32c - main - freebsd-base.7: style 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09d81767e32cb437da0ac7d1c3b51eed01591b82 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 01:51:39 +0000 Message-Id: <69fbf02b.18f9d.4fb1d607@gitrepo.freebsd.org> The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=09d81767e32cb437da0ac7d1c3b51eed01591b82 commit 09d81767e32cb437da0ac7d1c3b51eed01591b82 Author: Maxim Konovalov AuthorDate: 2026-05-07 01:50:45 +0000 Commit: Maxim Konovalov CommitDate: 2026-05-07 01:50:45 +0000 freebsd-base.7: style --- share/man/man7/freebsd-base.7 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/man/man7/freebsd-base.7 b/share/man/man7/freebsd-base.7 index d1857b2dbbec..b23d1ae44d34 100644 --- a/share/man/man7/freebsd-base.7 +++ b/share/man/man7/freebsd-base.7 @@ -50,7 +50,7 @@ and .Dq CURRENT .\" re@ will provide their own repository before release, at which .\" point this text will need updating. -branches are hosted on the Internet at +branches are hosted on the Internet at .Lk https://pkg.freebsd.org . These packages are updated when new errata or security updates are released (for supported release versions), or twice daily for @@ -92,7 +92,8 @@ option was enabled when building the system, which is not the default. .El .Pp The exact set of available subpackages differs for each individual -package. For example, some packages may not provide any development +package. +For example, some packages may not provide any development files, in which case the .Sy -dev subpackage is not present. From nobody Thu May 7 03:49:25 2026 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 4g9ytF3348z6dN4h for ; Thu, 07 May 2026 03:49:25 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9ytF2KKTz3mHs for ; Thu, 07 May 2026 03:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778125765; 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=6juM/HYZgK9+5ROShR0VfGcJaMc769jlzqS+CnKABOE=; b=qAexpquYJiJt4w7uJ+SiTsF3kz4SQW/JNdQ4NFyHyzRxJPBBuK0xlsG2lNcRohD5P5KNO3 Ihno4XQHdsUKBWuE/mAIqXWaLKepKxl73iH8BAF6wVeRE0UjLuOUOgedYJ/KfJWNeSs4et E2uPcs8GYlZqxPMxyVo8dNRy7qawwi8VijR0n1b0dTLtkFk/6v7ZZjWluwP5kld9BO2roH CsSSEOCAD+ZjFVhMuQGC+CJz8PJbNEkoTxhiyHQzAykOdqbuYbV+JBTdXXfO3Shv9C5YG3 JPGcNCO7Ws0rdxpi9hWE17/NYhUPnSDLZKPCCPG0GRAIDOTBVnqeySrpFfuRPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778125765; a=rsa-sha256; cv=none; b=HTL3E+O5p5G2ATGYUpEXCG5QY73gcuUGyJm/KXoYb60YLMGt8GTDQzjXEUJ0k3Uq5s+Fym hXCg5f8bWWNZJhGPfrF4OQKSEISdOkK8rhliFFiwQn05EjjR/JfSy9AR6UMnpcqBLQIQH7 XNViQdt/zUjJXkg9RpkZQt5/zzm7aX0i/SZOQSs94OIC/jkzWYZbbu3qsz4mphe+6Xx43B sLQZ33pZPsXzAXgdjRR41RL7leI/RVUdceZzmzAZkD02wv+i09BTaHW4eYP3h8r/9Zt70b Ko1CSLKqItY49adCGPImbSOETJK1Bjtptk2KT6JClSaY0IIlQX6fYA1MARqlxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778125765; 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=6juM/HYZgK9+5ROShR0VfGcJaMc769jlzqS+CnKABOE=; b=nmosQ94fUItLaLxESdxIlkAZaP7jouO7HtqWj4qzA9H5ElbTMqL82N7Ybllr+4CvRlWVwW IbifK7daiJrwcQfFk9PFdLTma3CvSg0j9MDCe5kx4kB9BHnSeW6E3FskyK0QA28x+l9hHV lM9eEW2ByZIRErmVJhTbDdJwwDF7KruArgEWoP8GfkC8y7vK5bmP4XjIYUXn92FqgoeNEv a4biCJU+HyxHMPwpzY17VK41lHXtUUnD7NXS01N0XF6I5cKfd+N4tIEOkRWKq5XW1IgvV2 uQBMlDhsakNKFsHillIg1zAACbCHdjM8WbgR04sTHQCzBURUhsQ3rRMl4oBb0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9ytF1sYtz17J2 for ; Thu, 07 May 2026 03:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25fab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 03:49:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: 586838724e40 - main - Remove PROC_CHECK_PRIV macro from sys_process.c 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 586838724e4086016ad62f0914248fc58ce26e35 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 03:49:25 +0000 Message-Id: <69fc0bc5.25fab.7a87e5e5@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=586838724e4086016ad62f0914248fc58ce26e35 commit 586838724e4086016ad62f0914248fc58ce26e35 Author: Simon J. Gerraty AuthorDate: 2026-05-07 03:49:06 +0000 Commit: Simon J. Gerraty CommitDate: 2026-05-07 03:49:06 +0000 Remove PROC_CHECK_PRIV macro from sys_process.c Just put the priv_check calls in the code. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56864 --- sys/kern/sys_process.c | 59 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 487dc5d06614..dece6457a4bf 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -72,13 +72,6 @@ /* Assert it's safe to unlock a process, e.g. to allocate working memory */ #define PROC_ASSERT_TRACEREQ(p) MPASS(((p)->p_flag2 & P2_PTRACEREQ) != 0) -#define PROC_PRIV_CHECK(priv) do { \ - int _error; \ - _error = priv_check(curthread, priv); \ - if (_error) \ - return (_error); \ - } while (0) - /* * Functions implemented below: * @@ -115,8 +108,12 @@ proc_read_regs(struct thread *td, struct reg *regs) int proc_write_regs(struct thread *td, struct reg *regs) { + int error; + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); return (set_regs(td, regs)); } @@ -130,8 +127,12 @@ proc_read_dbregs(struct thread *td, struct dbreg *dbregs) int proc_write_dbregs(struct thread *td, struct dbreg *dbregs) { + int error; + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); return (set_dbregs(td, dbregs)); } @@ -149,8 +150,12 @@ proc_read_fpregs(struct thread *td, struct fpreg *fpregs) int proc_write_fpregs(struct thread *td, struct fpreg *fpregs) { + int error; + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); return (set_fpregs(td, fpregs)); } @@ -271,7 +276,9 @@ proc_write_regset(struct thread *td, int note, struct iovec *iov) if (regset->set == NULL) return (EINVAL); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); p = td->td_proc; @@ -305,8 +312,12 @@ proc_read_regs32(struct thread *td, struct reg32 *regs32) int proc_write_regs32(struct thread *td, struct reg32 *regs32) { + int error; + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); return (set_regs32(td, regs32)); } @@ -320,8 +331,12 @@ proc_read_dbregs32(struct thread *td, struct dbreg32 *dbregs32) int proc_write_dbregs32(struct thread *td, struct dbreg32 *dbregs32) { + int error; + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); return (set_dbregs32(td, dbregs32)); } @@ -335,8 +350,12 @@ proc_read_fpregs32(struct thread *td, struct fpreg32 *fpregs32) int proc_write_fpregs32(struct thread *td, struct fpreg32 *fpregs32) { + int error; + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); return (set_fpregs32(td, fpregs32)); } #endif @@ -378,7 +397,9 @@ proc_rwmem(struct proc *p, struct uio *uio) fault_flags = writing ? VM_FAULT_DIRTY : VM_FAULT_NORMAL; if (writing) { - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); } /* @@ -710,11 +731,11 @@ sys_ptrace(struct thread *td, struct ptrace_args *uap) addr = uap->addr; break; } - if (error) + if (error != 0) return (error); error = kern_ptrace(td, uap->req, uap->pid, addr, uap->data); - if (error) + if (error != 0) return (error); switch (uap->req) { @@ -1250,7 +1271,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) CTR3(KTR_PTRACE, "PT_STEP: tid %d (pid %d), sig = %d", td2->td_tid, p->p_pid, data); error = ptrace_single_step(td2); - if (error) + if (error != 0) goto out; break; case PT_CONTINUE: @@ -1260,7 +1281,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) if (addr != (void *)1) { error = ptrace_set_pc(td2, (u_long)(uintfptr_t)addr); - if (error) + if (error != 0) goto out; td2->td_dbgflags |= TDB_USERWR; } From nobody Thu May 7 05:02:52 2026 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 4gB0W02t47z6dTHZ for ; Thu, 07 May 2026 05:02:52 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gB0W021Tfz3vqm for ; Thu, 07 May 2026 05:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130172; 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=Y4tbP/piT/sb0mLceqLZU4TkaxnIJqfc4g7oPg6TUvw=; b=JlPdJEV9UpukfwZwnmZzGKLkXEo6CDy+adVzb/6BVrZ1n5NdMHh0nzt/+CW6kv/4Ke+QpH fUhn60j8X3KSYxz14aOGkXVt8e2WOuw7z17qOSwTzZgaX6kXWlVezHzMD0iKFeTNKBVtgx SKejL3GK29T1ctlj+clvQqq9g3D1TEJvVEoeu0QMo69FasE3SWQjGiZqt6QrpRicK7TFEV 6Xk6EcWtnLbHO9Z9KL0fL95HYwVP03XsC6GJ4PpBYnF85cCMKgMnJiyEj3HZDjV+hvxeWJ lYtQwmXZ+PPpU29VI0ozWPwDiW1veSjStCrcZiM3C3uALY4a+t8kQqHSDzKPjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778130172; a=rsa-sha256; cv=none; b=aFZOrkdz1P0DHJIORNfoV9bbgCTc1dTs/bWDWBNEFH+6T8fcFVpuu5JRvuOhO0DENlS8Oy HHerdhee5gYig7BWjPqYxVAe5T8GA409MQufjPtDCc+0aG1YCU2EAZpOB4jqU7DZ6hjsrh DZ/pp38w6MxT1kDvsscVuo3mO/P9yLyh6XToAgU4PlOHR4lJiZhDb40JDpciBu/hh1d/r6 jha9dqqlHfzZIJRUGoXRT2WjVJ+UpUb8kCMywme/AJwDk+O4Y3uN+xWgOMFWNoq+U2NQSp myWpwMbiBlzK7q9D25mWp6J3FJJf1sSXbTWkk80MECvfy77UhtLx/lfoT2v9Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130172; 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=Y4tbP/piT/sb0mLceqLZU4TkaxnIJqfc4g7oPg6TUvw=; b=iiegMeiJPLcpfI5PS/s+E/guXKa744oeXBLMtYSP0yAJdxt9I0IYfL0jdlxXxYpZFt/g8Y /QTsYiqRTibKjabiiSanibWazCgwcId3Y00Sj9supTZu1AUDxKL55Hf1edT1GcyrMDzGzD 2diNY813UyB5Mcrr8IZTJuHOptH/cvAtaa731guA/U+Wy2qQVmzv2ZR4AHRuRi62/zwzNt fdnQpktVPwKh5cW56f0VPI2nO2xGbyJnSyJom+tHmXtCrL93JSiYTsP4A6h/GNVK1jXiPo hPdOJh2bYwu9ULkx2ztxrBhjiY/zxj0hZR1P9tukrCcVqQAviGeEJjZBVbthaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB0W01Xwxz19gm for ; Thu, 07 May 2026 05:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 360e2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 05:02:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: 3daa43b1bb2c - main - sys: Make priority.h and rtprio.h include all dependencies 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3daa43b1bb2cf68f32993e342f59eb146afb7c24 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 05:02:52 +0000 Message-Id: <69fc1cfc.360e2.24248fa1@gitrepo.freebsd.org> The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=3daa43b1bb2cf68f32993e342f59eb146afb7c24 commit 3daa43b1bb2cf68f32993e342f59eb146afb7c24 Author: Alex Richardson AuthorDate: 2026-05-07 04:20:39 +0000 Commit: Alex Richardson CommitDate: 2026-05-07 04:23:03 +0000 sys: Make priority.h and rtprio.h include all dependencies This ensures this header can be included without an explicit or implicit sys/types.h include first. This causes issues building SPEC2017 which includes sys/rtprio.h and then we get an error due to missing u_char definition. Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52041 --- sys/sys/priority.h | 8 ++++---- sys/sys/rtprio.h | 9 +++++---- tools/build/test-includes/badfiles.inc | 2 -- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/sys/priority.h b/sys/sys/priority.h index 93dd5aa90d95..3a3537bee1b2 100644 --- a/sys/sys/priority.h +++ b/sys/sys/priority.h @@ -136,10 +136,10 @@ #endif struct priority { - u_char pri_class; /* Scheduling class. */ - u_char pri_level; /* Normal priority level. */ - u_char pri_native; /* Priority before propagation. */ - u_char pri_user; /* User priority based on p_cpu and p_nice. */ + unsigned char pri_class; /* Scheduling class. */ + unsigned char pri_level; /* Normal priority level. */ + unsigned char pri_native; /* Priority before propagation. */ + unsigned char pri_user; /* User priority based on p_cpu and p_nice. */ }; #endif /* !_SYS_PRIORITY_H_ */ diff --git a/sys/sys/rtprio.h b/sys/sys/rtprio.h index 6e0d8c7b0fe7..d6968a9e58a4 100644 --- a/sys/sys/rtprio.h +++ b/sys/sys/rtprio.h @@ -34,6 +34,7 @@ #ifndef _SYS_RTPRIO_H_ #define _SYS_RTPRIO_H_ +#include #include /* @@ -71,8 +72,8 @@ * Scheduling class information. */ struct rtprio { - u_short type; /* scheduling class */ - u_short prio; + unsigned short type; /* scheduling class */ + unsigned short prio; }; #ifdef _KERNEL @@ -86,8 +87,8 @@ void pri_to_rtp(struct thread *, struct rtprio *); #include __BEGIN_DECLS -int rtprio(int, pid_t, struct rtprio *); -int rtprio_thread(int, lwpid_t, struct rtprio *); +int rtprio(int, __pid_t, struct rtprio *); +int rtprio_thread(int, __lwpid_t, struct rtprio *); __END_DECLS #endif /* !_KERNEL */ #endif /* !_SYS_RTPRIO_H_ */ diff --git a/tools/build/test-includes/badfiles.inc b/tools/build/test-includes/badfiles.inc index a0aada4f016f..e7e9e67c4518 100644 --- a/tools/build/test-includes/badfiles.inc +++ b/tools/build/test-includes/badfiles.inc @@ -90,14 +90,12 @@ BADHDRS= \ sys/pmckern.h \ sys/posix4.h \ sys/power.h \ - sys/priority.h \ sys/prng.h \ sys/qmath.h \ sys/racct.h \ sys/resourcevar.h \ sys/rman.h \ sys/rmlock.h \ - sys/rtprio.h \ sys/runq.h \ sys/rwlock.h \ sys/sbuf.h \ From nobody Thu May 7 05:02:53 2026 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 4gB0W1562nz6dSq3 for ; Thu, 07 May 2026 05:02:53 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gB0W12rnqz3w6Y for ; Thu, 07 May 2026 05:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130173; 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=uyMYxGBUz1wm9yILqHYCdL13u3dXIhOVZBHwqLXvPco=; b=uZ/ZZauScS2hMURKoNTooEmiSOfKupqCklc7WPVna73ufNNUptMGEZ2ejJgrBSIUGk5x1Y XUx8NbNOHZTx1wBIsnnsRzZtrGYWDOhmcOn9Fm+afVm8xSnhkP50hDkQnNM9wvm6lpuQ2d qMpTx2LVRfV1Sh/0OjWtnI5KzbNX0Loh1L/8UMYua1ZjVYxbT9OKZPP1o4Bd90e9KcNIiQ W8/bWdCs3tpI5KszlJAqRGybKvQKyBFRqQLwFEb4kopREaO9neWVhsTro2+u3z6DGO6tMH CDMjNKVHL2lnjvAbkKo2t3qCFbeWK3fuUAYo9XWjjWZHzFQTylQ/+mIOJ/NXUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778130173; a=rsa-sha256; cv=none; b=b+wx44sxW6pe1GO7Ekh37uOCMZKru047kn+ulkSgy41ZTju7+9DhKR1XL3pP0JITeZndfK VWt5lo61ICiXBPW8rvc3nCeaowhrKQPYNe37JNAqvIF14ING4hq0A0S4ettsQguEioRuLh h3j/xsmwrVr8JK8n9dIatBQq9S75qTh6/zWmBH4q2MW97Jp8ZE9ld2+HBcr2FI5VGLOS+Z HDnYeoS2Rw10l5EvJ0cdokfeDi0Kc8otW1dM85YfV/LMtr6Q5XIii6ztg+ZvKKXTvPE6AY AaQMAzmXHd+p92lVlm5NO6IKPwfDVwe4UZFtRxHvJ0NJF6ywXa3DgC1l8KQJTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130173; 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=uyMYxGBUz1wm9yILqHYCdL13u3dXIhOVZBHwqLXvPco=; b=WR8pmL9bIMhrCV1Sfc7sU/wQBUVNCr1WcdZsZKk/blncf2qAeRXFmt69bN5TvBSjhZREOs gcWcvwEJoWIu/RVHI9iVthwEviyPGpDUENLr+tJ5ry83FLGgQ+tkLZuovHiOpxA7dM0Cpc cTlXkyUbbx2mT1gh91WB/ZyBNJSrkjO6E0zdZZPp2sO6Jb9RNfaiKCdbGuESGDWo+ZM16W 70B39FL/JOpW3pfZEiqZQ/Xu4e0o3Idk5JUuQCBBtLEmi5h+AyzAzLmKF5tJQLMPCP/pkO dbvyanku2DlHfCC5+4j0HHGPbEjLBdWt2kcmJCDmi7XR1/NtSirTlF5RYn2uhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB0W12M0fz19nB for ; Thu, 07 May 2026 05:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 370e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 05:02:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: 3fe5069ce2bf - main - virtio_p9fs: Fix kernel panic on module unload 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fe5069ce2bf5b2702f3be6531ce6a05c584e64d Auto-Submitted: auto-generated Date: Thu, 07 May 2026 05:02:53 +0000 Message-Id: <69fc1cfd.370e5.2296ef7f@gitrepo.freebsd.org> The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=3fe5069ce2bf5b2702f3be6531ce6a05c584e64d commit 3fe5069ce2bf5b2702f3be6531ce6a05c584e64d Author: Alex Richardson AuthorDate: 2026-05-07 04:21:23 +0000 Commit: Alex Richardson CommitDate: 2026-05-07 04:23:03 +0000 virtio_p9fs: Fix kernel panic on module unload The virtio_p9fs module event handler can be invoked multiple times. Previously, this caused p9_init_zones() and p9_register_trans() to be executed multiple times, leaking UMA zones and corrupting the transport list. During module unload, p9_destroy_zones() was also called multiple times on the same zone pointers, triggering a duplicate free kernel panic in uma_zdestroy(). This patch introduces a static reference counter in vt9p_modevent() to ensure the zones and transports are only initialized and destroyed exactly once, aligning with the approach used by other virtio drivers like vtnet. Reviewed by: kib, markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56497 --- sys/dev/virtio/p9fs/virtio_p9fs.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/dev/virtio/p9fs/virtio_p9fs.c b/sys/dev/virtio/p9fs/virtio_p9fs.c index 2b276a60aa9a..f76b135c042d 100644 --- a/sys/dev/virtio/p9fs/virtio_p9fs.c +++ b/sys/dev/virtio/p9fs/virtio_p9fs.c @@ -464,16 +464,22 @@ static int vt9p_modevent(module_t mod, int type, void *unused) { int error; + static int loaded = 0; error = 0; switch (type) { case MOD_LOAD: - p9_init_zones(); - p9_register_trans(&vt9p_trans); + if (loaded++ == 0) { + p9_init_zones(); + p9_register_trans(&vt9p_trans); + } break; case MOD_UNLOAD: - p9_destroy_zones(); + if (--loaded == 0) { + p9_unregister_trans(&vt9p_trans); + p9_destroy_zones(); + } break; case MOD_SHUTDOWN: break; From nobody Thu May 7 05:02:54 2026 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 4gB0W30tNJz6dT0x for ; Thu, 07 May 2026 05:02:55 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gB0W24Dm8z3vlJ for ; Thu, 07 May 2026 05:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130174; 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=gQXijSTwGBB3wG2Z/w1rIgba5WaHjrXZsYry1ZcisfY=; b=SI1RHGmk9TJl75CS8dIW4W2ra87rpqIxA0pOhn7sQpfkO9ahtO6KJiKmbxplT7/l4MAtv1 yVMKr+Mp4X+8RujzL5o8fOPMZeE8v9cdJ/Vb2Ena9JExQhg8I2d+XTyt1IS+v8FWI8fbU4 Ke8/TvM1Pv8EKvs4PXydW+TzeU6Z0F5+zJ/i5a8++ZBoW8BSNdpYRsAAkXXMJMNTTNYTSe dcaG5UOZr/r4jUVn3e4w8X5N4zhc20TrpEDgoM1L7WXFMDUzHgqRb+43eOBHejVwUh1Kz1 jRNzeHegFACSKguScexNHn2uRJl/wYMfrpUJZw3Eoy4uHAvjmD1PCmvNmRtEZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778130174; a=rsa-sha256; cv=none; b=Q40HQ+BIwgKXV3RyBrWms9sO34oAGUGEg6TA37cxlC6uc0zG7pqdMls5GnIxwyfiK/8kwv /WPkXyT1FNsEl5KiUKbIhpEZhPos+teVZ+l6/tOaaDMWu7XwApLFfb+zlGGDGz02QglPeN AgLBabXtbarFmbDkSVzoxHGy4nqefTT93En5kI3GNXSGCGxUErBgZi3gSu6mz+lOt4evRP rRg/x1jhJV2+681gtICCdEd2I6XA+jCUWaSKr0jUhybby1GflkejVOb7D3uk7swWG9VqVS XT5W3QCKXEFToKnZg4PDNuW4RQW3WSFYRaTkHB+Gja10MO/YXLP31jIfZiUs+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130174; 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=gQXijSTwGBB3wG2Z/w1rIgba5WaHjrXZsYry1ZcisfY=; b=l1UlBsJs3mMAcOgzQxoxzD3qPVKvRy2sniRwIcW8GQC5VZng1f/+SK5Mt0D6gLXgaRXmW4 SFIYP1MvOghJI5/uVeMzoDVaudHU8DXOEQ7MSPUoS75ytvw+7TV6In5J1NZlgcrMIxa6I6 JIJSXcAF8HLC35KBRX9aEvy/os7V9buK7vuSkr6SB9Jxt5UPHoqheKpzp3bUMZUBfs7J+V iyUqKz4u6Fj8DKpKl2eGAYtEbFW329pSE+4i+FpQUt+XiXtk5j8OcUimQvpIZvLYr2QFnq PvglSMvuGAGlmn2wG6C24c5/yvvHzahWXR6j9+J2tVxonRFeoxhWmd9bxfechw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB0W23VGvz19lK for ; Thu, 07 May 2026 05:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35f34 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 05:02:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: 1ed2ef42e017 - main - p9fs: Move UMA zone initialization to VFS module lifecycle 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ed2ef42e01771f5d8ca9be61e07dcf0fd47feba Auto-Submitted: auto-generated Date: Thu, 07 May 2026 05:02:54 +0000 Message-Id: <69fc1cfe.35f34.2afae8bd@gitrepo.freebsd.org> The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=1ed2ef42e01771f5d8ca9be61e07dcf0fd47feba commit 1ed2ef42e01771f5d8ca9be61e07dcf0fd47feba Author: Alex Richardson AuthorDate: 2026-05-07 04:21:50 +0000 Commit: Alex Richardson CommitDate: 2026-05-07 04:23:04 +0000 p9fs: Move UMA zone initialization to VFS module lifecycle Previously, the UMA zones required for 9P requests (p9fs_buf_zone, p9fs_req_zone, etc.) were initialized and destroyed in the virtio_p9fs transport module. This caused issues when unloading the core p9fs module. This change moves p9_init_zones() and p9_destroy_zones() into p9fs_init() and p9fs_uninit() inside p9fs_vfsops.c so that they are correctly bound to the VFS filesystem module lifecycle via vfs_modevent, aligning p9fs with standard FreeBSD VFS semantics. Found while fixing https://github.com/CTSRD-CHERI/cheribsd/issues/2617. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56492 --- sys/dev/virtio/p9fs/virtio_p9fs.c | 3 +-- sys/fs/p9fs/p9fs_vfsops.c | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/dev/virtio/p9fs/virtio_p9fs.c b/sys/dev/virtio/p9fs/virtio_p9fs.c index f76b135c042d..19a32fea458e 100644 --- a/sys/dev/virtio/p9fs/virtio_p9fs.c +++ b/sys/dev/virtio/p9fs/virtio_p9fs.c @@ -471,14 +471,12 @@ vt9p_modevent(module_t mod, int type, void *unused) switch (type) { case MOD_LOAD: if (loaded++ == 0) { - p9_init_zones(); p9_register_trans(&vt9p_trans); } break; case MOD_UNLOAD: if (--loaded == 0) { p9_unregister_trans(&vt9p_trans); - p9_destroy_zones(); } break; case MOD_SHUTDOWN: @@ -487,6 +485,7 @@ vt9p_modevent(module_t mod, int type, void *unused) error = EOPNOTSUPP; break; } + return (error); } diff --git a/sys/fs/p9fs/p9fs_vfsops.c b/sys/fs/p9fs/p9fs_vfsops.c index 0e09c58e57b6..a0f0a5a4e494 100644 --- a/sys/fs/p9fs/p9fs_vfsops.c +++ b/sys/fs/p9fs/p9fs_vfsops.c @@ -119,6 +119,8 @@ p9fs_init(struct vfsconf *vfsp) p9fs_io_buffer_zone = uma_zcreate("p9fs io_buffer zone", P9FS_MTU, NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + p9_init_zones(); + return (0); } @@ -127,6 +129,8 @@ static int p9fs_uninit(struct vfsconf *vfsp) { + p9_destroy_zones(); + uma_zdestroy(p9fs_node_zone); uma_zdestroy(p9fs_io_buffer_zone); uma_zdestroy(p9fs_getattr_zone); From nobody Thu May 7 05:02:55 2026 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 4gB0W42PVSz6dT3W for ; Thu, 07 May 2026 05:02:56 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gB0W36XZPz3vpG for ; Thu, 07 May 2026 05:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130175; 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=32RCz/jlZOMPsR+cpxuzQo3PcH5s9RQ6Elt+Kq6yEvc=; b=L227mHiTs2Ac2lhpK83fTJD83+AA8IO0ogg8rzJZYXJ9uNDy7HI2kjvUbSIi0HSs+wMYrY asPORxHyUIn2IlHPzXIblgKbNXa2GnleNG0FGy/uClt8+0kKV5y1/1aR3nvd5k4EdNVWva SXIzS/AXAfEigV6kr3jzTEI6r6vLd9C7Zadu5uW7Wk+J6JTusq0lTlT5fmiqZhN6VJSOI0 jUrsF7O1hmP4p7XWbT4i9HnxSIeTYy/YS4baRgzGQyoghM4GDJtIwzIiCnwJJtl5lAM26Q 03OPmCYzQ/vWPwhqAtUWSebQIxCexdifwxRCi1oZIjEmENvQSwAGSRluROdkbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778130175; a=rsa-sha256; cv=none; b=NxVgp3Cpo7H/tTUtYWlguOAr22nqvKv5GC/lEFVeLf6RaG5F/z98ykpHmKWqdWJwSiVf3H prrFPDyZCd6zibCeWnm32GzAeS19Rc/vlVZ/xyCdjvao9CX4XyoONfSSoy5P+hb1/NJ25u 7fDDG8i/yPrDYfFuyT+x7DUdsm+8mzbzBPCbteE6vR8PWdpjV5SHD+slLjxf1Uwwx1LVvd nviqu9jt8AV5ARgo435YAfB0uK/STNcTysUf7CY1KI6lxzIZIi2bIrRBc0xjF07QygN1Cz PqDqJPom9jYZjivjNJDpOWs4+venSERA1hkGu1Utp9yiQKZHtCwd+AXnZAkWBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130175; 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=32RCz/jlZOMPsR+cpxuzQo3PcH5s9RQ6Elt+Kq6yEvc=; b=cpxoBPQsHCaF2qC4OLUoUjiJRET4ZSkDLjcNHsySCSZJVclf/ZtWC7OSnnrw/miyO7sO31 PlepZSCr0IK5bq7fov0eeBp4YsZKgq8JHmxxWJmpDTEU4DVy4tWLZwWZk0vUI0ivQNSmQ7 q8aWdpRCWiMVQH8vVyGub+nOSDNt4CDG7sogbwLEeBNywNc8o0lKaDFd+HKb0PBP+0eLpb HTTRb1jaS5wV01IbaMWF7zKCLV8DbSZhK4NMeT9/qzeki91KKDJoeiSXn5PEg8Y4SscHfa Z47bmFr7SHgXNskAPhRNwn+ihwTEzqqRYLH5rD/uCBl2fKcme29ztU1Xt5FheQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB0W33zhcz19lM for ; Thu, 07 May 2026 05:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 348c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 05:02:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: 96b2f4a91241 - main - p9fs: implement basic pathconf support 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96b2f4a9124158f27c4c27c32f6fa1a6018250fb Auto-Submitted: auto-generated Date: Thu, 07 May 2026 05:02:55 +0000 Message-Id: <69fc1cff.348c0.5473ab52@gitrepo.freebsd.org> The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=96b2f4a9124158f27c4c27c32f6fa1a6018250fb commit 96b2f4a9124158f27c4c27c32f6fa1a6018250fb Author: Alex Richardson AuthorDate: 2026-05-07 04:22:23 +0000 Commit: Alex Richardson CommitDate: 2026-05-07 04:23:04 +0000 p9fs: implement basic pathconf support This is needed for various pjdfstest tests which fail with syntax errors if pathconf _PC_NAME_MAX/_PC_PATH_MAX return -1. For NAME_MAX we can use the 9P2000.L Tstatfs call to get namelen from the host. While this could theoretically be different for nested filesystems in the shared mount it is a much better guess than just returning 255. There does not seem to be a way to get the host PATH_MAX, so we just return the conservative kernel default. Found while fixing https://github.com/CTSRD-CHERI/cheribsd/issues/2617. Reviewed by: markj, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56493 --- sys/fs/p9fs/p9fs.h | 1 + sys/fs/p9fs/p9fs_vnops.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/sys/fs/p9fs/p9fs.h b/sys/fs/p9fs/p9fs.h index 2470734fef4d..b469495ef69e 100644 --- a/sys/fs/p9fs/p9fs.h +++ b/sys/fs/p9fs/p9fs.h @@ -154,6 +154,7 @@ struct p9fs_session { struct mtx p9fs_mtx; /* mutex used for guarding the chain.*/ STAILQ_HEAD( ,p9fs_node) virt_node_list; /* list of p9fs nodes in this session*/ struct p9_fid *mnt_fid; /* to save nobody 's fid for unmounting as root user */ + unsigned int name_max; /* cached max filename length */ }; struct p9fs_mount { diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c index 7141e9700602..ad739a219acb 100644 --- a/sys/fs/p9fs/p9fs_vnops.c +++ b/sys/fs/p9fs/p9fs_vnops.c @@ -37,10 +37,12 @@ #include #include #include -#include -#include #include +#include +#include +#include #include +#include #include #include @@ -2248,6 +2250,72 @@ p9fs_delayed_setsize(struct vop_delayed_setsize_args *ap) return (0); } +static unsigned int +p9fs_get_name_max(struct p9fs_node *np) +{ + struct p9fs_session *vses = np->p9fs_ses; + struct p9_statfs statfs; + struct p9_fid *vfid; + unsigned int name_max; + int error = 0; + + name_max = atomic_load_int(&vses->name_max); + if (name_max != 0) + return (name_max); + + P9_DEBUG(VOPS, "%s: querying _PC_NAME_MAX\n", __func__); + vfid = p9fs_get_fid(vses->clnt, np, NULL, VFID, -1, &error); + if (vfid != NULL) { + error = p9_client_statfs(vfid, &statfs); + if (error == 0) { + /* + * Note that this is not strictly correct if you have + * nested mounts on the host (e.g. when using qemu with + * multidevs=remap), but is a better estimate than just + * returning 255. + */ + name_max = statfs.namelen; + } + } + P9_DEBUG(VOPS, "%s: max_name=%u error=%d\n", __func__, name_max, error); + if (error != 0 || name_max == 0) { + printf("p9fs: warning: failed to query name_max (error %d), " + "using fallback %d\n", error, NAME_MAX); + name_max = NAME_MAX; /* fallback and prevent retrying */ + } + atomic_store_int(&vses->name_max, name_max); + return (name_max); +} + +/* + * Return POSIX pathconf information applicable to p9fs filesystems. + */ +static int +p9fs_pathconf(struct vop_pathconf_args *ap) +{ + int error = 0; + struct vnode *vp = ap->a_vp; + struct p9fs_node *np = P9FS_VTON(vp); + + switch (ap->a_name) { + case _PC_NAME_MAX: + *ap->a_retval = p9fs_get_name_max(np); + break; + case _PC_SYMLINK_MAX: + case _PC_PATH_MAX: + /* + * These are conservative estimates, the real value depends on + * the host file system. + */ + *ap->a_retval = MAXPATHLEN; + break; + default: + error = vop_stdpathconf(ap); + break; + } + return (error); +} + struct vop_vector p9fs_vnops = { .vop_default = &default_vnodeops, .vop_lookup = p9fs_lookup, @@ -2257,6 +2325,7 @@ struct vop_vector p9fs_vnops = { .vop_delayed_setsize = p9fs_delayed_setsize, .vop_getattr = p9fs_getattr_dotl, .vop_setattr = p9fs_setattr_dotl, + .vop_pathconf = p9fs_pathconf, .vop_reclaim = p9fs_reclaim, .vop_inactive = p9fs_inactive, .vop_readdir = p9fs_readdir, From nobody Thu May 7 05:02:56 2026 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 4gB0W50Wncz6dTFr for ; Thu, 07 May 2026 05:02:57 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gB0W45Jhfz3w6v for ; Thu, 07 May 2026 05:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130176; 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=wCXb5ub4O7XzugdwfxzAKTTgx3WIqPzPSAoyK//yRK0=; b=GlWGD5bHkLukksIyMrj5bg2oKIinSb0a8V3FFERdWENKfTjMeuzmBn4tzwW4CZpkxE4BgH 20BsMCtQUaYsrVIYDZJygdDw3jMNFW31f7XcYRpnFgnZrTOr6PhUAp1I1NMOk3/cugeIaB o7sBTC/Pz1FwPQQRmZOPTHPot4efUaTxSrJtOWlznNAvncwv8WR3I0aPei5SGcqZBOXsf2 LhjbRLBuAO3TDUOYU5WOlqCz3P5tczl30GId5B3+1lwyJ6mYZ3mEPRHo2aJ7uxTRj/Za1T jPWtXJAvj7nB6M0mg0fRs3voCFtNGofs/J8mS4INGU7JW1Shgmon2a48nOB9yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778130176; a=rsa-sha256; cv=none; b=vJRtCoQWW3qJbmSQYPxmVVPxtMXxH2Qq0ZTOUyGdduXWmxUW/RO5i9mRwCIhLQs4rEOCu4 tmL6oJAaVOXzmIBSWwKSMApmEy4VcY8qFsfRuXXi+kcTCZmu3eXqgxcmhDu7FPVbxWT9sS 2dZvg4+8xCcf3wE4q6J1RVMipywPtqJtrpS72B8v/7oyYh2zl/On4SihQIBWCinqWU5nBY uKHOt4NmPAfLkJC08RuRnqq7Hqg6hmgmY7eaMlFOuXLRBMIkQYYeiQliDD/zEGLt7o86k2 0QtutVoVmwG/54dFdlawXNNC/UdBH+/TUols3jS7nOPN0IdCiiVxUMc6GIFCTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130176; 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=wCXb5ub4O7XzugdwfxzAKTTgx3WIqPzPSAoyK//yRK0=; b=az5i2n3p0oQLqEbNQ8O4XyJiZ/vpsAXBchiqdRkTOvdSwEkqppubzYr018X9A4YWYoeRzH saAgAMe67hrbhDFgTRGIPnWtpFWryWuB+ZXhpfEpwcDt+Z7aVBflO34v1MOZifyowemm8h j3i0rHE1SIPZH+7QcB3rUXsoQ43EuLY5NGQinlz8PigVW2D4gJu9xjxwned7SNmKCzAWsn Nul0RP9mWlS2oP+eaeolx/sbM0kvK9NiC2bsUNAbcfSbq/yw+CfPFlZOzOcKUzlK84C00F K4+zA01zAZSo3tDjLSRCRS9HoNwD2hQH5rJaBSkVhhzCnWU4/boAZBa6+1Ao9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB0W44mgsz19yl for ; Thu, 07 May 2026 05:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35f30 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 05:02:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: 40d59ee35dc1 - main - p9fs: Fix creating files with restrictive permissions 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40d59ee35dc106cda88d66e37527975a32596cd7 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 05:02:56 +0000 Message-Id: <69fc1d00.35f30.e0202b2@gitrepo.freebsd.org> The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=40d59ee35dc106cda88d66e37527975a32596cd7 commit 40d59ee35dc106cda88d66e37527975a32596cd7 Author: Alex Richardson AuthorDate: 2026-05-07 04:23:27 +0000 Commit: Alex Richardson CommitDate: 2026-05-07 04:23:28 +0000 p9fs: Fix creating files with restrictive permissions When a file is created via p9fs with restrictive permissions (like 000), the 9P TCREATE request successfully creates and natively opens the file, returning an open, writable file descriptor. Previously, p9fs would attempt a subsequent TOPEN. That TOPEN would fail with EACCES due to the restrictive mode, leaving a 0-byte file and causing operations like 'mv' to abort. We now preserve the writable descriptor returned by TCREATE so that the subsequent VOP_OPEN can use it directly, avoiding the failing TOPEN. Additionally, p9fs_compatible_mode now appropriately isolates the base access intent when matching fids, preventing extended flags from breaking the match. A test case for this behavior has been submitted to pjdfstest: https://github.com/pjd/pjdfstest/pull/87 Resolves: https://github.com/CTSRD-CHERI/cheribsd/issues/2617 Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56494 --- sys/fs/p9fs/p9fs_subr.c | 14 +++++++++----- sys/fs/p9fs/p9fs_vnops.c | 24 +++++++++++++++++++++++- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/sys/fs/p9fs/p9fs_subr.c b/sys/fs/p9fs/p9fs_subr.c index d0f04f6c5e97..f66e7a171029 100644 --- a/sys/fs/p9fs/p9fs_subr.c +++ b/sys/fs/p9fs/p9fs_subr.c @@ -275,16 +275,20 @@ p9fs_compatible_mode(struct p9_fid *fid, int mode) { /* * Return TRUE for an exact match. For OREAD and OWRITE, allow - * existing ORDWR fids to match. Only check the low two bits - * of mode. + * existing ORDWR fids to match. * - * TODO: figure out if this is correct for O_APPEND + * We mask both the requested mode and the existing fid's mode + * with 3 (0b11) to isolate the base access intent (O_RDONLY, + * O_WRONLY, or O_RDWR). This prevents extended open flags like + * O_EXCL or O_APPEND from causing a mismatch when we are merely + * looking for an appropriately privileged open descriptor. */ int fid_mode = fid->mode & 3; - if (fid_mode == mode) + int req_mode = mode & 3; + if (fid_mode == req_mode) return (TRUE); if (fid_mode == P9PROTO_ORDWR) - return (mode == P9PROTO_OREAD || mode == P9PROTO_OWRITE); + return (req_mode == P9PROTO_OREAD || req_mode == P9PROTO_OWRITE); return (FALSE); } diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c index ad739a219acb..2519e5cd050a 100644 --- a/sys/fs/p9fs/p9fs_vnops.c +++ b/sys/fs/p9fs/p9fs_vnops.c @@ -419,7 +419,7 @@ out: * the name and perm specified under the parent dir. If this succeeds (an entry * is created for the new file on the server), we create our metadata for this * file (vnode, p9fs node calling vget). Once we are done, we clunk the open - * fid of the parent directory. + * fid of the parent directory if it was not retained. */ static int create_common(struct p9fs_node *dnp, struct componentname *cnp, @@ -473,6 +473,28 @@ create_common(struct p9fs_node *dnp, struct componentname *cnp, dnp, newfid, vpp, cnp->cn_nameptr); if (error != 0) goto out; + + if (ofid != NULL) { + struct p9fs_node *np = P9FS_VTON(*vpp); + ofid->v_opens = 0; + /* + * The 9P file creation request natively opens + * the file as part of the create operation and + * gives us a writable file handle (ofid). + * We retain this open descriptor by adding it + * to the VOFID list of the new vnode. This + * guarantees that a subsequent VOP_OPEN call + * does not need to send a redundant TOPEN + * request. This is particularly important + * because if a file was requested to be created + * with 000 permissions, the host will reject + * subsequent TOPEN requests due to insufficient + * permissions, which would cause an overall + * open() failure. + */ + p9fs_fid_add(np, ofid, VOFID); + ofid = NULL; /* prevent closing handle below */ + } } else { /* Not found return NOENTRY.*/ goto out; From nobody Thu May 7 09:57:23 2026 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 4gB72q5j1mz6byX4 for ; Thu, 07 May 2026 09:57:23 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gB72q4btlz3gtT for ; Thu, 07 May 2026 09:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778147843; 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=BYJe3kaj/4UYIpZC6wKUa93/zy13BJkGnN+Q1nPPesk=; b=Ajzj7gesRb1H4zjom+G2ow0haY1aK2xxks4Aea8+Djv3jVu5FAm3oBZB4BN4S4Ss+qkyDt 1ukhs8gf1EiDqFetLAM3S4XOdH3N4llilxXq6QT5lXu7ofLAcx+/4z3ygsU+9VAS1pl+hK ojCwVaAxPm4V0FOEInHS9k24Xtg44HNEZBym+Ldl+yG6nXjUZdNkAmkVcB7Ny4wuz9T3nd 3QjZqu0IYQ/d5T2JFgpASKAtybKzSmTQE2aJgVtFTPEMShpraYxIOAHYV26NLCiGY4bC3R uNypgIL8fBEXNp2sLGPVJUyG8PpZUToqtiT/jZClcPUQ1A+QoQdIXI4oWBxmeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778147843; a=rsa-sha256; cv=none; b=KrOQBHPnng/n1AOZHKk2r7li4a9Wv5S0pALDXeRuglz3YzQpcmNso24gG/D3nzG/seQv8j FSBp2oySiOyQzAIH36PfKOt08tn+XsiJ+hdi4rkVrs+BPobt6cyygiVRKJklsXqQEhbtOu FaZWulbVN+pkuw+qRfT+UPYjmdnHFUb1HK+UwEN4v6pZfyQxE3GxSdHrBHbOfXKjnVN+KT P4o+Y1JHbL0yPwL4vXK3Bck24qHdfOdwndvylvT/uDSh8V9styY6Y0m7ZIZygf4IJTyn2g s41hwsIutAKrSmNBbIg+mo/TbNTteh/DhjKLxuLoyKnCXy8xdudimlUVaHlMNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778147843; 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=BYJe3kaj/4UYIpZC6wKUa93/zy13BJkGnN+Q1nPPesk=; b=etoSTmuznVsK62A4gNFlRIC2RXORkvex0QPpCpytBVQQzlAHvQs8Y8zKjmUp+AbBRTIXYw ydPqnkHJrpLXxX3Wco7ZEPlDaDsW2zvhctj4wB2SArgeGex7/pNqzyCEplwFKtC8UapV+9 WKnbDSbbQN0sYv1fM0ze0YzgsPbvIxe5/GuEie0GipWr7o9uPTFmQ8kDINIxu7qC71vOeE nyzgB6GeLTbrnIp3d7Mr30qRpZK88CpMH6/Vfo9jUtD6ThD8KrugEcZlL95EnJlNQyUsAA amFq6wEjjC+t3ZlwLDE2hrBueWM7MW9iAnA5r8YJujSgCY4rkrYDkCkHu436UQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB72q4C9Zz5jr for ; Thu, 07 May 2026 09:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24c8e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 09:57:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 242050278a37 - main - dtrace: Document the syscall provider 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 242050278a377f5ca6906545ddc924b60ad8aa58 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 09:57:23 +0000 Message-Id: <69fc6203.24c8e.1b704a4a@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=242050278a377f5ca6906545ddc924b60ad8aa58 commit 242050278a377f5ca6906545ddc924b60ad8aa58 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-05-05 12:57:53 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-07 09:57:03 +0000 dtrace: Document the syscall provider MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56831 --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 3 +- lib/libsys/intro.2 | 5 +- share/man/man4/Makefile | 1 + share/man/man4/dtrace_syscall.4 | 87 ++++++++++++++++++++++++++++ share/man/man4/linux.4 | 3 +- 5 files changed, 95 insertions(+), 4 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 5173074ee63e..45cb8c863f7a 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,7 +20,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 20, 2026 +.Dd May 7, 2026 .Dt DTRACE 1 .Os .Sh NAME @@ -1310,6 +1310,7 @@ in .Xr dtrace_profile 4 , .Xr dtrace_sched 4 , .Xr dtrace_sctp 4 , +.Xr dtrace_syscall 4 , .Xr dtrace_tcp 4 , .Xr dtrace_udp 4 , .Xr dtrace_udplite 4 , diff --git a/lib/libsys/intro.2 b/lib/libsys/intro.2 index 008936b278ae..33dfecf648c5 100644 --- a/lib/libsys/intro.2 +++ b/lib/libsys/intro.2 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 19, 2024 +.Dd May 7, 2026 .Dt INTRO 2 .Os .Sh NAME @@ -756,7 +756,8 @@ during a system boot. .El .Sh SEE ALSO .Xr intro 3 , -.Xr perror 3 +.Xr perror 3 , +.Xr dtrace_syscall 4 .Sh HISTORY The .Nm Ns Pq 2 diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 60ab6e8bdab6..44671c564239 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1029,6 +1029,7 @@ _dtrace_provs= dtrace_audit.4 \ dtrace_profile.4 \ dtrace_sched.4 \ dtrace_sctp.4 \ + dtrace_syscall.4 \ dtrace_tcp.4 \ dtrace_udp.4 \ dtrace_udplite.4 \ diff --git a/share/man/man4/dtrace_syscall.4 b/share/man/man4/dtrace_syscall.4 new file mode 100644 index 000000000000..e154e4c6046b --- /dev/null +++ b/share/man/man4/dtrace_syscall.4 @@ -0,0 +1,87 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2026 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.Dd May 7, 2026 +.Dt DTRACE_SYSCALL 4 +.Os +.Sh NAME +.Nm dtrace_syscall +.Nd a DTrace provider for system calls +.Sh SYNOPSIS +.Nm syscall Ns Cm \&: Ns Ar abi Ns Cm \&: Ns Ar syscall Ns Cm :entry +.Nm syscall Ns Cm \&: Ns Ar abi Ns Cm \&: Ns Ar syscall Ns Cm :return +.Sh DESCRIPTION +The +.Nm syscall +provider provides entry and return probes for system calls. +.Pp +The module in the probe's description is +.Ar abi , +which indicates what system call ABI a +.Ar syscall +belongs to. +.Nm +supports the following system call ABIs: +.Pp +.Bl -tag -offset indent -width freebsd32 -compact +.It Cm freebsd +Native ABI. +.It Cm freebsd32 +Non-native, 32-bit ABI. +.It Cm linux +Refer to +.Xr linux 4 . +.It Cm linux32 +Refer to +.Xr linux 4 . +.El +.Pp +The arguments to the +.Cm entry +probes are the arguments passed to the system call. +.Pp +The +.Cm return +probe stores the system call's return value in both +.Fa arg0 +and +.Fa arg1 . +.Pp +Inspect the +.Xr d 7 Ap s +.Va errno +variable to check if a system call failed. +.Sh EXAMPLES +.Ss Example 1 : Count Up System Calls +The following script traces all system calls and counts them for every process +on the system. +.Bd -literal -offset 2n +syscall:::entry { + @[execname, pid] = count(); +} +.Ed +.Sh SEE ALSO +.Xr dtrace 1 , +.Xr intro 2 , +.Xr tracing 7 +.Rs +.%B The illumos Dynamic Tracing Guide +.%O Chapter syscall Provider +.%D 2008 +.%U https://illumos.org/books/dtrace/chp-syscall.html +.Re +.Rs +.%A Brendan Gregg +.%A Jim Mauro +.%B DTrace: Dynamic Tracing in Oracle Solaris, Mac OS X and FreeBSD +.%I Prentice Hall +.%O Chapter Syscall Provider +.%P pp. 315\(en327 +.%D 2011 +.%U https://www.brendangregg.com/dtracebook/ +.Re +.Sh AUTHORS +This manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . diff --git a/share/man/man4/linux.4 b/share/man/man4/linux.4 index 711ac11e8fce..ec8342efe705 100644 --- a/share/man/man4/linux.4 +++ b/share/man/man4/linux.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 19, 2024 +.Dd May 7, 2026 .Dt LINUX 4 .Os .Sh NAME @@ -179,6 +179,7 @@ Linux kernel objects file system, see .El .Sh SEE ALSO .Xr brandelf 1 , +.Xr dtrace_syscall 4 , .Xr fdescfs 4 , .Xr linprocfs 4 , .Xr linsysfs 4 , From nobody Thu May 7 11:58:34 2026 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 4gB9kg1tnLz6c8yC for ; Thu, 07 May 2026 11:58:35 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gB9kf6LwNz3sjY for ; Thu, 07 May 2026 11:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778155114; 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=SbIUzAkKYjYAKmNYwSRuJhBhH9o4ce6/X2ETO58VhXc=; b=NL7FuP8iQyonth80pHYnmQ0H+O8Tbf+aXnL3EvwVSHKy66hke6882AnDRuPDLLFyEizfcX 35owMUcTFqGyJu+X3Oh39XPPVd1kyQuV+1H/ksiZbbsmxWuYE4IYnVR8LBBUnhKrNcN9k9 8HttDa+rxTpCTyTQtm3KHH7G0xiklsz2thlU3joB9vHCj3daUC9wBf3LIEBI877aLtt0Ij sdWlfddo7k2Sr22piXG88bRYl0tNOxfbgpWUlBhLpWHMnY6BLdNtr+3LpZeiG+UGveaL5/ 6lSknPkdoS4651kpCvdwi2PyNOq85Dwb9UTGSdz0nqkzBUJ/6saro8lRZSxVMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778155114; a=rsa-sha256; cv=none; b=rFeO3BUIOg1MSj38hUQmERqHd3Ta79bPrzyDOIDZ+l5oS1k2kdIgxOaOqX5wCSXXzRUBNa x2j+U7JsZZ/q0wfO/82dQYIecVtNDLyRhzChcor9KHJncohGfvh7h6zA8iIheeN2D/MLXP xw7Th/W57FO7YfK9txWR5QCcLIBv6RnGs9Xo5A22DI3U6u1Ga652ZXUoBdCL9LILfQkv3d 0lBhv2PS5qOUxiw6EmrvhwbMyyQXZup4221y13CedV7Li++htVSadkVZhKns7hQ5HiQ4tI e9/2YihVXX8lypOV9D68DjxndAY0ff5HWRTdS/NPX5hBhRXn4sl/S5V2B5Yb+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778155114; 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=SbIUzAkKYjYAKmNYwSRuJhBhH9o4ce6/X2ETO58VhXc=; b=TFpWTgbUCtrxvTpZ/by2hFy3DdQrk3GX1lvtTkTOxHoiTE9pGihx8lvXq0BN+i6e0I6Nz3 nFZrFD2Bn9FA6f3molfTPQxvSZEZeiFMIXUmQmRZKQn9AhDrdAHkXWfJHHRUxH1Z0XPGtr Nxo236RHTfRu3k4Nf427903HAjf1IAAzeUcARfrA2kKQh/zYfwKz+/RniYLJxG8RW+jmHz 14U9bzl8su/Mpi0ChAkvuSUvx91z/6zRQGtIZb5smND53tmIgamijMckn0+aI+E2wOl48Q iDiNTbcFcCusfClIyQgOzdbhV4CTN0KFmCa2FzMwE2B5Lg6iLnNA6GXj8H1J1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB9kf5Y43z95R for ; Thu, 07 May 2026 11:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39d39 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 11:58:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: ef19cae25337 - main - dtrace_mib.4: Document the DTrace MIB provider 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef19cae25337e7449f338914650bbfab0fbea99f Auto-Submitted: auto-generated Date: Thu, 07 May 2026 11:58:34 +0000 Message-Id: <69fc7e6a.39d39.72740059@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=ef19cae25337e7449f338914650bbfab0fbea99f commit ef19cae25337e7449f338914650bbfab0fbea99f Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-07-18 15:46:25 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-07 11:53:50 +0000 dtrace_mib.4: Document the DTrace MIB provider Reviewed by: kp MFC after: 1 week Obtained from: 60d8dbbef075 netinet: add a probe point for IP, IP6, ICMP, ICMP6, UDP and TCP stats counters Differential Revision: https://reviews.freebsd.org/D53709 --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 1 + sbin/sysctl/sysctl.8 | 3 +- share/man/man4/Makefile | 1 + share/man/man4/dtrace_ip.4 | 3 +- share/man/man4/dtrace_mib.4 | 123 +++++++++++++++++++++++++++ share/man/man4/dtrace_tcp.4 | 3 +- share/man/man4/icmp.4 | 3 +- share/man/man4/icmp6.4 | 3 +- share/man/man4/ifmib.4 | 3 +- share/man/man4/ip.4 | 3 +- share/man/man4/ipsec.4 | 3 +- share/man/man4/tcp.4 | 3 +- share/man/man4/udp.4 | 3 +- share/man/man7/stats.7 | 5 +- 14 files changed, 149 insertions(+), 11 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 45cb8c863f7a..e78b6e1875ae 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -1304,6 +1304,7 @@ in .Xr dtrace_ip 4 , .Xr dtrace_kinst 4 , .Xr dtrace_lockstat 4 , +.Xr dtrace_mib 4 , .Xr dtrace_pid 4 , .Xr dtrace_proc 4 , .Xr dtrace_priv 4 , diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8 index e0e35f075a78..b97bce320898 100644 --- a/sbin/sysctl/sysctl.8 +++ b/sbin/sysctl/sysctl.8 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 31, 2025 +.Dd May 7, 2026 .Dt SYSCTL 8 .Os .Sh NAME @@ -336,6 +336,7 @@ The option has been deprecated and is silently ignored. .Sh SEE ALSO .Xr sysctl 3 , +.Xr dtrace_mib 4 , .Xr loader.conf 5 , .Xr sysctl.conf 5 , .Xr security 7 , diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 44671c564239..b9c441e97597 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1023,6 +1023,7 @@ _dtrace_provs= dtrace_audit.4 \ dtrace_ip.4 \ dtrace_kinst.4 \ dtrace_lockstat.4 \ + dtrace_mib.4 \ dtrace_pid.4 \ dtrace_priv.4 \ dtrace_proc.4 \ diff --git a/share/man/man4/dtrace_ip.4 b/share/man/man4/dtrace_ip.4 index e9fbdfa3cf43..6faeb305ffc5 100644 --- a/share/man/man4/dtrace_ip.4 +++ b/share/man/man4/dtrace_ip.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 14, 2015 +.Dd May 7, 2026 .Dt DTRACE_IP 4 .Os .Sh NAME @@ -266,6 +266,7 @@ This provider is compatible with the providers found in Solaris and Darwin. .Sh SEE ALSO .Xr dtrace 1 , +.Xr dtrace_mib 4 , .Xr dtrace_tcp 4 , .Xr dtrace_udp 4 , .Xr ip 4 , diff --git a/share/man/man4/dtrace_mib.4 b/share/man/man4/dtrace_mib.4 new file mode 100644 index 000000000000..e8c2dd3a6f05 --- /dev/null +++ b/share/man/man4/dtrace_mib.4 @@ -0,0 +1,123 @@ +.\" +.\" Copyright (c) 2025-2026 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd May 7, 2026 +.Dt DTRACE_MIB 4 +.Os +.Sh NAME +.Nm dtrace_mib +.Nd a DTrace provider for Management Information Base +.Sh SYNOPSIS +.Cm mib: Ns Ar module Ns Cm \&:count: Ns Ar counter +.Pp +In +.Xr config 5 : +.Cd "options KDTRACE_MIB_SDT" +.Sh DESCRIPTION +The +.Nm mib +provider allows tracing of Management Information Base stats counters. +.Pp +The list of instrumented +.Ar module Ns s +includes: +.Bl -tag -offset indent -width ipcomp -compact +.It Cm ah +IP Authentication Header (RFC 2402), +.Xr ipsec 4 +.It Cm esp +IP Encapsulating Security Payload (RFC 1827, RFC 2406), +.Xr ipsec 4 +.It Cm icmp +.Xr icmp 4 +.It Cm icmp6 +.Xr icmp6 4 +.It Cm ip +.Xr ip 4 +.It Cm ip6 +.Xr ip6 4 +.It Cm ipcomp +IP Payload Compression Protocol, +.Xr ipsec 4 +.It Cm ipsec +.Xr ipsec 4 +.It Cm tcp +.Xr tcp 4 +.It Cm udp +.Xr udp 4 +.El +.Pp +The +.Cm mib: Ns Ar module Ns Cm \&:count: Ns Ar counter +probes fire when the +.Ar counter +in +.Ar module Ns s +increases. +.Pp +The first probe argument, +.Vt uint64_t Va args[0] , +is the increment that the +.Ar counter +will increase by. +.Pp +Note that some probes like +.Cm mib:esp:count:esps_hist +or +.Cm mib:icmp6:count:icp6s_outhist +provide additional probe-specific arguments. +.Sh EXAMPLES +.Ss Example 1 : Tracing IP Stats Counters +When debugging network issues one common clue is an unexpectedly +incrementing error counter. +This is helpful, in that it gives us an +idea of what might be going wrong, but often these counters may be +incremented in different functions. +.Pp +Trace all +.Nm mib +probes in the +.Xr ip 4 +module and print the current count and a stack trace: +.Pp +.Bd -literal -offset 2n +# dtrace -n 'mib:ip:count: { printf("%d", arg0); stack(); }' +dtrace: description 'mib:ip:count: ' matched 29 probes +CPU ID FUNCTION:NAME + 7 98784 count:ips_localout 1 + kernel`ip_output+0x17a2 + kernel`udp_send+0xaca + kernel`sosend_dgram+0x315 + kernel`sousrsend+0x79 + kernel`kern_sendit+0x1be + kernel`sendit+0x1ab + kernel`sys_sendmsg+0x5b + kernel`amd64_syscall+0x169 + kernel`0xffffffff81094b8b +.Ed +.Sh SEE ALSO +.Xr dtrace 1 , +.Xr dtrace_ip 4 , +.Xr dtrace_tcp 4 , +.Xr dtrace_udp 4 , +.Xr tracing 7 , +.Xr sysctl 8 +.Sh STANDARDS +The probe descriptions in +the +.Fx +.Nm mib +provider are not compatible with those in the Solaris/illumos mib provider. +.Sh AUTHORS +.An -nosplit +The +.Nm mib +provider was added to +.Fx +by +.An Kristof Provost Aq Mt kp@FreeBSD.org . +.Pp +This manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . diff --git a/share/man/man4/dtrace_tcp.4 b/share/man/man4/dtrace_tcp.4 index af57f6e94a63..5570dd965706 100644 --- a/share/man/man4/dtrace_tcp.4 +++ b/share/man/man4/dtrace_tcp.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 2, 2023 +.Dd May 7, 2026 .Dt DTRACE_TCP 4 .Os .Sh NAME @@ -501,6 +501,7 @@ provider in Solaris. .Sh SEE ALSO .Xr dtrace 1 , .Xr dtrace_ip 4 , +.Xr dtrace_mib 4 , .Xr dtrace_sctp 4 , .Xr dtrace_udp 4 , .Xr dtrace_udplite 4 , diff --git a/share/man/man4/icmp.4 b/share/man/man4/icmp.4 index c8c92a794e24..493d2d218cec 100644 --- a/share/man/man4/icmp.4 +++ b/share/man/man4/icmp.4 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 11, 2024 +.Dd May 7, 2026 .Dt ICMP 4 .Os .Sh NAME @@ -264,6 +264,7 @@ exists. .Xr recv 2 , .Xr send 2 , .Xr sysctl 3 , +.Xr dtrace_mib 4 , .Xr inet 4 , .Xr intro 4 , .Xr ip 4 , diff --git a/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4 index 8730e3fefacb..d9a8bd34a81a 100644 --- a/share/man/man4/icmp6.4 +++ b/share/man/man4/icmp6.4 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 1, 2018 +.Dd May 7, 2026 .Dt ICMP6 4 .Os .Sh NAME @@ -243,6 +243,7 @@ structure as the option value. .Xr setsockopt 2 , .Xr socket 2 , .Xr getprotobyname 3 , +.Xr dtrace_mib 4 , .Xr inet6 4 , .Xr ip6 4 , .Xr netintro 4 diff --git a/share/man/man4/ifmib.4 b/share/man/man4/ifmib.4 index 20b5613b6873..48e79c1f9411 100644 --- a/share/man/man4/ifmib.4 +++ b/share/man/man4/ifmib.4 @@ -25,7 +25,7 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 26, 2020 +.Dd May 7, 2026 .Dt IFMIB 4 .Os .Sh NAME @@ -165,6 +165,7 @@ and implements a superset of the MIB for Ethernet-like networks. .Sh SEE ALSO .Xr sysctl 3 , +.Xr dtrace_mib 4 , .Xr intro 4 , .Xr ifnet 9 .\" .Xr ethermib 4 , diff --git a/share/man/man4/ip.4 b/share/man/man4/ip.4 index fb5ea398c840..140866f6fcf6 100644 --- a/share/man/man4/ip.4 +++ b/share/man/man4/ip.4 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 9, 2021 +.Dd May 7, 2026 .Dt IP 4 .Os .Sh NAME @@ -907,6 +907,7 @@ field was not equal to the length of the datagram written to the socket. .Xr byteorder 3 , .Xr CMSG_DATA 3 , .Xr sourcefilter 3 , +.Xr dtrace_mib 4 , .Xr icmp 4 , .Xr igmp 4 , .Xr inet 4 , diff --git a/share/man/man4/ipsec.4 b/share/man/man4/ipsec.4 index 9fd6207c2f14..0c60e0e3c121 100644 --- a/share/man/man4/ipsec.4 +++ b/share/man/man4/ipsec.4 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 4, 2025 +.Dd May 7, 2026 .Dt IPSEC 4 .Os .Sh NAME @@ -336,6 +336,7 @@ routines from looking into the IP payload. .Xr socket 2 , .Xr ipsec_set_policy 3 , .Xr crypto 4 , +.Xr dtrace_mib 4 , .Xr enc 4 , .Xr icmp6 4 , .Xr if_ipsec 4 , diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4 index 3c9f4ff83f3d..4c01daf4e14e 100644 --- a/share/man/man4/tcp.4 +++ b/share/man/man4/tcp.4 @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 5, 2025 +.Dd May 7, 2026 .Dt TCP 4 .Os .Sh NAME @@ -1098,6 +1098,7 @@ when trying to use a TCP function block that is not available; .Xr stats 3 , .Xr sysctl 3 , .Xr blackhole 4 , +.Xr dtrace_mib 4 , .Xr inet 4 , .Xr intro 4 , .Xr ip 4 , diff --git a/share/man/man4/udp.4 b/share/man/man4/udp.4 index b1dbff56154f..db9d0e0ae2c7 100644 --- a/share/man/man4/udp.4 +++ b/share/man/man4/udp.4 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 20, 2025 +.Dd May 7, 2026 .Dt UDP 4 .Os .Sh NAME @@ -175,6 +175,7 @@ exists. .Xr send 2 , .Xr socket 2 , .Xr blackhole 4 , +.Xr dtrace_mib 4 , .Xr inet 4 , .Xr intro 4 , .Xr ip 4 , diff --git a/share/man/man7/stats.7 b/share/man/man7/stats.7 index 0b57d525522c..f81c2fef0155 100644 --- a/share/man/man7/stats.7 +++ b/share/man/man7/stats.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 28, 2025 +.Dd May 7, 2026 .Dt STATS 7 .Os .Sh NAME @@ -44,6 +44,8 @@ are currently included in the base system, with more appearing periodically. Show Bluetooth socket information .It Nm ctlstat CAM Target Layer statistics utility +.It Nm dtrace_mib +Access the MIB stats counters with DTrace .It Nm dwatch Watch processes as they trigger a particular DTrace probe .It Nm fstat @@ -99,6 +101,7 @@ Report ZFS I/O statistics .Xr sockstat 1 , .Xr stat 1 , .Xr systat 1 , +.Xr dtrace_mib 4 , .Xr intro 7 , .Xr tuning 7 , .Xr ctlstat 8 , From nobody Thu May 7 11:59:29 2026 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 4gB9lj6SYDz6c96x for ; Thu, 07 May 2026 11:59:29 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gB9lj3KXbz3sx0 for ; Thu, 07 May 2026 11:59:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778155169; 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=27lrEmY1Z9Zo+eVBSgTLwKY7jiW3CH9L3eJjU12d0tk=; b=NYyYSV+2UQ2AO1Ku2ZiqDMYY6hcrUKPS27L/Jn7vRfGtnq1kdKfr4jWopwuVticVWVhAWj PDj5pc3A1NC8MqHexPJvNifreOrIZ8dHxz40jZf07B8K6Q2UiQxrOEkj+VzzoPRNpXRVW1 FVqO9ZnVJx4ba0mMTRqocuGvu8yyl7fVQUumrkguwp9iSXs9T7ODeD1yMiSdF7rVXKl8YG VxQoMVLAKq75PSZmp5UTnMgpmncyQYbFvJXykhgHuVTp/aA5F46Y+hzuaEeksEwmfqg96u LQRJ4QQ18TLtYbt2rDh8eOmrPsKbXiOrJNw4UYsnrn/yIkNLK6qURyInsUpryA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778155169; a=rsa-sha256; cv=none; b=G63FaK0RLxMau1/w/CulKCLe6UXJcM/ARBDRfrLeBlsCZAIAfDfOoeIepKt5DReAgJmhcN XZ7L860ZZduh72V2E5sw9PW0byvuc0LxiiV0hUBfvcoQhY0mi6zNYW2ue3wwkcSWf6AYXP LiXSIzXluhUDqtiRL0JeCf55eZ/dVldgA4ezKy4SO5CgMNOOMpYK+3K7aYDw2tRvqHo1/1 i3vVEZfHYHP+AETQIFEFKfNfN2K+WBKHT14oaZ3K/1rYBxoA9HPCfvFGzJJxO3lmo63ub9 KmpZVRqgRS424CC3fYusJ2IEW9WGFPfMxvPoTj0S5kCF6PglHOdYBtmixGFFLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778155169; 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=27lrEmY1Z9Zo+eVBSgTLwKY7jiW3CH9L3eJjU12d0tk=; b=wFup6dMrlUSpScE+a3OTgbpOz4O2ya/OmnBZzHoVWwoybtGoYw79chwxH4E7jP+sIlIUN0 MJ3fTL98XA7hLYtnzXOIsBFY6R/lX69dQ5Nsa9PXjkI0zw8A0RgdnEM7+88CzQi2Gbd6qq 5jepDzv13a7zKzCV8E2N1NBcD/XLSFKGOezGz84u/UxJpMFvkl2IiW7bcw3VtoV30cTFuV JYCaeOpTFedvlkyyvLdW3NFfopMEOA1QOAn+YJe5irmpFW1U5BvoUl/M4elv4RCnu2pPCf CaWNae+VrN3OLLZEEjxcgCwXPSwz06uDbiG9KBvPf+UM6vOxkV+ESs6pbS7IDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB9lj2Wbvz95S for ; Thu, 07 May 2026 11:59:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38277 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 11:59:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ce4e8c478a26 - main - bufspace_wait(): only try to help bufdaemon if there is a chance to help 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce4e8c478a261ce6c7af7d81817f86420c5239b9 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 11:59:29 +0000 Message-Id: <69fc7ea1.38277.2ead2076@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ce4e8c478a261ce6c7af7d81817f86420c5239b9 commit ce4e8c478a261ce6c7af7d81817f86420c5239b9 Author: Konstantin Belousov AuthorDate: 2026-04-22 05:09:34 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-07 11:59:11 +0000 bufspace_wait(): only try to help bufdaemon if there is a chance to help Only call buf_flush() if there are some dirty buffers belonging to the vnode we are allocating the buffer for. Otherwise the bd dirty queue scan cannot find anything and it makes no sense to spend CPU doing it. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/kern/vfs_bio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 8f47a7abbc5e..675f6fb4e526 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -727,7 +727,8 @@ bufspace_wait(struct bufdomain *bd, struct vnode *vp, int gbflags, BD_LOCK(bd); while (bd->bd_wanted) { if (vp != NULL && vp->v_type != VCHR && - (td->td_pflags & TDP_BUFNEED) == 0) { + (td->td_pflags & TDP_BUFNEED) == 0 && + vp->v_bufobj.bo_dirty.bv_cnt > 0) { BD_UNLOCK(bd); /* * getblk() is called with a vnode locked, and From nobody Thu May 7 13:14:07 2026 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 4gBCPq5BMhz6cGpD for ; Thu, 07 May 2026 13:14: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBCPq4Sb2z43hX for ; Thu, 07 May 2026 13:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778159647; 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=cJ4idQMj7MKg7KjOqTH1Ebclw1pJfo4Uqby/yk1kM5M=; b=Efx/wk2mUkZHZuAZ/k0FGuSBQxWpE2Q7HBq3m3cvaoMz5II8FYq4llg2UvD13+j07Z1vPM egg1rIEx5K6cdLmNNrRRhjHrsdVTF3a/ypBIgnVGPALgB+74nk3dWj8kmwySvm6Efk2hMH Bm1j1HKsIMDsPEZOYYGdabbUmvchqYRa261u20skaOBhOhRJV00jy/sDieXpFufZ0+LDwn YkA3OoLb34lQzvuLEfCHGJQ7XX1SGUvw/89b8IcnJvZWIhV1urFxqJukits6B0XBhWF96y kTxAo6NGc3OP/2ECk9/tjvdANrkjTWsXLKRa3503N2wL3rIPEy2A/Elzhhu0eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778159647; a=rsa-sha256; cv=none; b=W2lTdDhScgoMb2RpL8/K2wy0eT99HLQ1WH1sKyXuO+ArS9BiBaaMlyi1wOG8VzmXMYLwNK zaRl/sjO+/YZcmLW9kDw0D0i1ljNHuvfCkvna99/+bPy11RId5pRLi9t4edDgE7h5p4+SE fawX+ZYseteBj2rqJMXhlDy7MMujyzZx3BbhTeUrZjUGasMpxvbZwZVzntv3aPxzxVWQ62 ESi7OYYWpBLXIqZW4CJ4L/S67fG5kOTCS9Ev7v484SsLvc2VOD9oHbGuMaQ3kj9QdBKfQX mmWMhO4gGTP+hxZH8GRH1ev8wo3BkDlczQz7qJ1h90CywbfwoEC6Oajfx7B1RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778159647; 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=cJ4idQMj7MKg7KjOqTH1Ebclw1pJfo4Uqby/yk1kM5M=; b=SYo5mY1t2uSdEvoZ/UCmukK51EqXEVowhJpUyQkl4gO70bSxu8uhNH2g+rpCGc2cHXe7GL Jl/VVH/TrYW8t/d9Pj98RkRfIkBwm06KDG6DGFuOd1xTMWXdBnLO0lsOCJvravn2iE6xYh tqCXDMWDdth0RUMsyitb7GWe7e2iTkTkEIJDEJmzRjAlMdVw7KqQx1spIyQwaN1G6JZ7j2 n3hZ1cHRIlIl5FitPZzfJKwE3KgRqSSTq5Oc6Lz2Sg/jai24hOQhGybN7Qmm6Gw3tHyHN/ DBOcNKOgqyAXUgybPESo1z2mG2YXR157sU/7GS7T1GZv1HqTxj1n9Ke1F49nHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBCPq42G8zBnC for ; Thu, 07 May 2026 13:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a4d1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 13:14:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 640af0d9067b - main - cam: Cross-reference dtrace_cam.4 and cam.4 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 640af0d9067bee6e8f300c158f0cf928e666977c Auto-Submitted: auto-generated Date: Thu, 07 May 2026 13:14:07 +0000 Message-Id: <69fc901f.1a4d1.24894f23@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=640af0d9067bee6e8f300c158f0cf928e666977c commit 640af0d9067bee6e8f300c158f0cf928e666977c Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-05-07 13:11:13 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-07 13:13:47 +0000 cam: Cross-reference dtrace_cam.4 and cam.4 While here, remove empty sections from cam.4. MFC after: 3 days Fixes: 1a7151f79664 cam: Add probes for xpt actions --- share/man/man4/dtrace_cam.4 | 6 ++---- share/man/man4/scsi.4 | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/man/man4/dtrace_cam.4 b/share/man/man4/dtrace_cam.4 index e5b7ae34c391..8e2790e72d22 100644 --- a/share/man/man4/dtrace_cam.4 +++ b/share/man/man4/dtrace_cam.4 @@ -2,7 +2,7 @@ .\" .\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd December 26, 2025 +.Dd May 7, 2026 .Dt DTRACE_CAM 4 .Os .Sh NAME @@ -25,11 +25,9 @@ probe fires when that request completes. The .Fn cam::xpt:async-cb probe fires just before an async callback is called. -.Sh ARGUMENTS -.Sh FILES -.Sh EXAMPLES .Sh SEE ALSO .Xr dtrace 1 , +.Xr cam 4 , .Xr SDT 9 .Sh HISTORY The diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4 index e66fccf53e64..b6390fec646e 100644 --- a/share/man/man4/scsi.4 +++ b/share/man/man4/scsi.4 @@ -22,7 +22,7 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.Dd December 11, 2025 +.Dd May 7, 2026 .Dt CAM 4 .Os .Sh NAME @@ -530,6 +530,8 @@ for details. .\" .Xr ps3cdrom 4 , .Xr sbp 4 , .Xr twa 4 +.It Sy DTrace Providers: +.Xr dtrace_cam 4 .El .Sh HISTORY The From nobody Thu May 7 14:23:12 2026 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 4gBDxX42JVz6cMZf for ; Thu, 07 May 2026 14:23:12 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBDxX3L8Gz3Bnk for ; Thu, 07 May 2026 14:23:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778163792; 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=0/fGZizJpvRdw4uKOe+pEqWnQfWC55ur+3t2fPHn6xs=; b=PY/PufbX8olGoH8zusBXJuT6KT6EAa+UsfYeMdlD4Bzntj7iRURaORwdn6bZzF9vQrr+6j dWR6iQMRRqv5KWXCME99xqPpjm7pbB6yAoIWe5fZxyQSy183GpVo751BGxqTKGDjkvQYKp 3wfgLbJlJGFawAV35mK5g6EoPCzWMjpUeZmcaa8W8hF6ZFUjahbVjv0j9eMX3YkJAK4NX4 cSau5a2hPWBZv5IXw9VKAlblHEGo6hb0290HNyR3acMyeamxaWLnHh1vWEb18G/miu2r7l GmTr0QpIrM6+T+vegzu+0xcFc2QLxm4++LCuzgnKSahykgDJxx/OuGZ1RUWeVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778163792; a=rsa-sha256; cv=none; b=U7hRh6NU6E1vFqO6Sag6ehOIDJV8xpQ4ppOH08Cc3VpBZME7gcSR5dFKOesqAK8skcXEtI HzaKSFqJp+qJRZhhKgcWHd5QtVr3k/ZEILGXrFhkPNi+hCgJB3PyddpFgXBanRLvEIa0du Xr+0leOgMD1YdntdgoNyq3rxx4L49SFzKiAlSCIgUkf1IozuTZzYygeo8NsJAlijtII+aa OY8cIJ5V4NCQ8gB2D3k7/D2VdhcxPMYpuoRisO/6RbTq8iZmiO1m5xPYeUfUqp3V8y3pMb FP4NXy/tb11z3cdvZ4nGin4BYodSG32DaaCKeS5WotF6ieJw9iV7rMMDgi6VfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778163792; 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=0/fGZizJpvRdw4uKOe+pEqWnQfWC55ur+3t2fPHn6xs=; b=qDJsbR1JY28f0XhUBGSmc0bK2JQPDHnjXCL8Fkjt9f2vXNtBGpgLXr3Kce46BSVrbUSCHw sPfgZ85Ig9egGqUph1gfyKoMCcGB7wqbCLXM5oPhSNVvfSQN2cyMyku/7e9OXP3r5aUeDC lY1yQpVYjrwsZjfCZiM9eUNdf8U7DqBHJtdi4VQKRChu43vrYhDJ/q8EZ5tjE3SLGZL73V R+L7aOdfbZVV9Sr0D1Mgb2lJbT9GJeaHQXReFWW03MM7ILD8oKocnVWel7NNultIA7llp0 x4Yh3QHVYIM7AB3KttLPwbIzxkS99aRNRGDGGG28588UDGKv/X80qYgWkOXMhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBDxX2ttZzTtc for ; Thu, 07 May 2026 14:23:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 223c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 14:23:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 2b9301a22bc6 - main - d.7: Document macro variables 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b9301a22bc677239d3c0dc783d970f17e7ca294 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 14:23:12 +0000 Message-Id: <69fca050.223c2.1cd02282@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=2b9301a22bc677239d3c0dc783d970f17e7ca294 commit 2b9301a22bc677239d3c0dc783d970f17e7ca294 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-05-07 14:20:46 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-07 14:20:46 +0000 d.7: Document macro variables MFC after: 1 week --- share/man/man7/d.7 | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/share/man/man7/d.7 b/share/man/man7/d.7 index 59b3389b121b..792f6d36ce73 100644 --- a/share/man/man7/d.7 +++ b/share/man/man7/d.7 @@ -1,9 +1,9 @@ .\" .\" SPDX-License-Identifier: BSD-2-Clause .\" -.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" Copyright (c) 2025-2026 Mateusz Piotrowski <0mp@FreeBSD.org> .\" -.Dd October 28, 2025 +.Dd May 7, 2026 .Dt D 7 .Os .Sh NAME @@ -39,6 +39,41 @@ This manual page serves as a short reference of the language. Refer to books listed in .Sx SEE ALSO for a complete reference. +.Sh MACRO VARIABLES +.Bl -column "$1, $2, $3, ..." "Syntax" +.It Sy Name Ta Sy Description +.It Va $1 , $2 , $3 , .\&.\&. Ta Macro arguments +.It Va $egid Ta Effective group ID Pq Xr getegid 2 +.It Va $euid Ta Effective user ID Pq Xr geteuid 2 +.It Va $gid Ta Real group ID Pq Xr getgid 2 +.It Va $pid Ta Process ID Pq Xr getpid 2 +.It Va $pgid Ta Process group ID Pq Xr getpgrp 2 +.It Va $ppid Ta Parent process ID Pq Xr getppid 2 +.It Va $sid Ta Session ID Pq Xr getsid 2 +.It Va $target Ta Target process ID of the process +specified via the +.Fl p +flag or created via the +.Fl c +flag. +.It Va $uid Ta Real user ID Pq Xr getuid 2 +.El +.Pp +The macro arguments correspond to the command-line operands. +They expand to an integer, identifier, or string depending on the context. +Prepending a macro argument with an extra dollar sign +.Pq Ql $ +forces string expansion. +.Pp +For example, +.Bd -literal -compact -offset indent +dtrace -n 'syscall::fstatat: /execname == $$1/ {}' -- ls +.Ed +uses +.Va $$1 +instead of +.Va $1 +to expand to a string instead rather than to a global variable identifier. .Sh PROBE'S DESCRIPTION A probe's description consists of four elements: .Sm off @@ -411,3 +446,10 @@ variable which typically provides the current working directory is not supported on .Fx at the moment. +.Pp +Macro variables +.Va $projid +and +.Va $taskid +are always 0 on +.Fx . From nobody Thu May 7 16:24:01 2026 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 4gBHcx4FG1z6cp2v for ; Thu, 07 May 2026 16:24:01 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBHcx3kRcz3ZmJ for ; Thu, 07 May 2026 16:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778171041; 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=ph1vOjhk+azFvM9SPwBdv8JCLjXZdNlHibpWZltyHIE=; b=C5OZWMn5BXFjuyI8+fGoxqjMFpjerzSCrNTJalH+KsbiClJsCCnfhcHZGldiemJyOFF49L p3IkcHjT33aiqwUnSxKOuqsFCfL6DH3CWo+50fhugg0kIMoP28u7oWLfcFVBmuh2rIIGjm dKoclQjie4YXWemFLLTIoU3Xy7Z4v9QSh6SVOWVdTjWDvGtosyd8G9HPkJ7YgV6lnkqkpO e9t8+wEtzsjLvhV7t1oPUU3KYecAjiBOO3rK+peeRGyzwD7QSfZcgVLk4rZ8ESm1GPs9Ao H6+vbV4Z3yLJGY/sx40PnR2E0QSWnl2OIfPUIIA6mx6+urfncfduKMWePsvcUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778171041; a=rsa-sha256; cv=none; b=XONh/Jz0tvtQFxLjawGT/hOZqGprclJurKTgxSXI4WdY4YP+ss5cw9fDy9raoRH3zWmYvw yh1RPffTwH07jb+J2172XMV0wYVND2aGpULLN3Cugd4Tkm9wsRIBS4EWB+r2X6+SQNuXnT UlQV0/s1i5XaYy3hbTHKR0PhRZWmGXa/C01/Uu6HGgFxet22qelrfyRUMTKCheeIlaED9/ MsRQtvhjBkvQB55ZvWykC+FAN/AGs+3luatALVYX7h791uREYJ0ttc+7WbQmLTFCTiiz+5 38xM2xHH6kI4YPbULmBO68w41tsfWdWPAqJN5ru+sWASkdl5FwkILJtmiIx7Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778171041; 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=ph1vOjhk+azFvM9SPwBdv8JCLjXZdNlHibpWZltyHIE=; b=p3XpoPRvr3A4WkzBEIXavUz5Xtc7b5mCglQznrSkHJZhAKaRffeA7OwlK3EHdEH+Si7qTr sZryW6MElHdShHBQSELAEMiNS5GKR3ssORwOMtOMyjFyfb6GgFxX+FM7PKAhjmfZJ/HxIO h4F96WkalQ/ld84fXCrh0QiiuVGSRpbdnsvPs9oONZBfukt5ZaJRgC3hYfcfXkmwg9+FIP VnkNv7Rf6whAo58wbcgH/jrPaEqqCBRPsBTKPM3YeGwU00BaFaVOa59VNIvIknsejh6029 Q5iRH5Rusi+jiX+oHiv0DyESbWi5hCRoMYoVaBihWBAYa4OAy23zMiU4+6j/0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBHcx3JSZzZwN for ; Thu, 07 May 2026 16:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37289 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 16:24:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 726ff260ecfa - main - pfctl: optionally print the rule in the state overview 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 726ff260ecfa38878aec982456c44ddb0f9c791b Auto-Submitted: auto-generated Date: Thu, 07 May 2026 16:24:01 +0000 Message-Id: <69fcbca1.37289.79d664df@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=726ff260ecfa38878aec982456c44ddb0f9c791b commit 726ff260ecfa38878aec982456c44ddb0f9c791b Author: Kristof Provost AuthorDate: 2026-05-05 12:42:16 +0000 Commit: Kristof Provost CommitDate: 2026-05-07 15:06:56 +0000 pfctl: optionally print the rule in the state overview When dumping states optionally (at '-vv') also show the rule which created the state. This can be helpful if the ruleset changed and we want to know what rule created the state. Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 4 + lib/libpfctl/libpfctl.h | 2 + sbin/pfctl/pf_print_state.c | 4 + sbin/pfctl/pfctl.c | 3 + sys/netpfil/pf/pf_nl.c | 189 +++++++++++++++++++++++--------------- sys/netpfil/pf/pf_nl.h | 2 + tests/sys/netpfil/pf/get_state.sh | 44 +++++++++ tests/sys/netpfil/pf/killstate.sh | 2 +- 8 files changed, 173 insertions(+), 77 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index ac60a924c228..4e51167b401a 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -1929,6 +1929,8 @@ static const struct snl_attr_parser nla_p_skey[] = { SNL_DECLARE_ATTR_PARSER(skey_parser, nla_p_skey); #undef _OUT +SNL_DECLARE_ATTR_PARSER(rule_parser, ap_getrule); + #define _IN(_field) offsetof(struct genlmsghdr, _field) #define _OUT(_field) offsetof(struct pfctl_state, _field) static struct snl_attr_parser ap_state[] = { @@ -1963,6 +1965,7 @@ static struct snl_attr_parser ap_state[] = { { .type = PF_ST_RT_IFNAME, .off = _OUT(rt_ifname), .cb = snl_attr_store_ifname }, { .type = PF_ST_SRC_NODE_FLAGS, .off = _OUT(src_node_flags), .cb = snl_attr_get_uint8 }, { .type = PF_ST_RT_AF, .off = _OUT(rt_af), .cb = snl_attr_get_uint8 }, + { .type = PF_ST_CREATED_BY_RULE, .off = _OUT(created_by_rule), .arg = &rule_parser, .cb = snl_attr_get_nested }, }; #undef _IN #undef _OUT @@ -1988,6 +1991,7 @@ pfctl_get_states_h(struct pfctl_handle *h, struct pfctl_state_filter *filter, pf snl_add_msg_attr_u8(&nw, PF_ST_AF, filter->af); snl_add_msg_attr_ip6(&nw, PF_ST_FILTER_ADDR, &filter->addr.v6); snl_add_msg_attr_ip6(&nw, PF_ST_FILTER_MASK, &filter->mask.v6); + snl_add_msg_attr_bool(&nw, PF_ST_INCLUDE_RULE, filter->include_rule); hdr = snl_finalize_msg(&nw); if (hdr == NULL) diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 1012be53db65..3080209ec7a0 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -406,6 +406,7 @@ struct pfctl_state { char rt_ifname[IFNAMSIZ]; sa_family_t rt_af; uint8_t src_node_flags; + struct pfctl_rule created_by_rule; }; TAILQ_HEAD(pfctl_statelist, pfctl_state); @@ -504,6 +505,7 @@ struct pfctl_state_filter { sa_family_t af; struct pf_addr addr; struct pf_addr mask; + bool include_rule; }; typedef int (*pfctl_get_state_fn)(struct pfctl_state *, void *); int pfctl_get_states_iter(pfctl_get_state_fn f, void *arg); diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c index 1c5a46f86b35..9b0c57fd73d3 100644 --- a/sbin/pfctl/pf_print_state.c +++ b/sbin/pfctl/pf_print_state.c @@ -434,6 +434,10 @@ print_state(struct pfctl_state *s, int opts) if (strcmp(s->ifname, s->orig_ifname) != 0) printf(" origif: %s\n", s->orig_ifname); + + printf(" rule: "); + print_rule(&s->created_by_rule, "", 0, 0); + printf("\n"); } } diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index f35baf25ec35..c349487ed9d2 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1996,6 +1996,9 @@ pfctl_show_states(int dev, const char *iface, int opts) if (iface != NULL) strlcpy(filter.ifname, iface, IFNAMSIZ); + if (opts & PF_OPT_VERBOSE2) + filter.include_rule = true; + arg.opts = opts; arg.dotitle = opts & PF_OPT_SHOWALL; arg.iface = iface; diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index e4ce9e64f637..d1beb7681c21 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -51,8 +51,11 @@ #include _DECLARE_DEBUG(LOG_DEBUG); +static bool nlattr_add_labels(struct nl_writer *nw, int attrtype, + const struct pf_krule *r); +static bool nlattr_add_rule(struct nl_writer *nw, const struct pf_krule *rule); static bool nlattr_add_pf_threshold(struct nl_writer *, int, - struct pf_kthreshold *); + const struct pf_kthreshold *); struct nl_parsed_state { uint8_t version; @@ -63,6 +66,7 @@ struct nl_parsed_state { sa_family_t af; struct pf_addr addr; struct pf_addr mask; + bool include_rule; }; #define _IN(_field) offsetof(struct genlmsghdr, _field) @@ -75,6 +79,7 @@ static const struct nlattr_parser nla_p_state[] = { { .type = PF_ST_PROTO, .off = _OUT(proto), .cb = nlattr_get_uint16 }, { .type = PF_ST_FILTER_ADDR, .off = _OUT(addr), .cb = nlattr_get_in6_addr }, { .type = PF_ST_FILTER_MASK, .off = _OUT(mask), .cb = nlattr_get_in6_addr }, + { .type = PF_ST_INCLUDE_RULE, .off = _OUT(include_rule), .cb = nlattr_get_bool }, }; static const struct nlfield_parser nlf_p_generic[] = { { .off_in = _IN(version), .off_out = _OUT(version), .cb = nlf_get_u8 }, @@ -146,8 +151,26 @@ dump_state_key(struct nl_writer *nw, int attr, const struct pf_state_key *key) return (true); } +static bool +nlattr_add_rule_nested(struct nl_writer *nw, int attr, const struct pf_krule *r) +{ + int off; + bool ret; + + off = nlattr_add_nested(nw, attr); + if (off == 0) + return (false); + + ret = nlattr_add_rule(nw, r); + + nlattr_set_len(nw, off); + + return (ret); +} + static int -dump_state(struct nlpcb *nlp, const struct nlmsghdr *hdr, struct pf_kstate *s, +dump_state(struct nlpcb *nlp, const struct nlmsghdr *hdr, + struct nl_parsed_state *attrs, struct pf_kstate *s, struct nl_pstate *npt) { struct nl_writer *nw = npt->nw; @@ -231,6 +254,9 @@ dump_state(struct nlpcb *nlp, const struct nlmsghdr *hdr, struct pf_kstate *s, if (!dump_state_peer(nw, PF_ST_PEER_DST, &s->dst)) goto enomem; + if (attrs->include_rule && s->rule != NULL) + nlattr_add_rule_nested(nw, PF_ST_CREATED_BY_RULE, s->rule); + if (nlmsg_end(nw)) return (0); @@ -282,7 +308,7 @@ handle_dumpstates(struct nlpcb *nlp, struct nl_parsed_state *attrs, &attrs->mask, &attrs->addr, af)) continue; - error = dump_state(nlp, hdr, s, npt); + error = dump_state(nlp, hdr, attrs, s, npt); if (error != 0) break; } @@ -307,7 +333,7 @@ handle_getstate(struct nlpcb *nlp, struct nl_parsed_state *attrs, s = pf_find_state_byid(attrs->id, attrs->creatorid); if (s == NULL) return (ENOENT); - ret = dump_state(nlp, hdr, s, npt); + ret = dump_state(nlp, hdr, attrs, s, npt); PF_STATE_UNLOCK(s); return (ret); @@ -465,7 +491,8 @@ NL_DECLARE_ATTR_PARSER(rule_addr_parser, nla_p_ruleaddr); #undef _OUT static bool -nlattr_add_rule_addr(struct nl_writer *nw, int attrtype, struct pf_rule_addr *r) +nlattr_add_rule_addr(struct nl_writer *nw, int attrtype, + const struct pf_rule_addr *r) { struct pf_addr_wrap aw = {0}; int off = nlattr_add_nested(nw, attrtype); @@ -687,7 +714,8 @@ nlattr_get_nested_timeouts(struct nlattr *nla, struct nl_pstate *npt, const void } static bool -nlattr_add_timeout(struct nl_writer *nw, int attrtype, uint32_t *timeout) +nlattr_add_timeout(struct nl_writer *nw, int attrtype, + const uint32_t *timeout) { int off = nlattr_add_nested(nw, attrtype); @@ -875,76 +903,10 @@ out: return (error); } -struct nl_parsed_get_rule { - char anchor[MAXPATHLEN]; - uint8_t action; - uint32_t nr; - uint32_t ticket; - uint8_t clear; -}; -#define _OUT(_field) offsetof(struct nl_parsed_get_rule, _field) -static const struct nlattr_parser nla_p_getrule[] = { - { .type = PF_GR_ANCHOR, .off = _OUT(anchor), .arg = (void *)MAXPATHLEN, .cb = nlattr_get_chara }, - { .type = PF_GR_ACTION, .off = _OUT(action), .cb = nlattr_get_uint8 }, - { .type = PF_GR_NR, .off = _OUT(nr), .cb = nlattr_get_uint32 }, - { .type = PF_GR_TICKET, .off = _OUT(ticket), .cb = nlattr_get_uint32 }, - { .type = PF_GR_CLEAR, .off = _OUT(clear), .cb = nlattr_get_uint8 }, -}; -#undef _OUT -NL_DECLARE_PARSER(getrule_parser, struct genlmsghdr, nlf_p_empty, nla_p_getrule); - -static int -pf_handle_getrule(struct nlmsghdr *hdr, struct nl_pstate *npt) +static bool +nlattr_add_rule(struct nl_writer *nw, const struct pf_krule *rule) { - char anchor_call[MAXPATHLEN]; - struct nl_parsed_get_rule attrs = {}; - struct nl_writer *nw = npt->nw; - struct genlmsghdr *ghdr_new; - struct pf_kruleset *ruleset; - struct pf_krule *rule; - u_int64_t src_nodes_total = 0; - int rs_num; - int error; - - error = nl_parse_nlmsg(hdr, &getrule_parser, npt, &attrs); - if (error != 0) - return (error); - - if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) - return (ENOMEM); - - ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); - ghdr_new->cmd = PFNL_CMD_GETRULE; - - PF_RULES_WLOCK(); - ruleset = pf_find_kruleset(attrs.anchor); - if (ruleset == NULL) { - PF_RULES_WUNLOCK(); - error = ENOENT; - goto out; - } - - rs_num = pf_get_ruleset_number(attrs.action); - if (rs_num >= PF_RULESET_MAX) { - PF_RULES_WUNLOCK(); - error = EINVAL; - goto out; - } - - if (attrs.ticket != ruleset->rules[rs_num].active.ticket) { - PF_RULES_WUNLOCK(); - error = EBUSY; - goto out; - } - - rule = TAILQ_FIRST(ruleset->rules[rs_num].active.ptr); - while ((rule != NULL) && (rule->nr != attrs.nr)) - rule = TAILQ_NEXT(rule, entries); - if (rule == NULL) { - PF_RULES_WUNLOCK(); - error = EBUSY; - goto out; - } + u_int64_t src_nodes_total = 0; nlattr_add_rule_addr(nw, PF_RT_SRC, &rule->src); nlattr_add_rule_addr(nw, PF_RT_DST, &rule->dst); @@ -1050,6 +1012,81 @@ pf_handle_getrule(struct nlmsghdr *hdr, struct nl_pstate *npt) nlattr_add_u8(nw, PF_RT_SOURCE_LIMIT, rule->sourcelim.id); nlattr_add_u32(nw, PF_RT_SOURCE_LIMIT_ACTION, rule->sourcelim.limiter_action); + return (true); +} + +struct nl_parsed_get_rule { + char anchor[MAXPATHLEN]; + uint8_t action; + uint32_t nr; + uint32_t ticket; + uint8_t clear; +}; +#define _OUT(_field) offsetof(struct nl_parsed_get_rule, _field) +static const struct nlattr_parser nla_p_getrule[] = { + { .type = PF_GR_ANCHOR, .off = _OUT(anchor), .arg = (void *)MAXPATHLEN, .cb = nlattr_get_chara }, + { .type = PF_GR_ACTION, .off = _OUT(action), .cb = nlattr_get_uint8 }, + { .type = PF_GR_NR, .off = _OUT(nr), .cb = nlattr_get_uint32 }, + { .type = PF_GR_TICKET, .off = _OUT(ticket), .cb = nlattr_get_uint32 }, + { .type = PF_GR_CLEAR, .off = _OUT(clear), .cb = nlattr_get_uint8 }, +}; +#undef _OUT +NL_DECLARE_PARSER(getrule_parser, struct genlmsghdr, nlf_p_empty, nla_p_getrule); + +static int +pf_handle_getrule(struct nlmsghdr *hdr, struct nl_pstate *npt) +{ + char anchor_call[MAXPATHLEN]; + struct nl_parsed_get_rule attrs = {}; + struct nl_writer *nw = npt->nw; + struct genlmsghdr *ghdr_new; + struct pf_kruleset *ruleset; + struct pf_krule *rule; + int rs_num; + int error; + + error = nl_parse_nlmsg(hdr, &getrule_parser, npt, &attrs); + if (error != 0) + return (error); + + if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) + return (ENOMEM); + + ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); + ghdr_new->cmd = PFNL_CMD_GETRULE; + + PF_RULES_WLOCK(); + ruleset = pf_find_kruleset(attrs.anchor); + if (ruleset == NULL) { + PF_RULES_WUNLOCK(); + error = ENOENT; + goto out; + } + + rs_num = pf_get_ruleset_number(attrs.action); + if (rs_num >= PF_RULESET_MAX) { + PF_RULES_WUNLOCK(); + error = EINVAL; + goto out; + } + + if (attrs.ticket != ruleset->rules[rs_num].active.ticket) { + PF_RULES_WUNLOCK(); + error = EBUSY; + goto out; + } + + rule = TAILQ_FIRST(ruleset->rules[rs_num].active.ptr); + while ((rule != NULL) && (rule->nr != attrs.nr)) + rule = TAILQ_NEXT(rule, entries); + if (rule == NULL) { + PF_RULES_WUNLOCK(); + error = EBUSY; + goto out; + } + + nlattr_add_rule(nw, rule); + error = pf_kanchor_copyout(ruleset, rule, anchor_call, sizeof(anchor_call)); MPASS(error == 0); @@ -1729,7 +1766,7 @@ pf_handle_get_ruleset(struct nlmsghdr *hdr, struct nl_pstate *npt) static bool nlattr_add_pf_threshold(struct nl_writer *nw, int attrtype, - struct pf_kthreshold *t) + const struct pf_kthreshold *t) { int off = nlattr_add_nested(nw, attrtype); int conn_rate_count = 0; diff --git a/sys/netpfil/pf/pf_nl.h b/sys/netpfil/pf/pf_nl.h index 6591c707d9a4..4d0186ea86a5 100644 --- a/sys/netpfil/pf/pf_nl.h +++ b/sys/netpfil/pf/pf_nl.h @@ -152,6 +152,8 @@ enum pfstate_type_t { PF_ST_RT_IFNAME = 37, /* string */ PF_ST_SRC_NODE_FLAGS = 38, /* u8 */ PF_ST_RT_AF = 39, /* u8 */ + PF_ST_INCLUDE_RULE = 40, /* bool */ + PF_ST_CREATED_BY_RULE = 41, /* nested, pf_rule_type_t */ }; enum pf_addr_type_t { diff --git a/tests/sys/netpfil/pf/get_state.sh b/tests/sys/netpfil/pf/get_state.sh index eb2bc854c800..eb2e2f37a15d 100644 --- a/tests/sys/netpfil/pf/get_state.sh +++ b/tests/sys/netpfil/pf/get_state.sh @@ -74,7 +74,51 @@ many_cleanup() pft_cleanup } +atf_test_case "rule" "cleanup" +rule_head() +{ + atf_set descr 'Test retrieving original state establishing rule' + atf_set require.user root +} + +rule_body() +{ + pft_init + + epair=$(vnet_mkepair) + ifconfig ${epair}a 192.0.2.1/24 up + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up + jexec alcatraz pfctl -e + + pft_set_rules alcatraz \ + "pass in proto icmp label \"icmplabel\"" + + # Establish state + atf_check -o ignore ping -c 1 -W 1 192.0.2.2 + + # We should see the rule now + atf_check -o match:"rule: pass in proto icmp all keep state label \"icmplabel\"" \ + -e ignore \ + jexec alcatraz pfctl -ss -vv + + pft_set_rules noflush alcatraz \ + "pass" + + # Even after the rules changes we should see the original rule + atf_check -o match:"rule: pass in proto icmp all keep state label \"icmplabel\"" \ + -e ignore \ + jexec alcatraz pfctl -ss -vv +} + +rule_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "many" + atf_add_test_case "rule" } diff --git a/tests/sys/netpfil/pf/killstate.sh b/tests/sys/netpfil/pf/killstate.sh index f5925d715e7c..161a8b7668f2 100644 --- a/tests/sys/netpfil/pf/killstate.sh +++ b/tests/sys/netpfil/pf/killstate.sh @@ -666,7 +666,7 @@ key_body() --replyif ${epair}a # Get the state key - key=$(jexec alcatraz pfctl -ss -vvv | awk '/icmp/ { print($2 " " $3 " " $4 " " $5); }') + key=$(jexec alcatraz pfctl -ss -vvv | awk '/all icmp/ { print($2 " " $3 " " $4 " " $5); }') bad_key=$(echo ${key} | sed 's/icmp/tcp/') # Kill the wrong key From nobody Thu May 7 16:24:02 2026 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 4gBHcz0pMnz6cpB3 for ; Thu, 07 May 2026 16:24:03 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBHcy5Yt5z3ZgQ for ; Thu, 07 May 2026 16:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778171042; 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=zNUb01ErcAJA2KA+vhWeJB+m8tRZxtZZh5vH15+KcsY=; b=f/NC2vAXFGW12hshDC5oyGyFwv5nxfMiqShRnC+6MCsUpnHqw2br5rd4SzTVPJvnl1xf83 xGoI0jPyS9+xQYjmeq/3eRakpoR65jOChEiASd+VUNj0qnOIj+gTtPKKSCHMVwqTkhmqhr rpEOdA5m57eY7rm7ucSCX1dqVH/gjDWpIk2SA/K8e55jf+dnAisWSfNDLN9H0cwdngA4e9 8K6GUYtOkvQGkYVS8Qwnk1Ky1bC1wJ21728cbWjA0sG/BK9+lypR7Z0ZxDHqCzuSbsUJUZ c+Y4xXSvXBnQfqHmAvEGg+1mN5MaNlBnHQVnEMZmlmh0HbwJTNc402n0hSqP2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778171042; a=rsa-sha256; cv=none; b=DckxotR9kFNQo60IDFACDFZ/H3jfvvNryUbtwCfs9Zc8BTDb0yk9jhflqc3Ds9NDNI5XPK /Tts8cdiExuonrSO0UrSOHv8G6TL94J/HMKsoaJGoQSNkZl/IOtmxiOXt5Ty/8qqq6juPx qdU+tQr3Kv6m7kVxIZ52OiO8sL+E6UuoMkZ55I/zH2sOzhiAL11u6zGPHAHAvqbydBF82f 1FjsZHhhtBJWzLGvb89G553MsiXCqLvrTERydubQ5L98U9QfM9ffAES2TAW1pRIPzG6v0N kUWlLGdRwiqfyCHaYkxgmvab22rrlIjm8rc0jkUwBemTX92RbQ807ekRxjTFLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778171042; 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=zNUb01ErcAJA2KA+vhWeJB+m8tRZxtZZh5vH15+KcsY=; b=eHxeNVhffWM/cRojfdRmsN4VEc72DUoTNmELd8fqM7ocpHZUj4ZNDj+IRQdr4Rqli3Df10 dFOMSp3zhIibUgC4PqpVsE65wtlJSRqln/dEZX05ywvtKk17nRwLmv+KOXYuZX5PpSiGtU t/oMCVXB1ZCMMmYuZmtg1ZoW5fBgac4IFLAzPOv+O6uZePlNvBG9aef3SkVNue0cr8KMVD 1LKyAMkuDzdXoV+o+FaxvVKiG9OX1tZBrNxo9DBKTAbBMCKO5y8dVaBsCvQelTMv4n5zDQ el7kylkg4L8YqNXqwNCHXaLflRyetxWgjff0hQw9bW2XeqH0idq/rrsRHnEHLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBHcy3hVFzZnQ for ; Thu, 07 May 2026 16:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36ea1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 16:24:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 4e7c1ff95a51 - main - pfctl: relax interface name requirement 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e7c1ff95a5187faee524055f22c4cf4134d1147 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 16:24:02 +0000 Message-Id: <69fcbca2.36ea1.5fb90566@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4e7c1ff95a5187faee524055f22c4cf4134d1147 commit 4e7c1ff95a5187faee524055f22c4cf4134d1147 Author: Kristof Provost AuthorDate: 2026-05-07 09:58:17 +0000 Commit: Kristof Provost CommitDate: 2026-05-07 15:07:23 +0000 pfctl: relax interface name requirement The FreeBSD network stack, for better or worse, does not impose any requirements on interface names. As such it's valid for an interface name to start with a number (or indeed, be something like '⭐'). Allow this in pfctl, and add a test case for the specific case of interface names starting with a number. Note that we don't support UTF-8 names fully, so those may still fail. PR: 295064 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 2 +- tests/sys/netpfil/pf/names.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 57a5140ffeb7..7e9d81da6ed9 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -4242,7 +4242,7 @@ dynaddr : '(' STRING ')' { char *p, *op; op = $2; - if (!isalpha(op[0])) { + if (op[0] == '\0') { yyerror("invalid interface name '%s'", op); free(op); YYERROR; diff --git a/tests/sys/netpfil/pf/names.sh b/tests/sys/netpfil/pf/names.sh index e47b0917cfec..c6f2a06c15f9 100644 --- a/tests/sys/netpfil/pf/names.sh +++ b/tests/sys/netpfil/pf/names.sh @@ -95,8 +95,48 @@ group_cleanup() pft_cleanup } +atf_test_case "start_number" "cleanup" +start_number_head() +{ + atf_set descr 'Test interface names starting with a number' + atf_set require.user root +} + +start_number_body() +{ + pft_init + + epair=$(vnet_mkepair) + ifconfig ${epair}a 192.0.2.1/24 up + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up + jexec alcatraz ifconfig ${epair}b name 4ever + jexec alcatraz pfctl -e + + jexec alcatraz ifconfig + + pft_set_rules alcatraz \ + "block" \ + "pass in from any to (4ever)" + + atf_check -o ignore ping -c 3 192.0.2.2 + + # Negative test, if the interface doesn't exist we don't pass packets + pft_set_rules alcatraz \ + "block" \ + "pass in from any to (5ever)" + atf_check -s exit:2 -o ignore ping -c 1 -t 1 192.0.2.2 +} + +start_number_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "names" atf_add_test_case "group" + atf_add_test_case "start_number" } From nobody Thu May 7 17:00:57 2026 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 4gBJRY6xJqz6cr9s for ; Thu, 07 May 2026 17:00:57 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBJRY6JCbz3g7x for ; Thu, 07 May 2026 17:00:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778173257; 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=KC8+/rvDxT7Vv7/FdRVlbQzG8lrEYqbAJOJuHjtHXyo=; b=q3IG96NEFsZ2RvWXOx1iKnbBd/AeZs/I+AMRF6eMBDrpquGHjR5JI3XC7TYALL8H2/pnwx e3O9RPi6uqMY1vEwvlDNfi89GIp2hk/mNBTbMnwo1FlhFnHXdzmCQYK4tOQyqkCQDsT1oV 2wq6yrU3TJzOeZLpCMTpAsk7RJWeJEVBUySk59t+kHi0ZfRyoMaOo95+w0dQZWyxZAUJdN adMCaqLEv8rdDFUsW7WovDnJPUiWtX0EMu8uTANzuxR+rAcUtUVAqlBYd0xXD20/dhJaYV iUwvBwIhcQQlyX47PuYxMZdlPFyI9Hn+lgHgRct5v1LR8ID3c63eTnxahUWZjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778173257; a=rsa-sha256; cv=none; b=bg32MYsjtmKGrDTk01kuScaxzZ1doCv9lbYG/R2jKOos/vIssblBXjh/PbxHktjQ8mbDeq YvoUhHCR3kvbUioiTLrCSQVIi/Syphj6XW+M9bmcRs47JpGZwUUGSau8dqggmjLVpJKQzM MV/RjS8U9J0b7DA7Q/Sw+KwKecaRcIaIQiDUB3ZQIVCIrBYKIfXSWW4+Ks3M64g6A7v+VE lKSivyPdfGbCbCIEg6j4k0pvbKpNmp3Q7AZ+tRsdGE8NonXfFJ+KnZXJ6fb+JW/sMY1eEM kx47zV1FlgJ1JOlf5R95qRoK/tuPQmKR5dhnnDJd+xEP8cQzJ0SaAPjZuirVdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778173257; 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=KC8+/rvDxT7Vv7/FdRVlbQzG8lrEYqbAJOJuHjtHXyo=; b=K5nDNj/KJdI0bgmiG1IW4helBzATzI0OcVTQoNPmQEyprNcfZ8nNT2603CIxUq2zsW9eis QqQ5pLDBFLW3ITTMgyqKN9hX4IgGI61Ufkbh3HSHA/pcYPvHLOGHqu8oUGlKV6ykj9a4Uv I24kPcogZQyu8uIQ4dxbVINhoOgfRhJxHKPKnw+ZKIGBbKg4nL4B7eB245Ytj6QL63wcnJ yNZfDCMoRPT2rV4RYkgu0mgwAUfq+0iEJzzwrk5l4CE5RlBK6KV+mLyGD8p2oxV7fVROUp N4tc+58Kp39OJ8QIfPJEze3BPQT4HNsQg/YfKx3SARnVvAIIZGYer5rH/EYQDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBJRY5bSDzbXR for ; Thu, 07 May 2026 17:00:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39fd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 17:00:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 642dd17ee943 - main - vm_map_growstack(): consistently use local vars instead of curthread/proc 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 642dd17ee94377c3d5533d05d0d9a58b88f60387 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 17:00:57 +0000 Message-Id: <69fcc549.39fd6.602c9f25@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=642dd17ee94377c3d5533d05d0d9a58b88f60387 commit 642dd17ee94377c3d5533d05d0d9a58b88f60387 Author: Konstantin Belousov AuthorDate: 2026-05-07 16:00:31 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-07 17:00:14 +0000 vm_map_growstack(): consistently use local vars instead of curthread/proc Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56863 --- sys/vm/vm_map.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 63bdce9d60f8..0a81e62d2d63 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4731,6 +4731,7 @@ static int vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) { vm_map_entry_t stack_entry; + struct thread *td; struct proc *p; struct vmspace *vm; vm_offset_t gap_end, gap_start, grow_start; @@ -4746,7 +4747,8 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) int error __diagused; #endif - p = curproc; + td = curthread; + p = td->td_proc; vm = p->p_vmspace; /* @@ -4760,9 +4762,9 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) MPASS(!vm_map_is_system(map)); - lmemlim = lim_cur(curthread, RLIMIT_MEMLOCK); - stacklim = lim_cur(curthread, RLIMIT_STACK); - vmemlim = lim_cur(curthread, RLIMIT_VMEM); + lmemlim = lim_cur(td, RLIMIT_MEMLOCK); + stacklim = lim_cur(td, RLIMIT_STACK); + vmemlim = lim_cur(td, RLIMIT_VMEM); retry: /* If addr is not in a hole for a stack grow area, no need to grow. */ if (gap_entry == NULL && !vm_map_lookup_entry(map, addr, &gap_entry)) @@ -4778,8 +4780,8 @@ retry: } else { return (KERN_FAILURE); } - guard = ((curproc->p_flag2 & P2_STKGAP_DISABLE) != 0 || - (curproc->p_fctl0 & NT_FREEBSD_FCTL_STKGAP_DISABLE) != 0) ? 0 : + guard = ((p->p_flag2 & P2_STKGAP_DISABLE) != 0 || + (p->p_fctl0 & NT_FREEBSD_FCTL_STKGAP_DISABLE) != 0) ? 0 : gap_entry->next_read; max_grow = gap_entry->end - gap_entry->start; if (guard > max_grow) From nobody Thu May 7 17:00:58 2026 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 4gBJRb1bZlz6crYM for ; Thu, 07 May 2026 17:00:59 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBJRb0Fyfz3g1H for ; Thu, 07 May 2026 17:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778173259; 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=7P6LVwzgTnCeha5dSIEPidZFWnVpgOjMbQc7CRZTsAo=; b=vHfEGZ16pDfHszgamOu7KqDgywMwPThlHyuBpjknm3doY0lrueR5LGHtX108f2arH3uaXq pHOdYl5BAq7Xp8mBsKMLXIYIOw/I640gCLxP3timWCZ+m7cVnvvF7OxU8hygz324av1R9d KsNRVL/Cz8oS9ZVJW+JC7bm6gvf7fNJDVI+YrWi3LwiMRfJ4F4w94yNDc+NvlN6t+oKhlx Q0yrVffwscVCtG0k++mLODuHLUSy9aXZoO3nJ0u7/QTpAXQS7bdnHuyKdLB9i4pHFFUPq0 JxPcDodB/sE0V1bessgRS5WSmxcKW61bmJZS46Qq2pvXyT6NrfO1keChCEWZjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778173259; a=rsa-sha256; cv=none; b=AxwO6iBiSBeHACvpD6oDZHePOEdTxR/LOCbh/DTwVV/AWN/fHbgeeBZZUvBFD/FIehxkPG p6NFUgIu93oaWygi2Oj4pfD5/L/i8g9osgdwOKqeDe72jJpg3IY80hvL9PAJgIsdTR2/Gc 44WnTXH30UEtlB2UiyUbK3PqqpYrtJV2chKXWHBBxWY+9DIQ1EFUYjz1gEqfv7JIEl/ojo cAoxTlxP+cl4AxOoigBcttPw8zQdzB8Mjk+aIM0Ae3pN/q0SqaHok/b6vfAzj7dCTL+1td nmca6JPZphLp0NqJuQiMKEayaE/HIt/8K8HAVW0xe2dYK0UhTUov4k3Fq1Xryw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778173259; 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=7P6LVwzgTnCeha5dSIEPidZFWnVpgOjMbQc7CRZTsAo=; b=HRPybOijlS19xaoJJtnPk4Tw3s7vAcQwkxdMu9aOLhO4pNOV70eA7BSfoikqgeCtLutVGt nvJ9cxa3Ban/m44/E/yq+vn/lkX23ycG22ZRLzOUBHQeJjfLfM0QcYFLoPx94PlOhpLiod Ue2sPKaWj+vzXVH7GBJjlwCdoWVpGS+CuaHTsmLb2laLVFwnFjdMish8DJTfRq0aEyZ8pu 6o/HWS/ERFZF0G4wxVuG7ZXz3PazTCrOM0iPSOwNKgC6dMDe8Pc0L6S/AMrpoaH0Ht6T1d d06RZlNqC3Tq4CVMVL97PnkXN/ZGC6zyVeAc0ua0gwuN0BkwPo36MZ3Ltp5Dqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBJRZ6wRJzbPB for ; Thu, 07 May 2026 17:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39ea9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 17:00:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 18c5a26f8a74 - main - vm_map_growstack(): give a hint to user that stack was blown out 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18c5a26f8a747583b9bca3a6a1ae9db1ed4591a3 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 17:00:58 +0000 Message-Id: <69fcc54a.39ea9.7d6605ea@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=18c5a26f8a747583b9bca3a6a1ae9db1ed4591a3 commit 18c5a26f8a747583b9bca3a6a1ae9db1ed4591a3 Author: Konstantin Belousov AuthorDate: 2026-05-06 22:53:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-07 17:00:14 +0000 vm_map_growstack(): give a hint to user that stack was blown out Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56863 --- sys/vm/vm_map.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 0a81e62d2d63..7ead7d7e6472 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4723,6 +4723,11 @@ vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize, return (rv); } +static bool report_stackoverflow = true; +SYSCTL_BOOL(_vm, OID_AUTO, report_stackoverflow, CTLFLAG_RWTUN, + &report_stackoverflow, 0, + "uprintf() on stack overflow"); + /* * Attempts to grow a vm stack entry. Returns KERN_SUCCESS if we * successfully grow the stack. @@ -4787,8 +4792,12 @@ retry: if (guard > max_grow) return (KERN_NO_SPACE); max_grow -= guard; - if (grow_amount > max_grow) + if (grow_amount > max_grow) { + if (report_stackoverflow) + uprintf("pid %d comm %s tid %d stack overflow\n", + p->p_pid, p->p_comm, td->td_tid); return (KERN_NO_SPACE); + } /* * If this is the main process stack, see if we're over the stack @@ -4796,8 +4805,12 @@ retry: */ is_procstack = addr >= (vm_offset_t)vm->vm_maxsaddr && addr < (vm_offset_t)vm->vm_stacktop; - if (is_procstack && (ctob(vm->vm_ssize) + grow_amount > stacklim)) + if (is_procstack && (ctob(vm->vm_ssize) + grow_amount > stacklim)) { + if (report_stackoverflow) + uprintf("pid %d comm %s tid %d stack overflow\n", + p->p_pid, p->p_comm, td->td_tid); return (KERN_NO_SPACE); + } #ifdef RACCT if (racct_enable) { From nobody Thu May 7 17:19:11 2026 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 4gBJrb3XcQz6ct5V for ; Thu, 07 May 2026 17:19:11 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBJrb1HRZz3jqT for ; Thu, 07 May 2026 17:19:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174351; 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=8zWMCRB7m5PMANhu0qqZ8HeC9mQGb+OmHL952xipXuo=; b=pnEjEY+xooR718FBPPZnhqZWTHLqULlGZwt61PaDAIy+mYdDxG8bs+M0MiDwEOqciVENqR fLB6vWPWaJwsEvYwFqYvVIFl4Fi/o/wYoRmDdWLb4M5nTewBAharTGXyBQpHs5SyGT/L6/ 9r2nxXLUfI5RSdxV+8pkdAh2AsjUCXm48TNi1oorOpWfFT1hHK5qb91mp+9HKJssk+uPn4 W7MzzrgJPWVpZaNiUUlrz7a0b5gEKapB34d0WFEA13nkx+nMDh5nrCETT6LAYNAhIHofMG 9jxEybvc4Invz52XEzCyPbMGQpQqd4+WOVWQ8BzCB3CFAybjyvew20Rpbig5ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778174351; a=rsa-sha256; cv=none; b=Jp5gQfQtNPdqY4+KB0Ia6RSC/mVW/U17pLJ/l85hlelaW0dFAP+6/SrNP+Ziznfrwvol3c hBoUxrfC28YNdpwO+InCnWep4QnUIo9wb2NFmEPReKYNvTSOJuwf3qak704m68oGzdA0J3 urL1KdMjgzz+Yq1iEnZ7dT5cm4fNz/uv4sqw5/P2T0ueoTRb9BGBlpBiTbTuSUl7YQrZOM rXiWlYRWr+isdVc2TcZCY3+/psnAIDWQw0nlQO6Uv0XUKg3CtWaFEcFoaMTHh1V3EqZNZt CeHOO/vHh3sAE9Y86gvlP2IK7tSTYVCUXuXNxOtoFOAJDPoX/nNkQ345pCuBKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174351; 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=8zWMCRB7m5PMANhu0qqZ8HeC9mQGb+OmHL952xipXuo=; b=N8hokd/4uGx2dLrxkUxKFXVKuiTl0Fud7l8XO7vkJQgeaG68AMUfzEzjquNLF5Z9tCW+fS dW+hJ3Qy3lf2nDGj+JmMK+Q3RYqSYaTMYpdu1FxgAZpXXCqODCZh0/zStRMDj+lU0zCSvO F5aV14P5orFaZK0942RP1lEc9BlEcuVAsAUCwOmkXC45viyd2csyWLFZXDA6yd6hEcjBTj PFvdyPtm/N8SIJULR0ZPJrQBZVPqUgi/5EgwHAgelaCZPhblud6rJo8m8aaJcZjjp6J0QG ikSXdJilCh4z5+GYvbDjDlkXpB0/w7HodSMI6gV9UzRql+YpRpOBhufqoD+70A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBJrb0p9vzbT6 for ; Thu, 07 May 2026 17:19:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a87d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 17:19:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 54625dfb363a - main - git-arc: Update the usage message to mention create -d 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54625dfb363a4a00841ef7d7ee8e5cc5ea1156e0 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 17:19:11 +0000 Message-Id: <69fcc98f.3a87d.1c4265a8@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=54625dfb363a4a00841ef7d7ee8e5cc5ea1156e0 commit 54625dfb363a4a00841ef7d7ee8e5cc5ea1156e0 Author: Mark Johnston AuthorDate: 2026-05-07 17:18:32 +0000 Commit: Mark Johnston CommitDate: 2026-05-07 17:18:32 +0000 git-arc: Update the usage message to mention create -d Fixes: 448ec129bcef ("git-arc: Add a create-draft mode") --- tools/tools/git/git-arc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index 395787df970c..f2a325f3452a 100755 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -57,7 +57,7 @@ err_usage() Usage: git arc [-vy] Commands: - create [-l] [-r [,...]] [-s subscriber[,...]] [|] + create [-dl] [-r [,...]] [-s subscriber[,...]] [|] list | patch [-bcrs] [ ...] stage [-b branch] [|] From nobody Thu May 7 17:32:08 2026 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 4gBK7X49mnz6ctvM for ; Thu, 07 May 2026 17:32:08 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBK7X3H3Dz3p46 for ; Thu, 07 May 2026 17:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778175128; 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=4+lUhU3vmI0ppXQDAX57CD1W2o11vdXOSI3UaSOqc64=; b=WCpM+yqvwbe7Vsr7LfePHoT7WKv/vDcbKUFb7QbJfiTPwiACKRhPFV+VenRiC5Dcttb57e lYryu0rL3zp7euiGUdvBUem2hd0/8d9IpkwLyFbjP+8olIVLaGUeuGlE0WYO9TJWHJIG6L fedmlXef4vhsY6CZqYFFKq8653FFYVtGo7DIlmeq6Anqsvt7ln+vh3CMhEoOqCPPFUNMxn FJWIOkn8wD0AFPnmyh7oJUEqxaANmaDdpQyE7XU3o4cd6q9UmdZV4HG9E2QXNeis0ykPX2 OGUj/gowwMgmU+DWDjUqApGbmoaNtoFKiE0FOpxtRnjcPm8yzaWEOhDjhf9DUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778175128; a=rsa-sha256; cv=none; b=fDJCuODLbSuitwBjEFcIlBrNvUSNOQEVL8HOWW3+ZL6OTyUNjNxikHmtK2E8RWyxijWMDS MqnPlJxrF3pqtY+xKjYxZsYK9khXzxZmvtzPYkzzfUiobx6WgB4pMrSr8JV7xTK4Xea3SH NKdg0O/qp/hlJ0HbaOgdvkrTyzmn0jAciDxjUDKZD3bVytm5tyHddzrfkY36agZG4OtfdA Myc770HsyDJSBIEhhaQTYWMEFzRZEyBf1cArhz4iESZJdOIhsCBMdwY/2JYh6lawIFsldo STgUwqwia3CxoTTVlY4x3T9EVnCEm4sURGKMmPklmC5h/DKBa90KVZTKckjqcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778175128; 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=4+lUhU3vmI0ppXQDAX57CD1W2o11vdXOSI3UaSOqc64=; b=wMLFHmndWYPkvYwGxt5Tx2sP7GpSsxyDK+ig/BA/GG7L3z5XfwylJSjrD/wLievS85rVKR x6ZkuF6CFHKEHm4tt4UgGtIddp8NK5UpDVpPu1EKvm/e9CpHV85qNGbONyYA4kWMwzS1Je hCUea9OJcHsc/haCcoeSWyJUGwj0fBdM2Te1N2wBPsx38XErWi0QsoQGtOqWU2D4zvvhkh mp2zXG0/UVcLrJIiHOZvmGW/qC5dVg7ofv1+qEZh87y+PIr+GlyZKyOjhW7sVLoUv9uknC k74lBdT1k56Agoy89UoQ+B9IpzWhMFUJETUg2IzKL5AlRKORGe0DaI+Ap7MVqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBK7X2jm0zcWc for ; Thu, 07 May 2026 17:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c66f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 17:32:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 944a4eb089b3 - main - stand/libsa/zfs: disable ZSTD_TRACE and DYNAMIC_BMI2 code paths 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 944a4eb089b33241b21979253e0a373ce0bdf984 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 17:32:08 +0000 Message-Id: <69fccc98.3c66f.1f43e0bb@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=944a4eb089b33241b21979253e0a373ce0bdf984 commit 944a4eb089b33241b21979253e0a373ce0bdf984 Author: Ryan Libby AuthorDate: 2026-05-07 17:30:05 +0000 Commit: Ryan Libby CommitDate: 2026-05-07 17:30:05 +0000 stand/libsa/zfs: disable ZSTD_TRACE and DYNAMIC_BMI2 code paths Enabling ZSTD_TRACE leaves behind undefined weak symbols, which causes a problem for gcc builds. The bfd linker emits an obscure error about overlapping FDEs. We don't need ZSTD_TRACE for libsa, so just disable it. Also disable BMI2 instruction optimizations. The addition of the optional BMI2 code paths caused the boot loader binaries to grow larger (28 KiB for clang, 32 KiB for gcc). The boot loader binaries are size constrained, and this pushed the gcc-generated lua_loader.bin over the 500000 byte limit, and the clang one to within 4k of the limit. Fixes: 8a62a2a5659d ("zfs: merge openzfs/zfs@f8e5af53e") Reviewed by: delphij, imp, mm Differential Revision: https://reviews.freebsd.org/D56866 --- stand/libsa/zfs/Makefile.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc index 3df6779559c9..540635d144ef 100644 --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -75,9 +75,13 @@ CFLAGS.zfs.c+= -DHAS_ZSTD_ZFS \ # # ZSTD coding style has some issues, so suppress clang's warnings. Also, zstd's # use of BMI instrucitons is broken in this environment, so avoid them. +# Avoid generating the DYNAMIC_BMI2 code paths because the code duplication +# inflates the resulting binaries. Disable ZSTD_TRACE because we don't need it +# and the bfd linker trips over the weak undefined symbols it generates. # .for i in ${ZSTD_SRC} -CFLAGS.$i+= -U__BMI__ ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.$i+= -U__BMI__ -DDYNAMIC_BMI2=0 -DZSTD_TRACE=0 \ + ${NO_WBITWISE_INSTEAD_OF_LOGICAL} .endfor CFLAGS.zfs_zstd.c+= -DIN_BASE -DIN_LIBSA From nobody Thu May 7 18:08:39 2026 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 4gBKxg5GzRz6cx9B for ; Thu, 07 May 2026 18:08:39 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBKxg4hS2z3shD for ; Thu, 07 May 2026 18:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778177319; 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=iT4juC+mJSQfUO6CzfefH1eLZ6NFiPQ6X+PUS9mmWs8=; b=fRLe8H5o6OLmtg8o4h1UYVhIQXxos38nWDJktl4sEv/Webt4MfJcz921I57cJTdQXgzkqr s49qv+SccOJiRppExBqxbNx7e4/0imyl/DjreLXQJksrzW7XuCK2KgRktx4KPQ04Rxt7Ce 6VfDAeliPgi7jybzO+AbhViijt+t1n5AfOhZpLWrkL/APyzWIEHm6sqRUTwYaPbzcg0QDL 1KI28Bru4ahTC4WgRyUILoNvnAl6FMum5K9BeWWYoVV3EPwAGC2lRRysJplCafk8WzwBj0 TqUhL3gIycSBCVCu9EBl8EyObWd8DMrxTM5skk9vHLYdrHeATyT0u2s2vlu5/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778177319; a=rsa-sha256; cv=none; b=DcXMBP3erM9jIfk+WRSUWkx1qtkrSfMEC4D++NDuUjaCxF7gMbx8P/AkAGhxvK+72Hcos6 HaCTvz9HRLRGpkDC3VWCdHI/R20YnBbZKBn9ezDLkGNFSSyylh+R/yyV4sgX3E+F0FedN6 iuEMntfD9CPmxJ7896PopnMDJdLKlQBOydH5ywCtzjE2ag2Who//nzLCzABrC89lI3ZZND JypRG+hB8eNBvSuaCK93SKTJc6uGXq6wgEZ1xOGYeUm8ToUUnTs5PcvVIRMKY0egfc2BgT jY9xwkRq9gaR8aeW9FVbC5oGrXo8+HoDuxIde8gXRpxl8LGQi/G904Ka5I69FQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778177319; 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=iT4juC+mJSQfUO6CzfefH1eLZ6NFiPQ6X+PUS9mmWs8=; b=Og9eUi0DmKYj3t6JATkpNxe2XbxTREe29EV+zrmxKkOdigDKUd0088c1fdNF2RY9Y2MZ// pANFg1W98fUmabBzqsG2aKYhI8fbsCZZ178rU8qKnjDH2cfkw40SzYb+wuazHi7L6OBYyI QX9dYQT195tD9GeQfRmNI2/nWhSqp3x12or1IrQWLftQc/8bGTK/eTgv7Tqf1SjZ1gtcxO ksJ9mxxWbx4x1ruu1Y6JIJjSsJblzOTItKQpztMFwLxhBk8SUuq+fJvHQV68mNWhFD1A81 1+ltjOlgDShqrQN4hACBoJE4LvIgqI5tkINYBzHANzK1BrJG27lSFI3YNuWWTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBKxg4DwhzdTV for ; Thu, 07 May 2026 18:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 411fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 18:08:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Hall Subject: git: 0d48d6d7bba7 - main - smartpqi: Add runtime sysctl for debug_level and log device state changes 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrhall X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d48d6d7bba77d6c3736ce56ea5667bfbde89705 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 18:08:39 +0000 Message-Id: <69fcd527.411fb.36380f0d@gitrepo.freebsd.org> The branch main has been updated by jrhall: URL: https://cgit.FreeBSD.org/src/commit/?id=0d48d6d7bba77d6c3736ce56ea5667bfbde89705 commit 0d48d6d7bba77d6c3736ce56ea5667bfbde89705 Author: John Hall AuthorDate: 2026-05-04 21:43:27 +0000 Commit: John Hall CommitDate: 2026-05-07 18:08:26 +0000 smartpqi: Add runtime sysctl for debug_level and log device state changes The smartpqi driver did not log device add/remove or controller events to syslog, and hw.smartpqi.debug_level could only be set at boot via loader.conf with no runtime sysctl interface. Add a read-write sysctl at dev.smartpqi.N.debug_level for runtime debug level changes. Add device_printf calls for device addition, removal, and controller events (hotplug, hardware, physical/logical device, AIO state/config changes) so state changes always appear in dmesg. Add DBG_DISC logging for discovery state transitions. Fix spelling errors in strings and comments across the driver. Bump driver version to 14.4691.1.2000 / 15.2.1.2000. PR: 294161 Reviewed by: imp Approved by: imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56832 --- sys/dev/smartpqi/smartpqi_cam.c | 4 ++-- sys/dev/smartpqi/smartpqi_defines.h | 8 ++++---- sys/dev/smartpqi/smartpqi_discovery.c | 21 ++++++++++++++++++--- sys/dev/smartpqi/smartpqi_event.c | 17 ++++++++++++++--- sys/dev/smartpqi/smartpqi_main.c | 12 +++++++++++- sys/dev/smartpqi/smartpqi_misc.c | 4 ++-- sys/dev/smartpqi/smartpqi_queue.c | 4 ++-- sys/dev/smartpqi/smartpqi_request.c | 4 ++-- sys/dev/smartpqi/smartpqi_response.c | 4 ++-- sys/dev/smartpqi/smartpqi_sis.c | 6 +++--- sys/dev/smartpqi/smartpqi_structures.h | 4 ++-- 11 files changed, 62 insertions(+), 26 deletions(-) diff --git a/sys/dev/smartpqi/smartpqi_cam.c b/sys/dev/smartpqi/smartpqi_cam.c index 690b38c9f855..6ded8aa97e39 100644 --- a/sys/dev/smartpqi/smartpqi_cam.c +++ b/sys/dev/smartpqi/smartpqi_cam.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -1300,7 +1300,7 @@ register_sim(struct pqisrc_softstate *softs, int card_index) csa.callback_arg = softs; xpt_action((union ccb *)&csa); if (csa.ccb_h.status != CAM_REQ_CMP) { - DBG_ERR("Unable to register smartpqi_aysnc handler: %d!\n", + DBG_ERR("Unable to register smartpqi_async handler: %d!\n", csa.ccb_h.status); } diff --git a/sys/dev/smartpqi/smartpqi_defines.h b/sys/dev/smartpqi/smartpqi_defines.h index 0277abd3e318..c4084f069588 100644 --- a/sys/dev/smartpqi/smartpqi_defines.h +++ b/sys/dev/smartpqi/smartpqi_defines.h @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -944,12 +944,12 @@ typedef uint8_t *passthru_buf_type_t; #define PQISRC_DRIVER_MAJOR __FreeBSD__ #if __FreeBSD__ <= 14 -#define PQISRC_DRIVER_MINOR 4690 +#define PQISRC_DRIVER_MINOR 4691 #else #define PQISRC_DRIVER_MINOR 2 #endif -#define PQISRC_DRIVER_RELEASE 0 -#define PQISRC_DRIVER_REVISION 2008 +#define PQISRC_DRIVER_RELEASE 1 +#define PQISRC_DRIVER_REVISION 2000 #define STR(s) # s #define PQISRC_VERSION(a, b, c, d) STR(a.b.c-d) diff --git a/sys/dev/smartpqi/smartpqi_discovery.c b/sys/dev/smartpqi/smartpqi_discovery.c index a7de5a149810..8682e6cabd7e 100644 --- a/sys/dev/smartpqi/smartpqi_discovery.c +++ b/sys/dev/smartpqi/smartpqi_discovery.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -155,7 +155,7 @@ pqisrc_remove_target_bit(pqisrc_softstate_t *softs, int target) softs->bit_map.bit_vector[target] = SLOT_AVAILABLE; } -/* Use bit map to find availible targets */ +/* Use bit map to find available targets */ int pqisrc_find_avail_target(pqisrc_softstate_t *softs) { @@ -1423,7 +1423,11 @@ pqisrc_add_device(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) if(device->expose_device) { pqisrc_init_device_active_io(softs, device); - /* TBD: Call OS upper layer function to add the device entry */ + device_printf(softs->os_specific.pqi_dev, + "device added: vendor=%s model=%s B%d:T%d:L%d type=%s\n", + device->vendor, device->model, + device->bus, device->target, device->lun, + device->is_physical_device ? "physical" : "logical"); os_add_device(softs,device); } DBG_FUNC("OUT\n"); @@ -1451,6 +1455,11 @@ pqisrc_remove_device(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) } /* Wait for device outstanding Io's */ pqisrc_wait_for_device_commands_to_complete(softs, device); + device_printf(softs->os_specific.pqi_dev, + "device removed: vendor=%s model=%s B%d:T%d:L%d type=%s\n", + device->vendor, device->model, + device->bus, device->target, device->lun, + device->is_physical_device ? "physical" : "logical"); /* Call OS upper layer function to remove the exposed device entry */ os_remove_device(softs,device); DBG_FUNC("OUT\n"); @@ -1674,10 +1683,14 @@ pqisrc_update_device_list(pqisrc_softstate_t *softs, case DEVICE_NOT_FOUND: /* Device not found in existing list */ device->new_device = true; + DBG_DISC("new device found B%d:T%d:L%d\n", + device->bus, device->target, device->lun); break; case DEVICE_CHANGED: /* Actual device gone need to add device to list*/ device->new_device = true; + DBG_DISC("device changed B%d:T%d:L%d\n", + device->bus, device->target, device->lun); break; case DEVICE_IN_REMOVE: /*Older device with same target/lun is in removal stage*/ @@ -1686,6 +1699,8 @@ pqisrc_update_device_list(pqisrc_softstate_t *softs, * free call*/ device->new_device = false; same_device->schedule_rescan = true; + DBG_DISC("device in removal B%d:T%d:L%d, scheduling rescan\n", + device->bus, device->target, device->lun); break; default: break; diff --git a/sys/dev/smartpqi/smartpqi_event.c b/sys/dev/smartpqi/smartpqi_event.c index 77a70f9fb031..c3c27c9e1c0b 100644 --- a/sys/dev/smartpqi/smartpqi_event.c +++ b/sys/dev/smartpqi/smartpqi_event.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -204,6 +204,17 @@ pqisrc_process_event_intr_src(pqisrc_softstate_t *softs,int obq_id) } if (event_index >= 0) { + static const char *event_names[] = { + [PQI_EVENT_HOTPLUG] = "hotplug", + [PQI_EVENT_HARDWARE] = "hardware", + [PQI_EVENT_PHYSICAL_DEVICE] = "physical device", + [PQI_EVENT_LOGICAL_DEVICE] = "logical device", + [PQI_EVENT_AIO_STATE_CHANGE] = "AIO state change", + [PQI_EVENT_AIO_CONFIG_CHANGE] = "AIO config change", + }; + device_printf(softs->os_specific.pqi_dev, + "event: %s (type=0x%x)\n", + event_names[event_index], response.event_type); if(response.request_acknowledge) { pending_event = &softs->pending_events[event_index]; pending_event->pending = true; @@ -385,7 +396,7 @@ pqisrc_report_event_config(pqisrc_softstate_t *softs) pqi_event_config_request_t request; pqi_event_config_t *event_config_p ; dma_mem_t buf_report_event ; - /*bytes to be allocaed for report event config data-in buffer */ + /*bytes to be allocated for report event config data-in buffer */ uint32_t alloc_size = sizeof(pqi_event_config_t) ; memset(&request, 0 , sizeof(request)); @@ -446,7 +457,7 @@ pqisrc_set_event_config(pqisrc_softstate_t *softs) pqi_event_config_request_t request; pqi_event_config_t *event_config_p; dma_mem_t buf_set_event; - /*bytes to be allocaed for set event config data-out buffer */ + /*bytes to be allocated for set event config data-out buffer */ uint32_t alloc_size = sizeof(pqi_event_config_t); memset(&request, 0 , sizeof(request)); diff --git a/sys/dev/smartpqi/smartpqi_main.c b/sys/dev/smartpqi/smartpqi_main.c index 1f006939bf7c..fbfbcc962f35 100644 --- a/sys/dev/smartpqi/smartpqi_main.c +++ b/sys/dev/smartpqi/smartpqi_main.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -427,6 +427,16 @@ smartpqi_attach(device_t dev) goto out; } + /* Register sysctl for runtime debug_level changes */ + { + struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(dev); + struct sysctl_oid *tree = device_get_sysctl_tree(dev); + + SYSCTL_ADD_ULONG(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "debug_level", CTLFLAG_RW, &logging_level, + "Debug logging bitmask"); + } + goto out; dma_out: diff --git a/sys/dev/smartpqi/smartpqi_misc.c b/sys/dev/smartpqi/smartpqi_misc.c index 6db0d80ed993..fd0b907aa252 100644 --- a/sys/dev/smartpqi/smartpqi_misc.c +++ b/sys/dev/smartpqi/smartpqi_misc.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -252,7 +252,7 @@ bsd_set_hint_scatter_gather_config(struct pqisrc_softstate *softs) DBG_FUNC("IN\n"); - /* At least > 16 sg's required to wotk hint correctly. + /* At least > 16 sg's required to work hint correctly. * Default the sg count set by driver/controller. */ if ((!softs->hint.sg_segments) || (softs->hint.sg_segments > diff --git a/sys/dev/smartpqi/smartpqi_queue.c b/sys/dev/smartpqi/smartpqi_queue.c index e8a467531aa4..679d956f6f36 100644 --- a/sys/dev/smartpqi/smartpqi_queue.c +++ b/sys/dev/smartpqi/smartpqi_queue.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -729,7 +729,7 @@ pqisrc_create_op_ibq(pqisrc_softstate_t *softs, op_ib_q->pi_register_offset); } else { int i = 0; - DBG_WARN("Error Status Decsriptors\n"); + DBG_WARN("Error Status Descriptors\n"); for (i = 0; i < 4; i++) DBG_WARN(" %x\n",admin_resp.resp_type.create_op_iq.status_desc[i]); } diff --git a/sys/dev/smartpqi/smartpqi_request.c b/sys/dev/smartpqi/smartpqi_request.c index c5f8ac3c41ba..655660615797 100644 --- a/sys/dev/smartpqi/smartpqi_request.c +++ b/sys/dev/smartpqi/smartpqi_request.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -1998,7 +1998,7 @@ pqisrc_send_raid_tmf(pqisrc_softstate_t *softs, pqi_scsi_dev_t const *devp, if (softs->timeout_in_tmf && tmf_type == SOP_TASK_MANAGEMENT_LUN_RESET) { - /* OS_TMF_TIMEOUT_SEC - 1 to accomodate driver processing */ + /* OS_TMF_TIMEOUT_SEC - 1 to accommodate driver processing */ tmf_req.timeout_in_sec = OS_TMF_TIMEOUT_SEC - 1; } diff --git a/sys/dev/smartpqi/smartpqi_response.c b/sys/dev/smartpqi/smartpqi_response.c index 38695860e520..1ae74a5b95ff 100644 --- a/sys/dev/smartpqi/smartpqi_response.c +++ b/sys/dev/smartpqi/smartpqi_response.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -275,7 +275,7 @@ pqisrc_is_innocuous_error(pqisrc_softstate_t *softs, rcb_t *rcb, void *err_info) if (raid_err->data_out_result == PQI_RAID_DATA_IN_OUT_UNDERFLOW) return true; - /* We get these a alot: leave a tiny breadcrumb about the error, + /* We get these a lot: leave a tiny breadcrumb about the error, but don't do full spew about it */ if (raid_err->status == PQI_AIO_STATUS_CHECK_CONDITION) { diff --git a/sys/dev/smartpqi/smartpqi_sis.c b/sys/dev/smartpqi/smartpqi_sis.c index 82eb999ca4b8..99aa952eb149 100644 --- a/sys/dev/smartpqi/smartpqi_sis.c +++ b/sys/dev/smartpqi/smartpqi_sis.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -26,7 +26,7 @@ #include "smartpqi_includes.h" -/* Function for disabling msix interrupots */ +/* Function for disabling msix interrupts */ void sis_disable_msix(pqisrc_softstate_t *softs) { @@ -96,7 +96,7 @@ sis_disable_interrupt(pqisrc_softstate_t *softs) sis_disable_msix(softs); break; default: - DBG_ERR("Inerrupt mode none!\n"); + DBG_ERR("Interrupt mode none!\n"); break; } diff --git a/sys/dev/smartpqi/smartpqi_structures.h b/sys/dev/smartpqi/smartpqi_structures.h index 0c9ad375823d..ada6676ada8f 100644 --- a/sys/dev/smartpqi/smartpqi_structures.h +++ b/sys/dev/smartpqi/smartpqi_structures.h @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -1168,7 +1168,7 @@ typedef struct bmic_sense_feature_page_header { uint8_t page; uint8_t sub_page; uint16_t total_length; /** Total length of the page. - * The length is the same wheteher the request buffer is too short or not. + * The length is the same whether the request buffer is too short or not. * When printing out the page, only print the buffer length. */ } OS_ATTRIBUTE_PACKED bmic_sense_feature_page_header_t; From nobody Thu May 7 18:08:40 2026 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 4gBKxj1Mg9z6cxKB for ; Thu, 07 May 2026 18:08:41 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBKxh6XPpz3sky for ; Thu, 07 May 2026 18:08:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778177320; 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=RV0o9z6B8GoXh6wSfIJGBTbavhJUwKHRbBob0pCxDyo=; b=FYCcu2XxC7WB4drpVIncW0YvGRYQIer4swBgjhIJUR6/69SeNC3JMjdFLLXzu3WWug+Y8e xpMNaPch9EBlH8LY4KlY6FSxo2BU7qbWGwyYu7CiF6INf7XvDDkC6u/Ntj3XkUd0R8FNjX mMRv7q2MAgtGEyS5B8HZVkz5aw9S5YMqL7ONcqTA1A+IotUlknClvV7SZYF2v4304CuS1N L4ICXAyqE24sF51uThHNkcerBS9o4saPWXkB5cKh1wD9SA+Qdi0vzCGa0qVQqi0iGRMYOM 2X4TG0E0YiI+DeUPe28aX+lBSMyBFcNVLqFsAA6rycirFZwlouV52SeQrlFzQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778177320; a=rsa-sha256; cv=none; b=TPrParZ7//CabFgHTWU3Fg/5INZzriWNkpskCp181q1SSo4UEr+T2ZE9QOdwf2q8VC7nkO +LdAMfAS/aKtt5/jYzSYAQ/tnS7s44XjubtSxvSDZpZeHLdGQusweyurapcBDxH1pbmklV lqiIW5ReOdpRynCekesqtnu+FsX6ug9NW6rcZ47lgjAHri40nvMj9nvqR+Dk8h5WZHb/dS 9/SOS5G0YstPblQPMAZ7xpwSGnqGFG1nvp2eA45yHp70+5+S3Fjq8PfYDGFcJaWQqJPEYh WU2S7o2mB+JU+mkReVW4yfEELtJmYm8G7t4wgZjjTuFHbDl5P2wtnqpjCWWglg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778177320; 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=RV0o9z6B8GoXh6wSfIJGBTbavhJUwKHRbBob0pCxDyo=; b=PhB2ZsWZ9YKstAjjFUBgli9q3weVAI0owBdkZvJhpDhalmSa2yDVoc9PbN83U7rZuUAcKt 6DJA4nQ8+Zm0H9gQQpuroJDZWDOO9KNlqr9yMJ8q4W8lRrWsZjlb810YJnYcBxr9/uDwvm wKycxgSdlnD56vpeu/xtxgrgQicOPfkpsGYGwRsx8SquLNoE+tENvbkDCu5Dh8Q/Xul2W/ u4UpBXCt9DH/09Zu0bGu3Vb1cWM8PdTSnANrM2Eit+vDt/P4T7dAtmrsRlyYnFX71KENPX 74yoh7e6chmMEjhoXn6yCOpZVE3BhvWc1e/yNHbC9G/Xi+cIVh3KyIemw8lWGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBKxh55CzzdGK for ; Thu, 07 May 2026 18:08:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fe37 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 18:08:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Hall Subject: git: e9912b7e88e7 - main - smartpqi.4: Document runtime debug_level sysctl 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrhall X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9912b7e88e7d66c0ab5fec1cfe61dcd18377166 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 18:08:40 +0000 Message-Id: <69fcd528.3fe37.163a645@gitrepo.freebsd.org> The branch main has been updated by jrhall: URL: https://cgit.FreeBSD.org/src/commit/?id=e9912b7e88e7d66c0ab5fec1cfe61dcd18377166 commit e9912b7e88e7d66c0ab5fec1cfe61dcd18377166 Author: John Hall AuthorDate: 2026-05-04 22:14:28 +0000 Commit: John Hall CommitDate: 2026-05-07 18:08:27 +0000 smartpqi.4: Document runtime debug_level sysctl Update smartpqi(4) to document the dev.smartpqi..debug_level sysctl for runtime debug level changes, and note that device add/remove and controller event messages always appear in dmesg regardless of the debug_level setting. PR: 294161 Reviewed by: imp Approved by: imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56832 --- share/man/man4/smartpqi.4 | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/share/man/man4/smartpqi.4 b/share/man/man4/smartpqi.4 index ef5f903fe422..ae85e184114d 100644 --- a/share/man/man4/smartpqi.4 +++ b/share/man/man4/smartpqi.4 @@ -1,4 +1,4 @@ -.\" Copyright (C) 2019-2025, Microchip Technology Inc. and its subsidiaries +.\" Copyright (C) 2019-2026, Microchip Technology Inc. and its subsidiaries .\" Copyright (C) 2016-2018, Microsemi Corporation .\" Copyright (C) 2016, PMC-Sierra, Inc. .\" Written by John Hall @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 28, 2025 +.Dd April 14, 2026 .Dt SMARTPQI 4 amd64 .Os .Sh NAME @@ -64,11 +64,13 @@ OEM Controllers based on the Microchip Technology Inc. SmartROC and SmartIOC Chipsets .El .Sh DEBUGGING -Driver diagnostic printing is controlled in +Driver diagnostic printing is controlled at boot time in .Xr loader.conf 5 by using the global .Va hw.smartpqi.debug_level -tunable. +tunable, or at runtime via the per-controller +.Va dev.smartpqi..debug_level +sysctl. .Pp The .Va debug_level @@ -82,11 +84,27 @@ The following levels are available: .It 0x0002 Ta info Ta Basic information .It 0x0004 Ta function Ta Used to show function entry and exit .It 0x0008 Ta io Ta Logging data from controller -.It 0x0010 Ta discovery Ta Device discovery +.It 0x0010 Ta discovery Ta Device discovery state transitions .It 0x0020 Ta warning Ta Operational warnings .It 0x0040 Ta error Ta Parameter errors and programming bugs .It 0x0080 Ta note Ta More detailed information .El +.Pp +In addition to the level-gated debug output, the driver always logs +device addition, device removal, and controller events +(hotplug, hardware, physical/logical device changes, AIO state and +configuration changes) via +.Xr device_printf 9 , +which appear in +.Xr dmesg 8 +regardless of the +.Va debug_level +setting. +.Pp +For example, to enable discovery logging at runtime on the first controller: +.Bd -literal -offset indent +sysctl dev.smartpqi.0.debug_level=0x0070 +.Ed .Sh DEVICE HINTS The following tunable values can be set in .Pa /boot/device.hints @@ -162,7 +180,9 @@ https://www.microchip.com/design-centers/storage .Xr xpt 4 , .Xr loader.conf 5 , .Xr camcontrol 8 , -.Xr kldload 8 +.Xr dmesg 8 , +.Xr kldload 8 , +.Xr sysctl 8 .Sh HISTORY The .Nm From nobody Thu May 7 18:45:58 2026 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 4gBLml0bm0z6d16p for ; Thu, 07 May 2026 18:45:59 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBLmk6zZ5z41qG for ; Thu, 07 May 2026 18:45:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778179559; 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=Kjs9BSwcq/0ZofYeAxaKmNV7s/4odaKiYW5HO562fDA=; b=JJYBnqEbaax81MpUlwJjmVzZSejzFGkUxz7yJYp8KRybZQfhT6y0XTCYjmQe/wjAoteGJM Chzd1e41Cz5VyWghR33FB87AJDfsyoYD1JP3fCpWsgzOL/qWYKKHgjNced2Aq7l+rUKmCh YwO1hp+hbJQA16QZn9GSmPHyIFg3DtYhW9dHcaR0G+270eX/T1pB6qBxv+ieCao1OdNlEq xvERK8rqDx173rar/VvCYPw3I90XjGobV7wXg0RvFKa9WId2DQWKJkagKjDoS5Z+F7Jpq6 PmBBM29zfeEWLE2sbBnGycJHQjmYYwyqkQd42BVIOhn48Rc6072OchljuC9Cjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778179559; a=rsa-sha256; cv=none; b=JawioftLYiHpWfI5SjB4RPHF2lCUHZ+4Npx/cwyNDGisgn+Wk36xyuhDVkjqEiSEnuhatP yapK4NIvtMeaShsKaB+pu8gtmiZB4e3p67crgi8NOb5Qdw0lPRIAQcVqz5zxsjLxgg5xek PP6Q+gtqvWZ8caHkffOuoSmJ8KKXyCA4n1Ly85JzwT3nLL2WAVPHbShmOiyBJySYfV6uci KeHI3faOb06BPnAW3vR00RZDMDy22k0HEXGCUgo5YGeoRgI1zSALhM9W01Cx2ty2QKFvOw /XAYVvURqXzI06sTaM0zkKtEAomxl4wUVk67y2mr8YPbdYlTgOvSmg25X63a7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778179559; 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=Kjs9BSwcq/0ZofYeAxaKmNV7s/4odaKiYW5HO562fDA=; b=cTlDHniyVmwBixPRerZ3ylovEFgdKtXV/YVVM+um2PGuhmb1SFI1qC+JbzBAnwL3hmk4D2 qpVKm8g5Ey0n8wvi99Y2C8+smblZtF7UJ3Q9K3j0nhDfaf4Kcd5EJc1divEWqj7HBXshox WCTPzW9YLbE5M0VfhqF3TJOzqLHjr8TTkM/nRARC7c15avxMU1xmDLSJg3WC9piWjvNp7h AoRPz01DBUtYIicZ+SndEaTGg1N5k28vqWtJYR8sPJIheQs9asqmwxWpcmB10rnuonzGTd dyfv6JTWPrhcnY3WuCmT5SMdWBpiBDxyVlQgVFCOtZXc4cVtS6w/yQKvQukdJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBLmk6YqdzfYn for ; Thu, 07 May 2026 18:45:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44d55 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 18:45:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 2c88636e0e7a - main - stat: Expand devname test case 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c88636e0e7a0316d5e6d146874bdb2751f75c40 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 18:45:58 +0000 Message-Id: <69fcdde6.44d55.73a37995@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2c88636e0e7a0316d5e6d146874bdb2751f75c40 commit 2c88636e0e7a0316d5e6d146874bdb2751f75c40 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-07 18:45:14 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-07 18:45:14 +0000 stat: Expand devname test case Test what happens when we ask for the rdev of a non-device. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D56838 --- usr.bin/stat/tests/stat_test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/stat/tests/stat_test.sh b/usr.bin/stat/tests/stat_test.sh index 282efc91303f..aa8563c62ccc 100755 --- a/usr.bin/stat/tests/stat_test.sh +++ b/usr.bin/stat/tests/stat_test.sh @@ -26,6 +26,7 @@ # : ${CHKPATH:="mnt"} +: ${NODEV:="#NODEV"} atf_test_case F_flag F_flag_head() @@ -323,6 +324,7 @@ devname_body() atf_check -o inline:"$devname\n" stat -f '%Sd' "$CHKPATH" atf_check -o inline:"$devname\n" stat -f '%Sr' "$devpath" + atf_check -o inline:"$NODEV\n" stat -f '%Sr' "$CHKPATH" } devname_cleanup() { From nobody Thu May 7 20:00:35 2026 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 4gBNQq1kkFz6d6SS for ; Thu, 07 May 2026 20:00:35 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBNQq0rm5z3Fyy for ; Thu, 07 May 2026 20:00:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778184035; 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=Y01ppdNtwnkOASAvu+46fAD6Sj9neys2S6v2lENG+98=; b=VNaOQYG6xxdHcFQKNhotiZq4oAHdB5Y/+wfixJPZAqPg60Dwh/37EFehWGs9+b+vdTzpyZ 6IRP6e1K6Ff4F4ek5xBiQZU18npM/X2CRQRHK2cTbW0PdZQAES+JA9FY7kz46PQ+10aysO rlsDzllLvWusSHHEi8izb5HjgL8JYEL8WrvYq0Z28KXGX8CexVOx3GL9HEKxSePF/kpgQj E99WWPOHl7R+/Ea2qDrPH/40AvQcKMUw9jMsLwPoejkzFLiTyqzuuCW2Y/woc8vjqLl3F/ K7QdcF8Xr9IbgnzMdmbz12MLOmr6XsQzPWHLGYkHPJkE7iaLdjgH8k+NVl5Fag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778184035; a=rsa-sha256; cv=none; b=YlfqbFFFW5vdHjjwscbS/LAJsE5WT4zPomfFuLASb45g41x1qKlsvrOJUP6E6+BuCK151Z 5CZJrK6SQuyFsFM6ghaaBSwndDpKH3+4nNE1lekjH3OK6CfjPRZDCyFTEAD0jw1wARzELd 1klYw+VPKbrzwRI+R2+HKLrEYmMw9nij7k8/QzOQKuzuv+80PsDWAubu8ZQSyMVHmKRYAN UNdY2Nu5TgiBnRhW/kZE6/Jn9BPjH9NmX6k3Duf2lJF4C+U6gkLXwYCWQLbkTZUettszcx H9KoYXvdULswEhT3gMLZkQ26cj6TuEI6USUBEvXTSy/lKKURBJGeXV+oZbJMHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778184035; 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=Y01ppdNtwnkOASAvu+46fAD6Sj9neys2S6v2lENG+98=; b=L9fey4UX8a0zSmwzemYbvgHvUmW6BAkd1E4R/2B87+sU1u0K2LzEoZzWLD5ATOpenFbIM3 emv7llRrd/qxP+/hpG+THYtSyHSyjg18zhJWXfLDcxLGYCRPYFmJKD+vDt9vBZBK9oFVpN ByKB6+eBxjfCU50qS2YPRwnARqZI2d9SO/RXiY3SNmriX7gt6w8JH+8+UieQBerQVJ5IvE /Fqq7UD5UAwJStOzl3p9j1TVWN+3lIux/oN+iFWjyXc2doUA3kqgHxMaj7+1BnmB8KSwBf VwpaZ7QqK+dflWSlxCSncp24RoVjsbEC+gzPMXdqsYfE4FUxALufDwbE3j3DYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBNQq0HzMzhGH for ; Thu, 07 May 2026 20:00:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e649 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 20:00:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8eef59db2542 - main - vm_map_growstack(): use local for p->p_vmspace 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8eef59db254283eaaee47be94d4ea9f2fef4f2ad Auto-Submitted: auto-generated Date: Thu, 07 May 2026 20:00:35 +0000 Message-Id: <69fcef63.1e649.1c12c448@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8eef59db254283eaaee47be94d4ea9f2fef4f2ad commit 8eef59db254283eaaee47be94d4ea9f2fef4f2ad Author: Konstantin Belousov AuthorDate: 2026-05-07 19:58:18 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-07 19:58:18 +0000 vm_map_growstack(): use local for p->p_vmspace Noted by: alc Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/vm/vm_map.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 7ead7d7e6472..94dd7d3a19bc 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4761,8 +4761,7 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) * debugger or AIO daemon. The reason is that the wrong * resource limits are applied. */ - if (p != initproc && (map != &p->p_vmspace->vm_map || - p->p_textvp == NULL)) + if (p != initproc && (map != &vm->vm_map || p->p_textvp == NULL)) return (KERN_FAILURE); MPASS(!vm_map_is_system(map)); From nobody Thu May 7 21:07:07 2026 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 4gBPvb4RTZz6bykr for ; Thu, 07 May 2026 21:07: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBPvb3l57z3TxG for ; Thu, 07 May 2026 21:07:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778188027; 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=zbQDsj+h8XikRGaixweOV9biTwP7GrRZqzzx2TFUEzs=; b=g75SI76KnE7tPONw7DWwA2L5ODOKru1lPKpTmv/4ZmkBlbd4eJEO396ij7mbnQJMPQZckt /SeA+J3HHAX83Bx6CoOOkE7TLu3YJRNkCbXptZ7t6mx7KPoSZpAmLjXRPm3sL02i0RhTF6 YjAkG+V5LSCo0hpQZi0fzPCCvrZGOX2TBFn1MLJmheSjQ7lsvlgeo+tXz4+fg2MN6VajoN sfg+GpCq+3qIQWZQIpiddJROsXm3iSfulePsdhLQnyOu4xRu3Pztc2B9CAScCPMMVKm+Rq objpKmLlU08hDWbt1H9RlS0j66RqYCCysH3n/Lpij/9Tzpo/ifwxE286wpB1KQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778188027; a=rsa-sha256; cv=none; b=g8HV5xn2k+l72o9GbvcixMBZgr6iNMp2pUfedrgkquPscmD+aXmAp3aIXB2kyJ8gLmSjP+ FGtGqaSfpvlQSdia9aSM+YsYUIMxCkQpwgUzkhjb2E54pLyo7tzkVkHRz2dLmhAh8CHVY+ gunw1vqNQCLb9r1unQCo5vFXAu6DmANVp3JwI15PBA+miCg3O7Eqv6c7SGVLx8C56qaA6l 6TiFVhfE0tqvSkySqt37aH+iwwb71EuDhifgRtX/L47rlPOHENDXxMhnEL4M0FzJBplE+s 04O0Z0mhe+SXXHoj392T72ouXJGmFKCOnCaPNuo2Ri+qOMWZE6QdzC9viIZEOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778188027; 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=zbQDsj+h8XikRGaixweOV9biTwP7GrRZqzzx2TFUEzs=; b=P1Xc9jHmm/BrZP7JG3+kzp4zCIHj3iNced9y4fZMOxRiE5zlkBceSWc3f5ngklwN/GMvex iD3zISNUWUgmUwVtDDv+QfKL/Cu5GqVkM3gdGQuSboc5Wx8LIrphjaKUhxo69OfeKuHqhr KrpZCQ8vYTU9mOz8VzWIfCCvJ5+tA5RAy3Advj4xflGV4YiaoIHlqEVjESMalywd5ILy+x FS04m95rbs0CAjTuX7waO7zhNcT7gadv3s28PhK6YK5nC94eqszRXS5Twe5BGQr8PPcYPo bHmWKydsWNIQXxdWt/cSsfIlH7dGw2NrFUS9GMXAFY+AB7j5J2L25bOltez2Qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBPvb3Fgczjg3 for ; Thu, 07 May 2026 21:07:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24e0d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 21:07:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 1d24638d3e88 - main - Fix LOCAL_PEERCRED in 32-bit compat mode 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d24638d3e8875e4b99a4b5e39f4241e37221b3d Auto-Submitted: auto-generated Date: Thu, 07 May 2026 21:07:07 +0000 Message-Id: <69fcfefb.24e0d.5cdbd5a5@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=1d24638d3e8875e4b99a4b5e39f4241e37221b3d commit 1d24638d3e8875e4b99a4b5e39f4241e37221b3d Author: Alan Somers AuthorDate: 2026-04-27 23:46:53 +0000 Commit: Alan Somers CommitDate: 2026-05-07 20:52:35 +0000 Fix LOCAL_PEERCRED in 32-bit compat mode Previously the cr_pid field would be incorrectly copied to userland, due to a size mismatch between the structure as defined in 32-bit vs 64-bit builds. Fix it by converting the structure before copying it to userland. PR: 294833 Sponsored by: ConnectWise MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D56675 --- sys/kern/uipc_usrreq.c | 21 +++++++++++++++++++-- sys/sys/ucred.h | 11 +++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 8ff9822ee9eb..2508f7edd1c5 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -83,6 +83,7 @@ #include #include #include +#include #include #include #include @@ -2752,8 +2753,24 @@ uipc_ctloutput(struct socket *so, struct sockopt *sopt) error = EINVAL; } UNP_PCB_UNLOCK(unp); - if (error == 0) - error = sooptcopyout(sopt, &xu, sizeof(xu)); + if (error != 0) + break; +#ifdef COMPAT_FREEBSD32 + if (SV_PROC_FLAG(sopt->sopt_td->td_proc, SV_ILP32)) { + struct xucred32 xu32 = {}; + int i; + + xu32.cr_version = xu.cr_version; + xu32.cr_uid = xu.cr_uid; + xu32.cr_ngroups = xu.cr_ngroups; + for (i = 0; i < XU_NGROUPS; i++) + xu32.cr_groups[i] = xu.cr_groups[i]; + xu32.cr_pid = xu.cr_pid; + error = sooptcopyout(sopt, &xu32, sizeof(xu32)); + break; + } +#endif + error = sooptcopyout(sopt, &xu, sizeof(xu)); break; case LOCAL_CREDS: diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index ba241cf9ff3a..4bf48a5e4b87 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -193,6 +193,17 @@ struct setcred32 { uint32_t sc_label; /* struct mac32 [*] */ }; +#ifdef COMPAT_FREEBSD32 +/* 32-bit compatible version of xucred */ +struct xucred32 { + u_int cr_version; /* structure layout version */ + uid_t cr_uid; /* effective user id */ + short cr_ngroups; /* number of groups (incl. cr_gid). */ + gid_t cr_groups[XU_NGROUPS]; /* groups */ + pid_t cr_pid; +}; +#endif + struct thread; /* Common native and 32-bit compatibility entry point. */ From nobody Fri May 8 09:09:14 2026 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 4gBjwp4zHBz6bwvK for ; Fri, 08 May 2026 09:09:14 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBjwp4VDvz3W20 for ; Fri, 08 May 2026 09:09:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778231354; 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=tpJOdoMh1/Ivf9vZAtwu0gEtTL40iuuSHn/BVQjrxdc=; b=jQVcGd0hGVH9FmOl/sKSoBQlBbQZ1CN6qKdiGl+VSVg6NcpPIafjP+saaDA0jY7ZSsrL1J sqkTteYaxJ3GCH60ClsrDvXeJ+TI/YxPml5Js/6hPYOkFWHGiZlHcug4zT4qJF3lCnjJot 2ektvAX9jApPwZMf8Q1RKtU+Js3ntn5mdp4psZotjvQfI/u+laDG+ZBLWPxL0cy6ZncIMi FGrOPOQ73az7RI369FfmjOyjkH60y1uVrtzx2nvSLYRChJa/iqvVZBuxI/jytl1i8urrHv lksiUsaK5vZlr0o1ZltuRdOdJOnJQsvEq8SnxftMM7+65AH5tlFchn7CcHxrsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778231354; a=rsa-sha256; cv=none; b=LITlfpsWhqurttXEhKex/7UL5cZRSHtvRv6roXZp89UUKbDhW70f8T2PotIEN7PBOSV23Q wclC7WttZC14BzX0pbTqGHrGKbF2SyNxpp2/rvEZH79nbp6khLBIc2bi2hdRJojkve077G 1f3b9d9BH3G9Uu6Z6dEetAoQpsq05wXPKxiht6/9L4FpI0HXaWyNoj7leKH7RVaBLB2eYi ILIbPlMZXTmA7oLndseyoDtpTGRci91b99w5lF/gYUHWFKDwhP+rpFE/v3pb4oXrOo4qNb Ws6PRBPuQa0DOU14BecHoiJar7xItybwJP8vr4OIJgpiPwtUT268apU/EEfV3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778231354; 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=tpJOdoMh1/Ivf9vZAtwu0gEtTL40iuuSHn/BVQjrxdc=; b=aUqWD34/IKzBjaUqYESDJbbRuIZYmuQrgTtvfiHxLmn5jJFBW16i4QeLA9aeIz6XU7/zFg htBU8iaNM+aKN8HT+icid8L647H6dSxaERZS7c3khiXR6PpMIrB8T3MO0Xi7zHMbCwfnRP m+1Kn5GvFpKf96mLNemjxUBpbq0P9zsn1loKN0a/lJ7w803BBZMMRZG9IcE3Wt/O+irSoI ORDWA9n7z8HT2q7oRwpOD6MM7IK5s3d1cWskRjzXhEVIcUUmaglPrGoNLdL3F5nu8Yfkry UzwrBnZsQkmejW28jkKNHJ6OULd0/h3zCnSOmK978guMZFVYOjbygUU6CLvB1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBjwp414Xz15tN for ; Fri, 08 May 2026 09:09:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20450 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 09:09:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 076e44839160 - main - uio.9: Document uiomove_fromphys() 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 076e44839160f74f96fda83fa81c3acb41b9ebc8 Auto-Submitted: auto-generated Date: Fri, 08 May 2026 09:09:14 +0000 Message-Id: <69fda83a.20450.75b6eef0@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=076e44839160f74f96fda83fa81c3acb41b9ebc8 commit 076e44839160f74f96fda83fa81c3acb41b9ebc8 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-03-20 07:52:28 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-08 09:05:57 +0000 uio.9: Document uiomove_fromphys() Reviewed by: kib Discussed with: markj, royger MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54070 --- share/man/man9/Makefile | 1 + share/man/man9/uio.9 | 45 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 29c822c10eb2..fbb981891ce4 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -2333,6 +2333,7 @@ MLINKS+=uidinfo.9 uifind.9 \ uidinfo.9 uihold.9 MLINKS+=uio.9 uiomove.9 \ uio.9 uiomove_frombuf.9 \ + uio.9 uiomove_fromphys.9 \ uio.9 uiomove_nofault.9 MLINKS+=unr.9 alloc_unr.9 \ unr.9 alloc_unrl.9 \ diff --git a/share/man/man9/uio.9 b/share/man/man9/uio.9 index b143eb6e8e62..a7563125a351 100644 --- a/share/man/man9/uio.9 +++ b/share/man/man9/uio.9 @@ -23,13 +23,14 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 22, 2025 +.Dd May 7, 2026 .Dt UIO 9 .Os .Sh NAME .Nm uio , .Nm uiomove , .Nm uiomove_frombuf , +.Nm uiomove_fromphys , .Nm uiomove_nofault .Nd device driver I/O routines .Sh SYNOPSIS @@ -37,25 +38,29 @@ .In sys/uio.h .Bd -literal struct uio { - struct iovec *uio_iov; /* scatter/gather list */ - int uio_iovcnt; /* length of scatter/gather list */ - off_t uio_offset; /* offset in target object */ - ssize_t uio_resid; /* remaining bytes to copy */ - enum uio_seg uio_segflg; /* address space */ - enum uio_rw uio_rw; /* operation */ - struct thread *uio_td; /* owner */ + struct iovec *uio_iov; /* scatter/gather list */ + int uio_iovcnt; /* length of scatter/gather list */ + off_t uio_offset; /* offset in target object */ + ssize_t uio_resid; /* remaining bytes to process */ + enum uio_seg uio_segflg; /* address space */ + enum uio_rw uio_rw; /* operation */ + struct thread *uio_td; /* owner */ }; .Ed +.Pp .Ft int .Fn uiomove "void *buf" "int howmuch" "struct uio *uiop" .Ft int .Fn uiomove_frombuf "void *buf" "int howmuch" "struct uio *uiop" .Ft int +.Fn uiomove_fromphys "vm_page_t ma[]" "vm_offset_t offset" "int howmuch" "struct uio *uiop" +.Ft int .Fn uiomove_nofault "void *buf" "int howmuch" "struct uio *uiop" .Sh DESCRIPTION The functions .Fn uiomove , .Fn uiomove_frombuf , +.Fn uiomove_fromphys , and .Fn uiomove_nofault are used to transfer data between buffers and I/O vectors that might @@ -152,10 +157,27 @@ When .Va uio_offset is greater than or equal to the buffer size, the result is success with no bytes transferred, effectively signaling EOF. +.Pp +The +.Fn uiomove_fromphys +function provides a machine-independent way to copy memory +to and from the physical address space. +The +.Fa "ma[]" +argument is an array of physical pages. +Every physical page address in the array provides +a page-sized chunk of the physical space. +The +.Fa "offset" +argument is the offset into the +.Fa "ma[]" +array. +In particular, the offset does not have to lie within the first page. .Sh RETURN VALUES On success .Fn uiomove , .Fn uiomove_frombuf , +.Fn uiomove_fromphys , and .Fn uiomove_nofault will return 0; on error they will return an appropriate error code. @@ -168,7 +190,7 @@ will not work (the buffer pointer is not being advanced in case of a partial read), it is just here to demonstrate the .Nm handling. -.Bd -literal +.Bd -literal -offset 2n /* MIN() can be found there: */ #include @@ -200,7 +222,8 @@ fooread(struct cdev *dev, struct uio *uio, int flag) } .Ed .Sh ERRORS -.Fn uiomove +.Fn uiomove , +.Fn uiomove_fromphys and .Fn uiomove_nofault will fail and return the following error code if: @@ -211,7 +234,7 @@ The invoked or .Xr copyout 9 returned -.Er EFAULT +.Er EFAULT . .El .Pp In addition, From nobody Fri May 8 15:18:08 2026 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 4gBt6T1cC2z6cS97 for ; Fri, 08 May 2026 15:18:09 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBt6T0tSHz46xn for ; Fri, 08 May 2026 15:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778253489; 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=qwNuBP4an8uoXzZKRsutyarObHF1j74fPaDxlataix8=; b=BSYJBjyIuiNfJfh5sazfpxgo1AN3ETVKgWycrxM1JKK/tzPz15yuhyME5oM6j/dxBjKko8 3tDwEENoGp0Zur4FBZezs+7Qr7lUaSUQ7dCBF3Jg1f6O+KN1HqeQGxXKfEaqu2hDmbp99n ZPGgRXFtJD9vgqxzOBLQI0PLeQTFt5ylhI41+LoNtKZH3zU0qTE1bLaRPait/LwOJT4Y17 NG20UGznwpJE/QT5iD1+dR93m+dR8j6XuKuM4NQvra7FLhTZk45qpFCcEbIBwm0lG/HZnY L6SnNl71TAK6JNhWxUQ1ydBnQLwYBVfglYmmYxWCYLvaJ81Eyy03+zPAZC8d1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778253489; a=rsa-sha256; cv=none; b=lFLopp5lxxangheiXFtcWGRjvW4dh7uMrfxv6Wlw9ajpPTSuDwf//TYbHzdBxeyXiSbKho aYVBSDSNnydBZsgrXexdMZAw4pQvyeCH/scj/+gjykCk3F3xbd+9l9JfwWGp3DOpYmo5BE 7guWLKWcZe4ACb/Q4YxnWDbz0dwQ5oHNpHcwVvA2AzeFFB+TDM+r1OJXg6yg6eCbDNWPkX F79o0lOUDSE7zt7kgTOqWxcQ7gWSLRpmeAm5T6u5P8MkEoLgbvGdWfn/xCihtRF0n3MPnV cjGR6ftp0LNWjcqpMwRG/dMLQFx2ZewUlCmbYPAnOAU46ipbV4nWnN3H59ed8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778253489; 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=qwNuBP4an8uoXzZKRsutyarObHF1j74fPaDxlataix8=; b=onSnuJtzEiqHg/8aRCA5MGws28ZEAu+/ojBmrSjpyNXapKSLgdT2rCTDhmZaba/lQVGxzn Vt75NaGejIkYR793xTYCSIJex0WoNbvEqQVKsyn9ucmrnw0LlemR4Qf3R5V+t0R3qxkMUx ye0tP7H5NXr9Z2nXi5hCFgBW4uRMoX+TvLyIAk2W8GVOyrteDBszmrlUNqRYIziyiQpRaF kIeiKlLCdlhgDvFS3zNFeUGU4Dtv+1v/dK7Pq/KV26v/iy30trwW6IcqeE45BrpGenuD3I wIPUTUCw0JvDO3MnQu6X0tW+3j+v0J5Uic05Mm391J2YWRcMsNJsja3GKWtz2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBt6T0BTzz3k7 for ; Fri, 08 May 2026 15:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 308c7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 15:18:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: bd1e789b8452 - main - Make "make update-packages" idempotent 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd1e789b8452a8c2f166a3b4defb95330c71dadd Auto-Submitted: auto-generated Date: Fri, 08 May 2026 15:18:08 +0000 Message-Id: <69fdfeb0.308c7.27da5a2b@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=bd1e789b8452a8c2f166a3b4defb95330c71dadd commit bd1e789b8452a8c2f166a3b4defb95330c71dadd Author: Alan Somers AuthorDate: 2026-05-07 18:18:29 +0000 Commit: Alan Somers CommitDate: 2026-05-08 15:17:57 +0000 Make "make update-packages" idempotent If the user runs "make update-packages" without bumping BRANCH, then it isn't possible to copy packages from the old location to the new one (because the two locations are the same). So just skip that step. Sponsored by: ConnectWise PR: 295085 MFC after: 1 week Reviewed by: ivy, emaste Differential Revision: https://reviews.freebsd.org/D56872 --- Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index b07b5f9c1a65..2927054c2e83 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2128,7 +2128,7 @@ real-packages: stage-packages create-packages sign-packages .PHONY real-update-packages: stage-packages .PHONY ${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} create-packages -.if defined(PKG_VERSION_FROM_DIR) +.if defined(PKG_VERSION_FROM_DIR) && ${PKG_VERSION} != ${PKG_VERSION_FROM} @echo "==> Checking for new packages (comparing ${PKG_VERSION} to ${PKG_VERSION_FROM})" @for pkg in ${PKG_VERSION_FROM_DIR}/${PKG_NAME_PREFIX}-*; do \ pkgname=$$(${PKG_CMD} query -F $${pkg} '%n' | sed 's/${PKG_NAME_PREFIX}-\(.*\)/\1/') ; \ @@ -2146,6 +2146,8 @@ real-update-packages: stage-packages .PHONY echo "==> New package $${newpkgname}" ; \ fi ; \ done +.elif defined(PKG_VERSION_FROM_DIR) + @echo "==> Package version ${PKG_VERSION} unchanged, keeping old package set" .else @echo "==> Bootstrapping repository, not checking for new packages" .endif From nobody Fri May 8 18:15:34 2026 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 4gBy3C0n5Bz6cksJ for ; Fri, 08 May 2026 18:15:35 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBy3C0DTXz3b2P for ; Fri, 08 May 2026 18:15:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778264135; 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=CELeftaOYM1jZR+CxTVkYJVGPloyd1pQUYO5wuVjXpI=; b=Ky8nuQkRlaRhBBkuwf8MKW+ACQibceUPct7tB6GPFySRPfPO9NdzHU2hxS/Hmaf+wu9eG8 B3ry+dc3xN5Zhk7ftq811WHx+hqjVcbAllNAhpIJuwlmCEFhD4ROprrkipIY1cDrOAjp4S pd2R7B1GIuCd8vw7+L3y72ajwQp9hfoKT0Fbras/D3wGmBg3Ii2YNdz3H8MRWvytSLUjvU /tnkNFqxQQY5b7cN92+75wTMQKiDxINQd1Q4HpuA9haWIhOGrWtiMF+VEHxkzSHxl9WvXE VaETpkbQx2CpwF6pXURo86ne/FOm00AesPXpktl4ORUMVDT3/1EH9aIENi4ROw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778264135; a=rsa-sha256; cv=none; b=jzDuVAQKQv+RjKizaRUZkc2wW+DXJW0Z5rBH8+KPpzOfHogKUOvDW/r2UFTcSywNNYQybZ DjfMmaZ3WLSkHLVYM1o4tdNoUlwwBPD7DPIYTLpy8JdGjYQfS5gyDQNTBfzZBMpmDA4a9E cv2KIYOt0cRTOofJ28ZzrSPKyDFQIu3TN3shAT26RNzku/iGe61cygZd/+GiLGH2+XrcpU uQ/vUaWLczZeDjd89JNj9Kg/LXrtpqz/tbRGvnAIHTFJBjcrzPcoqANHDpDd35OaKD4qGK r/uwy8UxMAuNHO4nL5yR47r5aQup9qj1LuTPqSuKqLZVmjavNd7b7RTmizPS6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778264135; 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=CELeftaOYM1jZR+CxTVkYJVGPloyd1pQUYO5wuVjXpI=; b=mcWiTmIos6qQWT4qiMUMivGFytgd7A/zdW+Jn8med/NIaOCMOBE+CyR4hSdBOpDZh4LS3a YggN9eH2vGpb6zZJ85hu1frciOVo4wtpBCEKwwCA55XNSC38io6CXMPM7YYF/mePl7FG4n NpLNeLW5uyEKAS/sh7dfh8LSHvRvS+fMm8P7P9LIOGO8NaJYnv45WVln8+gx7MQkvely7r Yd2N0dQaL/ZaPHjC6VJcrKQ+THCTDY8v+DKgWGidUBN89U1H1ITixeMYROu6lASjJLqCZv IIC5lVkBNlpekcZuyL5XicqJmA9BseRGxPAsG13RvTe4b/uNbSYbSn5Hw2skEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBy3B6ttKz8QS for ; Fri, 08 May 2026 18:15:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42ccf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 18:15:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: d9b272a19d39 - main - Merge commit 871038759afb from llvm git (by Marco Elver): 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9b272a19d39f71665b529860bfed731bcfd99f5 Auto-Submitted: auto-generated Date: Fri, 08 May 2026 18:15:34 +0000 Message-Id: <69fe2846.42ccf.7f445ce5@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d9b272a19d39f71665b529860bfed731bcfd99f5 commit d9b272a19d39f71665b529860bfed731bcfd99f5 Author: Dimitry Andric AuthorDate: 2026-05-08 17:59:54 +0000 Commit: Dimitry Andric CommitDate: 2026-05-08 17:59:54 +0000 Merge commit 871038759afb from llvm git (by Marco Elver): Thread Safety Analysis: Fix pointer handling of variables with deprecated attributes (#148974) de10e44b6fe7 ("Thread Safety Analysis: Support warning on passing/returning pointers to guarded variables") added checks for passing pointer to guarded variables. While new features do not necessarily need to support the deprecated attributes (`guarded_var`, and `pt_guarded_var`), we need to ensure that such features do not cause the compiler to crash. As such, code such as this: struct { int v __attribute__((guarded_var)); } p; int *g() { return &p.v; // handleNoMutexHeld() with POK_ReturnPointer } Would crash in debug builds with the assertion in handleNoMutexHeld() triggering. The assertion is meant to capture the fact that this helper should only be used for warnings on variables (which the deprecated attributes only applied to). To fix, the function handleNoMutexHeld() should handle all POK cases that apply to variables explicitly, and produce a best-effort warning. We refrain from introducing new warnings to avoid unnecessary code bloat for deprecated features. Fixes: https://github.com/llvm/llvm-project/issues/140330 This fixes an assertion while building the net/openvswitch port: "Assertion failed: ((POK == POK_VarAccess || POK == POK_VarDereference) && "Only works for variables"), function handleNoMutexHeld, file /usr/src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp, line 2120.' Reported by: cy PR: 295101, 292067 MFC after: 1 month --- .../clang/lib/Sema/AnalysisBasedWarnings.cpp | 25 +++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp b/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp index ec39bca6039f..ab55cbceeaa8 100644 --- a/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp +++ b/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp @@ -2116,11 +2116,26 @@ class ThreadSafetyReporter : public clang::threadSafety::ThreadSafetyHandler { void handleNoMutexHeld(const NamedDecl *D, ProtectedOperationKind POK, AccessKind AK, SourceLocation Loc) override { - assert((POK == POK_VarAccess || POK == POK_VarDereference) && - "Only works for variables"); - unsigned DiagID = POK == POK_VarAccess? - diag::warn_variable_requires_any_lock: - diag::warn_var_deref_requires_any_lock; + unsigned DiagID = 0; + switch (POK) { + case POK_VarAccess: + case POK_PassByRef: + case POK_ReturnByRef: + case POK_PassPointer: + case POK_ReturnPointer: + DiagID = diag::warn_variable_requires_any_lock; + break; + case POK_VarDereference: + case POK_PtPassByRef: + case POK_PtReturnByRef: + case POK_PtPassPointer: + case POK_PtReturnPointer: + DiagID = diag::warn_var_deref_requires_any_lock; + break; + case POK_FunctionCall: + llvm_unreachable("Only works for variables"); + break; + } PartialDiagnosticAt Warning(Loc, S.PDiag(DiagID) << D << getLockKindFromAccessKind(AK)); Warnings.emplace_back(std::move(Warning), getNotes()); From nobody Fri May 8 20:05:49 2026 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 4gC0VP43p9z6ctSG for ; Fri, 08 May 2026 20:05:49 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gC0VP1sv1z3mJH for ; Fri, 08 May 2026 20:05:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778270749; 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=Zlz3LODCYoH9xbKl+YxG7Pw27th1G7aMO0zIT0yA6yo=; b=ninVkiUiL+PNLu87hyUIdXWiJYbLaBNwiCfE4EYMCxyp1ETtQHzRDDnfv0s24bOs4Yps12 uzn3lSNm3CRygzXLempiuR54YKeDiO/jqSwMqs0CRWwFK6gx9RObmg9GXXUXPsaOAPQ4FP NG7Jq48r5o9XfON7rjAu+oYyhEGIa5I4ZDcgfZeSd/jCigCH/ydt1xaZUZ5RzeR0+fs1Ly qmpCNEGY/Y3faDloxgZPWd40N4R/oe4156rlKZJfGjP7qU/gXhP86NTccKdYE09YHOxqZ1 600bpoQUdb0Rv7gED7X78OWd/GYfiql2GA5Dby80XBBNvdy5CcoLnFnKKynSLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778270749; a=rsa-sha256; cv=none; b=km+a9qS+8BlC+N95bMgDSvYDfS67/cOeTuOOAm0yVO6PosDaCH8EpMGHouvl/Ve5AU6PAA 8CXj1xmOqJmEiIrbmFnwWrqi/cXnhmopBnulnotxYSclba6rM1sSc6buL+dArGutI0js1M h50TSzag3ymQaI33n2gnSyVmNqENLmhQ/DRdi/yReI2wbq3+Mhl9oLcxk5BXNaLJu+z7GC HUyT4+N/mfBDqonWN32zWYRTpRHIIi3AbHX52Lf+Td5880OHxKCwTXZSrZPy99WnOl6lcY u8eIhJzQyWJ5ERVkw31mYm6AmcNokd8mmgjPFt61wVsxTLWh1jAxe9NDNqITBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778270749; 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=Zlz3LODCYoH9xbKl+YxG7Pw27th1G7aMO0zIT0yA6yo=; b=xvyPexoKgaS5rhVwvEany2LhTMGq2+ezBfM1ViOgUa1eoA7NDJtZptLPVzsYpY7xedV3s/ korn9ycyZntswZORvaW4lyAwjgh9Ol+jhSY0YWlB8OKcghw9WBMGkBHggZag8n8MhPA5vG q2pe81+Zlbl1GxVzWU66a70g9Aqplvw05vkMUzyHDevbk0Ufaz9uZZl6giGs50WPCHOtpz Qa2Paa8gJPFKC4ci0mK9laezWsUoguVirLc2Qea4UPWpj1w1vZsG48BGPo+iN8G1I/0yrM eiEaBp04tC1FKYXgJGABNrSbvzrFAD5wcAvyBIQee94Jrq2VbDYL5mEU4tXWAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gC0VP1BLGzCVK for ; Fri, 08 May 2026 20:05:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eb98 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 20:05:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 94323513dd50 - main - types: provide __SIZEOF_{INT{8,16,32,64},TIME,TIME32}_T 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94323513dd5070bf1fc3c191c560bd7e17da8931 Auto-Submitted: auto-generated Date: Fri, 08 May 2026 20:05:49 +0000 Message-Id: <69fe421d.1eb98.ccdad19@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=94323513dd5070bf1fc3c191c560bd7e17da8931 commit 94323513dd5070bf1fc3c191c560bd7e17da8931 Author: Ryan Libby AuthorDate: 2026-05-08 19:37:24 +0000 Commit: Ryan Libby CommitDate: 2026-05-08 19:37:24 +0000 types: provide __SIZEOF_{INT{8,16,32,64},TIME,TIME32}_T Suggested by: kib Reviewed by: imp, kib Discussed with: emaste, jrtc27 Differential Revision: https://reviews.freebsd.org/D56783 --- sys/arm/include/_types.h | 1 + sys/arm64/include/_types.h | 1 + sys/powerpc/include/_types.h | 1 + sys/riscv/include/_types.h | 1 + sys/sys/_types.h | 5 +++++ sys/sys/abi_types.h | 2 ++ sys/x86/include/_types.h | 2 ++ 7 files changed, 13 insertions(+) diff --git a/sys/arm/include/_types.h b/sys/arm/include/_types.h index 7319d950443b..9fde5fc5d7c9 100644 --- a/sys/arm/include/_types.h +++ b/sys/arm/include/_types.h @@ -57,6 +57,7 @@ typedef __int64_t __int_fast64_t; typedef __int32_t __register_t; typedef __int32_t __segsz_t; /* segment size (in pages) */ typedef __int64_t __time_t; /* time()... */ +#define __SIZEOF_TIME_T __SIZEOF_INT64_T typedef __uint32_t __uint_fast8_t; typedef __uint32_t __uint_fast16_t; typedef __uint32_t __uint_fast32_t; diff --git a/sys/arm64/include/_types.h b/sys/arm64/include/_types.h index 98f7dea67520..c46f64b2b252 100644 --- a/sys/arm64/include/_types.h +++ b/sys/arm64/include/_types.h @@ -55,6 +55,7 @@ typedef __int64_t __int_fast64_t; typedef __int64_t __register_t; typedef __int64_t __segsz_t; /* segment size (in pages) */ typedef __int64_t __time_t; /* time()... */ +#define __SIZEOF_TIME_T __SIZEOF_INT64_T typedef __uint32_t __uint_fast8_t; typedef __uint32_t __uint_fast16_t; typedef __uint32_t __uint_fast32_t; diff --git a/sys/powerpc/include/_types.h b/sys/powerpc/include/_types.h index 33cc6e731b50..746f9a4837c6 100644 --- a/sys/powerpc/include/_types.h +++ b/sys/powerpc/include/_types.h @@ -66,6 +66,7 @@ typedef __int32_t __register_t; typedef __int32_t __segsz_t; /* segment size (in pages) */ #endif typedef __int64_t __time_t; /* time()... */ +#define __SIZEOF_TIME_T __SIZEOF_INT64_T typedef __uint32_t __uint_fast8_t; typedef __uint32_t __uint_fast16_t; typedef __uint32_t __uint_fast32_t; diff --git a/sys/riscv/include/_types.h b/sys/riscv/include/_types.h index 3e9abd27a156..a9f95d4b6839 100644 --- a/sys/riscv/include/_types.h +++ b/sys/riscv/include/_types.h @@ -51,6 +51,7 @@ typedef __int64_t __int_fast64_t; typedef __int64_t __register_t; typedef __int64_t __segsz_t; /* segment size (in pages) */ typedef __int64_t __time_t; /* time()... */ +#define __SIZEOF_TIME_T __SIZEOF_INT64_T typedef __uint32_t __uint_fast8_t; typedef __uint32_t __uint_fast16_t; typedef __uint32_t __uint_fast32_t; diff --git a/sys/sys/_types.h b/sys/sys/_types.h index a2ee83a862da..bc438c17c8c0 100644 --- a/sys/sys/_types.h +++ b/sys/sys/_types.h @@ -40,18 +40,23 @@ */ typedef signed char __int8_t; typedef unsigned char __uint8_t; +#define __SIZEOF_INT8_T __SIZEOF_CHAR__ typedef short __int16_t; typedef unsigned short __uint16_t; +#define __SIZEOF_INT16_T __SIZEOF_SHORT__ typedef int __int32_t; typedef unsigned int __uint32_t; +#define __SIZEOF_INT32_T __SIZEOF_INT__ #if __SIZEOF_LONG__ == 8 typedef long __int64_t; typedef unsigned long __uint64_t; +#define __SIZEOF_INT64_T __SIZEOF_LONG__ #elif __SIZEOF_LONG__ == 4 __extension__ typedef long long __int64_t; __extension__ typedef unsigned long long __uint64_t; +#define __SIZEOF_INT64_T __SIZEOF_LONG_LONG__ #else #error unsupported long size #endif diff --git a/sys/sys/abi_types.h b/sys/sys/abi_types.h index 44d1bd733bbd..ddacd08ff011 100644 --- a/sys/sys/abi_types.h +++ b/sys/sys/abi_types.h @@ -27,8 +27,10 @@ typedef struct { #if defined(__amd64__) || defined(__i386__) typedef __int32_t time32_t; +#define __SIZEOF_TIME32_T __SIZEOF_INT32_T #else typedef __int64_t time32_t; +#define __SIZEOF_TIME32_T __SIZEOF_INT64_T #endif #define __HAVE_TIME32_T diff --git a/sys/x86/include/_types.h b/sys/x86/include/_types.h index b33dc0bfc7af..2630af1257c7 100644 --- a/sys/x86/include/_types.h +++ b/sys/x86/include/_types.h @@ -71,10 +71,12 @@ typedef __int64_t __int_fast64_t; typedef __int64_t __register_t; typedef __int64_t __segsz_t; /* segment size (in pages) */ typedef __int64_t __time_t; /* time()... */ +#define __SIZEOF_TIME_T __SIZEOF_INT64_T #else typedef __int32_t __register_t; typedef __int32_t __segsz_t; typedef __int32_t __time_t; +#define __SIZEOF_TIME_T __SIZEOF_INT32_T #endif typedef __uint32_t __uint_fast8_t; typedef __uint32_t __uint_fast16_t; From nobody Fri May 8 20:05:50 2026 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 4gC0VQ4lBgz6ctJZ for ; Fri, 08 May 2026 20:05:50 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gC0VQ2R2Xz3mCG for ; Fri, 08 May 2026 20:05:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778270750; 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=4VEoqt6FpjzPUFbfBsUZvFdgyFyeryvwGz6ycDzavUk=; b=Io5XlxtyxvFVqJyCZwpt8S0+/c0O+hkIjDqWkHqr7i440rHunCGMB4ZS2yRqe0m+zbd0XI oNCWcXTZgkO5G8hVU1bW44dWzLXkRii+U8Sakn7sUAeIocRp4upjEeoI7h0K0tHaGo9ZiK Te3RnEEWEhCIeWawHk6ysDWKGWTGXuX7gL9K0mz2RfpSDjGDBysfJOkU+7c8HQVDJFXdn+ wG/i9Lfblmhi3OefJ8WkP5P/ld3tfh0dusSWiSNb1iY4ifig37RmgNP9jOAJA11nJm0ocB 6I5/DPhPpnBdoqqiAaokNdYfOH40aSE21QtbmajYlRlsXrG2P0UjGKqcTbPACQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778270750; a=rsa-sha256; cv=none; b=ALBAaW0AGjIyYWUiMqRJDAT3N4pauQxrN2f3Y74wxsNjnOSJgo6yFQ3yF2cClRct9PC3rc mrPGXo0Jy15s8nF3L+Yei2jMkahr/GU5koGN1uvHoj2GszBXYC58q2PkrME53esvX+Mecb AYLqp1WTFfhULxuwb/WbJ0vrXGVa+oNi+2Ezna/HiSNOzdRqTjtdxgyKTa2jtVyS7P/A4a aVqHTmGqL0E2XTTEz8s6v9+4PbHtkNpMYNDQOvupBBkXnWeQZulzvuY6bZKK9i5K+xWWQ0 CzfguQlVTZ5f3KkhUt42vk7gDgHY2BPJlM6+FiksW3JzQ8wBfqtKqVe/FsWAMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778270750; 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=4VEoqt6FpjzPUFbfBsUZvFdgyFyeryvwGz6ycDzavUk=; b=BrWXFmffXwLe4jWT/kUDg93yqAlOtLm0meZu3T9NVeWcGHUVje0DToPn+F/S6LfOSchFEj Nwpesphr/7r+v6cw+nKR7gvxoAY+lhJ5lD80YpPKbgT/0iqlN3KIEuN6NPQxhuvpS29nOh G1jxFj4gSIRLbxUm+KTCn8YmFu0TH7nQxiX3Li6bHfflnNOO968CU3kqEFwvye3q2pDGcu frrbGHrm27kG6VkYoJQD0pxFjWdOZsyFP7Gpn6yS8eObtjBl9CfIermXatTbD4AhLNQFgI Aml12UKqH5vHaZ6ZvoNQbaTkAyZvxPxtpjdKOauOUxd/msMusL35HQyxEZ0ycQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gC0VQ1QSGzCHb for ; Fri, 08 May 2026 20:05:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e236 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 20:05:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 324d53c26b23 - main - sys/time: rework saturation ifdef to avoid direct arch ref 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 324d53c26b2399d9b44fdd08e9c5af650f4ec3ae Auto-Submitted: auto-generated Date: Fri, 08 May 2026 20:05:50 +0000 Message-Id: <69fe421e.1e236.606f6a05@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=324d53c26b2399d9b44fdd08e9c5af650f4ec3ae commit 324d53c26b2399d9b44fdd08e9c5af650f4ec3ae Author: Ryan Libby AuthorDate: 2026-05-08 19:37:24 +0000 Commit: Ryan Libby CommitDate: 2026-05-08 19:37:24 +0000 sys/time: rework saturation ifdef to avoid direct arch ref Suggested by: kib Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D56401 --- sys/sys/time.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/time.h b/sys/sys/time.h index 6f18d8bd844d..5255d3bc9c7e 100644 --- a/sys/sys/time.h +++ b/sys/sys/time.h @@ -355,7 +355,7 @@ tstosbt(struct timespec _ts) static __inline sbintime_t tstosbt_sat(struct timespec _ts) { -#ifndef __i386__ +#if __SIZEOF_TIME_T > 4 if (_ts.tv_sec > SBT_MAX >> 32) return (SBT_MAX); if (_ts.tv_sec < -(SBT_MAX >> 32) - 1) @@ -384,7 +384,7 @@ tvtosbt(struct timeval _tv) static __inline sbintime_t tvtosbt_sat(struct timeval _tv) { -#ifndef __i386__ +#if __SIZEOF_TIME_T > 4 if (_tv.tv_sec > SBT_MAX >> 32) return (SBT_MAX); if (_tv.tv_sec < -(SBT_MAX >> 32) - 1) From nobody Fri May 8 22:51:34 2026 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 4gC49k0zTmz6d75R; Fri, 08 May 2026 22:51:38 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gC49j5lyXz3H0b; Fri, 08 May 2026 22:51:37 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001b.ext.cloudfilter.net ([10.228.9.171]) by cmsmtp with ESMTPS id LRx9wxPUyk14SLU2iwwVMo; Fri, 08 May 2026 22:51:36 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id LU2hwUzoquxscLU2iwW3UC; Fri, 08 May 2026 22:51:36 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=BZrVE7t2 c=1 sm=1 tr=0 ts=69fe68f8 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=NGcC8JguVDcA:10 a=6I5d2MoRAAAA:8 a=NEAV23lmAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=yJNcuj67nJIjCl48qfAA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id D3826146; Fri, 08 May 2026 15:51:34 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 98C9F10C; Fri, 08 May 2026 15:51:34 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Dimitry Andric cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: d9b272a19d39 - main - Merge commit 871038759afb from llvm git (by Marco Elver): In-reply-to: <69fe2846.42ccf.7f445ce5@gitrepo.freebsd.org> References: <69fe2846.42ccf.7f445ce5@gitrepo.freebsd.org> Comments: In-reply-to Dimitry Andric message dated "Fri, 08 May 2026 18:15:34 -0000." 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 08 May 2026 15:51:34 -0700 Message-Id: <20260508225134.98C9F10C@slippy.cwsent.com> X-CMAE-Envelope: MS4xfBbNgGmi8dHeVfkX7Nte3KmOx+8UK0j7qeCfFz6smsBPAnWgYbU0oPUybqvQW+LVYYjSQxheImydP2khGHZipFXrLMuK+du/3cD2VFdsVX4CT0ly+eEA 82M8MTXMRKMG3ImumCzECbtJu49lue4yc2Dl59FC8RoZ4ZWZDITEGJrtgr9RGYFa85EYifAz4PyG6bmrjLfdV/z6yr6n/jNY1dK3a1ywQCK02yXvABGTAZWX qjuXhHTTimnSJacY/wgmkNm9XKeRj5SF9ovggB5GJjGBrBiODOiqBbQw1IRjEwgnPAofHH0UIu6KVzen3hv2PXCS4HpgNOPHmbnAgvYENa4= X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4gC49j5lyXz3H0b X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated In message <69fe2846.42ccf.7f445ce5@gitrepo.freebsd.org>, Dimitry Andric writes : > The branch main has been updated by dim: > > URL: https://cgit.FreeBSD.org/src/commit/?id=d9b272a19d39f71665b529860bfed731 > bcfd99f5 > > commit d9b272a19d39f71665b529860bfed731bcfd99f5 > Author: Dimitry Andric > AuthorDate: 2026-05-08 17:59:54 +0000 > Commit: Dimitry Andric > CommitDate: 2026-05-08 17:59:54 +0000 > > Merge commit 871038759afb from llvm git (by Marco Elver): > > Thread Safety Analysis: Fix pointer handling of variables with deprecat > ed attributes (#148974) > > de10e44b6fe7 ("Thread Safety Analysis: Support warning on > passing/returning pointers to guarded variables") added checks for > passing pointer to guarded variables. While new features do not > necessarily need to support the deprecated attributes (`guarded_var`, > and `pt_guarded_var`), we need to ensure that such features do not caus > e > the compiler to crash. > > As such, code such as this: > > struct { > int v __attribute__((guarded_var)); > } p; > > int *g() { > return &p.v; // handleNoMutexHeld() with POK_ReturnPointer > } > > Would crash in debug builds with the assertion in handleNoMutexHeld() > triggering. The assertion is meant to capture the fact that this helper > should only be used for warnings on variables (which the deprecated > attributes only applied to). > > To fix, the function handleNoMutexHeld() should handle all POK cases > that apply to variables explicitly, and produce a best-effort warning. > > We refrain from introducing new warnings to avoid unnecessary code bloa > t > for deprecated features. > > Fixes: https://github.com/llvm/llvm-project/issues/140330 > > This fixes an assertion while building the net/openvswitch port: > "Assertion failed: ((POK == POK_VarAccess || POK == POK_VarDereference) > && "Only works for variables"), function handleNoMutexHeld, file > /usr/src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp, > line 2120.' > > Reported by: cy > PR: 295101, 292067 > MFC after: 1 month > --- > .../clang/lib/Sema/AnalysisBasedWarnings.cpp | 25 +++++++++++++++++--- > -- > 1 file changed, 20 insertions(+), 5 deletions(-) > > diff --git a/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp b/ > contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp > index ec39bca6039f..ab55cbceeaa8 100644 > --- a/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp > +++ b/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp > @@ -2116,11 +2116,26 @@ class ThreadSafetyReporter : public clang::threadSafe > ty::ThreadSafetyHandler { > > void handleNoMutexHeld(const NamedDecl *D, ProtectedOperationKind POK, > AccessKind AK, SourceLocation Loc) override { > - assert((POK == POK_VarAccess || POK == POK_VarDereference) && > - "Only works for variables"); > - unsigned DiagID = POK == POK_VarAccess? > - diag::warn_variable_requires_any_lock: > - diag::warn_var_deref_requires_any_lock; > + unsigned DiagID = 0; > + switch (POK) { > + case POK_VarAccess: > + case POK_PassByRef: > + case POK_ReturnByRef: > + case POK_PassPointer: > + case POK_ReturnPointer: > + DiagID = diag::warn_variable_requires_any_lock; > + break; > + case POK_VarDereference: > + case POK_PtPassByRef: > + case POK_PtReturnByRef: > + case POK_PtPassPointer: > + case POK_PtReturnPointer: > + DiagID = diag::warn_var_deref_requires_any_lock; > + break; > + case POK_FunctionCall: > + llvm_unreachable("Only works for variables"); > + break; > + } > PartialDiagnosticAt Warning(Loc, S.PDiag(DiagID) > << D << getLockKindFromAccessKind(AK)); > Warnings.emplace_back(std::move(Warning), getNotes()); > After updating the system and the poudriere jail it's still experiencing the same issue. A Snippet of poudriere output below. /bin/sh ./libtool --tag=CC --mode=compile cc -DHAVE_CONFIG_H -I. -I ./include -I ./include -I ./lib -I ./lib -I/usr/include -Wstrict-prototypes -Wall -Wextra -Wno-sign-compare -Wpointer-arith -Wformat -Wformat-security -Wswitch-enum -Wunused-parameter -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-field-initializers -Wthread-safety -fno-strict-aliasing -Wswitch-bool -Wlogical-not-parentheses -Wsizeof-array-argument -Wshift-negative-value -Qunused-arguments -Wshadow -Wno-null-pointer-arithmetic -Warray-bounds-pointer-arithmetic -O2 -pipe -Wno-misleading-indentation -Wno-tautological-overlap-compare -Wno-unused-but-set-variable -Wno-deprecated-literal-operator -Wno-misleading-indentation -Wno-tautological-overlap-compare -Wno-unused-but-set-variable -fstack-protector-strong -fno-strict-aliasing -mno-avx512f -MT lib/util.lo -MD -MP -MF $depbase.Tpo -c -o lib/util.lo lib/util.c &&\ mv -f $depbase.Tpo $depbase.Plo #0 0x000015af6c783b06 llvm::sys::PrintStackTrace(llvm::raw_ostream&, int) /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/Unix/Signals.inc:0:13 #1 0x000015af6c781543 llvm::sys::RunSignalHandlers() /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/Signals.cpp:105:18 #2 0x000015af6c7255a2 HandleCrash /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/CrashRecoveryContext.cpp:73:5 #3 0x000015af6c7255a2 CrashRecoverySignalHandler /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/CrashRecoveryContext.cpp:390:51 #4 0x000015af6f03493c handle_signal /opt/src/git-src/lib/libthr/thread/thr_sig.c:0:3 #5 0x000015af6f033f5b thr_sighandler /opt/src/git-src/lib/libthr/thread/thr_sig.c:262:1 #6 0x000015af60e282d3 ([vdso]+0x2d3) #7 0x000015af74a3fd8a _thr_kill /export/obj/opt/src/git-src/amd64.amd64/lib/libsys/thr_kill.S:4:0 #8 0x000015af71a58a54 raise /opt/src/git-src/lib/libc/gen/raise.c:0:10 #9 0x000015af71b0a769 abort /opt/src/git-src/lib/libc/stdlib/abort.c:67:17 #10 0x000015af71a3b591 (/lib/libc.so.7+0xa2591) #11 0x000015af662b64e6 handleNoMutexHeld /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp:0:5 #12 0x000015af65576664 hasAttrs /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:521:34 #13 0x000015af65576664 attr_begin /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:543:12 #14 0x000015af65576664 specific_attr_begin /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:568:38 #15 0x000015af65576664 specific_attrs /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:563:29 #16 0x000015af65576664 checkAccess /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:1775:27 #17 0x000015af65577976 examineArguments /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:2150:35 #18 0x000015af6557594b getCallee /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/Expr.h:3023:53 #19 0x000015af6557594b getCalleeDecl /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/Expr.h:3054:12 #20 0x000015af6557594b VisitCallExpr /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:2223:46 #21 0x000015af6556837b Visit /export/obj/opt/src/git-src/amd64.amd64/lib/clang/libclang/clang/AST/StmtNodes.inc:1622:1 #22 0x000015af6556837b runAnalysis /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:2655:26 #23 0x000015af655645ee operator() /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__vector/vector.h:250:18 #24 0x000015af655645ee ~vector /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__vector/vector.h:262:67 #25 0x000015af655645ee ~ThreadSafetyAnalyzer /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:1082:7 #26 0x000015af655645ee clang::threadSafety::runThreadSafetyAnalysis(clang::AnalysisDeclContext&, clang::threadSafety::ThreadSafetyHandler&, clang::threadSafety::BeforeSet**) /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:2743:1 #27 0x000015af662aa7d6 emitDiagnostics /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp:1997:44 #28 0x000015af662aa7d6 clang::sema::AnalysisBasedWarnings::IssueWarnings(clang::sema::AnalysisBasedWarnings::Policy, clang::sema::FunctionScopeInfo*, clang::Decl const*, clang::QualType) /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp:2982:14 #29 0x000015af6634f5e4 clang::Sema::PopFunctionScopeInfo(clang::sema::AnalysisBasedWarnings::Policy const*, clang::Decl const*, clang::QualType) /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/Sema.cpp:2458:3 #30 0x000015af664d892f reset /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__memory/unique_ptr.h:287:21 #31 0x000015af664d892f ~unique_ptr /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__memory/unique_ptr.h:259:71 #32 0x000015af664d892f clang::Sema::ActOnFinishFunctionBody(clang::Decl*, clang::Stmt*, bool) /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp:16687:3 #33 0x000015af6628555c clang::Parser::ParseFunctionStatementBody(clang::Decl*, clang::Parser::ParseScope&) /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/ParseStmt.cpp:2402:18 #34 0x000015af6629f843 clang::Parser::ParseFunctionDefinition(clang::ParsingDeclarator&, clang::Parser::ParsedTemplateInfo const&, clang::Parser::LateParsedAttrList*) /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:0:0 #35 0x000015af661ca5bc clang::Parser::ParseDeclGroup(clang::ParsingDeclSpec&, clang::DeclaratorContext, clang::ParsedAttributes&, clang::Parser::ParsedTemplateInfo&, clang::SourceLocation*, clang::Parser::ForRangeInit*) /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp:2266:18 #36 0x000015af6629e9bf clang::Parser::ParseDeclOrFunctionDefInternal(clang::ParsedAttributes&, clang::ParsedAttributes&, clang::ParsingDeclSpec&, clang::AccessSpecifier) /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:0:10 #37 0x000015af6629e1a5 clang::Parser::ParseDeclarationOrFunctionDefinition(clang::ParsedAttributes&, clang::ParsedAttributes&, clang::ParsingDeclSpec*, clang::AccessSpecifier) /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:1209:12 #38 0x000015af6629d10a clang::Parser::ParseExternalDeclaration(clang::ParsedAttributes&, clang::ParsedAttributes&, clang::ParsingDeclSpec*) /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:0:14 #39 0x000015af6629b8a5 clang::Parser::ParseTopLevelDecl(clang::OpaquePtr&, clang::Sema::ModuleImportState&) /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:745:10 #40 0x000015af661b4a4e clang::ParseAST(clang::Sema&, bool, bool) /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/ParseAST.cpp:169:5 #41 0x000015af6601fe48 clang::FrontendAction::Execute() /opt/src/git-src/contrib/llvm-project/clang/lib/Frontend/FrontendAction.cpp:1225:10 #42 0x000015af65fa08cd getPtr /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/Support/Error.h:278:42 #43 0x000015af65fa08cd operator bool /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/Support/Error.h:241:16 #44 0x000015af65fa08cd clang::CompilerInstance::ExecuteAction(clang::FrontendAction&) /opt/src/git-src/contrib/llvm-project/clang/lib/Frontend/CompilerInstance.cpp:1055:23 #45 0x000015af660c02a5 clang::ExecuteCompilerInvocation(clang::CompilerInstance*) /opt/src/git-src/contrib/llvm-project/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp:299:25 #46 0x000015af1464f224 cc1_main /opt/src/git-src/contrib/llvm-project/clang/tools/driver/cc1_main.cpp:297:15 #47 0x000015af1465d0a5 ExecuteCC1Tool /opt/src/git-src/contrib/llvm-project/clang/tools/driver/driver.cpp:225:12 #48 0x000015af65c6198e operator() /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Job.cpp:436:30 #49 0x000015af65c6198e callback_fn<(lambda at /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Job.cpp:436:22)> /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/ADT/STLFunctionalExtras.h:46:12 #50 0x000015af6c7251fc operator() /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/ADT/STLFunctionalExtras.h:0:12 #51 0x000015af6c7251fc llvm::CrashRecoveryContext::RunSafely(llvm::function_ref) /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/CrashRecoveryContext.cpp:426:3 #52 0x000015af65c60f0a clang::driver::CC1Command::Execute(llvm::ArrayRef>, std::__1::basic_string, std::__1::allocator>*, bool*) const /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Job.cpp:436:7 #53 0x000015af65c20844 clang::driver::Compilation::ExecuteCommand(clang::driver::Command const&, clang::driver::Command const*&, bool) const /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Compilation.cpp:196:15 #54 0x000015af65c20acc clang::driver::Compilation::ExecuteJobs(clang::driver::JobList const&, llvm::SmallVectorImpl>&, bool) const /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Compilation.cpp:251:13 #55 0x000015af65c40186 empty /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/ADT/SmallVector.h:82:46 #56 0x000015af65c40186 clang::driver::Driver::ExecuteCompilation(clang::driver::Compilation&, llvm::SmallVectorImpl>&) /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Driver.cpp:2246:23 #57 0x000015af1465c76c clang_main /opt/src/git-src/contrib/llvm-project/clang/tools/driver/driver.cpp:406:21 #58 0x000015af1465ae22 main /opt/src/git-src/usr.bin/clang/clang/clang-driver.cpp:17:10 #59 0x000015af71a2d3cf __libc_start1 /opt/src/git-src/lib/libc/csu/libc_start1.c:180:2 cc: error: clang frontend command failed with exit code 134 (use -v to see invocation) FreeBSD clang version 21.1.8 (https://github.com/llvm/llvm-project.git llvmorg-21.1.8-0-g2078da43e25a) Target: x86_64-unknown-freebsd16.0 Thread model: posix InstalledDir: /usr/bin Build config: +assertions cc: note: diagnostic msg: ******************** PLEASE ATTACH THE FOLLOWING FILES TO THE BUG REPORT: Preprocessed source(s) and associated run script(s) are located at: cc: note: diagnostic msg: /tmp/timeval-562747.c cc: note: diagnostic msg: /tmp/timeval-562747.sh cc: note: diagnostic msg: ******************** Trying this on a physical machine results in the same LLVM panic. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Fri May 8 23:33:04 2026 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 4gC55Z6CDmz6bx15; Fri, 08 May 2026 23:33:06 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gC55Z5vYXz3LRq; Fri, 08 May 2026 23:33:06 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778283186; 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: in-reply-to:in-reply-to:references:references; bh=Yu2A20Z/iiTniBNFySHRSyWBeYYWJbz8ImiQoXutkhE=; b=toHVg9SOKvIPmTwBEIa03yFBtTnaXDd+RVnedhTgvHYPMmJvHIqs6f2hFcdWVTGa8U641Q QOg4GQRxxP5v2mWa8VUT+yBjZN76rlxS+sNjFuLkuxyWXEFDCq9vrlCXMfyzfAedBii6iC 3tqXpQ/ZglPrpw2YdG93pCHja7t2fE8m6BzHuLRafCPCX3w7F8S15Ycb+PBm895pJT80g6 SKbX3DzO9uH/J5Y05W15hTe9BEZQ3vpS6nPmkeQyhkfudiMcy/vA4R67hyiSTpQH2Tlk7i QJLTkkiO+qHd48QfWgP+F1ovRFj7z8r2Ldm/HMzRdJGa0WPOkV0VIwIQGITyLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778283186; a=rsa-sha256; cv=none; b=MIYP7PfYsHbZUa/jSFmb1ZYGuiXFbscryjk3Pryb4/2ZbY0TO8+iyoe5PpA8O471K9dLZ0 P79whpV44K1QzEgWWfF8p6YcWg3BeIxls78zPNjrUpaT4umWX22jv35WxYhJgwXNWv+f/k TNQhklpRPC2AxH9WkeoEST7xBueIueAvIUw6HY9Sb9I8adhMwFCJhMvPKF8llKM/oyHzWz sv++CPdu8DswJq+tbEr2Tgv9E+7HJwsaPFJfp2hJLaUvl16wh7CRFH7L4IdEFvQji3zqvw yNrpwPvAmnH2rdjQmjhOflZBEqYi29ARQU/5LziaHdyiIzVCSXt6WPSALY70hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778283186; 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: in-reply-to:in-reply-to:references:references; bh=Yu2A20Z/iiTniBNFySHRSyWBeYYWJbz8ImiQoXutkhE=; b=yB5pJ+4yfVcJYgqchCEF2IN5ZkRIv+Ok6Tf9v1IjuABXvM0Ag+mGc2/fSdij/fH4pV9YZK B1bkIl5qpnmKDWcRcMC07fFJaViqW9HLE24BAVrg4faozcqV0XJX07IntkJcQGG9RIrIUk e3s5B8VlNd8CyUB5FBQx7NRC0nDRfKXIOcGACgP7tblYINiZjOU4f6kKI+bvi2mtVJnQch PmXfrWezENq5LDf2VShIQ1VD19L7KrAZellU4UBQSrjOPz9isAbYVaYh8VDfyN/tTUSSvs NIMgfhlho4ta4LAmwWVgsxnTQHzyHv+T6c1aRs+RjXGFPGhc5U3y/weBhIvhnQ== Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (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 ECDSA (prime256v1) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "E7" (not verified)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gC55Z4gybz16vF; Fri, 08 May 2026 23:33:06 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (bladnoch.home.andric.com [192.168.0.20]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 26A8C61BD7; Sat, 09 May 2026 01:33:05 +0200 (CEST) Content-Type: text/plain; charset=us-ascii 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.6\)) Subject: Re: git: d9b272a19d39 - main - Merge commit 871038759afb from llvm git (by Marco Elver): From: Dimitry Andric In-Reply-To: <20260508225134.98C9F10C@slippy.cwsent.com> Date: Sat, 9 May 2026 01:33:04 +0200 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <69fe2846.42ccf.7f445ce5@gitrepo.freebsd.org> <20260508225134.98C9F10C@slippy.cwsent.com> To: Cy Schubert X-Mailer: Apple Mail (2.3826.700.81.1.6) On 9 May 2026, at 00:51, Cy Schubert wrote: >=20 > In message <69fe2846.42ccf.7f445ce5@gitrepo.freebsd.org>, Dimitry = Andric writes > : >> The branch main has been updated by dim: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dd9b272a19d39f71665b529860bfed731= >> bcfd99f5 >>=20 >> commit d9b272a19d39f71665b529860bfed731bcfd99f5 >> Author: Dimitry Andric >> AuthorDate: 2026-05-08 17:59:54 +0000 >> Commit: Dimitry Andric >> CommitDate: 2026-05-08 17:59:54 +0000 >>=20 >> Merge commit 871038759afb from llvm git (by Marco Elver): >>=20 >> Thread Safety Analysis: Fix pointer handling of variables with = deprecat >> ed attributes (#148974) >>=20 >> de10e44b6fe7 ("Thread Safety Analysis: Support warning on >> passing/returning pointers to guarded variables") added checks = for >> passing pointer to guarded variables. While new features do not >> necessarily need to support the deprecated attributes = (`guarded_var`, >> and `pt_guarded_var`), we need to ensure that such features do = not caus >> e >> the compiler to crash. >>=20 >> As such, code such as this: >>=20 >> struct { >> int v __attribute__((guarded_var)); >> } p; >>=20 >> int *g() { >> return &p.v; // handleNoMutexHeld() with = POK_ReturnPointer >> } >>=20 >> Would crash in debug builds with the assertion in = handleNoMutexHeld() >> triggering. The assertion is meant to capture the fact that this = helper >> should only be used for warnings on variables (which the = deprecated >> attributes only applied to). >>=20 >> To fix, the function handleNoMutexHeld() should handle all POK = cases >> that apply to variables explicitly, and produce a best-effort = warning. >>=20 >> We refrain from introducing new warnings to avoid unnecessary = code bloa >> t >> for deprecated features. >>=20 >> Fixes: https://github.com/llvm/llvm-project/issues/140330 >>=20 >> This fixes an assertion while building the net/openvswitch port: >> "Assertion failed: ((POK =3D=3D POK_VarAccess || POK =3D=3D = POK_VarDereference) >> && "Only works for variables"), function handleNoMutexHeld, file >> = /usr/src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp, >> line 2120.' >>=20 >> Reported by: cy >> PR: 295101, 292067 >> MFC after: 1 month >> --- >> .../clang/lib/Sema/AnalysisBasedWarnings.cpp | 25 = +++++++++++++++++--- >> -- >> 1 file changed, 20 insertions(+), 5 deletions(-) >>=20 >> diff --git = a/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp b/ >> contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp >> index ec39bca6039f..ab55cbceeaa8 100644 >> --- a/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp >> +++ b/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp >> @@ -2116,11 +2116,26 @@ class ThreadSafetyReporter : public = clang::threadSafe >> ty::ThreadSafetyHandler { >>=20 >> void handleNoMutexHeld(const NamedDecl *D, ProtectedOperationKind = POK, >> AccessKind AK, SourceLocation Loc) override = { >> - assert((POK =3D=3D POK_VarAccess || POK =3D=3D = POK_VarDereference) && >> - "Only works for variables"); >> - unsigned DiagID =3D POK =3D=3D POK_VarAccess? >> - diag::warn_variable_requires_any_lock: >> - diag::warn_var_deref_requires_any_lock; >> + unsigned DiagID =3D 0; >> + switch (POK) { >> + case POK_VarAccess: >> + case POK_PassByRef: >> + case POK_ReturnByRef: >> + case POK_PassPointer: >> + case POK_ReturnPointer: >> + DiagID =3D diag::warn_variable_requires_any_lock; >> + break; >> + case POK_VarDereference: >> + case POK_PtPassByRef: >> + case POK_PtReturnByRef: >> + case POK_PtPassPointer: >> + case POK_PtReturnPointer: >> + DiagID =3D diag::warn_var_deref_requires_any_lock; >> + break; >> + case POK_FunctionCall: >> + llvm_unreachable("Only works for variables"); >> + break; >> + } >> PartialDiagnosticAt Warning(Loc, S.PDiag(DiagID) >> << D << getLockKindFromAccessKind(AK)); >> Warnings.emplace_back(std::move(Warning), getNotes()); >>=20 >=20 > After updating the system and the poudriere jail it's still = experiencing the same > issue. A Snippet of poudriere output below. >=20 > /bin/sh ./libtool --tag=3DCC --mode=3Dcompile cc -DHAVE_CONFIG_H = -I. -I ./include -I ./include -I ./lib -I ./lib -I/usr/include = -Wstrict-prototypes -Wall -Wextra -Wno-sign-compare -Wpointer-arith = -Wformat -Wformat-security -Wswitch-enum -Wunused-parameter = -Wbad-function-cast -Wcast-align -Wstrict-prototypes = -Wold-style-definition -Wmissing-prototypes -Wmissing-field-initializers = -Wthread-safety -fno-strict-aliasing -Wswitch-bool = -Wlogical-not-parentheses -Wsizeof-array-argument -Wshift-negative-value = -Qunused-arguments -Wshadow -Wno-null-pointer-arithmetic = -Warray-bounds-pointer-arithmetic -O2 -pipe = -Wno-misleading-indentation -Wno-tautological-overlap-compare = -Wno-unused-but-set-variable -Wno-deprecated-literal-operator = -Wno-misleading-indentation -Wno-tautological-overlap-compare = -Wno-unused-but-set-variable -fstack-protector-strong = -fno-strict-aliasing -mno-avx512f -MT lib/util.lo -MD -MP -MF = $depbase.Tpo -c -o lib/util.lo lib/util.c &&\ > mv -f $depbase.Tpo $depbase.Plo > #0 0x000015af6c783b06 llvm::sys::PrintStackTrace(llvm::raw_ostream&, = int) = /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/Unix/Signals.inc:0:= 13 > #1 0x000015af6c781543 llvm::sys::RunSignalHandlers() = /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/Signals.cpp:105:18 > #2 0x000015af6c7255a2 HandleCrash = /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/CrashRecoveryContex= t.cpp:73:5 > #3 0x000015af6c7255a2 CrashRecoverySignalHandler = /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/CrashRecoveryContex= t.cpp:390:51 > #4 0x000015af6f03493c handle_signal = /opt/src/git-src/lib/libthr/thread/thr_sig.c:0:3 > #5 0x000015af6f033f5b thr_sighandler = /opt/src/git-src/lib/libthr/thread/thr_sig.c:262:1 > #6 0x000015af60e282d3 ([vdso]+0x2d3) > #7 0x000015af74a3fd8a _thr_kill = /export/obj/opt/src/git-src/amd64.amd64/lib/libsys/thr_kill.S:4:0 > #8 0x000015af71a58a54 raise /opt/src/git-src/lib/libc/gen/raise.c:0:10 > #9 0x000015af71b0a769 abort = /opt/src/git-src/lib/libc/stdlib/abort.c:67:17 > #10 0x000015af71a3b591 (/lib/libc.so.7+0xa2591) > #11 0x000015af662b64e6 handleNoMutexHeld = /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings= .cpp:0:5 > #12 0x000015af65576664 hasAttrs = /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:5= 21:34 > #13 0x000015af65576664 attr_begin = /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:5= 43:12 > #14 0x000015af65576664 specific_attr_begin = /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:5= 68:38 > #15 0x000015af65576664 specific_attrs = /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:5= 63:29 > #16 0x000015af65576664 checkAccess = /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= 1775:27 > #17 0x000015af65577976 examineArguments = /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= 2150:35 > #18 0x000015af6557594b getCallee = /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/Expr.h:3023:= 53 > #19 0x000015af6557594b getCalleeDecl = /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/Expr.h:3054:= 12 > #20 0x000015af6557594b VisitCallExpr = /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= 2223:46 > #21 0x000015af6556837b Visit = /export/obj/opt/src/git-src/amd64.amd64/lib/clang/libclang/clang/AST/StmtN= odes.inc:1622:1 > #22 0x000015af6556837b runAnalysis = /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= 2655:26 > #23 0x000015af655645ee operator() = /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__vector/ve= ctor.h:250:18 > #24 0x000015af655645ee ~vector = /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__vector/ve= ctor.h:262:67 > #25 0x000015af655645ee ~ThreadSafetyAnalyzer = /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= 1082:7 > #26 0x000015af655645ee = clang::threadSafety::runThreadSafetyAnalysis(clang::AnalysisDeclContext&, = clang::threadSafety::ThreadSafetyHandler&, = clang::threadSafety::BeforeSet**) = /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= 2743:1 > #27 0x000015af662aa7d6 emitDiagnostics = /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings= .cpp:1997:44 > #28 0x000015af662aa7d6 = clang::sema::AnalysisBasedWarnings::IssueWarnings(clang::sema::AnalysisBas= edWarnings::Policy, clang::sema::FunctionScopeInfo*, clang::Decl const*, = clang::QualType) = /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings= .cpp:2982:14 > #29 0x000015af6634f5e4 = clang::Sema::PopFunctionScopeInfo(clang::sema::AnalysisBasedWarnings::Poli= cy const*, clang::Decl const*, clang::QualType) = /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/Sema.cpp:2458:3 > #30 0x000015af664d892f reset = /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__memory/un= ique_ptr.h:287:21 > #31 0x000015af664d892f ~unique_ptr = /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__memory/un= ique_ptr.h:259:71 > #32 0x000015af664d892f = clang::Sema::ActOnFinishFunctionBody(clang::Decl*, clang::Stmt*, bool) = /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp:16687:3 > #33 0x000015af6628555c = clang::Parser::ParseFunctionStatementBody(clang::Decl*, = clang::Parser::ParseScope&) = /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/ParseStmt.cpp:2402:1= 8 > #34 0x000015af6629f843 = clang::Parser::ParseFunctionDefinition(clang::ParsingDeclarator&, = clang::Parser::ParsedTemplateInfo const&, = clang::Parser::LateParsedAttrList*) = /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:0:0 > #35 0x000015af661ca5bc = clang::Parser::ParseDeclGroup(clang::ParsingDeclSpec&, = clang::DeclaratorContext, clang::ParsedAttributes&, = clang::Parser::ParsedTemplateInfo&, clang::SourceLocation*, = clang::Parser::ForRangeInit*) = /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp:2266:1= 8 > #36 0x000015af6629e9bf = clang::Parser::ParseDeclOrFunctionDefInternal(clang::ParsedAttributes&, = clang::ParsedAttributes&, clang::ParsingDeclSpec&, = clang::AccessSpecifier) = /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:0:10 > #37 0x000015af6629e1a5 = clang::Parser::ParseDeclarationOrFunctionDefinition(clang::ParsedAttribute= s&, clang::ParsedAttributes&, clang::ParsingDeclSpec*, = clang::AccessSpecifier) = /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:1209:12 > #38 0x000015af6629d10a = clang::Parser::ParseExternalDeclaration(clang::ParsedAttributes&, = clang::ParsedAttributes&, clang::ParsingDeclSpec*) = /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:0:14 > #39 0x000015af6629b8a5 = clang::Parser::ParseTopLevelDecl(clang::OpaquePtr&, = clang::Sema::ModuleImportState&) = /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:745:10 > #40 0x000015af661b4a4e clang::ParseAST(clang::Sema&, bool, bool) = /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/ParseAST.cpp:169:5 > #41 0x000015af6601fe48 clang::FrontendAction::Execute() = /opt/src/git-src/contrib/llvm-project/clang/lib/Frontend/FrontendAction.cp= p:1225:10 > #42 0x000015af65fa08cd getPtr = /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/Support/Error.h:27= 8:42 > #43 0x000015af65fa08cd operator bool = /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/Support/Error.h:24= 1:16 > #44 0x000015af65fa08cd = clang::CompilerInstance::ExecuteAction(clang::FrontendAction&) = /opt/src/git-src/contrib/llvm-project/clang/lib/Frontend/CompilerInstance.= cpp:1055:23 > #45 0x000015af660c02a5 = clang::ExecuteCompilerInvocation(clang::CompilerInstance*) = /opt/src/git-src/contrib/llvm-project/clang/lib/FrontendTool/ExecuteCompil= erInvocation.cpp:299:25 > #46 0x000015af1464f224 cc1_main = /opt/src/git-src/contrib/llvm-project/clang/tools/driver/cc1_main.cpp:297:= 15 > #47 0x000015af1465d0a5 ExecuteCC1Tool = /opt/src/git-src/contrib/llvm-project/clang/tools/driver/driver.cpp:225:12= > #48 0x000015af65c6198e operator() = /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Job.cpp:436:30 > #49 0x000015af65c6198e callback_fn<(lambda at = /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Job.cpp:436:22)> = /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/ADT/STLFunctionalE= xtras.h:46:12 > #50 0x000015af6c7251fc operator() = /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/ADT/STLFunctionalE= xtras.h:0:12 > #51 0x000015af6c7251fc = llvm::CrashRecoveryContext::RunSafely(llvm::function_ref) = /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/CrashRecoveryContex= t.cpp:426:3 > #52 0x000015af65c60f0a = clang::driver::CC1Command::Execute(llvm::ArrayRef>, std::__1::basic_string, = std::__1::allocator>*, bool*) const = /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Job.cpp:436:7 > #53 0x000015af65c20844 = clang::driver::Compilation::ExecuteCommand(clang::driver::Command = const&, clang::driver::Command const*&, bool) const = /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Compilation.cpp:196= :15 > #54 0x000015af65c20acc = clang::driver::Compilation::ExecuteJobs(clang::driver::JobList const&, = llvm::SmallVectorImpl>&, bool) const = /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Compilation.cpp:251= :13 > #55 0x000015af65c40186 empty = /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/ADT/SmallVector.h:= 82:46 > #56 0x000015af65c40186 = clang::driver::Driver::ExecuteCompilation(clang::driver::Compilation&, = llvm::SmallVectorImpl>&) = /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Driver.cpp:2246:23 > #57 0x000015af1465c76c clang_main = /opt/src/git-src/contrib/llvm-project/clang/tools/driver/driver.cpp:406:21= > #58 0x000015af1465ae22 main = /opt/src/git-src/usr.bin/clang/clang/clang-driver.cpp:17:10 > #59 0x000015af71a2d3cf __libc_start1 = /opt/src/git-src/lib/libc/csu/libc_start1.c:180:2 > cc: error: clang frontend command failed with exit code 134 (use -v to = see invocation) > FreeBSD clang version 21.1.8 (https://github.com/llvm/llvm-project.git = llvmorg-21.1.8-0-g2078da43e25a) > Target: x86_64-unknown-freebsd16.0 > Thread model: posix > InstalledDir: /usr/bin > Build config: +assertions > cc: note: diagnostic msg:=20 > ******************** >=20 > PLEASE ATTACH THE FOLLOWING FILES TO THE BUG REPORT: > Preprocessed source(s) and associated run script(s) are located at: > cc: note: diagnostic msg: /tmp/timeval-562747.c > cc: note: diagnostic msg: /tmp/timeval-562747.sh > cc: note: diagnostic msg:=20 >=20 > ******************** >=20 > Trying this on a physical machine results in the same LLVM panic. How did you rebuild the poudriere jail? I think due to dependency issues = you might not have gotten a new compiler, because for me it works OK = now. I'll see if I can bump the FREEBSD_CC_VERSION if it's needed, but I'd = rather not. You should probably try a fresh build. -Dimitry From nobody Fri May 8 23:49:47 2026 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 4gC5Sv2p6qz6bxxw; Fri, 08 May 2026 23:49:51 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gC5Sv0Nxlz3Mcl; Fri, 08 May 2026 23:49:50 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002b.ext.cloudfilter.net ([10.228.9.233]) by cmsmtp with ESMTPS id LMgowx6X1k14SLUx3wxZMB; Fri, 08 May 2026 23:49:49 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id LUx2wnXR0M2qiLUx3wmGpv; Fri, 08 May 2026 23:49:49 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=b+a/I9Gx c=1 sm=1 tr=0 ts=69fe769d a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=NGcC8JguVDcA:10 a=6I5d2MoRAAAA:8 a=NEAV23lmAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=SMJLPe1anlQe-p-EpDAA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 1C7C716A; Fri, 08 May 2026 16:49:48 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id D2B6C2A; Fri, 08 May 2026 16:49:47 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Dimitry Andric cc: Cy Schubert , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: d9b272a19d39 - main - Merge commit 871038759afb from llvm git (by Marco Elver): In-reply-to: References: <69fe2846.42ccf.7f445ce5@gitrepo.freebsd.org> <20260508225134.98C9F10C@slippy.cwsent.com> Comments: In-reply-to Dimitry Andric message dated "Sat, 09 May 2026 01:33:04 +0200." 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 08 May 2026 16:49:47 -0700 Message-Id: <20260508234947.D2B6C2A@slippy.cwsent.com> X-CMAE-Envelope: MS4xfN4+d4O091XYomEnCla6iBOvcpdUInT1FIY33jBgxSNQaZI+UE2bpPGiRLAxAdRPRc1TEBtB63OWL4+TnNSRxrxeTrvOxfeQYTnEMA+M9oMHdBGQ1MiB 2NK/SYsLMHc7V/xGKzMevP20QNuZMI5dgA783ktOSUhWKTKWKzqlFocs9nO4zH/i1dbgTRQnDQ0CkMrnio7vsvIKzb1vPSrkmJrK2rXwXsgHVw6uAz71iFJ4 OvOlCDP/EK5pOSOeARgaxjxY1cmSFEJOJOBBLQjNHzkn+0FPQXblohdQRxy4ghJIQzVxgHiQ/EkC1QU5gm+YvIPgSy/YRG2QXE9HIwwr/3I= X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4gC5Sv0Nxlz3Mcl X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated In message , Dimitry Andric w rites: > On 9 May 2026, at 00:51, Cy Schubert wrote: > >=20 > > In message <69fe2846.42ccf.7f445ce5@gitrepo.freebsd.org>, Dimitry = > Andric writes > > : > >> The branch main has been updated by dim: > >>=20 > >> URL: = > https://cgit.FreeBSD.org/src/commit/?id=3Dd9b272a19d39f71665b529860bfed731= > > >> bcfd99f5 > >>=20 > >> commit d9b272a19d39f71665b529860bfed731bcfd99f5 > >> Author: Dimitry Andric > >> AuthorDate: 2026-05-08 17:59:54 +0000 > >> Commit: Dimitry Andric > >> CommitDate: 2026-05-08 17:59:54 +0000 > >>=20 > >> Merge commit 871038759afb from llvm git (by Marco Elver): > >>=20 > >> Thread Safety Analysis: Fix pointer handling of variables with = > deprecat > >> ed attributes (#148974) > >>=20 > >> de10e44b6fe7 ("Thread Safety Analysis: Support warning on > >> passing/returning pointers to guarded variables") added checks = > for > >> passing pointer to guarded variables. While new features do not > >> necessarily need to support the deprecated attributes = > (`guarded_var`, > >> and `pt_guarded_var`), we need to ensure that such features do = > not caus > >> e > >> the compiler to crash. > >>=20 > >> As such, code such as this: > >>=20 > >> struct { > >> int v __attribute__((guarded_var)); > >> } p; > >>=20 > >> int *g() { > >> return &p.v; // handleNoMutexHeld() with = > POK_ReturnPointer > >> } > >>=20 > >> Would crash in debug builds with the assertion in = > handleNoMutexHeld() > >> triggering. The assertion is meant to capture the fact that this = > helper > >> should only be used for warnings on variables (which the = > deprecated > >> attributes only applied to). > >>=20 > >> To fix, the function handleNoMutexHeld() should handle all POK = > cases > >> that apply to variables explicitly, and produce a best-effort = > warning. > >>=20 > >> We refrain from introducing new warnings to avoid unnecessary = > code bloa > >> t > >> for deprecated features. > >>=20 > >> Fixes: https://github.com/llvm/llvm-project/issues/140330 > >>=20 > >> This fixes an assertion while building the net/openvswitch port: > >> "Assertion failed: ((POK =3D=3D POK_VarAccess || POK =3D=3D = > POK_VarDereference) > >> && "Only works for variables"), function handleNoMutexHeld, file > >> = > /usr/src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp, > >> line 2120.' > >>=20 > >> Reported by: cy > >> PR: 295101, 292067 > >> MFC after: 1 month > >> --- > >> .../clang/lib/Sema/AnalysisBasedWarnings.cpp | 25 = > +++++++++++++++++--- > >> -- > >> 1 file changed, 20 insertions(+), 5 deletions(-) > >>=20 > >> diff --git = > a/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp b/ > >> contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp > >> index ec39bca6039f..ab55cbceeaa8 100644 > >> --- a/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp > >> +++ b/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp > >> @@ -2116,11 +2116,26 @@ class ThreadSafetyReporter : public = > clang::threadSafe > >> ty::ThreadSafetyHandler { > >>=20 > >> void handleNoMutexHeld(const NamedDecl *D, ProtectedOperationKind = > POK, > >> AccessKind AK, SourceLocation Loc) override = > { > >> - assert((POK =3D=3D POK_VarAccess || POK =3D=3D = > POK_VarDereference) && > >> - "Only works for variables"); > >> - unsigned DiagID =3D POK =3D=3D POK_VarAccess? > >> - diag::warn_variable_requires_any_lock: > >> - diag::warn_var_deref_requires_any_lock; > >> + unsigned DiagID =3D 0; > >> + switch (POK) { > >> + case POK_VarAccess: > >> + case POK_PassByRef: > >> + case POK_ReturnByRef: > >> + case POK_PassPointer: > >> + case POK_ReturnPointer: > >> + DiagID =3D diag::warn_variable_requires_any_lock; > >> + break; > >> + case POK_VarDereference: > >> + case POK_PtPassByRef: > >> + case POK_PtReturnByRef: > >> + case POK_PtPassPointer: > >> + case POK_PtReturnPointer: > >> + DiagID =3D diag::warn_var_deref_requires_any_lock; > >> + break; > >> + case POK_FunctionCall: > >> + llvm_unreachable("Only works for variables"); > >> + break; > >> + } > >> PartialDiagnosticAt Warning(Loc, S.PDiag(DiagID) > >> << D << getLockKindFromAccessKind(AK)); > >> Warnings.emplace_back(std::move(Warning), getNotes()); > >>=20 > >=20 > > After updating the system and the poudriere jail it's still = > experiencing the same > > issue. A Snippet of poudriere output below. > >=20 > > /bin/sh ./libtool --tag=3DCC --mode=3Dcompile cc -DHAVE_CONFIG_H = > -I. -I ./include -I ./include -I ./lib -I ./lib -I/usr/include = > -Wstrict-prototypes -Wall -Wextra -Wno-sign-compare -Wpointer-arith = > -Wformat -Wformat-security -Wswitch-enum -Wunused-parameter = > -Wbad-function-cast -Wcast-align -Wstrict-prototypes = > -Wold-style-definition -Wmissing-prototypes -Wmissing-field-initializers = > -Wthread-safety -fno-strict-aliasing -Wswitch-bool = > -Wlogical-not-parentheses -Wsizeof-array-argument -Wshift-negative-value = > -Qunused-arguments -Wshadow -Wno-null-pointer-arithmetic = > -Warray-bounds-pointer-arithmetic -O2 -pipe = > -Wno-misleading-indentation -Wno-tautological-overlap-compare = > -Wno-unused-but-set-variable -Wno-deprecated-literal-operator = > -Wno-misleading-indentation -Wno-tautological-overlap-compare = > -Wno-unused-but-set-variable -fstack-protector-strong = > -fno-strict-aliasing -mno-avx512f -MT lib/util.lo -MD -MP -MF = > $depbase.Tpo -c -o lib/util.lo lib/util.c &&\ > > mv -f $depbase.Tpo $depbase.Plo > > #0 0x000015af6c783b06 llvm::sys::PrintStackTrace(llvm::raw_ostream&, = > int) = > /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/Unix/Signals.inc:0:= > 13 > > #1 0x000015af6c781543 llvm::sys::RunSignalHandlers() = > /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/Signals.cpp:105:18 > > #2 0x000015af6c7255a2 HandleCrash = > /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/CrashRecoveryContex= > t.cpp:73:5 > > #3 0x000015af6c7255a2 CrashRecoverySignalHandler = > /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/CrashRecoveryContex= > t.cpp:390:51 > > #4 0x000015af6f03493c handle_signal = > /opt/src/git-src/lib/libthr/thread/thr_sig.c:0:3 > > #5 0x000015af6f033f5b thr_sighandler = > /opt/src/git-src/lib/libthr/thread/thr_sig.c:262:1 > > #6 0x000015af60e282d3 ([vdso]+0x2d3) > > #7 0x000015af74a3fd8a _thr_kill = > /export/obj/opt/src/git-src/amd64.amd64/lib/libsys/thr_kill.S:4:0 > > #8 0x000015af71a58a54 raise /opt/src/git-src/lib/libc/gen/raise.c:0:10 > > #9 0x000015af71b0a769 abort = > /opt/src/git-src/lib/libc/stdlib/abort.c:67:17 > > #10 0x000015af71a3b591 (/lib/libc.so.7+0xa2591) > > #11 0x000015af662b64e6 handleNoMutexHeld = > /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings= > .cpp:0:5 > > #12 0x000015af65576664 hasAttrs = > /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:5= > 21:34 > > #13 0x000015af65576664 attr_begin = > /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:5= > 43:12 > > #14 0x000015af65576664 specific_attr_begin = > /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:5= > 68:38 > > #15 0x000015af65576664 specific_attrs = > /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:5= > 63:29 > > #16 0x000015af65576664 checkAccess = > /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= > 1775:27 > > #17 0x000015af65577976 examineArguments = > /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= > 2150:35 > > #18 0x000015af6557594b getCallee = > /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/Expr.h:3023:= > 53 > > #19 0x000015af6557594b getCalleeDecl = > /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/Expr.h:3054:= > 12 > > #20 0x000015af6557594b VisitCallExpr = > /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= > 2223:46 > > #21 0x000015af6556837b Visit = > /export/obj/opt/src/git-src/amd64.amd64/lib/clang/libclang/clang/AST/StmtN= > odes.inc:1622:1 > > #22 0x000015af6556837b runAnalysis = > /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= > 2655:26 > > #23 0x000015af655645ee operator() = > /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__vector/ve= > ctor.h:250:18 > > #24 0x000015af655645ee ~vector = > /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__vector/ve= > ctor.h:262:67 > > #25 0x000015af655645ee ~ThreadSafetyAnalyzer = > /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= > 1082:7 > > #26 0x000015af655645ee = > clang::threadSafety::runThreadSafetyAnalysis(clang::AnalysisDeclContext&, = > clang::threadSafety::ThreadSafetyHandler&, = > clang::threadSafety::BeforeSet**) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= > 2743:1 > > #27 0x000015af662aa7d6 emitDiagnostics = > /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings= > .cpp:1997:44 > > #28 0x000015af662aa7d6 = > clang::sema::AnalysisBasedWarnings::IssueWarnings(clang::sema::AnalysisBas= > edWarnings::Policy, clang::sema::FunctionScopeInfo*, clang::Decl const*, = > clang::QualType) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings= > .cpp:2982:14 > > #29 0x000015af6634f5e4 = > clang::Sema::PopFunctionScopeInfo(clang::sema::AnalysisBasedWarnings::Poli= > cy const*, clang::Decl const*, clang::QualType) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/Sema.cpp:2458:3 > > #30 0x000015af664d892f reset = > /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__memory/un= > ique_ptr.h:287:21 > > #31 0x000015af664d892f ~unique_ptr = > /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__memory/un= > ique_ptr.h:259:71 > > #32 0x000015af664d892f = > clang::Sema::ActOnFinishFunctionBody(clang::Decl*, clang::Stmt*, bool) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp:16687:3 > > #33 0x000015af6628555c = > clang::Parser::ParseFunctionStatementBody(clang::Decl*, = > clang::Parser::ParseScope&) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/ParseStmt.cpp:2402:1= > 8 > > #34 0x000015af6629f843 = > clang::Parser::ParseFunctionDefinition(clang::ParsingDeclarator&, = > clang::Parser::ParsedTemplateInfo const&, = > clang::Parser::LateParsedAttrList*) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:0:0 > > #35 0x000015af661ca5bc = > clang::Parser::ParseDeclGroup(clang::ParsingDeclSpec&, = > clang::DeclaratorContext, clang::ParsedAttributes&, = > clang::Parser::ParsedTemplateInfo&, clang::SourceLocation*, = > clang::Parser::ForRangeInit*) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp:2266:1= > 8 > > #36 0x000015af6629e9bf = > clang::Parser::ParseDeclOrFunctionDefInternal(clang::ParsedAttributes&, = > clang::ParsedAttributes&, clang::ParsingDeclSpec&, = > clang::AccessSpecifier) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:0:10 > > #37 0x000015af6629e1a5 = > clang::Parser::ParseDeclarationOrFunctionDefinition(clang::ParsedAttribute= > s&, clang::ParsedAttributes&, clang::ParsingDeclSpec*, = > clang::AccessSpecifier) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:1209:12 > > #38 0x000015af6629d10a = > clang::Parser::ParseExternalDeclaration(clang::ParsedAttributes&, = > clang::ParsedAttributes&, clang::ParsingDeclSpec*) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:0:14 > > #39 0x000015af6629b8a5 = > clang::Parser::ParseTopLevelDecl(clang::OpaquePtr&, = > clang::Sema::ModuleImportState&) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:745:10 > > #40 0x000015af661b4a4e clang::ParseAST(clang::Sema&, bool, bool) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/ParseAST.cpp:169:5 > > #41 0x000015af6601fe48 clang::FrontendAction::Execute() = > /opt/src/git-src/contrib/llvm-project/clang/lib/Frontend/FrontendAction.cp= > p:1225:10 > > #42 0x000015af65fa08cd getPtr = > /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/Support/Error.h:27= > 8:42 > > #43 0x000015af65fa08cd operator bool = > /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/Support/Error.h:24= > 1:16 > > #44 0x000015af65fa08cd = > clang::CompilerInstance::ExecuteAction(clang::FrontendAction&) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Frontend/CompilerInstance.= > cpp:1055:23 > > #45 0x000015af660c02a5 = > clang::ExecuteCompilerInvocation(clang::CompilerInstance*) = > /opt/src/git-src/contrib/llvm-project/clang/lib/FrontendTool/ExecuteCompil= > erInvocation.cpp:299:25 > > #46 0x000015af1464f224 cc1_main = > /opt/src/git-src/contrib/llvm-project/clang/tools/driver/cc1_main.cpp:297:= > 15 > > #47 0x000015af1465d0a5 ExecuteCC1Tool = > /opt/src/git-src/contrib/llvm-project/clang/tools/driver/driver.cpp:225:12= > > > #48 0x000015af65c6198e operator() = > /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Job.cpp:436:30 > > #49 0x000015af65c6198e callback_fn<(lambda at = > /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Job.cpp:436:22)> = > /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/ADT/STLFunctionalE= > xtras.h:46:12 > > #50 0x000015af6c7251fc operator() = > /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/ADT/STLFunctionalE= > xtras.h:0:12 > > #51 0x000015af6c7251fc = > llvm::CrashRecoveryContext::RunSafely(llvm::function_ref) = > /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/CrashRecoveryContex= > t.cpp:426:3 > > #52 0x000015af65c60f0a = > clang::driver::CC1Command::Execute(llvm::ArrayRef :StringRef>>, std::__1::basic_string, = > std::__1::allocator>*, bool*) const = > /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Job.cpp:436:7 > > #53 0x000015af65c20844 = > clang::driver::Compilation::ExecuteCommand(clang::driver::Command = > const&, clang::driver::Command const*&, bool) const = > /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Compilation.cpp:196= > :15 > > #54 0x000015af65c20acc = > clang::driver::Compilation::ExecuteJobs(clang::driver::JobList const&, = > llvm::SmallVectorImpl const*>>&, bool) const = > /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Compilation.cpp:251= > :13 > > #55 0x000015af65c40186 empty = > /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/ADT/SmallVector.h:= > 82:46 > > #56 0x000015af65c40186 = > clang::driver::Driver::ExecuteCompilation(clang::driver::Compilation&, = > llvm::SmallVectorImpl const*>>&) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Driver.cpp:2246:23 > > #57 0x000015af1465c76c clang_main = > /opt/src/git-src/contrib/llvm-project/clang/tools/driver/driver.cpp:406:21= > > > #58 0x000015af1465ae22 main = > /opt/src/git-src/usr.bin/clang/clang/clang-driver.cpp:17:10 > > #59 0x000015af71a2d3cf __libc_start1 = > /opt/src/git-src/lib/libc/csu/libc_start1.c:180:2 > > cc: error: clang frontend command failed with exit code 134 (use -v to = > see invocation) > > FreeBSD clang version 21.1.8 (https://github.com/llvm/llvm-project.git = > llvmorg-21.1.8-0-g2078da43e25a) > > Target: x86_64-unknown-freebsd16.0 > > Thread model: posix > > InstalledDir: /usr/bin > > Build config: +assertions > > cc: note: diagnostic msg:=20 > > ******************** > >=20 > > PLEASE ATTACH THE FOLLOWING FILES TO THE BUG REPORT: > > Preprocessed source(s) and associated run script(s) are located at: > > cc: note: diagnostic msg: /tmp/timeval-562747.c > > cc: note: diagnostic msg: /tmp/timeval-562747.sh > > cc: note: diagnostic msg:=20 > >=20 > > ******************** > >=20 > > Trying this on a physical machine results in the same LLVM panic. > > How did you rebuild the poudriere jail? I think due to dependency issues = > you might not have gotten a new compiler, because for me it works OK = > now. I install my jail using my /usr/obj and update using, poudriere jail -j HEADamd64 -u > > I'll see if I can bump the FREEBSD_CC_VERSION if it's needed, but I'd = > rather not. You should probably try a fresh build. World should have been built incrementally but looking at bash history I may have only built the kernel. My mistake. Sorry for the noise. > > -Dimitry -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Fri May 8 23:55:14 2026 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 4gC5b64LFTz6bywH for ; Fri, 08 May 2026 23:55:14 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gC5b63vX0z3N3J for ; Fri, 08 May 2026 23:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778284514; 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=B+aoTseTtBcxmocZ36fyuA7Conoh6tsEaZO4CkGzmtc=; b=PNMYqmYVR9lESmRsR96O93p2oIo7T40mCzLrAICDR1fUqt9cRXOhz15GFMMFiUO50dV/rQ PVQ3v2IyIJk5x8H+0oDDVT1Na/gz8e6RQV7bpkFaAy/ZjjYDuMdWhJWtSNMuGOwk3BE3aN zZVyDzoIBb2DFWssPxFBNdlU/byW9wSdWIJI9Uxc4v049WeUCqugeUhWmRMu8iho9L7Vsy Cr1FPYABR/v1C0yZQz7j1ONmEQ/jAjqKU1K1C49IYxoDSo1hHzoBej9yZD8xDma/2syxw5 V/T/t3GXuEYqhnnFo4wSUPeGlfh+k5uz5j1IV2l/UfXXAauuPxzsTiLLxpvMPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778284514; a=rsa-sha256; cv=none; b=WfGeRlKZkUlRZ/2h5Ehj5j+mfO8G8p/WJHObaIexPQ/5pXPwvRc+esHExBFWa/b6hN8/E3 nFh98Oth0RunM7jHJbXJxshWynptC8yZdX4CDSusbVTaYlrpjV1oteVsEbMfGSOCVfP1wY nb6Zb+TlwuTq9pgh5zifI5YyxldfuUQgkvbdmUorgngOiOSOVhnqqYBd6Vkr4z1JZ5HzrO 0sOujQAaT5ywzaOvC+GwGhI6E4VLm62AQFsT0eg2VwW37gZH28tcLoMdN2oL5Bm2PSgaEn CMLOpAYnzvYFhkEVr2I/NZg34s6Fa+2yPgksjEiQwAwok9r3fe87doTdFcQwOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778284514; 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=B+aoTseTtBcxmocZ36fyuA7Conoh6tsEaZO4CkGzmtc=; b=e8s+HoPyMZ0tIvclrQERN2ao2TcFXw2r072CerrYLYqjQ19275yfVMuyMatA+vbZ/4kON/ 9vqbgaPBPZSS476ttXxrnySRPSo7EfXAfK4HIlaz+Z2RgglQOrnr/bBckNBX/s1iwOqoLP NgWCpUTfwIDYufd3+y9ljga/pu/G88MQ39Fe1w1ytdMPTE7/fLRrS5x4vEAXOSEfmfjbkf zjWYXg8iKccEDz5vZyreM5zHMEMgcgX75IAF8x1fh1CNTb6nxssI+G1TykiOa82U6c5rO+ WGTsfrdhq/IpFwnFRP6rA05M6BKq/+5mGbITJ1IwCKfDxCpBIhP0KCnZ8srihw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gC5b63TjSzbWb for ; Fri, 08 May 2026 23:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f107 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 23:55:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 1bef5535c1f1 - main - cxgbe(4): Updates to the hw and fw headers and config file 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bef5535c1f191055e545cad029eabe939d93d24 Auto-Submitted: auto-generated Date: Fri, 08 May 2026 23:55:14 +0000 Message-Id: <69fe77e2.3f107.57b32233@gitrepo.freebsd.org> The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=1bef5535c1f191055e545cad029eabe939d93d24 commit 1bef5535c1f191055e545cad029eabe939d93d24 Author: Navdeep Parhar AuthorDate: 2026-03-09 18:19:49 +0000 Commit: Navdeep Parhar CommitDate: 2026-05-08 22:26:02 +0000 cxgbe(4): Updates to the hw and fw headers and config file MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/common/t4_regs.h | 51 ++++++-------- sys/dev/cxgbe/firmware/t4fw_interface.h | 107 +++++++++++++++++++++++++++--- sys/dev/cxgbe/firmware/t7fw_cfg.txt | 19 +++--- sys/dev/cxgbe/firmware/t7fw_cfg_uwire.txt | 19 +++--- sys/dev/cxgbe/t4_main.c | 15 +++-- 5 files changed, 154 insertions(+), 57 deletions(-) diff --git a/sys/dev/cxgbe/common/t4_regs.h b/sys/dev/cxgbe/common/t4_regs.h index 09d0d4aa2c08..9984461352d0 100644 --- a/sys/dev/cxgbe/common/t4_regs.h +++ b/sys/dev/cxgbe/common/t4_regs.h @@ -1465,10 +1465,10 @@ #define A_SGE_INT_ENABLE3 0x1040 #define A_SGE_FL_BUFFER_SIZE0 0x1044 -#define S_SIZE 4 +#define CXGBE_S_SIZE 4 #define CXGBE_M_SIZE 0xfffffffU -#define V_SIZE(x) ((x) << S_SIZE) -#define G_SIZE(x) (((x) >> S_SIZE) & CXGBE_M_SIZE) +#define CXGBE_V_SIZE(x) ((x) << S_SIZE) +#define CXGBE_G_SIZE(x) (((x) >> S_SIZE) & CXGBE_M_SIZE) #define S_T6_SIZE 4 #define M_T6_SIZE 0xfffffU @@ -26578,15 +26578,10 @@ #define V_CIM_ULP_TX_PKT_ERR_CODE(x) ((x) << S_CIM_ULP_TX_PKT_ERR_CODE) #define G_CIM_ULP_TX_PKT_ERR_CODE(x) (((x) >> S_CIM_ULP_TX_PKT_ERR_CODE) & M_CIM_ULP_TX_PKT_ERR_CODE) -#define S_CIM_SGE1_PKT_ERR_CODE 8 -#define M_CIM_SGE1_PKT_ERR_CODE 0xffU -#define V_CIM_SGE1_PKT_ERR_CODE(x) ((x) << S_CIM_SGE1_PKT_ERR_CODE) -#define G_CIM_SGE1_PKT_ERR_CODE(x) (((x) >> S_CIM_SGE1_PKT_ERR_CODE) & M_CIM_SGE1_PKT_ERR_CODE) - -#define S_CIM_SGE0_PKT_ERR_CODE 0 -#define M_CIM_SGE0_PKT_ERR_CODE 0xffU -#define V_CIM_SGE0_PKT_ERR_CODE(x) ((x) << S_CIM_SGE0_PKT_ERR_CODE) -#define G_CIM_SGE0_PKT_ERR_CODE(x) (((x) >> S_CIM_SGE0_PKT_ERR_CODE) & M_CIM_SGE0_PKT_ERR_CODE) +#define S_CIM_SGE_PKT_ERR_CODE 0 +#define M_CIM_SGE_PKT_ERR_CODE 0xffU +#define V_CIM_SGE_PKT_ERR_CODE(x) ((x) << S_CIM_SGE_PKT_ERR_CODE) +#define G_CIM_SGE_PKT_ERR_CODE(x) (((x) >> S_CIM_SGE_PKT_ERR_CODE) & M_CIM_SGE_PKT_ERR_CODE) #define S_CIM_PCIE_PKT_ERR_CODE 8 #define M_CIM_PCIE_PKT_ERR_CODE 0xffU @@ -60550,17 +60545,15 @@ #define A_MAC_PORT_PTP_DRIFT_ADJUST_COUNT 0x9a0 #define A_MAC_PORT_PTP_OFFSET_ADJUST_FINE 0x9a4 -#if 0 -#define S_B 16 -#define M_B 0xffffU -#define V_B(x) ((x) << S_B) -#define G_B(x) (((x) >> S_B) & M_B) -#endif +#define CXGBE_S_B 16 +#define CXGBE_M_B 0xffffU +#define CXGBE_V_B(x) ((x) << CXGBE_S_B) +#define CXGBE_G_B(x) (((x) >> CXGBE_S_B) & CXGBE_M_B) -#define S_A 0 -#define M_A 0xffffU -#define V_A(x) ((x) << S_A) -#define G_A(x) (((x) >> S_A) & M_A) +#define CXGBE_S_A 0 +#define CXGBE_M_A 0xffffU +#define CXGBE_V_A(x) ((x) << CXGBE_S_A) +#define CXGBE_G_A(x) (((x) >> CXGBE_S_A) & CXGBE_M_A) #define A_MAC_PORT_PTP_OFFSET_ADJUST_TOTAL 0x9a8 #define A_MAC_PORT_PTP_CFG 0x9ac @@ -62257,10 +62250,10 @@ #define A_MAC_PORT_MTIP_VLAN_TPID_0 0x1a00 -#define S_VLANTAG 0 +#define CXGBE_S_VLANTAG 0 #define CXGBE_M_VLANTAG 0xffffU -#define V_VLANTAG(x) ((x) << S_VLANTAG) -#define G_VLANTAG(x) (((x) >> S_VLANTAG) & M_VLANTAG) +#define CXGBE_V_VLANTAG(x) ((x) << CXGBE_S_VLANTAG) +#define CXGBE_G_VLANTAG(x) (((x) >> CXGBE_S_VLANTAG) & CXGBE_M_VLANTAG) #define A_MAC_PORT_MTIP_VLAN_TPID_1 0x1a04 #define A_MAC_PORT_MTIP_VLAN_TPID_2 0x1a08 @@ -69613,10 +69606,10 @@ #define V_INIT_ENABLE(x) ((x) << S_INIT_ENABLE) #define F_INIT_ENABLE V_INIT_ENABLE(1U) -#define S_WAIT 16 -#define M_WAIT 0xfffU -#define CXGBE_V_WAIT(x) ((x) << S_WAIT) -#define G_WAIT(x) (((x) >> S_WAIT) & M_WAIT) +#define CXGBE_S_WAIT 16 +#define CXGBE_M_WAIT 0xfffU +#define CXGBE_V_WAIT(x) ((x) << CXGBE_S_WAIT) +#define CXGBE_G_WAIT(x) (((x) >> CXGBE_S_WAIT) & CXGBE_M_WAIT) #define S_EN_MULTI_RANK_SEL 4 #define V_EN_MULTI_RANK_SEL(x) ((x) << S_EN_MULTI_RANK_SEL) diff --git a/sys/dev/cxgbe/firmware/t4fw_interface.h b/sys/dev/cxgbe/firmware/t4fw_interface.h index b11552dce021..6235a2c3fab4 100644 --- a/sys/dev/cxgbe/firmware/t4fw_interface.h +++ b/sys/dev/cxgbe/firmware/t4fw_interface.h @@ -2560,6 +2560,22 @@ struct fw_ri_wr { __be32 tpt_offset_t10_config; __be32 r8[2]; } nvmet_init; + struct fw_ri_iscsi_init { + __u8 type; + __u8 dcrc_dis_to_hcrc; + __u8 r4[3]; + __u8 qp_caps; + __be16 r5; + __be32 pdid; + __be32 qpid; + __be32 sq_eqid; + __be32 r6; + __be32 scqid; + __be32 rcqid; + __be32 r7[4]; + __be32 r8[2]; + __be64 r9; + } iscsi_init; struct fw_ri_fini { __u8 type; __u8 r3[7]; @@ -2634,6 +2650,37 @@ struct fw_ri_wr { #define G_FW_RI_WR_T10_CONFIG(x) \ (((x) >> S_FW_RI_WR_T10_CONFIG) & M_FW_RI_WR_T10_CONFIG) +#define S_FW_RI_WR_DCRC_DIS 7 +#define M_FW_RI_WR_DCRC_DIS 0x1 +#define V_FW_RI_WR_DCRC_DIS(x) ((x) << S_FW_RI_WR_DCRC_DIS) +#define G_FW_RI_WR_DCRC_DIS(x) \ + (((x) >> S_FW_RI_WR_DCRC_DIS) & M_FW_RI_WR_DCRC_DIS) +#define F_FW_RI_WR_DCRC_DIS V_FW_RI_WR_DCRC_DIS(1U) + +#define S_FW_RI_WR_HCRC_DIS 6 +#define M_FW_RI_WR_HCRC_DIS 0x1 +#define V_FW_RI_WR_HCRC_DIS(x) ((x) << S_FW_RI_WR_HCRC_DIS) +#define G_FW_RI_WR_HCRC_DIS(x) \ + (((x) >> S_FW_RI_WR_HCRC_DIS) & M_FW_RI_WR_HCRC_DIS) +#define F_FW_RI_WR_HCRC_DIS V_FW_RI_WR_HCRC_DIS(1U) + +#define S_FW_RI_WR_PSZ_IDX 4 +#define M_FW_RI_WR_PSZ_IDX 0x3 +#define V_FW_RI_WR_PSZ_IDX(x) ((x) << S_FW_RI_WR_PSZ_IDX) +#define G_FW_RI_WR_PSZ_IDX(x) \ + (((x) >> S_FW_RI_WR_PSZ_IDX) & M_FW_RI_WR_PSZ_IDX) + +#define S_FW_RI_WR_DCRC 1 +#define M_FW_RI_WR_DCRC 0x1 +#define V_FW_RI_WR_DCRC(x) ((x) << S_FW_RI_WR_DCRC) +#define G_FW_RI_WR_DCRC(x) (((x) >> S_FW_RI_WR_DCRC) & M_FW_RI_WR_DCRC) +#define F_FW_RI_WR_DCRC V_FW_RI_WR_DCRC(1U) + +#define S_FW_RI_WR_HCRC 0 +#define M_FW_RI_WR_HCRC 0x1 +#define V_FW_RI_WR_HCRC(x) ((x) << S_FW_RI_WR_HCRC) +#define G_FW_RI_WR_HCRC(x) (((x) >> S_FW_RI_WR_HCRC) & M_FW_RI_WR_HCRC) +#define F_FW_RI_WR_HCRC V_FW_RI_WR_HCRC(1U) /****************************************************************************** * R o C E V 2 W O R K R E Q U E S T s @@ -2951,6 +2998,24 @@ struct fw_v2_nvmet_tx_data_wr { #endif }; +#define S_FW_V2_NVMET_TX_DATA_WR_DACK_CHANGE 20 +#define M_FW_V2_NVMET_TX_DATA_WR_DACK_CHANGE 0x1 +#define V_FW_V2_NVMET_TX_DATA_WR_DACK_CHANGE(x) \ + ((x) << S_FW_V2_NVMET_TX_DATA_WR_DACK_CHANGE) +#define G_FW_V2_NVMET_TX_DATA_WR_DACK_CHANGE(x) \ + (((x) >> S_FW_V2_NVMET_TX_DATA_WR_DACK_CHANGE) & \ + M_FW_V2_NVMET_TX_DATA_WR_DACK_CHANGE) +#define F_FW_V2_NVMET_TX_DATA_WR_DACK_CHANGE \ + V_FW_V2_NVMET_TX_DATA_WR_DACK_CHANGE(1U) + +#define S_FW_V2_NVMET_TX_DATA_WR_DACK_MODE 18 +#define M_FW_V2_NVMET_TX_DATA_WR_DACK_MODE 0x3 +#define V_FW_V2_NVMET_TX_DATA_WR_DACK_MODE(x) \ + ((x) << S_FW_V2_NVMET_TX_DATA_WR_DACK_MODE) +#define G_FW_V2_NVMET_TX_DATA_WR_DACK_MODE(x) \ + (((x) >> S_FW_V2_NVMET_TX_DATA_WR_DACK_MODE) & \ + M_FW_V2_NVMET_TX_DATA_WR_DACK_MODE) + #define S_FW_V2_NVMET_TX_DATA_WR_FLAGS_HI 10 #define M_FW_V2_NVMET_TX_DATA_WR_FLAGS_HI 0x3fffff #define V_FW_V2_NVMET_TX_DATA_WR_FLAGS_HI(x) \ @@ -4990,6 +5055,16 @@ struct fw_crypto_update_sa_wr { } key; }; +#define S_FW_CRYPTO_UPDATE_SA_WR_EG_IPVER 3 +#define M_FW_CRYPTO_UPDATE_SA_WR_EG_IPVER 0x1 +#define V_FW_CRYPTO_UPDATE_SA_WR_EG_IPVER(x) \ + ((x) << S_FW_CRYPTO_UPDATE_SA_WR_EG_IPVER) +#define G_FW_CRYPTO_UPDATE_SA_WR_EG_IPVER(x) \ + (((x) >> S_FW_CRYPTO_UPDATE_SA_WR_EG_IPVER) & \ + M_FW_CRYPTO_UPDATE_SA_WR_EG_IPVER) +#define F_FW_CRYPTO_UPDATE_SA_WR_EG_IPVER \ + V_FW_CRYPTO_UPDATE_SA_WR_EG_IPVER(1U) + #define S_FW_CRYPTO_UPDATE_SA_WR_SAOP 2 #define M_FW_CRYPTO_UPDATE_SA_WR_SAOP 0x1 #define V_FW_CRYPTO_UPDATE_SA_WR_SAOP(x) \ @@ -8952,24 +9027,40 @@ enum fw_port_type { FW_PORT_TYPE_KX4 = 5, /* No, 4, No, No, Yes, Yes, 10G */ FW_PORT_TYPE_CX4 = 6, /* No, 4, No, No, No, No, 10G */ FW_PORT_TYPE_KX = 7, /* No, 1, No, No, Yes, No, 1G */ - FW_PORT_TYPE_KR = 8, /* No, 1, No, No, Yes, Yes, 10G */ + FW_PORT_TYPE_KR = 8, /* No, 1, No, No, Yes, Yes, 10G BP AN */ FW_PORT_TYPE_SFP = 9, /* No, 1, Yes, No, No, No, 10G */ - FW_PORT_TYPE_BP_AP = 10, /* No, 1, No, No, Yes, Yes, 10G, BP ANGE */ - FW_PORT_TYPE_BP4_AP = 11, /* No, 4, No, No, Yes, Yes, 10G, BP ANGE */ + FW_PORT_TYPE_BP_AP = 10, /* No, 1, No, No, Yes, Yes, 10G, BP AN */ + FW_PORT_TYPE_BP4_AP = 11, /* No, 4, No, No, Yes, Yes, 10G, BP AN */ FW_PORT_TYPE_QSFP_10G = 12, /* No, 1, Yes, No, No, No, 10G */ FW_PORT_TYPE_QSA = 13, /* No, 1, Yes, No, No, No, 10G */ FW_PORT_TYPE_QSFP = 14, /* No, 4, Yes, No, No, No, 40G */ - FW_PORT_TYPE_BP40_BA = 15, /* No, 4, No, No, Yes, Yes, 40G/10G/1G, BP ANGE */ - FW_PORT_TYPE_KR4_100G = 16, /* No, 4, 100G/40G/25G, Backplane */ + FW_PORT_TYPE_BP40_BA = 15, /* No, 4, No, No, Yes, Yes, 40G/10G/1G, BP AN */ + FW_PORT_TYPE_KR4_100G = 16, /* No, 4, 100G/40G/50G/25G/10G/1G, BP AN */ FW_PORT_TYPE_CR4_QSFP = 17, /* No, 4, 100G/40G/25G */ - FW_PORT_TYPE_CR_QSFP = 18, /* No, 1, 25G Spider cable */ - FW_PORT_TYPE_CR2_QSFP = 19, /* No, 2, 50G */ + FW_PORT_TYPE_CR_QSFP = 18, /* No, 1, 25G, Spider cable */ + FW_PORT_TYPE_CR2_QSFP = 19, /* No, 2, 50G, Spider cable */ FW_PORT_TYPE_SFP28 = 20, /* No, 1, 25G/10G/1G */ FW_PORT_TYPE_KR_SFP28 = 21, /* No, 1, 25G/10G/1G using Backplane */ FW_PORT_TYPE_KR_XLAUI = 22, /* No, 4, 40G/10G/1G, No AN*/ + FW_PORT_TYPE_BARE_LINK_50G = 23, /* No, 1, 50G */ + FW_PORT_TYPE_BARE_LINK_100G = 24, /* No, 2, 100G/50G */ + FW_PORT_TYPE_BARE_LINK_200G = 25, /* No, 4, 200G/100G/50G */ FW_PORT_TYPE_SFP56 = 26, /* No, 1, 50G/25G */ FW_PORT_TYPE_QSFP56 = 27, /* No, 4, 200G/100G/50G/25G */ - FW_PORT_TYPE_QSFPDD = 34, /* No, 8, 400G/200G/100G/50G */ + FW_PORT_TYPE_QSFP56_4_50G = 28, /* No, 1, 50G, Spider cable */ + FW_PORT_TYPE_KR_50G = 29, /* No, 1, 50G/25G/10G/1G, BP AN */ + FW_PORT_TYPE_KR2_100G = 30, /* No, 2, 100G/50G/25G/10G/1G, BP AN */ + FW_PORT_TYPE_KR4_200G = 31, /* No, 4, 200G/100G/40G/50G/25G/10G/1G, BP AN */ + FW_PORT_TYPE_QSFP56_2_50G = 32, /* No, 1, 50G, Spider cable */ + FW_PORT_TYPE_OSFP = 33, /* No, 8, 400G/200G/100G/50G */ + FW_PORT_TYPE_QSFPDD = 34, /* No, 8, 400G/200G/100G/50G */ + FW_PORT_TYPE_OSFP_2_200G = 35, /* No, 4, 200G, Spider cable */ + FW_PORT_TYPE_QSFPDD_2_200G = 36,/* No, 4, 200G, Spider cable */ + FW_PORT_TYPE_KR8_400G = 37, /* No, 8, 400G/200G/100G/50G/40G/25G/10G/1G, BP AN */ + FW_PORT_TYPE_QSFP56_2_100G = 38,/* No, 2, 100G, Spider cable */ + FW_PORT_TYPE_QSFPDD_4_100G = 39,/* No, 2, 100G, Spider cable */ + FW_PORT_TYPE_KR2_50G = 40, /* No, 1, 50G/25G/10G/1G, BP AN */ + FW_PORT_TYPE_MAX, FW_PORT_TYPE_NONE = M_FW_PORT_CMD_PORTTYPE32 }; diff --git a/sys/dev/cxgbe/firmware/t7fw_cfg.txt b/sys/dev/cxgbe/firmware/t7fw_cfg.txt index 70b05da04a23..33c703fdc9d7 100644 --- a/sys/dev/cxgbe/firmware/t7fw_cfg.txt +++ b/sys/dev/cxgbe/firmware/t7fw_cfg.txt @@ -175,6 +175,11 @@ # TPT error. # Err2uP = 0 + # ULP_TX_ACCELERATOR_CTL + reg[0x8f90] = 0x00000015/0x00000015 # Compression block clock gating + # Dedupe clock gating + # Erasure Coding clock gating + #ULP_RX_CTL1 reg[0x19330] = 0x000000f0/0x000000f0 # RDMA_Invld_Msg_Dis = 3 # ROCE_Invld_Msg_Dis = 3 @@ -201,7 +206,7 @@ # default gc enabled. # HMA configuration (uncomment following lines to enable HMA) - hma_size = 128 # Size (in MBs) of host memory expected + hma_size = 256 # Size (in MBs) of host memory expected hma_regions = iscsi,rrq,tls,ddp,pmrx,stag,pbl,rq # What all regions to place in host memory #mc[0]=0 @@ -394,8 +399,7 @@ neq = 16 # niqflint + nethctrl Egress Queues nexactf = 8 # number of exact MPSTCAM MAC filters cmask = all # access to all channels - #pmask = 0x4 # access to only one port - pmask = 0x1 # access to only one port + pmask = 0x4 # access to only one port [function "3"] nvf = 16 # NVF on this function @@ -407,7 +411,7 @@ neq = 16 # niqflint + nethctrl Egress Queues nexactf = 8 # number of exact MPSTCAM MAC filters cmask = all # access to all channels - #pmask = 0x2 # access to only one port + pmask = 0x8 # access to only one port # Some OS Drivers manage all application functions for all ports via PF4. # Thus we need to provide a large number of resources here. For Egress @@ -421,7 +425,7 @@ r_caps = all # read permissions for all commands nvi = 28 # NVI_UNIFIED niqflint = 170 # NFLIQ_UNIFIED + NLFIQ_WD - nethctrl = 224 # NETHCTRL_UNIFIED + NETHCTRL_WD + nethctrl = 288 # NETHCTRL_UNIFIED + NETHCTRL_WD neq = 252 # NEQ_UNIFIED + NEQ_WD nqpcq = 12288 nexactf = 40 # NMPSTCAM_UNIFIED @@ -435,8 +439,7 @@ nserver = 480 # number of server region entries nhash = 12288 # number of hash region entries nhpfilter = 64 # number of high priority filter region entries - #protocol = nic_vm, ofld, rddp, rdmac, iscsi_initiator_pdu, iscsi_target_pdu, iscsi_t10dif, tlskeys, crypto_lookaside, ipsec_inline, rocev2, nic_hashfilter, ofld_sendpath - protocol = nic_vm, ofld, rddp, rdmac, iscsi_initiator_pdu, iscsi_target_pdu, iscsi_t10dif, tlskeys, crypto_lookaside, ipsec_inline, rocev2, nic_hashfilter, nvme_tcp + protocol = nic_vm, ofld, rddp, rdmac, iscsi_initiator_pdu, iscsi_target_pdu, iscsi_t10dif, tlskeys, crypto_lookaside, ipsec_inline, rocev2, nic_hashfilter, nvme_tcp, ofld_sendpath tp_l2t = 3072 tp_ddp = 2 tp_ddp_iscsi = 2 @@ -643,7 +646,7 @@ [fini] version = 0x1425001d - checksum = 0x3671da3b + checksum = 0x2419f987 # Total resources used by above allocations: # Virtual Interfaces: 104 diff --git a/sys/dev/cxgbe/firmware/t7fw_cfg_uwire.txt b/sys/dev/cxgbe/firmware/t7fw_cfg_uwire.txt index b1f5129238eb..9da841153138 100644 --- a/sys/dev/cxgbe/firmware/t7fw_cfg_uwire.txt +++ b/sys/dev/cxgbe/firmware/t7fw_cfg_uwire.txt @@ -175,6 +175,11 @@ # TPT error. # Err2uP = 0 + # ULP_TX_ACCELERATOR_CTL + reg[0x8f90] = 0x00000015/0x00000015 # Compression block clock gating + # Dedupe clock gating + # Erasure Coding clock gating + #ULP_RX_CTL1 reg[0x19330] = 0x000000f0/0x000000f0 # RDMA_Invld_Msg_Dis = 3 # ROCE_Invld_Msg_Dis = 3 @@ -201,7 +206,7 @@ # default gc enabled. # HMA configuration (uncomment following lines to enable HMA) - hma_size = 128 # Size (in MBs) of host memory expected + hma_size = 256 # Size (in MBs) of host memory expected hma_regions = iscsi,rrq,tls,ddp,pmrx,stag,pbl,rq # What all regions to place in host memory #mc[0]=0 @@ -394,8 +399,7 @@ neq = 16 # niqflint + nethctrl Egress Queues nexactf = 8 # number of exact MPSTCAM MAC filters cmask = all # access to all channels - #pmask = 0x4 # access to only one port - pmask = 0x1 # access to only one port + pmask = 0x4 # access to only one port [function "3"] nvf = 16 # NVF on this function @@ -407,7 +411,7 @@ neq = 16 # niqflint + nethctrl Egress Queues nexactf = 8 # number of exact MPSTCAM MAC filters cmask = all # access to all channels - #pmask = 0x2 # access to only one port + pmask = 0x8 # access to only one port # Some OS Drivers manage all application functions for all ports via PF4. # Thus we need to provide a large number of resources here. For Egress @@ -421,7 +425,7 @@ r_caps = all # read permissions for all commands nvi = 28 # NVI_UNIFIED niqflint = 170 # NFLIQ_UNIFIED + NLFIQ_WD - nethctrl = 224 # NETHCTRL_UNIFIED + NETHCTRL_WD + nethctrl = 288 # NETHCTRL_UNIFIED + NETHCTRL_WD neq = 252 # NEQ_UNIFIED + NEQ_WD nqpcq = 12288 nexactf = 40 # NMPSTCAM_UNIFIED @@ -435,8 +439,7 @@ nserver = 480 # number of server region entries nhash = 12288 # number of hash region entries nhpfilter = 64 # number of high priority filter region entries - #protocol = nic_vm, ofld, rddp, rdmac, iscsi_initiator_pdu, iscsi_target_pdu, iscsi_t10dif, tlskeys, crypto_lookaside, ipsec_inline, rocev2, nic_hashfilter, ofld_sendpath - protocol = nic_vm, ofld, rddp, rdmac, iscsi_initiator_pdu, iscsi_target_pdu, iscsi_t10dif, tlskeys, crypto_lookaside, ipsec_inline, rocev2, nic_hashfilter, nvme_tcp + protocol = nic_vm, ofld, rddp, rdmac, iscsi_initiator_pdu, iscsi_target_pdu, iscsi_t10dif, tlskeys, crypto_lookaside, ipsec_inline, rocev2, nic_hashfilter, nvme_tcp, ofld_sendpath tp_l2t = 3072 tp_ddp = 2 tp_ddp_iscsi = 2 @@ -643,7 +646,7 @@ [fini] version = 0x1425001d - checksum = 0x96513217 + checksum = 0x83f95163 # Total resources used by above allocations: # Virtual Interfaces: 104 diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 69ecfce1dade..d73204eb808c 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -3760,10 +3760,17 @@ port_mword(struct port_info *pi, uint32_t speed) return (IFM_NONE); } break; - case M_FW_PORT_CMD_PTYPE: /* FW_PORT_TYPE_NONE for old firmware */ - if (chip_id(pi->adapter) >= CHELSIO_T7) - return (IFM_UNKNOWN); - /* fall through */ + case FW_PORT_TYPE_KR4_200G: { + /* + * Pre-T7 firmware used M_FW_PORT_CMD_PTYPE for PORT_TYPE_NONE + * and driver needs to deal with both. + */ + _Static_assert(M_FW_PORT_CMD_PTYPE == FW_PORT_TYPE_KR4_200G, + "driver/firmware mismatch"); + if (chip_id(pi->adapter) < CHELSIO_T7) + return (IFM_NONE); + return (IFM_200G_KR4_PAM4); + } case FW_PORT_TYPE_NONE: return (IFM_NONE); } From nobody Sat May 9 04:57:27 2026 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 4gCDHw6H3wz6cfwL for ; Sat, 09 May 2026 04:57:32 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCDHw3dkMz3s6M for ; Sat, 09 May 2026 04:57:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778302652; 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=HJcDvZNznLPAx8aXc5e0O5B10bPbZa/p3eUkeCKroVo=; b=jXIBfcbSm4gIHu0jvuypaIXlmrUPg+MKPS0XyzBqeOBd7nWPOWL6sbn49T5UvhziYrTRtZ UX6NmTgW5yUqNsYFkUvZJuKqBfWc4MZRnGiTSOxzr5j9OzruwKRSAes7nvQSH1ZI83x8X0 cs+mCYoEPjWRUtDr9D18t7UFQqcNqx46hogp3qOhPsvHSgTNaEoI2y4rr6jCgQkoSY2ie0 J8t0dqjy2o119/X1FmY/dU4UFnyUih5AOchKm7fG698MzzuJkihTzdvSNZ4DuHbm3CjtGS f7GoB+O7h77f57PAzZkdxfBy/zo4b5iI51tcqphnBqw0Hj/v7LUVx3RtHhy4AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778302652; a=rsa-sha256; cv=none; b=SJloBuk3gKoBXo/CL8bzAriL/McwXo0KL0/vonnMTWePS0Km/LewkCIKgj4nBUr9MOrpyR K7DZYBOdwCfLMajMTgLe+3zySvV3Biig5GBeDYcKLg7VUkI1PFxJ7tn3HgtFeWT1IN3Onq XBHJOUhO5KTrwGjfVkhhmjBCVwIR55glYauHXlB9TEx2lJntftUj9sjplV3rdF80QkwFLc HzW5hZr9Z6MWt2sdP6fPgqjKPhhNROUxSMz50uuUEa9Wlz02Njj3ihipTEj3Ut9X0nHDMx HGMLWKEpAh3ZE4eLs2AQSc2CSjUI2KjoMBx2gIwv64azYB0igI1V+IUTX55IHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778302652; 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=HJcDvZNznLPAx8aXc5e0O5B10bPbZa/p3eUkeCKroVo=; b=ZfGosSm7RjrQnIpAD0QUijATUVzGMXR9M0TU4xy2ddsKYUgoPvYe8+HL/5y/OjML6It1fk QNfcCmLXqGvov0N3fX37m3lHChnPA0dwD00FYEuxVRgDpcWy7gmePagHz+rGb8MkXuAxNT v8Qs3ZQpme8pZuRZnRaIOYlglQRZ4c4zJ7MtDxv6qEeAsiW4YLaV77Ss9M68B3z2x8oAaQ imLvfqDAO2YcBJlYtNEP0FtcxVn6o3n0/K1z8UjrKuzqtzEnlTm9tfSKlhpqOkBIOPMLfu olZLA5HCxcA4hskBpOLO3nfCGskOqCLTg7kkn0hjxDB6Omt//mJcHUhz3rlIzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCDHw2V1bzm2g for ; Sat, 09 May 2026 04:57:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3749a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 04:57:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Lianwei Wang From: Xin LI Subject: git: 10e342c1ec78 - main - fsck_msdosfs: fix FAT header correction not persisting in cache mode 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10e342c1ec78af5a0b97739c806b16a632118fa5 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 04:57:27 +0000 Message-Id: <69febeb7.3749a.5499531@gitrepo.freebsd.org> The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=10e342c1ec78af5a0b97739c806b16a632118fa5 commit 10e342c1ec78af5a0b97739c806b16a632118fa5 Author: Lianwei Wang AuthorDate: 2026-05-09 04:56:12 +0000 Commit: Xin LI CommitDate: 2026-05-09 04:56:12 +0000 fsck_msdosfs: fix FAT header correction not persisting in cache mode When fsck_msdosfs runs with FAT32 cache mode (used for large filesystems that cannot be mmap'd), a detected FAT header correction was written into the in-memory buffer but the corresponding cache entry (fat32_cache_allentries[0]) was never marked dirty. As a result, fat_flush_fat32_cache_entry() skipped it, the corrected bytes were never written to disk, and copyfat() propagated the uncorrected on-disk data to all backup FAT copies. Every subsequent fsck run would repeat the same "FAT starts with odd byte sequence / FIXED" cycle indefinitely. Fix by marking fat32_cache_allentries[0].dirty = true after applying the in-memory correction, ensuring the chunk is flushed before copyfat() runs. Obtained from: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/4047981 MFC after: 3 days --- sbin/fsck_msdosfs/fat.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c index 567bfcd428cb..5ead0b1bf783 100644 --- a/sbin/fsck_msdosfs/fat.c +++ b/sbin/fsck_msdosfs/fat.c @@ -927,6 +927,17 @@ readfat(int fs, struct bootblock *boot, struct fat_descriptor **fp) default: break; } + /* + * In cache mode the header lives in + * fat32_cache_allentries[0]. Mark it + * dirty so it is flushed to disk (either + * on eviction or in writefat()) before + * copyfat() copies the primary FAT to + * backup copies. + */ + if (fat->use_cache) + fat->fat32_cache_allentries[0].dirty = + true; } } } From nobody Sat May 9 08:38:57 2026 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 4gCKCV6MbGz6cwrS for ; Sat, 09 May 2026 08:39:02 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCKCV3w13z4DQH for ; Sat, 09 May 2026 08:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778315942; 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=7LA5/ilhIlmXlFLjmWr5HpdIauWTYW3XCLn2zVpVFAk=; b=NUXCgq4lzPLqwVr89B03Hia4pbkTrVjIglFpFtz5AArdYi+hHpS/yx7/BEonTRqwndaKqP BblV3x6MrNq++Un8eUdMmEJOHyHoCIh+Sixg6VLZGiGIX9BUTHyu7Z3Cz48L+j/58CkZY2 AH+UVx5FdQH/BcKb9fT1XEdmRCiWXvX+GdZEiQvgaxhY1/ltbhG+8jKAq8BBK6rU1vdJYT s0Ay7SIZZJmtr0vOKiUS84CmsFXQi5A0w7os9TvzXgdO4QhazA3S8F2m8NQ+o8vxUY8KtY 4pfxc8lAM+hKjZMdYnmQRDJMCMEfZXXwH96GdF5vAg83uVWCawHWl7ZzwjGuRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778315942; a=rsa-sha256; cv=none; b=hBe/SuFTmdwZ6bLwDDeNYnIYxjIbBBV5ClhK6As3rKKB/q4d0NMMXeKrP4e4qU7TEpdplB fo6/fHDJ31kUTrd+lox01BPgEvB8X484AbWFYQNiiR+GYGhSndbe2PnSv/hwc+VNNo+Red 2B6Cx2cpwa7jBHjdQYLaoaSvM4jmOy0j3C9ncFwv8K3iRu9PnC66lHjJi2pEDvOAp1n3Py ARpSuTCnsUChmRhQNjlXuuuiG7dQTYgugA9o9JwF+lKfUIAyja9PYeqA3lU8YXwlw/1xP0 4EDXaOgP8lNWvZwDfJqew9od6DzEteIOAWb5AMJmsjQVFYQj0prHbpWNfo8Qgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778315942; 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=7LA5/ilhIlmXlFLjmWr5HpdIauWTYW3XCLn2zVpVFAk=; b=LtCeRNnrsRwv9jJoeI+fiTb5dh89G3kRJq+Z7kYK6h6h7aq8v+aCbp1DOHwCXVUNWcygGA Kgnf5dApNxxFxS8EvIpQcmVgBFzVMbxLf2Uc10La9KEJVy2Gi4y504/Ky+mlj+8VKTavvI /YBnvw4mKDmMLIN+ms+ToMsqxsemUU/U+PuLrSABTU1vrVJnPhZLI45yolHWPuvG59ZJdy IvMsffC3rmJNVaFxzp5H4skhymrZhzQEwQKTPwP8mmD2A4NJ9OapqoxuGXifg1fp+20qrO VskP8TAiInzubbQCMJeUdZpjRRD/n4570T9UceB8uFXvjSvbb3iM47Lq32tcDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCKCV30TJzs6M for ; Sat, 09 May 2026 08:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c8d3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 08:38:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Laurent Chardon From: ShengYi Hung Subject: git: 072f79d0a287 - main - hwpstate_amd: Initialize CPPC driver type 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 072f79d0a287528b11da866d6115f726a69eca0d Auto-Submitted: auto-generated Date: Sat, 09 May 2026 08:38:57 +0000 Message-Id: <69fef2a1.1c8d3.514df1b6@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=072f79d0a287528b11da866d6115f726a69eca0d commit 072f79d0a287528b11da866d6115f726a69eca0d Author: Laurent Chardon AuthorDate: 2026-04-30 12:08:30 +0000 Commit: ShengYi Hung CommitDate: 2026-05-09 08:38:21 +0000 hwpstate_amd: Initialize CPPC driver type Assign the driver type instead of preserving uninitialized stack data PR: 294899 Reviewed by: aokblast --- sys/x86/cpufreq/hwpstate_amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 5e075a26a57b..bbc6592579e3 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -745,7 +745,7 @@ hwpstate_settings(device_t dev, struct cf_setting *sets, int *count) static int hwpstate_type_cppc(device_t dev, int *type) { - *type |= CPUFREQ_TYPE_ABSOLUTE | CPUFREQ_FLAG_INFO_ONLY | + *type = CPUFREQ_TYPE_ABSOLUTE | CPUFREQ_FLAG_INFO_ONLY | CPUFREQ_FLAG_UNCACHED; return (0); } From nobody Sat May 9 09:04:55 2026 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 4gCKnN1CRfz6cysF for ; Sat, 09 May 2026 09:04:56 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCKnM6hSwz4Gq1 for ; Sat, 09 May 2026 09:04:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778317495; 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=PLCCDMx/Ea9IPMn2GdCuI8cydGQ5Be0BfwUlecopv6U=; b=K4CsT2LSB8nB+L39yKv5g3JSHFI4oSTpjcVQqaLDn8P/Gr+LYT/NkoU1OnOrEx8AgqhT/w E5kZQZdW/UUAofJ6/Yzfjh8/eRe60qrp06svAmq8yBYtpt6Kzs4viS3v+MFkherE4SKyt2 6sX1B3OnXVcJct164khYMrjR7eDpYMMcGtm7LNHnHuuKYxBV9xtBojZIX6+jcXD5XRbYYH SiebfZhEbykfjBCzc1BDSqP6QtwJX1uKTqah+MESWPRFLXZQwohiH3j2Obd5bMAAeKAtQe wyazxuKPcNOEVjcC0BxJbJY7PoFkZPZjp4u4pFve0aQFtHxXBukkElaGp6o8WQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778317495; a=rsa-sha256; cv=none; b=B8ccfvmpP9zQd/vcDbBnK0GiSxsk5UaFcTPuuwE6ohb3+hHaMs5E6G01SI66In/RpFFi1l ojbP4G0poshgquwSBCRSKAZ3MpZUYbbZ+yppPTonD9lrjx22Xfms21ZkewaLWdgO7x3LCP pHISTi8UuCROlHU3/eP/RAoRoxt76OgsCxqJNOfcy7qZgWhzgffzbfss+N2VewGQHlMi6B ZKudjem62N2CDkkEHuWdcZ/B1o5oPzuEDBiOFzEDmxPcxIAFB8nkTcZdYqpsyIApkKiUc3 zURhJ6MCubltvMi1l8sdurqM8lzdzBJMAfdElVDvzSOsbQznWO/IIJeqskzB8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778317495; 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=PLCCDMx/Ea9IPMn2GdCuI8cydGQ5Be0BfwUlecopv6U=; b=R5BCGplFPtPkBcPtN7wF7RsmdzazymAythQuOpOg0g8TYgiyCItsE4i6T3RzM4iGS7+Dlr 9RTJprztA/5ggQKAex1IeKwektFTgohwtSsded5d76IwuesTAxyYYEHsWnaDzANaSIY5ar oXN9Dn3fWQBaEUeigayT9pyi09GSRozjMZJfTlpAs9puuwDV2F2tVXzEGCA3rLH39wOFoP dodfubdkeh/Y9k3a3+Va/nViFPkVxTcCI2NgydyLalkj3V1m3d8VXckfKL9MK6xwVt6iig cWlq/lEf4gV2hVxHX/OXWDzpflUw5IxUv4d3B+B/44iEeHmPLmUwreozPqR7Qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCKnM56X3zsXD for ; Sat, 09 May 2026 09:04:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eb7b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 09:04:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 44338ccd1268 - main - BSD.root.dist: Correct tag for /etc/sysctl.kld.d 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44338ccd12685621c4b1c57e692a4f27f5a655d3 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 09:04:55 +0000 Message-Id: <69fef8b7.1eb7b.2d49774d@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=44338ccd12685621c4b1c57e692a4f27f5a655d3 commit 44338ccd12685621c4b1c57e692a4f27f5a655d3 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-09 09:04:08 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-09 09:04:25 +0000 BSD.root.dist: Correct tag for /etc/sysctl.kld.d This is only used by rc.subr and belongs in rc, not runtime. Fixes: fa6d67cd16b5 ("BSD.root.dist: Add package tag for all directories") MFC after: 3 days Reviewed by: ivy Differential Revision: https://reviews.freebsd.org/D56900 --- etc/mtree/BSD.root.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index d5ef29c51a92..274397769cac 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -105,7 +105,7 @@ untrusted tags=package=caroot .. .. - sysctl.kld.d tags=package=runtime + sysctl.kld.d tags=package=rc .. syslog.d tags=package=syslogd .. From nobody Sat May 9 09:09:28 2026 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 4gCKtk041Gz6d0Pd for ; Sat, 09 May 2026 09:09:34 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCKtj4qtSz4HXd for ; Sat, 09 May 2026 09:09:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778317773; 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=melgQ2BZ+8xiyZkjEn7KjmxuZ0WdtL1vz98Rf+uZh/U=; b=wQtIGYPXWoTkYQ/0BtDIzbY25u6QYtL5BhL1Nh8DFJe6x7E432eoDR/Vas87yYOoXD6jDL /jUnyHC6v8wIest3jDwMvlo03j4QqZv/e4NMIR+CMKJVq4Oca7iQCTviuBUf2K949IjpM5 Wq399uhT7QhAqGPgxeZxjpgyaZC92fhLLDl6Vaolm2G1Uh+zbymabWcteS91tc8noFFj3k q/kQ7coPTBdEy4qFzOPDI3akIW7MMyvc6923Pgahm/5iyTPzrZ+dla1TvYzof2D17GgfRv xn8bGr7qYy3Pj5MCrDE1Kzy2pmNZ0Iii6a3jyOf+Km86kelzoNBgDPvBNfj/rQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778317773; a=rsa-sha256; cv=none; b=niXMlzyGW8/nM/1h663h6Qbg1udOJOIPhgx77trTvDIH7rJxzsMGEhnLnGVMDw9PAyC+3a weWNBk/aeL4WjqQn9b/Ymk6X4eM4Jhjor88X2VkWsUbrh7Nix1nisNkjpCnyuM6F74uf1f x6L4ddemb8hNGTm56VTVF3kLFv5PjOz1HaQekXc1aMsPhWJDfo9lvZRPv/38Vyev9TEbi8 fpnWPMP9Y3mqSnweVCJidXSE2umhYFDd7I2YbvDuoDTMPwGcLWl7odAIiT3PGPwX9yaD5S 09UIRUHnxeuiezjZrScm0/fyKQNI9qmnOjjbz7aisE0195AxhxLK9XCVaBPm5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778317773; 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=melgQ2BZ+8xiyZkjEn7KjmxuZ0WdtL1vz98Rf+uZh/U=; b=gJ/KsBVWUAz2h7thtAsW1/Il7hyXoUdpByfNBb6okNVKxW4CQDejMmbY1tLZy4BSRnPBNE QPlzW3S3lMpGtCvcOtLADzOozzZbwuFNFy9Dn7T8ExlIoQT5Btzr3DpYSH6W1mV37lYv1a 5goZBsL3jocwc+6D/BTBR8NERfWFdMzq+AdM7PURMytMXikZH4EOHb3kxXxoWtc5kFHrAh sEPxmm1DMzBN7KldholA+gCYJU+c9921OmWbviKmPZsy4klkvYEaON9tcaShMkYnfu/iBw y5jNEjX8AGSdTq3/C7b/0RrxR64cExYoKLEZ3Ne5x0ROVhyiWuKMRsAhuK+EFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCKtj3rKtzsZ3 for ; Sat, 09 May 2026 09:09:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21772 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 09:09:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Gisle Nes From: ShengYi Hung Subject: git: 555ffd9022de - main - pci: use uint32_t for eecp 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 555ffd9022de0c497881bafc413e3e1d05af10d4 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 09:09:28 +0000 Message-Id: <69fef9c8.21772.3c013dce@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=555ffd9022de0c497881bafc413e3e1d05af10d4 commit 555ffd9022de0c497881bafc413e3e1d05af10d4 Author: Gisle Nes AuthorDate: 2026-04-07 16:48:15 +0000 Commit: ShengYi Hung CommitDate: 2026-05-09 09:09:05 +0000 pci: use uint32_t for eecp eecp holds the extended capability offset. If that offset is larger than 0xff, storing it in uint8_t truncates it, which can make the early EHCI/XHCI capability walk read the wrong location and loop during boot. Seen on AMD device 1022:151e, where HCCPARAMS1 = 0x0118ffc5 and the first xHCI extended capability offset is 0x460. Widen eecp to uint32_t in xhci_early_takeover(), matching xhci_pci_take_controller(). Signed-off-by: Gisle Nes Reviewed by: zlei, aokblast MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/2127 Closes: https://github.com/freebsd/freebsd-src/pull/2127 --- sys/dev/pci/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 0dddd2dd263f..b5a3012accd6 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -3756,7 +3756,7 @@ xhci_early_takeover(device_t self) struct resource *res; uint32_t cparams; uint32_t eec; - uint8_t eecp; + uint32_t eecp; uint8_t bios_sem; uint8_t offs; int rid; From nobody Sat May 9 14:04:08 2026 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 4gCSQc6swrz6bvpX for ; Sat, 09 May 2026 14:04:08 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCSQc5wxKz3bJn for ; Sat, 09 May 2026 14:04:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778335448; 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=+xqTIY8Bs6VLGidp3VRH/iCgZ26ZEmnU8Z8f7QUQDVM=; b=ngLv8GSMsN+EHbRltgoYVl5cy+PiXYUpsqD5otVSmH0VHzzeJV9rVBIy8LT+ZIuOZvSNgO /KxUFyQ+vhn2KjV+/4y10S/mJmkPdEX90KoTxJOKPFUT2yCKQRHxkPiRd3RF3HoueLpce8 ZbDN27ClfA4HPsaAKYzt87rT2j60E0ML25VNG6A2KA1zihJjDXWxRLND5UrYLMB7XPTKAD 7pXBchDVyZwvVVfQ+LWZSxEsoiR4BcepAiXe9T9+B67oxk7pqLURzv/mskJvNzmckqCepe GM/S10mmN1WBHRXOWbtxutvcgkqhkFcD7E/O0vhajeHT5Fj1eMxmVHUV8dsmXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778335448; a=rsa-sha256; cv=none; b=tvo0dJgqZVk/4RBWkUNaluT6F4UDBihuoNHiLOaNEnONg9SG7orDQ7WiJ/u9kk/g+LUFhF iBkZ7KYzngIfVYsMY7+uYtleg3wTIG+zhNqjLrG+/M46zpnyxLJ1I4JISU/qz2mKZsHDE6 EOHg4Hj4iVc/XZik/FsO1kKrJNw6W4DIskGe5ZxmdfsnKHTnRf7NuyY7CrYF6dkp3nMciy N3S9/t8BH5pFMTmWh8OSWy0dEaFPzJn+/e/PWexSfSEWb7Re+sjrPlMtn7u/EwsEpT6d+o va96nIFfo+z5uPvrepBOlM27MscFAe6/2ZkHDb3FIlmR17FmKd/fF4WD0DTibQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778335448; 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=+xqTIY8Bs6VLGidp3VRH/iCgZ26ZEmnU8Z8f7QUQDVM=; b=ml0Iw0sJJtzGaj1bSl0bwbstp0JQ5SHQ8SItsdmpSbAy+U6Rv15nPseaifdAklr4iZ7w+Y 53saCJRf1pa51zuf6FWHPchYSvfC39NSws5Tq2aNGJeMnJ9P/W0rk6RzG9BpPTBpTmUUu9 70R45cyyPqY431oAAw9V/b6FzhsyU0O7PqjLLxrkeyVYFMTTwWBZw+7qb2iQJOEcD6Xa6M MkZW6AeZV3gh9FCFvqx/xIOLG+8MocOj1WBLVQXF1w5BpLi4FJd9tNQnL5OCrgoCGHe3Fs 6iq7fduiGzlLG7Te3l/0VdHYRh0i188ERg2JoycH+NmyKugQY+4EzLatyV9Rig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCSQc5THJz12NP for ; Sat, 09 May 2026 14:04:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21905 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 14:04:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Paarth Shirsat From: Benedict Reuschling Subject: git: 6499888ca741 - main - gpart(7): Fix reference to the zfsprops man page 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6499888ca741bf3db90d7fd352d5480f7314337f Auto-Submitted: auto-generated Date: Sat, 09 May 2026 14:04:08 +0000 Message-Id: <69ff3ed8.21905.3b5d6c41@gitrepo.freebsd.org> The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/src/commit/?id=6499888ca741bf3db90d7fd352d5480f7314337f commit 6499888ca741bf3db90d7fd352d5480f7314337f Author: Paarth Shirsat AuthorDate: 2026-05-09 13:58:36 +0000 Commit: Benedict Reuschling CommitDate: 2026-05-09 14:01:12 +0000 gpart(7): Fix reference to the zfsprops man page PR: 292147 --- lib/geom/part/gpart.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/geom/part/gpart.8 b/lib/geom/part/gpart.8 index 32a247529dfe..89bfc3be6f8a 100644 --- a/lib/geom/part/gpart.8 +++ b/lib/geom/part/gpart.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 20, 2026 +.Dd May 9, 2026 .Dt GPART 8 .Os .Sh NAME @@ -1527,7 +1527,7 @@ zvol will show up as a GEOM provider only if its .Sy volmode is set properly .Po refer to -.Xr zfsprops 8 +.Xr zfsprops 7 for details .Pc . .El From nobody Sat May 9 15:55:03 2026 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 4gCVth62KNz6c4q0 for ; Sat, 09 May 2026 15:55:08 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCVth53XFz3rf0 for ; Sat, 09 May 2026 15:55:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778342108; 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=WXguVpRi4tQSKnyGf+GNTRe07RTFwB/AdF7DIUMBUlU=; b=gexlGpY0NMgaIBk+P0YpzGKEH8kwfVfXL1mT2Gka3pKD8oKLkSLinppxEplms71HJZvnt4 MluyDovJYFzaol+CcAhHcAhZiC2bJe1Wd6EWLEayVKM22nGuQJLfSzTkOX5s6qYKeXLzUl 7AmENimiNxrydrq0kpmriAFtgrSjTwoI6XKDG+xdRfCkKvMf6z0xFOQrArQHNSL0ixhATa kYfdyS28iRwrzO+wTGVYTCg3ZsCsvTxtPkMIq06f0bEg5m82JQKDYwEOK4Yb+teOJGb6oJ 3LXkMJMcHOIqnEF9qetk9WOzsu/zq3alYXWASbhwvUEttBLHg8EsoBP1qnfmpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778342108; a=rsa-sha256; cv=none; b=Sxxd8yfka6EjrswuUSwsBHGFhCASWFitq5iEkMfIV7iAZV4WbZPGGWWCzhy4HhEuqjDrdz daDMpUWqj1EdQUXS7RUwyOT4/BXgcQFK+zm9MKDnGhqH2ZxGQKpFWCKiZzZYJZotqkDT/0 +3NOzglQtBBf9OVFDfvqb7goOP3SHZAx1biBmKitTqDbDP26Msokl6UfAoO0eL8XlyIqE5 IayvgnE/ZGZF7Ez63cVk5RUiksGd+N1iKE3bLVicuz1RFkAznxKgI+pmiqUyw/cG34zVv4 NYeiA7yaas+ozUafde8gxM81wMKDshrvVcrCLoL7N+ga7zLMwGitXhuEt0HOuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778342108; 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=WXguVpRi4tQSKnyGf+GNTRe07RTFwB/AdF7DIUMBUlU=; b=eLqFq4BbxapSOAYw+RqRcL5S+iQW4peIUKtzCM7w/rxHbroxJm+ZoVAZyHm2qckPat1XTr CxAtSAkx1Au2+sl46tpc2bvDKNhNHGn32Lfhjek4fbc7oXi6kx/b9P5ynsQ1hNb/MWk/lZ n3J4hAzGwsgx68zcRKiR874o2miovTPGW7ivlJgIOArAac9gJ/FXsr+BAtlBERbhHd116Y lZEFWXlLe6bYfsJ4aaKT4XH64qQ0LZqt7oRKlJxjM4t8bsI1CXbsIZ/cR6FDmgpEMiO6x8 +THT5vfQSYnXlukTYUg0x492IDZefFDPifZgNPqkUeN3qC42FcGbAjnhKRfMbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCVth4VlXz14wM for ; Sat, 09 May 2026 15:55:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 336ba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 15:55:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Chuck Silvers From: Hartmut Brandt Subject: git: 7906084ba2fd - main - Fix some memory leaks when fetching the mibII. 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: harti X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7906084ba2fd50022f38ce2e8d0bcef212a4ff19 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 15:55:03 +0000 Message-Id: <69ff58d7.336ba.123f34ad@gitrepo.freebsd.org> The branch main has been updated by harti: URL: https://cgit.FreeBSD.org/src/commit/?id=7906084ba2fd50022f38ce2e8d0bcef212a4ff19 commit 7906084ba2fd50022f38ce2e8d0bcef212a4ff19 Author: Chuck Silvers AuthorDate: 2026-05-09 15:52:14 +0000 Commit: Hartmut Brandt CommitDate: 2026-05-09 15:52:14 +0000 Fix some memory leaks when fetching the mibII. Reviewed by: glebius Sponsored by: Netflix Differential Revision: --- contrib/bsnmp/snmp_mibII/mibII.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/bsnmp/snmp_mibII/mibII.c b/contrib/bsnmp/snmp_mibII/mibII.c index 59f3836d1ede..4cf4f231facc 100644 --- a/contrib/bsnmp/snmp_mibII/mibII.c +++ b/contrib/bsnmp/snmp_mibII/mibII.c @@ -485,6 +485,7 @@ mib_fetch_ifmib(struct mibif *ifp) syslog(LOG_WARNING, "sysctl linkmib estimate (%s): %m", ifp->name); if (ifp->specmib != NULL) { + free(ifp->specmib); ifp->specmib = NULL; ifp->specmiblen = 0; } @@ -492,6 +493,7 @@ mib_fetch_ifmib(struct mibif *ifp) } if (len == 0) { if (ifp->specmib != NULL) { + free(ifp->specmib); ifp->specmib = NULL; ifp->specmiblen = 0; } @@ -500,6 +502,7 @@ mib_fetch_ifmib(struct mibif *ifp) if (ifp->specmiblen != len) { if ((newmib = realloc(ifp->specmib, len)) == NULL) { + free(ifp->specmib); ifp->specmib = NULL; ifp->specmiblen = 0; goto out; @@ -510,6 +513,7 @@ mib_fetch_ifmib(struct mibif *ifp) if (sysctl(name, nitems(name), ifp->specmib, &len, NULL, 0) == -1) { syslog(LOG_WARNING, "sysctl linkmib (%s): %m", ifp->name); if (ifp->specmib != NULL) { + free(ifp->specmib); ifp->specmib = NULL; ifp->specmiblen = 0; } @@ -546,9 +550,11 @@ mib_fetch_ifmib(struct mibif *ifp) alias_maxlen = MIBIF_ALIAS_SIZE_MAX; /* + * Free any alias memory allocated by a previous call. * Allocate maximum memory for a buffer and later reallocate * to free extra memory. */ + free(ifp->alias); if ((ifp->alias = malloc(alias_maxlen)) == NULL) { syslog(LOG_WARNING, "malloc(%d) failed: %m", (int)alias_maxlen); goto fin; From nobody Sat May 9 16:05:54 2026 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 4gCW770lPcz6c6KR for ; Sat, 09 May 2026 16:05:55 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCW764ycNz44rQ for ; Sat, 09 May 2026 16:05:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778342754; 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=G6S4DG8637ogAhGy6hMfnEX/PFjfVsLOhyrbsFPQGNY=; b=vF4Ih3v7WFU1LwxTaIonz9GoEfnrVNUM74eynrVLvK9UIv8FZ5EGTBFpM4UJKuVfvBiO4o 79JJSNH4oJroq/mf/i8rI7BXSCjSmeg9RpnyxoQiDsR87G6h/EDIkkTMASy5Rzy0uqjRHM Lq7sf+PmVfPose7wFnOxxS9xRg6NOsgsIcuYim7O5H/MNO8NeuvTBwQII0Nf3uvcnhm2oK EdmlsQ4FjkKQ+8icZP/gHxJ9XbXt+iRAwLJV6ASLahEvxEAxHVzBgx5SQjHfce/cShzwWE EFVKRRPainIDF1szdnqfZBsuYlwb4fexFTYHR7KxIwrhId93Dn1mpcY3M3rImw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778342754; a=rsa-sha256; cv=none; b=A5jphdMHlopKt7IlmmMctF/MMR9d8cd82dkNpxGjIlzxNPABvbd59/1jUT8EPX38UaNlYc dWkIsxJPuLQ/JX5eRJ5eeixtLjJ7JdoGEp0CaKQAfEqJ4yuQF3J1iYD0qwoS24q2cl2mGI CW1hH4zCrUhrY9/3gkd4xGnecKQbCmwJC0y3V1o3Ow82meJOpBuXfuC29OrGkDvwJExHLx ROEuWbXXZSFYNhQpZ7vUDgGOlUkN+fxDD1p37zafQLUJGVzMnpdC2/37Yy38cJFFa5Vp4j o3o6BG5FjRaWYiIV1EUOgtnqTDKpXH2zgKxhGEmya2hJFN7gGDBuon30F4B9pA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778342754; 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=G6S4DG8637ogAhGy6hMfnEX/PFjfVsLOhyrbsFPQGNY=; b=jJSG69avufObLGl/5j7x5TSCGwlf4Jdir4G1VMxfxYs9etlgAVlr/wsxAtrCzFh9vwi1gr iEKgOCtkEN6G+JsJVb7S836uCxuiwwWqKr1NP8uog+aoETrJPoXC42pc9neyXRf3f8pXlq nT+mwaeAloXc9nhM62fRcX2qdaSnQU5ZtmJm3nf8bekrc+36eSTZHXyGZRHXGVv7NPgWJg ZoWicUyFP9Qaas4bk/kMikO2vIqk0ZnCdwRgo6WyMZ9Emk41jGh0t4MSTd5Ae+bXkob98y TeblIEe1+QIQkc4yJKPM6Co+0NvJC759RFx0+TI3YJz49OBxKVJEbJz7vst/RQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCW764Hfbz15jm for ; Sat, 09 May 2026 16:05:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33ee3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 16:05:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hartmut Brandt Subject: git: 27ad506d2620 - main - Document some more OIDs that are used by bsnmp. 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: harti X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27ad506d26209e72d3cb2055de98f8a2eccc83be Auto-Submitted: auto-generated Date: Sat, 09 May 2026 16:05:54 +0000 Message-Id: <69ff5b62.33ee3.1228ecf0@gitrepo.freebsd.org> The branch main has been updated by harti: URL: https://cgit.FreeBSD.org/src/commit/?id=27ad506d26209e72d3cb2055de98f8a2eccc83be commit 27ad506d26209e72d3cb2055de98f8a2eccc83be Author: Hartmut Brandt AuthorDate: 2026-05-09 16:04:45 +0000 Commit: Hartmut Brandt CommitDate: 2026-05-09 16:04:45 +0000 Document some more OIDs that are used by bsnmp. --- contrib/bsnmp/oid-list | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/contrib/bsnmp/oid-list b/contrib/bsnmp/oid-list index 6bd2fe18c25f..7733cd5be063 100644 --- a/contrib/bsnmp/oid-list +++ b/contrib/bsnmp/oid-list @@ -10,11 +10,25 @@ enterprises 12325 FOKUS 1 BEGEMOT 1 BEGEMOT-SNMPD + 1 begemotSnmpdObjects + 1 begemotSnmpdConfig + 2 begemotTrapSinkTable + 4 begemotSnmpdPortTable + 5 begemotSnmpdCommunityTable + 6 begemotSnmpdModuleTable + 7 begemotSnmpdStats + 8 begemotSnmpdDebug + 9 begemotSnmpdLocalPortTable + 10 begemotSnmpdTransportMappings + 11 begemotSnmpdTransInetTable + 13 begemotSnmpdTraps + 14 begemotSnmpdContextTable 2 BEGEMOT-NETGRAPH snmpd netgraph module 3 BEGEMOT-IP snmpd IP related stuff. 4 BEGEMOT-IFACE-MIB interface MIB private stuff 5 BEGEMOT-IPSTATS-MIB IP statistics 6 BEGEMOT-IP-MIB IP objects + 7 BEGEMOT-VACM VACM support objects 100 BEGEMOT-ILMID snmpd ILMID module 101 BEGEMOT-ATM snmpd ATM module 200 BEGEMOT-PF snmpd PF module (phillip@freebsd.org) @@ -25,10 +39,14 @@ enterprises 205 begemotBridge bridge module 210 begemotWlan WLAN module 220 begemotHast HAST module + 230 begemotJails jails module 300 BEGEMOT-ACM DLR ACM project 303 BEGEMOT-WLINK DLR WLINK simulator 304 BEGEMOT-SATX DLR SatX simulator + 305 BEGEMOT-INET inet transport module + 306 BEGEMOT-LSOCK local socket transport module + 307 BEGEMOT-UDP UDP transport module 405 mysql (vanilla@fatpipi.com) 406 varnish (vanilla@fatpipi.com) From nobody Sat May 9 19:27:32 2026 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 4gCbbn2Fcdz6cfk1 for ; Sat, 09 May 2026 19:27:33 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCbbm5r1Xz3cKx for ; Sat, 09 May 2026 19:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778354852; 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=0m9KBb3MqY/W6V1e+C2tz1VOGY4VwP2nWL8RCmZdtUY=; b=aedxbz/J3uBdwFC9iGXkDlcvogM8aTxOFl4ORTtaFFoBgO/RCSWCdY1FTcCakWdtx/1EPP xwIur/s/UL3uQ68x83n18ZBAwVcGrDIz/2Kysk8SbjRaorB0iTJHHHZkKNcXztNvnUKYuu SGqVuH19wlpSv3ebY8sNgt+Yg178yg4Al4PD0k0EEAebv/KyR4MAMPfandlvse6B9hx745 7vgN2d6IT9vzE6nHyjnB3kfSaw3III7PSVKBiuw3oe+vi6M5VGooJMZ06WcHBGVsDj1Pa1 +vrfoYKFLdWI91vt3PTrzdOjgkVMEvhqNxtoNb5NQtbbSQJNNDlj3GIixhojEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778354852; a=rsa-sha256; cv=none; b=erau/ztGJpQjTgyXGh89uNevIfmWxa0eECpxPCFFNXmVzxGEmvB9Gw1UHzWj+7KGjlIXvz /gmF2CJ+6NpWAnINMpHmB8SAFbg57nvSjescmm+DMNyHvXn7VaLjCj8XAZOxt4QreU2zW0 OVFYjzmNkqYXhVWZXAQ2PPTe7wYHyonFbwaGA/cLesXqJxcdHkZrAKsokYQjotUt04oUTz Z/A+s9s9yvxaeRxGeKVCgYGw0Xob/jqscaQf17F+wU4/Xwfzqe1C5Za4vnoaAZST7Hgpc1 cdIFgv1TeBfS4np9kehNUTSrHH5TYmRhjhQQV1pVFsQgtu9GQs63XcBlgsiM/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778354852; 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=0m9KBb3MqY/W6V1e+C2tz1VOGY4VwP2nWL8RCmZdtUY=; b=TthnsqKagHK2OEbD4dukhlWwvpNdlX/qrHlqhCgTdJiYbFtzYKCc5re1yEoKr7h3gdaxA/ BAjgVYjc+mqicWJ0dLS2SFoJEm0Az0/7oH+EmnrsXAHQrt0ydAAE4WcHk1NvEHY9lhqJQN TaUVcl1L/xpL0fNmHRgvjY+A9zsKYxdVGcldIrpctJytNaxyoZ0CfSAe5F0NyyKKQJnF/A dTOZIZDR9Ax/OIHr16XbUwWD2XLVZ9RvuJh4Gp7hQ/EUdkZ+u2TUqTdygNJEuQ5bsA3SIp VwkMVhUm4rKnYaOYnl59lLhLg7prKX10nPH65bLIBOGxhKFVvgbhF8Eq5XVd6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCbbm58bFz1BXP for ; Sat, 09 May 2026 19:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19667 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 19:27:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: fdd7daa2318e - main - thunderbolt: Fix typo in comment 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fdd7daa2318ed3177e2674b9a3d18d21e2035ee1 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 19:27:32 +0000 Message-Id: <69ff8aa4.19667.279aa722@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=fdd7daa2318ed3177e2674b9a3d18d21e2035ee1 commit fdd7daa2318ed3177e2674b9a3d18d21e2035ee1 Author: Aymeric Wibo AuthorDate: 2026-05-09 17:22:41 +0000 Commit: Aymeric Wibo CommitDate: 2026-05-09 17:47:30 +0000 thunderbolt: Fix typo in comment Reported by: adrian Sponsored by: The FreeBSD Foundation --- sys/dev/thunderbolt/tbcfg_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/thunderbolt/tbcfg_reg.h b/sys/dev/thunderbolt/tbcfg_reg.h index bb68faa543b0..6ae5c6fea7fa 100644 --- a/sys/dev/thunderbolt/tbcfg_reg.h +++ b/sys/dev/thunderbolt/tbcfg_reg.h @@ -52,7 +52,7 @@ struct tb_cfg_read { uint32_t crc; }; -/* Config space read request, 6.4.2.4 */ +/* Config space read response, 6.4.2.4 */ struct tb_cfg_read_resp { tb_route_t route; uint32_t addr_attrs; From nobody Sat May 9 22:03:38 2026 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 4gCg3v3Clzz6csps for ; Sat, 09 May 2026 22:03:39 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCg3v09vLz43RC for ; Sat, 09 May 2026 22:03:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778364219; 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=y/WUvu9iDiXaQ/iU2iEts6hQLor1oarFU9u3oNV60U4=; b=ld1yVpUv01aXRl3kavEGZJtnOrhp6RE8Cs7FxiQ9i6nZcRs1IcHzhkwzpr9w9ru4lOnRQx SasCX5QFi0m6zmXU3iMb5v2LQUlZyBuzOGzNI9P/NlRhiQi2fty9rSt7i5AYG+Z1S/PVQ0 +zmB4erIkFCtyF+ct7lTFh++LQAwrYrZ8g3PtGdD3TCA5Xu4Ra3Vb/mczaQhrxYa5C7RfW OBoGE5r/MXKbRkGyoVK6lAEzWg7KDR/mSGwuozaRrvzyt613PrA+rnGUV9brrFLXMYuAi0 3VfXiVF3CKvNbDiLk7k3vGoMzbxWzajeSPh9i5J21AbhtJ5UvCg9bufS6Dcfqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778364219; a=rsa-sha256; cv=none; b=CqRH4OHeBHsb96SqZ52nVQ1XO/NVB6K14O24u6/2Ssldx00q0NNz3aqYVOLAF1b/iNLaHu hTdi/Ux6GYBixsiTvXR+4gCeF2bxFCqmSiaH9YXixNl5P3wKVUGOvw4hSHZ4Qu/2qygiFL KI+xxVLSboToHsyB3aZCb0Ef/gEHzh5vHeb2BMxArAhUgqxIxXRNSlTv+v5ugwurxFly1d oujxHYWTN8FhKVpAqeswGKuL4hhT2WGxBJlNh9QcFhLh6cp/mTfFqhygu15xCm4hCxV732 LGUNLV/Br7wIGJUa/MynmkXGZepgK8OdD5tKweH2ZLwVmfw6xoCeFwPhqhamuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778364219; 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=y/WUvu9iDiXaQ/iU2iEts6hQLor1oarFU9u3oNV60U4=; b=Yn0UTIXiRyiaJ3p6k4W+bAABPWHmdEIVyhSgv4lUs9sLq+Ayyiqv9HFVaTyh4YYE1liKzk P80OAaoaLcTHtfAjB8M9Pm+yWYhXCsgtElPyjgGZvrq1zVDNIFjwb/IaOMOlhkdrhvPvmd nvs75keA+ilf4V1cjwVyYpjv2MW/ojI0ZcwMgDxHaYcjIsdhWzniFkt4yN2qqaiFeMgHZM juEM6qFo1yKqCfChbalh7dcu1Allhfi7J769PkpY23p2L/Pli+xzXOEF6M0EpqOTraGK3/ vs4YCBLqgV6Y5a7yz/ih2MvyHBe2V0EJ8Of7L+CxxTC8hsJCoCVqWUc9iHBLhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCg3t6vjqz1Gtg for ; Sat, 09 May 2026 22:03:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34539 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 22:03:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jilles Tjoelker Subject: git: 3ca8ec19b6ec - main - libc: correct posix_spawn_file_actions_init ENOMEM error 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jilles X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ca8ec19b6ecc8ae4413d0505ce2d0efdd3e52c8 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 22:03:38 +0000 Message-Id: <69ffaf3a.34539.6a178982@gitrepo.freebsd.org> The branch main has been updated by jilles: URL: https://cgit.FreeBSD.org/src/commit/?id=3ca8ec19b6ecc8ae4413d0505ce2d0efdd3e52c8 commit 3ca8ec19b6ecc8ae4413d0505ce2d0efdd3e52c8 Author: Jilles Tjoelker AuthorDate: 2026-05-09 22:01:50 +0000 Commit: Jilles Tjoelker CommitDate: 2026-05-09 22:02:25 +0000 libc: correct posix_spawn_file_actions_init ENOMEM error The return value of posix_spawn_file_actions_init() is an error number. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56911 --- lib/libc/gen/posix_spawn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c index 11cdb5a29d03..faddb0d1494f 100644 --- a/lib/libc/gen/posix_spawn.c +++ b/lib/libc/gen/posix_spawn.c @@ -424,7 +424,7 @@ posix_spawn_file_actions_init(posix_spawn_file_actions_t *ret) fa = malloc(sizeof(struct __posix_spawn_file_actions)); if (fa == NULL) - return (-1); + return (errno); STAILQ_INIT(&fa->fa_list); *ret = fa; From nobody Sun May 10 04:43:18 2026 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 4gCqx26qFzz6KZZ6 for ; Sun, 10 May 2026 04:43:18 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCqx25sScz449s for ; Sun, 10 May 2026 04:43:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778388198; 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=qjeb960T8q6/tBNpk7e5HYTEeVRdK6TueiXifKnDVhI=; b=Os4FQPcs+lnPcoCkAJ7E/gAcDx7kdslH0J9FUdUJJcxdtaCmdWwH+3yz0PJ6Apqa2HWnGG BsZ4S9QmDLuSQ2t+YiPAh+HaCwKJ+uKEoVsKU+RH1FBYq7H8coM/X4IWHPpRSlDbzUL+og yVfSUKiAfVe0bLzdq7KAK4XalMJekVIGhxu9rFNX4A/K6C6Anyxe0fOOc0gUiXaeHVom+5 Wnemdjr+m22axWcU+No5ShXvOl7Abxikb+5VO1Ziza3XzN219RBnK2fqmj24T5qB4cJ/K/ bex5iN2/xnqlzKprfENnJseSNU1C9B/4oPo3bvTZhSKPbtekassTU9CDza3reQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778388198; a=rsa-sha256; cv=none; b=SlF2k/DRq1KITYxH5lq0kXD8VEeW6BfDYkpfcnPvzL1rPX8Km0m6En8FqQmDLZQU9WvCCM S4m3qGr6LMO49yMSeRXeykny3rVOwmsRxPAzMaFGw5xIuSEzBy1CIpCio5k0Rg7B5+nGch Ze0P94LfUsXZ2MKsidaIWtxqVk0WaqGygfPtGncm3ZCavBLlNkyCfoPjFeXuyEUU6CQQP+ BjVxOmeBSCz9qHXmXx5iLNDbJsHw3BcoMPf2hkDGPW0PjmoY4T0rES7jodPhXiC1AmGZ0+ 4OrK93kJ5KMemP6L6acseDwhylB73hgoWb3s3tNBCudgxWRWnqfH3DQ+8VHnLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778388198; 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=qjeb960T8q6/tBNpk7e5HYTEeVRdK6TueiXifKnDVhI=; b=Zj300V6/yObov/ChqWea+S1mgPpul7CjXeFgPRLAum2Hi9hca9/bYApz1QIODHx5s4Md/s nUcWUkOJteHCnwCosdsAOzdl5O5Knj1wJmT9WC8bdAHlmEwJktf0XexQlyKsRShD3DvrnK bsDo5rk8pRCgxyu+uAwyZbcFzto10au35JTwAT+PCkGKM8L5OjJ4gle6DaBqNT8/0fg6AZ tCbugIIWysKpDtabr/VPLjM/n5P2bAHN1p+pykCf/vZbkiE+NSBH60ig5jNL00U+yonGdZ Onbxe0owDaak31M7tyJdcqFajHGdWzg72/CQgEKcO9h8poO/AomNw8Djo6bsvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCqx25T5Cz4s for ; Sun, 10 May 2026 04:43:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3679f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 04:43:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 58e5b4dbd959 - main - vfs_subr: mark uma zone and smr pointers __read_mostly 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58e5b4dbd9594f9553cfe9df68a19a294e245ed7 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 04:43:18 +0000 Message-Id: <6a000ce6.3679f.32629671@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=58e5b4dbd9594f9553cfe9df68a19a294e245ed7 commit 58e5b4dbd9594f9553cfe9df68a19a294e245ed7 Author: Ryan Libby AuthorDate: 2026-05-10 04:25:12 +0000 Commit: Ryan Libby CommitDate: 2026-05-10 04:25:12 +0000 vfs_subr: mark uma zone and smr pointers __read_mostly Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56892 --- sys/kern/vfs_subr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 823ccc6cab71..bba0f3575300 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -237,15 +237,15 @@ static struct mtx mntid_mtx; */ static struct mtx __exclusive_cache_line vnode_list_mtx; -static uma_zone_t buf_trie_zone; -static smr_t buf_trie_smr; +static __read_mostly uma_zone_t buf_trie_zone; +static __read_mostly smr_t buf_trie_smr; /* Zone for allocation of new vnodes - used exclusively by getnewvnode() */ -static uma_zone_t vnode_zone; -MALLOC_DEFINE(M_VNODEPOLL, "VN POLL", "vnode poll"); - +static __read_mostly uma_zone_t vnode_zone; __read_frequently smr_t vfs_smr; +MALLOC_DEFINE(M_VNODEPOLL, "VN POLL", "vnode poll"); + /* * The workitem queue. * From nobody Sun May 10 04:43:19 2026 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 4gCqx412CMz6KZWw for ; Sun, 10 May 2026 04:43:20 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCqx36q04z44Jb for ; Sun, 10 May 2026 04:43:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778388200; 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=ky67kWNOAvyCsf5msQuNdJTUmfs4bUsybaFktx9+nzQ=; b=AjJC+vroisY3l3477D3VOw2ZUuPwDngwkkdAjgIzP9pWcm9lsYxZB1rWqcdHHgzNLYnEbQ iErriDf3qPyi/f4cBuPlisDIy+cTkbeuke4rKvX22RRX4LFJReHkO6W48TAAMw8cRcCklY R2hGXSQDHmUyiyJdh7/NBGAhedOjjFy7EFHsxn8G+vB5BRzBcryht35y46emcb375RO3r2 C45xfkHe2VtBVmjMQg+JK+Z17++QXBf9rTfDFP6nVtbS9BrHK3E0TEiwKDfPHR1LCIwbXB YPvEcDQVgSVjXQWfZpe/FHfo7Tm+DajquAS2SmDbVT9DE0LAK3CaOMHcHhoQ+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778388200; a=rsa-sha256; cv=none; b=KVM90p2eOXP0RlecPZ0LoX6IkhoOkL9AmFXgIzS4+vhhM7XLTTw+FosyeTdBfy9vK3/3y1 P+TSiqEzR5TYd6vVyfJpkplAWZqYn7siaiOKZ7exX+PNTNyyX/mVvUAHRhVUEEcTpQYkwY UerFJq25I3a/B0X306eyvdlhhxAV9PmC3gW1KiK7pa5VreisJi6kzArtD2R0sS67GJ7WVl ye53mHfJbY6XEkXECrDobZAMXEubekQVStKjWtd1F13mb7FnT5yDMNBI8PV8xlwodt3BCq Qu7Cm2LE5iW9OEpWzMWJ3ktEL/9p5X6A30fejyKDZZBAwWjneSgmrgxravcZKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778388200; 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=ky67kWNOAvyCsf5msQuNdJTUmfs4bUsybaFktx9+nzQ=; b=c33AhkgqoZkobdetyqK45u6CC6m92v3NkY8BM1XbwfQe77ewmZ0KRl/nyDnJKdgT+si16/ /MfOBt6/mWWXm33t7HVb/OG37lCnzbsNh9v90ux1t079ITMwZbJq/0I+rnhHGS5KYhJl3Y YKZhVl3kKCiWiWAnmg5Tmwznbx6m16i67GtPkHoqc7kaOFASRyCK7qsVwHSeNi7rTgXbQm 4PaqHQobxn3wVJPj8WomQ5L7lPj3q6YsvO7cc+LDfpXJeXvxnbzKUNgDt1n2yHCe6/mmew 5s9q8uwrDP3exb17K0iGvULHK+ppIWNKoWzNlD5Gtyqz0gkL9PI10PJArA5Uhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCqx36DSBzbK for ; Sun, 10 May 2026 04:43:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37700 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 04:43:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 0f6c880fcecd - main - stand/i386: quiet executable stack warning 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f6c880fcecdbb9cc84ed03ee85a518dd3c66f12 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 04:43:19 +0000 Message-Id: <6a000ce7.37700.78957453@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=0f6c880fcecdbb9cc84ed03ee85a518dd3c66f12 commit 0f6c880fcecdbb9cc84ed03ee85a518dd3c66f12 Author: Ryan Libby AuthorDate: 2026-05-10 04:25:43 +0000 Commit: Ryan Libby CommitDate: 2026-05-10 04:25:43 +0000 stand/i386: quiet executable stack warning Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D56908 --- stand/i386/boot2/sio.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stand/i386/boot2/sio.S b/stand/i386/boot2/sio.S index de554efb5b3e..5c4650dc0533 100644 --- a/stand/i386/boot2/sio.S +++ b/stand/i386/boot2/sio.S @@ -80,3 +80,5 @@ sio_ischar: movw $SIO_PRT+0x5,%dx # Line status register inb (%dx),%al # Received data andb $0x1,%al # ready? ret # To caller + + .section .note.GNU-stack,"",%progbits From nobody Sun May 10 14:54:42 2026 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 4gD5VV1j7mz6cxR3 for ; Sun, 10 May 2026 14:54:42 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD5VV0ztTz3sXX for ; Sun, 10 May 2026 14:54:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778424882; 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=QLFAsQ1+NzctI7RKZgTXJL9rutWkrN5XG8J1CyRuP6w=; b=TBvMydQUPWCIUcFIuVLeyL+irpdhQvZGuLmEfiCsBGcsIftdl8OUBO0q+epSf7WcgrNYLb FEcQ7fB0yz/CzyZgKr9YvqfM6pbzUhTruXe5j67QhiqU1O7qR2d4D0wEkqu81UrLL/fxS/ +NSM3wyUBiFXGfqtQvfitMB5oveLHrYKQ7V9Tcs7vLzwycoPlZfMS6iZIld9IURRsmdMWp o9MKAbUGazIeB8qgdYUguPEcbme8yl6XH7aECKhlm3rX73Wchs1mFEVAqe+Ju3B171Nuye EPgJJc0GmoIKSdjq5GWF2GkLkL3LNnhG/DU5dwNXN0urHW1pj6MPQLN6fvGQeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778424882; a=rsa-sha256; cv=none; b=KpWuPgsO65fsELxYj6CjBZvh6wzUO9AtS+e6unGuklw0H12xKQXHkaH5cfyMdXBugRDDSG dqJRdEZje3JsLK8iay+7HM5ISDq80bHV7SG6i+7fuEpfSQQjUlzNBxyW23D0AH+G2ootna AWlDVpDLtx6pcBXI99VLBhbm6tDW5LhQvhxF3HVmIlsmgDysQZ89esGUg1qZjTAKLqEmiM SKd945lVH0W1LInUmgURX1c2KXG5kgTO5X5NmLzYlVjVdgKyIq0ZFUcveD43r7hpKZaQ25 i+xJQgJ+xjUsD3rUo7wzomHoS2/sboxxhp8hSz4t7PaBI/uERB84F5ceKVReAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778424882; 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=QLFAsQ1+NzctI7RKZgTXJL9rutWkrN5XG8J1CyRuP6w=; b=WsY++MkD3Ib/IntKVLcwOCQoXxaJAmviPMpbrV9bbpr0Jfm5aupNSU8fP8SRB7Pbidp6m8 dmS5UZRvVboHAf5F76sn4Z19oHoYvtS+m0kwJ1arHRY2FEALCAmBm2/OKBRzkjWcxpCgqg Gfr3efNbs8cyqVCddldDZU+eHRuXs5wRi2jbv4qk9ylXQM1e+NaqqVquDiDcnUVMLcxkQ7 kRtxqvOADsGoFp+4J8akNocCncSzUwV3GWfe4iL4BSeWAitGA1j+nSUBgzg+X5wIOMLtal no07XNrUi8IAji9gmUPolc9ljdmR3YgKxbdRG8vA2Vf8q4vy5FBRGS4PVZ+pdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD5VV0FGCzbRT for ; Sun, 10 May 2026 14:54:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2719a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 14:54:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: a2e0822543e9 - main - libc: add freadlink(3) 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2e0822543e93a8d815acd2d1c3d51ef73d6e262 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 14:54:42 +0000 Message-Id: <6a009c32.2719a.14640cae@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a2e0822543e93a8d815acd2d1c3d51ef73d6e262 commit a2e0822543e93a8d815acd2d1c3d51ef73d6e262 Author: Konstantin Belousov AuthorDate: 2026-04-12 08:56:26 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 14:53:20 +0000 libc: add freadlink(3) Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56365 --- include/unistd.h | 1 + lib/libc/gen/Makefile.inc | 1 + lib/libc/gen/Symbol.map | 1 + lib/libc/gen/freadlink.c | 16 ++++++++++++++++ 4 files changed, 19 insertions(+) diff --git a/include/unistd.h b/include/unistd.h index 797eac4c364d..290bcce6a0b3 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -518,6 +518,7 @@ int execvpe(const char *, char * const *, char * const *); int feature_present(const char *); int fchroot(int); char *fflagstostr(u_long); +ssize_t freadlink(int fd, char *buf, size_t bufsize); int getdomainname(char *, int); int getentropy(void *, size_t); int getgrouplist(const char *, gid_t, gid_t *, int *); diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index c31f789fd1d1..18a68902f50a 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -56,6 +56,7 @@ SRCS+= \ fmtmsg.c \ fnmatch.c \ fpclassify.c \ + freadlink.c \ frexp.c \ fstab.c \ ftok.c \ diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index 60f34b3a1923..4d22251f7ec5 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -475,6 +475,7 @@ FBSD_1.8 { }; FBSD_1.9 { + freadlink; posix_spawn_file_actions_addchdir; posix_spawn_file_actions_addfchdir; posix_spawnattr_getexecfd_np; diff --git a/lib/libc/gen/freadlink.c b/lib/libc/gen/freadlink.c new file mode 100644 index 000000000000..e1ed7aba6c06 --- /dev/null +++ b/lib/libc/gen/freadlink.c @@ -0,0 +1,16 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright 2026 The FreeBSD Foundation + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + */ + +#include + +ssize_t +freadlink(int fd, char *buf, size_t bufsize) +{ + return (readlinkat(fd, "", buf, bufsize)); +} From nobody Sun May 10 14:54:43 2026 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 4gD5VW29VKz6cxX5 for ; Sun, 10 May 2026 14:54:43 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD5VW1PSYz3spM for ; Sun, 10 May 2026 14:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778424883; 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=5mYKT94xkutQFS21vXToTAroJfEuqCIl+eI6d4RpWdc=; b=TW+0vfYDs0qbdh2P6jsxOf4elIcltcNe8DPTcmcke+qHkAhoTYLcU5n90RrK3UyLcJkazd 5yZFLAGP+qJssnZn/sRHfv+enlC1g938oPltrifnr00Oz0rLLYe7MQ3crQWDHOjaIP4yCN Z29JejRBf/8Xh+aiuWMVDLmaHs5Z+9x5pYydtic22pfX1KhTiPffZq7TzZINZdwnrJBPnG OES7jg4X6J1wj8ASuk5LeIZn3Dux6+Nxwwra4eBt9uNSP10xcOM36D8tMJSPwRGMRXhLbM uQDR9xTDw4f6dCdOtyQIXB/P6zCD8sUSf2dKJL5Gsm1ebeeAjNyQpRKoDDewvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778424883; a=rsa-sha256; cv=none; b=cYKzxFEdgi5wP9fbaVwqz2WyXSWtp+7FtKTnqqwvxMqzOH4uvzTTl4f3yUXFL2jkE4ue9t TYdgmH0F2JDF3XLbGUv/hc1DdVpOSej4Kl/kNgRV+5FxgwC9gqhOI3XLgYn2qQicsZktF6 VCjvW0uAsvVwtTXSNIjF8KyQXqtuzQKV6x81neRJAJ0t9nT4Myt8kcV3gX23UYG8aMy0+6 FcGEnmLlDalTyugxmM4pz+eCc3A+8jb6Mtsp7KmeYMWUbnxDkLjXjayTkDPw3rEcPhyAFl 182aSq7Dh9p+Bwe0BqDfecNtKZHkV7eU+x5BDBdF1/JuXUf4VPXRQsGJ/nbJcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778424883; 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=5mYKT94xkutQFS21vXToTAroJfEuqCIl+eI6d4RpWdc=; b=bDLinIUg3CQKKpXGcUGOGd55qiHLQ4LfPXRayHtW6YyJ3nSAKfChaiXLpTp1894uRd/9kV vdnvCZP5k2R2aUFgRPUs/H7Br61kDNiWIjNzsMgYv4xBD3ebzrb/ha7iqaTLvLFqL6x4Lm McgM4t7eATHWDCvlZFAJpQskUL1+r1aI6Tp0y86NmErZ0a2OfP7zgKLiJ8xodUjYD0+mGY uBZCfgj1skh9ESxP01Z6P2PphgFGcR/xfFgrgZVhgGNgOOLar7/Nvz0q2nrJrtzMybiSbK PTMJwXW5J59ychLUTpTO1DJXpdBcTU/SUKfMvEtvR+GLx08axC+Gn4fwpe19Wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD5VW110pzbVW for ; Sun, 10 May 2026 14:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25866 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 14:54:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 428da7d65b1c - main - Add O_SYMLINK emulation 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 428da7d65b1c41c81a8786f66c1ce2f4242ac8bb Auto-Submitted: auto-generated Date: Sun, 10 May 2026 14:54:43 +0000 Message-Id: <6a009c33.25866.2ce3165b@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=428da7d65b1c41c81a8786f66c1ce2f4242ac8bb commit 428da7d65b1c41c81a8786f66c1ce2f4242ac8bb Author: Konstantin Belousov AuthorDate: 2026-04-20 20:02:13 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 14:53:20 +0000 Add O_SYMLINK emulation for MacOSX partial compatibility, defined as O_PATH | O_NOFOLLOW. fstat(2) and freadlink(3) works on the resulting file descriptors, but reads on the regular file do not. More complete but more hackish version was developed but deemed too hackish. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D56365 --- sys/sys/fcntl.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h index 0b13241f0ee3..80cbca4ea753 100644 --- a/sys/sys/fcntl.h +++ b/sys/sys/fcntl.h @@ -142,6 +142,13 @@ typedef __pid_t pid_t; #define O_EMPTY_PATH 0x02000000 #define O_NAMEDATTR 0x04000000 /* NFSv4 named attributes */ #define O_XATTR O_NAMEDATTR /* Solaris compatibility */ + +/* + * Emulate MacOSX compatibility flag without consuming a flags bit. + * It is not fully correct since reads over regular files opened with + * this definition fail. + */ +#define O_SYMLINK (O_PATH | O_NOFOLLOW) #endif #if __POSIX_VISIBLE >= 202405 From nobody Sun May 10 15:56:26 2026 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 4gD6sk6Nylz6d36G for ; Sun, 10 May 2026 15:56:26 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD6sk5c6vz44db for ; Sun, 10 May 2026 15:56:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778428586; 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=kgPEt56gTkjgu3YvioKEvSIlHn5kMmSHZnRaxYe+GBE=; b=egG092w+KCDmpPWgsYeHNwoodb0Hx+UcsTEgj3V7fUDi2/JxSYSA0RHxaB4bU1auQ34lkY f3cHmxJOkplkT6AYGbTWHvMBEmY4P73iX/jpeYpi/AGAgHa3j0uR8Ey8+0LL/x87YLKK0M iKyFiDgu7ErEbu5DP+wjDfrxlOGX2o3AOkNJ272JBTvQR7vQIFoNVvByTeB+ah1GaY0Fht YLvrdBEKhbt8FOb+ebbn55N2d6pE4oxrCTDV8ojEZ+tTvaM2sTT9SgD9BidTsL7FuYsKRw yV9eBStld38EQWRr9wXXPOFLsYLgbJm7hOGVKJxbNoniwuAcT4fIZigPbegOMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778428586; a=rsa-sha256; cv=none; b=xYmMLqgoTUV2w5sa7QCW+wv+k0RIbX7rdReH5+ufgdlnm1Koqwk5DjIPttMjaE8xCM6gJk aF2owxVuQhzwph7oCUIgWYc3PCbGnBm3ZubVCzqAGxFwdBStAd3PrVyQ/lnpudeqlIe9U+ n6v4D1EvWM0rCMrgCIgUrDypOmMRgwbVhpR/CO0qeIBKlSE8Za6me8KkfVkBAMBrIxHie8 7+Xzbk6A9qwMJq3Q9LMlZXMLBdw7fnfk6xIDsZrJas4EKz102XK+Com/ZfLQnqcsJisL+7 nlCQVQbKNzeAKJWgyLqHVdOC662H6rZRcWUrndKO+VUGgegayHWqcnJgvs/54g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778428586; 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=kgPEt56gTkjgu3YvioKEvSIlHn5kMmSHZnRaxYe+GBE=; b=W2IU18A+flCkwvp1kUZ/XDe8JyLgNgyRJTocI6si19X0xehWinB8YXYL1Mvs+KTJ/+N6hS ihEIjQIloIPILXz7MyOB2jVGfmUqgam9irVVskSAHGILE57QLTyJCBMRZ5Cg5COPOhSMMV goQyMAaxtsAjmJoUbmujItgOeCAQwlFL9atT4oo8pLQJqcyjyy2YM97RhqLEWF1b/GHy31 aBj5mv7TvhjWQ0snr4XKSBuys19nU4SuUiKAjGH85Z72r07skWd/amEPEbFytsvMglmbKw 7ku8gTtyOC/sjJ3mJLNL9fGoK4VSPdgalZCQdMG5F6+6dbReLkSUZJodGFmleQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD6sk4qFbzd0L for ; Sun, 10 May 2026 15:56:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36506 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 15:56:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 68fd0feacb8c - main - nuageinit: add decode_base64 tests 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68fd0feacb8ce5da9c47deea5505b3241b2ba6ec Auto-Submitted: auto-generated Date: Sun, 10 May 2026 15:56:26 +0000 Message-Id: <6a00aaaa.36506.4c33e375@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=68fd0feacb8ce5da9c47deea5505b3241b2ba6ec commit 68fd0feacb8ce5da9c47deea5505b3241b2ba6ec Author: Baptiste Daroussin AuthorDate: 2026-05-07 17:17:56 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-10 15:50:53 +0000 nuageinit: add decode_base64 tests --- libexec/nuageinit/tests/Makefile | 1 + libexec/nuageinit/tests/decode_base64.lua | 61 +++++++++++++++++++++++++++++++ libexec/nuageinit/tests/nuage.sh | 8 ++++ 3 files changed, 70 insertions(+) diff --git a/libexec/nuageinit/tests/Makefile b/libexec/nuageinit/tests/Makefile index dc8997717b59..feca49784c9e 100644 --- a/libexec/nuageinit/tests/Makefile +++ b/libexec/nuageinit/tests/Makefile @@ -18,5 +18,6 @@ ${PACKAGE}FILES+= sethostname.lua ${PACKAGE}FILES+= settimezone.lua ${PACKAGE}FILES+= warn.lua ${PACKAGE}FILES+= addfile.lua +${PACKAGE}FILES+= decode_base64.lua .include diff --git a/libexec/nuageinit/tests/decode_base64.lua b/libexec/nuageinit/tests/decode_base64.lua new file mode 100644 index 000000000000..0951d77f0ed7 --- /dev/null +++ b/libexec/nuageinit/tests/decode_base64.lua @@ -0,0 +1,61 @@ +#!/usr/libexec/flua +--- +-- SPDX-License-Identifier: BSD-2-Clause +-- +-- Copyright (c) 2026 Baptiste Daroussin + +local n = require("nuage") + +-- decode_base64 is not exported, test via addfile + +local function test_decode(input, expected) + local r, err = n.addfile({ + content = input, + encoding = "base64", + path = "/tmp/nuage_test_b64" + }, false) + if not r then + n.err(err) + end + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + if not root then + root = "" + end + local f = assert(io.open(root .. "/tmp/nuage_test_b64", "r")) + local str = f:read("*all") + f:close() + if str ~= expected then + n.err("base64 decode failed: expected '" .. expected + .. "' got '" .. str .. "'") + end +end + +-- empty input +test_decode("", "") + +-- single byte: 'a' +test_decode("YQ==", "a") + +-- two bytes: 'ab' +test_decode("YWI=", "ab") + +-- three bytes: 'abc' +test_decode("YWJj", "abc") + +-- newline in base64 +test_decode("YmxhCg==", "bla\n") + +-- spaces should be ignored +test_decode("Y Q = =", "a") + +-- b64 alias +local r, err = n.addfile({ + content = "YQ==", + encoding = "b64", + path = "/tmp/nuage_test_b64_b64" +}, false) +if not r then + n.err("b64 encoding alias should work: " .. tostring(err)) +end + +os.exit(0) diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 57d83b62928a..1c8d717a5b67 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -14,6 +14,7 @@ atf_test_case adduser atf_test_case adduser_passwd atf_test_case addgroup atf_test_case addfile +atf_test_case decode_base64 settimezone_body() { @@ -90,6 +91,12 @@ addfile_body() atf_check /usr/libexec/flua $(atf_get_srcdir)/addfile.lua } +decode_base64_body() +{ + mkdir tmp + atf_check /usr/libexec/flua $(atf_get_srcdir)/decode_base64.lua +} + atf_init_test_cases() { atf_add_test_case sethostname @@ -98,4 +105,5 @@ atf_init_test_cases() atf_add_test_case adduser_passwd atf_add_test_case addgroup atf_add_test_case addfile + atf_add_test_case decode_base64 } From nobody Sun May 10 15:56:27 2026 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 4gD6sm1T0hz6d2qh for ; Sun, 10 May 2026 15:56:28 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD6sl6KyNz44L6 for ; Sun, 10 May 2026 15:56:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778428587; 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=+obgy3UMByLjqGUKgB/USYEigFT7InwUqad12XKsCyo=; b=MKEoy4hm9SNhEcylJty0cmMgX6jXkkqDqTtys6ova14lNT8MRXs0+MhaJCL+TUNecvU0mw ZvTg3/MNMSvuJdkExtLmKp2rYipornWVhXFSRuE/d3FXXgFhJEFH4wDC5FeS2c2oWiRkbO 6X8F2NHbgVfw/zhPM3u8GlXA1teFfFvREWY3479VV37yVu5TGIYLVSx84XWvWu0JsDqKLS HuJ3Q3a9I6CTHVhWuDLkCC3DwPxeD03Cqndgf4R3+JREcYdhjFg9A2oagHFo03VQtt24LB uFWfXJPL04OBbx0aNP5Xzwqql07CosCT+eC2fl0iQZHk3cRZEzg6o5cNGQwfJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778428587; a=rsa-sha256; cv=none; b=rDWriK8phGmbyKsUS+V1eVK7yvpFBZLBQJIhzB08m5N/yPivX85Oz0Q4YAN2ySTltMHqbs O7+fqxOZU6cWizwwA990UHYeUzS9nVapGUkqXlBdNXSwan4M4Izg4v/Pqo45CMEotcaxtH i2v+e4dTWvqs4T9BBFwvkES0MoyJL5+wa7QgJgGSrD9eK2BbwL7CC8Vq9O4v4tY9lAVDtH hJeaRgoRcUearZDVxJp0sbadtQch/RejJcKi/GlmY/a5wQi/FMfCctvlhSL9zbh+0VXhhS B/14M1Ak3+AoOBCsQJjRsCmYpFKftkPjcnO2zHMNgdZ7zLODHyjUY/sxR0UASw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778428587; 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=+obgy3UMByLjqGUKgB/USYEigFT7InwUqad12XKsCyo=; b=vh0pWfjjoTU2SDOlITWBR2wqbNRCMidlL+k0+rw7Qhyy20JDEVANU6wYEfaio30SfvajA5 zSoX/QYUq8DaEsR5o0iHMByJkSiS0ukJYGXUc6MkbjDbeKFt2exo+ZE44btOzQVJmaJ/SG lQOJMI5ZxzHz1hUPGXs5OIPOGSsK+ZPyk+oWgY01FQI3mep4UYAg3i68GNY8gWYLJ7jqWN CDZP3/xAuqK5fb5/xppDrChSzu+gQpwCWF4uMt6jP4VqR9QTkb+HWzVIKYGtwCfPCyJFfv XXL0hqZl7vzSzEXbGXOqGT8D+11k5iShadVUQbsV1/10VvxLPM9223T4LvS8kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD6sl5VKfzchR for ; Sun, 10 May 2026 15:56:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36915 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 15:56:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: a49b3b10aae2 - main - nuageinit: add addsudo tests 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a49b3b10aae2db1f4a4ecf310fdedc80eb6bb7e2 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 15:56:27 +0000 Message-Id: <6a00aaab.36915.3ae93688@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=a49b3b10aae2db1f4a4ecf310fdedc80eb6bb7e2 commit a49b3b10aae2db1f4a4ecf310fdedc80eb6bb7e2 Author: Baptiste Daroussin AuthorDate: 2026-05-10 15:54:47 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-10 15:54:47 +0000 nuageinit: add addsudo tests --- libexec/nuageinit/tests/Makefile | 1 + libexec/nuageinit/tests/addsudo.lua | 61 +++++++++++++++++++++++++++++++++++++ libexec/nuageinit/tests/nuage.sh | 7 +++++ 3 files changed, 69 insertions(+) diff --git a/libexec/nuageinit/tests/Makefile b/libexec/nuageinit/tests/Makefile index feca49784c9e..d13ad14f1d8f 100644 --- a/libexec/nuageinit/tests/Makefile +++ b/libexec/nuageinit/tests/Makefile @@ -19,5 +19,6 @@ ${PACKAGE}FILES+= settimezone.lua ${PACKAGE}FILES+= warn.lua ${PACKAGE}FILES+= addfile.lua ${PACKAGE}FILES+= decode_base64.lua +${PACKAGE}FILES+= addsudo.lua .include diff --git a/libexec/nuageinit/tests/addsudo.lua b/libexec/nuageinit/tests/addsudo.lua new file mode 100644 index 000000000000..7fc5865d83f4 --- /dev/null +++ b/libexec/nuageinit/tests/addsudo.lua @@ -0,0 +1,61 @@ +#!/usr/libexec/flua +--- +-- SPDX-License-Identifier: BSD-2-Clause +-- +-- Copyright (c) 2026 Baptiste Daroussin + +local n = require("nuage") + +local root = os.getenv("NUAGE_FAKE_ROOTDIR") +if not root then + root = "" +end + +local function get_localbase() + local f = io.popen("sysctl -in user.localbase 2> /dev/null") + local lb = f:read("*l") + f:close() + if lb == nil or lb:len() == 0 then + lb = "/usr/local" + end + return lb +end + +local function read_sudoers() + local path = root .. get_localbase() .. "/etc/sudoers.d/90-nuageinit-users" + local f = io.open(path, "r") + if not f then + return nil + end + local content = f:read("*a") + f:close() + return content +end + +-- test with a single string rule +n.addsudo({ name = "testuser", sudo = "ALL=(ALL) NOPASSWD:ALL" }) +local content = read_sudoers() +if not content then + n.err("sudoers file not created") +end +if content ~= "testuser ALL=(ALL) NOPASSWD:ALL\n" then + n.err("unexpected sudoers content for string rule: '" .. content .. "'") +end + +-- remove file for next test +os.remove(root .. get_localbase() .. "/etc/sudoers.d/90-nuageinit-users") + +-- test with a table of rules +n.addsudo({ + name = "testuser", + sudo = { "ALL=(ALL) NOPASSWD:/usr/sbin/pw", "ALL=(ALL) ALL" } +}) +content = read_sudoers() +if not content then + n.err("sudoers file not created for table") +end +if content ~= "testuser ALL=(ALL) NOPASSWD:/usr/sbin/pw\ntestuser ALL=(ALL) ALL\n" then + n.err("unexpected sudoers content for table: '" .. content .. "'") +end + +os.exit(0) diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 1c8d717a5b67..9e3442281c15 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -15,6 +15,7 @@ atf_test_case adduser_passwd atf_test_case addgroup atf_test_case addfile atf_test_case decode_base64 +atf_test_case addsudo settimezone_body() { @@ -97,6 +98,11 @@ decode_base64_body() atf_check /usr/libexec/flua $(atf_get_srcdir)/decode_base64.lua } +addsudo_body() +{ + atf_check /usr/libexec/flua $(atf_get_srcdir)/addsudo.lua +} + atf_init_test_cases() { atf_add_test_case sethostname @@ -106,4 +112,5 @@ atf_init_test_cases() atf_add_test_case addgroup atf_add_test_case addfile atf_add_test_case decode_base64 + atf_add_test_case addsudo } From nobody Sun May 10 15:56:28 2026 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 4gD6sn2RLTz6d32c for ; Sun, 10 May 2026 15:56:29 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD6sm70Dgz44c8 for ; Sun, 10 May 2026 15:56:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778428589; 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=t1mlQB0ptcVJDPD+czd6Ho0sZ4gxCAnIs7cXYrqH1pw=; b=qJERSlTP0wztW2pulHNFwpRiw8FkJxlu9fm67h0QLLZ/8WY4k/vWjE3XZZiHAq3HvoIWbV 2HMnm0IV8qOWbTVZVQzrpfv9GnC2TTgtnssrE64urfxm0LvTmFzu7vSJM67XsHvlPkKU8t 3V+GaBMARwKStGjYS3xZWpZmCoPqVyGU4C8jhqZumxDj/4YcRkEljZ+Jh9fJ4wku1wfbtD omee8SuxTYOfWc/NXm15O1qTqLWJCfApMHCd5m3BO5DWzUp5mvK6QjZk4NGcs/LsdzseWO p2RPw6ER10bCzCTKcqiwQGP0ZiZCNRi/A3IZcZproHNlbD9K5uFSxWGG6/VdBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778428589; a=rsa-sha256; cv=none; b=boxmFNwvsz/Gulyo82hNzIc3ognhcjWJQC2gMPNITsus58sGL5Hw2hXrHxMqG+A+SIaUxQ 9nYmv6ISks095XPx2qUk/9vBRMZ7VxfgnaJsG/CzbQ2rQL6Hr4lKOhhFCUaV2cqzIr7oK9 lekuDyP5AutIaEd6gKUYD0+1EQ1yVKhbGpnEwBrEUhF04I5nY2Ll8Wgs5LM3Viww7+bOV1 fwX8R13DYNKx6Uhxi1xvMY2lIFW049qnXfGWYKlDCfVlz8voYFmiHtRtB9RKF55c4rzf/g 1r8KeQ7f/BC9g9qaOXzg98nGHf93IKL+OpouI88OadAR4c35rTy2ojlniYIXBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778428589; 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=t1mlQB0ptcVJDPD+czd6Ho0sZ4gxCAnIs7cXYrqH1pw=; b=Il9zJXLESmmsI9IDE6zisRJx+pBD4cHRbB/1ex1hjMpbca+COs4fC1zDYOoOMDnqADTXpt xGTt+JvD13TsNcMjUkQlsqSkNHACH9DG9YBjkf/iukDW6GAtLSN+KgMo/vMCLiaMyd9aiX VNywt+rgTcfcaht8S97vCElIbDPLaZSXqLZ0RCOQ/FKzSF940G56YH20XlwZNeENzkfjRY hVpx495PZS6UkEH3/uYE9DHK6qUndCt4EtZho/DndtZ4GFRdh13aRMBAZp0NLScj/Yx2N6 IvwW3AZF/fJyi/izUsmWfibbmFgdZNv+R7rEPNoVVUIGQRZCizctiu72He55Eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD6sm5wzszd1J for ; Sun, 10 May 2026 15:56:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36919 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 15:56:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 0f92bee2b3e0 - main - nuageinit: add adddoas tests 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f92bee2b3e08ffa34720a2eeffbce01af3f19f9 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 15:56:28 +0000 Message-Id: <6a00aaac.36919.48a21cc3@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0f92bee2b3e08ffa34720a2eeffbce01af3f19f9 commit 0f92bee2b3e08ffa34720a2eeffbce01af3f19f9 Author: Baptiste Daroussin AuthorDate: 2026-05-10 15:54:48 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-10 15:54:48 +0000 nuageinit: add adddoas tests --- libexec/nuageinit/tests/Makefile | 1 + libexec/nuageinit/tests/adddoas.lua | 64 +++++++++++++++++++++++++++++++++++++ libexec/nuageinit/tests/nuage.sh | 7 ++++ 3 files changed, 72 insertions(+) diff --git a/libexec/nuageinit/tests/Makefile b/libexec/nuageinit/tests/Makefile index d13ad14f1d8f..4c99f8e31ce3 100644 --- a/libexec/nuageinit/tests/Makefile +++ b/libexec/nuageinit/tests/Makefile @@ -20,5 +20,6 @@ ${PACKAGE}FILES+= warn.lua ${PACKAGE}FILES+= addfile.lua ${PACKAGE}FILES+= decode_base64.lua ${PACKAGE}FILES+= addsudo.lua +${PACKAGE}FILES+= adddoas.lua .include diff --git a/libexec/nuageinit/tests/adddoas.lua b/libexec/nuageinit/tests/adddoas.lua new file mode 100644 index 000000000000..d4bab41ecc3d --- /dev/null +++ b/libexec/nuageinit/tests/adddoas.lua @@ -0,0 +1,64 @@ +#!/usr/libexec/flua +--- +-- SPDX-License-Identifier: BSD-2-Clause +-- +-- Copyright (c) 2026 Baptiste Daroussin + +local n = require("nuage") + +local root = os.getenv("NUAGE_FAKE_ROOTDIR") +if not root then + root = "" +end + +local function get_localbase() + local f = io.popen("sysctl -in user.localbase 2> /dev/null") + local lb = f:read("*l") + f:close() + if lb == nil or lb:len() == 0 then + lb = "/usr/local" + end + return lb +end + +local function read_doasconf() + local path = root .. get_localbase() .. "/etc/doas.conf" + local f = io.open(path, "r") + if not f then + return nil + end + local content = f:read("*a") + f:close() + return content +end + +-- test with a single string rule with %u substitution +n.adddoas({ name = "testuser", doas = "permit persist %u as root" }) +local content = read_doasconf() +if not content then + n.err("doas.conf not created") +end +if content ~= "permit persist testuser as root\n" then + n.err("unexpected doas.conf content with %u: '" .. content .. "'") +end + +-- remove file for next test +os.remove(root .. get_localbase() .. "/etc/doas.conf") + +-- test with a table of rules +n.adddoas({ + name = "testuser", + doas = { + "deny %u as foobar", + "permit persist %u as root cmd whoami" + } +}) +content = read_doasconf() +if not content then + n.err("doas.conf not created for table") +end +if content ~= "deny testuser as foobar\npermit persist testuser as root cmd whoami\n" then + n.err("unexpected doas.conf content for table: '" .. content .. "'") +end + +os.exit(0) diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 9e3442281c15..01c4612eb8ec 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -16,6 +16,7 @@ atf_test_case addgroup atf_test_case addfile atf_test_case decode_base64 atf_test_case addsudo +atf_test_case adddoas settimezone_body() { @@ -103,6 +104,11 @@ addsudo_body() atf_check /usr/libexec/flua $(atf_get_srcdir)/addsudo.lua } +adddoas_body() +{ + atf_check /usr/libexec/flua $(atf_get_srcdir)/adddoas.lua +} + atf_init_test_cases() { atf_add_test_case sethostname @@ -113,4 +119,5 @@ atf_init_test_cases() atf_add_test_case addfile atf_add_test_case decode_base64 atf_add_test_case addsudo + atf_add_test_case adddoas } From nobody Sun May 10 15:56:29 2026 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 4gD6sp2K88z6d33t for ; Sun, 10 May 2026 15:56:30 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD6sp0Nr9z44cN for ; Sun, 10 May 2026 15:56:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778428590; 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=5JpvIQ8op4qrqR8dOs2qFCCOyxOmmq3JToiz9mYnvUI=; b=ngYCXNxbo5Q/ILoaOAzTM3pRnjoql/DQMXpNZ21WFE6Dv63x4P5ugWmdhR4W/CT5GfmyjZ vct9Nxmuus6b1BTMZTE/Yz2mM5OZixN6jdpoXrWid/6vBMZNjzGuRhGfGdCbDCZ5Wb6j05 vNQOiadjv1U5xBKhOBJGRU/YKINyz922sghAUw2VKlLAxY/x4S6FfF9WkNXoo8g3pSGRcT jAasvJL2ytHamp5HVWmzQPaxLyWWoQj7g26X9KUpYOGBIm7YMnQ6syaV4PmuOFCdNRj+NM W4mWaRDmWCBMwNiMd+gijJqO9OgSMLp/gc6UUqhnVhLItGtvkucg+RJGzSmfLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778428590; a=rsa-sha256; cv=none; b=ID5+XLo0Uh5XWN9ndKjg7J6/o9AoMoe7lxcZV4tXhkw++frDUdxyI2Ap5LkU6OxPE40MxC 778Y5JqR6nSOvexpr1JTq+/QKywpIlSoUDdEL5Ix7FoRIyqtTUdVGxHEQwVyM2FGlCx3OB TF6dOB1QpPy1ujwC4K+fGarBmZFoP8XE9cAXtFoPCMldBfe/Kwkr4cQ1JZ+fSDUWXSDmMW e7/3H8UEVW/tckK9ev+zwL8IA1nPVnjwwfnze5TRFumfLPmwCgXRu8ttg8k/WYU0L9zPZs 2xB3FQ7bS/foZfA7MdY6UxtgEGzKmjwOwhTggjrnzPYovUnFreIYreFsol72OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778428590; 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=5JpvIQ8op4qrqR8dOs2qFCCOyxOmmq3JToiz9mYnvUI=; b=cxC4GTwLpo+ctwEHr0hCLuk4rGg6VH3MTc4CSS5n0A1D2+jI6nOs0K7cs6RVX7q0TIAcoH brs62CNEIkVV/UOExHaItETS52i38xGTGSsb35dfqHTc77gXpoefaKYDfY/GqVg7XZ3FuZ ID3Xy1P3FsLmQKwifQLqV/XYxPiXz0HF7YPlNgj71ON0XdQM/Cf3N985kVrDTX1YIGvHK4 U9Ejk2DNPu3vMt2rZZImLy6QuTGg1SprjQ2L/S+V4Zl0Tl72B8kpB5vWTQzP6RK+cqVBb3 actrTKKuS6oFNcUrLzCuPrIj+N9J2uPO8xijSjdUFdC9mZVg96Cei/WIUhE9Pw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD6sn6w8Czc6J for ; Sun, 10 May 2026 15:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36389 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 15:56:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 8b03193289e8 - main - nuageinit: add update_sshd_config tests 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b03193289e87fd243acc50c5128c80459792667 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 15:56:29 +0000 Message-Id: <6a00aaad.36389.7cda12d1@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8b03193289e87fd243acc50c5128c80459792667 commit 8b03193289e87fd243acc50c5128c80459792667 Author: Baptiste Daroussin AuthorDate: 2026-05-10 15:54:48 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-10 15:54:48 +0000 nuageinit: add update_sshd_config tests --- libexec/nuageinit/tests/Makefile | 1 + libexec/nuageinit/tests/nuage.sh | 8 +++ libexec/nuageinit/tests/update_sshd_config.lua | 73 ++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/libexec/nuageinit/tests/Makefile b/libexec/nuageinit/tests/Makefile index 4c99f8e31ce3..fc7765268660 100644 --- a/libexec/nuageinit/tests/Makefile +++ b/libexec/nuageinit/tests/Makefile @@ -21,5 +21,6 @@ ${PACKAGE}FILES+= addfile.lua ${PACKAGE}FILES+= decode_base64.lua ${PACKAGE}FILES+= addsudo.lua ${PACKAGE}FILES+= adddoas.lua +${PACKAGE}FILES+= update_sshd_config.lua .include diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 01c4612eb8ec..348a8d93ba09 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -17,6 +17,7 @@ atf_test_case addfile atf_test_case decode_base64 atf_test_case addsudo atf_test_case adddoas +atf_test_case update_sshd_config settimezone_body() { @@ -109,6 +110,12 @@ adddoas_body() atf_check /usr/libexec/flua $(atf_get_srcdir)/adddoas.lua } +update_sshd_config_body() +{ + mkdir -p etc/ssh + atf_check /usr/libexec/flua $(atf_get_srcdir)/update_sshd_config.lua +} + atf_init_test_cases() { atf_add_test_case sethostname @@ -120,4 +127,5 @@ atf_init_test_cases() atf_add_test_case decode_base64 atf_add_test_case addsudo atf_add_test_case adddoas + atf_add_test_case update_sshd_config } diff --git a/libexec/nuageinit/tests/update_sshd_config.lua b/libexec/nuageinit/tests/update_sshd_config.lua new file mode 100644 index 000000000000..ac56c29986ac --- /dev/null +++ b/libexec/nuageinit/tests/update_sshd_config.lua @@ -0,0 +1,73 @@ +#!/usr/libexec/flua +--- +-- SPDX-License-Identifier: BSD-2-Clause +-- +-- Copyright (c) 2026 Baptiste Daroussin + +local n = require("nuage") + +local root = os.getenv("NUAGE_FAKE_ROOTDIR") +if not root then + root = "" +end + +local sshd_config = root .. "/etc/ssh/sshd_config" + +local function setup(content) + local dir = root .. "/etc/ssh" + n.mkdir_p(dir) + local f = assert(io.open(sshd_config, "w")) + f:write(content) + f:close() +end + +local function read_config() + local f = assert(io.open(sshd_config, "r")) + local content = f:read("*a") + f:close() + return content +end + +-- Key not found: appended +setup("SomeOtherKey yes\n") +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "SomeOtherKey yes\nPasswordAuthentication yes\n" then + n.err("Key not found: should be appended") +end + +-- Key with same value: no change +setup("PasswordAuthentication yes\n") +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "PasswordAuthentication yes\n" then + n.err("Same value: should not change") +end + +-- Key with different value: changed +setup("PasswordAuthentication no\n") +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "PasswordAuthentication yes\n" then + n.err("Different value: should change") +end + +-- Key with comment +setup("PasswordAuthentication no # keep this\n") +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "PasswordAuthentication yes\n" then + n.err("Comment stripped: '" .. read_config() .. "'") +end + +-- Case insensitive key matching +setup("passwordauthentication no\n") +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "PasswordAuthentication yes\n" then + n.err("Case insensitive matching failed") +end + +-- Extra spaces +setup(" PasswordAuthentication no \n") +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "PasswordAuthentication yes\n" then + n.err("Extra spaces handling failed: '" .. read_config() .. "'") +end + +os.exit(0) From nobody Sun May 10 16:37:37 2026 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 4gD7nL5GdCz6d5Z2 for ; Sun, 10 May 2026 16:37:42 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD7nL3WB8z48Bf for ; Sun, 10 May 2026 16:37:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778431062; 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=xCPJ2DpcwX+UhFBv2TmWWNPLK6c0n5t+6ulcyxKAv98=; b=pQ7CSaIyhWpX4sNwUwR7hkrIJ1R+H30GNvVLC1uXTV7WYx6pKZaVWvdSmS+57fdisZH+KX t7sV4Wlz01TqxTduqPHI4AiLKE8goIQlQswY+00E12Yi2I4pS1GgsAEryq+LsXUA+ffH+5 bFlAj4BBM+HbP7VoBdVGPzuXJiWJIclz4+k8/iu+CYrWLL2FqoS4daC9OJxfzwp3dhzey0 XburJNqRYTwr57CLrt/Q1qdlVHcaznVhaRnX8hztNqC3Ne3dvsq7GlsWYHYWhuf07Vnrdt UEhdPyjbMJUUQJ29s/rLQiklvLGM9CjYBt4TAxAusq4k6d5XV1fdz84U3ULZpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778431062; a=rsa-sha256; cv=none; b=crgxoa1Ol7Rhr/wIxpjv5Qmx7R/vhpKqP0p0RQqeDNaP+WUa3ku1k8nS4OFLH5nZ9TPbhc Oe0/+v8dAMimAJmH7p+uR4oEIJGyxB3PHgDlxueNynLnqqkI31Fpgya0oQKMzVxwqF1yjO L8IhgsNOy1MhjqnMhvRQSNHFFpqyI2C2qsDLlmUD4oJnQl8Kf4zruGhKrqXnwYYSE1QMTZ gPvh751iASoM7YGnJgjF6YYnB3RLosee0uaNRBXNdkiN49Rxrir/h+EUXpyBUbpczsWFxl 1jVbJI3Bf5P7YPKb9i6c9gzh5Wc2WDaZv55UYQ0SdZe6NKfUTjIpLNJ1aNCQzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778431062; 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=xCPJ2DpcwX+UhFBv2TmWWNPLK6c0n5t+6ulcyxKAv98=; b=jsuqumL2IRE4AzAWZPmUU4Cq/oZgZDXDpltFikxLiuGa+oxoHn+51umYJcCMICrv+Nefr3 Mx3PdWuzim+E2QrGmjJnYrvIUO8XIqO0Q3sI4QdvA5Az5ucGH37ZTNG9AY19897sHrNeus sudVxTV3B7kMh61YYOSOPw8lJKSMvDgzdB+/kmjdDZPPm8VZmZzW7wQI66YFxUxO3ID5Yx yB7KygUspYyHioJGqmMgMfQCvvDYD4eWlcwlrIDD+mWmcYvr2RYnTq8r9tVFyhbQvdTfYs 2CfsmkPpQF5kq+rZTDkhQrLdWIzRjBlNFgHPRXn9YakqTdEdBNNFg9eAhkfuxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD7nL2qMyzdp6 for ; Sun, 10 May 2026 16:37:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a09a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 16:37:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Steve Kargl From: Konstantin Belousov Subject: git: 3085fc9d97bd - main - [libm] implementation of rsqrt, rsqrtf, and rsqrtl 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3085fc9d97bd83785ba3ba43e0378d7d67987d1f Auto-Submitted: auto-generated Date: Sun, 10 May 2026 16:37:37 +0000 Message-Id: <6a00b451.3a09a.1326ab95@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3085fc9d97bd83785ba3ba43e0378d7d67987d1f commit 3085fc9d97bd83785ba3ba43e0378d7d67987d1f Author: Steve Kargl AuthorDate: 2026-05-08 14:06:08 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 16:36:33 +0000 [libm] implementation of rsqrt, rsqrtf, and rsqrtl From the PR: The attached diff implements the inverse square root function, i.e, rsqrt(x) = 1 / sqrt(x). Exhaustive testing of the float version suggests that it is correctly rounded in round-to-nearest for all test values in the range [0x1p-127,0x1p126]. Exhaustive testing of rsqrt and rsqrtl cannot be done, but 1100M values of x for rsqrt and 400M values for rsqrtl were tested. All tested values were correctly rounded. I do not have access to LD128 (i.e., IEEE 128-bit floating point) hardware, so the implementation of rsqrtl() is untested. The following is a summary of changes to source code. * lib/msun/Makefile: . Add s_rsqrt.c and s_rsqrtf.c to COMMON_SRCS. . For non-53-bit long double targets, add s_rsqrtl.c to COMMON_SRCS. . Add MLINKS for rsqrt.3, rsqrtf.3, and rsqrtl.3 to sqrt.3. * lib/msun/Symbol.map: . Add rsqrt, rsqrtf, and rsqrtl to the Symbol map for shared libm.so. * lib/msun/man/sqrt.3: . Update the sqrt.3 manual page to include information for rsqrt[fl]. . Note, these function come from ISO C23 (and IEEE-754 2008). * lib/msun/src/math.h: . Add prototypes for new functions. * lib/msun/src/math_private.h: . Add _SPLIT, _FAST2SUM, _SLOW2SUM, _XADD, _MUL, and _XMUL macros to perform type-type arthimetic (i.e., float-float). * src/s_rsqrt.c: . New file with the implementation of 'double rsqrt(double)'. . For 53-bit long double targets, add a weak reference for rsqrtl. * src/s_rsqrtf.c: . New file with the implementation of 'float rsqrt(float)'. * src/s_rsqrtl.c . New file with the implementation of 'long double rsqrt(long double)'. Note, the LD80 version uses bit twiddling and LD128 version is a straight C language implementation. The LD128 is untested due to lack of hardware. PR: 295089 MFC after: 1 week --- lib/msun/Makefile | 6 +- lib/msun/Symbol.map | 3 + lib/msun/man/sqrt.3 | 53 +++++++++++- lib/msun/src/math.h | 3 + lib/msun/src/math_private.h | 83 ++++++++++++++++++ lib/msun/src/s_rsqrt.c | 153 +++++++++++++++++++++++++++++++++ lib/msun/src/s_rsqrtf.c | 155 +++++++++++++++++++++++++++++++++ lib/msun/src/s_rsqrtl.c | 203 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 654 insertions(+), 5 deletions(-) diff --git a/lib/msun/Makefile b/lib/msun/Makefile index a9b07babc0a6..5e9adb533760 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -88,7 +88,7 @@ COMMON_SRCS= b_tgamma.c \ s_lround.c s_lroundf.c s_lroundl.c s_modff.c \ s_nan.c s_nearbyint.c s_nextafter.c s_nextafterf.c \ s_nexttowardf.c s_remquo.c s_remquof.c \ - s_rint.c s_rintf.c s_round.c s_roundf.c \ + s_rint.c s_rintf.c s_round.c s_roundf.c s_rsqrt.c s_rsqrtf.c \ s_scalbln.c s_scalbn.c s_scalbnf.c s_signbit.c \ s_signgam.c s_significand.c s_significandf.c s_sin.c \ s_sincos.c s_sincosf.c s_sinf.c \ @@ -143,7 +143,7 @@ COMMON_SRCS+= b_tgammal.c catrigl.c \ s_fminimum_numl.c s_fminimum_mag_numl.c \ s_frexpl.c s_logbl.c s_logl.c s_nanl.c \ s_nextafterl.c s_nexttoward.c s_remquol.c s_rintl.c s_roundl.c \ - s_scalbnl.c s_sinl.c s_sincosl.c s_sinpil.c \ + s_scalbnl.c s_sinl.c s_sincosl.c s_sinpil.c s_rsqrtl.c \ s_tanhl.c s_tanl.c s_tanpil.c s_truncl.c w_cabsl.c # Work around this warning from gcc: # lib/msun/ld80/e_powl.c:275:1: error: floating constant exceeds range of @@ -289,7 +289,7 @@ MLINKS+=sincos.3 sincosf.3 sin.3 sincosl.3 MLINKS+=sinh.3 sinhf.3 sinh.3 sinhl.3 MLINKS+=sinpi.3 sinpif.3 sinpi.3 sinpil.3 MLINKS+=sqrt.3 cbrt.3 sqrt.3 cbrtf.3 sqrt.3 cbrtl.3 sqrt.3 sqrtf.3 \ - sqrt.3 sqrtl.3 + sqrt.3 sqrtl.3 sqrt.3 rsqrt.3 sqrt.3 rsqrtf.3 sqrt.3 rsqrtl.3 MLINKS+=tan.3 tanf.3 tan.3 tanl.3 MLINKS+=tanh.3 tanhf.3 tanh.3 tanhl.3 MLINKS+=tanpi.3 tanpif.3 tanpi.3 tanpil.3 diff --git a/lib/msun/Symbol.map b/lib/msun/Symbol.map index 00222c960f80..2484cc13013b 100644 --- a/lib/msun/Symbol.map +++ b/lib/msun/Symbol.map @@ -344,4 +344,7 @@ FBSD_1.9 { fminimum_mag_num; fminimum_mag_numf; fminimum_mag_numl; + rsqrt; + rsqrtf; + rsqrtl; }; diff --git a/lib/msun/man/sqrt.3 b/lib/msun/man/sqrt.3 index f4a217353af0..6da6407ecc4b 100644 --- a/lib/msun/man/sqrt.3 +++ b/lib/msun/man/sqrt.3 @@ -25,17 +25,20 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 15, 2020 +.Dd May 7, 2026 .Dt SQRT 3 .Os .Sh NAME .Nm cbrt , .Nm cbrtf , .Nm cbrtl , +.Nm rsqrt , +.Nm rsqrtf , +.Nm rsqrtl, .Nm sqrt , .Nm sqrtf , .Nm sqrtl -.Nd cube root and square root functions +.Nd cube root, square root, and inverse square root functions .Sh LIBRARY .Lb libm .Sh SYNOPSIS @@ -47,6 +50,12 @@ .Ft long double .Fn cbrtl "long double x" .Ft double +.Fn rsqrt "double x" +.Ft float +.Fn rsqrtf "float x" +.Ft long double +.Fn rsqrtl "long double x" +.Ft double .Fn sqrt "double x" .Ft float .Fn sqrtf "float x" @@ -63,6 +72,15 @@ the cube root of .Fa x . .Pp The +.Fn rsqrt , +.Fn rsqrtf , +and +.Fn rsqrtl +functions compute +the inverse square root of +.Fa x . +.Pp +The .Fn sqrt , .Fn sqrtf , and @@ -77,6 +95,23 @@ The and .Fn cbrtl functions return the requested cube root. +.Pp +The +.Fn rsqrt , +.Fn rsqrtf , +and +.Fn rsqrtl +functions return 1 divided by the square root of +.Fa x +unless an error occurs. +An attempt to take the +.Fn rsqrt +of negative +.Fa x +raises an invalid exception and causes an \*(Na to be returned. +The inverse square root of \*(Pm0 returns \*(Pm\(if and +raises a divide-by-zero exception. +.Pp The .Fn sqrt , .Fn sqrtf , @@ -104,6 +139,13 @@ and .Fn sqrtl functions conform to .St -isoC-99 . +The +.Fn rsqrt , +.Fn rsqrtf , +and +.Fn rsqrtl +functions conform to ISO/IEC 9899:2024 ("ISO C23"). +.\" .St -isoC-24 . .Sh HISTORY The .Fn cbrt @@ -120,3 +162,10 @@ The .Fn cbrtl function appeared in .Fx 9.0 . +The +.Fn rsqrt , +.Fn rsqrtf , +and +.Fn rsqrtl +functions appeared in +.Fx 16.0 . diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h index 9894401160d4..e5c2ccb786a4 100644 --- a/lib/msun/src/math.h +++ b/lib/msun/src/math.h @@ -544,6 +544,9 @@ long double fminimum_mag_numl(long double, long double); double fminimum_num(double, double); float fminimum_numf(float, float); long double fminimum_numl(long double, long double); +double rsqrt(double); +float rsqrtf(float); +long double rsqrtl(long double); #endif /* __ISO_C_VISIBLE >= 2023 */ __END_DECLS diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index fbd84e246ca7..e9055a9a8c61 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -471,6 +471,89 @@ do { \ (a) = __tmp; \ } while (0) +/* + * Split x into high and low bits where CC is 0x1p(N/2) + 1 where + * N is rounded up for types with odd precisions. + * + * #define _CC (0x1p12F + 1) // float + * #define _CC (0x1p27 + 1) // double + * #define _CC (0x1p32L + 1) // long double (LD80) + * #define _CC (0x1p57L + 1) // long double (LD128) + */ +#define _SPLIT(x, xh, xl) \ +do { \ + typeof(x) __t1; \ + __t1 = (x) * _CC; \ + xh = __t1 + ((x) - __t1); \ + xl = (x) - xh; \ +} while(0) + +/* + * FAST2SUM requires |x| >= |y|. x and y are full precision. + * Note, _2SUMF(x,y) above destroys x and y. + */ +#define _FAST2SUM(x, y, hi, lo) \ +do { \ + hi = (x) + (y); \ + lo = (y) - (hi - (x)); \ +} while(0) + +/* + * SLOW2SUM does not require |x| >= |y|. Here, x and y are full precision. + * The t1 temporary variable is volatile to prevent compiler optimizations. + * Note, _2SUM(x,y) above destroys x and y. + */ +#define _SLOW2SUM(x, y, hi, lo) \ +do { \ + volatile typeof(x) __t1; \ + typeof(x) __t2; \ + hi = (x) + (y); \ + __t1 = hi - (y); \ + __t2 = hi - __t1; \ + lo = ((x) - __t1) + ((y) - __t2); \ +} while(0) + +/* + * x and y are full precision quantities that have been split into high + * and low parts via the _SPLIT macro. x and y are added to give z as + * high and low parts. + */ +#define _XADD(xh, xl, yh, yl, zh, zl) \ +do { \ + typeof(xh) __s1, __s2, __s3, __s4, __s5, __s6; \ + _SLOW2SUM(xh, yh, __s1, __s2); \ + _SLOW2SUM(xl, yl, __s3, __s4); \ + _FAST2SUM(__s1, __s2 + __s3, __s5, __s6); \ + _FAST2SUM(__s5, __s6 + __s4, zh, zl); \ +} while(0) + +/* + * x and y are full precision quantities. r1 and r2 are full precision + * high and low parts of the multiplication x * y. + */ +#define _MUL(x, y, r1 ,r2) \ +do { \ + typeof(x) __xh, __xl, __yh, __yl; \ + typeof(x) __t1; \ + _SPLIT(x, __xh, __xl); \ + _SPLIT(y, __yh, __yl); \ + r1 = (x) * (y); \ + __t1 = __xh * __yl + (__xh * __yh - r1); \ + r2 = __xl * __yl + (__xl * __yh + __t1); \ +} while(0) + +/* + * x and y are full precision quantities that have been split into high + * and low parts via the _SPLIT macro. x and y are multiplied to give z + * as high and low parts. + */ +#define _XMUL(xh, xl, yh, yl, ph, pl) \ +do { \ + _MUL(xh, yh, ph, pl); \ + pl += xl * yl + xl * yh + xh * yl; \ +} while(0) + + /* * Common routine to process the arguments to nan(), nanf(), and nanl(). */ diff --git a/lib/msun/src/s_rsqrt.c b/lib/msun/src/s_rsqrt.c new file mode 100644 index 000000000000..0a513afe8ed2 --- /dev/null +++ b/lib/msun/src/s_rsqrt.c @@ -0,0 +1,153 @@ +/*- + * Copyright (c) 2026 Steven G. Kargl + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * Compute the inverse sqrt of x, i.e., rsqrt(x) = 1 / sqrt(x). + * + * First, filter out special cases: + * + * 1. rsqrt(+-0) = +-inf, and raise FE_DIVBYZERO exception. + * 2. rsqrt(nan) = NaN. + * 3. rsqrt(+inf) returns +0. + * 2. rsqrt(x<0) = NaN, and raises FE_INVALID. + * + * If x is a subnormal, scale x into the normal range by x*0x1pN; while + * recording the exponent of the scale factor N. Split the possibly + * scaled x into f*2^n with f in [0.5,1). Set m=n or m=n-N (subnormal). + * If n is odd, then set f = f/2 and increase n to n+1. Thus, f is + * in [0.25,1) with n even. + * + * An initial estimate of y = rqrt[f](x) is 1 / sqrt[f](x). Exhaustive + * testing of rsqrtf() gave a max ULP of 1.49; while testing 500M x in + * [0,1000] gave a max ULP of 1.24 for rsqrt(). The value of y is then + * used with one iteration of Goldschmidt's algorithm: + * + * z = x * y + * h = y / 2 + * r = 0.5 - h * z + * y = h * r + h + * + * A factor of 2 appears missing in the above, but it is included in the + * exponent m. + */ +#include +#include +#include "math.h" +#include "math_private.h" + +#pragma STDC FENV_ACCESS ON + +#ifdef _CC +#undef _CC +#endif +#define _CC (0x1p27 + 1) + +double +rsqrt(double x) +{ + volatile static const double vzero = 0; + static const double half = 0.5; + int hx, m, rnd; + uint32_t lx, ux; + double h, ph, pl, rh, rl, y, zh, zl; + + EXTRACT_WORDS(hx, lx, x); + ux = (uint32_t)hx & 0x7fffffff; + + /* x = +-0. Raise exception. */ + if ((ux | lx) == 0) + return (1 / x); + + /* x is NaN. */ + if (ux > 0x7ff00000) + return (x + x); + + /* x is +-inf. */ + if (ux == 0x7ff00000) + return (hx & 0x80000000 ? vzero / vzero : 0.); + + /* x < 0. Raise exception. */ + if (hx < 0) + return (vzero / vzero); + + /* + * If x is subnormal, then scale it into the normal range. + * Split x into significand and exponent, x = f * 2^m, with + * f in [0.5,1) and m a biased exponent. + */ + m = 0; + if (hx < 0x00100000) { /* Subnormal */ + x *= 0x1p54; + GET_HIGH_WORD(hx, x); + m = -54; + } + m += (hx >> 20) - 1022; + hx = (hx & 0x000fffff) | 0x3fe00000; + SET_HIGH_WORD(x, hx); + + /* m is odd. Put x into [0.25,5) and increase m. */ + if (m & 1) { + x /= 2; + m += 1; + } + m = -(m >> 1); /* Prepare for 2^(-m/2). */ + + y = 1 / sqrt(x); /* ~52-bit estimate. */ + + h = y / 2; + + /* + * For values of x with a representation of 0x1.ffffffffffffepN + * with N an odd integer, the computed rsqrt() is not correctly + * rounded in round-to-nearest without toggling the rounding mode + * to FE_TOWARDZERO. Note, FE_DOWNWARD also works. However, + * messing with the rounding mode is expensive, so only do it + * when necessary. Example, x = 3.9999999999999991 + * gives y --> hx = 0x3ff00000, lx = 0x00000001 + */ + EXTRACT_WORDS(hx, lx, y); + if ((hx & 0x000fffff) == 0 && lx == 1) { + rnd = fegetround(); + fesetround(FE_TOWARDZERO); + _MUL(x, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + fesetround(rnd); + } else { + _MUL(x, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + } + + _XADD(-ph, -pl, half, 0, rh, rl); + y = rh * h + h; + + ux = (m + 1024) << 20; + INSERT_WORDS(x, ux, 0); + return (y *= x); +} + +#if LDBL_MANT_DIG == 53 +__weak_reference(rsqrt, rsqrtl); +#endif diff --git a/lib/msun/src/s_rsqrtf.c b/lib/msun/src/s_rsqrtf.c new file mode 100644 index 000000000000..b71f7baf5657 --- /dev/null +++ b/lib/msun/src/s_rsqrtf.c @@ -0,0 +1,155 @@ +/*- + * Copyright (c) 2026 Steven G. Kargl + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * Compute the inverse sqrt of x, i.e., rsqrt(x) = 1 / sqrt(x). + * + * First, filter out special cases: + * + * 1. rsqrt(+-0) = +-inf, and raise FE_DIVBYZERO exception. + * 2. rsqrt(nan) = NaN. + * 3. rsqrt(+inf) returns +0. + * 2. rsqrt(x<0) = NaN, and raises FE_INVALID. + * + * If x is a subnormal, scale x into the normal range by x*0x1pN; while + * recording the exponent of the scale factor N. Split the possibly + * scaled x into f*2^n with f in [0.5,1). Set m=n or m=n-N (subnormal). + * If n is odd, then set f = f/2 and increase n to n+1. Thus, f is + * in [0.25,1) with n even. + * + * An initial estimate of y = rqrt[f](x) is 1 / sqrt[f](x). Exhaustive + * testing of rsqrtf() gave a max ULP of 1.49; while testing 500M x in + * [0,1000] gave a max ULP of 1.24 for rsqrt(). The value of y is then + * used with one iteration of Goldschmidt's algorithm: + * + * z = x * y + * h = y / 2 + * r = 0.5 - h * z + * y = h * r + h + * + * A factor of 2 appears missing in the above, but it is included in the + * exponent m. + */ +#include +#include +#include "math.h" +#include "math_private.h" + +#pragma STDC FENV_ACCESS ON + +#ifdef _CC +#undef _CC +#endif +#define _CC (0x1p12F + 1) + +float +rsqrtf(float x) +{ + volatile static const float vzero = 0; + static const float half = 0.5; + uint32_t ix, ux; + int m, rnd; + float h, ph, pl, rh, rl, y, zh, zl; + + GET_FLOAT_WORD(ix, x); + ux = ix & 0x7fffffff; + + /* x = +-0. Raise exception. */ + if (ux == 0) + return (1 / x); + + /* x is NaN. */ + if (ux > 0x7f800000) + return (x + x); + + /* x is +-inf. */ + if (ux == 0x7f800000) + return (ix & 0x80000000 ? vzero / vzero : 0.F); + + /* x < 0. Raise exception. */ + if (ix & 0x80000000) + return (vzero / vzero); + + /* + * If x is subnormal, then scale it into the normal range. + * Split x into significand and exponent, x = f * 2^m, with + * f in [0.5,1) and m a biased exponent. + */ + m = 0; + if (ux < 0x00800000) { /* Subnormal */ + x *= 0x1p25f; + GET_FLOAT_WORD(ix, x); + m = -25; + } + m += (ix >> 23) - 126; /* Unbiased exponent */ + ix = (ix & 0x007fffff) | 0x3f000000; + SET_FLOAT_WORD(x, ix); /* x is in [0.5,1). */ + + /* m is odd. Put x into [0.25,5) and increase m. */ + if (m & 1) { + x /= 2; + m += 1; + } + m = -(m >> 1); /* Prepare for 2^(-m/2). */ + + /* + * Exhaustive testing of rsqrtf(x) = 1 / sqrtf(x) with x in + * [0x1p-127,0x1p126] shows the this approximation gives a + * 22- to 23-bit estimate of rsqrt(f). This is equivalent to + * a max ulp of ~1.49. + */ + y = 1 / sqrtf(x); + + h = y / 2; + + /* + * For values of x with a representation of 0x1.fffffcpN with + * N an odd integer, the computed rsqrtf() is not correctly + * rounded in round-to-nearest without toggling the rounding + * mode to FE_TOWARDZERO. Note, FE_DOWNWARD also works. + * However, messing with the rounding mode is expensive, so + * only do it when necessary. Example, x = 0x1.fffffcp3 gives + * y --> 0x3f800001. + */ + GET_FLOAT_WORD(ix, y); + if ((ix & 0x000fffff) == 1) { + rnd = fegetround(); + fesetround(FE_TOWARDZERO); + _MUL(x, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + fesetround(rnd); + } else { + _MUL(x, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + } + + _XADD(-ph, -pl, half, 0, rh, rl); + y = h * rh + h; + + ix = (uint32_t)(m + 128) << 23; + SET_FLOAT_WORD(x, ix); + return (y *= x); +} diff --git a/lib/msun/src/s_rsqrtl.c b/lib/msun/src/s_rsqrtl.c new file mode 100644 index 000000000000..34d5cdc48173 --- /dev/null +++ b/lib/msun/src/s_rsqrtl.c @@ -0,0 +1,203 @@ +/*- + * Copyright (c) 2026 Steven G. Kargl + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * Compute the inverse sqrt of x, i.e., rsqrt(x) = 1 / sqrt(x). + * + * First, filter out special cases: + * + * 1. rsqrt(+-0) = +-inf, and raise FE_DIVBYZERO exception. + * 2. rsqrt(nan) = NaN. + * 3. rsqrt(+inf) returns +0. + * 2. rsqrt(x<0) = NaN, and raises FE_INVALID. + * + * If x is a subnormal, scale x into the normal range by x*0x1pN; while + * recording the exponent of the scale factor N. Split the possibly + * scaled x into f*2^n with f in [0.5,1). Set m=n or m=n-N (subnormal). + * If n is odd, then set f = f/2 and increase n to n+1. Thus, f is + * in [0.25,1) with n even. + * + * An initial estimate of y = rqrt[f](x) is 1 / sqrt[f](x). Exhaustive + * testing of rsqrtf() gave a max ULP of 1.49; while testing 500M x in + * [0,1000] gave a max ULP of 1.24 for rsqrt(). The value of y is then + * used with one iteration of Goldschmidt's algorithm: + * + * z = x * y + * h = y / 2 + * r = 0.5 - h * z + * y = h * r + h + * + * A factor of 2 appears missing in the above, but it is included in the + * exponent m. + */ +#include +#include +#include "math.h" +#include "math_private.h" +#include "fpmath.h" + +#pragma STDC FENV_ACCESS ON + +#if LDBL_MANT_DIG == 64 + +#ifdef _CC +#undef _CC +#endif +#define _CC (0x1p32L + 1) + +long double +rsqrtl(long double x) +{ + volatile static const double vzero = 0; + static const double half = 0.5; + uint32_t ux; + int m, rnd; + long double h, ph, pl, rh, rl, y, zh, zl; + union IEEEl2bits u; + + u.e = x; + ux = (u.bits.manl | u.bits.manh); + + /* x = +-0. Raise exception. */ + if ((u.bits.exp | ux) == 0) + return (1 / x); + + /* x is NaN or x is +-inf. */ + if (u.bits.exp == 0x7fff) + return (ux ? (x + x) : (u.bits.sign ? vzero / vzero : 0)); + + /* x < 0. Raise exception. */ + if (u.bits.sign) + return (vzero / vzero); + + /* + * If x is subnormal, then scale it into the normal range. + * Split x into significand and exponent, x = f * 2^m, with + * f in [0.5,1) and m a biased exponent. + */ + ENTERI(); + + if (u.bits.exp == 0) { /* Subnormal */ + u.e *= 0x1p512; + m = u.bits.exp - 0x41fe; + } else { + m = u.bits.exp - 0x3ffe; + } + u.bits.exp = 0x3ffe; + + /* m is odd. Put x into [0.25,5) and increase m. */ + if (m & 1) { + u.e /= 2; + m += 1; + } + m = -(m >> 1); /* Prepare for 2^(-m/2). */ + + y = 1 / sqrt((double)u.e); /* ~52-bit estimate. */ + y -= y * (u.e * y * y - 1) / 2; /* ~63-bit estimate. */ + + h = y / 2; + + _MUL(u.e, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + _XADD(-ph, -pl, half, 0, rh, rl); + y = rh * h + h; + + u.e = 1; + u.xbits.expsign = 0x3fff + m + 1; + RETURNI(y * u.e); +} + +#else + +#ifdef _CC +#undef _CC +#endif +#define _CC (0x1p57L + 1) + +long double +rsqrtl(long double x) +{ + volatile static const double vzero = 0; + int hx, m, rnd; + long double y; + + /* x = +-0. Raise exception. */ + if (x == 0) + return (1 / x); + + /* x is NaN. */ + if (isnan(x)) + return (x + x); + + /* x is +-inf. */ + if (isinf(x)) + return (x > 0 ? 0 : vzero / vzero); + + /* x < 0. Raise exception. */ + if (x < 0) + return (vzero / vzero); + + /* + * If x is subnormal, then scale it into the normal range. + * Split x into significand and exponent, x = f * 2^m, with + * f in [0.5,1) and m a biased exponent. + */ + m = 0; + if (!isnormal(x)) { + x *= 0x1p114L; + m = -114; + } + x = frexpl(x, &hx); + m += hx; + + /* m is odd. Put x into [0.25,5) and increase m. */ + if (m & 1) { + x /= 2; + m += 1; + } + m = -(m >> 1); /* Prepare for 2^(-m/2). */ + + y = 1 / sqrt((double)x); /* ~52-bit estimate. */ + y -= y * (x * y * y - 1) / 2; /* ~104-bit estimate. */ + + static const double half = 0.5; + long double h, ph, pl, rh, rl, zh, zl; + + h = y / 2; + + rnd = fegetround(); + fesetround(FE_TOWARDZERO); + _MUL(x, y, zh, zl); + _XMUL(zh, zl, -h, 0, ph, pl); + fesetround(rnd); + + _XADD(ph, pl, half, 0, rh, rl); + y = rh * h + h; + m++; + + RETURNI(ldexpl(y, m)); +} +#endif From nobody Sun May 10 18:11:13 2026 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 4gD9sG0FJSz6cjMj for ; Sun, 10 May 2026 18:11:14 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD9sF6JjGz3Jkc for ; Sun, 10 May 2026 18:11:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436673; 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=wpt5Hz3NNbSW5sCS+FM5HxusYX0jaXGP3cswk5gvhyE=; b=vtivs/DYuBMJcRrL7A/JvLFYbjzTBbTdA1Zqx/zdSA3q8dfdh2Gj3f2Pcsu13HlFI8w8wN XDNPQKrO+07kAeU5PtEOcoORoX4g/x6A62Iir+Sfju6y4cHDUIZ/ucFuusY4VExvxcDJfI 5k6ETBNjpuA2eeNvOv8qWFEf/qbQcMzlc2l/nhbAURIDUcKeNr1Vfsgy7PhY29gesJ2BxK mxzkusGc1YiMuqfG7Xk1WVsa4EkCT6UHlpNVQ/0ZrWCfTNMLBcIHUNAPY+NHq0SFWSKU8Y xjxseOcX0yr5Wk0FdtDMU4ods0CpTagc7Y+W+nECVJQjLDboVe+ISDxFA3RnjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778436673; a=rsa-sha256; cv=none; b=Atx+tQ9QF2dND67O5yMMt9Oo16MOg1j7R+ZuUdzYICXBKnZQebTEcthybydJetRSW7HaGy dKQF6i0CV2eB/GUVu/tUziulDfI96m19YJz4iPlOkbhWnSUjB9AXklTADmlK4Bf66vj+O/ LnuFR5u9rV712xHcsrixTGQpCFqpgLku1spSL7ETI7lLxgS8om4KEzczsqeDWP4IMeosHj U65v9ly0Zf6hfVqb+Oly07x4i1A5woSzvpopuPvSyK+WclSEcTqDvGd/oDcpQqxkWN8qpP 6CP0YAYsjvSC7snyNNssULr0ezQ7B8YSNaRDAz5J0xzr63mrCqXD6k9EqT1Ktw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436673; 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=wpt5Hz3NNbSW5sCS+FM5HxusYX0jaXGP3cswk5gvhyE=; b=tOqoFsHXXkEEJsglb8uxEeoo5ZcdQeK5NOA7CyoymNyfdBVwFvXbq7x01pxapvc0LELJ4U yLp4ldg2ZSvHErULheHuJRD1AftL7LbvP08WZJqHgtu8kvgw8D8ayhY8NYgQQGzawK9zMB jKgmo7MyAH/BslGwAeX9Yzjb1Ulo2iMzfitJvFQs5rPTBvyoMHHIaQE3C/Q4vw7VjJ62wJ VY9eSSGaHVT6M81IViom1B2Xfmcz6LYW9zqDea4ESf9O/IYeRhh6cegyrbjeRTnF+kbnMg JsPtLd+yqcO+LV85Lagu46NVN6rLqcMVN0DomVxbDvBgY9mlFv20ALYcVz+RSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD9sF5prGzgnt for ; Sun, 10 May 2026 18:11:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 414fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 18:11:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 32cf4514cad6 - main - vfs: convert vfs_op_thread_* macros to static inlines 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32cf4514cad66ff69ffc96ede20d8debc9b96790 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 18:11:13 +0000 Message-Id: <6a00ca41.414fb.617f2e5f@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=32cf4514cad66ff69ffc96ede20d8debc9b96790 commit 32cf4514cad66ff69ffc96ede20d8debc9b96790 Author: Konstantin Belousov AuthorDate: 2026-04-24 01:26:11 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 17:43:46 +0000 vfs: convert vfs_op_thread_* macros to static inlines Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56611 --- sys/kern/vfs_cache.c | 4 +-- sys/kern/vfs_mount.c | 6 ++-- sys/kern/vfs_subr.c | 6 ++-- sys/kern/vfs_vnops.c | 4 +-- sys/sys/mount.h | 97 +++++++++++++++++++++++++++++++--------------------- 5 files changed, 68 insertions(+), 49 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 3f8591bd0ba7..66210bf58a7c 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -5737,7 +5737,7 @@ cache_fplookup_climb_mount(struct cache_fpl *fpl) prev_mp = NULL; for (;;) { - if (!vfs_op_thread_enter_crit(mp, mpcpu)) { + if (!vfs_op_thread_enter_crit(mp, &mpcpu)) { if (prev_mp != NULL) vfs_op_thread_exit_crit(prev_mp, prev_mpcpu); return (cache_fpl_partial(fpl)); @@ -5792,7 +5792,7 @@ cache_fplookup_cross_mount(struct cache_fpl *fpl) return (0); } - if (!vfs_op_thread_enter_crit(mp, mpcpu)) { + if (!vfs_op_thread_enter_crit(mp, &mpcpu)) { return (cache_fpl_partial(fpl)); } if (!vn_seqc_consistent(vp, vp_seqc)) { diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index ddc5a1b70887..fff05a627162 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -500,7 +500,7 @@ vfs_ref_from_vp(struct vnode *vp) if (__predict_false(mp == NULL)) { return (mp); } - if (vfs_op_thread_enter(mp, mpcpu)) { + if (vfs_op_thread_enter(mp, &mpcpu)) { if (__predict_true(mp == vp->v_mount)) { vfs_mp_count_add_pcpu(mpcpu, ref, 1); vfs_op_thread_exit(mp, mpcpu); @@ -527,7 +527,7 @@ vfs_ref(struct mount *mp) struct mount_pcpu *mpcpu; CTR2(KTR_VFS, "%s: mp %p", __func__, mp); - if (vfs_op_thread_enter(mp, mpcpu)) { + if (vfs_op_thread_enter(mp, &mpcpu)) { vfs_mp_count_add_pcpu(mpcpu, ref, 1); vfs_op_thread_exit(mp, mpcpu); return; @@ -645,7 +645,7 @@ vfs_rel(struct mount *mp) struct mount_pcpu *mpcpu; CTR2(KTR_VFS, "%s: mp %p", __func__, mp); - if (vfs_op_thread_enter(mp, mpcpu)) { + if (vfs_op_thread_enter(mp, &mpcpu)) { vfs_mp_count_sub_pcpu(mpcpu, ref, 1); vfs_op_thread_exit(mp, mpcpu); return; diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index bba0f3575300..48bfea2f5bf9 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -876,7 +876,7 @@ vfs_busy(struct mount *mp, int flags) MPASS((flags & ~MBF_MASK) == 0); CTR3(KTR_VFS, "%s: mp %p with flags %d", __func__, mp, flags); - if (vfs_op_thread_enter(mp, mpcpu)) { + if (vfs_op_thread_enter(mp, &mpcpu)) { MPASS((mp->mnt_kern_flag & MNTK_DRAINING) == 0); MPASS((mp->mnt_kern_flag & MNTK_UNMOUNT) == 0); MPASS((mp->mnt_kern_flag & MNTK_REFEXPIRE) == 0); @@ -939,7 +939,7 @@ vfs_unbusy(struct mount *mp) CTR2(KTR_VFS, "%s: mp %p", __func__, mp); - if (vfs_op_thread_enter(mp, mpcpu)) { + if (vfs_op_thread_enter(mp, &mpcpu)) { MPASS((mp->mnt_kern_flag & MNTK_DRAINING) == 0); vfs_mp_count_sub_pcpu(mpcpu, lockref, 1); vfs_mp_count_sub_pcpu(mpcpu, ref, 1); @@ -6985,7 +6985,7 @@ vfs_cache_root(struct mount *mp, int flags, struct vnode **vpp) struct vnode *vp; int error; - if (!vfs_op_thread_enter(mp, mpcpu)) + if (!vfs_op_thread_enter(mp, &mpcpu)) return (vfs_cache_root_fallback(mp, flags, vpp)); vp = atomic_load_ptr(&mp->mnt_rootvnode); if (vp == NULL || VN_IS_DOOMED(vp)) { diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 4061b2272193..15704634ff62 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -2083,7 +2083,7 @@ vn_start_write_refed(struct mount *mp, int flags) struct mount_pcpu *mpcpu; int error, mflags; - if ((flags & V_XSLEEP) == 0 && vfs_op_thread_enter(mp, mpcpu)) { + if ((flags & V_XSLEEP) == 0 && vfs_op_thread_enter(mp, &mpcpu)) { MPASS((mp->mnt_kern_flag & MNTK_SUSPEND) == 0); vfs_mp_count_add_pcpu(mpcpu, writeopcount, 1); vfs_op_thread_exit(mp, mpcpu); @@ -2252,7 +2252,7 @@ vn_finished_write(struct mount *mp) if (mp == NULL) return; - if (vfs_op_thread_enter(mp, mpcpu)) { + if (vfs_op_thread_enter(mp, &mpcpu)) { vfs_mp_count_sub_pcpu(mpcpu, writeopcount, 1); vfs_mp_count_sub_pcpu(mpcpu, ref, 1); vfs_op_thread_exit(mp, mpcpu); diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 1ca492929813..f99d0856f16e 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -36,8 +36,10 @@ #include #include #ifdef _KERNEL +#include #include #include +#include #include #include #include @@ -1137,47 +1139,64 @@ void resume_all_fs(void); */ #define vfs_mount_pcpu(mp) zpcpu_get(mp->mnt_pcpu) #define vfs_mount_pcpu_remote(mp, cpu) zpcpu_get_cpu(mp->mnt_pcpu, cpu) +static void vfs_op_thread_exit_crit(struct mount *mp, struct mount_pcpu *mpcpu); -#define vfs_op_thread_entered(mp) ({ \ - MPASS(curthread->td_critnest > 0); \ - struct mount_pcpu *_mpcpu = vfs_mount_pcpu(mp); \ - _mpcpu->mntp_thread_in_ops == 1; \ -}) - -#define vfs_op_thread_enter_crit(mp, _mpcpu) ({ \ - bool _retval_crit = true; \ - MPASS(curthread->td_critnest > 0); \ - _mpcpu = vfs_mount_pcpu(mp); \ - MPASS(mpcpu->mntp_thread_in_ops == 0); \ - _mpcpu->mntp_thread_in_ops = 1; \ - atomic_interrupt_fence(); \ - if (__predict_false(mp->mnt_vfs_ops > 0)) { \ - vfs_op_thread_exit_crit(mp, _mpcpu); \ - _retval_crit = false; \ - } \ - _retval_crit; \ -}) - -#define vfs_op_thread_enter(mp, _mpcpu) ({ \ - bool _retval; \ - critical_enter(); \ - _retval = vfs_op_thread_enter_crit(mp, _mpcpu); \ - if (__predict_false(!_retval)) \ - critical_exit(); \ - _retval; \ -}) - -#define vfs_op_thread_exit_crit(mp, _mpcpu) do { \ - MPASS(_mpcpu == vfs_mount_pcpu(mp)); \ - MPASS(_mpcpu->mntp_thread_in_ops == 1); \ - atomic_interrupt_fence(); \ - _mpcpu->mntp_thread_in_ops = 0; \ -} while (0) +static inline bool +vfs_op_thread_entered(struct mount *mp) +{ + struct mount_pcpu *mpcpu = vfs_mount_pcpu(mp); -#define vfs_op_thread_exit(mp, _mpcpu) do { \ - vfs_op_thread_exit_crit(mp, _mpcpu); \ - critical_exit(); \ -} while (0) + MPASS(curthread->td_critnest > 0); + return (mpcpu->mntp_thread_in_ops == 1); +} + +static inline bool +vfs_op_thread_enter_crit(struct mount *mp, struct mount_pcpu **mpcpup) +{ + struct mount_pcpu *mpcpu; + bool retval_crit = true; + + MPASS(curthread->td_critnest > 0); + mpcpu = vfs_mount_pcpu(mp); + MPASS(mpcpu->mntp_thread_in_ops == 0); + mpcpu->mntp_thread_in_ops = 1; + atomic_interrupt_fence(); + if (__predict_false(mp->mnt_vfs_ops > 0)) { + vfs_op_thread_exit_crit(mp, mpcpu); + retval_crit = false; + } + *mpcpup = mpcpu; + return (retval_crit); +} + +static inline bool +vfs_op_thread_enter(struct mount *mp, struct mount_pcpu **mpcpup) +{ + bool retval; + + critical_enter(); + retval = vfs_op_thread_enter_crit(mp, mpcpup); + if (__predict_false(!retval)) + critical_exit(); + return (retval); +} + +static inline void +vfs_op_thread_exit_crit(struct mount *mp, struct mount_pcpu *mpcpu) +{ + MPASS(mpcpu == vfs_mount_pcpu(mp)); + MPASS(mpcpu->mntp_thread_in_ops == 1); + + atomic_interrupt_fence(); + mpcpu->mntp_thread_in_ops = 0; +} + +static inline void +vfs_op_thread_exit(struct mount *mp, struct mount_pcpu *mpcpu) +{ + vfs_op_thread_exit_crit(mp, mpcpu); + critical_exit(); +} #define vfs_mp_count_add_pcpu(_mpcpu, count, val) do { \ MPASS(_mpcpu->mntp_thread_in_ops == 1); \ From nobody Sun May 10 18:11:14 2026 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 4gD9sH2MVHz6cjhg for ; Sun, 10 May 2026 18:11:15 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD9sG72PWz3K4V for ; Sun, 10 May 2026 18:11:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436675; 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=jthWbcPTEkGKruRb4G3A+e5DmLbc2pK4+sNhRcCzV1s=; b=ROcXorN5XwispPxWjlzb7jxO9cDZm8H7vGOq8gEltuOv9JdAV1sQslbqGIfVo1XVEGqPo/ GDd7T4b2/nt0FYYA6FfUc4eP1CsaNmjoSGuD+O2D/qIAmEPdAm8Sn7x55UK+hAP98WyXuQ kgx4Bc0JVbpHUIEChX4V2QtvuOMKEAvLIYWqIYTxQ8CwcoECGoPx8/HugE5mW+h6LlZLDT jsPQfCSdR3Gi07yof9vENSgDiaHxGL8bwDEfRfhxWu/UymesU7mFJYw3wfeRJu+Wu2b78J LTTLMA3Tn4tAiWjVAtZquENjGShxG7A9CMY81bUd7dkeN7PbtIzfsbZCKRACSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778436675; a=rsa-sha256; cv=none; b=bMBZkr7wgab5GZjpd7u8vMUo/WieZbcIPg/zyLt4pQWOn9jUnRWwEHa284+HvKtU4yxIjt toL4VCS9j7mjdikn8C46Qz+sa8MRnV1QLNngPn/AMlqhuu3Lv458zrWE2B0AdqaHdjqNaK khnlIJAOoGr9ln1VQDCTTaxiLDqzbhoBpRXqhyQkUEaEth4lhJkxjSwTV6fdqOBVkJdcS8 7cnnUyof98oO0qMEzTyGBcwIch+I0i5COGJzqEE6tkYxv1iFpfWElPNKZgIwetloNaoe5z x+I8buQ6aaeBy/t6X7+jjsamS17N7rOuRQSNMI0WCM5VA9q0lbyZ+85teEQkcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436675; 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=jthWbcPTEkGKruRb4G3A+e5DmLbc2pK4+sNhRcCzV1s=; b=q46bViW1VSPjpKP0ah+VUZXXmpwYgf5zxpRgADJZaExJJtN4y2d+bi2cFkqdhbxAPtFBZg 3dcI/s7a/FIobGFmFO1oatTsMQfUmz943d5IBFAo8N6D+8VoBOG23Q4DLCmJI0VCuGRaqr 7VRHPIszr4YsvLxZ7LLZKO0s8Zrpc5fET+W1dZq+fmKReEB8Vt7bvWL/qbfw6dAlc/JZCi eLjp1TYL8psGCrwtVb7nfiQSF3tHbirpaKaCd8dGIrWyERLK+XWtqo80W9fyJopydQvxUw 2Omf/fa+NwpApuJxZ5t9H3vgw6lu/CQlJAso/a+WesXkJauPP3e9Ju5VsfwkLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD9sG6dZzzh89 for ; Sun, 10 May 2026 18:11:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44476 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 18:11:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 1d5e4020e36e - main - vnode: add VIRF_KNOTE flag 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d5e4020e36e1cc9e906200c9c3c784ef43d977e Auto-Submitted: auto-generated Date: Sun, 10 May 2026 18:11:14 +0000 Message-Id: <6a00ca42.44476.4762460f@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1d5e4020e36e1cc9e906200c9c3c784ef43d977e commit 1d5e4020e36e1cc9e906200c9c3c784ef43d977e Author: Konstantin Belousov AuthorDate: 2026-04-24 01:31:27 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 17:43:46 +0000 vnode: add VIRF_KNOTE flag to indicate non-empty vnode knote list. Use it instead of VN_KNLIST_EMPTY() and guard note activations with it. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56611 --- sys/kern/vfs_subr.c | 14 ++++++++++---- sys/sys/mount.h | 12 ++++++++++-- sys/sys/vnode.h | 29 ++++++++++++----------------- 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 48bfea2f5bf9..f46c666b115c 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -6090,7 +6090,7 @@ vop_create_post(void *ap, int rc) a = ap; dvp = a->a_dvp; vn_seqc_write_end(dvp); - if (!rc) { + if (rc == 0) { VFS_KNOTE_LOCKED(dvp, NOTE_WRITE); INOTIFY_NAME(*a->a_vpp, dvp, a->a_cnp, IN_CREATE); } @@ -6244,7 +6244,7 @@ vop_mknod_post(void *ap, int rc) a = ap; dvp = a->a_dvp; vn_seqc_write_end(dvp); - if (!rc) { + if (rc == 0) { VFS_KNOTE_LOCKED(dvp, NOTE_WRITE); INOTIFY_NAME(*a->a_vpp, dvp, a->a_cnp, IN_CREATE); } @@ -6512,7 +6512,7 @@ vop_read_pgcache_post(void *ap, int rc) { struct vop_read_pgcache_args *a = ap; - if (!rc) + if (rc == 0) VFS_KNOTE_UNLOCKED(a->a_vp, NOTE_READ); } @@ -6659,6 +6659,8 @@ vfs_knlunlock(void *arg) { struct vnode *vp = arg; + if (KNLIST_EMPTY(&vp->v_pollinfo->vpi_selinfo.si_note)) + vn_irflag_unset(vp, VIRF_KNOTE); VOP_UNLOCK(vp); } @@ -6706,7 +6708,11 @@ vfs_kqfilter(struct vop_kqfilter_args *ap) return (ENOMEM); knl = &vp->v_pollinfo->vpi_selinfo.si_note; vhold(vp); - knlist_add(knl, kn, 0); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + knlist_add(knl, kn, 1); + if ((vn_irflag_read(vp) & VIRF_KNOTE) == 0) + vn_irflag_set(vp, VIRF_KNOTE); + VOP_UNLOCK(vp); return (0); } diff --git a/sys/sys/mount.h b/sys/sys/mount.h index f99d0856f16e..480a6c16badf 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -952,14 +952,22 @@ vfs_statfs_t __vfs_statfs; } \ } while (0) +#include + #define VFS_KNOTE_LOCKED(vp, hint) do \ { \ - VN_KNOTE((vp), (hint), KNF_LISTLOCKED); \ + if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { \ + KNOTE_LOCKED(&vp->v_pollinfo->vpi_selinfo.si_note, \ + hint); \ + } \ } while (0) #define VFS_KNOTE_UNLOCKED(vp, hint) do \ { \ - VN_KNOTE((vp), (hint), 0); \ + if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { \ + KNOTE_UNLOCKED(&vp->v_pollinfo->vpi_selinfo.si_note, \ + hint); \ + } \ } while (0) #include diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 3fd2c770cda1..d1d20778a8ec 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -224,18 +224,14 @@ _Static_assert(sizeof(struct vnode) <= 448, "vnode size crosses 448 bytes"); /* XXX: These are temporary to avoid a source sweep at this time */ #define v_object v_bufobj.bo_object -/* We don't need to lock the knlist */ -#define VN_KNLIST_EMPTY(vp) ((vp)->v_pollinfo == NULL || \ - KNLIST_EMPTY(&(vp)->v_pollinfo->vpi_selinfo.si_note)) - -#define VN_KNOTE(vp, b, a) \ - do { \ - if (!VN_KNLIST_EMPTY(vp)) \ - KNOTE(&vp->v_pollinfo->vpi_selinfo.si_note, (b), \ - (a) | KNF_NOKQLOCK); \ - } while (0) -#define VN_KNOTE_LOCKED(vp, b) VN_KNOTE(vp, b, KNF_LISTLOCKED) -#define VN_KNOTE_UNLOCKED(vp, b) VN_KNOTE(vp, b, 0) +#define VN_KNOTE(vp, b, a) do { \ + if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { \ + KNOTE(&vp->v_pollinfo->vpi_selinfo.si_note, (b), \ + (a) | KNF_NOKQLOCK); \ + } \ +} while (0) +#define VN_KNOTE_LOCKED(vp, b) VN_KNOTE(vp, b, KNF_LISTLOCKED) +#define VN_KNOTE_UNLOCKED(vp, b) VN_KNOTE(vp, b, 0) /* * Vnode flags. @@ -260,6 +256,7 @@ _Static_assert(sizeof(struct vnode) <= 448, "vnode size crosses 448 bytes"); #define VIRF_INOTIFY 0x0080 /* This vnode is being watched */ #define VIRF_INOTIFY_PARENT 0x0100 /* A parent of this vnode may be being watched */ +#define VIRF_KNOTE 0x0200 /* Has knlist */ #define VI_UNUSED0 0x0001 /* unused */ #define VI_MOUNT 0x0002 /* Mount in progress */ @@ -1052,7 +1049,7 @@ void vop_rename_fail(struct vop_rename_args *ap); off_t osize, ooffset, noffset; \ \ osize = ooffset = noffset = 0; \ - if (!VN_KNLIST_EMPTY((ap)->a_vp)) { \ + if ((vn_irflag_read((ap)->a_vp) & VIRF_KNOTE) != 0) { \ error = VOP_GETATTR((ap)->a_vp, &va, (ap)->a_cred); \ if (error) \ return (error); \ @@ -1063,10 +1060,8 @@ void vop_rename_fail(struct vop_rename_args *ap); #define vop_write_post(ap, ret) \ noffset = (ap)->a_uio->uio_offset; \ if (noffset > ooffset) { \ - if (!VN_KNLIST_EMPTY((ap)->a_vp)) { \ - VFS_KNOTE_LOCKED((ap)->a_vp, NOTE_WRITE | \ - (noffset > osize ? NOTE_EXTEND : 0)); \ - } \ + VFS_KNOTE_LOCKED((ap)->a_vp, NOTE_WRITE | \ + (noffset > osize ? NOTE_EXTEND : 0)); \ INOTIFY((ap)->a_vp, IN_MODIFY); \ } From nobody Sun May 10 18:11:16 2026 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 4gD9sJ2bVXz6cjH2 for ; Sun, 10 May 2026 18:11:16 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD9sJ12BRz3JY0 for ; Sun, 10 May 2026 18:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436676; 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=msTKjj2kLvey+sn1thoSevPvkSNQU8+5m2QoC8Emb84=; b=NWmIsPunhtgIeCO4gsoww4Sdk7E3wxk8CropElXe2HwSfVS4NQFYtRRfFJCxhUfUHuErjP s0i7Wtcfsw5xU83B+gH5NHSBKTv8UxfDsR0+dp9Hz6y37Nd44BCTNoJaET7s1Yk7ywKWKh OMozgfY2wcjjbwg2fEDJqfOsUuk9hTVSMJU1rcrYM/hrb7gTl2y72008WL5ByHlaSunhRq KFZKCYSTqh/5CDuDb8+jnVryYkySZPtCSO54IDXfVTR6tYNdnl5JlrJ46zdj8B3/DDpXL+ 0P5FF1vhhLgBFXk3nU7LGP7eysA38CTlGY+MasFddf3FNVshV7eD/ZA9X41hjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778436676; a=rsa-sha256; cv=none; b=D2s91tLoy4T/tITUgXJzm2/w1nqLNIwHJ3pp92nbaoBDHeZ40qusBMfIgYXAfg9FTTFNbf CcH78wJOCk0i914pDVVKKuesq0i77GyE+88B7JN911Uqft6ijfdP18DXDYZxglnKlJG0j3 bnQosF4pPqu0c5TuwajBVDlYefmAydQYjz8cPWYkOpegaFkTgSWNPCqOYDsMYgBRBJRl3s ALvR1A1h1AllWTPEB3qBqbqpTAPpEBi2ROofwS/adns7IYyljjv/tPrzJKXL9qzsp31SU2 kvwwo3LEiHpS/L+IKTDElhfkr5bcEqkYyOL5Bg0RSyVF8L1bNLLDwqJXgt9X3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436676; 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=msTKjj2kLvey+sn1thoSevPvkSNQU8+5m2QoC8Emb84=; b=rjBRmgoxR/vCUCWO+Q639mzq7ep7CEz33WUT5i2jkWfZJ9fqFL8g1pwAD6/8OEigYNdj5M iSMg4/XabUp+XqCfQ/GAWHf/EDJEYRM9eKnfGsS1Ub+YXbbiktkEMVaAM6owfBuu/jgZoq sJJcF2dYGP6ro/MN1GNgpTWK0L1K1oDRaVDL66JT7wqGZDIq9s6Fz7B79WoJriIVnQMzso bjok0jDOecdW9uRZpFgM+bUZm305O4PoQEakV634ghzPkc8KYhqeYxWoV4Rx2BJ5Urk3rp mBidN3KUisFI3R9HaD3wjZoS5zHIBUeEDJCddtjS7a60g5+okmpb7XjFoLrk8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD9sJ0SphzhLk for ; Sun, 10 May 2026 18:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43d05 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 18:11:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e9a5eb0e5e44 - main - vop_read_pgcache_post(): report inotify IN_ACCESS same as for vop_read_post() 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9a5eb0e5e44e79d0f8dc71274b0183926abd562 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 18:11:16 +0000 Message-Id: <6a00ca44.43d05.7e8be65@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e9a5eb0e5e44e79d0f8dc71274b0183926abd562 commit e9a5eb0e5e44e79d0f8dc71274b0183926abd562 Author: Konstantin Belousov AuthorDate: 2026-05-06 20:29:28 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 17:43:46 +0000 vop_read_pgcache_post(): report inotify IN_ACCESS same as for vop_read_post() Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56611 --- sys/kern/vfs_subr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index f46c666b115c..4bfbc0a7057e 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -6512,8 +6512,10 @@ vop_read_pgcache_post(void *ap, int rc) { struct vop_read_pgcache_args *a = ap; - if (rc == 0) - VFS_KNOTE_UNLOCKED(a->a_vp, NOTE_READ); + if (rc == 0) { + VFS_KNOTE_LOCKED(a->a_vp, NOTE_READ); + INOTIFY(a->a_vp, IN_ACCESS); + } } static struct knlist fs_knlist; From nobody Sun May 10 18:11:17 2026 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 4gD9sM1sPJz6cjcd for ; Sun, 10 May 2026 18:11:19 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD9sK6jY2z3JtJ for ; Sun, 10 May 2026 18:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436677; 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=y6/oeATvRCxqCBsYGYEuqtYFaGBdggsW3YRcG2lN71A=; b=Ug4PKyk0HN8Xe8zk1mdomCqwIEpKbhtrFmC1b4Ai3y5+WDqkyX3SrxBaEvicBYK0E0ca7f Hcr8k3bZyhKMkVO6cRZJ8JLtPNUyjwbGIEMneN4eumlcHIoMRhVRiMYbCTfaHkzaCc2Z1Z uJ6x4Pjszi3LEXrJWNfxPtqDL8qmRICZTwvvwr+dwPDPU+hHqYSco2Z+HPE7wneUxTDbfP R7kVMXi5F0KWl6Zw1vmrHnN4qHHjCTGiTRc3mxgVPHUpRoZFiteij75a0c1+1vR85YCRxJ UraopDuCrUm3tvOF0L/xie+mJFOiBB+ZdC5fPjF19SaVJ+C91jIoFV5ZJHUfng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778436678; a=rsa-sha256; cv=none; b=YvDloM/33uTisc46zZs5YFG5rQlUfBII0cV4PsjBdfVdUO4LGGWOdNAL3yM3RvTpS11iTl 0wwGX9dw9HinETIoE8H1jUODI3ACojT6IdlJrOd7TDm58Uu8lAn44y6+sz81piwr2ZmL2P 8bG0GPBEdVe6HNDY4lgufvI/26JDSsg3HH0o47hIk7adJLcL+7yhGKMLi62W4AcOGDgIeC 8oxoYlCFVfZEUApCC+7pUkqP3jV36Y3y2F6Lo09KXqZNLBKdakdPMbvOsZeht+mANEvA7R fIqsXIYdNMlNK2Ovn2D3AxpDTb426D6Yd0P3QboIY13qeLK8HeZteGMd/JzKYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436678; 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=y6/oeATvRCxqCBsYGYEuqtYFaGBdggsW3YRcG2lN71A=; b=JVy2H8HFGdTaI+OvS/1z2wFokDqqRTmWs884qItie6Yn0k7H1ocVoTq+Bxq1X0oyLJPNPl e6gRPCRWuuGd9N97oNeyjRce6jtHgt8OJsI9wKbd3C5NB7AF82DvRi9oumhUuhE99bh4Hp KYO1gaY606dJmlcfU10SAlMsCbqAXQMU+247C1Ih1IrtjbYdeJEKNovKtwQPQ1SAV9jz5Q L7x0HQISTbnJs92O20UMYmlsvitSvuLnnQDrbDH+bVzr2TgWb+GUvaIfYRXYVatyunSDo9 QIu2y64f0YJPfSKvFzAn1gO28uarQa5asRFvi3BBr3x2NUalXibQWR4Gr5SA3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD9sK17xLzh0P for ; Sun, 10 May 2026 18:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43575 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 18:11:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: a57420b214b0 - main - vfs: convert VFS_OPs from macros to static inlines 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a57420b214b04de3d066236b555925ffbcb93daa Auto-Submitted: auto-generated Date: Sun, 10 May 2026 18:11:17 +0000 Message-Id: <6a00ca45.43575.42544519@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a57420b214b04de3d066236b555925ffbcb93daa commit a57420b214b04de3d066236b555925ffbcb93daa Author: Konstantin Belousov AuthorDate: 2026-04-24 01:31:27 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 17:43:46 +0000 vfs: convert VFS_OPs from macros to static inlines Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56611 --- sys/sys/mount.h | 230 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 121 insertions(+), 109 deletions(-) diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 480a6c16badf..d6696bba0a4f 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -853,122 +853,134 @@ struct vfsops { vfs_statfs_t __vfs_statfs; -#define VFS_MOUNT(MP) ({ \ - int _rc; \ - \ - TSRAW(curthread, TS_ENTER, "VFS_MOUNT", (MP)->mnt_vfc->vfc_name);\ - _rc = (*(MP)->mnt_op->vfs_mount)(MP); \ - TSRAW(curthread, TS_EXIT, "VFS_MOUNT", (MP)->mnt_vfc->vfc_name);\ - _rc; }) - -#define VFS_UNMOUNT(MP, FORCE) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_unmount)(MP, FORCE); \ - _rc; }) - -#define VFS_ROOT(MP, FLAGS, VPP) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_root)(MP, FLAGS, VPP); \ - _rc; }) - -#define VFS_CACHEDROOT(MP, FLAGS, VPP) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_cachedroot)(MP, FLAGS, VPP); \ - _rc; }) - -#define VFS_QUOTACTL(MP, C, U, A, MP_BUSY) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_quotactl)(MP, C, U, A, MP_BUSY); \ - _rc; }) - -#define VFS_STATFS(MP, SBP) ({ \ - int _rc; \ - \ - _rc = __vfs_statfs((MP), (SBP)); \ - _rc; }) - -#define VFS_SYNC(MP, WAIT) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_sync)(MP, WAIT); \ - _rc; }) - -#define VFS_VGET(MP, INO, FLAGS, VPP) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_vget)(MP, INO, FLAGS, VPP); \ - _rc; }) - -#define VFS_FHTOVP(MP, FIDP, FLAGS, VPP) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_fhtovp)(MP, FIDP, FLAGS, VPP); \ - _rc; }) - -#define VFS_CHECKEXP(MP, NAM, EXFLG, CRED, NUMSEC, SEC) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_checkexp)(MP, NAM, EXFLG, CRED, NUMSEC,\ - SEC); \ - _rc; }) - -#define VFS_EXTATTRCTL(MP, C, FN, NS, N) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_extattrctl)(MP, C, FN, NS, N); \ - _rc; }) - -#define VFS_SYSCTL(MP, OP, REQ) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_sysctl)(MP, OP, REQ); \ - _rc; }) - -#define VFS_SUSP_CLEAN(MP) do { \ - if (*(MP)->mnt_op->vfs_susp_clean != NULL) { \ - (*(MP)->mnt_op->vfs_susp_clean)(MP); \ - } \ -} while (0) +static inline int +VFS_MOUNT(struct mount *mp) +{ + int rc; -#define VFS_RECLAIM_LOWERVP(MP, VP) do { \ - if (*(MP)->mnt_op->vfs_reclaim_lowervp != NULL) { \ - (*(MP)->mnt_op->vfs_reclaim_lowervp)((MP), (VP)); \ - } \ -} while (0) + TSRAW(curthread, TS_ENTER, "VFS_MOUNT", mp->mnt_vfc->vfc_name); + rc = mp->mnt_op->vfs_mount(mp); + TSRAW(curthread, TS_EXIT, "VFS_MOUNT", mp->mnt_vfc->vfc_name); + return (rc); +} -#define VFS_UNLINK_LOWERVP(MP, VP) do { \ - if (*(MP)->mnt_op->vfs_unlink_lowervp != NULL) { \ - (*(MP)->mnt_op->vfs_unlink_lowervp)((MP), (VP)); \ - } \ -} while (0) +static inline int +VFS_UNMOUNT(struct mount *mp, int force) +{ + return (mp->mnt_op->vfs_unmount(mp, force)); +} -#define VFS_PURGE(MP) do { \ - if (*(MP)->mnt_op->vfs_purge != NULL) { \ - (*(MP)->mnt_op->vfs_purge)(MP); \ - } \ -} while (0) +static inline int +VFS_ROOT(struct mount *mp, int flags, struct vnode **vpp) +{ + return (mp->mnt_op->vfs_root(mp, flags, vpp)); +} + +static inline int +VFS_CACHEDROOT(struct mount *mp, int flags, struct vnode **vpp) +{ + return (mp->mnt_op->vfs_cachedroot(mp, flags, vpp)); +} + +static inline int +VFS_QUOTACTL(struct mount *mp, int cmds, uid_t uid, void *arg, bool *mp_busy) +{ + return (mp->mnt_op->vfs_quotactl(mp, cmds, uid, arg, mp_busy)); +} + +static inline int +VFS_STATFS(struct mount *mp, struct statfs *sbp) +{ + return (__vfs_statfs(mp, sbp)); +} + +static inline int +VFS_SYNC(struct mount *mp, int waitfor) +{ + return (mp->mnt_op->vfs_sync(mp, waitfor)); +} + +static inline int +VFS_VGET(struct mount *mp, ino_t ino, int flags, struct vnode **vpp) +{ + return (mp->mnt_op->vfs_vget(mp, ino, flags, vpp)); +} + +static inline int +VFS_FHTOVP(struct mount *mp, struct fid *fidp, int flags, struct vnode **vpp) +{ + return (mp->mnt_op->vfs_fhtovp(mp, fidp, flags, vpp)); +} + +static inline int +VFS_CHECKEXP(struct mount *mp, struct sockaddr *nam, uint64_t *extflagsp, + struct ucred **credanonp, int *numsecflavors, int *secflavors) +{ + return (mp->mnt_op->vfs_checkexp(mp, nam, extflagsp, credanonp, + numsecflavors, secflavors)); +} + +static inline int +VFS_EXTATTRCTL(struct mount *mp, int cmd, struct vnode *filename_vp, + int attrnamespace, const char *attrname) +{ + return (mp->mnt_op->vfs_extattrctl(mp, cmd, filename_vp, + attrnamespace, attrname)); +} + +static inline int +VFS_SYSCTL(struct mount *mp, fsctlop_t op, struct sysctl_req *req) +{ + return (mp->mnt_op->vfs_sysctl(mp, op, req)); +} + +static inline void +VFS_SUSP_CLEAN(struct mount *mp) +{ + if (mp->mnt_op->vfs_susp_clean != NULL) + mp->mnt_op->vfs_susp_clean(mp); +} + +static inline void +VFS_RECLAIM_LOWERVP(struct mount *mp, struct vnode *vp) +{ + if (mp->mnt_op->vfs_reclaim_lowervp != NULL) + mp->mnt_op->vfs_reclaim_lowervp(mp, vp); +} + +static inline void +VFS_UNLINK_LOWERVP(struct mount *mp, struct vnode *vp) +{ + if (mp->mnt_op->vfs_unlink_lowervp != NULL) + mp->mnt_op->vfs_unlink_lowervp(mp, vp); +} + +static inline void +VFS_PURGE(struct mount *mp) +{ + if (mp->mnt_op->vfs_purge != NULL) + mp->mnt_op->vfs_purge(mp); +} #include -#define VFS_KNOTE_LOCKED(vp, hint) do \ -{ \ - if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { \ - KNOTE_LOCKED(&vp->v_pollinfo->vpi_selinfo.si_note, \ - hint); \ - } \ -} while (0) +static inline void +VFS_KNOTE_LOCKED(struct vnode *vp, int hint) +{ + if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { + KNOTE_LOCKED(&vp->v_pollinfo->vpi_selinfo.si_note, + hint); + } +} -#define VFS_KNOTE_UNLOCKED(vp, hint) do \ -{ \ - if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { \ - KNOTE_UNLOCKED(&vp->v_pollinfo->vpi_selinfo.si_note, \ - hint); \ - } \ -} while (0) +static inline void +VFS_KNOTE_UNLOCKED(struct vnode *vp, int hint) +{ + if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { + KNOTE_UNLOCKED(&vp->v_pollinfo->vpi_selinfo.si_note, + hint); + } +} #include From nobody Sun May 10 18:11:18 2026 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 4gD9sM1wkcz6cjMx for ; Sun, 10 May 2026 18:11:19 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD9sL2Ry9z3Jqr for ; Sun, 10 May 2026 18:11:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436678; 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=m2J/J5x/F/weqBCeJvgxryVe2q8Zqpr3AUfCGI+16sM=; b=BpA5J7GZzXaU0ISdrToDdEFswthOYR5nWNhnO+uDLhl39QRcXYtOmPr35H+jDw+3WxtiyG lskXbk4KlPDty9WdgiJijTlJff8pflmD8Vp7W5GPoA8dbp+kWdhdBEDFxMPHl71GW/KsEj nEzn0yqBOP3p7ZbUGPSDrlepNjkJJDYeVMHcXkRqEBIxMwS3Aa9hvjxHpxCBl+QF1jLkso RNjXMcHPTQ+2var02omCKnUJRO/uK0Z7CWjf2aVqpNH7B0GZ2y59DUpjxss8uFFvz585QT Ymfx/dYZr5PmKYJfaIDMTYymbG88a/sBjxYEGSimPE5+5pdKtP6dg1ypZlSM7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778436678; a=rsa-sha256; cv=none; b=jJB5m1/7mwgFmq5PEQoqjZBAXQWBFAz71F0zC2E3M4QRiXYCo5q/spyCm0+sSxAGnYAmAK HPr+DYcWtSUNdZQ7STbyHfW+pwGPdHx+VXECDNRH5bZkeHHD9JIiTnXQvAwwDUwkF/y0FQ N15bZnmuFa1LwXplgnpMz4jcrop0z/4lQSbfLXq2SW4uOGgpx5PwsKNFKjGst+mzPs45+E ieSWGkgRtiNKI1+F+znHfWnRsnM0ndJ+l/jYkzxwcqIUG5P+3ts+0H81yhGFSy3QlUymT7 kI7C3PxCtxFiN629E1kgL52dYfjqwDt3Fqc3u8/XX4vHMzUJ7dbssyL91CUyvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436678; 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=m2J/J5x/F/weqBCeJvgxryVe2q8Zqpr3AUfCGI+16sM=; b=jf4twBHN9AzZtsxerECU+wLN+yst9mMTSeGle1uVVu8VaetfavZcMZuIS+Br8eBCYroeCl gMcACs58/Z5bRCdLcPa1qwufxwhI8tVfxFtVMgdrNzeik34hn2+VGfOt3lWSB37+8hXUka gQTybyFJ1BgIST/8T6PzlSXdSmwlz3gp6zzo+CJGQq6BsL7c1vUzzyX3rsbVryv5xY92Y3 cImui+dfiJQhyVUf/TKUdZ7B9VHICy+Ib/DDiQxeUBg5gN3T+P+PWPBx4i+k4w7gn91i3J KkqCy/oV1CGGco7F5ugNgXMuKu9LkJ1XlN3vRCOTye+ntixHV7g9SPuVjrMAAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD9sL1pcrzgp0 for ; Sun, 10 May 2026 18:11:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41de6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 18:11:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 5e4947f7e08a - main - sys/vnode.h: remove stale comment 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e4947f7e08a90ba50f9e8cea9ae5e128717cb5f Auto-Submitted: auto-generated Date: Sun, 10 May 2026 18:11:18 +0000 Message-Id: <6a00ca46.41de6.75480034@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5e4947f7e08a90ba50f9e8cea9ae5e128717cb5f commit 5e4947f7e08a90ba50f9e8cea9ae5e128717cb5f Author: Konstantin Belousov AuthorDate: 2026-04-24 02:06:02 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 17:43:46 +0000 sys/vnode.h: remove stale comment The source sweep is not going to happen. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56611 --- sys/sys/vnode.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index d1d20778a8ec..4fee025a93ea 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -221,7 +221,6 @@ _Static_assert(sizeof(struct vnode) <= 448, "vnode size crosses 448 bytes"); #define bo2vnode(bo) __containerof((bo), struct vnode, v_bufobj) -/* XXX: These are temporary to avoid a source sweep at this time */ #define v_object v_bufobj.bo_object #define VN_KNOTE(vp, b, a) do { \ From nobody Sun May 10 18:14:41 2026 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 4gD9xF2ctTz6cjtd for ; Sun, 10 May 2026 18:14:41 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD9xF1vkZz3Ls2 for ; Sun, 10 May 2026 18:14:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436881; 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=fGQsMtDBvLDyBCL1MUxjlqtuwJwvYmiPsHpNQoITAuU=; b=I423YP9S/O2UAcHq/LnH4Qza3dfWfWuKuacByRD31tK2SdrFYqhIOEgBPlYizyjPDtFMKf z4evhObJXH2SXEiucvOyjlSrL/l3L3yyXiXoyhJpTSN+THYFQEUUEkNeJIUmGLUgRm/X+P tA5tFMHToM/trwTA4QbfCc8ahfh7yzDpfXLIOg40XYF59v1Frw1CXas7ZTJHBeQ6kzhSEA 61k8pAbYubrZYTOLH1y177f14gNSJaicu5YKBZ5pi4sf7v7LYoLl4J9cnQpyaqq1KyjBQS Oxc7G+BPjUiVxi3cnxzi8+oOdiebDJdfP9fgQtvWrcazAXAS4Vta9Eun7myLVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778436881; a=rsa-sha256; cv=none; b=JfJjGd1c8vL0oqcc80H2DrHVEq/VQZMsGVflOwwEj3RORYw5ybJOXuQsuORv7YvVn2/sR4 rHlckayGaultdHxt+Iq5RM4PoR57jDxl5RRIDaSivfOWLk1mTHswq3dBBHxOtuGiHDQIi0 x5DxD2Ews6gaezNl77ptTqnciRaOltg1u6rpuHQAjMP7Tf2fglfqa1kT54i3XxlcsMHsZ6 LyTWMwIBzng2Wymq+GXhRKgIindnqzaHhdwP848Eq1JU+ouauRZmSl0xe4bkvRpANMRNaH fwr+a622RFfwMy4ag55kpe1t0mppv/anskzFr0+UH7SlqjLw8bZQF0KLW4aCBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436881; 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=fGQsMtDBvLDyBCL1MUxjlqtuwJwvYmiPsHpNQoITAuU=; b=IVla1wn1xjBX0HwyhoZ8ZLd/h1fmHFMozG4/NBOoKDgLYK2PHSZwzz0ERDlC0dqrUyyFyW o8O5Nn+U23WZm50OwaoPMUw/fg5UfohEzjTu+xVVaw4+kr2Iw+eCIr0YOE2oGK7yjYOgLo WDdAxi7+593FCHpsDZaiELzTrKrVK9l+iePqOLL30rqeY2dyItl7m9nSAg3fcqNDg7xjpd 800QVVNU+CNmwloNQ72tHrjAY5iYzNmNS1LPs4kH6jH9vzfnLWLrtRBCNjJpF82nkmyCZk WXy/OXS+61pPWLWQ24lE1ogwiT4sqikp6Q/CPya6EC5i6pzQZCZl7CfqcYKwNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD9xF1LW5zgdt for ; Sun, 10 May 2026 18:14:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4418e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 18:14:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ea72f6d5a8b9 - main - sys/cdefs.h: move __BEGIN_DECLS/__END_DECLS into a helper sys/_decls.h 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea72f6d5a8b9386a09e23fbdc933effb007ca899 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 18:14:41 +0000 Message-Id: <6a00cb11.4418e.735c08d5@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ea72f6d5a8b9386a09e23fbdc933effb007ca899 commit ea72f6d5a8b9386a09e23fbdc933effb007ca899 Author: Konstantin Belousov AuthorDate: 2026-05-08 14:13:35 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 18:14:18 +0000 sys/cdefs.h: move __BEGIN_DECLS/__END_DECLS into a helper sys/_decls.h There are situations where nothing from sys/cdefs.h is needed except for the declaration braces. More, the other facilities from sys/cdefs.h might unnecessarly pollute the namespace. Reviewed by: markj, imp Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56889 --- sys/sys/_decls.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ sys/sys/cdefs.h | 8 +------- tools/build/Makefile | 1 + 3 files changed, 48 insertions(+), 7 deletions(-) diff --git a/sys/sys/_decls.h b/sys/sys/_decls.h new file mode 100644 index 000000000000..2ef61671dd70 --- /dev/null +++ b/sys/sys/_decls.h @@ -0,0 +1,46 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 1991, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Berkeley Software Design, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _SYS__DECLS_H_ +#define _SYS__DECLS_H_ + +#if defined(__cplusplus) +#define __BEGIN_DECLS extern "C" { +#define __END_DECLS } +#else +#define __BEGIN_DECLS +#define __END_DECLS +#endif + +#endif diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index a08c50c8439a..d0a34f1bdfc0 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -61,13 +61,7 @@ #define __has_builtin(x) 0 #endif -#if defined(__cplusplus) -#define __BEGIN_DECLS extern "C" { -#define __END_DECLS } -#else -#define __BEGIN_DECLS -#define __END_DECLS -#endif +#include /* * This code has been put in place to help reduce the addition of diff --git a/tools/build/Makefile b/tools/build/Makefile index f0856900b281..d71cc710be87 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -360,6 +360,7 @@ DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h .if ${.MAKE.OS} == "FreeBSD" # Needed to build most of the things below, which include sys/cdefs.h either # directly or transitively +SYSINCS+= ${SRCTOP}/sys/sys/_decls.h SYSINCS+= ${SRCTOP}/sys/sys/_visible.h SYSINCS+= ${SRCTOP}/sys/sys/cdefs.h .endif From nobody Sun May 10 19:41:36 2026 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 4gDCsX278wz6cr3l for ; Sun, 10 May 2026 19:41:36 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gDCsX1Grkz3W3s for ; Sun, 10 May 2026 19:41:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778442096; 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=C7FpZeADhT0VtSnFfNZrRCMDVwQNvGo0aSAZjgmhqoc=; b=SNPMec+llm1f2SWshmpuSXy4a1a9k6vX1iRP027+5u9FW2OLfgxRnnI/f+oN2g7EHfEOQo gz1+XyXelNpiEIjL8XKDnnIbzBpH516vCxiLc+/Vq1tEk/pHU+cIth7L4rRLsVuxL+p7oi ntdCfxTL1KTvdxKr3kGYhJe2TSY4UOqPoPZjigCL4ETpsTJmHA8Nd/NXkjQyGq035yYt1I kx28pHuOyqvDEQYUW6FXqo/LhKSohcKjobKaes1HOFKSuO4t2x+Y78p1AwrLkAQAcxi3Fe r62ZtDQ46KFFPWo4XmXqG/mqw7srnQkqn5YmCZ7rtLLw7eGJ9zN08Dsn3MWe8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778442096; a=rsa-sha256; cv=none; b=CU9cZjN9xP0j6D9BjcRy9Q8kNKOsfZivjgVxqPqp802TfsNcrxGLpxUZb9GYa2vzL+vKN6 8X8dEZ0xJcMEvgPg3j5vxqmSdtAiZmeCGs981Sh1GF0B9IVvjk//Iei/cXrepOZHfDD7dt JWsftJSMQFx3ojPYWtOJyLNPskTTuVwwciRA8qilSQkwqklBs1jB3iuR8TaosgOs4MUnl/ ble7GWWU0JhByOoL1r+6ydUOQl8Ltms+wKuD1GRDFytn05tluGE3xKf5JXBUu2td8Jnqcg iuQWhwonUTxmddCH6nlWy6L+kOF/PO/msa108xgX3D5BzaOhvcc5/xJAYfZiRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778442096; 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=C7FpZeADhT0VtSnFfNZrRCMDVwQNvGo0aSAZjgmhqoc=; b=WGIO1qtIcBXNfVtg6gbDB6uuYjY9FaZ2u0IuRyYOtUvLi2avsm7+9rwhVwhnCWV2OWD2br sXqQIDZ5xthvVxAtKW4E9ax5FABKYmCYcxVSg7t2LELTVy+0RgfNR71XEnG6PFxUlE3IAI jbCsaLTLDF4BdHSUYuYaxpTdMhwfUa2wu+h7/orjtp+XMlm+MMyWLxlUuc2C6AaIQsDJGL nCHEED/WtWD/rNKGrHuvc97aDvbZrCq1V70lyyfxjfw+SkW2vKme6scVJTJDKVzUGAsQX1 LDX7Htpe5SxB3COBOyFo/4aas1za4eT3yK8CV8YJrOdsJtQl2JETnnl9pj8StA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDCsX0ptQzkgG for ; Sun, 10 May 2026 19:41:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bef0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 19:41:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 70ef02b5d3fd - main - if_geneve: Fix uninitialized variable use in geneve_udp_input() 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70ef02b5d3fdbc4f51ea81404c4cbca310083ce6 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 19:41:36 +0000 Message-Id: <6a00df70.1bef0.3cd82247@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=70ef02b5d3fdbc4f51ea81404c4cbca310083ce6 commit 70ef02b5d3fdbc4f51ea81404c4cbca310083ce6 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-05-10 19:25:53 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-10 19:38:52 +0000 if_geneve: Fix uninitialized variable use in geneve_udp_input() Set the ifp variable as soon as soft_c becomes available so that interface statistics can be incremented. PR: 295129 Reported by: Robert Morris Fixes: e44d2e941e8e ("if_geneve: Add Support for Geneve ...") --- sys/net/if_geneve.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_geneve.c b/sys/net/if_geneve.c index ab8b313e860a..59822045b77b 100644 --- a/sys/net/if_geneve.c +++ b/sys/net/if_geneve.c @@ -3021,6 +3021,7 @@ geneve_udp_input(struct mbuf *m, int offset, struct inpcb *inpcb, if (sc == NULL) return (false); + ifp = sc->gnv_ifp; if ((sc->gnv_flags & GENEVE_FLAG_RUNNING) == 0) goto out; @@ -3043,7 +3044,6 @@ geneve_udp_input(struct mbuf *m, int offset, struct inpcb *inpcb, if (error != 0) goto out; - ifp = sc->gnv_ifp; if (ifp == m->m_pkthdr.rcvif) /* XXX Does not catch more complex loops. */ goto out;