From nobody Mon May 11 07:42: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 4gDWsk1Qwtz6cKck for ; Mon, 11 May 2026 07:42: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 4gDWsk0jWnz4GV3 for ; Mon, 11 May 2026 07:42:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778485370; 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=GkNFnpGsGXO4z7CZhxgn36llXduuQuP44YIl+qsMs4s=; b=kLO28PKGj0myuGDxaSBhT8Gq88Y7s+sWzGArf15ABOkQGWnupR+eS+BXojaiO3VuxTZNWW CGobjQJrf97oF6IxZEwnbTT8MWiXwmPLTSchWae1y1audxPI6iwcnPK9S2bl/weeRdUDhQ uFyR2Dcn2TIQ72MHvp1rPT1s/FrjSmPHDgBXclpWguV2RNg/JqV7lLqZwmpHuFtH+bEGoH 0Zfasla3BjeryUaU/WVovljLLisWlPVE1QXyxZbHdFhqa97EzYp16DZbXNqPzOgFyDpBP7 acNMBhOezb8wPqnUTtBRWbV4HLdBuXYSVv5WcB2IItTKrdOJW2XPgWuZzRaMYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778485370; a=rsa-sha256; cv=none; b=ZJ8Mcs5qusq/SBAh3oywvD0qs6aMffAWiBq8kNUTJFL1Db0rAXWnnHYuV+9T2qcsuN5aQZ hUKOyhkkGKP1q79hgv0ClUzyJmCgYDpC3n0ACPzjHniMuozgtdSNpVuzA6r/m4A+LJ5kuA shHDJxb7cr2IFRCs3ul6LyzX5b1brSi7h83er6Dd3v/9wdUhALHfhGCzn2iOqH38euUiK1 MfZELIqD+23OBPx1NYeG/3XQ6kQpGINWmTdKbyvhqqiPB6q0uLIxeTb58gi4OqmO+lNGyA 2Z4jOcISt3T83PEeezjkRJZdRF5wYz51VoBDMYv5ug0Xb0NjlAFWFBf5GmJvKA== 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=1778485370; 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=GkNFnpGsGXO4z7CZhxgn36llXduuQuP44YIl+qsMs4s=; b=cenpPxAVXW+gn9sqWBbVDLMVOqkKpfjRFo+SPcX7vDBR1KDcmtI1zTLQyvskUEKFmj6t3f vinad7ogAiMgsWLgEVTp9J8DIFoRAhROw2smuY8Fbxx/a7h2lQuS4OFEIw1rgFQzVgyZzA y/tYhQi/9qdtd8JxCO/oRfW9VnFIOc5t0ItRa1Xwu8fCTt2CeZy/ne3bfsIkkXJNXc9QB6 9qUKP8baPxsDjnnyrDhyYtQjQ0ruV9Jd6KZoFHWPQ7LD5Rrszq2khQ4jd/FeDC9Mtlyez7 zqjXU7D3+4zV5Or6pIJ/9FG8ZsmQ/jvwMm6weNOOMCLoyRmsGPdGXbhN5W48uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDWsk0GLBz16jh for ; Mon, 11 May 2026 07:42:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21c3a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 07:42:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: bac7bd5038e0 - main - linux: address executable stack warnings 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: bac7bd5038e09d12dfdbf79a87b25443e02d0ba9 Auto-Submitted: auto-generated Date: Mon, 11 May 2026 07:42:50 +0000 Message-Id: <6a01887a.21c3a.72ac7450@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=bac7bd5038e09d12dfdbf79a87b25443e02d0ba9 commit bac7bd5038e09d12dfdbf79a87b25443e02d0ba9 Author: Ryan Libby AuthorDate: 2026-05-11 05:39:27 +0000 Commit: Ryan Libby CommitDate: 2026-05-11 05:39:27 +0000 linux: address executable stack warnings Mark assembly files as not requiring executable stacks. This still leaves linux32_vdso.so without a .note.GNU-stack section in the gcc build for now. Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D56894 --- sys/amd64/linux/linux_locore.asm | 2 ++ sys/amd64/linux/linux_support.S | 2 ++ sys/amd64/linux32/linux32_locore.asm | 2 ++ sys/amd64/linux32/linux32_support.S | 2 ++ sys/arm64/linux/linux_locore.asm | 2 ++ sys/arm64/linux/linux_support.S | 2 ++ sys/compat/linux/linux_vdso_inc.S | 2 ++ sys/i386/linux/linux_locore.asm | 2 ++ 8 files changed, 16 insertions(+) diff --git a/sys/amd64/linux/linux_locore.asm b/sys/amd64/linux/linux_locore.asm index 19a6ac5d50d8..d4af90bda5fb 100644 --- a/sys/amd64/linux/linux_locore.asm +++ b/sys/amd64/linux/linux_locore.asm @@ -85,3 +85,5 @@ END(linux_rt_sigcode) .balign 4 .previous #endif + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/linux/linux_support.S b/sys/amd64/linux/linux_support.S index 7cc59b205a97..2ab46fe8c5ea 100644 --- a/sys/amd64/linux/linux_support.S +++ b/sys/amd64/linux/linux_support.S @@ -227,3 +227,5 @@ ENTRY(futex_xorl_smap) movq %rax,PCB_ONFAULT(%r8) ret END(futex_xorl_smap) + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/linux32/linux32_locore.asm b/sys/amd64/linux32/linux32_locore.asm index 4b77bd32600e..cc4b0488edb0 100644 --- a/sys/amd64/linux32/linux32_locore.asm +++ b/sys/amd64/linux32/linux32_locore.asm @@ -128,3 +128,5 @@ END(__kernel_vsyscall) .balign 4 .previous #endif + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/linux32/linux32_support.S b/sys/amd64/linux32/linux32_support.S index a316a9bf066d..1018b6ce579c 100644 --- a/sys/amd64/linux32/linux32_support.S +++ b/sys/amd64/linux32/linux32_support.S @@ -227,3 +227,5 @@ ENTRY(futex_xorl_smap) movq %rax,PCB_ONFAULT(%r8) ret END(futex_xorl_smap) + + .section .note.GNU-stack,"",%progbits diff --git a/sys/arm64/linux/linux_locore.asm b/sys/arm64/linux/linux_locore.asm index c330546702f1..20846a324647 100644 --- a/sys/arm64/linux/linux_locore.asm +++ b/sys/arm64/linux/linux_locore.asm @@ -51,3 +51,5 @@ __user_rt_sigreturn: mov x8, #LINUX_SYS_linux_rt_sigreturn svc #0 EEND(__kernel_rt_sigreturn) + + .section .note.GNU-stack,"",%progbits diff --git a/sys/arm64/linux/linux_support.S b/sys/arm64/linux/linux_support.S index 3b16583e9d54..61a0604dd91b 100644 --- a/sys/arm64/linux/linux_support.S +++ b/sys/arm64/linux/linux_support.S @@ -176,3 +176,5 @@ ENTRY(futex_xorl) END(futex_xorl) GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) + + .section .note.GNU-stack,"",%progbits diff --git a/sys/compat/linux/linux_vdso_inc.S b/sys/compat/linux/linux_vdso_inc.S index 44cc357b4a4a..d2ac3e28aabe 100644 --- a/sys/compat/linux/linux_vdso_inc.S +++ b/sys/compat/linux/linux_vdso_inc.S @@ -37,3 +37,5 @@ _binary_linux_vdso_so_o_end: #include GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) #endif + + .section .note.GNU-stack,"",%progbits diff --git a/sys/i386/linux/linux_locore.asm b/sys/i386/linux/linux_locore.asm index dbd0757c44bc..c188ad72f009 100644 --- a/sys/i386/linux/linux_locore.asm +++ b/sys/i386/linux/linux_locore.asm @@ -122,3 +122,5 @@ END(__kernel_vsyscall) .balign 4 .previous #endif + + .section .note.GNU-stack,"",%progbits From nobody Mon May 11 15:26: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 4gDk8N69KDz6dB4x for ; Mon, 11 May 2026 15:26: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 4gDk8N5bPtz40VG for ; Mon, 11 May 2026 15:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778513172; 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=5YgViGRsleiEoRUee2dqWtRYRbcCjFm4lu9jyII32S4=; b=u58tZGBvR2Q4565DCSTyMbEdYAlmDZwfVjnNSo1KdqHVFmTYELsqLBgSBtUaKLh9hxTtvT kmp0t88KWD9SPXTMQsicAscg8uvX2HoMDHJtqIv34tOfNQ1WuAe7Wig0c4IayS+Tuc3BjU jooyGwRCD2BfGdIem5k6NbSfAqwqhWGU0OWtFAeTHtED4B5VyUTyaQewqg7XITpYvQsAso GA8CAgaJqLZ3IoNOlhGgCN4zGrZGDxbc1UDBkq/RnZ6DbHb17resZVejK1JmB0COX8ygH8 3KqwK2Nlq3E4xJ0VxuJnpzHV6COwHy5NVlmJTvsqmm8xaOqObNwZN3sKjxlf0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778513172; a=rsa-sha256; cv=none; b=K3Bfp0gbu8N+GVkayXB9pePauA0qBDoaInI088kqVzbAunBKFr2v9TKwRsZHB4yAwPul05 +aFqkeT+bZDVd1L58EUAELsKrRzqDfFQvEcs2kyJeykWPBGiMasTy6vmoB7jeDegCYPtFk RcXP+ojjzEKMsjD20TpMu8LvWI7Lq/o076F3JqhOOQJamLnKUJ7W1vgaEw+z8i6UBF7+iS pipGpDsDuvyVtc9WULKXAvjCCINj92Dwks7eJLPUdt+ALZf7u7otV390XfYgRvZa9Nheyf vuU0DCkcDFgEkdHpsLjRZsE+4Irbg/JyPncUYVsfdpXt8gYzbYcJRmwbxF2W7g== 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=1778513172; 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=5YgViGRsleiEoRUee2dqWtRYRbcCjFm4lu9jyII32S4=; b=UE8Ews8mxHJrFLGnOcBvH2C+Io1IWz7+czWrD6ORzwzOLVasdc/E84lWVD7BMXg8Z7dfWO uChcm/otAtg8MqdALiYGTFd8Wic8rIkuxLz1n8c83GEja4TupTV/qUgBzdlupCe+RXgC8D 1wwQxp4x0NucipKnPpWoAW3fbkCkYzSUaQvKxkXj6/+Mmlv84/98BL/DeN8hSgmisa6vPs HkeZH7wSZrrtdyJgLVk4W1gRQWcqTDk15te0jgFVS+R5NGqS9hKfSFJhzA5UU4hBdbXJ0g /VmEIRTSuaztTZiqLdk+0PyPBBkkbnt5rcsb8Fn8VFBsKquRAVqPJHOn7vTDtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDk8N4ccjz6YY for ; Mon, 11 May 2026 15:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3142c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 15:26:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 92f623e4a988 - main - rge: add the Intel Killer E5000 PCI ID 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: 92f623e4a98876c897669be0f1220887c996918e Auto-Submitted: auto-generated Date: Mon, 11 May 2026 15:26:12 +0000 Message-Id: <6a01f514.3142c.2ccfe8ca@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=92f623e4a98876c897669be0f1220887c996918e commit 92f623e4a98876c897669be0f1220887c996918e Author: Kyle Evans AuthorDate: 2026-05-11 15:26:03 +0000 Commit: Kyle Evans CommitDate: 2026-05-11 15:26:03 +0000 rge: add the Intel Killer E5000 PCI ID This and the E3000 are both handled by the r8169 driver in Linux, and reportedly this is infact just a straight re-brand of the RTL8126. Tested by: "Sinetek" on Discord Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D56917 --- share/man/man4/rge.4 | 4 +++- sys/dev/rge/if_rge.c | 1 + sys/dev/rge/if_rge_vendor.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/share/man/man4/rge.4 b/share/man/man4/rge.4 index 24c42f9106dc..5e338ebf9c87 100644 --- a/share/man/man4/rge.4 +++ b/share/man/man4/rge.4 @@ -3,7 +3,7 @@ .\" .\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd April 5, 2026 +.Dd May 11, 2026 .Dt RGE 4 .Os .Sh NAME @@ -137,6 +137,8 @@ RealTek RTL8126 (up to 5 Gbps) RealTek RTL8127 (up to 10 Gbps) .It Killer E3000 (up to 2.5 Gbps) +.It +Killer E5000 (up to 5 Gbps) .El .Sh SYSCTL VARIABLES The following variables are available as both diff --git a/sys/dev/rge/if_rge.c b/sys/dev/rge/if_rge.c index 8887e8d39ae4..06f034ebd61d 100644 --- a/sys/dev/rge/if_rge.c +++ b/sys/dev/rge/if_rge.c @@ -113,6 +113,7 @@ struct rge_matchid { const struct rge_matchid rge_devices[] = { { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_E3000, "Killer E3000" }, + { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_E5000, "Killer E5000" }, { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8125, "RTL8125" }, { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8126, "RTL8126", }, { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8127, "RTL8127" }, diff --git a/sys/dev/rge/if_rge_vendor.h b/sys/dev/rge/if_rge_vendor.h index eea94e39e20b..f80b99f1f8b6 100644 --- a/sys/dev/rge/if_rge_vendor.h +++ b/sys/dev/rge/if_rge_vendor.h @@ -21,6 +21,7 @@ #define PCI_VENDOR_REALTEK 0x10ec #define PCI_PRODUCT_REALTEK_E3000 0x3000 +#define PCI_PRODUCT_REALTEK_E5000 0x5000 #define PCI_PRODUCT_REALTEK_RTL8125 0x8125 #define PCI_PRODUCT_REALTEK_RTL8126 0x8126 #define PCI_PRODUCT_REALTEK_RTL8127 0x8127 From nobody Mon May 11 17:20: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 4gDmhY3BRGz6dKJj for ; Mon, 11 May 2026 17:20: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 4gDmhX52plz3H1f for ; Mon, 11 May 2026 17:20:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778520044; 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=XQ1K2gn0x9ipD3067fRPbSuU5b0a1cbVhGGkNk5ZZI8=; b=IcvtIO4qZ60UedFa2Mt2HbJ1uM0Bqu5O+miziawI1fUk5rib7fLURomKXQZ3Z9NWP4m1GV jbYqV9kRH+ApVbEcBEklZ7hEMreuBsxPebpf8eui7XV3tFvkujTjRk5j0wt7OdBenxNZl4 HLzRkyQNhhmFvQgZEET1+OxjxOwcl/sk1EZM/VP2wHP1JBZ1ogvoMluTY58PlDNWhGNZW9 B5KcCI7RV5afiMlPYLbcBR+UMJqQGeKFTU5cUVDdanf7BpY8E3Wef1XLmjqEMT/Sst1WRt CsQKJUjPthwtShV65djwdCJe+06ycKf02bPyRIpRjCHM7xZPgNFTueDVvV4BRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778520044; a=rsa-sha256; cv=none; b=rZjjCGYNKzrUDcpX8WMwJbbnytmuXKdn0HSnSsnmK+gyEaCcM++C0QIZGcqtIa8F7kgbCn fqiBt2wlAT28PsKkOMsFlsyvP/MAFmcfkVXRovp/4pImHYw6ojGVEDITQZF9VmfSivfAE1 bUoTqxEJbSa4pjs0cSHKYTowk+x6QMhSKLFXGNRj503w5q1k+Uek3j1N06lz+oRAn5UbZ+ DJuxWG0S3tH1Haz8iS9jQeI8hhVQtP/mCjzP5+/I6r6DFkeVnj+FhF8GY023lX9vBrPTVq BsjwIYdYVlFCzGpDXzLmZr9d5WubpafrPItGAvc14H6UZSWwlsFCj+hbHjp/dQ== 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=1778520044; 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=XQ1K2gn0x9ipD3067fRPbSuU5b0a1cbVhGGkNk5ZZI8=; b=MUxkMCABswvk1ov3fQ9QCq+ovBXz+JJxeqZdQUpALoP/T8EO1447qiuj4W8agO3/csJ3w+ G7IZHzgnmlGZzQxuWzu9L3LI7AuzFSEWEzk0xLbvLFpzIBmXmyPr/6s0Y58/T3QmUGZcNg hg1FRDWW307rBQOOLTafjhmG6eSvzzlKSRG9jD8CQP7d8mC1I4nGf03gmtfPPojx4uNhPx g/McEFerZ0zQ/pp8u8UOG5F/5L5f/dKxTErA/ASOb9LYBCGgsFJym82WXKUyeznQHdS8jV Zo+hVTngKZg25B9G5XQALiQc8SNyNxQuKzWGywaZk5Vucn/Omsb1cphGjE6H3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDmhX4NBgzBDK for ; Mon, 11 May 2026 17:20:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fa30 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 17:20:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 95b4436e989d - main - power: Rename sleep types 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: 95b4436e989df29f6368f13832cb13d7cbc52eac Auto-Submitted: auto-generated Date: Mon, 11 May 2026 17:20:44 +0000 Message-Id: <6a020fec.3fa30.760ea205@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=95b4436e989df29f6368f13832cb13d7cbc52eac commit 95b4436e989df29f6368f13832cb13d7cbc52eac Author: Aymeric Wibo AuthorDate: 2026-05-11 17:11:36 +0000 Commit: Aymeric Wibo CommitDate: 2026-05-11 17:11:39 +0000 power: Rename sleep types Make sleep type names clearer and more consistent, and allow space for something like "os_hibernate" once that gets added to FreeBSD. Reviewed by: jaeyoon, olce, markj Approved by: jaeyoon, olce, markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56920 --- sys/compat/linuxkpi/common/src/linux_acpi.c | 2 +- sys/dev/acpica/acpi.c | 16 ++++++++-------- sys/dev/ufshci/ufshci_private.h | 4 ++-- sys/dev/xen/control/control.c | 6 +++--- sys/kern/subr_power.c | 8 ++++---- sys/sys/power.h | 10 +++++----- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_acpi.c b/sys/compat/linuxkpi/common/src/linux_acpi.c index c7d62c745c7e..85a3afe5d01d 100644 --- a/sys/compat/linuxkpi/common/src/linux_acpi.c +++ b/sys/compat/linuxkpi/common/src/linux_acpi.c @@ -131,7 +131,7 @@ linux_handle_power_suspend_event(void *arg __unused, enum power_stype stype) linux_acpi_target_sleep_state = ACPI_STATE_S3; pm_suspend_target_state = PM_SUSPEND_TO_IDLE; break; - case POWER_STYPE_SUSPEND_TO_MEM: + case POWER_STYPE_FW_SUSPEND: linux_acpi_target_sleep_state = ACPI_STATE_S3; pm_suspend_target_state = PM_SUSPEND_MEM; break; diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index bdc197a4fb59..ec1f002150c1 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -672,12 +672,12 @@ acpi_attach(device_t dev) * s2idle when ACPI_FADT_LOW_POWER_S0 is set. */ sc->acpi_sleep_button_stype = POWER_STYPE_UNKNOWN; - for (stype = POWER_STYPE_STANDBY; stype <= POWER_STYPE_HIBERNATE; stype++) + for (stype = POWER_STYPE_STANDBY; stype <= POWER_STYPE_FW_HIBERNATE; stype++) if (acpi_supported_stypes[stype]) { sc->acpi_sleep_button_stype = stype; break; } - if (sc->acpi_sleep_button_stype == POWER_STYPE_HIBERNATE || + if (sc->acpi_sleep_button_stype == POWER_STYPE_FW_HIBERNATE || sc->acpi_sleep_button_stype == POWER_STYPE_UNKNOWN) { if (acpi_supported_stypes[POWER_STYPE_SUSPEND_TO_IDLE]) sc->acpi_sleep_button_stype = POWER_STYPE_SUSPEND_TO_IDLE; @@ -816,9 +816,9 @@ acpi_stype_to_sstate(struct acpi_softc *sc, enum power_stype stype) return (ACPI_STATE_S0); case POWER_STYPE_STANDBY: return (sc->acpi_standby_sx); - case POWER_STYPE_SUSPEND_TO_MEM: + case POWER_STYPE_FW_SUSPEND: return (ACPI_STATE_S3); - case POWER_STYPE_HIBERNATE: + case POWER_STYPE_FW_HIBERNATE: return (ACPI_STATE_S4); case POWER_STYPE_POWEROFF: return (ACPI_STATE_S5); @@ -851,9 +851,9 @@ acpi_sstate_to_stype(int sstate) case ACPI_STATE_S2: return (POWER_STYPE_STANDBY); case ACPI_STATE_S3: - return (POWER_STYPE_SUSPEND_TO_MEM); + return (POWER_STYPE_FW_SUSPEND); case ACPI_STATE_S4: - return (POWER_STYPE_HIBERNATE); + return (POWER_STYPE_FW_HIBERNATE); case ACPI_STATE_S5: return (POWER_STYPE_POWEROFF); } @@ -3723,8 +3723,8 @@ acpi_EnterSleepState(struct acpi_softc *sc, enum power_stype stype) case POWER_STYPE_STANDBY: do_standby(sc, &slp_state, intr); break; - case POWER_STYPE_SUSPEND_TO_MEM: - case POWER_STYPE_HIBERNATE: + case POWER_STYPE_FW_SUSPEND: + case POWER_STYPE_FW_HIBERNATE: do_sleep(sc, &slp_state, intr, acpi_sstate); break; case POWER_STYPE_SUSPEND_TO_IDLE: diff --git a/sys/dev/ufshci/ufshci_private.h b/sys/dev/ufshci/ufshci_private.h index 067b51a419e8..8d18fab982d7 100644 --- a/sys/dev/ufshci/ufshci_private.h +++ b/sys/dev/ufshci/ufshci_private.h @@ -262,11 +262,11 @@ static const struct ufshci_power_entry power_map[POWER_STYPE_COUNT] = { UFSHCI_UIC_LINK_STATE_ACTIVE }, [POWER_STYPE_STANDBY] = { UFSHCI_DEV_PWR_SLEEP, SSS_PC_IDLE, UFSHCI_UIC_LINK_STATE_HIBERNATE }, - [POWER_STYPE_SUSPEND_TO_MEM] = { UFSHCI_DEV_PWR_POWERDOWN, + [POWER_STYPE_FW_SUSPEND] = { UFSHCI_DEV_PWR_POWERDOWN, SSS_PC_STANDBY, UFSHCI_UIC_LINK_STATE_HIBERNATE }, [POWER_STYPE_SUSPEND_TO_IDLE] = { UFSHCI_DEV_PWR_SLEEP, SSS_PC_IDLE, UFSHCI_UIC_LINK_STATE_HIBERNATE }, - [POWER_STYPE_HIBERNATE] = { UFSHCI_DEV_PWR_DEEPSLEEP, 0x40, + [POWER_STYPE_FW_HIBERNATE] = { UFSHCI_DEV_PWR_DEEPSLEEP, 0x40, UFSHCI_UIC_LINK_STATE_OFF }, [POWER_STYPE_POWEROFF] = { UFSHCI_DEV_PWR_POWERDOWN, SSS_PC_STANDBY, UFSHCI_UIC_LINK_STATE_OFF }, diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c index 2c61b48c0451..e363ea1700f6 100644 --- a/sys/dev/xen/control/control.c +++ b/sys/dev/xen/control/control.c @@ -176,12 +176,12 @@ xctrl_suspend(void) cpuset_t cpu_suspend_map; #endif - EVENTHANDLER_INVOKE(power_suspend_early, POWER_STYPE_SUSPEND_TO_MEM); + EVENTHANDLER_INVOKE(power_suspend_early, POWER_STYPE_FW_SUSPEND); xs_lock(); stop_all_proc(); xs_unlock(); suspend_all_fs(); - EVENTHANDLER_INVOKE(power_suspend, POWER_STYPE_SUSPEND_TO_MEM); + EVENTHANDLER_INVOKE(power_suspend, POWER_STYPE_FW_SUSPEND); #ifdef EARLY_AP_STARTUP MPASS(mp_ncpus == 1 || smp_started); @@ -298,7 +298,7 @@ xctrl_suspend(void) resume_all_fs(); resume_all_proc(); - EVENTHANDLER_INVOKE(power_resume, POWER_STYPE_SUSPEND_TO_MEM); + EVENTHANDLER_INVOKE(power_resume, POWER_STYPE_FW_SUSPEND); if (bootverbose) printf("System resumed after suspension\n"); diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c index 13448cfa4d1e..761c9c0639ce 100644 --- a/sys/kern/subr_power.c +++ b/sys/kern/subr_power.c @@ -153,12 +153,12 @@ power_pm_register(u_int pm_type, power_pm_fn_t pm_fn, void *pm_arg, sizeof(power_pm_supported)); if (power_pm_supported[POWER_STYPE_STANDBY]) power_standby_stype = POWER_STYPE_STANDBY; - if (power_pm_supported[POWER_STYPE_SUSPEND_TO_MEM]) - power_suspend_stype = POWER_STYPE_SUSPEND_TO_MEM; + if (power_pm_supported[POWER_STYPE_FW_SUSPEND]) + power_suspend_stype = POWER_STYPE_FW_SUSPEND; else if (power_pm_supported[POWER_STYPE_SUSPEND_TO_IDLE]) power_suspend_stype = POWER_STYPE_SUSPEND_TO_IDLE; - if (power_pm_supported[POWER_STYPE_HIBERNATE]) - power_hibernate_stype = POWER_STYPE_HIBERNATE; + if (power_pm_supported[POWER_STYPE_FW_HIBERNATE]) + power_hibernate_stype = POWER_STYPE_FW_HIBERNATE; error = 0; TASK_INIT(&power_pm_task, 0, power_pm_deferred_fn, NULL); } else { diff --git a/sys/sys/power.h b/sys/sys/power.h index d34af0ddb86a..85e0b12391ff 100644 --- a/sys/sys/power.h +++ b/sys/sys/power.h @@ -67,9 +67,9 @@ enum power_sstate_transition { enum power_stype { POWER_STYPE_AWAKE, POWER_STYPE_STANDBY, - POWER_STYPE_SUSPEND_TO_MEM, + POWER_STYPE_FW_SUSPEND, POWER_STYPE_SUSPEND_TO_IDLE, - POWER_STYPE_HIBERNATE, + POWER_STYPE_FW_HIBERNATE, POWER_STYPE_POWEROFF, POWER_STYPE_COUNT, POWER_STYPE_UNKNOWN, @@ -78,9 +78,9 @@ enum power_stype { static const char * const power_stype_names[POWER_STYPE_COUNT] = { [POWER_STYPE_AWAKE] = "awake", [POWER_STYPE_STANDBY] = "standby", - [POWER_STYPE_SUSPEND_TO_MEM] = "s2mem", - [POWER_STYPE_SUSPEND_TO_IDLE] = "s2idle", - [POWER_STYPE_HIBERNATE] = "hibernate", + [POWER_STYPE_FW_SUSPEND] = "fw_suspend", + [POWER_STYPE_SUSPEND_TO_IDLE] = "suspend_to_idle", + [POWER_STYPE_FW_HIBERNATE] = "fw_hibernate", [POWER_STYPE_POWEROFF] = "poweroff", }; From nobody Mon May 11 22:21: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 4gDvMM3Yr0z6cClP for ; Mon, 11 May 2026 22:21: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 4gDvMM12J7z43Jt for ; Mon, 11 May 2026 22:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778538079; 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=2R8++xx9ARzWiQE91340RTQySl20t34yUIAv/lkZgrQ=; b=u20qqWZ3uRj/uuDnRjCv8yLKIEECpwIENEM1m6jtqh2sDWNpwfyzvcPXPp8IWXh1SihkKu NNnG+1wZoj3THW5qJ0M1IzzfZrdocSKbjk30DFnTrRyEzFF3B38LWdQaE1vRLXQgpPN6LJ /yKb9Jrb3QN7XvjSCr8lcsHGGz5Lx754RTjioVn0MnM61dNUMSqZmyJrrxXwWVpxMLOUKi qo0Bp+RfL2u0MBLsZSXqxTdUHDOpzp4skK9Mkdd3Lyp9A9J0ByluOyJup1mI+24RCRN4yq DQaVN+P1Bk+isvbSZyT7u4/7XsjmSO2wpi3KLqsXowROWZsealcWsHcaJxO1QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778538079; a=rsa-sha256; cv=none; b=ntGBLJm1pHG0yD2inEOpR+yqtiShrkKWHtcKZ47tpH5E5+Ucs5KTWP5xVv6W6fF6AuB1rU YWJIuG3lLv5fT6TppgxyLIHOklBGyfsKiQX6mHUEsFky9xxH0C5w1vICBaU8+MCNQcPiZv q/cN4z9Y5Ocn1gVXKliS6ObOauCWFFrSRVJaP9NlybM+3MEaP4Bf8Hf8xTPvW01F6WkbGP m72czPgzFwc7Chu5TwaG3mltK8KzEteZihYpJpEVQrpTK0J9yOetT0Kh6PfL3IMP+3WBjs HSYImeyxqrjET0X+WY+S7wTwYG2ZLxrFFzhtgMosR3dEc18OTgZl5CM8ALa6BQ== 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=1778538079; 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=2R8++xx9ARzWiQE91340RTQySl20t34yUIAv/lkZgrQ=; b=c3mx2goZnD9HYwmuYkTXKjDbTlhtWJmBIXoT8jpVba8cLcC+TcbCc3kwmuV/T2LyzCB93p 0sqVm5rcN+4+ZeLwIp6W4Q7dAslNAmQq84bo0tpBSRPMHjorlN3ZD0Y0m5oLiGnkXTpFHk Lbd00j4Fn9OQhtFsG58QWlKgF9FLiL6dHYj5Q/cXD1X1F31l/x6ANnnw/Ozu+6ogiz/AZC PHROOJDrrJE9eH02NTuCO4LZCz+uovFsUm3jTpM5eUFG5VyY1XeKhojMH520vX8O/tg0bI AEX5N4xe86OFurA+IS8M9Hby+uf4ukHz3xtAB+Om6C2E3mA46u85eMgTa1kivw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDvMM08nzzcGM for ; Mon, 11 May 2026 22:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 341f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 22:21:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Tuffli Subject: git: 7419d6e463fe - main - Add 'contrib/smart/' from commit 'eb3b1302382b1d0cbe37eeebabfcdd546aa2fc4e' 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: chuck X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7419d6e463fee40f0f52cd5bc46a93cbb7ac6114 Auto-Submitted: auto-generated Date: Mon, 11 May 2026 22:21:18 +0000 Message-Id: <6a02565e.341f8.64b91f9e@gitrepo.freebsd.org> The branch main has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=7419d6e463fee40f0f52cd5bc46a93cbb7ac6114 commit 7419d6e463fee40f0f52cd5bc46a93cbb7ac6114 Merge: 95b4436e989d eb3b1302382b Author: Chuck Tuffli AuthorDate: 2026-05-11 21:50:04 +0000 Commit: Chuck Tuffli CommitDate: 2026-05-11 21:50:04 +0000 Add 'contrib/smart/' from commit 'eb3b1302382b1d0cbe37eeebabfcdd546aa2fc4e' git-subtree-dir: contrib/smart git-subtree-mainline: 95b4436e989df29f6368f13832cb13d7cbc52eac git-subtree-split: eb3b1302382b1d0cbe37eeebabfcdd546aa2fc4e contrib/smart/Changelog | 37 ++ contrib/smart/LICENSE | 13 + contrib/smart/Makefile | 26 + contrib/smart/README.md | 62 ++ contrib/smart/freebsd_dev.c | 828 +++++++++++++++++++++++++ contrib/smart/libsmart.c | 1359 +++++++++++++++++++++++++++++++++++++++++ contrib/smart/libsmart.h | 174 ++++++ contrib/smart/libsmart_desc.c | 158 +++++ contrib/smart/libsmart_dev.h | 60 ++ contrib/smart/libsmart_priv.h | 83 +++ contrib/smart/smart.8 | 245 ++++++++ contrib/smart/smart.c | 334 ++++++++++ 12 files changed, 3379 insertions(+) diff --cc contrib/smart/Changelog index 000000000000,42b79bc34070..42b79bc34070 mode 000000,100644..100644 --- a/contrib/smart/Changelog +++ b/contrib/smart/Changelog diff --cc contrib/smart/LICENSE index 000000000000,8b0a0bf6a4a6..8b0a0bf6a4a6 mode 000000,100644..100644 --- a/contrib/smart/LICENSE +++ b/contrib/smart/LICENSE diff --cc contrib/smart/Makefile index 000000000000,000000000000..64cab720e08f new file mode 100644 --- /dev/null +++ b/contrib/smart/Makefile @@@ -1,0 -1,0 +1,26 @@@ ++# ++# Copyright (c) 2016-2021 Chuck Tuffli ++# ++# Permission to use, copy, modify, and distribute this software for any ++# purpose with or without fee is hereby granted, provided that the above ++# copyright notice and this permission notice appear in all copies. ++# ++# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ++# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++# ++PROG= smart ++SRCS= smart.c libsmart.c libsmart_desc.c ++SRCS+= freebsd_dev.c ++LIBADD= cam xo ++MAN=smart.8 ++MLINKS= smart.8 diskhealth.8 ++#CFLAGS+= -ggdb -O0 ++CFLAGS+= -DLIBXO ++LINKS= ${BINDIR}/smart ${BINDIR}/diskhealth ++ ++.include diff --cc contrib/smart/README.md index 000000000000,000000000000..57fc685a9ef8 new file mode 100644 --- /dev/null +++ b/contrib/smart/README.md @@@ -1,0 -1,0 +1,62 @@@ ++# README # ++ ++### What is this repository for? ### ++ ++* Application to output the SMART values of disks ++ ++### How do I get set up? ### ++ ++Clone this repository onto a FreeBSD box and run make ++ ++ $ git clone https://github.com/ctuffli/smart ++ $ cd smart && make ++ ++or install it from ports ( http://www.freshports.org/sysutils/smart/ ) ++ ++### How to use ++ Usage: smart [-htxi] [-a attribute[,attribute]...] ++ -h, --help ++ -t, --threshold : also print out the threshold values ++ -x, --hex : print the values out in hexadecimal ++ -a, --attribute : print a specific attribute(s) ++ -i, --info : print general device information ++ -d, --decode: decode the attribute IDs ++ -D, --no-decode: don't decode the attribute IDs ++ -v, --version : print the version and copyright ++ ++### Example ++* List the raw attributes of SATA device /dev/ada0 ++ ++ smart ada0 ++ ++* List the decoded attributes of NVMe device /dev/nda0 ++ ++ smart -d nda0 ++ ++ or ++ ++ diskhealth nda0 ++ ++### What does the raw output mean? ++The format and location of SMART / health data varies across protocols. ++To simplify the output, the application uses a Dumb Unified Model of ++SMART Buffers. In this model, SMART data is located in one or more log ++pages. Each page contains one or more values ("attributes") ++differentiated by an ID. Note that ID's are only unique within a log ++page. Thus, the application outputs: ++ ++ ++for each selected attribute. Threshold values, if defined by the protocol ++and selected by the user, are printed after the attribute value. ++ ++See the shell scripts `atasmart`, `nvmesmart`, and `scsismart` for examples of parsing the output. ++ ++### What is the decoded output? ++Decoded output converts numeric values (Log Page, Attribute ID and Value tuples) into human-readable descriptions. ++ ++The output for protocols like NVMe and SCSI which provide standardized descriptions will match the text in the specification. ATA, however, allows vendors to define their own attributes. For ATA, descriptions come from the "SMART Attribute Descriptions (SAD)" (ANSI - INCITS TR-54) specification which documents attributes common to multiple ATA drive vendors. ++ ++### Protocol Specific Notes ++* __ATA__ : The attribute and values follow the 'standard'. The log page is the Feature value used in ATA command. Thus, the default page is 208 / 0xd0 (a.k.a SMART Read Data). The threshold values printed are status flags, current value, and worst value. The SMART Return Status (Feature 218 / 0xda) indicates the reliability status of the device and is sometimes used as a top-level SMART health indication. While this command does not return data, the application encodes "no errors" as 0x0 and "threshold exceeded" as 0x1 in attribute 0. ++* __NVMe__ : The Log Page is the SMART / Health Information LID value in the Get Log Page command (i.e. 0x2). The attribute ID is the byte offset within this page. ++* __SCSI__ : The Log Page ID is the Page Code value in the Mode Sense command. The attribute ID is the parameter code defined by this page (e.g. 0 in the Write Error Counters log page is 'Errors corrected without substantial delay'). The values will depend on the Page Codes supported by a drive. diff --cc contrib/smart/freebsd_dev.c index 000000000000,d1dda2289742..d1dda2289742 mode 000000,100644..100644 --- a/contrib/smart/freebsd_dev.c +++ b/contrib/smart/freebsd_dev.c diff --cc contrib/smart/libsmart.c index 000000000000,a1732de09ed9..a1732de09ed9 mode 000000,100644..100644 --- a/contrib/smart/libsmart.c +++ b/contrib/smart/libsmart.c diff --cc contrib/smart/libsmart.h index 000000000000,60346f3b3a70..60346f3b3a70 mode 000000,100644..100644 --- a/contrib/smart/libsmart.h +++ b/contrib/smart/libsmart.h diff --cc contrib/smart/libsmart_desc.c index 000000000000,bcfb31d66922..bcfb31d66922 mode 000000,100644..100644 --- a/contrib/smart/libsmart_desc.c +++ b/contrib/smart/libsmart_desc.c diff --cc contrib/smart/libsmart_dev.h index 000000000000,bbf028e73712..bbf028e73712 mode 000000,100644..100644 --- a/contrib/smart/libsmart_dev.h +++ b/contrib/smart/libsmart_dev.h diff --cc contrib/smart/libsmart_priv.h index 000000000000,f29fc1e1e033..f29fc1e1e033 mode 000000,100644..100644 --- a/contrib/smart/libsmart_priv.h +++ b/contrib/smart/libsmart_priv.h diff --cc contrib/smart/smart.8 index 000000000000,3215ff890001..3215ff890001 mode 000000,100644..100644 --- a/contrib/smart/smart.8 +++ b/contrib/smart/smart.8 diff --cc contrib/smart/smart.c index 000000000000,8b543fea1819..8b543fea1819 mode 000000,100644..100644 --- a/contrib/smart/smart.c +++ b/contrib/smart/smart.c From nobody Mon May 11 22:21: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 4gDvMN32vXz6cDSk for ; Mon, 11 May 2026 22:21: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 4gDvMN1LSQz433l for ; Mon, 11 May 2026 22:21:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778538080; 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=v26/90V/XN9PbYMnBSaKbS/+A44P/YkZb9f3o8Q0NQM=; b=R2rG/qbItyvpVDSYM/KRxerHlS6iWcWiToufrsAxqG68yno3F0nf0X6Bvmy/VrlMOYyfVv qOWiMsIb6brHQJ9bUyN7O8Ja5gmHTKR5X484bwfDqg2Emcp1aY+VDLsNijbXQaFrypzCTm F9cIunVON8UFyJwaB87EAN+eZK6fIXP5Dq0Egwu/COd1EewjWLe0BRKEYxRpsKsZ38H7Hg 1O+XX7r2KvxGbdLWCpRObbHXUm+sE4g3fLq6xTp+vTEEWTbw/oqaSmIfgvDOPbSt1Ys+Wj ornp+pflVJ1ExBqxVihbho6OVzpC+XCq6//PG5xlSbsBec1jzM4A3FXvzpP7fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778538080; a=rsa-sha256; cv=none; b=yVOh/65iN7HDNeGckhNqD/IBvXNVMu0z7dYEvGr52gCP7/jZA7rhABWnjbNPmUm0rpjAKp 2e7pwHwq7OVzSdOadi+UNbUiFi3tC3Dl0zjUX7qyVJpxfiaUmIj1qeMOgjVGMjRuxpI6eP Cal33jLP7Aglv4YJlqdv2SgbCdbLweGc2b45tHCnWk0bwHUkIF2551Mu6ZFwlGqcdq9k6q YS3wDBeGZ/zj7aoP4uCqe+q65XLpLYBaD3gXgmv+AxGk7Lko2192FsC6HLJvCmCe6AmDXx A84tQm88BifIArsMua8Z6i6ybY/TxgPBiK8nisQy6VVxDDmXBXP1XtXhUFCpMg== 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=1778538080; 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=v26/90V/XN9PbYMnBSaKbS/+A44P/YkZb9f3o8Q0NQM=; b=Rq6GbpY0LIWK51SBpbe/Z6rbZzGhtvRQOtr08qOJO7M5USsB5ymlQk8HMVpc0hYYKRFLeK gLBKFhltKAlXcjdiR+HduvLsPZajh6SuOTVbleWyexnqvrn69vTfTM3DPSuwN1hpwU9fsm +JMoQs9kQMApeARPzpQ995tNdDRLp7XHwBeQs8pPICLRQbmezKQLuKHuT6ki21dxgh/xBO iukYEWPtT3OCxwYBSHmimt5vplgvRfMfDsyx7la7JDYRqdXcUmciyKRF/2KT9NI7HQ6ShF 0MnQTAwzLmwvgAXmagjBHdTghL61C2h6z3PqVjqY9GFBJssIfVT8Q5h/KRseyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDvMN0xh0zcGP for ; Mon, 11 May 2026 22:21:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37fa7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 22:21:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Tuffli Subject: git: 25942dddc8a8 - main - smart: Connect contrib/smart to 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: chuck X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25942dddc8a81a338d4615db99b8e7cbb8550449 Auto-Submitted: auto-generated Date: Mon, 11 May 2026 22:21:20 +0000 Message-Id: <6a025660.37fa7.6a3f7fc0@gitrepo.freebsd.org> The branch main has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=25942dddc8a81a338d4615db99b8e7cbb8550449 commit 25942dddc8a81a338d4615db99b8e7cbb8550449 Author: Chuck Tuffli AuthorDate: 2026-04-28 16:55:50 +0000 Commit: Chuck Tuffli CommitDate: 2026-05-11 22:18:52 +0000 smart: Connect contrib/smart to build Reviewed by: fuz, jrm Relnotes: yes Differential Revision: https://reviews.freebsd.org/D56638 --- packages/Makefile | 1 + packages/smart/Makefile | 4 ++++ packages/smart/smart.ucl | 30 ++++++++++++++++++++++++++++++ usr.sbin/Makefile | 1 + usr.sbin/smart/Makefile | 8 ++++++++ 5 files changed, 44 insertions(+) diff --git a/packages/Makefile b/packages/Makefile index 79bdab9f1abd..71a49d6d06ea 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -66,6 +66,7 @@ SUBDIR= blocklist \ resolvconf \ rip \ runtime \ + smart \ smbutils \ syslogd \ tcpd \ diff --git a/packages/smart/Makefile b/packages/smart/Makefile new file mode 100644 index 000000000000..2cc04493da57 --- /dev/null +++ b/packages/smart/Makefile @@ -0,0 +1,4 @@ +WORLDPACKAGE= smart + +.include + diff --git a/packages/smart/smart.ucl b/packages/smart/smart.ucl new file mode 100644 index 000000000000..e861f61a08ab --- /dev/null +++ b/packages/smart/smart.ucl @@ -0,0 +1,30 @@ +/* + * SPDX-License-Identifier: ISC + * + * Copyright (c) 2026 Chuck Tuffli + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +comment = "SMART monitoring" + +desc = < + +SMARTDIR=${SRCTOP}/contrib/smart +.PATH: ${SMARTDIR} + +PACKAGE= smart + +.include "${SMARTDIR}/Makefile" From nobody Mon May 11 23:31: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 4gDwvr1srcz6cKSF for ; Mon, 11 May 2026 23:31: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 4gDwvr1PvSz49X2 for ; Mon, 11 May 2026 23:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778542264; 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=vZo0YhTY6jrb28ocS/F8d+NVPQin5FcoOvvzSy8Q+pQ=; b=wp64qXE+0rtVbvDcTd/JZZmWTg9FiBRtNKtK88HykI7tWke2aHbeiziRImYFV4EdwdI7GY XmpPV7wEKJCUDihwMGe5LNZOrpkVblWDlkYzv1pBo+KuAmUwA6DtGKdfsOT1mPN7cbzTvO KBUQaB/9orEcuSHLFcbCz8CsxYLjJrUkHZfQ2hjfyimuJnh9tA05tqpZ53KEnb7+QgVd06 SUpMeKL3SMtXw7TXNcMOICa7Bc7Bb1mypz5F9b3/g/IDhIa8Ho2zV3aGpEdvyPTV3Bnhp2 FOcp+23Oap8Tb+FJB514hVmjVZTlRkhiA/F30hizBJYQU/BtAV2K5zXtAFhqOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778542264; a=rsa-sha256; cv=none; b=RwUTvmkLW4nO6LFk+jky8k7MP14g7MTUr2QlbchE6Mh0tsapSewtFfYJq+7FqBZHTIxcNG XKYFif/VtEqIv8hXGQDPb0xVBBHjXmqJ7j0rMmSjVblJUDLyJv67Ah0MMhIAGNVizryIPw ZjrxOfBnwAQrdyURfeYekffN5dmYysGlqUPJjVZb0KSjKZVnKjwQOSszGmoD/FaH2cYO9O hZTcWezTDWdSoj1DlLCbcl2agMiGv7azk08oSc5FLqTrQCjH6T7HzdALqqzsO3FEqIn7fC eFIiYutVqFuL8rfo9lt1nTQxBOxlQtYlmNBdAX8A+1B9kcBt1IzZwKWcJvZO8Q== 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=1778542264; 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=vZo0YhTY6jrb28ocS/F8d+NVPQin5FcoOvvzSy8Q+pQ=; b=igi9b1r3pVYThZueXhDRJCjZ8xI6JyjT4+gwd53uLS8Vuu5wd5MAgAxLpZkrlp2GEubQcL seOHkwyWgYqbxiR7FWHViunDIa0QOeMHj4/phQQ/Q9rgzjsbM6t3iV4YLYBoD00EtB7jrE xEeVfCmxfCikLeBb3U750IFhKxWEIoh0dbRdLpHjHnaai7LBpbcYRpb5mFl17x5CivlJhL ZAGi1cgsLC0Ia6K0QviCkFqO3e4vfc/NFhHeZsbeLK2ncqJ0PNourg+HeS36dVS3A2rQ4S akoSxgLOHzqUhXHLkH4pV5NHEr8ynfHxFcFaC6Ql/RiDcbZ80FLT4+o5vN2BSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDwvr0zwLzfbc for ; Mon, 11 May 2026 23:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e53b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 11 May 2026 23:31:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jung-uk Kim Subject: git: 7697e6c4df71 - main - acpica: Merge ACPICA 20260408 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: jkim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7697e6c4df7188ee3a2aa66f73c572c27479bdf2 Auto-Submitted: auto-generated Date: Mon, 11 May 2026 23:31:03 +0000 Message-Id: <6a0266b7.3e53b.16dacd8f@gitrepo.freebsd.org> The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=7697e6c4df7188ee3a2aa66f73c572c27479bdf2 commit 7697e6c4df7188ee3a2aa66f73c572c27479bdf2 Merge: 25942dddc8a8 69ae37302ee9 Author: Jung-uk Kim AuthorDate: 2026-05-11 23:29:58 +0000 Commit: Jung-uk Kim CommitDate: 2026-05-11 23:29:58 +0000 acpica: Merge ACPICA 20260408 Merge commit '69ae37302ee98839857791a261546e19d078cdb8' sys/contrib/dev/acpica/changes.txt | 24 ++ sys/contrib/dev/acpica/common/acfileio.c | 11 +- sys/contrib/dev/acpica/common/acgetline.c | 2 +- sys/contrib/dev/acpica/common/adfile.c | 2 +- sys/contrib/dev/acpica/common/adisasm.c | 2 +- sys/contrib/dev/acpica/common/adwalk.c | 2 +- sys/contrib/dev/acpica/common/ahids.c | 10 +- sys/contrib/dev/acpica/common/ahpredef.c | 2 +- sys/contrib/dev/acpica/common/ahtable.c | 3 +- sys/contrib/dev/acpica/common/ahuuids.c | 7 +- sys/contrib/dev/acpica/common/cmfsize.c | 2 +- sys/contrib/dev/acpica/common/dmextern.c | 2 +- sys/contrib/dev/acpica/common/dmrestag.c | 2 +- sys/contrib/dev/acpica/common/dmswitch.c | 2 +- sys/contrib/dev/acpica/common/dmtable.c | 7 +- sys/contrib/dev/acpica/common/dmtables.c | 2 +- sys/contrib/dev/acpica/common/dmtbdump.c | 2 +- sys/contrib/dev/acpica/common/dmtbdump1.c | 111 +++++++- sys/contrib/dev/acpica/common/dmtbdump2.c | 2 +- sys/contrib/dev/acpica/common/dmtbdump3.c | 2 +- sys/contrib/dev/acpica/common/dmtbinfo.c | 2 +- sys/contrib/dev/acpica/common/dmtbinfo1.c | 40 ++- sys/contrib/dev/acpica/common/dmtbinfo2.c | 4 +- sys/contrib/dev/acpica/common/dmtbinfo3.c | 2 +- sys/contrib/dev/acpica/common/getopt.c | 2 +- sys/contrib/dev/acpica/compiler/aslallocate.c | 2 +- sys/contrib/dev/acpica/compiler/aslanalyze.c | 2 +- sys/contrib/dev/acpica/compiler/aslascii.c | 2 +- sys/contrib/dev/acpica/compiler/aslbtypes.c | 2 +- sys/contrib/dev/acpica/compiler/aslcache.c | 2 +- sys/contrib/dev/acpica/compiler/aslcodegen.c | 12 +- sys/contrib/dev/acpica/compiler/aslcompile.c | 2 +- sys/contrib/dev/acpica/compiler/aslcompiler.h | 2 +- sys/contrib/dev/acpica/compiler/aslcompiler.l | 2 +- sys/contrib/dev/acpica/compiler/aslcstyle.y | 2 +- sys/contrib/dev/acpica/compiler/asldebug.c | 2 +- sys/contrib/dev/acpica/compiler/asldefine.h | 2 +- sys/contrib/dev/acpica/compiler/aslerror.c | 2 +- sys/contrib/dev/acpica/compiler/aslexternal.c | 105 +++++++- sys/contrib/dev/acpica/compiler/aslfileio.c | 2 +- sys/contrib/dev/acpica/compiler/aslfiles.c | 2 +- sys/contrib/dev/acpica/compiler/aslfold.c | 2 +- sys/contrib/dev/acpica/compiler/aslglobal.h | 3 +- sys/contrib/dev/acpica/compiler/aslhelp.c | 2 +- sys/contrib/dev/acpica/compiler/aslhelpers.y | 2 +- sys/contrib/dev/acpica/compiler/aslhex.c | 2 +- sys/contrib/dev/acpica/compiler/aslkeywords.y | 2 +- sys/contrib/dev/acpica/compiler/asllength.c | 2 +- sys/contrib/dev/acpica/compiler/asllisting.c | 2 +- sys/contrib/dev/acpica/compiler/asllistsup.c | 2 +- sys/contrib/dev/acpica/compiler/aslload.c | 4 +- sys/contrib/dev/acpica/compiler/asllookup.c | 2 +- sys/contrib/dev/acpica/compiler/aslmain.c | 2 +- sys/contrib/dev/acpica/compiler/aslmap.c | 4 +- sys/contrib/dev/acpica/compiler/aslmapenter.c | 2 +- sys/contrib/dev/acpica/compiler/aslmapoutput.c | 2 +- sys/contrib/dev/acpica/compiler/aslmaputils.c | 2 +- sys/contrib/dev/acpica/compiler/aslmessages.c | 5 +- sys/contrib/dev/acpica/compiler/aslmessages.h | 3 +- sys/contrib/dev/acpica/compiler/aslmethod.c | 2 +- sys/contrib/dev/acpica/compiler/aslnamesp.c | 2 +- sys/contrib/dev/acpica/compiler/asloffset.c | 2 +- sys/contrib/dev/acpica/compiler/aslopcodes.c | 10 +- sys/contrib/dev/acpica/compiler/asloperands.c | 32 ++- sys/contrib/dev/acpica/compiler/aslopt.c | 2 +- sys/contrib/dev/acpica/compiler/asloptions.c | 2 +- sys/contrib/dev/acpica/compiler/aslparseop.c | 2 +- sys/contrib/dev/acpica/compiler/aslparser.y | 2 +- sys/contrib/dev/acpica/compiler/aslpld.c | 2 +- sys/contrib/dev/acpica/compiler/aslpredef.c | 2 +- sys/contrib/dev/acpica/compiler/aslprepkg.c | 2 +- sys/contrib/dev/acpica/compiler/aslprimaries.y | 2 +- sys/contrib/dev/acpica/compiler/aslprintf.c | 2 +- sys/contrib/dev/acpica/compiler/aslprune.c | 2 +- sys/contrib/dev/acpica/compiler/aslresource.c | 2 +- sys/contrib/dev/acpica/compiler/aslresources.y | 2 +- sys/contrib/dev/acpica/compiler/aslrestype1.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype1i.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2d.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2e.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2q.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2s.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2w.c | 2 +- sys/contrib/dev/acpica/compiler/aslrules.y | 2 +- sys/contrib/dev/acpica/compiler/aslstartup.c | 2 +- sys/contrib/dev/acpica/compiler/aslstubs.c | 2 +- sys/contrib/dev/acpica/compiler/aslsupport.l | 2 +- sys/contrib/dev/acpica/compiler/aslsupport.y | 2 +- sys/contrib/dev/acpica/compiler/asltokens.y | 2 +- sys/contrib/dev/acpica/compiler/asltransform.c | 2 +- sys/contrib/dev/acpica/compiler/asltree.c | 2 +- sys/contrib/dev/acpica/compiler/asltypes.h | 2 +- sys/contrib/dev/acpica/compiler/asltypes.y | 2 +- sys/contrib/dev/acpica/compiler/aslutils.c | 2 +- sys/contrib/dev/acpica/compiler/asluuid.c | 2 +- sys/contrib/dev/acpica/compiler/aslwalks.c | 17 +- sys/contrib/dev/acpica/compiler/aslxref.c | 14 +- sys/contrib/dev/acpica/compiler/aslxrefout.c | 2 +- sys/contrib/dev/acpica/compiler/cvcompiler.c | 2 +- sys/contrib/dev/acpica/compiler/cvdisasm.c | 2 +- sys/contrib/dev/acpica/compiler/cvparser.c | 2 +- sys/contrib/dev/acpica/compiler/dtcompile.c | 28 +- sys/contrib/dev/acpica/compiler/dtcompiler.h | 7 +- sys/contrib/dev/acpica/compiler/dtcompilerparser.l | 2 +- sys/contrib/dev/acpica/compiler/dtcompilerparser.y | 2 +- sys/contrib/dev/acpica/compiler/dtexpress.c | 2 +- sys/contrib/dev/acpica/compiler/dtfield.c | 2 +- sys/contrib/dev/acpica/compiler/dtio.c | 8 +- sys/contrib/dev/acpica/compiler/dtparser.l | 2 +- sys/contrib/dev/acpica/compiler/dtparser.y | 2 +- sys/contrib/dev/acpica/compiler/dtsubtable.c | 9 +- sys/contrib/dev/acpica/compiler/dttable.c | 2 +- sys/contrib/dev/acpica/compiler/dttable1.c | 133 +++++++++- sys/contrib/dev/acpica/compiler/dttable2.c | 17 +- sys/contrib/dev/acpica/compiler/dttemplate.c | 2 +- sys/contrib/dev/acpica/compiler/dttemplate.h | 57 +++- sys/contrib/dev/acpica/compiler/dtutils.c | 2 +- sys/contrib/dev/acpica/compiler/preprocess.h | 2 +- sys/contrib/dev/acpica/compiler/prexpress.c | 2 +- sys/contrib/dev/acpica/compiler/prmacros.c | 2 +- sys/contrib/dev/acpica/compiler/prparser.l | 2 +- sys/contrib/dev/acpica/compiler/prparser.y | 2 +- sys/contrib/dev/acpica/compiler/prscan.c | 2 +- sys/contrib/dev/acpica/compiler/prutils.c | 2 +- .../dev/acpica/components/debugger/dbcmds.c | 2 +- .../dev/acpica/components/debugger/dbconvert.c | 2 +- .../dev/acpica/components/debugger/dbdisply.c | 2 +- .../dev/acpica/components/debugger/dbexec.c | 2 +- .../dev/acpica/components/debugger/dbfileio.c | 2 +- .../dev/acpica/components/debugger/dbhistry.c | 2 +- .../dev/acpica/components/debugger/dbinput.c | 2 +- .../dev/acpica/components/debugger/dbmethod.c | 2 +- .../dev/acpica/components/debugger/dbnames.c | 2 +- .../dev/acpica/components/debugger/dbobject.c | 2 +- .../dev/acpica/components/debugger/dbstats.c | 2 +- .../dev/acpica/components/debugger/dbtest.c | 2 +- .../dev/acpica/components/debugger/dbutils.c | 2 +- .../dev/acpica/components/debugger/dbxface.c | 2 +- .../dev/acpica/components/disassembler/dmbuffer.c | 2 +- .../dev/acpica/components/disassembler/dmcstyle.c | 2 +- .../acpica/components/disassembler/dmdeferred.c | 2 +- .../dev/acpica/components/disassembler/dmnames.c | 2 +- .../dev/acpica/components/disassembler/dmopcode.c | 19 +- .../dev/acpica/components/disassembler/dmresrc.c | 23 +- .../dev/acpica/components/disassembler/dmresrcl.c | 2 +- .../dev/acpica/components/disassembler/dmresrcl2.c | 2 +- .../dev/acpica/components/disassembler/dmresrcs.c | 2 +- .../dev/acpica/components/disassembler/dmutils.c | 2 +- .../dev/acpica/components/disassembler/dmwalk.c | 16 +- .../dev/acpica/components/dispatcher/dsargs.c | 2 +- .../dev/acpica/components/dispatcher/dscontrol.c | 2 +- .../dev/acpica/components/dispatcher/dsdebug.c | 2 +- .../dev/acpica/components/dispatcher/dsfield.c | 2 +- .../dev/acpica/components/dispatcher/dsinit.c | 2 +- .../dev/acpica/components/dispatcher/dsmethod.c | 43 ++- .../dev/acpica/components/dispatcher/dsmthdat.c | 2 +- .../dev/acpica/components/dispatcher/dsobject.c | 2 +- .../dev/acpica/components/dispatcher/dsopcode.c | 2 +- .../dev/acpica/components/dispatcher/dspkginit.c | 2 +- .../dev/acpica/components/dispatcher/dsutils.c | 2 +- .../dev/acpica/components/dispatcher/dswexec.c | 2 +- .../dev/acpica/components/dispatcher/dswload.c | 2 +- .../dev/acpica/components/dispatcher/dswload2.c | 2 +- .../dev/acpica/components/dispatcher/dswscope.c | 2 +- .../dev/acpica/components/dispatcher/dswstate.c | 2 +- sys/contrib/dev/acpica/components/events/evevent.c | 2 +- sys/contrib/dev/acpica/components/events/evglock.c | 2 +- sys/contrib/dev/acpica/components/events/evgpe.c | 2 +- .../dev/acpica/components/events/evgpeblk.c | 2 +- .../dev/acpica/components/events/evgpeinit.c | 2 +- .../dev/acpica/components/events/evgpeutil.c | 2 +- .../dev/acpica/components/events/evhandler.c | 14 +- sys/contrib/dev/acpica/components/events/evmisc.c | 2 +- .../dev/acpica/components/events/evregion.c | 2 +- .../dev/acpica/components/events/evrgnini.c | 2 +- sys/contrib/dev/acpica/components/events/evsci.c | 2 +- sys/contrib/dev/acpica/components/events/evxface.c | 2 +- .../dev/acpica/components/events/evxfevnt.c | 2 +- sys/contrib/dev/acpica/components/events/evxfgpe.c | 2 +- .../dev/acpica/components/events/evxfregn.c | 2 +- .../dev/acpica/components/executer/exconcat.c | 2 +- .../dev/acpica/components/executer/exconfig.c | 29 ++- .../dev/acpica/components/executer/exconvrt.c | 2 +- .../dev/acpica/components/executer/excreate.c | 2 +- .../dev/acpica/components/executer/exdebug.c | 2 +- .../dev/acpica/components/executer/exdump.c | 2 +- .../dev/acpica/components/executer/exfield.c | 2 +- .../dev/acpica/components/executer/exfldio.c | 2 +- .../dev/acpica/components/executer/exmisc.c | 2 +- .../dev/acpica/components/executer/exmutex.c | 2 +- .../dev/acpica/components/executer/exnames.c | 2 +- .../dev/acpica/components/executer/exoparg1.c | 2 +- .../dev/acpica/components/executer/exoparg2.c | 2 +- .../dev/acpica/components/executer/exoparg3.c | 12 +- .../dev/acpica/components/executer/exoparg6.c | 2 +- .../dev/acpica/components/executer/exprep.c | 2 +- .../dev/acpica/components/executer/exregion.c | 2 +- .../dev/acpica/components/executer/exresnte.c | 2 +- .../dev/acpica/components/executer/exresolv.c | 2 +- .../dev/acpica/components/executer/exresop.c | 2 +- .../dev/acpica/components/executer/exserial.c | 2 +- .../dev/acpica/components/executer/exstore.c | 2 +- .../dev/acpica/components/executer/exstoren.c | 2 +- .../dev/acpica/components/executer/exstorob.c | 2 +- .../dev/acpica/components/executer/exsystem.c | 2 +- .../dev/acpica/components/executer/extrace.c | 2 +- .../dev/acpica/components/executer/exutils.c | 2 +- .../dev/acpica/components/hardware/hwacpi.c | 2 +- .../dev/acpica/components/hardware/hwesleep.c | 2 +- sys/contrib/dev/acpica/components/hardware/hwgpe.c | 2 +- sys/contrib/dev/acpica/components/hardware/hwpci.c | 2 +- .../dev/acpica/components/hardware/hwregs.c | 2 +- .../dev/acpica/components/hardware/hwsleep.c | 2 +- .../dev/acpica/components/hardware/hwtimer.c | 2 +- .../dev/acpica/components/hardware/hwvalid.c | 2 +- .../dev/acpica/components/hardware/hwxface.c | 2 +- .../dev/acpica/components/hardware/hwxfsleep.c | 2 +- .../dev/acpica/components/namespace/nsaccess.c | 2 +- .../dev/acpica/components/namespace/nsalloc.c | 2 +- .../dev/acpica/components/namespace/nsarguments.c | 2 +- .../dev/acpica/components/namespace/nsconvert.c | 2 +- .../dev/acpica/components/namespace/nsdump.c | 2 +- .../dev/acpica/components/namespace/nsdumpdv.c | 2 +- .../dev/acpica/components/namespace/nseval.c | 2 +- .../dev/acpica/components/namespace/nsinit.c | 2 +- .../dev/acpica/components/namespace/nsload.c | 2 +- .../dev/acpica/components/namespace/nsnames.c | 9 +- .../dev/acpica/components/namespace/nsobject.c | 9 +- .../dev/acpica/components/namespace/nsparse.c | 2 +- .../dev/acpica/components/namespace/nspredef.c | 2 +- .../dev/acpica/components/namespace/nsprepkg.c | 9 +- .../dev/acpica/components/namespace/nsrepair.c | 2 +- .../dev/acpica/components/namespace/nsrepair2.c | 2 +- .../dev/acpica/components/namespace/nssearch.c | 2 +- .../dev/acpica/components/namespace/nsutils.c | 2 +- .../dev/acpica/components/namespace/nswalk.c | 2 +- .../dev/acpica/components/namespace/nsxfeval.c | 2 +- .../dev/acpica/components/namespace/nsxfname.c | 2 +- .../dev/acpica/components/namespace/nsxfobj.c | 2 +- sys/contrib/dev/acpica/components/parser/psargs.c | 136 +++++++++- sys/contrib/dev/acpica/components/parser/psloop.c | 5 +- .../dev/acpica/components/parser/psobject.c | 2 +- .../dev/acpica/components/parser/psopcode.c | 2 +- .../dev/acpica/components/parser/psopinfo.c | 2 +- sys/contrib/dev/acpica/components/parser/psparse.c | 2 +- sys/contrib/dev/acpica/components/parser/psscope.c | 2 +- sys/contrib/dev/acpica/components/parser/pstree.c | 2 +- sys/contrib/dev/acpica/components/parser/psutils.c | 2 +- sys/contrib/dev/acpica/components/parser/pswalk.c | 4 +- sys/contrib/dev/acpica/components/parser/psxface.c | 2 +- .../dev/acpica/components/resources/rsaddr.c | 2 +- .../dev/acpica/components/resources/rscalc.c | 2 +- .../dev/acpica/components/resources/rscreate.c | 2 +- .../dev/acpica/components/resources/rsdump.c | 2 +- .../dev/acpica/components/resources/rsdumpinfo.c | 2 +- .../dev/acpica/components/resources/rsinfo.c | 2 +- sys/contrib/dev/acpica/components/resources/rsio.c | 2 +- .../dev/acpica/components/resources/rsirq.c | 2 +- .../dev/acpica/components/resources/rslist.c | 2 +- .../dev/acpica/components/resources/rsmemory.c | 2 +- .../dev/acpica/components/resources/rsmisc.c | 2 +- .../dev/acpica/components/resources/rsserial.c | 9 +- .../dev/acpica/components/resources/rsutils.c | 2 +- .../dev/acpica/components/resources/rsxface.c | 2 +- sys/contrib/dev/acpica/components/tables/tbdata.c | 2 +- sys/contrib/dev/acpica/components/tables/tbfadt.c | 5 +- sys/contrib/dev/acpica/components/tables/tbfind.c | 2 +- .../dev/acpica/components/tables/tbinstal.c | 2 +- sys/contrib/dev/acpica/components/tables/tbprint.c | 2 +- sys/contrib/dev/acpica/components/tables/tbutils.c | 2 +- sys/contrib/dev/acpica/components/tables/tbxface.c | 2 +- .../dev/acpica/components/tables/tbxfload.c | 2 +- .../dev/acpica/components/tables/tbxfroot.c | 2 +- .../dev/acpica/components/utilities/utaddress.c | 2 +- .../dev/acpica/components/utilities/utalloc.c | 2 +- .../dev/acpica/components/utilities/utascii.c | 2 +- .../dev/acpica/components/utilities/utbuffer.c | 2 +- .../dev/acpica/components/utilities/utcache.c | 2 +- .../dev/acpica/components/utilities/utcksum.c | 2 +- .../dev/acpica/components/utilities/utcopy.c | 13 +- .../dev/acpica/components/utilities/utdebug.c | 2 +- .../dev/acpica/components/utilities/utdecode.c | 2 +- .../dev/acpica/components/utilities/utdelete.c | 2 +- .../dev/acpica/components/utilities/uterror.c | 2 +- .../dev/acpica/components/utilities/uteval.c | 2 +- .../dev/acpica/components/utilities/utexcep.c | 2 +- .../dev/acpica/components/utilities/utglobal.c | 2 +- .../dev/acpica/components/utilities/uthex.c | 2 +- .../dev/acpica/components/utilities/utids.c | 2 +- .../dev/acpica/components/utilities/utinit.c | 2 +- .../dev/acpica/components/utilities/utlock.c | 2 +- .../dev/acpica/components/utilities/utmath.c | 2 +- .../dev/acpica/components/utilities/utmisc.c | 2 +- .../dev/acpica/components/utilities/utmutex.c | 2 +- .../dev/acpica/components/utilities/utnonansi.c | 2 +- .../dev/acpica/components/utilities/utobject.c | 2 +- .../dev/acpica/components/utilities/utosi.c | 2 +- .../dev/acpica/components/utilities/utownerid.c | 2 +- .../dev/acpica/components/utilities/utpredef.c | 2 +- .../dev/acpica/components/utilities/utresdecode.c | 2 +- .../dev/acpica/components/utilities/utresrc.c | 34 ++- .../dev/acpica/components/utilities/utstate.c | 2 +- .../dev/acpica/components/utilities/utstring.c | 2 +- .../dev/acpica/components/utilities/utstrsuppt.c | 2 +- .../dev/acpica/components/utilities/utstrtoul64.c | 2 +- .../dev/acpica/components/utilities/uttrack.c | 2 +- .../dev/acpica/components/utilities/utuuid.c | 2 +- .../dev/acpica/components/utilities/utxface.c | 2 +- .../dev/acpica/components/utilities/utxferror.c | 2 +- .../dev/acpica/components/utilities/utxfinit.c | 2 +- .../dev/acpica/components/utilities/utxfmutex.c | 2 +- sys/contrib/dev/acpica/include/acapps.h | 4 +- sys/contrib/dev/acpica/include/acbuffer.h | 2 +- sys/contrib/dev/acpica/include/acclib.h | 2 +- sys/contrib/dev/acpica/include/accommon.h | 2 +- sys/contrib/dev/acpica/include/acconfig.h | 2 +- sys/contrib/dev/acpica/include/acconvert.h | 2 +- sys/contrib/dev/acpica/include/acdebug.h | 2 +- sys/contrib/dev/acpica/include/acdisasm.h | 11 +- sys/contrib/dev/acpica/include/acdispat.h | 2 +- sys/contrib/dev/acpica/include/acevents.h | 2 +- sys/contrib/dev/acpica/include/acexcep.h | 2 +- sys/contrib/dev/acpica/include/acglobal.h | 2 +- sys/contrib/dev/acpica/include/achware.h | 2 +- sys/contrib/dev/acpica/include/acinterp.h | 2 +- sys/contrib/dev/acpica/include/aclocal.h | 3 +- sys/contrib/dev/acpica/include/acmacros.h | 2 +- sys/contrib/dev/acpica/include/acnames.h | 2 +- sys/contrib/dev/acpica/include/acnamesp.h | 2 +- sys/contrib/dev/acpica/include/acobject.h | 2 +- sys/contrib/dev/acpica/include/acopcode.h | 2 +- sys/contrib/dev/acpica/include/acoutput.h | 2 +- sys/contrib/dev/acpica/include/acparser.h | 2 +- sys/contrib/dev/acpica/include/acpi.h | 2 +- sys/contrib/dev/acpica/include/acpiosxf.h | 2 +- sys/contrib/dev/acpica/include/acpixf.h | 4 +- sys/contrib/dev/acpica/include/acpredef.h | 6 +- sys/contrib/dev/acpica/include/acresrc.h | 2 +- sys/contrib/dev/acpica/include/acrestyp.h | 3 +- sys/contrib/dev/acpica/include/acstruct.h | 2 +- sys/contrib/dev/acpica/include/actables.h | 2 +- sys/contrib/dev/acpica/include/actbinfo.h | 10 +- sys/contrib/dev/acpica/include/actbl.h | 2 +- sys/contrib/dev/acpica/include/actbl1.h | 289 ++++++++++++++++++++- sys/contrib/dev/acpica/include/actbl2.h | 2 +- sys/contrib/dev/acpica/include/actbl3.h | 2 +- sys/contrib/dev/acpica/include/actypes.h | 2 +- sys/contrib/dev/acpica/include/acutils.h | 2 +- sys/contrib/dev/acpica/include/acuuid.h | 7 +- sys/contrib/dev/acpica/include/amlcode.h | 2 +- sys/contrib/dev/acpica/include/amlresrc.h | 2 +- sys/contrib/dev/acpica/include/platform/acenv.h | 2 +- sys/contrib/dev/acpica/include/platform/acenvex.h | 2 +- .../dev/acpica/include/platform/acfreebsd.h | 2 +- sys/contrib/dev/acpica/include/platform/acgcc.h | 2 +- sys/contrib/dev/acpica/include/platform/acgccex.h | 2 +- .../acpica/os_specific/service_layers/osgendbg.c | 2 +- .../acpica/os_specific/service_layers/osunixxf.c | 2 +- 359 files changed, 1611 insertions(+), 412 deletions(-) diff --cc sys/contrib/dev/acpica/common/getopt.c index 535e7a00bc8f,000000000000..3af472ffe13d mode 100644,000000..100644 --- a/sys/contrib/dev/acpica/common/getopt.c +++ b/sys/contrib/dev/acpica/common/getopt.c @@@ -1,384 -1,0 +1,384 @@@ +/****************************************************************************** + * + * Module Name: getopt + * + *****************************************************************************/ + +/****************************************************************************** + * + * 1. Copyright Notice + * - * Some or all of this work - Copyright (c) 1999 - 2025, Intel Corp. ++ * Some or all of this work - Copyright (c) 1999 - 2026, Intel Corp. + * All rights reserved. + * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + ***************************************************************************** + * + * Alternatively, you may choose to be licensed under the terms of the + * following license: + * + * 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, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the names + * of any contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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. + * + * Alternatively, you may choose to be licensed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + *****************************************************************************/ + +/* + * ACPICA getopt() implementation + * + * Option strings: + * "f" - Option has no arguments + * "f:" - Option requires an argument + * "f+" - Option has an optional argument + * "f^" - Option has optional single-char sub-options + * "f|" - Option has required single-char sub-options + */ + +#include +#include +#include + +#define ACPI_OPTION_ERROR(msg, badchar) \ + if (AcpiGbl_Opterr) {fprintf (stderr, "%s%c\n", msg, badchar);} + + +int AcpiGbl_Opterr = 1; +int AcpiGbl_Optind = 1; +int AcpiGbl_SubOptChar = 0; +char *AcpiGbl_Optarg; + +static int CurrentCharPtr = 1; + + +/******************************************************************************* + * + * FUNCTION: AcpiGetoptArgument + * + * PARAMETERS: argc, argv - from main + * + * RETURN: 0 if an argument was found, -1 otherwise. Sets AcpiGbl_Optarg + * to point to the next argument. + * + * DESCRIPTION: Get the next argument. Used to obtain arguments for the + * two-character options after the original call to AcpiGetopt. + * Note: Either the argument starts at the next character after + * the option, or it is pointed to by the next argv entry. + * (After call to AcpiGetopt, we need to backup to the previous + * argv entry). + * + ******************************************************************************/ + +int +AcpiGetoptArgument ( + int argc, + char **argv) +{ + + AcpiGbl_Optind--; + CurrentCharPtr++; + + if (argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)] != '\0') + { + AcpiGbl_Optarg = &argv[AcpiGbl_Optind++][(int) (CurrentCharPtr+1)]; + } + else if (++AcpiGbl_Optind >= argc) + { + ACPI_OPTION_ERROR ("\nOption requires an argument", 0); + + CurrentCharPtr = 1; + return (-1); + } + else + { + AcpiGbl_Optarg = argv[AcpiGbl_Optind++]; + } + + CurrentCharPtr = 1; + return (0); +} + + +/******************************************************************************* + * + * FUNCTION: AcpiGetopt + * + * PARAMETERS: argc, argv - from main + * opts - options info list + * + * RETURN: Option character or ACPI_OPT_END + * + * DESCRIPTION: Get the next option + * + ******************************************************************************/ + +int +AcpiGetopt( + int argc, + char **argv, + char *opts) +{ + int CurrentChar; + char *OptsPtr; + + + if (CurrentCharPtr == 1) + { + if (AcpiGbl_Optind >= argc || + argv[AcpiGbl_Optind][0] != '-' || + argv[AcpiGbl_Optind][1] == '\0') + { + return (ACPI_OPT_END); + } + else if (strcmp (argv[AcpiGbl_Optind], "--") == 0) + { + AcpiGbl_Optind++; + return (ACPI_OPT_END); + } + } + + /* Get the option */ + + CurrentChar = argv[AcpiGbl_Optind][CurrentCharPtr]; + + /* Make sure that the option is legal */ + + if (CurrentChar == ':' || + (OptsPtr = strchr (opts, CurrentChar)) == NULL) + { + ACPI_OPTION_ERROR ("Illegal option: -", CurrentChar); + + if (argv[AcpiGbl_Optind][++CurrentCharPtr] == '\0') + { + AcpiGbl_Optind++; + CurrentCharPtr = 1; + } + + return ('?'); + } + + /* Option requires an argument? */ + + if (*++OptsPtr == ':') + { + if (argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)] != '\0') + { + AcpiGbl_Optarg = &argv[AcpiGbl_Optind++][(int) (CurrentCharPtr+1)]; + } + else if (++AcpiGbl_Optind >= argc) + { + ACPI_OPTION_ERROR ( + "Option requires an argument: -", CurrentChar); + + CurrentCharPtr = 1; + return ('?'); + } + else + { + AcpiGbl_Optarg = argv[AcpiGbl_Optind++]; + } + + CurrentCharPtr = 1; + } + + /* Option has an optional argument? */ + + else if (*OptsPtr == '+') + { + if (argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)] != '\0') + { + AcpiGbl_Optarg = &argv[AcpiGbl_Optind++][(int) (CurrentCharPtr+1)]; + } + else if (++AcpiGbl_Optind >= argc) + { + AcpiGbl_Optarg = NULL; + } + else + { + AcpiGbl_Optarg = argv[AcpiGbl_Optind++]; + } + + CurrentCharPtr = 1; + } + + /* Option has optional single-char arguments? */ + + else if (*OptsPtr == '^') + { + if (argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)] != '\0') + { + AcpiGbl_Optarg = &argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)]; + } + else + { + AcpiGbl_Optarg = "^"; + } + + AcpiGbl_SubOptChar = AcpiGbl_Optarg[0]; + AcpiGbl_Optind++; + CurrentCharPtr = 1; + } + + /* Option has a required single-char argument? */ + + else if (*OptsPtr == '|') + { + if (argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)] != '\0') + { + AcpiGbl_Optarg = &argv[AcpiGbl_Optind][(int) (CurrentCharPtr+1)]; + } + else + { + ACPI_OPTION_ERROR ( + "Option requires a single-character suboption: -", + CurrentChar); + + CurrentCharPtr = 1; + return ('?'); + } + + AcpiGbl_SubOptChar = AcpiGbl_Optarg[0]; + AcpiGbl_Optind++; + CurrentCharPtr = 1; + } + + /* Option with no arguments */ + + else + { + if (argv[AcpiGbl_Optind][++CurrentCharPtr] == '\0') + { + CurrentCharPtr = 1; + AcpiGbl_Optind++; + } + + AcpiGbl_Optarg = NULL; + } + + return (CurrentChar); +} diff --cc sys/contrib/dev/acpica/components/debugger/dbtest.c index 4e0eb486c35b,000000000000..eda8013762b0 mode 100644,000000..100644 --- a/sys/contrib/dev/acpica/components/debugger/dbtest.c +++ b/sys/contrib/dev/acpica/components/debugger/dbtest.c @@@ -1,1340 -1,0 +1,1340 @@@ +/******************************************************************************* + * + * Module Name: dbtest - Various debug-related tests + * + ******************************************************************************/ + +/****************************************************************************** + * + * 1. Copyright Notice + * - * Some or all of this work - Copyright (c) 1999 - 2025, Intel Corp. ++ * Some or all of this work - Copyright (c) 1999 - 2026, Intel Corp. + * All rights reserved. + * + * 2. License + * + * 2.1. This is your license from Intel Corp. under its intellectual property + * rights. You may have additional license terms from the party that provided + * you this software, covering your right to use that party's intellectual + * property rights. + * + * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a + * copy of the source code appearing in this file ("Covered Code") an + * irrevocable, perpetual, worldwide license under Intel's copyrights in the + * base code distributed originally by Intel ("Original Intel Code") to copy, + * make derivatives, distribute, use and display any portion of the Covered + * Code in any form, with the right to sublicense such rights; and + * + * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent + * license (with the right to sublicense), under only those claims of Intel + * patents that are infringed by the Original Intel Code, to make, use, sell, + * offer to sell, and import the Covered Code and derivative works thereof + * solely to the minimum extent necessary to exercise the above copyright + * license, and in no event shall the patent license extend to any additions + * to or modifications of the Original Intel Code. No other license or right + * is granted directly or by implication, estoppel or otherwise; + * + * The above copyright and patent license is granted only if the following + * conditions are met: + * + * 3. Conditions + * + * 3.1. Redistribution of Source with Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification with rights to further distribute source must include + * the above Copyright Notice, the above License, this list of Conditions, + * and the following Disclaimer and Export Compliance provision. In addition, + * Licensee must cause all Covered Code to which Licensee contributes to + * contain a file documenting the changes Licensee made to create that Covered + * Code and the date of any change. Licensee must include in that file the + * documentation of any changes made by any predecessor Licensee. Licensee + * must include a prominent statement that the modification is derived, + * directly or indirectly, from Original Intel Code. + * + * 3.2. Redistribution of Source with no Rights to Further Distribute Source. + * Redistribution of source code of any substantial portion of the Covered + * Code or modification without rights to further distribute source must + * include the following Disclaimer and Export Compliance provision in the + * documentation and/or other materials provided with distribution. In + * addition, Licensee may not authorize further sublicense of source of any + * portion of the Covered Code, and must include terms to the effect that the + * license from Licensee to its licensee is limited to the intellectual + * property embodied in the software Licensee provides to its licensee, and + * not to intellectual property embodied in modifications its licensee may + * make. + * + * 3.3. Redistribution of Executable. Redistribution in executable form of any + * substantial portion of the Covered Code or modification must reproduce the + * above Copyright Notice, and the following Disclaimer and Export Compliance + * provision in the documentation and/or other materials provided with the + * distribution. + * + * 3.4. Intel retains all right, title, and interest in and to the Original + * Intel Code. + * + * 3.5. Neither the name Intel nor any other trademark owned or controlled by + * Intel shall be used in advertising or otherwise to promote the sale, use or + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + ***************************************************************************** + * + * Alternatively, you may choose to be licensed under the terms of the + * following license: + * + * 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, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the names + * of any contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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. + * + * Alternatively, you may choose to be licensed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + *****************************************************************************/ + +#include +#include +#include +#include +#include +#include + + +#define _COMPONENT ACPI_CA_DEBUGGER + ACPI_MODULE_NAME ("dbtest") + + +/* Local prototypes */ + +static void +AcpiDbTestAllObjects ( + void); + +static ACPI_STATUS +AcpiDbTestOneObject ( + ACPI_HANDLE ObjHandle, + UINT32 NestingLevel, + void *Context, + void **ReturnValue); + +static ACPI_STATUS +AcpiDbTestIntegerType ( + ACPI_NAMESPACE_NODE *Node, + UINT32 BitLength); + +static ACPI_STATUS +AcpiDbTestBufferType ( + ACPI_NAMESPACE_NODE *Node, + UINT32 BitLength); + +static ACPI_STATUS +AcpiDbTestStringType ( + ACPI_NAMESPACE_NODE *Node, + UINT32 ByteLength); + +static ACPI_STATUS +AcpiDbTestPackageType ( + ACPI_NAMESPACE_NODE *Node); + +static ACPI_STATUS +AcpiDbTestFieldUnitType ( + ACPI_OPERAND_OBJECT *ObjDesc); + +static ACPI_STATUS +AcpiDbReadFromObject ( + ACPI_NAMESPACE_NODE *Node, + ACPI_OBJECT_TYPE ExpectedType, + ACPI_OBJECT **Value); + +static ACPI_STATUS +AcpiDbWriteToObject ( + ACPI_NAMESPACE_NODE *Node, + ACPI_OBJECT *Value); + +static void +AcpiDbEvaluateAllPredefinedNames ( + char *CountArg); *** 1922 LINES SKIPPED *** From nobody Tue May 12 00:02:31 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 4gDxc75nrgz6cMW8 for ; Tue, 12 May 2026 00:02:31 +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 4gDxc74zcpz3Dcl for ; Tue, 12 May 2026 00:02:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778544151; 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=Crrs9oHM+odwsF3aZs/9Vi2Ec/qjED9kKg6cfbyoSag=; b=X5s0XHUXnFGm3jjAbQb2+CJ6PaUVS6664ekLGFlu6pbHVIQamRacoufAPMCvpHiC8x0DLg Xyu8KOd4y+9e00iXE1V4AVIdbSdl6zl7AODnylvsLgPSKFwEQXQRmZB7lPUmoPU0Mvr3BF DHrbpxKE9E8ovi0CMmM8z931W8ZqdR7yTQ8TGw84s29WRADqRreLaIYT9/MkwWkjcltx9u d+2iXDzB6dLtT08J1m5hgER1l0+Hzq/e+/r4ycZlVnnwIHEe0BvRIYxItEWudeIc8MBtKq uGRFpcnIMJsNHvZh6umuFOkGICLtM12QPz+49xq9MnOVNG+jnVZ9f+MaIgE0EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778544151; a=rsa-sha256; cv=none; b=A68B9xDVlpZvbWElTf3e+pcIYPNDZD0mqprmwBy3QcX1q8o47oC3+TQ9eoW1j0revHbfrw 4huvzbZ1ayUiCTzH2eJSqtQbD+Vn4qZ0K5neopOMYdURklSPphztVsyiXIGg7oYBwy1Ue/ mju2xttkR2k2nNDSP8c8qJR8sM0Nnx8F5NtfPdtOUB1cdIARmjVnfXmqQQoonn+c867OB9 bXNxxDL9j0MQGTlWw2mKgAyTXD/mxZO76fb7DBtIFa18jcZpFYNzJ5JRz54Fd2fWs4NA+9 0a0OuorQBBg+Iglea8TLYp1PLaUnPmZMrN/iaylvTmBWurv6+ZpgN5H+bsEyfg== 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=1778544151; 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=Crrs9oHM+odwsF3aZs/9Vi2Ec/qjED9kKg6cfbyoSag=; b=Uile6iZLghkYYaATanitwBQQZeBXRLIn7fbUyKtg1sALUr9mRh+EHlvquRN6bLMZ1bkaVm +WW2nXN4hinL5xZfTxzAbzhSkPQwev97QHCNJpC1A+L+VROuJ857nWw0knfLVpzNNsEUBk k4Wp1CJv88eOD4/Rtn89MvQSvm1lzCTu1ReRWODcas/5luF02tJwoag98P2+hppAphC8lQ vCkFlFGmGmAYx76H9H6T2WZs5/7KUOgh3el2qIFiw3wE3DTqNme3zStXzB26s64/rVqgoJ kHCThmMgijL8tM0tPXLoN5lgczxWuWYBlN6sD61id5pyS2GhTesvKKXP1yiG0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDxc74Yh2zgFM for ; Tue, 12 May 2026 00:02:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f0ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 00:02:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a3036edd0292 - main - if_media: Claim 10BASE-T1S and 10BASE-T1L constants 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: a3036edd0292291a71fb74ba2bce355159ac6913 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 00:02:31 +0000 Message-Id: <6a026e17.3f0ff.60f5efc6@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a3036edd0292291a71fb74ba2bce355159ac6913 commit a3036edd0292291a71fb74ba2bce355159ac6913 Author: Ed Maste AuthorDate: 2026-05-04 23:48:25 +0000 Commit: Ed Maste CommitDate: 2026-05-12 00:01:04 +0000 if_media: Claim 10BASE-T1S and 10BASE-T1L constants These are two single-pair Ethernet (SPE) variants that run at 10 Mbps. 10BASE-T1S has automotive origins and supports multiple nodes on up to 25m of cable. 10BASE-T1L is intended for building and industrial automation and supports long-distance point to point links of over 1km. Reviewed by: kbowling Differential Revision: https://reviews.freebsd.org/D56952 --- sys/net/if_media.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/net/if_media.h b/sys/net/if_media.h index 892b7d1e3e52..5cc8714219c8 100644 --- a/sys/net/if_media.h +++ b/sys/net/if_media.h @@ -262,6 +262,8 @@ uint64_t ifmedia_baudrate(int); #define IFM_1000_BX IFM_X(121) /* 1000Base-BX */ #define IFM_400G_SR8 IFM_X(122) /* 400GBase-SR8 */ #define IFM_400G_CR8 IFM_X(123) /* 400GBase-CR8 */ +#define IFM_10_T1S IFM_X(124) /* 10BASE-T1S */ +#define IFM_10_T1L IFM_X(125) /* 10BASE-T1L */ /* * Please update ieee8023ad_lacp.c:lacp_compose_key() @@ -554,6 +556,8 @@ struct ifmedia_description { { IFM_400G_AUI8, "400G-AUI8" }, \ { IFM_400G_SR8, "400GBase-SR8" }, \ { IFM_400G_CR8, "400GBase-CR8" }, \ + { IFM_10_T1S, "10BASE-T1S" }, \ + { IFM_10_T1L, "10BASE-T1L" }, \ { 0, NULL }, \ } @@ -903,6 +907,8 @@ struct ifmedia_baudrate { { IFM_ETHER | IFM_400G_AUI8, IF_Gbps(400ULL) }, \ { IFM_ETHER | IFM_400G_SR8, IF_Gbps(400ULL) }, \ { IFM_ETHER | IFM_400G_CR8, IF_Gbps(400ULL) }, \ + { IFM_ETHER | IFM_10_T1S, IF_Mbps(10) }, \ + { IFM_ETHER | IFM_10_T1L, IF_Mbps(10) }, \ \ { IFM_IEEE80211 | IFM_IEEE80211_FH1, IF_Mbps(1) }, \ { IFM_IEEE80211 | IFM_IEEE80211_FH2, IF_Mbps(2) }, \ From nobody Tue May 12 03:16: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 4gF1vb1Z7Dz6csRT for ; Tue, 12 May 2026 03:16: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 4gF1vZ5WPzz3ZkM for ; Tue, 12 May 2026 03:16:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778555770; 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=CBXhiQnvMb8Lt6yJLlu1WjJKfh1qyJVyljjBISnJ7gs=; b=OV7QXOALQLUNOJ2yrf2+p8sgGyGMfEiCG6L+zFifJ5auGctBtCnoZKFp3YGKcue3uTerVW UHlXwak1z/6Qtmn24TKgvQcqqkGllfwFWsIfA4o2mv/GWLsOQMrv3Cfd2XRwurYaSfDpHM zC2wbDJcSl9DRljY7BxDDKh4s6TgUpU4k7olf60NfwsZRyXRVpfxIlrMZuuhVcnKb1NaGY xowwGb1df+1uBr1DFpHcohfi6cWoaKz/Pxj4j/BdPC/eVyMi16CBLF4ewZ7+eb4l4uhXKM OkdJBcRxugsAY56FFENQd050KS4dbCOdG+cKTIU+KnLUEAK5fB9fZtw+zzkB/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778555770; a=rsa-sha256; cv=none; b=bHSBQY0m09UNhYgZupjg2zO1QE0G6uNDyccJT6X5c+1VX5dYkOP4SBC0lHKIVu4EDW0iag 6WcoKfbmu25+DJo9yqovvEW6zDtm83eoxn/85YMTz5B3uIuAnASf6c38kKyl5QdJ3aIBMu E3hgfV1UOsr/Xrq8mCAa7qM8JqDeB7Ce/CneZps24vUv/KXJpSgknr4fTj2GPpNCcULv3T apkBfOB/uqAYApKdlwZXZLw1RXo53OMDK9+C15+GdC/vk13Nm8b/p3bKx124Z94MNDAGoo YiLNme5uZcG7iPpmqyryeTVnREUXsklaSlYLX29Mz6Wc2cYUA6jYfC4fPqlLug== 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=1778555770; 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=CBXhiQnvMb8Lt6yJLlu1WjJKfh1qyJVyljjBISnJ7gs=; b=MXgw8UbPlm3HSJiNy5QgklkheiajnNFGHUXgIUsRcOcW+UUjROmkbSjjLkRjeE5o6V48jm tg5LqPWcg6BXP4FqogaE0IahgU4ooe0X0QwCQXr5Br+NwAeAzXESs5yjLcmN7d+ixls9Oy gbXxeYN3o4j7wMf1AoKXX6YDrFqtiNMmLFEqLJg2ShzBn+ZEWWIMFgwnKQbFJUpZovBf/D UApAtqEgmuiSVdnEVJN2MRjgMQ6YEvgkz09l4Lh+lsFUvEb+HUwisHsl38XjEnwxKD0ekD xhVAEqtMoUNot3Qkg7f9O9dwZ94BF8VUfVg+EAGYhfwM40C3AXS0r06o9X05lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gF1vZ4Wnjzm8Z for ; Tue, 12 May 2026 03:16:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37c10 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 03:16:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Raphael 'kena' Poss From: Alexander Ziaee Subject: git: e26b5e074934 - main - spkr.4: Reflect latest changes and add history 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: e26b5e0749340d4e4557881b6634b044bce3fa61 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 03:16:05 +0000 Message-Id: <6a029b75.37c10.370bf11a@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=e26b5e0749340d4e4557881b6634b044bce3fa61 commit e26b5e0749340d4e4557881b6634b044bce3fa61 Author: Raphael 'kena' Poss AuthorDate: 2026-05-08 13:10:29 +0000 Commit: Alexander Ziaee CommitDate: 2026-05-12 03:14:16 +0000 spkr.4: Reflect latest changes and add history - speaker(4) was recently modernized to lock the driver per-playback instead of per-open. Update the man page to explain this change. - added a reference to MML and SMX in the historical context to make it easier for users to find additional documentation online. Signed-off-by: Raphael Poss Reviewed by: ziaee Closes: https://github.com/freebsd/freebsd-src/pull/2183 --- share/man/man4/spkr.4 | 102 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 78 insertions(+), 24 deletions(-) diff --git a/share/man/man4/spkr.4 b/share/man/man4/spkr.4 index 64dfee278de4..a2e55035408c 100644 --- a/share/man/man4/spkr.4 +++ b/share/man/man4/spkr.4 @@ -16,16 +16,6 @@ speaker on an machine running .Fx . .Pp -Only one process may have this device open at any given time; -.Xr open 2 -and -.Xr close 2 -are used to lock and relinquish it. -An attempt to open when -another process has the device locked will return -1 with an -.Er EBUSY -error -indication. Writes to the device are interpreted as `play strings' in a simple ASCII melody notation. An @@ -34,6 +24,13 @@ request for tone generation at arbitrary frequencies is also supported. .Pp +Only one string can be playing at a time. +Concurrent +.Xr write 2 +and +.Xr ioctl 2 +calls from separate threads or processes are serialized per string. +.Pp Sound-generation does not monopolize the processor; in fact, the driver spends most of its time sleeping while the PC hardware is emitting tones. @@ -64,18 +61,25 @@ pointer to the first of an array of tone structures and plays them in continuous sequence; this array must be terminated by a final member with a zero duration. .Pp -The play-string language is modeled on the PLAY statement conventions of +The play-string language is a dialect of the Music Markup Language +(MML) used in various computer and gaming systems since the 1970s. +It is a subset of the MML variant supported by the PLAY statement of .Tn IBM -Advanced BASIC 2.0. -The +Advanced BASIC 2.0, +.Tn MS +BASICA and GW-BASIC, +as well as the Standard Musical Expression (SMX) supported in +.Tn MS +QBasic. .Li MB , .Li MF , and .Li X -primitives of PLAY are not -useful in a timesharing environment and are omitted. +primitives of MML/SMX are not supported. The `octave-tracking' -feature and the slur mark are new. +feature and the slur mark are specific to the +.Fx +implementation. .Pp There are 84 accessible notes numbered 1-84 in 7 octaves, each running from C to B, numbered 0-6; the scale is equal-tempered A440 and octave 3 starts @@ -115,10 +119,11 @@ Thus ``olbc'' will be played as ``olb>c'', and ``olcb'' as ``olc, < and O[0123456]. -(The octave-locking -feature is not supported in +The octave-locking feature is not supported in .Tn IBM -BASIC.) +and +.Tn MS +BASIC dialects. .It Li > Bump the current octave up one. .It Li < @@ -201,9 +206,11 @@ dotted twice, it is held 9/4, and three times would give 27/8. A note and its sustain dots may also be followed by a slur mark (underscore). This causes the normal micro-rest after the note to be filled in, slurring it to the next one. -(The slur feature is not supported in +The slur feature is not supported in .Tn IBM -BASIC.) +and +.Tn MS +BASIC dialects. .Pp Whitespace in play strings is simply skipped and may be used to separate melody sections. @@ -214,16 +221,63 @@ speaker device file .El .Sh SEE ALSO .Xr spkrtest 8 +.Pp +Additional information about MML: +.Bl -dash -offset indent +.It +.Lk https://electronicmusic.fandom.com/wiki/Music_Macro_Language "The Electronic Music Wiki - Music Macro Language" +.It +.Rs +.%T "IBM Personal Computer BASIC manual" +.%I "IBM Corporation" +.%D "1982" +.Re +.It +.Rs +.%T "BASICA manual" +.%I "Microsoft Corporation" +.%D "1982" +.Re +.It +.Rs +.%T "GW-BASIC manual" +.%I "Microsoft Corporation" +.%D "1987" +.Re +.It +.Rs +.%T "QBasic manual" +.%I "Microsoft Corporation" +.%D "1991" +.Re +.It +.Rs +.%A "Eleanor Selfridge-Field" +.%T "Beyond MIDI: the handbook of musical codes" +.%I "MIT Press" +.%D "1997" +.Re +.El .Sh HISTORY The .Nm device appeared in .Fx 1.0 . +.Pp +Prior to +.Fx 16 , +only one file descriptor could hold the device open. .Sh AUTHORS -.An Eric S. Raymond Aq Mt esr@snark.thyrsus.com , +.An -nosplit +The +.Nm +driver was written by +.An Eric S. Raymond Aq Mt esr@snark.thyrsus.com in June 1990 -.Sh PORTED BY -.An Andrew A. Chernov Aq Mt ache@astral.msk.su +and ported by +.An Andrew A. Chernov Aq Mt ache@astral.msk.su . +Support for concurrent open was added by +.An Raphael Poss Aq Mt knz@thaumogen.net . .Sh BUGS Due to roundoff in the pitch tables and slop in the tone-generation and timer hardware (neither of which was designed for precision), neither pitch accuracy From nobody Tue May 12 07:48: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 4gF7y61WMCz6dDrW for ; Tue, 12 May 2026 07:48: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 4gF7y60Fphz427l for ; Tue, 12 May 2026 07:48:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778572126; 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=R80TsFeuiyXKqvh5FI6LLoM36jzfPpXgs+VO0v2a/fE=; b=t6OTqK4zL7thaNpKLvhUSo/pZXIHwrhB0bKOGnH49hZoOPRRiMgKsrFewjlX0k7BaeVP/D /dnCd4sXeiEk3RCGzhXleSQQn9qVNYRugRRbkDR4Wvm2vEsgxYwrhqfSn66eXl7/928EUD 2kCgAFY9ByItoyWLRdV7OJzJwEM/ohTSfo2xpi3gN3J1bGNCNm3q/msv1SsBwrkGgIaJKb 6Ue4LqjeMbVnIS+aGbrGcTRhL7yuaKhWzjsO1UlDHs5e5Ey2Ll+ZMJOf1zygeYR0UBqR08 pHpzJM0Wb1n70JfzhajZxIwNfEp2QP5To38dZaqT7skZKw7aUILAvrHG+FwHXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778572126; a=rsa-sha256; cv=none; b=MAC5pPUpulJE5m3hOB2ikMsMhTqZd+F9Kn/Mh4RXcAQgARPcYx610QVC7mP4XEW9KZmgoi KJULvOu9WqUmfjwWFuI7BgYjHggCEX0DzO4X/766sZgMTmDlSr+JXKIihEDX4R4ZlAEWUB vKEftXtYTrok54YL8A1CRsgNVLF16mbYCTR7rIyXsvdKO/JoVYzu2syrcAWH2pNrZkA0iB zTEHOQ1+1c3wBDlHuAEDAGXoI6AZXQou22R4hjW7zZfdEUGqtwnbBQ3Mty+VS31RtbQA/o oS6WW09EoU/mq+PmwVr9unp2sUWMtBxxMGcd2RGe+sDirnPL6wsA3saFzXmsOw== 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=1778572126; 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=R80TsFeuiyXKqvh5FI6LLoM36jzfPpXgs+VO0v2a/fE=; b=adwU898V49cSL7jrewy7UFnWOT6HERl3zVOiU1JvWNpqu80MBM+jFOWJLLhLH8r5dHCdAA lrbT+mJdCJBaUoc0epf86sZidwt9YhDiCqeyxbflMgcyBNVFqMn8TqkH91Ar5MJTvMnTdd tpN0jVOJPJWxz9lUEF4Qrq/rHQ232bXT1UOpLM2P1lRzHi03fW79fhC5wvFoz1/iJFSb+F 6E/oA5GlNjo9OoMAjH2SaDAH6zJV9MIXR20XLR86LQO+RqD8mBXtz/69nR1//P9soOq/64 Ct/0AunLgYjBsti0qt/G+Ukv0ou4eso4MwcBJjAhxiyFL/OIZwdWChoDE1ziZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gF7y56d8Vzv0y for ; Tue, 12 May 2026 07:48:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23ba8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 07:48:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Boris Lytochkin From: Andrey V. Elsukov Subject: git: 3d39eadcdeb3 - main - ipfw: fix IPv6 flow label matching 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: ae X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d39eadcdeb301e95abdc94b1ad5d1255fa0f446 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 07:48:45 +0000 Message-Id: <6a02db5d.23ba8.7e41e5d9@gitrepo.freebsd.org> The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=3d39eadcdeb301e95abdc94b1ad5d1255fa0f446 commit 3d39eadcdeb301e95abdc94b1ad5d1255fa0f446 Author: Boris Lytochkin AuthorDate: 2026-05-12 07:44:10 +0000 Commit: Andrey V. Elsukov CommitDate: 2026-05-12 07:44:10 +0000 ipfw: fix IPv6 flow label matching * do not require just only ip6 proto for flow-id opcode in ipfw(8). ipv6-icmp, tcp, udp should be fine too. * fix off-by-one bug leading to out-of-bounds read. * apply IPV6_FLOWLABEL_MASK before comparison in flow6id_match(), so flow-id opcode will match a specified flow label. No need to take protocol version and traffic class into account. * add the test to verify that opcode is working correctly. Reviewed by: pouria Obtained from: Yandex LLC MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56869 --- sbin/ipfw/ipfw2.c | 5 +-- sys/netpfil/ipfw/ip_fw2.c | 4 +- tests/sys/netpfil/common/pft_ping.py | 13 +++++- tests/sys/netpfil/ipfw/Makefile | 1 + tests/sys/netpfil/ipfw/ipv6-flow-id.sh | 78 ++++++++++++++++++++++++++++++++++ 5 files changed, 95 insertions(+), 6 deletions(-) diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c index e0e1339a1dce..06a1ee937cd7 100644 --- a/sbin/ipfw/ipfw2.c +++ b/sbin/ipfw/ipfw2.c @@ -5515,10 +5515,7 @@ read_options: break; case TOK_FLOWID: - if (proto != IPPROTO_IPV6 ) - errx( EX_USAGE, "flow-id filter is active " - "only for ipv6 protocol\n"); - fill_flow6( (ipfw_insn_u32 *) cmd, *av, cblen); + fill_flow6(insntod(cmd, u32), *av, cblen); av++; break; diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c index 10690920e6fd..133aeeb969a6 100644 --- a/sys/netpfil/ipfw/ip_fw2.c +++ b/sys/netpfil/ipfw/ip_fw2.c @@ -780,7 +780,9 @@ static int flow6id_match(int curr_flow, ipfw_insn_u32 *cmd) { int i; - for (i=0; i <= cmd->o.arg1; ++i) + /* Mask proto version and traffic class out before comparing flow-id */ + curr_flow &= ntohl(IPV6_FLOWLABEL_MASK); + for (i=0; i < cmd->o.arg1; ++i) if (curr_flow == cmd->d[i]) return 1; return 0; diff --git a/tests/sys/netpfil/common/pft_ping.py b/tests/sys/netpfil/common/pft_ping.py index a2a1d9c7f4ec..ada4f8607ab0 100644 --- a/tests/sys/netpfil/common/pft_ping.py +++ b/tests/sys/netpfil/common/pft_ping.py @@ -63,6 +63,7 @@ def prepare_ipv6(send_params): dst_address = send_params.get('dst_address') hlim = send_params.get('hlim') tc = send_params.get('tc') + fl = send_params.get('fl') ip6 = sp.IPv6(dst=dst_address) if src_address: ip6.src = src_address @@ -70,6 +71,8 @@ def prepare_ipv6(send_params): ip6.hlim = hlim if tc: ip6.tc = tc + if fl: + ip6.fl = fl return ip6 @@ -224,6 +227,7 @@ def check_ipv6(expect_params, packet): flags = expect_params.get('flags') hlim = expect_params.get('hlim') tc = expect_params.get('tc') + fl = expect_params.get('fl') ip6 = packet.getlayer(sp.IPv6) if not ip6: LOGGER.debug('Packet is not IPv6!') @@ -245,6 +249,9 @@ def check_ipv6(expect_params, packet): if tc and ip6.tc != tc: LOGGER.debug(f'Wrong TC value {ip6.tc}, expected {tc}') return False + if fl and ip6.fl != fl: + LOGGER.debug(f'Wrong Flow Label value {ip6.fl}, expected {fl}') + return False return True @@ -635,6 +642,8 @@ def parse_args(): help='ICMP Echo Request payload size') parser_send.add_argument('--send-tc', type=int, help='IPv6 Traffic Class or IPv4 DiffServ / ToS') + parser_send.add_argument('--send-fl', type=int, + help='IPv6 Flow label') parser_send.add_argument('--send-tcpopt-unaligned', action='store_true', help='Include unaligned TCP options') parser_send.add_argument('--send-nop', action='store_true', @@ -652,6 +661,8 @@ def parse_args(): help='TCP sequence number') parser_expect.add_argument('--expect-tc', type=int, help='IPv6 Traffic Class or IPv4 DiffServ / ToS') + parser_expect.add_argument('--expect-fl', type=int, + help='IPv6 Flow Label') parser.add_argument('-v', '--verbose', action='store_true', help=('Enable verbose logging. Apart of potentially useful information ' @@ -673,7 +684,7 @@ def main(): send_params = {} expect_params = {} for param_name in ( - 'flags', 'hlim', 'length', 'mss', 'seq', 'tc', 'frag_length', + 'flags', 'hlim', 'length', 'mss', 'seq', 'tc', 'fl', 'frag_length', 'sport', 'dport', ): param_arg = vars(args).get(f'send_{param_name}') diff --git a/tests/sys/netpfil/ipfw/Makefile b/tests/sys/netpfil/ipfw/Makefile index 52f898050267..0be870945891 100644 --- a/tests/sys/netpfil/ipfw/Makefile +++ b/tests/sys/netpfil/ipfw/Makefile @@ -4,6 +4,7 @@ TESTSDIR= ${TESTSBASE}/sys/netpfil/ipfw ATF_TESTS_SH+= fwd \ divert \ + ipv6-flow-id \ log \ lookup \ table diff --git a/tests/sys/netpfil/ipfw/ipv6-flow-id.sh b/tests/sys/netpfil/ipfw/ipv6-flow-id.sh new file mode 100644 index 000000000000..fd3ef2f6cd81 --- /dev/null +++ b/tests/sys/netpfil/ipfw/ipv6-flow-id.sh @@ -0,0 +1,78 @@ +# +# Copyright (c) 2026 Boris Lytochkin +# +# SPDX-License-Identifier: BSD-2-Clause +# + +common_dir="$(atf_get_srcdir)/../common" +. ${common_dir}/utils.subr + +NC="nc -w 1 -dnN" + +setup_network_v6() +{ + epair="$1" + + ifconfig ${epair}a inet6 2001:db8:42::1/64 up no_dad -ifdisabled + + vnet_mkjail alcatraz ${epair}b + + ifconfig -j alcatraz ${epair}b inet6 2001:db8:42::2/64 up no_dad -ifdisabled + + jexec alcatraz /usr/sbin/inetd -p /dev/null $(atf_get_srcdir)/lookup_inetd.conf + + # Sanity checks + atf_check -s exit:0 -o ignore ping6 -i .1 -c 3 -s 1200 2001:db8:42::2 + atf_check -o "inline:GOOD 82\n" ${NC} 2001:db8:42::2 82 +} + +atf_test_case "ipv6fl" "cleanup" + +ipv6fl_head() +{ + atf_set descr 'flow-id test' + atf_set require.user root + atf_set require.progs python3 scapy +} + +ipv6fl_body() +{ + + firewall_init "ipfw" + + epair=$(vnet_mkepair) + + setup_network_v6 ${epair} + + # Check if the firewall is able to match exact IPv6 flow label + firewall_config "alcatraz" ipfw ipfw \ + "ipfw -q add 100 allow ip6 from any to any flow-id 0xbaad" \ + "ipfw -q add 200 deny ipv6-icmp from any to any icmp6types 128 in" + + # Check Flow Label matches + atf_check -s exit:0 ${common_dir}/pft_ping.py \ + --sendif ${epair}a \ + --fromaddr 2001:db8:42::1 \ + --to 2001:db8:42::2 \ + --send-fl $((0xbaad)) \ + --replyif ${epair}a + + # Check Flow Label mismatch + atf_check -s exit:1 ${common_dir}/pft_ping.py \ + --sendif ${epair}a \ + --fromaddr 2001:db8:42::1 \ + --to 2001:db8:42::2 \ + --send-fl $((0xf001)) \ + --replyif ${epair}a + +} + +ipv6fl_cleanup() +{ + firewall_cleanup $1 +} + +atf_init_test_cases() +{ + atf_add_test_case "ipv6fl" +} From nobody Tue May 12 07:53:00 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 4gF8303CV3z6dDxt for ; Tue, 12 May 2026 07:53:00 +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 4gF8302QXYz42Sj for ; Tue, 12 May 2026 07:53:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778572380; 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=y2tfkr/3GtdCzqR4dVvq9Y7Y+9vuttD4v4cliyY+5sI=; b=ca5oXpVKUur3g4+NPbXBdLmbAROwKn3Uq2EYQcJvCm9zyIpEYVoVSUTdBJ1z/R7ToX0qdN EoBxP0EigRJlOnPpQqNFxVfLvsc3JIL3dAQm4DA9Iys3mfSDgwhiJwwIsfyn1M7G1KIsix uJRGoccHBLg64mI7gG1kVSnRGxC9OHD3kA6SUAOY6n2CUWDafOm+1AlX65tmDS+mYf1akY nzzDZGL7w4O3pztSp1JsaGvNm+S1AUX1/STx1tz/OLTsFUf9BQH9UUHoQP2eFSKgTlBsSx Ii2x2Bl5jp+BMqfFLScMClEGPzkZKUxQMN8PMIj3cTbq0p0aD40HTkrMbftJ7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778572380; a=rsa-sha256; cv=none; b=kOFSe3hgwYHZ+jKEct/dZiognka1G1h2q4sO1jMCYC2nrqAHAvicZTWdZeUQNsib8hOVk/ biObyBdRIfSz6jRxCnI2vg8CtcE5d+MEjtZhAfNMvO6wvDlcnSTfPnFbM0kPX09NWD+LWX 70QBxSN6KnGGvRR2vDKTTDP/nXdAnCgutBr9+QjaSSr0V5WsbOr07/2Mu4cLCXD/ETxzbN NAAcpj0VemB/XQjHzS/y+qX+5LZ7p6ngOyNGQ2DK6m0SxVOmArMLOWl/7VVMZRfeUKpQLn u7NTBuxHHg/HqriRgRcbbzuvZlduLqDqsoe3PDQkNCiRjO6auD7BDS9a0NAtFA== 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=1778572380; 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=y2tfkr/3GtdCzqR4dVvq9Y7Y+9vuttD4v4cliyY+5sI=; b=jhSuHDjQfX629C5WKhG+0G1SvS1Xlb4x3wmQV9aoaQ4sAEgKFuOTf+BVgR4Yq+MPO4KBCT jazStd1DF5g2EH5I9hpwOEe/zE2pCy00V44PAlSuajOWVCpJLgLdwS2vWYPWlVtSXLmd28 xPVhyOz72gZI+a+I7Vej/NO3ixu/SQ4thMcD01JBfte+9vM0oWH2OKvIef93t5haJLywU+ PdRIhNunUmlLUPVG1xpwRY1qw4picJxW06NN3Pe1H88Oo3SgBj1CxfT64sm2yugrBMDy8M mVjwZGloc5SVOXAXZp1Q6Je+lLLoHEt+nrLPhYtpJbR1rhQu3lKlxQmnk57hFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gF8301lJyzvFf for ; Tue, 12 May 2026 07:53:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24b1f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 07:53:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 8b70a203be10 - main - nuageinit: fix command injection and related issues 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: 8b70a203be10411c560ed303ab25713d70b316e9 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 07:53:00 +0000 Message-Id: <6a02dc5c.24b1f.734d8e95@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8b70a203be10411c560ed303ab25713d70b316e9 commit 8b70a203be10411c560ed303ab25713d70b316e9 Author: Baptiste Daroussin AuthorDate: 2026-05-07 18:22:14 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-12 07:52:32 +0000 nuageinit: fix command injection and related issues - Add shell_escape() helper to safely escape shell arguments - Apply shell_escape to all user-controlled values in shell commands: adduser (usershow, useradd, lock, primary_group, groups) addgroup (groupshow, groupadd, members) exec_change_password (usermod) settimezone (tzsetup root and timezone) install_package (pkg package names) - Escape double quotes in hostname when writing rc.conf.d/hostname - Add missing 'local' declaration for resolvconf_command in nameservers() - Escape interface name in resolvconf -a command - Change open_resolvconf_conf() from 'w' to 'a' mode to prevent data loss when nameservers() is called multiple times - Clean up stale resolvconf.conf at the start of each boot (skip on postnet to preserve config written by first call) MFC After: 1 day --- libexec/nuageinit/nuage.lua | 43 +++++++++++++++++++++++------------- libexec/nuageinit/nuageinit | 17 ++++++++++++-- libexec/nuageinit/tests/nuageinit.sh | 6 ++--- 3 files changed, 46 insertions(+), 20 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 2d962b540b23..f3c23a7c3eb8 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -52,6 +52,10 @@ local function decode_base64(input) return table.concat(result) end +local function shell_escape(s) + return "'" .. string.gsub(s, "'", "'\\''") .. "'" +end + local function warnmsg(str, prepend) if not str then return @@ -121,7 +125,7 @@ local function sethostname(hostname) warnmsg("Impossible to open " .. hostnamepath .. ":" .. err) return end - f:write('hostname="' .. hostname .. '"\n') + f:write('hostname="' .. hostname:gsub('"', '\\"') .. '"\n') f:close() end @@ -199,7 +203,7 @@ local function adduser(pwd) if root then cmd = cmd .. "-R " .. root .. " " end - local f = io.popen(cmd .. " usershow " .. pwd.name .. " -7 2> /dev/null") + local f = io.popen(cmd .. " usershow " .. shell_escape(pwd.name) .. " -7 2> /dev/null") local pwdstr = f:read("*a") f:close() if pwdstr:len() ~= 0 then @@ -220,13 +224,17 @@ local function adduser(pwd) -- a warning but creates the user anyway. list = purge_group(list) if #list > 0 then - extraargs = " -G " .. table.concat(list, ",") + local escaped_list = {} + for _, g in ipairs(list) do + table.insert(escaped_list, shell_escape(g)) + end + extraargs = " -G " .. table.concat(escaped_list, ",") end end -- pw will automatically create a group named after the username -- do not add a -g option in this case if pwd.primary_group and pwd.primary_group ~= pwd.name then - extraargs = extraargs .. " -g " .. pwd.primary_group + extraargs = extraargs .. " -g " .. shell_escape(pwd.primary_group) end if not pwd.no_create_home then extraargs = extraargs .. " -m " @@ -248,9 +256,9 @@ local function adduser(pwd) if root then cmd = cmd .. "-R " .. root .. " " end - cmd = cmd .. "useradd -n " .. pwd.name .. " -M 0755 -w none " - cmd = cmd .. extraargs .. " -c '" .. pwd.gecos - cmd = cmd .. "' -d '" .. pwd.homedir .. "' -s " .. pwd.shell .. postcmd + cmd = cmd .. "useradd -n " .. shell_escape(pwd.name) .. " -M 0755 -w none " + cmd = cmd .. extraargs .. " -c " .. shell_escape(pwd.gecos) + cmd = cmd .. " -d " .. shell_escape(pwd.homedir) .. " -s " .. shell_escape(pwd.shell) .. postcmd f = io.popen(cmd, "w") if input then @@ -267,7 +275,7 @@ local function adduser(pwd) if root then cmd = cmd .. "-R " .. root .. " " end - cmd = cmd .. "lock " .. pwd.name + cmd = cmd .. "lock " .. shell_escape(pwd.name) os.execute(cmd) end return pwd.homedir @@ -283,7 +291,7 @@ local function addgroup(grp) if root then cmd = cmd .. "-R " .. root .. " " end - local f = io.popen(cmd .. " groupshow " .. grp.name .. " 2> /dev/null") + local f = io.popen(cmd .. " groupshow " .. shell_escape(grp.name) .. " 2> /dev/null") local grpstr = f:read("*a") f:close() if grpstr:len() ~= 0 then @@ -292,13 +300,17 @@ local function addgroup(grp) local extraargs = "" if grp.members then local list = splitlist(grp.members) - extraargs = " -M " .. table.concat(list, ",") + local escaped_list = {} + for _, m in ipairs(list) do + table.insert(escaped_list, shell_escape(m)) + end + extraargs = " -M " .. table.concat(escaped_list, ",") end cmd = "pw " if root then cmd = cmd .. "-R " .. root .. " " end - cmd = cmd .. "groupadd -n " .. grp.name .. extraargs + cmd = cmd .. "groupadd -n " .. shell_escape(grp.name) .. extraargs local r = os.execute(cmd) if not r then warnmsg("fail to add group " .. grp.name) @@ -484,7 +496,7 @@ local function exec_change_password(user, password, type, expire) postcmd = " -w random" end end - cmd = cmd .. "usermod " .. user .. postcmd + cmd = cmd .. "usermod " .. shell_escape(user) .. postcmd if expire then cmd = cmd .. " -p 1" else @@ -577,7 +589,7 @@ local function settimezone(timezone) root = "/" end - local f, _, rc = os.execute("tzsetup -s -C " .. root .. " " .. timezone) + local f, _, rc = os.execute("tzsetup -s -C " .. shell_escape(root) .. " " .. shell_escape(timezone)) if not f then warnmsg("Impossible to configure time zone ( rc = " .. rc .. " )") @@ -600,8 +612,8 @@ local function install_package(package) if package == nil then return true end - local install_cmd = "pkg install -y " .. package - local test_cmd = "pkg info -q " .. package + local install_cmd = "pkg install -y " .. shell_escape(package) + local test_cmd = "pkg info -q " .. shell_escape(package) if os.getenv("NUAGE_RUN_TESTS") then print(install_cmd) print(test_cmd) @@ -683,6 +695,7 @@ local function addfile(file, defer) end local n = { + shell_escape = shell_escape, warn = warnmsg, err = errmsg, chmod = chmod, diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index a1ebd3f52b25..fc8d9582b9c6 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -67,7 +67,14 @@ local function open_resolv_conf() end local function open_resolvconf_conf() - return openat("/etc", "resolvconf.conf") + local path_dir = root .. "/etc" + local path_name = path_dir .. "/resolvconf.conf" + nuage.mkdir_p(path_dir) + local f, err = io.open(path_name, "a") + if not f then + nuage.err("unable to open " .. path_name .. ": " .. err) + end + return f, path_name end local function get_ifaces_by_mac() @@ -271,8 +278,9 @@ local function nameservers(interface, obj) end -- Only call resolvconf with interface if interface is provided + local resolvconf_command if interface then - resolvconf_command = "resolvconf -a " .. interface .. " < " .. resolv_conf + resolvconf_command = "resolvconf -a " .. nuage.shell_escape(interface) .. " < " .. resolv_conf else resolvconf_command = "resolvconf -u" end @@ -738,6 +746,11 @@ local function load_userdata() return line, obj end +-- Clean up stale resolvconf.conf from previous boot +if citype ~= "postnet" then + os.remove(root .. "/etc/resolvconf.conf") +end + if citype == "config-2" then -- network config2_network(ni_path) diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 1fd68d5a178e..89207fdf0aca 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -801,7 +801,7 @@ packages: - yeah/plop EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -s exit:0 -o inline:"pkg install -y yeah/plop\npkg info -q yeah/plop\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -s exit:0 -o inline:"pkg install -y 'yeah/plop'\npkg info -q 'yeah/plop'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet cat > media/nuageinit/user_data << 'EOF' #cloud-config @@ -809,7 +809,7 @@ packages: - curl EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg install -y curl\npkg info -q curl\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -o inline:"pkg install -y 'curl'\npkg info -q 'curl'\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet cat > media/nuageinit/user_data << 'EOF' #cloud-config @@ -818,7 +818,7 @@ packages: - meh: bla EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg install -y curl\npkg info -q curl\n" -e inline:"nuageinit: Invalid type: table for packages entry number 2\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -o inline:"pkg install -y 'curl'\npkg info -q 'curl'\n" -e inline:"nuageinit: Invalid type: table for packages entry number 2\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet } config2_userdata_update_packages_body() From nobody Tue May 12 08:15: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 4gF8Xq3Bb7z6dGhm; Tue, 12 May 2026 08:15:23 +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 4gF8Xq2YSmz43bX; Tue, 12 May 2026 08:15:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778573723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=yYueH2zL/CazWv42Pk0M9f1lwsJ9+yoASEVp2X3z0ec=; b=e2HZrvzHkS5+XleSJbuEMd9xODFDKEANMEP17DaZU/EjrTAzM6daeEY+i23BYVm9X5hXCZ kjQo8z5yNHQktgkMzN6kTooe+NrO1RzNC+fyf8xtKAPX9wC3pmnh3wljfcGDIDTj/ndxco J6yKCyt/SUjfWcIEqkM6ydgUjZYFppuIRr+1KbGir+e9eIcnahZPfgnhkKGRqCfO/6IAv/ seYg+lm8kbHUXnqgJbEeKCFhE92gBkzXQ8lgESiSYwPbg2Rc5iCrICa0cCkaGN/9cP37Iu aS4GhLX64xBi4SSY1Xaj0Wnob8U4JrGn827GPyQI9BZUzX+qLkxUCh7VQcmVcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778573723; a=rsa-sha256; cv=none; b=x8Pe9+1fvgjL+TbASw1yMJrNp6HRVybPBNvKPmaFQcoF1REbqq2hGsKNQnOMZqnJ+LDGgL UeX8n4PmuXMpCiRf0RVRd6q5+eVyIu9Xp1WUqbaq4NuxLrlhVB7/XeAbeZIKwUp6QX59YL IVasJshT+Jq5BVzIf/hXbreZzlSqg6a50rSo2zD4dtO7jH0/C1EKcu4j2iKmh4JTDDdNRw UbcsbFDD6r4dF7HpG1Wr+knryFweB4xKELSVU86r8gWIvis+Ds3yRIbXrFLtmEcybLSS2U yKDhGmSZu+Tq90hz0/0l9WftgfblVe3FymzDkgY7x0Xrau89OIaGs0T3P8DZxg== 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=1778573723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=yYueH2zL/CazWv42Pk0M9f1lwsJ9+yoASEVp2X3z0ec=; b=c9cd6HSeHrKdYZROFUzJChnnDz/2isi5qVXSnj/1/ov/OsW+5wKsDZ9ntMHFpLwXgEEVqc mRm+J9PKKj3/VwBZcUSwjOPLTcKz5HCcqZeyrvTkadgsVCTgh0H7tW0rPCYxuIiSsWvYrt LhaPjy/SWyfi9Ow3lUiKblXwTMcnvk3bGrsVnLpvWtqN7LDBtmV8oOF/XpuifdwJ13Agx4 nfKZHEcY4cQ0VeSjteHkcAXz1uJNvXf+Q+iTsZQiOoo0XgNa2cy8ju8EEecCGj42VSmPdf nU53h0LnVrBhHYmwoI2j42T5bvd82TSLUWOH0YZK3Ay2uMCwUNQPW3WLTWBq0w== Received: from b.nours.eu (b.nours.eu [54.38.177.57]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gF8Xq1LHpzZKR; Tue, 12 May 2026 08:15:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by b.nours.eu (Postfix, from userid 1001) id DE0D63D576; Tue, 12 May 2026 10:15:21 +0200 (CEST) Date: Tue, 12 May 2026 10:15:21 +0200 From: Baptiste Daroussin To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8b70a203be10 - main - nuageinit: fix command injection and related issues Message-ID: References: <6a02dc5c.24b1f.734d8e95@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: <6a02dc5c.24b1f.734d8e95@gitrepo.freebsd.org> On Tue 12 May 07:53, Baptiste Daroussin wrote: > The branch main has been updated by bapt: > > URL: https://cgit.FreeBSD.org/src/commit/?id=8b70a203be10411c560ed303ab25713d70b316e9 > > commit 8b70a203be10411c560ed303ab25713d70b316e9 > Author: Baptiste Daroussin > AuthorDate: 2026-05-07 18:22:14 +0000 > Commit: Baptiste Daroussin > CommitDate: 2026-05-12 07:52:32 +0000 > > nuageinit: fix command injection and related issues > > - Add shell_escape() helper to safely escape shell arguments > - Apply shell_escape to all user-controlled values in shell commands: > adduser (usershow, useradd, lock, primary_group, groups) > addgroup (groupshow, groupadd, members) > exec_change_password (usermod) > settimezone (tzsetup root and timezone) > install_package (pkg package names) > - Escape double quotes in hostname when writing rc.conf.d/hostname > - Add missing 'local' declaration for resolvconf_command in nameservers() > - Escape interface name in resolvconf -a command > - Change open_resolvconf_conf() from 'w' to 'a' mode to prevent > data loss when nameservers() is called multiple times > - Clean up stale resolvconf.conf at the start of each boot > (skip on postnet to preserve config written by first call) > > MFC After: 1 day Part of this has been reported by: Yazdan Soltani sorry I forgot to mention. Best regards, Bapt From nobody Tue May 12 09:20: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 4gFB0Y3D6Kz6dLpN; Tue, 12 May 2026 09:21:01 +0000 (UTC) (envelope-from ivy@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 4gFB0Y2hndz3HkQ; Tue, 12 May 2026 09:21:01 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778577661; 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=TYFFkcRKWU6Y9keTpBRlwsX8oGPhAXFRTr/0AT7scRY=; b=sELA9WN+iqkeujZksGKng0dRqLF3RAclU1sDnZUMMEMupAHnjgLpvl+EUp31anMTcjwqMy tRJiRn4wySukV3XLHuVP3TgOF/osNFVOu5Tj47a2AJU7J0wJg83mqofHUwahRtZjvh1s6/ P1ZZ3m7kwqxJWQ/6JyG6e3t1hXDtkyklojnZ9Xqp/LlDEbBGako1keooPg031RNhPtUtCy aa6PzEvz+08b5X9pnFuODOEof+2X4AjVAQ5D8aeDoaovO4mSkcpmEdspNVvsu9zsnY58TG ZvcjXuYOJl2fZjA43hjK49OPmgug7T6DYVnZYCsS/5TDufPrccnByp03mlRGKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778577661; a=rsa-sha256; cv=none; b=xPrZ1dt0SDgHi2Prvz98LC07joHcv4KqOHqhx90/FXutH/GTlw507Vl+Z/XiyIpQArRRSj IKuxteh3HMBWHwYgqFmZbrnv9CciEmQuTc1e6UnjbrNkP3uqvmZy4xMYdNulnjttQLmAps k130f/nvF4nbZowEk81UIz0R1JALpCGvo7hK5mtQy+34GdPiCFObahOdKFptaiY4cW81Ek F+a5MzuZE2GjvYhJBrkIq+Sa9hfQLD0bne2AZ4+aIQXUPh8cTb/9cZgerQhkZ8vk1qHGx6 vxJhynt1ezbeQYu4h6YMZuHYc1VYpqlv4grvohFnIcLSsgmlkWQRToVkB3kirg== 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=1778577661; 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=TYFFkcRKWU6Y9keTpBRlwsX8oGPhAXFRTr/0AT7scRY=; b=LZFP2n+GtoeeTvHhjbI1Rjt9Zup79/RRu/QzdjBz4C6VfHmeSmQHXTSYqoYcxEllDyGK5P 8FHkUOwb03SpmEZUxGykGeyjT3NxlmcT/QEArOo3/L/oUnE2oXgM9sAiAIsjMgyYusHW58 SWhdvCdGt0qdrPCD1h79vsrY9qSytO4uSf8HpoVXuuK0WhNs2WVEX9yrYNQDEcGGKMZIZM m86plmNZG/9Xl2O0h1xNUrbt3pd8bVVNX6oN/C6AFQlFnJD9+3zh49huYw0wBz5AGqP8tg Xeyiq+ct6vYPaFUbdntC8uUWOspgSuIbZJNqZt2U84DrLxc/aKqncVFH8d8krQ== Received: from rose.le-fay.org (rose.le-fay.org [IPv6:2a00:1098:6b:400::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: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gFB0X5lgSzkm7; Tue, 12 May 2026 09:21:00 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Tue, 12 May 2026 10:20:59 +0100 From: Lexi Winter To: Chuck Tuffli Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 25942dddc8a8 - main - smart: Connect contrib/smart to build Message-ID: Mail-Followup-To: Chuck Tuffli , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <6a025660.37fa7.6a3f7fc0@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; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="wPgJQBgrz6YCK84D" Content-Disposition: inline In-Reply-To: <6a025660.37fa7.6a3f7fc0@gitrepo.freebsd.org> --wPgJQBgrz6YCK84D Content-Type: text/plain; charset=us-ascii Content-Disposition: inline hello, Chuck Tuffli wrote in <6a025660.37fa7.6a3f7fc0@gitrepo.freebsd.org>: > smart: Connect contrib/smart to build this has broken the armv7 build: --- all_subdir_usr.sbin/smart --- /aux0/ci/worker/main-linux-clang-armv7/build/contrib/smart/libsmart.c:1351:26: error: format specifies type 'unsigned long' but the argument has type 'size_t' (aka 'unsigned int') [-Werror,-Wformat] 1350 | dprintf("bad read (%d) from page %#x (bytes=%lu)\n", rc, | ~~~ | %zu 1351 | plist->pages[p].id, plist->pages[p].bytes); | ^~~~~~~~~~~~~~~~~~~~~ /aux0/ci/worker/main-linux-clang-armv7/build/contrib/smart/libsmart_priv.h:36:69: note: expanded from macro 'dprintf' 36 | #define dprintf(f, ...) if (do_debug) fprintf(stderr, "dbg: " f, ## __VA_ARGS__) | ~ ^~~~~~~~~~~ 1 error generated. --wPgJQBgrz6YCK84D Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCagLw9wAKCRD1nT63mIK/ YNpJAP9qIApUQMf7+9CPkHZ+tvbwX9G3eTmTyC+v5JO0Ol/jpwEA9sGDhT0aPO+v M7TPgcMNaLpgWjXRyfZTbt8BAGrtGw0= =SkBm -----END PGP SIGNATURE----- --wPgJQBgrz6YCK84D-- From nobody Tue May 12 09:53: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 4gFBjY2W8cz6dPDr for ; Tue, 12 May 2026 09:53: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 4gFBjY1tpRz3WCh for ; Tue, 12 May 2026 09:53:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778579585; 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=P6QfCeNyUe55iwYIgv2yjKUkbD7a+4qlFO6eYxGlUtw=; b=X7gqTCygX7ALw7qjFXPygdqt/3o9c9AMQBZt4TBOczm6pDONWWL4E0lQ5Zk+3hS9LyXAKt f0FlgTzGo7N3IjWh5PBiK8yDPssLeTweleRwDOM+F6Y35Umu3HnAOWj3pftiabqINXgUTZ vg0NPWOvlodc9oEljHGvSgkG8i1rbnq2kRKILNQNlZcVxXPogH/4vQ2lN2Rcrs5V7L8dBq DOR13iU6Log91C66WS35VBZYPgfqMpvSYBsMqchSk61bMvhNCPwtF/jqrBIHHXpmCrWzSl gpqyWndGS7Wlr1+GP5y6YjZeXnBUg/GPLXPTsOmptWALwECZ+ZX8c8QngtjNOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778579585; a=rsa-sha256; cv=none; b=OJZfBSMia/OcchT70LvMG6W3q2U7mwpRB8PsmK1FYx9xvjrQmohafXTv/NlLUix3gIlRqo 7x4B3xW930ZNIA0qRYijXR3R9h2oNXZQt8PHTvBH4J94CfDogA2GqxK1gdBuQx+IPb1bt3 Sd4XFrqb1JUeODMaQ/Ox9/O6bg+nnQL7VJdNqMZRPeIkOgv68AplVAuusMRjdaaBQOVZJ7 7BJEenr7vlRnNcySN5YWDUSKqx1SjK92lbbGaREE6Qmcv51QIFkIJLmEqXrHRK9B8/FrP3 NAdYvnbmFcsATXVi2FEtzYM58bAfpFCSbMqla6INelmTOx2MgpO30i4saJuhtQ== 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=1778579585; 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=P6QfCeNyUe55iwYIgv2yjKUkbD7a+4qlFO6eYxGlUtw=; b=UN8K2l27YgcOhkuybK3xQyR9utIugoJMhEKVwkqhMvmOn8ch1DJHX5Ezmkhk8mFvgdUA5m vY+ejT3sSuEmTDuCBp45GNf6Au8xcZXFJzy1d5LhhQbtKMg0tszWs32EgMMAgCfXbhfBDJ 6p0P4JGvzYnlvT67YHdEOQsqorM4BSpE4A0V4bplsR9s0QTaPvcTGe8ULlH4EEY6wbT21U 4pfi4hhEczn6i9RJjnMC/jHaz/aA7J8JBfj1pPbzl6wUAD6DOa6+u59eCIVTd/0A/uXuws fUmPB33gzhlpfZGwpUZlwk7rSKaEE+2sf53nQvVmER8a3DqSxxW0tEN47WWVpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFBjY11BBzy1S for ; Tue, 12 May 2026 09:53:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39142 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 09:53:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 6f451c60918f - main - power: Rename power transition 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: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f451c60918f2152ebe89f561f04e5219cecffa6 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 09:53:05 +0000 Message-Id: <6a02f881.39142.4116e66@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=6f451c60918f2152ebe89f561f04e5219cecffa6 commit 6f451c60918f2152ebe89f561f04e5219cecffa6 Author: Aymeric Wibo AuthorDate: 2026-05-12 09:46:19 +0000 Commit: Aymeric Wibo CommitDate: 2026-05-12 09:46:24 +0000 power: Rename power transition enum Just so it isn't so long. Changing now before the API freezes, after discussion with olce@. While here, improve the wording in the comments for power transitions and sleep types a bit. Reviewed by: olce Approved by: olce Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56953 --- sys/dev/acpi_support/acpi_ibm.c | 2 +- sys/dev/syscons/syscons.c | 4 ++-- sys/dev/vt/vt_core.c | 4 ++-- sys/kern/subr_power.c | 8 ++++---- sys/sys/power.h | 19 ++++++++++--------- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c index 1221384e7d8a..2967832a0878 100644 --- a/sys/dev/acpi_support/acpi_ibm.c +++ b/sys/dev/acpi_support/acpi_ibm.c @@ -1453,7 +1453,7 @@ acpi_ibm_eventhandler(struct acpi_ibm_softc *sc, int arg) * instead of suspend-to-RAM. */ case IBM_EVENT_SUSPEND_TO_RAM: - power_pm_suspend(POWER_SSTATE_TRANSITION_SUSPEND); + power_pm_suspend(POWER_TRANSITION_SUSPEND); break; case IBM_EVENT_BLUETOOTH: diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 1a2969d6f2d8..fe440b68f209 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -3987,10 +3987,10 @@ next_code: break; case SUSP: - power_pm_suspend(POWER_SSTATE_TRANSITION_SUSPEND); + power_pm_suspend(POWER_TRANSITION_SUSPEND); break; case STBY: - power_pm_suspend(POWER_SSTATE_TRANSITION_STANDBY); + power_pm_suspend(POWER_TRANSITION_STANDBY); break; case DBG: diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index f7cffcea5b92..68e9f45cff56 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -804,11 +804,11 @@ vt_machine_kbdevent(struct vt_device *vd, int c) return (1); case SPCLKEY | STBY: /* XXX Not present in kbdcontrol parser. */ /* Put machine into Stand-By mode. */ - power_pm_suspend(POWER_SSTATE_TRANSITION_STANDBY); + power_pm_suspend(POWER_TRANSITION_STANDBY); return (1); case SPCLKEY | SUSP: /* kbdmap(5) keyword `susp`. */ /* Suspend machine. */ - power_pm_suspend(POWER_SSTATE_TRANSITION_SUSPEND); + power_pm_suspend(POWER_TRANSITION_SUSPEND); return (1); } diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c index 761c9c0639ce..47682a0ee75e 100644 --- a/sys/kern/subr_power.c +++ b/sys/kern/subr_power.c @@ -176,7 +176,7 @@ power_pm_get_type(void) } void -power_pm_suspend(enum power_sstate_transition trans) +power_pm_suspend(enum power_transition trans) { enum power_stype stype; @@ -184,13 +184,13 @@ power_pm_suspend(enum power_sstate_transition trans) return; switch (trans) { - case POWER_SSTATE_TRANSITION_STANDBY: + case POWER_TRANSITION_STANDBY: stype = power_standby_stype; break; - case POWER_SSTATE_TRANSITION_SUSPEND: + case POWER_TRANSITION_SUSPEND: stype = power_suspend_stype; break; - case POWER_SSTATE_TRANSITION_HIBERNATE: + case POWER_TRANSITION_HIBERNATE: stype = power_hibernate_stype; break; default: diff --git a/sys/sys/power.h b/sys/sys/power.h index 85e0b12391ff..e420717e1aa7 100644 --- a/sys/sys/power.h +++ b/sys/sys/power.h @@ -48,21 +48,22 @@ * Sleep state transition requests. * * These are high-level sleep states that the system can enter. They map to - * a specific generic sleep type (enum power_stype). + * a specific generic sleep type (enum power_stype), depending on the + * kern.power.* sysctls. */ -enum power_sstate_transition { - POWER_SSTATE_TRANSITION_STANDBY, - POWER_SSTATE_TRANSITION_SUSPEND, - POWER_SSTATE_TRANSITION_HIBERNATE, +enum power_transition { + POWER_TRANSITION_STANDBY, + POWER_TRANSITION_SUSPEND, + POWER_TRANSITION_HIBERNATE, }; /* * Sleep type. * * These are the specific generic methods of entering a sleep state. E.g. - * POWER_SSTATE_TRANSITION_SUSPEND could be set to enter either suspend-to-RAM - * (which is S3 on ACPI systems), or suspend-to-idle (S0ix on ACPI systems). - * This would be done through the kern.power.suspend sysctl. + * POWER_TRANSITION_SUSPEND could be set to enter either firmware suspend (which + * is suspend-to-RAM or S3 on ACPI systems), or suspend-to-idle (S0ix on ACPI + * platforms). This would be done through the kern.power.suspend sysctl. */ enum power_stype { POWER_STYPE_AWAKE, @@ -96,7 +97,7 @@ extern int power_pm_register(u_int _pm_type, power_pm_fn_t _pm_fn, void *_pm_arg, bool _pm_supported[static POWER_STYPE_COUNT]); extern u_int power_pm_get_type(void); -extern void power_pm_suspend(enum power_sstate_transition _trans); +extern void power_pm_suspend(enum power_transition _trans); /* * System power API. From nobody Tue May 12 10:20: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 4gFCKQ2q59z6dQsV for ; Tue, 12 May 2026 10:20: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 4gFCKP74xSz3bK7 for ; Tue, 12 May 2026 10:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778581242; 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=P4j7l9D/EslOB8JAowTcSWZiwmz2i9eK02FukDtvXMI=; b=QkhmUdtyTQ7zoIAps5AT5U792A1VFKfqJmi1edVIfxaLj7g0+UDfhNXyYmGjKwCjAFUJD/ 6ufdw38w1/lVZSfaf36ILb16qnKHXtUCNMOgB1kD+8MOQO85+jWpUPliQ/k3jGDNzZV0tn hWVfH5W/RFRZbxtBTwLaeWu2Ev+Yce0LcJQR6oct02WNYkmIv7w7jDQ8LWv7hpUCzzOVm+ wZgah1p2NKlEEEByiUF9WvUjJh12LQGoCZgdZVLV2eLqAPJDxjcC4SL7zKRFV9xcYDuvI6 5mNhF+HBAL4p0eCy1MIJt//0CFRaZuvb7/UJ/8K4rdWXQMxR6aomxGHVEpTl6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778581242; a=rsa-sha256; cv=none; b=jvX4MIipgbZv8kj9tLuhZhERNbiAfVwjzHCj/d1NmK8ulKpt7d086YsW0FHQ6MD0sqtA4U CBru86+n6Prjt1KeTrnxfzvv3+FagHGKL0qFpDJ/qIuyOxRDjY95tw9dFGxf/TbxNzAmci 2KVgo/ORJRjfXoLUoHSNLWVsPKHtnQ12gB/soJBJnXhv1pYIUduMwfcdiBNoLGZ9BvjIlp 3smcJJ1e8P8xKldNZCVWBalhYGo315nHMBBQ5DHUqUduqQ3xM9qGch6QiH/KMPJI6+aJ7t 1sXZ0o88k+C5gT41qDnjPE4ynoz5vPyp1wcp/2R0tvyTzBP4Ej1Mn4HmnsYrUQ== 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=1778581242; 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=P4j7l9D/EslOB8JAowTcSWZiwmz2i9eK02FukDtvXMI=; b=X2bvAX9jo2bhBV7RFACvDTLJKvkrG6zdMDIKBocMqOJJE1YOjjkne8LUjO7IKchrvuiEO7 tbMr5Dx/kncvIn2USYqj35n+LOvxJ/oA1MgIeRCDcBloJIi0Ao1eg5Bpss7ikrknfAd3lf vyLv/4Wn0DNxPU/8TqjWEiPtIwOuIDbH3vNLlPV23fsDtw1QXe0larmMKGe9YbV4RhG5WZ QvPhv4h7ZpheJK8JLPD7Hb30wQPSR8uzoNJU3ab0T3dO0O0p913iRrvfoJR72Nv3I6MXul gbpXgN4f3amvQHJqQu2r/P4k/X+BLePPStums5VBrY9ZS4T+LeRM2Nf3tWDkCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFCKP6cbMzyYD for ; Tue, 12 May 2026 10:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c055 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 10:20:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: bcecad2c24aa - main - riscv: IOMMU 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: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcecad2c24aa500913559c00f1be8b364a3ff150 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 10:20:41 +0000 Message-Id: <6a02fef9.3c055.3a6526da@gitrepo.freebsd.org> The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=bcecad2c24aa500913559c00f1be8b364a3ff150 commit bcecad2c24aa500913559c00f1be8b364a3ff150 Author: Ruslan Bukin AuthorDate: 2026-05-12 10:09:04 +0000 Commit: Ruslan Bukin CommitDate: 2026-05-12 10:11:32 +0000 riscv: IOMMU support Support for RISC-V IOMMU spec v1.0.1 (ratified) https://github.com/riscv-non-isa/riscv-iommu Supports translation for PCI devices only. Supports 1 or 2-level device-directory-table (DDT). Supports SV39 and SV48 virtual memory system (on per-device basis). Supports both "standard" and "extended" device-context (DC) structure. Supports "bypass" mode to disable translation for a particular device. Supports WSI (Wire-Signalled Interrupts) only. This includes both PCI-bus and FDT attachment drivers. Note in case of PCI-bus attachment, interrupts are not available. In this case no error report is provided in case of translation fault. Otherwise interrupts are not needed. Differential Revision: https://reviews.freebsd.org/D55922 --- sys/conf/files.riscv | 9 + sys/riscv/conf/GENERIC | 1 + sys/riscv/include/bus_dma_impl.h | 3 + sys/riscv/include/iommu.h | 10 + sys/riscv/iommu/iommu.c | 1351 ++++++++++++++++++++++++++++++++++++++ sys/riscv/iommu/iommu.h | 359 ++++++++++ sys/riscv/iommu/iommu_fdt.c | 145 ++++ sys/riscv/iommu/iommu_frontend.c | 505 ++++++++++++++ sys/riscv/iommu/iommu_frontend.h | 38 ++ sys/riscv/iommu/iommu_if.m | 147 +++++ sys/riscv/iommu/iommu_pci.c | 172 +++++ sys/riscv/iommu/iommu_pmap.c | 629 ++++++++++++++++++ sys/riscv/iommu/iommu_pmap.h | 49 ++ 13 files changed, 3418 insertions(+) diff --git a/sys/conf/files.riscv b/sys/conf/files.riscv index 90a74367a54f..58a31b5f326e 100644 --- a/sys/conf/files.riscv +++ b/sys/conf/files.riscv @@ -6,6 +6,7 @@ cddl/dev/fbt/riscv/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${ crypto/des/des_enc.c optional netsmb dev/cpufreq/cpufreq_dt.c optional cpufreq fdt dev/ofw/ofw_cpu.c optional fdt +dev/ofw/ofw_pci.c optional pci fdt dev/ofw/ofw_pcib.c optional pci fdt dev/pci/pci_dw.c optional pci fdt dev/pci/pci_dw_if.m optional pci fdt @@ -42,6 +43,14 @@ libkern/memset.c standard libkern/strcmp.c standard libkern/strlen.c standard libkern/strncmp.c standard +riscv/iommu/iommu_frontend.c standard +riscv/iommu/iommu_if.m standard +riscv/iommu/iommu.c standard +riscv/iommu/iommu_fdt.c optional fdt +riscv/iommu/iommu_pci.c optional pci +riscv/iommu/iommu_pmap.c optional iommu +dev/iommu/busdma_iommu.c optional iommu +dev/iommu/iommu_gas.c optional iommu riscv/riscv/aplic.c standard riscv/riscv/autoconf.c standard riscv/riscv/bus_machdep.c standard diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 827d5efef50b..cce2787ed5d7 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -77,6 +77,7 @@ options RACCT # Resource accounting framework options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default options RCTL # Resource limits options SMP +options IOMMU # RISC-V SBI console device rcons diff --git a/sys/riscv/include/bus_dma_impl.h b/sys/riscv/include/bus_dma_impl.h index 09fd29b74f8e..8c2040a68f52 100644 --- a/sys/riscv/include/bus_dma_impl.h +++ b/sys/riscv/include/bus_dma_impl.h @@ -41,6 +41,7 @@ struct bus_dma_tag_common { int flags; bus_dma_lock_t *lockfunc; void *lockfuncarg; + int domain; }; struct bus_dma_impl { @@ -52,6 +53,8 @@ struct bus_dma_impl { int (*tag_destroy)(bus_dma_tag_t dmat); int (*map_create)(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp); int (*map_destroy)(bus_dma_tag_t dmat, bus_dmamap_t map); + int (*tag_set_domain)(bus_dma_tag_t); + bool (*id_mapped)(bus_dma_tag_t, vm_paddr_t, bus_size_t); int (*mem_alloc)(bus_dma_tag_t dmat, void** vaddr, int flags, bus_dmamap_t *mapp); void (*mem_free)(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map); diff --git a/sys/riscv/include/iommu.h b/sys/riscv/include/iommu.h new file mode 100644 index 000000000000..38214b7003f4 --- /dev/null +++ b/sys/riscv/include/iommu.h @@ -0,0 +1,10 @@ +/*- + * This file is in the public domain. + */ + +#ifndef _MACHINE_IOMMU_H_ +#define _MACHINE_IOMMU_H_ + +#include + +#endif /* !_MACHINE_IOMMU_H_ */ diff --git a/sys/riscv/iommu/iommu.c b/sys/riscv/iommu/iommu.c new file mode 100644 index 000000000000..59df2e68384f --- /dev/null +++ b/sys/riscv/iommu/iommu.c @@ -0,0 +1,1351 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 Ruslan Bukin + * + * 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. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include + +#include +#include + +#include +#include +#include + +#include "iommu_if.h" + +#define dprintf(fmt, ...) + +MALLOC_DEFINE(M_IOMMU, "RISCV_IOMMU", "RISC-V IOMMU"); + +#define RD4(sc, reg) bus_read_4(sc->res[0], (reg)) +#define WR4(sc, reg, val) bus_write_4(sc->res[0], (reg), (val)) +#define RD8(sc, reg) bus_read_8(sc->res[0], (reg)) +#define WR8(sc, reg, val) bus_write_8(sc->res[0], (reg), (val)) + +#define CQ_ENTRY_DWORDS 2 /* 16-byte */ +#define CQ_ENTRY_COUNT 8192 /* Amount of 16-byte entries. */ +#define FQ_ENTRY_DWORDS 4 /* 32-byte */ +#define FQ_ENTRY_COUNT 8192 /* Amount of 32-byte entries. */ +#define PQ_ENTRY_DWORDS 2 /* 16-byte */ +#define PQ_ENTRY_COUNT 8192 /* Amount of 16-byte entries. */ + +#define DDT_NON_LEAF_DWORDS 1 +#define DDT_DC_STD_DWORDS 4 /* Standard-format DC. */ +#define DDT_DC_EXT_DWORDS 8 /* Extended-format DC. */ +#define DDT_L1_DID_BITS 9 /* All formats. */ + +#define QUEUE_ALIGN (1024 * 1024) /* TODO */ +#define QUEUE_HEAD(q) ((q)->csr + RISCV_IOMMU_CQH - RISCV_IOMMU_CQB) +#define QUEUE_TAIL(q) ((q)->csr + RISCV_IOMMU_CQT - RISCV_IOMMU_CQB) +#define QUEUE_IPSR(q) (1 << (q)->idx) + +#define PHYS_TO_PPN(p) ((p) >> 12) + +struct riscv_iommu_fq_event { + uint16_t cause_id; + char *descr; +}; + +static struct riscv_iommu_fq_event fq_events[] = { + { FQ_CAUSE_INST_FAULT, "Instruction access fault" }, + { FQ_CAUSE_RD_ADDR_MISALIGNED, "Read address misaligned" }, + { FQ_CAUSE_RD_FAULT, "Read access fault" }, + { FQ_CAUSE_WR_ADDR_MISALIGNED, "Write/AMO address misaligned" }, + { FQ_CAUSE_WR_FAULT, "Write/AMO access fault" }, + { FQ_CAUSE_INST_FAULT_S, "Instruction page fault" }, + { FQ_CAUSE_RD_FAULT_S, "Read page fault" }, + { FQ_CAUSE_WR_FAULT_S, "Write/AMO page fault" }, + { FQ_CAUSE_INST_FAULT_VS, "Instruction guest page fault" }, + { FQ_CAUSE_RD_FAULT_VS, "Read guest-page fault" }, + { FQ_CAUSE_WR_FAULT_VS, "Write/AMO guest-page fault" }, + { FQ_CAUSE_DMA_DISABLED, "All inbound transactions disallowed" }, + { FQ_CAUSE_DDT_LOAD_FAULT, "DDT entry load access fault" }, + { FQ_CAUSE_DDT_INVALID, "DDT entry not valid" }, + { FQ_CAUSE_DDT_MISCONFIGURED, "DDT entry misconfigured" }, + { FQ_CAUSE_TR_TYPE_DISALLOWED, "Transaction type disallowed" }, + { FQ_CAUSE_MSI_LOAD_FAULT, "MSI PTE load access fault" }, + { FQ_CAUSE_MSI_INVALID, "MSI PTE not valid" }, + { FQ_CAUSE_MSI_MISCONFIGURED, "MSI PTE misconfigured" }, + { FQ_CAUSE_MRIF_FAULT, "MRIF access fault" }, + { FQ_CAUSE_PDT_LOAD_FAULT, "PDT entry load access fault" }, + { FQ_CAUSE_PDT_INVALID, "PDT entry not valid" }, + { FQ_CAUSE_PDT_MISCONFIGURED, "PDT entry misconfigured" }, + { FQ_CAUSE_DDT_CORRUPTED, "DDT data corruption" }, + { FQ_CAUSE_PDT_CORRUPTED, "PDT data corruption" }, + { FQ_CAUSE_MSI_PT_CORRUPTED, "MSI PT data corruption" }, + { FQ_CAUSE_MRIF_CORRUPTED, "MSI MRIF data corruption" }, + { FQ_CAUSE_INTERNAL_DP_ERROR, "Internal data path error" }, + { FQ_CAUSE_MSI_WR_FAULT, "IOMMU MSI write access fault" }, + { FQ_CAUSE_PT_CORRUPTED, "1st/2nd-stage PT data corruption" }, + { 0, NULL }, +}; + +static void +riscv_iommu_init_pscids(struct riscv_iommu_softc *sc) +{ + + sc->pscid_set_size = (1 << sc->pscid_bits); + sc->pscid_set = bit_alloc(sc->pscid_set_size, M_IOMMU, M_WAITOK); + mtx_init(&sc->pscid_set_mutex, "pscid set", NULL, MTX_SPIN); +} + +static int +riscv_iommu_pscid_alloc(struct riscv_iommu_softc *sc, int *new_pscid) +{ + + mtx_lock_spin(&sc->pscid_set_mutex); + bit_ffc(sc->pscid_set, sc->pscid_set_size, new_pscid); + if (*new_pscid == -1) { + mtx_unlock_spin(&sc->pscid_set_mutex); + return (ENOMEM); + } + bit_set(sc->pscid_set, *new_pscid); + mtx_unlock_spin(&sc->pscid_set_mutex); + + return (0); +} + +static void +riscv_iommu_pscid_free(struct riscv_iommu_softc *sc, int pscid) +{ + + mtx_lock_spin(&sc->pscid_set_mutex); + bit_clear(sc->pscid_set, pscid); + mtx_unlock_spin(&sc->pscid_set_mutex); +} + +static uint32_t +riscv_iommu_q_inc_tail(struct riscv_iommu_queue *q) +{ + + return ((q->lc.tail + 1) & q->mask); +} + +static uint32_t +riscv_iommu_q_inc_head(struct riscv_iommu_queue *q) +{ + + return ((q->lc.head + 1) & q->mask); +} + +static int +riscv_iommu_q_has_space(struct riscv_iommu_queue *q) +{ + + if (riscv_iommu_q_inc_tail(q) != q->lc.head) + return (1); + + return (0); +} + +static int +riscv_iommu_q_empty(struct riscv_iommu_queue *q) +{ + + if (q->lc.tail == q->lc.head) + return (1); + + return (0); +} + +static int +riscv_iommu_dequeue(struct riscv_iommu_softc *sc, struct riscv_iommu_queue *q, + void *data) +{ + void *entry_addr; + + q->lc.val = RD8(sc, q->head_off); + entry_addr = (void *)((uint64_t)q->vaddr + q->lc.head * q->entry_size); + memcpy(data, entry_addr, q->entry_size); + q->lc.head = riscv_iommu_q_inc_head(q); + WR4(sc, q->head_off, q->lc.head); + + return (0); +} + +static int +riscv_iommu_enqueue(struct riscv_iommu_softc *sc, struct riscv_iommu_queue *q, + void *data) +{ + void *entry_addr; + + RISCV_IOMMU_LOCK(sc); + + /* Ensure that a space is available. */ + do { + q->lc.head = RD4(sc, q->head_off); + } while (riscv_iommu_q_has_space(q) == 0); + + /* Write the command to the current tail entry. */ + entry_addr = (void *)((uint64_t)q->vaddr + q->lc.tail * q->entry_size); + memcpy(entry_addr, data, q->entry_size); + + /* Increment tail index. */ + q->lc.tail = riscv_iommu_q_inc_tail(q); + WR4(sc, q->tail_off, q->lc.tail); + + RISCV_IOMMU_UNLOCK(sc); + + return (0); +} + +static void +riscv_iommu_sync(struct riscv_iommu_softc *sc, struct riscv_iommu_queue *q) +{ + struct riscv_iommu_command cmd; + uint64_t reg; + + bzero(&cmd, sizeof(struct riscv_iommu_command)); + reg = COMMAND_OPCODE_IOFENCE; + reg |= FUNC_IOFENCE_FUNC_C | FUNC_IOFENCE_PR | FUNC_IOFENCE_PW; + cmd.dword0 = reg; + + riscv_iommu_enqueue(sc, &sc->cq, (void *)&cmd); + + /* + * FUNC_IOFENCE_WSI does not seem to be implemented in QEMU, + * so ensure all requests are processed in polling mode; + */ + do { + q->lc.head = RD4(sc, q->head_off); + } while (riscv_iommu_q_empty(q) == 0); +} + +static int +riscv_iommu_inval_ddt(struct riscv_iommu_softc *sc) +{ + struct riscv_iommu_command cmd; + uint64_t reg; + + bzero(&cmd, sizeof(struct riscv_iommu_command)); + reg = COMMAND_OPCODE_IODIR; + reg |= FUNC_IODIR_INVAL_DDT; + cmd.dword0 = reg; + + riscv_iommu_enqueue(sc, &sc->cq, (void *)&cmd); + + return (0); +} + +static int +riscv_iommu_inval_ddt_did(struct riscv_iommu_softc *sc, int did) +{ + struct riscv_iommu_command cmd; + uint64_t reg; + + bzero(&cmd, sizeof(struct riscv_iommu_command)); + reg = COMMAND_OPCODE_IODIR; + reg |= FUNC_IODIR_INVAL_DDT; + reg |= FUNC_IODIR_DV; + reg |= (uint64_t)did << FUNC_IODIR_DID_S; + cmd.dword0 = reg; + + riscv_iommu_enqueue(sc, &sc->cq, (void *)&cmd); + + return (0); +} + +/* Invalidate entire address space. */ +static int +riscv_iommu_inval_vma(struct riscv_iommu_softc *sc) +{ + struct riscv_iommu_command cmd; + uint64_t reg; + + bzero(&cmd, sizeof(struct riscv_iommu_command)); + reg = COMMAND_OPCODE_IOTINVAL; + reg |= FUNC_IOTINVAL_VMA; + cmd.dword0 = reg; + + riscv_iommu_enqueue(sc, &sc->cq, (void *)&cmd); + + return (0); +} + +static int +riscv_iommu_inval_vma_page(struct riscv_iommu_softc *sc, vm_offset_t addr, + int pscid) +{ + struct riscv_iommu_command cmd; + uint64_t reg; + + bzero(&cmd, sizeof(struct riscv_iommu_command)); + reg = COMMAND_OPCODE_IOTINVAL; + reg |= FUNC_IOTINVAL_VMA; + reg |= FUNC_IOTINVAL_AV; + reg |= FUNC_IOTINVAL_PSCV; + reg |= pscid << FUNC_IOTINVAL_PSCID_S; + cmd.dword0 = reg; + cmd.dword1 = PHYS_TO_PPN(addr) << FUNC_IOTINVAL_ADDR_S; + + riscv_iommu_enqueue(sc, &sc->cq, (void *)&cmd); + + return (0); +} + +static int +riscv_iommu_inval_vma_pscid(struct riscv_iommu_softc *sc, int pscid) +{ + struct riscv_iommu_command cmd; + uint64_t reg; + + bzero(&cmd, sizeof(struct riscv_iommu_command)); + reg = COMMAND_OPCODE_IOTINVAL; + reg |= FUNC_IOTINVAL_VMA; + reg |= FUNC_IOTINVAL_PSCV; + reg |= pscid << FUNC_IOTINVAL_PSCID_S; + cmd.dword0 = reg; + + riscv_iommu_enqueue(sc, &sc->cq, (void *)&cmd); + + return (0); +} + +static int +riscv_iommu_set_mode(struct riscv_iommu_softc *sc) +{ + struct riscv_iommu_ddt *ddt; + uint64_t reg; + uint64_t base; + + reg = RD8(sc, RISCV_IOMMU_DDTP); + if (reg & DDTP_BUSY) + return (ENXIO); + + ddt = &sc->ddt; + base = ddt->base | (sc->iommu_mode << DDTP_IOMMU_MODE_S); + WR8(sc, RISCV_IOMMU_DDTP, base); + + reg = RD8(sc, RISCV_IOMMU_DDTP); + if (reg != base) { + device_printf(sc->dev, "could not set mode\n"); + return (ENXIO); + } + + riscv_iommu_inval_ddt(sc); + riscv_iommu_inval_vma(sc); + + return (0); +} + +static int +riscv_iommu_enable_queue(struct riscv_iommu_softc *sc, + struct riscv_iommu_queue *q) +{ + uint32_t reg; + int timeout; + + if (q == &sc->cq) + WR4(sc, QUEUE_TAIL(q), 0); + else + WR4(sc, QUEUE_HEAD(q), 0); + + reg = CQCSR_CQEN | CQCSR_CIE | CQCSR_CQMF; + WR4(sc, q->csr, reg); + + timeout = 1000; + do { + reg = RD4(sc, RISCV_IOMMU_CQCSR); + if ((reg & CQCSR_BUSY) == 0) + break; + DELAY(10); + } while (timeout--); + + if (timeout <= 0) { + device_printf(sc->dev, "could not enable command queue\n"); + return (-1); + } + + if ((reg & CQCSR_CQON) == 0) { + device_printf(sc->dev, "could not activate command queue\n"); + return (-1); + } + + /* RW1C interrupt pending bit. */ + WR4(sc, RISCV_IOMMU_IPSR, QUEUE_IPSR(q)); + + return (0); +} + +static int +riscv_iommu_init_queue(struct riscv_iommu_softc *sc, + struct riscv_iommu_queue *q, uint64_t base, uint32_t dwords) +{ + uint64_t reg; + int sz; + + q->entry_size = dwords * 8; + sz = (1 << q->size_log2) * q->entry_size; + + /* Set up the command circular buffer */ + q->vaddr = contigmalloc(sz, M_IOMMU, M_WAITOK | M_ZERO, 0, + (1ul << 48) - 1, QUEUE_ALIGN, 0); + if (q->vaddr == NULL) { + device_printf(sc->dev, "failed to allocate %d bytes\n", sz); + return (-1); + } + + q->mask = (1 << q->size_log2) - 1; + q->head_off = (uint32_t)base - RISCV_IOMMU_CQB + RISCV_IOMMU_CQH; + q->tail_off = (uint32_t)base - RISCV_IOMMU_CQB + RISCV_IOMMU_CQT; + q->paddr = vtophys(q->vaddr); + q->base = (sc->cq.size_log2 - 1) << CQB_LOG2SZ_1_S; + q->base |= PHYS_TO_PPN(q->paddr) << CQB_PPN_S; + WR8(sc, base, q->base); + + /* Verify it sticks. */ + reg = RD8(sc, base); + if (reg != q->base) { + device_printf(sc->dev, "could not init queue\n"); + return (ENXIO); + } + + return (0); +} + +static int +riscv_iommu_init_queues(struct riscv_iommu_softc *sc) +{ + int error; + + sc->cq.size_log2 = ilog2(CQ_ENTRY_COUNT); + sc->fq.size_log2 = ilog2(FQ_ENTRY_COUNT); + sc->pq.size_log2 = ilog2(PQ_ENTRY_COUNT); + + sc->cq.csr = RISCV_IOMMU_CQCSR; + sc->fq.csr = RISCV_IOMMU_FQCSR; + sc->pq.csr = RISCV_IOMMU_PQCSR; + + sc->cq.idx = 0; + sc->fq.idx = 1; + sc->pq.idx = 3; + + /* Command queue (CQ). */ + error = riscv_iommu_init_queue(sc, &sc->cq, RISCV_IOMMU_CQB, + CQ_ENTRY_DWORDS); + if (error) + return (error); + + /* Fault queue (FQ). */ + error = riscv_iommu_init_queue(sc, &sc->fq, RISCV_IOMMU_FQB, + FQ_ENTRY_DWORDS); + if (error) + return (error); + + /* Page request queue (PQ). */ + error = riscv_iommu_init_queue(sc, &sc->pq, RISCV_IOMMU_PQB, + PQ_ENTRY_DWORDS); + if (error) + return (error); + + error = riscv_iommu_enable_queue(sc, &sc->cq); + if (error) + return (error); + + error = riscv_iommu_enable_queue(sc, &sc->fq); + if (error) + return (error); + + error = riscv_iommu_enable_queue(sc, &sc->pq); + if (error) + return (error); + + return (0); +} + +static int +riscv_iommu_init_pagedir(struct riscv_iommu_softc *sc) +{ + + return (0); +} + +static void +riscv_iommu_print_fault(struct riscv_iommu_softc *sc, + struct riscv_iommu_fq_record *rec) +{ + struct riscv_iommu_fq_event *ev; + uint16_t cause_id; + uint16_t ttyp; + uint32_t did; + uint32_t pid; + bool pv, priv; + int i; + + cause_id = (rec->hdr & FQR_HDR_CAUSE_M) >> FQR_HDR_CAUSE_S; + ttyp = (rec->hdr & FQR_HDR_TTYP_M) >> FQR_HDR_TTYP_S; + did = (rec->hdr & FQR_HDR_DID_M) >> FQR_HDR_DID_S; + pid = (rec->hdr & FQR_HDR_PID_M) >> FQR_HDR_PID_S; + pv = (rec->hdr & FQR_HDR_PV) ? 1 : 0; + priv = (rec->hdr & FQR_HDR_PRIV) ? 1 : 0; + + ev = NULL; + for (i = 0; fq_events[i].cause_id != 0; i++) { + if (fq_events[i].cause_id == cause_id) { + ev = &fq_events[i]; + break; + } + } + + if (ev == NULL) { + device_printf(sc->dev, "Fault: unknown fault 0x%x received\n", + cause_id); + return; + } + + device_printf(sc->dev, "Fault: event 0x%x received: %s\n", + ev->cause_id, ev->descr); + device_printf(sc->dev, " hdr 0x%lx\n", rec->hdr); + device_printf(sc->dev, " iotval 0x%lx\n", rec->iotval); + device_printf(sc->dev, " iotval2 0x%lx\n", rec->iotval2); + device_printf(sc->dev, " ttyp 0x%x did 0x%x pid 0x%x pv %d priv %d" + "\n", ttyp, did, pid, pv, priv); +} + +static int +riscv_cq_intr(void *arg) +{ + struct riscv_iommu_softc *sc; + struct riscv_iommu_queue *q; + uint32_t reg; + + sc = arg; + q = &sc->cq; + + reg = RD4(sc, q->csr); + printf("%s: pending %x\n", __func__, reg); + + /* Clear pending bit. */ + WR4(sc, RISCV_IOMMU_IPSR, IPSR_CIP); + + return (FILTER_HANDLED); +} + +static int +riscv_fq_intr(void *arg) +{ + struct riscv_iommu_fq_record rec; + struct riscv_iommu_softc *sc; + struct riscv_iommu_queue *q; + uint32_t reg; + + sc = arg; + q = &sc->fq; + + reg = RD4(sc, q->csr); + printf("%s: pending %x\n", __func__, reg); + + /* Clear pending bit. */ + WR4(sc, RISCV_IOMMU_IPSR, IPSR_FIP); + + do { + riscv_iommu_dequeue(sc, q, &rec); + riscv_iommu_print_fault(sc, &rec); + } while (!riscv_iommu_q_empty(q)); + + return (FILTER_HANDLED); +} + +static int +riscv_pm_intr(void *arg) +{ + struct riscv_iommu_softc *sc; + + sc = arg; + + printf("%s\n", __func__); + + /* Clear pending bit. */ + WR4(sc, RISCV_IOMMU_IPSR, IPSR_PMIP); + + return (FILTER_HANDLED); +} + +static int +riscv_pq_intr(void *arg) +{ + struct riscv_iommu_softc *sc; + struct riscv_iommu_queue *q; + uint32_t reg; + + sc = arg; + q = &sc->pq; + + reg = RD4(sc, q->csr); + printf("%s: pending %x\n", __func__, reg); + + /* Clear pending bit. */ + WR4(sc, RISCV_IOMMU_IPSR, IPSR_PIP); + + return (FILTER_HANDLED); +} + +static int +riscv_iommu_init_ddt_linear(struct riscv_iommu_softc *sc) +{ + struct riscv_iommu_ddt *ddt; + uint64_t size; + uint64_t reg; + + ddt = &sc->ddt; + ddt->num_top_entries = (1 << sc->l0_did_bits); + + size = ddt->num_top_entries * (sc->dc_dwords << 3); + + if (bootverbose) + device_printf(sc->dev, "linear ddt size %ld, num_top_entries " + "%d\n", size, ddt->num_top_entries); + + ddt->vaddr = contigmalloc(size, M_IOMMU, + M_WAITOK | M_ZERO, /* flags */ + 0, /* low */ + (1ul << 48) - 1, /* high */ + size, /* alignment */ + 0); /* boundary */ + if (ddt->vaddr == NULL) { + device_printf(sc->dev, "failed to allocate ddt\n"); + return (ENXIO); + } + + reg = vtophys(ddt->vaddr); + if (bootverbose) + device_printf(sc->dev, "ddt base %p size %lx\n", ddt->vaddr, + size); + ddt->base = PHYS_TO_PPN(reg) << DDTP_PPN_S; + + return (0); +} + +static int +riscv_iommu_init_ddt_2lvl(struct riscv_iommu_softc *sc) +{ + struct riscv_iommu_ddt *ddt; + uint64_t size; + uint64_t reg; + uint64_t sz; + + ddt = &sc->ddt; + ddt->num_top_entries = (1 << DDT_L1_DID_BITS); + + size = ddt->num_top_entries * (DDT_NON_LEAF_DWORDS << 3); + + if (bootverbose) + device_printf(sc->dev, "%s: size %lu, l1 entries %d, size " + "%lu\n", __func__, size, ddt->num_top_entries, size); + + ddt->vaddr = contigmalloc(size, M_IOMMU, + M_WAITOK | M_ZERO, /* flags */ + 0, /* low */ + (1ul << 48) - 1, /* high */ + size, /* alignment */ + 0); /* boundary */ + if (ddt->vaddr == NULL) { + device_printf(sc->dev, "Failed to allocate 2lvl ddt.\n"); + return (ENOMEM); + } + + sz = ddt->num_top_entries * sizeof(struct l1_desc); + ddt->l1 = malloc(sz, M_IOMMU, M_WAITOK | M_ZERO); + + reg = vtophys(ddt->vaddr); + if (bootverbose) + device_printf(sc->dev, "ddt base %p size %lx\n", ddt->vaddr, + size); + ddt->base = PHYS_TO_PPN(reg) << DDTP_PPN_S; + + return (0); +} + +static int +riscv_iommu_init_l0_directory(struct riscv_iommu_softc *sc, int sid) +{ + struct riscv_iommu_ddt *ddt; + struct l1_desc *l1_desc; + uint64_t *l1e; + uint64_t val; + size_t size; + int i; + + ddt = &sc->ddt; + l1_desc = &ddt->l1[sid >> sc->l0_did_bits]; + if (l1_desc->va) { + /* Already allocated. */ + return (0); + } + + size = (1 << sc->l0_did_bits) * (sc->dc_dwords << 3); + + l1_desc->va = contigmalloc(size, M_IOMMU, + M_WAITOK | M_ZERO, /* flags */ + 0, /* low */ + (1ul << 48) - 1, /* high */ + size, /* alignment */ + 0); /* boundary */ + if (l1_desc->va == NULL) { + device_printf(sc->dev, "failed to allocate l0 directory\n"); + return (ENXIO); + } + + l1_desc->pa = vtophys(l1_desc->va); + + i = sid >> sc->l0_did_bits; + l1e = (void *)((uint64_t)ddt->vaddr + DDT_NON_LEAF_DWORDS * 8 * i); + + /* Install the L1 entry. */ + val = PHYS_TO_PPN(l1_desc->pa) << DC_NON_LEAF_ENTRY_PPN_S; + val |= DC_NON_LEAF_ENTRY_VALID; + *l1e = val; + + return (0); +} + +static void * +riscv_iommu_get_dc_addr(struct riscv_iommu_softc *sc, int did) +{ + struct riscv_iommu_ddt *ddt; + struct l1_desc *l1_desc; + uintptr_t l0_base; + void *addr; + int l0_offs; + int l1_idx; + + ddt = &sc->ddt; + + l0_offs = sc->dc_dwords * 8 * (did & ((1 << sc->l0_did_bits) - 1)); + + if (sc->iommu_mode == DDTP_IOMMU_MODE_2LVL) { + l1_idx = (did >> sc->l0_did_bits) & + ((1 << DDT_L1_DID_BITS) - 1); + l1_desc = &ddt->l1[l1_idx]; + l0_base = (uintptr_t)l1_desc->va; + } else + l0_base = (uintptr_t)ddt->vaddr; + + addr = (void *)(l0_base + l0_offs); + + dprintf("ddt vaddr %p addr %p\n", ddt->vaddr, addr); + + return (addr); +} + +static int +riscv_iommu_init_dc(struct riscv_iommu_softc *sc, + struct riscv_iommu_domain *domain, int did, bool bypass) +{ + struct riscv_iommu_dc_base *dc_base; + struct riscv_iommu_dc *dc; + struct riscv_iommu_pmap *p; + + dc = riscv_iommu_get_dc_addr(sc, did); + dc_base = &dc->base; + + device_printf(sc->dev, "address translation for device id" + " 0x%x is %s.\n", did, bypass ? "bypassed" : "enabled"); + + p = &domain->p; + + bzero(dc_base, sizeof(struct riscv_iommu_dc_base)); + if (bypass == false) + dc_base->fsc = p->pm_satp; + dc_base->ta = (domain->pscid << DC_TA_PSCID_S) | DC_TA_V; + + riscv_iommu_inval_ddt_did(sc, did); + riscv_iommu_sync(sc, &sc->cq); + dc_base->tc |= DC_TC_V; + riscv_iommu_inval_ddt_did(sc, did); + riscv_iommu_inval_vma(sc); + riscv_iommu_sync(sc, &sc->cq); + + return (0); +} + +static void +riscv_iommu_deinit_dc(struct riscv_iommu_softc *sc, int did) +{ + struct riscv_iommu_dc_base *dc_base; + struct riscv_iommu_dc *dc; + + dc = riscv_iommu_get_dc_addr(sc, did); + dc_base = &dc->base; + dc_base->tc &= ~DC_TC_V; + + riscv_iommu_inval_ddt_did(sc, did); + riscv_iommu_sync(sc, &sc->cq); +} + +static int +riscv_iommu_setup_interrupts(struct riscv_iommu_softc *sc) +{ + device_t dev; + int error; + + dev = sc->dev; + + if (sc->res[1] == NULL || sc->res[2] == NULL || + sc->res[3] == NULL || sc->res[4] == NULL) { + device_printf(dev, "Warning: no interrupt resources " + "provided.\n"); + return (ENXIO); + } + + error = bus_setup_intr(dev, sc->res[1], INTR_TYPE_MISC, + riscv_cq_intr, NULL, sc, &sc->intr_cookie[0]); + if (error) { + device_printf(dev, "Couldn't setup cq interrupt handler\n"); + return (ENXIO); + } + + error = bus_setup_intr(dev, sc->res[2], INTR_TYPE_MISC, + riscv_fq_intr, NULL, sc, &sc->intr_cookie[1]); + if (error) { + device_printf(dev, "Couldn't setup fq interrupt handler\n"); + return (ENXIO); + } + + error = bus_setup_intr(dev, sc->res[3], INTR_TYPE_MISC, + riscv_pm_intr, NULL, sc, &sc->intr_cookie[2]); + if (error) { + device_printf(dev, "Couldn't setup pm interrupt handler\n"); + return (ENXIO); + } + + error = bus_setup_intr(dev, sc->res[4], INTR_TYPE_MISC, + riscv_pq_intr, NULL, sc, &sc->intr_cookie[3]); + if (error) { + device_printf(dev, "Couldn't setup pq interrupt handler\n"); + return (ENXIO); + } *** 2583 LINES SKIPPED *** From nobody Tue May 12 13:02: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 4gFGvZ1Xcpz6dchc for ; Tue, 12 May 2026 13:02: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 4gFGvY6ckyz4Dq2 for ; Tue, 12 May 2026 13:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778590921; 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=vwOG5znDhcMgDLPrYnImC2zyP2ngMbwPnEprCw0/JbM=; b=m8HgtoBbgQJmNDZXnrPxoF8H3aOa8yq9Qkfjjyh2sTr16Zvou8OSc5Q4pV0pBxbtoMzTG8 gFvRMOmwLw/c2piHcSvuDLNO6U96OZwKgzPuT+DJCcaWFk9Rq7wtSjZtxlS0Kr4iMtdstn ljFsfNkj+Bsm+oXdrnJiKm3Wvf2BVpjA18mHom5KM4oS3ESjgetUDAyEEgpBFraJRuhWRJ U6K7x+JpD9Q8yIu6Ez3XMS0nIxaL+AQj9z2IEVUlwYvpOG2ceZAGET1LtoLrdqLl4lzvdU aG+fQHMhAeWPezTL+260lN+GYlPki0S2OGowTes4FEyfB0A0aVsjJD5zoqd+9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778590921; a=rsa-sha256; cv=none; b=iLsr/wzDgR/L7mc48nrfLpwNoMWBQ1O6NPnJz8ZdHdho51JP7tQAxGQBPhxAkFos0MNIUA 5Lv35AF6+Ry+mV2t1+JdH1b8LTrGxzLHijxyepGSmVwZVkmZ0Q1DIK4F1dTcpUjZ0gSaP4 dJu218V8u/lTKy4AH7WFCjrhIqNmglKIFcZnqAXRlhr1LMfDWdZ7MKGxCuHwNS2x2IiXY4 OArQ45+W7oScLOW0ruBzkU1wUzD1Nd4GSISbxs7UpXmZTx+ct5+vuqhWilepz19dgY1c2G Pda0GgY3T5uUeN9bftbVViZLLHL70KwwiIUdEqcADV3QCA+UmmLEnz7vh77u+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=1778590921; 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=vwOG5znDhcMgDLPrYnImC2zyP2ngMbwPnEprCw0/JbM=; b=vqKmQeC+i+ADGhil6ooTlUvWsRzu8kdRwBE7IPWhdhVxOhjNPwyAa7kiRqEgatsPi/uWBO DIiiPjBbKE3Lp5z9baattQfN4NDC14WahAEOVTZ8XrwKzxnr1W8e1tU8Yut9nQlAXG/4Ow iElVOTiJxIMwIabduvq+RLm4D7NWDr/likr/mv3oaKdq7mLYi9EYqPBZDTpGR1ExlF0Kkp WejQalZj+4kCvsdIF25xKqKL1vRF1Pqz7XXb2eZ6IMrzk4wVXYGEs/iIJjkdL0Ugkrr5pq M6OcQDz7m2hcpfM9JqzLue7sZ6S7iWyx0RxtFYmPepYeC7Dg2PqCb9560VJTRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFGvY69YXz148c for ; Tue, 12 May 2026 13:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c7de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 13:02:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 23b263dfbf5e - main - Revert "mlx5e: Ensure rx timestamps are monotonically increasing" 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: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23b263dfbf5ec24de2f6e1abc2a4eb04869b3e07 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 13:02:01 +0000 Message-Id: <6a0324c9.1c7de.6615b4a8@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=23b263dfbf5ec24de2f6e1abc2a4eb04869b3e07 commit 23b263dfbf5ec24de2f6e1abc2a4eb04869b3e07 Author: Andrew Gallatin AuthorDate: 2026-05-12 12:55:54 +0000 Commit: Andrew Gallatin CommitDate: 2026-05-12 12:55:54 +0000 Revert "mlx5e: Ensure rx timestamps are monotonically increasing" This reverts commit ce33f96fcf2f2d0d49c406274bcc64df72fe530e. It turns out that doing it this way did indeed prevent backwards movement of timestamps, however it also lead to an ever increasing error, eventually yielding timestamps hundreds or thousands of seconds in the future. Back this out until we can come up with a solution that prevents backards timestamps and also avoids accumulating error. Sponsored by: Netflix --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 50 ------------------------------------- 1 file changed, 50 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 9bcb0dcf8e16..fb8b79c8f787 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -1134,25 +1134,6 @@ mlx5e_hw_clock(struct mlx5e_priv *priv) return (((uint64_t)hw_h << 32) | hw_l); } -/* - * Seed the first calibration point so that base_prev and clbr_hw_prev - * are always valid. Called once during attach before the first - * calibration callout fires. - */ -static void -mlx5e_seed_calibration(struct mlx5e_priv *priv) -{ - struct mlx5e_clbr_point *cp; - struct timespec ts; - - cp = &priv->clbr_points[0]; - cp->clbr_hw_curr = mlx5e_hw_clock(priv); - nanouptime(&ts); - cp->base_curr = mlx5e_timespec2usec(&ts); - cp->clbr_hw_prev = cp->clbr_hw_curr - 1; - cp->base_prev = cp->base_curr - 1; -} - /* * The calibration callout, it runs either in the context of the * thread which enables calibration, or in callout. It takes the @@ -1166,9 +1147,6 @@ mlx5e_calibration_callout(void *arg) struct mlx5e_priv *priv; struct mlx5e_clbr_point *next, *curr; struct timespec ts; - uint64_t hw_delta_new, hw_delta_old; - uint64_t old_nsec, old_projected, old_sec; - uint64_t res_n, res_s, res_s_mod, rt_delta_old; int clbr_curr_next; priv = arg; @@ -1197,33 +1175,6 @@ mlx5e_calibration_callout(void *arg) nanouptime(&ts); next->base_curr = mlx5e_timespec2usec(&ts); - /* - * Ensure monotonicity across calibration transitions. Compute - * what the old calibration would extrapolate to at the new - * hw_curr. If the new base_curr is less, clamp it so the new - * slope is at least as steep as the old one. This prevents - * packets from seeing time go backwards when the slope drops. - * - * Use the same split-seconds technique as mlx5e_mbuf_tstmp() - * to avoid overflowing uint64_t in the multiplication. - */ - hw_delta_new = next->clbr_hw_curr - curr->clbr_hw_curr; - rt_delta_old = curr->base_curr - curr->base_prev; - hw_delta_old = curr->clbr_hw_curr - curr->clbr_hw_prev; - old_sec = hw_delta_new / priv->cclk; - old_nsec = hw_delta_new % priv->cclk; - res_s = old_sec * rt_delta_old; - res_n = old_nsec * rt_delta_old; - res_s_mod = res_s % hw_delta_old; - res_s /= hw_delta_old; - res_s_mod *= priv->cclk; - res_n += res_s_mod; - res_n /= hw_delta_old; - res_s *= priv->cclk; - old_projected = curr->base_curr + res_s + res_n; - if (next->base_curr < old_projected) - next->base_curr = old_projected; - curr->clbr_gen = 0; atomic_thread_fence_rel(); priv->clbr_curr = clbr_curr_next; @@ -4936,7 +4887,6 @@ mlx5e_create_ifp(struct mlx5_core_dev *mdev) callout_init(&priv->tstmp_clbr, 1); /* Pull out the frequency of the clock in hz */ priv->cclk = (uint64_t)MLX5_CAP_GEN(mdev, device_frequency_khz) * 1000ULL; - mlx5e_seed_calibration(priv); mlx5e_reset_calibration_callout(priv); pa.pa_version = PFIL_VERSION; From nobody Tue May 12 13:02:00 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 4gFGvY138pz6dd6x for ; Tue, 12 May 2026 13:02: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 4gFGvX5qW0z4DkF for ; Tue, 12 May 2026 13:02:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778590920; 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=bs/zBvMaG/oAvERUrUZolhqYPLqheCL4h5whELKB12s=; b=YuLE1PgETUH3/NrHck+wVJCLS50nIBfDqjrsOEPYQnMejPrUG9e0d1U5pINkwNQq55Uj1y zs9qXRD7wTaDzeum2y3Yq8KohYepV5prkkhrtAjE+GyxGPSTXegWgWSqLURT5R/FOPhXYh Bn3rYxpZxhR9ghCZlKdF+IkactdtTklYheK/hNVhpD6MhbJYzAtppqkJa5dZKff59omeH/ lwpucMafmNxZoY+z10/tTTU4tOJXWRGLiR3tgFtFQfpUBY8zjaCCvqDHlA2FtgZEYsFq2h p7hku27nW2Oi7btP/33BITu9yu/ZkpsGUuoYS8gUpepWGbO7a/920zmLkODFdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778590920; a=rsa-sha256; cv=none; b=gva5lDWo2/jucfIJIY/zziWOHHkijImM/SfwLOPnClre3xpSlIvIRJxn0lu8x4c3+p8cmJ S4UTtlWiuWC6vFqy70qiAG4eJPH05pijbpMWu5tytUBCnaHDxVn3VbpPTeaimFYzLfaNyO IOuZfkrGOCDSRM1jGf6cpsP1U83SyPEPUOUrKJSob/1JmOzGK2u1uxM+ORB5mU7lyAPSvB rUGjV4C4z45hDKPjRFMpQ93X4DXophNt4x1qTvOZumJTBOv3YTHEi/gqWBdE3gAFLzKrCZ 8GXYlGbR/Jk6nYaxU2gcItFA2n9gvjvYDJwWhb2OBiJAGfAYolmVREc02M/2PA== 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=1778590920; 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=bs/zBvMaG/oAvERUrUZolhqYPLqheCL4h5whELKB12s=; b=SxRCJatbZ5nJYpKhnlh+Vd817E5y/WJB03M4fhAEJRGImu7CNLHJsefyUYK9Ig7BPmjXdo rfQ2LySQDf36GP6FdUj2oKWbtoJQQ5sz1Nh2R19eRLj7hEyxc43r9TymY9oEgPvzS5lGxL II6gO2BO8n/o6SEfsiq5xJaWg2VFGuCRqw/07h+seEagRcD97MHZfcMOcPX9zGGWC2MM/X 55Nd8BngxVhJQhnShh8ayGoNeyoQdepUjnW4TtmyRWIjWX0elImi/5u+60zlJ0QdlglhGU XIYHDNeTD69ldXyFzYMX4ZnIfrgo+UV7ucrKypILhHJMwFaoecEJ1vC6Pjcmuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFGvX5L1qz13dx for ; Tue, 12 May 2026 13:02:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1de2a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 13:02:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 9f69446d4548 - main - lacp: fix link state with multiple aggregators 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: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f69446d45484c16d2b9b9bf71bbb2fca86cb6e5 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 13:02:00 +0000 Message-Id: <6a0324c8.1de2a.5c820de6@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=9f69446d45484c16d2b9b9bf71bbb2fca86cb6e5 commit 9f69446d45484c16d2b9b9bf71bbb2fca86cb6e5 Author: Andrew Gallatin AuthorDate: 2026-05-12 12:52:24 +0000 Commit: Andrew Gallatin CommitDate: 2026-05-12 12:52:24 +0000 lacp: fix link state with multiple aggregators When we have multiple aggregators, the link state should reflect the state of the active aggregator. This change was prompted by a script pruning 10GbE interfaces from an lacp bundle with 100GbE interfaces. Mixing speeds like this creates multiple aggregators. When the last 10GbE interface was removed, lagg0 would loose link because the current aggregator's port count would drop to 0, even though the 100GbE aggregator had active ports. This left the system in a hard to diagnose state where lagg0 reported "active", but all outgoing IP traffic was dropped, due to the RT_LINK_IS_UP() check noticing lagg0's if_link_state was marked as down. Reviewed by: zlei Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D56579 --- sys/net/ieee8023ad_lacp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c index 281d16bc6c05..8c695f71cc0f 100644 --- a/sys/net/ieee8023ad_lacp.c +++ b/sys/net/ieee8023ad_lacp.c @@ -682,6 +682,7 @@ static void lacp_disable_distributing(struct lacp_port *lp) { struct lacp_aggregator *la = lp->lp_aggregator; + struct lacp_aggregator *la_active; struct lacp_softc *lsc = lp->lp_lsc; struct lagg_softc *sc = lsc->lsc_softc; char buf[LACP_LAGIDSTR_MAX+1]; @@ -703,7 +704,6 @@ lacp_disable_distributing(struct lacp_port *lp) TAILQ_REMOVE(&la->la_ports, lp, lp_dist_q); la->la_nports--; - sc->sc_active = la->la_nports; if (lsc->lsc_active_aggregator == la) { lacp_suppress_distributing(lsc, la); @@ -713,6 +713,8 @@ lacp_disable_distributing(struct lacp_port *lp) } lp->lp_state &= ~LACP_STATE_DISTRIBUTING; + la_active = lsc->lsc_active_aggregator; + sc->sc_active = la_active != NULL ? la_active->la_nports : 0; if_link_state_change(sc->sc_ifp, sc->sc_active ? LINK_STATE_UP : LINK_STATE_DOWN); } @@ -721,6 +723,7 @@ static void lacp_enable_distributing(struct lacp_port *lp) { struct lacp_aggregator *la = lp->lp_aggregator; + struct lacp_aggregator *la_active; struct lacp_softc *lsc = lp->lp_lsc; struct lagg_softc *sc = lsc->lsc_softc; char buf[LACP_LAGIDSTR_MAX+1]; @@ -739,7 +742,6 @@ lacp_enable_distributing(struct lacp_port *lp) KASSERT(la->la_refcnt > la->la_nports, ("aggregator refcnt invalid")); TAILQ_INSERT_HEAD(&la->la_ports, lp, lp_dist_q); la->la_nports++; - sc->sc_active = la->la_nports; lp->lp_state |= LACP_STATE_DISTRIBUTING; @@ -750,6 +752,8 @@ lacp_enable_distributing(struct lacp_port *lp) /* try to become the active aggregator */ lacp_select_active_aggregator(lsc); + la_active = lsc->lsc_active_aggregator; + sc->sc_active = la_active != NULL ? la_active->la_nports : 0; if_link_state_change(sc->sc_ifp, sc->sc_active ? LINK_STATE_UP : LINK_STATE_DOWN); } From nobody Tue May 12 13:50: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 4gFHzs42tWz6cDGC for ; Tue, 12 May 2026 13:50:49 +0000 (UTC) (envelope-from ctuffli@gmail.com) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 4gFHzr1YrYz3FRY for ; Tue, 12 May 2026 13:50:48 +0000 (UTC) (envelope-from ctuffli@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 ctuffli@gmail.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=ctuffli@gmail.com Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-83975e992e1so2720744b3a.2 for ; Tue, 12 May 2026 06:50:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778593846; x=1779198646; h=content-transfer-encoding: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=wPl1aCYEXjZ28HL7WYecev440tqmRysytxpve8bLqos=; b=pJAeFDpGwDSZ1/tk0W7X4QWIEYEiMh0HpFqdpDvWlYw29BI7E+zXol6JcDbauRcPcR 25GIuvPwJmHtumm3kVFC5c+tiXBUAD0K/sTl/sHX5fat94n+wI5pj5quBQ0ScG3ooC7y Gtgd3UJIz85KDgdFM66g7lAYikhHf3rhvR4Sp8c4R169kK1HGoCt95D0ABwOdZw/YxMv TktP5nq+aeZrkKBpWiyK0AZzzHSZNKSAwwOhxBdGH4SW2E4uYwsE9oWep8zVPr84PVBV 49aoUwGHVj+nabzIImeoi9x9UHLKLB6V7N/NsziwjA+T01T2txgurjb8gDaT8yYHvju3 7VQA== X-Forwarded-Encrypted: i=1; AFNElJ9GohNhNEmyxCDePdzTki6mbzJ4EzGH4EQuXk49OrGJ/6aCRrJoz4dETJmOAhQiuvEhua4NcuzH54bil7FRTl2KCSvBrA==@freebsd.org X-Gm-Message-State: AOJu0Yz1bX+8OJT4ox6wz+NV1gpdQv75ioOwKGlWeouGc5tgu9s++59v 1+2T/GFSJOxMReNQPuIOSADvkRdJSkkv9OC0AlIeFYcvJora0Ou8MUqw+RxiKQ== X-Gm-Gg: Acq92OEdSg0Q3jYxnVlr0W9bJuJ2hIeS5l/MdXlt854eDZCkbi1uJYC2LkxdXb8oslp sOMpdGSp30+dEwbqcoiw38jEZJBO185G1szRqLWCenIdh+FgiOfiKxTUzJ44+pcOlIVEnwePJun LnZS8OnTTJ/k0wsck8PwVffCe9r96FxNjzbUlEtU78H9AADq5dfHRD0eSpFOYccQ96+RliVOVGs P3KN5DtUnMFZNCjCsxOUL0B4S5b0v02m9D2Tq7EdW8WxRwS5znUs+H4eRU6WszdT/coN/zXPqHh dRymI00GDpR+u9nfCcaxuzwLeq0o2VW9bDUgSW7ntMGZs1UrUjstwGbz0I2aM1aRwbm4lHiTrJV yOV50yx+nO/hYVc8joAJCDzMCG6x6u/2NRpYnjxRlLWs2bWvt7iseo5yUftz/neUkH/VDqZQoV4 CDqbFNodX/ZQJvo8GZLWaio9ESc9hZbt7d+vP55IbC8XvPQxH2SFFmYXpySuDMnI6QFBt7/ag= X-Received: by 2002:a05:6a00:4c07:b0:83e:c76c:d720 with SMTP id d2e1a72fcca58-83eebbf089bmr3203318b3a.30.1778593846369; Tue, 12 May 2026 06:50:46 -0700 (PDT) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com. [209.85.214.175]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83965645140sm24441940b3a.12.2026.05.12.06.50.45 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 12 May 2026 06:50:46 -0700 (PDT) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2ba21d32776so37295395ad.2 for ; Tue, 12 May 2026 06:50:45 -0700 (PDT) X-Forwarded-Encrypted: i=1; AFNElJ8/OA8PxLiELe/hbxo55zcE/CiKt/ShAtqRHwHF0iYNa7Wqq22+wRcDjVWyDX1M5Jhs9AUYbaD+Y6UnDxv9upER7jaPXg==@freebsd.org X-Received: by 2002:a17:902:c404:b0:2ba:4eee:6c1e with SMTP id d9443c01a7336-2bd0112cdd7mr40179675ad.15.1778593845679; Tue, 12 May 2026 06:50:45 -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: <6a025660.37fa7.6a3f7fc0@gitrepo.freebsd.org> In-Reply-To: From: Chuck Tuffli Date: Tue, 12 May 2026 06:50:34 -0700 X-Gmail-Original-Message-ID: X-Gm-Features: AVHnY4KGlinc8BKOvX589SzcmviBbBYal6jL9VPIy78y3RZBanQ0C0EkTLDo1Hg Message-ID: Subject: Re: git: 25942dddc8a8 - main - smart: Connect contrib/smart to build To: Chuck Tuffli , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[chuck@freebsd.org,ctuffli@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; RWL_MAILSPIKE_GOOD(-0.10)[209.85.210.179:from]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; MIME_TRACE(0.00)[0:+]; MISSING_XM_UA(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TO_DN_SOME(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FROM_HAS_DN(0.00)[]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[chuck@freebsd.org,ctuffli@gmail.com]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_COUNT_THREE(0.00)[3]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_NA(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.210.179:from,209.85.214.175:received]; RCPT_COUNT_THREE(0.00)[4] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4gFHzr1YrYz3FRY On Tue, May 12, 2026 at 2:21=E2=80=AFAM Lexi Winter wrote= : > > hello, > > Chuck Tuffli wrote in <6a025660.37fa7.6a3f7fc0@gitrepo.freebsd.org>: > > smart: Connect contrib/smart to build > > this has broken the armv7 build: Apologies. Working on a fix ... From nobody Tue May 12 14:00: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 4gFJCJ3cNlz6cDvG for ; Tue, 12 May 2026 14:00: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 4gFJCJ1392z3HT3 for ; Tue, 12 May 2026 14:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778594444; 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=/RMVus7CMl/VMb7CfheotMj9oeOgxje6fZu4p3mFdtM=; b=eSF8SfL1OlGN2jLxauB1Pv1sfGKzBLTTsG5wLRDLUpsQs9tAf3NCXigTUkMcQ0ec80t5rf PqK+a13Uh8nY84ROT1Zvk3xe2Lb/HPMEL0YpRn2HF4YIzXgRf7H8eCqiYBaW6gawUC0WnY /4Z2KGGRnf+1P7peWjRdo6fh3CMOzxsBwQAjhaDtROC4/GoR7cdeub/ydSnxkXYgA6swov X1OEIfDTeIpfDIpnc5KHxH0wTHm2nWKQUO9MJaYY4e/UZdYa1T3iTXRaJ8tV1hnRx4oYYi rKy9OlII6bIumlf3clEjjz8tR8Dz59cTJQ2nNuUv7AUqObeEKclDvIeGS+MnUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778594444; a=rsa-sha256; cv=none; b=IYDR4Wa2DOEM83WC8cBz/CxcAk1T/opHAXtX/ZK1pwc8TNxmbq8U359oYajiokGCw/Pctw SxwzSvmerdO5D97jAjUFjX4VMpBgu67kYjRug5NaMcisk3akO2z9cXLfmcyLlFldVZ6/Vl 3uZew8iNdjndWFpIwdM/sw6RCHsFhE/O0pZ2ARt1PXkjfTzJXimsZ8asGCqGUApCBWKaah dQEHzz4jGiegN6otoBK685zHMAHCJbcaecG0b9nC3msLQG27J3QLzWusms77fbGIOEr5Ri BnR9JHK5eo0nv6ZNbiW9M1acXQ/eI3AEFIZi/CQu1MDnbJVTyi23uxpMRTqgpg== 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=1778594444; 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=/RMVus7CMl/VMb7CfheotMj9oeOgxje6fZu4p3mFdtM=; b=NXg3BrLSfcknstjdDnn+auwcNiFITFsvmzh8ISY0D38MRkB17fMvRXok2M/dm0v4sR76Di nPfCRjI2fY48/l/ZgeVgAJjx8KFLVrMkDUtqOhL9grX5J1bd8NVXkfA2C1wMOZ6r/k/tFQ oqLDFjH853K+AbT65xGOqGT+wT8akgwfW2It+wvP65sMrOWa2nAAu2PIb0QTCpMIR7zUjZ WmmnlA5trd8EgjlIdx3NUbw+OVpyllz++GODjRQSGp9uOKE3YXzKxD2jmm8EE3qJjbVZWJ aO8ktdU21hlDOQx0Kmjpfb2hSgI89vIfvRP7ZnDmPLY0xa6bYVxU70z7IhN8Bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFJCJ0XkHz15Gs for ; Tue, 12 May 2026 14:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 247a7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 14:00:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Brian Scott From: Mitchell Horne Subject: git: dab8138e13de - main - g_part,mkimg: Add additional GPT partition types 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dab8138e13dea539a387c458979403980a137bf2 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 14:00:44 +0000 Message-Id: <6a03328c.247a7.6b3f3736@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=dab8138e13dea539a387c458979403980a137bf2 commit dab8138e13dea539a387c458979403980a137bf2 Author: Brian Scott AuthorDate: 2026-05-11 16:24:46 +0000 Commit: Mitchell Horne CommitDate: 2026-05-12 14:00:10 +0000 g_part,mkimg: Add additional GPT partition types Add the hifive-fsbl, hifive-bbl, and xbootldr aliases to mkimg(1). Add the xbootldr alias to geom(4), and thus gpart(8). The "hifive" partition types are defined and used by various RISC-V SBCs for locating firmware. "xbootldr", or the Extended Boot Loader Partition is defined here: https://uapi-group.org/specifications/specs/boot_loader_specification/ Reviewed by: emaste, markj, mhorne MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56784 --- sys/geom/part/g_part.c | 1 + sys/geom/part/g_part.h | 2 ++ sys/geom/part/g_part_gpt.c | 2 ++ sys/sys/disk/gpt.h | 2 ++ usr.bin/mkimg/gpt.c | 6 ++++++ usr.bin/mkimg/scheme.c | 3 +++ usr.bin/mkimg/scheme.h | 3 +++ 7 files changed, 19 insertions(+) diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c index 1e4236507fa4..6c4c37d9bfce 100644 --- a/sys/geom/part/g_part.c +++ b/sys/geom/part/g_part.c @@ -135,6 +135,7 @@ struct g_part_alias_list { { "vmware-vmfs", G_PART_ALIAS_VMFS }, { "vmware-vmkdiag", G_PART_ALIAS_VMKDIAG }, { "vmware-vsanhdr", G_PART_ALIAS_VMVSANHDR }, + { "xbootldr", G_PART_ALIAS_XBOOTLDR }, }; SYSCTL_DECL(_kern_geom); diff --git a/sys/geom/part/g_part.h b/sys/geom/part/g_part.h index 575d97623e9b..1355cfec66a0 100644 --- a/sys/geom/part/g_part.h +++ b/sys/geom/part/g_part.h @@ -108,6 +108,8 @@ enum g_part_alias { G_PART_ALIAS_VMKDIAG, /* A VMware vmkDiagnostic partition entry */ G_PART_ALIAS_VMRESERVED, /* A VMware reserved partition entry */ G_PART_ALIAS_VMVSANHDR, /* A VMware vSAN header partition entry */ + G_PART_ALIAS_XBOOTLDR, /* A Systemd/Linux extended boot partition + Also used by visionfive2 as part of the boot sequence */ /* Keep the following last */ G_PART_ALIAS_COUNT }; diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c index 4733631c4b20..eeca5fbfae17 100644 --- a/sys/geom/part/g_part_gpt.c +++ b/sys/geom/part/g_part_gpt.c @@ -230,6 +230,7 @@ static struct uuid gpt_uuid_vmfs = GPT_ENT_TYPE_VMFS; static struct uuid gpt_uuid_vmkdiag = GPT_ENT_TYPE_VMKDIAG; static struct uuid gpt_uuid_vmreserved = GPT_ENT_TYPE_VMRESERVED; static struct uuid gpt_uuid_vmvsanhdr = GPT_ENT_TYPE_VMVSANHDR; +static struct uuid gpt_uuid_xbootldr = GPT_ENT_TYPE_XBOOTLDR; static struct g_part_uuid_alias { struct uuid *uuid; @@ -302,6 +303,7 @@ static struct g_part_uuid_alias { { &gpt_uuid_vmkdiag, G_PART_ALIAS_VMKDIAG, 0 }, { &gpt_uuid_vmreserved, G_PART_ALIAS_VMRESERVED, 0 }, { &gpt_uuid_vmvsanhdr, G_PART_ALIAS_VMVSANHDR, 0 }, + { &gpt_uuid_xbootldr, G_PART_ALIAS_XBOOTLDR, 0 }, { NULL, 0, 0 } }; diff --git a/sys/sys/disk/gpt.h b/sys/sys/disk/gpt.h index 426ae835c0c1..65b00f5de733 100644 --- a/sys/sys/disk/gpt.h +++ b/sys/sys/disk/gpt.h @@ -261,6 +261,8 @@ CTASSERT(sizeof(struct gpt_ent) == 128); #define GPT_ENT_TYPE_U_BOOT_ENV \ {0x3de21764,0x95bd,0x54bd,0xa5,0xc3,{0x4a,0xbe,0x78,0x6f,0x38,0xa8}} +#define GPT_ENT_TYPE_XBOOTLDR \ + {0xbc13c2ff,0x59e6,0x4262,0xa3,0x52,{0xb2,0x75,0xfd,0x6f,0x71,0x72}} /* * Boot partition used by GRUB 2. diff --git a/usr.bin/mkimg/gpt.c b/usr.bin/mkimg/gpt.c index ce817ea10ed2..4471cfa1d4b4 100644 --- a/usr.bin/mkimg/gpt.c +++ b/usr.bin/mkimg/gpt.c @@ -52,6 +52,9 @@ static mkimg_uuid_t gpt_uuid_freebsd_zfs = GPT_ENT_TYPE_FREEBSD_ZFS; static mkimg_uuid_t gpt_uuid_mbr = GPT_ENT_TYPE_MBR; static mkimg_uuid_t gpt_uuid_ms_basic_data = GPT_ENT_TYPE_MS_BASIC_DATA; static mkimg_uuid_t gpt_uuid_prep_boot = GPT_ENT_TYPE_PREP_BOOT; +static mkimg_uuid_t gpt_uuid_hifive_bbl = GPT_ENT_TYPE_HIFIVE_BBL; +static mkimg_uuid_t gpt_uuid_xbootldr = GPT_ENT_TYPE_XBOOTLDR; +static mkimg_uuid_t gpt_uuid_hifive_fsbl = GPT_ENT_TYPE_HIFIVE_FSBL; static struct mkimg_alias gpt_aliases[] = { { ALIAS_EFI, ALIAS_PTR2TYPE(&gpt_uuid_efi) }, @@ -65,6 +68,9 @@ static struct mkimg_alias gpt_aliases[] = { { ALIAS_MBR, ALIAS_PTR2TYPE(&gpt_uuid_mbr) }, { ALIAS_NTFS, ALIAS_PTR2TYPE(&gpt_uuid_ms_basic_data) }, { ALIAS_PPCBOOT, ALIAS_PTR2TYPE(&gpt_uuid_prep_boot) }, + { ALIAS_HIFIVE_BBL, ALIAS_PTR2TYPE(&gpt_uuid_hifive_bbl) }, + { ALIAS_XBOOTLDR, ALIAS_PTR2TYPE(&gpt_uuid_xbootldr) }, + { ALIAS_HIFIVE_FSBL, ALIAS_PTR2TYPE(&gpt_uuid_hifive_fsbl) }, { ALIAS_NONE, 0 } /* Keep last! */ }; diff --git a/usr.bin/mkimg/scheme.c b/usr.bin/mkimg/scheme.c index 80ff456a709f..b64cfe8bd007 100644 --- a/usr.bin/mkimg/scheme.c +++ b/usr.bin/mkimg/scheme.c @@ -58,6 +58,9 @@ static struct { { "mbr", ALIAS_MBR }, { "ntfs", ALIAS_NTFS }, { "prepboot", ALIAS_PPCBOOT }, + { "hifive-bbl", ALIAS_HIFIVE_BBL }, + { "xbootldr", ALIAS_XBOOTLDR }, + { "hifive-fsbl", ALIAS_HIFIVE_FSBL }, { NULL, ALIAS_NONE } /* Keep last! */ }; diff --git a/usr.bin/mkimg/scheme.h b/usr.bin/mkimg/scheme.h index 1c234b86d66c..7a5e09036ee3 100644 --- a/usr.bin/mkimg/scheme.h +++ b/usr.bin/mkimg/scheme.h @@ -47,6 +47,9 @@ enum alias { ALIAS_MBR, ALIAS_NTFS, ALIAS_PPCBOOT, + ALIAS_HIFIVE_BBL, + ALIAS_XBOOTLDR, + ALIAS_HIFIVE_FSBL, /* end */ ALIAS_COUNT /* Keep last! */ }; From nobody Tue May 12 14:00: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 4gFJCN3lPlz6cF3P for ; Tue, 12 May 2026 14:00:48 +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 4gFJCN1zMtz3HbX for ; Tue, 12 May 2026 14:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778594448; 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=rFxTsLP43axOZAoyKR0sY/BsGYrOYlOHXnnsw6iivHw=; b=n4hYEmf30iVUqE7XZ9bduCVbe2PHS+bxCh/nzOavVmqywC6mlPgw9FVj5CtdQ/LJjkc++a sb2gpYXgyUEuG2xgH+5+ZiF8wnvG8Y55A9T0vWGxpKZOoBBAJWrENCJhKLO64MC3H6qu+l ZKkLDyAVf2RgcLShyM1vzxdh1CWJrngL92p8VdrxeU2LDkiSRelqVyEBASF4iDXXTdiWkO IDxVkF1Kp3M3qPGMqNt4DhLSMskwJ+Dcl/6KhEur4yHr/HY+uI+MXCtCq0naEcQLRUjjH+ abDUV4TmDTEjk8XNSyvOhdm7Tupdsn8Yw8Uknx3FmyEvmhesWxMiGV7TiBx1uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778594448; a=rsa-sha256; cv=none; b=p0XiqqdYqibb9ZA5GxgK6twGqk8+8Db17xUfLxjrkT460IKRZhCUWNttY60ftDfJ4YCzXe /k3jgMWbXdhiCyC8xVEWlRkMqtZ7i8pnZKC0LD/TUoQsGJaO/vlJpkEO7BYykXoc2G6UZQ RuREQ2brlPvmdGk88C8tMa/qNzPBLWvj3cgr/gWqYHuCdwCY+u6zhXPnG0YqZJM8L3fdFP teaQCdsRhC6v0DQ5YRifhhRTO+l7+vwxj0hWJDIjBMctI7dxFCsAkhHJem6wTdxYMUGBRr CwiFnrQ1KBzkJRW9h/7SU1LuBAudA8Uus/toZ3Tp0hSEz9IVL7gvK7LCTElpgg== 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=1778594448; 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=rFxTsLP43axOZAoyKR0sY/BsGYrOYlOHXnnsw6iivHw=; b=o4XKxuIp6FE3ZZcnShHledMvcXGHiDxdsCcMVaJ3Qez+b/JM8EU/N1FTgJV7dRwRC0MN8h rl2htwi66jefdyLBe9M4RMrZQM3r38P2KoutgHyERYWCfFSnyIxcerO7WU4pCz5W5+dAJC I8TKAAjHHVXhzfncct8XiOcX0m0ZUSBVEeotCRn91B3YH2T2zsZ0PxsFbvUwQtnkuQ7Mk2 5g6tb2WeIxfDteb4CVzfQjYtsUiCYxsq4KNj1ICK9CmbFbMQU/PhgUVtD8KRaBeqg/D3gG KJDI4prYar8XP8aKh++Q9L1ArRPlbFQLiLnA5WWS5kTtqXLwLJ0O4WC6fdYQtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFJCN1XjMz14d6 for ; Tue, 12 May 2026 14:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 243ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 14:00:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Brian Scott From: Mitchell Horne Subject: git: 351fad05e075 - main - if_eqos_starfive: Read MAC address from device tree 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 351fad05e075c388dece4cd6dd8613494b870bad Auto-Submitted: auto-generated Date: Tue, 12 May 2026 14:00:42 +0000 Message-Id: <6a03328a.243ef.7c686076@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=351fad05e075c388dece4cd6dd8613494b870bad commit 351fad05e075c388dece4cd6dd8613494b870bad Author: Brian Scott AuthorDate: 2026-05-11 16:54:04 +0000 Commit: Mitchell Horne CommitDate: 2026-05-12 14:00:10 +0000 if_eqos_starfive: Read MAC address from device tree u-boot/opensbi determines the ethernet MAC address from ROM and passes it to the OS in the device tree. This change sets the correct MAC address from this source. This prevents the eqos class driver from generating random MAC addresses at each boot. Tested on Starfive VisionFive 2, riscv64 SBC. Reviewed by: mhorne MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56782 --- sys/dev/eqos/if_eqos_starfive.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/dev/eqos/if_eqos_starfive.c b/sys/dev/eqos/if_eqos_starfive.c index 62f8b3f38983..f81118fd3094 100644 --- a/sys/dev/eqos/if_eqos_starfive.c +++ b/sys/dev/eqos/if_eqos_starfive.c @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -40,6 +41,7 @@ #define JH7110_CSR_FREQ 198000000 #define WR4(sc, o, v) bus_write_4(sc->base.res[EQOS_RES_MEM], (o), (v)) +#define RD4(sc, o) bus_read_4(sc->base.res[EQOS_RES_MEM], (o)) static const struct ofw_compat_data compat_data[] = { {"starfive,jh7110-dwmac", 1}, @@ -131,6 +133,8 @@ if_eqos_starfive_init(device_t dev) struct if_eqos_starfive_softc *sc = device_get_softc(dev); hwreset_t rst_ahb, rst_stmmaceth; phandle_t node; + uint8_t eaddr[ETHER_ADDR_LEN]; + uint32_t maclo, machi; node = ofw_bus_get_node(dev); @@ -186,6 +190,14 @@ if_eqos_starfive_init(device_t dev) return (ENXIO); } + if (OF_getprop(node, "local-mac-address", eaddr, sizeof(eaddr)) == + sizeof(eaddr)) { + machi = eaddr[5] | (eaddr[4] << 8); + WR4(sc, GMAC_MAC_ADDRESS0_HIGH, machi); + maclo = eaddr[3] | (eaddr[2] << 8) | (eaddr[1] << 16) | + (eaddr[0] << 24); + WR4(sc, GMAC_MAC_ADDRESS0_LOW, maclo); + } return (0); } From nobody Tue May 12 14:13: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 4gFJVX0LrGz6cFpM for ; Tue, 12 May 2026 14:13: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 4gFJVW69VJz3KRc for ; Tue, 12 May 2026 14:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778595235; 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=fsQAbidLCr8uZMYnTeFIsM6G3L/RuZw7LFMIdXxY2go=; b=oNElQJwvwa5lEEawsAYVLMGRhrEwpL++ySAy85VpjLK2SOBi9Z9uq8du7b79IxsKifkfHo ky643oj7TYR1pTvlbEgHYTkOy8/f0lV+EglbaMv2CszAcZj9zoOl1eGJCP3K2VdaQTFVCg o+3eey8nQvu8fD/X/4p2nASwuoeMRCpMBO8ecigqBTo/BsGZYJXRxQRL94oW/HUOfHBQ+a 3Fv3HjQII3/oPKRpxb9uSBCF3XvZlAjak9LRgktg1+VINMhifhATQxvjEwU9ZH5w17NybC leCbM/NKg4KXCfl0JnrPqy1F6hagCAsLke0CRuOSdSoKsrYhwMS7TKWvdlP3zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778595235; a=rsa-sha256; cv=none; b=S4zBFHikvzM3ov1i9O/r1QAQGcOg7CzbCPG9gLRCSW+xJInyn2CjeGfrH6a200MLVk5QoW TxtIzHPFiT0jXtRQ1xQxCvsMg6el+Hb6fGfWjuSmRWEgQqGOxaxEdAXw6DLKFVcGD96Xhm S+1MpxGx1fHGoW4i5QDReC6+RY/oXDL3OkxIdivqBQHEGg1pWbJPCjX0FsP325Rdp/L44G jPQZ3RaiMn6z9kcDMWG0Fqk7ZbZ5Do/O0Yvf8yUAuvNo3cbgk2Ux3Ub0wrklpgwHnG1Inj ShR2Spk2B5eEOfcWiFArypEyHIm046PnQvEKJAHQ15fdm/1oswAnlf1TuJargA== 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=1778595235; 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=fsQAbidLCr8uZMYnTeFIsM6G3L/RuZw7LFMIdXxY2go=; b=wZnHotJWkGMCMnnslTSICbTUU8HWV5DMkO8SMQDm794cu/J5kmk3AJb9vFcUXrLFC6146u 72sNAryHEtTvPGYylqZbb9sY3pbOJeXh0XiYLWX4lc2b1UAK54AJay553ZpoOix603VQVt UD2s6mIU2/VrKKfAOhJfxrlU8lwW4R1m41iBu+JSyirg9KxQqvR8I5kBhBUVBe6TY93mB6 KhHcgpRt9VpbotGeGFALBS781afnHCkO8z6bo1FPfISsTawcvFMOTcctj+l+10CgPtCxqb UXalzjD+bwNNXX3hidOMLIxdQh7dY5voyD1XEPQdBdXgLSERSpGlkZ83zjLv5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFJVW5jcXz15nb for ; Tue, 12 May 2026 14:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25016 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 14:13:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: dc14ae4217a0 - main - bsdinstall: do pkgbase installations with the "script" command 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: dc14ae4217a0babb1240f813b642edc2d7b955a6 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 14:13:55 +0000 Message-Id: <6a0335a3.25016.6508a60e@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=dc14ae4217a0babb1240f813b642edc2d7b955a6 commit dc14ae4217a0babb1240f813b642edc2d7b955a6 Author: Alan Somers AuthorDate: 2026-04-28 17:27:17 +0000 Commit: Alan Somers CommitDate: 2026-05-12 14:13:16 +0000 bsdinstall: do pkgbase installations with the "script" command "bsdinstall script" will now do a pkgbase installation by default. The system components to install can be specified in the COMPONENTS variable, and have the same names as those used in the interactive installer. bsdinstall will still do a legacy distset installation if DISTRIBUTIONS is defined in the installerconfig file. MFC: 1 week PR: 290375 Sponsored by: ConnectWise Reviewed by: ziaee, ivy, jduran Differential Revision: https://reviews.freebsd.org/D56717 --- UPDATING | 5 +++ usr.sbin/bsdinstall/bsdinstall.8 | 45 ++++++++++++++++----- usr.sbin/bsdinstall/scripts/pkgbase.in | 15 ++++++- usr.sbin/bsdinstall/scripts/script | 71 ++++++++++++++++++++-------------- 4 files changed, 95 insertions(+), 41 deletions(-) diff --git a/UPDATING b/UPDATING index c60143c6184e..58d12856c581 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 16.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20260512: + "bsdinstall script" will now do a pkgbase installation by default. To + revert to the legacy distset installation, set "DISTRIBUTIONS" in + your installerconfig. + 20260412: The /etc/rc.d/NETWORKING script no longer provides the legacy NETWORK alias. Third-party or local RC scripts that still use diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8 index 282b88328e99..a35c8f56ada7 100644 --- a/usr.sbin/bsdinstall/bsdinstall.8 +++ b/usr.sbin/bsdinstall/bsdinstall.8 @@ -29,7 +29,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 20, 2026 +.Dd May 12, 2026 .Dt BSDINSTALL 8 .Os .Sh NAME @@ -109,9 +109,12 @@ for more information on this target. .Pp The .Ev DISTRIBUTIONS -environment variable is set to -.Dq base.txz kernel.txz -by default for this target. +environment variable is unset by default for this target. +Instead, the +.Ev COMPONENTS +environment variable is effectively set to +.Dq base kernel kernel-dbg +for this target. .It Cm keymap If the current controlling TTY is a .Xr syscons 4 @@ -321,8 +324,17 @@ overridden when making scripted or customized installers. The directory to use for temporary files. Default: .Dq Pa /tmp +.It Ev COMPONENTS +The set of components to install for scripted installations using +base system packages, e.g., +.Dq base lib32 kernel-dbg tests . +Default: "base kernel-dbg" .It Ev DISTRIBUTIONS -The set of distributions to install, e.g., "base.txz kernel.txz ports.txz". +The set of distributions to install for traditional installations, e.g., +.Dq base.txz kernel.txz ports.txz . +If unset, then +.Nm +will install using base system packages. Default: unset unless noted otherwise in the .Sx TARGETS section. @@ -609,18 +621,18 @@ A typical bsdinstall script, using the default filesystem layout and the UFS filesystem, looks like this: .Bd -literal -offset indent PARTITIONS=DEFAULT -DISTRIBUTIONS="kernel.txz base.txz" +COMPONENTS="base debug" #!/bin/sh sysrc ifconfig_DEFAULT=DHCP sysrc sshd_enable=YES -pkg install puppet +pkg install -y puppet .Ed .Pp For a scripted installation involving a ZFS pool spanning multiple disks, the script instead looks like this: .Bd -literal -offset indent -DISTRIBUTIONS="kernel.txz base.txz" +COMPONENTS="base debug" export ZFSBOOT_VDEV_TYPE=stripe export ZFSBOOT_DISKS="ada0 ada1" export nonInteractive="YES" @@ -628,7 +640,20 @@ export nonInteractive="YES" #!/bin/sh echo "ifconfig_DEFAULT=DHCP" >> /etc/rc.conf echo "sshd_enable=YES" >> /etc/rc.conf -pkg install puppet +pkg install -y puppet +.Ed +.Pp +To install using traditional distributions sets instead of packages, set +.Ev DISTRIBUTIONS +to the list of distribution sets to install, like this: +.Bd -literal -offset indent +PARTITIONS=DEFAULT +DISTRIBUTIONS="kernel.txz base.txz" + +#!/bin/sh +sysrc ifconfig_DEFAULT=DHCP +sysrc sshd_enable=YES +pkg install -y puppet .Ed .Pp On @@ -653,7 +678,7 @@ arbitrary commands can be run here to extend the installer. In addition to the variables in .Sx ENVIRONMENT VARIABLES , in particular -.Ev DISTRIBUTIONS , +.Ev COMPONENTS , the preamble can contain a variable .Ev PARTITIONS which is passed to the diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index 89ddc244171e..2c7d6bcae904 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -180,7 +180,18 @@ local function select_components(components, options) } append_list(bsddialog_args, checklist_items) - local exit_code, output = bsddialog(bsddialog_args) + local exit_code = 0 + local output = "" + if options.non_interactive then + local env_components = os.getenv("COMPONENTS") + if env_components then + output = env_components:gsub(" ", "\n") + else + output = "base\nkernel-dbg" + end + else + exit_code, output = bsddialog(bsddialog_args) + end -- This should only be possible if bsddialog is killed by a signal -- or buggy, we disable the cancel option and esc key. -- If this does happen, there's not much we can do except exit with a @@ -300,6 +311,8 @@ local function parse_options() for _, a in ipairs(arg) do if a == "--jail" then options.jail = true + elseif a == "--non-interactive" then + options.non_interactive = true else io.stderr:write("Error: unknown option " .. a .. "\n") os.exit(1) diff --git a/usr.sbin/bsdinstall/scripts/script b/usr.sbin/bsdinstall/scripts/script index 21da2ea7c366..93d07c7899c3 100755 --- a/usr.sbin/bsdinstall/scripts/script +++ b/usr.sbin/bsdinstall/scripts/script @@ -40,6 +40,7 @@ f_include $BSDCFG_SHARE/variable.subr # PARTITIONS # DISTRIBUTIONS # BSDINSTALL_DISTDIR +# COMPONENTS # # Default name of the ZFS boot-pool @@ -97,7 +98,6 @@ awk 'BEGIN {pathb=ARGV[2]; ARGV[2]=""} /^#!/{b=1} { >$TMPDIR/bsdinstall-installscript-preamble . $TMPDIR/bsdinstall-installscript-preamble -: ${DISTRIBUTIONS="kernel.txz base.txz"}; export DISTRIBUTIONS export BSDINSTALL_DISTDIR # Re-initialize a new log if preamble changed BSDINSTALL_LOG @@ -118,37 +118,48 @@ else fi bsdinstall mount -# Fetch missing distribution files, if any -exec 5>&1 -export BSDINSTALL_DISTDIR=$(`dirname $0`/fetchmissingdists 2>&1 1>&5) -FETCH_RESULT=$? -exec 5>&- +if [ -n "$COMPONENTS" -a -n "$DISTRIBUTIONS" ]; then + error "Cannot set both COMPONENTS and DISTRIBUTIONS" +elif [ -z "$DISTRIBUTIONS" ]; then + # If COMPONENTS is set, or neither is, install with pkgbase + bsdinstall pkgbase --non-interactive +else + # Otherwise, unpack distsets -[ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributions" + # Fetch missing distribution files, if any + exec 5>&1 + export BSDINSTALL_DISTDIR=$(`dirname $0`/fetchmissingdists 2>&1 1>&5) + FETCH_RESULT=$? + exec 5>&- -# Unpack distributions -bsdinstall checksum -if [ -t 0 ]; then - # If install is a tty, use distextract as normal - bsdinstall distextract -else - # Otherwise, we need to use tar (see https://reviews.freebsd.org/D10736) - for set in $DISTRIBUTIONS; do - f_dprintf "Extracting $BSDINSTALL_DISTDIR/$set" - # XXX: The below fails if any mountpoints are FAT, due to - # inability to set ctime/mtime on the root of FAT partitions, - # which is needed to support e.g. EFI system partitions. tar has - # no option to ignore this (distextract ignores them internally - # through a hack), and returns 1 on any warning or error, - # effectively turning all warnings into fatal errors. - # - # Work around this in an extremely lame way for the specific - # case of EFI system partitions only. This *ONLY WORKS* if - # /boot/efi is empty and does not handle analogous problems on - # other systems (ARM, PPC64). - tar -xf "$BSDINSTALL_DISTDIR/$set" -C $BSDINSTALL_CHROOT --exclude boot/efi - mkdir -p $BSDINSTALL_CHROOT/boot/efi - done + [ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributions" + + bsdinstall checksum + if [ -t 0 ]; then + # If install is a tty, use distextract as normal + bsdinstall distextract + else + # Otherwise, we need to use tar (see + # https://reviews.freebsd.org/D10736) + for set in $DISTRIBUTIONS; do + f_dprintf "Extracting $BSDINSTALL_DISTDIR/$set" + # XXX: The below fails if any mountpoints are FAT, due + # to inability to set ctime/mtime on the root of FAT + # partitions, which is needed to support e.g. EFI + # system partitions. tar has no option to ignore this + # (distextract ignores them internally through a hack), + # and returns 1 on any warning or error, effectively + # turning all warnings into fatal errors. + # + # Work around this in an extremely lame way for the + # specific case of EFI system partitions only. This + # *ONLY WORKS* if /boot/efi is empty and does not + # handle analogous problems on other systems (ARM, + # PPC64). + tar -xf "$BSDINSTALL_DISTDIR/$set" -C $BSDINSTALL_CHROOT --exclude boot/efi + mkdir -p $BSDINSTALL_CHROOT/boot/efi + done + fi fi # Configure bootloader if needed From nobody Tue May 12 15:33: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 4gFLGK46P7z6cMpT for ; Tue, 12 May 2026 15:33: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 4gFLGK3K3kz3Ymj for ; Tue, 12 May 2026 15:33:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778600009; 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=TUpuSFZxFCLWvt9VwtedWQjo6lOlqG3HyR0MuwpKuN8=; b=IMvBOdzyhTmn/unedM86UWfS9PjEB212CjPYb6U+cmTwO1sz7WQKcUilUqvgKC7arvJ35L O71GAQk8eeHPuveHyzEQ8omNEdLz+5P0G09jFmvvaSR0ki9WsSCN3VZeal1TMHGJWQYrAL 8lc936ULgVYYRawlFFvSbkj/YxVVpznMGmnFyfvWHwTBMZc+cBMiQmMCsLmtbShh3LE1wB QUQ3nlLYXH6tsUdNFxIDR0zln7PtDZZd/T7qanjGjX3E9e7FpG+Qmd+LvMm5fkIN8VYBr8 bRQA5tVrVmpbQc8OYJsIU05EDi2ltL+vc+9CgF6NUjiJlJSOmTNAaX3TB8Mxbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778600009; a=rsa-sha256; cv=none; b=PdrldpCcB1IeFLktTrOSTi3vGkpwgqgWakwxvmKpc0ZAe1AmXdvBJ7C7R4BedzdTYje2b9 pq2Mrmr9YsQrE5z39FGHhu/uIJOmIYPK5AdWld2n7TIjA51jFX1ecVUphl3HwGUVMUYI2g +1PimfNOQOT7chWjZqxwJUiGy7C28+kp2vmTZwSh9wVkMxDWf49qyjjPi44x0o921ceP1b jhJKYaxw8cIgzwNmrwcTEW2iHjXAdmwcNLULseDHq3hAb1UECDx4iUhkxxvULFc/m8taM5 KVUuybuhrjr6WrfsPCizt0Ra/nu60OEnsnetCIZaFdqx3jYbSNtFCRDdCyGAIQ== 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=1778600009; 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=TUpuSFZxFCLWvt9VwtedWQjo6lOlqG3HyR0MuwpKuN8=; b=E9XNWyvBMxMqeU6KcEyzI/AYRucpuudojpdzYKOxw5VX9w6QSa2ukFunBQAoLqUooT5mH3 QXtQfNbcROko2FDZDkT91rdus6x27IYd2w045SHTQgfD+0Su0/HFRUMBLCfGRZvfXIa5oF JcyID8yydH6IJme9VzANECBTaaY4tVo71VzYjTjODAdH8Oaa5kjnU6kjvb4hR9PjJK1Ac1 zAAkCGcbAscTrh7Jks1SPbEr8DbAjA/dcFVEgo0GEcN/iT/hEIi/IohGl8suJ7lIDrn70h HYYNKUqiXH9ZsLP/wQTzfuTk7sAqlrEwvWW8j5IGRb5VTPseB9VjxlrTh9vf+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFLGK2lgwz188L for ; Tue, 12 May 2026 15:33:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 365ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 15:33:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Tuffli Subject: git: 346be36e8861 - main - smart: Merge smart 1.0.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: chuck X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 346be36e8861e26bfed44cbf960903d0055f6660 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 15:33:29 +0000 Message-Id: <6a034849.365ac.30377fd0@gitrepo.freebsd.org> The branch main has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=346be36e8861e26bfed44cbf960903d0055f6660 commit 346be36e8861e26bfed44cbf960903d0055f6660 Merge: dc14ae4217a0 d2d20bb5099d Author: Chuck Tuffli AuthorDate: 2026-05-12 14:33:03 +0000 Commit: Chuck Tuffli CommitDate: 2026-05-12 14:33:03 +0000 smart: Merge smart 1.0.3 Merge commit 'd2d20bb5099dc1c443a4b783d43b8a45338c85d2' contrib/smart/Changelog | 4 ++++ contrib/smart/freebsd_dev.c | 17 +++++------------ contrib/smart/libsmart.c | 2 +- contrib/smart/smart.c | 2 +- 4 files changed, 11 insertions(+), 14 deletions(-) From nobody Tue May 12 15:48: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 4gFLc42f98z6cPMY for ; Tue, 12 May 2026 15:48:52 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: from mail-yx1-f54.google.com (mail-yx1-f54.google.com [74.125.224.54]) (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 4gFLc355bdz3fkX for ; Tue, 12 May 2026 15:48:51 +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 74.125.224.54 as permitted sender) smtp.mailfrom=rlibby@gmail.com Received: by mail-yx1-f54.google.com with SMTP id 956f58d0204a3-65318dafbcbso6039429d50.2 for ; Tue, 12 May 2026 08:48:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778600931; x=1779205731; h=content-transfer-encoding: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=3H0+Sav9WjwHu0//Qn3KwI2m78IWW/q1BJYphH2aK/I=; b=OyJl2TTjFJZA1mjoxxPuVNZ8m2CkUa10HZzQiYFmQzwjnoBxwvGsK6/Lc0VYYqa/ai E+ABQPPhW8OOMp4J7VXuwcUTRYYpnYdFmNM3icdjUEHgxdrRPfv+CWD1ldbgrxN7qI7u mGJunXsQnJv6qAFZp2RSvAjwBT0DsgAM11guKTrZmXnvLJv0OWALV9n6AYw5n0XHhIkF 2cfWynAno298YKeYl8f/SLe359jgv3y4ZaRYKS9enKCVL+CX4FbBHbPdK7G3jB6La2mc 1wniLkz6j45+G0RpvIIicaQLEyoVd1mU0VeZIXDCV54ZNqZA3LwBdtWtJKi2rBLKYQi5 50Eg== X-Forwarded-Encrypted: i=1; AFNElJ8q8e+7lMrtfnI+MYfCWM2vapx7RfpkKI5W7kjDAqySuT2sRl06ZsG9pBiEd1kIH2Xt+GAkfjQPI1uYZ3fkW1r+pWWuEg==@freebsd.org X-Gm-Message-State: AOJu0YwZsPAjKfuXVxJV3xcsrbcszNidaUiPDht8k34slRPAnSIwth15 sx9f4+2i+9VxVLp/34W+sDiB008AnohCWt/yUBPkNYjUqW9urOTTCMc/boQ40A== X-Gm-Gg: Acq92OFSnJAbAa7s9XSktK+Gx6U4I7WtihM5nDV6VvDO4gRcf9fbWv31vXiPjqTpB0x 3JIOnlxwvos3J3CPz5caippm5cAf5lweqjEI/l2pTIGSpgsdEXMCIkjCDi73u9kbHHTdmEWfJH6 ICTN8tw2BhzEDM0AD2UcezBYTxIjmv/cs9XS6ZmcBgbdMbdqriYo9Nus9owU/qPg1cAFCu0WaOb 35qMd5Z5SV2UczG4F7ECZyyWQgM6AdSYvs/+G8Zy9YQ5NBsGd6Xb8cWkNoWkx/vpC0ZwCvLsspR NFAQXT1reo0nHNE3ff8M7KAJyFXdT7FnbCr5M5xBpuLowYnRz8Az8tsYD/LwugRrtMT6cAmldCw TH2PTV0ZcqV+7gyQl4Pm4x8CAYLr5vg/qJYI3HRZiRKZVNSu9p+c3/Xa5LVXZB9WDcLXPPOMl8d nduj7sWI7E/hp3ZFyYOcrEDAAHzrcUP6+BVRIkR4spwpfR1BY20h3DjF8f6g== X-Received: by 2002:a05:690e:2515:b0:651:d430:7832 with SMTP id 956f58d0204a3-65c79cf2d9emr21500300d50.10.1778600930851; Tue, 12 May 2026 08:48:50 -0700 (PDT) Received: from mail-yx1-f43.google.com (mail-yx1-f43.google.com. [74.125.224.43]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-65d96be4aa2sm7240690d50.15.2026.05.12.08.48.50 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 12 May 2026 08:48:50 -0700 (PDT) Received: by mail-yx1-f43.google.com with SMTP id 956f58d0204a3-65c7492a2ceso5253081d50.3 for ; Tue, 12 May 2026 08:48:50 -0700 (PDT) X-Forwarded-Encrypted: i=1; AFNElJ/bmeyIqTPB1/U9h6TlqCCHfOyEqu8cXHt99gftF+A0E2DazY1ZaicO3w4Jbft2ZU0V22Y0AH2JLdcJtPOTq4vSQV1cLw==@freebsd.org X-Received: by 2002:a05:690e:1403:b0:650:a6d:d6bf with SMTP id 956f58d0204a3-65c79ee4068mr28594244d50.51.1778600930119; Tue, 12 May 2026 08:48:50 -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: <6a000ce6.3679f.32629671@gitrepo.freebsd.org> In-Reply-To: <6a000ce6.3679f.32629671@gitrepo.freebsd.org> From: Ryan Libby Date: Tue, 12 May 2026 08:48:38 -0700 X-Gmail-Original-Message-ID: X-Gm-Features: AVHnY4Lifka9WCN9AryEFSz2Va1AsGfSfjQaB4_jIONpD0hxvLjmkF2lwz6VsQQ Message-ID: Subject: Re: git: 58e5b4dbd959 - main - vfs_subr: mark uma zone and smr pointers __read_mostly To: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.89 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.989]; FORGED_SENDER(0.30)[rlibby@freebsd.org,rlibby@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:74.125.0.0/16:c]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_THREE(0.00)[3]; MISSING_XM_UA(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[rlibby]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_NONE(0.00)[]; FROM_NEQ_ENVFROM(0.00)[rlibby@freebsd.org,rlibby@gmail.com]; ASN(0.00)[asn:15169, ipnet:74.125.0.0/16, country:US]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[74.125.224.54:from]; RCVD_IN_DNSWL_NONE(0.00)[74.125.224.43:received,74.125.224.54:from] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4gFLc355bdz3fkX On Sat, May 9, 2026 at 9:43=E2=80=AFPM Ryan Libby wrot= e: > > The branch main has been updated by rlibby: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D58e5b4dbd9594f9553cfe9df68= a19a294e245ed7 > > 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 > --- I should have tagged this one: Sponsored by: Dell Inc. From nobody Tue May 12 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 4gFLms3pVSz6cPS9 for ; Tue, 12 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 4gFLms361dz3hST for ; Tue, 12 May 2026 15:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778601389; 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=SUY1fTXY+rcioVxgZlZBOwucMMRXgKYwbE2ghlWidhg=; b=xnFXta53zEZRN9lZGpsUXgTxsmJQOl5dMNArgZiDJQUgX055z9Mk0tRPWj3g1fNwHH8nJQ HXLP0/7gdpHQWfD9p8nQ5SfVtdEku7eXZTIUynsbQaEEesUcsr18rWgeRLelm4EYn9bCM1 +Wb92KqNa4JhUFI4c7keLZZrPAuoh8WZds/IWYcNRmmczdeY2OMaOZIjSqjkkDHFLIja6G nIt4w12Kd5xylyy8xCrmUc+LGCBctCfrpgEaKb/xL1vF3sGP1IBoN9ZZ0oc96U3Enc/5+S Eo4jQnhM3i8p3uKMoVcHDZyvzaQ3OoPOznszSylVctVJtM0IZiVqA34NDO4DdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778601389; a=rsa-sha256; cv=none; b=bn0oxv2g0HlCMsIBXCxgIu5Nj4Phr22Q9mPWZJpFqvrKvp8HFbVoVY4eO8nY75HYuOLHHH zHf52aIstDPqairIhIXqB7OiRbjZbC/nryJSfjgTd4/J0bhhOCBufPe7Q/4rCpZafHRA8U 46EcnBBQQWyLODoixyoAHC4wsEfmsDi73mZEUbaTTLeUAwNjoWGhSiexUZ8wxrwF0qjSyV tk4AjukgjuMAIzNrjPgXC6YrSkOaaqS5YqwBgmFCKEkmFz+WgZ9IznduEuhHQgQSHAmTxu qQbceq2rIJdtpQjIzi4n1vLAY1fUFCsRi8n3xJuaORFeY0BZWfVaRBQOZcJikQ== 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=1778601389; 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=SUY1fTXY+rcioVxgZlZBOwucMMRXgKYwbE2ghlWidhg=; b=qyxA8lob3x6jHzL7RuwiVBYrlWWZobx9sG2so9gya985J6tr9vheD300JBeVlcyLw+prPV KFUQuBKl+vIwV+n2M2XkMvF0/ddUUKVrQi1qQMJWH5yEUyVmWDxPCiTNpjA1IUbjb5lqVD AjQaOuXfBI/4gK734+50b8kA5NMU0HIWJL3egnV76CP6hkw/USIMbc1lzI4UZI3Aqx0uDb w9K1YmyzIiAdgXRlTAEc3ByX/fZqVeu7t0DccyhWh5NXGXt42NhqIybhscF9IwZzorLlPL jqC34iqwEJiZSRo311fait40aZtTNiikgg6zSSNoVa5QNmzJK/QzMxXVDFyuAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFLms2FLSz18S0 for ; Tue, 12 May 2026 15:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 376c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 15:56:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aleksandr Rybalko Subject: git: 8db0553ed6d8 - main - vt: Clear cut-paste selection if the area intersects with the filled region 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: ray X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8db0553ed6d8636d82a26896237099526b93be19 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 15:56:29 +0000 Message-Id: <6a034dad.376c9.1b86bb2c@gitrepo.freebsd.org> The branch main has been updated by ray: URL: https://cgit.FreeBSD.org/src/commit/?id=8db0553ed6d8636d82a26896237099526b93be19 commit 8db0553ed6d8636d82a26896237099526b93be19 Author: Aleksandr Rybalko AuthorDate: 2026-05-12 15:56:20 +0000 Commit: Aleksandr Rybalko CommitDate: 2026-05-12 15:56:20 +0000 vt: Clear cut-paste selection if the area intersects with the filled region * cut-paste buffer stays unchanged PR: 260069 Reported by: emaste Reviewed by: imp Approved by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D56922 --- sys/dev/vt/vt.h | 2 ++ sys/dev/vt/vt_buf.c | 30 ++++++++++++++++++++++++++++++ sys/dev/vt/vt_core.c | 8 +++++--- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/sys/dev/vt/vt.h b/sys/dev/vt/vt.h index 4abe99e4ab13..6ff242562c87 100644 --- a/sys/dev/vt/vt.h +++ b/sys/dev/vt/vt.h @@ -248,6 +248,8 @@ void vtbuf_cursor_visibility(struct vt_buf *, int); int vtbuf_set_mark(struct vt_buf *vb, int type, int col, int row); int vtbuf_get_marked_len(struct vt_buf *vb); void vtbuf_extract_marked(struct vt_buf *vb, term_char_t *buf, int sz, int mark); +void vtbuf_unmark(struct vt_buf *vb); +void vtbuf_unmark_on_cross(struct vt_buf *vb, int target_begin, int target_end); #endif #define VTB_MARK_NONE 0 diff --git a/sys/dev/vt/vt_buf.c b/sys/dev/vt/vt_buf.c index e1e4ebc23491..8596342c139a 100644 --- a/sys/dev/vt/vt_buf.c +++ b/sys/dev/vt/vt_buf.c @@ -202,6 +202,36 @@ vtbuf_in_this_range(int begin, int test, int end, int sz) else return (test >= begin && test < end); } + +void +vtbuf_unmark(struct vt_buf *vb) +{ + + vtbuf_set_mark(vb, VTB_MARK_START, 0, 0); +} + +void +vtbuf_unmark_on_cross(struct vt_buf *vb, int target_begin, int target_end) +{ + int hsz, mb, me, tb, te; + + tb = vtbuf_wth(vb, target_begin); + te = vtbuf_wth(vb, target_end); + mb = vb->vb_mark_start.tp_row; + me = vb->vb_mark_end.tp_row; + hsz = vb->vb_history_size; + + /* + * Test intersection with vtbuf_in_this_range due to use of + * the circular buffer. + */ + if (vtbuf_in_this_range(tb, mb, te, hsz) || + vtbuf_in_this_range(tb, me, te, hsz) || + vtbuf_in_this_range(mb, tb, me, hsz) || + vtbuf_in_this_range(mb, te, me, hsz)) { + vtbuf_unmark(vb); + } +} #endif int diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index 68e9f45cff56..641f6c014937 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -1197,6 +1197,10 @@ vtterm_fill(struct terminal *tm, const term_rect_t *r, term_char_t c) { struct vt_window *vw = tm->tm_softc; +#ifndef SC_NO_CUTPASTE + vtbuf_unmark_on_cross(&vw->vw_buf, r->tr_begin.tp_row, + r->tr_end.tp_row); +#endif vtbuf_fill(&vw->vw_buf, r, c); } @@ -2465,9 +2469,7 @@ vt_mouse_event(int type, int x, int y, int event, int cnt, int mlevel) default: vt_mouse_paste(); /* clear paste buffer selection after paste */ - vtbuf_set_mark(&vw->vw_buf, VTB_MARK_START, - vd->vd_mx / vf->vf_width, - vd->vd_my / vf->vf_height); + vtbuf_unmark(&vw->vw_buf); break; } return; /* Done */ From nobody Tue May 12 16:04: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 4gFLyF5VtQz6cg4C for ; Tue, 12 May 2026 16:04:37 +0000 (UTC) (envelope-from ctuffli@gmail.com) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 4gFLyB5VCNz3m39 for ; Tue, 12 May 2026 16:04:34 +0000 (UTC) (envelope-from ctuffli@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 ctuffli@gmail.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=ctuffli@gmail.com Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2b9fcf7c91bso57190855ad.0 for ; Tue, 12 May 2026 09:04:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778601873; x=1779206673; h=content-transfer-encoding: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=0TmW/YaNwyeBKFsXezyHeDlWuX6yIXapFxYhi4rSYS0=; b=GJAZTggDOvpZod8dT52hFXltdQ7ik9MTCeQPqP6VFv5eIbMfVaG7sYnYDO454xiWVL aJFejq5f3KdLzVenV4fKpoo+M9rCxbW+UVBk0gO/s5itDwjvfcwwoHsuT+LLpWsvlwl7 j9res0jSOMQp+1rk/0jYPoaWuRYFQAdnr0czu4bwYOxDDAdaFR8gDOhHWu34wTaKQlUL L6HlobJedJhp1//u770fEybcfzy8ibcD0pH0A2teoDVYFNv6Cx6/aeYZCYuWXZBZorZ2 Ic6EAH8gHeN53QVRBlC3dQhho02vdH10EgviABjAejLIB54z/dbjsmabs5HgHaxr4e/O KMPg== X-Forwarded-Encrypted: i=1; AFNElJ9KLylEZK8c2e8VrvCnwPYinpBHLlx5E5E97xpfPDA8/s49iNJb3WpV1ZmOqPERXCBgK//28++fJVLeZbChmrrKWCp+jA==@freebsd.org X-Gm-Message-State: AOJu0Yx0wES3hd1UtkyCgo/hZRHmJbK7YSIanBKjXIFGluwj2qphYbW6 zYu1rtOJKjPr9RV/7AQt6XxJHvALjgZjApNGeXeFFx5Z7yRgsNCGUMIvuW+GFg== X-Gm-Gg: Acq92OEyF9BfiBPgQ34mYShEzHz4Aw1Nwtqpr8I9HESe/83LTS/ce78YTHvUa5B3wZD Yt85kSgxn1AUX+jdakmYy7glLZA1gzxuBXS/jYiYbtLxSwr6oYHyqfADQwuxOMxbDMwBG1tR+DV BQDq4Crx7YYe2MSGygN1exVH7kQiL7DCG87yTMNWKMv3YEBpKG24PqyZHvNFQdwtSloOUAsvfTS vGD7v7+RM/ioGoFB17EsLzVkUOmWwSsAzdAcKnrjzrTPhI8TC4QhaTyPVNKZqXsP0XLjRBq/808 WZ4COdqnbY+Aur1Br63oDUNu3CfJgGKOsYsNDCOrQfwG/vaAA4MTmbJFw16H0QqZEwCVWU3zpTg Sl9ec00DL41XfQ1xFlKLG0KKgir8noEMT3kGi4rWd7Fpf4/pG+j/pfgJZqpn6XhJ2gntias0TfZ /i2YiUTG4wmz/9hlqrOOeWwjAwyxeq5JjKNEHWk6yuXWCWaRhXFwRVx9utjhAW X-Received: by 2002:a17:903:350d:b0:2b0:6f21:8289 with SMTP id d9443c01a7336-2ba79c2232amr288979915ad.25.1778601872527; Tue, 12 May 2026 09:04:32 -0700 (PDT) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com. [209.85.210.171]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1d3fee3sm130957225ad.18.2026.05.12.09.04.31 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 12 May 2026 09:04:31 -0700 (PDT) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-834f1075805so4015110b3a.2 for ; Tue, 12 May 2026 09:04:31 -0700 (PDT) X-Forwarded-Encrypted: i=1; AFNElJ8DazKV26WnGFOKKUwfJ0qFJTEdXsrAfEGiuVv6e6k/Q5NxlIgiKTzkZxirsXApv3VTzakb2I3d51Y8vXUSV+1TIW99gQ==@freebsd.org X-Received: by 2002:a05:6a00:b48:b0:82f:280a:d888 with SMTP id d2e1a72fcca58-83a5bbd5fd8mr29537511b3a.12.1778601871058; Tue, 12 May 2026 09:04:31 -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: <6a025660.37fa7.6a3f7fc0@gitrepo.freebsd.org> In-Reply-To: From: Chuck Tuffli Date: Tue, 12 May 2026 09:04:19 -0700 X-Gmail-Original-Message-ID: X-Gm-Features: AVHnY4JgaPS6toj0mC3T-6ilaC0wcFU78HK1G_7BfZqVW7ExXPuuqJHNyKauEIs Message-ID: Subject: Re: git: 25942dddc8a8 - main - smart: Connect contrib/smart to build To: Chuck Tuffli , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.990]; FORGED_SENDER(0.30)[chuck@freebsd.org,ctuffli@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; 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.214.182:from]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; MISSING_XM_UA(0.00)[]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; FROM_NEQ_ENVFROM(0.00)[chuck@freebsd.org,ctuffli@gmail.com]; FROM_HAS_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.214.182:from,209.85.210.171:received]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; RCVD_COUNT_THREE(0.00)[3]; RCPT_COUNT_THREE(0.00)[4] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4gFLyB5VCNz3m39 On Tue, May 12, 2026 at 2:21=E2=80=AFAM Lexi Winter wrote= : > > hello, > > Chuck Tuffli wrote in <6a025660.37fa7.6a3f7fc0@gitrepo.freebsd.org>: > > smart: Connect contrib/smart to build > > this has broken the armv7 build: Both the armv7 and gcc14 builds should be working again. From nobody Tue May 12 16:55: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 4gFN4x3g9Hz6clBb for ; Tue, 12 May 2026 16:55: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 4gFN4x1DQFz3vjR for ; Tue, 12 May 2026 16:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604929; 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=0fyy/SroxdhHoSvLYJoSLYTizZ2ZWJh87kCTs/ELtzk=; b=boOa+v7pLp4xCz/o//+dukU9o9BXiZrw+fWI41CM74xZkksn2h8XjbEEad1KKGYkEKFnGs cCV9bl2E06hlte+Tg1+ZwxNElB+PIChbb1sDLJEHevnXNwqeszMDh/b1ql/dtk2dIv3WfT 1Q2Jv372HLBey0rpm/wvewD2qXPXSFXFXHX/YFV//hBqI1zT8lNDurM1+mU99eck1Soodo yrHeshedT/NtChrsXqYRNsqafIDtx0IIYV0kBFYmSC2JslrzwJ2tVOoGf2L3Ee5L8JYmYZ iN9khsLgoE8ho0diGVRNB2rFePa8o2AVWVaXQ3rmzfZL6GHGjtauA6muji4g9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778604929; a=rsa-sha256; cv=none; b=FSPdxhErmRMUlf0Mano97dgfuPXb4NwrTFJsOTuRUFdgovNnLFEAeIbvTrRgWI2WVy2krd xIyuoI8h/YA0QdKJ+awnSeg3cZGkhZM2RfdfwCk1apzR+bT25bCQwwWjcyidfF9dvQEjfX G1uTx2BCFI8xP2EhLQx+vZSxu4+zTcDMIGnbH0yrB2epZrCeIyzAJF4CVv8uRuzWAnhlm8 Igdlnz1Q5h+XF/Vk/apSpMI5iw1eVJsHdQyVs+J7+7P4/DMOaVFmrm74EE9PrTUxhSaimG fSTlKQZVp7zlSXNq0tqssoX5Aqnmu6y0j1vp2WERmS3n30iEjpT/1wOdkVnCzg== 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=1778604929; 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=0fyy/SroxdhHoSvLYJoSLYTizZ2ZWJh87kCTs/ELtzk=; b=T9GhkxRCwIcFoIcxYc4JqLrVRMAC4GjrlvAcFX/acgBDCQWoSbmuioIP9nuJ7b7iqn8cza AGAIbReVwfurJVZZxZ8/5MJX+wVdmuWmn5eOILGO/gy6wNiHOj89pMOvOq2CuP3Hg0+Qoy RkykZrP8cxzG33TZ5sx88kZZNbBYxpOX+F9FlO6EwSskMiOd/xEcXDYec3xLf6WFIzW6hx nwhKIcwpWyLdRA77XgByViC6xU2/1fDD68MI8fLSk9cnAtF2enrStL+amxFXyctsYoCpL3 ELuwj6x62cn/MjGUgJ01ErKGV/wKRYdjJMWzs5dPqPXrk2ACOvpBxKJmr57PGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFN4x0Hq5z1BQv for ; Tue, 12 May 2026 16:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dcae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 16:55:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: f9ba99eaa24f - main - physmem: Add a way to read all memory 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: f9ba99eaa24fb41a69c5480621427fe64333986f Auto-Submitted: auto-generated Date: Tue, 12 May 2026 16:55:29 +0000 Message-Id: <6a035b81.3dcae.2ec4e6d3@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f9ba99eaa24fb41a69c5480621427fe64333986f commit f9ba99eaa24fb41a69c5480621427fe64333986f Author: Sarah Walker AuthorDate: 2026-05-12 11:10:32 +0000 Commit: Andrew Turner CommitDate: 2026-05-12 16:54:40 +0000 physmem: Add a way to read all memory In Arm CCA we need to find all memory to protect it. This needs to find all memory, ignoring any excluded memory to protect it from the host. Add physmem_all that reads all physical memory regions. Co-developed-by: Andrew Turner (writing tests & commit message) Sponsored by: Arm Ltd --- sys/kern/subr_physmem.c | 6 ++++++ sys/sys/physmem.h | 1 + tests/sys/kern/subr_physmem_test.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/sys/kern/subr_physmem.c b/sys/kern/subr_physmem.c index 6b97b36a6c51..7458c8147ad1 100644 --- a/sys/kern/subr_physmem.c +++ b/sys/kern/subr_physmem.c @@ -503,6 +503,12 @@ physmem_avail(vm_paddr_t *avail, size_t maxavail) return (regions_to_avail(avail, EXFLAG_NOALLOC, maxavail, 0, NULL, NULL)); } +size_t +physmem_all(vm_paddr_t *avail, size_t maxavail) +{ + return (regions_to_avail(avail, 0, maxavail, 0, NULL, NULL)); +} + bool physmem_excluded(vm_paddr_t pa, vm_size_t sz) { diff --git a/sys/sys/physmem.h b/sys/sys/physmem.h index 1b75dc63dc40..97c3ad9f3154 100644 --- a/sys/sys/physmem.h +++ b/sys/sys/physmem.h @@ -54,6 +54,7 @@ void physmem_hardware_region(uint64_t pa, uint64_t sz); void physmem_exclude_region(vm_paddr_t pa, vm_size_t sz, uint32_t flags); size_t physmem_avail(vm_paddr_t *avail, size_t maxavail); +size_t physmem_all(vm_paddr_t *avail, size_t maxavail); void physmem_init_kernel_globals(void); void physmem_print_tables(void); bool physmem_excluded(vm_paddr_t pa, vm_size_t sz); diff --git a/tests/sys/kern/subr_physmem_test.c b/tests/sys/kern/subr_physmem_test.c index b810a2016473..31bd30447e3b 100644 --- a/tests/sys/kern/subr_physmem_test.c +++ b/tests/sys/kern/subr_physmem_test.c @@ -79,6 +79,12 @@ ATF_TC_BODY(hwregion, tc) ATF_CHECK_EQ(len, 2); ATF_CHECK_EQ(avail[0], 2 * PAGE_SIZE); ATF_CHECK_EQ(avail[1], 7 * PAGE_SIZE); + + /* Check physmem_all */ + len = physmem_all(avail, nitems(avail)); + ATF_CHECK_EQ(len, 2); + ATF_CHECK_EQ(avail[0], 2 * PAGE_SIZE); + ATF_CHECK_EQ(avail[1], 7 * PAGE_SIZE); } ATF_TC_WITHOUT_HEAD(hwregion_exclude); @@ -106,6 +112,27 @@ ATF_TC_BODY(hwregion_exclude, tc) ATF_CHECK_EQ(avail[1], 3 * PAGE_SIZE); ATF_CHECK_EQ(avail[2], 6 * PAGE_SIZE); ATF_CHECK_EQ(avail[3], 7 * PAGE_SIZE); + + /* Check physmem_all */ + len = physmem_all(avail, 6); + ATF_CHECK_EQ(len, 2); + ATF_CHECK_EQ(avail[0], 2 * PAGE_SIZE); + ATF_CHECK_EQ(avail[1], 7 * PAGE_SIZE); + + /* Check an excluded region out of the included memory works */ + physmem_exclude_region(7 * PAGE_SIZE, PAGE_SIZE, EXFLAG_NOALLOC); + len = physmem_avail(avail, 6); + ATF_CHECK_EQ(len, 4); + ATF_CHECK_EQ(avail[0], 2 * PAGE_SIZE); + ATF_CHECK_EQ(avail[1], 3 * PAGE_SIZE); + ATF_CHECK_EQ(avail[2], 6 * PAGE_SIZE); + ATF_CHECK_EQ(avail[3], 7 * PAGE_SIZE); + + /* Check physmem_all */ + len = physmem_all(avail, 6); + ATF_CHECK_EQ(len, 2); + ATF_CHECK_EQ(avail[0], 2 * PAGE_SIZE); + ATF_CHECK_EQ(avail[1], 7 * PAGE_SIZE); } ATF_TC_WITHOUT_HEAD(hwregion_unordered); @@ -125,6 +152,12 @@ ATF_TC_BODY(hwregion_unordered, tc) ATF_CHECK_EQ(len, 2); ATF_CHECK_EQ(avail[0], PAGE_SIZE); ATF_CHECK_EQ(avail[1], 3 * PAGE_SIZE); + + /* Check physmem_all */ + len = physmem_all(avail, 4); + ATF_CHECK_EQ(len, 2); + ATF_CHECK_EQ(avail[0], PAGE_SIZE); + ATF_CHECK_EQ(avail[1], 3 * PAGE_SIZE); } ATF_TP_ADD_TCS(tp) From nobody Tue May 12 16:55:30 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 4gFN4y3tydz6cl3K for ; Tue, 12 May 2026 16:55: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 4gFN4y1bJ1z3w9m for ; Tue, 12 May 2026 16:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604930; 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=EFCna7ir+8t8FFaSfvQnc2RlfY6KY/MvNmQIFoaFkaE=; b=FkoDhXsk7xWz/vZR5gfruPMpYi0anl9rUy6UoIjAPiPgJeAq6IZ5aguHA+zP7w2z3SjUZU 1YzKX0DXldUp/2vGqkn966SBvSYYSvdhC43KJoYyOGebEv35dwaxCgtwqvFpnfJxXbr0c8 NzB/E+SiDs28a9N0jrfrYnMWnJ4sCXBnA3cZzSVmasRZf0Yf7sQtKwlFFJXZUG/H2R2Hz3 aCRllvOHaO8XPJfrUZp+qNNqQdHkc6KgDPCzZzXPMsGwdZtdqMOdLk7RfosBKMhzbrduWd 7Q0sRqHhgBieXpnqHQgYXVwP1ARrmCOpycE1/8AIndlI/zFCwbAzqRH+nWjWfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778604930; a=rsa-sha256; cv=none; b=sI4lfkHLPj7qPy3+unCSMLTrczH+TlQgPyh/Vy+BOrswzCgAk+8pE0SD0IRgnV338VKTXa LCwoZsUg/XLKVuRe2MM4cEeURMZyvylf6EgyzokUNP13/plPp/5LLnXY4FnlwkGcm/d1os ajCg8ZuuSPmlmCOBSCf4ope068ryHaxYmVZSbRRpTfy3zARDzmJjtZ3UdMD/Ug5JnMe2Nr zhKUUw5qNf+rryC3MunlXvfUi2AvVPhd+e5RSwp+KfnbAnR4j/vOqbsne7QzfIX2FejmW9 9xurJkHMD+AihjDEgnIyQUUIz4JBvLg4+a4uVGMQEWOxp05NFX46gpVt00kWmA== 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=1778604930; 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=EFCna7ir+8t8FFaSfvQnc2RlfY6KY/MvNmQIFoaFkaE=; b=dLQFHAk6ATOijADYESf5/3fVz9SWVP9RhMsdyCbr2BfDMFOL4xbve9q1h8C5r3Yk2NunYS yyib8ZvQIWYRK5wfDET2zZ7eTema0YzGMxRuILB4ZMPsZNVNg4+3pYrHNkOBgXGzSEtO5p g9n0mJjwrzl5GiE4qLJxLbIiTIhy7+U9LF2UFADvX2C3GGqkO+IeBbXJopg+lPElP1/JiW RsF2aagc1Nff6NgftJfnyARvtjnF2eWwylwNLBk0ColnbLv1c2i3RGY/36hMMhuj2qetUD IWhO2OZ00uN+yY1bf+d6tVWfjsjoHvlmVbNOfN+bBXLGDLnSifBRZkcgGwdOSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFN4y16sNz1BQw for ; Tue, 12 May 2026 16:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e295 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 16:55:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: 76a2904c352b - main - arm64: Add RSI detection for CCA 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: 76a2904c352b497b32fc902523e3e485f7b06ffd Auto-Submitted: auto-generated Date: Tue, 12 May 2026 16:55:30 +0000 Message-Id: <6a035b82.3e295.91ae8c3@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=76a2904c352b497b32fc902523e3e485f7b06ffd commit 76a2904c352b497b32fc902523e3e485f7b06ffd Author: Sarah Walker AuthorDate: 2026-05-12 11:27:13 +0000 Commit: Andrew Turner CommitDate: 2026-05-12 16:54:40 +0000 arm64: Add RSI detection for CCA Detect the presence of the Realm Services Interface (RSI). This detection is performed early in bootup; PSCI initialisation has been moved to initarm() to faciliate this. Reviewed by: andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D56598 --- sys/arm64/arm64/machdep.c | 5 ++ sys/arm64/arm64/pmap.c | 2 + sys/arm64/arm64/rsi.c | 185 ++++++++++++++++++++++++++++++++++++++++++++++ sys/arm64/include/pmap.h | 3 + sys/arm64/include/rsi.h | 129 ++++++++++++++++++++++++++++++++ sys/conf/files.arm64 | 1 + sys/dev/psci/psci.c | 11 ++- sys/dev/psci/psci.h | 3 + 8 files changed, 338 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index adfb509d4924..d219c737c215 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -86,6 +86,7 @@ #include #include #include +#include #include #include @@ -103,6 +104,7 @@ #include #endif +#include #include _Static_assert(sizeof(struct pcb) == 1248, "struct pcb is incorrect size"); @@ -889,6 +891,9 @@ initarm(struct arm64_bootparams *abp) valid = bus_probe(); + psci_init(NULL); + arm64_rsi_setup_memory(); + cninit(); set_ttbr0(abp->kern_ttbr0); pmap_s1_invalidate_all_kernel(); diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 595fba2da411..2d2982fdfae7 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -205,6 +205,8 @@ __exclusive_cache_line static struct pmap_large_md_page pv_dummy_large; #define pv_dummy pv_dummy_large.pv_page __read_mostly static struct pmap_large_md_page *pv_table; +__read_mostly uint64_t prot_ns_shared_pa; + static struct pmap_large_md_page * _pa_to_pmdp(vm_paddr_t pa) { diff --git a/sys/arm64/arm64/rsi.c b/sys/arm64/arm64/rsi.c new file mode 100644 index 000000000000..85c7896e13ce --- /dev/null +++ b/sys/arm64/arm64/rsi.c @@ -0,0 +1,185 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 Arm Ltd + * + * 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. + */ + +#include "opt_platform.h" + +#include +#include +#include +#include + +#include + +#include +#include + +#include +#include + +static struct realm_config config; +static bool rsi_present = false; + +#define PHYSMAP_SIZE (2 * (VM_PHYSSEG_MAX - 1)) + +static vm_paddr_t physmap[PHYSMAP_SIZE]; + +static unsigned long +rsi_request_version(unsigned long req, unsigned long *out_lower, + unsigned long *out_higher) +{ + struct arm_smccc_res res; + + arm_smccc_invoke_smc(SMC_RSI_ABI_VERSION, req, &res); + + if (out_lower != NULL) + *out_lower = res.a1; + if (out_higher != NULL) + *out_higher = res.a2; + + return (res.a0); +} + +static inline unsigned long +rsi_get_realm_config(struct realm_config *cfg) +{ + struct arm_smccc_res res; + + arm_smccc_invoke_smc(SMC_RSI_REALM_CONFIG, vtophys(cfg), &res); + return (res.a0); +} + +static bool +rsi_version_matches(void) +{ + unsigned long ver_lower, ver_higher; + unsigned long ret; + + ret = rsi_request_version(RSI_ABI_VERSION, &ver_lower, &ver_higher); + + if (ret == SMCCC_RET_NOT_SUPPORTED) + return (false); + + if (ret != RSI_SUCCESS) { + printf("RME: RMM doesn't support RSI version %lu.%lu. Supported range: %lu.%lu-%lu.%lu\n", + RSI_ABI_VERSION_MAJOR, RSI_ABI_VERSION_MINOR, + RSI_ABI_VERSION_GET_MAJOR(ver_lower), + RSI_ABI_VERSION_GET_MINOR(ver_lower), + RSI_ABI_VERSION_GET_MAJOR(ver_higher), + RSI_ABI_VERSION_GET_MINOR(ver_higher)); + return (false); + } + + printf("RME: Using RSI version %lu.%lu\n", + RSI_ABI_VERSION_GET_MAJOR(ver_lower), + RSI_ABI_VERSION_GET_MINOR(ver_lower)); + + return (true); +} + + +unsigned long +rsi_set_addr_range_state(vm_paddr_t start, vm_paddr_t end, enum ripas state, + unsigned long flags, vm_paddr_t *top) +{ + struct arm_smccc_res res; + + arm_smccc_smc(SMC_RSI_IPA_STATE_SET, start, end, state, flags, 0, 0, 0, + &res); + + if (top) + *top = res.a1; + + return (res.a0); +} + +static int +rsi_set_memory_range(vm_paddr_t start, vm_paddr_t end, enum ripas state, + unsigned long flags) +{ + unsigned long ret; + vm_paddr_t top; + + while (start != end) { + ret = rsi_set_addr_range_state(start, end, state, flags, &top); + if (ret || top < start || top > end) + return (-EINVAL); + start = top; + } + + return (0); +} + +/* + * Convert the specified range to RAM. Do not convert any pages that may have + * been DESTROYED, without our permission. + */ +static int +rsi_set_memory_range_protected_safe(vm_paddr_t start, vm_paddr_t end) +{ + return (rsi_set_memory_range(start, end, RSI_RIPAS_RAM, + RSI_NO_CHANGE_DESTROYED)); +} + +void +arm64_rsi_setup_memory(void) +{ + int physmap_idx; + int i; + + if (!psci_conduit_is_smc()) + return; + if (!rsi_version_matches()) + return; + if (rsi_get_realm_config(&config)) + return; + + prot_ns_shared_pa = 1ul << (config.ipa_bits - 1); + if (bootverbose) + printf("arm64_rsi_setup_memory: rsi_present, ipa_bits=%lu prot_ns_shared_pa=%lx\n", + config.ipa_bits, prot_ns_shared_pa); + rsi_present = true; + + physmap_idx = physmem_all(physmap, nitems(physmap)); + + if (bootverbose) + printf("physmap:\n"); + + for (i = 0; i < physmap_idx; i += 2) { + if (bootverbose) + printf(" %lx %lx\n", physmap[i], physmap[i + 1]); + + if (rsi_set_memory_range_protected_safe(physmap[i], + physmap[i + 1])) + panic("rsi_set_memory_range_protected_safe failed"); + } +} + +bool +in_realm(void) +{ + return (rsi_present); +} diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index 2ee70fc754da..00b54a874e12 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -43,6 +43,7 @@ #ifndef LOCORE #include +#include #include #include #include @@ -132,6 +133,8 @@ extern vm_offset_t virtual_end; extern pt_entry_t pmap_sh_attr; +extern __read_mostly uint64_t prot_ns_shared_pa; + /* * Macros to test if a mapping is mappable with an L1 Section mapping * or an L2 Large Page mapping. diff --git a/sys/arm64/include/rsi.h b/sys/arm64/include/rsi.h new file mode 100644 index 000000000000..82e54f9c57e3 --- /dev/null +++ b/sys/arm64/include/rsi.h @@ -0,0 +1,129 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 Arm Ltd + * + * 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. + */ + +#ifndef _MACHINE_RSI_H_ +#define _MACHINE_RSI_H_ + +extern uint64_t prot_ns_shared; + +bool in_realm(void); + +void arm64_rsi_setup_memory(void); + +/* + * The major version number of the RSI implementation. This is increased when + * the binary format or semantics of the SMC calls change. + */ +#define RSI_ABI_VERSION_MAJOR UL(1) + +/* + * The minor version number of the RSI implementation. This is increased when + * a bug is fixed, or a feature is added without breaking binary compatibility. + */ +#define RSI_ABI_VERSION_MINOR UL(0) + +#define RSI_ABI_VERSION ((RSI_ABI_VERSION_MAJOR << 16) | \ + RSI_ABI_VERSION_MINOR) + +#define RSI_ABI_VERSION_GET_MAJOR(_version) ((_version) >> 16) +#define RSI_ABI_VERSION_GET_MINOR(_version) ((_version) & 0xFFFF) + +#define RSI_SUCCESS UL(0) +#define RSI_ERROR_INPUT UL(1) +#define RSI_ERROR_STATE UL(2) +#define RSI_INCOMPLETE UL(3) +#define RSI_ERROR_UNKNOWN UL(4) + +#define SMC_RSI_FID(n) SMCCC_FUNC_ID(SMCCC_FAST_CALL, \ + SMCCC_64BIT_CALL, \ + SMCCC_STD_SECURE_SERVICE_CALLS, \ + n) + +/* + * Returns RSI version. + * + * arg1 == Requested interface revision + * ret0 == Status / error + * ret1 == Lower implemented interface revision + * ret2 == Higher implemented interface revision + */ +#define SMC_RSI_ABI_VERSION SMC_RSI_FID(0x190) + +/* + * Read configuration for the current Realm. + * + * arg1 == struct realm_config addr + * ret0 == Status / error + */ +#define SMC_RSI_REALM_CONFIG SMC_RSI_FID(0x196) + +struct realm_config { + union { + struct { + unsigned long ipa_bits; /* Width of IPA in bits */ + unsigned long hash_algo; /* Hash algorithm */ + }; + uint8_t pad[0x200]; + }; + union { + uint8_t rpv[64]; /* Realm Personalization Value */ + uint8_t pad2[0xe00]; + }; + /* + * The RMM requires the configuration structure to be aligned to a 4k + * boundary, ensure this happens by aligning this structure. + */ +} __aligned(0x1000); + +/* + * Request RIPAS of a target IPA range to be changed to a specified value. + * + * arg1 == Base IPA address of target region + * arg2 == Top of the region + * arg3 == RIPAS value + * arg4 == flags + * ret0 == Status / error + * ret1 == Top of modified IPA range + * ret2 == Whether the Host accepted or rejected the request + */ +#define SMC_RSI_IPA_STATE_SET SMC_RSI_FID(0x197) + +#define RSI_NO_CHANGE_DESTROYED UL(0) +#define RSI_CHANGE_DESTROYED UL(1) + +#define RSI_ACCEPT UL(0) +#define RSI_REJECT UL(1) + +enum ripas { + RSI_RIPAS_EMPTY = 0, + RSI_RIPAS_RAM +}; + +unsigned long rsi_set_addr_range_state(vm_paddr_t start, vm_paddr_t end, + enum ripas state, unsigned long flags, vm_paddr_t *top); + +#endif /* !_MACHINE_RSI_H_ */ diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 44f292d9048f..8f550a644db6 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -77,6 +77,7 @@ arm64/arm64/ptrauth.c standard \ compile-with "${NORMAL_C:N-mbranch-protection*} -mbranch-protection=bti" arm64/arm64/pmap.c standard arm64/arm64/ptrace_machdep.c standard +arm64/arm64/rsi.c standard arm64/arm64/sdt_machdep.c optional kdtrace_hooks arm64/arm64/sigtramp.S standard arm64/arm64/spec_workaround.c standard diff --git a/sys/dev/psci/psci.c b/sys/dev/psci/psci.c index 2b250401ae83..872fae056a4b 100644 --- a/sys/dev/psci/psci.c +++ b/sys/dev/psci/psci.c @@ -133,7 +133,7 @@ static int psci_def_callfn(register_t, register_t, register_t, register_t, psci_callfn_t psci_callfn = psci_def_callfn; -static void +void psci_init(void *dummy) { psci_callfn_t new_callfn; @@ -146,8 +146,11 @@ psci_init(void *dummy) psci_callfn = new_callfn; psci_present = true; } + +#ifdef __arm__ /* This needs to be before cpu_mp at SI_SUB_CPU, SI_ORDER_THIRD */ SYSINIT(psci_start, SI_SUB_CPU, SI_ORDER_FIRST, psci_init, NULL); +#endif static int psci_def_callfn(register_t a __unused, register_t b __unused, @@ -631,3 +634,9 @@ psci_v0_2_init(device_t dev, int default_version) device_printf(dev, "PSCI version number mismatched with DT\n"); return (1); } + +bool +psci_conduit_is_smc(void) +{ + return (psci_callfn == arm_smccc_smc); +} diff --git a/sys/dev/psci/psci.h b/sys/dev/psci/psci.h index 6704eaf26c71..c250bf45d344 100644 --- a/sys/dev/psci/psci.h +++ b/sys/dev/psci/psci.h @@ -44,6 +44,9 @@ void psci_reset(void); int32_t psci_features(uint32_t); int psci_get_version(void); +void psci_init(void *dummy); +bool psci_conduit_is_smc(void); + /* Handler to let us call into the PSCI/SMCCC firmware */ extern psci_callfn_t psci_callfn; static inline int From nobody Tue May 12 16:55:31 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 4gFN4z4S7Lz6cl3L for ; Tue, 12 May 2026 16:55:31 +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 4gFN4z2qS4z3w3w for ; Tue, 12 May 2026 16:55:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604931; 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=MyfAD4MjAZD5hSnfq194TyeUAFKrn7fooLifjiSKyfM=; b=kupV4AvOaNMc5AIFhRaNCzYBMIXFkeQFrroVfCRj6ELP0vo/BfYXOXYPwkLQMZRiNt+AYg HoyiLUH8GglRXLlJ1BVZSVaHf4BeRYTLehCl38Mk8UVrufimE2hxdTDSrlgc46WrxQhWPP 9bCkNV+ppUhj8o11jYPwkzd6tRXZ42V4ZzEn+kBEwbm70/ZLxPCKHr0fvM2a6HcS6aFnEs WIOc5xgrMbk3t262v4JBZvEyKPbZXOcTGEEtMH2aWciFQHFSr2OxejnGU4iOXCoQfuE3ke bqFEzkjuYRMF2E4TClWP7L0OHtVuwIulrVwoK2c5gG/cdcQrQszPjWrB9cP2ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778604931; a=rsa-sha256; cv=none; b=pBM85BMg/O/9pps5WDOIyvgTBKZweR9Mywe48BS4R2zgRjYE8TLAL6I/1fvWhSaj2BjRj7 ErsEdf5N18VJBkslpDzg25XFSsw+Nwd8hLbFhf0sUL1bqSd5McKPWRzccTCtE1KkLl96Ig +h5gYp6fpL2aDjqWVqN5b+T6jDqs6NULPLgRLDBZgKC6S1nCE3d37jaK/tF2oEqYIUtWAi R5ofc0ZBbSEpW43DPyCyiJT7TqWBoiwpTgzCmEtQn/J/fOE+SExRZ060qM2wwBXWzcKY41 g+CMRheX3l3QNy9WaDme3vtW7QgfzZNDg8kHWGvulp9UEF2c1BMHxwQcE657NQ== 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=1778604931; 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=MyfAD4MjAZD5hSnfq194TyeUAFKrn7fooLifjiSKyfM=; b=agdsGoO0xvulLGQ24hqXxYYz1Z1duxefvbakictIs/k5WNpg29mGNIzWsK9nkl0CBRPY8y ONsFHHZr5N27ExepiudOFVVslfoqsnO0xsqswwwS/0SbpeCEsxEWo5ktQ+T0dq8OJK4YO9 FDXDmSAHvrl6DnaH6m/6RBdaaQI0omAPT54p6MIohiUKm5+N+++sPHordNK9So1OzgQXCP OaLgXhzEjOmFjrkuJcA0VN8Lk7GsNudX7RjFL25CJV2jOo6jzzCknoAshyqUq4LjPkvPai UeWAdzSkiG820r7NjopshKPVdLV+Vpf/IjhfB4pRV3PJvPDfZqQ7USeH8XmLjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFN4z214Gz19nF for ; Tue, 12 May 2026 16:55:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3df8a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 16:55:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: 56abdbc5f709 - main - arm64: VM/PMAP changes for CCA guest 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56abdbc5f709fc0e18624b3b7586647459922a41 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 16:55:31 +0000 Message-Id: <6a035b83.3df8a.27c5734@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=56abdbc5f709fc0e18624b3b7586647459922a41 commit 56abdbc5f709fc0e18624b3b7586647459922a41 Author: Sarah Walker AuthorDate: 2026-05-12 11:29:20 +0000 Commit: Andrew Turner CommitDate: 2026-05-12 16:54:41 +0000 arm64: VM/PMAP changes for CCA guest support When in a realm: - Mappings with mode VM_MEMATTR_DEVICE and VM_MEMATTR_DEVICE_NP are unprotected - Imported busdma buffers in protected memory are always bounced - If EARLY_PRINTK is in use, the UART physical address must be in the unprotected address space Reviewed by: andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D56599 --- sys/arm64/arm64/busdma_bounce.c | 68 ++++++++++++++++++++++++++++++++++++++--- sys/arm64/arm64/efirt_machdep.c | 10 +++++- sys/arm64/arm64/pmap.c | 40 ++++++++++++++++++++++++ sys/conf/files.arm64 | 1 + sys/vm/vm_page.c | 8 +++++ 5 files changed, 122 insertions(+), 5 deletions(-) diff --git a/sys/arm64/arm64/busdma_bounce.c b/sys/arm64/arm64/busdma_bounce.c index 74fa611e6d1a..db7e108812aa 100644 --- a/sys/arm64/arm64/busdma_bounce.c +++ b/sys/arm64/arm64/busdma_bounce.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -56,6 +57,7 @@ #include #include #include +#include #include #define MAX_BPAGES 4096 @@ -120,6 +122,8 @@ static void _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, static void _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf, bus_size_t buflen, int flags); +static busdma_bufalloc_t nonsecure_allocator; + static MALLOC_DEFINE(M_BUSDMA, "busdma", "busdma metadata"); #define dmat_alignment(dmat) ((dmat)->common.alignment) @@ -215,6 +219,10 @@ might_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t paddr, if (map && (map->flags & DMAMAP_FROM_DMAMEM) != 0) return (false); + /* Bounce if accessing secure memory */ + if (in_realm() && !(paddr & prot_ns_shared_pa)) + return (true); + if ((dmat->bounce_flags & BF_COULD_BOUNCE) != 0) return (true); @@ -239,6 +247,10 @@ must_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t paddr, addr_needs_bounce(dmat, paddr)) return (true); + /* Bounce if accessing secure memory */ + if (in_realm() && !(paddr & prot_ns_shared_pa)) + return (true); + return (false); } @@ -492,6 +504,7 @@ static int bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, bus_dmamap_t *mapp) { + struct busdma_bufzone *bufzone; vm_memattr_t attr; int mflags; @@ -524,6 +537,9 @@ bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, else attr = VM_MEMATTR_DEFAULT; + if (in_realm()) + mflags |= M_UNPROTECTED; + /* * Create the map, but don't set the could bounce flag as * this allocation should never bounce; @@ -567,13 +583,16 @@ bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags, * * In the meantime warn the user if malloc gets it wrong. */ - if (dmat->alloc_size <= PAGE_SIZE && + + bufzone = busdma_bufalloc_findzone(nonsecure_allocator, + dmat->alloc_size); + + if (bufzone && + dmat->alloc_size <= PAGE_SIZE && dmat->alloc_alignment <= PAGE_SIZE && dmat->common.lowaddr >= ptoa((vm_paddr_t)Maxmem) && attr == VM_MEMATTR_DEFAULT) { - *vaddr = malloc_domainset_aligned(dmat->alloc_size, - dmat->alloc_alignment, M_DEVBUF, - DOMAINSET_PREF(dmat->common.domain), mflags); + *vaddr = uma_zalloc(bufzone->umazone, mflags); } else if (dmat->common.nsegments >= howmany(dmat->alloc_size, MIN(dmat->common.maxsegsz, PAGE_SIZE)) && dmat->alloc_alignment <= PAGE_SIZE && @@ -1148,3 +1167,44 @@ struct bus_dma_impl bus_dma_bounce_impl = { .load_kmsan = bounce_bus_dmamap_load_kmsan, #endif }; + +static void * +nonsecure_alloc(uma_zone_t zone, vm_size_t size, int domain, uint8_t *pflag, + int wait) +{ + void *p; /* Returned page */ + + *pflag = UMA_SLAB_KERNEL; + p = kmem_malloc_domainset(DOMAINSET_FIXED(domain), size, + wait | M_UNPROTECTED); + + return (p); +} + +static void +nonsecure_free(void *mem, vm_size_t size, uint8_t flags) +{ + KASSERT((flags & UMA_SLAB_KERNEL) != 0, + ("UMA: page_free used with invalid flags %x", flags)); + + kmem_free(mem, size); +} + +static void +busdma_bounce_init(void *dummy) +{ + if (in_realm()) + nonsecure_allocator = busdma_bufalloc_create("nonsecure", + dcache_line_size, /* minimum_alignment */ + nonsecure_alloc, /* uma_alloc func */ + nonsecure_free, /* uma_free func */ + UMA_ZONE_NOTOUCH); /* uma_zcreate_flags */ + else + nonsecure_allocator = busdma_bufalloc_create("nonsecure", + dcache_line_size, /* minimum_alignment */ + NULL, /* uma_alloc func */ + NULL, /* uma_free func */ + UMA_ZONE_NOTOUCH); /* uma_zcreate_flags */ +} + +SYSINIT(busdma, SI_SUB_KMEM + 1, SI_ORDER_FIRST, busdma_bounce_init, NULL); diff --git a/sys/arm64/arm64/efirt_machdep.c b/sys/arm64/arm64/efirt_machdep.c index b079393cd2a9..07946a2bdb82 100644 --- a/sys/arm64/arm64/efirt_machdep.c +++ b/sys/arm64/arm64/efirt_machdep.c @@ -46,6 +46,7 @@ #include #include +#include #include #include @@ -171,6 +172,7 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int descsz) vm_page_t efi_l0_page; uint64_t idx; int i, mode; + uint64_t pa; obj_1t1_pt = vm_pager_allocate(OBJT_PHYS, NULL, L0_ENTRIES + L0_ENTRIES * Ln_ENTRIES + L0_ENTRIES * Ln_ENTRIES * Ln_ENTRIES + @@ -231,7 +233,13 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int descsz) for (va = p->md_phys, idx = 0; idx < p->md_pages; idx += (PAGE_SIZE / EFI_PAGE_SIZE), va += PAGE_SIZE) { l3 = efi_1t1_l3(va); - *l3 = va | l3_attr; + + if (mode == VM_MEMATTR_DEVICE && in_realm()) + pa = va | prot_ns_shared_pa; + else + pa = va; + + *l3 = PHYS_TO_PTE(pa) | l3_attr; } VM_OBJECT_WUNLOCK(obj_1t1_pt); } diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 2d2982fdfae7..adc583812e5b 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -152,6 +152,7 @@ #include #include #include +#include #ifdef NUMA #define PMAP_MEMDOM MAXMEMDOM @@ -539,6 +540,9 @@ static int pmap_bti_copy(pmap_t dst_pmap, pmap_t src_pmap); static void pmap_bti_deassign_all(pmap_t pmap); static void pagezero(void *); +static void pmap_set_protected(pt_entry_t old_l3); +static void pmap_set_unprotected(pt_entry_t new_l3); + /* * These load the old table data and store the new value. * They need to be atomic as the System MMU may write to the table at @@ -2381,6 +2385,11 @@ pmap_kenter(vm_offset_t sva, vm_size_t size, vm_paddr_t pa, int mode) KASSERT((size & PAGE_MASK) == 0, ("pmap_kenter: Mapping is not page-sized")); + /* CCA - Map devices as nonsecure */ + if (in_realm() && (mode == VM_MEMATTR_DEVICE || + mode == VM_MEMATTR_DEVICE_NP)) + pa |= prot_ns_shared_pa; + attr = ATTR_AF | pmap_sh_attr | ATTR_S1_AP(ATTR_S1_AP_RW) | ATTR_S1_XN | ATTR_KERN_GP | ATTR_S1_IDX(mode); old_l3e = 0; @@ -4224,6 +4233,9 @@ pmap_remove_l3_range(pmap_t pmap, pd_entry_t l2e, vm_offset_t sva, if ((old_l3 & ATTR_SW_WIRED) != 0) pmap->pm_stats.wired_count--; pmap_resident_count_dec(pmap, 1); + /* Below will only be true in a realm environment. */ + if (PTE_TO_PHYS(old_l3) & prot_ns_shared_pa) + pmap_set_protected(old_l3); if ((old_l3 & ATTR_SW_MANAGED) != 0) { m = PTE_TO_VM_PAGE(old_l3); if (pmap_pte_dirty(pmap, old_l3)) @@ -5376,6 +5388,28 @@ restart: return (KERN_SUCCESS); } +static void +pmap_set_unprotected(pt_entry_t new_l3) +{ + vm_paddr_t pa; + + pa = PTE_TO_PHYS(new_l3) & ~prot_ns_shared_pa; + + rsi_set_addr_range_state(pa, pa + L3_SIZE, RSI_RIPAS_EMPTY, + RSI_CHANGE_DESTROYED, NULL); +} + +static void +pmap_set_protected(pt_entry_t old_l3) +{ + vm_paddr_t pa; + + pa = PTE_TO_PHYS(old_l3) & ~prot_ns_shared_pa; + + rsi_set_addr_range_state(pa, pa + L3_SIZE, RSI_RIPAS_RAM, + RSI_CHANGE_DESTROYED, NULL); +} + /* * Insert the given physical page (p) at * the specified virtual address (v) in the @@ -5409,6 +5443,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, if ((m->oflags & VPO_UNMANAGED) == 0) VM_PAGE_OBJECT_BUSY_ASSERT(m); pa = VM_PAGE_TO_PHYS(m); + if (in_realm() && (flags & PMAP_ENTER_UNPROTECTED) != 0) + pa |= prot_ns_shared_pa; new_l3 = (pt_entry_t)(PHYS_TO_PTE(pa) | ATTR_AF | pmap_sh_attr | L3_PAGE); new_l3 |= pmap_pte_memattr(pmap, m->md.pv_memattr); @@ -5728,6 +5764,10 @@ validate: #endif rv = KERN_SUCCESS; + + if (in_realm() && (flags & PMAP_ENTER_UNPROTECTED) != 0) + pmap_set_unprotected(new_l3); + out: if (lock != NULL) rw_wunlock(lock); diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 8f550a644db6..faecea51d5c1 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -9,6 +9,7 @@ kern/subr_devmap.c standard kern/subr_efi_map.c standard kern/subr_intr.c optional intrng kern/subr_physmem.c standard +kern/subr_busdma_bufalloc.c standard libkern/strlen.c standard libkern/arm64/crc32c_armv8.S standard diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index bdea77bfabf0..233292bdd6cb 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -110,6 +110,10 @@ #include #include +#if defined(__aarch64__) +#include +#include +#endif struct vm_domain vm_dom[MAXMEMDOM]; @@ -1290,6 +1294,10 @@ PHYS_TO_VM_PAGE(vm_paddr_t pa) vm_page_t m; #ifdef VM_PHYSSEG_SPARSE +#if defined(__aarch64__) + if (in_realm()) + pa &= ~prot_ns_shared_pa; /* Mask off secure bit */ +#endif m = vm_phys_paddr_to_vm_page(pa); if (m == NULL) m = vm_phys_fictitious_to_vm_page(pa); From nobody Tue May 12 16:55: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 4gFN513sXDz6cl3R for ; Tue, 12 May 2026 16:55: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 4gFN505QZGz3w7j for ; Tue, 12 May 2026 16:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604932; 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=ze2kn2YzrzbGp9J1ZWfgNvderBh9JXPemilfxIraYFk=; b=qiNx5k07JfTNwjl5KJYdWK6BmGvRKjV1CkIrcLaP1BzUROpfFt5Ka+fXRL+/v9RrAiMJ52 a2M8HDrQYvL0GOiM5ULLdqXxsg26KxD6RujOPDt+Vqu11zq8eLQ8FowdyIk7FknCVRPm3C pqFIfQMAC0wbVi11LlSAITrpwvqgptdkdiuXaheYt4jRSeLPyMoARA9XVv7tyEeVqsvAjE hB8qKUdVSg5UrQmPj0D8yRaRiLcAOGZkT38sMmndDOOSzWow7yC3XV4Jy7zcJ14k8BETU/ QH4GwvgbHR/nvOvFdqkiXp5cNRGQ5TC0iOxglrXh+CeW1HxCMELZJidjDZKc5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778604932; a=rsa-sha256; cv=none; b=QfIRZoB7iGnDgswVNo0J1SJzzHOc8pTCoW0MtF7QqgS/r2lgLACegDhiF7OzfPxo/1n87t buK0QhTxq9pE4b0Y8e4yYlvgXOwmbXb4zHOq/Vf9whGleVJ3TvS8c71A67YpqGSCkUrfui 5WNu8vrZMsLTJhUDWV/abE8WVuUwvYwp+AGJxqRiV3xB4ooVbxmpJJLc2+Y24Y8MFO1d+B D4NMhZLQjZfN6W6W+sIKfkVU2+d5Pq2WFyNMGPhzyoS2mcun+6JlMS42wYEBfJOJaDgsnc MgBvauf+3M/2FMnC8YP4Atlz05/RdMRPwYRfYIGJ9fh/oxnsthX9/X+HFI3vqg== 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=1778604932; 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=ze2kn2YzrzbGp9J1ZWfgNvderBh9JXPemilfxIraYFk=; b=hFA7fmmn67SqWR/e7NGEDIZOU4/w+DihAJazxUX56yo/lnXXj1ueRIcvYDOJrcPbOlW68R CVMYRXtEVhpabbosXILdOmiqvqcKCnrXFIHmXNWLsfdo7tU1VlLh86+nn7SJDEk+Ikqi9V 4uqTPUUBRJrtjKgASPSRWGzCfXaFh/aVItkSqs7R+y/I+m8aDOPhnCyB0x9oJ7RwLE9ciU RVgjqb7DUuhPw4qtD/gxi/hEdZyobX1mKVVzEcowpwY1M1OqP4RPEeFpfOCMb8yTiHDX0D XnBDnXVe5nFizv/OrD8+8J1i+Tqw2HdJXIHfKwLked+0WVkRyyKm4fPeu+nUkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFN502rKmz1BVR for ; Tue, 12 May 2026 16:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e0a7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 16:55:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: a6add87b5e17 - main - arm64: Load SOCDEV_PA as a literal rather than an immediate 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: a6add87b5e174702261f3b8e8022791ed4ab9898 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 16:55:32 +0000 Message-Id: <6a035b84.3e0a7.681a7a75@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a6add87b5e174702261f3b8e8022791ed4ab9898 commit a6add87b5e174702261f3b8e8022791ed4ab9898 Author: Sarah Walker AuthorDate: 2026-05-12 12:15:49 +0000 Commit: Andrew Turner CommitDate: 2026-05-12 16:54:41 +0000 arm64: Load SOCDEV_PA as a literal rather than an immediate When EARLY_PRINTK is used in a realm environment, the UART physical address must be in the unprotected address space. The resulting physical address will not generally fit in an immediate, so use a literal instead. Reviewed by: andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D56600 --- sys/arm64/arm64/locore.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index 14300eceb6d5..b200aa93c281 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -799,7 +799,7 @@ common: adrp x9, socdev_va str x17, [x9, :lo12:socdev_va] - mov x9, #(SOCDEV_PA & ~L2_OFFSET) /* PA start */ + ldr x9, =(SOCDEV_PA) /* PA start */ mov x10, #1 bl build_l2_block_pagetable #endif From nobody Tue May 12 16:55: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 4gFN515NgXz6ckls for ; Tue, 12 May 2026 16:55: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 4gFN510RNzz3wJp for ; Tue, 12 May 2026 16:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778604933; 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=QfMUnhsbCLreXKDo+xqePsDZpkQ+hK+hFKSd0dEG0i0=; b=xQ+TjD6Mvi9y6gKZlRZamgxzsm//5CkBqi7h5yxvR3SodYg8wRiNm9WqrLXht9yd1fifoo zlZLki/Ybwug4hma9/7mLtT3nS7jR7akwZ2axad/r6D0n/co4wKGPpIn4fUfFPBRTAFoa7 A6oJCXXEP6SXMav09mvrluCFxknZfH6RAZVqowRDsHzgj4XY82i0V+5tLaVAZbRpON2+jS rm6+1pWyTXbCPA3xBw1DKrKRtuS71IlzrZ0LHm2yLNcRIoMbmnGvfReThJtQauP7VPbe30 SlW7Q57DxHM5P2BgfANloMOUqumjMUpKiLb9h3b6AgfHww4Rwk04MZqF8O54eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778604933; a=rsa-sha256; cv=none; b=FZOpmkoYdm8UHb+OG83Dfdh81/G5hiwZTr11zPWXFdvdVMHFTR8vIeK9vbrwFwijvF4fbr FPjqYkGP4g37MD7xgpAFkStukcNNUyhvZVwrk68RmWBKfNdPNHlQC7n4d1s7mTMWCKI/01 NJBLYcgTmQ8Cr/EOpBK3tBg+7TgFohQVh+dbZgzwVJfu6fuFFEtE7AruYHZ0Fsv4LS/BaX uBmQc0vmQy9KQiMYQQGfiEbdmlmjf1t9f75rF5XrWzLHSR390/39bULLOLAkKdd76IxxvR t/a0UK3lFptkQUEB0qmoyGtGW9Vd39Gh/i/iWbCNfbd0UC9aBfRVBSapXKcJaQ== 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=1778604933; 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=QfMUnhsbCLreXKDo+xqePsDZpkQ+hK+hFKSd0dEG0i0=; b=U4X/EQC7EHdI09cH8977juS3vx/JOHPWRhtXz2uSGe67EzWVcn+GUl5yaFCMmmtrjJeikZ OLX0Fk+zj6cN9fsJqMfgk/XRWN4C1XJx4PQmbT3DmAvOWm4/sWRatpM4sKNlRXpKAcRwVP jUoCGq5QcLqlOwGbQVMhpaLrEevHV0DpsgaXtt6DNeJoJE0OvJHPvtcVi4/sGr/MXrzfSZ 8LJE1aCz36fX3aHDfOOkarAzRzutn+iVz3IAXjjb7tkEZmAvOT5PyNgqskSxtXhvhFn6iy /Ju3rf/yl6PAKvR7iUSZZhkxKBAQaod6kiSTzk9XY3TCrcamYr2Z2LsFgwllYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFN506q2xz1BXx for ; Tue, 12 May 2026 16:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e1ba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 16:55:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: cd2512eaab5c - main - vm: Add flags for unprotected allocations 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: cd2512eaab5cd402a0177a8078b9234b215b39bd Auto-Submitted: auto-generated Date: Tue, 12 May 2026 16:55:27 +0000 Message-Id: <6a035b7f.3e1ba.1c3bccb@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=cd2512eaab5cd402a0177a8078b9234b215b39bd commit cd2512eaab5cd402a0177a8078b9234b215b39bd Author: Sarah Walker AuthorDate: 2026-05-12 12:16:00 +0000 Commit: Andrew Turner CommitDate: 2026-05-12 16:54:40 +0000 vm: Add flags for unprotected allocations Unprotected allocations are intended to be accessible outside of the current VM on systems such as Arm CCA. Reviewed by: markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D56518 --- sys/sys/malloc.h | 1 + sys/vm/pmap.h | 1 + sys/vm/vm_kern.c | 23 ++++++++++++++++++++--- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h index 9b281da4b4d4..68dffb395534 100644 --- a/sys/sys/malloc.h +++ b/sys/sys/malloc.h @@ -61,6 +61,7 @@ #define M_EXEC 0x4000 /* allocate executable space */ #define M_NEXTFIT 0x8000 /* only for vmem, follow cursor */ #define M_NEVERFREED 0x10000 /* chunk will never get freed */ +#define M_UNPROTECTED 0x20000 /* alloc out of unprotected memory */ #define M_VERSION 2024073001 diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h index e6dcd47d32f6..868bb787dc98 100644 --- a/sys/vm/pmap.h +++ b/sys/vm/pmap.h @@ -104,6 +104,7 @@ extern vm_offset_t kernel_vm_end; #define PMAP_ENTER_NOSLEEP 0x00000100 #define PMAP_ENTER_WIRED 0x00000200 #define PMAP_ENTER_LARGEPAGE 0x00000400 +#define PMAP_ENTER_UNPROTECTED 0x00000800 #define PMAP_ENTER_RESERVED 0xFF000000 /* diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index fc5d0de424bd..41ba07373976 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -270,6 +270,7 @@ kmem_alloc_attr_domain(int domain, vm_size_t size, int flags, vm_paddr_t low, vm_size_t asize; int pflags; vm_prot_t prot; + u_int pmap_enter_flags; object = kernel_object; asize = round_page(size); @@ -279,6 +280,11 @@ kmem_alloc_attr_domain(int domain, vm_size_t size, int flags, vm_paddr_t low, offset = addr - VM_MIN_KERNEL_ADDRESS; pflags = malloc2vm_flags(flags) | VM_ALLOC_WIRED; prot = (flags & M_EXEC) != 0 ? VM_PROT_ALL : VM_PROT_RW; + + pmap_enter_flags = prot | PMAP_ENTER_WIRED; + if ((flags & M_UNPROTECTED) != 0) + pmap_enter_flags |= PMAP_ENTER_UNPROTECTED; + VM_OBJECT_WLOCK(object); for (i = 0; i < asize; i += PAGE_SIZE) { m = kmem_alloc_contig_pages(object, atop(offset + i), @@ -296,7 +302,7 @@ kmem_alloc_attr_domain(int domain, vm_size_t size, int flags, vm_paddr_t low, pmap_zero_page(m); vm_page_valid(m); pmap_enter(kernel_pmap, addr + i, m, prot, - prot | PMAP_ENTER_WIRED, 0); + pmap_enter_flags, 0); } VM_OBJECT_WUNLOCK(object); kmem_alloc_san(addr, size, asize, flags); @@ -363,6 +369,7 @@ kmem_alloc_contig_domain(int domain, vm_size_t size, int flags, vm_paddr_t low, vm_size_t asize; u_long npages; int pflags; + u_int pmap_enter_flags; object = kernel_object; asize = round_page(size); @@ -385,12 +392,17 @@ kmem_alloc_contig_domain(int domain, vm_size_t size, int flags, vm_paddr_t low, vm_page_domain(m), domain)); end_m = m + npages; tmp = addr; + + pmap_enter_flags = VM_PROT_RW | PMAP_ENTER_WIRED; + if ((flags & M_UNPROTECTED) != 0) + pmap_enter_flags |= PMAP_ENTER_UNPROTECTED; + for (; m < end_m; m++) { if ((flags & M_ZERO) && (m->flags & PG_ZERO) == 0) pmap_zero_page(m); vm_page_valid(m); pmap_enter(kernel_pmap, tmp, m, VM_PROT_RW, - VM_PROT_RW | PMAP_ENTER_WIRED, 0); + pmap_enter_flags, 0); tmp += PAGE_SIZE; } VM_OBJECT_WUNLOCK(object); @@ -549,6 +561,7 @@ kmem_back_domain(int domain, vm_object_t object, vm_offset_t addr, vm_page_t m; vm_prot_t prot; int pflags; + u_int pmap_enter_flags; KASSERT(object == kernel_object, ("kmem_back_domain: only supports kernel object.")); @@ -560,6 +573,10 @@ kmem_back_domain(int domain, vm_object_t object, vm_offset_t addr, pflags |= VM_ALLOC_WAITFAIL; prot = (flags & M_EXEC) != 0 ? VM_PROT_ALL : VM_PROT_RW; + pmap_enter_flags = prot | PMAP_ENTER_WIRED; + if ((flags & M_UNPROTECTED) != 0) + pmap_enter_flags |= PMAP_ENTER_UNPROTECTED; + i = 0; vm_page_iter_init(&pages, object); VM_OBJECT_WLOCK(object); @@ -589,7 +606,7 @@ retry: ("kmem_malloc: page %p is managed", m)); vm_page_valid(m); pmap_enter(kernel_pmap, addr + i, m, prot, - prot | PMAP_ENTER_WIRED, 0); + pmap_enter_flags, 0); if (__predict_false((prot & VM_PROT_EXECUTE) != 0)) m->oflags |= VPO_KMEM_EXEC; } From nobody Tue May 12 18:00:31 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 4gFPX44RG0z6cqrN for ; Tue, 12 May 2026 18:00: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 4gFPX42gywz3BtX for ; Tue, 12 May 2026 18:00:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778608836; 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=sPlS55ATgAPdTWOk2m18uRiY7GynW2YZScd/NH7BD4o=; b=IxmB4cW+2GAvyIB0lfQgBG7A4j+YLKYX7FUrlM9IvG6rEIVMugzgZoJ7+YE+2dtsEYBicK 7BJvR/wKlTeVccsQKCEEpd/JPHOWNF0OODq2W07iNhKGD239DBcQvBcUz8dLTTX9vVfZSg kuoDFCR1x5RlFgHzIuAbwhVttBfXtzPrTGma2lAvO2eMzgzX1QTUC1OlLM2ow+EJ2ZQvY8 NTEVG8jA8dz+rLAruj6g5yghXmwOuv03m+pT6EKSDkgiq2NgYZvJIRrSpZa62JrfLhifDX PT1BxPNQY+uEUqAM6HZg/GLH5S8lAIJz3uBDXnDgCoXUTLSEyJUru1BcYhulXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778608836; a=rsa-sha256; cv=none; b=Wgc1Pqnk2sOiSrRimZ4Mw/g1TJuyNPBcnwY03BifjBhi1sFD2pLeTbOepIA7GLkb/Zz5M1 UBdgiriOIFkIxtL0S/SnkD2QVa5NE90z+2WJjZIaoMR66TZ0Sw1Thv1lPAx7DCttrsUSmx u31RNVKteYWX4Cpzm3ben4w5fyAdpMDs2xrfBLutedxAw2ta6HkwziWMHIeeN9WLUOmS9C /1aXR1Z06MDLybl8FFnluc7dawmo1tcfxMDkx3sd+nawxHkFrB6erz5ksmRaFVvnYuHXdn k934BkU0CzFdKzKj9KMzzUQzMVvsf3iZjOgcsgDaPZXZmV/h6EOmjt4IIdItqQ== 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=1778608836; 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=sPlS55ATgAPdTWOk2m18uRiY7GynW2YZScd/NH7BD4o=; b=X+nUoUkADkGaehyQaUb9pNVvhwQSvU7s/2YOylPQuqZ2tFH9rYhQSJ0mPydK3+0RNDOdhh /IbCZm8onZ5LgDq4B7rU6UYTZOIxGvi/dBkPOVexfioAEHETsDDvWiqZrnXy9qy9vn0dtI WFkq0c1W8upx1hLbrVAwSeNS+jcUB/xCk1+niHPQ3PLOsAp05QYasTuSWktW/3GVE7pGpD tWh/OR7+giac8GwVAWB8m6DzD3BZ3BvZ5kkLbfx5xu2jeMh9o4xfCFlveaz5sxRYShmFKL kjLt1XuOnJpkKkis/PMRTiqcPo4VkGZSPbJfmtr4wAaaW9rWFoP1ZifWfeFKmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFPX41rm4z1Crk for ; Tue, 12 May 2026 18:00:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44a0c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 18:00:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e68433e1990d - main - sys: Fix heap disclosure in compat7 kern.proc.filedesc 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e68433e1990d5f1bcc1bdd270d65f1e4792a8e1b Auto-Submitted: auto-generated Date: Tue, 12 May 2026 18:00:31 +0000 Message-Id: <6a036abf.44a0c.1cbab5f5@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e68433e1990d5f1bcc1bdd270d65f1e4792a8e1b commit e68433e1990d5f1bcc1bdd270d65f1e4792a8e1b Author: Ed Maste AuthorDate: 2026-05-12 16:25:01 +0000 Commit: Ed Maste CommitDate: 2026-05-12 17:59:51 +0000 sys: Fix heap disclosure in compat7 kern.proc.filedesc sysctl Reported by: Yuxiang Yang, Yizhou Zhao, Ao Wang, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM-5.1 from Z.ai Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56976 --- sys/kern/kern_descrip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 48303926759b..349ebb5702a5 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -5135,7 +5135,7 @@ sysctl_kern_proc_ofiledesc(SYSCTL_HANDLER_ARGS) return (ENOENT); } kif = malloc(sizeof(*kif), M_TEMP, M_WAITOK); - okif = malloc(sizeof(*okif), M_TEMP, M_WAITOK); + okif = malloc(sizeof(*okif), M_TEMP, M_WAITOK | M_ZERO); PWDDESC_XLOCK(pdp); pwd = pwd_hold_pwddesc(pdp); if (pwd != NULL) { From nobody Tue May 12 18:12:09 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 4gFPnP6Cp9z6crHR for ; Tue, 12 May 2026 18:12: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 4gFPnP556tz3HZl for ; Tue, 12 May 2026 18:12:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778609529; 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=R74bwGvD1oS5FxUcA3n3s2tiS/rgNXcExiB7+6iCfvg=; b=rWeh0MDasl3KvRrazZbyjpZsaKbDQuz0vAMNw88Lu9DVgyq8exxGAQp6lHwZsE5RgfWvh7 dAvOI4TdotRX4EqElzmOuOnT/dJqDCwe23pyHqx1Z4Fg96zwOotLFMAy7YFFVZcqow77X6 ym9t4fgziZTlmtWDlcqtme0HSN2/oDnG6o6cw5dh2hC7gF1GpJVxf0eiTztb+3YQ+BAaHZ ZzAeQIFJMrekjYHyIPIT3CuDXZcqo3mc9FszeM4ExkOc4nEnzHjQVBSJKjeF/3uAjnkUZy HjE4q6oJcyAvYbfeXoo7nrqiTGekDDtajumjxELVuYs026idY6krgK4/AP4V8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778609529; a=rsa-sha256; cv=none; b=UzRkJpsKr1r2+WoRzYw1VFxaz9osIaI0pYQqh90uI/avLe9E4ntV0Yvw+4kO/ytmxD9ZUJ gdWhWbgI/syz9FG+KTzah8+f3H0MFINZJRb+P1iCS0Iv0AYEZtGxykvLmZXs+2eqfB9H46 7ep8Bb8oAxf8rVJS4ez4IaKq5xU4qxmdHIpfWeFH5zAp1BUmOXNKM/4WR8PoMYiVeM42Zm YXCA+ToBUx02Q0x8U2Pgw2xZfqbmQkXge9RWVro3gZbRXc36YpZZH6Qp+XNtVfyCy1ksBs RbVhuLo1lNPqKmjCQwOItgp7Tu3sSRGdq7fnlmRldI90jLE5yyo5FJd8PnrEBQ== 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=1778609529; 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=R74bwGvD1oS5FxUcA3n3s2tiS/rgNXcExiB7+6iCfvg=; b=UR1VuvSNlOxqMch6UxuskBdInwhbE+ULW/gyyiwMe9FvipZ2NI8nrcGZC1gcIduQKjMGlW YFwndcj6afEHWo8vSChNReP5sJQd4XfhByF3vxtT1rQabIjRs9/0W7ACb/EYMH9+zQVWyA 7l7n4irl4i65KRNqflOeYVn7nsjR/MizQMEz+EBre75ymDSFWWmVQhfV7YgYbULzG/pZda JP3B3uOR8O4Z/c/iO0rXLcJGIhqD8bfz+aZEzK7yGdBI7g6y508UHqccFl0mCLPCfALmPP qQD3BN3GzxgUDetebV9M5otT3fKtlbhw5tP6rRKFZItArXhG4XRpgEyHKXNgOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFPnP4ZWsz1CZ9 for ; Tue, 12 May 2026 18:12:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45867 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 18:12:09 +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: 03bc95b060a9 - main - dtrace_dtmalloc.4: Document the DTrace dtmalloc 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: 03bc95b060a91ed9d410270d00d1dd4f8edcdcc7 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 18:12:09 +0000 Message-Id: <6a036d79.45867.754c40cd@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=03bc95b060a91ed9d410270d00d1dd4f8edcdcc7 commit 03bc95b060a91ed9d410270d00d1dd4f8edcdcc7 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-07-17 20:55:49 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-12 18:03:11 +0000 dtrace_dtmalloc.4: Document the DTrace dtmalloc provider MFC after: 1 week Discussed with: christos, markj, ziaee Differential Revision: https://reviews.freebsd.org/D51396 --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 3 +- share/man/man4/Makefile | 1 + share/man/man4/dtrace_dtmalloc.4 | 132 +++++++++++++++++++++++++++ share/man/man9/malloc.9 | 3 +- 4 files changed, 137 insertions(+), 2 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index e78b6e1875ae..ad639f337a72 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,7 +20,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 7, 2026 +.Dd May 12, 2026 .Dt DTRACE 1 .Os .Sh NAME @@ -1298,6 +1298,7 @@ in .Xr dtrace_audit 4 , .Xr dtrace_callout_execute 4 , .Xr dtrace_cam 4 , +.Xr dtrace_dtmalloc 4 , .Xr dtrace_dtrace 4 , .Xr dtrace_fbt 4 , .Xr dtrace_io 4 , diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index b9c441e97597..4f067f3ef757 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1017,6 +1017,7 @@ _ccd.4= ccd.4 _dtrace_provs= dtrace_audit.4 \ dtrace_callout_execute.4 \ dtrace_cam.4 \ + dtrace_dtmalloc.4 \ dtrace_dtrace.4 \ dtrace_fbt.4 \ dtrace_io.4 \ diff --git a/share/man/man4/dtrace_dtmalloc.4 b/share/man/man4/dtrace_dtmalloc.4 new file mode 100644 index 000000000000..97b4ffd8a057 --- /dev/null +++ b/share/man/man4/dtrace_dtmalloc.4 @@ -0,0 +1,132 @@ +.\" +.\" Copyright (c) 2025-2026 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd May 12, 2026 +.Dt DTRACE_DTMALLOC 4 +.Os +.Sh NAME +.Nm dtrace_dtmalloc +.Nd a DTrace provider for tracing kernel memory allocations by type +.Sh SYNOPSIS +.Nm dtmalloc Ns Cm :: Ns Ar function Ns Cm :malloc +.Nm dtmalloc Ns Cm :: Ns Ar function Ns Cm :free +.Sh DESCRIPTION +The +.Nm dtmalloc +provider instruments +.Xr malloc 9 +and +.Xr free 9 +kernel functions to trace memory allocations by type. +Refer to +.Xr malloc 9 +for more details about malloc types. +.Pp +The +.Nm dtmalloc Ns Cm :: Ns Ar function Ns Cm :malloc +probe fires upon a successful allocation. +Its probe arguments are: +.Bl -column -offset indent "malloc Probe Argument" "Definition" +.It Sy Probe Argument Ta Sy Definition +.It Fa args[0] Ta Ft struct malloc_type *mtp +.It Fa args[1] Ta Ft struct malloc_type_internal *mtip +.It Fa args[2] Ta Ft struct malloc_type_stats *mtsp +.It Fa args[3] Ta Ft unsigned long size +.It Fa args[4] Ta Ft int zindx +.El +.Pp +The +.Nm dtmalloc Ns Cm :: Ns Ar function Ns Cm :free +probe fires upon a free operation. +Its probe arguments are: +.Bl -column -offset indent "free Probe Argument" "Definition" +.It Sy free Probe Argument Ta Sy Definition +.It Fa args[0] Ta Ft struct malloc_type *mtp +.It Fa args[1] Ta Ft struct malloc_type_internal *mtip +.It Fa args[2] Ta Ft struct malloc_type_stats *mtsp +.It Fa args[3] Ta Ft unsigned long size +.It Fa args[4] Ta Always 0 +.El +.Pp +The first three arguments for each probe +.Po i.e., +.Fa mtp , mtip , +and +.Fa mtsp Pc +provide references to the +.Xr malloc 9 +type internals; +.Fa size +is the size of the allocation; +.Fa zindx +is the index into the +.Va kmemzones[] +array used for the allocation. +In practice, +.Fa size +is the most useful parameter to trace. +.Sh IMPLEMENTATION NOTES +The +.Ar function +part of the probe description in the +.Nm dtmalloc +provider is the +.Xr malloc 9 +type short description with all whitespace characters replaced +with underscores. +For example, a malloc type defined by +.Bd -literal -offset indent +MALLOC_DEFINE(M_FOO_BAR, "foo bar", "FooBar subsystem"); +.Ed +.Pp +will have probes called +.Bd -literal -offset indent +dtmalloc::foo_bar: +.Ed +.Sh FILES +.Bl -tag -width "" +.It In sys/malloc.h +The header where +.Vt struct malloc_type +is defined. +.El +.Sh EXAMPLES +.Ss Example 1 : Counting Successful Memory Allocations by Type +.Bd -literal -offset 2n +# dtrace -n 'dtmalloc:::malloc {@[stringof args[0]->ks_shortdesc] = count()}' +dtrace: description 'dtmalloc:::malloc ' matched 480 probes +^C + 80211node 1 + CAM CCB 1 + CAM periph 1 + ioctlops 1 + netlink 1 + soname 4 + sysctltmp 4 + solaris 5 + acpica 16 + temp 36 + lkpikmalloc 44 + iov 100 + selfd 648 +.Ed +.Sh SEE ALSO +.Xr dtrace 1 , +.Xr tracing 7 , +.Xr malloc 9 +.Sh AUTHORS +.An -nosplit +.Nm +was written by +.An John Birrell Aq Mt jb@FreeBSD.org . +.Pp +This manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . +.Sh CAVEATS +The +.Nm dtmalloc +provider does not trace +.Xr uma 9 +allocations. diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9 index 06f5ed4ef360..269a766e6168 100644 --- a/share/man/man9/malloc.9 +++ b/share/man/man9/malloc.9 @@ -28,7 +28,7 @@ .\" .\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $ .\" -.Dd August 4, 2024 +.Dd May 12, 2026 .Dt MALLOC 9 .Os .Sh NAME @@ -394,6 +394,7 @@ functions. Failing consistency checks will cause a panic or a system console message. .Sh SEE ALSO +.Xr dtrace_dtmalloc 4 , .Xr numa 4 , .Xr vmstat 8 , .Xr contigmalloc 9 , From nobody Tue May 12 19:30: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 4gFRWh64Bjz6cy35 for ; Tue, 12 May 2026 19:30: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 4gFRWh5VG5z3TxK for ; Tue, 12 May 2026 19:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778614224; 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=CAJFaNMEwId7PPopEw7nI83Qga3RUrtagnxm4i76ffc=; b=yavxM355+AX5ulh9fAq1zXM2345/sQlmBN5rigLSndVzRyAjOItl69zJE8FdxzoDFTXaIm dKg4y1yUQtPYhKp89sOdxTlWmUXA/KesEAmnEddvdY77ZLP4w9xGpYydNviaxxPus/UWYM vePbP4ztrwFPlsstW5DGs7IPLVokhosxT5jQ1G8shAbJ6+O3qjpCu9545wUTjx/jbCRMq0 AH8/pO1pIqAVaTf7SIFToeVusEiR2QW3nN85bLOJllmzL4wrBl2ciWW3BRpkl/7oSXPpL9 suN3frbeP584HQM/w+sCgWCmwVNLV8y2HUNiYnGWghXb6HGIcrMpq1L50lownw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778614224; a=rsa-sha256; cv=none; b=LBKkqmXLPmPvrhZF/y6trxYeT+jcpV1mN3XKYqNfPntTP21gCN/javvnxLaIuDBWM0WcWT JOrynuQixzobGDo3mv58xsKpuelpKPioTdWkAs0sbme8DdUtmy+m9ZMT5ntD6/B1kV6r7+ 5DVdspIvKaSvCJidzxUZHKeEJedfptEt2aokqtQozvXmZvX72au5T33NIcLJ5cjOpiGERM L0Ba5Q43Sqr3bwmNtHrIwvQRLDOZrTslxBnPK0X0y9NvT/0WY+LmXp5/kLR4Oa1pjpb3MQ hnmtaYASIWJo+45NSjjWhp0xWfvZEK7kcuZeHYxwCStFjwRUM3+4si4ZrH0yHw== 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=1778614224; 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=CAJFaNMEwId7PPopEw7nI83Qga3RUrtagnxm4i76ffc=; b=jC2iZPH54zZ4g1y0P6bsA4TVqSf5bX8Z6dGhkdmC/dkYS+9UTmT239GU76arvbROpqsspZ WGXXJ5m+cw+rzUMNCo+eulPO2+11o/bFroETp22p4ei/Pqu8EvXGMhqGN+ZZTg2mspxjCm 2jRM0dxg04odq9vWCVVa51gs1jSQTrGWCiciSYQ4XHw9q+lHfEg/KenCMcnV1iQUW13RBt nOsa4e+9mhUN2hrHhP0sDO9SVO7VFwZTWY60x7Uoq+DaHiQO4M9piqYI8NuvM5ctbhlJCJ l+kglmw03lr0fuRay65rR5rKwqnoI6oq+tPMoI9HJJYBIHXfrX38KYFO3fm2Uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFRWh4mmLz2TZ for ; Tue, 12 May 2026 19:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ec21 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 19:30:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Nick Banks From: Michael Tuexen Subject: git: d1aee9f1535b - main - sys/time.h: add bintime2us() helper 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1aee9f1535b02dc3db2a5bd1ac75213068a675a Auto-Submitted: auto-generated Date: Tue, 12 May 2026 19:30:19 +0000 Message-Id: <6a037fcb.1ec21.727adcef@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d1aee9f1535b02dc3db2a5bd1ac75213068a675a commit d1aee9f1535b02dc3db2a5bd1ac75213068a675a Author: Nick Banks AuthorDate: 2026-05-12 19:26:24 +0000 Commit: Michael Tuexen CommitDate: 2026-05-12 19:26:24 +0000 sys/time.h: add bintime2us() helper Add a microsecond conversion helper to complement the existing bintime2ns(). The body mirrors bintime2ns(). This will be used by an upcoming eventlog(9) framework as well as the TCP code in upcoming changes. Approved by: gallatin, tuexen Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D56972 --- sys/sys/time.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/sys/time.h b/sys/sys/time.h index 5255d3bc9c7e..ecde8a826499 100644 --- a/sys/sys/time.h +++ b/sys/sys/time.h @@ -308,6 +308,17 @@ bintime2ns(const struct bintime *_bt) return (ret); } +static __inline uint64_t +bintime2us(const struct bintime *_bt) +{ + uint64_t ret; + + ret = (uint64_t)(_bt->sec) * (uint64_t)1000000; + ret += __utime64_scale64_floor( + _bt->frac, 1000000, 1ULL << 32) >> 32; + return (ret); +} + static __inline void timespec2bintime(const struct timespec *_ts, struct bintime *_bt) { From nobody Tue May 12 20:05: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 4gFSJh0pnkz6d1K1 for ; Tue, 12 May 2026 20:05: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 4gFSJh0CVDz3ZJj for ; Tue, 12 May 2026 20:05:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616356; 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=913t0nSr42ZalVYcwkowGqc7iTCezGEqwMdq6EbKf0Y=; b=wveCqxK4vC/U3qaNQ7ua0QAUU4tVoPPsHxtKcS4X1rbKFKj+4UbH+HGLU/3w8kn4i0gdIc +ypLas64HwObyVmK5+mTOBjANlI5GLS3UlZprxcviAB6DQtzENOdt0i3UoS8hlLpcfOtmZ x/iH8TFsKXMDIo4H1dGbb5UPI3X2vg13d6hSDcR09UeCwqDEGw6PW7NHb0qQ6EyA4alfiq P2/nMTksL+0uhEGejnwwWy2D7sN3cqhQ8DjXI01B21euXtkZ+pG5NGjDrBnmkPIOdscA/b y2eQSivGky/XUrOYd/u+0E/EndlpSaWAOdJGQZ7pb0CaPJtl+UKcSH/JiCxOWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616356; a=rsa-sha256; cv=none; b=XiLsSXxFFUSOmRj1hPosEkJKKtfsBV85HWNv3v25ZBCx8TN846r5duu7JeG6jdsMXEu5ul ArHsXA7NGt9QqD22mdZmN/V4rcG5rLKaoEDvdyz4EVnk1aHEnvm6ad3yj7WsWFpWg1qGnl /gusKPf/RIUPkgmZvPaumRb3Q/5MKhVCeexkB35o/cJJpDLWOdk0iO06A8PHxWjb8H3IAz /+nr3vRjbvicxI7SOaZkYPjHU0yax4lkw+FW8esuTZXMp5bNdnMZ6UopAHPO/qASMs3Q/Z S3rc07h1lyhjHICa5/ftSo1D1Q+0yodBnL8P8batMFJ0LGQjqqNuxB7UiCsbdg== 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=1778616356; 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=913t0nSr42ZalVYcwkowGqc7iTCezGEqwMdq6EbKf0Y=; b=xO//7NYOmtKBXFi4j7K99OE56IXMCakrhqppEAjmXcNDeMvcz+PcjrRNBB8+1cB85rfdBb u6I6R8eVlQQKkyMZw5XrLe0Y7gXdfN6zeWVlGCTQ9Y6aNR5LknYYsktIvoK32vOyrNYEfz SwP/3RLMZ2aVsoz8opLsWHVFjKkdMxKPrUpbqFJR18CtSx7LSXB9YM1ShgP+q1H7gWmrY/ IKx80OeHuVS05/fss3ui8YzxGBly/HHP9uWGesJ2HJTAilRcK9mqQVqwUIKBmPGsNV5vPb BFLktaBYa56A9WdeQkdRDcxTD8g5H58ZFuUdJ8mZBVxrgYDQldGQ/3rJnH5umg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJg6fYdz2m5 for ; Tue, 12 May 2026 20:05:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22d84 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:05:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 26bffe5695d7 - main - tests/tcp_hpts_test: Fix more resource leaks 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: 26bffe5695d7cab2e797ce4ad153f324c0262f48 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:05:55 +0000 Message-Id: <6a038823.22d84.f4d7a67@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=26bffe5695d7cab2e797ce4ad153f324c0262f48 commit 26bffe5695d7cab2e797ce4ad153f324c0262f48 Author: Mark Johnston AuthorDate: 2026-05-12 17:44:31 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:18 +0000 tests/tcp_hpts_test: Fix more resource leaks Address leaks that I missed in commit f7bf9fd6199c ("tests/tcp_hpts_test: Fix resource leaks"). Reviewed by: Nick Banks , tuexen MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56943 --- sys/netinet/tcp_hpts_test.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_hpts_test.c b/sys/netinet/tcp_hpts_test.c index bc61b64b8c58..25c3a939e86d 100644 --- a/sys/netinet/tcp_hpts_test.c +++ b/sys/netinet/tcp_hpts_test.c @@ -624,7 +624,9 @@ KTEST_FUNC(tcpcb_insertion) struct tcpcb *tp; struct tcp_hpts_entry *hpts; uint32_t timeout_usecs = 10; + int error; + error = 0; test_hpts_init(); pace = tcp_hptsi_create(&test_funcs, false); @@ -638,9 +640,9 @@ KTEST_FUNC(tcpcb_insertion) INP_WLOCK(&tp->t_inpcb); tp->t_flags2 |= TF2_HPTS_CALLS; - KTEST_EQUAL(call_counts[CCNT_SWI_SCHED], 0); + KTEST_EQUAL_GOTO(call_counts[CCNT_SWI_SCHED], 0, cleanup_locked); tcp_hpts_insert(pace, tp, timeout_usecs, NULL); - KTEST_EQUAL(tp->t_in_hpts, IHPTS_ONQUEUE); + KTEST_EQUAL_GOTO(tp->t_in_hpts, IHPTS_ONQUEUE, cleanup_locked); INP_WUNLOCK(&tp->t_inpcb); KTEST_EQUAL(call_counts[CCNT_TCP_OUTPUT], 0); KTEST_EQUAL(call_counts[CCNT_SWI_SCHED], 1); @@ -656,7 +658,7 @@ KTEST_FUNC(tcpcb_insertion) INP_WLOCK(&tp->t_inpcb); tcp_hpts_remove(pace, tp); - KTEST_EQUAL(tp->t_in_hpts, IHPTS_NONE); + KTEST_EQUAL_GOTO(tp->t_in_hpts, IHPTS_NONE, cleanup_locked); INP_WUNLOCK(&tp->t_inpcb); KTEST_EQUAL(call_counts[CCNT_TCP_OUTPUT], 0); KTEST_VERIFY(!tcp_in_hpts(tp)); @@ -668,6 +670,10 @@ KTEST_FUNC(tcpcb_insertion) tcp_hptsi_destroy(pace); return (0); + +cleanup_locked: + INP_WUNLOCK(&tp->t_inpcb); + return (error); } /* @@ -1475,6 +1481,7 @@ KTEST_FUNC(direct_wake_mechanism) struct tcp_hpts_entry *hpts; int error; + error = 0; test_hpts_init(); pace = tcp_hptsi_create(&test_funcs, false); From nobody Tue May 12 20:05: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 4gFSJj2vCSz6d1GZ for ; Tue, 12 May 2026 20:05: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 4gFSJj0t5Nz3Z4r for ; Tue, 12 May 2026 20:05:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616357; 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=uxX+p1cigWkTzQ2VXP5uo1/Eau+QVk+510jJr8bMmzc=; b=QpypCT8M6wSVQHqL8D7Z0vasVVMIuyrYAapLIUdFhDvlHUOrV/S64kU/VX9D5nnc5IiO3q A4dL+kq1rhd6Cb8rlRLRGnsl7elUQplsnUQg2FPRBznH/ZyIsUBWVtoVJny2ujqKqXY/ls q2D6Ij/plfQtLy1/6RTzxJN5MnnjYQoFubdp3/+2l7uWkm2mUn+b2BevtNxV9DxWLLKbxN T/YDTNdoHZbAucrD3tlISc0aVdRN8Xe5wiT1cxzuRVqj1T3PMpp/QKr4IMBMorzbMalzUO XjzDV3S8YTxeO3mEBqc/e/fQowen0hCgrFv3YM/aS12iPmNZXnH66YR8MnsOGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616357; a=rsa-sha256; cv=none; b=miAdfKzQkZenO/8ksxLTgLWsRbKSefEBtUJ9KOkNqGalLVA7KiFB7f2BE+oK8wcgU5gHik d4EZh71JytqW22ZrumpMIldOYhsX3nIaI1aBjkTgQuzZe0VmBEPfP+pqufNozSqAR4W+/g KKHP42ZR6ptniCCudRcPCKE1hU88JdD8x+xzAOKhCKU7sGSMojhpPf2VSmm7aCFUow+9CK c43ce/rhOkVRKy896O94Yhz88ZxBUx8daKdMnKCcGu63prtknWBnimosGBkvcGDKPQgqjB rOUWCtodaPo63EUbkNkoIiEf+ozV0VeFdFeCU1huPvDHz6DbzbUB8xZ1rBszkQ== 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=1778616357; 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=uxX+p1cigWkTzQ2VXP5uo1/Eau+QVk+510jJr8bMmzc=; b=bf34hzZ0BI0j3hY/TJlPGGEhvsBLrPVtJCZ7k2NgzPyPb+TKSaS3crQoHv+98zUJ26Mjr9 L1yZU27z0MUmDVL1UYD4yKWzRVhf5BSsu8IPgLyNssx3j3ZsQHZMKGDmkzQZhx+NHGPv60 9vAHOPcd0w4HuNLTCVka8KqGjromj2UIdpfJzqlbdC+nm7SMWLzmBQYPQ209++VN+qhNWP 2or1jSftQQsiQByCQfZRvGyZA3EC7e8KlTMJ8KnJu9hmrQD9YW+T6kcYolaKIFzc2zze9/ yKzuZuMAUkfQt0sh1kVbpO5vvSTXz/rRxCJezc857GFwrFHdG2of1zqYJH/9MA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJh6wVRz2m6 for ; Tue, 12 May 2026 20:05:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2147c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:05:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3b16e96b005c - main - tests/ip_mroute: Remove test timeouts 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: 3b16e96b005c723717aa6a4ebc48000354e64fa1 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:05:56 +0000 Message-Id: <6a038824.2147c.36d8a879@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3b16e96b005c723717aa6a4ebc48000354e64fa1 commit 3b16e96b005c723717aa6a4ebc48000354e64fa1 Author: Mark Johnston AuthorDate: 2026-05-12 17:45:08 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:18 +0000 tests/ip_mroute: Remove test timeouts The configured timeout of 30s is a bit too low for a couple of tests which create 4+ VNET jails when running tests in parallel and with kernel sanitizers enabled. There's no reason to have custom timeouts, just use the default. MFC after: 1 week --- tests/sys/netinet/ip_mroute.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/sys/netinet/ip_mroute.py b/tests/sys/netinet/ip_mroute.py index c79b046445e5..0a705670e89b 100644 --- a/tests/sys/netinet/ip_mroute.py +++ b/tests/sys/netinet/ip_mroute.py @@ -192,7 +192,6 @@ class Test1RBasicINET(MRouteINETTestTemplate): @pytest.mark.require_user("root") @pytest.mark.require_progs(["pimd"]) - @pytest.mark.timeout(30) def test(self): self.starttest(["vnet_host1", "vnet_host2"]) self.waittest() @@ -287,7 +286,6 @@ class Test1RCrissCrossINET(MRouteINETCrissCrossTestTemplate): @pytest.mark.require_user("root") @pytest.mark.require_progs(["pimd"]) - @pytest.mark.timeout(30) def test(self): self.starttest(["vnet_host1", "vnet_host2", "vnet_host3", "vnet_host4"]) self.waittest() @@ -347,7 +345,6 @@ class Test1RCrissCrossINETMissingRouter(MRouteINETCrissCrossTestTemplate): @pytest.mark.require_user("root") @pytest.mark.require_progs(["pimd"]) - @pytest.mark.timeout(30) def test(self): self.starttest(["vnet_host1", "vnet_host2", "vnet_host3", "vnet_host4"]) self.waittest() @@ -401,7 +398,6 @@ class Test1RBasicINET6(MRouteINET6TestTemplate): self.donetest() @pytest.mark.require_user("root") - @pytest.mark.timeout(30) def test(self): self.starttest(["vnet_host1", "vnet_host2"]) self.waittest() @@ -489,7 +485,6 @@ class Test1RCrissCrossINET6MissingRouter(MRouteINET6CrissCrossTestTemplate): self.donetest() @pytest.mark.require_user("root") - @pytest.mark.timeout(30) def test(self): self.starttest(["vnet_host1", "vnet_host2", "vnet_host3", "vnet_host4"]) self.waittest() @@ -549,7 +544,6 @@ class Test1RCrissCrossINET6(MRouteINET6CrissCrossTestTemplate): self.donetest() @pytest.mark.require_user("root") - @pytest.mark.timeout(30) def test(self): self.starttest(["vnet_host1", "vnet_host2", "vnet_host3", "vnet_host4"]) self.waittest() From nobody Tue May 12 20:05: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 4gFSJk4BVDz6d1PR for ; Tue, 12 May 2026 20:05:58 +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 4gFSJk0ld2z3Z4t for ; Tue, 12 May 2026 20:05:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616358; 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=bQ6ssESVJc3IV4gIE0nqg1CG9fv4ArZ6HD/Lmbb/S0w=; b=lK33OxjwrWJ7O24IsViLkmNONC1VPINIaktNHLBYIjivOUVX1Bgi6ZtVnhEOswDfab/N9C eLiXfq2uoSsCKco4Kl22wJf2JgzPneESK0EkObY4H0mOvro7JSaiFyHEqR7K9HYzWrYisn WdS3/Midlz1R1b/eVGD5oIzWgr2+kufSGv+R2YCdh5lg2FUPlvdfhgLs4xokVf8RGQ6SPj vz7d/z2TlRvgFxbgVMxkRjgGtV6C8Qvd96szc5KIie4tMylQIJvRP34ExjdTebdChGAvGG nJptrjpob8q20f1hHIil7+IX3+qQ/tv3LnaiinrTE/FtOnPC7ahj7UTT/+9LwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616358; a=rsa-sha256; cv=none; b=W9zOmnMYHdu8AfI/wlVZt6YbsyOIqj9Z8mTGNRMnqWeT+LCreHaHsWVmgR5J25M4NeQcst SJAVd5XdAlPexFVZuMWPGyJPREpiwjnfFAb3MxLVEWyIVC45qCNg/jyUc2RMRoKyznFD2y EfDP/6n3Tcelxz3GnHien2qwDG13bQvlnY6xzaWO3iH98/LjUt1t2VD3Nd0iXGe9BHAdtP ooBtMK04j0M+UVUzMmoXijaf/TSiTFNsoHhTMtW7cEJTqyDUDocLUEaTCqAFrF4Iv/IfwO /VALCXMUsp88jfcRZaMadaBIwi1x4U70iwz139Kra6iXwZmBnf3mcKcmIS6RrA== 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=1778616358; 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=bQ6ssESVJc3IV4gIE0nqg1CG9fv4ArZ6HD/Lmbb/S0w=; b=vPxyy76uidySw0p3Zel9wNuxccaZaX9gHstm5p5F9TKXQdHF0xbBPY7Zz3JMvP7XglPJ8G nzi+5IcgPqRZqsqdIyb1ARWsV+nwcZuDPtJWqzk94jTd0EPGbAi9BkrIg8NKE9KOoDC8Md MFxvcFcfnnclXqQplNfbWKHVZlEaACY00XBrdI6kxmUTVnpqVeI8Zlrm0XBQzfaquqwCXL RkxXlbIocizgAEvPwnAimoHZgeELmolmJa0fmQs4blBoCWpCkfsbannZJpYcUzFQj4B1r0 aZTUzSR2OfV0X57nswjDbl7VVAWi9th34PRQSQzs8E8evtCZGoz6bOKycouJqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJk0Bdjz2qT for ; Tue, 12 May 2026 20:05:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 217db by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:05:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 35a36d4a54df - main - mdo: Avoid relying on header pollution 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: 35a36d4a54df244e93bf280345426a600e394a90 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:05:58 +0000 Message-Id: <6a038826.217db.7419e13b@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=35a36d4a54df244e93bf280345426a600e394a90 commit 35a36d4a54df244e93bf280345426a600e394a90 Author: Mark Johnston AuthorDate: 2026-05-12 17:46:17 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:18 +0000 mdo: Avoid relying on header pollution The uses of PAGE_SIZE and roundup2() require param.h. MFC after: 1 week --- usr.bin/mdo/mdo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/mdo/mdo.c b/usr.bin/mdo/mdo.c index 879423bc0128..e72f28b237e7 100644 --- a/usr.bin/mdo/mdo.c +++ b/usr.bin/mdo/mdo.c @@ -10,9 +10,9 @@ * Foundation. */ +#include #include #include -#include #include #include From nobody Tue May 12 20:05: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 4gFSJl5f8rz6d1kp for ; Tue, 12 May 2026 20:05: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 4gFSJl2Zqnz3Z59 for ; Tue, 12 May 2026 20:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616359; 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=PwkPM7IJ+pYMMsHXHw3OvtJw2DUwiXqnZlN/hQ/dtMI=; b=nZYovAED9vKRSDSFB85Aqo9iW4eR7eWrDIK4IUo+ssqtZlkHHsBjM9SugdDblfK4JnnFEd 7rp7G6/YYku+7pEh1R1C5QQJVvL6I4JTcQE/2U0Nh5f9sadW/oBbWoay2mTmPbhH5DvToD T6AvL6z42EzYGY84JVEOjSGTbl/F0d+9XdLlvOEX85fojsiqpLVBp4XIvho4k3hbx045/V w68Jm3759DHoaZOJmbX6TkXDCupGcdFWJ9VWT6h+ZuP9RJQTvzrjb/PD/oP+QVmJjezdNq 8zBoxTnApB4wsGRnVfcq+BarHp4hUgPH08u41M92FMTcMeYejyZvg1ualtotew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616359; a=rsa-sha256; cv=none; b=Y6fmkqcKFOLXdv3Ceq3R1i/bkDvu76Zrh1pJoo2q5JpevybejqD8SPN/u6Ec4dSJkz4bQe /ZACzd2ByyP+ZXkkCRyKv3Xp61ngVq8VoX483/TdolkPe4HDvF45Wtq8UffMIYAHSRLDc3 T9jzneT4U0djWd5jpMb9C89u76tSzDVVI7XUagyuGjnUFFCKQ5SeTp9J1dOOzycIvgEYvZ KsIXbtzIQix/fyi5Z0Kd1qEQYJfkQfayAmZxX//0/DZTbNfTab7TpxEltovbarKYc0TRNG Ri9qyhCnseeJ8pyoKNIprcDiptVs/ZNQt1fNzEqgNkNZq9cQiUfXbebkfZ7/cA== 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=1778616359; 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=PwkPM7IJ+pYMMsHXHw3OvtJw2DUwiXqnZlN/hQ/dtMI=; b=KgwIRdrWgiNvMfj8HFOh5cWweUEs0lzzM5FkDGWbaai6XA27mEsJ6/Jx42yML5fS6wSufF 1NqN4uZB+MqYPx5tBE+ewdzQB7S5uBvtvA1SRWjg7aWIpbNJG6s2ZPz088FrpMJYhACFhl 9WgyIAsEV+ufA0cCc+vK4PTv7zNf6q6/S6UDoC0ltrnlpfdkeZnykO5QUBpbbAI8qBwtHG 77budEvnU85r4D6vi8NKWNbB2re2GjPb8qIAeGIsTNaGYcukDkvrSFqtWZybO6kAKmXYDm BHP42reyA6BRBs6oKkdZ7d/H9qZ9Q4pGnq6zPBsmWoGbyFMlsYXu9z8UnBXp1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJl1184z3ZG for ; Tue, 12 May 2026 20:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22295 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:05:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: fab4acbb7db8 - main - vmem: Include param.h in the userspace port as well 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: fab4acbb7db8ffc7082d1b60b3c8e446a7cfef90 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:05:59 +0000 Message-Id: <6a038827.22295.56bc29ca@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fab4acbb7db8ffc7082d1b60b3c8e446a7cfef90 commit fab4acbb7db8ffc7082d1b60b3c8e446a7cfef90 Author: Mark Johnston AuthorDate: 2026-05-12 17:46:24 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:18 +0000 vmem: Include param.h in the userspace port as well It is required at least for NBBY. MFC after: 1 week --- sys/kern/subr_vmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_vmem.c b/sys/kern/subr_vmem.c index 8b834a2e2a79..0ea8c9e41568 100644 --- a/sys/kern/subr_vmem.c +++ b/sys/kern/subr_vmem.c @@ -80,7 +80,7 @@ #else /* _KERNEL */ -#include +#include #include #include #include From nobody Tue May 12 20:06:00 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 4gFSJm6KHtz6d1bG for ; Tue, 12 May 2026 20:06:00 +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 4gFSJm2MSLz3ZD3 for ; Tue, 12 May 2026 20:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616360; 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=3z0ER0tBxl+ja8C/mn3ZFat7B1G5f7F5TmLzDPwBvfI=; b=FhO8Po7GeW2wde0scBlUtgfOQKr3H5RRWEFJmzUJCq0C5r/NbPWkDPiQlQ+1eMfnBJ2l/j +n6jjK7CRIWRNCU+WYBWJ/lYARK7caE6YxZlTncqHUsbwNVVMKs7adtGrKwi2rQV55hi3/ jF8vSZUbh945Cnoa24un01dkFEo6JNhqdbxwt65ibgPDTAxRaFu+JlCN9RhoFtwNLYcWJV ixO5rV0NIsVarp6uJ1rCDyuBDK9C6GXcsUil6uJ1JTzUg/UE4TxvAQ9+BFxiOWpGDaCyE6 R/rgMtAi2qAK2U4YUWU8oqEUzWySI2cW/tESU9A9hkOli32huSJqUys0Vtc95Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616360; a=rsa-sha256; cv=none; b=DjIT3a3OQBFKOmCiPjaYlUO4Hzi1X/BYwZFzBQ3EfAKgWqBj0wYfmgi9fct/wi0McCM4Oi fzJAwxAqFlhz8t/15KBMKoZrkQ2K9T5wNNffsQOt42FD7W5gkX1AWj0cTd9rEUlV1hA0Qt WaFJ+z6VpujCU5MmNLi/5h+8zw9NUhGeo3YRYvdn2P5r3mPXNQyBUkB6x3q1R1ffW9NZdx BUIhT1sIiEU9Vex0fAITojho+lFxHqaJVAIMUPOzoj8r8eo4eR4nI1LkSkUI6IAgoVrAdB KojJRMBXpkiKobybda9j9UxIUoZ6RF2OVvNlAyr4h7+9Y56RakqWHIFBV/EXlw== 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=1778616360; 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=3z0ER0tBxl+ja8C/mn3ZFat7B1G5f7F5TmLzDPwBvfI=; b=O/7Cg694b4jvBo4wAXu7mKpexz/bspKP3BJkQ87MjCUvE1me5WxURk6ixumTS8/0P8Kw9c 4DvbLNSkSclwpaQO4FyELz1qeVBtL3CoT7CWJfSksgc7lgqeA4d5yA/44BX/Up/AeMVYd2 v2DDfjMkgjy7BbDkUolMFbRk3fpfZl8FP9eaie7RWmEIwCezxCgRxVq16dBIKMvRMgzDJG Kuk3TCMIdD55y5jM4Fed2zZe4MHbjYbsQWdxWElMj4vubaPIlLaFJ3tXdEIY/LWSWdVyXq yU9DP59aF9ailwUbVnXxNTwxlvjVhHI5UxLhLXQCIXxlfwJv6BmuBokFKtfAIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJm1qRPz3ZH for ; Tue, 12 May 2026 20:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fb75 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5615db1007bd - main - find: Include signal.h to get a definition for sig_atomic_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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5615db1007bdc935ac6592a66721320ccd8335ce Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:00 +0000 Message-Id: <6a038828.1fb75.479f33d8@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5615db1007bdc935ac6592a66721320ccd8335ce commit 5615db1007bdc935ac6592a66721320ccd8335ce Author: Mark Johnston AuthorDate: 2026-05-12 17:46:29 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:18 +0000 find: Include signal.h to get a definition for sig_atomic_t MFC after: 1 week --- usr.bin/find/extern.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/find/extern.h b/usr.bin/find/extern.h index 250b5fb6689c..acb86f084fbf 100644 --- a/usr.bin/find/extern.h +++ b/usr.bin/find/extern.h @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ -#include +#include void brace_subst(char *, char **, char *, size_t); PLAN *find_create(char ***); From nobody Tue May 12 20:06: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 4gFSJq28R8z6d1pL for ; Tue, 12 May 2026 20:06: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 4gFSJp3nFRz3Z8D for ; Tue, 12 May 2026 20:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616362; 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=9yFZ18QbA7b7Ud2Y8+MgQ/JnIHi0QT2yiCNV/VShoSc=; b=G8CW4bYeipu3xnOCZGi+M8SFiq1N5fmgjaEdOCeICJPov2fPv3aBWv9TM8ByJEBl5oAhIx 8nWhfgVY8rFbrnthObFjIGHs/nMPWT+CtdHh35SlrdaC+2jARlN/T7LpaCRmFG36/k+oDt OGd73Hd4h6MMzMTWPwjcy69mqtV6cRAURbiROjTsTujvMkAPw6Ntl/Ac4bvZvB00xolaPW BeB4jtvu3uJqklAPYZDITdSbOiaPHBKVWCOhHTKFM+LbLueoF5XR+Gw4VaJd6DQcDYg9ka TeiNifcpWEWA9tPIgUhSu0Mji52/rLaT41lpabMXTTb5+KXJ5IvU+EsZDi6UVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616362; a=rsa-sha256; cv=none; b=V2Outgo/yWVUwqqahWt9qiRLchE2z5dNFYfhyDtEtECQrxDWU8WW0g/QppVPsa5P36awhL PeY97h6vdoBqBEnkdeLUwdydDhk45Fs1mDs12QHE5cu8vCp+J++75WNE4U9e4qsAa17hkO Vd6WKs9IL9tpOmODMSJBVzzHksbV3vpF8Sa06VIy+8SF5C651FSd24ywsuTLkxPjaARz/H yVVoIJwxnoq4kotJ2WfBhHukjlDuzIFF1UDUyxj8+FH14BBSPaabCcaEUVC+HS4dI9PTzY 3AORi+aCSGcdI44RsuZvPIRlhyVy1WCEcwxbx6loYPD0AIieOvnRk3D6LGy/4w== 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=1778616362; 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=9yFZ18QbA7b7Ud2Y8+MgQ/JnIHi0QT2yiCNV/VShoSc=; b=QZcgt+0sRdAp0wtaOhZHojsGBoLPkk4PglzzbMTW40n5LZfG3MtfqJ8BePSHsYBP6bdrlc XBx1niADMzEnFFOqYITZE2A/n4WZ6uBdFvYMnA7/Z6EuTR6foIesjhJhuLbJOSZ91BncAz k51jMNH2zU5DhQyTa/IqZJRydFMffOZt1H7Q6IRjvIH6v+fHpPTAWvHYijdJbLxi+ZQMCJ 6NoO79YGUeZTpYFADcpZWJLNMcnHq+dhHKKlUZMWGhSNLRtomfkjf3Ufmux4jitO6WQJt9 /gqi4w39LbUqQ4VcetSH2b+02iYDiHX236wE8U6S/PHVWCllwNXIhSX/Gpggow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJp3M7fz3Hj for ; Tue, 12 May 2026 20:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22e00 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ee2d1a1a5a18 - main - edquota: Include param.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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee2d1a1a5a1877f8ce7b9eee94479ec702880bd7 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:02 +0000 Message-Id: <6a03882a.22e00.2ef61b9e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ee2d1a1a5a1877f8ce7b9eee94479ec702880bd7 commit ee2d1a1a5a1877f8ce7b9eee94479ec702880bd7 Author: Mark Johnston AuthorDate: 2026-05-12 17:46:40 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +0000 edquota: Include param.h Required for MAXPATHLEN and MAXLOGNAME. MFC after: 1 week --- usr.sbin/edquota/edquota.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c index 6c209cd23716..f9780a7b0507 100644 --- a/usr.sbin/edquota/edquota.c +++ b/usr.sbin/edquota/edquota.c @@ -36,6 +36,7 @@ * Disk quota editor. */ +#include #include #include #include From nobody Tue May 12 20:06: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 4gFSJn6Wflz6d1rt for ; Tue, 12 May 2026 20:06: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 4gFSJn3Mjkz3Z34 for ; Tue, 12 May 2026 20:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616361; 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=veptGizTNRkxmo7iKePa5Wdhb9r1zXRBD/Tf/rHAIDw=; b=BqLyFdqJQbiFfeI1HxIdMI83pwE6n6yVjBoff2QSUfQCVmUnVxo/aajhEZL5769EBJ8JbK +T7OUcBNOtD25TvXK+KvR0Qp8sog/T/D+h/IFn10ifprZlFHNjxgwsiFIG9yg6P13ct1ac 5IvDFILXPDz0WI19oOX2XYxrqjLuyMXGa1T1I1rfoOxsQs1sVZAUYo/BxsnwZJ+VoesN1n v/QRWuY2KbAgTIXb83XYcRLhp9w8fxHSfd8kSdmley6WtHDPoBEDhSayRUC4qICUkL0Kxt +IQODp0+jBAosduj3+37ORaTdabYqc0gsHlIfpJsLx608AaLISMCuCDOYRGd1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616361; a=rsa-sha256; cv=none; b=gAGP8kBxqRTMDCMD43DR3ypZ3cRmTtgtRoWWPUBbkdVL5VYiEew6RYzZ56GlfgPUxqBWlX q6DIQzkjH4HI9JGLCYKAYjHwzLIzDINllPdAKbp0N8v5WAt4nvLlpAATt+BajAVW/YNOJZ FoCI7elg7y1gIOFel49w78liJpCncDDP/Rgx0o/1uqlNFkbb65kVbhQRi11D0pgNgjdq9v fQY55FPddi+1f+87oQHeCQxXhORs+jgBvUXDyKLLZx7D5xEzZYkkVo6pfQn8oBL+Lsd8ns LU4ZSD4drDMjy1Cys1hsiBFcqthxw6iQgPW/1m4oYKvXSqhtuZCwmkOBvb4VNg== 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=1778616361; 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=veptGizTNRkxmo7iKePa5Wdhb9r1zXRBD/Tf/rHAIDw=; b=tgIyYdp7OLvtWvrE8P3Lh/FoMN/t7dTTU9kwx2V76hDzHRR1gx9IgLqIl5mnWzIbVmWEBH IJEx8+y+djC+W7QqyylaP47MQ5dMUbOnRRYeWRQhq0WN8i3kVJVYCSKHHKUBcX3t43W9Xh sLCEgyAXsnrSXaMOtLfK1ytGDGjicKup02mqXek4qR/NwgdCdpZSCINj792oCo2NVDfGaA FzyxnMuYUJsA8dD3xC50MVifjpku+SlIeT/RY2Pku8ZUrZt2NPgYyIvTrbqyMOWoa38zra ZbJrs1Sv1fajjLrhdCQq+Ac0beK+YOmyHIW0OjgBARteCrTvJuFHAUEX2+4wFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJn2c6Gz3Tv for ; Tue, 12 May 2026 20:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 217e4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: fae5815a1d7e - main - hastd: Include param.h instead of relying on pollution in hooks.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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fae5815a1d7ef6ef07a15231ca695cba0f848e18 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:01 +0000 Message-Id: <6a038829.217e4.5bd0d91d@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fae5815a1d7ef6ef07a15231ca695cba0f848e18 commit fae5815a1d7ef6ef07a15231ca695cba0f848e18 Author: Mark Johnston AuthorDate: 2026-05-12 17:46:34 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:18 +0000 hastd: Include param.h instead of relying on pollution in hooks.c This is needed at least for MAX() and PATH_MAX. MFC after: 1 week --- sbin/hastd/hooks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/hastd/hooks.c b/sbin/hastd/hooks.c index 43ba6f06851a..f8c908928b0f 100644 --- a/sbin/hastd/hooks.c +++ b/sbin/hastd/hooks.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. */ -#include +#include #include #include From nobody Tue May 12 20:06: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 4gFSJr01XBz6d1ms for ; Tue, 12 May 2026 20:06: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 4gFSJq4md1z3ZPF for ; Tue, 12 May 2026 20:06:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616363; 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=OqqKCxd6yEinfZwSTGohtw6jg/eXhS1o9WcCz68yB3E=; b=Z53cpPNTMUu71CsMs5QzTV6XCOnCyBLHsK5NZKK3LRlu1dbixgh8KQVnVpM+xZJnMZ/wt5 Wm7EgrFt3JUrT/XyBBlptQdVSTrFbQPlZBu1rQVKaTLzzBdsliMMmBvCXEZjmHP3dJ0GdL X1fsZz1P8teUUs8ndoEAl8QaTlOJR7Ppg+jW9R7Njq3t+nkW0kFvgOi9T9/xE64jBw2KVE ltqGk0LTW7Job5bAW98NUA/f1zvVgH+ig/Eou4g0OLMYT4CcX10f+VtOMPZsRlzsE3paKJ JSwMhhGckB/1uA8CWmiRB0dNRr4kM3SfK2GE6Dn4BHTpLVy7Aeh6UENLVmseRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616363; a=rsa-sha256; cv=none; b=Q4eWum1RBuTM48L3s8lQsvZaMxUowSyp0OFhbPTNxoeFyqT7BdLL9uTE4pk6OdZiQdVH29 unD20ebnOK5IiUV8CcR9vkdqE1sOODNRl4mjWwumMz+gha0nUfIKpRUGolUKoVCD5vOzjS i6nek+KgF20vKaA548J4mU2DzAO1FiVAgOJWkcvYqz/D9fxT+1n9VJLI9lUYO8ezJmc5dh fTf2UogG9/Vr4BqPtnB9/uhAZ19XPH1CCgmRFJGvvdbNZXDFZYcLDEy48EG1ug9wJ0g4jH KMhUYqEP+GHkwmaqPqEecQqaneWBE+tUUOXJOFsJxHGIMnBHM/roZn2ofb95bA== 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=1778616363; 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=OqqKCxd6yEinfZwSTGohtw6jg/eXhS1o9WcCz68yB3E=; b=jjfw/ZuwpELaxV81+P55NTXXc5CkKV7JHNXEwcEYSJjI9yNeD7wUY6ChC1a2huRkthDZ3I cgCgvCre6FlKZYXxjyJ814/AJWwfGoUBmp5ULRHnbVhj0YZM+1xQVShwqKJ9Pgzcw2PWLz ySbkX3DGN8FST5d3e39xq+c0e1lOsPp+NyLtMwCG6jIrjEZRQmIjYddpJOOeV7BPvMg+EE YO7323kAj5I0UfKp+UxMmT+cWB3WZfJ6Cmbt+WISpmYJMf9syFpn7hp7idvzC0Q0uVTFvk ffgEbFAv5OUkDphaCvx3vbI0ETTxIieSn+mfP3YB5sbqviHAPplvHEqhu3q82A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJq48jxz3LF for ; Tue, 12 May 2026 20:06:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fcd8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 9461071d5cd9 - main - reboot: Include limits.h for PATH_MAX 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: 9461071d5cd901c968dcd7f4a114905995f90d66 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:03 +0000 Message-Id: <6a03882b.1fcd8.17e6fa2e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9461071d5cd901c968dcd7f4a114905995f90d66 commit 9461071d5cd901c968dcd7f4a114905995f90d66 Author: Mark Johnston AuthorDate: 2026-05-12 17:46:45 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +0000 reboot: Include limits.h for PATH_MAX MFC after: 1 week --- sbin/reboot/reboot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 002a393000eb..a11f92453147 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include From nobody Tue May 12 20:06: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 4gFSJs3KGfz6d1Pm for ; Tue, 12 May 2026 20:06: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 4gFSJr5djYz3Zb5 for ; Tue, 12 May 2026 20:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616364; 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=1neNGwcisDk3vVMIYNX/YA9TX9kT5PVS7c4Fhku24Ws=; b=rcN5SbuYLw+r+HyrmbxMbqSZwEmk3SH50q/3FjP2q1594iGY2Jpy1P6kdJRxVKKKJqn65t 0tJFHTp7axJMFVTik8WFNZYoOd4QNSXRWRgE6Z1lTC918fmiXd8l36L7hzEitXlEASmNDX sSMhNCsLBU9iAMDWt2mJaTis2IGEgCRNueTyM3N61sPuQoyoamrB9GWpfk/KSBTB4hn/Cy sPMmiC5S7k1LrAXsvUaqyd+qka2f1uUoxZNd3ERyo4U51zjGQIAyaxDOmkiKV6TeKLUtnZ 4I+A8rSj2sXldKZeMMX2LtwGf7NtAEdHGqJeMen7OgE0lbs24wpK4Dt9rcorOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616364; a=rsa-sha256; cv=none; b=GKPJ9wHwrGiyff8X666ENOF8d1UXGgQWl4rZKQTiegxHyXUeYDB+Pd5LlTga1BX5RFu4ds DTj9qsE6bzcawHqbH3U3SD/Koi9V0jS0J+9JNUksqBtWWooSMRA5Fcc23JPgBQ6VklOkmI H/jva47rhohGsn/XH/C2ksiLvQVsxo3FwHZaXhih9KqAj8K0egep3fcHRLxHnr6+8hTm81 aWpF4AL+PX7UEM+4/fNY/3BrxUenCOwXtyVLG54e0mILoLasa43gE0Tlk8f5ute0pkyYYs OI5bRDXOPbodEyrt95KXHUUakmhw1fO1dX+InVX55/qZFAoUvKRD7JgOnQjowA== 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=1778616364; 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=1neNGwcisDk3vVMIYNX/YA9TX9kT5PVS7c4Fhku24Ws=; b=HoTxi7HGjuPWBChcrWg6AQVcd6tX6lWMg1brqXtimJoYDNGOtQcNFPQRFf+pEQgc9m5G7p 3ZXt4/xqOcFkvmvM0BrcO/+lK4Vbf4FdYgu1Kt43JoasfZHcCBtMn+RJZA2my9Tu/Nbiu5 wS3eykGLi9E2e191r6sJinY9jpB+Br7V0A1AH3ng1ZuqV9ZcAafGQwo9ZPv9Gn3khniV6v c4Jk1YVfIhjxFamvvxI4UYPXLNa7PjaceBU7jWt0W+1c9IWz7FcN/Dj/gc3hcrJMB6E5A5 YNLHmik6xwcrDH44L4UpPaOrpeUSvifxwZwIlRfHGW3G61I+9mzO9E4g4HAn0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJr4yw2z3XK for ; Tue, 12 May 2026 20:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2261e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 237900f17f09 - main - libutil: Include param.h in quotafile.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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 237900f17f091d059a3ead6a5320285654f4bfa0 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:04 +0000 Message-Id: <6a03882c.2261e.3fd16310@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=237900f17f091d059a3ead6a5320285654f4bfa0 commit 237900f17f091d059a3ead6a5320285654f4bfa0 Author: Mark Johnston AuthorDate: 2026-05-12 17:47:04 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +0000 libutil: Include param.h in quotafile.c Required for MAXPATHLEN. MFC after: 1 week --- lib/libutil/quotafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libutil/quotafile.c b/lib/libutil/quotafile.c index 1f02813dee92..e8c8b39843d2 100644 --- a/lib/libutil/quotafile.c +++ b/lib/libutil/quotafile.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. */ -#include +#include #include #include #include From nobody Tue May 12 20:06: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 4gFSJt1pLBz6d1Pq for ; Tue, 12 May 2026 20:06: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 4gFSJs6GFzz3ZDv for ; Tue, 12 May 2026 20:06:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616365; 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=uySVV8oc08REFXhhXo1OGjhTLcSHSmRnCL6GQYvWwtE=; b=hgPtjvXPYU9SF9BLuUYGNsLygTZ3MPSxihSO/wl76t5ZPAUyc+CkXNRLk5xlXG/3bUqatl xmrFiiLpaRP3lYIWiIDuXwTFXyXHwfA19ORkMoB4YugjIPzxVGU5fqJEFKEwvcb5f/sTls QM1WGfPy2DgzvD6sh6Zxeg0X7URZJSZdPaUJI7osodb/EPG3fJ2JMLg+VbWIomOr9gq86J YpxZU+BszplhMtT8au5U2GLHZAKiz7ASS9a5xyKSp6lx+9BZLvh6cLrgWshchLXMoOHaxZ Az1xI8AJf6H+1yGD+eF92LxN5p6qtDi2RKBVW6dBaTjkN1UiGhmyOBQAbQ4z8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616365; a=rsa-sha256; cv=none; b=i9UVF3B4GkA1hldmApQLf0ebTJBSfhQFnlaeNplMD7vyknGJAhdwlzzZ0fruQPTI1BXESi 1E5egXtqPJNa48yhEjRGmRTRemzlIzNgghECoSBQO+6bKgQNHxreNg58re5og03yCCBi8P m1HQL7aWFvgJ+SxkfvH8AaeMvz4MqiITLsTIYHwqLMGHsfVQ9pzQb0gCVzM4FL0IEMCftO HRr3IZCSz7khTfZsEfpCfUrzGNItpcvDdibjTz/pMh9pFp8+UTcDBtRdLJBfpqM04ZNCxE AJWvh7w9w3+cR+BS9EuuAO5b6jTxGcz/kl4M5Y8pRGPK4HxiKfHF1It6whoXXg== 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=1778616365; 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=uySVV8oc08REFXhhXo1OGjhTLcSHSmRnCL6GQYvWwtE=; b=aHnyBQNmkGY8ncXny7gE7w83/aKb2gP7ATH2HBhz8zVAUwLugOPy9y7G5r8jPnlPj0xDBh /7pZIOJ8Pji6s2PSylNUOVaMn1pfbTs+7rCN20P064J9OU/yklI7eXvQ8+7Xt4fwKYRzwZ ZZA8lPyJFjes/c1RraF8fuNliFH1qy/ULAC1qDhgS+xdkzisAnv0s0/QbENxqipAz2EpjT zhrW0jTrZPL1tpUGbm9IG3OEssHCmOVqAA3rUryByPPd1aq5VUVEQqZZK8iW6BIfcPazJv x/lyziIHFg6ebJtWlYK5l9bM3EB1Us4x7xNa0WI3chQGop/Wvv+vEOoc2GkQ1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJs5q0Vz3LG for ; Tue, 12 May 2026 20:06:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22d60 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3cd3900b690d - main - fsck_ffs: Avoid relying on param.h pollution from libufs.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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cd3900b690d8296094921cec844da3f72d30cbb Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:05 +0000 Message-Id: <6a03882d.22d60.75b6446@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3cd3900b690d8296094921cec844da3f72d30cbb commit 3cd3900b690d8296094921cec844da3f72d30cbb Author: Mark Johnston AuthorDate: 2026-05-12 17:47:11 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +0000 fsck_ffs: Avoid relying on param.h pollution from libufs.h - gjournal.c needs param.h to get a definition of isclr(). - fsck.h needs signal.h for sig_atomic_t. Sort includes while here. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56858 --- sbin/fsck_ffs/fsck.h | 9 +++++---- sbin/fsck_ffs/gjournal.c | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index aaf02850f29a..ff2ac6305be2 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -62,13 +62,14 @@ #ifndef _FSCK_H_ #define _FSCK_H_ -#include -#include +#include + +#include #include +#include +#include #include -#include - #define MAXDUP 10 /* limit on dup blks (per inode) */ #define MAXBAD 10 /* limit on bad blks (per inode) */ #define MINBUFS 100 /* minimum number of buffers required */ diff --git a/sbin/fsck_ffs/gjournal.c b/sbin/fsck_ffs/gjournal.c index b94f27758315..edbb2f373815 100644 --- a/sbin/fsck_ffs/gjournal.c +++ b/sbin/fsck_ffs/gjournal.c @@ -53,10 +53,10 @@ * SUCH DAMAGE. */ -#include -#include +#include #include #include +#include #include "fsck.h" void From nobody Tue May 12 20:06: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 4gFSJv3XLzz6d1hN for ; Tue, 12 May 2026 20:06: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 4gFSJt74TLz3ZPl for ; Tue, 12 May 2026 20:06:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616367; 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=fODo2dzqr2CZSS22/Oo85aDc4fP1K+F6i3qXyXDc0Ic=; b=WPvp7tWUgWrySY5+WpI782Hezl8SE07c6QM3H0AShhqICtl5P8Y+KAbPAcyk9NGrXtsJh8 9gmwAiG8cj+Y7JPLlz2VbM25Fhyfd1mnUX4Y8xm0UJQmgRyBEYSkQVmha0gN7FtHwjGl34 vJljW9gRl+JfNo8rzp9Xwd/zYle2ZpWKxKeh7iTZufblP2z37w51+Ys6NTYdoh/tUfw1xI XcEDbgjEDJhN2fZeseG5F3oQRo9WPKASBdRyZOIvGMzbjUPonMSLFqofMQzzThjavtnQe4 Mr8qj3yrNuAyxpq5zDO4XV2HRD6Lm/Y2zvledV62T89DMQAgElHyT926evU0dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616367; a=rsa-sha256; cv=none; b=L2Q70+GPRge0WpcpSBUcteVIRT10P6s/B1E/R7Tf+0cn6h2eItytHGDOLwozxnwCmpsQ20 O9O2oLmflhX6qVpnUCMddnKs/t/JzPM0czPHvkauNf8rIp71jMvXqf4EVDioAM6Zoh9H+f iwkya/EC9irv9gmdfZk+fwrEA19sztFbBE3UnQA4ObxLo/RP+8Or3U8Efu7GlmLUChFzIx 8kTt9SsjwZ0XnKHS70v9RmbbLFZKDN5P1JY+7+pjc1WuGByZdF2XV1MASMqw9NLk8RoeDp e+Remd1iI3dlYH0syYvYc7WtacICugsLUgx8JjOkIBGiMPUP5T0Tf1qEe4A1nA== 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=1778616367; 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=fODo2dzqr2CZSS22/Oo85aDc4fP1K+F6i3qXyXDc0Ic=; b=WWoDC5k7zPvh+qK8D+gY98XZWfDAigqCAU7m/VuPtvJsTNp1oCYYaafAqli4VdPIdaWeqc 4MxIKP8FQQpVJwSO5MgR0I7t8m55wd8v7U4ooTECtmlf4g1BtiFITJ8NkariNMDl1SpGdv t4g1fXJUVHRA/uxXc7tYMk8aWmODuDdYL06wkPTetZjLTCX1m+wj4UdP88c+13WrshgL1k kkN3q9QGUbamuoRcWJ5uIknC1cpvk10UfFJkBjLpAsGXV+DFQhAvWxD4luftqosrlPO3+1 cojjR/egYmELVcdPeor6S6gIRZKmcOuSzTq3ygvi3QPZ20b5v/DTZFWFm0wlBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJt6dW4z2m9 for ; Tue, 12 May 2026 20:06:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22098 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 271d25a066b5 - main - libufs: Avoid using param.h constants in libufs.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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 271d25a066b59df1e2bb774990948c985382126a Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:06 +0000 Message-Id: <6a03882e.22098.3032f52d@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=271d25a066b59df1e2bb774990948c985382126a commit 271d25a066b59df1e2bb774990948c985382126a Author: Mark Johnston AuthorDate: 2026-05-12 17:47:17 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +0000 libufs: Avoid using param.h constants in libufs.h MAXBSIZE is defined in param.h, which defines many other things. To avoid forcing all consumers of libufs.h to include param.h, let's instead redefine it and verify the definition in inode.c. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56859 --- lib/libufs/inode.c | 3 +++ lib/libufs/libufs.h | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/libufs/inode.c b/lib/libufs/inode.c index 863e71867daa..bc4d99c66203 100644 --- a/lib/libufs/inode.c +++ b/lib/libufs/inode.c @@ -48,6 +48,9 @@ #include +_Static_assert(LIBUFS_MAXBSIZE >= MAXBSIZE, + "LIBUFS_MAXBSIZE must be at least MAXBSIZE"); + int getinode(struct uufsd *disk, union dinodep *dp, ino_t inum) { diff --git a/lib/libufs/libufs.h b/lib/libufs/libufs.h index bb92e082a875..b76d15b338b4 100644 --- a/lib/libufs/libufs.h +++ b/lib/libufs/libufs.h @@ -29,6 +29,7 @@ #ifndef __LIBUFS_H__ #define __LIBUFS_H__ + #include /* @@ -38,6 +39,8 @@ */ #define LIBUFS_BUFALIGN 128 +#define LIBUFS_MAXBSIZE 65536 + /* * userland ufs disk. */ @@ -48,11 +51,11 @@ struct uufsd { } d_sbunion __aligned(LIBUFS_BUFALIGN); union { struct cg d_cg; /* cylinder group */ - char d_buf[MAXBSIZE]; /* cylinder group storage */ + char d_buf[LIBUFS_MAXBSIZE]; /* cylinder group storage */ } d_cgunion __aligned(LIBUFS_BUFALIGN); union { union dinodep d_ino[1]; /* inode block */ - char d_inos[MAXBSIZE]; /* inode block as buffer */ + char d_inos[LIBUFS_MAXBSIZE]; /* inode block as buffer */ } d_inosunion __aligned(LIBUFS_BUFALIGN); const char *d_name; /* disk name */ const char *d_error; /* human readable disk error */ From nobody Tue May 12 20:06: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 4gFSJw3slpz6d1s7 for ; Tue, 12 May 2026 20:06: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 4gFSJw0RvGz3ZBd for ; Tue, 12 May 2026 20:06:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616368; 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=yTe9hdH4duWDZNq9Icf9csEh00uyvVPAibqjpqtl4D0=; b=q7qzly9AWcJqfRwbDqIMZLLpUGrVc1mqTqr7p7s2G8GgeYXlY1QAHsWydBAMZODK44Wpo3 9bu9CVH+LELYSqCU2uXfvfSHn5ws+GUxOdpChJn9I2s3Pxirj6XomgV+rsI+Ps0qxR7Mys S2HsPwE6hEZMG4ooZdGj9TFqmiHw0gE3MaHNCIOpNCSloHZjQz0S6Eq49HEdSLQOyb+z23 w7GcA1RVjIPW8vn5CNoktD84TMFJnWhqwBEYaFzBLvFO5xTFplk3vgCSyWxUeMdq36u73J M+7E7u3PuHfAN5v+rdeIQ4sqDo5QZw3jKuc4kZcXZQPBM7lLZpvcHu6dHMjlcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616368; a=rsa-sha256; cv=none; b=dye4qUHri97dNp3x3zTIP44yr6bqHtUO+EPZIug1ynV2CrPFUrQMCmmIs6tvxcPeRbiVBs 1LefsDDK3RFSv5p8GSj4YQ0VEVZKn9lQkzKFOGkK0587tl/CE1uFuiDa6rVwWx/PI1+UOI kTUxaP9bcXXlt0A364WLusRtiXrzeqF6hbRa2UXLB9EulMJz9nF3z3iWmN7GzIP9WCGH6t +yd2NPk2zQlc7OgQYynEthuDx+AlguqPYQC43VkNuvIJrRciK+3unHKo+8ZkV28McMlItt zEB4vGSnz/3Oia5SAR3Sxyctj8WUi0qk0DOf4m4BZ6+9w0y1AxGXdX/XPc5JtA== 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=1778616368; 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=yTe9hdH4duWDZNq9Icf9csEh00uyvVPAibqjpqtl4D0=; b=UHbLW43Qni/TAMl87cCZmIfDEs/Hlz4wC0522XTy+RcCypITQfBxKpABzPHCg6cK+cOzh0 ZXXgtZ3qKwh7UoEaBFsL9EQ6gyk0KDoor0rD/6Adwlnlm8LawyAAAmbZ/rW4BY8ua0ZcSA 1nZGa7KnXU9Mg9qC8WcDV68unDD9z2zlmvEfPX+NaCbhuIc5Zlng6gtvIjLKHHO+VAlTKe QhsSkvev7qLayJn4TCGC3ycLvEOdj6pcKvSGbIrOQawQQ+qDcA/ibfZZ6EOV6UVhpdps1h lf8gzPanKlZHwVdqAgUO+UC6ysve8GqGmLwtoPafvQ0Zux/IZN6sWowO6qKUZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJv70CVz3LH for ; Tue, 12 May 2026 20:06:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 213fe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 8b4b995effb7 - main - cpuset: Move userspace declarations out of _cpuset.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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b4b995effb7911cc13706dc309d5e03c83b9a94 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:07 +0000 Message-Id: <6a03882f.213fe.54e83363@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8b4b995effb7911cc13706dc309d5e03c83b9a94 commit 8b4b995effb7911cc13706dc309d5e03c83b9a94 Author: Mark Johnston AuthorDate: 2026-05-12 17:47:25 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +0000 cpuset: Move userspace declarations out of _cpuset.h The _*.h headers are for structure definitions and should avoid dependencies on other headers. This convention is violated by using __BEGIN_DECLS/__END_DECLS. Move the declarations to cpuset.h, I see no reason they can't be there. Reviewed by: olce, brooks, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56856 --- sys/sys/_cpuset.h | 7 ------- sys/sys/cpuset.h | 7 ++++++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/sys/sys/_cpuset.h b/sys/sys/_cpuset.h index b87cfb5d3f80..157192ed65ba 100644 --- a/sys/sys/_cpuset.h +++ b/sys/sys/_cpuset.h @@ -49,11 +49,4 @@ __BITSET_DEFINE(_cpuset, CPU_SETSIZE); typedef struct _cpuset cpuset_t; -#ifndef _KERNEL -__BEGIN_DECLS -cpuset_t *__cpuset_alloc(size_t set_size); -void __cpuset_free(cpuset_t *ptr); -__END_DECLS -#endif - #endif /* !_SYS__CPUSET_H_ */ diff --git a/sys/sys/cpuset.h b/sys/sys/cpuset.h index e861321586db..92c14b0de5eb 100644 --- a/sys/sys/cpuset.h +++ b/sys/sys/cpuset.h @@ -181,8 +181,13 @@ int cpusetobj_strscan(cpuset_t *, const char *); void ddb_display_cpuset(const cpuset_t *); #endif -#else +#else /* !_KERNEL */ +#include + __BEGIN_DECLS +cpuset_t *__cpuset_alloc(size_t set_size); +void __cpuset_free(cpuset_t *ptr); + int cpuset(cpusetid_t *); int cpuset_setid(cpuwhich_t, id_t, cpusetid_t); int cpuset_getid(cpulevel_t, cpuwhich_t, id_t, cpusetid_t *); From nobody Tue May 12 20:06:09 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 4gFSJx5SPmz6d1sD for ; Tue, 12 May 2026 20:06: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 4gFSJx3Dtrz3ZYc for ; Tue, 12 May 2026 20:06:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616369; 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=YZYVYewwpfbuEElL49WvYx/DuWZEyelc5MQm+L7yp1k=; b=REIliy9tq41cQMVP7u7NySrKMphW7+LNeJiMijDretkYtG66BSvCEeeC/u0z1H/Lbh4Ih/ Y8P9k+U+x5BwirKPzS1n/VTf16q+W9kQQu/5E7ljyWi+fQ7gDb04l7NRp6YimwrWV0Revn M16tDjOTPZ2gW2rvxd1zVvn2h0KJGddYtL9lK1c9e4lSrNivE1lk+iLLIlXzM9QDhDxYdz etV7LeYABKdMPjz7dGeK09m3bFLkSRGG+epa1fSAa3DPyif6M1cBEb6wusGfnbc/GqjVtD yTGAqz+eAaQicMiHUtZz0TuMCYuSsozcEYQc+aqrZ9EMVD1PpEB1JOIKEEs46A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616369; a=rsa-sha256; cv=none; b=RTcZ4XYEkKJK68we5DdnQ+cmMFNxO4YohKAhznsLVlJVIlW1RsH2ksNtwEx0ciiIkDk/m2 R7Cft4uqrtJYFvTm51bC47KW0EhNXYFmW2sABICY8zRbXlbTgdfnQwzJI0AfBnOAiJubQ5 viu2kQd34afjh3sE4YkLEw6cmoAuI3u9Dl67LvBG0ovrRQyqTG3R6NBrFqGA8zEu4fE5kd AYSVu9T1RGv2efwgG1b/MzzMMeqX99w28uBvkdZCBuxu+jyJFiMcOr2NzDkL0bwiSnzIYg ykRlxR12msRthfbZfcTsCieUJWHrFbGO1ewrB1MhWCZ0ViJFLoON88WkIpYotg== 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=1778616369; 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=YZYVYewwpfbuEElL49WvYx/DuWZEyelc5MQm+L7yp1k=; b=jQEWNcGCvpoKUF1EBzPY3NTMyrtDdbTqPbKboSI2Gyuu1+bV5WCutsJsnf5C502gJ+ci49 urI0Ff7dv3DvGEPJOrAaYfA5CyGucTr9Oxehz688HrjchT2aJsnpi4SLtEYWDQbBx6Yse9 O/2eDfSip8pCCdyP83KqsjkP+NsJdhtWkA/uMY0ILUyIPs6bU37m/4pY3Zo+KSvFjdNOyV 8e0WYfbYMRO1ycrux5LJHOiWifmFHv0p8cLPJKpyzI1s4cdLItj+ei7PK7QTxOoLkQEPfT OkBQG1WZHtb8OkEsY5ebs4VszD7z+abb9EDnMTNjgVbzNTTe5NfIdUNy4l5BwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJx0gf9z3Tx for ; Tue, 12 May 2026 20:06:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 217ee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a6c4fe2d1a38 - main - if_vxlan: Update *m0 after a pullup 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: a6c4fe2d1a38885914b1c3e85508b965ccdb7874 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:09 +0000 Message-Id: <6a038831.217ee.3920506b@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a6c4fe2d1a38885914b1c3e85508b965ccdb7874 commit a6c4fe2d1a38885914b1c3e85508b965ccdb7874 Author: Mark Johnston AuthorDate: 2026-05-12 17:50:15 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +0000 if_vxlan: Update *m0 after a pullup vxlan_input()'s caller is supposed to free *m0 if it is non-NULL after the function returns. vxlan_input() failed to update *m0 after the pullup however, so if it hits an error case after the pullup, we'll free the mbuf twice. Currently this can happen only if the interface is brought down or due to a packet loop. Reported by: Yuxiang Yang, Yizhou Zhao, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM5.1 from Z.ai Reviewed by: pouria, zlei MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56944 --- sys/net/if_vxlan.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index 3d51c3c421ff..da219217480f 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -2876,8 +2876,7 @@ vxlan_input(struct vxlan_socket *vso, uint32_t vni, struct mbuf **m0, ifp = sc->vxl_ifp; if (m->m_len < ETHER_HDR_LEN && - (m = m_pullup(m, ETHER_HDR_LEN)) == NULL) { - *m0 = NULL; + (m = *m0 = m_pullup(m, ETHER_HDR_LEN)) == NULL) { error = ENOBUFS; goto out; } From nobody Tue May 12 20:06: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 4gFSJy3vFDz6d1by for ; Tue, 12 May 2026 20:06:10 +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 4gFSJy1xBGz3ZBw for ; Tue, 12 May 2026 20:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778616370; 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=/e7Dq6z67xH2cxMmC2kBS7Hbw6J3iPUq3Hq10flZe9k=; b=oHHGynWJn0bSPD2iJyMblSNXJooA+Ye6FgPmgo4BBCCu9174oC2gZaWVKCl6qnOdhFmjxY RNQXixjfZsSCv69hH5dyNaNyq1dD72qZJmpx3M2Wo86VkHG2cQd/JREOIhRA7tUw95UB3O gbUz4DWLGnC8UHL3ROoSFZvrwK+waJi6JXubPmUAaS57U7xys10zNaP9vklvZCzVIlx9ue r7t5n6e7TUCkSpDlv7jUYCH4yFD4JF22MY9mrJKB/qYVcmbQ3l58SdDiwa7Kb+d9mkCtnu zTd416EkRATVDol/uZhUuEKmzt8Snjx9Id+mF1YvsqWhgJwfX4S68beobMgUWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778616370; a=rsa-sha256; cv=none; b=XOYFxFbtBsboXST9f7Kv/GPjFtEQKC+zY6Gkpi0Ppql4649Ki9TgMtLsC/eCRgkRnTKbRu dyh3n2otW2i23o6RUlb3qIh8qQM+pj6ExWK/7Q+p+wwe/vrArHRGescqx5edwMCxf93hcV zmEJDdTb2l2VIhYpEaQ/yC76Om8OFpQJ2SHrD+rd+hv5JPldtypYFVMzQZvt9KoMQYZw9l 2eIqSXizjRkuHQGISPcMu5zBUn4szvPQD9OMPEMIkRYerqtQVvGpeXChhVbUKHXrdYsPJI ZS/jDCO1BiQPNqXRjPNOanJoMI6aeH+RP4baQBnSCymrAMJ5zLH1DR4iYoXKGA== 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=1778616370; 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=/e7Dq6z67xH2cxMmC2kBS7Hbw6J3iPUq3Hq10flZe9k=; b=c4UsGbNPTrxj4Ec8/o1wtYmcpXuOkaujC5vTwvLpdLgWfZDvFNBH11Dm8gRBuVwkeIvenP AvcHu0DV1g9emgl2KFnxhKUyciMGEt5VLwUVEJL5DgUesi3CUhL7vvvJ+oSKD7WzyFm0fL a216pHtrmSAJqDAFRRM4Af6i9yzEbA5O3iumiay1oKKsGFWYannSaf7b68IWaFRFQSlbGz iQlod2Z1D2YAjOyxZ0kntyMc75ibn920TMqbIrhKGuRvcfRriols021meXN7tU35DXMG0H 6LGmpjWTXVnS2E7MEB2osRW93Z/wmGacX+wcWgOgBQjKmJXRMNtgFMUPr+a1Ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSJy1Xycz3LJ for ; Tue, 12 May 2026 20:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22e04 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:06:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: beab4a237a45 - main - igmp: Avoid leaving dangling pointers in the state-change queue 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: beab4a237a45aea809e81802b9e1e9ff30f3d929 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:06:10 +0000 Message-Id: <6a038832.22e04.6ba24256@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=beab4a237a45aea809e81802b9e1e9ff30f3d929 commit beab4a237a45aea809e81802b9e1e9ff30f3d929 Author: Mark Johnston AuthorDate: 2026-05-12 17:53:49 +0000 Commit: Mark Johnston CommitDate: 2026-05-12 20:05:19 +0000 igmp: Avoid leaving dangling pointers in the state-change queue When igmp_v3_merge_state_changes() is iterating over state-change packets, there is a case where it'll free a queued packet but will fail to remove it from the queue. Fix that. Reported by: Yuxiang Yang, Yizhou Zhao, Xuewei Feng, Qi Li, and Ke Xu from Tsinghua University using GLM5.1 from Z.ai Reviewed by: pouria, glebius MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56947 --- sys/netinet/igmp.c | 8 +++++--- sys/sys/mbuf.h | 8 ++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 00288356cb1f..226f38a035fb 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -3326,10 +3326,12 @@ igmp_v3_merge_state_changes(struct in_multi *inm, struct mbufq *scq) CTR2(KTR_IGMPV3, "%s: outbound queue full, skipping whole packet %p", __func__, m); - mt = m->m_nextpkt; - if (!docopy) + m0 = m->m_nextpkt; + if (!docopy) { + mbufq_remove(gq, m); m_freem(m); - m = mt; + } + m = m0; continue; } diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index c5072cec904b..fb1a0a5b81d0 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1656,6 +1656,14 @@ mbufq_enqueue(struct mbufq *mq, struct mbuf *m) return (0); } +static inline void +mbufq_remove(struct mbufq *mq, struct mbuf *m) +{ + + STAILQ_REMOVE(&mq->mq_head, m, mbuf, m_stailqpkt); + mq->mq_len--; +} + static inline struct mbuf * mbufq_dequeue(struct mbufq *mq) { From nobody Tue May 12 20:18: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 4gFSbx2hzPz6d2mS; Tue, 12 May 2026 20:19:09 +0000 (UTC) (envelope-from olce@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 4gFSbx22bnz3h2t; Tue, 12 May 2026 20:19:09 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778617149; 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=dwC6EyGqM3VgGY6zzqPAiOBTGOYInxlzz/DW1t59ZoY=; b=EpJNjnUKnDZjRBcLOU7kaQq1wXdepDQLqMPOCH9Ro9kMn9DVtYb3hC+9jrnFgQMYDQsPpo C7ugsHyfwyeQempTEKu/XCDQ+Vm6vvui4d/poDy8YB5bn9+svyhD/+oWQybFVHRBJPKp4Y fWQZrGwEVLLhMuWyQMp9+Jb6fJSs/yOZgq0FeiNZ4z7FJxFmFnuCxICN+87nv7fegnCkGk fqyFKu4Se0Y3cAW6MC5ddIxyYk7181Goi8yBhmvPxj/78eimNUNfaIZvAYZPjBLgEENfu6 wbrsB1DMltabZ2ldOFwaNniWXucEV9EdO0NZOD1WmcVr1SibStLTC8kMqqqYnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778617149; a=rsa-sha256; cv=none; b=BaQTcjlZAYLx/SB62sCYNBK8vZ4wV3eIZyNFPgZKP59YwTJJ7+z6HwcMvhWmtALwuUBaZx 4A9rx1X7U3FBLKBkPn2FfefIuafbhgdC8kqmdWWW2jK6SAKdsDi7jOPc2ykduo12fmrsm5 jZgOEEWLeLfQkzyCKU/16ex2PAKLRNE5vZEWkjRWq3/rwR1H1JSIF2/fr9rlzuxwEqknfB ZoDN6DH5HzWd3wmUTG5PRBjUtrCgvNBYXS5gCfoFkYJaonmoEzQj4ielKoEaZ0u9IIUnfV YtVopo2NyQUlnlH8dgHSYp+bLa+qGvRZDO4uh7zOvki2i2wfulIAhzRJ7ZUJ6A== 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=1778617149; 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=dwC6EyGqM3VgGY6zzqPAiOBTGOYInxlzz/DW1t59ZoY=; b=o+myHmoU/5An4SnOqO4L9dgWASpOumZpDqZNRrg5d9YGc7x6MX2ooAT8pILP/KzgtiVkvH okD3JByH4yGAiRc+3gRcGhfw91W702ekbcO9OnJ8LgnI+5CJiYImBUJXDFYkrHo5drHtoH WEIrkIxpb9IqLCtTcAat4tJc3/eQdKFEASiu7aWruxXi5l6NjInPCoLWBDTyoOUneXp9IU W86YMWXblmVA+kCp5sUTF+4F4xxogsFbS9y2675O3Q+3eBxU8Bi5Jf9SFr7qa0z0bEPdqm 5OakrI18fHbDUPaAD4BYUJ2qLDpYZTEbqlIyackwM5vWB3WP6BTkeoXApSUmBw== 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 4gFSbw3WL3zyfF; Tue, 12 May 2026 20:19:08 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: Mark Johnston Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, src-committers@freebsd.org Subject: Re: git: fab4acbb7db8 - main - vmem: Include param.h in the userspace port as well Date: Tue, 12 May 2026 22:18:59 +0200 Message-ID: <6585650.O1aUxXEVJ6@ravel> In-Reply-To: <6a038827.22295.56bc29ca@gitrepo.freebsd.org> References: <6a038827.22295.56bc29ca@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="nextPart2540870.bDOn7JOVgO"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart2540870.bDOn7JOVgO Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Olivier Certner To: Mark Johnston Date: Tue, 12 May 2026 22:18:59 +0200 Message-ID: <6585650.O1aUxXEVJ6@ravel> In-Reply-To: <6a038827.22295.56bc29ca@gitrepo.freebsd.org> References: <6a038827.22295.56bc29ca@gitrepo.freebsd.org> MIME-Version: 1.0 Hi Mark, > The branch main has been updated by markj: > > URL: https://cgit.FreeBSD.org/src/commit/?id=fab4acbb7db8ffc7082d1b60b3c8e446a7cfef90 > > commit fab4acbb7db8ffc7082d1b60b3c8e446a7cfef90 > Author: Mark Johnston > AuthorDate: 2026-05-12 17:46:24 +0000 > Commit: Mark Johnston > CommitDate: 2026-05-12 20:05:18 +0000 > > vmem: Include param.h in the userspace port as well > > It is required at least for NBBY. > > MFC after: 1 week Strictly speaking, NBBY requires only , a header I created to put simple and frequently used definitions such as nitems(), howmany() and round*(). Using it in these cases may be preferable. Regards. -- Olivier Certner --nextPart2540870.bDOn7JOVgO Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmoDizQACgkQjKEwQJce JicLpQ//Z5sSX2kt7BzHP9gOYsuRL54TK3WurHoe9OgOIBh/u+2ppOCTqAeAHS2J y1x0/c/l+GIKdifNh+A8JtWOKaQLqXBcTOcHqel8dkRsunfPXHSNvaEpIyFWxw1g xlQQeUzrzJapbD/8zv6kN+lwJSwndEtaornecTNpnIRXHxDoR5YBeBKgpXcr73uz J3IgOnqqHU6yky9BXRDi3WSwmuAjVtvY2NI1mBkvRK52Hs7ROkmcEHeOKpqyCBPq uHwSrvjgYQqM9j+4ktu+6Xq9q98D8QLevd9TsCnGgBk5Dk+VcXx+13DDXXbJE41x /TP+qVxaXvqDR0Yq9IuWaYQFozCJ97/fhN5wtk5RrOBhalm6i07GfeXxVvNFZa2M kwUrf5pXJbdcpbwV2aMlJvWcO9nNJeuubcRX3KXJxzyCWJb2SSsaamkBF8ZYlGXn CrMGquLPDIQYVi4dAJZhNCjid0B/clvlXsA5/6XzW9clj2zBdqdHRXykroh2CHnu xCMs9dIJ9C+vAUEYH4kjAnNUHcfie1CG88WQcg5gwMr2xIhPp+Z+2HDlCTSc57EK GqsejpWJVSO9ZnfC3dNaT9bMuJQFWrvZldMi6GGvahdPnhOEKcsjfRx65L65ligI f+1wLu26PyXAVzulSDviY025Uc66OiQ6mzazAIdcQpqkrKQEPoA= =p6Ih -----END PGP SIGNATURE----- --nextPart2540870.bDOn7JOVgO-- From nobody Tue May 12 20:25: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 4gFSkp2Xqpz6d37P for ; Tue, 12 May 2026 20:25: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 4gFSkp0J7vz3hb1 for ; Tue, 12 May 2026 20:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778617506; 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=yT+qVqI+6F1k73ugDbTGAGiowNzQ7hDiwbp5MWWTdhA=; b=yihNcgR1L1EEmsG6In7RAZbMxnk6GS3eHuKS01d9sp1+li/nPHp02ZHCgIE4pYpeppsU0b MwC8a5NxZN95KjVWSBJZIer3Y2SWMZcmiQHoVnr+wVrdSDD5K3jJ8DC0jjuaEdrPUzctse xsfDrAc0HOhtz3Nbbfh5eW/nhQHUFWhKlY2boYjSVOTBeQyTyuyIKz8xxigfJZFOvxc7+B SRadLaWeNtlV8IycQEWMsJ8lO8H1SIPCrmCyi0bNbE6h3hXoqT5vfdJcjqax7tym6GJ5ne BhZBemVT4FetDOC1trqzEGQe1z9QZQ4GvkdwoNKjxIu6q20dlM5ODbmDmk5QhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778617506; a=rsa-sha256; cv=none; b=HCDI4S+6rujT9SG8BAhOwZfymkcBKteByBoR1nZavOcYuHec2GjgbzC4bUMSOgHuQfsF4V buSufB34dcGjBkbhsLGXOs0UbtyvGjcDRtB3kW+3VfkmTBy7hRPU9epUMDJGv9O6v7vpOd +8DPgMsLAdUT2X67YmDo7+mXH1UDeIUbRwYAiJzJOj/TDRubq7CTP/Ev0g9BYV0LwhbVZe ZjnYjaZVkL5F9BKB9J4zBFe2+srzK2djAi0XJwzkqifu2odsBGsYZtTogzCdXJU050f8AB eYo4Sh1MoCwmMZV60vikuftbhgwegUGXnTvJdTHv46/aZ7FGeMVKfSCP0gkJUQ== 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=1778617506; 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=yT+qVqI+6F1k73ugDbTGAGiowNzQ7hDiwbp5MWWTdhA=; b=swjqQi0DvLRk8QSlYCVPhksJxzKGZu1M/jMDuW3RLO0kMssRAGB4CuxFVPplWrwQirICMK ynL60Aa+Rk9n5nUPtA6HhnGbdH/7jqojYo1EaQLeYMRNjX/DcUXl2FqV/OGVGlExgBmkiq j8as0GRKasJhnRBsY2AnNr/G+Kvkt/wQdnOBiK9cPAakYNXzun0GC9M1NGnsF9aFJK6/qp fTsyWLueGLzopiijulL4+mFyOkXn/xJ0GrU+6bopy9BwyyzydQlyYcQY8TCurCNghEayOH LZU8VhG+Q/mGfxhR2mlpO0CvRPCx7D17BhUe2v9yFsmr0/onusozyAfQJMCW0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFSkn6Tpfz3p7 for ; Tue, 12 May 2026 20:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24392 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 20:25:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 644b4646c7ac - main - OpenSSH: Update to 10.1p1 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: 644b4646c7acab87dc20d4e5dd53d2d9da152989 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 20:25:05 +0000 Message-Id: <6a038ca1.24392.5194335f@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=644b4646c7acab87dc20d4e5dd53d2d9da152989 commit 644b4646c7acab87dc20d4e5dd53d2d9da152989 Merge: beab4a237a45 6409980cbba7 Author: Ed Maste AuthorDate: 2026-05-12 20:24:10 +0000 Commit: Ed Maste CommitDate: 2026-05-12 20:24:10 +0000 OpenSSH: Update to 10.1p1 Full release notes are available at https://www.openssh.com/txt/release-10.1 Selected highlights from the release notes: Potentially-incompatible changes * ssh(1): add a warning when the connection negotiates a non-post quantum key agreement algorithm. * ssh(1), sshd(8): major changes to handling of DSCP marking/IPQoS * ssh(1), sshd(8): deprecate support for IPv4 type-of-service (ToS) keywords in the IPQoS configuration directive. * ssh-add(1): when adding certificates to an agent, set the expiry to the certificate expiry time plus a short (5 min) grace period. * ssh-agent(1), sshd(8): move agent listener sockets from /tmp to under ~/.ssh/agent for both ssh-agent(1) and forwarded sockets in sshd(8). Security * ssh(1): disallow control characters in usernames passed via the commandline or expanded using %-sequences from the configuration file, and disallow \0 characters in ssh:// URIs. New features * ssh(1), sshd(8): add SIGINFO handlers to log active channel and session information. Sponsored by: The FreeBSD Foundation crypto/openssh/.depend | 25 +- crypto/openssh/.github/ci-status.md | 22 +- crypto/openssh/.github/configs | 13 +- crypto/openssh/.github/install_libcrypto.sh | 75 + crypto/openssh/.github/install_putty.sh | 37 + crypto/openssh/.github/run_test.sh | 23 +- crypto/openssh/.github/setup_ci.sh | 73 +- crypto/openssh/.github/workflows/c-cpp.yml | 89 +- crypto/openssh/.github/workflows/selfhosted.yml | 15 +- crypto/openssh/.github/workflows/upstream.yml | 11 +- crypto/openssh/.github/workflows/vm.yml | 371 + crypto/openssh/.gitignore | 1 + crypto/openssh/.skipped-commit-ids | 7 + crypto/openssh/ChangeLog | 11611 +++++++++++-------- crypto/openssh/INSTALL | 2 +- crypto/openssh/Makefile.in | 70 +- crypto/openssh/PROTOCOL | 126 +- crypto/openssh/PROTOCOL.agent | 13 +- crypto/openssh/PROTOCOL.certkeys | 326 - crypto/openssh/PROTOCOL.chacha20poly1305 | 107 - crypto/openssh/README | 2 +- crypto/openssh/TODO | 2 +- crypto/openssh/atomicio.c | 6 - crypto/openssh/audit-bsm.c | 2 +- crypto/openssh/audit-linux.c | 4 +- crypto/openssh/auth-krb5.c | 2 +- crypto/openssh/auth-options.c | 7 +- crypto/openssh/auth-pam.c | 127 +- crypto/openssh/auth-passwd.c | 4 +- crypto/openssh/auth-rhosts.c | 4 +- crypto/openssh/auth-shadow.c | 4 +- crypto/openssh/auth.c | 7 +- crypto/openssh/auth2-chall.c | 10 +- crypto/openssh/auth2-hostbased.c | 15 +- crypto/openssh/auth2-pubkey.c | 16 +- crypto/openssh/auth2-pubkeyfile.c | 23 +- crypto/openssh/auth2.c | 2 +- crypto/openssh/authfd.c | 27 +- crypto/openssh/authfd.h | 8 +- crypto/openssh/authfile.c | 8 +- crypto/openssh/channels.c | 115 +- crypto/openssh/channels.h | 13 +- crypto/openssh/cipher.c | 17 +- crypto/openssh/clientloop.c | 55 +- crypto/openssh/config.h | 45 +- crypto/openssh/configure.ac | 110 +- crypto/openssh/contrib/Makefile | 7 +- crypto/openssh/contrib/README | 8 +- crypto/openssh/contrib/cygwin/ssh-user-config | 3 +- crypto/openssh/contrib/gnome-ssh-askpass4.c | 249 + crypto/openssh/contrib/redhat/openssh.spec | 17 +- crypto/openssh/contrib/redhat/sshd.init | 2 +- crypto/openssh/contrib/ssh-copy-id | 15 +- crypto/openssh/contrib/suse/openssh.spec | 3 +- crypto/openssh/crypto_api.h | 4 +- crypto/openssh/defines.h | 14 + crypto/openssh/digest-libc.c | 3 +- crypto/openssh/dispatch.c | 6 +- crypto/openssh/dns.c | 8 +- crypto/openssh/dns.h | 5 +- crypto/openssh/groupaccess.c | 21 +- crypto/openssh/gss-genr.c | 2 +- crypto/openssh/gss-serv.c | 2 +- crypto/openssh/hmac.c | 2 +- crypto/openssh/hostfile.c | 62 +- crypto/openssh/kex-names.c | 64 +- crypto/openssh/kex.c | 9 +- crypto/openssh/kex.h | 7 +- crypto/openssh/kexdh.c | 3 +- crypto/openssh/kexecdh.c | 3 +- crypto/openssh/kexgen.c | 6 +- crypto/openssh/kexgexc.c | 6 +- crypto/openssh/kexgexs.c | 7 +- crypto/openssh/kexmlkem768x25519.c | 6 +- crypto/openssh/krb5_config.h | 1 + crypto/openssh/krl.c | 5 +- crypto/openssh/log.c | 4 +- crypto/openssh/loginrec.c | 48 +- crypto/openssh/logintest.c | 2 - crypto/openssh/m4/openssh.m4 | 42 +- crypto/openssh/mac.c | 23 +- crypto/openssh/misc-agent.c | 357 + crypto/openssh/misc.c | 103 +- crypto/openssh/misc.h | 9 +- crypto/openssh/moduli | 859 +- crypto/openssh/moduli.c | 59 +- crypto/openssh/monitor.c | 86 +- crypto/openssh/monitor_fdpass.c | 12 +- crypto/openssh/monitor_wrap.c | 93 +- crypto/openssh/monitor_wrap.h | 6 +- crypto/openssh/mux.c | 23 +- crypto/openssh/openbsd-compat/Makefile.in | 5 +- crypto/openssh/openbsd-compat/arc4random.c | 2 - crypto/openssh/openbsd-compat/arc4random_uniform.c | 4 +- crypto/openssh/openbsd-compat/bsd-misc.c | 55 +- crypto/openssh/openbsd-compat/bsd-misc.h | 14 +- crypto/openssh/openbsd-compat/bsd-openpty.c | 8 +- crypto/openssh/openbsd-compat/bsd-poll.h | 6 +- crypto/openssh/openbsd-compat/daemon.c | 4 +- crypto/openssh/openbsd-compat/glob.c | 2 - crypto/openssh/openbsd-compat/include/netgroup.h | 0 crypto/openssh/openbsd-compat/include/util.h | 0 crypto/openssh/openbsd-compat/memmem.c | 2 - crypto/openssh/openbsd-compat/openssl-compat.c | 9 +- crypto/openssh/openbsd-compat/openssl-compat.h | 19 +- crypto/openssh/openbsd-compat/port-prngd.c | 4 +- crypto/openssh/openbsd-compat/reallocarray.c | 2 - crypto/openssh/openbsd-compat/recallocarray.c | 2 - .../openssh/openbsd-compat/regress/utimensattest.c | 12 +- crypto/openssh/packet.c | 107 +- crypto/openssh/packet.h | 8 +- crypto/openssh/pathnames.h | 13 +- crypto/openssh/pkcs11.h | 1502 ++- crypto/openssh/platform.c | 15 +- crypto/openssh/poly1305.c | 4 +- crypto/openssh/progressmeter.c | 12 +- crypto/openssh/readconf.c | 75 +- crypto/openssh/readconf.h | 8 +- crypto/openssh/readpass.c | 8 +- crypto/openssh/regress/Makefile | 69 +- crypto/openssh/regress/agent-pkcs11-cert.sh | 57 +- crypto/openssh/regress/agent-pkcs11-restrict.sh | 31 +- crypto/openssh/regress/agent-pkcs11.sh | 72 +- crypto/openssh/regress/agent-restrict.sh | 17 +- crypto/openssh/regress/agent.sh | 8 +- crypto/openssh/regress/cert-hostkey.sh | 4 +- crypto/openssh/regress/cert-userkey.sh | 6 +- crypto/openssh/regress/cfgmatch.sh | 4 +- crypto/openssh/regress/cfgparse.sh | 19 +- crypto/openssh/regress/connect-bigconf.sh | 17 + crypto/openssh/regress/dropbear-server.sh | 76 + crypto/openssh/regress/dsa_ssh2.prv | 14 - crypto/openssh/regress/dsa_ssh2.pub | 13 - crypto/openssh/regress/dynamic-forward.sh | 4 +- crypto/openssh/regress/hostbased.sh | 3 +- crypto/openssh/regress/keygen-comment.sh | 3 +- crypto/openssh/regress/keytype.sh | 4 +- crypto/openssh/regress/knownhosts-command.sh | 3 +- crypto/openssh/regress/krl.sh | 3 +- crypto/openssh/regress/limit-keytype.sh | 6 +- crypto/openssh/regress/misc/fuzz-harness/Makefile | 11 +- .../regress/misc/fuzz-harness/agent_fuzz_helper.c | 7 - .../openssh/regress/misc/fuzz-harness/fixed-keys.h | 26 - .../fuzz-harness/testdata/create-agent-corpus.sh | 2 +- .../misc/fuzz-harness/testdata/id_dsa-cert.pub | 1 - crypto/openssh/regress/misc/sk-dummy/sk-dummy.c | 7 +- .../regress/misc/ssh-verify-attestation/Makefile | 4 +- .../ssh-verify-attestation.c | 7 +- crypto/openssh/regress/modpipe.c | 4 +- crypto/openssh/regress/netcat.c | 36 +- crypto/openssh/regress/password.sh | 60 + crypto/openssh/regress/penalty-expire.sh | 2 +- crypto/openssh/regress/penalty.sh | 2 +- crypto/openssh/regress/percent.sh | 45 +- crypto/openssh/regress/rekey.sh | 2 +- crypto/openssh/regress/ssh-com-client.sh | 14 +- crypto/openssh/regress/ssh-com.sh | 26 +- crypto/openssh/regress/ssh2putty.sh | 3 +- crypto/openssh/regress/sshcfgparse.sh | 27 +- crypto/openssh/regress/sshsig.sh | 4 +- crypto/openssh/regress/test-exec.sh | 54 +- crypto/openssh/regress/unittests/Makefile.inc | 29 +- crypto/openssh/regress/unittests/authopt/Makefile | 8 +- crypto/openssh/regress/unittests/authopt/tests.c | 10 +- crypto/openssh/regress/unittests/bitmap/Makefile | 7 +- crypto/openssh/regress/unittests/bitmap/tests.c | 32 +- .../openssh/regress/unittests/conversion/Makefile | 4 +- .../openssh/regress/unittests/conversion/tests.c | 10 +- crypto/openssh/regress/unittests/hostkeys/Makefile | 8 +- .../regress/unittests/hostkeys/mktestdata.sh | 13 +- .../regress/unittests/hostkeys/test_iterate.c | 214 +- .../regress/unittests/hostkeys/testdata/dsa_1.pub | 1 - .../regress/unittests/hostkeys/testdata/dsa_2.pub | 1 - .../regress/unittests/hostkeys/testdata/dsa_3.pub | 1 - .../regress/unittests/hostkeys/testdata/dsa_4.pub | 1 - .../regress/unittests/hostkeys/testdata/dsa_5.pub | 1 - .../regress/unittests/hostkeys/testdata/dsa_6.pub | 1 - .../unittests/hostkeys/testdata/known_hosts | 12 +- crypto/openssh/regress/unittests/hostkeys/tests.c | 13 +- crypto/openssh/regress/unittests/kex/Makefile | 8 +- crypto/openssh/regress/unittests/kex/test_kex.c | 79 +- .../openssh/regress/unittests/kex/test_proposal.c | 2 - crypto/openssh/regress/unittests/kex/tests.c | 9 +- crypto/openssh/regress/unittests/match/Makefile | 4 +- crypto/openssh/regress/unittests/match/tests.c | 10 +- crypto/openssh/regress/unittests/misc/Makefile | 6 +- crypto/openssh/regress/unittests/misc/test_argv.c | 2 - .../openssh/regress/unittests/misc/test_convtime.c | 2 - .../openssh/regress/unittests/misc/test_expand.c | 31 +- .../openssh/regress/unittests/misc/test_hpdelim.c | 2 - crypto/openssh/regress/unittests/misc/test_misc.c | 436 + crypto/openssh/regress/unittests/misc/test_parse.c | 10 +- .../openssh/regress/unittests/misc/test_ptimeout.c | 8 +- .../openssh/regress/unittests/misc/test_strdelim.c | 2 - .../openssh/regress/unittests/misc/test_xextendf.c | 89 + crypto/openssh/regress/unittests/misc/tests.c | 14 +- .../openssh/regress/unittests/sshbuf/test_sshbuf.c | 4 +- .../regress/unittests/sshbuf/test_sshbuf_fixed.c | 4 +- .../regress/unittests/sshbuf/test_sshbuf_fuzz.c | 4 +- .../unittests/sshbuf/test_sshbuf_getput_basic.c | 11 +- .../unittests/sshbuf/test_sshbuf_getput_crypto.c | 11 +- .../unittests/sshbuf/test_sshbuf_getput_fuzz.c | 18 +- .../regress/unittests/sshbuf/test_sshbuf_misc.c | 223 +- crypto/openssh/regress/unittests/sshbuf/tests.c | 12 +- crypto/openssh/regress/unittests/sshkey/Makefile | 6 +- crypto/openssh/regress/unittests/sshkey/common.c | 49 +- crypto/openssh/regress/unittests/sshkey/common.h | 5 +- .../openssh/regress/unittests/sshkey/mktestdata.sh | 53 +- .../openssh/regress/unittests/sshkey/test_file.c | 98 +- .../openssh/regress/unittests/sshkey/test_fuzz.c | 77 +- .../openssh/regress/unittests/sshkey/test_sshkey.c | 225 +- .../regress/unittests/sshkey/testdata/dsa_1 | 12 - .../unittests/sshkey/testdata/dsa_1-cert.fp | 1 - .../unittests/sshkey/testdata/dsa_1-cert.pub | 1 - .../regress/unittests/sshkey/testdata/dsa_1.fp | 1 - .../regress/unittests/sshkey/testdata/dsa_1.fp.bb | 1 - .../unittests/sshkey/testdata/dsa_1.param.g | 1 - .../unittests/sshkey/testdata/dsa_1.param.priv | 1 - .../unittests/sshkey/testdata/dsa_1.param.pub | 1 - .../regress/unittests/sshkey/testdata/dsa_1.pub | 1 - .../regress/unittests/sshkey/testdata/dsa_1_pw | 15 - .../regress/unittests/sshkey/testdata/dsa_2 | 12 - .../regress/unittests/sshkey/testdata/dsa_2.fp | 1 - .../regress/unittests/sshkey/testdata/dsa_2.fp.bb | 1 - .../regress/unittests/sshkey/testdata/dsa_2.pub | 1 - .../regress/unittests/sshkey/testdata/dsa_n | 21 - .../regress/unittests/sshkey/testdata/dsa_n_pw | 21 - crypto/openssh/regress/unittests/sshkey/tests.c | 10 +- crypto/openssh/regress/unittests/sshsig/Makefile | 6 +- .../openssh/regress/unittests/sshsig/mktestdata.sh | 8 +- .../openssh/regress/unittests/sshsig/testdata/dsa | 12 - .../regress/unittests/sshsig/testdata/dsa.pub | 1 - .../regress/unittests/sshsig/testdata/dsa.sig | 13 - crypto/openssh/regress/unittests/sshsig/tests.c | 15 +- .../openssh/regress/unittests/test_helper/fuzz.c | 7 +- .../regress/unittests/test_helper/test_helper.c | 214 +- .../regress/unittests/test_helper/test_helper.h | 28 +- crypto/openssh/regress/unittests/utf8/Makefile | 7 +- crypto/openssh/regress/unittests/utf8/tests.c | 8 +- crypto/openssh/sandbox-capsicum.c | 8 +- crypto/openssh/sandbox-darwin.c | 6 +- crypto/openssh/sandbox-seccomp-filter.c | 66 +- crypto/openssh/scp.1 | 19 +- crypto/openssh/scp.c | 48 +- crypto/openssh/servconf.c | 93 +- crypto/openssh/serverloop.c | 40 +- crypto/openssh/session.c | 56 +- crypto/openssh/sftp-client.c | 40 +- crypto/openssh/sftp-client.h | 3 +- crypto/openssh/sftp-common.c | 2 - crypto/openssh/sftp-glob.c | 4 +- crypto/openssh/sftp-server.c | 16 +- crypto/openssh/sftp.c | 22 +- crypto/openssh/sk-api.h | 2 - crypto/openssh/sk-usbhid.c | 11 +- crypto/openssh/srclimit.c | 16 +- crypto/openssh/ssh-add.1 | 13 +- crypto/openssh/ssh-add.c | 224 +- crypto/openssh/ssh-agent.1 | 38 +- crypto/openssh/ssh-agent.c | 141 +- crypto/openssh/ssh-dss.c | 457 - crypto/openssh/ssh-ecdsa.c | 35 +- crypto/openssh/ssh-ed25519.c | 37 +- crypto/openssh/ssh-keygen.1 | 13 +- crypto/openssh/ssh-keygen.c | 320 +- crypto/openssh/ssh-keyscan.1 | 6 +- crypto/openssh/ssh-keyscan.c | 42 +- crypto/openssh/ssh-keysign.c | 14 +- crypto/openssh/ssh-pkcs11-client.c | 517 +- crypto/openssh/ssh-pkcs11-helper.c | 221 +- crypto/openssh/ssh-pkcs11.c | 862 +- crypto/openssh/ssh-pkcs11.h | 14 +- crypto/openssh/ssh-rsa.c | 50 +- crypto/openssh/ssh-sk-helper.c | 19 +- crypto/openssh/ssh-sk.c | 4 +- crypto/openssh/ssh-xmss.c | 389 - crypto/openssh/ssh.c | 117 +- crypto/openssh/ssh_config | 3 +- crypto/openssh/ssh_config.5 | 50 +- crypto/openssh/ssh_namespace.h | 44 +- crypto/openssh/sshbuf-getput-basic.c | 4 +- crypto/openssh/sshbuf-misc.c | 63 +- crypto/openssh/sshbuf.h | 18 +- crypto/openssh/sshconnect.c | 39 +- crypto/openssh/sshconnect2.c | 4 +- crypto/openssh/sshd-auth.c | 35 +- crypto/openssh/sshd-session.c | 38 +- crypto/openssh/sshd.8 | 6 +- crypto/openssh/sshd.c | 60 +- crypto/openssh/sshd_config | 2 +- crypto/openssh/sshd_config.5 | 27 +- crypto/openssh/sshkey-xmss.c | 1113 -- crypto/openssh/sshkey-xmss.h | 56 - crypto/openssh/sshkey.c | 233 +- crypto/openssh/sshkey.h | 43 +- crypto/openssh/sshlogin.c | 2 +- crypto/openssh/sshpty.c | 10 +- crypto/openssh/sshsig.c | 5 +- crypto/openssh/uidswap.c | 8 +- crypto/openssh/umac.c | 9 +- crypto/openssh/version.h | 8 +- crypto/openssh/xmalloc.c | 8 +- crypto/openssh/xmss_commons.c | 36 - crypto/openssh/xmss_commons.h | 21 - crypto/openssh/xmss_fast.c | 1106 -- crypto/openssh/xmss_fast.h | 111 - crypto/openssh/xmss_hash.c | 137 - crypto/openssh/xmss_hash.h | 22 - crypto/openssh/xmss_hash_address.c | 66 - crypto/openssh/xmss_hash_address.h | 40 - crypto/openssh/xmss_wots.c | 192 - crypto/openssh/xmss_wots.h | 64 - secure/lib/libssh/Makefile | 4 +- secure/ssh.mk | 2 +- 314 files changed, 14462 insertions(+), 14120 deletions(-) diff --cc crypto/openssh/.github/install_libcrypto.sh index 000000000000,d1aa23450679..d1aa23450679 mode 000000,100755..100755 --- a/crypto/openssh/.github/install_libcrypto.sh +++ b/crypto/openssh/.github/install_libcrypto.sh diff --cc crypto/openssh/.github/install_putty.sh index 000000000000,6d6d0ad49f41..6d6d0ad49f41 mode 000000,100755..100755 --- a/crypto/openssh/.github/install_putty.sh +++ b/crypto/openssh/.github/install_putty.sh diff --cc crypto/openssh/.github/workflows/vm.yml index 000000000000,9dcf5fcca764..9dcf5fcca764 mode 000000,100644..100644 --- a/crypto/openssh/.github/workflows/vm.yml +++ b/crypto/openssh/.github/workflows/vm.yml diff --cc crypto/openssh/.gitignore index c419d0fd662b,000000000000..df0f2ce0464e mode 100644,000000..100644 --- a/crypto/openssh/.gitignore +++ b/crypto/openssh/.gitignore @@@ -1,39 -1,0 +1,40 @@@ +Makefile +buildpkg.sh +config.h +config.h.in~ +config.log +config.status +openbsd-compat/Makefile +openbsd-compat/regress/Makefile ++openbsd-compat/include +openssh.xml +opensshd.init +survey.sh +**/*.o +**/*.lo +**/*.so +**/*.dylib +**/*.dll +**/*.out +**/*.a +**/*.un~ +**/.*.swp +autom4te.cache/ +scp +sftp +sftp-server +ssh +ssh-add +ssh-agent +ssh-keygen +ssh-keyscan +ssh-keysign +ssh-pkcs11-helper +ssh-sk-helper +sshd +sshd-session +sshd-auth +!regress/misc/**/Makefile +!regress/unittests/**/Makefile +tags + diff --cc crypto/openssh/INSTALL index 113c25cc2203,000000000000..32f2e9ad53b5 mode 100644,000000..100644 --- a/crypto/openssh/INSTALL +++ b/crypto/openssh/INSTALL @@@ -1,295 -1,0 +1,295 @@@ +1. Prerequisites +---------------- + +A C compiler. Any C89 or better compiler that supports variadic macros +should work. Where supported, configure will attempt to enable the +compiler's run-time integrity checking options. Some notes about +specific compilers: + - clang: -ftrapv and -sanitize=integer require the compiler-rt runtime + (CC=clang LDFLAGS=--rtlib=compiler-rt ./configure) + +To support Privilege Separation (which is now required) you will need +to create the user, group and directory used by sshd for privilege +separation. See README.privsep for details. + + +The remaining items are optional. + +A working installation of zlib: +Zlib 1.1.4 or 1.2.1.2 or greater (earlier 1.2.x versions have problems): +https://zlib.net/ + +libcrypto from either of LibreSSL or OpenSSL. Building without libcrypto +is supported but severely restricts the available ciphers and algorithms. + - LibreSSL (https://www.libressl.org/) 3.1.0 or greater + - OpenSSL (https://www.openssl.org) 1.1.1 or greater + +LibreSSL/OpenSSL should be compiled as a position-independent library +(i.e. -fPIC, eg by configuring OpenSSL as "./config [options] -fPIC" +or LibreSSL as "CFLAGS=-fPIC ./configure") otherwise OpenSSH will not +be able to link with it. If you must use a non-position-independent +libcrypto, then you may need to configure OpenSSH --without-pie. + +If you build either from source, running the OpenSSL self-test ("make +tests") or the LibreSSL equivalent ("make check") and ensuring that all +tests pass is strongly recommended. + +NB. If you operating system supports /dev/random, you should configure +libcrypto (LibreSSL/OpenSSL) to use it. OpenSSH relies on libcrypto's +direct support of /dev/random, or failing that, either prngd or egd. + +PRNGD: + +If your system lacks kernel-based random collection, the use of Lutz +Jaenicke's PRNGd is recommended. If you are using libcrypto it requires +that the libcrypto is configured to support it. If you are building +--without-openssl then the --with-prngd-socket option must match the +socket provided by prngd. + +http://prngd.sourceforge.net/ + +EGD: + +The Entropy Gathering Daemon (EGD) supports the same interface as prngd. +The same caveats about configuration for prngd also apply. + +http://egd.sourceforge.net/ + +PAM: + +OpenSSH can utilise Pluggable Authentication Modules (PAM) if your +system supports it. PAM is standard most Linux distributions, Solaris, +HP-UX 11, AIX >= 5.2, FreeBSD, NetBSD and Mac OS X. + +Information about the various PAM implementations are available: + +Solaris PAM: http://www.sun.com/software/solaris/pam/ +Linux PAM: http://www.kernel.org/pub/linux/libs/pam/ +OpenPAM: http://www.openpam.org/ + +If you wish to build the GNOME passphrase requester, you will need the GNOME +libraries and headers. + +GNOME: +http://www.gnome.org/ + +Alternatively, Jim Knoble has written an excellent X11 +passphrase requester. This is maintained separately at: + +http://www.jmknoble.net/software/x11-ssh-askpass/ + +TCP Wrappers: + +If you wish to use the TCP wrappers functionality you will need at least +tcpd.h and libwrap.a, either in the standard include and library paths, +or in the directory specified by --with-tcp-wrappers. Version 7.6 is +known to work. + +http://ftp.porcupine.org/pub/security/index.html + +LibEdit: + +sftp supports command-line editing via NetBSD's libedit. If your platform +has it available natively you can use that, alternatively you might try +these multi-platform ports: + +http://www.thrysoee.dk/editline/ +http://sourceforge.net/projects/libedit/ + +LDNS: + +LDNS is a DNS BSD-licensed resolver library which supports DNSSEC. + +http://nlnetlabs.nl/projects/ldns/ + +Autoconf: + +If you modify configure.ac or configure doesn't exist (eg if you checked +the main git branch) then you will need autoconf-2.69 and automake-1.16.1 +or newer to rebuild the automatically generated files by running +"autoreconf". Earlier versions may also work but this is not guaranteed. + +http://www.gnu.org/software/autoconf/ +http://www.gnu.org/software/automake/ + +Basic Security Module (BSM): + +Native BSM support is known to exist in Solaris from at least 2.5.1, +FreeBSD 6.1 and OS X. Alternatively, you may use the OpenBSM +implementation (http://www.openbsm.org). + +makedepend: + +https://www.x.org/archive/individual/util/ + +If you are making significant changes to the code you may need to rebuild +the dependency (.depend) file using "make depend", which requires the +"makedepend" tool from the X11 distribution. + +libfido2: + +libfido2 allows the use of hardware security keys over USB. libfido2 +in turn depends on libcbor. libfido2 >= 1.5.0 is strongly recommended. +Limited functionality is possible with earlier libfido2 versions. + +https://github.com/Yubico/libfido2 +https://github.com/pjk/libcbor + + +2. Building / Installation +-------------------------- + +To install OpenSSH with default options: + +./configure +make +make install + +This will install the OpenSSH binaries in /usr/local/bin, configuration files +in /usr/local/etc, the server in /usr/local/sbin, etc. To specify a different +installation prefix, use the --prefix option to configure: + +./configure --prefix=/opt +make +make install + +Will install OpenSSH in /opt/{bin,etc,lib,sbin}. You can also override +specific paths, for example: + +./configure --prefix=/opt --sysconfdir=/etc/ssh +make +make install + +This will install the binaries in /opt/{bin,lib,sbin}, but will place the +configuration files in /etc/ssh. + +If you are using PAM, you may need to manually install a PAM control +file as "/etc/pam.d/sshd" (or wherever your system prefers to keep +them). Note that the service name used to start PAM is __progname, +which is the basename of the path of your sshd (e.g., the service name +for /usr/sbin/osshd will be osshd). If you have renamed your sshd +executable, your PAM configuration may need to be modified. + +A generic PAM configuration is included as "contrib/sshd.pam.generic", +you may need to edit it before using it on your system. If you are +using a recent version of Red Hat Linux, the config file in +contrib/redhat/sshd.pam should be more useful. Failure to install a +valid PAM file may result in an inability to use password +authentication. On HP-UX 11 and Solaris, the standard /etc/pam.conf +configuration will work with sshd (sshd will match the other service +name). + +There are a few other options to the configure script: + +--with-audit=[module] enable additional auditing via the specified module. +Currently, drivers for "debug" (additional info via syslog) and "bsm" +(Sun's Basic Security Module) are supported. + +--with-pam enables PAM support. If PAM support is compiled in, it must +also be enabled in sshd_config (refer to the UsePAM directive). + +--with-prngd-socket=/some/file allows you to enable EGD or PRNGD +support and to specify a PRNGd socket. Use this if your Unix lacks +/dev/random. + +--with-prngd-port=portnum allows you to enable EGD or PRNGD support +and to specify a EGD localhost TCP port. Use this if your Unix lacks +/dev/random. + +--with-lastlog=FILE will specify the location of the lastlog file. +./configure searches a few locations for lastlog, but may not find +it if lastlog is installed in a different place. + +--without-lastlog will disable lastlog support entirely. + +--with-osfsia, --without-osfsia will enable or disable OSF1's Security +Integration Architecture. The default for OSF1 machines is enable. + +--with-tcp-wrappers will enable TCP Wrappers (/etc/hosts.allow|deny) +support. + +--with-utmpx enables utmpx support. utmpx support is automatic for +some platforms. + +--without-shadow disables shadow password support. + +--with-ipaddr-display forces the use of a numeric IP address in the +$DISPLAY environment variable. Some broken systems need this. + +--with-default-path=PATH allows you to specify a default $PATH for sessions +started by sshd. This replaces the standard path entirely. + +--with-pid-dir=PATH specifies the directory in which the sshd.pid file is +created. + +--with-xauth=PATH specifies the location of the xauth binary + +--with-ssl-dir=DIR allows you to specify where your Libre/OpenSSL +libraries are installed. + +--with-ssl-engine enables Libre/OpenSSL's (hardware) ENGINE support + +--without-openssl builds without using OpenSSL. Only a subset of ciphers +and algorithms are supported in this configuration. + +--without-zlib builds without zlib. This disables the Compression option. + +--with-4in6 Check for IPv4 in IPv6 mapped addresses and convert them to +real (AF_INET) IPv4 addresses. Works around some quirks on Linux. + +If you need to pass special options to the compiler or linker, you +can specify these as environment variables before running ./configure. +For example: + +CC="/usr/foo/cc" CFLAGS="-O" LDFLAGS="-s" LIBS="-lrubbish" ./configure + +3. Configuration +---------------- + +The runtime configuration files are installed by in ${prefix}/etc or +whatever you specified as your --sysconfdir (/usr/local/etc by default). + +The default configuration should be instantly usable, though you should +review it to ensure that it matches your security requirements. + +To generate a host key, run "make host-key". Alternately you can do so +manually using the following commands: + + ssh-keygen -t [type] -f /etc/ssh/ssh_host_key -N "" + - for each of the types you wish to generate (rsa, dsa or ecdsa) or ++for each of the types you wish to generate (rsa, ed25519 or ecdsa) or + + ssh-keygen -A + +to generate keys for all supported types. + +Replacing /etc/ssh with the correct path to the configuration directory. +(${prefix}/etc or whatever you specified with --sysconfdir during +configuration). + +If you have configured OpenSSH with EGD/prngd support, ensure that EGD or +prngd is running and has collected some entropy first. + +For more information on configuration, please refer to the manual pages +for sshd, ssh and ssh-agent. + +4. (Optional) Send survey +------------------------- + +$ make survey +[check the contents of the file "survey" to ensure there's no information +that you consider sensitive] +$ make send-survey + +This will send configuration information for the currently configured +host to a survey address. This will help determine which configurations +are actually in use, and what valid combinations of configure options +exist. The raw data is available only to the OpenSSH developers, however +summary data may be published. + +5. Problems? +------------ + +If you experience problems compiling, installing or running OpenSSH, +please refer to the "reporting bugs" section of the webpage at +https://www.openssh.com/ diff --cc crypto/openssh/auth.c index 28ee390f4a15,000000000000..496a0194b100 mode 100644,000000..100644 --- a/crypto/openssh/auth.c +++ b/crypto/openssh/auth.c @@@ -1,788 -1,0 +1,787 @@@ - /* $OpenBSD: auth.c,v 1.162 2024/09/15 01:18:26 djm Exp $ */ ++/* $OpenBSD: auth.c,v 1.163 2025/09/15 04:39:15 djm Exp $ */ +/* + * Copyright (c) 2000 Markus Friedl. 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 ``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. + */ + +#include "includes.h" + +#include +#include +#include +#include + +#include + +#include +#include +#include - #ifdef HAVE_PATHS_H - # include - #endif ++#include +#include +#ifdef HAVE_LOGIN_H +#include +#endif +#ifdef USE_SHADOW +#include +#endif +#include +#include +#include +#include +#include +#include +#include + +#include "xmalloc.h" +#include "match.h" +#include "groupaccess.h" +#include "log.h" +#include "sshbuf.h" +#include "misc.h" +#include "servconf.h" +#include "sshkey.h" +#include "hostfile.h" +#include "auth.h" +#include "auth-options.h" +#include "canohost.h" +#include "uidswap.h" +#include "packet.h" +#include "loginrec.h" +#ifdef GSSAPI +#include "ssh-gss.h" +#endif +#include "authfile.h" +#include "monitor_wrap.h" +#include "ssherr.h" +#include "channels.h" +#include "blocklist_client.h" + +/* import */ +extern ServerOptions options; +extern struct include_list includes; +extern struct sshbuf *loginmsg; +extern struct passwd *privsep_pw; +extern struct sshauthopt *auth_opts; + +/* Debugging messages */ +static struct sshbuf *auth_debug; + +/* + * Check if the user is allowed to log in via ssh. If user is listed + * in DenyUsers or one of user's groups is listed in DenyGroups, false + * will be returned. If AllowUsers isn't empty and user isn't listed + * there, or if AllowGroups isn't empty and one of user's groups isn't + * listed there, false will be returned. + * If the user's shell is not executable, false will be returned. + * Otherwise true is returned. + */ +int +allowed_user(struct ssh *ssh, struct passwd * pw) +{ + struct stat st; + const char *hostname = NULL, *ipaddr = NULL; + u_int i; + int r; + + /* Shouldn't be called if pw is NULL, but better safe than sorry... */ + if (!pw || !pw->pw_name) + return 0; + + if (!options.use_pam && platform_locked_account(pw)) { + logit("User %.100s not allowed because account is locked", + pw->pw_name); + return 0; + } + + /* + * Deny if shell does not exist or is not executable unless we + * are chrooting. + */ + if (options.chroot_directory == NULL || + strcasecmp(options.chroot_directory, "none") == 0) { + char *shell = xstrdup((pw->pw_shell[0] == '\0') ? + _PATH_BSHELL : pw->pw_shell); /* empty = /bin/sh */ + + if (stat(shell, &st) == -1) { + logit("User %.100s not allowed because shell %.100s " + "does not exist", pw->pw_name, shell); + free(shell); + return 0; + } + if (S_ISREG(st.st_mode) == 0 || + (st.st_mode & (S_IXOTH|S_IXUSR|S_IXGRP)) == 0) { + logit("User %.100s not allowed because shell %.100s " + "is not executable", pw->pw_name, shell); + free(shell); + return 0; + } + free(shell); + } + + if (options.num_deny_users > 0 || options.num_allow_users > 0 || + options.num_deny_groups > 0 || options.num_allow_groups > 0) { + hostname = auth_get_canonical_hostname(ssh, options.use_dns); + ipaddr = ssh_remote_ipaddr(ssh); + } + + /* Return false if user is listed in DenyUsers */ + if (options.num_deny_users > 0) { + for (i = 0; i < options.num_deny_users; i++) { + r = match_user(pw->pw_name, hostname, ipaddr, + options.deny_users[i]); + if (r < 0) { + fatal("Invalid DenyUsers pattern \"%.100s\"", + options.deny_users[i]); + } else if (r != 0) { + logit("User %.100s from %.100s not allowed " + "because listed in DenyUsers", + pw->pw_name, hostname); + return 0; + } + } + } + /* Return false if AllowUsers isn't empty and user isn't listed there */ + if (options.num_allow_users > 0) { + for (i = 0; i < options.num_allow_users; i++) { + r = match_user(pw->pw_name, hostname, ipaddr, + options.allow_users[i]); + if (r < 0) { + fatal("Invalid AllowUsers pattern \"%.100s\"", + options.allow_users[i]); + } else if (r == 1) + break; + } + /* i < options.num_allow_users iff we break for loop */ + if (i >= options.num_allow_users) { + logit("User %.100s from %.100s not allowed because " + "not listed in AllowUsers", pw->pw_name, hostname); + return 0; + } + } + if (options.num_deny_groups > 0 || options.num_allow_groups > 0) { + /* Get the user's group access list (primary and supplementary) */ + if (ga_init(pw->pw_name, pw->pw_gid) == 0) { + logit("User %.100s from %.100s not allowed because " + "not in any group", pw->pw_name, hostname); + return 0; + } + + /* Return false if one of user's groups is listed in DenyGroups */ + if (options.num_deny_groups > 0) + if (ga_match(options.deny_groups, + options.num_deny_groups)) { + ga_free(); + logit("User %.100s from %.100s not allowed " + "because a group is listed in DenyGroups", + pw->pw_name, hostname); + return 0; + } + /* + * Return false if AllowGroups isn't empty and one of user's groups + * isn't listed there + */ + if (options.num_allow_groups > 0) + if (!ga_match(options.allow_groups, + options.num_allow_groups)) { + ga_free(); + logit("User %.100s from %.100s not allowed " + "because none of user's groups are listed " + "in AllowGroups", pw->pw_name, hostname); + return 0; + } + ga_free(); + } + +#ifdef CUSTOM_SYS_AUTH_ALLOWED_USER + if (!sys_auth_allowed_user(pw, loginmsg)) + return 0; +#endif + + /* We found no reason not to let this user try to log on... */ + return 1; +} + +/* + * Formats any key left in authctxt->auth_method_key for inclusion in + * auth_log()'s message. Also includes authxtct->auth_method_info if present. + */ +static char * +format_method_key(Authctxt *authctxt) +{ + const struct sshkey *key = authctxt->auth_method_key; + const char *methinfo = authctxt->auth_method_info; + char *fp, *cafp, *ret = NULL; + + if (key == NULL) + return NULL; + + if (sshkey_is_cert(key)) { + fp = sshkey_fingerprint(key, + options.fingerprint_hash, SSH_FP_DEFAULT); + cafp = sshkey_fingerprint(key->cert->signature_key, + options.fingerprint_hash, SSH_FP_DEFAULT); + xasprintf(&ret, "%s %s ID %s (serial %llu) CA %s %s%s%s", + sshkey_type(key), fp == NULL ? "(null)" : fp, + key->cert->key_id, + (unsigned long long)key->cert->serial, + sshkey_type(key->cert->signature_key), + cafp == NULL ? "(null)" : cafp, + methinfo == NULL ? "" : ", ", + methinfo == NULL ? "" : methinfo); + free(fp); *** 15227 LINES SKIPPED *** From nobody Tue May 12 20:37: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 4gFT1B55LQz6d4DN; Tue, 12 May 2026 20:37:34 +0000 (UTC) (envelope-from markj@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 4gFT1B4VzBz3mJq; Tue, 12 May 2026 20:37:34 +0000 (UTC) (envelope-from markj@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778618254; 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=9aGTZHEidYgdZhvhgFus82YALn7RqmFVfjDL0bv/yO4=; b=p2LvhPwYJShZNGJWPN5ghkTAziFhBNQbGSS8RQn4bcJ2fU9iXyev8IWhNmdh5pZ7zYTyp+ XJ0aL754A3yNfqQScGPFYDL9+IqZNSZ6f5TMnDsW6EB7zLAV9oh3fP2Mt8uGk5iCg8ibwv NPsFWCOQV216ojvplVjTu+o3+dmY5qXasNlju3tSI94wY2AC42ssJqjebmaUJKvmCz2xmv DofjFBE3+8VLEiKgHZ5ZHrh7fsHKZdsO4o4nGCpAdk1Crag+VpZ/ZCQOo3vDaXlDP+2TR0 eGI5Kj/zjvHbcZvpkqaCm4PU18adUyg2oXMcKbzfinrx9gq4kBZC/ieNHuhbAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778618254; a=rsa-sha256; cv=none; b=jScmUK19tzxScnsN5pBqFtKaI3wl87TSU8yQ8OuplRIW7F/etdvXrjgmmqhkIrjIy6CHZm sApBiiT7r546DwGWVCOKJDv/8chyipDxnHryR0AefvnRXuQGfzg0vBgP764MgI28dXIQY7 tzYxPo4ibkQwg1UF+H0UKdF5mFkhtmJUkiSQN7NlqcwoKrNeurnyEyJLuIMKfqbjuMyZ8i s4N/m09Yy6Wq2CUfdSsNhfuNYB68KdsanU8hoZiOlcmZgHzKZuen2JPVpjBrADSBKS4tKO H8OoJgCndNhk+tMfk5OZ8+LpTx3pgAI0/XQnJPbvxJQYb8Bci94wQpSaaP4FRw== 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=1778618254; 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=9aGTZHEidYgdZhvhgFus82YALn7RqmFVfjDL0bv/yO4=; b=RyayIPzCDhhoigmx+pr5qk3/FH2z9RPWJdWf8AUZPsx6xlKuIayIWzhaUfVph55sItOcMP Ufg6Bxu4PMJWlplQ//6lnZV0RvCphbHpIvtGu72RHTZw8rtYp81drJTyK/1qlWDsWcqk+a 18J7v1F4hn86xgclMLQyd4ZSMwhz31LnN0vLc2S0hY+RQOe82EiNgchR8L847x0iZxuWuA glE/Brf5GCZQr//1nqDdI6uJ+v1bG25puFNlx793w7DKsqPu9+8EHiZG6HEiVq7I4YIfmh PhFxTTbXEnmNAMDAqyxizeLdUXbSljLyHr243Snq+9meCEG4Erzm/oaSN8yX5g== Received: from nuc (192-0-220-237.cpe.teksavvy.com [192.0.220.237]) (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: markj) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gFT1B2c9Pz10lp; Tue, 12 May 2026 20:37:34 +0000 (UTC) (envelope-from markj@freebsd.org) Date: Tue, 12 May 2026 16:37:32 -0400 From: Mark Johnston To: Olivier Certner Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: fab4acbb7db8 - main - vmem: Include param.h in the userspace port as well Message-ID: References: <6a038827.22295.56bc29ca@gitrepo.freebsd.org> <6585650.O1aUxXEVJ6@ravel> 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: <6585650.O1aUxXEVJ6@ravel> On Tue, May 12, 2026 at 10:18:59PM +0200, Olivier Certner wrote: > Hi Mark, > > > The branch main has been updated by markj: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=fab4acbb7db8ffc7082d1b60b3c8e446a7cfef90 > > > > commit fab4acbb7db8ffc7082d1b60b3c8e446a7cfef90 > > Author: Mark Johnston > > AuthorDate: 2026-05-12 17:46:24 +0000 > > Commit: Mark Johnston > > CommitDate: 2026-05-12 20:05:18 +0000 > > > > vmem: Include param.h in the userspace port as well > > > > It is required at least for NBBY. > > > > MFC after: 1 week > > Strictly speaking, NBBY requires only , a header I created to put simple and frequently used definitions such as nitems(), howmany() and round*(). Using it in these cases may be preferable. Yes, it looks like _param.h is sufficient here. I think it's ok to just keep it as param.h given that 1) it's not a header and 2) we already include sys/param.h in the #ifdef _KERNEL case. From nobody Tue May 12 21:12: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 4gFTnc2QJnz6d643 for ; Tue, 12 May 2026 21:12: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 4gFTnb6MJgz3tKn for ; Tue, 12 May 2026 21:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778620355; 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=6DggzHgCT3sEWsoHRPLJjxv0DW7hUTMhiEWwMYWoWxE=; b=RX8cISacHkjVg+4xlKww7meTQFa1B7T8iBW/BynilApqzsqYoiEjxKGDyt6+TqEhpj0TBf qhXRIkFTNGmK2fALjs1BpBhU8YTK7bZLteFUiob9/FbqFKm6tezmAaOPB4rxTwDFXWijU8 nesNbpMNe+5yxCk0ne7AJ1BmMmOkjGwHmhKR9h2RbOuFnZ/YgRHRIHq+zZWi2sNdt2gUhG CFS2kZaU+oipFFJaL0D0zBFX4k7Joe4dMn6AO0CZUDg14K0RtAq6TyhdfArCUzx1m1ZWfX 9U1J8hzCV2PZBCFH/z+896o5iFpn/c6tLCAhRm13zbHkjmZOwsjN2a8dGRzoVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778620355; a=rsa-sha256; cv=none; b=rYfbmKZqUF+y7KydDc+BUVX/1mJrZeDM/qdZ7G/t2cuWN/GUkCDOwA/J/l3ufnZw6kDDor 0+AlArdvEb4q3zE9PPtz5Qc+ydOJq/tnIOGQLkrh5wtjfb7BdwdJeBQZ08Xrs5Ij/aNRre 8sygak9D2I2QmcMdK1i3G5HlXpoPlKJBAczWy/fF1H6b3eJEiRQtfTriabZfwhZMFKJglI gEu191Mhow79HYhXFmE1JW3MV4CFaMgZvSHgkT9HLaQlsf3llHqTyGFG6chJoJZ8EuncuD LWvvh8+cWJKT7PiG3QIsBRskp5+XP1go7IPsuN4urJYK257oQSs9gaAQTwYPMg== 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=1778620355; 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=6DggzHgCT3sEWsoHRPLJjxv0DW7hUTMhiEWwMYWoWxE=; b=NqJjgy8OBj1pinkrwwfivOhIF/kZypfSsvGwV7uw0YbEdw4f8luZmGF3sfg0riwnt4CZCq Y2zBDFmhmDrhNB9Z0sl97FUNWqsaHcI3g+yGykki79rn108kpLP8Qn+C8L01XSye0yiVTK 39E2Bl96R9MmFPkUZlnFzLNoEJopNAIQOFoIj674cX57vV+7uQusDyd3diJsvm2i8MpVO+ iXyCE0R0fK1BSYobZxOqkXHhM8BSjKD424xFM61jGnFNinZyel6YM1P7t+Xkb8ebk0AybD 5566cbK/nAHTeHTgzGVhLmWptyuUcXQVUEFPLHXJBz11fRTVvjbsirYekqMwQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFTnb5mMlz56s for ; Tue, 12 May 2026 21:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27cd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 21:12:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e68aa5ab80ab - main - OpenSSH: Update to 10.2p1 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: e68aa5ab80ab57bdbcbe94dd2922a018d675e7f0 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 21:12:35 +0000 Message-Id: <6a0397c3.27cd6.3581a08b@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e68aa5ab80ab57bdbcbe94dd2922a018d675e7f0 commit e68aa5ab80ab57bdbcbe94dd2922a018d675e7f0 Merge: 644b4646c7ac 17ecafb37c65 Author: Ed Maste AuthorDate: 2026-05-12 21:12:09 +0000 Commit: Ed Maste CommitDate: 2026-05-12 21:12:09 +0000 OpenSSH: Update to 10.2p1 Full release notes are available at https://www.openssh.com/txt/release-10.2 Selected highlights from the release notes: Bugfixes -------- * ssh(1): fix mishandling of terminal connections when ControlPersist was active that rendered the session unusable. bz3872 Sponsored by: The FreeBSD Foundation crypto/openssh/.depend | 2 +- crypto/openssh/.github/ci-status.md | 5 + crypto/openssh/.github/run_test.sh | 1 - crypto/openssh/ChangeLog | 183 +++++++++++++++++++++++------ crypto/openssh/Makefile.in | 2 +- crypto/openssh/README | 2 +- crypto/openssh/auth-pam.c | 2 +- crypto/openssh/channels.c | 9 +- crypto/openssh/channels.h | 3 +- crypto/openssh/config.h | 5 +- crypto/openssh/configure.ac | 2 + crypto/openssh/contrib/redhat/openssh.spec | 2 +- crypto/openssh/contrib/suse/openssh.spec | 2 +- crypto/openssh/openbsd-compat/arc4random.h | 4 +- crypto/openssh/openbsd-compat/bsd-misc.c | 24 ++++ crypto/openssh/openbsd-compat/bsd-misc.h | 8 ++ crypto/openssh/regress/test-exec.sh | 12 +- crypto/openssh/ssh-pkcs11-helper.c | 16 --- crypto/openssh/ssh-pkcs11.c | 31 ++++- crypto/openssh/ssh_namespace.h | 1 - crypto/openssh/sshkey.c | 8 ++ crypto/openssh/version.h | 4 +- 22 files changed, 248 insertions(+), 80 deletions(-) diff --cc crypto/openssh/config.h index 23d24fadf6cd,000000000000..b7f432596b55 mode 100644,000000..100644 --- a/crypto/openssh/config.h +++ b/crypto/openssh/config.h @@@ -1,2115 -1,0 +1,2118 @@@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Define if you have a getaddrinfo that fails for the all-zeros IPv6 address + */ +/* #undef AIX_GETNAMEINFO_HACK */ + +/* Define if your AIX loginfailed() function takes 4 arguments (AIX >= 5.2) */ +/* #undef AIX_LOGINFAILED_4ARG */ + +/* System only supports IPv4 audit records */ +/* #undef AU_IPv4 */ + +/* Define if your resolver libs need this for getrrsetbyname */ +/* #undef BIND_8_COMPAT */ + +/* The system has incomplete BSM API */ +/* #undef BROKEN_BSM_API */ + +/* broken in chroots on older kernels */ +/* #undef BROKEN_CLOSEFROM */ + +/* Define if cmsg_type is not passed correctly */ +/* #undef BROKEN_CMSG_TYPE */ + +/* getaddrinfo is broken (if present) */ +/* #undef BROKEN_GETADDRINFO */ + +/* getgroups(0,NULL) will return -1 */ +/* #undef BROKEN_GETGROUPS */ + +/* getline is not what we expect */ +/* #undef BROKEN_GETLINE */ + +/* FreeBSD glob does not do what we need */ +#define BROKEN_GLOB 1 + +/* Define if you system's inet_ntoa is busted (e.g. Irix gcc issue) */ +/* #undef BROKEN_INET_NTOA */ + +/* Define if your struct dirent expects you to allocate extra space for d_name + */ +/* #undef BROKEN_ONE_BYTE_DIRENT_D_NAME */ + +/* System poll(2) implementation is broken */ +/* #undef BROKEN_POLL */ + +/* Can't do comparisons on readv */ +/* #undef BROKEN_READV_COMPARISON */ + +/* NetBSD read function is sometimes redirected, breaking atomicio comparisons + against it */ +/* #undef BROKEN_READ_COMPARISON */ + +/* Needed for NeXT */ +/* #undef BROKEN_SAVED_UIDS */ + +/* Define if your setregid() is broken */ +/* #undef BROKEN_SETREGID */ + +/* Define if your setresgid() is broken */ +/* #undef BROKEN_SETRESGID */ + +/* Define if your setresuid() is broken */ +/* #undef BROKEN_SETRESUID */ + +/* Define if your setreuid() is broken */ +/* #undef BROKEN_SETREUID */ + +/* LynxOS has broken setvbuf() implementation */ +/* #undef BROKEN_SETVBUF */ + +/* QNX shadow support is broken */ +/* #undef BROKEN_SHADOW_EXPIRE */ + +/* Define if your snprintf is busted */ +/* #undef BROKEN_SNPRINTF */ + +/* strndup broken, see APAR IY61211 */ +/* #undef BROKEN_STRNDUP */ + +/* strnlen broken, see APAR IY62551 */ +/* #undef BROKEN_STRNLEN */ + +/* strnvis detected broken */ +#define BROKEN_STRNVIS 1 + +/* tcgetattr with ICANON may hang */ +/* #undef BROKEN_TCGETATTR_ICANON */ + +/* updwtmpx is broken (if present) */ +/* #undef BROKEN_UPDWTMPX */ + +/* Define if you have BSD auth support */ +/* #undef BSD_AUTH */ + +/* Define if you want to specify the path to your lastlog file */ +/* #undef CONF_LASTLOG_FILE */ + +/* Define if you want to specify the path to your utmp file */ +/* #undef CONF_UTMP_FILE */ + +/* Define if you want to specify the path to your wtmpx file */ +/* #undef CONF_WTMPX_FILE */ + +/* Define if you want to specify the path to your wtmp file */ +/* #undef CONF_WTMP_FILE */ + +/* Need to call setpgrp as root */ +/* #undef DISABLE_FD_PASSING */ + +/* Define if you don't want to use lastlog */ +/* #undef DISABLE_LASTLOG */ + +/* Define if you don't want to use your system's login() call */ +/* #undef DISABLE_LOGIN */ + +/* Define if you don't want to use pututline() etc. to write [uw]tmp */ +/* #undef DISABLE_PUTUTLINE */ + +/* Define if you don't want to use pututxline() etc. to write [uw]tmpx */ +/* #undef DISABLE_PUTUTXLINE */ + +/* Define if you want to disable shadow passwords */ +/* #undef DISABLE_SHADOW */ + +/* Define if you don't want to use utmp */ +#define DISABLE_UTMP 1 + +/* Define if you don't want to use utmpx */ +/* #undef DISABLE_UTMPX */ + +/* Define if you don't want to use wtmp */ +#define DISABLE_WTMP 1 + +/* Define if you don't want to use wtmpx */ +#define DISABLE_WTMPX 1 + +/* Enable for PKCS#11 support */ +#define ENABLE_PKCS11 /**/ + +/* Enable for U2F/FIDO support */ +#define ENABLE_SK /**/ + +/* Enable for built-in U2F/FIDO support */ +/* #undef ENABLE_SK_INTERNAL */ + +/* define if fflush(NULL) does not work */ +/* #undef FFLUSH_NULL_BUG */ + +/* File names may not contain backslash characters */ +/* #undef FILESYSTEM_NO_BACKSLASH */ + +/* fsid_t has member val */ +/* #undef FSID_HAS_VAL */ + +/* fsid_t has member __val */ +/* #undef FSID_HAS___VAL */ + +/* getpgrp takes one arg */ +#define GETPGRP_VOID 1 + +/* Conflicting defs for getspnam */ +/* #undef GETSPNAM_CONFLICTING_DEFS */ + +/* Define if your system glob() function has the GLOB_ALTDIRFUNC extension */ +#define GLOB_HAS_ALTDIRFUNC 1 + +/* Define if your system glob() function has gl_matchc options in glob_t */ +#define GLOB_HAS_GL_MATCHC 1 + +/* Define if your system glob() function has gl_statv options in glob_t */ +/* #undef GLOB_HAS_GL_STATV */ + +/* Define this if you want GSSAPI support in the version 2 protocol */ +/* #undef GSSAPI */ + +/* Define if you want to use shadow password expire field */ +/* #undef HAS_SHADOW_EXPIRE */ + +/* Define if your system uses access rights style file descriptor passing */ +/* #undef HAVE_ACCRIGHTS_IN_MSGHDR */ + +/* Define if you have ut_addr in utmp.h */ +/* #undef HAVE_ADDR_IN_UTMP */ + +/* Define if you have ut_addr in utmpx.h */ +/* #undef HAVE_ADDR_IN_UTMPX */ + +/* Define if you have ut_addr_v6 in utmp.h */ +/* #undef HAVE_ADDR_V6_IN_UTMP */ + +/* Define if you have ut_addr_v6 in utmpx.h */ +/* #undef HAVE_ADDR_V6_IN_UTMPX */ + +/* Define to 1 if you have the 'arc4random' function. */ +#define HAVE_ARC4RANDOM 1 + +/* Define to 1 if you have the 'arc4random_buf' function. */ +#define HAVE_ARC4RANDOM_BUF 1 + +/* Define to 1 if you have the 'arc4random_stir' function. */ +/* #undef HAVE_ARC4RANDOM_STIR */ + +/* Define to 1 if you have the 'arc4random_uniform' function. */ +#define HAVE_ARC4RANDOM_UNIFORM 1 + +/* Define to 1 if you have the 'asprintf' function. */ +#define HAVE_ASPRINTF 1 + +/* OpenBSD's gcc has bounded */ +/* #undef HAVE_ATTRIBUTE__BOUNDED__ */ + +/* Have attribute nonnull */ +#define HAVE_ATTRIBUTE__NONNULL__ 1 + +/* OpenBSD's gcc has sentinel */ +/* #undef HAVE_ATTRIBUTE__SENTINEL__ */ + +/* Define to 1 if you have the 'aug_get_machine' function. */ +/* #undef HAVE_AUG_GET_MACHINE */ + +/* Define to 1 if you have the 'auth_hostok' function. */ +#define HAVE_AUTH_HOSTOK 1 + +/* Define to 1 if you have the 'auth_timeok' function. */ +#define HAVE_AUTH_TIMEOK 1 + +/* Define to 1 if you have the 'b64_ntop' function. */ +/* #undef HAVE_B64_NTOP */ + +/* Define to 1 if you have the 'b64_pton' function. */ +/* #undef HAVE_B64_PTON */ + +/* Define if you have the basename function. */ +#define HAVE_BASENAME 1 + +/* Define to 1 if you have the 'bcopy' function. */ +#define HAVE_BCOPY 1 + +/* Define to 1 if you have the 'bcrypt_pbkdf' function. */ +/* #undef HAVE_BCRYPT_PBKDF */ + +/* Define to 1 if you have the 'bindresvport_sa' function. */ +#define HAVE_BINDRESVPORT_SA 1 + +/* Define to 1 if you have the 'blf_enc' function. */ +/* #undef HAVE_BLF_ENC */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BLF_H */ + +/* Define to 1 if you have the 'Blowfish_expand0state' function. */ +/* #undef HAVE_BLOWFISH_EXPAND0STATE */ + +/* Define to 1 if you have the 'Blowfish_expandstate' function. */ +/* #undef HAVE_BLOWFISH_EXPANDSTATE */ + +/* Define to 1 if you have the 'Blowfish_initstate' function. */ +/* #undef HAVE_BLOWFISH_INITSTATE */ + +/* Define to 1 if you have the 'Blowfish_stream2word' function. */ +/* #undef HAVE_BLOWFISH_STREAM2WORD */ + +/* Define to 1 if you have the 'BN_is_prime_ex' function. */ +#define HAVE_BN_IS_PRIME_EX 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BSD_LIBUTIL_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BSM_AUDIT_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BSTRING_H */ + +/* Define to 1 if you have the 'bzero' function. */ +#define HAVE_BZERO 1 + +/* calloc(0, x) returns NULL */ +#define HAVE_CALLOC 1 + +/* Define if you have caph_cache_tzdata */ +#define HAVE_CAPH_CACHE_TZDATA 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_CAPSICUM_HELPERS_H 1 + +/* Define to 1 if you have the 'cap_rights_limit' function. */ +#define HAVE_CAP_RIGHTS_LIMIT 1 + +/* Define to 1 if you have the 'clock' function. */ +#define HAVE_CLOCK 1 + +/* Have clock_gettime */ +#define HAVE_CLOCK_GETTIME 1 + +/* define if you have clock_t data type */ +#define HAVE_CLOCK_T 1 + +/* Define to 1 if you have the 'closefrom' function. */ +#define HAVE_CLOSEFROM 1 + +/* Define to 1 if you have the 'close_range' function. */ +#define HAVE_CLOSE_RANGE 1 + +/* Define if gai_strerror() returns const char * */ +#define HAVE_CONST_GAI_STRERROR_PROTO 1 + +/* Define if your system uses ancillary data style file descriptor passing */ +#define HAVE_CONTROL_IN_MSGHDR 1 + +/* Define to 1 if you have the 'crypt' function. */ +#define HAVE_CRYPT 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRYPTO_SHA2_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRYPT_H */ + +/* Define if you are on Cygwin */ +/* #undef HAVE_CYGWIN */ + +/* Define if your libraries define daemon() */ +#define HAVE_DAEMON 1 + +/* Define to 1 if you have the declaration of 'AI_NUMERICSERV', and to 0 if + you don't. */ +#define HAVE_DECL_AI_NUMERICSERV 1 + +/* Define to 1 if you have the declaration of 'authenticate', and to 0 if you + don't. */ +/* #undef HAVE_DECL_AUTHENTICATE */ + +/* Define to 1 if you have the declaration of 'bzero', and to 0 if you don't. + */ +#define HAVE_DECL_BZERO 1 + +/* Define to 1 if you have the declaration of 'ftruncate', and to 0 if you + don't. */ +#define HAVE_DECL_FTRUNCATE 1 + +/* Define to 1 if you have the declaration of 'getentropy', and to 0 if you + don't. */ +#define HAVE_DECL_GETENTROPY 1 + +/* Define to 1 if you have the declaration of 'getpeereid', and to 0 if you + don't. */ +#define HAVE_DECL_GETPEEREID 1 + +/* Define to 1 if you have the declaration of 'GLOB_NOMATCH', and to 0 if you + don't. */ +#define HAVE_DECL_GLOB_NOMATCH 1 + +/* Define to 1 if you have the declaration of 'GSS_C_NT_HOSTBASED_SERVICE', + and to 0 if you don't. */ +/* #undef HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE */ + +/* Define to 1 if you have the declaration of 'howmany', and to 0 if you + don't. */ +#define HAVE_DECL_HOWMANY 1 + +/* Define to 1 if you have the declaration of 'htole64', and to 0 if you + don't. */ +#define HAVE_DECL_HTOLE64 1 + +/* Define to 1 if you have the declaration of 'h_errno', and to 0 if you + don't. */ +#define HAVE_DECL_H_ERRNO 1 + +/* Define to 1 if you have the declaration of 'INFINITY', and to 0 if you + don't. */ +#define HAVE_DECL_INFINITY 1 + +/* Define to 1 if you have the declaration of 'le32toh', and to 0 if you + don't. */ +#define HAVE_DECL_LE32TOH 1 + +/* Define to 1 if you have the declaration of 'le64toh', and to 0 if you + don't. */ +#define HAVE_DECL_LE64TOH 1 + +/* Define to 1 if you have the declaration of 'loginfailed', and to 0 if you + don't. */ +/* #undef HAVE_DECL_LOGINFAILED */ + +/* Define to 1 if you have the declaration of 'loginrestrictions', and to 0 if + you don't. */ +/* #undef HAVE_DECL_LOGINRESTRICTIONS */ + +/* Define to 1 if you have the declaration of 'loginsuccess', and to 0 if you + don't. */ +/* #undef HAVE_DECL_LOGINSUCCESS */ + +/* Define to 1 if you have the declaration of 'MAXSYMLINKS', and to 0 if you + don't. */ +#define HAVE_DECL_MAXSYMLINKS 1 + +/* Define to 1 if you have the declaration of 'memmem', and to 0 if you don't. + */ +#define HAVE_DECL_MEMMEM 1 + +/* Define to 1 if you have the declaration of 'NFDBITS', and to 0 if you + don't. */ +#define HAVE_DECL_NFDBITS 1 + +/* Define to 1 if you have the declaration of 'offsetof', and to 0 if you + don't. */ +#define HAVE_DECL_OFFSETOF 1 + +/* Define to 1 if you have the declaration of 'O_NONBLOCK', and to 0 if you + don't. */ +#define HAVE_DECL_O_NONBLOCK 1 + +/* Define to 1 if you have the declaration of 'passwdexpired', and to 0 if you + don't. */ +/* #undef HAVE_DECL_PASSWDEXPIRED */ + +/* Define to 1 if you have the declaration of 'readv', and to 0 if you don't. + */ +#define HAVE_DECL_READV 1 + +/* Define to 1 if you have the declaration of 'setauthdb', and to 0 if you + don't. */ +/* #undef HAVE_DECL_SETAUTHDB */ + +/* Define to 1 if you have the declaration of 'SHUT_RD', and to 0 if you + don't. */ +#define HAVE_DECL_SHUT_RD 1 + +/* Define to 1 if you have the declaration of 'UINT32_MAX', and to 0 if you + don't. */ +#define HAVE_DECL_UINT32_MAX 1 + +/* Define to 1 if you have the declaration of 'writev', and to 0 if you don't. + */ +#define HAVE_DECL_WRITEV 1 + +/* Define to 1 if you have the declaration of '_getlong', and to 0 if you + don't. */ +#define HAVE_DECL__GETLONG 0 + +/* Define to 1 if you have the declaration of '_getshort', and to 0 if you + don't. */ +#define HAVE_DECL__GETSHORT 0 + +/* Define to 1 if you have the declaration of '__builtin_inff', and to 0 if + you don't. */ +/* #undef HAVE_DECL___BUILTIN_INFF */ + +/* Define to 1 if you have the 'DES_crypt' function. */ +#define HAVE_DES_CRYPT 1 + +/* Define if you have /dev/ptmx */ +/* #undef HAVE_DEV_PTMX */ + +/* Define if you have /dev/ptc */ +/* #undef HAVE_DEV_PTS_AND_PTC */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the 'dirfd' function. */ +#define HAVE_DIRFD 1 + +/* Define to 1 if you have the 'dirname' function. */ +#define HAVE_DIRNAME 1 + +/* Define to 1 if you have the 'dlopen' function. */ +#define HAVE_DLOPEN 1 + +/* Define to 1 if you have the 'EC_KEY_METHOD_new' function. */ +#define HAVE_EC_KEY_METHOD_NEW 1 + +/* Define to 1 if you have the 'EC_POINT_get_affine_coordinates' function. */ +#define HAVE_EC_POINT_GET_AFFINE_COORDINATES 1 + +/* Define to 1 if you have the 'EC_POINT_get_affine_coordinates_GFp' function. + */ +#define HAVE_EC_POINT_GET_AFFINE_COORDINATES_GFP 1 + +/* Define to 1 if you have the 'EC_POINT_set_affine_coordinates' function. */ +#define HAVE_EC_POINT_SET_AFFINE_COORDINATES 1 + +/* Define to 1 if you have the 'EC_POINT_set_affine_coordinates_GFp' function. + */ +#define HAVE_EC_POINT_SET_AFFINE_COORDINATES_GFP 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ELF_H 1 + +/* Define to 1 if you have the 'endgrent' function. */ +#define HAVE_ENDGRENT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ENDIAN_H 1 + +/* Define to 1 if you have the 'endutent' function. */ +/* #undef HAVE_ENDUTENT */ + +/* Define to 1 if you have the 'endutxent' function. */ +#define HAVE_ENDUTXENT 1 + +/* Define to 1 if you have the 'err' function. */ +#define HAVE_ERR 1 + +/* Define to 1 if you have the 'errx' function. */ +#define HAVE_ERRX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERR_H 1 + +/* Define if your system has /etc/default/login */ +/* #undef HAVE_ETC_DEFAULT_LOGIN */ + +/* Define to 1 if you have the 'EVP_chacha20' function. */ +#define HAVE_EVP_CHACHA20 1 + +/* Define to 1 if you have the 'EVP_CIPHER_CTX_get_iv' function. */ +/* #undef HAVE_EVP_CIPHER_CTX_GET_IV */ + +/* Define to 1 if you have the 'EVP_CIPHER_CTX_get_updated_iv' function. */ +#define HAVE_EVP_CIPHER_CTX_GET_UPDATED_IV 1 + +/* Define to 1 if you have the 'EVP_CIPHER_CTX_iv' function. */ +#define HAVE_EVP_CIPHER_CTX_IV 1 + +/* Define to 1 if you have the 'EVP_CIPHER_CTX_iv_noconst' function. */ +#define HAVE_EVP_CIPHER_CTX_IV_NOCONST 1 + +/* Define to 1 if you have the 'EVP_CIPHER_CTX_set_iv' function. */ +/* #undef HAVE_EVP_CIPHER_CTX_SET_IV */ + +/* Define to 1 if you have the 'EVP_DigestFinal_ex' function. */ +#define HAVE_EVP_DIGESTFINAL_EX 1 + +/* Define to 1 if you have the 'EVP_DigestInit_ex' function. */ +#define HAVE_EVP_DIGESTINIT_EX 1 + +/* Define to 1 if you have the 'EVP_DigestSign' function. */ +#define HAVE_EVP_DIGESTSIGN 1 + +/* Define to 1 if you have the 'EVP_DigestVerify' function. */ +#define HAVE_EVP_DIGESTVERIFY 1 + +/* Define to 1 if you have the 'EVP_MD_CTX_cleanup' function. */ +/* #undef HAVE_EVP_MD_CTX_CLEANUP */ + +/* Define to 1 if you have the 'EVP_MD_CTX_copy_ex' function. */ +#define HAVE_EVP_MD_CTX_COPY_EX 1 + +/* Define to 1 if you have the 'EVP_MD_CTX_init' function. */ +/* #undef HAVE_EVP_MD_CTX_INIT */ + +/* Define to 1 if you have the 'EVP_PKEY_get_raw_private_key' function. */ +#define HAVE_EVP_PKEY_GET_RAW_PRIVATE_KEY 1 + +/* Define to 1 if you have the 'EVP_PKEY_get_raw_public_key' function. */ +#define HAVE_EVP_PKEY_GET_RAW_PUBLIC_KEY 1 + +/* Define to 1 if you have the 'EVP_sha256' function. */ +#define HAVE_EVP_SHA256 1 + +/* Define to 1 if you have the 'EVP_sha384' function. */ +#define HAVE_EVP_SHA384 1 + +/* Define to 1 if you have the 'EVP_sha512' function. */ +#define HAVE_EVP_SHA512 1 + +/* Define if you have ut_exit in utmp.h */ +/* #undef HAVE_EXIT_IN_UTMP */ + +/* Define to 1 if you have the 'explicit_bzero' function. */ +#define HAVE_EXPLICIT_BZERO 1 + +/* Define to 1 if you have the 'explicit_memset' function. */ +/* #undef HAVE_EXPLICIT_MEMSET */ + +/* Define to 1 if you have the 'fchmod' function. */ +#define HAVE_FCHMOD 1 + +/* Define to 1 if you have the 'fchmodat' function. */ +#define HAVE_FCHMODAT 1 + +/* Define to 1 if you have the 'fchown' function. */ +#define HAVE_FCHOWN 1 + +/* Define to 1 if you have the 'fchownat' function. */ +#define HAVE_FCHOWNAT 1 + +/* Use F_CLOSEM fcntl for closefrom */ +/* #undef HAVE_FCNTL_CLOSEM */ + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if the system has the type 'fd_mask'. */ +#define HAVE_FD_MASK 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FEATURES_H */ + +/* Define to 1 if you have the 'fido_assert_set_clientdata' function. */ +/* #undef HAVE_FIDO_ASSERT_SET_CLIENTDATA */ + +/* Define to 1 if you have the 'fido_cred_prot' function. */ +/* #undef HAVE_FIDO_CRED_PROT */ + +/* Define to 1 if you have the 'fido_cred_set_clientdata' function. */ +/* #undef HAVE_FIDO_CRED_SET_CLIENTDATA */ + +/* Define to 1 if you have the 'fido_cred_set_prot' function. */ +/* #undef HAVE_FIDO_CRED_SET_PROT */ + +/* Define to 1 if you have the 'fido_dev_get_touch_begin' function. */ +/* #undef HAVE_FIDO_DEV_GET_TOUCH_BEGIN */ + +/* Define to 1 if you have the 'fido_dev_get_touch_status' function. */ +/* #undef HAVE_FIDO_DEV_GET_TOUCH_STATUS */ + +/* Define to 1 if you have the 'fido_dev_is_winhello' function. */ +/* #undef HAVE_FIDO_DEV_IS_WINHELLO */ + +/* Define to 1 if you have the 'fido_dev_supports_cred_prot' function. */ +/* #undef HAVE_FIDO_DEV_SUPPORTS_CRED_PROT */ + +/* Define to 1 if you have the header file. */ +#define HAVE_FLOATINGPOINT_H 1 + +/* Define to 1 if you have the 'flock' function. */ +#define HAVE_FLOCK 1 + +/* Define to 1 if you have the 'fmt_scaled' function. */ +/* #undef HAVE_FMT_SCALED */ + +/* Define to 1 if you have the 'fnmatch' function. */ +#define HAVE_FNMATCH 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FNMATCH_H 1 + +/* Define to 1 if you have the 'freeaddrinfo' function. */ +#define HAVE_FREEADDRINFO 1 + +/* Define to 1 if you have the 'freezero' function. */ +/* #undef HAVE_FREEZERO */ + +/* Define to 1 if the system has the type 'fsblkcnt_t'. */ +#define HAVE_FSBLKCNT_T 1 + +/* Define to 1 if the system has the type 'fsfilcnt_t'. */ +#define HAVE_FSFILCNT_T 1 + +/* Define to 1 if you have the 'fstatat' function. */ +#define HAVE_FSTATAT 1 + +/* Define to 1 if you have the 'fstatfs' function. */ +#define HAVE_FSTATFS 1 + +/* Define to 1 if you have the 'fstatvfs' function. */ +#define HAVE_FSTATVFS 1 + +/* Define to 1 if you have the 'futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the 'gai_strerror' function. */ +#define HAVE_GAI_STRERROR 1 + +/* Define to 1 if you have the 'getaddrinfo' function. */ +#define HAVE_GETADDRINFO 1 + +/* Define to 1 if you have the 'getaudit' function. */ +/* #undef HAVE_GETAUDIT */ + +/* Define to 1 if you have the 'getaudit_addr' function. */ +/* #undef HAVE_GETAUDIT_ADDR */ + +/* Define to 1 if you have the 'getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the 'getentropy' function. */ +#define HAVE_GETENTROPY 1 + +/* Define to 1 if you have the 'getgrouplist' function. */ +#define HAVE_GETGROUPLIST 1 + +/* Define to 1 if you have the 'getgrset' function. */ +/* #undef HAVE_GETGRSET */ + +/* Define to 1 if you have the 'getlastlogxbyname' function. */ +/* #undef HAVE_GETLASTLOGXBYNAME */ + +/* Define to 1 if you have the 'getline' function. */ +#define HAVE_GETLINE 1 + +/* Define to 1 if you have the 'getluid' function. */ +/* #undef HAVE_GETLUID */ + +/* Define to 1 if you have the 'getnameinfo' function. */ +#define HAVE_GETNAMEINFO 1 + +/* Define to 1 if you have the 'getopt' function. */ +#define HAVE_GETOPT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GETOPT_H 1 + +/* Define if your getopt(3) defines and uses optreset */ +#define HAVE_GETOPT_OPTRESET 1 + +/* Define if your libraries define getpagesize() */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the 'getpeereid' function. */ +#define HAVE_GETPEEREID 1 + +/* Define to 1 if you have the 'getpeerucred' function. */ +/* #undef HAVE_GETPEERUCRED */ + +/* Define to 1 if you have the 'getpgid' function. */ +#define HAVE_GETPGID 1 + +/* Define to 1 if you have the 'getpgrp' function. */ +#define HAVE_GETPGRP 1 + +/* Define to 1 if you have the 'getpwanam' function. */ +/* #undef HAVE_GETPWANAM */ + +/* Define to 1 if you have the 'getrandom' function. */ +#define HAVE_GETRANDOM 1 + +/* Define to 1 if you have the 'getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define if getrrsetbyname() exists */ +/* #undef HAVE_GETRRSETBYNAME */ + +/* Define to 1 if you have the 'getseuserbyname' function. */ +/* #undef HAVE_GETSEUSERBYNAME */ + +/* Define to 1 if you have the 'getsid' function. */ +#define HAVE_GETSID 1 + +/* Define to 1 if you have the 'gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the 'getttyent' function. */ +#define HAVE_GETTTYENT 1 + +/* Define to 1 if you have the 'getutent' function. */ +/* #undef HAVE_GETUTENT */ + +/* Define to 1 if you have the 'getutid' function. */ +/* #undef HAVE_GETUTID */ + +/* Define to 1 if you have the 'getutline' function. */ +/* #undef HAVE_GETUTLINE */ + +/* Define to 1 if you have the 'getutxent' function. */ +#define HAVE_GETUTXENT 1 + +/* Define to 1 if you have the 'getutxid' function. */ +#define HAVE_GETUTXID 1 + +/* Define to 1 if you have the 'getutxline' function. */ +#define HAVE_GETUTXLINE 1 + +/* Define to 1 if you have the 'getutxuser' function. */ +#define HAVE_GETUTXUSER 1 + +/* Define to 1 if you have the 'get_default_context_with_level' function. */ +/* #undef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL */ + +/* Define to 1 if you have the 'glob' function. */ +#define HAVE_GLOB 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GLOB_H 1 + +/* Define to 1 if you have the 'group_from_gid' function. */ +#define HAVE_GROUP_FROM_GID 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_GENERIC_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_GSSAPI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_GSSAPI_KRB5_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_KRB5_H */ + +/* Define if HEADER.ad exists in arpa/nameser.h */ +#define HAVE_HEADER_AD 1 + +/* Define to 1 if you have the 'HMAC_CTX_init' function. */ +/* #undef HAVE_HMAC_CTX_INIT */ + +/* Define if you have ut_host in utmp.h */ +/* #undef HAVE_HOST_IN_UTMP */ + +/* Define if you have ut_host in utmpx.h */ +#define HAVE_HOST_IN_UTMPX 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_IAF_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_IA_H */ + +/* Define if you have ut_id in utmp.h */ +/* #undef HAVE_ID_IN_UTMP */ + +/* Define if you have ut_id in utmpx.h */ +#define HAVE_ID_IN_UTMPX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_IFADDRS_H 1 + +/* Define to 1 if you have the 'inet_aton' function. */ +#define HAVE_INET_ATON 1 + +/* Define to 1 if you have the 'inet_ntoa' function. */ +#define HAVE_INET_NTOA 1 + +/* Define to 1 if you have the 'inet_ntop' function. */ +#define HAVE_INET_NTOP 1 + +/* Define to 1 if you have the 'innetgr' function. */ +#define HAVE_INNETGR 1 + +/* define if you have int64_t data type */ +#define HAVE_INT64_T 1 + +/* Define to 1 if the system has the type 'intmax_t'. */ +#define HAVE_INTMAX_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* define if you have intxx_t data type */ +#define HAVE_INTXX_T 1 + +/* Define to 1 if the system has the type 'in_addr_t'. */ +#define HAVE_IN_ADDR_T 1 + +/* Define to 1 if the system has the type 'in_port_t'. */ +#define HAVE_IN_PORT_T 1 + +/* Define if you have isblank(3C). */ +#define HAVE_ISBLANK 1 + +/* Define to 1 if you have the 'killpg' function. */ +#define HAVE_KILLPG 1 + +/* Define to 1 if you have the 'krb5_cc_new_unique' function. */ +/* #undef HAVE_KRB5_CC_NEW_UNIQUE */ + +/* Define to 1 if you have the 'krb5_free_error_message' function. */ +/* #undef HAVE_KRB5_FREE_ERROR_MESSAGE */ + +/* Define to 1 if you have the 'krb5_get_error_message' function. */ +/* #undef HAVE_KRB5_GET_ERROR_MESSAGE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_LANGINFO_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LASTLOG_H */ + +/* Define if you want ldns support */ +/* #undef HAVE_LDNS */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBAUDIT_H */ + +/* Define to 1 if you have the 'bsm' library (-lbsm). */ +/* #undef HAVE_LIBBSM */ + +/* Define to 1 if you have the 'dl' library (-ldl). */ +#define HAVE_LIBDL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIBGEN_H 1 + +/* Define if system has libiaf that supports set_id */ +/* #undef HAVE_LIBIAF */ + +/* Define to 1 if you have the 'network' library (-lnetwork). */ +/* #undef HAVE_LIBNETWORK */ + +/* Define to 1 if you have the 'pam' library (-lpam). */ +#define HAVE_LIBPAM 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBPROC_H */ + +/* Define to 1 if you have the 'socket' library (-lsocket). */ +/* #undef HAVE_LIBSOCKET */ + +/* Define to 1 if you have the header file. */ +#define HAVE_LIBUTIL_H 1 + +/* Define to 1 if you have the 'xnet' library (-lxnet). */ +/* #undef HAVE_LIBXNET */ + +/* Define to 1 if you have the 'z' library (-lz). */ +#define HAVE_LIBZ 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LINUX_AUDIT_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LINUX_FILTER_H */ + *** 8246 LINES SKIPPED *** From nobody Tue May 12 22:51: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 4gFWzj13YFz6dDmP for ; Tue, 12 May 2026 22:51: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 4gFWzh64nDz47jT for ; Tue, 12 May 2026 22:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778626288; 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=4ZGKdppjktkDlpq+h4g3UZRfu4z8Fp3aGCXIRDhoFu8=; b=AzZOrXbqnZy+1M12SvStbXKtk+5ECDNiwnpAgo+M1EN/gOeD0X9W3TEJJXn5yoWMDuf0Bx aOA7tH4jz+hR1Z0HbqXXfsqs62HkYmCvc35+tz9jzcoy2HBBQGHQgMrHtfjf8xuxrmyWX8 JZVF/JgL/hNkBFvd9z8VOh0ZhaFUwSgEhPImP79AwZcQ1LeVyjziD9a1UJPVsiq4jPOFKN 13jqUxoxnx5qTogYEwKXsD8jM4b8sSlR2HSlK6EzBprPDhHQjHHGeYS+ih8uyzwVijy8EM cB1uI6SEbdx8/5RRURvtXeNo25nKb0WZJz9fdAsEDe22qpKDGLN/gbuLP5W+hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778626288; a=rsa-sha256; cv=none; b=NWq1UJHr7YK5QDc8aW+VJSLdmF8oGAhu95Kslq8ln4r22VZPPGLAIaHs/q8SyKrDP1xFul wIgijtZj2b34lJ46zMd0e6rnLOFWFZj7grJCaKSyf2QiYUFk4XM0lyacmIPzSmN7TpTnrB VUoIrBq0HMAq31I3GNKmrxUEvRWSw0KpoBWra6+teNK7nM6abUWXMBmbXl2fjoptmb0VU6 wnFUzP5l0+DIB4Nsc71lcTgBzNT2r1nDWyzD7DBYrcJRTAn1LNwr6tNBQqF0eo2AdHKDet bqdngPIRCVYkMhv74XT3A6Qu60Iv48ibe4oeCSxOLGyAqQEMd6Kkte62MvHopA== 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=1778626288; 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=4ZGKdppjktkDlpq+h4g3UZRfu4z8Fp3aGCXIRDhoFu8=; b=no9xhgXgkqzMZobh8kvofAaVgYTkipeaPfrWGn+jWrDsZfKH4NJLAPZjiaTkJa7vu5yRXw QULSGY+HUkndIeWfE7vNvY0wEb9Zaxz1k9tg+oA7TbAs3lAAiGmBii4ofmAPAD0y12kCr0 CUqQJTXv+z6oZgiGjBf0O1bgIaOz/mG9utYL7APhofiQlWvqmgnqOsp8TFgTP9YIKBV8F2 kLBqSFJqihyUxdSSowMJMc7gNelUaLTB9wV5wTuSPdJKpqjOkD35+qtUO4S936zsBCGVm1 8L5Fr5MDSroeymLNvjA4Bw/yrzKzxZmLAmpKXGvHWjzV+OtwAhXQWK3wsW+PjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFWzh5dkGz89k for ; Tue, 12 May 2026 22:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b5f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 22:51:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b76b05c04cc9 - main - pam_ssh: Fix build - chase OpenSSH function signature change 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: b76b05c04cc9ed2cd053c7b367c92628447ede6f Auto-Submitted: auto-generated Date: Tue, 12 May 2026 22:51:28 +0000 Message-Id: <6a03aef0.3b5f8.6d9c077f@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b76b05c04cc9ed2cd053c7b367c92628447ede6f commit b76b05c04cc9ed2cd053c7b367c92628447ede6f Author: Ed Maste AuthorDate: 2026-05-12 22:49:29 +0000 Commit: Ed Maste CommitDate: 2026-05-12 22:51:00 +0000 pam_ssh: Fix build - chase OpenSSH function signature change Reported by: dch Fixes: 644b4646c7ac ("OpenSSH: Update to 10.1p1") Sponsored by: The FreeBSD Foundation --- lib/libpam/modules/pam_ssh/pam_ssh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.c b/lib/libpam/modules/pam_ssh/pam_ssh.c index 157908b6b910..1fcee93efb69 100644 --- a/lib/libpam/modules/pam_ssh/pam_ssh.c +++ b/lib/libpam/modules/pam_ssh/pam_ssh.c @@ -62,7 +62,7 @@ #include "sshkey.h" #define ssh_add_identity(auth, key, comment) \ - ssh_add_identity_constrained(auth, key, comment, 0, 0, 0, NULL, NULL, 0) + ssh_add_identity_constrained(auth, key, comment, 0, 0, NULL, NULL, 0) extern char **environ; From nobody Wed May 13 00:35: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 4gFZHQ2dz5z6dMMJ for ; Wed, 13 May 2026 00:35: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 4gFZHP67fhz3TBZ for ; Wed, 13 May 2026 00:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778632513; 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=BwvlGzb6AnO5MWDpy7WPwiefaJcyPqEe8+kvpzzH+t8=; b=QmvgKTlWHnntHS4K++eNTbYnEEEN47B5TL9NBlcFhXzgp19CSLHfkiNNjmhnCrlh32+JBP /iialc7xWR0yw5d2QBR40iWpLmyRWP4nULQNw2Mxa3jrNI6aRCA1gSfBezh7ogqHANg7U0 GTImEylwFJowEHmz+1NkYNB9rcLC1JCkAj5mtKZHXgE9c/JOYkv4W7nk0CVbHLzYFZPp8s XvyR+IFJO+8TxHQ060SyL7pemdSkQDESRFQIBPlAn4r+vI7gT1J4/aMYLZ5VWuuKNJx7xB Oth4CkSpuBrbs+TVypg7z3NaqSOTl3crsWPifmnZjvu1o1Y+t8/LGShDBdiisw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778632513; a=rsa-sha256; cv=none; b=YUDlAj5caDALYx7HnNbGMEr1wW/oD4jOSIywIhh5yUFT1ju0ekXVYo0xzmT8lcvsny6vIp 9O1VMqYI86mg/tybiaVH0SuZDy8ndVdP2gCV13+lNaldqcZxkWI0KyY6b8p7jr02dYfsRi BFOpGC5VtbzXGQHH8+R5QPkQTd61JPVxrFYQfRui0ikGnM5A07xSv2f38iXWlm/AGkA8Cz UfEJYhApdohrC5JE9nAMYBDoV4SN0Yzrc2zhXqT9n0kX/gz3IwklDNadVQ9nghJX7X5UjI 2tVJeBb41sm6xam8gv8SR4ojIIU7AULDAuyTBfOcMXKeHmF9UU8J919ro+FmVg== 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=1778632513; 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=BwvlGzb6AnO5MWDpy7WPwiefaJcyPqEe8+kvpzzH+t8=; b=kUs9Vy/sdLZoFvL2EyUmGzh6Z4N6xasNz3XMibQFdLhWD35f2SYSLoL2vnBc+J8VEW5RWW 0RwIixBr/u8mg/QvzWM2JLJNUistlVVb44Gauk72UeqGO2pGExz/9mfJGG2BszjHWk395C M1PxaboUM84due6RKr6R1q7V94nGncvKhAwm9gjY2Vf0oPbs0l1e8UrMs8y/8rDSpRr+Gl zZBv7l9/EZ4v4eHtrxcz7Mv5N8Cjlev9h1JhQpz0ubRKaqD/Z17yfHf/adLJoR+TkWnrde nlPicLUQpRrCNUQXph8rDCyV4pSrW0iP++u/YNNiLEwjScDKssP5VAzEYxy15A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFZHP5kHCzBM0 for ; Wed, 13 May 2026 00:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f606 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 00:35:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e6475c8f3539 - main - Cirrus-CI: Bump toolchain to LLVM 21 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: e6475c8f353981baeddb544f5a9deb48956f2815 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 00:35:13 +0000 Message-Id: <6a03c741.1f606.6b4b843@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e6475c8f353981baeddb544f5a9deb48956f2815 commit e6475c8f353981baeddb544f5a9deb48956f2815 Author: Ed Maste AuthorDate: 2026-05-12 23:35:11 +0000 Commit: Ed Maste CommitDate: 2026-05-13 00:29:30 +0000 Cirrus-CI: Bump toolchain to LLVM 21 Cirrus-CI is shutting down at the end of the month, but we can still finish with an up-to-date working build with an LLVM version matching the in-tree toolchain. Sponsored by: The FreeBSD Foundation --- .cirrus.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 83cfe6e5c591..2fdf0d492987 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -39,12 +39,20 @@ task: TOOLCHAIN: llvm18 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - name: amd64-llvm19 World and kernel build and boot smoke test - only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*' + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual env: TARGET: amd64 TARGET_ARCH: amd64 TOOLCHAIN: llvm19 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite + - name: amd64-llvm21 World and kernel build and boot smoke test + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*' + env: + TARGET: amd64 + TARGET_ARCH: amd64 + TOOLCHAIN: llvm21 + TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - name: arm64-llvm16 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual @@ -77,6 +85,14 @@ task: TARGET_ARCH: aarch64 TOOLCHAIN: llvm19 TOOLCHAIN_PKG: ${TOOLCHAIN} + - name: arm64-llvm21 World and kernel build and boot smoke test (manual) + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual + env: + TARGET: arm64 + TARGET_ARCH: aarch64 + TOOLCHAIN: llvm21 + TOOLCHAIN_PKG: ${TOOLCHAIN} - name: amd64-gcc12 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual From nobody Wed May 13 00:36: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 4gFZKP4Fstz6dMMv for ; Wed, 13 May 2026 00:36: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 4gFZKP2WlJz3TLZ for ; Wed, 13 May 2026 00:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778632617; 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=dH+KZ8KEsVvuXVbQoIG2SmKvFNFOhxTdqT2+34NkAf4=; b=lQpcfjFRhnnUcvk1ssO6yEFGtIpqWsfxRxr55XClDxyraqDr5SJQQz964N70TMCmwuEwoH yH2NCFJAgwf13xFGcbtBb4s+VxMlkLK0pKKbo1Rla3me8Xc+X9Q9PJDw+9m1QaH29HjuH3 dFD1QAAtaUzC+8cOPSGWeVGnTJaLmESonFc2pp/FJFmRZRlzyNRxDWoInY7vkKdEWESFu+ U703ffPf14Z7mHmQ2kSfyzRpssn4RUE/zVat4RUtjJpmok7RTnWjg/S78yB55BrY5UPjy+ MNmP12LM8UOgzFbrnGqr5Eg78lMpwDxL9R9wpQH7yH408iPvB4lJQqNWa0tFtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778632617; a=rsa-sha256; cv=none; b=ncSF5zWAMEEZKbIQxaX+ssbzfu1ZOdsxKrCUby4Pt4LKVzR1CtOpn+Tw+LNn9RnPA1uhkl Mxo0orAlKh0bPgqBUzhwRWxDyWIK6q4vMR5sU5wpAkZ9DKoV61pLoDD7VA3UnCfcoHf/A4 m1eharHi2NBN3BdOCeS74b7BncLtJpr7xcaNBigZyAOr422T/kYrrZ9u4LowmUwggzx9qO ebn/4nf76GJ7+wDtMTu4RP5o+y7iUvzZVRJEUgTWrryvv9TIdFdXOXKhFnhzIXC31M8Uph 3vw/mCfQMAsY6sQtcK3pRm1fYYpUfNlf3zrf/QWnl1nZFYWtDX/cVMhXbT8Irg== 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=1778632617; 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=dH+KZ8KEsVvuXVbQoIG2SmKvFNFOhxTdqT2+34NkAf4=; b=qKTAEz2je7DfiDtJDilOyycsRXLoT5v3JbxmjPiAhndiTPh5ddjr+crn3jotVA98v0yHb4 GVYiPu2tAQZcKU3Kv9s/YWbc0BUjTvhlF2XdTFoOOiPSVMK7clpxLYhGj61yKvqLNdT7Vy 3to7JsrJqJoJ6Z0/wuxktOOKKx8rHTsV/1KMOYVaHcbiSlTsws9ZF/mDVa/f/7h723F4Lv 7+F4jIZW8Ph9qdq81fqHXpWUGJFzch6QShKiS613mMG8CNSx/U40YUBFd81Dqb8Kk+n6ew Fqj1kzdSZJBJbdlL0ypCWJDM7R+DM1XQM+IgBZTcOa/+fL04KCze1LH9EMr/Uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFZKP1skDzBS1 for ; Wed, 13 May 2026 00:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f414 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 00:36:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: eacf4f50bfb1 - main - u3g: Add Telit LM960A18 LTE modem 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: eacf4f50bfb19aa0278db5e8982d73c6d77ca24c Auto-Submitted: auto-generated Date: Wed, 13 May 2026 00:36:57 +0000 Message-Id: <6a03c7a9.1f414.6cf0aa4d@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=eacf4f50bfb19aa0278db5e8982d73c6d77ca24c commit eacf4f50bfb19aa0278db5e8982d73c6d77ca24c Author: Ed Maste AuthorDate: 2026-05-12 19:52:16 +0000 Commit: Ed Maste CommitDate: 2026-05-13 00:36:39 +0000 u3g: Add Telit LM960A18 LTE modem The patch in the PR failed to apply, so I manually applied the same changes. PR: 295231 Submitted by: Mike Tancsa Reviewed by: emaste --- sys/dev/usb/serial/u3g.c | 2 ++ sys/dev/usb/usbdevs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c index 0fc774d83ee1..6e3d9395359b 100644 --- a/sys/dev/usb/serial/u3g.c +++ b/sys/dev/usb/serial/u3g.c @@ -624,6 +624,8 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = { U3G_DEV(TCTMOBILE, X080S, U3GINIT_TCT), U3G_DEV(TELIT, UC864E, 0), U3G_DEV(TELIT, UC864G, 0), + U3G_DEV(TELIT, LM960, 0), + U3G_DEV(TELIT, LM960_ECM, 0), U3G_DEV(TLAYTECH, TEU800, 0), U3G_DEV(TOSHIBA, G450, 0), U3G_DEV(TOSHIBA, HSDPA, 0), diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 594afafbb07f..ff4a6fd82f07 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4807,6 +4807,8 @@ product TELEX MIC1 0x0001 Enhanced USB Microphone /* Telit products */ product TELIT UC864E 0x1003 UC864E 3G modem product TELIT UC864G 0x1004 UC864G 3G modem +product TELIT LM960 0x1040 LM960A18 LTE modem (RNDIS) +product TELIT LM960_ECM 0x1042 LM960A18 LTE modem (ECM) /* Ten X Technology, Inc. */ product TENX UAUDIO0 0xf211 USB audio headset From nobody Wed May 13 03:27: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 4gFf6Y44HSz6YQ9d for ; Wed, 13 May 2026 03:27: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 4gFf6Y34rfz3pxm for ; Wed, 13 May 2026 03:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778642869; 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=xFEin/LZmDNFJejYGTPsCbi6tU+rLycLrP+JMwSqSD0=; b=sWXxkSfOqnUPf7GgeznhaI/V7SiT+mZq9UI8WoVaaIInWgZT+FNbrTvT/sSz7fpHmndz4V X6QWchHq782a0r/CzUJB61kYnwwFavgkSXA84496MrNGQB7NIZZUhRYBmCnAMJNICjs8sD TOKQFoJ8Xo2TAkB4P+cIEdWM2DoM//duRIsTK5nuzy6syBsMn4WNMbDOh7xhe9ZSNxToUL FZ40IDeoHrKCljC+j3rDodj4wkXmSX6npRIKqiV04OK4sVCmP7MWivIBBy4ZTwT7LZMLQg Gwe8/amOkTFNtrhGQlEWQ21/ft4mxpmi9tYyBHUIdUW0kuF3nNqa9zCKEdZlsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778642869; a=rsa-sha256; cv=none; b=a8y/qI5gT6vrZPWVTMlLXT1SvRspa+DoqvjSZbLn80nXKouxpT6cQC+BJlCFJCXtMPB+kr /AAF67c1CAZCSEUkHMkXPu82pd6fB7Z9upB0uUSlCvF+BjMwPSnmmSk5ulUF7W1RFjIJWv b6yv+m/VZ9obG2lXJcrJ0CVdllowjXBLC7ITXbhrlYQtOn+ttzS2qgqfxFe0zltk1drlXx zv9sOa3DmG0XYUUpHuA9jXrycL7Di+eQtFA9SeHhNc/7L+LK47ZvUEpiPmfAb7UND2QVDx z4d5TU5G0oJOkWGhGAPSg76DUBXBuNA3NJJN4a49m5AvYnA5WyyBFF/LC5p57g== 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=1778642869; 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=xFEin/LZmDNFJejYGTPsCbi6tU+rLycLrP+JMwSqSD0=; b=W+BIZqgdO9BhIcatbroCFSEskwDv/BHW2rHbINLv548fZ86uLlMj3fp1OhX3nE5/xrE+YL N349MIo4I5cl3gbXhfqfealxp2soChDOi+PZgYmuhfCfB0ZGBUwULCXFM/AWP+y0weudwg i7fX3fv1d6mL8vj7Bl+uCLl4m2/9XBieWRUvNqIuaA8YyNmArq1ZpfiUHQCQsrahhVjKsZ iL39cnReCoWQ1ooWzmsrCEoHMpW3qw3+/9GsQAqm57Z10c86Wy25b3oGGGYMjoVTLptYSA sCdYxIWdFd1apTrVDiClfZCFdsDuPeJs9pDTX0SqUf3SEPgrJwcPw6SSVsNqgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFf6Y1gBzzYyb for ; Wed, 13 May 2026 03:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3797c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 03:27:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Philip Paeps Subject: git: 9cc9b8b37284 - main - contrib/expat: import expat 2.8.1 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: philip X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9cc9b8b372842b9a941d235c5e9949a214e5284f Auto-Submitted: auto-generated Date: Wed, 13 May 2026 03:27:43 +0000 Message-Id: <6a03efaf.3797c.399f0d1b@gitrepo.freebsd.org> The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=9cc9b8b372842b9a941d235c5e9949a214e5284f commit 9cc9b8b372842b9a941d235c5e9949a214e5284f Merge: eacf4f50bfb1 e3c0f2f39909 Author: Philip Paeps AuthorDate: 2026-05-13 03:17:00 +0000 Commit: Philip Paeps CommitDate: 2026-05-13 03:26:56 +0000 contrib/expat: import expat 2.8.1 Changes: https://github.com/libexpat/libexpat/blob/R_2_8_1/expat/Changes Security: CVE-2026-45186 MFC after: 1 week contrib/expat/Changes | 26 ++++ contrib/expat/README.md | 2 +- contrib/expat/configure.ac | 2 +- contrib/expat/doc/reference.html | 2 +- contrib/expat/doc/xmlwf.1 | 2 +- contrib/expat/doc/xmlwf.xml | 2 +- contrib/expat/lib/expat.h | 2 +- contrib/expat/lib/xmlparse.c | 36 ++++- contrib/expat/tests/alloc_tests.c | 4 +- contrib/expat/tests/basic_tests.c | 310 ++++++++++++++++++++++++++++++++++++-- contrib/expat/tests/common.c | 5 +- contrib/expat/tests/handlers.c | 34 +++-- contrib/expat/tests/handlers.h | 2 + contrib/expat/tests/memcheck.c | 6 +- contrib/expat/tests/minicheck.c | 10 +- contrib/expat/tests/misc_tests.c | 7 +- contrib/expat/tests/structdata.c | 7 +- contrib/expat/xmlwf/unixfilemap.c | 5 +- contrib/expat/xmlwf/xmlfile.c | 4 +- contrib/expat/xmlwf/xmlwf.c | 83 +++++----- lib/libexpat/expat_config.h | 6 +- lib/libexpat/libbsdxml.3 | 4 +- 22 files changed, 450 insertions(+), 111 deletions(-) diff --cc contrib/expat/README.md index 619e60b2d16b,000000000000..7a5ed463b6d5 mode 100644,000000..100644 --- a/contrib/expat/README.md +++ b/contrib/expat/README.md @@@ -1,300 -1,0 +1,300 @@@ +[![Run Linux CI tasks](https://github.com/libexpat/libexpat/actions/workflows/linux.yml/badge.svg)](https://github.com/libexpat/libexpat/actions/workflows/linux.yml) +[![Packaging status](https://repology.org/badge/tiny-repos/expat.svg)](https://repology.org/metapackage/expat/versions) +[![Downloads SourceForge](https://img.shields.io/sourceforge/dt/expat?label=Downloads%20SourceForge)](https://sourceforge.net/projects/expat/files/) +[![Downloads GitHub](https://img.shields.io/github/downloads/libexpat/libexpat/total?label=Downloads%20GitHub)](https://github.com/libexpat/libexpat/releases) +[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/10205/badge)](https://www.bestpractices.dev/projects/10205) + +> [!CAUTION] +> +> Expat is **understaffed** and without funding. +> There is a [call for help with details](https://github.com/libexpat/libexpat/blob/master/expat/Changes) +> at the top of the `Changes` file. + + - # Expat, Release 2.8.0 ++# Expat, Release 2.8.1 + +This is Expat, a C99 library for parsing +[XML 1.0 Fourth Edition](https://www.w3.org/TR/2006/REC-xml-20060816/), started by +[James Clark](https://en.wikipedia.org/wiki/James_Clark_%28programmer%29) in 1997. +Expat is a stream-oriented XML parser. This means that you register +handlers with the parser before starting the parse. These handlers +are called when the parser discovers the associated structures in the +document being parsed. A start tag is an example of the kind of +structures for which you may register handlers. + +Expat supports the following C99 compilers: + +- GNU GCC >=4.5 (for use from C) or GNU GCC >=4.8.1 (for use from C++) +- LLVM Clang >=3.5 +- Microsoft Visual Studio >=17.0/2022 + (the oldest version supported by the [official GitHub Actions Windows images](https://github.com/actions/runner-images)) + +Windows users can use the +[`expat-win32bin-*.*.*.{exe,zip}` download](https://github.com/libexpat/libexpat/releases), +which includes both pre-compiled libraries and executables, and source code for +developers. + +Expat is [free software](https://www.gnu.org/philosophy/free-sw.en.html). +You may copy, distribute, and modify it under the terms of the License +contained in the file +[`COPYING`](https://github.com/libexpat/libexpat/blob/master/expat/COPYING) +distributed with this package. +This license is the same as the MIT/X Consortium license. + + +## Using libexpat in your CMake-Based Project + +There are three documented ways of using libexpat with CMake: + +### a) `find_package` with Module Mode + +This approach leverages CMake's own [module `FindEXPAT`](https://cmake.org/cmake/help/latest/module/FindEXPAT.html). + +Notice the *uppercase* `EXPAT` in the following example: + +```cmake +cmake_minimum_required(VERSION 3.10) + +project(hello VERSION 1.0.0) + +find_package(EXPAT 2.2.8 MODULE REQUIRED) + +add_executable(hello + hello.c +) + +target_link_libraries(hello PUBLIC EXPAT::EXPAT) +``` + +### b) `find_package` with Config Mode + +This approach requires files from… + +- libexpat >=2.2.8 where packaging uses the CMake build system +or +- libexpat >=2.3.0 where packaging uses the GNU Autotools build system + on Linux +or +- libexpat >=2.4.0 where packaging uses the GNU Autotools build system + on macOS or MinGW. + +Notice the *lowercase* `expat` in the following example: + +```cmake +cmake_minimum_required(VERSION 3.10) + +project(hello VERSION 1.0.0) + +find_package(expat 2.2.8 CONFIG REQUIRED char dtd ns) + +add_executable(hello + hello.c +) + +target_link_libraries(hello PUBLIC expat::expat) +``` + +### c) The `FetchContent` module + +This approach — as demonstrated below — requires CMake >=3.18 for both the +[`FetchContent` module](https://cmake.org/cmake/help/latest/module/FetchContent.html) +and its support for the `SOURCE_SUBDIR` option to be available. + +Please note that: +- Use of the `FetchContent` module with *non-release* SHA1s or `master` + of libexpat is neither advised nor considered officially supported. +- Pinning to a specific commit is great for robust CI. +- Pinning to a specific commit needs updating every time there is a new + release of libexpat — either manually or through automation —, + to not miss out on libexpat security updates. + +For an example that pulls in libexpat via Git: + +```cmake +cmake_minimum_required(VERSION 3.18) + +include(FetchContent) + +project(hello VERSION 1.0.0) + +FetchContent_Declare( + expat + GIT_REPOSITORY https://github.com/libexpat/libexpat/ + GIT_TAG 000000000_GIT_COMMIT_SHA1_HERE_000000000 # i.e. Git tag R_X_Y_Z + SOURCE_SUBDIR expat/ +) + +FetchContent_MakeAvailable(expat) + +add_executable(hello + hello.c +) + +target_link_libraries(hello PUBLIC expat) +``` + + +## Building from a Git Clone + +If you are building Expat from a check-out from the +[Git repository](https://github.com/libexpat/libexpat/), +you need to run a script that generates the configure script using the +GNU autoconf and libtool tools. To do this, you need to have +autoconf 2.58 or newer. Run the script like this: + +```console +./buildconf.sh +``` + +Once this has been done, follow the same instructions as for building +from a source distribution. + + +## Building from a Source Distribution + +### a) Building with the configure script (i.e. GNU Autotools) + +To build Expat from a source distribution, you first run the +configuration shell script in the top level distribution directory: + +```console +./configure +``` + +There are many options which you may provide to configure (which you +can discover by running configure with the `--help` option). But the +one of most interest is the one that sets the installation directory. +By default, the configure script will set things up to install +libexpat into `/usr/local/lib`, `expat.h` into `/usr/local/include`, and +`xmlwf` into `/usr/local/bin`. If, for example, you'd prefer to install +into `/home/me/mystuff/lib`, `/home/me/mystuff/include`, and +`/home/me/mystuff/bin`, you can tell `configure` about that with: + +```console +./configure --prefix=/home/me/mystuff +``` + +Another interesting option is to enable 64-bit integer support for +line and column numbers and the over-all byte index: + +```console +./configure CPPFLAGS=-DXML_LARGE_SIZE +``` + +However, such a modification would be a breaking change to the ABI +and is therefore not recommended for general use — e.g. as part of +a Linux distribution — but rather for builds with special requirements. + +After running the configure script, the `make` command will build +things and `make install` will install things into their proper +location. Have a look at the `Makefile` to learn about additional +`make` options. Note that you need to have write permission into +the directories into which things will be installed. + +If you are interested in building Expat to provide document +information in UTF-16 encoding rather than the default UTF-8, follow +these instructions (after having run `make distclean`). +Please note that we configure with `--without-xmlwf` as xmlwf does not +support this mode of compilation (yet): + +1. Mass-patch `Makefile.am` files to use `libexpatw.la` for a library name: +
+ `find . -name Makefile.am -exec sed + -e 's,libexpat\.la,libexpatw.la,' + -e 's,libexpat_la,libexpatw_la,' + -i.bak {} +` + +1. Run `automake` to re-write `Makefile.in` files:
+ `automake` + +1. For UTF-16 output as unsigned short (and version/error strings as char), + run:
+ `./configure CPPFLAGS=-DXML_UNICODE --without-xmlwf`
+ For UTF-16 output as `wchar_t` (incl. version/error strings), run:
+ `./configure CFLAGS="-g -O2 -fshort-wchar" CPPFLAGS=-DXML_UNICODE_WCHAR_T + --without-xmlwf` +
Note: The latter requires libc compiled with `-fshort-wchar`, as well. + +1. Run `make` (which excludes xmlwf). + +1. Run `make install` (again, excludes xmlwf). + +Using `DESTDIR` is supported. It works as follows: + +```console +make install DESTDIR=/path/to/image +``` + +overrides the in-makefile set `DESTDIR`, because variable-setting priority is + +1. commandline +1. in-makefile +1. environment + +Note: This only applies to the Expat library itself, building UTF-16 versions +of xmlwf and the tests is currently not supported. + +A reference manual is available in the file `doc/reference.html` in this +distribution. + + +### b) Building with CMake + +The CMake build system is still *experimental* and may replace the primary +build system based on GNU Autotools at some point when it is ready. + + +#### Available Options + +For an idea of the available (non-advanced) options for building with CMake: + +```console +# rm -f CMakeCache.txt ; cmake -D_EXPAT_HELP=ON -LH . | grep -B1 ':.*=' | sed 's,^--$,,' +// Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel ... +CMAKE_BUILD_TYPE:STRING= + +// Install path prefix, prepended onto install directories. +CMAKE_INSTALL_PREFIX:PATH=/usr/local + +// Path to a program. +DOCBOOK_TO_MAN:FILEPATH=/usr/bin/docbook2x-man + +// Build man page for xmlwf +EXPAT_BUILD_DOCS:BOOL=ON + +// Build the examples for expat library +EXPAT_BUILD_EXAMPLES:BOOL=ON + +// Build fuzzers for the expat library +EXPAT_BUILD_FUZZERS:BOOL=OFF + +// Build pkg-config file +EXPAT_BUILD_PKGCONFIG:BOOL=ON + +// Build the tests for expat library +EXPAT_BUILD_TESTS:BOOL=ON + +// Build the xmlwf tool for expat library +EXPAT_BUILD_TOOLS:BOOL=ON + +// Character type to use (char|ushort|wchar_t) [default=char] +EXPAT_CHAR_TYPE:STRING=char + +// Install expat files in cmake install target +EXPAT_ENABLE_INSTALL:BOOL=ON + +// Use /MT flag (static CRT) when compiling in MSVC +EXPAT_MSVC_STATIC_CRT:BOOL=OFF + +// Build fuzzers via OSS-Fuzz for the expat library +EXPAT_OSSFUZZ_BUILD:BOOL=OFF + +// Build a shared expat library +EXPAT_SHARED_LIBS:BOOL=ON + +// Define to provide symbol versioning for dependency generation +EXPAT_SYMBOL_VERSIONING:BOOL=OFF + +// Treat all compiler warnings as errors +EXPAT_WARNINGS_AS_ERRORS:BOOL=OFF +``` diff --cc lib/libexpat/expat_config.h index fcc692224520,000000000000..3259e7a187aa mode 100644,000000..100644 --- a/lib/libexpat/expat_config.h +++ b/lib/libexpat/expat_config.h @@@ -1,149 -1,0 +1,149 @@@ +/* expat_config.h. Generated from expat_config.h.in by configure. */ +/* expat_config.h.in. Generated from configure.ac by autoheader. */ + +#ifndef EXPAT_CONFIG_H +#define EXPAT_CONFIG_H 1 + +#include + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* 1234 = LILENDIAN, 4321 = BIGENDIAN */ +#if BYTE_ORDER == LITTLE_ENDIAN +#define BYTEORDER 1234 +#else +#define BYTEORDER 4321 +#endif + +/* Define to 1 if you have the `arc4random' function. */ +#define HAVE_ARC4RANDOM 1 + +/* Define to 1 if you have the `arc4random_buf' function. */ +#define HAVE_ARC4RANDOM_BUF 1 + +/* define if the compiler supports basic C++11 syntax */ +#define HAVE_CXX11 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the 'getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getrandom' function. */ +#define HAVE_GETRANDOM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the 'bsd' library (-lbsd). */ +/* #undef HAVE_LIBBSD */ + +/* Define to 1 if you have a working 'mmap' system call. */ +#define HAVE_MMAP 1 + +/* 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 `syscall' and `SYS_getrandom'. */ +#define HAVE_SYSCALL_GETRANDOM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* 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 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Name of package */ +#define PACKAGE "expat" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://github.com/libexpat/libexpat/issues" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "expat" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "expat 2.8.0" ++#define PACKAGE_STRING "expat 2.8.1" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "expat" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "2.8.0" ++#define PACKAGE_VERSION "2.8.1" + +/* Define to 1 if all of the C89 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define STDC_HEADERS 1 + +/* Version number of package */ - #define VERSION "2.8.0" ++#define VERSION "2.8.1" + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif + +/* Define to allow retrieving the byte offsets for attribute names and values. + */ +/* #undef XML_ATTR_INFO */ + +/* Define to specify how much context to retain around the current parse + point, 0 to disable. */ +#define XML_CONTEXT_BYTES 1024 + +/* Define to include code reading entropy from `/dev/urandom'. */ +#define XML_DEV_URANDOM 1 + +/* Define to make parameter entity parsing functionality available. */ +#define XML_DTD 1 + +/* Define as 1/0 to enable/disable support for general entities. */ +#define XML_GE 1 + +/* Define to make XML Namespaces functionality available. */ +#define XML_NS 1 + +/* Define to empty if 'const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to 'long int' if does not define. */ +/* #undef off_t */ + +#endif // ndef EXPAT_CONFIG_H diff --cc lib/libexpat/libbsdxml.3 index e5fedea71dd1,000000000000..3283aeffedfa mode 100644,000000..100644 --- a/lib/libexpat/libbsdxml.3 +++ b/lib/libexpat/libbsdxml.3 @@@ -1,67 -1,0 +1,67 @@@ +.\"- +.\" Copyright (c) 2002 Poul-Henning Kamp +.\" 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. +.\"/ - .Dd April 27, 2026 ++.Dd May 13, 2026 +.Dt LIBBSDXML 3 +.Os +.Sh NAME +.Nm libbsdxml +.Nd eXpat XML parser library +.Sh SYNOPSIS +.In bsdxml.h +.Sh DESCRIPTION +The +.Nm - library is a verbatim copy of the eXpat XML library version 2.8.0. ++library is a verbatim copy of the eXpat XML library version 2.8.1. +.Pp +The +.Nm +library is intended to be used within the +.Fx +base system only. +Use of the +.Nm +library for other purposes is not supported and discouraged. +.Pp +To avoid version and autoconfiguration issues, the library has been +renamed to +.Nm +rather than retain the original eXpat library and include file names +to prevent confusion and autoconfiguration issues for 3rd party +software. +.Sh SEE ALSO +For full documentation, please see the eXpat webpage at +.Pa http://www.libexpat.org/ . +.Sh AUTHORS +.An -nosplit +The original eXpat was written by +.An James Clark Aq Mt jjc@jclark.com . +.Pp +Subsequently eXpat maintenance and development been taken up by a group +of people under the leadership of +.An Fred Drake Aq Mt fdrake@acm.com , +.An Paul Prescod , +and +.An Clark Cooper . From nobody Wed May 13 04:31: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 4gFgXT1xH7z6cjGN for ; Wed, 13 May 2026 04:31: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 4gFgXT1C7Vz3wSK for ; Wed, 13 May 2026 04:31:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778646713; 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=yyl/CtarHrtJnk5eBJF4RrMqiJEkaHm6Pf7aqx6sL3I=; b=MbdqSEjOt3etnoH4+se/Ftxn69/5jKtApZAKD9oe/ekCeNHIb6m2HLZBvFmR5hpcNnau1c zaGlOEFyo2YfkQ2NrPEUSjOMSWPXNaeHJVzPyrR3U4lf4Y55AzRxifMTLG34N4S0sigoQX RJXj/EwbHUiyXqP69pX/71kv/dZw+MELhZMbugzns56SVrWe8H77pfo6kmdLIQxtJmrJ9T HudxOQLvmquxjtTnqwn/tF5mMmHiVDjANWgFSJoXtWUdYTnWGQj/xU2nUrbuWz9g8PZ2Xo RzXIZGNvxJNpRZJSydC2cCKxksHt3VVdsElymmx/BzRTIA1Yo1ZkV5AQ++EjvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778646713; a=rsa-sha256; cv=none; b=Jhqs/bXJeQUBjPvSl4+LQRM1T8Fsx1kB9uEl6KoMnZ0sJxYKwSlP0b+3vv8/1nxa+s0FUf UwgQGnPVOYhb9Fay0K4Y6ZiV9YJEoJne5fjIG26hVZTH++qCN9FTdzM5oUISng59LF1bUg TjdSXM809f0X8/dliNpXP4PncjHYak0qd5jxfxFV5WKDB41WJuLbsdItUYlpTTp1FyTKxA rK36u/1/SzqUlVyJMtZEVP0wkFlESAwiYP6SKFKDCUluaGhYO8jKbzybiNBKE51zk+ZNjX x2JvXCDvkurz0uLf7K/5dbUaKwLqBXMXXZ0THym08yrs/vG3GVJJmwFcOKurjA== 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=1778646713; 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=yyl/CtarHrtJnk5eBJF4RrMqiJEkaHm6Pf7aqx6sL3I=; b=sqMn5IBsma7T4vO5s/iCtLnhnQOCmEFL74TVJt+GKUj4qPlrForNEkgBa36lB7G1HPrKn3 mFKO+hHWGoGHgkisYnjaGlbu5PmTAjkPqFeYFYu1Wb1sxShHsl3YYklPcDTWm/Qy18seD+ GQ+qFBAAzZEaBrQGiv+dUAnoNYaoRBk+HHYNZH3/By5UsCTN5yHzQ2KzKfTz9VebaWqW4e FLpMmHJyTU34EEgSQS4cO7hnlbRjyZ1QkTd+YHFxPHgoq/TL0DO9Vsd4s2+AKp4RBjoIGt c8r/XvWnpcCKITxUKyeKb2eryBHsIhKdTCb/ZzhpA+x0/yoMayAEtYW4gO77ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFgXT0gtBzbkb for ; Wed, 13 May 2026 04:31:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41498 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 04:31:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: 1729d2f741a1 - main - Merge bmake-20260508 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: 1729d2f741a12a42c61ed5308ee156a0d1cd1918 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 04:31:48 +0000 Message-Id: <6a03feb4.41498.1110fe88@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=1729d2f741a12a42c61ed5308ee156a0d1cd1918 commit 1729d2f741a12a42c61ed5308ee156a0d1cd1918 Merge: 9cc9b8b37284 ef402bba8426 Author: Simon J. Gerraty AuthorDate: 2026-05-13 04:24:08 +0000 Commit: Simon J. Gerraty CommitDate: 2026-05-13 04:26:44 +0000 Merge bmake-20260508 Merge commit 'ef402bba84260816d3e8d6e2439b0bc7eddc9446' contrib/bmake/ChangeLog | 16 ++++++++++++++++ contrib/bmake/Makefile.config.in | 1 + contrib/bmake/VERSION | 2 +- contrib/bmake/arch.c | 16 ++++++++-------- contrib/bmake/bmake.1 | 6 +++--- contrib/bmake/bmake.cat1 | 22 ++++++++++++---------- contrib/bmake/cond.c | 12 +++++------- contrib/bmake/configure | 35 +++++++++++++++++++++++++---------- contrib/bmake/configure.in | 21 ++++++++++++++++++--- contrib/bmake/dir.c | 8 ++++---- contrib/bmake/for.c | 14 +++++++------- contrib/bmake/job.c | 11 +++++------ contrib/bmake/main.c | 6 +++--- contrib/bmake/make-bootstrap.sh.in | 4 +++- contrib/bmake/make.1 | 6 +++--- contrib/bmake/make.c | 13 ++++++------- contrib/bmake/make.h | 14 +++++++------- contrib/bmake/meta.c | 8 +++----- contrib/bmake/mk/ChangeLog | 26 ++++++++++++++++++++++++++ contrib/bmake/mk/dirdeps.mk | 23 ++++++++++++++--------- contrib/bmake/mk/gendirdeps.mk | 8 ++++---- contrib/bmake/mk/install-mk | 4 ++-- contrib/bmake/mk/lib.mk | 4 ++-- contrib/bmake/mk/meta.sys.mk | 8 ++++++-- contrib/bmake/mk/sys.dependfile.mk | 4 ++-- contrib/bmake/mk/sys.dirdeps.mk | 5 +++-- contrib/bmake/mk/sys.mk | 10 ++++++++-- contrib/bmake/mk/sys.vars.mk | 4 ++-- contrib/bmake/parse.c | 6 +++--- contrib/bmake/var.c | 13 ++++++------- usr.bin/bmake/Makefile.config | 3 ++- usr.bin/bmake/config.h | 4 ++-- 32 files changed, 212 insertions(+), 125 deletions(-) diff --cc usr.bin/bmake/Makefile.config index 5ba662b3145e,000000000000..17005c8109db mode 100644,000000..100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@@ -1,28 -1,0 +1,29 @@@ +# This is a generated file, do NOT edit! +# See contrib/bmake/bsd.after-import.mk +# + +SRCTOP?= ${.CURDIR:H:H} + +# things set by configure + - _MAKE_VERSION?=20260313 ++_MAKE_VERSION?=20260508 + +prefix?= /usr +srcdir= ${SRCTOP}/contrib/bmake +CC?= cc +MAKE_OS?= +DEFAULT_SYS_PATH?= .../share/mk:/usr/share/mk ++MAKE_SAVE_DOLLARS_DEFAULT?= no + +EGREP= egrep +CPPFLAGS+= +CFLAGS+= ${CPPFLAGS} -DHAVE_CONFIG_H +LDFLAGS+= +LIBOBJS+= ${LIBOBJDIR}stresep$U.o +LDADD+= +USE_META?= yes +USE_FILEMON?= dev +FILEMON_H?= /usr/include/dev/filemon/filemon.h +BMAKE_PATH_MAX?= 1024 +# used if MAXPATHLEN not defined +CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX} diff --cc usr.bin/bmake/config.h index fecfc2be4adb,000000000000..4e4b7c9da809 mode 100644,000000..100644 --- a/usr.bin/bmake/config.h +++ b/usr.bin/bmake/config.h @@@ -1,449 -1,0 +1,449 @@@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Path of default shell */ +/* #undef DEFSHELL_CUSTOM */ + +/* Shell spec to use by default */ +/* #undef DEFSHELL_INDEX */ + +/* Path of default shell */ +/* #undef DEFSHELL_PATH */ + +/* Define to 1 if you have the header file. */ +#define HAVE_AR_H 1 + +/* Define to 1 if you have the declaration of 'sys_siglist', and to 0 if you + don't. */ +#define HAVE_DECL_SYS_SIGLIST 1 + +/* Define to 1 if you have the header file, and it defines 'DIR'. + */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the 'dirname' function. */ +#define HAVE_DIRNAME 1 + +/* Define to 1 if you don't have 'vprintf' but do have '_doprnt.' */ +/* #undef HAVE_DOPRNT */ + +/* Define to 1 if you have the 'err' function. */ +#define HAVE_ERR 1 + +/* Define to 1 if you have the 'errx' function. */ +#define HAVE_ERRX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERR_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the 'fork' function. */ +#define HAVE_FORK 1 + +/* Define to 1 if you have the 'getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the 'getenv' function. */ +#define HAVE_GETENV 1 + +/* Define to 1 if you have the 'getopt' function. */ +#define HAVE_GETOPT 1 + +/* Define to 1 if you have the 'getwd' function. */ +#define HAVE_GETWD 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the 'killpg' function. */ +#define HAVE_KILLPG 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIBGEN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if the system has the type 'long long int'. */ +#define HAVE_LONG_LONG_INT 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MINIX_CONFIG_H */ + +/* Define to 1 if you have the header file, and it defines 'DIR'. */ +/* #undef HAVE_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_PATHS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_POLL_H 1 + +/* Define to 1 if you have the 'putenv' function. */ +#define HAVE_PUTENV 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_RANLIB_H 1 + +/* Define to 1 if you have the 'realpath' function. */ +#define HAVE_REALPATH 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_REGEX_H 1 + +/* Define to 1 if you have the 'select' function. */ +#define HAVE_SELECT 1 + +/* Define to 1 if you have the 'setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the 'setpgid' function. */ +#define HAVE_SETPGID 1 + +/* Define to 1 if you have the 'setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if you have the 'setsid' function. */ +#define HAVE_SETSID 1 + +/* Define to 1 if you have the 'sigaction' function. */ +#define HAVE_SIGACTION 1 + +/* Define to 1 if you have the 'sigaddset' function. */ +#define HAVE_SIGADDSET 1 + +/* Define to 1 if you have the 'sigpending' function. */ +#define HAVE_SIGPENDING 1 + +/* Define to 1 if you have the 'sigprocmask' function. */ +#define HAVE_SIGPROCMASK 1 + +/* Define to 1 if you have the 'sigsetmask' function. */ +#define HAVE_SIGSETMASK 1 + +/* Define to 1 if you have the 'sigsuspend' function. */ +#define HAVE_SIGSUSPEND 1 + +/* Define to 1 if you have the 'sigvec' function. */ +#define HAVE_SIGVEC 1 + +/* Define to 1 if the system has the type 'sig_atomic_t'. */ +#define HAVE_SIG_ATOMIC_T 1 + +/* Define to 1 if you have the 'snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* 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 'strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the 'stresep' function. */ +/* #undef HAVE_STRESEP */ + +/* Define to 1 if you have the 'strftime' function. */ +#define HAVE_STRFTIME 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 'strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* Define to 1 if you have the 'strsep' function. */ +#define HAVE_STRSEP 1 + +/* Define to 1 if you have the 'strtod' function. */ +#define HAVE_STRTOD 1 + +/* Define to 1 if you have the 'strtol' function. */ +#define HAVE_STRTOL 1 + +/* Define to 1 if you have the 'strtoll' function. */ +#define HAVE_STRTOLL 1 + +/* Define to 1 if you have the 'strtoul' function. */ +#define HAVE_STRTOUL 1 + +/* Define to 1 if you have the 'sysctl' function. */ +#define HAVE_SYSCTL 1 + +/* Define to 1 if you have the header file, and it defines 'DIR'. + */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the header file, and it defines 'DIR'. + */ +/* #undef HAVE_SYS_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* 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_SYSCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UIO_H 1 + +/* Define to 1 if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the 'unsetenv' function. */ +#define HAVE_UNSETENV 1 + +/* Define to 1 if the system has the type 'unsigned long long int'. */ +#define HAVE_UNSIGNED_LONG_LONG_INT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UTIME_H 1 + +/* Define to 1 if you have the 'vfork' function. */ +#define HAVE_VFORK 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VFORK_H */ + +/* Define to 1 if you have the 'vprintf' function. */ +#define HAVE_VPRINTF 1 + +/* Define to 1 if you have the 'vsnprintf' function. */ +#define HAVE_VSNPRINTF 1 + +/* Define to 1 if you have the 'wait3' function. */ +#define HAVE_WAIT3 1 + +/* Define to 1 if you have the 'wait4' function. */ +#define HAVE_WAIT4 1 + +/* Define to 1 if you have the 'waitpid' function. */ +#define HAVE_WAITPID 1 + +/* Define to 1 if you have the 'warn' function. */ +#define HAVE_WARN 1 + +/* Define to 1 if you have the 'warnx' function. */ +#define HAVE_WARNX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 + +/* Define to 1 if 'fork' works. */ +#define HAVE_WORKING_FORK 1 + +/* Define to 1 if 'vfork' works. */ +#define HAVE_WORKING_VFORK 1 + +/* define if your compiler has __attribute__ */ +#define HAVE___ATTRIBUTE__ 1 + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "sjg@NetBSD.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "bmake" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "bmake 20251111" ++#define PACKAGE_STRING "bmake 20260406" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "bmake" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "20251111" ++#define PACKAGE_VERSION "20260406" + +/* Define to 1 if the 'S_IS*' macros in do not work properly. */ +/* #undef STAT_MACROS_BROKEN */ + +/* Define to 1 if all of the C89 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define STDC_HEADERS 1 + +/* Define to 1 if your declares 'struct tm'. */ +/* #undef TM_IN_SYS_TIME */ + +/* Enable extensions on AIX, Interix, z/OS. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# define _DARWIN_C_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# define _HPUX_ALT_XOPEN_SOCKET_API 1 +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +/* # undef _MINIX */ +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# define _NETBSD_SOURCE 1 +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# define _OPENBSD_SOURCE 1 +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +/* # undef _POSIX_SOURCE */ +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +/* # undef _POSIX_1_SOURCE */ +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# define __STDC_WANT_IEC_60559_BFP_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# define __STDC_WANT_IEC_60559_DFP_EXT__ 1 +#endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# define __STDC_WANT_IEC_60559_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1 +#endif +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# define __STDC_WANT_LIB_EXT2__ 1 +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# define __STDC_WANT_MATH_SPEC_FUNCS__ 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +/* # undef _XOPEN_SOURCE */ +#endif + + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif + +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT32_T */ + +/* C99 function name */ +/* #undef __func__ */ + +/* Define to empty if 'const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to '__inline__' or '__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to the type of a signed integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +/* #undef int64_t */ + +/* Define to 'int' if does not define. */ +/* #undef mode_t */ + +/* Define to 'long int' if does not define. */ +/* #undef off_t */ + +/* Define as a signed integer type capable of holding a process identifier. */ +/* #undef pid_t */ + +/* type that signal handlers can safely frob */ +/* #undef sig_atomic_t */ + +/* Define as 'unsigned int' if doesn't define. */ +/* #undef size_t */ + +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint32_t */ + +/* Define as 'fork' if 'vfork' does not work. */ +/* #undef vfork */ From nobody Wed May 13 11:26: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 4gFrkx1KnNz6dF5F for ; Wed, 13 May 2026 11:26: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 4gFrkw5x9fz3ZGk for ; Wed, 13 May 2026 11:26:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778671592; 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=5I3NOXC8XL68RKdET1nWduse8nArF9yxz4k2/POW5YM=; b=arQDJCsME8yz3oYvl87deAU6ox7TlNhvGxK/WIOg+wQd8wdi2JdaOpLwwL8feWp3Qujqef pCuGbK1UFk/nY/i4AN3SQWyUMTOg4Ne84j4e2S6YZgVFavYQUkTI3J1zv6AYMjsGypjYZ7 RCxqgDgEhptsOJmYlNOXdx3XMuWBHHCCp95xOosbpm8TIPDU4nUjXkkq/P3TVW1hYUzvMy QT3lFsMfFBQLc11sFhNlh/otRcvPGfpWQn+Y6wGXlZv65uWsoMucJRHieaiLjZ92CqkMbS eLUNJkNTYm1uVvghVg+r3jdy1/BqVpAZTDaU4fXXxo1cyMYaqRlGthJx8E/weQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778671592; a=rsa-sha256; cv=none; b=vT4Z1RAY6S+rdSaEDEl44C6x2W8BQdrLo+6qSXvfl0mvJBC/1EWMdUWifx6ETXEdHGRqJk RrRIbQIJSQvhtjMvNIAE0pTlsCsyoPV6K31qFb61v6fZ+7zeDhMVuW4Ikvu/gQE+VsvKwG Xr8dXbutHgAYKXSl5bby/4rcl7cC6mkoPyMBp2od54NPrR+aQFasZ6lQxDBozjQVXEaDr3 JFbsWX3lZaH91Mta0RSl8ZoR6jzhwIfsBqALqWG0ZjobaCiWjLWKEOesv1IECgQuLs4/I4 52Ame34ttB7Xhh3L4FQ49z8uzCXUxUjGPgYzdqxqoakexR/PHklJ6c5ivqVeng== 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=1778671592; 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=5I3NOXC8XL68RKdET1nWduse8nArF9yxz4k2/POW5YM=; b=hCk/SzAgSu7D45MBPdloFb+D4JSivamRAA2RdP6N2bMSwLfI7XddiSeQO3iqUOFcI4Sk6b DXSNKKNFXMeefrMgy8xbvbNoNfE6ldrM+SR4DoK5sW15XlNrJu8TqXyLwn4PGpxgJ+fFMp wLOXCfmOoFNrKov1LOT6pvCkMaqc24VbsT/Ti6copsMnlP3/ewfBr/UXL5jQ7pwhTwBkZJ E2LQIPIAPQYANoCqKjzHBy91eEgiZZ/ZTVyrh0fVW8DOpabFH8kMU+KxojSSeda4jI4RN6 Gy3YdfWwnM9gMvlUbe6zgDaN0QRcQx+XEqfK0fe/BtazRcVlGeWV1u+OpImVvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFrkw5Gv3zpYl for ; Wed, 13 May 2026 11:26:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43d94 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 11:26:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 188631e43a1a - main - rtnetlink: Check for allocation failure in nlattr_get_multipath() 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: 188631e43a1a5d2985156141c2e244a925670683 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 11:26:32 +0000 Message-Id: <6a045fe8.43d94.6e31bd14@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=188631e43a1a5d2985156141c2e244a925670683 commit 188631e43a1a5d2985156141c2e244a925670683 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-05-11 19:53:21 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-13 09:44:19 +0000 rtnetlink: Check for allocation failure in nlattr_get_multipath() Check for alloction failure on `npt_alloc()` for RTA_MULTIPATH attributes in `nlattr_get_multipath()`. Also, add tests for maximum number of rtnexthop in rtnetlink. Reported by: Joshua Rogers of AISLE Research Team Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56954 --- sys/netlink/route/rt.c | 4 +++ tests/sys/netlink/test_rtnl_route.c | 55 +++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index cb2d737f34e3..4d7b0a3e1fa3 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -470,6 +470,10 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, max_nhops = data_len / sizeof(struct rtnexthop); mp = npt_alloc(npt, (max_nhops + 2) * sizeof(struct rta_mpath_nh)); + if (mp == NULL) { + NLMSG_REPORT_ERR_MSG(npt, "%s: too many RTA_MULTIPATH", __func__); + return (ENOMEM); + } mp->num_nhops = 0; for (rtnh = (struct rtnexthop *)(nla + 1); data_len > 0; ) { diff --git a/tests/sys/netlink/test_rtnl_route.c b/tests/sys/netlink/test_rtnl_route.c index 84d73db11cc7..334d1fea9fe9 100644 --- a/tests/sys/netlink/test_rtnl_route.c +++ b/tests/sys/netlink/test_rtnl_route.c @@ -18,6 +18,7 @@ #include #include +#include #include #include @@ -310,12 +311,66 @@ ATF_TC_BODY(rtnl_nhgrp_expire, tc) cleanup_route_by_dst(&ss, &nw, "203.0.113.0"); } +ATF_TC(rtnl_nhgrp_big_nhops); +ATF_TC_HEAD(rtnl_nhgrp_big_nhops, tc) +{ + atf_tc_set_md_var(tc, "descr", "test RTA_MULTIPATH with too many nhops using netlink"); + atf_tc_set_md_var(tc, "require.user", "root"); + atf_tc_set_md_var(tc, "require.kmods", "netlink"); +} + +ATF_TC_BODY(rtnl_nhgrp_big_nhops, tc) +{ + struct snl_state ss; + struct snl_writer nw; + struct nlmsghdr *hdr, *rx_hdr; + struct in_addr gw; + struct snl_errmsg_data e = {}; + struct snl_parsed_route r = { .rtax_weight = RT_DEFAULT_WEIGHT }; + struct rtmsg *rtm; + struct rtnexthop *rtnh; + int nhop, max_nhop, off, off2; + + max_nhop = 25; + ATF_REQUIRE_MSG(snl_init(&ss, NETLINK_ROUTE), "snl_init() failed"); + + inet_pton(AF_INET, "127.0.2.1", &gw); + + /* create new multipath route */ + snl_init_writer(&ss, &nw); + ATF_REQUIRE((hdr = snl_create_msg_request(&nw, RTM_NEWROUTE)) != NULL); + hdr->nlmsg_flags |= NLM_F_CREATE; + ATF_REQUIRE((rtm = prepare_rtm_by_dst(&nw, "203.0.113.0")) != NULL); + + off = snl_add_msg_attr_nested(&nw, RTA_MULTIPATH); + for (nhop = 0; nhop < max_nhop; nhop++) { + off2 = snl_get_msg_offset(&nw); + rtnh = snl_reserve_msg_object(&nw, struct rtnexthop); + rtnh->rtnh_flags = 0; + rtnh->rtnh_hops = nhop + 1; + rtnh->rtnh_ifindex = 0; + snl_add_msg_attr_ip4(&nw, RTA_GATEWAY, &gw); + rtnh = snl_restore_msg_offset(&nw, off2, struct rtnexthop); + rtnh->rtnh_len = snl_get_msg_offset(&nw) - off2; + } + snl_end_attr_nested(&nw, off); + + ATF_REQUIRE((hdr = snl_finalize_msg(&nw)) != NULL); + ATF_REQUIRE(snl_send_message(&ss, hdr)); + ATF_REQUIRE((rx_hdr = snl_read_reply(&ss, hdr->nlmsg_seq)) != NULL); + ATF_REQUIRE(snl_parse_errmsg(&ss, rx_hdr, &e)); + ATF_REQUIRE_INTEQ(e.error, ENOMEM); + + cleanup_route_by_dst(&ss, &nw, "203.0.113.0"); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, rtnl_nhgrp); ATF_TP_ADD_TC(tp, rtnl_nhgrp_expire); ATF_TP_ADD_TC(tp, rtnl_nhop_merge); + ATF_TP_ADD_TC(tp, rtnl_nhgrp_big_nhops); return (atf_no_error()); } From nobody Wed May 13 11:26:33 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 4gFrky1QKGz6dDZg for ; Wed, 13 May 2026 11:26: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 4gFrkx54Rcz3ZPM for ; Wed, 13 May 2026 11:26:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778671593; 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=MbYL3xQ57cZnjqC7wJ9sDrCscgCq6PZL0Z8liGAng9A=; b=aJ1oV19BuYnuFAnL7DVAOxRxc2xRPmaUBonkg/PrGLLhHNjfT3BfxOX10yifn4ynpImmip DlQWRntKZAzJTUs4SolAOQlMQnOlKJTgBS6VoaDd6nXV46OswqH+IoSCD/F/grjGjpSXm3 40smZT6MGhJhAK3BZDBT7iw3jcxr3NzexgeSaddNs/88QS6fq77mt3nO2fJ4sWDVsoXnTF ldmN2+FBYAyeo7rR4NYbLMvKA5C4Crz7F9wvI8iny1ExMopEiqvJYa0Pag9/1zFc85J+Ma WwI2kPMWb2Gnyn06vTx/DdfyjsZ8Z3eC3d5Tqg7nHvtBnmXRs2jUp2ri7fo0gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778671593; a=rsa-sha256; cv=none; b=yFcbj5kBrjc91Fa3pgUK58BuHM+x6twpZdWp+MxGkLYkLheRRNei0cq3Ikc7452Lzkq44Q e4j5q4pG1qhYrulXw3Ns27/d7nR1HSUWebXOHgrlY0t/ZZqMX/FXyyneEEZ04/kBs/g1mt 3UifJOMN5EjW8GnY7+1qgu1wfC8o2oT+NdAtZg1ruBVimOV0vAsMuGD11SU3z7Hi+1Ux4Y hxse9Jbb1O5nCuZeVg0bZsZbBpcmR0Q/+6Mqe+j4yGpnksuSOZy8lQ5tMQVr983xgUMNF2 pA3wV5JWFO92iakcM5ZVgoYfain6bt912baqdEB6S83j0ItvbzYOS2IIIVo0pQ== 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=1778671593; 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=MbYL3xQ57cZnjqC7wJ9sDrCscgCq6PZL0Z8liGAng9A=; b=GUj1rGJUfSYFCHfou590w5fl3tllSTEuAslLelu6RXm2uniljRkXHp21F1O8A4HGMmUPPL VkU18XPhSsFw8Dd3h6YL+sM07ScoYKThi6es2TYIYJjucOJ18I1NKG0cgqFVkQJjFt6mLy voc6aJsEIqX6BbHVDIvn/txVSbs5wXAysMGm+BtUpKjV17759XsXrLd1VEMUUxgTYNmArX T4uP+Qz0foTh6u9uaBNAuQVnnyzz1ZqlxGOxM9Z1dTIN+dj80j6kbAy044xBwvz2L0okvW pK0kSO4L8AjZ8U9l35ewZRjrRFP8KUlns7E5FGh8n+Wb2j0R7+C5m3HM1WNtaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFrkx496JzpJ4 for ; Wed, 13 May 2026 11:26:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43907 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 11:26:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 4329663a861e - main - rtnetlink: Align RTA_MULTIPATH length validation in nlattr_get 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: 4329663a861ef74796b79b6b0872cfe10d31c591 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 11:26:33 +0000 Message-Id: <6a045fe9.43907.49e26815@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=4329663a861ef74796b79b6b0872cfe10d31c591 commit 4329663a861ef74796b79b6b0872cfe10d31c591 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-05-12 11:34:28 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-13 09:44:28 +0000 rtnetlink: Align RTA_MULTIPATH length validation in nlattr_get Fix length validation of RTA_MULTIPATH attributes in nlattr_get_multipath() by making sure the user request is align. PR: 295102 Reported by: Robert Morris Reviewed by: markj Fixes: 7e5bf68495cc ("netlink: add netlink support") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56963 --- sys/netlink/route/rt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 4d7b0a3e1fa3..dfc501e11299 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -479,8 +479,9 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, for (rtnh = (struct rtnexthop *)(nla + 1); data_len > 0; ) { struct rta_mpath_nh *mpnh; + len = NL_ITEM_ALIGN(rtnh->rtnh_len); if (__predict_false(rtnh->rtnh_len <= sizeof(*rtnh) || - rtnh->rtnh_len > data_len)) { + len < rtnh->rtnh_len || len > data_len)) { NLMSG_REPORT_ERR_MSG(npt, "%s: bad length %u", __func__, rtnh->rtnh_len); return (EINVAL); @@ -494,7 +495,6 @@ nlattr_get_multipath(struct nlattr *nla, struct nl_pstate *npt, mp->num_nhops - 1); return (error); } - len = NL_ITEM_ALIGN(rtnh->rtnh_len); data_len -= len; rtnh = (struct rtnexthop *)((char *)rtnh + len); } From nobody Wed May 13 11:56: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 4gFsPz49bsz6dHKk for ; Wed, 13 May 2026 11:56: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 4gFsPz3YzWz3psd for ; Wed, 13 May 2026 11:56:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778673415; 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=nwmVawtIieAvC9ekV7+jYwunabZV2QtQenMOHU0irVI=; b=by+yUcnSqCV7M0s02TPrK3h31Lcju5V6OeyGE52lAXFUUzngtMzgpiy1HTckAF6XHDCOFu Tm/hryOcd5rKZY5QLJ2TIbi4Wp45UfVGh0dh13yk+0mvvg7bF+5qPxkvWZcLQM9ylSZKfc ctHoxzVHTsoPh61VhBBM/x3jbqkoLruPqrNHo+Owbu5jXRAB5Z0Uaai+0e6Mx2Cz6f1POt NTK6TkVspsI8li0RvupKcoxMGYjHA1nb0CkZfjTbPRO4gb/5vdJiwWFV9BUQ8nAOEaHqzW R3iqnYeLWNo7YJB2TAVfNlgVosuxeHrXSgRLwuocNrBkNfaHFweqiaAedEeGSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778673415; a=rsa-sha256; cv=none; b=TD+BE+qmwvM/ZRajSXe+njq1ieG+R/wykmR3Oj12r+p0ULvweOO2x/VL+dz9tlkOGN7t1C cD5fYa06UPrs2ZBT1StyzqkTzLulA6zgpRZ6nVATS5QozIMP80qUnAt0VLnDYg0Mavenw7 EDXUTaEE5gek1njm9aznn8/6tuzr7zWAbEpr+O71z8dfIEjbz4nuQK5+/w3HHDStZDYgWs HfuwmZjtnhz7xja+tMfxV5wFaHY+Tj3oKUoFakmoRB9rIS1/xPQSvTsbggLiXeo9ZN01rI JsC8e9cxJxLr6I3yGkIkdhn/M7dNnsz5Q0W83/T5VqJXkE0gw2ml7EM4q1QQMw== 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=1778673415; 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=nwmVawtIieAvC9ekV7+jYwunabZV2QtQenMOHU0irVI=; b=aL/hfloi2juyPM5xGhv0dZcjaU4tOO1MJC3fgSMkZ3LRFeqljkKRGLID1lqZAetq23cYxR ZSOA8BIs0z/sNB+QUFXcWl1sWdcRoVE/gfVp1GBciuo4fII6w6/L4F3E3TSjloVQVcP1hc 1sxRPYvwSChFSAM62FNZpZPVmTaFfqNIIf4BIDn5dD4PcTRbjx6TNePq8VA3bY7gSeg3Px qrt4k6mQxNSBtM6gfTu0nwP4y4pJWEWh5Ujvy8HWymPcBsLC5i5Ia1/yopP4uodZWbMGHJ M82k88qTRN0Onv4olq7AiOM2kfZWfzXJ4frfWef+dbm9oJGNnWgH0yl6pbsUTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFsPz2vcqzpdR for ; Wed, 13 May 2026 11:56:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46877 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 11:56:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: d649825e8348 - main - power: Power device and ioctl for state transitions 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: d649825e83482f796f492f2000b20ce1b5db6f63 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 11:56:55 +0000 Message-Id: <6a046707.46877.4d9fa1a9@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=d649825e83482f796f492f2000b20ce1b5db6f63 commit d649825e83482f796f492f2000b20ce1b5db6f63 Author: Aymeric Wibo AuthorDate: 2026-05-10 09:04:32 +0000 Commit: Aymeric Wibo CommitDate: 2026-05-13 11:55:48 +0000 power: Power device and ioctl for state transitions Create new /dev/power node with super simple ioctl for initiating sleep state transitions. This is meant as a generic interface to replace the ACPI- and APM-specific interfaces. This allows for non-ACPI states to be entered, such as suspend-to-idle when setting kern.power.suspend=suspend_to_idle. Reviewed by: markj, olce Approved by: markj, olce Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55508 --- sys/dev/acpi_support/acpi_ibm.c | 2 +- sys/dev/syscons/syscons.c | 4 +-- sys/dev/vt/vt_core.c | 4 +-- sys/kern/subr_power.c | 59 ++++++++++++++++++++++++++++++++++++++--- sys/sys/power.h | 31 ++++++++++++++-------- 5 files changed, 81 insertions(+), 19 deletions(-) diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c index 2967832a0878..693d793532c1 100644 --- a/sys/dev/acpi_support/acpi_ibm.c +++ b/sys/dev/acpi_support/acpi_ibm.c @@ -1453,7 +1453,7 @@ acpi_ibm_eventhandler(struct acpi_ibm_softc *sc, int arg) * instead of suspend-to-RAM. */ case IBM_EVENT_SUSPEND_TO_RAM: - power_pm_suspend(POWER_TRANSITION_SUSPEND); + (void)power_pm_suspend(POWER_TRANSITION_SUSPEND); break; case IBM_EVENT_BLUETOOTH: diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index fe440b68f209..9167da23efd8 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -3987,10 +3987,10 @@ next_code: break; case SUSP: - power_pm_suspend(POWER_TRANSITION_SUSPEND); + (void)power_pm_suspend(POWER_TRANSITION_SUSPEND); break; case STBY: - power_pm_suspend(POWER_TRANSITION_STANDBY); + (void)power_pm_suspend(POWER_TRANSITION_STANDBY); break; case DBG: diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index 641f6c014937..db54cb426844 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -804,11 +804,11 @@ vt_machine_kbdevent(struct vt_device *vd, int c) return (1); case SPCLKEY | STBY: /* XXX Not present in kbdcontrol parser. */ /* Put machine into Stand-By mode. */ - power_pm_suspend(POWER_TRANSITION_STANDBY); + (void)power_pm_suspend(POWER_TRANSITION_STANDBY); return (1); case SPCLKEY | SUSP: /* kbdmap(5) keyword `susp`. */ /* Suspend machine. */ - power_pm_suspend(POWER_TRANSITION_SUSPEND); + (void)power_pm_suspend(POWER_TRANSITION_SUSPEND); return (1); } diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c index 47682a0ee75e..ffd91db83e96 100644 --- a/sys/kern/subr_power.c +++ b/sys/kern/subr_power.c @@ -31,7 +31,10 @@ */ #include +#include #include +#include +#include #include #include #include @@ -49,6 +52,54 @@ static void *power_pm_arg = NULL; static bool power_pm_supported[POWER_STYPE_COUNT] = {0}; static struct task power_pm_task; +static d_ioctl_t power_ioctl; + +static struct cdevsw power_cdevsw = { + .d_version = D_VERSION, + .d_ioctl = power_ioctl, + .d_name = "power", +}; + +static void +power_init(void *unused) +{ + struct make_dev_args args; + struct cdev *dev; + + make_dev_args_init(&args); + args.mda_devsw = &power_cdevsw; + args.mda_uid = UID_ROOT; + args.mda_gid = GID_OPERATOR; + args.mda_mode = 0660; + if (make_dev_s(&args, &dev, "power") != 0) + printf("Failed to create power device"); +} +SYSINIT(powerdev, SI_SUB_PSEUDO, SI_ORDER_ANY, power_init, NULL); + +static int +power_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, + struct thread *td) +{ + int err = 0; + uint32_t trans; + + if ((fflag & FWRITE) == 0) + return (EPERM); + + switch (cmd) { + case PIOTRANSITION: + trans = *(uint32_t *)data; + /* Check for overflow */ + if ((enum power_transition)trans != trans) + return (EINVAL); + err = power_pm_suspend((enum power_transition)trans); + break; + default: + err = EINVAL; + } + return (err); +} + enum power_stype power_name_to_stype(const char *name) { @@ -175,13 +226,13 @@ power_pm_get_type(void) return (power_pm_type); } -void +int power_pm_suspend(enum power_transition trans) { enum power_stype stype; if (power_pm_fn == NULL) - return; + return (ENXIO); switch (trans) { case POWER_TRANSITION_STANDBY: @@ -196,11 +247,13 @@ power_pm_suspend(enum power_transition trans) default: printf("%s: unknown sleep state transition %d\n", __func__, trans); - return; + return (EINVAL); } power_pm_task.ta_context = (void *)(intptr_t)stype; taskqueue_enqueue(taskqueue_thread, &power_pm_task); + + return (0); } /* diff --git a/sys/sys/power.h b/sys/sys/power.h index e420717e1aa7..a1497d1a6524 100644 --- a/sys/sys/power.h +++ b/sys/sys/power.h @@ -3,7 +3,7 @@ * * Copyright (c) 2001 Mitsuru IWASAKI * All rights reserved. - * Copyright (c) 2025 The FreeBSD Foundation + * Copyright (c) 2025-2026 The FreeBSD Foundation * * Portions of this software were developed by Aymeric Wibo * under sponsorship from the FreeBSD Foundation. @@ -32,17 +32,9 @@ #ifndef _SYS_POWER_H_ #define _SYS_POWER_H_ -#ifdef _KERNEL -#include #include - -/* Power management system type */ -#define POWER_PM_TYPE_ACPI 0x01 -#define POWER_PM_TYPE_NONE 0xff - -/* Commands for Power management function */ -#define POWER_CMD_SUSPEND 0x00 +#include /* * Sleep state transition requests. @@ -55,8 +47,25 @@ enum power_transition { POWER_TRANSITION_STANDBY, POWER_TRANSITION_SUSPEND, POWER_TRANSITION_HIBERNATE, + POWER_TRANSITION_COUNT, }; +/* + * Power ioctls. + */ +#define PIOTRANSITION _IOW('T', 1, uint32_t) + +#ifdef _KERNEL + +#include + +/* Power management system type */ +#define POWER_PM_TYPE_ACPI 0x01 +#define POWER_PM_TYPE_NONE 0xff + +/* Commands for Power management function */ +#define POWER_CMD_SUSPEND 0x00 + /* * Sleep type. * @@ -97,7 +106,7 @@ extern int power_pm_register(u_int _pm_type, power_pm_fn_t _pm_fn, void *_pm_arg, bool _pm_supported[static POWER_STYPE_COUNT]); extern u_int power_pm_get_type(void); -extern void power_pm_suspend(enum power_transition _trans); +extern int power_pm_suspend(enum power_transition _trans); /* * System power API. From nobody Wed May 13 12:39: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 4gFtMC5tDhz6dLCG for ; Wed, 13 May 2026 12:39: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 4gFtMC3WNkz3vJq for ; Wed, 13 May 2026 12:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675975; 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=eYhZhJ78SLSArMzTGfU+YqHQY+9NIrv15vl6PrEyAbc=; b=ssg8QKODiuBlfKfM7KHdLxRf8qoIcd80GyPBeNuIvWwc/Gfc3y45CCU+gyr77r09/ouvKm G2RSn3UhaAray6lZPdTS1YCGzGMX5RyowLa7HkGydP1XDlZjBtm0hSQTVGHEqBbbRiOs7h rPNqb73r5P0GYyeIf1hYYn5QrK5uYz17iQe7sVwnK4Dyit2LUDniPZiA6rpklDT3oHJK5z 2CFuxxk5riGaAXUwncoXuKb51TDfTvRY59IyZomytx94rJntTRycnSR/3Tm6Q42504oebg Vrv+2nES6nKiugQ9ZV2ED48k6tKMjnE+CMuOkBFsUOzaNq8mGuqZrkGMeY68kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675975; a=rsa-sha256; cv=none; b=SRTDrzceDoxOtF3F0QtJ2m8I4k8Mkem5L26+qnK/a6Sg1HUTwG8fZ2hnhqUYjuSC1a9J5F CfvBfTvN3wb/+j6qj3G64Axf81yO5h/Afnt3/gxlRDyPodna3UwVSojsV0Ie6V/B90WRsw ThvzEBknPbgKy50PXIAF4pCIG1GcEhx2DK8U9vJop202U1W2xFPpn8T42Fmvu7TfCiWO5q G2IH+DJf+D18cxjuSnpICrEhHkVSug9ZiV1pv+r3czsZWpVC9smygu5dKdBrH9R7mklJv8 jc9SnEtM+0pHimg5uGHi9Nx2YKMIa507oUAPNTOSl/ShKc5NLDnozbR/dbIm+Q== 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=1778675975; 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=eYhZhJ78SLSArMzTGfU+YqHQY+9NIrv15vl6PrEyAbc=; b=JpnqwjgIGQKMxdg8EfAMraS+ERsRKtxBZVLR0db1DeJAOL+5aEaUWnY60QE1Kxa3LbC8YX kIT12/fwylFBZT8E+yXF+nom0vN+zBAreYA+5m3XGdpKcCxlnsq9YhfavTDx+iV9OTu3QF TeOgniW7rMENsa/LVlPPRsGHFMqqgNxnsAUHoE3niT0V41z2SXXzSOc7uUcaFZ97LSA7Qi +ViVuVSZAwdjj0Wpo0CxZ2JT1kHbQDDtai4A+jTAOV4LMT727nkZPn+tClIgbhcX+9Harm CXZAqBcNO81eb9PNoM6sVQJBSXzN6Bn637f1xU0KVz0WxpnUn/c0rCFaDd+qag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMC2s7Dzr9M for ; Wed, 13 May 2026 12:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19dae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: a652d9763059 - main - acpi_spmc(4): Fix comments on constraints storage 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a652d97630599c089a722d4cb881e2731c5336a8 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:35 +0000 Message-Id: <6a047107.19dae.672f43a2@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a652d97630599c089a722d4cb881e2731c5336a8 commit a652d97630599c089a722d4cb881e2731c5336a8 Author: Olivier Certner AuthorDate: 2026-05-04 11:38:58 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:13 +0000 acpi_spmc(4): Fix comments on constraints storage The fields themselves are not unused, we actually fill them, but once filled we indeed do not use their values (yet). See the '#ifdef notyet' section in acpi_spmc_check_constraints(). No functional change. Reviewed by: emaste, obiwac, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56798 --- sys/dev/acpica/acpi_spmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 03944800327d..d8fa5617c8bf 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -150,11 +150,11 @@ struct acpi_spmc_constraint { int min_d_state; ACPI_HANDLE handle; - /* Unused, spec only. */ + /* Intel only. Currently filled but unused. */ uint64_t lpi_uid; uint64_t min_dev_specific_state; - /* Unused, AMD only. */ + /* AMD only. Currently filled but unused. */ uint64_t function_states; }; From nobody Wed May 13 12:39: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 4gFtMD6f7lz6dKlC for ; Wed, 13 May 2026 12:39: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 4gFtMD41Zlz3vbB for ; Wed, 13 May 2026 12:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675976; 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=X4pjMafmaVeSqkQbpwVySNoMd1Mc2vvGjGYgy4ICC4I=; b=iLqorsOs3os2L77SO9enWtH47jy1g/sOopfrnZjR3vrLx2lsIExDooZnXH502tFlLWKloZ QmGc8PjXvIGdTn6xh1w0a5j2gt3h4ti2T4erVy3FxJWRUGtK1S9MkkFDaYEtY+kMaGprn1 0hRblp6knAMTUx1In9tEhtZHlxLpjnU519+cdOguJTJ83nazLZfr1w4IagNnANlSG7MQbO DdDKuLpWyyeQK11y3k15OIS1U9hFEEbLwQqInduvkziJkyAvgV302GDEa8GESITaHPYw8o Djnb+1vBGlYy5cEUbxgEa4MBr8aiX6nZGazeCtQ6bzKEQ5o4580p+sSV7f7KGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675976; a=rsa-sha256; cv=none; b=U36Zg+NGFfBPrpD6y/+Qut9mPhilFdD/3/2uLPmx7MoJFYygP6aHzsPa4d3mQrzT8XRDhO PDA0GeUmF3DuVF0FcS1zlo0VXgqk9zpEzNE5mDJ3Rv2xbP93yF2UmSJzl+yUQBxxpR+ZdL UXOv2QYIWt/k5Zqd+AU2WFesCuJKPQGYxBhhu+sBxM9nR7GABMaJIJu0u2n0HHHcoqMJTG n4I258BlZJccgxziY/I0+lGjO5QJW/H3bKB6BvcjmUpeNYLmTedvcCwA5kaZagTEKyYfn0 gjK/UVAzH2K+cf5NQJiyNzLY54p0upbF5svep/Ixmk/gHaz2TVcyaVbVWjCd/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=1778675976; 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=X4pjMafmaVeSqkQbpwVySNoMd1Mc2vvGjGYgy4ICC4I=; b=kTVMA6Ma5ZByRsIG1iycVewD16JO0UTRU6TNofq3LDwRwUwpajOHjzKfWv75eI+wlbJlbJ scUhXHWQ/bxkqMBjEaR0op2yGRhNZs8YgyjTmFc6yNpdCh0/I99e7psGu8MNzGl2hNhh62 dOejXGXRZDQqNU3rTHz8ZvNBSE+6EkoeXippuG7/FrH6yzy2Ch+8KelaQfMxNlog+wGOFU fYniRTIeBkkfZznX2IGIWm03TZT/K+J8qijRhxvrfjkvBuwbqhKSNaQJbGhe/SD4wkvDhX z4+PibWl4nMcGI9a1xL/L6pfSbMS4mHUjsIkELVtRPHI3J4WOhDc0tB4xOHixQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMD2pGZzqyG for ; Wed, 13 May 2026 12:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 195e9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: beca41dfb55f - main - acpi_spmc(4): Remove XXX from a comment about retrieving constraints 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: beca41dfb55f0b83612fe8a2aec508944c4b2138 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:36 +0000 Message-Id: <6a047108.195e9.25848f99@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=beca41dfb55f0b83612fe8a2aec508944c4b2138 commit beca41dfb55f0b83612fe8a2aec508944c4b2138 Author: Olivier Certner AuthorDate: 2026-05-04 11:56:52 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:18 +0000 acpi_spmc(4): Remove XXX from a comment about retrieving constraints There is really nothing we can do about a DSM function that works on first call but fails on subsequent calls, except calling it only once, which we already do. While here, soften the comment message, as failure was observed with some specific machines only. No functional change. Reviewed by: emaste, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56799 --- sys/dev/acpica/acpi_spmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index d8fa5617c8bf..36a2c20e6be8 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -451,7 +451,7 @@ acpi_spmc_get_constraints(device_t dev) dsm_index.regular = DSM_GET_DEVICE_CONSTRAINTS; } - /* XXX It seems like this DSM fails if called more than once. */ + /* It seems like this DSM can fail if called more than once. */ status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm_set->uuid, dsm_set->revision, dsm_index.i, NULL, &result, ACPI_TYPE_PACKAGE); From nobody Wed May 13 12:39: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 4gFtMF5tM9z6dL3G for ; Wed, 13 May 2026 12:39:37 +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 4gFtMF49Q2z3vVQ for ; Wed, 13 May 2026 12:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675977; 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=tQtx/NJTZCG8NM0U1xppqORrafD59KLVJtIijnIB4K8=; b=Xe0rE6EzEYqe06Zn00LgS50JH6bzHVY0Z65Ll4mvO+W2BAnIRvYaP3qoAMlgDrukqHPm3i SMkmZyUMtM1U3fosw+w0EhoHlzpj9EN3DwQIh2QhwmDBKkTTSnWn/GN1eEzch0qo0ozXgX +4OzH01ugbyH7WWQQNh1pAz/UCcd/jULaiPA+2IlxwhHIlQdOecLSwG5zQS3y5cN9uFPED oXI1XTYx4kyYWyeIsTFCnKLwlGaYh2cdmFnesxk2LQbUuvw9WdHjjjIt/ytvFOToBuQGrk CQihs9f/GgzRaD9slP0hkOaewP4NyEd+RFNSDfw7oq60UdlQcicRz3nkZO9gUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675977; a=rsa-sha256; cv=none; b=WAh7vB5norLA9F3zhIeaktwYg6nq2N5vQczirN4oS1/bB7BFNcboyA+kIiFQp5X4aEtwEU DYqOCRxLMnxvF8Bd551uamA2myGiWDuQKCnxsVXjMHyIQ/1HHdfvDIxXbcHkW+XDNCtcTU 4c/XOnDu2ogx+qWOpJqkC94KdRJeZmTWyzBfvMHdx4LEqTGWV5pfHv8a62Sv/R4V6QAk/i vQKMEibcOfWbogWITdGGGs6qbYuztuUKzyrbKed9zBDz0ARneGZFfWv1C4g0j+kzducZSX UdP3dSd9izoWXfe71tsH049mcGLVwnBrq29alextW3fkY0wj5TkqRiYk6TwNsA== 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=1778675977; 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=tQtx/NJTZCG8NM0U1xppqORrafD59KLVJtIijnIB4K8=; b=Im6sqRLdGdoGfNCaCan/19/+VXPCQYZd3gatyiFsgfgNrT9Jy32HWRvXbPYl0ksilQdC42 4CkvhpdKKEpNl5cktCd2XQRbutrq5UM6fsdWd0EU1o1mmiyirGFnqVKpgZ4/sPkOTgyB9Z KHQaZyyGrmlHXV3W9PzLrDq3Aac1vh17G5JOXZSncHbGfHAKTwmShnX68SFqqMUd5d1avh 5SIcYBKT5mnwhyY/wjJZBozgyx1PbcCJNEwcmGiolqgIyWb00ec/kVlzUA0+DW8xV/5Os/ TvKypSgCmKjQVNOLCpDEIMNIaG2BiZJeu0EY5acU6ll4HONnB4T1QD1R2knxDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMF3bXRzr21 for ; Wed, 13 May 2026 12:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bd18 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 704b96509d3c - main - acpi_spmc(4): Constraints: Rename the Intel-format parser 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 704b96509d3c720be382f13d3d020b40acc21e31 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:37 +0000 Message-Id: <6a047109.1bd18.1ee2c15@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=704b96509d3c720be382f13d3d020b40acc21e31 commit 704b96509d3c720be382f13d3d020b40acc21e31 Author: Olivier Certner AuthorDate: 2026-05-04 12:57:05 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:19 +0000 acpi_spmc(4): Constraints: Rename the Intel-format parser ...from acpi_spmc_get_constraints_spec() to acpi_spmc_get_constraints_intel(), as really there is no ACPI specification proper and parsing the constraints is done according to some *Intel* specification (even if it is true that, by contrast, AMD has none). No functional change (intended). Reviewed by: obiwac, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56800 --- sys/dev/acpica/acpi_spmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 36a2c20e6be8..b13e78b8000b 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -301,7 +301,7 @@ acpi_spmc_free_constraints(struct acpi_spmc_softc *sc) } static int -acpi_spmc_get_constraints_spec(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) +acpi_spmc_get_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) { struct acpi_spmc_constraint *constraint; int revision; @@ -465,7 +465,7 @@ acpi_spmc_get_constraints(device_t dev) if (is_amd) rv = acpi_spmc_get_constraints_amd(sc, object); else - rv = acpi_spmc_get_constraints_spec(sc, object); + rv = acpi_spmc_get_constraints_intel(sc, object); AcpiOsFree(object); if (rv != 0) return (rv); From nobody Wed May 13 12:39: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 4gFtMG6H8lz6dL9G for ; Wed, 13 May 2026 12:39: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 4gFtMG4p5Yz3vS8 for ; Wed, 13 May 2026 12:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675978; 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=dbUHUuJaLELGZ7j7wniwGfVNiol2bzqkTxEAADKqtLY=; b=K/Aatu9oQnvWZNgyDdBniFomgem0G7r9RzyhJ32EjQh+QJvXlKpo/fDwOzNdXnl1kcEtrq kIti03fDrKhLmmvx9XYP7bHW5ZAC+lucEpQXJ95Wjkf9noh9PwI6K+2vwU8Jxz6peu6BZ4 RniOOqerLk1taxIqoHZy5FK7XnyAfVOhQX+yedL4E4IacIpqPT4/2zaHKE79TF0V0g0yBX taU1B4BA7g6p1DedNRNw864mJBo1RfBRL/hmhO2kRu60PWf2PFbaNndR9nVQzl39Iiqjcb /R1oXoHV1Vi4ZJYOMuWL0RHSviQUeFeGoS8TeMg8VugeRRR9FIk8saBA2IOozA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675978; a=rsa-sha256; cv=none; b=NJ96AYSfaon4mIYBYB0qthukNW3EI6VLd3/s9soR0+Zm+jiAnHMIr8Ec4kw2C2J8QndMmw BhGs9cDoz5l88IVfck2QyUHzo14wKNSzjSHpZEjELIFQdr97PWB3IIdfmIAXvsDtnk3ksv dRgMURugjOedOs7DEbvPV8d/i47+CjSHOhUt6eQUsoKaUBFpSh50kBD04wlGZiHhoB70ip KHC+qF/hO5v54qqbBabsrLdAAnDHaqC23T0/5hs/ntwqZQiQ+riFXvhW9UbuSiwRcUiyCR fIVImvvxOevpVWKm2l1/5rVB3O5+9U4prKgvqHEkiEN6yz+CP580m1Dc2ZanqQ== 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=1778675978; 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=dbUHUuJaLELGZ7j7wniwGfVNiol2bzqkTxEAADKqtLY=; b=SIOOtoIJm2B4HoMYGA3TX+cqJ5rFVGt/jhD10sDQeRdFgNSdyehvpH2U7UoXr/rpLGYCit ENRp5uI9Q1/GXNgu7UKvdPk0dSeEqhIAycOxteoT39QXeYkuSyNt1lAtfJz7bRZnliNdma wcG5DgpEOoI4eQXaX8QhdI95du9JRmC2L7HA+qqzkdbqZPdb6wjqB68UONcrDL0SDnzfyx XxCjFhD0ADgwmej5EH193zato0MteEv0vJCnWBhWxrkfWGLaZi8ZWVZKB6KlJ+iBth7pXI dKjh46J0FI/6azmGOUohFfN9DFglhfA3Wafs8knykc3VFEDGid753bZi9TKqzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMG4Nb7zr6J for ; Wed, 13 May 2026 12:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 195ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: a648c45c9dc1 - main - acpi_spmc(4): Factor out code to test for a DSM's presence 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a648c45c9dc13de0457ea51d1ebd333b06ccff8e Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:38 +0000 Message-Id: <6a04710a.195ed.44ed3b8@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a648c45c9dc13de0457ea51d1ebd333b06ccff8e commit a648c45c9dc13de0457ea51d1ebd333b06ccff8e Author: Olivier Certner AuthorDate: 2026-05-04 13:16:08 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:19 +0000 acpi_spmc(4): Factor out code to test for a DSM's presence ...through a new function has_dsm(), which slightly simplifies reading. No functional change (intended). Reviewed by: obiwac, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56801 --- sys/dev/acpica/acpi_spmc.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index b13e78b8000b..478887660e16 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -172,6 +172,12 @@ struct acpi_spmc_softc { struct acpi_spmc_constraint *constraints; }; +static bool +has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_set_bit) +{ + return ((sc->dsm_sets & dsm_set_bit) != 0); +} + static void acpi_spmc_check_dsm_set(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, struct dsm_set *dsm_set); static int acpi_spmc_get_constraints(device_t dev); @@ -442,7 +448,7 @@ acpi_spmc_get_constraints(device_t dev) return (0); /* The Microsoft DSM set doesn't have this DSM. */ - is_amd = (sc->dsm_sets & DSM_SET_AMD) != 0; + is_amd = has_dsm(sc, DSM_SET_AMD); if (is_amd) { dsm_set = &amd_dsm_set; dsm_index.amd = AMD_DSM_GET_DEVICE_CONSTRAINTS; @@ -562,11 +568,11 @@ acpi_spmc_display_off_notif(device_t dev) { struct acpi_spmc_softc *sc = device_get_softc(dev); - if ((sc->dsm_sets & DSM_SET_INTEL) != 0) + if (has_dsm(sc, DSM_SET_INTEL)) acpi_spmc_run_dsm(dev, &intel_dsm_set, DSM_DISPLAY_OFF_NOTIF); - if ((sc->dsm_sets & DSM_SET_MS) != 0) + if (has_dsm(sc, DSM_SET_MS)) acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_DISPLAY_OFF_NOTIF); - if ((sc->dsm_sets & DSM_SET_AMD) != 0) + if (has_dsm(sc, DSM_SET_AMD)) acpi_spmc_run_dsm(dev, &amd_dsm_set, AMD_DSM_DISPLAY_OFF_NOTIF); } @@ -575,11 +581,11 @@ acpi_spmc_display_on_notif(device_t dev) { struct acpi_spmc_softc *sc = device_get_softc(dev); - if ((sc->dsm_sets & DSM_SET_INTEL) != 0) + if (has_dsm(sc, DSM_SET_INTEL)) acpi_spmc_run_dsm(dev, &intel_dsm_set, DSM_DISPLAY_ON_NOTIF); - if ((sc->dsm_sets & DSM_SET_MS) != 0) + if (has_dsm(sc, DSM_SET_MS)) acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_DISPLAY_ON_NOTIF); - if ((sc->dsm_sets & DSM_SET_AMD) != 0) + if (has_dsm(sc, DSM_SET_AMD)) acpi_spmc_run_dsm(dev, &amd_dsm_set, AMD_DSM_DISPLAY_ON_NOTIF); } @@ -590,13 +596,13 @@ acpi_spmc_entry_notif(device_t dev) acpi_spmc_check_constraints(sc); - if ((sc->dsm_sets & DSM_SET_AMD) != 0) + if (has_dsm(sc, DSM_SET_AMD)) acpi_spmc_run_dsm(dev, &amd_dsm_set, AMD_DSM_ENTRY_NOTIF); - if ((sc->dsm_sets & DSM_SET_MS) != 0) { + if (has_dsm(sc, DSM_SET_MS)) { acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_MODERN_ENTRY_NOTIF); acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_ENTRY_NOTIF); } - if ((sc->dsm_sets & DSM_SET_INTEL) != 0) + if (has_dsm(sc, DSM_SET_INTEL)) acpi_spmc_run_dsm(dev, &intel_dsm_set, DSM_ENTRY_NOTIF); } @@ -605,11 +611,11 @@ acpi_spmc_exit_notif(device_t dev) { struct acpi_spmc_softc *sc = device_get_softc(dev); - if ((sc->dsm_sets & DSM_SET_INTEL) != 0) + if (has_dsm(sc, DSM_SET_INTEL)) acpi_spmc_run_dsm(dev, &intel_dsm_set, DSM_EXIT_NOTIF); - if ((sc->dsm_sets & DSM_SET_AMD) != 0) + if (has_dsm(sc, DSM_SET_AMD)) acpi_spmc_run_dsm(dev, &amd_dsm_set, AMD_DSM_EXIT_NOTIF); - if ((sc->dsm_sets & DSM_SET_MS) != 0) { + if (has_dsm(sc, DSM_SET_MS)) { acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_EXIT_NOTIF); if (ms_dsm_set.dsms_supported & (1 << DSM_MODERN_TURN_ON_DISPLAY)) From nobody Wed May 13 12:39: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 4gFtMJ2HVFz6dKnY for ; Wed, 13 May 2026 12:39: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 4gFtMH70PFz3vbP for ; Wed, 13 May 2026 12:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675980; 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=O6ULrsUoYFiEyd+d7ZkOY4LNjvmkukUeZw5huJ/HUa0=; b=gEfsGzwUOavpIwNC1Pzuyu8Yw78TSWzf9xB2nZJhSVrIHbdpV7+DbEy05gu+BwAX9x7tvs 2Hk/y195PhlunJkTaJWHvN7h/tb1qT/DLCqojwjEZg9Uh6e5iuSbFk3pABJHYQWW759jun 07P/7hE9kzBWZ/CLYNEPtmUmLbZpulojQAQvcc1tIKXI+NR3KNH8LCN2Zc8HeDUCw9Hgxy 8U3xNCSblIyW+4cWSdc8m8qsifPEsms13r+UdNGeG9uvsGJu1xEmAdIbPgJTYYLlDZUKtx r6HXl5pUlUaW7ePWuCAq6vj+Iu814hiMTPrl2n5+MjBcsztPSpXLmpdK78Wgmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675979; a=rsa-sha256; cv=none; b=ntPiQVxjURk3X9Q+OMS0t2CvS3GIhp0jaoHot6LVV1TDbsmFh5HaoZ0fSEKuCg3yKVQMQi kneUch9uJFhh5M8F1kDzhyIRCxJSP70qGzq75azAOZxzcnrSUEEUmMNhzANhcn6XXuk6XV XFwfZYo6Vnc1NdChliWGQnEgSnPzJ+kERBXY5r8DfuDLaUIeb5nB7yNSNSm4lWmo/8HbEw CcKmu6ohTUMsPEzf/9RzGORzArwBoPxtqhSLmxoOi/OoJTWN00cNbeSQiCYjpktkPjfziX SYKUV7srvRTg/ZKPzwjh8ffG5Rk+6nJ+3ve116hsqioIK+GshM91hOVWhobfrA== 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=1778675979; 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=O6ULrsUoYFiEyd+d7ZkOY4LNjvmkukUeZw5huJ/HUa0=; b=tFR/wXQOXOoAZ1Bw/gwXvRH06lU6icPVmMH+kSN1uVjcxcm8Qqdje9+bwt7yismbXbF1V6 Aw90p+fzVc7CAQJuHhOT9mJGZwE0cuPKNh/su2LZtG0vNIo109FvkEbqCFkQ1xgdIVW0VM smVcbUnXUbNt/gFGo+fF7LEtgh88BlT+67uPFg3I5IJ7v8svk2VLw8Q+LjSiuW+zNedXpR 5Qv/lYAdtp19wOS5dv9IN7q/pwz3klqB0adja8Qd+X+m4P9+DG5DlMK9p0m37EOEuRaHN6 C+JHcOt7jkb7cm/07ROsTQZNNTpARQ13d5Dc6U+X3VtsDTkHCipW6c22/fhtGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMH5DPYzrDy for ; Wed, 13 May 2026 12:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 196d3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 27d99ff07908 - main - acpi_spmc(4): Clear confusion between DSMs and their 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27d99ff07908a0333774b4c364a798154ae9fa8c Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:39 +0000 Message-Id: <6a04710b.196d3.7de397fe@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=27d99ff07908a0333774b4c364a798154ae9fa8c commit 27d99ff07908a0333774b4c364a798154ae9fa8c Author: Olivier Certner AuthorDate: 2026-05-04 14:48:10 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:19 +0000 acpi_spmc(4): Clear confusion between DSMs and their functions Stick to the ACPI specification's terminology where DSM means "device specific method", but is in fact a set of multiple functions (actually, there is one set of functions per DSM revision, with the set for some revision in theory including those of the previous revisions), by renaming some of the fields of 'struct acpi_spmc_softc' and local variables accordingly. To this end, rename appropriate structures, fields, parameters and variables, mechanically. No functional change (intended). Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56802 --- sys/dev/acpica/acpi_spmc.c | 204 ++++++++++++++++++++++----------------------- 1 file changed, 102 insertions(+), 102 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 478887660e16..e7f658dbcad0 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -42,7 +42,7 @@ enum intel_dsm_index { DSM_DISPLAY_ON_NOTIF = 4, DSM_ENTRY_NOTIF = 5, DSM_EXIT_NOTIF = 6, - /* Only for Microsoft DSM set. */ + /* Only for Microsoft DSM. */ DSM_MODERN_ENTRY_NOTIF = 7, DSM_MODERN_EXIT_NOTIF = 8, DSM_MODERN_TURN_ON_DISPLAY = 9, @@ -57,24 +57,24 @@ enum amd_dsm_index { AMD_DSM_DISPLAY_ON_NOTIF = 5, }; -enum dsm_set_flags { - DSM_SET_INTEL = 1 << 0, - DSM_SET_MS = 1 << 1, - DSM_SET_AMD = 1 << 2, +enum dsm_flags { + DSM_INTEL = 1 << 0, + DSM_MS = 1 << 1, + DSM_AMD = 1 << 2, }; -struct dsm_set { - enum dsm_set_flags flag; +struct dsm_desc { + enum dsm_flags flag; const char *name; - int revision; - struct uuid uuid; - uint64_t dsms_supported; - uint64_t dsms_expected; - uint64_t extra_dsms; + int revision; + struct uuid uuid; + uint64_t supported_functions; + uint64_t expected_functions; + uint64_t extra_functions; }; -static struct dsm_set intel_dsm_set = { - .flag = DSM_SET_INTEL, +static struct dsm_desc dsm_intel = { + .flag = DSM_INTEL, .name = "Intel", /* * XXX Linux uses 1 for the revision on Intel DSMs, but doesn't explain @@ -89,32 +89,32 @@ static struct dsm_set intel_dsm_set = { 0xc4eb40a0, 0x6cd2, 0x11e2, 0xbc, 0xfd, {0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66}, }, - .dsms_expected = (1 << DSM_GET_DEVICE_CONSTRAINTS) | + .expected_functions = (1 << DSM_GET_DEVICE_CONSTRAINTS) | (1 << DSM_DISPLAY_OFF_NOTIF) | (1 << DSM_DISPLAY_ON_NOTIF) | (1 << DSM_ENTRY_NOTIF) | (1 << DSM_EXIT_NOTIF), }; SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, intel_dsm_revision, CTLFLAG_RW, - &intel_dsm_set.revision, 0, + &dsm_intel.revision, 0, "Revision to use when evaluating Intel SPMC DSMs"); -static struct dsm_set ms_dsm_set = { - .flag = DSM_SET_MS, +static struct dsm_desc dsm_ms = { + .flag = DSM_MS, .name = "Microsoft", .revision = 0, .uuid = { /* 11e00d56-ce64-47ce-837b-1f898f9aa461 */ 0x11e00d56, 0xce64, 0x47ce, 0x83, 0x7b, {0x1f, 0x89, 0x8f, 0x9a, 0xa4, 0x61}, }, - .dsms_expected = (1 << DSM_DISPLAY_OFF_NOTIF) | + .expected_functions = (1 << DSM_DISPLAY_OFF_NOTIF) | (1 << DSM_DISPLAY_ON_NOTIF) | (1 << DSM_ENTRY_NOTIF) | (1 << DSM_EXIT_NOTIF) | (1 << DSM_MODERN_ENTRY_NOTIF) | (1 << DSM_MODERN_EXIT_NOTIF), - .extra_dsms = (1 << DSM_MODERN_TURN_ON_DISPLAY), + .extra_functions = (1 << DSM_MODERN_TURN_ON_DISPLAY), }; -static struct dsm_set amd_dsm_set = { - .flag = DSM_SET_AMD, +static struct dsm_desc dsm_amd = { + .flag = DSM_AMD, .name = "AMD", /* * XXX Linux uses 0 for the revision on AMD DSMs, but at least on the @@ -130,13 +130,13 @@ static struct dsm_set amd_dsm_set = { 0xe3f32452, 0xfebc, 0x43ce, 0x90, 0x39, {0x93, 0x21, 0x22, 0xd3, 0x77, 0x21}, }, - .dsms_expected = (1 << AMD_DSM_GET_DEVICE_CONSTRAINTS) | + .expected_functions = (1 << AMD_DSM_GET_DEVICE_CONSTRAINTS) | (1 << AMD_DSM_ENTRY_NOTIF) | (1 << AMD_DSM_EXIT_NOTIF) | (1 << AMD_DSM_DISPLAY_OFF_NOTIF) | (1 << AMD_DSM_DISPLAY_ON_NOTIF), }; SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, amd_dsm_revision, CTLFLAG_RW, - &amd_dsm_set.revision, 0, "Revision to use when evaluating AMD SPMC DSMs"); + &dsm_amd.revision, 0, "Revision to use when evaluating AMD SPMC DSMs"); union dsm_index { int i; @@ -162,7 +162,7 @@ struct acpi_spmc_softc { device_t dev; ACPI_HANDLE handle; ACPI_OBJECT *obj; - enum dsm_set_flags dsm_sets; + enum dsm_flags dsms; struct eventhandler_entry *eh_suspend; struct eventhandler_entry *eh_resume; @@ -173,13 +173,13 @@ struct acpi_spmc_softc { }; static bool -has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_set_bit) +has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_bit) { - return ((sc->dsm_sets & dsm_set_bit) != 0); + return ((sc->dsms & dsm_bit) != 0); } -static void acpi_spmc_check_dsm_set(struct acpi_spmc_softc *sc, - ACPI_HANDLE handle, struct dsm_set *dsm_set); +static void acpi_spmc_check_dsm(struct acpi_spmc_softc *sc, + ACPI_HANDLE handle, struct dsm_desc *dsm); static int acpi_spmc_get_constraints(device_t dev); static void acpi_spmc_free_constraints(struct acpi_spmc_softc *sc); @@ -212,18 +212,18 @@ acpi_spmc_probe(device_t dev) sc = device_get_softc(dev); sc->dev = dev; - /* Check which sets of DSMs are supported. */ - sc->dsm_sets = 0; + /* Check which DSMs are supported. */ + sc->dsms = 0; - acpi_spmc_check_dsm_set(sc, handle, &intel_dsm_set); - acpi_spmc_check_dsm_set(sc, handle, &ms_dsm_set); - acpi_spmc_check_dsm_set(sc, handle, &amd_dsm_set); + acpi_spmc_check_dsm(sc, handle, &dsm_intel); + acpi_spmc_check_dsm(sc, handle, &dsm_ms); + acpi_spmc_check_dsm(sc, handle, &dsm_amd); - if (sc->dsm_sets == 0) + if (sc->dsms == 0) return (ENXIO); - device_set_descf(dev, "System Power Management Controller " - "(DSM sets 0x%x)", sc->dsm_sets); + device_set_descf(dev, "System Power Management Controller (DSMs 0x%x)", + sc->dsms); return (0); } @@ -265,34 +265,34 @@ acpi_spmc_detach(device_t dev) } static void -acpi_spmc_check_dsm_set(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, - struct dsm_set *dsm_set) +acpi_spmc_check_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, + struct dsm_desc *dsm) { - uint64_t dsms_supported = acpi_DSMQuery(handle, - (uint8_t *)&dsm_set->uuid, dsm_set->revision); - const uint64_t min_dsms = dsm_set->dsms_expected; - const uint64_t max_dsms = min_dsms | dsm_set->extra_dsms; + uint64_t supported_functions = acpi_DSMQuery(handle, + (uint8_t *)&dsm->uuid, dsm->revision); + const uint64_t min_dsms = dsm->expected_functions; + const uint64_t max_dsms = min_dsms | dsm->extra_functions; /* - * Check if DSM set supported at all. We do this by checking the - * existence of "enum functions". + * Check if DSM supported at all. We do this by checking the existence + * of "enum functions". */ - if ((dsms_supported & 1) == 0) + if ((supported_functions & 1) == 0) return; - dsms_supported &= ~1; - dsm_set->dsms_supported = dsms_supported; - sc->dsm_sets |= dsm_set->flag; - - if ((dsms_supported & min_dsms) != min_dsms) - device_printf(sc->dev, "DSM set %s does not support expected " - "DSMs (%#" PRIx64 " vs %#" PRIx64 "). " - "Some methods may fail.\n", - dsm_set->name, dsms_supported, min_dsms); - - if ((dsms_supported & ~max_dsms) != 0) - device_printf(sc->dev, "DSM set %s supports more DSMs than " - "expected (%#" PRIx64 " vs %#" PRIx64 ").\n", dsm_set->name, - dsms_supported, max_dsms); + supported_functions &= ~1; + dsm->supported_functions = supported_functions; + sc->dsms |= dsm->flag; + + if ((supported_functions & min_dsms) != min_dsms) + device_printf(sc->dev, "DSM %s does not support expected " + "functions (%#" PRIx64 " vs %#" PRIx64 "). " + "Some may fail.\n", + dsm->name, supported_functions, min_dsms); + + if ((supported_functions & ~max_dsms) != 0) + device_printf(sc->dev, "DSM %s supports more functions than " + "expected (%#" PRIx64 " vs %#" PRIx64 ").\n", dsm->name, + supported_functions, max_dsms); } static void @@ -435,7 +435,7 @@ acpi_spmc_get_constraints(device_t dev) { struct acpi_spmc_softc *sc; union dsm_index dsm_index; - struct dsm_set *dsm_set; + struct dsm_desc *dsm; ACPI_STATUS status; ACPI_BUFFER result; ACPI_OBJECT *object; @@ -447,23 +447,23 @@ acpi_spmc_get_constraints(device_t dev) if (sc->constraints_populated) return (0); - /* The Microsoft DSM set doesn't have this DSM. */ - is_amd = has_dsm(sc, DSM_SET_AMD); + /* The Microsoft DSM doesn't have this function. */ + is_amd = has_dsm(sc, DSM_AMD); if (is_amd) { - dsm_set = &amd_dsm_set; + dsm = &dsm_amd; dsm_index.amd = AMD_DSM_GET_DEVICE_CONSTRAINTS; } else { - dsm_set = &intel_dsm_set; + dsm = &dsm_intel; dsm_index.regular = DSM_GET_DEVICE_CONSTRAINTS; } /* It seems like this DSM can fail if called more than once. */ - status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm_set->uuid, - dsm_set->revision, dsm_index.i, NULL, &result, + status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm->uuid, + dsm->revision, dsm_index.i, NULL, &result, ACPI_TYPE_PACKAGE); if (ACPI_FAILURE(status)) { device_printf(dev, "%s failed to call %s DSM %d (rev %d)\n", - __func__, dsm_set->name, dsm_index.i, dsm_set->revision); + __func__, dsm->name, dsm_index.i, dsm->revision); return (ENXIO); } @@ -536,7 +536,7 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) } static void -acpi_spmc_run_dsm(device_t dev, struct dsm_set *dsm_set, int index) +acpi_spmc_run_dsm(device_t dev, struct dsm_desc *dsm, int function_index) { struct acpi_spmc_softc *sc; ACPI_STATUS status; @@ -544,12 +544,12 @@ acpi_spmc_run_dsm(device_t dev, struct dsm_set *dsm_set, int index) sc = device_get_softc(dev); - status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm_set->uuid, - dsm_set->revision, index, NULL, &result, ACPI_TYPE_ANY); + status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm->uuid, + dsm->revision, function_index, NULL, &result, ACPI_TYPE_ANY); if (ACPI_FAILURE(status)) { device_printf(dev, "%s failed to call %s DSM %d (rev %d)\n", - __func__, dsm_set->name, index, dsm_set->revision); + __func__, dsm->name, function_index, dsm->revision); return; } @@ -557,9 +557,9 @@ acpi_spmc_run_dsm(device_t dev, struct dsm_set *dsm_set, int index) } /* - * Try running the DSMs from all the DSM sets we have, as them failing costs us + * Try running the functions from all the DSMs we have, as them failing costs us * nothing, and it seems like on AMD platforms, both the AMD entry and Microsoft - * "modern" DSM's are required for it to enter modern standby. + * "modern" functions are required for it to enter modern standby. * * This is what Linux does too. */ @@ -568,12 +568,12 @@ acpi_spmc_display_off_notif(device_t dev) { struct acpi_spmc_softc *sc = device_get_softc(dev); - if (has_dsm(sc, DSM_SET_INTEL)) - acpi_spmc_run_dsm(dev, &intel_dsm_set, DSM_DISPLAY_OFF_NOTIF); - if (has_dsm(sc, DSM_SET_MS)) - acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_DISPLAY_OFF_NOTIF); - if (has_dsm(sc, DSM_SET_AMD)) - acpi_spmc_run_dsm(dev, &amd_dsm_set, AMD_DSM_DISPLAY_OFF_NOTIF); + if (has_dsm(sc, DSM_INTEL)) + acpi_spmc_run_dsm(dev, &dsm_intel, DSM_DISPLAY_OFF_NOTIF); + if (has_dsm(sc, DSM_MS)) + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_DISPLAY_OFF_NOTIF); + if (has_dsm(sc, DSM_AMD)) + acpi_spmc_run_dsm(dev, &dsm_amd, AMD_DSM_DISPLAY_OFF_NOTIF); } static void @@ -581,12 +581,12 @@ acpi_spmc_display_on_notif(device_t dev) { struct acpi_spmc_softc *sc = device_get_softc(dev); - if (has_dsm(sc, DSM_SET_INTEL)) - acpi_spmc_run_dsm(dev, &intel_dsm_set, DSM_DISPLAY_ON_NOTIF); - if (has_dsm(sc, DSM_SET_MS)) - acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_DISPLAY_ON_NOTIF); - if (has_dsm(sc, DSM_SET_AMD)) - acpi_spmc_run_dsm(dev, &amd_dsm_set, AMD_DSM_DISPLAY_ON_NOTIF); + if (has_dsm(sc, DSM_INTEL)) + acpi_spmc_run_dsm(dev, &dsm_intel, DSM_DISPLAY_ON_NOTIF); + if (has_dsm(sc, DSM_MS)) + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_DISPLAY_ON_NOTIF); + if (has_dsm(sc, DSM_AMD)) + acpi_spmc_run_dsm(dev, &dsm_amd, AMD_DSM_DISPLAY_ON_NOTIF); } static void @@ -596,14 +596,14 @@ acpi_spmc_entry_notif(device_t dev) acpi_spmc_check_constraints(sc); - if (has_dsm(sc, DSM_SET_AMD)) - acpi_spmc_run_dsm(dev, &amd_dsm_set, AMD_DSM_ENTRY_NOTIF); - if (has_dsm(sc, DSM_SET_MS)) { - acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_MODERN_ENTRY_NOTIF); - acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_ENTRY_NOTIF); + if (has_dsm(sc, DSM_AMD)) + acpi_spmc_run_dsm(dev, &dsm_amd, AMD_DSM_ENTRY_NOTIF); + if (has_dsm(sc, DSM_MS)) { + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MODERN_ENTRY_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_ENTRY_NOTIF); } - if (has_dsm(sc, DSM_SET_INTEL)) - acpi_spmc_run_dsm(dev, &intel_dsm_set, DSM_ENTRY_NOTIF); + if (has_dsm(sc, DSM_INTEL)) + acpi_spmc_run_dsm(dev, &dsm_intel, DSM_ENTRY_NOTIF); } static void @@ -611,17 +611,17 @@ acpi_spmc_exit_notif(device_t dev) { struct acpi_spmc_softc *sc = device_get_softc(dev); - if (has_dsm(sc, DSM_SET_INTEL)) - acpi_spmc_run_dsm(dev, &intel_dsm_set, DSM_EXIT_NOTIF); - if (has_dsm(sc, DSM_SET_AMD)) - acpi_spmc_run_dsm(dev, &amd_dsm_set, AMD_DSM_EXIT_NOTIF); - if (has_dsm(sc, DSM_SET_MS)) { - acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_EXIT_NOTIF); - if (ms_dsm_set.dsms_supported & + if (has_dsm(sc, DSM_INTEL)) + acpi_spmc_run_dsm(dev, &dsm_intel, DSM_EXIT_NOTIF); + if (has_dsm(sc, DSM_AMD)) + acpi_spmc_run_dsm(dev, &dsm_amd, AMD_DSM_EXIT_NOTIF); + if (has_dsm(sc, DSM_MS)) { + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_EXIT_NOTIF); + if (dsm_ms.supported_functions & (1 << DSM_MODERN_TURN_ON_DISPLAY)) - acpi_spmc_run_dsm(dev, &ms_dsm_set, + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MODERN_TURN_ON_DISPLAY); - acpi_spmc_run_dsm(dev, &ms_dsm_set, DSM_MODERN_EXIT_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MODERN_EXIT_NOTIF); } } From nobody Wed May 13 12:39: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 4gFtMK4DKSz6dLFV for ; Wed, 13 May 2026 12:39: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 4gFtMK00bQz3vkQ for ; Wed, 13 May 2026 12:39:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675981; 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=bEgMcNlp8wcLt9eOVDDiN2owflpWR61NVR2deRdUqmw=; b=GfwIAZG1gDd7QQsbSZ5szCVHBoqOAC88oHuSw9MH6nmWwGTdOE9YJoifolqf87Pno6x6hL qRh6cbpnws8qRfshqHPZq8KWlZByC/8r4C9gxpUBljEPPPFBemCTIuT1qUHowMBfyq6Ftj U4+PeRDrthYOR8unKV6+DrQc3krp+1TUBONbwYlfWrWqXXu6O+kMfesD0D6NiFjylWdvfp QZnlq1wqrT8zrOXQe/T+1hWb/XdKfFVi/QkU3z9cvvuQK3KxmzqZ4N9nI8gezdC0dG8upI EkOYYJF0dQr7+U0stnMn2EGsmaNCGHJsQCdYq9aSy3/nftnoOXhN2hYMfp8oBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675981; a=rsa-sha256; cv=none; b=jaDdiV6BWTgcCTnlDl11iXpzv4Mwxqaz1oYJg0XrAN0F/SQxplf6jbMkEdDx+8z6GFPWW2 s7/35i+WzhYHK88eFznu10fCYsmKykvn/5FJYwHrg8IMmlluCQxExHHF5+x1nVcdLjXXmx 9uEp2jdgE+hlKXaH+6i5fZq3FiRNmpMD1U9YSTsELiKD/+xecHA3ci3Ba2mwX+OiSji+D8 CGXdPLfEJ4RCouoTRrTl/sxKqKd/aBtIWpBtikTKHjAjs42rwO7FSKFZSgtKcjoQve0ZGT Idd/2NSITTr0iCD1evkSxc5Tj+O6I83UPy0pYQn5wVp1p0kzLoqakMMA41rgMA== 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=1778675981; 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=bEgMcNlp8wcLt9eOVDDiN2owflpWR61NVR2deRdUqmw=; b=wxxJAoLpaUeNtBTUp6h2CbBOEH07coLHEFXe2FD6207wez1GEaz4/Uw+giAyDGUEjnjycl la7KEp6SdO4/XEyranAluQ1pAzojRFPYWGAG04lq34QX0bKyDozLQvyzmtCr+/uJDFDJNX B/Fsq6wQWoO/cGr9j1Ls0PkU3L1kobkRfnibSH7GeIaVcXAvlVEBvH3Yuz5lOE6MGkDbFv sETbE+J472MndA2GpOmZM5jGOWctk8y8TTSvv0AvblbvxToiUXgv2Um9uOL2nrTCAWZ5ka VfEfMqDZ7p6itr5jOXD4AIQ/unqP69elkRerEREWda2J/+uLn4yTkMQjEsqrog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMJ61ZXzrTC for ; Wed, 13 May 2026 12:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1973a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: f77731ee95c1 - main - acpi_spmc(4): Introduce supports_function() 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f77731ee95c179cede7dec0e87bc8146a2c546bc Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:40 +0000 Message-Id: <6a04710c.1973a.14acb230@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f77731ee95c179cede7dec0e87bc8146a2c546bc commit f77731ee95c179cede7dec0e87bc8146a2c546bc Author: Olivier Certner AuthorDate: 2026-05-04 14:52:31 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:19 +0000 acpi_spmc(4): Introduce supports_function() For better readability and because this stance will be used in many more places in a subsequent commit. No functional change (intended). Reviewed by: imp (older version), obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56803 --- sys/dev/acpica/acpi_spmc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index e7f658dbcad0..a6b18767e91b 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -34,6 +34,9 @@ static char *spmc_ids[] = { NULL }; +/* Conversion of an index to a mask. */ +#define IDX_TO_BIT(idx) (1ull << (idx)) + enum intel_dsm_index { DSM_ENUM_FUNCTIONS = 0, DSM_GET_DEVICE_CONSTRAINTS = 1, @@ -172,6 +175,12 @@ struct acpi_spmc_softc { struct acpi_spmc_constraint *constraints; }; +static bool +supports_function(const struct dsm_desc *const dsm, const int function_index) +{ + return ((dsm->supported_functions & IDX_TO_BIT(function_index)) != 0); +} + static bool has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_bit) { @@ -617,8 +626,7 @@ acpi_spmc_exit_notif(device_t dev) acpi_spmc_run_dsm(dev, &dsm_amd, AMD_DSM_EXIT_NOTIF); if (has_dsm(sc, DSM_MS)) { acpi_spmc_run_dsm(dev, &dsm_ms, DSM_EXIT_NOTIF); - if (dsm_ms.supported_functions & - (1 << DSM_MODERN_TURN_ON_DISPLAY)) + if (supports_function(&dsm_ms, DSM_MODERN_TURN_ON_DISPLAY)) acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MODERN_TURN_ON_DISPLAY); acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MODERN_EXIT_NOTIF); From nobody Wed May 13 12:39: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 4gFtMM2lYFz6dL3L for ; Wed, 13 May 2026 12:39: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 4gFtMM13B9z3vSb for ; Wed, 13 May 2026 12:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675983; 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=uQ5vp5oKOZaSE/B0ATd7BWcUO7zIzunyL76FYC910DU=; b=NVW0PBw+48OCewdTa3YIWtkNz2fzW3Jkix/wapPqxy4UJFcLwASxzJjfvN5cYUGemhFtoS asFY8o7FQY+D34yNm/17ZJ8DogRYausO5RCREx4RkPEBWBjt1RNyrfXZX4rPEvb0gc1+DE t0GOd6BO0untZAq2g6iZWq8vGrb6kzoVoOIODTHiBL3+NISwT3flM2xF0A7C7XS+G9ItxA rBI+6B75RkglqWdQ3cXVkLiTScBKcflj/2WuleLmPDLJvbimVRwD5mN6kj2P6V3kGc48bk XPR9/DUbSwPQwCWhGA4nKM//zAr8sg+q+b9ZiWCtphvDC1tDLdVwwz8TbxGvCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675983; a=rsa-sha256; cv=none; b=cdmgzBJytvoyTYI7x2FOWrc4mswdmv0EWyd2G+X4UbQVFUncbCsDL0yohDTb0JdOSqVpJq FPftBYYrulA3oD90CtCE7Cnm7fu6xmtiaWTP3lVV/X+aS/f19IjtrQhtb4d6XDvjs+zq/b QAgxt4MUbwfPLUHrKZFqoQKx+BPEGBPYCp/oB+T+JmoqSZVdmhdfeI2P8XB1kRlPWWlEYt tPWfnqBPg/o0T+DfVC8yGdtIN4Xf2oGPp/Rs5Cg0vK6fj+ptG7Fp6ZDVyesL1e47PM/Gx1 SeJiMlUnYj6PBX2/qVI8lJOuwxck4Em8sWCmVf550YD6oQYTeZ9uSSWSQ5u2zQ== 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=1778675983; 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=uQ5vp5oKOZaSE/B0ATd7BWcUO7zIzunyL76FYC910DU=; b=YN/ehbhs+IizMoNRvimzy3UhmY0L1xDXq95ytkF8UXKJHpFZE/reMqa5UIMPhTtWu9TBJp EDHfvwx0eLLIwhwKh8doF4UgI9clDAZRw3o8XW3485nTHzebLqRImCaQ/57dOTQC4bnkZj Cuqw0DRaS9GnMp7hdWpnX9SHrHXdVygKxXobTm5tVqKlfJrZVCA7pjuZh1WWSIhZdqqIKH /0YFb9BeDDSCv6XsHHrCCtxG9dq9m1R7eSbGRQuEzxE5X2e2kC1mjrvmfOHsEK/QMEkCr4 ztQmEkNatX2UDjrIhGNwSHtOZBaN8DvB8qv2pG3CnQfKsPnOaqSIVvUlgHefFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMM0VTrzrTF for ; Wed, 13 May 2026 12:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1be1c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 3c2d2bcc6f5d - main - acpi_spmc(4): Factor out printing DSM call error, delineate function 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c2d2bcc6f5d6e7819f0675afb8464e525c87cb3 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:43 +0000 Message-Id: <6a04710f.1be1c.6ab03c7e@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=3c2d2bcc6f5d6e7819f0675afb8464e525c87cb3 commit 3c2d2bcc6f5d6e7819f0675afb8464e525c87cb3 Author: Olivier Certner AuthorDate: 2026-05-04 15:40:46 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:20 +0000 acpi_spmc(4): Factor out printing DSM call error, delineate function Introduce failed_to_call_dsm(), which prepends "function" before the function index for better clarity. For now, it prints the function number, as before, but will soon print a human-readable name. Reviewed by: imp (older version), obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56805 --- sys/dev/acpica/acpi_spmc.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 30be1b4a32e7..f5951a4809d5 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -186,6 +186,15 @@ has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_bit) return ((sc->dsms & dsm_bit) != 0); } +static void +failed_to_call_dsm(const struct acpi_spmc_softc *const sc, + const struct dsm_desc *const dsm, const int function_index) +{ + (void)device_printf(sc->dev, + "Failed to call DSM %s (rev %u) function %d\n", + dsm->name, dsm->revision, function_index); +} + static void acpi_spmc_check_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, struct dsm_desc *dsm); static int acpi_spmc_get_constraints(device_t dev); @@ -470,8 +479,7 @@ acpi_spmc_get_constraints(device_t dev) dsm->revision, dsm_index.i, NULL, &result, ACPI_TYPE_PACKAGE); if (ACPI_FAILURE(status)) { - device_printf(dev, "%s failed to call %s DSM %d (rev %d)\n", - __func__, dsm->name, dsm_index.i, dsm->revision); + failed_to_call_dsm(sc, dsm, dsm_index.i); return (ENXIO); } @@ -555,13 +563,10 @@ acpi_spmc_run_dsm(device_t dev, struct dsm_desc *dsm, int function_index) status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm->uuid, dsm->revision, function_index, NULL, &result, ACPI_TYPE_ANY); - if (ACPI_FAILURE(status)) { - device_printf(dev, "%s failed to call %s DSM %d (rev %d)\n", - __func__, dsm->name, function_index, dsm->revision); - return; - } - - AcpiOsFree(result.Pointer); + if (ACPI_FAILURE(status)) + failed_to_call_dsm(sc, dsm, function_index); + else + AcpiOsFree(result.Pointer); } /* From nobody Wed May 13 12:39: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 4gFtML2RG6z6dKnc for ; Wed, 13 May 2026 12:39: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 4gFtML0Y5Gz3vSR for ; Wed, 13 May 2026 12:39:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675982; 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=taGU3aDeZfhxxTgBIiD4OUJcwU8G1Bc+Lo9/LQ3u+Z0=; b=fp5JzwJBbqVnVixMmZHaiIsA46MfLyVouySZxcM0zos74c/D3yfCDfJvtUuev8TgTnna+1 Zf7CnKU5PH0hQ7xdNmlIRlqZaujr4Ko/MnRngaLrHHc0eZKQw8BU5nkt/Bn4oT9kGSLxzg OJJanKrBZVqi+peDIHpCgz7/yxjeAmC6l9XSMtTSIkkfQca7Oy3L51/vGoo4IqXYIn4kQa OGoW4ThbPmKYisRegDr1v2jTWaNwF1nFdb9GwDVHrtJHr5OfckVkJtSsPyNH3ignG4Ml01 yOOHYb70BRu5HdMFJf46ilC6w5rs1tPdv0Ik34d4tm900zjGF1F3lJr1593loQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675982; a=rsa-sha256; cv=none; b=N03ybJ8CiVkZ5b5yPNS1I86lbCcqn6GkUhTzUlevpZ0V8k4LW2vbR4LncgfEZXLNDnTgzk Q9QhrZrdHPKejJHTKrcJAS06jUZZdN0Bc3plRMrmYSc34dRmFSylS3UOnjI00kkpdLD21B 8jRPEb1J2Njovv6k20CptzhSjRAEaRO+goaMquC5dWVkXZBEJoBUK4l2h0ScCIc1G9EB7I j5OxFMrErc7nn7gxtosYLNSx/GSFKpFLgBSx/6awdZnPe/X/hfBYNCfGxfCvWG4SK3Ebbn UmY8gyJmTPvg/QPwl0IsTLx7HIRwAlDHnn0ydnS0Wd67hzd0SEIP4Mqpp/GRFg== 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=1778675982; 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=taGU3aDeZfhxxTgBIiD4OUJcwU8G1Bc+Lo9/LQ3u+Z0=; b=X/rUxIjiZCRmAXCkkV4HMXw29+y4hkMdxK20M8vCeJW6cKqEMCHx6/JFkA0xSNnqc6dqRf 1e6dVKhASi1Zmivnq3snnibUKmjQJS+jNKedZefw/IrWkOVehPT5aUVPJIGaboMnxlMxeW OC/o4AGHg7idDtoe9FVuePw60q9Lq9ocYvMIHTvPeoOd0FEJvD60IgcexdHUjhBQZzXb7E /SDgXjZqUWqmRhO8Om8dyii1HKXBSXcagIw1pREv0vTd/6tG5EVdxI6FiSI0HRZ+fvqhVg vjX2juDlTzzhos1TIzmrdvfTTLE+/NsPSrsORB/XuAFIBccUw6GW+/X/PW57EQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMK6ms3zr6M for ; Wed, 13 May 2026 12:39:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bf3e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 868f50f64980 - main - acpi_spmc(4): softc: Remove unused 'obj' 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 868f50f649808320e9433ab321f450fa22bcddba Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:41 +0000 Message-Id: <6a04710d.1bf3e.57ec19f0@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=868f50f649808320e9433ab321f450fa22bcddba commit 868f50f649808320e9433ab321f450fa22bcddba Author: Olivier Certner AuthorDate: 2026-05-04 15:03:05 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:20 +0000 acpi_spmc(4): softc: Remove unused 'obj' No functional change (intended). Reviewed by: imp (older version), obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56804 --- sys/dev/acpica/acpi_spmc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index a6b18767e91b..30be1b4a32e7 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -164,7 +164,6 @@ struct acpi_spmc_constraint { struct acpi_spmc_softc { device_t dev; ACPI_HANDLE handle; - ACPI_OBJECT *obj; enum dsm_flags dsms; struct eventhandler_entry *eh_suspend; From nobody Wed May 13 12:39: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 4gFtMN5wsrz6dLCZ for ; Wed, 13 May 2026 12:39: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 4gFtMN1n7jz3vSp for ; Wed, 13 May 2026 12:39:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675984; 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=vgIoNCajo/UREHJlRyNTq3tqZfAPd4NWW0JXm2BM8Vw=; b=lWyYmjxLngNcjrSNhtIlk/zcWJrF6lCW96Ul6STO7mCXg/oGMv/bl26PhU2LeyVUHpe3Kj I2DvlP6Qg/StGXHX7CLqQLmn9Rc1xgMmf8HoVgWHuePnz47cImBoD15dW/hV/TjW/vgN7h vtZCosjh2xLkXXh1nvEUGFIXqr7gkar0UoLkwy29fF20RjVRAK9+nTNzQXsAqmPlqfBRFg pz+LIZYBW+9xE7hqpaXis8b7QO7UgWnAXzbOeltHUB/23gXeHwL6tUrhaOV+AoCmcVgfF4 M4nyOvDoO5WhVGFwjBnXj7QConMXEB9SLLwPBvexTyLMy3lMPrQ2E3CIwCHukw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675984; a=rsa-sha256; cv=none; b=ByJOTGAxTpKchtYXhG0Cv6OEnDEpJkzZjieR8UQ4mSyEKi8g5G1Bmu3JXpcWcfGFOwSz4S 3B21ky5VMP5oigoC9FmH40C4NLWJUnm/x19Xh2Z4rAxkMreFplKwZY+gJNe/u/WEoMhV9g boerpXWpbJs/lpx0RcoahhLWtwzEwvpt8qdeIX7C1sj8e5c4QN744pjDZkSzFOVEniJPgX X05K5bzPoo/BNu7y8jKuFmIcLXCZ1/EZ+9IMn+hFlVQVbvh/UbO27dzQtlKX7jJOsqsZIo fwj5i/8NMfyV0tgDtTfWYl8tIyyq7g3khdugOhqCvbK4bsR3FDVsR5XJWWGWiw== 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=1778675984; 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=vgIoNCajo/UREHJlRyNTq3tqZfAPd4NWW0JXm2BM8Vw=; b=P9YXC5UOq+0VZanIbepccm7gOQA+SZCOwhHOMZ4VwezC5/C3Ojrs3/LFr7lf8OJ0VqMQiQ vr3xvaF2HWVgIuoZoeU3vyN9Wh6kOwVKzGHk8QghBVhlKWl8PS+QvHXfaY4Ohe7moet2xG if73lZWxjvNSo72Xh6rhaMU0Sbu7tmIhIxtrqdYZTeadaj5n//T6CRfsaCw3EKSP5YvO8C wiYMWtOblhtE0lybRq8/Zva2cILYeMAVB0zhqAxQW1V1bgqBULlT+Yb3JjE6c7J722kD5B dLPB5BiJAQ64wtpG1bysKnNkOt0CVIfQPI+1U8v23Dq5k2E+FlnzgXvcS+oFMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMN1LpFzr23 for ; Wed, 13 May 2026 12:39:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18ee1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: cc628a66b4c4 - main - acpi_spmc(4): Human-readably print supported DSMs and their 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc628a66b4c4d8423830491ebfd69333f7d02378 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:44 +0000 Message-Id: <6a047110.18ee1.5d9ff4f2@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=cc628a66b4c4d8423830491ebfd69333f7d02378 commit cc628a66b4c4d8423830491ebfd69333f7d02378 Author: Olivier Certner AuthorDate: 2026-05-04 15:54:40 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:20 +0000 acpi_spmc(4): Human-readably print supported DSMs and their functions To this end, revamp how DSMs and their functions are represented. Replace enumerations, which only bring minimal advantages, with plain macros, allowing to get rid of 'union dsm_index' and in passing the associated bug that an underlying type smaller than 'int' is aliased to an 'int', which assumes little-endian architectures. Associate to each function a printable name, in the form of a per-DSM array that maps a function index into a string. Make sure that every used array and their number of items are sized at compile-time and are declared constant, and that as little code as possible depends on the particular set of present DSMs and associated functions. Since the set of DSMs and sets of per-DSM functions are represented as bitsets, introduce print_bit_field() to print such sets. This new function is akin to printf("%b", ...) but with more flexibility. It takes a function associating a name to some bit index and an opaque pointer, allowing to leverage existing structures containing names instead of imposing the use of a separate string containing all names to be printed. It also provides a default name to bits without an explicit name, composed of a common prefix and the bit index as a suffix. Reviewed by: imp (older version), obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56756 --- sys/dev/acpica/acpi_spmc.c | 407 +++++++++++++++++++++++++++++++-------------- 1 file changed, 279 insertions(+), 128 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index f5951a4809d5..641ed269c6b6 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -22,13 +22,11 @@ #include + /* Hooks for the ACPI CA debugging infrastructure */ #define _COMPONENT ACPI_SPMC ACPI_MODULE_NAME("SPMC") -static SYSCTL_NODE(_debug_acpi, OID_AUTO, spmc, CTLFLAG_RD | CTLFLAG_MPSAFE, - NULL, "SPMC debugging"); - static char *spmc_ids[] = { "PNP0D80", NULL @@ -37,48 +35,69 @@ static char *spmc_ids[] = { /* Conversion of an index to a mask. */ #define IDX_TO_BIT(idx) (1ull << (idx)) -enum intel_dsm_index { - DSM_ENUM_FUNCTIONS = 0, - DSM_GET_DEVICE_CONSTRAINTS = 1, - DSM_GET_CRASH_DUMP_DEVICE = 2, - DSM_DISPLAY_OFF_NOTIF = 3, - DSM_DISPLAY_ON_NOTIF = 4, - DSM_ENTRY_NOTIF = 5, - DSM_EXIT_NOTIF = 6, - /* Only for Microsoft DSM. */ - DSM_MODERN_ENTRY_NOTIF = 7, - DSM_MODERN_EXIT_NOTIF = 8, - DSM_MODERN_TURN_ON_DISPLAY = 9, -}; +/* List of supported DSMs. */ +#define DSM_INTEL 0 +#define DSM_MS 1 +#define DSM_AMD 2 -enum amd_dsm_index { - AMD_DSM_ENUM_FUNCTIONS = 0, - AMD_DSM_GET_DEVICE_CONSTRAINTS = 1, - AMD_DSM_ENTRY_NOTIF = 2, - AMD_DSM_EXIT_NOTIF = 3, - AMD_DSM_DISPLAY_OFF_NOTIF = 4, - AMD_DSM_DISPLAY_ON_NOTIF = 5, -}; +/* List of DSM function indices. */ +#define DSM_ENUM_FUNCTIONS 0 /* Common to all DSMs */ +#define DSM_GET_DEVICE_CONSTRAINTS 1 /* AMD and Intel, MS N/A */ + +#define DSM_GET_CRASH_DUMP_DEVICE 2 /* Intel, MS N/A */ +#define DSM_INTEL_MS_DISPLAY_OFF_NOTIF 3 +#define DSM_INTEL_MS_DISPLAY_ON_NOTIF 4 +#define DSM_INTEL_MS_LPI_ENTRY_NOTIF 5 +#define DSM_INTEL_MS_LPI_EXIT_NOTIF 6 + +#define DSM_MS_SLEEP_ENTRY_NOTIF 7 +#define DSM_MS_SLEEP_EXIT_NOTIF 8 +#define DSM_MS_TURN_ON_DISPLAY 9 + +#define DSM_AMD_LPI_ENTRY_NOTIF 2 +#define DSM_AMD_LPI_EXIT_NOTIF 3 +#define DSM_AMD_DISPLAY_OFF_NOTIF 4 +#define DSM_AMD_DISPLAY_ON_NOTIF 5 -enum dsm_flags { - DSM_INTEL = 1 << 0, - DSM_MS = 1 << 1, - DSM_AMD = 1 << 2, -}; + +/* Descriptors for the DSMs we support. */ struct dsm_desc { - enum dsm_flags flag; const char *name; + /* Index in the dsms[] array below. */ + int index; + /* + * Revisions are zero or a positive number. Strictly speaking, next + * field should be a 'uint64_t' as per the ACPI spec, but our ACPI DSM + * interface takes an 'int' and anyway actual revision numbers never + * even exceed the limits of a 'uint8_t'. + */ int revision; struct uuid uuid; uint64_t supported_functions; uint64_t expected_functions; uint64_t extra_functions; + /* Human-friendly names of known functions. */ + const char *const *function_names; + int function_names_nb; +}; + +static const char *const dsm_intel_function_names[] = { + [DSM_GET_DEVICE_CONSTRAINTS] = "DEVICE_CONSTRAINTS", + [DSM_GET_CRASH_DUMP_DEVICE] = "CRASH_DUMP_DEVICE", + [DSM_INTEL_MS_DISPLAY_OFF_NOTIF] = "DISPLAY_OFF", + [DSM_INTEL_MS_DISPLAY_ON_NOTIF] = "DISPLAY_ON", + [DSM_INTEL_MS_LPI_ENTRY_NOTIF] = "LPI_ENTRY", + [DSM_INTEL_MS_LPI_EXIT_NOTIF] = "LPI_EXIT", }; static struct dsm_desc dsm_intel = { - .flag = DSM_INTEL, + .index = DSM_INTEL, .name = "Intel", + .uuid = { /* c4eb40a0-6cd2-11e2-bcfd-0800200c9a66 */ + 0xc4eb40a0, 0x6cd2, 0x11e2, 0xbc, 0xfd, + {0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66} + }, /* * XXX Linux uses 1 for the revision on Intel DSMs, but doesn't explain * why. The commit that introduces this links to a document mentioning @@ -88,65 +107,100 @@ static struct dsm_desc dsm_intel = { * this just in case. */ .revision = 0, - .uuid = { /* c4eb40a0-6cd2-11e2-bcfd-0800200c9a66 */ - 0xc4eb40a0, 0x6cd2, 0x11e2, 0xbc, 0xfd, - {0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66}, - }, - .expected_functions = (1 << DSM_GET_DEVICE_CONSTRAINTS) | - (1 << DSM_DISPLAY_OFF_NOTIF) | (1 << DSM_DISPLAY_ON_NOTIF) | - (1 << DSM_ENTRY_NOTIF) | (1 << DSM_EXIT_NOTIF), + .expected_functions = + IDX_TO_BIT(DSM_GET_DEVICE_CONSTRAINTS) | + IDX_TO_BIT(DSM_INTEL_MS_DISPLAY_OFF_NOTIF) | + IDX_TO_BIT(DSM_INTEL_MS_DISPLAY_ON_NOTIF) | + IDX_TO_BIT(DSM_INTEL_MS_LPI_ENTRY_NOTIF) | + IDX_TO_BIT(DSM_INTEL_MS_LPI_EXIT_NOTIF), + .extra_functions = + IDX_TO_BIT(DSM_GET_CRASH_DUMP_DEVICE), /* Not used. */ + .function_names = dsm_intel_function_names, + .function_names_nb = nitems(dsm_intel_function_names), }; -SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, intel_dsm_revision, CTLFLAG_RW, - &dsm_intel.revision, 0, - "Revision to use when evaluating Intel SPMC DSMs"); +static const char *const dsm_ms_function_names[] = { + [DSM_INTEL_MS_DISPLAY_OFF_NOTIF] = "DISPLAY_OFF", + [DSM_INTEL_MS_DISPLAY_ON_NOTIF] = "DISPLAY_ON", + [DSM_INTEL_MS_LPI_ENTRY_NOTIF] = "LPI_ENTRY", + [DSM_INTEL_MS_LPI_EXIT_NOTIF] = "LPI_EXIT", + [DSM_MS_SLEEP_ENTRY_NOTIF] = "SLEEP_ENTRY", + [DSM_MS_SLEEP_EXIT_NOTIF] = "SLEEP_EXIT", + [DSM_MS_TURN_ON_DISPLAY] = "TURN_ON", +}; static struct dsm_desc dsm_ms = { - .flag = DSM_MS, + .index = DSM_MS, .name = "Microsoft", - .revision = 0, .uuid = { /* 11e00d56-ce64-47ce-837b-1f898f9aa461 */ 0x11e00d56, 0xce64, 0x47ce, 0x83, 0x7b, - {0x1f, 0x89, 0x8f, 0x9a, 0xa4, 0x61}, + {0x1f, 0x89, 0x8f, 0x9a, 0xa4, 0x61} }, - .expected_functions = (1 << DSM_DISPLAY_OFF_NOTIF) | - (1 << DSM_DISPLAY_ON_NOTIF) | (1 << DSM_ENTRY_NOTIF) | - (1 << DSM_EXIT_NOTIF) | (1 << DSM_MODERN_ENTRY_NOTIF) | - (1 << DSM_MODERN_EXIT_NOTIF), - .extra_functions = (1 << DSM_MODERN_TURN_ON_DISPLAY), + .revision = 0, + .expected_functions = + IDX_TO_BIT(DSM_INTEL_MS_DISPLAY_OFF_NOTIF) | + IDX_TO_BIT(DSM_INTEL_MS_DISPLAY_ON_NOTIF) | + IDX_TO_BIT(DSM_INTEL_MS_LPI_ENTRY_NOTIF) | + IDX_TO_BIT(DSM_INTEL_MS_LPI_EXIT_NOTIF) | + IDX_TO_BIT(DSM_MS_SLEEP_ENTRY_NOTIF) | + IDX_TO_BIT(DSM_MS_SLEEP_EXIT_NOTIF), + .extra_functions = + IDX_TO_BIT(DSM_MS_TURN_ON_DISPLAY), + .function_names = dsm_ms_function_names, + .function_names_nb = nitems(dsm_ms_function_names), +}; + +static const char *const dsm_amd_function_names[] = { + [DSM_GET_DEVICE_CONSTRAINTS] = "DEVICE_CONSTRAINTS", + [DSM_AMD_DISPLAY_OFF_NOTIF] = "DISPLAY_OFF", + [DSM_AMD_DISPLAY_ON_NOTIF] = "DISPLAY_ON", + [DSM_AMD_LPI_ENTRY_NOTIF] = "LPI_ENTRY", + [DSM_AMD_LPI_EXIT_NOTIF] = "LPI_EXIT", }; static struct dsm_desc dsm_amd = { - .flag = DSM_AMD, + .index = DSM_AMD, .name = "AMD", + .uuid = { /* e3f32452-febc-43ce-9039-932122d37721 */ + 0xe3f32452, 0xfebc, 0x43ce, 0x90, 0x39, + {0x93, 0x21, 0x22, 0xd3, 0x77, 0x21} + }, /* * XXX Linux uses 0 for the revision on AMD DSMs, but at least on the - * Framework 13 AMD 7040 series, the enum functions DSM only returns a - * function mask that covers all the DSMs we need to call when called - * with revision 2. + * Framework 13 AMD 7040 series, the "enumerate functions" DSM function + * needs to be called with revision 2 to return a mask that covers all + * the functions we would like to call. * * The debug.acpi.spmc.amd_dsm_revision sysctl may be used to configure * this just in case. */ .revision = 2, - .uuid = { /* e3f32452-febc-43ce-9039-932122d37721 */ - 0xe3f32452, 0xfebc, 0x43ce, 0x90, 0x39, - {0x93, 0x21, 0x22, 0xd3, 0x77, 0x21}, - }, - .expected_functions = (1 << AMD_DSM_GET_DEVICE_CONSTRAINTS) | - (1 << AMD_DSM_ENTRY_NOTIF) | (1 << AMD_DSM_EXIT_NOTIF) | - (1 << AMD_DSM_DISPLAY_OFF_NOTIF) | (1 << AMD_DSM_DISPLAY_ON_NOTIF), + .expected_functions = + IDX_TO_BIT(DSM_GET_DEVICE_CONSTRAINTS) | + IDX_TO_BIT(DSM_AMD_DISPLAY_OFF_NOTIF) | + IDX_TO_BIT(DSM_AMD_DISPLAY_ON_NOTIF) | + IDX_TO_BIT(DSM_AMD_LPI_ENTRY_NOTIF) | + IDX_TO_BIT(DSM_AMD_LPI_EXIT_NOTIF), + .function_names = dsm_amd_function_names, + .function_names_nb = nitems(dsm_amd_function_names), }; +static struct dsm_desc *const dsms[] = { + [DSM_INTEL] = &dsm_intel, + [DSM_MS] = &dsm_ms, + [DSM_AMD] = &dsm_amd, +}; + +static SYSCTL_NODE(_debug_acpi, OID_AUTO, spmc, CTLFLAG_RD | CTLFLAG_MPSAFE, + NULL, "SPMC debugging"); + +SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, intel_dsm_revision, CTLFLAG_RW, + &dsm_intel.revision, 0, + "Revision to use when evaluating Intel SPMC DSMs"); + SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, amd_dsm_revision, CTLFLAG_RW, &dsm_amd.revision, 0, "Revision to use when evaluating AMD SPMC DSMs"); -union dsm_index { - int i; - enum intel_dsm_index regular; - enum amd_dsm_index amd; -}; - struct acpi_spmc_constraint { bool enabled; char *name; @@ -164,7 +218,7 @@ struct acpi_spmc_constraint { struct acpi_spmc_softc { device_t dev; ACPI_HANDLE handle; - enum dsm_flags dsms; + int dsms; struct eventhandler_entry *eh_suspend; struct eventhandler_entry *eh_resume; @@ -174,6 +228,14 @@ struct acpi_spmc_softc { struct acpi_spmc_constraint *constraints; }; + +static const struct dsm_desc * +resolve_dsm(int dsm_index) +{ + MPASS(0 <= dsm_index && dsm_index < nitems(dsms)); + return (dsms[dsm_index]); +} + static bool supports_function(const struct dsm_desc *const dsm, const int function_index) { @@ -181,9 +243,78 @@ supports_function(const struct dsm_desc *const dsm, const int function_index) } static bool -has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_bit) +has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_index) +{ + return ((sc->dsms & IDX_TO_BIT(dsm_index)) != 0); +} + +typedef const char *pbf_get_name_t(const int, const void *const); + +static const char * +pbf_dsm_name(const int dsm_index, const void *const opaque __unused) +{ + return (resolve_dsm(dsm_index)->name); +} + +static const char * +dsm_function_name(const struct dsm_desc *const dsm, const int function_index) +{ + MPASS(function_index >= 0); + if (function_index >= dsm->function_names_nb) + return (NULL); + /* May be NULL. */ + return (dsm->function_names[function_index]); +} + +static const char * +pbf_function_name(const int function_index, const void *const opaque) { - return ((sc->dsms & dsm_bit) != 0); + return (dsm_function_name(opaque, function_index)); +} + +static int +print_bit_field(char *const buf, const size_t buf_size, + const uint64_t bit_field, const char *const fallback_prefix, + pbf_get_name_t get_name, const void *const opaque) +{ + uint64_t bf = bit_field; + char *const buf_end = buf + buf_size; + char *p = buf; + int ret = 0; + bool one_set = false; + +#define PBF_PRINT(...) \ + do { \ + const __ptrdiff_t rem = MAX(buf_end - p, 0); \ + const int lret = snprintf(p, rem, __VA_ARGS__); \ + \ + MPASS(lret >= 0); \ + p += MIN(lret, rem); \ + ret += lret; \ + } while (0) + + if (bf == 0) { + PBF_PRINT(""); + return (ret); + } + + do { + const int b_idx = ffsll(bf) - 1; + const char *const name = get_name(b_idx, opaque); + + PBF_PRINT(one_set ? "," : "<"); + one_set = true; + if (name != NULL) + PBF_PRINT("%s", name); + else + PBF_PRINT("%s_%d", fallback_prefix, b_idx); + + bf &= ~IDX_TO_BIT(b_idx); + } while (bf != 0); + PBF_PRINT(">"); +#undef PBF_PRINT + + return (ret); } static void @@ -191,14 +322,17 @@ failed_to_call_dsm(const struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm, const int function_index) { (void)device_printf(sc->dev, - "Failed to call DSM %s (rev %u) function %d\n", - dsm->name, dsm->revision, function_index); + "Failed to call DSM %s (rev %u) function %s\n", + dsm->name, dsm->revision, dsm_function_name(dsm, function_index)); } static void acpi_spmc_check_dsm(struct acpi_spmc_softc *sc, - ACPI_HANDLE handle, struct dsm_desc *dsm); + ACPI_HANDLE handle, struct dsm_desc *const dsm); +static void acpi_spmc_dsm_print_functions( + const struct acpi_spmc_softc *const sc, + const struct dsm_desc *const dsm); static int acpi_spmc_get_constraints(device_t dev); -static void acpi_spmc_free_constraints(struct acpi_spmc_softc *sc); +static void acpi_spmc_free_constraints(struct acpi_spmc_softc *const sc); static void acpi_spmc_suspend(device_t dev, enum power_stype stype); static void acpi_spmc_resume(device_t dev, enum power_stype stype); @@ -207,8 +341,9 @@ static int acpi_spmc_probe(device_t dev) { char *name; - ACPI_HANDLE handle; + ACPI_HANDLE handle; struct acpi_spmc_softc *sc; + char buf[32]; /* Check that this is an enabled device. */ if (acpi_get_type(dev) != ACPI_TYPE_DEVICE || acpi_disabled("spmc")) @@ -232,15 +367,15 @@ acpi_spmc_probe(device_t dev) /* Check which DSMs are supported. */ sc->dsms = 0; - acpi_spmc_check_dsm(sc, handle, &dsm_intel); - acpi_spmc_check_dsm(sc, handle, &dsm_ms); - acpi_spmc_check_dsm(sc, handle, &dsm_amd); + for (int i = 0; i < nitems(dsms); ++i) + acpi_spmc_check_dsm(sc, handle, dsms[i]); if (sc->dsms == 0) return (ENXIO); - device_set_descf(dev, "System Power Management Controller (DSMs 0x%x)", - sc->dsms); + print_bit_field(buf, sizeof(buf), sc->dsms, "DSM", pbf_dsm_name, NULL); + device_set_descf(dev, "System Power Management Controller (DSMs %s)", + buf); return (0); } @@ -281,39 +416,57 @@ acpi_spmc_detach(device_t dev) return (0); } +static void +acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, + const struct dsm_desc *const dsm) +{ + const uint64_t missing = dsm->expected_functions & + ~dsm->supported_functions; + const uint64_t unknown = dsm->supported_functions & + ~(dsm->expected_functions | dsm->extra_functions); + char buf[128]; + + print_bit_field(buf, sizeof(buf), dsm->supported_functions, + "FUNC", pbf_function_name, dsm); + device_printf(sc->dev, "DSM %s: Supported functions: %#" PRIx64 "%s\n", + dsm->name, dsm->supported_functions, buf); + + if (missing != 0) { + print_bit_field(buf, sizeof(buf), missing, "FUNC", + pbf_function_name, dsm); + device_printf(sc->dev, "DSM %s: Does not enumerate expected " + "functions %#" PRIx64 "%s. Calls to them may fail.\n", + dsm->name, missing, buf); + } + + if (unknown != 0) { + print_bit_field(buf, sizeof(buf), unknown, "FUNC", + pbf_function_name, dsm); + device_printf(sc->dev, "DSM %s: Supports more functions than " + "used (%#" PRIx64 "%s), driver might need an upgrade.\n", + dsm->name, unknown, buf); + } +} + static void acpi_spmc_check_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, - struct dsm_desc *dsm) + struct dsm_desc *const dsm) { - uint64_t supported_functions = acpi_DSMQuery(handle, + const uint64_t supported_functions = acpi_DSMQuery(handle, (uint8_t *)&dsm->uuid, dsm->revision); - const uint64_t min_dsms = dsm->expected_functions; - const uint64_t max_dsms = min_dsms | dsm->extra_functions; /* - * Check if DSM supported at all. We do this by checking the existence - * of "enum functions". + * DSM is supported if bit 0 is set. */ if ((supported_functions & 1) == 0) return; - supported_functions &= ~1; - dsm->supported_functions = supported_functions; - sc->dsms |= dsm->flag; - - if ((supported_functions & min_dsms) != min_dsms) - device_printf(sc->dev, "DSM %s does not support expected " - "functions (%#" PRIx64 " vs %#" PRIx64 "). " - "Some may fail.\n", - dsm->name, supported_functions, min_dsms); - - if ((supported_functions & ~max_dsms) != 0) - device_printf(sc->dev, "DSM %s supports more functions than " - "expected (%#" PRIx64 " vs %#" PRIx64 ").\n", dsm->name, - supported_functions, max_dsms); + dsm->supported_functions = supported_functions & ~1; + sc->dsms |= IDX_TO_BIT(dsm->index); + acpi_spmc_dsm_print_functions(sc, dsm); } static void -acpi_spmc_free_constraints(struct acpi_spmc_softc *sc) +acpi_spmc_free_constraints(struct acpi_spmc_softc *const sc) { for (size_t i = 0; i < sc->constraint_count; i++) free(sc->constraints[i].name, M_TEMP); @@ -451,7 +604,6 @@ static int acpi_spmc_get_constraints(device_t dev) { struct acpi_spmc_softc *sc; - union dsm_index dsm_index; struct dsm_desc *dsm; ACPI_STATUS status; ACPI_BUFFER result; @@ -466,20 +618,14 @@ acpi_spmc_get_constraints(device_t dev) /* The Microsoft DSM doesn't have this function. */ is_amd = has_dsm(sc, DSM_AMD); - if (is_amd) { - dsm = &dsm_amd; - dsm_index.amd = AMD_DSM_GET_DEVICE_CONSTRAINTS; - } else { - dsm = &dsm_intel; - dsm_index.regular = DSM_GET_DEVICE_CONSTRAINTS; - } + dsm = is_amd ? &dsm_amd : &dsm_intel; /* It seems like this DSM can fail if called more than once. */ status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm->uuid, - dsm->revision, dsm_index.i, NULL, &result, + dsm->revision, DSM_GET_DEVICE_CONSTRAINTS, NULL, &result, ACPI_TYPE_PACKAGE); if (ACPI_FAILURE(status)) { - failed_to_call_dsm(sc, dsm, dsm_index.i); + failed_to_call_dsm(sc, dsm, DSM_GET_DEVICE_CONSTRAINTS); return (ENXIO); } @@ -552,7 +698,7 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) } static void -acpi_spmc_run_dsm(device_t dev, struct dsm_desc *dsm, int function_index) +acpi_spmc_run_dsm(device_t dev, const struct dsm_desc *dsm, int function_index) { struct acpi_spmc_softc *sc; ACPI_STATUS status; @@ -560,7 +706,7 @@ acpi_spmc_run_dsm(device_t dev, struct dsm_desc *dsm, int function_index) sc = device_get_softc(dev); - status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm->uuid, + status = acpi_EvaluateDSMTyped(sc->handle, (const uint8_t *)&dsm->uuid, dsm->revision, function_index, NULL, &result, ACPI_TYPE_ANY); if (ACPI_FAILURE(status)) @@ -582,11 +728,13 @@ acpi_spmc_display_off_notif(device_t dev) struct acpi_spmc_softc *sc = device_get_softc(dev); if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, DSM_DISPLAY_OFF_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_intel, + DSM_INTEL_MS_DISPLAY_OFF_NOTIF); if (has_dsm(sc, DSM_MS)) - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_DISPLAY_OFF_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_ms, + DSM_INTEL_MS_DISPLAY_OFF_NOTIF); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, AMD_DSM_DISPLAY_OFF_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_DISPLAY_OFF_NOTIF); } static void @@ -595,11 +743,13 @@ acpi_spmc_display_on_notif(device_t dev) struct acpi_spmc_softc *sc = device_get_softc(dev); if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, DSM_DISPLAY_ON_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_intel, + DSM_INTEL_MS_DISPLAY_ON_NOTIF); if (has_dsm(sc, DSM_MS)) - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_DISPLAY_ON_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_ms, + DSM_INTEL_MS_DISPLAY_ON_NOTIF); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, AMD_DSM_DISPLAY_ON_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_DISPLAY_ON_NOTIF); } static void @@ -610,13 +760,14 @@ acpi_spmc_entry_notif(device_t dev) acpi_spmc_check_constraints(sc); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, AMD_DSM_ENTRY_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_LPI_ENTRY_NOTIF); if (has_dsm(sc, DSM_MS)) { - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MODERN_ENTRY_NOTIF); - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_ENTRY_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MS_SLEEP_ENTRY_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_INTEL_MS_LPI_ENTRY_NOTIF); } if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, DSM_ENTRY_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_intel, + DSM_INTEL_MS_LPI_ENTRY_NOTIF); } static void @@ -625,15 +776,15 @@ acpi_spmc_exit_notif(device_t dev) struct acpi_spmc_softc *sc = device_get_softc(dev); if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, DSM_EXIT_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_intel, DSM_INTEL_MS_LPI_EXIT_NOTIF); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, AMD_DSM_EXIT_NOTIF); + acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_LPI_EXIT_NOTIF); if (has_dsm(sc, DSM_MS)) { - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_EXIT_NOTIF); - if (supports_function(&dsm_ms, DSM_MODERN_TURN_ON_DISPLAY)) + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_INTEL_MS_LPI_EXIT_NOTIF); + if (supports_function(&dsm_ms, DSM_MS_TURN_ON_DISPLAY)) acpi_spmc_run_dsm(dev, &dsm_ms, - DSM_MODERN_TURN_ON_DISPLAY); - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MODERN_EXIT_NOTIF); + DSM_MS_TURN_ON_DISPLAY); + acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MS_SLEEP_EXIT_NOTIF); } } From nobody Wed May 13 12:39: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 4gFtMP6gJKz6dLCc for ; Wed, 13 May 2026 12:39: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 4gFtMP2dCMz3vhY for ; Wed, 13 May 2026 12:39:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675985; 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=/ZePbyAbtKiqYUKijChAincAafjmIdajPxW0s8CyHwk=; b=vyrBbD19kzyd/uE2qH8Tx5OyiuktgE64JrzhN2IuMQfyCwG6qkQ2QPU+TccH92WB0HCXT2 2Y6TcBg7TYR0UrPqZFMkg2Cqk4g6e3swDa1zpne1fhJErqBeRgC75budH3fM+vVDZ8jWqG 6zmPcqW43ws0q4uZJ6wvNDAW+JvDLT7piflXysCmDo7VN2UfPlILxi7JHq9EbCrIced4or 6E1d6r1hTsOlLpx0Zl/CFhZm8MTi+4aWUvts5fambFn72Lcr+0KoxojckHbcIqZmYMT4xN s0HxYI9N9dTeybkyfEPv4Qa61lwYKRdu+oLyKp0c7Pul7GVJ1dCe8tMAUhS3ZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675985; a=rsa-sha256; cv=none; b=QW0dbmTAJ9EKH/6GU/jHkcaO6Fu4U22QOEH1l20/tiUHTfd/5nJ+nnRSNDH5ZHL2lsMpa2 4z4Ttk7ctnWBRf5RcJI97HBoyC32ShByPAziKbtFP+M5zEeK6wrM65lUkdDUPKlE1hOkJI elud6BA1soTUVsg02Tb5pAJpuQgScJyDeq6xewHMu1It+eXokgrJigOtF/1EeRYDDIEkZJ K1+gLp0aiv9N5Qd3p0sseCDv02+evnCdbcpkw1cSn3XWVxCB0X9mY1L4UHnFCMSFAKR6qk rJQ6p9C8NmAh9pLvpi2USQFYhhZACsXt6tveehLCV9EnEboLMWZbxcNBS78acg== 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=1778675985; 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=/ZePbyAbtKiqYUKijChAincAafjmIdajPxW0s8CyHwk=; b=ykN1m8eYfEGLT8jvWhDJFim0wmgyHVXl2Cr+qt/xmdEunthgp4LyPpZ9yghE94mcQTbU9Z ZbD3KBbrvbfSdQoYBxGA6Aq51UN2m0hC8fst7GsHqPvQN6HKJvXiPSIu5IJFPIJniijiLl yMxS1TSoaJynIMkPNwB/hHCpGSIeE9EH9L7/qlGSCUgkVQU5E/S4zuAtpWzwzDZvL6lBS8 Kxc9gWsb9Rn0DEfADp5+D4VWyY3x54kP+trQkyssShqBJoIbGFcutUvq8UJWc1QCmBL8Rh 7d2iNUpqPRXj9mtRg+m05/b4uTGtI3JOeh+YB6NeNL7xWHSAMgsFrP/yrn9r+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 4gFtMP28bhzqyK for ; Wed, 13 May 2026 12:39:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 195f1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: ee00031940d6 - main - acpi_spmc(4): Rename functions parsing constraints 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee00031940d647962457d64e86a2e433a2f7a2ed Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:45 +0000 Message-Id: <6a047111.195f1.70aff99c@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ee00031940d647962457d64e86a2e433a2f7a2ed commit ee00031940d647962457d64e86a2e433a2f7a2ed Author: Olivier Certner AuthorDate: 2026-05-04 11:35:23 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:20 +0000 acpi_spmc(4): Rename functions parsing constraints Rename acpi_spmc_get_constraints_intel() and acpi_spmc_get_constraints_amd() ("get" => "parse") to reflect that they are actually just parsing the constraints passed by acpi_spmc_get_constraints(). No functional change (intended). Reviewed by: imp, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56806 --- sys/dev/acpica/acpi_spmc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 641ed269c6b6..45231038fd42 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -477,7 +477,7 @@ acpi_spmc_free_constraints(struct acpi_spmc_softc *const sc) } static int -acpi_spmc_get_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) +acpi_spmc_parse_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) { struct acpi_spmc_constraint *constraint; int revision; @@ -540,7 +540,7 @@ acpi_spmc_get_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) } static int -acpi_spmc_get_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) +acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) { size_t constraint_count; ACPI_OBJECT *constraint_obj; @@ -631,9 +631,9 @@ acpi_spmc_get_constraints(device_t dev) object = (ACPI_OBJECT *)result.Pointer; if (is_amd) - rv = acpi_spmc_get_constraints_amd(sc, object); + rv = acpi_spmc_parse_constraints_amd(sc, object); else - rv = acpi_spmc_get_constraints_intel(sc, object); + rv = acpi_spmc_parse_constraints_intel(sc, object); AcpiOsFree(object); if (rv != 0) return (rv); From nobody Wed May 13 12:39: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 4gFtMQ73ygz6dLFl for ; Wed, 13 May 2026 12:39: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 4gFtMQ3TlSz3vmt for ; Wed, 13 May 2026 12:39:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675986; 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=ZfKLNfkny0HX7uQjbAskpBnG9wvhdnRF9FqXmLaWrhY=; b=oECoisX+AWtC9y2bZSe533CCxtbsCUYVZzeR6aCk/JEzRhlH4oyiCKybVhqeNwjlzGQXeP zWtUrdFp+52rl5w1PSf3Pd4i64IoqAxrzdD4OasLwewiM6Qc0zNurDF4aBcni5nLpDVNiW XNI/pW13EOsEt2PELOWXe22ot11WcgU8YlE/TSBUHInIEDYBhlQk4SDoAMc/9nkU3RzCwf goNy9wQC2zTZRgR5HSkj7sCaIyD2Dv/jpZdq48g22zBDBbHpcTBWEicT/KbWO7b/phRh1+ Ij2w1Q1KPQ7LMbfJgWBJP90MNm87yBAXRZGXQNXrbi33UYSjLdkKI6a34dLa8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675986; a=rsa-sha256; cv=none; b=YlzIxfgJbgqSwyTORzuZ9FPYfDCF66gay6JSJgI/oucHsFcqvd1QoUBbUy/lL8//ximrvE uRf5ULeocpgG+Az5kN55bKNQhhWlyIpC5vPpi4FUXxRx82NoS+8PovR72LuwWY64quoqLL y12a1WzRuNVD2B2UWbMhE+ujgJ4SP8lvuHuZh401a9s4FALX7d23SN/JpoiF1VtWMtlM0K /ZLhtGKz5gYiFlTkcTOoUWe0KdOx6nluz+7h94Hd+4dmwcLySSSiUP7cwU9QRAoJOk6jjZ B8HDYzP6wBHwEfXddQoN5LeRfGNUe8zB3zIjGQxrPGIer8DpEp+/zWQHWfemjA== 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=1778675986; 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=ZfKLNfkny0HX7uQjbAskpBnG9wvhdnRF9FqXmLaWrhY=; b=mmB+nfg8DS+4xpmIg6VRXVex+0aVxrQfOh7O1j1dllYUJ4zWKdbDzLYsrgffl3ty9omfGu smhwuzT7IREm/D3NYHmAaIoow0lHWgSFdCHv6zZSqRUB5dUIvg0X+MztkZlZbumXUkbMbk se+u3e4hIkfG63eCAXSNSM6zYIrtQXS47Ehk+6YzQbqgbllw6fWlARvfk0GUrt5DXnpieK ZPjYOmzxatxmr75ZoJ1hifWTLB7aZaqijdKNGibrFkhnAbeSUbXdNT2tJF98iGTeibiNi0 u41+X9tRmbJXyzkoNMQxk+n6a+NNsVfwQWbYVKRweS25vO5WSVtDeUdrx6iUzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMQ2ywVzqlw for ; Wed, 13 May 2026 12:39:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1973e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 98ad729f3e98 - main - acpi_spmc(4): Constraints: Simplify some assertions 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98ad729f3e98b75ae79cd4b539fe2767f8a6f89e Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:46 +0000 Message-Id: <6a047112.1973e.fc59e99@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=98ad729f3e98b75ae79cd4b539fe2767f8a6f89e commit 98ad729f3e98b75ae79cd4b539fe2767f8a6f89e Author: Olivier Certner AuthorDate: 2026-05-04 11:48:16 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:21 +0000 acpi_spmc(4): Constraints: Simplify some assertions While here, capitalize their messages. Reviewed by: imp, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56807 --- sys/dev/acpica/acpi_spmc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 45231038fd42..530d719fd66e 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -486,8 +486,7 @@ acpi_spmc_parse_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *objec ACPI_OBJECT *detail; ACPI_OBJECT *constraint_package; - KASSERT(sc->constraints_populated == false, - ("constraints already populated")); + KASSERT(!sc->constraints_populated, ("Constraints already populated")); sc->constraint_count = object->Package.Count; sc->constraints = malloc(sc->constraint_count * sizeof *sc->constraints, @@ -548,8 +547,7 @@ acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) struct acpi_spmc_constraint *constraint; ACPI_OBJECT *name_obj; - KASSERT(sc->constraints_populated == false, - ("constraints already populated")); + KASSERT(!sc->constraints_populated, ("Constraints already populated")); /* * First element in the package is unknown. @@ -658,7 +656,7 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) { bool violation = false; - KASSERT(sc->constraints_populated, ("constraints not populated")); + KASSERT(sc->constraints_populated, ("Constraints not populated")); for (size_t i = 0; i < sc->constraint_count; i++) { struct acpi_spmc_constraint *constraint = &sc->constraints[i]; From nobody Wed May 13 12:39: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 4gFtMS6tLgz6dLLb for ; Wed, 13 May 2026 12:39:48 +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 4gFtMS50FPz3vln for ; Wed, 13 May 2026 12:39:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675988; 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=zFZWJar+cNW7vwqbEdnXghkPisnCLu+N2SdNd/AWx/4=; b=i0NkDcrHY1+ybph2wCQouY5Wzo9AjAoNzt2sw8el8cLOLM0LUK5uaoOcrINJ0HDRxfElvC c8maOvPGVxfY4MBwbONxxQAfyUQLyMbO1dX5UYPTtarQJ0cmdBV27bIfVlhG+y9Vh8/68o 4Hh4TAUNsuXU52l7pxXB+snICiOL/RRJYDv2E0+KiDmfpUW0L6xfgez9E+UIm8zh17kP/3 sAmin3JmRjtLvgB5QTuVAwMOC2HgtM1/KITxhtHRa/e/XYkVS/2mGuu0nXteC066igz9t9 Ck5zbArZ8pwBEvwYFAaZ7uHj8U+UWOeC2MYGqKPQVJP7VnNA4LO5XE0odmPkHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675988; a=rsa-sha256; cv=none; b=nL2XF/+/VFqnUhzg+aKVKLcAB7ipTNTVPgnHn/EYKxRQLBvd3VsTLg1gtARM0/+j/1XduY jHfaeV0zOSSlq9PNFf7vVuhp6ux+TNECJ5bYsd9z88YFslHZdYNeyLbdUPcgHBrKAcUY5s YCGfmZtfRtl1CTddVRkJt/OEoqpWEb7O2R5jUYn7Fdl3I9d1+yrs7r7DdV4Hu8sPU7hO7M 398CZn6VGo8+8bPBN0ijW/lUxjkiIVzU62yT2ljz2zrBALMeTeOLkd38VAYgadrVie6wTu JwPfxUhcRjuqvN0Ww0KzzDeXaZz7xbbeWOYPJDnWLTCmrZ+MmK85RtLWmvUmPg== 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=1778675988; 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=zFZWJar+cNW7vwqbEdnXghkPisnCLu+N2SdNd/AWx/4=; b=GGvuAOW5VCjcKownXkRLU663IlF4hdViYCY+LWo4/1tfF4y3+v6j5LMmucckQb8umibQDG vWMHchN65xLZXjREve/h1Cnc1mklZi6H5X8cNG3afURwUPlG1s0HGTyY/KWu+BAkyFr0Q2 6/2LTd9+ywyIvCBXnO0jNoLOgtiC/vo9dnvAVIYxpi/79iDJySP2+Oh8YLXSlHNZKhu5HR Us2SZa53J6jU1caAPWZZm0Ocpyxrv73cFXasUbQ26UgwyJEN0rARVmEJYK2pIKUEirw9Qc tgBkc4KJ7rtxfmZrH/B4n4XyBMP4lBL4GAWnXl1kBe2EF+mIXCdLCm3Wvv9G6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMS4GlGzr6P for ; Wed, 13 May 2026 12:39:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a5a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 0cef5efbbf93 - main - acpi_spmc(4): Stop pretending that all constraints are verified 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0cef5efbbf939c3ca89bd29047a230cbedb2c9bb Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:48 +0000 Message-Id: <6a047114.1a5a4.25314d00@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=0cef5efbbf939c3ca89bd29047a230cbedb2c9bb commit 0cef5efbbf939c3ca89bd29047a230cbedb2c9bb Author: Olivier Certner AuthorDate: 2026-05-04 12:04:08 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:21 +0000 acpi_spmc(4): Stop pretending that all constraints are verified We do not check these constraints (yet), so stop printing that they are verified. While here, make the (not compiled in at the moment) "constraint violated" message more terse, and move the warning it contains to outside of the loop (no need to print it repeatedly if multiple constraints are violated). While here, bail out early if there are no constraints to avoid printing (in the future) that constraints are respected even when there are none. Reviewed by: imp (older version), obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56809 --- sys/dev/acpica/acpi_spmc.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 15b97347e8eb..58197242ff92 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -655,9 +655,17 @@ acpi_spmc_get_constraints(device_t dev) static void acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) { +#ifdef notyet bool violation = false; +#endif KASSERT(sc->constraints_populated, ("Constraints not populated")); + /* + * Avoid printing that constraints are respected when there are no + * constraints at all. + */ + if (sc->constraint_count == 0) + return; for (size_t i = 0; i < sc->constraint_count; i++) { struct acpi_spmc_constraint *constraint = &sc->constraints[i]; @@ -671,19 +679,24 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) if (ACPI_FAILURE(acpi_pwr_get_state(constraint->handle, &d_state))) continue; if (d_state < constraint->min_d_state) { - device_printf(sc->dev, "constraint for device %s" - " violated (minimum D-state required was %s, actual" - " D-state is %s), might fail to enter LPI state\n", + device_printf(sc->dev, "Constraint for device %s" + " violated (current D-state: %s, " + "required minimum D-state: %s).\n" constraint->name, - acpi_d_state_to_str(constraint->min_d_state), - acpi_d_state_to_str(d_state)); + acpi_d_state_to_str(d_state), + acpi_d_state_to_str(constraint->min_d_state)); violation = true; } #endif } - if (!violation) +#ifdef notyet + if (violation) + device_printf(sc->dev, "Some constraints violated, " + "might fail to enter a Low-Power Idle state\n"); + else device_printf(sc->dev, - "all device power constraints respected!\n"); + "All device power constraints respected!\n"); +#endif } static void From nobody Wed May 13 12:39: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 4gFtMS0D3qz6dLJJ for ; Wed, 13 May 2026 12:39:48 +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 4gFtMR3tTgz3vn8 for ; Wed, 13 May 2026 12:39:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675987; 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=c7aXjPiWgRtT+ou8uKWWvpah0VXPIx6Sj3KzDtBQciQ=; b=JbkvuJWL9dE0kZ9QLGnqT0BUHzkfMnp9rdRJTsSHuVSOIXMlXwh29DSFk0CZMxnoA8vZu2 HLOsGYzxq/xvvAN1inOJRJyMAp9kJ5cth8nJWnt5nvSAdIOoYH0dJNNuGoFUndEJktCzgk qlSc9m0msZXag1MHNcqyjpfl0/uhN0UzkYOn3/jg9ADrOg2nKwAWXA5AGXnYCAQdIP7IgB loQaI/bJ36V156IXRE2l66WlP5tq/7pNbce2QoxWfOfdy81YLD0VVNxXC/RHbcDLLu4x5f KfFV3O/pqkDeyfsBLJBbZvezwIjJ35S+gwieERDSYP5DlXqcu2HcGTerUZHtrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675987; a=rsa-sha256; cv=none; b=n1WRhOUsKPTEB9kph7oTQ3zMuH5CTYepxytXVzQ127OuJtzyc87GTODAsxxxWOfTkdoAs9 flXewN/lVeGnv7WiqHbZ7kN8UWvrk3S1girGDvNrGGFteW/zcUwTQqZRFJ4gQuzwHr+OtC HUNfZwIJ5LjS1msZ1iM0kD1BJZYhNfgIaE7a1wVz+hO2OkkKygItrivRfKD1JX2oUfPeFq PGPCFiDl+fKd2UO8Ro7jdAY177dnb+PLi7rEC23GFIe9JYzvGc+6BmbS37ejYY9vnEVSyN jI/l0Z+ugUGsT2smCLDFE91l9aOD6RsS/0KrV/l5sP0Nuny/579F6CmRj/CdxQ== 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=1778675987; 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=c7aXjPiWgRtT+ou8uKWWvpah0VXPIx6Sj3KzDtBQciQ=; b=QF55wDEQKT4of2yL7ps1Ygk5cvsHSN1lZURX2J77WEwSXnXEfsgECyHvPDsZpRV9ycG22g hIKJQ5qA4CDzqaRKYnYaAKrAGatBIv3QSaXEGoGiF0kY9vfwV3J9AjfV+FbY0K2AygKYvJ 1b3CB9lGO19j0YtAIzCj671++0wNaQc9OCzYnhuphvRtMANUTNktHiT88zqrsmNETP259J zy9KG/aQvcbNeT7RhdGEBJOeHyEr0YHSG2opzmfj/CyKPjSevsjxvcAS6SnRulqjd5MMQT jb1hGAyIHRBr/oa/jBd1MFlFxEZ/rg0NN1TXFCc96NtSyALZMt2horF48Dz1aA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMR3TDgzr9V for ; Wed, 13 May 2026 12:39:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19545 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: a78c9a2a47f2 - main - acpi_spmc(4): Constraints: Clearer message on handle retrieve 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a78c9a2a47f2209328bd25e527bd20cfab6d3665 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:47 +0000 Message-Id: <6a047113.19545.5c5a6a90@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a78c9a2a47f2209328bd25e527bd20cfab6d3665 commit a78c9a2a47f2209328bd25e527bd20cfab6d3665 Author: Olivier Certner AuthorDate: 2026-05-04 12:00:39 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:21 +0000 acpi_spmc(4): Constraints: Clearer message on handle retrieve error Currently, the "failed to get handle for ..." log messages on attach are a bit alarming and no context is provided. Print out that these are retrieved when trying to match constraints and that such failures are ignored, which should make administrators worry less. While here, remove duplicated handle retrieving code in acpi_spmc_check_constraints() because: 1. As is, it is dead code: We 'continue' if the handle is NULL, i.e., not already resolved, before trying to resolve it again. 2. This code is called after device suspension, which might make some objects disappear from the ACPI namespace. In any case, it seems unlikely that, suddenly, new objects would appear. Reviewed by: imp, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56808 --- sys/dev/acpica/acpi_spmc.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 530d719fd66e..15b97347e8eb 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -643,7 +643,8 @@ acpi_spmc_get_constraints(device_t dev) status = acpi_GetHandleInScope(sc->handle, __DECONST(char *, constraint->name), &constraint->handle); if (ACPI_FAILURE(status)) { - device_printf(dev, "failed to get handle for %s\n", + device_printf(dev, + "Constraints: Cannot get handle for %s, ignoring\n", constraint->name); constraint->handle = NULL; } @@ -665,16 +666,6 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) if (constraint->handle == NULL) continue; - ACPI_STATUS status = acpi_GetHandleInScope(sc->handle, - __DECONST(char *, constraint->name), &constraint->handle); - if (ACPI_FAILURE(status)) { - device_printf(sc->dev, "failed to get handle for %s\n", - constraint->name); - constraint->handle = NULL; - } - if (constraint->handle == NULL) - continue; - #ifdef notyet int d_state; if (ACPI_FAILURE(acpi_pwr_get_state(constraint->handle, &d_state))) From nobody Wed May 13 12:39: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 4gFtMW0YGGz6dL7p for ; Wed, 13 May 2026 12:39:51 +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 4gFtMV62wTz3w4L for ; Wed, 13 May 2026 12:39:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675990; 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=ibP/A95FBWE1zAZOj+/FNiCs6vZY7X3hTHiIxsrFzrs=; b=xOqLFawuxNR9lw9Dxs5nPWlzowxsBJ1fSSa9FN46LdPBaWdejlyfU4gPWKf44xbCsOEYbz s/WiMnmVH0yrWbrv5LWyzxU2IkUosgRPuJFHM2gNR3SK9TAEdwJ/YYq3s7NmXecPlya1s4 ufm8vWdA6ixKhK9TqeG56dvw4YJWvS66IaV3Js4ABfygZRTSYb6/an3NLAIBuKqqmW7zKr /OvDFLtEu/IrZBfuYfkPTBJbAxYGt3HY3HYt4/iNQ2yxg+O/Kl6yOs7DK8dXIQr6h5JUhu qAhZj0k0eK7nX063rS21LtHpdT93FK9GCKVGMgfUaIgj/pgjTI5yasR3pAoPdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675990; a=rsa-sha256; cv=none; b=RGpeLCdxYLBwR1IvChKMiCyuH30IPMnt9Fbc9M0K2Lm5tYRDD0ukA171YNfg3Uy4Corigm 2rfr328UDdOPqNLT0kxsZbEiRjuznGMwW5R5gVL5thIWeb7csv2LvtaoBF1MUbNiTFbM+a WrzZ6GAxhq6ED+zFAMF8URf8m2vsMWyz9VcSOeu7gL3I7Qt6Xva5AV8R9crOg2nPls1F6O 3i8rT8AT84Q5T/BRSJwogHltmw7ILZPnhjtkQKkANi/56Yx7RJVfXitqhl8Kk/BKNsHPf4 xEA3CBkuuUcehpDJFJzNSVr1zn2GpQBWjd5J9SP1UGt0NXYgkNm7CNJq67lPmA== 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=1778675990; 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=ibP/A95FBWE1zAZOj+/FNiCs6vZY7X3hTHiIxsrFzrs=; b=gLkfzNRcKat21kzlqBzpgNQfrULP0E1QMifawSAuGgzbCYntP1tYb7edLK0vvd0qvSfAiy MVTv7MspELC+K403bppphtxjfnX3Ccdo82EzNwG2y8wRceSPhswb3R8L6iRQiKoo05nnV6 DnOZWAg99MEk5rT70XHlhQAiGK96pAbjJTcRy/phzKfHyREwQqfVzB4TmeNICF0H6nrh9c TvpqOGdQ7dwKtr3053FNKOoTHaf4pfse/v01S/ndRZi0D/WrBXUH2I1H6VC/rGb536/fKL Ew7NdH1RO/ezi4wzgkgmX5mJVcFN2KaubWDfWgkYOzUGD/6k5QbnvTLx4EEm+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 4gFtMV5XNlzqyM for ; Wed, 13 May 2026 12:39:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19f4c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: ebad66abbc1f - main - acpi_spmc(4): Print supported functions after DSMs 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ebad66abbc1f25a761add6481de99abf474b2d87 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:50 +0000 Message-Id: <6a047116.19f4c.69d42c69@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ebad66abbc1f25a761add6481de99abf474b2d87 commit ebad66abbc1f25a761add6481de99abf474b2d87 Author: Olivier Certner AuthorDate: 2026-05-04 16:19:31 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:22 +0000 acpi_spmc(4): Print supported functions after DSMs This makes things more top-down, as expected when probing devices. Reviewed by: imp, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56811 --- sys/dev/acpica/acpi_spmc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 939f254fbf7f..33915b536667 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -326,7 +326,7 @@ failed_to_call_dsm(const struct acpi_spmc_softc *const sc, dsm->name, dsm->revision, dsm_function_name(dsm, function_index)); } -static void acpi_spmc_check_dsm(struct acpi_spmc_softc *sc, +static void acpi_spmc_probe_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, struct dsm_desc *const dsm); static void acpi_spmc_dsm_print_functions( const struct acpi_spmc_softc *const sc, @@ -380,7 +380,7 @@ acpi_spmc_attach(device_t dev) ("%s: Inconsistent indices for DSM %s", __func__, dsms[i]->name)); - acpi_spmc_check_dsm(sc, handle, dsms[i]); + acpi_spmc_probe_dsm(sc, handle, dsms[i]); } if (sc->dsms == 0) { @@ -391,6 +391,11 @@ acpi_spmc_attach(device_t dev) print_bit_field(buf, sizeof(buf), sc->dsms, "DSM", pbf_dsm_name, NULL); device_printf(dev, "DSMs supported: %s\n", buf); + /* Print supported functions of usable DSMs. */ + for (int i = 0; i < nitems(dsms); ++i) + if (has_dsm(sc, i)) + acpi_spmc_dsm_print_functions(sc, dsms[i]); + /* Get device constraints. We can only call this once so do this now. */ acpi_spmc_get_constraints(dev); @@ -447,7 +452,7 @@ acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, } static void -acpi_spmc_check_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, +acpi_spmc_probe_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, struct dsm_desc *const dsm) { const uint64_t supported_functions = acpi_DSMQuery(handle, @@ -460,7 +465,6 @@ acpi_spmc_check_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, return; dsm->supported_functions = supported_functions & ~1; sc->dsms |= IDX_TO_BIT(dsm->index); - acpi_spmc_dsm_print_functions(sc, dsm); } static void From nobody Wed May 13 12:39: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 4gFtMV2SQDz6dKtQ for ; Wed, 13 May 2026 12:39: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 4gFtMT5CTPz3vnR for ; Wed, 13 May 2026 12:39:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675989; 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=uGcCzeE4V4vt9KULNs1x8NYBh3g8e03W9kv8mX/JyHg=; b=kqHqDYMwq9lMSphnnR4mxOaQg41Wq1nTHWsImcgUVekR7uDjVuLrvcrqEbfb89QtV4DnGt d3m/o/F5x5ra6Q2i04xOuDT/zVsX6RwRK1UcE5ayZq6KONahXqQRwqirVIpGmcARHXe3HG UyMVgu7AAFkk/cUeWdk0ThG6CirgSl2rKmrohWY7Lnfm3Kftc7dHXEWQfYpXsWJVCu39as vEgT+RgRwLcCYK4EmWypj4BGO1Y8LO5Eh+OBYZvJAi0w6UFXv3Qgj5C/WJcht5wv/ChHIh jG3i58SND2WegFukrQhwea0rWiOMZLfjmgkhZYI9SXzroDHMHtNCGV2iW4GwyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675989; a=rsa-sha256; cv=none; b=OGPrKM+YlJxEfyksBT/K19TDbqCHNC2wg5oIN/TMOVfVQTkq/L8JRF6yzBwqSge53wZaeL F052rLdXdRM0SR5SWrPuy+MNkNIfnqjfqEprgaGy/UxneVLZOQ2HRxFG+xDSDswp4fH63l ZW4WWStjq5W7eYUztEGl/WXWctUyI0n0OxKg1H6NCLRV8m3LuTYDicl+ke32z1+fONsKV+ TbFAOe2baUAHzPufJT/OfjbKh3WocaCF8QZSuJDRehjkCkOKHuo1IRcmWokdAoBVtaAVPe tLnzHOQseGtS5R9DoZNXFMol5bM5LbydIs6jYn3UyTWi6kllJeoM2XHqK09JaA== 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=1778675989; 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=uGcCzeE4V4vt9KULNs1x8NYBh3g8e03W9kv8mX/JyHg=; b=T6iu9Di3XoaD6/Qk5fELSDfchkano5YrTQaq9WRcIXCBMgxEOoQBZWU31LSsioXav4xwzC snkfj3s4epLTwBpwJjptz4JRRSX1jkhMu3zEn/gzeta+Ei448fxQz5nR7FYrcYdP65Kvjf 33osWbX1crzdneAgGdrpXiGQaTdNFVSDwVJK2h0okivm0ssR+Eut0LGsgHg+Q0SyqA2phK 1v+c+l8fvzkMpqaEZB6Trxg1Inm4qDs1OpWeFNZCSRHayAY1XnXvkg3vEgP+vmfEcvPCDj OQeLLgHq/XTUd1dKL+JEGHwLFHgC3AFQONjDSVRwS50khii5qg3uPrqz3WLn/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMT4jjmzrTH for ; Wed, 13 May 2026 12:39:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a5a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 6bd543f7a82a - main - acpi_spmc(4): Check DSMs only on attach, do not return 0 on probe 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6bd543f7a82a3cbb10db3a79590d5179be403660 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:49 +0000 Message-Id: <6a047115.1a5a8.2a65c03@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=6bd543f7a82a3cbb10db3a79590d5179be403660 commit 6bd543f7a82a3cbb10db3a79590d5179be403660 Author: Olivier Certner AuthorDate: 2026-05-04 12:40:44 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:21 +0000 acpi_spmc(4): Check DSMs only on attach, do not return 0 on probe Once we have recognized a device by PNP ID, declare support unconditionally on probe, and only check for DSMs in attach. We do this for these reasons: 1. PNP0D80 is de-facto a device supposed to hold DSMs related to suspend-to-idle, so we assume it cannot be used for other purposes. And if that changes, we need another architecture anyway (e.g., have a new driver claiming those devices and behaving like a bus, to which this driver would be a sub-driver). 2. If there are no DSMs that we support on such a device, then a new DSM was added that the driver does not know about and which "replaces" (in terms of functionality) the known ones, or the firmware is buggy. In both cases, failing the attach instead of the probe is reasonable, as that leads to printing some error which we (and probably users too) would like to know about. 3. This is a step to enable multiple instances of this driver (just to be a good citizen, and also to be future proof against weird firmwares that would, e.g., implement the Microsoft DSM on another device than the Intel one). Reviewed by: imp (older version), obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56810 --- sys/dev/acpica/acpi_spmc.c | 56 ++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 58197242ff92..939f254fbf7f 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -340,10 +340,7 @@ static void acpi_spmc_resume(device_t dev, enum power_stype stype); static int acpi_spmc_probe(device_t dev) { - char *name; - ACPI_HANDLE handle; - struct acpi_spmc_softc *sc; - char buf[32]; + char *name; /* Check that this is an enabled device. */ if (acpi_get_type(dev) != ACPI_TYPE_DEVICE || acpi_disabled("spmc")) @@ -357,41 +354,42 @@ acpi_spmc_probe(device_t dev) return (ENXIO); } - handle = acpi_get_handle(dev); - /* ACPI_ID_PROBE() above cannot succeed without a handle. */ + device_set_desc(dev, "System Power Management Controller"); + + return (BUS_PROBE_DEFAULT); +} + +static int +acpi_spmc_attach(device_t dev) +{ + struct acpi_spmc_softc *const sc = device_get_softc(dev); + const ACPI_HANDLE handle = acpi_get_handle(dev); + char buf[32]; + + /* + * ACPI_ID_PROBE() in acpi_spmc_probe() cannot succeed without a handle. + */ MPASS(handle != NULL); - sc = device_get_softc(dev); sc->dev = dev; + sc->handle = handle; - /* Check which DSMs are supported. */ - sc->dsms = 0; + for (int i = 0; i < nitems(dsms); ++i) { + KASSERT(dsms[i] != NULL, ("%s: Sparse dsms[]!", __func__)); + KASSERT(dsms[i]->index == i, + ("%s: Inconsistent indices for DSM %s", __func__, + dsms[i]->name)); - for (int i = 0; i < nitems(dsms); ++i) acpi_spmc_check_dsm(sc, handle, dsms[i]); + } - if (sc->dsms == 0) + if (sc->dsms == 0) { + device_printf(dev, "No DSM supported!"); return (ENXIO); + } print_bit_field(buf, sizeof(buf), sc->dsms, "DSM", pbf_dsm_name, NULL); - device_set_descf(dev, "System Power Management Controller (DSMs %s)", - buf); - - return (0); -} - -static int -acpi_spmc_attach(device_t dev) -{ - struct acpi_spmc_softc *sc = device_get_softc(dev); - - sc->handle = acpi_get_handle(dev); - if (sc->handle == NULL) - return (ENXIO); - - sc->constraints_populated = false; - sc->constraint_count = 0; - sc->constraints = NULL; + device_printf(dev, "DSMs supported: %s\n", buf); /* Get device constraints. We can only call this once so do this now. */ acpi_spmc_get_constraints(dev); From nobody Wed May 13 12:39: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 4gFtMX2GJQz6dL5J for ; Wed, 13 May 2026 12:39: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 4gFtMW6mfyz3vws for ; Wed, 13 May 2026 12:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675992; 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=iK+vCNCO0tolrFdbZGv+U0Eq6Dms14KNC3efOEZClLU=; b=YpKyiB6deJPjVSLqPNXaTqYusYFvDQhFNjpQABcGcq4xzLF8IG+v8rGvkHY5paKihZz4jQ br0N3MtJowlvoabhI3GaTnwzsmkKgGh4vwCeqkEKgKy8Z6sZNcitV1y9KfjrSjWtL1T+n4 R/0PsAGqLIM/D0sUDZnpJbZuiqLpxeeQrLH0jfCxue/InbrX/pVVm4N1SKaRtpr1A0ez4f Xj4kN3WO7KQx9N46SUIqwfkK+kqKyW9MMq4ocsW1/kanDyhCUyWaEk73WzWBFEhUz8uvUB 3vBgwy1POUJz6ntsH+9BriN3dj3EsJwdJLJ0zvA92WFxRpLfr+X6mQAlvgypfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675991; a=rsa-sha256; cv=none; b=EDrAhZgQRylrblfIqcE09qKZ4FHDSrlYLSOkrNGhxAtPJq0d2ioESlykVYXVg55SvfS55Q YjnCh26IqeKqgw8+uqG/cMeRKurnI2KEXW85Xqu7ahbXAotCNMEz6+wvydWLGpYF3FagIK QgEZa0F/bTMTO9w+0MyNfclUxsywuWL/uZTYHvTcHEOscF2v6ineNUj54h8Az+TDv3NvDN x9BszxK+3Y/F2jfPOxg2Y7hG4r7bu8cei7niprAJ0wjl/04HSkjlaQ+SchIEI01g1jFDr+ suNwBa8O4+YlfG0poNi+PT3B2/S8neX2oWaktTohbEupqDMHDDBpEl0yAS9reQ== 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=1778675991; 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=iK+vCNCO0tolrFdbZGv+U0Eq6Dms14KNC3efOEZClLU=; b=FoKjPuDnUGRZGsfaZTkcQIdvAT1Kj7LH6rUtdcTAh4Vo4qtNH2Ki5317ghPnOqAG0gYyeJ /b9xZRRIKVu2Xmvsw3gQRrcf0TVVkMqVpj7fIsDucjDoGJ5VlNmMc7nAOdxXYwhfIN6gbM Smq5jTdZ1R1fMmdgV+sC1+QuIXDw9Yl9turueRj9lYEdYP26LVQWZtExMfbKr7YSnZ5yDy Vy6IkMCZRDdDlthrpqqoFP37htAHBABSw0W+wuAOmrVNuU0Snwj92dLlK4owICeXroLyvf bdFwboZMt2db2GdJCbntJB0azXFx8p5OAkdn73MAmomHOEIo2ISqvri9EWAOmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMW6N6TzqyN for ; Wed, 13 May 2026 12:39:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c0eb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: e5615cd8094f - main - acpi_spmc(4): INVARIANTS: Do not panic on getting constraints failure 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5615cd8094f75a17572b3dae810f48ae8401d6c Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:51 +0000 Message-Id: <6a047117.1c0eb.3a123f6c@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=e5615cd8094f75a17572b3dae810f48ae8401d6c commit e5615cd8094f75a17572b3dae810f48ae8401d6c Author: Olivier Certner AuthorDate: 2026-05-04 19:10:25 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:22 +0000 acpi_spmc(4): INVARIANTS: Do not panic on getting constraints failure Just continue without constraints checking in this case. To this end, remove the 'constraints_populated' field from 'struct acpi_spmc_softc' and any reference to it. However, we introduce another boolean, 'sc->get_constraints_succeeded', in order to check (under INVARIANTS) that acpi_spmc_get_constraints() is called only once on success. Calling that function another time after a success would leak memory. It would be easy to change that function to support multiple calls (e.g., by adding a call to acpi_spmc_free_constraints() near its start), however trying to retrieve the constraints again simply looks like wasted time as the same results are expected to be returned on each call. Reviewed by: imp, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56812 --- sys/dev/acpica/acpi_spmc.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 33915b536667..9a4264d6785b 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -223,7 +223,9 @@ struct acpi_spmc_softc { struct eventhandler_entry *eh_suspend; struct eventhandler_entry *eh_resume; - bool constraints_populated; +#ifdef INVARIANTS + bool get_constraints_succeeded; +#endif size_t constraint_count; struct acpi_spmc_constraint *constraints; }; @@ -488,8 +490,6 @@ acpi_spmc_parse_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *objec ACPI_OBJECT *detail; ACPI_OBJECT *constraint_package; - KASSERT(!sc->constraints_populated, ("Constraints already populated")); - sc->constraint_count = object->Package.Count; sc->constraints = malloc(sc->constraint_count * sizeof *sc->constraints, M_TEMP, M_WAITOK | M_ZERO); @@ -536,7 +536,6 @@ acpi_spmc_parse_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *objec constraint_package->Package.Elements[2].Integer.Value; } - sc->constraints_populated = true; return (0); } @@ -549,8 +548,6 @@ acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) struct acpi_spmc_constraint *constraint; ACPI_OBJECT *name_obj; - KASSERT(!sc->constraints_populated, ("Constraints already populated")); - /* * First element in the package is unknown. * Second element is the number of device constraints. @@ -596,7 +593,6 @@ acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) constraint_obj->Package.Elements[3].Integer.Value; } - sc->constraints_populated = true; return (0); } @@ -613,8 +609,8 @@ acpi_spmc_get_constraints(device_t dev) struct acpi_spmc_constraint *constraint; sc = device_get_softc(dev); - if (sc->constraints_populated) - return (0); + + MPASS(!sc->get_constraints_succeeded); /* The Microsoft DSM doesn't have this function. */ is_amd = has_dsm(sc, DSM_AMD); @@ -651,6 +647,10 @@ acpi_spmc_get_constraints(device_t dev) constraint->handle = NULL; } } + +#ifdef INVARIANTS + sc->get_constraints_succeeded = true; +#endif return (0); } @@ -661,7 +661,6 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) bool violation = false; #endif - KASSERT(sc->constraints_populated, ("Constraints not populated")); /* * Avoid printing that constraints are respected when there are no * constraints at all. From nobody Wed May 13 12:39: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 4gFtMY2vktz6dLJY for ; Wed, 13 May 2026 12:39: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 4gFtMY0bCBz3vqq for ; Wed, 13 May 2026 12:39:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675993; 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=6eGrSWeqCHwcizrYoJmErCjXAbWYSSsHAONUK3Gvv0M=; b=pyhdj0+BF4yg5hdPAyiZ4W1ifcq7Pf2Z1gVIEz9NLopfhPUW0cwd9CPcYkkx+SziHyGJ6C YbJKabWiRLo469+kQQ5W1aVsylSCAi1vW6pDCkp2TAM9RD271cs6pbu3rslR0nf52qb9O9 FPL7avbEyE65Q7cmQ7o3uz+YBcGfSAdHvRdONviYSo3c9YgL6mSFulJvroJr/Yv4YfLxox xtd9ihsXtdz0C7omcW0CDYLUY3pXCu4OAwB7DYSX7hCW1CSnXYkQGi7g9jOPTTOAq5wPja BWdHfydv8wG4wub18DOapqgpSKYfzjfewCgHLA4yPccgNcFcmd9iCV3cugxIpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675993; a=rsa-sha256; cv=none; b=lY8jx8yooVQyngh1hnPUMGinkvJ3GESpRgQP3+GkQ4EkQ50QYAkru5UQ6ueTaPf9dyTDLS 7Ch9VllHLg/uZh8j6qUIH8y/cE+CT0rg7YF+2J+IQl+hHjXiK9P2EDXXaazMRaMpb9NgyK Ahnu3a3Ws19Tdp4CCILxusD9bGcky/NXo7AW75Ey/FZDOw4dSf5RQSYs3GvG2ZxfIa9k35 fqTslENy9lV6rlxx5TWuFwmd/zSLuL84u5udY7pa3u5iWOPWC2s0xthqm4V/bxfpEvyoLd R+FEx6R7Pfi3Cbq1Tuuvzfuhp7UvupSZkqtgGkfdTYdifACRmUnBoAqniSWXhg== 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=1778675993; 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=6eGrSWeqCHwcizrYoJmErCjXAbWYSSsHAONUK3Gvv0M=; b=G/FoUV/Is3ajUxjPW7yYBPe9b8HaJitt58egSoYqDudZL93WBif/k5lY2SNgYsPLm9Juyu yWYPgDiZudjM9Rr/mYha8IW9lJQGmOyYZKyXl7GsF54h+SfesoC2ho/6H8+wNqMY72E3lJ Qw4sTDH4HSFunvDnymeDya8Y8Z11aZRZ+eLhqdKno336rHC8ljW0k83eV+GjiBbxgVsjkx ft0j3GlEarsnogZaIvaVrpxliSaN1JDNBb764ezrlBlDhBxCLzXvh74NbUIhb8rSfiQGa4 uzplGIB9j/zXWuG8PwSg/bdk/CQyN15QiCAAST1K/OHB85r8KOcmhxpU9bnQ2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMY04cTzqyQ for ; Wed, 13 May 2026 12:39:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19bdf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 921a6d6c38f5 - main - acpi_spmc(4): Gracefully support a standalone Microsoft DSM 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 921a6d6c38f5b099b1290a614689d70df2e0f0d4 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:53 +0000 Message-Id: <6a047119.19bdf.1c924158@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=921a6d6c38f5b099b1290a614689d70df2e0f0d4 commit 921a6d6c38f5b099b1290a614689d70df2e0f0d4 Author: Olivier Certner AuthorDate: 2026-05-04 19:17:21 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:22 +0000 acpi_spmc(4): Gracefully support a standalone Microsoft DSM In acpi_spmc_get_constraints(), stop assuming that if there is no AMD DSM, then the Intel one is present. Although this is likely to be the overwhelming majority of cases on amd64, there is no technical reason nor constraint in our code that really needs assuming that. On (so far hypothetical) machines with only the Microsoft DSM, this assumption would cause a cryptic and irrelevant error message (and, prior to the previous commit, a panic on INVARIANTS). Warn the user if both the Intel and AMD DSMs are present, and use the constraints reported by the Intel one (see the comment for why). Reviewed by: imp (older version), obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56813 --- sys/dev/acpica/acpi_spmc.c | 52 +++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 9a4264d6785b..fde803bdd15d 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -333,7 +333,7 @@ static void acpi_spmc_probe_dsm(struct acpi_spmc_softc *sc, static void acpi_spmc_dsm_print_functions( const struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm); -static int acpi_spmc_get_constraints(device_t dev); +static int acpi_spmc_get_constraints(struct acpi_spmc_softc *const sc); static void acpi_spmc_free_constraints(struct acpi_spmc_softc *const sc); static void acpi_spmc_suspend(device_t dev, enum power_stype stype); @@ -399,7 +399,7 @@ acpi_spmc_attach(device_t dev) acpi_spmc_dsm_print_functions(sc, dsms[i]); /* Get device constraints. We can only call this once so do this now. */ - acpi_spmc_get_constraints(dev); + acpi_spmc_get_constraints(sc); sc->eh_suspend = EVENTHANDLER_REGISTER(acpi_post_dev_suspend, acpi_spmc_suspend, dev, 0); @@ -597,24 +597,36 @@ acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) } static int -acpi_spmc_get_constraints(device_t dev) +acpi_spmc_get_constraints(struct acpi_spmc_softc *const sc) { - struct acpi_spmc_softc *sc; - struct dsm_desc *dsm; - ACPI_STATUS status; - ACPI_BUFFER result; - ACPI_OBJECT *object; - bool is_amd; - int rv; + struct dsm_desc *dsm; + ACPI_STATUS status; + ACPI_BUFFER result; + ACPI_OBJECT *object; + int rv; struct acpi_spmc_constraint *constraint; - sc = device_get_softc(dev); MPASS(!sc->get_constraints_succeeded); - - /* The Microsoft DSM doesn't have this function. */ - is_amd = has_dsm(sc, DSM_AMD); - dsm = is_amd ? &dsm_amd : &dsm_intel; + /* + * Constraints are not supported by the Microsoft DSM. Since we do not + * expect both Intel and AMD DSMs to be present at once, we only have + * a single storage for common information ('min_d_state'). In case + * some day both happen to be present, warn the user so that he can + * report that condition to us, and somewhat arbitrarily favor the Intel + * one because it at least has a written specification. + */ + if (has_dsm(sc, DSM_INTEL)) { + dsm = &dsm_intel; + + if (has_dsm(sc, DSM_AMD)) + device_printf(sc->dev, "Constraints: Both Intel and " + "AMD DSMs are present!\n" + "Using constraints from Intel.\nPlease report.\n"); + } else if (has_dsm(sc, DSM_AMD)) + dsm = &dsm_amd; + else + return (0); /* It seems like this DSM can fail if called more than once. */ status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm->uuid, @@ -626,10 +638,12 @@ acpi_spmc_get_constraints(device_t dev) } object = (ACPI_OBJECT *)result.Pointer; - if (is_amd) - rv = acpi_spmc_parse_constraints_amd(sc, object); - else + if (dsm == &dsm_intel) rv = acpi_spmc_parse_constraints_intel(sc, object); + else { + MPASS(dsm == &dsm_amd); + rv = acpi_spmc_parse_constraints_amd(sc, object); + } AcpiOsFree(object); if (rv != 0) return (rv); @@ -641,7 +655,7 @@ acpi_spmc_get_constraints(device_t dev) status = acpi_GetHandleInScope(sc->handle, __DECONST(char *, constraint->name), &constraint->handle); if (ACPI_FAILURE(status)) { - device_printf(dev, + device_printf(sc->dev, "Constraints: Cannot get handle for %s, ignoring\n", constraint->name); constraint->handle = NULL; From nobody Wed May 13 12:39: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 4gFtMb4DbHz6dLD8 for ; Wed, 13 May 2026 12:39: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 4gFtMb26LLz3w2B for ; Wed, 13 May 2026 12:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675995; 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=6SFC3oa0cRcKm/ZCtjU9bbz6SY67Ij1rol32dV9L8bE=; b=ViPY+p1s7MUVGJeM9jfknVSBVJFZXyMJ89Nkwi9pzB/KNWpMTnbfb4SQXmDZW7fl32utkX pGdVgBkhlpS8r81087MWPfWe26JCcF+mNkCqPn353IE+oEw+h9MGdto4GafXtu07/TDO1+ hwWSY2W+6yij8ehMRZZ8P9UztQZcJNLrl34vk+KmZIdFhJuYYvgL8/VKbZCGBCoGVSmz6L 2U0jxsU6lJqBvYxNZRiXaKcZPCvksYCHs+xXuflyzox+p42I69OABXaPZusdk9oKH95gpo rQbDWSklt6r0c1nf9XovOSsFjRMLAnGR37dWYGskBLP3m4IVmmy23ArCXIC1Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675995; a=rsa-sha256; cv=none; b=vmwdXPigzgmd7BstISkO8x2NTPiKYKDAoQdKTIvMmovytounjs1UalEIQwyofMPncxoeWH HJThjvYixHeL1SzcU4W/esF5tHBLnvoCpMDHxV9cF9MiR5I0KQhxcQ1Io/8zCJkup6GXV+ DoI2JIYmOjTzguJrhLkDyWzNVVhU2aNhyal5o2JIR+lzgo5MK3vNKNI85YPieSJqHpoyW4 s/kK/HtO7yOo+Vrjg7TW6DGkjZ+wjnJzVIw2pV4g9JbzOho0OXqKuAtpdUB965IzIPOKPB 7GQKTvmxl/QqAVOsrejKY/bXrX6/KJRIwe8lwbzJG8hMxhBGQUtDJS2y9mZuFQ== 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=1778675995; 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=6SFC3oa0cRcKm/ZCtjU9bbz6SY67Ij1rol32dV9L8bE=; b=E2RKRDMib0ckUvUOFNn1mGjT/IA+3l79YsgXmdCNNfh0Uxl+lPKwXekfmmeLRCPAf5Cx8T bfvOYwxcPRL3PuPmyEqUteAeftTRfKLboiOasxIZBx44a65+a8CbBoEKvgcbACUMBTa35O lNhWGdMtRc4DMDknvcMga6x+oVSHsoapuqQddmVVg5CQao1KcSystr4Ldj0oEGJlUOguiy AvQY6QE2gVDM8FSb2f0tkYcGRbmO6aY0pZ9F0pkwnH2f9qwc5Yv3X8s1RTNDUTxP5OVBIN S8zu09SyVhqa1ZkG1H1G7skDkSjudM+yD7eDGDrRL1pKxo6CRbSXKfn5p2ZDvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMb1cBszrTJ for ; Wed, 13 May 2026 12:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c0ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: ee13d62417f2 - main - acpi_spmc(4): Constraint parsing: Clearer error messages 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee13d62417f28ee22331ab81ecac2ed3457ea1e1 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:55 +0000 Message-Id: <6a04711b.1c0ef.41b2638c@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ee13d62417f28ee22331ab81ecac2ed3457ea1e1 commit ee13d62417f28ee22331ab81ecac2ed3457ea1e1 Author: Olivier Certner AuthorDate: 2026-05-04 19:42:40 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:23 +0000 acpi_spmc(4): Constraint parsing: Clearer error messages Reviewed by: imp, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56815 --- sys/dev/acpica/acpi_spmc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 95d802f7688d..5aed9ad3e5e4 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -516,8 +516,8 @@ acpi_spmc_parse_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *objec */ revision = detail->Package.Elements[0].Integer.Value; if (revision != 0) { - device_printf(sc->dev, "Unknown revision %d for " - "device constraint detail package\n", revision); + device_printf(sc->dev, "Intel: Unknown revision %d for " + "constraint %zu's detail package\n", revision, i); sc->constraint_count--; continue; } @@ -553,7 +553,8 @@ acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) constraints = &object->Package.Elements[2]; if (constraints->Package.Count != constraint_count) { - device_printf(sc->dev, "constraint count mismatch (%d to %zu)\n", + device_printf(sc->dev, + "AMD: Constraints: Count mismatch (%d to %zu)\n", constraints->Package.Count, constraint_count); return (ENXIO); } @@ -566,7 +567,8 @@ acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) /* Parse the constraint package. */ constraint_obj = &constraints->Package.Elements[i]; if (constraint_obj->Package.Count != 4) { - device_printf(sc->dev, "constraint %zu has %d elements\n", + device_printf(sc->dev, + "AMD: Constraint %zu has %d elements, not 4\n", i, constraint_obj->Package.Count); acpi_spmc_free_constraints(sc); return (ENXIO); From nobody Wed May 13 12:39: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 4gFtMZ6N1cz6dLG0 for ; Wed, 13 May 2026 12:39: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 4gFtMZ1JGkz3vr8 for ; Wed, 13 May 2026 12:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675994; 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=JsWkWVdz80EZPKgPCnk4AaLmLAOKYJoZ9CPFY54OCkQ=; b=F49jsWHgMlB2p5sjZLjhSaJonJky8mWDn9F7+rjNkFDgosOBZI6YZMSny6aZ4BaGpMQ2R0 Qyh/wWiG+EwJRHJoGJZBACJKDMmK1x7iSvI7t8U0Vml86haDf4+i43pMuOjLXIHAg3nkP6 kbrr8td/kULF0DTdP6RQH9nJjD7+v+B3aXfK3udqo5vGWd6CqJQNDYgCoSwXjewT3wDhJE ffzRQxwSdyXgr6lkw7zzWniMwd/hl9/2PtSdhe6Cf7ljUC2QPu5TjINN2KaQvZfn3AvBoq w7z2zQj/zHmm/f3CczKErnnY0bYmQ25iQFlzGN2rVCc6R0NuAh5PKe5j3YCfRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675994; a=rsa-sha256; cv=none; b=A/IEZDCzWfYuGU5LFyXbSoDmY4hl2XMo8Q4au4WAh0WepL3RCLbYdUhpOBrQD1vMPj9vPw wC2tUI3bac+6OtsjEa9Vy2S6fhBPXSXCSawH5zKO3Nw/I0KunoxBXLCIZ22nBC4WwWTZtI IMe6M6ceEF5pvEmJUtm4bkTWRRbcnZNHDr91xv03sv/qYOqIfdiEREiSHPUax9JlrEEl1R Tp65oPVnAyVokaIaxpoTGAcrFRwM8sbWxfEiyh8EgCe1ICV/cdi48m21dgm0Yte/mS1/M0 zhG7Ky/1g5Yksp+2nVQemq/7ci+5jTqpQR0gi6gNBH+cnFKHqzKLAJjJexeutg== 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=1778675994; 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=JsWkWVdz80EZPKgPCnk4AaLmLAOKYJoZ9CPFY54OCkQ=; b=SrJn4GtZKBGft7szwIpFuICPIeZAOmwpJp0Rf3kc+jsZOl9DYiTB1sku/tQ/tT2ZRERtw4 2V211oI+pBJ4zNNrYHdtdq4VqtR8jHXYg5YOOMCNtLLStFOvPK6TCb6dYlGvFobfrQDNSR 9zT8LbMqrgPEIgRv2KX3UruMMwOkSvyStp1eRKpOuiwvKoMwXFFnnLL/FRItYaRXDb6mvk Ic+06S25SNy8Evy0+KITNJWRsvFzXg/Q8bw1oJivZkjACki985x83/2QPXxKU6KH+xZpUM hK/a8aRk81ufG8EWn39L6wO72zI1Ow2/pZpmtV0goYaSyiK570zza7fL0AK38g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMZ0p5kzr9Y for ; Wed, 13 May 2026 12:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a621 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 0813dc032547 - main - acpi_spmc(4): In-kernel strdup() cannot fail, remove dead code 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0813dc0325476599841268f405d4bce8b341b2db Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:54 +0000 Message-Id: <6a04711a.1a621.8ae3d91@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=0813dc0325476599841268f405d4bce8b341b2db commit 0813dc0325476599841268f405d4bce8b341b2db Author: Olivier Certner AuthorDate: 2026-05-04 19:41:14 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:22 +0000 acpi_spmc(4): In-kernel strdup() cannot fail, remove dead code No functional change (intended). Reviewed by: imp, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56814 --- sys/dev/acpica/acpi_spmc.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index fde803bdd15d..95d802f7688d 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -508,10 +508,6 @@ acpi_spmc_parse_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *objec name_obj = &constraint_obj->Package.Elements[0]; constraint->name = strdup(name_obj->String.Pointer, M_TEMP); - if (constraint->name == NULL) { - acpi_spmc_free_constraints(sc); - return (ENOMEM); - } detail = &constraint_obj->Package.Elements[2]; /* @@ -582,10 +578,6 @@ acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) name_obj = &constraint_obj->Package.Elements[1]; constraint->name = strdup(name_obj->String.Pointer, M_TEMP); - if (constraint->name == NULL) { - acpi_spmc_free_constraints(sc); - return (ENOMEM); - } constraint->function_states = constraint_obj->Package.Elements[2].Integer.Value; From nobody Wed May 13 12:39: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 4gFtMc6W4zz6dLLx for ; Wed, 13 May 2026 12:39: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 4gFtMc30lfz3w2J for ; Wed, 13 May 2026 12:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675996; 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=pzFOoHPKHH6L2pqCC7wlho1PXqmHvsxeIXjwOLCv6cs=; b=x5qkkz7CuRfWzpUNqWnKTKDEtBEpneQBWbb4kd/Wb2jFg29OSvhgVXhDVXHxRbn2NpYOOT 5clymZFiwvjjrbJrB6fIufI57k7FY/v5LOqiPgrs+6KpjCDAiqx1xYGAfIL7kiNBxP9APq /WVwaytE/1M2KkSShCV5Z673RNkJe6u/DmGgTmNQHS5sKySUuCSZW8mMdl+uei1Z16HAi3 u4jiyp6Clgo762/gv8prLns2I0+k4AdL9VuROeVVEhHpI9wFMW29TSvv68W210Ux1WodtP gBLuIWrNhsQ3PuApcYRFBWqopyw2I7cTwofvrzZqhv7+Dqovv+UA8cS7N6JcgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675996; a=rsa-sha256; cv=none; b=vSEkJoXE7qWvlvPJHhg94IXB7Lxpi4FYEprYFqlgPV4kW6l1G8PMBbOVrMuhNrNuSF4cW4 OSN19NW0VbT0200T2zHg1V9RnjmF44Gz+n8h6goo9xIJXE/SWX2ON/Rd0Hk/WpROzfmnEx quKZkIspgi+/usRcHUSN7PtVlIvZGcB9V6afQ5nsRK5TWqpIVYyitSP/0+Lu3V84L7vUI7 nACczHhBEAKfR1IXtGWg7MaxRI1IG944JlLDIBrF5DfD/J9Vex/55nmr3DY9FcOi9/laQd P+TSd5aBcz6HUw4v97INVqZNKc+Lj8ixcXSQRJooVMOb+ATy8jKEtQWeR9O8cQ== 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=1778675996; 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=pzFOoHPKHH6L2pqCC7wlho1PXqmHvsxeIXjwOLCv6cs=; b=sKrfZXaRwtaapey7TOyM5VKfhQaoFS0nRgMiLVTnnpa5iRcqkYD2hBitZJeEMEcsNOyuo1 APiwwE+rMW3gXGyShsqO7fCKwQwmLOl/y8jXQ9AWdQ6pVM1WnAhh6YiIduGVI+Yaandt4E drQwOyPW51ltJv00HWgHZ1/XVUpOshtRk+vUmM8QoTXGVs77Ll3k54zG+8bq00kLBCqWLm /9pcdKlr1ZCN5EBE9AMnKu8jYKj7kEHdTFeWc/V7YzJdH2oTVHf9EmW6GqehKYTBsTiM2C C+NfU00ae6Z3PBirToRF7Wim/3WR20rt6orivbOBjB3sxz6c9tPb9BW4jcK/uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMc2LkyzrTK for ; Wed, 13 May 2026 12:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18646 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 5ba100a35cc5 - main - acpi_spmc(4): Global message on constraints parsing failure 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ba100a35cc5999d86a975fea9383d279f12e177 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:56 +0000 Message-Id: <6a04711c.18646.5b796bdb@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=5ba100a35cc5999d86a975fea9383d279f12e177 commit 5ba100a35cc5999d86a975fea9383d279f12e177 Author: Olivier Certner AuthorDate: 2026-05-04 19:49:32 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:23 +0000 acpi_spmc(4): Global message on constraints parsing failure ...in order to indicate to users that power state constraints will not be checked at all. Reviewed by: imp, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56816 --- sys/dev/acpica/acpi_spmc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 5aed9ad3e5e4..751b4c8f0641 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -367,6 +367,7 @@ acpi_spmc_attach(device_t dev) struct acpi_spmc_softc *const sc = device_get_softc(dev); const ACPI_HANDLE handle = acpi_get_handle(dev); char buf[32]; + int error; /* * ACPI_ID_PROBE() in acpi_spmc_probe() cannot succeed without a handle. @@ -399,7 +400,12 @@ acpi_spmc_attach(device_t dev) acpi_spmc_dsm_print_functions(sc, dsms[i]); /* Get device constraints. We can only call this once so do this now. */ - acpi_spmc_get_constraints(sc); + error = acpi_spmc_get_constraints(sc); + if (error != 0) + /* acpi_spmc_get_constraints() takes care of cleaning up. */ + device_printf(dev, + "Could not parse power state constraints (%d), " + "will not check for them before suspend\n", error); sc->eh_suspend = EVENTHANDLER_REGISTER(acpi_post_dev_suspend, acpi_spmc_suspend, dev, 0); From nobody Wed May 13 12:39: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 4gFtMf5hhrz6dL8D for ; Wed, 13 May 2026 12:39:58 +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 4gFtMf41c3z3w9B for ; Wed, 13 May 2026 12:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675998; 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=mqXiqwsMcgtRt+ohdZbTvxWvNOu1PoLjIowie72xpZ0=; b=IHVaNfOmhVO+cKT3NfLub8Ax0hmNhIOYrnnge8kE+b9U24LUaeW4/S2Wg7wgU0zlkF2tA+ Bz9uEymjyAUi7K1RedNG9mKt600pwJA/17OQlfU45VgKUYf6tF/0siEicb17VTHeww+9ho G4ke5fysOorevkVl/XYOFDdSfCDwBPJujUZcb0J/1QmYIt81d/ZXRypdFTYM6ZJ5JCHrv4 AI6jzMqlmLs6GMnlg4EJcHuruj6cMrC2Y/QFwwjUHNlVTuli9zsW4q+GJkyWdrUVJiETKu br71EhuXd06A9LWLKveyX3AxrAKqpS9gVR3Ef4hJVNeEpODCwXQAhcbk6pTnBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675998; a=rsa-sha256; cv=none; b=kT+SIWcpOYmIzXjtQiltN9pMsBFGzFUhZvJTOQJ8RANQWXPz48boUwdQvEtDz5siRQ5cvA t4IY+RCbS9EdL0e9tQsm/FyewbU+ocvbRHmy2NC4wc2yY5kpCZg3OC/SbAvgYdD8GRXZyl Ha79EZ1vewlghE7+UiPhsLfhISX5izLWQ3ScYtDRWrABFf+jInpTVlzBZJoLYDk8WdsTPR Ea3nOU4MWKA9CtgDde1SLdiyyDTI0+SDGyBuceiR7jLZnp1x2xPK/ZXxWkVYPwvjKQ58uQ aLhyzYcQr3AjGAGL9N+qkZHUBWpE7U+96KZaHix/kns/KnMgGhh8VWK0Z8auVg== 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=1778675998; 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=mqXiqwsMcgtRt+ohdZbTvxWvNOu1PoLjIowie72xpZ0=; b=eO1Ddg2K9EjtFf1iOiWlZ/+QNCIYW3j/M4sf35390vAc0Ewks+h02cU+44+70otoQZKxiB VvdIWpXo6qbfxTmxNBNHzWa/DxDBzeNx8s/jL6CJiu0QRdZCxSdo/OodVpCm2Jzl1BHfIl nLaiEIwNtNyOTEUf04L3G/OhWZiQ17zKdKoIpC7QMIqCIflnIjeTPrVTdenVCj9q72lbgq I+QoonjYg5zi0HuBmXK5Rrf6YPvfqjTHy1R4RGZIQfrHirtNZuv9oFiVSmJaMwR58CUbhw QQ2v7h152ahEuS0O0qsVXlv8j8tD2MGZY2Deg0giCPEG0KPn7m9+GzZE8PP0GQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMf3cnXzqyT for ; Wed, 13 May 2026 12:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bd10 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: f56201cee3e8 - main - acpi_spmc(4): acpi_spmc_probe_dsm(): Remove passing superfluous handle 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f56201cee3e8f90dd17ec287b43997983d23fdfe Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:58 +0000 Message-Id: <6a04711e.1bd10.15cdbec1@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f56201cee3e8f90dd17ec287b43997983d23fdfe commit f56201cee3e8f90dd17ec287b43997983d23fdfe Author: Olivier Certner AuthorDate: 2026-05-04 20:21:41 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:24 +0000 acpi_spmc(4): acpi_spmc_probe_dsm(): Remove passing superfluous handle The handle is already held by the softc, which is also passed. No functional change (intended). Reviewed by: imp, obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56818 --- sys/dev/acpica/acpi_spmc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index b12723a14bee..96050705c5e5 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -332,8 +332,8 @@ failed_to_call_dsm(const struct acpi_spmc_softc *const sc, dsm->name, dsm->revision, dsm_function_name(dsm, function_index)); } -static void acpi_spmc_probe_dsm(struct acpi_spmc_softc *sc, - ACPI_HANDLE handle, const struct dsm_desc *const dsm); +static void acpi_spmc_probe_dsm(struct acpi_spmc_softc *const sc, + const struct dsm_desc *const dsm); static void acpi_spmc_dsm_print_functions( const struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm); @@ -382,7 +382,7 @@ acpi_spmc_attach(device_t dev) ("%s: Inconsistent indices for DSM %s", __func__, dsms[i]->name)); - acpi_spmc_probe_dsm(sc, handle, dsms[i]); + acpi_spmc_probe_dsm(sc, dsms[i]); } if (sc->dsms == 0) { @@ -460,10 +460,10 @@ acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, } static void -acpi_spmc_probe_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, +acpi_spmc_probe_dsm(struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm) { - const uint64_t supported_functions = acpi_DSMQuery(handle, + const uint64_t supported_functions = acpi_DSMQuery(sc->handle, (const uint8_t *)&dsm->uuid, dsm->revision); /* From nobody Wed May 13 12:39: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 4gFtMd5bkTz6dLPL for ; Wed, 13 May 2026 12:39: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 4gFtMd3X80z3w7Q for ; Wed, 13 May 2026 12:39:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675997; 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=fHV8ETbufWdOHS7LbbCeNVmSNPoIYovMkYDZNUWUCyg=; b=n141Y9fsuGWoVrQvkYLoo5OPp3fd0ncFfeUpv7u6EwJKWJQrBEaS1ODxLCYd+h5m/YfDUT SmcvP6gb1uwgPvkvh2zg2qvj6/2PToc1JtPeKkWwaLyTIFZfvbYkdrABcNcB2SV91rhDwP MvpM6RbwKUQgFdSOyWSf46ukV5LLObAbTa6Qf5Tyd/EXns1xHPLMPi+D7Qcuka+oPqVCOB 9o+1mnif5VTByzKWnV14MiEeiS7/xI+1phjP5OBU4RkkVWjLvYGnzJOb/JGm1GTS+7Db6R 5F7+rT/Pgg57ZZOlIoglYxSI3tUQHPZy6MrwyeGOA3/CFULOw9YTu3Q+heQfhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675997; a=rsa-sha256; cv=none; b=r3zJA+XQJzK628vR8olQhupI7iWWTg2/J42vf7Rqsp5NT2wkPqzaGT88f4bhnZGS7EKNh9 2Kz5Q/mbEX0IAymz8RK1r3Ndarnz9L36SRQ+37/bcWB8YYFMHhC1JNqEbjbuajUWtXRjKU 1YfbZzWgpnL7MH/GG+QSNXfBFjMQ6kjEwZxpt+dmYTvJAeLy1CDYiSOCGyuuChgcJcpC3e aPlqwAGCtlNah3a9F4Cz6vjlbMokqtMmczaL2xnJ1USKL4aSBYJa7hLj0NhYMFTDB1ilyU U64NU6xDC3Lu5Hua1WOxGELQc3jo0hzSq1/omEpWlAFKdv6mc020Pzq877tbBA== 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=1778675997; 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=fHV8ETbufWdOHS7LbbCeNVmSNPoIYovMkYDZNUWUCyg=; b=uPPw3uXODBsxrvGmhMDBNC8FJ6JVu0SXjqzTqnQEEr8GQAkcbRz8sdYzN95sj6HSo8bH27 bD4FmwkrPeH0AUdNi1A05SRgoM6tHd0i79vqDsHfSrmR+g8C67ou6tQiNgkNN/TnTaozjH BP8zxJ0RxWPoNTWtpZyyh8AmfmzhV6WELU22xkM8vWz6chSEwb3VAGVYqCAKAoZ0yrAwUW 0jmte79xJ/GtaVVNN+2K0txstDGof34WhUJNI2XV3su9+TNj/vadnHjDMLhnqSJbclnzq0 iHfk2JAnjWN3lbSwn9urNLwEASPIaPSMjYeEbRScuvRhtvRAQWWU9KmBlLL/Yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMd37Rqzr6S for ; Wed, 13 May 2026 12:39:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bd0a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 310cbb8924fa - main - acpi_spmc(4): Enable multiple instances 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 310cbb8924fa8f0ace9c5f555cf74b7c1e4396a2 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:57 +0000 Message-Id: <6a04711d.1bd0a.2145462d@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=310cbb8924fa8f0ace9c5f555cf74b7c1e4396a2 commit 310cbb8924fa8f0ace9c5f555cf74b7c1e4396a2 Author: Olivier Certner AuthorDate: 2026-05-04 20:19:40 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:23 +0000 acpi_spmc(4): Enable multiple instances Support the (so far hypothetical) case of a machine with multiple instances of the PNP0D80 device (e.g., if multiple DSMs are not implemented on the same device), by allowing multiple instances of the device to co-exist. This is achieved by moving 'supported_functions' from 'struct dsm' into the softc, so each instance has its own view of which functions are supported. Consequently, the check on the instance unit on probe can be removed. Reviewed by: imp (older version), obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56817 --- sys/dev/acpica/acpi_spmc.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 751b4c8f0641..b12723a14bee 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -74,7 +74,6 @@ struct dsm_desc { */ int revision; struct uuid uuid; - uint64_t supported_functions; uint64_t expected_functions; uint64_t extra_functions; /* Human-friendly names of known functions. */ @@ -129,7 +128,7 @@ static const char *const dsm_ms_function_names[] = { [DSM_MS_TURN_ON_DISPLAY] = "TURN_ON", }; -static struct dsm_desc dsm_ms = { +static const struct dsm_desc dsm_ms = { .index = DSM_MS, .name = "Microsoft", .uuid = { /* 11e00d56-ce64-47ce-837b-1f898f9aa461 */ @@ -185,7 +184,7 @@ static struct dsm_desc dsm_amd = { .function_names_nb = nitems(dsm_amd_function_names), }; -static struct dsm_desc *const dsms[] = { +static const struct dsm_desc *const dsms[] = { [DSM_INTEL] = &dsm_intel, [DSM_MS] = &dsm_ms, [DSM_AMD] = &dsm_amd, @@ -219,6 +218,7 @@ struct acpi_spmc_softc { device_t dev; ACPI_HANDLE handle; int dsms; + uint64_t supported_functions[nitems(dsms)]; struct eventhandler_entry *eh_suspend; struct eventhandler_entry *eh_resume; @@ -239,9 +239,13 @@ resolve_dsm(int dsm_index) } static bool -supports_function(const struct dsm_desc *const dsm, const int function_index) +supports_function(const struct acpi_spmc_softc *const sc, const int dsm_index, + const int function_index) { - return ((dsm->supported_functions & IDX_TO_BIT(function_index)) != 0); + MPASS(0 <= dsm_index && dsm_index < nitems(sc->supported_functions)); + + return ((sc->supported_functions[dsm_index] & + IDX_TO_BIT(function_index)) != 0); } static bool @@ -329,7 +333,7 @@ failed_to_call_dsm(const struct acpi_spmc_softc *const sc, } static void acpi_spmc_probe_dsm(struct acpi_spmc_softc *sc, - ACPI_HANDLE handle, struct dsm_desc *const dsm); + ACPI_HANDLE handle, const struct dsm_desc *const dsm); static void acpi_spmc_dsm_print_functions( const struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm); @@ -351,11 +355,6 @@ acpi_spmc_probe(device_t dev) if (ACPI_ID_PROBE(device_get_parent(dev), dev, spmc_ids, &name) > 0) return (ENXIO); - if (device_get_unit(dev) > 0) { - device_printf(dev, "shouldn't have more than one SPMC"); - return (ENXIO); - } - device_set_desc(dev, "System Power Management Controller"); return (BUS_PROBE_DEFAULT); @@ -431,16 +430,17 @@ static void acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm) { - const uint64_t missing = dsm->expected_functions & - ~dsm->supported_functions; - const uint64_t unknown = dsm->supported_functions & + const uint64_t supported_functions = + sc->supported_functions[dsm->index]; + const uint64_t missing = dsm->expected_functions & ~supported_functions; + const uint64_t unknown = supported_functions & ~(dsm->expected_functions | dsm->extra_functions); char buf[128]; - print_bit_field(buf, sizeof(buf), dsm->supported_functions, + print_bit_field(buf, sizeof(buf), supported_functions, "FUNC", pbf_function_name, dsm); device_printf(sc->dev, "DSM %s: Supported functions: %#" PRIx64 "%s\n", - dsm->name, dsm->supported_functions, buf); + dsm->name, supported_functions, buf); if (missing != 0) { print_bit_field(buf, sizeof(buf), missing, "FUNC", @@ -461,17 +461,17 @@ acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, static void acpi_spmc_probe_dsm(struct acpi_spmc_softc *sc, ACPI_HANDLE handle, - struct dsm_desc *const dsm) + const struct dsm_desc *const dsm) { const uint64_t supported_functions = acpi_DSMQuery(handle, - (uint8_t *)&dsm->uuid, dsm->revision); + (const uint8_t *)&dsm->uuid, dsm->revision); /* * DSM is supported if bit 0 is set. */ if ((supported_functions & 1) == 0) return; - dsm->supported_functions = supported_functions & ~1; + sc->supported_functions[dsm->index] = supported_functions & ~1; sc->dsms |= IDX_TO_BIT(dsm->index); } @@ -798,7 +798,7 @@ acpi_spmc_exit_notif(device_t dev) acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_LPI_EXIT_NOTIF); if (has_dsm(sc, DSM_MS)) { acpi_spmc_run_dsm(dev, &dsm_ms, DSM_INTEL_MS_LPI_EXIT_NOTIF); - if (supports_function(&dsm_ms, DSM_MS_TURN_ON_DISPLAY)) + if (supports_function(sc, DSM_MS, DSM_MS_TURN_ON_DISPLAY)) acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MS_TURN_ON_DISPLAY); acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MS_SLEEP_EXIT_NOTIF); From nobody Wed May 13 12:39: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 4gFtMh0mnrz6dLPR for ; Wed, 13 May 2026 12:40:00 +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 4gFtMg4sNGz3w7r for ; Wed, 13 May 2026 12:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778675999; 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=cu31TaVMLIdz5M6lHVkS7BzJ84YxxCpaeW3E0WQS4ts=; b=jo8lJkCKIusv8eHinwUddNpYWGT88+fC34ofsITN/MxEt18Q23fR674bjLnTIzG2RKiE6v WqJdBhiZz+MROe0hjg97tsPReqvoWjz0i+cXRC8C8vuociNWcj3MOeau028kOTVMMXqa2N Ox4luopzLL3TtmJQj+/tFoTo3REXdkzxYHix+jelyQQOTG9BkRgmAxGdb5DLqNMYaRe2sU YeI7v3R/5qUeKW5dNDVmM9jf9bJe19I6HrjBFxObZtyocQ29ADxL85oYP6/s+jmV3UZS72 RXw2c+9wqX9lS2B1KPoPd/teok0iAR2dg/Bwv2sJYvJhaFu77nf17Y2+1Oh+0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778675999; a=rsa-sha256; cv=none; b=euhM4ebDB2RAsc+3lJGwGip65eB5GNRU6i8oSLV5WAnpSDh5p9AoKvMU/i2iJtqIJh0HyK e6L5kprOQS62pPcqdCG56ukvcMm+IVqp6T1kwl41fchGU8At1kUB2rxaVqsvqO/0E3T/Kl h4AnE7XOgPpIzCUJf4otcL1UrTwuTnQS5Dnfh/Q+JWiC7t5g/9h1AePoBhHG2lsCN2+bB+ /dieIJDpy3h2kad2W2rsonMEr4/pMRbwTblWqPZmD5n5EFKkT3Ad4uBg5g2yRvLCT5HjG4 h0fqBz+d5/v6Z8UVmcahoC0ZtWN3H3xZlXHtCS4aVHTrJu8hsT/y4lkVbViw+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=1778675999; 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=cu31TaVMLIdz5M6lHVkS7BzJ84YxxCpaeW3E0WQS4ts=; b=mkB+TS/8D+VnjUg2an3ythIGDLZD7ahJ8G/GKwxRyjMgLSsuSapJjwXK3qHKeXmvkE4JzV Cf188tGE+cqOnYgk3qqlAAmoU5MXZsu+JDZZsJkM7ghZW37uuS1gQQx6pBBUziUUmmKVTS AoxAb6qhqnbz1S3IA5rbL4jV9qRjplztzhei2LIh5f2KSlt7DVoaPV+PDV/ek+SkSdpX0a NHiOtdYUeDMSkK2tYilHzi/3SDiR58haj6ckmLpGX1pb5KYV6aQ5OZIA6/xdYEML5wwwAp z3l0cWQD8dhYja7PU00BNKfnfHmC0j9RJoawlOWInwIdTBTCnFWPkqSuvJ9Qzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMg4Q67zrF4 for ; Wed, 13 May 2026 12:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18ee5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:39:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 37c59fdc3b4d - main - acpi_spmc(4): Add a sysctl knob to request verbosity 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37c59fdc3b4d25304982a4d39931da5c2ec4c2e6 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:39:59 +0000 Message-Id: <6a04711f.18ee5.3ee731fe@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=37c59fdc3b4d25304982a4d39931da5c2ec4c2e6 commit 37c59fdc3b4d25304982a4d39931da5c2ec4c2e6 Author: Olivier Certner AuthorDate: 2026-05-07 15:59:37 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:24 +0000 acpi_spmc(4): Add a sysctl knob to request verbosity The driver will be more verbose on this knob being non-zero or 'bootverbose' being set. The corresponding variable is typed as an integer to leave room for expansion. To be used in subsequent commits. Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56875 --- sys/dev/acpica/acpi_spmc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 96050705c5e5..d67ac2770f7e 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -200,6 +200,12 @@ SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, intel_dsm_revision, CTLFLAG_RW, SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, amd_dsm_revision, CTLFLAG_RW, &dsm_amd.revision, 0, "Revision to use when evaluating AMD SPMC DSMs"); +static int verbose; +SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, verbose, CTLFLAG_RW, + &verbose, 0, "acpi_spmc(4) verbosity"); + +#define VERBOSE() (verbose || bootverbose) + struct acpi_spmc_constraint { bool enabled; char *name; From nobody Wed May 13 12:40:00 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 4gFtMj1vTvz6dLPW for ; Wed, 13 May 2026 12:40: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 4gFtMh5JG4z3w5y for ; Wed, 13 May 2026 12:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676000; 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=+nNHoX3QxvgPNSRcw54T7d6M64JyHefePEHHSDdJ7/w=; b=EEXnQ4j6BaWX/hG9D75SqwwZj+MWkXjQBiNOOZ9Ra6zFPJ4KcmOciWhbyoD0eLql97ISUv oGihF6zT+D/KLFCqnTKPB3PZN0tTnC2m+vetqN9YwsXJPKKyZM8Mc3w8R+O7PIQNBWhglp DMuWm5w+1Wor7iktwOdEnL89BoFVO9KGR2l0L5TPc8l8h4E5zsRaza/3+L3liddHMVt0FC 5uRd+5B8vc+ehdjsnMnUk6ovLMuri7PRFUN+/BFmT11qeqOK1JqWBKlbXZ8U436PTCvmxu Oa/6Ne61I8UTFwCqEvE2nsPZELkucu4PFb1K4A18gTtj1QohojBiZMUf8adiVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676000; a=rsa-sha256; cv=none; b=EYoAWqSELY8HcX8ziSKpE5j298c5hA2T80iiryncxu0TO5yTxGo4wEsyGqvmcRwR5oKrJp 7Vnp1f4PiFgLoe8MIjwG5BZkNit11CP96UhSLzqICUa2dOoErFAizQ+E6pDA+RGjvBO7pa uxBBikROl+3/GcQff1csWG2MyniZHsEV8Y19GJ1/SgBXnpCd6Wvp2zTqTd8CmLBOT+rk4H aPZ2vTt82uQ24EUx3Oxb8eYrIA4b7Def7HttBIzjnojecSggdGb8RjKTGAFCG5duQrog2m er5qaUa4tuvoS8XvzUmG7HcY2MyOWwE4U0B8GObj7/rHt9w2ijqWTOMspue9AA== 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=1778676000; 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=+nNHoX3QxvgPNSRcw54T7d6M64JyHefePEHHSDdJ7/w=; b=Zwj9lFN9XKV96GUAbjK2zlV+/4zKXXTK961swmTuPM8YYA8CGv5ygF/8uEKhtozblovv6V z1E3L4pLWPSzNRcP9l0IYG1ainY5pI8QZtBkKRjyKOcvYDO5yWZx9JVoDHqtiU6XHBQGFS L2r7F5MmMLptAz4qqne3oL4Mlvw4h2+xdgW/IqyA8dtF+eKBoi7dbA5sA/NZ/SPWXLzQF8 hSDNVb9RQ1NtE67L8TK6k+Bb+fuI1cjuNI7p5u91Krh8nbzRErYPjQEgqZkrGsna1ViVMQ mCSD2NftiWEOEMgHpqdeJ+yNwI8roaptG07lDBcRldAkfxVTlUMNu3ninXfIwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMh4lQGzqyW for ; Wed, 13 May 2026 12:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c68a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 6da01f06ef79 - main - acpi_spmc(4): Be less verbose by default 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6da01f06ef7964f8a58369e7d1605ce10a49b82c Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:00 +0000 Message-Id: <6a047120.1c68a.31982544@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=6da01f06ef7964f8a58369e7d1605ce10a49b82c commit 6da01f06ef7964f8a58369e7d1605ce10a49b82c Author: Olivier Certner AuthorDate: 2026-05-05 12:36:57 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:24 +0000 acpi_spmc(4): Be less verbose by default Do not print by default details of failures that are unlikely to help a normal user and to have a crucial influence on whether suspension works correctly. Do so only on a verbose boot or if requested explicitly by the user via 'debug.acpi.spmc.verbose'. In particular: - On an Intel Framework laptop, the Microsoft DSM only reports the SLEEP_ENTRY and SLEEP_EXIT functions. That makes some sense since, according to its specification, all functions of a Microsoft DSM except these two are in fact redundant with Intel DSM's ones (also, that of AMD DSM's ones). Those functions being missing are only a potential problem if there is no other DSM than Microsoft's (yet to be observed in the field). - The details of malformed/unapplicable constraints or ones with a newer format the driver does not know about are not readily actionable pieces of information, but rather debug/developer-oriented ones. When verbosity is not requested, only print the details of the first such failure to encourage reporting and at the same time avoid cluttering the output. - Detecting and printing unknown DSM functions is not directly actionable either, and the driver not using these functions may not prevent suspending (but might, e.g., prevent reaching deeper sleep states). Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56876 --- sys/dev/acpica/acpi_spmc.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index d67ac2770f7e..1ce4401ebcf4 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -448,7 +448,7 @@ acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, device_printf(sc->dev, "DSM %s: Supported functions: %#" PRIx64 "%s\n", dsm->name, supported_functions, buf); - if (missing != 0) { + if (VERBOSE() && missing != 0) { print_bit_field(buf, sizeof(buf), missing, "FUNC", pbf_function_name, dsm); device_printf(sc->dev, "DSM %s: Does not enumerate expected " @@ -456,7 +456,7 @@ acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, dsm->name, missing, buf); } - if (unknown != 0) { + if (VERBOSE() && unknown != 0) { print_bit_field(buf, sizeof(buf), unknown, "FUNC", pbf_function_name, dsm); device_printf(sc->dev, "DSM %s: Supports more functions than " @@ -528,8 +528,13 @@ acpi_spmc_parse_constraints_intel(struct acpi_spmc_softc *sc, ACPI_OBJECT *objec */ revision = detail->Package.Elements[0].Integer.Value; if (revision != 0) { - device_printf(sc->dev, "Intel: Unknown revision %d for " - "constraint %zu's detail package\n", revision, i); + /* Only print this error message once if not verbose. */ + if (VERBOSE() || sc->constraint_count == + object->Package.Count) + device_printf(sc->dev, + "Intel: Unknown revision %d for " + "constraint %zu's detail package\n", + revision, i); sc->constraint_count--; continue; } @@ -661,9 +666,11 @@ acpi_spmc_get_constraints(struct acpi_spmc_softc *const sc) status = acpi_GetHandleInScope(sc->handle, __DECONST(char *, constraint->name), &constraint->handle); if (ACPI_FAILURE(status)) { - device_printf(sc->dev, - "Constraints: Cannot get handle for %s, ignoring\n", - constraint->name); + if (VERBOSE()) + device_printf(sc->dev, + "Constraints: Cannot get handle for %s, " + "ignoring\n", + constraint->name); constraint->handle = NULL; } } From nobody Wed May 13 12:40: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 4gFtMk2cxzz6dL5s for ; Wed, 13 May 2026 12:40: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 4gFtMj5bXGz3w69 for ; Wed, 13 May 2026 12:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676001; 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=C2IrRUvpk0XEAq5J/OgHTuxfQbrsxL/MG4bo2pWeBvw=; b=lC+wWektVLPRoFcc0qLUhGTT0JmlX7XzfPsZjK6XAOSvrGfCMFtv9DJcSolGc+6cVI/ZIv +UPGcdzhF24se/pKfHdicAIaLYvEx/GPqGk1yDznt2eu8po0pjQw1aOYNeNAtRpWyX4Hp6 fAkbc1W2bQ6BW0aTe3kosflle6GzANNAPwW7uuZsigQ1a9RuV5A8bX6R0jpt1nrjCh/Fdx zo4P05TR1dZwpVQHysdXWUqdrckib7thcqs7b92i6RAVUcKEbfXQz15lBxudVDXPnReCI4 QqhioBGhAPj283BdiR0L5GNvXEPqfpg2i8Ng71i+Re7+NoT2gP4EntPeniVc0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676001; a=rsa-sha256; cv=none; b=l8cQKPkoI8l+HDgx/nsVUlUlvA8eKfExpXBG64KKq4jsfnNyDC/QvpMMweJXGptf0H/f6g WGlliiNA8V1tV7wfn8emcrT+GVgVcwo4yexMl0Rmydf9tR5J/JjOLVylUHhA8m/Fifyt31 hxFTsWpS4OTFwDRwtw296lBB4guxcmqW0XwrlSmYEV1o9X5EE9/lj6wGsEL+5QZ7k/wCF9 4UE6PcKVWa2EPwTjEuxhW0sl5bHbr86bhpyv8ScDElBdg6GxvBwvdSGua3utQK/yoxJpsP dO8NBYBY/ER/b8rtVFA+BQEfrCw6iy+S3cDdp0SkEz1EK8+Bh0H4cSTCjQ5Rxg== 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=1778676001; 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=C2IrRUvpk0XEAq5J/OgHTuxfQbrsxL/MG4bo2pWeBvw=; b=wTB6sIDdKbJ9umJC2Dwac6zHR6ChcY8RaAIRl/RhzhPkYI654UTbF514JOXp4IxtHfcNYS B15jqlNjNro3cB5YRtOElJtahOBxTNOPlr7GvjcL9FPat6dayDuBR9VRK3uXboBNpcYvfT 6+rN6MxVtHNQzO6CYmph3hZA4AJZPoHGHgAvx+uUu2hNyxLWQ83BL4NzO1Ak38CbcFFytb bCxUOVFQaNJEv/siJYGaPfpTpKvfxOd6eGYkV11kPNNatXK4k7CFP5+NHFCir6rWcMmYrX 8zxZdZxZsQghjDdfbgKUmP09J5rECtNDHN1xFuJzNSNtsP5gUkuD5Su39txQEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMj58PKzrF6 for ; Wed, 13 May 2026 12:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 196fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: d765d209c3dc - main - acpi_spmc(4): acpi_spmc_run_dsm(): Rename, rename parameters, constify 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d765d209c3dc5d1eca781cab97c8579969b1e7d5 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:01 +0000 Message-Id: <6a047121.196fb.7554a77d@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d765d209c3dc5d1eca781cab97c8579969b1e7d5 commit d765d209c3dc5d1eca781cab97c8579969b1e7d5 Author: Olivier Certner AuthorDate: 2026-05-06 12:02:25 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:24 +0000 acpi_spmc(4): acpi_spmc_run_dsm(): Rename, rename parameters, constify This function actually runs a function of a given DSM. Remove the '_dsm' suffix to remove the inaccuracy and make things simpler. Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56877 --- sys/dev/acpica/acpi_spmc.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 1ce4401ebcf4..b2da99864581 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -727,14 +727,18 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) #endif } +/* + * Run a single DSM function. + * + * Discards the result, but prints a message on error. + */ static void -acpi_spmc_run_dsm(device_t dev, const struct dsm_desc *dsm, int function_index) +acpi_spmc_run(device_t dev, const struct dsm_desc *const dsm, + const int function_index) { - struct acpi_spmc_softc *sc; - ACPI_STATUS status; - ACPI_BUFFER result; - - sc = device_get_softc(dev); + const struct acpi_spmc_softc *const sc = device_get_softc(dev); + ACPI_STATUS status; + ACPI_BUFFER result; status = acpi_EvaluateDSMTyped(sc->handle, (const uint8_t *)&dsm->uuid, dsm->revision, function_index, NULL, &result, ACPI_TYPE_ANY); @@ -758,13 +762,13 @@ acpi_spmc_display_off_notif(device_t dev) struct acpi_spmc_softc *sc = device_get_softc(dev); if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_DISPLAY_OFF_NOTIF); if (has_dsm(sc, DSM_MS)) - acpi_spmc_run_dsm(dev, &dsm_ms, + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_DISPLAY_OFF_NOTIF); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_DISPLAY_OFF_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_DISPLAY_OFF_NOTIF); } static void @@ -773,13 +777,13 @@ acpi_spmc_display_on_notif(device_t dev) struct acpi_spmc_softc *sc = device_get_softc(dev); if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_DISPLAY_ON_NOTIF); if (has_dsm(sc, DSM_MS)) - acpi_spmc_run_dsm(dev, &dsm_ms, + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_DISPLAY_ON_NOTIF); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_DISPLAY_ON_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_DISPLAY_ON_NOTIF); } static void @@ -790,13 +794,13 @@ acpi_spmc_entry_notif(device_t dev) acpi_spmc_check_constraints(sc); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_LPI_ENTRY_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_LPI_ENTRY_NOTIF); if (has_dsm(sc, DSM_MS)) { - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MS_SLEEP_ENTRY_NOTIF); - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_INTEL_MS_LPI_ENTRY_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_MS_SLEEP_ENTRY_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_LPI_ENTRY_NOTIF); } if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_LPI_ENTRY_NOTIF); } @@ -806,15 +810,15 @@ acpi_spmc_exit_notif(device_t dev) struct acpi_spmc_softc *sc = device_get_softc(dev); if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run_dsm(dev, &dsm_intel, DSM_INTEL_MS_LPI_EXIT_NOTIF); + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_LPI_EXIT_NOTIF); if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run_dsm(dev, &dsm_amd, DSM_AMD_LPI_EXIT_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_LPI_EXIT_NOTIF); if (has_dsm(sc, DSM_MS)) { - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_INTEL_MS_LPI_EXIT_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_LPI_EXIT_NOTIF); if (supports_function(sc, DSM_MS, DSM_MS_TURN_ON_DISPLAY)) - acpi_spmc_run_dsm(dev, &dsm_ms, + acpi_spmc_run(dev, &dsm_ms, DSM_MS_TURN_ON_DISPLAY); - acpi_spmc_run_dsm(dev, &dsm_ms, DSM_MS_SLEEP_EXIT_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_MS_SLEEP_EXIT_NOTIF); } } From nobody Wed May 13 12:40: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 4gFtMm30mZz6dLPd for ; Wed, 13 May 2026 12:40: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 4gFtMl6L6Vz3wGm for ; Wed, 13 May 2026 12:40:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676003; 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=+5OzVmBXPuBqH/fa7aNFoyFgNTQ7V5qsJD/wGuipYe8=; b=ZnccIY2JYNrJBZjhE0yZ2u9yiF8D15Cw+tvqKM+aZyWhRe4ULmTxSNvCrGXjaw929qm1oi o1FYzgOwI6cXNdANF1B7FiXgRbyWxEefL/v8cukUqpBygpFujODVj8RMzcQEmOQ2SMcErp xXw98ZQtSgBHQZ1VsoBzx9NmhIDBnTnovJrdfsdYaEIqdXWTHYhwRZ5oFvkaiAoZLQeQdQ LriShR31bvzZkGTfbacvzysVTcdirhq7i+mxNMJIHLoZXBHvpaQwot4+gp3zfsNz71WdzB 197KmPplvnPw1uZkJG9wvjOkfUTwzFzSr/QUHoT0f8pnG/pm1cqoQoBFyBmCFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676003; a=rsa-sha256; cv=none; b=dIOB6389bnYsiD0n97slOesXMzjU/Lt78DHHsRRi+JVHVfy8Yqq+VTlpyx30MQle4WvAwa eaMFI2me8Sa01c0FNHdyMLEYa5gYM3S1jQbl1LnZ4I4eLnlMx2SjmG8pYBSaYdv/rtTD44 amNnN/jHI3PVVoWJ3HLpT8t7Eke5mLftHAr0hJFqlxgh0EUdQewnY3u2RNrBKbETkZsNmw hGdsVZ1HfXtt9wZ8EHRXWOuM0pvSB0fAmr4lrTS3hTNsQIb5M+EymJpaVujahQsXBGoEsV dvWp1NHAIm+fszz2VtD+w5OLn+Rjp3R1fN4qkPc5r0AJ+J3wtrAiEougJsbEHA== 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=1778676003; 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=+5OzVmBXPuBqH/fa7aNFoyFgNTQ7V5qsJD/wGuipYe8=; b=WwnzRam42b4dBHQ2egscEEe5WL1qfm+oCK4rqbQuSCKKCLHSg/v3xJgdDAOScvQNSZG2yL NSJY0/nwHMsuuKu68E1aurxiUiEOtDY0DiYZgJTyJ/wwBiV//gZudNsxPb57L+EcDpQXGi NK6hu+6vz15iGTv18wBbnx6YaOAl6m7xFzqeDnPOkZpSrcNyCmtCBS2j9n1pkTVJdnJ1LH JJ+2IxsXm5sHVaJF1sDrG+j7ZEI1pX1qXnYLADjawaMmK/4mvkim5Lq+Nej8CkhVcxBH1p N3XpwpttnkLK2UrSdWWheGrN35RsICvcR86eS/RukeaZPPhaQkilb1JybTKaow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMl5xNnzr6X for ; Wed, 13 May 2026 12:40:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c88f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 65ecfb4a66f3 - main - acpi_spmc(4): Only run DSM functions reported present 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65ecfb4a66f377ca72569d7a96de0347b4541b52 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:03 +0000 Message-Id: <6a047123.1c88f.689dad22@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=65ecfb4a66f377ca72569d7a96de0347b4541b52 commit 65ecfb4a66f377ca72569d7a96de0347b4541b52 Author: Olivier Certner AuthorDate: 2026-05-06 11:53:02 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:25 +0000 acpi_spmc(4): Only run DSM functions reported present Examination of the DSDT in a Framework laptop generally hints at firmware designers sometimes providing ACPI methods for convenience (e.g., same firmware for multiple models) but not using them (or not expecting them to be used) depending on tweaks or the actual hardware platform. On an Intel Framework laptop, we specifically observe the presence of a Microsoft DSM that just reports availability of the SLEEP_ENTRY and SLEEP_EXIT (7 and 8) functions although the Microsoft specification requires other functions, whose purpose is similar to corresponding Intel DSM's ones (such as DISPLAY_OFF). However, we currently always call the latter even on the Microsoft DSM. On that laptop, fortunately, the way the code is structured in the _DSM method leads to nothing being executed on this call. Given the similarity of intent between most functions from the Microsoft DSM on one side and those of ADM and Intel on the other, it is imaginable that other firmware developers could use a strategy where functions are in fact aliased, in which case insisting on calling the Microsoft's DSM function even if not enumerated would cause the action to be performed twice (because we also call the corresponding function on the Intel/AMD DSM), which may or may not cause other problems and in any case seems a waste. So, by default, do not try to run any function that is not enumerated, as that looks like the safest approach. Add a debug sysctl(8) knob to revert to the previous behavior, just in case ('debug.acpi.spmc.force_call_expected_functions'). acpi_spmc_run() now checks if a DSM/function combination has been enumerated, and skips the actual call if it does not. This allows to remove all checks from the acpi_spmc_*_notif() functions, making the code much more compact. acpi_spmc_get_constraints() now checks whether DSM_GET_DEVICE_CONSTRAINTS is supported in order to determine which DSM to use and whether to call the function at all. Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56879 --- sys/dev/acpica/acpi_spmc.c | 89 +++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 52 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index da9c80266952..c33336d10ec3 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -206,6 +206,11 @@ SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, verbose, CTLFLAG_RW, #define VERBOSE() (verbose || bootverbose) +static bool force_call_expected_functions; +SYSCTL_BOOL(_debug_acpi_spmc, OID_AUTO, always_call_expected_functions, + CTLFLAG_RW, &force_call_expected_functions, 0, + "Call all expected functions on a present DSM, even those not enumerated."); + struct acpi_spmc_constraint { bool enabled; char *name; @@ -461,7 +466,7 @@ acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, print_bit_field(buf, sizeof(buf), missing, "FUNC", pbf_function_name, dsm); device_printf(sc->dev, "DSM %s: Does not enumerate expected " - "functions %#" PRIx64 "%s. Calls to them may fail.\n", + "functions %#" PRIx64 "%s. Will skip calling them.\n", dsm->name, missing, buf); } @@ -635,14 +640,14 @@ acpi_spmc_get_constraints(struct acpi_spmc_softc *const sc) * report that condition to us, and somewhat arbitrarily favor the Intel * one because it at least has a written specification. */ - if (has_dsm(sc, DSM_INTEL)) { + if (supports_function(sc, DSM_INTEL, DSM_GET_DEVICE_CONSTRAINTS)) { dsm = &dsm_intel; - if (has_dsm(sc, DSM_AMD)) + if (supports_function(sc, DSM_AMD, DSM_GET_DEVICE_CONSTRAINTS)) device_printf(sc->dev, "Constraints: Both Intel and " - "AMD DSMs are present!\n" + "AMD DSMs support getting them!\n" "Using constraints from Intel.\nPlease report.\n"); - } else if (has_dsm(sc, DSM_AMD)) + } else if (supports_function(sc, DSM_AMD, DSM_GET_DEVICE_CONSTRAINTS)) dsm = &dsm_amd; else return (0); @@ -690,8 +695,9 @@ acpi_spmc_get_constraints(struct acpi_spmc_softc *const sc) } static void -acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) +acpi_spmc_check_constraints(device_t dev) { + const struct acpi_spmc_softc *const sc = device_get_softc(dev); #ifdef notyet bool violation = false; #endif @@ -703,7 +709,8 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) if (sc->constraint_count == 0) return; for (size_t i = 0; i < sc->constraint_count; i++) { - struct acpi_spmc_constraint *constraint = &sc->constraints[i]; + const struct acpi_spmc_constraint *constraint = + &sc->constraints[i]; if (!constraint->enabled) continue; @@ -738,6 +745,7 @@ acpi_spmc_check_constraints(struct acpi_spmc_softc *sc) /* * Run a single DSM function. * + * Only runs the function if it was reported present during enumeration. * Discards the result, but prints a message on error. */ static void @@ -748,6 +756,10 @@ acpi_spmc_run(device_t dev, const struct dsm_desc *const dsm, ACPI_STATUS status; ACPI_BUFFER result; + if (!(supports_function(sc, dsm->index, function_index) || + (force_call_expected_functions && has_dsm(sc, dsm->index)))) + return; + status = acpi_EvaluateDSMTyped(sc->handle, (const uint8_t *)&dsm->uuid, dsm->revision, function_index, NULL, &result, ACPI_TYPE_ANY); @@ -767,67 +779,40 @@ acpi_spmc_run(device_t dev, const struct dsm_desc *const dsm, static void acpi_spmc_display_off_notif(device_t dev) { - struct acpi_spmc_softc *sc = device_get_softc(dev); - - if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run(dev, &dsm_intel, - DSM_INTEL_MS_DISPLAY_OFF_NOTIF); - if (has_dsm(sc, DSM_MS)) - acpi_spmc_run(dev, &dsm_ms, - DSM_INTEL_MS_DISPLAY_OFF_NOTIF); - if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run(dev, &dsm_amd, DSM_AMD_DISPLAY_OFF_NOTIF); + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_DISPLAY_OFF_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_DISPLAY_OFF_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_DISPLAY_OFF_NOTIF); } static void acpi_spmc_display_on_notif(device_t dev) { - struct acpi_spmc_softc *sc = device_get_softc(dev); - - if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run(dev, &dsm_intel, - DSM_INTEL_MS_DISPLAY_ON_NOTIF); - if (has_dsm(sc, DSM_MS)) - acpi_spmc_run(dev, &dsm_ms, - DSM_INTEL_MS_DISPLAY_ON_NOTIF); - if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run(dev, &dsm_amd, DSM_AMD_DISPLAY_ON_NOTIF); + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_DISPLAY_ON_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_DISPLAY_ON_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_DISPLAY_ON_NOTIF); } static void acpi_spmc_entry_notif(device_t dev) { - struct acpi_spmc_softc *sc = device_get_softc(dev); + /* XXX - No real check currently. Check return code when it does. */ + acpi_spmc_check_constraints(dev); - acpi_spmc_check_constraints(sc); - - if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run(dev, &dsm_amd, DSM_AMD_LPI_ENTRY_NOTIF); - if (has_dsm(sc, DSM_MS)) { - acpi_spmc_run(dev, &dsm_ms, DSM_MS_SLEEP_ENTRY_NOTIF); - acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_LPI_ENTRY_NOTIF); - } - if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run(dev, &dsm_intel, - DSM_INTEL_MS_LPI_ENTRY_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_LPI_ENTRY_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_MS_SLEEP_ENTRY_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_LPI_ENTRY_NOTIF); + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_LPI_ENTRY_NOTIF); } static void acpi_spmc_exit_notif(device_t dev) { - struct acpi_spmc_softc *sc = device_get_softc(dev); - - if (has_dsm(sc, DSM_INTEL)) - acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_LPI_EXIT_NOTIF); - if (has_dsm(sc, DSM_AMD)) - acpi_spmc_run(dev, &dsm_amd, DSM_AMD_LPI_EXIT_NOTIF); - if (has_dsm(sc, DSM_MS)) { - acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_LPI_EXIT_NOTIF); - if (supports_function(sc, DSM_MS, DSM_MS_TURN_ON_DISPLAY)) - acpi_spmc_run(dev, &dsm_ms, - DSM_MS_TURN_ON_DISPLAY); - acpi_spmc_run(dev, &dsm_ms, DSM_MS_SLEEP_EXIT_NOTIF); - } + acpi_spmc_run(dev, &dsm_intel, DSM_INTEL_MS_LPI_EXIT_NOTIF); + acpi_spmc_run(dev, &dsm_amd, DSM_AMD_LPI_EXIT_NOTIF); + acpi_spmc_run(dev, &dsm_ms, DSM_INTEL_MS_LPI_EXIT_NOTIF); + /* Hint to the platform we are soon going to turn on the display. */ + acpi_spmc_run(dev, &dsm_ms, DSM_MS_TURN_ON_DISPLAY); + acpi_spmc_run(dev, &dsm_ms, DSM_MS_SLEEP_EXIT_NOTIF); } static void From nobody Wed May 13 12:40: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 4gFtMl32V7z6dLMV for ; Wed, 13 May 2026 12:40: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 4gFtMk6SMGz3w8Q for ; Wed, 13 May 2026 12:40:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676003; 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=LgbIJQeJu5dxRlkzQ1aRS7fhRLhmesH56SK5oXQ3Fc0=; b=GgXM+WmnY0auVwn+4Unajyhj2lQx/n0TFZW6vAgE7AxTdxiH0ekSF8rfwYmXX2ajOJrw1z PFET5OZGumH69HsHBE3SmHcqG4CnfXRJd8hMgpBhjwpbPpj0PaNq/d4ckTSApEoljZn6is 4n6UluMBloDRM4qu3qp29llo9EWcH7tnOUIZX21DlrEZlHcKYgIURpBl+IeMdBAbQKWT3g sBtDyVYcfcObCunp+298NusoYKmBc8FSz7uuLoGMGoTOVPVSOxg/YuMr3JRtO1yqCWHEbq ixJOmG6kA7kcludMrA1W/FrjvudNHnzcctLWKyP8kzJ4wiFIhLER40/FCrR1NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676003; a=rsa-sha256; cv=none; b=MB8ftED2uB32YUR5GMlKQbDtT+jcgRGw3sVzTvvezEUNZakWayXbJwpNtGdSzJRlQw6l8H OhRGBQJ+duLtR/Nx/CYoNwf7+GEuhFmmFuUhq3j/BtP2y8CzDtgoKqbapbkD/4cWOKnRYU mBAI2XxH4Oz/jHX52EuT9gBvy6YfRWemMgQBKJooKG+b7sRhoPy+lR1FxVQAtxmmPYp3A9 hcm5N4O0Of6molAbOql/rYZY64RjOxz43MkMGnN72zcXccqnk2xyS8P10bwNsePWu5z0tc p057SmJJ5TsKX1qzeGbCAgkJTkwChpWpaLDor94BtOPXVqALOxavgrGZvJ3AgQ== 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=1778676003; 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=LgbIJQeJu5dxRlkzQ1aRS7fhRLhmesH56SK5oXQ3Fc0=; b=I1gtnhCS2/w71PTZalpQDqDfynfUtJJJ9KIoB5VYDvQhMdWZxbGIdRtAn7Qsu9VNlQGgkO LfD0SimsjZu6ZAJbrFd4LZKP0ocvLt6bN6/rdhg1B8tra7UEnF0wbJSKV0mHfxLd7lnpQL JYGMoOUvzt7BiQGXYKbDY4TH3kD31+ee4+Fj9UxPBx1v/wHi3VYsEOV8x3LIoNzDrn9SDL xzcfYENgmIIiQzni/uNDBr3eQMk/oYUPxFnqDrG4OAGmUNwkJ0IDWBTDr5viTSwoi2/fOl ys/7WRg+bueuRnsYXYAhb7GGhY/VD7hKQU/xabp7fKGevU40ZrlKO/jq7/LduA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMk5XHzzr28 for ; Wed, 13 May 2026 12:40:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19769 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: ba4f05b55fb4 - main - acpi_spmc(4): Factor out testing for present DSMs/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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba4f05b55fb4b006f1bbe26d3ad3527f48e85939 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:02 +0000 Message-Id: <6a047122.19769.3dee4ae6@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ba4f05b55fb4b006f1bbe26d3ad3527f48e85939 commit ba4f05b55fb4b006f1bbe26d3ad3527f48e85939 Author: Olivier Certner AuthorDate: 2026-05-06 09:31:19 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:25 +0000 acpi_spmc(4): Factor out testing for present DSMs/functions Since we are now keeping in the softc the information about which DSM functions are available (in supported_functions[]), the 'dsms' field there is somewhat redundant. Make it completely redundant by keeping the bit representing the enumeration function itself in each element of supported_functions[], and then remove the field. As a result, convert has_dsm() to rely on supports_function(). Adapt acpi_spmc_dsm_check_functions() so that it does not take into account the enumeration function bit. While here, use the self-explanatory stance IDX_TO_BIT(DSM_ENUM_FUNCTIONS) instead of a hardcoded 1. Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56878 --- sys/dev/acpica/acpi_spmc.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index b2da99864581..da9c80266952 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -223,7 +223,6 @@ struct acpi_spmc_constraint { struct acpi_spmc_softc { device_t dev; ACPI_HANDLE handle; - int dsms; uint64_t supported_functions[nitems(dsms)]; struct eventhandler_entry *eh_suspend; @@ -257,7 +256,7 @@ supports_function(const struct acpi_spmc_softc *const sc, const int dsm_index, static bool has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_index) { - return ((sc->dsms & IDX_TO_BIT(dsm_index)) != 0); + return (supports_function(sc, dsm_index, DSM_ENUM_FUNCTIONS)); } typedef const char *pbf_get_name_t(const int, const void *const); @@ -371,6 +370,7 @@ acpi_spmc_attach(device_t dev) { struct acpi_spmc_softc *const sc = device_get_softc(dev); const ACPI_HANDLE handle = acpi_get_handle(dev); + int supported_dsms; char buf[32]; int error; @@ -382,6 +382,7 @@ acpi_spmc_attach(device_t dev) sc->dev = dev; sc->handle = handle; + supported_dsms = 0; for (int i = 0; i < nitems(dsms); ++i) { KASSERT(dsms[i] != NULL, ("%s: Sparse dsms[]!", __func__)); KASSERT(dsms[i]->index == i, @@ -389,14 +390,17 @@ acpi_spmc_attach(device_t dev) dsms[i]->name)); acpi_spmc_probe_dsm(sc, dsms[i]); + if (has_dsm(sc, i)) + supported_dsms |= IDX_TO_BIT(i); } - if (sc->dsms == 0) { + if (supported_dsms == 0) { device_printf(dev, "No DSM supported!"); return (ENXIO); } - print_bit_field(buf, sizeof(buf), sc->dsms, "DSM", pbf_dsm_name, NULL); + print_bit_field(buf, sizeof(buf), supported_dsms, "DSM", + pbf_dsm_name, NULL); device_printf(dev, "DSMs supported: %s\n", buf); /* Print supported functions of usable DSMs. */ @@ -436,7 +440,12 @@ static void acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm) { - const uint64_t supported_functions = + /* + * Remove the enumeration function bit, which we do not care about when + * printing which functions are supported and which we do not want to + * report as unknown. + */ + const uint64_t supported_functions = ~IDX_TO_BIT(DSM_ENUM_FUNCTIONS) & sc->supported_functions[dsm->index]; const uint64_t missing = dsm->expected_functions & ~supported_functions; const uint64_t unknown = supported_functions & @@ -475,10 +484,9 @@ acpi_spmc_probe_dsm(struct acpi_spmc_softc *const sc, /* * DSM is supported if bit 0 is set. */ - if ((supported_functions & 1) == 0) + if ((supported_functions & IDX_TO_BIT(DSM_ENUM_FUNCTIONS)) == 0) return; - sc->supported_functions[dsm->index] = supported_functions & ~1; - sc->dsms |= IDX_TO_BIT(dsm->index); + sc->supported_functions[dsm->index] = supported_functions; } static void From nobody Wed May 13 12:40: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 4gFtMn29ndz6dLGR for ; Wed, 13 May 2026 12:40: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 4gFtMm6vCfz3wKQ for ; Wed, 13 May 2026 12:40:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676005; 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=1EYw45XSfUpQuHeOQoz/NXQRHmANtRO70zB0QTrllYw=; b=NxR0T9Qfwtx/ClRYRFdcwc34S3l4BClti7ZOy8ox46lEMmnQs/hoS9KGgsHVkzF3gG/qmU oNxN3ztWHoQ+C8Zs7jf8ZfBF57bbSRAjB/A5FaALYQlFLNRsHe3EMCTTqKIgkpPYHTpH+V 3l2oC5HOq9d6bKBjCUVP2peE63bLV8CKOvb2XNMoFPP8nN3nSZQnd2rr5k/iiIih+EyPbj wO5rrs8IwfZEwQ2gOBkWzjvwXU+HSmdlrtN24zeBjgru/f3NqV71tloGKy80L7xMM9K1xU JWpnx1Nf0v8+0f1R2eG2y+/hCSLdXzFpUMLBW6z1ZRMIpUg4IT0fNhYlSmBtJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676005; a=rsa-sha256; cv=none; b=L2gcGXRfs/NvyK3d9XfAxjUXc+6GXOlWSjgxgB66MEsJspsLoZMCZNIFQdgIOjqc97rY9I hYqYldkHr3ZXJOyXxE1VREIeVP+nQDCHX0kw71sscCodSWyLNlV+vsdJDKoulHe00EEgtg 5hCoMjZMcR4KblHbm62ZhxnfIJl0mgFQl9ACjX5rrwmds7UIu01xxBQi7cVDuzM0h6j33U ivEFnL0h/WGRsEnBKCvgJWfZLPF8wzhu/zunoJuh1MT2iz+Athw6F7HuzAfC6xgkyKgniN 0IJO6SpFz9G9rBk42flzSHUHL0y5OSkAAx5y+GJp8/p8x0P7oHzTZoDhKt+PtQ== 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=1778676005; 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=1EYw45XSfUpQuHeOQoz/NXQRHmANtRO70zB0QTrllYw=; b=bilNPoApA8nIojZF3zdv7P3iGUznLlwrQm+8GrgnurOx0n0/On3KW4U3vqOXnGDViuM8NE TWb3RyylVVXL+0HhBSnffrz+MRxhP5wAyLceqdhuhEcQcqs2TiC4F8WkhfoY0A20kdfvQn bC/ARF5p/5ZvJAjhteQ+PH69W0lsL3zewuT+9WySZNDXrbue47WBYW9iROOEx0I2H/GY5g GSkzqfLmZwXVvMSZpgS+Y5LXkailTCaAgMyUkYvtbzygiDZvrn44ZwgAdwIiAVlpfzf0f1 aNUND4FeTzMOTsvc7MUPjG6Td6gKtI541wFSzdD9AC9CV0pDTjYlBpXXpZY5Lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMm6LMXzrTM for ; Wed, 13 May 2026 12:40:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c893 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: b092ee520618 - main - acpi_spmc(4): softc: Move supported functions into a DSM info structure 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b092ee520618a8e8df7f4d7fb095e8940dd0d305 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:04 +0000 Message-Id: <6a047124.1c893.3b4c14cf@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=b092ee520618a8e8df7f4d7fb095e8940dd0d305 commit b092ee520618a8e8df7f4d7fb095e8940dd0d305 Author: Olivier Certner AuthorDate: 2026-05-06 13:15:27 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:25 +0000 acpi_spmc(4): softc: Move supported functions into a DSM info structure This is in preparation to adding the revision as a probed information. Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56880 --- sys/dev/acpica/acpi_spmc.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index c33336d10ec3..244e7795ba84 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -211,6 +211,11 @@ SYSCTL_BOOL(_debug_acpi_spmc, OID_AUTO, always_call_expected_functions, CTLFLAG_RW, &force_call_expected_functions, 0, "Call all expected functions on a present DSM, even those not enumerated."); +/* Per DSM probed information. */ +struct dsm_info { + uint64_t supported_functions; +}; + struct acpi_spmc_constraint { bool enabled; char *name; @@ -228,7 +233,7 @@ struct acpi_spmc_constraint { struct acpi_spmc_softc { device_t dev; ACPI_HANDLE handle; - uint64_t supported_functions[nitems(dsms)]; + struct dsm_info dsms_info[nitems(dsms)]; struct eventhandler_entry *eh_suspend; struct eventhandler_entry *eh_resume; @@ -252,9 +257,9 @@ static bool supports_function(const struct acpi_spmc_softc *const sc, const int dsm_index, const int function_index) { - MPASS(0 <= dsm_index && dsm_index < nitems(sc->supported_functions)); + MPASS(0 <= dsm_index && dsm_index < nitems(dsms)); - return ((sc->supported_functions[dsm_index] & + return ((sc->dsms_info[dsm_index].supported_functions & IDX_TO_BIT(function_index)) != 0); } @@ -451,7 +456,7 @@ acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, * report as unknown. */ const uint64_t supported_functions = ~IDX_TO_BIT(DSM_ENUM_FUNCTIONS) & - sc->supported_functions[dsm->index]; + sc->dsms_info[dsm->index].supported_functions; const uint64_t missing = dsm->expected_functions & ~supported_functions; const uint64_t unknown = supported_functions & ~(dsm->expected_functions | dsm->extra_functions); @@ -491,7 +496,7 @@ acpi_spmc_probe_dsm(struct acpi_spmc_softc *const sc, */ if ((supported_functions & IDX_TO_BIT(DSM_ENUM_FUNCTIONS)) == 0) return; - sc->supported_functions[dsm->index] = supported_functions; + sc->dsms_info[dsm->index].supported_functions = supported_functions; } static void From nobody Wed May 13 12:40: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 4gFtMp33Hnz6dLXY for ; Wed, 13 May 2026 12:40: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 4gFtMp03Vpz3wH8 for ; Wed, 13 May 2026 12:40:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676006; 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=QyCxTPFCuPQ8OlXeLI3wWPC4B/aHckc22yU0ZvLWz90=; b=lfCavwabprP3jDD6Eh1k12A4gY+je9lf0lL8v0ZTB8udw7ey11tg4JO4oboQGHH19ZlLEg Kh1CUdij1dcfShZGwZq+QmLAemoGk7P/0EoQmUHLfm6G3nCrvyf2HzazdOfL5R10vmg6Z+ Im59/3jKjKZVgz8hK3lHUdi+WionVL1+xZSdlqwCBB1HXYhxrmr1INH/cGd2QrTd+KGuOb z/WcoA7GWSFMwOIWzPZrP+rPxPgRtMG3NMIV3WWgrNIUrT9XQwj5CpdwXTktPkY0c4uNkw 9T3RtUFKjji1s//9ZYDjSkWc/sfOioEn3au8rq3fCdJ4b3wpOcXdib6vpKuABQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676006; a=rsa-sha256; cv=none; b=My2yvm2kHoVwOnD9ymEx7o4NJC2hY9UKt065vviGJheMJolyaluOqOltLPWrOgaXZ3RWBg 00Y9fOjqxuPlY13sEz90xSp8LIzMZXUzXxttgt5EO98Egp0ZINvyVqFwbNVJAW+yvf+x0a +psf8BFCUaU4Xs5apvW7fwMTPk6Sxih7VOv16SYPQ5H+FT+DvNqam6QNOoIcZwf4PVBSzQ Wj9cyGRPu0C2ESqfh8gJPGW4UI3F6m57evcKeD09jy2AQ2UTHXPBzjc4qGY6etpebmt9iM laWEM6EN4HLkqCurqaSHCxKJu6xefO/TZYrI4nmT5mXaR9CbbUqOwpqVoOhbNQ== 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=1778676006; 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=QyCxTPFCuPQ8OlXeLI3wWPC4B/aHckc22yU0ZvLWz90=; b=tJHtgnTrkKUSOcJVLgfnrYuMzuD48NG3D1wE/OMgCPTSWAQVfQd6+bZgyfgh7n9M3wUfSl cenFD3294Z35VQCGjLbZlRalleZVUbaDayRoEefjXLmcFZ8FxwDapv+x3dt8N0yoxBiN8r XYyNlGhKBhoNW6jfgdC0f+mMnpjFiLc++D7DN18p/puhF0/Z8TUeqF2kuruzUknQzBa3ur gQtI1XKrxH5VDZB5QB7CA9s+5QWwTbMsud/1DvYEQGamMp2D+FO/P0IEByIWAAAwYYXW3i 9TKANLDqBZ5j0myDNWAf5epV/ErKNz+89RIflgwxN3281B170m425Wgf3vxgRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMn6kJqzrRD for ; Wed, 13 May 2026 12:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c897 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: b82e41d39405 - main - acpi_spmc(4): Trivial simplification in detach function 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b82e41d394054fdc357bc9e03b9a48a2e6983a91 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:05 +0000 Message-Id: <6a047125.1c897.604bf252@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=b82e41d394054fdc357bc9e03b9a48a2e6983a91 commit b82e41d394054fdc357bc9e03b9a48a2e6983a91 Author: Olivier Certner AuthorDate: 2026-05-07 07:53:36 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:25 +0000 acpi_spmc(4): Trivial simplification in detach function Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56881 --- sys/dev/acpica/acpi_spmc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 244e7795ba84..b1f97685e50c 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -441,8 +441,7 @@ acpi_spmc_detach(device_t dev) EVENTHANDLER_DEREGISTER(acpi_post_dev_suspend, sc->eh_suspend); EVENTHANDLER_DEREGISTER(acpi_pre_dev_resume, sc->eh_resume); - - acpi_spmc_free_constraints(device_get_softc(dev)); + acpi_spmc_free_constraints(sc); return (0); } From nobody Wed May 13 12:40: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 4gFtMq2z85z6dLMd for ; Wed, 13 May 2026 12:40: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 4gFtMq0Z1Zz3wHL for ; Wed, 13 May 2026 12:40:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676007; 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=HSZHrGaj2Dpcnct4YrhIMEiAzQjl5KJRm2ZJm3RcPA4=; b=f2F1ZR/DSBe6E20WLeRsFMXgoAncMoOazblUAC/wcRspIxvPU6OCMsDBNMwI/EdSWL6gQl 2XGUdGZZIt36Mtum98vSwBBRqdZR4hBMWIrphH2bL2bqB8cG5YY4hATjICCqjib/WZqUYS rduK0pe0sYrwleGi13LdMgtoBMLwQvL1TbDax65K089wHOgngnzBqYXQ7/B7MoDvXWQmCE zBLyegPbGuj8y0Oyod/PEaWRU7h/awrEJS2lw5aOA0aUHcAFVmbeesYwg5akusUfdoPSr0 7QK/4rjX184/pQsk8BJNiLkkULQ4p3w6dvt/fNjg2B1KtfliOJ4qbfWEjhBD6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676007; a=rsa-sha256; cv=none; b=psXwDix16gClLmIG4s8oPGK9eqGYaOW/RDqbibo+Aa233sBwvfwUS1wd6kvjKhwK6fbGHh tyIlAcSRWlNCdWNg25b0y3slhThT/idUnx86qXoH7SDWqm+b6wF5jTXNhhZ1t2t6imqdbC lxSnBYVagGkP7+RV6DdbDUMNDKiOVfWVzmOZeoNTuRbnlCpP3MP4Or+72F5Li6/c6HSTu1 gvfoPzcXz8cUZNALjOOiGLNQS9X59SE6QLO4MnWjKCoMv3s1ar2bHiE51JfiNJGTzYZxyh jcPKLkVsNHy9pDFvvgKKzMsVvYb5KrY4baH14F4NeOan0ascue9t80w8/iEeTQ== 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=1778676007; 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=HSZHrGaj2Dpcnct4YrhIMEiAzQjl5KJRm2ZJm3RcPA4=; b=PfmYSfNm6m0FlasmQZy1A+FwOI4BrHCCibf663vpGbkq/O9enmIGfCa/NQE+jfgBFaNURy 3488dGasUphAKsWhfpCcgRk4KwVFEmsQOMs/aKF5b1HP4uwnrMyaVSIAodlzD2ktt5I/o6 yand15b603o9qTIh0u+oRvosYBgjY8bv8TcyiP4Byzq9viC4r2i2LvuTi/OdeBrUdQI/1w x3iMzJyAGkg8jsez7vRx5RdShAD2Tly6+GtIqT5XVmpkM4DSOUNoCEOyQaMjHE1qfY8/tY p2JySKg3y5fC3PAbQNdSb4crqqT078kQHZ4wNENakRHEt1Z4H9AYLA02a94i4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMq01CszrRG for ; Wed, 13 May 2026 12:40:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c692 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 69a303ace76f - main - acpi_spmc(4): Auto-detect DSM revisions by default 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69a303ace76f42630ca07bcc5d2d090774a0364d Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:06 +0000 Message-Id: <6a047126.1c692.59049bab@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=69a303ace76f42630ca07bcc5d2d090774a0364d commit 69a303ace76f42630ca07bcc5d2d090774a0364d Author: Olivier Certner AuthorDate: 2026-05-07 08:22:13 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:26 +0000 acpi_spmc(4): Auto-detect DSM revisions by default Which revisions to use for the Intel and AMD DSMs is unclear. For the Intel one, the written specification indicates only 0, but Linux uses 1 (possibly an oversight). For the AMD one, for which there is no specification, Linux uses 0, but at least on the Framework 13 AMD 7040 series, the "enumerate functions" function only returns a mask that covers all the functions we expect when called with revision 2. Introduce an auto-detection strategy where each revision starting from 0 is tried in turn up to some limit (included; default: 15). As soon as a revision implements all expected functions, we stop the loop and use that one, in effect selecting the minimum revision that implements all we need, which should avoid potential backwards-compatibility problems. If no revision implements all expected functions, the highest available revision in the checked range is selected, but higher revisions that do not bring new functions are discarded (see the explanatory comment in acpi_spmc_probe_dsm()). The revision policy is still tunable using the same existing sysctl(8) knobs 'debug.acpi.spmc.intel_dsm_revision' and 'debug.acpi.spmc.amd_dsm_revision'. They have been extended so that a negative value indicates to use the auto-detection mechanism up to a revision of minus the value. As before, a 0 or positive value requests a specific revision. A new knob is introduced for the Microsoft DSM just in case ('debug.acpi.spmc.ms_dsm_revision'). Since now the revision can be auto-detected, and thus depends on a particular device instance, move it into 'struct dsm_info' on the softc. This also enables finishing the split between static and dynamic/tunable information, allowing to constify all the DSM descriptors. Print the revision eventually used along with the supported functions. Tested on an Intel Framework laptop. Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56882 --- sys/dev/acpica/acpi_spmc.c | 249 +++++++++++++++++++++++++++++++-------------- 1 file changed, 175 insertions(+), 74 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index b1f97685e50c..fcd4105b2a76 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -32,6 +32,39 @@ static char *spmc_ids[] = { NULL }; +/* sysctl(8) knobs */ +static SYSCTL_NODE(_debug_acpi, OID_AUTO, spmc, CTLFLAG_RD | CTLFLAG_MPSAFE, + NULL, "SPMC debugging"); + +int8_t dsm_intel_revision = -15; +SYSCTL_S8(_debug_acpi_spmc, OID_AUTO, intel_dsm_revision, CTLFLAG_RW, + &dsm_intel_revision, 0, + "Revision to use with the Intel DSM " + "(negative: auto, try from 0 to minus the value)"); + +int8_t dsm_amd_revision = -15; +SYSCTL_S8(_debug_acpi_spmc, OID_AUTO, amd_dsm_revision, CTLFLAG_RW, + &dsm_amd_revision, 0, + "Revision to use with the AMD DSM " + "(negative: auto, try from 0 to minus the value)"); + +int8_t dsm_ms_revision = -15; +SYSCTL_S8(_debug_acpi_spmc, OID_AUTO, ms_dsm_revision, CTLFLAG_RW, + &dsm_ms_revision, 0, + "Revision to use with the Microsoft DSM " + "(negative: auto, try from 0 to minus the value)"); + +static int verbose; +SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, verbose, CTLFLAG_RW, + &verbose, 0, "acpi_spmc(4) verbosity"); + +#define VERBOSE() (verbose || bootverbose) + +static bool force_call_expected_functions; +SYSCTL_BOOL(_debug_acpi_spmc, OID_AUTO, always_call_expected_functions, + CTLFLAG_RW, &force_call_expected_functions, 0, + "Call all expected functions on a present DSM, even those not enumerated."); + /* Conversion of an index to a mask. */ #define IDX_TO_BIT(idx) (1ull << (idx)) @@ -64,21 +97,20 @@ static char *spmc_ids[] = { struct dsm_desc { const char *name; - /* Index in the dsms[] array below. */ - int index; + struct uuid uuid; /* - * Revisions are zero or a positive number. Strictly speaking, next - * field should be a 'uint64_t' as per the ACPI spec, but our ACPI DSM - * interface takes an 'int' and anyway actual revision numbers never - * even exceed the limits of a 'uint8_t'. + * Points to an integer which, if negative, indicates to auto-detect the + * revision by trying all revisions between 0 and minus the value, else + * is the sole revision to try. */ - int revision; - struct uuid uuid; + const int8_t *revision_spec; uint64_t expected_functions; uint64_t extra_functions; /* Human-friendly names of known functions. */ const char *const *function_names; int function_names_nb; + /* Index in the dsms[] array below. */ + int index; }; static const char *const dsm_intel_function_names[] = { @@ -90,22 +122,14 @@ static const char *const dsm_intel_function_names[] = { [DSM_INTEL_MS_LPI_EXIT_NOTIF] = "LPI_EXIT", }; -static struct dsm_desc dsm_intel = { +static const struct dsm_desc dsm_intel = { .index = DSM_INTEL, .name = "Intel", .uuid = { /* c4eb40a0-6cd2-11e2-bcfd-0800200c9a66 */ 0xc4eb40a0, 0x6cd2, 0x11e2, 0xbc, 0xfd, {0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66} }, - /* - * XXX Linux uses 1 for the revision on Intel DSMs, but doesn't explain - * why. The commit that introduces this links to a document mentioning - * revision 0, so default this to 0. - * - * The debug.acpi.spmc.intel_dsm_revision sysctl may be used to configure - * this just in case. - */ - .revision = 0, + .revision_spec = &dsm_intel_revision, .expected_functions = IDX_TO_BIT(DSM_GET_DEVICE_CONSTRAINTS) | IDX_TO_BIT(DSM_INTEL_MS_DISPLAY_OFF_NOTIF) | @@ -135,7 +159,7 @@ static const struct dsm_desc dsm_ms = { 0x11e00d56, 0xce64, 0x47ce, 0x83, 0x7b, {0x1f, 0x89, 0x8f, 0x9a, 0xa4, 0x61} }, - .revision = 0, + .revision_spec = &dsm_ms_revision, .expected_functions = IDX_TO_BIT(DSM_INTEL_MS_DISPLAY_OFF_NOTIF) | IDX_TO_BIT(DSM_INTEL_MS_DISPLAY_ON_NOTIF) | @@ -157,23 +181,14 @@ static const char *const dsm_amd_function_names[] = { [DSM_AMD_LPI_EXIT_NOTIF] = "LPI_EXIT", }; -static struct dsm_desc dsm_amd = { +static const struct dsm_desc dsm_amd = { .index = DSM_AMD, .name = "AMD", .uuid = { /* e3f32452-febc-43ce-9039-932122d37721 */ 0xe3f32452, 0xfebc, 0x43ce, 0x90, 0x39, {0x93, 0x21, 0x22, 0xd3, 0x77, 0x21} }, - /* - * XXX Linux uses 0 for the revision on AMD DSMs, but at least on the - * Framework 13 AMD 7040 series, the "enumerate functions" DSM function - * needs to be called with revision 2 to return a mask that covers all - * the functions we would like to call. - * - * The debug.acpi.spmc.amd_dsm_revision sysctl may be used to configure - * this just in case. - */ - .revision = 2, + .revision_spec = &dsm_amd_revision, .expected_functions = IDX_TO_BIT(DSM_GET_DEVICE_CONSTRAINTS) | IDX_TO_BIT(DSM_AMD_DISPLAY_OFF_NOTIF) | @@ -190,30 +205,16 @@ static const struct dsm_desc *const dsms[] = { [DSM_AMD] = &dsm_amd, }; -static SYSCTL_NODE(_debug_acpi, OID_AUTO, spmc, CTLFLAG_RD | CTLFLAG_MPSAFE, - NULL, "SPMC debugging"); - -SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, intel_dsm_revision, CTLFLAG_RW, - &dsm_intel.revision, 0, - "Revision to use when evaluating Intel SPMC DSMs"); - -SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, amd_dsm_revision, CTLFLAG_RW, - &dsm_amd.revision, 0, "Revision to use when evaluating AMD SPMC DSMs"); - -static int verbose; -SYSCTL_INT(_debug_acpi_spmc, OID_AUTO, verbose, CTLFLAG_RW, - &verbose, 0, "acpi_spmc(4) verbosity"); - -#define VERBOSE() (verbose || bootverbose) - -static bool force_call_expected_functions; -SYSCTL_BOOL(_debug_acpi_spmc, OID_AUTO, always_call_expected_functions, - CTLFLAG_RW, &force_call_expected_functions, 0, - "Call all expected functions on a present DSM, even those not enumerated."); - /* Per DSM probed information. */ struct dsm_info { uint64_t supported_functions; + /* + * Revisions are zero or a positive number. Strictly speaking, next + * field should be a 'uint64_t' as per the ACPI spec, but our ACPI DSM + * interface takes an 'int' and anyway actual revision numbers never + * even exceed the limits of a 'uint8_t'. + */ + uint8_t revision; }; struct acpi_spmc_constraint { @@ -253,20 +254,60 @@ resolve_dsm(int dsm_index) return (dsms[dsm_index]); } +static struct dsm_info * +get_dsm_info(struct acpi_spmc_softc *const sc, const int dsm_index) +{ + MPASS(0 <= dsm_index && dsm_index < nitems(dsms)); + return (&sc->dsms_info[dsm_index]); +} + +static const struct dsm_info * +get_const_dsm_info(const struct acpi_spmc_softc *const sc, const int dsm_index) +{ + MPASS(0 <= dsm_index && dsm_index < nitems(dsms)); + return (&sc->dsms_info[dsm_index]); +} + +static const uint64_t +get_supported_functions(const struct acpi_spmc_softc *const sc, + const int dsm_index) +{ + return (get_const_dsm_info(sc, dsm_index)->supported_functions); +} + +static const uint8_t +get_revision(const struct acpi_spmc_softc *const sc, const int dsm_index) +{ + return (get_const_dsm_info(sc, dsm_index)->revision); +} + +static bool +supports_function_bitset(const uint64_t supported_functions, + const int function_index) +{ + return ((supported_functions & IDX_TO_BIT(function_index)) != 0); +} + static bool supports_function(const struct acpi_spmc_softc *const sc, const int dsm_index, const int function_index) { - MPASS(0 <= dsm_index && dsm_index < nitems(dsms)); + return (supports_function_bitset(get_supported_functions(sc, dsm_index), + function_index)); +} - return ((sc->dsms_info[dsm_index].supported_functions & - IDX_TO_BIT(function_index)) != 0); +static bool +has_dsm_bitset(const uint64_t supported_functions) +{ + /* DSM is supported if bit DSM_ENUM_FUNCTIONS (0) is set. */ + return (supports_function_bitset(supported_functions, + DSM_ENUM_FUNCTIONS)); } static bool has_dsm(const struct acpi_spmc_softc *const sc, const int dsm_index) { - return (supports_function(sc, dsm_index, DSM_ENUM_FUNCTIONS)); + return (has_dsm_bitset(get_supported_functions(sc, dsm_index))); } typedef const char *pbf_get_name_t(const int, const void *const); @@ -344,12 +385,13 @@ failed_to_call_dsm(const struct acpi_spmc_softc *const sc, { (void)device_printf(sc->dev, "Failed to call DSM %s (rev %u) function %s\n", - dsm->name, dsm->revision, dsm_function_name(dsm, function_index)); + dsm->name, get_revision(sc, dsm->index), + dsm_function_name(dsm, function_index)); } static void acpi_spmc_probe_dsm(struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm); -static void acpi_spmc_dsm_print_functions( +static void acpi_spmc_dsm_print( const struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm); static int acpi_spmc_get_constraints(struct acpi_spmc_softc *const sc); @@ -416,7 +458,7 @@ acpi_spmc_attach(device_t dev) /* Print supported functions of usable DSMs. */ for (int i = 0; i < nitems(dsms); ++i) if (has_dsm(sc, i)) - acpi_spmc_dsm_print_functions(sc, dsms[i]); + acpi_spmc_dsm_print(sc, dsms[i]); /* Get device constraints. We can only call this once so do this now. */ error = acpi_spmc_get_constraints(sc); @@ -445,8 +487,15 @@ acpi_spmc_detach(device_t dev) return (0); } +static uint64_t +dsm_missing_functions(const struct dsm_desc *const dsm, + uint64_t supported_functions) +{ + return (dsm->expected_functions & ~supported_functions); +} + static void -acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, +acpi_spmc_dsm_print(const struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm) { /* @@ -455,16 +504,17 @@ acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, * report as unknown. */ const uint64_t supported_functions = ~IDX_TO_BIT(DSM_ENUM_FUNCTIONS) & - sc->dsms_info[dsm->index].supported_functions; - const uint64_t missing = dsm->expected_functions & ~supported_functions; + get_supported_functions(sc, dsm->index); + const uint64_t missing = dsm_missing_functions(dsm, supported_functions); const uint64_t unknown = supported_functions & ~(dsm->expected_functions | dsm->extra_functions); char buf[128]; print_bit_field(buf, sizeof(buf), supported_functions, "FUNC", pbf_function_name, dsm); - device_printf(sc->dev, "DSM %s: Supported functions: %#" PRIx64 "%s\n", - dsm->name, supported_functions, buf); + device_printf(sc->dev, + "DSM %s, revision %d: Supported functions: %#" PRIx64 "%s\n", + dsm->name, get_revision(sc, dsm->index), supported_functions, buf); if (VERBOSE() && missing != 0) { print_bit_field(buf, sizeof(buf), missing, "FUNC", @@ -483,19 +533,69 @@ acpi_spmc_dsm_print_functions(const struct acpi_spmc_softc *const sc, } } +/* Returns whether the DSM is supported (enumeration succeeds). */ +static bool +probe_dsm_revision(const struct acpi_spmc_softc *const sc, + const struct dsm_desc *const dsm, const uint8_t revision, + uint64_t *const supported_functions) +{ + *supported_functions = acpi_DSMQuery(sc->handle, + (const uint8_t *)&dsm->uuid, revision); + return (has_dsm_bitset(*supported_functions)); +} + +static void +set_dsm_revision(struct acpi_spmc_softc *const sc, + const struct dsm_desc *const dsm, const uint8_t revision, + uint64_t supported_functions) +{ + struct dsm_info *const dsm_info = get_dsm_info(sc, dsm->index); + + MPASS(has_dsm_bitset(supported_functions)); + dsm_info->supported_functions = supported_functions; + dsm_info->revision = revision; +} + static void acpi_spmc_probe_dsm(struct acpi_spmc_softc *const sc, const struct dsm_desc *const dsm) { - const uint64_t supported_functions = acpi_DSMQuery(sc->handle, - (const uint8_t *)&dsm->uuid, dsm->revision); + const int8_t revision_spec = *dsm->revision_spec; + uint64_t supported_functions; + + if (revision_spec >= 0) { + /* Specific revision specified. */ + if (probe_dsm_revision(sc, dsm, revision_spec, + &supported_functions)) + set_dsm_revision(sc, dsm, revision_spec, + supported_functions); + return; + } /* - * DSM is supported if bit 0 is set. + * Auto-detect. We try revisions in ascending order, selecting the + * first that has all the functions we expect in the hope to avoid potential + * backwards-compatibility problems, else continuing with higher ones + * but adopting them only if they actually add new functions (it seems + * common that firmwares do not care about the revision, or will return + * the same supported functions after a revision limit). */ - if ((supported_functions & IDX_TO_BIT(DSM_ENUM_FUNCTIONS)) == 0) - return; - sc->dsms_info[dsm->index].supported_functions = supported_functions; + for (uint8_t revision = 0; revision <= -revision_spec; ++revision) { + if (!probe_dsm_revision(sc, dsm, revision, + &supported_functions)) + continue; + if ((~get_supported_functions(sc, dsm->index) & + supported_functions) == 0) + /* This revision adds no new function, skip it. */ + continue; + + set_dsm_revision(sc, dsm, revision, supported_functions); + + if (dsm_missing_functions(dsm, ~IDX_TO_BIT(DSM_ENUM_FUNCTIONS) & + supported_functions) == 0) + /* We have all expected functions, bail out. */ + break; + } } static void @@ -627,7 +727,7 @@ acpi_spmc_parse_constraints_amd(struct acpi_spmc_softc *sc, ACPI_OBJECT *object) static int acpi_spmc_get_constraints(struct acpi_spmc_softc *const sc) { - struct dsm_desc *dsm; + const struct dsm_desc *dsm; ACPI_STATUS status; ACPI_BUFFER result; ACPI_OBJECT *object; @@ -657,9 +757,9 @@ acpi_spmc_get_constraints(struct acpi_spmc_softc *const sc) return (0); /* It seems like this DSM can fail if called more than once. */ - status = acpi_EvaluateDSMTyped(sc->handle, (uint8_t *)&dsm->uuid, - dsm->revision, DSM_GET_DEVICE_CONSTRAINTS, NULL, &result, - ACPI_TYPE_PACKAGE); + status = acpi_EvaluateDSMTyped(sc->handle, (const uint8_t *)&dsm->uuid, + get_revision(sc, dsm->index), DSM_GET_DEVICE_CONSTRAINTS, NULL, + &result, ACPI_TYPE_PACKAGE); if (ACPI_FAILURE(status)) { failed_to_call_dsm(sc, dsm, DSM_GET_DEVICE_CONSTRAINTS); return (ENXIO); @@ -765,7 +865,8 @@ acpi_spmc_run(device_t dev, const struct dsm_desc *const dsm, return; status = acpi_EvaluateDSMTyped(sc->handle, (const uint8_t *)&dsm->uuid, - dsm->revision, function_index, NULL, &result, ACPI_TYPE_ANY); + get_revision(sc, dsm->index), function_index, NULL, + &result, ACPI_TYPE_ANY); if (ACPI_FAILURE(status)) failed_to_call_dsm(sc, dsm, function_index); From nobody Wed May 13 12:40: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 4gFtMr4Btnz6dLPl for ; Wed, 13 May 2026 12:40: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 4gFtMr0rCKz3wMq for ; Wed, 13 May 2026 12:40:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676008; 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=dBhUFxwZhNFmlSvbnDBAZ+GvUWfzTyb3fUG19AuFA3o=; b=iwmr2YvyYS5Z1GQ4Phg9yb367pJ/22R4MEEZNSOe8bGyjEtNr88MMysiC4JF+Q02V0XHYF BnGWqDf+ZCAYz/hPR9WEVqxY3koIWeFemHJp3lK3BPva9nQN1VIXsF3Po+I7j6R15L1/in /oKzziijMSZfmsxx5IsjoE2k5PVvprFtBN72kxJ85R/NgPF1QcVoony+Ncl1YHxRGJWx/N nWAkZBdY2Ah8K+OWSIqbj+WJSo8dfesuUUSvW1GeLjmxy/aTtKnM/fcn9LzjnyzMeSPcel /D6QTnSLk3UeyQ5w1DGCljz3NegMOJkG7z87Pw1iHrh5OU1B0zi7gnYMQx5Apg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676008; a=rsa-sha256; cv=none; b=ZoiIjrmlee6qrn8atOTQMv7906ZXe2wg8iTe26ad4OiMfvw1gUgvHIpqPIthSxfcNSFT0f yJmaCHwzFk35DQSmfCAMeG0uRtshmLRwTEmE4WhxVugX1DwNRaCGYXFDva1S2ExX//X8hs u27ZyUtglJpc2aW6avLdIb9u/wLIdX5krKSEGrq4HzTIrhBztBMe/5GZDJR+7O0SClexb6 Pr32k89T9al3on6MvBB9pYLScv1Egx5oMj11yYFH6JcYN5AjSpJM1aSg5J9IERyh7iCsPb YL00XOm5FJdqaKhV1JA4M11NDzrJLIFR+JwsXawqcwQsKaMF15TkngrjywHFkA== 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=1778676008; 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=dBhUFxwZhNFmlSvbnDBAZ+GvUWfzTyb3fUG19AuFA3o=; b=HJY4je+Wr6KVMqsbKoaX2+MdB6nqWdNvWjvr/H5OIR+d19uw2jYJDqaoVYxq6nErpZSAbE 3yjTbUI/nkuitbQ6GdKPO+fIOuZ5f5SMuVVGk99V3k4t0F4E5bnCRnh8uawhDUkqR5novA +LFH/EGS0muIgP6sYoz2KvSoRt7zzbRpFWYt+frzXcJnVZHT58cNJFlAIq4nSa7qNSWG2G mD5Hy4TgH2NYKhSfZrrkW+mcvHJzm6+4ykGvMnOaYPqDhKSuaJc3xINdmXaV0ppz2cu2eI Dw1QYWfEvbqLIJcWg+enTXhTKzC/zh7bD7dmox5MDpNegYhSfOZSpC35B21Qmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMr0NsWzr9f for ; Wed, 13 May 2026 12:40:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1be79 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 91d3fb31e858 - main - acpi_spmc(4): If verbose, print called 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91d3fb31e858404f62d4a3afae2e209796968c3d Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:08 +0000 Message-Id: <6a047128.1be79.3709ba8d@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=91d3fb31e858404f62d4a3afae2e209796968c3d commit 91d3fb31e858404f62d4a3afae2e209796968c3d Author: Olivier Certner AuthorDate: 2026-05-07 16:15:21 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:26 +0000 acpi_spmc(4): If verbose, print called functions ...as a debugging aid, in order to be able to check that some functions are effectively called and to identify them quickly if they cause a hang. Reviewed by: obiwac Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56883 --- sys/dev/acpica/acpi_spmc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index fcd4105b2a76..8cb1d2878d88 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -763,7 +763,8 @@ acpi_spmc_get_constraints(struct acpi_spmc_softc *const sc) if (ACPI_FAILURE(status)) { failed_to_call_dsm(sc, dsm, DSM_GET_DEVICE_CONSTRAINTS); return (ENXIO); - } + } else if (VERBOSE()) + device_printf(sc->dev, "Constraints: Retrieved successfully\n"); object = (ACPI_OBJECT *)result.Pointer; if (dsm == &dsm_intel) @@ -864,14 +865,21 @@ acpi_spmc_run(device_t dev, const struct dsm_desc *const dsm, (force_call_expected_functions && has_dsm(sc, dsm->index)))) return; + if (VERBOSE()) + device_printf(dev, "DSM %s: Calling function %s\n", + dsm->name, dsm_function_name(dsm, function_index)); status = acpi_EvaluateDSMTyped(sc->handle, (const uint8_t *)&dsm->uuid, get_revision(sc, dsm->index), function_index, NULL, &result, ACPI_TYPE_ANY); if (ACPI_FAILURE(status)) failed_to_call_dsm(sc, dsm, function_index); - else + else { + if (VERBOSE()) + device_printf(dev, "DSM %s: Function %s successful\n", + dsm->name, dsm_function_name(dsm, function_index)); AcpiOsFree(result.Pointer); + } } /* From nobody Wed May 13 12:40:09 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 4gFtMs3zgmz6dLDw for ; Wed, 13 May 2026 12:40: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 4gFtMs1C6tz3wBh for ; Wed, 13 May 2026 12:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778676009; 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=3F7wPUanrRv0WAl+lg63W/6EnpARV1xDIISAhJssQlE=; b=MYCvF+eaTnZt0flRfV1jcmU+yFtvLczaSIDA72zFwO5dIe9U5Gi2dJjcOBSQCf1D2VC02O aGH+cLFg4vsbCuDZKXH/hSRTwpFoxCVo/uqLNWP+zMthn5gA8qVlsifhqLC8GURqt8E914 3y7XUbf59+e5Co52LyJ/Cc3BLzE6QE2nsnEoVl4UipiclSaUKboWa6ebC8/7N7liDW7OUY inXwcGvoKospI0YAt8933qqZo3/ZQriKfnbOTGUsr2UsGS3XpM+1u/LgdxKpacIhtDivBS HykUWFBbIDb8zFg12SrAheNUEaWMSAPXB+vK+iEM0oWQUUP0a6uvXPHe0byeQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778676009; a=rsa-sha256; cv=none; b=hUwWNFOV35DZ1ZZfNwd8nmTNN6iRSmriApgf4GVTnXSedg7zhNzajz1leFTki4fZzDrklW brDs3lR3wW8YuR3W8LjWGHpVKoqw2SSvZiOXo9/AJO5iLyKmlwXc0a6PuOtPgMSMIXTAiX +DajwCBKyuXLVhzrc3eS7mNjxLOijoVmJ4j4Py7TbQ3ITckhmYWLJwiOMAYk+/fQ+vr1Lk jlbwIbx1tBXiWC0CISAOvT+eauIJCM4Mv9/+7nWKt54+2qJlcxx+mfXuzmKh2gAvttCfkM bCul+JBmRBUNMs4vrkMwbCwFjJIe7eN8CgCnRcgB5SA6dLvAV1y8+O2bNFN9EA== 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=1778676009; 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=3F7wPUanrRv0WAl+lg63W/6EnpARV1xDIISAhJssQlE=; b=V+lf0mEhGklnaesR7tEFs8s1cWuUxiD+2O3E8TaB9A+SJt1jDAZy1tyRxtD/9bL1mv3KCY xVoA96nps4AKboWYH2oDdI++3tC9cyDMdFDanDvPs7c1GrmrLcP5RZjy8yHDK47Y+wj3GL apT3XVrVKnkcl/C1psIWkpgGnKhyB7Xw/r5GGtIAvNORARjKm7dOTHD+W3FFhhAgz9z24+ hIYh3Uwk7/rW2KcV5sfH2fsK3hK50aSzYlSGpiQmGOf/ADjjRY8wgcjFvaIpah/1P+Qi+w ifYq5u7rADyTluMWdXCnHR1cFgpuQbVzYazF9I01M/HL8zxKiHtR5Pkt2SIeig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFtMs0htyzr29 for ; Wed, 13 May 2026 12:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c715 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 12:40:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 23005ed3a1c8 - main - acpi_spmc(4): Update copyright 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23005ed3a1c8f6c111dff71b17daa6549b59a98a Auto-Submitted: auto-generated Date: Wed, 13 May 2026 12:40:09 +0000 Message-Id: <6a047129.1c715.545886b8@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=23005ed3a1c8f6c111dff71b17daa6549b59a98a commit 23005ed3a1c8f6c111dff71b17daa6549b59a98a Author: Olivier Certner AuthorDate: 2026-05-12 15:10:34 +0000 Commit: Olivier Certner CommitDate: 2026-05-13 12:38:26 +0000 acpi_spmc(4): Update copyright Sponsored by: The FreeBSD Foundation --- sys/dev/acpica/acpi_spmc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c index 8cb1d2878d88..c8e2cf4c3733 100644 --- a/sys/dev/acpica/acpi_spmc.c +++ b/sys/dev/acpica/acpi_spmc.c @@ -5,6 +5,10 @@ * * This software was developed by Aymeric Wibo * under sponsorship from the FreeBSD Foundation. + * + * Portions of this software were developed by Olivier Certner + * at Kumacom SARL under sponsorship from the FreeBSD + * Foundation. */ #include From nobody Wed May 13 13:41: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 4gFvkX32Nlz6dQM1 for ; Wed, 13 May 2026 13:41: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 4gFvkX2K3Cz3JZW for ; Wed, 13 May 2026 13:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778679684; 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=Bk1OTKUcq7whnQk+pc/fHsnAtZ3rb2GrDLhHBx4WMqI=; b=e/OjQy+VVpo5KCW2r4hq4r2hZAeyUv12xJwwu2rB155WjvBeRmMWPjC61FFsMIHWxDfrkC uHdTjPJfwWr/C/ELiUEkozDxA7FgGyh0Xh98kh0Oy4fj2bitRj1GOXLH6GrPOfM6EawCCz nyAPr0x7OeAOosPBaGjjTuFBVpnJ1UEUMZn3QDjrNMvXKBgN4C2j/K1+3iAY0AKoqdclQ+ C/MNK6C+VMXqIgQupERCvEPbzDI1ShGgMxFlkIrN9cLMNEJ+2U27H7mrL5Xt31nR4tH0Wv Gs2vxSMl1eJCzWtLVgrwbY9h+wXsGiQMtXSqxaGr+7iVraEgB9cRA0K8nda4nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778679684; a=rsa-sha256; cv=none; b=txbSi3XRwJc8N94MUK2Lm7+0432LmnFjCs4gxvTj40JffGqtb4pmkS9hbwQ0sK9YxSGLnZ yh71l5Lv5Nkut6S4VV8V9/Ad9eAWTQMmIst9eJ/pwVLw9XThwiIqAIVjqwsr/MRal1ftZi GGMAYPT/FeX/aXvoaLvW78zPGJrCtAnEc1MoZcCaHvVdUNFY+aDqNyi9B1Yok+YUTFtQP1 xAOnN+8krSpqbmPWnOS3pR8o+nb5Lxmy0C5ODNP5F0MctPROZMC/3iph0hZyyd6mXs2y0r 44xA1P6SxQItzzr97cmok279NG7majMOiIOofQ5n1tCZLHqllo44L3JLBzIh2A== 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=1778679684; 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=Bk1OTKUcq7whnQk+pc/fHsnAtZ3rb2GrDLhHBx4WMqI=; b=hGZEKBgJPtTe8B4R4i0bjb0T3DSlqq8hckM0if4zBrMPEnhqb1qzABGl6Zj4SC5hvxJZwz IV2MQsn4RdB8VmluNPjHmBOeUOpB3Wad5bHO3fqZI4FcoqZT8/bJxTlhq8LXl34Zvxko6f r9hsijRBnv8xEI+D4qB79gW00vaVERYyheqBSZH/6qEG+nTEJ4nfxIBaAHyxx/Gycq1xXf UVsByEKEvP0NABfmXk4xmneFkzQSTj9+aAHMXWxi12VZuLBb4NnRHEMMfoJMXQfBlM2XqD 0I0qmh7i/GF/FoPQkXvgsCqZVo4aDsPKtcxDtBxmGzzYFwzESabTI7q3pF7geA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFvkX1j8NztLM for ; Wed, 13 May 2026 13:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23161 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 13:41:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: f6178451eea5 - main - src.opts.mk: Comment about CTF & DTRACE relationship 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: f6178451eea5b1ce6802fbb0e6eceb555c7b4841 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 13:41:24 +0000 Message-Id: <6a047f84.23161.627f2390@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f6178451eea5b1ce6802fbb0e6eceb555c7b4841 commit f6178451eea5b1ce6802fbb0e6eceb555c7b4841 Author: Ed Maste AuthorDate: 2026-05-12 17:19:46 +0000 Commit: Ed Maste CommitDate: 2026-05-13 13:37:58 +0000 src.opts.mk: Comment about CTF & DTRACE relationship WITH_CTF enables building userland components with CTF, and not the ctf* tools as one might expect. The tools are actually included with the DTRACE knob. Add a comment where the dependency is handled, as this has caused confusion. Reported by: ivy Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56977 --- share/mk/src.opts.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 506b36b3d4b0..1fd63eb0db31 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -429,6 +429,8 @@ MK_KERBEROS_SUPPORT:= no MK_MITKRB5:= no .endif +# MK_DTRACE also gates ctf tools, so we cannot build userland with CTF +# if it is off. .if ${MK_DTRACE} == "no" MK_CTF:= no .endif From nobody Wed May 13 16:00: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 4gFyq94lvbz6dZvh for ; Wed, 13 May 2026 16:00:37 +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 4gFyq93w6zz3ktb for ; Wed, 13 May 2026 16:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778688037; 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=Jvnf+Z+IPoYLYXoIOYYvZzstAz0z5RAahpKpQytstrU=; b=H7V6woSyGEaTrMTyNcrSiJN/nCGn8yyLXrwd1f+VDzc/crbBehpt9N2QR6CsNOl+idyH5H GyIbdj/KteFuN3grXL0dxprabrAedR6q3Zysvby9u84Z967xa2lBq3cJmPC4GKv9fTcbAc ql/CjgCGiJklO9ptGzWz1Qy2KkEuBgNTMH9lgK66bwPQh5weaSGOSWaQygVLZuIGcOf+mt csslj2cEDr3MPir1oAA04z9w3I8qjh1O2J2rE9ZzSKBPimXnWj5G0PvXReAxB+/hecHpPv 7ky0APolxVOXPHeQ3o5SuAUXyWIBpnHg1LiRugnXbAwK3dB5rlnuaQ3E8uPJ1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778688037; a=rsa-sha256; cv=none; b=Vr6KyEyqPvifEejf1j4GZE+FMwGHj0MfERJsajPQfG9dQhBr6qxQYOIn776Rm7kvBHesXK +eW6wyjXpCrlP92TnRqxBbV2W72fRxTPQHXhaEdIxSwoqNFK3kA0zhuIFbbFXVJ0z7uhRV gCyyWGoGrMyiUHnXDR4vJlj+TDepuz9zb6G4GWcFcnaLM1MXtAtooS5xA5SAb9iyjwK8Cw 2EQAmV4JOzgXjzpueV6JnrDluGeaYHIkRGO7jyWvm5B5tpSHgEGxR/5DRcBB4AjDm3+ZW2 B41hhKWDRE75IUciZok7czdL3TUHxEAkWQa7KR+e4grEzV4CXGy6+PyDDzRgCQ== 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=1778688037; 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=Jvnf+Z+IPoYLYXoIOYYvZzstAz0z5RAahpKpQytstrU=; b=l4cEBaJhlLJt4rUmSw2g7VGWj0sU+nLNqEzq6OhBVZO08MoZtgEFa+i15sRCnhbDIBZ+rv T2oGR+t1oaMNiG/7Dgq3Tz055cpyIwzm4Ydg8hueEV+TEUGSlMcoiWyOdLmzwsrRU3gEJp 5HtksyCOHZgsC8LsjUCRlFK1zM/ZdYwIxXkM1E9C5LlUQULOVaFhdwAbBfD49W1fsenLdu jDqy5VpASCBXdcGEgwDtiOHtqUhcX/bITe6VApSRicHLvpgkJ2FNV5LGGYuY6Q7PDCcwCB fsn+LgF6plnKc2IcALA03vFBzoeiZ5OtU573BrKU2YFcubsF8KZbdvSwFbaB1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFyq93W1tzx2c for ; Wed, 13 May 2026 16:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a555 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 16:00:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: e03c00b47b1a - main - cxgbe(4): Query and report IPsec offload related parameters 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: e03c00b47b1af560b280c32576e7fc06b0a58224 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 16:00:37 +0000 Message-Id: <6a04a025.3a555.7202e86e@gitrepo.freebsd.org> The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=e03c00b47b1af560b280c32576e7fc06b0a58224 commit e03c00b47b1af560b280c32576e7fc06b0a58224 Author: Navdeep Parhar AuthorDate: 2026-05-12 18:04:55 +0000 Commit: Navdeep Parhar CommitDate: 2026-05-13 15:51:46 +0000 cxgbe(4): Query and report IPsec offload related parameters MFC after: 2 weeks Sponsored by: Chelsio Communications --- sys/dev/cxgbe/common/common.h | 4 ++++ sys/dev/cxgbe/t4_main.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/common/common.h b/sys/dev/cxgbe/common/common.h index 2033967ffb94..fcc728a8bf31 100644 --- a/sys/dev/cxgbe/common/common.h +++ b/sys/dev/cxgbe/common/common.h @@ -457,6 +457,10 @@ struct adapter_params { unsigned int max_ordird_qp; /* Max read depth per RDMA QP */ unsigned int max_ird_adapter; /* Max read depth per adapter */ + unsigned int nipsec_tunnel; + unsigned int nipsec_transport; + unsigned int nofld_ipsec_tunnel; + /* These values are for all ports (8b/port, upto 4 ports) */ uint32_t mps_bg_map; /* MPS rx buffer group map */ uint32_t tp_ch_map; /* TPCHMAP from firmware */ diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index d73204eb808c..07906dac00a8 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -5998,7 +5998,29 @@ get_params__post_init(struct adapter *sc) sc->vres.key.start = val[0]; sc->vres.key.size = val[1] - val[0] + 1; } - + if (sc->cryptocaps & FW_CAPS_CONFIG_IPSEC_INLINE) { + param[0] = FW_PARAM_PFVF(NIPSEC_TUNNEL); + param[1] = FW_PARAM_PFVF(NIPSEC_TRANSPORT); + rc = -t4_query_params(sc, sc->mbox, sc->pf, 0, 2, param, val); + if (rc == 0) { + sc->params.nipsec_tunnel = val[0]; + sc->params.nipsec_transport = val[1]; + } else { + CH_ERR(sc, "failed to query IPsec params: %d.\n", rc); + MPASS(sc->params.nipsec_tunnel == 0); + MPASS(sc->params.nipsec_transport == 0); + } + } + if (sc->cryptocaps & FW_CAPS_CONFIG_OFLD_OVER_IPSEC_INLINE) { + param[0] = FW_PARAM_PFVF(OFLD_NIPSEC_TUNNEL); + rc = -t4_query_params(sc, sc->mbox, sc->pf, 0, 1, param, val); + if (rc == 0) { + sc->params.nofld_ipsec_tunnel = val[0]; + } else { + CH_ERR(sc, "failed to query TOE IPsec params: %d.\n", rc); + MPASS(sc->params.nofld_ipsec_tunnel == 0); + } + } /* * We've got the params we wanted to query directly from the firmware. * Grab some others via other means. @@ -7987,6 +8009,15 @@ t4_sysctls(struct adapter *sc) SYSCTL_ADD_INT(ctx, children, OID_AUTO, "nfilters", CTLFLAG_RD, NULL, sc->tids.nftids, "number of filters"); + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "nipsec_tunnel", CTLFLAG_RD, + NULL, sc->params.nipsec_tunnel, "max hw IPsec tunnels"); + + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "nipsec_transport", CTLFLAG_RD, + NULL, sc->params.nipsec_transport, "max hw IPsec transport pairs"); + + SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "nofld_ipsec_tunnel", CTLFLAG_RD, + NULL, sc->params.nofld_ipsec_tunnel, "max hw IPsec tunnels (TOE)"); + SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0, sysctl_temperature, "I", "chip temperature (in Celsius)"); From nobody Wed May 13 16:34: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 4gFzZ82cd3z6ddBW for ; Wed, 13 May 2026 16:34: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 4gFzZ825VHz3rxn for ; Wed, 13 May 2026 16:34:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778690064; 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=WyfBzbbvQn49u/XBDMs34h1MFP85NqU4GKuGvHEPVLc=; b=SDtOKskyjzDEJsisdcCTlky5ZvssIv4LlPg65XBiLL/MWDMw1FBoMPoHSag2l873CNFgeN aaufyFkHfWLggZohOTPAQzhVyuhvxKCHwZLPPDM0tu6sQAR+8Gm4ghByLOdLAmEEKQkutR 8EBSKqbVtULA1XBCOkzdwZ27lgMVqMBUTnrzQKAxxXgazkP+X/Jx0UyUZQ0FsyWOMr1i+D yKVPgseTflG+XFm3mu1Mynzvw1rRkcA393P/wLoYpQ6uBaPieNKKtYZmYFyLvCrZLgOWIz rOvF7Sp4C3Wqqz7DFETwHR88fpAb5gNScMpHylFZbuiSfwK5z0AYNZZGH6YEKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778690064; a=rsa-sha256; cv=none; b=yfuIQ5lv+5hDPzNDM930eamfJwrxVzwb9c6frxouWW+WdvxFN5TXgXnLBDbB9dx4HbkhVJ 3lztjFZUFpD6clAS3T1dyyYlawdTKCEEWa1oXDs73Fu71/lqgFo6papCN+DCcj/O7l7XA4 FjcILoBrsx3eVIdmj4Hw/vAb89+RV49bmnJYmJnnWIMdhBSOXd8PyO7Mb1so+boZelvTG2 i4VYqMojhu/2AQ/mqTZtqNISg3QRgS4yDkBNthbDCgCfrvOhXMdc9oxtfcqAEuC/nvdtiZ ZK+K0Goha7m06RP+zVQxfaLulHv9470QGjmW3bFdkG+fnXi7ToHwvxEwzYl/Uw== 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=1778690064; 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=WyfBzbbvQn49u/XBDMs34h1MFP85NqU4GKuGvHEPVLc=; b=y4lYhQ5WHWGD3XeYwBPyB1nwbX9ruA+uidTvUoJ3C1i2hnhJc4/b0tp5/vQT32PaiP+v6n 0I/yggwC+OHVMDFNGRcn5A12UvXjv2kjAewO89vJ4ivSDgLFOP9raTrBLz3zSk2OdqlStB fXj/y2kQF0wf1+i0bSnVPYe7dUPqKLAZ/zs/BTfn0GEu0z/wbgeF8sCkzB9mp6R+mWm6YQ /tdShDA6DNSAxea+8f67Yhh8hwRo/DGPSM6ZUI0FMsnvHfLW1p9eUxgdM6vxwWZifiIlGh B2lk9tVUGx+841rp2f0iflKM81IY/R2Y2rYD/LAfomsVRWEp1oX97l6bZqyIbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFzZ81h2dzyZP for ; Wed, 13 May 2026 16:34:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bf3e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 16:34:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 538f0564c119 - main - mandoc: Add an entry for libsys to lib.in 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: 538f0564c1197605d7ab80ba39cbf27cc9c90fed Auto-Submitted: auto-generated Date: Wed, 13 May 2026 16:34:24 +0000 Message-Id: <6a04a810.3bf3e.71e401ab@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=538f0564c1197605d7ab80ba39cbf27cc9c90fed commit 538f0564c1197605d7ab80ba39cbf27cc9c90fed Author: John Baldwin AuthorDate: 2026-05-13 16:33:12 +0000 Commit: John Baldwin CommitDate: 2026-05-13 16:33:12 +0000 mandoc: Add an entry for libsys to lib.in Reviewed by: brooks, emaste Obtained from: CheriBSD Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D56849 --- contrib/mandoc/lib.in | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/mandoc/lib.in b/contrib/mandoc/lib.in index 134614aa6478..dcea23cf81ea 100644 --- a/contrib/mandoc/lib.in +++ b/contrib/mandoc/lib.in @@ -120,6 +120,7 @@ LINE("libsdp", "Bluetooth Service Discovery Protocol User Library (libsdp, \\-l LINE("libssp", "Buffer Overflow Protection Library (libssp, \\-lssp)") LINE("libstdthreads", "C11 Threads Library (libstdthreads, \\-lstdthreads)") LINE("libSystem", "System Library (libSystem, \\-lSystem)") +LINE("libsys", "System Call Library (libsys, \\-lsys)") LINE("libsysdecode", "System Argument Decoding Library (libsysdecode, \\-lsysdecode)") LINE("libtacplus", "TACACS+ Client Library (libtacplus, \\-ltacplus)") LINE("libtcplay", "TrueCrypt-compatible API library (libtcplay, \\-ltcplay)") From nobody Wed May 13 16:34: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 4gFzZ94YHLz6ddBX for ; Wed, 13 May 2026 16:34: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 4gFzZ92rzjz3s5Q for ; Wed, 13 May 2026 16:34:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778690065; 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=6Bji0aiOLoL/y1S/GWy5pVXXTQ5kH1ncdmM1DNifjKg=; b=j3D2eVOGkSiNCDb5B8i5cpBjy+V+vnP4UBQvoQ5J7IH2ODgtoTn4xHGAkuqSimm3Sxi/Dx eIfFg0s52KDSTjdeps3lw+ckEVixnIEkeGcNLBEtuegZNF1MmobsSK7Oe/x+cmVHlsQq8E ZBGShHBzF0YLf8gxaLYu3tLUJfUBkcr28AvjQdoJNv3WH6eSoZzMOXWHdm33H5jOcLKCbt s4HMrynIKpZw8PZ5jk3LCQcZvsEZVW9gCrQDAs01ru8GEHDL9JvmbhPt3QTn5C7OqrLGBG O0bm3Rs99djE06Cfu6RSf2NlsjpUpKRcIFmh49XQLCCKBbhfJ8RchkIFaySYaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778690065; a=rsa-sha256; cv=none; b=xoxyKgiwwP6yg2WbXLgdV/mF1IC5mDvVLy9L4CCWU/hsj62rZLX2mJrAAx8SdMosOQJqAH w12xEtUG3MeiuCnn1jMB7mSbtBN+ah/elOXPw83DVylrZFhnFo9ud6bWnfLdDiou9uKW5v 5sbsQsmfRAXA2jV8kBcjmHsmWYEen1yhaWhop6vWEFmAUghr8iCmGXwLq402HZ2TfUFH5z Pa/406PV42KltgorQmThCAxryDDA0o9mX49vJIK51xqpxbI02z0bu/phvVa+BNZ9tL65xK ZuGrCSZLkoyqWE9DpnMWQbJVoiW4Vw7KJu3UFEsTlZTk63SIdZO4Au2jTqR/SA== 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=1778690065; 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=6Bji0aiOLoL/y1S/GWy5pVXXTQ5kH1ncdmM1DNifjKg=; b=knqotUGIrttQG1byrgAImGzpgLnBvm3sciKQdTC+E9G/rAQw0CQMCI+XsTu6bo9THE0PoZ zpNVtMKtIqTde9XBY45KjUcaFCJ7r+srbCVyVzHTO2/BsaLIOYbnktjRlnxYcQh2yU+eJG 0jfM8CZPthvpseq0ZG9fiYDblUWt9NyXRetMxQE8Q2TJOLnj9X7qFgaU0Azc9ZaOwzsiWO pWIPtcmNxUEOSqTX/UdoZYYwRqJmldphRnW2OMvj779S6zXvai7eppL7f4sibQt72qYlFj aZq9vvrM9VNQDdb3vkXL3LNaRariEyBCYw1rnN/8XJV9hRWGLUqS/Qz5o9vxXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFzZ92SR0zylX for ; Wed, 13 May 2026 16:34:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3be57 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 16:34:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 8766e2122ac0 - main - mandoc: Updating FreeBSD thead library descriptions 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: 8766e2122ac02ff4d86c254d8ef1c41d4a7f76a0 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 16:34:25 +0000 Message-Id: <6a04a811.3be57.aea6532@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8766e2122ac02ff4d86c254d8ef1c41d4a7f76a0 commit 8766e2122ac02ff4d86c254d8ef1c41d4a7f76a0 Author: John Baldwin AuthorDate: 2026-05-13 16:33:29 +0000 Commit: John Baldwin CommitDate: 2026-05-13 16:33:29 +0000 mandoc: Updating FreeBSD thead library descriptions Remove libkse as it has been obsolete for many years and drop 1:1 from description of libthr. Reviewed by: brooks Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D56850 --- contrib/mandoc/lib.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/mandoc/lib.in b/contrib/mandoc/lib.in index dcea23cf81ea..04d86f9add1e 100644 --- a/contrib/mandoc/lib.in +++ b/contrib/mandoc/lib.in @@ -74,7 +74,6 @@ LINE("libisns", "Internet Storage Name Service Library (libisns, \\-lisns)") LINE("libjail", "Jail Library (libjail, \\-ljail)") LINE("libkcore", "Kernel Memory Core Access Library (libkcore, \\-lkcore)") LINE("libkiconv", "Kernel-side iconv Library (libkiconv, \\-lkiconv)") -LINE("libkse", "N:M Threading Library (libkse, \\-lkse)") LINE("libkvm", "Kernel Data Access Library (libkvm, \\-lkvm)") LINE("libm", "Math Library (libm, \\-lm)") LINE("libm68k", "m68k Architecture Library (libm68k, \\-lm68k)") @@ -126,7 +125,7 @@ LINE("libtacplus", "TACACS+ Client Library (libtacplus, \\-ltacplus)") LINE("libtcplay", "TrueCrypt-compatible API library (libtcplay, \\-ltcplay)") LINE("libtermcap", "Termcap Access Library (libtermcap, \\-ltermcap)") LINE("libterminfo", "Terminal Information Library (libterminfo, \\-lterminfo)") -LINE("libthr", "1:1 Threading Library (libthr, \\-lthr)") +LINE("libthr", "Threading Library (libthr, \\-lthr)") LINE("libufs", "UFS File System Access Library (libufs, \\-lufs)") LINE("libugidfw", "File System Firewall Interface Library (libugidfw, \\-lugidfw)") LINE("libulog", "User Login Record Library (libulog, \\-lulog)") From nobody Wed May 13 16:34: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 4gFzZB5Jswz6ddHS for ; Wed, 13 May 2026 16:34: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 4gFzZB3h5Zz3sJk for ; Wed, 13 May 2026 16:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778690066; 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=szOBREqrT1CSw1ZcTQ/gbMa9x8uHL7ycgyWOesk1KWc=; b=tdS1sxwDGiHeOoCKlwfaGsaWtOZoyH0dh3G6KTK4oNJ0l15OtH/IRtoMdetO3TvhOzwU0H 0zRN2IJc/IRkpxQ3TJoO3z+MjK8j6m2MfJlZXnjUNgodaREQ5yxTZqs/RjKFCgu1X3F9n7 fAA9p6b/CqvkXp6hKE2iUQRHYO02MpDto3cBS3NLHO7jwh4KYWEXmZ5tL4nutM2+QKDhe1 UeV7Oa202fPwW+vhn769tenrDf0SHXyk3P7nwuXbqD67uspauX8C9lAdPcGSLNAF2K4is+ IKPC135N6eOBlCsuwZCixo+jlEINN8UEwPLCLWIqu5ImVFGk3dk5rG4lWkEpNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778690066; a=rsa-sha256; cv=none; b=MGXi+8my+Kgk57zRup6fxqFvSEuLEQlvVWPweeH9FpXtBMpH+vhEGG7OlYduDHoA9i6uEP k6LsTaZ4Vt84OLj/F8zhE15wINdYfGG4mDVfGyedLmT3igyCvKPRQxVjnWlK87eMnms2jX ZkJfBlo8z8aH4h5FheHRx67XUrLals069+L4poaKPE8DjZEaUvzzrdFv6hixpy/Q3m6Wkx NA1Z0UKeEojEuCAX4aZXfiG6Ig5ygbtMeJqgQ4P0w+8q3v2Ao0o6u60q2l/+PN+5kUl08s xPGa30VTFXKQeo7rz0XAJbNWVf8q+3UbpAXGvAudS/6zm6J+Lj123yX8fReiqg== 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=1778690066; 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=szOBREqrT1CSw1ZcTQ/gbMa9x8uHL7ycgyWOesk1KWc=; b=c5hJ+9XuV6vjd7+PCHAUwaRuO7vQ908La04dnkDlCApojEg87z5iRlZykG9+tOs4ncpASx FRJZM/RDa0F4LtV/VdNjA0gDcRmRLuIQfGohmuwInCocdBhCCcWkC93YmAm6uA6YnOYQO3 a2LMeiFkOdH2DvPGQ5uPJSwiFSKzH32pHBMxkPqQ3Nb08W3A36Px4fw8+T9WwX6YRL7Svd ummaf3JafgNAChmTkHxgGAUqv623tmtGgPmVxIprCivcYZxt9oIb0JADEZcQcvfOYv+7ud 1CCWlZOpHFzIIVwdiLHBESatgs+oPz4+lVxAk/fSWU1m6nSliNN7z8Y57LYK1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFzZB3GQpzyJF for ; Wed, 13 May 2026 16:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c5b4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 16:34:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 04987aa1d809 - main - arm64/vmm: Enforce a data barrier before tlbi for non-VHE 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: 04987aa1d8099e5f8f5dd8c68e65f315b3f1fd6c Auto-Submitted: auto-generated Date: Wed, 13 May 2026 16:34:26 +0000 Message-Id: <6a04a812.3c5b4.5614f8fb@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=04987aa1d8099e5f8f5dd8c68e65f315b3f1fd6c commit 04987aa1d8099e5f8f5dd8c68e65f315b3f1fd6c Author: John Baldwin AuthorDate: 2026-05-13 16:33:52 +0000 Commit: John Baldwin CommitDate: 2026-05-13 16:33:52 +0000 arm64/vmm: Enforce a data barrier before tlbi for non-VHE Exception entry does not include an implicit, architectural data barrier. Reported by: Ben Simner Reviewed by: andrew Fixes: 5577bb2f67ff ("arm64/vmm: Support tlbi from VHE") Differential Revision: https://reviews.freebsd.org/D56855 --- sys/arm64/vmm/vmm_hyp.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/arm64/vmm/vmm_hyp.c b/sys/arm64/vmm/vmm_hyp.c index 75c15f06dd08..27fdf18e4700 100644 --- a/sys/arm64/vmm/vmm_hyp.c +++ b/sys/arm64/vmm/vmm_hyp.c @@ -708,9 +708,7 @@ VMM_HYP_FUNC(s2_tlbi_range)(uint64_t vttbr, vm_offset_t sva, vm_offset_t eva, uint64_t host_tcr; #endif -#ifdef VMM_VHE dsb(ishst); -#endif #define TLBI_VA_SHIFT 12 #define TLBI_VA_MASK ((1ul << 44) - 1) @@ -768,9 +766,7 @@ VMM_HYP_FUNC(s2_tlbi_all)(uint64_t vttbr) { uint64_t host_vttbr; -#ifdef VMM_VHE dsb(ishst); -#endif /* Switch to the guest vttbr */ /* TODO: Handle Cortex-A57/A72 erratum 131936 */ From nobody Wed May 13 16:46: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 4gFzqZ4SCPz6cfRk for ; Wed, 13 May 2026 16:46: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 4gFzqZ3xYQz3tjl for ; Wed, 13 May 2026 16:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778690762; 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=cEGt6iOEedXRDife2WG883uzx77fIBiCY4NRk9b75Zk=; b=qvCeyYDQeNWsgfDJL7X4S4xiZccVGrTMWQQVnUYSiZE3IH7Vlb/TdOp8MOGUe2igOfm09q TD44Ye810uIdJh3HIAm2QW8FrOr3cwQrh0sQfmfD76Gec+a4pfVW57YG5Iq67PP9WdCjnR IhLfdOHhwCZP16IR8s6gi7mzX7YUAX5FFxxsr5yfxfXD8habMbuNIQp2xF1U7/EQ8bP+60 4oJ4lACZnNZf2cFKdAtXmCs3f21BDd+eIOtKSt6QR1y0te9fzb/oy3K2Ozfp9FKEGhsc+m TczIMlqxBeMbKPYS7U8JrbSLXiyQ9iJl5P3j6kAlVVXOOIyBBW/pntkQmiV7CQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778690762; a=rsa-sha256; cv=none; b=yeGsgZCNr3ycL5Nkbizr/+4YRXm0kQl8pvuKwCdVEZeLTqEoSpllvQK6o46+tyMmM+abFN ZD28pGBQd/+HXHG/VyaxuvCAWtJqGVGSDy1qKGnalpJZwApUoqj5FmdQYB+TgYK+erARA0 UGSIzAZDPRWc2cQBK0cqzQyYgvRxxXQ7V25MYoa8DzOV/0gfyJxSK9F2LsOEXF7xcRUGjo 2KwAUXPJdiS4Lfrowgy+ydCyqm4M7ncrcLwBpQ3IMzvmdtUxGk1Fbna5lkjk7AHM/sSjzI R61Qku38cXQQidIl4f/RWPcuZAUSpcZUfgJHO+BwUAeF9I9BIDsPhELmMMrH4w== 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=1778690762; 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=cEGt6iOEedXRDife2WG883uzx77fIBiCY4NRk9b75Zk=; b=aceZ/ODH9qx7MUmtCeSteM33GPeE8dj4xlzMI7DSBD4/C9EjaUcKFHDJCdNncJl5N//y3x ox33UzmbmeE9x1paa8FlbphWt5sNt6e1wx3nCYjoMKd1Wgve8Y5Hi5m4GAztYNTp/XoHpN SWzUoh0G08V8mNcUOktb6ETAI01ZpSdkRZetpPwihesJzAdy19DhnSckVgJ7XsVr4eUrfQ eS1tIufWCqbt3I46ThElhz5FhjYHtpJRpSW5ZQmle5/6lCRv4N8LQvz1ILc0Kx+y96K6HS /HbilryVETwKUu8SS/9hi/RMiHIUGsLMBxpM0gcKmIwpON3sG4i/f2ZaVqXugw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFzqZ3DThzyqS for ; Wed, 13 May 2026 16:46:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dba7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 16:46:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: ee04ee95ab38 - main - cap_net: fix error propagation for ENOTCAPABLE in cap_getaddrinfo 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: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee04ee95ab386147c57d3b4efcc5774e8d64330b Auto-Submitted: auto-generated Date: Wed, 13 May 2026 16:46:02 +0000 Message-Id: <6a04aaca.3dba7.5cc94167@gitrepo.freebsd.org> The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=ee04ee95ab386147c57d3b4efcc5774e8d64330b commit ee04ee95ab386147c57d3b4efcc5774e8d64330b Author: Mariusz Zaborski AuthorDate: 2026-05-12 09:48:56 +0000 Commit: Mariusz Zaborski CommitDate: 2026-05-13 16:42:45 +0000 cap_net: fix error propagation for ENOTCAPABLE in cap_getaddrinfo Fixes: b60053fde172 ("libcasper: Fix inconsistent error codes of cap_get{addr,name}info()") --- lib/libcasper/services/cap_net/cap_net.c | 4 ++-- lib/libcasper/services/cap_net/tests/net_test.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libcasper/services/cap_net/cap_net.c b/lib/libcasper/services/cap_net/cap_net.c index 5887fe3c407e..59124e3cb54f 100644 --- a/lib/libcasper/services/cap_net/cap_net.c +++ b/lib/libcasper/services/cap_net/cap_net.c @@ -1011,12 +1011,12 @@ net_getaddrinfo(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout) } if (!net_allowed_family(funclimit, family)) { - errno = ENOTCAPABLE; + serrno = ENOTCAPABLE; error = EAI_SYSTEM; goto out; } if (!net_allowed_hosts(funclimit, hostname, servname)) { - errno = ENOTCAPABLE; + serrno = ENOTCAPABLE; error = EAI_SYSTEM; goto out; } diff --git a/lib/libcasper/services/cap_net/tests/net_test.c b/lib/libcasper/services/cap_net/tests/net_test.c index adf5773233c8..21d620e0f8d8 100644 --- a/lib/libcasper/services/cap_net/tests/net_test.c +++ b/lib/libcasper/services/cap_net/tests/net_test.c @@ -73,7 +73,7 @@ test_getnameinfo_v4(cap_channel_t *chan, int family, const char *ip) capret = cap_getnameinfo(chan, (struct sockaddr *)&ipaddr, sizeof(ipaddr), capfn, sizeof(capfn), NULL, 0, NI_NAMEREQD); - if (capret != 0 && capret == ENOTCAPABLE) + if (capret == EAI_SYSTEM && errno == ENOTCAPABLE) return (ENOTCAPABLE); sysret = getnameinfo((struct sockaddr *)&ipaddr, sizeof(ipaddr), origfn, @@ -102,7 +102,7 @@ test_getnameinfo_v6(cap_channel_t *chan, const char *ip) capret = cap_getnameinfo(chan, (struct sockaddr *)&ipaddr, sizeof(ipaddr), capfn, sizeof(capfn), NULL, 0, NI_NAMEREQD); - if (capret != 0 && capret == ENOTCAPABLE) + if (capret == EAI_SYSTEM && errno == ENOTCAPABLE) return (ENOTCAPABLE); sysret = getnameinfo((struct sockaddr *)&ipaddr, sizeof(ipaddr), origfn, @@ -196,8 +196,8 @@ test_getaddrinfo(cap_channel_t *chan, int family, const char *domain, hints.ai_socktype = SOCK_STREAM; capret = cap_getaddrinfo(chan, domain, servname, &hints, &capres); - if (capret != 0 && capret == ENOTCAPABLE) - return (capret); + if (capret == EAI_SYSTEM && errno == ENOTCAPABLE) + return (ENOTCAPABLE); sysret = getaddrinfo(domain, servname, &hints, &origres); if (sysret != 0) From nobody Wed May 13 17:45: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 4gG18825Rlz6cl74 for ; Wed, 13 May 2026 17:45: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 4gG1881JKCz452g for ; Wed, 13 May 2026 17:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778694328; 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=IwvzIg28aU1VG2f9X8Q3WbPs4kSkjYwj9lNZWRBpd0Y=; b=p/FkSD8LgeedAbsODS0lrVqAX/ccsUeOHo3AwyIDuE0i2EKn4VVrBVbQqfaCk8Yj/jr5KL AnqK3MloC6G4o7nqtrNlj+OqEZTZoMrblCVh9XucXlphGVhd3kK7QEV6Gjr06ZtM8C8H1M mnC66KbayOARWx6T4+vvEY9TqtxItWys/j4p3tQjMzGGL9j9/tGJg62FyAh5H59k+3DfYS H97XJWDFjxORFFInuqENBxQ7E4riwb+JxtgGmmZ8QXiGZ3gahPUtRBWS6lZnArAKbAQjdp /tVxQue3Rf5V2yo6cp1WgwAoqbNlYTsLwh+M7br1aDo6ZNqsKNbPmclfFrDMAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778694328; a=rsa-sha256; cv=none; b=qlR4rhRwQCEsXkbKz/mue470hRnZyJmE81Oqw0eTIaeWA8GQJ3r64FLqxO8wNBk0WxuXUl anRAjqGQYc/pi16xwvREl7aACl5/+CDcKV7p28LGMlscgXnsDcJW06x4xFBgRfN/n01Bp5 GHEZumE41LptCMMPaCHGz1+rd156QXHeIIPeVD6OsPAk7ADSXxzOpxoNwtzbKPuAJAjagd 99NL8yf2MQZgOq4o+6k4L/GV4y70cfow1mmoOrZ6v+z/xWuZ2Le8SbruBHkWPZTGU5bBiv e8JxPfGnlIyNDjxYNUMBzwADPpyQDtqN/8091m5ipLKIBofc8n8RmHI2B12gVQ== 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=1778694328; 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=IwvzIg28aU1VG2f9X8Q3WbPs4kSkjYwj9lNZWRBpd0Y=; b=urTxmU9nOjHGb4danyvgmsTuwFcEoIr3t7N/vPvoI0wirDlQ3v1sL0aAsCYJArnLUnwGFT 92t7iI0yau2RQJkURHtacBl7MUT0QKUoi1AoLJrbcGNgS4slD2oYSTAL0uaZ80a5Sv7Jfx Jo4gAchxcAxNCyiCds9Yyfj2DkZjclD1nZ/NX6BFL1qs5ZTqvzezQw9d97/EO/JyZTDRaW 5Tsr5lF1jtZZLGRuDYNg4Bi/1kTEUbmX/R9lWEtahq46IuIzMBsDxY/wTmJrN8UGzT4Tpo 7TL1n62NwcpjuJvr6AmDB06bmOJTkHaYS8llCV/M8u64MXRu5N0BHjFO4EQDmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG1880cr0z11Xb for ; Wed, 13 May 2026 17:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d59a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 17:45:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 2a56cedac2e4 - main - bq_insert: delay the BUF_UNLOCK if not bd_flush()ing 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: 2a56cedac2e43c77e037e2d0c7e5af2ccb083c53 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 17:45:28 +0000 Message-Id: <6a04b8b8.1d59a.24dd7c7c@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=2a56cedac2e43c77e037e2d0c7e5af2ccb083c53 commit 2a56cedac2e43c77e037e2d0c7e5af2ccb083c53 Author: Ryan Libby AuthorDate: 2026-05-13 17:43:21 +0000 Commit: Ryan Libby CommitDate: 2026-05-13 17:43:21 +0000 bq_insert: delay the BUF_UNLOCK if not bd_flush()ing Reduce bufqueue lock contention by delaying the BUF_UNLOCK to after dropping the bufqueue lock. Still do the early BUF_UNLOCK if we actually have to bd_flush. Reviewed by: kib, markj Sponsored by: Dell Inc. Differential Revision: https://reviews.freebsd.org/D56948 --- sys/kern/vfs_bio.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 675f6fb4e526..181f2907c245 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -2053,22 +2053,26 @@ bq_insert(struct bufqueue *bq, struct buf *bp, bool unlock) bp->b_qindex = bq->bq_index; bp->b_subqueue = bq->bq_subqueue; - /* - * Unlock before we notify so that we don't wakeup a waiter that - * fails a trylock on the buf and sleeps again. - */ - if (unlock) - BUF_UNLOCK(bp); - if (bp->b_qindex == QUEUE_CLEAN) { /* * Flush the per-cpu queue and notify any waiters. + * + * Unlock before we notify so that we don't wakeup a waiter + * that fails a trylock on the buf and sleeps again. */ if (bd->bd_wanted || (bq != bd->bd_cleanq && - bq->bq_len >= bd->bd_lim)) + bq->bq_len >= bd->bd_lim)) { + if (unlock) { + BUF_UNLOCK(bp); + unlock = false; + } bd_flush(bd, bq); + } } BQ_UNLOCK(bq); + + if (unlock) + BUF_UNLOCK(bp); } /* From nobody Wed May 13 17:45: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 4gG1894KxKz6clFK for ; Wed, 13 May 2026 17:45: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 4gG1891nB8z44d8 for ; Wed, 13 May 2026 17:45:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778694329; 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=Z7wvWoLdeY40G4NUhJtjHZRID9MdHaiLX2yNHlNGcVI=; b=SFfFTfFTRF9aHzrcxaWeTCB5BrdzxFnv6v5FUt1CTpRXL1WbUYfhEb/2Uus8wHdtAO22Kn SNjML9c9v85rw4cYwHg+Ix6/5/O5fUmJ6Gil4yzVZV2d7qelpsTo3YmKS/6KfdRKstEJ1g FgW8HqrgUZLSBP8GyhLl3tZOnfwUYw7vx0lL4OFXFE4IDlCC58j+wHqj1bN3oWvAf4Jj0P +n6+JlHP6EGd4lEm5nhL5JZx47X8W+cTvTqv2JqMtXnmuy939XnkAXLLnPF0jCcsRyMXuj FDA0KWcMuVlVwWAJeV/2cE5gVruTQBkjSqyTbrZo94CbFaO+jYXwmG204oEDGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778694329; a=rsa-sha256; cv=none; b=WIWeB1mAM02zNIAdSSw1Ir8Y9MJP2j0n8cS61M3jaxzaY/maWPHryYIBB1KW+dBot+07Ut IYP5np4wBv1GlC2grF4O2KY84RAl636wwLteW7AmxEagfKStteSPA1FddHGiiFle0+LpTO 9YXuaNmXC3igAr+qy6UV8uLGGlEEOHFIdqECbwqQ4Xwe1EPbXZ1fCeFGK+5dgmQIFhf8r2 cLigBGbsmYR9GKQjR56DdqTrBRy6YnoqK7p7VOLKDz87Twyl89AYoc2oqxBFbGsua2BiHN TxRjbawB9t1X4FH8NnvsU9MfQFgqYLX+2clEuVHH21LEsS8VAV2r/dZoHskbmA== 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=1778694329; 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=Z7wvWoLdeY40G4NUhJtjHZRID9MdHaiLX2yNHlNGcVI=; b=JN4YEoZXdzQb0Ufh05Xado/V47Fv255HczHnxyhxKZZgYvfdgXNSWoiRWaJLuJqkJtCJA+ nlNHl8yoghpqEnf0aVHPRSU52WxRRce9I7+FwI8XO/IWiS96qSYzmceZH1mGOdQgr++0Lv 8q68Heu0WwtncXHRyiX0Jqo3z1wm1y6+BRxM95v6Rzs2aJ0R8aP7isXydLqdSL/OwfDfw1 nkY1ZEWtuuARP9GlP9cqwtZY7t0V1KNI3zvtmLLg0L6AKVfM0RjDElxcbkMyQly6jKBY4N +Eywd8rPRgvelvimuqZcJwtMSNrsquM25ooCzcKWklJCb6evTtZMGYTk6iDNBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG1890x7Yz11Jr for ; Wed, 13 May 2026 17:45:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1df81 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 17:45:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: e30e507a7737 - main - vfs_bio: mark uma zone pointer __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: e30e507a7737eb7cc2d2592a26171a2d5cf6c4f5 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 17:45:29 +0000 Message-Id: <6a04b8b9.1df81.e9f2546@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=e30e507a7737eb7cc2d2592a26171a2d5cf6c4f5 commit e30e507a7737eb7cc2d2592a26171a2d5cf6c4f5 Author: Ryan Libby AuthorDate: 2026-05-13 17:43:21 +0000 Commit: Ryan Libby CommitDate: 2026-05-13 17:43:21 +0000 vfs_bio: mark uma zone pointer __read_mostly Reviewed by: kib, olce Sponsored by: Dell Inc. Differential Revision: https://reviews.freebsd.org/D56949 --- sys/kern/vfs_bio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 181f2907c245..cb45ca7c75b7 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -405,7 +405,7 @@ struct bufqueue __exclusive_cache_line bqempty; /* * per-cpu empty buffer cache. */ -uma_zone_t buf_zone; +uma_zone_t __read_mostly buf_zone; static int sysctl_runningspace(SYSCTL_HANDLER_ARGS) From nobody Wed May 13 17:45:30 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 4gG18B6C4mz6cl75 for ; Wed, 13 May 2026 17:45: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 4gG18B2W59z452p for ; Wed, 13 May 2026 17:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778694330; 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=TuqZFTqSdwB+KIcZSx1SMR1VM/avxwHfFHSpGdyq4qY=; b=oloC/V7aGMFYWDYMp6coAY6GJWFmI8EZssBoT1n+YgQZBTnhMShtFS/nlB8/aNQ5ne6B05 65sPU8SNDQIeRyCM1j7/XOMFh+w12M17/P3BIY5iJ7jAkatMzRkzgZRZwjAnnC/Je53so+ R3vV1AFmIrjv8YzKtRcb81CCeW+L0XP8KQuxOl216qEHn4hPksXLewiyS9JJNScBoXiBXD QuBzIM5TomrORekKIJ/ArFflJtsaU9IFAk3kZhI9HHjELm3BbwC5POrjrMAIH28MyXCxto Ry6S1nCUBWMmbcJaYX8cboOLKkH+c/HsiR51oczfU+VyjwOMxYw0KnyWE5LxXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778694330; a=rsa-sha256; cv=none; b=LIAJrjt+6JwijsyesAcx2KWfiY4HebJKQji9AmIOQWIt5ZvOinpRJqQ3cyZgG3FYi3z3gh rDcl00+J3DqRa7EskNV+y12BaNrV8mg1qHfPIA4YU+aE33qpXeH1W0L9/LPwxVvnlV5GkT 4l2YplXj6F9/D00ZvqJIU5OTrM0y2xFZRkkw0JQc6aSV1Yf48s0iWSdBiJ6o5D+yugBZj0 YAuRnox1m4HfNKMgS2mhrszgOosIehu/BWybPBwFnUWtFoGrEkzmBDft2FcAdh9OdKrR1f glHOhYckXUcQDvq/DQij/nDb9ht5Vlc9wBhgDBlAWbEgSAM5OLgtomWgljfOqA== 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=1778694330; 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=TuqZFTqSdwB+KIcZSx1SMR1VM/avxwHfFHSpGdyq4qY=; b=bWfW5QBck+rHE4IwiHvfJ7990A9puTWLFTfTTW5KEqWVblwFEZ2ZjvF0QjT17bu0FHmUM+ l9Wugogm87ZAiCNPuEkThZrx4nPvD8FXEGS40iFVjUKTl0IFjrCvgHd+kV5bjM2GzsRsSH 1YCCTuo1ZBtX5lBcgTvzvufMZgDq8+1zLBM4D1TK+/3ORLeZCNcsJNdnuDQimqTTbwwNsU AR2D7XXqJyco03ewpJA1JalF+CQVE/UBw4HQghKJSN+ExXyAExpXTr7tbqPCx2RnnVefrE pdY++2Uad4rknB2egxdv9YDPe+K3ABUqr1ocCv4hPU1tMrBUkPtkcV4XIeiRCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG18B1jlSz11Js for ; Wed, 13 May 2026 17:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c03d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 17:45:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 33355275247c - main - vnlru: avoid cache line contention 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: 33355275247c462e1204bd1db5905a7d132eb502 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 17:45:30 +0000 Message-Id: <6a04b8ba.1c03d.78f0936@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=33355275247c462e1204bd1db5905a7d132eb502 commit 33355275247c462e1204bd1db5905a7d132eb502 Author: Ryan Libby AuthorDate: 2026-05-13 17:43:21 +0000 Commit: Ryan Libby CommitDate: 2026-05-13 17:43:21 +0000 vnlru: avoid cache line contention Reviewed by: kib, olce Sponsored by: Dell Inc. Differential Revision: https://reviews.freebsd.org/D56951 --- sys/kern/vfs_subr.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 4bfbc0a7057e..54e883038046 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -160,13 +160,6 @@ int vttoif_tab[10] = { S_IFSOCK, S_IFIFO, S_IFMT, S_IFMT }; -/* - * List of allocates vnodes in the system. - */ -static TAILQ_HEAD(freelst, vnode) vnode_list; -static struct vnode *vnode_list_free_marker; -static struct vnode *vnode_list_reclaim_marker; - /* * "Free" vnode target. Free vnodes are rarely completely free, but are * just ones that are cheap to recycle. Usually they are for files which @@ -190,7 +183,7 @@ static struct vnode *vnode_list_reclaim_marker; * E.g., 9% of 75% of MAXVNODES is more than 566000 vnodes to reclaim * whenever vnlru_proc() becomes active. */ -static long wantfreevnodes; +static long __read_mostly wantfreevnodes; static long __exclusive_cache_line freevnodes; static long freevnodes_old; @@ -326,12 +319,26 @@ static enum { SYNCER_RUNNING, SYNCER_SHUTTING_DOWN, SYNCER_FINAL_DELAY } syncer_state; /* Target for maximum number of vnodes. */ -u_long desiredvnodes; -static u_long gapvnodes; /* gap between wanted and desired */ -static u_long vhiwat; /* enough extras after expansion */ +u_long __read_mostly desiredvnodes; static u_long vlowat; /* minimal extras before expansion */ static bool vstir; /* nonzero to stir non-free vnodes */ -static volatile int vsmalltrigger = 8; /* pref to keep if > this many pages */ +/* pref to keep vnode if > this many resident pages */ +static volatile int __read_mostly vsmalltrigger = 8; + +/* Group globals accessed only under vnode_list_mtx together. */ +struct { + /* List of allocated vnodes in the system. */ + TAILQ_HEAD(freelst, vnode) vnode_list; + struct vnode *vnode_list_free_marker; + struct vnode *vnode_list_reclaim_marker; + u_long gapvnodes; /* gap between wanted and desired */ + u_long vhiwat; /* enough extras after expansion */ +} g_vnlru __exclusive_cache_line; +#define vnode_list g_vnlru.vnode_list +#define vnode_list_free_marker g_vnlru.vnode_list_free_marker +#define vnode_list_reclaim_marker g_vnlru.vnode_list_reclaim_marker +#define gapvnodes g_vnlru.gapvnodes +#define vhiwat g_vnlru.vhiwat static u_long vnlru_read_freevnodes(void); @@ -1345,7 +1352,7 @@ next_iter: return (done); } -static int max_free_per_call = 10000; +static int __read_mostly max_free_per_call = 10000; SYSCTL_INT(_debug, OID_AUTO, max_vnlru_free, CTLFLAG_RW, &max_free_per_call, 0, "limit on vnode free requests per call to the vnlru_free routine (legacy)"); SYSCTL_INT(_vfs_vnode_vnlru, OID_AUTO, max_free_per_call, CTLFLAG_RW, @@ -1535,7 +1542,7 @@ vnlru_recalc(void) * Calling vlrurecycle() from the bowels of filesystem code has some * interesting deadlock problems. */ -static struct proc *vnlruproc; +static struct proc * __read_mostly vnlruproc; static int vnlruproc_sig; static u_long vnlruproc_kicks; From nobody Wed May 13 17:49: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 4gG1Dk29QDz6clf1; Wed, 13 May 2026 17:49:26 +0000 (UTC) (envelope-from ivy@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 4gG1Dj754kz46px; Wed, 13 May 2026 17:49:25 +0000 (UTC) (envelope-from ivy@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778694566; 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=hkl5VMJzR3pK1LZlSj7H1e9SwHfSMX+ahAuMzsthJNY=; b=jDUjtA6XHrRm6PYgUaV50zvJppG0BpRZPfHcPkJcuG1qCg+W/v97uK/L3pXgdID9wBPfzF 1lIyyJSoAsm/aUB/gfhamd7AMB72Klg2OzleaDLB1sv6mBKutRbieOsO4yZY+dz07S+xzn jHfCpsEEuCiMMqSTCfxBNyaVLa3mRIuMyq54irX0ofD/8QTYvf/vuNCOs8q2MRL8moi3+R RGgf1PrJwXbe6K8LdN+a/keGdDcdFtHNYThWoP/6EckVV3/M308Qu8dcTulLLeOGW+Gy8E HX675VJ09v3fb3HfDYzsCftfyLkVMqLiZNTRfZBb2TyZt1HHdbMh0YOz/9cIBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778694566; a=rsa-sha256; cv=none; b=S2XNSUKbb4Dc/zg0RXwKmQg5bZolwqZfA9zwQueUQEECfa+rfneep3CnAswA9CYCXHuJnl zdRHrZFMnHK79v7z4RO/DYHDysFS45AhndUYK4fO7UPUv4nswZT0GoutoS3gCYbTaAgAQs wg2hlGjFmq6+PwAtimB/FoAyaU3i4PG51mBv/l3d1SnyWvYkbahtz6flhPjXzaoZJuvEE1 dZ28LpQ6DzaDlSDWQ+0/6V32WSb9EPYRHw1QLa/OQlvDCvv1XrdcwS42Ls+uG96sbm4gjg E+TZOmuCjBqjtSSUEs6utWfhQ1AV7f1VgPvRZtnX8qLyLR5IXBqhZ0JwrknGzw== 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=1778694566; 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=hkl5VMJzR3pK1LZlSj7H1e9SwHfSMX+ahAuMzsthJNY=; b=lOf+KMTyqyvsScM2SaNZgJIKQpjHqu+kDZi/i2/Tz8iA54DFcF+syPyhgVsEwdKBiqaqPP VhbPKquHTtmGszw0LfqkMJVjkYF8FXExyVSJrD9sWVIM1JYzUyQA3htOWi761hx44B727H 9j6M2CUZ09KQkd10yQvNF6Lulh4uK89OKF5wWugT1utxoE9AA3jrNmmCujzlbQtygrttFB I7i9L502aA4NMah1iQRoMc+wXicp7jKRwBOVrQ6rSLsusmQZPkRA9ww1VhFA5fQtR4LWhI SRSrpetD9VNXBLTC3jeREBrOdtbo3moZROGFN/L8JpLmn0ywQyjWD/QX7DG1jQ== Received: from rose.le-fay.org (rose.le-fay.org [IPv6:2a00:1098:6b:400::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: ivy/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gG1Dj2879zFMj; Wed, 13 May 2026 17:49:24 +0000 (UTC) (envelope-from ivy@freebsd.org) Date: Wed, 13 May 2026 18:49:22 +0100 From: Lexi Winter To: Andrew Turner Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Sarah Walker Subject: Re: git: 76a2904c352b - main - arm64: Add RSI detection for CCA Message-ID: Mail-Followup-To: Andrew Turner , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Sarah Walker References: <6a035b82.3e295.91ae8c3@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; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="WPl1nKXF5nSvLU5e" Content-Disposition: inline In-Reply-To: <6a035b82.3e295.91ae8c3@gitrepo.freebsd.org> --WPl1nKXF5nSvLU5e Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable hello, Andrew Turner wrote in <6a035b82.3e295.91ae8c3@gitrepo.freebsd.org>: > commit 76a2904c352b497b32fc902523e3e485f7b06ffd > Author: Sarah Walker > AuthorDate: 2026-05-12 11:27:13 +0000 > Commit: Andrew Turner > CommitDate: 2026-05-12 16:54:40 +0000 >=20 > arm64: Add RSI detection for CCA i think this commit (or a related one) has broken the aarch64 LINT-ACPI kernel build: --- rsi.o --- In file included from /aux0/ci/worker/main-linux-clang-aarch64/build/sys/ar= m64/arm64/rsi.c:35: In file included from /aux0/ci/worker/main-linux-clang-aarch64/build/sys/vm= /vm_page.h:68: In file included from /aux0/ci/worker/main-linux-clang-aarch64/build/sys/vm= /pmap.h:88: =2E/machine/pmap.h:151:48: error: unknown type name 'vm_prot_t'; did you me= an 'vm_page_t'? 151 | int pmap_change_prot(void *va, vm_size_t size, vm_prot_t prot); | ^~~~~~~~~ | vm_page_t /aux0/ci/worker/main-linux-clang-aarch64/build/sys/sys/types.h:293:25: note= : 'vm_page_t' declared here 293 | typedef struct vm_page *vm_page_t; | ^ --WPl1nKXF5nSvLU5e Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQSyjTg96lp3RifySyn1nT63mIK/YAUCagS5ngAKCRD1nT63mIK/ YGfLAP0TGl5pue2SS6h28oOiGSWxo8Hcrg6PKzNJ8c7uLCM+6gD8DEHtTCsAoLJM hDqqn/rDRfaFzfGIQ17N0Nr/bHTKvQ0= =SIXX -----END PGP SIGNATURE----- --WPl1nKXF5nSvLU5e-- From nobody Wed May 13 18:11: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 4gG1kR2GqMz6cn7J for ; Wed, 13 May 2026 18:11: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 4gG1kR1KwZz49GB for ; Wed, 13 May 2026 18:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778695903; 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=K+ltc75VaCgSKgSIljHOGu+91tPq6Vok+rxeF3LgS9I=; b=xnnFZQ7ITWk9VpAdOd8R4lBMkKQV/3FMMyM5usMbwsiikhZpupzHALSKF977wCSWjoSSqj e5Ypbp75ix9dU1V+C8Bq6ojSDnLRynKahmuPPMB87DRBcyBaT16fx1bqQQLAzjbDQBMiAP DGZSngcgtYMTyeF/hMH/UarZ8okjIoZpyKPwx1T2sfUgTgVZ8bDv/SMG6NjBf8n5YaIbaX yrP7FjP+L0d6gwsqQY/SyO0ry9viwLEHxA8p6dOXp0vtPkeU7b9ZeTfhIIBGjHJ9ufT6gP sbAeXHNVz0Zqgp3r921gmdQsENfEHvk9+ZVSyJQh27OXeqWSTDjz6cgz6seKYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778695903; a=rsa-sha256; cv=none; b=aDMCoO/kj9LINJ9w8FOtWTSVPm+0CyCYqctldPgYh8x64jQajYo3PuU7XhPMtH4oIO6cIV rpQ8irubCIF8wYM86XRcsKdPghkhDhPltaS8LdCMOLHiUZ+mcMbGp8BZ+V8DGmYgI2iLLC 8+HYvVLM4U3FcmieyKAMu2sBrR4z796DZRh2p8CvcJUAwDs1P5dFf/o+ej761efSQUTNb8 NBBuXFJDPHNXJtOmmjlN2DKDlFgsL7vGbTzu1j9nSG/nbdlOswnasf8aiDc7tHcEfS9KG1 OAIyJS6NUpn8VXOGzFabMzi0Cf+WRccDg9pgEWB/xgBkdD8IwtrAnF0H0jkS+Q== 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=1778695903; 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=K+ltc75VaCgSKgSIljHOGu+91tPq6Vok+rxeF3LgS9I=; b=bIBt/YHTdcwtNBWdCR7pAPkC5kxxaXQ2O2fKwH223ptkllHWQNpkLia6QJeoB5gtRKxciZ YGAFtx5SsrDFdJ6XrJU1MKL6bPDAMZQgeuTAv/GAhW/JGmUF4v/5QrTMcFNS7b59pu58zx fewPTX55WShPw6NU0pCb9AL93vMWCznYLNYcDHkj5jAYCHxJ8EM2SvyCYxnxk03zQ0cZ0K kpiC/OvTxJcFFTKNgeF7/85DfoG8G8AdmONyhQyBn5/3YH6D34cN59EkOX9ErdnnNrnFbo 7DaUbzWFqpUIumFL5viXui858GxoBpNl0hIMv4ZxWSv3/cJqwYg7jnW+WIFuSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG1kR0m05z11vZ for ; Wed, 13 May 2026 18:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20cd3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 18:11:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 52fa2f9f8d57 - main - clock_gettime.2: Fix a couple of typos 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: 52fa2f9f8d57e4dde555567794c6b3e0e242b8a1 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 18:11:43 +0000 Message-Id: <6a04bedf.20cd3.1ddaf401@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=52fa2f9f8d57e4dde555567794c6b3e0e242b8a1 commit 52fa2f9f8d57e4dde555567794c6b3e0e242b8a1 Author: John Baldwin AuthorDate: 2026-05-13 18:11:26 +0000 Commit: John Baldwin CommitDate: 2026-05-13 18:11:26 +0000 clock_gettime.2: Fix a couple of typos Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D56990 --- lib/libsys/clock_gettime.2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libsys/clock_gettime.2 b/lib/libsys/clock_gettime.2 index 841673648dfc..746be2e03d8b 100644 --- a/lib/libsys/clock_gettime.2 +++ b/lib/libsys/clock_gettime.2 @@ -71,7 +71,7 @@ Increments in SI seconds like a wall clock. It uses a 1970 epoch and implements the UTC timescale. The count of physical SI seconds since 1970, adjusted by subtracting the number of positive leap seconds and adding the number of negative leap seconds. -Behavior during a leap second is not defined by and POSIX standard. +Behavior during a leap second is not defined by any POSIX standard. .It Dv CLOCK_MONOTONIC .It Dv CLOCK_MONOTONIC_PRECISE .It Dv CLOCK_MONOTONIC_FAST @@ -108,7 +108,7 @@ It will increase monotonically during a leap second. Will return .Er EINVAL if the current offset between TAI and UTC is not known, -which may be the case early in boot before NTP or other time daemon has +which may be the case early in boot before NTP or another time daemon has synchronized. .El .Pp From nobody Wed May 13 19:37: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 4gG3dS6nVTz6cv60 for ; Wed, 13 May 2026 19:37: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 4gG3dS5TlKz3Txl for ; Wed, 13 May 2026 19:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778701052; 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=PDsEfwKPC8oOUz8DHlQH6Jjb3YlLH7tSqgzFU3gTgME=; b=N94G4ZI9gWjdp5If+QgbHq7xcFWf/YqNyxs6yR+dK33WBV8dnaGwKMMy+h0RL2cKjwly9h kP3DH1C+zSXdetxEvsM7BpJCIdQsAwz209DpmEhbgwRkl12gyn3dkU2Np0BtMZOeilYz8W zXn30/w0zr96G2+XoIPOja3MSh1JGtmcau8YHDPUhIRhQAw/zM5Jm7jIk5wsUlb207Uf2N rGlJ2gb4/+lI/bJcDlU5SlXSFv1SpSqP3eUsA1WiKjxAq4akWUBy5VD3FbqG+TplTwHDuE evfvcbLdnqeN4IvQmwXYankB4y5Gnjj1at5ExTq2NwXk5pf7jlSCkOopMEJOYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778701052; a=rsa-sha256; cv=none; b=efGKIaaaIFIi0GwxSU8iG0KgVRVAUodDJnMLDSQWsam3Px5YwcGDOD1mr/g7vBsilVG3ms 5r15340osq2tcKZNVVWyzkSrWCA/1WX2Vhm7fxCMaQKTXQ4UgHKRhd4AfZwGHs35EGbLH8 QbmZOz+dFxviqWMYig61kmO6/nTkv1q0uG6xu2bu3iWh/R/xgxtys7tciRmsuBiIRKji71 VXizdO64o2l/eCcRihLI+rZKrxOMUPMnb41tDvqPD/Mn/sw+taTTtr4cOpryPOdj27BcDi kKeo0rSBmVAJgPaYuLg5nDPJO5u1olTGkkDK1M+cEk6GVGhvgbf6BoiKrWbSYA== 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=1778701052; 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=PDsEfwKPC8oOUz8DHlQH6Jjb3YlLH7tSqgzFU3gTgME=; b=xwJh+PtJGXEuOdfXow3d3XxbZdRpeRa+SBAHl/bSjp2TBXkg3ZYFCINPLlO9O1QDbeEMSB ghivpcnKaPNFu8ZsVFgo6ZnvHq42UQhkW0T9seH1VqE+tyL8/HutOKf0wydtN6UnWiWos0 qZnfxC5wVnpKbybRh7mqpur7Ns05oNuGqxfk65NV7Yo4+dbdcfNE4/NIu+J34st279gSJT F8q1a0571MmKuBP1qkaM+YwqnSLiENBc77tTk6SXc8fAh8RIv2bzHVCdR9maU2d8HCr3k9 Zf2sKKhBUY5JghpkI/+ReNeESge/i7my1d4rmVrxcoChoRmSsDBH19p7fIJJFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG3dS51TNz14PC for ; Wed, 13 May 2026 19:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 305b9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 19:37:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 54d0ae979d95 - main - gpart.8: add entry for xbootldr partition 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54d0ae979d9596399f33dc7d7245866f86ab7f8e Auto-Submitted: auto-generated Date: Wed, 13 May 2026 19:37:32 +0000 Message-Id: <6a04d2fc.305b9.5b806a77@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=54d0ae979d9596399f33dc7d7245866f86ab7f8e commit 54d0ae979d9596399f33dc7d7245866f86ab7f8e Author: Mitchell Horne AuthorDate: 2026-05-12 14:13:12 +0000 Commit: Mitchell Horne CommitDate: 2026-05-13 19:35:11 +0000 gpart.8: add entry for xbootldr partition type Reviewed by: emaste, markj Sponsored by: The FreeBSD Foundation Fixes: dab8138e13de ("g_part,mkimg: Add additional GPT partition types") Differential Revision: https://reviews.freebsd.org/D56969 --- lib/geom/part/gpart.8 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/geom/part/gpart.8 b/lib/geom/part/gpart.8 index 89bfc3be6f8a..887a07932f60 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 May 9, 2026 +.Dd May 12, 2026 .Dt GPART 8 .Os .Sh NAME @@ -1042,6 +1042,12 @@ A partition claimed by VMware VSAN. The scheme-specific type is .Qq Li "!381cfccc-7288-11e0-92ee-000c2911d0b2" for GPT. +.It Cm xbootldr +An Extended Boot Loader Partition (XBOOTLDR), secondary to the EFI system +partition, used to store additional firmware or boot loader menu entries. +The scheme-specific type is +.Qq Li "!bc13c2ff-59e6-4262-a352-b275fd6f7172" +for GPT. .El .Sh ATTRIBUTES The scheme-specific attributes for EBR: From nobody Wed May 13 19:40:31 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 4gG3hv2vF5z6cvD9 for ; Wed, 13 May 2026 19:40:31 +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 4gG3hv2MSHz3VW1 for ; Wed, 13 May 2026 19:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778701231; 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=dprnyI8lpzFMEiqu3+pk5T2eHp0hhGIvnVppjwrHBRs=; b=lv0jOLvkES6n9Q6HYgUI9HoEsWGwQJ/AG/ZaJRCNhHJuefbnJcXy5mOb7vZCKeH/iZITM3 mnQCKwZ4DDjSwGZr0QrRp8kktZawjlRdx1rm/an1YvLh3Rp4xTX/I4CTqWIek6UsxxzgnM uNWBhMZg6BGPY9clC03++Gk+w2kXBCmIkwBiZL32KlDHcUnL+hvtkp05xQEwi1VCD3DLm6 kwXUQPyU1xniB1cK3ffDOO4+EiVJXibpW0FPE4b2oBplAp10FX+CJ1/uWFW8LuYt1xKtCn j6ZWKiAD2YZIvD1mWXeOpS/L4E7GBtSAoVHXlq+p01PXdKT2+PdHueKVGX8hMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778701231; a=rsa-sha256; cv=none; b=jtVyXAQ1gDUyEp6MX+sdi3xKKB4c1CStodyz8ysNhFORSZE2u//fKnLeXxd+3hk2QRfATX s+j6/LykPuuxlWMzBLMeudSeCyFq92aMboqoVVcTZq8VO7s0fQcK9MHThMhAmCBxPoW2kb Jzu92EkFT3qJlsxDb+abuW29NC6E8adgya96kNTxdZALM3gItL8NHeVyfMFcBRcT4tPXxD DbQCHiyy+WLtOWdTSMA6DyiQ+GvEvRrF8J6b7LsOU4g2cJKhU3ytCiVdBMS2DvZOO7MXhP fzrjpyt76v6TuaeQrZXFLcqJmyIdpO3dL68rkQ0fZjmVXJFmaizcoZu5ZX93/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=1778701231; 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=dprnyI8lpzFMEiqu3+pk5T2eHp0hhGIvnVppjwrHBRs=; b=JjB+30pGAoESCxuqr4Tpp9YKg54FeQerEJ3DOLR8INfyLjWcDp7DgvncUFDBaqmT6z+WIp LCcuLMuZrESn+J7W72leHlNZTS/1WGj4Dp3qkNlgh7PIqmfQ5FudjtDdriuTXSdHuupTdk 01SHNH/c+5ONWQNYoqngHvV13ce4A2BcWPbhOKv/rVaBeN29Kp8gQqP/x5Tly8uX3cTe23 zZI69QENzC4dU9L8a6XY3JKkS5WSHdx3zqMGLEYtILtU8TEGjCc0a6wmEC6oXvW4oaMiS5 5JR5/aCjd/iYno6TANJDvgry//71povygpF2z1/nZ+PnmqqISPpjD0WG0pn00w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG3hv1C1Dz13sd for ; Wed, 13 May 2026 19:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31ba9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 19:40:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cb31a266167c - main - ptrace: clear TDP_USERWR after transparent attach only on attach 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: cb31a266167c8bde3488fbdd6bf24c38b6f59977 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 19:40:31 +0000 Message-Id: <6a04d3af.31ba9.20680c0e@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cb31a266167c8bde3488fbdd6bf24c38b6f59977 commit cb31a266167c8bde3488fbdd6bf24c38b6f59977 Author: Konstantin Belousov AuthorDate: 2026-05-11 01:12:30 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-13 19:40:03 +0000 ptrace: clear TDP_USERWR after transparent attach only on attach The flag indicates that the modifying ptrace op was issued, and clearing it after transparent attach is needed to not leak the flag to later operations, since it is cleared on the syscall enter. But clearing it there unconditionally is too strong. The clearing should be only done for attach situation. Reported by: Alex S Fixes: 99976934274de6fa19f049a0b6eac10856710f96 Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56928 --- sys/kern/sys_process.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index dece6457a4bf..5effc6fbe2d7 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -1411,17 +1411,16 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) * register file or specifying the pc, make the thread * xstopped by waking it up. */ - if ((td2->td_dbgflags & TDB_USERWR) != 0) { - if (pt_attach_transparent) { - thread_lock(td2); - if (TD_ON_SLEEPQ(td2) && - (td2->td_flags & TDF_SINTR) != 0) { - sleepq_abort(td2, EINTR); - } else { - thread_unlock(td2); - } + if ((td2->td_dbgflags & TDB_USERWR) != 0 && + pt_attach_transparent) { + thread_lock(td2); + if (TD_ON_SLEEPQ(td2) && + (td2->td_flags & TDF_SINTR) != 0) { + td2->td_dbgflags &= ~TDB_USERWR; + sleepq_abort(td2, EINTR); + } else { + thread_unlock(td2); } - td2->td_dbgflags &= ~TDB_USERWR; } /* From nobody Wed May 13 19:47: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 4gG3sc12Zkz6cvsg for ; Wed, 13 May 2026 19: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 4gG3sb60PMz3WXZ for ; Wed, 13 May 2026 19: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=1778701683; 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=8JfDlnkcp7YbH/ldCs3a0JzrUW1CPtOQkTAYgWJpPU0=; b=aOS02XVRwWKLgVRh65epNGF80+LOAUphtcW7AXPQi6En2g8tFCBeDueCPgCDV3Oo86CoM0 P0sDU1JEk1mOVMl3We2DxY8xhycjum8nxOcaZOgeRTkU43XGmdhpPBIQlsvmdPMGOMUZWK tfHVq7kkTIhzbpk2gLux3cIcRb30vbcmd+Tcipdwt/RmqBtIghtaKk6/So9aa47eDxlyic 6ZXyfFSvtvPoeHboQSC/SaEOq7N0sKVnE4FhSuHDVxLJ1CM9D+1F6KMT38HtubIdhJ6P4f yS1DBJQWKAc08CUZCZarFEAFvzocZyBMvv67o0YVORXer4oBB7AnPqUA+kz9xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778701683; a=rsa-sha256; cv=none; b=rYkMpkmUxE4EBmntBvcg7QbNW1n0Ey4x6E2H9REYdeAX4w2SgbG0l1X8VajX8pzypRGFhG 5KG7zNoEpEaeOO008q7bAdCJvTZb90nvlLNy+6TJMtICEn88WQ1IbYeqT4MvdBF6tqfpXo nxONuEVBiFBJ2OG+0n50w7kfmxXumjXbTuyYPm1Ilt6GDSLXCzaCigXi4ijcHC2wf80gbK dhpRSrRMqFE+iJRI6vTN7oCPZpn4iPc1Q9zX2x5CprYO4SF2CwfPdFOgq+0lApBlF1vd1A NgYtciGC5pyhp56IK5DdHOFufT2xKCOg9ya8vYMIbdo8FDbPixCzhV+uJ2/XDg== 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=1778701683; 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=8JfDlnkcp7YbH/ldCs3a0JzrUW1CPtOQkTAYgWJpPU0=; b=nI8pqbJBWReCBxp7vDdJxmU3R4p6oB9UprOaK6yLvJgWOucA4YQIe43hXWobmuACs52OUR 9stmhoFmx8v1z0BMIgpYI74udkdWFQD2K+71JRKRso8/WyytJ99eI7e+4GSwh/58MwYkai VJObDQ1m5sEEYNmMr5euZPIM/E4Taj7bXUAkdF1y4pFaZpJf2KLbDrSXkqf5BkeiMJyvPB k4oY5cDdwvqFFh02IgzeXu3Ga+wCZ94SbSwCSrCTz6AYLPNca+a6BRs0OxBneObP5oI1wA RxjnFRFjYGfWcdN0GypJWE7pLop2Z9gkCOSNzIcU8A6Ill7nLstqeKyze7VlUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG3sb57M1z13t8 for ; Wed, 13 May 2026 19:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 314e9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 19:47:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Chuck Silvers From: Konstantin Belousov Subject: git: bab04ddf1fd4 - main - ufs: support unmapped bufs for indirect blocks in bmap 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: bab04ddf1fd4b7a77d1cfae4a67ededf1f35ee0d Auto-Submitted: auto-generated Date: Wed, 13 May 2026 19:47:58 +0000 Message-Id: <6a04d56e.314e9.6d1b1b68@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bab04ddf1fd4b7a77d1cfae4a67ededf1f35ee0d commit bab04ddf1fd4b7a77d1cfae4a67ededf1f35ee0d Author: Chuck Silvers AuthorDate: 2026-05-07 12:43:53 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-13 19:46:00 +0000 ufs: support unmapped bufs for indirect blocks in bmap Use unmapped bufs for indirect block buffers in bmap, and use sf_bufs for transient mapping them when we need to read the specific pointer. [kib note: I changed the original patch to use sf_buf instead of explicit DMAP utilization, making the change MI]. Tested by: pho Reviewed by: kib MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53424 --- sys/ufs/ufs/ufs_bmap.c | 143 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 134 insertions(+), 9 deletions(-) diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index 9d21eaa0cb56..edfcabb1a607 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -34,7 +34,6 @@ * SUCH DAMAGE. */ -#include #include #include #include @@ -44,10 +43,13 @@ #include #include #include +#include +#include #include #include #include +#include #include #include @@ -59,6 +61,11 @@ static ufs_lbn_t lbn_count(struct ufsmount *, int); static int readindir(struct vnode *, ufs_lbn_t, ufs2_daddr_t, struct buf **); +static int ufs_bmap_use_unmapped = 1; + +SYSCTL_INT(_vfs_ufs, OID_AUTO, bmap_use_unmapped, CTLFLAG_RWTUN, + &ufs_bmap_use_unmapped, 0, "UFS bmap uses unmapped bufs"); + /* * Bmap converts the logical block number of a file to its physical block * number on the disk. The conversion is done by using the logical block @@ -102,12 +109,15 @@ readindir(struct vnode *vp, struct buf *bp; struct mount *mp; struct ufsmount *ump; - int error; + struct inode *ip; + int error, gbflags; mp = vp->v_mount; ump = VFSTOUFS(mp); + ip = VTOI(vp); - bp = getblk(vp, lbn, mp->mnt_stat.f_iosize, 0, 0, 0); + gbflags = !I_IS_UFS1(ip) && ufs_bmap_use_unmapped ? GB_UNMAPPED : 0; + bp = getblk(vp, lbn, mp->mnt_stat.f_iosize, 0, 0, gbflags); if ((bp->b_flags & B_CACHE) == 0) { KASSERT(daddr != 0, ("readindir: indirect block not in cache")); @@ -151,6 +161,24 @@ readindir(struct vnode *vp, * next block and the disk address of the block (if it is assigned). */ +static void * +ufs_bm_sf_get(struct buf *bp, int32_t pgidx, struct sf_buf **sfp) +{ + struct sf_buf *sf; + + sched_pin(); + sf = sf_buf_alloc(bp->b_pages[pgidx], SFB_CPUPRIVATE); + *sfp = sf; + return (sf_buf_kva(sf)); +} + +static void +ufs_bm_sf_put(struct sf_buf *sf) +{ + sf_buf_free(sf); + sched_unpin(); +} + int ufs_bmaparray(struct vnode *vp, ufs2_daddr_t bn, @@ -164,10 +192,16 @@ ufs_bmaparray(struct vnode *vp, struct ufsmount *ump; struct mount *mp; struct indir a[UFS_NIADDR+1], *ap; + struct sf_buf *sf; ufs2_daddr_t daddr; ufs_lbn_t metalbn; int error, num, maxrun = 0; int *nump; + ufs1_daddr_t *daddr1p; + ufs2_daddr_t pgbn, daddrppg, prevdaddr, *daddr2p; + int32_t daddrsz, boff, pgidx, pgoff; + void *pgaddr; + bool isseq; ap = NULL; ip = VTOI(vp); @@ -261,17 +295,71 @@ ufs_bmaparray(struct vnode *vp, if (error != 0) return (error); - if (I_IS_UFS1(ip)) - daddr = ((ufs1_daddr_t *)bp->b_data)[ap->in_off]; - else - daddr = ((ufs2_daddr_t *)bp->b_data)[ap->in_off]; + daddrsz = I_IS_UFS1(ip) ? sizeof(ufs1_daddr_t) : sizeof(ufs2_daddr_t); + if (!buf_mapped(bp)) { + boff = ap->in_off * daddrsz; + pgidx = boff / PAGE_SIZE; + pgoff = (boff & PAGE_MASK) / daddrsz; + pgaddr = ufs_bm_sf_get(bp, pgidx, &sf); + if (I_IS_UFS1(ip)) + daddr = ((ufs1_daddr_t *)pgaddr)[pgoff]; + else + daddr = ((ufs2_daddr_t *)pgaddr)[pgoff]; + ufs_bm_sf_put(sf); + } else { + if (I_IS_UFS1(ip)) + daddr = ((ufs1_daddr_t *)bp->b_data)[ap->in_off]; + else + daddr = ((ufs2_daddr_t *)bp->b_data)[ap->in_off]; + } + if ((error = UFS_CHECK_BLKNO(mp, ip->i_number, daddr, mp->mnt_stat.f_iosize)) != 0) { bqrelse(bp); return (error); } + if (num > 1 || daddr == 0 || runp == NULL) + continue; + + daddrppg = PAGE_SIZE / daddrsz; if (I_IS_UFS1(ip)) { - if (num == 1 && daddr && runp) { + if (!buf_mapped(bp)) { + prevdaddr = daddr; + isseq = true; + for (bn = ap->in_off + 1; + bn < MNINDIR(ump) && *runp < maxrun && isseq; ) { + boff = bn * daddrsz; + pgidx = boff / PAGE_SIZE; + pgoff = (boff & PAGE_MASK) / daddrsz; + KASSERT(pgidx >= 0 && pgidx < bp->b_npages, + ("pgidx %d vs b_npages %d", pgidx, bp->b_npages)); + pgaddr = ufs_bm_sf_get(bp, pgidx, &sf); + daddr1p = (ufs1_daddr_t *)pgaddr; + for (pgbn = pgoff; + pgbn < daddrppg && *runp < maxrun && + (isseq = is_sequential(ump, prevdaddr, daddr1p[pgbn])); + prevdaddr = daddr1p[pgbn], ++pgbn, ++bn, ++*runp); + ufs_bm_sf_put(sf); + } + prevdaddr = daddr; + bn = ap->in_off; + if (runb && bn) { + isseq = true; + for (--bn; bn >= 0 && *runb < maxrun && isseq; ) { + boff = bn * daddrsz; + pgidx = boff / PAGE_SIZE; + pgoff = (boff & PAGE_MASK) / daddrsz; + KASSERT(pgidx >= 0 && pgidx < bp->b_npages, + ("pgidx %d vs b_npages %d", pgidx, bp->b_npages)); + pgaddr = ufs_bm_sf_get(bp, pgidx, &sf); + daddr1p = (ufs1_daddr_t *)pgaddr; + for (pgbn = pgoff; pgbn >= 0 && *runb < maxrun && + (isseq = is_sequential(ump, daddr1p[pgbn], prevdaddr)); + prevdaddr = daddr1p[pgbn], --pgbn, --bn, ++*runb); + ufs_bm_sf_put(sf); + } + } + } else { for (bn = ap->in_off + 1; bn < MNINDIR(ump) && *runp < maxrun && is_sequential(ump, @@ -289,7 +377,44 @@ ufs_bmaparray(struct vnode *vp, } continue; } - if (num == 1 && daddr && runp) { + + if (!buf_mapped(bp)) { + prevdaddr = daddr; + isseq = true; + for (bn = ap->in_off + 1; + bn < MNINDIR(ump) && *runp < maxrun && isseq; ) { + boff = bn * daddrsz; + pgidx = boff / PAGE_SIZE; + pgoff = (boff & PAGE_MASK) / daddrsz; + KASSERT(pgidx >= 0 && pgidx < bp->b_npages, + ("pgidx %d vs b_npages %d", pgidx, bp->b_npages)); + pgaddr = ufs_bm_sf_get(bp, pgidx, &sf); + daddr2p = (ufs2_daddr_t *)pgaddr; + for (pgbn = pgoff; + pgbn < daddrppg && *runp < maxrun && + (isseq = is_sequential(ump, prevdaddr, daddr2p[pgbn])); + prevdaddr = daddr2p[pgbn], ++pgbn, ++bn, ++*runp); + ufs_bm_sf_put(sf); + } + prevdaddr = daddr; + bn = ap->in_off; + if (runb && bn) { + isseq = true; + for (--bn; bn >= 0 && *runb < maxrun && isseq; ) { + boff = bn * daddrsz; + pgidx = boff / PAGE_SIZE; + pgoff = (boff & PAGE_MASK) / daddrsz; + KASSERT(pgidx >= 0 && pgidx < bp->b_npages, + ("pgidx %d vs b_npages %d", pgidx, bp->b_npages)); + pgaddr = ufs_bm_sf_get(bp, pgidx, &sf); + daddr2p = (ufs2_daddr_t *)pgaddr; + for (pgbn = pgoff; pgbn >= 0 && *runb < maxrun && + (isseq = is_sequential(ump, daddr2p[pgbn], prevdaddr)); + prevdaddr = daddr2p[pgbn], --pgbn, --bn, ++*runb); + ufs_bm_sf_put(sf); + } + } + } else { for (bn = ap->in_off + 1; bn < MNINDIR(ump) && *runp < maxrun && is_sequential(ump, From nobody Wed May 13 20: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 4gG4Bh3NpFz6cxH5 for ; Wed, 13 May 2026 20: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 4gG4Bh0pkWz3ZfF for ; Wed, 13 May 2026 20: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=1778702572; 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=s2XzrzwgTQS+4QStN+gwC8L6lNXlNe5dN0SRcNh2OqE=; b=yO+asMf/tX9jtHAzECM0aBb52oZGadXugFIAEAfP6SkVOC5VplTHnHwZcUfDv3qAz4l14g 8WfoGPELtpgfXbIQeK/07toVHJSzzS9Gg/aAu3UjTYeX2yKpifUR8guZ5xsq5bJmxDbx83 Vfqty/WVVwSGUUGsQJ0d6LcgplFVaFNhcyUB18HLBD85zzOiayIOAQqc+yH2Agnk+NtEql kETOEc/WloJ+Kir/lHnhx8hGb7Zyr1phZ+v17Bl0P4XDCTt7+GhHWggXe4nvTqyIasQWqf tPhAoXjXuQYYNclXJDsY3TE3Uhrw3EC6gbQg1WodncZEhjB6jk30PTUSUCabZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778702572; a=rsa-sha256; cv=none; b=OPC2ur5yGSmLTdoea8AX6dwo1RN1JoLm4hbtxKsjMKLbrUniwOZJu4Vi3as5VigevfizCB q8Cu5aid5OHZl1wmZtBCwXV5/XdM6SKJYUi5bVGKddyNA+k61hJtnZwqezQJyqc0gMmYEV dxQVlI2+wLFGAIInFMkil3NuAFTwQcx54vSfrsIThzAVN0mfzxs25V8gqqFopYQqu4/tIu HP8Gwbhds0cE+XiHcTscSeyyPPdMRvTX69PbDFCvVBFHFk8E6Z5s+XRpQ5c7lclhA6Jm1X wtaksAfL7hQr7c+aGHBvHuPxfqzaqBLkhX9EjcXgJM5qukgUao+KlBsjJCru2Q== 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=1778702572; 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=s2XzrzwgTQS+4QStN+gwC8L6lNXlNe5dN0SRcNh2OqE=; b=JIbFlszULnYheK9WP264MrpVfM9DUn++Wv0or98Z0YaA/DJkoHFe9rRm+WGO2HdnoKQy4g SmiGgTBJdXbHpnMBonjuZFjEAw8u1j0f8XdPjMPXSvZdOWQyM2bXGo2ltKPa1MJ3NTsSIq I1aBM1JHMh1iNHJ+3qrTkoa/dPdIuU1eFl3FpoSTlCdQsf+NzPO/EPT7AvkMnH6jha1+Xu ZTbLyX91k+HTRp7b5mWGmdxzcrKVLwHYpMWOhCjmFGEZB896T9R0o2lJ4X7ZMJ80g7vpBM bOWmD/NPtsymSfJVyUKX60YzxRWs7iFMdjerH5a42IfhgILd/HMRb+1g5hLGVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG4Bh0Nrfz14hw for ; Wed, 13 May 2026 20:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33f48 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 20:02:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: 69e9d5d30669 - main - cap_fileargs: fix typo 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: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69e9d5d306699d40148256722d7240dbb5da8fb5 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 20:02:52 +0000 Message-Id: <6a04d8ec.33f48.2f85b074@gitrepo.freebsd.org> The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=69e9d5d306699d40148256722d7240dbb5da8fb5 commit 69e9d5d306699d40148256722d7240dbb5da8fb5 Author: Mariusz Zaborski AuthorDate: 2026-05-13 19:51:44 +0000 Commit: Mariusz Zaborski CommitDate: 2026-05-13 19:59:37 +0000 cap_fileargs: fix typo --- lib/libcasper/services/cap_fileargs/cap_fileargs.3 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libcasper/services/cap_fileargs/cap_fileargs.3 b/lib/libcasper/services/cap_fileargs/cap_fileargs.3 index 6a69fe7e1f4a..601d2aa72717 100644 --- a/lib/libcasper/services/cap_fileargs/cap_fileargs.3 +++ b/lib/libcasper/services/cap_fileargs/cap_fileargs.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 8, 2025 +.Dd May 13, 2026 .Dt CAP_FILEARGS 3 .Os .Sh NAME @@ -208,7 +208,7 @@ The following arguments are required: Specifies access permissions for opened files. .It mode Pq Dv NV_TYPE_NUMBER Required when the -.Dv O_CREATE +.Dv O_CREAT flag is set in .Va flags . Specifies the permissions to use when creating new files. From nobody Wed May 13 20: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 4gG4Bk4X75z6cx83 for ; Wed, 13 May 2026 20:02: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 4gG4Bk28PSz3ZFS for ; Wed, 13 May 2026 20: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=1778702574; 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=xvPSyKQJI3ixMAYFi6MLPD/g/SSMJcQpOzlyFT2K5Nc=; b=M79iE3PVREcGkcoKXTfNze/DYYv3kSD80hSxIjDS7c9mZWRGbo9ZBnYm8/+CLHxqlKaEVT VnrmdoBt99/vYVMScXHyroyXDp8YSPcHQpbGunVdO2vycLOM2FB9Ghg+GooNOtVCdExkHo bOUjvCGwItKa5puiNImNbny/tJDriqyrTID9W6u36NFZQDDi/iJRA21W63UWI7CC8pOCwG DR2oVHAc88TKhl9WQOYnSIYAwNCLuGX/ov0Kh6BdA/sV8aZP52sP7Ch00f4JCJ+m8wS78D +QLQJpaFtiWU/70JHzTVIU7trtLSecUcuN6YHOmnaPilqHzXa1YCxBbK1N4Jtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778702574; a=rsa-sha256; cv=none; b=dvO+srel3C+/8SNgI5lBCSE/o6Zvyv/1+fJeQFLFk5qLr/uA/PCD98R+3FRrBAcmxvvRAM nvMwgsrYuwJNg/PdFGqnJDXWss5wo2gWq/1z51C2WbKAx7fAdTKjUVxmD+2pCm3tpO20Ma CVARGNfKPp5q14NcFcRMEIHVXzNjti156NKXM4us+PR4oaFNlOHm4uWF/3yamiYzO94cxS gmZkSkgnhz987SiN4IEeohm4SQWHtO4ydiJ/6oIBgJ2dhw4IYJSz5GyGNs3MfxWwCn7/ob rGA9fAH4LLQAPH5hmw1mj8/8mFux9TcbJTlwST+sMrROMNajAE0gEwJv88jEHQ== 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=1778702574; 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=xvPSyKQJI3ixMAYFi6MLPD/g/SSMJcQpOzlyFT2K5Nc=; b=wETk4v/D+F8JITmhg+GxcrtsKXkKfWcU0kIGpoISbR8kwDBSdZ6eAL3a1nwBztRIZ9wtgc VQqy11glbYBB0ZnFwgEcCVRZGz9rxsk4/0yduEG+bIhhGkhvidJLg52dYmpkhkx/BTI3kP kVo9Ra2WQb3Is2AQTkLg91NXBq7gQOdeSOd92l1/nDswLuVVoXZu/5zKa0I5E4+X37AQcV Xz48VqJfGdXxhgljXfsshp9QHUqSSwzOCIO+ytmZAH5fd1qEv671JZEKJnBNhywGiSJS8X o6UMkraWMaZHlJd21kQug3s0dQad8GBHLH7YQ6p7l08eH6WAyDXRtpka9qmX3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG4Bk1dgCz14gY for ; Wed, 13 May 2026 20:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3388a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 20:02:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: efc1f50ec499 - main - cap_net: fix typos 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: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efc1f50ec4999e4222e1f1b3d6d2f668f9169afb Auto-Submitted: auto-generated Date: Wed, 13 May 2026 20:02:54 +0000 Message-Id: <6a04d8ee.3388a.32b14fcf@gitrepo.freebsd.org> The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=efc1f50ec4999e4222e1f1b3d6d2f668f9169afb commit efc1f50ec4999e4222e1f1b3d6d2f668f9169afb Author: Mariusz Zaborski AuthorDate: 2026-05-13 19:56:09 +0000 Commit: Mariusz Zaborski CommitDate: 2026-05-13 19:59:38 +0000 cap_net: fix typos --- lib/libcasper/services/cap_net/cap_net.3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libcasper/services/cap_net/cap_net.3 b/lib/libcasper/services/cap_net/cap_net.3 index e322222e866f..ae9a6d820ae3 100644 --- a/lib/libcasper/services/cap_net/cap_net.3 +++ b/lib/libcasper/services/cap_net/cap_net.3 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 6, 2023 +.Dd May 13, 2026 .Dt CAP_NET 3 .Os .Sh NAME @@ -217,7 +217,7 @@ Multiple calls to .Fn cap_net_limit_connect , and .Fn cap_net_limit_bind -is supported, each call is extending preview capabilities. +is supported, each call is extending previous capabilities. .Sh EXAMPLES The following example first opens a capability to casper and then uses this capability to create the @@ -250,7 +250,7 @@ if (capnet == NULL) /* Close Casper capability. */ cap_close(capcas); -/* Limit system.net to reserve IPv4 addresses, to host example.com . */ +/* Limit system.net to resolve IPv4 addresses, to host example.com . */ limit = cap_net_limit_init(capnet, CAPNET_NAME2ADDR | CAPNET_CONNECTDNS); if (limit == NULL) err(1, "Unable to create limits."); From nobody Wed May 13 20: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 4gG4Bj3xgcz6cxMc for ; Wed, 13 May 2026 20: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 4gG4Bj1H9bz3ZFR for ; Wed, 13 May 2026 20: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=1778702573; 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=ZzaO7JiBgGl65PQnnFGb9dWqlnKb02lBPCqa6ybF7ac=; b=oAvzOXPuOKG0KJOSKuBIejEbWbmpMeN5aUucNs8tyE0qnj2Qbl5zSLadP6/qfayUs56PcK 3uu2VA4Q4u4DWDf2C3NilLkpmG0LPE3TXzchI/y8hJKzlBOa8h9qeFNVKUE1F74P32jjRF XX0ge5GWSWu2ajHuT9+vG5rxNEUEwlk5zDlcxWHTR/DsohnkktH8CjbqvWsss145fFrag1 T6ljEnEQ+EcOAnQOehsxOkk7yI1tqnhn07pyZtK70YWd9qpZqAvzTqq7mjpE7JRP2HGmMe xHToOkiD9KFe8vVCoYgRAaVsdEBLIHJUDXSG7QBcTgOymqBr9Hbw0vls/ijfWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778702573; a=rsa-sha256; cv=none; b=Dz8EbIZ94El0l/2enJjiPkdB7I6jJxhZSaJKvl0gz8u1dwJzDxXaRMPpMi0Box7x5hvh0D cjJ5/ZRROyj1cZc1qDHnpQLYsDweHuHsBhAbGIjdk1RjAUx1zng7Wtxcr4iUzu/9yhnO2m Nv28+hGnw9J4NzyHOMx/4fFV6IZjRB9Rm/QdTsS2p7feYvqFQFRCFiecGFO2kKNn5AR01E krhYZ+quh/K11rtSDZHygwzV1EnTGzr0F5lXHH2LPzV5UXshqFAnLwVdmBs4q+US2gzvhU Kt4ZvMXDYq5C6SR5ReEFV70iaU1KGFuGhz8MftRSaz+VoRmhWbiFTN+Rrn4C0A== 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=1778702573; 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=ZzaO7JiBgGl65PQnnFGb9dWqlnKb02lBPCqa6ybF7ac=; b=CgKvo8s9oR0/qiWCOW+0yZ8gW23qu1sqFftDNQTlJ5UL8VGc1yxCiXIvuWf9wdvXqEtOoo EqLIxRCAsa6fIXfdJTbVCCIxVfUyobKErI6HAYAclPosZAbVTuQGI/76oJR+2jgbrCSlpW NnY0GmGPJ9H+ndgC7y+Exc5Z6nlxJnRkCZCgddKCLS/8AOjBdHq0GXb5pSY+1eSw9IRVRE nesRv8jT+D6nVXXII6NkKKUuszub7VOp43br8nae+7o9KAvOFl/CiXh4quqHByQrgFG/fO 9tfOg970V12PSQlw/uK9bFNWHvh7JGwX5tZ0NmdjhqFhW/lJjDlV1DC6ZYOqKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG4Bj0tkXz14xR for ; Wed, 13 May 2026 20:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3333c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 20:02:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: 4569c022db0b - main - cap_dns: fix typos 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: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4569c022db0bd2242eed883c33207980ddb00019 Auto-Submitted: auto-generated Date: Wed, 13 May 2026 20:02:53 +0000 Message-Id: <6a04d8ed.3333c.3ffc1e99@gitrepo.freebsd.org> The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=4569c022db0bd2242eed883c33207980ddb00019 commit 4569c022db0bd2242eed883c33207980ddb00019 Author: Mariusz Zaborski AuthorDate: 2026-05-13 19:55:29 +0000 Commit: Mariusz Zaborski CommitDate: 2026-05-13 19:59:37 +0000 cap_dns: fix typos --- lib/libcasper/services/cap_dns/cap_dns.3 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libcasper/services/cap_dns/cap_dns.3 b/lib/libcasper/services/cap_dns/cap_dns.3 index d6bbb6bd1263..23e09d1f8c13 100644 --- a/lib/libcasper/services/cap_dns/cap_dns.3 +++ b/lib/libcasper/services/cap_dns/cap_dns.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 15, 2020 +.Dd May 13, 2026 .Dt CAP_DNS 3 .Os .Sh NAME @@ -74,7 +74,7 @@ functions. The functions .Fn cap_gethostbyname , .Fn cap_gethostbyname2 , -.Fn cep_gethostbyaddr +.Fn cap_gethostbyaddr and .Fn cap_getnameinfo are respectively equivalent to @@ -100,7 +100,7 @@ See the .Sx LIMITS section for more details. The -.Fa ntpyes +.Fa ntypes variable contains the number of .Fa types provided. @@ -190,7 +190,7 @@ if (capdns == NULL) /* Close Casper capability, we don't need it anymore. */ cap_close(capcas); -/* Limit system.dns to reserve IPv4 addresses */ +/* Limit system.dns to resolve IPv4 addresses */ familylimit = AF_INET; if (cap_dns_family_limit(capdns, &familylimit, 1) < 0) err(1, "Unable to limit access to the system.dns service"); From nobody Wed May 13 20: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 4gG4Bl5LK9z6cwjb for ; Wed, 13 May 2026 20: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 4gG4Bl2xV3z3ZhX for ; Wed, 13 May 2026 20: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=1778702575; 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=Tip19L8x91G9TBgWiXPsKAq4lhvSVzwvhfoHal3zIPI=; b=V+jtzb7ZDWv/C5WXDmLo15UtrlowXIMQbRIeAYfEg0oANoqNsswmvBBxfBG2Gks2HLbVrz qvOhs3vRR000uBdxnq57OVmF1buAVpJA7Sa/930SpFn1/htsNUQ8iDF8bjJtYcSBUVn/sC Y1FwOzhzICZGwbhvVD5uEVulRPSxZI3JoS4qy1deZkSwzMI/jZYD864Z8DSMHLa0nrONpX 0KjWE9duXwkTFXdXDVPLE9tpu0bO7h/y2Wbq6sgA1uM8gWWyjSCfQqVZCf7dZdzkzLrq99 ZIze0U5YceJVvg9vZnvKPXEklchem1cgxIP8mEPh8kvzy+gobSwXn3HOmjoAfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778702575; a=rsa-sha256; cv=none; b=F0Om7lv8Jhl4Y148EWFy9h4rr8vRmhko1w5fck0Hcl5sUNK3zOP7DAxYslCIll3iqx6HZk bjkq5rWUJAQwMyrkd0/7cTuV1rngDvmvyY6pwkffI8YJnAIxpc7XWpIS8RT7FXR4KTmzzc nZUpd2UlsDrX99KCS4INTwuRQPV3slFSo5eYZq8c2/bAybOh86m5P1zmh4f8xAqg0pX5pf x9EvsKAQIdI7Y8N4BL5hnxElOUULNoNYjBWmftplIzrTss8Cg5C2VQ5y8tww4OLevI2y4S 1f09Mx1NWUyaLTt7zW4T6jkj+nj6ukTocM6UV1K3wATaSqoW2FfTfWII9XXmmw== 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=1778702575; 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=Tip19L8x91G9TBgWiXPsKAq4lhvSVzwvhfoHal3zIPI=; b=NPhvL9JHpHuEyCTVFVZDKf8Mi2Jqcke8Qk69jbUDb5XDLyaBM+o9qU+p6Z61q7iQTo9XjA slXcH8bWJLGIWspZmKvVbjFkLReOyPrbAyyCXwkQf1rKdpfNLFSxDIz8JaNm1gnjMSEr99 VBakMe8hb9SOLIQZKNzb6iAzFybP8wXA7VvfY74WJfbGRQ7lSSZhe00E3u0BuozOLeQvUf LtVK8WOoT0pItlxx2rsE25amiK+R7QEnyf0HSpjAK/7Cw5TEjk/8IGA6Sv7EAg0jAyz+XJ KAHn89b4bgNZ7yrAbGBpZtox+26GXPvKPZnr9emPWLtX5Dt1mBuXY9HAimIwdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG4Bl2Mqwz14gZ for ; Wed, 13 May 2026 20:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32bb7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 20:02:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: 45fa572b94e7 - main - cap_sysctl: fix typo 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: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45fa572b94e7c61de5797ea877af3dade91af23f Auto-Submitted: auto-generated Date: Wed, 13 May 2026 20:02:55 +0000 Message-Id: <6a04d8ef.32bb7.3313a45f@gitrepo.freebsd.org> The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=45fa572b94e7c61de5797ea877af3dade91af23f commit 45fa572b94e7c61de5797ea877af3dade91af23f Author: Mariusz Zaborski AuthorDate: 2026-05-13 19:57:20 +0000 Commit: Mariusz Zaborski CommitDate: 2026-05-13 19:59:38 +0000 cap_sysctl: fix typo --- lib/libcasper/services/cap_sysctl/cap_sysctl.3 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libcasper/services/cap_sysctl/cap_sysctl.3 b/lib/libcasper/services/cap_sysctl/cap_sysctl.3 index 2c7a491a1f8b..6acbe38d874e 100644 --- a/lib/libcasper/services/cap_sysctl/cap_sysctl.3 +++ b/lib/libcasper/services/cap_sysctl/cap_sysctl.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 6, 2023 +.Dd May 13, 2026 .Dt CAP_SYSCTL 3 .Os .Sh NAME @@ -93,7 +93,7 @@ Rights are encoded using the following flags: CAP_SYSCTL_READ allow reads of the sysctl variable CAP_SYSCTL_WRITE allow writes of the sysctl variable CAP_SYSCTL_RDWR allow reads and writes of the sysctl variable -CAP_RECURSIVE permit access to any child of the sysctl variable +CAP_SYSCTL_RECURSIVE permit access to any child of the sysctl variable .Ed .Pp The From nobody Wed May 13 20:40: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 4gG52K2zG5z6d0lp for ; Wed, 13 May 2026 20:40: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 4gG52K2PpHz3nTL for ; Wed, 13 May 2026 20:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778704841; 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=l3knK7iRgcuDKCwYbJPYnFzLtisUjU8I1rJcGyaFS0s=; b=ARUhLVkkoWzotNmhxcqPd6Z9uIAgpoB7zWnYC82amfvcZEd97shmPJOoimCqmcb+QbAqlQ 5iqfAwNnBbDdx/jE3l6Byb9iHTkmBmiR3SIXtOsDbH4EeCrZFX5CPp2oN6GRRNIOJ07h92 lKLGFmscDsIwfydUoO9Y5tSJre1do4iP30Gz24MSG3cC+xQLO2bpakTMQyLvGqnyvUA/41 i6lKMZhKTAqc8WUZs15d45s/QJC4m3phDe5f7N3FrkNQYOJp6MSOj8uDwozYtoKijGUQB8 ujq45p1WpRshwe/qCWYMF5UCY30fXqWNeMXeHFJY+7jsiuqzASbvB4EWhWLYnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778704841; a=rsa-sha256; cv=none; b=CyuiJhUjNFaHck83UD7UqF8L+y6i8m+Bmp+W4C33qnO000K6swFdVAQ+Z1uir/t5TAYL01 DQF91A1erszoPejnVJe4b5qxbSnPBC+SRP9/QmRRH80dDnFGcF0bKCMKIEH2+V9/DGewcE VLdgc8rvJwKSrZNfJ9VSrgoYSFqY+pttU5jIMA5tlcrLVdRen+oNMG2hSxvUmSl/+umiAI 96DOs1EkhH73y0/9SeDkR/lcsLIE9dXeVjjT5c69v198Kj+IKlNOucLfX28rbpLoZYW64e vP0zBnMtQ9afZaYQUYIcEYj3oc5kvuIBtzgviRY/kqmlKSE1m76cTTH+NWA2YQ== 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=1778704841; 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=l3knK7iRgcuDKCwYbJPYnFzLtisUjU8I1rJcGyaFS0s=; b=lud7IV5bXorhlujkUJ0+OAmySXl4LMX5A8TGhR+hYxhxsu9uw83YPJRy8WvnQAcgxjM+Dm Q1E9n7ElJyAegyCMY5hUAy4bsYjjlN+ODhFuHKSYXllaeKuycL9uVsccVYDhO6GzQdH2Iq lmGCKU5oYuTAsLHsS25M0NODluVkpOobAWby4O0ubjjIcv+aY4ux+kKgbaHmSDVh/Rgftc scW/n2y6Le1BciB7d6jNAxOI9YCRT2xUOUSrwbcqYHhjln6m6dn30sAcQDVUAZYPQDS4/J KS1/glfJcBsNsEfQmH4+/LPiiG2+kgAqgk2DRXENUmCn7YUaK+5hcSagHdhntw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gG52K1jm4z15cW for ; Wed, 13 May 2026 20:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38cc7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 20:40:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Alex S From: Ed Maste Subject: git: 96f262dcacdb - main - tests/sys/arch/amd64: Add a basic ptrace syscall tampering test 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: 96f262dcacdbfb56e94c60985b07f9f8ee2d046b Auto-Submitted: auto-generated Date: Wed, 13 May 2026 20:40:36 +0000 Message-Id: <6a04e1c4.38cc7.3dade40b@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=96f262dcacdbfb56e94c60985b07f9f8ee2d046b commit 96f262dcacdbfb56e94c60985b07f9f8ee2d046b Author: Alex S AuthorDate: 2026-05-11 23:52:20 +0000 Commit: Ed Maste CommitDate: 2026-05-13 20:40:16 +0000 tests/sys/arch/amd64: Add a basic ptrace syscall tampering test Signed-off-by: Alex S Reviewed-by: kib Pull-request: https://github.com/freebsd/freebsd-src/pull/2190 --- tests/sys/arch/amd64/Makefile | 1 + tests/sys/arch/amd64/ptrace-sce-tamper.c | 89 ++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/tests/sys/arch/amd64/Makefile b/tests/sys/arch/amd64/Makefile index 34f3c90c4082..d4cf00237f9b 100644 --- a/tests/sys/arch/amd64/Makefile +++ b/tests/sys/arch/amd64/Makefile @@ -1,6 +1,7 @@ TESTSDIR= ${TESTSBASE}/sys/arch/amd64 PLAIN_TESTS_C+= int0x80 +PLAIN_TESTS_C+= ptrace-sce-tamper BINDIR= ${TESTSDIR} diff --git a/tests/sys/arch/amd64/ptrace-sce-tamper.c b/tests/sys/arch/amd64/ptrace-sce-tamper.c new file mode 100644 index 000000000000..0645f62a7e9b --- /dev/null +++ b/tests/sys/arch/amd64/ptrace-sce-tamper.c @@ -0,0 +1,89 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 Alex S + */ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#ifndef __amd64__ +#error "amd64 only" +#endif + +/* + * This test substitutes exit(42) instead of getpid() using ptrace. + */ + +static const int EXPECTED_EXIT_CODE = 42; + +static void +tamper(pid_t pid) +{ + struct ptrace_lwpinfo info; + struct reg regs; + + if (ptrace(PT_LWPINFO, pid, (caddr_t)&info, sizeof(info)) == -1) + err(1, "ptrace(PT_LWPINFO)"); + + if ((info.pl_flags & PL_FLAG_SCE) != 0 && + info.pl_syscall_code == SYS_getpid) { + if (ptrace(PT_GETREGS, pid, (caddr_t)®s, sizeof(regs)) == -1) + err(1, "ptrace(PT_GETREGS)"); + + regs.r_rax = SYS_exit; + regs.r_rdi = EXPECTED_EXIT_CODE; + + if (ptrace(PT_SETREGS, pid, (caddr_t)®s, sizeof(regs)) == -1) + err(1, "ptrace(PT_SETREGS)"); + } +} + +int +main(void) +{ + pid_t pid; + int status; + + pid = fork(); + if (pid == -1) + err(1, "fork"); + + if (pid == 0) { + (void)ptrace(PT_TRACE_ME, 0, 0, 0); + (void)getpid(); + exit(0); + } else { + if (ptrace(PT_ATTACH, pid, 0, 0) == -1) + err(1, "ptrace(PT_ATTACH)"); + + for (;;) { + if (wait(&status) == -1) + err(1, "wait"); + + if (WIFEXITED(status)) { + if (WEXITSTATUS(status) == EXPECTED_EXIT_CODE) { + printf("exit code changed\n"); + exit(0); + } else { + printf("unable to change exit code\n"); + exit(1); + } + } + + assert(WIFSTOPPED(status)); + tamper(pid); + + if (ptrace(PT_TO_SCE, pid, (caddr_t)1, 0) == -1) + err(1, "ptrace(PT_TO_SCE)"); + } + } +} From nobody Thu May 14 09:48: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 4gGQVw1dPNz6cpWY for ; Thu, 14 May 2026 09:48: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 4gGQVw0sHHz41nb for ; Thu, 14 May 2026 09:48:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778752088; 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=moA8VqDseh+Iw7YXRH9OD8LVe6EeOmUiB5TVj72NBow=; b=ATzuCmI8zJ+kZvrQ251I5lEtPGvRQtMDHXpmIJk0p6lmfDFRKitQbJvg5wsOW/qmuiQkmm pHWakupAygnkgRnYxvDcbnd5Fo5whgw59HQDQ8vGtctZ3ezFTQY3/83/WKmbWFEibyaUpt NimHm0wR87CLJhz0sTCgzQB48s679lDO9dY2WofRlrB1f0FgfPjE8nBw+gm1FX2ZdEkIel MHDGvnwVD76+V44VyRyB3S92muf8+bmYpvCkp6b9kw0TJ9GZu+eC0VWuclfQ3KZexxrred whIL54UqG2GF6NIzCplRyiLD5cMkAHs0gZk95xAPwzZ8up/L2ZvEshSvxgkCCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778752088; a=rsa-sha256; cv=none; b=GQj4YcZ6Cl8hino2y15Fjp3SplTwzhfXibuZYkP3FbGF+8+h59wDpzAPDUNNhGSAeFXXkk 5jWrzdA+QAjYYy2JBh+prHOAvnOKnvCkWLDI1QPogSaSqJsvYp12+HM5qcgMgHOQT/uXju 0Mg2pb+kkscCf3ou/0YSDJD/IS5ZWXsnZ3G5rEMjPFHL9wMR+CI1Lpda08GKoYiwr8EHCt BBTiM2NgGl0ciMRaz5IsoH3tr5fn0mTAs9KK97mCfuCEQrnnA5iOIaNmEbUiiNBs3z8Go4 Y+BFpTkjlNolcjx6fWvI4S06IUUmYoVkPsihjzZZtxPz5yy27jLbAJnPcNzItg== 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=1778752088; 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=moA8VqDseh+Iw7YXRH9OD8LVe6EeOmUiB5TVj72NBow=; b=Q9vT5LlRVnSqFeshS+RMoeHNeVFaVOcxvwqGjMhBEi+c599r7lul/UuHSP1rm0QrD71s6b LtYG51wu7Iuh/lhmfTuISG4W2t852ldcooEHxtbnH6fgsKZ+h6nwTwr8quOKfO23h9Hdtw luV06AZutB8BGaCHAxDDIiu8jREpHRrpkzgcnDP3BATcvQ7ma8CD+D3tCV0tfTwr1KcO6f /E+Vpr53Eo9oUW+jEKE3ddITl/47htBXMIxMoDxggkYTytz+ySj6OELPzJlrs6ZX5OBXtQ 7WWNFRW97DPMXVChCrj9X0FlZtA26teVcc48g8RjI6ZrzCETc7aIgQKzbGbGGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGQVw0KdjzX74 for ; Thu, 14 May 2026 09:48:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a272 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 09:48:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: b8606c3406ea - main - arm64: Fix the includes for rsi.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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8606c3406eab69637be616260c977c9a8f14ff3 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 09:48:08 +0000 Message-Id: <6a059a58.3a272.24fcb57d@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b8606c3406eab69637be616260c977c9a8f14ff3 commit b8606c3406eab69637be616260c977c9a8f14ff3 Author: Andrew Turner AuthorDate: 2026-05-14 08:31:06 +0000 Commit: Andrew Turner CommitDate: 2026-05-14 09:25:14 +0000 arm64: Fix the includes for rsi.c This depended on header pollution only present when FDT is defined. As FDT isn't check for in this file we can remove opt_platform.h and include the correct set of vm header files. Reported by: ivy Fixes: 76a2904c352b ("arm64: Add RSI detection for CCA") Sponsored by: Arm Ltd --- sys/arm64/arm64/rsi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/rsi.c b/sys/arm64/arm64/rsi.c index 85c7896e13ce..f5af8c977529 100644 --- a/sys/arm64/arm64/rsi.c +++ b/sys/arm64/arm64/rsi.c @@ -25,14 +25,13 @@ * SUCH DAMAGE. */ -#include "opt_platform.h" - #include #include #include #include -#include +#include +#include #include #include From nobody Thu May 14 10:35: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 4gGRYM5WXdz6ctCv for ; Thu, 14 May 2026 10:35: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 4gGRYM14BGz46M7 for ; Thu, 14 May 2026 10:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778754919; 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=2oTRSHvhTv/SDc9wE6CEnVdQH/iG7yCDRBWes45jG40=; b=TeywFCD2d646/qPLLlXzUR3YgismIbXon40CltfH2WoooKn9df68Pu1FnThPTXUUIA/JuO z2X6SysTcAouW3OCK4I+D5jcgdKfRvIqdJgL3bpoxaYL61D5L4LwXrQfcA6+PfMZnqkhLP 0zk4aOHjWprhJQ18Vdmf7uCk5VKU5LOS9gljh5T4mqyu1GWNd/P1bQUu3dRUU+yN493zgo 0dgBFAAH3IdZwoz8+09b3z0gIGp9YTaz/oDFSahqPjXRlH2Mxe29bcSvQILMMwkDBPewQh LGsm9BHKU4zmsim+9K5s322FhpqXjvtzO1qb2Ehg2OhTv3SEXKXMCXlaNUVMbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778754919; a=rsa-sha256; cv=none; b=MupXNNRwvLL3oBpxtki1BU8TNoYq4QrNaNJ26UBQBoMjqPU+d22Pch0oDGAqe8b40AoMkr /ULkzJq/KFET4rQ5AH7yidBWAagMc0l73T8JWaxjSiEqivPUX3DcdhRX/hrWt8KZWW/alI xjS11qFNt63H+xgRfzgHIOcDjwZWpSMRgY+XlPed90YtJSyShpgM6YvAN77qBJiRW9J/DR JInBoF8XAL+pzRcUyekJTPbWwxF6JrHaYprxhPvR9o88wtIKXgvcDGzdXW91W5Pjj+0AiX UmYjWoBL9Bdiz0AhUwyC/Jrlr7hizzviPTPmctNIPyNax4/XnhgbjCxO+NS0xg== 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=1778754919; 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=2oTRSHvhTv/SDc9wE6CEnVdQH/iG7yCDRBWes45jG40=; b=EPdY1UXUlVikMb/6i5KZQwhqI51tSDkvfPCd1N5gDRKE5Vfe6keJJiDyzIzYx/MUGvd5w5 AJl/d85ay/BfDSGashsxp5lAYhOV3EbciHlo97THk0PqjSmUM1eE2bAz1/ghSlGXgHd8WU xGRGGVYddS504icvmnrB1qDHZORt9/2rfsL52qW8+YrAOUdup9A/HGrkPsZvVH2WZ0VF6J U8Vkb0k0nrQ5LMGv3I2ATvk96XMxFeGTvS5x0PW0QXcdT2JNtOCSM1h+l3LzGUAPugpTM0 fd84U0BY+3/l1E4t5hpIu+E/tT19Z55+SjTknrm3xqz21BRyy7ZlpOqmdWdr0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGRYM0N3zzZmZ for ; Thu, 14 May 2026 10:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40780 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 10:35:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: aa92784fcb8a - main - libc/timespec_get*.3: expose STANDARDS section 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: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa92784fcb8a375231058d67f7ccaeaa3e42ed33 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 10:35:19 +0000 Message-Id: <6a05a567.40780.37a0e322@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=aa92784fcb8a375231058d67f7ccaeaa3e42ed33 commit aa92784fcb8a375231058d67f7ccaeaa3e42ed33 Author: Robert Clausecker AuthorDate: 2026-05-14 10:32:11 +0000 Commit: Robert Clausecker CommitDate: 2026-05-14 10:34:47 +0000 libc/timespec_get*.3: expose STANDARDS section We now have .St -isoC-2023, so the STANDARDS section can go live. Fixes: 9b5d724cad10087e34165199e55f15f2df744ed5 MFC after: 1 week --- lib/libc/gen/timespec_get.3 | 10 +++++----- lib/libc/gen/timespec_getres.3 | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/libc/gen/timespec_get.3 b/lib/libc/gen/timespec_get.3 index 7edf4fe17c30..f6cb578db55e 100644 --- a/lib/libc/gen/timespec_get.3 +++ b/lib/libc/gen/timespec_get.3 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 21, 2023 +.Dd May 14, 2026 .Dt TIMESPEC_GET 3 .Os .Sh NAME @@ -85,10 +85,10 @@ of .Dv TIME_UTC conforms to .St -isoC-2011 . -.\" The -.\" .Dv TIME_MONOTONIC -.\" base conforms to -.\" -isoC-2023 . +The +.Dv TIME_MONOTONIC +base conforms to +.St -isoC-2023 . .Sh HISTORY This interface first appeared in .Fx 12 . diff --git a/lib/libc/gen/timespec_getres.3 b/lib/libc/gen/timespec_getres.3 index e00af6758f1a..1b65cad4a056 100644 --- a/lib/libc/gen/timespec_getres.3 +++ b/lib/libc/gen/timespec_getres.3 @@ -3,7 +3,7 @@ .\" .\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd August 21, 2023 +.Dd May 14, 2026 .Dt TIMESPEC_GETRES 3 .Os .Sh NAME @@ -36,11 +36,11 @@ if successful and zero otherwise. .Sh SEE ALSO .Xr clock_getres 2 , .Xr timespec_get 3 -.\" .Sh STANDARDS -.\" The -.\" .Nm -.\" function conforms to -.\" .St -isoC-2023 . +.Sh STANDARDS +The +.Nm +function conforms to +.St -isoC-2023 . .Sh HISTORY This interface first appeared in .Fx 14 . From nobody Thu May 14 10:35: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 4gGRYL2g9nz6ctCt for ; Thu, 14 May 2026 10:35: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 4gGRYL0667z46Yq for ; Thu, 14 May 2026 10:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778754918; 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=OX6lCt6NCt5hSuPqt/8I1KbqWOUirH/dgZGzC9SY/Qg=; b=IRWCPNJEWB9IBFd+Lz9gRxQZRDWPvn7XdSa4b3GD8TjOrszlxRVwQFo7i6gz8Ay2L5b+Pi TZT8/cZgbDENVNnnDYqQWjzxRmTshniWugyrsuQRGXlhTNFQuqhPy0NHdkqdF36p+B5FbP 8ePy6EKjnUJRUJcwR4z8MZYVvluVId0+IPumzsKJaslHUbVDDPDkTx4u7PivI0Pjo4uOqy DtBano3/Z2TLxsbs29z6mf1R2y2eHuqcL58ejoX6RpKMboCihVN24F70Vt5giQDo4dbBmS xYrpBIKRcsaA2eNrSJsYs3iYLdNXuti93F64AESadn8zN0uS5n5/xJ1yfc8izA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778754918; a=rsa-sha256; cv=none; b=J25RwMqjaQIKw37oUzN5DrziQqwYY33ZIX+NMTnVf3PkWQEkIxrS5U+7GrLRLgnZz0nwIH Vxz0cmKCEANHaWffbhM8ScigCBnnm8+AdTJp2WAjAoEOawsjCdT/5Wi5zN70w7XUmpdx/R 3UKhh44rKsPfnQQqIeOjOgWguE84dh0r6jOXxZe1exDuPghR/cNWejJYjabldS/ivilOP0 kmDcikCsZMeRqB+ZI0gq6mZ94p84oMk22e5/3cDHKR/IJVUuW6g54r3lcGFVgAqz5MnbLt 7haBN3ShAawd/rrRIBlzB45bMvohkkWKvilLncUSV8vPrynnEN0qg8GbHjnB1g== 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=1778754918; 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=OX6lCt6NCt5hSuPqt/8I1KbqWOUirH/dgZGzC9SY/Qg=; b=r/KM4MPtqn4ckX+KHeKglPh2Y8eGwxfUlSx45m7MUaRj/wDgPpx+1xID7jM3Tg1rPxTcy+ Xo1kV+/rd4BqDcYLSnQipy7aZ9zfXNU4E7xKBwuBcOAHxKS9e5Gc+OcUeK0DPGIqbIBmjg WV0RTqT5PMx/imzUOtzPIGpLzB0MQJMhMvvdcgKzSdqfkmQibBZ6P6tY/3GYMLtLrlOQlO gI29KsVM4H2et4ZXdzhYCdjK8ahDcYYyqODcsC6nert7KxVrFda/RWr7saYKTWzSpUm32b 0VAOG8jueZuhg0tN/7SgxgSJrvNMcmtN4dEJl6vXzBs/N8r1jM4SRZ6TlwGtFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGRYK6qZ0zZ3D for ; Thu, 14 May 2026 10:35:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fb72 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 10:35:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 68251761c77b - main - libc/ctime.3: timegm() is in C23. 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: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68251761c77b2f5ff927cf19bba7d4efa88799de Auto-Submitted: auto-generated Date: Thu, 14 May 2026 10:35:17 +0000 Message-Id: <6a05a565.3fb72.25821ac7@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=68251761c77b2f5ff927cf19bba7d4efa88799de commit 68251761c77b2f5ff927cf19bba7d4efa88799de Author: Robert Clausecker AuthorDate: 2026-05-14 10:24:30 +0000 Commit: Robert Clausecker CommitDate: 2026-05-14 10:34:40 +0000 libc/ctime.3: timegm() is in C23. See also: D53951, https://wiki.freebsd.org/C23 MFC after: 1 week --- lib/libc/stdtime/ctime.3 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libc/stdtime/ctime.3 b/lib/libc/stdtime/ctime.3 index 6384e8bd959b..e51cb5d52f94 100644 --- a/lib/libc/stdtime/ctime.3 +++ b/lib/libc/stdtime/ctime.3 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 23, 2025 +.Dd May 14, 2026 .Dt CTIME 3 .Os .Sh NAME @@ -354,8 +354,9 @@ table). .Pp The .Fn timegm -function is not specified by any standard; its function cannot be -completely emulated using the standard functions described above. +function is expected to conform to +.St -isoC-2023 +with the same constraint. .Sh HISTORY This manual page is derived from the time package contributed to Berkeley by From nobody Thu May 14 13:59: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 4gGX5J58qwz6dBTb for ; Thu, 14 May 2026 13:59:48 +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 4gGX5J44gTz3SjW for ; Thu, 14 May 2026 13:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778767188; 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=lTNQHwK2P/Hqv4JRYRG+tCuTe9qD3LycfhKTN3DfTu0=; b=U8B5XahrggeqPSc4QH1vcvxTyHQTfBptLQS2PirV0U/fVv1quA+9Zb/2HB4DvhJa0EBqSS kFsWJuFAesRZ9OhA442/X6mmkv6MVklKbqLgcjDsuy9AgryYcPB5SGLXNsvmdEjHzzofp8 OxpQPhPRBWqWc5EW/DLdqWP3i1m75d6lIdo692LKEsj2f4t/phBftLZ9nyqAOCaN8ioM6r 839L1CPPnppXjVOrnrdsNTgGlubmWEweJP2ZaBQL86NqGBJbLAxcMcz7E4MHMLerTFlyoq KXh58gw2KwLMqOipXp55UYt2/YeUf7c20hYBNTcFRPc7CkMqnBDRRxt0JgGJ1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778767188; a=rsa-sha256; cv=none; b=OSlTD7OpYqKMARMYF5fYLPr3+JdMX2795udr9IVtYYdcKJm1ZnMTioxV2upiclBhDHWW2w 3bmUuNgvM/c0hy4FdSHfXVlOmTlNb7VyWxIbMYcPcVy3gA59tfl2AIj9f2YP4Mk8P+SH6u uFczBW/rzs5ylaENbCBJ+gH8Sh8cds4xXjY7X/O12s7z2h0dSM8yytTVqhYhosEolLySoi 4Vtra/kiY/TfntfjTicrdpoZi6F6ZGkyCGNRT78ygBAnZYopPQK7E3yXywrJOCQvlYYsQY yJ63+3xyI8Jaa9lvEDEszPuKzZ91gdg2K3DcQ6e8QUVeFWXFHbeaAcbaS+PCxg== 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=1778767188; 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=lTNQHwK2P/Hqv4JRYRG+tCuTe9qD3LycfhKTN3DfTu0=; b=cVIga1MzKwzxU+ffiQR3pmWrh6W9xq5v+4sQ4DFt4Q6GhqMFZJuXwylSRWVL0E5b3SPWu1 oYNsRxPJD3Z2qnYE8ZlSxwE0asRMCIQ8VrosO6nCQpRS+rZYJFpSJySClG9jmays7vM9rT 7gMau2Cy5wD2e5WewiEuRw7EjdmPfVMo/NIbdZUhg2pLVRNXu9se4EOzPFk+dLrCCaC/Pg S/AxrVW8OKHba+JjQkaP10Qf2nW7LDi4gaeT8JA6jxXe4aTF5gd6CkUSqi00cSucjZ9g0v IzlWOcZ0CuWdcMEmtYnWeO7ecpROC9bFVaSXGv4MgMFZSxuK7wgxNDK62alw4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGX5J3Yf7zgVN for ; Thu, 14 May 2026 13:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 221f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 13:59:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 4cdcacb9b296 - main - usbdevs: Add TP-Link UB500 (RTL8761BUV) USB ID 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: 4cdcacb9b2969b681b9547da61535b09e9e67478 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 13:59:48 +0000 Message-Id: <6a05d554.221f3.45cb92ac@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4cdcacb9b2969b681b9547da61535b09e9e67478 commit 4cdcacb9b2969b681b9547da61535b09e9e67478 Author: Ed Maste AuthorDate: 2026-05-14 13:32:45 +0000 Commit: Ed Maste CommitDate: 2026-05-14 13:50:46 +0000 usbdevs: Add TP-Link UB500 (RTL8761BUV) USB ID This device is not yet supported. Unfortunately some recently purchased UB400 dongles also contain this Realtek IC. Sponsored by: The FreeBSD Foundation --- sys/dev/usb/usbdevs | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index ff4a6fd82f07..a6a240d62186 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4862,6 +4862,7 @@ product TPLINK T2UV3 0x011f Archer T2U ver 3 product TPLINK T2UPLUS 0x0120 Archer T2U Plus product TPLINK RTL8153 0x0601 RTL8153 USB 10/100/1000 LAN product TPLINK RTL8153_2 0x0602 RTL8153 USB 10/100/1000 LAN +product TPLINK UB500 0x0604 UB500 RTL8761BUV Bluetooth /* Trek Technology products */ product TREK THUMBDRIVE 0x1111 ThumbDrive From nobody Thu May 14 14:25:31 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 4gGXg010Xzz6dDVP for ; Thu, 14 May 2026 14:25: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 4gGXg00NDKz3WDt for ; Thu, 14 May 2026 14:25:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778768732; 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=sx9vSnI7IaE2lZg6S9flXg59MaYcLCqsNDeFlWmjyos=; b=Mvw/DKVLKdaZEr0uYxrNSUzPkDHeteSLyAdZ8ddSWW36AwNR2ppT0v26HvBLrvJ1Vo28gY xEX3d275nIi+kUDL+l9ab7xB3HSh7RuBb1QgauCHFstbUEKhlfoCkaZPbl7RogMoY16rXH FVwqCxDjQvriyajrL5nSUPTFgijipjtpiQd2QJi/qk8JCT4u2Tn7GBoYHNh2896EuhCJdM fVFE1JALRFo2yMCs1qMDZ72Ky70ykmtC3AUyoNUlUJgeFqFVPj18lG4b5S08D3nO6ZcfVk jaBGVSMSflP+lQo6wL6pHp3rl56ExeqOAdvEj3WU9tlS5gQ8G12ZBFgjmCt33A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778768732; a=rsa-sha256; cv=none; b=L+CXfmrwHbmE5H2nkqoQixdC+D9v3BfNWV0St0B9ZFZ2HTjYHgwUJmjyP6RnIiY6c7qOZ+ E1+mh5yRoO0OkcDJpdEiNJi2APe+vOI7OEozwm+r/oMK/yWR1JK+9G4EC/z6bVxW4tkR8g CFuv4weTdFjLEoD1lm6+FJkcO50VbVUwmj9nmlJU2WNq6wFSFwhyBsasom3Y0NoYXlUwPk wGo2816i4uearlQqqDS7TmFYxNLkQLV/xv8jCj7v7EQQgWKhJ5MkA5Uq/o6hkX6WUyhNTZ jcRQYDECisfxOtoC0nSWZQjKnM6JIgWBYPPMvqsTJ+EBCJsK0FDaIGvSbcEbJQ== 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=1778768732; 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=sx9vSnI7IaE2lZg6S9flXg59MaYcLCqsNDeFlWmjyos=; b=PhCq7fLygzFzTb3Ry/w2JFNp7KzYy0ucIccYpEQXwD/1t3oYSNiqya/fuEK8YPseyWFPel VCs8j3hshtyb3/3qOqgwdxA//hVH3AU2nFgtR8J/2A0ttbA2LoqxiU/kHKSxGcbsGaA8tm /eGl9CBbhmTLDqP0gpyp3Llvnw/3t+xiXzzifDloGfCK/rhetg5Zw2mYiFhj9gWe2efZF3 bPLFJKAnLjnY3c4yd6izGyzNfQo5VrUmrr8kEO1GafXjue8YbGUXTPz/cjvAjYXTxxm5LY LAmdjSNAGia33G7Upy2ur14YlBSoFhLBYaFq+AWJQdgbzx/FeCDbDFslavMBtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGXfz72jBzh5H for ; Thu, 14 May 2026 14:25:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30187 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 14:25:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 988c03980452 - main - linux/io: handle memtype_wc mapping for !DMAP range 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 988c03980452a56fb0fbb15e18b0a644602d0ab3 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 14:25:31 +0000 Message-Id: <6a05db5b.30187.4ea0a4f2@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=988c03980452a56fb0fbb15e18b0a644602d0ab3 commit 988c03980452a56fb0fbb15e18b0a644602d0ab3 Author: Mitchell Horne AuthorDate: 2026-05-14 14:20:22 +0000 Commit: Mitchell Horne CommitDate: 2026-05-14 14:25:09 +0000 linux/io: handle memtype_wc mapping for !DMAP range The amdgpu driver in drm-kmod will attempt to update/reserve certain GPU VRAM ranges as write-combining. Depending on the system, this address range may fall outside of FreeBSD's constructed DMAP. We cannot use pmap_change_attr() in this case. When INVARIANTS is enabled, this results in the following: panic: physical address 0x880000000 not covered by the DMAP Add a guard against triggering the KASSERT in PHYS_TO_DMAP(). This limitation in our implementation of arch_io_reserve_memtype_wc() is already known in drm-kmod's amdgpu_bo_init(), and errors are ignored there (see "BSDFIXME"). This change is only to eliminate the preventable assertion failure within this scheme. Tested by: kevans Reviewed by: kib, emaste MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56971 --- sys/compat/linuxkpi/common/include/linux/io.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h index f89c150e7a3b..4dfc04b3f3fc 100644 --- a/sys/compat/linuxkpi/common/include/linux/io.h +++ b/sys/compat/linuxkpi/common/include/linux/io.h @@ -544,6 +544,9 @@ arch_io_reserve_memtype_wc(resource_size_t start, resource_size_t size) #if defined(__amd64__) void *va; + if (!PHYS_IN_DMAP(start) || !PHYS_IN_DMAP(start + size)) + return (-EINVAL); + va = PHYS_TO_DMAP(start); return (-pmap_change_attr(va, size, VM_MEMATTR_WRITE_COMBINING)); #else @@ -557,8 +560,10 @@ arch_io_free_memtype_wc(resource_size_t start, resource_size_t size) #if defined(__amd64__) void *va; - va = PHYS_TO_DMAP(start); + if (!PHYS_IN_DMAP(start) || !PHYS_IN_DMAP(start + size)) + return; + va = PHYS_TO_DMAP(start); pmap_change_attr(va, size, VM_MEMATTR_WRITE_BACK); #endif } From nobody Thu May 14 15:36: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 4gGZF933cHz6dKf1 for ; Thu, 14 May 2026 15:36: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 4gGZF92MzZz3gy9 for ; Thu, 14 May 2026 15:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778773005; 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=4nXjW7roiQZ7s+PyxuUo2+6K3jSpfxpiH8rzv0o1p3I=; b=XofzrbN/RPbSGa/NtkhVucttPcLHbQ7mLBKFzc9/WfXz1k87e6qr2sEnR/1kYukB0QhUsc UNmjZJtYAfG2nAYNj7Hpw6SnXC3diFOvT4S6O1ZR1EoNKv+HUmI2+xl8LlxYXqQMDuHWt1 VZNZv5L8GxjtUYPZsWVtJmWnSRmmtD+bM41isbKe8RX42Yj6HBsjp3kFtShB5uwidV4/BR oOA3DkZpwkv4KXj9S7yqidcDNulQ9+Y9TOrxUDSpvAcWUKG7iRf8cepawAuQAI7Txl8Xrv aCpCP62halPvlnquRpuBe6tMHfmmr7zGDYuk+ht221Ams9qHU+nVq/KobQ3vNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778773005; a=rsa-sha256; cv=none; b=Nfo7v0ljBbhCSRnGYYqKXqU4RY8ezlQ649ZsafWdPb2mFHKKYsKUolONJCJtycCn70HCa7 +EB+PhSA6dum/WKkDNuHGF5jRsssSzOUjtWyiKNSuIGYtk7XVIfdQuKuCSCUE6fSiiCh0P aCJ7nqZ9ANSoigKrOrRpRPDJGYmSdSl3qefwGEDC91kA4Ww2itNUxcmaQORTFnAwvs8Wfg Hc9xdlPUGK8IbypaIH+SRjcuAWq2MldWUAPyC8uOVB0soK3sDNsw6XQca98EKIfvhd983l MIPRRaZdY3Q7I4auztybZq9wefPlbjboOy6+hSsDeXNivds4gtdePknnNGlp7A== 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=1778773005; 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=4nXjW7roiQZ7s+PyxuUo2+6K3jSpfxpiH8rzv0o1p3I=; b=nyvD17mbYpGyiFRipwvyUfo3tJm/AMQcMFGowMe77lwCn5W4HDi0VkJBgLfE0KUF+k2fEn U9McHR8R6uiuJCYK0+3Iwvy/O9meyhyr1kkiDcEiP4XFNr2QI2MDUHBigUokvwgjssG4Ql tOc810lKupsvWYkIbxgjDkh9o51wws9D0Sx3FbsTCZN7u7/FiSTX7llIpQGTLUvUeeQHYW CkzdMjOjBgnC/j4F6P1dDljMng/zwnfdiMwdpOJ/W25xYxHsDXuGN4MfSRbdIDRVS/MoWg b4lfBOk4Lt3RyR0pbZeUaW+110OFTGwAdhvAjk0gusCjuSqA8G7/+aep5eOXVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGZF91Zbjzk5R for ; Thu, 14 May 2026 15:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3626e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 15:36:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fb4e7898a359 - main - Revert "nvme: Only attach to storage NVMe devices" 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb4e7898a359a5044e6794c7fe8a698d29af1fd3 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 15:36:45 +0000 Message-Id: <6a05ec0d.3626e.6afe0cb9@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fb4e7898a359a5044e6794c7fe8a698d29af1fd3 commit fb4e7898a359a5044e6794c7fe8a698d29af1fd3 Author: Warner Losh AuthorDate: 2026-05-14 15:35:35 +0000 Commit: Warner Losh CommitDate: 2026-05-14 15:35:35 +0000 Revert "nvme: Only attach to storage NVMe devices" This reverts commit 0a19464bf7afa35ce2aa7649152bc3a7629faa98. It's incorrect for ahci attachments. Reverting to merge to stable/15 to merge to releng/15.1 for the release. Sponsored by: Netflix --- sys/cam/cam_ccb.h | 2 +- sys/dev/nvme/nvme_sim.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h index cedb3a9ad61c..e0516fb37850 100644 --- a/sys/cam/cam_ccb.h +++ b/sys/cam/cam_ccb.h @@ -651,7 +651,7 @@ struct ccb_pathinq_settings_nvme { uint8_t bus; uint8_t slot; uint8_t function; - uint8_t progif; + uint8_t extra; char dev_name[NVME_DEV_NAME_LEN]; /* nvme controller dev name for this device */ }; _Static_assert(sizeof(struct ccb_pathinq_settings_nvme) == 64, diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c index b9f09c8d1f61..a6ba1a498185 100644 --- a/sys/dev/nvme/nvme_sim.c +++ b/sys/dev/nvme/nvme_sim.c @@ -208,7 +208,7 @@ nvme_sim_action(struct cam_sim *sim, union ccb *ccb) cpi->xport_specific.nvme.bus = pci_get_bus(dev); cpi->xport_specific.nvme.slot = pci_get_slot(dev); cpi->xport_specific.nvme.function = pci_get_function(dev); - cpi->xport_specific.nvme.progif = pci_get_progif(dev); + cpi->xport_specific.nvme.extra = 0; strlcpy(cpi->xport_specific.nvme.dev_name, device_get_nameunit(dev), sizeof(cpi->xport_specific.nvme.dev_name)); cpi->hba_vendor = pci_get_vendor(dev); @@ -314,13 +314,6 @@ nvme_sim_probe(device_t dev) { if (nvme_use_nvd) return (ENXIO); - /* - * Only do storage devices with CAM. NVMHCI 1.0 interfaces are the only - * ones that have namespaces with LBA ranges on them. - */ - if (pci_get_progif(device_get_parent(dev)) != - PCIP_STORAGE_NVM_ENTERPRISE_NVMHCI_1_0) - return (ENXIO); device_set_desc(dev, "nvme cam"); return (BUS_PROBE_DEFAULT); From nobody Thu May 14 18:56: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 4gGfgq5XYSz5WqWg; Thu, 14 May 2026 18:56:39 +0000 (UTC) (envelope-from jhb@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 4gGfgq4jx0z45QV; Thu, 14 May 2026 18:56:39 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778784999; 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=UcbCV7NXBCYnq+OR6DAgi7n0vIFgzFJUmDzoVvK7Ndg=; b=m38h2Nrz6qGkrO9iNMElSdCjbZ5JdAzFYnvNex7S3mSS/d0nVHI0MSLc+KNUbyKZnvtTPm TUxK5CHmQBbre2zvOXNwZ/j1aUJS0mFdn/tCU/qNEMFw1AcnmgiE4HoWGGMeq8CiUHWNOn DkGMayUANBbEQ+IsrH8ecdyDsqQcXssveGtJNMUVkGqU66dHshdsyJ2S0+EQPfmkZYbpXr dP8Pjf2X2nks9nXszqe7wKJ9d3mWyhRwGcPbN+SVdYq8wdzO5dSF0tmpueKCp2xc23W3Lq UVI6UfOcdQIb3cXrEvYbB/wLIixtJEQB2Zf2AxZ6H5bv0rQs0R7X4n/j7jCVRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778784999; a=rsa-sha256; cv=none; b=QOejl1txY5swb4QA9BeO5LiDHDaG0jmXOizZEadNJx94TbGRfkF7TeQ6HAsKyfaWAZlc5O UPGl+MgnB5/6lAscWoGxvuXjHITEs/dGMVFEMwbMlcBQI8yZetPRMgaXab5NXKPnrUZ1e9 hSJTPKlC4J+Rza8C+1UsHtgCwn2IjmwBIQvewS2vHRmcyrCVSrUPBocMjCRo+QoihmG6xD ISzP7q4m2jyOVviF3pbVJwVPNPQjo55I+9It/eSn7HBaygLhDjMnpIsW3IXqyLwvcn9rom D3TN8zMke+NAeOpFofd9OxCPCets1Eb9n9nndBfmF66bSqCNSubpAuuN5fqwow== 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=1778784999; 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=UcbCV7NXBCYnq+OR6DAgi7n0vIFgzFJUmDzoVvK7Ndg=; b=aqZj4UyvMYrrGCe/8oxDSA9fxrlAKhAuR0jCij8vqkwJ8+Fi7iHNhHuGjZBzDo69mENLBQ bBoOhLURLfdBLveJUwDxOEByKngZJKMkvO7j4tbSmTYrhTDBHn5uwTtEOE7A5h+W7pzDFU woVAwP+nTlhykqchPDtIHrCNwyDgL8v9xmRB7g92rCcQElDWqVMvGu3iBPZ+x82zt6bE15 v+3QuQoxDEI+HqJ2NspUBiJMZ4R8ilqu9mSjPyUmP/vBF9Q1/7Wy9fOsovOoKpBxWvfaN7 1nsuWAssCLSwOTgYG6DDx7LItr3HZtpitqjE//iCCMXji/8p6K4S1TgUNIdkRg== Received: from [IPV6:2601:5c0:4202:5670:f9f4:5f18:1426:342d] (unknown [IPv6:2601:5c0:4202:5670:f9f4:5f18:1426:342d]) (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: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gGfgq2cj3z14Nd; Thu, 14 May 2026 18:56:39 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <501769a6-e12b-428d-9dd3-c6764083e578@FreeBSD.org> Date: Thu, 14 May 2026 14:56:38 -0400 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: 8766e2122ac0 - main - mandoc: Updating FreeBSD thead library descriptions Content-Language: en-US To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <6a04a811.3be57.aea6532@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 5/13/26 22:47, Konstantin Belousov wrote: > On Wed, May 13, 2026 at 04:34:25PM +0000, John Baldwin wrote: >> The branch main has been updated by jhb: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=8766e2122ac02ff4d86c254d8ef1c41d4a7f76a0 >> >> commit 8766e2122ac02ff4d86c254d8ef1c41d4a7f76a0 >> Author: John Baldwin >> AuthorDate: 2026-05-13 16:33:29 +0000 >> Commit: John Baldwin >> CommitDate: 2026-05-13 16:33:29 +0000 >> >> mandoc: Updating FreeBSD thead library descriptions >> >> Remove libkse as it has been obsolete for many years and drop 1:1 from >> description of libthr. >> >> Reviewed by: brooks >> Sponsored by: AFRL, DARPA >> Differential Revision: https://reviews.freebsd.org/D56850 >> --- >> contrib/mandoc/lib.in | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/contrib/mandoc/lib.in b/contrib/mandoc/lib.in >> index dcea23cf81ea..04d86f9add1e 100644 >> --- a/contrib/mandoc/lib.in >> +++ b/contrib/mandoc/lib.in >> @@ -74,7 +74,6 @@ LINE("libisns", "Internet Storage Name Service Library (libisns, \\-lisns)") >> LINE("libjail", "Jail Library (libjail, \\-ljail)") >> LINE("libkcore", "Kernel Memory Core Access Library (libkcore, \\-lkcore)") >> LINE("libkiconv", "Kernel-side iconv Library (libkiconv, \\-lkiconv)") >> -LINE("libkse", "N:M Threading Library (libkse, \\-lkse)") >> LINE("libkvm", "Kernel Data Access Library (libkvm, \\-lkvm)") >> LINE("libm", "Math Library (libm, \\-lm)") >> LINE("libm68k", "m68k Architecture Library (libm68k, \\-lm68k)") >> @@ -126,7 +125,7 @@ LINE("libtacplus", "TACACS+ Client Library (libtacplus, \\-ltacplus)") >> LINE("libtcplay", "TrueCrypt-compatible API library (libtcplay, \\-ltcplay)") >> LINE("libtermcap", "Termcap Access Library (libtermcap, \\-ltermcap)") >> LINE("libterminfo", "Terminal Information Library (libterminfo, \\-lterminfo)") >> -LINE("libthr", "1:1 Threading Library (libthr, \\-lthr)") >> +LINE("libthr", "Threading Library (libthr, \\-lthr)") > Arguably the suggested linker argument should be -lpthread instead. I think there is a "libpthread" entry already and we could just use that in our manpages going forward instead of .Lb libthr which would have that effect. Actually, .Lib libthr is only used in a few places, and several of those could either be removed (e.g. the IMPLEMENTATION NOTES section in pthread(3) can probably just be removed, it was more relevant when there were multiple libraries) or updated (_umtx_op.2 can just reference libpthread instead of libthr). It's not clear to me if there is true value in renaming the real library, though if we ever bump the major version for libthr we should probably use the opportunity to install it as libpthread for real. Given it uses symbol versioning it seems unlikely we will ever do that though. If we really cared we could rename it for 16 I guess. The compat15 package would just need to contain libthr.so.3. -- John Baldwin From nobody Thu May 14 19:01: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 4gGfn56whmz5WqmK for ; Thu, 14 May 2026 19:01:13 +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 4gGfn56Wy7z463j for ; Thu, 14 May 2026 19:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785273; 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=3p/1L+a8eF0y+IdEjle/fPH1TNXbGfMGVOUH+0hwot0=; b=nQIzsiDiEILoJGhManzY10XFYdwnbQqbRdWkqEaLOozZZEbecE8RiBTSStzF3fKzCGu9xX +3UzBy5g7+CXPgpOQ65yzXFJneBVf7Gw8SUxiJUra79jZi+4ggJjLYqqQHT1u3dY9DK17v 4SAIfWqW+nn1VRb0DVHGJsTLWStb6/FnwKXYyOgo6YIWTRIr5Cp2N1DWMmueL7eaGEXA9u dYBsq3/r+fTI4IoSJ69NSO7Wu3OASZMMtUiWqwlBXQyQn+g0mHJaS4D2pbVgDGN7vDozPr kF4IbCLIRxHQvCpLW+EfrX+qMGd2MlNWjVhZOhxqOar8xrhDpO/f9v/KjI8/KA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785273; a=rsa-sha256; cv=none; b=juE/Kg/kbqs0lucGzWdFlFFb8jqV1cdSQVGe6gjn4UZsQJYkZKCFHa5ScmOuBeQkZgajUK +GdIxzQZu/UaqeO1f8cBWc98PJwmo/VanFGZ5XnXnRNvkLXbdFiIpMfn8ERZMsigcOT68v 352Lig4D9xMsuTObvKRPq+nSEKWe9W9kWhlUvklhAuBlb5SLNRtZ4oyfNux/EiWJdhow65 6i9yiapX2vdqTvnL7lh5MPo3+iLHoKGdfNnGl7jfl6Z0vwyFrdLRK5cLHSpUugt8xJHwRK EjbdOqeeN5VsRwqdDI7WGWdfayK1c6vJ0bdX6OIEz+Wd6seD9/xrL1pQ0oggJA== 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=1778785273; 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=3p/1L+a8eF0y+IdEjle/fPH1TNXbGfMGVOUH+0hwot0=; b=hTjV2b2pEjpvXIEKO2a7Em/jnHaR+cYR9RUSvpYr84fElWObPdMVw+b/Zh43bQNo5Iz4YB gcHVT8KQGYT5qYb3pwPT8W7CNa38TgiPxe8LogVO708ws923PBH8hvs97squAQEU7EFsrs K5STMFkVdM9NUzZopO/3nYQRLCEC7GkopaQaDoydl6MmQl9qkwMeAJVslf2lIZYWRDXkqo OWrMwrcXTrZu8T+U1oO3gpEK6NSAFhbg8ZPTRtSRIwzX2Bq3SWzSLeJ4FHHDDTo8gA+nzl 6oT6DhUwsoZRob+wr6vzjzVmGQEP7f3CFFoZ3wPBSyzD3fP3h7RZQlrtvWu57w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfn55qhQzqqh for ; Thu, 14 May 2026 19:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2672e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:01:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 2574974648c6 - main - OpenSSH: Update to 10.3p1 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: 2574974648c68c738aec3ff96644d888d7913a37 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:01:13 +0000 Message-Id: <6a061bf9.2672e.364c778f@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2574974648c68c738aec3ff96644d888d7913a37 commit 2574974648c68c738aec3ff96644d888d7913a37 Merge: fb4e7898a359 2c72d8219c56 Author: Ed Maste AuthorDate: 2026-05-14 18:59:30 +0000 Commit: Ed Maste CommitDate: 2026-05-14 18:59:30 +0000 OpenSSH: Update to 10.3p1 Full release notes are available at https://www.openssh.com/txt/release-10.3 Selected highlights from the release notes: * ssh(1), sshd(8): remove bug compatibility for implementations that don't support rekeying. If such an implementation tries to interoperate with OpenSSH, it will now eventually fail when the transport needs rekeying. * ssh(1), sshd(8): support IANA-assigned codepoints for SSH agent forwarding, as per draft-ietf-sshm-ssh-agent. Support for the new names is advertised via the EXT_INFO message. If a server offers support for the new names, then they are used preferentially. * ssh(1): add a ~I escape option that shows information about the current SSH connection. * sshd(8): add 'invaliduser' penalty to PerSourcePenalties, which is applied to login attempts for usernames that do not match real accounts. Defaults to 5s to match 'authfail' but allows administrators to block such attempts for longer if desired. * Support the ed25519 signature scheme via libcrypto. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56999 crypto/openssh/.depend | 345 +- crypto/openssh/.github/ci-status.md | 5 + crypto/openssh/.github/configs | 29 +- crypto/openssh/.github/run_test.sh | 5 + crypto/openssh/.github/setup_ci.sh | 8 +- crypto/openssh/.github/workflows/c-cpp.yml | 9 +- crypto/openssh/.github/workflows/selfhosted.yml | 1 + crypto/openssh/.github/workflows/upstream.yml | 10 +- crypto/openssh/.github/workflows/vm.yml | 127 +- crypto/openssh/.gitignore | 3 +- crypto/openssh/.skipped-commit-ids | 1 + crypto/openssh/ChangeLog | 13627 +++++++++--------- crypto/openssh/INSTALL | 9 +- crypto/openssh/Makefile.in | 16 +- crypto/openssh/PROTOCOL | 2 +- crypto/openssh/README | 2 +- crypto/openssh/README.md | 9 +- crypto/openssh/addr.c | 4 +- crypto/openssh/addr.h | 8 +- crypto/openssh/addrmatch.c | 7 +- crypto/openssh/audit-bsm.c | 6 +- crypto/openssh/auth-bsdauth.c | 10 +- crypto/openssh/auth-krb5.c | 2 +- crypto/openssh/auth-options.c | 3 +- crypto/openssh/auth-pam.c | 220 +- crypto/openssh/auth-pam.h | 2 +- crypto/openssh/auth.c | 36 +- crypto/openssh/auth.h | 4 +- crypto/openssh/auth2-chall.c | 38 +- crypto/openssh/auth2-gss.c | 21 +- crypto/openssh/auth2-hostbased.c | 13 +- crypto/openssh/auth2-none.c | 7 - crypto/openssh/auth2-pubkey.c | 17 +- crypto/openssh/auth2-pubkeyfile.c | 28 +- crypto/openssh/auth2.c | 14 +- crypto/openssh/authfd.c | 73 +- crypto/openssh/authfd.h | 6 +- crypto/openssh/authfile.c | 8 +- crypto/openssh/canohost.c | 5 +- crypto/openssh/chacha.c | 4 +- crypto/openssh/channels.c | 435 +- crypto/openssh/channels.h | 26 +- crypto/openssh/cipher-aesctr.c | 6 +- crypto/openssh/cipher-chachapoly-libcrypto.c | 4 +- crypto/openssh/cipher.c | 3 +- crypto/openssh/clientloop.c | 58 +- crypto/openssh/clientloop.h | 6 +- crypto/openssh/compat.c | 6 +- crypto/openssh/config.h | 21 +- crypto/openssh/configure.ac | 135 +- crypto/openssh/contrib/redhat/openssh.spec | 2 +- crypto/openssh/contrib/suse/openssh.spec | 2 +- crypto/openssh/crypto_api.h | 32 +- crypto/openssh/defines.h | 15 +- crypto/openssh/dh.c | 5 +- crypto/openssh/digest-libc.c | 11 +- crypto/openssh/dispatch.c | 8 +- crypto/openssh/dispatch.h | 8 +- crypto/openssh/dns.c | 19 +- crypto/openssh/ed25519-openssl.c | 207 + crypto/openssh/ed25519.c | 4 + crypto/openssh/entropy.c | 24 +- crypto/openssh/entropy.h | 9 +- crypto/openssh/gss-genr.c | 2 +- crypto/openssh/gss-serv-krb5.c | 2 +- crypto/openssh/gss-serv.c | 12 +- crypto/openssh/hash.c | 43 - crypto/openssh/hmac.c | 3 +- crypto/openssh/hostfile.c | 6 +- crypto/openssh/kex-names.c | 4 +- crypto/openssh/kex.c | 26 +- crypto/openssh/kex.h | 9 +- crypto/openssh/kexdh.c | 7 +- crypto/openssh/kexecdh.c | 4 +- crypto/openssh/kexgen.c | 10 +- crypto/openssh/kexgex.c | 2 +- crypto/openssh/kexgexc.c | 13 +- crypto/openssh/kexgexs.c | 12 +- crypto/openssh/krb5_config.h | 9 + crypto/openssh/krl.c | 41 +- crypto/openssh/krl.h | 8 +- crypto/openssh/libcrux_mlkem768_sha3.h | 13878 +++++++++---------- crypto/openssh/log.c | 7 +- crypto/openssh/loginrec.c | 9 +- crypto/openssh/loginrec.h | 1 + crypto/openssh/mac.c | 8 +- crypto/openssh/mac.h | 6 +- crypto/openssh/mdoc2man.awk | 8 + crypto/openssh/misc-agent.c | 2 +- crypto/openssh/misc.c | 234 +- crypto/openssh/misc.h | 37 +- crypto/openssh/mlkem768.sh | 124 +- crypto/openssh/moduli | 1011 +- crypto/openssh/moduli.c | 50 +- crypto/openssh/monitor.c | 67 +- crypto/openssh/monitor.h | 6 +- crypto/openssh/monitor_fdpass.c | 5 +- crypto/openssh/monitor_wrap.c | 30 +- crypto/openssh/monitor_wrap.h | 3 +- crypto/openssh/msg.c | 5 +- crypto/openssh/mux.c | 167 +- crypto/openssh/myproposal.h | 5 +- crypto/openssh/nchan.c | 4 +- crypto/openssh/openbsd-compat/bcrypt_pbkdf.c | 6 +- crypto/openssh/openbsd-compat/bsd-misc.c | 9 + crypto/openssh/openbsd-compat/bsd-misc.h | 4 + crypto/openssh/openbsd-compat/bsd-openpty.c | 1 + crypto/openssh/openbsd-compat/bsd-poll.h | 4 + .../openssh/openbsd-compat/{sha2.h => bsd-sha2.h} | 0 crypto/openssh/openbsd-compat/fake-rfc2553.c | 6 +- crypto/openssh/openbsd-compat/include/glob.h | 1 + crypto/openssh/openbsd-compat/include/sys/queue.h | 1 + crypto/openssh/openbsd-compat/include/sys/tree.h | 1 + crypto/openssh/openbsd-compat/openbsd-compat.h | 2 +- crypto/openssh/openbsd-compat/openssl-compat.c | 23 +- crypto/openssh/openbsd-compat/openssl-compat.h | 2 +- crypto/openssh/openbsd-compat/sha2.c | 2 +- crypto/openssh/packet.c | 304 +- crypto/openssh/packet.h | 30 +- crypto/openssh/pathnames.h | 11 +- crypto/openssh/progressmeter.c | 6 +- crypto/openssh/readconf.c | 181 +- crypto/openssh/readconf.h | 9 +- crypto/openssh/readpass.c | 3 +- crypto/openssh/regress/Makefile | 12 +- crypto/openssh/regress/cert-hostkey.sh | 47 +- crypto/openssh/regress/cert-userkey.sh | 12 +- crypto/openssh/regress/cfgmatch.sh | 23 +- crypto/openssh/regress/check-perm.c | 2 - crypto/openssh/regress/gss-auth.sh | 196 + crypto/openssh/regress/hostbased.sh | 27 +- crypto/openssh/regress/kbdint.sh | 86 + crypto/openssh/regress/misc/sk-dummy/Makefile | 11 +- crypto/openssh/regress/misc/sk-dummy/fatal.c | 32 +- .../regress/misc/ssh-verify-attestation/Makefile | 11 +- crypto/openssh/regress/modpipe.c | 6 +- crypto/openssh/regress/multiplex.sh | 47 +- crypto/openssh/regress/percent.sh | 6 +- crypto/openssh/regress/proxyjump.sh | 102 + crypto/openssh/regress/scp.sh | 15 +- crypto/openssh/regress/scp3.sh | 17 +- crypto/openssh/regress/sftp-cmds.sh | 187 +- crypto/openssh/regress/sftp-resume.sh | 4 +- crypto/openssh/regress/ssh-pkcs11.sh | 40 + crypto/openssh/regress/ssh-tty.sh | 179 + crypto/openssh/regress/test-exec.sh | 36 +- crypto/openssh/regress/unittests/Makefile.inc | 6 +- crypto/openssh/regress/unittests/authopt/Makefile | 8 +- crypto/openssh/regress/unittests/authopt/tests.c | 3 +- crypto/openssh/regress/unittests/bitmap/Makefile | 3 +- .../openssh/regress/unittests/conversion/Makefile | 4 +- crypto/openssh/regress/unittests/hostkeys/Makefile | 9 +- .../regress/unittests/hostkeys/test_iterate.c | 4 +- crypto/openssh/regress/unittests/kex/Makefile | 10 +- crypto/openssh/regress/unittests/kex/tests.c | 4 + crypto/openssh/regress/unittests/match/Makefile | 4 +- crypto/openssh/regress/unittests/misc/Makefile | 4 +- .../openssh/regress/unittests/misc/test_convtime.c | 37 +- crypto/openssh/regress/unittests/misc/test_misc.c | 39 + crypto/openssh/regress/unittests/sshbuf/Makefile | 6 +- .../openssh/regress/unittests/sshbuf/test_sshbuf.c | 39 +- .../regress/unittests/sshbuf/test_sshbuf_fuzz.c | 4 +- .../unittests/sshbuf/test_sshbuf_getput_basic.c | 123 +- .../unittests/sshbuf/test_sshbuf_getput_crypto.c | 6 +- .../unittests/sshbuf/test_sshbuf_getput_fuzz.c | 10 +- crypto/openssh/regress/unittests/sshkey/Makefile | 10 +- .../openssh/regress/unittests/sshkey/test_sshkey.c | 4 +- crypto/openssh/regress/unittests/sshkey/tests.c | 2 + crypto/openssh/regress/unittests/sshsig/Makefile | 9 +- .../regress/unittests/test_helper/test_helper.c | 53 +- .../regress/unittests/test_helper/test_helper.h | 26 +- crypto/openssh/regress/unittests/utf8/Makefile | 3 +- crypto/openssh/rijndael.c | 2 +- crypto/openssh/sandbox-seccomp-filter.c | 6 + crypto/openssh/scp.c | 37 +- crypto/openssh/servconf.c | 202 +- crypto/openssh/servconf.h | 59 +- crypto/openssh/serverloop.c | 19 +- crypto/openssh/session.c | 34 +- crypto/openssh/sftp-client.c | 61 +- crypto/openssh/sftp-client.h | 40 +- crypto/openssh/sftp-common.c | 6 +- crypto/openssh/sftp-common.h | 16 +- crypto/openssh/sftp-glob.c | 1 + crypto/openssh/sftp-server.c | 176 +- crypto/openssh/sftp-usergroup.c | 3 +- crypto/openssh/sftp.c | 73 +- crypto/openssh/sntrup761.c | 22 +- crypto/openssh/sntrup761.sh | 24 +- crypto/openssh/srclimit.c | 42 +- crypto/openssh/srclimit.h | 2 + crypto/openssh/ssh-add.1 | 9 +- crypto/openssh/ssh-add.c | 62 +- crypto/openssh/ssh-agent.1 | 2 +- crypto/openssh/ssh-agent.c | 134 +- crypto/openssh/ssh-ecdsa-sk.c | 20 +- crypto/openssh/ssh-ecdsa.c | 6 +- crypto/openssh/ssh-ed25519-sk.c | 4 +- crypto/openssh/ssh-ed25519.c | 3 +- crypto/openssh/ssh-keygen.1 | 34 +- crypto/openssh/ssh-keygen.c | 55 +- crypto/openssh/ssh-keyscan.c | 5 +- crypto/openssh/ssh-keysign.c | 8 +- crypto/openssh/ssh-pkcs11-client.c | 3 +- crypto/openssh/ssh-pkcs11-helper.c | 4 +- crypto/openssh/ssh-pkcs11.c | 25 +- crypto/openssh/ssh-pkcs11.h | 8 +- crypto/openssh/ssh-rsa.c | 6 +- crypto/openssh/ssh-sk-client.c | 44 +- crypto/openssh/ssh-sk-helper.c | 1 - crypto/openssh/ssh.1 | 10 +- crypto/openssh/ssh.c | 92 +- crypto/openssh/ssh_api.c | 4 +- crypto/openssh/ssh_api.h | 3 +- crypto/openssh/ssh_config.5 | 19 +- crypto/openssh/ssh_namespace.h | 59 +- crypto/openssh/sshbuf-getput-basic.c | 72 +- crypto/openssh/sshbuf-getput-crypto.c | 2 +- crypto/openssh/sshbuf-misc.c | 4 +- crypto/openssh/sshbuf.c | 22 +- crypto/openssh/sshbuf.h | 83 +- crypto/openssh/sshconnect.c | 28 +- crypto/openssh/sshconnect.h | 3 +- crypto/openssh/sshconnect2.c | 113 +- crypto/openssh/sshd-auth.c | 26 +- crypto/openssh/sshd-session.c | 61 +- crypto/openssh/sshd.c | 27 +- crypto/openssh/sshd_config | 2 +- crypto/openssh/sshd_config.5 | 71 +- crypto/openssh/ssherr-libcrypto.c | 59 + crypto/openssh/ssherr-nolibcrypto.c | 26 + crypto/openssh/ssherr.c | 7 +- crypto/openssh/ssherr.h | 4 +- crypto/openssh/sshkey.c | 155 +- crypto/openssh/sshkey.h | 16 +- crypto/openssh/sshlogin.c | 3 +- crypto/openssh/sshpty.c | 4 +- crypto/openssh/sshsig.c | 8 +- crypto/openssh/ttymodes.c | 3 +- crypto/openssh/uidswap.c | 5 +- crypto/openssh/umac.c | 15 +- crypto/openssh/version.h | 6 +- secure/lib/libssh/Makefile | 4 +- secure/libexec/sftp-server/Makefile | 2 +- secure/libexec/ssh-sk-helper/Makefile | 2 +- secure/ssh.mk | 2 +- 246 files changed, 19635 insertions(+), 16449 deletions(-) diff --cc crypto/openssh/.gitignore index df0f2ce0464e,000000000000..907533067c8b mode 100644,000000..100644 --- a/crypto/openssh/.gitignore +++ b/crypto/openssh/.gitignore @@@ -1,40 -1,0 +1,39 @@@ ++*~ +Makefile +buildpkg.sh +config.h - config.h.in~ +config.log +config.status +openbsd-compat/Makefile +openbsd-compat/regress/Makefile +openbsd-compat/include +openssh.xml +opensshd.init +survey.sh +**/*.o +**/*.lo +**/*.so +**/*.dylib +**/*.dll +**/*.out +**/*.a - **/*.un~ +**/.*.swp +autom4te.cache/ +scp +sftp +sftp-server +ssh +ssh-add +ssh-agent +ssh-keygen +ssh-keyscan +ssh-keysign +ssh-pkcs11-helper +ssh-sk-helper +sshd +sshd-session +sshd-auth +!regress/misc/**/Makefile +!regress/unittests/**/Makefile +tags + diff --cc crypto/openssh/INSTALL index 32f2e9ad53b5,000000000000..ec7c29be57d7 mode 100644,000000..100644 --- a/crypto/openssh/INSTALL +++ b/crypto/openssh/INSTALL @@@ -1,295 -1,0 +1,298 @@@ +1. Prerequisites +---------------- + +A C compiler. Any C89 or better compiler that supports variadic macros +should work. Where supported, configure will attempt to enable the +compiler's run-time integrity checking options. Some notes about +specific compilers: + - clang: -ftrapv and -sanitize=integer require the compiler-rt runtime + (CC=clang LDFLAGS=--rtlib=compiler-rt ./configure) + +To support Privilege Separation (which is now required) you will need +to create the user, group and directory used by sshd for privilege +separation. See README.privsep for details. + + +The remaining items are optional. + +A working installation of zlib: +Zlib 1.1.4 or 1.2.1.2 or greater (earlier 1.2.x versions have problems): +https://zlib.net/ + - libcrypto from either of LibreSSL or OpenSSL. Building without libcrypto - is supported but severely restricts the available ciphers and algorithms. ++libcrypto from one of LibreSSL, OpenSSL, AWS-LC or BoringSSL. Building ++without libcrypto is supported but severely restricts the available ++ciphers and algorithms. + - LibreSSL (https://www.libressl.org/) 3.1.0 or greater + - OpenSSL (https://www.openssl.org) 1.1.1 or greater ++ - AWS-LC (https://github.com/aws/aws-lc) ++ - BoringSSL (https://github.com/google/boringssl) + - LibreSSL/OpenSSL should be compiled as a position-independent library ++libcrypto should be compiled as a position-independent library +(i.e. -fPIC, eg by configuring OpenSSL as "./config [options] -fPIC" +or LibreSSL as "CFLAGS=-fPIC ./configure") otherwise OpenSSH will not +be able to link with it. If you must use a non-position-independent +libcrypto, then you may need to configure OpenSSH --without-pie. + +If you build either from source, running the OpenSSL self-test ("make +tests") or the LibreSSL equivalent ("make check") and ensuring that all +tests pass is strongly recommended. + +NB. If you operating system supports /dev/random, you should configure +libcrypto (LibreSSL/OpenSSL) to use it. OpenSSH relies on libcrypto's +direct support of /dev/random, or failing that, either prngd or egd. + +PRNGD: + +If your system lacks kernel-based random collection, the use of Lutz +Jaenicke's PRNGd is recommended. If you are using libcrypto it requires +that the libcrypto is configured to support it. If you are building +--without-openssl then the --with-prngd-socket option must match the +socket provided by prngd. + +http://prngd.sourceforge.net/ + +EGD: + +The Entropy Gathering Daemon (EGD) supports the same interface as prngd. +The same caveats about configuration for prngd also apply. + +http://egd.sourceforge.net/ + +PAM: + +OpenSSH can utilise Pluggable Authentication Modules (PAM) if your +system supports it. PAM is standard most Linux distributions, Solaris, +HP-UX 11, AIX >= 5.2, FreeBSD, NetBSD and Mac OS X. + +Information about the various PAM implementations are available: + +Solaris PAM: http://www.sun.com/software/solaris/pam/ +Linux PAM: http://www.kernel.org/pub/linux/libs/pam/ +OpenPAM: http://www.openpam.org/ + +If you wish to build the GNOME passphrase requester, you will need the GNOME +libraries and headers. + +GNOME: +http://www.gnome.org/ + +Alternatively, Jim Knoble has written an excellent X11 +passphrase requester. This is maintained separately at: + +http://www.jmknoble.net/software/x11-ssh-askpass/ + +TCP Wrappers: + +If you wish to use the TCP wrappers functionality you will need at least +tcpd.h and libwrap.a, either in the standard include and library paths, +or in the directory specified by --with-tcp-wrappers. Version 7.6 is +known to work. + +http://ftp.porcupine.org/pub/security/index.html + +LibEdit: + +sftp supports command-line editing via NetBSD's libedit. If your platform +has it available natively you can use that, alternatively you might try +these multi-platform ports: + +http://www.thrysoee.dk/editline/ +http://sourceforge.net/projects/libedit/ + +LDNS: + +LDNS is a DNS BSD-licensed resolver library which supports DNSSEC. + +http://nlnetlabs.nl/projects/ldns/ + +Autoconf: + +If you modify configure.ac or configure doesn't exist (eg if you checked +the main git branch) then you will need autoconf-2.69 and automake-1.16.1 +or newer to rebuild the automatically generated files by running +"autoreconf". Earlier versions may also work but this is not guaranteed. + +http://www.gnu.org/software/autoconf/ +http://www.gnu.org/software/automake/ + +Basic Security Module (BSM): + +Native BSM support is known to exist in Solaris from at least 2.5.1, +FreeBSD 6.1 and OS X. Alternatively, you may use the OpenBSM +implementation (http://www.openbsm.org). + +makedepend: + +https://www.x.org/archive/individual/util/ + +If you are making significant changes to the code you may need to rebuild +the dependency (.depend) file using "make depend", which requires the +"makedepend" tool from the X11 distribution. + +libfido2: + +libfido2 allows the use of hardware security keys over USB. libfido2 +in turn depends on libcbor. libfido2 >= 1.5.0 is strongly recommended. +Limited functionality is possible with earlier libfido2 versions. + +https://github.com/Yubico/libfido2 +https://github.com/pjk/libcbor + + +2. Building / Installation +-------------------------- + +To install OpenSSH with default options: + +./configure +make +make install + +This will install the OpenSSH binaries in /usr/local/bin, configuration files +in /usr/local/etc, the server in /usr/local/sbin, etc. To specify a different +installation prefix, use the --prefix option to configure: + +./configure --prefix=/opt +make +make install + +Will install OpenSSH in /opt/{bin,etc,lib,sbin}. You can also override +specific paths, for example: + +./configure --prefix=/opt --sysconfdir=/etc/ssh +make +make install + +This will install the binaries in /opt/{bin,lib,sbin}, but will place the +configuration files in /etc/ssh. + +If you are using PAM, you may need to manually install a PAM control +file as "/etc/pam.d/sshd" (or wherever your system prefers to keep +them). Note that the service name used to start PAM is __progname, +which is the basename of the path of your sshd (e.g., the service name +for /usr/sbin/osshd will be osshd). If you have renamed your sshd +executable, your PAM configuration may need to be modified. + +A generic PAM configuration is included as "contrib/sshd.pam.generic", +you may need to edit it before using it on your system. If you are +using a recent version of Red Hat Linux, the config file in +contrib/redhat/sshd.pam should be more useful. Failure to install a +valid PAM file may result in an inability to use password +authentication. On HP-UX 11 and Solaris, the standard /etc/pam.conf +configuration will work with sshd (sshd will match the other service +name). + +There are a few other options to the configure script: + +--with-audit=[module] enable additional auditing via the specified module. +Currently, drivers for "debug" (additional info via syslog) and "bsm" +(Sun's Basic Security Module) are supported. + +--with-pam enables PAM support. If PAM support is compiled in, it must +also be enabled in sshd_config (refer to the UsePAM directive). + +--with-prngd-socket=/some/file allows you to enable EGD or PRNGD +support and to specify a PRNGd socket. Use this if your Unix lacks +/dev/random. + +--with-prngd-port=portnum allows you to enable EGD or PRNGD support +and to specify a EGD localhost TCP port. Use this if your Unix lacks +/dev/random. + +--with-lastlog=FILE will specify the location of the lastlog file. +./configure searches a few locations for lastlog, but may not find +it if lastlog is installed in a different place. + +--without-lastlog will disable lastlog support entirely. + +--with-osfsia, --without-osfsia will enable or disable OSF1's Security +Integration Architecture. The default for OSF1 machines is enable. + +--with-tcp-wrappers will enable TCP Wrappers (/etc/hosts.allow|deny) +support. + +--with-utmpx enables utmpx support. utmpx support is automatic for +some platforms. + +--without-shadow disables shadow password support. + +--with-ipaddr-display forces the use of a numeric IP address in the +$DISPLAY environment variable. Some broken systems need this. + +--with-default-path=PATH allows you to specify a default $PATH for sessions +started by sshd. This replaces the standard path entirely. + +--with-pid-dir=PATH specifies the directory in which the sshd.pid file is +created. + +--with-xauth=PATH specifies the location of the xauth binary + +--with-ssl-dir=DIR allows you to specify where your Libre/OpenSSL +libraries are installed. + +--with-ssl-engine enables Libre/OpenSSL's (hardware) ENGINE support + +--without-openssl builds without using OpenSSL. Only a subset of ciphers +and algorithms are supported in this configuration. + +--without-zlib builds without zlib. This disables the Compression option. + +--with-4in6 Check for IPv4 in IPv6 mapped addresses and convert them to +real (AF_INET) IPv4 addresses. Works around some quirks on Linux. + +If you need to pass special options to the compiler or linker, you +can specify these as environment variables before running ./configure. +For example: + +CC="/usr/foo/cc" CFLAGS="-O" LDFLAGS="-s" LIBS="-lrubbish" ./configure + +3. Configuration +---------------- + +The runtime configuration files are installed by in ${prefix}/etc or +whatever you specified as your --sysconfdir (/usr/local/etc by default). + +The default configuration should be instantly usable, though you should +review it to ensure that it matches your security requirements. + +To generate a host key, run "make host-key". Alternately you can do so +manually using the following commands: + + ssh-keygen -t [type] -f /etc/ssh/ssh_host_key -N "" + +for each of the types you wish to generate (rsa, ed25519 or ecdsa) or + + ssh-keygen -A + +to generate keys for all supported types. + +Replacing /etc/ssh with the correct path to the configuration directory. +(${prefix}/etc or whatever you specified with --sysconfdir during +configuration). + +If you have configured OpenSSH with EGD/prngd support, ensure that EGD or +prngd is running and has collected some entropy first. + +For more information on configuration, please refer to the manual pages +for sshd, ssh and ssh-agent. + +4. (Optional) Send survey +------------------------- + +$ make survey +[check the contents of the file "survey" to ensure there's no information +that you consider sensitive] +$ make send-survey + +This will send configuration information for the currently configured +host to a survey address. This will help determine which configurations +are actually in use, and what valid combinations of configure options +exist. The raw data is available only to the OpenSSH developers, however +summary data may be published. + +5. Problems? +------------ + +If you experience problems compiling, installing or running OpenSSH, +please refer to the "reporting bugs" section of the webpage at +https://www.openssh.com/ diff --cc crypto/openssh/README.md index 2ad6471386e2,000000000000..1cfcd7bb9feb mode 100644,000000..100644 --- a/crypto/openssh/README.md +++ b/crypto/openssh/README.md @@@ -1,86 -1,0 +1,89 @@@ +# Portable OpenSSH + - [![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml) - [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/openssh.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:openssh) ++[![C/C++ CI](../../actions/workflows/c-cpp.yml/badge.svg)](../../actions/workflows/c-cpp.yml) ++[![VM CI](../../actions/workflows/vm.yml/badge.svg)](../../actions/workflows/vm.yml) ++[![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml) ++[![CIFuzz](../../actions/workflows/cifuzz.yml/badge.svg)](../../actions/workflows/cifuzz.yml) ++[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/openssh.svg)](https://issues.oss-fuzz.com/issues?q="Project:+openssh"+is:open) +[![Coverity Status](https://scan.coverity.com/projects/21341/badge.svg)](https://scan.coverity.com/projects/openssh-portable) + +OpenSSH is a complete implementation of the SSH protocol (version 2) for secure remote login, command execution and file transfer. It includes a client ``ssh`` and server ``sshd``, file transfer utilities ``scp`` and ``sftp`` as well as tools for key generation (``ssh-keygen``), run-time key storage (``ssh-agent``) and a number of supporting programs. + +This is a port of OpenBSD's [OpenSSH](https://openssh.com) to most Unix-like operating systems, including Linux, OS X and Cygwin. Portable OpenSSH polyfills OpenBSD APIs that are not available elsewhere, adds sshd sandboxing for more operating systems and includes support for OS-native authentication and auditing (e.g. using PAM). + +## Documentation + +The official documentation for OpenSSH are the man pages for each tool: + +* [ssh(1)](https://man.openbsd.org/ssh.1) +* [sshd(8)](https://man.openbsd.org/sshd.8) +* [ssh-keygen(1)](https://man.openbsd.org/ssh-keygen.1) +* [ssh-agent(1)](https://man.openbsd.org/ssh-agent.1) +* [scp(1)](https://man.openbsd.org/scp.1) +* [sftp(1)](https://man.openbsd.org/sftp.1) +* [ssh-keyscan(8)](https://man.openbsd.org/ssh-keyscan.8) +* [sftp-server(8)](https://man.openbsd.org/sftp-server.8) + +## Stable Releases + +Stable release tarballs are available from a number of [download mirrors](https://www.openssh.com/portable.html#downloads). We recommend the use of a stable release for most users. Please read the [release notes](https://www.openssh.com/releasenotes.html) for details of recent changes and potential incompatibilities. + +## Building Portable OpenSSH + +### Dependencies + +Portable OpenSSH is built using autoconf and make. It requires a working C compiler, standard library and headers. + - ``libcrypto`` from either [LibreSSL](https://www.libressl.org/) or [OpenSSL](https://www.openssl.org) may also be used. OpenSSH may be built without either of these, but the resulting binaries will have only a subset of the cryptographic algorithms normally available. ++``libcrypto`` from one of [LibreSSL](https://www.libressl.org/), [OpenSSL](https://www.openssl.org), [AWS-LC](https://github.com/aws/aws-lc) or [BoringSSL](https://github.com/google/boringssl) may also be used. OpenSSH may be built without either of these, but the resulting binaries will have only a subset of the cryptographic algorithms normally available. + +[zlib](https://www.zlib.net/) is optional; without it transport compression is not supported. + +FIDO security token support needs [libfido2](https://github.com/Yubico/libfido2) and its dependencies and will be enabled automatically if they are found. + +In addition, certain platforms and build-time options may require additional dependencies; see README.platform for details about your platform. + +### Building a release + +Release tarballs and release branches in git include a pre-built copy of the ``configure`` script and may be built using: + +``` +tar zxvf openssh-X.YpZ.tar.gz +cd openssh +./configure # [options] +make && make tests +``` + +See the [Build-time Customisation](#build-time-customisation) section below for configure options. If you plan on installing OpenSSH to your system, then you will usually want to specify destination paths. + +### Building from git + +If building from the git master branch, you'll need [autoconf](https://www.gnu.org/software/autoconf/) installed to build the ``configure`` script. The following commands will check out and build portable OpenSSH from git: + +``` +git clone https://github.com/openssh/openssh-portable # or https://anongit.mindrot.org/openssh.git +cd openssh-portable +autoreconf +./configure +make && make tests +``` + +### Build-time Customisation + +There are many build-time customisation options available. All Autoconf destination path flags (e.g. ``--prefix``) are supported (and are usually required if you want to install OpenSSH). + +For a full list of available flags, run ``./configure --help`` but a few of the more frequently-used ones are described below. Some of these flags will require additional libraries and/or headers be installed. + +Flag | Meaning +--- | --- +``--with-pam`` | Enable [PAM](https://en.wikipedia.org/wiki/Pluggable_authentication_module) support. [OpenPAM](https://www.openpam.org/), [Linux PAM](http://www.linux-pam.org/) and Solaris PAM are supported. +``--with-libedit`` | Enable [libedit](https://www.thrysoee.dk/editline/) support for sftp. +``--with-kerberos5`` | Enable Kerberos/GSSAPI support. Both [Heimdal](https://www.h5l.org/) and [MIT](https://web.mit.edu/kerberos/) Kerberos implementations are supported. +``--with-selinux`` | Enable [SELinux](https://en.wikipedia.org/wiki/Security-Enhanced_Linux) support. + +## Development + +Portable OpenSSH development is discussed on the [openssh-unix-dev mailing list](https://lists.mindrot.org/mailman/listinfo/openssh-unix-dev) ([archive mirror](https://marc.info/?l=openssh-unix-dev)). Bugs and feature requests are tracked on our [Bugzilla](https://bugzilla.mindrot.org/). + +## Reporting bugs + +_Non-security_ bugs may be reported to the developers via [Bugzilla](https://bugzilla.mindrot.org/) or via the mailing list above. Security bugs should be reported to [openssh@openssh.com](mailto:openssh.openssh.com). diff --cc crypto/openssh/auth.c index 496a0194b100,000000000000..da1a674126d1 mode 100644,000000..100644 --- a/crypto/openssh/auth.c +++ b/crypto/openssh/auth.c @@@ -1,787 -1,0 +1,791 @@@ - /* $OpenBSD: auth.c,v 1.163 2025/09/15 04:39:15 djm Exp $ */ ++/* $OpenBSD: auth.c,v 1.164 2026/02/11 22:57:16 djm Exp $ */ +/* + * Copyright (c) 2000 Markus Friedl. 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 ``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. + */ + +#include "includes.h" + +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#ifdef HAVE_LOGIN_H +#include +#endif +#ifdef USE_SHADOW +#include +#endif +#include +#include +#include +#include +#include +#include +#include + +#include "xmalloc.h" +#include "match.h" +#include "groupaccess.h" +#include "log.h" +#include "sshbuf.h" +#include "misc.h" +#include "servconf.h" +#include "sshkey.h" +#include "hostfile.h" +#include "auth.h" +#include "auth-options.h" +#include "canohost.h" +#include "uidswap.h" +#include "packet.h" +#include "loginrec.h" +#ifdef GSSAPI +#include "ssh-gss.h" +#endif +#include "authfile.h" +#include "monitor_wrap.h" +#include "ssherr.h" +#include "channels.h" +#include "blocklist_client.h" + +/* import */ +extern ServerOptions options; +extern struct include_list includes; +extern struct sshbuf *loginmsg; +extern struct passwd *privsep_pw; +extern struct sshauthopt *auth_opts; + +/* Debugging messages */ +static struct sshbuf *auth_debug; + +/* + * Check if the user is allowed to log in via ssh. If user is listed + * in DenyUsers or one of user's groups is listed in DenyGroups, false + * will be returned. If AllowUsers isn't empty and user isn't listed + * there, or if AllowGroups isn't empty and one of user's groups isn't + * listed there, false will be returned. + * If the user's shell is not executable, false will be returned. + * Otherwise true is returned. + */ +int +allowed_user(struct ssh *ssh, struct passwd * pw) +{ + struct stat st; + const char *hostname = NULL, *ipaddr = NULL; - u_int i; + int r; ++ u_int i; + + /* Shouldn't be called if pw is NULL, but better safe than sorry... */ + if (!pw || !pw->pw_name) + return 0; + + if (!options.use_pam && platform_locked_account(pw)) { + logit("User %.100s not allowed because account is locked", + pw->pw_name); + return 0; + } + + /* + * Deny if shell does not exist or is not executable unless we + * are chrooting. + */ + if (options.chroot_directory == NULL || + strcasecmp(options.chroot_directory, "none") == 0) { + char *shell = xstrdup((pw->pw_shell[0] == '\0') ? + _PATH_BSHELL : pw->pw_shell); /* empty = /bin/sh */ + + if (stat(shell, &st) == -1) { + logit("User %.100s not allowed because shell %.100s " + "does not exist", pw->pw_name, shell); + free(shell); + return 0; + } + if (S_ISREG(st.st_mode) == 0 || + (st.st_mode & (S_IXOTH|S_IXUSR|S_IXGRP)) == 0) { + logit("User %.100s not allowed because shell %.100s " + "is not executable", pw->pw_name, shell); + free(shell); + return 0; + } + free(shell); + } + + if (options.num_deny_users > 0 || options.num_allow_users > 0 || + options.num_deny_groups > 0 || options.num_allow_groups > 0) { + hostname = auth_get_canonical_hostname(ssh, options.use_dns); + ipaddr = ssh_remote_ipaddr(ssh); + } + + /* Return false if user is listed in DenyUsers */ + if (options.num_deny_users > 0) { + for (i = 0; i < options.num_deny_users; i++) { + r = match_user(pw->pw_name, hostname, ipaddr, + options.deny_users[i]); + if (r < 0) { + fatal("Invalid DenyUsers pattern \"%.100s\"", + options.deny_users[i]); + } else if (r != 0) { + logit("User %.100s from %.100s not allowed " + "because listed in DenyUsers", + pw->pw_name, hostname); + return 0; + } + } + } + /* Return false if AllowUsers isn't empty and user isn't listed there */ + if (options.num_allow_users > 0) { + for (i = 0; i < options.num_allow_users; i++) { + r = match_user(pw->pw_name, hostname, ipaddr, + options.allow_users[i]); + if (r < 0) { + fatal("Invalid AllowUsers pattern \"%.100s\"", + options.allow_users[i]); + } else if (r == 1) + break; + } + /* i < options.num_allow_users iff we break for loop */ + if (i >= options.num_allow_users) { + logit("User %.100s from %.100s not allowed because " + "not listed in AllowUsers", pw->pw_name, hostname); + return 0; + } + } + if (options.num_deny_groups > 0 || options.num_allow_groups > 0) { + /* Get the user's group access list (primary and supplementary) */ + if (ga_init(pw->pw_name, pw->pw_gid) == 0) { + logit("User %.100s from %.100s not allowed because " + "not in any group", pw->pw_name, hostname); + return 0; + } + + /* Return false if one of user's groups is listed in DenyGroups */ + if (options.num_deny_groups > 0) + if (ga_match(options.deny_groups, + options.num_deny_groups)) { + ga_free(); + logit("User %.100s from %.100s not allowed " + "because a group is listed in DenyGroups", + pw->pw_name, hostname); + return 0; + } + /* + * Return false if AllowGroups isn't empty and one of user's groups + * isn't listed there + */ + if (options.num_allow_groups > 0) + if (!ga_match(options.allow_groups, + options.num_allow_groups)) { + ga_free(); + logit("User %.100s from %.100s not allowed " + "because none of user's groups are listed " + "in AllowGroups", pw->pw_name, hostname); + return 0; + } + ga_free(); + } + +#ifdef CUSTOM_SYS_AUTH_ALLOWED_USER + if (!sys_auth_allowed_user(pw, loginmsg)) + return 0; +#endif + + /* We found no reason not to let this user try to log on... */ + return 1; +} + +/* + * Formats any key left in authctxt->auth_method_key for inclusion in + * auth_log()'s message. Also includes authxtct->auth_method_info if present. + */ +static char * +format_method_key(Authctxt *authctxt) +{ + const struct sshkey *key = authctxt->auth_method_key; + const char *methinfo = authctxt->auth_method_info; + char *fp, *cafp, *ret = NULL; + + if (key == NULL) + return NULL; + + if (sshkey_is_cert(key)) { + fp = sshkey_fingerprint(key, *** 15259 LINES SKIPPED *** From nobody Thu May 14 21:06: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 4gGjYH0PC3z5X3GN for ; Thu, 14 May 2026 21:06: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 4gGjYG6vt2z3RZX for ; Thu, 14 May 2026 21:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778792771; 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=LOue5QeK3z55OIzs/7q6znxqgmvQPJ3Xvn24nHGA1MY=; b=Tg/xGLjWeBR8wFVXw3E3aXJBLGHglL2DtaADHbiV7dlsMRHMYeGTfoDXLs2CdywgghJ8PD wWKBfllvl/FzzdVJXIlcGJbm+tBamTlaZgAJsyTU6q74+NI+RxJWXikoIC41WDi4OsoJ5d M9GqR9hrD3mFfMJeUSnrF10loGXUpWrDCnwlCwcJmTPzbdfaRcXSConLi0Qt0MGjvaWdFv uPtVHAuoumf2VusI+xHkqu7g+ctFn98Hlqsu2i865/xxOCKCK6/PEVb5wxSJbdB3ysJx2b 2NiLJ5J26lOl5mlQTppMFo+8FnBGkC7BapGQULM9Ba2sHYnAbyjg2c59pPeo8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778792771; a=rsa-sha256; cv=none; b=oq4tS5Sdtqzzf8/U8vKpCjTDISjmurjGxgy5/j+I7Z3BWJlrIL1U30RddYELIwnAUHRqNy TpKSxwy/7EP6I/GMVNDZQl0cgXZSwQfaypD3sMV07Ikl2P5L5ndcA9CpfXsQ9Os/JBc3t2 2CkFNuhHTBfHf6cnu9vTdxf4PObVZEP538et/FJZuvtISUaF2Yx/SQzpNYUJtsCHaxZvXm w5teoVDXhS0H2IVjhMvIDTUc6Z9iiBw0axvZkF0h+t/HvLt0R7J1A1iBy4Zul6GAXwYp4F X4xcpW78X8Qo1BSvRazXpyfcaiz4pLNquLsJWf2MGVJEYFk4S/umB5m+80epDg== 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=1778792771; 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=LOue5QeK3z55OIzs/7q6znxqgmvQPJ3Xvn24nHGA1MY=; b=bfudl3w+oP5UNEu8fEcvgWZbNlAsVvnYbgaiMRIw5+sGAf6RxydiovbaWSpFnN4UT3PxBy u93CF7yV1XUIdfiVIAl3LOq3S6bmB8RUrU3Mv77S04zfQkGPkJYLs/jTEPjQKc9IhwC4UM y6taFx1P48EmoV0sKE69DC8P5+TDIpTY/LL3PmwDkgnA08ZNfIXLzApny//15Qy/sF1BHp xv1L6tfY2ThuiujniaytRZjztvRXKbCwmUjGbRYbu0/5QQT8H/+DzVDi6wcCjshDLAytZI rRUtDOBFKLQjApvCGS0swxAKy7v8vMWPSvMIbuCU9KTtZlikw8XWlEVQfhr7dQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGjYG6C1NztnT for ; Thu, 14 May 2026 21:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b972 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 21:06:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 464a351267dc - main - Cloud releases: Switch to firstboot_pkg_upgrade 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: 464a351267dc0d1843b919dd72ad1c70c24815ce Auto-Submitted: auto-generated Date: Thu, 14 May 2026 21:06:10 +0000 Message-Id: <6a063942.3b972.2845a80a@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=464a351267dc0d1843b919dd72ad1c70c24815ce commit 464a351267dc0d1843b919dd72ad1c70c24815ce Author: Alexander Ziaee AuthorDate: 2026-05-14 21:05:07 +0000 Commit: Alexander Ziaee CommitDate: 2026-05-14 21:05:12 +0000 Cloud releases: Switch to firstboot_pkg_upgrade Cloud images are deployed with base system packages. Introduce a firstboot package auto updater to patch the base system on first boot. MFC after: 1 hour MFC to: stable/15 Reviewed by: cperciva Sponsored by: Google Cloud Differential Revision: https://reviews.freebsd.org/D56890 --- release/tools/azure.conf | 5 +++-- release/tools/ec2-base.conf | 9 ++++++--- release/tools/gce.conf | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 7a4f0b5027cf..9a5c12424bd3 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -6,10 +6,10 @@ export VMSIZE=30g # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="azure-agent python python3 firstboot-freebsd-update firstboot-pkgs" +export VM_EXTRA_PACKAGES="azure-agent python python3 firstboot-pkg-upgrade firstboot-pkgs" # Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST="ntpd sshd waagent firstboot_freebsd_update firstboot_pkgs" +export VM_RC_LIST="ntpd sshd waagent firstboot_pkg_upgrade firstboot_pkgs" # No swap space; waagent will allocate swap space on the resource disk. # See ResourceDisk.EnableSwap and ResourceDisk.SwapSizeMB in waagent.conf @@ -43,6 +43,7 @@ vm_extra_pre_umount() { cat << EOF >> ${DESTDIR}/etc/rc.conf ifconfig_hn0="SYNCDHCP" ntpd_sync_on_start="YES" +firstboot_pkg_upgrade_repos="FreeBSD-base" EOF cat << EOF >> ${DESTDIR}/boot/loader.conf diff --git a/release/tools/ec2-base.conf b/release/tools/ec2-base.conf index ffe2646240a5..24b2feb5f0d7 100644 --- a/release/tools/ec2-base.conf +++ b/release/tools/ec2-base.conf @@ -7,15 +7,15 @@ # * amazon-ssm-agent (not enabled by default, but some users need to use # it on systems not connected to the internet), # * ec2-scripts, which provides a range of EC2ification startup scripts, -# * firstboot-freebsd-update, to install security updates at first boot, +# * firstboot-pkg-upgrade, to install security updates at first boot, # * firstboot-pkgs, to install packages at first boot, and # * isc-dhcp44-client, used for IPv6 network setup. export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} amazon-ssm-agent ec2-scripts \ - firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client" + firstboot-pkg-upgrade firstboot-pkgs isc-dhcp44-client" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} ec2_configinit ec2_ephemeral_swap \ - ec2_fetchkey ec2_loghostkey firstboot_freebsd_update firstboot_pkgs \ + ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade firstboot_pkgs \ growfs sshd" vm_extra_pre_umount() { @@ -24,6 +24,9 @@ vm_extra_pre_umount() { # via EC2 user-data. echo 'firstboot_pkgs_list="devel/py-awscli"' >> ${DESTDIR}/etc/rc.conf + # Limit firstboot_pkg_upgrade to the base system. + echo 'firstboot_pkg_upgrade_repos="FreeBSD-base"' >> ${DESTDIR}/etc/rc.conf + # Any EC2 ephemeral disks seen when the system first boots will # be "new" disks; there is no "previous boot" when they might have # been seen and used already. diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 7298aabf3956..938672ac92e0 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -6,14 +6,14 @@ export VMSIZE=20g # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update \ +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-pkg-upgrade \ firstboot-pkgs google-cloud-sdk panicmail sudo \ sysutils/py-google-compute-engine lang/python \ lang/python3" # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="ntpd sshd growfs \ - firstboot_pkgs firstboot_freebsd_update google_startup \ + firstboot_pkgs firstboot_pkg_upgrade google_startup \ google_accounts_daemon google_clock_skew_daemon \ google_instance_setup google_network_daemon" @@ -47,6 +47,7 @@ ifconfig_DEFAULT="SYNCDHCP mtu 1460" ntpd_sync_on_start="YES" # need to fill in something here #firstboot_pkgs_list="" +firstboot_pkg_upgrade_repos="FreeBSD-base" panicmail_autosubmit="YES" EOF From nobody Thu May 14 21:59: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 4gGkl83GXsz5vt53 for ; Thu, 14 May 2026 21:59:48 +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 4gGkl82QgTz3WRN for ; Thu, 14 May 2026 21:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778795988; 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=3sFrKT+NmZsZqr601HMUze46ZOzdjnPRhFmaH+ogAck=; b=HZAF22T7QRLYc8/SHkWHy36SGuA2RXn7HrO7ShjR+RYpnzJwR538bN+g8BT6qyKSxfzFIv 5MyF6MNJ1ttIncckNagMjLadVjQY4Q4m2N5B/YqZBq73+GouZEXNwaaAx1dpWCtlDskHFE nrtWSqHp81dtN9z9E6pnucmbmYMVIQT5OKTIpWxtktk0kPXU6C51NFqNLSjGT9ADc27Jiu oiSFLnycjnZrbWCeviuXXTkAnq2OrNjezWIUxBkwawVPDZHkUYytMCM9GgHpc9YtoeaYsR 72R/+7QyoSEZuthxdNQSJYHQ2iObfXjBIb+EjnBVJ/lkJbviOQ7jhntUkMDYRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778795988; a=rsa-sha256; cv=none; b=o1pqPsHdVqnAghKHpCf1MwFFHOXjI33SADrJtYdfoO77AyM66lWGNDFMAN0lEOKZTGqVMt y6L+5d5Ea7K++Z9Fp/gVf/Qu8HZV6OQp3T0wKoGAKbgsPf2Ayo1bE5VSI6B7CCIhSV9DVR u3W3jmQGm1q2b/nNGeM6RqK6LR0DeUNUwi7GajLDuXSv7TrTRvGueNt/IY2WEC65/2nanq nlEffNayE0v303Tlrx09tNF6oZDxcMBbpU/SK5UYCL5YfymdjphUSngAF6NUj2fxamGSO5 GFtlSxf82UM5VbmzIIPDH/tb+eMt6kNf6ASzhy3+q9JoPNWXqmFG7y2DkE8FkA== 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=1778795988; 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=3sFrKT+NmZsZqr601HMUze46ZOzdjnPRhFmaH+ogAck=; b=j9xjMfCX8frifSpoqYZxGWt2YsO9GvpKySKIPtdjVsjuupfKnCUSPwxRWXJnpgpWU6NKgS m53tWz7EgPJdMcXaBQVelNKSFpI7qzHqU7OtEMXoIrFkh916wYSRJJvTKpQkmvGsnOAY+2 oy+ET1EdmCMEyJG9BZ8jjq44Hms+knqyRsXywN5uqm2xiQvqtY4AIqeGxuC9pg3VacJI0N X0Xm46eRoknqfMdt8Y9oOb0XYXAzkVp0n3tFWaGkDuYu7b/WUnHBxXbz3KeGmhDZUuH7Mt bKv0CwspF+2kto05kagN0wm49KflvJ1jEiOuYxE07x1riXwWXhMMdAXUw7aAAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGkl81jDlzvsj for ; Thu, 14 May 2026 21:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f4d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 21:59:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 4080419d9a2d - main - Cloud releases: More firstboot_pkg_upgrade 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: 4080419d9a2d88d44d20baaf3ea01934561819c1 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 21:59:48 +0000 Message-Id: <6a0645d4.3f4d6.29c3838d@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4080419d9a2d88d44d20baaf3ea01934561819c1 commit 4080419d9a2d88d44d20baaf3ea01934561819c1 Author: Colin Percival AuthorDate: 2026-05-14 21:14:09 +0000 Commit: Colin Percival CommitDate: 2026-05-14 21:59:11 +0000 Cloud releases: More firstboot_pkg_upgrade Update a couple more cloudware images which I forgot about earlier. Reviewed by: ziaee Fixes: 464a351267dc ("Cloud releases: Switch to firstboot_pkg_upgrade") Differential Revision: https://reviews.freebsd.org/D57006 --- release/tools/basic-cloudinit.conf | 7 ++++--- release/tools/ec2-small.conf | 9 ++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/release/tools/basic-cloudinit.conf b/release/tools/basic-cloudinit.conf index 98e11f0bb08b..621165ea1669 100644 --- a/release/tools/basic-cloudinit.conf +++ b/release/tools/basic-cloudinit.conf @@ -8,16 +8,17 @@ export CONFIG_DRIVE=YES export CONFIG_DRIVE_SIZE=1M # Packages to install into the image we're creating. -# * firstboot-freebsd-update, to install security updates at first boot. -export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update" +# * firstboot-pkg-upgrade, to install security updates at first boot. +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-pkg-upgrade" # Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST="${VM_RC_LIST} firstboot_freebsd_update growfs sshd nuageinit" +export VM_RC_LIST="${VM_RC_LIST} firstboot_pkg_upgrade growfs sshd nuageinit" vm_extra_pre_umount() { cat << EOF >> ${DESTDIR}/etc/rc.conf dumpdev="AUTO" ifconfig_DEFAULT="SYNCDHCP accept_rtadv" +firstboot_pkg_upgrade_repos="FreeBSD-base" # RSA host keys are obsolete and also very slow to generate sshd_rsa_enable="NO" EOF diff --git a/release/tools/ec2-small.conf b/release/tools/ec2-small.conf index 6564a59c2cf6..f5904d5ea4ba 100644 --- a/release/tools/ec2-small.conf +++ b/release/tools/ec2-small.conf @@ -25,18 +25,21 @@ vm_extra_filter_base_packages() { # Packages to install into the image we're creating. In addition to packages # present on all EC2 AMIs, we install: # * ec2-scripts, which provides a range of EC2ification startup scripts, -# * firstboot-freebsd-update, to install security updates at first boot, +# * firstboot-pkg-upgrade, to install security updates at first boot, # * firstboot-pkgs, to install packages at first boot, and # * isc-dhcp44-client, used for IPv6 network setup. export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ec2-scripts \ - firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client" + firstboot-pkg-upgrade firstboot-pkgs isc-dhcp44-client" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} ec2_configinit ec2_ephemeral_swap \ - ec2_fetchkey ec2_loghostkey firstboot_freebsd_update firstboot_pkgs \ + ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade firstboot_pkgs \ growfs sshd" vm_extra_pre_umount() { + # Limit firstboot_pkg_upgrade to the base system. + echo 'firstboot_pkg_upgrade_repos="FreeBSD-base"' >> ${DESTDIR}/etc/rc.conf + # Any EC2 ephemeral disks seen when the system first boots will # be "new" disks; there is no "previous boot" when they might have # been seen and used already. From nobody Thu May 14 22:19: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 4gGl9z5N0Cz5vvSZ for ; Thu, 14 May 2026 22:19: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 4gGl9z4Yllz3YXs for ; Thu, 14 May 2026 22:19:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778797175; 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=Z158jur/VXZn1BbIc1S/f9oChT6EqNTCcvTOw1VFon0=; b=V9H4SpTEek1N67WN+/yLmtYX+OzVpkHbrcK4D/X5CtW6BEHcc3OM5QfQy5iKTV9YI/cS/T vz/dB5qiUhS6livR+q53FObOY7irVLQ4AyAKC/obxh+CyB05hi9iHF4q6QZdJt1+3la75k fMgknbERB3rxje6KQnOTvhsZPe6HVgNF9eqgAvns11VK7DsRAoDEe/acekiscBv4lnSHPW M2R8jkiVB+31+s/QqfRbjqSixLQKyfolrOaKZPlyjXJLz9iASvECI2cVFFeq6ZzayWfbxX v+l44Lb+2HUHEeXPpQdAwt9yZu7GoCee5x0B+1vIDVztjNsfwhwkMAeipDennA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778797175; a=rsa-sha256; cv=none; b=QKT6a2NPqO3wtUoVCHfMAgRf3fmP2/S7cOqtu9lceimLbFCJkvJevaSFnKL0uLRC/7vPhx bqxadvR44v/jObAYnhk66lkBZapHKYQ+tifHmp9kPZX6AZ/QrYfeQcGX6U4vYzTabzFrme kD03BTayzPFH6Ncph/pIWjFIqJWPQOOexHkBtGe9fvmCQNTS+Gg3uoXCMw2JRX/0+mYYgl SksQ4NxdqzQaaMOehAeCO+mEgPSRsf1yHXqkRo2m4eTrKkylJUpJYhwhfp7IP+sCShRkmr qwARHDwWBxKhSSDQ7vo2LVELHn9bzVE0xMzWjZ7ogF9qEG1x2qZrEhpX4eoQlg== 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=1778797175; 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=Z158jur/VXZn1BbIc1S/f9oChT6EqNTCcvTOw1VFon0=; b=wd/zvM3M2QF5Vc58IK1Ddb+sIiTFnpMLU/HQr0ZyOgfXHD6jP492KEQTcR4B+xXFB0tRd0 xuiK1m/8lYgXqbSYJ57ymm+FdnBd9LsA4wAW5ShtP+mFeJoVNIKOW8Oas6of7JZ47a5j/w npgvEmnIxMZjGyPcKMkVAEkv94WunzwFTzrtNDFUpK7sPKzlaaGPuyPStcIlrpxSua/Hqu ml+WK60QNw0S70va67yzs8Thu9c+6zoamMsHMh7+Gip5PFap3/TfxKkOdRGB1imHXKrZ/1 v5Jto/QY/1jkgNfxq+KmLS3Nxe0tVzXd5Giqm6Lh6RVmh0qwx78nnf1Jun6uhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGl9z3d73zwYJ for ; Thu, 14 May 2026 22:19:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 422a5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 22:19:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 13d3bd165e22 - main - subr_uio.c: Remove a KASSERT() for large NFS server I/O 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: 13d3bd165e225eec9af91b6e3361c2482931f95b Auto-Submitted: auto-generated Date: Thu, 14 May 2026 22:19:35 +0000 Message-Id: <6a064a77.422a5.5d3744f6@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=13d3bd165e225eec9af91b6e3361c2482931f95b commit 13d3bd165e225eec9af91b6e3361c2482931f95b Author: Rick Macklem AuthorDate: 2026-05-14 22:17:55 +0000 Commit: Rick Macklem CommitDate: 2026-05-14 22:17:55 +0000 subr_uio.c: Remove a KASSERT() for large NFS server I/O When the NFS server is set to allow an I/O size greater than 1Mbyte (not allowed in FreeBSD's main yet), a KASSERT() in allocuio() can fail when: zfs_freebsd_write()->zfs_write()->zfs_uiocopy() ->cloneuio()->allocuio() is called for a large NFS server write. Since the userland API callers to allocuio() already check that the size does not exceed UIO_MAXIOV, there does not seem to be a need to a KASSERT() here. Removing the KASSERT() allows NFS server writes of greater than 1Mbyte to work, once the NFS code is patched to allow them. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D57005 --- sys/kern/subr_uio.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/kern/subr_uio.c b/sys/kern/subr_uio.c index 6ac932fb6690..fa5865fbe938 100644 --- a/sys/kern/subr_uio.c +++ b/sys/kern/subr_uio.c @@ -441,8 +441,6 @@ allocuio(u_int iovcnt) struct uio *uio; int iovlen; - KASSERT(iovcnt <= UIO_MAXIOV, - ("Requested %u iovecs exceed UIO_MAXIOV", iovcnt)); iovlen = iovcnt * sizeof(struct iovec); uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK); uio->uio_iov = (struct iovec *)(uio + 1); From nobody Thu May 14 22:35: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 4gGlWn2jcjz5vwdh for ; Thu, 14 May 2026 22:35: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 4gGlWn24xKz3cq4 for ; Thu, 14 May 2026 22:35:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778798101; 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=0LwtV8TrJ+wo9Ee5e/sNrUw3W5+b0Mlhea+gXrRlfpo=; b=bw+r1lMey/f8IcEGWyviKfh2UofxLCrf5UfVZMb50XrcwGpHud7sKQqRsvlT5kxwwFQvj4 bRx8u9UauvZqbPXxjfBLN+hUWRRrLOxEhQY7k1yBCLI8PHcdRvhxcanc7wJYxqlg6NBVlV YCnP0V02b4X2hcdPLwQ12C1uBNO2p/LSYIDSLbnaMTacYgoha50c2Mva0+kQ0M4jKxROC+ FJhe+4Jr/yU2iaCNFNJGbGZOz/wW1o1uVefnn0hiBoPgNQFersz63yB4dfF9s38ti1Dptu GqZeCIcH6rEnp/CstQeamCp2Fy1BH9aj3XE66uDlM7dT87bpb1WfrJACsTJtcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778798101; a=rsa-sha256; cv=none; b=fFuj6uubnirAOLRNIMoqgIhpwMAOXlmae5IjV1192er8F8PFsiKS4KnlPYzPW+OC/NwwkC A1YklBGjeF2cYrGX4FbECH4WfkIoVHf/FT+7klWw2abiMAHqbYlhvMDcc/yn264XVXEiTG KZ7Zri3LRuiZVJ9u2VbO+yW/2bg9qaYsgaHUftw9FdmgpT0NQ06HQ4Qh4RdSBRDeGlmI5O A+U69QSOr3Cs6c/bg3bAWfb0u2CS+LcrEP4IIODStyMpckmFmudPRmm/EnM/cTguYHCIBb mC7yagejZIHGXO+lswOYdLt5bEVwv/1KJgxI2qftkHyHTkzi6n+Jx8eU8z8Pmw== 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=1778798101; 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=0LwtV8TrJ+wo9Ee5e/sNrUw3W5+b0Mlhea+gXrRlfpo=; b=EM6WS5jHiYeAXVwbbM+lIlyBl8vurByK41DCbNAze1x0gZd6kpS81Pv7fb2jdceuj381rD GTfEsRtWRDnLeUnWr97Xl7sOhZyKhzEpFVT+oGW4mMPffNpr2Nx0TCES8Bw3FxOVZ4UvCN 6CCO5UADe9rF7tuU6l/ntyKlRzWl2g4A4J0AbPIKDS003RS521qx0XTx3udESIRvLU+7Y9 AKW07xAKbY21kMUMvh78WiG5ZxbMxlR5BcpJYoxs6cNhFllKQoqcuIi2DFnGZZ4LGUafk9 vwS2D5s9RbYfNPN656BGdngSOk1H73C31XTNw2qHszqOQnBkRyB8NhP8Mee+IQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGlWn1039zwLG for ; Thu, 14 May 2026 22:35:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44875 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 22:35:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: b92b9da33006 - main - nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes 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: b92b9da3300655c86dcd42ea8a5ba45badd90847 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 22:35:01 +0000 Message-Id: <6a064e15.44875.4253434b@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b92b9da3300655c86dcd42ea8a5ba45badd90847 commit b92b9da3300655c86dcd42ea8a5ba45badd90847 Author: Rick Macklem AuthorDate: 2026-05-14 22:33:23 +0000 Commit: Rick Macklem CommitDate: 2026-05-14 22:33:23 +0000 nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes Without this patch, the maximum setting for vfs.nfsd.srvmaxio was 1Mbyte. This patch increases that to 4Mbytes. The same as for any setting above 128Kbytes, settings up to 4Mbytes require that kern.ipc.maxsockbuf be increased. (A message generated after setting vfs.nfsd.srvmaxio via the /etc/rc.conf variable nfs_server_maxio will indicate the minimum setting, which will be somewhat greater than four times the setting of vfs.nfsd.srvmaxio.) Requested by: Cedric Blancher MFC after: 2 weeks Fixes: 13d3bd165e22 ("subr_uio.c: Remove a KASSERT() for large NFS server I/O") --- sys/fs/nfs/nfsproto.h | 3 +++ sys/fs/nfsserver/nfs_nfsdport.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h index 6e67c5be3416..1054c85d8e8f 100644 --- a/sys/fs/nfs/nfsproto.h +++ b/sys/fs/nfs/nfsproto.h @@ -89,8 +89,11 @@ * It used to be called NFS_MAXDATA, but has been renamed to clarify that * it refers to server side only and doesn't conflict with the NFS_MAXDATA * defined in rpcsvc/nfs_prot.h for userland. + * NFS_SRVMAXIO is the default setting for vfs.nfsd.srvmaxio + * NFS_SRVLIMITIO is the maximum setting allowed for vfs.nfsd.srvmaxio */ #define NFS_SRVMAXIO (128 * 1024) +#define NFS_SRVLIMITIO (4 * 1024 * 1024) /* Stat numbers for rpc returns (version 2, 3 and 4) */ /* diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index e42d5ca1e0a3..1e6936ed351c 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -241,8 +241,9 @@ sysctl_srvmaxio(SYSCTL_HANDLER_ARGS) printf("nfsd: vfs.nfsd.srvmaxio can only be increased\n"); return (EINVAL); } - if (newsrvmaxio > 1048576) { - printf("nfsd: vfs.nfsd.srvmaxio cannot be > 1Mbyte\n"); + if (newsrvmaxio > NFS_SRVLIMITIO) { + printf("nfsd: vfs.nfsd.srvmaxio cannot be > %d\n", + NFS_SRVLIMITIO); return (EINVAL); } if ((newsrvmaxio & (newsrvmaxio - 1)) != 0) { From nobody Thu May 14 23:06: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 4gGmDg2QvSz5w0Y6 for ; Thu, 14 May 2026 23:06: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 4gGmDg1gDqz3jPV for ; Thu, 14 May 2026 23:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778800019; 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=YwtsxHU074/RVroGOJcUe/gadotTGvs/4jPz02QMmGg=; b=R3ztcMLOzA+Ez21aJqPDF/h5vYTjo+vA4vhmb0cYzHGpQEJ3mICaV2cUQUyxDVZGJQXtH3 6XBk1+VyzV3NDl2BcUSBzULJdJWfmOYSz0m0RBZUW9zF4+Ucsv8Bdsp5KxSgu30McWVSg+ mEw3XVw9yb/60jBz+4bo3b3OXR4+9Ymh4qfxH0iO00wti93g7ckCy8dPuymDNPy+E1FCe1 xl3halCe/82gJXSVLM7GsYztiB8JNoIsQIUJJ+JTXVo87bNWmHCjeM5iRBk/vh5qIZgCTU ZXUwAB5wVvnVf1FFnE9ttTEceMmtHh61TJOe0qsGYVMrl4l/TfUnYcuURbJ2EA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778800019; a=rsa-sha256; cv=none; b=YZLjD4+BhzzEDtxy4Rq187ndM2vaK4pZkyOq8SvocLk9wUAb0Y+knK65LHxs5EhiPHQjGF W628SwfNFYihNJ44/4zyjG89Ki+tcXcFxanQQcEvrdzEqqKLyE2Fn4lau4S6PtMtCN+2gY UCc3c6/VVMsEEjoKRAsJjJ1dJVY0jfCJBAwLcG8RA/LmL7soBU7xvJHyC4UNVxwrKecmRB 3Yh6P/1VLUNeznFhKeIQgD60+SQZnRsbmFEEksKDeJdA+ku7OJPkZhcQj3DsnDH2hNftBZ /tXbc6Cnu1GMWjVvY14TXxyzHjVU6KWh6VrPeqla68o9uOfuPU1ydkF1ZrtqfA== 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=1778800019; 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=YwtsxHU074/RVroGOJcUe/gadotTGvs/4jPz02QMmGg=; b=grzvXyuN1dXpTE2k3gQgn1BWgSfOY4E+qrZLhIM7Ygd+qhbsi1T0dD8pE9ppTNVWmimjfU EiK0VLLMSX3vPMGn93lXVycDsyG/UiZA5NkmPP4ovgtgn5nBkoFFTLI0gxruySE1l6QN6u Cewse0f8wGavcJfFci+au7E3vRG9b8VWjtQqD+61+fxTfKu4/9GwD/ZIwa5NVwzAoOfjhM FalMK+Oue46Nj/guEV2CXrZvVmHbyX7VrYKu/HbdoHw3tJjDH30jTqqKNUKBgM9NKhYh+y 1MErtlIM0K5r1GhVYP0ZU9U+hqOZVigVovb4FTN0ewJkzLAt2bgTICIfa578Dg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGmDg0zXxzxqf for ; Thu, 14 May 2026 23:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4662f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 23:06:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 074c42ade353 - main - RELNOTES: Add an entry for commit b92b9da33006 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: 074c42ade353caedca05e3234c3cb20f28bf5231 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 23:06:59 +0000 Message-Id: <6a065593.4662f.4707b2c3@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=074c42ade353caedca05e3234c3cb20f28bf5231 commit 074c42ade353caedca05e3234c3cb20f28bf5231 Author: Rick Macklem AuthorDate: 2026-05-14 23:04:26 +0000 Commit: Rick Macklem CommitDate: 2026-05-14 23:04:26 +0000 RELNOTES: Add an entry for commit b92b9da33006 --- RELNOTES | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RELNOTES b/RELNOTES index d8c64f989830..0a25313d3f77 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,11 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +b92b9da33006, 13d3bd165e22: + This patch allows vfs.nfsd.srvmaxio to be set to + a value as high as 4Mbytes. It is usually set + via the nfs_server_maxio variable in /etc/rc.conf. + 4c486fe40267: The multicast routing modules, ip_mroute and ip6_mroute, are now FIB-aware. That is, there is a multicast routing table per FIB, rather than a global From nobody Fri May 15 01:06: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 4gGptW5NNcz6cTj3; Fri, 15 May 2026 01:06:27 +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 4gGptW1p0zz423X; Fri, 15 May 2026 01:06:27 +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 64F16COe031860; Fri, 15 May 2026 04:06:15 +0300 (EEST) (envelope-from kib@freebsd.org) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 64F16COe031860 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 64F16CRc031859; Fri, 15 May 2026 04:06:12 +0300 (EEST) (envelope-from kib@freebsd.org) X-Authentication-Warning: tom.home: kostik set sender to kib@freebsd.org using -f Date: Fri, 15 May 2026 04:06:12 +0300 From: Konstantin Belousov To: John Baldwin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 8766e2122ac0 - main - mandoc: Updating FreeBSD thead library descriptions Message-ID: References: <6a04a811.3be57.aea6532@gitrepo.freebsd.org> <501769a6-e12b-428d-9dd3-c6764083e578@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: <501769a6-e12b-428d-9dd3-c6764083e578@FreeBSD.org> 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: 4gGptW1p0zz423X X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On Thu, May 14, 2026 at 02:56:38PM -0400, John Baldwin wrote: > On 5/13/26 22:47, Konstantin Belousov wrote: > > On Wed, May 13, 2026 at 04:34:25PM +0000, John Baldwin wrote: > > > The branch main has been updated by jhb: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=8766e2122ac02ff4d86c254d8ef1c41d4a7f76a0 > > > > > > commit 8766e2122ac02ff4d86c254d8ef1c41d4a7f76a0 > > > Author: John Baldwin > > > AuthorDate: 2026-05-13 16:33:29 +0000 > > > Commit: John Baldwin > > > CommitDate: 2026-05-13 16:33:29 +0000 > > > > > > mandoc: Updating FreeBSD thead library descriptions > > > Remove libkse as it has been obsolete for many years and drop 1:1 from > > > description of libthr. > > > Reviewed by: brooks > > > Sponsored by: AFRL, DARPA > > > Differential Revision: https://reviews.freebsd.org/D56850 > > > --- > > > contrib/mandoc/lib.in | 3 +-- > > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > > > diff --git a/contrib/mandoc/lib.in b/contrib/mandoc/lib.in > > > index dcea23cf81ea..04d86f9add1e 100644 > > > --- a/contrib/mandoc/lib.in > > > +++ b/contrib/mandoc/lib.in > > > @@ -74,7 +74,6 @@ LINE("libisns", "Internet Storage Name Service Library (libisns, \\-lisns)") > > > LINE("libjail", "Jail Library (libjail, \\-ljail)") > > > LINE("libkcore", "Kernel Memory Core Access Library (libkcore, \\-lkcore)") > > > LINE("libkiconv", "Kernel-side iconv Library (libkiconv, \\-lkiconv)") > > > -LINE("libkse", "N:M Threading Library (libkse, \\-lkse)") > > > LINE("libkvm", "Kernel Data Access Library (libkvm, \\-lkvm)") > > > LINE("libm", "Math Library (libm, \\-lm)") > > > LINE("libm68k", "m68k Architecture Library (libm68k, \\-lm68k)") > > > @@ -126,7 +125,7 @@ LINE("libtacplus", "TACACS+ Client Library (libtacplus, \\-ltacplus)") > > > LINE("libtcplay", "TrueCrypt-compatible API library (libtcplay, \\-ltcplay)") > > > LINE("libtermcap", "Termcap Access Library (libtermcap, \\-ltermcap)") > > > LINE("libterminfo", "Terminal Information Library (libterminfo, \\-lterminfo)") > > > -LINE("libthr", "1:1 Threading Library (libthr, \\-lthr)") > > > +LINE("libthr", "Threading Library (libthr, \\-lthr)") > > Arguably the suggested linker argument should be -lpthread instead. > > I think there is a "libpthread" entry already and we could just use > that in our manpages going forward instead of .Lb libthr which would > have that effect. Actually, .Lib libthr is only used in a few places, > and several of those could either be removed (e.g. the IMPLEMENTATION > NOTES section in pthread(3) can probably just be removed, it was more > relevant when there were multiple libraries) or updated (_umtx_op.2 > can just reference libpthread instead of libthr). We do have libthr(3), and it should not be dropped. The reference from pthread(3) to libthr(3) in its current form IMO makes sense. What I mean is only to stop suggesting in any way to link against libthr.so, instead of libpthread.so. I do not envision that we ever would bump libthr major version number, but libpthread.so might become linker script instead of the symlink. > > It's not clear to me if there is true value in renaming the real > library, though if we ever bump the major version for libthr we should > probably use the opportunity to install it as libpthread for real. > Given it uses symbol versioning it seems unlikely we will ever do that > though. If we really cared we could rename it for 16 I guess. The > compat15 package would just need to contain libthr.so.3. I am only about man pages. From nobody Fri May 15 01:10: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 4gGpz76GMdz6cW2p for ; Fri, 15 May 2026 01:10:27 +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 4gGpz75Ybjz42N3 for ; Fri, 15 May 2026 01:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778807427; 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=hQf8y5Om6uVWQfhltnplLZmrhhBQFxBaZXFiqmgo05s=; b=d2TDfGG1fNF9b6wqlFjoIYkjr+/U9GsGc+2K74nOReRicbM6XZspaKQXFOIdHqenOCJ+3f +B3Vx41OC6vIR/vv7jQifnOGQIwSoMQ1uVnWvTvJWF21PRHFEVo3coKhbjt6oCqQPpvjnJ M4LD4e1AChpfIPDRu+0UTNzgPBFFzp2EIA3PhKwgr2La8iYwF1LPNT3iVJjNzvzqsGiWy+ mVU07zFEAHhibckNsC3okNXGSyHBlF28hMNj67cgkZzhGHhLO6dEZHYEiqNEprG7yCWWDH 5Fp22HY6NhTuiqBaebpbZ+zxDc3X+Q/O3OWI+EBLKsfUItG0IO3y3Iq4ckHtwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778807427; a=rsa-sha256; cv=none; b=SJ1LIwDF5dTCHtr6gNu+zbMNyodmz0G6TgIBs795eTHcnhPaR0yApyYrghGr0y7fr8LwEt 9D0tGsANwCZl6g1rHZqmr0M/5VWA5z/nEFOo8OZlyhyCrPa4uJ8mEOwYyYGYdmLP+rI6I4 AVysRvGPn/gW3Pp1ErwtMckj7LJ4VQncWP4j49UBG/r5tJY9XUVUhJObjvw1YBqOaEce5f 8k5S/87zFLmqns10DPgQIweinn/38Es8hNcHeR2x0t6MnTZZVphejlg4QGYWOBXr6kyHEN MYmgFJXRAeHVhJkjhwm2J0FUs1kuiBuiBmYdtpBH+/oxkB7YwNwVu0TK2BXVpg== 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=1778807427; 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=hQf8y5Om6uVWQfhltnplLZmrhhBQFxBaZXFiqmgo05s=; b=SubP7L7ETpUKaqP6mAJcb5Llm5cPP8Mvuw7A7x9It1zr+WUoNQEXuHy8VXFVWqlb4vZjFJ nBlwJVxfaZlv5ItdGANGA3SkaH1cdNVW7Y/5jDaHNR12n29Rft08fkCVL6eyrHgsBB+PET 4qg7xb5WnjLCNRFnA7/xEpnQx36vzjyZixdHbbaZ1As7NuKgv9HkZNtVSShhnHYe6gq8Ib tZZxyGURCDIJOngZn92G6iXVTvc8Qdm8WhYRCkqVFd3rN4Ltznj6RhOUmbJu1aoaL0d0zB Pn0zH5/74TQK3nV19FjkE5xagNV8n4e4m0Xx7AQJKG+YPgQ7hUL5pGSUo1E2rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGpz74s6yz11tS for ; Fri, 15 May 2026 01:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22cf0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 01:10:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b99954433d42 - main - linux: Fix some problems with header pollution 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: b99954433d42d978b257e846dbfe568e9af7b140 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 01:10:27 +0000 Message-Id: <6a067283.22cf0.6eb8afc4@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b99954433d42d978b257e846dbfe568e9af7b140 commit b99954433d42d978b257e846dbfe568e9af7b140 Author: Mark Johnston AuthorDate: 2026-05-15 00:39:25 +0000 Commit: Mark Johnston CommitDate: 2026-05-15 00:39:25 +0000 linux: Fix some problems with header pollution - Avoid including sys/proc.h in linux_vdso_gtod.c. It's not needed, but the implicit inclusion of sys/param.h via sys/ucred.h->bsm/audit.h was bringing in some required definitions. - Include a couple of required headers: sys/time.h (for struct bintime), and limits.h (for INT_MAX). - Move some helpers from linux.h, which depend on sys/param.h for NODEV, to the one CU where they're actually used. No functional change intended. Reviewed by: imp, kib, emaste MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56982 --- sys/amd64/linux/linux_vdso_gtod.c | 4 ++- sys/amd64/linux32/linux32_vdso_gtod.c | 4 ++- sys/arm64/linux/linux_vdso_gtod.c | 4 ++- sys/compat/linux/linux.h | 50 ----------------------------------- sys/compat/linux/linux_stats.c | 46 ++++++++++++++++++++++++++++++++ sys/i386/linux/linux_vdso_gtod.c | 4 ++- 6 files changed, 58 insertions(+), 54 deletions(-) diff --git a/sys/amd64/linux/linux_vdso_gtod.c b/sys/amd64/linux/linux_vdso_gtod.c index abe42d51a3ac..12c5c96dcead 100644 --- a/sys/amd64/linux/linux_vdso_gtod.c +++ b/sys/amd64/linux/linux_vdso_gtod.c @@ -27,12 +27,14 @@ #include #include -#include #include #include +#include #define _KERNEL #include #undef _KERNEL + +#include #include #include diff --git a/sys/amd64/linux32/linux32_vdso_gtod.c b/sys/amd64/linux32/linux32_vdso_gtod.c index f32db30057d0..ff4b372ea3bc 100644 --- a/sys/amd64/linux32/linux32_vdso_gtod.c +++ b/sys/amd64/linux32/linux32_vdso_gtod.c @@ -27,12 +27,14 @@ #include #include -#include #include #include +#include #define _KERNEL #include #undef _KERNEL + +#include #include #include diff --git a/sys/arm64/linux/linux_vdso_gtod.c b/sys/arm64/linux/linux_vdso_gtod.c index 203c76b6e3a9..55f039b74593 100644 --- a/sys/arm64/linux/linux_vdso_gtod.c +++ b/sys/arm64/linux/linux_vdso_gtod.c @@ -28,12 +28,14 @@ #include #include -#include #include #include +#include #define _KERNEL #include #undef _KERNEL + +#include #include #include diff --git a/sys/compat/linux/linux.h b/sys/compat/linux/linux.h index 67acd726a503..a9f753cd55b7 100644 --- a/sys/compat/linux/linux.h +++ b/sys/compat/linux/linux.h @@ -28,58 +28,8 @@ #ifndef _LINUX_MI_H_ #define _LINUX_MI_H_ -/* - * Machine independent set of types for the Linux types. - */ typedef uint32_t l_dev_t; -/* - * Linux dev_t conversion routines. - * - * As of version 2.6.0 of the Linux kernel, dev_t is a 32-bit quantity - * with 12 bits set asaid for the major number and 20 for the minor number. - * The in-kernel dev_t encoded as MMMmmmmm, where M is a hex digit of the - * major number and m is a hex digit of the minor number. - * The user-space dev_t encoded as mmmM MMmm, where M and m is the major - * and minor numbers accordingly. This is downward compatible with legacy - * systems where dev_t is 16 bits wide, encoded as MMmm. - * In glibc dev_t is a 64-bit quantity, with 32-bit major and minor numbers, - * encoded as MMMM Mmmm mmmM MMmm. This is downward compatible with the Linux - * kernel and with legacy systems where dev_t is 16 bits wide. - * - * In the FreeBSD dev_t is a 64-bit quantity. The major and minor numbers - * are encoded as MMMmmmMm, therefore conversion of the device numbers between - * Linux user-space and FreeBSD kernel required. - */ -static __inline l_dev_t -linux_encode_dev(int _major, int _minor) -{ - - return ((_minor & 0xff) | ((_major & 0xfff) << 8) | - (((_minor & ~0xff) << 12) & 0xfff00000)); -} - -static __inline l_dev_t -linux_new_encode_dev(dev_t _dev) -{ - - return (_dev == NODEV ? 0 : linux_encode_dev(major(_dev), minor(_dev))); -} - -static __inline int -linux_encode_major(dev_t _dev) -{ - - return (_dev == NODEV ? 0 : major(_dev) & 0xfff); -} - -static __inline int -linux_encode_minor(dev_t _dev) -{ - - return (_dev == NODEV ? 0 : minor(_dev) & 0xfffff); -} - static __inline int linux_decode_major(l_dev_t _dev) { diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index 6f96a219003b..5ac9394f3601 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -58,6 +58,52 @@ #include #include +/* + * Linux dev_t conversion routines. + * + * As of version 2.6.0 of the Linux kernel, dev_t is a 32-bit quantity + * with 12 bits set asaid for the major number and 20 for the minor number. + * The in-kernel dev_t encoded as MMMmmmmm, where M is a hex digit of the + * major number and m is a hex digit of the minor number. + * The user-space dev_t encoded as mmmM MMmm, where M and m is the major + * and minor numbers accordingly. This is downward compatible with legacy + * systems where dev_t is 16 bits wide, encoded as MMmm. + * In glibc dev_t is a 64-bit quantity, with 32-bit major and minor numbers, + * encoded as MMMM Mmmm mmmM MMmm. This is downward compatible with the Linux + * kernel and with legacy systems where dev_t is 16 bits wide. + * + * In the FreeBSD dev_t is a 64-bit quantity. The major and minor numbers + * are encoded as MMMmmmMm, therefore conversion of the device numbers between + * Linux user-space and FreeBSD kernel required. + */ +static l_dev_t +linux_encode_dev(int _major, int _minor) +{ + + return ((_minor & 0xff) | ((_major & 0xfff) << 8) | + (((_minor & ~0xff) << 12) & 0xfff00000)); +} + +static l_dev_t +linux_new_encode_dev(dev_t _dev) +{ + + return (_dev == NODEV ? 0 : linux_encode_dev(major(_dev), minor(_dev))); +} + +static int +linux_encode_major(dev_t _dev) +{ + + return (_dev == NODEV ? 0 : major(_dev) & 0xfff); +} + +static int +linux_encode_minor(dev_t _dev) +{ + + return (_dev == NODEV ? 0 : minor(_dev) & 0xfffff); +} static int linux_kern_fstat(struct thread *td, int fd, struct stat *sbp) diff --git a/sys/i386/linux/linux_vdso_gtod.c b/sys/i386/linux/linux_vdso_gtod.c index 00367d82139e..336f8d4c290d 100644 --- a/sys/i386/linux/linux_vdso_gtod.c +++ b/sys/i386/linux/linux_vdso_gtod.c @@ -27,12 +27,14 @@ #include #include -#include #include #include +#include #define _KERNEL #include #undef _KERNEL + +#include #include #include From nobody Fri May 15 09:57: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 4gH2gB5cZwz6cXPT for ; Fri, 15 May 2026 09:57: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 4gH2gB5862z3dmq for ; Fri, 15 May 2026 09:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778839046; 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=4qjfctbEJ9F9u2yA3d7C91ZfCZBa3IEApSo8ZUNF87c=; b=aOCmr3ApGH8q7fVTyzUJbOjK46VgevQONHzR3gXNSkr5bscBjihzOLR++d549nvFPxO5LG 3TNrJDFcNZMKxGa5lDjsCCic21BRPLDWd10mHWxVxVLXoKeSdmi1Tm2Fe1LBjb+Fyc6mnS E2Xl1eBYL5mhHMCORqjoXimzawA+NL9rRUWpKc7lXwtYcRWek9JpsSgEU4NJPU4d7AaWVk H7MmCTi3+XQQW9buyz7eZvfOVHBhZuLGqPwyBQAjKd0ml8CzqHVSJHMky22mBxn+5HnsGo /B0i1djaV0EoEWtMC7/oGKiIFpf90zN+EAA+4leazqHmJyiTZXi3fF0XZXi3uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778839046; a=rsa-sha256; cv=none; b=RqrdbiOf3+cWxikug/2BaW8/TBWek5NkIWNolq0WROlci46JCNZEqzG0A8JYyia8TppodM U8VDHRiO5npOBwPjVz9Lay/WRuEnHG0MumG/37V3vN4EEB98a9TTXEYYDnpJakyFVl4yMw 6zhxHK1zSF4Zp3T+HaazaWtufB6QTJJiIWNgo9MJ8gU9rA4wnMtS6Hly2vSwojMLFKvvGf ZYGERmR0TFH7LSGgW685+l+wyQuZZ/Qd56eSNNt52P/5irY7jO7UQfc9ZsMSLjYU6NKT1E Ed3ShEeiPgShEiZbVMmHTswY0ox2Et9ICXPHHvRfYTS0NrQCLxg59uj+1wwKHg== 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=1778839046; 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=4qjfctbEJ9F9u2yA3d7C91ZfCZBa3IEApSo8ZUNF87c=; b=pzLTS+0W/hi6pdWul046xeB7HZf6BSnHP6dHi+Zy1bYXGAMbeXe+CBm/vzBLsZQGDxQoi2 X7A9P5cqHt3J3nVi9wrbb1xK1hRapVXJ1nn4XMqf6IkO0Lb6Uo+RR3q/aCYherAVQvxo1y pVFtxOTJ2YxCQvYBsr3Ob+m+hindCVAfcoO/abVhSsMaxBFMlZP9nw25Durvi9/Zku5ywN w63x9/eFNCCVZ2FP+Fa6qzS9FsIPMj06syq3/EsHmvcp2oXAFzirQWgVd5CEM0P46z6eUM bpEhGKPqi1WFJzRzK6nbjNDkhw/B9loYNTN3w2j91dVwFWJaFh0TDBLp6YPMJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gH2gB4Z8Vz1GvH for ; Fri, 15 May 2026 09:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c3d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 09:57:26 +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: 7abddbb3cdee - main - bhyve.8: Fix formatting of -G's "w" prefix 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: 7abddbb3cdeeff0d4d991aee52e92382e847e8a2 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 09:57:26 +0000 Message-Id: <6a06ee06.3c3d9.270864dc@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=7abddbb3cdeeff0d4d991aee52e92382e847e8a2 commit 7abddbb3cdeeff0d4d991aee52e92382e847e8a2 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-05-15 09:48:43 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-15 09:48:43 +0000 bhyve.8: Fix formatting of -G's "w" prefix "w" is a command modifier, not an argument. Use Cm. Fixes: 2cdff9918e79 byhve: add option to specify IP address for gdb MFC after: 3 days --- usr.sbin/bhyve/bhyve.8 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index be906419d74e..dd9b5b992415 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 23, 2026 +.Dd May 15, 2026 .Dt BHYVE 8 .Os .Sh NAME @@ -58,7 +58,7 @@ .Oo .Sm off .Fl G\~ -.Oo Ar w Oc +.Oo Cm w Oc .Oo Ar bind_address Cm \&: Oc .Ar port .Sm on @@ -194,7 +194,7 @@ If a is specified, bhyve reads the file and adds the file content as fw_cfg data. .It Fl G Xo .Sm off -.Oo Ar w Oc +.Oo Cm w Oc .Oo Ar bind_address Cm \&: Oc .Ar port .Sm on @@ -208,7 +208,7 @@ and to listen for debugger connections. Only a single debugger may be attached to the debug server at a time. If the option begins with -.Sq w , +.Cm w , .Nm will pause execution at the first instruction waiting for a debugger to attach. .It Fl H From nobody Fri May 15 09: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 4gH2gD0D8Vz6cXDQ for ; Fri, 15 May 2026 09:57: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 4gH2gC61fHz3dv5 for ; Fri, 15 May 2026 09:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778839047; 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=ooa7zEO8o8ker7VleaskMOgalQIQGy0ptmgHZxwjcL8=; b=wbHj0EC6A9NyDhKV5H1qDulmDIy2r3X7JemTpXty9wOZKhiNlx3kkdF7D+OtjNpYzLfZGE hZ9f0ALbX/m4HNkqO2tjW/Y/EfpgarP/d3vPv4Z7oaR4PA9wvqzNECSWcfDdPJkGP+nqYf KbuYRKFgtRrNK3mz1K0xcOM4atCFBVYGhADkfTk8Rnj8CbXOvs2ZWSUKaK1TwT8c3QMzfo vBuXXFwt3npWFM3sihTsVubTGWeuLTJAtfZNaq49UaShbll9fv4ap2QYEArY5gKZq+/UFx yYHzH5EmJ/C7L290qVKyPTZw6TSjR3qzm/6OhCeFm4rzwU9I/lDcA90U4H/nCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778839047; a=rsa-sha256; cv=none; b=THg1O8bvY0bImg8SFr7QxTSNi9R28pY/9Np0sl8EBM6xuJXLMtev/7xGP56lAd8JSPuthS 1Di96rfT1r3E0CwE8zlM9K5o5gb3PLyrb3nqfUvP8kzueD9TkZaAvUSd/aDMEifUsCF4HH kclZfnjGXElhLPGPx1SZ/HtOd+eQGZpE+xZi7CKEFIcnXASKhO7eegxe/Yu2JuqizXBnmj 54TN7hyOBnLxSf3pugDIaqyCBFh5IrEpTJ/zdsKo0driIyttwrZDkwJ1qw9nEU+9LnKbrz ynn6Sk7t7j1KXvXKneIjjzl05FJY/DXHrINdclR5zd6jVqMBkzvzKOvCtKrWuQ== 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=1778839047; 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=ooa7zEO8o8ker7VleaskMOgalQIQGy0ptmgHZxwjcL8=; b=MUNIYpbHUdIlkdFMS1LGMQGbZnLdSfJrgjne/Ji0qD3vktQAVRcWXHyWq9gEnjjzSJKMsz qNYIwg3Wnja6ma30Yan82X1nq9qVg4IQgdb4AZ500KGIyosYqkcHaZJ8T9r9Uu7u4KUupD OADULAXXC/CO69uBCm9H9LsOA37LPvglopKfg11uPy0p2i2Jj0t1woTUtkI2/ua6qbeoR9 EN806gkLe93TiZCFaiR39eMqI0+CaVtbR7aZuVwS7JrBF0jUwGvh4nlWArJ55QTF2R1JjM moClCgDgfzNGTZ02tlEw1FrnG2ApUzuGc6lSrZRzZX/8b44/Djam2lzCGH7A8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gH2gC5dZpz1HCK for ; Fri, 15 May 2026 09:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d3dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 09:57:27 +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: e0c3d21e3b43 - main - bhyve.8: Improve readability by not breaking -f's synopsis 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: e0c3d21e3b43c664fbec3b070612c17a72c39482 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 09:57:27 +0000 Message-Id: <6a06ee07.3d3dc.4a8bb0f3@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=e0c3d21e3b43c664fbec3b070612c17a72c39482 commit e0c3d21e3b43c664fbec3b070612c17a72c39482 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-05-15 09:49:43 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-15 09:49:43 +0000 bhyve.8: Improve readability by not breaking -f's synopsis MFC after: 3 days --- usr.sbin/bhyve/bhyve.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index dd9b5b992415..5118974baace 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -46,8 +46,8 @@ .Op Cm ,threads= Ar n .Oc .Sm on -.Oo Fl f .Sm off +.Oo Fl f\~ .Ar name Cm \&, .Oo .Cm string No | Cm file From nobody Fri May 15 12:13: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 4gH5hH3SXrz6dCrQ for ; Fri, 15 May 2026 12:13: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 4gH5hH2fT4z3r81 for ; Fri, 15 May 2026 12:13:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778847215; 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=v8Tyn+uYZ6DAgoLtTrfLECThuVrgzPkfCOIHMo1Opbs=; b=tNvPxINeGRT6pATV/QDK5v2l3gq/K98lDudW/mDS7da9dqe3nW/3QdR9Xq4fvPTVBfyfJq cooIkXsjO9t9y18PonYisxEx98nvLrRglrOewDCgEwho4gzA4MRau2KlxBw2jlJa06KUWm G5fwQfvFm+7SJwWaAfBVPUfYgPk9mQ8bg5d7zOF9CC39aD86A3TbG5A9IAABy8c31u9/wG tQY8wxrLuy2mKfFFGE9VHtVwuxU0AMvvaF55htR28acOfDCDwpVnh7RGAhEQBydGZqB79J Ha6XVwYPRfTbay4NxrEnHRGrlLl1J+JV3IYhHLdaJuc6e8YgOI0prk71e7sY5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778847215; a=rsa-sha256; cv=none; b=WlzrUosNl0u+zNi5uIB6vLFzlb2J/ByP1Pd8ZfjEaSEGyWCPm6qqAVCPFikH8Ncpj/S5sJ j7pCabaFm++FPpq2y8p7oldi4Y3ZkW3BajVYJj6hQszebzIEbVIWE5p7wMolcLzDS1mFbV reK8GUGgigKv+tpVr7e97LG4gI8tGReLD6fdWLwPMZH8HPuWQn45jltiooIY/gIWs0ux0O qqbV4Tbxj3WMwcOdyOce19Iec2RWRcctJM9mvYO61O170d2HATgXuBve36vae8DkPP4xK4 QNypDDLva+CxsqpB+3C0sAZ8y6cUTKHbF4jA+L9C1Zr6eRc5we88F0Glp1fpgw== 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=1778847215; 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=v8Tyn+uYZ6DAgoLtTrfLECThuVrgzPkfCOIHMo1Opbs=; b=QL+ttzgj00fGfKoaXjuKZbjM/Ad0kshLJXKrDnBUmnmWS+YvpUGRSf5eLVKUrq9AUzli99 QIHG9UvLrTAfOQ/I+vXA8SU1T6W7imxjxFUY0m/P1ySXGZeJG4+f2BaQtaprKma3t5+7sP 5rdtlN4FTn6dC3soHNrQipEi59r9lLAz5t8o1l1iC2cCbGg/YegSBPb6pvgJRBmDg5jSwc 4av/RwVQs0zg3R7MufEdBBa1VlkIh+mEaVKnYuL6tcw1kyKqVv0LtTL8TtaT3Y5Hn4nk8O pI3/+Dl2IWaeKVGcBgp92NkbRDJTOEe9KGuwWqgNSvp3EbuBPLnip9XiKH5QFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gH5hH2BkCz1MCn for ; Fri, 15 May 2026 12:13:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bbaf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 12:13:35 +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: ae0fd05a333b - main - p9fs.4: Cross-reference mount(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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae0fd05a333b0ab9e6f020b07a0e483e6f85538a Auto-Submitted: auto-generated Date: Fri, 15 May 2026 12:13:35 +0000 Message-Id: <6a070def.1bbaf.22e56fe1@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=ae0fd05a333b0ab9e6f020b07a0e483e6f85538a commit ae0fd05a333b0ab9e6f020b07a0e483e6f85538a Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-05-15 10:11:29 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-15 10:13:20 +0000 p9fs.4: Cross-reference mount(8) MFC after: 3 days --- sbin/mount/mount.8 | 3 ++- share/man/man4/p9fs.4 | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8 index 877001727a8f..b651fb53bf2c 100644 --- a/sbin/mount/mount.8 +++ b/sbin/mount/mount.8 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 28, 2025 +.Dd May 15, 2026 .Dt MOUNT 8 .Os .Sh NAME @@ -584,6 +584,7 @@ support for a particular file system might be provided either on a static .Xr ext2fs 4 , .Xr ffs 4 , .Xr mac 4 , +.Xr p9fs 4 , .Xr procfs 4 , .Xr tarfs 4 , .Xr tmpfs 4 , diff --git a/share/man/man4/p9fs.4 b/share/man/man4/p9fs.4 index a49053d461d4..c50720b6ebc8 100644 --- a/share/man/man4/p9fs.4 +++ b/share/man/man4/p9fs.4 @@ -22,7 +22,7 @@ .\" (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 November 7, 2024 +.Dd May 15, 2026 .Dt P9FS 4 .Os .Sh NAME @@ -104,7 +104,8 @@ or .Pa /var/tmp have the expected semantics. .Sh SEE ALSO -.Xr fstab 5 +.Xr fstab 5 , +.Xr mount 8 .Sh HISTORY The 9P protocol first appeared in the Plan 9 operating system. More recently, the protocol has been widely used with virtual machines From nobody Fri May 15 12:52: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 4gH6Y03c5hz6dGh9 for ; Fri, 15 May 2026 12:52: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 4gH6Y02gV4z3tq7 for ; Fri, 15 May 2026 12:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778849540; 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=LpZjN/MJBBne6HliI1WKBWCoKMm0i21xlQUwSAwSBnI=; b=BhhoMSGWVDqBIUNyqFNh7AgVYQCsFOhALX5DsMHgfyTPwZlFfUcBAPl4dL1tRxSc6NSmsE P1W5OPYHgm//aOGZcZlE76imzxtDtBxyRcMDUxCDDWVyNPUFmles3phB0YFx2SFlmdl7bM MA9SDE6uZ88EE4wjAOhi1bsUEFrJEDv6MtxSwsUaQWrL5Kv5ZdyQuBOzxlLMcLnsRnsr// e/gvqu+TsIhr9fj4BoLt6wH7zBwIMnflEry3Nd4z9qj+ZKXpdRUMaeshO4uoVh/FdHZVOF gdCnuRnJBPPmWitARnSIeLwfngX9Phr+j9q4bB2J/CO4DivCFNHUX4AiMdn4Aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778849540; a=rsa-sha256; cv=none; b=CRulJhPc4wTUNjNfSr/Wj1+BPVIH7uzHYAovu5Ye8rm79VTcGOhCK4M2te1uj90Hd4PfJj +17nunoJvOzdF3vbTsi4JCxK7lRwp110kav+TWUFYB2CMCPc0mJAkEbUEUlTAq+mWS24W8 eSGFUATYdJ73vbIKVtnjtWf4OHs25pW7ktCEA/KRo4pIwAyoG0rntnbgU5t6Pi2hm2ApNQ 8Th5j9Y3jtpR0qBM2iwMBLjgB3yIuLIpVO/ZN0rvLiyJQI3j1KL4qmASazUZAA8/Q6fYPq xn22/ITLPlJJ3a+NEZjGQstRLbqzupzjvtk7Z1G3GoWAKdC+2t28E8GtUS9e/Q== 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=1778849540; 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=LpZjN/MJBBne6HliI1WKBWCoKMm0i21xlQUwSAwSBnI=; b=RTfQgPQWfBYt3Bs1DWxxU57wJD142OHO4lQMm6tcgbxJw449MDSTb4u0I6hGE5cu/1O1Kb R9tK53W5eHSu1THScRBWTYDyQ18qLwDAeCchB3lA0DdNeliuvrpJ1q1zGK8bBPOWJ/6DJK JuhOty4ryqIxgEuW9M7l6DAFaXQq+IdVWHsxL8To1KdjvYsRfYbyI8Xihh2IIcxpWWeH/o 3GpX3UrUVyg7OazlEW333riZSjFRlg59fS2BPo6nrCW2eDXqlzvHDMQ/OGRDNQpeIoCX/V eGKl38QUYDkWksdC+Ge70GEherK3r02j8QaYpI0oKgeanqLic80Txu7NWcfxFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gH6Y024PGz1Mlc for ; Fri, 15 May 2026 12:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1edeb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 12:52:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: bcd50fe5c3c6 - main - style.mdoc: Explain why not to abuse Nm 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: bcd50fe5c3c6e70c710e13378999814e9df43d3c Auto-Submitted: auto-generated Date: Fri, 15 May 2026 12:52:20 +0000 Message-Id: <6a071704.1edeb.3d5b357f@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=bcd50fe5c3c6e70c710e13378999814e9df43d3c commit bcd50fe5c3c6e70c710e13378999814e9df43d3c Author: Alexander Ziaee AuthorDate: 2026-05-15 12:49:20 +0000 Commit: Alexander Ziaee CommitDate: 2026-05-15 12:50:42 +0000 style.mdoc: Explain why not to abuse Nm MFC after: 3 days Reviewed by: 0mp Differential Revision: https://reviews.freebsd.org/D55299 --- share/man/man5/style.mdoc.5 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/share/man/man5/style.mdoc.5 b/share/man/man5/style.mdoc.5 index 64e2291d1c75..c4c2aa7b3695 100644 --- a/share/man/man5/style.mdoc.5 +++ b/share/man/man5/style.mdoc.5 @@ -41,6 +41,12 @@ which renders as: Then run .Ql Nm make Cm install Cm clean . .Ed +.Pp +This pollutes the +.Xr whatis 1 +database, causing +.Ql whatis clean +to incorrectly show the page it was written in. .El .Ss Copyright Header Refer to From nobody Fri May 15 14:53: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 4gH9DZ68sCz6dQsP for ; Fri, 15 May 2026 14:53: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 4gH9DZ5K78z46c9 for ; Fri, 15 May 2026 14:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778856798; 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=XzxjeAwRyPqVuEJKNKsnmciZVR+wDuIUPrSLSaFouSs=; b=TbwoKaqHGO/uBCG3wV3dI1H1JaaAX/0D0piJbLxMaMFvgCjYE4Zlu/dvq1LAvaoNFSXIbJ 9xQSiZC19VL/98BgdzSScyNpNaNByt2xQANf4TmyIUQmfDBTPKU53UlS5rgO+lFYEwBEOb 6+sFidmEAo46S/J0NBChDj0BikF19cTbiAkMjgR4KCHwFdnOmH4i6RblNMmhhvbWl0u+R2 sN1ihUmXZ4nobcKIm9owy2VjnyJwSii4ybPMR2oT2KLaFuvxVJ72wpimQUKE+P2Ct52hHj 9a0B8h2aBj7XcNNw0f0VC3d/73jMVz+2d5uuGsZQFgPsr1UgtZ+dMFLG3YcAlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778856798; a=rsa-sha256; cv=none; b=IH05oe5JWp/bK8WRSRQFJ7LFjlBcCEKJnIZ4GVwjgi/9j/kCrxmmqZpZjeae06bl3cD47B o4MmV5JHmwoHT98o6L5/4oS2LXi+GblRSdRtc/xXChQc/8ToPfVde6sl6upbKyZjABcRVU 4wCaKdxL1M31vQEeFtzR+Ki56x/1WXwRbDP8gE+lbY+HLjnxQq0EI8V2cmzwny03uzsHm8 64LjSZYjzU2HfrjcifneQX+tNR9HbKadaoY2bHPm8JgeM4iGg9ZpuT84gfOvabG7WtlaeQ 3lDr2UkeiGAlBKlaS4GxrYiZtSx5p6Bjij4pCYmzqAH4wFCvjDhCHjrZzL7Ztg== 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=1778856798; 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=XzxjeAwRyPqVuEJKNKsnmciZVR+wDuIUPrSLSaFouSs=; b=kc5O+Hs0+Nbt+gv3IIeHqKTWSqFDCi781HHZQ98Mpd7AGkuH9tCb/q2F7UpHZbFzCTQV0v XSMrOfiCPsKXTXcvaeYDbLc0Wta7OH9W7egP22sgYn2bejSgw3iXzkc3WvynRGPLyelqQH ukf6UoklXNz8OLlh4xd0O9qHBTDyvwLFlk5D1M+VJGuJqfA83ht1Tn2DiIqaonySefmz+h unueWsZom7lWPBCvKnLQGkKqva0+Z/0aSUaxdBHtO6Pvlwsi003avzFb5Bi8cjCkRqgTyC C7D/K4ohZPC85OCq3xmM5PqjUOTPmX0UHFMvRfERzjJJf0a8S4TiX+BF7F/g9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gH9DZ4qyVz1QTr for ; Fri, 15 May 2026 14:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35e7b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 14:53:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 776584319fb4 - main - sound: Fix lock order reversal in dsp_poll() 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: 776584319fb4d66cdb1c2f91bed154dfe6a74e5e Auto-Submitted: auto-generated Date: Fri, 15 May 2026 14:53:18 +0000 Message-Id: <6a07335e.35e7b.6354f4f2@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=776584319fb4d66cdb1c2f91bed154dfe6a74e5e commit 776584319fb4d66cdb1c2f91bed154dfe6a74e5e Author: ShengYi Hung AuthorDate: 2026-05-15 08:43:47 +0000 Commit: ShengYi Hung CommitDate: 2026-05-15 14:52:48 +0000 sound: Fix lock order reversal in dsp_poll() chn_poll() may hold both rdch and wrch channel locks while calling chn_trigger(rdch). chn_trigger() switches the lock order from "channel -> dsp dev" to "dsp dev -> channel" by temporarily dropping the channel lock before acquiring the dsp lock. However, only rdch was unlocked during the transition while wrch remained locked. Since wrch is also a channel lock and witness had already established the lock order requirement: dsp dev -> channel witness reports a lock order reversal when pcm_lock() is acquired while wrch is still held. Avoid holding rdch and wrch simultaneously during chn_trigger() lock-order switching by only keeping the channel locks when needed. The issue can be reliably reproduced by starting pipewire, pipewire-pulse, and pavucontrol. Reviewed by: christos MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57009 --- sys/dev/sound/pcm/dsp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 797bfba81023..7bc1decc283b 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -1877,24 +1877,25 @@ dsp_poll(struct cdev *i_dev, int events, struct thread *td) ret = 0; - dsp_lock_chans(priv, FREAD | FWRITE); wrch = priv->wrch; rdch = priv->rdch; if (wrch != NULL && !(wrch->flags & CHN_F_DEAD)) { + CHN_LOCK(wrch); e = (events & (POLLOUT | POLLWRNORM)); if (e) ret |= chn_poll(wrch, e, td); + CHN_UNLOCK(wrch); } if (rdch != NULL && !(rdch->flags & CHN_F_DEAD)) { + CHN_LOCK(rdch); e = (events & (POLLIN | POLLRDNORM)); if (e) ret |= chn_poll(rdch, e, td); + CHN_UNLOCK(rdch); } - dsp_unlock_chans(priv, FREAD | FWRITE); - PCM_GIANT_LEAVE(d); return (ret); From nobody Fri May 15 15:08: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 4gH9ZW4B1wz6dRjG for ; Fri, 15 May 2026 15:08:51 +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 4gH9ZW3TGlz47XY for ; Fri, 15 May 2026 15:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778857731; 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=9HXRzzbNo5OwEOVe/OpJWvz+kGoIeANdlh0xflbgD/4=; b=hckHyW34gk7PlVDsnyplmE5Dmn3f5/fSdAc44WFnoVhE8LE3jg56fPU9hFw3B5qC70tBld adRtIrQtrgXOiFB5qFw6nzL01VHNyzz0KUUa+4XUJyuQwJblFoy29qF5W4UE3dCr7onIOX xpvQkOo91E8IXn6lL4TWWvINFB3G5BgJvf3teaDRPBYub+HozGYU1eNWxFykpjtRkSXbLW gnqXwOJoPJJAOkS61pCb+f6FeyFhpqU2oMRR9wEe8umJNutbeqAGAwMpjoifYwXrDv5GB9 qAKWVnEDETwZSqz9GhsdMNYjvMxdcKHx0X72MmOGXwvIuOZJbXZPWiU7UtA9rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778857731; a=rsa-sha256; cv=none; b=APDbHFX7QBEpjztTunrmFnIreGPqpH0lPsULmD/G3C9BUDfLmxCJoCalyIzoK9mkwl2VW2 2jW5ZmBLvC4Shgz49SdDLR82ne3Dtriloz8sE0xAKbVhXN7UL8mUFHkBGkpZx05Ue2Oeiw vjIO5ZXD2hUtrautTRrhjoQcJBZ0X4ZnhkWff8fZ14pseJPDc1kn6qSafHJ8ikgOoB2Cpe VCWxDd96lAUnOWnuKMKq9cYQSsp9loK7od5E7edN9z/Zuzj2MyjjPuC/xxQpKtkIZDx3SB nNJXx4VVPeFUFTqynzCyNbe0xn6EPtz/pKjK7XnS/yEI9J8x6+eQQms+5wJPnw== 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=1778857731; 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=9HXRzzbNo5OwEOVe/OpJWvz+kGoIeANdlh0xflbgD/4=; b=Mf6YzQb/ujfPAnpE2t6bKNbnFxeW9/LpVA6xgM1QnIVLFQW67y+2ykKP/gAOuuy3+Fg2XR aDOYsQNjDplnFdgUBeNL8Y1GArx49s57eJmwvLHkAH0RUgkk7kwLVswFTLK5+LPGPsAxoy qZ1VUGQbVux0psML6LixDeWbba3bRr4qIzKmTHMhNPRl2gFV+oubrM/wPUxfEUfbEoiMXz d4eNs8dlnOGbSiTmnNqnw3mBz9keqAWprnvvqry+NdnssxVa4dWl1kObRn5E+v9RF7jTw9 /lshAK3b99IvAh3FcJBDtBcFCbb9lxeuWiCgT2kH3LS/AULX9D8V5jpwWHifww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gH9ZW34D7z1QY7 for ; Fri, 15 May 2026 15:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3403a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 15:08:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: b9c10eeb380b - main - sound: Improve hw.snd.compat_linux_mmap 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9c10eeb380b3ba629421062af8658e79a9171cd Auto-Submitted: auto-generated Date: Fri, 15 May 2026 15:08:51 +0000 Message-Id: <6a073703.3403a.3477a5a@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b9c10eeb380b3ba629421062af8658e79a9171cd commit b9c10eeb380b3ba629421062af8658e79a9171cd Author: Christos Margiolis AuthorDate: 2026-05-15 14:07:59 +0000 Commit: Christos Margiolis CommitDate: 2026-05-15 15:08:11 +0000 sound: Improve hw.snd.compat_linux_mmap - Reject PROT_EXEC in all cases when Linux support is not compiled in. - Define sysctl only when Linux support is compiled in. - Document better. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: emaste Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/29 --- share/man/man4/pcm.4 | 26 +++++++++++++++++--------- sys/dev/sound/pcm/dsp.c | 13 +++++-------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4 index 518c37b54f1d..8a92cefa3549 100644 --- a/share/man/man4/pcm.4 +++ b/share/man/man4/pcm.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 15, 2025 +.Dd May 15, 2026 .Dt SOUND 4 .Os .Sh NAME @@ -254,21 +254,29 @@ are global settings and are device specific. .Bl -tag -width indent .It Va hw.snd.compat_linux_mmap -Linux +This +.Xr sysctl 8 +variable is available only when Linux application support is compiled into the +kernel, and affects Linux binaries only. +It is a hack to get around the fact that, for i386 emulation, +.Xr linux 4 +historically set PROT_EXEC automatically when PROT_READ or PROT_WRITE was set +during an .Xr mmap 2 -compatibility. +call, which +.Fx +does not. +.Pp The following values are supported (default is 0): .Bl -tag -width 2n .It -1 -Force disabling/denying PROT_EXEC +Force-disable PROT_EXEC .Xr mmap 2 -requests. +requests, even for Linux applications. .It 0 -Auto detect proc/ABI type, allow +Allow PROT_EXEC .Xr mmap 2 -for Linux applications, and deny for everything else. -.It 1 -Always allow PROT_EXEC page mappings. +requests for Linux applications only. .El .It Va hw.snd.default_auto Automatically assign the default sound unit. diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 7bc1decc283b..d9726ffdd6bb 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -54,10 +54,12 @@ struct dsp_cdevpriv { struct pcm_channel *wrch; }; +#ifdef SV_ABI_LINUX static int dsp_mmap_allow_prot_exec = 0; SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RWTUN, &dsp_mmap_allow_prot_exec, 0, - "linux mmap compatibility (-1=force disable 0=auto 1=force enable)"); + "linux mmap compatibility (-1=force-disable 0=auto)"); +#endif static int dsp_basename_clone = 1; SYSCTL_INT(_hw_snd, OID_AUTO, basename_clone, CTLFLAG_RWTUN, @@ -1923,20 +1925,15 @@ dsp_mmap_single(struct cdev *i_dev, vm_ooffset_t *offset, struct pcm_channel *wrch, *rdch, *c; int err; +#ifdef SV_ABI_LINUX /* - * Reject PROT_EXEC by default. It just doesn't makes sense. - * Unfortunately, we have to give up this one due to linux_mmap - * changes. - * * https://lists.freebsd.org/pipermail/freebsd-emulation/2007-June/003698.html - * */ -#ifdef SV_ABI_LINUX if ((nprot & PROT_EXEC) && (dsp_mmap_allow_prot_exec < 0 || (dsp_mmap_allow_prot_exec == 0 && SV_CURPROC_ABI() != SV_ABI_LINUX))) #else - if ((nprot & PROT_EXEC) && dsp_mmap_allow_prot_exec < 1) + if (nprot & PROT_EXEC) #endif return (EINVAL); From nobody Fri May 15 15:08: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 4gH9ZX5hNpz6dRV6 for ; Fri, 15 May 2026 15:08: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 4gH9ZX4b6Fz485n for ; Fri, 15 May 2026 15:08:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778857732; 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=1C3JEEy3wbbumeWGaz4nZIqYZBH8wFSRANh4rR0VwcY=; b=JFcliadSL4ZSLHC3wibzigqsDa3ObeM5lCo3EH35PpBwb5UwzkSU64qMOxikJWxYpfMxE+ mVoDtUPk5G9yDwN6QP5fygNQVHIWwsQc8Gnq4CG64GNOz9t9sIwSwFwf4UNq+sfD8f47P5 X++P3wx90Js00rtpAwrnvcM+U4CpM15DoGZ1uiT/t82YSk39SHdvdEBVkrLzJcTE4wGnln lo2d6fl/TqHIUsLjQHmkMN7yEBV3QdCCpM+he5VIWKpDaQ44btPdKIu8/GM56Wg0O8Ensd KbjggG91MKg17xZVF44hfxveMYwBG5AvQc/0BYdIxRFpqWIXvVrS5ogqI+x8wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778857732; a=rsa-sha256; cv=none; b=hAxiZh2uZR6ice3WTjE1tAg8jNAZMtkWpyf4OpgS5SMmdrIJ2tgK5NshL1cbcT9oKDfTfL YiNneOQhwohAkeN7zBpHbFKTvcxEg0FJu/WCSxvrxI568T1f5feSvuuf8CDZW1MGDMUPGu 6d40ZZNGnp6lxPxjZdIgPq4AeKeaXVuuCotv2W0oQXuZp80Hdpy7NGBkxfVsqd8YkQRWcl IThAbH+wAg/dBPpCO3rRU0NDPgSADT3zITVBsszjMTFhJ0eBOXUwdFEJ6lSwNDefWn/kWs 6E8BDQsuU2FRXm9A+U3SVQFSFDVhoKUGpQdI4z551MVsG8IQZ1L/noDcIwWH2Q== 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=1778857732; 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=1C3JEEy3wbbumeWGaz4nZIqYZBH8wFSRANh4rR0VwcY=; b=ou+9UtIRCfAVVbJ5NOy2zX9WEM0CiHfP2IJx5DbWBoH79uRIW+qBBumXkOP0/jaRwG8o0W LdQcjaC1DHBluwPM0gqpQDBK9ZSMIwzqd4izAnL+sOxfCKKbsu/+qEgFDi7WAvkT+6vzjD G3rqTUbB/wmf8WsgSr0HKHz70XHwYsO2bdNMHSsj6fXjhnV3sYHPits19qjPm7A5BSU8SK ubY0xZMiGnfs4zn8Bp7WEITMeDdtL5xyuRTWZWv3ms1Exd3d2LiLOidHSUK/T6vv8tEbaI KM61vryKyw376g7IB4UqiFYhzdxlqqVmOhN1mDIuWA9a2QWqFgN5vEYyMIBHlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gH9ZX3x8dz1RJj for ; Fri, 15 May 2026 15:08:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36027 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 15:08:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 9354e204f5ac - main - sound: Force-disable hw.snd.compat_linux_mmap by default 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9354e204f5ac797cbf1ef8e05294703c378bc9b6 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 15:08:52 +0000 Message-Id: <6a073704.36027.aff631@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9354e204f5ac797cbf1ef8e05294703c378bc9b6 commit 9354e204f5ac797cbf1ef8e05294703c378bc9b6 Author: Christos Margiolis AuthorDate: 2026-05-15 14:47:10 +0000 Commit: Christos Margiolis CommitDate: 2026-05-15 15:08:11 +0000 sound: Force-disable hw.snd.compat_linux_mmap by default Eventually this hack will be removed, so start by disabling it by default. Sponsored by: The FreeBSD Foundation MFC after: 12 months Reviewed by: emaste Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/29 --- share/man/man4/pcm.4 | 2 +- sys/dev/sound/pcm/dsp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4 index 8a92cefa3549..4e70d95d5441 100644 --- a/share/man/man4/pcm.4 +++ b/share/man/man4/pcm.4 @@ -267,7 +267,7 @@ call, which .Fx does not. .Pp -The following values are supported (default is 0): +The following values are supported (default is -1): .Bl -tag -width 2n .It -1 Force-disable PROT_EXEC diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index d9726ffdd6bb..7b4f3f15645e 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -55,7 +55,7 @@ struct dsp_cdevpriv { }; #ifdef SV_ABI_LINUX -static int dsp_mmap_allow_prot_exec = 0; +static int dsp_mmap_allow_prot_exec = -1; SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RWTUN, &dsp_mmap_allow_prot_exec, 0, "linux mmap compatibility (-1=force-disable 0=auto)"); From nobody Fri May 15 16:20:30 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 4gHC9B4j9rz6ddZQ for ; Fri, 15 May 2026 16:20: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 4gHC9B3fK3z3bjC for ; Fri, 15 May 2026 16:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778862030; 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=rB5SjsAga/UXifgIAhGSY1JKp2yUoUTvjkf3bhx7R9E=; b=s93oh6Vn0gMoZqsXQWWcS5dXMiAKGk36+6WsVKFsRbvdlXmiKtyg2C1fmKBsls9OpG3uPb sDvHF5tdpTVa+3Q1yUmg8qLra92js0Lx77H6hAW7KOk1fIdPFZ9Acmhg5rO1Do6oTSYsDG cp/ACJBmTBw3XcVY9Cawevrv+qG6gEqOsPYnFXVuXnm5WqAwNQvUjrS3exYChRYINtICgu DBN3hu9XBLh5Yvd3K3fZ1fWAVHqW/nz03tx+th88BoYw0YOhFFalxqfhu9nG0Z1MfI4LHX IPiUWynDMvP7EjXdAw/9zd0xTcs5JP4lsIPZgsFUXhLFQzGVneXkrMdQc1sX7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778862030; a=rsa-sha256; cv=none; b=Mc8ALo86nM3vY8hZ4la5e4FYueTM1Dj9NI3r1HwWa7cLwEI0AM34GcnCUCwARgz6QPK6cw 65orpbDjE0GjHNyDMRc2sOdEpk1n2cuEWOHbrSHxe2pLVXnm4rVn0VFUhThCpQ7X4AlI3F 3lXrjfNJuRSzcoV6yiqns5LNAY2ZlNZDU32ZUKkLM/k9cS2GplLvxmMfAj14Y3vsu8dgaE zwI4o1c8FMsnYl2Lr3TtcbfjpNs+JzeOyJXtt/jcFuglG4EqSj0iA8iBLhFGDACj9j4sT/ W4XB0AiAgEF6HPwfmVzclm+JB0V2g2ZWZ7ktrPw2PyelLT/ttEXYZcX/tQPvvA== 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=1778862030; 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=rB5SjsAga/UXifgIAhGSY1JKp2yUoUTvjkf3bhx7R9E=; b=YCi9BrbfRZkN2fGXp7xbHY1Qw5gEhQErZ6vaw+3+GqAul35P+KKTw8vYz501CLFm7lebp9 vgECgpS8huDMJgMRp8n7bTpGP4+YJulGQctvouC/JpjREZ9dsx7L3yDlNiKcwqGdRaLho3 ak1aJdJ13xGLK9r8NAvXNIXtqOnbwe/v7YsFF7/h6diZr8JEvel1ypG1BPlM5IpKulWIOe BNMo+AaRzhN0kqb0ExvqLFy6I7jZUnVsA1cyGilZmQpefA31QwBYB+MuPaCwkSeVqTT5LY HUi0NThE7cSU8fwsEreOAUB0l0wctQ8kzE57FiR/Ds+pZXg46X7COKUrKJDCBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHC9B3126z1C5 for ; Fri, 15 May 2026 16:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d4a9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 16:20:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 6531070132b0 - main - openssh: Add reference for another local patch 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: 6531070132b0210aaaeb08c0dc93cb272bed348e Auto-Submitted: auto-generated Date: Fri, 15 May 2026 16:20:30 +0000 Message-Id: <6a0747ce.3d4a9.54faa201@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6531070132b0210aaaeb08c0dc93cb272bed348e commit 6531070132b0210aaaeb08c0dc93cb272bed348e Author: Ed Maste AuthorDate: 2026-05-15 16:16:45 +0000 Commit: Ed Maste CommitDate: 2026-05-15 16:19:49 +0000 openssh: Add reference for another local patch A bug fix was committed locally and submitted upstream. Document it in our upgrade instructions, as these sometimes take a long time before getting merged. Sponsored by: The FreeBSD Foundation --- crypto/openssh/FREEBSD-upgrade | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 815c11a8f8ca..6987956ce163 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -188,6 +188,11 @@ internet protocols are supported by the kernel before trying to connect to the target host. This avoids confusing the user with spurious error messages. + +12) EVP_CIPHER_CTX_get_iv() stub bugfix + + Bug fix submitted upstream at + https://bugzilla.mindrot.org/show_bug.cgi?id=3873 This port was brought to you by (in no particular order) DARPA, NAI From nobody Fri May 15 17:53: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 4gHFDw3j88z6dlMN for ; Fri, 15 May 2026 17:53: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 4gHFDv2hcBz3nX3 for ; Fri, 15 May 2026 17:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778867631; 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=5JYwjw5u+U1u6xcd/6PUalgEYEQYzneclbOHolcecU4=; b=K3Rb26hA5HpPrYw3PvrfsBIVEYkXFgf/SW3F+dbpAsKc+hv+i9Esf+dgE8EmfTaaIkd5W4 WpxDiZO+pFHntS4iHZE9soWkD5S8l9trOooznRXNqPhgKOFYuYmWwiNBa3O5PczWO1Hoih U5N9sZT2HA4yssnI8fbabpePwNaldjouZqiM3FJVIidUuZI4DdO9/900remg2QFUu7UDp4 jCjXBtnRXfNP+IHU3a18ROoa9KhHnH3vgerTEPursRQCbDMvlSi2O4m23Afu2ly7tGBwL1 SkY7g7VuxLy2tA0DZi8K21PNWgC/w4sJL1cujtSEk2lprMhhn4sg/WlaiFsXHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778867632; a=rsa-sha256; cv=none; b=OVp88mgcjUt+uB0l5vLGiY/YM1pHFZYdysn09dfQFsQQ9s8wwX4O+wjs+wT3RUye+djzV7 GC2MhIIJ8B7TsOxc4WwRmjjAA64DS2vbpZsnf8gGeoHYu+VYHmK4xu2Fn4i9WjNft4AWEm OyyMs/vlU4S75neiRF/Xk3XMw64yqJYANmJUXhI0lmTptvoWempD/PlCg6HHZ6vk9xiWzi T57WX0CLdFbrjFPcIsqn/oN8gD3bZT02wkoADQhtVY/yNjIRbGnySSQjO+ekFHiP9EpNmu Hn+mwC6Rya84ockVQ1YAFDlOEPnkWbedkewhKroVLAy2w2rqAM016a1QxRX9zA== 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=1778867632; 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=5JYwjw5u+U1u6xcd/6PUalgEYEQYzneclbOHolcecU4=; b=l6hlKifzeoTlr+XB2fCE/w8JGAILn/ocu+efgu2Div9vBUpb8s6loZx95pGEvM+jHhhE56 Y4/IJ2Oy7EbM5FOyy08E52CxswuOBV/+jivAH0VW0oGpic1wYC3gO4VcBK1qC6xgrdiKWw X4r/eBLF8gj917g94ta/BVkNwGUWEEIU/8LFyHFSIQcarnXToni1N4OR92kCcnax/HepWB KfqeYlJyXFINOZcDjnKtvNc/s8MyoxcNicoplSQnXVgwCD3qMv+FDzxWWwzKTh6fpr1u/R ouLlZz9h12igkwjrxoWsehybYhFbbH82cuxVEApxlGGyRmnXiW7eD1K1BxBHiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHFDv29lKz3VY for ; Fri, 15 May 2026 17:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fdc9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 17:53:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: 394f8ff461e6 - main - jail: replace PR_ALLOW_ALL_STATIC hex constant with symbolic OR 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: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 394f8ff461e69e30c36570618bb24fd474856f6a Auto-Submitted: auto-generated Date: Fri, 15 May 2026 17:53:51 +0000 Message-Id: <6a075daf.1fdc9.19f075a3@gitrepo.freebsd.org> The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=394f8ff461e69e30c36570618bb24fd474856f6a commit 394f8ff461e69e30c36570618bb24fd474856f6a Author: Mariusz Zaborski AuthorDate: 2026-05-15 12:31:31 +0000 Commit: Mariusz Zaborski CommitDate: 2026-05-15 17:38:44 +0000 jail: replace PR_ALLOW_ALL_STATIC hex constant with symbolic OR No functional change intended. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D57014 --- sys/sys/jail.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/sys/jail.h b/sys/sys/jail.h index 5ac4c5f9008d..c0ad53eec3cf 100644 --- a/sys/sys/jail.h +++ b/sys/sys/jail.h @@ -280,7 +280,15 @@ struct prison_racct { * build time. PR_ALLOW_ALL_STATIC should contain any bit above that we expect * to be used on the system, while PR_ALLOW_PRISON0 will be some subset of that. */ -#define PR_ALLOW_ALL_STATIC 0x00ff87ff +#define PR_ALLOW_ALL_STATIC \ + (PR_ALLOW_SET_HOSTNAME | PR_ALLOW_SYSVIPC | PR_ALLOW_RAW_SOCKETS | \ + PR_ALLOW_CHFLAGS | PR_ALLOW_MOUNT | PR_ALLOW_QUOTAS | \ + PR_ALLOW_SOCKET_AF | PR_ALLOW_MLOCK | PR_ALLOW_READ_MSGBUF | \ + PR_ALLOW_UNPRIV_DEBUG | PR_ALLOW_SUSER | PR_ALLOW_RESERVED_PORTS | \ + PR_ALLOW_KMEM_ACCESS | PR_ALLOW_NFSD | PR_ALLOW_EXTATTR | \ + PR_ALLOW_ADJTIME | PR_ALLOW_SETTIME | PR_ALLOW_ROUTING | \ + PR_ALLOW_UNPRIV_PARENT_TAMPER | PR_ALLOW_SETAUDIT) + #define PR_ALLOW_PRISON0 \ (PR_ALLOW_ALL_STATIC & ~(PR_ALLOW_UNPRIV_PARENT_TAMPER)) From nobody Fri May 15 18:39: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 4gHGF55pDzz6dnfW for ; Fri, 15 May 2026 18:39: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 4gHGF55X2hz3vZ4 for ; Fri, 15 May 2026 18:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778870345; 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=Fkwbf4NIJJtLqyNRq19QMIKVjcOcFCI6nq5UbmdTEfc=; b=BW3OyUfIu4VignwrO6QlJIGaOLptqHzMmrP1Leia9JO7GtabZvqcV8NGpvzyTX+3jGbyPg 5gdp7hzWuwjaynzRjhndQ05MjFbV5u6NT+B/JVWhWoC1JsQ9TukmMnUwlaaMyKcehv0TBX jytsMKk/1ITyjpHPXKyxMMPFtKvEeXfNeqyDH7wpbrFY/If2XCCkOAjYZjxKu0QH6mplH2 1qaZV/ESjoKKsAngPd7U7TrbqpABhO16Z39BGxScZ0bf3X2+THxXgiiSPtX3OAS6NlObZ8 /frZsMUGSksI6/gdrSBLGF7oMNtBdtqZoh5veVUfLYob3KQPdmAR4GkV1grVoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778870345; a=rsa-sha256; cv=none; b=diCInzkfg0o+xXjL8Yp5gZfVZo6bShiQG7sxxmi6j2SmddNZQXTxgZbPi5psLxUqOufNkl 6km6diNEZ1fM/AFAf91H3XxF+Wcbc0B1+k9bAz+fpuKYR64BLkaWEOhbp1rCAJJRJOfMNX SFAOTTd609S4FVF3MQsvTZ1GqMOrKnwKabShj1xVE5Tk0l62Oq2yvMOK7cp0Bnz7vHO6e+ 5/xJOSYcfqfEmgXv5NuQBMVFwTXZQVZBg6/EwiKHJih0hm/tgiLmCmgSZ4vZNQ6ftbVCL0 /ucoGy+Wwc9Y61zUGo8h9F1f2QfCI+jy5TlsgBXLnJE7pUWQpQ+lyDgpKyvTzQ== 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=1778870345; 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=Fkwbf4NIJJtLqyNRq19QMIKVjcOcFCI6nq5UbmdTEfc=; b=bci/l7g2K+oH43/3fQ/OW4OJEVdMbKZK8XN0HrDn2APpjtnfrKh1deiYVKzmBmexBR1vy7 Lp/b1cW1WjRDqP4IdiAAz3oGwrJeA0sWVdem5qyfklQrYpaQzW7ifBCfAhC/P+/qeROuLq wtnUb412sWEryyMIx6fO7KgKGKxuLX4sU0Gg456/i8A7EKsJh8WZP8eTodFEU3mULlHLXC JtZYMNAJFSF1k1nCWZs59XFbsPRwATtddS9aTh2pK+3rc/aHyfLfBwPsE/fEPJIdWNeBJ7 HHmJUx7ZLGHuMt39fOdGASO/gkKxhzHbNhmUOGNe4dbXgMF4yp2JoWb9zChIOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHGF551jyz4jD for ; Fri, 15 May 2026 18:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22d6f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 18:39:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 0a2f7683bf0c - main - man: iwlwifi/rtw88/rtw89: update man pages for Linux v7.0 based updates 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a2f7683bf0cbd57d7cdba0713a3e30b24cbf9b4 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 18:39:05 +0000 Message-Id: <6a076849.22d6f.1b3a13da@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0a2f7683bf0cbd57d7cdba0713a3e30b24cbf9b4 commit 0a2f7683bf0cbd57d7cdba0713a3e30b24cbf9b4 Author: Bjoern A. Zeeb AuthorDate: 2026-05-15 16:29:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-05-15 18:38:52 +0000 man: iwlwifi/rtw88/rtw89: update man pages for Linux v7.0 based updates For all: - harmonize Copyright/license section according to style.9 and used SPDX only. - mention that the current generation of the driver is based on Linux version 7.0. - make linuxkpi.4 and linuxkpi_wlan.4 .Xr as the man pages do exist these days. iwlwifi: update the card/chipset names supported (while we still can) iwlwififw: leave a comment only that we can no longer update the man page and it will be removed in the future. rtw88: update supported chipsets and add note to BUGS sections rtw89: update supported chipsets and add note to BUGS sections Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D57019 --- share/man/man4/iwlwifi.4 | 154 +++++++++++++++++++++------------------------ share/man/man4/iwlwififw.4 | 28 ++------- share/man/man4/rtw88.4 | 27 +++++--- share/man/man4/rtw89.4 | 26 +++++--- 4 files changed, 116 insertions(+), 119 deletions(-) diff --git a/share/man/man4/iwlwifi.4 b/share/man/man4/iwlwifi.4 index 411af54be9fb..71825507f7c7 100644 --- a/share/man/man4/iwlwifi.4 +++ b/share/man/man4/iwlwifi.4 @@ -1,33 +1,12 @@ .\" -.\" SPDX-License-Identifier: BSD-2-Clause -.\" -.\" Copyright (c) 2021-2025 The FreeBSD Foundation +.\" Copyright (c) 2021-2026 The FreeBSD Foundation .\" .\" This documentation was written by Bj\xc3\xb6rn Zeeb under sponsorship from .\" the FreeBSD Foundation. .\" -.\" 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 .\" -.Dd August 19, 2025 +.Dd May 15, 2026 .Dt IWLWIFI 4 .Os .Sh NAME @@ -62,7 +41,7 @@ The driver provides support for Intel Wireless network devices. .Pp .Nm -is derived from Intel's Linux iwlwifi driver. +is derived from Intel's Linux iwlwifi driver based on Linux version 7.0. The .Xr iwm 4 and @@ -72,7 +51,7 @@ driver. .Pp In addition .Nm -already supports Intel's Linux iwlwifi/mld chipsets. +supports the chipsets based on Intel's Linux iwlwifi/mld driver. .Pp .Nm still complements the @@ -83,10 +62,9 @@ Intel's Linux iwlwifi/dvm, which does not support. .Pp The driver uses the -.\" No LinuxKPI man pages so no .Xr here. -.Sy linuxkpi_wlan +.Xr linuxkpi_wlan 4 and -.Sy linuxkpi +.Xr linuxkpi 4 compat framework to bridge between the Linux and native .Fx @@ -147,117 +125,129 @@ Intel(R) Wireless N 7260 .It Intel(R) Dual Band Wireless AC 3160 .It +Intel(R) Wireless N 3160 +.It Intel(R) Dual Band Wireless N 3160 .It -Intel(R) Wireless N 3160 +Intel(R) Dual Band Wireless-AC 3165 .It -Intel(R) Dual Band Wireless AC 3165 +Intel(R) Dual Band Wireless-AC 3168 .It -Intel(R) Dual Band Wireless AC 3168 +Intel(R) Dual Band Wireless-AC 7265 .It -Intel(R) Dual Band Wireless AC 7265 +Intel(R) Dual Band Wireless-N 7265 .It -Intel(R) Wireless N 7265 +Intel(R) Wireless-N 7265 .It -Intel(R) Dual Band Wireless N 7265 +Intel(R) Dual Band Wireless-AC 8260 .It -Intel(R) Dual Band Wireless AC 8260 +Intel(R) Dual Band Wireless-N 8260 .It -Intel(R) Dual Band Wireless N 8260 +Intel(R) Dual Band Wireless-AC 4165 .It -Intel(R) Dual Band Wireless AC 4165 +Intel(R) Dual Band Wireless-AC 8265 .It -Intel(R) Dual Band Wireless AC 8265 +Intel(R) Dual Band Wireless-AC 8275 .It -Intel(R) Dual Band Wireless AC 8275 +Killer(R) Wireless-AC 1435i Wireless Network Adapter (8265D2W) .It -Killer (R) Wireless-AC 1550 Wireless Network Adapter (9260NGW) 160MHz +Killer(R) Wireless-AC 1435-KIX Wireless Network Adapter (8265NGW) .It -Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW) +Intel(R) Wireless-AC 9461 160MHz .It -Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW) +Intel(R) Wireless-AC 9461 .It -Killer(R) Wireless-AC 1550s Wireless Network Adapter (9560D2W) 160MHz +Intel(R) Wireless-AC 9462 160MHz .It -Killer(R) Wireless-AC 1550i Wireless Network Adapter (9560NGW) 160MHz +Intel(R) Wireless-AC 9462 .It -Killer(R) Wi-Fi 6E AX1690s 160MHz Wireless Network Adapter (411D2W) +Intel(R) Wireless-AC 9260 160MHz .It -Killer(R) Wi-Fi 6E AX1690i 160MHz Wireless Network Adapter (411NGW) +Intel(R) Wireless-AC 9260 +.It +Intel(R) Wireless-AC 9560 160MHz +.It +Intel(R) Wireless-AC 9560 +.It +Intel(R) Wi-Fi 6 AX201 160MHz .It -Intel(R) Wireless-AC 9260-1 +Intel(R) Wi-Fi 6 AX101 +.It +Intel(R) Wi-Fi 6 AX203 .It Intel(R) Wi-Fi 6 AX200 160MHz .It -Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W) +Intel(R) Wi-Fi 6E AX211 160MHz .It -Killer(R) Wi-Fi 6 AX1650x 160MHz Wireless Network Adapter (200NGW) +Intel(R) Wi-Fi 6E AX411 160MHz .It -Intel(R) Wi-Fi 6 AX201 160MHz +Intel(R) Wi-Fi 6E AX210 160MHz .It -Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W) +Killer(R) Wireless-AC 1550 Wireless Network Adapter (9260NGW) 160MHz .It -Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW) +Killer(R) Wireless-AC 1550s Wireless Network Adapter (9560D2W) 160MHz +.It +Killer(R) Wireless-AC 1550i Wireless Network Adapter (9560NGW) 160MHz .It -Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201NGW) +Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W) .It -Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201D2W) +Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW) .It -Intel(R) Wi-Fi 6E AX211 160MHz +Killer(R) Wi-Fi 6E AX1675s 160MHz Wireless Network Adapter (211D2W) .It -Intel(R) Wi-Fi 6 AX210 160MHz +Killer(R) Wi-Fi 6E AX1675i 160MHz Wireless Network Adapter (211NGW) .It Killer(R) Wi-Fi 6E AX1675w 160MHz Wireless Network Adapter (210D2W) .It Killer(R) Wi-Fi 6E AX1675x 160MHz Wireless Network Adapter (210NGW) .It -Intel(R) Wi-Fi 6E AX411 160MHz +Killer(R) Wi-Fi 6E AX1690s 160MHz Wireless Network Adapter (411D2W) .It -Killer(R) Wi-Fi 6E AX1675s 160MHz Wireless Network Adapter (211NGW) +Killer(R) Wi-Fi 6E AX1690i 160MHz Wireless Network Adapter (411NGW) .It -Killer(R) Wi-Fi 6E AX1675i 160MHz Wireless Network Adapter (211NGW) +Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W) .It -Intel(R) Wireless-AC 9461 160MHz +Killer(R) Wi-Fi 6 AX1650x 160MHz Wireless Network Adapter (200NGW) .It -Intel(R) Wireless-AC 9461 +Intel(R) Wi-Fi 7 BE201 320MHz .It -Intel(R) Wireless-AC 9462 160MHz +Intel(R) Wi-Fi 7 BE401 320MHz .It -Intel(R) Wireless-AC 9462 +Intel(R) Wi-Fi 7 BE200 320MHz .It -Intel(R) Wireless-AC 9560 160MHz +Intel(R) Wi-Fi 7 BE202 160MHz .It -Intel(R) Wireless-AC 9560 +Killer(R) Wi-Fi 7 BE1750s 320MHz Wireless Network Adapter (BE201D2W) .It -Intel(R) Wireless-AC 9270 160MHz +Killer(R) Wi-Fi 7 BE1750i 320MHz Wireless Network Adapter (BE201NGW) .It -Intel(R) Wireless-AC 9270 +Killer(R) Wi-Fi 7 BE1790s 320MHz Wireless Network Adapter (BE401D2W) .It -Intel(R) Wireless-AC 9162 160MHz +Killer(R) Wi-Fi 7 BE1790i 320MHz Wireless Network Adapter (BE401NGW) .It -Intel(R) Wireless-AC 9162 +Killer(TM) Wi-Fi 7 BE1750w 320MHz Wireless Network Adapter (BE200D2W) .It -Intel(R) Wireless-AC 9260 160MHz +Killer(TM) Wi-Fi 7 BE1750x 320MHz Wireless Network Adapter (BE200NGW) .It -Intel(R) Wireless-AC 9260 +Intel(R) Wi-Fi 7 BE211 320MHz .It -Intel(R) Wi-Fi 6 AX101 +Intel(R) Wi-Fi 6E AX221 160MHz .It -Intel(R) Wi-Fi 6 AX203 +Intel(R) Wi-Fi 7 BE213 160MHz .It -Intel(R) Wi-Fi 6E AX231 160MHz +Intel(R) Wi-Fi 8 BN201 .It -Intel(R) Wi-Fi 7 BE201 320MHz +Intel(R) Wi-Fi 7 BE223 .It -Intel(R) Wi-Fi 7 BE200 320MHz +Intel(R) Wi-Fi 8 BN203 .It -Intel(R) Wi-Fi 7 BE202 160MHz +Killer(R) Wi-Fi 7 BE1775s 320MHz Wireless Network Adapter (BE211D2W) .It -Intel(R) TBD Sc device +Killer(R) Wi-Fi 7 BE1775i 320MHz Wireless Network Adapter (BE211NGW) .It -Intel(R) TBD Sc2 device +Killer(R) Wi-Fi 8 BN1850w2 320MHz Wireless Network Adapter (BN201.D2W) .It -Intel(R) TBD Sc2f device +Killer(R) Wi-Fi 8 BN1850i 320MHz Wireless Network Adapter (BN201.NGW) .\" -------------------------------------------------------------------- .El .Sh LOADER TUNABLES @@ -318,6 +308,8 @@ directory. .Xr iwm 4 , .Xr iwn 4 , .Xr iwx 4 , +.Xr linuxkpi 4, +.Xr linuxkpi_wlan 4, .Xr wlan 4 , .Xr networking 7 , .Xr fwget 8 , diff --git a/share/man/man4/iwlwififw.4 b/share/man/man4/iwlwififw.4 index 45ee0e757c07..32c9e974b60d 100644 --- a/share/man/man4/iwlwififw.4 +++ b/share/man/man4/iwlwififw.4 @@ -1,31 +1,15 @@ .\" -.\" SPDX-License-Identifier: BSD-2-Clause -.\" -.\" Copyright (c) 2021-2025 The FreeBSD Foundation +.\" Copyright (c) 2021-2026 The FreeBSD Foundation .\" .\" This documentation was written by Bj\xc3\xb6rn Zeeb under sponsorship from .\" the FreeBSD Foundation. .\" -.\" 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. +.\" SPDX-License-Identifier: BSD-2-Clause .\" -.\" 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. +.\" NOTE: this man page is obsolete and will be removed in future versions +.\" of FreeBSD as there is (easy) no way to extract the information anymore +.\" from the driver. We do leave it currently for completeness until the +.\" next generation of cards start shipping. .\" .Dd May 12, 2025 .Dt IWLWIFIFW 4 diff --git a/share/man/man4/rtw88.4 b/share/man/man4/rtw88.4 index e01f508ef80e..6f60861cf623 100644 --- a/share/man/man4/rtw88.4 +++ b/share/man/man4/rtw88.4 @@ -1,9 +1,13 @@ -.\"- -.\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Copyright (c) 2022-2026 Bjoern A. Zeeb +.\" Copyright (c) 2026 The FreeBSD Foundation +.\" +.\" Portions of this documentation were written by Bj\xc3\xb6rn Zeeb +.\" under sponsorship from the FreeBSD Foundation. +.\" +.\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd February 10, 2026 +.Dd May 15, 2026 .Dt RTW88 4 .Os .Sh NAME @@ -28,7 +32,7 @@ It is not possible to load the driver from .Sh DESCRIPTION The .Nm -driver is derived from Realtek's Linux rtw88 driver. +driver is derived from Realtek's Linux rtw88 driver based on Linux version 7.0. .Pp This driver requires firmware to be loaded before it will work. The package @@ -45,10 +49,9 @@ One can use to install the correct firmware package. .Pp The driver uses the -.\" No LinuxKPI man pages so no .Xr here. -.Sy linuxkpi_wlan +.Xr linuxkpi_wlan 4 and -.Sy linuxkpi +.Xr linuxkpi 4 compat framework to bridge between the Linux and native .Fx @@ -64,6 +67,8 @@ driver supports PCIe devices with the following chipsets: .It Realtek 802.11n wireless 8723de (RTL8723DE) .It +Realtek 802.11ac wireless 8814ae (RTL8814AE) +.It Realtek 802.11ac wireless 8821ce (RTL8821CE) .It Realtek 802.11ac wireless 8822be (RTL8822BE) @@ -84,6 +89,8 @@ for network buffer memory to the lower 32bit of physical memory and make the driver work. .El .Sh SEE ALSO +.Xr linuxkpi 4, +.Xr linuxkpi_wlan 4, .Xr wlan 4 , .Xr networking 7 , .Xr fwget 8 , @@ -95,14 +102,16 @@ The driver first appeared in .Fx 13.2 . .Sh BUGS -Certainly. -.Pp Does not seem to work (reliably) on machines with more than 4GB of main memory. See in the .Sx LOADER TUNABLES section above. .Pp +At least the 8821CE and 8822BE chipsets have trouble associating, +which seems to be due to the software scan fallback, the chandef emulation, +and net80211 interactions, along with a 6s timeout observed in the driver. +.Pp While .Nm supports 802.11a/b/g/n/ac modes, diff --git a/share/man/man4/rtw89.4 b/share/man/man4/rtw89.4 index 8c7132673db5..95d75781f995 100644 --- a/share/man/man4/rtw89.4 +++ b/share/man/man4/rtw89.4 @@ -1,9 +1,13 @@ -.\"- -.\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Copyright (c) 2023-2025 Bjoern A. Zeeb +.\" Copyright (c) 2026 The FreeBSD Foundation +.\" +.\" Portions of this documentation were written by Bj\xc3\xb6rn Zeeb +.\" under sponsorship from the FreeBSD Foundation. +.\" +.\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd June 13, 2025 +.Dd May 15, 2026 .Dt RTW89 4 .Os .Sh NAME @@ -28,7 +32,7 @@ It is not possible to load the driver from .Sh DESCRIPTION The .Nm -driver is derived from Realtek's Linux rtw89 driver. +driver is derived from Realtek's Linux rtw89 driver based on Linux version 7.0. .Pp This driver requires firmware to be loaded before it will work. The package @@ -45,10 +49,9 @@ One should use to install the correct firmware package. .Pp The driver uses the -.\" No LinuxKPI man pages so no .Xr here. -.Sy linuxkpi_wlan +.Xr linuxkpi_wlan 4 and -.Sy linuxkpi +.Xr linuxkpi 4 compat framework to bridge between the Linux and native .Fx @@ -68,6 +71,8 @@ Realtek 8852AE Wi-Fi 6 (RTL8852AE) .It Realtek 8852BE Wi-Fi 6 (RTL8852BE) .It +Realtek 8852BTE Wi-Fi 6 (RTL8852BE-VT) +.It Realtek 8852CE Wi-Fi 6E (RTL8852CE) .It Realtek 8922AE Wi-Fi 7 (RTL8922AE) @@ -86,6 +91,8 @@ for network buffer memory to the lower 32bit of physical memory and make the driver work. .El .Sh SEE ALSO +.Xr linuxkpi 4, +.Xr linuxkpi_wlan 4, .Xr wlan 4 , .Xr networking 7 , .Xr fwget 8 , @@ -105,6 +112,11 @@ See in the .Sx LOADER TUNABLES section above. .Pp +We observe various stability issues leading up to driver crashes and +kernel panics with the current set of chipsets at least in combination +with +.Xr linuxkpi_wlan 4 . +.Pp While .Nm supports 802.11a/b/g/n/ac/ax modes, From nobody Fri May 15 19:42: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 4gHHf90FHJz6dsy8 for ; Fri, 15 May 2026 19:42:25 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from mail-yx1-xb12d.google.com (mail-yx1-xb12d.google.com [IPv6:2607:f8b0:4864:20::b12d]) (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 4gHHf83r5lz42Kh for ; Fri, 15 May 2026 19:42:24 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yx1-xb12d.google.com with SMTP id 956f58d0204a3-65c364b893aso465776d50.0 for ; Fri, 15 May 2026 12:42:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1778874142; cv=none; d=google.com; s=arc-20240605; b=Xwj/O6c5Xcw4l2wdvIAAfEouvAQ2hvfVGk7St5fabfqa75fUc+fI5o1j1eIJmgJ4IJ 4WhyRCHfAj59Y4qQfBKHjOtgWXj0fOoHb3TPBjtt4FNz8TF1i9LsJfFDftje8vE6v/l/ HoG/g2q2yJr1NKJInOcwZS02gmaiZXtL/WumKp9lnTNeZQXS8vJWA68G5XEbfMA54w62 7m2AqkiTtOws3CtFZJR+21plywxLbH+SkTGV9VFx921gb0H3+AdlkBoi2I04gGQ/PXg0 3i8G0iIQOLJ/AfFBlTMFx15vkhJ8b2tPFmJEpPgl4jBalSP/UqltMeQTq0BL9kwLOuyn WxEQ== 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=WGhiDaaL4v1Gsdz2nsFKiiqvR0PXQwS1OTLPeVdENjA=; fh=g6jKeGrhgsC8Zn4WAwzveZDfTDoj7+YItktGHoQtPS8=; b=CYrWJ7QSPeNti4cubOx9CbO89/Gyz0L+zX3puvtRzZWvTN8kjGstmumYLH4kGXk1s0 UQRiU5OckwiNKjT35EBEAefl82gS/j9ZjgPw4Pm3B9M6X416aFhseirzfeNHbtqn1w/W B7Dm8nbRg8g04pwQgpoMxrPcs2cLozsYbWmtKMWoW+sq9t47aNj3XLgCqEGvLfZ0TDns Jw9XVsw57sY17WZvdsXAR78ysOQLGVwCDMA6308Kj2ICNOX420CYb5vs89nXNlbhIhgd nFHSzbCoPakFxeh0FRTsEIhHDNUSym/mwSA/n2B0lvDPDFoMpa90Nu2/cf3AXkq7UJx+ zLFw==; 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=1778874142; x=1779478942; 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=WGhiDaaL4v1Gsdz2nsFKiiqvR0PXQwS1OTLPeVdENjA=; b=X6Xq5N3A+6BOgt7I1KsAQLQLqQqOayF5M1clyRHpndqvqk0f8zNzjknyPl3jwWqmwt cRCPlDt+DNHTFS2vF10q7L8SPgwXeTGJFByLOfm0JQsu0Xz2/o0UesULuJOO8jA8HBVW A8/IS2O541kBk7C0LjUlLE9i+4fomWP0g3BgftM4TOcCKr4HDAe6ltqo+rBa1CTlLgIZ HioIsUPK6zZy3yI+u1J9QwAfpCeeh05pz2vjupX0avbjofSt4wGTStGN9jDmLBB4rO+g H6NQD8MUYcAWIMWaJx/EZJT0Vu9oDyXqZ8OGbc0vzKB2dQJhaFwYVkDfU3Zl/gbDfXx8 MFuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778874142; x=1779478942; 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=WGhiDaaL4v1Gsdz2nsFKiiqvR0PXQwS1OTLPeVdENjA=; b=THkLLaPLec/L2wWPX14410jzBgkuMgMZjLPzcLuV6usdT+yIMgV/HGo/KUgLrnn7Eu DZnMLNW9HLUnTJOYr2hjddz1QljuNilrh+essi3xP1c9FiIbBA6HFzsyZ0rvrWCMascV shRaqJ80rJrH4llR1eqZ+l53wiz+ntT8v4VlS2gJ6dlNh1ZMA3xTzZkJ4uz+mTt0bISs eXZcV5Y2slWoJb/GqsBO5FtAEssz443JDS/uf//r3/i1p+U+KYDHnI2Dc4fg/wmh3vrw VAGMFDJRr5k7GYzSrxY+aRHJVrwYdJKeh43ctXIwZA2lWZAod+2ZAInz1A5WpbZLcZL3 dpKA== X-Forwarded-Encrypted: i=1; AFNElJ8YBlWq5TYdnET3u0Q7CA0+F6Et+E5ICQv+dfqtuCmml1YrDW0V/MNcHcSzVsyS/onZKKas45u8qzRhpysbaL1/iUuZpA==@freebsd.org X-Gm-Message-State: AOJu0YzJdeUL78TtsMwcJYbtGSZBzpOcZQRyTAij0ymapSeCQ70HhDbj VIpN2ZBGxpjL4Pn/9cuNhHWhfoJrBmkPB7Sw5frQbzZed9MrQ/7KBh7V+I4Fc6DdZVH8qfcvSqv IWyZ0uWH1gownUjsyVPD/nmQTJKpjj/E= X-Gm-Gg: Acq92OGVOC+WVTD5FKf3cwJVd3y+f5UtrEAdOFMAfmcBVju4oSJDnhU3nabdVVPP1nP NVMYVSYLHJzbxXMLFaMSOUcGVXmQdhXu6AayCgY74sFA8B7+9N08VaACv4bOIGPZg1Faysmp3LW o5ukbBsZmyDmeTBwW0D3oeWjVmeXmHRJvpAiHHTWDf/jUcLhMxPm7yYeZcWKMRSESyDQlyeCNlU 5dV5C+607q6jznGQRYSqcU/6LXvqqPl9e+rlRjAD03iOurRox7tR0QGd33kRblg2WacUhwCfWhZ y8AivpInmfIxk9EycnA3HrmkyUMYUHHDPLEPYZAtgI631mCuqFw= X-Received: by 2002:a05:690e:1402:b0:65d:6f10:d42a with SMTP id 956f58d0204a3-65e227cfff6mr5395860d50.39.1778874142364; Fri, 15 May 2026 12:42:22 -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:c9a:b0:514:c31c:db89 with HTTP; Fri, 15 May 2026 12:42:20 -0700 (PDT) In-Reply-To: <6a064e15.44875.4253434b@gitrepo.freebsd.org> References: <6a064e15.44875.4253434b@gitrepo.freebsd.org> From: Oliver Pinter Date: Fri, 15 May 2026 20:42:20 +0100 X-Gm-Features: AVHnY4KHqD2ECw2L6wgkbEZgWe3CrVi5X3X0ChNljK0_PYUDWiepeylSSfHkyGA Message-ID: Subject: Re: git: b92b9da33006 - main - nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes To: Rick Macklem Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="0000000000005b16ab0651e0699c" 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: 4gHHf83r5lz42Kh X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated --0000000000005b16ab0651e0699c Content-Type: text/plain; charset="UTF-8" Hi! On Friday, May 15, 2026, Rick Macklem wrote: > The branch main has been updated by rmacklem: > > URL: https://cgit.FreeBSD.org/src/commit/?id= > b92b9da3300655c86dcd42ea8a5ba45badd90847 > > commit b92b9da3300655c86dcd42ea8a5ba45badd90847 > Author: Rick Macklem > AuthorDate: 2026-05-14 22:33:23 +0000 > Commit: Rick Macklem > CommitDate: 2026-05-14 22:33:23 +0000 > > nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes > > Without this patch, the maximum setting for > vfs.nfsd.srvmaxio was 1Mbyte. This patch increases > that to 4Mbytes. > > The same as for any setting above 128Kbytes, settings up to > 4Mbytes require that kern.ipc.maxsockbuf be increased. > (A message generated after setting vfs.nfsd.srvmaxio via > the /etc/rc.conf variable nfs_server_maxio will indicate > the minimum setting, which will be somewhat greater than > four times the setting of vfs.nfsd.srvmaxio.) > > Requested by: Cedric Blancher > MFC after: 2 weeks > Fixes: 13d3bd165e22 ("subr_uio.c: Remove a KASSERT() for large NFS > server I/O") Wouldn't be better to introduce an MFC with tag, rater than abusing the Fixes tag? This seems to me like a new "feature", rather than a bug. And it will may be added to releasenotes also. > --- > sys/fs/nfs/nfsproto.h | 3 +++ > sys/fs/nfsserver/nfs_nfsdport.c | 5 +++-- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h > index 6e67c5be3416..1054c85d8e8f 100644 > --- a/sys/fs/nfs/nfsproto.h > +++ b/sys/fs/nfs/nfsproto.h > @@ -89,8 +89,11 @@ > * It used to be called NFS_MAXDATA, but has been renamed to clarify that > * it refers to server side only and doesn't conflict with the NFS_MAXDATA > * defined in rpcsvc/nfs_prot.h for userland. > + * NFS_SRVMAXIO is the default setting for vfs.nfsd.srvmaxio > + * NFS_SRVLIMITIO is the maximum setting allowed for vfs.nfsd.srvmaxio > */ > #define NFS_SRVMAXIO (128 * 1024) > +#define NFS_SRVLIMITIO (4 * 1024 * 1024) > > /* Stat numbers for rpc returns (version 2, 3 and 4) */ > /* > diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_ > nfsdport.c > index e42d5ca1e0a3..1e6936ed351c 100644 > --- a/sys/fs/nfsserver/nfs_nfsdport.c > +++ b/sys/fs/nfsserver/nfs_nfsdport.c > @@ -241,8 +241,9 @@ sysctl_srvmaxio(SYSCTL_HANDLER_ARGS) > printf("nfsd: vfs.nfsd.srvmaxio can only be increased\n"); > return (EINVAL); > } > - if (newsrvmaxio > 1048576) { > - printf("nfsd: vfs.nfsd.srvmaxio cannot be > 1Mbyte\n"); > + if (newsrvmaxio > NFS_SRVLIMITIO) { > + printf("nfsd: vfs.nfsd.srvmaxio cannot be > %d\n", > + NFS_SRVLIMITIO); > return (EINVAL); > } > if ((newsrvmaxio & (newsrvmaxio - 1)) != 0) { > > --0000000000005b16ab0651e0699c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi!

On Friday, May 15, 2026, Rick Macklem <rmacklem@freebsd.org> wrote:
The branch main has been updated by rmacklem:

URL: https://cgit.FreeBSD.org/src/commit/?id=3Db92b9da3300655c86dcd42ea8a5ba45badd90847

commit b92b9da3300655c86dcd42ea8a5ba45badd90847
Author:=C2=A0 =C2=A0 =C2=A0Rick Macklem <rmacklem@FreeBSD.org>
AuthorDate: 2026-05-14 22:33:23 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Rick Macklem <rmacklem@FreeBSD.org>
CommitDate: 2026-05-14 22:33:23 +0000

=C2=A0 =C2=A0 nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes

=C2=A0 =C2=A0 Without this patch, the maximum setting for
=C2=A0 =C2=A0 vfs.nfsd.srvmaxio was 1Mbyte.=C2=A0 This patch increases
=C2=A0 =C2=A0 that to 4Mbytes.

=C2=A0 =C2=A0 The same as for any setting above 128Kbytes, settings up to =C2=A0 =C2=A0 4Mbytes require that kern.ipc.maxsockbuf be increased.
=C2=A0 =C2=A0 (A message generated after setting vfs.nfsd.srvmaxio via
=C2=A0 =C2=A0 the /etc/rc.conf variable nfs_server_maxio will indicate
=C2=A0 =C2=A0 the minimum setting, which will be somewhat greater than
=C2=A0 =C2=A0 four times the setting of vfs.nfsd.srvmaxio.)

=C2=A0 =C2=A0 Requested by:=C2=A0 =C2=A0Cedric Blancher <cedric.blancher@gmail.com>
=C2=A0 =C2=A0 MFC after:=C2=A0 =C2=A0 =C2=A0 2 weeks
=C2=A0 =C2=A0 Fixes:=C2=A0 13d3bd165e22 ("subr_uio.c: Remove a KASSERT= () for large NFS server I/O")

Wouldn&#= 39;t be better to introduce an MFC with tag, rater than abusing the Fixes t= ag? This seems to me like a new "feature", rather than a bug. And= it will may be added to releasenotes also.
=C2=A0
---
=C2=A0sys/fs/nfs/nfsproto.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 3 +++=
=C2=A0sys/fs/nfsserver/nfs_nfsdport.c | 5 +++--
=C2=A02 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h
index 6e67c5be3416..1054c85d8e8f 100644
--- a/sys/fs/nfs/nfsproto.h
+++ b/sys/fs/nfs/nfsproto.h
@@ -89,8 +89,11 @@
=C2=A0 * It used to be called NFS_MAXDATA, but has been renamed to clarify = that
=C2=A0 * it refers to server side only and doesn't conflict with the NF= S_MAXDATA
=C2=A0 * defined in rpcsvc/nfs_prot.h for userland.
+ * NFS_SRVMAXIO is the default setting for vfs.nfsd.srvmaxio
+ * NFS_SRVLIMITIO is the maximum setting allowed for vfs.nfsd.srvmaxio
=C2=A0 */
=C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 NFS_SRVMAXIO=C2=A0 =C2=A0 (128 * 1= 024)
+#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 NFS_SRVLIMITIO=C2=A0 (4 * 1024 * 1024)<= br>
=C2=A0/* Stat numbers for rpc returns (version 2, 3 and 4) */
=C2=A0/*
diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c
index e42d5ca1e0a3..1e6936ed351c 100644
--- a/sys/fs/nfsserver/nfs_nfsdport.c
+++ b/sys/fs/nfsserver/nfs_nfsdport.c
@@ -241,8 +241,9 @@ sysctl_srvmaxio(SYSCTL_HANDLER_ARGS)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 printf("nfsd: = vfs.nfsd.srvmaxio can only be increased\n");
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (EINVAL); =C2=A0 =C2=A0 =C2=A0 =C2=A0 }
-=C2=A0 =C2=A0 =C2=A0 =C2=A0if (newsrvmaxio > 1048576) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0printf("nfsd: = vfs.nfsd.srvmaxio cannot be > 1Mbyte\n");
+=C2=A0 =C2=A0 =C2=A0 =C2=A0if (newsrvmaxio > NFS_SRVLIMITIO) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0printf("nfsd: = vfs.nfsd.srvmaxio cannot be > %d\n",
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NFS_S= RVLIMITIO);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (EINVAL); =C2=A0 =C2=A0 =C2=A0 =C2=A0 }
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if ((newsrvmaxio & (newsrvmaxio - 1)) !=3D = 0) {

--0000000000005b16ab0651e0699c-- From nobody Fri May 15 19:44: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 4gHHhD3pfWz6dt6Q for ; Fri, 15 May 2026 19:44:12 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from mail-yx1-xb12e.google.com (mail-yx1-xb12e.google.com [IPv6:2607:f8b0:4864:20::b12e]) (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 4gHHh93pGPz42Sr for ; Fri, 15 May 2026 19:44:09 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20251104 header.b=fP9jZIjQ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of oliver.pntr@gmail.com designates 2607:f8b0:4864:20::b12e as permitted sender) smtp.mailfrom=oliver.pntr@gmail.com; arc=pass ("google.com:s=arc-20240605:i=1") Received: by mail-yx1-xb12e.google.com with SMTP id 956f58d0204a3-65890a6ca20so505445d50.0 for ; Fri, 15 May 2026 12:44:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1778874243; cv=none; d=google.com; s=arc-20240605; b=VOinThimzI2omjvjGyZ2H4wcEOa/8zljuWXnBb8r3QmBEnPkEdQYTgEV9JHvz+LBkC S1gTF4/aSqvXgZGELD6YXFt6RiBAhabeLmloEsxMV9R1Vxfs7T3mx8/Y9GlfdnJZnmyj p9B8JnNXETGC7Oe/tom9Rl9QfkZNmQdJx3kIdqMGBYa+adbK2Y1f7TCnOHPHhbYGzjIW bRDkRu6H1NHLuOt5AnKApCsQYv5h2O3DQhVpud0p5aqd7+Ee8HQGg4DhBngDhGw+HYAG QNePjspKCYDGQkKCV6oiSscs2A2P7WLfH7dt0+RkriMhC8nOr0xZS8Sp9ZZG6r+5MGsZ UUOA== 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=yrxKU7fENYV8hR1/De76nQ91++TDZJQe0H4RwN3ODhU=; fh=OUZET+XACTXEClX38p9UqupcRclP0oidushUFgAnmLg=; b=goE/ijGEtvTuJOYR4AVw6Qw5za5nQMZ/kdjQwF9wmbq+5/U/K7wRS0JtDf5qmwhOLy ye9nIvaC2+VN/NJ7b0J6aDDKPV6NRLS1AfrHbQe56BXdRGK9izcprRpRG1gg6ZcZLKrb nAWmQZUz3g8WaPXxbT62gy0hxdfj+KDGdLvdJjZF0TPvw1YP8dNmNK5Y/Dfkuw3blYGa UVVkEwO6RZEbaV7ugZvPCalx0Ze/Va/fZ4vuXR8rf7twWyDffOSrTb0xsyntQrz9ajI8 kqZYGHQstyLWCuZdc+OdXgA06qUDWHNYH/5WcKYlmTf5P7LjZVCDV7KhSrxE5EmAzBeG s6xw==; 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=1778874243; x=1779479043; 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=yrxKU7fENYV8hR1/De76nQ91++TDZJQe0H4RwN3ODhU=; b=fP9jZIjQ60kc5utmR1bipUiQctvFZxs8FilqyMkvmnM9c3FjZP/rbp4KGIED+euAqY XwmeChzQW9db/ITR2Hs898kJcmOZV8YNeYtXFFKYFEOYgvkmESGGGcmvL0qPPKg7IQqF cCe7lhzyCmgDwipUgmXC6BtJmcmt/xI/kiKJELEpztHlw1zzz4sD0Khmpw4HVBRZprs2 ZNmLphnIrrRd1bNu0tckzLp65bijANgJbf0o7Xb4Bf9rqaE9k38CwfOlOss+P9k0HD6W fuLCw8al5LGoz1vWUo2WvrfkUkV3VVNneextx3u8Gqt7yi1diY/hFsTluOa0+DyfRgRe ya1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778874243; x=1779479043; 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=yrxKU7fENYV8hR1/De76nQ91++TDZJQe0H4RwN3ODhU=; b=g7qDHsx9tNDRDquSSil/uEnDGuXjnzN0ZI8aKa5k4loruyWzHYzNnyyWCxrHGR3Gl9 Z1gDqzFh1d8O8mUKzCqdXwAciKbygqY6HvDxBfJBBZGRziLScMXo7P13B4ouLQdpIDYL 9r/x7lXq24aT9uZ8Jn9tr/oHPga1Gf+3G+Ano/D3qGVcMqYBtQrUXAsGQ5JoeRB4WaIP Xln08IPat/nbOJ5sNo6T7KbRUuLlYROA+cbqLVAqscemj+0PXjP1vCeSKYIn5VXZA7nL vzYLsx8bM03x9JGnRvs5bAgrNa9Fk2FfSZaTp7iRTUqHRLLl8WOweABM+kizet+PIC/b 54tg== X-Forwarded-Encrypted: i=1; AFNElJ/eMQkDEs2P5I3A1r4kmwMnYbaDjKPqjeOsozCSXyc/OUPHUlg8CT3xq4IwcfliiZEpFDUPV/6hDmwoXQ1fXmqiOyUWLQ==@freebsd.org X-Gm-Message-State: AOJu0YxnUxIa0C9DkPU3N/JO/lxW/LbtOpVanJdMJ3gHAFEoKl11aygU Uhp32d3cp/Q9o8DnvmNt5JckfHwiD81b80UJklRgf+WG+VLAdwM+O0TUUStfQo95FjB3tu1mpiT MbMWaWN5+lys1z5318kGbwfl+adqSrRI= X-Gm-Gg: Acq92OFrsoBoGely1f+jY5MEG7HfNcm381zmc+K41A0oygMzpr8ehJB0c+2mPi+2kNB jvdf+AZyyZlNFRje6cCUwUPictFUjzw+4C6bOfpBI6jPWlBLxgVnAVcEVk40/ASTVKlZS2iFK73 erpX/aJd9XHHitvxD3R1khbeZzs90FjYzujV+W5GlEgp/lEyBV3zNcriO4hrwtvKwS8Tzo30CKC awhrGlAgQkqCwHMlJ8jRVYq65qrOa9+6gKatosW23By9OqrRvfzQo7TB2hHJoMbK+tAp45eBn8M dZ4uukk+g4JqB6vyA6X4y0i5zgkc445Wnb3p7al1 X-Received: by 2002:a05:690e:4806:b0:650:a6d:d6bf with SMTP id 956f58d0204a3-65e2282a752mr3961703d50.51.1778874243448; Fri, 15 May 2026 12:44:03 -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:1b89:b0:518:4b65:6f6d with HTTP; Fri, 15 May 2026 12:44:01 -0700 (PDT) In-Reply-To: References: <6a064e15.44875.4253434b@gitrepo.freebsd.org> From: Oliver Pinter Date: Fri, 15 May 2026 20:44:01 +0100 X-Gm-Features: AVHnY4IC9OLCdRqd-o7eXF-nlG1X0nc_yb7PXAIBMUCV9xQ_77_Qr7z4MW1F12c Message-ID: Subject: Re: git: b92b9da33006 - main - nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes To: Rick Macklem Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="0000000000006184be0651e06f17" X-Spamd-Result: default: False [-5.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; ARC_ALLOW(-1.00)[google.com:s=arc-20240605:i=1]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4864::/56:c]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20251104]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; TAGGED_FROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; TO_DN_EQ_ADDR_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; MISSING_XM_UA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; MID_RHS_MATCH_FROMTLD(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::b12e:from] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4gHHh93pGPz42Sr --0000000000006184be0651e06f17 Content-Type: text/plain; charset="UTF-8" On Friday, May 15, 2026, Oliver Pinter wrote: > Hi! > > On Friday, May 15, 2026, Rick Macklem wrote: > >> The branch main has been updated by rmacklem: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=b92b9da3300655c86dcd >> 42ea8a5ba45badd90847 >> >> commit b92b9da3300655c86dcd42ea8a5ba45badd90847 >> Author: Rick Macklem >> AuthorDate: 2026-05-14 22:33:23 +0000 >> Commit: Rick Macklem >> CommitDate: 2026-05-14 22:33:23 +0000 >> >> nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes >> >> Without this patch, the maximum setting for >> vfs.nfsd.srvmaxio was 1Mbyte. This patch increases >> that to 4Mbytes. >> >> The same as for any setting above 128Kbytes, settings up to >> 4Mbytes require that kern.ipc.maxsockbuf be increased. >> (A message generated after setting vfs.nfsd.srvmaxio via >> the /etc/rc.conf variable nfs_server_maxio will indicate >> the minimum setting, which will be somewhat greater than >> four times the setting of vfs.nfsd.srvmaxio.) >> >> Requested by: Cedric Blancher >> MFC after: 2 weeks >> Fixes: 13d3bd165e22 ("subr_uio.c: Remove a KASSERT() for large NFS >> server I/O") > > > Wouldn't be better to introduce an MFC with tag, rater than abusing the > Fixes tag? This seems to me like a new "feature", rather than a bug. And it > will may be added to releasenotes also. > > (sorry, I've just seen now, the release notes, I'm going through on the commit from oldest to newest, but the other part is still relevant) > --- >> sys/fs/nfs/nfsproto.h | 3 +++ >> sys/fs/nfsserver/nfs_nfsdport.c | 5 +++-- >> 2 files changed, 6 insertions(+), 2 deletions(-) >> >> diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h >> index 6e67c5be3416..1054c85d8e8f 100644 >> --- a/sys/fs/nfs/nfsproto.h >> +++ b/sys/fs/nfs/nfsproto.h >> @@ -89,8 +89,11 @@ >> * It used to be called NFS_MAXDATA, but has been renamed to clarify that >> * it refers to server side only and doesn't conflict with the >> NFS_MAXDATA >> * defined in rpcsvc/nfs_prot.h for userland. >> + * NFS_SRVMAXIO is the default setting for vfs.nfsd.srvmaxio >> + * NFS_SRVLIMITIO is the maximum setting allowed for vfs.nfsd.srvmaxio >> */ >> #define NFS_SRVMAXIO (128 * 1024) >> +#define NFS_SRVLIMITIO (4 * 1024 * 1024) >> >> /* Stat numbers for rpc returns (version 2, 3 and 4) */ >> /* >> diff --git a/sys/fs/nfsserver/nfs_nfsdport.c >> b/sys/fs/nfsserver/nfs_nfsdport.c >> index e42d5ca1e0a3..1e6936ed351c 100644 >> --- a/sys/fs/nfsserver/nfs_nfsdport.c >> +++ b/sys/fs/nfsserver/nfs_nfsdport.c >> @@ -241,8 +241,9 @@ sysctl_srvmaxio(SYSCTL_HANDLER_ARGS) >> printf("nfsd: vfs.nfsd.srvmaxio can only be increased\n"); >> return (EINVAL); >> } >> - if (newsrvmaxio > 1048576) { >> - printf("nfsd: vfs.nfsd.srvmaxio cannot be > 1Mbyte\n"); >> + if (newsrvmaxio > NFS_SRVLIMITIO) { >> + printf("nfsd: vfs.nfsd.srvmaxio cannot be > %d\n", >> + NFS_SRVLIMITIO); >> return (EINVAL); >> } >> if ((newsrvmaxio & (newsrvmaxio - 1)) != 0) { >> >> --0000000000006184be0651e06f17 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

On Friday, May 15, 2026, Oliver Pinter <oliver.pntr@gmail.com> wrote:
Hi!

On Friday, May 15, 2026, Rick Macklem <rmacklem@freebsd.org= > wrote:
The branch main has been upda= ted by rmacklem:

URL: https://cgit.FreeBSD.org/src/commit/?id=3Db92b9da3300655c86dcd42ea8a5ba45badd90847

commit b92b9da3300655c86dcd42ea8a5ba45badd90847
Author:=C2=A0 =C2=A0 =C2=A0Rick Macklem <rmacklem@FreeBSD.org>
AuthorDate: 2026-05-14 22:33:23 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Rick Macklem <rmacklem@FreeBSD.org>
CommitDate: 2026-05-14 22:33:23 +0000

=C2=A0 =C2=A0 nfsd: Allow vfs.nfsd.srvmaxio to be up to 4Mbytes

=C2=A0 =C2=A0 Without this patch, the maximum setting for
=C2=A0 =C2=A0 vfs.nfsd.srvmaxio was 1Mbyte.=C2=A0 This patch increases
=C2=A0 =C2=A0 that to 4Mbytes.

=C2=A0 =C2=A0 The same as for any setting above 128Kbytes, settings up to =C2=A0 =C2=A0 4Mbytes require that kern.ipc.maxsockbuf be increased.
=C2=A0 =C2=A0 (A message generated after setting vfs.nfsd.srvmaxio via
=C2=A0 =C2=A0 the /etc/rc.conf variable nfs_server_maxio will indicate
=C2=A0 =C2=A0 the minimum setting, which will be somewhat greater than
=C2=A0 =C2=A0 four times the setting of vfs.nfsd.srvmaxio.)

=C2=A0 =C2=A0 Requested by:=C2=A0 =C2=A0Cedric Blancher <cedric.blancher@gmail.com>
=C2=A0 =C2=A0 MFC after:=C2=A0 =C2=A0 =C2=A0 2 weeks
=C2=A0 =C2=A0 Fixes:=C2=A0 13d3bd165e22 ("subr_uio.c: Remove a KASSERT= () for large NFS server I/O")


---
=C2=A0sys/fs/nfs/nfsproto.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 3 +++=
=C2=A0sys/fs/nfsserver/nfs_nfsdport.c | 5 +++--
=C2=A02 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h
index 6e67c5be3416..1054c85d8e8f 100644
--- a/sys/fs/nfs/nfsproto.h
+++ b/sys/fs/nfs/nfsproto.h
@@ -89,8 +89,11 @@
=C2=A0 * It used to be called NFS_MAXDATA, but has been renamed to clarify = that
=C2=A0 * it refers to server side only and doesn't conflict with the NF= S_MAXDATA
=C2=A0 * defined in rpcsvc/nfs_prot.h for userland.
+ * NFS_SRVMAXIO is the default setting for vfs.nfsd.srvmaxio
+ * NFS_SRVLIMITIO is the maximum setting allowed for vfs.nfsd.srvmaxio
=C2=A0 */
=C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 NFS_SRVMAXIO=C2=A0 =C2=A0 (128 * 1= 024)
+#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 NFS_SRVLIMITIO=C2=A0 (4 * 1024 * 1024)<= br>
=C2=A0/* Stat numbers for rpc returns (version 2, 3 and 4) */
=C2=A0/*
diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nf= sdport.c
index e42d5ca1e0a3..1e6936ed351c 100644
--- a/sys/fs/nfsserver/nfs_nfsdport.c
+++ b/sys/fs/nfsserver/nfs_nfsdport.c
@@ -241,8 +241,9 @@ sysctl_srvmaxio(SYSCTL_HANDLER_ARGS)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 printf("nfsd: = vfs.nfsd.srvmaxio can only be increased\n");
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (EINVAL); =C2=A0 =C2=A0 =C2=A0 =C2=A0 }
-=C2=A0 =C2=A0 =C2=A0 =C2=A0if (newsrvmaxio > 1048576) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0printf("nfsd: = vfs.nfsd.srvmaxio cannot be > 1Mbyte\n");
+=C2=A0 =C2=A0 =C2=A0 =C2=A0if (newsrvmaxio > NFS_SRVLIMITIO) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0printf("nfsd: = vfs.nfsd.srvmaxio cannot be > %d\n",
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NFS_S= RVLIMITIO);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (EINVAL); =C2=A0 =C2=A0 =C2=A0 =C2=A0 }
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if ((newsrvmaxio & (newsrvmaxio - 1)) !=3D = 0) {

--0000000000006184be0651e06f17-- From nobody Fri May 15 21:01:09 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 4gHKP528jXz6dyDP; Fri, 15 May 2026 21:01:13 +0000 (UTC) (envelope-from bz@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 4gHKP51Nxtz49bK; Fri, 15 May 2026 21:01:13 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778878873; 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=hhmW/ELtik9uN5OlF1LRm2eKZBxW/byqEDMV7/ZUM3A=; b=P2W9mCIi18Ttk+L1Afv/ocvcdC/JJDuBQ99tHVvPnTGIxPfUWxkeqxZTN9mkgBajqTTkyj t2TZlBnqFEBNgpxbaFJlj3EU5X90Wp/YKYN6U0t9T98rxWrVrbTUPhY3qUYwBbvLTbfGuo lnyg2/6Y9lXz5M04oNt5UuW8nD/ehHAwOKpxoG2dzkuXDEhJVhLPbORbSQLxFzVlIOWLQu t8luKn0fpM/mPbuxafKzOickKsWOtR9s3spITsNduDstPR1ZsedI73SvSNFm6PpZpSVJLJ X9V23gdn+iKZbY9G32JVdagFnSkli6AgAhKejV9AmGpDxNU+F3gbAJAdCR9nqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778878873; a=rsa-sha256; cv=none; b=LU8yhkYXd0PTaEvE/TjNGP+G8snUEBLBaHjU3zGUsPoNJNWwpr+P+d8BNPsqX3+sVmSqfs EQAaNs4OTjdspOZa9tzX2qDuUUEG518gKg/abZqi5Vuxj61lr146eLK2T5YmLtpMCoco8+ Ij/FeLEbj36yCqnnjFcZrzBNqGCUMrXyU8G/zxTL8nrvBm+6t58ZqHFGHshLYmX8nAst78 POR9SdCNkQ6cD61GfBkRIxz1AvCwOa2va7WrPBUg3Ioh+P+PFPxxsBpxcj+b7sz6hHT1mX cOnzyAVujdNtn4rEfDpQrlTM9EFRLKrVp8EPQPdzbtcyOLGNqlAhCDUszxz9Qw== 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=1778878873; 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=hhmW/ELtik9uN5OlF1LRm2eKZBxW/byqEDMV7/ZUM3A=; b=qD/umICkrVWVJiIYAC0LClPz8G3bhIpkg8Xvr520xio633oYvVUMSbELeyhgJ8m/jIWu1y zoPfRgw5zxT0y2zFV1bBmSMAe1inSGHgxfPd4UMwoPo3qaPiVoHaoFAle4ERjcaCdYMg8C HG5kljid4oI1PcxfIC6DCptX8HZbZNIDp6+fVmQ87m9XduAoGA5fC1x11pesN1SLV1zr4f CbgAqixUYG6VkDyA6RD+vrzjq9miEYNQOAybW+Y+QgT5dcAZFjKKSb7LOqokTRiN0Nc3fz pGd33Vw+7TwOmCy34d2N2w9KxqF5f/yJE06kuF80Hz9kXALWiI0NP60m1NE1HA== Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe: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-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E7" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gHKP501VLzQbq; Fri, 15 May 2026 21:01:12 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id 535C2A64806; Fri, 15 May 2026 21:00:47 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 5F7452D029E9; Fri, 15 May 2026 21:01:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id 6QCkehKAaZTP; Fri, 15 May 2026 21:01:10 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 4E35F2D029D8; Fri, 15 May 2026 21:01:10 +0000 (UTC) Date: Fri, 15 May 2026 21:01:09 +0000 (UTC) From: "Bjoern A. Zeeb" To: Ruslan Bukin cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: bcecad2c24aa - main - riscv: IOMMU support In-Reply-To: <6a02fef9.3c055.3a6526da@gitrepo.freebsd.org> Message-ID: References: <6a02fef9.3c055.3a6526da@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 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; format=flowed On Tue, 12 May 2026, Ruslan Bukin wrote: > The branch main has been updated by br: > > URL: https://cgit.FreeBSD.org/src/commit/?id=bcecad2c24aa500913559c00f1be8b364a3ff150 > > commit bcecad2c24aa500913559c00f1be8b364a3ff150 > Author: Ruslan Bukin > AuthorDate: 2026-05-12 10:09:04 +0000 > Commit: Ruslan Bukin > CommitDate: 2026-05-12 10:11:32 +0000 > > riscv: IOMMU support > > Support for RISC-V IOMMU spec v1.0.1 (ratified) > https://github.com/riscv-non-isa/riscv-iommu > > Supports translation for PCI devices only. > Supports 1 or 2-level device-directory-table (DDT). > Supports SV39 and SV48 virtual memory system (on per-device basis). > Supports both "standard" and "extended" device-context (DC) structure. > Supports "bypass" mode to disable translation for a particular device. > Supports WSI (Wire-Signalled Interrupts) only. > > This includes both PCI-bus and FDT attachment drivers. > > Note in case of PCI-bus attachment, interrupts are not available. In this > case no error report is provided in case of translation fault. Otherwise > interrupts are not needed. > > Differential Revision: https://reviews.freebsd.org/D55922 > --- > sys/conf/files.riscv | 9 + > sys/riscv/conf/GENERIC | 1 + > sys/riscv/include/bus_dma_impl.h | 3 + > sys/riscv/include/iommu.h | 10 + > sys/riscv/iommu/iommu.c | 1351 ++++++++++++++++++++++++++++++++++++++ > sys/riscv/iommu/iommu.h | 359 ++++++++++ > sys/riscv/iommu/iommu_fdt.c | 145 ++++ > sys/riscv/iommu/iommu_frontend.c | 505 ++++++++++++++ > sys/riscv/iommu/iommu_frontend.h | 38 ++ > sys/riscv/iommu/iommu_if.m | 147 +++++ > sys/riscv/iommu/iommu_pci.c | 172 +++++ > sys/riscv/iommu/iommu_pmap.c | 629 ++++++++++++++++++ > sys/riscv/iommu/iommu_pmap.h | 49 ++ > 13 files changed, 3418 insertions(+) There are some accesses to sp_resident_count which are not guarded by INVARIANTS which makes kernel compiles fail. -- Bjoern A. Zeeb r15:7 From nobody Fri May 15 21:03: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 4gHKSJ2lHpz6dyhC; Fri, 15 May 2026 21:04:00 +0000 (UTC) (envelope-from bz@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 4gHKSJ25qkz4CSk; Fri, 15 May 2026 21:04:00 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778879040; 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=qt+IrCmqtvIyBPv9TWHlxlrYI5yIUdtwbBq1JjrJgfw=; b=ByBeFFfvSSQCO7kZ28GLO2k/c+o+mxEVBTUSqbkamBbxYBhVps3N9DNPyldvpI8lBebymZ 0JFgXj9VO4yZqW0PgRiS6FZuhIbEDz/yCXO0sP4J58SxcKRPhdfplampyTAvWYScLxAUSI j8cWoV1m/awiBUAIBJ3T3LUm9+Bpim0ohZNuG4JDGTwBLdsVjpAUjMs2N/XU+yTz+KmAh4 +aE9aE+WeoXA+Cg3zXS2JZ9ZWVKPUA3cUTo6ddVqX2ucVgFug+5LdNqjsPvnmzKDD8Q459 wpZsIsrKBd/+1RS3l4wmkRKs5HmYBvy9E6NR8IPNit1VQ38XD++okRuNl/LtaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778879040; a=rsa-sha256; cv=none; b=T18wodA/RX4qmxo6xQRkkWglRLsSob+FnNA1DvWEWChtYm9h/WcCXgDVtnG1tNm/Jlbx27 GrgyvSiiBR8fCXqOyqYt2+BlCXgREYp8j6aYN0GbsB+Pz6frziGY3iksc7eMaToDmL5vkX L0h03ocYD1Z2Mj7xMr/BZvWqT8Wt9O86RX7g7plf0pyo12r59CXKWLMWGRqMMuzeO5Q1pH RN4i4pu0ZkL4hgevvrxCLdz8gX/8BFUHnk4W+43o/yk30w+l7jPlEdP4pQPYlOJoV9jdjR ZUNnFSQVLtH1xIfAcB9CPcbFeO9YIcz4vpCc4LESjzsz7f19iaHfmSECxrW41w== 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=1778879040; 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=qt+IrCmqtvIyBPv9TWHlxlrYI5yIUdtwbBq1JjrJgfw=; b=tWrOnUBgGqHQ3qXBrntWR9C20nYT3L3GxaEQ6IBkcO1+Y8wz2V7pNT2tXTq/+ERLMfYWay /2AAyAwqwHflvS4eqSCSshNSc14/wf12N0MyJsHXulqFyDSuHzD/iXPa3NnqH+pmTjW4KW mUowh0CcmkVqMyqA0RYa7MYGylj+1TJWyqj0oh4141GTIyNs6XDbAqXqVqIJyBI24ccE83 lBQTb1FfMDD36k9Pvqi7r0Iwuh4rKE9S4j/BNwV+PUGK6N7cC/GwG2CJxZvt5LiFAp2vjq 2LtB/vsjcumNRhl7W86oGJpkMvQ9s1xFOtKLKSUel3M8fhW0MqBut/Vx4nhPkg== Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe: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-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E7" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gHKSJ0dpxzPm2; Fri, 15 May 2026 21:04:00 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id 6EA3CA64805; Fri, 15 May 2026 21:03:34 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 64DD32D029E9; Fri, 15 May 2026 21:03:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id GHvb6Jy-DUNA; Fri, 15 May 2026 21:03:57 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 568952D029D8; Fri, 15 May 2026 21:03:57 +0000 (UTC) Date: Fri, 15 May 2026 21:03:57 +0000 (UTC) From: "Bjoern A. Zeeb" To: Ruslan Bukin cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: bcecad2c24aa - main - riscv: IOMMU support In-Reply-To: <6a02fef9.3c055.3a6526da@gitrepo.freebsd.org> Message-ID: <5poorp6p-3r7-317r-p54q-355r73r852r@mnoonqbm.arg> References: <6a02fef9.3c055.3a6526da@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 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; format=flowed On Tue, 12 May 2026, Ruslan Bukin wrote: > The branch main has been updated by br: > > URL: https://cgit.FreeBSD.org/src/commit/?id=bcecad2c24aa500913559c00f1be8b364a3ff150 > > commit bcecad2c24aa500913559c00f1be8b364a3ff150 > Author: Ruslan Bukin > AuthorDate: 2026-05-12 10:09:04 +0000 > Commit: Ruslan Bukin > CommitDate: 2026-05-12 10:11:32 +0000 > > riscv: IOMMU support > > Support for RISC-V IOMMU spec v1.0.1 (ratified) > https://github.com/riscv-non-isa/riscv-iommu > > Supports translation for PCI devices only. > Supports 1 or 2-level device-directory-table (DDT). > Supports SV39 and SV48 virtual memory system (on per-device basis). > Supports both "standard" and "extended" device-context (DC) structure. > Supports "bypass" mode to disable translation for a particular device. > Supports WSI (Wire-Signalled Interrupts) only. > > This includes both PCI-bus and FDT attachment drivers. > > Note in case of PCI-bus attachment, interrupts are not available. In this > case no error report is provided in case of translation fault. Otherwise > interrupts are not needed. > > Differential Revision: https://reviews.freebsd.org/D55922 > --- > sys/conf/files.riscv | 9 + > sys/riscv/conf/GENERIC | 1 + > sys/riscv/include/bus_dma_impl.h | 3 + > sys/riscv/include/iommu.h | 10 + > sys/riscv/iommu/iommu.c | 1351 ++++++++++++++++++++++++++++++++++++++ > sys/riscv/iommu/iommu.h | 359 ++++++++++ > sys/riscv/iommu/iommu_fdt.c | 145 ++++ > sys/riscv/iommu/iommu_frontend.c | 505 ++++++++++++++ > sys/riscv/iommu/iommu_frontend.h | 38 ++ > sys/riscv/iommu/iommu_if.m | 147 +++++ > sys/riscv/iommu/iommu_pci.c | 172 +++++ > sys/riscv/iommu/iommu_pmap.c | 629 ++++++++++++++++++ > sys/riscv/iommu/iommu_pmap.h | 49 ++ > 13 files changed, 3418 insertions(+) It seems that sys/riscv/conf/NOTES needs to include iommu now as otherwise the build fails with missing symbols. -- Bjoern A. Zeeb r15:7 From nobody Fri May 15 21:31: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 4gHL3X6vMsz6f1C6 for ; Fri, 15 May 2026 21:31: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 4gHL3X651fz4G8F for ; Fri, 15 May 2026 21:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778880664; 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=7FJDbbmbjOhHlhbA0HXs33eud9x39WT20b37DHAwGUg=; b=afV5JdUxUXkb0Qb8q8eKdKTNG5EWgtNdUbZ9BDmZWKCV6yWD7wKA/U4jRPEJ+FGdzxz2Bs o/UwORfT6oxIq82SI1VOj9Ja+CDLBKtNY6+CQZ0m12tE9SSXITZLdtC3jBiAaQuUos5HAo 7zdHRbuEt92qYXNzejxVFuhW5H/QkXqWYriHvSz0s9TN3l89G+G444SVenmXUjEstGyEA5 jnQb3935Lvn31RLDbwmwcvrYNk6SXdMcn9ahs1ipDxwFwS9CQg1R17/4iOdOPrJUxhPp1o /gJtpzl6A8TkPSa1BkvskUmhv+BmZbY18L4MgUtvlpeQr6p/ousYpDvXgrOn0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778880664; a=rsa-sha256; cv=none; b=gjinQCjXKfMGMTEG4BkY29tFAxIS5LeFEA/ZDIP5JwIqnx5q74KQRzZ6RGOtiCLiFZxPda iT91vpYUcg1TWbgfBBKfisX444HSoOYqIqN6aoqfhnoMYpdBXnWzpbdzekRT8mbVvvFb6q 0fGhub4kwP9JzQxDVkSGIsSNrR17xZFbO4WWjt6r+pqYFp4cxVtuk3PMdSapTXZU/LBnrS 6aMl8dtpFt4VkOlzJhEG7xPT72DEC0WmOsdGqtDvz21/j1eXB+Xn55ZJbbIvxkqs6O/o0u IrNfRkMUKJly2Ag/tXQ1K9yX7wWWYgzlgYf43deson6arzXyGOXwXCPsFEQSSA== 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=1778880664; 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=7FJDbbmbjOhHlhbA0HXs33eud9x39WT20b37DHAwGUg=; b=QzX2n7Cb93D67KOCiNJ/eEJDZp3fRr/QbJfl4oEDqf1Vr9T0FOM0DG2PmUXcSdHoJ1UBwl FPEAbCNMLODntrEwVpqcCi3UCXGcpMDNk9v+FeNXHPcC+aKUo3EfuyfvKzB7ur+Ra9381o ytkRR0Rzl2HZv9WExFNly2apHym+398JQq+Gf+x8/BDAPGDjHQa+NWVc2kQEcZ+LaTeGHD /9SPV6jbI0iD0T+PTWSDz6+PExe2o/nTRDbxigSfXH1jo/6iSsgFXt6MRuKc6L8nRX9fSm PD2FKM3tgOthnZGlnuxKY3tomGge26jXqoFNb7xWetIdTcmuAb7kyYFQ9Uf5dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHL3X5bKLz9K8 for ; Fri, 15 May 2026 21:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3eb7b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 21:31:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 355989b21712 - main - route.8: Describe weight modifier 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: 355989b21712cbb7173cbec4a036c541e6f08c0e Auto-Submitted: auto-generated Date: Fri, 15 May 2026 21:31:04 +0000 Message-Id: <6a079098.3eb7b.7273e83a@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=355989b21712cbb7173cbec4a036c541e6f08c0e commit 355989b21712cbb7173cbec4a036c541e6f08c0e Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-04-14 07:49:29 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-15 21:29:49 +0000 route.8: Describe weight modifier Describe `-weight` argument in the route manual. Reviewed by: glebius, ziaee Differential Revision: https://reviews.freebsd.org/D56246 --- sbin/route/route.8 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sbin/route/route.8 b/sbin/route/route.8 index 572781ef59c8..5cb16120c8d8 100644 --- a/sbin/route/route.8 +++ b/sbin/route/route.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 12, 2024 +.Dd May 16, 2026 .Dt ROUTE 8 .Os .Sh NAME @@ -297,6 +297,17 @@ Note that the qualifier works only for .Dv AF_INET6 address family. .Pp +For +.Li ECMP +routes, the +.Fl weight +modifier can be used to influence nexthop selection. +For example, a destination with two nexthops defined as +.Dq Fl gateway Ar 3fff::1 Fl weight Ar 100 +and +.Dq Fl gateway Ar 3fff::2 Fl weight Ar 200 +will make the nexthop 3fff::2 twice as likely to be chosen as 3fff::1. +.Pp Routes have associated flags which influence operation of the protocols when sending to destinations matched by the routes. These flags may be set (or sometimes cleared) From nobody Fri May 15 21:59: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 4gHLhd4cJpz6f33n for ; Fri, 15 May 2026 21:59: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 4gHLhd3m3kz4MWV for ; Fri, 15 May 2026 21:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778882385; 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=XdqtFy2ex9sHtPWnZqtLvxLLRKWaS7jhIfvcFfaLc/A=; b=hf+eQguWhbTV5lZK+4CyLVzrgzMe6KjPsd47iMKiZ3GFJ3zGYx1Q0WJ6zTxQTnu1JzrV/N ROpSZ1muQ9fZZuTOPU1vjWqRvs6HxkMKSa/fq9KzXugN4mnHXNrD8DUg4/DRHN+ejQbmRX 1mNT9WNQwURNyKDgE69R8NKhDiyYrhHYo7vm0wUWPMnSSpIgYi9CdHztDxRJ4KCzW65z5z sMAR38CW5rMBlMOLwR3Us0oKOtkg08VFMDSN7eqRtWCsHUFE3cozq+rtF8BQ22yLXS6xg9 6+Ywy08u4FIvqGnG33EKLcJ7cKelScieUfGu1WC+9hp9JYNUYFP1TdcFGlnhBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778882385; a=rsa-sha256; cv=none; b=FXROIgrfNSQ9lpodt+3Cp/D5cq1IuAXa/+m4KXUJgvPxQzpmgJmA6yiwlJBZLrEY5lFN4L V3i6h5pyyAhoMtKggzIw98wtRYeqxJWQCiBxMTBg43GtRFMvUQCBHb1RTq4z5Sw2kFlCrF Hzk+90LhIRV3QK9ZbrgNQtZyFlxTwNZ0oTzX5JIydchMhR0i/X3Z+CwRCMfu0hPdzAYsx6 NAZ6aMfSkiN7kDCL8QV5zP3wJSwRT5qOS4xYBFUj1jV9D0VVdymnvg2o/ezJiRyOv9jt9i XAFgFpd1tPMRg0Sa7qKJ94VkCj8mrb5o6dNlTxk2A6xshKeqUqEOJlJifCu95g== 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=1778882385; 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=XdqtFy2ex9sHtPWnZqtLvxLLRKWaS7jhIfvcFfaLc/A=; b=iMO/8fYEbcHeC393C1t/44SHt1saG1kJFLFAEdjSblJGqro96ukBFHqeQgU2iHhsTa5xab Xj8zRdihX9a3SxQKFoJ/557gN6MSEtCODapCASbA15+UZlcMuVwySHoMB0oVwcWzurOD73 +/wMeTpBMKESea3zstCqws7WGXiJNAemWLmqy8EHkCRv6CYXipBfIVfTiWrBYzsDGCPGLv 2XnKLcNc3SLV3zN0F4k03UHUAzQBhsn8LfnJmjQWOu734ZQeNsZSsWpu14UgSBrKLgBXrE Lijm97d/tSHfqnbcuwqZvn8jcDG4IULhdA4LxrFGmyXoRD5ccckuwAX1RdfJpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHLhd3HvrzBMw for ; Fri, 15 May 2026 21:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 418a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 21:59:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: d201e4e84919 - main - wtap: use typed rssi and noise floor values 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d201e4e8491901d1de6bcaeb581a0bf958bf86f2 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 21:59:45 +0000 Message-Id: <6a079751.418a8.2996337e@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d201e4e8491901d1de6bcaeb581a0bf958bf86f2 commit d201e4e8491901d1de6bcaeb581a0bf958bf86f2 Author: Bjoern A. Zeeb AuthorDate: 2026-05-13 21:14:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-05-15 21:59:07 +0000 wtap: use typed rssi and noise floor values Adjust the rssi and nf arguments to typed int8_t and adjust the maths for rssi to be consistant with what net80211 expects. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: lwhsu, adrian Differential Revision: https://reviews.freebsd.org/D57020 --- sys/dev/wtap/if_wtap.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c index dd332c538c8f..376b63e38f2b 100644 --- a/sys/dev/wtap/if_wtap.c +++ b/sys/dev/wtap/if_wtap.c @@ -495,6 +495,7 @@ wtap_rx_proc(void *arg, int npending) struct mbuf *m; struct ieee80211_node *ni; struct wtap_buf *bf; + int8_t rssi, nf; #if 0 DWTAP_PRINTF("%s\n", __func__); @@ -528,6 +529,15 @@ wtap_rx_proc(void *arg, int npending) ieee80211_dump_pkt(ic, mtod(m, caddr_t), 0,0,0); #endif + /* + * Use arbitrary but sane values, and do the correct conversion + * for net80211 using 0.5 dBm values relative to the noise floor. + */ + nf = -95; + rssi = 42; + rssi -= nf; + rssi *= 2; + /* * Locate the node for sender, track state, and then * pass the (referenced) node up to the 802.11 layer @@ -540,10 +550,10 @@ wtap_rx_proc(void *arg, int npending) /* * Sending station is known, dispatch directly. */ - ieee80211_input(ni, m, 1<<7, 10); + ieee80211_input(ni, m, rssi, nf); ieee80211_free_node(ni); } else { - ieee80211_input_all(ic, m, 1<<7, 10); + ieee80211_input_all(ic, m, rssi, nf); } /* The mbufs are freed by the Net80211 stack */ From nobody Fri May 15 21:59: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 4gHLhf65WDz6f3Dh for ; Fri, 15 May 2026 21:59: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 4gHLhf4p1hz4MYC for ; Fri, 15 May 2026 21:59:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778882386; 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=ewQ3if3gufoOX5xgQ63tQqGNAfphKA685RAhTcNOn8U=; b=Cg5DO+2LOVmeNgWl6QLTWqcpvXW3lALJ6moX1YanCjfIqtYSRXw1nyh//VKew20RBgBeZa U6HJX4sMfPozEkb5fZBr0tgw+Lg2yRx0cxlYFTwmIajJ14EP/x7Sx3KPeQm+fz3dwQz523 cCgUaB4oD/8qRWq9ruvW50A8N6HaIGgU2EFHsbWYiDqFAezOppdIHdHea738/u4KhEQSYh dgzlPK0+c88+/1Rf0EobqJPpMRMkSj8tRnsDBAjpV1CUQE4o8Fvh30u81iFhsSSAMpH9yI DCts0E7b75D0QQtzCQWaPVCwM8ueUhySSSDkIBqoL150vVX8BoVidZkC/F6kVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778882386; a=rsa-sha256; cv=none; b=RQEVWEL6G5qD4hbgLlz4cZJeQKCLF6aBon7rspgFEbe7qgcxb9p3vZt00wa4L9PmR3aQMh V+r3XD9c93MUU8ocCSJUPHpOnCEwjnro0H1/wF25ino8bV9YWnSbb5l8hs4w7LwyJ6Qi1l uPK9o2sw40tcXuj4Epq6rmbY8xFyZnUIBKEQn2JFoPZueJzW4xgpzuOzweDRuH4z9NcKEM N4ShdgOjXG+1sYoboevAqE8gEGL0og3AqvznOQEmVfU+Jv+dBGKWpWm0OdVXYtJmMFl5xu yewWAi/kLJf9kSmagb7I0URk3Y36fwI+nnRUEsg/APzI+0jZuHAmuGAcAO9o6A== 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=1778882386; 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=ewQ3if3gufoOX5xgQ63tQqGNAfphKA685RAhTcNOn8U=; b=CpgPRb9C+fjluhtK3y6ekJIuuBhc/hB18fmaawkjXMDfPmvvMvkDpj/l8AqSiHRvkNHdb6 fM0I2O9oXQ+487zc3Zj1aEGCbOxwobUaMnCcNHEUcp+Oi291dSmwkAL86nB5AI7Y9Flf+Q YVv4q1zauXhEi31033bhD0ySiij6V/ytmJTddT5+YQl/Triu1N+v8hdJCqcidsE7+kfdbR LClhIEsRbqkB+hfupmLqBvc31w+q4TpSVvsWxsRCL3ymt6MH69PmxBmNK2CvCeFKSkXBzJ udYjyDMZsUVRdEb23+Jyl9dJ9SS3Vv+Sceyu5lQLfKY1KX9Cp0CG4SuRsYip0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHLhf4DmbzBQ8 for ; Fri, 15 May 2026 21:59:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41d0c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 21:59:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 96eaa6857ffe - main - net80211: define a type for rssi values 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96eaa6857ffe009c141c5a6dbea88f96efed9b2d Auto-Submitted: auto-generated Date: Fri, 15 May 2026 21:59:46 +0000 Message-Id: <6a079752.41d0c.2e7c8c1a@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=96eaa6857ffe009c141c5a6dbea88f96efed9b2d commit 96eaa6857ffe009c141c5a6dbea88f96efed9b2d Author: Bjoern A. Zeeb AuthorDate: 2025-06-19 00:05:27 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-05-15 21:59:07 +0000 net80211: define a type for rssi values Due to net80211 keeping values in 0.5dBm relative to the noise floor an int8_t is not good enough to prevent a double wrap around, which means the reported rssi values can be wrong (see D50928 or likely a commit in the future for more information). In order to address the problem and not break the userspace API, start by defining a type within the kernel and use that. In a next step we will then update the int8_t to int16_t to avoid the problem up to the ioctl code. This will then allow us to work on the the user space API indepedently (see PR 293016 for possible impact outside the base system). No functional changes intended. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D57021 --- sys/dev/ath/if_ath.c | 4 ++-- sys/dev/mwl/if_mwl.c | 4 ++-- sys/net80211/_ieee80211.h | 15 ++++++++++----- sys/net80211/ieee80211_adhoc.c | 4 ++-- sys/net80211/ieee80211_hostap.c | 4 ++-- sys/net80211/ieee80211_ioctl.c | 4 +++- sys/net80211/ieee80211_mesh.c | 4 ++-- sys/net80211/ieee80211_monitor.c | 4 ++-- sys/net80211/ieee80211_node.c | 18 +++++++++--------- sys/net80211/ieee80211_node.h | 4 ++-- sys/net80211/ieee80211_ratectl.h | 2 +- sys/net80211/ieee80211_scan.h | 2 +- sys/net80211/ieee80211_sta.c | 4 ++-- sys/net80211/ieee80211_var.h | 6 +++--- sys/net80211/ieee80211_wds.c | 7 ++++--- 15 files changed, 47 insertions(+), 39 deletions(-) diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 1304b597c545..2d52afcf62aa 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -179,7 +179,7 @@ static struct ieee80211_node *ath_node_alloc(struct ieee80211vap *, static void ath_node_cleanup(struct ieee80211_node *); static void ath_node_free(struct ieee80211_node *); static void ath_node_getsignal(const struct ieee80211_node *, - int8_t *, int8_t *); + net80211_rssi_t *, int8_t *); static void ath_txq_init(struct ath_softc *sc, struct ath_txq *, int); static struct ath_txq *ath_txq_setup(struct ath_softc*, int qtype, int subtype); static int ath_tx_setup(struct ath_softc *, int, int); @@ -3957,7 +3957,7 @@ ath_node_free(struct ieee80211_node *ni) } static void -ath_node_getsignal(const struct ieee80211_node *ni, int8_t *rssi, int8_t *noise) +ath_node_getsignal(const struct ieee80211_node *ni, net80211_rssi_t *rssi, int8_t *noise) { struct ieee80211com *ic = ni->ni_ic; struct ath_softc *sc = ic->ic_softc; diff --git a/sys/dev/mwl/if_mwl.c b/sys/dev/mwl/if_mwl.c index 513c3d9c60e4..b7f85e65cfd9 100644 --- a/sys/dev/mwl/if_mwl.c +++ b/sys/dev/mwl/if_mwl.c @@ -129,7 +129,7 @@ static struct ieee80211_node *mwl_node_alloc(struct ieee80211vap *, static void mwl_node_cleanup(struct ieee80211_node *); static void mwl_node_drain(struct ieee80211_node *); static void mwl_node_getsignal(const struct ieee80211_node *, - int8_t *, int8_t *); + net80211_rssi_t *, int8_t *); static void mwl_node_getmimoinfo(const struct ieee80211_node *, struct ieee80211_mimo_info *); static int mwl_rxbuf_init(struct mwl_softc *, struct mwl_rxbuf *); @@ -2390,7 +2390,7 @@ mwl_node_drain(struct ieee80211_node *ni) } static void -mwl_node_getsignal(const struct ieee80211_node *ni, int8_t *rssi, int8_t *noise) +mwl_node_getsignal(const struct ieee80211_node *ni, net80211_rssi_t *rssi, int8_t *noise) { *rssi = ni->ni_ic->ic_node_getrssi(ni); #ifdef MWL_ANT_INFO_SUPPORT diff --git a/sys/net80211/_ieee80211.h b/sys/net80211/_ieee80211.h index 566b12befeb3..c970ba6be70d 100644 --- a/sys/net80211/_ieee80211.h +++ b/sys/net80211/_ieee80211.h @@ -374,6 +374,11 @@ struct ieee80211_channel { #define IEEE80211_AID_DEF 128 #define IEEE80211_AID_MIN 16 +/* + * Definitions for (internal, basic) types. + */ +typedef int8_t net80211_rssi_t; + /* * 802.11 rate set. */ @@ -618,14 +623,14 @@ struct ieee80211_rx_stats { uint64_t c_rx_tsf; /* 32 or 64 bit TSF */ /* All DWORD aligned */ - int16_t c_nf_ctl[IEEE80211_MAX_CHAINS]; /* per-chain NF */ - int16_t c_nf_ext[IEEE80211_MAX_CHAINS]; /* per-chain NF */ - int16_t c_rssi_ctl[IEEE80211_MAX_CHAINS]; /* per-chain RSSI */ - int16_t c_rssi_ext[IEEE80211_MAX_CHAINS]; /* per-chain RSSI */ + net80211_rssi_t c_nf_ctl[IEEE80211_MAX_CHAINS]; /* per-chain NF */ + net80211_rssi_t c_nf_ext[IEEE80211_MAX_CHAINS]; /* per-chain NF */ + net80211_rssi_t c_rssi_ctl[IEEE80211_MAX_CHAINS]; /* per-chain RSSI */ + net80211_rssi_t c_rssi_ext[IEEE80211_MAX_CHAINS]; /* per-chain RSSI */ /* 32 bits */ int8_t c_nf; /* global NF */ - int8_t c_rssi; /* global RSSI */ + net80211_rssi_t c_rssi; /* global RSSI */ uint8_t c_chain; /* number of RX chains involved */ uint8_t c_rate; /* legacy; 11n rate code; VHT MCS */ diff --git a/sys/net80211/ieee80211_adhoc.c b/sys/net80211/ieee80211_adhoc.c index 22c28ee4fef9..16f20c0c636b 100644 --- a/sys/net80211/ieee80211_adhoc.c +++ b/sys/net80211/ieee80211_adhoc.c @@ -68,7 +68,7 @@ static void adhoc_vattach(struct ieee80211vap *); static int adhoc_newstate(struct ieee80211vap *, enum ieee80211_state, int); static int adhoc_input(struct ieee80211_node *, struct mbuf *, - const struct ieee80211_rx_stats *, int, int); + const struct ieee80211_rx_stats *, net80211_rssi_t, int); static void adhoc_recv_mgmt(struct ieee80211_node *, struct mbuf *, int subtype, const struct ieee80211_rx_stats *, int, int); static void ahdemo_recv_mgmt(struct ieee80211_node *, struct mbuf *, @@ -301,7 +301,7 @@ doprint(struct ieee80211vap *vap, int subtype) */ static int adhoc_input(struct ieee80211_node *ni, struct mbuf *m, - const struct ieee80211_rx_stats *rxs, int rssi, int nf) + const struct ieee80211_rx_stats *rxs, net80211_rssi_t rssi, int nf) { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; diff --git a/sys/net80211/ieee80211_hostap.c b/sys/net80211/ieee80211_hostap.c index 9074878e17e4..3505f7ba66e0 100644 --- a/sys/net80211/ieee80211_hostap.c +++ b/sys/net80211/ieee80211_hostap.c @@ -66,7 +66,7 @@ static void hostap_vattach(struct ieee80211vap *); static int hostap_newstate(struct ieee80211vap *, enum ieee80211_state, int); static int hostap_input(struct ieee80211_node *ni, struct mbuf *m, const struct ieee80211_rx_stats *, - int rssi, int nf); + net80211_rssi_t rssi, int nf); static void hostap_deliver_data(struct ieee80211vap *, struct ieee80211_node *, struct mbuf *); static void hostap_recv_mgmt(struct ieee80211_node *, struct mbuf *, @@ -466,7 +466,7 @@ doprint(struct ieee80211vap *vap, int subtype) */ static int hostap_input(struct ieee80211_node *ni, struct mbuf *m, - const struct ieee80211_rx_stats *rxs, int rssi, int nf) + const struct ieee80211_rx_stats *rxs, net80211_rssi_t rssi, int nf) { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 4c3e5fa94243..09cb39cfcf6f 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -379,6 +379,7 @@ get_sta_info(void *arg, struct ieee80211_node *ni) struct ieee80211_node_txrate tr; struct ieee80211vap *vap = ni->ni_vap; struct ieee80211req_sta_info *si; + net80211_rssi_t rssi; size_t ielen, len; uint8_t *cp; @@ -398,7 +399,8 @@ get_sta_info(void *arg, struct ieee80211_node *ni) si->isi_flags = ni->ni_chan->ic_flags; si->isi_state = ni->ni_flags; si->isi_authmode = ni->ni_authmode; - vap->iv_ic->ic_node_getsignal(ni, &si->isi_rssi, &si->isi_noise); + vap->iv_ic->ic_node_getsignal(ni, &rssi, &si->isi_noise); + si->isi_rssi = rssi; vap->iv_ic->ic_node_getmimoinfo(ni, &si->isi_mimo); si->isi_capinfo = ni->ni_capinfo; si->isi_erp = ni->ni_erp; diff --git a/sys/net80211/ieee80211_mesh.c b/sys/net80211/ieee80211_mesh.c index 7f2e8bdcb963..900b0c2ad4cd 100644 --- a/sys/net80211/ieee80211_mesh.c +++ b/sys/net80211/ieee80211_mesh.c @@ -83,7 +83,7 @@ static void mesh_transmit_to_gate(struct ieee80211vap *, struct mbuf *, static void mesh_forward(struct ieee80211vap *, struct mbuf *, const struct ieee80211_meshcntl *); static int mesh_input(struct ieee80211_node *, struct mbuf *, - const struct ieee80211_rx_stats *rxs, int, int); + const struct ieee80211_rx_stats *rxs, net80211_rssi_t, int); static void mesh_recv_mgmt(struct ieee80211_node *, struct mbuf *, int, const struct ieee80211_rx_stats *rxs, int, int); static void mesh_recv_ctl(struct ieee80211_node *, struct mbuf *, int); @@ -1525,7 +1525,7 @@ mesh_recv_group_data(struct ieee80211vap *vap, struct mbuf *m, static int mesh_input(struct ieee80211_node *ni, struct mbuf *m, - const struct ieee80211_rx_stats *rxs, int rssi, int nf) + const struct ieee80211_rx_stats *rxs, net80211_rssi_t rssi, int nf) { #define HAS_SEQ(type) ((type & 0x4) == 0) #define MC01(mc) ((const struct ieee80211_meshcntl_ae01 *)mc) diff --git a/sys/net80211/ieee80211_monitor.c b/sys/net80211/ieee80211_monitor.c index fc262f172f12..c77d67a00d73 100644 --- a/sys/net80211/ieee80211_monitor.c +++ b/sys/net80211/ieee80211_monitor.c @@ -58,7 +58,7 @@ static void monitor_vattach(struct ieee80211vap *); static int monitor_newstate(struct ieee80211vap *, enum ieee80211_state, int); static int monitor_input(struct ieee80211_node *ni, struct mbuf *m, - const struct ieee80211_rx_stats *rxs, int rssi, int nf); + const struct ieee80211_rx_stats *rxs, net80211_rssi_t rssi, int nf); void ieee80211_monitor_attach(struct ieee80211com *ic) @@ -123,7 +123,7 @@ monitor_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) */ static int monitor_input(struct ieee80211_node *ni, struct mbuf *m, - const struct ieee80211_rx_stats *rxs, int rssi, int nf) + const struct ieee80211_rx_stats *rxs, net80211_rssi_t rssi, int nf) { struct ieee80211vap *vap = ni->ni_vap; struct ifnet *ifp = vap->iv_ifp; diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 49ba00299fee..970268851af1 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -91,8 +91,8 @@ static int node_init(struct ieee80211_node *); static void node_cleanup(struct ieee80211_node *); static void node_free(struct ieee80211_node *); static void node_age(struct ieee80211_node *); -static int8_t node_getrssi(const struct ieee80211_node *); -static void node_getsignal(const struct ieee80211_node *, int8_t *, int8_t *); +static net80211_rssi_t node_getrssi(const struct ieee80211_node *); +static void node_getsignal(const struct ieee80211_node *, net80211_rssi_t *, int8_t *); static void node_getmimoinfo(const struct ieee80211_node *, struct ieee80211_mimo_info *); @@ -1341,7 +1341,7 @@ node_age(struct ieee80211_node *ni) ieee80211_ht_node_age(ni); } -static int8_t +static net80211_rssi_t node_getrssi(const struct ieee80211_node *ni) { uint32_t avgrssi = ni->ni_avgrssi; @@ -1354,7 +1354,7 @@ node_getrssi(const struct ieee80211_node *ni) } static void -node_getsignal(const struct ieee80211_node *ni, int8_t *rssi, int8_t *noise) +node_getsignal(const struct ieee80211_node *ni, net80211_rssi_t *rssi, int8_t *noise) { *rssi = node_getrssi(ni); *noise = ni->ni_noise; @@ -3039,7 +3039,7 @@ get_hostap_rssi(void *arg, struct ieee80211_node *ni) { struct rssiinfo *info = arg; struct ieee80211vap *vap = ni->ni_vap; - int8_t rssi; + net80211_rssi_t rssi; /* only associated stations */ if (ni->ni_associd == 0) @@ -3056,7 +3056,7 @@ get_adhoc_rssi(void *arg, struct ieee80211_node *ni) { struct rssiinfo *info = arg; struct ieee80211vap *vap = ni->ni_vap; - int8_t rssi; + net80211_rssi_t rssi; /* only neighbors */ /* XXX check bssid */ @@ -3075,7 +3075,7 @@ get_mesh_rssi(void *arg, struct ieee80211_node *ni) { struct rssiinfo *info = arg; struct ieee80211vap *vap = ni->ni_vap; - int8_t rssi; + net80211_rssi_t rssi; /* only neighbors that peered successfully */ if (ni->ni_mlstate != IEEE80211_NODE_MESH_ESTABLISHED) @@ -3088,7 +3088,7 @@ get_mesh_rssi(void *arg, struct ieee80211_node *ni) } #endif /* IEEE80211_SUPPORT_MESH */ -int8_t +net80211_rssi_t ieee80211_getrssi(struct ieee80211vap *vap) { #define NZ(x) ((x) == 0 ? 1 : (x)) @@ -3126,7 +3126,7 @@ ieee80211_getrssi(struct ieee80211vap *vap) } void -ieee80211_getsignal(struct ieee80211vap *vap, int8_t *rssi, int8_t *noise) +ieee80211_getsignal(struct ieee80211vap *vap, net80211_rssi_t *rssi, int8_t *noise) { if (vap->iv_bss == NULL) /* NB: shouldn't happen */ diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h index f1246dd12419..7b32370c2c54 100644 --- a/sys/net80211/ieee80211_node.h +++ b/sys/net80211/ieee80211_node.h @@ -528,8 +528,8 @@ struct ieee80211_node *ieee80211_add_neighbor(struct ieee80211vap *, const struct ieee80211_scanparams *); void ieee80211_node_join(struct ieee80211_node *,int); void ieee80211_node_leave(struct ieee80211_node *); -int8_t ieee80211_getrssi(struct ieee80211vap *); -void ieee80211_getsignal(struct ieee80211vap *, int8_t *, int8_t *); +net80211_rssi_t ieee80211_getrssi(struct ieee80211vap *); +void ieee80211_getsignal(struct ieee80211vap *, net80211_rssi_t *, int8_t *); /* TX sequence space related routines */ ieee80211_seq ieee80211_tx_seqno_fetch_incr(struct ieee80211_node *, diff --git a/sys/net80211/ieee80211_ratectl.h b/sys/net80211/ieee80211_ratectl.h index 0e5beb5185cb..a52c4a517d77 100644 --- a/sys/net80211/ieee80211_ratectl.h +++ b/sys/net80211/ieee80211_ratectl.h @@ -63,7 +63,7 @@ struct ieee80211_ratectl_tx_status { int final_rate; /* transmission rate */ uint_fast8_t short_retries; /* RTS/CTS retries */ uint_fast8_t long_retries; /* ACK retries */ - int8_t rssi; /* ACK RSSI */ + net80211_rssi_t rssi; /* ACK RSSI */ uint8_t spare[15]; /* for future use */ }; diff --git a/sys/net80211/ieee80211_scan.h b/sys/net80211/ieee80211_scan.h index 1afe767ef052..5336386c8e1d 100644 --- a/sys/net80211/ieee80211_scan.h +++ b/sys/net80211/ieee80211_scan.h @@ -282,7 +282,7 @@ struct ieee80211_scan_entry { uint8_t se_fhindex; /* FH only */ uint8_t se_dtimperiod; /* DTIM period */ uint16_t se_erp; /* ERP from beacon/probe resp */ - int8_t se_rssi; /* avg'd recv ssi */ + net80211_rssi_t se_rssi; /* avg'd recv ssi */ int8_t se_noise; /* noise floor */ uint8_t se_cc[2]; /* captured country code */ uint8_t se_meshid[2+IEEE80211_MESHID_LEN]; diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c index 3522b1b24742..550f837a0013 100644 --- a/sys/net80211/ieee80211_sta.c +++ b/sys/net80211/ieee80211_sta.c @@ -67,7 +67,7 @@ static void sta_vattach(struct ieee80211vap *); static void sta_beacon_miss(struct ieee80211vap *); static int sta_newstate(struct ieee80211vap *, enum ieee80211_state, int); static int sta_input(struct ieee80211_node *, struct mbuf *, - const struct ieee80211_rx_stats *, int, int); + const struct ieee80211_rx_stats *, net80211_rssi_t, int); static void sta_recv_mgmt(struct ieee80211_node *, struct mbuf *, int subtype, const struct ieee80211_rx_stats *, int rssi, int nf); static void sta_recv_ctl(struct ieee80211_node *, struct mbuf *, int subtype); @@ -530,7 +530,7 @@ doprint(struct ieee80211vap *vap, int subtype) */ static int sta_input(struct ieee80211_node *ni, struct mbuf *m, - const struct ieee80211_rx_stats *rxs, int rssi, int nf) + const struct ieee80211_rx_stats *rxs, net80211_rssi_t rssi, int nf) { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index 7b45261f59b1..2f11fa7c887f 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -325,9 +325,9 @@ struct ieee80211com { void (*ic_node_age)(struct ieee80211_node *); void (*ic_node_drain)(struct ieee80211_node *); - int8_t (*ic_node_getrssi)(const struct ieee80211_node*); + net80211_rssi_t (*ic_node_getrssi)(const struct ieee80211_node*); void (*ic_node_getsignal)(const struct ieee80211_node*, - int8_t *, int8_t *); + net80211_rssi_t *, int8_t *); void (*ic_node_getmimoinfo)( const struct ieee80211_node*, struct ieee80211_mimo_info *); @@ -543,7 +543,7 @@ struct ieee80211vap { int (*iv_input)(struct ieee80211_node *, struct mbuf *, const struct ieee80211_rx_stats *, - int, int); + net80211_rssi_t, int); void (*iv_recv_mgmt)(struct ieee80211_node *, struct mbuf *, int, const struct ieee80211_rx_stats *, diff --git a/sys/net80211/ieee80211_wds.c b/sys/net80211/ieee80211_wds.c index 1c05a40e632f..75c37e49423a 100644 --- a/sys/net80211/ieee80211_wds.c +++ b/sys/net80211/ieee80211_wds.c @@ -62,7 +62,7 @@ static void wds_vattach(struct ieee80211vap *); static int wds_newstate(struct ieee80211vap *, enum ieee80211_state, int); static int wds_input(struct ieee80211_node *ni, struct mbuf *m, - const struct ieee80211_rx_stats *rxs, int, int); + const struct ieee80211_rx_stats *rxs, net80211_rssi_t, int); static void wds_recv_mgmt(struct ieee80211_node *, struct mbuf *, int subtype, const struct ieee80211_rx_stats *, int, int); @@ -101,7 +101,8 @@ wds_flush(struct ieee80211_node *ni) { struct ieee80211com *ic = ni->ni_ic; struct mbuf *m, *next; - int8_t rssi, nf; + net80211_rssi_t rssi; + int8_t nf; m = ieee80211_ageq_remove(&ic->ic_stageq, (void *)(uintptr_t) ieee80211_mac_hash(ic, ni->ni_macaddr)); @@ -404,7 +405,7 @@ wds_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) */ static int wds_input(struct ieee80211_node *ni, struct mbuf *m, - const struct ieee80211_rx_stats *rxs, int rssi, int nf) + const struct ieee80211_rx_stats *rxs, net80211_rssi_t rssi, int nf) { struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; From nobody Fri May 15 23:38: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 4gHNtD05HTz6cRf6; Fri, 15 May 2026 23:38:12 +0000 (UTC) (envelope-from bz@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 4gHNtC59Btz3mw4; Fri, 15 May 2026 23:38:11 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778888291; 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=7OcPsjbAw4fo5SvzY5/g5GO/iQUg0WivsVMkc2Ema2A=; b=i2o6kuYtKAz2KJ99RLpKutbSciP7txNxm7DoX6OwLNtATxKV1yMrs8P/9Z+1SdHjdShAi7 kyu7e3vNMqgjizDLLkl/neN6UTUkXfpIXzktKSRRCaIHtyq4x9REVbwALZbkv8wsCRtfmY sOfsAj84sgcM35Lxr094lKTCGGMMKbvjx6K913rrp/58EEnNfLMHQn2MOReemTXYhf5xnk 1P5xjBVQqVf9HvMUUK24ko6w6pogujI828SAVnD3gU34zf9N66JUeZQ8Nnh+TCvGl2QAzX aFdpFmvp+u+7ulBetXbimZs2i4ECoakd+ahvibXWLuu1b/irRlSWTTslM+gMRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778888291; a=rsa-sha256; cv=none; b=ct+wKHIOvEip54Mx8bKJXwCXrkLA+fH3BDagYzqLJDhoG7FBCu4LmLGYhMUyVjf+AfEjU5 Cn5201I7+6H54tTcoFIVlUjeXnE3mYFfYntwokAKl1oyDfEukNTPXF+GLcOGYIZR1P51PZ SjFYGhakYRWuJlcuTI6ynisUdP/QLsBa7Mey53aXcnSVqpaWXo8QkLQDssRnHCkQ+UoXFp tOmLcTXrWAuHLjwyoPGHF1q/2LnbPV6Hk7s3oYwHeUUm0yOg0+t5o8JOO4tXlmXL22VwiA Gc1JgqOKaW/gLTqE2pbsW1ZTvpNlCXf78mxXzahFpU5K6YDmP7V6ljjWB1hzqA== 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=1778888291; 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=7OcPsjbAw4fo5SvzY5/g5GO/iQUg0WivsVMkc2Ema2A=; b=S4aP7tiJc7rqHjQeJzGnaLHYYgQbHIAbu827BOyVukBLkNsKqBMK+dyZw+rm9Jduz4Elx3 FCfGUcbTBwi0k6fqCDJuIdD6UklydtSErzHW9cOYD1BQRhY6qpG9cDV+aFdzhDb35v6uU+ T6Yv6eAahUbQUbM0rsInhxjd1ESnJqe66MRCNOB4NWDEVBdREOPv9pgda8Jb1tXT1qaUWP 0j+r4echCQl5bvGApkontkzeySNRUZ1wKIvvlWELA888im8HzbqpRoUIfO6ze5JFWln8bv M7y3i55TUQPdu3HRkeG/y188s25Cspv79wOxeuWBBw1s5Q8i40NpYNJexgbCnw== Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe: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-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E7" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gHNtC2xZpzjxy; Fri, 15 May 2026 23:38:11 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id A62BDA64806; Fri, 15 May 2026 23:37:45 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id B3FEB2D029EC; Fri, 15 May 2026 23:38:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id U5oLsYKqq_2R; Fri, 15 May 2026 23:38:08 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 5B5CD2D029D8; Fri, 15 May 2026 23:38:08 +0000 (UTC) Date: Fri, 15 May 2026 23:38:08 +0000 (UTC) From: "Bjoern A. Zeeb" To: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 70fde0ed6bbb - main - md5: Encode non-printable filenames In-Reply-To: <69f250e0.37a65.1d7c90ca@gitrepo.freebsd.org> Message-ID: <95sp1227-9sp1-60q4-3qp6-4r598q63o152@mnoonqbm.arg> References: <69f250e0.37a65.1d7c90ca@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 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/mixed; boundary="0-493607577-1778888288=:11296" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --0-493607577-1778888288=:11296 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Wed, 29 Apr 2026, Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav wrote: > The branch main has been updated by des: > > URL: https://cgit.FreeBSD.org/src/commit/?id=70fde0ed6bbbb1f84c440190ba1e5435f8c90e13 > > commit 70fde0ed6bbbb1f84c440190ba1e5435f8c90e13 > Author: Dag-Erling Smørgrav > AuthorDate: 2026-04-29 18:41:05 +0000 > Commit: Dag-Erling Smørgrav > CommitDate: 2026-04-29 18:41:05 +0000 > > md5: Encode non-printable filenames > > Encode filenames in the VIS_CSTYLE | VIS_OCTAL style regardless of > output mode. When reading filenames from a checksum file, attempt to > decode them, and use the decoded name unless the decoded name does not > exist but the undecoded one does. > > This breaks compatibility with GNU coreutils, which unfortunately uses > a non-reversible encoding when outputting filenames containing > non-printable characters. > > While here, drop a sentence about preimage attacks against MD5 and SHA1 > from the manual page, as I no longer trust it to be true. > > MFC after: 1 week > Reviewed by: bcr, markj > Differential Revision: https://reviews.freebsd.org/D56615 > --- > sbin/md5/md5.1 | 30 ++++++++++++++++++++++-------- > sbin/md5/md5.c | 41 +++++++++++++++++++++++++++++++++++------ > 2 files changed, 57 insertions(+), 14 deletions(-) This breaks make makesum and related in ports for, e.g., filenames/URLs which have a '?' in them. If you, on an updated system, run make makesum in net/wifi-firmware-rtw88-kmod for example, you can see that the '?' are now quoted for the SHA256 lines while they were not previously. -TIMESTAMP = 1765584880 -SHA256 (linux-firmware/rtw88fw/rtw88/rtw8703b_fw.bin?h=20251125) = 5e32bd891c74a0719c871726b74490cf5e1a05cdcefb8fe2414f80fffdeb9f9d +TIMESTAMP = 1778888000 +SHA256 (linux-firmware/rtw88fw/rtw88/rtw8703b_fw.bin\?h=20251125) = 5e32bd891c74a0719c871726b74490cf5e1a05cdcefb8fe2414f80fffdeb9f9d SIZE (linux-firmware/rtw88fw/rtw88/rtw8703b_fw.bin?h=20251125) = 20290 -SHA256 (linux-firmware/rtw88fw/rtw88/rtw8703b_wow_fw.bin?h=20251125) = 7156b0d2b4580e63d11a3a78258c35ff28e840c7c6428953920ae6a1cd5d05ac +SHA256 (linux-firmware/rtw88fw/rtw88/rtw8703b_wow_fw.bin\?h=20251125) = 7156b0d2b4580e63d11a3a78258c35ff28e840c7c6428953920ae6a1cd5d05ac SIZE (linux-firmware/rtw88fw/rtw88/rtw8703b_wow_fw.bin?h=20251125) = 23074 -SHA256 (linux-firmware/rtw88fw/rtw88/rtw8723d_fw.bin?h=20251125) = 9c64e079815a333a3f7b731be7cc0be65206ebc883891659dc8ff5ed36a5e2f5 +SHA256 (linux-firmware/rtw88fw/rtw88/rtw8723d_fw.bin\?h=20251125) = 9c64e079815a333a3f7b731be7cc0be65206ebc883891659dc8ff5ed36a5e2f5 SIZE (linux-firmware/rtw88fw/rtw88/rtw8723d_fw.bin?h=20251125) = 28884 -SHA256 (linux-firmware/rtw88fw/rtw88/rtw8812a_fw.bin?h=20251125) = abdcca4e8bf76ebfba23d433de310ffefebd0ff9d01990639d4cd9602b32b71a +SHA256 (linux-firmware/rtw88fw/rtw88/rtw8812a_fw.bin\?h=20251125) = abdcca4e8bf76ebfba23d433de310ffefebd0ff9d01990639d4cd9602b32b71a SIZE (linux-firmware/rtw88fw/rtw88/rtw8812a_fw.bin?h=20251125) = 27030 -SHA256 (linux-firmware/rtw88fw/rtw88/rtw8814a_fw.bin?h=20251125) = aa6bf9d62b2d2d8a37254fd6d917ba2839888cdedc21850d4481874cb1d3d7cb +SHA256 (linux-firmware/rtw88fw/rtw88/rtw8814a_fw.bin\?h=20251125) = aa6bf9d62b2d2d8a37254fd6d917ba2839888cdedc21850d4481874cb1d3d7cb SIZE (linux-firmware/rtw88fw/rtw88/rtw8814a_fw.bin?h=20251125) = 68320 -SHA256 (linux-firmware/rtw88fw/rtw88/rtw8821a_fw.bin?h=20251125) = 4693ece655044d96f81bd3f3e8db14dc352b493219c4fd0a75788a6fbd9eac3c +SHA256 (linux-firmware/rtw88fw/rtw88/rtw8821a_fw.bin\?h=20251125) = 4693ece655044d96f81bd3f3e8db14dc352b493219c4fd0a75788a6fbd9eac3c SIZE (linux-firmware/rtw88fw/rtw88/rtw8821a_fw.bin?h=20251125) = 31898 ... That then results in trying to build the port: => No SHA256 checksum recorded for linux-firmware/rtw88fw/rtw88/rtw8703b_fw.bin?h=20251125. => No suitable checksum found for linux-firmware/rtw88fw/rtw88/rtw8703b_fw.bin?h=20251125. => No SHA256 checksum recorded for linux-firmware/rtw88fw/rtw88/rtw8703b_wow_fw.bin?h=20251125. => No suitable checksum found for linux-firmware/rtw88fw/rtw88/rtw8703b_wow_fw.bin?h=20251125. => No SHA256 checksum recorded for linux-firmware/rtw88fw/rtw88/rtw8723d_fw.bin?h=20251125. => No suitable checksum found for linux-firmware/rtw88fw/rtw88/rtw8723d_fw.bin?h=20251125. ... -- Bjoern A. Zeeb r15:7 --0-493607577-1778888288=:11296-- From nobody Sat May 16 01:00: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 4gHQjf2cd9z6cZmq for ; Sat, 16 May 2026 01:00: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 4gHQjd5cCSz43kq for ; Sat, 16 May 2026 01:00:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778893253; 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=syTlzwpQvdMP2LTvabtKk1QX3ybi3RzNqJyQglR6dzY=; b=CeIgP8YRwYbq6pz7bF43+YkLxbPSg0spVcc+1uWKiXNcZY0yN5Wvo9vgMI3V97NxfumW4Q qesZRVkbAgNmJ3B9TEpJjv5qIf4tU/OjNt9Y9/dT2C+td5eSvX89yCj8V5PqF0sBCt/L9v QRUJHN6U2gGgLM937/mCObTUn5w6+I2hIERJWiidLVxmwKN+vwdkWcJrIFL9ncYkiHhFRU vls0ljN9a3XNLmUjUt0Y3Kr7JKqweHXOS6FvgEx4+d2Lam+vqJwPagM2DnNkR4naKdTPk8 fa2FXDCq0TeynjTKwmiFepdlwJmWnEWgLJtChao2mAjBpvOFNrrSMpM228hslQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778893253; a=rsa-sha256; cv=none; b=lXbbU3PoQqN7lgTbEqh+W3T8eUqtAHwjTD29vr9V8E8mw+SE4noB1RxMwCk+vgFlJTBWci fg79XrFRy+iTXAnFurimneXnjZ94acwndYP/gjq9wx+G+OIjguZDbgdtFxqF/jBpEQV4cb c+AOKV8cybMmFNKrmmj+Ff8IuXTLw4E05isWRgYqlO3A11+8KjeLHDlVX+BZwuMEe5H50r GPq0BzYP5wNuZqeFNfHC7dqo8gGt4gkBmTzTxgJi+T6Qw9pzeZaevO0ytgiNGlKlY5m/yD c1NiUUdxGSFlyBvbU+qtZlfL3jrkONJWLR5v/FngnIwEPdKJYGyjQMKvn8qETw== 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=1778893253; 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=syTlzwpQvdMP2LTvabtKk1QX3ybi3RzNqJyQglR6dzY=; b=AAYiTK4WgP9N8y/+62Dc/K/fHeNkPN5ODagzyK5InzGTo2S+X+Mddtfq420Gl0lBTpn54S FbahAd3LSWSKj7BuPXSFwY8zjTI8OZTWLdLYZQvcpUjxIQ5TTXppNnNF3WB1inqdNX0Jez IlggdPlXyWcNCRXP4gIUwaXEQfaJgilthBonIDmJh8aZcxeO0GbpjFptUcX9r1SnB+NHkq 2jICu1b4MNF8GJfkG3mc4xSZOzuhdRqMRgCNrrFjg5Dwu1iPYKIi9Mj8X/Uoq39ok+xdNI krjYQD0z0LsurlUK5hOPRUr64CYlnjzaVvaIL1VCiJ5KQJo/EYNRnGSAb+Jh3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHQjd5BXlzZ1f for ; Sat, 16 May 2026 01:00:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26750 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 01:00:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 183633079178 - main - thunderbolt: make code -Wunused clean 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: 1836330791789f18d0c9f0a63322a7f33b373c5b Auto-Submitted: auto-generated Date: Sat, 16 May 2026 01:00:53 +0000 Message-Id: <6a07c1c5.26750.273515b1@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=1836330791789f18d0c9f0a63322a7f33b373c5b commit 1836330791789f18d0c9f0a63322a7f33b373c5b Author: Enji Cooper AuthorDate: 2026-02-26 08:06:49 +0000 Commit: Enji Cooper CommitDate: 2026-05-16 01:00:36 +0000 thunderbolt: make code -Wunused clean This change modifies code paths and uses `__diagused` to address `-Wunused` issues that occur when `THUNDERBOLT_DEBUG` == `0`. MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D55575 --- sys/dev/thunderbolt/nhi.c | 18 +++++++++++------- sys/dev/thunderbolt/router.c | 11 +++++++---- sys/dev/thunderbolt/tb_acpi_pcib.c | 2 +- sys/dev/thunderbolt/tb_debug.c | 6 +++--- sys/dev/thunderbolt/tb_debug.h | 2 +- sys/dev/thunderbolt/tb_pcib.c | 2 +- 6 files changed, 24 insertions(+), 17 deletions(-) diff --git a/sys/dev/thunderbolt/nhi.c b/sys/dev/thunderbolt/nhi.c index 9550de258dab..6cbe79779c13 100644 --- a/sys/dev/thunderbolt/nhi.c +++ b/sys/dev/thunderbolt/nhi.c @@ -788,8 +788,11 @@ nhi_tx_schedule(struct nhi_ring_pair *r, struct nhi_cmd_frame *cmd) int nhi_tx_synchronous(struct nhi_ring_pair *r, struct nhi_cmd_frame *cmd) { + struct nhi_softc *sc __diagused; int error, count; + sc = r->sc; + if ((error = nhi_tx_schedule(r, cmd)) != 0) return (error); @@ -812,16 +815,16 @@ nhi_tx_synchronous(struct nhi_ring_pair *r, struct nhi_cmd_frame *cmd) if ((cmd->flags & CMD_REQ_COMPLETE) == 0) error = ETIMEDOUT; - tb_debug(r->sc, DBG_TXQ|DBG_FULL, "tx_synchronous done waiting, " + tb_debug(sc, DBG_TXQ|DBG_FULL, "tx_synchronous done waiting, " "err= %d, TX_COMPLETE= %d\n", error, !!(cmd->flags & CMD_REQ_COMPLETE)); if (error == ERESTART) { - tb_printf(r->sc, "TX command interrupted\n"); + tb_printf(sc, "TX command interrupted\n"); } else if ((error == EWOULDBLOCK) || (error == ETIMEDOUT)) { - tb_printf(r->sc, "TX command timed out\n"); + tb_printf(sc, "TX command timed out\n"); } else if (error != 0) { - tb_printf(r->sc, "TX command failed error= %d\n", error); + tb_printf(sc, "TX command failed error= %d\n", error); } return (error); @@ -831,7 +834,7 @@ static int nhi_tx_complete(struct nhi_ring_pair *r, struct nhi_tx_buffer_desc *desc, struct nhi_cmd_frame *cmd) { - struct nhi_softc *sc; + struct nhi_softc *sc __diagused; struct nhi_pdf_dispatch *txpdf; u_int sof; @@ -865,9 +868,10 @@ static int nhi_rx_complete(struct nhi_ring_pair *r, struct nhi_rx_post_desc *desc, struct nhi_cmd_frame *cmd) { - struct nhi_softc *sc; + struct nhi_softc *sc __diagused; struct nhi_pdf_dispatch *rxpdf; - u_int eof, len; + u_int eof; + u_int len __diagused; sc = r->sc; eof = desc->eof_len >> RX_BUFFER_DESC_EOF_SHIFT; diff --git a/sys/dev/thunderbolt/router.c b/sys/dev/thunderbolt/router.c index a3b418d77fac..fe7ad7026b2e 100644 --- a/sys/dev/thunderbolt/router.c +++ b/sys/dev/thunderbolt/router.c @@ -277,7 +277,8 @@ _tb_router_attach(struct router_softc *sc) { struct tb_cfg_router *cfg; uint32_t *buf; - int error, up; + int error; + int up __diagused; buf = malloc(9 * 4, M_THUNDERBOLT, M_NOWAIT|M_ZERO); if (buf == NULL) @@ -297,8 +298,9 @@ _tb_router_attach(struct router_softc *sc) sc->uuid[1] = cfg->uuid_hi; sc->uuid[2] = 0xffffffff; sc->uuid[3] = 0xffffffff; - tb_debug(sc, DBG_ROUTER, "Router upstream_port= %d, max_port= %d, " - "depth= %d\n", up, sc->max_adap, sc->depth); + tb_debug(sc, DBG_ROUTER, + "Router upstream_port= %d, max_port= %d, depth= %d\n", + up, sc->max_adap, sc->depth); free(buf, M_THUNDERBOLT); /* Downstream adapters are indexed in the array allocated here. */ @@ -718,7 +720,8 @@ router_notify_intr(void *context, union nhi_ring_desc *ring, struct nhi_cmd_fram struct router_softc *sc; struct router_command *cmd; struct tb_cfg_notify event; - u_int ev, adap; + u_int adap __diagused; + u_int ev; KASSERT(context != NULL, ("context cannot be NULL\n")); diff --git a/sys/dev/thunderbolt/tb_acpi_pcib.c b/sys/dev/thunderbolt/tb_acpi_pcib.c index 947df3688535..57ad916d4435 100644 --- a/sys/dev/thunderbolt/tb_acpi_pcib.c +++ b/sys/dev/thunderbolt/tb_acpi_pcib.c @@ -120,7 +120,7 @@ tb_acpi_pcib_attach(device_t dev) ACPI_OBJECT_LIST list; ACPI_OBJECT arg; ACPI_BUFFER buf; - ACPI_STATUS s; + ACPI_STATUS s __diagused; tb_debug(sc, DBG_BRIDGE, "Executing OSUP\n"); diff --git a/sys/dev/thunderbolt/tb_debug.c b/sys/dev/thunderbolt/tb_debug.c index f455ee72e9f6..fe65b2a5c034 100644 --- a/sys/dev/thunderbolt/tb_debug.c +++ b/sys/dev/thunderbolt/tb_debug.c @@ -206,7 +206,7 @@ int tb_debug_sysctl(SYSCTL_HANDLER_ARGS) { struct sbuf *sbuf; -#if defined (THUNDERBOLT_DEBUG) && (THUNDERBOLT_DEBUG > 0) +#ifdef THUNDERBOLT_DEBUG struct tb_debug_string *string; char *buffer; size_t sz; @@ -221,7 +221,7 @@ tb_debug_sysctl(SYSCTL_HANDLER_ARGS) sbuf = sbuf_new_for_sysctl(NULL, NULL, 128, req); -#if defined (THUNDERBOLT_DEBUG) && (THUNDERBOLT_DEBUG > 0) +#ifdef THUNDERBOLT_DEBUG debug = (u_int *)arg1; sbuf_printf(sbuf, "%#x", *debug); @@ -317,7 +317,7 @@ tb_parse_debug(u_int *debug, char *list) void tbdbg_dprintf(device_t dev, u_int debug, u_int val, const char *fmt, ...) { -#if defined(THUNDERBOLT_DEBUG) && (THUNDERBOLT_DEBUG > 0) +#ifdef THUNDERBOLT_DEBUG va_list ap; u_int lvl, dbg; diff --git a/sys/dev/thunderbolt/tb_debug.h b/sys/dev/thunderbolt/tb_debug.h index 4f5584420882..6ce479a42389 100644 --- a/sys/dev/thunderbolt/tb_debug.h +++ b/sys/dev/thunderbolt/tb_debug.h @@ -81,7 +81,7 @@ enum { */ void tbdbg_dprintf(device_t dev, u_int debug, u_int val, const char *fmt, ...) __printflike(4, 5); -#if defined(THUNDERBOLT_DEBUG) && (THUNDERBOLT_DEBUG > 0) +#ifdef THUNDERBOLT_DEBUG #define tb_debug(sc, level, fmt...) \ tbdbg_dprintf((sc)->dev, (sc)->debug, level, ##fmt) #else diff --git a/sys/dev/thunderbolt/tb_pcib.c b/sys/dev/thunderbolt/tb_pcib.c index b30de5a7493c..65ff42e4f831 100644 --- a/sys/dev/thunderbolt/tb_pcib.c +++ b/sys/dev/thunderbolt/tb_pcib.c @@ -304,7 +304,7 @@ static int tb_pcib_detach(device_t dev) { struct tb_pcib_softc *sc; - int error; + int error __diagused; sc = device_get_softc(dev); From nobody Sat May 16 08:52: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 4gHd9t02HWz6dDWG; Sat, 16 May 2026 08:52:34 +0000 (UTC) (envelope-from des@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 4gHd9s6Gj7z3slS; Sat, 16 May 2026 08:52:33 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778921553; 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=r90EdCWpBmzk+OH+WBdsLUk3FhbanKn1FiG+4Fe1m9o=; b=BgZqCF2Yw+Z3RFCwEz/DTlGZCek9VwrPeXDrsfoGA6TgxzfTf+vKq4SAxRYPILpKj63OZv I5Qfjaq7up6R418zZpRWc78rM47E9wg7o7sKHty/0IQpw9Kmbc5wdG1hpOqbdXnnlJ6xF1 BwgDrrWvqYd/mlaM5aCNl5mdbbVFYXQvq1dQXgsSeTWL9+martMYrjKKl34iXcMlfqVHs2 /iEY1bjTbYsC5jg31amJfg387xy6AXmy5ldxDQxNa6iuUMphUJRGcM2wwF7s7SQLP2D+C3 eVqLQEdaGHOu7bh+ZswfDp0UyWVbphK4p60xv67jLnA4pQMQirqtYQO874Pp3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778921553; a=rsa-sha256; cv=none; b=JAIgk/1BmHoD4BI0a1X5Qjddzewm22Lh1KuiwKpBiJE1f6WJ/Qw6lC0YG5MSpEuCNVzoxr G4GB4FBNp15HyvMKiazhxgbi0Qe3Pxx1Vo20P8mi3h+UpBfxb+gLi2wFB1Tlo3KZfwUX0c MByf/qV/vDdNu2NhqpFjtZl5lAQ8UOyTvOfwKDw/DECZm56lXaXnHJ9m3Ev4koGb3guq5H GE1Hvg7yaP3JOwrYyZeii2idgF1ZP25o78veG6Dt93V8qD96qW3RsiQb/lR958c+PI/1+V 7wdGEubCifoCUMl2hQV6iul8FoqzxWcniI5cCShelWoydbrmkgtA7tzIPWRtgw== 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=1778921553; 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=r90EdCWpBmzk+OH+WBdsLUk3FhbanKn1FiG+4Fe1m9o=; b=Wr2/IT+XUtWpu68ZSA0DJhzvT8D5KnieZketvJeV3NfraVq0V0/RPtzmX8F1Q6J+lOcfuG cfCmryBQ/yD1d0rPjQaIjuc0gJiiUUlAGjxc71IlUGHYWYQfF2v7SaEJf+8+v0IDB4p7Eu /YXaiXfAlaMQoGftRoc8IlMwefXXY0LHvR73yT+m2qMen/aSMCnNHJ7EqH/L/1snOgNUu/ E/C4TwH8mgilUB6+eOtCY/h8kyyoTnnD8WlBDDTl21Od+GxRNDyuy6+xYQ24psCUxf/2Ar eLSdTrgOmc+nZ4ckMnzdSv9cuYxM+RdZ7jOp+9AGxoPhDXXGgRY1Xdvd6FpCzA== Received: from ltc.des.dev (2a01cb0585070b00922e16fffef1acef.ipv6.abo.wanadoo.fr [IPv6:2a01:cb05:8507:b00:922e:16ff:fef1:acef]) (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: des/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gHd9s5Bj4zw2v; Sat, 16 May 2026 08:52:33 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id A99BDAA311; Sat, 16 May 2026 10:52:32 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: "Bjoern A. Zeeb" Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 70fde0ed6bbb - main - md5: Encode non-printable filenames In-Reply-To: <95sp1227-9sp1-60q4-3qp6-4r598q63o152@mnoonqbm.arg> (Bjoern A. Zeeb's message of "Fri, 15 May 2026 23:38:08 +0000 (UTC)") References: <69f250e0.37a65.1d7c90ca@gitrepo.freebsd.org> <95sp1227-9sp1-60q4-3qp6-4r598q63o152@mnoonqbm.arg> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Sat, 16 May 2026 10:52:32 +0200 Message-ID: <86se7renxr.fsf@ltc.des.dev> 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: quoted-printable "Bjoern A. Zeeb" writes: > This breaks make makesum and related in ports for, e.g., > filenames/URLs which have a '?' in them. Then I suggest those ports (17 out of 34,469) fix their distnames. The usual trick is to add a `dummy=3D/my-preferred-file-name` CGI argument at the end of the URL. A quick `git grep -l dummy=3D/` will provide plenty of examples to emulate. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Sat May 16 12:12: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 4gHjd60RzRz6c2fk; Sat, 16 May 2026 12:12:58 +0000 (UTC) (envelope-from des@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 4gHjd56yc7z3MS6; Sat, 16 May 2026 12:12:57 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778933578; 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=/g6agyLZPSbAcp0V0d447RJQAxVuMqNO8trO6Vpn9/8=; b=P8Xan3w+VgfmVghF5T2hPir0AjF7V3AmAqCCNUVAn5Ygcwoi/DNcCy6VQ8JEf6qY01TrMj A4AHJrV+UbHSU9ER0Or6BRjxOVyuW0kFAinO1j1qNq16QWKTIexZAXN8jRRRxRO9pYUrgd Q63xVLhK3FgJmdi5wr59qSTd3aInbSRWr1mV1rDjVGzw15Zn/hvlDD57/kMERQtKWZKoqv AnOiu1qBycXy976LVfyKs+h3Wpx9Pa1GShNaoiBIA48DB+bEX7y8/9RvAeedYBXkb0mIj/ 3MJ4LDwSpJY56Mx0Qhx3sNXfsSMuK3U+ERYQnZPZGI2uX16LhfTZpory8YstMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778933578; a=rsa-sha256; cv=none; b=k7WuYleDKlUrtad6RxQAwD0QqBU2SJJVxKr0BOtAsVTmAdGua6/BpHd0Y3qB/LNT9tWhZg /NEdKZTYljYgT4hHsD2NgLye5NOAC3hwGwWzxlWHlSXWh8CiM1mJyWM7M6pI6Urhn7fHw2 Z8ALV3QoBM9Jrs1Qh+kTOY3JVIRXvrBaSLqNdIAob6Gq2cA6C0k2+qelt9ABwXf2QiNz/p SCeHqmC9Ml1l4PVX99ye7OwPTWPBIgPOjd16j3sfy7LLx8cMVj+c0wX4xRPQWmntGEF1P4 +lnPafqlcSXRtXPr7jl0E9NE0Yio338EyTIqyYN9+/O2M83grSu4uLjV6ogp3A== 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=1778933578; 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=/g6agyLZPSbAcp0V0d447RJQAxVuMqNO8trO6Vpn9/8=; b=ZELQPScYi/d1RSrz8I7hqx0sEX9Oq846dMN+9SWwWyihahPDAsgh8YMGMZzbNFUUord0Il ijuRVxpP3fZOoMZdEVZEj/IKBzGDFvkUj44WeVGW/J4FXxWBjhBxJM0Gj5gXHS7ibcAjJL rX5ldnFDwu14o8IU8lakI8Uz/c+cSHRrm0RjCmqYtue+t/irMUgGqKEFytZJAoFd0csEN+ psocbXY2jsgirRl2np1JO1jEwgJzOxAYUiphr8QHhYE0b6zqG6EVbi6PxdLDl0xRpg5W4f yql6fLZUsJvdExrdN+7D0bf7O07pz1dDdnpzVhCh+P4pU34X3EWs3smw/ib8Qw== Received: from ltc.des.dev (unknown [92.183.12.56]) (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: des/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gHjd55mHLz10Nh; Sat, 16 May 2026 12:12:57 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 8B16FAA122; Sat, 16 May 2026 14:12:56 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Alexander Ziaee Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 809504f331fd - main - man: Kill off MANSUBDIRs In-Reply-To: <69f79438.38a23.3196f451@gitrepo.freebsd.org> (Alexander Ziaee's message of "Sun, 03 May 2026 18:30:16 +0000") References: <69f79438.38a23.3196f451@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Sat, 16 May 2026 14:12:56 +0200 Message-ID: <86h5o7eenr.fsf@ltc.des.dev> 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: quoted-printable Alexander Ziaee writes: > commit 809504f331fd3588e36b54255196379bdb59890a > Author: Alexander Ziaee > AuthorDate: 2026-05-03 17:53:25 +0000 > Commit: Alexander Ziaee > CommitDate: 2026-05-03 17:53:25 +0000 > > man: Kill off MANSUBDIRs >=20=20=20=20=20 > Three architecture dependent manuals are installed to MANSUBDIRs, > creating at least two empty manual page directories on everyone's > boxxen. Move those manuals to their canonical area, enhancing clarity, > grepability, removing useless inodes, and increasing consistency with > the rest of the architecture dependent manuals which are unconditiona= lly > installed, and noted at the top of the rendered manual. >=20=20=20=20=20 > MFC after: 3 days You can't just proclaim that you want these directories gone, you need to actually remove them from the mtree file(s). DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Sat May 16 16:17: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 4gHq2y58qGz6cdkT for ; Sat, 16 May 2026 16:17: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 4gHq2y4S5pz3tF4 for ; Sat, 16 May 2026 16:17:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778948234; 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=EfcL6y3KxYb7dLBmik7g2mFaCVtxgTossY3IccOkm04=; b=WuSXlX0PtHCoR+O3ssCDYFlKokfAB2cCTSnLD8fKYKv9sq9LccVEt2R2UN5ZCUAOFytw++ As8tCS44BpVSRaXf9snJzrQVJbDP0DWSXUB6CWZfbBbtJELsuJlit4ND6olNf6S0jfR9G0 zgFD81F11dpN2jSa8/X++0isPGmYbmKm00AjeONjajikzfQJfv0BVYiEUUclL21rho89AY P6hvnbOf5iQAZmeezSlint6gGaVo/QxzQcwmg6f/U9P3QbkOpjrEJONTUuvePn07N+wIot MjiagbSj309RsoDztzIV2HQFw6t1Kwc0sW4EwfkDdFsPuGUqKR6GHXe9wUEA0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778948234; a=rsa-sha256; cv=none; b=VYWUimfMgsH/jqRRJc51i6G9Os55sHCQdirv7TylyEbZ1Ce7r9EEUNyrgetdsEoXUYXTy1 H+dglmk6QD2ueb/5/CQFtjf+8yobzHAkLywSBeg291Oo+bM4pI+w3g3utSkA6yuzsCb46b aS98ldO7UCHNF5mtKq0CLlIljTvOCqXMBm+GCkj/S4tEGtUY1ogzujRz1CW03AjlR1t4xH jOkWog0z3CwZLqWvArZcuUascIvJRiG7Ad53qi3MFM4boDK1wLht40BE14vOg3SZCNN9HL XnktqsAs5Kmqd3BdgjGGgKFPGMK0LszH7uwZ7wzBeh2zVwwO0VqdiyYOpaZerA== 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=1778948234; 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=EfcL6y3KxYb7dLBmik7g2mFaCVtxgTossY3IccOkm04=; b=JTruGV/bCDsfX4KxFUJV/sypuUroLv0bBoqcnhLKic6uR2zAFszaeVT6fYD2CQ1eakMzwe iSAKPUTUblRthzBMiPczDFYkemW4bsk7DcxFU9Sz93DsgRUQE9mnl7Qhn8g4EWa4F36CP5 gTnoGQR8lm2xEZrLxZ/GPBWCkSU5FpiSS7yV4NzoXyBBdGxSQRe2msaXJcnjSb38ybl7Cb peMen+IQ+xJbV5SmvfSaSYy45Tmehirngt1EbYlwDhdktrMv+Hcsmm+BnvnbpBr1U5vfDx SsugRvMUcZUYRf7OH/Un/YQ6LhCsPabQbBdIpc4P+DcfFTaoVUdtbHB29p+KWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHq2y42D6z11s3 for ; Sat, 16 May 2026 16:17:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e0b5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 16:17:14 +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: 1dc1b95163b9 - main - mtree: Remove unused MANSUBDIRs 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: 1dc1b95163b9e5cf5cbd52c2b979568724746eac Auto-Submitted: auto-generated Date: Sat, 16 May 2026 16:17:14 +0000 Message-Id: <6a08988a.3e0b5.2b6a6f55@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1dc1b95163b9e5cf5cbd52c2b979568724746eac commit 1dc1b95163b9e5cf5cbd52c2b979568724746eac Author: Dag-Erling Smørgrav AuthorDate: 2026-05-16 16:16:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-16 16:16:57 +0000 mtree: Remove unused MANSUBDIRs MFC after: 3 days Fixes: 809504f331fd ("man: Kill off MANSUBDIRs") Reviewed by: ziaee Differential Revision: https://reviews.freebsd.org/D57029 --- ObsoleteFiles.inc | 1 + etc/mtree/BSD.usr.dist | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 524ebcd8c61e..3785f5ac30e1 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,7 @@ # done # 20260503: Kill off MANSUBDIRs +OLD_DIRS+=usr/share/man/man4/amd64 OLD_FILES+=usr/share/man/man8/amd64/apm.8.gz OLD_FILES+=usr/share/man/man8/amd64/apmconf.8.gz OLD_FILES+=usr/share/man/man8/i386/apmd.8.gz diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index d580cbceb062..00abc75d5bbb 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -503,8 +503,6 @@ man4 aarch64 .. - amd64 - .. arm .. i386 @@ -519,12 +517,6 @@ man7 .. man8 - amd64 - .. - i386 - .. - powerpc - .. .. man9 .. From nobody Sat May 16 18:34: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 4gHt4t418lz6cqZP for ; Sat, 16 May 2026 18:34: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 4gHt4t3S25z3Dv7 for ; Sat, 16 May 2026 18:34:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778956446; 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=ulWmzmUlrjV8Cf4w1Qz1AWOnzc4iXoIy7FBqyDcTf0I=; b=nZDsXNNFwCj6MJX5jjaqFOqm4GkdwcNwupxUSmUFfBmTsYpnlHDwY6JEcQPG2cjlPPwKq4 iFPmvdKTHEOFNy/LWviBIAWAvzdhqJ4wxbAJQiB/VvxR4xAzX18kydQpkY5RzjFPdzc3hW fptK4cP+nrXJwrMs7WFTeg1mOD+ddv81RwxOgFOxvonAc6cOZq7CGc5kc31SqHY697XtuC hvIhT2LavWLpJZrhWjO9d0hzH3ix3d4TItaOfY9G1zfyDPjCPzcNhFvN54CNuMY5+hizpy /ON0zQz2JEfJ4GZZ/fhXkBxsZAv/wKbj7CPPEZDvjYNx1sLVjgrmh2dVQ+8Ncg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778956446; a=rsa-sha256; cv=none; b=BobWZAYKheMpo8fvkCk8yiUFPuFKj6bUStwu/mrStRGEzEAdgXNA6FGdFNRiq1J/SnBvro a4xb4f3f4KXjRgk/mljkCajPHXNs/xQvsVoYI/krZBRI+Mg5HCXRPjnlWnwBz3oGUuz/Qb BnJJDGHGDn7ib6HKoKbyJZpQbRFR4fcramCO1Fq7NCRgx7pVeYgsIyWl3jTraputeixJ5w H/v8HZHXpsHowb8ULLMmsa25CP6wt5PPaGAZwnk8KFZJWNxOE8aWjgKICCmLpuL+TBOnPk B+h2xpdbdlNgDbE8J+k86ECARh8mDBOjhZdxYB7+qUsr1fn3qM7j3XuEFMxS+Q== 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=1778956446; 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=ulWmzmUlrjV8Cf4w1Qz1AWOnzc4iXoIy7FBqyDcTf0I=; b=rfU/YiAdNMHA+G7a3OLnrU2fVnXXqRjTayNEscfFseGasb4mUKBQ1PFE3qrxYabKXOjBae f+t49BcojoegnCOFi61GXzAVIr6p3qh1Kf9xzTawIWSRur/evCvKp/BHrmznza9d6MrfOg R2+NvP/p+svlBY2plTT57EMOsM70bM4sm9c89sh3QzQAxw2JkjTz9T5MPIiAoxSVLcLb0X 8xy8gyaMFsi8shPWw50kXLzBxYeN6wA5VTgUkWVFVjn5/Nt6GXYFxQVznrhaWjn+h/EXzh KRLf9lT3812CQpPDKjQWB/I7luUlgTNI/T30f9+QTSInSp4xPGj22GjJYcUryA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHt4t2wD8z154f for ; Sat, 16 May 2026 18:34:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2599d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 18:34:06 +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: 5f60d8a8f297 - main - riscv: Add IOMMU to NOTES 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: 5f60d8a8f2978f998da55d4e3cd0cb0e073bfc21 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 18:34:06 +0000 Message-Id: <6a08b89e.2599d.732052@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5f60d8a8f2978f998da55d4e3cd0cb0e073bfc21 commit 5f60d8a8f2978f998da55d4e3cd0cb0e073bfc21 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-16 18:32:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-16 18:33:37 +0000 riscv: Add IOMMU to NOTES Reported by: bz, ivy Fixes: bcecad2c24aa ("riscv: IOMMU support") --- sys/riscv/conf/NOTES | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/riscv/conf/NOTES b/sys/riscv/conf/NOTES index 102ee26811b3..6ae74bd51eb5 100644 --- a/sys/riscv/conf/NOTES +++ b/sys/riscv/conf/NOTES @@ -16,6 +16,7 @@ options KDTRACE_FRAME # Ensure frames are compiled in options KDTRACE_HOOKS # Kernel DTrace hooks options DDB_CTF # Kernel ELF linker loads CTF data options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default +options IOMMU # Enable detailed accounting by the PV entry allocator. options PV_STATS From nobody Sat May 16 19:09: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 4gHttF6PC5z6csys; Sat, 16 May 2026 19:09:57 +0000 (UTC) (envelope-from des@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 4gHttF4CVBz3Lwl; Sat, 16 May 2026 19:09:57 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778958597; 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=wLNNFy50y5M+rWfbVhAFCP0J1zFJIKJqHPY41CxYi+E=; b=Bag45y6Q0wdOfICl/oUPK1T13Z4W0CMxfj5RHp2u79y1duvSKpAIT8pgfkduiw/GGj02jk 8dEsDaz46Zs8iFOaYZwDvqf3osOoN1or0GBZiv4OS1HqULzcfNFXTvhb4pFTHoXn21xL+s ooH67yMgks/pI/GYIqv728zjHupEIDo3DlTxsqOPO3juPW7wYLXblevwUu6jmFGyDGB8ay TEk/2BMw2OZtsykvqIN8JLdVDik4DNBX4jZEj8q9bTnqfj0BOE5uMbsHVBaLgwNeX1RhSZ 7uICg+mYt3HtjzBJ97QeiQ9fiMbVUrhAp4niv7XHTAXubFGNcbCZimbGW4FWhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778958597; a=rsa-sha256; cv=none; b=o2cuasfpgAK71Ikl1xqPY+D5h6aZWIYXeWlq/9XNu0/J9FWypWvN9LkXjbRT+rfw61bmoc tFNM4pqWPtyW7om5Z43rVFkO1ZCa4fdCu8jiBELzSQsneSGep/XUIOE70xqLvnTUazeyoT IGSFV3m/7vgns6HIe5f1qbswc6hozdEhS+qwqpZ2H48XqYlI1zxutMmgdN89RUPNm64NsO 4PdpJthglceVs8B6tc2OVVOKBOyWRvE4EF3mBBGnG/cwk9eGZprnMBhopMVja5lDdcwg4M hWANUUUNI1ouZ8HbD+8OrtuSEBTAEnW4FHzNOVftFd02AubNYFZrv6jYaenRdg== 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=1778958597; 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=wLNNFy50y5M+rWfbVhAFCP0J1zFJIKJqHPY41CxYi+E=; b=tIHC9xQOsXbY/DRwsGWEpDOykBEyVgwWF86yjGANh+y0zHhxoUKgFOGgp3PV1kk60Qni97 K5S6jRAKiyo1463azcjE+88u/k10mg5QXhx0XQvkKH7RW88TnF4bbUZ+Zp8iS/dnZaNKSI 8fsNqsWwmtrDgexcHm+BdMXVLbRCF8PACvuCRIKd0cvj5GjoOotWhYsanvDBHVAC1GysZB qywAFM4ezP7osY+f4BmTE+qWlyFGlU6tpXSp56j2X9ZfPl/Nj246Dme4c2lIf1kqG6N41w PaXZP2nWIGAc+3+l/QE3k8Tz04qarLnmUD0uUolLQAAxBLdfiYxtWTVfszF0iw== Received: from ltc.des.dev (unknown [92.183.12.56]) (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: des/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gHttF2t4sz1900; Sat, 16 May 2026 19:09:57 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 3E028A9BF2; Sat, 16 May 2026 21:09:56 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Ed Maste Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 2574974648c6 - main - OpenSSH: Update to 10.3p1 In-Reply-To: <6a061bf9.2672e.364c778f@gitrepo.freebsd.org> (Ed Maste's message of "Thu, 14 May 2026 19:01:13 +0000") References: <6a061bf9.2672e.364c778f@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Sat, 16 May 2026 21:09:56 +0200 Message-ID: <86tss7b27v.fsf@ltc.des.dev> 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: quoted-printable Ed Maste writes: > commit 2574974648c68c738aec3ff96644d888d7913a37 > Merge: fb4e7898a359 2c72d8219c56 > Author: Ed Maste > AuthorDate: 2026-05-14 18:59:30 +0000 > Commit: Ed Maste > CommitDate: 2026-05-14 18:59:30 +0000 > > OpenSSH: Update to 10.3p1 > [...] > diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h > index b7f432596b55..69bc79c92bb5 100644 > --- a/crypto/openssh/config.h > +++ b/crypto/openssh/config.h > [...] > @@ -1915,11 +1921,7 @@ > #define SIZEOF_SHORT_INT 2 >=20=20 > /* The size of 'time_t', as computed by sizeof. */ > -#ifdef __i386__ > -#define SIZEOF_TIME_T 4 > -#else > #define SIZEOF_TIME_T 8 > -#endif >=20=20 > /* Define as const if snprintf() can declare const char *fmt */ > #define SNPRINTF_CONST const This breaks i386. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Sat May 16 19:19: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 4gHv4p5WtMz6cth6 for ; Sat, 16 May 2026 19:19: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 4gHv4p3VnYz3Pfh for ; Sat, 16 May 2026 19:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778959146; 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=xs/0+uxsG3xQ2ggyBApKDGUsdEHox4NqpxPib6pfmDo=; b=a1HUVG66kykkTu7sI8t6TpEjREbfvSzVjHxeSFTc7IgFni4LosKvbygUSIeo7oycm1kfju rNKp5fcMbHe62Z66qy4vc61+QmC1dEv4TkOsQU7UK8vGDBtoays1LzaxqpAgt0BM5W6k08 ULW8hFkbcZOq3nR+2VBY/ljY/mNzs/xYgUdMp+MpHnKh2VOxagibexT6pXIudib+sY9Wiw PvA50H3IZAHFRrZhY83nAj+Q6MNZPaV1WrHgGtYw4GqMTfPmLgHOHSX1rqcx3uBxykz5qN rgUu3CdGTD+08XRb1NRAr3o/T8y7zJteTk1tJteTgqh15jFklFXVmsaAUaLgOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778959146; a=rsa-sha256; cv=none; b=EdD0/w+bnwlmOfuc2XLjZeVp6NoQCCORyTCcsu4DBgvdUBs7GNrZ1yCnzJQcuiuyUr2mEm p+gDx57CCciXt5FlifUnbiBB/wUAPZuWcR8uLc0+xC63OvprvqSbGTsC41LIyCGhyVXFIM iGmjUycKRdz/J0UyvZbAvptqI8ZS9GuJfJyow93yv1MO0zj8XtkQAHFhUiTv1DxLwaGQey NGx8FMaEAsK1RMmAzXkYDTlZif/SbtpsUemIr330t5/HS8Q68BkS/BCQPehUSSWHrJPzBF S0dSKZH+uDAoaJ7LPnNTE4FlsFhDitZPwodDrovNtfh9btLsoBJeO+vLwsmMhA== 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=1778959146; 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=xs/0+uxsG3xQ2ggyBApKDGUsdEHox4NqpxPib6pfmDo=; b=BTCX50Ab73GT+RzAVZGjs4rJ1dPx8geRtJgsiGPSWm0iexBBUxTeVnZGZAe3pyK//rGCLZ +osyV94UskiAwbTzoPLQ8Ih6jy6AyD0MEuKZFCFIchXQGs0rY0IRMkUkI+DLZrwbxB7ZCE GC+159S2i9ZWweOI9SjkHSBK88TlM4YA7tOfBUrABHc5LE0ZGx00jyjy0RD2GORqnFfKBc cSbgHZCCCou0I5jOYwrYqnbCaPvxSg+idTfU3lgIUdBdkkTiNVIg8QfaYt30DsS+9k38PA U3fOhuAoh/snnAAyFKuQ0DX9wiuk07DjWyn8CzDQKCQTNKfwaozgob8jw0nrdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHv4p2sW3z16LS for ; Sat, 16 May 2026 19:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31cbc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 19:19:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 61df4be487cf - main - EC2: Don't enable firstboot_pkgs in small flavour 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: 61df4be487cfbfd27b0959e1eb66ef0d8f84562f Auto-Submitted: auto-generated Date: Sat, 16 May 2026 19:19:06 +0000 Message-Id: <6a08c32a.31cbc.30915665@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=61df4be487cfbfd27b0959e1eb66ef0d8f84562f commit 61df4be487cfbfd27b0959e1eb66ef0d8f84562f Author: Colin Percival AuthorDate: 2026-05-16 18:58:13 +0000 Commit: Colin Percival CommitDate: 2026-05-16 19:18:52 +0000 EC2: Don't enable firstboot_pkgs in small flavour The EC2 "base" flavour installs the devel/py-awscli package at boot time by default; we don't do this in the "small" flavour, so the default behaviour was to update the FreeBSD-ports repository and then do nothing with it. Turn off firstboot_pkgs by default; if someone is using the "small" flavour of AMIs and wants to install packages at instance launch time, they simply need to add 'firstboot_pkgs_enable="YES"' to /etc/rc.conf (which they must already be editing via user-data, in order to provide the list of packages they want installed). Sponsored by: Amazon MFC after: 3 days MFC to: stable/15 Relnotes: EC2 "small" images now have firstboot_pkgs_enable="NO". --- release/tools/ec2-small.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/ec2-small.conf b/release/tools/ec2-small.conf index f5904d5ea4ba..6da4444bc835 100644 --- a/release/tools/ec2-small.conf +++ b/release/tools/ec2-small.conf @@ -33,7 +33,7 @@ export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ec2-scripts \ # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} ec2_configinit ec2_ephemeral_swap \ - ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade firstboot_pkgs \ + ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade \ growfs sshd" vm_extra_pre_umount() { From nobody Sat May 16 19:42: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 4gHvbr1wxmz6cwKg for ; Sat, 16 May 2026 19:42: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 4gHvbr0Wr4z3Tk9 for ; Sat, 16 May 2026 19:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778960552; 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=R436QAqpSmGSwVgPK5AnG6XpFVCXGKu7GEfHt2no16E=; b=x3B0BiHeTTBr6Wn6B6SLid6GUjILvYY98RKcrE1hQEjUPocmMOoXb/kK9okHbp7CAHxY2V ENjHb8hd3jexSlaX8schYcYJ+KlxriSAVf8VlAoO4zf3byi3cTkiUXidU0liUyZpP+H8mB t4kXqjwZ5YnCl3GIBCTpvb3g0YkTf1ChqyFZ/eLjHj2BA7ERRc14uCPYDqCKEgfcuXBz32 T5Jsnp0r/VNzr9luDOViufUo0UcL1JbyC4Vea0qqMf8N7WMWanHRfuhiqe7wm+pJktJ1g7 klNEZmjIgOiLP8+eqemTomwG5yXYU3P7ZKHWbJ9B1iduu1V0yo4mTzblJd3TBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778960552; a=rsa-sha256; cv=none; b=tBC/7EQs4g/+q/znyAw6/4ZfXlVJhvGCVSTSQJY+wDML5UjGjbcr9fRVuTcJS8Z3m4okg9 s3znuZaopCHfmQqrE4UBPplRnah1jA9RbsvLTHKtY0WrYk1kNQS0jbwQCobgK6hHwzNY5e xLquUmdS6BZe7EKDQSY81XJQduGVNLg2fu9807Zr1tlCR335q9TThM/g9rFALcmqf9N9G5 OeYsv7tCfxc7Anj9NjE/+Glu2hXh549lHrD365TQlTJxSG1tALX3LotB9nHrBcSfGpiF8+ yWQqO4ujd+L2ENy+sh4+VVKlrLkyYSPg4We4AGnfpGDa5hdOc9M+n/pXVD8uyQ== 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=1778960552; 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=R436QAqpSmGSwVgPK5AnG6XpFVCXGKu7GEfHt2no16E=; b=uEn+WQrjjvjHqagTncznygjVGT076q21LH1j3UxFIgVgT0ab9LHz1ldFAodjb09rS0f5fZ 8TxHnRcNirZ2toCZG6B8yqEagY89YUFlVMhohJnKkaBMZuEBYoUoq+a513v+ESARTkNcbK kzrjl8DfldN97ItYGLDrefr2UxKgbCt8v0auwqNXMxKs3Noe+XJvX2iaGzf3+E5y86ouwC tJmA//7XfygL/prBHFnWJBTew5Mxwsmmy1DMYGub9UkjWuWYXKYrn3+8K7zp5eOZcClsO+ SKVsP0wZi9kvldPHepYJK2Em0ByWymF8BwUZTbkOzImz32vdUi9uZLzN0hzZTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHvbq713bz17PR for ; Sat, 16 May 2026 19:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35d02 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 19:42:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Alex S From: Konstantin Belousov Subject: git: 8dd43304b397 - main - amd64/ptrace-sce-tamper test: get rid of PT_TRACE_ME 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: 8dd43304b397715a4313bcaebbf493b607a7099f Auto-Submitted: auto-generated Date: Sat, 16 May 2026 19:42:26 +0000 Message-Id: <6a08c8a2.35d02.7126c6cd@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8dd43304b397715a4313bcaebbf493b607a7099f commit 8dd43304b397715a4313bcaebbf493b607a7099f Author: Alex S AuthorDate: 2026-05-16 01:16:32 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-16 19:41:26 +0000 amd64/ptrace-sce-tamper test: get rid of PT_TRACE_ME PT_TRACE_ME is only useful in combination with exec and there is no exec in this test. Signed-off-by: Alex S MFC after: 1 week --- tests/sys/arch/amd64/ptrace-sce-tamper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/sys/arch/amd64/ptrace-sce-tamper.c b/tests/sys/arch/amd64/ptrace-sce-tamper.c index 0645f62a7e9b..9bdedad6597b 100644 --- a/tests/sys/arch/amd64/ptrace-sce-tamper.c +++ b/tests/sys/arch/amd64/ptrace-sce-tamper.c @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -58,7 +59,7 @@ main(void) err(1, "fork"); if (pid == 0) { - (void)ptrace(PT_TRACE_ME, 0, 0, 0); + raise(SIGSTOP); (void)getpid(); exit(0); } else { From nobody Sat May 16 20:20: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 4gHwRl3BX9z6d0W8 for ; Sat, 16 May 2026 20:20: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 4gHwRl2Gqcz3d6P for ; Sat, 16 May 2026 20:20:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778962835; 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=zxxgCifDhmPEs0TAJgVgRlNH10KErbFAS/ZwmKB1mfU=; b=bCVXWlw4TFeOyzqIMzbXt+zrW4ShTa3IAutgRITsN/ZbXfKt47dT+vXWtZnR9eENlhtazB 4MZIBfeqsDUnU5ncgSAf6rLYo7yW99svDID9CwSx78MJbWanKAPldGRz9i8tifYOxmp/9Z vklMedM95jznCKMHE/+0xVRsKNWjL9snwQw7SnkgmUFfLa9QEOQIahNeVDoQyvaWDmxcal /jlV1ycNLukg3J99Xxtp3/1UfUiIAIsfts5J4csqGKCwyamqZGwiPNAVPl2S9siBEiXYGd PtOBZhM9P1bV65lZN2c2lwTKqa4gmacxsKS5xGNVCRfsYFovjjMicrYUYtChvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778962835; a=rsa-sha256; cv=none; b=X6luYP4nCUIoBapq6vj3pWkARud05TLwsCHVFqareG2Q7W4YKxS8VMdFoJwxnZTDjCU2QI e4qa7OPzwgQ3v0vOZO5/1G2fnvfrldvFdV0kFv3GfMjhK8i9LQiIdcEIdm3QA10RvO2uPN 2L7+TgXu8hHcF0x8g34UU8j5PQlez5cnCq7wwH8UdNTKSzKnKxCVyDo8biCujSH5BpOibn BQYSi4Xg+lALus3hpOeznCDaxGSMXrnqu3Btr1/v0QJFps06rDyVzyOuyw6BX/w89rOyDC NurPt09IPUEP5H3b+mKZ/7mzcjgiRIT4L6H12t+EVyKYIvc9kIkFy/bdv+uZuw== 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=1778962835; 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=zxxgCifDhmPEs0TAJgVgRlNH10KErbFAS/ZwmKB1mfU=; b=VB2/nTbNR5sqJGXddDyzTouSdMwDmacQyUCsKy2kJ7rbwXoLB0ouZ3PXCJQtnRm1A7EuD6 EYKvSq90IbYk910ZSMhP0qtlcG0BW0IBp5D6i4juAZkVBfknKIq1pbNOzgKssZ82oqltFF QtUFkwOoGGdVZeDPpR1NH7zLpKoDZeb6PZl85LM/6pRpT4TbQvAfR7YSDbiR/iykm/XflO cTbKPdVRZEn7fMY6eXU/jVnz/lf8Jhwm1K4a9j+r9M/QBeZezzyVBo49N+hwyITCigVMVn /dNn10I1SGk6z0t1ufq4yTUtDDJmL28JiFBEujAxPrsgap2VxRY/l8jaHBytQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHwRl1rkwz17NT for ; Sat, 16 May 2026 20:20:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39c1e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 20:20:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 7eb71fd267c6 - main - riscv: fix GENERIC-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: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7eb71fd267c6cab43650720b9ed89f72cdcc5a3b Auto-Submitted: auto-generated Date: Sat, 16 May 2026 20:20:35 +0000 Message-Id: <6a08d193.39c1e.4948f08d@gitrepo.freebsd.org> The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=7eb71fd267c6cab43650720b9ed89f72cdcc5a3b commit 7eb71fd267c6cab43650720b9ed89f72cdcc5a3b Author: Ruslan Bukin AuthorDate: 2026-05-16 20:17:44 +0000 Commit: Ruslan Bukin CommitDate: 2026-05-16 20:17:44 +0000 riscv: fix GENERIC-NODEBUG build Reported by: bz --- sys/riscv/iommu/iommu_pmap.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/riscv/iommu/iommu_pmap.c b/sys/riscv/iommu/iommu_pmap.c index 751ba4cf1ac3..a760f9d922e6 100644 --- a/sys/riscv/iommu/iommu_pmap.c +++ b/sys/riscv/iommu/iommu_pmap.c @@ -179,6 +179,7 @@ pmap_l3(struct riscv_iommu_pmap *pmap, vm_offset_t va) return (pmap_l2_to_l3(l2, va)); } +#ifdef INVARIANTS static __inline void pmap_resident_count_inc(struct riscv_iommu_pmap *pmap, int count) { @@ -197,6 +198,17 @@ pmap_resident_count_dec(struct riscv_iommu_pmap *pmap, int count) pmap->sp_resident_count, count)); pmap->sp_resident_count -= count; } +#else +static __inline void +pmap_resident_count_inc(struct riscv_iommu_pmap *pmap, int count) +{ +} + +static __inline void +pmap_resident_count_dec(struct riscv_iommu_pmap *pmap, int count) +{ +} +#endif /*************************************************** * Page table page management routines..... From nobody Sat May 16 20:25: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 4gHwYF4qvFz6d12v for ; Sat, 16 May 2026 20:25: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 4gHwYF4BtLz3fCw for ; Sat, 16 May 2026 20:25:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778963121; 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=AiuvMQPrkjm2/autpHpfklPFo0glfXqUNzfi4B7wSSI=; b=Ngq+Dx+Y0ZeaPKB1T1cF3ZoQ32uH8HNOvySy45T7+V6kZDZoJpsnVk4k1U3L1yrxXZC50N HFhlMumapfkd+splz82zUPqooqAC3gVDfZPjg2bsdQaPBhDWEsmtQ/PHKbJPhpNL/d3AgI ph/SbjvXjIdduEioSp0uCu4VKG4rw9BIqN/KVbpJh1MZih7tlik+lHOoFRA2u5WLSc9LY8 k6uzmi38waLVhTfQ/I1EFMwDrzSy/PeciE13vgaFSsTYIX0v8EnJsOLTEGzRUt4DQvUuQL 2O0kGO+jXRQuUiAx4gQckUPiJmYHQHmX26EulOpHrAST+zu3OHxQY1QQLcjBlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778963121; a=rsa-sha256; cv=none; b=s9g43ZM7HhjjYIU9kn3XkZ7847sLxs2I43/rrIwGYUtZ5wTR/GrzB3uG2dN5BoKyy1NWQF EGLApjPQZmahyG+4u6VvrF1+Ca+yznQ7S3DmbSb7CYK0lJyxMUu63fAjB1HzGd5Pq7MWem xHWaNOwz3Z/UN3wM0Iuil3eb59ZlkoH++7T4ahcOYeVBNcmFT1UfquwCGmbbA3SC4kPrZt Cya34kQ63upyYbhY4WkVJd3BIvLL1gA7Z3ldXdGmonCCCb06T1iJZNk6UmWaJTqkkXeWar DIxzuYY4+aa0Two3gbS5hvReskwQqAupj/cVJVKSvHs+hbrRmN8kY0g5u3FMxg== 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=1778963121; 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=AiuvMQPrkjm2/autpHpfklPFo0glfXqUNzfi4B7wSSI=; b=kAnEWUD3BuXGMLXlqOHKVha6NwbgkAOHXoDFeYuUl1NLNev+Cstv6Q16OYCASBqlm+7bqo CV5q2s9gCY6/PpwX04H86h4Atbfj37rihia7FL37H1mRGHc12VP2QCrRvMv1in27hZu3xs LkELKVlGXriaqDtw3iHnSLeYuU344pp1LlTkLFNkcwy9CugNPfomm2tVXelAjM9gbEAJOR AvitiTJccj6BjfOjKJMlgaF95H6/c/hMgr445dBG/ixx7UUXCUU0SosAioVL6Xd5AWYnWV DatES3qU29HjOHZamkZDfhj5vrvwA7g+9Y7uhYHOjY1kaNfr467KH3kk42WhrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHwYF3lfXz18S0 for ; Sat, 16 May 2026 20:25:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a300 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 20:25:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 755c1e039adf - main - kernel: address executable stack warnings in amd64 gcc 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: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 755c1e039adfd68ecf4d5954e13fe54263c34a03 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 20:25:21 +0000 Message-Id: <6a08d2b1.3a300.184d4a75@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=755c1e039adfd68ecf4d5954e13fe54263c34a03 commit 755c1e039adfd68ecf4d5954e13fe54263c34a03 Author: Ryan Libby AuthorDate: 2026-05-16 20:24:45 +0000 Commit: Ryan Libby CommitDate: 2026-05-16 20:24:45 +0000 kernel: address executable stack warnings in amd64 gcc build Mark assembly files as not requiring executable stacks. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56946 --- sys/amd64/amd64/cpu_switch.S | 2 ++ sys/amd64/amd64/efirt_support.S | 2 ++ sys/amd64/amd64/exception.S | 2 ++ sys/amd64/amd64/kexec_tramp.S | 2 ++ sys/amd64/amd64/locore.S | 2 ++ sys/amd64/amd64/mpboot.S | 2 ++ sys/amd64/amd64/support.S | 2 ++ sys/amd64/amd64/xen-locore.S | 2 ++ sys/amd64/ia32/ia32_sigtramp.S | 2 ++ sys/amd64/sgx/sgx_support.S | 2 ++ sys/amd64/vmm/amd/svm_support.S | 2 ++ sys/amd64/vmm/intel/vmx_support.S | 2 ++ sys/crypto/aesni/aeskeys_amd64.S | 2 ++ sys/dev/hyperv/vmbus/amd64/vmbus_vector.S | 2 ++ sys/tools/vdso_wrap.S | 2 ++ 15 files changed, 30 insertions(+) diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S index 17ff8005e3cd..21e55e64d74a 100644 --- a/sys/amd64/amd64/cpu_switch.S +++ b/sys/amd64/amd64/cpu_switch.S @@ -496,3 +496,5 @@ sw1wait: cmpq %rcx, %rdx je 1b jmp sw1cont + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/amd64/efirt_support.S b/sys/amd64/amd64/efirt_support.S index 54578f573750..671fd52e5016 100644 --- a/sys/amd64/amd64/efirt_support.S +++ b/sys/amd64/amd64/efirt_support.S @@ -117,3 +117,5 @@ ENTRY(efi_rt_fault) END(efi_rt_fault) efi_rt_panic_str: .asciz "efi_rt_arch_call: too many args" + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index babfbacf92ef..5ff75fb65740 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -1373,3 +1373,5 @@ gsbase_load_fault: #ifdef HWPMC_HOOKS ENTRY(end_exceptions) #endif + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/amd64/kexec_tramp.S b/sys/amd64/amd64/kexec_tramp.S index 6a2de676bc35..297a2a715a10 100644 --- a/sys/amd64/amd64/kexec_tramp.S +++ b/sys/amd64/amd64/kexec_tramp.S @@ -89,3 +89,5 @@ CNAME(kexec_saved_image): CNAME(kexec_do_reboot_size): .globl kexec_do_reboot_size .quad . - kexec_do_reboot + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index 2be555b25160..d0b67d8872b9 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -194,3 +194,5 @@ ENTRY(la57_trampoline_end) .globl bootstack .space BOOTSTACK_SIZE /* space for bootstack - temporary stack */ bootstack: + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/amd64/mpboot.S b/sys/amd64/amd64/mpboot.S index e3d940088f14..5929b529147b 100644 --- a/sys/amd64/amd64/mpboot.S +++ b/sys/amd64/amd64/mpboot.S @@ -276,3 +276,5 @@ entry_64: wrmsr jmp init_secondary + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S index 27694a95653c..09d4ef85b087 100644 --- a/sys/amd64/amd64/support.S +++ b/sys/amd64/amd64/support.S @@ -1996,3 +1996,5 @@ ENTRY(cpu_sync_core) pushq %rdx iretq END(cpu_sync_core) + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/amd64/xen-locore.S b/sys/amd64/amd64/xen-locore.S index ed2aae038b6d..8ee135f45400 100644 --- a/sys/amd64/amd64/xen-locore.S +++ b/sys/amd64/amd64/xen-locore.S @@ -206,3 +206,5 @@ gdt32: .long 0x0000ffff # %ds, %es, %ss .long 0x00cf9200 gdt32end: + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/ia32/ia32_sigtramp.S b/sys/amd64/ia32/ia32_sigtramp.S index 1a80f78a3234..8d700e1fe912 100644 --- a/sys/amd64/ia32/ia32_sigtramp.S +++ b/sys/amd64/ia32/ia32_sigtramp.S @@ -138,3 +138,5 @@ __vdso_lcall_tramp: ud2 #endif .p2align 1 + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/sgx/sgx_support.S b/sys/amd64/sgx/sgx_support.S index 4816f178e657..53fe359f3f41 100644 --- a/sys/amd64/sgx/sgx_support.S +++ b/sys/amd64/sgx/sgx_support.S @@ -66,3 +66,5 @@ sgx_onfault: popq %rbx POP_FRAME_POINTER ret + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/vmm/amd/svm_support.S b/sys/amd64/vmm/amd/svm_support.S index 26bf36b98f71..225a2a83e7b1 100644 --- a/sys/amd64/vmm/amd/svm_support.S +++ b/sys/amd64/vmm/amd/svm_support.S @@ -155,3 +155,5 @@ ENTRY(svm_launch) VLEAVE ret END(svm_launch) + + .section .note.GNU-stack,"",%progbits diff --git a/sys/amd64/vmm/intel/vmx_support.S b/sys/amd64/vmm/intel/vmx_support.S index 877e377f892d..9a3c6b3fd80b 100644 --- a/sys/amd64/vmm/intel/vmx_support.S +++ b/sys/amd64/vmm/intel/vmx_support.S @@ -268,3 +268,5 @@ ENTRY(vmx_call_isr) VLEAVE ret END(vmx_call_isr) + + .section .note.GNU-stack,"",%progbits diff --git a/sys/crypto/aesni/aeskeys_amd64.S b/sys/crypto/aesni/aeskeys_amd64.S index 667e64f441a5..8ae4a54a3d8d 100644 --- a/sys/crypto/aesni/aeskeys_amd64.S +++ b/sys/crypto/aesni/aeskeys_amd64.S @@ -219,3 +219,5 @@ ENTRY(aesni_set_deckey) retq .cfi_endproc END(aesni_set_deckey) + + .section .note.GNU-stack,"",%progbits diff --git a/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S b/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S index a15041ae7e32..f7479dc1f6f8 100644 --- a/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S +++ b/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S @@ -40,3 +40,5 @@ movq %rsp, %rdi call vmbus_handle_intr jmp doreti + + .section .note.GNU-stack,"",%progbits diff --git a/sys/tools/vdso_wrap.S b/sys/tools/vdso_wrap.S index 5a815fd6f499..865a7f1e14aa 100644 --- a/sys/tools/vdso_wrap.S +++ b/sys/tools/vdso_wrap.S @@ -46,3 +46,5 @@ VDSO_BLOB_START(VDSO_NAME): VDSO_BLOB_END(VDSO_NAME): .globl VDSO_BLOB_SIZE(VDSO_NAME) .set VDSO_BLOB_SIZE(VDSO_NAME), . - VDSO_BLOB_START(VDSO_NAME) + + .section .note.GNU-stack,"",%progbits From nobody Sat May 16 21:42: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 4gHyG230Q7z6d6l3 for ; Sat, 16 May 2026 21:42: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 4gHyG22PnWz3qs2 for ; Sat, 16 May 2026 21:42:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778967738; 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=2YOXJ+fgzQp1VUHWBKCfxVyRNQvmh0NQwna+VtOdSdg=; b=cbAWCTgw+DGYZ0OoxizPNXZg2LkuR+uC7dE1fUv4tKdDsxVk+TNPAbK6HY5p5+s57C3IXY ibhEzsg+VmOj4x6tVNuz0+o0k/B6yPyFbg5g0wWhGgNWwoJrVsbkCwxS3OW39463DjdecN xSVmNLZmrAVb4GlfqEayG0rEBtYZHuAccUQQFlUDQSTvXRxu+ajXcalOMLLBZlEXhFg6WK CaSs+ToiBwuw0QcOmqSyGPCmCSzo51GrRBNrIoF3DflNYyYFvWdmxE+fsyr2HvRkglqyd1 0KgKkiFUxtR+G7H+fIBYwME1eYhzzFUE4ylaZk/00PpABuFmdQUzi5XriS0mEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778967738; a=rsa-sha256; cv=none; b=jA9Tlpy7cDkJQkRXKe9AI86jh+8FhPW2ugq0Ei5XiSQv200Gd5qQsau6F2SJux7aALSQtK RUGqKAyJeK6LZ7hS3xvhowvl7lQc98COqP9PANcv9s92MmDZsH7g28lP4uIUzDCJlinnGd AXHLDlldAXQh3UM99AUMI1c9qLbDi2vRAr0oiyEDaIMzUBVCoNib6onS1WFozsLfTUq/oH AuNmf3Ae/WN0Dny9CVqzjP3Rt45rM4TXDc4Mw6YPDfDMsRBgbYG+UQN9wTKmf3fSaMsj4Q HA2Ju89RltT+rvBUKU2qGI89XEdUTwPKAs1JRiYFMqKqTl0tCViQpdEOHp5k2A== 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=1778967738; 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=2YOXJ+fgzQp1VUHWBKCfxVyRNQvmh0NQwna+VtOdSdg=; b=f13uyzQf981D+FCgtdPcqQ//Qdpxgq24CSeuDpFGe77ZrP6VQxB1DT3Zr4sU6LBSzry1Ol vRnAQVFdhpt4j0YlE2mpkm2a5Ie0i9mF8Fhaoh0MStD0g2YHoIJVhACiGhVcubKPSpsfrs UhCjkAQoake3gHQfaRto17s3Tq9h0mWoSxMM5y3Z7Yoq7BS6Hp63V5TriDGchyulE/8RgT GY1eYi2m6KgWCJYGs3qwqButVxyp7SHMlTKttgcLLIsS8KkMzHTU/dUmPDxhty1eZ6A2Qg 7LCzDdDRrMmBcAAPraXmLYdkdFuj6SnTTmxwcTK3+w9QY4nKRDztnutCKMSSuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHyG21fxrz1BPT for ; Sat, 16 May 2026 21:42:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 409b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 21:42:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 72ab129799a2 - main - x86: remove sys/mount.h from genassym.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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72ab129799a231e322b119de3f9c1263e76527b8 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 21:42:18 +0000 Message-Id: <6a08e4ba.409b8.4c0777e2@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=72ab129799a231e322b119de3f9c1263e76527b8 commit 72ab129799a231e322b119de3f9c1263e76527b8 Author: Konstantin Belousov AuthorDate: 2026-05-16 19:27:40 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-16 21:40:31 +0000 x86: remove sys/mount.h from genassym.c The header is not needed, and causes some issues with build because it requires vnode_if.h generated due to transient dependency from vnode.h. While there, remove unneeded explicit sys/cdefs.h and sys/param.h usage. Reported and tested by: thierry Fixes: 1d5e4020e36e ("vnode: add VIRF_KNOTE flag") Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/amd64/amd64/genassym.c | 3 --- sys/i386/i386/genassym.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c index 2716784ee871..875c536166d1 100644 --- a/sys/amd64/amd64/genassym.c +++ b/sys/amd64/amd64/genassym.c @@ -32,11 +32,9 @@ * SUCH DAMAGE. */ -#include #include "opt_hwpmc_hooks.h" #include "opt_kstack_pages.h" -#include #include #include #include @@ -46,7 +44,6 @@ #include #endif #include -#include #include #include #include diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c index d4d80fbb38ac..1a31f6b3428c 100644 --- a/sys/i386/i386/genassym.c +++ b/sys/i386/i386/genassym.c @@ -32,12 +32,10 @@ * SUCH DAMAGE. */ -#include #include "opt_apic.h" #include "opt_hwpmc_hooks.h" #include "opt_kstack_pages.h" -#include #include #include #include @@ -47,7 +45,6 @@ #endif #include #include -#include #include #include #include From nobody Sat May 16 22:03: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 4gHyk12pkCz6d8Nk for ; Sat, 16 May 2026 22:03: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 4gHyk11C6dz3t8J for ; Sat, 16 May 2026 22:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778968985; 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=DXoxkCex8htvS+hTlJ5EJuIY1xQf7UjQLNKLVVUVR2w=; b=Hc2CREHGpoB4LxGYVnoKdoRhTpQDdg6pa3E1Z7SK+b/AXd34iH87bwcqC7bDw7ftLS0ox/ 5ATetgWi4mLg6ZxHVr+S8UVzhLJl39wDvVNE2UozKsLbDt09SWQFw9kuzSFLBJEURVUZeN VfTKnVqsG8m7/UYM4UY4AV5YubI7eRfULOAC7mAAEdPNKEHhZxz8fyeugJ3J6/Qld5SZ4a WQKrLp2BVQFXoNQd36KTaHoXiKO+FVPPhTkD5PFb86VorPAfZMcCTBwRICUV4bWsa7owcb SYjGQJ9okTKG7LAkAj376lbLhzcrkBf9r8S0AHVghZ7j3DrKQ3n04rHVeazEtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778968985; a=rsa-sha256; cv=none; b=RXXRXdlFBMF+UtPY3Raqd1XwElFGTt7ZkqfT/wJhefmeWA/U78ymzuWqscfsNuZxt85STL 1CKIcWg45iHglkUARERC+OaJ7j/47Q+wNOtEf1R3c93ZTsbxo8AxjDUFHaK/TNq9qReg4l 3yEra1uY8cwDhY2kVNpAJrFSJCdD/vg0B+Qor+G22x6MSm5aqKLu2hkDYpAdSvdxfnI4a2 oeQR9828FH9nXyECdejYQCrSfMyWe2Q7ejU+GTdZOBAdNrj3czlFD9jzkM8lPGPF3Jwf6z Kzg5uXM9g+wBMuDMQB1ecIGmE/toU6liC2BQaQwuahDuzI9nh2oATyFRdPtkZA== 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=1778968985; 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=DXoxkCex8htvS+hTlJ5EJuIY1xQf7UjQLNKLVVUVR2w=; b=tIYrpN4wLN0mIntEYFmoM/ZPwiicP7fKY6MJWNZKwHueuAgjnC521IBEUDoGRTpcpSn8EN mi0VBaGuWC5YMBTaVAweZkOUkgjgyB5eAVxX29aNmMrOb/I/0b/a8zpiNbP3SfwQaKnmkH R1ukNRGGaMvPCiEcPvkn/15VK1WS5Lm3PjVXru9kBL3oWSoJii5dm5Sf84MQmcjEEVA2l+ FkmYjmRNYRjT1yqvcCgpfwRvFZR5T9dt7YoEtNITIoPjpeATTzAM8bUntBYZoZVV2tnnJW EWyFcZOIfkYIbUagAslR1/rIIao/iarJ+cw+pD9yMBIud/Jkc3QUmWUUl6KecA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gHyk10fLCz1C7x for ; Sat, 16 May 2026 22:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43ff1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 22:03:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 3d246db08333 - main - blocklist: Add back probes 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d246db08333c06df343281d5aaebfd07ea08252 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 22:03:05 +0000 Message-Id: <6a08e999.43ff1.491de9e2@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=3d246db08333c06df343281d5aaebfd07ea08252 commit 3d246db08333c06df343281d5aaebfd07ea08252 Author: Jose Luis Duran AuthorDate: 2026-05-16 22:00:02 +0000 Commit: Jose Luis Duran CommitDate: 2026-05-16 22:00:02 +0000 blocklist: Add back probes The banner exchange was moved to the sshd-auth process in upstream commit bb781f02d4efd178e329a62a838962bee16e3e9b. Add it back. Add back fatal exit probe. NetBSD PR: bin/60270 (GNATS) Reviewed by: emaste Fixes: 2574974648c6 ("OpenSSH: Update to 10.3p1") Differential Revision: https://reviews.freebsd.org/D57027 --- crypto/openssh/sshd-auth.c | 5 ++++- crypto/openssh/sshd-session.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/crypto/openssh/sshd-auth.c b/crypto/openssh/sshd-auth.c index 76350a2a3501..e335bda8ee48 100644 --- a/crypto/openssh/sshd-auth.c +++ b/crypto/openssh/sshd-auth.c @@ -96,6 +96,7 @@ #include "srclimit.h" #include "ssh-sandbox.h" #include "dh.h" +#include "blocklist_client.h" /* Privsep fds */ #define PRIVSEP_MONITOR_FD (STDERR_FILENO + 1) @@ -812,8 +813,10 @@ do_ssh2_kex(struct ssh *ssh) free(hkalgs); if ((r = kex_exchange_identification(ssh, -1, - options.version_addendum)) != 0) + options.version_addendum)) != 0) { + BLOCKLIST_NOTIFY(ssh, BLOCKLIST_AUTH_FAIL, "Banner exchange"); sshpkt_fatal(ssh, r, "banner exchange"); + } mm_sshkey_setcompat(ssh); /* tell monitor */ if ((ssh->compat & SSH_BUG_NOREKEY)) diff --git a/crypto/openssh/sshd-session.c b/crypto/openssh/sshd-session.c index ae41b4d7595f..26a361fe621e 100644 --- a/crypto/openssh/sshd-session.c +++ b/crypto/openssh/sshd-session.c @@ -1369,8 +1369,11 @@ cleanup_exit(int i) audit_event(the_active_state, SSH_CONNECTION_ABANDON); #endif /* Override default fatal exit value when auth was attempted */ - if (i == 255 && monitor_auth_attempted()) + if (i == 255 && monitor_auth_attempted()) { + BLOCKLIST_NOTIFY(the_active_state, BLOCKLIST_AUTH_FAIL, + "Fatal exit"); _exit(EXIT_AUTH_ATTEMPTED); + } if (i == 255 && monitor_invalid_user()) _exit(EXIT_INVALID_USER); _exit(i); From nobody Sat May 16 23:24: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 4gJ0Ww0swvz6dG1X for ; Sat, 16 May 2026 23:24: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 4gJ0Ww09MRz45fn for ; Sat, 16 May 2026 23:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778973868; 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=jd9NqqUomoOxEJKxnACsAaQeHX9d4dku61FGCZZcbNI=; b=qnF4Bzp7nu/yED6YVEvrrQrvWkiDun8nksyRTvX863WDW+Lp84ZzvXaYpLhwgYpeLSePNW S9DZLcbSp6PDuXqYPHaV1IPo/xyThUJf1p782UEOmxt1q9vIqAXMwk547DDO03s9yLQ0+z iiRoFXgte6osDXcNN527dDPPuxOPictD8UAEl25zqMPk6Robka3MNJYjjzH4dO38SZEk49 SBYmNZg5o8QQ43jzh58x/VIoRR9Vl0OY+lpE2BmxlzIpClqmNBBYl8qIGVpVuWHVKPsGnr GJV8YDBSs3NPVm4ZrwgOKSWLrpT161KwyZUZ+QPgtamJH94GjSYJgzGb6AboGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778973868; a=rsa-sha256; cv=none; b=pmxtUCgf1NSk7otAY1JdQXoIse9IJ1X5uzCe4HrXyTZNa2KL5YPBQuZzeDu6k4TZaFRDnU LXh3FuAZ95CPnfCLZQpmvwDEuyUK24HOSHU6gWrXCo6CMKG01gUwgwMWlMHSk8D/uGMi9n P7qj+8wneL2vmif7tr5kxosOT/3mavuZq3gbhPB5shhi/JcYYtAUFxDZOL9ReOL+x4ei4X 5TFM/2gty2T35q3KQ4pCx25QMTsjAiTk6Obn03HRR9PzldxgoJmMqw8sx3GA/urwKepJkk 5IMA7bhZ2F2MjzYp6kPBXtij6Mev8sN+xZlj4W2GVY5gZ41gItO5OzWjpercag== 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=1778973868; 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=jd9NqqUomoOxEJKxnACsAaQeHX9d4dku61FGCZZcbNI=; b=cYHzJ0lAo4bBXVv+A9cjFUiQuYHluK8toHDnAnyVTueovZGq963BZ/gWz57mq2sSIdFvdh Vf/kApNLQmtLTekdjlmPszClfaPoWzeu0Akil+daPbCAVUYry64KT8SCLbZ9CL4KOyceaI qIIN2DxiymBjbiLWeh52CRzhVwtNk1NNZK8UIu1wKOORR9qyRmWeGlxPzJfI7kxbBGNO0f kYIHlHqykmFaxd/up1sBmR61amRUFFoXNXk4vyHjH2csHJxll8ab+gPMOvom0xMM9GaA5v ZB7whJkwP9FRssUnzmG44Z1Y3E21p8CFT2sF2bAaOFnR4gw4WboylIY23M3xjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJ0Wv6cBCzjH for ; Sat, 16 May 2026 23:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c6f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 16 May 2026 23:24:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 43a8585cb2bb - main - sys/mount.h: restore KNF_NOKQLOCK in VFS_KNOTE_{,UN}LOCKED() call to KNOTE() 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: 43a8585cb2bb0e284df672174a57780e53107d27 Auto-Submitted: auto-generated Date: Sat, 16 May 2026 23:24:27 +0000 Message-Id: <6a08fcab.1c6f7.2f21ecdb@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=43a8585cb2bb0e284df672174a57780e53107d27 commit 43a8585cb2bb0e284df672174a57780e53107d27 Author: Konstantin Belousov AuthorDate: 2026-05-16 19:11:43 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-16 23:24:10 +0000 sys/mount.h: restore KNF_NOKQLOCK in VFS_KNOTE_{,UN}LOCKED() call to KNOTE() ZFS needs to take internal sleepable lock in its implementation of VOP_GETATTR(). Due to this, kq must be unlocked around calls to the vfs filter methods. Fixes: 1d5e4020e36e ("vnode: add VIRF_KNOTE flag") Reported and tested by: des Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/sys/mount.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/sys/mount.h b/sys/sys/mount.h index d6696bba0a4f..2e880bac9068 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -968,8 +968,8 @@ 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); + KNOTE(&vp->v_pollinfo->vpi_selinfo.si_note, + hint, KNF_LISTLOCKED | KNF_NOKQLOCK); } } @@ -977,8 +977,8 @@ 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); + KNOTE(&vp->v_pollinfo->vpi_selinfo.si_note, + hint, KNF_NOKQLOCK); } } From nobody Sun May 17 10:15: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 4gJGyw1jMyz6f6HW for ; Sun, 17 May 2026 10:15: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 4gJGyv6fF0z42PY for ; Sun, 17 May 2026 10:15:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779012920; 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=ivD/FE0IAQTMscIKNPSJGEWOjgLbvNIvJXRX1WU6S6Q=; b=yZlNYXPKDomMArj/F6Y/4bpVLiui3aV4fHF9G51DF20OWNlSP0zFgzXdk9bsYzoN9gsWX+ fsJ+BDHmwfxAstQvUHuuihTPgveK5SPCErH1JS9D5Syc/ruvneklYXgCHl9WUxVeGCVD5a jdq6pLX2mc4wjNiJ6gMfh+tgFGZkCud2Z5Ogjf3MjyHegdzuwVyymywUw/EYZ5ysvV8QWQ yhc8d/7PX55Hty6JXiBeyxBIMIw+4irUGcWRUvhe2bLCDQFwuvSK75xWX/NAYFcYZOjHoz fiR5MFeEFP9jCPaY6G2+cfSYfWDFXfpW3yvmEsRv33Tk4uW83vhVFYkzhvUDMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779012920; a=rsa-sha256; cv=none; b=w7yLEzj/I7w8cQRRhzYLWJ5TJY2BjPFGQQXgjJtfgw4OPPtfFwB3S5exxL1wAGb0Gjr3C+ OMP3oawgjXphzIAnqLXlIUkLe6RoBIwGd/DLXpwDrFsrjWziXNQ99O6A6efPcevZGGN+IE CaDRtCDG70tocnTaZcqMl+EB76pOUOcmmIXAcjUeMrGgSDzdiU1w2u0ozE9uxUlppF2VEO YSmyep9N6AdziM7Vi19P5ZlW1q4B/O4rFN1RGkU5zDjy+Ik2NgIJq9ybmEwE9y1yNxxvNG 3fhHFCzzidQaJK+xYj1hMuNzICWkCm/1UPPEvQOb6KZz6HdCG/V3v5AzJU20mw== 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=1779012920; 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=ivD/FE0IAQTMscIKNPSJGEWOjgLbvNIvJXRX1WU6S6Q=; b=eGg8QiAPhZzapwgQ6ojkB9gE5LbbbPh9h4o0h1K8uYyHw5h6YSzxj5mgKAc+DTynRbYe2J Wr3gA6pTreD1T8DiP18M+eOaXmAnX80ID3Av9Ck95zMc+gy0CIjnwT6jCiCyDREWxIEg/C P+POL+ptD2bUEqEPD0OuewyDSOVz4y18wH0s9VbQskUJporxH8w0tij1sSZvwDz29hvaxO Ki8gJ81m7TwDL/e9/Fw/beXcUlBkaoXrcfkmvd9ZMM7cdpqxjpDaRfbFY5sFzywB45wq+C 8RQnIkVpD3JjPpz1Ecus8ZQu4PLWzHGKXeQzaJo4bP1GiGRytG+dibcTmv2JEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJGyv5kSvzdJF for ; Sun, 17 May 2026 10:15:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ffad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 10:15:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrey V. Elsukov Subject: git: 2872268c7f6d - main - ipfw: treat ipv6 address with zero mask as 'any' 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: ae X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2872268c7f6d473aae9b02ebb5d2c24fc2cff9b1 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 10:15:19 +0000 Message-Id: <6a099537.3ffad.40d890d5@gitrepo.freebsd.org> The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=2872268c7f6d473aae9b02ebb5d2c24fc2cff9b1 commit 2872268c7f6d473aae9b02ebb5d2c24fc2cff9b1 Author: Andrey V. Elsukov AuthorDate: 2026-05-17 10:12:20 +0000 Commit: Andrey V. Elsukov CommitDate: 2026-05-17 10:12:20 +0000 ipfw: treat ipv6 address with zero mask as 'any' Make the behaviour similar for both IPv4 and IPv6. Also add the corresponding tests. PR: 294733 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56618 --- sbin/ipfw/ipfw2.c | 7 ++++--- sbin/ipfw/ipv6.c | 11 +++++++---- sbin/ipfw/tests/test_add_rule.py | 24 ++++++++++++++++++++++++ tests/atf_python/sys/netpfil/ipfw/insns.py | 2 ++ 4 files changed, 37 insertions(+), 7 deletions(-) diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c index 06a1ee937cd7..c67eb6618c59 100644 --- a/sbin/ipfw/ipfw2.c +++ b/sbin/ipfw/ipfw2.c @@ -3595,12 +3595,13 @@ fill_ip(ipfw_insn_ip *cmd, char *av, int cblen, struct tidx *tstate) * list unless it is the only item, in which case we * report an error. */ - if (cmd->o.len & F_NOT) { /* "not any" never matches */ - if (av == NULL && len == 0) /* only this entry */ + if (av == NULL && len == 0) { + if (cmd->o.len & F_NOT) /* "not any" never matches */ errx(EX_DATAERR, "not any never matches"); + return; } /* else do nothing and skip this entry */ - return; + continue; } /* A single IP can be stored in an optimized format */ if (d[1] == (uint32_t)~0 && av == NULL && len == 0) { diff --git a/sbin/ipfw/ipv6.c b/sbin/ipfw/ipv6.c index e6eb07af26dc..f34a08bb6f52 100644 --- a/sbin/ipfw/ipv6.c +++ b/sbin/ipfw/ipv6.c @@ -396,8 +396,6 @@ fill_ip6(ipfw_insn_ip6 *cmd, char *av, int cblen, struct tidx *tstate) n2mask(&d[1], masklen); } - APPLY_MASK(d, &d[1]); /* mask base address with mask */ - av = q; /* Check this entry */ @@ -408,11 +406,16 @@ fill_ip6(ipfw_insn_ip6 *cmd, char *av, int cblen, struct tidx *tstate) * list unless it is the only item, in which case we * report an error. */ - if (cmd->o.len & F_NOT && av == NULL && len == 0) - errx(EX_DATAERR, "not any never matches"); + if (av == NULL && len == 0) { + if (cmd->o.len & F_NOT) + errx(EX_DATAERR, "not any never matches"); + return (1); + } continue; } + APPLY_MASK(d, &d[1]); /* mask base address with mask */ + /* * A single IP can be stored alone */ diff --git a/sbin/ipfw/tests/test_add_rule.py b/sbin/ipfw/tests/test_add_rule.py index 4360c5f87c15..ed565f0e7c68 100755 --- a/sbin/ipfw/tests/test_add_rule.py +++ b/sbin/ipfw/tests/test_add_rule.py @@ -135,6 +135,30 @@ class TestAddRule(BaseTest): }, id="test_rulenum", ), + pytest.param( + { + "in": "add allow ip4 from 0.0.0.0/0 to 192.0.2.1/0", + "out": { + "insns": [ + InsnEmpty(IpFwOpcode.O_IP4), + InsnEmpty(IpFwOpcode.O_ACCEPT), + ], + }, + }, + id="test_zero_addrmask4", + ), + pytest.param( + { + "in": "add allow ip6 from ::/0 to 2001:DB8::/0", + "out": { + "insns": [ + InsnEmpty(IpFwOpcode.O_IP6), + InsnEmpty(IpFwOpcode.O_ACCEPT), + ], + }, + }, + id="test_zero_addrmask6", + ), pytest.param( { "in": "add allow ip from { 1.2.3.4 or 2.3.4.5 } to any", diff --git a/tests/atf_python/sys/netpfil/ipfw/insns.py b/tests/atf_python/sys/netpfil/ipfw/insns.py index dbb9af659794..c5f729ac4d63 100644 --- a/tests/atf_python/sys/netpfil/ipfw/insns.py +++ b/tests/atf_python/sys/netpfil/ipfw/insns.py @@ -682,6 +682,8 @@ insn_attrs = prepare_attrs_map( AttrDescr(IpFwOpcode.O_NOP, InsnComment), + AttrDescr(IpFwOpcode.O_IP4, InsnEmpty), + AttrDescr(IpFwOpcode.O_IP6, InsnEmpty), AttrDescr(IpFwOpcode.O_PROTO, InsnProto), AttrDescr(IpFwOpcode.O_PROB, InsnProb), AttrDescr(IpFwOpcode.O_IP_DST_ME, InsnEmpty), From nobody Sun May 17 12:50: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 4gJLQ06wlHz6fHs1 for ; Sun, 17 May 2026 12:50: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 4gJLQ06R2rz3FrB for ; Sun, 17 May 2026 12:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779022232; 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=oqmMo46l3oFFvbwKvfyK0ieXs3TP+yz+NPpjHUBi9kk=; b=CAKzQ6e5udy+xL8u+ZI+odjQ8ysJOdiRMwmW0JcaNLGcbVDZFy+oPN4VC8FGEw9htMAtJL ygBgrR8GHY+2i4yHYjqz823UtFdpDYTSPlTjGPottea0EBZUU9UeBkilOXsL+NnqOlZWxd vdzfkISN0fAw1092w/cfn4I6Rb9FjKKW9U7NofV0ncONly0sZmAHcKnq2JezVy6h2iM+Mt bYL38CPYwpp5zqsT9ktiD5uzmSSxLBFDqPgnGjWwb6G2rDGVp3cY/gI8am4gmG8vHd9HWE oTYSvRrCPy7XAMo8HMghrQyZJmkKQJkMWE29Ul7WEpiB53UwwJfPnM6lVt1QBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779022232; a=rsa-sha256; cv=none; b=YOQjgZjQrIViudSI2LfNLXwEEl8ofodhTypm64u03LtDBiZlipgLFLXN/m4m6CVp6BSmlk INK6FdvGvMwxleAx9X7KZzOo7Q7RU2y7Sqt8uo74txxEbIFw72lAq3rhoLXNmOUsJCKwhX /iwMtXW2hapA6I83h5tdcgk7+Oa8p3UNq+GkEaFa3vjH+Gunlp5Z4mPEZwQi9F5uqIUbJz c4NHM5t4zTYiuzpLw07ryWdG6c5WIMmGDdblkgKWRcOPNaXc/p/qqwN5kUWGaZG7wmTQEL nBDTxlLgkYPc4V23qXA/igIkAELM2oG9eTYqlqFgSAvxd3GfHOz/mpTnAQ8XWw== 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=1779022232; 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=oqmMo46l3oFFvbwKvfyK0ieXs3TP+yz+NPpjHUBi9kk=; b=GmzU8yHaquMk1/13lT1IecnPAUaFk9IjjSZSeNCj3aDqY1zMRSWkdLlYua/HSWoFZ7eNMz bb5hiArY3VFmLFAXgFUUI9Sk8pkE9qQve6KXmUwaO97dRHNkLc2iCZhPdMl9ZG5O2QLt3v to1O3wkCV0+n+z4ne4OJF06FoL88MpJlpQgZQVbbceAmgkMnR+w5bSkKDhWmnDZYgTNCN7 iuWSIFUg284nAeZXJhGexKUgb4fJB3B5W6RBzjVjtYWpR+kg4jMqWOJR1gHWZyPcSUEFDb 8ynukLrF2/zw371brC132eUOK/DqaUzSgBmDj/nc/HCUY1H0UHyQuRoErjlP3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJLQ05zjvzj68 for ; Sun, 17 May 2026 12:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 301f4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 12:50:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 4cee16d471d4 - main - linuxulator: fix SO_PEERCRED emulation after 1d24638d3e8 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: 4cee16d471d47f4673e4d2c66f7a96d4e6d86ee9 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 12:50:32 +0000 Message-Id: <6a09b998.301f4.a5dedec@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=4cee16d471d47f4673e4d2c66f7a96d4e6d86ee9 commit 4cee16d471d47f4673e4d2c66f7a96d4e6d86ee9 Author: Alan Somers AuthorDate: 2026-05-16 18:03:49 +0000 Commit: Alan Somers CommitDate: 2026-05-17 12:49:23 +0000 linuxulator: fix SO_PEERCRED emulation after 1d24638d3e8 For Linux binaries, sopt->sopt_td may be null. And there's also no need to check it, since struct l_ucred has the same layout on 32-bit systems as on 64-bit ones. PR: 295333 Reported by: Miguel Gomes Fixes: 1d24638d3e8 ("Fix LOCAL_PEERCRED in 32-bit compat mode") MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D57032 --- sys/kern/uipc_usrreq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 2508f7edd1c5..a5607e66117c 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -2756,7 +2756,9 @@ uipc_ctloutput(struct socket *so, struct sockopt *sopt) if (error != 0) break; #ifdef COMPAT_FREEBSD32 - if (SV_PROC_FLAG(sopt->sopt_td->td_proc, SV_ILP32)) { + if (sopt->sopt_td && + SV_PROC_FLAG(sopt->sopt_td->td_proc, SV_ILP32)) + { struct xucred32 xu32 = {}; int i; From nobody Sun May 17 16:24: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 4gJR8X75Zpz6fZ2P for ; Sun, 17 May 2026 16:24: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 4gJR8X4KTHz3sVF for ; Sun, 17 May 2026 16:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779035052; 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=k8us6U29pe1aH396K6TzA5hS+YihbDMPEGURKNVhQgE=; b=GsQF2xnmZmLqHURCG9wAqgKJQDSRZht8/CcoIMCQZKHb24b5f0BU9X4WTsQ2tQl+g7IkmT Bwb3lU5TulYB3vsTZI01SszZsPyuILkf7IPLAN7ZS6K5RGYl2EGsnCOf32nNPhKR3m24MQ 4DcRjO2MlWOieT/bjnlBvQ6KUck/MKH0JPA7vSlMV/Zzevsybvh9XDciqIqjQM0VCoyhuG XJYgNdR9QPZTxWx7vL3aSbwVD4ld1C5LM9rgoD4NGP3UBSB3P/4d2VLP5KFlQoGlxRkfZ/ pF7YwdljytpsBNKYZ3UBtE/8exOCSTqQpnVp5xwQIUXZm4Uk2UaThvj93DvtqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779035052; a=rsa-sha256; cv=none; b=TrGjbrLdhnI2/fPVTCSu8xlKrJZtcMRIaaz4odyOTndy057/ahAXkyY/mIWs+5nka8gu0G HB11Ay10Hh4RgdgF4dHBXmaNtty7syQRe7xIizFr0vQiKTB/sBVH7BKB5J00Z5fYDngiMh qceNGMADK7w2MQcLvOHnRJBWxUJYYLBK/PAZ8EZ8a6L+flr0BGVrivWyJGPuVIVmN0kk1r KGnYM6QA7jYp5D6DNlaUiy+dlhthqZonhRACAQkzXizSf64+b0AZ6B4bY0Zn9e/oCjXxmp CohTtOtQQQCWrcZJrbdkDxWA3ea+cSFnToNKKk3oObT72XDTETeBySXIF7T5YQ== 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=1779035052; 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=k8us6U29pe1aH396K6TzA5hS+YihbDMPEGURKNVhQgE=; b=BYsZqdlhZspNavkLnNAPZ+TisPxNI7EBCKUey8bU9zkXheI0opkejJaGorJquPtx+CJcI9 eDDN8oecor6g6pCayKAYCO/c4ZQByTq7ft2nF3Kaz9d1pLFDKT9eSKxrCPnOVYcRrhtiyv z5vBDbHchC5+mM6IbU7FfdV6mrcis/+rdbIUEp0gSFnm8idMEaQ0PS2T67hRmJbAEoHB1X i+yk7UoT3OF01QEZfol6MdhE+ZItSxQzDctZN1wBEFAsjltC1FkacVHxsnvbR1w/gf/zIc awYekBxBLVyGXQ3614itx4yMrm74kG9qSz5PXo4ucs7FehCHfKWEmcX1e1L4iA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJR8X3jnszpg7 for ; Sun, 17 May 2026 16:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 180b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 16:24:12 +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: 363ea40c7654 - main - limits: Further RLIMIT_VMM cleanup 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: 363ea40c765424b3cbd9b96790235af030fcc8ff Auto-Submitted: auto-generated Date: Sun, 17 May 2026 16:24:12 +0000 Message-Id: <6a09ebac.180b1.3301129f@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=363ea40c765424b3cbd9b96790235af030fcc8ff commit 363ea40c765424b3cbd9b96790235af030fcc8ff Author: Dag-Erling Smørgrav AuthorDate: 2026-05-17 16:23:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-17 16:23:50 +0000 limits: Further RLIMIT_VMM cleanup Teach limits(1), sh(1), and setclassresources(3) about RLIMIT_VMM. Fixes: 1092ec8b3375 ("kern: Introduce RLIMIT_VMM") Reviewed by: bnovkov Differential Revision: https://reviews.freebsd.org/D57031 --- bin/sh/miscbltin.c | 5 ++++- lib/libutil/login_class.c | 1 + usr.bin/limits/limits.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c index bbf0aa5b8bde..f96f96ba43d2 100644 --- a/bin/sh/miscbltin.c +++ b/bin/sh/miscbltin.c @@ -517,6 +517,9 @@ static const struct limits limits[] = { #endif #ifdef RLIMIT_PIPEBUF { "pipebuf", (char *)0, RLIMIT_PIPEBUF, 1024, 'y' }, +#endif +#ifdef RLIMIT_VMM + { "virtual machines", (char *)0, RLIMIT_VMM, 1, 'V' }, #endif { (char *) 0, (char *)0, 0, 0, '\0' } }; @@ -553,7 +556,7 @@ ulimitcmd(int argc __unused, char **argv __unused) struct rlimit limit; what = 'f'; - while ((optc = nextopt("HSatfdsmcnuvlbpwkoy")) != '\0') + while ((optc = nextopt("abcdfHklmnopSstuVvwy")) != '\0') switch (optc) { case 'H': how = HARD; diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index 9478b4dc98ca..90e4e01f7c3b 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -66,6 +66,7 @@ static struct login_res { { "kqueues", login_getcapsize, RLIMIT_KQUEUES }, { "umtxp", login_getcapnum, RLIMIT_UMTXP }, { "pipebuf", login_getcapnum, RLIMIT_PIPEBUF }, + { "vms", login_getcapnum, RLIMIT_VMM }, { NULL, 0, 0 } }; diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c index 57551c556c25..fbb19289e6ca 100644 --- a/usr.bin/limits/limits.c +++ b/usr.bin/limits/limits.c @@ -92,6 +92,7 @@ static struct { { " kqueues%-4s %8s", "\n", 1 }, { " umtxp%-4s %8s", "\n", 1 }, { " pipebuf%-4s %8s", " kB\n", 1024 }, + { " vms%-4s %8s", "\n", 1 }, } }, { "sh", "unlimited", "", " -H", " -S", "", @@ -112,6 +113,7 @@ static struct { { "ulimit%s -k %s", ";\n", 1 }, { "ulimit%s -o %s", ";\n", 1 }, { "ulimit%s -y %s", ";\n", 1024 }, + { "ulimit%s -V %s", ";\n", 1 }, } }, { "csh", "unlimited", "", " -h", "", NULL, From nobody Sun May 17 19:44: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 4gJWc13gVYz6ctyB for ; Sun, 17 May 2026 19:44: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 4gJWc12rMmz3L8p for ; Sun, 17 May 2026 19:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779047089; 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=gI+0l6tqk+HdCCTSIQYEhQUBJuTa7uDgHquZV313aWM=; b=YcSdkyNRO9e+TF5gwl6hsByMZQ4M1xnFRWEPUv4y4ZigCY1AMwcYWW0fYx6vCSJHJ0IxQz z1jQq2spLZctTVm7kM2AXmdXnhLaloZHGzHuVEqjoZle/VZMJJNOvq1dNTWkcqoWS19qgK Asw7vKMgtaE+S9Rfe5dA3KsoC+E3AVMJFnJoeSogI2EEYdOg5c+1VL9fvkZ2zMKUqVvGgD OpxmKW8YJvqb1uhI8YRHjKS7dxjyf/dVXawEeYdN7RCZAbyzTJCEzfTxsRCFLw8IvFZV67 Dt2MxHJ1QjdVC4Ho/y+ypovPZ9hVO9PYnDhN/hovB1UjEYBrGXXNHkA2QllbIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779047089; a=rsa-sha256; cv=none; b=hZ4szaPMvORzSYbUGNOOvG4TOTXH+bmRHLhBYDhnHBJu5UllHNR4KQvQ4Lxz/EB54uoNLJ jUVogiP4EKHoHIM0kECDFmT5hzN7l+Z91XuhpA0evO8dZThMt9YylsJV9wIdKniirdyZdI 1pXgenUa6gyJYBfhJE1iW5UIicxfJhDgh63NwfjTYGwnLYXhCIgmXJogI9E3a162uGUQfj M6x1XJNbRyHISnhNeo6VzDFWQmABj3hjBjvfbZig2cKCqlEaQndVAdV0D72o+9BhF5wsOb cX+NSV9GtMg38roWod2fwWnhUEbteh/7fEstya6dyb59GksFV/tMiSznuqKOJw== 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=1779047089; 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=gI+0l6tqk+HdCCTSIQYEhQUBJuTa7uDgHquZV313aWM=; b=IexozvV/vQkS5VatTu5aYnzLTYsVL6xDIQeGm0aSHWJJlzW2qn5l84ux9aBE9kKPghi31q 2FqWomcWUz/KjM0pYil30cTBI1Yl0qD5fUe97ipLaT7xYutaQR9ZLNO38uwa+XVn9MwUYm +DEOxDBDQ6/f10yF7vuIREwCub9KnK24bJnnu2jTt4nvdrgV1TPQAFMsBj32f810qNUx7D /xgFizISqRzULLAEVJW1HCVelgUf8hM1F7qE0KBWOM7qiJ4itkxAytswUgx0qJFSzJMkQL b9/1OHvE3tLH+2O40Rungo31v+kvWNPM0fhkVs58ebvpF2JXecd+u+YW6+slFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJWc12PkVzvsm for ; Sun, 17 May 2026 19:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 366ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 19:44:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7bdf2b5d5fba - main - nullfs: do not allow to mount a vnode over itself 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: 7bdf2b5d5fbabfc8749c4ff6e618c3e843b14de0 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 19:44:49 +0000 Message-Id: <6a0a1ab1.366ed.93367f9@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7bdf2b5d5fbabfc8749c4ff6e618c3e843b14de0 commit 7bdf2b5d5fbabfc8749c4ff6e618c3e843b14de0 Author: Konstantin Belousov AuthorDate: 2026-05-16 22:16:45 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-17 19:44:06 +0000 nullfs: do not allow to mount a vnode over itself This causes recursion in VFS that is not worth handling. PR: 275570 Reported by: Alex S Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57043 --- sys/fs/nullfs/null_vfsops.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index c3eec727aeea..0ec4f9c87297 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -151,6 +151,14 @@ nullfs_mount(struct mount *mp) */ lowerrootvp = ndp->ni_vp; + /* + * Do not allow to mount a vnode over itself. + */ + if (mp->mnt_vnodecovered == lowerrootvp) { + vput(lowerrootvp); + return (EDEADLK); + } + /* * Check multi null mount to avoid `lock against myself' panic. */ From nobody Sun May 17 19:56:15 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 4gJWsC2hNkz6cvpN for ; Sun, 17 May 2026 19:56: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 4gJWsC1nTXz3MVk for ; Sun, 17 May 2026 19:56:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779047775; 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=3lQ6AoBzSnUq78saSfSCOQQz2YG7z/cnWAjZe9mQfEw=; b=FZ8qDd0bmWugfKb73lpPFWFzcm3yP0lX4slRVsqK5+eOOg5C+8cm92jOqqKnbkOcBL8p4o UFmOWqfCW8DmjF9abNa1BjWce/4h2yP8v0/oPzpNGeopPAPTn6SLhhCYiYum6Pu/ZZ/Itb Wj3bnPo7fHkdKfq61v46QhOvnJO/lNLBL7dxCq5qSIivehd7AOOA+rxy+m0cchqz7ClMOl m6PSL+hxmCap6NGTwCyvjm0eYY0Z+xR4EdN0prdauV/pRkxP62QWRpdnALCKJ9MCNoP953 yHl8MEdE64/sCc5jpCrvEBsjKODiJq3kPhYncPpqBP38pliPGIvJxH8/SjyTBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779047775; a=rsa-sha256; cv=none; b=BUVRIyKKv8/H3UFfqTFeQtl/eVX9cMpjBWcAJ9YeVlVpFxuFu1Jiz85JGFc5ufNj+Ux9jh lQkXwAnrpdGAFUm+VAk+m8gmIlS6hl90t8B5aFYF3wednvGyJNEe/vtoi//VMWbC3ImNdk x3kLXuYpjR8JNJMrcqODdTjiDF8NeP651wy9YqWP4Nx3D9IvoZTrTJvn3/cfv+eZS1AJGU raBux9qW7VpMyZp+d9HrwVKosmpL7aWRGgmxsntOg+NoPS9dzBZ6IF+DFYCHT6e31H6UNh w8ABo+AnZFjf4WLbFWOwpBG/FSX+Jb3bAQtWZykuuGBmy7YIzqKusNlJNZ8e4w== 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=1779047775; 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=3lQ6AoBzSnUq78saSfSCOQQz2YG7z/cnWAjZe9mQfEw=; b=Mf9qzBCyxETBxl02sX6UM6Erx70ex3s1Ld4YKf8LIoti94yrW7XlqwWqAKu8oRNoxFkSKj 2D4U7S+NVJ78Mq1jswTavyZgb7yqxJd3xbV3XnOc69EiQR232mgvJUWkOScEYW7GD6FPMD wycLv1eotvfz07I0mP7e7aSSHrX/3/mnkLcBJtGPxsmv6RN14BNzQqV7oOU3WiDZgGIUFB PMVtOOzePBSGuvbzcIakhK5ecaeN0FxPcCMX3ypGPiI6vRWgqUuMawhpE/i9EHmJ+Cf1RG +RMVAHL71CRegA8xtSIwfn1c6DbGczdKm1yYKB02k6f4RarnS599I6pHsoswZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJWsC1KcHzvqg for ; Sun, 17 May 2026 19:56:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31478 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 19:56:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 56bc43f5d02b - main - locking.9: warn about using sleepable lock address as a sleep channel 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: 56bc43f5d02bd0745d597db44c285bf78d083762 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 19:56:15 +0000 Message-Id: <6a0a1d5f.31478.7a5c2aa@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=56bc43f5d02bd0745d597db44c285bf78d083762 commit 56bc43f5d02bd0745d597db44c285bf78d083762 Author: Konstantin Belousov AuthorDate: 2026-05-15 11:05:45 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-17 19:55:23 +0000 locking.9: warn about using sleepable lock address as a sleep channel Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D57012 --- share/man/man9/locking.9 | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/share/man/man9/locking.9 b/share/man/man9/locking.9 index ad044b6e1d46..9afdcd56f4f6 100644 --- a/share/man/man9/locking.9 +++ b/share/man/man9/locking.9 @@ -205,11 +205,6 @@ The functions and .Fn wakeup_one also handle event-based thread blocking. -Unlike condition variables, -arbitrary addresses may be used as wait channels and a dedicated -structure does not need to be allocated. -However, care must be taken to ensure that wait channel addresses are -unique to an event. If a thread must wait for an external event, it is put to sleep by .Fn tsleep , .Fn msleep , @@ -222,6 +217,16 @@ Threads may also wait using one of the locking primitive sleep routines or .Xr sx_sleep 9 . .Pp +Unlike condition variables, +arbitrary addresses may be used as wait channels and a dedicated +structure does not need to be allocated. +However, care must be taken to ensure that wait channel addresses are +unique to an event. +For example, the memory address of a sleepable lock such as a +.Xr sx 9 +must not be used as a sleep channel, because the lock implementation +will internally use the same address as a wait channel. +.Pp The parameter .Fa chan is an arbitrary address that uniquely identifies the event on which From nobody Sun May 17 21:13:31 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 4gJYZN0948z6d3XG for ; Sun, 17 May 2026 21:13: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 4gJYZM5Gvxz3ZxN for ; Sun, 17 May 2026 21:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779052411; 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=xn/38VmpktomNPctyLvMuMamnz9fZdtd32FtE2G5LLs=; b=FrvZ22Z358/sg7F/N3lSzTg3O54td5VFyxJftg9KYvKE7oxNOdUQXYui1IPd8F+7pZ3i6D JJVEocw6o2ZidLb81Kz57SghvnBYrWqlwuv+Yq21gByNXvHUn+6paRd3hgVLOWc/1/wDy/ BQ3/FVBaI/Lj0tWkg8yURXbO2y+orZMtnO1V+vV4/+UV4GCrcxVOzMwQuIRn6ELnGgKxSE bmL1YTRwySp+cQ/KAB6jfIS51SSKhBjCgI4xD6B94NNUUbunmbvoBbTE7aVOV5MdnQ4iqA URh9KSEZnsKKpt9sBHbtkXsKe5lE21FedCNjAP+L6uJ5+6hPpNHYe5A6o5jtsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779052411; a=rsa-sha256; cv=none; b=jRzA+JMjn9bpzq4QWyOyHm3tdE4H8/Ctwxexp+7S8HG2B7JeGeJQwG5g2nDEP6ldFD0y2r TqaFbfjHTN3BJj1xmMrEz4x2YZun8EwgU4KWXstAunW/DP5/KnOe2ZJOBcy07+jYf8lx+k VO8hTizskW6MVFrf95ZfwPfivimp6RL0rsEcQs32CnkzX0rfnfFi+yu56kaUoeg5MNK+qY 0bH0WcNXk69lCKxMVTvFrs7HM0Nj3b8jSChLJeeMWWqNn4oBIzMFLw5F1CYPT5TGSLZjxv eG7GkremBIeoVOw08XtT57fDBZPhj4wcHCk65ppPh9bwvLrcy5HzDe2lvGXd3Q== 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=1779052411; 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=xn/38VmpktomNPctyLvMuMamnz9fZdtd32FtE2G5LLs=; b=mdf4wQ8rg6Nv7wS7eDSQXgYBkDCasR37qYajza9NgCl7hy7TbSWEKAyvK9MsoT7hEt9vJ5 M7KhxsOUQEVCzkaICVf2W4Si045ogpz2QkWlOISIsW9yHKmVd+spzQFcJbkKNxgyH2qomS r1XKSwCAYGvh1LlIksg6Vzj5mK8k434HmonNtjftAQoSz/MdDfzdXIoBBr1w5H8M8JHYXY MjB/4KlT4xDoDIyKLw8Q+Xhga5zwOvKZMQPyz5VrxdZKYcDog9bcE6aKLCwO6RFgRj/QQM NTdV3hRrDqP8KtGYO0FpOBCnu1/uaikqLXc/uvgReg0X2+J3+4H0A44DEHHESA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJYZM4sYRzyHY for ; Sun, 17 May 2026 21:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f70c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 21:13:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Koine Yuusuke From: Ed Maste Subject: git: 436f47a80c20 - main - intelhfi: Add IA32_PM_ENABLE bit flag define 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: 436f47a80c20a4d8395d30f81684b2d5dd35991e Auto-Submitted: auto-generated Date: Sun, 17 May 2026 21:13:31 +0000 Message-Id: <6a0a2f7b.3f70c.16f105a4@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=436f47a80c20a4d8395d30f81684b2d5dd35991e commit 436f47a80c20a4d8395d30f81684b2d5dd35991e Author: Koine Yuusuke AuthorDate: 2026-05-17 15:58:41 +0000 Commit: Ed Maste CommitDate: 2026-05-17 21:13:14 +0000 intelhfi: Add IA32_PM_ENABLE bit flag define Reviewed by: Minsoo Choo Differential Revision: https://reviews.freebsd.org/D56919 --- sys/x86/include/specialreg.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h index 4eb4f2c398b2..edf281225180 100644 --- a/sys/x86/include/specialreg.h +++ b/sys/x86/include/specialreg.h @@ -904,6 +904,9 @@ /* MSR IA32_MCU_OPT_CTRL */ #define IA32_RNGDS_MITG_DIS 0x00000001 +/* MSR IA32_PM_ENABLE */ +#define IA32_PM_ENABLE_HWP_ENABLE (1ULL << 0) + /* MSR IA32_HWP_CAPABILITIES */ #define IA32_HWP_CAPABILITIES_HIGHEST_PERFORMANCE(x) (((x) >> 0) & 0xff) #define IA32_HWP_CAPABILITIES_GUARANTEED_PERFORMANCE(x) (((x) >> 8) & 0xff) From nobody Sun May 17 22:09: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 4gJZqB0tYCz6d7bF for ; Sun, 17 May 2026 22:09: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 4gJZq975ffz3mK6 for ; Sun, 17 May 2026 22:09:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779055782; 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=VfNy3PzQn6xKr/RuR67KCroGt/D6vwEtP/qmmmz382A=; b=XafnitJqiOTKmzGwW9ajxQ/I2THVhVSWdjrQN1f64UEnFiGhlYS29Mf1Et9I12sXr6brH9 p4MfLQDtmDwQBR+/Oo3FzcluNSkyOtvMjn7kz+L4xjkuMPVX126dAEYb0ZWcP5iyaaUpsN zzTsx78nnmj2GyBYxx0eEPaZQImH9IiIGgv3iD4mS8e2aAWZdWnmzk5yBQWFs6Txt/rM0a b0wpDo5xKGkr7kk2kx9I8cxCD0XVCMRci2Oa95gfunF4qgha2kfdjTkAncS02m05zU4fdd AFmmh7a4hmQ1aXWBb8rzxEg+7qsmVw8tw8F51IH7OJxFuBEiZcwAc76k+FeIRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779055782; a=rsa-sha256; cv=none; b=jt99g08MGGYHtBhhPf/Is3JErD9z8eq+C3hWBAaxrkJxnoZnEc3g8t8tO8bf+UCQs+19Ua 5lyOYYyoKYZUBTFDZkNUsTwsaRzMCUPcu/NDV0WBD6cqqHUN/2dyhkaZ2SLHzlm9sw4WWU SAPu0T++5egbpv9sTIYufmXjBhapMNebOlyV691UjgdVGVGucfWmMLuVMvYgZ3J+dhF6vu JD6IjGsxyVG4VDnlz68T1IjuNRLx32QBxaQSuzdygTF106mklUUIHddD/DTKVBU1EkDHw2 j4op8a0yrZjm2LgXJJ+cWU87INjyuaaBgxZ8bumchz7s7gjQAL3rcFJRXODn5Q== 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=1779055782; 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=VfNy3PzQn6xKr/RuR67KCroGt/D6vwEtP/qmmmz382A=; b=d2uu22EkrEh83A1SYRgqDZKB4YDt92af5NgiEj4e0gL7zK9ORIaKwj2zVuqrQNy31j0Pxf bYNHGMY528roqlCXqvAIuA+9r2o8rSsSv0hfcl+IVqCHy0KSLcawsX+v7PH5CniykdWlHt SNDjc269VlLOJfWObosDOKRWWkd2UJHvha3Rbxn7bR6a4mKnTRj32S6yvkaDpqAFPvulZH RQiNFMVHWA8pxCZCnrtAFRQt2WW4wc5nEdR0kzGzdIOcn8nTwigd1Qxpq7XF9M1rWk0gDf RF4z9Pi6TKSx64U7EbJYUXRADRSuAhszxpnIyxo7/3DACw3yvGCF8rcJz3JuMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJZq96P1yz10lq for ; Sun, 17 May 2026 22:09:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 425c7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 22:09:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8ad8643a6673 - main - ufs: ufs_bmap_seekdata() needs mapped buffer for scan 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: 8ad8643a66735d28dac53a772856c94ca65b2bf3 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 22:09:41 +0000 Message-Id: <6a0a3ca5.425c7.6f2ddb32@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8ad8643a66735d28dac53a772856c94ca65b2bf3 commit 8ad8643a66735d28dac53a772856c94ca65b2bf3 Author: Konstantin Belousov AuthorDate: 2026-05-17 00:09:21 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-17 22:09:26 +0000 ufs: ufs_bmap_seekdata() needs mapped buffer for scan PR: 295348 Reported and tested by: Alastair Hogge Reviewed by: mckusick Fixes: bab04ddf1fd4 ("ufs: support unmapped bufs for indirect blocks in bmap") MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57036 --- sys/ufs/ufs/ufs_bmap.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index edfcabb1a607..6b3e6f77427c 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -59,7 +59,8 @@ #include static ufs_lbn_t lbn_count(struct ufsmount *, int); -static int readindir(struct vnode *, ufs_lbn_t, ufs2_daddr_t, struct buf **); +static int readindir(struct vnode *, ufs_lbn_t, ufs2_daddr_t, bool, + struct buf **); static int ufs_bmap_use_unmapped = 1; @@ -104,6 +105,7 @@ static int readindir(struct vnode *vp, ufs_lbn_t lbn, ufs2_daddr_t daddr, + bool allow_unmapped, struct buf **bpp) { struct buf *bp; @@ -116,7 +118,8 @@ readindir(struct vnode *vp, ump = VFSTOUFS(mp); ip = VTOI(vp); - gbflags = !I_IS_UFS1(ip) && ufs_bmap_use_unmapped ? GB_UNMAPPED : 0; + gbflags = allow_unmapped && !I_IS_UFS1(ip) && + ufs_bmap_use_unmapped ? GB_UNMAPPED : 0; bp = getblk(vp, lbn, mp->mnt_stat.f_iosize, 0, 0, gbflags); if ((bp->b_flags & B_CACHE) == 0) { KASSERT(daddr != 0, @@ -291,7 +294,7 @@ ufs_bmaparray(struct vnode *vp, */ if (bp) bqrelse(bp); - error = readindir(vp, metalbn, daddr, &bp); + error = readindir(vp, metalbn, daddr, true, &bp); if (error != 0) return (error); @@ -525,7 +528,7 @@ ufs_bmap_seekdata(struct vnode *vp, off_t *offp) for (; daddr != 0 && num > 0; ap++, num--) { if (bp != NULL) bqrelse(bp); - error = readindir(vp, ap->in_lbn, daddr, &bp); + error = readindir(vp, ap->in_lbn, daddr, false, &bp); if (error != 0) return (error); From nobody Sun May 17 23:37: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 4gJcn22ZB4z6dF5w for ; Sun, 17 May 2026 23:37:58 +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 4gJcn2236qz3wlB for ; Sun, 17 May 2026 23:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779061078; 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=by1+1f1mZNTIeqhGyw4B/HQZQUl8Q/g49CwRJIqHAyo=; b=YwxJP0i66rkA7D5vfRqvFuOFH3+zt6H9jIUzKu/zlsKPrq+WazNxCivPiMf8Tjp+nChrAX HlZjfV3iH/fSHdO/T23RWn9eM9gnacBHxii0+8Czixp8wEjarFZSfgOSCOn8YNiI+RDtVV 8kfrCKYO4IQB617S8vIjxB8ahwxfGRAcT2kohzmIRn3yN5/5ZFJ6hZ3F5S2zI9Ov9JZ+mH k9BcmnLv9SUsFiuwBqyJmqIq0932eX7eGWVsbXAonKRPdfyTUOiFV7XvqhMZqrZIYLMjtM 9BH93zt2XznO2FQiVWmdVytT0HSOLFZmgEUlVChRTVeMoHWHCjK4DyjCH8rOXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779061078; a=rsa-sha256; cv=none; b=tHtCHeXWpn+2ns1u7+Gd/NaWMseMJIdllAv8GKTAsPjVYntJcdXgGIcu48y5GUMWfLXRuE Gd+gCUQosS9OleIApy51xbV+tdS6Lm7zL7tnLTKdj7cKGjYrSzdhBkBrag52iSThqhxA93 vmHSHbFIhjFUXN8Ss34PEO8ois6P9o2S5dw5bP4/y9mWbuaQ9Nux/elYn129yj0od9WBEG BLxr/G77IZc69oKRAsR6VauuZuGsAS6J1rea+hxJrxZOmzjX5k3rjCg57FiR3hwQZp11bT xu84In7xMQbuJ0wLp9l5+wkyjBZ9d/FxPgPYc3fFOLGk9QRivnLBOkha/UWQPg== 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=1779061078; 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=by1+1f1mZNTIeqhGyw4B/HQZQUl8Q/g49CwRJIqHAyo=; b=couN53nhvgfBarw6xV9AwdHZhqc4M5xLsC5PhkJ51RSTEYr5SxKesAVPCRPM8htmgoRi6c T9+sPhSmJYwg9oLq3y0aCmymA0nhvK8WXkHVNpNWch2RpAiSNDMEfLghD/6Op3TbdOhJo1 uv0EteYhPAWQSYPQ7X/yk+a6R1fb8YmBjU4Oiy1sYLTIfpIi841g1UzaWGAFCwh5IhtX9N R7nYYCpcQ/42UX0xOayfLEMMf7T6IxOAoBQyPHlOZUPoMI4YrZPHJ3KRCqHABWvIgSQo14 xREGbFLOnU0y75Iik+vsXnG4WbQwrfWzGKODmt158L0ZxV57emh8+1Ld1MjRLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJcn21L5hz1393 for ; Sun, 17 May 2026 23:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c5ad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 23:37:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 56460a6a420a - main - rtw89: firmware: extend script to extract fwget entries 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56460a6a420a066ea6eeadc3725bfdaf49f8142b Auto-Submitted: auto-generated Date: Sun, 17 May 2026 23:37:58 +0000 Message-Id: <6a0a5156.1c5ad.dfc1431@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=56460a6a420a066ea6eeadc3725bfdaf49f8142b commit 56460a6a420a066ea6eeadc3725bfdaf49f8142b Author: Bjoern A. Zeeb AuthorDate: 2026-05-17 23:16:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-05-17 23:35:55 +0000 rtw89: firmware: extend script to extract fwget entries The so far so consistent (file)names got an outlier so add the one character longer pattern as well to catch that. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/rtw89/zzz_fw_ports_fwget.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/rtw89/zzz_fw_ports_fwget.sh b/sys/contrib/dev/rtw89/zzz_fw_ports_fwget.sh index 4ee0ab7a6fd1..a1f655f7dc71 100644 --- a/sys/contrib/dev/rtw89/zzz_fw_ports_fwget.sh +++ b/sys/contrib/dev/rtw89/zzz_fw_ports_fwget.sh @@ -51,7 +51,7 @@ fi # list_fw() { - for f in `ls -1 rtw?????.c rtw?????e.c`; do + for f in `ls -1 rtw?????.c rtw?????e.c rtw?????te.c`; do l=$(cpp ${f} 2>&1 | awk '/^MODULE_FIRMWARE\(/ { gsub(/"/, ""); gsub("__stringify\\(", ""); gsub("\\);$", ""); gsub("\\)", ""); gsub("^MODULE_FIRMWARE\\(", ""); gsub(" ", ""); printf "%s\n", $0; }' | sort -n | uniq) if test "${l}" == ""; then @@ -134,7 +134,7 @@ fi fwgetfile=$(mktemp -p /tmp ${DRIVER}-fwget.XXXXXX) :> ${fwgetfile} -for f in `ls -1 rtw?????.c rtw?????e.c`; do +for f in `ls -1 rtw?????.c rtw?????e.c rtw?????te.c`; do # Ports FLAVOR names are [a-z0-9_]. If needed add more mangling magic here. n=${f%.c}; From nobody Sun May 17 23:37: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 4gJcn33ckFz6dF61 for ; Sun, 17 May 2026 23:37: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 4gJcn32GRrz3wFq for ; Sun, 17 May 2026 23:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779061079; 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=9RiIfXZefOj+NkuM2AvWZlT0zmUKoCRK1XuW5wttoZ4=; b=jUaSRGHeRGcbxfk8am8bC+dsDniM3aiTKk7ThOCETVmEvazoeYT6/YmtzPLA64a7JloDNX 6sWliY9dt5vHiMRJEYKlDqqlPve1douY7LRUoRa+lCoOqNhI4ueWhVuIWkMWipFIwkTSp2 +mH1USivyscujLu5enIppqbfmElfQo5qt80DI2x0SJIusjfPyq/WXlLgXv5jBuEOaQYYku eaMu9dGN9Jv4qG3g/XVTuaL9Yj1pHQZaSI7NS7qtf3k7gvQ+JQCv8CiRhDNEXyRgsVjDoq gyZUCZa6ml6g11BtetJYcMpcQfIVQduzhtyfN3FC4L6xGu3mb0ksTkqYnfzw7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779061079; a=rsa-sha256; cv=none; b=U8+YS9UIY1LLIH7YCinZ77tk1ZT+hD5ry/W6I5utlOvgne0kmEYWuBmmsOcvVsXB+5Yp08 gjiR5C1RjSC1+Od5V3WzmmKi6WdEtDVjPiYkyNcbKZOOSj06l5XhsThw2lXaE5R4lr0ABo 4tkMJS1+TOYTclQe07X8m8ZG5G9pmdRKVSc+mD3XXZeEmXyU6LX4tBY/GbXDq/SYP4axY7 p3PdnWnmcFHgCsqqkIipsQcVguRLLP0P+nUNBckbxTBKQfe+Gg7y/LHbkIjhs3t5fEw+SC pDSP1y5P9jlHgLLlCR5b96sTARxC4u8egAMH4ZAm48AtoEg6djP5JvWivKP4wA== 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=1779061079; 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=9RiIfXZefOj+NkuM2AvWZlT0zmUKoCRK1XuW5wttoZ4=; b=PYjjOslqpxUfllN6LWnVszW6i+gOtLvsu33ypmUCDrGKY/08Xw8Lv81061hZEquAX1LePz 4CMRAx2N8ZMz28wFHUMaxAHFn8AR6fh8WBYZOwsuREjbdy1871ox/3F0Ocys7GP9YaQ4aV 0dCQwAacvCmJa8gLTELsaXkJHBtawO/IBin2Pz8ltruJtXMRspVGgKVJ5LldWohrEdOhWj 26LsxQ26+0BJiU9RIMKZMhXmvedftrqa1Ri9ibIpqpkMUP7jfX4Oi9wbiD7yHr11MKyKJY ywLQGUQjcuMJp0KClPCYNqvuI6pW8v5X4h3jar6kOBXfUzqsL6STX+0mtdT0xQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJcn31FtGz12nX for ; Sun, 17 May 2026 23:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cfc1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 23:37:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 4f6c60c3d3c4 - main - iwlwifi: firmware: reduce script to extract fwget information 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f6c60c3d3c44aa3df23f280f2fe247f7a930efa Auto-Submitted: auto-generated Date: Sun, 17 May 2026 23:37:59 +0000 Message-Id: <6a0a5157.1cfc1.29a6c8b5@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4f6c60c3d3c44aa3df23f280f2fe247f7a930efa commit 4f6c60c3d3c44aa3df23f280f2fe247f7a930efa Author: Bjoern A. Zeeb AuthorDate: 2026-05-17 23:25:21 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-05-17 23:37:12 +0000 iwlwifi: firmware: reduce script to extract fwget information Due to driver changes it is no longer feasible to extract the full PCI ID / firmware / card type information in one go as we used to be able to. We have already changed the way we extract firmware information for ports and marked the iwlwififw.4 man page as obsolete. Reduce the script to simply extarct the fwget(8) information and, compared to the old times, sort each section so diffs will be easier to see in the future. This was particular helpful this time to make sure we do not lose entries with the change of technique. We also keep the script in the best perl spirit to do the job but not to win a price, especially given it seems we have to change matters every (other) year. Given we can no longer extract firmware information for the PCI IDs, we need to "manually" check against the ports that names match. Ideally we will simplify things for everything "mld-only" one day to only have a single firmware package for these (even if size increases slightly). Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/iwlwifi/zzz_fw_ports_fwget.sh | 444 +++++--------------------- 1 file changed, 85 insertions(+), 359 deletions(-) diff --git a/sys/contrib/dev/iwlwifi/zzz_fw_ports_fwget.sh b/sys/contrib/dev/iwlwifi/zzz_fw_ports_fwget.sh index afbd52b9fa40..c817aff071bf 100644 --- a/sys/contrib/dev/iwlwifi/zzz_fw_ports_fwget.sh +++ b/sys/contrib/dev/iwlwifi/zzz_fw_ports_fwget.sh @@ -2,376 +2,102 @@ #- # SPDX-License-Identifier: BSD-2-Clause # -# Copyright (c) 2024-2025 The FreeBSD Foundation +# Copyright (c) 2024-2026 The FreeBSD Foundation # # This software was developed by Björn Zeeb # under sponsorship from the FreeBSD Foundation. # # This is neither efficient nor elegant but we need it few times -# a year and it does the job. -# -# -# USAGE: please check out the correct tag/hash for ports in the -# linux-firmware.git repository you point this script to. -# -# USAGE: please make sure to pre-load if_iwlwifi.ko so that we -# have access to the sysctl. You do not need to have a supported -# card in the system. -# In case that is not possible you can save the results to a file -# and provide that locally. It will be renamed at the end of the -# run. +# a year and it does the job. And it turns out there is a lot of +# churn so keep the solutions quick and dirty. # set -e -# sysctl -n compat.linuxkpi.iwlwifi_pci_ids_name > iwlwifi_pci_ids_name.txt -PCI_IDS_FILE=iwlwifi_pci_ids_name.txt -D_PCI_IDS_FILE=`pwd`/${PCI_IDS_FILE} - -################################################################################ -# -# Check pre-reqs -# -if [ $# -ne 1 ]; then - printf "USAGE: %s /path/to/linux-firmware.git\n" $0 >&2 - exit 1 -fi - -if [ ! -d cfg/ -o ! -e cfg/bz.c ]; then - printf "ERROR: run from iwlwifi driver directory; no cfg/bz.c here\n" >&2 - exit 1 -fi - -LFWDIR=${1} -if test ! -d ${LFWDIR} -o ! -e ${LFWDIR}/WHENCE; then - printf "ERROR: cannot find linux-firmware.git at '%s'\n" ${LFWDIR} >&2 - exit 1 -fi - -if test -r ${D_PCI_IDS_FILE}; then - printf "NOTICE: using proovided ${D_PCI_IDS_FILE}\n" >&2 -else - - kldstat -n if_iwlwifi.ko > /dev/null 2>&1 - rc=$? - case ${rc} in - 0) ;; - *) printf "ERROR: please pre-load if_iwlwifi.ko (you do not need a device)\n" >&2 - exit 1 - ;; - esac - - sysctl -N compat.linuxkpi.iwlwifi_pci_ids_name > /dev/null 2>&1 - rc=$? - case ${rc} in - 0) sysctl -n compat.linuxkpi.iwlwifi_pci_ids_name > ${D_PCI_IDS_FILE} - ;; - *) printf "ERROR: cannot get compat.linuxkpi.iwlwifi_pci_ids_name\n" >&2 - exit 1 - ;; - esac -fi - -# We need to be in the config directory for simplicity. -cd cfg - -################################################################################ - -# Get a list of all device/firmware flavors as seen/supported by the driver. -flavors=$(awk -F\\t '{ - if (/^$/) { next; } - if ($5 == "undefined") { next; } - print tolower($5); -}' ${D_PCI_IDS_FILE} | sort -V | uniq) - -################################################################################ -# -# Helper functions. -# - -# -# This uses a hack (cpp) to expand some macros for us and parses out the result -# which is the firmware name with the maximum FW version supported for that -# firmware. -# We then go and check that said firmware actually exists in linux-firmware.git. -# We try to find a lower version number if the "MAX" version given from the cpp -# output does not (yet) publicly exist. -# .pnvm files are now properly listed as MODULE_FIRMWARE so no more magic needed -# for them. -# Given the filename matches a "flavor" at this point, we then group all the -# available firmware files from this flavor together and print it as a ports -# Makefile variable. -# -# We also print some other meta-data that callers will filter out depending on -# their needs to generate other lists and mappings. -# +unsortedf=$(mktemp -p /tmp iwlwifi-fwget-unsorted.XXXXXX) +sortedf=$(mktemp -p /tmp iwlwifi-fwget-sorted.XXXXXX) +:> ${unsortedf} +:> ${sortedf} -# For each get a list of firmware names we know. -list_fw() -{ - for f in ${flavors}; do - #echo "==> ${f}" - #awk -F \\t -v flav=${f} '{ - # if ($5 != flav) { next; } - # # No firmwre; skip. - # if ($3 ~ /^$/) { next; } - # if ($3 == "(null)") { next; }; - # print $3; - #}' ${D_PCI_IDS_FILE} | sort | uniq - - # For now the flavor names and the file names are 1:1 which makes this - # a lot easier (given some sysctl/file entries are not able to list - # their firmware but we know their "flavor". - l=$(cpp ${f}.c 2>&1 | awk ' - /^MODULE_FIRMWARE\(/ { - gsub(/"/, ""); - gsub("__stringify\\(", ""); - gsub("\\);$", ""); - gsub("\\)", ""); - gsub("^MODULE_FIRMWARE\\(", ""); - gsub(" ", ""); - printf "%s\n", $0; - }' | sort -V | uniq) - #echo "${l}" - - lx="" - for fx in ${l}; do - if test -e ${LFWDIR}/${fx}; then - lx="${lx} ${fx}" - - # Check for matching .pnvm file. - # They are now properly listed in MODULE_FIRMWARE() as well so no more magic. - #px=$(echo ${fx} | awk '{ gsub("-[[:digit:]]*.ucode", ".pnvm"); print; }') - #if test -e ${LFWDIR}/${px}; then - # lx="${lx} ${px}" - #fi - else - case "${fx}" in - *.pnvm) - printf "NOTICE: pnvm file not found for '%s'\n" ${fx} >&2 - ;; - *.ucode) - # Try lowering the version number. - bn=$(echo ${fx} | awk '{ gsub("-[[:digit:]]*.ucode", ""); print; }') - vn=$(echo ${fx} | awk '{ gsub(".ucode$", ""); gsub("^.*-", ""); print; }') - #echo "BN ${bn} VN ${vn}" - # Single digits are not zero-padded so just ${i} will be fine. - for i in `jot ${vn} ${vn} 1`; do - xn="${bn}-${i}.ucode" - if test -e ${LFWDIR}/${xn}; then - lx="${lx} ${xn}" - break - fi - done - ;; - *) - printf "NOTICE: file for unknown firmware type not found for '%s'\n" ${fx} >&2 - ;; - esac - fi - done - - # Get a count so we can automatically add \\ apart from the last line. - fn=$(echo "${lx}" | wc -w | awk '{ print $1 }') - - #echo "==> ${f} :: ${fn} :: ${lx}" - - if test ${fn} -gt 0; then - - # Ports FLAVOR names are [a-z0-9_]. If needed add more mangling magic here. - flav=`echo ${f} | awk '{ printf "%s", tolower($0); }'` - - echo "FWS ${flav}" - echo "DISTFILES_${flav}= \\" - for fz in ${lx}; do echo "${fz}"; done | \ - awk -v fn=$fn -v fwg=${flav} '{ - if (FNR == fn) { x="" } else { x=" \\" }; - printf "\t%s${DISTURL_SUFFIX}%s\n", $0, x; - fwn=$0; - gsub("-[[:digit:]]*\.ucode$", "", fwn); - printf "FWGET %s %s\n", fwg, fwn; - }' - fi - - done +cpp -DCONFIG_IWLMVM -DCONFIG_IWLMLD \ + -I../../../compat/linuxkpi/common/include pcie/drv.c 2> /dev/null | \ +grep __builtin_choose_expr | \ +awk 'BEGIN { + lt="" } - -################################################################################ -# -# Generate the PORTS file template. -# - -fwsl=$(list_fw | grep ^FWS | awk '{ print $2 }') -# Get a count so we can automatically add \\ apart from the last line. -fn=$(echo "${fwsl}" | wc -w | awk '{ print $1 }') - -if test ${fn} -gt 0; then - - portsfile=$(mktemp -p /tmp iwlwifi-fwport.XXXXXX) - - :> ${portsfile} - ( - echo "FWSUBS= \\" - for sz in ${fwsl}; do echo "${sz}"; done | \ - awk -v fn=$fn '{ if (FNR == fn) { x="" } else { x=" \\" }; printf "\t%s%s\n", $0, x; }' - - echo - echo "# Do not prefix with empty \${FWSUBDIR}/!" - list_fw | grep -v ^FWS | grep -v ^FWGET - - echo - echo "DISTFILES_\${FWDRV}= \\" - for sz in ${fwsl}; do echo "${sz}"; done | \ - awk -v fn=$fn '{ if (FNR == fn) { x="" } else { x=" \\" }; printf "\t${DISTFILES_%s}%s\n", $0, x; }' - echo "DISTFILES_\${FWDRV}_lic=" - ) >> ${portsfile} - - printf "INFO: wifi-firmware-iwlwifi-kmod template at %s\n" ${portsfile} >&2 -fi - -################################################################################ -# -# Generate a temporary firmware -> flavor mapping table for fwget generation. -# - -mapfile=$(mktemp -p /tmp iwlwifi-mapfile.XXXXXX) -:> ${mapfile} - -fwgl=$(list_fw | grep FWGET) -# Get a count so we can automatically add \\ apart from the last line. -fn=$(echo "${fwgl}" | wc -w | awk '{ print $1 }') -if test ${fn} -gt 0; then - - ( - list_fw | grep FWGET | grep -v '.pnvm' | \ - while read x flav fw; do - printf "%s\t%s\n" ${fw} ${flav} - done | \ - sort -n | uniq - ) >> ${mapfile} -fi - -################################################################################ -# -# Try to generate the PCI ID -> port flavor mapping -# -# We get PCI ID, description, firmware base from the sysctl and can work our -# way back from fw name base to flavor via the mapping table file. -# - -fwgetfile=$(mktemp -p /tmp iwlwifi-fwget.XXXXXX) -:> ${fwgetfile} - -awk 'BEGIN { FS="\t"; } { - # Skip empty lines. - if (/^$/) { next; } - # Skip "undefined" flavors as we have no idea what chipset. - if ($5 == "undefined") { next; } - - # No firmware name; do not skip! - # All we need is the flavor, which we now always have. - #if ($3 == "(null)") { next; }; - - FLAV=tolower($5); - - split($1, i, "/"); - gsub("\t.*$", "", i[4]); - - # Not an Intel Vednor ID; skip. - if (i[1] != "0x8086") { next; }; - - # No defined device ID; skip. - if (i[2] == "0xffff") { next; }; - - # Adjust wildcards or a ill-printed 0. - if (i[3] == "0xffffffff") { i[3] = "*"; }; - if (i[4] == "000000") { i[4] = "0x0000"; }; - if (i[4] == "0xffffffff") { i[4] = "*"; }; - if (i[4] == "0xffff") { i[4] = "*"; }; - - printf "%s\t%s/%s/%s\n", FLAV, i[2], i[3], i[4]; -}' ${D_PCI_IDS_FILE} | \ -sort -V | uniq | \ -while read flav match; do - - #flav=$(awk -v fw=$fw '{ if ($1 == fw) { print $2; } }' ${mapfile}) - #echo "${fw} :: ${match} :: ${flav}" - - if test "${flav}" != ""; then - printf "${flav}\t${match}\t${flav}\n" - else - #echo "NO FLAV ${fw} ${match}" >&2 - fi - -done | \ -awk 'BEGIN { FS="\t"; FWN=""; } -{ - FW=$1; - if (FWN != FW) { printf "\n\t# %s\n", FW; FWN=FW; }; - - printf "\t%s) addpkg \"wifi-firmware-iwlwifi-kmod-%s\"; return 1 ;;\n", $2, $3; -} END { - printf "\n"; -}' >> ${fwgetfile} - -printf "INFO: fwget pci_network_intel template at %s\n" ${fwgetfile} >&2 - -################################################################################ -# -# Try to build the iwlwififw.4 bits too. -# - -dl=$(grep -v ^$ ${D_PCI_IDS_FILE} | uniq | \ -awk ' -{ - # Sourt out duplicate lines. - if (dup[$0]++) { next; } - - split($0, a, "\t"); - ids=a[1]; - name=a[2]; - fw=a[3]; - flavor=a[5]; - - #my ($v, $d, $sv, $sd) = split("/", $ids); - split(ids, i, "/"); - gsub("^0xffff+", "any", i[1]); - gsub("^0xffff+", "any", i[2]); - gsub("^0xffff+", "any", i[3]); - gsub("^0xffff+", "any", i[4]); - - if (name == "") { name="(unknown)"; } - if (fw == "") { fw="(unknown)"; } - if (flavor == "") { flavor="iwlwifi"; } - if (flavor == "undefined") { flavor="iwlwifi"; } - - # iwlwififw.4 - printf ".It \"\"\n.It %s\n.It %s Ta %s Ta %s Ta %s Ta %s Ta %s\n", name, i[1], i[2], i[3], i[4], flavor, fw; - - # wiki - # XXX TODO possibly quote some in `` to avoid automatic linking? - # || PCI IDs || Chipset Name || Firmware prefix || Comment || - printf "WIKI || %s / %s / %s / %s || %s || %s || ||\n", i[1], i[2], i[3], i[4], name, fw; - if ((FNR % 25) == 0) { printf "WIKI \n"; } -}') - -manfwfile=$(mktemp -p /tmp iwlwifi-iwlwififw4.XXXXXX) -:> ${manfwfile} -echo "${dl}" | grep -v ^WIKI >> ${manfwfile} -printf "INFO: share/man/man4/iwlwififw.4 template at %s\n" ${manfwfile} >&2 - -wikifile=$(mktemp -p /tmp iwlwifi-wiki.XXXXXX) -:> ${wikifile} -echo "${dl}" | awk '/^WIKI / { gsub("^WIKI ", ""); print; }' >> ${wikifile} -printf "INFO: WIKI template at %s\n" ${wikifile} >&2 - - -################################################################################ -# -# Cleanup -# -rm ${mapfile} -mv -f ${D_PCI_IDS_FILE} ${D_PCI_IDS_FILE}.old + if (!/.vendor = 0x8086,/) { + printf "ERROR: %s\n", $0; + exit + } + + d=$6; + sv=$9; + sd=$12; + t=$15; + + + gsub("\\(", "", d); + gsub(")", "", d); + gsub(",", "", d); + + gsub("\\(", "", sv); + gsub(")", "", sv); + gsub(",", "", sv); + + gsub("\\(", "", sd); + gsub(")", "", sd); + gsub(",", "", sd); + + gsub("-1U", "*", d); + gsub("-1U", "*", sv); + gsub("-1U", "*", sd); + + gsub("^.*\\(", "", t); + gsub(")", "", t); + gsub(",", "", t); + gsub("^iwl_", "", t); + gsub("^iwl", "", t); + gsub("_mac_cfg$", "", t); + gsub("_.*$", "", t); + + t=tolower(t) + if (t != lt) { + printf "\n\t# %s\n", t; + lt = t; + } + if (t == "9560") { t = "9000"; } + if (t == "ax200") { t = "22000"; } + if (t == "qu") { t = "22000"; } + if (t == "cc") { t = "22000"; } + if (t == "ma") { t = "ax210"; } + if (t == "so") { t = "ax210"; } + if (t == "ty") { t = "ax210"; } + if (t == "gl") { t = "bz"; } + if (t != "7000" && t != "8000" && t != "9000" && t != "22000" && t != "ax210" && t != "bz" && t != "sc") { + printf "ERROR: invalid flavor '%s': %s\n", t, $0; + exit + } + + printf "\t%s/%s/%s) addpkg \"wifi-firmware-iwlwifi-kmod-%s\"; return 1 ;;\n", tolower(d), tolower(sv), tolower(sd), t; + +}' > ${unsortedf} + +( for f in \ + 7000 \ + 8000 \ + 9000 \ + 22000 \ + ax210 \ + bz \ + sc ; do + + printf "\n\t# %s\n" ${f} + grep "wifi-firmware-iwlwifi-kmod-${f}" ${unsortedf} | sort -n + +done; echo ) > ${sortedf} + +rm -f ${unsortedf} +printf "INFO: fwget(8) template at %s\n" ${sortedf} >&2 # end From nobody Sun May 17 23:38:00 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 4gJcn51FCsz6dG1l for ; Sun, 17 May 2026 23:38: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 4gJcn46NYqz3wTV for ; Sun, 17 May 2026 23:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779061080; 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=MeMJF/ov+HHXPRiPxb+V3aN6pkM15fQgtAYcT8s+8Zs=; b=DO3PpEdT7BqjHP9tl8NHh2RlHi1yVROkoQGFf1aJCcczsTC1JucjTSp+k+iNn65VJxjqzo OfZP6nvLQVi1XmPRnPQ+c58N2cdplrNerBF8e38dNqKpTHpcSZ+K0tr3sbX+ibfjI3i1/X 0dC1wmb2FFp192I0/eN6+lxKyoAl46ZfIoiMVKj/LasbnaazyoK7+ihckDucdHM74RG0SC LYShO1vMnilIAbs/o180Aoz/a3LtMr1uLLAgK88ckn5HvaE8E+EJDpyT+KHiubrQuLUMtH AGXrJNlmRTeipB2bZg0kubrbxuNz6uNqZCPbu7r9Z2rLFzEy2amqWRk2NNbx7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779061080; a=rsa-sha256; cv=none; b=QRGirDH2A5X0sNimATG+0JLbArmS5OPCEdijdGgSoBdjYYigDkD/Ts47tfzHKN1uuGCN5i Pu0lfxz1dGJSgMXabVy7d9CfxTOdm3Y85pgzXTR7wbZ5z8pwsQ1dbbcqBmOOZUizuTdzST KQKr7RaLok3C6Nua4xuep8YcJ4Isq5Fn9ZWS8kbYODodQuK4DiShcIWZjV7nttgLWHCnmr mW0zQ2ghdrTubWedydlO/v6LvhEg74hwHp/h5WED9M2uURTnyUCPyBki9EDovwcylJvAhi Xm1J1q2RT7Rws1/LLpl4Uz27avQcq9EtYSIvCjaxXE3DtTLI3ltaO7Y96Lcq7w== 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=1779061080; 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=MeMJF/ov+HHXPRiPxb+V3aN6pkM15fQgtAYcT8s+8Zs=; b=kwNGSeZLDy/iqq0OtB12ELddrs/D9k7ULK/EEP4T9W9zHzQNZKtAsirk4akiwz0aP1pXxL k5A3vz5AJ9Im2h/o5NQFRb8Z4PUuSGfaavVbpGvtgSuz5p+8Irfdg1lsBtIA4kPyusrk3O 0OyWkXADVe3HOFuNfAY8ycfMo/t+veH3JtoRBjWB/c0T3KHVUKzC6gYwRQi4ENXePX6YxL PX131bMbCOgkuuTcs1T8N9iSINOIdpcmt0EKPdUSzrWjHqElPJOmguR7XYHWj/+fw0u9VG zNFkrTtuC+UykhQZZqlxhAkwugItQANKy00A5mlQTRob84D1mcPAxC9tXIujQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gJcn41vf4z12hs for ; Sun, 17 May 2026 23:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d6f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 17 May 2026 23:38:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: ca67cfa5237f - main - fwget: update realtek and intel pci entries 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca67cfa5237f7ac537ca8611054b5af2098e2d86 Auto-Submitted: auto-generated Date: Sun, 17 May 2026 23:38:00 +0000 Message-Id: <6a0a5158.1d6f5.17787957@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ca67cfa5237f7ac537ca8611054b5af2098e2d86 commit ca67cfa5237f7ac537ca8611054b5af2098e2d86 Author: Bjoern A. Zeeb AuthorDate: 2026-05-17 23:10:15 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-05-17 23:37:12 +0000 fwget: update realtek and intel pci entries For Realtek we only add new entries. For Intel the old way of extracting IDs from the driver no longer works. The new list is shortened as we drop more specific entries which were already covered by wildcard entries. The new lists are also sorted within the groups. There are 4 entries the new driver no longer carries but are still present in older versions, so we keep them manually. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- usr.sbin/fwget/pci/pci_network_intel | 246 ++++++++++----------------------- usr.sbin/fwget/pci/pci_network_realtek | 5 +- 2 files changed, 75 insertions(+), 176 deletions(-) diff --git a/usr.sbin/fwget/pci/pci_network_intel b/usr.sbin/fwget/pci/pci_network_intel index 02d842a2d075..c088d3a57f83 100644 --- a/usr.sbin/fwget/pci/pci_network_intel +++ b/usr.sbin/fwget/pci/pci_network_intel @@ -1,7 +1,7 @@ #- # SPDX-License-Identifier: BSD-2-Clause # -# Copyright (c) 2024 The FreeBSD Foundation +# Copyright (c) 2024-2026 The FreeBSD Foundation # # This software was developed by Björn Zeeb # under sponsorship from the FreeBSD Foundation. @@ -26,18 +26,11 @@ pci_network_intel_iwlwifi() ### >>> # 7000 - 0x08b1/*/0x4a6c) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0x4a6e) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0x4a70) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0x4c60) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0x4c70) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0x402a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0x406a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0x446a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0x486e) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4020) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0x402a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4060) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4062) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0x406a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4070) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4072) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4160) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; @@ -46,20 +39,27 @@ pci_network_intel_iwlwifi() 0x08b1/*/0x4420) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4460) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4462) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0x446a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4470) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4472) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4560) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4570) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0x486e) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x4870) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0x4a6c) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0x4a6e) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0x4a70) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0x4c60) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0x4c70) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x5070) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x5072) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x5170) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0x5770) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0xc02a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b1/*/0xc06a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0xc020) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0xc02a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0xc060) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0xc062) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b1/*/0xc06a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0xc070) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0xc072) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0xc160) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; @@ -77,18 +77,18 @@ pci_network_intel_iwlwifi() 0x08b1/*/0xc770) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0xcc60) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b1/*/0xcc70) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b2/*/0x426a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0x4220) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0x4260) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0x4262) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b2/*/0x426a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0x4270) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0x4272) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0x4360) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0x4370) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x08b2/*/0xc26a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0xc220) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0xc260) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0xc262) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x08b2/*/0xc26a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0xc270) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0xc272) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b2/*/0xc370) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; @@ -116,23 +116,14 @@ pci_network_intel_iwlwifi() 0x08b4/*/0x8270) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b4/*/0x8272) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x08b4/*/0x8370) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x24fb/*/0x0000) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x24fb/*/0x2010) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x24fb/*/0x2050) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x24fb/*/0x2110) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x24fb/*/0x2150) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x095a/*/0x5c10) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x095a/*/0x5f10) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x095a/*/0x9e10) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x095a/*/0x500a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x095a/*/0x502a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x095a/*/0x900a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x1010) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5000) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5002) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x095a/*/0x500a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5010) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5012) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5020) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x095a/*/0x502a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5090) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5100) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5102) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; @@ -145,7 +136,10 @@ pci_network_intel_iwlwifi() 0x095a/*/0x5490) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5510) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x5590) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x095a/*/0x5c10) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x095a/*/0x5f10) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x9000) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x095a/*/0x900a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x9010) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x9012) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x9110) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; @@ -153,9 +147,10 @@ pci_network_intel_iwlwifi() 0x095a/*/0x9400) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x9410) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095a/*/0x9510) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; - 0x095b/*/0x520a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x095a/*/0x9e10) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095b/*/0x5200) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095b/*/0x5202) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x095b/*/0x520a) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095b/*/0x5210) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095b/*/0x5212) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095b/*/0x5290) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; @@ -164,6 +159,11 @@ pci_network_intel_iwlwifi() 0x095b/*/0x9200) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095b/*/0x9210) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x095b/*/0x9310) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x24fb/*/0x0000) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x24fb/*/0x2010) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x24fb/*/0x2050) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x24fb/*/0x2110) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; + 0x24fb/*/0x2150) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x3165/*/0x4010) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x3165/*/0x4012) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; 0x3165/*/0x4110) addpkg "wifi-firmware-iwlwifi-kmod-7000"; return 1 ;; @@ -177,10 +177,8 @@ pci_network_intel_iwlwifi() # 8000 0x24f3/*/0x0000) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; - 0x24f3/*/0x01f0) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0004) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0010) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; - 0x24f3/*/0x10b0) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0012) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0044) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0050) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; @@ -188,6 +186,7 @@ pci_network_intel_iwlwifi() 0x24f3/*/0x0130) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0132) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0150) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24f3/*/0x01f0) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0250) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0810) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x0850) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; @@ -197,6 +196,7 @@ pci_network_intel_iwlwifi() 0x24f3/*/0x1010) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x1012) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x1050) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24f3/*/0x10b0) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x1110) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x1130) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0x1132) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; @@ -216,11 +216,13 @@ pci_network_intel_iwlwifi() 0x24f3/*/0x9150) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0xb0b0) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0xc010) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24f3/*/0xc030) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0xc050) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0xc110) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; - 0x24f3/*/0xd0b0) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0xd010) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24f3/*/0xd030) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f3/*/0xd050) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24f3/*/0xd0b0) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f4/*/0x0030) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f4/*/0x1030) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f4/*/0x8030) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; @@ -229,10 +231,7 @@ pci_network_intel_iwlwifi() 0x24f4/*/0xd030) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f5/*/0x0010) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24f6/*/0x0030) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; - 0x24fd/*/0x3e01) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; - 0x24fd/*/0x3e02) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x0010) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; - 0x24fd/*/0x10d0) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x0012) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x0014) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x0050) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; @@ -247,8 +246,13 @@ pci_network_intel_iwlwifi() 0x24fd/*/0x1010) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x1012) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x1014) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24fd/*/0x10d0) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x1110) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x1130) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24fd/*/0x1431) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24fd/*/0x1432) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24fd/*/0x3e01) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; + 0x24fd/*/0x3e02) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x8010) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x8050) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; 0x24fd/*/0x8110) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; @@ -258,201 +262,93 @@ pci_network_intel_iwlwifi() 0x24fd/*/0x9110) addpkg "wifi-firmware-iwlwifi-kmod-8000"; return 1 ;; # 9000 - 0x9df0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; - 0x30dc/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; - 0x31dc/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; + 0x2526/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; 0x271b/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; 0x271c/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; - 0x2526/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; + 0x30dc/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; + 0x31dc/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; + 0x9df0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; 0xa370/*/*) addpkg "wifi-firmware-iwlwifi-kmod-9000"; return 1 ;; # 22000 - 0x02f0/*/0x007c) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x02f0/*/0x0070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x02f0/*/0x0074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x02f0/*/0x0078) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x02f0/*/0x0310) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x02f0/*/0x1651) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x02f0/*/0x1652) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x02f0/*/0x2074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x02f0/*/0x4070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x02f0/*/0x6074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; 0x02f0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/0x007c) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/0x0070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/0x0074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/0x0078) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/0x0310) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/0x1651) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/0x1652) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/0x2074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/0x4070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x3df0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x007c) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x0070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x0074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x0078) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x0310) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x1651) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x1652) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x2074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x4070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/0x6074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x4df0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x06f0/*/0x007c) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x06f0/*/0x0070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x06f0/*/0x0074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x06f0/*/0x0078) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x06f0/*/0x0310) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x06f0/*/0x1651) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x06f0/*/0x1652) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x06f0/*/0x2074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x06f0/*/0x4070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; 0x06f0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x34f0/*/0x007c) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x34f0/*/0x0070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x34f0/*/0x0074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x34f0/*/0x0078) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x34f0/*/0x0310) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x34f0/*/0x1651) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x34f0/*/0x1652) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x34f0/*/0x2074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x34f0/*/0x4070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; + 0x2723/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; 0x34f0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x43f0/*/0x007c) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x43f0/*/0x0070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x43f0/*/0x0074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x43f0/*/0x0078) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x43f0/*/0x1651) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x43f0/*/0x1652) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x43f0/*/0x2074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x43f0/*/0x4070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; + 0x3df0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; 0x43f0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x2723/*/0x1653) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x2723/*/0x1654) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0x2723/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x0a10) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x007c) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x0070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x0074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x0078) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x1651) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x1652) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x2074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x4070) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; - 0xa0f0/*/0x6074) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; + 0x4df0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; 0xa0f0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-22000"; return 1 ;; # ax210 - 0x7a70/*/0x0a10) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7a70/*/0x00b0) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7a70/*/0x0090) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7a70/*/0x0098) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7a70/*/0x0310) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7a70/*/0x0510) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7a70/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7a70/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7a70/*/0x1691) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7a70/*/0x1692) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; + 0x2725/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; + 0x2729/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; + 0x51f0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; + 0x51f1/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; + 0x54f0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; 0x7a70/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x0a10) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x00b0) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x0090) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x0098) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x0310) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x0510) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x1691) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7af0/*/0x1692) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; 0x7af0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7e40/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7e40/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7e40/*/0x1691) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7e40/*/0x1692) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; 0x7e40/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7f70/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x7f70/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; 0x7f70/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x51f0/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x51f0/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x51f0/*/0x1691) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x51f0/*/0x1692) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x51f0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x51f1/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x51f1/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x51f1/*/0x1692) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x51f1/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x54f0/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x54f0/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x54f0/*/0x1691) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x54f0/*/0x1692) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x54f0/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x0a10) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x0020) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x0024) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x0090) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x0310) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x0510) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x1673) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x1674) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x2020) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x4020) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x6020) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0x6024) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0xe020) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/0xe024) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2725/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2726/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2726/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; - 0x2729/*/*) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; # bz - 0x4d40/*/*) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0x272b/*/*) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0x272d/*/*) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0x2727/*/*) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0x4d40/*/*) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0x7740/*/*) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x0000) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0xa840/*/0x0a10) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x0090) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x0094) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x0098) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x009c) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x00c0) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x00c4) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x00e0) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x00e4) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x00e8) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x00ec) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0xa840/*/0x009c) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0xa840/*/0x011c) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0xa840/*/0x40c4) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0xa840/*/0x40e0) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0xa840/*/0x0090) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0xa840/*/0x0094) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; - 0xa840/*/0x0098) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x0100) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x0110) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x0114) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x0118) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x011c) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x0310) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x0314) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x0510) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x0a10) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x1771) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x1772) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x1775) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x1776) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x1791) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x1792) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x4090) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x40c4) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0xa840/*/0x40e0) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x4110) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; 0xa840/*/0x4314) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; # sc 0x6e70/*/*) addpkg "wifi-firmware-iwlwifi-kmod-sc"; return 1 ;; + 0xd240/*/*) addpkg "wifi-firmware-iwlwifi-kmod-sc"; return 1 ;; 0xd340/*/*) addpkg "wifi-firmware-iwlwifi-kmod-sc"; return 1 ;; 0xe340/*/*) addpkg "wifi-firmware-iwlwifi-kmod-sc"; return 1 ;; 0xe440/*/*) addpkg "wifi-firmware-iwlwifi-kmod-sc"; return 1 ;; ### <<< + # Historic values which are removed from a newer driver but are still + # present in at least stable/14. + + # iwl_ax211_killer_1675* + 0x2726/*/0x1671) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; + 0x2726/*/0x1672) addpkg "wifi-firmware-iwlwifi-kmod-ax210"; return 1 ;; + + # bz + 0x2727/*/*) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + 0x272d/*/*) addpkg "wifi-firmware-iwlwifi-kmod-bz"; return 1 ;; + esac } diff --git a/usr.sbin/fwget/pci/pci_network_realtek b/usr.sbin/fwget/pci/pci_network_realtek index d70470b65244..24e24c498e67 100644 --- a/usr.sbin/fwget/pci/pci_network_realtek +++ b/usr.sbin/fwget/pci/pci_network_realtek @@ -2,7 +2,7 @@ # SPDX-License-Identifier: BSD-2-Clause # # Copyright 2023 Bjoern A. Zeeb -# Copyright (c) 2024 The FreeBSD Foundation +# Copyright (c) 2024-2026 The FreeBSD Foundation # # Portions of this software were developed by Björn Zeeb # under sponsorship from the FreeBSD Foundation. @@ -41,6 +41,7 @@ pci_network_realtek_rtw88() ### >>> 0xd723) addpkg "wifi-firmware-rtw88-kmod-rtw8723d"; return 1 ;; + 0x8813) addpkg "wifi-firmware-rtw88-kmod-rtw8814a"; return 1 ;; 0xb821) addpkg "wifi-firmware-rtw88-kmod-rtw8821c"; return 1 ;; 0xc821) addpkg "wifi-firmware-rtw88-kmod-rtw8821c"; return 1 ;; 0xb822) addpkg "wifi-firmware-rtw88-kmod-rtw8822b"; return 1 ;; @@ -67,8 +68,10 @@ pci_network_realtek_rtw89() 0xa85a) addpkg "wifi-firmware-rtw89-kmod-rtw8852a"; return 1 ;; 0xb852) addpkg "wifi-firmware-rtw89-kmod-rtw8852b"; return 1 ;; 0xb85b) addpkg "wifi-firmware-rtw89-kmod-rtw8852b"; return 1 ;; + 0xb520) addpkg "wifi-firmware-rtw89-kmod-rtw8852bt"; return 1 ;; 0xc852) addpkg "wifi-firmware-rtw89-kmod-rtw8852c"; return 1 ;; 0x8922) addpkg "wifi-firmware-rtw89-kmod-rtw8922a"; return 1 ;; + 0x892b) addpkg "wifi-firmware-rtw89-kmod-rtw8922a"; return 1 ;; ### <<< esac