From nobody Mon May 4 00:15:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g82HK0Vzlz6bytM for ; Mon, 04 May 2026 00:15: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 4g82HJ6Cs2z3qmw for ; Mon, 04 May 2026 00:15:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777853756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eB+Rr6emVngrFUAewnSS7ObD/oQ4AB6IusSvnq2iV9M=; b=RfVyqJ++WQntNougSe7FHTaSwbhok9Li2mbTmzmVod73e5yIooonTeCTdsYHBM7OBWbQJf jklpUUnv0LOc0ZwPzTQsRdN4JUqi3NnHSkSmQYDi2vdqjvGVZqDSmehxEt3qfxIFM9o6Vv U9eofF5WdZRT+lBt4sgeqEhTbCr/9BwzgIDYfZYpjfL/1XyACE4GkiVH+CSrW+ebzI/UKd 8B62kdFDIgNPZizo1OXtAP7F4A1EwLPKqXxoYez+qDgnFe0VEy8JTg+GpkfkeFzp6oNwGu Ple2y2AtIN4aBI2oupcdNrhiwYlAfmB7tljJFACwPySAEdwwaGk5V8nhI+IlOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777853756; a=rsa-sha256; cv=none; b=Ioy8hSizpNowuax0r2aquCsNVtnJ17FjHEaDA8bzMYzmneeX2JBkkbGkZv25rMfCpx79EH h6+wDi+ANgL9F26rUqKWEsxcpbz7Ape+UAptw6uLBo7QFN7HK+e8G/zFP2L4agLvd84Fk/ CN8aa2Lg4SER9L1GjACNFwtFZEdkWa7+EgtC44HvVhXBXBnKkXCSPuK/baCeX4jRyLUP7C IXDZOEjR51Rg/jmioWcE/FWpXeGiI6xz3gs3EJUZF8zVrf90DyeQoGFGqcUrAmhw4fCB6P nvqzXK7pn0+Eo3Y39jy9y3F7na+vjDkhGUAmKFOdxKCGcxVVRVJgPu8hiuja9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777853756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eB+Rr6emVngrFUAewnSS7ObD/oQ4AB6IusSvnq2iV9M=; b=NCU84tvGu2+gxYISNhL9qvTgFbnqWLXQt03aKiUjpMTI3wx3izLDuXf6ZzKs90663NOsya XSsx/pE5nOopRt3gyR/SVf3vm2AnGLQwqst7K9ObQRd4Fn76oJtrMB4b4lvoL+7m3wKodA N3lTvI4GBk2UMnZR7T9vvmzHe1WXT7QzKCzOo+Fv4RTay+0TYAR9VjnwxAMhRhCb1SKbTx amocbO7OwnLti5viHkkWzSMIFBMKMSRqi562c5Uh/4okPr7FScGq8Cqm/9QM79lDUOdDey 34eNeJFESeniqwo5CnyDQAuOiID6rAK+d98WGwMK7vgmJTx+aa5TPVWYFZC9UA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g82HJ5dGPzwN2 for ; Mon, 04 May 2026 00:15:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31fd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 00:15:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 0a919e2a9265 - stable/15 - libifconfig: Skip bridge VLAN config for span members List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0a919e2a9265b5cdaeb2c5d51c29791b4eb7335c Auto-Submitted: auto-generated Date: Mon, 04 May 2026 00:15:56 +0000 Message-Id: <69f7e53c.31fd6.4f8c8e96@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=0a919e2a9265b5cdaeb2c5d51c29791b4eb7335c commit 0a919e2a9265b5cdaeb2c5d51c29791b4eb7335c Author: Lexi Winter AuthorDate: 2026-04-29 03:11:20 +0000 Commit: Lexi Winter CommitDate: 2026-05-04 00:14:37 +0000 libifconfig: Skip bridge VLAN config for span members bridge(4) doesn't support BRDGGIFVLANSET for span members, which means if a span interface is configured, libifconfig will fail to fetch bridge members. Skip this for IFBIF_SPAN members. PR: 292634 MFC after: 3 days Reported by: Emrion Reviewed by: pouria, zlei Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56694 (cherry picked from commit 454322c08b8aa181939c8d920472f03cfd591032) --- lib/libifconfig/libifconfig_bridge.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libifconfig/libifconfig_bridge.c b/lib/libifconfig/libifconfig_bridge.c index 675bf5dd2ff5..2bb2952aeef2 100644 --- a/lib/libifconfig/libifconfig_bridge.c +++ b/lib/libifconfig/libifconfig_bridge.c @@ -139,6 +139,11 @@ ifconfig_bridge_get_bridge_status(ifconfig_handle_t *h, } for (size_t i = 0; i < bridge->inner.members_count; ++i) { struct ifbif_vlan_req vreq; + + /* Skip VLAN config for span members */ + if (bridge->inner.members[i].ifbr_ifsflags & IFBIF_SPAN) + continue; + memset(&vreq, 0, sizeof(vreq)); strlcpy(vreq.bv_ifname, bridge->inner.members[i].ifbr_ifsname, sizeof(vreq.bv_ifname)); From nobody Mon May 4 00:15:57 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g82HL2ZbXz6c03r for ; Mon, 04 May 2026 00:15: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 4g82HK72Mbz3qhF for ; Mon, 04 May 2026 00:15:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777853758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=achmdpvjk49/NEJAqTlzTs0IBvOQ7LirvI0jq9Fh/Wk=; b=ahABSk5aX4C5M/YSnMLEY9vvy27l6vFp8FnABauZmvibJRqeXhBVD4Ks1KsU5tXBG/uEtg 4KhCQO+eQFm0kSKNj1H8OfiNykKFbu5rSENpfsVcFmJ2P7TjLmYIoVsgVj2KvCk8bbmJiV XQEESt68E1N3gYB0qM4lcb7FHZSLyWeaqOSU+Xv5g0i316Rv9/Mbn1tyCT+2Uj9O68k+Yg kteUQOsFpAJ25vKeWLoljUMbCbp8SzKM7z1LZbU3PBm+P/FxprJgxrSFeVLIPQgWA7jztQ IKeMfJghyE/0O4gVqhuh3Rwk3XhunxDHR3fQ85VsGVfECmJQygq4Kv/HRyL+Nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777853758; a=rsa-sha256; cv=none; b=QPHhyc1oFObZtohNIFYo9C6aY6ccWN3TaR9l5Pj3hzSTwq5+NCzTVaY448iPV6t7KD4XYg atneKwZeVJQItHIIIUEJyebroslQOh0pgq1h03o/1Rx4f5gj41JAvmUq+DRINXgjfpsNeS hueIheCjNuUIQGHo5z5UwtBuMH63eAX0G2zXGBVeUS3kEVbAGviiSHRzqylneswSojsbvt A+qEVEEBiu3vOB3/Or0Jikmr00XJ7pwas+FCVPWjfQ1ZJsMlNBradvwqwalFrc5Cfj06R3 6+w2tDD9ytJLnIeBqJL7cB6J91PUCZBC2AjjSNyDkQnQHReJm/+gkJm4s/bbIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777853758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=achmdpvjk49/NEJAqTlzTs0IBvOQ7LirvI0jq9Fh/Wk=; b=WlbZ0+D08idUVeJUEvKCgT4mbS/XC04g0k9eOJuhRALyJp4MWVvXM59v7E9PAn9UHO1l8C L97kSconAnl2xUmIB+GUUy8SjSlmIpst8uZ2Wnndckk1ywolzZauczUcmYZXLlAN6fQmm3 JQ0zv+JDe3f4BeLe300gllEkrDGwADg0Phkqn8Lv9GKcaSh93XXYXEPqj6qirDT+tN7Iin j4DKWz8488p2Boyjq/lizwiFxPop5VLRW+FhelKop4tPQkGh6lgxS2Rx+wKCdhm+4moAdE lzWTugspoJXs4fMgVAOadvI1BuwiJ7kntD7d+pU8HfOt/y0L0MqaVNYLTNAM0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g82HK6NX3zwQK for ; Mon, 04 May 2026 00:15:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32f31 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 00:15:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: ee58056e1e42 - stable/15 - boot1.chrp: Specify --image-base List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ee58056e1e42de9230a159412827da97ae7f03bc Auto-Submitted: auto-generated Date: Mon, 04 May 2026 00:15:57 +0000 Message-Id: <69f7e53d.32f31.5582354c@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=ee58056e1e42de9230a159412827da97ae7f03bc commit ee58056e1e42de9230a159412827da97ae7f03bc Author: Lexi Winter AuthorDate: 2026-04-18 20:07:40 +0000 Commit: Lexi Winter CommitDate: 2026-05-04 00:14:38 +0000 boot1.chrp: Specify --image-base This is required for LLVM 22's ld.lld to avoid a build error: ld.lld: error: section '.text' address (0x38000) is smaller than image base (0x10000000); specify --image-base ld.lld: error: section '.rodata' address (0x3b308) is smaller than image base (0x10000000); specify --image-base ld.lld: error: section '.data' address (0x3b610) is smaller than image base (0x10000000); specify --image-base ld.lld: error: section '.bss' address (0x3f618) is smaller than image base (0x10000000); specify --image-base Use 0x38000 for the image base, which is the address of the lowest (and only) LOAD segment in the file. Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56459 (cherry picked from commit aa0bc7cca153f67f8becec8a8fb259ff5fd30fd0) --- stand/powerpc/boot1.chrp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/powerpc/boot1.chrp/Makefile b/stand/powerpc/boot1.chrp/Makefile index b91c0117b5a7..0b77bce2b097 100644 --- a/stand/powerpc/boot1.chrp/Makefile +++ b/stand/powerpc/boot1.chrp/Makefile @@ -21,7 +21,7 @@ CFLAGS+=-I${LDRSRC} # boot1.elf defined in the HFS template, but sometimes boot1.elf is written # directly to the PReP partition. # -LDFLAGS=-nostdlib -static -Wl,-N -Wl,-Ttext=0x38000 +LDFLAGS=-nostdlib -static -Wl,-N -Wl,-Ttext=0x38000 -Wl,--image-base=0x38000 .PATH: ${SYSDIR}/libkern ${SRCTOP}/lib/libc/powerpc/gen ${.CURDIR} From nobody Mon May 4 01:48:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g84Lc2N8Dz6c8sm for ; Mon, 04 May 2026 01:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g84Lc1Zc8z40c4 for ; Mon, 04 May 2026 01:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777859336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YijwUJdjTKBekwWiySYVbHHyUPNnMQNerRb0pveO/04=; b=Rcpd2/Syy7JY/4GCdsD1+kNQG2+z0rsUjkbq0WDdxL5peJnge5aePZy/Uo6fiH5dZxtz0C z75XCuce5Nb5WwkcIx6w2aLuVOSjlewoNn7lIa3c8plC1g2FMmT+CeHjn/hJj2dxp4ok0d /zjjLnxFEYw+hLqJEDdQY0yMmCbn+TWL/MAB4+fFR2I/ddEGGsrZ33/cL3RwZ0V8M90GJF wv/hsNZrm0E0YvwxtZpXGk0b4zywY1pSbY7EM4JYz7brufYP+t8iSkfIUKKrgAxlXvZofe wHGI9uscji1wWJTUe19FM0kbygZ3Mze19sYt2xdMmvt9Jx+7D9paVWSRMJSrdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777859336; a=rsa-sha256; cv=none; b=TbqXty6Aib8V7XrDzBMvJ11lwCYjMb+PsfmYjwejuEOj7bEYG5lhlXDkorHnggdnxpB8J2 kwxG7jTq6GTvsvAn5p0G4C3Pg3hLMDC54/kL++/NcOGCJ7gFMDFCQwfWqdmh863O9jJZch 0h+GvRV5I7O3X1QjBrK1hsye9R8FvUJRz7W/uAjz8d4fNqvqJyokmf4nl9ioGjUNvR6JTY v6rMuE7TeOUXbOGCrihQSBfXx1FrnRgJVFSlluHKyK+W3Li/dHduChX27at2UyubWZ70ml rKlisV2v6d1qJdJ5EytRnYWUIcTG18o3F/HLxl6GpSiwaZh8+DKs9Y99kO7uJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777859336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YijwUJdjTKBekwWiySYVbHHyUPNnMQNerRb0pveO/04=; b=OvaQSwhV3n3EzcoJ+jR9tKj1tSSxNp5mITSWF10KG9ZHD9Qy96J1/OPv0MQDOMZ0b+ELqn twhPInLkVgrvBwjfXq7vFoA5ZXs/KAtJbuF2ce6n2R9AWjt68IHE7fh//s7/TYzrv9RepD QOAWV9RiH/bul2jt9yKvSDCfqgLSn3XBTyI/0odlwPlKbNdU9HLioedRYusc7p91qZQrUM sqx7zJBfwToVW5GBRyIEdSmzAL4jVpRqv4jwvVBylvgodXhyN7dnd8KnMhDzD492vAtyZ/ AO70BbY0w6UL1QTk3g6zPHC/UpPhgZ9RZ2AOInCB0MTWCaNorpoxSY8rJL8zLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g84Lc11ZBzyq1 for ; Mon, 04 May 2026 01:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bb6b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 01:48:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 7a40b8a89e7d - main - dpaa: Fix copyright headers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a40b8a89e7da2a7e8d8e132bc37885b22e9bfb1 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 01:48:56 +0000 Message-Id: <69f7fb08.3bb6b.40509e12@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=7a40b8a89e7da2a7e8d8e132bc37885b22e9bfb1 commit 7a40b8a89e7da2a7e8d8e132bc37885b22e9bfb1 Author: Justin Hibbits AuthorDate: 2026-05-04 01:43:44 +0000 Commit: Justin Hibbits CommitDate: 2026-05-04 01:47:54 +0000 dpaa: Fix copyright headers Reported by: ziaee@ Fixes: fd8d34ce27 ("dpaa: Migrate from NCSW base to a home-grown driver") --- sys/dev/dpaa/bman.c | 4 ++-- sys/dev/dpaa/bman.h | 4 ++-- sys/dev/dpaa/bman_portals.c | 4 ++-- sys/dev/dpaa/bman_var.h | 4 ++-- sys/dev/dpaa/dpaa_common.c | 4 ++-- sys/dev/dpaa/dpaa_common.h | 4 ++-- sys/dev/dpaa/fman.c | 6 +++--- sys/dev/dpaa/fman_if.m | 2 +- sys/dev/dpaa/fman_muram.c | 4 ++-- sys/dev/dpaa/fman_parser.h | 4 ++-- sys/dev/dpaa/fman_port.c | 6 +++--- sys/dev/dpaa/fman_port.h | 6 +++--- sys/dev/dpaa/fman_port_if.m | 24 +----------------------- sys/dev/dpaa/fman_xmdio.c | 6 +++--- sys/dev/dpaa/if_memac.c | 6 +++--- sys/dev/dpaa/if_memac.h | 25 +++---------------------- sys/dev/dpaa/if_memac_fdt.c | 25 +++---------------------- sys/dev/dpaa/qman.c | 4 ++-- sys/dev/dpaa/qman_portal_if.m | 4 ++-- sys/dev/dpaa/qman_portals.c | 4 ++-- sys/dev/dpaa/qman_var.h | 4 ++-- 21 files changed, 47 insertions(+), 107 deletions(-) diff --git a/sys/dev/dpaa/bman.c b/sys/dev/dpaa/bman.c index 90095427f10d..3d1052f9ed9f 100644 --- a/sys/dev/dpaa/bman.c +++ b/sys/dev/dpaa/bman.c @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/sys/dev/dpaa/bman.h b/sys/dev/dpaa/bman.h index d8a76bfa672b..118c6f5938bc 100644 --- a/sys/dev/dpaa/bman.h +++ b/sys/dev/dpaa/bman.h @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ /*- diff --git a/sys/dev/dpaa/bman_portals.c b/sys/dev/dpaa/bman_portals.c index c4f6431857b9..b0c8200c1880 100644 --- a/sys/dev/dpaa/bman_portals.c +++ b/sys/dev/dpaa/bman_portals.c @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #include "opt_platform.h" diff --git a/sys/dev/dpaa/bman_var.h b/sys/dev/dpaa/bman_var.h index 67a0d7dd007a..91484da61ac3 100644 --- a/sys/dev/dpaa/bman_var.h +++ b/sys/dev/dpaa/bman_var.h @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #ifndef BMAN_VAR_H diff --git a/sys/dev/dpaa/dpaa_common.c b/sys/dev/dpaa/dpaa_common.c index 56345064dfca..c5055231298b 100644 --- a/sys/dev/dpaa/dpaa_common.c +++ b/sys/dev/dpaa/dpaa_common.c @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/sys/dev/dpaa/dpaa_common.h b/sys/dev/dpaa/dpaa_common.h index 1d81d63877a4..8fa43a034ef5 100644 --- a/sys/dev/dpaa/dpaa_common.h +++ b/sys/dev/dpaa/dpaa_common.h @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #ifndef DPAA_COMMON_H diff --git a/sys/dev/dpaa/fman.c b/sys/dev/dpaa/fman.c index c0c7ec8cb17b..b94c05fd7dbf 100644 --- a/sys/dev/dpaa/fman.c +++ b/sys/dev/dpaa/fman.c @@ -1,7 +1,7 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * +/* * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/sys/dev/dpaa/fman_if.m b/sys/dev/dpaa/fman_if.m index bdca87a2fe2c..e7412ca64195 100644 --- a/sys/dev/dpaa/fman_if.m +++ b/sys/dev/dpaa/fman_if.m @@ -1,4 +1,4 @@ -#- +# # SPDX-License-Identifier: BSD-2-Clause # # Copyright (c) 2026 Justin Hibbits diff --git a/sys/dev/dpaa/fman_muram.c b/sys/dev/dpaa/fman_muram.c index 35ea02065456..a3df993dbb98 100644 --- a/sys/dev/dpaa/fman_muram.c +++ b/sys/dev/dpaa/fman_muram.c @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/sys/dev/dpaa/fman_parser.h b/sys/dev/dpaa/fman_parser.h index 65dc5bcabe69..aff95b1ae9d9 100644 --- a/sys/dev/dpaa/fman_parser.h +++ b/sys/dev/dpaa/fman_parser.h @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #ifndef DPAA_FMAN_PARSER_H diff --git a/sys/dev/dpaa/fman_port.c b/sys/dev/dpaa/fman_port.c index 548557edc7f8..384d13a7b3a7 100644 --- a/sys/dev/dpaa/fman_port.c +++ b/sys/dev/dpaa/fman_port.c @@ -1,7 +1,7 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * +/* * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/sys/dev/dpaa/fman_port.h b/sys/dev/dpaa/fman_port.h index eea7019077e3..8803c5e5f7c9 100644 --- a/sys/dev/dpaa/fman_port.h +++ b/sys/dev/dpaa/fman_port.h @@ -1,7 +1,7 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * +/* * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #ifndef DPAA_FMAN_PORT_H diff --git a/sys/dev/dpaa/fman_port_if.m b/sys/dev/dpaa/fman_port_if.m index 2a5c939cc4a0..fe6159340c2c 100644 --- a/sys/dev/dpaa/fman_port_if.m +++ b/sys/dev/dpaa/fman_port_if.m @@ -1,29 +1,7 @@ -#- -# SPDX-License-Identifier: BSD-2-Clause # # Copyright (c) 2026 Justin Hibbits # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# +# SPDX-License-Identifier: BSD-2-Clause #include #include diff --git a/sys/dev/dpaa/fman_xmdio.c b/sys/dev/dpaa/fman_xmdio.c index 913f09781c85..521c30860dc5 100644 --- a/sys/dev/dpaa/fman_xmdio.c +++ b/sys/dev/dpaa/fman_xmdio.c @@ -1,7 +1,7 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * +/* * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/sys/dev/dpaa/if_memac.c b/sys/dev/dpaa/if_memac.c index dd338b318492..6d0fa3f5e337 100644 --- a/sys/dev/dpaa/if_memac.c +++ b/sys/dev/dpaa/if_memac.c @@ -1,7 +1,7 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * +/* * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/sys/dev/dpaa/if_memac.h b/sys/dev/dpaa/if_memac.h index a10e6f932d01..98942abaf79c 100644 --- a/sys/dev/dpaa/if_memac.h +++ b/sys/dev/dpaa/if_memac.h @@ -1,27 +1,8 @@ -/*- +/* + * Copyright (c) 2026 Justin Hibbits * Copyright (c) 2011-2012 Semihalf. - * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * SPDX-License-Identifier: BSD-2-Clause */ #ifndef IF_MEMAC_H_ diff --git a/sys/dev/dpaa/if_memac_fdt.c b/sys/dev/dpaa/if_memac_fdt.c index 455b021c52a4..f136608a906c 100644 --- a/sys/dev/dpaa/if_memac_fdt.c +++ b/sys/dev/dpaa/if_memac_fdt.c @@ -1,27 +1,8 @@ -/*- +/* + * Copyright (c) 2026 Justin Hibbits * Copyright (c) 2012 Semihalf. - * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * SPDX-License-Identifier: BSD-2-Clause */ #include diff --git a/sys/dev/dpaa/qman.c b/sys/dev/dpaa/qman.c index 550f7e288a6b..9143ebde5cb4 100644 --- a/sys/dev/dpaa/qman.c +++ b/sys/dev/dpaa/qman.c @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ /*- * Copyright (c) 2011-2012 Semihalf. diff --git a/sys/dev/dpaa/qman_portal_if.m b/sys/dev/dpaa/qman_portal_if.m index 35bc087a4ec1..2efe31dd6980 100644 --- a/sys/dev/dpaa/qman_portal_if.m +++ b/sys/dev/dpaa/qman_portal_if.m @@ -1,7 +1,7 @@ -#- -# SPDX-License-Identifier: BSD-2-Clause # # Copyright (c) 2026 Justin Hibbits +# +# SPDX-License-Identifier: BSD-2-Clause #include #include diff --git a/sys/dev/dpaa/qman_portals.c b/sys/dev/dpaa/qman_portals.c index cce43fa8016e..3b64aca71cb7 100644 --- a/sys/dev/dpaa/qman_portals.c +++ b/sys/dev/dpaa/qman_portals.c @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #include "opt_platform.h" diff --git a/sys/dev/dpaa/qman_var.h b/sys/dev/dpaa/qman_var.h index c143dec1c327..8ed36bbb6a35 100644 --- a/sys/dev/dpaa/qman_var.h +++ b/sys/dev/dpaa/qman_var.h @@ -1,7 +1,7 @@ /* - * SPDX-License-Identifier: BSD-2-Clause - * * Copyright (c) 2026 Justin Hibbits + * + * SPDX-License-Identifier: BSD-2-Clause */ #ifndef QMAN_VAR_H From nobody Mon May 4 01:48:57 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g84Ld3R7zz6c96b for ; Mon, 04 May 2026 01:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g84Ld28Vkz40Lx for ; Mon, 04 May 2026 01:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777859337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6oWRvkLZrng0hrHYyVxvG153DcZxPJYtxMxhoVCFvYg=; b=M5ZWzTBQB0CP8fSSoGM46UdH+kVDdlXXPxiTI+DmDGFdvdOyuQg9xYOfHP2AB8ZxHCumN4 6jLLriCW/lwNmvrdpPzvHxDzoIulZuW0LOgcFCTHd/nOPZarvRrfwC2GxYBuIPwj91AK5a d4lNLuAEQnY3jLkQNduseeg1D4vkIffLEgCHGOERDtU7PqYjVSJlSRngFfkmS2txmECbIX cp2/xbDFD+hOMEnlUdKV+eYTaG3U8tRxrhAPh5Fj169br+QzY6MFjqLPxpNncaZK5U/Oeb 6KO2y7TssRfsWgtTngcQnfWNomzNG1m3ZWhgW5mF5ZRSzok5PtjDgKKykDIl0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777859337; a=rsa-sha256; cv=none; b=OXOhYclycckoGfGgnQKMMM2Zld4SCyTPNt0wrDeZ6IpoWPTjlcDVxVoBrQbmmRsjvnyBTQ s3ic05kqQNLRxIRlSCCE7hn17K6o6sje1r4pIySkVSUP8sAYcXB+SjwQeXhL18U0meQg71 ilpXhOV+dr1rMr2zoUSdRh4FdgMUIzIN3QSA9PxVB4nIGNmiRH6yyl4uAShuXectlPUr8z lvWPZYy85kTTPSA6CZtNPZ+j1c1oE3r5379h0B4Mfe0kedPsz/xgOgEguSXzaVqt8nrwZC fz6OmDxBID3xbcQ1nNU1pAu3AzjN7IHiZjTlhfdnMn2qiJJG8Yj9Jgvwou71ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777859337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6oWRvkLZrng0hrHYyVxvG153DcZxPJYtxMxhoVCFvYg=; b=tgJ+f89Ab0yu4QiiccB4UdXLIutlbjn1yUClY6SRypBkHvTObsPCs+tdFJ0HPn9wP7sdNB q6tfKJVjumjp+Lj+bHLLH82rziBt8C6xqmJ2L8M0C0UU9qBJX/FJRzV2UlmYmptKQzudhl eHBEYyl2d47x0Fz09ptmPH3Mce7LXGGnixzZEIKb/vzVb7MWnni1HP0JWT5nLT8jn1BnuR v9vaIrYigVbKHs8XwcfFxBXyu/xrSsUGlAlPsZtarAFmhU5CH5MiVks45s9mCx2+Gr7goU 2pCk+DP4ribfJe1MhSmaVUtcGJOtIVpILdl6uGb9dUs81Af4LeM4+4FxwOarEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g84Ld1jKVzyq2 for ; Mon, 04 May 2026 01:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cc2b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 01:48:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 7b5a23b12451 - main - rs5c372a: Fix copyright header List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b5a23b12451a71a8377c7ef674b716a54751e92 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 01:48:57 +0000 Message-Id: <69f7fb09.3cc2b.35950411@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=7b5a23b12451a71a8377c7ef674b716a54751e92 commit 7b5a23b12451a71a8377c7ef674b716a54751e92 Author: Justin Hibbits AuthorDate: 2026-05-04 01:45:11 +0000 Commit: Justin Hibbits CommitDate: 2026-05-04 01:47:54 +0000 rs5c372a: Fix copyright header Reported by: ziaee@ Fixes: d22051b18 ("iicbus/rtc: Add driver for the Ricoh rs5c372 RTC") --- sys/dev/iicbus/rtc/rs5c372a.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/sys/dev/iicbus/rtc/rs5c372a.c b/sys/dev/iicbus/rtc/rs5c372a.c index c5743e840d25..1511025801f5 100644 --- a/sys/dev/iicbus/rtc/rs5c372a.c +++ b/sys/dev/iicbus/rtc/rs5c372a.c @@ -1,27 +1,7 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * +/* * Copyright (c) 2026 Justin Hibbits * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * SPDX-License-Identifier: BSD-2-Clause */ #include From nobody Mon May 4 04:30:08 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g87wv1tL6z6cRhP for ; Mon, 04 May 2026 04:30:23 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: from mail-yx1-f42.google.com (mail-yx1-f42.google.com [74.125.224.42]) (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 4g87wt2Cc0z4Gfx for ; Mon, 04 May 2026 04:30:22 +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.42 as permitted sender) smtp.mailfrom=rlibby@gmail.com Received: by mail-yx1-f42.google.com with SMTP id 956f58d0204a3-65c0bda7f15so3525454d50.0 for ; Sun, 03 May 2026 21:30:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777869021; x=1778473821; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=P3gz5eAhj12DwD5LEMuq/smOGaJIM1fdauxUyGqOdSI=; b=CpNPqI9Q8FNAcXKi8jqXYEKI2fJRgX0kMUrgYRp5PXvWKHFp6rm4/uKrRX4s8o+svE sqz3xyByXwaAf56wwULJLC51IQjZZ2pzOMMOsDpd11s+mk2p5I+zFVKzwUB0gvZ++mht DsKNyU7ms/BT8k0IUO10+PX8MOIdOEGNBz9YCmRvC5/2D1T0vqcq/V0ZkQgJ/aB9nGTV D+yYnd6GH41waIK6ovaSj1A04xsI8EWtk+RZ24rFkZIN//rRBVdwxIHiBE6ZQTyMEzcz +oOiemqYAxOKPwE4zxJEFEHASF4Jft0oF2WYUdf7DIckf9oaQqzVdzUjzCNfMFJGwNmv jYMw== X-Forwarded-Encrypted: i=1; AFNElJ8bEqjB9FFvxFh96Z1Zk+vdHTTDXDKYqyERLIHpo1IN5XNoltHVJeeVtStd35Kb8MYY8OBgiPNuKipljdM4/2NqpQBo@freebsd.org X-Gm-Message-State: AOJu0YygJ4bExviX/Ibds5tK1vkjSlmndyJxekjwakyWTeOUsAaVJAOo e5u6p3uhbbC0oFJ5ICW6XOGjPIyBi1XvEygBMr3vcLAgCRPJ+zW9ePik5u0P8A== X-Gm-Gg: AeBDiesiALtzaGLzXFVWJ4An5kEQOVRSojz75RRnvmyWwLv6ThxIGhuHuWfv9UTaDM7 U2E9UqKs8NgiVO2EvV5mar3Gd0pzc7RFE5sQUKL0YIPvBu1Kx3VeMxqjAuGGYd7VcdFwr7AdOii dpdQTq4KskDIyGdqfAzRPWjSMt5ADhgZjRjEN6ZE5TMwOXPHHsWN6tMMJVSbtDPOE7aaeLxko+w xOhGti78R68CCRT8qPINBn5We2DZXBmxDjJREqpXYfeyfbQK9Wwj8kLi7kGI2d5iJOOk0LQOzcU i47+PXNOCL0gu/X5bKa3bCzEQNBg9E8IhkbdXEGTmS1X44dzp8Q5apVkYKsFaz0j00d8iXZK8vE Zz/7UgvLFabU3VIwGpp7qk1Tk2gi1YIA//+qTBYCFJrrY/jSXSH8HOY8JPglclUGhgia6DxqVwl j5t3IRaG9x9SOozx/hHEmqKFkpTElYez0O7a/On+YX6V2pbQ99EiE4J+qqewremY1Spf2GXphrv Kd+jmA= X-Received: by 2002:a05:690c:c4f9:b0:7bd:4b22:a05c with SMTP id 00721157ae682-7bd772a3173mr88650727b3.49.1777869020485; Sun, 03 May 2026 21:30:20 -0700 (PDT) Received: from mail-yx1-f48.google.com (mail-yx1-f48.google.com. [74.125.224.48]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7bd6683a849sm44477677b3.29.2026.05.03.21.30.19 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 03 May 2026 21:30:20 -0700 (PDT) Received: by mail-yx1-f48.google.com with SMTP id 956f58d0204a3-651c366f7efso3440524d50.1 for ; Sun, 03 May 2026 21:30:19 -0700 (PDT) X-Forwarded-Encrypted: i=1; AFNElJ/8sygzEESzqTcPoYG0atqMVGMK/eKChvyt2onQWfftKsRHWusjjm4/bF0NUr0OMJpFZXxz3BiyszS6vYL8BQsSQfoM@freebsd.org X-Received: by 2002:a05:690e:4090:b0:651:c264:dd61 with SMTP id 956f58d0204a3-65c3d9d0399mr8508734d50.7.1777869019535; Sun, 03 May 2026 21:30:19 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 References: <69ef4acf.1fcd2.4d4d3e54@gitrepo.freebsd.org> In-Reply-To: <69ef4acf.1fcd2.4d4d3e54@gitrepo.freebsd.org> From: Ryan Libby Date: Sun, 3 May 2026 21:30:08 -0700 X-Gmail-Original-Message-ID: X-Gm-Features: AVHnY4JpLlZ6WrMsndOgRIl76yOC-rr4-rkn1iF77kYK3PgjBnP_l9z3xKNuxUM Message-ID: Subject: Re: git: c16c95192f01 - main - virtio_net: Use bus_dma for rxq/txq buffers To: Andrew Turner Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Sarah Walker Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-0.56 / 15.00]; RBL_VIRUSFREE_BOTNET(2.00)[74.125.224.42:from]; NEURAL_HAM_LONG(-1.00)[-0.996]; NEURAL_HAM_MEDIUM(-0.99)[-0.988]; NEURAL_HAM_SHORT(-0.97)[-0.974]; FORGED_SENDER(0.30)[rlibby@freebsd.org,rlibby@gmail.com]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; MIME_GOOD(-0.10)[text/plain]; BAD_REP_POLICIES(0.10)[]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; MISSING_XM_UA(0.00)[]; FREEFALL_USER(0.00)[rlibby]; ASN(0.00)[asn:15169, ipnet:74.125.0.0/16, country:US]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[rlibby@freebsd.org,rlibby@gmail.com]; RCVD_IN_DNSWL_NONE(0.00)[74.125.224.42:from,74.125.224.48:received]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[74.125.224.42:from]; R_DKIM_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(0.00)[+ip4:74.125.0.0/16:c]; RCPT_COUNT_FIVE(0.00)[5] X-Spamd-Bar: / X-Rspamd-Queue-Id: 4g87wt2Cc0z4Gfx On Mon, Apr 27, 2026 at 4:39=E2=80=AFAM Andrew Turner = wrote: > > The branch main has been updated by andrew: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dc16c95192f01237a876eb7bc33= 6e3bbda9310171 > > commit c16c95192f01237a876eb7bc336e3bbda9310171 > Author: Sarah Walker > AuthorDate: 2026-02-16 14:19:13 +0000 > Commit: Andrew Turner > CommitDate: 2026-04-27 11:37:53 +0000 > > virtio_net: Use bus_dma for rxq/txq buffers > > While the majority of virtio platforms will be fully coherent, some m= ay > require cache maintenance or other specific device memory handling (e= g for > secure partitioning). Using bus_dma allows for these usecases. > > The virtio buffers are marked as coherent; this should ensure that sy= nc > calls are no-ops in the common cases. > > Reviewed by: andrew > Sponsored by: Arm Ltd > Differential Revision: https://reviews.freebsd.org/D55492 > --- > sys/dev/virtio/network/if_vtnet.c | 275 +++++++++++++++++++++++++++++= +++--- > sys/dev/virtio/network/if_vtnetvar.h | 10 ++ > 2 files changed, 268 insertions(+), 17 deletions(-) > > diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/i= f_vtnet.c > index ef01833b9e03..e88602a44664 100644 > --- a/sys/dev/virtio/network/if_vtnet.c > +++ b/sys/dev/virtio/network/if_vtnet.c > @@ -96,6 +96,17 @@ > #define VTNET_ETHER_ALIGN ETHER_ALIGN > #endif > > +/* > + * Worst case offset to ensure header doesn't share any cache lines with > + * payload. > + */ > +#define VTNET_RX_BUFFER_HEADER_OFFSET 128 > + > +struct vtnet_rx_buffer_header { > + bus_addr_t addr; > + bus_dmamap_t dmap; > +}; > + > static int vtnet_modevent(module_t, int, void *); > > static int vtnet_probe(device_t); > @@ -384,6 +395,17 @@ MODULE_DEPEND(vtnet, netmap, 1, 1, 1); > > VIRTIO_SIMPLE_PNPINFO(vtnet, VIRTIO_ID_NETWORK, "VirtIO Networking Adapt= er"); > > +static struct vtnet_rx_buffer_header * > +vtnet_mbuf_to_rx_buffer_header(struct vtnet_softc *sc, struct mbuf *m) > +{ > + if (VTNET_ETHER_ALIGN !=3D 0 && sc->vtnet_hdr_size % 4 =3D=3D 0) > + return (struct vtnet_rx_buffer_header *)((uintptr_t)m->m_= data - > + VTNET_RX_BUFFER_HEADER_OFFSET - VTNET_ETHER_ALIGN); > + else > + return (struct vtnet_rx_buffer_header *)((uintptr_t)m->m_= data - > + VTNET_RX_BUFFER_HEADER_OFFSET); > +} > + > static int > vtnet_modevent(module_t mod __unused, int type, void *unused __unused) > { > @@ -457,6 +479,60 @@ vtnet_attach(device_t dev) > goto fail; > } > > + mtx_init(&sc->vtnet_rx_mtx, device_get_nameunit(dev), > + "VirtIO Net RX lock", MTX_DEF); > + > + error =3D bus_dma_tag_create( > + bus_get_dma_tag(dev), /* parent */ > + sizeof(uint16_t), /* alignment */ > + 0, /* boundary */ > + BUS_SPACE_MAXADDR, /* lowaddr */ > + BUS_SPACE_MAXADDR, /* highaddr */ > + NULL, NULL, /* filter, filterarg */ > + MJUM9BYTES, /* max request size */ > + 1, /* max # segments */ > + MJUM9BYTES, /* maxsegsize - worst cas= e */ > + BUS_DMA_COHERENT, /* flags */ > + busdma_lock_mutex, /* lockfunc */ > + &sc->vtnet_rx_mtx, /* lockarg */ > + &sc->vtnet_rx_dmat); > + if (error) { > + device_printf(dev, "cannot create bus_dma_tag\n"); > + goto fail; > + } > + > + mtx_init(&sc->vtnet_tx_mtx, device_get_nameunit(dev), > + "VirtIO Net TX lock", MTX_DEF); > + > + error =3D bus_dma_tag_create( > + bus_get_dma_tag(dev), /* parent */ > + sizeof(uint16_t), /* alignment */ > + 0, /* boundary */ > + BUS_SPACE_MAXADDR, /* lowaddr */ > + BUS_SPACE_MAXADDR, /* highaddr */ > + NULL, NULL, /* filter, filterarg */ > + sc->vtnet_tx_nsegs * MJUM9BYTES, /* max request size */ > + sc->vtnet_tx_nsegs, /* max # segments */ > + MJUM9BYTES, /* maxsegsize */ > + BUS_DMA_COHERENT, /* flags */ > + busdma_lock_mutex, /* lockfunc */ > + &sc->vtnet_tx_mtx, /* lockarg */ > + &sc->vtnet_tx_dmat); > + if (error) { > + device_printf(dev, "cannot create bus_dma_tag\n"); > + goto fail; > + } > + > +#ifdef __powerpc__ > + /* > + * Virtio uses physical addresses rather than bus addresses, so = we > + * need to ask busdma to skip the iommu physical->bus mapping. = At > + * present, this is only a thing on the powerpc architectures. > + */ > + bus_dma_tag_set_iommu(sc->vtnet_rx_dmat, NULL, NULL); > + bus_dma_tag_set_iommu(sc->vtnet_tx_dmat, NULL, NULL); > +#endif > + > error =3D vtnet_alloc_rx_filters(sc); > if (error) { > device_printf(dev, "cannot allocate Rx filters\n"); > @@ -1545,6 +1621,11 @@ static struct mbuf * > vtnet_rx_alloc_buf(struct vtnet_softc *sc, int nbufs, struct mbuf **m_ta= ilp) > { > struct mbuf *m_head, *m_tail, *m; > + struct vtnet_rx_buffer_header *vthdr; > + bus_dma_segment_t segs[1]; > + bus_dmamap_t dmap; > + int nsegs; > + int err; > int i, size; > > m_head =3D NULL; > @@ -1562,13 +1643,43 @@ vtnet_rx_alloc_buf(struct vtnet_softc *sc, int nb= ufs, struct mbuf **m_tailp) > } > > m->m_len =3D size; > + vthdr =3D (struct vtnet_rx_buffer_header *)m->m_data; > + > + /* Reserve space for header */ > + m_adj(m, VTNET_RX_BUFFER_HEADER_OFFSET); > + > /* > * Need to offset the mbuf if the header we're going to a= dd > * will misalign. > */ > - if (VTNET_ETHER_ALIGN !=3D 0 && sc->vtnet_hdr_size % 4 = =3D=3D 0) { > + if (VTNET_ETHER_ALIGN !=3D 0 && sc->vtnet_hdr_size % 4 = =3D=3D 0) > m_adj(m, VTNET_ETHER_ALIGN); > + > + err =3D bus_dmamap_create(sc->vtnet_rx_dmat, 0, &dmap); > + if (err) { > + printf("Failed to create dmamap, err :%d\n", > + err); > + m_freem(m); > + return (NULL); > } > + > + nsegs =3D 0; > + err =3D bus_dmamap_load_mbuf_sg(sc->vtnet_rx_dmat, dmap, = m, segs, > + &nsegs, BUS_DMA_NOWAIT); > + if (err !=3D 0) { > + printf("Failed to map mbuf into DMA visible memor= y, err: %d\n", > + err); > + m_freem(m); > + bus_dmamap_destroy(sc->vtnet_rx_dmat, dmap); > + return (NULL); > + } > + KASSERT(nsegs =3D=3D 1, > + ("%s: unexpected number of DMA segments for rx buffer= : %d", > + __func__, nsegs)); > + > + vthdr->addr =3D segs[0].ds_addr; > + vthdr->dmap =3D dmap; > + > if (m_head !=3D NULL) { > m_tail->m_next =3D m; > m_tail =3D m; > @@ -1594,7 +1705,7 @@ vtnet_rxq_replace_lro_nomrg_buf(struct vtnet_rxq *r= xq, struct mbuf *m0, > int len, clustersz, nreplace, error; > > sc =3D rxq->vtnrx_sc; > - clustersz =3D sc->vtnet_rx_clustersz; > + clustersz =3D sc->vtnet_rx_clustersz - VTNET_RX_BUFFER_HEADER_OFF= SET; > /* > * Need to offset the mbuf if the header we're going to add will > * misalign, account for that here. > @@ -1709,9 +1820,12 @@ vtnet_rxq_replace_buf(struct vtnet_rxq *rxq, struc= t mbuf *m, int len) > static int > vtnet_rxq_enqueue_buf(struct vtnet_rxq *rxq, struct mbuf *m) > { > + struct vtnet_rx_buffer_header *hdr; > struct vtnet_softc *sc; > struct sglist *sg; > int header_inlined, error; > + bus_addr_t paddr; > + struct mbuf *mp; > > sc =3D rxq->vtnrx_sc; > sg =3D rxq->vtnrx_sg; > @@ -1724,28 +1838,38 @@ vtnet_rxq_enqueue_buf(struct vtnet_rxq *rxq, stru= ct mbuf *m) > header_inlined =3D vtnet_modern(sc) || > (sc->vtnet_flags & VTNET_FLAG_MRG_RXBUFS) !=3D 0; /* TODO: AN= Y_LAYOUT */ > > + hdr =3D vtnet_mbuf_to_rx_buffer_header(sc, m); > + paddr =3D hdr->addr; > + > /* > * Note: The mbuf has been already adjusted when we allocate it i= f we > * have to do strict alignment. > */ > - if (header_inlined) > - error =3D sglist_append_mbuf(sg, m); > - else { > - struct vtnet_rx_header *rxhdr =3D > - mtod(m, struct vtnet_rx_header *); > + if (header_inlined) { > + error =3D sglist_append_phys(sg, paddr, m->m_len); > + } else { > MPASS(sc->vtnet_hdr_size =3D=3D sizeof(struct virtio_net_= hdr)); > > /* Append the header and remaining mbuf data. */ > - error =3D sglist_append(sg, &rxhdr->vrh_hdr, sc->vtnet_hd= r_size); > + error =3D sglist_append_phys(sg, paddr, sc->vtnet_hdr_siz= e); > if (error) > return (error); > - error =3D sglist_append(sg, &rxhdr[1], > + error =3D sglist_append_phys(sg, > + paddr + sizeof(struct vtnet_rx_header), > m->m_len - sizeof(struct vtnet_rx_header)); > if (error) > return (error); > > - if (m->m_next !=3D NULL) > - error =3D sglist_append_mbuf(sg, m->m_next); > + mp =3D m->m_next; > + while (mp) { > + hdr =3D vtnet_mbuf_to_rx_buffer_header(sc, mp); > + paddr =3D hdr->addr; > + error =3D sglist_append_phys(sg, paddr, mp->m_len= ); > + if (error) > + return (error); > + > + mp =3D mp->m_next; > + } > } > > if (error) > @@ -1931,6 +2055,7 @@ vtnet_rxq_merged_eof(struct vtnet_rxq *rxq, struct = mbuf *m_head, int nbufs) > m_tail =3D m_head; > > while (--nbufs > 0) { > + struct vtnet_rx_buffer_header *vthdr; > struct mbuf *m; > uint32_t len; > > @@ -1940,6 +2065,10 @@ vtnet_rxq_merged_eof(struct vtnet_rxq *rxq, struct= mbuf *m_head, int nbufs) > goto fail; > } > > + vthdr =3D vtnet_mbuf_to_rx_buffer_header(sc, m); > + bus_dmamap_sync(sc->vtnet_rx_dmat, vthdr->dmap, > + BUS_DMASYNC_POSTREAD); > + > if (vtnet_rxq_new_buf(rxq) !=3D 0) { > rxq->vtnrx_stats.vrxs_iqdrops++; > vtnet_rxq_discard_buf(rxq, m); > @@ -2060,6 +2189,7 @@ static int > vtnet_rxq_eof(struct vtnet_rxq *rxq) > { > struct virtio_net_hdr lhdr, *hdr; > + struct vtnet_rx_buffer_header *vthdr; > struct vtnet_softc *sc; > if_t ifp; > struct virtqueue *vq; > @@ -2075,14 +2205,31 @@ vtnet_rxq_eof(struct vtnet_rxq *rxq) > > CURVNET_SET(if_getvnet(ifp)); > while (count-- > 0) { > - struct mbuf *m; > + struct mbuf *m, *mp; > uint32_t len, nbufs, adjsz; > + uint32_t synced; > > m =3D virtqueue_dequeue(vq, &len); > if (m =3D=3D NULL) > break; > deq++; > > + mp =3D m; > + > + /* > + * Sync all mbufs in this packet. There will only be a si= ngle > + * mbuf unless LRO is in use. > + */ > + synced =3D 0; > + while (mp && synced < len) { > + vthdr =3D vtnet_mbuf_to_rx_buffer_header(sc, mp); > + bus_dmamap_sync(sc->vtnet_rx_dmat, vthdr->dmap, > + BUS_DMASYNC_POSTREAD); > + > + synced +=3D mp->m_len; > + mp =3D mp->m_next; > + } > + > if (len < sc->vtnet_hdr_size + ETHER_HDR_LEN) { > rxq->vtnrx_stats.vrxs_ierrors++; > vtnet_rxq_discard_buf(rxq, m); > @@ -2342,6 +2489,14 @@ vtnet_txq_free_mbufs(struct vtnet_txq *txq) > > while ((txhdr =3D virtqueue_drain(vq, &last)) !=3D NULL) { > if (kring =3D=3D NULL) { > + bus_dmamap_unload(txq->vtntx_sc->vtnet_tx_dmat, > + txhdr->dmap); > + bus_dmamap_destroy(txq->vtntx_sc->vtnet_tx_dmat, > + txhdr->dmap); > + bus_dmamap_unload(txq->vtntx_sc->vtnet_tx_dmat, > + txhdr->hdr_dmap); > + bus_dmamap_destroy(txq->vtntx_sc->vtnet_tx_dmat, > + txhdr->hdr_dmap); > m_freem(txhdr->vth_mbuf); > uma_zfree(vtnet_tx_header_zone, txhdr); > } > @@ -2511,15 +2666,36 @@ drop: > return (NULL); > } > > +static void > +vtnet_txq_enqueue_callback(void *arg, bus_dma_segment_t *segs, > + int nsegs, int error) > +{ > + vm_paddr_t *hdr_paddr; > + > + if (error !=3D 0) > + return; > + > + KASSERT(nsegs =3D=3D 1, ("%s: %d segments returned!", __func__, n= segs)); > + > + hdr_paddr =3D (vm_paddr_t *)arg; > + *hdr_paddr =3D segs[0].ds_addr; > +} > + > static int > vtnet_txq_enqueue_buf(struct vtnet_txq *txq, struct mbuf **m_head, > struct vtnet_tx_header *txhdr) > { > + bus_dma_segment_t segs[VTNET_TX_SEGS_MAX]; > + int nsegs; > struct vtnet_softc *sc; > struct virtqueue *vq; > struct sglist *sg; > struct mbuf *m; > int error; > + vm_paddr_t hdr_paddr; > + bus_dmamap_t hdr_dmap; > + bus_dmamap_t dmap; > + int i; > > sc =3D txq->vtntx_sc; > vq =3D txq->vtntx_vq; > @@ -2527,15 +2703,55 @@ vtnet_txq_enqueue_buf(struct vtnet_txq *txq, stru= ct mbuf **m_head, > m =3D *m_head; > > sglist_reset(sg); > - error =3D sglist_append(sg, &txhdr->vth_uhdr, sc->vtnet_hdr_size)= ; > + > + error =3D bus_dmamap_create(sc->vtnet_tx_dmat, 0, &hdr_dmap); > + if (error) > + goto fail; > + > + error =3D bus_dmamap_load(sc->vtnet_tx_dmat, hdr_dmap, &txhdr->vt= h_uhdr, > + sc->vtnet_hdr_size, vtnet_txq_enqueue_callback, &hdr_paddr, > + BUS_DMA_NOWAIT); > + if (error) > + goto fail_hdr_dmamap_destroy; > + > + error =3D sglist_append_phys(sg, hdr_paddr, sc->vtnet_hdr_size); > if (error !=3D 0 || sg->sg_nseg !=3D 1) { > KASSERT(0, ("%s: cannot add header to sglist error %d nse= g %d", > __func__, error, sg->sg_nseg)); > - goto fail; > + goto fail_hdr_dmamap_unload; > } > > - error =3D sglist_append_mbuf(sg, m); > + bus_dmamap_sync(sc->vtnet_tx_dmat, hdr_dmap, BUS_DMASYNC_PREWRITE= ); > + > + error =3D bus_dmamap_create(sc->vtnet_tx_dmat, 0, &dmap); > + if (error) > + goto fail_hdr_dmamap_unload; > + > + nsegs =3D 0; > + error =3D bus_dmamap_load_mbuf_sg(sc->vtnet_tx_dmat, dmap, m, seg= s, > + &nsegs, BUS_DMA_NOWAIT); > + if (error !=3D 0) > + goto fail_dmamap_destroy; > + KASSERT(nsegs <=3D sc->vtnet_tx_nsegs, > + ("%s: unexpected number of DMA segments for tx buffer: %d (ma= x %d)", > + __func__, nsegs, sc->vtnet_tx_nsegs)); > + > + bus_dmamap_sync(sc->vtnet_tx_dmat, dmap, BUS_DMASYNC_PREWRITE); > + > + for (i =3D 0; i < nsegs && !error; i++) > + error =3D sglist_append_phys(sg, segs[i].ds_addr, segs[i]= .ds_len); > + > if (error) { > + sglist_reset(sg); > + bus_dmamap_unload(sc->vtnet_tx_dmat, dmap); > + > + error =3D sglist_append_phys(sg, hdr_paddr, sc->vtnet_hdr= _size); > + if (error !=3D 0 || sg->sg_nseg !=3D 1) { > + KASSERT(0, ("%s: cannot add header to sglist erro= r %d nseg %d", > + __func__, error, sg->sg_nseg)); > + goto fail_dmamap_destroy; > + } > + > m =3D m_defrag(m, M_NOWAIT); > if (m =3D=3D NULL) { > sc->vtnet_stats.tx_defrag_failed++; > @@ -2545,16 +2761,41 @@ vtnet_txq_enqueue_buf(struct vtnet_txq *txq, stru= ct mbuf **m_head, > *m_head =3D m; > sc->vtnet_stats.tx_defragged++; > > - error =3D sglist_append_mbuf(sg, m); > + nsegs =3D 0; > + error =3D bus_dmamap_load_mbuf_sg(sc->vtnet_tx_dmat, dmap= , m, > + segs, &nsegs, BUS_DMA_NOWAIT); > + if (error !=3D 0) > + goto fail_dmamap_destroy; > + KASSERT(nsegs <=3D sc->vtnet_tx_nsegs, > + ("%s: unexpected number of DMA segments for tx buffer= : %d (max %d)", > + __func__, nsegs, sc->vtnet_tx_nsegs)); > + > + bus_dmamap_sync(sc->vtnet_tx_dmat, dmap, BUS_DMASYNC_PREW= RITE); > + > + for (i =3D 0; i < nsegs && !error; i++) > + error =3D sglist_append_phys(sg, segs[i].ds_addr, > + segs[i].ds_len); > + > if (error) > - goto fail; > + goto fail_dmamap_unload; > } > > txhdr->vth_mbuf =3D m; > + txhdr->dmap =3D dmap; > + txhdr->hdr_dmap =3D hdr_dmap; > + > error =3D virtqueue_enqueue(vq, txhdr, sg, sg->sg_nseg, 0); > > return (error); > > +fail_dmamap_unload: > + bus_dmamap_unload(sc->vtnet_tx_dmat, dmap); > +fail_dmamap_destroy: > + bus_dmamap_destroy(sc->vtnet_tx_dmat, dmap); > +fail_hdr_dmamap_unload: > + bus_dmamap_unload(sc->vtnet_tx_dmat, hdr_dmap); > +fail_hdr_dmamap_destroy: > + bus_dmamap_destroy(sc->vtnet_tx_dmat, hdr_dmap); > fail: > m_freem(*m_head); > *m_head =3D NULL; > diff --git a/sys/dev/virtio/network/if_vtnetvar.h b/sys/dev/virtio/networ= k/if_vtnetvar.h > index eb5e6784b07f..6cafe827d733 100644 > --- a/sys/dev/virtio/network/if_vtnetvar.h > +++ b/sys/dev/virtio/network/if_vtnetvar.h > @@ -190,6 +190,12 @@ struct vtnet_softc { > struct mtx vtnet_mtx; > char vtnet_mtx_name[16]; > uint8_t vtnet_hwaddr[ETHER_ADDR_LEN]; > + > + bus_dma_tag_t vtnet_rx_dmat; > + struct mtx vtnet_rx_mtx; > + > + bus_dma_tag_t vtnet_tx_dmat; > + struct mtx vtnet_tx_mtx; > }; > /* vtnet flag descriptions for use with printf(9) %b identifier. */ > #define VTNET_FLAGS_BITS \ > @@ -273,6 +279,10 @@ struct vtnet_tx_header { > } vth_uhdr; > > struct mbuf *vth_mbuf; > + > + bus_dmamap_t dmap; > + > + bus_dmamap_t hdr_dmap; > }; > > /* > I believe this is causing a massive memory leak in the devbuf malloc type. I can't even get through a build over nfs on a VM without hitting OOM. Reverting b5bad6df467cc95bea641afe674c55cd5b9f1510 and c16c95192f01237a876eb7bc336e3bbda9310171 fixes the leak. Can you please fix or revert this? You can monitor the leak with something like vmstat -m | grep devbuf > @@ -1562,13 +1643,43 @@ vtnet_rx_alloc_buf(struct vtnet_softc *sc, int nb= ufs, struct mbuf **m_tailp) > } > > m->m_len =3D size; > + vthdr =3D (struct vtnet_rx_buffer_header *)m->m_data; > + > + /* Reserve space for header */ > + m_adj(m, VTNET_RX_BUFFER_HEADER_OFFSET); > + > /* > * Need to offset the mbuf if the header we're going to a= dd > * will misalign. > */ > - if (VTNET_ETHER_ALIGN !=3D 0 && sc->vtnet_hdr_size % 4 = =3D=3D 0) { > + if (VTNET_ETHER_ALIGN !=3D 0 && sc->vtnet_hdr_size % 4 = =3D=3D 0) > m_adj(m, VTNET_ETHER_ALIGN); > + > + err =3D bus_dmamap_create(sc->vtnet_rx_dmat, 0, &dmap); > + if (err) { > + printf("Failed to create dmamap, err :%d\n", > + err); > + m_freem(m); > + return (NULL); > } > + > + nsegs =3D 0; > + err =3D bus_dmamap_load_mbuf_sg(sc->vtnet_rx_dmat, dmap, = m, segs, > + &nsegs, BUS_DMA_NOWAIT); Where is the bus_dmamap_unload and bus_dmamap_destroy for the rx bufs? Ryan From nobody Mon May 4 05:59:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g89wF50jqz6cdb1 for ; Mon, 04 May 2026 05:59: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 4g89wF0yBPz4PNg for ; Mon, 04 May 2026 05:59:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777874397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6QUWxmetF53l4GU4drl2/A6x/L9JFNdkQNG7JUywK7k=; b=gEKgWMMhKQzv23QGs0f7Aji62FHEVZVJVYPuJ40yXJYiJgVn7Lyw2VRR/p3Z300eKAia3I nFqDPKXmBw0wRjGIVg+st1t91cNVOUtDemrA+pn31VrClJNyACelRbQVt7+daRRk5D0iMO HZtyfcD4s3YH6necEDXJ5Li+L7WjWO4bsQEFWyZ+qomecqohEUI8XtwUhSOS/Fiz3l3DmS j2NJTb1ieNnT9AIArL/5bHo6vmD2KPpMqjnYbQWnP/Ha+iSW1R8mv+fuU2/ckalRC6ZfmV UCe+JMecQ7Bz/AUEyeOy1xkUp6U7oLP4XdT59B0PjYIzE3vS7HdzOBxZHzu4YQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777874397; a=rsa-sha256; cv=none; b=ny+J0pdi4OE6sVdsb0O7I437lE8zKDyukurgJNmEGsAdkpc5aJb1FWcroP3hOAX6a9Bfh0 XavWeaqWIAzFbMHlgfY9aWw3BN4aV1TGkZPVUDXFuiy+YH4lmmokiyphWJrGfiAnIOzlGQ 20ANrSyu+/iEppLHu7AGc21qbga//kLBYIiMZaaeGGBdnkDqDaAM+gjRydddP8T0bo2d6K r48KEopEqlKSP1BEeTMDDMGWxMTG7aOrZJDBtNdA0bRfaufh6x7te4yFDFLJKH60QSDco5 oTmB+lgEQbMtzpvq8D80pKEqG+ACEA1TdF5k/OmgWUp8CMpEwoqSfOlwpPqMww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777874397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6QUWxmetF53l4GU4drl2/A6x/L9JFNdkQNG7JUywK7k=; b=xrV4WY0UwwASGQewzK1ZMjpqQVWUxzpKZQXzYZ2p1l4kHoiS+QUBF+BwM+KSQEAQ05MEhf lfSaUxaznliyknJoq5l1mkRGwR4vr1VXvStEi/kyYBlnqa8PiouZd0Z2k4Y6BzbjnegP08 Ybuy/I36CRaX/WbdioWNbAdwDEx8cQTY5HkHkk1acxaz9ED32npf6+2UX05CzrO38/Ogt/ U+Hc1mXyZw5t3UClnVJaM1WwhI/k9IiWw/tIrNe1UcyMQfXa+sxPckbJtiXg2W+QGBWtYo jyBOQ5bjk3mLAjYlnP2bQVcEPDGRQukOJItimZ8dhZiZv+eJa09DXwYfQsRVjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g89wF0TQPz15bv for ; Mon, 04 May 2026 05:59:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39a2d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 05:59:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: 838e23734d06 - stable/15 - contrib/expat: import expat 2.8.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 838e23734d06285b4473e12f52232346c93142c9 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 05:59:51 +0000 Message-Id: <69f835d7.39a2d.15088a8@gitrepo.freebsd.org> The branch stable/15 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=838e23734d06285b4473e12f52232346c93142c9 commit 838e23734d06285b4473e12f52232346c93142c9 Author: Philip Paeps AuthorDate: 2026-04-27 10:38:10 +0000 Commit: Philip Paeps CommitDate: 2026-05-04 04:35:20 +0000 contrib/expat: import expat 2.8.0 Changes: https://github.com/libexpat/libexpat/blob/R_2_8_0/expat/Changes Security: CVE-2026-41080 (cherry picked from commit e3935639d8d8b6556cad18e1c90e419a65f26b40) --- contrib/expat/Changes | 66 +++++ contrib/expat/README.md | 8 +- contrib/expat/configure.ac | 137 +++++++-- contrib/expat/doc/reference.html | 57 +++- contrib/expat/doc/xmlwf.1 | 2 +- contrib/expat/doc/xmlwf.xml | 2 +- contrib/expat/examples/element_declarations.c | 5 +- contrib/expat/expat_config.h.in | 3 + contrib/expat/lib/Makefile.am | 36 +++ contrib/expat/lib/Makefile.in | 170 ++++++++++- contrib/expat/lib/expat.h | 16 +- contrib/expat/lib/expat_external.h | 5 +- contrib/expat/lib/internal.h | 4 +- contrib/expat/lib/libexpat.map.in | 5 + contrib/expat/lib/random_arc4random.c | 56 ++++ .../acc_tests_cxx.cpp => lib/random_arc4random.h} | 13 +- .../random_arc4random_buf.c} | 21 +- .../random_arc4random_buf.h} | 13 +- contrib/expat/lib/random_dev_urandom.c | 72 +++++ .../chardata_cxx.cpp => lib/random_dev_urandom.h} | 14 +- contrib/expat/lib/random_getentropy.c | 54 ++++ .../random_getentropy.h} | 14 +- contrib/expat/lib/random_getrandom.c | 90 ++++++ contrib/expat/lib/random_getrandom.h | 40 +++ contrib/expat/lib/random_rand_s.c | 88 ++++++ contrib/expat/lib/random_rand_s.h | 41 +++ contrib/expat/lib/xmlparse.c | 316 ++++++++------------- contrib/expat/lib/xmlrole.c | 2 +- contrib/expat/lib/xmltok.c | 2 +- contrib/expat/lib/xmltok_ns.c | 2 +- contrib/expat/tests/Makefile.am | 24 +- contrib/expat/tests/Makefile.in | 156 +--------- contrib/expat/tests/basic_tests.c | 26 ++ contrib/expat/tests/common_cxx.cpp | 32 --- contrib/expat/tests/dummy_cxx.cpp | 32 --- contrib/expat/tests/handlers_cxx.cpp | 32 --- contrib/expat/tests/memcheck_cxx.cpp | 32 --- contrib/expat/tests/minicheck_cxx.cpp | 32 --- contrib/expat/tests/misc_tests.c | 2 +- contrib/expat/tests/misc_tests_cxx.cpp | 32 --- contrib/expat/tests/ns_tests_cxx.cpp | 32 --- contrib/expat/tests/nsalloc_tests.c | 11 +- contrib/expat/tests/nsalloc_tests_cxx.cpp | 32 --- contrib/expat/tests/structdata_cxx.cpp | 32 --- contrib/expat/xmlwf/xmlfile.c | 2 +- contrib/expat/xmlwf/xmlwf.c | 2 +- lib/libexpat/Makefile | 2 +- lib/libexpat/expat_config.h | 6 +- lib/libexpat/libbsdxml.3 | 4 +- 49 files changed, 1136 insertions(+), 741 deletions(-) diff --git a/contrib/expat/Changes b/contrib/expat/Changes index 2b3704a69b77..87611eea5c01 100644 --- a/contrib/expat/Changes +++ b/contrib/expat/Changes @@ -29,6 +29,72 @@ !! THANK YOU! Sebastian Pipping -- Berlin, 2026-03-17 !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +Release 2.8.0 Fri April 24 2026 + Security fixes: + #47 #1183 CVE-2026-41080 -- The existing hash flooding protection + (based on SipHash) only used 4 to 8 bytes of entropy for + a salt, when 16 bytes of salt are supported by the + implementation of SipHash used by Expat. Now full 16 bytes + of entropy are used to improve protection against hash + flooding attacks. + Existing API function XML_SetHashSalt is now deprecated + because of its limitations, and its use should be + considered a vulnerability. Please either use the new API + function XML_SetHashSalt16Bytes (with known-high-quality + entropy input only!) instead, or leave the derivation of + a 16-bytes hash salt from high quality entropy to Expat's + internal machinery (by *not* calling either of the two + XML_SetHashSalt* functions). + + Bug fixes: + #1188 Avoid propagating /dev/urandom file descriptor to child + processes + #1193 Fix interpretation of `errno` after randomization calls + #1195 Avoid assuming uint8_t is a character type + + Other changes: + #1180 #1199 Add support for `getentropy(3)` as a source of entropy; + this helps with protecting against hash flooding attacks, + in particular with WASI SDK (where none of the other + entropy sources supported by libexpat are available). + #1200 Autotools: Add `--without-arc4random` and + `--without-arc4random-buf` + #1200 Autotools: Make `./configure` output report on available + high quality entropy sources + #1173 Autotools|macOS: Sync CMake templates with CMake 4.3.0 + #1201 Autotools|CMake: Improve checks for `arc4random` and + `arc4random_buf` e.g. with modern glibc + #1201 CMake: Report on availability of functions `arc4random` and + `arc4random_buf` + #1201 CMake: Mark entropy related build switches as advanced + #1189 .. + #1203 #1204 Extract new files from entropy extraction code + #1194 Stop duplicating C tests 1:1 as C++ ("runtests_cxx") + #1202 Fix a comment typo in expat_external.h + #1187 Fix grammar in compile error message + #1192 examples: Build warning-free with -Wwrite-strings + #1171 tests: Address harmless warning from Coverity + #1170 #1176 Sync file headers + #1190 #1206 Version info bumped from 12:3:11 (libexpat*.so.1.11.3) + to 13:0:12 (libexpat*.so.1.12.0); see https://verbump.de/ + for what these numbers do + + Infrastructure: + #1166 #1167 .. + #1172 #1175 .. + #1178 #1179 .. + #1185 #1205 CI: Make Perl XML::Parser integration tests run against + both version 2.47 and the latest release 2.58 + #1169 CI: Adapt to breaking changes regarding Inno Setup + #1173 CI: Adapt to breaking changes regarding CMake + #1174 CI: Include public corpus of fuzzer `xml_lpm_fuzzer` with + regression testing + #1181 #1182 CI: Bump WASI SDK from 30 to 32 + + Special thanks to: + Jérôme Duval + Matthew Fernandez + Release 2.7.5 Tue March 17 2026 Security fixes: #1158 CVE-2026-32776 -- Fix NULL function pointer dereference for diff --git a/contrib/expat/README.md b/contrib/expat/README.md index a67548be7fc9..619e60b2d16b 100644 --- a/contrib/expat/README.md +++ b/contrib/expat/README.md @@ -11,7 +11,7 @@ > at the top of the `Changes` file. -# Expat, Release 2.7.5 +# Expat, Release 2.8.0 This is Expat, a C99 library for parsing [XML 1.0 Fourth Edition](https://www.w3.org/TR/2006/REC-xml-20060816/), started by @@ -297,10 +297,4 @@ EXPAT_SYMBOL_VERSIONING:BOOL=OFF // Treat all compiler warnings as errors EXPAT_WARNINGS_AS_ERRORS:BOOL=OFF - -// Make use of getrandom function (ON|OFF|AUTO) [default=AUTO] -EXPAT_WITH_GETRANDOM:STRING=AUTO - -// Make use of syscall SYS_getrandom (ON|OFF|AUTO) [default=AUTO] -EXPAT_WITH_SYS_GETRANDOM:STRING=AUTO ``` diff --git a/contrib/expat/configure.ac b/contrib/expat/configure.ac index 6d028b5f6658..87633650f321 100644 --- a/contrib/expat/configure.ac +++ b/contrib/expat/configure.ac @@ -89,9 +89,9 @@ dnl dnl If the API changes incompatibly set LIBAGE back to 0 dnl -LIBCURRENT=12 # sync -LIBREVISION=3 # with -LIBAGE=11 # CMakeLists.txt! +LIBCURRENT=13 # sync +LIBREVISION=0 # with +LIBAGE=12 # CMakeLists.txt! AC_CONFIG_HEADERS([expat_config.h]) AH_TOP([#ifndef EXPAT_CONFIG_H @@ -217,21 +217,51 @@ AM_CONDITIONAL([_INTERNAL_LARGE_SIZE], [echo -- "${CPPFLAGS}${CFLAGS}" | ${FGREP LT_LIB_M -AC_MSG_CHECKING([for arc4random_buf (BSD or glibc 2.36+)]) -AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main(void) { - char dummy[[123]]; // double brackets for m4 - arc4random_buf(dummy, 0U); - return 0; - } - ])], - [AC_DEFINE([HAVE_ARC4RANDOM_BUF], [1], [Define to 1 if you have the `arc4random_buf' function.]) - AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]) - - AC_MSG_CHECKING([for arc4random (BSD, macOS, or glibc 2.36+)]) +AC_ARG_WITH([arc4random], + [AS_HELP_STRING([--with-arc4random], + [enforce the use of arc4random function in the system @<:@default=check@:>@]) +AS_HELP_STRING([--without-arc4random], + [skip auto detect of arc4random @<:@default=check@:>@])], + [], + [with_arc4random=check]) + +AC_ARG_WITH([arc4random-buf], + [AS_HELP_STRING([--with-arc4random-buf], + [enforce the use of arc4random_buf function in the system @<:@default=check@:>@]) +AS_HELP_STRING([--without-arc4random-buf], + [skip auto detect of arc4random_buf @<:@default=check@:>@])], + [], + [with_arc4random_buf=check]) + +have_arc4random=false +have_arc4random_buf=false + +AS_IF([test "x${with_arc4random_buf}" != xno], + [AC_MSG_CHECKING([for arc4random_buf (BSD or glibc 2.36+)]) AC_LINK_IFELSE([AC_LANG_SOURCE([ + #if ! defined(_DEFAULT_SOURCE) + # define _DEFAULT_SOURCE 1 /* for glibc */ + #endif + #include + int main(void) { + char dummy[[123]]; // double brackets for m4 + arc4random_buf(dummy, 0U); + return 0; + } + ])], + [AC_DEFINE([HAVE_ARC4RANDOM_BUF], [1], [Define to 1 if you have the `arc4random_buf' function.]) + have_arc4random_buf=true + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AS_IF([test "x${with_arc4random_buf}" = xyes], + [AC_MSG_ERROR([enforced the use of arc4random_buf --with-arc4random-buf, but not detected])])])]) + +AS_IF([test "x${with_arc4random}" != xno], + [AC_MSG_CHECKING([for arc4random (BSD, macOS, or glibc 2.36+)]) + AC_LINK_IFELSE([AC_LANG_SOURCE([ + #if ! defined(_DEFAULT_SOURCE) + # define _DEFAULT_SOURCE 1 /* for glibc */ + #endif #include int main(void) { arc4random(); @@ -239,8 +269,58 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([ } ])], [AC_DEFINE([HAVE_ARC4RANDOM], [1], [Define to 1 if you have the `arc4random' function.]) + have_arc4random=true + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AS_IF([test "x${with_arc4random}" = xyes], + [AC_MSG_ERROR([enforced the use of arc4random --with-arc4random, but not detected])])])]) + +AM_CONDITIONAL([WITH_ARC4RANDOM], [test x${have_arc4random} = xtrue]) +AM_CONDITIONAL([WITH_ARC4RANDOM_BUF], [test x${have_arc4random_buf} = xtrue]) + +have_getentropy=false + +AC_ARG_WITH([getentropy], + [AS_HELP_STRING([--with-getentropy], + [enforce the use of getentropy function in the system @<:@default=check@:>@]) +AS_HELP_STRING([--without-getentropy], + [skip auto detect of getentropy @<:@default=check@:>@])], + [], + [with_getentropy=check]) + +AS_IF([test "x$with_getentropy" != xno], + [AC_MSG_CHECKING([for getentropy (BSD, macOS 10.12+, glibc 2.25+)]) + AC_LINK_IFELSE([AC_LANG_SOURCE([ + // NOTE: Please keep this block in sync with its two siblings in files + // 'ConfigureChecks.cmake' and 'lib/random_getentropy.c'! + #if defined(__APPLE__) + # include + #else + # if defined(__GLIBC__) && ! defined(_DEFAULT_SOURCE) + # define _DEFAULT_SOURCE 1 + # endif + # if ! defined(_GNU_SOURCE) + # define _GNU_SOURCE 1 /* for musl */ + # endif + # include + #endif // ! defined(__APPLE__) + + int main(void) { + return getentropy(NULL, 0U); + } + ])], + [AC_DEFINE([HAVE_GETENTROPY], [1], [Define to 1 if you have the `getentropy' function.]) + have_getentropy=true AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no])])]) + [AC_MSG_RESULT([no]) + AS_IF([test "x$with_getentropy" = xyes], + [AC_MSG_ERROR([enforced the use of getentropy --with-getentropy, but not detected])])])]) + +AM_CONDITIONAL([WITH_GETENTROPY], [test x${have_getentropy} = xtrue]) + +have_either_getrandom=false +have_getrandom_function=false +have_getrandom_syscall=false AC_ARG_WITH([getrandom], [AS_HELP_STRING([--with-getrandom], @@ -260,6 +340,8 @@ AS_IF([test "x$with_getrandom" != xno], } ])], [AC_DEFINE([HAVE_GETRANDOM], [1], [Define to 1 if you have the `getrandom' function.]) + have_either_getrandom=true + have_getrandom_function=true AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) AS_IF([test "x$with_getrandom" = xyes], @@ -286,11 +368,15 @@ AS_IF([test "x$with_sys_getrandom" != xno], } ])], [AC_DEFINE([HAVE_SYSCALL_GETRANDOM], [1], [Define to 1 if you have `syscall' and `SYS_getrandom'.]) + have_either_getrandom=true + have_getrandom_syscall=true AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) AS_IF([test "x$with_sys_getrandom" = xyes], [AC_MSG_ERROR([enforced the use of syscall SYS_getrandom --with-sys-getrandom, but not detected])])])]) +AM_CONDITIONAL([WITH_EITHER_GETRANDOM], [test x${have_either_getrandom} = xtrue]) + dnl Only needed for xmlwf: AC_CHECK_HEADERS(fcntl.h unistd.h) AC_TYPE_OFF_T @@ -486,4 +572,17 @@ User flags (override Automake flags on conflict): CPPFLAGS: ${CPPFLAGS} CFLAGS: ${CFLAGS} CXXFLAGS: ${CXXFLAGS} - LDFLAGS: ${LDFLAGS}]) + LDFLAGS: ${LDFLAGS} + +Entropy sources: + arc4random: ${have_arc4random} + arc4random_buf: ${have_arc4random_buf} + getentropy: ${have_getentropy} + getrandom: ${have_getrandom_function} + syscall SYS_getrandom: ${have_getrandom_syscall} + /dev/urandom: true + +Continue with e.g.: + make -j2 + make check + sudo make install]) diff --git a/contrib/expat/doc/reference.html b/contrib/expat/doc/reference.html index 5faa8d6515af..195bd183fd82 100644 --- a/contrib/expat/doc/reference.html +++ b/contrib/expat/doc/reference.html @@ -53,7 +53,7 @@

- The Expat XML Parser Release 2.7.5 + The Expat XML Parser Release 2.8.0

@@ -404,7 +404,11 @@
  • - XML_SetHashSalt + XML_SetHashSalt (deprecated) +
    • + +
  • + XML_SetHashSalt16Bytes
  • @@ -3449,22 +3453,35 @@ XML_SetParamEntityParsing(XML_Parser p,

    - XML_SetHashSalt + XML_SetHashSalt (deprecated) 

     int XMLCALL
-XML_SetHashSalt(XML_Parser p,
+XML_SetHashSalt(XML_Parser parser,
                 unsigned long hash_salt);
    Sets the hash salt to use for internal hash calculations. Helps in preventing DoS attacks based on predicting hash function behavior. In order to have an effect this must be called before parsing has started. Returns 1 if successful, 0 when - called after XML_Parse or XML_ParseBuffer. + called after XML_Parse or XML_ParseBuffer or when + parser is NULL. +

    + Note: Function XML_SetHashSalt is + deprecated. Please use function XML_SetHashSalt16Bytes instead for better + security. XML_SetHashSalt only provides 4 to 8 bytes of entropy + (depending on the size of type unsigned long) while the SipHash + implementation used by Expat can leverage up to 16 bytes of entropy — at least + twice as much. Function XML_SetHashSalt16Bytes of Expat >=2.8.0 + (and where backported) matches the amount of entropy supported by SipHash. +

    +

    Note: This call is optional, as the parser will auto-generate a new - random salt value if no value has been set at the start of parsing. + random salt value internally if no value has been set by the start of parsing.

    @@ -3475,6 +3492,34 @@ XML_SetHashSalt(XML_Parser p,

    +

    + XML_SetHashSalt16Bytes +

    + + 
    +/* Added in Expat 2.8.0. */
+XML_Bool XMLCALL
+XML_SetHashSalt16Bytes(XML_Parser parser,
+                       const uint8_t entropy[16]);
+
    +
    + Sets the hash salt to use for internal hash calculations. Helps in preventing DoS + attacks based on predicting hash function behavior. In order to have an effect + this must be called before parsing has started. Returns XML_TRUE if + successful, XML_FALSE when called after XML_Parse or + XML_ParseBuffer or when parser is NULL. +

    + Note: Setting a salt that is not from a source of high quality + entropy (like getentropy(3)) will make the parser vulnerable to + hash flooding attacks. +

    + +

    + Note: This call is optional, as the parser will auto-generate a new + random salt value internally if no value has been set by the start of parsing. +

    +
    +

    XML_UseForeignDTD

    diff --git a/contrib/expat/doc/xmlwf.1 b/contrib/expat/doc/xmlwf.1 index 75318fccc856..0736f110e3c1 100644 --- a/contrib/expat/doc/xmlwf.1 +++ b/contrib/expat/doc/xmlwf.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH XMLWF 1 "March 17, 2026" "" "" +.TH XMLWF 1 "April 24, 2026" "" "" .SH NAME xmlwf \- Determines if an XML document is well-formed .SH SYNOPSIS diff --git a/contrib/expat/doc/xmlwf.xml b/contrib/expat/doc/xmlwf.xml index c4fe92d44fb4..3a3897750cb1 100644 --- a/contrib/expat/doc/xmlwf.xml +++ b/contrib/expat/doc/xmlwf.xml @@ -21,7 +21,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ Scott"> Bronson"> - March 17, 2026"> + April 24, 2026"> 1"> bronson@rinspin.com"> diff --git a/contrib/expat/examples/element_declarations.c b/contrib/expat/examples/element_declarations.c index d644b2ffa5ea..d864cf70a2f7 100644 --- a/contrib/expat/examples/element_declarations.c +++ b/contrib/expat/examples/element_declarations.c @@ -16,6 +16,7 @@ Copyright (c) 2017 Rhodri James Copyright (c) 2019 Zhongyuan Zhou Copyright (c) 2024 Hanno Böck + Copyright (c) 2026 Matthew Fernandez Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining @@ -82,7 +83,7 @@ stackPopFree(Stack *stackTop) { return newStackTop; } -static char * +static const char * contentTypeName(enum XML_Content_Type contentType) { switch (contentType) { case XML_CTYPE_EMPTY: @@ -102,7 +103,7 @@ contentTypeName(enum XML_Content_Type contentType) { } } -static char * +static const char * contentQuantName(enum XML_Content_Quant contentQuant) { switch (contentQuant) { case XML_CQUANT_NONE: diff --git a/contrib/expat/expat_config.h.in b/contrib/expat/expat_config.h.in index 7541bf6005e6..4d7d732e8052 100644 --- a/contrib/expat/expat_config.h.in +++ b/contrib/expat/expat_config.h.in @@ -24,6 +24,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_FCNTL_H +/* Define to 1 if you have the `getentropy' function. */ +#undef HAVE_GETENTROPY + /* Define to 1 if you have the 'getpagesize' function. */ #undef HAVE_GETPAGESIZE diff --git a/contrib/expat/lib/Makefile.am b/contrib/expat/lib/Makefile.am index 493077231c57..27bf2ab64769 100644 --- a/contrib/expat/lib/Makefile.am +++ b/contrib/expat/lib/Makefile.am @@ -55,6 +55,42 @@ libexpat_la_SOURCES = \ xmltok.c \ xmlrole.c +if WITH_ARC4RANDOM + libexpat_la_SOURCES += \ + random_arc4random.c \ + random_arc4random.h +endif + +if WITH_ARC4RANDOM_BUF + libexpat_la_SOURCES += \ + random_arc4random_buf.c \ + random_arc4random_buf.h +endif + +if ! MINGW + libexpat_la_SOURCES += \ + random_dev_urandom.c \ + random_dev_urandom.h +endif + +if WITH_GETENTROPY + libexpat_la_SOURCES += \ + random_getentropy.c \ + random_getentropy.h +endif + +if WITH_EITHER_GETRANDOM + libexpat_la_SOURCES += \ + random_getrandom.c \ + random_getrandom.h +endif + +if MINGW + libexpat_la_SOURCES += \ + random_rand_s.c \ + random_rand_s.h +endif + if WITH_TESTS libtestpat_la_CPPFLAGS = -DXML_TESTING diff --git a/contrib/expat/lib/Makefile.in b/contrib/expat/lib/Makefile.in index d8e4fd59e117..4cd6fcfc6088 100644 --- a/contrib/expat/lib/Makefile.in +++ b/contrib/expat/lib/Makefile.in @@ -126,6 +126,30 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @HAVE_VSCRIPT_TRUE@am__append_1 = $(VSCRIPT_LDFLAGS),@builddir@/libexpat.map +@WITH_ARC4RANDOM_TRUE@am__append_2 = \ +@WITH_ARC4RANDOM_TRUE@ random_arc4random.c \ +@WITH_ARC4RANDOM_TRUE@ random_arc4random.h + +@WITH_ARC4RANDOM_BUF_TRUE@am__append_3 = \ +@WITH_ARC4RANDOM_BUF_TRUE@ random_arc4random_buf.c \ +@WITH_ARC4RANDOM_BUF_TRUE@ random_arc4random_buf.h + +@MINGW_FALSE@am__append_4 = \ +@MINGW_FALSE@ random_dev_urandom.c \ +@MINGW_FALSE@ random_dev_urandom.h + +@WITH_GETENTROPY_TRUE@am__append_5 = \ +@WITH_GETENTROPY_TRUE@ random_getentropy.c \ +@WITH_GETENTROPY_TRUE@ random_getentropy.h + +@WITH_EITHER_GETRANDOM_TRUE@am__append_6 = \ +@WITH_EITHER_GETRANDOM_TRUE@ random_getrandom.c \ +@WITH_EITHER_GETRANDOM_TRUE@ random_getrandom.h + +@MINGW_TRUE@am__append_7 = \ +@MINGW_TRUE@ random_rand_s.c \ +@MINGW_TRUE@ random_rand_s.h + subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ @@ -180,7 +204,21 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(docdir)" \ "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) libexpat_la_LIBADD = -am_libexpat_la_OBJECTS = xmlparse.lo xmltok.lo xmlrole.lo +am__libexpat_la_SOURCES_DIST = xmlparse.c xmltok.c xmlrole.c \ + random_arc4random.c random_arc4random.h \ + random_arc4random_buf.c random_arc4random_buf.h \ + random_dev_urandom.c random_dev_urandom.h random_getentropy.c \ + random_getentropy.h random_getrandom.c random_getrandom.h \ + random_rand_s.c random_rand_s.h +@WITH_ARC4RANDOM_TRUE@am__objects_1 = random_arc4random.lo +@WITH_ARC4RANDOM_BUF_TRUE@am__objects_2 = random_arc4random_buf.lo +@MINGW_FALSE@am__objects_3 = random_dev_urandom.lo +@WITH_GETENTROPY_TRUE@am__objects_4 = random_getentropy.lo +@WITH_EITHER_GETRANDOM_TRUE@am__objects_5 = random_getrandom.lo +@MINGW_TRUE@am__objects_6 = random_rand_s.lo +am_libexpat_la_OBJECTS = xmlparse.lo xmltok.lo xmlrole.lo \ + $(am__objects_1) $(am__objects_2) $(am__objects_3) \ + $(am__objects_4) $(am__objects_5) $(am__objects_6) libexpat_la_OBJECTS = $(am_libexpat_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -190,10 +228,26 @@ libexpat_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libexpat_la_LDFLAGS) $(LDFLAGS) -o $@ libtestpat_la_LIBADD = -am__libtestpat_la_SOURCES_DIST = xmlparse.c xmltok.c xmlrole.c -am__objects_1 = libtestpat_la-xmlparse.lo libtestpat_la-xmltok.lo \ - libtestpat_la-xmlrole.lo -@WITH_TESTS_TRUE@am_libtestpat_la_OBJECTS = $(am__objects_1) +am__libtestpat_la_SOURCES_DIST = xmlparse.c xmltok.c xmlrole.c \ + random_arc4random.c random_arc4random.h \ + random_arc4random_buf.c random_arc4random_buf.h \ + random_dev_urandom.c random_dev_urandom.h random_getentropy.c \ + random_getentropy.h random_getrandom.c random_getrandom.h \ + random_rand_s.c random_rand_s.h +@WITH_ARC4RANDOM_TRUE@am__objects_7 = \ +@WITH_ARC4RANDOM_TRUE@ libtestpat_la-random_arc4random.lo +@WITH_ARC4RANDOM_BUF_TRUE@am__objects_8 = libtestpat_la-random_arc4random_buf.lo +@MINGW_FALSE@am__objects_9 = libtestpat_la-random_dev_urandom.lo +@WITH_GETENTROPY_TRUE@am__objects_10 = \ +@WITH_GETENTROPY_TRUE@ libtestpat_la-random_getentropy.lo +@WITH_EITHER_GETRANDOM_TRUE@am__objects_11 = \ +@WITH_EITHER_GETRANDOM_TRUE@ libtestpat_la-random_getrandom.lo +@MINGW_TRUE@am__objects_12 = libtestpat_la-random_rand_s.lo +am__objects_13 = libtestpat_la-xmlparse.lo libtestpat_la-xmltok.lo \ + libtestpat_la-xmlrole.lo $(am__objects_7) $(am__objects_8) \ + $(am__objects_9) $(am__objects_10) $(am__objects_11) \ + $(am__objects_12) +@WITH_TESTS_TRUE@am_libtestpat_la_OBJECTS = $(am__objects_13) libtestpat_la_OBJECTS = $(am_libtestpat_la_OBJECTS) @WITH_TESTS_TRUE@am_libtestpat_la_rpath = AM_V_P = $(am__v_P_@AM_V@) @@ -211,10 +265,22 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/libtestpat_la-xmlparse.Plo \ +am__depfiles_remade = ./$(DEPDIR)/libtestpat_la-random_arc4random.Plo \ + ./$(DEPDIR)/libtestpat_la-random_arc4random_buf.Plo \ + ./$(DEPDIR)/libtestpat_la-random_dev_urandom.Plo \ + ./$(DEPDIR)/libtestpat_la-random_getentropy.Plo \ + ./$(DEPDIR)/libtestpat_la-random_getrandom.Plo \ + ./$(DEPDIR)/libtestpat_la-random_rand_s.Plo \ + ./$(DEPDIR)/libtestpat_la-xmlparse.Plo \ ./$(DEPDIR)/libtestpat_la-xmlrole.Plo \ - ./$(DEPDIR)/libtestpat_la-xmltok.Plo ./$(DEPDIR)/xmlparse.Plo \ - ./$(DEPDIR)/xmlrole.Plo ./$(DEPDIR)/xmltok.Plo + ./$(DEPDIR)/libtestpat_la-xmltok.Plo \ + ./$(DEPDIR)/random_arc4random.Plo \ + ./$(DEPDIR)/random_arc4random_buf.Plo \ + ./$(DEPDIR)/random_dev_urandom.Plo \ + ./$(DEPDIR)/random_getentropy.Plo \ + ./$(DEPDIR)/random_getrandom.Plo ./$(DEPDIR)/random_rand_s.Plo \ + ./$(DEPDIR)/xmlparse.Plo ./$(DEPDIR)/xmlrole.Plo \ + ./$(DEPDIR)/xmltok.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -235,7 +301,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libexpat_la_SOURCES) $(libtestpat_la_SOURCES) -DIST_SOURCES = $(libexpat_la_SOURCES) \ +DIST_SOURCES = $(am__libexpat_la_SOURCES_DIST) \ $(am__libtestpat_la_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ @@ -428,11 +494,9 @@ lib_LTLIBRARIES = libexpat.la @WITH_TESTS_TRUE@noinst_LTLIBRARIES = libtestpat.la libexpat_la_LDFLAGS = @AM_LDFLAGS@ @LIBM@ -no-undefined -version-info \ @LIBCURRENT@:@LIBREVISION@:@LIBAGE@ $(am__append_1) -libexpat_la_SOURCES = \ - xmlparse.c \ - xmltok.c \ - xmlrole.c - +libexpat_la_SOURCES = xmlparse.c xmltok.c xmlrole.c $(am__append_2) \ + $(am__append_3) $(am__append_4) $(am__append_5) \ + $(am__append_6) $(am__append_7) @WITH_TESTS_TRUE@libtestpat_la_CPPFLAGS = -DXML_TESTING @WITH_TESTS_TRUE@libtestpat_la_SOURCES = $(libexpat_la_SOURCES) doc_DATA = \ @@ -548,9 +612,21 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-random_arc4random.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-random_arc4random_buf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-random_dev_urandom.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-random_getentropy.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-random_getrandom.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-random_rand_s.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-xmlparse.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-xmlrole.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-xmltok.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random_arc4random.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random_arc4random_buf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random_dev_urandom.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random_getentropy.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random_getrandom.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random_rand_s.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlparse.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlrole.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltok.Plo@am__quote@ # am--include-marker @@ -603,6 +679,48 @@ libtestpat_la-xmlrole.lo: xmlrole.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libtestpat_la-xmlrole.lo `test -f 'xmlrole.c' || echo '$(srcdir)/'`xmlrole.c +libtestpat_la-random_arc4random.lo: random_arc4random.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libtestpat_la-random_arc4random.lo -MD -MP -MF $(DEPDIR)/libtestpat_la-random_arc4random.Tpo -c -o libtestpat_la-random_arc4random.lo `test -f 'random_arc4random.c' || echo '$(srcdir)/'`random_arc4random.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtestpat_la-random_arc4random.Tpo $(DEPDIR)/libtestpat_la-random_arc4random.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='random_arc4random.c' object='libtestpat_la-random_arc4random.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libtestpat_la-random_arc4random.lo `test -f 'random_arc4random.c' || echo '$(srcdir)/'`random_arc4random.c + +libtestpat_la-random_arc4random_buf.lo: random_arc4random_buf.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libtestpat_la-random_arc4random_buf.lo -MD -MP -MF $(DEPDIR)/libtestpat_la-random_arc4random_buf.Tpo -c -o libtestpat_la-random_arc4random_buf.lo `test -f 'random_arc4random_buf.c' || echo '$(srcdir)/'`random_arc4random_buf.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtestpat_la-random_arc4random_buf.Tpo $(DEPDIR)/libtestpat_la-random_arc4random_buf.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='random_arc4random_buf.c' object='libtestpat_la-random_arc4random_buf.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libtestpat_la-random_arc4random_buf.lo `test -f 'random_arc4random_buf.c' || echo '$(srcdir)/'`random_arc4random_buf.c + +libtestpat_la-random_dev_urandom.lo: random_dev_urandom.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libtestpat_la-random_dev_urandom.lo -MD -MP -MF $(DEPDIR)/libtestpat_la-random_dev_urandom.Tpo -c -o libtestpat_la-random_dev_urandom.lo `test -f 'random_dev_urandom.c' || echo '$(srcdir)/'`random_dev_urandom.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtestpat_la-random_dev_urandom.Tpo $(DEPDIR)/libtestpat_la-random_dev_urandom.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='random_dev_urandom.c' object='libtestpat_la-random_dev_urandom.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libtestpat_la-random_dev_urandom.lo `test -f 'random_dev_urandom.c' || echo '$(srcdir)/'`random_dev_urandom.c + +libtestpat_la-random_getentropy.lo: random_getentropy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libtestpat_la-random_getentropy.lo -MD -MP -MF $(DEPDIR)/libtestpat_la-random_getentropy.Tpo -c -o libtestpat_la-random_getentropy.lo `test -f 'random_getentropy.c' || echo '$(srcdir)/'`random_getentropy.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtestpat_la-random_getentropy.Tpo $(DEPDIR)/libtestpat_la-random_getentropy.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='random_getentropy.c' object='libtestpat_la-random_getentropy.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libtestpat_la-random_getentropy.lo `test -f 'random_getentropy.c' || echo '$(srcdir)/'`random_getentropy.c + +libtestpat_la-random_getrandom.lo: random_getrandom.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libtestpat_la-random_getrandom.lo -MD -MP -MF $(DEPDIR)/libtestpat_la-random_getrandom.Tpo -c -o libtestpat_la-random_getrandom.lo `test -f 'random_getrandom.c' || echo '$(srcdir)/'`random_getrandom.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtestpat_la-random_getrandom.Tpo $(DEPDIR)/libtestpat_la-random_getrandom.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='random_getrandom.c' object='libtestpat_la-random_getrandom.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libtestpat_la-random_getrandom.lo `test -f 'random_getrandom.c' || echo '$(srcdir)/'`random_getrandom.c + +libtestpat_la-random_rand_s.lo: random_rand_s.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libtestpat_la-random_rand_s.lo -MD -MP -MF $(DEPDIR)/libtestpat_la-random_rand_s.Tpo -c -o libtestpat_la-random_rand_s.lo `test -f 'random_rand_s.c' || echo '$(srcdir)/'`random_rand_s.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtestpat_la-random_rand_s.Tpo $(DEPDIR)/libtestpat_la-random_rand_s.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='random_rand_s.c' object='libtestpat_la-random_rand_s.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libtestpat_la-random_rand_s.lo `test -f 'random_rand_s.c' || echo '$(srcdir)/'`random_rand_s.c + mostlyclean-libtool: -rm -f *.lo @@ -779,9 +897,21 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -f ./$(DEPDIR)/libtestpat_la-random_arc4random.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_arc4random_buf.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_dev_urandom.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_getentropy.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_getrandom.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_rand_s.Plo -rm -f ./$(DEPDIR)/libtestpat_la-xmlparse.Plo -rm -f ./$(DEPDIR)/libtestpat_la-xmlrole.Plo -rm -f ./$(DEPDIR)/libtestpat_la-xmltok.Plo + -rm -f ./$(DEPDIR)/random_arc4random.Plo + -rm -f ./$(DEPDIR)/random_arc4random_buf.Plo + -rm -f ./$(DEPDIR)/random_dev_urandom.Plo + -rm -f ./$(DEPDIR)/random_getentropy.Plo + -rm -f ./$(DEPDIR)/random_getrandom.Plo + -rm -f ./$(DEPDIR)/random_rand_s.Plo -rm -f ./$(DEPDIR)/xmlparse.Plo -rm -f ./$(DEPDIR)/xmlrole.Plo -rm -f ./$(DEPDIR)/xmltok.Plo @@ -831,9 +961,21 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/libtestpat_la-random_arc4random.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_arc4random_buf.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_dev_urandom.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_getentropy.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_getrandom.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_rand_s.Plo -rm -f ./$(DEPDIR)/libtestpat_la-xmlparse.Plo -rm -f ./$(DEPDIR)/libtestpat_la-xmlrole.Plo -rm -f ./$(DEPDIR)/libtestpat_la-xmltok.Plo + -rm -f ./$(DEPDIR)/random_arc4random.Plo + -rm -f ./$(DEPDIR)/random_arc4random_buf.Plo + -rm -f ./$(DEPDIR)/random_dev_urandom.Plo + -rm -f ./$(DEPDIR)/random_getentropy.Plo + -rm -f ./$(DEPDIR)/random_getrandom.Plo + -rm -f ./$(DEPDIR)/random_rand_s.Plo -rm -f ./$(DEPDIR)/xmlparse.Plo -rm -f ./$(DEPDIR)/xmlrole.Plo -rm -f ./$(DEPDIR)/xmltok.Plo diff --git a/contrib/expat/lib/expat.h b/contrib/expat/lib/expat.h index 18dbaebde293..79c609f19aa4 100644 --- a/contrib/expat/lib/expat.h +++ b/contrib/expat/lib/expat.h @@ -45,6 +45,7 @@ #ifndef Expat_INCLUDED # define Expat_INCLUDED 1 +# include // for uint8_t # include # include "expat_external.h" @@ -917,10 +918,21 @@ XML_SetParamEntityParsing(XML_Parser parser, function behavior. This must be called before parsing is started. Returns 1 if successful, 0 when called after parsing has started. Note: If parser == NULL, the function will do nothing and return 0. + DEPRECATED since Expat 2.8.0. */ XMLPARSEAPI(int) XML_SetHashSalt(XML_Parser parser, unsigned long hash_salt); +/* Sets the hash salt to use for internal hash calculations. + Helps in preventing DoS attacks based on predicting hash function behavior. + This must be called before parsing is started. + Returns XML_TRUE if successful, XML_FALSE when called after parsing has + started or when parser is NULL. + Added in Expat 2.8.0. +*/ +XMLPARSEAPI(XML_Bool) +XML_SetHashSalt16Bytes(XML_Parser parser, const uint8_t entropy[16]); + /* If XML_Parse or XML_ParseBuffer have returned XML_STATUS_ERROR, then XML_GetErrorCode returns information about the error. */ @@ -1081,8 +1093,8 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled); See https://semver.org */ # define XML_MAJOR_VERSION 2 -# define XML_MINOR_VERSION 7 -# define XML_MICRO_VERSION 5 +# define XML_MINOR_VERSION 8 +# define XML_MICRO_VERSION 0 # ifdef __cplusplus } diff --git a/contrib/expat/lib/expat_external.h b/contrib/expat/lib/expat_external.h index d9ddeb612f6d..7f5c4c3aae4d 100644 --- a/contrib/expat/lib/expat_external.h +++ b/contrib/expat/lib/expat_external.h @@ -12,9 +12,10 @@ Copyright (c) 2001-2002 Greg Stein Copyright (c) 2002-2006 Karl Waclawek Copyright (c) 2016 Cristian Rodríguez - Copyright (c) 2016-2026 Sebastian Pipping + Copyright (c) 2016-2025 Sebastian Pipping Copyright (c) 2017 Rhodri James Copyright (c) 2018 Yury Gribov + Copyright (c) 2026 Matthew Fernandez Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining @@ -45,7 +46,7 @@ /* Expat tries very hard to make the API boundary very specifically defined. There are two macros defined to control this boundary; each of these can be defined before including this header to - achieve some different behavior, but doing so it not recommended or + achieve some different behavior, but doing so is not recommended or tested frequently. XMLCALL - The calling convention to use for all calls across the diff --git a/contrib/expat/lib/internal.h b/contrib/expat/lib/internal.h index 61266ebb7723..420d4217a569 100644 --- a/contrib/expat/lib/internal.h +++ b/contrib/expat/lib/internal.h @@ -28,7 +28,7 @@ Copyright (c) 2002-2003 Fred L. Drake, Jr. Copyright (c) 2002-2006 Karl Waclawek Copyright (c) 2003 Greg Stein - Copyright (c) 2016-2025 Sebastian Pipping + Copyright (c) 2016-2026 Sebastian Pipping Copyright (c) 2018 Yury Gribov Copyright (c) 2019 David Loffredo Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow @@ -113,6 +113,7 @@ #if defined(_WIN32) \ && (! defined(__USE_MINGW_ANSI_STDIO) \ || (1 - __USE_MINGW_ANSI_STDIO - 1 == 0)) +# define EXPAT_FMT_LLX(midpart) "%" midpart "I64x" # define EXPAT_FMT_ULL(midpart) "%" midpart "I64u" # if defined(_WIN64) // Note: modifiers "td" and "zu" do not work for MinGW # define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "I64d" @@ -122,6 +123,7 @@ # define EXPAT_FMT_SIZE_T(midpart) "%" midpart "u" # endif #else +# define EXPAT_FMT_LLX(midpart) "%" midpart "llx" # define EXPAT_FMT_ULL(midpart) "%" midpart "llu" # if ! defined(ULONG_MAX) # error Compiler did not define ULONG_MAX for us diff --git a/contrib/expat/lib/libexpat.map.in b/contrib/expat/lib/libexpat.map.in index 52e59ed3d931..71a6758fd746 100644 --- a/contrib/expat/lib/libexpat.map.in +++ b/contrib/expat/lib/libexpat.map.in @@ -117,3 +117,8 @@ LIBEXPAT_2.7.2 { @_EXPAT_COMMENT_DTD_OR_GE@ XML_SetAllocTrackerActivationThreshold; @_EXPAT_COMMENT_DTD_OR_GE@ XML_SetAllocTrackerMaximumAmplification; } LIBEXPAT_2.6.0; + +LIBEXPAT_2.8.0 { + global: + XML_SetHashSalt16Bytes; +} LIBEXPAT_2.7.2; diff --git a/contrib/expat/lib/random_arc4random.c b/contrib/expat/lib/random_arc4random.c new file mode 100644 index 000000000000..243fbbc82fda --- /dev/null +++ b/contrib/expat/lib/random_arc4random.c @@ -0,0 +1,56 @@ +/* + __ __ _ + ___\ \/ /_ __ __ _| |_ + / _ \\ /| '_ \ / _` | __| + | __// \| |_) | (_| | |_ + \___/_/\_\ .__/ \__,_|\__| + |_| XML parser + + Copyright (c) 2017-2026 Sebastian Pipping + Copyright (c) 2026 Matthew Fernandez + Licensed under the MIT license: + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to permit + persons to whom the Software is furnished to do so, subject to the + following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN + NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +#include "random_arc4random.h" + +#if ! defined(_DEFAULT_SOURCE) +# define _DEFAULT_SOURCE 1 /* for glibc */ +#endif + +#include // for uint32_t +#include // for arc4random *** 2045 LINES SKIPPED *** From nobody Mon May 4 06:47:42 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8BzL2nNCz6cjFp for ; Mon, 04 May 2026 06:47: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 4g8BzL1kNGz3FXq for ; Mon, 04 May 2026 06:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777877262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8B/1fLzI4i2eG08/RmnNwdW4UnIQsptVfadrUZrC/2Y=; b=BeIZUiWQAm+6klbGUMpjU0bZbjh/zeofIUzGezEK1LExZ3VhlmHOsMEZ8yRzNpULn7/o4K OBZ/D7qU72rWXI7i8xYmd7mwwsrf3OwqNmF8vHPfLd7MUeKvb1/AfuSqsAKTTCTCjVUSm3 vMwt8M7V6aNs2Tt40xbnCHhd/2rDwFku2UgXeloqrpoH1zZr/4xyogZxxM7W6Wx/nymdsY Rgb/h483tEkjW30crH7X43GCsNsda43Jp7exg371uJeP8gcMU4uZ4O1+79E7OP4rG11S9K BiTRSY0KcGm9dGzu34Oj1GZiOw+K6/gaHpwz+bt7vqD1yQGPidzsa6ytLIoO4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777877262; a=rsa-sha256; cv=none; b=su0Opzyvef1hPoLZeWOfa8nBSRw5XTeOOaK3GG5C4dKW2XgRV7SaTbYXi47juZk6QEo3/g 5srVluyi+hduDYIdS2OKpdvnHXZTZHjYxEs/PW321jvnnPgmwg3H1ut1qEcWxI0a0Wh2qN GMmUkOE9rxpCe48fQbKWuXiVFc3svIwkraNFFYWyLx5VWF9kZ8YGSVKXFefrXm/JEKBTdb ZKk4Hk9V4T45jHk6qgjJEzNSuOjc+vWHQ8saXuYjeQB+dgj1TKU+Aw2D5M7q/s/N/pxade tvQ9B1ErMEPjwb2nIuJq9pXJKXsxWQlYzyYKRmHgEcZcvGcyS5WGwOnZL2OVQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777877262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8B/1fLzI4i2eG08/RmnNwdW4UnIQsptVfadrUZrC/2Y=; b=x7ESyItox3487dQ83/RSU1Z9JZIF5GZTi+kNrptcTUptWwCdzuZrg2w/xzKEsOPhgcDQ3J wASQX6zcmpWTYcb3Hg/m79zaOoOAFgYvbtZmwPGhBmwp6/RiR4uOm3683oETJ6wqD3ORrD oAqDylldZUB0dR5clkuVhBQuH8IA+9SAyWDLv8Yjz49BVyK2FC3ZEwsPxmB2qE0GZ2Fria FmuHECLw10QGfR0PPjBb3a+gBoU8JaK7vqkC0shU5u+adhrbROQhPnBZvftckpQb0WArRP 37R93YFV0M1BVN7/l1V/+Lu4it7Uf5nGkieHbTr3dkBDQ+1Fqyr6Esy3GLhWQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8BzL1GQHz17Mm for ; Mon, 04 May 2026 06:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e8a3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 06:47:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: c082fc0be153 - stable/15 - msun/math.3: reference new functions f{max,min}imum{,_num,_mag}() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: c082fc0be1538261569c4d05eb69914fa51f8691 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 06:47:42 +0000 Message-Id: <69f8410e.3e8a3.5537618f@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=c082fc0be1538261569c4d05eb69914fa51f8691 commit c082fc0be1538261569c4d05eb69914fa51f8691 Author: Robert Clausecker AuthorDate: 2026-03-31 16:55:11 +0000 Commit: Robert Clausecker CommitDate: 2026-05-04 06:40:11 +0000 msun/math.3: reference new functions f{max,min}imum{,_num,_mag}() See also: D55834, D56236 MFC after: 1 month (cherry picked from commit 47ca491ca425d0d3d8e2a8a3cac40d6565d8ab6a) --- lib/msun/man/math.3 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/msun/man/math.3 b/lib/msun/man/math.3 index 47353298bb54..f98c5e1a2a75 100644 --- a/lib/msun/man/math.3 +++ b/lib/msun/man/math.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 7, 2017 +.Dd April 11, 2026 .Dt MATH 3 .Os .Sh NAME @@ -115,8 +115,14 @@ scalbn adjust exponent copysign copy sign bit fabs absolute value fdim positive difference -fmax maximum function -fmin minimum function +fmax maximum function (legacy) +fmaximum maximum function (prefers \*(Na) +fmaximum_mag maximum magnitude (prefers \*(Na) +fmaximum_num maximum function (avoids \*(Na) +fmin minimum function (legacy) +fminimum minimum function (prefers \*(Na) +fminimum_mag minimum magnitude (prefers \*(Na) +fminimum_num minimum function (avoids \*(Na) signbit extract sign bit .El .Ss Not a Number Functions From nobody Mon May 4 06:47:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8BzK2WDfz6cjNP for ; Mon, 04 May 2026 06:47: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 4g8BzK1YnRz3FXp for ; Mon, 04 May 2026 06:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777877261; 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=c8VRNdl3nSFLIcCGquTkLKsp5RasjTGpHhjZtcTTbhc=; b=FZXKAbUeJidQItR6XgOWRaXPUkhGePp3Riy6eB8qJm0CMaxWGPz3UEC3VfB+WMUti4a8CB y9CIYcwH+r+vCUt812P8cjgFmgs3M9D28fnnd8isMg3NbjXSN0ywqaO364LcarrwRjBbhc jDAOZ+3HnVac2TmYR9A4/mWoUBmaF6maRS0NvHkT4nzcgGOe7cjbdDOzwfPIjSc9ZnG52W QuMc7OeoUSyQTWuEyrY8EuvCoHW5U9Ohh+xuv3MZc6elqZE6etxVNIAhQYqtsCiyQydwwU +rUBoxiwCgtw42CVHONPTD5G/usuT9oDiLI9LS49eDuJLIRwHizmXNsMZkccBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777877261; a=rsa-sha256; cv=none; b=YFkMJ+uZd4bUnUErlPqhAmC3NvuLM8sCnBZ+7/qtrAgqGntOlW16nW27NfRfjI8T8EKMcY tvmrpBhFMxFSl3/QqDqDjb+nR58p0xEoXQEP/qXcw0gDDLRDkGtEv0eoNbFB1MJdElkUGY iDq5CFOoAJhwab5k9zdyaEeTNfewzG9N13Rb1RIIhw9xrwMDBCdam/Qf93GEnaKdjWUM0z 8+UIEFS+Y5LFn8WUbJJXhIMHPNvVrifvVL8TMA2k+jcsvaI5LHURuMP0GhYVAvT3KkX7ty jSaP2/b2U+0OBUsc3pwu68lG4S9ts3+wyemlMdm6jwV2SV1bHipKPRCuBmbuWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777877261; 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=c8VRNdl3nSFLIcCGquTkLKsp5RasjTGpHhjZtcTTbhc=; b=ww0o/eQK4k1xBpAcpBun5Qv5k1pnqw/aVtVIZJC2wQjg8e4cEcJwEV6dC0dUMyig6s6QMl MkkfBS4XhDUoPqEWejl9u4dvfq/d4u/ZJWaegK3fyiVBjTZviv0Y2f3p8aCRF1VMZ8BXfm 6qfZYkoWGA3teo9rZqhSrYexWmAvKhJgCtni37RBtO/oEflGh9GXHqqp1daezzAAkAavXq tslBQtc+5WN4KCftr86ytL2oJIpsImRUkJ9CIidP1IPpxB0PKsehqW05gZKf9QWIMmBLrr Nd6mZgX0VFkfdHQVGnynCvvfqYn0GrIacXdySZ7amtaRDxRcUidBLm2WKtFBmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8BzK0T9Lz17Gp for ; Mon, 04 May 2026 06:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e183 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 06:47:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: =?utf-8?Q?Jes=C3=BAs?= =?utf-8?Q?Bl=C3=A1zqu?=ez From: Robert Clausecker Subject: git: 0073b3d572af - stable/15 - lib/msun: Added fmaximum_mag and fmaximum_num families List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 0073b3d572af124ba453a39e3229d97b8bd5ab02 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 06:47:41 +0000 Message-Id: <69f8410d.3e183.1cf6f136@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=0073b3d572af124ba453a39e3229d97b8bd5ab02 commit 0073b3d572af124ba453a39e3229d97b8bd5ab02 Author: Jesús Blázquez AuthorDate: 2026-04-11 08:11:44 +0000 Commit: Robert Clausecker CommitDate: 2026-05-04 06:40:11 +0000 lib/msun: Added fmaximum_mag and fmaximum_num families Added support for the f{maximum,minimum}_{mag,num} families, the new C23 standard functions for maximum magnitude and number-preferring maximum. This includes modifying fmax.3, on top of D56230, to recommend the use of fmaximum_num and fminimum_num. Reviewed by: fuz, kargl MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D56236 (cherry picked from commit 4e30c12973c73539bef01be3870a90b6346141e8) --- lib/msun/Makefile | 16 ++++- lib/msun/Symbol.map | 12 ++++ lib/msun/man/fmax.3 | 9 ++- lib/msun/man/fmaximum.3 | 4 +- lib/msun/man/fmaximum_mag.3 | 102 ++++++++++++++++++++++++++++ lib/msun/man/fmaximum_num.3 | 113 ++++++++++++++++++++++++++++++++ lib/msun/src/math.h | 12 ++++ lib/msun/src/s_fmaximum_mag.c | 73 +++++++++++++++++++++ lib/msun/src/s_fmaximum_magf.c | 68 +++++++++++++++++++ lib/msun/src/s_fmaximum_magl.c | 62 ++++++++++++++++++ lib/msun/src/s_fmaximum_num.c | 74 +++++++++++++++++++++ lib/msun/src/s_fmaximum_numf.c | 70 ++++++++++++++++++++ lib/msun/src/s_fmaximum_numl.c | 63 ++++++++++++++++++ lib/msun/src/s_fminimum.c | 2 +- lib/msun/src/s_fminimum_mag.c | 74 +++++++++++++++++++++ lib/msun/src/s_fminimum_magf.c | 69 +++++++++++++++++++ lib/msun/src/s_fminimum_magl.c | 63 ++++++++++++++++++ lib/msun/src/s_fminimum_num.c | 76 +++++++++++++++++++++ lib/msun/src/s_fminimum_numf.c | 71 ++++++++++++++++++++ lib/msun/src/s_fminimum_numl.c | 65 ++++++++++++++++++ lib/msun/src/s_fminimumf.c | 2 +- lib/msun/src/s_fminimuml.c | 2 +- lib/msun/tests/fmaximum_fminimum_test.c | 78 +++++++++++++++++++++- 23 files changed, 1169 insertions(+), 11 deletions(-) diff --git a/lib/msun/Makefile b/lib/msun/Makefile index 4a0ff1ad92b6..d61f4e9a1659 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -76,7 +76,9 @@ COMMON_SRCS= b_tgamma.c \ s_finite.c s_finitef.c \ s_floor.c s_floorf.c s_fma.c s_fmaf.c \ s_fmax.c s_fmaxf.c s_fmaximum.c s_fmaximumf.c \ + s_fmaximum_mag.c s_fmaximum_magf.c s_fmaximum_num.c s_fmaximum_numf.c \ s_fmin.c s_fminf.c s_fminimum.c s_fminimumf.c \ + s_fminimum_mag.c s_fminimum_magf.c s_fminimum_num.c s_fminimum_numf.c \ s_frexp.c s_frexpf.c s_ilogb.c s_ilogbf.c \ s_ilogbl.c s_isfinite.c s_isnan.c s_isnormal.c \ s_llrint.c s_llrintf.c s_llround.c s_llroundf.c s_llroundl.c \ @@ -133,7 +135,8 @@ COMMON_SRCS+= b_tgammal.c catrigl.c \ s_asinhl.c s_atanl.c s_cbrtl.c s_ceill.c s_cexpl.c \ s_clogl.c s_cosl.c s_cospil.c s_cprojl.c \ s_csqrtl.c s_erfl.c s_exp2l.c s_expl.c s_floorl.c s_fmal.c \ - s_fmaxl.c s_fmaximuml.c s_fminl.c s_fminimuml.c \ + s_fmaxl.c s_fmaximuml.c s_fmaximum_magl.c s_fmaximum_numl.c \ + s_fminl.c s_fminimuml.c s_fminimum_magl.c s_fminimum_numl.c \ s_frexpl.c s_logbl.c s_logl.c s_nanl.c \ s_nextafterl.c s_nexttoward.c s_remquol.c s_rintl.c s_roundl.c \ s_scalbnl.c s_sinl.c s_sincosl.c s_sinpil.c \ @@ -179,7 +182,8 @@ MAN= acos.3 acosh.3 asin.3 asinh.3 atan.3 atan2.3 atanh.3 \ exp.3 fabs.3 fdim.3 \ feclearexcept.3 feenableexcept.3 fegetenv.3 \ fegetround.3 fenv.3 floor.3 fma.3 \ - fmax.3 fmaximum.3 fmod.3 hypot.3 ieee.3 ieee_test.3 ilogb.3 j0.3 \ + fmax.3 fmaximum.3 fmaximum_mag.3 fmaximum_num.3 fmod.3 \ + hypot.3 ieee.3 ieee_test.3 ilogb.3 j0.3 \ lgamma.3 log.3 lrint.3 lround.3 math.3 nan.3 \ nextafter.3 remainder.3 rint.3 \ round.3 scalbn.3 signbit.3 sin.3 sincos.3 \ @@ -232,9 +236,15 @@ MLINKS+=floor.3 floorf.3 floor.3 floorl.3 MLINKS+=fma.3 fmaf.3 fma.3 fmal.3 MLINKS+=fmax.3 fmaxf.3 fmax.3 fmaxl.3 \ fmax.3 fmin.3 fmax.3 fminf.3 fmax.3 fminl.3 -MLINKS+=fmaximum.3 fmaximuml.3 fmaximum.3 fmaximumf.3 \ +MLINKS+=fmaximum.3 fmaximumf.3 fmaximum.3 fmaximuml.3 \ fmaximum.3 fminimum.3 fmaximum.3 fminimumf.3 \ fmaximum.3 fminimuml.3 +MLINKS+=fmaximum_mag.3 fmaximum_magf.3 fmaximum_mag.3 fmaximum_magl.3 \ + fmaximum_mag.3 fminimum_mag.3 fmaximum_mag.3 fminimum_magf.3 \ + fmaximum_mag.3 fminimum_magl.3 +MLINKS+=fmaximum_num.3 fmaximum_numf.3 fmaximum_num.3 fmaximum_numl.3 \ + fmaximum_num.3 fminimum_num.3 fmaximum_num.3 fminimum_numf.3 \ + fmaximum_num.3 fminimum_numl.3 MLINKS+=fmod.3 fmodf.3 fmod.3 fmodl.3 MLINKS+=hypot.3 cabs.3 hypot.3 cabsf.3 hypot.3 cabsl.3 \ hypot.3 hypotf.3 hypot.3 hypotl.3 diff --git a/lib/msun/Symbol.map b/lib/msun/Symbol.map index 932cc000fe52..35addfcee3d5 100644 --- a/lib/msun/Symbol.map +++ b/lib/msun/Symbol.map @@ -326,4 +326,16 @@ FBSD_1.9 { fminimum; fminimumf; fminimuml; + fmaximum_mag; + fmaximum_magf; + fmaximum_magl; + fminimum_mag; + fminimum_magf; + fminimum_magl; + fmaximum_num; + fmaximum_numf; + fmaximum_numl; + fminimum_num; + fminimum_numf; + fminimum_numl; }; diff --git a/lib/msun/man/fmax.3 b/lib/msun/man/fmax.3 index 873a19375ce5..3b167a0b6f8d 100644 --- a/lib/msun/man/fmax.3 +++ b/lib/msun/man/fmax.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 6, 2026 +.Dd April 11, 2026 .Dt FMAX 3 .Os .Sh NAME @@ -93,6 +93,13 @@ as being larger than .Li -0.0 . This behavior is not specified by the C standard, is not portable, and may not occur in light of compiler optimizations. +Applications requiring specific handling of signed zeroes or +.No \*(Na +values are recommended to use +.Xr fmaximum_num 3 +and +.Xr fminimum_num 3 +instead, which have strictly defined behavior for these cases. .Sh HISTORY These routines first appeared in .Fx 5.3 . diff --git a/lib/msun/man/fmaximum.3 b/lib/msun/man/fmaximum.3 index bd301163a034..ef26c12268c0 100644 --- a/lib/msun/man/fmaximum.3 +++ b/lib/msun/man/fmaximum.3 @@ -83,9 +83,9 @@ or is an \*(Na, then the result is an \*(Na. These routines do not raise any floating-point exceptions. .Sh SEE ALSO -.Xr fabs 3 , -.Xr fdim 3 , .Xr fmax 3 , +.Xr fmaximum_num 3 , +.Xr fmaximum_mag 3 , .Xr math 3 .Sh STANDARDS The diff --git a/lib/msun/man/fmaximum_mag.3 b/lib/msun/man/fmaximum_mag.3 new file mode 100644 index 000000000000..f5e4c39f96ef --- /dev/null +++ b/lib/msun/man/fmaximum_mag.3 @@ -0,0 +1,102 @@ +.\" Copyright (c) 2004 David Schultz +.\" Copyright (c) 2026 Jesús Blázquez +.\" 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 3, 2026 +.Dt FMAXIMUM_MAG 3 +.Os +.Sh NAME +.Nm fmaximum_mag , +.Nm fmaximum_magf , +.Nm fmaximum_magl , +.Nm fminimum_mag , +.Nm fminimum_magf , +.Nm fminimum_magl +.Nd floating-point maximum and minimum magnitude functions +.Sh LIBRARY +.Lb libm +.Sh SYNOPSIS +.In math.h +.Ft double +.Fn fmaximum_mag "double x" "double y" +.Ft float +.Fn fmaximum_magf "float x" "float y" +.Ft "long double" +.Fn fmaximum_magl "long double x" "long double y" +.Ft double +.Fn fminimum_mag "double x" "double y" +.Ft float +.Fn fminimum_magf "float x" "float y" +.Ft "long double" +.Fn fminimum_magl "long double x" "long double y" +.Sh DESCRIPTION +The +.Fn fmaximum_mag , +.Fn fmaximum_magf , +and +.Fn fmaximum_magl +functions determine the larger of the absolute values of +.Fa x +and +.Fa y , +and return the argument with the larger absolute value. +If the absolute values are equal, the behavior is equivalent to calling the corresponding +.Fn fmaximum +function on the arguments. +.Pp +Likewise, the +.Fn fminimum_mag , +.Fn fminimum_magf , +and +.Fn fminimum_magl +functions determine the smaller of the absolute values of +.Fa x +and +.Fa y , +and return the argument with the smaller absolute value. +If the absolute values are equal, the behavior is equivalent to calling the corresponding +.Fn fminimum +function on the arguments. +.Pp +If either argument is an \*(Na, then the result is an \*(Na. +These routines do not raise any floating-point exceptions. +.Sh SEE ALSO +.Xr fmax 3 , +.Xr fmaximum 3 , +.Xr fmaximum_num 3 , +.Xr math 3 +.Sh STANDARDS +The +.Fn fmaximum_mag , +.Fn fmaximum_magf , +.Fn fmaximum_magl , +.Fn fminimum_mag , +.Fn fminimum_magf , +and +.Fn fminimum_magl +functions conform to +.St -isoC-2023 . +.Sh HISTORY +These routines first appeared in +.Fx 16.0 . diff --git a/lib/msun/man/fmaximum_num.3 b/lib/msun/man/fmaximum_num.3 new file mode 100644 index 000000000000..33fa759f0173 --- /dev/null +++ b/lib/msun/man/fmaximum_num.3 @@ -0,0 +1,113 @@ +.\" Copyright (c) 2004 David Schultz +.\" Copyright (c) 2026 Jesús Blázquez +.\" 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 3, 2026 +.Dt FMAXIMUM_NUM 3 +.Os +.Sh NAME +.Nm fmaximum_num , +.Nm fmaximum_numf , +.Nm fmaximum_numl , +.Nm fminimum_num , +.Nm fminimum_numf , +.Nm fminimum_numl +.Nd floating-point maximum and minimum number functions +.Sh LIBRARY +.Lb libm +.Sh SYNOPSIS +.In math.h +.Ft double +.Fn fmaximum_num "double x" "double y" +.Ft float +.Fn fmaximum_numf "float x" "float y" +.Ft "long double" +.Fn fmaximum_numl "long double x" "long double y" +.Ft double +.Fn fminimum_num "double x" "double y" +.Ft float +.Fn fminimum_numf "float x" "float y" +.Ft "long double" +.Fn fminimum_numl "long double x" "long double y" +.Sh DESCRIPTION +The +.Fn fmaximum_num , +.Fn fmaximum_numf , +and +.Fn fmaximum_numl +functions determine the larger of +.Fa x +and +.Fa y , +preferring a numeric value over an \*(Na. +If one argument is a numeric value and the other is an \*(Na, +the numeric value is returned. +If both arguments are numeric, the larger value is returned. +If both arguments are \*(Nas, a quiet \*(Na is returned. +For the purpose of these functions, positive zero is considered +greater than negative zero. +.Pp +Likewise, the +.Fn fminimum_num , +.Fn fminimum_numf , +and +.Fn fminimum_numl +functions determine the smaller of +.Fa x +and +.Fa y , +preferring a numeric value over an \*(Na. +If one argument is a numeric value and the other is an \*(Na, +the numeric value is returned. +If both arguments are numeric, the smaller value is returned. +If both arguments are \*(Nas, a quiet \*(Na is returned. +For the purpose of these functions, negative zero is considered +less than positive zero. +.Pp +Unlike with the +.Xr fmaximum 3 +and +.Xr fmaximum_mag 3 +families of functions, if either argument is a signaling \*(Na, +an invalid exception is raised. +Otherwise, these routines do not raise any floating-point exceptions. +.Sh SEE ALSO +.Xr fmax 3 , +.Xr fmaximum 3 , +.Xr fmaximum_mag 3 , +.Xr math 3 +.Sh STANDARDS +The +.Fn fmaximum_num , +.Fn fmaximum_numf , +.Fn fmaximum_numl , +.Fn fminimum_num , +.Fn fminimum_numf , +and +.Fn fminimum_numl +functions conform to +.St -isoC-2023 . +.Sh HISTORY +These routines first appeared in +.Fx 16.0 . diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h index 103b82c1cdf8..853984953a91 100644 --- a/lib/msun/src/math.h +++ b/lib/msun/src/math.h @@ -526,6 +526,18 @@ long double fmaximuml(long double, long double); double fminimum(double, double); float fminimumf(float, float); long double fminimuml(long double, long double); +double fmaximum_mag(double, double); +float fmaximum_magf(float, float); +long double fmaximum_magl(long double, long double); +double fminimum_mag(double, double); +float fminimum_magf(float, float); +long double fminimum_magl(long double, long double); +double fmaximum_num(double, double); +float fmaximum_numf(float, float); +long double fmaximum_numl(long double, long double); +double fminimum_num(double, double); +float fminimum_numf(float, float); +long double fminimum_numl(long double, long double); #endif /* __ISO_C_VISIBLE >= 2023 */ __END_DECLS diff --git a/lib/msun/src/s_fmaximum_mag.c b/lib/msun/src/s_fmaximum_mag.c new file mode 100644 index 000000000000..1b1250f4c36e --- /dev/null +++ b/lib/msun/src/s_fmaximum_mag.c @@ -0,0 +1,73 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2004 David Schultz + * 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. + */ + +#include +#include + +#include "fpmath.h" + +#ifdef USE_BUILTIN_FMAXIMUM_MAG +double +fmaximum_mag(double x, double y) +{ + return (__builtin_fmaximum_mag(x, y)); +} +#else +double +fmaximum_mag(double x, double y) +{ + union IEEEd2bits u[2]; + + u[0].d = x; + u[1].d = y; + + /* Handle NaN according to ISO/IEC 60559. NaN argument -> NaN return */ + if ((u[0].bits.exp == 2047 && (u[0].bits.manh | u[0].bits.manl) != 0) || + (u[1].bits.exp == 2047 && (u[1].bits.manh | u[1].bits.manl) != 0)) + return (NAN); + + double ax = fabs(x); + double ay = fabs(y); + + if (ay > ax) + return (y); + if (ax > ay) + return (x); + + /* If magnitudes are equal, we break the tie with the sign */ + if (u[0].bits.sign != u[1].bits.sign) + return (u[u[0].bits.sign].d); + + return (x); +} +#endif + +#if (LDBL_MANT_DIG == 53) +__weak_reference(fmaximum_mag, fmaximum_magl); +#endif + diff --git a/lib/msun/src/s_fmaximum_magf.c b/lib/msun/src/s_fmaximum_magf.c new file mode 100644 index 000000000000..6193b9184970 --- /dev/null +++ b/lib/msun/src/s_fmaximum_magf.c @@ -0,0 +1,68 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2004 David Schultz + * 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. + */ + +#include + +#include "fpmath.h" + +#ifdef USE_BUILTIN_FMAXIMUM_MAGF +float +fmaximum_magf(float x, float y) +{ + return (__builtin_fmaximum_magf(x, y)); +} +#else +float +fmaximum_magf(float x, float y) +{ + union IEEEf2bits u[2]; + + u[0].f = x; + u[1].f = y; + + /* Handle NaN according to ISO/IEC 60559. NaN argument -> NaN return */ + if ((u[0].bits.exp == 255 && u[0].bits.man != 0) || + (u[1].bits.exp == 255 && u[1].bits.man != 0)) + return (NAN); + + float ax = fabsf(x); + float ay = fabsf(y); + + if (ay > ax) + return (y); + if (ax > ay) + return (x); + + /* If magnitudes are equal, we break the tie with the sign */ + if (u[0].bits.sign != u[1].bits.sign) + return (u[u[0].bits.sign].f); + + return (x); +} +#endif + diff --git a/lib/msun/src/s_fmaximum_magl.c b/lib/msun/src/s_fmaximum_magl.c new file mode 100644 index 000000000000..f2426b050d33 --- /dev/null +++ b/lib/msun/src/s_fmaximum_magl.c @@ -0,0 +1,62 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2004 David Schultz + * 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. + */ + +#include + +#include "fpmath.h" + +long double +fmaximum_magl(long double x, long double y) +{ + union IEEEl2bits u[2]; + + u[0].e = x; + mask_nbit_l(u[0]); + u[1].e = y; + mask_nbit_l(u[1]); + + /* Handle NaN according to ISO/IEC 60559. NaN argument -> NaN return */ + if ((u[0].bits.exp == 32767 && (u[0].bits.manh | u[0].bits.manl) != 0) || + (u[1].bits.exp == 32767 && (u[1].bits.manh | u[1].bits.manl) != 0)) + return (NAN); + + long double ax = fabsl(x); + long double ay = fabsl(y); + + if (ay > ax) + return (y); + if (ax > ay) + return (x); + + /* If magnitudes are equal, we break the tie with the sign */ + if (u[0].bits.sign != u[1].bits.sign) + return (u[0].bits.sign ? y : x); + + return (x); +} + diff --git a/lib/msun/src/s_fmaximum_num.c b/lib/msun/src/s_fmaximum_num.c new file mode 100644 index 000000000000..cf16c76f89b9 --- /dev/null +++ b/lib/msun/src/s_fmaximum_num.c @@ -0,0 +1,74 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2004 David Schultz + * Copyright (c) 2026 Jesús Blázquez + * 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. + */ + +#include +#include +#include + +#include "fpmath.h" + +#ifdef USE_BUILTIN_FMAXIMUM_NUM +double +fmaximum_num(double x, double y) +{ + return (__builtin_fmaximum_num(x, y)); +} +#else +double +fmaximum_num(double x, double y) +{ + union IEEEd2bits u[2]; + bool nan_x, nan_y; + + u[0].d = x; + u[1].d = y; + + nan_x = u[0].bits.exp == 2047 && (u[0].bits.manh | u[0].bits.manl) != 0; + nan_y = u[1].bits.exp == 2047 && (u[1].bits.manh | u[1].bits.manl) != 0; + + if (nan_x || nan_y) { + /* These ternary conditionals force (x+y), so that sNaN's raise exceptions */ + if (nan_x && nan_y) + return (x + y); + if (nan_x) + return ((x + y) != 0.0 ? y : y); + return ((x + y) != 0.0 ? x : x); + } + + /* Handle comparisons of signed zeroes. */ + if (u[0].bits.sign != u[1].bits.sign) + return (u[u[0].bits.sign].d); + + return (x > y ? x : y); +} +#endif + +#if (LDBL_MANT_DIG == 53) +__weak_reference(fmaximum_num, fmaximum_numl); +#endif diff --git a/lib/msun/src/s_fmaximum_numf.c b/lib/msun/src/s_fmaximum_numf.c new file mode 100644 index 000000000000..c30179e47f9e --- /dev/null +++ b/lib/msun/src/s_fmaximum_numf.c @@ -0,0 +1,70 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2004 David Schultz + * Copyright (c) 2026 Jesús Blázquez + * 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. + */ + +#include +#include + +#include "fpmath.h" + +#ifdef USE_BUILTIN_FMAXIMUM_NUMF +float +fmaximum_numf(float x, float y) +{ + return (__builtin_fmaximum_numf(x, y)); +} +#else +float +fmaximum_numf(float x, float y) +{ + union IEEEf2bits u[2]; + bool nan_x, nan_y; + + u[0].f = x; + u[1].f = y; + + nan_x = u[0].bits.exp == 255 && u[0].bits.man != 0; + nan_y = u[1].bits.exp == 255 && u[1].bits.man != 0; + + if (nan_x || nan_y) { + /* These ternary conditionals force (x+y), so that sNaN's raise exceptions */ + if (nan_x && nan_y) + return (x + y); + if (nan_x) + return ((x + y) != 0.0 ? y : y); + return ((x + y) != 0.0 ? x : x); + } + + /* Handle comparisons of signed zeroes. */ + if (u[0].bits.sign != u[1].bits.sign) + return (u[u[0].bits.sign].f); + + return (x > y ? x : y); +} +#endif + diff --git a/lib/msun/src/s_fmaximum_numl.c b/lib/msun/src/s_fmaximum_numl.c new file mode 100644 index 000000000000..2291d01ca4f4 --- /dev/null +++ b/lib/msun/src/s_fmaximum_numl.c @@ -0,0 +1,63 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2004 David Schultz + * Copyright (c) 2026 Jesús Blázquez + * 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. + */ + +#include +#include + +#include "fpmath.h" + +long double +fmaximum_numl(long double x, long double y) +{ + union IEEEl2bits u[2]; + bool nan_x, nan_y; + + u[0].e = x; + mask_nbit_l(u[0]); + u[1].e = y; + mask_nbit_l(u[1]); + + nan_x = u[0].bits.exp == 32767 && (u[0].bits.manh | u[0].bits.manl) != 0; + nan_y = u[1].bits.exp == 32767 && (u[1].bits.manh | u[1].bits.manl) != 0; + + if (nan_x || nan_y) { + /* These ternary conditionals force (x+y), so that sNaN's raise exceptions */ + if (nan_x && nan_y) + return (x + y); + if (nan_x) + return ((x + y) != 0.0 ? y : y); + return ((x + y) != 0.0 ? x : x); + } + + /* Handle comparisons of signed zeroes. */ + if (u[0].bits.sign != u[1].bits.sign) + return (u[0].bits.sign ? y : x); + + return (x > y ? x : y); +} diff --git a/lib/msun/src/s_fminimum.c b/lib/msun/src/s_fminimum.c index 64c81b560626..fa3fd17fe241 100644 --- a/lib/msun/src/s_fminimum.c +++ b/lib/msun/src/s_fminimum.c @@ -47,7 +47,7 @@ fminimum(double x, double y) u[0].d = x; u[1].d = y; - /* Check for NaNs to avoid raising spurious exceptions. */ + /* Handle NaN according to ISO/IEC 60559. NaN argument -> NaN return */ if (u[0].bits.exp == 2047 && (u[0].bits.manh | u[0].bits.manl) != 0 || u[1].bits.exp == 2047 && (u[1].bits.manh | u[1].bits.manl) != 0) return (NAN); diff --git a/lib/msun/src/s_fminimum_mag.c b/lib/msun/src/s_fminimum_mag.c new file mode 100644 index 000000000000..cd21fb948a8e --- /dev/null +++ b/lib/msun/src/s_fminimum_mag.c @@ -0,0 +1,74 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2004 David Schultz + * 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. + */ + +#include +#include + +#include "fpmath.h" + +#ifdef USE_BUILTIN_FMINIMUM_MAG +double +fminimum_mag(double x, double y) +{ + return (__builtin_fminimum_mag(x, y)); +} +#else +double +fminimum_mag(double x, double y) +{ + union IEEEd2bits u[2]; + + u[0].d = x; + u[1].d = y; + + /* Handle NaN according to ISO/IEC 60559. NaN argument -> NaN return */ + if (u[0].bits.exp == 2047 && (u[0].bits.manh | u[0].bits.manl) != 0 || + u[1].bits.exp == 2047 && (u[1].bits.manh | u[1].bits.manl) != 0) + return (NAN); + + double ax = fabs(x); + double ay = fabs(y); + + if (ay < ax) + return (y); + if (ax < ay) + return (x); + + /* If magnitudes are equal, we break the tie with the sign */ + if (u[0].bits.sign != u[1].bits.sign) + return (u[u[1].bits.sign].d); + + return (x); +} +#endif + +#if (LDBL_MANT_DIG == 53) +__weak_reference(fminimum_mag, fminimum_magl); +#endif + + diff --git a/lib/msun/src/s_fminimum_magf.c b/lib/msun/src/s_fminimum_magf.c new file mode 100644 index 000000000000..9c04859184ea --- /dev/null +++ b/lib/msun/src/s_fminimum_magf.c @@ -0,0 +1,69 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2004 David Schultz + * 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. + */ + *** 496 LINES SKIPPED *** From nobody Mon May 4 06:47:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8BzP4FRQz6cjFq for ; Mon, 04 May 2026 06:47: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 4g8BzP13Fcz3FgM for ; Mon, 04 May 2026 06:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777877265; 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=NPAm1cBogBh5h5M1h2HHEfgm7kqk43S4EuqA7Pa4tpc=; b=nC2MNI+jI6zd4m0V0SRvIhyGBrUojng3ZmUIYCyeXXXmEPw7dKCfsJHZjupX7AeLofkC+1 a7DHbI5LjYrNoL21Kvs0nqHZEmijm1YdeymT6GdMew3vgZbS+JpLS1FT2bcv2yi0xlqYBV gdh0Xr8giui5gyiCHS9SaNN5N9nhIcEg/IEFkFffBSsOTKAPjm7MWT5coOIEXydzxFJ3k/ FQ4zP9ZPLD2nDWPij0+sTT9cWAeZeSuzzjSdfGYhswWlVOdo48/jLHB4pJKMOqz8Wq/abC PdXoCdv8lDzYoLjl5YHHeHD/5Cm6IIbKB4hXnO/JNkty5W64v6HOY11ovelCWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777877265; a=rsa-sha256; cv=none; b=WCuY+EgxRlsG4aqNOW8B2GUcI1ujkxGYdfIOUP3znFmdYIHRCwOB4CbmEqXzk7iA9x+auK 7Dz9/ntAgyGwb9q1PpCUYkPk2d6ViV7i5ZerPZZS7Cznw66ucc7ruDmkNgdXt2MGjevB/T FJ16F34DaY5QvyqiCtWdywrjO9EgIZrKWU/DcFEz+AH+7ORNc/TpSscya0h95FmD6Hx9uK iVEqvPoQYCDhdAWpoddiCRZJrekvG2aC3k1Dw8kjP2kCoYwZYXX8KLUYeS4ST96zK53uf3 KNKC+Te1UMvqA+9avDyVzLphvqtCV2PFyxRusOhajQXI7qZi+BGH644CWSDOWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777877265; 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=NPAm1cBogBh5h5M1h2HHEfgm7kqk43S4EuqA7Pa4tpc=; b=M95vLlzjHIwMLCgvLrBpeFKXtZTqcOt872ZCmRMclRuqmIXh9EghjLGZSXGOfWMR7RQVFB xqYiMbBccq/iQzGdtfP5gNnmiSj8MklkLgH3apqE5zlyHA3TrbJ+wBjLs+mDhIjVWikmr4 lwe0D68C5pgD+TDfu2VQChbehB9G4GTPsbdA4OeW6U0Zo75XaiCM/0l0HVPSlYY3JibjSw AeWUzhIFxkEU9pYcJcPo7tNv602JkotzZ3h3Ut9YIwfh7AUj9M4uFZb9uC/H3HnDZbDcBu iW4eL/ueXfYU/wlkKcI12rJL78KkcEUmsQw9P0Qp9Vhb96yQIxkKSeV9XxH6gQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8BzP0cFRz17Y7 for ; Mon, 04 May 2026 06:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e36c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 06:47:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: =?utf-8?Q?Jes=C3=BAs?= =?utf-8?Q?Bl=C3=A1zqu?=ez From: Robert Clausecker Subject: git: 10ea8de9df20 - stable/15 - lib/msun: Added fmaximum and fminimum family. Tests and man page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 10ea8de9df20a9a64b7adad25576ac90bbef63ed Auto-Submitted: auto-generated Date: Mon, 04 May 2026 06:47:39 +0000 Message-Id: <69f8410b.3e36c.1915fcb8@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=10ea8de9df20a9a64b7adad25576ac90bbef63ed commit 10ea8de9df20a9a64b7adad25576ac90bbef63ed Author: Jesús Blázquez AuthorDate: 2026-03-31 16:31:15 +0000 Commit: Robert Clausecker CommitDate: 2026-05-04 06:40:11 +0000 lib/msun: Added fmaximum and fminimum family. Tests and man page Starting from the existing fmax{,f,l} functions I've added the fmaximum family, which handles NaN according to the newest standard (propagating it). This commit is a PoC for GSoC 2026. Reviewed by: fuz, kargl MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D55834 (cherry picked from commit e55db843ef45a8788f69e110d97210fb3968b92f) --- lib/msun/Makefile | 15 ++- lib/msun/Symbol.map | 11 ++ lib/msun/man/fmaximum.3 | 103 +++++++++++++++++ lib/msun/src/math.h | 6 + lib/msun/src/s_fmaximum.c | 65 +++++++++++ lib/msun/src/s_fmaximumf.c | 60 ++++++++++ lib/msun/src/s_fmaximuml.c | 54 +++++++++ lib/msun/src/s_fminimum.c | 66 +++++++++++ lib/msun/src/s_fminimumf.c | 61 +++++++++++ lib/msun/src/s_fminimuml.c | 55 ++++++++++ lib/msun/tests/Makefile | 1 + lib/msun/tests/fmaximum_fminimum_test.c | 188 ++++++++++++++++++++++++++++++++ 12 files changed, 680 insertions(+), 5 deletions(-) diff --git a/lib/msun/Makefile b/lib/msun/Makefile index 4dc815ce87fb..4a0ff1ad92b6 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -75,8 +75,9 @@ COMMON_SRCS= b_tgamma.c \ s_exp2.c s_exp2f.c s_expm1.c s_expm1f.c s_fabsf.c s_fdim.c \ s_finite.c s_finitef.c \ s_floor.c s_floorf.c s_fma.c s_fmaf.c \ - s_fmax.c s_fmaxf.c s_fmin.c \ - s_fminf.c s_frexp.c s_frexpf.c s_ilogb.c s_ilogbf.c \ + s_fmax.c s_fmaxf.c s_fmaximum.c s_fmaximumf.c \ + s_fmin.c s_fminf.c s_fminimum.c s_fminimumf.c \ + s_frexp.c s_frexpf.c s_ilogb.c s_ilogbf.c \ s_ilogbl.c s_isfinite.c s_isnan.c s_isnormal.c \ s_llrint.c s_llrintf.c s_llround.c s_llroundf.c s_llroundl.c \ s_log1p.c s_log1pf.c s_logb.c s_logbf.c s_lrint.c s_lrintf.c \ @@ -132,7 +133,8 @@ COMMON_SRCS+= b_tgammal.c catrigl.c \ s_asinhl.c s_atanl.c s_cbrtl.c s_ceill.c s_cexpl.c \ s_clogl.c s_cosl.c s_cospil.c s_cprojl.c \ s_csqrtl.c s_erfl.c s_exp2l.c s_expl.c s_floorl.c s_fmal.c \ - s_fmaxl.c s_fminl.c s_frexpl.c s_logbl.c s_logl.c s_nanl.c \ + s_fmaxl.c s_fmaximuml.c s_fminl.c s_fminimuml.c \ + s_frexpl.c s_logbl.c s_logl.c s_nanl.c \ s_nextafterl.c s_nexttoward.c s_remquol.c s_rintl.c s_roundl.c \ s_scalbnl.c s_sinl.c s_sincosl.c s_sinpil.c \ s_tanhl.c s_tanl.c s_tanpil.c s_truncl.c w_cabsl.c @@ -176,8 +178,8 @@ MAN= acos.3 acosh.3 asin.3 asinh.3 atan.3 atan2.3 atanh.3 \ cpow.3 csqrt.3 erf.3 \ exp.3 fabs.3 fdim.3 \ feclearexcept.3 feenableexcept.3 fegetenv.3 \ - fegetround.3 fenv.3 floor.3 \ - fma.3 fmax.3 fmod.3 hypot.3 ieee.3 ieee_test.3 ilogb.3 j0.3 \ + fegetround.3 fenv.3 floor.3 fma.3 \ + fmax.3 fmaximum.3 fmod.3 hypot.3 ieee.3 ieee_test.3 ilogb.3 j0.3 \ lgamma.3 log.3 lrint.3 lround.3 math.3 nan.3 \ nextafter.3 remainder.3 rint.3 \ round.3 scalbn.3 signbit.3 sin.3 sincos.3 \ @@ -230,6 +232,9 @@ MLINKS+=floor.3 floorf.3 floor.3 floorl.3 MLINKS+=fma.3 fmaf.3 fma.3 fmal.3 MLINKS+=fmax.3 fmaxf.3 fmax.3 fmaxl.3 \ fmax.3 fmin.3 fmax.3 fminf.3 fmax.3 fminl.3 +MLINKS+=fmaximum.3 fmaximuml.3 fmaximum.3 fmaximumf.3 \ + fmaximum.3 fminimum.3 fmaximum.3 fminimumf.3 \ + fmaximum.3 fminimuml.3 MLINKS+=fmod.3 fmodf.3 fmod.3 fmodl.3 MLINKS+=hypot.3 cabs.3 hypot.3 cabsf.3 hypot.3 cabsl.3 \ hypot.3 hypotf.3 hypot.3 hypotl.3 diff --git a/lib/msun/Symbol.map b/lib/msun/Symbol.map index 4d5a5e4d7e6e..932cc000fe52 100644 --- a/lib/msun/Symbol.map +++ b/lib/msun/Symbol.map @@ -316,3 +316,14 @@ FBSD_1.7 { tanpif; tanpil; }; + +/* First added in 16.0-CURRENT */ + +FBSD_1.9 { + fmaximum; + fmaximumf; + fmaximuml; + fminimum; + fminimumf; + fminimuml; +}; diff --git a/lib/msun/man/fmaximum.3 b/lib/msun/man/fmaximum.3 new file mode 100644 index 000000000000..bd301163a034 --- /dev/null +++ b/lib/msun/man/fmaximum.3 @@ -0,0 +1,103 @@ +.\" Copyright (c) 2004 David Schultz +.\" Copyright (c) 2026 Jesús Blázquez +.\" 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 4, 2026 +.Dt FMAXIMUM 3 +.Os +.Sh NAME +.Nm fmaximum , +.Nm fmaximumf , +.Nm fmaximuml , +.Nm fminimum , +.Nm fminimumf , +.Nm fminimuml +.Nd floating-point maximum and minimum functions +.Sh LIBRARY +.Lb libm +.Sh SYNOPSIS +.In math.h +.Ft double +.Fn fmaximum "double x" "double y" +.Ft float +.Fn fmaximumf "float x" "float y" +.Ft "long double" +.Fn fmaximuml "long double x" "long double y" +.Ft double +.Fn fminimum "double x" "double y" +.Ft float +.Fn fminimumf "float x" "float y" +.Ft "long double" +.Fn fminimuml "long double x" "long double y" +.Sh DESCRIPTION +The +.Fn fmaximum , +.Fn fmaximumf , +and +.Fn fmaximuml +functions return the larger of +.Fa x +and +.Fa y , +and likewise, the +.Fn fminimum , +.Fn fminimumf , +and +.Fn fminimuml +functions return the smaller of +.Fa x +and +.Fa y . +They treat +.Li +0.0 +as being larger than +.Li -0.0 . +.Pp +Unlike the +.Xr fmax 3 +family of functions, which ignore an \*(Na, if either argument to +.Fn fmaximum +or +.Fn fminimum +is an \*(Na, then the result is an \*(Na. +These routines do not raise any floating-point exceptions. +.Sh SEE ALSO +.Xr fabs 3 , +.Xr fdim 3 , +.Xr fmax 3 , +.Xr math 3 +.Sh STANDARDS +The +.Fn fmaximum , +.Fn fmaximumf , +.Fn fmaximuml , +.Fn fminimum , +.Fn fminimumf , +and +.Fn fminimuml +functions conform to +.St -isoC-2023 . +.Sh HISTORY +These routines first appeared in +.Fx 16.0 . diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h index 25bd64e36a63..103b82c1cdf8 100644 --- a/lib/msun/src/math.h +++ b/lib/msun/src/math.h @@ -520,6 +520,12 @@ long double sinpil(long double); double tanpi(double); float tanpif(float); long double tanpil(long double); +double fmaximum(double, double); +float fmaximumf(float, float); +long double fmaximuml(long double, long double); +double fminimum(double, double); +float fminimumf(float, float); +long double fminimuml(long double, long double); #endif /* __ISO_C_VISIBLE >= 2023 */ __END_DECLS diff --git a/lib/msun/src/s_fmaximum.c b/lib/msun/src/s_fmaximum.c new file mode 100644 index 000000000000..f9e1998a84c2 --- /dev/null +++ b/lib/msun/src/s_fmaximum.c @@ -0,0 +1,65 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2004 David Schultz + * Copyright (c) 2026 Jesús Blázquez + * 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. + */ + +#include +#include + +#include "fpmath.h" + +#ifdef USE_BUILTIN_FMAXIMUM +double +fmaximum(double x, double y) +{ + return (__builtin_fmaximum(x, y)); +} +#else +double +fmaximum(double x, double y) +{ + union IEEEd2bits u[2]; + + u[0].d = x; + u[1].d = y; + + /* Handle NaN according to ISO/IEC 60559. NaN argument -> NaN return */ + if ((u[0].bits.exp == 2047 && (u[0].bits.manh | u[0].bits.manl) != 0) || + (u[1].bits.exp == 2047 && (u[1].bits.manh | u[1].bits.manl) != 0)) + return (NAN); + + /* Handle comparisons of signed zeroes. */ + if (u[0].bits.sign != u[1].bits.sign) + return (u[u[0].bits.sign].d); + + return (x > y ? x : y); +} +#endif + +#if (LDBL_MANT_DIG == 53) +__weak_reference(fmaximum, fmaximuml); +#endif diff --git a/lib/msun/src/s_fmaximumf.c b/lib/msun/src/s_fmaximumf.c new file mode 100644 index 000000000000..db4b96c14749 --- /dev/null +++ b/lib/msun/src/s_fmaximumf.c @@ -0,0 +1,60 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2004 David Schultz + * Copyright (c) 2026 Jesús Blázquez + * 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. + */ + +#include + +#include "fpmath.h" + +#ifdef USE_BUILTIN_FMAXIMUMF +float +fmaximumf(float x, float y) +{ + return (__builtin_fmaximumf(x, y)); +} +#else +float +fmaximumf(float x, float y) +{ + union IEEEf2bits u[2]; + + u[0].f = x; + u[1].f = y; + + /* Handle NaN according to ISO/IEC 60559. NaN argument -> NaN return */ + if ((u[0].bits.exp == 255 && u[0].bits.man != 0) || + (u[1].bits.exp == 255 && u[1].bits.man != 0)) + return (NAN); + + /* Handle comparisons of signed zeroes. */ + if (u[0].bits.sign != u[1].bits.sign) + return (u[u[0].bits.sign].f); + + return (x > y ? x : y); +} +#endif diff --git a/lib/msun/src/s_fmaximuml.c b/lib/msun/src/s_fmaximuml.c new file mode 100644 index 000000000000..c849478cf05a --- /dev/null +++ b/lib/msun/src/s_fmaximuml.c @@ -0,0 +1,54 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2004 David Schultz + * Copyright (c) 2026 Jesús Blázquez + * 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. + */ + +#include + +#include "fpmath.h" + +long double +fmaximuml(long double x, long double y) +{ + union IEEEl2bits u[2]; + + u[0].e = x; + mask_nbit_l(u[0]); + u[1].e = y; + mask_nbit_l(u[1]); + + /* Handle NaN according to ISO/IEC 60559. NaN argument -> NaN return */ + if ((u[0].bits.exp == 32767 && (u[0].bits.manh | u[0].bits.manl) != 0) || + (u[1].bits.exp == 32767 && (u[1].bits.manh | u[1].bits.manl) != 0)) + return (NAN); + + /* Handle comparisons of signed zeroes. */ + if (u[0].bits.sign != u[1].bits.sign) + return (u[0].bits.sign ? y : x); + + return (x > y ? x : y); +} diff --git a/lib/msun/src/s_fminimum.c b/lib/msun/src/s_fminimum.c new file mode 100644 index 000000000000..64c81b560626 --- /dev/null +++ b/lib/msun/src/s_fminimum.c @@ -0,0 +1,66 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2004 David Schultz + * Copyright (c) 2026 Jesús Blázquez + * 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. + */ + +#include +#include + +#include "fpmath.h" + +#ifdef USE_BUILTIN_FMINIMUM +double +fminimum(double x, double y) +{ + return (__builtin_fminimum(x, y)); +} +#else +double +fminimum(double x, double y) +{ + union IEEEd2bits u[2]; + + u[0].d = x; + u[1].d = y; + + /* Check for NaNs to avoid raising spurious exceptions. */ + if (u[0].bits.exp == 2047 && (u[0].bits.manh | u[0].bits.manl) != 0 || + u[1].bits.exp == 2047 && (u[1].bits.manh | u[1].bits.manl) != 0) + return (NAN); + + /* Handle comparisons of signed zeroes. */ + if (u[0].bits.sign != u[1].bits.sign) + return (u[u[1].bits.sign].d); + + return (x < y ? x : y); +} +#endif + +#if (LDBL_MANT_DIG == 53) +__weak_reference(fminimum, fminimuml); +#endif + diff --git a/lib/msun/src/s_fminimumf.c b/lib/msun/src/s_fminimumf.c new file mode 100644 index 000000000000..d3978f576931 --- /dev/null +++ b/lib/msun/src/s_fminimumf.c @@ -0,0 +1,61 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2004 David Schultz + * Copyright (c) 2026 Jesús Blázquez + * 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. + */ + +#include + +#include "fpmath.h" + +#ifdef USE_BUILTIN_FMINIMUMF +float +fminimumf(float x, float y) +{ + return (__builtin_fminimumf(x, y)); +} +#else +float +fminimumf(float x, float y) +{ + union IEEEf2bits u[2]; + + u[0].f = x; + u[1].f = y; + + /* Check for NaNs to avoid raising spurious exceptions. */ + if (u[0].bits.exp == 255 && u[0].bits.man != 0 || + u[1].bits.exp == 255 && u[1].bits.man != 0) + return (NAN); + + /* Handle comparisons of signed zeroes. */ + if (u[0].bits.sign != u[1].bits.sign) + return (u[u[1].bits.sign].f); + + return (x < y ? x : y); +} +#endif + diff --git a/lib/msun/src/s_fminimuml.c b/lib/msun/src/s_fminimuml.c new file mode 100644 index 000000000000..e2c5527ee319 --- /dev/null +++ b/lib/msun/src/s_fminimuml.c @@ -0,0 +1,55 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2004 David Schultz + * Copyright (c) 2026 Jesús Blázquez + * 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. + */ + +#include + +#include "fpmath.h" + +long double +fminimuml(long double x, long double y) +{ + union IEEEl2bits u[2]; + + u[0].e = x; + mask_nbit_l(u[0]); + u[1].e = y; + mask_nbit_l(u[1]); + + /* Check for NaNs to avoid raising spurious exceptions. */ + if (u[0].bits.exp == 32767 && (u[0].bits.manh | u[0].bits.manl) != 0 || + u[1].bits.exp == 32767 && (u[1].bits.manh | u[1].bits.manl) != 0) + return (NAN); + + /* Handle comparisons of signed zeroes. */ + if (u[0].bits.sign != u[1].bits.sign) + return (u[1].bits.sign ? y : x); + + return (x < y ? x : y); +} + diff --git a/lib/msun/tests/Makefile b/lib/msun/tests/Makefile index d2a3ebffadb3..d723e0aaf656 100644 --- a/lib/msun/tests/Makefile +++ b/lib/msun/tests/Makefile @@ -58,6 +58,7 @@ ATF_TESTS_C+= exponential_test ATF_TESTS_C+= fenv_test ATF_TESTS_C+= fma_test ATF_TESTS_C+= fmaxmin_test +ATF_TESTS_C+= fmaximum_fminimum_test ATF_TESTS_C+= ilogb2_test ATF_TESTS_C+= invtrig_test ATF_TESTS_C+= invctrig_test diff --git a/lib/msun/tests/fmaximum_fminimum_test.c b/lib/msun/tests/fmaximum_fminimum_test.c new file mode 100644 index 000000000000..4641f80dfdad --- /dev/null +++ b/lib/msun/tests/fmaximum_fminimum_test.c @@ -0,0 +1,188 @@ +/* + * Copyright (c) 2008 David Schultz + * 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. + */ + +/* + * Tests for fmaximum{,f,l}() and fminimum{,f,l}() + */ + +#include +#include +#include +#include + +#include "test-utils.h" + +#pragma STDC FENV_ACCESS ON + +/* + * Test whether func(x, y) has the expected result, and make sure no + * exceptions are raised. + */ +#define TEST(func, type, x, y, expected, rmode) do { \ + type __x = (x); /* convert before we clear exceptions */ \ + type __y = (y); \ + ATF_REQUIRE_EQ(0, feclearexcept(ALL_STD_EXCEPT)); \ + long double __result = func((__x), (__y)); \ + CHECK_FP_EXCEPTIONS_MSG(0, ALL_STD_EXCEPT, \ + #func "(%.20Lg, %.20Lg) rmode%d", (x), (y), rmode); \ + ATF_CHECK_MSG(fpequal_cs(__result, (expected), true), \ + #func "(%.20Lg, %.20Lg) rmode%d = %.20Lg, expected %.20Lg", \ + (x), (y), rmode, __result, (expected)); \ +} while (0) + +static void +testall_r(long double big, long double small, int rmode) +{ + long double expected_max, expected_min; + if (isnan(big) || isnan(small)) { + expected_max = big + small; + expected_min = expected_max; + } else { + expected_max = big; + expected_min = small; + } + + TEST(fmaximumf, float, big, small, expected_max, rmode); + TEST(fmaximumf, float, small, big, expected_max, rmode); + TEST(fmaximum, double, big, small, expected_max, rmode); + TEST(fmaximum, double, small, big, expected_max, rmode); + TEST(fmaximuml, long double, big, small, expected_max, rmode); + TEST(fmaximuml, long double, small, big, expected_max, rmode); + TEST(fminimumf, float, big, small, expected_min, rmode); + TEST(fminimumf, float, small, big, expected_min, rmode); + TEST(fminimum, double, big, small, expected_min, rmode); + TEST(fminimum, double, small, big, expected_min, rmode); + TEST(fminimuml, long double, big, small, expected_min, rmode); + TEST(fminimuml, long double, small, big, expected_min, rmode); +} + +/* + * Test all the functions: fmaximumf, fmaximum, fmaximuml, fminimumf, fminimum, fminimuml + * in all rounding modes and with the arguments in different orders. + * The input 'big' must be >= 'small'. + */ +static void +testall(long double big, long double small) +{ + static const int rmodes[] = { + FE_TONEAREST, FE_UPWARD, FE_DOWNWARD, FE_TOWARDZERO + }; + int i; + + for (i = 0; i < 4; i++) { + fesetround(rmodes[i]); + testall_r(big, small, rmodes[i]); + } +} + +ATF_TC_WITHOUT_HEAD(test1); +ATF_TC_BODY(test1, tc) +{ + testall(1.0, 0.0); +} + +ATF_TC_WITHOUT_HEAD(test2); +ATF_TC_BODY(test2, tc) +{ + testall(42.0, nextafterf(42.0, -INFINITY)); +} +ATF_TC_WITHOUT_HEAD(test3); +ATF_TC_BODY(test3, tc) +{ + testall(nextafterf(42.0, INFINITY), 42.0); +} + +ATF_TC_WITHOUT_HEAD(test4); +ATF_TC_BODY(test4, tc) +{ + testall(-5.0, -5.0); +} + +ATF_TC_WITHOUT_HEAD(test5); +ATF_TC_BODY(test5, tc) +{ + testall(-3.0, -4.0); +} + +ATF_TC_WITHOUT_HEAD(test6); +ATF_TC_BODY(test6, tc) +{ + testall(1.0, NAN); +} +ATF_TC_WITHOUT_HEAD(test7); +ATF_TC_BODY(test7, tc) +{ + testall(INFINITY, NAN); +} + +ATF_TC_WITHOUT_HEAD(test8); +ATF_TC_BODY(test8, tc) +{ + testall(INFINITY, 1.0); +} + +ATF_TC_WITHOUT_HEAD(test9); +ATF_TC_BODY(test9, tc) +{ + testall(-3.0, -INFINITY); +} + +ATF_TC_WITHOUT_HEAD(test10); +ATF_TC_BODY(test10, tc) +{ + testall(3.0, -INFINITY); +} + +ATF_TC_WITHOUT_HEAD(test11); +ATF_TC_BODY(test11, tc) +{ + testall(NAN, NAN); +} + +ATF_TC_WITHOUT_HEAD(test12); +ATF_TC_BODY(test12, tc) +{ + testall(0.0, -0.0); +} + + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, test1); + ATF_TP_ADD_TC(tp, test2); + ATF_TP_ADD_TC(tp, test3); + ATF_TP_ADD_TC(tp, test4); + ATF_TP_ADD_TC(tp, test5); + ATF_TP_ADD_TC(tp, test6); + ATF_TP_ADD_TC(tp, test7); + ATF_TP_ADD_TC(tp, test8); + ATF_TP_ADD_TC(tp, test9); + ATF_TP_ADD_TC(tp, test10); + ATF_TP_ADD_TC(tp, test11); + ATF_TP_ADD_TC(tp, test12); + + return (atf_no_error()); +} From nobody Mon May 4 06:57:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8CBT16lMz6ckDJ for ; Mon, 04 May 2026 06:57:21 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8CBS735Kz3HMk for ; Mon, 04 May 2026 06:57:20 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777877841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6ZPWnnBxqmWURBFbR69tP+TnpXnrAahZw0uVquz05Z8=; b=ZTzbVYiesOnK9SahkdKOLl8s9YbEzANrPggWo+yUF0x9Khrap2H1Bf4ak2nlQINmATA/9t 8Z4cDxkqCwdw/En1K1Di2wpr3N+L70zkuf5PSOk9Hf/X3wpPDz2fZ/gDzBO7k950hUUW1x IHhKpCsWQjw89F3sL+skfY5HHtTfiMsB0nwTYP965XgBTFTAHGHUeIS0exPCWpSyFqZjwl B4r0QO+ZBUKlyCv9eAHMD4od3hgGCIeb9tVe434L3b1tzxWxH9k3v8EzQkuh8rfa+qnQsQ 4oSp1uh5svWxJg71rXPyuaQL0Ehx0wZXPX4xZ3Sqi9ThxIbx6PmtUmsDojOT6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777877840; a=rsa-sha256; cv=none; b=fH1sCdxJ/BN2bFl8MnlKUuUCnnQ+KZ/k8F6HzmiYlKJjq7Nrd6VFUxKNyY0QmljBRIbICf quMH9uOLX4AAuyKbyRhPOhAa5PjR3DtiOs9cy6KYFKOj6BtNoylPLdS0sqHPw2Wy6l7sqz 4Bo9Ob56eRko/HV9dE9a/FAPNaAvVUdIb5Pn58qazeCB047XkpnOzLtZGBzN6mQh4NEWEY ifDEcBbGS7zyUKpgLGvnr+qd+FJOhYmVQDZhNK57O1hPOAtb62AeWTi+UFJqGTEBnhcod7 G+uK6wmMjofVn1lQXVhs8xXhCSukiXFsCg+W9rkzNyjBnk/+chEJFq9CIlq60A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777877840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6ZPWnnBxqmWURBFbR69tP+TnpXnrAahZw0uVquz05Z8=; b=xUs/yA2CcWJvicX3K2yWHf+0TRq/kBaSS/iKfVh8/2AQtHR6ZchxokhceeRlR4wXio1SfW VKPzZ0FvtdIiRQ/O+cCsPU53gdxgmdsXdAMo1u2Tsl2a5HTE1gH3EHInaRcNlm4NNTh7dX 6zD6iio0jEdLA0xcxozI0lla6QqE4wFzrVWpjDnSNzUT9mlpbDdO2cjJnYwQFYi7jfP3LL SyGE2RHX3qFqtnI+kjWFyckTU16w22z1lkL75hO6+SgjRfq1E9h5rV+A24/sytkdSaqGOL jAQGy0n3ogMLfX3MC4UCp6MiNZITM759DDtO3NRdXUs5deOb/vjMoa9OYLxPow== Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4g8CBS61HNzG2r for ; Mon, 04 May 2026 06:57:20 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-5a41a9a97d3so569935e87.1 for ; Sun, 03 May 2026 23:57:20 -0700 (PDT) X-Forwarded-Encrypted: i=1; AFNElJ/YDFoVZceaWYib6262szAeDowR9YKY1dibekTm4/66L979vEeu/3RCQ9pNERltAXc5jna2A5XgMDq00nGErHDmJK0v@freebsd.org X-Gm-Message-State: AOJu0YxSh/o/X3qeA/2pqQn+NGf7TIYGb+ow+kfnj2MK/T4MGOak6oel L0eQ+shmuVpQ/1gUXDVD6UslmQd2wa/WUUBWmJN1B6C9qStaYCUIoy9Nka2ljqIsQiLZL5wbj0x ivNUlltclQMkvAiiPX73l3aqjWztfTA0= X-Received: by 2002:a05:651c:503:b0:38a:365c:8416 with SMTP id 38308e7fff4ca-39378527a82mr10714991fa.3.1777877839406; Sun, 03 May 2026 23:57:19 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 References: <69f5387a.26bf3.36f56fa3@gitrepo.freebsd.org> <994cef06-a1c9-45b8-b807-3449517fe381@yahoo.com> In-Reply-To: <994cef06-a1c9-45b8-b807-3449517fe381@yahoo.com> From: Nuno Teixeira Date: Mon, 4 May 2026 07:57:06 +0100 X-Gmail-Original-Message-ID: X-Gm-Features: AVHnY4IFdgSBytzaWAouazBMfKvNvVswsMgavCW_oKWMfP4qUwWLiDwIIYvA5eM Message-ID: Subject: Re: git: c4f08d46c7f7 - main - llvm-*: Move all LLVM_BINUTILS symlinks to toolchain package To: Mark Millard Cc: jlduran@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Ed Maste Content-Type: multipart/alternative; boundary="000000000000126c0c0650f87163" --000000000000126c0c0650f87163 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello, Any clues if those symlinks are related? ``` # ./tools/build/stale-symlink-buildworld.sh stale symlink detected: lrwxr-xr-x 1 root wheel 12 May 4 07:53 /usr/obj/usr/src/amd64.amd64/tmp/usr/bin/c++filt -> llvm-cxxfilt stale symlink detected: lrwxr-xr-x 1 root wheel 8 May 4 07:53 /usr/obj/usr/src/amd64.amd64/tmp/usr/bin/gcov -> llvm-cov stale symlink detected: lrwxr-xr-x 1 root wheel 12 May 4 07:53 /usr/obj/usr/src/amd64.amd64/tmp/usr/bin/objdump -> llvm-objdump stale symlink detected: lrwxr-xr-x 1 root wheel 12 May 4 07:53 /usr/obj/usr/src/amd64.amd64/tmp/usr/bin/readelf -> llvm-readelf ``` Thanks Mark Millard escreveu (s=C3=A1bado, 2/05/2026 =C3=A0(s)= 05:45): > On 5/1/26 17:38, Jose Luis Duran wrote: > > On Fri, May 1, 2026 at 8:34=E2=80=AFPM Ed Maste wr= ote: > >> > >> The branch main has been updated by emaste: > >> > >> URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dc4f08d46c7f717cc8c66bf702c00676= 5a5b6b1a9 > >> > >> commit c4f08d46c7f717cc8c66bf702c006765a5b6b1a9 > >> Author: Ed Maste > >> AuthorDate: 2026-03-06 14:46:18 +0000 > >> Commit: Ed Maste > >> CommitDate: 2026-05-01 23:33:51 +0000 > >> > >> llvm-*: Move all LLVM_BINUTILS symlinks to toolchain package > >> > >> Some of the LLVM binary utilities were included in the Clang packa= ge > >> (because they did not set an explicit PACKAGE). > >> > >> Add a new Makefile under clang/toolchain to create the symlinks an= d > man > >> links for ar, c++filt, nm, and so on (without the llvm-* prefix) > when > >> LLVM_BINUTILS is enabled (as it is by default). > >> > >> PR: 293610 > >> Reviewed by: bapt, ivy, brooks > >> Sponsored by: The FreeBSD Foundation > >> Differential Revision: https://reviews.freebsd.org/D55692 > >> --- > >> ... > >> +.if ${MK_LLVM_BINUTILS} !=3D "no" > >> +PKG_DEPS.toolchain+=3D llvm > > > > Is there an llvm package (FreeBSD-llvm)? > > > > For reference, for main [so: 16 at this point]: > (context predates the above change) > > > # pkg search -rFreeBSD-base -g FreeBSD-llvm\* > # > > # pkg search -rFreeBSD-base -g FreeBSD-binutils\* > # > > So: no for FreeBSD-llvm . > > > But for things that do exist that internally are based on some of llvm: > (the context has all the FreeBSD-* base packages installed) > > # pkg info -dl FreeBSD-\* \ > | grep -v -e /contrib/ -e /src/ -e /man1/ \ > | grep -e ^FreeBSD- \ > -e llvm- \ > -e libprivateclang \ > -e libprivatellvm \ > -e libcompiler_rt \ > | grep -B1 -v ^FreeB > FreeBSD-clang-16.snap20260430194422 > FreeBSD-libcompiler_rt-dev-16.snap20260425150102 > /usr/bin/llvm-addr2line > /usr/bin/llvm-cov > /usr/bin/llvm-cxxfilt > /usr/bin/llvm-objcopy > /usr/bin/llvm-objdump > /usr/bin/llvm-profdata > /usr/bin/llvm-readelf > /usr/bin/llvm-readobj > /usr/bin/llvm-strings > /usr/bin/llvm-strip > /usr/bin/llvm-symbolizer > /usr/lib/libprivateclang.so.21 > /usr/lib/libprivatellvm.so.21 > FreeBSD-clang-dbg-16.snap20260430194422 > /usr/lib/debug/usr/bin/llvm-cov.debug > /usr/lib/debug/usr/bin/llvm-cxxfilt.debug > /usr/lib/debug/usr/bin/llvm-objcopy.debug > /usr/lib/debug/usr/bin/llvm-objdump.debug > /usr/lib/debug/usr/bin/llvm-profdata.debug > /usr/lib/debug/usr/bin/llvm-readobj.debug > /usr/lib/debug/usr/bin/llvm-strings.debug > /usr/lib/debug/usr/bin/llvm-symbolizer.debug > /usr/lib/debug/usr/lib/libprivateclang.so.21.debug > /usr/lib/debug/usr/lib/libprivatellvm.so.21.debug > FreeBSD-clang-dev-16.snap20260428205205 > FreeBSD-clang-16.snap20260430194422 (libprivatellvm.so.21) > /usr/lib/libprivateclang.so > /usr/lib/libprivatellvm.so > -- > FreeBSD-libcompiler_rt-dev-16.snap20260425150102 > /usr/lib/libcompiler_rt.a > FreeBSD-libcompiler_rt-dev-lib32-16.snap20260425150102 > /usr/lib32/libcompiler_rt.a > -- > FreeBSD-lld-16.snap20260430194422 > FreeBSD-clang-16.snap20260430194422 (libprivatellvm.so.21) > -- > FreeBSD-lldb-16.snap20260430194422 > FreeBSD-clang-16.snap20260430194422 (libprivateclang.so.21) > FreeBSD-clang-16.snap20260430194422 (libprivatellvm.so.21) > -- > FreeBSD-set-devel-16.snap20260424143247 > FreeBSD-libcompiler_rt-dev-16.snap20260425150102 > -- > FreeBSD-set-lib32-16.snap20260424143247 > FreeBSD-libcompiler_rt-dev-lib32-16.snap20260425150102 > -- > FreeBSD-toolchain-16.snap20260430194422 > FreeBSD-clang-16.snap20260430194422 (libprivatellvm.so.21) > /usr/bin/llvm-ar > /usr/bin/llvm-nm > /usr/bin/llvm-ranlib > /usr/bin/llvm-size > FreeBSD-toolchain-dbg-16.snap20260430194422 > /usr/lib/debug/usr/bin/llvm-ar.debug > /usr/lib/debug/usr/bin/llvm-nm.debug > /usr/lib/debug/usr/bin/llvm-size.debug > > > That should at least give an idea, even if it might be incomplete. > > > -- > =3D=3D=3D > Mark Millard > marklmi at yahoo.com > > --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --000000000000126c0c0650f87163 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
    Hello,

    Any clues if those symlinks = are related?

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

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

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


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

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

    So: no for FreeBSD-llvm .


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

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


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


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



    --
    Nuno Teixeira
    =
    FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
    --000000000000126c0c0650f87163-- From nobody Mon May 4 07:16:01 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8Cc70tFrz6cl9t for ; Mon, 04 May 2026 07:16: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 4g8Cc65b1gz3KSB for ; Mon, 04 May 2026 07:16:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777878966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1y4ZEVtH7zV23DGD6NQEVpeG3mF/G7QiUrm8BHjxP50=; b=EUAmjXYpH+3ojrwM7W/vawG+4lNECs7d6OfZW5tk2IilZIjBLLv9vNVO1mX9+bct5hqACQ FftRTuZ/y+WdeCme7ucfY9VfGFcLhVXTEU9hB8eV79TF0ldbRH4bEk5ZDe0kcI85G1njzP t78FmdiGhhf1e22l7CR1oqIHOjAjzJr6OEve/pRSC++iAj2ojTswrITC7HRY+OqombXtSR 8Bqh6mZL/qevs/4UNhY2m2n61AoEA0VN7MCaL6uapNaQgnzaOYTycwPBEbZv1KTzS21rRH OMDuvCOttQQnU8kbba0rBYtDxny7Q9lvH74zZVEWGoKpA3kVcCsy1RNwkN/u0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777878966; a=rsa-sha256; cv=none; b=oK72limL1PXJpJipCaXnmTDfHQGTpWdD5sGe9C56pXIircPzcFO/rOxelr3kWKUioyWT0R AXWuUUxHTn9YdJcunGfob0sCAf8N6/PCLFZirXo6XFps7ldq/jizqA5hmDss8k5q71vVbx sFQnLwVtsprhLD56Xavb8MPREBxN2C44JH1UR+tvtVt4tCe+Zkx/98Ck8hqs92iMtsvdCy zGPBHFTDIf9kwpUdevPYN/skpbTNpPo9imLSt3vg3gCk88r6ReLVpWn3V2U55Yo76YEmDG YhgyW/S2R47PspEmewLcJTiFybehRAw4OoR09veXGVo0bOIUFGv/C1pWxnDAHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777878966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1y4ZEVtH7zV23DGD6NQEVpeG3mF/G7QiUrm8BHjxP50=; b=CiiIvD2mI0N9wuD91JbvoyOVl5168b3Fo0Av33N0Nc8FwbpxedLMHUhliBEIVtLSaOB4zo njRslyx+x2XGF2u3LA37UsVNgSxs3JILfofc8nLk5AjY1RZXaJ3fMqipKlFH3Yt0w2ss5P dwWfx3DyPiS3qiQMbDFWGPwdoNQcbgp7rRT9EmLMKdXi2Wj4Bz6fuBELP2ooc5Yp6gIkhT kM7gqmVblvc0IFJEU7AUmJJcCGvxkg8kWOINwXf2wW2E86eoYgbskELfFdc5Cqy2f0tM/r nluV3FjOsC2QXQKhy5AWSbaCyszu5AbGuBhReqG48WK2Gju3QbpHDfVi8Tmbbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8Cc652CLz18LT for ; Mon, 04 May 2026 07:16:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40d51 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 07:16:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: fca6c9e8f747 - stable/14 - contrib/expat: import expat 2.8.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: fca6c9e8f7474132f30bf836f1c2b8d289bdc14d Auto-Submitted: auto-generated Date: Mon, 04 May 2026 07:16:01 +0000 Message-Id: <69f847b1.40d51.2ae32f62@gitrepo.freebsd.org> The branch stable/14 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=fca6c9e8f7474132f30bf836f1c2b8d289bdc14d commit fca6c9e8f7474132f30bf836f1c2b8d289bdc14d Author: Philip Paeps AuthorDate: 2026-04-27 10:38:10 +0000 Commit: Philip Paeps CommitDate: 2026-05-04 06:00:13 +0000 contrib/expat: import expat 2.8.0 Changes: https://github.com/libexpat/libexpat/blob/R_2_8_0/expat/Changes Security: CVE-2026-41080 (cherry picked from commit e3935639d8d8b6556cad18e1c90e419a65f26b40) --- contrib/expat/Changes | 66 +++++ contrib/expat/README.md | 8 +- contrib/expat/configure.ac | 137 +++++++-- contrib/expat/doc/reference.html | 57 +++- contrib/expat/doc/xmlwf.1 | 2 +- contrib/expat/doc/xmlwf.xml | 2 +- contrib/expat/examples/element_declarations.c | 5 +- contrib/expat/expat_config.h.in | 3 + contrib/expat/lib/Makefile.am | 36 +++ contrib/expat/lib/Makefile.in | 170 ++++++++++- contrib/expat/lib/expat.h | 16 +- contrib/expat/lib/expat_external.h | 5 +- contrib/expat/lib/internal.h | 4 +- contrib/expat/lib/libexpat.map.in | 5 + contrib/expat/lib/random_arc4random.c | 56 ++++ .../acc_tests_cxx.cpp => lib/random_arc4random.h} | 13 +- .../random_arc4random_buf.c} | 21 +- .../random_arc4random_buf.h} | 13 +- contrib/expat/lib/random_dev_urandom.c | 72 +++++ .../chardata_cxx.cpp => lib/random_dev_urandom.h} | 14 +- contrib/expat/lib/random_getentropy.c | 54 ++++ .../random_getentropy.h} | 14 +- contrib/expat/lib/random_getrandom.c | 90 ++++++ contrib/expat/lib/random_getrandom.h | 40 +++ contrib/expat/lib/random_rand_s.c | 88 ++++++ contrib/expat/lib/random_rand_s.h | 41 +++ contrib/expat/lib/xmlparse.c | 316 ++++++++------------- contrib/expat/lib/xmlrole.c | 2 +- contrib/expat/lib/xmltok.c | 2 +- contrib/expat/lib/xmltok_ns.c | 2 +- contrib/expat/tests/Makefile.am | 24 +- contrib/expat/tests/Makefile.in | 156 +--------- contrib/expat/tests/basic_tests.c | 26 ++ contrib/expat/tests/common_cxx.cpp | 32 --- contrib/expat/tests/dummy_cxx.cpp | 32 --- contrib/expat/tests/handlers_cxx.cpp | 32 --- contrib/expat/tests/memcheck_cxx.cpp | 32 --- contrib/expat/tests/minicheck_cxx.cpp | 32 --- contrib/expat/tests/misc_tests.c | 2 +- contrib/expat/tests/misc_tests_cxx.cpp | 32 --- contrib/expat/tests/ns_tests_cxx.cpp | 32 --- contrib/expat/tests/nsalloc_tests.c | 11 +- contrib/expat/tests/nsalloc_tests_cxx.cpp | 32 --- contrib/expat/tests/structdata_cxx.cpp | 32 --- contrib/expat/xmlwf/xmlfile.c | 2 +- contrib/expat/xmlwf/xmlwf.c | 2 +- lib/libexpat/Makefile | 2 +- lib/libexpat/expat_config.h | 6 +- lib/libexpat/libbsdxml.3 | 4 +- 49 files changed, 1136 insertions(+), 741 deletions(-) diff --git a/contrib/expat/Changes b/contrib/expat/Changes index 2b3704a69b77..87611eea5c01 100644 --- a/contrib/expat/Changes +++ b/contrib/expat/Changes @@ -29,6 +29,72 @@ !! THANK YOU! Sebastian Pipping -- Berlin, 2026-03-17 !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +Release 2.8.0 Fri April 24 2026 + Security fixes: + #47 #1183 CVE-2026-41080 -- The existing hash flooding protection + (based on SipHash) only used 4 to 8 bytes of entropy for + a salt, when 16 bytes of salt are supported by the + implementation of SipHash used by Expat. Now full 16 bytes + of entropy are used to improve protection against hash + flooding attacks. + Existing API function XML_SetHashSalt is now deprecated + because of its limitations, and its use should be + considered a vulnerability. Please either use the new API + function XML_SetHashSalt16Bytes (with known-high-quality + entropy input only!) instead, or leave the derivation of + a 16-bytes hash salt from high quality entropy to Expat's + internal machinery (by *not* calling either of the two + XML_SetHashSalt* functions). + + Bug fixes: + #1188 Avoid propagating /dev/urandom file descriptor to child + processes + #1193 Fix interpretation of `errno` after randomization calls + #1195 Avoid assuming uint8_t is a character type + + Other changes: + #1180 #1199 Add support for `getentropy(3)` as a source of entropy; + this helps with protecting against hash flooding attacks, + in particular with WASI SDK (where none of the other + entropy sources supported by libexpat are available). + #1200 Autotools: Add `--without-arc4random` and + `--without-arc4random-buf` + #1200 Autotools: Make `./configure` output report on available + high quality entropy sources + #1173 Autotools|macOS: Sync CMake templates with CMake 4.3.0 + #1201 Autotools|CMake: Improve checks for `arc4random` and + `arc4random_buf` e.g. with modern glibc + #1201 CMake: Report on availability of functions `arc4random` and + `arc4random_buf` + #1201 CMake: Mark entropy related build switches as advanced + #1189 .. + #1203 #1204 Extract new files from entropy extraction code + #1194 Stop duplicating C tests 1:1 as C++ ("runtests_cxx") + #1202 Fix a comment typo in expat_external.h + #1187 Fix grammar in compile error message + #1192 examples: Build warning-free with -Wwrite-strings + #1171 tests: Address harmless warning from Coverity + #1170 #1176 Sync file headers + #1190 #1206 Version info bumped from 12:3:11 (libexpat*.so.1.11.3) + to 13:0:12 (libexpat*.so.1.12.0); see https://verbump.de/ + for what these numbers do + + Infrastructure: + #1166 #1167 .. + #1172 #1175 .. + #1178 #1179 .. + #1185 #1205 CI: Make Perl XML::Parser integration tests run against + both version 2.47 and the latest release 2.58 + #1169 CI: Adapt to breaking changes regarding Inno Setup + #1173 CI: Adapt to breaking changes regarding CMake + #1174 CI: Include public corpus of fuzzer `xml_lpm_fuzzer` with + regression testing + #1181 #1182 CI: Bump WASI SDK from 30 to 32 + + Special thanks to: + Jérôme Duval + Matthew Fernandez + Release 2.7.5 Tue March 17 2026 Security fixes: #1158 CVE-2026-32776 -- Fix NULL function pointer dereference for diff --git a/contrib/expat/README.md b/contrib/expat/README.md index a67548be7fc9..619e60b2d16b 100644 --- a/contrib/expat/README.md +++ b/contrib/expat/README.md @@ -11,7 +11,7 @@ > at the top of the `Changes` file. -# Expat, Release 2.7.5 +# Expat, Release 2.8.0 This is Expat, a C99 library for parsing [XML 1.0 Fourth Edition](https://www.w3.org/TR/2006/REC-xml-20060816/), started by @@ -297,10 +297,4 @@ EXPAT_SYMBOL_VERSIONING:BOOL=OFF // Treat all compiler warnings as errors EXPAT_WARNINGS_AS_ERRORS:BOOL=OFF - -// Make use of getrandom function (ON|OFF|AUTO) [default=AUTO] -EXPAT_WITH_GETRANDOM:STRING=AUTO - -// Make use of syscall SYS_getrandom (ON|OFF|AUTO) [default=AUTO] -EXPAT_WITH_SYS_GETRANDOM:STRING=AUTO ``` diff --git a/contrib/expat/configure.ac b/contrib/expat/configure.ac index 6d028b5f6658..87633650f321 100644 --- a/contrib/expat/configure.ac +++ b/contrib/expat/configure.ac @@ -89,9 +89,9 @@ dnl dnl If the API changes incompatibly set LIBAGE back to 0 dnl -LIBCURRENT=12 # sync -LIBREVISION=3 # with -LIBAGE=11 # CMakeLists.txt! +LIBCURRENT=13 # sync +LIBREVISION=0 # with +LIBAGE=12 # CMakeLists.txt! AC_CONFIG_HEADERS([expat_config.h]) AH_TOP([#ifndef EXPAT_CONFIG_H @@ -217,21 +217,51 @@ AM_CONDITIONAL([_INTERNAL_LARGE_SIZE], [echo -- "${CPPFLAGS}${CFLAGS}" | ${FGREP LT_LIB_M -AC_MSG_CHECKING([for arc4random_buf (BSD or glibc 2.36+)]) -AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main(void) { - char dummy[[123]]; // double brackets for m4 - arc4random_buf(dummy, 0U); - return 0; - } - ])], - [AC_DEFINE([HAVE_ARC4RANDOM_BUF], [1], [Define to 1 if you have the `arc4random_buf' function.]) - AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]) - - AC_MSG_CHECKING([for arc4random (BSD, macOS, or glibc 2.36+)]) +AC_ARG_WITH([arc4random], + [AS_HELP_STRING([--with-arc4random], + [enforce the use of arc4random function in the system @<:@default=check@:>@]) +AS_HELP_STRING([--without-arc4random], + [skip auto detect of arc4random @<:@default=check@:>@])], + [], + [with_arc4random=check]) + +AC_ARG_WITH([arc4random-buf], + [AS_HELP_STRING([--with-arc4random-buf], + [enforce the use of arc4random_buf function in the system @<:@default=check@:>@]) +AS_HELP_STRING([--without-arc4random-buf], + [skip auto detect of arc4random_buf @<:@default=check@:>@])], + [], + [with_arc4random_buf=check]) + +have_arc4random=false +have_arc4random_buf=false + +AS_IF([test "x${with_arc4random_buf}" != xno], + [AC_MSG_CHECKING([for arc4random_buf (BSD or glibc 2.36+)]) AC_LINK_IFELSE([AC_LANG_SOURCE([ + #if ! defined(_DEFAULT_SOURCE) + # define _DEFAULT_SOURCE 1 /* for glibc */ + #endif + #include + int main(void) { + char dummy[[123]]; // double brackets for m4 + arc4random_buf(dummy, 0U); + return 0; + } + ])], + [AC_DEFINE([HAVE_ARC4RANDOM_BUF], [1], [Define to 1 if you have the `arc4random_buf' function.]) + have_arc4random_buf=true + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AS_IF([test "x${with_arc4random_buf}" = xyes], + [AC_MSG_ERROR([enforced the use of arc4random_buf --with-arc4random-buf, but not detected])])])]) + +AS_IF([test "x${with_arc4random}" != xno], + [AC_MSG_CHECKING([for arc4random (BSD, macOS, or glibc 2.36+)]) + AC_LINK_IFELSE([AC_LANG_SOURCE([ + #if ! defined(_DEFAULT_SOURCE) + # define _DEFAULT_SOURCE 1 /* for glibc */ + #endif #include int main(void) { arc4random(); @@ -239,8 +269,58 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([ } ])], [AC_DEFINE([HAVE_ARC4RANDOM], [1], [Define to 1 if you have the `arc4random' function.]) + have_arc4random=true + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AS_IF([test "x${with_arc4random}" = xyes], + [AC_MSG_ERROR([enforced the use of arc4random --with-arc4random, but not detected])])])]) + +AM_CONDITIONAL([WITH_ARC4RANDOM], [test x${have_arc4random} = xtrue]) +AM_CONDITIONAL([WITH_ARC4RANDOM_BUF], [test x${have_arc4random_buf} = xtrue]) + +have_getentropy=false + +AC_ARG_WITH([getentropy], + [AS_HELP_STRING([--with-getentropy], + [enforce the use of getentropy function in the system @<:@default=check@:>@]) +AS_HELP_STRING([--without-getentropy], + [skip auto detect of getentropy @<:@default=check@:>@])], + [], + [with_getentropy=check]) + +AS_IF([test "x$with_getentropy" != xno], + [AC_MSG_CHECKING([for getentropy (BSD, macOS 10.12+, glibc 2.25+)]) + AC_LINK_IFELSE([AC_LANG_SOURCE([ + // NOTE: Please keep this block in sync with its two siblings in files + // 'ConfigureChecks.cmake' and 'lib/random_getentropy.c'! + #if defined(__APPLE__) + # include + #else + # if defined(__GLIBC__) && ! defined(_DEFAULT_SOURCE) + # define _DEFAULT_SOURCE 1 + # endif + # if ! defined(_GNU_SOURCE) + # define _GNU_SOURCE 1 /* for musl */ + # endif + # include + #endif // ! defined(__APPLE__) + + int main(void) { + return getentropy(NULL, 0U); + } + ])], + [AC_DEFINE([HAVE_GETENTROPY], [1], [Define to 1 if you have the `getentropy' function.]) + have_getentropy=true AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no])])]) + [AC_MSG_RESULT([no]) + AS_IF([test "x$with_getentropy" = xyes], + [AC_MSG_ERROR([enforced the use of getentropy --with-getentropy, but not detected])])])]) + +AM_CONDITIONAL([WITH_GETENTROPY], [test x${have_getentropy} = xtrue]) + +have_either_getrandom=false +have_getrandom_function=false +have_getrandom_syscall=false AC_ARG_WITH([getrandom], [AS_HELP_STRING([--with-getrandom], @@ -260,6 +340,8 @@ AS_IF([test "x$with_getrandom" != xno], } ])], [AC_DEFINE([HAVE_GETRANDOM], [1], [Define to 1 if you have the `getrandom' function.]) + have_either_getrandom=true + have_getrandom_function=true AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) AS_IF([test "x$with_getrandom" = xyes], @@ -286,11 +368,15 @@ AS_IF([test "x$with_sys_getrandom" != xno], } ])], [AC_DEFINE([HAVE_SYSCALL_GETRANDOM], [1], [Define to 1 if you have `syscall' and `SYS_getrandom'.]) + have_either_getrandom=true + have_getrandom_syscall=true AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) AS_IF([test "x$with_sys_getrandom" = xyes], [AC_MSG_ERROR([enforced the use of syscall SYS_getrandom --with-sys-getrandom, but not detected])])])]) +AM_CONDITIONAL([WITH_EITHER_GETRANDOM], [test x${have_either_getrandom} = xtrue]) + dnl Only needed for xmlwf: AC_CHECK_HEADERS(fcntl.h unistd.h) AC_TYPE_OFF_T @@ -486,4 +572,17 @@ User flags (override Automake flags on conflict): CPPFLAGS: ${CPPFLAGS} CFLAGS: ${CFLAGS} CXXFLAGS: ${CXXFLAGS} - LDFLAGS: ${LDFLAGS}]) + LDFLAGS: ${LDFLAGS} + +Entropy sources: + arc4random: ${have_arc4random} + arc4random_buf: ${have_arc4random_buf} + getentropy: ${have_getentropy} + getrandom: ${have_getrandom_function} + syscall SYS_getrandom: ${have_getrandom_syscall} + /dev/urandom: true + +Continue with e.g.: + make -j2 + make check + sudo make install]) diff --git a/contrib/expat/doc/reference.html b/contrib/expat/doc/reference.html index 5faa8d6515af..195bd183fd82 100644 --- a/contrib/expat/doc/reference.html +++ b/contrib/expat/doc/reference.html @@ -53,7 +53,7 @@

    - The Expat XML Parser Release 2.7.5 + The Expat XML Parser Release 2.8.0

    @@ -404,7 +404,11 @@
  • - XML_SetHashSalt + XML_SetHashSalt (deprecated) +
    • + +
  • + XML_SetHashSalt16Bytes
  • @@ -3449,22 +3453,35 @@ XML_SetParamEntityParsing(XML_Parser p,

    - XML_SetHashSalt + XML_SetHashSalt (deprecated) 

     int XMLCALL
-XML_SetHashSalt(XML_Parser p,
+XML_SetHashSalt(XML_Parser parser,
                 unsigned long hash_salt);
    Sets the hash salt to use for internal hash calculations. Helps in preventing DoS attacks based on predicting hash function behavior. In order to have an effect this must be called before parsing has started. Returns 1 if successful, 0 when - called after XML_Parse or XML_ParseBuffer. + called after XML_Parse or XML_ParseBuffer or when + parser is NULL. +

    + Note: Function XML_SetHashSalt is + deprecated. Please use function XML_SetHashSalt16Bytes instead for better + security. XML_SetHashSalt only provides 4 to 8 bytes of entropy + (depending on the size of type unsigned long) while the SipHash + implementation used by Expat can leverage up to 16 bytes of entropy — at least + twice as much. Function XML_SetHashSalt16Bytes of Expat >=2.8.0 + (and where backported) matches the amount of entropy supported by SipHash. +

    +

    Note: This call is optional, as the parser will auto-generate a new - random salt value if no value has been set at the start of parsing. + random salt value internally if no value has been set by the start of parsing.

    @@ -3475,6 +3492,34 @@ XML_SetHashSalt(XML_Parser p,

    +

    + XML_SetHashSalt16Bytes +

    + + 
    +/* Added in Expat 2.8.0. */
+XML_Bool XMLCALL
+XML_SetHashSalt16Bytes(XML_Parser parser,
+                       const uint8_t entropy[16]);
+
    +
    + Sets the hash salt to use for internal hash calculations. Helps in preventing DoS + attacks based on predicting hash function behavior. In order to have an effect + this must be called before parsing has started. Returns XML_TRUE if + successful, XML_FALSE when called after XML_Parse or + XML_ParseBuffer or when parser is NULL. +

    + Note: Setting a salt that is not from a source of high quality + entropy (like getentropy(3)) will make the parser vulnerable to + hash flooding attacks. +

    + +

    + Note: This call is optional, as the parser will auto-generate a new + random salt value internally if no value has been set by the start of parsing. +

    +
    +

    XML_UseForeignDTD

    diff --git a/contrib/expat/doc/xmlwf.1 b/contrib/expat/doc/xmlwf.1 index 75318fccc856..0736f110e3c1 100644 --- a/contrib/expat/doc/xmlwf.1 +++ b/contrib/expat/doc/xmlwf.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH XMLWF 1 "March 17, 2026" "" "" +.TH XMLWF 1 "April 24, 2026" "" "" .SH NAME xmlwf \- Determines if an XML document is well-formed .SH SYNOPSIS diff --git a/contrib/expat/doc/xmlwf.xml b/contrib/expat/doc/xmlwf.xml index c4fe92d44fb4..3a3897750cb1 100644 --- a/contrib/expat/doc/xmlwf.xml +++ b/contrib/expat/doc/xmlwf.xml @@ -21,7 +21,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ Scott"> Bronson"> - March 17, 2026"> + April 24, 2026"> 1"> bronson@rinspin.com"> diff --git a/contrib/expat/examples/element_declarations.c b/contrib/expat/examples/element_declarations.c index d644b2ffa5ea..d864cf70a2f7 100644 --- a/contrib/expat/examples/element_declarations.c +++ b/contrib/expat/examples/element_declarations.c @@ -16,6 +16,7 @@ Copyright (c) 2017 Rhodri James Copyright (c) 2019 Zhongyuan Zhou Copyright (c) 2024 Hanno Böck + Copyright (c) 2026 Matthew Fernandez Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining @@ -82,7 +83,7 @@ stackPopFree(Stack *stackTop) { return newStackTop; } -static char * +static const char * contentTypeName(enum XML_Content_Type contentType) { switch (contentType) { case XML_CTYPE_EMPTY: @@ -102,7 +103,7 @@ contentTypeName(enum XML_Content_Type contentType) { } } -static char * +static const char * contentQuantName(enum XML_Content_Quant contentQuant) { switch (contentQuant) { case XML_CQUANT_NONE: diff --git a/contrib/expat/expat_config.h.in b/contrib/expat/expat_config.h.in index 7541bf6005e6..4d7d732e8052 100644 --- a/contrib/expat/expat_config.h.in +++ b/contrib/expat/expat_config.h.in @@ -24,6 +24,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_FCNTL_H +/* Define to 1 if you have the `getentropy' function. */ +#undef HAVE_GETENTROPY + /* Define to 1 if you have the 'getpagesize' function. */ #undef HAVE_GETPAGESIZE diff --git a/contrib/expat/lib/Makefile.am b/contrib/expat/lib/Makefile.am index 493077231c57..27bf2ab64769 100644 --- a/contrib/expat/lib/Makefile.am +++ b/contrib/expat/lib/Makefile.am @@ -55,6 +55,42 @@ libexpat_la_SOURCES = \ xmltok.c \ xmlrole.c +if WITH_ARC4RANDOM + libexpat_la_SOURCES += \ + random_arc4random.c \ + random_arc4random.h +endif + +if WITH_ARC4RANDOM_BUF + libexpat_la_SOURCES += \ + random_arc4random_buf.c \ + random_arc4random_buf.h +endif + +if ! MINGW + libexpat_la_SOURCES += \ + random_dev_urandom.c \ + random_dev_urandom.h +endif + +if WITH_GETENTROPY + libexpat_la_SOURCES += \ + random_getentropy.c \ + random_getentropy.h +endif + +if WITH_EITHER_GETRANDOM + libexpat_la_SOURCES += \ + random_getrandom.c \ + random_getrandom.h +endif + +if MINGW + libexpat_la_SOURCES += \ + random_rand_s.c \ + random_rand_s.h +endif + if WITH_TESTS libtestpat_la_CPPFLAGS = -DXML_TESTING diff --git a/contrib/expat/lib/Makefile.in b/contrib/expat/lib/Makefile.in index d8e4fd59e117..4cd6fcfc6088 100644 --- a/contrib/expat/lib/Makefile.in +++ b/contrib/expat/lib/Makefile.in @@ -126,6 +126,30 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @HAVE_VSCRIPT_TRUE@am__append_1 = $(VSCRIPT_LDFLAGS),@builddir@/libexpat.map +@WITH_ARC4RANDOM_TRUE@am__append_2 = \ +@WITH_ARC4RANDOM_TRUE@ random_arc4random.c \ +@WITH_ARC4RANDOM_TRUE@ random_arc4random.h + +@WITH_ARC4RANDOM_BUF_TRUE@am__append_3 = \ +@WITH_ARC4RANDOM_BUF_TRUE@ random_arc4random_buf.c \ +@WITH_ARC4RANDOM_BUF_TRUE@ random_arc4random_buf.h + +@MINGW_FALSE@am__append_4 = \ +@MINGW_FALSE@ random_dev_urandom.c \ +@MINGW_FALSE@ random_dev_urandom.h + +@WITH_GETENTROPY_TRUE@am__append_5 = \ +@WITH_GETENTROPY_TRUE@ random_getentropy.c \ +@WITH_GETENTROPY_TRUE@ random_getentropy.h + +@WITH_EITHER_GETRANDOM_TRUE@am__append_6 = \ +@WITH_EITHER_GETRANDOM_TRUE@ random_getrandom.c \ +@WITH_EITHER_GETRANDOM_TRUE@ random_getrandom.h + +@MINGW_TRUE@am__append_7 = \ +@MINGW_TRUE@ random_rand_s.c \ +@MINGW_TRUE@ random_rand_s.h + subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ @@ -180,7 +204,21 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(docdir)" \ "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) libexpat_la_LIBADD = -am_libexpat_la_OBJECTS = xmlparse.lo xmltok.lo xmlrole.lo +am__libexpat_la_SOURCES_DIST = xmlparse.c xmltok.c xmlrole.c \ + random_arc4random.c random_arc4random.h \ + random_arc4random_buf.c random_arc4random_buf.h \ + random_dev_urandom.c random_dev_urandom.h random_getentropy.c \ + random_getentropy.h random_getrandom.c random_getrandom.h \ + random_rand_s.c random_rand_s.h +@WITH_ARC4RANDOM_TRUE@am__objects_1 = random_arc4random.lo +@WITH_ARC4RANDOM_BUF_TRUE@am__objects_2 = random_arc4random_buf.lo +@MINGW_FALSE@am__objects_3 = random_dev_urandom.lo +@WITH_GETENTROPY_TRUE@am__objects_4 = random_getentropy.lo +@WITH_EITHER_GETRANDOM_TRUE@am__objects_5 = random_getrandom.lo +@MINGW_TRUE@am__objects_6 = random_rand_s.lo +am_libexpat_la_OBJECTS = xmlparse.lo xmltok.lo xmlrole.lo \ + $(am__objects_1) $(am__objects_2) $(am__objects_3) \ + $(am__objects_4) $(am__objects_5) $(am__objects_6) libexpat_la_OBJECTS = $(am_libexpat_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -190,10 +228,26 @@ libexpat_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libexpat_la_LDFLAGS) $(LDFLAGS) -o $@ libtestpat_la_LIBADD = -am__libtestpat_la_SOURCES_DIST = xmlparse.c xmltok.c xmlrole.c -am__objects_1 = libtestpat_la-xmlparse.lo libtestpat_la-xmltok.lo \ - libtestpat_la-xmlrole.lo -@WITH_TESTS_TRUE@am_libtestpat_la_OBJECTS = $(am__objects_1) +am__libtestpat_la_SOURCES_DIST = xmlparse.c xmltok.c xmlrole.c \ + random_arc4random.c random_arc4random.h \ + random_arc4random_buf.c random_arc4random_buf.h \ + random_dev_urandom.c random_dev_urandom.h random_getentropy.c \ + random_getentropy.h random_getrandom.c random_getrandom.h \ + random_rand_s.c random_rand_s.h +@WITH_ARC4RANDOM_TRUE@am__objects_7 = \ +@WITH_ARC4RANDOM_TRUE@ libtestpat_la-random_arc4random.lo +@WITH_ARC4RANDOM_BUF_TRUE@am__objects_8 = libtestpat_la-random_arc4random_buf.lo +@MINGW_FALSE@am__objects_9 = libtestpat_la-random_dev_urandom.lo +@WITH_GETENTROPY_TRUE@am__objects_10 = \ +@WITH_GETENTROPY_TRUE@ libtestpat_la-random_getentropy.lo +@WITH_EITHER_GETRANDOM_TRUE@am__objects_11 = \ +@WITH_EITHER_GETRANDOM_TRUE@ libtestpat_la-random_getrandom.lo +@MINGW_TRUE@am__objects_12 = libtestpat_la-random_rand_s.lo +am__objects_13 = libtestpat_la-xmlparse.lo libtestpat_la-xmltok.lo \ + libtestpat_la-xmlrole.lo $(am__objects_7) $(am__objects_8) \ + $(am__objects_9) $(am__objects_10) $(am__objects_11) \ + $(am__objects_12) +@WITH_TESTS_TRUE@am_libtestpat_la_OBJECTS = $(am__objects_13) libtestpat_la_OBJECTS = $(am_libtestpat_la_OBJECTS) @WITH_TESTS_TRUE@am_libtestpat_la_rpath = AM_V_P = $(am__v_P_@AM_V@) @@ -211,10 +265,22 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/libtestpat_la-xmlparse.Plo \ +am__depfiles_remade = ./$(DEPDIR)/libtestpat_la-random_arc4random.Plo \ + ./$(DEPDIR)/libtestpat_la-random_arc4random_buf.Plo \ + ./$(DEPDIR)/libtestpat_la-random_dev_urandom.Plo \ + ./$(DEPDIR)/libtestpat_la-random_getentropy.Plo \ + ./$(DEPDIR)/libtestpat_la-random_getrandom.Plo \ + ./$(DEPDIR)/libtestpat_la-random_rand_s.Plo \ + ./$(DEPDIR)/libtestpat_la-xmlparse.Plo \ ./$(DEPDIR)/libtestpat_la-xmlrole.Plo \ - ./$(DEPDIR)/libtestpat_la-xmltok.Plo ./$(DEPDIR)/xmlparse.Plo \ - ./$(DEPDIR)/xmlrole.Plo ./$(DEPDIR)/xmltok.Plo + ./$(DEPDIR)/libtestpat_la-xmltok.Plo \ + ./$(DEPDIR)/random_arc4random.Plo \ + ./$(DEPDIR)/random_arc4random_buf.Plo \ + ./$(DEPDIR)/random_dev_urandom.Plo \ + ./$(DEPDIR)/random_getentropy.Plo \ + ./$(DEPDIR)/random_getrandom.Plo ./$(DEPDIR)/random_rand_s.Plo \ + ./$(DEPDIR)/xmlparse.Plo ./$(DEPDIR)/xmlrole.Plo \ + ./$(DEPDIR)/xmltok.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -235,7 +301,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libexpat_la_SOURCES) $(libtestpat_la_SOURCES) -DIST_SOURCES = $(libexpat_la_SOURCES) \ +DIST_SOURCES = $(am__libexpat_la_SOURCES_DIST) \ $(am__libtestpat_la_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ @@ -428,11 +494,9 @@ lib_LTLIBRARIES = libexpat.la @WITH_TESTS_TRUE@noinst_LTLIBRARIES = libtestpat.la libexpat_la_LDFLAGS = @AM_LDFLAGS@ @LIBM@ -no-undefined -version-info \ @LIBCURRENT@:@LIBREVISION@:@LIBAGE@ $(am__append_1) -libexpat_la_SOURCES = \ - xmlparse.c \ - xmltok.c \ - xmlrole.c - +libexpat_la_SOURCES = xmlparse.c xmltok.c xmlrole.c $(am__append_2) \ + $(am__append_3) $(am__append_4) $(am__append_5) \ + $(am__append_6) $(am__append_7) @WITH_TESTS_TRUE@libtestpat_la_CPPFLAGS = -DXML_TESTING @WITH_TESTS_TRUE@libtestpat_la_SOURCES = $(libexpat_la_SOURCES) doc_DATA = \ @@ -548,9 +612,21 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-random_arc4random.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-random_arc4random_buf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-random_dev_urandom.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-random_getentropy.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-random_getrandom.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-random_rand_s.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-xmlparse.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-xmlrole.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-xmltok.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random_arc4random.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random_arc4random_buf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random_dev_urandom.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random_getentropy.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random_getrandom.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random_rand_s.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlparse.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlrole.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltok.Plo@am__quote@ # am--include-marker @@ -603,6 +679,48 @@ libtestpat_la-xmlrole.lo: xmlrole.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libtestpat_la-xmlrole.lo `test -f 'xmlrole.c' || echo '$(srcdir)/'`xmlrole.c +libtestpat_la-random_arc4random.lo: random_arc4random.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libtestpat_la-random_arc4random.lo -MD -MP -MF $(DEPDIR)/libtestpat_la-random_arc4random.Tpo -c -o libtestpat_la-random_arc4random.lo `test -f 'random_arc4random.c' || echo '$(srcdir)/'`random_arc4random.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtestpat_la-random_arc4random.Tpo $(DEPDIR)/libtestpat_la-random_arc4random.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='random_arc4random.c' object='libtestpat_la-random_arc4random.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libtestpat_la-random_arc4random.lo `test -f 'random_arc4random.c' || echo '$(srcdir)/'`random_arc4random.c + +libtestpat_la-random_arc4random_buf.lo: random_arc4random_buf.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libtestpat_la-random_arc4random_buf.lo -MD -MP -MF $(DEPDIR)/libtestpat_la-random_arc4random_buf.Tpo -c -o libtestpat_la-random_arc4random_buf.lo `test -f 'random_arc4random_buf.c' || echo '$(srcdir)/'`random_arc4random_buf.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtestpat_la-random_arc4random_buf.Tpo $(DEPDIR)/libtestpat_la-random_arc4random_buf.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='random_arc4random_buf.c' object='libtestpat_la-random_arc4random_buf.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libtestpat_la-random_arc4random_buf.lo `test -f 'random_arc4random_buf.c' || echo '$(srcdir)/'`random_arc4random_buf.c + +libtestpat_la-random_dev_urandom.lo: random_dev_urandom.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libtestpat_la-random_dev_urandom.lo -MD -MP -MF $(DEPDIR)/libtestpat_la-random_dev_urandom.Tpo -c -o libtestpat_la-random_dev_urandom.lo `test -f 'random_dev_urandom.c' || echo '$(srcdir)/'`random_dev_urandom.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtestpat_la-random_dev_urandom.Tpo $(DEPDIR)/libtestpat_la-random_dev_urandom.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='random_dev_urandom.c' object='libtestpat_la-random_dev_urandom.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libtestpat_la-random_dev_urandom.lo `test -f 'random_dev_urandom.c' || echo '$(srcdir)/'`random_dev_urandom.c + +libtestpat_la-random_getentropy.lo: random_getentropy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libtestpat_la-random_getentropy.lo -MD -MP -MF $(DEPDIR)/libtestpat_la-random_getentropy.Tpo -c -o libtestpat_la-random_getentropy.lo `test -f 'random_getentropy.c' || echo '$(srcdir)/'`random_getentropy.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtestpat_la-random_getentropy.Tpo $(DEPDIR)/libtestpat_la-random_getentropy.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='random_getentropy.c' object='libtestpat_la-random_getentropy.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libtestpat_la-random_getentropy.lo `test -f 'random_getentropy.c' || echo '$(srcdir)/'`random_getentropy.c + +libtestpat_la-random_getrandom.lo: random_getrandom.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libtestpat_la-random_getrandom.lo -MD -MP -MF $(DEPDIR)/libtestpat_la-random_getrandom.Tpo -c -o libtestpat_la-random_getrandom.lo `test -f 'random_getrandom.c' || echo '$(srcdir)/'`random_getrandom.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtestpat_la-random_getrandom.Tpo $(DEPDIR)/libtestpat_la-random_getrandom.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='random_getrandom.c' object='libtestpat_la-random_getrandom.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libtestpat_la-random_getrandom.lo `test -f 'random_getrandom.c' || echo '$(srcdir)/'`random_getrandom.c + +libtestpat_la-random_rand_s.lo: random_rand_s.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libtestpat_la-random_rand_s.lo -MD -MP -MF $(DEPDIR)/libtestpat_la-random_rand_s.Tpo -c -o libtestpat_la-random_rand_s.lo `test -f 'random_rand_s.c' || echo '$(srcdir)/'`random_rand_s.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtestpat_la-random_rand_s.Tpo $(DEPDIR)/libtestpat_la-random_rand_s.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='random_rand_s.c' object='libtestpat_la-random_rand_s.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libtestpat_la-random_rand_s.lo `test -f 'random_rand_s.c' || echo '$(srcdir)/'`random_rand_s.c + mostlyclean-libtool: -rm -f *.lo @@ -779,9 +897,21 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-am + -rm -f ./$(DEPDIR)/libtestpat_la-random_arc4random.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_arc4random_buf.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_dev_urandom.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_getentropy.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_getrandom.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_rand_s.Plo -rm -f ./$(DEPDIR)/libtestpat_la-xmlparse.Plo -rm -f ./$(DEPDIR)/libtestpat_la-xmlrole.Plo -rm -f ./$(DEPDIR)/libtestpat_la-xmltok.Plo + -rm -f ./$(DEPDIR)/random_arc4random.Plo + -rm -f ./$(DEPDIR)/random_arc4random_buf.Plo + -rm -f ./$(DEPDIR)/random_dev_urandom.Plo + -rm -f ./$(DEPDIR)/random_getentropy.Plo + -rm -f ./$(DEPDIR)/random_getrandom.Plo + -rm -f ./$(DEPDIR)/random_rand_s.Plo -rm -f ./$(DEPDIR)/xmlparse.Plo -rm -f ./$(DEPDIR)/xmlrole.Plo -rm -f ./$(DEPDIR)/xmltok.Plo @@ -831,9 +961,21 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/libtestpat_la-random_arc4random.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_arc4random_buf.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_dev_urandom.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_getentropy.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_getrandom.Plo + -rm -f ./$(DEPDIR)/libtestpat_la-random_rand_s.Plo -rm -f ./$(DEPDIR)/libtestpat_la-xmlparse.Plo -rm -f ./$(DEPDIR)/libtestpat_la-xmlrole.Plo -rm -f ./$(DEPDIR)/libtestpat_la-xmltok.Plo + -rm -f ./$(DEPDIR)/random_arc4random.Plo + -rm -f ./$(DEPDIR)/random_arc4random_buf.Plo + -rm -f ./$(DEPDIR)/random_dev_urandom.Plo + -rm -f ./$(DEPDIR)/random_getentropy.Plo + -rm -f ./$(DEPDIR)/random_getrandom.Plo + -rm -f ./$(DEPDIR)/random_rand_s.Plo -rm -f ./$(DEPDIR)/xmlparse.Plo -rm -f ./$(DEPDIR)/xmlrole.Plo -rm -f ./$(DEPDIR)/xmltok.Plo diff --git a/contrib/expat/lib/expat.h b/contrib/expat/lib/expat.h index 18dbaebde293..79c609f19aa4 100644 --- a/contrib/expat/lib/expat.h +++ b/contrib/expat/lib/expat.h @@ -45,6 +45,7 @@ #ifndef Expat_INCLUDED # define Expat_INCLUDED 1 +# include // for uint8_t # include # include "expat_external.h" @@ -917,10 +918,21 @@ XML_SetParamEntityParsing(XML_Parser parser, function behavior. This must be called before parsing is started. Returns 1 if successful, 0 when called after parsing has started. Note: If parser == NULL, the function will do nothing and return 0. + DEPRECATED since Expat 2.8.0. */ XMLPARSEAPI(int) XML_SetHashSalt(XML_Parser parser, unsigned long hash_salt); +/* Sets the hash salt to use for internal hash calculations. + Helps in preventing DoS attacks based on predicting hash function behavior. + This must be called before parsing is started. + Returns XML_TRUE if successful, XML_FALSE when called after parsing has + started or when parser is NULL. + Added in Expat 2.8.0. +*/ +XMLPARSEAPI(XML_Bool) +XML_SetHashSalt16Bytes(XML_Parser parser, const uint8_t entropy[16]); + /* If XML_Parse or XML_ParseBuffer have returned XML_STATUS_ERROR, then XML_GetErrorCode returns information about the error. */ @@ -1081,8 +1093,8 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled); See https://semver.org */ # define XML_MAJOR_VERSION 2 -# define XML_MINOR_VERSION 7 -# define XML_MICRO_VERSION 5 +# define XML_MINOR_VERSION 8 +# define XML_MICRO_VERSION 0 # ifdef __cplusplus } diff --git a/contrib/expat/lib/expat_external.h b/contrib/expat/lib/expat_external.h index d9ddeb612f6d..7f5c4c3aae4d 100644 --- a/contrib/expat/lib/expat_external.h +++ b/contrib/expat/lib/expat_external.h @@ -12,9 +12,10 @@ Copyright (c) 2001-2002 Greg Stein Copyright (c) 2002-2006 Karl Waclawek Copyright (c) 2016 Cristian Rodríguez - Copyright (c) 2016-2026 Sebastian Pipping + Copyright (c) 2016-2025 Sebastian Pipping Copyright (c) 2017 Rhodri James Copyright (c) 2018 Yury Gribov + Copyright (c) 2026 Matthew Fernandez Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining @@ -45,7 +46,7 @@ /* Expat tries very hard to make the API boundary very specifically defined. There are two macros defined to control this boundary; each of these can be defined before including this header to - achieve some different behavior, but doing so it not recommended or + achieve some different behavior, but doing so is not recommended or tested frequently. XMLCALL - The calling convention to use for all calls across the diff --git a/contrib/expat/lib/internal.h b/contrib/expat/lib/internal.h index 61266ebb7723..420d4217a569 100644 --- a/contrib/expat/lib/internal.h +++ b/contrib/expat/lib/internal.h @@ -28,7 +28,7 @@ Copyright (c) 2002-2003 Fred L. Drake, Jr. Copyright (c) 2002-2006 Karl Waclawek Copyright (c) 2003 Greg Stein - Copyright (c) 2016-2025 Sebastian Pipping + Copyright (c) 2016-2026 Sebastian Pipping Copyright (c) 2018 Yury Gribov Copyright (c) 2019 David Loffredo Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow @@ -113,6 +113,7 @@ #if defined(_WIN32) \ && (! defined(__USE_MINGW_ANSI_STDIO) \ || (1 - __USE_MINGW_ANSI_STDIO - 1 == 0)) +# define EXPAT_FMT_LLX(midpart) "%" midpart "I64x" # define EXPAT_FMT_ULL(midpart) "%" midpart "I64u" # if defined(_WIN64) // Note: modifiers "td" and "zu" do not work for MinGW # define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "I64d" @@ -122,6 +123,7 @@ # define EXPAT_FMT_SIZE_T(midpart) "%" midpart "u" # endif #else +# define EXPAT_FMT_LLX(midpart) "%" midpart "llx" # define EXPAT_FMT_ULL(midpart) "%" midpart "llu" # if ! defined(ULONG_MAX) # error Compiler did not define ULONG_MAX for us diff --git a/contrib/expat/lib/libexpat.map.in b/contrib/expat/lib/libexpat.map.in index 52e59ed3d931..71a6758fd746 100644 --- a/contrib/expat/lib/libexpat.map.in +++ b/contrib/expat/lib/libexpat.map.in @@ -117,3 +117,8 @@ LIBEXPAT_2.7.2 { @_EXPAT_COMMENT_DTD_OR_GE@ XML_SetAllocTrackerActivationThreshold; @_EXPAT_COMMENT_DTD_OR_GE@ XML_SetAllocTrackerMaximumAmplification; } LIBEXPAT_2.6.0; + +LIBEXPAT_2.8.0 { + global: + XML_SetHashSalt16Bytes; +} LIBEXPAT_2.7.2; diff --git a/contrib/expat/lib/random_arc4random.c b/contrib/expat/lib/random_arc4random.c new file mode 100644 index 000000000000..243fbbc82fda --- /dev/null +++ b/contrib/expat/lib/random_arc4random.c @@ -0,0 +1,56 @@ +/* + __ __ _ + ___\ \/ /_ __ __ _| |_ + / _ \\ /| '_ \ / _` | __| + | __// \| |_) | (_| | |_ + \___/_/\_\ .__/ \__,_|\__| + |_| XML parser + + Copyright (c) 2017-2026 Sebastian Pipping + Copyright (c) 2026 Matthew Fernandez + Licensed under the MIT license: + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to permit + persons to whom the Software is furnished to do so, subject to the + following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN + NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +#include "random_arc4random.h" + +#if ! defined(_DEFAULT_SOURCE) +# define _DEFAULT_SOURCE 1 /* for glibc */ +#endif + +#include // for uint32_t +#include // for arc4random *** 2045 LINES SKIPPED *** From nobody Mon May 4 07:17:01 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8CdB2KnZz6cm1q for ; Mon, 04 May 2026 07:17: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 4g8Cd96DDlz3Kb7 for ; Mon, 04 May 2026 07:17:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777879021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p0s1bLVGWAcmgDKjENdxrboglzu/1fV5PI4wDz+dOOc=; b=jpYeWlRlMxpnH7qcTtDnVCe5rKbraIJQmBJP4iT9YXUqxcIwYJ5Y9jk4zWH/L+dKvyh2XG 6GagsYuZXEiSUbQlwIIC/5bp6Hnd/B2q74lkJXgqfwBe7rCAxZI46AzFqCiugjfvCGZnex 5f04Dp10yJRzhFNs3asKmjVjoCYVi+AveH32PyXzF2WobeLNkoHT2IuCzkuvouwZVH9bXz AePWi9WisGGkf1Qw4n7KpH0ZHosL3ZsqmOgPrDXcvbfm5I8hR/livwN0Sn0GZUVlQB0Qdz UXEaPQpiBeyutrcKWdvyKNEWqJJtxhpQTYuqxm5o1/WLjqMh1u/hCZXFicBFrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777879021; a=rsa-sha256; cv=none; b=baQSU2Mk5OaL8UaSV9bq4IhTYvrBYGsFyCYcY1eG3PdfK5IKo35EOGaB+HNXLj2cZMFA2e tKfio9sW0A86vDOsTfcZRcgX7uibS/N1HRHfAvfL/2Ll77NQsTMrNNF6v3eqkmuIpY6Ycd f9MEzgXfg1LRhL6R1FkThmCEcB8maVlk/3CnZNbmJxnj1ivJk9kosPPwbIXef/NegSWhw3 uBANjQI/D9KEaXV9oD93/68QLA3uFUWYY/+EFi40Vc+LkESstaayrITmeNRmo4zpdh44Sr +SWqFnUdLZlpzPVonu4oeswyRRO1OM/LGL6eVwgUogJ1ynUKM5YEtmz5tuXKOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777879021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p0s1bLVGWAcmgDKjENdxrboglzu/1fV5PI4wDz+dOOc=; b=YDIqRvXcUzSzQtDAoDuzC31CYeeBb69wLx8c1Slr/Xu+WwmpSrlc8S4E4Uyn2koocYJ9NI B8zVqWO4o7Ek6/iuWjn4basbqTol7FV894Ai3IzsJ7AFJeMjGhMYy5rZh7iNwwXoeBuo/H f/vmxvkGCvMqmHMz0SghB/RS9ZUHtxhQqdrpGjw6+uf2lheWRhWeg4p8mCf+Wjrl89VtAd UjK4WDHN//CqVW7q/YC/ay4RP0YXac3ssVaTtveTCE8AGiXLcdC8ZPVdQwu6AHtEAclU7h bb5pP1ilu73AV6buJ4zwYCDntZAkzBSfWnBCUzZZAULDapcsk/6bY0RrM002QA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8Cd93TWFz18cs for ; Mon, 04 May 2026 07:17:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f152 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 07:17:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: fba39d50f781 - stable/15 - init: build dynamically List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: fba39d50f7819289c226c8c39d423fab1778c8d8 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 07:17:01 +0000 Message-Id: <69f847ed.3f152.73d17b76@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fba39d50f7819289c226c8c39d423fab1778c8d8 commit fba39d50f7819289c226c8c39d423fab1778c8d8 Author: Konstantin Belousov AuthorDate: 2026-04-20 17:52:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-04 07:16:39 +0000 init: build dynamically (cherry picked from commit 24d887436dcd5b6c18a7505e477c79cae3002c3a) --- sbin/init/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/sbin/init/Makefile b/sbin/init/Makefile index 1fc9b633f664..342df4596a72 100644 --- a/sbin/init/Makefile +++ b/sbin/init/Makefile @@ -10,6 +10,4 @@ LIBADD= util crypt CONFTTYSNAME= ttys CONFTTYS+= ttys -NO_SHARED?= YES - .include From nobody Mon May 4 07:17:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8CdC0DtZz6cm01 for ; Mon, 04 May 2026 07:17: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 4g8CdB5168z3KrD for ; Mon, 04 May 2026 07:17:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777879022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KU62D0PjwiQELbFoTghX5r7AIGRSrMIFV29f9ulJCNE=; b=ZNKHb3+LLdu5CoIW80/koL3RpbKIJaF9GoHp4hMKWZv6PTs9FYwz7JJOQvUlXklXiGwjDh rzaUlidfUBysIe2YC59e9psBogRdkBkj7a+4W2vCkI+wwm2EQHXefEIxT2FX/iU6uH7KWM UHseSbZJDoFa/ZaUNSGARNK59OJoRUUka7JZRV2srxb72nX8IKBu0Se2BjqBE28ZOlaz7T RKN8MU7Qqe1dd+zendQJOrw+RFk7UjIFsNlDb01TtBMABTCN7uwhnIULTJy9nnahzwNjan cdbOvs0O360Zc4Lye9pD8v7mwSnl7BoBAt87ujm3hs+TEgN7DnUWPf6WeoRuQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777879022; a=rsa-sha256; cv=none; b=oKK7FpDvixjuStwspWpsgHMiJKk093JU7T/RQXa5ujDmzCbL34+uSxeK6YZVjU0ntpygdq U/qWlre2O5KNWAVEsrm9/E2+Uv0U2viF6QTjh9ZzDiL3aMLoiYegfZtJb5OoXfhhOOPlih TIno89XX3epz8csBPiPecIZ9iP+lT1tdSu7Jzv4fZPnxlMhWmPAMwBsknAeSzwERJBdJKd 3SP0WDX4aflb81DbIw7hx+UDSbJrTkVpgkFD0vPKiQxnjQHZHrGps1ST1O1fd7T4rEZE1L zep70+V8zF42rA0QqHXXct9g3yRclOoMMYfefnccrEI22eccHlDz40SBCiV4kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777879022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KU62D0PjwiQELbFoTghX5r7AIGRSrMIFV29f9ulJCNE=; b=PMhzR+jfohVr9mgp16VtqvUe8rAH0sMz1Tp1Sc8SE4SZg25EUljGdU1n7pfCiK6HpKRMtt tkXXR9XTCGyaRXDE1kqwUxM6SoujUcsOj6hfOJhKMfbulcS3WV3NxAqDFP+hOWIpH5Td71 pyQ16TKoP79TNbxq6OxbgygCJsaRRu9AjGvl6qdx1FCA35rV3hU3xcAzEBr04IFyBajVPx QVtGezmA5bq9jowehnZMewMs3zm3iIRLJmpeicbAKhDTGGxpNg/Hx/zsJy79zyI8tduzIH ImsnFFQKreST+fcHmU6usydcg4nwV/u3JfjkQdcaLdKOjZCzBnRgU1Ihs7LyZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8CdB49SBz17ZT for ; Mon, 04 May 2026 07:17:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4100c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 07:17:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0276461a2d88 - stable/15 - bin/sh: make it possible to use as interactive init List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 0276461a2d88aaf41158a9b4ba25342a644aa1c5 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 07:17:02 +0000 Message-Id: <69f847ee.4100c.692e8132@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0276461a2d88aaf41158a9b4ba25342a644aa1c5 commit 0276461a2d88aaf41158a9b4ba25342a644aa1c5 Author: Konstantin Belousov AuthorDate: 2026-04-20 18:03:39 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-04 07:16:39 +0000 bin/sh: make it possible to use as interactive init (cherry picked from commit d7338bb4914d120e5719d3216b23a509c49ed3be) --- bin/sh/main.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/bin/sh/main.c b/bin/sh/main.c index 94e8da6b4921..0ca2d4942426 100644 --- a/bin/sh/main.c +++ b/bin/sh/main.c @@ -39,6 +39,9 @@ #include #include #include +#include +#include +#include #include "shell.h" #include "main.h" @@ -124,6 +127,22 @@ main(int argc, char *argv[]) trputs("Shell args: "); trargs(argv); #endif rootpid = getpid(); + if (rootpid == 1) { + /* + * Make sh usable for invocation as interactive init + * substitute with init_path=/bin/sh, by opening + * file descriptors 0, 1, and 2 on /dev/console. + */ + if (fcntl(STDIN_FILENO, F_GETFL, NULL) == -1 && errno == EBADF) { + (void)open(_PATH_CONSOLE, O_RDWR); + (void)setsid(); + (void)tcsetsid(STDIN_FILENO, rootpid); + } + if (fcntl(STDOUT_FILENO, F_GETFL, NULL) == -1 && errno == EBADF) + (void)dup2(STDIN_FILENO, STDOUT_FILENO); + if (fcntl(STDERR_FILENO, F_GETFL, NULL) == -1 && errno == EBADF) + (void)dup2(STDIN_FILENO, STDERR_FILENO); + } rootshell = 1; INTOFF; initvar(); From nobody Mon May 4 07:17:04 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8CdF0YMFz6cllY for ; Mon, 04 May 2026 07:17: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 4g8CdD6J12z3KlS for ; Mon, 04 May 2026 07:17:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777879024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n0NhDFMsQOHxU0BtZTpdIH0acYAbp2vZj5mjFvmdnKY=; b=rAyiZmiHiFjbo7Vr0mG/gyWykot2EPc+Rtkyc2jTImM148DeiYaj23T3Tk/R4l0RXV0IU1 hETOWlsQLdjfp4xwz1f9p36kui6vnM+OUMQIV0c+N7XuWPPPn7RJDj8oSdlq0Lr8urX7zI YcvoxgFxA/ZRAUqxbscPcLFcwhU0CIcm/7mDbmmHNghDq9SOXpDy67S9AckXDIQChdZCgN hN2hNOeiNKsK5hOyLJxmhKq5Yma90gIt9ZOiiyY2co6UcNs7uKh4iq3SOE9xzAbXD9GGe4 oypJa8Ld7AM1OgFHI5/pnAhcmMseNybXqgKnXSeaNEOsUqbXR8ct9XCAm/7LFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777879024; a=rsa-sha256; cv=none; b=XK+zHjXkpKL7IJ2dad8U6vA2ppsOwZ/wugTxI70FCz7HwxEZ8Pj19n67C5bMMHqRYjBMb4 ykV7TOXB/pYd9xSSIJyka8ZDJ0K4Cy7jG612Ut8j4EJdmTDxEULvOk1SayeIg4lWr+lgY3 mCAi7uTPz3Yq16aMjl9RzzpxXTH8SZXyNmBjenEQ6ceg4f3lXJMMExk48TVz7xzI5v81fD XIYTu1iTur9MjMYFEc3Kuh2sSMi14snvBi0NR1gzS0jkL2jyeYmguFjIIUJ+ryQUdNP1Za OTyK/menpbnZFTaqFDUIyRmgf9QUTviqZXXEhdM9CW4qaUOqDXiUn3TsIVXoRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777879024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n0NhDFMsQOHxU0BtZTpdIH0acYAbp2vZj5mjFvmdnKY=; b=T2lrOHpw1qnylLOAYTOUxOzxHi3M98o3ZQwP+oPe+cjRl8VTbxI5FrM1OdcabvuUvRrR4g BbHLEmBi07ZIKm6HqJs48GNADcOi3bKaAJBwY0SxVDy5nY05fAhzVWHfhueZQ1rXC5X/0A lHa+/i6Fj0j6XaQgHgpVXn59s9GAK7acsz5eORsqg8CysMpYHuloY6FriQO9hL126jB/l+ MCw09CSzUI8uLjSRQQ5W5/JVT88mGtmkci3/v8aLSunuX2TMLEk/wNVyATBbm/1w5hwivA QckD62/LHaD6hws3iDPQndGz1A/cL3XBKJlB9SGdkX4uHCEQKdLsdY2lxyxyuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8CdD5lMYz18XF for ; Mon, 04 May 2026 07:17:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 413f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 07:17:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1332831c5aa7 - stable/15 - init.8: document init_path among loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 1332831c5aa7e2b828fd799b8ecc137421eadcb4 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 07:17:04 +0000 Message-Id: <69f847f0.413f8.561ba45@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1332831c5aa7e2b828fd799b8ecc137421eadcb4 commit 1332831c5aa7e2b828fd799b8ecc137421eadcb4 Author: Konstantin Belousov AuthorDate: 2026-04-26 10:20:16 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-04 07:16:39 +0000 init.8: document init_path among loader tunables (cherry picked from commit 9e6ae89d831a4ddce0925ac3682d602a71f1b26d) --- sbin/init/init.8 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sbin/init/init.8 b/sbin/init/init.8 index 8f6e78b79d7b..f86adf53b361 100644 --- a/sbin/init/init.8 +++ b/sbin/init/init.8 @@ -396,6 +396,11 @@ back to the default, so that the .Pa /etc/rc script is executed with the standard shell .Pa /bin/sh . +.It Va init_path +Specifies the path used to search for the init binary. +More than one binary can be listed in the string, +candidate file names are split by the \[lq]:\[rq] separator. +Each name is opened in sequence until a valid executable is found. .El .Sh FILES .Bl -tag -width /var/log/init.log -compact From nobody Mon May 4 07:17:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8CdH3SFkz6cm4N for ; Mon, 04 May 2026 07:17: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 4g8CdH0fJ8z3Kdp for ; Mon, 04 May 2026 07:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777879027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rbw8KsmthzCG6KLZRFCuqMqSHkb5bTWx1ECk4nLirdI=; b=EpeQ2/8mZNsXt4LCrdIkLo2IHO4BZUFUmWDBZmYB+tKPavTv8/NvIE3UfiO5xjzXB1df// fztac0oWd0OAihcoYzeXmQ7WxCIFt7BtI8GjyFnq3X+Xt5a2/zAril7pVbELQZUJffhcSM 0xZhD+n8FJ/OTHmLt0p1Tc4kmh8BvmSW4oeGEByAacfpYt0ZKm8/5+rwDwzANRWGPe2wEh JJ/QFM5V/unLvffGhlw87CC2X1IIbqRipg6UZS9osIKYIMSTKp3VrVV6uRflXwDVgsMDss rxh2ybgwHPKzrumZunLPv2/lGNx6xo9xxpFcm3s/ORXcKrYyu+/PI16dByTheA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777879027; a=rsa-sha256; cv=none; b=oejFTe6ANb/gB9lGzqREapsfpR9WA9KgSIKU88EqrgvqAdMpe9aue7cdt+d9JlKITdAjEJ xH68/JlpMZTXC90zluT3pfFw25njXAWs8GcS9ub1hgJCDrPv3sduaIMtU8bpzVl+zy8BYK 95njfTG2pKM3CjrjvjBhF5CjjXoLgixXfZwS4tdUsTjHoiOLoJ6o+s23nZJVDjANj2FQsW Y4o1YdMU8czzw50U+1WaVsCVP+AwgTGgDVyciHS/VW1ie57sR9HEHRI4JmbG3oY+Guq44J XK49atVtXQzfULWsU7Wd6+GP68a+OFYkLVKHr0iLfCYXQ7I1lDGFGl1cIITc/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777879027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rbw8KsmthzCG6KLZRFCuqMqSHkb5bTWx1ECk4nLirdI=; b=p4tkULBvUAvYqO+nPpjyPWaDt6w8YXV8eS/blewhPq4FYQGBgNQxJZsgDVnIwAU9C8QXyX p2+umQwR/tk/MMkty2damFZtQKpsfNoq+trktKiFwg0svY77gyAQarxYSPM+nE6nHe7JU3 tliuifXIgtHeheiQFd2Blac90l8YkUqmemiCHg6+TpCdUuNZIytrns5DFFwnhp46DY8rCG 3obd0AEyeMYD45v4F08gZ7XQXYtcM/VPyOfbWY/rIMOi06whvdwAc7i08oF6ToTlskoJgy 9eZ6Szu96mUzD+pM6AF7xWGpoNjPHPXMLsyntns2NQoTVnUJxwdcxmvWmYyc+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8CdH0Dz5z18Zb for ; Mon, 04 May 2026 07:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41c2a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 07:17:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: cd86057224b5 - stable/15 - amd64: ia32_fetch_syscall_args() does not need to check params != NULL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: cd86057224b58af38adf0f0ce6042bb39b7b2837 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 07:17:07 +0000 Message-Id: <69f847f3.41c2a.432819de@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cd86057224b58af38adf0f0ce6042bb39b7b2837 commit cd86057224b58af38adf0f0ce6042bb39b7b2837 Author: Konstantin Belousov AuthorDate: 2026-04-25 09:46:50 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-04 07:16:39 +0000 amd64: ia32_fetch_syscall_args() does not need to check params != NULL (cherry picked from commit 912f9dfca451e359dda7cdf45539b7c19764f54d) --- sys/amd64/ia32/ia32_syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/ia32/ia32_syscall.c b/sys/amd64/ia32/ia32_syscall.c index c61587a93d1f..85e3d8f8e920 100644 --- a/sys/amd64/ia32/ia32_syscall.c +++ b/sys/amd64/ia32/ia32_syscall.c @@ -187,7 +187,7 @@ ia32_fetch_syscall_args(struct thread *td) else sa->callp = &p->p_sysent->sv_table[sa->code]; - if (params != NULL && sa->callp->sy_narg != 0) + if (sa->callp->sy_narg != 0) error = copyin(params, (caddr_t)args, (u_int)(sa->callp->sy_narg * sizeof(int))); else From nobody Mon May 4 07:17:03 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8CdC6q0Nz6cllV for ; Mon, 04 May 2026 07:17: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 4g8CdC5bW3z3KXw for ; Mon, 04 May 2026 07:17:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777879023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U62V57FUitrvlbK39+LDXoanUJN7UoNEw2PrHDPPjmg=; b=batQ4wey26s20SSdfiMR1nA1akATDYd0+CuHL0hj8fIGyBK0e6+2J1hlH5Zaz+QTPpy7G7 +KUy1fz4+1TYSuIhk+Fjlo2LCXEhLUYhcBTCi6fJDKBWWGhv77F3TmJjQi32Hqy35Qrhuu FmAgR/XyFAdfiHLsnqDrrVmOQDxRQAozfGsPk+LPE7NjXJ3QVis7u3ZPnHkPv6k2/3eWAi C+isWk7enXJtsy7fylawbTX9FwRxSMKaK5BmVSkBlG42Xz8zG41x8fFKUML9oDqAs7KvGV NUtgTj4KNZaWbUew88bw5N2cMdAW3cvvqAq0M/dZuJeDOsdjIMU/yjfIGHZ0Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777879023; a=rsa-sha256; cv=none; b=XSVqEm2zqTBpkez7ddRWPUNbE0/Hnm7RzCntpm1N0Ux08nGLeiOYX1gGslc89HwfmYzVig M1fFTYcS4kTcxnsZ/zz88xOzbG5cQrTMZpIzu83sg9XVZ16JQGFkQMTcwdsMmpK/wbli8I 9bwtHnVLOGE2HCqqti+L+1dTgGmGVGmUKAgsFK6jEqlZcVOK8QuErxdD/TQqSEP6fkWWi9 HHA7xLZBMCPEoVv3JkiHZssTNiAnjdR7OnqwGgjZfMrZpBdhdaVboORatk2EXWmPSo+w/f L07wMMEtfb/ZzvjVoIg5L2UopfJS0OOnUL9I0BHnaZheKkIipGLGGHYEhgWv6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777879023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U62V57FUitrvlbK39+LDXoanUJN7UoNEw2PrHDPPjmg=; b=K4mQNxS7Ewklp9Gnvk/jIolux7QalfzaFRoM5YeBqdU3TRNjguwc12YHcfoyE6dDVfNPnn Z6iRVP4pV0b4gkDsxYUBaNx4PgHOxJaUHyp24WD7h7oycaKDhFA1tFNH6ZQyB1a9YqyOOL KnK/Kk53Z43esf6Ea9WwDzuZhSZFsJ777j8fNTMjoiLmy2xLjWlMVpA6Gbkkz0qPUzjnbj 8zC/M42Vai6pjutAnvusQ/aEUQFSFnJF29qqjpD5xRxxSdXNqna/Ed4Br5LmWdXdzfjK3b KfIC1EGR2gEsa/ewtk4KtuH6fufQiPhsKH+vVB05JN0MERORq6jmaWVuFsnlEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8CdC4yPSz18JD for ; Mon, 04 May 2026 07:17:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 406d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 07:17:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e5c9bd66eaab - stable/15 - kern/init_main.c: path is for the binary, not process List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: e5c9bd66eaaba591163c06234551e4bf1c325c24 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 07:17:03 +0000 Message-Id: <69f847ef.406d9.2d02279b@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e5c9bd66eaaba591163c06234551e4bf1c325c24 commit e5c9bd66eaaba591163c06234551e4bf1c325c24 Author: Konstantin Belousov AuthorDate: 2026-04-26 10:15:18 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-04 07:16:39 +0000 kern/init_main.c: path is for the binary, not process (cherry picked from commit a268af3447ebaa9712174ba2d226ffdc66f68e98) --- sys/kern/init_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 4cccb2546a9a..3ce53ffa265b 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -709,7 +709,7 @@ static char init_path[MAXPATHLEN] = "/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init"; #endif SYSCTL_STRING(_kern, OID_AUTO, init_path, CTLFLAG_RD, init_path, 0, - "Path used to search the init process"); + "Path used to search for the init binary"); /* * Shutdown timeout of init(8). From nobody Mon May 4 07:17:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8CdG1nrYz6cm1s for ; Mon, 04 May 2026 07:17: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 4g8CdF6vH4z3KjJ for ; Mon, 04 May 2026 07:17:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777879026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xcUqEIiicYkpJJKTwBe1xA4A4/ZYbn4DXtg0MZdFVD4=; b=aj4AbTP9Lyp17ERhS/Wwjmhe9Homsy/GogI2qQmVTiVzXlg62CpTNgPo6BC+RL2Jlib+vx n8algnRllWVh4K0lDfr+twDuVCefIZyPOO4bYrxryeQqgbD9+ZDnfUmXGpovTgzowo4D9T PrWUvPP4aDol2TrV+ghjAUDnqEBKudOM6OVoRP0fEqstEEGtJ1xPJZzZggWi+BJb2YuQId Uy9eb3Iy4Ba0ZeiKQ33vThD9RAXCZJQ2nfZBPhwL4vGzSP4lbTz0A7sMK5SHuhVj72MqEO kRVzsB7hNXXYDoQnHxkRLD3SB9FmC7xWEKFznLv2bxWXtQkiz30wg5p6+rg8Fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777879026; a=rsa-sha256; cv=none; b=j32h6jvpFdCEnNssfR//MjMiE1907H+HnionGqVJyWS0gZSyRcBkcf29C+eAJmZdduGdAC vCqrV8216FfV+fcarkI1S47v09vB1Mw/+tlY13P1DKL7kW90mA7Jb8xT0lwcSxvZW3k+1c X4fM7xwORGg/cKfQcNPsz2KcBFCi3oAUo4KSMS+jQFqJOPDdqwxHN1ltxTXck8bu8nIivT awfRQpQcdtykN8iJ9RylSI/HmcisZjI8DjyhBgRZGstmd2sNqLaBYjRHJL0e2trM/R+hAc Omr8UpzN4iJHP5qMggDUSXwHYVOVIrvGPGY2hDZLwtn8KGxsnHcmAvrf31Tp/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777879026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xcUqEIiicYkpJJKTwBe1xA4A4/ZYbn4DXtg0MZdFVD4=; b=scyH/4rTnHaDitocl8jcwv1eBNTwR5TFi5dye5q7vgj6LavobmnyqZiaWhyV9PjRHcgRnP qE2ZU8Lmxg7JE4UTGtIp6EMIeOz/MsyLFO5kW42Xjvdd7RxFpfCi9kU6CqeH2eKQu+HzUY sZO/gS4FbArx0iJSOqUE3zLOxfGK0MzG2IKTLKmZsrsd63/RNBeeOETegk+BxrgU8WWLwJ OK2o0MuN+dbl6yuHWMASMkY+Km62n54CVce1ptsAalU8HIakIWtzeVgwKPm4AqrmmlfFqM LLLWtwqg4z2Rye3iArUjL9xuSva5x0wKw1YQowlB6S1AAS15DjbyR7t47quhlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8CdF6VxBz18XG for ; Mon, 04 May 2026 07:17:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40e8c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 07:17:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 350d980db869 - stable/15 - init.8: add RECOVERING section List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 350d980db8693b300fdee01598cb98c9699616ba Auto-Submitted: auto-generated Date: Mon, 04 May 2026 07:17:05 +0000 Message-Id: <69f847f1.40e8c.3b065f0@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=350d980db8693b300fdee01598cb98c9699616ba commit 350d980db8693b300fdee01598cb98c9699616ba Author: Konstantin Belousov AuthorDate: 2026-04-26 10:28:05 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-04 07:16:39 +0000 init.8: add RECOVERING section (cherry picked from commit e378d97eeb2b8961f312cc04d4751579a7b70741) --- sbin/init/init.8 | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/sbin/init/init.8 b/sbin/init/init.8 index f86adf53b361..85b1db2ddf06 100644 --- a/sbin/init/init.8 +++ b/sbin/init/init.8 @@ -401,6 +401,41 @@ Specifies the path used to search for the init binary. More than one binary can be listed in the string, candidate file names are split by the \[lq]:\[rq] separator. Each name is opened in sequence until a valid executable is found. +.Sh RECOVERING +If the +.Pa /sbin/init +binary is broken or cannot be executed by the current kernel, +recovery requires console access. +Then, the +.Va init_path +loader tunable can be used to specify alternative +.Nm +location. +.Pp +By default, system install leaves copy of the previous +.Nm init +binary at +.Pa /sbin/init.bak , +and this path is set as one component of the default +.Va init_path . +.Pp +If +.Nm +cannot be run, the +.Fx +version of +.Xr sh 1 +has a special provision for running as PID 1. +If the shell detects that it is running as init, it opens +.Pa /dev/console +as it standard input and output and enters the +command loop. +.Pp +The session should be exited using +.Ic reboot Fl q +or exec-ing fixed +.Nm , +since a normal exit will cause a kernel panic. .El .Sh FILES .Bl -tag -width /var/log/init.log -compact From nobody Mon May 4 07:17:08 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8CdJ3d9Rz6cm06 for ; Mon, 04 May 2026 07:17: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 4g8CdJ1bhCz3KlT for ; Mon, 04 May 2026 07:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777879028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2hsyjy53DAsZFOSsmb2YqkEVLVcJlK51n6ETiR5ocZI=; b=N/PqXwhaDMEqRm2GAFROYp9ulVRQRwJYvZxdhdAwbYRipMbNs9yIWx8IsWd6g1bqSioso3 1Db85Nygk5onRJLX6iStNk2i+pRM3EMnbVHOhzZ/mGM/JZKTsISCfxo3124paUq/o6uwsy /cip9FClpjg+WhlH5VXFcgbmvj8wvWjuP+2U1SHAddT2iIfCyRMaffct9qgf2eWRJNQgFp dGV42cVNOlETirhWrHhvH5yZicNvzniZBS9aS4DoU76iMY50qhzDWD9yuMHhQQBJcSDyOD zYeEbxDy//3BgyO7Kir8OqUuQcmLPKCD57iLHwOBPm6nq20aRMBkNMYmYmxUug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777879028; a=rsa-sha256; cv=none; b=CtuRkKzW02Eq4KWymM1Rj/3bOxG1j3W6VzZLTmcQddqWEZr6+8KSXoksMFQfyZaDmIiBxG n5x1AFhS5ADb1fj4dUBamQgjg1BVByyWloTpCz1paqdT7POvWKyEQxkaQ0KMfgISsFh6Nj Ft+eU/mQpmOxfMdj3JsvEQ4iXFbl/vmnYeoKG3+qDLaH9D+c1sWFWyZEkxiwOYwmrkXqVk ZkunrPCmsvRQevy2T4dpqPfkKsYhXCMMBUIe4LKFOyiiwgmQHnIKIzLTTlZVn0jbZHQW6T foOXqtzueD8jqRcfzlc4Rc1akK9+9eX29nB5+mZnkDT2LD29j0hV0d93MWKSPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777879028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2hsyjy53DAsZFOSsmb2YqkEVLVcJlK51n6ETiR5ocZI=; b=uiCUIFwxd9AEHtQXbCsXjBde2gjMsCkyAqUVpJKrwWB585rxITjB3a4Okk5/Q3bUtbTN+u dsnPf7B7pjOpQR+xXYC+gYDdJd8XCHWXicEEcW0q4JI9WNjOfuQqWmpXaGf71u9I76W9Z8 YMXt/uVjK4cr8hgfE5VHZDfKXVuHf11SmnRG2QNEU2Sh7WxLlWT8UDPxNQWA1BGSe3VbDO j+rtWFglXErBCadbe6ahyJEmFYQWVcCarq0+RMQ++yaNhwK+yPr9xtZVf6hc5V4TyMCMmA ajXcPqFLfhj984uFbCMhKlPUcSAf8XcW8dmolIsSK2hewtz3iWE8kJWo23zfYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8CdJ13zzz18cw for ; Mon, 04 May 2026 07:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 406dd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 07:17:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a42f95b71ed9 - stable/15 - amd64 ia32_syscall(): only allow for ILP32 processes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: a42f95b71ed946ad3d85f1b95daf0056abdc8345 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 07:17:08 +0000 Message-Id: <69f847f4.406dd.20adc89@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a42f95b71ed946ad3d85f1b95daf0056abdc8345 commit a42f95b71ed946ad3d85f1b95daf0056abdc8345 Author: Konstantin Belousov AuthorDate: 2026-04-25 09:49:08 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-04 07:16:39 +0000 amd64 ia32_syscall(): only allow for ILP32 processes (cherry picked from commit bd8edba0792b71be3f8ed5dea9c22287e95c986a) --- sys/amd64/ia32/ia32_syscall.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/amd64/ia32/ia32_syscall.c b/sys/amd64/ia32/ia32_syscall.c index 85e3d8f8e920..edafb753faa0 100644 --- a/sys/amd64/ia32/ia32_syscall.c +++ b/sys/amd64/ia32/ia32_syscall.c @@ -218,6 +218,15 @@ ia32_syscall(struct trapframe *frame) orig_tf_rflags = frame->tf_rflags; td = curthread; td->td_frame = frame; + if (__predict_false(SV_PROC_FLAG(td->td_proc, SV_ILP32) == 0)) { + ksiginfo_init_trap(&ksi); + ksi.ksi_signo = SIGBUS; + ksi.ksi_code = BUS_OBJERR; + ksi.ksi_addr = (void *)frame->tf_rip; + trapsignal(td, &ksi); + userret(td, td->td_frame); + return; + } syscallenter(td); From nobody Mon May 4 07:17:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8CdK4xzLz6clx9 for ; Mon, 04 May 2026 07:17: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 4g8CdK2KrZz3KjK for ; Mon, 04 May 2026 07:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777879029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bTilTz4qOCe8K6lmU/Y8qJVUTTV5L732Ek3wYK3N9NI=; b=MtiTLB2+UvTX5YuTp/Ba8Oo07OpWEkbRLtnC17GEf8FInhSx9mB+CqvzkijZFhroGyT5DZ 82FBKK+x7G/a+QS8UIs1EqhAgz6d/6MOK4JSw4lFBaQcuLVUPC3JKqX4AOwgDxbe3feKzp kjh7XQxpo5dW9hOFBjfVJnI6fXkqyyEPLstUvX2gYeoEHY2AKWORkNrjA/CmG81O523lTG l+tlAktZ7VFYdac/DoEwJdqm0u/cMgVaJRPVDq5opVMYVbLBfsEcxjTWbU0L3RZ/lEWTKc aUJSLn1KFFnO4B9On945Ez3P6DF5WfwCZQGt3r3NDHSLdyGGAFdII9YKwXOUBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777879029; a=rsa-sha256; cv=none; b=Px1hrra19vkwa8LIAOglHOr2r/AsWu8OOkq8WEkWRI1IiO/q1QrxHMLsDeNYK+/17nsEnX UAUayrMEpmzLvIHn1RYiJ3rOb3NCf70/lM00yiwwboUOM18rnLXyxFlnqfqtKPglGqHpAr oDQcjcFa84tn8/MaIqVFvnSySi0/Y512SxuttlSQH8hqkvk9KtITi3BA+e/u4UPQdjhrG+ FPQ334qHLYdVjCEOC7HvEcFKLqMPYKNcSGl8YXzEiqIP5HRToHyJUQCnaBRTrQLsfLd/7I LIJyNunOndXOC5SzM8IQbUGg9eo7d8S+o9vAjM2WIimIa3EBk6CfeYFSlSMD7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777879029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bTilTz4qOCe8K6lmU/Y8qJVUTTV5L732Ek3wYK3N9NI=; b=ounARm+HZYMXKK3SdgRF5Ap5LMEet2+BDpoGSDgam5+gylpYWiXs3XEdARvQsGOqQOTAKR CE14Zub/DNNtIzy3Dg8EZqhRvciJKPLN/QY46FnWOJ3jV3GJ+2hkaWwz3TlHSosPIBH7Zz KFtpqk2j3lHxE857+kOJPrbXcw9oBSdiPfTt/hozxOU4515X8CnjP1bcJ8uqNVl8VgChDF 67gNyQxnhO3i1Q8U9EkPGtcqRuloUtLEF/lJXn86pXIRoKRe9BXdR3iwPL6REJMn8gESrb csfv4FnFO+bWDQYocCwOWmYkRNtwxXVvkW5UHCUVbrgmxab1AvwtzFPEufJh7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8CdK1wg2z18XH for ; Mon, 04 May 2026 07:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4065f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 07:17:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 2157c0e19672 - stable/15 - tests/sys/arch/amd64: add a program to check INT $0x80 behavior on amd64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 2157c0e19672e341130e0444ac6d902966da0a26 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 07:17:09 +0000 Message-Id: <69f847f5.4065f.4f827677@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2157c0e19672e341130e0444ac6d902966da0a26 commit 2157c0e19672e341130e0444ac6d902966da0a26 Author: Konstantin Belousov AuthorDate: 2026-04-27 04:23:36 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-04 07:16:40 +0000 tests/sys/arch/amd64: add a program to check INT $0x80 behavior on amd64 (cherry picked from commit 2c2ec6bbc9cc7762a250ffe903bda6c2e44d25ff) --- tests/sys/arch/amd64/Makefile | 7 ++++ tests/sys/arch/amd64/int0x80.c | 94 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/tests/sys/arch/amd64/Makefile b/tests/sys/arch/amd64/Makefile new file mode 100644 index 000000000000..34f3c90c4082 --- /dev/null +++ b/tests/sys/arch/amd64/Makefile @@ -0,0 +1,7 @@ +TESTSDIR= ${TESTSBASE}/sys/arch/amd64 + +PLAIN_TESTS_C+= int0x80 + +BINDIR= ${TESTSDIR} + +.include diff --git a/tests/sys/arch/amd64/int0x80.c b/tests/sys/arch/amd64/int0x80.c new file mode 100644 index 000000000000..e03462a6dccd --- /dev/null +++ b/tests/sys/arch/amd64/int0x80.c @@ -0,0 +1,94 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright 2026 The FreeBSD Foundation + * + * This software were developed by + * Konstantin Belousov under sponsorship from + * the FreeBSD Foundation. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef __amd64__ +#error "amd64 only" +#endif + +/* + * The check to see how "INT $0x80" behaves for amd64 native ABI + * processes. Before bd8edba0792b71be3f8ed5dea9c22287e95c986a it + * executed syscalls with amd64 calling conventions. After that + * revision, it should raise SIGBUS. + */ + +static uintptr_t int0x80_loc; +static int signo; +extern char after_int0x80[]; + +static void +sigill_action(int signo1, siginfo_t *si __unused, void *uctxv) +{ + ucontext_t *uctx = uctxv; + + signo = signo1; + int0x80_loc = uctx->uc_mcontext.mc_rip; +} + +static int +fire(void) +{ + int res; + + asm volatile( + ".globl\tafter_int0x80\n" + "\tint\t$0x80\n" + "after_int0x80:" + : "=a" (res) + : "%0" (SYS_getpid) + : "rdx", "memory", "cc"); + return (res); +} + +int +main(void) +{ + struct sigaction sa; + char signame[SIG2STR_MAX]; + int pid, res; + + res = 0; + + memset(&sa, 0, sizeof(sa)); + sa.sa_sigaction = sigill_action; + sa.sa_flags = SA_SIGINFO; + if (sigaction(SIGBUS, &sa, NULL) == -1) + err(1, "catching SIGBUS"); + + pid = fire(); + atomic_signal_fence(memory_order_seq_cst); + if (int0x80_loc == 0) { + printf("int $0x80 does not raise SIGBUS\n"); + if (pid == getpid()) + printf("and syscall worked\n"); + else + printf("but syscall did not worked\n"); + res = 1; + } else { + sig2str(signo, signame); + printf("int $0x80 raises SIG%s\n", signame); + if (int0x80_loc == (uintptr_t)after_int0x80) { + printf("at expected location\n"); + } else { + printf("not at expected location\n"); + res = 1; + } + } + exit(res); +} From nobody Mon May 4 11:57:37 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8Krx6nZ5z6RZmT for ; Mon, 04 May 2026 11:57: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 4g8Krx4chnz42m3 for ; Mon, 04 May 2026 11:57:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777895857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jGZ1KZmCsUQZxkfAC6FxugD5NBGjKunEiKteQCQ6ypU=; b=uINrw9yZnC+i0lB911FCUzS29nw1wpZnCxiDOklc6JHyKpulHiON7mwdd+W5U3ZGFzWSGD e5asRJxryFdumaJGbYONJAvAqaPEyNz3q9/tTwRXe3Onxx8ELx9NHooFG4PV1drAgsWFr/ 1W+0Ons44R1+Vi+r8J1wQ08+TZyZp1sBzd4GcHwa1CQldknXMiMOab3XfCHRR7rwbFyNT/ tKmLVSErU39ewMiGN9z/RaLzYR23O4X50tQlI71AqhE5GymuBu1GgT40ndBS/nuvoluIAy qfRvFdNz0Ny27Ena1x7SGzgxtmItuWlnPIhikR6RIsDnvPuAxf+bKAxkkDupBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777895857; a=rsa-sha256; cv=none; b=OT6xWJsdGyUqqdrA2elHbi2Q/0QvQqFAU8pRZUtdySAuR4ZUexmhrIuawogFHo3BDlgl98 vancUAqShCosUgIFIvWmqobWSgIanSxjEnBcP5FAiHFrnBR3MOqjhUJcF8yjBd1bo3LaL7 Bdc3Ozo96FjTsgEhAJWLgj72TAx9HEChigS8GffmZTUwUtPbGrH025TvnMPhC0N38J0t8p 1j3chdFLofNsXmImAH5HjJNG+NW2pKotiDCw2gk68X48GLdUT79s8euXbC6ZjOrkDFdHIH wz4UlhikvY6Ps+EuEhZPQn5fjQ2Q0gBQhbL4BIa5yGPrIDYSBgxwLYtTL9iikw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777895857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jGZ1KZmCsUQZxkfAC6FxugD5NBGjKunEiKteQCQ6ypU=; b=T7grLhRuuQcrd++h59c1igOlclaAD6Tw/CXrvb0w/jb8oyl69E2a2w5estuOxKeQSB5ood 54s7KMuQb3JXCxgVEbUAUVx4ZP6pSz2e2vJtkNMSg9VkXYdH6VaUG4j9V7K4tqdh2Q8Zho F0CRTB0hZH2QQWM7/ErQGlG5Mskbr+qb9hUDNv3sWvGAspU9xvqkOksOKZ3hAr80vkiP4a JUVV593+dwDibH3Rt8QQPdpLAkjVbYASj7guxVzPPrOqzEX5sqGqIm1IdnujSFuabYiITH +AZKnE+Fhs9CqmnqlYtFSnOSLUEplnKKRz89xBTu7+3cw021zBnCpwhmMDCpXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8Krx40FQz3GT for ; Mon, 04 May 2026 11:57:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 365f9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 11:57:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: ea93554de436 - stable/15 - krb5: Adjust version to 1.22.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ea93554de436e84d27200d12f3a3b6dc1670fac9 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 11:57:37 +0000 Message-Id: <69f889b1.365f9.605035c9@gitrepo.freebsd.org> The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=ea93554de436e84d27200d12f3a3b6dc1670fac9 commit ea93554de436e84d27200d12f3a3b6dc1670fac9 Author: Cy Schubert AuthorDate: 2026-05-01 00:57:39 +0000 Commit: Cy Schubert CommitDate: 2026-05-04 11:57:27 +0000 krb5: Adjust version to 1.22.2 Fixes: 736e411a737b (cherry picked from commit 8f46ba065143d9d89968a20b23844287d54c04a2) --- krb5/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krb5/Makefile.inc b/krb5/Makefile.inc index 34d04daab0b1..e3f85fdded3c 100644 --- a/krb5/Makefile.inc +++ b/krb5/Makefile.inc @@ -10,7 +10,7 @@ .include PACKAGE?= kerberos -KRB5_VERSION= 1.22.1 +KRB5_VERSION= 1.22.2 # MIT KRB5 uses KRB5_DIR. Heimdal uses KRB5DIR. KRB5_SRCTOP= ${SRCTOP}/krb5 From nobody Mon May 4 11:57:36 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8Krx0ZMfz6RZpV for ; Mon, 04 May 2026 11:57: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 4g8Krw4M5Yz42x3 for ; Mon, 04 May 2026 11:57:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777895856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B/8bIuI7Wx9FIqd/tqILuJAHJNJGw50VKbGNQvJ/N2A=; b=AvoDwhSBWYpDDmRDNl3IvnhQksRk56OZAmMUt16E7UbWILExKMJGRZSaayNsNC3GY9Bzzj P6hJW76HbsXy07mMvGifoO1kRnN4aeyLWGVjJUQf76BMw6e+FoeIJ4GUxEMiXtcMRtknJf Z8lkFQL63fRM64RG0W9bb+ZPnK1Dp/Y5Uc8BJRMEo1rGZx81lIgoxjwJst9MZ9XsEgr1zW LY6DC5N5d3+hjqCic1C4p9lYN43ck8k1b9fwmHx9Y6nBORcuMCZwhVlr3RwWXQZvaIWJLQ zbKq0lhSR1kaXGZYlve8LJppzUJwtXVXO07U/9BFcoTqR2uJgC1Jyc18UhcFgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777895856; a=rsa-sha256; cv=none; b=Z3wHkYzCsaqPOg6zCZSFQit9AJSntA+dO+QWdRQy7nLPAsn4DlkErkm4zmh3Ga8u5l+gei QK8j5xj8AvfJmPWS8jcyeZuZjfhrSLr1pC2frI6kQ8I9qucFXiTgg6Ccr84uARnjtFuoD3 Sf1pZGbrqO0JcvZVmR3PI8dAptkg5DACWZ3d5OyDOc4td+tZ8mNN/pHx3y8Uj0KyEEcKgI OxuteOxbiMfmzu8RYiq072OM7hv9GJYaDJ3KzOnTbk32AlG4Tga5iNOEpTvV7rPQRaYM62 NMXKms2JkuoD8qCDoPbqAybXRhO2AvwLTn2u3fVSS3f9UQL/J7qhDzYYl/g+mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777895856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B/8bIuI7Wx9FIqd/tqILuJAHJNJGw50VKbGNQvJ/N2A=; b=SlpCPK4vwdcfVyAqSn67r71aFnHlsDF8bS5OTVXDtJhjjngU7t6pPSjXkVtsAD9S7tBgLf B+VEOQQ7fnSK76G/2z/BMzTmMbghDJzN5IzaXotyPYIKjxBrW6dsQcC2QS9ToSxayzrnfD zMuzZ40QuAi9sxjBFCOp1u01eYNpRflycT/Zbm32zk/46fww0usEJ1zKXfLm3B8UYNHJ6O CPRZAnEGSQ0vF2m7jSu2gONeEgzyEo4wZDGNid9EpGtlMKf1PtxucZPFpmm6zCBWZ0x4xE 1jBc6bLX7PbX9ydhEfX2ucVbs63n65I//Qv7espZzMtSr+Q45kVOX9venNPWWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8Krw3H3Mz3bX for ; Mon, 04 May 2026 11:57:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 362d1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 11:57:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: a22ad16deb2c - stable/15 - krb5: Fix two NegoEx parsing vulnerabilities List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a22ad16deb2ce23050c949b43210f5c6feb5afa8 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 11:57:36 +0000 Message-Id: <69f889b0.362d1.23163885@gitrepo.freebsd.org> The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=a22ad16deb2ce23050c949b43210f5c6feb5afa8 commit a22ad16deb2ce23050c949b43210f5c6feb5afa8 Author: Cy Schubert AuthorDate: 2026-04-30 19:27:31 +0000 Commit: Cy Schubert CommitDate: 2026-05-04 11:57:26 +0000 krb5: Fix two NegoEx parsing vulnerabilities Bring in upstream commit 2e75f0d93 fixing two CVEs. Upstream commit log is: In parse_nego_message(), check the result of the second call to vector_base() before dereferencing it. In parse_message(), check for a short header_len to prevent an integer underflow when calculating the remaining message length. Reported by Cem Onat Karagun. CVE-2026-40355: In MIT krb5 release 1.18 and later, if an application calls gss_accept_sec_context() on a system with a NegoEx mechanism registered in /etc/gss/mech, an unauthenticated remote attacker can trigger a null pointer dereference, causing the process to terminate. CVE-2026-40356: In MIT krb5 release 1.18 and later, if an application calls gss_accept_sec_context() on a system with a NegoEx mechanism registered in /etc/gss/mech, an unauthenticated remote attacker can trigger a read overrun of up to 52 bytes, possibly causing the process to terminate. Exfiltration of the bytes read does not appear possible. (cherry picked from commit c9dd7bffa58c50b2f7ed9e66ace39197c468d8e6) --- crypto/krb5/src/lib/gssapi/spnego/negoex_util.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/crypto/krb5/src/lib/gssapi/spnego/negoex_util.c b/crypto/krb5/src/lib/gssapi/spnego/negoex_util.c index edc5462e8441..a65238e57305 100644 --- a/crypto/krb5/src/lib/gssapi/spnego/negoex_util.c +++ b/crypto/krb5/src/lib/gssapi/spnego/negoex_util.c @@ -253,6 +253,10 @@ parse_nego_message(OM_uint32 *minor, struct k5input *in, offset = k5_input_get_uint32_le(in); count = k5_input_get_uint16_le(in); p = vector_base(offset, count, EXTENSION_LENGTH, msg_base, msg_len); + if (p == NULL) { + *minor = ERR_NEGOEX_INVALID_MESSAGE_SIZE; + return GSS_S_DEFECTIVE_TOKEN; + } for (i = 0; i < count; i++) { extension_type = load_32_le(p + i * EXTENSION_LENGTH); if (extension_type & EXTENSION_FLAG_CRITICAL) { @@ -391,7 +395,8 @@ parse_message(OM_uint32 *minor, spnego_gss_ctx_id_t ctx, struct k5input *in, msg_len = k5_input_get_uint32_le(in); conv_id = k5_input_get_bytes(in, GUID_LENGTH); - if (in->status || msg_len > token_remaining || header_len > msg_len) { + if (in->status || msg_len > token_remaining || + header_len < (size_t)(in->ptr - msg_base) || header_len > msg_len) { *minor = ERR_NEGOEX_INVALID_MESSAGE_SIZE; return GSS_S_DEFECTIVE_TOKEN; } From nobody Mon May 4 11:57:38 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8Krz1QwLz6RZLC for ; Mon, 04 May 2026 11:57:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8Kry51j0z430N for ; Mon, 04 May 2026 11:57:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777895858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bQlsWx/Y/RytLYE21MYvbw0pnpR3CKv72OazROy+dyU=; b=QoSt1j11/rEE/kGH+xRXb0YPVGPJRc/ZmrHBox9ly6mXWziNuUIcxxguW0S2UDr5EKhsXJ pVQnqQmBa6yeSTaHDTnOt/ych/2JhsCmL7WjZpU2MWZjEcCZsMhKRVCJF7rra+TRyQkPUA mpR8YstDnJwzPDNUoJPNmxj0NnpBsono9qX5QXpps1qbaT6PZ+GW/d7T70S6l+boUL8B4k ORyJ0/BmLlj/4tZbhEHrKq56WL2VJ1IU8vmL4JYR/nByAuL6A5aElQBMhksbIJyNJWQabw DDPsJ9UNqR5qAdwz/h+V5arasrl8bCEJYZFAQn9d1gILveeX2n/W9+KQmHo73Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777895858; a=rsa-sha256; cv=none; b=HtWSuIo7+bdB1m24BdbrZ4ge3ZMsYiSOnk86PEpm3QDQHgXJCNiVd+5WzR+nrY6v8JC/gc zHORoEdiqtKksn0yESGWxPet9i2ZFAPLi6xCjfr36AhsERttYaE+M8AeE4be6Gm3f3S0JX pPvalvtffq4fV7p7i1mpgF0YWsb2aP1CV6spdvIv+Q8y/esfYdoCovoWcxjldnttlXGE4T C1xXBZrt3r9sZmSXj7l9S58z6USvVpb9519KRGa+jl4dwgDkn/KCTo8Emfpf6T3VWB3ieY vcy9QPIB1+T1GUW+EKYVCp2H+jr6THU5Pr/T3sDiU3Ic6kwtUTCPg2fShCflsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777895858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bQlsWx/Y/RytLYE21MYvbw0pnpR3CKv72OazROy+dyU=; b=a1IU1OusJkIonfF++/cFsEzdb+pDj5UMOdvue+Lo5Ip0JqeqLabRv1elRvZMzJaR6V0O10 AmjrzIaRTM+qD0+7gJJv88RFLFU+NUY9STmewb6Uney6ZFuuWtg2kArI0TkX0ETPdRp5S5 V6u89azdZMNbERHyur4nilVC3Tq///Ry/Pi66pL3Pw7lIZbcJr2y93LUd7sG9hqE+8qUIP RT1S3TsR8AItYv1D/U81sSY1KH+N8IQ3SiLfmAn1Wmsu343+aOcgOKSBC0QtwFuWmPGfAL in0LSKaOTlGflkWgub3AWnDAh+5XOaW1Cgl//k2Whuh8l0GHEACjMOcil9l/lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8Kry4ZZTz3VN for ; Mon, 04 May 2026 11:57:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3732d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 11:57:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: e3fc36736631 - stable/15 - krb5: Adjust additional version strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e3fc367366319466dd91fe0217a06c0655e35a8a Auto-Submitted: auto-generated Date: Mon, 04 May 2026 11:57:38 +0000 Message-Id: <69f889b2.3732d.6126a328@gitrepo.freebsd.org> The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=e3fc367366319466dd91fe0217a06c0655e35a8a commit e3fc367366319466dd91fe0217a06c0655e35a8a Author: Cy Schubert AuthorDate: 2026-05-01 14:40:19 +0000 Commit: Cy Schubert CommitDate: 2026-05-04 11:57:27 +0000 krb5: Adjust additional version strings Fixes: 736e411a737b (cherry picked from commit c64ee36e5d09ecee4ce4951047014c8461734fb5) --- krb5/include/autoconf.h | 4 ++-- krb5/util/build-tools/Makefile | 1 + krb5/util/build-tools/krb5-config.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/krb5/include/autoconf.h b/krb5/include/autoconf.h index 760aca79176b..ef6a1fa2090d 100644 --- a/krb5/include/autoconf.h +++ b/krb5/include/autoconf.h @@ -641,7 +641,7 @@ #define PACKAGE_NAME "Kerberos 5" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Kerberos 5 1.22.1" +#define PACKAGE_STRING "Kerberos 5 1.22.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "krb5" @@ -650,7 +650,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.22.1" +#define PACKAGE_VERSION "1.22.2" /* Default PKCS11 module name */ #define PKCS11_MODNAME "opensc-pkcs11.so" diff --git a/krb5/util/build-tools/Makefile b/krb5/util/build-tools/Makefile index 8bafbb777c07..bf8396dfd939 100644 --- a/krb5/util/build-tools/Makefile +++ b/krb5/util/build-tools/Makefile @@ -8,6 +8,7 @@ # .include "../Makefile.inc" +.include "../../Makefile.pc" SCRIPTS= krb5-config.sh BINDIR?= /usr/bin diff --git a/krb5/util/build-tools/krb5-config.sh b/krb5/util/build-tools/krb5-config.sh index 9980f054b88f..401c19474f84 100755 --- a/krb5/util/build-tools/krb5-config.sh +++ b/krb5/util/build-tools/krb5-config.sh @@ -26,7 +26,7 @@ # Configurable parameters set by autoconf # Disreagard the above. Edit this by hand in the bespoke FreeBSD build. -version_string="Kerberos 5 release 1.22.1" +version_string="Kerberos 5 release 1.22.2" prefix=/usr exec_prefix=${prefix} From nobody Mon May 4 11:57:35 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8Ks10zjPz6RZpZ for ; Mon, 04 May 2026 11:57: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 4g8Ks0566Nz430P for ; Mon, 04 May 2026 11:57:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777895860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JeGz+teqkM5noHtzxMT/oBfeYsb6dx48yGHCaqW8U9E=; b=hGuBCAdYf2nthwqfSRhYwr+eVdqKOtBS/57TROBTAOwnsLneAbZLqrgv3MgjM2VgfKzmK5 gDJYMxJLvWJz/ypHubXkzbKYYgTEVcGwU3TU4lVjUAfImlrNJmgf5P+us5PCBJi2AFOvZ5 25BXakQ3HNzzl40nZmwRjPbEUcgRXggifpalh78FS66MwlsFhZUiR/DjriSY2F2++iehF3 KWybw0zp6Ozyyr2/Y3vKbSEGLI4tb6anK+KOqGlew3ZA13jm8xRygRuu6VOIFVcbEpp6AD TLwBaNnSothoM9oI/MM73PUGEl7TyyGJrYgAR5j/U6i6VSD3FLkkX4ZSH3NYHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777895860; a=rsa-sha256; cv=none; b=wjdL7DpA7Z0AX/8NpXyi35HtEy30CeZS+3Up1vG2Pu5QCIbR3W8aW+zfO3lQ4CX6IXUu6X dj/V4kvk08qZt7Vqj+4gzLUiGv3wtmwDAhFC6TzI8J+KEUwjIuJhZSDRaQWgF97ryV6ckh rCsnIrhUrotOLDhTGxdPfQnRPEkaZWKKZ0DAoYLndkmYbH9zfP++Kjk+e23oQEBWPiYJDY KrzAQnqR/jvtNor41O3Ry0HWbGt65kOrUKpPiF6HkdyptN9QotrXN9yspoersyDVhkPsF/ fkN+xdPx+vxLHZ13FO7BGz264xHMg8t1N4qABW2D0dp6FaDWto2VVUjGAnRSIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777895860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JeGz+teqkM5noHtzxMT/oBfeYsb6dx48yGHCaqW8U9E=; b=HMOuYvbmwXasYXsV5l+yt3dGQ8mDq9b0CV2MV0FxYk6erPwsuavKZYV8x9P+88nmR/qT0s 59vnDriC3uxUGEScjLXeo5UX4mAKfHlTPj5yQpWs8rqMDmMmQ/OEyeSmIvh1R32rCJwCBK zFhfhgY7FSZppoNKOL2xlo2r0FjZa2xwx+JV9OrQtAVHwck06raHuQfFYMVKVp1y1vNbDU +phx5CODW7JxV3v19SU/t7WWSuI3B6/OYMqcDe//e+K9v2T6L2v7ctZXWUoSDDU73YImZC QHfsVTkDYowpCoQ3BroAwPAVKX7JhOxdSHC7kV/ikjbKBVQA9CgWGbV4QNNCZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8Ks04j14z3mt for ; Mon, 04 May 2026 11:57:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 365f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 11:57:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 919b10729753 - stable/15 - krb5: import MIT 1.22.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 919b10729753336ef16338295c61ebd085348fb9 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 11:57:35 +0000 Message-Id: <69f889af.365f5.7f3b7e8f@gitrepo.freebsd.org> The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=919b10729753336ef16338295c61ebd085348fb9 commit 919b10729753336ef16338295c61ebd085348fb9 Author: Cy Schubert AuthorDate: 2026-04-30 19:24:20 +0000 Commit: Cy Schubert CommitDate: 2026-05-04 11:57:26 +0000 krb5: import MIT 1.22.2 Merge commit '90c687295e2d62f9411fc5b571f5af4e8ee187a7' (cherry picked from commit 736e411a737b9f57c1303e6d15c5afd4f63af0d3) --- crypto/krb5/NOTICE | 2 +- crypto/krb5/README | 24 +++++++++++++++- crypto/krb5/src/configure | 20 ++++++------- crypto/krb5/src/lib/gssapi/krb5/acquire_cred.c | 1 + crypto/krb5/src/lib/gssapi/krb5/iakerb.c | 1 + crypto/krb5/src/lib/gssapi/spnego/spnego_mech.c | 2 +- crypto/krb5/src/lib/krad/packet.c | 2 +- crypto/krb5/src/lib/krb5/ccache/cc_file.c | 8 ++++++ crypto/krb5/src/lib/krb5/ccache/cc_mslsa.c | 37 ++++++++++--------------- crypto/krb5/src/man/k5identity.man | 4 +-- crypto/krb5/src/man/k5login.man | 4 +-- crypto/krb5/src/man/k5srvutil.man | 4 +-- crypto/krb5/src/man/kadm5.acl.man | 4 +-- crypto/krb5/src/man/kadmin.man | 4 +-- crypto/krb5/src/man/kadmind.man | 4 +-- crypto/krb5/src/man/kdb5_ldap_util.man | 4 +-- crypto/krb5/src/man/kdb5_util.man | 4 +-- crypto/krb5/src/man/kdc.conf.man | 4 +-- crypto/krb5/src/man/kdestroy.man | 4 +-- crypto/krb5/src/man/kerberos.man | 4 +-- crypto/krb5/src/man/kinit.man | 4 +-- crypto/krb5/src/man/klist.man | 4 +-- crypto/krb5/src/man/kpasswd.man | 4 +-- crypto/krb5/src/man/kprop.man | 4 +-- crypto/krb5/src/man/kpropd.man | 4 +-- crypto/krb5/src/man/kproplog.man | 4 +-- crypto/krb5/src/man/krb5-config.man | 4 +-- crypto/krb5/src/man/krb5.conf.man | 4 +-- crypto/krb5/src/man/krb5kdc.man | 4 +-- crypto/krb5/src/man/ksu.man | 4 +-- crypto/krb5/src/man/kswitch.man | 4 +-- crypto/krb5/src/man/ktutil.man | 4 +-- crypto/krb5/src/man/kvno.man | 4 +-- crypto/krb5/src/man/sclient.man | 4 +-- crypto/krb5/src/man/sserver.man | 4 +-- crypto/krb5/src/patchlevel.h | 6 ++-- crypto/krb5/src/po/mit-krb5.pot | 4 +-- crypto/krb5/src/prototype/prototype.c | 2 +- crypto/krb5/src/prototype/prototype.h | 2 +- crypto/krb5/src/windows/version.rc | 2 +- 40 files changed, 120 insertions(+), 97 deletions(-) diff --git a/crypto/krb5/NOTICE b/crypto/krb5/NOTICE index 3d78b73035cf..20d8ef24e604 100644 --- a/crypto/krb5/NOTICE +++ b/crypto/krb5/NOTICE @@ -1,4 +1,4 @@ -Copyright (C) 1985-2025 by the Massachusetts Institute of Technology. +Copyright (C) 1985-2026 by the Massachusetts Institute of Technology. All rights reserved. diff --git a/crypto/krb5/README b/crypto/krb5/README index d1de8357e388..73eafa585dc9 100644 --- a/crypto/krb5/README +++ b/crypto/krb5/README @@ -6,7 +6,7 @@ Copyright and Other Notices --------------------------- -Copyright (C) 1985-2025 by the Massachusetts Institute of Technology +Copyright (C) 1985-2026 by the Massachusetts Institute of Technology and its contributors. All rights reserved. Please see the file named NOTICE for additional notices. @@ -97,6 +97,24 @@ removed. Beginning with the krb5-1.18 release, all support for single-DES encryption types has been removed. +Major changes in 1.22.2 (2026-01-29) +------------------------------------ + +This is a bug fix release. + +* Fix a SPNEGO packet parsing bug which could cause GSS mechanism + negotiation failure. + +krb5-1.22.2 changes by ticket ID +-------------------------------- + +9183 Fix SPNEGO mechListMIC parsing +9188 Improve MSLSA ccache timestamp conversion +9189 Fix krb5 gss_acquire_cred() leak on some errors +9190 Make atomic ccache replacement work on Windows +9193 Fix uninitialized pointer dereference in libkrad +9194 Fix IAKERB realm discovery state machine logic + Major changes in 1.22.1 (2025-08-20) ------------------------------------ @@ -378,6 +396,7 @@ reports, suggestions, and valuable resources: Gerald Combs Simon Cooper Sylvain Cortes + Robert Crowston Ian Crowther Arran Cudbard-Bell Adam Dabrowski @@ -475,6 +494,7 @@ reports, suggestions, and valuable resources: Tomas Kuthan Pierre Labastie Andreas Ladanyi + Yubi Lee Chris Leick Volker Lendecke Jan iankko Lieskovsky @@ -519,6 +539,7 @@ reports, suggestions, and valuable resources: Felipe Ortega Michael Osipov Andrej Ota + Dmitry Ovsyannikov Dmitri Pal Javier Palacios Dilyan Palauzov @@ -530,6 +551,7 @@ reports, suggestions, and valuable resources: Zoran Pericic W. Michael Petullo Mark Phalan + Ben Pope Sharwan Ram Brett Randall Jonathan Reams diff --git a/crypto/krb5/src/configure b/crypto/krb5/src/configure index c8dc43de1380..ed823e9244a1 100755 --- a/crypto/krb5/src/configure +++ b/crypto/krb5/src/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for Kerberos 5 1.22.1. +# Generated by GNU Autoconf 2.71 for Kerberos 5 1.22.2. # # Report bugs to . # @@ -615,8 +615,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Kerberos 5' PACKAGE_TARNAME='krb5' -PACKAGE_VERSION='1.22.1' -PACKAGE_STRING='Kerberos 5 1.22.1' +PACKAGE_VERSION='1.22.2' +PACKAGE_STRING='Kerberos 5 1.22.2' PACKAGE_BUGREPORT='krb5-bugs@mit.edu' PACKAGE_URL='' @@ -1506,7 +1506,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Kerberos 5 1.22.1 to adapt to many kinds of systems. +\`configure' configures Kerberos 5 1.22.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1577,7 +1577,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Kerberos 5 1.22.1:";; + short | recursive ) echo "Configuration of Kerberos 5 1.22.2:";; esac cat <<\_ACEOF @@ -1739,7 +1739,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Kerberos 5 configure 1.22.1 +Kerberos 5 configure 1.22.2 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2439,7 +2439,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Kerberos 5 $as_me 1.22.1, which was +It was created by Kerberos 5 $as_me 1.22.2, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -8159,7 +8159,7 @@ fi -KRB5_VERSION=1.22.1 +KRB5_VERSION=1.22.2 @@ -15366,7 +15366,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Kerberos 5 $as_me 1.22.1, which was +This file was extended by Kerberos 5 $as_me 1.22.2, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15430,7 +15430,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -Kerberos 5 config.status 1.22.1 +Kerberos 5 config.status 1.22.2 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/crypto/krb5/src/lib/gssapi/krb5/acquire_cred.c b/crypto/krb5/src/lib/gssapi/krb5/acquire_cred.c index aa1a486dcaa0..12e6b7ea805b 100644 --- a/crypto/krb5/src/lib/gssapi/krb5/acquire_cred.c +++ b/crypto/krb5/src/lib/gssapi/krb5/acquire_cred.c @@ -912,6 +912,7 @@ error_out: if (cred->name) kg_release_name(context, &cred->name); krb5_free_principal(context, cred->impersonator); + krb5_free_principal(context, cred->acceptor_mprinc); zapfreestr(cred->password); k5_mutex_destroy(&cred->lock); xfree(cred); diff --git a/crypto/krb5/src/lib/gssapi/krb5/iakerb.c b/crypto/krb5/src/lib/gssapi/krb5/iakerb.c index 90a9bce11ad7..7cc4710e25d3 100644 --- a/crypto/krb5/src/lib/gssapi/krb5/iakerb.c +++ b/crypto/krb5/src/lib/gssapi/krb5/iakerb.c @@ -631,6 +631,7 @@ iakerb_initiator_step(iakerb_ctx_id_t ctx, cred->name->princ->realm = server_realm; server_realm = empty_data(); + ctx->state = IAKERB_AS_REQ; /* Done with realm discovery; fall through to AS request. */ case IAKERB_AS_REQ: if (ctx->icc == NULL) { diff --git a/crypto/krb5/src/lib/gssapi/spnego/spnego_mech.c b/crypto/krb5/src/lib/gssapi/spnego/spnego_mech.c index 43ba63ab2a7b..4a778364336e 100644 --- a/crypto/krb5/src/lib/gssapi/spnego/spnego_mech.c +++ b/crypto/krb5/src/lib/gssapi/spnego/spnego_mech.c @@ -3515,7 +3515,7 @@ get_negTokenResp(OM_uint32 *minor_status, struct k5input *in, return GSS_S_DEFECTIVE_TOKEN; } - if (k5_der_get_value(&seq, CONTEXT | 0x04, &field)) { + if (k5_der_get_value(&seq, CONTEXT | 0x03, &field)) { *mechListMIC = get_octet_string(&field); /* Handle Windows 2000 duplicate response token */ diff --git a/crypto/krb5/src/lib/krad/packet.c b/crypto/krb5/src/lib/krad/packet.c index ed19385f71a6..22128350428c 100644 --- a/crypto/krb5/src/lib/krad/packet.c +++ b/crypto/krb5/src/lib/krad/packet.c @@ -565,7 +565,7 @@ krad_packet_decode_request(krb5_context ctx, const char *secret, if (cb != NULL) { for (tmp = (*cb)(data, FALSE); tmp != NULL; tmp = (*cb)(data, FALSE)) { - if (pkt_id_get(*reqpkt) == pkt_id_get(tmp)) + if (pkt_id_get(req) == pkt_id_get(tmp)) break; } diff --git a/crypto/krb5/src/lib/krb5/ccache/cc_file.c b/crypto/krb5/src/lib/krb5/ccache/cc_file.c index 198152a9ecd0..f34c0f1064aa 100644 --- a/crypto/krb5/src/lib/krb5/ccache/cc_file.c +++ b/crypto/krb5/src/lib/krb5/ccache/cc_file.c @@ -1311,6 +1311,14 @@ fcc_replace(krb5_context context, krb5_ccache id, krb5_principal princ, goto errno_cleanup; st = rename(tmpname, data->filename); +#ifdef _WIN32 + /* Windows cannot rename over an existing file under most circumstances. + * Try ReplaceFile() (which only works if the destination file exists). */ + if (st != 0) { + if (ReplaceFile(data->filename, tmpname, NULL, 0, NULL, NULL)) + st = 0; + } +#endif if (st != 0) goto errno_cleanup; tmpfile_exists = FALSE; diff --git a/crypto/krb5/src/lib/krb5/ccache/cc_mslsa.c b/crypto/krb5/src/lib/krb5/ccache/cc_mslsa.c index 4931e6c172a5..675cf4d11206 100644 --- a/crypto/krb5/src/lib/krb5/ccache/cc_mslsa.c +++ b/crypto/krb5/src/lib/krb5/ccache/cc_mslsa.c @@ -249,24 +249,15 @@ KerbExternalNameToMITPrinc(KERB_EXTERNAL_NAME *msprinc, WCHAR *realm, krb5_conte return FALSE; } -static time_t -FileTimeToUnixTime(LARGE_INTEGER *ltime) +/* + * Convert a Windows file time (number of 100-nanosecond intervals since + * 1601-01-01 UTC) to a POSIX timestamp (number of seconds since 1970-01-01 + * UTC). + */ +static inline time_t +FileTimeToUnixTime(int64_t ft) { - FILETIME filetime, localfiletime; - SYSTEMTIME systime; - struct tm utime; - filetime.dwLowDateTime=ltime->LowPart; - filetime.dwHighDateTime=ltime->HighPart; - FileTimeToLocalFileTime(&filetime, &localfiletime); - FileTimeToSystemTime(&localfiletime, &systime); - utime.tm_sec=systime.wSecond; - utime.tm_min=systime.wMinute; - utime.tm_hour=systime.wHour; - utime.tm_mday=systime.wDay; - utime.tm_mon=systime.wMonth-1; - utime.tm_year=systime.wYear-1900; - utime.tm_isdst=-1; - return(mktime(&utime)); + return ft / 10000000 - 11644473600; } static void @@ -346,9 +337,9 @@ MSCredToMITCred(KERB_EXTERNAL_TICKET *msticket, UNICODE_STRING ClientRealm, MSSessionKeyToMITKeyblock(&msticket->SessionKey, context, &creds->keyblock); MSFlagsToMITFlags(msticket->TicketFlags, &creds->ticket_flags); - creds->times.starttime=FileTimeToUnixTime(&msticket->StartTime); - creds->times.endtime=FileTimeToUnixTime(&msticket->EndTime); - creds->times.renew_till=FileTimeToUnixTime(&msticket->RenewUntil); + creds->times.starttime=FileTimeToUnixTime(msticket->StartTime.QuadPart); + creds->times.endtime=FileTimeToUnixTime(msticket->EndTime.QuadPart); + creds->times.renew_till=FileTimeToUnixTime(msticket->RenewUntil.QuadPart); creds->addresses = NULL; @@ -377,9 +368,9 @@ CacheInfoEx2ToMITCred(KERB_TICKET_CACHE_INFO_EX2 *info, creds->keyblock.enctype = info->SessionKeyType; creds->ticket_flags = info->TicketFlags; MSFlagsToMITFlags(info->TicketFlags, &creds->ticket_flags); - creds->times.starttime=FileTimeToUnixTime(&info->StartTime); - creds->times.endtime=FileTimeToUnixTime(&info->EndTime); - creds->times.renew_till=FileTimeToUnixTime(&info->RenewTime); + creds->times.starttime=FileTimeToUnixTime(info->StartTime.QuadPart); + creds->times.endtime=FileTimeToUnixTime(info->EndTime.QuadPart); + creds->times.renew_till=FileTimeToUnixTime(info->RenewTime.QuadPart); /* MS Tickets are addressless. MIT requires an empty address * not a NULL list of addresses. diff --git a/crypto/krb5/src/man/k5identity.man b/crypto/krb5/src/man/k5identity.man index a7d533f077fd..40962b7a49c2 100644 --- a/crypto/krb5/src/man/k5identity.man +++ b/crypto/krb5/src/man/k5identity.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "K5IDENTITY" "5" " " "1.22.1" "MIT Kerberos" +.TH "K5IDENTITY" "5" " " "1.22.2" "MIT Kerberos" .SH NAME k5identity \- Kerberos V5 client principal selection rules .SH DESCRIPTION @@ -96,6 +96,6 @@ kerberos(1), \fI\%krb5.conf\fP .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/k5login.man b/crypto/krb5/src/man/k5login.man index 906f8854f87c..d0e327d1bfa4 100644 --- a/crypto/krb5/src/man/k5login.man +++ b/crypto/krb5/src/man/k5login.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "K5LOGIN" "5" " " "1.22.1" "MIT Kerberos" +.TH "K5LOGIN" "5" " " "1.22.2" "MIT Kerberos" .SH NAME k5login \- Kerberos V5 acl file for host access .SH DESCRIPTION @@ -87,6 +87,6 @@ kerberos(1) .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/k5srvutil.man b/crypto/krb5/src/man/k5srvutil.man index 537ed15d8f3b..e926a1eb3b3f 100644 --- a/crypto/krb5/src/man/k5srvutil.man +++ b/crypto/krb5/src/man/k5srvutil.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "K5SRVUTIL" "1" " " "1.22.1" "MIT Kerberos" +.TH "K5SRVUTIL" "1" " " "1.22.2" "MIT Kerberos" .SH NAME k5srvutil \- host key table (keytab) manipulation utility .SH SYNOPSIS @@ -90,6 +90,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kadm5.acl.man b/crypto/krb5/src/man/kadm5.acl.man index 3517c08bd6fe..95cf849d7493 100644 --- a/crypto/krb5/src/man/kadm5.acl.man +++ b/crypto/krb5/src/man/kadm5.acl.man @@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KADM5.ACL" "5" " " "1.22.1" "MIT Kerberos" +.TH "KADM5.ACL" "5" " " "1.22.2" "MIT Kerberos" .SH NAME kadm5.acl \- Kerberos ACL file .SH DESCRIPTION @@ -271,6 +271,6 @@ To operate without an ACL file, set the \fIacl_file\fP variable in .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kadmin.man b/crypto/krb5/src/man/kadmin.man index 005c2add8135..15ddc17dc573 100644 --- a/crypto/krb5/src/man/kadmin.man +++ b/crypto/krb5/src/man/kadmin.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KADMIN" "1" " " "1.22.1" "MIT Kerberos" +.TH "KADMIN" "1" " " "1.22.2" "MIT Kerberos" .SH NAME kadmin \- Kerberos V5 database administration program .SH SYNOPSIS @@ -1089,6 +1089,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kadmind.man b/crypto/krb5/src/man/kadmind.man index c0b355c79a9b..842b5082c8b7 100644 --- a/crypto/krb5/src/man/kadmind.man +++ b/crypto/krb5/src/man/kadmind.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KADMIND" "8" " " "1.22.1" "MIT Kerberos" +.TH "KADMIND" "8" " " "1.22.2" "MIT Kerberos" .SH NAME kadmind \- KADM5 administration server .SH SYNOPSIS @@ -156,6 +156,6 @@ activation is used. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kdb5_ldap_util.man b/crypto/krb5/src/man/kdb5_ldap_util.man index 7cfda216e399..23461beafc60 100644 --- a/crypto/krb5/src/man/kdb5_ldap_util.man +++ b/crypto/krb5/src/man/kdb5_ldap_util.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KDB5_LDAP_UTIL" "8" " " "1.22.1" "MIT Kerberos" +.TH "KDB5_LDAP_UTIL" "8" " " "1.22.2" "MIT Kerberos" .SH NAME kdb5_ldap_util \- Kerberos configuration utility .SH SYNOPSIS @@ -500,6 +500,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kdb5_util.man b/crypto/krb5/src/man/kdb5_util.man index 0e5f1d1bf5fe..a777ad8ec933 100644 --- a/crypto/krb5/src/man/kdb5_util.man +++ b/crypto/krb5/src/man/kdb5_util.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KDB5_UTIL" "8" " " "1.22.1" "MIT Kerberos" +.TH "KDB5_UTIL" "8" " " "1.22.2" "MIT Kerberos" .SH NAME kdb5_util \- Kerberos database maintenance utility .SH SYNOPSIS @@ -563,6 +563,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kdc.conf.man b/crypto/krb5/src/man/kdc.conf.man index 33bbb13c6157..ca82a2f1796e 100644 --- a/crypto/krb5/src/man/kdc.conf.man +++ b/crypto/krb5/src/man/kdc.conf.man @@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KDC.CONF" "5" " " "1.22.1" "MIT Kerberos" +.TH "KDC.CONF" "5" " " "1.22.2" "MIT Kerberos" .SH NAME kdc.conf \- Kerberos V5 KDC configuration file .sp @@ -1178,6 +1178,6 @@ Here\(aqs an example of a kdc.conf file: .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kdestroy.man b/crypto/krb5/src/man/kdestroy.man index 88888d590133..e91ed47d35bf 100644 --- a/crypto/krb5/src/man/kdestroy.man +++ b/crypto/krb5/src/man/kdestroy.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KDESTROY" "1" " " "1.22.1" "MIT Kerberos" +.TH "KDESTROY" "1" " " "1.22.2" "MIT Kerberos" .SH NAME kdestroy \- destroy Kerberos tickets .SH SYNOPSIS @@ -90,6 +90,6 @@ Default location of Kerberos 5 credentials cache .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kerberos.man b/crypto/krb5/src/man/kerberos.man index 64d9290688cb..295d154c44d3 100644 --- a/crypto/krb5/src/man/kerberos.man +++ b/crypto/krb5/src/man/kerberos.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KERBEROS" "7" " " "1.22.1" "MIT Kerberos" +.TH "KERBEROS" "7" " " "1.22.2" "MIT Kerberos" .SH NAME kerberos \- Overview of using Kerberos .SH DESCRIPTION @@ -210,6 +210,6 @@ Institute of Technology .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kinit.man b/crypto/krb5/src/man/kinit.man index 9934f21b6895..6153166a1165 100644 --- a/crypto/krb5/src/man/kinit.man +++ b/crypto/krb5/src/man/kinit.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KINIT" "1" " " "1.22.1" "MIT Kerberos" +.TH "KINIT" "1" " " "1.22.2" "MIT Kerberos" .SH NAME kinit \- obtain and cache Kerberos ticket-granting ticket .SH SYNOPSIS @@ -250,6 +250,6 @@ default location for the local host\(aqs keytab. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/klist.man b/crypto/krb5/src/man/klist.man index e4e505bc6573..aa5e44ab4298 100644 --- a/crypto/krb5/src/man/klist.man +++ b/crypto/krb5/src/man/klist.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KLIST" "1" " " "1.22.1" "MIT Kerberos" +.TH "KLIST" "1" " " "1.22.2" "MIT Kerberos" .SH NAME klist \- list cached Kerberos tickets .SH SYNOPSIS @@ -151,6 +151,6 @@ Default location for the local host\(aqs keytab file. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kpasswd.man b/crypto/krb5/src/man/kpasswd.man index 7577b9213beb..0321cac4d0a2 100644 --- a/crypto/krb5/src/man/kpasswd.man +++ b/crypto/krb5/src/man/kpasswd.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KPASSWD" "1" " " "1.22.1" "MIT Kerberos" +.TH "KPASSWD" "1" " " "1.22.2" "MIT Kerberos" .SH NAME kpasswd \- change a user's Kerberos password .SH SYNOPSIS @@ -63,6 +63,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kprop.man b/crypto/krb5/src/man/kprop.man index c21bd9692735..f3fc60a71b43 100644 --- a/crypto/krb5/src/man/kprop.man +++ b/crypto/krb5/src/man/kprop.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KPROP" "8" " " "1.22.1" "MIT Kerberos" +.TH "KPROP" "8" " " "1.22.2" "MIT Kerberos" .SH NAME kprop \- propagate a Kerberos V5 principal database to a replica server .SH SYNOPSIS @@ -77,6 +77,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kpropd.man b/crypto/krb5/src/man/kpropd.man index b1caad000718..182ecfe8b7f7 100644 --- a/crypto/krb5/src/man/kpropd.man +++ b/crypto/krb5/src/man/kpropd.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KPROPD" "8" " " "1.22.1" "MIT Kerberos" +.TH "KPROPD" "8" " " "1.22.2" "MIT Kerberos" .SH NAME kpropd \- Kerberos V5 replica KDC update server .SH SYNOPSIS @@ -164,6 +164,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kproplog.man b/crypto/krb5/src/man/kproplog.man index 8d404de88b48..95a4b0800ca6 100644 --- a/crypto/krb5/src/man/kproplog.man +++ b/crypto/krb5/src/man/kproplog.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KPROPLOG" "8" " " "1.22.1" "MIT Kerberos" +.TH "KPROPLOG" "8" " " "1.22.2" "MIT Kerberos" .SH NAME kproplog \- display the contents of the Kerberos principal update log .SH SYNOPSIS @@ -108,6 +108,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/krb5-config.man b/crypto/krb5/src/man/krb5-config.man index 0b743cf5d124..ecc696a7919e 100644 --- a/crypto/krb5/src/man/krb5-config.man +++ b/crypto/krb5/src/man/krb5-config.man @@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KRB5-CONFIG" "1" " " "1.22.1" "MIT Kerberos" +.TH "KRB5-CONFIG" "1" " " "1.22.2" "MIT Kerberos" .SH NAME krb5-config \- tool for linking against MIT Kerberos libraries .SH SYNOPSIS @@ -135,6 +135,6 @@ shell% krb5\-config \-\-libs krb5 .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/krb5.conf.man b/crypto/krb5/src/man/krb5.conf.man index 2590f2151eaf..eaba2b4cdab0 100644 --- a/crypto/krb5/src/man/krb5.conf.man +++ b/crypto/krb5/src/man/krb5.conf.man @@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KRB5.CONF" "5" " " "1.22.1" "MIT Kerberos" +.TH "KRB5.CONF" "5" " " "1.22.2" "MIT Kerberos" .SH NAME krb5.conf \- Kerberos configuration file .sp @@ -1500,6 +1500,6 @@ syslog(3) .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/krb5kdc.man b/crypto/krb5/src/man/krb5kdc.man index bcbd19d01a98..3f38828b8b0f 100644 --- a/crypto/krb5/src/man/krb5kdc.man +++ b/crypto/krb5/src/man/krb5kdc.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KRB5KDC" "8" " " "1.22.1" "MIT Kerberos" +.TH "KRB5KDC" "8" " " "1.22.2" "MIT Kerberos" .SH NAME krb5kdc \- Kerberos V5 KDC .SH SYNOPSIS @@ -140,6 +140,6 @@ caller\-provided sockets will be ignored if socket activation is used. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/ksu.man b/crypto/krb5/src/man/ksu.man index 59015c2dd4dc..e1f1c16efab6 100644 --- a/crypto/krb5/src/man/ksu.man +++ b/crypto/krb5/src/man/ksu.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KSU" "1" " " "1.22.1" "MIT Kerberos" +.TH "KSU" "1" " " "1.22.2" "MIT Kerberos" .SH NAME ksu \- Kerberized super-user .SH SYNOPSIS @@ -462,6 +462,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kswitch.man b/crypto/krb5/src/man/kswitch.man index 7c21199fcee4..0ed5168aaa67 100644 --- a/crypto/krb5/src/man/kswitch.man +++ b/crypto/krb5/src/man/kswitch.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KSWITCH" "1" " " "1.22.1" "MIT Kerberos" +.TH "KSWITCH" "1" " " "1.22.2" "MIT Kerberos" .SH NAME kswitch \- switch primary ticket cache .SH SYNOPSIS @@ -66,6 +66,6 @@ Default location of Kerberos 5 credentials cache .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/ktutil.man b/crypto/krb5/src/man/ktutil.man index 8e4ec837732a..53077975bb87 100644 --- a/crypto/krb5/src/man/ktutil.man +++ b/crypto/krb5/src/man/ktutil.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KTUTIL" "1" " " "1.22.1" "MIT Kerberos" +.TH "KTUTIL" "1" " " "1.22.2" "MIT Kerberos" .SH NAME ktutil \- Kerberos keytab file maintenance utility .SH SYNOPSIS @@ -157,6 +157,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/kvno.man b/crypto/krb5/src/man/kvno.man index f068f0664ab4..b63ba3b238d2 100644 --- a/crypto/krb5/src/man/kvno.man +++ b/crypto/krb5/src/man/kvno.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "KVNO" "1" " " "1.22.1" "MIT Kerberos" +.TH "KVNO" "1" " " "1.22.2" "MIT Kerberos" .SH NAME kvno \- print key version numbers of Kerberos principals .SH SYNOPSIS @@ -136,6 +136,6 @@ Default location of the credentials cache .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/sclient.man b/crypto/krb5/src/man/sclient.man index e697bd44b281..10976c05a46a 100644 --- a/crypto/krb5/src/man/sclient.man +++ b/crypto/krb5/src/man/sclient.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SCLIENT" "1" " " "1.22.1" "MIT Kerberos" +.TH "SCLIENT" "1" " " "1.22.2" "MIT Kerberos" .SH NAME sclient \- sample Kerberos version 5 client .SH SYNOPSIS @@ -49,6 +49,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/man/sserver.man b/crypto/krb5/src/man/sserver.man index c71194e59aaa..e60cb696d9c3 100644 --- a/crypto/krb5/src/man/sserver.man +++ b/crypto/krb5/src/man/sserver.man @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SSERVER" "8" " " "1.22.1" "MIT Kerberos" +.TH "SSERVER" "8" " " "1.22.2" "MIT Kerberos" .SH NAME sserver \- sample Kerberos version 5 server .SH SYNOPSIS @@ -177,6 +177,6 @@ variables. .SH AUTHOR MIT .SH COPYRIGHT -1985-2025, MIT +1985-2026, MIT .\" Generated by docutils manpage writer. . diff --git a/crypto/krb5/src/patchlevel.h b/crypto/krb5/src/patchlevel.h index 1a6d3e47098f..7cde36884833 100644 --- a/crypto/krb5/src/patchlevel.h +++ b/crypto/krb5/src/patchlevel.h @@ -51,7 +51,7 @@ */ #define KRB5_MAJOR_RELEASE 1 #define KRB5_MINOR_RELEASE 22 -#define KRB5_PATCHLEVEL 1 +#define KRB5_PATCHLEVEL 2 /* #undef KRB5_RELTAIL */ -#define KRB5_RELDATE "20250820" -#define KRB5_RELTAG "krb5-1.22.1-final" +#define KRB5_RELDATE "20260129" +#define KRB5_RELTAG "krb5-1.22.2-final" diff --git a/crypto/krb5/src/po/mit-krb5.pot b/crypto/krb5/src/po/mit-krb5.pot index 6358f57081b2..6b4ba3bc3121 100644 --- a/crypto/krb5/src/po/mit-krb5.pot +++ b/crypto/krb5/src/po/mit-krb5.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mit-krb5 1.22.1\n" +"Project-Id-Version: mit-krb5 1.22.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-08-20 15:43-0400\n" +"POT-Creation-Date: 2026-01-28 19:53-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/crypto/krb5/src/prototype/prototype.c b/crypto/krb5/src/prototype/prototype.c index a9c225f92b0f..ada2a0d8b7ed 100644 --- a/crypto/krb5/src/prototype/prototype.c +++ b/crypto/krb5/src/prototype/prototype.c @@ -1,7 +1,7 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ /* prototype/prototype.c - <<< One-line description of file >>> */ /* - * Copyright (C) 2025 by the Massachusetts Institute of Technology. + * Copyright (C) 2026 by the Massachusetts Institute of Technology. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/crypto/krb5/src/prototype/prototype.h b/crypto/krb5/src/prototype/prototype.h index 94ab86d5859d..d17862561a6f 100644 --- a/crypto/krb5/src/prototype/prototype.h +++ b/crypto/krb5/src/prototype/prototype.h @@ -1,7 +1,7 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ /* prototype/prototype.h - <<< One-line description of file >>> */ /* - * Copyright (C) 2025 by the Massachusetts Institute of Technology. + * Copyright (C) 2026 by the Massachusetts Institute of Technology. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/crypto/krb5/src/windows/version.rc b/crypto/krb5/src/windows/version.rc index 491daf417785..8d36ec6c682e 100644 --- a/crypto/krb5/src/windows/version.rc +++ b/crypto/krb5/src/windows/version.rc @@ -41,7 +41,7 @@ #define K5_PRODUCT_VERSION_STRING MAJOR_MINOR MAYBE_PATCH RELTAIL "\0" #define K5_PRODUCT_VERSION KRB5_MAJOR_RELEASE, KRB5_MINOR_RELEASE, KRB5_PATCHLEVEL, KRB5_BUILDLEVEL -#define K5_COPYRIGHT "Copyright (C) 1997-2025 by the Massachusetts Institute of Technology\0" +#define K5_COPYRIGHT "Copyright (C) 1997-2026 by the Massachusetts Institute of Technology\0" #define K5_COMPANY_NAME "Massachusetts Institute of Technology.\0" /* From nobody Mon May 4 12:09:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8L6C2Lhxz6Rbjt for ; Mon, 04 May 2026 12:09:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8L6C1JQ0z45wf for ; Mon, 04 May 2026 12:09:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777896547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=axksXvfyGT2/wnLEFuVgMUdOHkkAFKJFlKSUbXddfZI=; b=knR8FKegSsdaqojhD9zC9n5Uk26Cp66QS8El6GjeU3QbjHgdJ+eAsaghNqttfhfikWF2Bh TzFITMAZbF4t03vR6semr2k/61Tg+0pvdxab4pNGDBx9Myz6/4ODHlIz43sr1lZValS79C oM4VWL4O74oXrD8PVxTUEoRA3K0Lok9GEUvKAtgEYFZskGh/4apPZMI61hsBxs337edGyy x9QroR6PFLFSYH3NJ7Ntg8acMC90J1n2rYqTEjx5/Qk/SjQsFNSib2ZzFwZ1g3CzvOjvJv yapHa4rSi2qXmExYLMlILEyHx0ZPpiXJHI/OP2fqqDHRnQuqzJf5jbtmYx3MNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777896547; a=rsa-sha256; cv=none; b=TfnG8BMQIt3l/RV1hDBbqiSl8zqx1coFOd/VEUBC6Iu+hbpOIMjISgjNlFmG9zJKnVr520 ZbKLxbIDgZjZNYIIRomEI0GsYc1tvsXMg4aiMM4FkKBAfceSve1o6ceM+5Lnq0rTameF88 3+a5Hdsy6cX0NkNdpVAFonRI0ZDFLE4hzM8c7BEGQVdULsE6p5Dyrz+Limm5DLj3OhGa6p YldeOqIbbZ/4qEejZmk+J77IR7CE/EiGjfF8QADV7k3p/pelwfCOBI20QwWahE3nw9wMdL DiyamRYWlJfkfKuhgjTt+m4Ra7MAeJOR3iD9y6VV34Kxb1dPuOhWRejwx4bJdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777896547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=axksXvfyGT2/wnLEFuVgMUdOHkkAFKJFlKSUbXddfZI=; b=yNLmDhTOq/hN3FeN/95XEZ8EKnKDMG0gdYs7YGEGD28Xy307YRTtd0jeV9aXohFZg2MpRv StjZO0uvHTLIsFTsgU1pCSj4Kjt0vw9LltaZTJJA/fh45KGkQCauWdoBWpRRMxCSL68fjJ ieqV4XGRQYa3ENZ+tux6KpzPH/KjIQy+7/klguycnexCn1uwzXJexwCCO7lkgpB07WW98u UhkCl0cf00Gbl7um3fvAKi3bQBvenQJu2/dEoF6XcouTRh/aOhNxyr/zbO3xXr7bRisrkz ilN5saHHrQ8VqW0n5Ql8Tjb7WIkFlvXl8SYJt6frJKD2aKaD/8fv/H6QJpZ3vA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8L6C0v71z3cM for ; Mon, 04 May 2026 12:09:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37733 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 12:09:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 8acc4c16c663 - main - vis.3: Try to better describe VIS_SAFE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8acc4c16c6635c3cd8871d0ee1221b62d48d71b9 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 12:09:07 +0000 Message-Id: <69f88c63.37733.7fd2598@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8acc4c16c6635c3cd8871d0ee1221b62d48d71b9 commit 8acc4c16c6635c3cd8871d0ee1221b62d48d71b9 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-04 12:08:10 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-04 12:08:10 +0000 vis.3: Try to better describe VIS_SAFE The current text fails to draw the reader's attention to the fact that VIS_SAFE essentially exempts certain characters from being encoded. While here, fix some markup nits. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56716 --- contrib/libc-vis/vis.3 | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/contrib/libc-vis/vis.3 b/contrib/libc-vis/vis.3 index 18329589d940..9b7b8152be3e 100644 --- a/contrib/libc-vis/vis.3 +++ b/contrib/libc-vis/vis.3 @@ -29,7 +29,7 @@ .\" .\" @(#)vis.3 8.1 (Berkeley) 6/9/93 .\" -.Dd April 22, 2017 +.Dd May 3, 2026 .Dt VIS 3 .Os .Sh NAME @@ -246,19 +246,22 @@ alter this: Also encode double quotes .It Dv VIS_GLOB Also encode the magic characters -.Ql ( * , +.Po +.Ql * , .Ql \&? , .Ql \&[ , and -.Ql # ) +.Ql # +.Pc recognized by .Xr glob 3 . .It Dv VIS_SHELL Also encode the meta characters used by shells (in addition to the glob characters): -.Ql ( ' , +.Po +.Ql ' , .Ql ` , -.Ql \&" , +.Ql \&\(dq , .Ql \&; , .Ql & , .Ql < , @@ -272,7 +275,8 @@ characters): .Ql \&! , .Ql \&^ , and -.Ql ~ ) . +.Ql ~ +.Pc . .It Dv VIS_SP Also encode space. .It Dv VIS_TAB @@ -286,13 +290,15 @@ Synonym for Synonym for .Dv VIS_WHITE | VIS_GLOB | VIS_SHELL . .It Dv VIS_SAFE -Only encode -.Dq unsafe -characters. -Unsafe means control characters which may cause common terminals to perform -unexpected functions. -Currently this form allows space, tab, newline, backspace, bell, and -return \(em in addition to all graphic characters \(em unencoded. +Leave +.Dq safe +characters unencoded. +Characters are only considered unsafe if they cause common terminals +to perform unexpected functions. +Setting the +.Dv VIS_SAFE +flag exempts the backspace, bell, and return characters from being +encoded. .El .Pp (The above flags have no effect for From nobody Mon May 4 12:10:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8L846yYBz6RcFW for ; Mon, 04 May 2026 12:10: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 4g8L843XgQz46pF for ; Mon, 04 May 2026 12:10:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777896644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oR8MFOKoRraOxHcxj1RPtF0eNe5s6zDssEPtLWyooew=; b=c05BAy2GF02GR7uHMw/j92SwTN8oBUvAmDd6H/oxOytlO7r2UmRI6fSbuznd8HUKTek6zv +d8OxN9bXcn4PahhKIlvKtQ++jjdFwS3d/zFnmVQCsOQwR9a1xDvW1Y+Y2FnTrKXwMp48h iq+fCU5Nmk1DcdMH0CsQ/MP6awE15WGaZoxQFp9kGxLdFWcKun22dHENVBBOz62OFlOR+1 VvxWr/bpqSSCgJpGiVM5j+1UhoZRWJteIWNGwfZN5c4R8LYBjM4JboCMMJaHojAptVsnOk VQ5uQv9Dt1MFwJyWJoVpALTYC8HMEI7ziDVcDZbGn3JmM9D+VmJBWF+64JE9rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777896644; a=rsa-sha256; cv=none; b=A6he6w2PGH+3zotlB2FXQ1WAdUJ6YQgeo9dwFRMnHoOBFmmrRkPQ5RNr8Qfa7TL1DLBdLH sg0JX2uixPIl4OnQL1WegkAAv2XD5UQALruT8cppsb3RRtMqeEqWvLoSJMD47hubld21y7 ZukR5LpVgt7sBL4WOmKsxwIPtHau36WjZfj8eSrw1ofrblci2AUFAFs+7MAZf+M/5EtipV 9NFEPc9OFrbs4DJrraRjlfjEmBLaP4AZmfYgxGl/yDAaDK4JDZY5xOUlaQ+MqZmAX0t1AB h8DmsnOPH/OxIhEEZHMIsG7KsfkErMkXn3fmQtZqQytg82eHumIjC13Anv+Xsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777896644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oR8MFOKoRraOxHcxj1RPtF0eNe5s6zDssEPtLWyooew=; b=WhTpbwrIGNMk0jUsdLI76Oo6EJByIEtU+Yx03LDR7R0/XXND88HL3No4HUqkFMxF+L2fjE uYhv3PuwbqhaROwb0T48zwjkgEibkwr+LsriY+3SlX8CCmhA2JdR/cZZjY11LDz/yEYmcy PdB1wfnnDVdNjJe3CUpsN8vi+MoZDKFLtNf1pL1CLAXAe++xIMX4qmvgi/ZxoKrVNstwKK t2AFsc7cQdXMdKiqnWabnl3fA0l8zK+dLaDrsDZcibYvSnLYhWMecQKDkCBwrqWtgNjGpW zJyqp7IcgRFl/vKkH0TRAJkPqIauxNJihRVNJQLj6WH5oT9OGNQJLQCELdpqRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8L8432gFz3cZ for ; Mon, 04 May 2026 12:10:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39306 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 12:10:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 1b149c2a9735 - stable/15 - mixer(8): Deprecate some unintuitive control values List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 1b149c2a973526df6ba63f8521c4591aa7250d50 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 12:10:44 +0000 Message-Id: <69f88cc4.39306.3f92b042@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=1b149c2a973526df6ba63f8521c4591aa7250d50 commit 1b149c2a973526df6ba63f8521c4591aa7250d50 Author: Christos Margiolis AuthorDate: 2026-04-23 12:06:15 +0000 Commit: Christos Margiolis CommitDate: 2026-05-04 12:10:25 +0000 mixer(8): Deprecate some unintuitive control values This is a follow-up to cc7479d7dc9b ("mixer(8): Improve mute and recsrc controls"). These deprecated values will be completely removed on 2026-06-15. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: 0mp Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/21 (cherry picked from commit a28bb575c89c8de62684419ece1ff5e070e4ce24) (cherry picked from commit 54922e4ec8909829a7ca8d2158c2a514a06df094) --- usr.sbin/mixer/mixer.8 | 20 +++++++--------- usr.sbin/mixer/mixer.c | 48 ++++++++++++++++++++++++-------------- usr.sbin/mixer/tests/mixer_test.sh | 18 +------------- 3 files changed, 41 insertions(+), 45 deletions(-) diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8 index bdff0dbedc11..2d12e6057797 100644 --- a/usr.sbin/mixer/mixer.8 +++ b/usr.sbin/mixer/mixer.8 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2021 Christos Margiolis +.\" Copyright (c) 2021-2026 Christos Margiolis .\" .\" Permission is hereby granted, free of charge, to any person obtaining a copy .\" of this software and associated documentation files (the "Software"), to deal @@ -19,7 +19,7 @@ .\" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN .\" THE SOFTWARE. .\" -.Dd February 26, 2026 +.Dd April 4, 2026 .Dt MIXER 8 .Os .Sh NAME @@ -113,9 +113,7 @@ with one of the available devices): .Oo Cm \&+ | Cm \&- Oc Ar lvol Oo % Oc .Oo Cm \&: Oo Cm \&+ | Cm \&- Oc Ar rvol Oo % Oc Oc .Xc -.It Ar dev Cm .mute Ta Cm 0 | 1 | ^ .It Ar dev Cm .mute Ta Cm off | on | toggle -.It Ar dev Cm .recsrc Ta Cm ^ | + | - | = .It Ar dev Cm .recsrc Ta Cm toggle | add | remove | set .El .Sm on @@ -153,13 +151,13 @@ The control (un)mutes a device. The following values are available: .Bl -tag -width "xxxxxxxxxx" -offset indent -.It Cm 0 | off +.It Cm off unmutes .Ar dev -.It Cm 1 | on +.It Cm on mutes .Ar dev -.It Cm ^ | toggle +.It Cm toggle toggles the mute of .Ar dev .El @@ -177,19 +175,19 @@ on a .Sy rec device: .Bl -tag -width "xxxxxxxxxx" -offset indent -.It Cm ^ | toggle +.It Cm toggle toggles .Ar dev of possible recording devices -.It Cm + | add +.It Cm add adds .Ar dev to possible recording devices -.It Cm - | remove +.It Cm remove removes .Ar dev from possible recording devices -.It Cm = | set +.It Cm set makes .Ar dev the only recording device. diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c index a0fc9705a301..c9efacc666eb 100644 --- a/usr.sbin/mixer/mixer.c +++ b/usr.sbin/mixer/mixer.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2021 Christos Margiolis + * Copyright (c) 2021-2026 Christos Margiolis * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -428,16 +428,22 @@ mod_mute(struct mix_dev *d, void *p) m = d->parent_mixer; cp = mixer_get_ctl(m->dev, C_MUT); val = p; - if (strncmp(val, "off", strlen(val)) == 0 || - strncmp(val, "0", strlen(val)) == 0) + if (strncmp(val, "off", strlen(val)) == 0) { opt = MIX_UNMUTE; - else if (strncmp(val, "on", strlen(val)) == 0 || - strncmp(val, "1", strlen(val)) == 0) + } else if (strncmp(val, "0", strlen(val)) == 0) { + warnx("%s: deprecated: use \"off\" instead", val); + opt = MIX_UNMUTE; + } else if (strncmp(val, "on", strlen(val)) == 0) { + opt = MIX_MUTE; + } else if (strncmp(val, "1", strlen(val)) == 0) { + warnx("%s: deprecated: use \"on\" instead", val); opt = MIX_MUTE; - else if (strncmp(val, "toggle", strlen(val)) == 0 || - strncmp(val, "^", strlen(val)) == 0) + } else if (strncmp(val, "toggle", strlen(val)) == 0) { + opt = MIX_TOGGLEMUTE; + } else if (strncmp(val, "^", strlen(val)) == 0) { + warnx("%s: deprecated: use \"toggle\" instead", val); opt = MIX_TOGGLEMUTE; - else { + } else { warnx("%s: no such modifier", val); return (-1); } @@ -464,19 +470,27 @@ mod_recsrc(struct mix_dev *d, void *p) m = d->parent_mixer; cp = mixer_get_ctl(m->dev, C_SRC); val = p; - if (strncmp(val, "add", strlen(val)) == 0 || - strncmp(val, "+", strlen(val)) == 0) + if (strncmp(val, "add", strlen(val)) == 0) { + opt = MIX_ADDRECSRC; + } else if (strncmp(val, "+", strlen(val)) == 0) { + warnx("%s: deprecated: use \"add\" instead", val); opt = MIX_ADDRECSRC; - else if (strncmp(val, "remove", strlen(val)) == 0 || - strncmp(val, "-", strlen(val)) == 0) + } else if (strncmp(val, "remove", strlen(val)) == 0) { opt = MIX_REMOVERECSRC; - else if (strncmp(val, "set", strlen(val)) == 0 || - strncmp(val, "=", strlen(val)) == 0) + } else if (strncmp(val, "-", strlen(val)) == 0) { + warnx("%s: deprecated: use \"remove\" instead", val); + opt = MIX_REMOVERECSRC; + } else if (strncmp(val, "set", strlen(val)) == 0) { + opt = MIX_SETRECSRC; + } else if (strncmp(val, "=", strlen(val)) == 0) { + warnx("%s: deprecated: use \"set\" instead", val); opt = MIX_SETRECSRC; - else if (strncmp(val, "toggle", strlen(val)) == 0 || - strncmp(val, "^", strlen(val)) == 0) + } else if (strncmp(val, "toggle", strlen(val)) == 0) { opt = MIX_TOGGLERECSRC; - else { + } else if (strncmp(val, "^", strlen(val)) == 0) { + warnx("%s: deprecated: use \"toggle\" instead", val); + opt = MIX_TOGGLERECSRC; + } else { warnx("%s: no such modifier", val); return (-1); } diff --git a/usr.sbin/mixer/tests/mixer_test.sh b/usr.sbin/mixer/tests/mixer_test.sh index c48512db5ec7..da5f4d7566bc 100755 --- a/usr.sbin/mixer/tests/mixer_test.sh +++ b/usr.sbin/mixer/tests/mixer_test.sh @@ -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 Christos Margiolis # under sponsorship from the FreeBSD Foundation. @@ -210,16 +210,6 @@ mute_body() atf_check -o ignore -e empty mixer vol.mute=toggle atf_check -o match:"=off" mixer vol.mute - # Test deprecated interface - atf_check -o ignore -e empty mixer vol.mute=0 - atf_check -o match:"=off" mixer vol.mute - - atf_check -o ignore -e empty mixer vol.mute=1 - atf_check -o match:"=on" mixer vol.mute - - atf_check -o ignore -e empty mixer vol.mute=^ - atf_check -o match:"=off" mixer vol.mute - # Test wrong values atf_check -o ignore -e not-empty mixer vol.mute=foobar atf_check -o ignore -e not-empty mixer vol.mute=10 @@ -248,12 +238,6 @@ recsrc_body() atf_check -o ignore -e empty mixer ${recsrc}.recsrc=set atf_check -o ignore -e empty mixer ${recsrc}.recsrc=toggle - # Test deprecated interface - atf_check -o ignore -e empty mixer ${recsrc}.recsrc=+ - atf_check -o ignore -e empty mixer ${recsrc}.recsrc=- - atf_check -o ignore -e empty mixer ${recsrc}.recsrc== - atf_check -o ignore -e empty mixer ${recsrc}.recsrc=^ - # Test wrong values atf_check -o ignore -e not-empty mixer ${recsrc}.recsrc=foobar atf_check -o ignore -e not-empty mixer ${recsrc}.recsrc=10 From nobody Mon May 4 13:50:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8NLs2JRRz6bCZh for ; Mon, 04 May 2026 13:50: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 4g8NLs1013z3LZb for ; Mon, 04 May 2026 13:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777902613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CyNerDDuREPBwudkbmSgs+5HaYzwB4bJ6Wh9rO8yYDg=; b=M2ZW79uHkrHNCDaYjqdxPYUP34Q3/UhDonuVz375hfQdF7YJciwRbXRZPklFRFePqhYL+D BV3Jrmc/TPSOtH4YyKxqd3P3xI4g6UDkW9gV4KN9KUSJTyr4IpXYjFi/El5ly2vugWcttE xs9FiERmuGRgwIGe4rtBhuqe0h0fNzk4OxLBfaQ0gaw2/6KzrWeL/OIDZTlAZR99l2Thkc pGGAarK14mBRHvV5f6XyXjmYhOdl+QdKLhuPcn8AqCkSsj+XBUposDumUdmRtM9ah9QWZG WZ46oRhUKpIdIwvAezpKkz/PYbLxi+ANn6iEP2uR7c844UOjmcMIE0BLUWB2OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777902613; a=rsa-sha256; cv=none; b=Px/5sfr09UusDFG3PsrM24PBQsH7vkFIIsyotkrcSEFegvcOjmdQz/oQcLMkimheYHkZN1 Z1ao1TGTE/MoalcBIa82+BTGSSw+LnM7t0gXrMFjoQuax4euw40xwDF8O4tBngRl2C8ADi sdKTDyj7abvycGFJeq7Bn6xSGsZmegR9ZuY2MqsJo2mAkO3VKb8Bv3yvS/77H1VJu9oBOJ 43djUWsBp53MNarhgwCRWT46oeWPR0kzbPBwI20++ImDH8XECXUtGOSkr1ZMnbkyYaZ2zG aqw4g16N56FjzNJ8FaWkfChRaRIGjqg3xPRGt81QGW/yC/RLMne27E/NN4qhKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777902613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CyNerDDuREPBwudkbmSgs+5HaYzwB4bJ6Wh9rO8yYDg=; b=PxrQPrGYLfs6Q1D1HDnqH9t68zJ2fSvunfB0r75OSaE0NTHFVKqHzOsgi7+Ui4qTbrPRG3 QoxHF6l0zZejqM/MSSi8MvpPJXFU6x+ocxCwEQt+ZNfML/nbwZE/Y5aSxQjbQdthQEzpEF Zwlqx+bUmFJW4W+dAUWcDWotsId+DJT/trLC4IIiNnRS0/nTOkHC1amV3Z05w9y35fY/PE ZRECCZgK38r0qzW106mdqNr4JfrpuRzy9yszrc+4E2zK5KyYoDTzDgWl8nBrnlPaS31F88 GtBIsEN7NYjBmW6rgpDfpzG8Ym/c8sPwOUfufFbVOOQFrov8PVd3WyxF10JsBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8NLs04q8z70c for ; Mon, 04 May 2026 13:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41fd7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 13:50:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 045a9ef829fa - main - llvm: Don't install /usr/bin/{gcov,objdump} twice List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 045a9ef829fa30c2ba7af47ab34d3b2443024207 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 13:50:07 +0000 Message-Id: <69f8a40f.41fd7.1637cbcf@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=045a9ef829fa30c2ba7af47ab34d3b2443024207 commit 045a9ef829fa30c2ba7af47ab34d3b2443024207 Author: Lexi Winter AuthorDate: 2026-05-04 13:49:20 +0000 Commit: Lexi Winter CommitDate: 2026-05-04 13:49:20 +0000 llvm: Don't install /usr/bin/{gcov,objdump} twice Commit c4f08d46c7f7 moved the symlinks for the LLVM binutils from LLVM itself to the toolchain (usr.bin/clang/toolchain), but did not remove the links for /usr/bin/gcov and /usr/bin/objdump from the llvm version, meaning we installed them twice, once in the clang package and once in the toolchain package. Remove the links from the llvm version and move the MLINKs to toolchain, which is where the other MLINKs dwell. While here, fix toolchain to use the correct build option for llvm-cov, MK_LLVM_COV. Fixes: c4f08d46c7f7 ("llvm-*: Move all LLVM_BINUTILS symlinks to toolchain package") Reported by: jrm Reviewed by: jrm, dim, emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56788 --- usr.bin/clang/Makefile | 1 + usr.bin/clang/llvm-cov/Makefile | 2 -- usr.bin/clang/llvm-objdump/Makefile | 3 --- usr.bin/clang/toolchain/Makefile | 4 ++++ 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile index d86508829533..1d80fad2936f 100644 --- a/usr.bin/clang/Makefile +++ b/usr.bin/clang/Makefile @@ -65,6 +65,7 @@ SUBDIR+= lldb-server .if ${MK_LLVM_COV} != "no" SUBDIR+= llvm-cov SUBDIR+= llvm-profdata +SUBDIR_DEPEND_toolchain= llvm-cov .endif .endif # TOOLS_PREFIX diff --git a/usr.bin/clang/llvm-cov/Makefile b/usr.bin/clang/llvm-cov/Makefile index 3c02d4b7d144..67a93fa593bb 100644 --- a/usr.bin/clang/llvm-cov/Makefile +++ b/usr.bin/clang/llvm-cov/Makefile @@ -1,8 +1,6 @@ .include PROG_CXX= llvm-cov -SYMLINKS= llvm-cov ${BINDIR}/gcov -MLINKS= llvm-cov.1 gcov.1 SRCDIR= llvm/tools/llvm-cov SRCS+= CodeCoverage.cpp diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index 86281217ee0a..c0c201b68085 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -29,7 +29,4 @@ DEPENDFILES+= ${TGHDRS:C/$/.d/} DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} -SYMLINKS= llvm-objdump ${BINDIR}/objdump -MLINKS= llvm-objdump.1 objdump.1 - .include "../llvm.prog.mk" diff --git a/usr.bin/clang/toolchain/Makefile b/usr.bin/clang/toolchain/Makefile index 1a7db32274e3..5f66ae1433b1 100644 --- a/usr.bin/clang/toolchain/Makefile +++ b/usr.bin/clang/toolchain/Makefile @@ -7,7 +7,10 @@ SYMLINKS+= llvm-ar ${BINDIR}/ar SYMLINKS+= llvm-ranlib ${BINDIR}/ranlib MLINKS+= llvm-ar.1 ar.1 llvm-ar.1 ranlib.1 +.if ${MK_LLVM_COV} != "no" SYMLINKS+= llvm-cov ${BINDIR}/gcov +MLINKS= llvm-cov.1 gcov.1 +.endif SYMLINKS+= llvm-cxxfilt ${BINDIR}/c++filt MLINKS+= llvm-cxxfilt.1 c++filt.1 @@ -21,6 +24,7 @@ MLINKS+= llvm-objcopy.1 objcopy.1 MLINKS+= llvm-objcopy.1 strip.1 SYMLINKS+= llvm-objdump ${BINDIR}/objdump +MLINKS= llvm-objdump.1 objdump.1 SYMLINKS+= llvm-readelf ${BINDIR}/readelf MLINKS+= llvm-readelf.1 readelf.1 From nobody Mon May 4 15:23:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8QQf357Qz6bPcn for ; Mon, 04 May 2026 15:23: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 4g8QQf1YQHz3bc8 for ; Mon, 04 May 2026 15:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777908218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z8wboxUYjQvvFXouhJe7Ra0ngZqqbbCz4tMPolQ/65Q=; b=F0QJFwIU2OqmL2c27WUSDIEi2DQOyJVbOfT9XY6JfPW94O2M98GdSQe7V83XqbEstDvh2h GXr8EnEO/J1/am5OrCgDZ6dhEiDmgsQGYBxdqbY+lijKQRiNw8XHaCz0s/aiAOW+uOuUTK AWIvp1augp/H9cc1w2d0vFKg12rYEcdylSzemj16FkYLKN0Uu3U7Rx5jsRvPLzI33Qxjw0 KGJXBYFJe/6ZU5dXBk5AMW0OPsm/3S8v5+CF0ASv2DerUpdVprgaUUue0Rwfk2sRIiWAzJ JXkyLuklzD6TAiB7UjOaQGyjJTPK3nGZX89UTNEo5+NGhF/7IOf6UkE/mciRWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777908218; a=rsa-sha256; cv=none; b=DfmwZ5MQegz5gHWhlpoTBqnRv5iDJrSd6GgCSEzpE892kRokWB72POc27D+UPmIHqN5LTJ dsVtbsoQSwaekNn77b8N8ZjaDEJSyM7gXQteGpOQdi3qg2/hTNiArjqoKQwuvVYQvZFEQn YdUF/bZK1MFUhWO9tsPtFDPavahJC8g76YFXUigsfsDG+Y89a39scrAqsFJ/t2JOdDvSx4 8OCVPpaZjvnTDM9nSxPbid84/05t19V0bVvrlkuo3XYMRACh8ppGdLQw+ccdRX8i3leu3R 5KmZzBr5Tr1NL72Xd/bWIhHwfWb4Zba02gU/FYHishS2kHEq/BO2mj30AC0aiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777908218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z8wboxUYjQvvFXouhJe7Ra0ngZqqbbCz4tMPolQ/65Q=; b=KTNy1xrVOrJLzYHHG37qqv7GN9eNwLlzKl8ZrpREa81/qfKIv33fHW8UiqdlRvPw02mGay XsSzpBu9NyIpZjVc6YnZr2XkI7aCXlBpzrSudnY2AA0sMoNYTuXn/ocRdp3Qzwu5k+T59n NRjoddI3sozycRUTz2tyNBycav6FCP99vCun1580z1Du+qGoquCrZIPkeI79zgFzadYBI2 JTTWrrQwDTJrneQAlOR0H//zLvT5Rp9XW9XPyMO2ZdMn9L4C/To7B2GKIZ6Xr7sdtr8pf/ dDNXqXto7hfQKasN710w8kocqKVBfK7z6hObwYnvOpncFchk8RGUbjzYj+oUQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8QQd6sZlz9dH for ; Mon, 04 May 2026 15:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18ef1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 15:23:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3d1c59a0bee9 - Create tag release/13.5.0-p14 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/tags/release/13.5.0-p14 X-Git-Reftype: annotated tag X-Git-Commit: 3d1c59a0bee97b02a5a4b6013bb8d5699fdf18e7 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 15:23:32 +0000 Message-Id: <69f8b9f4.18ef1.58184b42@gitrepo.freebsd.org> The annotated tag release/13.5.0-p14 has been created by markj: URL: https://cgit.FreeBSD.org/src/tag/?h=release/13.5.0-p14 tag release/13.5.0-p14 Tagger: Mark Johnston TaggerDate: 2026-05-04 15:20:15 +0000 Tag FreeBSD 13.5-RELEASE-p14 commit 2e6399fe39b3497c7d949b905025082232418793 Author: Mark Johnston AuthorDate: 2026-04-30 21:14:06 +0000 Commit: Mark Johnston CommitDate: 2026-04-30 21:21:13 +0000 Add UPDATING entries and bump version Approved by: so From nobody Mon May 4 15:23:54 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8QQz2M9wz6bP8g for ; Mon, 04 May 2026 15:23: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 4g8QQz0Dr6z3c27 for ; Mon, 04 May 2026 15:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777908235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bCYouSEBszfFXM1zV+BaUGwMQZSHkg2tQLNJumHTm5A=; b=ehbDukHDw07kVvWNJwHE2oYQ+fOGIbp2xRwpDRPGzZWvvh0G+YjLPokvWq7GHLM4WETiO9 N0L/rJy16fj1mhYZl0HchDrTRE9xoMe41autpLITq6V+iEwz5A9Qri3y9QMPt9ukCDYkuJ WUCXarilseuwpRER2BG7okIjuKACPZylfLBv86btBEy6Zm1apJpczBlhuI+HNDUfTcnD70 Jg7xAA7QBB8u4o6SaHd9K0aVV6uw0mV5xmwusItycPMIVUVShXbnmSEAuMYpy/UXkKxWpu cUQEeRDpOBvAz3psJb9T+R3BsyRRRYc3Og1h1ugy/7OcqsZ8nuR8boPZ425JNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777908235; a=rsa-sha256; cv=none; b=J/WqYlDePNxUC7/Ua2sg/hmBzKAZXDCoNkZXqu3s6ia0YCo7sLimf00D+fgpsUtDoiJy9y 1PKr3dlEKdFDoH3LR7i+R70rnBX61npyBtX9TKz12zJgwlJPBOqHq+UOoWRJq7FHu3mRpI 4yHzuw6SNEnAMopqbMDelyhmrdaYQ4TqoD3QKzwkAEcCgIotaMEfpC8EGksE1LNJ8aDMg0 j6iZTo+IElYMfybuVD8QM2uQ0GUeuEiCVqQhjwOQZmyue7QeFZpEUi6eAfKgbIXUyvVs7E ZUEqwbkRaJLKo/zxcmFBOifTELhERsXZ1RGTi5YZnFFSb51jjfEY00yqIqPewg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777908235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bCYouSEBszfFXM1zV+BaUGwMQZSHkg2tQLNJumHTm5A=; b=Z9ptXlUtTBrTbOyh2CD7uNUYKJQZvygSRUufzFJKtWNIAqdXC5nBLOLJ5O2DfYf5xtdo/2 bvlc+ni8ksXJJUZANNaf/fPUie3EvJ2+druzlVUpiwhrigcw8eVzyg06vvZNbdgVcGHN/U yJ+hf+hPayG17hie5E3Umq1oHY08D057/OJ5Td7AyZhP+6OOd2qYQCHaCGU79LvH+KZ3Z/ KLyyihsPNOL9Rr05yehDMxHKWex33FN5QIS2ZpgNqI4VDYGVspjrB8hoHPaoydhH2vJjNo FUS9RtPVrbRgXl4C/ELqWilf4s5TFR9N0tSRDeITsaU01XcRdj2a+a/H/OJMYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8QQy6LV4z9qh for ; Mon, 04 May 2026 15:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a46a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 15:23:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d8c8682d59f5 - Create tag release/14.3.0-p13 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/tags/release/14.3.0-p13 X-Git-Reftype: annotated tag X-Git-Commit: d8c8682d59f5d3b407acf5a2aebfc70acf8cfd07 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 15:23:54 +0000 Message-Id: <69f8ba0a.1a46a.56c06c95@gitrepo.freebsd.org> The annotated tag release/14.3.0-p13 has been created by markj: URL: https://cgit.FreeBSD.org/src/tag/?h=release/14.3.0-p13 tag release/14.3.0-p13 Tagger: Mark Johnston TaggerDate: 2026-05-04 15:23:41 +0000 Tag FreeBSD 14.3-RELEASE-p13 commit 4f4b48e8a5478657f343953ef30ce992f2a6b68f Author: Mark Johnston AuthorDate: 2026-04-30 21:12:58 +0000 Commit: Mark Johnston CommitDate: 2026-04-30 21:21:34 +0000 Add UPDATING entries and bump version Approved by: so From nobody Mon May 4 15:24:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8QRP0X1Bz6bPHm for ; Mon, 04 May 2026 15:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8QRN5qV9z3bwK for ; Mon, 04 May 2026 15:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777908256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUr97Xv2OLpCHcTr5NQ451pslRKVIKOBjP+8RCANFbY=; b=yiEvoDfaGbIwEgip9PK6SzVtQ5Iusp9sk2T8gZusUh0g4L3jgb7qMPs/vYeJT1xq7aYQ2v wTN653PnjvfnM6Eo/QjsXuaGmsuxq1C9w/NC4DtwMfhABjV2yho68wtB2pW5PZLxJad8Rq 3Fc/qwV5bRqzxK4UulMWq2BQLfrgEA3ano2hT2qvE7/jC1MzEJCgXWHzNvGvhcDn58f5ag vHNLyy4kC5ZBoofQMXznOOWAQLR30IGTgJs1Tc5YANPfwASHvUDG6DvhSjZGgMkVszuEo+ RVi85sI4VADyYmLWEvR6xmfvFYJ0XBGzrJ60VEsR7e1AJwkVhVoQujZD9WDmoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777908256; a=rsa-sha256; cv=none; b=YtF7+bHCjHUYztC3QsxA1HY04ZELRWJ1K3zj/O0GYA4h14zESut+fz9JLkE9jFOgnA42As nvxN8VqJVItk1Oaw7PwWH8nlm2qTx2kBlzCcfXIzvQHN5qH08KGqAPbxIr1yqPUIRpVWLH LeuqbjoIHAsnsLk01Ko4YPw7TF4MB63r7qEXURwJX5PG8nBbr31WuyHBS+iw4J0ei3rKv9 9P4iDZVr8NsRkil92Z7MYSkyByuLto8lTN4+lmj/4W2s+f2+eHRWvjoPPOzfXZalJlNktV RqcVGGceBH3HpT15EMiObAmEtLeLxHD0P+emE6mP+NdZkIev8mRvx10gEebHhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777908256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUr97Xv2OLpCHcTr5NQ451pslRKVIKOBjP+8RCANFbY=; b=weF65WQOaEjbHzLvnRa9Yv6FOjrbuNGfs0mvgZfTsl/EYsw4M4h1RCJ5ivcNeOUeTkVNB1 3Fm4aqP3UtsuAE9pm8TP5ObzVx6uie4v4uwRjLwMVc74FtB/1yCwl2caL8SPKOYvtCpTOo B7UDAL+2G7kFnSZ7fgz6Xu80tnfZBMHJGtDERdUSf0WAJwO5mXf98cWt9FTZXPsgDPXGSX +VQd4pw945WLmIgtjKwehzNnwynkqdA9wd0V5teIq/8Sa9u5ltGevlCx3XkAfYw4GVGOmc O3BzQdiiPzNo/DGfhPL0cwgpkL1l8XZsmmMEWMd7qXufqcWb6Zi8PMzlb5Csdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8QRN4hJ4z9dJ for ; Mon, 04 May 2026 15:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a46e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 15:24:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e21af1c4bfbc - Create tag release/14.4.0-p4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/tags/release/14.4.0-p4 X-Git-Reftype: annotated tag X-Git-Commit: e21af1c4bfbced3f2ef36c4fb3d8134b5cb2b66c Auto-Submitted: auto-generated Date: Mon, 04 May 2026 15:24:16 +0000 Message-Id: <69f8ba20.1a46e.76c32871@gitrepo.freebsd.org> The annotated tag release/14.4.0-p4 has been created by markj: URL: https://cgit.FreeBSD.org/src/tag/?h=release/14.4.0-p4 tag release/14.4.0-p4 Tagger: Mark Johnston TaggerDate: 2026-05-04 15:23:59 +0000 Tag FreeBSD 14.4-RELEASE-p4 commit 49be56ed6fea1b8456cb6daf6ea163bf2d084861 Author: Mark Johnston AuthorDate: 2026-04-30 21:12:03 +0000 Commit: Mark Johnston CommitDate: 2026-04-30 21:21:54 +0000 Add UPDATING entries and bump version Approved by: so From nobody Mon May 4 15:24:33 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8QRk0wSGz6bPX8 for ; Mon, 04 May 2026 15:24: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 4g8QRj5MGQz3c4T for ; Mon, 04 May 2026 15:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777908273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B6tigoYPWvHo8yzsXOONahP6UPcGNdkyoWT7bTJEtq0=; b=CRgv7/3bi96f2E2dHbCsUkUuTEiMdENvDFlkKM6N3Z6CH+AiIID71DI2D5ErgBUJ1NPuBi 7ZOoY+dakAsIOwNN4lqiBBgJRv6aWeFAYBHaUitC7g73z95UGbbaxgIguFwOkPTK1BRZc2 GxPnZl+6EpZwrTLYldKxqKLC4rDlHi1UqE7C0DCaPEZPRs6ip2cDaz21TzWo8bda/Omh+A x9L9yigDZlLCyJ8StPBPrUXVnjEDEEVSOlgogqmMH7qsNQQsb8zBCFY56DsJR5L3DuLNNv 8M7y5g5UR0BaSLWcddn0vzcIH1YkAGJ5+caMLj2pzMx065PIEn4t/zgybtR67A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777908273; a=rsa-sha256; cv=none; b=UI34iDTZ3WnFT1LE/EGPYLB46sLWy4klM8WGEFMX+c33aXL4gdH0+sPeoO/bUF/mJV+sRj AlfoMdbcowrmyq4DRwRFzNyXoMk5GogDNrELmlMN8gTdhWaVvqzKNdEEHPGg12QzGogjgt UHX08yOwNA9OMKco8LsuC3mPjQK2OIzks24lGI7//IF5Zc8tH6srOnrA7dxdLlU6DTCLx0 01MmfuCh0ga85SzcDy3l3UKEAudIaIokT8/RwpnmsD2FxtFe3hOmrKvH9j6GjJ8hpW7gNK oDakCvK7oSuQXj892jCYjzSJhJ4/PJUqeGJI3rSMFFAvbICoDycQnYfJDSFzRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777908273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B6tigoYPWvHo8yzsXOONahP6UPcGNdkyoWT7bTJEtq0=; b=Rv7jh9wCz2YpiPrJzlCVsf7mX6B4attN62xLRl20uEWmrAPAayq6ju0r3Q8fHDnMPfJb2R odM0RJwP5qLzlBypF/ELDGvqoiVvP/X6pBvtAKZrM/9p4Z4geBtJJKlb2zRx6H4cU+4BH1 pRJTyw3I3b9aRRRgubzxDlFcKzFioKTJM90Mc4z0z4AkdwMlWEdV+aB3NwlI9n2PWgj3+W c9w0ContyJPPM0D03GEVwxnjXm8XSJ7ewbzSYXdPamHpnIl3d4Oealko+Lffrxj38XNpcv TIIp4e0m0wb073zDpV35apWlz+4HW05Kt/t+PZVFB+uVZA32t8ELvV62qFzTuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8QRj4R79z8sp for ; Mon, 04 May 2026 15:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c2d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 15:24:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c895694f1791 - Create tag release/15.0.0-p8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/tags/release/15.0.0-p8 X-Git-Reftype: annotated tag X-Git-Commit: c895694f1791f667b4a43dc67f670ed778bb05d3 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 15:24:33 +0000 Message-Id: <69f8ba31.1c2d2.3ea2ba3@gitrepo.freebsd.org> The annotated tag release/15.0.0-p8 has been created by markj: URL: https://cgit.FreeBSD.org/src/tag/?h=release/15.0.0-p8 tag release/15.0.0-p8 Tagger: Mark Johnston TaggerDate: 2026-05-04 15:24:21 +0000 Tag FreeBSD 15.0-RELEASE-p8 commit 53054229dcb3cb994056da70b6c838c74ea3bb83 Author: Mark Johnston AuthorDate: 2026-04-30 21:10:49 +0000 Commit: Mark Johnston CommitDate: 2026-04-30 21:10:49 +0000 Add UPDATING entries and bump version Approved by: so From nobody Mon May 4 16:03:08 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8RJL3fpWz6blnN for ; Mon, 04 May 2026 16:03: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 4g8RJD40mMz3l9r for ; Mon, 04 May 2026 16:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777910588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lv0Uj6SlC/WQMAugmWNMIFjtbMOJ5cxQWhHJqBRBF5Q=; b=xll4ImVKrN9E7eVyvzhUoLn9ig1MuQX7fKKBIn2dSn7EC9s7+cEys00jIq8vM1yERXv6Ol KGgmGrbrsGj1mnTuYq6wMC8a94BGpXz6r6iOAjS9izOGK5Cl09hW/Zo+un0B1DtkazQXbu XfR/Y3/Nbyv7s1bYGgKgyrKJk22JpBL8szvn7HrHxGoAPMOS5xSo5pbN3vajz6unw0Dxi6 AP/9EygVHb/evIYhjD4HfJ8nLzotteDNx85iu2/QA7gQMjDDnVmvLF1FPSivEdO7y9SH3q 4cWCFF3diL2Vqgltpc4YZ0xLmrAe0qsS6R8+ft9xbjSw7UQB8gI7Y+ILeLbRJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777910588; a=rsa-sha256; cv=none; b=IcRNzIhHBgQgyB5fHu7RX4yYleGg7LAGTA2InqD2CDXgws6BO9XOHZY2iibgarxLXJY/Jr sXi12by2a6EILwW2guHSEBQjcwJ3YwFoZ/fJExW8INmuTIoFVGNHMgFkljMCaCkWy9PWaU sCrZP5VGu2CyXfzBAdFPpPSfXoYxYug3V+Y61rRWtaPy9aRE2t7f72UxT1K8EaZCux/M68 twI/gvHUxzEJPA7KYBgX7VwN07mmax2nStMkvqvjn2N+20Wp5WcQHX5pkXLYh3Uldl4mKI ea3iGpAg8Pub8UkmL5JLg0X4j2Zr0J55QSphPCrcxJ0Gn4wSjePMYN+RWdVU2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777910588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lv0Uj6SlC/WQMAugmWNMIFjtbMOJ5cxQWhHJqBRBF5Q=; b=QJIeoihp9hrfULPIt/YHEnrnyY844vG/0pXIAJKCuMlDyk0zyiDINULZ5LqmXDJJTgW5Ud g802fadk40B4JurY6eVy0wRlT2ehkgcyqPfsNmhipFXJOBAYbhk+NDRO4BmV6+8OEnOgOt kInFOXMeR7ypI+13JkAVZ/dAxW677neaxoMsfHbnAZvT8MWnOg/gupKCEGGlnEdpsl5c7Y ckGPoN1P7WAJSN3FmKbbBsuqAf9XWSuNARauP2d84T/HkbJT4eYo7kr+nv4tiKsYEDE7N3 tJ5QUkyg6OaWFAmcrusrjwHSw6uyPjv9xYTL+5Q4J6VGi8oa4vgYjJ9YxsVVpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8RJD3YMzzBhQ for ; Mon, 04 May 2026 16:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21d68 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 16:03:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: 36b399f55e3f - main - asmc: rename wol sysctl to auto_poweron List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36b399f55e3fa16063188b6f8ad8eaaf8c2215ab Auto-Submitted: auto-generated Date: Mon, 04 May 2026 16:03:08 +0000 Message-Id: <69f8c33c.21d68.546f46ca@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=36b399f55e3fa16063188b6f8ad8eaaf8c2215ab commit 36b399f55e3fa16063188b6f8ad8eaaf8c2215ab Author: Abdelkader Boudih AuthorDate: 2026-05-04 14:26:44 +0000 Commit: Adrian Chadd CommitDate: 2026-05-04 14:26:44 +0000 asmc: rename wol sysctl to auto_poweron Older SMC firmware exposed AUPO as a Wake-on-LAN control. On updated firmware, the key controls automatic power-on when AC power is restored after a power loss; WoL is handled by the GBE controller instead. Rename the sysctl to reflect the current semantics. No compatibility alias is provided as the sysctl has not appeared in any release. Reviewed by: ziaee, adrian Differential Revision: https://reviews.freebsd.org/D56747 --- share/man/man4/asmc.4 | 9 ++++++++- sys/dev/asmc/asmc.c | 24 ++++++++++-------------- sys/dev/asmc/asmcvar.h | 4 +++- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/share/man/man4/asmc.4 b/share/man/man4/asmc.4 index 9b42d021e1aa..e1dd4b09d647 100644 --- a/share/man/man4/asmc.4 +++ b/share/man/man4/asmc.4 @@ -1,4 +1,4 @@ -.\"- +.\" .\" Copyright (c) 2007, 2008, 2009 Rui Paulo .\" All rights reserved. .\" @@ -112,6 +112,13 @@ minimum fan speed, the minimum speed and the maximum speed respectively. .Pp All values are in RPM. +.Sh POWER MANAGEMENT +The +.Va dev.asmc.%d.auto_poweron +sysctl controls whether the machine automatically powers on when AC power +is restored after an unclean power loss +.Pq SMC key Dq AUPO . +A value of 1 enables automatic power-on; 0 disables it. .Sh RAW SMC KEY ACCESS When the kernel is compiled with the .Dv ASMC_DEBUG diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 5fe89d85be6d..8cd7842d03fd 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -123,7 +123,7 @@ static int asmc_mbp_sysctl_light_left(SYSCTL_HANDLER_ARGS); static int asmc_mbp_sysctl_light_right(SYSCTL_HANDLER_ARGS); static int asmc_mbp_sysctl_light_control(SYSCTL_HANDLER_ARGS); static int asmc_mbp_sysctl_light_left_10byte(SYSCTL_HANDLER_ARGS); -static int asmc_wol_sysctl(SYSCTL_HANDLER_ARGS); +static int asmc_aupo_sysctl(SYSCTL_HANDLER_ARGS); static int asmc_key_getinfo(device_t, const char *, uint8_t *, char *); @@ -793,14 +793,14 @@ asmc_init(device_t dev) device_printf(dev, "SMC revision: %x.%x%x%x\n", buf[0], buf[1], buf[2], ntohs(*(uint16_t *)buf + 4)); - /* Wake-on-LAN convenience sysctl */ + /* Auto power-on after AC power loss (AUPO). */ if (asmc_key_read(dev, ASMC_KEY_AUPO, buf, 1) == 0) { SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "wol", + OID_AUTO, "auto_poweron", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, - dev, 0, asmc_wol_sysctl, "I", - "Wake-on-LAN enable (0=off, 1=on)"); + dev, 0, asmc_aupo_sysctl, "I", + "Auto power-on after AC power loss (0=off, 1=on)"); } sc->sc_nfan = asmc_fan_count(dev); @@ -1222,7 +1222,7 @@ out: /* * Raw SMC key access sysctls - enables reading/writing any SMC key by name * Usage: - * sysctl dev.asmc.0.raw.key=AUPO # Set key, auto-detects length + * sysctl dev.asmc.0.raw.key=TC0P # Set key, auto-detects length * sysctl dev.asmc.0.raw.value # Read current value (hex bytes) * sysctl dev.asmc.0.raw.value=01 # Write new value */ @@ -2338,18 +2338,17 @@ asmc_mbp_sysctl_light_left_10byte(SYSCTL_HANDLER_ARGS) } /* - * Wake-on-LAN convenience sysctl. - * Reading returns 1 if WoL is enabled, 0 if disabled. - * Writing 1 enables WoL, 0 disables it. + * Auto power-on after AC power loss (AUPO key). + * When non-zero the machine boots automatically when AC is restored + * after an unclean power loss. Useful for always-on servers / home labs. */ static int -asmc_wol_sysctl(SYSCTL_HANDLER_ARGS) +asmc_aupo_sysctl(SYSCTL_HANDLER_ARGS) { device_t dev = (device_t)arg1; uint8_t aupo; int val, error; - /* Read current AUPO value */ if (asmc_key_read(dev, ASMC_KEY_AUPO, &aupo, 1) != 0) return (EIO); @@ -2358,10 +2357,7 @@ asmc_wol_sysctl(SYSCTL_HANDLER_ARGS) if (error != 0 || req->newptr == NULL) return (error); - /* Clamp to 0 or 1 */ aupo = (val != 0) ? 1 : 0; - - /* Write AUPO */ if (asmc_key_write(dev, ASMC_KEY_AUPO, &aupo, 1) != 0) return (EIO); diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index ae027ba33ae9..6388fc78fb69 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -175,7 +175,9 @@ struct asmc_softc { #define ASMC_KEY_CLAMSHELL "MSLD" /* RO; 1 byte */ /* - * Auto power on / Wake-on-LAN. + * Auto power-on after AC power loss (AUPO). + * When set, the machine boots automatically when AC power is restored + * after an unclean power loss. This is NOT Wake-on-LAN. */ #define ASMC_KEY_AUPO "AUPO" /* RW; 1 byte */ From nobody Mon May 4 16:51:13 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMk22mCz6brF3 for ; Mon, 04 May 2026 16:51: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 4g8SMj3PZHz3w4f for ; Mon, 04 May 2026 16:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cXVXJwSixNVblenOY0fd3URBdPrmx054N2UDxLM5RO4=; b=N+Qfs28wycEWulvA/V9bbTCKtNIrOQhg04uyvVOQ7XPNRvcyfGCp6cx17uez0D8XtWKy/I egUoBtjvs1uwvQuTCjpTyIUlcA7gaLxFDLqBwy7wzlqYmDPT5f8SHkU8dnL9rdru0TI4jN XiX7ZoI+TxzYRw36ZQdT+8hv61oUSJabXNhSKYMUo8zd9twNcWv6OGVu2sGgZKW2NrxxSx Z7v2A9mBJ8UaMmEDKnjaIjBravE7nVvk2NM5YSwxKgwRGXNSoBcOQnCEpSX91xZbloFhzy Jx/DE+K7xdIuSMJjGnMlyglaZVmYo0MyntUR3NXzes6UI/GfuIAdHv337IlMtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777913473; a=rsa-sha256; cv=none; b=Fqm3USHTqj0u52Qg9yYUYQhZL+ATk/TPkjatSikVfbM1Rga/iW7Vb8sSHL91O3SCcqXZgs Y33F3TgOQ+5LnvBtgeCDXJRayX0aD93Z3VuDQVaWX3GBvguX3dLMLs9Kgp37dIGz+LEXNl gphJm3ZKQNLSK9YJYJ1a0tV+zJHHUboie0jiSg+2CigN8AFSOZC2daNn4cUSHfYaQsLG1k tuH9jz1op3OCK71+Lz5Da/PhXBXfV/TVAOwlO8d46NmzkaqtwNu7+e2dlmqro/SDbf2c3b Y9YaRckpd/GWdV3sSDFsMYWxjSuhO4FOeie8YNMaqFpbjZ55JHgG3WJDjEKEdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cXVXJwSixNVblenOY0fd3URBdPrmx054N2UDxLM5RO4=; b=ExI5DyKlcn9J45MFsSoPle90GWpDoCcEm7UkMIOG8XJDX2fC0geO4ya1FMXkSqHLcwrcku DUHXiWwPgVhpO/avc2F9+2nk0l/R1vTcGSW/MARqSksjmStLLig2/cIgWIJk0RXcxdcWtZ A57O1o0HNGNUoRG4qK6kBw9eWrHbFYjT5wqk8wshNgJUVxyg7b3Q7GQECkI2OhS0VMDq8B GtR9Nu3238tZ7Z++nu5MleAElbklXMq/YFtpI+TZY5hp32j3POhRGjxLwius5IHgOYeFV5 QBqaM0x0xB3XQyR1m2gTlvjoWTZ/VG9dcB7P667H3YA3JBqg9XiwcSmDhT/B5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMj31CzzClt for ; Mon, 04 May 2026 16:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26b8f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 16:51:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: f7145eff8172 - stable/14 - ifnet: Fix races in if_vmove_reclaim() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f7145eff8172cbcaffb36c1d13aae0e438759a7c Auto-Submitted: auto-generated Date: Mon, 04 May 2026 16:51:13 +0000 Message-Id: <69f8ce81.26b8f.67a6c9d7@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f7145eff8172cbcaffb36c1d13aae0e438759a7c commit f7145eff8172cbcaffb36c1d13aae0e438759a7c Author: Zhenlei Huang AuthorDate: 2026-03-30 16:00:01 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-04 16:49:40 +0000 ifnet: Fix races in if_vmove_reclaim() The thread running if_vmove_reclaim() may race with other threads those running if_detach(), if_vmove_loan() or if_vmove_reclaim(). In case the current thread loses race, two issues arise, 1. It is unstable and unsafe to access ifp->if_vnet, 2. The interface is removed from "active" list, hence if_unlink_ifnet() can fail. For the first case, check against source prison's vnet instead, given the interface is obtained from that vnet. For the second one, return ENODEV to indicate the interface was on the list but the current thread loses race, to distinguish from ENXIO, which means the interface or child prison is not found. This is the same with if_vmove_loan(). Reviewed by: kp, pouria Fixes: a779388f8bb3 if: Protect V_ifnet in vnet_if_return() MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55997 (cherry picked from commit ee9456ce37539da5b651945eea18502f290eb133) (cherry picked from commit cef2f7b440ffa67271690a6aba532e4c090772db) --- sys/net/if.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 2245863bda83..55c81b7c931b 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1355,7 +1355,7 @@ if_vmove_reclaim(struct thread *td, char *ifname, int jid) struct prison *pr; struct vnet *vnet_dst; struct ifnet *ifp; - int found __diagused; + int found; /* Try to find the prison within our visibility. */ sx_slock(&allprison_lock); @@ -1368,16 +1368,16 @@ if_vmove_reclaim(struct thread *td, char *ifname, int jid) /* Make sure the named iface exists in the source prison/vnet. */ CURVNET_SET(pr->pr_vnet); - ifp = ifunit(ifname); /* XXX Lock to avoid races. */ + ifp = ifunit(ifname); if (ifp == NULL) { CURVNET_RESTORE(); prison_free(pr); return (ENXIO); } - /* Do not try to move the iface from and to the same prison. */ + /* Do not try to move the iface from and to the same vnet. */ vnet_dst = TD_TO_VNET(td); - if (vnet_dst == ifp->if_vnet) { + if (vnet_dst == pr->pr_vnet) { CURVNET_RESTORE(); prison_free(pr); return (EEXIST); @@ -1385,7 +1385,11 @@ if_vmove_reclaim(struct thread *td, char *ifname, int jid) /* Get interface back from child jail/vnet. */ found = if_unlink_ifnet(ifp, true); - MPASS(found); + if (! found) { + CURVNET_RESTORE(); + prison_free(pr); + return (ENODEV); + } sx_xlock(&ifnet_detach_sxlock); if_vmove(ifp, vnet_dst); sx_xunlock(&ifnet_detach_sxlock); From nobody Mon May 4 16:51:12 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMh6KsTz6brGw for ; Mon, 04 May 2026 16:51: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 4g8SMh2zbVz3w9Y for ; Mon, 04 May 2026 16:51:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XqTUJ2SaK36Ry7P0xCkQNAU4OaojKnPnAr0Pkb5W4tE=; b=GV5HlHyoMuQgB2DRTvftDrC9GqdTWoHlPnKRHnyr6694MfrxbWAJR3+3eXA/sZIIiw96+6 hSRy6TAmJZAP3ig9k1jSAYe/IjtoIXIO1h2DLulbiYTvHizbS2LgpdUP9w80tflpVMycqe qzw0CNWekDXT0B/J1XWiWUkwH4EbVk7M9iwExAeXLu8xnCjUZ3aqEBBT2VcIVKjpxHwie+ aTe023k9CCTj61p3EQyrE2VTlLXIvcDmiX9NX2VkScxBaZkPEJLLm60GoinBt3DEuqrJoR jTsxLw7KRILP6MvFCrngmauianI0nY5v8jAueagiTYBwiOS16/DwwtZj3VX5Jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777913472; a=rsa-sha256; cv=none; b=rJkJSlbWCuOuCS2Qiy194iR760asNjegi2THturJEw5hK483/IS8K9utUgh43CjN9kw0Zk cmxWbhV2yCqgIaj0l/9TDk5BdbuVnLibAwlrVt8nhv9EPnCuw+LQUvLjKBypCj2Yty59CD giWw7c7ePaDIHyE2G9jpKl9a8ryPkpvNtMTy/2VCu0tzHeUJJlc7UiO1KzPCIbbC8hA5ZQ PaLr/1fQy5+sWH6KfpMxQ5IyGHreW60SgiOHhiqKlbnAZs0+SHru7CyKGDKwbULG6BhWyf T7FVgNOHvRnsvLgslEMYLOnJ6WuSKb7LL22iz91g4yBJQ/ZixX0J/HGpiUFYwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XqTUJ2SaK36Ry7P0xCkQNAU4OaojKnPnAr0Pkb5W4tE=; b=wf4aAivk3qKLoPARwzHR+SlteoXcNPvTpzLJracimJxtGfoWxXGtipHsuAz48YuxcHtCQn U01+Kmar+Of7FXVQ4j8LP6IZRAGF0P0RQhukcG/XB8w/hnZ32R0nEhrk5q18UWRtWx01MC 2mpecxgWGweZVAv9GDfdKizc9HVJpg9ySeHlScSkN5tq5P59TQwcn/GzhMRkYmQZCm7ZBU NAgvbfKsBMsa2oQC6MZXQyIrsS2DiRze58qR6L4jF76RM0cOhVXHVzaYVMGrhEfPEORCkv TPgc40coY1NNomwTjm4CLIzjItm9Bic3smVunFFtlV2Tf+2KfVVyw6yk+kXX2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMh2Z7xzCpJ for ; Mon, 04 May 2026 16:51:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27844 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 16:51:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: bc73c7f61912 - stable/14 - ifnet: Remove unreachable code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bc73c7f6191211b254f8cc87aab71d5ff853e24d Auto-Submitted: auto-generated Date: Mon, 04 May 2026 16:51:12 +0000 Message-Id: <69f8ce80.27844.3fac1349@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=bc73c7f6191211b254f8cc87aab71d5ff853e24d commit bc73c7f6191211b254f8cc87aab71d5ff853e24d Author: Zhenlei Huang AuthorDate: 2026-03-16 17:03:05 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-04 16:49:40 +0000 ifnet: Remove unreachable code The ioctls SIOCSIFVNET and SIOCSIFRVNET are for userland only. For SIOCSIFVNET, if_vmove_loan(), the interface is obtained from current VNET. For SIOCSIFRVNET, if_vmove_reclaim(), a valid child prison is held before getting the interface. In both cases the VNET of the obtained interfaces is stable, so there's no need to check it. No functional change intended. Reviewed by: glebius, jamie (for #jails) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55828 (cherry picked from commit e0731059af912a27d0f842959218946b1daaa7d1) (cherry picked from commit a989b0fbc965b453d97e3d032efb4f9c7592734a) --- sys/net/if.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 44f80a51eea8..2245863bda83 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1301,7 +1301,6 @@ if_vmove_loan(struct thread *td, struct ifnet *ifp, char *ifname, int jid) struct prison *pr; struct ifnet *difp; bool found; - bool shutdown; MPASS(ifindex_table[ifp->if_index].ife_ifnet == ifp); @@ -1331,14 +1330,6 @@ if_vmove_loan(struct thread *td, struct ifnet *ifp, char *ifname, int jid) } sx_xlock(&ifnet_detach_sxlock); - /* Make sure the VNET is stable. */ - shutdown = VNET_IS_SHUTTING_DOWN(ifp->if_vnet); - if (shutdown) { - sx_xunlock(&ifnet_detach_sxlock); - prison_free(pr); - return (EBUSY); - } - found = if_unlink_ifnet(ifp, true); if (! found) { sx_xunlock(&ifnet_detach_sxlock); @@ -1365,7 +1356,6 @@ if_vmove_reclaim(struct thread *td, char *ifname, int jid) struct vnet *vnet_dst; struct ifnet *ifp; int found __diagused; - bool shutdown; /* Try to find the prison within our visibility. */ sx_slock(&allprison_lock); @@ -1393,14 +1383,6 @@ if_vmove_reclaim(struct thread *td, char *ifname, int jid) return (EEXIST); } - /* Make sure the VNET is stable. */ - shutdown = VNET_IS_SHUTTING_DOWN(ifp->if_vnet); - if (shutdown) { - CURVNET_RESTORE(); - prison_free(pr); - return (EBUSY); - } - /* Get interface back from child jail/vnet. */ found = if_unlink_ifnet(ifp, true); MPASS(found); From nobody Mon May 4 16:51:14 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMk6CqDz6brK5 for ; Mon, 04 May 2026 16:51: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 4g8SMk4FhHz3w4g for ; Mon, 04 May 2026 16:51:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n7fcwoFsfi5v0pUKBV87M+iozR2uy+TvJnaLso/UtQk=; b=thGTD2DyjBrS0UO7bm8qZC2hu/DpOUHdlvODsVJxCw5rP7mndFu7DSRgIABeKaOM0RKIno 3u7RupZ1t2fsujHLECXBsD5D3Y6scDp1wgj1cvubBYANh2Yk0ITNJwRdkqJaXyzQ3L95h+ HlpKA4tjEtlZQ3Yu4x8UmdBNwTDcuOZ+My4CO341Q2BUxne5ykng451lKTx1fl1am4BSJW m0SUvwpPws1wDFDXZ5AWj7hcpdnEh3ufwIncGLyloF3Vb37F42xLagCPLNOnkYUlerVmWJ 37cOusTONO0TbFWT5kJK75kDlPikNmkgjLjmn6g5S57SucalVBWkAQxG5Luw5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777913474; a=rsa-sha256; cv=none; b=ritokJUCcoMfvw7pRzQdItcuWaixzzNE9IUtGk8M7JbVZfbc5I6a43tVTLlWHimKUWm49T 8XfmkpICFgh1wNc5pyQBA6QpH4n6ygyZjCJlgpYSwWGzTkL8Izldu70/rMRTwUiKzThBoH QlsrZxsPByOkLpKXXZMQiJbe0m67OmDVDnOjUrsK+w8SGbAORoqbrUdNsj/WhgWhQPiz6z HRe2hcmWYA/YHQIPZJ87zCkZBZtNbjlAW2VZrJKx2B8B/y/v5t/bEKVMrA8GceDGc7XwjX s7HEhNMGIyIdSCDVH62deXRsRfJCa9nnlojbS6uRvPBhlMmBpRp45EVbAEHT5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n7fcwoFsfi5v0pUKBV87M+iozR2uy+TvJnaLso/UtQk=; b=N/ah3e331dbjIxbimM7pKnsg6qdF29wuMrxiJj0Qk4IZ3xmACRUyLEQ5vvYNA83Wlcc1mT unDVf8eoZ8zb2pl4aB4TjcSS+D8HnQ77bZL3J7gC6DxFMYywV8V8r1HvgQnQT9tnT164/a 4U5EyxjXIzc+eZKHpWtg3NDExa4c7PYhwtg+1AIsrp/9zX9Uzs79tqrvZa+ZFId/2ZH6sd GZxzHVo84ad/PGkHuPm8oukIwZAIcxL7bj1UqNykdsSOjBBhoHzBGZshdGeg0BAg5tw/ex JJ9y3YeoOMssQOkYTt5xMDppps5RFo/Er0cDZOlr5UfWPR/TEpOpwTEQxAxLQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMk3ZlxzCrQ for ; Mon, 04 May 2026 16:51:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24acc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 16:51:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: b1dc0bc2cc86 - stable/14 - ifnet: Add some sanity checks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b1dc0bc2cc8658992bed0c0a3148f6a9c67eef8b Auto-Submitted: auto-generated Date: Mon, 04 May 2026 16:51:14 +0000 Message-Id: <69f8ce82.24acc.28c04d9f@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=b1dc0bc2cc8658992bed0c0a3148f6a9c67eef8b commit b1dc0bc2cc8658992bed0c0a3148f6a9c67eef8b Author: Zhenlei Huang AuthorDate: 2026-04-07 04:33:05 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-04 16:49:40 +0000 ifnet: Add some sanity checks To be more robust since the checking is now performed where the interface is referenced. While here, remove a redundant check from if_vmove_loan(). Reviewed by: kp, glebius, pouria MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55875 (cherry picked from commit 00d96da231d007673a1672452748d8ea4f6788ae) (cherry picked from commit 877fa4f2a2d37dcd9e828d12dc9736c5e83ffd8c) --- sys/net/if.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 55c81b7c931b..1d6b2f7b9461 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -440,8 +440,12 @@ VNET_SYSINIT(vnet_if_init, SI_SUB_INIT_IF, SI_ORDER_SECOND, vnet_if_init, static void if_link_ifnet(struct ifnet *ifp) { - IFNET_WLOCK(); + + MPASS(refcount_load(&ifp->if_refcount) > 0); + MPASS(ifp->if_vnet == curvnet); + MPASS(ifindex_table[ifp->if_index].ife_ifnet == ifp); + CK_STAILQ_INSERT_TAIL(&V_ifnet, ifp, if_link); #ifdef VIMAGE curvnet->vnet_ifcnt++; @@ -458,6 +462,10 @@ if_unlink_ifnet(struct ifnet *ifp, bool vmove) IFNET_WLOCK(); CK_STAILQ_FOREACH(iter, &V_ifnet, if_link) if (iter == ifp) { + MPASS(refcount_load(&ifp->if_refcount) > 0); + MPASS(ifp->if_vnet == curvnet); + MPASS(ifindex_table[ifp->if_index].ife_ifnet == ifp); + CK_STAILQ_REMOVE(&V_ifnet, ifp, ifnet, if_link); #ifdef VIMAGE curvnet->vnet_ifcnt--; @@ -1302,8 +1310,6 @@ if_vmove_loan(struct thread *td, struct ifnet *ifp, char *ifname, int jid) struct ifnet *difp; bool found; - MPASS(ifindex_table[ifp->if_index].ife_ifnet == ifp); - /* Try to find the prison within our visibility. */ sx_slock(&allprison_lock); pr = prison_find_child(td->td_ucred->cr_prison, jid); @@ -2222,14 +2228,13 @@ ifunit_ref(const char *name) NET_EPOCH_ENTER(et); CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { if (strncmp(name, ifp->if_xname, IFNAMSIZ) == 0 && - !(ifp->if_flags & IFF_DYING)) + !(ifp->if_flags & IFF_DYING)) { + MPASS(ifp->if_vnet == curvnet); + MPASS(ifindex_table[ifp->if_index].ife_ifnet == ifp); + if_ref(ifp); break; + } } - if (ifp != NULL) { - if_ref(ifp); - MPASS(ifindex_table[ifp->if_index].ife_ifnet == ifp); - } - NET_EPOCH_EXIT(et); return (ifp); } @@ -2242,8 +2247,12 @@ ifunit(const char *name) NET_EPOCH_ENTER(et); CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { - if (strncmp(name, ifp->if_xname, IFNAMSIZ) == 0) + if (strncmp(name, ifp->if_xname, IFNAMSIZ) == 0) { + MPASS(refcount_load(&ifp->if_refcount) > 0); + MPASS(ifp->if_vnet == curvnet); + MPASS(ifindex_table[ifp->if_index].ife_ifnet == ifp); break; + } } NET_EPOCH_EXIT(et); return (ifp); From nobody Mon May 4 16:51:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMn0NYcz6brK6 for ; Mon, 04 May 2026 16:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8SMm5hzpz3wGG for ; Mon, 04 May 2026 16:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Au7gABmffUhGbkYGRTyCOEV5VD+3aQ8D6cGtJlOfP3I=; b=rkItKGztRkzWKvIyMOyRtObkD2/l8di80ojb6jsoZd9w6gswvrxLEyytOQSrlYqlAOMDQt 5wk8kS+WjeKglCmVF4+ft+/OJ2pmd5yCNwkct1Df8WN10Gfd3cGMPFaef9fN3kJkOTA5OA yMNmE+z6/uaGLX+R+nkKFxLFjueeEtvSKrWNodhTxUvOp4re30S/dW2Z+tGB9JU1TMQOok TjKQkTV5ogL6B1Aw56n78cQz9tjwseT7tAUa2Fq1h81pThHS0WBu/BhEmroQEEn2J+o26H ++xGmpbTz1tWKtPKBjfXuJaxdCYXWFnNhMYHoyofzqxCDpSLwQhXB5jLLFi+jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777913476; a=rsa-sha256; cv=none; b=eNjivZB5JE2QSvm9C6bmxH7PD7nfVilusSyU1cqMAg4u5Tkas4kp/6gfWSOcj3NMfZqDSL 2J/R8Ay5OAS/F4fdvLZq0Ml1FSVR4WZy3CZRRoXwQrVFcgIzQorSsOfZ50X7+7nxF5fIgV 9rBOrsWom1LGm/51hqZ1G5MyQWJl3B40/NkfqHM3CPtclvJepbjMFT+SqLVX4hF2E/1Iki xmp1BiJnu4DGJ3/ctBTOAIcBjYmf2U/NYR1j2M5XEx8eWTz98wo26Qrim1+7noXjigGYrP lVuNViUVIm9lW6cSCchUhWI/w0hK1bcd34DbMBC5fNpvqtXGasdWI7/wAFq0mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Au7gABmffUhGbkYGRTyCOEV5VD+3aQ8D6cGtJlOfP3I=; b=dJeRE3ro9hvMoEwN/vEOjtUVb4VnStkGSzir7pEelbQOw4ZynAaVncjm/XcrckFLvRocpO hAHxWwnYyKoSbyfL9OjYjyrXW8i8qcQSXS351/WBM83HQwj2QIYGXsV87wYnWXiarRPM8n UKi48VofCFjGuhBhxwAJgd82LWbXmLsiOOBzViXkCqw+B781oaQipdpaekuP+kRt7htZrp trxctnqUjFigKMffeoOygrJ53jsv1xHOYh7bNnG7aWUwO32eL2uJXxquf4tNRDJdFoEBCi uXEshYE3LbopeUCDAF8+zt04fSioGIshl+2ehgwwRf635khEF7CLsR/a0A4lEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMm5JNCzCrR for ; Mon, 04 May 2026 16:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27310 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 16:51:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 328598079b56 - stable/14 - ifnet: Move SIOCSIFVNET from ifhwioctl() to ifioctl() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 328598079b56bb007d8baa065be603b992b4da6d Auto-Submitted: auto-generated Date: Mon, 04 May 2026 16:51:16 +0000 Message-Id: <69f8ce84.27310.34af862b@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=328598079b56bb007d8baa065be603b992b4da6d commit 328598079b56bb007d8baa065be603b992b4da6d Author: Zhenlei Huang AuthorDate: 2026-04-13 04:38:44 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-04 16:49:41 +0000 ifnet: Move SIOCSIFVNET from ifhwioctl() to ifioctl() SIOCSIFVNET is not a hardware ioctl. Move it to where it belongs. Where here, rewrite the logic of checking whether we are moving the interface from and to the same vnet or not, since it is obviously not stable to access the interface's vnet, given the current thread may race with other threads those running if_vmove(). MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55880 (cherry picked from commit 38bd7ef62f318f791e232e217855307a9d75efa0) (cherry picked from commit 477c3ba3673152e88ec5c50d8f45db24102bdf07) --- sys/net/if.c | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index c4c2df61dd1d..f34e35549e03 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1304,26 +1304,39 @@ if_vmove(struct ifnet *ifp, struct vnet *new_vnet) * Move an ifnet to or from another child prison/vnet, specified by the jail id. */ static int -if_vmove_loan(struct thread *td, struct ifnet *ifp, char *ifname, int jid) +if_vmove_loan(struct thread *td, char *ifname, int jid) { struct prison *pr; - struct ifnet *difp; + struct ifnet *ifp, *difp; bool found; + MPASS(curthread == td); + MPASS(curvnet == TD_TO_VNET(td)); + + /* + * We check the existence of the interface, and will later try to + * unlink it from the "active" list, so it is sufficient to only + * hold a weak reference to it. + * Be aware that it is unsafe to access any member of it, until it + * is proven to be safe to ( say it was on the "active" list ). + */ + ifp = ifunit(ifname); + if (ifp == NULL) + return (ENXIO); + /* Try to find the prison within our visibility. */ sx_slock(&allprison_lock); pr = prison_find_child(td->td_ucred->cr_prison, jid); sx_sunlock(&allprison_lock); if (pr == NULL) return (ENXIO); - prison_hold_locked(pr); - mtx_unlock(&pr->pr_mtx); - - /* Do not try to move the iface from and to the same prison. */ - if (pr->pr_vnet == ifp->if_vnet) { - prison_free(pr); + /* Do not try to move the iface from and to the same vnet. */ + if (pr->pr_vnet == TD_TO_VNET(td)) { + mtx_unlock(&pr->pr_mtx); return (EEXIST); } + prison_hold_locked(pr); + mtx_unlock(&pr->pr_mtx); /* Make sure the named iface does not exists in the dst. prison/vnet. */ /* XXX Lock interfaces to avoid races. */ @@ -2701,15 +2714,6 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) error = if_rename(ifp, new_name); break; -#ifdef VIMAGE - case SIOCSIFVNET: - error = priv_check(td, PRIV_NET_SETIFVNET); - if (error) - return (error); - error = if_vmove_loan(td, ifp, ifr->ifr_name, ifr->ifr_jid); - break; -#endif - case SIOCSIFMETRIC: error = priv_check(td, PRIV_NET_SETIFMETRIC); if (error) @@ -2997,6 +3001,12 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct thread *td) ifr = (struct ifreq *)data; switch (cmd) { #ifdef VIMAGE + case SIOCSIFVNET: + error = priv_check(td, PRIV_NET_SETIFVNET); + if (error == 0) + error = if_vmove_loan(td, ifr->ifr_name, ifr->ifr_jid); + goto out_noref; + case SIOCSIFRVNET: error = priv_check(td, PRIV_NET_SETIFVNET); if (error == 0) From nobody Mon May 4 16:51:15 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMm0GMJz6brF9 for ; Mon, 04 May 2026 16:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8SMl4tXwz3w2Z for ; Mon, 04 May 2026 16:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LSpXu69i5n8TN8uRYy3nu/ZLz/SMNLRAN+ITcVmdlG0=; b=ofYd4HkwheI+/jO4ZwTyL+RqtS6oXO6Ib6OE+oSlY4fVh50UiyPGJZwBCf/WQw4pQIeUOz XD3HD7vjGT131bgooVVeFMe6GOUsMko91JmarN2UbohIf6XT7NhZgk5ha3kkBS8t8bnU4r kNvXR6V+fsBD5S549k3K6Ue/gqdxdNvF6f2iaCSxqcuNIVd1cXbk14vPZTk0l25YSrwo2t ed9M21rOVut8+IesUr4KS4wdXP9BaOs7YEmGv659FdYcSRxYcek8q5VplDcCMOZm51m+PV cH/GeDx024/fcsKbd9l1vM8jbvKcwN87nAsXY01XKw/zvbSPchZ6UVSos9aqzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777913475; a=rsa-sha256; cv=none; b=ggg8H6BFpMEBN4+hWRxThXTi9vVUNweqDDrmpUI6vsRWaRUdV9DrmcGNrT2m9psNOvAbRf usMO50qsquHNU5ahH413sxPaYtoWif2SDNM/qh4UA/AyfjXZvI6lEwlo9id81vE2K55Cjh n5G9zX/xbV8S6yg0mrNnV9YJ07gekJlNwScaI7zWZyz0/YBW7FbQsrmMepG8FYUS+3DMsg FkgERQfpcqmrbVbC4WW/yQyz1e0v/lFPOyFd4aa7JB7i1mWpFBWjhryPaLXFPlu3BlbmkD WbsbXg4HMfKHoTGddBZ0cV2NJtIIklW4q3TgxZBbu9BGQNnXqOwz0CXKBbyHzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LSpXu69i5n8TN8uRYy3nu/ZLz/SMNLRAN+ITcVmdlG0=; b=MN1c7PmRV2jbtOg1PuxzXLYhNQdcUZoidJLa03dnMd5TsWOrXLpTFzrMBLHmEjQNx+ltyx smCCusgKxetJbPWZxpjc9AY/NCbFdcOFxeROBklIE0Ufah7QQqjx50zgLOF27+H6mYhC9d M0UZSelFXhn/oiLQHqLvgsd3QQ1CpnSMzPSGpxWfQzpo3BxV6sKQySgE7ndz3yejV1Bshm UVGjLQEGLB+ZRVhR2aT02KII4qG2+HRISWWm0s1qi4V+ijaQ/JFN5olXvsBfOQDNePXmlP cmEy8vNyxeTAXKfgZC9aMjXHR9yhuAiOufgPikfN17lF0JupmeP4Qqku56vzBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMl4TYWzCb7 for ; Mon, 04 May 2026 16:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25b3d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 16:51:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: e7063f1d8b5d - stable/14 - ifnet: vnet_if_return(): Avoid unnecessary recursive acquisition of ifnet_detach_sxlock List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e7063f1d8b5db637fdedc6a66abccc0efd76d9c7 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 16:51:15 +0000 Message-Id: <69f8ce83.25b3d.6acee854@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e7063f1d8b5db637fdedc6a66abccc0efd76d9c7 commit e7063f1d8b5db637fdedc6a66abccc0efd76d9c7 Author: Zhenlei Huang AuthorDate: 2026-04-13 04:38:43 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-04 16:49:41 +0000 ifnet: vnet_if_return(): Avoid unnecessary recursive acquisition of ifnet_detach_sxlock vnet_if_return() will be invocked by vnet_sysuninit() on vnet destructing, while the lock ifnet_detach_sxlock has been acquired in vnet_destroy() already. With this change the order of locking is more clear. There should be no functional change. Reviewed by: pouria Fixes: 868bf82153e8 if: avoid interface destroy race MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56288 (cherry picked from commit f1fae67afbb13a41d488d0e0ec66b1805925019c) (cherry picked from commit ccfc2d91304e88aafc0ca0e13e0f8b5a156d2a01) --- sys/net/if.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 1d6b2f7b9461..c4c2df61dd1d 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -491,6 +491,8 @@ vnet_if_return(const void *unused __unused) i = 0; + /* The lock has already been aquired in vnet_destroy() */ + sx_assert(&ifnet_detach_sxlock, SX_XLOCKED); /* * We need to protect our access to the V_ifnet tailq. Ordinarily we'd * enter NET_EPOCH, but that's not possible, because if_vmove() calls @@ -519,9 +521,7 @@ vnet_if_return(const void *unused __unused) IFNET_WUNLOCK(); for (int j = 0; j < i; j++) { - sx_xlock(&ifnet_detach_sxlock); if_vmove(pending[j], pending[j]->if_home_vnet); - sx_xunlock(&ifnet_detach_sxlock); } free(pending, M_IFNET); From nobody Mon May 4 16:51:18 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMq3g8Mz6br1f for ; Mon, 04 May 2026 16:51: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 4g8SMq1Yk9z3wGK for ; Mon, 04 May 2026 16:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vbOxY0OsVvlXXd4IWqDJBL5IlBNlu+y5SAQsuUliZU8=; b=XbUN6YthCd0D5uQe5QTKoA0X8Yyo6DWEa/5ChWR5ZYPcJrDVmGpdA0dajs3QIJVF3TNSRj 7H9Bfm0BLlfnncaJRIWOg0rELbqPx7UZKTK4dI18FvYRwmR3LbqW1E7oZ/UAPJG+38y4po R0GqJM4rfVwsBJkIPqdcPbByGCcu0qKLZUwZxlunuC6/pTJUKZVjdaNlUB37vTN9mkW1Kd BcX019dvlk5GJZeVHygk8PLlPiCTStG5jY/YCgjiaw8Z+qO5s7q73pxyG/EVoGo1nbvdLl Dzji3xlkkXsZYUO00tjyUX8JDSxctGLt7E2gnXLCUb7dJtX7UrypfJopdJf5kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777913479; a=rsa-sha256; cv=none; b=E9gfUhyKNulm+cz5Zr77jtYgJNltuwCFVnmwhrEXlNiFZRlpfQnJ3Hnt3/WAn5zhKUODNb ElVT1/YM9ytZJcmDVBKjUdzh/20VZpNY0ckrAOpCPdmYyrimspLmB04epGZyErAlrnH6Vk 0Xd+eYag9VtQ0RPAh0EehVZUslQQEMZJN5dRRuRy60PGwTP3OTkvrUTtjK2E0nd1eD6q7a gvJc/jqCqvTuGnKJCP4e4f9e44oqkOWeJXfsIVZr/3zLpIhAY15igW3qB1KPXUoIZFmw0v o9pspTIlXDHJ82OtPIxo00Q7iTLbsZL8PqaeUu4nm8vKhwItRJiQ7RLT6rKPdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vbOxY0OsVvlXXd4IWqDJBL5IlBNlu+y5SAQsuUliZU8=; b=qV3tKODb0JDIxux/jocLYVA+AKijGuXRxVHjSHLxdrkIDcBvE3p/YCuyFlaamTaGfWuTIe hJr7Qx253zuGycTNqR6Lj5ykgFniAELOI2EIz8G0KNhrcpxoEARFf2G6aiwV1cdRjxT4sn X/pTOfJJAaIvaoAGoF5CIxXZR/7E9dXLAfiQSptud1U1L+NPJC0/xVfuJXya32xxNswHb/ cbYd6O31TpjDvsvZ9yZD+H2Nk+1KyNoITlhfnuTrcO5aHMSq6lxjs/q6pw/ui9ENJCLHBD Zst4DWTgbj+l+J+Naeikj3VFlmRIdGZrlEypXX9crW/XZ42PcV9kf+vqNKgEkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMq0VQZzCrT for ; Mon, 04 May 2026 16:51:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25b41 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 16:51:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 320805add13d - stable/14 - tests/net/if_clone_test: Add a test for races between if_detach() and if_vmove_reclaim() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 320805add13ddf8e680d88f5c9b3ae3b6a49f6cf Auto-Submitted: auto-generated Date: Mon, 04 May 2026 16:51:18 +0000 Message-Id: <69f8ce86.25b41.10828a42@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=320805add13ddf8e680d88f5c9b3ae3b6a49f6cf commit 320805add13ddf8e680d88f5c9b3ae3b6a49f6cf Author: Zhenlei Huang AuthorDate: 2026-04-27 19:17:21 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-04 16:49:42 +0000 tests/net/if_clone_test: Add a test for races between if_detach() and if_vmove_reclaim() Ideally we shall have tests for all possible races. It is races between if_detach(), if_vmove_loan(), if_vmove_reclaim() and vnet_if_return(). Well that requires too many tests and it appears to be less valuable to have them all. So focus on potential in future regressions related to recent fixes [1] and [2] only. [1] ee9456ce3753 ifnet: Fix races in if_vmove_reclaim() [2] ba7f47d47dc1 ifnet: if_detach(): Fix races with vmove operations MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56606 (cherry picked from commit f4be16983dea4904f85ac20e921ad2a8c18a0f79) (cherry picked from commit 696d1590697e9d4c0f07ce0a8d76a62bc77bdfd5) --- tests/sys/net/if_clone_test.sh | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tests/sys/net/if_clone_test.sh b/tests/sys/net/if_clone_test.sh index de7384d9053c..7dbfc7759cd5 100755 --- a/tests/sys/net/if_clone_test.sh +++ b/tests/sys/net/if_clone_test.sh @@ -96,6 +96,34 @@ epair_destroy_race_cleanup() cleanup_ifaces } +atf_test_case epair_destroy_race2 cleanup +epair_destroy_race2_head() +{ + atf_set "descr" "Race if_detach() and if_vmove_reclaim()" + atf_set "require.user" "root" +} +epair_destroy_race2_body() +{ + jid=$(jail -ic vnet host.hostname="epair_destroy2" persist path=/) + + for i in `seq 1 10` + do + epair_a=$(ifconfig epair create) + epair_b=${epair_a%a}b + ifconfig $epair_b vnet $jid + ifconfig $epair_a destroy & pid1=$! + ifconfig $epair_b -vnet $jid & pid2=$! + wait $pid1 + wait $pid2 + done + + jail -R $jid + true +} +epair_destroy_race2_cleanup() +{ +} + atf_test_case epair_ipv6_up_stress cleanup epair_ipv6_up_stress_head() { @@ -433,6 +461,7 @@ atf_init_test_cases() atf_add_test_case epair_stress atf_add_test_case epair_up_stress atf_add_test_case epair_destroy_race + atf_add_test_case epair_destroy_race2 atf_add_test_case faith_ipv6_up_stress atf_add_test_case faith_stress atf_add_test_case faith_up_stress From nobody Mon May 4 16:51:20 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMr3spLz6brFJ for ; Mon, 04 May 2026 16:51: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 4g8SMr0msTz3wGL for ; Mon, 04 May 2026 16:51:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HY+08yanem3QFbqUk6pC49Nbd8BQjmqjICPAS4qgR6c=; b=dmZkj8EzyZmxS9EktLfQMcDks8KoLMGdt8g9yd/CQ4fbQYykhLkguMNWZ98+zZkdPXiWs3 F6sVkSOWc2hHCnByTvUCqyg/c82pyvkZHjBumgyvcCKxzdmBbNrwJKknwAUnw9AHH/lrUP w+YC8aenxv5EE3Q7b8ZdWets51CRBGCfU8f/BLT0sf/6tAUScEeAY3jTzN25L1KYKC2MM4 XEi2VsCvYILyIdUUvDyUYZvMembgVZ1SwgqI+V5NW2EsC6/ZcsEtodzV6P7SedNjXr4tp5 nKWqgOPFhpg/EIYj47bpAx77/UBYOzwJr10XoXbhkoj/JZMPRpGOEa7qrNJphQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777913480; a=rsa-sha256; cv=none; b=glMo1Y1l5zxz0QGbYVEJE+hR88fdbocL1i0mDS2H8nawZD2GD6rlBT8OnFTw/8yG31ZJV6 PR0pDqcKXXRVX8VcyuebUD7tliFvklM9dwSHHGqhFYzJf9/69PAxSdXJJPYKnvBatFWehq /q0oHetSZmb8y1ulk6SpeSlb65e5yLc9upOXGFzHYlcGCeUy3kNVyVt46gci0gSwrYxrKg /mxXQsLR+anoWR2X+NY6kon6030yt0kMNQjcWMjoD/PlhOx4OKz3RtP/6S+yQLQAXdSJ4T R+RNNKu4zsk4OuTU7GOqBIZChlMPd3Q8JL6Q9HCEw7BxbK8uoCsW3UrR4MiqoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HY+08yanem3QFbqUk6pC49Nbd8BQjmqjICPAS4qgR6c=; b=uNZ/zKhfT4lMX3mL5CidpFVHl6gVgeN8hA2doStEwMDsbyhcuyF+DQzKvf1Zz0TTY42TqS p2uOfnDhWgrwrr/hvrHTKyxojNgLXzBJIKTXZ8+JojfbE1U77s/CXVoUhdS3BJNltftUCx NVd3bRccMii18CJO8LYQB0WvlHPobfrHG/SB/qnerRteiKBWLdA4FzZymfIxx/TO55DGua 34+kHZMMwu7cNBXXEH2/bPuvvtNngLzLgsertYpgpuNS4FcrAp69SntBIACSAGN4SulbzU U+hfbFreYC/GT0bBVMI8AZraAQRaK3Zi0Bl07Hk23J/VJkgmm1/jtlSaljsm/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMr0N7QzCTW for ; Mon, 04 May 2026 16:51:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26b93 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 16:51:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 33da0a256bfc - stable/14 - tests/netgraph: Add a test for races between if_detach() and vnet_if_return() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 33da0a256bfc75f72ea789fd71dce0e07515800c Auto-Submitted: auto-generated Date: Mon, 04 May 2026 16:51:20 +0000 Message-Id: <69f8ce88.26b93.7009e2ca@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=33da0a256bfc75f72ea789fd71dce0e07515800c commit 33da0a256bfc75f72ea789fd71dce0e07515800c Author: Zhenlei Huang AuthorDate: 2026-04-27 19:17:22 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-04 16:49:42 +0000 tests/netgraph: Add a test for races between if_detach() and vnet_if_return() A ng_eiface(4) or physical interface does not involve the cloner hence the detaching is a bit different with epair(4). Add more tests to cover that. PR: 292993 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56609 (cherry picked from commit 0988abd52352ae0977cd3e5c10316b7d94e1cac8) (cherry picked from commit 3a4c4d61ac2c9f369e55d0ab994c9da78aa4cb74) --- tests/sys/netgraph/Makefile | 2 ++ tests/sys/netgraph/eiface_test.sh | 67 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/tests/sys/netgraph/Makefile b/tests/sys/netgraph/Makefile index 74e4046482ef..145e455c9f75 100644 --- a/tests/sys/netgraph/Makefile +++ b/tests/sys/netgraph/Makefile @@ -16,6 +16,8 @@ ATF_TESTS_C+= basic \ hub \ vlan_rotate \ +ATF_TESTS_SH+= eiface_test + SRCS.basic= basic.c util.c SRCS.bridge= bridge.c util.c SRCS.hub= hub.c util.c diff --git a/tests/sys/netgraph/eiface_test.sh b/tests/sys/netgraph/eiface_test.sh new file mode 100644 index 000000000000..442f5c1a71d2 --- /dev/null +++ b/tests/sys/netgraph/eiface_test.sh @@ -0,0 +1,67 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2026 Zhenlei Huang +# +# 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. + +. $(atf_get_srcdir)/../common/vnet.subr + +atf_test_case "pr292993" "cleanup" +pr292993_head() +{ + atf_set descr 'Test for PR 292993' + atf_set require.user root +} + +pr292993_body() +{ + vnet_init + + for i in `seq 1 10` + do + ngeth=$(ngctl -f - <<__EOF__ | awk '$1 == "Args:" {print substr($2, 2, length($2)-2)}') +mkpeer . eiface path_$i ether +msg .path_$i getifname +__EOF__ + # Sanity check + atf_check -s exit:0 -o ignore \ + ifconfig $ngeth + jail -c vnet name="eiface_destroy_$i" path=/ \ + vnet.interface="$ngeth" exec.start="sleep 0.1" & + pid=$! + sleep 0.1 + ngctl shutdown ${ngeth}: + wait $pid + done + true +} + +pr292993_cleanup() +{ + vnet_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "pr292993" +} From nobody Mon May 4 16:51:21 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMs5Ml7z6brK9 for ; Mon, 04 May 2026 16:51: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 4g8SMs1wz7z3wJh for ; Mon, 04 May 2026 16:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VyuPBx2qE/1YrhBKhwoRQmO+O3jJwyQi87G9LOJ2P6E=; b=q4X/iPzClwiraVF83wbuz5aNb+YATuwDDg1TbDoh9pBx9A3ztQioNWQVpPLi3yHEHjhYaZ S7U3HsWzcY93kJsgtxnoyuCAmI0JNE95FEZgOX5EoPzWKQHZJe1vl7lz6IrUQXz4nEqKfT WMTYjdHUzmjWrLI3pRwxbaIbnXC4yTbnveTeUd5kaQQ9gzN7wuECZFJqnUuc1HoZ4Jg2EE A3ogxY4Jmgw9sCC+OT1u1xBlALvWHWjHIlxIXLDrIRtyHMZjmXauDDT4CIrzRY7LHlaLfW XsCKRhy9Gnx55thDSlOUhCggxlDkPvf6u8uu7QXzSq+95H2YBPbMeSL8G1xg1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777913481; a=rsa-sha256; cv=none; b=ISix1widYTSbdii+5q95tOwUX5fsykWm9RbPLizoh/TGA10bgxAsw/0asJ8OaWhZCunYPC BxXAC2OXopAfQyAtw/MM9qY6TfEVROvRpOxMH0zVkJ5MrBS6/EQGZ0ebkcx/AtTX0MgsiQ TIjzECZO9twigqZ8qAO+AVG72WDr/ml19DO399bK65+mrMjQ6yY3RPiYFLhFLMKPqxjAJI c+6pLn6gIlyi/qMEliGfZ77r5QJoebikT6P6/0jJB/ocvdghOcqQFP2ohomIFSGDXxH3aK BpAtuAEp4KMG4BItYAOhzWyMtYzTnzi6L7uxzkPT/nVG5UlJFLBlmU/Bc7+1Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VyuPBx2qE/1YrhBKhwoRQmO+O3jJwyQi87G9LOJ2P6E=; b=Qk2i1nh/Fp1LLtJ/AI/6BShXaCVxvPLsvIAIgTEGGzUB0YGWYsMofUwBtjmpFTCd6ua+UW ZkGt5pEiBh45TF22AWG3jEhlro58Jm2AjCoiBmBHVU8BRP3zPn1LVNsFN0303z5L3CxfNF z/HFHekfXkpmJMdSTmPk/sWV3GLMsYDEFxToddTwTXxn75KFRecSZPpdQ1yO1OH+0cJD1H 0C0yNP05kiPStid8XHobLBIsQbgKy8RJiHwEI+d1JvjvmUpiQBZo8JC8dlXresqf+zgOko nBgelTGQibmqRs/l1Q/tiO2/BNBMx5N2Zs7JAUUfEjO1qCCHswkB50I1qwovZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMs1C05zCjp for ; Mon, 04 May 2026 16:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26f63 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 16:51:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 77b8bc06cf73 - stable/14 - ifnet: if_detach(): Fix races with vmove operations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 77b8bc06cf73c66ed9a4ebb4d88d072056059ff4 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 16:51:21 +0000 Message-Id: <69f8ce89.26f63.77cc04e3@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=77b8bc06cf73c66ed9a4ebb4d88d072056059ff4 commit 77b8bc06cf73c66ed9a4ebb4d88d072056059ff4 Author: Zhenlei Huang AuthorDate: 2026-04-25 19:56:07 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-04 16:49:43 +0000 ifnet: if_detach(): Fix races with vmove operations The rationality is that the driver private data holds a strong reference to the interface, and the detach operation shall never fail. Given the vmove operation, if_vmove_loan(), if_vmove_reclaim() or vnet_if_return() is not atomic and spans multiple steps, acquire ifnet_detach_sxlock only for if_detach_internal() and if_vmove() is not sufficient. It is possible that the thread running if_detach() sees stale vnet, or the vmoving is in progress, then if_unlink_ifnet() will fail. Fix that by extending coverage of ifnet_detach_sxlock a bit to also cover if_unlink_ifnet(), so that the entire detach and vmove operation is serialized. Given it is an error when the if_unlink_ifnet() fails, and if_detach() is a public KPI, prefer panic() over assertion on failure, to indicate explicitly that bad thing happens. That shall also prevent potential corrupted status of the interface, which is a bit hard to diagnose. PR: 292993 Reviewed by: glebius MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D56374 (cherry picked from commit ba7f47d47dc1a177e4d8f115f791ec25f3da0eab) (cherry picked from commit 5c4021ca0abe4e17200f5faa2fd71014ef0a5f09) --- sys/net/if.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 0aa1cbbb7b41..b3ab75144460 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -459,6 +459,7 @@ if_unlink_ifnet(struct ifnet *ifp, bool vmove) struct ifnet *iter; int found = 0; + sx_assert(&ifnet_detach_sxlock, SX_XLOCKED); IFNET_WLOCK(); CK_STAILQ_FOREACH(iter, &V_ifnet, if_link) if (iter == ifp) { @@ -1087,14 +1088,23 @@ if_detach(struct ifnet *ifp) { bool found; + /* + * The driver private data holds a strong reference to the ifnet, and + * it is actually the "owner", hence this routine shall never fail. + * + * Ideally we can loop retrying when we lose race with other threads + * those run if_unlink_ifnet(). For simplicity, use ifnet_detach_sxlock + * to serialize all the detach / vmove operations. + */ + sx_xlock(&ifnet_detach_sxlock); CURVNET_SET_QUIET(ifp->if_vnet); found = if_unlink_ifnet(ifp, false); - if (found) { - sx_xlock(&ifnet_detach_sxlock); - if_detach_internal(ifp, false); - sx_xunlock(&ifnet_detach_sxlock); - } + if (! found) + panic("%s: interface is not on the active list", + ifp->if_xname); + if_detach_internal(ifp, false); CURVNET_RESTORE(); + sx_xunlock(&ifnet_detach_sxlock); } /* @@ -1403,13 +1413,14 @@ if_vmove_reclaim(struct thread *td, char *ifname, int jid) } /* Get interface back from child jail/vnet. */ + sx_xlock(&ifnet_detach_sxlock); found = if_unlink_ifnet(ifp, true); if (! found) { + sx_xunlock(&ifnet_detach_sxlock); CURVNET_RESTORE(); prison_free(pr); return (ENODEV); } - sx_xlock(&ifnet_detach_sxlock); if_vmove(ifp, vnet_dst); sx_xunlock(&ifnet_detach_sxlock); CURVNET_RESTORE(); From nobody Mon May 4 16:51:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMp0Rq9z6br1d for ; Mon, 04 May 2026 16:51: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 4g8SMn6C6Xz3wJd for ; Mon, 04 May 2026 16:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U/JaTmusvmBahICpHHxLGGDBXt0l0pg9MIKZ80dfhi4=; b=NX9YiUtLbNpfS+rVF+wayV+Ti965atj3E2nZuxAe2KrFnb8Iko1ifPfkk/qyO6FVfSul2H Cf8Q7ygwHz2PaxVn8Kuzqmr+vmLF8YPRG15pom0dejYlwl0H4Ev/OS0E0MgUri4STOtqnB ZX0vyunqydSmdKy0uuus92l/ZZ2yk92YbX9OMSkGT7H0RNeAaxHMhBIJmUvws8E53r4ilp SCE5+YyOHL15ylipIDw4GYw05aSqNCm+oHhcbvOoVn8/gncErjpDtFCbuD+BoGQ8H2TQE4 pZBt8ZHgwkziNnYcj0wMd9UR9iQGfFpJahJ09heDBiUXDRSUgGSbPTwwX92bDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777913477; a=rsa-sha256; cv=none; b=oyzOn39xZs7TyR0YLTg+uk2AyiOgI5USUNFnr4SWQLtUZ7bdRtMFzCqRycmumnjFCG6DDd CvXkOk6WOGwHNptnZwkkC81YWhGsvWkaswNnm3O53FsjoczD7QLXdJVTBIYE+FbOoqACcN bu2RXLDq+vEoPJYSwi3pvqo7d7gCpGj0tB33XkLB9KyYLfKoFB4SCgmp741nxpdS48MEMy 8AKzS6gJpAcakUXu2W4ll8TyQyJN1mz1I//fkDyZDyYM0jESxkVGQ3gQEs8OIq1OpNSUee Qbgl4Aj+AyHVzY7r11NGGruFhFJhvmq3VE5Ncx3Yp1I07qE6e2wZLm5JAmUBgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U/JaTmusvmBahICpHHxLGGDBXt0l0pg9MIKZ80dfhi4=; b=Ne1MhsQ5MG8FfTqyBUlMsPzFGWFF6n9hFfFahHdZfETtlsoCFrL2nzVF50rS6kXYWuMsNG whX0h2ktEr3PYHF/MTyaLOuKiDbGbnv3GjDrpwITWK2sxBmJhLmiQMfZ74tJ+CrKyx/JEG t34ijKwkbckg9rsWyKvDwrYQOuIKMUVZbdHMfwH5VrP6ajcwCSH1HoeydDdrADHl0wqMzN g4D9L7wiDw+lXpjLjQDTVEUSDjrFbYUSnPeghiWUzQgehVDe9GnBwLSN2I9KbvC0qzS46a pX/52Nxj6rOy8gH9tsMcAGpgmCMj3RDXBH3aMrhGqRIM5KNBGc0bzKUTWDO9Cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8SMn5lLTzD2R for ; Mon, 04 May 2026 16:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26b0f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 16:51:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 9598f7277a1b - stable/14 - if_clone: Make ifnet_detach_sxlock opaque to consumers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9598f7277a1ba4f15e3e2f8ffe7aa6132652cb67 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 16:51:17 +0000 Message-Id: <69f8ce85.26b0f.18ad47f0@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9598f7277a1ba4f15e3e2f8ffe7aa6132652cb67 commit 9598f7277a1ba4f15e3e2f8ffe7aa6132652cb67 Author: Zhenlei Huang AuthorDate: 2026-04-13 04:38:44 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-04 16:49:42 +0000 if_clone: Make ifnet_detach_sxlock opaque to consumers The change e133271fc1b5e introduced ifnet_detach_sxlock, and change 6d2a10d96fb5 widened its coverage, but there are still consumers, net80211 and tuntap e.g., want it. Instead of sprinkling it everywhere, make it opaque to consumers. Out of tree drivers shall also benefit from this change. Reviewed by: kp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56298 (cherry picked from commit e9fc0c538264355bd3fd9120c650078281c2a290) (cherry picked from commit c624e04a0bd0ab147ec64c17e3e53f5ebc769dcf) --- sys/net/if.c | 5 +---- sys/net/if_clone.c | 17 ++++++++++++++++- sys/netlink/route/iface.c | 3 --- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index f34e35549e03..0aa1cbbb7b41 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -3025,11 +3025,8 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct thread *td) case SIOCIFDESTROY: error = priv_check(td, PRIV_NET_IFDESTROY); - if (error == 0) { - sx_xlock(&ifnet_detach_sxlock); + if (error == 0) error = if_clone_destroy(ifr->ifr_name); - sx_xunlock(&ifnet_detach_sxlock); - } goto out_noref; case SIOCIFGCLONERS: diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c index 9f0dc7cd9649..07295f7fdbcd 100644 --- a/sys/net/if_clone.c +++ b/sys/net/if_clone.c @@ -443,6 +443,14 @@ if_clone_destroyif_flags(struct if_clone *ifc, struct ifnet *ifp, uint32_t flags { int err; + /* + * XXXZL: To avoid racing with if_vmove() so that we will have + * stable if_vnet. + * This have a good effect, that is, the destroying of tightly + * coupled cloned interfaces such as epair(4) is serialized, + * although the driver is responsible to take care of that. + */ + sx_assert(&ifnet_detach_sxlock, SA_XLOCKED); /* * Given that the cloned ifnet might be attached to a different * vnet from where its cloner was registered, we have to @@ -469,7 +477,12 @@ if_clone_destroyif_flags(struct if_clone *ifc, struct ifnet *ifp, uint32_t flags int if_clone_destroyif(struct if_clone *ifc, struct ifnet *ifp) { - return (if_clone_destroyif_flags(ifc, ifp, 0)); + int err; + + sx_xlock(&ifnet_detach_sxlock); + err = if_clone_destroyif_flags(ifc, ifp, 0); + sx_xunlock(&ifnet_detach_sxlock); + return (err); } static struct if_clone * @@ -671,9 +684,11 @@ if_clone_detach(struct if_clone *ifc) V_if_cloners_count--; IF_CLONERS_UNLOCK(); + sx_xlock(&ifnet_detach_sxlock); /* destroy all interfaces for this cloner */ while (!LIST_EMPTY(&ifc->ifc_iflist)) if_clone_destroyif_flags(ifc, LIST_FIRST(&ifc->ifc_iflist), IFC_F_FORCE); + sx_xunlock(&ifnet_detach_sxlock); IF_CLONE_REMREF(ifc); } diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index 6fd99cf61e2d..0a37ae576f8e 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -550,10 +550,7 @@ rtnl_handle_dellink(struct nlmsghdr *hdr, struct nlpcb *nlp, struct nl_pstate *n } NLP_LOG(LOG_DEBUG3, nlp, "mapped ifindex %u to %s", attrs.ifi_index, if_name(ifp)); - sx_xlock(&ifnet_detach_sxlock); error = if_clone_destroy(if_name(ifp)); - sx_xunlock(&ifnet_detach_sxlock); - NLP_LOG(LOG_DEBUG2, nlp, "deleting interface %s returned %d", if_name(ifp), error); if_rele(ifp); From nobody Mon May 4 16:57:35 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8SW92tWFz6bsS9 for ; Mon, 04 May 2026 16:57: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 4g8SW90BD7z41sH for ; Mon, 04 May 2026 16:57:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VW4kyahdX4XyQO6paPtloN4vbTAEOg/xpqlj80yP+oE=; b=MRbDubmC/bnNdwlONaKrym6Yo5of0AmYHl2BxQQHWoWYef9dNNMJLjINa1SAo0B06DwBu/ GmZG5s8Sijj7yq210Quh+H3Y0eSoC1FmzDCZGf6a7xWrVUHGSqqkwVbcspMEW5+D9jp8Yw 625gbLPeGgQS1ScrQBbyU7J23l0gig5s5CrD8pH8ROWKz8G9naBvc4yFSmhhDUsrmPlN0g 9icJiGw86Nj9SQ5bon7Q1XLJlMxiYH5DDWG9GJApOwS959uOfUiZYNgiAR6SQj95VW8FZP Ds4ybjX/EYpGw41crYrIeSmIJZ4AxZvJt+7t/sugEfUqp2CYYhGCZJi1/waCzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777913861; a=rsa-sha256; cv=none; b=ojtGVX1y38dBSxZMnmYWvXNkAAQI1DzfwiBiRbSORsx5wXSN2fgaAOajtQWOAcmdgJG2Nv tBF8vKRZS2iGd2ntssVdQGOFaCvYAozqQQpiWYUX4fWcS6C/AguAyYmUH5EeuX3xA8pS/W xTlNp2pUEn3l7IP8bZrfLzSJbN0fHvVeeBqZ3p8QVQktplFEkz1V9xkRIAJiBbexs4gNRo s6VicsnhD4FbPjYetIpgNxAl9fV33X551CoE7iFXCmRQhuw4O5iV/SAqqN4f6HFgIQiaLc Kr+75xsjoDEoG1uI+7dV3dzatwqiRHHmtPABx2eH2H5n+/ndBTTH7H4yJDVR5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777913861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VW4kyahdX4XyQO6paPtloN4vbTAEOg/xpqlj80yP+oE=; b=N4OAr5MXRoIorqiPzNh4Rutphuq5CsSmg6I422f10+cosmQwX49V0iWCVMZzYI2HlEwPIr 0SX+emCUnuQ2rPyJWXDFSsDZKn2ieBXNvy/B1xfnVp2wQ1NjCt+3WHC1jSDjLh+95VqhQy oS2CQ2k/XlQC47bk+zDyUc6aMFonQkHq5UdrlpJQxqcLG9FwJ1zK2ehkOqL5z338rayauk qctQkEkZDKXV6qoL/qKHN7IM2OSwiJFimkSfNS37VuuDEfawLQU3yzCnHFmlUJRC5eHUw3 DL4Q3kMa9AMExgLLmLQqNSEGWivsQSGH/iylqFpByNlgE80C5r+ce8veuxYwuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8SW86s17zCkJ for ; Mon, 04 May 2026 16:57:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26d7b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 16:57:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: d5728351a58b - main - amd/int0x80 test: fix inline asm for gcc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5728351a58b87764f3302eb8c4ca9f35e99e8b6 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 16:57:35 +0000 Message-Id: <69f8cfff.26d7b.61328eb3@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=d5728351a58b87764f3302eb8c4ca9f35e99e8b6 commit d5728351a58b87764f3302eb8c4ca9f35e99e8b6 Author: Ryan Libby AuthorDate: 2026-05-04 16:34:41 +0000 Commit: Ryan Libby CommitDate: 2026-05-04 16:34:41 +0000 amd/int0x80 test: fix inline asm for gcc Gcc complained about the unused %0 asm argument. Fixes: 2c2ec6bbc9cc ("tests/sys/arch/amd64: add a program to check INT $0x80 behavior on amd64") Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D56781 --- tests/sys/arch/amd64/int0x80.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/sys/arch/amd64/int0x80.c b/tests/sys/arch/amd64/int0x80.c index e03462a6dccd..fbe98fb341a1 100644 --- a/tests/sys/arch/amd64/int0x80.c +++ b/tests/sys/arch/amd64/int0x80.c @@ -46,12 +46,13 @@ fire(void) { int res; + res = SYS_getpid; asm volatile( ".globl\tafter_int0x80\n" "\tint\t$0x80\n" "after_int0x80:" - : "=a" (res) - : "%0" (SYS_getpid) + : "+a" (res) + : : "rdx", "memory", "cc"); return (res); } From nobody Mon May 4 17:28:22 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8TBb1bHQz6bwNs for ; Mon, 04 May 2026 17:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8TBZ5cXzz47HQ for ; Mon, 04 May 2026 17:28:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777915702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JOqHTccQfLt80L7HNrXk9Zz6aQitVxmebS8+EOPoDig=; b=cX55IHfrI7y8jklEv3PcKjxLQeUPQOHpDWVUWokKUB6CJag2/vi7PKTjz5m0zDhV6/q/+f SkKkElmr9ZrbmSpsvt4I67oib0HiGeh/D+0Agguc+RvDDpmSOKi4rZ0GAuBVu83G2Zq6H0 IB6Oo3L/lFDZQkKhk4ju1GiQYS7y9Ja3TdSsg5/jVExhlSK9etB7v0mP4CPvIeaIUXxL/4 T4bliSzFQUKmcvka6Y5gj4fPKTDOVLD/BUyAnIUofp0Gqtdf0CY9HNd8TGbqSRmotHITtT wAx37zodnraCGppAR5O2RVzK4wVLrq4BYkVlItpELaGftKJXSPJWv+MfREUDdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777915702; a=rsa-sha256; cv=none; b=cH65iAmNt6KF9iWbktyWIMQYbGg7Led6oiVK1LyJWPZr2ZVq2Teh1VXR+rMSh4UHXvcr3z LfYuk1k/VWTTDq+kPhRcIuWLgrXJ9AR6zlJ5y6gc/tw3GuzOvozA2cAlRpBjdhdQIuYWmt mW8oYZbIsnp1unV4QChlNxBXFEzd7DIjmn9a5H3EMAiWMOhwS8OnfkXBtFX2azj5MAY6fn 5QcarLd9vZFiV8RNYmmjVO50qtVQ8qe15hV31nDaH4bbifm9Ur/JMi4SQpzq9sJs3EM+RH mLquzyuDN/aaxIXpqujo1N3ao+O8abjXgi1xMdh12f4Nw1CinyNSqgUYIQCikQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777915702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JOqHTccQfLt80L7HNrXk9Zz6aQitVxmebS8+EOPoDig=; b=oDxTzkqvRRXhkU5MT/RlfXGFYngcBSqlOSAGaguOhyxKy/txETMr/C7qQ4bxfLBZW/jIyD 7Ckz/UDervJOqUQSMeRV84vTheSLANRRG1S0k00dXobziPyCkUS8skDHZ2ljlbialxQXVo 2Odyjuy8OKSbEPUuOnokV8hYZkQ5f85DdhS5GYVtulaRVEbGzsfIKW/BUWporxDzPVHRXV LXQuzUT9Yni6RWiDaVFYecppaJulB22gtUiLGYz83jjHuxO1R5lMAFgyr/UrIgPWtI10xL /FZYQ+uFl/t7nfu8+JVKJkd3lQsvaLjgMMlAJJYYQo9s9thJXmnkltyLAHCqow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8TBZ4xcmzVBR for ; Mon, 04 May 2026 17:28:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 322ba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 17:28:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 41b03932e590 - main - tests: Add a simple regression test for an execve overflow bug List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41b03932e59068decf03b7975889841f71c73ec4 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 17:28:22 +0000 Message-Id: <69f8d736.322ba.1871d479@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=41b03932e59068decf03b7975889841f71c73ec4 commit 41b03932e59068decf03b7975889841f71c73ec4 Author: Mark Johnston AuthorDate: 2026-05-04 15:39:55 +0000 Commit: Mark Johnston CommitDate: 2026-05-04 17:28:02 +0000 tests: Add a simple regression test for an execve overflow bug MFC after: 2 weeks --- tests/sys/kern/Makefile | 1 + tests/sys/kern/execve_overflow.c | 46 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index a5a2af67e39d..a06e8702f16d 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -17,6 +17,7 @@ ATF_TESTS_C+= kern_copyin ATF_TESTS_C+= kern_descrip_test # One test modifies the maxfiles limit, which can cause spurious test failures. TEST_METADATA.kern_descrip_test+= is_exclusive="true" +PLAIN_TESTS_C+= execve_overflow ATF_TESTS_C+= exterr_test ATF_TESTS_C+= fdgrowtable_test ATF_TESTS_C+= getdirentries_test diff --git a/tests/sys/kern/execve_overflow.c b/tests/sys/kern/execve_overflow.c new file mode 100644 index 000000000000..462f36ac5154 --- /dev/null +++ b/tests/sys/kern/execve_overflow.c @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2026 Mark Johnston + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +/* + * A minimal regression test for FreeBSD-SA-26:13.exec. + */ + +#include +#include +#include +#include +#include +#include + +#define SCRIPTNAME "script" +#define SCRIPTBODY "#!/bin/sh\nexit 0\n" + +int +main(void) +{ + char *argv; + size_t size; + int fd; + + fd = open(SCRIPTNAME, O_WRONLY | O_CREAT | O_TRUNC, 0700); + if (fd == -1) + err(1, "open"); + if (write(fd, SCRIPTBODY, sizeof(SCRIPTBODY) - 1) != + sizeof(SCRIPTBODY) - 1) + err(1, "write"); + close(fd); + + size = ARG_MAX / 2; + argv = malloc(size); + if (argv == NULL) + err(1, "malloc"); + memset(argv, 'a', size - 1); + argv[size - 1] = '\0'; + + execve(SCRIPTNAME, (char *[]){ argv, NULL }, (char *[]){ NULL }); + + exit(1); +} From nobody Mon May 4 17:28:21 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8TBg0Jr9z6bwZ1 for ; Mon, 04 May 2026 17:28: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 4g8TBf65hmz47L6 for ; Mon, 04 May 2026 17:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777915706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QQsrTp0VFiL2UFaI6/46+ato6qXAfB/yvsL6I1GI86U=; b=Ub81XelXBHLyyXJnh2AyHfyv5nVXX2GZWPZ+OHM8lZv1dIMYnc0ttFd4k7GtQsn2lftKqf uMPI1HeiSI0RNwITPDxmOmPZS31FRF5VJ2o0I2ZAyJSeFTBOs9WsJ0xhW1K4SpK8Ez9K5Y QiXZl+b5/y1D6ZmojAVTSL0N9IPwqmVBrnzdo3xKBcwZZFFz45etthWhCrmr0pIZAB91K0 HWqwjHGm525odnalnhxWjq/xcFPycAq74tkklXPhVOn2B6lKoM55xTiSahXjidzJZjUtFs aRruq3N+CnKuz3Jg8GhbUmS08SYBi5rRJ6b9tstFK1dDnCSANljUuQiyeekUMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777915706; a=rsa-sha256; cv=none; b=xy0kzIAHD+VYMDN8+oKLmWBbwRNwg1Ve4l/0WQgMmiw5OvTAGmRMTfxDdE5vg60zVrtf1+ v3tSO8XUiM9tYUuDRJN1TcrstXXvqFeyJlgQjM+GMLeNs4mPUXF1PzmowGUhnsVXT8SVVF Fh8j7pVtyHnJyDDs9pCDXSso9EddCIeVjZXzLTbt8KWB0R/Ad/AyTZSEkHkYe3FS5hsJBq Qp5nXJKTcQ0tW3laf3QgCGAi+kE3ci4htj53L2y4NbGrwaO/w1vMIuIuNfKmBIIZ5Tdngi 4k2knrj4EPlijZ7J5Jze1HjGPOqhK3093Hx6NV/nHTegX4LvCZPwkhKERJdhig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777915706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QQsrTp0VFiL2UFaI6/46+ato6qXAfB/yvsL6I1GI86U=; b=SQ+pCOlWn3YtGtsJNo2bDoFZ1t5HL6jb+l1KgiGXJUAQsi/N29mf0o7mZ7OxUSmZ5InwRJ D0GFRphHkH6otZ3s/ek1VoFLDnVx5jUfvvwt4LxFuUM+G3Iup6DQWe592Xx5CoDaSWXbAS BkWHXLQRtJ8BwL9b+QzXhiOVTKPB8a39ZbeCsaeGzWYXr26qioZQMRAeidnHEr0JT2coO2 ezMwjEBMX5inToS458iD63KQJNyGSv66etRuQwJ6OAvrDiM4aUBMrIyu00Oan4vFMuCawa 4iEeW94epjwYSfxMMU1fUHlth1HMeqKthpPsLEE7iZZn0L6OT4l4V0Usy9avIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8TBf5GFczTwh for ; Mon, 04 May 2026 17:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30a39 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 17:28:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: eca4dd133883 - main - execve: Add guard pages around execve KVA buffers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eca4dd133883c9e9aaeca68e0119a638ba0aaca7 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 17:28:21 +0000 Message-Id: <69f8d735.30a39.330b25c8@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eca4dd133883c9e9aaeca68e0119a638ba0aaca7 commit eca4dd133883c9e9aaeca68e0119a638ba0aaca7 Author: Mark Johnston AuthorDate: 2026-05-04 15:38:54 +0000 Commit: Mark Johnston CommitDate: 2026-05-04 17:28:02 +0000 execve: Add guard pages around execve KVA buffers This helps ensure that overflows will trigger a panic instead of silently corrupting adjacent buffers, as happened in SA-26:13.exec. Extend kmap_alloc_wait() to support allocation of guard pages on both sides of a KVA allocation. Modify the exec_map setup accordingly. Add the "vm.exec_map_guard_pages" tunable to provide control over the guard page allocations. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56711 --- sys/kern/kern_exec.c | 3 ++- sys/vm/vm_extern.h | 2 +- sys/vm/vm_init.c | 8 ++++++-- sys/vm/vm_kern.c | 39 ++++++++++++++++++++++++++++++++------- sys/vm/vm_kern.h | 1 + 5 files changed, 42 insertions(+), 11 deletions(-) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 8e3b41170cab..958ec559fd8d 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1435,7 +1435,8 @@ exec_prealloc_args_kva(void *arg __unused) mtx_init(&exec_args_kva_mtx, "exec args kva", NULL, MTX_DEF); for (i = 0; i < exec_map_entries; i++) { argkva = malloc(sizeof(*argkva), M_PARGS, M_WAITOK); - argkva->addr = kmap_alloc_wait(exec_map, exec_map_entry_size); + argkva->addr = kmap_alloc_wait(exec_map, exec_map_entry_size, + ptoa(exec_map_guard_pages)); argkva->gen = exec_args_gen; SLIST_INSERT_HEAD(&exec_args_kva_freelist, argkva, next); } diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index 207eb721d129..799b89ce2fc8 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -51,7 +51,7 @@ void *kva_alloc_aligned(vm_size_t, vm_size_t); void kva_free(void *, vm_size_t); /* These operate on pageable virtual addresses. */ -void *kmap_alloc_wait(vm_map_t, vm_size_t); +void *kmap_alloc_wait(vm_map_t, vm_size_t, vm_size_t); void kmap_free_wakeup(vm_map_t, void *, vm_size_t); /* These operate on virtual addresses backed by memory. */ diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c index 40a001afb300..316b43c1c240 100644 --- a/sys/vm/vm_init.c +++ b/sys/vm/vm_init.c @@ -274,8 +274,12 @@ again: exec_map_entries = 2 * mp_ncpus + 4; #endif exec_map_entry_size = round_page(PATH_MAX + ARG_MAX); - kmem_subinit(exec_map, kernel_map, &minaddr, &maxaddr, - exec_map_entries * exec_map_entry_size + 64 * PAGE_SIZE, false); + exec_map_guard_pages = 1; + TUNABLE_INT_FETCH("vm.exec_map_guard_pages", &exec_map_guard_pages); + size = exec_map_entries * + (exec_map_entry_size + 2 * ptoa(exec_map_guard_pages)) + + 64 * PAGE_SIZE; + kmem_subinit(exec_map, kernel_map, &minaddr, &maxaddr, size, false); kmem_subinit(pipe_map, kernel_map, &minaddr, &maxaddr, maxpipekva, false); TSEXIT(); diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index 3a6fed6cb3e1..fc5d0de424bd 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -107,6 +107,7 @@ CTASSERT((ZERO_REGION_SIZE & PAGE_MASK) == 0); const u_long vm_maxuser_address = VM_MAXUSER_ADDRESS; u_int exec_map_entry_size; +u_int exec_map_guard_pages; u_int exec_map_entries; SYSCTL_ULONG(_vm, OID_AUTO, min_kernel_address, CTLFLAG_RD, @@ -706,34 +707,52 @@ kmem_free(void *addr, vm_size_t size) vmem_free(arena, (uintptr_t)addr, size); } +static void +kmap_alloc_map(vm_map_t map, vm_offset_t addr, vm_size_t size, + vm_prot_t prot, int flags) +{ + int error __diagused; + + error = vm_map_insert(map, NULL, 0, + addr, addr + size, prot, prot, flags); + KASSERT(error == KERN_SUCCESS, + ("%s: unexpected error %d", __func__, error)); +} + /* * kmap_alloc_wait: * * Allocates pageable memory from a sub-map of the kernel. If the submap * has no room, the caller sleeps waiting for more memory in the submap. + * If "guard_size" is non-zero, then unmapped KVA is left at the beginning + * and end of the allocated range. * * This routine may block. */ void * -kmap_alloc_wait(vm_map_t map, vm_size_t size) +kmap_alloc_wait(vm_map_t map, vm_size_t size, vm_size_t guard_size) { vm_offset_t addr; + vm_size_t total_size; + + KASSERT(size % PAGE_SIZE == 0 && guard_size % PAGE_SIZE == 0, + ("%s: size %zu guard_size %zu", __func__, size, guard_size)); - size = round_page(size); if (!swap_reserve(size)) return (NULL); + total_size = size + 2 * guard_size; for (;;) { /* * To make this work for more than one map, use the map's lock * to lock out sleepers/wakers. */ vm_map_lock(map); - addr = vm_map_findspace(map, vm_map_min(map), size); - if (addr + size <= vm_map_max(map)) + addr = vm_map_findspace(map, vm_map_min(map), total_size); + if (addr + total_size <= vm_map_max(map)) break; /* no space now; see if we can ever get space */ - if (vm_map_max(map) - vm_map_min(map) < size) { + if (vm_map_max(map) - vm_map_min(map) < total_size) { vm_map_unlock(map); swap_release(size); return (0); @@ -741,10 +760,16 @@ kmap_alloc_wait(vm_map_t map, vm_size_t size) vm_map_modflags(map, MAP_NEEDS_WAKEUP, 0); vm_map_unlock_and_wait(map, 0); } - vm_map_insert(map, NULL, 0, addr, addr + size, VM_PROT_RW, VM_PROT_RW, + if (guard_size != 0) { + kmap_alloc_map(map, addr, guard_size, + VM_PROT_NONE, MAP_CREATE_GUARD); + kmap_alloc_map(map, addr + guard_size + size, guard_size, + VM_PROT_NONE, MAP_CREATE_GUARD); + } + kmap_alloc_map(map, addr + guard_size, size, VM_PROT_RW, MAP_ACC_CHARGED); vm_map_unlock(map); - return ((void *)addr); + return ((void *)(addr + guard_size)); } /* diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h index 942c03480364..296a50ae0058 100644 --- a/sys/vm/vm_kern.h +++ b/sys/vm/vm_kern.h @@ -75,4 +75,5 @@ extern struct vmem *memguard_arena; extern u_long vm_kmem_size; extern u_int exec_map_entries; extern u_int exec_map_entry_size; +extern u_int exec_map_guard_pages; #endif /* _VM_VM_KERN_H_ */ From nobody Mon May 4 18:31:20 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8VbD3xp4z6c3Y7 for ; Mon, 04 May 2026 18:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8VbD31XYz3H5r for ; Mon, 04 May 2026 18:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777919480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yn86SAOoCxbD8FasxVcJ0l+MKC2j0ZE/qrI2ldCPspU=; b=Ox9JjOzZZNu+5kWr2rMHhPXGMuPHBXm1Qno9TYvwfBNyF9i9zZsIs/uxE+plpyQVpVjd8t MUPtytGHt+GDydTqE+OB84eZAeCf+kBEHPSKe/R8vEeBFaG5dm+kuj7BUOEiTpRWIs94Hm PTMBx/T1fW2+G5+7xe+2wbSZXFxOQjjxBI+Hlbcgyoz9R51ip5Rx0KuOBtvy2X/zcHf6gN IK41pjFaq0NyKPZiKLQaoAd7SOJZH2Xek2ANdhUEyFTAI91D3fAa3SxEK/rgD6N5Kxmlst WhsUNeq5EFC7CQAs6zooozBM5Pk2IJuSZA+hKztElINz3ZB5j4FYPW+C1ck/8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777919480; a=rsa-sha256; cv=none; b=qnOW0ABHD0LApG5WGPAjaM9up0/1kSzGrhClqwLacJne1JmpCovacmzDig9pATUbB2INEt 3UB71l1m6wYe3xKc6mloMGg2pY9et7ZW7mbktns3qzNeV/oCCBG745KCHVuE04LdVsclq9 BcjkdUt2GRV+QahYyt5Q3DC6C+mE8zHEz6Si7gNov+9omiekv8786BwjL2PqGBYvjPKJSY 1+ThDg8GRg8jv/pwV3FTLNQwhGiaAu7Gk4/Hi1FbdFCNy0np4ubCDcCdinSX4Kh62S0hV8 aeNSOOI5kyhochAqVKhEAz9OwJSwggf+zy+lGYX3zJw3klk74Oi3e68tz26n3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777919480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yn86SAOoCxbD8FasxVcJ0l+MKC2j0ZE/qrI2ldCPspU=; b=IE6k7hv7tSlY8j0oao/EJYiWACppvoIFjQS/yzOdPLS4nz2OAnWSBd9VILEyUek7RdFji0 RifyO6ez1O7ZldrCCVuDQbZKjqNieJSxU236ox34eUEvlUWJapMIWwraHrcdhCL0ILMyUy 6oHeEC+lL4FFlBJBOrK1qxYHOXt4rBr3+wx+QeySfwRMZqHGWNej1kcgLlDul/QnSTujXX 3nCaGHmaRFf1HpK0QF/KXqagN2Xc+E/IJF/Mx6+CEbmXPSdvTHm4wI527ZlsouJiiefNJj O0xResvzn6uFl7BXbEdIJSmOZG3Le4AXj+U11A9hZZhIjdi8syWng/WdQSUOqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8VbD2cclzY9l for ; Mon, 04 May 2026 18:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38745 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 18:31:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: c295f0263760 - main - zone.9: Add a missing newline List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c295f026376035fee1a9e44efa2af30d46b7884a Auto-Submitted: auto-generated Date: Mon, 04 May 2026 18:31:20 +0000 Message-Id: <69f8e5f8.38745.7da088ff@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=c295f026376035fee1a9e44efa2af30d46b7884a commit c295f026376035fee1a9e44efa2af30d46b7884a Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-05-04 18:28:36 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-04 18:29:48 +0000 zone.9: Add a missing newline MFC after: 3 days --- share/man/man9/zone.9 | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9 index 9f13cf0e504a..eeac1f241c29 100644 --- a/share/man/man9/zone.9 +++ b/share/man/man9/zone.9 @@ -484,6 +484,7 @@ Free items in the per-CPU caches are left alone. .It Dv UMA_RECLAIM_DRAIN_CPU Reclaim all cached items. .El +.Pp The .Fn uma_reclaim_domain and From nobody Mon May 4 18:34:47 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8VgP1rdSz6c3dG; Mon, 04 May 2026 18:34:57 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from mx0a-00273201.pphosted.com (mx0a-00273201.pphosted.com [208.84.65.16]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "*.pphosted.com", Issuer "Sectigo Public Server Authentication CA OV R36" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8VgN3WLyz3HcC; Mon, 04 May 2026 18:34:56 +0000 (UTC) (envelope-from sjg@juniper.net) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=juniper.net header.s=PPS03102026 header.b=C3cvfG0L; dkim=none ("invalid DKIM record") header.d=juniper.net header.s=selector1 header.b="fuQs/cRO"; dmarc=pass (policy=reject) header.from=juniper.net; spf=pass (mx1.freebsd.org: domain of sjg@juniper.net designates 208.84.65.16 as permitted sender) smtp.mailfrom=sjg@juniper.net; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}") Received: from pps.filterd (m0108158.ppops.net [127.0.0.1]) by mx0a-00273201.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 644HugOQ2973979; Mon, 4 May 2026 11:34:55 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; h= cc:content-id:content-type:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=PPS03102026; bh=SzfkvGbl0 ACeTKHzVhu3Vi2zwnvmqccuOV39oAr8p6E=; b=C3cvfG0LHsXxOkVR+ckaEbjnf zfo2m7gX+I9gQ5ef8FLB4sg9Tu0/WHV8DsJjFh3XvF5vIK48As8/7fJ3zqEAkSe9 CwzfHuBRrj5CzCS6bQr9CGLg6j6QWhg9t89p/hEYj4Hsehpvwq6boWLkRfeScowS mgIjd/0PvFTypnBufqeTRA7MxSwEyiwUwERAifDFFcyOWzjiLB6T8PhcNNiqW193 91CnLcMmkb7wFXx71VLxLPyhBREddMNIKFY+3qnariY1/pU61+9R35EK0sYcDXNP M2TMinKihrToozO+2XroqR1HI6Byuu2QJSkPU9EjPQj7lt/hdcblYOe9tKmYw== Received: from cy3pr05cu001.outbound.protection.outlook.com (mail-westcentralusazon11013026.outbound.protection.outlook.com [40.93.201.26]) by mx0a-00273201.pphosted.com (PPS) with ESMTPS id 4dwkbqr07c-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 04 May 2026 11:34:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=a7uxa2gmghYr/bxeWzIQ4aKxt5RzNroe25XSJXKhV0aRmMvTuiVarc2UMMSvlfGpof3ZiEtOlLCbXCxVRf1NLExPahOjxnz+zexaV9TGtxCX6oFugdMuCn1JS5gHZ25+LP9kjAQlGlgyAh6pINMNE+UDVW0Y/FWUbLlNHBgkox7F6eyQRsaigWvRW6TG7U7VH6pVJuiSSXDFdQI+YOb2LQG4IM/kDrTCy1vMpCMVHirByzfuzgu1wDGkgJyviYH+ZssslsYOhKimoxA1upmW8Kxa97gkozedQzXzc4A9bdqgm2HxZwqwT39FZ4R8wXvhHHLxT8FnzoWFVaYfKSu6lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SzfkvGbl0ACeTKHzVhu3Vi2zwnvmqccuOV39oAr8p6E=; b=eTENmb6fhAt2jtRji/C6lopd+USdowmQht+pMUNVTiKRRA7RtqUgE8NftRMg5E1jMOFVI4mEWuPXpVOajkf5BMd3gzMc8djjA15qfrvVRy1b4z+gk25Fiuj9XtvxZR59q8tIVietIzEynS2tYYKlbF+MqfJUOzZOQjtwheHZ7EiaLP9iI0KaGx5/79lWlWp5S55+vs2Z50WRghfVJqG07OSxjsdn3nly6TgJzb54BYw4g7lu/snE02lWin7Ls4pAZve/RMeUguRhMd1eDcOCwCYxvQfw5cjX9a5qvloqfhKXcgiBnBJGuAeLgFk7LI2GBKJnUgaRzPgTHcr5hHKa6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 66.129.239.14) smtp.rcpttodomain=freebsd.org smtp.mailfrom=juniper.net; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=juniper.net; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SzfkvGbl0ACeTKHzVhu3Vi2zwnvmqccuOV39oAr8p6E=; b=fuQs/cROru3bPTFQMEuNiIRYJaXfyEHn4If0wCLnlotvXSy+4GrLMZWPVRGNaQ3FK5vlaMiuOBK0k5BwulrMXHqxQoPiooj7vpLot6RZs2+KodZok9MvS2ksovzCTBgRHCgSoYTzM8xaofyYmLYLhqIB6cAooCJPICOiKguTBdk= Received: from SJ0PR03CA0205.namprd03.prod.outlook.com (2603:10b6:a03:2ef::30) by CY5PR05MB9071.namprd05.prod.outlook.com (2603:10b6:930:3d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.26; Mon, 4 May 2026 18:34:48 +0000 Received: from SJ1PEPF000026CA.namprd04.prod.outlook.com (2603:10b6:a03:2ef:cafe::7f) by SJ0PR03CA0205.outlook.office365.com (2603:10b6:a03:2ef::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9870.25 via Frontend Transport; Mon, 4 May 2026 18:34:47 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 66.129.239.14) smtp.mailfrom=juniper.net; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=juniper.net; Received-SPF: Fail (protection.outlook.com: domain of juniper.net does not designate 66.129.239.14 as permitted sender) receiver=protection.outlook.com; client-ip=66.129.239.14; helo=juniper.net; Received: from juniper.net (66.129.239.14) by SJ1PEPF000026CA.mail.protection.outlook.com (10.167.244.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9891.9 via Frontend Transport; Mon, 4 May 2026 18:34:47 +0000 Received: from p-exchfe-eqx-03.jnpr.net (10.104.9.50) by p-exchfe-eqx-04.jnpr.net (10.104.9.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Mon, 4 May 2026 11:34:47 -0700 Received: from p-exchbe-eqx-04.jnpr.net (10.104.9.87) by p-exchfe-eqx-03.jnpr.net (10.104.9.50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Mon, 4 May 2026 11:34:47 -0700 Received: from kaos.jnpr.net (10.104.20.6) by p-exchbe-eqx-04.jnpr.net (10.104.9.87) with Microsoft SMTP Server id 15.2.2562.37 via Frontend Transport; Mon, 4 May 2026 11:34:47 -0700 Received: by kaos.jnpr.net (Postfix, from userid 1377) id 1DB19C8E7E; Mon, 04 May 2026 11:34:47 -0700 (PDT) Received: from kaos.jnpr.net (localhost [127.0.0.1]) by kaos.jnpr.net (Postfix) with ESMTP id 1C2DFC8DF0; Mon, 04 May 2026 11:34:47 -0700 (PDT) To: Oliver Pinter CC: "Enji Cooper (yaneurabeya)" , =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Subject: Re: git: 566cc005812b - main - safe_set treat ':' and '#' differently In-Reply-To: <6906.1777574491@kaos.jnpr.net> References: <69e8f964.39869.24418b55@gitrepo.freebsd.org> <86jyts1xzr.fsf@ltc.des.dev> <15177.1777314263@kaos.jnpr.net> <86bjf41chq.fsf@ltc.des.dev> <24831.1777314998@kaos.jnpr.net> <6875.1777333471@kaos.jnpr.net> <6906.1777574491@kaos.jnpr.net> Comments: In-reply-to: "Simon J. Gerraty" message dated "Thu, 30 Apr 2026 11:41:31 -0700." From: "Simon J. Gerraty" X-Mailer: MH-E 8.6+git; nmh 1.8; Emacs 30.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <11634.1777919687.1@kaos.jnpr.net> Date: Mon, 4 May 2026 11:34:47 -0700 Message-ID: <14577.1777919687@kaos.jnpr.net> X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000026CA:EE_|CY5PR05MB9071:EE_ X-MS-Office365-Filtering-Correlation-Id: 14c57f7f-4fa1-49ed-09d3-08deaa0bd1f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|36860700016|13003099007|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: e3GflaVVRAwENgZRktMQzjG/ri4OTofbaqE7G0xGqB7pO4uExIcqNGVJfJOeRmWaok83Nhj/eDOJVrymeKH1HvCei+VHdpjQli8VRzTFA1cEtfD3AoasariOLzs7n9oxzLtCnOUvv2AG5jVA2Ry+cR2CWmqU3i2YOabOEed88iavcYvDmFg/Lz7EWDHVKizA0zxycAC/pTRhoeRyWweXMHsLUEn4CCDpT+mybNai47GnLy2AnfCvTLkazVjpW2YsQwi326IyjvDQEDVor4lc7UTkkZYxbuCFD9byBYDxquLP1LRkUBmAHvbV+FJuiefMpIqwWMuCdssBU7a5zkUI0OblEKT2wOPGXd4Af+3x2983vLu5aYp+KyZYvsn8DWnqO+AfvRU6pI39wq303NmBbyJe1BmO00vd7/SKnWmgSogaSozBNfiLMyai0TzefGOzbPRT95sL72ouPo3nLnNGV6Q211/Fj1rg57m826X1vET3ILejHTBdf5zaHfVeHdQuuKXEeOZqo0br6MhyTv9EEFlmXvrZ1GtLglDrYg1edQIoNoS+5L7teTp5CiJNfntxZXa/NPlnvn2G8E2vs2tUUW/mWHyVz7NSfedE2etX7IjQ1ea2HO33imsyxRGAYncWLoNeqh1UIHZOAuL7vYx12TkB31KJ5y/CxF74qlVXulhYtCYgliBewToo2V4DjiVEywHnCSwb/tnDeS2K+7beB8JkotaVY3nhdLTNBlws1+2ca2gKXqvjMQAGyJzeaB2z X-Forefront-Antispam-Report: CIP:66.129.239.14;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:juniper.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(376014)(36860700016)(13003099007)(18002099003)(22082099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2/a/Sz7ZZzJVd/5ll7RMvpyYeOrhDQx/uviKhONIu8QamWD8VcaCZKtHkAS9sO3cKtbQXxpMT34hRtQdzot5qjGQYaHeMZbu0xh+HlkpuyLdTG7PX95dINKTOwsEiRIjLNIb6+nBfo3cTvuFZ5bkKK4rjV+ApiSB3ZL7kimCYXggPutg3w+z5HBITOK2hDRh8RkdqUg5HJCSJKjfd6pVjqnHxTcy5WfvbMGPC3cfOCKvUEm6Jg2enwqTm6eEl9ChsFhpyZ/VwA8sGQ6gKNIhsA1erM18GS/gZZx1nUjJ5XpWvunRi7hQ+CMiJuyDCCENZPcAXwbMiR5zg+6hMSGGM7lp6FFbTZMVLbRXSBfj5wd/v7q8KUBdjjMn+QvBZ1rwiguj005CyhteI16YOmrkaiUpbh/tffWJcswDXG0GE6ms84lY3NcWeMeirQTdJ37G X-Exchange-RoutingPolicyChecked: A02W3Es/py8Btagl9RaOgnPClkwvK8KjTEnyF77C2oM1jzHDzfC2MKy9DL6lrxP5mepaa9rtG65k1z+HKdL0xoRw40miRRZl+wsNPwOzDXnJwPZQKydh3i3VSDjumbwJb4w//rcEJyiKjrEbL6ocQAv240KHpb5j4dl9qxqpSeGrK67qKGbt39D2OxWSxOJgSCE20/4PyrclG5+M8JbQZtMsFcMsODDW6d4Fv/LbzRydwG5JotE9I55bj+TH6sfbeTJL9TbMnk4JXUaAsmLaObdfTfHdeatzSK4fF0703rhjcG8mWhpfV60eOcVw++Cuf8ZDsW79yD+Czqdv4q2J1g== X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2026 18:34:47.6880 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 14c57f7f-4fa1-49ed-09d3-08deaa0bd1f5 X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4;Ip=[66.129.239.14];Helo=[juniper.net] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000026CA.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR05MB9071 X-Proofpoint-GUID: 6gJoJbV6eu55IEAU4laXtyGKh4ooqbJe X-Authority-Analysis: v=2.4 cv=Rtz16imK c=1 sm=1 tr=0 ts=69f8e6ce cx=c_pps a=ThMr3hCQx13Nvzo14U/9jA==:117 a=f/rncuQqEjTEF/G1odkJ9w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=kj9zAlcOel0A:10 a=NGcC8JguVDcA:10 a=s63m1ICgrNkA:10 a=rhJc5-LppCAA:10 a=VkNPw1HP01LnGYTKEx00:22 a=7vL3O5uBSuztJ3xaqtyr:22 a=P7Xzg2ago1iBcVwzY-fE:22 a=6I5d2MoRAAAA:8 a=OUXY8nFuAAAA:8 a=pGLkceISAAAA:8 a=dGvunq7JNw21vi2BIywA:9 a=CjuIK1q_8ugA:10 a=zZCYzV9kfG8A:10 a=cAcMbU7R10T-QSRYIcO_:22 X-Proofpoint-ORIG-GUID: 6gJoJbV6eu55IEAU4laXtyGKh4ooqbJe X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTA0MDE2OCBTYWx0ZWRfX91AY6N/gry/q zoso7zrD2F+Rp/nDb2wn3Kkp627g5zsV1K2/Ui4AHw3CLee1xoAQNcJrcHJ+H1lFr8keutxDnsJ HeQZ2xoTQSGdhVncqAJbOamaKS8imxduX5E3b8GLvxPTXnEitL00Zf0t8ctVW4r02N9ATaL/eHW XOqJKnppLXrMee3Rf8QbOh2WxwBSTRb5YP4feP8fDMumYkYLfPigDBYeLR784npU3ULEh+G4tnm OFSx+G+trfnNs1qja7IkKrzYOpJPsWY3GxciEibBFyXQ+khNeA13OL3qGoCiCCquXSlKdm/el51 4RUjU+C7H5hx8cg+T3lLLfGE+EKuE4rzT7Qu9k06zVhucmwymHdcI2WmdFUyODX+In1HMHrYvOY oZhxa3ydM+g0u+DNkBESA4uY0jj1x0TpBWkCDJm387xbPdSJDFyJEBTp8dyFwHhV28Cgp39zD83 5kD1cYecvw6NsdT4qFQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-04_05,2026-04-30_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 clxscore=1015 priorityscore=1501 phishscore=0 bulkscore=0 adultscore=0 impostorscore=0 lowpriorityscore=0 spamscore=0 malwarescore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605040168 X-Spamd-Result: default: False [-2.91 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; ARC_REJECT(1.00)[signature check failed: fail, {[1] = sig:microsoft.com:reject}]; NEURAL_HAM_SHORT(-0.81)[-0.806]; DMARC_POLICY_ALLOW(-0.50)[juniper.net,reject]; R_DKIM_ALLOW(-0.20)[juniper.net:s=PPS03102026]; R_SPF_ALLOW(-0.20)[+ip4:208.84.65.16]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[208.84.65.16:from]; FREEMAIL_CC(0.00)[gmail.com,freebsd.org,juniper.net]; TO_DN_SOME(0.00)[]; FREEMAIL_TO(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; R_DKIM_PERMFAIL(0.00)[juniper.net:s=selector1]; FROM_HAS_DN(0.00)[]; DKIM_MIXED(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org,dev-commits-src-all@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[juniper.net:+,juniper.net:~]; RCPT_COUNT_SEVEN(0.00)[7]; ASN(0.00)[asn:26211, ipnet:208.84.65.0/24, country:US]; TAGGED_RCPT(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[40.93.201.26:received]; FREEFALL_USER(0.00)[sjg]; RCVD_COUNT_SEVEN(0.00)[10] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4g8VgN3WLyz3HcC Simon J. Gerraty wrote: > Oliver Pinter wrote: > > Could you please add some unit test for the supported use cases to > > avoid future confusions? > > Sure. safe_eval.sh is setup to support that. https://reviews.freebsd.org/D56795 Not sure if anything else needs updating. Tests work as expected from src tree. From nobody Mon May 4 19:27:48 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8WrT5CtNz6cCjp for ; Mon, 04 May 2026 19:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8WrT39n5z3NV1 for ; Mon, 04 May 2026 19:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777922873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UZ2dfS0sNcIPSdTI2PT29pIAtimhdMq/QZUY6HiAoSM=; b=WzgsV2hynAeJlZWxLlio0WVuO2cKCMc/GdfJ2ALiwGIBd8Bw8cPAyhAx4+kAh+jHCfxAlx a0/DMzbaeWJ1l27uCK9slGfpN0dqa4YmnrSe/NorUaOw5PcT94LPVjKnF2h2C3WM36eivB rAP77P8pQo3+qUUeYoTcOr4xvhT2MMnIh5KQHT3dRoLfM5X/ISdYT27kgwytsbUoWJ6Zr4 RTccMu2HA+T0x3fuEHNFK1EpNEFlac0GxrWF9HqPeZpRO/i/Zzj+m/1QDUXoEn1SxrKbPY aJaRccB0s7WFcJ/72B3Wn2qRyKCc+UTlilZKDfsW9vBHK3J0SlbLf2xM81WHNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777922873; a=rsa-sha256; cv=none; b=haaOgcd7sIfjt+zxrr2cCa4o2XBi/dV0GGpd84T+PNUNGOfTS72ajo4qaE1ibXlOHprPes 9bb+8ZMEhBUPZmxAFUmtKDnBC9E21ZVTD/rBnXMj1OE7OuYwTClc3ShSvpMW/k+hx6hfnQ 0AG3nzIPbp/uksXrsH9TfL2zat69m+eBAqGbs0+qE9FY4qUgu79Vr1q8Dcu07/hIdAaWuu zLIpWaKn+xZEoS6ESwO8fbKcpJDgiTg8vAEGriCurilpok8yGYnPOanR6vMN2Syrc4ILSN RGTYdwyouo9nolVo+j3vpBqawthjpG771g/zqoiv7GVYzd9GaKhBpdRJXJAvgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777922873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UZ2dfS0sNcIPSdTI2PT29pIAtimhdMq/QZUY6HiAoSM=; b=cBQoc7sxxQaHgDfqqmiihppr2+o9kz/Jhs2ml8YGX+G8df6BFSsCIo0j6H/6tAyVpJcnIh PAa9bK5iT+21HrkQG6NXx/pxM6M6KehHjSxbbm1fmWh4m23fQD4BPv1rbtVIKj636Gn+Ub fJzULh+ofddkO20ZvBqP+4p+AYY3/rTZO/cNv39cXkv/MW9j7fQWonSMhbbntgn/vPOAnB 1xLqHWOWUViIVLK+dvsCfnBcM5despw0P4r8QfIQBeWsKTc6pfDEvPmskblw0uZOfvImIs v3FkCYDBOMTw5Nd1gTRUE0P0ZaPQqAJNw1f7jg+1JvgQ+QKpJqaJz+IpnQj0OQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8WrT2TBWzZmy for ; Mon, 04 May 2026 19:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e3a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 19:27:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: 658bb99db9c7 - main - linuxkpi: Implement `module_*()` APIs as static functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 658bb99db9c7872f92ccb86ed2674c72636436d2 Auto-Submitted: auto-generated Date: Mon, 04 May 2026 19:27:48 +0000 Message-Id: <69f8f334.3e3a4.d717d55@gitrepo.freebsd.org> The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=658bb99db9c7872f92ccb86ed2674c72636436d2 commit 658bb99db9c7872f92ccb86ed2674c72636436d2 Author: Jean-Sébastien Pédron AuthorDate: 2026-05-04 07:45:38 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-05-04 19:13:43 +0000 linuxkpi: Implement `module_*()` APIs as static functions This fixes an "unused variable" warning when building DRM drivers. Reviewed by: emaste MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56780 --- sys/compat/linuxkpi/common/include/linux/module.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/module.h b/sys/compat/linuxkpi/common/include/linux/module.h index fbe57cbbed82..de4be1e9ebe9 100644 --- a/sys/compat/linuxkpi/common/include/linux/module.h +++ b/sys/compat/linuxkpi/common/include/linux/module.h @@ -136,9 +136,14 @@ _module_run(void *arg) #define module_exit_order(fn, order) \ SYSUNINIT(fn, SI_SUB_OFED_MODINIT, (order), _module_run, (fn)) -#define module_get(module) -#define module_put(module) -#define try_module_get(module) 1 +static inline void module_get(struct module *module) {} +static inline void module_put(struct module *module) {} + +static inline bool +try_module_get(struct module *module) +{ + return (true); +} #define postcore_initcall(fn) module_init(fn) From nobody Mon May 4 20:59:24 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8YtD1Bgyz6cQlg for ; Mon, 04 May 2026 20:59:32 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from mail-yx1-xb133.google.com (mail-yx1-xb133.google.com [IPv6:2607:f8b0:4864:20::b133]) (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 4g8YtC5jlpz3ggW for ; Mon, 04 May 2026 20:59:31 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yx1-xb133.google.com with SMTP id 956f58d0204a3-651bc83e74aso3995790d50.2 for ; Mon, 04 May 2026 13:59:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1777928366; cv=none; d=google.com; s=arc-20240605; b=gY3wZT3f+vDVsBfF09ZBYmwXzr7JYnHTK5WkGvU2+63HIBUG3WJM3sCSdNF42HbDGH BXFkLxXku8FD1luRR5akKBM0hQfKsiiYn5RGdtmGoKrxi32tglNCI2C1thyuvHlEdXtf ih8WeIHCJ87tCNTf+wEyaWoSgkcIVu7fFlerjFa1hjqerPq1rs/qP2Y5/R/1HLo5yMrd INuSei01Hgg7b3pgGusJ26VOfNWy1CYnEBN23U4OlyL5JCx/ztosrwikDILvSnEhMLXL sh4TPYc5HcPo1BlifqzxWcnO3By0cKQRdNdtKalCr7zrw0CL5uK75Qrf1AjY29T6/NqY 44Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:dkim-signature; bh=+rAGedD6vDvl3FBbMUZx2Mw0OId1sF03Se0KPGkJ/FY=; fh=6Cgd8xiu0zkNL9NFAnJkWIQO5lfF29kpCWBD6ukKVcg=; b=Y/a4KjieScmU8LZe0vdTNMX6QdinLG0NFZi7bgLzTknAdbrMeDRFDZBRJCDNY9ijGz EXLhdzNTDNkO7OoZ3fozjFpVcNKBbmwbjhT53lOjccauUJO3Ltzyxbmy6GtlzaHDLa7X morotB2j0vWHuD4tXKZYTEQ5/TD1D19KaMeWlBloWWfAQhi4kONy2ORot3EdzVFHtZ6z FPihVFg+ww6ErDhbj+nFotCyNohESbDTZSmPF5o7JjjxtCGKMOZ0y3MzOtlHSN4HhEXD itEQ3YAgaNXKqumzQrKVztIp8LAYOeTnQn2GLcb5pnqWgLMpSuYJTAr8VaQ0uMsz694Q T0bQ==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777928366; x=1778533166; darn=freebsd.org; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=+rAGedD6vDvl3FBbMUZx2Mw0OId1sF03Se0KPGkJ/FY=; b=aQlZNACntaQV/ypMNWUVbBFK9SVzKNq64fnjHPAFrbpeg67TWFewQ7KaC0HwED9Bb3 a3KBpkobP4dt3MAzbtre2hjGH/cDatSPKZuSlXinriIOh6O1dVKnxMh+tUMnMMZ+4aX2 VRqx6nS9IenYVD5L3jFFzUQp7L95KdiZ/zS6euK1BrvOK4Pfl65Oy5LFn0syiOHxv0xt wtjY8tsKtDnz3rLWAZyWN0mGpT5QK8TiHSKFVnyNLrDi+TskIHzL554C1AUzuojZ2PpB 6lBFVjXMCNeZW2JHxEqkgm6NXIhJGJdDXu54+n4UJOncARc9W+ylhSxR2w8wjLp4tJW/ Z5rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777928366; x=1778533166; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=+rAGedD6vDvl3FBbMUZx2Mw0OId1sF03Se0KPGkJ/FY=; b=bDly7FQfqw2OxtxztrcYpeIEBFLJbDRTko0yPuJZ1pdFpCvrcok/wV309DUR5DrkaL tWibzNAdh1o8dJGxJllj77b1Ggmye5zJZlDxFEYC/Kjox1Aa6CzimqbUVT1U3cbX/HYz QKVQ0/wh0pD6AvHDEpKB2XlYkBdhUGrlG9nCwQvQ46wNBFpechRXnifz1+Fo9LkfJYBm /iaylybmsZ91Ai6ezEbSEnOJKQjt9533T+EjOdckRM7C2j7OhlNdzEywHmjjoem2WAa3 h9HfPilK/zqX9lTEDgh4LImfIgdb8cHv0wlKojrdsbWAYaytvz0+eLzUvPS/KKr81IRn UlvQ== X-Forwarded-Encrypted: i=1; AFNElJ8OvyKCpX3ZI746GStUqXoqkyNeRQGLAcCIn+IokUjHNdP7z+IuC6c0bIOw3UfXjsuUu4A1TZFPc+19fYQ60RcGYmCN@freebsd.org X-Gm-Message-State: AOJu0YyAN/OX7DTdtMXdqLvrq6w4TEF16VyPz47474tJmIT2ESsmcW2m ij34UY6mvn95QvTGtKeywojBqTeAYwVRMaZN7LZycWZyj+chjEu5/3065Wt+GnTzQkx3aARIFOZ 5H7Jxv9NIwiIqq06TLMnEehr7fcyPbxuctg== X-Gm-Gg: AeBDieu9Z4L26DqSF+uFxwVrt+YV2xZkqHQ+NO3ygGfhDfZQ8EMI9tVeGjK+7QruPJV lWP64wnYm0G42IX4pwuQw6Hc6Ac6Qami1KKsZd+Hlnd89QmqUPNnbNccOmek29xawNDpTn44/Y0 JKTW1Ppkv5yfHurNb6CayC5Gn8nA9EseARQZ0bX6aSLLWA9yggMXGuIxa8Ne87vRBMCIY2kmTOm xFNatSFXnqk/Z2QqiVr18MBGbeZMQpJR3Wwr0/tEjrkC2ETGR7cXE67ut8bZbIDel3tr+mYX1bT bq9hGrzA929dsSFvuvfE0GKABD0CiYMQHwj60XOz+x84QoP/5PQ= X-Received: by 2002:a05:690e:d5a:b0:651:b67e:6e58 with SMTP id 956f58d0204a3-65c3d9a379amr10654700d50.7.1777928366164; Mon, 04 May 2026 13:59:26 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Received: by 2002:a05:7011:a1cb:b0:515:3e23:509f with HTTP; Mon, 4 May 2026 13:59:24 -0700 (PDT) In-Reply-To: <14577.1777919687@kaos.jnpr.net> References: <69e8f964.39869.24418b55@gitrepo.freebsd.org> <86jyts1xzr.fsf@ltc.des.dev> <15177.1777314263@kaos.jnpr.net> <86bjf41chq.fsf@ltc.des.dev> <24831.1777314998@kaos.jnpr.net> <6875.1777333471@kaos.jnpr.net> <6906.1777574491@kaos.jnpr.net> <14577.1777919687@kaos.jnpr.net> From: Oliver Pinter Date: Mon, 4 May 2026 21:59:24 +0100 X-Gm-Features: AVHnY4KqwATf_61TGu3cocY3DWtVNPynoPJq-WNDTVpUgDh_i3Gv5a7R1iXnqcQ Message-ID: Subject: Re: git: 566cc005812b - main - safe_set treat ':' and '#' differently To: "Simon J. Gerraty" Cc: "Enji Cooper (yaneurabeya)" , =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="000000000000b38fa80651043442" X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4g8YtC5jlpz3ggW X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated --000000000000b38fa80651043442 Content-Type: text/plain; charset="UTF-8" Hi! On Monday, May 4, 2026, Simon J. Gerraty wrote: > Simon J. Gerraty wrote: > > > Oliver Pinter wrote: > > > Could you please add some unit test for the supported use cases to > > > avoid future confusions? > > > > Sure. safe_eval.sh is setup to support that. > > https://reviews.freebsd.org/D56795 > > Not sure if anything else needs updating. Thanks! I've seen that it tests for ``, but what's about $()? Tests work as expected from src tree. > --000000000000b38fa80651043442 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi!

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

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

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

    Not sure if anything else needs updating.

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

    Tests work as expected from src tree.
    --000000000000b38fa80651043442-- From nobody Mon May 4 21:07:50 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8Z3y0p4Dz6cRh8 for ; Mon, 04 May 2026 21:07:58 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic315-55.consmr.mail.gq1.yahoo.com (sonic315-55.consmr.mail.gq1.yahoo.com [98.137.65.31]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8Z3x2tMhz3hRH for ; Mon, 04 May 2026 21:07:57 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1777928874; bh=iigoFO8/ssFGkZVPjluNv5ZXu21zgwpCuSucA6ZQrVc=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From:Subject:Reply-To; b=XRrdT5SJZOigNirQbiHXF8SMIQe/jZurDP57hyffUJr37EJP+M4iu8lAYYrREFXHG4cms6Ecy2xs5x/RotETTXDhesosF9DrhhLnz4yAbZhaSmOKEj9XTBN/Igztk8GJz46frehtiZarHGWWAtv10WgsElLcpwHJognl2arbiai18SouCn0RY47jdItdLCdQmSdWlYiZlyu/2jI/Nr/PWJDZlHuUw6q2B69/SkwKziLBKBcglzdwQdN2McWTIN/2qQfAYg15svQwRMSzy+BWJtbJRcb/G+cS4iKGYqZGYvW8tDk9gwQGs+Xrv/c2LMBxJ6PCRQK7QHG3TYvOd61NXQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1777928874; bh=s3Od29s7BtysMosv7L7UBaHnHtYoGg7z3smjs15Z4r+=; h=X-Sonic-MF:Date:Subject:To:From:From:Subject; b=SuOTMiyzeLl0NvzjfVEkRnodd+BDpSXf033FnvCDXPJWgxFKdZtz9iusKO69MYKW5JK9F6Q5EiVLv8xW2UJG70jsdzqkaF2Xk4ZQzNApAX9BsWyBbGd1q5vboEzTLv6satFIgaqGzSnmRdGyglPG4TdsymAW5t5JaxK9dAF48OBDpC7gUivnxWBK7pA3UCSzxSSZiLd1vhijs2s69uX4dXmP2fZtw4JttdOHUUUW9gt3ly+wsd5lMUb/WzNXBM6oo3HsqbPf678dBlEQ6I4xu+eF9OHrzIxtdnNpQyCOuDbjWlsbx062TDq10wjokJDU3bvh3MBA0XQvDeD+zkW+DQ== X-YMail-OSG: JYYVXJwVM1koCzgerFW0nU2z165AR_dWl0nXxaRtNnzPtBtld62ERKXpF500jIF 4.k45m3T6tDuPsC5YROnoPd0qCZpapGyOfrnTISbN29Cn.l62qc3qHV2.RAqgOJa8QC4TU.JJJ_Y C4lNifDEV8SyzOjB6cd9UZQc0c0NFfXV8uFwHf.CCG46G0cBiW8QrPEG6I_ISyq30cA3I3xqmP5s 0ZBliUZzZmLQjUcBL31OxdsGcRcNCxXAtNbTTjoME_B5c3wfvkkC5uGc3pCE0tRHi9oQJNlhtenG wY2sSVE7X1nicNmW7a28L0Z8UNuPK8DMg9Z6rqTVDESc4CBPbpITzaqpfKGXCn1SxdAzyvhJn9Qe 2h.YZ9JlP.gbNWbFYkmxPy4828ttTexklmoW6Op3UaqAVaL1LcdScfwGPjluxU1npipwz2ybTBug gPEeh7YL_IuVJEmvMEVeWwcxcJ7GPIlU8rlVbBcx9nJtch6diFhyxX..I4NgRn0.X6P_SuYcaYnb wbKBwacyGjF4BhxRFzKhYEr0fkb6ROm2Xo9IFbJcLQqY9k5P93RLaldQ7lf_Z16ZBKbR0PRpZCi7 HG5z7ezwL.StbpHO6zfHUYRKxissUyp.wNY8hm9SO1Dc7uTeTpRDcsYwNovYc.GEKhsRTvLm6JJt I7bqGgtr5ytUQ_aM8dHnvqorIJCknkZYOYtPvqKgSjUOluyeedOlV3kCDunTHs1f80iud3S5psaT ohx5eH0upCM3kY7kytJx0029z9rCX9D9n6q5pT7VAwVaN3rGPaZBOrjGOAnz1_a3itQdR0tzsXqa DhYzWBbWvoSsoyJ.mmpfAoTfrjICgi5hB99RaENOlnmxpdldUfs7.jFWowD03V6fxS6rHMfNq7UJ mmlXCvVVIW4hJPu9VMm3Feq.FpRutDMpDZxthcJ66pVIn3azsqOEcc6.UyAQTB3XFsp1msNz3Lvm ECgQLWwTGiGFF2Fi6riAT_hLDsM5aJY.F3nAtV77mPuOMqs8dQeEP8dNW6uwPY6VY5zV83Cf8jBI oAwdQN.tkExH3FN0LdOS5W..MYHohI71OA19IVH_2qjA.rw2GKBi3R7JnO7eYBz4XSbwgHi8rf1p Y_67euCda7YnXOe5QsvTJNt5hY2H2HVLvoMKayZTB1uD5c_R1jivtv6X8DDHzZs47GppugumIbvI 4TXqQglBUShZ2H5ddn3K9pLSX11qZw7HIladhCctbaP0s5P1hGG4CqtziCkaZxs3jpYthSMfz542 RjERMe_3LB5Z4A9ufB6ENyws6j8iwvGnYZO2VGMr.aP3UME_9WOFr7Ig9IsnjVaw8iEQiNVZUqzi zKxgYl_kta2n6rd9E7kXEQUd87949MlrF8GzRQJxnv2.aar3LPhG_xB6EK3v1XojIcxOXNrWqB.2 x8b.jx4EWMp07kvn2nYNb8Q7kt_0oUbCWmActkquHOYeFQ0IjtxeEdH9dMLOPM_LlW7OmRkzid9E cb3FUS7IQfWwpQ0TgmFoIdUrJKP0GSMXO4hL_lpNXArLx9zwn98xOTrba98OqrmNXLswl9lN2XpB UIXmBpLvulxkYtQOjRLUROtkN4jThpqHMX.GbHASboG0vRBJ.B.gGMzZCHEbHRQ5c1bESxTb6xKf Ax_c13z.CZm.ifAoy7LSYwrf9e8xR_OxzxT.bQpb269bsk5YvprM99QYmAM09htln2Zb2HHDSDmK W.6GkhWhfdePS_yJ1ghjQe141eF9T1Bc3SL4gA.NatZGj1WC9W6TzAr83EUTCRLjKrWaai_vRpDw SCY_ZduXXvawAd1YGfatO_.pvCsqYaY2NzQyrRgC0gAHyeulaCDiaQKwXtKrLgo_TIuDtRmFgGDh IkGQ8n3nL.MAamD76tR3Ks.3soIHUWG.YBGofe5AtlkYMUXq_1EKdgjgP31sWe088bf03ci6tdiM JEz1h5uasVpBYE8FSPqG4Jl3ym3mnF042Ps7OcXjfB220Wb.Ap_74UFovtPrH5qYsftbY5ZPStlI x.1rYgzUadbvL9WdqWCp7abtam1eRMTmSCzLOaeC1ygShAI08NUW1EG47D6aupFqoAFG7hsJK0HW w1Am63Tz.XbKTvdxUZ7SonX2RDdeE8BzPGmefW.N6xojLcmpwRnAp4Uzzh0bnm_DeyE.lv6YascM IORnBH5k8ispO7g4A7J7UtrzgtFQHQ1cB86nUwrcjna5mG0WxKZXM9JXM.wvANGmRQKEcVit5lX1 1QXQOCGWu..xhRRo40xKJAKra1oX_sWDW7ZL2jWDCvLgAyBSoNQTpiABDKXyRdmmEDeaUps3Aha7 QO0T1nxZ7LMBMM4nHMrfDB8M5MsMmt8dbVQGq2bOJ2ow4GQ1xGo18Skkrd.SY07UFYLJUiPmh_Ts - X-Sonic-MF: X-Sonic-ID: 30e4303d-20cd-41bc-8ea8-5cca6d9b32b7 Received: from sonic.gate.mail.ne1.yahoo.com by sonic315.consmr.mail.gq1.yahoo.com with HTTP; Mon, 4 May 2026 21:07:54 +0000 Received: by hermes--production-gq1-7bb7df5c46-tkjt8 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 4f886f77a93cca6f6a2b24e257732c1e; Mon, 04 May 2026 21:07:51 +0000 (UTC) Message-ID: Date: Mon, 4 May 2026 14:07:50 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: c4f08d46c7f7 - main - llvm-*: Move all LLVM_BINUTILS symlinks to toolchain package To: Nuno Teixeira , Lexi Winter Cc: jlduran@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Ed Maste References: <69f5387a.26bf3.36f56fa3@gitrepo.freebsd.org> <994cef06-a1c9-45b8-b807-3449517fe381@yahoo.com> Content-Language: en-US From: Mark Millard In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailer: WebService/1.1.25559 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Queue-Id: 4g8Z3x2tMhz3hRH X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On 5/3/26 23:57, Nuno Teixeira wrote: > Hello, > > Any clues if those symlinks are related? > > ``` > # ./tools/build/stale-symlink-buildworld.sh > stale symlink detected: lrwxr-xr-x  1 root wheel 12 May  4 07:53 /usr/ > obj/usr/src/amd64.amd64/tmp/usr/bin/c++filt -> llvm-cxxfilt > stale symlink detected: lrwxr-xr-x  1 root wheel 8 May  4 07:53 /usr/ > obj/usr/src/amd64.amd64/tmp/usr/bin/gcov -> llvm-cov > stale symlink detected: lrwxr-xr-x  1 root wheel 12 May  4 07:53 /usr/ > obj/usr/src/amd64.amd64/tmp/usr/bin/objdump -> llvm-objdump > stale symlink detected: lrwxr-xr-x  1 root wheel 12 May  4 07:53 /usr/ > obj/usr/src/amd64.amd64/tmp/usr/bin/readelf -> llvm-readelf > ``` Hmm. Your list happens to overlap with the later fix: ("git: 045a9ef829fa - main - llvm: Don't install /usr/bin/{gcov,objdump} twice") I wonder if c++filt -> llvm-cxxfilt and readelf -> llvm-readelf might be similar in some way. > > Thanks > > Mark Millard > escreveu > (sábado, 2/05/2026 à(s) 05:45): > > On 5/1/26 17:38, Jose Luis Duran wrote: > > On Fri, May 1, 2026 at 8:34 PM Ed Maste > wrote: > >> > >> The branch main has been updated by emaste: > >> > >> URL: https://cgit.FreeBSD.org/src/commit/? > id=c4f08d46c7f717cc8c66bf702c006765a5b6b1a9 cgit.FreeBSD.org/src/commit/? > id=c4f08d46c7f717cc8c66bf702c006765a5b6b1a9> > >> > >> commit c4f08d46c7f717cc8c66bf702c006765a5b6b1a9 > >> Author:     Ed Maste > >> AuthorDate: 2026-03-06 14:46:18 +0000 > >> Commit:     Ed Maste > >> CommitDate: 2026-05-01 23:33:51 +0000 > >> > >>     llvm-*: Move all LLVM_BINUTILS symlinks to toolchain package > >> > >>     Some of the LLVM binary utilities were included in the Clang > package > >>     (because they did not set an explicit PACKAGE). > >> > >>     Add a new Makefile under clang/toolchain to create the > symlinks and man > >>     links for ar, c++filt, nm, and so on (without the llvm-* > prefix) when > >>     LLVM_BINUTILS is enabled (as it is by default). > >> > >>     PR:             293610 > >>     Reviewed by:    bapt, ivy, brooks > >>     Sponsored by:   The FreeBSD Foundation > >>     Differential Revision: https://reviews.freebsd.org/D55692 > > >> --- > >> ... > >> +.if ${MK_LLVM_BINUTILS} != "no" > >> +PKG_DEPS.toolchain+=   llvm > > > > Is there an llvm package (FreeBSD-llvm)? > > > > For reference, for main [so: 16 at this point]: > (context predates the above change) > > > # pkg search -rFreeBSD-base -g FreeBSD-llvm\* > # > > # pkg search -rFreeBSD-base -g FreeBSD-binutils\* > # > > So: no for FreeBSD-llvm . > > > But for things that do exist that internally are based on some of llvm: > (the context has all the FreeBSD-* base packages installed) > > # pkg info -dl FreeBSD-\* \ > | grep -v -e /contrib/ -e /src/ -e /man1/ \ > | grep -e ^FreeBSD- \ >        -e llvm- \ >        -e libprivateclang \ >        -e libprivatellvm \ >        -e libcompiler_rt \ > | grep -B1 -v ^FreeB > FreeBSD-clang-16.snap20260430194422 >         FreeBSD-libcompiler_rt-dev-16.snap20260425150102 >         /usr/bin/llvm-addr2line >         /usr/bin/llvm-cov >         /usr/bin/llvm-cxxfilt >         /usr/bin/llvm-objcopy >         /usr/bin/llvm-objdump >         /usr/bin/llvm-profdata >         /usr/bin/llvm-readelf >         /usr/bin/llvm-readobj >         /usr/bin/llvm-strings >         /usr/bin/llvm-strip >         /usr/bin/llvm-symbolizer >         /usr/lib/libprivateclang.so.21 >         /usr/lib/libprivatellvm.so.21 > FreeBSD-clang-dbg-16.snap20260430194422 >         /usr/lib/debug/usr/bin/llvm-cov.debug >         /usr/lib/debug/usr/bin/llvm-cxxfilt.debug >         /usr/lib/debug/usr/bin/llvm-objcopy.debug >         /usr/lib/debug/usr/bin/llvm-objdump.debug >         /usr/lib/debug/usr/bin/llvm-profdata.debug >         /usr/lib/debug/usr/bin/llvm-readobj.debug >         /usr/lib/debug/usr/bin/llvm-strings.debug >         /usr/lib/debug/usr/bin/llvm-symbolizer.debug >         /usr/lib/debug/usr/lib/libprivateclang.so.21.debug >         /usr/lib/debug/usr/lib/libprivatellvm.so.21.debug > FreeBSD-clang-dev-16.snap20260428205205 >         FreeBSD-clang-16.snap20260430194422 (libprivatellvm.so.21) >         /usr/lib/libprivateclang.so >         /usr/lib/libprivatellvm.so > -- > FreeBSD-libcompiler_rt-dev-16.snap20260425150102 >         /usr/lib/libcompiler_rt.a > FreeBSD-libcompiler_rt-dev-lib32-16.snap20260425150102 >         /usr/lib32/libcompiler_rt.a > -- > FreeBSD-lld-16.snap20260430194422 >         FreeBSD-clang-16.snap20260430194422 (libprivatellvm.so.21) > -- > FreeBSD-lldb-16.snap20260430194422 >         FreeBSD-clang-16.snap20260430194422 (libprivateclang.so.21) >         FreeBSD-clang-16.snap20260430194422 (libprivatellvm.so.21) > -- > FreeBSD-set-devel-16.snap20260424143247 >         FreeBSD-libcompiler_rt-dev-16.snap20260425150102 > -- > FreeBSD-set-lib32-16.snap20260424143247 >         FreeBSD-libcompiler_rt-dev-lib32-16.snap20260425150102 > -- > FreeBSD-toolchain-16.snap20260430194422 >         FreeBSD-clang-16.snap20260430194422 (libprivatellvm.so.21) >         /usr/bin/llvm-ar >         /usr/bin/llvm-nm >         /usr/bin/llvm-ranlib >         /usr/bin/llvm-size > FreeBSD-toolchain-dbg-16.snap20260430194422 >         /usr/lib/debug/usr/bin/llvm-ar.debug >         /usr/lib/debug/usr/bin/llvm-nm.debug >         /usr/lib/debug/usr/bin/llvm-size.debug > > > That should at least give an idea, even if it might be incomplete. > > > -- > === > Mark Millard > marklmi at yahoo.com > > > > -- > Nuno Teixeira > FreeBSD UNIX:     Web:  https://FreeBSD.org > -- === Mark Millard marklmi at yahoo.com From nobody Mon May 4 21:58:00 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8b9p1V6Dz6cZHQ for ; Mon, 04 May 2026 21:58: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 4g8b9n6Z4Lz3ppJ for ; Mon, 04 May 2026 21:58:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777931885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/QWG2jhZah9lUwRtqOp12kZl8WkQnBtGw+GRXjxwXEc=; b=Fi/RLRsBY5YtHJpXnKQXiRU0onge/JmW6Zji31PWXtI6119dphi6heU53B75Ow8NYt5ZH9 PIT3yYJt32kECjiRbehxRs22Mycl86bjj06j1afLgo/0W4T33pdfdkdVAWrM0DtV9zMJXN qURlQeQ2xpnq0lJ4OY009vA5Lf7HSHBVQ4ndFBBXSDZ0zk2/19D0VT3DuSjJsFdaXW2TJx 4uKma43iOs/zb5Njuu/V6HItdXA7DqlOjo8QgSWmpJpqVwCTXx7l24Uf4n4tVLr6gorTix dlrP1KpTFufAk5LFCtc5bWmDeQTmxZQ0uXUqG6A6OZb99zOo61fbvOM5meI+aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777931885; a=rsa-sha256; cv=none; b=CU6ozGDuc3vWWpHfsY60NsjgJjM1e0fVqKnimHOtX7KVGAedMQ1WnTZyaLM4vXOrLH65ds AYKAY+gu0wzvb+NVCAvYSMzGZVXzehIn+lXEDCM3hrOoWklcRJFZtTCV39H2mFY/AJfFMZ +1mdQD8uX462DVfYhfVfDh6A4zariPNugjRH1JWpybfoRs63aP/iShzUrOIQOZizOrSVjZ W1rHDViqEmqVuY7bSid+5EGJ1oPwOpEme9Kj/T7qQ3W0f0wKIlUCy0DdPycoaTr21Ed0zG 8lHnBqdfE5jDe59hwpNpaOS5/4exo8FDVxFRVdBpw3QQtzrg3NhUO9MQpOYNcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777931885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/QWG2jhZah9lUwRtqOp12kZl8WkQnBtGw+GRXjxwXEc=; b=JHIR9irWxXSlQXIoLBq135HEZQBrMGeyYqOyahHplsq97mb3460xqFVnAVWKoJrYvKRqZI HnLUcD5zbLqn+32wgt2Ji8Pas+vbncKm1AphTuOaaoFKhGzK13R/7781HLfTH3yKRumiGT 402L4jOtkjJkKFgWp5tMLoIXvDNmc3xIWuir+OWxY67gnZC/p9kKs2RFRzjKffYHiwgDNj 8lgwtTqJ5o5hqTjDGo6ewqQU0aPtz5jgvctoBQCLLcSzWxKg88s5gc0izIg1y05iLoaGgb tU/cIoBXzdo6RZ53Fj4wKzsCzugG1yEUryLQocz40KPokO5OrcnHaqQP+DjuaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8b9n5thczdwJ for ; Mon, 04 May 2026 21:58:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e4a7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 04 May 2026 21:58:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Chuck Tuffli Subject: git: eb3b1302382b - vendor/smart - vendor branch created List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/vendor/smart X-Git-Reftype: branch X-Git-Commit: eb3b1302382b1d0cbe37eeebabfcdd546aa2fc4e X-Git-Oldrev: 0000000000000000000000000000000000000000 X-Git-Newrev: eb3b1302382b1d0cbe37eeebabfcdd546aa2fc4e Auto-Submitted: auto-generated Date: Mon, 04 May 2026 21:58:00 +0000 Message-Id: <69f91668.1e4a7.57abbaaf@gitrepo.freebsd.org> The branch vendor/smart has been created by chuck: URL: https://cgit.FreeBSD.org/src/log/?id=eb3b1302382b eb3b1302382b Import smart revision 1.0.2 From nobody Tue May 5 00:05:37 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8f131Vg2z6cmhT for ; Tue, 05 May 2026 00:05: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 4g8f130mBGz42fN for ; Tue, 05 May 2026 00:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777939543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HPgaMzkmKmYoAWzRfiqtDbS8/L6YGBXbG4RdCfqIuxM=; b=teC6d7h0e90yn9+0KfEcb0bUBvH6P0mhFS7zyDJot+8za3XoKlzQfHbi030CdBvQ4Jtf5A hxNT0cZZErZ7+9DWXr8m5Ctyk/4uI3TBAIGPysrH5d7dYsYtyTN7Lty/HKOf6IRHZ4ePrE b/qK3wTGzWYT1lmhUo1SNFf1ceMprOErQ9csjNbn6J/JfuS0Nqc5e+Ez6MfNwkoaTCNSb4 EHn1Fcwhtidwl4tlHZahhD5LvPsi4OB8I9L6kOuJewT+A+KjBQbYCPt91IK31FXXYWyKBd 7UFymRfg+H5aCIk4IbYb+ZLsYwJFKgrw/TMoTsqq0hPl/jtU8xHZOQVtNMIEMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777939543; a=rsa-sha256; cv=none; b=kYnVrTu1k2bwS9xgYm+Yq7biMpNUzRmErDPaEoG1yPwSTLxbfVb/fq4mI7WyuhlhLsVqfB j7NLIXnh10u/jo5FuiwIWoau8OobJubFA4N0ixjd8tFEK1++kOyUC9uvIlQynu6sK+huGc oGwkoSn2Wo4zFGZCA23I7WOTH7laa0KYI1r9XQcC6U3VNuWKfwSDUSWL00NWYVoBF1d/WW 2aTBO7ngPNogAbBA0Bls6jlAsi+eLrviV7BNjR0lQteq1iKdaQmiaA2pXNskKQrZXFCrjF PrHylj+MFrESSmOtocYjD2Nef2mWuBRk3ZP6p1IVCUG0Gg7nwU40gx8+u6CRZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777939543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HPgaMzkmKmYoAWzRfiqtDbS8/L6YGBXbG4RdCfqIuxM=; b=J5NC8h/6TpKsbL3+JNZ1/DXecSjLzglaYk8sdR/Ke6VkMU/C8YI7QFcOcWWP+i4z3ddVnC PAvh+sR9/1qPhVaVTNrD6Envo2DshLIszDW97Wmn4itGHFTpb1qiiDVpIOr9HsIma+uA3a WWLtqCG4eA9qRnbd+FVJqFXQwlJSVuUemV6oBAbqCLLGpR+d6H67LEWB8g01ZekW3e/GVF PFDehdLcxAyo1I4yuUw+WOrshS9nFVIED1UxMfBTkOYmKgiMSZroT9prPdkKeEydMyytWf knsq5M8pGcmFu/OnkuE9fq+LskkADoCwnkchfEp/MUv7tbp0rWom00b4/+KlIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8f130Hrrzj7P for ; Tue, 05 May 2026 00:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33c96 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 00:05:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 03e9e83f3586 - main - nfs_nfsdserv.c: Clip number of callback slots List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03e9e83f358678bab5e4c1ddf9c9d8faa7183cbb Auto-Submitted: auto-generated Date: Tue, 05 May 2026 00:05:37 +0000 Message-Id: <69f93451.33c96.2c15b11d@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=03e9e83f358678bab5e4c1ddf9c9d8faa7183cbb commit 03e9e83f358678bab5e4c1ddf9c9d8faa7183cbb Author: Rick Macklem AuthorDate: 2026-05-05 00:04:00 +0000 Commit: Rick Macklem CommitDate: 2026-05-05 00:04:00 +0000 nfs_nfsdserv.c: Clip number of callback slots The client tells the server how many callback slots it can handle in the callback session. However, the NFSv4.1/4.2 server can only handle a maximum of NFSV4_SLOTS slots. This patch clips the client's value to that, to avoid using too high a slot# for a callback. Fortunately, I do not know of an extant client that specifies a value greater than NFSV4_SLOTS, so this patch is not really needed, as yet. Also, the client rarely uses a slot# above 0 when doing callbacks. MFC after: 2 weeks --- sys/fs/nfsserver/nfs_nfsdserv.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 855d018e72d2..ad0f495bbd69 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -4869,6 +4869,14 @@ nfsrvd_createsession(struct nfsrv_descript *nd, __unused int isdgram, *tl++ = txdr_unsigned(sep->sess_cbsess.nfsess_foreslots); *tl++ = txdr_unsigned(1); *tl = txdr_unsigned(0); /* No RDMA. */ + /* + * Although the client accepts slot#s up to + * sess_cbsess.nfsess_foreslots, the server can only use + * a maximum of NFSV4_SLOTS, so clip it to avoid ever using + * too high a slot. + */ + if (sep->sess_cbsess.nfsess_foreslots > NFSV4_SLOTS) + sep->sess_cbsess.nfsess_foreslots = NFSV4_SLOTS; } nfsmout: if (nd->nd_repstat != 0 && sep != NULL) From nobody Tue May 5 01:21:34 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8ghZ2Sb4z6ctqN for ; Tue, 05 May 2026 01:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8ghZ1J0Nz4Cch for ; Tue, 05 May 2026 01:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777944094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8//T+VaHqhczEYMX6uVuENe8UBEUqvLztIoGlFF3vY4=; b=smpLt6tyxjR+WRKmR0uXV+jsxW8A7z2dvhS//sR5RojJ7MlvX6bsGmtGnihfzaZ4IatOam 3icmwCV7ZgtPUJ8yYdnB8aXX4JPId3DB6a8N5V3Q8Gc1YoiCQBh04fX6aQz8LvP0D+1qg6 p61/8aWYHbxQV+NwzYEKc3GRbdubAaB20Yj+OrH9oIOV6OVUDYFYmikHEU5i61lMBJi1RO e5PdUrgVV9G8qRX8ru+tWwNzePglL9gIPqFS65zi4VqabWLg9A4X7XPEa+2jwl1LADVO4N vnG24nK41lbrW7sXH09A3sfZEOn2ejv7jfMGHnHqHdAtAWtvigVvYhwd8Cw87A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777944094; a=rsa-sha256; cv=none; b=rgvigQLZvIs2jut8yXb+pyfFuIeZdXboCapVXQPUSHFLNiu+KXh5fzR65QSbMNx13NjAbo jk/VcmW9qN3bmXfHgbMbZuvvdjOffuIHj/0gUlgsEG7YKUTYlUYP4/Hc4U5GXUl8645XqL Zv2hmHIevbaewhdNVko0UWdxvg+u6o0OBj7Jc2iFelwsf/65zwqZoW0m0ysH9xrMz9laUV Bd8DC3IU7TWg/2Y2XsQzVFhJoNOZx6fY1qVejx6bBOvcZ49sCcczuYAsDAybyE6mYbUuzJ dDWK3X8wAPQSXpSM9TOKJvqjFsjwFodGX6vm5u4DiajM5D3i6bE6+y3PYQfAeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777944094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8//T+VaHqhczEYMX6uVuENe8UBEUqvLztIoGlFF3vY4=; b=uxSwXUPRjU2HbJNef7YcAB7eu7nUZedug05YApRP2wTDP0o3erI+m2AlFyR5xakcNS4pY9 qUYEB5LdRCrORYCIy9si3BWI2FmI7gaQIsGeDWf7DFy4ylNneSPnVDN1zFp/23pNThQWcV elmhQOmUmgC0nIXdBchI42lC8GrjUySsFnXm2WTc/TBHQSxfLZToyvUrn6qwaFirTkaycX 6VPw2LyqH5tI9M45PSiewFVX9u1+ZS1Ue9ouLz5Da+7ylw0oRmG0lZkJ6BSvPiexr2DvGL +WRFA/0MW8lefbhtyxz5c9CB3UHiBFTCjpj/eYuwce+I5PDQBCPOtP8NHLEoGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8ghZ0hdzzlwD for ; Tue, 05 May 2026 01:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ca3e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 01:21:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 8e8d87856241 - main - packages: Make create-sets.sh more robust during release List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e8d87856241f69c277dc5fab48c5c66312475d6 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 01:21:34 +0000 Message-Id: <69f9461e.3ca3e.480fc28@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=8e8d87856241f69c277dc5fab48c5c66312475d6 commit 8e8d87856241f69c277dc5fab48c5c66312475d6 Author: Lexi Winter AuthorDate: 2026-05-05 00:31:20 +0000 Commit: Lexi Winter CommitDate: 2026-05-05 00:32:34 +0000 packages: Make create-sets.sh more robust during release Commit d1c176fedfc9 made create-sets.sh exit when it encounters an error, instead of creating an empty repository. However, this turns out to cause some issues: 1. A package not having any sets is considered an error, but during the release build, we stuff a 'pkg' package into the repository which doesn't have any sets, which causes a failure. Avoid this by simply ignoring the pkg package. 2. No error was printed in this case, which made the problem hard to diagnose. Add an explicit error message. 3. A similar problem occurred running on a repository which already contained sets, which is not usually done during the build, but is not necessarly an inappropriate thing to do. Fix this one by ignoring set packages when looking for sets. While here, fix another issue that might cause packages to be wrongly skipped if the path to the repository contains a '-' character, since we didn't strip the path before testing the package name. PR: 294966 Fixes: d1c176fedfc9 ("packages: Make create-sets.sh more robust") MFC after: 2 weeks Reported by: Alastair Hogge Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56792 --- release/packages/create-sets.sh | 52 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 4 deletions(-) diff --git a/release/packages/create-sets.sh b/release/packages/create-sets.sh index 3dfd8f1a3388..88d4020d8413 100755 --- a/release/packages/create-sets.sh +++ b/release/packages/create-sets.sh @@ -35,17 +35,61 @@ repodir="$1"; shift # generate-set-ucl.lua. UCL_VARS="$@" +# Extract PKG_NAME_PREFIX so we can use it later. +PKG_NAME_PREFIX="" +set -- $UCL_VARS +while [ -n "$1" ]; do + case "$1" in + PKG_NAME_PREFIX) + shift + PKG_NAME_PREFIX="$1" + break;; + *) + shift; shift;; + esac +done +if [ -z "$PKG_NAME_PREFIX" ]; then + printf >&2 '%s: PKG_NAME_PREFIX must be specified\n' "$0" + exit 1 +fi + # Nothing is explicitly added to set-base, so it wouldn't get built unless # we list it here. SETS="base base-dbg base-jail base-jail-dbg" for pkg in "$repodir"/*.pkg; do - # If the package name doesn't containing a '-', then it's - # probably data.pkg or packagesite.pkg, which are not real - # packages. - { echo "$pkg" | grep -q '-'; } || continue + # Check if we should process this package. + case "${pkg##*/}" in + # When building release, we add a 'pkg' package to the repository, + # but this isn't a base package and doesn't have a set. To avoid + # this causing an error, skip it. + pkg-*) continue;; + + # Any existing set packages may also have no sets (and even if they + # do, they shouldn't be included here). + ${PKG_NAME_PREFIX}-set-*) + continue;; + + # If the package name contains a '-', process it. All "real" + # packages contain a '-', because the package filename format + # is -.pkg, so this skips files which aren't + # really packages, like data.pkg or packagesite.pkg. + # + *-*) ;; + *) continue;; + esac + + # Print a useful error message instead of failing silently if + # grep doesn't find any sets here. + set +e _tmp="$(${PKG_CMD} query -F "$pkg" '%At %n %Av' | grep '^set ')" + if [ -z "$_tmp" ]; then + printf >&2 '%s: package has no sets: %s\n' "$0" "$pkg" + exit 1 + fi + set -e + set -- $_tmp pkgname="$2" sets="$(echo "$3" | tr , ' ')" From nobody Tue May 5 04:21:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8lhc17sTz6dBq2 for ; Tue, 05 May 2026 04:21:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8lhb6nzLz3GFN for ; Tue, 05 May 2026 04:21:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777954912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M32RaCLva6dzgELnJ17K0C5nyLufvKf6e1cIlb9Uc2Q=; b=Ge++5u91pfiKX+0xBs6hKXv8U2Ve+JMJNlZySb1tX7uq/bYfpSEspuy6j1Iq1SxM1axYxi Tf9cixylHzxLcQszNNOGfgNYQAHzvMQtdcwtodz2P4tYOX7qHeVcfFc31GkhVuHJuEeFHv SoFxKDFHQkGrdHJGX5jYkDJMY8/PMSTPCwaVbL2+oEmGGKybnEMM9aziIyfhxiU3QbZAAw P1JXXpEQCZ7pH9+35UZQKxvX4ZOrUX5p3clUWKB9QaEcPZl+67RCjtahsC3IHLxA2aTA4Z uj3Cnsw+O7m6+NUAaqECBrnrQi5Af6kvVV/zYfb5VPzK3QYwfw0BWkSgtOTGyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777954912; a=rsa-sha256; cv=none; b=BoAzxhu2QY8gNp4c0lF3f2ETUQ16ePOqpyzTJBS/+jhXsRYu7DQx/NcENgjB4Oz/HvNN63 eBYChJZbEqNqCLsVg3nTmo2IAc6LC7nHi25UrOsCKJFlDj4O0sfUt7HDRJtNuSSSc3p4DW NLnQovd9/3nZfifZZqaLQnKfWR6EoeZDicNwIqSevH0CidE3PkDaaFIG0hiF1Bfv9fxIVc nEIsXFz4YQyRmF4rTIp3o+SdMP7Yvox9CofrQNiEYEQunjpnN/kLn0Cm1BXYs66Wt0fPKp fXQUPiAuYdgKfrZnNroGxVCk4X+4rNHZ2AXSL6WCNXfJWJydNTuNGKRUpCjlTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777954912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M32RaCLva6dzgELnJ17K0C5nyLufvKf6e1cIlb9Uc2Q=; b=cSbo3eS+8mXSLSG2CJZdt8+s2tS928Mty6n7R4jTase1izL+LQ87e3n9jp+e46V2gMFj8r 280lq9s8rlwdYknk+ai/QEFKsEd8WYMYMkeLAOK4FA7UEIUDEZQe83zvpcW2zN+sNGQnHu NfpDjGvxfWtNIr9NvIta0tvH7ChFhoI+rcggJQrQqz9Zw6GhQ/xldj/m1TdPRy5M1Gnbhu Xm0cKU1gSr9IDftMUrLKLZGWtARd7cFKtFARsgdWdOKvI00tTjN+16ecSO1lzHTIENOBL7 SjQHT8zHJH+QZYvL3IAona/YkKt6i6UtS448a/qy08S6xuGl+cZZWt2pRtsB4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8lhb6Jqzzrq6 for ; Tue, 05 May 2026 04:21:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3096a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 04:21:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 89b97931d6d4 - main - bsdinstall: Always use pkg.FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89b97931d6d415d7a2504d8ea2c99beafd77cf24 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 04:21:51 +0000 Message-Id: <69f9705f.3096a.42ac7292@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=89b97931d6d415d7a2504d8ea2c99beafd77cf24 commit 89b97931d6d415d7a2504d8ea2c99beafd77cf24 Author: Colin Percival AuthorDate: 2026-05-05 02:43:59 +0000 Commit: Colin Percival CommitDate: 2026-05-05 04:21:27 +0000 bsdinstall: Always use pkg.FreeBSD.org The FreeBSD-base bits are accessible via pkg.FreeBSD.org, even for releases, so there is no need to point at pkgbase.FreeBSD.org. MFC after: 3 days --- usr.sbin/bsdinstall/FreeBSD-base.conf.in | 2 +- usr.sbin/bsdinstall/Makefile | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bsdinstall/FreeBSD-base.conf.in b/usr.sbin/bsdinstall/FreeBSD-base.conf.in index 86ec8fabe253..13c94bbb8a64 100644 --- a/usr.sbin/bsdinstall/FreeBSD-base.conf.in +++ b/usr.sbin/bsdinstall/FreeBSD-base.conf.in @@ -1,5 +1,5 @@ FreeBSD-base: { - url: "pkg+https://%%PKGHOST%%.FreeBSD.org/${ABI}/%%SUBURL%%", + url: "pkg+https://pkg.FreeBSD.org/${ABI}/%%SUBURL%%", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/%%KEYSDIR%%", diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index a576f2d0794e..f796a8710c5b 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -21,26 +21,22 @@ _REVISION!= ${MAKE} -C ${SRCTOP}/release -V REVISION REVISION?= ${_REVISION} .if ${BRANCH} == CURRENT || ${BRANCH} == STABLE -PKGHOST= pkg KEYSDIR= pkg SUBURL= base_latest .elif ${BRANCH} == RELEASE -PKGHOST= pkgbase KEYSDIR= pkgbase-${REVISION:C/\.[0-9]+//} SUBURL= base_release_${REVISION:C/[0-9]+\.//} .elif ${BRANCH:C/[0-9]+$//} == BETA || \ ${BRANCH:C/[0-9]+$//} == RC -PKGHOST= pkgbase KEYSDIR= pkgbase-${REVISION:C/\.[0-9]+//} SUBURL= base_release_${REVISION:C/[0-9]+\.//}_${BRANCH:tl} .else .warning Invalid branch "${BRANCH}" -PKGHOST= pkg KEYSDIR= pkg SUBURL= base_latest .endif FreeBSD-base.conf: FreeBSD-base.conf.in - sed "s|%%PKGHOST%%|${PKGHOST}|;s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET} + sed "s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET} .include From nobody Tue May 5 06:06:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8p1F4C0tz6dLX3 for ; Tue, 05 May 2026 06:06: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 4g8p1F21lhz3RMM for ; Tue, 05 May 2026 06:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777961185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jz7pCGDLcxHX/RuMdw7W9/NwKfWgNljp8iMOG/f3+n0=; b=WUgrwGepejdO5zx2CJ9LL5YZwpwSblZBQh24ELW0M/g14r2SpoJpSUDCJBc65lzteccdSO Da2B+wxHuhaXmSGEW44mN7MYkKCSzrR/JNk+hOxPsMoGUThhGR//crmzouBkfEYDFY4AZk 2mX5fLdeqkiWTiqRESJadaFLwZWqunIAyVGgbbyvdRI+fGpPz/H36nkaDllle/tVhI6SNK qAHs8VS/OZha1uBh1tSfOd8ke688ZVLmYj3/oO/bZg5a1H2DDS7Uyy7cbM0ovvW0tzHShl 9xP5sEmig2kshTxHGeeOG42sxKBEoyLy487UB4vMxTfs3MvNxy+HWhCfD4j3NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777961185; a=rsa-sha256; cv=none; b=LVpykTCsLwDMz5RiwO8tBwjhj+E+98XjFHRipReBms7yR0g9FsUGr04vvih264c+T3ORTA HEjDHYXLrXA0FNzX8cdKYmZR8DqZclccKz/3PBtOHXDKPEPZpRFXoZTOBhFA06CN/hYOe3 nsoJfiSTp6blZknhMKC+R5VS2Tt+D789YweV7bjWq0j7n0Pr4iMeISbU+zgXlzr9SLjRTW GvhabLGxJ4I4rU5qhEqD48b6UIM1SHBJ9t8LufUp7RlcKQxeeevVQUC5ER+txD7suIlzlY RFRfXbT/2KfsEzfmsN3z76JrDTPZExzXcMaW78BrYTfmKmB6b7SFyGL1MZGyLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777961185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jz7pCGDLcxHX/RuMdw7W9/NwKfWgNljp8iMOG/f3+n0=; b=oqd15q60UywXcA4xtCs17f0azKjOwJyzFPqJk9fo3JibAIKAMOqutKtgrNmi0Zyrm+yYv7 PQvu5WBetnYQkrFU+GuNfcHO0FtbeKhsaccFlHpnZx5tj18RhotJKM0pdZoh0q83EPTqwT nGgj3e18Y+NiQhgl7x3q6IRNRS/sI7047ni3acWUILA5A/rk7LYybaAC1eTWNiz1TPS5+5 DDcuN520dzkfxuBSDZniJds4rbmpbfSfR4ZnB5rbYKBWL5beyAtEcJZHB/Y7tO0gPpn1Rx tX+ep3LfUXu8m3xAVFtkKzoCdALt4KE9dqUIOW/wpHDeJyYxUU8pd4CBzpYjAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8p1F1ZsMzvS7 for ; Tue, 05 May 2026 06:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3adf4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 06:06:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 6f84579ae4d1 - main - nfs_pub: move from vfs_subr.c to vfs_export.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f84579ae4d107635e32fc3fcfc34669adc7b3f5 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 06:06:19 +0000 Message-Id: <69f988db.3adf4.6d8cba37@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=6f84579ae4d107635e32fc3fcfc34669adc7b3f5 commit 6f84579ae4d107635e32fc3fcfc34669adc7b3f5 Author: Ryan Libby AuthorDate: 2026-05-05 05:55:11 +0000 Commit: Ryan Libby CommitDate: 2026-05-05 05:55:11 +0000 nfs_pub: move from vfs_subr.c to vfs_export.c nfs_pub is used only in vfs_export.c. Reviewed by: kib, rmacklem Differential Revision: https://reviews.freebsd.org/D56777 --- sys/kern/vfs_export.c | 3 +++ sys/kern/vfs_subr.c | 3 --- sys/sys/mount.h | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index bd7caa01e153..566dd3d8770d 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -62,6 +62,9 @@ #include #include +/* Publicly exported FS */ +static struct nfs_public nfs_pub; + static MALLOC_DEFINE(M_NETADDR, "export_host", "Export host address structure"); #if defined(INET) || defined(INET6) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 58975f7ac932..823ccc6cab71 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -237,9 +237,6 @@ static struct mtx mntid_mtx; */ static struct mtx __exclusive_cache_line vnode_list_mtx; -/* Publicly exported FS */ -struct nfs_public nfs_pub; - static uma_zone_t buf_trie_zone; static smr_t buf_trie_smr; diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 18f85192f6c3..1ca492929813 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -1071,7 +1071,6 @@ int vfs_report_lockf(struct mount *mp, struct sbuf *sb); extern TAILQ_HEAD(mntlist, mount) mountlist; /* mounted filesystem list */ extern struct mtx_padalign mountlist_mtx; -extern struct nfs_public nfs_pub; extern struct sx vfsconf_sx; #define vfsconf_lock() sx_xlock(&vfsconf_sx) #define vfsconf_unlock() sx_xunlock(&vfsconf_sx) From nobody Tue May 5 08:35:20 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8sK42fSLz6Rhsf for ; Tue, 05 May 2026 08:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8sK41yLfz3fwb for ; Tue, 05 May 2026 08:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777970120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9R17gzRVXnEjbcwUurAsbeO0iYSyIXbhHlOeEUaXFus=; b=Oz/nWkge8fURjOdszv90ILJW51xXtnLq8TJsOHE0KrRFQMvZ6wqfYzB+2i89O5E4LOHnBE eX1/yE+rNhB4RvlAUErXK0sLuYp2n5VpQiJsMtPs3fvP2H9gimw+CXaHNcI3hVRhjZoLCv jX1lnbPr+QqYKhkmN1glF4FggYHTTL0g2HVkdrcayLKDJwcMvl5OVjp5+6WwzhVYhvvecc DORLnVsjt1gfEenvhJ4y060u1JKOPl79UCtku4eyugLzFACHybIBhBYZ7N/wlFISEEedzF VS6UCDaBofayuiM0FtdczDTXJLkClKQHOQJaPhp2zdTrKC5dIov+Q7djeHVcTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777970120; a=rsa-sha256; cv=none; b=TtoO8GugzS2rd4cFiJIblrzFlukVhb2MPffXtcpTZfg0u/2Ew8rSOud2SI2byp+PaRUq3b GO67E6oMxfx8IgF29PB5Sl7zdjOUoJwam5WtobJ2RqH5dqJxNiA1GpF5m/oXnEWjpq9t+9 LKcdC8J5HTj/5fCJ00PoSgz0zsgIOAXhHh/eowCDSB1i7aQ1NYqGPlc9vsjsKQ2RSCpCf3 ov+URaN5GWhuQ07DjVmFT3BxCX8qAaVQ5TTF8bYAGwb1MUjSJNBxGhTLbA78ZbcQJktjxQ PkTd4HXhqSYjZz2OjzL5MzvcqszinJLNAf2ucglOA4IYqRy4jfK5GKZZ2a7kvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777970120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9R17gzRVXnEjbcwUurAsbeO0iYSyIXbhHlOeEUaXFus=; b=b1N1ujeUHbx1WjCAlvLwMB81nK+G4d4C6jf2H4C2Bc24sz3uvGAzcy1dIOjvS/QLz+N07u 21JW16D8UkA/UVaAk/JEhaODRZweyUltGZudri5E6TYheW8UcMvHXNuGzxowOIIUEZEeQ9 N5SaOQVyY9v9ITY//WS2AGl5enDYahORCndCxRypjfAhz8EC7gnBcevVmO2LXPsD/YJfYE IP4Ut1ndH9UdT8LOSkabt6vd961lU2HtwrUbGLMUOmenn9n2qO2oJEN1CB32okLbzxnHxQ 16cO7hZD5JZ9dXwU3w9Vd0DEK9AHANTfio1ol9pZnHmPv2bgBduXMPTOSCdnjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8sK41S9Bz10N4 for ; Tue, 05 May 2026 08:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18ab2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 08:35:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: bf6d00afdb61 - main - pfsync: reject invalid SCTP states List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf6d00afdb6171ba04a1c5a7fde904cde87d212d Auto-Submitted: auto-generated Date: Tue, 05 May 2026 08:35:20 +0000 Message-Id: <69f9abc8.18ab2.14fea4eb@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=bf6d00afdb6171ba04a1c5a7fde904cde87d212d commit bf6d00afdb6171ba04a1c5a7fde904cde87d212d Author: Kristof Provost AuthorDate: 2026-05-04 16:08:35 +0000 Commit: Kristof Provost CommitDate: 2026-05-05 07:45:29 +0000 pfsync: reject invalid SCTP states SCTP states should always have a src scrub object associated with them. Crafted pfsync packets might not have this, leading to us derferencing a NULL pointer on cleanup. Validate the pfsync state insertion packet to make sure this is correct. PR: 294989 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/if_pfsync.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 3edf08aefeb5..a5f377e84307 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -873,6 +873,13 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) (st->act.rtableid >= 0 && st->act.rtableid < rt_numfibs))) goto cleanup; + if (sks->proto == IPPROTO_SCTP && st->src.scrub == NULL) { + if (V_pf_status.debug >= PF_DEBUG_MISC) + printf("%s: invalid SCTP state from creator id: %08x\n", __func__, + ntohl(sp->pfs_1301.creatorid)); + goto cleanup; + } + st->id = sp->pfs_1301.id; st->creatorid = sp->pfs_1301.creatorid; pf_state_peer_ntoh(&sp->pfs_1301.src, &st->src); From nobody Tue May 5 09:33:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8tbx389Hz6bj1n for ; Tue, 05 May 2026 09:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8tbx1Y95z3nBX for ; Tue, 05 May 2026 09:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777973597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CSAtEM3wE9jANtOxxyBay6Z7AWCBIH1IJpUqxU1p3WY=; b=gUzGPdJ2asDqbFnpzJ3vvUS7/qJI4Jhz1eh1TV7dDE4u8b1zmr9wnwLnnjW2j0fbXPdV6/ 2Cl/lOZFPJr2FEUj/P9m2L1PwACUT9+Ta8ODe4a8Klbi+ArJ0yOgcNt+qZ0r2zpaYJAC9w 7ZzULisSCZq90WauOg/tzyyJvwetvkxEt9fXAWEKchicHcW0mwf87OZWPb4l65dG1mVd76 AukoORsmEYvJoycT9/5syxMwfUuquFBXCaLv1OJNGK0vLHHjU/OJfn+W4479hv6J4LUSNJ hmHtfld44h3EVMlJRALBN6Q92Eltj0DPh0ltFuKmiqxHAo1+q/5Q5h88xFQn+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777973597; a=rsa-sha256; cv=none; b=sxsnPSCXXpw7CcQMRpaPWaHrBdlu9UAL+QbmShABcf8ITGNdZ/Rn+5e+PKnQUTsvmZW2H7 fXrErJDAIXaw0sfL9tYbjjHJCadYGDS1TXV1nS9KR7NLVHuGOwru39x5Q5LeIEjJLK8+f1 2fNnsAnbw/Su7b/MBPUe5fppMA/uLk3sTJYhCKrIp4Iwb/NIiIy5KdI7plCm3hIooZ3VoI vEkrjCb8vB+sbGz0lYXd2iAXyMkRWU/ctdMrkeu0zf7Da763pXwY1GZbh8RKyqhcJib4C8 v8dy8UqHCbsZLhEPmUVKpkb7qXTBQFNd8kb6sDOBQkVYAvQst51WaaH2OntKeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777973597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CSAtEM3wE9jANtOxxyBay6Z7AWCBIH1IJpUqxU1p3WY=; b=EYj3CtYoM93XjjfhaaVjYsa8jBpN286Cse370VLHi+Q3kqW+EFP8D5aW5c6WDajbSL7Vj8 NgxzaC3oq348hDtG0zKjoJ9tSRl11glnes7VGR/1k5ZzekmkEifpAgVBTzcp21hHV5kJcO vWG9RtnSFF363QVYleeuvcQG9Q1pabAuPPg9P25SwWefCfRjALuzqPjVh4aTK1YMN6TsLK j2QdEa9yUbxDa6Eaq31kmpo7NHzc5zuR5QqFzFWC3dpjAZqEnXnNnuws49oBY/ETRZbFOl sn7V575RTdKYSK2SzHiG4aDBoRMxr4u8YxguzzSEh3rKxvs2mbT31bBwP/T6/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8tbx19Djz11XL for ; Tue, 05 May 2026 09:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 210a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 09:33:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: dc00f118405e - main - Revert "virtio_net: Use bus_dma for rxq/txq buffers" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc00f118405e8638ceb13b288e14164a8a9ba669 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 09:33:17 +0000 Message-Id: <69f9b95d.210a4.71b90855@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=dc00f118405e8638ceb13b288e14164a8a9ba669 commit dc00f118405e8638ceb13b288e14164a8a9ba669 Author: Andrew Turner AuthorDate: 2026-05-05 09:17:51 +0000 Commit: Andrew Turner CommitDate: 2026-05-05 09:18:14 +0000 Revert "virtio_net: Use bus_dma for rxq/txq buffers" This reverts commit c16c95192f01237a876eb7bc336e3bbda9310171. Revert until we can fix reported issues --- sys/dev/virtio/network/if_vtnet.c | 275 +++-------------------------------- sys/dev/virtio/network/if_vtnetvar.h | 10 -- 2 files changed, 17 insertions(+), 268 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index e88602a44664..ef01833b9e03 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -96,17 +96,6 @@ #define VTNET_ETHER_ALIGN ETHER_ALIGN #endif -/* - * Worst case offset to ensure header doesn't share any cache lines with - * payload. - */ -#define VTNET_RX_BUFFER_HEADER_OFFSET 128 - -struct vtnet_rx_buffer_header { - bus_addr_t addr; - bus_dmamap_t dmap; -}; - static int vtnet_modevent(module_t, int, void *); static int vtnet_probe(device_t); @@ -395,17 +384,6 @@ MODULE_DEPEND(vtnet, netmap, 1, 1, 1); VIRTIO_SIMPLE_PNPINFO(vtnet, VIRTIO_ID_NETWORK, "VirtIO Networking Adapter"); -static struct vtnet_rx_buffer_header * -vtnet_mbuf_to_rx_buffer_header(struct vtnet_softc *sc, struct mbuf *m) -{ - if (VTNET_ETHER_ALIGN != 0 && sc->vtnet_hdr_size % 4 == 0) - return (struct vtnet_rx_buffer_header *)((uintptr_t)m->m_data - - VTNET_RX_BUFFER_HEADER_OFFSET - VTNET_ETHER_ALIGN); - else - return (struct vtnet_rx_buffer_header *)((uintptr_t)m->m_data - - VTNET_RX_BUFFER_HEADER_OFFSET); -} - static int vtnet_modevent(module_t mod __unused, int type, void *unused __unused) { @@ -479,60 +457,6 @@ vtnet_attach(device_t dev) goto fail; } - mtx_init(&sc->vtnet_rx_mtx, device_get_nameunit(dev), - "VirtIO Net RX lock", MTX_DEF); - - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* parent */ - sizeof(uint16_t), /* alignment */ - 0, /* boundary */ - BUS_SPACE_MAXADDR, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - MJUM9BYTES, /* max request size */ - 1, /* max # segments */ - MJUM9BYTES, /* maxsegsize - worst case */ - BUS_DMA_COHERENT, /* flags */ - busdma_lock_mutex, /* lockfunc */ - &sc->vtnet_rx_mtx, /* lockarg */ - &sc->vtnet_rx_dmat); - if (error) { - device_printf(dev, "cannot create bus_dma_tag\n"); - goto fail; - } - - mtx_init(&sc->vtnet_tx_mtx, device_get_nameunit(dev), - "VirtIO Net TX lock", MTX_DEF); - - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* parent */ - sizeof(uint16_t), /* alignment */ - 0, /* boundary */ - BUS_SPACE_MAXADDR, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - sc->vtnet_tx_nsegs * MJUM9BYTES, /* max request size */ - sc->vtnet_tx_nsegs, /* max # segments */ - MJUM9BYTES, /* maxsegsize */ - BUS_DMA_COHERENT, /* flags */ - busdma_lock_mutex, /* lockfunc */ - &sc->vtnet_tx_mtx, /* lockarg */ - &sc->vtnet_tx_dmat); - if (error) { - device_printf(dev, "cannot create bus_dma_tag\n"); - goto fail; - } - -#ifdef __powerpc__ - /* - * Virtio uses physical addresses rather than bus addresses, so we - * need to ask busdma to skip the iommu physical->bus mapping. At - * present, this is only a thing on the powerpc architectures. - */ - bus_dma_tag_set_iommu(sc->vtnet_rx_dmat, NULL, NULL); - bus_dma_tag_set_iommu(sc->vtnet_tx_dmat, NULL, NULL); -#endif - error = vtnet_alloc_rx_filters(sc); if (error) { device_printf(dev, "cannot allocate Rx filters\n"); @@ -1621,11 +1545,6 @@ static struct mbuf * vtnet_rx_alloc_buf(struct vtnet_softc *sc, int nbufs, struct mbuf **m_tailp) { struct mbuf *m_head, *m_tail, *m; - struct vtnet_rx_buffer_header *vthdr; - bus_dma_segment_t segs[1]; - bus_dmamap_t dmap; - int nsegs; - int err; int i, size; m_head = NULL; @@ -1643,43 +1562,13 @@ vtnet_rx_alloc_buf(struct vtnet_softc *sc, int nbufs, struct mbuf **m_tailp) } m->m_len = size; - vthdr = (struct vtnet_rx_buffer_header *)m->m_data; - - /* Reserve space for header */ - m_adj(m, VTNET_RX_BUFFER_HEADER_OFFSET); - /* * Need to offset the mbuf if the header we're going to add * will misalign. */ - if (VTNET_ETHER_ALIGN != 0 && sc->vtnet_hdr_size % 4 == 0) + if (VTNET_ETHER_ALIGN != 0 && sc->vtnet_hdr_size % 4 == 0) { m_adj(m, VTNET_ETHER_ALIGN); - - err = bus_dmamap_create(sc->vtnet_rx_dmat, 0, &dmap); - if (err) { - printf("Failed to create dmamap, err :%d\n", - err); - m_freem(m); - return (NULL); } - - nsegs = 0; - err = bus_dmamap_load_mbuf_sg(sc->vtnet_rx_dmat, dmap, m, segs, - &nsegs, BUS_DMA_NOWAIT); - if (err != 0) { - printf("Failed to map mbuf into DMA visible memory, err: %d\n", - err); - m_freem(m); - bus_dmamap_destroy(sc->vtnet_rx_dmat, dmap); - return (NULL); - } - KASSERT(nsegs == 1, - ("%s: unexpected number of DMA segments for rx buffer: %d", - __func__, nsegs)); - - vthdr->addr = segs[0].ds_addr; - vthdr->dmap = dmap; - if (m_head != NULL) { m_tail->m_next = m; m_tail = m; @@ -1705,7 +1594,7 @@ vtnet_rxq_replace_lro_nomrg_buf(struct vtnet_rxq *rxq, struct mbuf *m0, int len, clustersz, nreplace, error; sc = rxq->vtnrx_sc; - clustersz = sc->vtnet_rx_clustersz - VTNET_RX_BUFFER_HEADER_OFFSET; + clustersz = sc->vtnet_rx_clustersz; /* * Need to offset the mbuf if the header we're going to add will * misalign, account for that here. @@ -1820,12 +1709,9 @@ vtnet_rxq_replace_buf(struct vtnet_rxq *rxq, struct mbuf *m, int len) static int vtnet_rxq_enqueue_buf(struct vtnet_rxq *rxq, struct mbuf *m) { - struct vtnet_rx_buffer_header *hdr; struct vtnet_softc *sc; struct sglist *sg; int header_inlined, error; - bus_addr_t paddr; - struct mbuf *mp; sc = rxq->vtnrx_sc; sg = rxq->vtnrx_sg; @@ -1838,38 +1724,28 @@ vtnet_rxq_enqueue_buf(struct vtnet_rxq *rxq, struct mbuf *m) header_inlined = vtnet_modern(sc) || (sc->vtnet_flags & VTNET_FLAG_MRG_RXBUFS) != 0; /* TODO: ANY_LAYOUT */ - hdr = vtnet_mbuf_to_rx_buffer_header(sc, m); - paddr = hdr->addr; - /* * Note: The mbuf has been already adjusted when we allocate it if we * have to do strict alignment. */ - if (header_inlined) { - error = sglist_append_phys(sg, paddr, m->m_len); - } else { + if (header_inlined) + error = sglist_append_mbuf(sg, m); + else { + struct vtnet_rx_header *rxhdr = + mtod(m, struct vtnet_rx_header *); MPASS(sc->vtnet_hdr_size == sizeof(struct virtio_net_hdr)); /* Append the header and remaining mbuf data. */ - error = sglist_append_phys(sg, paddr, sc->vtnet_hdr_size); + error = sglist_append(sg, &rxhdr->vrh_hdr, sc->vtnet_hdr_size); if (error) return (error); - error = sglist_append_phys(sg, - paddr + sizeof(struct vtnet_rx_header), + error = sglist_append(sg, &rxhdr[1], m->m_len - sizeof(struct vtnet_rx_header)); if (error) return (error); - mp = m->m_next; - while (mp) { - hdr = vtnet_mbuf_to_rx_buffer_header(sc, mp); - paddr = hdr->addr; - error = sglist_append_phys(sg, paddr, mp->m_len); - if (error) - return (error); - - mp = mp->m_next; - } + if (m->m_next != NULL) + error = sglist_append_mbuf(sg, m->m_next); } if (error) @@ -2055,7 +1931,6 @@ vtnet_rxq_merged_eof(struct vtnet_rxq *rxq, struct mbuf *m_head, int nbufs) m_tail = m_head; while (--nbufs > 0) { - struct vtnet_rx_buffer_header *vthdr; struct mbuf *m; uint32_t len; @@ -2065,10 +1940,6 @@ vtnet_rxq_merged_eof(struct vtnet_rxq *rxq, struct mbuf *m_head, int nbufs) goto fail; } - vthdr = vtnet_mbuf_to_rx_buffer_header(sc, m); - bus_dmamap_sync(sc->vtnet_rx_dmat, vthdr->dmap, - BUS_DMASYNC_POSTREAD); - if (vtnet_rxq_new_buf(rxq) != 0) { rxq->vtnrx_stats.vrxs_iqdrops++; vtnet_rxq_discard_buf(rxq, m); @@ -2189,7 +2060,6 @@ static int vtnet_rxq_eof(struct vtnet_rxq *rxq) { struct virtio_net_hdr lhdr, *hdr; - struct vtnet_rx_buffer_header *vthdr; struct vtnet_softc *sc; if_t ifp; struct virtqueue *vq; @@ -2205,31 +2075,14 @@ vtnet_rxq_eof(struct vtnet_rxq *rxq) CURVNET_SET(if_getvnet(ifp)); while (count-- > 0) { - struct mbuf *m, *mp; + struct mbuf *m; uint32_t len, nbufs, adjsz; - uint32_t synced; m = virtqueue_dequeue(vq, &len); if (m == NULL) break; deq++; - mp = m; - - /* - * Sync all mbufs in this packet. There will only be a single - * mbuf unless LRO is in use. - */ - synced = 0; - while (mp && synced < len) { - vthdr = vtnet_mbuf_to_rx_buffer_header(sc, mp); - bus_dmamap_sync(sc->vtnet_rx_dmat, vthdr->dmap, - BUS_DMASYNC_POSTREAD); - - synced += mp->m_len; - mp = mp->m_next; - } - if (len < sc->vtnet_hdr_size + ETHER_HDR_LEN) { rxq->vtnrx_stats.vrxs_ierrors++; vtnet_rxq_discard_buf(rxq, m); @@ -2489,14 +2342,6 @@ vtnet_txq_free_mbufs(struct vtnet_txq *txq) while ((txhdr = virtqueue_drain(vq, &last)) != NULL) { if (kring == NULL) { - bus_dmamap_unload(txq->vtntx_sc->vtnet_tx_dmat, - txhdr->dmap); - bus_dmamap_destroy(txq->vtntx_sc->vtnet_tx_dmat, - txhdr->dmap); - bus_dmamap_unload(txq->vtntx_sc->vtnet_tx_dmat, - txhdr->hdr_dmap); - bus_dmamap_destroy(txq->vtntx_sc->vtnet_tx_dmat, - txhdr->hdr_dmap); m_freem(txhdr->vth_mbuf); uma_zfree(vtnet_tx_header_zone, txhdr); } @@ -2666,36 +2511,15 @@ drop: return (NULL); } -static void -vtnet_txq_enqueue_callback(void *arg, bus_dma_segment_t *segs, - int nsegs, int error) -{ - vm_paddr_t *hdr_paddr; - - if (error != 0) - return; - - KASSERT(nsegs == 1, ("%s: %d segments returned!", __func__, nsegs)); - - hdr_paddr = (vm_paddr_t *)arg; - *hdr_paddr = segs[0].ds_addr; -} - static int vtnet_txq_enqueue_buf(struct vtnet_txq *txq, struct mbuf **m_head, struct vtnet_tx_header *txhdr) { - bus_dma_segment_t segs[VTNET_TX_SEGS_MAX]; - int nsegs; struct vtnet_softc *sc; struct virtqueue *vq; struct sglist *sg; struct mbuf *m; int error; - vm_paddr_t hdr_paddr; - bus_dmamap_t hdr_dmap; - bus_dmamap_t dmap; - int i; sc = txq->vtntx_sc; vq = txq->vtntx_vq; @@ -2703,55 +2527,15 @@ vtnet_txq_enqueue_buf(struct vtnet_txq *txq, struct mbuf **m_head, m = *m_head; sglist_reset(sg); - - error = bus_dmamap_create(sc->vtnet_tx_dmat, 0, &hdr_dmap); - if (error) - goto fail; - - error = bus_dmamap_load(sc->vtnet_tx_dmat, hdr_dmap, &txhdr->vth_uhdr, - sc->vtnet_hdr_size, vtnet_txq_enqueue_callback, &hdr_paddr, - BUS_DMA_NOWAIT); - if (error) - goto fail_hdr_dmamap_destroy; - - error = sglist_append_phys(sg, hdr_paddr, sc->vtnet_hdr_size); + error = sglist_append(sg, &txhdr->vth_uhdr, sc->vtnet_hdr_size); if (error != 0 || sg->sg_nseg != 1) { KASSERT(0, ("%s: cannot add header to sglist error %d nseg %d", __func__, error, sg->sg_nseg)); - goto fail_hdr_dmamap_unload; + goto fail; } - bus_dmamap_sync(sc->vtnet_tx_dmat, hdr_dmap, BUS_DMASYNC_PREWRITE); - - error = bus_dmamap_create(sc->vtnet_tx_dmat, 0, &dmap); - if (error) - goto fail_hdr_dmamap_unload; - - nsegs = 0; - error = bus_dmamap_load_mbuf_sg(sc->vtnet_tx_dmat, dmap, m, segs, - &nsegs, BUS_DMA_NOWAIT); - if (error != 0) - goto fail_dmamap_destroy; - KASSERT(nsegs <= sc->vtnet_tx_nsegs, - ("%s: unexpected number of DMA segments for tx buffer: %d (max %d)", - __func__, nsegs, sc->vtnet_tx_nsegs)); - - bus_dmamap_sync(sc->vtnet_tx_dmat, dmap, BUS_DMASYNC_PREWRITE); - - for (i = 0; i < nsegs && !error; i++) - error = sglist_append_phys(sg, segs[i].ds_addr, segs[i].ds_len); - + error = sglist_append_mbuf(sg, m); if (error) { - sglist_reset(sg); - bus_dmamap_unload(sc->vtnet_tx_dmat, dmap); - - error = sglist_append_phys(sg, hdr_paddr, sc->vtnet_hdr_size); - if (error != 0 || sg->sg_nseg != 1) { - KASSERT(0, ("%s: cannot add header to sglist error %d nseg %d", - __func__, error, sg->sg_nseg)); - goto fail_dmamap_destroy; - } - m = m_defrag(m, M_NOWAIT); if (m == NULL) { sc->vtnet_stats.tx_defrag_failed++; @@ -2761,41 +2545,16 @@ vtnet_txq_enqueue_buf(struct vtnet_txq *txq, struct mbuf **m_head, *m_head = m; sc->vtnet_stats.tx_defragged++; - nsegs = 0; - error = bus_dmamap_load_mbuf_sg(sc->vtnet_tx_dmat, dmap, m, - segs, &nsegs, BUS_DMA_NOWAIT); - if (error != 0) - goto fail_dmamap_destroy; - KASSERT(nsegs <= sc->vtnet_tx_nsegs, - ("%s: unexpected number of DMA segments for tx buffer: %d (max %d)", - __func__, nsegs, sc->vtnet_tx_nsegs)); - - bus_dmamap_sync(sc->vtnet_tx_dmat, dmap, BUS_DMASYNC_PREWRITE); - - for (i = 0; i < nsegs && !error; i++) - error = sglist_append_phys(sg, segs[i].ds_addr, - segs[i].ds_len); - + error = sglist_append_mbuf(sg, m); if (error) - goto fail_dmamap_unload; + goto fail; } txhdr->vth_mbuf = m; - txhdr->dmap = dmap; - txhdr->hdr_dmap = hdr_dmap; - error = virtqueue_enqueue(vq, txhdr, sg, sg->sg_nseg, 0); return (error); -fail_dmamap_unload: - bus_dmamap_unload(sc->vtnet_tx_dmat, dmap); -fail_dmamap_destroy: - bus_dmamap_destroy(sc->vtnet_tx_dmat, dmap); -fail_hdr_dmamap_unload: - bus_dmamap_unload(sc->vtnet_tx_dmat, hdr_dmap); -fail_hdr_dmamap_destroy: - bus_dmamap_destroy(sc->vtnet_tx_dmat, hdr_dmap); fail: m_freem(*m_head); *m_head = NULL; diff --git a/sys/dev/virtio/network/if_vtnetvar.h b/sys/dev/virtio/network/if_vtnetvar.h index 6cafe827d733..eb5e6784b07f 100644 --- a/sys/dev/virtio/network/if_vtnetvar.h +++ b/sys/dev/virtio/network/if_vtnetvar.h @@ -190,12 +190,6 @@ struct vtnet_softc { struct mtx vtnet_mtx; char vtnet_mtx_name[16]; uint8_t vtnet_hwaddr[ETHER_ADDR_LEN]; - - bus_dma_tag_t vtnet_rx_dmat; - struct mtx vtnet_rx_mtx; - - bus_dma_tag_t vtnet_tx_dmat; - struct mtx vtnet_tx_mtx; }; /* vtnet flag descriptions for use with printf(9) %b identifier. */ #define VTNET_FLAGS_BITS \ @@ -279,10 +273,6 @@ struct vtnet_tx_header { } vth_uhdr; struct mbuf *vth_mbuf; - - bus_dmamap_t dmap; - - bus_dmamap_t hdr_dmap; }; /* From nobody Tue May 5 09:33:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g8tc20Z1Rz6bj1w for ; Tue, 05 May 2026 09:33:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g8tc11hcqz3nWS for ; Tue, 05 May 2026 09:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777973601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tZn5I8TfBH7RUkNMW3axKnO55d6/A5FEh7Q+ReVJgtg=; b=iKRSIVZlsHsyRih4kmsn534vN7hcEk4/cFXyYBmbz2qhdKGyrMsY9UDexyIi7LhmYhitr0 8+H126TQGV4BcH3QqtmnsxhE5zUtBoc6HU9XfBwlKTUEF4F1azwychT2arz51nInKcYlkU PxBSnwC/OziDNDYceVCBZuH4jVJc8/NwAr29fXPMHwMpUy3rK3AunWawUGT2FKK+fVLloN lDelr454cV8ksmdT7DvYyiaSMygqFKSTKAkui9QAPDTeIpLeyKFia1FDnPWFii0U9oG2Z7 6AHclj2nny8tYvvu2DatS/A3rhlzgZG02TfAevJakdFdlREEi6Uk6g5XzgYB2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777973601; a=rsa-sha256; cv=none; b=vpQI6XVCYz9I9yjCuGvBPELxrk+F/ceEqYWfEGRUDpkJGo2QE+pNzLhjT42b0u4tu+aun9 PsxmhEyPa+V1GOaRMQTrxhf+75GGJHkBWDuYNvrqjNxjmjs4/4PB7hMj7kK6wcBIRkmZif N/xyh7F4cYSmogmThxAh70y/7EBKootDqJooMkOUgZYCA0LhdR3UKCQbj8EqUNtlS5geb7 5G+8wLiWH1mnIEzNTiOiY72cX2BkAndtQDi01TsYfDcev7c+v1jOQjX18a4aO0fhBqN+ZX IK11a4rgUVOMXk0yHuXxHKK4L8rgxtd8pjUKznEWIDgCGgi+EvShRSU9q/20rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777973601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tZn5I8TfBH7RUkNMW3axKnO55d6/A5FEh7Q+ReVJgtg=; b=hp92a+xjifFKWdylfksgClTZI6sBA0UlEdFsWxUqzAPV/u+MlMJ+Rm1tV+qcsl9Zb+A5ib CFH0Rd/3zSKosKpjhJ1LNuT6W/6Lse1RmS2njFeW4qiyccBWS9SVFXduV9caMlJtuqpEDV SoTsdog7GhPzhPBOC5YZisj47XjkLF1L8e7FoI/iyVZk/KV7bjKtwpe+5QWjeVCbOyvRgT xKJ6CoIZsTo6FvWR768DighGpq+t/vMdXZFkm2vE+9HOxPVPDg7PLfy1LYLhjm0c2ZZMOH s+ujj8iYpQFSVjAlOD20NuGu1aFb2rWaZAyEbMx9f6DgUU7F0wwILQIslp1+RQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8tc115sHz11jB for ; Tue, 05 May 2026 09:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2111e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 09:33:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: c8167ebb742c - main - Revert "virtio_net: Use bus_dma for command/ack buffers" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8167ebb742c36cb1fc32cc543afb4016b4fc174 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 09:33:16 +0000 Message-Id: <69f9b95c.2111e.46bab85c@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c8167ebb742c36cb1fc32cc543afb4016b4fc174 commit c8167ebb742c36cb1fc32cc543afb4016b4fc174 Author: Andrew Turner AuthorDate: 2026-05-05 09:16:23 +0000 Commit: Andrew Turner CommitDate: 2026-05-05 09:18:14 +0000 Revert "virtio_net: Use bus_dma for command/ack buffers" This reverts commit b5bad6df467cc95bea641afe674c55cd5b9f1510. Revert until we can fix reported issues --- sys/dev/virtio/network/if_vtnet.c | 336 ++++++----------------------------- sys/dev/virtio/network/if_vtnetvar.h | 6 - 2 files changed, 58 insertions(+), 284 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 40792482672c..e88602a44664 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -219,7 +219,7 @@ static void vtnet_init_locked(struct vtnet_softc *, int); static void vtnet_init(void *); static void vtnet_free_ctrl_vq(struct vtnet_softc *); -static int vtnet_exec_ctrl_cmd(struct vtnet_softc *, uint8_t *, +static void vtnet_exec_ctrl_cmd(struct vtnet_softc *, void *, struct sglist *, int, int); static int vtnet_ctrl_mac_cmd(struct vtnet_softc *, uint8_t *); static int vtnet_ctrl_guest_offloads(struct vtnet_softc *, uint64_t); @@ -523,50 +523,6 @@ vtnet_attach(device_t dev) goto fail; } - mtx_init(&sc->vtnet_hdr_mtx, device_get_nameunit(dev), - "VirtIO Net header lock", MTX_DEF); - - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* parent */ - sizeof(uint16_t), /* alignment */ - 0, /* boundary */ - BUS_SPACE_MAXADDR, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - PAGE_SIZE, /* max request size */ - 1, /* max # segments */ - PAGE_SIZE, /* maxsegsize */ - BUS_DMA_COHERENT, /* flags */ - busdma_lock_mutex, /* lockfunc */ - &sc->vtnet_hdr_mtx, /* lockarg */ - &sc->vtnet_hdr_dmat); - if (error) { - device_printf(dev, "cannot create bus_dma_tag\n"); - goto fail; - } - - mtx_init(&sc->vtnet_ack_mtx, device_get_nameunit(dev), - "VirtIO Net ACK lock", MTX_DEF); - - error = bus_dma_tag_create( - bus_get_dma_tag(dev), /* parent */ - sizeof(uint8_t), /* alignment */ - 0, /* boundary */ - BUS_SPACE_MAXADDR, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - sizeof(uint8_t), /* max request size */ - 1, /* max # segments */ - sizeof(uint8_t), /* maxsegsize */ - BUS_DMA_COHERENT, /* flags */ - busdma_lock_mutex, /* lockfunc */ - &sc->vtnet_ack_mtx, /* lockarg */ - &sc->vtnet_ack_dmat); - if (error) { - device_printf(dev, "cannot create bus_dma_tag\n"); - goto fail; - } - #ifdef __powerpc__ /* * Virtio uses physical addresses rather than bus addresses, so we @@ -575,8 +531,6 @@ vtnet_attach(device_t dev) */ bus_dma_tag_set_iommu(sc->vtnet_rx_dmat, NULL, NULL); bus_dma_tag_set_iommu(sc->vtnet_tx_dmat, NULL, NULL); - bus_dma_tag_set_iommu(sc->vtnet_hdr_dmat, NULL, NULL); - bus_dma_tag_set_iommu(sc->vtnet_ack_dmat, NULL, NULL); #endif error = vtnet_alloc_rx_filters(sc); @@ -3797,43 +3751,10 @@ vtnet_free_ctrl_vq(struct vtnet_softc *sc) } static void -vtnet_load_callback(void *arg, bus_dma_segment_t *segs, int nsegs, - int error) +vtnet_exec_ctrl_cmd(struct vtnet_softc *sc, void *cookie, + struct sglist *sg, int readable, int writable) { - bus_addr_t *paddr; - - if (error != 0) - return; - - KASSERT(nsegs == 1, ("%s: %d segments returned!", __func__, nsegs)); - - paddr = (bus_addr_t *)arg; - *paddr = segs[0].ds_addr; -} - -static int -vtnet_exec_ctrl_cmd(struct vtnet_softc *sc, uint8_t *ack, struct sglist *sg, - int readable, int writable) -{ - bus_dmamap_t ack_dmap; - bus_addr_t ack_paddr; struct virtqueue *vq; - int error; - - error = bus_dmamap_create(sc->vtnet_ack_dmat, 0, &ack_dmap); - if (error) - goto error_out; - - error = bus_dmamap_load(sc->vtnet_ack_dmat, ack_dmap, ack, - sizeof(uint8_t), vtnet_load_callback, &ack_paddr, BUS_DMA_NOWAIT); - if (error) - goto error_destroy; - - bus_dmamap_sync(sc->vtnet_ack_dmat, ack_dmap, BUS_DMASYNC_PREWRITE); - - error = sglist_append_phys(sg, ack_paddr, sizeof(uint8_t)); - if (error) - goto error_unload; vq = sc->vtnet_ctrl_vq; @@ -3841,237 +3762,152 @@ vtnet_exec_ctrl_cmd(struct vtnet_softc *sc, uint8_t *ack, struct sglist *sg, VTNET_CORE_LOCK_ASSERT(sc); if (!virtqueue_empty(vq)) - goto error_unload; + return; /* * Poll for the response, but the command is likely completed before * returning from the notify. */ - if (virtqueue_enqueue(vq, (void *)ack, sg, readable, writable) == 0) { + if (virtqueue_enqueue(vq, cookie, sg, readable, writable) == 0) { virtqueue_notify(vq); virtqueue_poll(vq, NULL); } - - bus_dmamap_sync(sc->vtnet_ack_dmat, ack_dmap, BUS_DMASYNC_POSTREAD); - -error_unload: - bus_dmamap_unload(sc->vtnet_ack_dmat, ack_dmap); -error_destroy: - bus_dmamap_destroy(sc->vtnet_ack_dmat, ack_dmap); -error_out: - return (error); } static int vtnet_ctrl_mac_cmd(struct vtnet_softc *sc, uint8_t *hwaddr) { struct sglist_seg segs[3]; - bus_dmamap_t hdr_dmap; - bus_addr_t hdr_paddr; struct sglist sg; struct { struct virtio_net_ctrl_hdr hdr __aligned(2); uint8_t pad1; uint8_t addr[ETHER_ADDR_LEN] __aligned(8); uint8_t pad2; + uint8_t ack; } s; - uint8_t ack; int error; - error = bus_dmamap_create(sc->vtnet_hdr_dmat, 0, &hdr_dmap); - if (error) - goto error_out; - - error = bus_dmamap_load(sc->vtnet_hdr_dmat, hdr_dmap, &s, - sizeof(s), vtnet_load_callback, &hdr_paddr, BUS_DMA_NOWAIT); - if (error) - goto error_destroy_hdr; - + error = 0; MPASS(sc->vtnet_flags & VTNET_FLAG_CTRL_MAC); s.hdr.class = VIRTIO_NET_CTRL_MAC; s.hdr.cmd = VIRTIO_NET_CTRL_MAC_ADDR_SET; bcopy(hwaddr, &s.addr[0], ETHER_ADDR_LEN); - ack = VIRTIO_NET_ERR; - bus_dmamap_sync(sc->vtnet_hdr_dmat, hdr_dmap, BUS_DMASYNC_PREWRITE); + s.ack = VIRTIO_NET_ERR; sglist_init(&sg, nitems(segs), segs); - error |= sglist_append_phys(&sg, hdr_paddr, - sizeof(struct virtio_net_ctrl_hdr)); - error |= sglist_append_phys(&sg, - hdr_paddr + ((uintptr_t)&s.addr - (uintptr_t)&s), - ETHER_ADDR_LEN); - MPASS(error == 0 && sg.sg_nseg == nitems(segs) - 1); + error |= sglist_append(&sg, &s.hdr, sizeof(struct virtio_net_ctrl_hdr)); + error |= sglist_append(&sg, &s.addr[0], ETHER_ADDR_LEN); + error |= sglist_append(&sg, &s.ack, sizeof(uint8_t)); + MPASS(error == 0 && sg.sg_nseg == nitems(segs)); if (error == 0) - error = vtnet_exec_ctrl_cmd(sc, &ack, &sg, sg.sg_nseg, 1); - if (error == 0) - error = (ack == VIRTIO_NET_OK ? 0 : EIO); + vtnet_exec_ctrl_cmd(sc, &s.ack, &sg, sg.sg_nseg - 1, 1); - bus_dmamap_unload(sc->vtnet_hdr_dmat, hdr_dmap); -error_destroy_hdr: - bus_dmamap_destroy(sc->vtnet_hdr_dmat, hdr_dmap); -error_out: - return (error); + return (s.ack == VIRTIO_NET_OK ? 0 : EIO); } static int vtnet_ctrl_guest_offloads(struct vtnet_softc *sc, uint64_t offloads) { struct sglist_seg segs[3]; - bus_dmamap_t hdr_dmap; - bus_addr_t hdr_paddr; struct sglist sg; struct { struct virtio_net_ctrl_hdr hdr __aligned(2); uint8_t pad1; uint64_t offloads __aligned(8); uint8_t pad2; + uint8_t ack; } s; - uint8_t ack; int error; - error = bus_dmamap_create(sc->vtnet_hdr_dmat, 0, &hdr_dmap); - if (error) - goto error_out; - - error = bus_dmamap_load(sc->vtnet_hdr_dmat, hdr_dmap, &s, - sizeof(s), vtnet_load_callback, &hdr_paddr, BUS_DMA_NOWAIT); - if (error) - goto error_destroy_hdr; - + error = 0; MPASS(sc->vtnet_features & VIRTIO_NET_F_CTRL_GUEST_OFFLOADS); s.hdr.class = VIRTIO_NET_CTRL_GUEST_OFFLOADS; s.hdr.cmd = VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET; s.offloads = vtnet_gtoh64(sc, offloads); - ack = VIRTIO_NET_ERR; - bus_dmamap_sync(sc->vtnet_hdr_dmat, hdr_dmap, BUS_DMASYNC_PREWRITE); + s.ack = VIRTIO_NET_ERR; sglist_init(&sg, nitems(segs), segs); - error |= sglist_append_phys(&sg, hdr_paddr, - sizeof(struct virtio_net_ctrl_hdr)); - error |= sglist_append_phys(&sg, - hdr_paddr + ((uintptr_t)&s.offloads - (uintptr_t)&s), - sizeof(uint64_t)); - MPASS(error == 0 && sg.sg_nseg == nitems(segs) - 1); + error |= sglist_append(&sg, &s.hdr, sizeof(struct virtio_net_ctrl_hdr)); + error |= sglist_append(&sg, &s.offloads, sizeof(uint64_t)); + error |= sglist_append(&sg, &s.ack, sizeof(uint8_t)); + MPASS(error == 0 && sg.sg_nseg == nitems(segs)); if (error == 0) - error = vtnet_exec_ctrl_cmd(sc, &ack, &sg, sg.sg_nseg, 1); - if (error == 0) - error = (ack == VIRTIO_NET_OK ? 0 : EIO); + vtnet_exec_ctrl_cmd(sc, &s.ack, &sg, sg.sg_nseg - 1, 1); - bus_dmamap_unload(sc->vtnet_hdr_dmat, hdr_dmap); -error_destroy_hdr: - bus_dmamap_destroy(sc->vtnet_hdr_dmat, hdr_dmap); -error_out: - return (error); + return (s.ack == VIRTIO_NET_OK ? 0 : EIO); } static int vtnet_ctrl_mq_cmd(struct vtnet_softc *sc, uint16_t npairs) { struct sglist_seg segs[3]; - bus_dmamap_t hdr_dmap; - bus_addr_t hdr_paddr; struct sglist sg; struct { struct virtio_net_ctrl_hdr hdr __aligned(2); uint8_t pad1; struct virtio_net_ctrl_mq mq __aligned(2); uint8_t pad2; + uint8_t ack; } s; - uint8_t ack; int error; - error = bus_dmamap_create(sc->vtnet_hdr_dmat, 0, &hdr_dmap); - if (error) - goto error_out; - - error = bus_dmamap_load(sc->vtnet_hdr_dmat, hdr_dmap, &s, - sizeof(s), vtnet_load_callback, &hdr_paddr, BUS_DMA_NOWAIT); - if (error) - goto error_destroy_hdr; - + error = 0; MPASS(sc->vtnet_flags & VTNET_FLAG_MQ); s.hdr.class = VIRTIO_NET_CTRL_MQ; s.hdr.cmd = VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET; s.mq.virtqueue_pairs = vtnet_gtoh16(sc, npairs); - ack = VIRTIO_NET_ERR; - bus_dmamap_sync(sc->vtnet_hdr_dmat, hdr_dmap, BUS_DMASYNC_PREWRITE); + s.ack = VIRTIO_NET_ERR; sglist_init(&sg, nitems(segs), segs); - error |= sglist_append_phys(&sg, hdr_paddr, - sizeof(struct virtio_net_ctrl_hdr)); - error |= sglist_append_phys(&sg, - hdr_paddr + ((uintptr_t)&s.mq - (uintptr_t)&s), - sizeof(struct virtio_net_ctrl_mq)); - MPASS(error == 0 && sg.sg_nseg == nitems(segs) - 1); + error |= sglist_append(&sg, &s.hdr, sizeof(struct virtio_net_ctrl_hdr)); + error |= sglist_append(&sg, &s.mq, sizeof(struct virtio_net_ctrl_mq)); + error |= sglist_append(&sg, &s.ack, sizeof(uint8_t)); + MPASS(error == 0 && sg.sg_nseg == nitems(segs)); if (error == 0) - error = vtnet_exec_ctrl_cmd(sc, &ack, &sg, sg.sg_nseg, 1); - if (error == 0) - error = (ack == VIRTIO_NET_OK ? 0 : EIO); + vtnet_exec_ctrl_cmd(sc, &s.ack, &sg, sg.sg_nseg - 1, 1); - bus_dmamap_unload(sc->vtnet_hdr_dmat, hdr_dmap); -error_destroy_hdr: - bus_dmamap_destroy(sc->vtnet_hdr_dmat, hdr_dmap); -error_out: - return (error); + return (s.ack == VIRTIO_NET_OK ? 0 : EIO); } static int vtnet_ctrl_rx_cmd(struct vtnet_softc *sc, uint8_t cmd, bool on) { struct sglist_seg segs[3]; - bus_dmamap_t hdr_dmap; - bus_addr_t hdr_paddr; struct sglist sg; struct { struct virtio_net_ctrl_hdr hdr __aligned(2); uint8_t pad1; uint8_t onoff; uint8_t pad2; + uint8_t ack; } s; - uint8_t ack; int error; - error = bus_dmamap_create(sc->vtnet_hdr_dmat, 0, &hdr_dmap); - if (error) - goto error_out; - - error = bus_dmamap_load(sc->vtnet_hdr_dmat, hdr_dmap, &s, - sizeof(s), vtnet_load_callback, &hdr_paddr, BUS_DMA_NOWAIT); - if (error) - goto error_destroy_hdr; - + error = 0; MPASS(sc->vtnet_flags & VTNET_FLAG_CTRL_RX); s.hdr.class = VIRTIO_NET_CTRL_RX; s.hdr.cmd = cmd; s.onoff = on; - ack = VIRTIO_NET_ERR; - bus_dmamap_sync(sc->vtnet_hdr_dmat, hdr_dmap, BUS_DMASYNC_PREWRITE); + s.ack = VIRTIO_NET_ERR; sglist_init(&sg, nitems(segs), segs); - error |= sglist_append_phys(&sg, hdr_paddr, - sizeof(struct virtio_net_ctrl_hdr)); - error |= sglist_append_phys(&sg, - hdr_paddr + ((uintptr_t)&s.onoff - (uintptr_t)&s), - sizeof(uint8_t)); - MPASS(error == 0 && sg.sg_nseg == nitems(segs) - 1); + error |= sglist_append(&sg, &s.hdr, sizeof(struct virtio_net_ctrl_hdr)); + error |= sglist_append(&sg, &s.onoff, sizeof(uint8_t)); + error |= sglist_append(&sg, &s.ack, sizeof(uint8_t)); + MPASS(error == 0 && sg.sg_nseg == nitems(segs)); if (error == 0) - error = vtnet_exec_ctrl_cmd(sc, &ack, &sg, sg.sg_nseg, 1); - if (error == 0) - error = (ack == VIRTIO_NET_OK ? 0 : EIO); + vtnet_exec_ctrl_cmd(sc, &s.ack, &sg, sg.sg_nseg - 1, 1); - bus_dmamap_unload(sc->vtnet_hdr_dmat, hdr_dmap); -error_destroy_hdr: - bus_dmamap_destroy(sc->vtnet_hdr_dmat, hdr_dmap); -error_out: - return (error); + return (s.ack == VIRTIO_NET_OK ? 0 : EIO); } static int @@ -4142,10 +3978,6 @@ vtnet_rx_filter_mac(struct vtnet_softc *sc) struct virtio_net_ctrl_hdr hdr __aligned(2); struct vtnet_mac_filter *filter; struct sglist_seg segs[4]; - bus_dmamap_t filter_dmap; - bus_addr_t filter_paddr; - bus_dmamap_t hdr_dmap; - bus_addr_t hdr_paddr; struct sglist sg; if_t ifp; bool promisc, allmulti; @@ -4185,25 +4017,6 @@ vtnet_rx_filter_mac(struct vtnet_softc *sc) if (promisc && allmulti) goto out; - error = bus_dmamap_create(sc->vtnet_hdr_dmat, 0, &hdr_dmap); - if (error) - goto out_error; - - error = bus_dmamap_load(sc->vtnet_hdr_dmat, hdr_dmap, &hdr, - sizeof(hdr), vtnet_load_callback, &hdr_paddr, BUS_DMA_NOWAIT); - if (error) - goto out_destroy_hdr; - - error = bus_dmamap_create(sc->vtnet_hdr_dmat, 0, &filter_dmap); - if (error) - goto out_unload_hdr; - - error = bus_dmamap_load(sc->vtnet_hdr_dmat, hdr_dmap, filter, - sizeof(*filter), vtnet_load_callback, &filter_paddr, - BUS_DMA_NOWAIT); - if (error) - goto out_destroy_filter; - filter->vmf_unicast.nentries = vtnet_gtoh32(sc, ucnt); filter->vmf_multicast.nentries = vtnet_gtoh32(sc, mcnt); @@ -4212,33 +4025,19 @@ vtnet_rx_filter_mac(struct vtnet_softc *sc) ack = VIRTIO_NET_ERR; sglist_init(&sg, nitems(segs), segs); - error |= sglist_append_phys(&sg, hdr_paddr, - sizeof(struct virtio_net_ctrl_hdr)); - error |= sglist_append_phys(&sg, - filter_paddr + ((uintptr_t)&filter->vmf_unicast - - (uintptr_t)filter), + error |= sglist_append(&sg, &hdr, sizeof(struct virtio_net_ctrl_hdr)); + error |= sglist_append(&sg, &filter->vmf_unicast, sizeof(uint32_t) + ucnt * ETHER_ADDR_LEN); - error |= sglist_append_phys(&sg, - filter_paddr + ((uintptr_t)&filter->vmf_multicast - - (uintptr_t)filter), + error |= sglist_append(&sg, &filter->vmf_multicast, sizeof(uint32_t) + mcnt * ETHER_ADDR_LEN); - MPASS(error == 0 && sg.sg_nseg == nitems(segs) - 1); + error |= sglist_append(&sg, &ack, sizeof(uint8_t)); + MPASS(error == 0 && sg.sg_nseg == nitems(segs)); if (error == 0) - error = vtnet_exec_ctrl_cmd(sc, &ack, &sg, sg.sg_nseg, 1); - if (error == 0) - error = (ack == VIRTIO_NET_OK ? 0 : EIO); - - bus_dmamap_unload(sc->vtnet_hdr_dmat, filter_dmap); -out_destroy_filter: - bus_dmamap_destroy(sc->vtnet_hdr_dmat, filter_dmap); -out_unload_hdr: - bus_dmamap_unload(sc->vtnet_hdr_dmat, hdr_dmap); -out_destroy_hdr: - bus_dmamap_destroy(sc->vtnet_hdr_dmat, hdr_dmap); -out_error: - if (error != 0) + vtnet_exec_ctrl_cmd(sc, &ack, &sg, sg.sg_nseg - 1, 1); + if (ack != VIRTIO_NET_OK) if_printf(ifp, "error setting host MAC filter table\n"); + out: if (promisc && vtnet_set_promisc(sc, true) != 0) if_printf(ifp, "cannot enable promiscuous mode\n"); @@ -4250,53 +4049,34 @@ static int vtnet_exec_vlan_filter(struct vtnet_softc *sc, int add, uint16_t tag) { struct sglist_seg segs[3]; - bus_dmamap_t hdr_dmap; - bus_addr_t hdr_paddr; struct sglist sg; struct { struct virtio_net_ctrl_hdr hdr __aligned(2); uint8_t pad1; uint16_t tag __aligned(2); uint8_t pad2; + uint8_t ack; } s; - uint8_t ack; int error; - error = bus_dmamap_create(sc->vtnet_hdr_dmat, 0, &hdr_dmap); - if (error) - goto error_out; - - error = bus_dmamap_load(sc->vtnet_hdr_dmat, hdr_dmap, &s, - sizeof(s), vtnet_load_callback, &hdr_paddr, BUS_DMA_NOWAIT); - if (error) - goto error_destroy_hdr; - + error = 0; MPASS(sc->vtnet_flags & VTNET_FLAG_VLAN_FILTER); s.hdr.class = VIRTIO_NET_CTRL_VLAN; s.hdr.cmd = add ? VIRTIO_NET_CTRL_VLAN_ADD : VIRTIO_NET_CTRL_VLAN_DEL; s.tag = vtnet_gtoh16(sc, tag); - ack = VIRTIO_NET_ERR; - bus_dmamap_sync(sc->vtnet_hdr_dmat, hdr_dmap, BUS_DMASYNC_PREWRITE); + s.ack = VIRTIO_NET_ERR; sglist_init(&sg, nitems(segs), segs); - error |= sglist_append_phys(&sg, hdr_paddr, - sizeof(struct virtio_net_ctrl_hdr)); - error |= sglist_append_phys(&sg, - hdr_paddr + ((uintptr_t)&s.tag - (uintptr_t)&s), - sizeof(uint16_t)); - MPASS(error == 0 && sg.sg_nseg == nitems(segs) - 1); + error |= sglist_append(&sg, &s.hdr, sizeof(struct virtio_net_ctrl_hdr)); + error |= sglist_append(&sg, &s.tag, sizeof(uint16_t)); + error |= sglist_append(&sg, &s.ack, sizeof(uint8_t)); + MPASS(error == 0 && sg.sg_nseg == nitems(segs)); if (error == 0) - error = vtnet_exec_ctrl_cmd(sc, &ack, &sg, sg.sg_nseg, 1); - if (error == 0) - error = (ack == VIRTIO_NET_OK ? 0 : EIO); + vtnet_exec_ctrl_cmd(sc, &s.ack, &sg, sg.sg_nseg - 1, 1); - bus_dmamap_unload(sc->vtnet_hdr_dmat, hdr_dmap); -error_destroy_hdr: - bus_dmamap_destroy(sc->vtnet_hdr_dmat, hdr_dmap); -error_out: - return (error); + return (s.ack == VIRTIO_NET_OK ? 0 : EIO); } static void diff --git a/sys/dev/virtio/network/if_vtnetvar.h b/sys/dev/virtio/network/if_vtnetvar.h index e445bdf6d6cb..6cafe827d733 100644 --- a/sys/dev/virtio/network/if_vtnetvar.h +++ b/sys/dev/virtio/network/if_vtnetvar.h @@ -196,12 +196,6 @@ struct vtnet_softc { bus_dma_tag_t vtnet_tx_dmat; struct mtx vtnet_tx_mtx; - - bus_dma_tag_t vtnet_hdr_dmat; - struct mtx vtnet_hdr_mtx; - - bus_dma_tag_t vtnet_ack_dmat; - struct mtx vtnet_ack_mtx; }; /* vtnet flag descriptions for use with printf(9) %b identifier. */ #define VTNET_FLAGS_BITS \ From nobody Tue May 5 13:41:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g905t20bvz6c7GQ for ; Tue, 05 May 2026 13:41:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g905t00qlz3MPs for ; Tue, 05 May 2026 13:41:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777988466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DDICFmOAKbGJMebl9e0mqBBfMn0Y67uMEaxyrDZ9YEY=; b=gwLnLwKX6LSpss/xq/ZKE/ymXDItTijtWBXQyfklHt46cQRher7XfxYic73PMV+J5gG67y d0XHmuBULZ5pepoIxoEHE4cYfwuVCfCPo/XQVnXLXXOxFAzmeriidJ29bK1VtifNDRVC3Q /zwHhdA1UwHUC5+YA4oQV62hZjjzvkk03TszyaKbZlEA3MA6Df+/Q6y10MHHGArhn6sZ7n qg72tPCLqiR6rpw5E/LHlwlAyybMdZst8pRovBDY9VnvpeJk6XKJsE7cMzm8YhhFhf5FJv JXaDvYYQXlOISI73UD0Kfmn1uNkL7u3rg/Yjfv+aLUYLFYbhNgqpGGojm3MvZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777988466; a=rsa-sha256; cv=none; b=VT8F50AXgMpSe0M9s0CnvRzcN40AgjFzaf98oG8qo1NPkwsqcZdN+8P356LCVF8uJAkFhC kOh6BhXyeYaSnhLvSfSQp4j6+ifVEeJwuLVD44m9BbECY8kndc4TowUJuHA/CPeUE/dNH3 EwmroVYcyM8FaVwAvim+CFTTz+dZNf9s8nxPBI7QLqf+OOM/1ugdrJDlX3M3a40fpc3WNf cmreoowFnGKuul4/M6z6wap/3yOIa9VS+zrIXZg5asT5zXVT7X3lRvsihdKxqIEibwwrBX 5Utu+fu0vnPv0PPZN6DUM6sLP5/ysNffYfbPwB3cksnKVyt/VFV43oZAgw5wiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777988466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DDICFmOAKbGJMebl9e0mqBBfMn0Y67uMEaxyrDZ9YEY=; b=XinlraB2lHvBXCTh4/QDWsQMNtc8+/ZdOxAPyPV1Oi+jB62ZjYb7RjMcautOTMO4LMuAbl fgg9Ni5EBapVqdsqbuYWTq2aan1R/C11TJkBVgsqcsoNZRKftCzIFFOAQD+ZRrIwYimEtn c529SzLzJ1JrBzKneifnEXU4ibyErYXweONlgjr4UayVGYt3UonNoYa45enWlV2a1VUOqQ ewVCOz7MP5Q3Wu1ji12NYbs+LGd2FHHSswmRpDMV4Coz8uxuc0y6yMWNy7+1eo8hhIkkfu ZpPb59apnn80kIEIB6v4W9HViDk9deDsg9EIJvbqyZ0L1dJdsmG0QLKrBaA4oA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g905s6VGxz18P7 for ; Tue, 05 May 2026 13:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4348c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 13:41:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 9f2ad7c09709 - main - init: allow to specify a custom path for rc(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f2ad7c09709e01ff6b856df0315e91ddc20df32 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 13:41:05 +0000 Message-Id: <69f9f371.4348c.7e92a692@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=9f2ad7c09709e01ff6b856df0315e91ddc20df32 commit 9f2ad7c09709e01ff6b856df0315e91ddc20df32 Author: Baptiste Daroussin AuthorDate: 2026-05-05 12:00:41 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-05 13:39:58 +0000 init: allow to specify a custom path for rc(8) This is useful for testing alternative service managers without modifying /etc/rc MFC After: 1 weeks Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56828 --- sbin/init/init.8 | 10 +++++++++- sbin/init/init.c | 18 +++++++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/sbin/init/init.8 b/sbin/init/init.8 index 85b1db2ddf06..f562efde0b51 100644 --- a/sbin/init/init.8 +++ b/sbin/init/init.8 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 22, 2021 +.Dd May 5, 2026 .Dt INIT 8 .Os .Sh NAME @@ -396,6 +396,14 @@ back to the default, so that the .Pa /etc/rc script is executed with the standard shell .Pa /bin/sh . +.It Va init_rc +If set to a valid file name in the root file system, +overrides the default path to +.Xr rc 8 +.Pq Pa /etc/rc . +This is useful for testing alternative service managers +without modifying the default +.Pa /etc/rc . .It Va init_path Specifies the path used to search for the init binary. More than one binary can be listed in the string, diff --git a/sbin/init/init.c b/sbin/init/init.c index d28501053c7f..db680c7f73bd 100644 --- a/sbin/init/init.c +++ b/sbin/init/init.c @@ -1025,11 +1025,23 @@ static state_func_t runcom(void) { state_func_t next_transition; + char runcom_path[PATH_MAX]; + const char *rc_script; - BOOTTRACE("/etc/rc starting..."); - if ((next_transition = run_script(_PATH_RUNCOM)) != NULL) + /* + * Allow overriding /etc/rc via the init_rc kenv variable. + * This is useful for testing alternative service managers + * without modifying /etc/rc. + */ + if (kenv(KENV_GET, "init_rc", runcom_path, sizeof(runcom_path)) > 0) + rc_script = runcom_path; + else + rc_script = _PATH_RUNCOM; + + BOOTTRACE("%s starting...", rc_script); + if ((next_transition = run_script(rc_script)) != NULL) return next_transition; - BOOTTRACE("/etc/rc finished"); + BOOTTRACE("%s finished", rc_script); runcom_mode = AUTOBOOT; /* the default */ return (state_func_t) read_ttys; From nobody Tue May 5 15:05:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g91zP6s4Hz6cGMt for ; Tue, 05 May 2026 15:05: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 4g91zP4T0xz3fTj for ; Tue, 05 May 2026 15:05:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777993537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QnIQfWW5BQADNhgqZvcJCeivcCv0KvgBoKwouVPDIMQ=; b=YVSdRXWPkIhZv2Y3PFaVGdErWzG59kBTG5gT2xTS81lFH+ZI9Ra0Ee9B4zjI3+IFDqtp1R 1XI6YlK0p3A7FTJk4XflbqjVZqOSYfVjEnH57nrV/N0coCx+iRIvZGFK1wi0jX3Z6rcDQ7 5qVHo+LbtZxicoGTgCsMslNrssXO0G2iMfvIWMRmiWxy/uD6kD+gxQGEc6PTSS80a8ykQG j0PSV4w76b9d7dII7AHGWapp9EZBs1bc9m5IigFHaWit1s6Q5VTEoMmD/U55Wf+i80h7Yf XzhzwOwURFeUzov1znzfCyxtqtpUDRqrNnFOmcOQvNVNMhleeBBxcqqR8zRBrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777993537; a=rsa-sha256; cv=none; b=Vg/lg+VsJOwr+0wPWcXgObiAum/JrwR6/39J1XtEJkKkWm8DDhtGfjfRhjWK1PuErLBRYe rwRejQMMyh9igIc+jhP0bdh5gKYv4B86XQ1iZaait9L40WoKtRyr9SbiGXfxF6xsaGSiYC Fau/dGv9Lo9YA5rI9eMy9uDxnIi8XKAcqbR7lgkN/WICZ0S4uOys9AwqDyUq3vqXu5tkk6 CxFxVwZYZ6D0qB5MyR9XRsFV/D/EFDV1WL1ToV8NZ9BoZx7Ls/d9XGFRNIPQrwVuJ5aTCF ipbKGRhihKO568kxmRJJ8fXDcKhJN2DDvWRn/TApvXj8lAH2+3J/t2hVaIUpbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777993537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QnIQfWW5BQADNhgqZvcJCeivcCv0KvgBoKwouVPDIMQ=; b=E2JnPNxDTEyKpbBOjGGry31T2sw92yiKk18YtUT7HbhohsMNlKWub2XvTa5J5mWWSlW/KF XuW7ARTsQFkTX+P2BrsC3SxalPVTfr9yIiA2lVHwKyOUhz1CIuow1sUUCglGm29snH/4m8 oCJrRJB5+KM/l3jikWMLH4ecc2Ec+aougiQ0uzXfsCn2i5i74eJd7Hl0bbbK/dSYU+PXf9 ojugzIWCUfwJTb2GvWGgFkB/gZjJ3JpPhL3m1heccl1Z0moVxhuUbuk3cGtRxalLGWBifi 7kRdeOtso2YQJVYDh0438xRXo+Y5F/NXepoyuvFVin6tRx+9j6sG4UgLXYuYzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g91zP3p4Gz1Bbp for ; Tue, 05 May 2026 15:05:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a07f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 15:05:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 5f901e157aaf - releng/15.1 - libifconfig: Skip bridge VLAN config for span members List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 5f901e157aafa6ed4550fe39dbc121f7668459b7 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 15:05:32 +0000 Message-Id: <69fa073c.1a07f.e12a530@gitrepo.freebsd.org> The branch releng/15.1 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=5f901e157aafa6ed4550fe39dbc121f7668459b7 commit 5f901e157aafa6ed4550fe39dbc121f7668459b7 Author: Lexi Winter AuthorDate: 2026-04-29 03:11:20 +0000 Commit: Lexi Winter CommitDate: 2026-05-05 15:03:45 +0000 libifconfig: Skip bridge VLAN config for span members bridge(4) doesn't support BRDGGIFVLANSET for span members, which means if a span interface is configured, libifconfig will fail to fetch bridge members. Skip this for IFBIF_SPAN members. PR: 292634 MFC after: 3 days Reported by: Emrion Reviewed by: pouria, zlei Approved by: re (cperciva) Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56694 (cherry picked from commit 454322c08b8aa181939c8d920472f03cfd591032) (cherry picked from commit 0a919e2a9265b5cdaeb2c5d51c29791b4eb7335c) --- lib/libifconfig/libifconfig_bridge.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libifconfig/libifconfig_bridge.c b/lib/libifconfig/libifconfig_bridge.c index 675bf5dd2ff5..2bb2952aeef2 100644 --- a/lib/libifconfig/libifconfig_bridge.c +++ b/lib/libifconfig/libifconfig_bridge.c @@ -139,6 +139,11 @@ ifconfig_bridge_get_bridge_status(ifconfig_handle_t *h, } for (size_t i = 0; i < bridge->inner.members_count; ++i) { struct ifbif_vlan_req vreq; + + /* Skip VLAN config for span members */ + if (bridge->inner.members[i].ifbr_ifsflags & IFBIF_SPAN) + continue; + memset(&vreq, 0, sizeof(vreq)); strlcpy(vreq.bv_ifname, bridge->inner.members[i].ifbr_ifsname, sizeof(vreq.bv_ifname)); From nobody Tue May 5 15:23:04 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g92Md26v5z6cHV9 for ; Tue, 05 May 2026 15:23: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 4g92Md1Tmpz3jS5 for ; Tue, 05 May 2026 15:23:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777994589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o8GjDI3ZCe4hyBsInjd2g2AEqFdoQk/vboaElId5ZTc=; b=kBnKSFJHrSlYAup7jHIEQMlyyl+FZA0mNB1ZZ8OnRckSOlW/CWiDaVm5ustf4HRxN/74MS IpkPUVJ1T18CQAePJ9/4qFLOMMOBSK0MInodQqR2XAHIzsZOn/55vWD4aPtTessJ8/3UnY cWh8wNWuP6KzSQreu9qwS3W7CmoaYUOBGJJrlSfly275L0Biy86RWYmdK/eaucEBwoe71L Wdyjyk9ZB81zfWugoetleeI6ywx4THnuMauXqVNwOn8xlPBpDSsZ5VVxnjdJorVsKr1E8Y J5U92JH0tGDQZZBXDlfLdrA7TmoOug1ulWxo6MjBMFlQIWn8uK+4Q9HjKObynQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777994589; a=rsa-sha256; cv=none; b=KS+VP6HxGOuDNlK+JAYTp1lmG2PyXOw0l9XBHyMEO3RF64hRS/RkRLItoZbZLJTgLkfGBc VrFFeDyWOC5FzAsIIhNlz/fYdWCNy07NUqwTQJwQwxR9LT6HCki7loMFvNS5r7BTkCG3tj B/C7vxihWUbux1FWqa+dgDUv1F7h0lBt4i1iMD12BakZaclOgDT5Ej+DUnUlSesUnpdkCj jFef2plWZMPFJHDFfWvP1cO97FOq/Sx/SrYJwjT8oqnQ0WhDOenattc8opW3c8gCMZ2fak Ayv1DpGB6LxNKYqZtJYv16dPha4GlbjEvU7/YFEs3iugSxYQzbnhlXio/0XIrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777994589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o8GjDI3ZCe4hyBsInjd2g2AEqFdoQk/vboaElId5ZTc=; b=GqAVMtBUs/J3NzSKuyDLfLkikdnZ+5w3wMfQbZ3gT0wND94Ef8O9w3fMrkVT+XjbubEPKE tZ21uCxD+mO6k7Y1gAoAo6GLsuvwRH7SYgHauZ9OJxvjIw9f/BrRppHD3gbGakck2pSGEj /P2WvrEsKLTUli7jSfGHrQ3m3teGsozqnURN9uxaW1jvEX/JDDbhYBlfWKTmOUzLuddodm TUqnG5rAEwQFlSoqe2qh9KV3eVYPlKXxDoUZ0Kcs5RpCJtI+GvIypdAkjQQ9NjDYE21I1E WjRssEbHZo5LEB70O+jX24HClVh6tJv63tAFzechDQ4YLoiHp19WLiygQ9aCmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g92Md0zFtz1CNV for ; Tue, 05 May 2026 15:23:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e127 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 15:23:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 261002908ffd - main - libusb: Add libusb_endpoint_transfer_type enum List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 261002908ffd9f13d19d1c6be6f82edac26b6938 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 15:23:04 +0000 Message-Id: <69fa0b58.1e127.63724f28@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=261002908ffd9f13d19d1c6be6f82edac26b6938 commit 261002908ffd9f13d19d1c6be6f82edac26b6938 Author: ShengYi Hung AuthorDate: 2026-05-05 14:39:29 +0000 Commit: ShengYi Hung CommitDate: 2026-05-05 15:22:47 +0000 libusb: Add libusb_endpoint_transfer_type enum MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- lib/libusb/libusb.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h index 623b56fb273b..46a2ed5eb8a6 100644 --- a/lib/libusb/libusb.h +++ b/lib/libusb/libusb.h @@ -119,6 +119,13 @@ enum libusb_endpoint_direction { #define LIBUSB_TRANSFER_TYPE_MASK 0x03 +enum libusb_endpoint_transfer_type { + LIBUSB_ENDPOINT_TRANSFER_TYPE_CONTROL = 0, + LIBUSB_ENDPOINT_TRANSFER_TYPE_ISOCHRONOUS = 1, + LIBUSB_ENDPOINT_TRANSFER_TYPE_BULK = 2, + LIBUSB_ENDPOINT_TRANSFER_TYPE_INTERRUPT = 3, +}; + enum libusb_transfer_type { LIBUSB_TRANSFER_TYPE_CONTROL = 0, LIBUSB_TRANSFER_TYPE_ISOCHRONOUS = 1, From nobody Tue May 5 15:26:59 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g92S32wlQz6cJFT for ; Tue, 05 May 2026 15:26:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g92S322mnz3kH0 for ; Tue, 05 May 2026 15:26:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777994819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1yQggwSnSstC+QjvvNDCe+1+276N/sU1pCH/jrxFHTM=; b=ZEYX29HuQEFgeFth8LrqgQLTM4cMPkTi0WEAtmde+95XHk6He0uC1dp3ZNqwQgSb014+1N ddCY6hBNinwQaLfFQ2iAuiV59Z0GfXWtBYT8YeRWii5RyaFUAgYYHJNgh5wP53ayg69yyJ Y0ascO4ov5jdIYlVPBzLGKbmqcqRr8oisi2RUoVjWvrGCSH9XJRmDrn4dzH0MGtGY7vv3w knkR7j+vXtn5XAoZcQO0zuCrEBvwqDO2lwlcrANWyW3C+yw3t2PJE1UvDLpduC1FUZMgwJ WaB5VZy2oAmY9mNhwzbUJGJXDYD4ldvUB9l5wLD48+5XxlMKPUb4TW6vZJqxcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777994819; a=rsa-sha256; cv=none; b=oPhP+qZS5iBRHpU37roRdP77ezQg+h7qNR1mDeOLgCulyomloJo51CBro4UaAlDzUoxOBP WBLgafRI7ml40c7kwWhe/+9Q5J3WzDtdkxznHBhxSQQ9yUEDeB+cmqNaYJDotoKB9efRyi Chi9jN9xP8H0YJzHbLq25mxZoAgGicXA6tUmDqV7lXhp2moIkHkupdkgRhotU/MPPaS6FB iyhmB2trV7Qb1JQ8kksXcAoYI0f/qxd5WmQVGqejvXjJMH35vxg9u4f9G6PxmLJjqaNZub hfFe7+2qCwP/NCV3UoU2R/ufuB5RIfULhlx/JLtbQYLmjcJQ3wvHIb+APryaNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777994819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1yQggwSnSstC+QjvvNDCe+1+276N/sU1pCH/jrxFHTM=; b=UrDzxpsElazbqKAgIWWcEtA8kWADgHZmKR+l5BjgJSo/BYIWgco3/7/yjYy+dbHVnQX32Q zQGO41NaHssefUtTYavBTzYvjHWdEKCbxUfdJDT8Jsl8dp9/QEOLcVRc0bvpXTONfzNUgc auoARJ2IqG7iUJhHEGsokVmwS1s0tu5G+ikR9ddAR9AjzzPOiviOkYfmkTjVQ5DQus69zX Rvx7C0t9jVv0VcAMdp+gQnNvaheTCL4tQ8BODrt3iOiwoNTsnmxQsPySXZFkP+myUhjEzl K0Vi/3Dm8BXX/FmSiZqHHaoss5Ievr1wb5srlfcujVAJsw1FOdeSXdz5BJQCbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g92S31S0Qz1Brv for ; Tue, 05 May 2026 15:26:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e813 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 15:26:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: efc0ced5c46f - main - ath{10,11,12}k: Add missing header in Makefile List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efc0ced5c46f3332bf1847f2889659e7f5412852 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 15:26:59 +0000 Message-Id: <69fa0c43.1e813.2e5c61c6@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=efc0ced5c46f3332bf1847f2889659e7f5412852 commit efc0ced5c46f3332bf1847f2889659e7f5412852 Author: ShengYi Hung AuthorDate: 2026-04-28 14:27:21 +0000 Commit: ShengYi Hung CommitDate: 2026-05-05 15:26:48 +0000 ath{10,11,12}k: Add missing header in Makefile Reviewed by: bz MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56693 --- sys/modules/ath10k/Makefile | 2 ++ sys/modules/ath11k/Makefile | 2 ++ sys/modules/ath12k/Makefile | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sys/modules/ath10k/Makefile b/sys/modules/ath10k/Makefile index b28df768c3d5..becf42a6a79a 100644 --- a/sys/modules/ath10k/Makefile +++ b/sys/modules/ath10k/Makefile @@ -1,3 +1,5 @@ +.include + DEVATH10KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath10k .PATH: ${DEVATH10KDIR} diff --git a/sys/modules/ath11k/Makefile b/sys/modules/ath11k/Makefile index a2f0064c2ae9..eaf196af5b55 100644 --- a/sys/modules/ath11k/Makefile +++ b/sys/modules/ath11k/Makefile @@ -1,3 +1,5 @@ +.include + DEVATH11KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath11k .PATH: ${DEVATH11KDIR} diff --git a/sys/modules/ath12k/Makefile b/sys/modules/ath12k/Makefile index ecca0bc3b409..071bb88a8b37 100644 --- a/sys/modules/ath12k/Makefile +++ b/sys/modules/ath12k/Makefile @@ -1,3 +1,5 @@ +.include + DEVATH12KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath12k .PATH: ${DEVATH12KDIR} From nobody Tue May 5 15:48:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g92xF6ZJjz6cK7P for ; Tue, 05 May 2026 15:48: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 4g92xF5ffvz3mmc for ; Tue, 05 May 2026 15:48:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777996129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7TM53kVeIKjv1fMaRkZbKGfxAGApDLYrUVnrhIvJx6w=; b=LJ5AzU7AKE5rKNzX4b9VaxTgYDdfNOP0qNswK0EvWJWdknp2QOotE3EouMoZv+CsCqU3MT P4eR+k+bPlQ2nzeFkTMV7WfNC+Rl7mpTssklkRI8ExUPBsqD5sVwsj2HpUk3NBWqm2vv8T LImwLmMjCSzbmyBA/pyMLB97XWWctJ5QeYA00cvmsEwKuYjNYyHyiuHj2Cfebu1VHlU4x8 RNpG4CdCCSNC0T8QY1OjdJTpl8KHCio4LsdpcLvrQo+N7OyrXADWkXiGryQhiu/m8l+TVg /rA+sI6DqFoPXcadjGkgWMC8v4CI2kL3AUw2FOWyfedlgwy27tvvGMBsE1qVNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777996129; a=rsa-sha256; cv=none; b=NVcabfWdD4MmftUNN7Cdq6Vrcz7Bu2dnhUVt1LzsQ+uxDde1hXqitF2UZoAOSb4gXUQFnn UWEiqU2Zl/qZvNmBAPrwgX/WIV61Eo5DpnM8YZ9h0FWLsQdo2CJ5br7AXgUCCnJo/qtMcG ZJbnbPcbpiEp7TC3mvZ95yQAq9inRTsJFqMRy2QFsVDLzBYVrfIvUowL3hhQpmH5HVGjcv njAp/Z0huheqKD1rg1F9wfeNyMD0XkFgBT6mrhzqqOnQ+zfqDHMqFnmE9D/Ls5emx2TxDw hbonASHw7+65Q3EgvpA6KN5um3nTFLxXj0ONEtz9YWwXQCJ+gTxyQ+4htZPeDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777996129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7TM53kVeIKjv1fMaRkZbKGfxAGApDLYrUVnrhIvJx6w=; b=AnB5yOT8Syd8uh0Bq46FOQOSx1inL3lEXcjUrGfwm9LRWCyXnY4psMQmR7LiJMKYI5aTI6 gNESbbYBd+mddIe2a4oLuwnxPP4BcIJFeuuAxqKZ30f+e9dVlgkVFiwNR4hoNFnucQx4sZ 9OWMCA/ddTneNf5WuohVucDayJe6ZKCfh/w7DpBokvRDFPC3HptaAu+LbV6U6RjDCXusyN YNFbiY+srZ1Rrzh0//HaxLLqQIseVNnExz1m/EVrsE5bV84xGxpRbrEdE2q3LJtsHjnUbo R6vXfutTjvqNma/zBDVSgKV/fk4eoA52v5sFdjtmgd7F8HmcGfJ+0fizte6H6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g92xF5GZZz1C2C for ; Tue, 05 May 2026 15:48:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eae4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 15:48:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: ce9ced951a0b - main - libusb: change callback register handler to int List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce9ced951a0b9d004a3b007d4ac6e9087a1301a2 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 15:48:44 +0000 Message-Id: <69fa115c.1eae4.306694d3@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=ce9ced951a0b9d004a3b007d4ac6e9087a1301a2 commit ce9ced951a0b9d004a3b007d4ac6e9087a1301a2 Author: ShengYi Hung AuthorDate: 2025-12-13 15:12:11 +0000 Commit: ShengYi Hung CommitDate: 2026-05-05 15:48:22 +0000 libusb: change callback register handler to int libusb upstream uses int for register handler. This causes some library user (like pyusb) to assume that we have int in all implementations and therefore provides a 4 byte storage only. This causes Segmentation fault as we will right the pointer. Reviewed by: adrian Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54211 --- lib/libusb/libusb.h | 5 ++--- lib/libusb/libusb10.c | 1 + lib/libusb/libusb10.h | 2 ++ lib/libusb/libusb10_hotplug.c | 50 +++++++++++++++++++++++++++---------------- 4 files changed, 37 insertions(+), 21 deletions(-) diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h index 46a2ed5eb8a6..ec60ce336e5a 100644 --- a/lib/libusb/libusb.h +++ b/lib/libusb/libusb.h @@ -293,7 +293,6 @@ struct libusb_context; struct libusb_device; struct libusb_transfer; struct libusb_device_handle; -struct libusb_hotplug_callback_handle_struct; struct libusb_pollfd { int fd; @@ -322,7 +321,7 @@ typedef struct libusb_device_handle libusb_device_handle; typedef struct libusb_pollfd libusb_pollfd; typedef void (*libusb_pollfd_added_cb) (int fd, short events, void *user_data); typedef void (*libusb_pollfd_removed_cb) (int fd, void *user_data); -typedef struct libusb_hotplug_callback_handle_struct *libusb_hotplug_callback_handle; +typedef int libusb_hotplug_callback_handle; typedef struct libusb_device_descriptor { uint8_t bLength; @@ -632,7 +631,7 @@ typedef int (*libusb_hotplug_callback_fn)(libusb_context *ctx, libusb_device *device, libusb_hotplug_event event, void *user_data); int libusb_hotplug_register_callback(libusb_context *ctx, libusb_hotplug_event events, libusb_hotplug_flag flags, int vendor_id, int product_id, int dev_class, libusb_hotplug_callback_fn cb_fn, void *user_data, libusb_hotplug_callback_handle *handle); -void libusb_hotplug_deregister_callback(libusb_context *ctx, libusb_hotplug_callback_handle handle); +void libusb_hotplug_deregister_callback(libusb_context *ctx, libusb_hotplug_callback_handle callback_handle); void *libusb_hotplug_get_user_data(struct libusb_context *ctx, libusb_hotplug_callback_handle callback_handle); diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c index b3af017ab980..08e40541a907 100644 --- a/lib/libusb/libusb10.c +++ b/lib/libusb/libusb10.c @@ -205,6 +205,7 @@ libusb_init_context(libusb_context **context, memset(ctx, 0, sizeof(*ctx)); ctx->devd_pipe = -1; + ctx->next_callback_id = 1; debug = getenv("LIBUSB_DEBUG"); if (debug != NULL) { diff --git a/lib/libusb/libusb10.h b/lib/libusb/libusb10.h index eced364ef857..354ff003de3e 100644 --- a/lib/libusb/libusb10.h +++ b/lib/libusb/libusb10.h @@ -80,6 +80,7 @@ struct libusb_hotplug_callback_handle_struct { int devclass; libusb_hotplug_callback_fn fn; void *user_data; + int id; }; TAILQ_HEAD(libusb_device_head, libusb_device); @@ -118,6 +119,7 @@ struct libusb_context { libusb_pollfd_added_cb fd_added_cb; libusb_pollfd_removed_cb fd_removed_cb; void *fd_cb_user_data; + int next_callback_id; }; struct libusb_device { diff --git a/lib/libusb/libusb10_hotplug.c b/lib/libusb/libusb10_hotplug.c index 359c818b5720..fd979fd4db14 100644 --- a/lib/libusb/libusb10_hotplug.c +++ b/lib/libusb/libusb10_hotplug.c @@ -176,8 +176,9 @@ libusb_hotplug_equal(libusb_device *_adev, libusb_device *_bdev) } static int -libusb_hotplug_filter(libusb_context *ctx, libusb_hotplug_callback_handle pcbh, - libusb_device *dev, libusb_hotplug_event event) +libusb_hotplug_filter(libusb_context *ctx, + struct libusb_hotplug_callback_handle_struct *pcbh, libusb_device *dev, + libusb_hotplug_event event) { if (!(pcbh->events & event)) return (0); @@ -216,8 +217,7 @@ libusb_hotplug_scan(void *arg) { struct pollfd pfd; struct libusb_device_head hotplug_devs; - libusb_hotplug_callback_handle acbh; - libusb_hotplug_callback_handle bcbh; + struct libusb_hotplug_callback_handle_struct *acbh, *bcbh; libusb_context *ctx = arg; libusb_device *temp; libusb_device *adev; @@ -343,7 +343,7 @@ int libusb_hotplug_register_callback(libusb_context *ctx, libusb_hotplug_callback_fn cb_fn, void *user_data, libusb_hotplug_callback_handle *phandle) { - libusb_hotplug_callback_handle handle; + struct libusb_hotplug_callback_handle_struct *handle; struct libusb_device *adev; ctx = GET_CONTEXT(ctx); @@ -365,6 +365,17 @@ int libusb_hotplug_register_callback(libusb_context *ctx, if (handle == NULL) return (LIBUSB_ERROR_NO_MEM); + handle->events = events; + handle->vendor = vendor_id; + handle->product = product_id; + handle->devclass = dev_class; + handle->fn = cb_fn; + handle->user_data = user_data; + CTX_LOCK(ctx); + if ((handle->id = ctx->next_callback_id++) < 0) + handle->id = ctx->next_callback_id = 1; + CTX_UNLOCK(ctx); + HOTPLUG_LOCK(ctx); if (ctx->hotplug_handler == NO_THREAD) { libusb_hotplug_enumerate(ctx, &ctx->hotplug_devs); @@ -373,12 +384,6 @@ int libusb_hotplug_register_callback(libusb_context *ctx, &libusb_hotplug_scan, ctx) != 0) ctx->hotplug_handler = NO_THREAD; } - handle->events = events; - handle->vendor = vendor_id; - handle->product = product_id; - handle->devclass = dev_class; - handle->fn = cb_fn; - handle->user_data = user_data; if (flags & LIBUSB_HOTPLUG_ENUMERATE) { TAILQ_FOREACH(adev, &ctx->hotplug_devs, hotplug_entry) { @@ -395,23 +400,32 @@ int libusb_hotplug_register_callback(libusb_context *ctx, HOTPLUG_UNLOCK(ctx); if (phandle != NULL) - *phandle = handle; + *phandle = handle->id; return (LIBUSB_SUCCESS); } void libusb_hotplug_deregister_callback(libusb_context *ctx, - libusb_hotplug_callback_handle handle) + libusb_hotplug_callback_handle callback_handle) { - ctx = GET_CONTEXT(ctx); + struct libusb_hotplug_callback_handle_struct *handle; - if (ctx == NULL || handle == NULL) + ctx = GET_CONTEXT(ctx); + + if (ctx == NULL || callback_handle == 0) return; HOTPLUG_LOCK(ctx); + TAILQ_FOREACH(handle, &ctx->hotplug_cbh, entry) { + if (handle->id == callback_handle) + break; + } + if (handle == NULL) + goto clean; TAILQ_REMOVE(&ctx->hotplug_cbh, handle, entry); libusb_interrupt_event_handler(ctx); - HOTPLUG_UNLOCK(ctx); +clean: + HOTPLUG_UNLOCK(ctx); free(handle); } @@ -419,13 +433,13 @@ void * libusb_hotplug_get_user_data(struct libusb_context *ctx, libusb_hotplug_callback_handle callback_handle) { - libusb_hotplug_callback_handle handle; + struct libusb_hotplug_callback_handle_struct *handle; ctx = GET_CONTEXT(ctx); HOTPLUG_LOCK(ctx); TAILQ_FOREACH(handle, &ctx->hotplug_cbh, entry) { - if (handle == callback_handle) + if (handle->id == callback_handle) break; } HOTPLUG_UNLOCK(ctx); From nobody Tue May 5 15:52:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g93235N5Cz6cKlN; Tue, 05 May 2026 15:52:59 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g93234gKpz3nMQ; Tue, 05 May 2026 15:52:59 +0000 (UTC) (envelope-from bapt@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777996379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=t3pjM6V1LGv6cLRXonY/EVHpWPFIwY0QXJVwMX9Yffk=; b=L67Hcp/MPb2bELCBFtpsb2ONIgn9yaYUzh5E7vvqhf0ejYb0mPIkkzXz/OgQMK/SxoD8FH /EmajafiRsF2Dakhq3HCxtua94go6IIsHjZPsUhoGMfS7VFeFigKfWqaFPyTkBeRLNPN8N aR11TLht3MG307MkJbml0aE0c2cvKz43UyJM7rYOyuMf/HsWAeitBdJqJbNxIocIog5Zwr SBJohaIPWK5sH0ws8AFytD+Bbo0rd/91iu0IMpwGSrF9qSt+WYldkKhcWIj6/TrvA8DVet YdFK784Q5cV6WVAAxzyJChLRSmlYMgz7AiQjIFOZpKSWpetilBwbSD2+3ONOVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777996379; a=rsa-sha256; cv=none; b=hgInyUvQKCZ6++sTXizgaz59811frEeVV57qp9xbXkUj/r+zdU0cp9xdiL3cRU/L80EMHw vq8MkpDFQPh21OOdh+ShQtWCY6L7AS3sdn7qOcPjKJWRv5lKLhaPzLmo0FUbsurJqQAJKR aGO+bvHCtJ5Hd6aigSFTISokwd0R5GOlZsZtWed5t3I0pkguaaYklB9Xz0LgkvJc0V9hAz u3zkd3HjPQ7yoCSPETAevtzoSU2Ura3V/JKUPu6nPWBY8gE4eA2n1Jezx2k0ENPF6caTQE IMWCyaRmW3PiTyO6d0qjbyDhDl8aCQVRLcluOZ92WhuB5u+EHPmQVN8J0SR00A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777996379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=t3pjM6V1LGv6cLRXonY/EVHpWPFIwY0QXJVwMX9Yffk=; b=bWk1ASaZgINCEamYNwm0vm8wmX38pxVjLziQ69VTBCMwvv7P+yUje9OXwXgWHV1NTNvSd0 I1CErmg6GDCn1nMsmTlH0LlU3ipGC4yqPjjEylMkealhIatwbGJl7eCS7qkI6LbwaQNvls sNWR3U3IvrwCDNaKGTCjPEmOmWTad3yubZ95/+9ql4tItyVaVrNed0UJ3kDTls7IFtOlw0 bSTaGaTz7DR5yC75EH/a6DjQw/v5pBPUHlBBaWePZsK6whzfnkzpr1NlrHNJYjpDmSrWiN Yq+AaeSCcwLKJLUXpZUWbcZ2VtS1leB5VW217Lf24n3BzXt7pbN070DX9FEd/A== Received: from b.nours.eu (b.nours.eu [IPv6:2001:41d0:303:5e39::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4g93233d42z2Jc; Tue, 05 May 2026 15:52:59 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by b.nours.eu (Postfix, from userid 1001) id 56C86416CD; Tue, 05 May 2026 17:52:55 +0200 (CEST) Date: Tue, 5 May 2026 17:52:55 +0200 From: Baptiste Daroussin To: ShengYi Hung Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: ce9ced951a0b - main - libusb: change callback register handler to int Message-ID: References: <69fa115c.1eae4.306694d3@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <69fa115c.1eae4.306694d3@gitrepo.freebsd.org> On Tue 05 May 15:48, ShengYi Hung wrote: > The branch main has been updated by aokblast: > > URL: https://cgit.FreeBSD.org/src/commit/?id=ce9ced951a0b9d004a3b007d4ac6e9087a1301a2 > > commit ce9ced951a0b9d004a3b007d4ac6e9087a1301a2 > Author: ShengYi Hung > AuthorDate: 2025-12-13 15:12:11 +0000 > Commit: ShengYi Hung > CommitDate: 2026-05-05 15:48:22 +0000 > > libusb: change callback register handler to int > > libusb upstream uses int for register handler. This causes some library > user (like pyusb) to assume that we have int in all implementations and > therefore provides a 4 byte storage only. This causes Segmentation > fault as we will right the pointer. > > Reviewed by: adrian > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D54211 This breaks backward compatibility this is why I did: https://reviews.freebsd.org/D55686 https://reviews.freebsd.org/D55687 sorry I didn't catchup on it, and sorry I missed you version of the patch. we don't know if we don't have users relying on the previous ABI imho this should go via symbol versioning and then backward compat. Best regards, Bapt From nobody Tue May 5 15:59:01 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g93966PfDz6cLZC for ; Tue, 05 May 2026 15:59: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 4g939643xvz3p0w for ; Tue, 05 May 2026 15:59:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777996746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R79P2SiznHVf/N3pJIEuK9NKLgtCUhWAmXQRjH3nkvY=; b=yyGCPRw3iauXdDxIiHduz3dDg0i+9tZLugpRj8ChsrVm0qCpkMvAlcfsN843mQBNZNe0jj WFga6Q4LM0MAGkVvyyL4ZcHZf5/4l0WyGCTf4AvYS6CbpWtHtaS4LZsGc69DLEWyRg6OjF hx1RQUA2c93bqG63dAGLzyd+ZRXDwxZHaYzrQd0N+9+isnFDvSCI1BTn4ro0ohBwxGgigc DIeIMd6CYF+o1Za+0xoth1p4jIKE+LJdi0X4gvxCOugH4xoXmSsID3foKvKctY38Xs99jN /8yP+qe6F/QCSYQ7zV6vtlqHqL4ci3t9NRRrCU6N6ZfFdN00cFvffDswvmHnZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777996746; a=rsa-sha256; cv=none; b=Fj4QsgKmneno69W3wysKPRfNrjn3UYO+pghTQFy7q+YVK9i0lsO9wPtkzPx4G6+vJMROH9 vLOXYiBoNJoJy5p5aoHuDtRaG8qCpNdbjxcFh1Jr2bq+pEyf8TCEsypavtZ6GBe/EgDiqN GYUTu2aANl1PWmNdvEt/5rwT786YcXKWmvMcqFBVF22vvA4QKgNyvQByTTeWfP5tMn74dl CnPrLdDIp8DwznvWLakqYw5BSr22s6BIERamTs6lnvqqVAdavmskpcHzK7zf91xHvaLboB dGD/Y5GTKmaZdOPmdJyebnCfQzmJSYc/7TQJf+xdPg3ZC0Z1dS8W52/GLtBBgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777996746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R79P2SiznHVf/N3pJIEuK9NKLgtCUhWAmXQRjH3nkvY=; b=sXmdmLMjNfdrkPb/jzR3LYqxjXoOfm8lNElELnEUA0nImd4+PCHJft1WvUHFNg9Nas4ggB 9UEJhkfn8V/wMrcY2nAsmQBIYcRuptN8xSuUou3rsObUIw85o2dn7MqCqM6I5r0XQoohyE 3RDLSU1wxWYPM+N9hYMTV+f2cbULs0/ij8gI/162KdjICac0jL9I2qnk9GDTf8q8xypC8h c3tlo8h1gpPpsuHCXr9M3Rzg7yfhx0KhWZme10fW21pLOtr7eQHiBxlR/Oe3EgeTyLISs9 /VnoVOaldg+cR0iwFcjoYn5zhURPsybhwBXLv/yiflK0KVEutuokXJJMtsFiOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g93961PRjz1CS9 for ; Tue, 05 May 2026 15:59:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21791 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 15:59:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 06271366982e - main - libusb: fix incorrect status type when completion on cancel the events List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06271366982eb6fe59502fcdf95a1a22e0671d5f Auto-Submitted: auto-generated Date: Tue, 05 May 2026 15:59:01 +0000 Message-Id: <69fa13c5.21791.68fe6db9@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=06271366982eb6fe59502fcdf95a1a22e0671d5f commit 06271366982eb6fe59502fcdf95a1a22e0671d5f Author: ShengYi Hung AuthorDate: 2025-08-05 09:41:17 +0000 Commit: ShengYi Hung CommitDate: 2026-05-05 15:58:49 +0000 libusb: fix incorrect status type when completion on cancel the events Reviewed by: lwhsu, markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51736 --- lib/libusb/libusb10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c index 08e40541a907..517630900f34 100644 --- a/lib/libusb/libusb10.c +++ b/lib/libusb/libusb10.c @@ -1770,14 +1770,14 @@ libusb10_cancel_all_transfer_locked(struct libusb20_device *pdev, struct libusb_ if (sxfer == NULL) continue; /* complete pending transfer */ - libusb10_complete_transfer(xfer, sxfer, LIBUSB_TRANSFER_ERROR); + libusb10_complete_transfer(xfer, sxfer, LIBUSB_TRANSFER_CANCELLED); } while ((sxfer = TAILQ_FIRST(&dev->tr_head))) { TAILQ_REMOVE(&dev->tr_head, sxfer, entry); /* complete pending transfer */ - libusb10_complete_transfer(NULL, sxfer, LIBUSB_TRANSFER_ERROR); + libusb10_complete_transfer(NULL, sxfer, LIBUSB_TRANSFER_CANCELLED); } } From nobody Tue May 5 16:25:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g93m53ZbBz6cNT2 for ; Tue, 05 May 2026 16:25: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 4g93m46fzWz3ry8 for ; Tue, 05 May 2026 16:25:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777998356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EIxxyC1D3ml5RGnmd38ay5AggHfPS0fiiZsBiwgZWfE=; b=l649+1fWLtdFuLIaO+cQaZMPGqBaoFlnPz0T0L50o1EQrYoAVsW0Vfad7LTxpUoaRSvHZV XlCzTZL2Pc0FSlvQzQwRW16AbGF1NWq59YI6CtusZ6dtpCiTFijeLOFAJvcN0AuW3VJE3Q 1beOBPfoTaslH+olGNGA1D+IxxHuWbiPznuQndfywz5dovPY/hWHvSZw3FsEddDP7o9S7K 7GLkRztKZhfHPTSFxsUrZzevQ3sAaPoY18oEll1YU06pYK3cPD/crM10a1vr1QGIk7X8Z6 KfoONT8Z8E7NeQp4Joxa/iU9EfmEozyLxxK5RtrhtznBJ3xX0jI0dzvZHTPHSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777998356; a=rsa-sha256; cv=none; b=GQ0M3QFCi74J6rIpa0sMJjchULhX+ywtnuIqjdgzTv9T3xiu9kiRHR+N/E4oXoBNj0IOsf rYE6w3l7GqFjR8/x7aIpaYGmEZrEGkj/8QQ+xqMwY8GjNgCu7DlWQeiWvP1/unVfpY+bHU cFfcbokOJEA5EY0lqnjrs/8oPd4AZ76kVJIwiJHw4jTA8RP1j9ZMXg/B74qvOGUfTRTubc nduc4r9Vd1Ojilr3UkPaDcybBixnP7bE44eqYdXmEOp3wrYrjlvuoDq53HVIAJlf2elbyE p7JDe5jXvW3WbBarZ1wmu+Mm/wsiNqbRC0oV/dP92AIJG71sra7KYK3Vsu/G6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777998356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EIxxyC1D3ml5RGnmd38ay5AggHfPS0fiiZsBiwgZWfE=; b=h2gFWUbmjWpt1PZxlFNuFAx6eCxazI1F8iLOzb7v2DLfLWlnmTUawt+cOtz+sHzgtqewVi xhKpZATqwx7IpfynbKkGaYAvipfpGJ58lrh9abIgLW1dSz/NAJR4wClwBChT8HX9UgSzzm sVwL0Pf1ADz/VpftzjaXzGG/REyPN4E8fiH8vvLh2mJ8xPQa3QnF5sesIG50ow63nMCi0I KnFEBXGmOKMSjsnVbEV2Rv/+3Io72pCIYqSZSz7yK37jV9uvCa9E/55C5paAo1xFwpCPFZ fJCZBp/grzNbJeHvgN1QigI0i42gGRkDQV3GgeLtEQgMciGHqnrqGJaFme6u8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g93m46FPzz1DRk for ; Tue, 05 May 2026 16:25:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24794 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 16:25:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 9fe189c79a81 - stable/14 - pf: improve ASCONF chunk validation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9fe189c79a8161380800dcff1d15c4cea7467a7e Auto-Submitted: auto-generated Date: Tue, 05 May 2026 16:25:56 +0000 Message-Id: <69fa1a14.24794.5e2b0a94@gitrepo.freebsd.org> The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9fe189c79a8161380800dcff1d15c4cea7467a7e commit 9fe189c79a8161380800dcff1d15c4cea7467a7e Author: Kristof Provost AuthorDate: 2026-04-28 08:54:24 +0000 Commit: Kristof Provost CommitDate: 2026-05-05 07:34:26 +0000 pf: improve ASCONF chunk validation When processing an ASCONF chunk we failed to verify that the chunk length was at least 8 bytes. As a result we might end up passing a negative length to pf_multihome_scan(). Fortunately this merely meant the function did nothing, but we should discard such invalid packets, so explicitly check for this. MFC after: 1 week Reported by: Mark Johnston Sponsored by: Orange Business Services (cherry picked from commit bea1c2fcd7839fd90a8ce96d6dc6a033779bc3c2) --- sys/netpfil/pf/pf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 3eab758296a9..469087a040e1 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -6707,6 +6707,9 @@ pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, NULL, NULL, pd->af)) return (PF_DROP); + if (ntohs(ah.ph.param_length) < sizeof(ah)) + return (PF_DROP); + ret = pf_multihome_scan(m, start + off + sizeof(ah), ntohs(ah.ph.param_length) - sizeof(ah), pd, kif, SCTP_ADD_IP_ADDRESS, true); @@ -6724,6 +6727,10 @@ pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, if (!pf_pull_hdr(m, start + off, &ah, sizeof(ah), NULL, NULL, pd->af)) return (PF_DROP); + + if (ntohs(ah.ph.param_length) < sizeof(ah)) + return (PF_DROP); + ret = pf_multihome_scan(m, start + off + sizeof(ah), ntohs(ah.ph.param_length) - sizeof(ah), pd, kif, SCTP_DEL_IP_ADDRESS, true); From nobody Tue May 5 16:25:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g93m93JJVz6cNT5 for ; Tue, 05 May 2026 16:26: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 4g93m924tgz3s44 for ; Tue, 05 May 2026 16:26:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777998361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rt8P5D6oL/+HFTpyQ04CEdKMeG0/1Zc+PIF+ZzxgyyE=; b=KC3DFXcpacWhdLvnyNoU1/i7Sy/8YwJbECYdnKuGU4klCDIHXucqDKSoHalDIm/HBkNDgo VKki+jZRO/oN8e5alb7YHc2cuACrxEPebMVfENiuCdgtttK8J8JSaLup9fNDRxkIYo6wFk dKDuduZ3TiW09nqL50MXJfjQ+GpGaLrzfvVDBXElRWoNEAIe8xagCGCJW+L5mr9ucpqF6E j1fziR5XFhUdLxAlBU1PvbP/agwQgPp4yK+TiWW83vliJg/wh/jqpg84n1faBRVB3Vl+7C xYtU5wYdWuFTj2AORuWL0eIZbyubzgY+AQeXpciMGKVIYvstbCB4c33tCjKqpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777998361; a=rsa-sha256; cv=none; b=okWmnM8vT7buq8AFMpm3YVG7RjjL7fMR8Y7DFMhHUjP/J6iw5iDHHvIx+cKuaRGQt+/E6P Yv5bkFmYfxWBJqfaW2dKGZu69DMSR/2mrXPZuJk7v2q6svvRnr741akvAndiz+ZzrczY6z Wzgrt7wb7WjEUvaDL/rKHH5PQBY5hlQGKATf2HT1JxupNnHnMnmzrQpJZ0lhMSZHsjsVgP IHCIrAOyHEemn+nU0sSq96VB0QZ6iYPEEKMQ+hs9onbJ0eep2a9Erf3ITZ88AVt4fY/0LC 7KMrFbAUqEB5k8oPu4v3DAJ52st2OO2fG9AdCewmBCtPW2EAeN31jkZwMFbeCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777998361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rt8P5D6oL/+HFTpyQ04CEdKMeG0/1Zc+PIF+ZzxgyyE=; b=nlGpjoNyHHV3lSnbTiDG/1rQlQkr3R0eAdpZ7f4U8id104xqLaZKs3EYcmn1khIaxldP5L NKDZFwkmHsbWJKVCJRTpn2zHURlkPQAIvWmP1Txmoi2xmxt6J9d4ylix7q1bB3699UtDfV 31N/gf1Itf2wdo3QEEx3WlJZyIMCpJHqXEKcOhQzd2cJN/WE6YkFGzjDlFJEbyEKAB65nA rP4dAfFvsGo3g0xvdTxgElXLwnt0BtrLKUW5vHQY3Dpksy7MhMXCvpCo7ypdEj1K7Aozzu 9CfxKQHzDkcDSbGljxQ3/WkjbORHlBxdUUGafYFcZFVFGC/TnjMNoU665WrleQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g93m91RJhz1Dm5 for ; Tue, 05 May 2026 16:26:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25792 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 16:25:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 730fb48f1387 - stable/15 - pf: improve ASCONF chunk validation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 730fb48f1387812ab82ea3b0ef807e6824425318 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 16:25:55 +0000 Message-Id: <69fa1a13.25792.1bd373d@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=730fb48f1387812ab82ea3b0ef807e6824425318 commit 730fb48f1387812ab82ea3b0ef807e6824425318 Author: Kristof Provost AuthorDate: 2026-04-28 08:54:24 +0000 Commit: Kristof Provost CommitDate: 2026-05-05 07:33:23 +0000 pf: improve ASCONF chunk validation When processing an ASCONF chunk we failed to verify that the chunk length was at least 8 bytes. As a result we might end up passing a negative length to pf_multihome_scan(). Fortunately this merely meant the function did nothing, but we should discard such invalid packets, so explicitly check for this. MFC after: 1 week Reported by: Mark Johnston Sponsored by: Orange Business Services (cherry picked from commit bea1c2fcd7839fd90a8ce96d6dc6a033779bc3c2) --- sys/netpfil/pf/pf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 7aee28e7b917..05a71cd45a35 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7794,6 +7794,9 @@ pf_multihome_scan(int start, int len, struct pf_pdesc *pd, int op, bool asconf) NULL, NULL, pd->af)) return (PF_DROP); + if (ntohs(ah.ph.param_length) < sizeof(ah)) + return (PF_DROP); + ret = pf_multihome_scan(start + off + sizeof(ah), ntohs(ah.ph.param_length) - sizeof(ah), pd, SCTP_ADD_IP_ADDRESS, true); @@ -7811,6 +7814,10 @@ pf_multihome_scan(int start, int len, struct pf_pdesc *pd, int op, bool asconf) if (!pf_pull_hdr(pd->m, start + off, &ah, sizeof(ah), NULL, NULL, pd->af)) return (PF_DROP); + + if (ntohs(ah.ph.param_length) < sizeof(ah)) + return (PF_DROP); + ret = pf_multihome_scan(start + off + sizeof(ah), ntohs(ah.ph.param_length) - sizeof(ah), pd, SCTP_DEL_IP_ADDRESS, true); From nobody Tue May 5 16:45:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g94Bq1Nmkz6bwDY; Tue, 05 May 2026 16:45:39 +0000 (UTC) (envelope-from aokblast@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g94Bq0K5Bz3vPs; Tue, 05 May 2026 16:45:39 +0000 (UTC) (envelope-from aokblast@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777999539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=Tt1p6vIiP92E0eBwRNQkPMbmD9a/PqiU1fO2NNzxpMk=; b=Zq8Ah9NsAWGGwkpKd4KSkFcN5w9+t/PcfYURd8aPKVrcWxSWA2GDE2H81DfK4A/nX5Oinj zlJgrE16tjJHaAuEW3NEspAqGzg/1ILGBJMsIF15kib9QR/riaGZNS3XfV3f56Vmye7BBT zJYpvPelXP0hgvd07FXJGcZCyOwT8Emnrccc9pkb69KgkX8D9Q1ySIhBiCv1A4awcEK6JA gxIB2XKZC5mV5GJfvR8C/nDJzNLRT+fasFNx9rcpJ2BnYL4PVX9g85LOY1KwmVfyerBrw9 xztvNaaNmmWZtSpy/yG44r9VgUVDTPI3fwF8lZtTjzOVE+9p2cs/K4W7pccFIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777999539; a=rsa-sha256; cv=none; b=dsyAnSvma/5pdDAJYrMu55CkYrr/aanQ+ki4dD2ft9Ax8uUl0fxm28X87lPOSW0/jwZO+9 mSMYlYPeHlBugmiCUHhWFmkP6VUkmqO/ntprKuX80esLma/RMb5yKilBbbMB6zZ4QIgoJ6 CuAzdvbGMQKxdzYHm8aR10QyH9jdSchbbQBURtNFBnYjIJMEEn33HPj+S8XKVPoPOqo/pE Z4VV9yrTWfw2sROYn6ZlApDhDYbnCE7XawMqkldZLC+T3Mzh28lMszoz3ZoYogCd1NiY3s sDLlqJ4rGYb4RRholYsEs5lbwmHND5V3pmbfPuOUMr+aImJTIXj+w4QSHrAbog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777999539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=Tt1p6vIiP92E0eBwRNQkPMbmD9a/PqiU1fO2NNzxpMk=; b=JzAyJcbaTpBxKAYT4R7SBnT1S/B5gEeqpXYLhrNhl2ludOHxa8LijAKAmsrwjl+cDeztww 0CCBxaBo5IBrxH2+E46oUrykBhzEDzcBCEUAGgOsMtULqNtXeO3xp/q7ZfKDGQBOfuI/+x uUBcziL+3qX6aVn0jbXzh6Pe2rF80ePKuU1P9Qtu7dUYSArYIQ1gw8SAmcP1Zl7lL4bCVI SoxPzHUCXFzljZBdD0b83D7yjZfSZMEoUoFnWpSlFz5e5mmyUjh8bjsJ1fbAxLPMiIiIS9 njkNb+CqKcYtfHVi79w+7Eg0dCbaTbxmxJKsZaccjOwnxRKnHYBzT2AslqlzcQ== Received: from [IPV6:2001:b011:3808:7bbd:bd1d:650b:e094:4fed] (2001-b011-3808-7bbd-bd1d-650b-e094-4fed.dynamic-ip6.hinet.net [IPv6:2001:b011:3808:7bbd:bd1d:650b:e094:4fed]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: aokblast) by smtp.freebsd.org (Postfix) with ESMTPSA id 4g94Bn4qXHz3Ky; Tue, 05 May 2026 16:45:37 +0000 (UTC) (envelope-from aokblast@FreeBSD.org) Message-ID: <9cac5d8a-8dd3-439f-ad8e-6dd082c9843f@FreeBSD.org> Date: Wed, 6 May 2026 00:45:05 +0800 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: ce9ced951a0b - main - libusb: change callback register handler to int To: Baptiste Daroussin Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <69fa115c.1eae4.306694d3@gitrepo.freebsd.org> Content-Language: en-US From: ShengYi Hung Autocrypt: addr=aokblast@FreeBSD.org; keydata= xsDNBGhkuaEBDAD0a1Cu+ntw+v0/ZZnqTewGcd335T5tfktBEt22FsaoBqca7TSp/AvP/bWD 3YtJFlxi7TJQbb2H+ylPzusPaN/R1Sj6wQsRD1Fj+1AjF9EOqxdohXm0SoWs3sRRbMrMGp6q DTQQBMj3TEuSE26gLxmpadtiAsyNDcNCllMSXAZ7xlk+ra9x/pAqOR0TZvObwY8VUncCy6UW UIGmsUF5B7oR2v7i9rFk/3ILkcoIC1k+OlhMbxBpwPLA24Aj8sZX9dzFbwLn2wucqRUzE9Id zrwpQpRHxH0t849VBhLze+zP8s6IUtgKaTUjClmCfZXVVBpFswXJmxgDRo51Ed+X94K2y6FS DRMxwiz18vnJNWlB+aHH5wTbgoTKU+zOckXODBowNEEmYpQNVNYJs1nP6tGRmN4YwW5hcNQY dUmFKR44uYdJomcqxkzJjU4rv4NBOdzrQTw+h5gCUdQ5IvBBGTA1enEP1qMhCpwTOfMd53of 17BC3CMFNTu8rburHceMaU0AEQEAAc0jU2hlbmdZaSBIdW5nIDxhb2tibGFzdEBGcmVlQlNE Lm9yZz7CwRcEEwEIAEEWIQSIP4S1lgaPs34UknRfTtfYEmBsYAUCaGS5oQIbAwUJBaOagAUL CQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRBfTtfYEmBsYJKeDAC/aJjRjMM9k9n6uwUW HemoAUGjv5fxkIpHWYCltnZ9KMs+TZXLsUZrv9DxOV4E3ebEn7iMJbOAvIjjVK//qexo6/er 9EZow4e/EQJLIL/0xRDiF4Jg7l1jziAI26P6dyuMNzeHddFg7ALVfE9wPCFqn3QGbHqDVjI/ E9UcxXiwHktndAo1wJXdEq9F8Ufmtj1t9NasTip8ofNgKfWCGhyyZI0kvhvob5darflQMO8Y G61zmSteO5Es8i9sP+lOhwEgsgHl0L/gQtMrOko9Td1iOSMuaP9t3rx7pOnYLdKt+xw8kWnB IW6GNEzp5QVJxmzr4DiyvvuR4SxnYy2tZjzQV4W8njBvw8SmZs0oS40iP8XNAoc91xLBizDn Lne3BDYOMXgm4csmDnJBM8s7Gaoc+WMY+hDP9SKWSqhyJUg8tauVhmPP3sTEXJbHoD0TuXxO SwG9nEdKoeWQCA0XMXQGfYWHKy1qz3spYCFgXHqmF+WBLljqLaeHQsHmvUhUIuTOwM0EaGS5 oQEMAMiauBmqNndH0AaX9cqOCf660X6fj7iidxwPY9pSUBOgZ3c13pRJLiR6xsYnOWm+Dgf2 BbNOz5iEtwx3Msrjw70/LsTJ4FdByUXZPZwujaPZ2SfowLMXXZbEJrPkJ2HeamaDw/Gf5O/p aDtAS3i8sFkKiOHwBX4doaL5Rxy/oqSpYTYL8tBFUWMHHk4ji12P6Pw1aW2H81XzKTae1Tga 8ViuiWzqibbbk5ddHjr/L+6LfTDM00K7WTZVBnW0qsMZJ9PQpt8636cuJx6D3ITXxtg4IzFN z7HOKbPQazSGhaqsbdxKmtwcP2uZEycsX+hPhtoOS2FuF5nWIYRZSzWBxWiOopHdRLL4YfAL MsGhFdnPH/J3G9gyBroiCiq2moRl2OSgo9W6rMxLCm62657zsvCo8p/KxaGq/ynwCAoQ1wHQ aVerJkGMf0n5tLkbNm2SyAbRy3tA/EfbzT0Yufq5gu9zGN/Uxf5hgFO6UqDHrlPeSSz++6m/ OAj3yLIsl2GpDwARAQABwsD8BBgBCAAmFiEEiD+EtZYGj7N+FJJ0X07X2BJgbGAFAmhkuaEC GwwFCQWjmoAACgkQX07X2BJgbGAJswv/dODZRYTWb/Xx8Y/Ei1OXLZIoNxoUHvBVEqO1xR/F JPwYM8TVcihvhCfM5lLhYdY1pkLjXdlGbTKZtvdHWHLvs62jGVjUXij52z1jOurnX2u0x1vq 1zpklWBx4VQhd3sVtcyLNdDYBFi3epVf1NEctToWyfBys6ijtVkhjem3V/l0PI1WtkECzYfP TOA+guf4dmrGSHPOZpCyFwHPRcVI+4puva4s4tjCAYa5E56GkICUJLuT1x228iqr5OC8YA7F eOTN94L/GqII6joaX2HIrcpGDybRIhGty+BqXvRIpjp0z5PdDeHiFQFTnBAEnjiATAMDKd7S q8y7Pv8OD/ptOl7Fg5iexCGVoLc3idpo/5T5fEXEaEWcGF9HRUeRTrnqQ9yBnALsqoLLVfou eF5Cl7c3p1pwbdR0iSK9p4x6BDcnrnIE52vRCtCdivyxTNa+zKdjlI6gn7oNsRmOnQbkEXML 9WZi4YnrnITSzpkpCzeQCDI0gqUdsxsbt4Vi73Oq In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------lD7NZBMLf4JtjCf3Pz040EXs" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------lD7NZBMLf4JtjCf3Pz040EXs Content-Type: multipart/mixed; boundary="------------320WRgPxQz0dInaDWD4Q3Tuh"; protected-headers="v1"; hp="clear" Message-ID: <9cac5d8a-8dd3-439f-ad8e-6dd082c9843f@FreeBSD.org> Date: Wed, 6 May 2026 00:45:05 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: ce9ced951a0b - main - libusb: change callback register handler to int To: Baptiste Daroussin Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <69fa115c.1eae4.306694d3@gitrepo.freebsd.org> Content-Language: en-US From: ShengYi Hung Autocrypt: addr=aokblast@FreeBSD.org; keydata= xsDNBGhkuaEBDAD0a1Cu+ntw+v0/ZZnqTewGcd335T5tfktBEt22FsaoBqca7TSp/AvP/bWD 3YtJFlxi7TJQbb2H+ylPzusPaN/R1Sj6wQsRD1Fj+1AjF9EOqxdohXm0SoWs3sRRbMrMGp6q DTQQBMj3TEuSE26gLxmpadtiAsyNDcNCllMSXAZ7xlk+ra9x/pAqOR0TZvObwY8VUncCy6UW UIGmsUF5B7oR2v7i9rFk/3ILkcoIC1k+OlhMbxBpwPLA24Aj8sZX9dzFbwLn2wucqRUzE9Id zrwpQpRHxH0t849VBhLze+zP8s6IUtgKaTUjClmCfZXVVBpFswXJmxgDRo51Ed+X94K2y6FS DRMxwiz18vnJNWlB+aHH5wTbgoTKU+zOckXODBowNEEmYpQNVNYJs1nP6tGRmN4YwW5hcNQY dUmFKR44uYdJomcqxkzJjU4rv4NBOdzrQTw+h5gCUdQ5IvBBGTA1enEP1qMhCpwTOfMd53of 17BC3CMFNTu8rburHceMaU0AEQEAAc0jU2hlbmdZaSBIdW5nIDxhb2tibGFzdEBGcmVlQlNE Lm9yZz7CwRcEEwEIAEEWIQSIP4S1lgaPs34UknRfTtfYEmBsYAUCaGS5oQIbAwUJBaOagAUL CQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRBfTtfYEmBsYJKeDAC/aJjRjMM9k9n6uwUW HemoAUGjv5fxkIpHWYCltnZ9KMs+TZXLsUZrv9DxOV4E3ebEn7iMJbOAvIjjVK//qexo6/er 9EZow4e/EQJLIL/0xRDiF4Jg7l1jziAI26P6dyuMNzeHddFg7ALVfE9wPCFqn3QGbHqDVjI/ E9UcxXiwHktndAo1wJXdEq9F8Ufmtj1t9NasTip8ofNgKfWCGhyyZI0kvhvob5darflQMO8Y G61zmSteO5Es8i9sP+lOhwEgsgHl0L/gQtMrOko9Td1iOSMuaP9t3rx7pOnYLdKt+xw8kWnB IW6GNEzp5QVJxmzr4DiyvvuR4SxnYy2tZjzQV4W8njBvw8SmZs0oS40iP8XNAoc91xLBizDn Lne3BDYOMXgm4csmDnJBM8s7Gaoc+WMY+hDP9SKWSqhyJUg8tauVhmPP3sTEXJbHoD0TuXxO SwG9nEdKoeWQCA0XMXQGfYWHKy1qz3spYCFgXHqmF+WBLljqLaeHQsHmvUhUIuTOwM0EaGS5 oQEMAMiauBmqNndH0AaX9cqOCf660X6fj7iidxwPY9pSUBOgZ3c13pRJLiR6xsYnOWm+Dgf2 BbNOz5iEtwx3Msrjw70/LsTJ4FdByUXZPZwujaPZ2SfowLMXXZbEJrPkJ2HeamaDw/Gf5O/p aDtAS3i8sFkKiOHwBX4doaL5Rxy/oqSpYTYL8tBFUWMHHk4ji12P6Pw1aW2H81XzKTae1Tga 8ViuiWzqibbbk5ddHjr/L+6LfTDM00K7WTZVBnW0qsMZJ9PQpt8636cuJx6D3ITXxtg4IzFN z7HOKbPQazSGhaqsbdxKmtwcP2uZEycsX+hPhtoOS2FuF5nWIYRZSzWBxWiOopHdRLL4YfAL MsGhFdnPH/J3G9gyBroiCiq2moRl2OSgo9W6rMxLCm62657zsvCo8p/KxaGq/ynwCAoQ1wHQ aVerJkGMf0n5tLkbNm2SyAbRy3tA/EfbzT0Yufq5gu9zGN/Uxf5hgFO6UqDHrlPeSSz++6m/ OAj3yLIsl2GpDwARAQABwsD8BBgBCAAmFiEEiD+EtZYGj7N+FJJ0X07X2BJgbGAFAmhkuaEC GwwFCQWjmoAACgkQX07X2BJgbGAJswv/dODZRYTWb/Xx8Y/Ei1OXLZIoNxoUHvBVEqO1xR/F JPwYM8TVcihvhCfM5lLhYdY1pkLjXdlGbTKZtvdHWHLvs62jGVjUXij52z1jOurnX2u0x1vq 1zpklWBx4VQhd3sVtcyLNdDYBFi3epVf1NEctToWyfBys6ijtVkhjem3V/l0PI1WtkECzYfP TOA+guf4dmrGSHPOZpCyFwHPRcVI+4puva4s4tjCAYa5E56GkICUJLuT1x228iqr5OC8YA7F eOTN94L/GqII6joaX2HIrcpGDybRIhGty+BqXvRIpjp0z5PdDeHiFQFTnBAEnjiATAMDKd7S q8y7Pv8OD/ptOl7Fg5iexCGVoLc3idpo/5T5fEXEaEWcGF9HRUeRTrnqQ9yBnALsqoLLVfou eF5Cl7c3p1pwbdR0iSK9p4x6BDcnrnIE52vRCtCdivyxTNa+zKdjlI6gn7oNsRmOnQbkEXML 9WZi4YnrnITSzpkpCzeQCDI0gqUdsxsbt4Vi73Oq In-Reply-To: --------------320WRgPxQz0dInaDWD4Q3Tuh Content-Type: multipart/mixed; boundary="------------oYz4z26cJ8KarCUplCoCO5Xu" --------------oYz4z26cJ8KarCUplCoCO5Xu Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 SGkgYmFwdCwNCg0KSSBhbHNvIHRvdGFsbHkgZm9yZ2V0IEkgaGF2ZSByZXBsaWVkIHVuZGVy IHlvdXIgcGF0Y2guIEkgd2lsbCByZXZlcnQgbXkgDQp2ZXJzaW9uIHRvIGFkZHJlc3MgeW91 ciBwcm9ibGVtIGF0IGxlYXN0IGZvciBub3cuDQoNCkJlc3QsDQoNClNoZW5nWWkgSHVuZw0K DQpPbiA1LzUvMjYgMjM6NTIsIEJhcHRpc3RlIERhcm91c3NpbiB3cm90ZToNCj4gT24gVHVl IDA1IE1heSAxNTo0OCwgU2hlbmdZaSBIdW5nIHdyb3RlOg0KPj4gVGhlIGJyYW5jaCBtYWlu IGhhcyBiZWVuIHVwZGF0ZWQgYnkgYW9rYmxhc3Q6DQo+Pg0KPj4gVVJMOiBodHRwczovL2Nn aXQuRnJlZUJTRC5vcmcvc3JjL2NvbW1pdC8/aWQ9Y2U5Y2VkOTUxYTBiOWQwMDRhM2IwMDdk NGFjNmU5MDg3YTEzMDFhMg0KPj4NCj4+IGNvbW1pdCBjZTljZWQ5NTFhMGI5ZDAwNGEzYjAw N2Q0YWM2ZTkwODdhMTMwMWEyDQo+PiBBdXRob3I6ICAgICBTaGVuZ1lpIEh1bmcgPGFva2Js YXN0QEZyZWVCU0Qub3JnPg0KPj4gQXV0aG9yRGF0ZTogMjAyNS0xMi0xMyAxNToxMjoxMSAr MDAwMA0KPj4gQ29tbWl0OiAgICAgU2hlbmdZaSBIdW5nIDxhb2tibGFzdEBGcmVlQlNELm9y Zz4NCj4+IENvbW1pdERhdGU6IDIwMjYtMDUtMDUgMTU6NDg6MjIgKzAwMDANCj4+DQo+PiAg ICAgIGxpYnVzYjogY2hhbmdlIGNhbGxiYWNrIHJlZ2lzdGVyIGhhbmRsZXIgdG8gaW50DQo+ PiAgICAgIA0KPj4gICAgICBsaWJ1c2IgdXBzdHJlYW0gdXNlcyBpbnQgZm9yIHJlZ2lzdGVy IGhhbmRsZXIuIFRoaXMgY2F1c2VzIHNvbWUgbGlicmFyeQ0KPj4gICAgICB1c2VyIChsaWtl IHB5dXNiKSB0byBhc3N1bWUgdGhhdCB3ZSBoYXZlIGludCBpbiBhbGwgaW1wbGVtZW50YXRp b25zIGFuZA0KPj4gICAgICB0aGVyZWZvcmUgcHJvdmlkZXMgYSA0IGJ5dGUgc3RvcmFnZSBv bmx5LiBUaGlzIGNhdXNlcyBTZWdtZW50YXRpb24NCj4+ICAgICAgZmF1bHQgYXMgd2Ugd2ls bCByaWdodCB0aGUgcG9pbnRlci4NCj4+ICAgICAgDQo+PiAgICAgIFJldmlld2VkIGJ5OiAg ICBhZHJpYW4NCj4+ICAgICAgU3BvbnNvcmVkIGJ5OiAgIFRoZSBGcmVlQlNEIEZvdW5kYXRp b24NCj4+ICAgICAgRGlmZmVyZW50aWFsIFJldmlzaW9uOiBodHRwczovL3Jldmlld3MuZnJl ZWJzZC5vcmcvRDU0MjExDQo+IFRoaXMgYnJlYWtzIGJhY2t3YXJkIGNvbXBhdGliaWxpdHkg dGhpcyBpcyB3aHkgSSBkaWQ6DQo+IGMNCj4gaHR0cHM6Ly9yZXZpZXdzLmZyZWVic2Qub3Jn L0Q1NTY4Nw0KPg0KPiBzb3JyeSBJIGRpZG4ndCBjYXRjaHVwIG9uIGl0LCBhbmQgc29ycnkg SSBtaXNzZWQgeW91IHZlcnNpb24gb2YgdGhlIHBhdGNoLg0KPg0KPiB3ZSBkb24ndCBrbm93 IGlmIHdlIGRvbid0IGhhdmUgdXNlcnMgcmVseWluZyBvbiB0aGUgcHJldmlvdXMgQUJJIGlt aG8gdGhpcw0KPiBzaG91bGQgZ28gdmlhIHN5bWJvbCB2ZXJzaW9uaW5nIGFuZCB0aGVuIGJh Y2t3YXJkIGNvbXBhdC4NCj4NCj4gQmVzdCByZWdhcmRzLA0KPiBCYXB0DQo= --------------oYz4z26cJ8KarCUplCoCO5Xu Content-Type: application/pgp-keys; name="OpenPGP_0x5F4ED7D812606C60.asc" Content-Disposition: attachment; filename="OpenPGP_0x5F4ED7D812606C60.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: quoted-printable -----BEGIN PGP PUBLIC KEY BLOCK----- xsDNBGhkuaEBDAD0a1Cu+ntw+v0/ZZnqTewGcd335T5tfktBEt22FsaoBqca7TSp /AvP/bWD3YtJFlxi7TJQbb2H+ylPzusPaN/R1Sj6wQsRD1Fj+1AjF9EOqxdohXm0 SoWs3sRRbMrMGp6qDTQQBMj3TEuSE26gLxmpadtiAsyNDcNCllMSXAZ7xlk+ra9x /pAqOR0TZvObwY8VUncCy6UWUIGmsUF5B7oR2v7i9rFk/3ILkcoIC1k+OlhMbxBp wPLA24Aj8sZX9dzFbwLn2wucqRUzE9IdzrwpQpRHxH0t849VBhLze+zP8s6IUtgK aTUjClmCfZXVVBpFswXJmxgDRo51Ed+X94K2y6FSDRMxwiz18vnJNWlB+aHH5wTb goTKU+zOckXODBowNEEmYpQNVNYJs1nP6tGRmN4YwW5hcNQYdUmFKR44uYdJomcq xkzJjU4rv4NBOdzrQTw+h5gCUdQ5IvBBGTA1enEP1qMhCpwTOfMd53of17BC3CMF NTu8rburHceMaU0AEQEAAc0jU2hlbmdZaSBIdW5nIDxhb2tibGFzdEBGcmVlQlNE Lm9yZz7CwRcEEwEIAEEWIQSIP4S1lgaPs34UknRfTtfYEmBsYAUCaGS5oQIbAwUJ BaOagAULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRBfTtfYEmBsYJKeDAC/ aJjRjMM9k9n6uwUWHemoAUGjv5fxkIpHWYCltnZ9KMs+TZXLsUZrv9DxOV4E3ebE n7iMJbOAvIjjVK//qexo6/er9EZow4e/EQJLIL/0xRDiF4Jg7l1jziAI26P6dyuM NzeHddFg7ALVfE9wPCFqn3QGbHqDVjI/E9UcxXiwHktndAo1wJXdEq9F8Ufmtj1t 9NasTip8ofNgKfWCGhyyZI0kvhvob5darflQMO8YG61zmSteO5Es8i9sP+lOhwEg sgHl0L/gQtMrOko9Td1iOSMuaP9t3rx7pOnYLdKt+xw8kWnBIW6GNEzp5QVJxmzr 4DiyvvuR4SxnYy2tZjzQV4W8njBvw8SmZs0oS40iP8XNAoc91xLBizDnLne3BDYO MXgm4csmDnJBM8s7Gaoc+WMY+hDP9SKWSqhyJUg8tauVhmPP3sTEXJbHoD0TuXxO SwG9nEdKoeWQCA0XMXQGfYWHKy1qz3spYCFgXHqmF+WBLljqLaeHQsHmvUhUIuTO wM0EaGS5oQEMAMiauBmqNndH0AaX9cqOCf660X6fj7iidxwPY9pSUBOgZ3c13pRJ LiR6xsYnOWm+Dgf2BbNOz5iEtwx3Msrjw70/LsTJ4FdByUXZPZwujaPZ2SfowLMX XZbEJrPkJ2HeamaDw/Gf5O/paDtAS3i8sFkKiOHwBX4doaL5Rxy/oqSpYTYL8tBF UWMHHk4ji12P6Pw1aW2H81XzKTae1Tga8ViuiWzqibbbk5ddHjr/L+6LfTDM00K7 WTZVBnW0qsMZJ9PQpt8636cuJx6D3ITXxtg4IzFNz7HOKbPQazSGhaqsbdxKmtwc P2uZEycsX+hPhtoOS2FuF5nWIYRZSzWBxWiOopHdRLL4YfALMsGhFdnPH/J3G9gy BroiCiq2moRl2OSgo9W6rMxLCm62657zsvCo8p/KxaGq/ynwCAoQ1wHQaVerJkGM f0n5tLkbNm2SyAbRy3tA/EfbzT0Yufq5gu9zGN/Uxf5hgFO6UqDHrlPeSSz++6m/ OAj3yLIsl2GpDwARAQABwsD8BBgBCAAmFiEEiD+EtZYGj7N+FJJ0X07X2BJgbGAF AmhkuaECGwwFCQWjmoAACgkQX07X2BJgbGAJswv/dODZRYTWb/Xx8Y/Ei1OXLZIo NxoUHvBVEqO1xR/FJPwYM8TVcihvhCfM5lLhYdY1pkLjXdlGbTKZtvdHWHLvs62j GVjUXij52z1jOurnX2u0x1vq1zpklWBx4VQhd3sVtcyLNdDYBFi3epVf1NEctToW yfBys6ijtVkhjem3V/l0PI1WtkECzYfPTOA+guf4dmrGSHPOZpCyFwHPRcVI+4pu va4s4tjCAYa5E56GkICUJLuT1x228iqr5OC8YA7FeOTN94L/GqII6joaX2HIrcpG DybRIhGty+BqXvRIpjp0z5PdDeHiFQFTnBAEnjiATAMDKd7Sq8y7Pv8OD/ptOl7F g5iexCGVoLc3idpo/5T5fEXEaEWcGF9HRUeRTrnqQ9yBnALsqoLLVfoueF5Cl7c3 p1pwbdR0iSK9p4x6BDcnrnIE52vRCtCdivyxTNa+zKdjlI6gn7oNsRmOnQbkEXML 9WZi4YnrnITSzpkpCzeQCDI0gqUdsxsbt4Vi73Oq =3DVgUx -----END PGP PUBLIC KEY BLOCK----- --------------oYz4z26cJ8KarCUplCoCO5Xu-- --------------320WRgPxQz0dInaDWD4Q3Tuh-- --------------lD7NZBMLf4JtjCf3Pz040EXs Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- wsD5BAABCAAjFiEEiD+EtZYGj7N+FJJ0X07X2BJgbGAFAmn6HpIFAwAAAAAACgkQX07X2BJgbGBI qgwAs9bGM/gZhrlYMt3+F/jy18pFExw9bS9Gig9lgauBJ1arRfL5I45YDzosJwSTE5c9LMSW1kSm SCGg/c5IKZ0280/sPHEraS3l956OFwXt+S1SEEGiUfHXf1iwKAcvDNomN2hHxySOb0EPFdAU9hPm 7HE5b4NQyjnBVYED7SdHi5dT7tQjB2F6+ikMWX0H1nFWGysJ4eoY1U9z38PDskMAP0zxKkT2tGUH wRcRxbOm1pxXpAPV91Lm57xTc+JEfARJtnJsqlokCC/Fn40nj+pq3j23Dr3uDo1IKs4XqFcQyNf2 f+BAhoElCgtgCMz4WAUb7pWG6LW4nTVCerT2PWMGskDKDxVEhpXWu7Plwvwm7H81W5NcEZQLHJ0x SsHQwlcZpZT1db+1aXfAWvkP3o1Z8MKxV2Wex4GEMatjLtQ5za4iQU/AEKITCUBE20abk/vJiPKn QgOFNiXaSQMkuyBRNOJ2JoxVo475rewa8vEK8Bx8O2NRtnCGxfzMrP8O/1ET =BsvF -----END PGP SIGNATURE----- --------------lD7NZBMLf4JtjCf3Pz040EXs-- From nobody Tue May 5 16:49:04 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g94Gt14FVz6bwKG for ; Tue, 05 May 2026 16:49: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 4g94Gt0Jn8z3wg7 for ; Tue, 05 May 2026 16:49:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777999750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0H7CnDe30UDAuKxc3iBzs/n3QTnVDPe/FDHgdvzL91E=; b=EUCiSpj7K2FP2wPwFYXbZLjFu6Hwj3k2N04scOCCTq7C7gkzwjtv7VNuSGGWSvOZbX7MXI agYWlM7TTnK7aO7ojSVjnQSrMT1IMup3Tsn3f3ioXDcWA7oxjzKk1j0hQtVyfW7LE+dIIT uX6+9V+PQSZgHis5WbU+uGdlytGdvcensRFFwp9TOAWLZppHIGlvlnUWdDj/krupjUqVsM cPIN+ErB5CKLdj2jFSQyOPSjNezBTRl+3n24gj1aXFDrvVT2bACsvtp646zrvc8gm2VtUy Znc9Vw9j1/TExp3cf8gGcIm4Qg7/Z5UsfhTStMpOVkpKmR5VAdBPA8Bi/7Wh5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777999750; a=rsa-sha256; cv=none; b=uK1X1ELWOvoIvhlKB67jSkdMFJLSsI6lO2BAcj93gK6WcpzJ1x7FC5opCue2uSAO5Cxxi4 fVexVDLLyR+CN+PWAwSG1Mmc61yK1J1QSAk8s2tCiaGAE8vaG0vCGw/D6OFz0f3ysIBL9N OHtFmzRQ5hbPv3mm8+0+0n5aYppoKUTuR8S1cPiPPuq8nP7XB6OEyctGmlhr2a5O+7Y6sB kVCTKGrj+pCTtes/j5D7mnbcLIVJatHshIY+qKkU9srzKWoSW9/L7Dqgpu00SHgHY/JlrT EVHKpVlIzfdbsYr1gmCIv2UIYvCddW/4DNQ3OFecnxS3PlrtLH7xA2OtJPusnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777999750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0H7CnDe30UDAuKxc3iBzs/n3QTnVDPe/FDHgdvzL91E=; b=cSef10CkqlJZmjjsSdKuquiXgTNSQhKNxGy5t6LGGt2YNOVay/rgdiF60VShZXRBJl6Z/H YDfRGwnMJApBj6OzH7cr3IyJoJVTUJcKqrVcmpXAEZns/7CyOX0Z6huVTeSmFBsVpZuJTL n3C22UPvD9feP7vE0y7tjBxM8z+LvSDqv597WWTS+bYhWsbbgTI3H+lrObcEOjludU5qbO 5hAjL/FNLWK2LmBdAbPcFddcK8nktTuzt4UvUh0gt7EFsY6tqpGnvps+0xcIj7cixdIEkx ZjCrGXGPC6oZ0LUPUhKIebzr8c6GMB87cXYG1jT/t2xkLauwK2+ZSwNQ8F4jIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g94Gs6zdKz1F9n for ; Tue, 05 May 2026 16:49:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 271bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 16:49:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: bf2c6d23ad09 - main - Revert "libusb: change callback register handler to int" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf2c6d23ad0988a8b5dccebccdbc6fda9482c6a2 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 16:49:04 +0000 Message-Id: <69fa1f80.271bf.2ee93ad@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=bf2c6d23ad0988a8b5dccebccdbc6fda9482c6a2 commit bf2c6d23ad0988a8b5dccebccdbc6fda9482c6a2 Author: ShengYi Hung AuthorDate: 2026-05-05 16:46:07 +0000 Commit: ShengYi Hung CommitDate: 2026-05-05 16:48:46 +0000 Revert "libusb: change callback register handler to int" This reverts commit ce9ced951a0b9d004a3b007d4ac6e9087a1301a2. We should handle backward compatibility before introducing this patch as people may rely on old ABI. --- lib/libusb/libusb.h | 5 +++-- lib/libusb/libusb10.c | 1 - lib/libusb/libusb10.h | 2 -- lib/libusb/libusb10_hotplug.c | 50 ++++++++++++++++--------------------------- 4 files changed, 21 insertions(+), 37 deletions(-) diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h index ec60ce336e5a..46a2ed5eb8a6 100644 --- a/lib/libusb/libusb.h +++ b/lib/libusb/libusb.h @@ -293,6 +293,7 @@ struct libusb_context; struct libusb_device; struct libusb_transfer; struct libusb_device_handle; +struct libusb_hotplug_callback_handle_struct; struct libusb_pollfd { int fd; @@ -321,7 +322,7 @@ typedef struct libusb_device_handle libusb_device_handle; typedef struct libusb_pollfd libusb_pollfd; typedef void (*libusb_pollfd_added_cb) (int fd, short events, void *user_data); typedef void (*libusb_pollfd_removed_cb) (int fd, void *user_data); -typedef int libusb_hotplug_callback_handle; +typedef struct libusb_hotplug_callback_handle_struct *libusb_hotplug_callback_handle; typedef struct libusb_device_descriptor { uint8_t bLength; @@ -631,7 +632,7 @@ typedef int (*libusb_hotplug_callback_fn)(libusb_context *ctx, libusb_device *device, libusb_hotplug_event event, void *user_data); int libusb_hotplug_register_callback(libusb_context *ctx, libusb_hotplug_event events, libusb_hotplug_flag flags, int vendor_id, int product_id, int dev_class, libusb_hotplug_callback_fn cb_fn, void *user_data, libusb_hotplug_callback_handle *handle); -void libusb_hotplug_deregister_callback(libusb_context *ctx, libusb_hotplug_callback_handle callback_handle); +void libusb_hotplug_deregister_callback(libusb_context *ctx, libusb_hotplug_callback_handle handle); void *libusb_hotplug_get_user_data(struct libusb_context *ctx, libusb_hotplug_callback_handle callback_handle); diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c index 517630900f34..56c9caedab16 100644 --- a/lib/libusb/libusb10.c +++ b/lib/libusb/libusb10.c @@ -205,7 +205,6 @@ libusb_init_context(libusb_context **context, memset(ctx, 0, sizeof(*ctx)); ctx->devd_pipe = -1; - ctx->next_callback_id = 1; debug = getenv("LIBUSB_DEBUG"); if (debug != NULL) { diff --git a/lib/libusb/libusb10.h b/lib/libusb/libusb10.h index 354ff003de3e..eced364ef857 100644 --- a/lib/libusb/libusb10.h +++ b/lib/libusb/libusb10.h @@ -80,7 +80,6 @@ struct libusb_hotplug_callback_handle_struct { int devclass; libusb_hotplug_callback_fn fn; void *user_data; - int id; }; TAILQ_HEAD(libusb_device_head, libusb_device); @@ -119,7 +118,6 @@ struct libusb_context { libusb_pollfd_added_cb fd_added_cb; libusb_pollfd_removed_cb fd_removed_cb; void *fd_cb_user_data; - int next_callback_id; }; struct libusb_device { diff --git a/lib/libusb/libusb10_hotplug.c b/lib/libusb/libusb10_hotplug.c index fd979fd4db14..359c818b5720 100644 --- a/lib/libusb/libusb10_hotplug.c +++ b/lib/libusb/libusb10_hotplug.c @@ -176,9 +176,8 @@ libusb_hotplug_equal(libusb_device *_adev, libusb_device *_bdev) } static int -libusb_hotplug_filter(libusb_context *ctx, - struct libusb_hotplug_callback_handle_struct *pcbh, libusb_device *dev, - libusb_hotplug_event event) +libusb_hotplug_filter(libusb_context *ctx, libusb_hotplug_callback_handle pcbh, + libusb_device *dev, libusb_hotplug_event event) { if (!(pcbh->events & event)) return (0); @@ -217,7 +216,8 @@ libusb_hotplug_scan(void *arg) { struct pollfd pfd; struct libusb_device_head hotplug_devs; - struct libusb_hotplug_callback_handle_struct *acbh, *bcbh; + libusb_hotplug_callback_handle acbh; + libusb_hotplug_callback_handle bcbh; libusb_context *ctx = arg; libusb_device *temp; libusb_device *adev; @@ -343,7 +343,7 @@ int libusb_hotplug_register_callback(libusb_context *ctx, libusb_hotplug_callback_fn cb_fn, void *user_data, libusb_hotplug_callback_handle *phandle) { - struct libusb_hotplug_callback_handle_struct *handle; + libusb_hotplug_callback_handle handle; struct libusb_device *adev; ctx = GET_CONTEXT(ctx); @@ -365,17 +365,6 @@ int libusb_hotplug_register_callback(libusb_context *ctx, if (handle == NULL) return (LIBUSB_ERROR_NO_MEM); - handle->events = events; - handle->vendor = vendor_id; - handle->product = product_id; - handle->devclass = dev_class; - handle->fn = cb_fn; - handle->user_data = user_data; - CTX_LOCK(ctx); - if ((handle->id = ctx->next_callback_id++) < 0) - handle->id = ctx->next_callback_id = 1; - CTX_UNLOCK(ctx); - HOTPLUG_LOCK(ctx); if (ctx->hotplug_handler == NO_THREAD) { libusb_hotplug_enumerate(ctx, &ctx->hotplug_devs); @@ -384,6 +373,12 @@ int libusb_hotplug_register_callback(libusb_context *ctx, &libusb_hotplug_scan, ctx) != 0) ctx->hotplug_handler = NO_THREAD; } + handle->events = events; + handle->vendor = vendor_id; + handle->product = product_id; + handle->devclass = dev_class; + handle->fn = cb_fn; + handle->user_data = user_data; if (flags & LIBUSB_HOTPLUG_ENUMERATE) { TAILQ_FOREACH(adev, &ctx->hotplug_devs, hotplug_entry) { @@ -400,32 +395,23 @@ int libusb_hotplug_register_callback(libusb_context *ctx, HOTPLUG_UNLOCK(ctx); if (phandle != NULL) - *phandle = handle->id; + *phandle = handle; return (LIBUSB_SUCCESS); } void libusb_hotplug_deregister_callback(libusb_context *ctx, - libusb_hotplug_callback_handle callback_handle) + libusb_hotplug_callback_handle handle) { - struct libusb_hotplug_callback_handle_struct *handle; + ctx = GET_CONTEXT(ctx); - ctx = GET_CONTEXT(ctx); - - if (ctx == NULL || callback_handle == 0) + if (ctx == NULL || handle == NULL) return; HOTPLUG_LOCK(ctx); - TAILQ_FOREACH(handle, &ctx->hotplug_cbh, entry) { - if (handle->id == callback_handle) - break; - } - if (handle == NULL) - goto clean; TAILQ_REMOVE(&ctx->hotplug_cbh, handle, entry); libusb_interrupt_event_handler(ctx); - -clean: HOTPLUG_UNLOCK(ctx); + free(handle); } @@ -433,13 +419,13 @@ void * libusb_hotplug_get_user_data(struct libusb_context *ctx, libusb_hotplug_callback_handle callback_handle) { - struct libusb_hotplug_callback_handle_struct *handle; + libusb_hotplug_callback_handle handle; ctx = GET_CONTEXT(ctx); HOTPLUG_LOCK(ctx); TAILQ_FOREACH(handle, &ctx->hotplug_cbh, entry) { - if (handle->id == callback_handle) + if (handle == callback_handle) break; } HOTPLUG_UNLOCK(ctx); From nobody Tue May 5 16:59:52 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g94WM0hBhz6bxXL; Tue, 05 May 2026 16:59:59 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g94WM01QYz3yDd; Tue, 05 May 2026 16:59:59 +0000 (UTC) (envelope-from bapt@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778000399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=o3BSmiJJMkD2xsV3brFQdv/Ov95qf+1EqeQD6hl6S+s=; b=s/AU0zUMZhFuyAXh5ym0MC90krxnbn7ApFnS8NiOcMQUDzc0WZuJn4pMMRKH0kua9PMVz4 Clktz3s8tGDGjvpO4MSF3VjOJDgDp2uL4u/kqVooD3rK5SdUZ95IRmuJpcAJEIbxSw7X4a j8803gVdeXEMpJJBRYHgnS9q6zqEGopCGvfGVaxEC3cAbjpnw5FZkvCTxM+exRqo6bgLdN Q1kOo0QnyNf2IQrg8X6YPHZoX07E53KOx100Q9rKhyij5M6rw6Xg1yyT9huUQLK0Ujjd7S D3eSK8o/g9olC5S3EgLEStP7ggPOlkM+pgdSJHkDNz8sd/ibjg17BAvYDljpVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778000399; a=rsa-sha256; cv=none; b=TBGPDZE2qqGrlryl1YX+9BsPCebhGkfny9uH39L3KsAAAO69Wa25c9ve/WZ0oMEkumU3cN 3OhaL+GsE0PoTdwOosYPMQ2mHaiqhiKa/udoZyCt5hdQrsD6QICFAvlu1SNuBbAr0d15P5 d9q6nqIPGFqHiYDAUUAMmxAIzouCbjljKoW25Q0c1fE0ZvrWfdWgM20Kt8lVKMZAKNcxRp eJr255yezVD+yxLT85KNRx1hBFqMLgR/QbPEnGxGaTLSRcWs/4rxqvIbKx+3Utl7/b7gV/ /eScCeGPsqatp3pUfcfED2dODpIVYm01mc6elvSfUZiPLtPI0cdlGDaXv0/GWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778000399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=o3BSmiJJMkD2xsV3brFQdv/Ov95qf+1EqeQD6hl6S+s=; b=CEV8Ga6FOnco6sCpZCd2eH6/fmGDzz2UGvLcEwlWSjUMOPPjL+WkQbKgB5QciyR+e1pZtk 6zPVv66sSiYSc4ZWw2Db3Ne1TGIO7/E7PQZhgEkpMJXRqx3lTo+MKA66X6RzjfZWVpURSQ iieQjvIqy/QS5Bmw2ve1qkKLbZllLE8Vs4zT3BUHMA1oLaQt6pDJhhVmKZkBoH3z9HSKbp rCIJMOEBstmI9Bp2ZxcIq4Pc5+4mpD1Vcyxs7rvxFntQWgA7fLxva4cFf5JEGBAQk+FUWX Mdd8noW7b2dVfDugTvw6pUpYzZSx2kOfpBHexE6OBe15HcHdAjEGefW/P2QZqA== Received: from b.nours.eu (b.nours.eu [IPv6:2001:41d0:303:5e39::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4g94WL5prMz3L7; Tue, 05 May 2026 16:59:58 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: by b.nours.eu (Postfix, from userid 1001) id 6DB72414E8; Tue, 05 May 2026 18:59:52 +0200 (CEST) Date: Tue, 5 May 2026 18:59:52 +0200 From: Baptiste Daroussin To: ShengYi Hung Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: ce9ced951a0b - main - libusb: change callback register handler to int Message-ID: References: <69fa115c.1eae4.306694d3@gitrepo.freebsd.org> <9cac5d8a-8dd3-439f-ad8e-6dd082c9843f@FreeBSD.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <9cac5d8a-8dd3-439f-ad8e-6dd082c9843f@FreeBSD.org> On Wed 06 May 00:45, ShengYi Hung wrote: > Hi bapt, > > I also totally forget I have replied under your patch. I will revert my > version to address your problem at least for now. > > Best, > > ShengYi Hung > don't hesitate to takeover my proposal of change, as I don't have time now to finish it. Best regards, Bapt From nobody Tue May 5 17:27:28 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g957L1jxHz6c1Bk for ; Tue, 05 May 2026 17:27:42 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g957K6F8qz42tK for ; Tue, 05 May 2026 17:27:41 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778002061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QGZ48HlImxXV3tC0Yq4yjIi6sYHBtP4aTIPPssner6c=; b=Zfyr30V0oOsVf8xufoY2VZMABZFdY5zU5VTq4+EDRjni1ZFQLm1+0poM0TdAX2fa0/Cn6L 4M6b7X+EC0H5ZLYdWTG187Ztz5IrTEGOK0toz+zlvwT1H/K6UJ9bmrMJtREB5sgNoDno2h slUioUAvUjf5upaixqZ+hQO2juqupjraNhe1wsjEvvFxmsJVHShNbyAc1LIxqfymJ1kMaQ o1SP2IjkmUhxCdwB+pxm6Viz+b4xTlTKqbQ04/wcinEobEUWmGOuI8gxfR6bueermrrSwH QFW5QcnTAGNHjkKoVWOxKIvTYWu7s43f3M6/SV7JbklWgoUdoVoV7GhJLkxigg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778002061; a=rsa-sha256; cv=none; b=O5AwOzuCURDAeUduSDzl1x/xPUvFOf+mlO9PjQ/BxQjQ/nw8Vbe9/PBtK9fSYK1Y5PZvxC umz10L5hTiFk7sd7hAxmTHk3A0sG8Sf9hV2925BwotYOpP0hQXlj9waQa7aLwvM5FMeZv+ VsTGJSmjJjfctLaLliVr5Xr/oR+6OXAkHtwG4aCl2VSBA/rbQHCivVLthjYnHnoPi1ccYY H+j/20h+sOMMesLftr+zz9p5D6IS6ZpMgwRZhrkQO7f2U/k2FlRzFEkuarRgMZ0RTHe0IC tHU0ybpqWYibm6n7DSePD7DB4Jy/ZiqwkOhUVlhtjNWRjdA3RcKMYPRSsRthVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778002061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QGZ48HlImxXV3tC0Yq4yjIi6sYHBtP4aTIPPssner6c=; b=Zwn4TlBhAgGhozA1pnrClWgmEUZXs+B3u72kLtN0DmYCTqPxqF72Kqg+XSA0Js7WrQDuBz QFmp7cltiK+3oxcT2Wv7xXkVAVMdqm+SJdJ3Aw1DAZj92AaUYXkeNJD/cNBW5/Y7/xv0D6 /C/LsL0WMVEDKHGzEBxjNUcMEFVW3DZ+Fhd8B56hU8TOaPrxA/e0RFsOudBsvPA7tratz3 mJAUMbXss5a8xF5tRurKaH8vM1GKsz1j0thBbyw7FDFp0hUKVP7M6BcIoigP+O4kgOc6c+ TIju7kkrUYL66V+75mRtsgXGDF2fsqHwsOcmyl7CR9RXQdj02xc5q9q3DdAuuQ== Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4g957K5SZ6z4FD for ; Tue, 05 May 2026 17:27:41 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-5a86cb123e0so154082e87.1 for ; Tue, 05 May 2026 10:27:41 -0700 (PDT) X-Forwarded-Encrypted: i=1; AFNElJ/hOBlXHK0ZDqvGrMO9NGzWDcSQJnic1PSm7Wf7L9D5jtHDd1brSMQGfM0NfqkQonI7PxOhUOTex/OdtW9PbCeMAjWX@freebsd.org X-Gm-Message-State: AOJu0YyYuZe4nGw9FvJnkBuVca1y+j9RybHe4oh7zdBp+vZ/PqmK0UCz 5Rrg3H2ZK9Yplv3w07BiN3/Pru0Y2O20XT6CKMAIMXFvenGcNRDYsG3Dp8wkStksJ8uOk6sbydZ ZRhVVCW11pAJEhefGtouqDIwByD9ifN8= X-Received: by 2002:a05:6512:1591:b0:5a8:7c42:bebe with SMTP id 2adb3069b0e04-5a87c42c066mr1143115e87.4.1778002060031; Tue, 05 May 2026 10:27:40 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 References: <69f5387a.26bf3.36f56fa3@gitrepo.freebsd.org> <994cef06-a1c9-45b8-b807-3449517fe381@yahoo.com> In-Reply-To: From: Nuno Teixeira Date: Tue, 5 May 2026 18:27:28 +0100 X-Gmail-Original-Message-ID: X-Gm-Features: AVHnY4K8AchGn1-naprbBLfN4x844oaW77v6fM6Vev1sjqdQVaUkNn7HUpvR_CU Message-ID: Subject: Re: git: c4f08d46c7f7 - main - llvm-*: Move all LLVM_BINUTILS symlinks to toolchain package To: Mark Millard Cc: Lexi Winter , jlduran@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Ed Maste Content-Type: multipart/alternative; boundary="00000000000032c7eb0651155d30" --00000000000032c7eb0651155d30 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Mark Millard escreveu (segunda, 4/05/2026 =C3=A0(s) 22:= 08): > > Hmm. Your list happens to overlap with the later fix: Yes, I see it at 045a9ef829 ("llvm: Don't install /usr/bin/{gcov,objdump} twice") on my rpi4 with worlds builded from scratch: ./tools/build/stale-symlink-buildworld.sh stale symlink detected: lrwxr-xr-x 1 root wheel 12 May 4 18:38 /usr/obj/usr/src/arm64.aarch64/tmp/usr/bin/c++filt -> llvm-cxxfilt stale symlink detected: lrwxr-xr-x 1 root wheel 12 May 4 18:38 /usr/obj/usr/src/arm64.aarch64/tmp/usr/bin/objdump -> llvm-objdump stale symlink detected: lrwxr-xr-x 1 root wheel 12 May 4 18:38 /usr/obj/usr/src/arm64.aarch64/tmp/usr/bin/readelf -> llvm-readelf Thanks, --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --00000000000032c7eb0651155d30 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


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

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

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

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

    Thanks,=
    =C2=A0
    --
    Nuno Teixeira
    FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
    --00000000000032c7eb0651155d30-- From nobody Tue May 5 17:30:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g95BK1V7hz6c1g2 for ; Tue, 05 May 2026 17:30:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g95BJ6CyZz43Rd for ; Tue, 05 May 2026 17:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778002216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DGTWj8n44XE+hpBAjQ5RtbOT4Kpsk1mVZ9b3jp4l6ck=; b=NUoYreDKON9MtWfq553JneUNFpJNEeS2rHCKL/U0l7lx7PZ35Ft2LdNCraZ5imn+9Qz5sS 9iQlotoTTKZQfYXD8DdzTzu2Kjc514+i2xX0NNrx1Pn8qCMDmuMB6zh17pvZSJTYTQZSJ1 WD/tlvDknvJxf3c2SdczKKfu9Vq+FdnBYMFH3CKNjOb0RzxNjykqfzeXKU2ILLnXqftcJe vPBTLEewmIhN9MYbZ6gyxdq9pE7xdo1UOk315p4lBnEUWr1EM7S9Sti0sc7YwJ3K95MVUX EihGCsxGpCZjRczR2hx/2gsLMoY+1W9alkJjlIvxFe7riHOg9B1Fx6/yrw3Xlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778002216; a=rsa-sha256; cv=none; b=u9kHlHR4s2izfY0CmjbR5hxKZIVqa0GTr4QWXiV8A8e5WvSDl+dNeBOIQMFa6JEmY0Gtdu SXJg4R0KheYBm2a2QRhHGzAWCXcJbleO9zOADWt04BMBGn7RVXsHM9VE6rb45E03BM6onV LMRBddmRo+Or19swg0+pgNb9AT/CC7CKj55MF66KYlnU0a95RJrHBvHKxHdsq6aCt0RXJK Rw9LqVssfm3IQZWhfOP1SC+iLgVamVslHNC6LAHq/NahZDvy7k4fYzsRAMSFuC/kAzYctP joxInoWDzNpvmL9uPqC0a+pkU9l7G5bg+WiCVBg6wv++A50GBM9tSN7s03DMww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778002216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DGTWj8n44XE+hpBAjQ5RtbOT4Kpsk1mVZ9b3jp4l6ck=; b=F0CKXtULfEZfleGcC9DsjieinJMd6KWKe8ZD9qMO9m1HRbHteM5wmZdfSLqZQ5j9cfj0Qv +Tcku8sZfDJNWyEkNjzT6CayAi31T1SU2hfutJlyzQmQrHZQCDLvj9rvMzgIpJPAorhVCB 7bc2QQceotsovSvlZK/5dC4MxyJPbfoIHTQLbvyeZ8LCYtJ8oqA1jBjrNVCi/HEyk2IyML Uk+rygjSFQJFAVdiY/YjkIzU0l3nmGoEBJxQv91b1GjEiUdSDSTqBxp8K7c8a+uilw0YAA 96VXyMMu02mIRpkdGZrcRk8Cj99UGDVIWeEw9XsCAP/rxDc4l3PUFiECwV04aQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g95BJ5lwkz1FkW for ; Tue, 05 May 2026 17:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33b54 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 17:30:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: adad6862228d - main - mac_veriexec_priv_check block proc_write_*regs* List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: adad6862228d1799e7e12c724b2534b4184f7d45 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 17:30:16 +0000 Message-Id: <69fa2928.33b54.5ad14de3@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=adad6862228d1799e7e12c724b2534b4184f7d45 commit adad6862228d1799e7e12c724b2534b4184f7d45 Author: Simon J. Gerraty AuthorDate: 2026-05-05 17:29:54 +0000 Commit: Simon J. Gerraty CommitDate: 2026-05-05 17:29:54 +0000 mac_veriexec_priv_check block proc_write_*regs* Writing to /proc/$pid/regs can also be leveraged to mess with memory. Only allow a trusted process to do so. Sponsored by: Hewlett Packard Enterprise Development LP. Reviewed by: olce Differential Revision: https://reviews.freebsd.org/D56763 --- sys/kern/sys_process.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index c67996ad7df1..3a94f1c0ff20 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -72,6 +72,13 @@ /* Assert it's safe to unlock a process, e.g. to allocate working memory */ #define PROC_ASSERT_TRACEREQ(p) MPASS(((p)->p_flag2 & P2_PTRACEREQ) != 0) +#define PROC_PRIV_CHECK(priv) do { \ + int _error; \ + _error = priv_check(currthread, priv); \ + if (_error) \ + return (_error); \ + } while (0) + /* * Functions implemented below: * @@ -109,6 +116,7 @@ int proc_write_regs(struct thread *td, struct reg *regs) { PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); + PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); return (set_regs(td, regs)); } @@ -123,6 +131,7 @@ int proc_write_dbregs(struct thread *td, struct dbreg *dbregs) { PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); + PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); return (set_dbregs(td, dbregs)); } @@ -141,6 +150,7 @@ int proc_write_fpregs(struct thread *td, struct fpreg *fpregs) { PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); + PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); return (set_fpregs(td, fpregs)); } @@ -261,6 +271,8 @@ proc_write_regset(struct thread *td, int note, struct iovec *iov) if (regset->set == NULL) return (EINVAL); + PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + p = td->td_proc; /* Drop the proc lock while allocating the temp buffer */ @@ -294,6 +306,7 @@ int proc_write_regs32(struct thread *td, struct reg32 *regs32) { PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); + PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); return (set_regs32(td, regs32)); } @@ -308,6 +321,7 @@ int proc_write_dbregs32(struct thread *td, struct dbreg32 *dbregs32) { PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); + PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); return (set_dbregs32(td, dbregs32)); } @@ -322,6 +336,7 @@ int proc_write_fpregs32(struct thread *td, struct fpreg32 *fpregs32) { PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); + PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); return (set_fpregs32(td, fpregs32)); } #endif @@ -363,9 +378,7 @@ proc_rwmem(struct proc *p, struct uio *uio) fault_flags = writing ? VM_FAULT_DIRTY : VM_FAULT_NORMAL; if (writing) { - error = priv_check_cred(p->p_ucred, PRIV_PROC_MEM_WRITE); - if (error) - return (error); + PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); } /* From nobody Tue May 5 17:34:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g95Gm37xmz6c20V for ; Tue, 05 May 2026 17:34: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 4g95Gm2J3Nz44Dk for ; Tue, 05 May 2026 17:34:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778002448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F+vYEHBfZemLwCFJcUjE3z/D0aOwXK7MnQzkDne8EzE=; b=rnxIwNeyxKSl1OO//r6ankVdvbXCHo9lwfvgNW8JwaONEC69+L+cwCg0I4Kr4Hjy7n6SuD 7IsQ+d/WNHEmz2IX1FtBFFXZ1WiPK08GX/g3vmoD3cDRTOR8HVC/e3OFV1MmeSWAg4/u4c My7XvJbzIbZjYXLRl1Qvf4BmkABNGAPuZQ9uJbToxVjcQTGo31ZCC0JMoU50JpIrPAKuNQ lQBzNjJ/zxmagkGeHcceMkIa/4E2jhJU54iWj8paAKB0YZwwkx6W3iULlk+zyINmqLwbDT XLc3vR6/rVNy+RydTFGx503iNKhmxk3z4fx5GPfqBhpc79GEWonFY0V3HM2/ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778002448; a=rsa-sha256; cv=none; b=f3I4F55hTVCapEi0OSC35ImiT1NOxNIk47Vvs5uiRgg95VjGvzvYDx1vDc+69QVQA7f5mA pyXRmypCsbhTC+0Me9nDGH9jLmi7zHFi3Z9l9vT7lnt0DVRwE1VDSHo7bDxl8WYyKy327X VbMqpi7z+6xfkjfcg6KgAHemYzUY/LdE4bLdylntqo1f/pMLEM/dB6SWsvXm9yEU2aCGTS caYYzT0w24TfuhuTlRUxA8VKCAmIC/yG3v+C/d+H18uAzbZyExE915dEdSh+IMi8r6bDwX GCuONIO18mp31dyl6dhOXBReeeM1kXChjWAZMFVqT0YcIzinVsqtKE4v8eM7SQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778002448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F+vYEHBfZemLwCFJcUjE3z/D0aOwXK7MnQzkDne8EzE=; b=BE3A1PmPeTA0hvs7hgym7KLWzDMA33VOz0+0p5bX0irc9h9Xn7rFvFka329UGJ4sYLwAiA PAOm4c3JcwOmNyc0jmOWeDVBR2V6xeewakLDwhJttKUP2z4wPo+n6rwerxt/G5gWVT3+Yf PncU2VU2Sn+Qz866UvwgYiR2Xe7zi7oVrdxJMZ2OUF0Ek9GPEOvuPi7hy3HTeYe/HC/Hmj fPSe0kt5N00frT0maz4soRacedBGxXqoGSBRssElNgn6EU/4+7IwPv5GRwWBU1npR+PSY9 +NUrNNrzHtTyXAr0oQKChwZrLhkPvLufDbby5XzZW3BPJCmOIHIMvIrg/BnaNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g95Gm1qc3z1G48 for ; Tue, 05 May 2026 17:34:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33d7a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 17:34:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 89c883c09ab5 - main - mii: Fix SMSC name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89c883c09ab5e0fdca7ac5dfe74fcc46b7669eb5 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 17:34:02 +0000 Message-Id: <69fa2a0a.33d7a.ce004a5@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=89c883c09ab5e0fdca7ac5dfe74fcc46b7669eb5 commit 89c883c09ab5e0fdca7ac5dfe74fcc46b7669eb5 Author: Ed Maste AuthorDate: 2026-05-04 23:13:44 +0000 Commit: Ed Maste CommitDate: 2026-05-05 17:33:39 +0000 mii: Fix SMSC name The LAN8700 / LAN8710 PHYs were Standard Microsystems Corporation (SMSC) parts. I presume SMC was chosen as an abbreviation, but the company always used SMSC as its short name. SMSC was acquired by Microchip in 2012. I kept the pre-acquisition name, as NetBSD (from where we obtained miidevs) uses SMSC. Reviewed by: adrian Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56819 --- sys/dev/mii/miidevs | 8 ++++---- sys/dev/mii/smscphy.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs index ca7e78a1cdd5..89d8e54a1843 100644 --- a/sys/dev/mii/miidevs +++ b/sys/dev/mii/miidevs @@ -72,7 +72,7 @@ oui RDC 0x00d02d RDC Semiconductor oui REALTEK 0x00e04c Realtek Semicondctor oui SEEQ 0x00a07d Seeq Technology oui SIS 0x00e006 Silicon Integrated Systems -oui SMC 0x00800f SMC +oui SMSC 0x00800f Microchip (formerly SMSC) oui TI 0x080028 Texas Instruments oui TSC 0x00c039 TDK Semiconductor oui VITESSE 0x0001c1 Vitesse Semiconductor @@ -361,6 +361,6 @@ model xxVITESSE VSC8514 0x0027 Vitesse VSC8514 10/100/1000TX PHY /* XaQti Corp. PHYs */ model xxXAQTI XMACII 0x0000 XaQti Corp. XMAC II gigabit interface -/* SMC */ -model SMC LAN8710A 0x000F SMC LAN8710A 10/100 interface -model SMC LAN8700 0x000C SMC LAN8700 10/100 interface +/* Microchip (formerly SMSC) */ +model SMSC LAN8710A 0x000F Microchip LAN8710A 10/100 interface +model SMSC LAN8700 0x000C Microchip LAN8700 10/100 interface diff --git a/sys/dev/mii/smscphy.c b/sys/dev/mii/smscphy.c index 4e0d3cd3e18e..d578242f5a61 100644 --- a/sys/dev/mii/smscphy.c +++ b/sys/dev/mii/smscphy.c @@ -74,8 +74,8 @@ static driver_t smscphy_driver = { DRIVER_MODULE(smscphy, miibus, smscphy_driver, 0, 0); static const struct mii_phydesc smscphys[] = { - MII_PHY_DESC(SMC, LAN8710A), - MII_PHY_DESC(SMC, LAN8700), + MII_PHY_DESC(SMSC, LAN8710A), + MII_PHY_DESC(SMSC, LAN8700), MII_PHY_END }; From nobody Tue May 5 17:59:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g95rb09c2z6c4Dc for ; Tue, 05 May 2026 17:59: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 4g95rZ5S1jz47p4 for ; Tue, 05 May 2026 17:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778003998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ez8bqK2UYur8sDk0zHaM52AK1e3O1SqXvHpTr/6ykNc=; b=D01OrbfLjG8PvNlYT0IER1jh/iseZWuMvVKXNwfyqDvqNCK4Se7WOfbMeNIThWUMuz4Zlp NBWwKJjqWh5pFeCx8qNPrdXarQ5H7Ahj0FyYHK4pwzXk4U793QwzJb2ai5vtR13KSHlfI6 fxklmZ7Ac4GXO2s53szynoWxdoWoBB5i3poftsqgMMeu3ef8MDSjdbjzmXgDqeJ1w7bkLN EfwV9SxSl+0v6s1osgiMqxTvPFXU9G9OsnhfJmcnlbzkhqClzCFnBRS8tqLP5bxtuyJHyr GYK6rSBEJ5CKyTHi/UrQy1PsGjG2kiDz9f4l4gc7BJFYgs55b+XR6IStK15Cng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778003998; a=rsa-sha256; cv=none; b=Pk1QcADQv70A+plof+aUUONpadqi3pJcIRlUSqvxTBtYcRPlPel6AOwKhWzdVCpbjF9kgg bXEJSY8ICfAmYbh4v6FThRmT2qfkkGFcztGiwwG92X6al8Iv0k++FrWLSLH/k/2XnSer6F ZNZ+iOIbZxe0Wdpom534VaKjtgxAvMnPkis8W9g7SFPCwXdNVjmt5P+lB3EAuOK3tJBGy0 30SS3+buCgodfx+zwEj9EoNIus9TMleOluyVjbDWnEywBmjC6ta0j3xNX1ehW2z/xgefQ5 bSNsloDEb3VSlokzzFLxjCsD0eRZCGC1LG0Yf8fthILVev9yDU6i+bby8buH2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778003998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ez8bqK2UYur8sDk0zHaM52AK1e3O1SqXvHpTr/6ykNc=; b=OvI2ulXBuLCrJuK4yPake+ayYzXEjqJJuUtD9SWzzorQjBSVobAOHJYBSH4nYHkPRLuana XvNvdKcsmKMuPTqy42aMUgQe8JmOQZ3hqB+FR0R9rUNdQeh6w/nGxuIwh/j/MjKmlRplk5 aNarozymWTYKp4lDN8yNTss7UYmAybvcTrO/8gQc50RAqIha0rJ2QMWsqZWuhowPE0n2vR XMmuPne9hmtHZUtKuzQ1wT1ucE01UoZzrN9NlXLkmde5oTm62LohwzM7YnbFw40fF4Zd1n xLM3LFIgkRTZaDUttuxioXs+4YwISWAxKHM/ve8FBLfvFw4AW+leyWnGRYi+5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g95rZ4bBTz1H9x for ; Tue, 05 May 2026 17:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35fbc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 17:59:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 49e496d27768 - main - stat: Set the timezone before testing -t flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49e496d2776870fb36ed8ea4c8139b5eb9f7f747 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 17:59:53 +0000 Message-Id: <69fa3019.35fbc.736fd5e5@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=49e496d2776870fb36ed8ea4c8139b5eb9f7f747 commit 49e496d2776870fb36ed8ea4c8139b5eb9f7f747 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-05 17:59:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-05 17:59:36 +0000 stat: Set the timezone before testing -t flag The test assumes UTC, which is what I use on my development systems and clearly what is used on our CI runners. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D56836 --- usr.bin/stat/tests/stat_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/stat/tests/stat_test.sh b/usr.bin/stat/tests/stat_test.sh index f2de15cf4f9b..282efc91303f 100755 --- a/usr.bin/stat/tests/stat_test.sh +++ b/usr.bin/stat/tests/stat_test.sh @@ -1,7 +1,7 @@ # # Copyright (c) 2017 Dell EMC # All rights reserved. -# Copyright (c) 2025 Klara, Inc. +# Copyright (c) 2025-2026 Klara, Inc. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -234,9 +234,9 @@ t_flag_head() { atf_set "descr" "Verify the output format for -t" } - t_flag_body() { + export TZ=UTC atf_check touch foo atf_check touch -d 1970-01-01T00:00:42 foo atf_check -o inline:'42\n' \ From nobody Tue May 5 18:24:43 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g96PJ5l4Yz6c72m for ; Tue, 05 May 2026 18:24:52 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic303-25.consmr.mail.gq1.yahoo.com (sonic303-25.consmr.mail.gq1.yahoo.com [98.137.64.206]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4g96PH6ZxVz3DS9 for ; Tue, 05 May 2026 18:24:51 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1778005488; bh=fQQBZLojsrm7J2K+meo9uYpDq4t0eBz/BfJECKQMfDg=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From:Subject:Reply-To; b=j52IXg8gVORtQcRZ8qwZfcWLyIPfU1CbA32Kuwv9Qc2F2kLZbbbW6NCu0NcbyuvyAX5aImS3c45Nwsh3R4Z0OrfVqHBFHYy3b8/yuuoWpP63pdHCz1X7g8HIcYiO9At6Z8PcL1zlFk8unEFUB+VCWnF9C3Qftktal2DWrcPFuWb+hWtQPMS1ekWXrON5VahPRbWrNqasg2OyKSzy+kbyIk3gBkqlMwa4FRn+Mfw1qkAxuCz07nvBJ3e3GhtptHBNB9VuXlt9Aod0ACVmKnFTO1yoV+XIu6jYaUCAws1VN1SXHKK5soTm0kZVp8XivCRCoq/yiVftqAoDWmLOlkRAIQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1778005488; bh=o6sCjyDR1GHoSo8PwCQokm/e00Q9IKtBnXj2LOTDt7R=; h=X-Sonic-MF:Date:Subject:To:From:From:Subject; b=mtcwzQEjo3fJHQqGkn8V++YLKN59+dwi09XqVlpCJOt2prHATuCzYKMTx8SAxXYwmHJXbm016LywAYKdhn6hmN5/NGdJIcOZyEJk2qhbR//BcCEeSqHDNq/eowDnVOlTC/slNscXha0v4Dtr3eKClvh3xwglF6fWhz4CvsdONykJ+ANA+ZvspjIiGycuXnF5OyDKw8xiG3zqmON7LWvxC5ecIHynB+LKDfVwjk2nzQ5/of7bEob4+bHysIedbOWoO+tIAdlEmaRpsJjC4t2f+H++YFB//O5/bKrbYSP3dz9MBR9l9g9m5gkOGtEoP7SbvrxKNBgTanM+//JQXjD8ww== X-YMail-OSG: DiRGBicVM1kY0PAqB.7oLnmDWlxGTTCV1MEXVwlXR5KWNcKEDY3Qo6ChCjtPH2E 1DnUVDPWEC5Z_zzXyHcWGOrN46pCFD3DhCnNjZ_afEwZJR_oglMUv_O9PnKMwK21a7cfGvgon2mJ clHbHzkZACtTh3mRIc4zkadC7YN49oB6vvMmscgTdBrqwDiFmRnR7QtegfGtb0EWRWaCT5aGozv8 1KuAvXwXqvlesyTgEse5zPuexdpfpnmrViIOVbdEUA3jWpu.F_gjMU6nLZyH3EfQ1T1OtOZwAEfg YL_9B9xkP29GuoGL_rPoqT9C9QVIQTwP5qxmH1zJ6xiKxBCRg6NHMhdBjUkkpOts1injROOphaT. FiulmFoRIxZb93qZ0mrSowSSoJyRyy3ZsdwZoy9GujM3Lm05OhECfYl3BRp7oDzAmZJKBfqr0ptf v8joR2bV5WWFBCzLlr8dn5m5b.5dv0zDUfS0ZI3zdxBazoJKJqMPSHXWyy23cENpmBCqVu2Ly8er deK0TW77BOwpSU5XMm4yVdSlbFdyOUvv45mFmd9vvtytbYHzgJ15Nxz66q0kWIJezvEYCmfFT8r6 hfU88LIfHb.iO4EIyYJLCH3S96GKjRfyqWKpAucLxWdgY88GFUXjY8GTjHHE1MLcW1rkcWwqmswR kDCq2GdVQdUEmiiqDlkNdNng86zyXi0Xd7kkNSUMZLQhOQiBUk0fRrUfKprOKci4sfHMW1np6g.3 NFGbcu1pnFURNwVkO.rH3hlcEK2jQX7Orn_kVdzdAh33YyhiaPnPV9l8qY6.1yVM5anYB9V.2jIg eJ4jcqB949dqJjiwI6i.iO25uel1307NF8S3eNug_PGXzbvhgaMvMh.88xcas8YKVEXtRrcoHfSl kTeEC1k6g5qjFjg1JMSsLqS7wMLN98wKeTmq68QkuB3zsj1.CpnMowpRcA4d4FDXg7jYjTQ6kBmT LbciL4WznjPsnqPvONfJe2HrMMi02Gjb0yJEXudRI.Ft16ipWxuAdf7CRSALBLHz6nQ0k8V6ioVC plj.0jgc2uUNvGUmI4gLPnJJeXrPsib7EX4WDJ3OJmTbjCCjDyMIDG.RdJxMmGWy6r1C42tdG.B1 dPIEplKw9SCslCpqB9dqd8WbDqb1IVmwreTi6.uS026DlZVHDr_KL2qb02xPu6lR7JtZb4GmUsji rPduXsfSzxSOYXYupU2ZWZYYXCcIee5s9S9KqHnjyd7OUpQLtAChexs3qlvKBF15LdoZoosK8_zT Z7dRkMQqgcnlAS_n_uen_6Fco9_zvYzx2IpPIvfn3T.VTLzViKV44fptfbyj4u16h3bSIY_.IAte iKjXdi5_2El8JViM6DD27waD5XawmP1Hnkeid2lgSrorm0sW8oxi.TBjkUxd5XFfp0EcQLyAe.Vi fqX.PEFfAU8NKKDZGdSLk65zJgqz2lujg2F1YbRL4wRJjc7BxHW59taiF0b815XWPnvFb6Rqogh_ TFNSieIe_mxapeP5K5mYAIgxQX9i2OZ0LaCaAyxL0GSRe6W0ij.AUmdGhN5kdytzZ6tD3rdoZVTX ks4OyJO1BWrYy2HQDiwBuk3J9xL5RYOCJXShmLdRkOCEM4gS6wlG4Yi5WSjmkNpsIh4S86euhhu5 yryexHC5YidC0D44js4EuaNipaHvBeE9.SJGS.T9BsVYUDNnLQv4mLI_e5PYBz.RePDJn3yQL_ZY 28zC.RFSGdq30KGiZBPBaBk.QQN4S.3RDs2OdF8Pk9zGx6rFNvmYM24AlutivddIMqszhZYqUtKO OwfodWDaFmdhINJx4hluCUncRX6NOnCfAM2xz8qWeaJS6SwvHGUet2zJSEetODxTRGR7YIWHr31x s21lt8cJOMNZRy3ae7QHVzV1y3M9xhbft.4uVkTO1_Rqhx6Df8YuYKa5MfNx62nhGZZ2D6G.v15p ej6zgKWo30eUHPMXwvK93PB64UvcZEBNZ5T9Ru7tyOtwutyNjp5.1OAGrqURqWTzNA957FKgda9t 8TccyMTLwVHV.xMcaKMUkTmeuCpMTyEpSk.gU3kH3BPZ6YG17IM2.tAWuIv8qrrakHOUJMLDBPTF z2EHlPxcp3NpaqKqM7YK_7zDPCsR0K_dKPVAXOcARuRr_FQfwycvkeoHSGgytw7ZIBUCiYj6kB.P Np6dpTBVXQKF4DxE.EiCkd02KPFTBcnFUYGtM0B1OCFucHfWF8fB5upUaU5feITX5qyuOatBSdqQ iVuHwDMPAxiYDruMHJV9Y22uNSzMwETY9PKy8DBbapQHjw1r3uyyS8uofwRq8fyxBj2gfjvZYT4T 9QT5VrSRVCvec1ggShTMEP7qwjMBriUXBvHieCPPBr96A0OP1 X-Sonic-MF: X-Sonic-ID: e9ab4b7c-0df1-4ae7-8af0-626c7b23c5a0 Received: from sonic.gate.mail.ne1.yahoo.com by sonic303.consmr.mail.gq1.yahoo.com with HTTP; Tue, 5 May 2026 18:24:48 +0000 Received: by hermes--production-gq1-7bb7df5c46-bkqln (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 857fb219e78bd26237f7c6de75f4e53f; Tue, 05 May 2026 18:24:44 +0000 (UTC) Message-ID: Date: Tue, 5 May 2026 11:24:43 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: c4f08d46c7f7 - main - llvm-*: Move all LLVM_BINUTILS symlinks to toolchain package To: Nuno Teixeira Cc: Lexi Winter , jlduran@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Ed Maste References: <69f5387a.26bf3.36f56fa3@gitrepo.freebsd.org> <994cef06-a1c9-45b8-b807-3449517fe381@yahoo.com> Content-Language: en-US From: Mark Millard In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailer: WebService/1.1.25559 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Queue-Id: 4g96PH6ZxVz3DS9 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On 5/5/26 10:27, Nuno Teixeira wrote: > > > Mark Millard > escreveu > (segunda, 4/05/2026 à(s) 22:08): > > > Hmm. Your list happens to overlap with the later fix: > > > Yes, I see it at 045a9ef829 ("llvm: Don't install /usr/bin/ > {gcov,objdump} twice") on my rpi4 with worlds builded from scratch: > > ./tools/build/stale-symlink-buildworld.sh > stale symlink detected: lrwxr-xr-x  1 root wheel 12 May  4 18:38 /usr/ > obj/usr/src/arm64.aarch64/tmp/usr/bin/c++filt -> llvm-cxxfilt > stale symlink detected: lrwxr-xr-x  1 root wheel 12 May  4 18:38 /usr/ > obj/usr/src/arm64.aarch64/tmp/usr/bin/objdump -> llvm-objdump > stale symlink detected: lrwxr-xr-x  1 root wheel 12 May  4 18:38 /usr/ > obj/usr/src/arm64.aarch64/tmp/usr/bin/readelf -> llvm-readelf All those paths involve /usr/obj/usr/src/arm64.aarch64/tmp/ . In other words(?): they are from the bootstrap build stage that is sometimes used? May be what cleaned out those llvm-* under arm64.aarch64/tmp/... (or did not need to create them) did not clean out the links to them as well at the time. > > Thanks, >   > -- > Nuno Teixeira > FreeBSD UNIX:     Web:  https://FreeBSD.org > -- === Mark Millard marklmi at yahoo.com From nobody Tue May 5 18:41:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g96mD13XNz6c7WH for ; Tue, 05 May 2026 18:41:16 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-oo1-f48.google.com (mail-oo1-f48.google.com [209.85.161.48]) (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 4g96mB1JlDz3HpQ for ; Tue, 05 May 2026 18:41:14 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.161.48 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com; arc=pass ("google.com:s=arc-20240605:i=1") Received: by mail-oo1-f48.google.com with SMTP id 006d021491bc7-69498319ee7so123040eaf.1 for ; Tue, 05 May 2026 11:41:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1778006473; cv=none; d=google.com; s=arc-20240605; b=hX0f+McK5tt3ID2074Cilwrb1Wth6/VSxCnMundEMtUqBduw6t4+cL3G7+7bM+7fVS ftLQFsZklS1Dr6c4Z8yLCJJy4BotYAx8kW9z5bpq0t0xfqVXrOs/ME6mp/OiMvfuodxS qBJeCUz+M0Ry02FNF9zztfDq2mkJpm9qHzMGMOmrf9t+a7a265ajZHkpn0RFHxc+8VJ2 w52W4Nx76M40lS/0csYEVX1GkLwkR4lbkRTU96Fkp6z6+VpTKCwwriFUIeuAzEikHnm4 SAPg/sv+ugbv08Fn+zmjRQtIbDwdYRM/c82qtJeLEWz+W7opNwZTwSdrBVTeWve8az6X YFPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=to:subject:message-id:date:from:in-reply-to:references:mime-version; bh=1NYxSU6nUPwce6w/hGngtkUgucaC2MINAQrGGf+A2ko=; fh=JMTvlwQcMeEJzT3IaV2gmjlcE8Kn5Xv3yPUeBpOyH2o=; b=h4woubSi7zcKjMIXePayz2pK3epm8rtGBYW8V2su9VUgUjHbG8eGyMyLqul5bvWQ1m FMy92I40FDKmoMg7RGJD52dmN71u+JE324+BIgphSve6gVyDbj6CVhzI3cjTFsZn3NXr sqgZaA8xYlf+jkK0p3wfbqQtDMONXx4yoXZ3hXXbjWS/GCmLlTzSAEItya3u6SSd4x+C HMe6+JfIpkk5kw1n/cuiCcAZvok6vZcSUOu9n3EZ0TVEMTIm518ObpHofGfD3UwT1cOu Kv6n0z2ZVEn57/kHjMBJQYO917X0IjZvxlHYZ9P1zCeTDPBHht0DsHKLEb7lTHBSGCI1 0VWQ==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778006473; x=1778611273; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1NYxSU6nUPwce6w/hGngtkUgucaC2MINAQrGGf+A2ko=; b=EGHPZJQdEr3MPS9OiLAwHrUydifP9NBzC3NYM1NjWei9JVvnRtQNmuk7irb0IfYAI5 o1ZpfHmM106avZLCGzxLc9aUAg8XMNcHRmPnxIfgHSe0owxcgEz3IobJw0aXtrhY567l +fJZC7jNQrYYQW7ffuC40qjVp5QfeCzqYRAQFXkfFfTJlHuJpxe3HlGyqRM7H/rf9bwF ougD0c4f1x6bBsGcuqbhYgC/gD5hX0e3yuUrJi/0/3NB6kQGgnwzEHGV+7vKeF8D4kOj 0ChWwh9+4fxvZHtadYCPYRUAFYqF0HQ7OApH9OGqNklhsbgJ1Rb6yZE2A2Wn1n/8SaN9 c9vg== X-Forwarded-Encrypted: i=1; AFNElJ+qfZNZDJClVYJrkg8rGWK2+oFDoeeS90jtsrAeNoig9ALLSRlKyJZuFgVOfTyKz0z1GL7LPgy2IqdZCjrXMtx2ipcO@freebsd.org X-Gm-Message-State: AOJu0Ywwv5MJH+Br9qXGyTDS43UcvnE4fPop4bSXF5gXBjeK73BRkHBc UXiaFQ7oqT2e6Xq6go+LloiOu8t/B36Uwctk6M5abdghRXob1Ywo4czzABjn4KlAlLMaaq+9dEj E5BZ6Xo4KSqCN3MGdiTM2XtqY33F0FqriCA== X-Gm-Gg: AeBDiesrBiWVgKeE8Qle/6oqN4HCMrlSis2U1GWjSX87dcuWUK3SaK1EJsEAOoemZ1k s0QT+7iFhH1UX69sDAbT2gU+OQcn12kRfFEnmoTsJkvgJDJGcs3owF/UtZAzX5Btcnd/gSX+3tb YEQPxiz7ecb0pidrqXOlg4/yi59n/OSFlAIXJcAWrWSaqoqN6YsLm0JY7+5tZHA2r/E1kl/bNn9 M6KmTOsVOw64N/TwvVi6lN+Bi6Zk9CsoeWwKjxVJZIOciES8fmniCt//54QQY4xSB49hWVOOGd9 H6H3oqf3wPYJM3rGqwbEnUCW/DsDptlt1WNGBWJMCa2MwW8x/Q== X-Received: by 2002:a05:6820:858c:20b0:694:8932:c794 with SMTP id 006d021491bc7-698876f0804mr1630600eaf.5.1778006473162; Tue, 05 May 2026 11:41:13 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 References: <69fa2a0a.33d7a.ce004a5@gitrepo.freebsd.org> In-Reply-To: <69fa2a0a.33d7a.ce004a5@gitrepo.freebsd.org> From: Ed Maste Date: Tue, 5 May 2026 14:41:02 -0400 X-Gm-Features: AVHnY4I0gW2mJpc9uOBpnhqsBR0sSUH6mf5-Gxod64DH2dySbXsvAcMqLKaxeXA Message-ID: Subject: Re: git: 89c883c09ab5 - main - mii: Fix SMSC name To: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [-2.54 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; ARC_ALLOW(-1.00)[google.com:s=arc-20240605:i=1]; NEURAL_HAM_SHORT(-0.95)[-0.946]; NEURAL_SPAM_MEDIUM(0.40)[0.404]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; MIME_GOOD(-0.10)[text/plain]; RWL_MAILSPIKE_GOOD(-0.10)[209.85.161.48:from]; MIME_TRACE(0.00)[0:+]; MISSING_XM_UA(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FREEFALL_USER(0.00)[carpeddiem]; RCVD_IN_DNSWL_NONE(0.00)[209.85.161.48:from]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_LAST(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; FROM_HAS_DN(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; RCPT_COUNT_THREE(0.00)[3]; R_DKIM_NA(0.00)[] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4g96mB1JlDz3HpQ On Tue, 5 May 2026 at 13:34, Ed Maste wrote: > > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=89c883c09ab5e0fdca7ac5dfe74fcc46b7669eb5 > > commit 89c883c09ab5e0fdca7ac5dfe74fcc46b7669eb5 > Author: Ed Maste > AuthorDate: 2026-05-04 23:13:44 +0000 > Commit: Ed Maste > CommitDate: 2026-05-05 17:33:39 +0000 > > mii: Fix SMSC name > > The LAN8700 / LAN8710 PHYs were Standard Microsystems Corporation (SMSC) > parts. I presume SMC was chosen as an abbreviation, but the company > always used SMSC as its short name. It turns out this isn't completely correct. Standard Microsystems Corporation did use SMC in the 1990s when they produced complete NICs (e.g., the SMC EtherEZ 8416BTA). By the beginning of the 2000s they sold only networking ICs, not complete NICs, and exclusively used the SMSC name. The SMSC name was firmly established by the time the LAN8700 was introduced. From nobody Tue May 5 19:02:18 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g97Df3zMxz6cBFd; Tue, 05 May 2026 19:02:26 +0000 (UTC) (envelope-from olce@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g97Df3BDsz3KgB; Tue, 05 May 2026 19:02:26 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778007746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=d2Li/jA13aWyRFyPctNOyybo1wqU32JzIPtb2iI4l10=; b=yjB5qrPM8l+IlhIA8GQoAH1TwPujLB0dFQIAy7onDpdXjHgynBzbLHrOqTrUEdhKmLzoKc WBSz2fSrIFpug3sTt4YTBaAW8UTb2fVPxN0b+2fw9mWTm5/7fXbVe9lBnfJmracSkKTuFZ fEP9FhTbdaUFhScxHL7Va3Q0FsVOqGxXCsXbMU6QRUwyTM6l8YKW9Zi2F8pyE9F7WQdXjd O5Pn1OPITYAcFdiHMO3dMQ5OKxqnahMFwSMcMv1fsZwXzqbgAUUwnwgk52Ti7v12zsEAGW gOZH3+W8BGf6Nz1mfIb+nxdEUbbGyX1zcFWl1rrtldP1OtNDn5qugixrtn/Oog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778007746; a=rsa-sha256; cv=none; b=GK7qp5KGRuilnD68Id+bwhL+DWf3bGzAQ1GCUEaMBz/5znpvflYsmQewpK6DqMVfGL0fDJ O31FJCedHmjZCIw/fu6F6vs6XKR1Nk5D/yZ8+NBk2oT4FkNz/AcKY6pEx2oHJukb5c61oG q7r9MXB5TJZ8+E30OJLLFIVbZDoUdE8pPHtrINJ6f2Lqw1naW4mFFmTBgqxE1qDypKHYjh Ycb72smfJiU0gvNZOWRQZWt4RV1Y3o0hJYBUWhnEWLOmDd0Y7udmGMouawzMi5RU2xM5Ai hEgEjz2ZsoHe524DLAmF21DD1DM4FMvqOmsf5rqZkOkL9FdL9QojAzBsL1/w8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778007746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=d2Li/jA13aWyRFyPctNOyybo1wqU32JzIPtb2iI4l10=; b=rB90eSIi+QRtearL+B76JOVGfEfaQCLaFI+MBZOJO9LMWbG3t+JzC6yHDYtYXHUaa9mt05 MQeO1tosztci89FMVa1vGpVSqpaJvuVzysS2OCCaD9D8jARmbd0Bb+oj75lcHfduLCJGZ1 XNiP6KUQ1gHtm/n/fgNdzEPiBwCuZJJH7jwooQucWzFOiiKT9LvDuyzdF/XunTmmYAFnva BcyTJYWBgam/6cb6+mLQgOqjEE4L5AHvcqby6iX5fiaJsv0Y83YVtBibBJJrFoJkXwOPYq k6cGA3eMAqG3RFxTNe5uTLPWR6RJlSAmAGaiJF7cwzRVB/vMrBkLE9p1vuGkQg== Received: from ravel.localnet (lfbn-nic-1-328-19.w90-116.abo.wanadoo.fr [90.116.162.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: olce/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4g97Dd5Lkdz5mn; Tue, 05 May 2026 19:02:25 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: "Simon J. Gerraty" , src-committers@freebsd.org Cc: dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Konstantin Belousov Subject: Re: git: adad6862228d - main - mac_veriexec_priv_check block proc_write_*regs* Date: Tue, 05 May 2026 21:02:18 +0200 Message-ID: <2679361.0dHE6SNnxz@ravel> In-Reply-To: References: <69fa2928.33b54.5ad14de3@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart4271060.BRNeRiNLvY"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart4271060.BRNeRiNLvY Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Olivier Certner To: "Simon J. Gerraty" , src-committers@freebsd.org Date: Tue, 05 May 2026 21:02:18 +0200 Message-ID: <2679361.0dHE6SNnxz@ravel> In-Reply-To: MIME-Version: 1.0 Hi Simon, > > +#define PROC_PRIV_CHECK(priv) do { \ > > + int _error; \ > > + _error = priv_check(currthread, priv); \ > What is currthread? This is missing the last round of small changes requested along with the validation (https://reviews.freebsd.org/D56763) and I guess breaks the build. Regards. -- Olivier Certner --nextPart4271060.BRNeRiNLvY Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmn6ProACgkQjKEwQJce JiedrhAAqa3cnZwiZUy0/Qd1a+eZkQoUsdf7jNf4maNLsz+wosglOoNu2+JaWM0t juUYgS0xN0XYLCyEkaXg6LDyDgx759NjScuGGc1gVcF1xUcQdInv2nLQT8uKlKD6 DHcd5B982GrrRvRwwxGWt/cnuknr8qF44CaYkyKnmwsOGP79YnrVq87+i+WtqxHC fh/niqjAfjs+4xlj3tlHMhxq6U6IA6CmZk2pIqPl9GtdEGpylISUHlc4o5aP6/Dd eDCn0y4gU8rA18MRfnhAaB82n+hxNg0xNgrRehLdkVkZTaRefwe5TotUyKFuLslk pPvkKgTh5IHVm8GFFikoG4HtcojVi0eX22sRA1QSTDVntl4esfMcV3k8SgCwN4TE THh7nkCLdwUdMWbvEpS2ffrd8hECk8i5kTtBTd+IolZJtAuvVjjyWxOhR0ug2RRB LiK2hCPCZJEOqkuYFI9FCOgLpU+hC8iluFwQLV57wa28yL5b3Yc90laNkgwtYKx3 qv0ZyhyVFNMRbZ8jxxwE/RcD3ISBUB/Ecfq5FRYDkz9OCe+o8rAyngi/8JHRggWe hnTxzYKuEWr+nuU6vRXg6GxiFTEWzcsUXzpNaLtDbSi0HX3dzjMxVR2vBvkiRerL CBAi2xW/8xXGEBcf+G9qjav06NkpGq9EKiLHKiyqfKOdz8SLT+Q= =mz2B -----END PGP SIGNATURE----- --nextPart4271060.BRNeRiNLvY-- From nobody Tue May 5 19:44:46 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g989b5mmXz6cGBq for ; Tue, 05 May 2026 19:44: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 4g989b575pz3WsX for ; Tue, 05 May 2026 19:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778010291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fF9WJbJyHFkQVRIR0KjyBR5E29ycG90DYqxwpgvvPu0=; b=p5i2N8BH2o2T8WGX0jaXEPKN/rzqoxzRA7nt02+d6rCHHdv8f7t5Wu3iAJwtnEkIh7SN9A ABmXHkb6uAdZjbFIuawY8TpYC57+540ogeCL7BFXbofF134kEweZg8utZqMdxK0Bd9sAdN fKLP5WiirT6Y56PJcsfxYePcbRWPWPrqC/1FNcuBCO8dKGxp473m5UCy9t4i69eSxJ7WLS HUDQR2oLiqmGcmkada9/2T/ZWGMrNnYdMAc/r8HvQ9Yo8cosIrikyGmjBMG8PJtNsfHx1t 2pctumWnb92Au4xLiYKdzqeFoY6F8VFTda6v4eG8MHMOW4jywocK445zkzPxSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778010291; a=rsa-sha256; cv=none; b=Lrq0+YP+UmQ++5hwi/hQohNGKoHvCn6cXefwb8x4m30Gt+OZTi3op2K538LZSRLy9WWwvY gfxJplpAXX9cyWNhitbIBEgTHiQhk87jnptbJNhP/ExC3I5Emz3bIGLFU4o9l7ZiF0YYVs Q2vZRwP8+N2DTou+PSGm2umzTYj6oYqFtgdA7BtM8w8qLtFXCbs70U7/eQNXrLAqi08xbb q1nEzXDe9QlfVxn9IqzeaSSu0V9gxvKcaIMWd9AUXu2o/W/JsWI/uEMdmnHvhdcBab/4lc 4lUkbK3NqKtan3OooRUiztqa5R9/iPepCvnVDMVyWKh+BHTtH4lZrvd6Xdz0TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778010291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fF9WJbJyHFkQVRIR0KjyBR5E29ycG90DYqxwpgvvPu0=; b=Eefd8UWPaHXaR6C4a72tgHb232URE+/cMqhUpuS61l80Bx9/zhU6WsYlqfZV+f+evDGyMm dD8nEPdXoSUjqwgE1CS8uQd89tJFlBznH+J0a/wBRNhJ+0g/iTG60XDLWS32LMjGsF2jdW MkAx8bFeFdx3pJfkpNFmY4w6IiJhmIcHd1YUAJwof7z4fnure2rBj+poGnSiNwnCsMSSwN fiApeTthAAhrxtcRsXJwO6EF11SJ0dBwPqdZFAyE5Ok8Auc1iiHXVWK91XUe32qJGezeMV 43mhPkcPC4LISwLvmW1HLyBNhKEzUovzsjyzy08Ds9daTxXB1LiT4WC7lSgzog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g989b4Q7Bz1Kx7 for ; Tue, 05 May 2026 19:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 411ad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 19:44:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: fd386e76fa2b - main - md5: Don't generate test cases just to skip them List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd386e76fa2b29d99525c246cbfc05768a1f4a76 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 19:44:46 +0000 Message-Id: <69fa48ae.411ad.49d9df99@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fd386e76fa2b29d99525c246cbfc05768a1f4a76 commit fd386e76fa2b29d99525c246cbfc05768a1f4a76 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-05 19:44:29 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-05 19:44:29 +0000 md5: Don't generate test cases just to skip them Don't waste time generating Perl test cases for algorithms that are not supported in Perl mode only to skip them when they are run. MFC after: 1 week Reviewed by: ngie Differential Revision: https://reviews.freebsd.org/D56687 --- sbin/md5/tests/md5_test.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sbin/md5/tests/md5_test.sh b/sbin/md5/tests/md5_test.sh index 34bdf43f13ea..a7632664c7aa 100644 --- a/sbin/md5/tests/md5_test.sh +++ b/sbin/md5/tests/md5_test.sh @@ -176,6 +176,7 @@ out_7_skein1024="cf21a613620e6c119eca31fdfaad449a8e02f95ca256c21d2a105f8e4157048 out_8_skein1024="e6799b78db54085a2be7ff4c8007f147fa88d326abab30be0560b953396d8802feee9a15419b48a467574e9283be15685ca8a079ee52b27166b64dd70b124b1d4e4f6aca37224c3f2685e67e67baef9f94b905698adc794a09672aba977a61b20966912acdb08c21a2c37001785355dc884751a21f848ab36e590331ff938138" for alg in $algorithms ; do + eval "perl=\$name_perl_${alg}" # supported in Perl mode? eval " atf_test_case self_test_${alg} self_test_${alg}_head() { @@ -228,14 +229,13 @@ gnu_${alg}_vec${i}_body() { atf_check -o inline:\"\$out_${i}_${alg} -\0\" ${alg}sum -z - in atf_check -o inline:\"\$out_${i}_${alg} -\n\" shasum \$alg_perl_${alg} digests :>stdout :>stderr @@ -394,14 +393,15 @@ EOF atf_init_test_cases() { for alg in $algorithms ; do + eval "perl=\$name_perl_${alg}" # supported in Perl mode? atf_add_test_case self_test_${alg} for i in $(seq $n) ; do atf_add_test_case bsd_${alg}_vec${i} atf_add_test_case gnu_${alg}_vec${i} - atf_add_test_case perl_${alg}_vec${i} + [ -n "$perl" ] && atf_add_test_case perl_${alg}_vec${i} done atf_add_test_case gnu_check_${alg} - atf_add_test_case perl_check_${alg} + [ -n "$perl" ] && atf_add_test_case perl_check_${alg} done atf_add_test_case gnu_bflag atf_add_test_case gnu_cflag From nobody Tue May 5 19:52:40 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g98Lc3k8Wz6cGpR for ; Tue, 05 May 2026 19:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g98Lc2wz4z3YCx for ; Tue, 05 May 2026 19:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778010760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5eW6mZTs1TUNd91ANTGgVpZHrOPsrISYx9KSUTnWTLs=; b=b8bMp6dXJq3oyyajzU/GJ5heqanBUEj9G4qcojvRQuqGkYRA4J8Bbgtpo1aBy7rTvikoKO g7c9k2FKWjor0fQWWfYvzsCRZynnCrN6I+EBiq/zH2xv3MhNVH2uq3UkdopzJZHEU/7cuO 4G2pNQnAoNI2SWVfBPHYOu3m9Wx6qx1tVvj7mZEj8y0vVyGDm0uH5imK88618QnKcZdd/k UEEnPss7CuHFz8Yo3/55Ied0O3HGZoOkKHsJ5TIwKojLq07niECb+WVNPKjr5JG4fWl9Qw oyG2W43t51CLoUPrd5QcWOmx5OOuQRF/jh1WS9zi0JqFM+25Yam463bfZBgG5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778010760; a=rsa-sha256; cv=none; b=c/JbYd/3adQ3FM7xkDAvDz3kcq5zxsQ7lAoIVMMSbdaBsAmjPEklubWHpMHMsNxDjzWjY5 nHvHCMSkuzpakbxHJlWcETHCLtDYUBsRP6JXZb2JL9Ym+hnZ1Nysod35/giKABKmpOnpvj 5jPwAEcjgZBDyOaS/XdGm3cz8Ucke8DaDbLP7CPCMg6nVtD/E4AVdWhqjmKJD4CBPVegiS S7O2rI1e69Ldkw2YFvjIMrXprEevaPlFq6pCNxZX69RfZfFuM+vE2zYpByiQiDrUYkrTgv eBcxqBxxMKj1FVJHNHDV1ccGC0Iud+t0w9XaD5EILqtePYkEWrK6BysfmQcKMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778010760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5eW6mZTs1TUNd91ANTGgVpZHrOPsrISYx9KSUTnWTLs=; b=xk1djWGKYHnFkCSgatXEkYBdyatmKCz8ogra8iRmyXvANWeZDcL5GvpjRmY1N0W/U/ef8L yx0ljf3sKglyOvfFadTxfAEVZ/CwgaI13V0EMG4H0e7w6bcXOk4qWpC4HB8WL84ZiKrj59 uEwdGFjB3lz27pnV/q3MUoXIKWlxIDtYsdrr1svIlLkJYio63CLGppob6s2ppRjO07PIRL 02HpHS+D6Lk+OzqAUKNBGZ0xDbcmpzh/pwev4w0EQTRHIKiMOKfxKjiBTC5A9qSLODzxH5 QEtLMkj7DdssdJxWYkODKgC5UtRqPs6yPH3NHblNammd+nmKa3UEVJYVYJWKAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g98Lc2MSSz1L6s for ; Tue, 05 May 2026 19:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 407d8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 19:52:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Enji Cooper Subject: git: 7619d14d08a0 - main - acpi_panasonic: acquire serial lock before calling hkey_sound_mute in shutdown List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7619d14d08a0036a07dce670f55b9568f8133b38 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 19:52:40 +0000 Message-Id: <69fa4a88.407d8.5b776998@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=7619d14d08a0036a07dce670f55b9568f8133b38 commit 7619d14d08a0036a07dce670f55b9568f8133b38 Author: Abdelkader Boudih AuthorDate: 2026-05-05 19:49:01 +0000 Commit: Enji Cooper CommitDate: 2026-05-05 19:51:38 +0000 acpi_panasonic: acquire serial lock before calling hkey_sound_mute in shutdown acpi_panasonic_shutdown() calls hkey_sound_mute() without holding the ACPI serial lock. Every other call site holds `ACPI_SERIAL_BEGIN(panasonic)` before calling it, as the locking model is caller-owned. This seems to affect the whole Panasonic Toughtbook lineup btw. Reviewed by: ngie Differential Revision: https://reviews.freebsd.org/D56718 --- sys/dev/acpi_support/acpi_panasonic.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/acpi_support/acpi_panasonic.c b/sys/dev/acpi_support/acpi_panasonic.c index 8fea47ee45e8..5f54ca07c5a6 100644 --- a/sys/dev/acpi_support/acpi_panasonic.c +++ b/sys/dev/acpi_support/acpi_panasonic.c @@ -233,7 +233,9 @@ acpi_panasonic_shutdown(device_t dev) /* Mute the main audio during reboot to prevent static burst to speaker. */ sc = device_get_softc(dev); mute = 1; + ACPI_SERIAL_BEGIN(panasonic); hkey_sound_mute(sc->handle, HKEY_SET, &mute); + ACPI_SERIAL_END(panasonic); return (0); } From nobody Tue May 5 20:08:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g98j773dPz6cHs9; Tue, 05 May 2026 20:08:43 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from mx0b-00273201.pphosted.com (mx0b-00273201.pphosted.com [67.231.152.164]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "*.pphosted.com", Issuer "Sectigo Public Server Authentication CA OV R36" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g98j74y9Mz3bGP; Tue, 05 May 2026 20:08:43 +0000 (UTC) (envelope-from sjg@juniper.net) Authentication-Results: mx1.freebsd.org; none Received: from pps.filterd (m0108163.ppops.net [127.0.0.1]) by mx0b-00273201.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 645JQGOL3607013; Tue, 5 May 2026 13:08:42 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; h= cc:content-id:content-type:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=PPS03102026; bh=uJ/I7VXKe sCuy+Pruyak06TExeOPRIWtY9cI2MnkKXA=; b=DC2K0bEhHo4aEsxR28vHTMbcX QfR1R3eK6730AsZfIJLMAulW6whjovRDGMxIqB06+pAjozZXY3OSoZNJAp5asFBI 02uGK27hA2mlkP0UHQm8h5aCk9mdBNcJ3yhTxQrqEXQIISRw1deJQkiRAaPfJrhc 6+BIGHO0hVMPlKe7azRy8fbDkHviLr/1HlnRuKg2z5oFrE2bcGhiSgDTMYpFssVW oUC00n/U+CuKjgtlihfVO/wJJeRzuVscKo+z6CcBjSimh/LhQM+hgj9KlWf1cwQd f9fHDo9T0BnWkRmvlwlj7FWgMeeRGPusFvHT9/txX6Usb8GE5eg1Rgq/M6UfQ== Received: from ch5pr02cu005.outbound.protection.outlook.com (mail-northcentralusazon11012055.outbound.protection.outlook.com [40.107.200.55]) by mx0b-00273201.pphosted.com (PPS) with ESMTPS id 4dyb1rvarp-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 05 May 2026 13:08:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eAUWhAANj8KpRuiyGcQ9W2yusBO0E2Czdkq6ewBOfANz/QfHqEONpNQcsh6PzJJTL3D+WE/DXTdOYXBMehNtPE8eVBVa1OlqwHf3MqSjJ9WarJLt+qRsakeUphOEigB7mNAwGvYpM9kZQlG84EU7koVofkVDa3OxsRsVKtXYCvE9JoZVHSdJ05VWjuUoMzhCn8qmaOAql9Av70U9dQyAwVWbFTwgliF5QkoxuE4YODX8/8MG9sZqU2WwSSpVLEuvKd9pIE9e/YpqAvGS6tz2CKx/kBEIPaI0vboZAeQw3qhAEHZ3gTA8ROkPBnDG112pjIQZs36U6WwX/kvPo8HO3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uJ/I7VXKesCuy+Pruyak06TExeOPRIWtY9cI2MnkKXA=; b=buL5rL45KHVrbgPd74TcdgtaDq4RyDU5FYPO+vyC/gB56lDOzasGdDR5ZhvfmDrvHADhiCS1qjZV6k3j8T+AwV3I+e57rlLAd2Iln/RPsRbej0cjXu4PoZBkj8HOToEstNKZK5LPLQW7HwsWZs66DSIj5ilTjseqIjZT6vZJ6zL4C9cS3PDn3qD3q8U64iRyoGAYg3YaMUjMFQf3FjPVJ+6CrF4BiT4TjUmSayAFJSQndeFGYoDEo4zFK08L6Nzj1zVGzDPyNn/vcRXHOK5DqTgKO4fXT9MW2+GnwUaKr6DWcebpeg2wvO7W6NfNDdga7PFGpS9GCb7WNYpehmyFfA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 66.129.239.14) smtp.rcpttodomain=freebsd.org smtp.mailfrom=juniper.net; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=juniper.net; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uJ/I7VXKesCuy+Pruyak06TExeOPRIWtY9cI2MnkKXA=; b=JwqcHb2cEOlsXOcL1J+A4/1HNVX3adQCW1TuaAh0FTwrG2Zn6eooC3Zk3ro9tR0LwlI6mM4SS0Ko1d9ZouIhxrYw1Pfkn8LII/ZdeKHMeKKuJYq9ypRKGdMLfiyKtHFOEkfb/5rov0Yy6Kg4i1gOmHHh2V3w/oNFDucGeIKitLE= Received: from PH8PR07CA0028.namprd07.prod.outlook.com (2603:10b6:510:2cf::23) by DM4PR05MB9392.namprd05.prod.outlook.com (2603:10b6:8:110::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9891.14; Tue, 5 May 2026 20:08:19 +0000 Received: from CY4PEPF0000E9DC.namprd05.prod.outlook.com (2603:10b6:510:2cf:cafe::ea) by PH8PR07CA0028.outlook.office365.com (2603:10b6:510:2cf::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9870.27 via Frontend Transport; Tue, 5 May 2026 20:08:19 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 66.129.239.14) smtp.mailfrom=juniper.net; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=juniper.net; Received-SPF: Fail (protection.outlook.com: domain of juniper.net does not designate 66.129.239.14 as permitted sender) receiver=protection.outlook.com; client-ip=66.129.239.14; helo=juniper.net; Received: from juniper.net (66.129.239.14) by CY4PEPF0000E9DC.mail.protection.outlook.com (10.167.241.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9891.9 via Frontend Transport; Tue, 5 May 2026 20:08:18 +0000 Received: from p-exchbe-eqx-04.jnpr.net (10.104.9.87) by p-exchfe-eqx-04.jnpr.net (10.104.9.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Tue, 5 May 2026 13:08:18 -0700 Received: from p-exchbe-eqx-04.jnpr.net (10.104.9.87) by p-exchbe-eqx-04.jnpr.net (10.104.9.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Tue, 5 May 2026 13:08:18 -0700 Received: from kaos.jnpr.net (10.104.20.6) by p-exchbe-eqx-04.jnpr.net (10.104.9.87) with Microsoft SMTP Server id 15.2.2562.37 via Frontend Transport; Tue, 5 May 2026 13:08:18 -0700 Received: by kaos.jnpr.net (Postfix, from userid 1377) id 04EFDC961D; Tue, 05 May 2026 13:08:18 -0700 (PDT) Received: from kaos.jnpr.net (localhost [127.0.0.1]) by kaos.jnpr.net (Postfix) with ESMTP id 0384EC93EF; Tue, 05 May 2026 13:08:18 -0700 (PDT) To: Konstantin Belousov CC: , , , Subject: Re: git: adad6862228d - main - mac_veriexec_priv_check block proc_write_*regs* In-Reply-To: References: <69fa2928.33b54.5ad14de3@gitrepo.freebsd.org> Comments: In-reply-to: Konstantin Belousov message dated "Tue, 05 May 2026 21:19:37 +0300." From: "Simon J. Gerraty" X-Mailer: MH-E 8.6+git; nmh 1.8; Emacs 30.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <83488.1778011697.1@kaos.jnpr.net> Date: Tue, 5 May 2026 13:08:17 -0700 Message-ID: <85671.1778011697@kaos.jnpr.net> X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9DC:EE_|DM4PR05MB9392:EE_ X-MS-Office365-Filtering-Correlation-Id: 8f84b100-8fe9-4b28-5304-08deaae20cf2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|82310400026|36860700016|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: pZhFKBjXSbvmzUA/z+zk4P+keYahbnf2V3H2YbIWnXou82Hqay2Aw2Nse3gOjJmjCTzTXI2+GyUiPoOvKSdeoNC0p4uz0/+CzrBpcf2jD/R1LKaLYUiZ/kXAQG+R7GnjkDQvNFTcliSJIqgsJy0KS6xLeZFefA6sjwZWIb29fP8gb6Z2xZLxPa8N48zEoFEzIdPZ7iIL7yZtICwlHBY5xba8wGjvWaOYGdqkmis29QssxpwGcoEOKDLbXPNtDgWO60c9dqJyTm9XtnRdUSpjSS7c/ea2vcp96mkoRBgSdXwjMGBkt++O2h/oQShIOjoaRdHVIdxLeapL8O/DcDk157vjblWFGtkjxuYOewHG6MJZ4AN9CumLYql+vhFBlOKhH/Tx4/SbhZk483usT+PHJLDTBimmXnNRcD1Se0mmux+RgCvwNQQVwoLSWOTSm/I6ed+cEZK9SW/+8dLyTJyPFCKgUUUHnqJcUMQV8pZP+0nnYH09kw7NSNCIixfKymzljGGbUzdZAL/oFfOEqN8+JmMzUXUSw79nkHZIo2U692xsucDJj+jxf3eauxPjadbZ+96d+ZDlCBk41Ly7OmaIbQpcA9d47WplcGvMUeQ1j/HgL3vtAyJ+6q4njZct05GLJ6GiLunSKod1SKzSG2eUdoLJqtda+Tllc0S+M9z2SxEjW+5kxzj/CiCWKwq8Hki6pSsOz9pHoQ4VY342eTJgPpQs+91wh0BeXpdpHsiVBJI= X-Forefront-Antispam-Report: CIP:66.129.239.14;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:juniper.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(1800799024)(82310400026)(36860700016)(18002099003)(22082099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oFrpFIVI9Ubaz/r3GxceGrytSiYdT/Z2h/6rctMWuUwcIwEAvETJ0sRkUZwMLS2WDfXjCWk7nesqy4DwbhnTPZfDFhIQS0R9ag0tD5DgPrG71iAFgYMjGPWCh4Fsyzw4LSR0OdIvpegKSuszspgfIVzAy4w06UYAhycM9HK4zvhrG8rzHYOne9zgAWL1HSXRvHuTgzF+hJl5uNQNoJChMiirqJXCnqIUJAKi29ssKlMC5kYFbm1ZYqyhuVuXkPSRUkLDtL4Gmt1zoMl50BNdU6GF4M1ZfojZu6uXdktBN7P91QyOa71k0aja/2SekkX9Pgd4iFEQ0zh9Es01iygHpCGtrW60jD64krmpkczBf+QA9XAWicfKkfQeo1XHB4lJyaq/3Zx5aJ7LNJxUn9mcVIgGLSauKylbGd2S46CJIS0M42vLVCLzdxF3afoHJHlw X-Exchange-RoutingPolicyChecked: a/AB+Agnxb85fLMgRqIV7Kf40oMniFS1DhstHLaaBoJt+ULF773V4UK4TOCuPOWgc3RMNL0SonsuC8bJEGV0St7aPHFr+j1+4py8qUiPeViXFR3s8IpBZcrfwtxBC3HLv/mR0FMvJct23S7BUBN+V1rGudg65JSw++qK4eYA/nDTYt0932DD15sa7wSj742VDHANa36Z3ZYELb8aP6ASAnVMY9oHT7t3OoPms6czDYjEEzcxzeiO7Ctr3ASE3gy6HCwxvGeaL3cdYI09mXz0UZk508k8ZJ/WpAGI9QfWDCxPatoqpugom1Kb9ELW+P1uJgl/IPnXBdUrx/11xTsnCg== X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2026 20:08:18.9121 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8f84b100-8fe9-4b28-5304-08deaae20cf2 X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4;Ip=[66.129.239.14];Helo=[juniper.net] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9DC.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR05MB9392 X-Authority-Analysis: v=2.4 cv=V4BNF+ni c=1 sm=1 tr=0 ts=69fa4e48 cx=c_pps a=JQIjQaBRt2POjw1IEeT7Rg==:117 a=f/rncuQqEjTEF/G1odkJ9w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=kj9zAlcOel0A:10 a=NGcC8JguVDcA:10 a=s63m1ICgrNkA:10 a=rhJc5-LppCAA:10 a=VkNPw1HP01LnGYTKEx00:22 a=7vL3O5uBSuztJ3xaqtyr:22 a=kT44gYg0zFKYNBFEzlFE:22 a=pGLkceISAAAA:8 a=YTchADhgnZfvhdZfOnsA:9 a=CjuIK1q_8ugA:10 a=qD59NlHBFxkA:10 a=QYH75iMubAgA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTA1MDE5NiBTYWx0ZWRfX6osZccAyk2UE biclFRdAHbWuHpUpYP8XA4fHTTVRWba6g6haIEAN0QtK1m7PdywlLBh3LC46FmrDlwcsizSy2eT zv8GJoKG02mQs1QnjCZjMF9VuImCdWZ0JROywtxwNxqZ79lAuOxIaJ7zIsjc1xZPV8pfQgJfMkR TUTR/oNXWoVL1zGgS0Rv1sc7zWOV3TatizYKujmxTBHQ9WLeMFp+Z1dPGhPLDF6xOuBid9DonA2 Q4EO9+vMrfrak6a1wRFkIjD6bijHu97n/va/c0V1yw5CMdn6Ckzh0nVJrNy1fmft+pfgpAZ373N z/+81BEny9QVMw1CY7wZdtH7ekQaMfmUe9P1R2PcPetQMZq+36phg0m0yu+oIRkoBJtjwRM77oX y+c7TmF2lESjmsPACG90p+a8Js4zwrVBUEi+KCYJy+jGF0/JABWy7sQAMdOPLpm5FzVArJ3+96l 1hst8uiPsMVCZ788Rsw== X-Proofpoint-GUID: y013QgHPRNzcNQg0Wf0Hf-QMy2hqHtWI X-Proofpoint-ORIG-GUID: y013QgHPRNzcNQg0Wf0Hf-QMy2hqHtWI X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-05_02,2026-04-30_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 adultscore=0 lowpriorityscore=0 bulkscore=0 suspectscore=0 spamscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 phishscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605050196 X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:22843, ipnet:67.231.152.0/24, country:US] X-Rspamd-Queue-Id: 4g98j74y9Mz3bGP X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated Konstantin Belousov wrote: > > +#define PROC_PRIV_CHECK(priv) do { \ > > + int _error; \ > > + _error = priv_check(currthread, priv); \ > What is currthread? fat fingers, sorry, fixing From nobody Tue May 5 20:14:45 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g98rB2vcGz6cJWL for ; Tue, 05 May 2026 20:14: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 4g98rB1qQ3z3dBG for ; Tue, 05 May 2026 20:14:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778012090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sSlPyHNlQdDHp43b66Dg0y6ys3Hu9yamnhfIqmXhuaE=; b=lj6Fg5xk6RpL4plsWjHu/KOOnAqYFIeL4g5dOWDfYr8cc/F5uXdQxs+9GNYB3P8eLX2hXQ ehO7TyrLdRDI1BYxwEsI+k5ougNq4r3hNDUMjHjt3Iu1Sok6Tn+S0P1wuCrrEstUH/3zHo OFvRuSt4BQSd62O+f6MEM+nvLzOFEEHrD5MFnPwzzOUeupZreZRrINKct8Zt8HMS9jNKR+ I4eOPTlIx0pOSQp2uIKvU4qTbTtJCYFMUgAfmPW2wwD18KKby/2cYfoxd0mWzzvieSjCHR zI2VxjeRoPxo4df6OWRAf6hAwcsrQnpkUzh4wiRkZLmrsRxOMtLwYGs4DenkLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778012090; a=rsa-sha256; cv=none; b=yBCncoHRiyoT1lUILyPp/F7pqyFWmjxwVL/bkFZSYFPZ+rot/3ncFXY9M6jT1PwuYBVGAn osn/Xjk4hUu5zRqlQ0PJ0Epb4kqFtrh7m+71jZCjpq2w/rDTpGQsI+rGlmCFG3q3PFcee9 KEo81X2GwyasA/2W6MPXh2KBzeXCzsF2T3zCjvHTjIySgTU82+0JII/k1kLnOf9JGRhT5I 7dxdPPTPKeZEsQ/Ydc/Iz2iFUMF3Tpu5vuCEpM6hHH7vvOkWPxXWtvQgsH1ZM4/1lpBQyF KcfkH2P3KM1kqhT/BKRSNY5HFD4dbAVn4UUvnzLN/HTwPdkjYWrpOpBX0Rncrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778012090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sSlPyHNlQdDHp43b66Dg0y6ys3Hu9yamnhfIqmXhuaE=; b=qVZSlDoL1aUWYPgvdXssuuIWHE5MGYPkxaYXxfSHTElLMInvR3RMSZoooT8KynQWQ/DsPT HO7LEl3LmUI5bqnrDNyM0Mw9UoqYwo/Tw7cad6yEGSmcFWcDydRNkdzO4Ad4FNvg7FbE7u lceGNwMUxST2D0RNqOEl17twSOPwRtOWDlI1HSSVrKGftGxzbvxSnglLJ1iD5bys4bf93A gixQf+tpo6SC3D6TieBfHLqeJ+n9JyJfWgA3PwHYf1dRSZKPAdSTYpOdNf2NiR9X0vmiTN a3KF2bbU5VKBSflZ8dunFb8m3cPeXojVLGBXlAraLT+Uc5q3t0h92b+Xl8aHqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g98rB1P8tz1LS2 for ; Tue, 05 May 2026 20:14:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44346 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 20:14:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: 8334d46162e4 - main - Fix typo in curthread List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8334d46162e46f400b04b93d79e310153380d643 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 20:14:45 +0000 Message-Id: <69fa4fb5.44346.2638bff6@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=8334d46162e46f400b04b93d79e310153380d643 commit 8334d46162e46f400b04b93d79e310153380d643 Author: Simon J. Gerraty AuthorDate: 2026-05-05 20:14:36 +0000 Commit: Simon J. Gerraty CommitDate: 2026-05-05 20:14:36 +0000 Fix typo in curthread --- sys/kern/sys_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 3a94f1c0ff20..487dc5d06614 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -74,7 +74,7 @@ #define PROC_PRIV_CHECK(priv) do { \ int _error; \ - _error = priv_check(currthread, priv); \ + _error = priv_check(curthread, priv); \ if (_error) \ return (_error); \ } while (0) From nobody Tue May 5 20:54:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g99k25Jl7z6cNBD; Tue, 05 May 2026 20:54:34 +0000 (UTC) (envelope-from kib@freebsd.org) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4g99k22Brsz3kn1; Tue, 05 May 2026 20:54:34 +0000 (UTC) (envelope-from kib@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 645Ks52x080790; Tue, 5 May 2026 23:54:08 +0300 (EEST) (envelope-from kib@freebsd.org) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 645Ks52x080790 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 645Ks53w080789; Tue, 5 May 2026 23:54:05 +0300 (EEST) (envelope-from kib@freebsd.org) X-Authentication-Warning: tom.home: kostik set sender to kib@freebsd.org using -f Date: Tue, 5 May 2026 23:54:05 +0300 From: Konstantin Belousov To: "Simon J. Gerraty" Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: adad6862228d - main - mac_veriexec_priv_check block proc_write_*regs* Message-ID: References: <69fa2928.33b54.5ad14de3@gitrepo.freebsd.org> <85671.1778011697@kaos.jnpr.net> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <85671.1778011697@kaos.jnpr.net> X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4g99k22Brsz3kn1 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On Tue, May 05, 2026 at 01:08:17PM -0700, Simon J. Gerraty wrote: > Konstantin Belousov wrote: > > > +#define PROC_PRIV_CHECK(priv) do { \ > > > + int _error; \ > > > + _error = priv_check(currthread, priv); \ > > What is currthread? > > fat fingers, sorry, fixing I must admit that I highly dislike this macro. It hides the non-local flow control (exit from the containing function) without any hints about it. Why not explicitly call priv_check() and return error ? It would be both cleaner, no potential local redefinition, and explicit. From nobody Tue May 5 21:26:20 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9BQj0yJBz6cgZk for ; Tue, 05 May 2026 21:26:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9BQh6JMfz3x7T for ; Tue, 05 May 2026 21:26:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778016380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XbbLMahRjv/xIgolrWyITy0+Eln4CnAOChaPFK0jWcQ=; b=Hu7lU3wkzPaJMEbPstvgygFhKDaWGNNOszURVtTScEXcE2prAl+yD5elce8Xy03iUDn3y8 1MWC1bLGOOnp/PU2IYaMv1YNqf8B9VTBQbkbVhiUnx+IZEvoiMA7Iq0NxzR8dEeFnItBjn MSj/K70Y+s8ZKd6s3cohLF42ul58FsoRhyIGDSRoGVQMzwQNwOax5ELk6inMsD/o3lw+hb eT2c/uj1SywO94F9REzqtUiv+2HuQ9C2M0xX3Ng6tYmC2wWrrZTR2tOSABS8o1C+rbObzS Oj8zWuZU6s+vGHpGf9fS8IDqbqYb2IvqYxVlKgInTdOjMjjPY/AYx7U4R+oX4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778016380; a=rsa-sha256; cv=none; b=KHAeDDRQFYuE7ZootQYCyz89KyGH/GneZLMbARznzKv04OQIF8c4XXKpfIZLw3D8VkI/ve eGcZBIt3/4RfQ4O/xDzrYH12gQYoEsgQAmjxvGeCdnNT/oDfyS2fraKRZrG+Y3evml3oQU mLnSigqHPrV8Ngv+H05Ghio+yDc/DMAlC/So61nKJtqBPWW00T5oup5rvs9tfUm62kjl9T m7pCpBIDbGxkwoxPXuTmEF5/nkI0FRn49EWacrvx80xChDeZZJQkCrwIjDNrNtUrk4Dpm9 fJxuRopZUWT35VZZQ/E+9zO7E56o1bzeH5ocgxdnA3zQxLhuMntRmrNwxbBzHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778016380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XbbLMahRjv/xIgolrWyITy0+Eln4CnAOChaPFK0jWcQ=; b=ktepjhxim815zgIsR7FpCN9v+cIZHdj0h9/YPoJxb0IhqR5ZELcMaaCoz3Wl18mzCXifVV IatZP7/qjTP+LkH+2Xh+p1TwgcjU4E2qJ1p9ilzElxeKEXxSCUbxEaSgKQM/Kys0YxnQLY wCPkZpMkTwKGasDwqqqRUSENIfLS05gKGnpfDf/UWGo8Hgi4wK5UUpK6G/VbDOLCv9RqRy kpJYCnpwbKda5EwxmJBIMiPMLovRGsakrgonpAvhzMVweCEG8SGWD+gL4SXUT3vhNlEZdH fhkB2hj4GvGW7HDMQZGLidy5Yk+yazc6bCFt6pp2lixrRcVLELsmqNYabwc9wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9BQh5vrFz1NYS for ; Tue, 05 May 2026 21:26:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c41b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 21:26:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: c24b1d9359b8 - main - pfctl: handle errors from PFNL_CMD_GETSTATES List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c24b1d9359b899c7532d5b296f37cf3d74a36942 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 21:26:20 +0000 Message-Id: <69fa607c.1c41b.4144044a@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c24b1d9359b899c7532d5b296f37cf3d74a36942 commit c24b1d9359b899c7532d5b296f37cf3d74a36942 Author: Kristof Provost AuthorDate: 2026-05-05 16:57:25 +0000 Commit: Kristof Provost CommitDate: 2026-05-05 20:20:42 +0000 pfctl: handle errors from PFNL_CMD_GETSTATES Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 2 +- sbin/pfctl/pfctl.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 59783592a370..ac60a924c228 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -2009,7 +2009,7 @@ pfctl_get_states_h(struct pfctl_handle *h, struct pfctl_state_filter *filter, pf return (ret); } - return (0); + return (e.error); } int diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index e84e7f9272d4..f35baf25ec35 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1991,6 +1991,7 @@ pfctl_show_states(int dev, const char *iface, int opts) { struct pfctl_show_state_arg arg; struct pfctl_state_filter filter = {}; + int ret; if (iface != NULL) strlcpy(filter.ifname, iface, IFNAMSIZ); @@ -1999,8 +2000,8 @@ pfctl_show_states(int dev, const char *iface, int opts) arg.dotitle = opts & PF_OPT_SHOWALL; arg.iface = iface; - if (pfctl_get_states_h(pfh, &filter, pfctl_show_state, &arg)) - return (-1); + if ((ret = pfctl_get_states_h(pfh, &filter, pfctl_show_state, &arg)) != 0) + errc(1, ret, "pfctl_get_states"); return (0); } From nobody Tue May 5 21:26:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9BQn1jTkz6cgGf for ; Tue, 05 May 2026 21:26: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 4g9BQm6jLHz3xGl for ; Tue, 05 May 2026 21:26:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778016385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P23Hvc8YDEoe40wXTXD8/zSoeRZRHkMCdfJcI4WAB6Q=; b=eECb2pnE4tkH30CD51CCAOkuUQilkUCrZygwpx+JuyutXyzfu5euA2pQsmATVrmZ+srBz6 cLzJEXcDR+OtcVRqS2svCNMfpuhENhbEi4DKj7zmML1GLTnhk/gS7XgSXCJ+DBcBPcJbse Q8UFTVdNrQ3MR0ErIyTQZkuIe+lJPRKDYFZ7lvPd9KKx3lGrfUZeg4qb0NbfHosStaoJ3L WdBbp2n1RGJ8VDMsPxHdHW5QjUqIp2DuWMDA23NfDV7K2fw3+JT0Sec1FqjUseQKMC1G9V aeJb4EPHXF5gu1wuJTm2yU79tecHI5kgK9AB9Jekdt1j8/bVqTCbnhUd0bdAoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778016385; a=rsa-sha256; cv=none; b=HvRVmy3l5godyp66Uo1PmrJitdqa5FxUOSMLNaDCopnPJ/cs3dgvYURciD4F8H5JnR7DHo uSaMFX5xNEVrze5rjNBL6GfNqblOiT3annWY/KEd6Z/67bQl8jry6Z8YWCeaWjGO3EgdI4 dT8zQeUv2GncPu35JCHfdfmOCUsZz7pqqINiltwM2O0tFHxDu0bZUbYSZcq1I+gvNXeMys yVu6JQShMr7lOo0+7VbPa/1KfZejmGn/PbyUBkCBs9YXlYOuMcRXCIiy26ITUnPO2jH27x LflNU69twf6alVeSOcrxAePFT4izPEG8e4qqZfNX8Ov+f0fnpJ0hG0npcQVM/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778016385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P23Hvc8YDEoe40wXTXD8/zSoeRZRHkMCdfJcI4WAB6Q=; b=JtpTGHyXIj8VGdyMxGe0gPIA1mOwFU3zuSVVoAVhL5QzPoeCY2KKt3lk6UX/UrLfxPtiQV 0pRaw2FuJNl+UJ8GXuHnUNvJ7H98C7vLSMxwISPY58gI/JKopQzY4Yg9WDXL4ubiXktl9m mIooST8CBdBNhczrE60ZS9gyAZB5wfwNZv17KzP9GlIiVoAoYOnEDKhSEkoWFhO4sRQL+R v7naLdKg96rRVgdl+cRs0KE1T/+6DPTGPm/1VTedyqScFwSwnn/SkgeR1ludzFEJlE1zKK pqYgsMcfqJsvQFYzgpOSKskWGnS3XSQ3uyMqwBnFravIWKiiVXPiuQU7SVEIYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9BQm5ptRz1NKd for ; Tue, 05 May 2026 21:26:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c32c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 21:26:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: a0e4c65f1814 - main - pf: do not reject rules with colliding hashes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0e4c65f1814a7a677364dc29bb703f84323d175 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 21:26:19 +0000 Message-Id: <69fa607b.1c32c.2f8ad50@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a0e4c65f1814a7a677364dc29bb703f84323d175 commit a0e4c65f1814a7a677364dc29bb703f84323d175 Author: Kristof Provost AuthorDate: 2026-04-29 15:04:44 +0000 Commit: Kristof Provost CommitDate: 2026-05-05 20:20:42 +0000 pf: do not reject rules with colliding hashes We insert rules in pf_krule_global solely for the benefit of the 'keepcounters' feature. Failing to insert (beause the rule hash collides, or an identical rule already exists) would be worse than restoring counts to the wrong rule (or failing to restore them at all). PR: 282863, 294860, 294859, 294858 MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D56745 --- sys/netpfil/pf/pf_ioctl.c | 24 ++++++++---------------- tests/sys/netpfil/pf/match.sh | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 16 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index d3e60b137c1a..ab2140a60ce7 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -3226,14 +3226,12 @@ pf_ioctl_addrule(struct pf_krule *rule, uint32_t ticket, PF_RULES_WUNLOCK(); pf_hash_rule(rule); - if (RB_INSERT(pf_krule_global, ruleset->rules[rs_num].inactive.tree, rule) != NULL) { - PF_RULES_WLOCK(); - TAILQ_REMOVE(ruleset->rules[rs_num].inactive.ptr, rule, entries); - ruleset->rules[rs_num].inactive.rcount--; - pf_free_rule(rule); - rule = NULL; - ERROUT(EEXIST); - } + /** + * Note: rule hashes may collide. Accept this, because the worst that can + * happen is that we get counter preservation wrong. + * Failing to insert here would be worse. + **/ + RB_INSERT(pf_krule_global, ruleset->rules[rs_num].inactive.tree, rule); PF_CONFIG_UNLOCK(); return (0); @@ -4895,14 +4893,8 @@ DIOCGETRULENV_error: ruleset->rules[rs_num].active.rcount--; } else { pf_hash_rule(newrule); - if (RB_INSERT(pf_krule_global, - ruleset->rules[rs_num].active.tree, newrule) != NULL) { - pf_free_rule(newrule); - PF_RULES_WUNLOCK(); - PF_CONFIG_UNLOCK(); - error = EEXIST; - goto fail; - } + RB_INSERT(pf_krule_global, + ruleset->rules[rs_num].active.tree, newrule); if (oldrule == NULL) TAILQ_INSERT_TAIL( diff --git a/tests/sys/netpfil/pf/match.sh b/tests/sys/netpfil/pf/match.sh index 992e32d9f887..c732ec7c5c17 100644 --- a/tests/sys/netpfil/pf/match.sh +++ b/tests/sys/netpfil/pf/match.sh @@ -234,10 +234,46 @@ double_match_cleanup() pft_cleanup } +atf_test_case "duplicate_rules" "cleanup" +duplicate_rules_head() +{ + atf_set descr 'Test identical rules' + atf_set require.user root +} + +duplicate_rules_body() +{ + pft_init + + epair=$(vnet_mkepair) + vnet_mkjail alcatraz ${epair}b + + ifconfig ${epair}a 192.0.2.1/24 up + jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up + + # Sanity check + atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "block" \ + "pass tagged FOO" \ + "match tag FOO" \ + "pass tagged FOO" + + atf_check -s exit:0 -o ignore ping -c 3 192.0.2.2 +} + +duplicate_rules_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "dummynet" atf_add_test_case "quick" atf_add_test_case "allow_opts" atf_add_test_case "double_match" + atf_add_test_case "duplicate_rules" } From nobody Tue May 5 22:31:23 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9Css2P21z6cmT6 for ; Tue, 05 May 2026 22:31: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 4g9Css0R1bz3BrD for ; Tue, 05 May 2026 22:31:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778020289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vOWeIQJSmtA2Khd2mHwMKIG/YgJCvka+2Tkjsc3W3hc=; b=bOW6vETO8dbiup4dWKw3AYsJv0mKZwwBl29MlNRGPrtt+bomeBQTq2UCjy/M9CPsBmuL0S Fze4AJe7DvS3y/ZBmEXp1CosbAfoWmqlxcqcfQhFthRM7p0g8jQ8SZvozU6pHsgwgGsYD8 o297jYmFXVkEVRffcLTiP+N9UImHlKQ7Kg1ZASEYHpWqBgGcN3PR9IZ6rWHS1bAXY4ZW4B UhTwdsPac6ReSIkqRV4uQaimeefj69VfcV5/AvYY3FrwfAOYL+abRu7rBV7vsv89wVNg0C 6kilgAlg7wv/3hgCPcUw1pVlnbSPgOky0HOnjg2GaoP3unMNbWzNNwNOplrS5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778020289; a=rsa-sha256; cv=none; b=i2jCdkFOGK9XVdUfYUrovg3vW/4lke8hc9htB6MHtCjZv3O6eP/HWLMaedw+itKckoA1hh gVUGDtU7q4o0eJw24M7fPso8ftCEy97gmJnetVFJhVohb+WP1Bc3rMysiG0x0RXsOG1vcs FvOXR185rwm2vVln/bU9CnQ4Y5tSBniLFD6Q2e0cVIr1o2v2808f7iBvsJDw6pQGF845ra vYj0/zoPvhouJOIAqtAqokSC5xRWGh2z7DDtpZVio0w0g8rzHDQjHh1beRtrnCO/OVf/nG BND+2jS3X9k2339/cSRxMXW8pLqINqR5ldAfaqnedfDRBlsyz999+E/quhwbYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778020289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vOWeIQJSmtA2Khd2mHwMKIG/YgJCvka+2Tkjsc3W3hc=; b=hlFKQjee+ptcmCeVOG7cT3L5wvwMFCYDsqEoajGQ2dt7OPdR08PF2D2l4+HiXnwkgomlPf qx4fRhZSTH4xgUlU1j4bNTanAVrYzbxt8e+3RYxvGSXYH/jOpBpLfEuNnLaUGf6Kl0kLKl zVZY2o1OBkmHGu1BkqEwrrEeTRftDkQzWCUzMLnRS48GjDUv2oIUkWs7jD5I+ofAIVA90/ yYqrgFqp0bBLyrItmAeBNlg11494Miuba4bycSed/hCnKy/RuQHqMhKwvXWdOruACt851N K0XsvOUTtDmWcRj0QKn+WWr2CA3mBKAWOZ1XKJXsEfnoPBL34S8DGSK1B8xboA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9Csr6rjXz1QKH for ; Tue, 05 May 2026 22:31:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22b19 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 22:31:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 2fef18ff5943 - main - certctl: Unstickify (un)trusted certificates List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2fef18ff594328a771b6aa659e8ffa5a7e076540 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 22:31:23 +0000 Message-Id: <69fa6fbb.22b19.f8209b6@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2fef18ff594328a771b6aa659e8ffa5a7e076540 commit 2fef18ff594328a771b6aa659e8ffa5a7e076540 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-05 22:30:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-05 22:30:52 +0000 certctl: Unstickify (un)trusted certificates Ever since certctl was rewritten in C, the rehash command has reingested TRUSTDESTDIR / UNTRUSTDESTDIR in addition to TRUSTPATH / UNTRUSTPATH. This seemed like a good idea at the time but was, in retrospect, a mistake, as it means a (un)trusted certificate remains (un)trusted forever (or at least until it expires) even if it is removed from (UN)TRUSTPATH. Among other issues, it causes ports QA to fail for any port that either installs certificates or depends on a port that does. Although this behavior was undocumented, the change may surprise users who have added certificates manually, so update the manual page to point it out and add prominent warnings to the trust and untrust commands. PR: 290078 MFC after: 1 week Reviewed by: kevans, bcr Differential Revision: https://reviews.freebsd.org/D56617 --- usr.sbin/certctl/certctl.8 | 15 ++++++- usr.sbin/certctl/certctl.c | 81 ++++++++++++++++++++++------------ usr.sbin/certctl/tests/certctl_test.sh | 3 +- 3 files changed, 67 insertions(+), 32 deletions(-) diff --git a/usr.sbin/certctl/certctl.8 b/usr.sbin/certctl/certctl.8 index 2d38ce020c04..7df89e4d35d0 100644 --- a/usr.sbin/certctl/certctl.8 +++ b/usr.sbin/certctl/certctl.8 @@ -24,7 +24,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 3, 2025 +.Dd April 24, 2026 .Dt CERTCTL 8 .Os .Sh NAME @@ -113,8 +113,19 @@ In addition, a bundle containing the trusted certificates is placed in .Ev BUNDLE . .It Ic untrust Add the specified file to the untrusted list. +Note that the next +.Ic rehash +will remove it unless a copy of it is also placed somewhere in a +directory included in +.Ev UNTRUSTPATH . .It Ic trust -Remove the specified file from the untrusted list. +Add the specified file to the trusted list, unless it is already +untrusted. +Note that the next +.Ic rehash +will remove it unless a copy of it is also placed somewhere in a +directory included in +.Ev TRUSTPATH . .El .Sh ENVIRONMENT .Bl -tag -width UNTRUSTDESTDIR diff --git a/usr.sbin/certctl/certctl.c b/usr.sbin/certctl/certctl.c index a53ed7b2b4b2..0a07703bf37b 100644 --- a/usr.sbin/certctl/certctl.c +++ b/usr.sbin/certctl/certctl.c @@ -636,23 +636,18 @@ write_bundle(const char *dir, const char *file, struct cert_tree *tree) * Returns the number of certificates loaded. */ static unsigned int -load_trusted(bool all, struct cert_tree *exclude) +load_trusted(void) { unsigned int i, n; int ret; /* load external trusted certs */ - for (i = n = 0; all && trusted_paths[i] != NULL; i++) { - ret = read_certs(trusted_paths[i], &trusted, exclude); + for (i = n = 0; trusted_paths[i] != NULL; i++) { + ret = read_certs(trusted_paths[i], &trusted, &untrusted); if (ret > 0) n += ret; } - /* load installed trusted certs */ - ret = read_certs(trusted_dest, &trusted, exclude); - if (ret > 0) - n += ret; - info("%d trusted certificates found", n); return (n); } @@ -663,24 +658,19 @@ load_trusted(bool all, struct cert_tree *exclude) * Returns the number of certificates loaded. */ static unsigned int -load_untrusted(bool all) +load_untrusted(void) { char *path; unsigned int i, n; int ret; /* load external untrusted certs */ - for (i = n = 0; all && untrusted_paths[i] != NULL; i++) { + for (i = n = 0; untrusted_paths[i] != NULL; i++) { ret = read_certs(untrusted_paths[i], &untrusted, NULL); if (ret > 0) n += ret; } - /* load installed untrusted certs */ - ret = read_certs(untrusted_dest, &untrusted, NULL); - if (ret > 0) - n += ret; - /* load legacy untrusted certs */ path = expand_path(LEGACY_PATH); ret = read_certs(path, &untrusted, NULL); @@ -796,8 +786,8 @@ certctl_list(int argc, char **argv __unused) { if (argc > 1) usage(); - /* load trusted certificates */ - load_trusted(false, NULL); + /* load installed trusted certificates */ + read_certs(trusted_dest, &trusted, NULL); /* list them */ list_certs(&trusted); free_certs(&trusted); @@ -814,8 +804,8 @@ certctl_untrusted(int argc, char **argv __unused) { if (argc > 1) usage(); - /* load untrusted certificates */ - load_untrusted(false); + /* load installed untrusted certificates */ + read_certs(untrusted_dest, &untrusted, NULL); /* list them */ list_certs(&untrusted); free_certs(&untrusted); @@ -842,10 +832,10 @@ certctl_rehash(int argc, char **argv __unused) } /* load untrusted certs first */ - load_untrusted(true); + load_untrusted(); /* load trusted certs, excluding any that are already untrusted */ - load_trusted(true, &untrusted); + load_trusted(); /* save everything */ ret = save_all(); @@ -859,7 +849,8 @@ certctl_rehash(int argc, char **argv __unused) } /* - * Manually add one or more certificates to the list of trusted certificates. + * Manually add one or more certificates to the list of trusted + * certificates. * * Returns 0 on success and -1 on failure. */ @@ -875,10 +866,10 @@ certctl_trust(int argc, char **argv) usage(); /* load untrusted certs first */ - load_untrusted(true); + load_untrusted(); /* load trusted certs, excluding any that are already untrusted */ - load_trusted(true, &untrusted); + load_trusted(); /* now load the additional trusted certificates */ n = 0; @@ -891,9 +882,9 @@ certctl_trust(int argc, char **argv) warnx("no new trusted certificates found"); free_certs(&untrusted); free_certs(&trusted); - free_certs(&extra); return (0); } + warnx("%u new trusted certificate%s found", n, n > 1 ? "s" : ""); /* * For each new trusted cert, move it from the extra list to the @@ -906,10 +897,16 @@ certctl_trust(int argc, char **argv) RB_INSERT(cert_tree, &trusted, cert); if ((other = RB_FIND(cert_tree, &untrusted, cert)) != NULL) { warnx("%s was previously untrusted", cert->name); + warnx("source of untrust: %s", other->path); RB_REMOVE(cert_tree, &untrusted, other); free_cert(other); } } + warnx("This operation is not persistent. To persistently add"); + warnx("trusted certificates to the system store, copy them to"); + warnx("one of these directories, then run `certctl rehash`:"); + for (i = 0; trusted_paths[i] != NULL; i++) + warnx(" %s", trusted_paths[i]); /* save everything */ ret = save_all(); @@ -929,6 +926,8 @@ certctl_trust(int argc, char **argv) static int certctl_untrust(int argc, char **argv) { + struct cert_tree extra = RB_INITIALIZER(&extra); + struct cert *cert, *other, *tmp; unsigned int n; int i, ret; @@ -936,23 +935,47 @@ certctl_untrust(int argc, char **argv) usage(); /* load untrusted certs first */ - load_untrusted(true); + load_untrusted(); + + /* load trusted certs, excluding any that are already untrusted */ + load_trusted(); /* now load the additional untrusted certificates */ n = 0; for (i = 1; i < argc; i++) { - ret = read_cert(argv[i], &untrusted, NULL); + ret = read_cert(argv[i], &extra, NULL); if (ret > 0) n += ret; } if (n == 0) { warnx("no new untrusted certificates found"); free_certs(&untrusted); + free_certs(&trusted); return (0); } + warnx("%u new untrusted certificate%s found", n, n > 1 ? "s" : ""); - /* load trusted certs, excluding any that are already untrusted */ - load_trusted(true, &untrusted); + /* + * For each new untrusted cert, move it from the extra list to the + * untrusted list, then check if a matching certificate exists on + * the trusted list. If that is the case, warn the user, then + * remove the matching certificate from the trusted list. + */ + RB_FOREACH_SAFE(cert, cert_tree, &extra, tmp) { + RB_REMOVE(cert_tree, &extra, cert); + RB_INSERT(cert_tree, &untrusted, cert); + if ((other = RB_FIND(cert_tree, &trusted, cert)) != NULL) { + warnx("%s was previously trusted", cert->name); + warnx("source of trust: %s", other->path); + RB_REMOVE(cert_tree, &trusted, other); + free_cert(other); + } + } + warnx("This operation is not persistent. To persistently add"); + warnx("untrusted certificates to the system store, copy them to"); + warnx("one of these directories, then run `certctl rehash`:"); + for (i = 0; untrusted_paths[i] != NULL; i++) + warnx(" %s", untrusted_paths[i]); /* save everything */ ret = save_all(); diff --git a/usr.sbin/certctl/tests/certctl_test.sh b/usr.sbin/certctl/tests/certctl_test.sh index 74749db0b3f5..133d65854c42 100644 --- a/usr.sbin/certctl/tests/certctl_test.sh +++ b/usr.sbin/certctl/tests/certctl_test.sh @@ -271,7 +271,8 @@ untrust_body() crtfile=usr/share/certs/trusted/${crtname}.crt check_trusted "${crtname}" check_in_bundle ${crtfile} - atf_check certctl untrust "${crtfile}" + atf_check -e match:"1 new untrusted" \ + certctl untrust "${crtfile}" check_untrusted "${crtname}" check_not_in_bundle ${crtfile} } From nobody Tue May 5 23:52:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9Ffy4GrNz6ct9D for ; Tue, 05 May 2026 23:52: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 4g9Ffy32x5z3SyC for ; Tue, 05 May 2026 23:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778025130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cga2CHxjTUb7tlMallb6rO+xzCZPFe7HWZbr2bDBTjE=; b=w8eDzjzbK6Ag+a+K2RNH2AQg6Blh0+HWslKeWa/08Yx4rnMT4d7tLNRbXVuo5NL1mPf8Nu JhbibXLkeDyZwI3egrOAIDiKhGLjfT7SfQ6/dKcyzPAG6ajyPxHGs16QDMET0PIPZ8Ya2j 1Btt6M9X9idyEQ+OpogqsgyZCL3JGkv/LsdpQlBpF7grr4PxQqC+SIIqkuowJSff4WVylU Ee/cTDu21Jnbt1WGNJknOUrvxx4Z0AxK4iKrFZEBkO28an1e5ZNI1CCvUUWqsqWHAHE9S0 QnwU2xGRI8oPuDDAFksyp0HYgDcx8ytuk5hIDCgiwNNGdCmGNqVcUUcGTav2Tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778025130; a=rsa-sha256; cv=none; b=U7QPJRK8SB4dJMEOkdwBRp/94KpH0SnB+2Vo/Ik9KaEeBOvonX1HHVwJ3tv+cCWdvOr+Nk R9GRa7V5Cc8HEKJ0Ou56Scj5SYWu4PSvKPDydVBEuQgYVYIrUqda5JnzL71y0XRDOvnTsi THLnaTNElcsH9JsOMpT0+gTw4e5gsK9i0GvgtMsZjm6/k1cruKCxwHJ0v01qA103C7VgkE ZUyO0FeMoFFfeC7561FijyYQBukGGLsEBYLSkXQ/gZSKWmyIRHYAPIu4Po9bNHelkUxSDf 7u3BdhNn4yUeMiCm1UNXmgVwumf1uY20C8LWyP/LY13nuM8zLE2vWI98rcNQDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778025130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cga2CHxjTUb7tlMallb6rO+xzCZPFe7HWZbr2bDBTjE=; b=L2Da6EASjiiXDWKwR5Qyj4YHgYS6KgCbe73v9TBS8mlLMdjMnkNQ/6It9CZDTUAIvfscYC SNI5I/uBMPIJbs7P7xXjO7GEuynvjd7hAL2Kmc5rZ3G6WI0PGdNp7c8fmdEtWFJEM3nXFw CkXfHU/WWY4S0czwXJl/PdIzLKd9Qw4IulpV59xbVMjVCK/gUObee3EtyHoT2maScutsM3 pXZ9jlzI3TMGs5FGnHGquytGI+9dAqwSCWGwKZGQukcMiOTz3YGutfyi/bYbvm57ZVSCAj 9xH7aLSnCnASnz64rRfNnkO2Ne0d5l1wkHLK5kmeCow4OqjQ1Qind4RvgClcEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9Ffy2dXVz1Rpv for ; Tue, 05 May 2026 23:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31bd9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 23:52:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0979bfb0ec80 - main - smsc: Add missing newline to PHY timeout error printf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0979bfb0ec804590a782ea33b787ec0989c1f1a4 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 23:52:05 +0000 Message-Id: <69fa82a5.31bd9.40b21eff@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0979bfb0ec804590a782ea33b787ec0989c1f1a4 commit 0979bfb0ec804590a782ea33b787ec0989c1f1a4 Author: Ed Maste AuthorDate: 2026-05-05 23:50:46 +0000 Commit: Ed Maste CommitDate: 2026-05-05 23:51:43 +0000 smsc: Add missing newline to PHY timeout error printf --- sys/dev/usb/net/if_smsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c index 8e16b8609144..c3c21fd22472 100644 --- a/sys/dev/usb/net/if_smsc.c +++ b/sys/dev/usb/net/if_smsc.c @@ -1296,7 +1296,7 @@ smsc_phy_init(struct smsc_softc *sc) } while ((bmcr & BMCR_RESET) && ((ticks - start_ticks) < max_ticks)); if (((usb_ticks_t)(ticks - start_ticks)) >= max_ticks) { - smsc_err_printf(sc, "PHY reset timed-out"); + smsc_err_printf(sc, "PHY reset timed-out\n"); return (EIO); } From nobody Wed May 6 01:32:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9HtH5k64z6d3B1 for ; Wed, 06 May 2026 01:32:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9HtH4yjTz3kTS for ; Wed, 06 May 2026 01:32:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778031127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4k7T3EqCmHwKg6K5G8az8huWWRVgqFMH+4iuKpJzlP0=; b=mpfntIZK1NzTAn5QrpM5jCX2LVv5eVOHl5YQishyjff4Ln/vrTdVIeCWidqrpV4U3vq3Et i4r1O4p5AZrzMxFPf/wxiS/u8hIM1cPexOWzZXWAZ404RvZDuPFfGqI1+Wuy5QiJuY4p1Y aDsSMzUK9zRnAAU1rIcRXsaGyus0291MT/+b1wm0DpCyIBEPNJ/cntC3A42QvRuss9eO0i X2Aj3n27uhJApbgQpx1k4QDgP4moLY83V4DTSXoYjj3TmqlElGMs3xOmpRJ1OxujCuPAFV fm+DsKSgMNmQw4OBVXVoWaiqHLOOApRm0yjaqsUfa0sBkVUbWHx8ZzsBoycQbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778031127; a=rsa-sha256; cv=none; b=htHHKt9yxz5dDzezatyi95jtlbvzKGdRlpejZkn6vnf9j12T9ABvNRkK/tKMb0/u7CcZty 2KbBDJeHb007DeC+4QZXH5EjRt333XDxfk1MW4hHmIJSS/LlDbppAh8qOcDXT1ClHRhFK9 fsuLAGxJQJUButfrsppOHqT06HvaR5Nu0D6H/+JOzwnFC5WPpfO3pF6ho45MgITmdyyrom jjDwtXMgjWPICU21cxH3tvSRS6iJzMgifp69mbZfdQ8AEhKTR/8i2fo0VoALjFtjZaOK2Z MRYRQTPFnByVAh+EzvWm7m3gwpZ/HYzYDmx2HxZl23eSb2Qyx+0oUc0zmQL2RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778031127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4k7T3EqCmHwKg6K5G8az8huWWRVgqFMH+4iuKpJzlP0=; b=co6HqMTmqOL/8HyWo06NYpV8trU9Y+gvrzM+979JslMQZ0Q4gbM8pMbRFzhaQJcZ37I4no MP3etSThCtZ1E6LisDvyYIoX+3veW6H3UERtZQqeUwtVM/6jYeosOynA5PdBJVVjiAe3tV S+BgMpcfruDnAC5oOxSwo5E3bOJ2ILZKx9eH++IWAFwcg8Gf/a/S0tM/XG0ZxsdBS4P/0W B069NK99+akzCJFvSn2nFFL9TYTLbnhdIUhRjInOwj+Gpe39pQqkFh39TaLE/Bt4vNomL/ fripd1PLB2pjW0EIWrmfHMoYWbdOX24ndY94rQoSZIyaJpi5Hj592OdYM8ZM2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9HtH4Scvz2Yg for ; Wed, 06 May 2026 01:32:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d841 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 01:32:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: 081d3ab24e03 - main - ichsmb: add Ice Lake-LP (0x34a3) and Ice Lake-N (0x38a3) SMBus device IDs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 081d3ab24e03d271a0de3b173802fbe71f52e8aa Auto-Submitted: auto-generated Date: Wed, 06 May 2026 01:32:02 +0000 Message-Id: <69fa9a12.3d841.9be5b2@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=081d3ab24e03d271a0de3b173802fbe71f52e8aa commit 081d3ab24e03d271a0de3b173802fbe71f52e8aa Author: Abdelkader Boudih AuthorDate: 2026-05-05 23:59:10 +0000 Commit: Adrian Chadd CommitDate: 2026-05-06 01:31:48 +0000 ichsmb: add Ice Lake-LP (0x34a3) and Ice Lake-N (0x38a3) SMBus device IDs Add PCI device IDs for two Ice Lake PCH SMBus controller variants: - 0x34a3 (Ice Lake-LP), previously listed as the generic "Ice Lake" entry (ID_ICELAKE), renamed to ID_ICELAKELP for clarity. - 0x38a3 (Ice Lake-N), a separate PCH variant not previously supported. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D56732 --- sys/dev/ichsmb/ichsmb_pci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/ichsmb/ichsmb_pci.c b/sys/dev/ichsmb/ichsmb_pci.c index af3e0f004b88..7f9409e4452c 100644 --- a/sys/dev/ichsmb/ichsmb_pci.c +++ b/sys/dev/ichsmb/ichsmb_pci.c @@ -110,7 +110,8 @@ #define ID_ELKHARTLAKE 0x4b23 #define ID_GEMINILAKE 0x31d4 #define ID_CEDARFORK 0x18df -#define ID_ICELAKE 0x34a3 +#define ID_ICELAKELP 0x34a3 +#define ID_ICELAKEN 0x38a3 #define ID_ALDERLAKE 0x7aa3 #define ID_ALDERLAKE2 0x51a3 #define ID_ALDERLAKE3 0x54a3 @@ -255,8 +256,10 @@ static const struct pci_device_table ichsmb_devices[] = { PCI_DESCR("Intel Gemini Lake SMBus controller") }, { PCI_DEV(PCI_VENDOR_INTEL, ID_CEDARFORK), PCI_DESCR("Intel Cedar Fork SMBus controller") }, - { PCI_DEV(PCI_VENDOR_INTEL, ID_ICELAKE), - PCI_DESCR("Intel Ice Lake SMBus controller") }, + { PCI_DEV(PCI_VENDOR_INTEL, ID_ICELAKELP), + PCI_DESCR("Intel Ice Lake-LP SMBus controller") }, + { PCI_DEV(PCI_VENDOR_INTEL, ID_ICELAKEN), + PCI_DESCR("Intel Ice Lake-N SMBus controller") }, { PCI_DEV(PCI_VENDOR_INTEL, ID_ALDERLAKE), .driver_data = (uintptr_t)ICHSMB_FEATURE_BLOCK_BUFFER, PCI_DESCR("Intel Alder Lake SMBus controller") }, From nobody Wed May 6 05:38:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9PL26QXdz6dMCy for ; Wed, 06 May 2026 05:38: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 4g9PL25fgfz49ty for ; Wed, 06 May 2026 05:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778045882; 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=XySEvOfWDcnn8ddWeABhLcGx37hUwcBfeR413efWFCg=; b=dzQMx93d8KDMln1yIEK7j8V9KyYSUMh0QGSoaEvNDLKFfeqDZjAn7fKFMKdvv26UEIzO5j pL/K+iwDN9RZo526lt53tS5Ts1ixDtyyxh7BsBL3ylqkMZfbHRyxK7xgbyo34WdDsrf1Ga NTFGUYXH6Q64XcFiDAqnZ6MaADcTRWBNAFtuDPu52qPm1+PyxAu//PbW/+lPThXzuQWMXV xoiSTjuVM7a1EH21ZYf9N6UkEnWJ5MZjXSZuSZ1v+YNcqNrKWbhRv+l/3HXGIJ9Vuyyjsg tfcpnDQlWj26ckfmatNI3ZIO1mazW3Cn+Yas8htHDE2UiBuHN49AtTPpeCxpFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778045882; a=rsa-sha256; cv=none; b=k2eCFNbAkzbRl/IkYFV75wzPsSJGo0Owo7fgA32bLE6vjvU4GPZxNcQ4itG9vxG1gAFPf7 JqGJ/9PZ8tfzbA6+VolB3wjnPgMeyiIupeXl3Sl4RA+9feLWeDL/f0LgzFFpzE8tzyl26a AFhY8d9vV+Gt6AEobRscZdVrHwofRWMzbb0WE6fRl8wcA88f5z04aC7EIDy3G3Q+73pRV2 eTD/Uckexbzr53MZb0xRQVktHV/5jbl6ezHo1axFevsccut2VsVwvcx3T8j2ZaFBBaxInN PZqmUl2FmGqzqZsNdZ/79YOSJybWBBksOPoTFttbCj7G+mwRMTTrZCy/hzvIdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778045882; 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=XySEvOfWDcnn8ddWeABhLcGx37hUwcBfeR413efWFCg=; b=boIqU7FHRhlqIzLRtGqDa1yhlyHGyYX8ngImvEnvh3Zf1aYNcvFCFRxOQbQoorB0iNX14v e8EnqssadYswzuEX0CVSKMpvAso7ZzyQpxNDPM477iT7EfyegzkFk98kk8jKhI5+Bcoo0Z 9fX7UHRUTPRUuNuEZcUxd7nH5H+gWvZ66sWMMNx6JvX/ptl2I1n+olT/5m+3ZnXjGbB0zf 8Da/M5nXyIDZvCCNZ+Zdhbhkuu6axDIwTvz5iBTENK00AnuuGYYMn2txyLqAoDXflJUucn FBiTCM4HcxSltrvTN2yoKaQZWcynVh6C91KRyejgNu3U5dZgrgSwvSTMast9wA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9PL25Bz9z9X0 for ; Wed, 06 May 2026 05:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 391e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 05:38:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Christian Ullrich From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 651b82e64ef4 - stable/15 - lockf: Avoid spinning when operating on an fd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 651b82e64ef4f753d8f4c1793f359de39744526c Auto-Submitted: auto-generated Date: Wed, 06 May 2026 05:38:02 +0000 Message-Id: <69fad3ba.391e3.7d05cecd@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=651b82e64ef4f753d8f4c1793f359de39744526c commit 651b82e64ef4f753d8f4c1793f359de39744526c Author: Christian Ullrich AuthorDate: 2026-05-03 15:35:10 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-06 05:37:26 +0000 lockf: Avoid spinning when operating on an fd When operating on a file descriptor, acquire_lock() would ignore the flags argument and always operate in non-blocking mode, resulting in unnecessary busy-looping. PR: 294832 MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56722 (cherry picked from commit d90513ea85693da0ca5955173609f4e81e38ae16) --- usr.bin/lockf/lockf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c index 16bae36a21e0..076d28b7ddd5 100644 --- a/usr.bin/lockf/lockf.c +++ b/usr.bin/lockf/lockf.c @@ -320,10 +320,14 @@ acquire_lock(union lock_subject *subj, int flags, int silent) int fd; if (fdlock) { + int lflags = LOCK_EX; + assert(subj->subj_fd >= 0 && subj->subj_fd <= INT_MAX); fd = (int)subj->subj_fd; - if (flock(fd, LOCK_EX | LOCK_NB) == -1) { + if ((flags & O_NONBLOCK) == O_NONBLOCK) + lflags |= LOCK_NB; + if (flock(fd, lflags) == -1) { if (errno == EAGAIN || errno == EINTR) return (-1); err(EX_CANTCREAT, "cannot lock fd %d", fd); From nobody Wed May 6 05:38:03 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9PL42CFjz6dMG7 for ; Wed, 06 May 2026 05:38: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 4g9PL36T16z4B1d for ; Wed, 06 May 2026 05:38:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778045883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HNS8gmAwLi8NUkXIw//McrklpJq1Y78u0kndtWZvKX8=; b=kWkK1doBGsQ5Xw3znODVIfK2lGryTzyO0qmtOxYGWTflj/gLUupJhCZp5X+SPNoHcBRy05 h9rzMo1KohFzs8z1TUxVNzSHxbxSi7bR3TgLJ8YfEXeNHqlVM6HwlqWwwkPv3n1K8Uv8VK tAXyPi2Y7hArEj8exk1s3yKw4yjqC+yQ5vUMA43rKVCqlNOBGwYUwpCFH4WX5dQfuBN55f pZZkIlbcMoJTc4hYnkPYOtBJrfr5dNO3q6dF3uHilQpFr4WsBjRTZjU9hgcw8u3uNgOMLX kzLng/vYFEsA7xrov/CLpK0FZm8WUYEoV13VE1Iw2jWrwzQYE5wczuKo+cBx9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778045883; a=rsa-sha256; cv=none; b=yXBTBXhxSLV5pfXdNXdneNGQnck7/3EtzQB1DQzEZ6LvzXBsSJvogx/YdqZGgQM5hGAJ1f 2EAfIB6Fhhs1ay90jv8Ky5IuX8jt7E2AxlzfqdepVQzr7WuCFsa4uC2bl516Y3bzYkBj9d lYFQvjPAwu5MHMlkl8LaNkaWq4nHV1iRHFFbUocA7MmxxGZYyMl8pkshIYjPzCj95K2aw0 kXJq0ewuQE+cUY1imAT3gOefUN2d15eyl9LPkNTLe7OErNkvdrIYbQDjt7r1Fdwu7uYkNl HoiQQiBrJOfVx+6Bxu/40uxmX5h21MGqfMNfJVYqTh7cW31b6AxTbmhp9Y7Qyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778045883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HNS8gmAwLi8NUkXIw//McrklpJq1Y78u0kndtWZvKX8=; b=NaHAzwbZzaRqUL1SNvSHZ5E1KfGwR8q09aePsr0wj7De2sGCYIL9TNP5Arpd6ff2z7PDq+ y/MlvPQn3STe+NqlzCOzR6L7LOlCUuN9ogvfXGlToGeJJmHNKsstkP/Be9z1v5lqPO6VVf YtZsB90Ky/EEpX5uO+a266T5vDyPiqMtPHd6on9vJfgnfuSeeeiLRYxCb8lW/GHRoeHzmc Tsyeor4w7Jcd9quMpuDXZEsZIr/Rc+poguC9PJ2wQ4dHBc+WszmWiwrAOpYwC4heV5Orlg PDVYCE5cuzZqBxT2VgznH7iwLsq7/CWw3NAeQvOsXkbu5WQ1BeyX0n3ev9xQ6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9PL3628Mz9X3 for ; Wed, 06 May 2026 05:38:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38568 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 05:38:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 8e5f92b6b22c - stable/15 - lockf: Test that lockf does not spin on fd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 8e5f92b6b22c82af1192575781788eb2c8fed448 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 05:38:03 +0000 Message-Id: <69fad3bb.38568.184cd750@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8e5f92b6b22c82af1192575781788eb2c8fed448 commit 8e5f92b6b22c82af1192575781788eb2c8fed448 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-03 15:35:15 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-06 05:37:26 +0000 lockf: Test that lockf does not spin on fd PR: 294832 MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56723 (cherry picked from commit 0733afdb4dad58cfe7ad7f5994e26bf148d78199) --- usr.bin/lockf/tests/lockf_test.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/usr.bin/lockf/tests/lockf_test.sh b/usr.bin/lockf/tests/lockf_test.sh index 823b5673a176..16ee5a03bb9e 100644 --- a/usr.bin/lockf/tests/lockf_test.sh +++ b/usr.bin/lockf/tests/lockf_test.sh @@ -177,6 +177,23 @@ fdlock_body() atf_check test "$status2" -eq 0 } +atf_test_case fdlockspin +fdlockspin_head() +{ + atf_set "descr" "Don't spin when locking a file descriptor" +} +fdlockspin_body() +{ + # Start background locker and give it time to get settled + lockf foo sleep 2 & sleep 1 + # Start foreground locker in fdlock mode + atf_check ktrace -tc lockf -t 3 0 ; Wed, 06 May 2026 05:38: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 4g9PL91Vd4z3C1S for ; Wed, 06 May 2026 05:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778045889; 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=w7V/S2BVm8C2CoN/c7k0ralizwrHyKuVsl5oL1ywGbI=; b=wEpvUmaBiAHUyyG+sUHBArCffcDMwdJIkjQKf6w90m5tR7CELI21hjRJpqa4+eWqKKAnyC ERCMsX62RrH7utNJb8D9hXE1h7xJhGG84rHhWTbh/+nYdZws3Ln55ET8ZAF1Fv8lTlRNr6 8WqfmBrKAJbrOY/5si7CGVYsS6ZkY+rQUL31KjLhEZbaWOBIOvWcPxSwDVGupCRt4wbg7r HHuR6sqHw7IO+ZDggUE/geAkqGfymWBXbLPePvOgGD6AQuCjCqfYXFXaK18J/CEjTu3h+T V3y6NpQyzdLuAzmPv2sjdZ8SrjXMFfTDsggyKeYwQA+q3X14cFCoBtRXcdiNCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778045889; a=rsa-sha256; cv=none; b=PmS+PxHwej0Z4BtZ//GFtH277c80YG1taXLF9Sp/gK42MiwAWG/eQ7y44kkd4idZsA9GVA YeWIfANBWQAORg+jMpCPZGB////omYqQkeRdAF5roJ5kTKW51DlPIryN8Gm6QRE5R0c/Nq C3r4UmO+AQPbXQlrqJgoOebhPGzVRqjkdMVX9/Qex8K/RL0yYJjZJ08skQtZ8CV7mSXxbG l0Db91EOH8wC0QEow/ST0tfFpeIwKmGlCn8qSdLDgA/IGdy9P17xP1inHUKxyH9tQXE6gM 9gbZTxNYpm7NTys98ji7oN1vSbg0G07fNsXEiZ/kezTBgTi3ba8r9/JXwGWmHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778045889; 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=w7V/S2BVm8C2CoN/c7k0ralizwrHyKuVsl5oL1ywGbI=; b=vPwlVZEZprAb0+sh9Te384UVdJlRMXYEKqGl6l6rPm/8qAvxy22dif/UFKhTA4Sr0EP+aM jRUzRbxhgUfX7/Fmn9GRSRcPqzvgj7KKyh6WyOsFC/ZtsMBoRitNWTvcDpfwiHmkGAonVf lXCDfuzYbFxy06UUO97R/c9dBOPH0kgMsyrKyjZz8RHr7atHpe2c7Ui7XdzC26nnLWGTMR Bxjq9j4QzuNI0ioMkTFnjQR2q+KwKXGDmhLifyoJ7rugiu9ICwiSE6NrIEpSl+Gu7tN4ff AiWqRy0jbFFUvHfXZSiECvYbHi1g/s+4InAIlW7rQAC479lbmQwp6bCC8ukzTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9PL90z36z9G9 for ; Wed, 06 May 2026 05:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 386bd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 05:38:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Christian Ullrich From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 4a6c4f0265ac - stable/14 - lockf: Avoid spinning when operating on an fd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 4a6c4f0265ac7234cf31a3c4494e3354caf629d3 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 05:38:09 +0000 Message-Id: <69fad3c1.386bd.12ff8fd0@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4a6c4f0265ac7234cf31a3c4494e3354caf629d3 commit 4a6c4f0265ac7234cf31a3c4494e3354caf629d3 Author: Christian Ullrich AuthorDate: 2026-05-03 15:35:10 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-06 05:37:39 +0000 lockf: Avoid spinning when operating on an fd When operating on a file descriptor, acquire_lock() would ignore the flags argument and always operate in non-blocking mode, resulting in unnecessary busy-looping. PR: 294832 MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56722 (cherry picked from commit d90513ea85693da0ca5955173609f4e81e38ae16) --- usr.bin/lockf/lockf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c index dd02bf2a5417..cd4a1623fb71 100644 --- a/usr.bin/lockf/lockf.c +++ b/usr.bin/lockf/lockf.c @@ -267,10 +267,14 @@ acquire_lock(union lock_subject *subj, int flags, int silent) int fd; if (fdlock) { + int lflags = LOCK_EX; + assert(subj->subj_fd >= 0 && subj->subj_fd <= INT_MAX); fd = (int)subj->subj_fd; - if (flock(fd, LOCK_EX | LOCK_NB) == -1) { + if ((flags & O_NONBLOCK) == O_NONBLOCK) + lflags |= LOCK_NB; + if (flock(fd, lflags) == -1) { if (errno == EAGAIN || errno == EINTR) return (-1); err(EX_CANTCREAT, "cannot lock fd %d", fd); From nobody Wed May 6 05:38:10 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9PLB5tnhz6dMLp for ; Wed, 06 May 2026 05:38: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 4g9PLB2CgSz3C3w for ; Wed, 06 May 2026 05:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778045890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OLtr3mbG0FRa7/EeGjJXtQynsREUfdY7ok30JboqAdg=; b=r660eGEC1CW/n4iD6/xvwPWqjgQS40YBiiZyq3zqMQKZfZkk2cEWuNOLuV+vTo/RgYr6TE BgKSpRiRxe/kO1a7FqCeSs8oy2aC+/BZ3bHJipk8val9Ds57usxih0zn1T34Gui8HVPbx1 scphRIS8Aq44g75GvbyCIxxsb+4UbXuGKLtRiENSssuxffidE9YfG/L7K8H4R3qUZ2Ybo0 1+fjUgHvk2cBRBzoGf7ijHHShnNjhGP4KWTVKlx7p6GSl27ZnEvgNk0EJ8K6gXabGHMpvZ PScZaED+k88YZkTWAzM+i7errt9WvCi0S7IfWnlVvSZVYGKaHwlxnR8z8HX/pQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778045890; a=rsa-sha256; cv=none; b=WOC/Y6zxF/e2IITBNUAExokJnqu2KdjKbvcM83o2v05QRyIJexyo1xBQBvDn4XyvVPAMF0 BCirQ3NtI8pZimY0++y7OlRvP8wU9BFeqf7M/c167uxkT/ZtpVNY98i45jzCp0pEKF1Rjb khIfQUU2KCaMQuaro6sy+qNmxYdYfGNrpa36RKPeEBtPCiUd96iqXs1Zr1mecYlHbMpcvJ 3y1I5q6U9j+MhCn7PB2/FGdSuvN7JCJxavAzhN6yQRC0HgxthtBG3euwjxATWLnCU/Y0ct hhSeZ3ymU10XVXMvP0aJsf+eE4Rq/hdMDSueKOfPNuAXPL9hvPKiFU1xEWMwiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778045890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OLtr3mbG0FRa7/EeGjJXtQynsREUfdY7ok30JboqAdg=; b=DFNz+3sxhG+z6bp2Yg5bh+53uW2LKe1DeX5qakZ+Rlc23y3vj3/1OEHad80W5QN8W/IVR7 hHYXnPpzdsIWj6aObSXEgmXVC8wgzDYPsDYruUHmSDoGcPe3fi0hE4bbTn1Q+qVFAsBKa4 AXN76OGkpH6BlMlMaLTKw2Lrulen/E4NBk8i7mwt/mumf50bKf33imVaGOzNIatsc1t4qE Mff4nbgsX0/LEPqE6aHT9mBkBN6psF3ZBxZX4J65ekIRv08nEW5EQtpP9d+GQDKa2Q9sT+ SgBwgUQyZMy8fwPm2wbVLyvnIgvx5DOOVuoNHJlozVV0DPQhjSg956M0CphRkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9PLB1lstz8ml for ; Wed, 06 May 2026 05:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 393f1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 05:38:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 5158575d924b - stable/14 - lockf: Test that lockf does not spin on fd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 5158575d924b911aff759af62de642ed38a7a2b3 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 05:38:10 +0000 Message-Id: <69fad3c2.393f1.1f2b8c40@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5158575d924b911aff759af62de642ed38a7a2b3 commit 5158575d924b911aff759af62de642ed38a7a2b3 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-03 15:35:15 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-06 05:37:40 +0000 lockf: Test that lockf does not spin on fd PR: 294832 MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56723 (cherry picked from commit 0733afdb4dad58cfe7ad7f5994e26bf148d78199) --- usr.bin/lockf/tests/lockf_test.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/usr.bin/lockf/tests/lockf_test.sh b/usr.bin/lockf/tests/lockf_test.sh index d73c7590653d..22f0c206fa2a 100644 --- a/usr.bin/lockf/tests/lockf_test.sh +++ b/usr.bin/lockf/tests/lockf_test.sh @@ -152,6 +152,23 @@ fdlock_body() atf_check test "$status2" -eq 0 } +atf_test_case fdlockspin +fdlockspin_head() +{ + atf_set "descr" "Don't spin when locking a file descriptor" +} +fdlockspin_body() +{ + # Start background locker and give it time to get settled + lockf foo sleep 2 & sleep 1 + # Start foreground locker in fdlock mode + atf_check ktrace -tc lockf -t 3 0 ; Wed, 06 May 2026 05:38: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 4g9PLH04S5z3CCV for ; Wed, 06 May 2026 05:38:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778045895; 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=tMsgvsAY2yakvOSdpjdJJcJstooZAXcgzyJUOnd/7pA=; b=dZWNYxFWmjiWK3cqzS0MefuBasfIiIc9J4pqh9OUS8y3Gla/aVaGgdtZ9oewQI0DcZguYS S+tZKuV9H5KeuIiz+EFyLekV3bpQ4dXDPf9InNwEs/FjoVmTWa82dnw5JM2uPM3r/N2wKU P1SEL83WxYTHxiqHtTETiRCZieMMboUiI/QqqNcH+mYKSRn56VnRlfcVgZYBWDC3nfhAmb Vl2vkgGrA0ZtS0fpzGXrrxaMhaZgnp2fOWQtOROWNqNxRkpV+h+iYTdpPnYAo4OregOnh7 U3h9JV1njkZYmT3+Se87d6MHp9fh2vxgueBbeQLl0Y5fALW890xPSeP8td/Bkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778045895; a=rsa-sha256; cv=none; b=SnR2fkPrnkZF980N1d0VvzY1eVIRjJQsvxET46UTSdTNIWhJeP0/lDuA/sX+QtpyZRpYt4 l9R34p0q/jIyc+iASyORRPRHldjIDbklUREFrSgfMvJUThad7CYyHYCuGXbrsDLX54gohi F870z25ExxKopBwcSJ5fIMbLholxsGN45SZNzXol+Z84a2KrRToqxfgkSx5Hcb2KqgKhdB RSnHpmHPzSXiRw/lCWP8Ps5ePghENcj0X25cRGVJ1Qlxm1vrQ8BrnWhGogsSvaq1BH0MUT pbVYLFUn5czoArNT3l67lli3Vv7I/hr13btyXLFhdsx9pyCbRhOImR02JKPIwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778045895; 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=tMsgvsAY2yakvOSdpjdJJcJstooZAXcgzyJUOnd/7pA=; b=i5DXS1yDkPiVDCdAQf/8aqerYI3Vojor6W1jZm5ZYA5ssYOUmvOF4x5wPcFFYltFhu+SIb 08OjN5cOVMq7ToASsNCOhfhfJV1FbCRp3DJDQ7pOx1hs0l5n4b/UsAC7iM9NVxQ+xQl4pL O2LbBpnB3hvnefq09CD0XpP/E0EQytbfqU3kenfhFky3joGLc9EKXrcqqs66kMTL50nLvb 9ILlTTqVylvRfrXfydHcvnPR2tKC/Zo+KphlU/gZ3I8EP+mTJNYU65aRA/Jm9G80YnJ/7k jC4fmFuViBtaLLCvR7xsCL/ET9HCYuovg35Pd0SGyD/FqN/CJXCLCY90or6aCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9PLG6fq7z9ZV for ; Wed, 06 May 2026 05:38:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 384c7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 05:38:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Christian Ullrich From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 2052d09b7a5f - stable/13 - lockf: Avoid spinning when operating on an fd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2052d09b7a5f55447b5106489731e229f93d8bda Auto-Submitted: auto-generated Date: Wed, 06 May 2026 05:38:14 +0000 Message-Id: <69fad3c6.384c7.4f190967@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2052d09b7a5f55447b5106489731e229f93d8bda commit 2052d09b7a5f55447b5106489731e229f93d8bda Author: Christian Ullrich AuthorDate: 2026-05-03 15:35:10 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-06 05:37:46 +0000 lockf: Avoid spinning when operating on an fd When operating on a file descriptor, acquire_lock() would ignore the flags argument and always operate in non-blocking mode, resulting in unnecessary busy-looping. PR: 294832 MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56722 (cherry picked from commit d90513ea85693da0ca5955173609f4e81e38ae16) --- usr.bin/lockf/lockf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c index f459b54060aa..a1711aaa8b6a 100644 --- a/usr.bin/lockf/lockf.c +++ b/usr.bin/lockf/lockf.c @@ -267,10 +267,14 @@ acquire_lock(union lock_subject *subj, int flags, int silent) int fd; if (fdlock) { + int lflags = LOCK_EX; + assert(subj->subj_fd >= 0 && subj->subj_fd <= INT_MAX); fd = (int)subj->subj_fd; - if (flock(fd, LOCK_EX | LOCK_NB) == -1) { + if ((flags & O_NONBLOCK) == O_NONBLOCK) + lflags |= LOCK_NB; + if (flock(fd, lflags) == -1) { if (errno == EAGAIN || errno == EINTR) return (-1); err(EX_CANTCREAT, "cannot lock fd %d", fd); From nobody Wed May 6 05:38:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9PLJ2ZzSz6dMGV for ; Wed, 06 May 2026 05:38:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9PLJ0vQvz3C2Z for ; Wed, 06 May 2026 05:38:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778045896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EFny89mglXq6gAWiBTxspNphMXgBx7zE2quvtuFsycc=; b=lK7qJoRkJuUVYjYutY30mPV7o0vPdKlmoAVCNUWXtDY5csd78/p2Eo2MJQXFZ2biRiACBW 0EDL37YSEyMQHLxkNOykjq5NYkcESeHAhicaHa3iXHGrYNJojwLfcYGUuc30esNgbI3jEI gqzOru1WGvBYwPkHW0k+fRm+jlfvYCg/Ow0eyNvd1kridW7GWdeT7Vv4zNxd/sfoSLK5nd bdIWE+JRcQVs/OpTvdhq948mjOFM1S+c+vtCb01RFt/8/sI9c2o/APgnK9AZ8FcH6qGbFi goPfHGyJbmeBugLTfznEY8AOywALGwkdvXkmoMXtEWkmr1AWi5hSv3BZPMlRRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778045896; a=rsa-sha256; cv=none; b=CxJP3Lr5VYFW3b9H0n25QYxUc1tqIuBInDYKLuiUYvBmi0zzXGyDrVDtdm72neHSUIRu5y 7/a6dkNjLxxs4rIheuSyVrq7Z7N0MZc5hg/TnGsf3H66v9lA2WAmsdWDu4AQb/EiLTj04n AD99Dujd1k/9JlriTXUY6ikwI8c9PUDTbXA7ohSLenp4NVvQpZoJEDfLigpKNLjX4mrP5M WwGV6Xzjo9X+bdpu2ZxlaKYkuGI8zLLtLMzx3Y2GTSNPeVkk9kbmGM79s2PHoZRe6zJ1D/ 3maRO5CH6OlwyV9Mife5GvIdYyNlzWxf/NfbyAZ3iyAui4L2JSuyqTHv4mPyig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778045896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EFny89mglXq6gAWiBTxspNphMXgBx7zE2quvtuFsycc=; b=HCVsInDTgF27GUiQ5SUQyCPIp5Tn6LVVoq1y87gcbUAfFmGCF+1xQhK3e1vF6IC3DlIkAU RzqR75+WhNDbBZcuvCg0sTDDqpAxdPrU/4ntVhOsdZtX/NixDbSi1LAW7BA4Jd//Gyl53E 8uMHY/mJ4Z4O69eR/nAlsyTtkfJdC/4we2qNf0oUS5xguUPE09QP3M93iQHnVuXxOSDhfl T2icITTK9R+AmCRxC1wyQv58DMt7peTCaAZZCKrT/13HMU5XWx977SGJBtKwCTwZNKl8gU ATUjxcIp6yySUwNcbksiL09Ntz0aYaq35DKXCYAJHvAZpjuZ1LCdtYUtfu0L3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9PLJ0QSJz8mp for ; Wed, 06 May 2026 05:38:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39103 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 05:38:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: bafb055ab1c5 - stable/13 - lockf: Test that lockf does not spin on fd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: bafb055ab1c5a6e8262fb26731f864bf7a071d9d Auto-Submitted: auto-generated Date: Wed, 06 May 2026 05:38:16 +0000 Message-Id: <69fad3c8.39103.619accfa@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bafb055ab1c5a6e8262fb26731f864bf7a071d9d commit bafb055ab1c5a6e8262fb26731f864bf7a071d9d Author: Dag-Erling Smørgrav AuthorDate: 2026-05-03 15:35:15 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-06 05:37:46 +0000 lockf: Test that lockf does not spin on fd PR: 294832 MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56723 (cherry picked from commit 0733afdb4dad58cfe7ad7f5994e26bf148d78199) --- usr.bin/lockf/tests/lockf_test.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/usr.bin/lockf/tests/lockf_test.sh b/usr.bin/lockf/tests/lockf_test.sh index cc6938d2306e..827e9ada9d2b 100644 --- a/usr.bin/lockf/tests/lockf_test.sh +++ b/usr.bin/lockf/tests/lockf_test.sh @@ -150,6 +150,23 @@ fdlock_body() atf_check test "$status2" -eq 0 } +atf_test_case fdlockspin +fdlockspin_head() +{ + atf_set "descr" "Don't spin when locking a file descriptor" +} +fdlockspin_body() +{ + # Start background locker and give it time to get settled + lockf foo sleep 2 & sleep 1 + # Start foreground locker in fdlock mode + atf_check ktrace -tc lockf -t 3 0 ; Wed, 06 May 2026 08:28: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 4g9T775qhMz3XvK for ; Wed, 06 May 2026 08:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778056131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p036GrhMvpR+K3bdvXcT+1FzgQIkhT4VPC5X2k9gmWo=; b=OQRVD8+Fdz1pAOY8EooGT5rLhCSPrdP2hACVJhizxvYEb+n0VMs5sWlkxZYYVtB+Q4QHYp imZSH1BBN8Wp+lsezzTKBilEAwU6EQGgN0pTQANHQScooJ803B0jrObqwPiGqlDcWR/njD I6kITU1/5D5K0uAlknGdQ11hJUT+g3ZTuvtUry7qlxSU0QR+4EeWkZOaTOrQv0RHGjtQgS DMjkeaGfYtYUjOeakZvWxps03U5MRnDj7f/qUlyAp5gu65YpfrkAcd8XucsGINpUr9tXHK +Z1oFEcuI+aTT1hMK0YS7GOq25SzeMXpKV6Ef5Kd3dret/JU97ggE5JMJaqjEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778056131; a=rsa-sha256; cv=none; b=OgjOFe+qDz09x9hlvj3DnsTvdXUayRn3CzsqDUyaT4cWJOqvUVc4jviaq+qvZ+/qwr85tF rFd+PQ0VSBFVOnxaCSGtKmhVKhGIPuy+O8DkrbdUNa5nNiK2dhtviHi80wprAXgHKn004g A8osngTDCj2D9Ml/rLLgqhzXNfpG0FDEflMIP3yoiiaEGVAQ2kmSI1y0OIaoL+WklRw/PM WZ8gfO8IynOnfV4DOqM32S8YMSb0+AIEfD/p9FK9dLRUOBNb4BmzqLIq7t1M/OGqTtraTG R6sOujv9zcQgg/BlXT8OcwvB1nr44kxEowmNIrO4Z0VTfS2jsvCg4ui6vKz9rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778056131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p036GrhMvpR+K3bdvXcT+1FzgQIkhT4VPC5X2k9gmWo=; b=wu5pOEQYw2MLWUIS7BfAEsG35Ot8Fy7jmgETVvDQh70aQQ8tlFKTPDM1D17doqRxu1TN0W bkhh33onKsD495c+TiPrXuvQi3x7Es6KCLF8j0Rn9ox9wg38h+Q9DyYAazi7TE7TbkPSG0 vPy0vzRai6eD0FMychrULgl3DuzZExKAnxN+GXeDE67zNESDsFnR3hMYFmkGXGzYmMAyWt LgsAKRBIbs7itLzeUL03ObOW5p8NQ7oMIuYPezpS4oY9brA4CA7oy6eu00t1TWIoNCYT2Z ZEb2idinyIvbaqEKmk8HNZp4j2IvGnokKGBihJ6Twf49XJuQSWUbVX3BLjZCgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9T775NDNzVcl for ; Wed, 06 May 2026 08:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 181f2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 08:28:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 822366134658 - main - Revert "zstd: disable weak-symbol tracing hooks in the kernel" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 822366134658ee59922d7f3e37db7bbb8956aaaf Auto-Submitted: auto-generated Date: Wed, 06 May 2026 08:28:46 +0000 Message-Id: <69fafbbe.181f2.72c3f3a@gitrepo.freebsd.org> The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=822366134658ee59922d7f3e37db7bbb8956aaaf commit 822366134658ee59922d7f3e37db7bbb8956aaaf Author: Xin LI AuthorDate: 2026-05-06 08:27:55 +0000 Commit: Xin LI CommitDate: 2026-05-06 08:27:55 +0000 Revert "zstd: disable weak-symbol tracing hooks in the kernel" This reverts commit de2ea5423cc63b62e7e42d11b667aa634109fc28 which is no longer needed after 1dddb580f950 . Tested by: mmel --- sys/conf/kern.pre.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index a5b21cdbe843..d1556660094a 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -157,11 +157,9 @@ NORMAL_FWO= ${CC:N${CCACHE_BIN}} -c ${ASM_CFLAGS} ${WERROR} -o ${.TARGET} \ NOSAN_C= ${NORMAL_C:N-fsanitize*:N-fno-sanitize*:N-fasan-shadow-offset*} # for ZSTD in the kernel (include zstd/lib/freebsd before other CFLAGS) -ZSTD_C= ${CC} -c -I$S/contrib/zstd/lib/freebsd ${CFLAGS} \ +ZSTD_C= ${CC} -c -DZSTD_HEAPMODE=1 -I$S/contrib/zstd/lib/freebsd ${CFLAGS} \ -I$S/contrib/zstd/lib -I$S/contrib/zstd/lib/common ${WERROR} \ - -Wno-missing-prototypes -U__BMI__ \ - -DZSTD_HEAPMODE=1 -DZSTD_NO_INTRINSICS -DZSTD_NO_TRACE \ - ${.IMPSRC} + -Wno-missing-prototypes -U__BMI__ -DZSTD_NO_INTRINSICS ${.IMPSRC} # https://github.com/facebook/zstd/commit/812e8f2a [zstd 1.4.1] # "Note that [GCC] autovectorization still does not do a good job on the # optimized version, so it's turned off via attribute and flag. I found From nobody Wed May 6 09:04:43 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9TwZ1j97z6byk5; Wed, 06 May 2026 09:04:46 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9TwZ194Mz3d7h; Wed, 06 May 2026 09:04:46 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778058286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=UWh2HkTrNilfZNgyUI8xV0wJh3uoQLSFpnpWBkI1AHM=; b=PZos9P+TSXGirN8Ch/fcvgB0k9RjN51ZgnCFWaGpeOC6tdfFdzpHrigleYIxxEVTCW2My1 1nMOdHyVXW7Hbt3FFj2V1IMkKVaAwj6FQ6S9JMl1DTnADCD+C9FTD+fBheuuh1RO7MjhLz IReJ9ypI6hpIkQK9IX/0O0N0Y/eNyzG6eIFeORT4FFPG68ZAaGRG8O8vQjX78kmSqtoxEO Kyu93QmZ51KnDs0qQ7jgZy7j8KqZ/o/znTOqCmsvUipdI6XbqgOzsbRBZt2PG7OmKdygEB KWq8rLwcLoiqcsVvrH1Vr0A+cSiJVSL3agxUBS1B+0Wkz0s4TmBV/nuwiaB+zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778058286; a=rsa-sha256; cv=none; b=vDrv1v63bt8vjFs1H+AVUY/27wqxVcwVzOxauyDlXfr1UxXfOBGvHjUFQTb+C936SDQdWf B5/Rq+MGlf1laJ8RUZE4RvRV3RU2Q5u+WSleirBdjVydApeaSBLuOAJPAsVQ+q1H9mN3U5 hRxNG/VKHM03Burf8MB4lLG4pUgBhjxXg+wXnZfvzSXIIEJ3sxAR+9tEhOY3XvCBnalHIX nkSU0zoj3A7OxuSiBW1VXqgapwTS2VLgIdCTLYFYCdK4xfiJ9asRunt00WdQlqyQlzlkbD Pb8dURs38EsgfEcb/bPjVbboNmAfiEtyYDqIxT16eaju3DfD44AK5bEkWw8YIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778058286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=UWh2HkTrNilfZNgyUI8xV0wJh3uoQLSFpnpWBkI1AHM=; b=jpITu49qtZBdn02iYEgiw/Okjekuxzlj6S/wlyJgUdKHs0Y+p3orGkNPz+odcLZsu4Nwl9 Zll332cSDLE5BxOLinkwrh90q2jIWjxIkSuNxKZ4CesJ3F1LAhyQUk5OHPXcwjN53qTjI9 AIokOZKa/AmIMxOHAuWDkHL3KRmz0ig6ybYH+vL2nPshkiUv9BHwOuvKJ7e2mxvhoNlJS2 IwFuERjda1orfjNjyk1wusje9LDxgp7A083LFXvzHK0Xm2Nvgx5MGYgJy+YaMY/Pwaxzwm DluM/qPp6FvgKkbhEmUbdZcjpverCH/zR2LgNdLtoEUl3YXdLwc0NnKBJmjTeg== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R12" (not verified)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4g9TwY6vWFzNJM; Wed, 06 May 2026 09:04:45 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 31E47246DF; Wed, 06 May 2026 11:04:44 +0200 (CEST) From: Kristof Provost To: Alexander Leidinger Cc: Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: f9590540c524 - main - zfs: merge openzfs/zfs@84ffe564d Date: Wed, 06 May 2026 11:04:43 +0200 X-Mailer: MailMate (2.0r6272) Message-ID: In-Reply-To: <52564a71ee85973901e4bc236723cf75@FreeBSD.org> References: <69f5a5ed.38a16.18e2d48a@gitrepo.freebsd.org> <52564a71ee85973901e4bc236723cf75@FreeBSD.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=_MailMate_42CC706C-4973-4FB2-9000-9AB1D8520480_=" --=_MailMate_42CC706C-4973-4FB2-9000-9AB1D8520480_= Content-Type: text/plain; charset=UTF-8; format=flowed; markup=markdown Content-Transfer-Encoding: quoted-printable On 2 May 2026, at 11:00, Alexander Leidinger wrote: > Am 2026-05-02 09:21, schrieb Martin Matuska: >> The branch main has been updated by mm: >> >> URL: = >> https://cgit.FreeBSD.org/src/commit/?id=3Df9590540c524607d22fa7e718c75= 8725c4365375 >> >> commit f9590540c524607d22fa7e718c758725c4365375 >> Merge: 069681afd58a 84ffe564dff1 >> Author: Martin Matuska >> AuthorDate: 2026-05-02 07:17:59 +0000 >> Commit: Martin Matuska >> CommitDate: 2026-05-02 07:18:34 +0000 >> >> zfs: merge openzfs/zfs@84ffe564d >> >> Notable upstream pull request merges: >> #18387 656285140 Handle raidz errors <=3D nparity rather than = >> ignoring >> #18401 1cebe8a38 libzfs: report invalid permission name in zfs = >> allow >> #18430 513710ed2 Fix "panic: cache_vop_rename: lingering = >> negative entry" >> #18440 37e3a260f dmu_direct: avoid UAF in = >> dmu_write_direct_done() >> #18445 2eee4ac1e Fix: draid autopkgtests fail on s390x = >> architecture >> #18448 8da472973 key lookup failure should always return EACCES >> #18456 4a58ab8ce zfs.4: document five missing module parameters >> >> Obtained from: OpenZFS >> OpenZFS commit: 84ffe564dff1b7f69d397817ef292cbe2c5ebad3 > > Are you aweare of = > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D294903 > > From the commit message I assume it is not fixed. > It looks like Alexander Motin fixed it upstream: = https://github.com/openzfs/zfs/pull/18489/changes/d1268512531de8b18f1b19c= b6e6e195c177adbfd I=E2=80=99m running a build with that fix in it now. Best regards, Kristof --=_MailMate_42CC706C-4973-4FB2-9000-9AB1D8520480_= Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

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

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

    The branch main has been updated by mm:

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

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

    zf=
s: merge openzfs/zfs@84ffe564d

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

Obtained from:  OpenZFS
OpenZFS commit: 84ffe564dff1b7f69d397817ef292cbe2c5ebad3

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

    From the commit message I assume it is not fixed.

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

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

    Best regards,
    Kristof

    --=_MailMate_42CC706C-4973-4FB2-9000-9AB1D8520480_=-- From nobody Wed May 6 10:12:43 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9WR53njyz6c4ty for ; Wed, 06 May 2026 10:12: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 4g9WR52382z3lLw for ; Wed, 06 May 2026 10:12:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778062369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t35ok72U22nstR9R87YSceSnWUvFgDkcvcJ6QVd7v0o=; b=j+7171Hl93z3gPjpnz7S3qLCuVIW8Qabi1aNBUMY8vHGjgeCj7fMbUB0F40DjY5QRfqCGS Z+1DH1/fo3R7KS8WpGMvLZAeEje7Y9MpPkEfHE1XBCf7PC7H+RP3lh55P9yBqidhn1ttDM mItCQBWZdj1w1maIukPX341yYxtD4ix3vqiArPZRxChcgL+MMayyhjVtr2yD/Z/gxmKMTu eOgbi3vQwoHV9ZFK5xw6I2BhusQQwMudI+mJg1b+CeoVoOLKJzvoRDm49b/noSlZEGhj43 PYq7v5tQzrTVQadNdh70gQgpdlj0xpaHXTpj16xsQ6WtbDmDv4SAGrwscr7Clw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778062369; a=rsa-sha256; cv=none; b=FzaGcgyIBwVUEda/0F+7nFoByNj94z62U3Pi0Rv/Zr1qju0W3dhQNFDuPEbAtaJVLYRcjf zTmCVrF9EuJTw5EjZBINGBVPmJIMto9JoQhp8ZokoQzHQRGWghhliotUSatU89hCyEfrAV 0i0suwbjsQePUDPW4+EHfb8DXxHkhDuI4zvlKSvM2SRtE9xqIxI7TMAKDgmEOukpz18W7d cjeFr03jHU3rAFCG/KQ8ccua2XtDOrU0NKqjYm8pX1TMBZTWrcnolWyBbjtR/w78wCBDX7 kScXcTGZhCvqWtux+4dsYGDIL9UyHD7cx9cjRZy8cHF731d2081R7CZRwjwg+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778062369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t35ok72U22nstR9R87YSceSnWUvFgDkcvcJ6QVd7v0o=; b=uhPT/adLPWUmenniGs9VfEOgn2pmFT/RZMXDICFuRLdRYIxQQ/EtlJOEalduLKsGCkEmOL U1RrvLEOvORjr4loZ7jjK/Hf4v957qBlo7qsu97atLfzMZ7PPmuFiSIBteEKQ8D3lqSVKB ZKgFunZYmQURtw1bBGIyRPNjvuJPtv85VIjgDOPGaMoIug8NalRkCn2I3+F1sWh0p3jUKL NOqU3L/qbV7YdmrF0PIrjnzD1QmQkf5Pm7iCaU0xEl3tlSQSdr66Y2bDlVPDaNKaS76HnT Mb1cdmQj4C+UdExOk8KBpKFW+TCc3B1vP8VWBF0szumCe1LFbQOgz9bidv3rWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9WR463HGzbNh for ; Wed, 06 May 2026 10:12:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26db0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 10:12:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ahmad Khalifa Subject: git: 3aabec5c8c6a - stable/15 - vt_core: don't draw the splash if a panic occurred List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3aabec5c8c6a74a4e50640b399a825d9f7adca9a Auto-Submitted: auto-generated Date: Wed, 06 May 2026 10:12:43 +0000 Message-Id: <69fb141b.26db0.3f13013c@gitrepo.freebsd.org> The branch stable/15 has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=3aabec5c8c6a74a4e50640b399a825d9f7adca9a commit 3aabec5c8c6a74a4e50640b399a825d9f7adca9a Author: Ahmad Khalifa AuthorDate: 2026-05-03 13:18:38 +0000 Commit: Ahmad Khalifa CommitDate: 2026-05-06 08:56:37 +0000 vt_core: don't draw the splash if a panic occurred The shutdown splash draws over all the useful info if ddb(4) is disabled. Don't draw the splash screen if we're rebooting because of a panic. MFC after: 3 days (cherry picked from commit bc83f414583ccaf337ef3b7c019df7727d6a3aae) --- sys/dev/vt/vt_core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index 2015d982a560..8360f0b80fb5 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -1682,6 +1682,9 @@ vtterm_splash(struct vt_device *vd) uintptr_t image; vt_axis_t top, left; + if (KERNEL_PANICKED()) + return; + if ((vd->vd_flags & VDF_TEXTMODE) != 0 || (boothowto & RB_MUTE) == 0) return; From nobody Wed May 6 12:48:03 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9ZtD0nypz6cJnd for ; Wed, 06 May 2026 12:48:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9ZtD065tz429k for ; Wed, 06 May 2026 12:48:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778071684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dVF1upmuFotVbHdeasqH+Gl0XVHLwSRkuB8gIbY5VFM=; b=KKg/iaqCJx1BoFW4iiJN1bQWXD8SFOtVJirixL/4DDsAm1VWKdHdEEIcM1MsNCPRjhEJ1q LUNXyNGWjNiXQ6ZwBRpdL0CK3yguG4O1owg4X3WkdDUeNDXUYjcG0yLn1SZ0buOrHa3ib/ VuWABbGb8unxPH9CLt9YV+MS2J/4P83Ed+SI+97Va2lq2J85nP89Oc2v0Z+FPxp6P8WsHP JDoU7mObsi5ZQggA22cz2LPE5NXi1j135rhuhNmnYInmiRAGivhY6w7NvOVGwxBlu6C/0v QMx+uV3FgIndnRvvnJB96V0KkvdjOVVgn5XrW4PDFcvpv1w00d0W28CYgU3eig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778071684; a=rsa-sha256; cv=none; b=gm87CS+yvD5lOil2vaO/+yeLW6me4qVgnRabEYLxVcFfm/2ap7bHA+51c0nsDhZr6B5IWz GmZ2TptNddPpIQd+nficr0+BLh1qPsKZodVn5TE3EC+GS2V5bpg9OmiIkLWrR2ZG4XEVdd TauPvlQiQasD9ZjzvuCtk3aezOEsRs5f4BViquqJ6reBm1BxJniayIlp8JJxuKJNcFDxR1 GZDHZ+wbriWHuI+oUFvBRKbAqhYqboePMLpwF8KD86JN9Ny9sIIrqGwAX4Xl7nlSwv2kE1 5L407LOlfG81xIWHFEKcxUZ+qS961JGOSjegoNexbOHBYvEYi0qCEkPEgm6jAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778071684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dVF1upmuFotVbHdeasqH+Gl0XVHLwSRkuB8gIbY5VFM=; b=IGkkdZBNIBPPA7+c8i2h3OknJVhnpykZR8DOVDDG9sQF1KFPaOHMvao/f2ShXTaxYV31tK wUM4xuuK8DA7EIl8pUGNAUgB3ZlsL9yiKSbhKhptYvK9FdFuK+Ka28OWahVXpyMLx1uCyb TlmqJKdpuxJ5qq1mInQzlWVziki4GJQaZwlis5y2wB4n7Q1giio1+rcvnyaT5M276oFsgm SNi4x/15UtiEeLjG76lcu2/g56vx9r+0eSY6Z4Klb/rTC7B58tqG5DA2GGZP6wItGbpIic roCHhro/YMtPLU6NEt5YjvJTWpKM5RhTlBUoH0BifoBJo1aiqIrPAXgeAxv6Jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9ZtC6FTZzgP0 for ; Wed, 06 May 2026 12:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e51e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 12:48:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 486c2dfaa7b9 - main - if_vlan: Use the exclusive lock everywhere List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 486c2dfaa7b9ed1ed79662584c9b0f4fd0c23d67 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 12:48:03 +0000 Message-Id: <69fb3883.3e51e.4290afc8@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=486c2dfaa7b9ed1ed79662584c9b0f4fd0c23d67 commit 486c2dfaa7b9ed1ed79662584c9b0f4fd0c23d67 Author: Mark Johnston AuthorDate: 2026-05-06 11:48:24 +0000 Commit: Mark Johnston CommitDate: 2026-05-06 11:48:24 +0000 if_vlan: Use the exclusive lock everywhere Running sys/net tests in parallel reveals some panics which look like the one below: ``` shared lock of (sx) vlan_sx @ /home/markj/sb/main/src/sys/net/if_vlan.c:2395 while exclusively locked from /home/markj/sb/main/src/sys/net/if_vlan.c:1850 panic: excl->share cpuid = 9 time = 1776467219 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe00d84e0780 vpanic() at vpanic+0x136/frame 0xfffffe00d84e08b0 panic() at panic+0x43/frame 0xfffffe00d84e0910 witness_checkorder() at witness_checkorder+0xdb1/frame 0xfffffe00d84e0ad0 _sx_slock_int() at _sx_slock_int+0x64/frame 0xfffffe00d84e0b10 vlan_ioctl() at vlan_ioctl+0x25c/frame 0xfffffe00d84e0b70 if_setflag() at if_setflag+0xdc/frame 0xfffffe00d84e0be0 ifpromisc() at ifpromisc+0x27/frame 0xfffffe00d84e0c00 vlan_setflags() at vlan_setflags+0x64/frame 0xfffffe00d84e0c30 vlan_unconfig_locked() at vlan_unconfig_locked+0xb7/frame 0xfffffe00d84e0c70 vlan_clone_destroy() at vlan_clone_destroy+0x5d/frame 0xfffffe00d84e0cb0 if_clone_destroyif_flags() at if_clone_destroyif_flags+0x8c/frame 0xfffffe00d84e0cf0 if_clone_detach() at if_clone_detach+0x106/frame 0xfffffe00d84e0d20 vnet_destroy() at vnet_destroy+0x154/frame 0xfffffe00d84e0d50 prison_deref() at prison_deref+0xaf5/frame 0xfffffe00d84e0dc0 sys_jail_remove() at sys_jail_remove+0x1a7/frame 0xfffffe00d84e0e00 amd64_syscall() at amd64_syscall+0x169/frame 0xfffffe00d84e0f30 fast_syscall_common() at fast_syscall_common+0xf8/frame 0xfffffe00d84e0f30 --- syscall (508, FreeBSD ELF64, jail_remove), rip = 0x25bd44705ca, rsp = 0x25bcfe72ab8, rbp = 0x25bcfe72b40 --- ``` All vlan interfaces are locked by a single recursive global lock. There are cases, like in the panic above where vlans are stacked on top of each other, where the driver tries to acquire an exclusive lock while holding a shared lock, and vice versa. With longer-term goals of making the networking regression test suites stable when run in parallel, and simplifying network control plane locking, which I find is quite complex and buggy, let's change if_vlan to use the exclusive lock everywhere. Reviewed by: pouria, zlei, kp, glebius MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56778 --- sys/net/if_vlan.c | 126 +++++++++++++++++++++++++----------------------------- 1 file changed, 58 insertions(+), 68 deletions(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index c254e2aa3107..ab05b4d075c7 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -236,25 +236,15 @@ static eventhandler_tag ifevent_tag; * must be sleepable and also have safe concurrent access to a vlan interface. * Since the sx(9) exists, it is used by default in most paths unless sleeping * is not permitted, or if it is not clear whether sleeping is permitted. - * */ -#define _VLAN_SX_ID ifv_sx - -static struct sx _VLAN_SX_ID; - -#define VLAN_LOCKING_INIT() \ - sx_init_flags(&_VLAN_SX_ID, "vlan_sx", SX_RECURSE) - -#define VLAN_LOCKING_DESTROY() \ - sx_destroy(&_VLAN_SX_ID) +static struct sx vlan_sx; -#define VLAN_SLOCK() sx_slock(&_VLAN_SX_ID) -#define VLAN_SUNLOCK() sx_sunlock(&_VLAN_SX_ID) -#define VLAN_XLOCK() sx_xlock(&_VLAN_SX_ID) -#define VLAN_XUNLOCK() sx_xunlock(&_VLAN_SX_ID) -#define VLAN_SLOCK_ASSERT() sx_assert(&_VLAN_SX_ID, SA_SLOCKED) -#define VLAN_XLOCK_ASSERT() sx_assert(&_VLAN_SX_ID, SA_XLOCKED) -#define VLAN_SXLOCK_ASSERT() sx_assert(&_VLAN_SX_ID, SA_LOCKED) +#define VLAN_LOCK_INIT() \ + sx_init_flags(&vlan_sx, "vlan_sx", SX_RECURSE) +#define VLAN_LOCK_DESTROY() sx_destroy(&vlan_sx) +#define VLAN_LOCK() sx_xlock(&vlan_sx) +#define VLAN_UNLOCK() sx_xunlock(&vlan_sx) +#define VLAN_LOCK_ASSERT() sx_assert(&vlan_sx, SA_XLOCKED) /* * We also have a per-trunk mutex that should be acquired when changing @@ -262,9 +252,9 @@ static struct sx _VLAN_SX_ID; */ #define TRUNK_LOCK_INIT(trunk) mtx_init(&(trunk)->lock, vlanname, NULL, MTX_DEF) #define TRUNK_LOCK_DESTROY(trunk) mtx_destroy(&(trunk)->lock) -#define TRUNK_WLOCK(trunk) mtx_lock(&(trunk)->lock) -#define TRUNK_WUNLOCK(trunk) mtx_unlock(&(trunk)->lock) -#define TRUNK_WLOCK_ASSERT(trunk) mtx_assert(&(trunk)->lock, MA_OWNED); +#define TRUNK_LOCK(trunk) mtx_lock(&(trunk)->lock) +#define TRUNK_UNLOCK(trunk) mtx_unlock(&(trunk)->lock) +#define TRUNK_LOCK_ASSERT(trunk) mtx_assert(&(trunk)->lock, MA_OWNED) /* * The VLAN_ARRAY substitutes the dynamic hash with a static array @@ -434,7 +424,7 @@ vlan_inshash(struct ifvlantrunk *trunk, struct ifvlan *ifv) int i, b; struct ifvlan *ifv2; - VLAN_XLOCK_ASSERT(); + VLAN_LOCK_ASSERT(); KASSERT(trunk->hwidth > 0, ("%s: hwidth not positive", __func__)); b = 1 << trunk->hwidth; @@ -464,7 +454,7 @@ vlan_remhash(struct ifvlantrunk *trunk, struct ifvlan *ifv) int i, b; struct ifvlan *ifv2; - VLAN_XLOCK_ASSERT(); + VLAN_LOCK_ASSERT(); KASSERT(trunk->hwidth > 0, ("%s: hwidth not positive", __func__)); b = 1 << (trunk->hwidth - 1); @@ -492,7 +482,7 @@ vlan_growhash(struct ifvlantrunk *trunk, int howmuch) struct ifvlanhead *hash2; int hwidth2, i, j, n, n2; - VLAN_XLOCK_ASSERT(); + VLAN_LOCK_ASSERT(); KASSERT(trunk->hwidth > 0, ("%s: hwidth not positive", __func__)); if (howmuch == 0) { @@ -603,7 +593,7 @@ vlan_inithash(struct ifvlantrunk *trunk) static void trunk_destroy(struct ifvlantrunk *trunk) { - VLAN_XLOCK_ASSERT(); + VLAN_LOCK_ASSERT(); vlan_freehash(trunk); trunk->parent->if_vlantrunk = NULL; @@ -629,7 +619,7 @@ vlan_setmulti(struct ifnet *ifp) struct vlan_mc_entry *mc; int error; - VLAN_XLOCK_ASSERT(); + VLAN_LOCK_ASSERT(); /* Find the parent. */ sc = ifp->if_softc; @@ -693,11 +683,11 @@ vlan_ifevent(void *arg __unused, struct ifnet *ifp, int event) return; } - TRUNK_WLOCK(trunk); + TRUNK_LOCK(trunk); VLAN_FOREACH(ifv, trunk) { ifv->ifv_ifp->if_baudrate = ifp->if_baudrate; } - TRUNK_WUNLOCK(trunk); + TRUNK_UNLOCK(trunk); NET_EPOCH_EXIT(et); } @@ -728,7 +718,7 @@ vlan_iflladdr(void *arg __unused, struct ifnet *ifp) * We need an exclusive lock here to prevent concurrent SIOCSIFLLADDR * ioctl calls on the parent garbling the lladdr of the child vlan. */ - TRUNK_WLOCK(trunk); + TRUNK_LOCK(trunk); VLAN_FOREACH(ifv, trunk) { /* * Copy new new lladdr into the ifv_ifp, enqueue a task @@ -744,7 +734,7 @@ vlan_iflladdr(void *arg __unused, struct ifnet *ifp) sdl->sdl_alen = ifp->if_addrlen; taskqueue_enqueue(taskqueue_thread, &ifv->lladdr_task); } - TRUNK_WUNLOCK(trunk); + TRUNK_UNLOCK(trunk); NET_EPOCH_EXIT(et); } @@ -761,10 +751,10 @@ vlan_ifdetach(void *arg __unused, struct ifnet *ifp) struct ifvlan *ifv; struct ifvlantrunk *trunk; - VLAN_XLOCK(); + VLAN_LOCK(); trunk = ifp->if_vlantrunk; if (trunk == NULL) { - VLAN_XUNLOCK(); + VLAN_UNLOCK(); return; } @@ -779,7 +769,7 @@ vlan_ifdetach(void *arg __unused, struct ifnet *ifp) /* Trunk should have been destroyed in vlan_unconfig(). */ KASSERT(ifp->if_vlantrunk == NULL, ("%s: purge failed", __func__)); - VLAN_XUNLOCK(); + VLAN_UNLOCK(); } /* @@ -916,7 +906,7 @@ vlan_modevent(module_t mod, int type, void *data) vlan_ifevent, NULL, EVENTHANDLER_PRI_ANY); if (ifevent_tag == NULL) return (ENOMEM); - VLAN_LOCKING_INIT(); + VLAN_LOCK_INIT(); vlan_input_p = vlan_input; vlan_link_state_p = vlan_link_state; vlan_trunk_cap_p = vlan_trunk_capabilities; @@ -954,7 +944,7 @@ vlan_modevent(module_t mod, int type, void *data) vlan_cookie_p = NULL; vlan_setcookie_p = NULL; vlan_devat_p = NULL; - VLAN_LOCKING_DESTROY(); + VLAN_LOCK_DESTROY(); if (bootverbose) printf("vlan: unloaded\n"); break; @@ -1343,9 +1333,9 @@ vlan_clone_dump_nl(struct ifnet *ifp, struct nl_writer *nw) uint16_t vlan_id = 0; uint16_t vlan_proto = 0; - VLAN_SLOCK(); + VLAN_LOCK(); if (__predict_false((ifv = ifp->if_softc) == NULL)) { - VLAN_SUNLOCK(); + VLAN_UNLOCK(); /* * XXXGL: the interface already went through if_dead(). This * check to be removed when we got better interface removal. @@ -1356,7 +1346,7 @@ vlan_clone_dump_nl(struct ifnet *ifp, struct nl_writer *nw) parent_index = PARENT(ifv)->if_index; vlan_id = ifv->ifv_vid; vlan_proto = ifv->ifv_proto; - VLAN_SUNLOCK(); + VLAN_UNLOCK(); if (parent_index != 0) nlattr_add_u32(nw, IFLA_LINK, parent_index); @@ -1696,7 +1686,7 @@ vlan_config(struct ifvlan *ifv, struct ifnet *p, uint16_t vid, if (trunk->parent != p) return (EBUSY); - VLAN_XLOCK(); + VLAN_LOCK(); ifv->ifv_proto = proto; @@ -1720,17 +1710,17 @@ vlan_config(struct ifvlan *ifv, struct ifnet *p, uint16_t vid, goto done; } - VLAN_XLOCK(); + VLAN_LOCK(); if (p->if_vlantrunk == NULL) { trunk = malloc(sizeof(struct ifvlantrunk), M_VLAN, M_WAITOK | M_ZERO); vlan_inithash(trunk); TRUNK_LOCK_INIT(trunk); - TRUNK_WLOCK(trunk); + TRUNK_LOCK(trunk); p->if_vlantrunk = trunk; trunk->parent = p; if_ref(trunk->parent); - TRUNK_WUNLOCK(trunk); + TRUNK_UNLOCK(trunk); } else { trunk = p->if_vlantrunk; } @@ -1838,7 +1828,7 @@ vlan_config(struct ifvlan *ifv, struct ifnet *p, uint16_t vid, done: if (error == 0) EVENTHANDLER_INVOKE(vlan_config, p, ifv->ifv_vid); - VLAN_XUNLOCK(); + VLAN_UNLOCK(); return (error); } @@ -1847,9 +1837,9 @@ static void vlan_unconfig(struct ifnet *ifp) { - VLAN_XLOCK(); + VLAN_LOCK(); vlan_unconfig_locked(ifp, 0); - VLAN_XUNLOCK(); + VLAN_UNLOCK(); } static void @@ -1861,7 +1851,7 @@ vlan_unconfig_locked(struct ifnet *ifp, int departing) struct ifnet *parent; int error; - VLAN_XLOCK_ASSERT(); + VLAN_LOCK_ASSERT(); ifv = ifp->if_softc; trunk = ifv->ifv_trunk; @@ -1935,7 +1925,7 @@ vlan_setflag(struct ifnet *ifp, int flag, int status, struct ifvlan *ifv; int error; - VLAN_SXLOCK_ASSERT(); + VLAN_LOCK_ASSERT(); ifv = ifp->if_softc; status = status ? (ifp->if_flags & flag) : 0; @@ -1994,13 +1984,13 @@ vlan_link_state(struct ifnet *ifp) return; } - TRUNK_WLOCK(trunk); + TRUNK_LOCK(trunk); VLAN_FOREACH(ifv, trunk) { ifv->ifv_ifp->if_baudrate = trunk->parent->if_baudrate; if_link_state_change(ifv->ifv_ifp, trunk->parent->if_link_state); } - TRUNK_WUNLOCK(trunk); + TRUNK_UNLOCK(trunk); NET_EPOCH_EXIT(et); } @@ -2011,7 +2001,7 @@ vlan_link_state(struct ifnet *ifp) int error; \ \ ifv = ifp->if_softc; \ - VLAN_SLOCK(); \ + VLAN_LOCK(); \ if (TRUNK(ifv) != NULL) { \ p = PARENT(ifv); \ if_ref(p); \ @@ -2020,7 +2010,7 @@ vlan_link_state(struct ifnet *ifp) } else { \ error = ENXIO; \ } \ - VLAN_SUNLOCK(); \ + VLAN_UNLOCK(); \ return (error); @@ -2091,7 +2081,7 @@ vlan_capabilities(struct ifvlan *ifv) u_long hwa = 0; NET_EPOCH_ASSERT(); - VLAN_SXLOCK_ASSERT(); + VLAN_LOCK_ASSERT(); p = PARENT(ifv); ifp = ifv->ifv_ifp; @@ -2222,17 +2212,17 @@ vlan_trunk_capabilities(struct ifnet *ifp) struct ifvlantrunk *trunk; struct ifvlan *ifv; - VLAN_SLOCK(); + VLAN_LOCK(); trunk = ifp->if_vlantrunk; if (trunk == NULL) { - VLAN_SUNLOCK(); + VLAN_UNLOCK(); return; } NET_EPOCH_ENTER(et); VLAN_FOREACH(ifv, trunk) vlan_capabilities(ifv); NET_EPOCH_EXIT(et); - VLAN_SUNLOCK(); + VLAN_UNLOCK(); } static int @@ -2267,7 +2257,7 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_addrlen); break; case SIOCGIFMEDIA: - VLAN_SLOCK(); + VLAN_LOCK(); if (TRUNK(ifv) != NULL) { p = PARENT(ifv); if_ref(p); @@ -2288,7 +2278,7 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) } else { error = EINVAL; } - VLAN_SUNLOCK(); + VLAN_UNLOCK(); break; case SIOCSIFMEDIA: @@ -2299,10 +2289,10 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) /* * Set the interface MTU. */ - VLAN_SLOCK(); + VLAN_LOCK(); trunk = TRUNK(ifv); if (trunk != NULL) { - TRUNK_WLOCK(trunk); + TRUNK_LOCK(trunk); if (ifr->ifr_mtu > (PARENT(ifv)->if_mtu - ifv->ifv_mtufudge) || ifr->ifr_mtu < @@ -2310,10 +2300,10 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) error = EINVAL; else ifp->if_mtu = ifr->ifr_mtu; - TRUNK_WUNLOCK(trunk); + TRUNK_UNLOCK(trunk); } else error = EINVAL; - VLAN_SUNLOCK(); + VLAN_UNLOCK(); break; case SIOCSETVLAN: @@ -2376,14 +2366,14 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) } #endif bzero(&vlr, sizeof(vlr)); - VLAN_SLOCK(); + VLAN_LOCK(); if (TRUNK(ifv) != NULL) { strlcpy(vlr.vlr_parent, PARENT(ifv)->if_xname, sizeof(vlr.vlr_parent)); vlr.vlr_tag = ifv->ifv_vid; vlr.vlr_proto = ifv->ifv_proto; } - VLAN_SUNLOCK(); + VLAN_UNLOCK(); error = copyout(&vlr, ifr_data_get_ptr(ifr), sizeof(vlr)); break; @@ -2392,10 +2382,10 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) * We should propagate selected flags to the parent, * e.g., promiscuous mode. */ - VLAN_SLOCK(); + VLAN_LOCK(); if (TRUNK(ifv) != NULL) error = vlan_setflags(ifp, 1); - VLAN_SUNLOCK(); + VLAN_UNLOCK(); break; case SIOCADDMULTI: @@ -2407,11 +2397,11 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) * XXX We need the rmlock here to avoid sleeping while * holding in6_multi_mtx. */ - VLAN_XLOCK(); + VLAN_LOCK(); trunk = TRUNK(ifv); if (trunk != NULL) error = vlan_setmulti(ifp); - VLAN_XUNLOCK(); + VLAN_UNLOCK(); break; case SIOCGVLANPCP: @@ -2445,7 +2435,7 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; case SIOCSIFCAP: - VLAN_SLOCK(); + VLAN_LOCK(); ifv->ifv_capenable = ifr->ifr_reqcap; trunk = TRUNK(ifv); if (trunk != NULL) { @@ -2455,7 +2445,7 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) vlan_capabilities(ifv); NET_EPOCH_EXIT(et); } - VLAN_SUNLOCK(); + VLAN_UNLOCK(); break; default: From nobody Wed May 6 12:48:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9ZtJ2CrPz6cJnk for ; Wed, 06 May 2026 12: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 4g9ZtJ1Pzvz42KJ for ; Wed, 06 May 2026 12: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=1778071688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H/Za06wX1udosAb3tQ/eqGOElF9RqqjwAJ99jcQpYVQ=; b=itVpcymlbbc16zFzdDoyKEATYnCv6+xdTR4HgSHai5uDOhj2QHmOLrS/pEoC16rP/oUc6F 9Eao6OHbYIBaRJHGkYc3ZQ+KPm2H6okCSnAorDuaMQXdw4LSWgajzsBi9ZoRktEoWuCXe6 xeF6tBVPNT0di+V5eGD2ISG1ehcYdQUV6nCNG+mJdEKYGRNw36pxQrrliwhb2mbORPo/Sg uyqXE1h7tD9zVx4zo0PNQQNIGrakFZmexySI9hmgwN0SmilVE7BMC7yneJ94ViGHrScVh5 l//DfzYX3ptpv0QjIIsOVVuxW98EJj/nOsMROfdc0XorFwv20/dx0eMAqXNhBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778071688; a=rsa-sha256; cv=none; b=RYcVLNj79p1dyDBlS8KpVuPCpaOEAUh2RHNQHhQ7SL8HuFlVS/atEV/whlkQRrS2zBiV/g HHrO43NzFFReaSCSTY6tJirUjO/7oUj8L++2qZtzqD3/lHVHGlP78UKfzy6orKGXcadlz/ dLIC8ar0NNoy4rOizG61QFyXUeuOXn1/m8p1LNl+yL3piMtt1+NVKP/3AMIt1W5K1jaxAc qdKBlZn5W5aC+UcqoPhIaYnXqw/b8GCehjvRU3PGp0m2BEIdIMXOpbfK5DRYkhdw5/jy4E WSMQreKGSqtCmJKiNTEqJ3dg7BJKH3+5ErPUnBhqw9ew5r509S59qmjON2JOtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778071688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H/Za06wX1udosAb3tQ/eqGOElF9RqqjwAJ99jcQpYVQ=; b=nHxsu5S2UcFo577yixLxxISQSUYg8ysV5RJt/eQXIYqdHnguI4Bj4pUsYpW7WbcQq/75L2 anETjnIDRJs50XX1xDFWMkun/zjf7gUShpmMttwglN2WM72tTqD2OSUPqk/lxQY1eHVaMG bwxY0dMlnItg9ilkGFG73NaMEHZkBWAwJG/38+F4LTlQj7MiDG9G0sDfE1kqSnNZNQyrDB 6tnGJ8D7x/wbhIKKn5Ro6dwmpNuzPNPV1q4oMlcwTy515ldLkK28bbWCeJpHue6MPR/FFB +BDHjuC2whCE2Pb1DgRcKpznYuwQTlkSaXCcA0hY/JvmfEuAe9ZqAnoaBT+zog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9ZtH6t8qzgP1 for ; Wed, 06 May 2026 12:48:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3df15 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 12:48:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 735b16d490ae - main - eventhandler: Fix a race when pruning eventhandlers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 735b16d490aee158beb54c415b716475a0d19cda Auto-Submitted: auto-generated Date: Wed, 06 May 2026 12:48:02 +0000 Message-Id: <69fb3882.3df15.6f5b09b7@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=735b16d490aee158beb54c415b716475a0d19cda commit 735b16d490aee158beb54c415b716475a0d19cda Author: Mark Johnston AuthorDate: 2026-05-06 11:48:05 +0000 Commit: Mark Johnston CommitDate: 2026-05-06 11:48:05 +0000 eventhandler: Fix a race when pruning eventhandlers By default, eventhandler_deregister() blocks until it reaches some point where no threads are invoking the event. At this point, it knows that 1) no threads are currently executing the handler, 2) some thread has freed the eventhandler structure by virtue of having called eventhandler_prune_list(), so it is safe to return. Suppose a thread is trying to deregister an event handler. A different thread prunes it, and wakes up the first thread. Before the first thread runs, a third thread grabs the event handler lock, and starts executing handlers. The first thread observes el_runcount > 0, and goes back to sleep. The third thread sees no event handlers to prune, and doesn't wake up the first thread, which sleeps forever. This change fixes the race and tries to make eventhandler_invoke() more efficient: keep a count of the number of dead list entries and only prune the list if there is at least one dead entry. Also, in eventhandler_deregister(), we only need to sleep if some dead entries are present, rather than sleeping whenever some thread is running handlers. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56767 --- sys/kern/subr_eventhandler.c | 18 ++++++++++++++---- sys/sys/eventhandler.h | 4 ++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/sys/kern/subr_eventhandler.c b/sys/kern/subr_eventhandler.c index 7568101dabd2..e91647648995 100644 --- a/sys/kern/subr_eventhandler.c +++ b/sys/kern/subr_eventhandler.c @@ -198,7 +198,10 @@ _eventhandler_deregister(struct eventhandler_list *list, eventhandler_tag tag, } else { CTR3(KTR_EVH, "%s: marking item %p from \"%s\" as dead", __func__, ep, list->el_name); + KASSERT(ep->ee_priority != EHE_DEAD_PRIORITY, + ("%s: handler for %s is dead", __func__, list->el_name)); ep->ee_priority = EHE_DEAD_PRIORITY; + list->el_deadcount++; } } else { /* remove entire list */ @@ -213,11 +216,15 @@ _eventhandler_deregister(struct eventhandler_list *list, eventhandler_tag tag, } else { CTR2(KTR_EVH, "%s: marking all items from \"%s\" as dead", __func__, list->el_name); - TAILQ_FOREACH(ep, &list->el_entries, ee_link) + TAILQ_FOREACH(ep, &list->el_entries, ee_link) { + KASSERT(ep->ee_priority != EHE_DEAD_PRIORITY, + ("%s: handler for %s is dead", __func__, list->el_name)); ep->ee_priority = EHE_DEAD_PRIORITY; + list->el_deadcount++; + } } } - while (wait && list->el_runcount > 0) + while (wait && list->el_deadcount > 0) mtx_sleep(list, &list->el_lock, 0, "evhrm", 0); EHL_UNLOCK(list); } @@ -292,8 +299,11 @@ eventhandler_prune_list(struct eventhandler_list *list) pruned++; } } - if (pruned > 0) - wakeup(list); + KASSERT(pruned == list->el_deadcount, + ("%s: pruned %u entries from \"%s\" but expected %u", + __func__, pruned, list->el_name, list->el_deadcount)); + list->el_deadcount = 0; + wakeup(list); } /* diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h index 29a16b393b52..f37b1150a7e8 100644 --- a/sys/sys/eventhandler.h +++ b/sys/sys/eventhandler.h @@ -46,7 +46,7 @@ struct eventhandler_entry_vimage { struct eventhandler_list { char *el_name; - int el_flags; /* Unused. */ + u_int el_deadcount; u_int el_runcount; struct mtx el_lock; TAILQ_ENTRY(eventhandler_list) el_link; @@ -82,7 +82,7 @@ struct eventhandler_list { KASSERT((list)->el_runcount > 0, \ ("eventhandler_invoke: runcount underflow")); \ (list)->el_runcount--; \ - if ((list)->el_runcount == 0) \ + if ((list)->el_runcount == 0 && (list)->el_deadcount != 0) \ eventhandler_prune_list(list); \ EHL_UNLOCK((list)); \ } while (0) From nobody Wed May 6 13:20:40 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9bbr4DDQz6cMRd for ; Wed, 06 May 2026 13:20: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 4g9bbr3911z45Pj for ; Wed, 06 May 2026 13:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778073640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wnSk+T7sdwLEVGLSHA/jFBIAPY9RajnpwwfjcIdZjoI=; b=XG5ZvP8W/OCN38b8sSnJ2yghJunZ+7zZZT0TqxtB8FMM+ciU0OhTRg20czpud92UbErCjz XVKpqSUBu0GSe51//HcJ3vtS4iL6MHFxNrg5Ftc/jbUUL6YN3SFJxtdUSDgoArQIAAmirc 03BhcVeKSQuR7/PCOL0fp03UH8VNI+g6QH450fhdZdct6td/Fkshgv0hFIbVYtebQq8AjU 3dcTCjfEqkKutMAuQXJ8X3VILf1c2z4cbvDxJLdhsN96Y+UhzxvNHC3poYkYywFGKufPJo KhC4aPXwgZ5sQsWfOAMl5YQ2DTXzSGVdU2BwKtpg4U3uIMMcVHAUcnyyaLLvbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778073640; a=rsa-sha256; cv=none; b=CpSPBHdBh5dVvbbhj5KNKuSeR5B4kBMZUV9Wx3E1FqqIToTuLoXMalJRvpJtwUR8MBx0y4 81EiT6KxKHjgp6A1hVgmdY5XG4GQMBN44KEJ5MwTd9iO3kdp+H/wZSEdNEJzWFwfMRL3Az fpIrwFNrcdSjQhbjkQfITrYKZqIjW3fvtomd9zGhSR4N3jENRCeKyCFYZFQ4F3Ayhzt1yA pkz4qTBjev3feqjQoTG66sHGmTjPxkVnZw7l5OGAmqT9IljYoOO3JXtBybWe8IS/FF5UnN UWKT5jxQ5/POLqSzIvpE4sWkHIpHpKQ7HcHN+hsGVkNsttJf1tLGd42RZodKWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778073640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wnSk+T7sdwLEVGLSHA/jFBIAPY9RajnpwwfjcIdZjoI=; b=FElPrdbrT/rr9Lopa9s9lzqmZHVla/G4NHnDxW8JWLBL8Fh5l/q3msCoM2KmKhdz6Urvs1 8XY3BXuAtVtsersavdyx2F429qojzeNT9qE0nKROvAikogMa3WFoMvbH4vubX575QSTcfO JeFT4ORb62MaBZ6Lvc7FMHb/pPhK2oFB9OLaggvQCobtkti0/zeyHgqwsJPykFJw76n/fz uCprm6zNNSUcMaxVmFAB7cQIZmKh9VneZkPmVgn2MJ8xcFRxgPUV9sSZiNaPH0AI0B04sP xPWDVUk1onwai0NEPMD488rSYLrctMDHKvgm3+g+l1yz7Xzu6En6sAP3hIj7ZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9bbr2XyvzgCW for ; Wed, 06 May 2026 13:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42556 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 13:20:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 8318c2f613be - stable/15 - nvram.8: Align option list and tag SPDX List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 8318c2f613bea98573aa4cd9ef7a4249d5010dd3 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 13:20:40 +0000 Message-Id: <69fb4028.42556.675df211@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=8318c2f613bea98573aa4cd9ef7a4249d5010dd3 commit 8318c2f613bea98573aa4cd9ef7a4249d5010dd3 Author: Alexander Ziaee AuthorDate: 2026-05-03 17:39:27 +0000 Commit: Alexander Ziaee CommitDate: 2026-05-06 13:16:15 +0000 nvram.8: Align option list and tag SPDX MFC after: 3 days (cherry picked from commit 33fbfceeb4d9daf1145089a10ce7b25110d8840f) --- usr.sbin/nvram/nvram.8 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/nvram/nvram.8 b/usr.sbin/nvram/nvram.8 index f0b63cdbc731..c326551b72c9 100644 --- a/usr.sbin/nvram/nvram.8 +++ b/usr.sbin/nvram/nvram.8 @@ -1,4 +1,6 @@ -.\"- +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2006 Maxim Sobolev .\" All rights reserved. .\" @@ -51,7 +53,7 @@ following by sign. .Pp The following options are available: -.Bl -tag -width indent +.Bl -tag -width "-d name" .It Fl d Ar name Delete the variable selected by .Ar name From nobody Wed May 6 13:20:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9bbs5ZtTz6cMVB for ; Wed, 06 May 2026 13:20: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 4g9bbs3pnzz45Pn for ; Wed, 06 May 2026 13: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=1778073641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ZPEUzQZuPm9HLZZMWSnanbS1HVBAc4/QtMWEttD1D8=; b=MgcqypKG9MBLiQf6fs0Lot3CD2jHLhyNiKQpqWkbM5G5zuUTt7Q5q/cGOMOJobT2NbC9rw 84tEJblr5gw62iTjQNgLoOmjYq20FGPdcXJRJkjB4IZLZUVGaxkzc9FyOZ6aRKcQb23JsW QiHWAFOzJ0zBX7ZOlvZgyASZ8b4dAgXqrF6+Z9BS0GAlC+W58BOPlRFR7IV2c2U1GHqEnS ESvSxeQoTcSqtGfLkqtezEmwnQaYEvThla95PE5s+B9zX7ltHwgQbrTgZZ+aQ5YR0HTZE/ 7ssDxd0DXDOEgIPVK9iEW/iQFJ3OkxWYE4m7grb6mliAzx4sIodO9SEgo511iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778073641; a=rsa-sha256; cv=none; b=mKxBItEiaLau7JyXfUjkkP8vcP6MjIGSW2Tc7gfbIkhNOnsi9iTUnitPSjM0+y8yI6NKxy Zw38bVwgmXSzFx1u1A2EegQVaNHCy9mFMu5JgrB0gUfg3SWvZhNQlFphewIDHp1KsN5Koc 8XGfXmY6ZUBq2FAfpRpHgyOLvTjnglGljqyNfAsgT1SLy+EHMnWFI6Nh0EnOBpyFIAtXKy yEvyLBQD35Ek4Oc0XZe98Q0l9xWofR0miHJioSnaXCPLc+dNy4MCoVGH9h3Qh20XNJjolD NkGZBylFrFWkVR/tJbMH12TbL60Od9BxI9eFg6qi5PkDA7oH/B6PhtccPT6N6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778073641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ZPEUzQZuPm9HLZZMWSnanbS1HVBAc4/QtMWEttD1D8=; b=hiwsc923zPJoL9znFXsJKPXZB7VtY7o896bavGvy4Jr0cE2s27rhVI6QPWPnQrU2DfbAxg B+VJuR9WlDRoC5yl+dEKajGzm7EuybdqNyFL/NBiInjsFfpVI4EfCUnDC10hzMbxJYEO2F YzlKjSpzirU82CnhDMDdmPS4LHaxnH0eNCi/K4j4KclYa+yJJjj8BaSpWtdiGjpyXHQ6Gc ohn/eGi50gX6qWxCeKqaDckqEJF0LYLfpI9FmfzMnCW4xq1CoH1WDc2ilNqG7vJVCOlXUA nJQPnDkETJF+4uCPYXP2HDNH/F+O6s14HRTyzz9nnhI1Hz+gkfNaU3Z3nPwZVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9bbs3Gw0zhJP for ; Wed, 06 May 2026 13:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4229c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 13:20:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 4da464b1ec46 - stable/15 - ocs_fc.4: Cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 4da464b1ec4669e658a9839c8ed33f11342b0296 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 13:20:41 +0000 Message-Id: <69fb4029.4229c.79d4eb35@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=4da464b1ec4669e658a9839c8ed33f11342b0296 commit 4da464b1ec4669e658a9839c8ed33f11342b0296 Author: Alexander Ziaee AuthorDate: 2026-05-03 18:27:05 +0000 Commit: Alexander Ziaee CommitDate: 2026-05-06 13:18:08 +0000 ocs_fc.4: Cleanup + more consistent document description + enumerate available options in synopsis in vt.4 style + tag spdx + tweak list rendering + cleanup HARDWARE + reflow excessively long lines silencing linter warnings + fix link macros MFC after: 3 days Reported by: michaelo (hardware notes) Differential Revision: https://reviews.freebsd.org/D56753 (cherry picked from commit dd97c3d83f9a92bbeb9740ceff4c1c74c451293e) --- share/man/man4/ocs_fc.4 | 93 +++++++++++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 38 deletions(-) diff --git a/share/man/man4/ocs_fc.4 b/share/man/man4/ocs_fc.4 index 714bb2655c15..b132a6eb24ed 100644 --- a/share/man/man4/ocs_fc.4 +++ b/share/man/man4/ocs_fc.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-3-Clause +.\" .\" Copyright (c) 2017 Broadcom. All rights reserved. .\" The term "Broadcom" refers to Broadcom Limited and/or its subsidiaries. .\" @@ -27,24 +30,37 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 29, 2021 +.Dd May 1, 2026 .Dt OCS_FC 4 .Os .Sh NAME .Nm ocs_fc -.Nd "Device driver for Emulex Fibre Channel Host Adapters" +.Nd Emulex Fibre Channel Host Adapter driver .Sh SYNOPSIS -To compile this driver into the kernel, add this line to the -kernel configuration file: -.Bd -ragged -offset indent -.Cd "device ocs_fc" -.Ed +.Cd device ocs_fc .Pp -To load the driver as a module at boot, add this line to +In +.Xr device.hints 5 : +.Cd hint.ocs_fc.N.initiator +.Cd hint.ocs_fc.N.target +.Cd hint.ocs_fc.N.topology +.Cd hint.ocs_fc.N.speed +.Pp +In .Xr loader.conf 5 : -.Bd -literal -offset indent -ocs_fc_load="YES" -.Ed +.Cd ocs_fc_load="YES" +.Pp +In +.Xr loader.conf 5 +or +.Xr sysctl.conf 5 : +.Cd dev.ocs_fc.N.port_state +.Cd dev.ocs_fc.N.wwpn +.Cd dev.ocs_fc.N.wwnn +.Cd dev.ocs_fc.N.configured_speed +.Cd dev.ocs_fc.N.configured_topology +.Cd dev.ocs_fc.N.current_speed +.Cd dev.ocs_fc.N.current_topology .Sh DESCRIPTION The .Nm @@ -58,7 +74,8 @@ and Fabric connections. FC-Tape is highly recommended for connections to tape drives that support it. FC-Tape includes four elements from the T-10 FCP-4 specification: -.Bl -bullet -offset indent +.Pp +.Bl -bullet -offset indent -compact .It Precise Delivery of Commands .It @@ -71,29 +88,31 @@ Task Retry Identification .Pp Together these features allow for link level error recovery with tape devices. -Without link level error recovery, an initiator cannot, for instance, tell whether a tape write -command that has timed out resulted in all, part, or none of the data going to -the tape drive. +Without link level error recovery, an initiator cannot, for instance, +tell whether a tape write command that has timed out resulted in all, +part, or none of the data going to the tape drive. FC-Tape is automatically enabled when both the controller and target support it. .Sh HARDWARE The .Nm -driver supports these Fibre Channel adapters: -.Bl -tag -width xxxxxx -offset indent -.It Emulex 16/8G FC GEN 5 HBAS -.Bd -literal -offset indent -LPe15004 FC Host Bus Adapters -LPe160XX FC Host Bus Adapters -.Ed -.It Emulex 32/16G FC GEN 6 HBAS -.Bd -literal -offset indent -LPe3100X FC Host Bus Adapters -LPe3200X FC Host Bus Adapters -.Ed -.It Emulex 64/32G FC GEN 7 HBAS -.Bd -literal -offset indent -LPe3500X FC Host Bus Adapters -.Ed +driver supports the following PCIe Fibre Channel adapters: +.Pp +.Bl -bullet -compact +.It +LPe3500X FC Host Bus Adapter +.Pq Emulex 64/32G FC Gen 7 HBA +.It +LPe3200X FC Host Bus Adapter +.Pq Emulex 32/16G FC Gen 6 HBA +.It +LPe3100X FC Host Bus Adapter +.Pq Emulex 32/16G FC Gen 6 HBA +.It +LPe160XX FC Host Bus Adapter +.Pq Emulex 16/8G FC Gen 5 HBA +.It +LPe15004 FC Host Bus Adapter +.Pq Emulex 16/8G FC Gen 5 HBA .El .Sh UPDATING FIRMWARE Adapter firmware updates are persistent. @@ -131,11 +150,9 @@ Check kernel messages regarding status of the operation Reboot the machine .El .Sh BOOT OPTIONS -Options are controlled by setting values in -.Pa /boot/device.hints . -.Pp -They are: -.Bl -tag -width indent +The following boot options are controlled by setting values in +.Pa /boot/device.hints : +.Bl -tag -width hint.ocs_fc.N.initiator .It Va hint.ocs_fc.N.initiator Enable initiator functionality. Default 1 (enabled), 0 to disable. @@ -181,9 +198,9 @@ Current Port Topology (read-only). .Sh SUPPORT For general information and support, go to the Broadcom website at: -.Pa http://www.broadcom.com/ +.Lk http://www.broadcom.com/ or E-Mail at -.Pa ocs-driver-team.pdl@broadcom.com . +.Mt ocs-driver-team.pdl@broadcom.com . .Sh SEE ALSO .Xr ifconfig 8 .Sh AUTHORS From nobody Wed May 6 13:20:42 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9bbv4mBFz6cMVF for ; Wed, 06 May 2026 13:20: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 4g9bbt58scz45Py for ; Wed, 06 May 2026 13:20:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778073642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BqdWIwTdJa4FrCg2alGaXLiB+E97cCiffXeEfApsRxE=; b=jHRPHoYlr29a0Er6dQ3MMgGSX/hrBWXxwsqitjwLD/KEWtWyCY1Qb7QlpjDxqYrEp7aQXR JL+0ddKL+oYKx54ZbuGZhGRHqdk/RjV3YcUnsO+hoPw4XsAbZX0/KJbhuOf5U+zvbSytDk /ZvLJKqOYT7atpgLNQxfXCuZ7gTbTASLRpw76JmXafXfAuu0Sw0ASMw+Ai0Z4ZK00fwF3K cmXErOq7m96GU7sFr0XwUSwByozP+p2S1gNEhoetQmhbmgw2vQORRlvwnS08to9Og/RIM2 ItQG71kB3sAwR5jrw/2a1AMiEg7hmLA1e5oSOm1608Xd0cLQnf/Vx2iJaEjYNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778073642; a=rsa-sha256; cv=none; b=oTArN4hDE6tXnbwGXdyF0VglICcPskr06Kq8fCsiCR/g1JipHAwc8zKVd134/8wqCnUi94 JsA+44AjOpd0uuSTfjcZKSyX4Eh+DzAydbFsdB64pO+gJpuxjjXihNg+UXMPXA/AGx5/O8 Oo5XGGdVPtiiRZSnAcML3su6RSlFY7klJ5rZ0AhQo2L3dQrjv98z2lW5BsV0bWOhxsOZE7 /MonIHTXPV7KGX8UbZI8QoZv/k7sMr+QIlty9pwckks3PKjZZTlZJjGRWtMkdgH1W3hAjz hexl6KX7ddDWkOuBNsi9zZBRhPg7chuMAPSpa/l8R82JZ0HB+pV8BeBENkjIVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778073642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BqdWIwTdJa4FrCg2alGaXLiB+E97cCiffXeEfApsRxE=; b=LpY9EP0hBBxU5FNO1UCC77t3ZDqZQSjFLaFNXileXlWMn2PZqzga6e8viJBkNmK+TwOzA9 DundZvx5OAJf+heCHoIZ4IJYmg613JK2mmuGw+0BNQ3FAm/v6/hNXU7zzSa1b/Ptr0NPE5 Hh6wL/dhwirBti8FMjlocEQ+LfBXDdrZXTxj3IhbiwhJzvq20f+J9HWAoEZLa8r3KcetLb vyFNPZhCQRDm57TvFnV31FsR5fDnLRTQPvoluhxSJmgnp/VA7A9cxzCjGKkq6Af34i8SF0 eDLqM04PWjtXMPL84Ua5M8tgCHiy7mzSu7cJaDvW1DBtsrdcTbQpGy4AYNlnnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9bbt3qqxzhJR for ; Wed, 06 May 2026 13:20:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41e19 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 13:20:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 55709c8a46a4 - stable/15 - man: Kill off MANSUBDIRs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 55709c8a46a470af78c0c818b36ac90615728c44 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 13:20:42 +0000 Message-Id: <69fb402a.41e19.6173c600@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=55709c8a46a470af78c0c818b36ac90615728c44 commit 55709c8a46a470af78c0c818b36ac90615728c44 Author: Alexander Ziaee AuthorDate: 2026-05-03 17:53:25 +0000 Commit: Alexander Ziaee CommitDate: 2026-05-06 13:20:17 +0000 man: Kill off MANSUBDIRs 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 unconditionally installed, and noted at the top of the rendered manual. MFC after: 3 days (cherry picked from commit 809504f331fd3588e36b54255196379bdb59890a) --- ObsoleteFiles.inc | 9 +++++++++ usr.sbin/apm/Makefile | 1 - usr.sbin/apmd/Makefile | 1 - usr.sbin/nvram/Makefile | 1 - 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index d8090aa28cc7..ebf2f4e6ceba 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,15 @@ # xargs -n1 | sort | uniq -d; # done +# 20260503: Kill off MANSUBDIRs +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 +OLD_FILES+=usr/share/man/man8/powerpc/nvram.8.gz +OLD_DIRS+=usr/share/man/man8/amd64 +OLD_DIRS+=usr/share/man/man8/i386 +OLD_DIRS+=usr/share/man/man8/powerpc + # 20260430: Regenerate trust store OLD_FILES+=usr/share/certs/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem OLD_FILES+=usr/share/certs/trusted/AffirmTrust_Premium.pem diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile index f9b3e11d22fa..81f47b8ff7b6 100644 --- a/usr.sbin/apm/Makefile +++ b/usr.sbin/apm/Makefile @@ -1,6 +1,5 @@ PROG= apm MAN= apm.8 -MANSUBDIR= /${MACHINE_CPUARCH} PACKAGE=apm diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile index bfe59cc7cd7d..9e693c630308 100644 --- a/usr.sbin/apmd/Makefile +++ b/usr.sbin/apmd/Makefile @@ -1,7 +1,6 @@ CONFS= apmd.conf PROG= apmd MAN= apmd.8 -MANSUBDIR= /i386 SRCS= apmd.c apmdlex.l apmdparse.y y.tab.h PACKAGE=apm diff --git a/usr.sbin/nvram/Makefile b/usr.sbin/nvram/Makefile index 7d27790ed132..4988763c73b4 100644 --- a/usr.sbin/nvram/Makefile +++ b/usr.sbin/nvram/Makefile @@ -1,5 +1,4 @@ PROG= nvram MAN= nvram.8 -MANSUBDIR= /powerpc .include From nobody Wed May 6 13:20:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9bbw72r9z6cMD4 for ; Wed, 06 May 2026 13:20: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 4g9bbw4MtBz45QH for ; Wed, 06 May 2026 13: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=1778073644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V79BYOLcJlZrVuFfx17zRyqGWNYWdWOOr7vk6zo9JsU=; b=fReGV6ejOScCvbyGKp7CJI8qYzYDTdsnYooZ8qLjpD8tXb5OuMm82kZ6Y6iIT8OZ9VSAGM 4svXocyk8u8Vr1v75jqahZ5OWuqV6A+y/gEcHcy2WHFjppdqqD/5P5YsXPG6wTPj9qpf18 C2YA3no/r0eYqkpT4VXZyqpOniAHA057MsYgV6byXp8pwGT0sDBErDmx30dV8iya9qYbu1 Xv4hoRteZtWnL1IGcrGdabZ5Q2jw7w7PQkdLMRm2HyeCySiqb4lWTrP/MDTSbe76cilK85 zG6qxgeDeP+qzMyXLkTy56CTznX68+9JOB3hb0BQB9YrrHSAiAPAS/+oVf7eGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778073644; a=rsa-sha256; cv=none; b=nKFQoD9HCwZ0IIazFAQ0lvrvlZ5B96asiHhftRQDDd7nVqerltQo4G/pThotypaNWWETF0 1vA+Um7PoWQpXnnH7lS+y4cE4oOFALys63uOHAU27baid3i3rlx7NWAVLY5/kPTRREkU0O Eo3MTm4RkGVTcB9E90RmNIPogpH2lUvaqAw348iBbJolJw+R3lx7lInpEKDXQVOG/sCJLX yxY7S2q6lUasM3RL4qzXYE3EEZ0a/phVRa2I+JN15Hq0pkBjC9k0/5hfB50gxj02+JYq2+ czL7dic8S7oDj/tPsMA+KKDwu7ZZKoBsMKTzPwK6KNTW5vWHKzgADyfievXfXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778073644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V79BYOLcJlZrVuFfx17zRyqGWNYWdWOOr7vk6zo9JsU=; b=FnfgFZDichTNEb/5mgKHtkc79kmMPiFfa8lzWFOJUBriGtFwyltKxbrq8f09MYysLEjq1v v3widS/FktIGHXlkNNXZY0m0bgJu6+00dFUVpB1gQMnNeqkLWXpekcJ2eV5ng9WQF3cKjt qDLT+AGwAo2HXwB1YdzEW9g6n7laeSOXua/ypBrLpNdJgsF18xP+av/4diye7zk+4190vI ELfJlwUBtx07ea5CUdRIThjzl2OMPzebyLZnPv4W3mrvo4207Rr9bob6nrzjlOuyvDLAyA 3JBftosoRp1DqFvVduc7VUzKcEIvRbdYMAhiCffVarpYSwzzMHBpBrREMaePgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9bbw3vk2zh47 for ; Wed, 06 May 2026 13:20:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4154a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 13:20:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: aa519edfe50a - stable/15 - ports.7/FILES: Expand and refactor into 3 tables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: aa519edfe50a65db516e62752914cb6922b3227f Auto-Submitted: auto-generated Date: Wed, 06 May 2026 13:20:39 +0000 Message-Id: <69fb4027.4154a.7d0b8165@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=aa519edfe50a65db516e62752914cb6922b3227f commit aa519edfe50a65db516e62752914cb6922b3227f Author: Alexander Ziaee AuthorDate: 2026-05-03 17:25:41 +0000 Commit: Alexander Ziaee CommitDate: 2026-05-06 13:16:15 +0000 ports.7/FILES: Expand and refactor into 3 tables Add make.conf, CHANGES, CONTRIBUTING.Md, UPDATING, and Tools/scripts. Refactor the FILES section of the ports reference manual into a bigger table with three sections separated by root directory. Remove preceeding article from all but "the big Kahuna", and root dirs where reasonable. MFC after: 3 days Relnotes: yes Reported by: adamw, arrowd, linimon Differential Revision: https://reviews.freebsd.org/D55441 (cherry picked from commit 28deec9b7e2b08b00160eb39de84ade6f27eb125) --- share/man/man7/ports.7 | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7 index 6e28f85da964..f187a1d8c1ce 100644 --- a/share/man/man7/ports.7 +++ b/share/man/man7/ports.7 @@ -25,7 +25,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 February 21, 2026 +.Dd February 24, 2026 .Dt PORTS 7 .Os .Sh NAME @@ -596,30 +596,41 @@ Which directory to use for the data. .El .Sh FILES -.Bl -tag -width "/usr/ports/Mk/bsd.port.mk" -compact -.It Pa /usr/ports/ -The default ports directory. -.It Pa /usr/ports/Mk/bsd.port.mk -The big Kahuna. -.It Pa /var/db/ports/ -The directory where the results of configuring -.Va OPTIONS -are stored. +.Bl -tag -width "ports/CONTRIBUTING.md" -compact +.It Pa ports/CHANGES +BREAKING NEWS to read before creating ports! +.It Pa ports/CONTRIBUTING.md +Instructions for contributing to the ports tree. +.It Pa ports/Mk/bsd.port.mk +The inner workings of the ports framework. +.It Pa ports/Tools/scripts/ +Grab bag of tools for maintaining ports. +.It Pa ports/UPDATING +BREAKING NEWS to read before upgrading ports! +.It Pa ports/distfiles/ +Directory where fetched files are stored. +.Pp .It Pa ${PORT}/Makefile -The specification for building the port. -.It Pa ${PORT}/distfiles -The directory where fetched files are stored. +Specification for building the port. .It Pa ${PORT}/distinfo -The checksums generated with +Checksums generated with .Ql make makesum . .It Pa ${PORT}/files/ -The directory for any patches. +Directory for patches or any additional files. .It Pa ${PORT}/pkg-descr -The long description of the port. +Long description of the port. .It Pa ${PORT}/pkg-plist -The list of all files installed by the port. -.It Pa ${PORT}/work +List of all files installed by the port. +.It Pa ${PORT}/work/ The port's building and staging directory. +.Pp +.It Pa /etc/make.conf +Settings for the port-building framework. +.It Pa /usr/ports/ +Canonical ports tree location. +.It Pa /var/db/ports/ +Directory for storing configured +.Va OPTIONS . .El .Sh EXAMPLES .Bl -tag -width 0n From nobody Wed May 6 14:17:03 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9cs06N3Yz6cgr3 for ; Wed, 06 May 2026 14:17: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 4g9cs05h5Kz3HGf for ; Wed, 06 May 2026 14:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778077028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IXHWoBGiWrSbgRhVCHSUhAnTyQCyd8KEY5j1Zfvtrso=; b=oBBjR7mp7f8ljsU6+S4Y61Zzsb8IsIiYg7gfRcdEcqwFFqQTWWOs3DWFf7DWCKDK+S/o2q Y7GQN5j48ApSuK2OW/e8PkUF56Xj7GUQAk4wPhqW1Tb0kIKdh+9QYL/8bjUDI9zs596/oO v4bJv00+OpfzzrMEd9huH2a59Wj2VAg37XdnBn6jZS0kTC91oczLkbwCU8w5PD/x7n2CkH QuO19lJs0qqAP6Y5/GEGzOCFXIwdLMUY4PgmgGq47RnWV1phRRMCXiXzSqzPQUiIlF06UD sYaUqPDRkVGj5GaiTqBvHmntrD/rfOB3PX/TzxwJOII05ZFgNCfbsuw0P2vPkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778077028; a=rsa-sha256; cv=none; b=Q9jKe14suMrcpULscVWXEsXWqRebTRNusyKpzEuvWyGTk4y7Crts50UsCCkQnkeoGmV2eH LYnjg8u9QNPbaJ33349bBvfRjFpM+I6sM7zMlPMBhlJTDRlXHHfzqlMiJq/VbwtEs03A37 0eKglddyDDmZyejWqWluGHnw3PramMOdaLXq0DgRp0J4vKT528XYur43tQOaQZumPJ/QCq J+CUBODvuJkJ1HYDfL4MK9M5vSF2Gbck+Q1BcQtwS9rR1PXLtr3O5sZKPhqyesUI4ci6P3 1H8e28YobLMVVw9Wig8APM8fBWv8e58GlQ+AbrFS4c0ftXMCEOFxtS+sz1XMrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778077028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IXHWoBGiWrSbgRhVCHSUhAnTyQCyd8KEY5j1Zfvtrso=; b=qoxDiPi6g7hBJsRzAF8GIWO7vSBZLvc8rSdL3wS9skBZjLL2hvwwwLhXrrRsA/jkFXVN9+ 6LGCiNZJ2mEQpMPKVTSmVYG6NgnKOnGtCn/Cnyppqo9z2HsRnk0NAzOXOrFCkW9UR3URKW 5qzbuaAUOw4fE6svs6fS1IqqfXC5XPfepGU7eZghtPw3wGDqt9GnOLWKeGzE2QTiSfxQRX 5CzuHy5IbIK/BcIsK4XFLDC8JdJVagZ2qzciBlq+2RC5eLNE3BP85Qjf8hdob2qwyP7acX mwCUHUGIq0odZyuzK1Q8GF9iEAerrfX0gnXHGg+o5Cl3vHFBTqd4rTEr7qo+ow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9cs04xlPzjbR for ; Wed, 06 May 2026 14:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46e02 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 14:17:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 748402ebf2d7 - main - devmatch: read linker.hints from all module paths List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 748402ebf2d7a08b13d0b21694afdaad55cfa9cd Auto-Submitted: auto-generated Date: Wed, 06 May 2026 14:17:03 +0000 Message-Id: <69fb4d5f.46e02.3c8fa9f9@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=748402ebf2d7a08b13d0b21694afdaad55cfa9cd commit 748402ebf2d7a08b13d0b21694afdaad55cfa9cd Author: Baptiste Daroussin AuthorDate: 2026-05-06 13:11:16 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-06 14:16:54 +0000 devmatch: read linker.hints from all module paths Previously, devmatch would stop at the first linker.hints file found in kern.module_path. This meant modules installed in /boot/modules/ were invisible to devmatch if /boot/kernel/ contained a linker.hints file (which it always does). Merge hints from all directories in kern.module_path. This allows third-party or out-of-tree kernel modules in /boot/modules/ to be auto-loaded by devmatch just like built-in modules. Reviewed by: imp Differential Revivion: https://reviews.freebsd.org/D56847 --- sbin/devmatch/devmatch.c | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c index 62bfc2c521ed..6c6c5f3bcf79 100644 --- a/sbin/devmatch/devmatch.c +++ b/sbin/devmatch/devmatch.c @@ -102,6 +102,9 @@ read_linker_hints(void) size_t buflen, len; if (linker_hints == NULL) { + void *all_hints = NULL; + size_t all_len = 0; + if (sysctlbyname("kern.module_path", NULL, &buflen, NULL, 0) < 0) errx(1, "Can't find kernel module path."); modpath = malloc(buflen); @@ -111,13 +114,39 @@ read_linker_hints(void) errx(1, "Can't find kernel module path."); p = modpath; while ((q = strsep(&p, ";")) != NULL) { + void *h; + snprintf(fn, sizeof(fn), "%s/linker.hints", q); - hints = read_hints(fn, &len); - if (hints == NULL) + h = read_hints(fn, &len); + if (h == NULL) continue; - break; + if (len < sizeof(int) || + *(int *)(intptr_t)h != LINKER_HINTS_VERSION) { + free(h); + continue; + } + if (all_hints == NULL) { + all_hints = h; + all_len = len; + } else { + void *merged; + + merged = realloc(all_hints, all_len + len - sizeof(int)); + if (merged == NULL) { + free(h); + continue; + } + all_hints = merged; + memcpy((char *)all_hints + all_len, + (char *)h + sizeof(int), + len - sizeof(int)); + all_len += len - sizeof(int); + free(h); + } } - if (q == NULL) { + hints = all_hints; + len = all_len; + if (hints == NULL) { if (quiet_flag) exit(EX_UNAVAILABLE); else From nobody Wed May 6 14:40:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9dNF5YCtz6cj9V for ; Wed, 06 May 2026 14:40:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9dNF1xQTz3L2v for ; Wed, 06 May 2026 14:40:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778078445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iab0+dhGlBKo+5PzUlomE5Ed2J4fHml7WYcVA+maIWE=; b=jTx75O+nurc15q+7fJW9UHHEy/zhI2xwQKn8pA7LPmwTsfhJFM7f/YavjDMMx91YR4xGDS arWOgVEhABjDQ3ScA+jW0Yct8TfB/10Ml9rJpbRHy+PdRiDXJqvMvIE4B0khSg7w/MUu9S Iwsbb0cDj0goB88hUQVFIANKnaYQYYpWj2nqe4aUDCRpk/nS9UleV0mR9h5wam17IY+PPm Ax7UlxfA6KB/06wmTmPJOIrOhYsmuVNnYZWpudEEK3kgrR/QUAc2XnWPtctqQhHgqDtwq+ snsJT9TZYcw0hURmKIUtKhI2CadIkcJaQJ5oG/z44cgChmUN0wzEBPSGwKK+sA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778078445; a=rsa-sha256; cv=none; b=ckf6Ul3j60d2P5DfJpablUrnGHukikO8JUn6fCm+4Z5Tax/W6UpFYUDGJhrgnVrcY6sa0/ xpPOrcm749Hb46/jud8u+IIXAYdTRAgvp7JZ4SZH07dVJyuhpgrrw54sEVA6iEH1kHN8qA qVYwYjfsAOK5JHDtCgt8X8yPNQn6GaYWNPgTvMScpMqt0dqYiGMxWWsAZHZgoZffwDbwCi X+3X6Vt9S8FKq+LyuyQBE8gQRHYO7ARn9cKuEFwsuCNgD8XXQ98+p0C76HjcxFsh0/8eDD A7XDUzFRbwMtejOpFO/rNyhy7jg07m81rB02kwBqcuAAQw0C3NVpEqpAyRDziw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778078445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iab0+dhGlBKo+5PzUlomE5Ed2J4fHml7WYcVA+maIWE=; b=lUh1sfn7zlsS8BSiVSsH71BU7tpo9lLzCteVxOhonbf0Ni7NnSyTkaHXGlJS/huRKXF5gp BWConXMA9/yg/eJBt8hFHsIAc/4aGmv3Orx2c53W3mKoMXcTilxajsrsZt9IPTaKAricsF UEBFPnCPxmt4FCKaBtN3K5QJ2IxsgNE3lz29AFfmXAj/FWrFRObAOuZC9Z7waR27Eposnp fItrgwQmNRkQJyZ/hvSH7yeRxPJ86SAsOfks5qm5AwxyVCW72//xCZibBOni2a7EP1jzsV O2QGUjGufiX0R7lp+pfN+wnshPKZHQkz3dTkOB3+lT/fHuoBIiuyMVqRBWscpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9dNF1RcRzkM2 for ; Wed, 06 May 2026 14:40:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19bc4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 14:40:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3d8928114c4f - main - eventhandler: Fix the NODEBUG build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d8928114c4fec6cefbb1cd566ef8d1b3d2999e2 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 14:40:39 +0000 Message-Id: <69fb52e7.19bc4.7dd29db0@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3d8928114c4fec6cefbb1cd566ef8d1b3d2999e2 commit 3d8928114c4fec6cefbb1cd566ef8d1b3d2999e2 Author: Mark Johnston AuthorDate: 2026-05-06 14:39:52 +0000 Commit: Mark Johnston CommitDate: 2026-05-06 14:39:52 +0000 eventhandler: Fix the NODEBUG build Reported by: Michael Butler Fixes: 735b16d490ae ("eventhandler: Fix a race when pruning eventhandlers") --- sys/kern/subr_eventhandler.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_eventhandler.c b/sys/kern/subr_eventhandler.c index e91647648995..ccc62253d81e 100644 --- a/sys/kern/subr_eventhandler.c +++ b/sys/kern/subr_eventhandler.c @@ -288,10 +288,12 @@ void eventhandler_prune_list(struct eventhandler_list *list) { struct eventhandler_entry *ep, *en; - int pruned = 0; + int pruned __diagused; CTR2(KTR_EVH, "%s: pruning list \"%s\"", __func__, list->el_name); EHL_LOCK_ASSERT(list, MA_OWNED); + + pruned = 0; TAILQ_FOREACH_SAFE(ep, &list->el_entries, ee_link, en) { if (ep->ee_priority == EHE_DEAD_PRIORITY) { TAILQ_REMOVE(&list->el_entries, ep, ee_link); From nobody Wed May 6 14:46:49 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9dWL6BzSz6cjfR for ; Wed, 06 May 2026 14:46: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 4g9dWL3R4Yz3MJV for ; Wed, 06 May 2026 14:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778078814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zBJ8w2L+VtwtxIx9HWTcIClgHX4Rw3HXyvSgWbR9jaA=; b=HihjHPN9B4hby/VS9x6Xw3s0Tt28n4Q+7QyBp+igpI1PWXEJ9xiCajUCR10jczqmN4/x0A bD7D/IZjV7wmlfwJv55hjc1EEi6/iYBpgc7MlT1HcYp/2nlLXIe0COfQobM9WoRIOrHHeo ZapSGoOEEcPXisImen3skoTXv+LWkn2qriz4i21b9PSwBDOFiZwayXcATRy8pxLnrfliBr 4revCvDqP9kQsSSmFN2A9H35H0beEVo/Cj9ry9g/Lyl4OIbspj//FPcYN5mjcVYeBOcsTV uEs0XHfv2kv3hp0DxgoNgKSCjTUubVjOgEQ10Hl2uOjGORUfQQFWOx97OydeKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778078814; a=rsa-sha256; cv=none; b=wgjgmoY34pGmbrQxqCYG/El7lnApw7Wg8MLrcDQcQ7da1SjK+fGnYEQy8EzGhJuALVS6Hl tK0xOKEBy2wKxhI479y4PiqHwXfemg+ET/3k9vmRnIWmS83I+3w9S2nV9rmPxJMvQFvSLn 6PQuoh7Pm+VO9Wn+xwcl8zpycTurA+C1HtNuZMTK4BkDIR0oG93WkZpfzVHCatq2edfqph 4skNIuVTcTBNiNqHEN3e5HcVuXA2KPUDaxRSNDQlWC9sNOqliLs0t2m630kah+B7JGHYx7 tDjAOHbhNyOcE/b3/pf2twiTvymV96Ml7T0aPlt/iQBYbiAvhmVbNTsVLXAkWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778078814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zBJ8w2L+VtwtxIx9HWTcIClgHX4Rw3HXyvSgWbR9jaA=; b=SkwCMN+9mbt0D4VOm0ke+y7xVyB6AwjX80ismFWCzaALvvGPT70eBDaPniB0wnGGl5HKTB plZ6BSUb7kTItBiYs/K39EnGpZbZdRGaon70a+bRf0D0pTGfd0J3wbxFcYUPTPJLZANCrR lcI11kIiROdODeimPkIE3ZfIGYhr9huxsnsKE2Yg3qNdQl72jE9gZALN26MqNiyIakgKPg +mB5QYf5ZUrbq+74XF6g7a5xbVTVJx5sa8qT86GcUvMec/ZApNKbJ21mK/6h/OGAWvWb00 b5Wx9TCOmfXwRioUy4ElLFdwWPVZ8tZj0wHXfGHzWHvR4dRtV1T5RoRSYXu5Xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9dWL2k3hzkNg for ; Wed, 06 May 2026 14:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a304 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 14:46:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: e3e5b86e3b9e - main - README.md: Add packages/ directory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3e5b86e3b9e00f1fe89e54d13dcd665e63eb4c6 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 14:46:49 +0000 Message-Id: <69fb5459.1a304.3f1c1b86@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=e3e5b86e3b9e00f1fe89e54d13dcd665e63eb4c6 commit e3e5b86e3b9e00f1fe89e54d13dcd665e63eb4c6 Author: Lexi Winter AuthorDate: 2026-05-06 14:45:54 +0000 Commit: Lexi Winter CommitDate: 2026-05-06 14:46:29 +0000 README.md: Add packages/ directory Fixes: bb75b0d581f7 ("packages: Convert world to a subdir build") MFC after: 2 weeks Reviewed by: des, emaste Differential Revision: https://reviews.freebsd.org/D56839 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 737afe1566ec..160c91b387e6 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ Source Roadmap: | krb5 | Build system for Kerberos 5 (MIT). | | lib | System libraries. | | libexec | System commands intended to be executed by other commands or daemons. | +| packages | Base system packages. | | release | Makefiles and scripts used for building releases and VM images. | | rescue | Build system for statically linked /rescue commands. | | sbin | System commands. | From nobody Wed May 6 14:56:24 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9dkQ2hBgz6ckGw for ; Wed, 06 May 2026 14:56:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9dkQ1BD4z3PF3 for ; Wed, 06 May 2026 14:56:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778079390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=46yxfO9VL+m7lD80l/J80+2ja3Y2J0dXWFHDCz67RFY=; b=OdNHN3Zpes7UY7gNzHtYmgTq3w1F7j31dLbED35GOhgr8v+xypm90zoON3rsvbs7mzS9Oa h2HaYv3wGB7ei35GEFMBax4Hftft5YLHp+PH8aD8bKMD8Dbt6PAhDeAd7VAWtDxZpmnV+l MLFo50Wqrg8CpFbgODF23U2+0v8FO+EOcK04kse+LcSvOZPGhT8xnhFAlh3kF/1Jz3iEWq mzJtuLGcAxBFgcv+cZJrZhPpmEHEStG4f52lQfVJx2YGhlLIqY+N40XuLiXzWlhyzOfBec 3hXZEfCix9YZsfFwAHeRImpruRmOxOhlrrl2Dl3fDTw9QESItRbtDffWzfdCGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778079390; a=rsa-sha256; cv=none; b=h15A8hhdBdYuVzZizjrc/eDsjPN4bGfLNhC7u4BFWwgcjqq+JJ0LKQFrMobDcjC8TWHYpV 7QpQMhS/Nh0m7efQyFcNNlsFckKAQgbhiFEdTSPrlbKwZGSFHnTEN2YfvUHO2UrdzAK0xg lkb2FRhgOvFoZhW+25yydtd/mjaMrmkb6jC2fdGGeV9zE5VLuaSCSxOS/DAalm25DAqTuV 72cMwNORoxU6vUCimO9Vtwaywzk6pb7Ld5JUpBrA3znYNR1X8uPtNVQEf1PXy8PP8kw01H RjaKx2be/GyHim7nFrDrVLbWKuaYOlWlTgHztxplAdhB2immkVK8c0oK/NxXrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778079390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=46yxfO9VL+m7lD80l/J80+2ja3Y2J0dXWFHDCz67RFY=; b=iLjZqXVFDLg7F+1tLSI9cj+AmJeqmTgJNOc3vYen6sRyiE6GoxbvVpmmkSkO1a+UjJmPhy zLBxS5tRkNIsn1Io9U5U53QJsmekvIwinVyaCw2wHp4TViTUtSpMem00UcqpZCs5KOM+ek vqvVsvYoccB2ANYrYc+bVTVG2tty0yEF+vHtx/HNCU0tCop9oF0S7K+xKwHRgqK1NTK5V/ C6mHNSsyAYLSt/CtwwVTTX/aNQAbqUmxJtD+ECWxxFr4R8CYT7BjSPjXUb0IZahfbmEt0W zQl7lBB1JvpvHbAR6z5n6fcukMYSCpU5KmCQVEfTuBgwEFbT0IELuwvrESTqCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9dkQ0QhmzkW5 for ; Wed, 06 May 2026 14:56:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 192f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 14:56:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 448b4c3f7f7d - main - nfs_clsubs.c: Fix ncl_getcookie() when "pos" is negative List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 448b4c3f7f7dd4c7e1707d7b833a26294c297182 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 14:56:24 +0000 Message-Id: <69fb5698.192f8.3f1d837b@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=448b4c3f7f7dd4c7e1707d7b833a26294c297182 commit 448b4c3f7f7dd4c7e1707d7b833a26294c297182 Author: Rick Macklem AuthorDate: 2026-05-06 14:54:55 +0000 Commit: Rick Macklem CommitDate: 2026-05-06 14:54:55 +0000 nfs_clsubs.c: Fix ncl_getcookie() when "pos" is negative In ncl_getcookie(), a very large value for "off" for a directory can result in "pos" being set to a bogus value (including a negative one), due to truncation. When "pos" is negative, is can skip past the while (pos >= NFSNUMCOOKIES) loop and return a bogus pointer instead of NULL. This patch changes the type to u_int and also adds a sanity check for a very large "off" to ensure that a NULL pointer is returned for this case. This bug has been in the code for decades and I am not aware of any report of it causing a problem for users. Reviewed by: markj Reported by: Joshua Rogers of AISLE Research Team MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56779 --- sys/fs/nfsclient/nfs_clsubs.c | 10 +++++++++- sys/fs/nfsclient/nfsnode.h | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clsubs.c b/sys/fs/nfsclient/nfs_clsubs.c index ae9fa51947cc..6361ae5f2901 100644 --- a/sys/fs/nfsclient/nfs_clsubs.c +++ b/sys/fs/nfsclient/nfs_clsubs.c @@ -263,9 +263,17 @@ nfsuint64 * ncl_getcookie(struct nfsnode *np, off_t off, int add) { struct nfsdmap *dp, *dp2; - int pos; + u_int pos; nfsuint64 *retval = NULL; + /* + * Limiting "off" to 50Gbytes sets a limit of 100 million directory + * entries of maximum filename length. Much more with shorter + * file names. This limit ensures "pos" will not be truncated + * in the devision below. + */ + if (off > 53687091200ull) + goto out; pos = (uoff_t)off / NFS_DIRBLKSIZ; if (pos == 0 || off < 0) { KASSERT(!add, ("nfs getcookie add at <= 0")); diff --git a/sys/fs/nfsclient/nfsnode.h b/sys/fs/nfsclient/nfsnode.h index 07c7ccb0ff10..cd9ded943c2f 100644 --- a/sys/fs/nfsclient/nfsnode.h +++ b/sys/fs/nfsclient/nfsnode.h @@ -61,7 +61,7 @@ struct sillyrename { struct nfsdmap { LIST_ENTRY(nfsdmap) ndm_list; - int ndm_eocookie; + u_int ndm_eocookie; union { nfsuint64 ndmu3_cookies[NFSNUMCOOKIES]; uint64_t ndmu4_cookies[NFSNUMCOOKIES]; From nobody Wed May 6 16:30:33 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9gpy3h6bz6cs5F for ; Wed, 06 May 2026 16:30: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 4g9gpy2mz0z3d9h for ; Wed, 06 May 2026 16:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778085034; 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=FVcPuHUmbnfMLT7BMxR+lpkQ2GIJx8JGQ92iYgBrst8=; b=Im05Stw43xGFYPvqUvbrL6vgbI6iqvsnF+a0RJd3qvDMd82YoPzqlTDYgVxRzZk6dSYJLF LcOUfixL1Tqkh+Sng/TFTJqetEtA6Owgf3H5WUuk9v892AoBMkFeTFLymK33hBVREmDcxT GaYSVej/0GsVbZliNBTWDivjNiCK+fTO79o3HYPSYq6bT0Lgj7z/53P1sbEVIU6Im8D1Am 3m4zmMifjxI0LaCTZe1u7cxpZ5l4rjVZvc/fezcI5Ax7H7G9o3VeuIK4ZCPum81Ev5rakM nqLvS1hsbz3dS3SI9ve1IrUEaPLio8SRXyblw5zMHUHiyiulcCzRLABea/uUBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778085034; a=rsa-sha256; cv=none; b=SgOHsbJukL1JF/ts6XUPHTFfUPpBhl0hn/smWio7IiVMT9UF3883Ju7QhFqDdh6b2bcTpR wlFuvRzV+GXesIZUAkv3ebb5j5UM7ivmn2LhPb4Y2BXyQLRO/t7o1XpJmOHPQZZMsHpV+o n7ZRf95evlCrOE/oYT36H7uQ0EMDKCxfCuYcjdeRL+OF0dh27dO7f+NA/nsKJH8ujydCP0 hyo5Jh+/YL9vdxR3LBd0+pAiAN1AgPX8/oe+WBS/OqXQCrP3XA8q33x7zODLdRq1wrLnaP loSvw8Ou3K4QoekpRf7zYD4ShtwOUX/WQ8hdl2oWMmtaAo0hetK0g3dmlJyfyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778085034; 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=FVcPuHUmbnfMLT7BMxR+lpkQ2GIJx8JGQ92iYgBrst8=; b=vzHPJ0Zo9X/g+zNUiApzXhC5eZtDM+DMGUwdC7/7kexchuY1v3KSg+hWLCCkJLFDZ84joA vbKpE+vkuDYXVBPuQDsOUOFbrFHDKTy9Raxv9kk1g/2gCJvHcRtIScAjO/5GRubaSV65fb b+nL1A0kzAvkw9Lb0/9amC8Fg1VQlASVmLmeuo7IJMFM1o0rb5zNYeoWKyaew8nVxXrQBF sO9K5jpiLvIMRGz4OWkjeU9zkzfyszKm3ZYK4ZTViAHNK5UIcZeGo5vVJcUFrkWAuiSvRi 5rX78KX4Ed8O3V5gO4mb1zKAaphZeepJTy1w6tyNRrSgYnltkFDdbghj6Ykiiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9gpy1DXwzmWx for ; Wed, 06 May 2026 16:30:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26a2d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 16:30:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Aaron LI From: Colin Percival Subject: git: c4be32aabf91 - releng/15.1 - tail(1): Fix -r (reverse) to work on pseudo filesystems List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: c4be32aabf91ec74d95296a3455bb7ed05b50ff5 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 16:30:33 +0000 Message-Id: <69fb6ca9.26a2d.2057fe86@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c4be32aabf91ec74d95296a3455bb7ed05b50ff5 commit c4be32aabf91ec74d95296a3455bb7ed05b50ff5 Author: Aaron LI AuthorDate: 2026-03-17 04:53:49 +0000 Commit: Colin Percival CommitDate: 2026-05-06 16:30:14 +0000 tail(1): Fix -r (reverse) to work on pseudo filesystems Pseudo filesystems (e.g., procfs) advertise a zero file size. Fix reverse() to handle such a case similarly as forward() so that '-r' works on pseudo filesystems. Approved by: re (cperciva) Signed-off-by: Aaron LI Reviewed by: pouria, Ricardo Branco , des Fixes: 1fb3caee7 ("tail: Do not trust st_size if it equals zero.") Pull-Request: https://github.com/freebsd/freebsd-src/pull/2080 (cherry picked from commit 4feeca3193c316c18472cd40f215446fda3bd739) (cherry picked from commit 771a65210018c68198ea413df10225e87a0ea909) --- usr.bin/tail/reverse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c index 1fa8784dec6d..690101c0b803 100644 --- a/usr.bin/tail/reverse.c +++ b/usr.bin/tail/reverse.c @@ -78,7 +78,7 @@ reverse(FILE *fp, const char *fn, enum STYLE style, off_t off, struct stat *sbp) if (style != REVERSE && off == 0) return; - if (S_ISREG(sbp->st_mode)) + if (S_ISREG(sbp->st_mode) && sbp->st_size > 0) r_reg(fp, fn, style, off, sbp); else switch(style) { From nobody Wed May 6 16:30:35 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9gpz1s5Bz6crwG for ; Wed, 06 May 2026 16:30: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 4g9gpz0hygz3dCt for ; Wed, 06 May 2026 16:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778085035; 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=WIrnq2N7RjTCXMQmarQ/+gWEGZOZLlWz2RttMjtJQqI=; b=U4fNAuQmt04Im+uiQDy9S7s7kZVf8xjUjHylw5afUMFLhvpnzLhzvo4MPd+ms/6im/37oq 8iatbzu8xZHj/rOVwjL5+A/DlLsh4ONzdQmmGbDd9oZDHU+AlEtTffFZNIoaghyyN9yCQP sNKqp8dEid4DqcuDbowpihNas4GUbybWCRrf757Hz7HF6YDuTVqyKHwrb+qJGVqk7jCbo6 2clM4K7IDyrA6yvj4i9s2y6Ao5k6bNSFMe4AQvR+raNWFr05iNjqtSVc3+ZjsibZBAK+CR 5oV2ZlkdVxZRDd7kJAqfq1dU6+JqKxL50mkPY5RUlSBABk5noKFL1C/74L3ZDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778085035; a=rsa-sha256; cv=none; b=thNwHn37Y/8D+mr1cFaYi1LfStTMhmY3JnOpW6jR5nPnyBXIr7giyLcSCtc26QrAjkVp4M K4V/CGWasy1bBLSJs2NZvPaPnoM2/qSEuzy/FKRUMmsH0u+pg6mDIfN2HCNh98rf6Ik86N JR9DYD5ho0dC/+tPsgD/Gs3MgwIF+pEf4MoIvdaHE1cdpKw0dLqmjUsNQPmjVefxFwxOgP WJPNsmDyUkh6TjxYZT66Of88szamH6GVzN2A0RbwgS2fmW3pKkZ9rCuiuDtVmHLedqMtk3 x8IRV1dkrd/Y4DzK39jmrSQbGseC/oM+X2uurTMZWdaONLy3BBIXt1FC2r/VPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778085035; 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=WIrnq2N7RjTCXMQmarQ/+gWEGZOZLlWz2RttMjtJQqI=; b=mauvZXXD4+TEjBW3YmMb49/mm1CKIUH5gBnuzDyxXDWMzmmimJk/NaYK5bHEqwDHPdU7WM cj9XIGwnBVkyiZYTN9Gdltjxzoh9w2xAMkrgcC/D0E/2mE9DLw2GwCBMaxSghIQi9tSBTt KtXaaNhb1uKvaM5otYibCgBPtkDz5bYYazvKU5G279Z+6njSAYkMwjF/yNqk3I9DtKOa5+ JkNxki8q4mMrUDNC81WCIAgATAHuUieWL/iqH/aOds4JbT+2LPmWuKCb6TgHnSaltM6J1i wHo+Ndnd7T8hQL1a5/69KsiOh2Q6REbnSelLvU3hzzFUtSmhn6yFuWHe5hPiRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9gpz0DzdzmWy for ; Wed, 06 May 2026 16:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26a80 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 16:30:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Christian Ullrich From: Colin Percival Subject: git: d0f618e7ae95 - releng/15.1 - lockf: Avoid spinning when operating on an fd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: d0f618e7ae955af283cb03a805e130e6c03d0d38 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 16:30:35 +0000 Message-Id: <69fb6cab.26a80.58688fe2@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d0f618e7ae955af283cb03a805e130e6c03d0d38 commit d0f618e7ae955af283cb03a805e130e6c03d0d38 Author: Christian Ullrich AuthorDate: 2026-05-03 15:35:10 +0000 Commit: Colin Percival CommitDate: 2026-05-06 16:30:18 +0000 lockf: Avoid spinning when operating on an fd When operating on a file descriptor, acquire_lock() would ignore the flags argument and always operate in non-blocking mode, resulting in unnecessary busy-looping. Approved by: re (cperciva) PR: 294832 MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56722 (cherry picked from commit d90513ea85693da0ca5955173609f4e81e38ae16) (cherry picked from commit 651b82e64ef4f753d8f4c1793f359de39744526c) --- usr.bin/lockf/lockf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c index 16bae36a21e0..076d28b7ddd5 100644 --- a/usr.bin/lockf/lockf.c +++ b/usr.bin/lockf/lockf.c @@ -320,10 +320,14 @@ acquire_lock(union lock_subject *subj, int flags, int silent) int fd; if (fdlock) { + int lflags = LOCK_EX; + assert(subj->subj_fd >= 0 && subj->subj_fd <= INT_MAX); fd = (int)subj->subj_fd; - if (flock(fd, LOCK_EX | LOCK_NB) == -1) { + if ((flags & O_NONBLOCK) == O_NONBLOCK) + lflags |= LOCK_NB; + if (flock(fd, lflags) == -1) { if (errno == EAGAIN || errno == EINTR) return (-1); err(EX_CANTCREAT, "cannot lock fd %d", fd); From nobody Wed May 6 16:30:36 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9gq03Dcgz6cs5H for ; Wed, 06 May 2026 16:30: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 4g9gq01GHhz3d86 for ; Wed, 06 May 2026 16:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778085036; 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=WN2cp1bRBZ1fXhAOvO62i6zV0QKM64cgUc2wohhtgHA=; b=alrVULE3vpJUlLOGG51ulIisSTYn9xlAuzSnxmB34spdWWZ7/3eT/gRy+PnOaLY8cWbCIB t4jdw0qeaLZ7f7AAL8AVCuNxnl6W+76arzlqCKEbHb0GIjkq9KIsyQmQwRXW1ok2tDEl5I 03m1PVUC39DIug1BDhkqX/w+x3fIZGWClhB240yfiYbvNPyPIm35czyuhnkO8m3YKnusoc vEMs6a+ixXlkr+3M7A2g08dWYTL5FYK3VWMvfxrFhNqLWy5rOytEZzSIckW+XLt6KzV6Y1 kyxGTUfMVC63eZ6LEDdogjONanaTh+KT0zYVfzWchNl/41oKkxiPAi8nH2n2wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778085036; a=rsa-sha256; cv=none; b=nNDa0UIG9ZzTtK9O4gIkroiF27u8/gET1eNC+woAqUEMMWUNqvuIg/x+H2dpZcgvvlUjr6 JK4fR6DTvEFmPNkOWBf+jbcnYRWk3rMytty04MKE608hueP/UoUJxv6wkJGvhdlmYfXJje x0VqMAEUYUiTg0OaDmDrATI5haShK3ZZtLZQsY3nF2dpl6QuBa6TXHskSftuNuqEXlQ6Uq 5YhQ3NnTXHjvd5VSSszBOi00Uzx6Rc9lW7uG+sp/cyq7AGlLOt4OML09NjQV6NOAQq7T+O /EOUzgBN1aKWw2Xc371UIpD0oWFkDTLX8x3R0D4fj13JBKT9iikxVU2VL04NxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778085036; 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=WN2cp1bRBZ1fXhAOvO62i6zV0QKM64cgUc2wohhtgHA=; b=gWtcC+0whKg6TLIC7zCfjShmlJiq69A5gajQpnwGBURgsv7H7sHYSAIZqH/iemsan6Pbyt j9vjFPOa8zhDtD+W6FpsLYvFJjSdRfgyq53UrlwDQmtaPirCVgyIzVIoKAHjTDT0mW5/Gi WuWWLaKhw+LeUyGYAqGh3rOBmtU458ZCXAVaoz8iYKXzVjxg0F8za0WLmFMiVTYq4pnMvF 4fRaxt3rbtmaa0YBgvVoCJ4D0u9ESBkqP+beAu/2kbecFM24nOZ0Ln5tzA5RoNfH9W3fAC ASUby0Qaux/cLAckbEmgD7aSvRsbg//vNy9ooVC1xA9LD9JdBcuTP8DMgj8kiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9gq00mTKzmTL for ; Wed, 06 May 2026 16:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25fae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 16:30:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Colin Percival Subject: git: 0ae114f07f5a - releng/15.1 - lockf: Test that lockf does not spin on fd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 0ae114f07f5a8d6048459f8dc37ed4132b02dcc9 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 16:30:36 +0000 Message-Id: <69fb6cac.25fae.4906fd1@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0ae114f07f5a8d6048459f8dc37ed4132b02dcc9 commit 0ae114f07f5a8d6048459f8dc37ed4132b02dcc9 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-03 15:35:15 +0000 Commit: Colin Percival CommitDate: 2026-05-06 16:30:21 +0000 lockf: Test that lockf does not spin on fd Approved by: re (cperciva) PR: 294832 MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56723 (cherry picked from commit 0733afdb4dad58cfe7ad7f5994e26bf148d78199) (cherry picked from commit 8e5f92b6b22c82af1192575781788eb2c8fed448) --- usr.bin/lockf/tests/lockf_test.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/usr.bin/lockf/tests/lockf_test.sh b/usr.bin/lockf/tests/lockf_test.sh index 823b5673a176..16ee5a03bb9e 100644 --- a/usr.bin/lockf/tests/lockf_test.sh +++ b/usr.bin/lockf/tests/lockf_test.sh @@ -177,6 +177,23 @@ fdlock_body() atf_check test "$status2" -eq 0 } +atf_test_case fdlockspin +fdlockspin_head() +{ + atf_set "descr" "Don't spin when locking a file descriptor" +} +fdlockspin_body() +{ + # Start background locker and give it time to get settled + lockf foo sleep 2 & sleep 1 + # Start foreground locker in fdlock mode + atf_check ktrace -tc lockf -t 3 0 ; Wed, 06 May 2026 16:30: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 4g9gq21kvgz3dDs for ; Wed, 06 May 2026 16:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778085038; 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=UPYKG4I64jWa96Vk4KLuOv2HyVTHzyIwE7d3VrmEIso=; b=P76Sr71cxGaeO6mmNQQ3WvtYlwhpbKZNhX+xu0fwJp55UzkSh2L7JCR0QcT4gONXPz2H7q 76Nd9PTyfVf9mTNiThNHqBXu/d2FqrKKKzXi9ZQfvKc8kHzXnNtK3jJBzwcdlbpeQJn4bF hmMjkXNKsQV/bO/BDdnWtLED3QvgGeFMMWN/zh7wPs37OuvDAHRyYfJ/6OmWi0lcT69V/4 6ZwVswE9qEroZCGtpkpehPnZRWJh1tq5DLUGBUtRCCM6QMFzF/kfykw/hkjsR6DJw7p3up QFGKeO/uLTIG+6D56rWGH6VsTgtwxwuyYhxK6EIgXXZp3iJTeU14bUdVUUl+pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778085038; a=rsa-sha256; cv=none; b=PDTRsUxJ7GQUm1VgG0Isd4/CIBLgmayqXp2tjohx4ST/iKL9TBn9E1GpwNG9ZPKnVrKIkL wS+j10JCHWmJGuwIhv3p1raEDa5ucefSiXtK1+mra17pm6Gh4WrRLWdxAxjZBlRkUwXuMj RPuoCScMJyVITEf9UxqdC/7+i44Oi/JXDLDiH+jDEdtAXx3UEWfo7+94RV/2t2izEg/6dk p1sQMBi4eisur0o/DbiWnC9j5QJlnJ6ssQNc7jd1H+VRGrw53Z76/8iSZg3iJWmPPr2J1I Se2FeZQbnp8v2kZx0mTVZImthy/XRV/kdY5B3xVrxtJPVOgkmjTBXxIABAqjkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778085038; 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=UPYKG4I64jWa96Vk4KLuOv2HyVTHzyIwE7d3VrmEIso=; b=bBtjLG47WBcn6KKTq2PXJeeWVCZxO93cXS81vPx8E/TF+YzpECK6QPqwZ7m8gedC/RkV1a KIy2mnGRSbafvLez1ZFA+UgWVjNKPwFfpvkgAx8yl2fMerjm5J9S5oKbyVmf2Df9Vpsp0y IEsA8y5PJHQugzJYXFPpcds3WdFqM4VxcG9iDrmly48Q3hYAPY2XK/7hyjUfmUkraw7Db1 n9cchfBAwTTi3/iY62V3O91jbPv+/2QDSufrKesrUwO7lOg5t+S8MMPRnkF2VKglLqBcMF 4Lveu22E5Wu+oU1zxn7RS5apki11yFxiynjozIUmjs0WqROzWF90aeYh3oKINw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9gq20g5Wzmpb for ; Wed, 06 May 2026 16:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 265f6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 16:30:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ahmad Khalifa From: Colin Percival Subject: git: 6a3966f363d3 - releng/15.1 - vt_core: don't draw the splash if a panic occurred List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 6a3966f363d3c6d1e84205e93a50d5746570976b Auto-Submitted: auto-generated Date: Wed, 06 May 2026 16:30:32 +0000 Message-Id: <69fb6ca8.265f6.2ee37480@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6a3966f363d3c6d1e84205e93a50d5746570976b commit 6a3966f363d3c6d1e84205e93a50d5746570976b Author: Ahmad Khalifa AuthorDate: 2026-05-03 13:18:38 +0000 Commit: Colin Percival CommitDate: 2026-05-06 16:29:54 +0000 vt_core: don't draw the splash if a panic occurred The shutdown splash draws over all the useful info if ddb(4) is disabled. Don't draw the splash screen if we're rebooting because of a panic. Approved by: re (cperciva) MFC after: 3 days (cherry picked from commit bc83f414583ccaf337ef3b7c019df7727d6a3aae) (cherry picked from commit 3aabec5c8c6a74a4e50640b399a825d9f7adca9a) --- sys/dev/vt/vt_core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index 2015d982a560..8360f0b80fb5 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -1682,6 +1682,9 @@ vtterm_splash(struct vt_device *vd) uintptr_t image; vt_axis_t top, left; + if (KERNEL_PANICKED()) + return; + if ((vd->vd_flags & VDF_TEXTMODE) != 0 || (boothowto & RB_MUTE) == 0) return; From nobody Wed May 6 17:38:36 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9jKf33L1z6cFcB for ; Wed, 06 May 2026 17:38: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 4g9jKY2V3tz3nGt for ; Wed, 06 May 2026 17:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778089121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vxf7V4NblRQ7CyEO0HtwZNymufl0yC5m+MCVzng54V4=; b=yX/Ho4iI/7qe+zQrgAkvQ7xRqZJ18GBccmcyEioXALQtpgGQcmXb/TQhGbNTRVvj1ZMWAw 3cjZkkqfcyZ3VGWaZuqY0UAXTp+iWmmeOIQUG9ZOuCvbCrU5d0OFp+VhfJ8t2x/WzruoY2 /GzXmIxY/Nz6A+BdOe1DUYPyrZMynOLI8uUysp+FAEAgwvQ0n0VbQjP28leCGOqipdsuey tvcIYuPhDb/2ofq8fx0C0T0qqDHtxbDBRT7TSILeRBrtqAC4HG30aqGB4UD5JgiEDBRnPy 9DD2OQfS0ladO5DEM7rSU3vV9r1CCwVK/hmfj4PHFEUjptu7ox+0lcC2iWaQnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778089121; a=rsa-sha256; cv=none; b=UwY7Dxo7qVOx2wJkqXT+WBH6IjYzSv+mTixYCR9GhyUjbzYxtbstUxiy8pcxS0cNjPAapa AurgI+lzwANpQpNVpgIiMpdXhb60AZRIoZgT4IxwQJiWCddvHAaZTjlxzCFGPdnyGoerlZ HS5d/bIMDAQ7pOIPb2zrcHcVakn5y8h5Z0xD8cjbKOy9tHfReFXRM5DpzviCk5qq2LvY/o cGqUzAb5X6XEzkSdmBvaNDN1GeYKnawKdWWsP5r4AxoIx08609U/BKPFvkKxj6jG7nJl9k qDz2DUMQ+A0o3hHmXaocSpXGw33B3dVXBVMuh2Rn2FCbLWxK9yHJ9gNxGLNiFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778089121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vxf7V4NblRQ7CyEO0HtwZNymufl0yC5m+MCVzng54V4=; b=krLwXZzXXcsIUCS83IhDMsBFQ7HBSDLymmh04yJ6Fu3QURlJfdbyUamC8PIxbv784Y/9fk JW8koLTE3RBbNxV+9pxh30NlrT4mc1hZKV+2U0IKNjXTH5dxo7rKMPJ0xB+flZUOAx14KJ IiUJph9y5T/MFxTiU45etvN/88V/rkX/m6GrCKqpSDfPlF8NwP0ZUoqB8P1FNPNpZQ/K8Y 7kTM0wHigIOtSgnfhQD0rqbMZ2ZIbodDvrhX36XlA1g6Wn/56qw98AfXSz0cM/6qSQ/nE0 TlulBFJ/VOTc60FVOZrIHTp5Z7tu95YnEj8BdjsiHM+2nfmyakeBbdKUyDBZ6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9jKY1n7qzpjV for ; Wed, 06 May 2026 17:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33737 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 17:38:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Hans Rosenfeld From: Ed Maste Subject: git: bc9f667eb11d - main - bhyve/virtio-scsi: Don't invoke iov_to_buf() in an assert() expression List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc9f667eb11d9b47541f834faefbc6aac077cee2 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 17:38:36 +0000 Message-Id: <69fb7c9c.33737.73b4140e@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bc9f667eb11d9b47541f834faefbc6aac077cee2 commit bc9f667eb11d9b47541f834faefbc6aac077cee2 Author: Hans Rosenfeld AuthorDate: 2026-03-10 19:14:10 +0000 Commit: Ed Maste CommitDate: 2026-05-06 17:36:48 +0000 bhyve/virtio-scsi: Don't invoke iov_to_buf() in an assert() expression If anyone would build bhyve with -DNDEBUG, any code in the expression in assert() won't be executed. Instead put the return value in a temporary variable to assert that it has the expected value. Reviewed by: emaste, markj (earlier version) Fixes: 2a514d377b37 ("bhyve/virtio-scsi: Preallocate all I/O requests") Differential Revision: https://reviews.freebsd.org/D55803 --- usr.sbin/bhyve/pci_virtio_scsi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/pci_virtio_scsi.c b/usr.sbin/bhyve/pci_virtio_scsi.c index dafff50fa531..5fb867e5eae7 100644 --- a/usr.sbin/bhyve/pci_virtio_scsi.c +++ b/usr.sbin/bhyve/pci_virtio_scsi.c @@ -669,6 +669,7 @@ pci_vtscsi_queue_request(struct pci_vtscsi_softc *sc, struct vqueue_info *vq) struct pci_vtscsi_queue *q = &sc->vss_queues[vq->vq_num - 2]; struct pci_vtscsi_request *req; struct vi_req vireq; + size_t res __maybe_unused; int n; pthread_mutex_lock(&q->vsq_fmtx); @@ -747,8 +748,9 @@ pci_vtscsi_queue_request(struct pci_vtscsi_softc *sc, struct vqueue_info *vq) * This will have to change if we begin allowing config space writes * to change sense size. */ - assert(iov_to_buf(req->vsr_iov_in, req->vsr_niov_in, - (void **)&req->vsr_cmd_rd) == VTSCSI_IN_HEADER_LEN(q->vsq_sc)); + res = iov_to_buf(req->vsr_iov_in, req->vsr_niov_in, + (void **)&req->vsr_cmd_rd); + assert(res == VTSCSI_IN_HEADER_LEN(q->vsq_sc)); /* Make sure this request addresses a valid LUN. */ if (pci_vtscsi_check_lun(req->vsr_cmd_rd->lun) == false) { From nobody Wed May 6 17:51:36 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9jcS3vDHz6cGmW for ; Wed, 06 May 2026 17:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9jcS3LQwz3pYQ for ; Wed, 06 May 2026 17:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778089896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TS84LBA943yAUD4bugGgj8ggyKNf/SMahrcWhj7iC+k=; b=xHnZ26jogXgnk8zCsR2/NhxxL+L4Uo1Vi/MKVMSbM+VJCV+vtuzkdNAUZOvkz0cs8Twc+o 5lgJB106FtTOq1ZlkXW8xuf8kLMvSVJmSJA/E6ha4riL1fHtqa2S1Lt3kfv+zlwJ1kjvP6 GAsTRtELGaUDLi1g7dz0k/aSOVpIoo3Vs4hx30HfrUqyEidLUebaiGk1j8ADNx+kVw6PIA KYbwMuwznZbuASTH/VoeKjROD1pyScs5AehjAwLWXA9nKutC77MtGPEmI1FzaRM+LWvl3l MujFp/66eHD4q1YK6bgz/ddeJpTA800Qw5jwARGBdUNbPdl4kYC/+KQH2+l2rA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778089896; a=rsa-sha256; cv=none; b=NQEwskpvx2Q/sOOShJ7Z8CGvzyoqaSkpSQR0MUVNGeLnPyRteWonfnG5HzzCH7oiX7REkR +sS0S8UJ1WuyD0/2RmDdwYxTeK74fSrvhYXw+GYgB3Hnv6VXtmECXFUyd9A/g4T+TfsS1O rWY+XSlv5ZRi8fCVx1lw8rrF917RHWzV+pAPEhkCbwvRTwZV9b7kUyaYtBXdt0BhQarHyx ecOZa7/Lcyh6RRM1SOb0qqb7VA/UJMqBLWP+HHC/ZkyFfXFTkFE9pR2Ax9Eh/6iYUyFifI K2Tl5r/RFyUIaUGDhMSAmjiroKh5epxhM1gBhDZfEmXocTwCdACIPEcDfTEBnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778089896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TS84LBA943yAUD4bugGgj8ggyKNf/SMahrcWhj7iC+k=; b=cB8XP814eRDg/qz8buDrvPId99lPqhSVr2WQiOxQLpaLQhu1mpXISqBpA1xDp8lmW3vecO Uuu+L27x+R8Q56+XhJF4N/e6H9i9H4MvAfKKBJ9UnXkFRQYnuHsqIbFPbfZelI5nzqtliv clKRj11UqktB+SLw/kxplQzi40JpBmnuW4oL9NYTAeXbAcTy1lkFypchDGId1VIjdI0KXg GK0O6rf9Tsrpo1BctDOO/zG7W5fjfkDj1LSQZuURg4ovMFqB70GDCuWPJaki7a7ywGhxYj 5OXjhgs0zrUrk3GM+j0SAHuSj0CId+SDm+fyRfuyYyfKy4Ml7Zbg6PtAUicSfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9jcS2wsYzq2c for ; Wed, 06 May 2026 17:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36fcd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 17:51:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 76d756eaa682 - main - Makefile.vm: Split error condition List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76d756eaa6823aad282cc53ec4e41a9777d89adc Auto-Submitted: auto-generated Date: Wed, 06 May 2026 17:51:36 +0000 Message-Id: <69fb7fa8.36fcd.7fc03439@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=76d756eaa6823aad282cc53ec4e41a9777d89adc commit 76d756eaa6823aad282cc53ec4e41a9777d89adc Author: Ed Maste AuthorDate: 2026-05-05 21:12:25 +0000 Commit: Ed Maste CommitDate: 2026-05-06 17:50:07 +0000 Makefile.vm: Split error condition Make it clear which of two possible cases applies. Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D56837 --- release/Makefile.vm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index d937783f02fe..8296fc47a477 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -99,9 +99,10 @@ QEMUTGT?= .if (defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE)) || \ (defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)) -.if (defined(WITHOUT_QEMU) && !defined(NO_ROOT)) || \ - (!defined(WITHOUT_QEMU) && defined(NO_ROOT)) -.error WITHOUT_QEMU requires NO_ROOT (and vice versa) +.if (defined(WITHOUT_QEMU) && !defined(NO_ROOT)) +.error WITHOUT_QEMU requires NO_ROOT +.elif (!defined(WITHOUT_QEMU) && defined(NO_ROOT)) +.error NO_ROOT requires WITHOUT_QEMU .endif .endif From nobody Wed May 6 19:19:24 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9lYt32Z0z6cPVK for ; Wed, 06 May 2026 19:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9lYt0wGCz3xn4 for ; Wed, 06 May 2026 19:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778095170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LHYwUNXJaFOyPjGpclBZKFhAqh2OorAQuYfnlyHX92g=; b=XGXNRly5g4ZvnPYenVXC/gA6i7p5IcdTMtH5AgCnC0FXXtZ5fn5DJYyhge8KkJl94VG4Kc S++v5pfbjKzsp8JmGYoE064O4OLqA6/Vgt4zCJgXKf3kj65WDHIE2kR6ZVw5WLgYSA37Vs afhZrUWaxgyH0zbqDUYxU3gU+G7KwdViOWGqP5oQJ1C5f0s5Db24OxJZVomseik37lb+aA kWrepnFYyVMSOAxbI+aW4M26dG6UscH7N4WWDZoeVWYZSLoCOYLIwBHryD+3vGbizvgFuE qIudzC5XCzMltbciAk0VE/nfjCphnYIe4qtpNbO0W6NdexrRPDxot2JgsF2KWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778095170; a=rsa-sha256; cv=none; b=GTYAg0g9IVTHtJghLfBv2e4LUJB/XwD+PMMsm6XY5MkC4HxIKbjoW2Yc2obhMaJXgFVXgq 1Q0dFi4rgi3UA2Grh7ctKPjMT9IQOwTIyLAcGPaPvwm1z0HvNYJUV+9QBwxW0sqgOk3wpF gjkq1mGttbHOyf/AGrKem0nPB1PXM0k0cvkJqdQKDgwkBiW+7PVzPBqa7hgWauJruxt5Cl 57cB5PGFW5GYLWrxvlFV4BMzf9pFTV6xvG7a6hcLihQK0qLprXetutHNIHZvWc2O6Mipxr Et1Yw9Bp2Aud7/I7qKiQH3NPw2hegQyomJZqzrLV6gqF01u7AHMQ8HdMuN/xuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778095170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LHYwUNXJaFOyPjGpclBZKFhAqh2OorAQuYfnlyHX92g=; b=LxWpVvFbBwY63/PAnR4N8qVa7zZi8AFwoCp9FYg8SR+Z2jtAYZyqzHLEWCfZ26R3TnUAdZ tpHu05ttbjLzkVv80lVBioJGNhhzaBA2qQYraZvYf3diKkhLW6mOQdnggvnCIgE0Bcp0gn WcLs/HYL54qPQ4EJryu7QYmtQ+855GifKnbzcMEQzPZRLlPCb1PqQMK4S8kiqzABnCZr0Z 8XVtLUFp/V9uonSGfO3plRWoRuPN8q5Tsyhvx6DUX+x7/dm0w6EzffFo0hQnl52aFVx3SI B+Eil/lpGGlDdkZx4rB4q001c9aXMBeDnYFh1nOc6ieF8hT8IElF3K57I8nTEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9lYt0CJdzrxs for ; Wed, 06 May 2026 19:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ec65 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 19:19:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: tickerguy From: Pouria Mousavizadeh Tehrani Subject: git: 103f9883d1ed - main - rtadvd(8): Honor pltime/vltime in interface declarations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 103f9883d1ed7431c432caa6ab9c61cd4d0831d0 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 19:19:24 +0000 Message-Id: <69fb943c.3ec65.33f6d40b@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=103f9883d1ed7431c432caa6ab9c61cd4d0831d0 commit 103f9883d1ed7431c432caa6ab9c61cd4d0831d0 Author: tickerguy AuthorDate: 2025-09-29 16:05:29 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-06 19:19:13 +0000 rtadvd(8): Honor pltime/vltime in interface declarations Currently rtadvd ignores interface pltime/vltime specifications unless the (static) address range is also included in the config file. This extends the validity of a pltime and/or vltime stanza in the config file for an interface to delegated addresses from an upstream provider. Signed-off-by: tickerguy PR: 288426 Reviewed by: pouria Pull Request: https://github.com/freebsd/freebsd-src/pull/1863 --- usr.sbin/rtadvd/config.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index 8b7079c17822..df4473841312 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -1107,6 +1107,7 @@ get_prefix(struct rainfo *rai) ifi = rai->rai_ifinfo; for (ifa = ifap; ifa; ifa = ifa->ifa_next) { + int64_t val64; int plen; if (strcmp(ifa->ifa_name, ifi->ifi_ifname) != 0) @@ -1155,9 +1156,26 @@ get_prefix(struct rainfo *rai) "<%s> add %s/%d to prefix list on %s", __func__, ntopbuf, pfx->pfx_prefixlen, ifi->ifi_ifname); + MAYHAVE(val64, "vltime", DEF_ADVVALIDLIFETIME); + if (val64 < 0 || val64 > 0xffffffff) { + syslog(LOG_WARNING, + "<%s> vltime (%" PRIu64 ") for %s/%d on %s " + "is out of range, use default value instead.", __func__, + val64, ntopbuf, pfx->pfx_prefixlen, ifi->ifi_ifname); + pfx->pfx_validlifetime = DEF_ADVVALIDLIFETIME; + } else + pfx->pfx_validlifetime = val64; + MAYHAVE(val64, "pltime", DEF_ADVPREFERREDLIFETIME); + if (val64 < 0 || val64 > 0xffffffff) { + syslog(LOG_WARNING, + "<%s> pltime (%" PRIu64 ") for %s/%d on %s " + "is out of range, use default value instead.", __func__, + val64, ntopbuf, pfx->pfx_prefixlen, ifi->ifi_ifname); + pfx->pfx_preflifetime = DEF_ADVPREFERREDLIFETIME; + } else + pfx->pfx_preflifetime = val64; + /* set other fields with protocol defaults */ - pfx->pfx_validlifetime = DEF_ADVVALIDLIFETIME; - pfx->pfx_preflifetime = DEF_ADVPREFERREDLIFETIME; pfx->pfx_onlinkflg = 1; pfx->pfx_autoconfflg = 1; pfx->pfx_origin = PREFIX_FROM_KERNEL; From nobody Wed May 6 19:52:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9mHl2nVcz6chy5 for ; Wed, 06 May 2026 19:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9mHl1D8zz426X for ; Wed, 06 May 2026 19:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778097139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ia0jmkQ4lCa8Ib5nZNQJceHnvj5TtIbiww/7eEzqlzs=; b=dCid2ydgnPs14GMKhQkdxGzvWCNNqrBAGgbYf7ob/hI0+ynT5hyCzZ/61zkVpFXDYDf7H7 kwpSvzQh1PXbKLcQP74OGAg3MRoHkGnWDmp4ihIgrN1/uHl60NgfLAVx3heH2TJtFjtmNZ 1qG1Dea8ytugT0BlOn0vRBgvuOarAboboUwvnkmmjrscQK93ZL8KBlzybMT8Asers07aJu KiqyXGFUyIR+WwOysyBLps9lK/6G/Lv7F/JiY3bxm6Jkv9dYz9rJEAermNnCAYlpPSBcFf fqlp8JZj2V3lX1bQJZ8Qqs5MSCAVntRNJ9IAsQlw+mvfVTalUjMcAj48jW+qKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778097139; a=rsa-sha256; cv=none; b=fcp18QseHCHcJEaCOIV6FnN3oaOcg+p9zyZYz4PwtcnJnrcOL2yGzk+eqCK9uLku7udks9 7KNHaCdJkAT7wmuA5uwRbBrf10a8o5BoUHlb0XAdadHHhFLz5yYANLPF3c8RaGvdqUziU6 z1bqXNBaaDdXAbo1dDXRWv9rtQtPzYEB2dzDfCJ/h1Qs5poBTMZcJQUV5vkalxE5YmzAXY i8GfETi/QKKfpd/4KzCs91y//EIBATg3V3uao+lWoAu6K0naOf1uFWcLdeLAS+a90TchkU Q0WPPQm+nDjdnLaUAkY2SFhhPNV/aEiIhiYcfTVUlDQc11WYPGIV8rIjQmaiEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778097139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ia0jmkQ4lCa8Ib5nZNQJceHnvj5TtIbiww/7eEzqlzs=; b=At8B7rO84cvoOcfqLQ9ZXfo6DQeR+glsTs+bLDuF4u9k5ZvZJkc2Y0YAIhd94uCdDKh+dH +Ki+jnmYEVs7fNh+ctYEfO6qljiWNNdwtee1n+re/QrHKUzo7Y0UyfYi7LJBBxtEap+GFh YxcWrsIVuuZ/PLBPe/O9+nlj9R2BHfuBRs4prmGoGsuBbKwRgvAKhcyngRG40i/3uxJWVs KNYuLwR4TLtP9Wuioh5w7hho1LU0cVqH9SQi5Bk1cHLVt3fQekrsRolXH5xmAbipQbVrVQ lPH+JPzVPpMVbwONTcyppdtP7+ZA6m1qgbn7DJunzJZRdNKldRM/IRWmqQ9qmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9mHl0k3Vzt2R for ; Wed, 06 May 2026 19:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1be2b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 19:52:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Hans Rosenfeld From: Ed Maste Subject: git: 84a95741805d - main - sys/cdefs.h: Introduce __maybe_unused attribute List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84a95741805d84f0074a34d61b93ccf86f422cf3 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 19:52:19 +0000 Message-Id: <69fb9bf3.1be2b.3d323559@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=84a95741805d84f0074a34d61b93ccf86f422cf3 commit 84a95741805d84f0074a34d61b93ccf86f422cf3 Author: Hans Rosenfeld AuthorDate: 2026-04-16 18:22:44 +0000 Commit: Ed Maste CommitDate: 2026-05-06 19:51:46 +0000 sys/cdefs.h: Introduce __maybe_unused attribute The __maybe_unused attribute should be used for variables which may or may not be used, such as when their only use is in an assertion. This attribute is functionally identical to __unused, suppressing compiler warnings for particular variable if it remains unused. Reviewed by: Minsoo Choo , imp Differential Revision: https://reviews.freebsd.org/D56517 --- share/man/man9/cdefs.9 | 6 ++++-- sys/compat/linuxkpi/common/include/linux/compiler_attributes.h | 1 - sys/sys/cdefs.h | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/share/man/man9/cdefs.9 b/share/man/man9/cdefs.9 index cc56e34d070a..2bda50c3f875 100644 --- a/share/man/man9/cdefs.9 +++ b/share/man/man9/cdefs.9 @@ -3,7 +3,7 @@ .\" .\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd May 9, 2025 +.Dd May 6, 2026 .Dt CDEFS 9 .Os .Sh NAME @@ -85,7 +85,9 @@ linkage. .It Sy __weak_symbol Ta Declare the symbol to be a weak symbol .It Sy __dead2 Ta Function will not return .It Sy __pure2 Ta Function has no side effects -.It Sy __unused Ta To Variable may be unused (usually arguments), so do not +.It Sy __unused Ta Variable may be unused (usually arguments), so do not +warn about it +.It Sy __maybe_unused Ta Variable may be unused (usually arguments), so do not warn about it .It Sy __used Ta Function really is used, so emit it even if it appears unused. .It Sy __deprecated Ta Function interface has been deprecated, and clients diff --git a/sys/compat/linuxkpi/common/include/linux/compiler_attributes.h b/sys/compat/linuxkpi/common/include/linux/compiler_attributes.h index 42908bb6c2b5..159c833802c5 100644 --- a/sys/compat/linuxkpi/common/include/linux/compiler_attributes.h +++ b/sys/compat/linuxkpi/common/include/linux/compiler_attributes.h @@ -39,7 +39,6 @@ #define noinline_for_stack __noinline -#define __maybe_unused __unused #define __always_unused __unused #define __must_check __result_use_check diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 132d4809b0ed..a08c50c8439a 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -152,6 +152,7 @@ #define __weak_symbol __attribute__((__weak__)) #define __dead2 __attribute__((__noreturn__)) #define __pure2 __attribute__((__const__)) +#define __maybe_unused __attribute__((__unused__)) #define __unused __attribute__((__unused__)) #define __used __attribute__((__used__)) #define __deprecated __attribute__((__deprecated__)) From nobody Wed May 6 20:20:54 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9mwr2fmBz6ckkH for ; Wed, 06 May 2026 20:21: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 4g9mwr0vLQz45Qv for ; Wed, 06 May 2026 20:21:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778098860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Y5xzE+9+NQoP95W/ezvYCg/BPRVU6DCyXRyANqa6mA=; b=Np5XiC4sGhADm7BqyMboTlStjlB0SyKkfHRjd2b5BEmFZWwfTgz95/KhASZVXtktxXdCVX dxlUsaljLpF1ZOWoS/TRf6TJ/WecQ7+IaA/d5vm6oTbWR7KyV5yjXknUPNtwcTi48ntO4x IDl3Fc3S9A4qq4dhn+nn+FvGNsL/ekprjjeSjz04E7bYv5sdbTsaglVJuVtyayy4lzKJNL UFCZXsAenvAYiQYYSODi8UTmgPZTN3cEJgIMgyBYzqrRhVsEXQ3z4y+ZYioIbkkyhMcR0X exom5EoCe0P6f3BZu/jqMuh3PgzvFQnEjupjbLUU6xJnmUiXZ6bRjcZ8St7F/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778098860; a=rsa-sha256; cv=none; b=q+DIJg0owesijZPBaRJomciq1M5PPH9+cUTNzkgiC1YTdjvp3vOuy+LZVI2+6ED2yogltY R0H7BR8KetszduyTi3gpJZHkHnqkmTrjZLgSD3jP1YHmT3B5VwqblKAjJ5pGIETRJc6YJu vuWDhoIix91yfpifqMw7unHzKlnl7Xwx4w9oiNlkylsUkSp6hOFA8gXS3tVEdXj9k8DxAm 2SwQwtFtX2UCMEJlncFReH5GsIi+1r7udFCjgPJcfU+BlBbdKlTZQhm//EaMMcPL0wfBRm XG6rajuzaVn98ehfzeJ3OBo3NhresQ2AJske2Zmr0xVQZ7Sry0Tqyh9DotdJqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778098860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Y5xzE+9+NQoP95W/ezvYCg/BPRVU6DCyXRyANqa6mA=; b=QhAJNWzxBMKYCHKeAcVtZteaJPGYgU9j6J3RSGpMffJtroUXXuSMAnyPUUEbV7u7ZbypNT 2FnupsHAGGf8BxYay+Xr7I0wa3Oa8hd/uK6jno73L7AKy9lPpD1T9s4kFf+W3CmrPCU21/ LKhao47D9GAgnK/fIzpRuHzbK+kzGdRUiQOFbzrdkvtHHGUVSDewFRi0/C9ORtJnKbUHOU q4TY3fsVn+uZfv0kGc7dD6jD+F1pFZPQm5k9wlriNtaor3ALi2lm2V0BSXtiFDC4X0v3D8 JFMZqKiPxRW0pk/9dX8AfPuFRNYgAa2wfnsvTyxpeqrH8UAThvVcbwqzH3kGOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9mwr0G33zvJ0 for ; Wed, 06 May 2026 20:21:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cfd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 20:20:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: c316ec259011 - main - nuageinit: only parse user_data as yaml when necessary List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c316ec259011e9e22e40eaa72d834f3bfac95c28 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 20:20:54 +0000 Message-Id: <69fba2a6.1cfd6.2ed0b178@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c316ec259011e9e22e40eaa72d834f3bfac95c28 commit c316ec259011e9e22e40eaa72d834f3bfac95c28 Author: Baptiste Daroussin AuthorDate: 2026-05-06 20:14:17 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-06 20:20:45 +0000 nuageinit: only parse user_data as yaml when necessary This fixes a regression introduced in cae280931c9e which prevents user_data as a shell script to be used PR: 295062 Reported by: Ross McKelvie MFC After: 1 day --- libexec/nuageinit/nuageinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index f7700f7d8e70..a1ebd3f52b25 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -727,7 +727,7 @@ local function load_userdata() f:close() local obj = nil - if ud then + if ud and line == "#cloud-config" then f = io.open(ni_path .. "/" .. ud) obj = yaml.load(f:read("*a")) f:close() From nobody Wed May 6 20:52:28 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9nd85nMPz6cnXx for ; Wed, 06 May 2026 20:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9nd84jr1z47cY for ; Wed, 06 May 2026 20:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778100748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mz7aCwAmLagYvkBWYzJa0hQbyvKScGi2w6AH1DYTsS0=; b=wgAO73UcY6Ga56YyyhFTxIeAC/WM5zErweXzL9Fza4txqEulb4zDpdx6x1K8zUKJofk6b9 kkL3Qgwa8Me3nhqXrzTjhfmYzsazz1tRl+ObJJPm3x1D8fTbVie+L/puaKG1sMK8RHIfMW kXsMeie3PIuFeDfHKZCk4M7lRG0ijvmv2rsBpyyS7R6F+Lttuqpba/DN478QnhZtYrabeH HQo1Ab/9cf6mK2grDfxGkehIZbdjSVExGT0CNSuvtpAL2az0gpOB/gcwTQHb3s8Z0Agi+D 7hSf7yOH+Wyqz/PLsJk4EpArNPCpN+Pm2y4ESL8dLIjrG7UZQwm3x1A7z9iXqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778100748; a=rsa-sha256; cv=none; b=qNaO7DthS6bRr2EzzwVuWto9h13yBwBj8/X1aF9U4Ua4W3U+LR1CwM4YJZoaP1PpmjnZat j/g9lqHnOf6exc0fFpIG5vKNdyvpkJJQb+gRz/ohhdUiUKUDK04bak5Q7eJ4EdGLcaohsB XsGyo7YvdX53OiUSabScHCtE9qszSbqB6eSDyJ1IWKQixeLaQhOAyo98RkUAyfW09nqhpG iBxAkcGV4V6FiqkqFTpskAJjXFtWHmOf9F01rk3R4Z/MErMMr8rou/loEDlkxePndD5igz FXauMrV0n9tb2nHT1P00wmzZ3p84tiDAyeX+zxF5f1RhFkvSbDTlccD6xdPnlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778100748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mz7aCwAmLagYvkBWYzJa0hQbyvKScGi2w6AH1DYTsS0=; b=vo6PFNfoeWBK/Y2PJNNBK399NPjJZpBR9XCX+MYFnRpdaOdYScUnLKd+XZViCmzVxCI6P5 MNAsQwD+m0Rk1aJqw8TMX5p96E3Ce9A28PNMely06GcCBwOMrHRemX85TH+dn9neNKK7d2 WScajOA40Fyz1SLWwJTwR7B1xCHk6pOHmn3oXBAKX3u9PKxi/t7LRUBPzGBYCHwHTfg8No sll62qIcWkv9GR7D1GEmyxlEBRqLjYRW7BKrmTNRTSal/BQN7yCr2FNoC4llVDYt+av1T7 aQ9LQq0K7r81zW54VZabFfY0Kd0sbUj96PAzWEnXSFd9JWmKcrLQhRqg+vjEwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9nd84GCmzw4T for ; Wed, 06 May 2026 20:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 229d5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 20:52:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Ariel Ehrenberg From: Konstantin Belousov Subject: git: bf636accdde4 - main - mlx5en: destroy TIR before DEK during TLS RX teardown List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf636accdde4bb9af2c6c07af5420dffffd82332 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 20:52:28 +0000 Message-Id: <69fbaa0c.229d5.2dc77e0e@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bf636accdde4bb9af2c6c07af5420dffffd82332 commit bf636accdde4bb9af2c6c07af5420dffffd82332 Author: Ariel Ehrenberg AuthorDate: 2026-04-15 21:45:07 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-06 20:52:12 +0000 mlx5en: destroy TIR before DEK during TLS RX teardown Reorder the TLS RX teardown sequence so the TIR is destroyed before the DEK. DESTROY_TIR for a TLS-enabled TIR issues a TRA RX fence that drains all in-flight packets from the crypto pipeline. If the DEK is destroyed first, packets still in flight hit a TPT encryption error (vendor syndrome 0x55) because the key they reference is already gone. Reviewed by: kib Sponsored by: Nvidia networking MFC after: 1 week --- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c index 89d2010656c5..b6a9a0c01d09 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c @@ -596,14 +596,21 @@ mlx5e_tls_rx_work(struct work_struct *work) if (ptag->flow_rule != NULL) mlx5e_accel_fs_del_inpcb(ptag->flow_rule); + /* + * Destroy TIR before DEK. DESTROY_TIR for a TLS- + * enabled TIR issues a TRA RX fence that drains all + * in-flight packets from the crypto pipeline. If the + * DEK were destroyed first, packets still in flight + * would hit a TPT encryption error (vendor syndrome + * 0x55) because the key they reference is already gone. + */ + if (ptag->tirn != 0) + mlx5_tls_close_tir(priv->mdev, ptag->tirn); + /* try to destroy DEK context by ID */ if (ptag->dek_index_ok) mlx5_encryption_key_destroy(priv->mdev, ptag->dek_index); - /* try to destroy TIR context by ID */ - if (ptag->tirn != 0) - mlx5_tls_close_tir(priv->mdev, ptag->tirn); - /* free tag */ mlx5e_tls_rx_tag_zfree(ptag); break; From nobody Wed May 6 20:54:03 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9ng01X4Rz6cntX for ; Wed, 06 May 2026 20:54:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9nfz6pByz48cX for ; Wed, 06 May 2026 20:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778100844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JzUNN0updTA6xyDKf0FWSVtG1i+hsk/g2R1VeuHWez4=; b=hdVzQI2ti0RNlJgS7g7uItoL2BtGbYVi9/o3NA8trfmhzpecSduYffZJ6KuZT2lFm1WdqN ITvGO1zCY9nPjrx9BHQAf6dtMLcGKQtMvlXfmYfaM4UxGM3ABvrKplVo2AK/Qqn9uvfNpB TtnqXZkfktcgPgaYIYuVBKhIn7MKV+4s3W6UHfprSlRlw9QpUD5lWbtF1IGZX1Zzj563v3 pGG1aM8uo5TZOvLR8sMCSjn23aBRVG7grV+Dmq81pLroIk6NwZGilEgcQQCf6VA5LZLeGX qtyw3XiUHFEOMPayWf2MPVhedErSiMMp/gQscsz8NAVtL7+gxhGOD/DPDnzaVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778100844; a=rsa-sha256; cv=none; b=bbR/Qv9ZwghH1Z/UivXWR494p+EsQ1fto2plL2NgSzmmi/gLcRqIyIZOqNYX/4k4ThXwlR JFtyZn6Gf1Z+l9w169CvhSUuJ94rRbnCBevsC1dgDsvBuwswZfdNMlThm349DJZAgjF6fF T959d22rdQo8kJhU0ZJ8NVfr0bU0NHL6m0Y/htUtrw6q6Rbf0QH/X7qo9NSp+sSuZFGEhT nJZp8cD8RdCqseQMZKrIJ8GGlaaKSU9HgBOpqeQQLfDvg/uJBdL5J3t42dAF85+TyjjWNv 8qhJSJ4JwNOOQWXsRFY8YrFD8OBtocJr+V7vDV5b5rnQCBgGCGSHVsMAnnxRsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778100844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JzUNN0updTA6xyDKf0FWSVtG1i+hsk/g2R1VeuHWez4=; b=vc7UXJZzrSiGdP/rQiori5AGLQYrx/VRqZBpJxzE4TQ5gZKEh/KqNPXf9RNW/iz02oK9Fs 00KZaMZGlLsX+cV0sSy/0lDiPsjwQfBl8zsS89ko44cLxWLQysrOifU+/hZfnyWeNa08+D 6m/uP0QBTV6eGNTk4LhbOjG2Hul6WLQfUk74C8E8ijSUSvsNQcXREQaHlhp4q/RaRc+Om4 CBZp6zW2oUh8VqT+QG5z6WO1KUP6K9YmeMXsqezbp1vl7EdO0dDULfBeMkryYsWc7t1xML 8i/mP6J2HycJ+ZydylGhskJx8zXAalndPL6iYe0wL7dRc2NeSeFA/VDLTmTvVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9nfz63mWzvnr for ; Wed, 06 May 2026 20:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22e4c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 20:54:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5df7dae10dc0 - main - kobj: Use M_WAITOK in kobj_init List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5df7dae10dc02ade8639b0171e0d3cc8db790e41 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 20:54:03 +0000 Message-Id: <69fbaa6b.22e4c.bfab97@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5df7dae10dc02ade8639b0171e0d3cc8db790e41 commit 5df7dae10dc02ade8639b0171e0d3cc8db790e41 Author: John Baldwin AuthorDate: 2026-05-06 20:53:46 +0000 Commit: John Baldwin CommitDate: 2026-05-06 20:53:46 +0000 kobj: Use M_WAITOK in kobj_init Blocking allocation is safe in all of the current callers of kobj_init (most of them do a M_WAITOK malloc of the structure passed as the first argument to kobj_init just before calling it). kobj_init doesn't return an error code but instead panics if the nested malloc in kobj_class_compile1 fails, so using M_WAITOK here is more robust. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D56625 --- sys/kern/subr_kobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_kobj.c b/sys/kern/subr_kobj.c index 09fd730660c4..a88639289954 100644 --- a/sys/kern/subr_kobj.c +++ b/sys/kern/subr_kobj.c @@ -308,7 +308,7 @@ kobj_init(kobj_t obj, kobj_class_t cls) { int error; - error = kobj_init1(obj, cls, M_NOWAIT); + error = kobj_init1(obj, cls, M_WAITOK); if (error != 0) panic("kobj_init1 failed: error %d", error); } From nobody Wed May 6 20:54:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9ng4195Pz6cp2k for ; Wed, 06 May 2026 20:54: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 4g9ng3747kz4957 for ; Wed, 06 May 2026 20:54:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778100848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Ny6nsfBT3HqP8103paARQMZD2nNs2G0mMWpMEBpRoY=; b=qmDbrmjnyqeNHS9Mm2NscSB4tvOjy7Qyvwdquiwl8tW3kGAcXY5nYFHf5YJCsv1P/QQ6XS jfuB85Ev+03wOwD88W3kIqqCqeZPRSBV/GMkEVLmm1mFZVLBeYUwpyxMwu/OkRUDB002PO iHM8bKK95ww0AU5R4GPQF6MhRT/SUlv5eRgiEbGe2JB6txv2z21hTzvIn8ffX0tBQnF9HD ZxJJ4Qh8e1vPgg0OXP5jAPxv2lqnwy5THqf44658+vMgvepCFAX9TJMGDIZuIZvBwOQdnX 8kcoqMZ/swJ4MeOGzcOzmm7gjxRPaE/MAEDPicG1fO6qcR+dTmxh3egW1GUBiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778100848; a=rsa-sha256; cv=none; b=FGKVMZN3nciPi0X9beaf9ER4UtbxTcZQ3TNCnlJdeXhx/HtJ/F0V1bx4fpANrgSZ3D4Ah4 qmI2wz/gPbqBBq1z96wROR6qfmHG/BMgB4JvPrZt0I5xfKnvXxeHRfzsJATWkmzTptuph7 ehDjD4FO4Ama2DbDidkp/+of8Qu3buyVeKr2KpS0ec1UUEhFFgm+aY1YXX42lZmh1SBXHi ZdgkcD5J4U8u2sk8f7hDzDUlUftROsBr+kneNF3+vmm3F+ALpWj8i33wJeO5t7zXi38Pdm 9I2Qn4A+Zu0U7AlP3g3v5gl5PaTJwcnOd8r8Ru/rwfyZsW1Zvj4ghSGGIfCpxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778100848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Ny6nsfBT3HqP8103paARQMZD2nNs2G0mMWpMEBpRoY=; b=XRFL+N29Y/HyrM7HQXHCYhhXkMsHJxd9GN/0eRETIqU++AKR+Ig41w1i4SsyXRFpJgE8Kp I8az8phjYg3ZW6EPSDFjvksCJc33YnP1rzAHoWyM3eyTACfwr4bjqHGVu0Tss0jbUl0CZ3 YyEvZDCKLqekURQLjdZs54jSCZ0nVGLRaqWRjmtiWzFl50ss9Bu6IJIApc7WBlxXOPEHRJ 969FMmHOjG8obCv/8QMLFllyl1awr/SUyL2ezg6DvUAg7GnwKJjnJQOZ78OMTE62/o4awL jRQJyizL1AmCzCyGqkjoarRitt2CuZPPQRhl1o8e/ZeI+02hVb9Yb+q7yBBMNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9ng36Tmzzvx0 for ; Wed, 06 May 2026 20:54:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21d51 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 20:54:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5a6e5954d14b - main - kobj: Assert class passed to kobj_init_static is compiled List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a6e5954d14b589bcba0125d10a6c7b62b588f4b Auto-Submitted: auto-generated Date: Wed, 06 May 2026 20:54:02 +0000 Message-Id: <69fbaa6a.21d51.a89b380@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5a6e5954d14b589bcba0125d10a6c7b62b588f4b commit 5a6e5954d14b589bcba0125d10a6c7b62b588f4b Author: John Baldwin AuthorDate: 2026-05-06 20:53:46 +0000 Commit: John Baldwin CommitDate: 2026-05-06 20:53:46 +0000 kobj: Assert class passed to kobj_init_static is compiled Inspired by discussion in https://github.com/freebsd/freebsd-src/pull/2016 Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D56624 --- sys/kern/subr_kobj.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/subr_kobj.c b/sys/kern/subr_kobj.c index d97834b3fe58..09fd730660c4 100644 --- a/sys/kern/subr_kobj.c +++ b/sys/kern/subr_kobj.c @@ -317,6 +317,8 @@ void kobj_init_static(kobj_t obj, kobj_class_t cls) { + KASSERT(cls->ops != NULL, + ("%s: class %p is not compiled", __func__, cls)); KASSERT(kobj_mutex_inited == 0, ("%s: only supported during early cycles", __func__)); From nobody Wed May 6 21:16:48 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9p9F0dd8z6cqHh for ; Wed, 06 May 2026 21:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9p9D5GpDz4DxJ for ; Wed, 06 May 2026 21:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778102208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RH8tNjiaAlJr4M4SXOYy6i7IkgOOuTRu5N4DV6vUUkc=; b=NBFZmHFkIALBaMIpqeJrF0uDSgDGTJNH78Cq/Az5rLnTdO+KiET5iumYnckxEkJEejNLtR uRVwVBhCVfx0nHPNZy4UBk4owcx3mLixMj+appS96r7Th1bhLptGIrXQwNUK1Ajyic+1hV QtH6A89vdD8cJ/rRasLGGWGcmi+rLBaTLzVZuyGhTn061h0hoT3xh8spNZI33+av4fZike Y91IdnEOBbAO1FJPz17WSniUTj7W+IIyJdmYuNqLS8mlGyVPmxm0cpRyaXSDyrAzFraqK7 yG2OCBAjNbS6Kv1zZsNMZWbIo7+5Nw14OWbUA5UQPJ9Ns+0tQhl7lvY82FRmkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778102208; a=rsa-sha256; cv=none; b=nF5Na67nVun/OhJk0WHBIV6eMlMnTq1Gf7tmDTS0k5FK95Jmhg2ZabkTIHBv2Nv/cshf2C sr85faUt8jYQYFM7VpBR7KeJy0vJTFyDI7r67zb/R5c6M+u0DGvAvBaORZgqOzuCweG3Gj AvndAwT86nqKSIhoqqMym8G7yIp77MQ9XX/3aT2AxEl15ZH9OKRBxYOnJdV+OPnrG3jy9x 6QEXCgOih9ftLaoqkua2hs6yjQ6KbxKWsnZmh5z9W7sREkco1DMiMja7bkAgWaU7jZhoWH F8T9qOeFYfT898oE0Nx3S6DGHT9PwN1XSW422tJlk5q2OR4H56iUM5P6TeMwZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778102208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RH8tNjiaAlJr4M4SXOYy6i7IkgOOuTRu5N4DV6vUUkc=; b=Om/Ao1MNmR6lBkacyaGHtN2PwKkQI6tJ6Tc9FrP+pMVowib5CzeElJusXd1OApOz923Dbz cyHp6GCDG+F7WV36hOBB+f7zuZYFu0i/v0E1bKPyNX20D1P72U5s2QyoXxzyHHC+e6FGL3 apI0Hf2ICvbTtodP1v+xe8v8DU+uekTUtpiqddZ6PFYhSeBm7TGdF2nV6//hJ1cYfyzqqQ ZcLcz73Pra4vV7BfI1eo+6hzlyq8MCmUa/gA0YAN04l1OCchD+ie6OrzClI34yFWvz8STU KxbNfLpoW4DXgNkoin4hW83gBwegMFOzgy8e7AV8zItKQoUaQOecViXzDaxQMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9p9D4MgbzwbB for ; Wed, 06 May 2026 21:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2275d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 21:16:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 2a86992ab501 - main - nuageninit: modify the test to show the issue fixed inc316ec259011 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a86992ab5019b4997ccadf7427011ba44e33c97 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 21:16:48 +0000 Message-Id: <69fbafc0.2275d.6d4eafb6@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2a86992ab5019b4997ccadf7427011ba44e33c97 commit 2a86992ab5019b4997ccadf7427011ba44e33c97 Author: Baptiste Daroussin AuthorDate: 2026-05-06 20:45:50 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-06 21:16:37 +0000 nuageninit: modify the test to show the issue fixed inc316ec259011 Ensure the script used is invalid when parsed by libyaml which highlight the issue revealed in PR295062 while at here validate the mode of the file is properly changed PR: 295062 MFC After: 1 day --- libexec/nuageinit/tests/nuageinit.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 3a01413f8487..1fd68d5a178e 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -76,10 +76,12 @@ nocloud_userdata_script_body() { mkdir -p media/nuageinit printf "instance-id: iid-local01\n" > "${PWD}"/media/nuageinit/meta-data - printf "#!/bin/sh\necho yeah\n" > "${PWD}"/media/nuageinit/user-data - chmod 755 "${PWD}"/media/nuageinit/user-data + # ensure this is an invalid when parsed with the yaml parser + printf "#!/bin/sh\n: ${test:-yes}\necho $test\n" > "${PWD}"/media/nuageinit/user-data + chmod 644 "${PWD}"/media/nuageinit/user-data atf_check -s exit:0 /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud - atf_check -o inline:"#!/bin/sh\necho yeah\n" cat var/cache/nuageinit/user_data + atf_check test -x var/cache/nuageinit/user_data + atf_check -o inline:"#!/bin/sh\n: ${test:-yes}\necho $test\n" cat var/cache/nuageinit/user_data } nocloud_user_data_script_body() From nobody Wed May 6 21:29:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9pRw0KYwz6crBl for ; Wed, 06 May 2026 21:29: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 4g9pRv5b8Kz4HHl for ; Wed, 06 May 2026 21:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778102971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lWgWmeVNMh7yid+zI8SNZlMVbxwrnSM+0vJT2NmCLA4=; b=bGjYaIrDJysQGPfHVPHiqIwCMi4nMZLF58oORAv5axWdA6xtbvesilha387mSOVV6X0REj RF6lmWOLNC5zeXYlQZCe/yLHeYyyZq25MVPxmirjlTd6q3GtXyZIOQXLKpc7XFwv2OWoRK UEkXGd6HtVTuwgwfA7FuTY7vszqAM9SOtIbDcBxcD9ytsUgkIjdasww3hyuZOoKgLgNAy4 4X6Mu2pO7sjtJisJf+8xKUcnqmCCxPTeUwzunTB1iroev7PskAfkEKXhDepiRD0mz0cdvK 06VRWtBQjdIJpVK4AimY7ed/GenvViobjxF8I9tc1GpfHitDYJhKvswy1Rv63w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778102971; a=rsa-sha256; cv=none; b=kqa4CXgkDluV5aydrNs/NXxcAteB5xZOLt0nU6tZKKValC1hogfpoyDJnMvIiE9PCYCt0s C+gvTNJJRSAKDMpCKsC2Kj2tgwXIu42P5qsNPwhtBPohHmuqJCLMrHD+iPlDAdC4btrIxa J78RhNOb1EZvn8o30BCdEENMnPBWhfnGjol5B+5noUmNVR4+ZIySn56+z9SYTTRYPpS6jM XPHrS6Cz/hdEkCoH0FMkp7suojr6wDBMYMlOuhKGLuIcpYH4MOybeDjp65P+EbwCQXtIyX V+U6qrtigp67vDJSMWtUybvaF+JgSgi9oFM39a3EeJ+y6hvyI4bMPNU+6FM99w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778102971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lWgWmeVNMh7yid+zI8SNZlMVbxwrnSM+0vJT2NmCLA4=; b=A6N+54a59A9T51GVnquE6Wh5yDcLxb/DihR23CrZbeXVmnC9vJKNATSi6/l2WnCb+g1PHa J3H2zVqcnkocjZNCLWipsCJ+tlnCJgoiNu8maZHBHCMyQrihWleUNR56qmRz/Au41TKW2X IbpEgC2CWu3sbGLNVZMH5T0nW+Y9o7JbGLjwawc+Rk/vIChB9UWvQW7zy4W6vcBE155pZk NlKPnmY5GXulSP0Ip4gfet6/rbhxsDtWPhj7wHNEBDPASPsAxAKEGwca0YtSNyNT25hY3M 4suxxRZiT9YYIeBZkneQmjqYJmVOP+ldOk0RoiKV0zJaHSew2BigH7uW3g2rmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9pRv5C2Pzwqr for ; Wed, 06 May 2026 21:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 250ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 21:29:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: c4af3f13a4e9 - main - freebsd-base.7: Document adding a local repo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4af3f13a4e9932968d92872aaf22312a6e79e4e Auto-Submitted: auto-generated Date: Wed, 06 May 2026 21:29:26 +0000 Message-Id: <69fbb2b6.250ac.6d9e436@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=c4af3f13a4e9932968d92872aaf22312a6e79e4e commit c4af3f13a4e9932968d92872aaf22312a6e79e4e Author: Alexander Ziaee AuthorDate: 2026-05-06 21:23:52 +0000 Commit: Alexander Ziaee CommitDate: 2026-05-06 21:25:26 +0000 freebsd-base.7: Document adding a local repo MFC after: 1 day Discussed with: bcr, ivy, kevans, ngie Differential Revision: https://reviews.freebsd.org/D56608 --- share/man/man7/freebsd-base.7 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/share/man/man7/freebsd-base.7 b/share/man/man7/freebsd-base.7 index 51de679ea9d1..d1857b2dbbec 100644 --- a/share/man/man7/freebsd-base.7 +++ b/share/man/man7/freebsd-base.7 @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd April 14, 2026 +.Dd April 23, 2026 .Dt FREEBSD-BASE 7 .Os .Sh NAME @@ -217,6 +217,27 @@ for a different target than the host system): pkg -r /ppcdev -oABI=FreeBSD:16:powerpc64le \e install FreeBSD-set-devel .Ed +.Ss Adding a locally built repository for snapshots +Disable the predefined repository, +and add a local repo for locally built base system packages: +.Bd -literal -offset indent +cat << EOF > /usr/local/etc/pkg/repos/FreeBSD.conf +FreeBSD-base: { enabled: no } +FreeBSD-local: { + url: "file:///usr/obj/usr/src/repo/${ABI}/latest", + enabled: yes +} +EOF +.Ed +.Pp +The packages are created by the +.Xr build 7 +system at +.Pa ${REPODIR}/${PKG_ABI}/ , +which defaults to the example directory. +.Pp +.Sy Note : +The repo must have a different name than the predefined repository. .Ss Unregister a currently running system Systems managed through .Xr pkg 8 From nobody Wed May 6 21:39:13 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9pgC0vpNz6crq7 for ; Wed, 06 May 2026 21:39: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 4g9pgB6Dbxz4J9g for ; Wed, 06 May 2026 21:39:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778103558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FgcYjLNfrTaAcbo2N8kgK4an0a6tnAd0aFmQeslhECA=; b=rxJ7nxTyvn+c6LU2IHqYndHACP/HzFANiPfObuAEzsfPl37koIA4rEvX1JeTdGg92Y7wh3 NxinI9LZu+SQR95OQ8npYI7QNnjyOTmmsqb/eown5PtHAKy+m2/XUasfrHBNmcWXHV2yoQ hWBOXqnOwXrLefl8oommhPOe49+3wNCeRHcDf+7iZPWd9e8zjt8kAKx4+uhaCBDKAJNPnO DHlc7N5ViZ+VsMO+D/VZVEoGHlhVGIyZ0KLRbq0odDgcHiGS5CmQApA9DuR82EMW+ayOSN /2ZT07qNVeT21LGKSyFeD4bW9p1A9sLgVq2AJQnoo9LsqNlvW5+0Pcjag/mfCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778103558; a=rsa-sha256; cv=none; b=XA6BXEc8DqDo0/6hw/b7/98AbE2Wgk4cu1EOEpv6uF8kHtrblnZ4Fl+S1+wEcTg9DK8mgM JPSKUNZPcZV923/T1JtB+d/eUtPQM4C/0vOPSoZZhmAbsj3LnEwd428Q4kzUGK/G/v0UAj Cc17xqiUtciLgPPKVS1SlO2BwYHPHINuPHuiLXph3R0srFQBVp+XI0uVz7z7bzcb664xzr kzFHfk5qIDmwYxEk9U20KHF6crSjlmprvRFD/79FRF0dfTO5QNUkVT5Fdc15KbMOURFi1G r7FkPHzmD/977t3JxGrNunDTnbBj/MNbHeS4Z5o2SIDGwhIRtnnAy4/8HKh2Fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778103558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FgcYjLNfrTaAcbo2N8kgK4an0a6tnAd0aFmQeslhECA=; b=Y3oy/qeiFO/ui9TN7lTqrQJ3mX5ztJNqKZ0ilX9krmctV9byOmlAt+Mr1Sf4oP3ps/i/sz eJQikHGohwveyB2SyZ8eDN1UqSjLLg6JoI6zlKDOQPvM+4SxnF9euugrfTahDuiyzFXw7L jL0f2yA9c9RBRIqcIQQHytWO5Khg8cAgq+Sbsy9qtqjQ1u2EElbdaps24/UH1+fxpW/jqR kEL8Kk9C3JWBzQ8CjxRkmIR5f0cOTP8Ko0jrXF6Ssaxlo9oQiarD53umyzvxglbGMKEWcu RXCG5/FoM8gNyZRXq8Cyqe7XX7smDE88FM05xWg9Ua9rs5Z66ZOCIaiTHygQaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9pgB5plNzx6P for ; Wed, 06 May 2026 21:39:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25ab8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 21:39:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 84ffe564dff1..a12c6ed62fcd - vendor/openzfs/master - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: a12c6ed62fcd06093b95616515e4716b0b0bc038 X-Git-Oldrev: 84ffe564dff1b7f69d397817ef292cbe2c5ebad3 X-Git-Newrev: a12c6ed62fcd06093b95616515e4716b0b0bc038 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 21:39:13 +0000 Message-Id: <69fbb501.25ab8.14befd40@gitrepo.freebsd.org> The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=84ffe564dff1..a12c6ed62fcd a4a7df886f8f libzfs/mnttab: restore ability to enable/disable cache 6748e7e65ea6 ZTS: add libzfs_mnttab_cache test c18e8ba87489 Linux 7.1: access dentry d_alias directly e78a51dd6ffa Fix off-by-one in PREVIOUSLY_REDACTED handler that drops last block b8d959640352 Fix rare cksum errors after rebuild 0a59f7845c28 Avoid flushing unrelated NFS exports on snapshot unmount d5099c330b90 Initialize vr_last_txg for rebuild f828a80cb6e4 CI/GCC: Add Fedora 44, fix build errors and threadsappend 366b1f9a3eab Fix long POSIX_FADV_DONTNEED for single block files 2de4f4c742e7 CI: FreeBSD 15.1 PRERELEASE (#18490) b68c782d82a7 man: document three missing properties and tunables 5dd912192dcd Update description of spl_schedule_hrtimeout_slack_us ae37f05d87ad linux: verify stale znodes in legacy fallocate 872f01019345 Zstd: rework ZSTD_isError symbol renaming a12c6ed62fcd ZTS: Remove threadsappend_001_pos exception From nobody Wed May 6 22:50:00 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9rDt0rB6z6cy0j for ; Wed, 06 May 2026 22:50: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 4g9rDt086Vz3FBd for ; Wed, 06 May 2026 22:50:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778107806; 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=rRRer2h2q7G66iQE5AAWs7P8NPvMywglvkmqW+dICGk=; b=vhQrc5ffKu+FoOVpbFxk2HbP0K+4iLXBXYBVAsux0U1VxlcmuyvkS7L6lchoF4DJxwBhCu rfzMBAMeA7oEHf3vZ5u86njEIvgDAUwDDUn9+J+q5ye/esT88fcn7hJKO5BGSBXfzVabbI /iJNB7N2hgNBeSP0L78L4qojA10VEvKkJEdyox/I14dxyTN2hfetjBbUrhpE1en+oDZY/q H3L9Rs+wK+fViHMHVhuN8065QloSipKIKxeXWalmWAf4FhdYAuavjZVFXBC+T86w1xH6Gg bpeAwV6VCHjM1hXscezHq5gx4yRQaXnL9Z6xHWpO1HlFJawzk5Lm360H8yxdyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778107806; a=rsa-sha256; cv=none; b=IcpqFeJ2lfpnFi0/PTIkyDyYgG+ld0Y6yY9JOFtg132MmS60ulFhIqHFwsGx1RbmFnF9Lr lnFrJfIgrwzNT3r/6Q442J+Q/zHViQZAgDRejppnao/rdhgHPeYilsIM4jz5RCfEYzZHI9 WjHL8M+BvwBcmYmTwhvh+80M46hdPowuDTCeVsu2DjD8UFVz75Dm6boKfYSFNHhD9FxrmW VPsJvu7QU2c4DWfXYkAD0wI+64QJl22AXyPQEMFvz2iBLBTLfd3Mwry1Aa89buHVoPhPKg ktdmCyWOd2a+1H59o09iazYMObI3mPZHH95CogpABpgnzn4RLV8rplP47sMpqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778107806; 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=rRRer2h2q7G66iQE5AAWs7P8NPvMywglvkmqW+dICGk=; b=eNcMmwN6USfWk+VkstLP53F9IKEk0IsktZ0IFSRP5roZ/dpS240RM1io30SnSx4PL+S5lT 8qp1UHKH3uTOJEe/nUKqtsJaePCaqp3r7QknlToZyA03HNKudCj3NeAW4ojEv6U+NhNF93 jEUSMXWx9cWW5TlhGrc5+DEhG6qgVUtS+r6T0XqjXfze6Y6OPXJV7TSAbUEvV3PIA3SC66 7oMWFi1f9GWEwFS/n865G8dxGuuFW1Pcf5cLiLXrl6lZIIOkE+dquOpcoT8rDWyIznOe2k bY/wPs8Y/aYvpD3tff+rLg2RT0PajVK2sO3OExWyU8Unk+JP9tZvFHVmzEpfCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9rDs6hWszyvb for ; Wed, 06 May 2026 22:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37704 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 22:50:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Enji Cooper Subject: git: 1c4f255bae84 - stable/15 - tests/if_lagg_test: unskip 'witness' testcase List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 1c4f255bae842ab43baf6f635367a50b34876835 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 22:50:00 +0000 Message-Id: <69fbc598.37704.3f9cba05@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=1c4f255bae842ab43baf6f635367a50b34876835 commit 1c4f255bae842ab43baf6f635367a50b34876835 Author: Siva Mahadevan AuthorDate: 2025-07-15 16:45:24 +0000 Commit: Enji Cooper CommitDate: 2026-05-06 22:49:50 +0000 tests/if_lagg_test: unskip 'witness' testcase This testcase passes consistently (in 100+ runs) now. Signed-off-by: Siva Mahadevan PR: 244163, 251726 MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 7a83fedc116d827cc9c6d8e049b785f1d7b68dcd) --- tests/sys/net/if_lagg_test.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/sys/net/if_lagg_test.sh b/tests/sys/net/if_lagg_test.sh index e2b998599991..992cdd1ebc0d 100755 --- a/tests/sys/net/if_lagg_test.sh +++ b/tests/sys/net/if_lagg_test.sh @@ -392,9 +392,6 @@ witness_head() } witness_body() { - if [ "$(atf_config_get ci false)" = "true" ]; then - atf_skip "https://bugs.freebsd.org/244163 and https://bugs.freebsd.org/251726" - fi if [ `sysctl -n debug.witness.watch` -ne 1 ]; then atf_skip "witness(4) is not enabled" fi From nobody Wed May 6 22:52:34 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9rHk2783z6cyPp for ; Wed, 06 May 2026 22:52: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 4g9rHk16V0z3GYq for ; Wed, 06 May 2026 22:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778107954; 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=Ah20SZJJHCRuD5lgvLtmTFNH/ToKe3qnknt1qdmV/20=; b=NxTPqcGpjLz97U6hnRoSxCtIvLohiSB8pmCi0to/fsSczs2hEY3vKkUf+VWMZwstOEJiM8 xqcdCxnWfnZAbfKRaxBohS0TTblRsoQ5UC7tYUhH4rIpF7iKTyAqFBkYCqcZc4rTdI99Sv mRnrqOidVNS5b7mDW5/xAMialJQ438sa9npv1qe3tblYSjQuIIZk4gYT7UmnZgK+DWhovk gALsDOqSBOpLBz7xft0hppgoNMMUlHUfFpRP3CyeAxol+d5fosBthTEtJn1kcHJqCoYQcC 8AT2ffx8qG+WIV1StjB1w2jtwTml7RATo1g710AD9DgOOoe2sZnFw72bw+T/5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778107954; a=rsa-sha256; cv=none; b=O76JvNuWZBuzOxiws/QoQt7zIRWtxkgUE+5OjYoQ8wdwKp47Kd2VtAPERhATvR7Txyk8Y6 J+aOZ16Gt88uPRDBtP49KdHNAyzXj5mmdScH+TZzonHhMAZFYYKuy+Wi0Q4HlWAEr2bQhx vaQ8jeoRVgobIx49KnO/j9pxUZ7f6oyFes+sRxReIYVPcbLq/rhbwXZWUuMD1f7LmDGwPP BUPkItb8IHvG47xvFQfDSmANtjZ1khrhL8AnIHeM8P96oKZX/EhEic9J30I0mlqsw87wIs l8bD3SXIC5r1TcelJn7O278QhbB7tps6FQJ0bb5a1jvaEjF0pexdYvDC5r/4rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778107954; 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=Ah20SZJJHCRuD5lgvLtmTFNH/ToKe3qnknt1qdmV/20=; b=EAr041PcTIhr/1Vzwl0YdxvUr/gck+4cxy6HrW0qM00tjy3gO8B7Td6e8fIW4jwcnMR6wC VNExd5YrfEc+4ZHTEKtRyVTf4EMm9UG8J7fZu7lrRJbawFrw5VcKLq7t+/Oa/qMUGLB+ia 3rAxiQLJEcaWa+cIayNy4YYjlQ0wd+VM32FGeHizuykH4Z5iskTclfXCHDyHqH7+sdS7Lv Ui8YFw8tCHfEEd8adRZOKlu0UTYH4MDLDbT/b1gc1o8JqqB2Z32H9v0yg9AXExLLCn/2M7 fvaqc+DMg0DTsy/aac2+Yw5Z5ZVfBX3G+kOM9ON7ZSC/M3ZwE8dt3CUrSVqcMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9rHk0jjlzylG for ; Wed, 06 May 2026 22:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37e5e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 22:52:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Enji Cooper Subject: git: 18626fad5f48 - stable/15 - Unskip test sys.netinet6.frag6.frag6_07.frag6_07 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 18626fad5f48efb9ccd22e4a06d49c0776a4c898 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 22:52:34 +0000 Message-Id: <69fbc632.37e5e.39b9863b@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=18626fad5f48efb9ccd22e4a06d49c0776a4c898 commit 18626fad5f48efb9ccd22e4a06d49c0776a4c898 Author: Siva Mahadevan AuthorDate: 2025-07-15 16:45:24 +0000 Commit: Enji Cooper CommitDate: 2026-05-06 22:52:25 +0000 Unskip test sys.netinet6.frag6.frag6_07.frag6_07 This is now consistently passing with 100+ consecutive runs. Signed-off-by: Siva Mahadevan PR: 244170 MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 681e9d3e391f30a512c523514f69a63c9782a901) --- tests/sys/netinet6/frag6/frag6_07.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/sys/netinet6/frag6/frag6_07.sh b/tests/sys/netinet6/frag6/frag6_07.sh index 09c82102b9b0..6189314013fd 100755 --- a/tests/sys/netinet6/frag6/frag6_07.sh +++ b/tests/sys/netinet6/frag6/frag6_07.sh @@ -218,9 +218,6 @@ frag6_07_head() { } frag6_07_body() { - if [ "$(atf_config_get ci false)" = "true" ]; then - atf_skip "https://bugs.freebsd.org/244170" - fi frag6_body 7 frag6_07_check_stats } From nobody Wed May 6 23:08:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9rdz5rkqz6d0QX for ; Wed, 06 May 2026 23:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9rdz4P9Sz3Hst for ; Wed, 06 May 2026 23:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778108903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vog4g9/2ztcl3i1N8UCBqR1JeM3NSxNzV1Zpfb37dYM=; b=Ds6bifrE86ZLvruSQ9zNAwif/6kzoXCJeotm3f7Ue6TQs1gh+YQUcrusF0ZLShzfhZS6kU d2v8jQfwZj57DzdNaq5hYSDfNkAB7A1R4Ub2mwCIOP/TXX0ev3pfLugvWY/s7nuSMw+Kbk OA7uzj8vzTu1DseGsAs9KfLSVi+owHpXp3Udc1C+JI8nPUQUonAfQceRp8IfDNQUUVk74W am2fszHOfYdGENHrVU27+ocgCJd1RwNm/E9Tras8CFNBPpfBJbUvcsmIwbUEuzcC5o/DUl 9p/sTZRSUH9vmheaM2/2v1LhLjoR4ZoxL8QzfmgOhDr++6/0aTffWNbNuYYB4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778108903; a=rsa-sha256; cv=none; b=SvR70cUjHhOhEhvvdHJbQxaSn4FsZo2HiOyUEbZguak3phOjEB7dMUSGk2C0O4wnWHH8mN 47/Bob1p028ZVfRmbtVjbBIezJ6reMW6NK6NC+90Ew0N0YGAgARKxlZcJ0S41RXJE5TkIB qCJ4MmN3LuoGhYRmjC0qrge/sOdPV+CjPrOoacBQslecbnFidP5u2wvoIFQx3hdLFrRRsO 5ustaf7IhLLxghsKR/IkRTHdQzqteG7dSNyuGtMZVmyI7CmmhUuhvhbwEQz6nJxXvQKMO2 F8GYXYAA+amSKtA8zIIsS1c+be22msic7rNpRg+y64BiFqpFk/fEASDcGqIOnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778108903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vog4g9/2ztcl3i1N8UCBqR1JeM3NSxNzV1Zpfb37dYM=; b=ZaOtwu7y1Fbm9cg6rBh3zudmbz1NZROcr6b+u/Dy7C3nQYyLXeXuVn6CAPbtEYpmDhI0Bo tRel4/5ltG/6kYxtN+shIUUaM/p7TsKc4DKgjZSJRmdIqqwrRjqXgHaRA9B/c52hvxJ3TV 5/WQ7+8lDHKljc2Vbw0So+ksvaSpximdPV6s/1M9yqc2GXKCLzkLYY7m4c/0S/DdzHTVVd L/0hUnTmsknG1Zn3wmWa6H0nRhJD+KE7zEhfnshEZyve0cv26B7lDlDviwbyrn03JMm9Ml /CvFc8NBesING2ueY7crQ1mLicj4pgQabtT8N1cQGSEk0Yf1gLwVzJuxBHPDAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9rdz3YhLz10Hv for ; Wed, 06 May 2026 23:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38422 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 23:08:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: efa8679e7f69 - main - zfs: merge openzfs/zfs@a12c6ed62 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efa8679e7f69c9cc225613827d9f75644cca5b3b Auto-Submitted: auto-generated Date: Wed, 06 May 2026 23:08:17 +0000 Message-Id: <69fbc9e1.38422.61a698ec@gitrepo.freebsd.org> The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=efa8679e7f69c9cc225613827d9f75644cca5b3b commit efa8679e7f69c9cc225613827d9f75644cca5b3b Merge: c4af3f13a4e9 a12c6ed62fcd Author: Martin Matuska AuthorDate: 2026-05-06 21:46:01 +0000 Commit: Martin Matuska CommitDate: 2026-05-06 23:07:56 +0000 zfs: merge openzfs/zfs@a12c6ed62 Notable upstream pull request merges: #18473 b8d959640 Fix rare cksum errors after rebuild #18477 e78a51dd6 Fix off-by-one in PREVIOUSLY_REDACTED handler that drops last block #18482 d5099c330 Initialize vr_last_txg for rebuild #18483 872f01019 Zstd: rework ZSTD_isError symbol renaming #18489 366b1f9a3 Fix long POSIX_FADV_DONTNEED for single block files Obtained from: OpenZFS OpenZFS commit: a12c6ed62fcd06093b95616515e4716b0b0bc038 .../.github/workflows/scripts/qemu-2-start.sh | 16 ++- .../.github/workflows/zfs-qemu-packages.yml | 2 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 10 +- sys/contrib/openzfs/cmd/zed/zed_event.c | 2 +- sys/contrib/openzfs/cmd/zfs/zfs_main.c | 3 +- sys/contrib/openzfs/config/kernel-dentry-alias.m4 | 32 ++++++ sys/contrib/openzfs/config/kernel.m4 | 2 + .../system-generators/zfs-mount-generator.c | 5 +- .../include/os/linux/kernel/linux/dcache_compat.h | 2 + sys/contrib/openzfs/include/sys/vdev_rebuild.h | 1 + sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 18 ++-- sys/contrib/openzfs/lib/libzfs/libzfs_diff.c | 4 +- sys/contrib/openzfs/lib/libzfs/libzfs_impl.h | 1 + sys/contrib/openzfs/lib/libzfs/libzfs_mnttab.c | 70 +++++++----- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 2 +- .../lib/libzutil/os/linux/zutil_device_path_os.c | 16 +-- sys/contrib/openzfs/man/man4/spl.4 | 13 +++ sys/contrib/openzfs/man/man7/vdevprops.7 | 6 ++ sys/contrib/openzfs/man/man7/zfsprops.7 | 15 +++ sys/contrib/openzfs/module/nvpair/nvpair.c | 5 +- .../openzfs/module/os/linux/zfs/zfs_ctldir.c | 19 +++- .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 5 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 16 ++- sys/contrib/openzfs/module/zfs/dmu.c | 10 +- sys/contrib/openzfs/module/zfs/dmu_objset.c | 2 +- sys/contrib/openzfs/module/zfs/dmu_send.c | 2 +- sys/contrib/openzfs/module/zfs/dsl_bookmark.c | 18 ++-- sys/contrib/openzfs/module/zfs/dsl_dir.c | 2 +- sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 12 ++- .../module/zstd/include/zstd_compat_wrapper.h | 2 + .../openzfs/module/zstd/lib/common/zstd_common.c | 8 +- sys/contrib/openzfs/tests/runfiles/common.run | 5 +- sys/contrib/openzfs/tests/runfiles/sanity.run | 2 +- .../openzfs/tests/test-runner/bin/zts-report.py.in | 1 - sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore | 1 + .../openzfs/tests/zfs-tests/cmd/Makefile.am | 4 + .../zfs-tests/cmd/libzfs_mnttab_cache_check.c | 107 +++++++++++++++++++ .../openzfs/tests/zfs-tests/cmd/threadsappend.c | 8 +- .../openzfs/tests/zfs-tests/include/commands.cfg | 1 + .../openzfs/tests/zfs-tests/tests/Makefile.am | 2 + .../tests/functional/fadvise/fadvise_dontneed.ksh | 13 ++- .../functional/libzfs/libzfs_mnttab_cache.ksh | 26 +++++ .../redacted_send/redacted_max_blkid.ksh | 118 +++++++++++++++++++++ .../tests/functional/redundancy/redundancy.kshlib | 9 +- sys/modules/zfs/zfs_config.h | 7 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 47 files changed, 522 insertions(+), 107 deletions(-) diff --cc sys/contrib/openzfs/config/kernel-dentry-alias.m4 index 000000000000,0baf1a06d3ce..0baf1a06d3ce mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-dentry-alias.m4 +++ b/sys/contrib/openzfs/config/kernel-dentry-alias.m4 diff --cc sys/contrib/openzfs/tests/zfs-tests/cmd/libzfs_mnttab_cache_check.c index 000000000000,661c5ce43f66..661c5ce43f66 mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/cmd/libzfs_mnttab_cache_check.c +++ b/sys/contrib/openzfs/tests/zfs-tests/cmd/libzfs_mnttab_cache_check.c diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/libzfs/libzfs_mnttab_cache.ksh index 000000000000,2459e364c1d7..2459e364c1d7 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/libzfs/libzfs_mnttab_cache.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/libzfs/libzfs_mnttab_cache.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/redacted_send/redacted_max_blkid.ksh index 000000000000,13820b470222..13820b470222 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redacted_send/redacted_max_blkid.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redacted_send/redacted_max_blkid.ksh diff --cc sys/modules/zfs/zfs_config.h index 77c310c268f8,000000000000..b4e4c1e4d29b mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,962 -1,0 +1,965 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* __assign_str() has one arg */ +/* #undef HAVE_1ARG_ASSIGN_STR */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +/* Define if your assembler supports .cfi_negate_ra_state. */ +/* #undef HAVE_AS_CFI_PSEUDO_OP */ + +/* backtrace() is available */ +/* #undef HAVE_BACKTRACE */ + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_file_open_by_path() exists */ +/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* bdev_nr_bytes() is available */ +/* #undef HAVE_BDEV_NR_BYTES */ + +/* bdev_open_by_path() exists */ +/* #undef HAVE_BDEV_OPEN_BY_PATH */ + +/* bdev_release() exists */ +/* #undef HAVE_BDEV_RELEASE */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* __blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */ + +/* __blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */ + +/* blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() exists */ +/* #undef HAVE_BLKDEV_PUT */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* struct queue_limits has a features field */ +/* #undef HAVE_BLKDEV_QUEUE_LIMITS_FEATURES */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_disk() exists and takes 2 args */ +/* #undef HAVE_BLK_ALLOC_DISK_2ARG */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue hardware context is cached in struct request */ +/* #undef HAVE_BLK_MQ_RQ_HCTX */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* backing_dev_info is available through queue gendisk */ +/* #undef HAVE_BLK_QUEUE_DISK_BDI */ + +/* blk_queue_rot() is available */ +/* #undef HAVE_BLK_QUEUE_ROT */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if getgeo() in block_device_operations takes struct gendisk * as its + first arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_GETGEO_GENDISK */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + ++/* dentry aliases are in d_u member */ ++/* #undef HAVE_DENTRY_D_U_ALIASES */ ++ +/* 3-arg dequeue_signal() takes a type argument */ +/* #undef HAVE_DEQUEUE_SIGNAL_3ARG_TYPE */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* dops->d_revalidate() takes 4 args */ +/* #undef HAVE_D_REVALIDATE_4ARGS */ + +/* Define if d_set_d_op() is available */ +/* #undef HAVE_D_SET_D_OP */ + +/* Define to 1 if you have the 'execvpe' function. */ +#define HAVE_EXECVPE 1 + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* linux/filelock.h exists */ +/* #undef HAVE_FILELOCK_HEADER */ + +/* file->f_version exists */ +/* #undef HAVE_FILE_F_VERSION */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* fs_context exists */ +/* #undef HAVE_FS_CONTEXT */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* GENHD_FL_EXT_DEVT flag is available */ +/* #undef HAVE_GENHD_FL_EXT_DEVT */ + +/* GENHD_FL_NO_PART flag is available */ +/* #undef HAVE_GENHD_FL_NO_PART */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the 'gettid' function. */ +/* #undef HAVE_GETTID */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* mnt_idmap does not have user_namespace */ +/* #undef HAVE_IDMAP_NO_USERNS */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_generic_drop() exists */ +/* #undef HAVE_INODE_GENERIC_DROP */ + +/* inode_get_atime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_ATIME */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* inode_get_mtime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_MTIME */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_atime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_ATIME_TO_TS */ + +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_mtime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_MTIME_TO_TS */ + +/* inode_state_read_once() exists */ +/* #undef HAVE_INODE_STATE_READ_ONCE */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() returns struct dentry* */ +/* #undef HAVE_IOPS_MKDIR_DENTRY */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_get_pages2() is available */ +/* #undef HAVE_IOV_ITER_GET_PAGES2 */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* Define to 1 if you have the 'issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* iter_is_ubuf() is available */ +/* #undef HAVE_ITER_IS_UBUF */ + +/* kasan_enabled() is GPL-only */ +/* #undef HAVE_KASAN_ENABLED_GPL_ONLY */ + +/* Define if kernel toolchain supports AES */ +/* #undef HAVE_KERNEL_AES */ + +/* Define if kernel toolchain supports AVX */ +/* #undef HAVE_KERNEL_AVX */ + +/* Define if kernel toolchain supports AVX2 */ +/* #undef HAVE_KERNEL_AVX2 */ + +/* Define if kernel toolchain supports AVX512BW */ +/* #undef HAVE_KERNEL_AVX512BW */ + +/* Define if kernel toolchain supports AVX512F */ +/* #undef HAVE_KERNEL_AVX512F */ + +/* Define if kernel toolchain supports AVX512VL */ +/* #undef HAVE_KERNEL_AVX512VL */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel defines intptr_t */ +/* #undef HAVE_KERNEL_INTPTR_T */ + +/* Define if kernel toolchain supports MOVBE */ +/* #undef HAVE_KERNEL_MOVBE */ + +/* kernel has kernel_neon_* functions */ +/* #undef HAVE_KERNEL_NEON */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* Define if kernel toolchain supports PCLMULQDQ */ +/* #undef HAVE_KERNEL_PCLMULQDQ */ + +/* Define if kernel toolchain supports SHA512EXT */ +/* #undef HAVE_KERNEL_SHA512EXT */ + +/* Define if kernel toolchain supports SSE2 */ +/* #undef HAVE_KERNEL_SSE2 */ + +/* Define if kernel toolchain supports SSE4_1 */ +/* #undef HAVE_KERNEL_SSE4_1 */ + +/* Define if kernel toolchain supports SSSE3 */ +/* #undef HAVE_KERNEL_SSSE3 */ + +/* strlcpy() exists */ +/* #undef HAVE_KERNEL_STRLCPY */ + +/* Define if kernel toolchain supports VAES */ +/* #undef HAVE_KERNEL_VAES */ + +/* Define if kernel toolchain supports VPCLMULQDQ */ +/* #undef HAVE_KERNEL_VPCLMULQDQ */ + +/* Define if kernel toolchain supports XSAVE */ +/* #undef HAVE_KERNEL_XSAVE */ + +/* Define if kernel toolchain supports XSAVEOPT */ +/* #undef HAVE_KERNEL_XSAVEOPT */ + +/* Define if kernel toolchain supports XSAVES */ +/* #undef HAVE_KERNEL_XSAVES */ + +/* kernel has kmap_local_page */ +/* #undef HAVE_KMAP_LOCAL_PAGE */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [unwind] */ +/* #undef HAVE_LIBUNWIND */ + +/* libunwind has unw_get_elf_filename */ +/* #undef HAVE_LIBUNWIND_ELF */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* building against unsupported kernel version */ +/* #undef HAVE_LINUX_EXPERIMENTAL */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Define to 1 if you have the 'mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* 'flags' in 'struct page' is a struct */ +/* #undef HAVE_MM_PAGE_FLAGS_STRUCT */ + +/* PG_error flag is available */ +/* #undef HAVE_MM_PAGE_FLAG_ERROR */ + +/* page_mapping() is available */ +/* #undef HAVE_MM_PAGE_MAPPING */ + +/* page_size() is available */ +/* #undef HAVE_MM_PAGE_SIZE */ + +/* mount_setattr() and struct mount_attr are available */ +/* #undef HAVE_MOUNT_SETATTR */ + +/* Define if ns_type is accessible through ns_common */ +/* #undef HAVE_NS_COMMON_TYPE */ + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* readahead_page() exists */ +/* #undef HAVE_PAGEMAP_READAHEAD_PAGE */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* pin_user_pages_unlocked() is available */ +/* #undef HAVE_PIN_USER_PAGES_UNLOCKED */ + +/* posix_acl_to_xattr() allocates its result */ +/* #undef HAVE_POSIX_ACL_TO_XATTR_ALLOC */ + +/* proc_handler ctl_table arg is const */ +/* #undef HAVE_PROC_HANDLER_CTL_TABLE_CONST */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* If available, contains the Python version number currently in use. */ +/* #undef HAVE_PYTHON */ + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* register_sysctl_sz exists */ +/* #undef HAVE_REGISTER_SYSCTL_SZ */ + +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* Define if set_default_d_op() is available */ +/* #undef HAVE_SET_DEFAULT_D_OP */ + +/* shrinker_register exists */ +/* #undef HAVE_SHRINKER_REGISTER */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* sops->free_inode() exists */ +/* #undef HAVE_SOPS_FREE_INODE */ + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* STACK_FRAME_NON_STANDARD asm macro is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD_ASM */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* statx() is available */ +/* #undef HAVE_STATX */ + +/* STATX_MNT_ID is available */ +/* #undef HAVE_STATX_MNT_ID */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the 'strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the 'strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* have super_block s_shrink */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK */ + +/* have super_block s_shrink pointer */ +/* #undef HAVE_SUPER_BLOCK_S_SHRINK_PTR */ + +/* have super_block s_wb_err */ +/* #undef HAVE_SUPER_BLOCK_S_WB_ERR */ + +/* sync_blockdev() is declared in include/blkdev.h */ +/* #undef HAVE_SYNC_BLOCKDEV */ + +/* struct kobj_type has default_groups */ +/* #undef HAVE_SYSFS_DEFAULT_GROUPS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* timer_delete_sync is available */ +/* #undef HAVE_TIMER_DELETE_SYNC */ + +/* i_op->tmpfile() uses old dentry signature */ +/* #undef HAVE_TMPFILE_DENTRY */ + +/* i_op->tmpfile() has mnt_idmap */ +/* #undef HAVE_TMPFILE_IDMAP */ + +/* i_op->tmpfile() has userns */ +/* #undef HAVE_TMPFILE_USERNS */ + +/* Define if host toolchain supports AES */ +#define HAVE_TOOLCHAIN_AES 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_TOOLCHAIN_AVX 1 + +/* Define if host toolchain supports AVX2 */ +#define HAVE_TOOLCHAIN_AVX2 1 +#endif + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_TOOLCHAIN_AVX512BW 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_TOOLCHAIN_AVX512F 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_TOOLCHAIN_AVX512VL 1 +#endif + +/* Define if host toolchain supports MOVBE */ +#define HAVE_TOOLCHAIN_MOVBE 1 + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_TOOLCHAIN_PCLMULQDQ 1 + +/* Define if host toolchain supports SHA512EXT */ +#define HAVE_TOOLCHAIN_SHA512EXT 1 + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE2 */ +#define HAVE_TOOLCHAIN_SSE2 1 + +/* Define if host toolchain supports SSE4_1 */ +#define HAVE_TOOLCHAIN_SSE4_1 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_TOOLCHAIN_SSSE3 1 +#endif + +#ifdef __amd64__ +/* Define if host toolchain supports VAES */ +#define HAVE_TOOLCHAIN_VAES 1 + +/* Define if host toolchain supports VPCLMULQDQ */ +#define HAVE_TOOLCHAIN_VPCLMULQDQ 1 +#endif + +/* Define if host toolchain supports XSAVE */ +#define HAVE_TOOLCHAIN_XSAVE 1 + +/* Define if host toolchain supports XSAVEOPT */ +#define HAVE_TOOLCHAIN_XSAVEOPT 1 + +/* Define if host toolchain supports XSAVES */ +#define HAVE_TOOLCHAIN_XSAVES 1 + +/* totalhigh_pages() exists */ +/* #undef HAVE_TOTALHIGH_PAGES */ + +/* kernel has totalram_pages() */ +/* #undef HAVE_TOTALRAM_PAGES_FUNC */ + +/* Define to 1 if you have the 'udev_device_get_is_initialized' function. */ +/* #undef HAVE_UDEV_DEVICE_GET_IS_INITIALIZED */ + +/* kernel has __kernel_fpu_* functions */ +/* #undef HAVE_UNDERSCORE_KERNEL_FPU */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* iops->getattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_GETATTR */ + +/* iops->setattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_SETATTR */ + +/* fops->clone_file_range() is available */ +/* #undef HAVE_VFS_CLONE_FILE_RANGE */ + +/* fops->dedupe_file_range() is available */ +/* #undef HAVE_VFS_DEDUPE_FILE_RANGE */ + +/* filemap_dirty_folio exists */ +/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */ + +/* generic_copy_file_range() is available */ +/* #undef HAVE_VFS_GENERIC_COPY_FILE_RANGE */ + +/* migratepage exists */ +/* #undef HAVE_VFS_MIGRATEPAGE */ + +/* migrate_folio exists */ +/* #undef HAVE_VFS_MIGRATE_FOLIO */ + +/* address_space_operations->readpages exists */ +/* #undef HAVE_VFS_READPAGES */ + +/* read_folio exists */ +/* #undef HAVE_VFS_READ_FOLIO */ + +/* fops->remap_file_range() is available */ +/* #undef HAVE_VFS_REMAP_FILE_RANGE */ + +/* __set_page_dirty_nobuffers exists */ +/* #undef HAVE_VFS_SET_PAGE_DIRTY_NOBUFFERS */ + +/* splice_copy_file_range() is available */ +/* #undef HAVE_VFS_SPLICE_COPY_FILE_RANGE */ + +/* address_space_operations->writepage exists */ +/* #undef HAVE_VFS_WRITEPAGE */ + +/* __vmalloc page flags exists */ +/* #undef HAVE_VMALLOC_PAGE_KERNEL */ + +/* int (*writepage_t)() takes struct folio* */ +/* #undef HAVE_WRITEPAGE_T_FOLIO */ + +/* write_cache_pages() is available */ +/* #undef HAVE_WRITE_CACHE_PAGES */ + +/* xattr_handler->get() wants dentry and inode and flags */ +/* #undef HAVE_XATTR_GET_DENTRY_INODE_FLAGS */ + +/* xattr_handler->set() wants both dentry and inode */ +/* #undef HAVE_XATTR_SET_DENTRY_INODE */ + +/* xattr_handler->set() takes mnt_idmap */ +/* #undef HAVE_XATTR_SET_IDMAP */ + +/* xattr_handler->set() takes user_namespace */ +/* #undef HAVE_XATTR_SET_USERNS */ + +/* ZERO_PAGE() is GPL-only */ +/* #undef HAVE_ZERO_PAGE_GPL_ONLY */ + +/* Define if you have [z] */ +#define HAVE_ZLIB 1 + +/* libunwind is llvm libunwind */ +/* #undef IS_LIBUNWIND_LLVM */ + +/* kernel exports FPU functions */ +/* #undef KERNEL_EXPORTS_X86_FPU */ + +/* TBD: fetch(3) support */ +#if 0 +/* whether the chosen libfetch is to be loaded at run-time */ +#define LIBFETCH_DYNAMIC 1 + +/* libfetch is fetch(3) */ +#define LIBFETCH_IS_FETCH 1 + +/* libfetch is libcurl */ +#define LIBFETCH_IS_LIBCURL 0 + +/* soname of chosen libfetch */ +#define LIBFETCH_SONAME "libfetch.so.6" +#endif + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* make_request_fn() return type */ +/* #undef MAKE_REQUEST_FN_RET */ + +/* The size of 'off_t', as computed by sizeof. */ +/* #undef SIZEOF_OFF_T */ + +/* using complete_and_exit() instead */ +/* #undef SPL_KTHREAD_COMPLETE_AND_EXIT */ *** 87 LINES SKIPPED *** From nobody Wed May 6 23:14:10 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9rml6m5mz6d0nY for ; Wed, 06 May 2026 23:14:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9rml6BSVz3JsF for ; Wed, 06 May 2026 23:14:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778109255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p5JhwtjvcRTqR/qvWPZ5qDdblL46q+H+pdwhgODa/8U=; b=IxJRWgj6I4qFpvgSi0ig3OY1R61WBgMbWiMN1My+OUYMmW8nPTj/c2+lwmeBmSNpf+Pqsm VYJHcTDtjjHttelYdUWKZR334Nxfdck8ERL9JvpcPzltdNC2FGyEftNhV3HJMSWO5RwJIe qKufrFch1p0Qnb9N1EZyD2AuEsg1/r7pdH/x3SNbEWDRN4FLXQzABNzETG8jhgGaG3/VM7 D1WciCprCfKNd7QPCrN8oBVpFcmQckmtNqha7DEu3vJ2b5Kq3pZtVNqaewk3HcJZuu9rS9 NMXwt5xVF3a2JRmQyM20vRP40zwhZgBWTemBGO2QWdAmG0YPO2Vgw15d1yxsig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778109255; a=rsa-sha256; cv=none; b=YYEBGdVspNZ9JTCWEb+Rh7iyDUU5rl7ympxNksChQTqJut6XgHEmxeiNnIpHYLGMqSJ4+B j8Jnk4cluKZYv6N1dt3ylS6wU3K48VQgPOucqYlR9vL3VlviwnCLs/Y2tVd70v0a4f7roE Wgq1Gu0zz37lj1BapiF8Vgicky5R9S7376Fy9h1W4VA9BINS+4TlPVLsnVQ6BXgHqghuaK H5sIRqsA+oWAmAblVS6/6QDDf9UVpGn3UlaxTUfxGvT0dt1WfYdwdG43As2e7MlOSDy5Gf 0yk7qneFJNDWiiPj2BUzKnI6Orx/vDvaXPBGE5VCmXxLJ5rmx01IR5pY1TQyHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778109255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p5JhwtjvcRTqR/qvWPZ5qDdblL46q+H+pdwhgODa/8U=; b=W32zhXkaU5YedIS1AZ8P7uJn7DgCPjsu+SQMAZAiuM1LzgGTDC4XFJYT5KKB4e6LtgYScr ZFkH6owe3FigZDSKtIzjG2BH9ByV/4+Dju4da2Qd8MGz1kSUO9NJ/p+EtpJyePXs/Dqnp2 ks1LE8emp4nQ4gZvAm2o8KFwnbSosZjUFbUBdMTjDZE7lJJ7pD27Q/mlcXqw+YukPnsEd3 W8duRvYprwYAMdB3YTihWr5B2cuyauDccxPdzIoBJEJ0yhzYUHWJmosnuYpqLW8qcrnjRt 3xF0G1E8D0Q22kqcoSX7H0ph5yoeAXVFooN/va3Pi0AuX0SoREA6IOsmD2XejA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9rml5Ylfz110c for ; Wed, 06 May 2026 23:14:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39ead by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 23:14:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 3348fa7a45fd - main - Revert "Skip sys.netinet6.frag6.frag6_19.frag6_19 in CI" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3348fa7a45fdf14a7af509e306229bd211444f1e Auto-Submitted: auto-generated Date: Wed, 06 May 2026 23:14:10 +0000 Message-Id: <69fbcb42.39ead.23473c94@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=3348fa7a45fdf14a7af509e306229bd211444f1e commit 3348fa7a45fdf14a7af509e306229bd211444f1e Author: Enji Cooper AuthorDate: 2026-05-06 23:08:26 +0000 Commit: Enji Cooper CommitDate: 2026-05-06 23:08:26 +0000 Revert "Skip sys.netinet6.frag6.frag6_19.frag6_19 in CI" Per [siva@'s comment on the PR][1], this testcase now passes cleanly in CI. PR: 274941 MFC after: 1 week [1]: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=274941#c6 This reverts commit 86e87c3bd1b377242aafe7e2222ae17ca0be96d9. --- tests/sys/netinet6/frag6/frag6_19.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/sys/netinet6/frag6/frag6_19.sh b/tests/sys/netinet6/frag6/frag6_19.sh index 187876c4c2bc..34095ed74f7a 100755 --- a/tests/sys/netinet6/frag6/frag6_19.sh +++ b/tests/sys/netinet6/frag6/frag6_19.sh @@ -207,9 +207,6 @@ frag6_19_head() { } frag6_19_body() { - if [ "$(atf_config_get ci false)" = "true" ]; then - atf_skip "https://bugs.freebsd.org/274941" - fi frag6_body 19 frag6_19_check_stats } From nobody Wed May 6 23:29:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9s655Bpbz6d1qZ for ; Wed, 06 May 2026 23:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9s654RxQz3KvM for ; Wed, 06 May 2026 23:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778110157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ykTCWnnvC1cQS0WCSLVWqey3lN4C4/BgJyF4JSfvUM=; b=HT+bK8CqxAEh+F6QwBwTfq089+jAUYrqwHLF1ZrSHFo0RydOz3ifP2relXIZsX9wksvgTM fucX+O9NRKzbo12CsWptmxdo8rYRZHIudNNmRELzuNscc+4ot0r054RjRWFsFmjzQWb7rc U0GLVsLTa8heuvkGpSnqDT7hhRWiR11ZHBXYFGAUSZbpaeSHgwzVq5rQyouHNchV3qlBMu jE6ECcsMi2iV/1MW4znSJWEpsMkGhGfs6PgBRSFGsAqhTO445P88zrn8XT1yvwrLK3Qixo 7aAvu2w4dvt/QP52JK47i38xTdI/S7vDbqaHC6u78+b49QjRMIJFIxfLHB/5iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778110157; a=rsa-sha256; cv=none; b=H8VnTLsyUcaxwKXsA00l2cX32dXCEkJsSAGF+w071A4oviE2b+0jOch5lkaMXXSjZ98Ura uZ3e+qbmxLzIE9n3sJkWn0J/umZ5xOwFM5hsxmC8qLUr0U4syeBMF+4G8VmcAb/PLREsfM /uxzHvsnC88t2ycszwLO+zkJSYCvtcTnUVIC/lZMnIMJlP5DkPLLOc61CJC80MM7LS50bP HAzhSu2Axe9T4dcFjXy0YswVneiBWuKniBN1plxaD9S6VVOV17vAlV5utENKEX32/0eYbn 1la4hLWa+vAlFplSV7Uu72GJasQVjTlTOmhm382wI72Gtw13rjOj9zy1OqECRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778110157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ykTCWnnvC1cQS0WCSLVWqey3lN4C4/BgJyF4JSfvUM=; b=knUfFbOp39eaH+jJyrsij68OXwOZSdBEDmUftu0hIP7DqET1Oqcs77lraFuUrwalpgifba TKoRE1MmUF6CcOOVN99NQL0Yd/0ItyWojuZmGOhB8OAU5JOt8FUcHBtTxKtaZeXXHwkN6M mJCXbYJIRYDVurLVggpw/M5Kh3TU5ORVZMB3iepqSbQgfExzxsw/OAtsV2AVqLlyBUYjOp tR/imFVQu60G9cYWiNiO353smUQYT180ECQnxemI2aPqP7T5P+Sw+2BrhuqD3UzNWJE8YX Fxef1YRgItR8gluEV6TViXca3+x3Cntpz3hHDJ1oqpA0o0JYxgdCW9cpW+FBsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9s653jcMz114M for ; Wed, 06 May 2026 23:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3acf5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 23:29:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Jan Bramkamp From: Kyle Evans Subject: git: 58811b0ae096 - main - jail: open the fstab files with fopen("re") List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58811b0ae096c134af372bcf475aea1d8d0e3c08 Auto-Submitted: auto-generated Date: Wed, 06 May 2026 23:29:17 +0000 Message-Id: <69fbcecd.3acf5.85ed4df@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=58811b0ae096c134af372bcf475aea1d8d0e3c08 commit 58811b0ae096c134af372bcf475aea1d8d0e3c08 Author: Jan Bramkamp AuthorDate: 2026-05-06 23:28:53 +0000 Commit: Kyle Evans CommitDate: 2026-05-06 23:28:53 +0000 jail: open the fstab files with fopen("re") This protects against accidentally leaking them past fork()+exec() in future refactorings. PR: 295052 Reviewed by: kevans --- usr.sbin/jail/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c index f1e2da215790..188f48732561 100644 --- a/usr.sbin/jail/config.c +++ b/usr.sbin/jail/config.c @@ -726,7 +726,7 @@ check_intparams(struct cfjail *j) TAILQ_FOREACH(s, &j->intparams[IP_MOUNT_FSTAB]->val, tq) { if (s->len == 0) continue; - f = fopen(s->s, "r"); + f = fopen(s->s, "re"); if (f == NULL) { jail_warnx(j, "mount.fstab: %s: %s", s->s, strerror(errno)); From nobody Wed May 6 23:29:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9s694TlCz6d23r for ; Wed, 06 May 2026 23:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9s693TzYz3Kyr for ; Wed, 06 May 2026 23:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778110161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5GnVnTd6CkL798zv+7s78DaDXKHml3qOnoxivu9Y7zg=; b=EYBd1fgvXhn71d9lWCc2BEvgjiDh413aOxehdKSwco2zHE7Z2Ps+15cuil7AFq36dsFCBq sxZjc8sZAo9RUNfd3ZxNUdq9J+L4yQ003hk01j++wibtntAdl1DmCq8e1IY2Y9gLyMPmwB ZITOFfK8pj3KKe6v7ViDoqFysw4Iuni6rgpS8jrWt0ppqgHTTlzG5oStYWy6eszX9VreDA mk4/hgC2dY+tbRTrolGvNE2BUgAfDlHC1jL3BsHgblIXEc3iMcDkq019f8daliIsckgjrr ENEXTw4ufC0HgUZ0JeOth+wUMoWvqeMtq1GEXxcAPnE/vzDF5HCiyohZ7H8LMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778110161; a=rsa-sha256; cv=none; b=IqNSLiWU5MANEmeSVQTvigOxwnhDGuW6GOle0ZytMYyLQ9Q3/oZUf90ZMwK9mLL2lYYdeZ Si+/W0qMYHG1olpiG+/JDjg9PHEV2P5xr0S3w93OZurSIq7aFkrgE/oQceA1I0GGHo1LLw 7WoE3B19dgPfjdTQNV2M/fyYQs3hr38/9Y+yMQBz200CQfol2653iXtIc6sXzSaFLcw/AK d5ndK9xq3zCtZmQk8sVbyQTWCiRxeJrgaGMmd/jLMoKjeH2NXVVjAYcunvsQYlxik9nEka DxqQFC8t7F3HwJN6hs0SArTnAMY9haUeW13h2D7QiZx+R721JPHiHEiJ8k/5JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778110161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5GnVnTd6CkL798zv+7s78DaDXKHml3qOnoxivu9Y7zg=; b=kXu/YcwHxarj9kn57ofElLdhKQWYYSlQmv8jmdoLXusaDiiW7qZRsrZqYGbjy77WVV0hL+ EFr5nC8KHOUE/sa4VutBYh7A3ZNJjAifzXz4F3tNixetwc7H98W8Y+mqE4duCvJwxKfugM 7APvI/u4VtIoUn9e+ZmhpsWCBgfZgFcinaUVq3DGcZ6Rz2P8DhwZxuYuR8q3QKI6CiyX0I YHG9VdnmeRVn6NuGpTP4B5gQccLlO3CBpE2OLGDO8UFjXbA/vVQoPvNpxBCu/DfUaL2Jli +JoGVFxoXAp9iMwxRtlZeq3Mi/26eQ2ETfy2dHE5idem5NeiBE5/x2GnlhbBkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9s6931sFz10gb for ; Wed, 06 May 2026 23:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38660 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 23:29:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Jan Bramkamp From: Kyle Evans Subject: git: 276d9b88a9e6 - main - jail: avoid leaking jail config fds to exec.* hooks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 276d9b88a9e6fd6fd90e57c36444756ad297d2ab Auto-Submitted: auto-generated Date: Wed, 06 May 2026 23:29:16 +0000 Message-Id: <69fbcecc.38660.478a2629@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=276d9b88a9e6fd6fd90e57c36444756ad297d2ab commit 276d9b88a9e6fd6fd90e57c36444756ad297d2ab Author: Jan Bramkamp AuthorDate: 2026-05-06 23:28:53 +0000 Commit: Kyle Evans CommitDate: 2026-05-06 23:28:53 +0000 jail: avoid leaking jail config fds to exec.* hooks The jail(8) command must not leave parsed configuration files open since the file descriptors will be leaked to child processes including the untrusted exec.start or exec.stop hooks. While fopen() doesn't provide direct access to O_CLOEXEC, it does provide access to FD_CLOEXEC via "e" in the mode string which provides the desired defense in depth against leaking file descriptors into exec.* hooks since those always execve() into a shell. Jail configuration is potentially sensitive and some hooks execute from within the jail context, leaving some opening for the jail to exfiltrate information about the host environment. (Commit message wordsmithed by kevans) PR: 295052 Reviewed by: kevans MFC after: 3 days --- usr.sbin/jail/config.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c index 1bad04ccde68..f1e2da215790 100644 --- a/usr.sbin/jail/config.c +++ b/usr.sbin/jail/config.c @@ -321,6 +321,7 @@ static void parse_config(const char *cfname, int is_stdin) { struct cflex cflex = {.cfname = cfname, .error = 0}; + FILE *yfp = NULL; void *scanner; yylex_init_extra(&cflex, &scanner); @@ -328,7 +329,7 @@ parse_config(const char *cfname, int is_stdin) cflex.cfname = "STDIN"; yyset_in(stdin, scanner); } else { - FILE *yfp = fopen(cfname, "r"); + yfp = fopen(cfname, "re"); if (!yfp) err(1, "%s", cfname); yyset_in(yfp, scanner); @@ -336,6 +337,8 @@ parse_config(const char *cfname, int is_stdin) if (yyparse(scanner) || cflex.error) exit(1); yylex_destroy(scanner); + if (yfp != NULL) + fclose(yfp); } /* From nobody Thu May 7 01:29:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9vn74n9Yz6dBNk for ; Thu, 07 May 2026 01:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9vn711b4z3WSC for ; Thu, 07 May 2026 01:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778117387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R+8DS4cEzSxNgOalqJguI3OuRFSjKYmwCKWFUClacRc=; b=CB6St/VzBdnCLXSuX0J+9Wgo96vf9PQVZad7WTXxkRhO7PapTKJjO4QjfAiSyB62G3VO7/ SmBkn2vDelgvoAq7SQ8/66iJQV5Xfqfyfocow2A5Z/Cav4ShMAKiVxRF4DqVbi/i5V/VQH UxIRJt62JFA1meee607EDhxd75Am3B9z8FNbd3ImqESLuCQt6ZuSyjyk3D0RYDAxe7/OGJ pNhqb1v7DHEOLPTw3LAI2pEBllTezsWAxj8d+4h3ur5MmfzPTkYo6MRPX0evbzzoiX/URR Rd8/67RmjVCiwD9CpJfvgHeLPQjXPyIhEiuNr4HIsgrGUrOqU/9ybfXr0rR7Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778117387; a=rsa-sha256; cv=none; b=Je1kOXlfYxNzRfuIpi9tEWVR6jJ91GpgPvFusTA/2WpRgco5BhtnVIDiDCRTx0o8Slcj1F oJxZdAUSZ4lQMS+anG2O9LtcD8kKZlYlQRkGVFvSTDPXQis0PZDV4nNL/bR7vB3b5pSQK/ Pyl5+PFgHvoupHYQWEUnbHoMbgZIq4boryMtcht2ZeQQXGtf1QvX1waBI2+ZaIO0cRvTVL /yiZZInG8oIQb0256Th0OcclgHjqt5cGrM5VymD5HbxVSP6sGOHK/czmgHTXCevIhT9zxl qUtmpFyhTnwefZ76k92QeTaIbLKEM0l8nDdSDJoeZgruMFwVgwRNfL/w8VgVzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778117387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R+8DS4cEzSxNgOalqJguI3OuRFSjKYmwCKWFUClacRc=; b=dbOs17WKpCabmVEQqhXHNdE96BLBSA8ve0oE9A95I7NM2jm9E0U4/aJ62FW/njztAFNSG5 pv5Jpg+SXdg9YQsZ4MquLgfi6RwWGPYXbIu19nXzgRA/oSSNJzYKa0t7esPNayDEhbfsz0 n+eAA29H2dTImyrNlz77OB+ZIkA+PO+tiMTypsm0mJwDY/nCS6z8K96AmGkpNUy3GfhC5W FmizeC1TIvPDf6T345AiVNvejlwoS4dy2XcOD+m6bpSchAiGvhgZYVUMrieWaoeqOdBA+f ycoWeYmaKOJg0omy7KzFVOyLRIfbj5IpoLmeL30YYj4TGbqEMwiT1Fproz3rbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9vn70CYLz13bf for ; Thu, 07 May 2026 01:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46e3b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 01:29:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Marek Zarychta From: Kyle Evans Subject: git: b2e4da0b53ad - main - devd: Use PF_LOCAL instead of PF_INET List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2e4da0b53ad082768b8f6f83766e030fd00d02a Auto-Submitted: auto-generated Date: Thu, 07 May 2026 01:29:41 +0000 Message-Id: <69fbeb05.46e3b.1a7a83f@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b2e4da0b53ad082768b8f6f83766e030fd00d02a commit b2e4da0b53ad082768b8f6f83766e030fd00d02a Author: Marek Zarychta AuthorDate: 2026-05-07 01:28:08 +0000 Commit: Kyle Evans CommitDate: 2026-05-07 01:28:08 +0000 devd: Use PF_LOCAL instead of PF_INET Avoid dependency on INET (IPv4) by using PF_LOCAL, allowing media check to work on systems without INET support. PR: 295045 Reviewed by: kevans MFC after: 1 week --- sbin/devd/devd.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc index ee38fbb2ccee..cff50d2f8d80 100644 --- a/sbin/devd/devd.cc +++ b/sbin/devd/devd.cc @@ -369,7 +369,7 @@ media::do_match(config &c) retval = false; - s = socket(PF_INET, SOCK_DGRAM, 0); + s = socket(PF_LOCAL, SOCK_DGRAM, 0); if (s >= 0) { memset(&ifmr, 0, sizeof(ifmr)); strlcpy(ifmr.ifm_name, value.c_str(), sizeof(ifmr.ifm_name)); From nobody Thu May 7 01:51:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9wGT2lL8z6dCv1 for ; Thu, 07 May 2026 01:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9wGS72TSz3YSJ for ; Thu, 07 May 2026 01:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778118705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kos/oe5PIjhrDMwIFpueBetXcH4EguOgav1C4poc9Dw=; b=YevGsqG2nHWATGwS8P+S8H8CeBkod3Gvb85PY7R15GTAB69O2TB/VE7S+xMvl5TwJKiRxB O/+KagGTIhCUrnDzSg5OuBMP3Pw6oyLE/VA+xngDYz15Zfdu1DQWE7foPKFT7yL/OSW1Ja +WEhfibjLAXsWe4+8yzMAqmYgFUELQii8u7FTkIqVekX5t9WRoHGAgL6X8RYFkJd8QF63W sGjdJz+oNjs+FmBSwPKHSu57zxKXBI4dq9YAwX5FKIM8JHU5Th5ww6haUvTweYEI6A4ipB VAyDGcEl16jQGTav9oQ8HLfVyqx9iHWgq+RpCqfukfLRaGFCdrjJLssQ518vNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778118705; a=rsa-sha256; cv=none; b=AzY2XSQ/t+3T1Pv6TO366TwhZ5G9hZnypW6Fke59RlOpjdj3bBO6grd2Y7cgk1RT9y4HLp Y0VBoZZDNbpW6+CE5aAH/beDJPYG9UfFf/zZ5/gwGl0gpSbVQmUi0sQtgWv9Irlv7kMVjW mTWE8OimJWCzYQcbxTDAfOEnvWsQ8nPCM/obK/GBSCyREntkWlKIi7LOW2m+pnYPWRXnC5 +YLnKQXBE1BT9HKUqSgqhtkqkdXnAe5e+z3LAiYuXahjTpHZK7RrMCBH9AaMEzfg63L7pK yQ5obQfcYeyvgkNr/69ERsft8xBZPPjdP9PnSTDng5VGLRYSDnpZ7h4DrJcCdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778118705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kos/oe5PIjhrDMwIFpueBetXcH4EguOgav1C4poc9Dw=; b=mDUaL/kr1j7+UTsJRDPdHqU8FUAHYkrCZahg4osuduHEiq83re/22MjqOVwm3sWlOpJ0Dk gdXkihwBKjbbml1y9/CsOw/FrN+32dBlR2Zs4n6MPo5oklkYN3sy6x746Kv1qHhwZ5yHoD l483l5y78G3UydkJhilkp4pZE3RDtrg8W8mWGMwSGkqV7pg79YRBfPEifSpippke12rfia deg/6RQA/py2E2HVYxChV+8qsM8rnjnAaP2soR7NTc8G3QJ2xNoco9EmlO0UgUcQFt/D5d 17VQyjMhOYhfAVJFGExEen+ogsbMxJtTt2zajT16zHFxNXRFgaatIFrafu0aKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9wGS6bh8z14WK for ; Thu, 07 May 2026 01:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18f9d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 01:51:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 09d81767e32c - main - freebsd-base.7: style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09d81767e32cb437da0ac7d1c3b51eed01591b82 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 01:51:39 +0000 Message-Id: <69fbf02b.18f9d.4fb1d607@gitrepo.freebsd.org> The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=09d81767e32cb437da0ac7d1c3b51eed01591b82 commit 09d81767e32cb437da0ac7d1c3b51eed01591b82 Author: Maxim Konovalov AuthorDate: 2026-05-07 01:50:45 +0000 Commit: Maxim Konovalov CommitDate: 2026-05-07 01:50:45 +0000 freebsd-base.7: style --- share/man/man7/freebsd-base.7 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/man/man7/freebsd-base.7 b/share/man/man7/freebsd-base.7 index d1857b2dbbec..b23d1ae44d34 100644 --- a/share/man/man7/freebsd-base.7 +++ b/share/man/man7/freebsd-base.7 @@ -50,7 +50,7 @@ and .Dq CURRENT .\" re@ will provide their own repository before release, at which .\" point this text will need updating. -branches are hosted on the Internet at +branches are hosted on the Internet at .Lk https://pkg.freebsd.org . These packages are updated when new errata or security updates are released (for supported release versions), or twice daily for @@ -92,7 +92,8 @@ option was enabled when building the system, which is not the default. .El .Pp The exact set of available subpackages differs for each individual -package. For example, some packages may not provide any development +package. +For example, some packages may not provide any development files, in which case the .Sy -dev subpackage is not present. From nobody Thu May 7 03:49:25 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9ytF50Qqz6dN4j for ; Thu, 07 May 2026 03:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9ytF2YjBz3m9L for ; Thu, 07 May 2026 03:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778125765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6juM/HYZgK9+5ROShR0VfGcJaMc769jlzqS+CnKABOE=; b=qAexpquYJiJt4w7uJ+SiTsF3kz4SQW/JNdQ4NFyHyzRxJPBBuK0xlsG2lNcRohD5P5KNO3 Ihno4XQHdsUKBWuE/mAIqXWaLKepKxl73iH8BAF6wVeRE0UjLuOUOgedYJ/KfJWNeSs4et E2uPcs8GYlZqxPMxyVo8dNRy7qawwi8VijR0n1b0dTLtkFk/6v7ZZjWluwP5kld9BO2roH CsSSEOCAD+ZjFVhMuQGC+CJz8PJbNEkoTxhiyHQzAykOdqbuYbV+JBTdXXfO3Shv9C5YG3 JPGcNCO7Ws0rdxpi9hWE17/NYhUPnSDLZKPCCPG0GRAIDOTBVnqeySrpFfuRPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778125765; a=rsa-sha256; cv=none; b=HTL3E+O5p5G2ATGYUpEXCG5QY73gcuUGyJm/KXoYb60YLMGt8GTDQzjXEUJ0k3Uq5s+Fym hXCg5f8bWWNZJhGPfrF4OQKSEISdOkK8rhliFFiwQn05EjjR/JfSy9AR6UMnpcqBLQIQH7 XNViQdt/zUjJXkg9RpkZQt5/zzm7aX0i/SZOQSs94OIC/jkzWYZbbu3qsz4mphe+6Xx43B sLQZ33pZPsXzAXgdjRR41RL7leI/RVUdceZzmzAZkD02wv+i09BTaHW4eYP3h8r/9Zt70b Ko1CSLKqItY49adCGPImbSOETJK1Bjtptk2KT6JClSaY0IIlQX6fYA1MARqlxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778125765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6juM/HYZgK9+5ROShR0VfGcJaMc769jlzqS+CnKABOE=; b=nmosQ94fUItLaLxESdxIlkAZaP7jouO7HtqWj4qzA9H5ElbTMqL82N7Ybllr+4CvRlWVwW IbifK7daiJrwcQfFk9PFdLTma3CvSg0j9MDCe5kx4kB9BHnSeW6E3FskyK0QA28x+l9hHV lM9eEW2ByZIRErmVJhTbDdJwwDF7KruArgEWoP8GfkC8y7vK5bmP4XjIYUXn92FqgoeNEv a4biCJU+HyxHMPwpzY17VK41lHXtUUnD7NXS01N0XF6I5cKfd+N4tIEOkRWKq5XW1IgvV2 uQBMlDhsakNKFsHillIg1zAACbCHdjM8WbgR04sTHQCzBURUhsQ3rRMl4oBb0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9ytF1tfTz173C for ; Thu, 07 May 2026 03:49:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25fab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 03:49:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Simon J. Gerraty Subject: git: 586838724e40 - main - Remove PROC_CHECK_PRIV macro from sys_process.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 586838724e4086016ad62f0914248fc58ce26e35 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 03:49:25 +0000 Message-Id: <69fc0bc5.25fab.7a87e5e5@gitrepo.freebsd.org> The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=586838724e4086016ad62f0914248fc58ce26e35 commit 586838724e4086016ad62f0914248fc58ce26e35 Author: Simon J. Gerraty AuthorDate: 2026-05-07 03:49:06 +0000 Commit: Simon J. Gerraty CommitDate: 2026-05-07 03:49:06 +0000 Remove PROC_CHECK_PRIV macro from sys_process.c Just put the priv_check calls in the code. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56864 --- sys/kern/sys_process.c | 59 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 487dc5d06614..dece6457a4bf 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -72,13 +72,6 @@ /* Assert it's safe to unlock a process, e.g. to allocate working memory */ #define PROC_ASSERT_TRACEREQ(p) MPASS(((p)->p_flag2 & P2_PTRACEREQ) != 0) -#define PROC_PRIV_CHECK(priv) do { \ - int _error; \ - _error = priv_check(curthread, priv); \ - if (_error) \ - return (_error); \ - } while (0) - /* * Functions implemented below: * @@ -115,8 +108,12 @@ proc_read_regs(struct thread *td, struct reg *regs) int proc_write_regs(struct thread *td, struct reg *regs) { + int error; + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); return (set_regs(td, regs)); } @@ -130,8 +127,12 @@ proc_read_dbregs(struct thread *td, struct dbreg *dbregs) int proc_write_dbregs(struct thread *td, struct dbreg *dbregs) { + int error; + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); return (set_dbregs(td, dbregs)); } @@ -149,8 +150,12 @@ proc_read_fpregs(struct thread *td, struct fpreg *fpregs) int proc_write_fpregs(struct thread *td, struct fpreg *fpregs) { + int error; + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); return (set_fpregs(td, fpregs)); } @@ -271,7 +276,9 @@ proc_write_regset(struct thread *td, int note, struct iovec *iov) if (regset->set == NULL) return (EINVAL); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); p = td->td_proc; @@ -305,8 +312,12 @@ proc_read_regs32(struct thread *td, struct reg32 *regs32) int proc_write_regs32(struct thread *td, struct reg32 *regs32) { + int error; + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); return (set_regs32(td, regs32)); } @@ -320,8 +331,12 @@ proc_read_dbregs32(struct thread *td, struct dbreg32 *dbregs32) int proc_write_dbregs32(struct thread *td, struct dbreg32 *dbregs32) { + int error; + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); return (set_dbregs32(td, dbregs32)); } @@ -335,8 +350,12 @@ proc_read_fpregs32(struct thread *td, struct fpreg32 *fpregs32) int proc_write_fpregs32(struct thread *td, struct fpreg32 *fpregs32) { + int error; + PROC_LOCK_ASSERT(td->td_proc, MA_OWNED); - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); return (set_fpregs32(td, fpregs32)); } #endif @@ -378,7 +397,9 @@ proc_rwmem(struct proc *p, struct uio *uio) fault_flags = writing ? VM_FAULT_DIRTY : VM_FAULT_NORMAL; if (writing) { - PROC_PRIV_CHECK(PRIV_PROC_MEM_WRITE); + error = priv_check(curthread, PRIV_PROC_MEM_WRITE); + if (error != 0) + return (error); } /* @@ -710,11 +731,11 @@ sys_ptrace(struct thread *td, struct ptrace_args *uap) addr = uap->addr; break; } - if (error) + if (error != 0) return (error); error = kern_ptrace(td, uap->req, uap->pid, addr, uap->data); - if (error) + if (error != 0) return (error); switch (uap->req) { @@ -1250,7 +1271,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) CTR3(KTR_PTRACE, "PT_STEP: tid %d (pid %d), sig = %d", td2->td_tid, p->p_pid, data); error = ptrace_single_step(td2); - if (error) + if (error != 0) goto out; break; case PT_CONTINUE: @@ -1260,7 +1281,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) if (addr != (void *)1) { error = ptrace_set_pc(td2, (u_long)(uintfptr_t)addr); - if (error) + if (error != 0) goto out; td2->td_dbgflags |= TDB_USERWR; } From nobody Thu May 7 03:52:12 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9yxY2FnNz6dN3R for ; Thu, 07 May 2026 03:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g9yxY1zV3z3mYw for ; Thu, 07 May 2026 03:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778125937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5CwLy6U6uxWcXJEPtiTxlxbI3N68dcqhE+Ip5N46u90=; b=XTiop9WfCweWB4NYM/+pOVFArwClOjndkAED20tde/xciTnsgyYrpyuNPPkwc3xGWAkRGY RkYXhN+5wnLAbMipXfv3A/tBW+n3LwJJlJpc7lizcfSiVvRQmiinN2Z3ZPZTJKqTkuR1d1 NkTNv0CXwHORccCK/uoK9F0GygkkBcj22fj8bXc2Y4HPGaK2YjGbE8agyFtNSESiST/LWa J8K11SO557NM6Ra4z1tvB5trnZc8CA9li8U/pfcXem6S07IqIRWXa7Oi9NtGk8pi7Ua8DA rL8wcZD4of75saO4M/YUx2Z76/Vr4+KvXvbZf0HlTWydCUeoNZWs7nUIPUekvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778125937; a=rsa-sha256; cv=none; b=wj6Gc4cBJH5b4UOau1sXL4vmkb8+QdsL7IjuF23IOaCHA9YYwMT8gZNht3xFU2qiwtyykR 7mTVgiYpDE48Mz8iHZ/kPRepUtYdb2x01GrTXr968P4TgV7aAvFoCpKC5CLFS15WnQ8qma bLDJ3uxs04Q0htsHsPmUoD87L2KxNDgRb21GII0mpPEtTxTCvLwzv2r/Bs6NuLWQMOcgqD TW8TAn/YPivTNtvz4riFZs3Jgo6V/5w5e+2IT3/IzTIZ45AWFMPLo9HFC7fD5Vyz628qAb QbmovytJ8eirj5azjSHsasbZF0LcSDv6tpAHRlvYcYNVbCXsGjbm7zZawoW/0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778125937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5CwLy6U6uxWcXJEPtiTxlxbI3N68dcqhE+Ip5N46u90=; b=buNnNwmKK+wsnP94EEyyJZZ5MVyy7UA3ThhvLqt882blUf4P68GJU3soydL7gNm2ogPA39 aYYqMKZWfH2lJUGoooAO1+GzRH4OOyaoMTUgtehtN9TqCPplOy5UdWwag9FbnBg533zbtJ hRDaDAx3Ll+/KOzvQZZyA8BDHc+hxDuBOYujl5QF57iHMYzidGvo+5wsfmY9f1YnTdvoJt gPkyzanwiugQgAoRuYL8K9yDLqPGfrKHMWsjiT/RT5u79TsDm5vaoVmhwcYXEkoRgilJBe /m1IY7WBwTYhzwg67GXMFhesFmvXvA0OMwF1ebAtTyFY4ujbIoHXJ41yP68trw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9yxY1RCmz17rv for ; Thu, 07 May 2026 03:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27362 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 03:52:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 423b0bc492d5 - stable/15 - MFV less v691 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 423b0bc492d5264ee518c6569d3c90ee0efb338c Auto-Submitted: auto-generated Date: Thu, 07 May 2026 03:52:12 +0000 Message-Id: <69fc0c6c.27362.38b8a96b@gitrepo.freebsd.org> The branch stable/15 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=423b0bc492d5264ee518c6569d3c90ee0efb338c commit 423b0bc492d5264ee518c6569d3c90ee0efb338c Author: Xin LI AuthorDate: 2026-05-07 03:51:51 +0000 Commit: Xin LI CommitDate: 2026-05-07 03:51:51 +0000 MFV less v691 Relnotes: yes (cherry picked from commit dafba19e42e78cd3d7c9264ece49ddd3d7d70da5) MFV: less v692. (cherry picked from commit e2abec625bf07c054f7ac2df2402d6c454113df8) --- contrib/less/LICENSE | 2 +- contrib/less/NEWS | 83 +++ contrib/less/README | 60 +- contrib/less/brac.c | 2 +- contrib/less/ch.c | 14 +- contrib/less/charset.c | 31 +- contrib/less/charset.h | 2 +- contrib/less/cmd.h | 26 +- contrib/less/cmdbuf.c | 138 ++-- contrib/less/command.c | 87 +-- contrib/less/compose.uni | 14 +- contrib/less/cvt.c | 2 +- contrib/less/decode.c | 107 ++- contrib/less/edit.c | 16 +- contrib/less/evar.c | 2 +- contrib/less/filename.c | 20 +- contrib/less/fmt.uni | 2 +- contrib/less/forwback.c | 37 +- contrib/less/funcs.h | 75 ++- contrib/less/help.c | 9 +- contrib/less/ifile.c | 12 +- contrib/less/input.c | 3 +- contrib/less/jump.c | 18 +- contrib/less/lang.h | 5 +- contrib/less/less.h | 19 +- contrib/less/less.hlp | 7 +- contrib/less/less.nro | 1495 ++++++++++++++++++++++++++++-------------- contrib/less/lessecho.c | 2 +- contrib/less/lessecho.nro | 37 +- contrib/less/lesskey.c | 2 +- contrib/less/lesskey.h | 2 +- contrib/less/lesskey.nro | 389 +++++++---- contrib/less/lesskey_parse.c | 37 +- contrib/less/lglob.h | 2 +- contrib/less/line.c | 39 +- contrib/less/linenum.c | 2 +- contrib/less/lsystem.c | 22 +- contrib/less/main.c | 55 +- contrib/less/mark.c | 154 +++-- contrib/less/omit.uni | 2 +- contrib/less/optfunc.c | 132 ++-- contrib/less/option.c | 134 ++-- contrib/less/option.h | 3 +- contrib/less/opttbl.c | 11 +- contrib/less/os.c | 65 +- contrib/less/output.c | 38 +- contrib/less/pattern.c | 2 +- contrib/less/pattern.h | 2 +- contrib/less/pckeys.h | 45 +- contrib/less/position.c | 16 +- contrib/less/position.h | 2 +- contrib/less/prompt.c | 38 +- contrib/less/screen.c | 527 ++++++++++----- contrib/less/scrsize.c | 2 +- contrib/less/search.c | 23 +- contrib/less/signal.c | 30 +- contrib/less/tags.c | 9 +- contrib/less/ttyin.c | 6 +- contrib/less/ubin.uni | 2 +- contrib/less/version.c | 21 +- contrib/less/wide.uni | 23 +- contrib/less/xbuf.c | 12 +- contrib/less/xbuf.h | 11 +- usr.bin/less/defines.h | 116 ++-- 64 files changed, 2852 insertions(+), 1451 deletions(-) diff --git a/contrib/less/LICENSE b/contrib/less/LICENSE index b9b72a3d088b..313cebd4f66f 100644 --- a/contrib/less/LICENSE +++ b/contrib/less/LICENSE @@ -2,7 +2,7 @@ ------------ Less -Copyright (C) 1984-2025 Mark Nudelman +Copyright (C) 1984-2026 Mark Nudelman Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/contrib/less/NEWS b/contrib/less/NEWS index 442fe21e406a..0f767aaeb059 100644 --- a/contrib/less/NEWS +++ b/contrib/less/NEWS @@ -9,6 +9,89 @@ Report bugs, suggestions or comments at https://github.com/gwsw/less/issues. +====================================================================== + + Major changes between "less" versions 691 and 692 + +* Revert HOME key to scroll to beginning of file and END key + to scroll to end of file (github #658). + +* Configure tty to leave CR and NL unmodified (github #703). + +* Add commands to lesskey parser (forw-bell-hilite, goto-pos and osc8-jump). + +* Add key sequences to lesskey parser (\kE, \kF, \kH, \kI, \kM, and \kS). + +* Fix bug using negative value with -z option (github #709). + +* Fix bug handling empty terminfo capabilties (github #710). + +* Fix memory leak in setupterm (github #707). + +* Make lesstest ignore system locale (nl_langinfo) (github #708). + +====================================================================== + + Major changes between "less" versions 685 and 691 + +* Add --autosave option (github #678). + +* Add ESC-f command (github #680). + +* Add column number to long prompt and = message. + +* Add prompt prototype sequences %C, %W, %Q and ?Q (github #685). + +* Map keypad keys, and use terminfo rather than termcap since keypad + definitions don't exist in termcap (github #650). + +* Change HOME key to scroll fully left and END key to scroll fully right. + Add shift-HOME and ctrl-HOME to scroll left and jump to top, and + add shift-END and ctrl-END to scroll right and jump to end (github #658). + +* Add LESSNOCONFIG environment variable. + +* Add --without-termlib to configure (github #701). + +* When setting line number colors (-DN), don't force bold attribute. + To set bold, you must append "d" or "*" to the color string (github #684). + +* While waiting for file data, only ^C or ^X will interrupt, not any command. + This reverts to behavior that existed before less-670 (github #700). + +* When --save-marks is not used, retain any marks saved in the history file + (github #662). + +* Defer sending the terminal init string until the first char is read + from the input file (github #682). + +* Make SIGHUP do an orderly exit like SIGTERM. + +* Implement modeline handling in Windows build. + +* Fix bugs and improve behavior of screen resize on Windows. + +* Fix bug when entering search modifier key at start of non-empty + search string (github #668). + +* Fix bug repainting screen with --form-feed (github #672). + +* Fix bugs passing invalid negative values to some command line + options (github #675). + +* Fix incorrect display of Lit indicator (github #670). + +* Fix incorrect display when returning to a mark after resizeing window + (github #681). + +* Fix bug using --pattern with --incsearch (github #696). + +* Disallow mouse click to open OSC8 link in SECURE mode (github #676). + +* Add SECURE_COMPILE environment variable for Windows builds. + +* Update Unicode tables. + ====================================================================== Major changes between "less" versions 679 and 685 diff --git a/contrib/less/README b/contrib/less/README index 4bfdc5e5a67f..a6954eb67c1e 100644 --- a/contrib/less/README +++ b/contrib/less/README @@ -84,7 +84,7 @@ INSTALLATION (Unix & Linux systems only): Makefile now. Take particular notice of the list of "terminal" libraries in the LIBS definition in the Makefile; these may need to be edited. The terminal libraries will be some subset of - -lncurses -lcurses -ltermcap -ltermlib + -ltinfo -ltinfow -lxcurses -lncursesw -lncurses -lcurses -ltermcap -ltermlib If you wish, you may edit defines.h to remove some optional features. If you choose not to include some features in your version, you may @@ -117,6 +117,29 @@ programmers", not "persons who attempt to circumvent computer security".) +======================================================================= +INSTALLATION (Windows-95, Windows-98 and Windows-NT systems only, + with Microsoft Visual C++, mingw, or Borland C) + +1. Move the distributed source to its own directory. + +2. If you wish, you may edit defines.wn to remove some optional features. + If you choose not to include some features in your version, you may + wish to edit the manual page less.man and the help page help.c + to remove the descriptions of the features which you are removing. + +3. If you are using Microsoft Visual C++, run "nmake -f Makefile.wnm". + If you are using mingw, run "make -f Makefile.wng". + If you are using Borland C, run "make -f Makefile.wnb". + + If the environment variable SECURE_COMPILE is to 1 during the make, + a "secure" version of less is built, with some features disabled. + +4. If the make succeeds, it will generate the programs "less.exe" and + "lesskey.exe" in your current directory. Test the generated programs. + + + ======================================================================= INSTALLATION (MS-DOS systems only, with Microsoft C, Borland C, or DJGPP) @@ -156,34 +179,6 @@ INSTALLATION (MS-DOS systems only, -======================================================================= -INSTALLATION (Windows-95, Windows-98 and Windows-NT systems only, - with Borland C or Microsoft Visual C++) - -1. Move the distributed source to its own directory. - -2. If you are using Borland C, rename Makefile.wnb to Makefile. - If you are using Microsoft Visual C++, rename Makefile.wnm to Makefile. - -3. Check the Makefile to make sure the definitions look ok. - -4. If you wish, you may edit defines.wn to remove some optional features. - If you choose not to include some features in your version, you may - wish to edit the manual page less.man and the help page help.c - to remove the descriptions of the features which you are removing. - -5. Type "make" and watch the fun. - -6. If the make succeeds, it will generate the programs "less.exe" and - "lesskey.exe" in your current directory. Test the generated programs. - -7. When satisfied that it works, if you wish to install it - in a public place, type "make install". - See step 6 of the Unix installation instructions for details - on how to change the default installation directories. - - - ======================================================================= INSTALLATION (OS/2 systems only, with EMX C) @@ -245,10 +240,3 @@ INSTALLATION (OS-9 systems only, See step 6 of the Unix installation instructions for details on how to change the default installation directories. -======================================================================= -ACKNOWLEDGMENTS: - Some versions of the less distribution are packaged using - Info-ZIP's compression utility. - Info-ZIP's software is free and can be obtained as source - code or executables from various anonymous-ftp sites, - including ftp.uu.net:/pub/archiving/zip. diff --git a/contrib/less/brac.c b/contrib/less/brac.c index 36f31d0316f4..b3b74e07d18a 100644 --- a/contrib/less/brac.c +++ b/contrib/less/brac.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2025 Mark Nudelman + * Copyright (C) 1984-2026 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. diff --git a/contrib/less/ch.c b/contrib/less/ch.c index fb7572e7f88a..47d31ecffadd 100644 --- a/contrib/less/ch.c +++ b/contrib/less/ch.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2025 Mark Nudelman + * Copyright (C) 1984-2026 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -22,7 +22,7 @@ typedef POSITION BLOCKNUM; -public int ignore_eoi; +public lbool ignore_eoi = FALSE; /* * Pool of buffers holding the most recently used blocks of the input file. @@ -883,13 +883,13 @@ public void ch_init(int f, int flags, ssize_t nread) */ ch_fsize = (flags & CH_HELPFILE) ? size_helpdata : filesize(ch_file); - /* - * This is a kludge to workaround a Linux kernel bug: files in some - * pseudo filesystems like /proc and tracefs have a size of 0 according - * to fstat() but have readable data. - */ if (ch_fsize == 0 && nread > 0) { + /* + * This is a kludge to workaround a Linux kernel bug: files in some + * pseudo filesystems like /proc and tracefs have a size of 0 according + * to fstat() but have readable data. + */ ch_flags |= CH_NOTRUSTSIZE; } diff --git a/contrib/less/charset.c b/contrib/less/charset.c index 0f62739bc88d..74159404148b 100644 --- a/contrib/less/charset.c +++ b/contrib/less/charset.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2025 Mark Nudelman + * Copyright (C) 1984-2026 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -202,20 +202,20 @@ static void ichardef_utf(constant char *s) switch (*s++) { case 'b': - xbuf_add_data(&user_ubin_array, (unsigned char *) &range, sizeof(range)); + xbuf_add_data(&user_ubin_array, &range, sizeof(range)); break; case 'c': - xbuf_add_data(&user_compose_array, (unsigned char *) &range, sizeof(range)); + xbuf_add_data(&user_compose_array, &range, sizeof(range)); break; case 'd': - xbuf_add_data(&user_omit_array, (unsigned char *) &range, sizeof(range)); + xbuf_add_data(&user_omit_array, &range, sizeof(range)); break; case 'w': - xbuf_add_data(&user_wide_array, (unsigned char *) &range, sizeof(range)); - xbuf_add_data(&user_prt_array, (unsigned char *) &range, sizeof(range)); + xbuf_add_data(&user_wide_array, &range, sizeof(range)); + xbuf_add_data(&user_prt_array, &range, sizeof(range)); break; case 'p': case '.': - xbuf_add_data(&user_prt_array, (unsigned char *) &range, sizeof(range)); + xbuf_add_data(&user_prt_array, &range, sizeof(range)); break; case '\0': s--; @@ -429,13 +429,21 @@ static void set_charset(void) /* * Try using the codeset name as the charset name. */ - s = nl_langinfo(CODESET); - if (icharset(s, 1)) - return; +#if LESSTEST + /* + * Don't check nl_langinfo in lesstest mode; charset should come + * only from environment variables, not from the system locale. + */ + if (0) /* {{ unfortunately it's too early to use is_lesstest }} */ +#endif + { + s = nl_langinfo(CODESET); + if (icharset(s, 1)) + return; + } #endif #endif -#if HAVE_STRSTR /* * Check whether LC_ALL, LC_CTYPE or LANG look like UTF-8 is used. */ @@ -448,7 +456,6 @@ static void set_charset(void) if (icharset("utf-8", 1)) return; } -#endif #if HAVE_LOCALE /* diff --git a/contrib/less/charset.h b/contrib/less/charset.h index 4acf494b4ed5..cf2e02547cb5 100644 --- a/contrib/less/charset.h +++ b/contrib/less/charset.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2025 Mark Nudelman + * Copyright (C) 1984-2026 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. diff --git a/contrib/less/cmd.h b/contrib/less/cmd.h index 07c57b111aee..945f99719d0c 100644 --- a/contrib/less/cmd.h +++ b/contrib/less/cmd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2025 Mark Nudelman + * Copyright (C) 1984-2026 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -86,6 +86,7 @@ #define A_OSC8_JUMP 74 #define A_START_PASTE 75 /* must not overlap EC_* */ #define A_END_PASTE 76 /* must not overlap EC_* */ +#define A_F_FOREVER_BELL 77 /* These values must not conflict with any A_* or EC_* value. */ #define A_INVALID 100 @@ -155,4 +156,27 @@ #define SK_BACKTAB 15 #define SK_CTL_BACKSPACE 16 #define SK_BACKSPACE 17 +#define SK_PAD_U 18 +#define SK_PAD_D 19 +#define SK_PAD_R 20 +#define SK_PAD_L 21 +#define SK_PAD_UR 22 +#define SK_PAD_UL 23 +#define SK_PAD_DR 24 +#define SK_PAD_DL 25 +#define SK_PAD_CENTER 26 +#define SK_PAD_STAR 27 +#define SK_PAD_SLASH 28 +#define SK_PAD_DASH 29 +#define SK_PAD_PLUS 30 +#define SK_PAD_DOT 31 +#define SK_PAD_COMMA 32 +#define SK_PAD_ZERO 33 +#define SK_SHIFT_HOME 34 +#define SK_SHIFT_END 35 +#define SK_CTL_HOME 36 +#define SK_CTL_END 37 +#define SK_SHIFT_LEFT_ARROW 38 +#define SK_SHIFT_RIGHT_ARROW 39 + #define SK_CONTROL_K 40 diff --git a/contrib/less/cmdbuf.c b/contrib/less/cmdbuf.c index f2963cf4c9da..1c3b3d461ad9 100644 --- a/contrib/less/cmdbuf.c +++ b/contrib/less/cmdbuf.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2025 Mark Nudelman + * Copyright (C) 1984-2026 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -23,7 +23,7 @@ extern int sc_width; extern int utf_mode; extern int no_hist_dups; -extern int marks_modified; +extern lbool marks_modified; extern int no_paste; public lbool pasting = FALSE; @@ -35,6 +35,9 @@ static int cmd_offset; /* Index into cmdbuf of first displayed char */ static lbool literal; /* Next input char should not be interpreted */ static size_t updown_match; /* Prefix length in up/down movement */ static lbool have_updown_match = FALSE; +#if LESS_INSERT_MODE +static lbool insert_mode = TRUE; +#endif static int cmd_complete(int action); /* @@ -189,7 +192,7 @@ public int len_cmdbuf(void) */ public lbool cmdbuf_empty(void) { - return cp == cmdbuf && cmd_mbc_buf_len == 0; + return cmdbuf[0] == '\0' && cmd_mbc_buf_len == 0; } /* @@ -454,39 +457,6 @@ static int cmd_left(void) return (CC_OK); } -/* - * Insert a char into the command buffer, at the current position. - */ -static int cmd_ichar(constant char *cs, size_t clen) -{ - char *s; - - if (strlen(cmdbuf) + clen >= sizeof(cmdbuf)-1) - { - /* No room in the command buffer for another char. */ - bell(); - return (CC_ERROR); - } - - /* - * Make room for the new character (shift the tail of the buffer right). - */ - for (s = &cmdbuf[strlen(cmdbuf)]; s >= cp; s--) - s[clen] = s[0]; - /* - * Insert the character into the buffer. - */ - for (s = cp; s < cp + clen; s++) - *s = *cs++; - /* - * Reprint the tail of the line from the inserted char. - */ - have_updown_match = FALSE; - cmd_repaint(cp); - cmd_right(); - return (CC_OK); -} - /* * Backspace in the command buffer. * Delete the char to the left of the cursor. @@ -502,7 +472,7 @@ static int cmd_erase(void) * Backspace past beginning of the buffer: * this usually means abort the command. */ - return (CC_QUIT); + return CC_QUIT; } /* * Move cursor left (to the char being erased). @@ -532,7 +502,7 @@ static int cmd_erase(void) * to abort the current command, if CF_QUIT_ON_ERASE is set. */ if ((curr_cmdflags & CF_QUIT_ON_ERASE) && cp == cmdbuf && *cp == '\0') - return (CC_QUIT); + return CC_QUIT; return (CC_OK); } @@ -554,6 +524,43 @@ static int cmd_delete(void) return (CC_OK); } +/* + * Insert a char into the command buffer, at the current position. + */ +static int cmd_ichar(constant char *cs, size_t clen) +{ + char *s; + + if (strlen(cmdbuf) + clen >= sizeof(cmdbuf)-1) + { + /* No room in the command buffer for another char. */ + lbell(); + return (CC_ERROR); + } + +#if LESS_INSERT_MODE + if (!insert_mode) + cmd_delete(); +#endif + /* + * Make room for the new character (shift the tail of the buffer right). + */ + for (s = &cmdbuf[strlen(cmdbuf)]; s >= cp; s--) + s[clen] = s[0]; + /* + * Insert the character into the buffer. + */ + for (s = cp; s < cp + clen; s++) + *s = *cs++; + /* + * Reprint the tail of the line from the inserted char. + */ + have_updown_match = FALSE; + cmd_repaint(cp); + cmd_right(); + return (CC_OK); +} + /* * Delete the "word" to the left of the cursor. */ @@ -612,7 +619,7 @@ static int cmd_kill(void) if (cmdbuf[0] == '\0') { /* Buffer is already empty; abort the current command. */ - return (CC_QUIT); + return CC_QUIT; } cmd_offset = 0; cmd_home(); @@ -625,7 +632,7 @@ static int cmd_kill(void) * to abort the current command, if CF_QUIT_ON_ERASE is set. */ if (curr_cmdflags & CF_QUIT_ON_ERASE) - return (CC_QUIT); + return CC_QUIT; return (CC_OK); } @@ -660,7 +667,7 @@ static int cmd_updown(int action) /* * The current command has no history list. */ - bell(); + lbell(); return (CC_OK); } @@ -705,7 +712,7 @@ static int cmd_updown(int action) /* * We didn't find a history entry that matches. */ - bell(); + lbell(); return (CC_OK); } @@ -796,6 +803,15 @@ public void cmd_addhist(struct mlist *mlist, constant char *cmd, lbool modified) * Thus, an UPARROW will always retrieve the previous command. */ mlist->curr_mp = ml->next; + if (modified) + { + if (mlist == &mlist_search && autosave_action('/')) + save_cmdhist(); +#if SHELL_ESCAPE || PIPEC + else if (mlist == &mlist_shell && autosave_action('!')) + save_cmdhist(); +#endif + } #endif } @@ -904,6 +920,9 @@ static int cmd_edit(char c, lbool stay_in_completion) return (CC_OK); case EC_INSERT: not_in_completion(); +#if LESS_INSERT_MODE + insert_mode = !insert_mode; +#endif return (CC_OK); case EC_BACKSPACE: not_in_completion(); @@ -914,7 +933,7 @@ static int cmd_edit(char c, lbool stay_in_completion) case EC_ABORT: not_in_completion(); (void) cmd_kill(); - return (CC_QUIT); + return CC_QUIT; case EC_W_BACKSPACE: not_in_completion(); return (cmd_werase()); @@ -950,17 +969,23 @@ static int cmd_istr(constant char *str) { constant char *endline = str + strlen(str); constant char *s; - int action; - + int action = CC_OK; +#if LESS_INSERT_MODE + lbool save_insert_mode = insert_mode; + insert_mode = TRUE; +#endif for (s = str; *s != '\0'; ) { constant char *os = s; step_charc(&s, +1, endline); action = cmd_ichar(os, ptr_diff(s, os)); if (action != CC_OK) - return (action); + break; } - return (CC_OK); +#if LESS_INSERT_MODE + insert_mode = save_insert_mode; +#endif + return (action); } /* @@ -1171,7 +1196,7 @@ static int cmd_complete(int action) #endif /* TAB_COMPLETE_FILENAME */ if (tk_text == NULL) { - bell(); + lbell(); return (CC_OK); } if (action == EC_EXPAND) @@ -1239,7 +1264,7 @@ static int cmd_complete(int action) fail: in_completion = FALSE; - bell(); + lbell(); return (CC_OK); } @@ -1281,7 +1306,7 @@ static int cmd_uchar(char c, size_t *plen) } else { /* UTF8_INVALID or stray UTF8_TRAIL */ - bell(); + lbell(); return (CC_ERROR); } } else if (IS_UTF8_TRAIL(c)) @@ -1293,14 +1318,14 @@ static int cmd_uchar(char c, size_t *plen) { /* complete, but not well formed (non-shortest form), sequence */ cmd_mbc_buf_len = 0; - bell(); + lbell(); return (CC_ERROR); } } else { /* Flush incomplete (truncated) sequence. */ cmd_mbc_buf_len = 0; - bell(); + lbell(); /* Handle new char. */ goto retry; } @@ -1388,7 +1413,6 @@ public LINENUM cmd_int(mutable long *frac) { constant char *p; LINENUM n = 0; - lbool err; for (p = cmdbuf; *p >= '0' && *p <= '9'; p++) { @@ -1401,8 +1425,8 @@ public LINENUM cmd_int(mutable long *frac) *frac = 0; if (*p++ == '.') { - *frac = getfraction(&p, NULL, &err); - /* {{ do something if err is set? }} */ + /* {{ Just ignore error in fractional part. }} */ + (void) getfraction(&p, frac); } return (n); } @@ -1447,7 +1471,7 @@ static int mlist_size(struct mlist *ml) static char * histfile_find(lbool must_exist) { constant char *home = lgetenv("HOME"); - char *name = NULL; + char *name; /* Try in $XDG_STATE_HOME, then in $HOME/.local/state, then in $XDG_DATA_HOME, then in $HOME. */ #if OS2 @@ -1738,7 +1762,7 @@ public void save_cmdhist(void) int skip_shell; struct save_ctx ctx; constant char *s; - FILE *fout = NULL; + FILE *fout; int histsize = 0; if (!secure_allow(SF_HISTORY) || !histfile_modified()) diff --git a/contrib/less/command.c b/contrib/less/command.c index 390385547385..1bb8d006f8ec 100644 --- a/contrib/less/command.c +++ b/contrib/less/command.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2025 Mark Nudelman + * Copyright (C) 1984-2026 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -32,7 +32,7 @@ extern int jump_sline; extern lbool quitting; extern int wscroll; extern int top_scroll; -extern int ignore_eoi; +extern lbool ignore_eoi; extern int hshift; extern int bs_mode; extern int proc_backspace; @@ -49,7 +49,6 @@ extern void *ml_examine; extern int wheel_lines; extern int def_search_type; extern lbool search_wrapped; -extern lbool no_poll; extern int no_paste; extern lbool pasting; extern int no_edit_warn; @@ -154,7 +153,7 @@ static void start_mca(int action, constant char *prompt, void *mlist, int cmdfla set_mlist(mlist, cmdflags); } -public int in_mca(void) +public lbool in_mca(void) { return (mca != 0 && mca != A_PREFIX); } @@ -476,7 +475,7 @@ static int mca_opt_nonfirst_char(char c) } } else if (!ambig) { - bell(); + lbell(); } return (MCA_MORE); } @@ -575,7 +574,10 @@ static int mca_search_char(char c) */ if (!cmdbuf_empty() || literal_char) { + lbool was_literal_char = literal_char; literal_char = FALSE; + if (was_literal_char) + mca_search1(); return (NO_MCA); } @@ -639,6 +641,17 @@ static int mca_search_char(char c) return (NO_MCA); } +/* + * Jump back to the starting position of an incremental search. + */ +static void jump_search_incr_pos(void) +{ + if (search_incr_pos.pos == NULL_POSITION) + return; + hshift = search_incr_hshift; + jump_loc(search_incr_pos.pos, search_incr_pos.ln); +} + /* * Handle a character of a multi-character command. */ @@ -772,30 +785,21 @@ static int mca_char(char c) if (*pattern == '\0') { /* User has backspaced to an empty pattern. */ - undo_search(1); - hshift = search_incr_hshift; - jump_loc(search_incr_pos.pos, search_incr_pos.ln); + undo_search(TRUE); + jump_search_incr_pos(); } else { - /* - * Suppress tty polling while searching. - * This avoids a problem where tty input - * can cause the search to be interrupted. - */ - no_poll = TRUE; if (search(st | SRCH_INCR, pattern, 1) != 0) { /* No match, invalid pattern, etc. */ - undo_search(1); - hshift = search_incr_hshift; - jump_loc(search_incr_pos.pos, search_incr_pos.ln); + undo_search(TRUE); + jump_search_incr_pos(); } - no_poll = FALSE; } /* Redraw the search prompt and search string. */ if (is_screen_trashed() || !full_screen) { - clear(); + lclear(); repaint(); } mca_search1(); @@ -851,7 +855,7 @@ static void make_display(void) * We need to clear and repaint screen before any change. */ if (!full_screen && !(quit_if_one_screen && one_screen)) - clear(); + lclear(); /* * If nothing is displayed yet, display starting from initial_scrpos. */ @@ -864,9 +868,9 @@ static void make_display(void) } else if (is_screen_trashed() || !full_screen) { int save_top_scroll = top_scroll; - int save_ignore_eoi = ignore_eoi; + lbool save_ignore_eoi = ignore_eoi; top_scroll = 1; - ignore_eoi = 0; + ignore_eoi = FALSE; if (is_screen_trashed() == 2) { /* Special case used by ignore_eoi: re-open the input file @@ -1304,29 +1308,31 @@ static void multi_search(constant char *pattern, int n, int silent) /* * Forward forever, or until a highlighted line appears. */ -static int forw_loop(int until_hilite) +static int forw_loop(int action) { - POSITION curr_len; + POSITION prev_hilite; if (ch_getflags() & CH_HELPFILE) return (A_NOACTION); cmd_exec(); jump_forw_buffered(); - curr_len = ch_length(); - highest_hilite = until_hilite ? curr_len : NULL_POSITION; - ignore_eoi = 1; + highest_hilite = prev_hilite = 0; + ignore_eoi = TRUE; while (!sigs) { - if (until_hilite && highest_hilite > curr_len) + if (action != A_F_FOREVER && highest_hilite > prev_hilite) { - bell(); - break; + lbell(); + if (action == A_F_UNTIL_HILITE) + break; + prev_hilite = highest_hilite; } make_display(); forward(1, FALSE, FALSE, FALSE); } - ignore_eoi = 0; + highest_hilite = NULL_POSITION; + ignore_eoi = FALSE; ch_set_eof(); /* @@ -1334,7 +1340,7 @@ static int forw_loop(int until_hilite) * a non-abort signal (e.g. window-change). */ if (sigs && !ABORT_SIGS()) - return (until_hilite ? A_F_UNTIL_HILITE : A_F_FOREVER); + return (action); return (A_NOACTION); } @@ -1401,7 +1407,6 @@ public void commands(void) #endif search_type = SRCH_FORW; - wscroll = (sc_height + 1) / 2; newaction = A_NOACTION; for (;;) @@ -1507,7 +1512,9 @@ public void commands(void) * want erase_char/kill_char to be treated * as line editing characters. */ - constant char tbuf[2] = { c, '\0' }; + char tbuf[2]; + tbuf[0] = c; + tbuf[1] = '\0'; action = fcmd_decode(tbuf, &extra); } /* @@ -1664,6 +1671,8 @@ public void commands(void) break; *** 8504 LINES SKIPPED *** From nobody Thu May 7 04:24:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9zgJ4mzrz6dQKf for ; Thu, 07 May 2026 04:25: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 4g9zgJ3dgJz3rH1 for ; Thu, 07 May 2026 04:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778127900; 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=TDVRShZR2TMIG3xx08RgD0cERDjE5LEV9nflsyWPnLc=; b=EoaCwVVN820L0TSQHr65L89NAPkDPpm+R2SFZdWyAqBvXMjpxErOKm/RkaU4/hnmYGjScQ ibS8RYj4gtOFDH9iPlICzhF4RXouVljfBgHHyI4attzKmGYfXoOcXUQaLHdZL+xnzaZGxD eir7yicc8JQbTxyKLHBFJw8NF4a8g7hQZobQV5yUoknqEFqlg0PPXZH2aFnnNADMduVcUL s7fCCE9a8EPBgB9x4V1VDuqPlYi1PH6tePkHhzY3jflJpo6ulmo7+eaZ1puzMmMWXN8Ahh LZ3opfi3M7p3C049q4pf/Ub8Ut6hFsz8GpZ4O4LFYmWXc/QxDyl8lXk4w5Ujng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778127900; a=rsa-sha256; cv=none; b=VOSzaqikt0KXunGCX1Jjd31YNoLcS1enqcTCjBvqiKX0+vxQPHbMo8+1CtYG7yOJoyn/MA ay0/1+Hs2Ou7d0KGv24ex+279Ux3E0MwogM69F1LUaLok9U/w+zoOMkweob2OXdTluhRCj NAspF6uXtgw8Y5SSoc2y5EDtFyLV9fY57fpOW+bPeZJmgjWB+68CuGJESYFBmyfRnpm7fC 0xA7TiwK5YU+HonKt67ccp6wfgwER/7Z0O02iK0iy4s2jBpX8hOWU1wcOzEViOhviLLn++ Mennvl6aH/6KKbOrEekEjg2FYg+1OTwGIwILcvD24FpHea5XQC9RJ9s6RtAF+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778127900; 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=TDVRShZR2TMIG3xx08RgD0cERDjE5LEV9nflsyWPnLc=; b=N8zowNRx7p/3nzqtyYoODMpPD36SLhki8D6eM/xn2epGr/thrH8neUHWnB3Y0CugRDbADG /+xXrwbqN/E0Phkv5V03Cp4OQJMILuQ60fT8uAdBagwRzTZuz74Gm+UzRIeCk9DyfHLUR2 WyXjOgr39KdTprFDUAbjBHkqnbCngTyRQOXsdffNhFX+xR1j2XobA/dYR9+E1eORvJ28Mx 7xEyjAnPKtwNq6y/ZKF2VzOBrUzxUt0+KE3P3TFr6rPVtPj3wt7M80jSES/5Xdas/5TsOT c/u1QhveBZQ4gJMNOo4BfpTgPoLxzPfw7McnTFfJQPl7pKq8oQ1iSUbShV8UBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9zgJ3D36z18Y7 for ; Thu, 07 May 2026 04:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30b55 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 04:24:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Michal Meloun From: Xin LI Subject: git: 5169e95b7596 - stable/15 - arm64: Define the .iplt section placement. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5169e95b7596b5a96cb50dee69ee8c20445a9a9e Auto-Submitted: auto-generated Date: Thu, 07 May 2026 04:24:55 +0000 Message-Id: <69fc1417.30b55.3861ece@gitrepo.freebsd.org> The branch stable/15 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=5169e95b7596b5a96cb50dee69ee8c20445a9a9e commit 5169e95b7596b5a96cb50dee69ee8c20445a9a9e Author: Michal Meloun AuthorDate: 2026-04-15 09:32:54 +0000 Commit: Xin LI CommitDate: 2026-05-07 04:24:25 +0000 arm64: Define the .iplt section placement. Ensure that the .plt and .ipld sections are in the executable memory segment. Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D56403 (cherry picked from commit 1dddb580f950a27fb9859b2879755dde114c9d8b) --- sys/conf/ldscript.arm64 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/conf/ldscript.arm64 b/sys/conf/ldscript.arm64 index ae231c3037e6..7ec0d4324270 100644 --- a/sys/conf/ldscript.arm64 +++ b/sys/conf/ldscript.arm64 @@ -15,6 +15,12 @@ SECTIONS *(.gnu.warning) *(.gnu.linkonce.t*) } =0x9090 + .plt : + { + *(.plt) + *(.iplt) + } + /* * Align to the the largest page size the kernel could be built for. * If we don't then building page tables in locore.S could fail as it @@ -66,7 +72,6 @@ SECTIONS .rel.plt : { *(.rel.plt) } .rela.plt : { *(.rela.plt) } .init : { *(.init) } =0x9090 - .plt : { *(.plt) } . = ALIGN(4); _extab_start = .; From nobody Thu May 7 04:29:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g9zmf45L9z6dQw1 for ; Thu, 07 May 2026 04:29: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 4g9zmf3bj8z3rZb for ; Thu, 07 May 2026 04:29:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778128178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ieesO0uO3WRrM0rhoX8iRV7h0YcSiPdSCSFz0p6EQJk=; b=CltGkRAuqQbAc/evTocGW+2C2nq1uAkI24JTQ/P24P9NVUPEiP85+72gvbPASM/P+3WeLE i7jGr/hcrOD0sC4GnVrQhyLZEtK1gOp8w1ZJ4ck86LY/8gpRbxD+BplmVLlDZ92m1Q6bWP 358Phoqz/HxieiinoOxXLL0drlWeOfPzgRkWR+eQur45xmiRiCxVBMkX6h2wpkiSlJQ2KV 2tkcypzthVOr3iuugH1VkB/GsHYCpMeAQ2vY/IAh+NmtLtGgO8OX+wLONTcbm2xTdNPbL8 iFLRPl0OmW2kC8hcykhnKjI+91ETusxEwFGk3xeUBec7bA0LPxs/v4mFsMxezw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778128178; a=rsa-sha256; cv=none; b=T7aoT7Wa5AAHF9kxibFPUhlTGY4f6ic/mRZ+FtRKFS6E+gNrnssdqfecGR+ZU9JGSbxqSR AQb+4bvQDOC63FFEV/fAaQjZyy9cC0xJJ2XaCVnVmv+4cQ9hEzxzciNtoGsOvw9kaNeldu LfhfwcSUql2vgGxp08Jhx7mvJJm/1dr2htkI8Y55n/GL4ACt+Tx7GK5X93o8xwZQRryG4n Gb+TwouvwcvT9ihN11cDOY88YkhGyQhLkYQTO2/PmgqQNB8BpgBV1kvcH97wBltKAyOrsJ vrawJMOt41IGCnSHrGmYOV1eMZdUnEXeorVR0ARIyuiMB2mgrDNU12U4FqF5mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778128178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ieesO0uO3WRrM0rhoX8iRV7h0YcSiPdSCSFz0p6EQJk=; b=m9M5lkfu0MIc4sbbDpsWC4hydvRa88r5O7qWMr1DhxaI79K8Hwj2mRbT+NyrfpXDQqW3R2 ug1iWEStYShx6btgN3n+bZuD4erLpIiFauihIYZIegYR7V+l7dKo5e5gmvR43hSK4gA7dv dAp4PbV7we/PfM+u8cRFEajUuiRwzxhnSx4gmDBpm1mbFKgFl1K1zQVOD+xGtkJAk+EtQa rvwKKzJkNxuQmehWwSOxKME/QsJUCkOL812va5mHdgZrYLG5NlBliHWu8kI4szF9ey5IuN sUHe8NbVdRSC2uEESdxNNjDNnALk4Mm60OeEe9h74h6XnfXreX+mZdabhsdLxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9zmf3B3cz18cY for ; Thu, 07 May 2026 04:29:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3122d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 04:29:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: ff426ceef657 - stable/15 - MFV: zstd 1.5.7. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ff426ceef657d7c478471e631349c5d1a8b96453 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 04:29:32 +0000 Message-Id: <69fc152c.3122d.2612d63b@gitrepo.freebsd.org> The branch stable/15 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=ff426ceef657d7c478471e631349c5d1a8b96453 commit ff426ceef657d7c478471e631349c5d1a8b96453 Author: Xin LI AuthorDate: 2026-05-07 04:29:03 +0000 Commit: Xin LI CommitDate: 2026-05-07 04:29:03 +0000 MFV: zstd 1.5.7. MFC after: 2 weeks Relnotes: yes (cherry picked from commit c0d9a07101a1e72769ee0619a583f63a078fb391) (cherry picked from commit 7c9418613a31571e4eceda55a417f7183d26acb5) (cherry picked from commit 111a42d7d78a88ba6ff7b5d61b0867faccc00276) --- lib/libzstd/Makefile | 4 + sys/conf/files | 1 + sys/contrib/zstd/.buckconfig | 9 - sys/contrib/zstd/.buckversion | 1 - sys/contrib/zstd/CHANGELOG | 148 +- sys/contrib/zstd/CONTRIBUTING.md | 489 --- sys/contrib/zstd/FREEBSD-Xlist | 11 +- sys/contrib/zstd/LICENSE | 8 +- sys/contrib/zstd/Makefile | 439 --- sys/contrib/zstd/README.md | 96 +- sys/contrib/zstd/SECURITY.md | 15 + sys/contrib/zstd/TESTING.md | 43 - sys/contrib/zstd/appveyor.yml | 205 -- sys/contrib/zstd/doc/README.md | 25 - sys/contrib/zstd/doc/educational_decoder/Makefile | 62 - sys/contrib/zstd/doc/educational_decoder/README.md | 36 - sys/contrib/zstd/doc/educational_decoder/harness.c | 119 - .../zstd/doc/educational_decoder/zstd_decompress.c | 2320 ------------- .../zstd/doc/educational_decoder/zstd_decompress.h | 61 - sys/contrib/zstd/doc/images/CSpeed2.png | Bin 73335 -> 0 bytes sys/contrib/zstd/doc/images/DCspeed5.png | Bin 69278 -> 0 bytes sys/contrib/zstd/doc/images/DSpeed3.png | Bin 27123 -> 0 bytes sys/contrib/zstd/doc/images/cdict_v136.png | Bin 33330 -> 0 bytes sys/contrib/zstd/doc/images/dict-cr.png | Bin 90412 -> 0 bytes sys/contrib/zstd/doc/images/dict-cs.png | Bin 91518 -> 0 bytes sys/contrib/zstd/doc/images/dict-ds.png | Bin 98316 -> 0 bytes sys/contrib/zstd/doc/images/zstd_cdict_v1_3_5.png | Bin 93969 -> 0 bytes sys/contrib/zstd/doc/images/zstd_logo86.png | Bin 5963 -> 0 bytes sys/contrib/zstd/doc/zstd_compression_format.md | 1692 ---------- sys/contrib/zstd/doc/zstd_manual.html | 1908 ----------- sys/contrib/zstd/examples/Makefile | 93 - sys/contrib/zstd/examples/README.md | 46 - sys/contrib/zstd/examples/common.h | 234 -- sys/contrib/zstd/examples/dictionary_compression.c | 97 - .../zstd/examples/dictionary_decompression.c | 99 - .../zstd/examples/multiple_simple_compression.c | 116 - .../zstd/examples/multiple_streaming_compression.c | 133 - sys/contrib/zstd/examples/simple_compression.c | 68 - sys/contrib/zstd/examples/simple_decompression.c | 65 - sys/contrib/zstd/examples/streaming_compression.c | 140 - .../examples/streaming_compression_thread_pool.c | 180 -- .../zstd/examples/streaming_decompression.c | 100 - sys/contrib/zstd/examples/streaming_memory_usage.c | 137 - sys/contrib/zstd/lib/BUCK | 232 -- sys/contrib/zstd/lib/Makefile | 357 -- sys/contrib/zstd/lib/README.md | 35 +- sys/contrib/zstd/lib/common/allocations.h | 55 + sys/contrib/zstd/lib/common/bits.h | 205 ++ sys/contrib/zstd/lib/common/bitstream.h | 192 +- sys/contrib/zstd/lib/common/compiler.h | 211 +- sys/contrib/zstd/lib/common/cpu.h | 38 +- sys/contrib/zstd/lib/common/debug.c | 8 +- sys/contrib/zstd/lib/common/debug.h | 42 +- sys/contrib/zstd/lib/common/entropy_common.c | 52 +- sys/contrib/zstd/lib/common/error_private.c | 12 +- sys/contrib/zstd/lib/common/error_private.h | 93 +- sys/contrib/zstd/lib/common/fse.h | 108 +- sys/contrib/zstd/lib/common/fse_decompress.c | 144 +- sys/contrib/zstd/lib/common/huf.h | 245 +- sys/contrib/zstd/lib/common/mem.h | 112 +- sys/contrib/zstd/lib/common/pool.c | 38 +- sys/contrib/zstd/lib/common/pool.h | 19 +- sys/contrib/zstd/lib/common/portability_macros.h | 56 +- sys/contrib/zstd/lib/common/threading.c | 88 +- sys/contrib/zstd/lib/common/threading.h | 23 +- sys/contrib/zstd/lib/common/xxhash.c | 16 +- sys/contrib/zstd/lib/common/xxhash.h | 3417 ++++++++++++++------ sys/contrib/zstd/lib/common/zstd_common.c | 37 +- sys/contrib/zstd/lib/common/zstd_deps.h | 14 +- sys/contrib/zstd/lib/common/zstd_internal.h | 195 +- sys/contrib/zstd/lib/common/zstd_trace.h | 19 +- sys/contrib/zstd/lib/compress/clevels.h | 2 +- sys/contrib/zstd/lib/compress/fse_compress.c | 146 +- sys/contrib/zstd/lib/compress/hist.c | 12 +- sys/contrib/zstd/lib/compress/hist.h | 9 +- sys/contrib/zstd/lib/compress/huf_compress.c | 472 +-- sys/contrib/zstd/lib/compress/zstd_compress.c | 3322 +++++++++++++------ .../zstd/lib/compress/zstd_compress_internal.h | 671 ++-- .../zstd/lib/compress/zstd_compress_literals.c | 156 +- .../zstd/lib/compress/zstd_compress_literals.h | 24 +- .../zstd/lib/compress/zstd_compress_sequences.c | 20 +- .../zstd/lib/compress/zstd_compress_sequences.h | 15 +- .../zstd/lib/compress/zstd_compress_superblock.c | 393 ++- .../zstd/lib/compress/zstd_compress_superblock.h | 2 +- sys/contrib/zstd/lib/compress/zstd_cwksp.h | 279 +- sys/contrib/zstd/lib/compress/zstd_double_fast.c | 244 +- sys/contrib/zstd/lib/compress/zstd_double_fast.h | 32 +- sys/contrib/zstd/lib/compress/zstd_fast.c | 704 ++-- sys/contrib/zstd/lib/compress/zstd_fast.h | 21 +- sys/contrib/zstd/lib/compress/zstd_lazy.c | 1063 +++--- sys/contrib/zstd/lib/compress/zstd_lazy.h | 198 +- sys/contrib/zstd/lib/compress/zstd_ldm.c | 101 +- sys/contrib/zstd/lib/compress/zstd_ldm.h | 22 +- sys/contrib/zstd/lib/compress/zstd_ldm_geartab.h | 2 +- sys/contrib/zstd/lib/compress/zstd_opt.c | 570 ++-- sys/contrib/zstd/lib/compress/zstd_opt.h | 58 +- sys/contrib/zstd/lib/compress/zstd_preSplit.c | 238 ++ sys/contrib/zstd/lib/compress/zstd_preSplit.h | 33 + sys/contrib/zstd/lib/compress/zstdmt_compress.c | 414 ++- sys/contrib/zstd/lib/compress/zstdmt_compress.h | 21 +- sys/contrib/zstd/lib/decompress/huf_decompress.c | 1031 +++--- .../zstd/lib/decompress/huf_decompress_amd64.S | 139 +- sys/contrib/zstd/lib/decompress/zstd_ddict.c | 8 +- sys/contrib/zstd/lib/decompress/zstd_ddict.h | 2 +- sys/contrib/zstd/lib/decompress/zstd_decompress.c | 410 ++- .../zstd/lib/decompress/zstd_decompress_block.c | 723 +++-- .../zstd/lib/decompress/zstd_decompress_block.h | 9 +- .../zstd/lib/decompress/zstd_decompress_internal.h | 18 +- sys/contrib/zstd/lib/deprecated/zbuff.h | 2 +- sys/contrib/zstd/lib/deprecated/zbuff_common.c | 2 +- sys/contrib/zstd/lib/deprecated/zbuff_compress.c | 2 +- sys/contrib/zstd/lib/deprecated/zbuff_decompress.c | 4 +- sys/contrib/zstd/lib/dictBuilder/cover.c | 141 +- sys/contrib/zstd/lib/dictBuilder/cover.h | 12 +- sys/contrib/zstd/lib/dictBuilder/divsufsort.h | 10 - sys/contrib/zstd/lib/dictBuilder/fastcover.c | 8 +- sys/contrib/zstd/lib/dictBuilder/zdict.c | 125 +- sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h | 6 + sys/contrib/zstd/lib/legacy/zstd_legacy.h | 39 +- sys/contrib/zstd/lib/legacy/zstd_v01.c | 69 +- sys/contrib/zstd/lib/legacy/zstd_v01.h | 2 +- sys/contrib/zstd/lib/legacy/zstd_v02.c | 107 +- sys/contrib/zstd/lib/legacy/zstd_v02.h | 2 +- sys/contrib/zstd/lib/legacy/zstd_v03.c | 111 +- sys/contrib/zstd/lib/legacy/zstd_v03.h | 2 +- sys/contrib/zstd/lib/legacy/zstd_v04.c | 99 +- sys/contrib/zstd/lib/legacy/zstd_v04.h | 2 +- sys/contrib/zstd/lib/legacy/zstd_v05.c | 107 +- sys/contrib/zstd/lib/legacy/zstd_v05.h | 2 +- sys/contrib/zstd/lib/legacy/zstd_v06.c | 132 +- sys/contrib/zstd/lib/legacy/zstd_v06.h | 2 +- sys/contrib/zstd/lib/legacy/zstd_v07.c | 117 +- sys/contrib/zstd/lib/legacy/zstd_v07.h | 2 +- sys/contrib/zstd/lib/libzstd.mk | 98 +- sys/contrib/zstd/lib/libzstd.pc.in | 10 +- sys/contrib/zstd/lib/module.modulemap | 16 +- sys/contrib/zstd/lib/zdict.h | 101 +- sys/contrib/zstd/lib/zstd.h | 1157 +++++-- sys/contrib/zstd/lib/zstd_errors.h | 44 +- sys/contrib/zstd/programs/BUCK | 44 - sys/contrib/zstd/programs/Makefile | 435 --- sys/contrib/zstd/programs/README.md | 191 +- sys/contrib/zstd/programs/benchfn.c | 12 +- sys/contrib/zstd/programs/benchfn.h | 14 +- sys/contrib/zstd/programs/benchzstd.c | 1287 +++++--- sys/contrib/zstd/programs/benchzstd.h | 80 +- sys/contrib/zstd/programs/datagen.c | 2 +- sys/contrib/zstd/programs/datagen.h | 10 +- sys/contrib/zstd/programs/dibio.c | 33 +- sys/contrib/zstd/programs/dibio.h | 2 +- sys/contrib/zstd/programs/fileio.c | 1887 ++++++----- sys/contrib/zstd/programs/fileio.h | 35 +- sys/contrib/zstd/programs/fileio_asyncio.c | 663 ++++ sys/contrib/zstd/programs/fileio_asyncio.h | 195 ++ sys/contrib/zstd/programs/fileio_common.h | 121 + sys/contrib/zstd/programs/fileio_types.h | 86 + sys/contrib/zstd/programs/lorem.c | 285 ++ sys/contrib/zstd/programs/lorem.h | 32 + sys/contrib/zstd/programs/platform.h | 46 +- sys/contrib/zstd/programs/timefn.c | 139 +- sys/contrib/zstd/programs/timefn.h | 70 +- sys/contrib/zstd/programs/util.c | 408 ++- sys/contrib/zstd/programs/util.h | 66 +- sys/contrib/zstd/programs/zstd.1 | 489 ++- sys/contrib/zstd/programs/zstd.1.md | 598 ++-- sys/contrib/zstd/programs/zstdcli.c | 648 ++-- sys/contrib/zstd/programs/zstdcli_trace.c | 2 +- sys/contrib/zstd/programs/zstdcli_trace.h | 2 +- sys/contrib/zstd/programs/zstdgrep.1 | 10 +- sys/contrib/zstd/programs/zstdgrep.1.md | 10 +- sys/contrib/zstd/programs/zstdless | 8 +- sys/contrib/zstd/programs/zstdless.1 | 6 +- sys/contrib/zstd/programs/zstdless.1.md | 6 +- sys/contrib/zstd/zlibWrapper/BUCK | 22 - sys/contrib/zstd/zlibWrapper/Makefile | 119 - sys/contrib/zstd/zlibWrapper/README.md | 4 +- sys/contrib/zstd/zlibWrapper/examples/example.c | 629 ---- .../zstd/zlibWrapper/examples/example_original.c | 618 ---- sys/contrib/zstd/zlibWrapper/examples/fitblk.c | 254 -- .../zstd/zlibWrapper/examples/fitblk_original.c | 233 -- sys/contrib/zstd/zlibWrapper/examples/minigzip.c | 640 ---- sys/contrib/zstd/zlibWrapper/examples/zwrapbench.c | 1016 ------ sys/contrib/zstd/zlibWrapper/gzclose.c | 6 +- sys/contrib/zstd/zlibWrapper/gzcompatibility.h | 16 +- sys/contrib/zstd/zlibWrapper/gzguts.h | 20 +- sys/contrib/zstd/zlibWrapper/gzlib.c | 99 +- sys/contrib/zstd/zlibWrapper/gzread.c | 95 +- sys/contrib/zstd/zlibWrapper/gzwrite.c | 89 +- sys/contrib/zstd/zlibWrapper/zstd_zlibwrapper.c | 90 +- sys/contrib/zstd/zlibWrapper/zstd_zlibwrapper.h | 15 +- usr.bin/zstd/Makefile | 2 + 191 files changed, 17754 insertions(+), 23515 deletions(-) diff --git a/lib/libzstd/Makefile b/lib/libzstd/Makefile index 4a1557a14517..82e9d2a5b243 100644 --- a/lib/libzstd/Makefile +++ b/lib/libzstd/Makefile @@ -15,6 +15,7 @@ SRCS= entropy_common.c \ zstd_compress_literals.c \ zstd_compress_sequences.c \ zstd_compress_superblock.c \ + zstd_preSplit.c \ zstdmt_compress.c \ huf_decompress.c \ zstd_ddict.c \ @@ -54,6 +55,9 @@ ZSTDDIR= ${SRCTOP}/sys/contrib/zstd .include +# These symbols are needed by dll-linked CLI zstd(1). +CFLAGS.pool.c+= -fvisibility=default + CFLAGS.huf_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} # https://github.com/facebook/zstd/commit/812e8f2a [zstd 1.4.1] diff --git a/sys/conf/files b/sys/conf/files index 9d6488a415cb..7f925bfc3f23 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -651,6 +651,7 @@ contrib/zstd/lib/compress/zstd_compress.c optional zstdio compile-with ${ZSTD_C} contrib/zstd/lib/compress/zstd_compress_literals.c optional zstdio compile-with ${ZSTD_C} contrib/zstd/lib/compress/zstd_compress_sequences.c optional zstdio compile-with ${ZSTD_C} contrib/zstd/lib/compress/zstd_compress_superblock.c optional zstdio compile-with "${ZSTD_C} ${NO_WUNUSED_BUT_SET_VARIABLE}" +contrib/zstd/lib/compress/zstd_preSplit.c optional zstdio compile-with ${ZSTD_C} contrib/zstd/lib/compress/fse_compress.c optional zstdio compile-with ${ZSTD_C} contrib/zstd/lib/compress/hist.c optional zstdio compile-with ${ZSTD_C} contrib/zstd/lib/compress/huf_compress.c optional zstdio compile-with ${ZSTD_C} diff --git a/sys/contrib/zstd/.buckconfig b/sys/contrib/zstd/.buckconfig deleted file mode 100644 index 483f6053b265..000000000000 --- a/sys/contrib/zstd/.buckconfig +++ /dev/null @@ -1,9 +0,0 @@ -[cxx] - cppflags = -DXXH_NAMESPACE=ZSTD_ -DZSTD_LEGACY_SUPPORT=4 - cflags = -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef -Wpointer-arith - cxxppflags = -DXXH_NAMESPACE=ZSTD_ -DZSTD_LEGACY_SUPPORT=4 - cxxflags = -std=c++11 -Wno-deprecated-declarations - gtest_dep = //contrib/pzstd:gtest - -[httpserver] - port = 0 diff --git a/sys/contrib/zstd/.buckversion b/sys/contrib/zstd/.buckversion deleted file mode 100644 index 892fad966fce..000000000000 --- a/sys/contrib/zstd/.buckversion +++ /dev/null @@ -1 +0,0 @@ -c8dec2e8da52d483f6dd7c6cd2ad694e8e6fed2b diff --git a/sys/contrib/zstd/CHANGELOG b/sys/contrib/zstd/CHANGELOG index 4e0045b950c9..92df0f462ee0 100644 --- a/sys/contrib/zstd/CHANGELOG +++ b/sys/contrib/zstd/CHANGELOG @@ -1,3 +1,145 @@ +V1.5.7 (Feb 2025) +fix: compression bug in 32-bit mode associated with long-lasting sessions +api: new method `ZSTD_compressSequencesAndLiterals()` (#4217, #4232) +api: `ZSTD_getFrameHeader()` works on skippable frames (#4228) +perf: substantial compression speed improvements (up to +30%) on small data, by @TocarIP (#4144) and @cyan4973 (#4165) +perf: improved compression speed (~+5%) for dictionary compression at low levels (#4170) +perf: much faster speed for `--patch-from` at high compression levels (#4276) +perf: higher `--patch-from` compression ratios, notably at high levels (#4288) +perf: better speed for binaries on Windows (@pps83) and when compiled with Visual Studio (@MessyHack) +perf: slight compression ratio improvement thanks to better block boundaries (#4136, #4176, #4178) +perf: slight compression ratio improvement for `dfast`, aka levels 3 and 4 (#4171) +perf: runtime bmi2 detection enabled on x86 32-bit mode (#4251) +cli: multi-threading as default CLI setting, by @daniellerozenblit +cli: new `--max` command (#4290) +build: improve `msbuild` version autodetection, support VS2022, by @ManuelBlanc +build: fix `meson` build by @artem and @Victor-C-Zhang, and on Windows by @bgilbert +build: compatibility with Apple Framework, by @Treata11 +build: improve icc/icx compatibility, by @josepho0918 and @luau-project +build: improve compatibility with Android NDK, by Adenilson Cavalcanti +portability: linux kernel branch, with improved support for Sequence producers (@embg, @gcabiddu, @cyan4973) +portability: improved qnx compatibility, suggested by @rainbowball +portability: improved install script for FreeBSD, by @sunpoet +portability: fixed test suite compatibility with gnu hurd, by @diegonc +doc: clarify specification, by @elasota +misc: improved tests/decodecorpus validation tool (#4102), by antmicro + +V1.5.6 (Mar 2024) +api: Promote `ZSTD_c_targetCBlockSize` to Stable API by @felixhandte +api: new `ZSTD_d_maxBlockSize` experimental parameter, to reduce streaming decompression memory, by @terrelln +perf: improve performance of param `ZSTD_c_targetCBlockSize`, by @Cyan4973 +perf: improved compression of arrays of integers at high compression, by @Cyan4973 +lib: reduce binary size with selective build-time exclusion, by @felixhandte +lib: improved huffman speed on small data and linux kernel, by @terrelln +lib: accept dictionaries with partial literal tables, by @terrelln +lib: fix CCtx size estimation with external sequence producer, by @embg +lib: fix corner case decoder behaviors, by @Cyan4973 and @aimuz +lib: fix zdict prototype mismatch in static_only mode, by @ldv-alt +lib: fix several bugs in magicless-format decoding, by @embg +cli: add common compressed file types to `--exclude-compressed`` by @daniellerozenblit +cli: fix mixing `-c` and `-o` commands with `--rm`, by @Cyan4973 +cli: fix erroneous exclusion of hidden files with `--output-dir-mirror` by @felixhandte +cli: improved time accuracy on BSD, by @felixhandte +cli: better errors on argument parsing, by @KapJI +tests: better compatibility with older versions of `grep`, by @Cyan4973 +tests: lorem ipsum generator as default backup content, by @Cyan4973 +build: cmake improvements by @terrelln, @sighingnow, @gjasny, @JohanMabille, @Saverio976, @gruenich, @teo-tsirpanis +build: bazel support, by @jondo2010 +build: fix cross-compiling for AArch64 with lld by @jcelerier +build: fix Apple platform compatibility, by @nidhijaju +build: fix Visual 2012 and lower compatibility, by @Cyan4973 +build: improve win32 support, by @DimitriPapadopoulos +build: better C90 compliance for zlibWrapper, by @emaste +port: make: fat binaries on macos, by @mredig +port: ARM64EC compatibility for Windows, by @dunhor +port: QNX support by @klausholstjacobsen +port: MSYS2 and Cygwin makefile installation and test support, by @QBos07 +port: risc-v support validation in CI, by @Cyan4973 +port: sparc64 support validation in CI, by @Cyan4973 +port: AIX compatibility, by @likema +port: HP-UX compatibility, by @likema +doc: Improved specification accuracy, by @elasota +bug: Fix and deprecate ZSTD_generateSequences (#3981) + +v1.5.5 (Apr 2023) +fix: fix rare corruption bug affecting the high compression mode, reported by @danlark1 (#3517, @terrelln) +perf: improve mid-level compression speed (#3529, #3533, #3543, @yoniko and #3552, @terrelln) +lib: deprecated bufferless block-level API (#3534) by @terrelln +cli: mmap large dictionaries to save memory, by @daniellerozenblit +cli: improve speed of --patch-from mode (~+50%) (#3545) by @daniellerozenblit +cli: improve i/o speed (~+10%) when processing lots of small files (#3479) by @felixhandte +cli: zstd no longer crashes when requested to write into write-protected directory (#3541) by @felixhandte +cli: fix decompression into block device using -o, reported by @georgmu (#3583) +build: fix zstd CLI compiled with lzma support but not zlib support (#3494) by @Hello71 +build: fix cmake does no longer require 3.18 as minimum version (#3510) by @kou +build: fix MSVC+ClangCL linking issue (#3569) by @tru +build: fix zstd-dll, version of zstd CLI that links to the dynamic library (#3496) by @yoniko +build: fix MSVC warnings (#3495) by @embg +doc: updated zstd specification to clarify corner cases, by @Cyan4973 +doc: document how to create fat binaries for macos (#3568) by @rickmark +misc: improve seekable format ingestion speed (~+100%) for very small chunk sizes (#3544) by @Cyan4973 +misc: tests/fullbench can benchmark multiple files (#3516) by @dloidolt + +v1.5.4 (Feb 2023) +perf: +20% faster huffman decompression for targets that can't compile x64 assembly (#3449, @terrelln) +perf: up to +10% faster streaming compression at levels 1-2 (#3114, @embg) +perf: +4-13% for levels 5-12 by optimizing function generation (#3295, @terrelln) +pref: +3-11% compression speed for `arm` target (#3199, #3164, #3145, #3141, #3138, @JunHe77 and #3139, #3160, @danlark1) +perf: +5-30% faster dictionary compression at levels 1-4 (#3086, #3114, #3152, @embg) +perf: +10-20% cold dict compression speed by prefetching CDict tables (#3177, @embg) +perf: +1% faster compression by removing a branch in ZSTD_fast_noDict (#3129, @felixhandte) +perf: Small compression ratio improvements in high compression mode (#2983, #3391, @Cyan4973 and #3285, #3302, @daniellerozenblit) +perf: small speed improvement by better detecting `STATIC_BMI2` for `clang` (#3080, @TocarIP) +perf: Improved streaming performance when `ZSTD_c_stableInBuffer` is set (#2974, @Cyan4973) +cli: Asynchronous I/O for improved cli speed (#2975, #2985, #3021, #3022, @yoniko) +cli: Change `zstdless` behavior to align with `zless` (#2909, @binhdvo) +cli: Keep original file if `-c` or `--stdout` is given (#3052, @dirkmueller) +cli: Keep original files when result is concatenated into a single output with `-o` (#3450, @Cyan4973) +cli: Preserve Permissions and Ownership of regular files (#3432, @felixhandte) +cli: Print zlib/lz4/lzma library versions with `-vv` (#3030, @terrelln) +cli: Print checksum value for single frame files with `-lv` (#3332, @Cyan4973) +cli: Print `dictID` when present with `-lv` (#3184, @htnhan) +cli: when `stderr` is *not* the console, disable status updates, but preserve final summary (#3458, @Cyan4973) +cli: support `--best` and `--no-name` in `gzip` compatibility mode (#3059, @dirkmueller) +cli: support for `posix` high resolution timer `clock_gettime()`, for improved benchmark accuracy (#3423, @Cyan4973) +cli: improved help/usage (`-h`, `-H`) formatting (#3094, @dirkmueller and #3385, @jonpalmisc) +cli: Fix better handling of bogus numeric values (#3268, @ctkhanhly) +cli: Fix input consists of multiple files _and_ `stdin` (#3222, @yoniko) +cli: Fix tiny files passthrough (#3215, @cgbur) +cli: Fix for `-r` on empty directory (#3027, @brailovich) +cli: Fix empty string as argument for `--output-dir-*` (#3220, @embg) +cli: Fix decompression memory usage reported by `-vv --long` (#3042, @u1f35c, and #3232, @zengyijing) +cli: Fix infinite loop when empty input is passed to trainer (#3081, @terrelln) +cli: Fix `--adapt` doesn't work when `--no-progress` is also set (#3354, @terrelln) +api: Support for Block-Level Sequence Producer (#3333, @embg) +api: Support for in-place decompression (#3432, @terrelln) +api: New `ZSTD_CCtx_setCParams()` function, set all parameters defined in a `ZSTD_compressionParameters` structure (#3403, @Cyan4973) +api: Streaming decompression detects incorrect header ID sooner (#3175, @Cyan4973) +api: Window size resizing optimization for edge case (#3345, @daniellerozenblit) +api: More accurate error codes for busy-loop scenarios (#3413, #3455, @Cyan4973) +api: Fix limit overflow in `compressBound` and `decompressBound` (#3362, #3373, Cyan4973) reported by @nigeltao +api: Deprecate several advanced experimental functions: streaming (#3408, @embg), copy (#3196, @mileshu) +bug: Fix corruption that rarely occurs in 32-bit mode with wlog=25 (#3361, @terrelln) +bug: Fix for block-splitter (#3033, @Cyan4973) +bug: Fixes for Sequence Compression API (#3023, #3040, @Cyan4973) +bug: Fix leaking thread handles on Windows (#3147, @animalize) +bug: Fix timing issues with cmake/meson builds (#3166, #3167, #3170, @Cyan4973) +build: Allow user to select legacy level for cmake (#3050, @shadchin) +build: Enable legacy support by default in cmake (#3079, @niamster) +build: Meson build script improvements (#3039, #3120, #3122, #3327, #3357, @eli-schwartz and #3276, @neheb) +build: Add aarch64 to supported architectures for zstd_trace (#3054, @ooosssososos) +build: support AIX architecture (#3219, @qiongsiwu) +build: Fix `ZSTD_LIB_MINIFY` build macro, which now reduces static library size by half (#3366, @terrelln) +build: Fix Windows issues with Multithreading translation layer (#3364, #3380, @yoniko) and ARM64 target (#3320, @cwoffenden) +build: Fix `cmake` script (#3382, #3392, @terrelln and #3252 @Tachi107 and #3167 @Cyan4973) +doc: Updated man page, providing more details for `--train` mode (#3112, @Cyan4973) +doc: Add decompressor errata document (#3092, @terrelln) +misc: Enable Intel CET (#2992, #2994, @hjl-tools) +misc: Fix `contrib/` seekable format (#3058, @yhoogstrate and #3346, @daniellerozenblit) +misc: Improve speed of the one-file library generator (#3241, @wahern and #3005, @cwoffenden) + +v1.5.3 (dev version, unpublished) + v1.5.2 (Jan, 2022) perf: Regain Minimal memset()-ing During Reuse of Compression Contexts (@Cyan4973, #2969) build: Build Zstd with `noexecstack` on All Architectures (@felixhandte, #2964) @@ -19,7 +161,7 @@ build: support for m68k (Motorola 68000's), by @cyan4973 build: improved AIX support, by @Helflym build: improved meson unofficial build, by @eli-schwartz cli : custom memory limit when training dictionary (#2925), by @embg -cli : report advanced parameters information when compressing in very verbose mode (``-vv`), by @Svetlitski-FB +cli : report advanced parameters information when compressing in very verbose mode (`-vv`), by @Svetlitski-FB v1.5.0 (May 11, 2021) api: Various functions promoted from experimental to stable API: (#2579-2581, @senhuang42) @@ -86,7 +228,7 @@ api: Add Function to Generate Skippable Frame (#2439, @senhuang42) perf: New Algorithms for the Long Distance Matcher (#2483, @mpu) perf: Performance Improvements for Long Distance Matcher (#2464, @mpu) perf: Don't Shrink Window Log when Streaming with a Dictionary (#2451, @terrelln) -cli: Fix `--output-dir-mirror`'s Rejection of `..`-Containing Paths (#2512, @felixhandte) +cli: Fix `--output-dir-mirror` rejection of `..` -containing paths (#2512, @felixhandte) cli: Allow Input From Console When `-f`/`--force` is Passed (#2466, @felixhandte) cli: Improve Help Message (#2500, @senhuang42) tests: Remove Flaky Tests (#2455, #2486, #2445, @Cyan4973) @@ -373,7 +515,7 @@ misc: added /contrib/docker script by @gyscos v1.3.3 (Dec 21, 2017) perf: faster zstd_opt strategy (levels 16-19) -fix : bug #944 : multithreading with shared ditionary and large data, reported by @gsliepen +fix : bug #944 : multithreading with shared dictionary and large data, reported by @gsliepen cli : fix : content size written in header by default cli : fix : improved LZ4 format support, by @felixhandte cli : new : hidden command `-S`, to benchmark multiple files while generating one result per file diff --git a/sys/contrib/zstd/CONTRIBUTING.md b/sys/contrib/zstd/CONTRIBUTING.md deleted file mode 100644 index e7e545129e51..000000000000 --- a/sys/contrib/zstd/CONTRIBUTING.md +++ /dev/null @@ -1,489 +0,0 @@ -# Contributing to Zstandard -We want to make contributing to this project as easy and transparent as -possible. - -## Our Development Process -New versions are being developed in the "dev" branch, -or in their own feature branch. -When they are deemed ready for a release, they are merged into "release". - -As a consequences, all contributions must stage first through "dev" -or their own feature branch. - -## Pull Requests -We actively welcome your pull requests. - -1. Fork the repo and create your branch from `dev`. -2. If you've added code that should be tested, add tests. -3. If you've changed APIs, update the documentation. -4. Ensure the test suite passes. -5. Make sure your code lints. -6. If you haven't already, complete the Contributor License Agreement ("CLA"). - -## Contributor License Agreement ("CLA") -In order to accept your pull request, we need you to submit a CLA. You only need -to do this once to work on any of Facebook's open source projects. - -Complete your CLA here: - -## Workflow -Zstd uses a branch-based workflow for making changes to the codebase. Typically, zstd -will use a new branch per sizable topic. For smaller changes, it is okay to lump multiple -related changes into a branch. - -Our contribution process works in three main stages: -1. Local development - * Update: - * Checkout your fork of zstd if you have not already - ``` - git checkout https://github.com//zstd - cd zstd - ``` - * Update your local dev branch - ``` - git pull https://github.com/facebook/zstd dev - git push origin dev - ``` - * Topic and development: - * Make a new branch on your fork about the topic you're developing for - ``` - # branch names should be concise but sufficiently informative - git checkout -b - git push origin - ``` - * Make commits and push - ``` - # make some changes = - git add -u && git commit -m - git push origin - ``` - * Note: run local tests to ensure that your changes didn't break existing functionality - * Quick check - ``` - make shortest - ``` - * Longer check - ``` - make test - ``` -2. Code Review and CI tests - * Ensure CI tests pass: - * Before sharing anything to the community, create a pull request in your own fork against the dev branch - and make sure that all GitHub Actions CI tests pass. See the Continuous Integration section below for more information. - * Ensure that static analysis passes on your development machine. See the Static Analysis section - below to see how to do this. - * Create a pull request: - * When you are ready to share you changes to the community, create a pull request from your branch - to facebook:dev. You can do this very easily by clicking 'Create Pull Request' on your fork's home - page. - * From there, select the branch where you made changes as your source branch and facebook:dev - as the destination. - * Examine the diff presented between the two branches to make sure there is nothing unexpected. - * Write a good pull request description: - * While there is no strict template that our contributors follow, we would like them to - sufficiently summarize and motivate the changes they are proposing. We recommend all pull requests, - at least indirectly, address the following points. - * Is this pull request important and why? - * Is it addressing an issue? If so, what issue? (provide links for convenience please) - * Is this a new feature? If so, why is it useful and/or necessary? - * Are there background references and documents that reviewers should be aware of to properly assess this change? - * Note: make sure to point out any design and architectural decisions that you made and the rationale behind them. - * Note: if you have been working with a specific user and would like them to review your work, make sure you mention them using (@) - * Submit the pull request and iterate with feedback. -3. Merge and Release - * Getting approval: - * You will have to iterate on your changes with feedback from other collaborators to reach a point - where your pull request can be safely merged. - * To avoid too many comments on style and convention, make sure that you have a - look at our style section below before creating a pull request. - * Eventually, someone from the zstd team will approve your pull request and not long after merge it into - the dev branch. - * Housekeeping: - * Most PRs are linked with one or more Github issues. If this is the case for your PR, make sure - the corresponding issue is mentioned. If your change 'fixes' or completely addresses the - issue at hand, then please indicate this by requesting that an issue be closed by commenting. - * Just because your changes have been merged does not mean the topic or larger issue is complete. Remember - that the change must make it to an official zstd release for it to be meaningful. We recommend - that contributors track the activity on their pull request and corresponding issue(s) page(s) until - their change makes it to the next release of zstd. Users will often discover bugs in your code or - suggest ways to refine and improve your initial changes even after the pull request is merged. - -## Static Analysis -Static analysis is a process for examining the correctness or validity of a program without actually -executing it. It usually helps us find many simple bugs. Zstd uses clang's `scan-build` tool for -static analysis. You can install it by following the instructions for your OS on https://clang-analyzer.llvm.org/scan-build. - -Once installed, you can ensure that our static analysis tests pass on your local development machine -by running: -``` -make staticAnalyze -``` - -In general, you can use `scan-build` to static analyze any build script. For example, to static analyze -just `contrib/largeNbDicts` and nothing else, you can run: - -``` -scan-build make -C contrib/largeNbDicts largeNbDicts -``` - -### Pitfalls of static analysis -`scan-build` is part of our regular CI suite. Other static analyzers are not. - -It can be useful to look at additional static analyzers once in a while (and we do), but it's not a good idea to multiply the nb of analyzers run continuously at each commit and PR. The reasons are : - -- Static analyzers are full of false positive. The signal to noise ratio is actually pretty low. -- A good CI policy is "zero-warning tolerance". That means that all issues must be solved, including false positives. This quickly becomes a tedious workload. -- Multiple static analyzers will feature multiple kind of false positives, sometimes applying to the same code but in different ways leading to : - + torteous code, trying to please multiple constraints, hurting readability and therefore maintenance. Sometimes, such complexity introduce other more subtle bugs, that are just out of scope of the analyzers. - + sometimes, these constraints are mutually exclusive : if one try to solve one, the other static analyzer will complain, they can't be both happy at the same time. -- As if that was not enough, the list of false positives change with each version. It's hard enough to follow one static analyzer, but multiple ones with their own update agenda, this quickly becomes a massive velocity reducer. - -This is different from running a static analyzer once in a while, looking at the output, and __cherry picking__ a few warnings that seem helpful, either because they detected a genuine risk of bug, or because it helps expressing the code in a way which is more readable or more difficult to misuse. These kind of reports can be useful, and are accepted. - -## Continuous Integration -CI tests run every time a pull request (PR) is created or updated. The exact tests -that get run will depend on the destination branch you specify. Some tests take -longer to run than others. Currently, our CI is set up to run a short -series of tests when creating a PR to the dev branch and a longer series of tests -when creating a PR to the release branch. You can look in the configuration files -of the respective CI platform for more information on what gets run when. - -Most people will just want to create a PR with the destination set to their local dev -branch of zstd. You can then find the status of the tests on the PR's page. You can also -re-run tests and cancel running tests from the PR page or from the respective CI's dashboard. - -Almost all of zstd's CI runs on GitHub Actions (configured at `.github/workflows`), which will automatically run on PRs to your -own fork. A small number of tests run on other services (e.g. Travis CI, Circle CI, Appveyor). -These require work to set up on your local fork, and (at least for Travis CI) cost money. -Therefore, if the PR on your local fork passes GitHub Actions, feel free to submit a PR -against the main repo. - -### Third-party CI -A small number of tests cannot run on GitHub Actions, or have yet to be migrated. -For these, we use a variety of third-party services (listed below). It is not necessary to set -these up on your fork in order to contribute to zstd; however, we do link to instructions for those -who want earlier signal. - -| Service | Purpose | Setup Links | Config Path | -|-----------|------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------| -| Travis CI | Used for testing on non-x86 architectures such as PowerPC | https://docs.travis-ci.com/user/tutorial/#to-get-started-with-travis-ci-using-github
    https://github.com/marketplace/travis-ci | `.travis.yml` | -| AppVeyor | Used for some Windows testing (e.g. cygwin, mingw) | https://www.appveyor.com/blog/2018/10/02/github-apps-integration/
    https://github.com/marketplace/appveyor | `appveyor.yml` | -| Cirrus CI | Used for testing on FreeBSD | https://github.com/marketplace/cirrus-ci/ | `.cirrus.yml` | -| Circle CI | Historically was used to provide faster signal,
    but we may be able to migrate these to Github Actions | https://circleci.com/docs/2.0/getting-started/#setting-up-circleci
    https://youtu.be/Js3hMUsSZ2c
    https://circleci.com/docs/2.0/enable-checks/ | `.circleci/config.yml` | - -Note: the instructions linked above mostly cover how to set up a repository with CI from scratch. -The general idea should be the same for setting up CI on your fork of zstd, but you may have to -follow slightly different steps. In particular, please ignore any instructions related to setting up -config files (since zstd already has configs for each of these services). - -## Performance -Performance is extremely important for zstd and we only merge pull requests whose performance -landscape and corresponding trade-offs have been adequately analyzed, reproduced, and presented. -This high bar for performance means that every PR which has the potential to -impact performance takes a very long time for us to properly review. That being said, we -always welcome contributions to improve performance (or worsen performance for the trade-off of -something else). Please keep the following in mind before submitting a performance related PR: - -1. Zstd isn't as old as gzip but it has been around for time now and its evolution is -very well documented via past Github issues and pull requests. It may be the case that your -particular performance optimization has already been considered in the past. Please take some -time to search through old issues and pull requests using keywords specific to your -would-be PR. Of course, just because a topic has already been discussed (and perhaps rejected -on some grounds) in the past, doesn't mean it isn't worth bringing up again. But even in that case, -it will be helpful for you to have context from that topic's history before contributing. -2. The distinction between noise and actual performance gains can unfortunately be very subtle -especially when microbenchmarking extremely small wins or losses. The only remedy to getting -something subtle merged is extensive benchmarking. You will be doing us a great favor if you -take the time to run extensive, long-duration, and potentially cross-(os, platform, process, etc) -benchmarks on your end before submitting a PR. Of course, you will not be able to benchmark -your changes on every single processor and os out there (and neither will we) but do that best -you can:) We've adding some things to think about when benchmarking below in the Benchmarking -Performance section which might be helpful for you. -3. Optimizing performance for a certain OS, processor vendor, compiler, or network system is a perfectly -legitimate thing to do as long as it does not harm the overall performance health of Zstd. -This is a hard balance to strike but please keep in mind other aspects of Zstd when -submitting changes that are clang-specific, windows-specific, etc. - -## Benchmarking Performance -Performance microbenchmarking is a tricky subject but also essential for Zstd. We value empirical -testing over theoretical speculation. This guide it not perfect but for most scenarios, it -is a good place to start. - -### Stability -Unfortunately, the most important aspect in being able to benchmark reliably is to have a stable -benchmarking machine. A virtual machine, a machine with shared resources, or your laptop -will typically not be stable enough to obtain reliable benchmark results. If you can get your -hands on a desktop, this is usually a better scenario. - -Of course, benchmarking can be done on non-hyper-stable machines as well. You will just have to -do a little more work to ensure that you are in fact measuring the changes you've made not and -noise. Here are some things you can do to make your benchmarks more stable: - -1. The most simple thing you can do to drastically improve the stability of your benchmark is -to run it multiple times and then aggregate the results of those runs. As a general rule of -thumb, the smaller the change you are trying to measure, the more samples of benchmark runs -you will have to aggregate over to get reliable results. Here are some additional things to keep in -mind when running multiple trials: - * How you aggregate your samples are important. You might be tempted to use the mean of your - results. While this is certainly going to be a more stable number than a raw single sample - benchmark number, you might have more luck by taking the median. The mean is not robust to - outliers whereas the median is. Better still, you could simply take the fastest speed your - benchmark achieved on each run since that is likely the fastest your process will be - capable of running your code. In our experience, this (aggregating by just taking the sample - with the fastest running time) has been the most stable approach. - * The more samples you have, the more stable your benchmarks should be. You can verify - your improved stability by looking at the size of your confidence intervals as you - increase your sample count. These should get smaller and smaller. Eventually hopefully - smaller than the performance win you are expecting. - * Most processors will take some time to get `hot` when running anything. The observations - you collect during that time period will very different from the true performance number. Having - a very large number of sample will help alleviate this problem slightly but you can also - address is directly by simply not including the first `n` iterations of your benchmark in - your aggregations. You can determine `n` by simply looking at the results from each iteration - and then hand picking a good threshold after which the variance in results seems to stabilize. -2. You cannot really get reliable benchmarks if your host machine is simultaneously running -another cpu/memory-intensive application in the background. If you are running benchmarks on your -personal laptop for instance, you should close all applications (including your code editor and -browser) before running your benchmarks. You might also have invisible background applications -running. You can see what these are by looking at either Activity Monitor on Mac or Task Manager -on Windows. You will get more stable benchmark results of you end those processes as well. - * If you have multiple cores, you can even run your benchmark on a reserved core to prevent - pollution from other OS and user processes. There are a number of ways to do this depending - on your OS: - * On linux boxes, you have use https://github.com/lpechacek/cpuset. - * On Windows, you can "Set Processor Affinity" using https://www.thewindowsclub.com/processor-affinity-windows - * On Mac, you can try to use their dedicated affinity API https://developer.apple.com/library/archive/releasenotes/Performance/RN-AffinityAPI/#//apple_ref/doc/uid/TP40006635-CH1-DontLinkElementID_2 -3. To benchmark, you will likely end up writing a separate c/c++ program that will link libzstd. -Dynamically linking your library will introduce some added variation (not a large amount but -definitely some). Statically linking libzstd will be more stable. Static libraries should -be enabled by default when building zstd. -4. Use a profiler with a good high resolution timer. See the section below on profiling for -details on this. -5. Disable frequency scaling, turbo boost and address space randomization (this will vary by OS) -6. Try to avoid storage. On some systems you can use tmpfs. Putting the program, inputs and outputs on -tmpfs avoids touching a real storage system, which can have a pretty big variability. - -Also check our LLVM's guide on benchmarking here: https://llvm.org/docs/Benchmarking.html - -### Zstd benchmark -The fastest signal you can get regarding your performance changes is via the in-build zstd cli -bench option. You can run Zstd as you typically would for your scenario using some set of options -and then additionally also specify the `-b#` option. Doing this will run our benchmarking pipeline -for that options you have just provided. If you want to look at the internals of how this -benchmarking script works, you can check out programs/benchzstd.c - -For example: say you have made a change that you believe improves the speed of zstd level 1. The -very first thing you should use to asses whether you actually achieved any sort of improvement -is `zstd -b`. You might try to do something like this. Note: you can use the `-i` option to -specify a running time for your benchmark in seconds (default is 3 seconds). -Usually, the longer the running time, the more stable your results will be. - -``` -$ git checkout -$ make && cp zstd zstd-old -$ git checkout -$ make && cp zstd zstd-new -$ zstd-old -i5 -b1 - 1 : 8990 -> 3992 (2.252), 302.6 MB/s , 626.4 MB/s -$ zstd-new -i5 -b1 - 1 : 8990 -> 3992 (2.252), 302.8 MB/s , 628.4 MB/s -``` - -Unless your performance win is large enough to be visible despite the intrinsic noise -on your computer, benchzstd alone will likely not be enough to validate the impact of your -changes. For example, the results of the example above indicate that effectively nothing -changed but there could be a small <3% improvement that the noise on the host machine -obscured. So unless you see a large performance win (10-15% consistently) using just -this method of evaluation will not be sufficient. - -### Profiling -There are a number of great profilers out there. We're going to briefly mention how you can -profile your code using `instruments` on mac, `perf` on linux and `visual studio profiler` -on windows. - -Say you have an idea for a change that you think will provide some good performance gains -for level 1 compression on Zstd. Typically this means, you have identified a section of -code that you think can be made to run faster. - -The first thing you will want to do is make sure that the piece of code is actually taking up -a notable amount of time to run. It is usually not worth optimizing something which accounts for less than -0.0001% of the total running time. Luckily, there are tools to help with this. -Profilers will let you see how much time your code spends inside a particular function. -If your target code snippet is only part of a function, it might be worth trying to -isolate that snippet by moving it to its own function (this is usually not necessary but -might be). - -Most profilers (including the profilers discussed below) will generate a call graph of -functions for you. Your goal will be to find your function of interest in this call graph -and then inspect the time spent inside of it. You might also want to to look at the -annotated assembly which most profilers will provide you with. - -#### Instruments -We will once again consider the scenario where you think you've identified a piece of code -whose performance can be improved upon. Follow these steps to profile your code using -Instruments. - -1. Open Instruments -2. Select `Time Profiler` from the list of standard templates -3. Close all other applications except for your instruments window and your terminal -4. Run your benchmarking script from your terminal window - * You will want a benchmark that runs for at least a few seconds (5 seconds will - usually be long enough). This way the profiler will have something to work with - and you will have ample time to attach your profiler to this process:) - * I will just use benchzstd as my bencharmking script for this example: -``` -$ zstd -b1 -i5 # this will run for 5 seconds -``` -5. Once you run your benchmarking script, switch back over to instruments and attach your -process to the time profiler. You can do this by: - * Clicking on the `All Processes` drop down in the top left of the toolbar. - * Selecting your process from the dropdown. In my case, it is just going to be labeled - `zstd` - * Hitting the bright red record circle button on the top left of the toolbar -6. You profiler will now start collecting metrics from your benchmarking script. Once -you think you have collected enough samples (usually this is the case after 3 seconds of -recording), stop your profiler. -7. Make sure that in toolbar of the bottom window, `profile` is selected. -8. You should be able to see your call graph. - * If you don't see the call graph or an incomplete call graph, make sure you have compiled - zstd and your benchmarking script using debug flags. On mac and linux, this just means - you will have to supply the `-g` flag alone with your build script. You might also - have to provide the `-fno-omit-frame-pointer` flag -9. Dig down the graph to find your function call and then inspect it by double clicking -the list item. You will be able to see the annotated source code and the assembly side by -side. - -#### Perf - -This wiki has a pretty detailed tutorial on getting started working with perf so we'll -leave you to check that out of you're getting started: - -https://perf.wiki.kernel.org/index.php/Tutorial - -Some general notes on perf: -* Use `perf stat -r # ` to quickly get some relevant timing and -counter statistics. Perf uses a high resolution timer and this is likely one -of the first things your team will run when assessing your PR. -* Perf has a long list of hardware counters that can be viewed with `perf --list`. -When measuring optimizations, something worth trying is to make sure the hardware -counters you expect to be impacted by your change are in fact being so. For example, -if you expect the L1 cache misses to decrease with your change, you can look at the -counter `L1-dcache-load-misses` -* Perf hardware counters will not work on a virtual machine. - -#### Visual Studio - -TODO - -## Issues -We use GitHub issues to track public bugs. Please ensure your description is -clear and has sufficient instructions to be able to reproduce the issue. - -Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe -disclosure of security bugs. In those cases, please go through the process -outlined on that page and do not file a public issue. - -## Coding Style -It's a pretty long topic, which is difficult to summarize in a single paragraph. -As a rule of thumbs, try to imitate the coding style of -similar lines of codes around your contribution. -The following is a non-exhaustive list of rules employed in zstd code base: - -### C90 -This code base is following strict C90 standard, -with 2 extensions : 64-bit `long long` types, and variadic macros. -This rule is applied strictly to code within `lib/` and `programs/`. -Sub-project in `contrib/` are allowed to use other conventions. - -### C++ direct compatibility : symbol mangling -All public symbol declarations must be wrapped in `extern “C” { … }`, -so that this project can be compiled as C++98 code, -and linked into C++ applications. - -### Minimal Frugal -This design requirement is fundamental to preserve the portability of the code base. -#### Dependencies -- Reduce dependencies to the minimum possible level. - Any dependency should be considered “bad” by default, - and only tolerated because it provides a service in a better way than can be achieved locally. - The only external dependencies this repository tolerates are - standard C libraries, and in rare cases, system level headers. -- Within `lib/`, this policy is even more drastic. - The only external dependencies allowed are ``, ``, ``, - and even then, not directly. - In particular, no function shall ever allocate on heap directly, - and must use instead `ZSTD_malloc()` and equivalent. - Other accepted non-symbol headers are `` and ``. -- Within the project, there is a strict hierarchy of dependencies that must be respected. - `programs/` is allowed to depend on `lib/`, but only its public API. - Within `lib/`, `lib/common` doesn't depend on any other directory. - `lib/compress` and `lib/decompress` shall not depend on each other. - `lib/dictBuilder` can depend on `lib/common` and `lib/compress`, but not `lib/decompress`. -#### Resources -- Functions in `lib/` must use very little stack space, - several dozens of bytes max. - Everything larger must use the heap allocator, - or require a scratch buffer to be emplaced manually. - -### Naming -* All public symbols are prefixed with `ZSTD_` - + private symbols, with a scope limited to their own unit, are free of this restriction. - However, since `libzstd` source code can be amalgamated, - each symbol name must attempt to be (and remain) unique. - Avoid too generic names that could become ground for future collisions. - This generally implies usage of some form of prefix. -* For symbols (functions and variables), naming convention is `PREFIX_camelCase`. - + In some advanced cases, one can also find : - - `PREFIX_prefix2_camelCase` - - `PREFIX_camelCase_extendedQualifier` -* Multi-words names generally consist of an action followed by object: - - for example : `ZSTD_createCCtx()` -* Prefer positive actions - - `goBackward` rather than `notGoForward` -* Type names (`struct`, etc.) follow similar convention, - except that they are allowed and even invited to start by an Uppercase letter. - Example : `ZSTD_CCtx`, `ZSTD_CDict` -* Macro names are all Capital letters. - The same composition rules (`PREFIX_NAME_QUALIFIER`) apply. -* File names are all lowercase letters. - The convention is `snake_case`. - File names **must** be unique across the entire code base, - even when they stand in clearly separated directories. - -### Qualifiers -* This code base is `const` friendly, if not `const` fanatical. - Any variable that can be `const` (aka. read-only) **must** be `const`. - Any pointer which content will not be modified must be `const`. - This property is then controlled at compiler level. - `const` variables are an important signal to readers that this variable isn’t modified. - Conversely, non-const variables are a signal to readers to watch out for modifications later on in the function. -* If a function must be inlined, mention it explicitly, - using project's own portable macros, such as `FORCE_INLINE_ATTR`, - defined in `lib/common/compiler.h`. - -### Debugging -* **Assertions** are welcome, and should be used very liberally, - to control any condition the code expects for its correct execution. - These assertion checks will be run in debug builds, and disabled in production. -* For traces, this project provides its own debug macros, - in particular `DEBUGLOG(level, ...)`, defined in `lib/common/debug.h`. - -### Code documentation -* Avoid code documentation that merely repeats what the code is already stating. - Whenever applicable, prefer employing the code as the primary way to convey explanations. - Example 1 : `int nbTokens = n;` instead of `int i = n; /* i is a nb of tokens *./`. - Example 2 : `assert(size > 0);` instead of `/* here, size should be positive */`. -* At declaration level, the documentation explains how to use the function or variable - and when applicable why it's needed, of the scenarios where it can be useful. -* At implementation level, the documentation explains the general outline of the algorithm employed, - and when applicable why this specific choice was preferred. - -### General layout -* 4 spaces for indentation rather than tabs -* Code documentation shall directly precede function declaration or implementation -* Function implementations and its code documentation should be preceded and followed by an empty line - - -## License -By contributing to Zstandard, you agree that your contributions will be licensed -under both the [LICENSE](LICENSE) file and the [COPYING](COPYING) file in the root directory of this source tree. diff --git a/sys/contrib/zstd/FREEBSD-Xlist b/sys/contrib/zstd/FREEBSD-Xlist index f39005add49f..7d87acac5f4a 100644 --- a/sys/contrib/zstd/FREEBSD-Xlist +++ b/sys/contrib/zstd/FREEBSD-Xlist @@ -1,10 +1,19 @@ -.circleci +*/BUCK +.buckconfig +.buckversion .cirrus.yml .github .gitignore .travis.yml +CODE_OF_CONDUCT.md +CONTRIBUTING.md +Makefile +Package.swift +TESTING.md build contrib +doc +examples lib/dll programs/windres tests diff --git a/sys/contrib/zstd/LICENSE b/sys/contrib/zstd/LICENSE index a793a8028925..75800288cc24 100644 --- a/sys/contrib/zstd/LICENSE +++ b/sys/contrib/zstd/LICENSE @@ -2,7 +2,7 @@ BSD License For Zstandard software -Copyright (c) 2016-present, Facebook, Inc. All rights reserved. +Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -14,9 +14,9 @@ are permitted provided that the following conditions are met: this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name Facebook nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. + * Neither the name Facebook, nor Meta, nor the names of its contributors may + be used to endorse or promote products derived from this software without *** 60802 LINES SKIPPED *** From nobody Thu May 7 05:02:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gB0W156Wxz6dTFm for ; Thu, 07 May 2026 05:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gB0W12pXjz3w43 for ; Thu, 07 May 2026 05:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uyMYxGBUz1wm9yILqHYCdL13u3dXIhOVZBHwqLXvPco=; b=uZ/ZZauScS2hMURKoNTooEmiSOfKupqCklc7WPVna73ufNNUptMGEZ2ejJgrBSIUGk5x1Y XUx8NbNOHZTx1wBIsnnsRzZtrGYWDOhmcOn9Fm+afVm8xSnhkP50hDkQnNM9wvm6lpuQ2d qMpTx2LVRfV1Sh/0OjWtnI5KzbNX0Loh1L/8UMYua1ZjVYxbT9OKZPP1o4Bd90e9KcNIiQ W8/bWdCs3tpI5KszlJAqRGybKvQKyBFRqQLwFEb4kopREaO9neWVhsTro2+u3z6DGO6tMH CDMjNKVHL2lnjvAbkKo2t3qCFbeWK3fuUAYo9XWjjWZHzFQTylQ/+mIOJ/NXUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778130173; a=rsa-sha256; cv=none; b=b+wx44sxW6pe1GO7Ekh37uOCMZKru047kn+ulkSgy41ZTju7+9DhKR1XL3pP0JITeZndfK VWt5lo61ICiXBPW8rvc3nCeaowhrKQPYNe37JNAqvIF14ING4hq0A0S4ettsQguEioRuLh h3j/xsmwrVr8JK8n9dIatBQq9S75qTh6/zWmBH4q2MW97Jp8ZE9ld2+HBcr2FI5VGLOS+Z HDnYeoS2Rw10l5EvJ0cdokfeDi0Kc8otW1dM85YfV/LMtr6Q5XIii6ztg+ZvKKXTvPE6AY AaQMAzmXHd+p92lVlm5NO6IKPwfDVwe4UZFtRxHvJ0NJF6ywXa3DgC1l8KQJTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uyMYxGBUz1wm9yILqHYCdL13u3dXIhOVZBHwqLXvPco=; b=WR8pmL9bIMhrCV1Sfc7sU/wQBUVNCr1WcdZsZKk/blncf2qAeRXFmt69bN5TvBSjhZREOs gcWcvwEJoWIu/RVHI9iVthwEviyPGpDUENLr+tJ5ry83FLGgQ+tkLZuovHiOpxA7dM0Cpc cTlXkyUbbx2mT1gh91WB/ZyBNJSrkjO6E0zdZZPp2sO6Jb9RNfaiKCdbGuESGDWo+ZM16W 70B39FL/JOpW3pfZEiqZQ/Xu4e0o3Idk5JUuQCBBtLEmi5h+AyzAzLmKF5tJQLMPCP/pkO dbvyanku2DlHfCC5+4j0HHGPbEjLBdWt2kcmJCDmi7XR1/NtSirTlF5RYn2uhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB0W12KTkz19gn for ; Thu, 07 May 2026 05:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 370e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 05:02:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: 3fe5069ce2bf - main - virtio_p9fs: Fix kernel panic on module unload List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fe5069ce2bf5b2702f3be6531ce6a05c584e64d Auto-Submitted: auto-generated Date: Thu, 07 May 2026 05:02:53 +0000 Message-Id: <69fc1cfd.370e5.2296ef7f@gitrepo.freebsd.org> The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=3fe5069ce2bf5b2702f3be6531ce6a05c584e64d commit 3fe5069ce2bf5b2702f3be6531ce6a05c584e64d Author: Alex Richardson AuthorDate: 2026-05-07 04:21:23 +0000 Commit: Alex Richardson CommitDate: 2026-05-07 04:23:03 +0000 virtio_p9fs: Fix kernel panic on module unload The virtio_p9fs module event handler can be invoked multiple times. Previously, this caused p9_init_zones() and p9_register_trans() to be executed multiple times, leaking UMA zones and corrupting the transport list. During module unload, p9_destroy_zones() was also called multiple times on the same zone pointers, triggering a duplicate free kernel panic in uma_zdestroy(). This patch introduces a static reference counter in vt9p_modevent() to ensure the zones and transports are only initialized and destroyed exactly once, aligning with the approach used by other virtio drivers like vtnet. Reviewed by: kib, markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56497 --- sys/dev/virtio/p9fs/virtio_p9fs.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/dev/virtio/p9fs/virtio_p9fs.c b/sys/dev/virtio/p9fs/virtio_p9fs.c index 2b276a60aa9a..f76b135c042d 100644 --- a/sys/dev/virtio/p9fs/virtio_p9fs.c +++ b/sys/dev/virtio/p9fs/virtio_p9fs.c @@ -464,16 +464,22 @@ static int vt9p_modevent(module_t mod, int type, void *unused) { int error; + static int loaded = 0; error = 0; switch (type) { case MOD_LOAD: - p9_init_zones(); - p9_register_trans(&vt9p_trans); + if (loaded++ == 0) { + p9_init_zones(); + p9_register_trans(&vt9p_trans); + } break; case MOD_UNLOAD: - p9_destroy_zones(); + if (--loaded == 0) { + p9_unregister_trans(&vt9p_trans); + p9_destroy_zones(); + } break; case MOD_SHUTDOWN: break; From nobody Thu May 7 05:02:54 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gB0W30tMWz6dSxZ for ; Thu, 07 May 2026 05:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gB0W24X28z3w47 for ; Thu, 07 May 2026 05:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gQXijSTwGBB3wG2Z/w1rIgba5WaHjrXZsYry1ZcisfY=; b=SI1RHGmk9TJl75CS8dIW4W2ra87rpqIxA0pOhn7sQpfkO9ahtO6KJiKmbxplT7/l4MAtv1 yVMKr+Mp4X+8RujzL5o8fOPMZeE8v9cdJ/Vb2Ena9JExQhg8I2d+XTyt1IS+v8FWI8fbU4 Ke8/TvM1Pv8EKvs4PXydW+TzeU6Z0F5+zJ/i5a8++ZBoW8BSNdpYRsAAkXXMJMNTTNYTSe dcaG5UOZr/r4jUVn3e4w8X5N4zhc20TrpEDgoM1L7WXFMDUzHgqRb+43eOBHejVwUh1Kz1 jRNzeHegFACSKguScexNHn2uRJl/wYMfrpUJZw3Eoy4uHAvjmD1PCmvNmRtEZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778130174; a=rsa-sha256; cv=none; b=Q40HQ+BIwgKXV3RyBrWms9sO34oAGUGEg6TA37cxlC6uc0zG7pqdMls5GnIxwyfiK/8kwv /WPkXyT1FNsEl5KiUKbIhpEZhPos+teVZ+l6/tOaaDMWu7XwApLFfb+zlGGDGz02QglPeN AgLBabXtbarFmbDkSVzoxHGy4nqefTT93En5kI3GNXSGCGxUErBgZi3gSu6mz+lOt4evRP rRg/x1jhJV2+681gtICCdEd2I6XA+jCUWaSKr0jUhybby1GflkejVOb7D3uk7swWG9VqVS XT5W3QCKXEFToKnZg4PDNuW4RQW3WSFYRaTkHB+Gja10MO/YXLP31jIfZiUs+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gQXijSTwGBB3wG2Z/w1rIgba5WaHjrXZsYry1ZcisfY=; b=l1UlBsJs3mMAcOgzQxoxzD3qPVKvRy2sniRwIcW8GQC5VZng1f/+SK5Mt0D6gLXgaRXmW4 SFIYP1MvOghJI5/uVeMzoDVaudHU8DXOEQ7MSPUoS75ytvw+7TV6In5J1NZlgcrMIxa6I6 JIJSXcAF8HLC35KBRX9aEvy/os7V9buK7vuSkr6SB9Jxt5UPHoqheKpzp3bUMZUBfs7J+V iyUqKz4u6Fj8DKpKl2eGAYtEbFW329pSE+4i+FpQUt+XiXtk5j8OcUimQvpIZvLYr2QFnq PvglSMvuGAGlmn2wG6C24c5/yvvHzahWXR6j9+J2tVxonRFeoxhWmd9bxfechw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB0W23kRRz19yk for ; Thu, 07 May 2026 05:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35f34 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 05:02:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: 1ed2ef42e017 - main - p9fs: Move UMA zone initialization to VFS module lifecycle List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ed2ef42e01771f5d8ca9be61e07dcf0fd47feba Auto-Submitted: auto-generated Date: Thu, 07 May 2026 05:02:54 +0000 Message-Id: <69fc1cfe.35f34.2afae8bd@gitrepo.freebsd.org> The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=1ed2ef42e01771f5d8ca9be61e07dcf0fd47feba commit 1ed2ef42e01771f5d8ca9be61e07dcf0fd47feba Author: Alex Richardson AuthorDate: 2026-05-07 04:21:50 +0000 Commit: Alex Richardson CommitDate: 2026-05-07 04:23:04 +0000 p9fs: Move UMA zone initialization to VFS module lifecycle Previously, the UMA zones required for 9P requests (p9fs_buf_zone, p9fs_req_zone, etc.) were initialized and destroyed in the virtio_p9fs transport module. This caused issues when unloading the core p9fs module. This change moves p9_init_zones() and p9_destroy_zones() into p9fs_init() and p9fs_uninit() inside p9fs_vfsops.c so that they are correctly bound to the VFS filesystem module lifecycle via vfs_modevent, aligning p9fs with standard FreeBSD VFS semantics. Found while fixing https://github.com/CTSRD-CHERI/cheribsd/issues/2617. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56492 --- sys/dev/virtio/p9fs/virtio_p9fs.c | 3 +-- sys/fs/p9fs/p9fs_vfsops.c | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/dev/virtio/p9fs/virtio_p9fs.c b/sys/dev/virtio/p9fs/virtio_p9fs.c index f76b135c042d..19a32fea458e 100644 --- a/sys/dev/virtio/p9fs/virtio_p9fs.c +++ b/sys/dev/virtio/p9fs/virtio_p9fs.c @@ -471,14 +471,12 @@ vt9p_modevent(module_t mod, int type, void *unused) switch (type) { case MOD_LOAD: if (loaded++ == 0) { - p9_init_zones(); p9_register_trans(&vt9p_trans); } break; case MOD_UNLOAD: if (--loaded == 0) { p9_unregister_trans(&vt9p_trans); - p9_destroy_zones(); } break; case MOD_SHUTDOWN: @@ -487,6 +485,7 @@ vt9p_modevent(module_t mod, int type, void *unused) error = EOPNOTSUPP; break; } + return (error); } diff --git a/sys/fs/p9fs/p9fs_vfsops.c b/sys/fs/p9fs/p9fs_vfsops.c index 0e09c58e57b6..a0f0a5a4e494 100644 --- a/sys/fs/p9fs/p9fs_vfsops.c +++ b/sys/fs/p9fs/p9fs_vfsops.c @@ -119,6 +119,8 @@ p9fs_init(struct vfsconf *vfsp) p9fs_io_buffer_zone = uma_zcreate("p9fs io_buffer zone", P9FS_MTU, NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + p9_init_zones(); + return (0); } @@ -127,6 +129,8 @@ static int p9fs_uninit(struct vfsconf *vfsp) { + p9_destroy_zones(); + uma_zdestroy(p9fs_node_zone); uma_zdestroy(p9fs_io_buffer_zone); uma_zdestroy(p9fs_getattr_zone); From nobody Thu May 7 05:02:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gB0W43m78z6dSvY for ; Thu, 07 May 2026 05:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gB0W35Chgz3vlT for ; Thu, 07 May 2026 05:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=32RCz/jlZOMPsR+cpxuzQo3PcH5s9RQ6Elt+Kq6yEvc=; b=L227mHiTs2Ac2lhpK83fTJD83+AA8IO0ogg8rzJZYXJ9uNDy7HI2kjvUbSIi0HSs+wMYrY asPORxHyUIn2IlHPzXIblgKbNXa2GnleNG0FGy/uClt8+0kKV5y1/1aR3nvd5k4EdNVWva SXIzS/AXAfEigV6kr3jzTEI6r6vLd9C7Zadu5uW7Wk+J6JTusq0lTlT5fmiqZhN6VJSOI0 jUrsF7O1hmP4p7XWbT4i9HnxSIeTYy/YS4baRgzGQyoghM4GDJtIwzIiCnwJJtl5lAM26Q 03OPmCYzQ/vWPwhqAtUWSebQIxCexdifwxRCi1oZIjEmENvQSwAGSRluROdkbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778130175; a=rsa-sha256; cv=none; b=NxVgp3Cpo7H/tTUtYWlguOAr22nqvKv5GC/lEFVeLf6RaG5F/z98ykpHmKWqdWJwSiVf3H prrFPDyZCd6zibCeWnm32GzAeS19Rc/vlVZ/xyCdjvao9CX4XyoONfSSoy5P+hb1/NJ25u 7fDDG8i/yPrDYfFuyT+x7DUdsm+8mzbzBPCbteE6vR8PWdpjV5SHD+slLjxf1Uwwx1LVvd nviqu9jt8AV5ARgo435YAfB0uK/STNcTysUf7CY1KI6lxzIZIi2bIrRBc0xjF07QygN1Cz PqDqJPom9jYZjivjNJDpOWs4+venSERA1hkGu1Utp9yiQKZHtCwd+AXnZAkWBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=32RCz/jlZOMPsR+cpxuzQo3PcH5s9RQ6Elt+Kq6yEvc=; b=cpxoBPQsHCaF2qC4OLUoUjiJRET4ZSkDLjcNHsySCSZJVclf/ZtWC7OSnnrw/miyO7sO31 PlepZSCr0IK5bq7fov0eeBp4YsZKgq8JHmxxWJmpDTEU4DVy4tWLZwWZk0vUI0ivQNSmQ7 q8aWdpRCWiMVQH8vVyGub+nOSDNt4CDG7sogbwLEeBNywNc8o0lKaDFd+HKb0PBP+0eLpb HTTRb1jaS5wV01IbaMWF7zKCLV8DbSZhK4NMeT9/qzeki91KKDJoeiSXn5PEg8Y4SscHfa Z47bmFr7SHgXNskAPhRNwn+ihwTEzqqRYLH5rD/uCBl2fKcme29ztU1Xt5FheQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB0W33zFJz1B8j for ; Thu, 07 May 2026 05:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 348c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 05:02:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: 96b2f4a91241 - main - p9fs: implement basic pathconf support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96b2f4a9124158f27c4c27c32f6fa1a6018250fb Auto-Submitted: auto-generated Date: Thu, 07 May 2026 05:02:55 +0000 Message-Id: <69fc1cff.348c0.5473ab52@gitrepo.freebsd.org> The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=96b2f4a9124158f27c4c27c32f6fa1a6018250fb commit 96b2f4a9124158f27c4c27c32f6fa1a6018250fb Author: Alex Richardson AuthorDate: 2026-05-07 04:22:23 +0000 Commit: Alex Richardson CommitDate: 2026-05-07 04:23:04 +0000 p9fs: implement basic pathconf support This is needed for various pjdfstest tests which fail with syntax errors if pathconf _PC_NAME_MAX/_PC_PATH_MAX return -1. For NAME_MAX we can use the 9P2000.L Tstatfs call to get namelen from the host. While this could theoretically be different for nested filesystems in the shared mount it is a much better guess than just returning 255. There does not seem to be a way to get the host PATH_MAX, so we just return the conservative kernel default. Found while fixing https://github.com/CTSRD-CHERI/cheribsd/issues/2617. Reviewed by: markj, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56493 --- sys/fs/p9fs/p9fs.h | 1 + sys/fs/p9fs/p9fs_vnops.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/sys/fs/p9fs/p9fs.h b/sys/fs/p9fs/p9fs.h index 2470734fef4d..b469495ef69e 100644 --- a/sys/fs/p9fs/p9fs.h +++ b/sys/fs/p9fs/p9fs.h @@ -154,6 +154,7 @@ struct p9fs_session { struct mtx p9fs_mtx; /* mutex used for guarding the chain.*/ STAILQ_HEAD( ,p9fs_node) virt_node_list; /* list of p9fs nodes in this session*/ struct p9_fid *mnt_fid; /* to save nobody 's fid for unmounting as root user */ + unsigned int name_max; /* cached max filename length */ }; struct p9fs_mount { diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c index 7141e9700602..ad739a219acb 100644 --- a/sys/fs/p9fs/p9fs_vnops.c +++ b/sys/fs/p9fs/p9fs_vnops.c @@ -37,10 +37,12 @@ #include #include #include -#include -#include #include +#include +#include +#include #include +#include #include #include @@ -2248,6 +2250,72 @@ p9fs_delayed_setsize(struct vop_delayed_setsize_args *ap) return (0); } +static unsigned int +p9fs_get_name_max(struct p9fs_node *np) +{ + struct p9fs_session *vses = np->p9fs_ses; + struct p9_statfs statfs; + struct p9_fid *vfid; + unsigned int name_max; + int error = 0; + + name_max = atomic_load_int(&vses->name_max); + if (name_max != 0) + return (name_max); + + P9_DEBUG(VOPS, "%s: querying _PC_NAME_MAX\n", __func__); + vfid = p9fs_get_fid(vses->clnt, np, NULL, VFID, -1, &error); + if (vfid != NULL) { + error = p9_client_statfs(vfid, &statfs); + if (error == 0) { + /* + * Note that this is not strictly correct if you have + * nested mounts on the host (e.g. when using qemu with + * multidevs=remap), but is a better estimate than just + * returning 255. + */ + name_max = statfs.namelen; + } + } + P9_DEBUG(VOPS, "%s: max_name=%u error=%d\n", __func__, name_max, error); + if (error != 0 || name_max == 0) { + printf("p9fs: warning: failed to query name_max (error %d), " + "using fallback %d\n", error, NAME_MAX); + name_max = NAME_MAX; /* fallback and prevent retrying */ + } + atomic_store_int(&vses->name_max, name_max); + return (name_max); +} + +/* + * Return POSIX pathconf information applicable to p9fs filesystems. + */ +static int +p9fs_pathconf(struct vop_pathconf_args *ap) +{ + int error = 0; + struct vnode *vp = ap->a_vp; + struct p9fs_node *np = P9FS_VTON(vp); + + switch (ap->a_name) { + case _PC_NAME_MAX: + *ap->a_retval = p9fs_get_name_max(np); + break; + case _PC_SYMLINK_MAX: + case _PC_PATH_MAX: + /* + * These are conservative estimates, the real value depends on + * the host file system. + */ + *ap->a_retval = MAXPATHLEN; + break; + default: + error = vop_stdpathconf(ap); + break; + } + return (error); +} + struct vop_vector p9fs_vnops = { .vop_default = &default_vnodeops, .vop_lookup = p9fs_lookup, @@ -2257,6 +2325,7 @@ struct vop_vector p9fs_vnops = { .vop_delayed_setsize = p9fs_delayed_setsize, .vop_getattr = p9fs_getattr_dotl, .vop_setattr = p9fs_setattr_dotl, + .vop_pathconf = p9fs_pathconf, .vop_reclaim = p9fs_reclaim, .vop_inactive = p9fs_inactive, .vop_readdir = p9fs_readdir, From nobody Thu May 7 05:02:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gB0W50Y3xz6dTFs for ; Thu, 07 May 2026 05:02:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gB0W45Hxpz3wGB for ; Thu, 07 May 2026 05:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wCXb5ub4O7XzugdwfxzAKTTgx3WIqPzPSAoyK//yRK0=; b=GlWGD5bHkLukksIyMrj5bg2oKIinSb0a8V3FFERdWENKfTjMeuzmBn4tzwW4CZpkxE4BgH 20BsMCtQUaYsrVIYDZJygdDw3jMNFW31f7XcYRpnFgnZrTOr6PhUAp1I1NMOk3/cugeIaB o7sBTC/Pz1FwPQQRmZOPTHPot4efUaTxSrJtOWlznNAvncwv8WR3I0aPei5SGcqZBOXsf2 LhjbRLBuAO3TDUOYU5WOlqCz3P5tczl30GId5B3+1lwyJ6mYZ3mEPRHo2aJ7uxTRj/Za1T jPWtXJAvj7nB6M0mg0fRs3voCFtNGofs/J8mS4INGU7JW1Shgmon2a48nOB9yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778130176; a=rsa-sha256; cv=none; b=vJRtCoQWW3qJbmSQYPxmVVPxtMXxH2Qq0ZTOUyGdduXWmxUW/RO5i9mRwCIhLQs4rEOCu4 tmL6oJAaVOXzmIBSWwKSMApmEy4VcY8qFsfRuXXi+kcTCZmu3eXqgxcmhDu7FPVbxWT9sS 2dZvg4+8xCcf3wE4q6J1RVMipywPtqJtrpS72B8v/7oyYh2zl/On4SihQIBWCinqWU5nBY uKHOt4NmPAfLkJC08RuRnqq7Hqg6hmgmY7eaMlFOuXLRBMIkQYYeiQliDD/zEGLt7o86k2 0QtutVoVmwG/54dFdlawXNNC/UdBH+/TUols3jS7nOPN0IdCiiVxUMc6GIFCTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wCXb5ub4O7XzugdwfxzAKTTgx3WIqPzPSAoyK//yRK0=; b=az5i2n3p0oQLqEbNQ8O4XyJiZ/vpsAXBchiqdRkTOvdSwEkqppubzYr018X9A4YWYoeRzH saAgAMe67hrbhDFgTRGIPnWtpFWryWuB+ZXhpfEpwcDt+Z7aVBflO34v1MOZifyowemm8h j3i0rHE1SIPZH+7QcB3rUXsoQ43EuLY5NGQinlz8PigVW2D4gJu9xjxwned7SNmKCzAWsn Nul0RP9mWlS2oP+eaeolx/sbM0kvK9NiC2bsUNAbcfSbq/yw+CfPFlZOzOcKUzlK84C00F K4+zA01zAZSo3tDjLSRCRS9HoNwD2hQH5rJaBSkVhhzCnWU4/boAZBa6+1Ao9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB0W44mqRz19ym for ; Thu, 07 May 2026 05:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35f30 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 05:02:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: 40d59ee35dc1 - main - p9fs: Fix creating files with restrictive permissions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40d59ee35dc106cda88d66e37527975a32596cd7 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 05:02:56 +0000 Message-Id: <69fc1d00.35f30.e0202b2@gitrepo.freebsd.org> The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=40d59ee35dc106cda88d66e37527975a32596cd7 commit 40d59ee35dc106cda88d66e37527975a32596cd7 Author: Alex Richardson AuthorDate: 2026-05-07 04:23:27 +0000 Commit: Alex Richardson CommitDate: 2026-05-07 04:23:28 +0000 p9fs: Fix creating files with restrictive permissions When a file is created via p9fs with restrictive permissions (like 000), the 9P TCREATE request successfully creates and natively opens the file, returning an open, writable file descriptor. Previously, p9fs would attempt a subsequent TOPEN. That TOPEN would fail with EACCES due to the restrictive mode, leaving a 0-byte file and causing operations like 'mv' to abort. We now preserve the writable descriptor returned by TCREATE so that the subsequent VOP_OPEN can use it directly, avoiding the failing TOPEN. Additionally, p9fs_compatible_mode now appropriately isolates the base access intent when matching fids, preventing extended flags from breaking the match. A test case for this behavior has been submitted to pjdfstest: https://github.com/pjd/pjdfstest/pull/87 Resolves: https://github.com/CTSRD-CHERI/cheribsd/issues/2617 Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56494 --- sys/fs/p9fs/p9fs_subr.c | 14 +++++++++----- sys/fs/p9fs/p9fs_vnops.c | 24 +++++++++++++++++++++++- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/sys/fs/p9fs/p9fs_subr.c b/sys/fs/p9fs/p9fs_subr.c index d0f04f6c5e97..f66e7a171029 100644 --- a/sys/fs/p9fs/p9fs_subr.c +++ b/sys/fs/p9fs/p9fs_subr.c @@ -275,16 +275,20 @@ p9fs_compatible_mode(struct p9_fid *fid, int mode) { /* * Return TRUE for an exact match. For OREAD and OWRITE, allow - * existing ORDWR fids to match. Only check the low two bits - * of mode. + * existing ORDWR fids to match. * - * TODO: figure out if this is correct for O_APPEND + * We mask both the requested mode and the existing fid's mode + * with 3 (0b11) to isolate the base access intent (O_RDONLY, + * O_WRONLY, or O_RDWR). This prevents extended open flags like + * O_EXCL or O_APPEND from causing a mismatch when we are merely + * looking for an appropriately privileged open descriptor. */ int fid_mode = fid->mode & 3; - if (fid_mode == mode) + int req_mode = mode & 3; + if (fid_mode == req_mode) return (TRUE); if (fid_mode == P9PROTO_ORDWR) - return (mode == P9PROTO_OREAD || mode == P9PROTO_OWRITE); + return (req_mode == P9PROTO_OREAD || req_mode == P9PROTO_OWRITE); return (FALSE); } diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c index ad739a219acb..2519e5cd050a 100644 --- a/sys/fs/p9fs/p9fs_vnops.c +++ b/sys/fs/p9fs/p9fs_vnops.c @@ -419,7 +419,7 @@ out: * the name and perm specified under the parent dir. If this succeeds (an entry * is created for the new file on the server), we create our metadata for this * file (vnode, p9fs node calling vget). Once we are done, we clunk the open - * fid of the parent directory. + * fid of the parent directory if it was not retained. */ static int create_common(struct p9fs_node *dnp, struct componentname *cnp, @@ -473,6 +473,28 @@ create_common(struct p9fs_node *dnp, struct componentname *cnp, dnp, newfid, vpp, cnp->cn_nameptr); if (error != 0) goto out; + + if (ofid != NULL) { + struct p9fs_node *np = P9FS_VTON(*vpp); + ofid->v_opens = 0; + /* + * The 9P file creation request natively opens + * the file as part of the create operation and + * gives us a writable file handle (ofid). + * We retain this open descriptor by adding it + * to the VOFID list of the new vnode. This + * guarantees that a subsequent VOP_OPEN call + * does not need to send a redundant TOPEN + * request. This is particularly important + * because if a file was requested to be created + * with 000 permissions, the host will reject + * subsequent TOPEN requests due to insufficient + * permissions, which would cause an overall + * open() failure. + */ + p9fs_fid_add(np, ofid, VOFID); + ofid = NULL; /* prevent closing handle below */ + } } else { /* Not found return NOENTRY.*/ goto out; From nobody Thu May 7 05:02:52 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gB0W55BzFz6dT3f for ; Thu, 07 May 2026 05:02:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gB0W54Dlyz3vrY for ; Thu, 07 May 2026 05:02:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y4tbP/piT/sb0mLceqLZU4TkaxnIJqfc4g7oPg6TUvw=; b=SYgKq3IEPFr7+6JXjQUQlx0O7Ne/ubJLwXm90r7W7IN791u9bRrgJDu2cvVWxuPzF8tQf7 3oaXgsIXfrxA0EC2defFXDszdUP+kflGLCLhgPO4st0ZUgux6vEpX/SRdw6y9Bq2o/qhFh Z5Ew9cCrGQidmc5E8X7doZXrRd6qyjipdTsO9fAQucjz9gd+oo2Wt0Gwr8DF0klhGNeZUs vnOocJV66zoF2RVd5cyUoV4kfxDzEKmSbr7STT+4xWaWEblfX0e4gC35lFOZURNEOU6XD3 eXkfI1QKZ2ZHxcjoADotgtB+lHUKd3JvrHBe7CBdmExC50WAJUP0rVcy+7cU0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778130177; a=rsa-sha256; cv=none; b=iaBsjzPx6gwE1sBQVqFsPVHK444oz/ULPCNa2ORtU6AW8ZDvgAGpQqulVEKYWsOe+hKKpW Tbz6/3wTlWsOQ4a7teH7B2hxwb8ZHzEtzLEUHrDbzjQFQ5cpCQL+8CO23iyXglJeA7BJPr 9RsyI/KxN5zSxHsGJoo8oAf55jq+foZeOmxgYutpwgFttUFOjy2ssIuCT1/XX8Ouyy/Nth 0GFEzVDovYvhSmd2dKpv1nrsvL9nD7fGdCielv53BB9/i1jiZtqVO7/+bGlAbt0aSpnMLh JTuNmUZSu4eRzk304UwpkrUhHBOKxx1SP6g3+qR75KRYPZiU04XJt2qv6+/rpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778130177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y4tbP/piT/sb0mLceqLZU4TkaxnIJqfc4g7oPg6TUvw=; b=cM5oY5wnYB5cGCmvDg3IiDEAQqODd2D9jXlRfg213I6kM+SW0kwyr7LTURzonn9VmzKPYA ++M02NUcSA7lpuygc+PleAqcRU8eOCX8BmRVHxJhqqF2UpgJoAKHjoWZ0H8r4Tnu71TmCB v4Z+hGKLEUlCGhrywXVi/544c5p8viT/c6uinb3CLSy0oTGNcsJsoxXiV6foRnPZPFC23Y 7TpUBgETZ8gIDXkD3SeYfduSxAfJ4ntEc5rwcB0kmkAInOAKbbw+U+tMklQ9dH3Tyuiy4u PjI0TrHuJpWsro+mcltYXJe4nTId5K1IMxWxW4Hc3tI+PcoFGDC++JdWGTl7Ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB0W53lZJz19MB for ; Thu, 07 May 2026 05:02:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 360e2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 05:02:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: 3daa43b1bb2c - main - sys: Make priority.h and rtprio.h include all dependencies List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3daa43b1bb2cf68f32993e342f59eb146afb7c24 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 05:02:52 +0000 Message-Id: <69fc1cfc.360e2.24248fa1@gitrepo.freebsd.org> The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=3daa43b1bb2cf68f32993e342f59eb146afb7c24 commit 3daa43b1bb2cf68f32993e342f59eb146afb7c24 Author: Alex Richardson AuthorDate: 2026-05-07 04:20:39 +0000 Commit: Alex Richardson CommitDate: 2026-05-07 04:23:03 +0000 sys: Make priority.h and rtprio.h include all dependencies This ensures this header can be included without an explicit or implicit sys/types.h include first. This causes issues building SPEC2017 which includes sys/rtprio.h and then we get an error due to missing u_char definition. Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52041 --- sys/sys/priority.h | 8 ++++---- sys/sys/rtprio.h | 9 +++++---- tools/build/test-includes/badfiles.inc | 2 -- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/sys/priority.h b/sys/sys/priority.h index 93dd5aa90d95..3a3537bee1b2 100644 --- a/sys/sys/priority.h +++ b/sys/sys/priority.h @@ -136,10 +136,10 @@ #endif struct priority { - u_char pri_class; /* Scheduling class. */ - u_char pri_level; /* Normal priority level. */ - u_char pri_native; /* Priority before propagation. */ - u_char pri_user; /* User priority based on p_cpu and p_nice. */ + unsigned char pri_class; /* Scheduling class. */ + unsigned char pri_level; /* Normal priority level. */ + unsigned char pri_native; /* Priority before propagation. */ + unsigned char pri_user; /* User priority based on p_cpu and p_nice. */ }; #endif /* !_SYS_PRIORITY_H_ */ diff --git a/sys/sys/rtprio.h b/sys/sys/rtprio.h index 6e0d8c7b0fe7..d6968a9e58a4 100644 --- a/sys/sys/rtprio.h +++ b/sys/sys/rtprio.h @@ -34,6 +34,7 @@ #ifndef _SYS_RTPRIO_H_ #define _SYS_RTPRIO_H_ +#include #include /* @@ -71,8 +72,8 @@ * Scheduling class information. */ struct rtprio { - u_short type; /* scheduling class */ - u_short prio; + unsigned short type; /* scheduling class */ + unsigned short prio; }; #ifdef _KERNEL @@ -86,8 +87,8 @@ void pri_to_rtp(struct thread *, struct rtprio *); #include __BEGIN_DECLS -int rtprio(int, pid_t, struct rtprio *); -int rtprio_thread(int, lwpid_t, struct rtprio *); +int rtprio(int, __pid_t, struct rtprio *); +int rtprio_thread(int, __lwpid_t, struct rtprio *); __END_DECLS #endif /* !_KERNEL */ #endif /* !_SYS_RTPRIO_H_ */ diff --git a/tools/build/test-includes/badfiles.inc b/tools/build/test-includes/badfiles.inc index a0aada4f016f..e7e9e67c4518 100644 --- a/tools/build/test-includes/badfiles.inc +++ b/tools/build/test-includes/badfiles.inc @@ -90,14 +90,12 @@ BADHDRS= \ sys/pmckern.h \ sys/posix4.h \ sys/power.h \ - sys/priority.h \ sys/prng.h \ sys/qmath.h \ sys/racct.h \ sys/resourcevar.h \ sys/rman.h \ sys/rmlock.h \ - sys/rtprio.h \ sys/runq.h \ sys/rwlock.h \ sys/sbuf.h \ From nobody Thu May 7 08:35:31 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gB5DM5mpVz6Rgrc for ; Thu, 07 May 2026 08:35: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 4gB5DM4B7Bz3VtL for ; Thu, 07 May 2026 08:35:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778142931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ptTLHeZwSeTweDtIjIPnOaeXw+TTnUBvvU0X7o5kQLI=; b=ZkDuldIxW6X5pSDg+JhM3Mset87cEkcmZJqAUuoZn6ZDgP4+LjxNLwhga7MBgGT5CMi7/4 hoDhtvIlOCMeFrLR7g1tkHdNRc1V27dzc0jRByRSjg6ipPiWf5hsHdkYk+7qwegcUdgbtC SNhsrWnGkM4SAxTxPMtUMb2D5Ldd/oqIkETsfY96CxyCFSKUIsVZseHkoDwLrWwy6txY27 QhEwaAtgicMhqGkSTHZrNBaQEHcdAJv4gitPFFgXj95XKnGUsmuX4etGj03uf53WBOn5wd 5tABz5DIoR1cdjz6RWQX2k/iyhGl16dipwSpPWkEYeGPSJnIf6i7QYgAtb5mjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778142931; a=rsa-sha256; cv=none; b=iy9eUGHOqCIEslsAS2RjSOoISjXmi8/vOr3caCKHPhO2cQA68kTXNMuDw6hA2qYSY65bAd hxfRy/tZC02RbWi9bhZze+D6pdTCIMMrKxf+lA/EFJvN9VJaukl/O7kSNn+jKolhJwVCie 1L6GUjWLaudbSc32PFo40e/qouk69vsuqhupz34l+O4VLruGZI1SHqfFvScGZIppBvwUHT yU9bObCcCAFU2dSitFWs9T6tDLDsFQ1aDNMZqK20/3K8VD+rfhn3/ZXvdtAx26g4UyvOi3 hgWG5D+UzpN7hAum84QDsLJuILwBdE8b+ldqf6wsR6Q6dkTTiTRMJ4MOcHn+cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778142931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ptTLHeZwSeTweDtIjIPnOaeXw+TTnUBvvU0X7o5kQLI=; b=T84Ng994mLKMuEsmVxLpw/JaZawiJ70ItepE+Eo3/CALPiwCCRMjIAAnF3ZY08keVsJsdd gTCwb6lAO+9fKWPmezDNlB3FliSi6OBsproBi5qZN8kXy2ng3eoADLxXXm1uBS/EIkyX5N b6fyWKUYNBtUi9FOU3XdMK5e3E/5KIgxuISvRgfiIMmgwna5jPO2v07U7/gNQIQkk65mgg tQVFP/20imJrlJkKMIicHfqUzmjBVD7ci34pkE31xq0yyT5NcRQSClgQsUm1CB0/R5u7PQ a7DPGHYI/Ck8P5qyDF3KVddcWGUtFoHGTFIDEMozmX5YMUglGOpEmilkhyZJlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB5DM2tDVz3Rh for ; Thu, 07 May 2026 08:35:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c8d1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 08:35:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: f20bd7739eab - stable/15 - zone.9: Add a missing newline List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: f20bd7739eab9401568262c536993d488b4322a1 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 08:35:31 +0000 Message-Id: <69fc4ed3.1c8d1.34115a6d@gitrepo.freebsd.org> The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=f20bd7739eab9401568262c536993d488b4322a1 commit f20bd7739eab9401568262c536993d488b4322a1 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-05-04 18:28:36 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-07 08:35:24 +0000 zone.9: Add a missing newline MFC after: 3 days (cherry picked from commit c295f026376035fee1a9e44efa2af30d46b7884a) --- share/man/man9/zone.9 | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9 index 9f13cf0e504a..eeac1f241c29 100644 --- a/share/man/man9/zone.9 +++ b/share/man/man9/zone.9 @@ -484,6 +484,7 @@ Free items in the per-CPU caches are left alone. .It Dv UMA_RECLAIM_DRAIN_CPU Reclaim all cached items. .El +.Pp The .Fn uma_reclaim_domain and From nobody Thu May 7 08:35:30 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gB5DR4nrhz6Rh09 for ; Thu, 07 May 2026 08:35: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 4gB5DR3ljGz3WHK for ; Thu, 07 May 2026 08:35:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778142935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HAnJiQDsbqNdcxiy/dK7h3IBylJoGCViCxZhHwTAU40=; b=tcgAeYGtjYSyHnFioZrFNL9PahaX6klRvwwheZVVidNceN/Ilm6kXo1zZCK2YEGiJahjYp xehPZOI59eCYd5I9uRRlxiTvoDqkqbg7wzfOL2DPT13deq5hXw+sGl+uV3THEV0/gWZHdu xoP9PeQztti3sZEavF6JIbm2SgCRbw3ykNwo1LfgJ74y0EhRJbSiTelADeFX4mGEnpOfL/ LT42ZWh5tYiP9gWPCPbBfum15Hx2jUilzfD/qlo44OJmI8RVDJhiFh1cDLCikvwtKsjBTR h9ZgKUlCf+FhR2PjFdRdi7HxDch/3KIZ5GPfinSXiO32nXghyWj8GKf+ljim5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778142935; a=rsa-sha256; cv=none; b=oRzZMhlqS2CVtNWI23tljenyXuD+VNr5SyPaKe++sfxL5m/UHY9nOdI3hWHYRshjN2J6Cg BzYJw5ZVjINYClY1x+AAhS7b0cijl9EieEafki9GidVZ/M7qWNgcC7X2EV57Inua9syEAg iCCA5NrL1tUUD/G+CuTDWj/jDI3ZXpwOMgJfhmJsz/KdHGtn0MXiSUVuBIwd3tuWUDcj1S v65PLre4XKwlHEonD5cIsLRDcREAP6IBwcXiRtJSZYRDyzphH5Xt/MRQQXhip4eoSOA9AI xKMI8Okz4w4XTwKWnl4vkiIVWiFq+KIAOZ9hNbw4P+T23rbDtlwUWXCOeUejkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778142935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HAnJiQDsbqNdcxiy/dK7h3IBylJoGCViCxZhHwTAU40=; b=A9eAb7TaaU1APR93o3n1lH1xrtL2SyCFKjT3TrefJ/Oy4eEJkh6mlPb3zKhC/Etzl12JwY 5c9CDfkNlO68JhGTLBIgtGLty04zW5FgZJr/tUypL55lIUgX75U2EGB+9Q18kCTeTeIhHT Buovua3e+9zCzHLzQEwF+9hRrwb7WK2lryXcwHjsGrTPc+UC0wHJ76t+yuhUSfFI2Qua/9 73QDjy6zUDBciFgm9jXtLL+0u5og0d19WdL4wBTlMmRjA90oj5RNGTzuTMIH9/QnPyPEAy Ug5pE+98v6QB0M2kIWEAiPyeFdcJOG8ShcgQEW5NZ/5ZdDPCLau9FurLlOc4sA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB5DR3Fdyz3CZ for ; Thu, 07 May 2026 08:35:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c516 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 08:35:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: f4678f761353 - stable/15 - bsdinstall.8: Document DISTRIBUTIONS defaults correctly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: f4678f7613538c63567e2e44cd5aceaee4b4a383 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 08:35:30 +0000 Message-Id: <69fc4ed2.1c516.5e5c751e@gitrepo.freebsd.org> The branch stable/15 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=f4678f7613538c63567e2e44cd5aceaee4b4a383 commit f4678f7613538c63567e2e44cd5aceaee4b4a383 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-04-20 15:52:25 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-07 08:35:24 +0000 bsdinstall.8: Document DISTRIBUTIONS defaults correctly Some targets override the default value of DISTRIBUTIONS. Document that in the manual page. Reported by: Nia Alarie Reviewed by: jlduran MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56528 (cherry picked from commit 4029e765436ff1633139c1afe1bc25185a0f4ef1) --- usr.sbin/bsdinstall/bsdinstall.8 | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8 index ee141e1d4296..282b88328e99 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 October 3, 2025 +.Dd April 20, 2026 .Dt BSDINSTALL 8 .Os .Sh NAME @@ -79,6 +79,12 @@ targets. .Bl -tag -width "-D file" .It Cm auto Run the standard interactive installation, including disk partitioning. +.Pp +The +.Ev DISTRIBUTIONS +environment variable is set to +.Dq base.txz kernel.txz +by default for this target. .It Cm jail Ar destination Sets up a new chroot system at .Pa destination , @@ -88,12 +94,24 @@ Behavior is generally similar to .Cm auto , except that disk partitioning and network setup are skipped and a kernel is not installed into the new system. +.Pp +The +.Ev DISTRIBUTIONS +environment variable is set to +.Dq base.txz +by default for this target. .It Cm script Ar script Runs the installation script at .Pa script . See .Sx SCRIPTING 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. .It Cm keymap If the current controlling TTY is a .Xr syscons 4 @@ -305,7 +323,9 @@ Default: .Dq Pa /tmp .It Ev DISTRIBUTIONS The set of distributions to install, e.g., "base.txz kernel.txz ports.txz". -Default: unset +Default: unset unless noted otherwise in the +.Sx TARGETS +section. .It Ev PARTITIONS The partitioning of the disk onto which the system is being installed. See From nobody Thu May 7 08:36:03 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gB5Dz16mfz6Rgx5 for ; Thu, 07 May 2026 08:36: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 4gB5Dz0V3Kz3Wnt for ; Thu, 07 May 2026 08:36:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778142963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l2JM2gGLqwp8sY3npvdax1OtWIVqAXh+nXM1RUsD8eA=; b=bC+PlC/VBucTzIAdnz08UOHWv+fi89L5QRm3bp2tWHXuUGmviC3icWMhU63PHD8CPpzlzC eYCmqqAC+ack+MR9HqN71oeLUgUaFJwYGxzTN7WyZVsSMdSLtSL6ToiE9qbDDnmKcw8qj3 +aNacGIjBQqiKlfl8KfhRr9nrPY9K/UystOs4XvsDnSahIybHdjqJ8a3ozAClg9319yE4J 2PkDRP7nz/G4gkDb4u663bNM3bg1FIoBr8CnsCXxBi7Rn3vkPYgN3CLm7gkyAyGFy5/ebA w2jzBj0VXJGUn2Rna6pNJXCtw0rypOh3K9/OaTBfYNrneAlKbThFkR6pNB8gcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778142963; a=rsa-sha256; cv=none; b=Td1ztKHM9rIgJO6X96H4jqsbqtLBmd/mwEj+TZxb/7i/Pp+lH/9PZTKHCaKl4o6ZZCDruf kkf+Ye+atWuQDPaxPxnOt7aURijzMultEzxV1qLh0gGae6cGZqXWGqSVS6laWbevyEq11G xBOEFhNI8ur1UXslJCEtG3+DwVk/EDtrKj/NcCc3iMhnBZa9ZtiQoicoOlIZ8E1noN2GVD UOZLZUG1cNHqILsnAKd03nkiTtg/vo96KXalhtshFpuluorQdG0IqYq9/lbXXUhhFA1SJN IqYK3tSaqreEHkotqHB4ddAwMQgef9g1SrK2iAPvv9o+FtmvKTnFFt9BbkqcOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778142963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l2JM2gGLqwp8sY3npvdax1OtWIVqAXh+nXM1RUsD8eA=; b=IJUnuCrdp+n6G7EuIgeHNOgf9mIbAYfPrs8K6VwIof7n4c2NyEhBV513H6fRlnlgL5pHwm Jb9HSoY1d5LrIgix7DE5Q+Ay7/h0ZFmOww0AcGK/NJH0P3AZQvJ1pRtQturP9Zth1LdTz7 QxHVMcXuwiYst49PqEN4zEkbhUXS1YxRJayGCaesh8czFRt8SPCgnX0zr6mQu+LzBMRKdA 8sNNUGTM6fWC7/B1K11Qi3K2ff3pgl1WsefvkgOECS4ZLCfZjXSWNnW+azjcprNjQHyufJ aUtIsK6c9pZvXergandFFh2Vzg4NHHHQfXtaACFrQvvt5DwBVQV18dzmB5NZjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB5Dz04j9z3Cb for ; Thu, 07 May 2026 08:36:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c80e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 08:36:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 750f37820d08 - stable/14 - zone.9: Add a missing newline List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 750f37820d0895dd3d66c3c1d4d5c915fe7d4ccf Auto-Submitted: auto-generated Date: Thu, 07 May 2026 08:36:03 +0000 Message-Id: <69fc4ef3.1c80e.5acc50d4@gitrepo.freebsd.org> The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=750f37820d0895dd3d66c3c1d4d5c915fe7d4ccf commit 750f37820d0895dd3d66c3c1d4d5c915fe7d4ccf Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-05-04 18:28:36 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-07 08:35:48 +0000 zone.9: Add a missing newline MFC after: 3 days (cherry picked from commit c295f026376035fee1a9e44efa2af30d46b7884a) --- share/man/man9/zone.9 | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9 index 9f13cf0e504a..eeac1f241c29 100644 --- a/share/man/man9/zone.9 +++ b/share/man/man9/zone.9 @@ -484,6 +484,7 @@ Free items in the per-CPU caches are left alone. .It Dv UMA_RECLAIM_DRAIN_CPU Reclaim all cached items. .El +.Pp The .Fn uma_reclaim_domain and From nobody Thu May 7 09:18:38 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gB6B72MS8z6RlRq for ; Thu, 07 May 2026 09:18:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gB6B70V2lz3bkL for ; Thu, 07 May 2026 09:18:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778145519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g15OzKLKyWrNa/unJk5Moy0HJmNFTQNRVKp5efMBsRw=; b=gnfO5mFxRIZle/LRSGxoNQ23KhIHGGCZoeCakdwGUyfO1w/+23aU7cfVzGZy4NR3bxWZHp pXMgv78OGrnlGzaon3HNbR6slnbRJO7urByL9A+UFzvmKNITfLHzVOuQLBpm9t23hKfOtG zoEAqgsvtNNZYhwa0ky32REjeO3Gqja22rPdOTvGjXd2vEmHZM3A0+wO1ptBMm2/qMSsFA /rPOhPEpYSSe7FgmlRDvPonVV5v0vK5kKwnLALbWt3au95ugdIp5bNK6MZNooAxqg9p2th y8z4lIcHNr1B5xjoDTbkksht/YVnnWyhEeDCiliEdIf25CbXiIZXxareAIII5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778145519; a=rsa-sha256; cv=none; b=E5MGtjg1zjlYMa9m5WCd4cG3XxtYfPmcf00jGkFQIGsDYPhB7wIrV1NFRR3XZjIC4LdzFC sASpPW4qGv2YMlHjoAQW5n/1BjPtdNrT+lHMbtfmirK8znDKKloKvGSzF+mjxni4SqI0kG u8aIQjU/K5AlJENjabTxBP2JomEqrs37GyVTYoLi+IWmLeis2lWPBAkqD4q4L6HBYF1G1f 4mr284eqwzHg4DlIYNq60UELq1BGJt5oLho5Gcg3cdwOzmTnhCtUJ5vBLQ1H2FXU2a14As gDrHURVnW10nrFQZhUrz2vfGR8+iwUh5jObm8I/vVNm5Zvnw4HKGk4mGgN2Vmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778145519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g15OzKLKyWrNa/unJk5Moy0HJmNFTQNRVKp5efMBsRw=; b=uGC3AfMQytOXsEJtRhYFK/nk8VEtUrVqSl7ZfpEbOpSNH/3ND5aCGPcMTizm9Bwa49uUxR iCEwJPEjNDqjrpuk0BmFoxnlFvbf3Xrl7MPGgSmriCMy5ssso24oRTgHonsmsBVh2KYDRy HjVwreUcVQ1CBepkpZbHOxLfHrDxQghThu+mjJgOEvRc35OcRB8Ek60MHsko43ik/S1tZY 4IdF4V/3DruMxyuu/HfPTsiwRZwGuyg66lvvS6isxf/4AwByh43dsXFjU814BZw49xXocY ta1RlYkiv+cisbYbjY9ivyqyqO2U/RDMs9jJ4ubeSAfPETPIipn2fUW66pdqug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB6B66tR0z4Yk for ; Thu, 07 May 2026 09:18:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 210a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 09:18:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 5aedbafd7a81 - stable/15 - sound: Retire unused snddev_info->bufsz List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 5aedbafd7a81b8e975baebd2ad0ff2712f8a65a5 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 09:18:38 +0000 Message-Id: <69fc58ee.210a6.5a4e0f27@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=5aedbafd7a81b8e975baebd2ad0ff2712f8a65a5 commit 5aedbafd7a81b8e975baebd2ad0ff2712f8a65a5 Author: Christos Margiolis AuthorDate: 2026-04-30 18:45:20 +0000 Commit: Christos Margiolis CommitDate: 2026-05-07 09:18:31 +0000 sound: Retire unused snddev_info->bufsz Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit 5e9f2a6aefabec01c587a169fd5efe3a2720a8e5) --- sys/dev/sound/pcm/sound.c | 9 --------- sys/dev/sound/pcm/sound.h | 1 - 2 files changed, 10 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 305d663cd6ad..9eb2dffeb908 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -242,7 +242,6 @@ pcm_getdevinfo(device_t dev) unsigned int pcm_getbuffersize(device_t dev, unsigned int minbufsz, unsigned int deflt, unsigned int maxbufsz) { - struct snddev_info *d = device_get_softc(dev); int sz, x; sz = 0; @@ -264,8 +263,6 @@ pcm_getbuffersize(device_t dev, unsigned int minbufsz, unsigned int deflt, unsig sz = deflt; } - d->bufsz = sz; - return sz; } @@ -406,12 +403,6 @@ pcm_register(device_t dev, char *str) SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "rec", CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "recording channels node"); - /* XXX: a user should be able to set this with a control tool, the - sysadmin then needs min+max sysctls for this */ - SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "buffersize", CTLFLAG_RD, &d->bufsz, 0, - "allocated buffer size"); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "bitperfect", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, d, diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 56ef6af8e546..40deee32ea5b 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -201,7 +201,6 @@ struct snddev_info { } channels; unsigned playcount, reccount, pvchancount, rvchancount; unsigned flags; - unsigned int bufsz; void *devinfo; device_t dev; char status[SND_STATUSLEN]; From nobody Thu May 7 09:18:37 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gB6BC2thPz6RlS0 for ; Thu, 07 May 2026 09:18: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 4gB6BC0bSbz3bhm for ; Thu, 07 May 2026 09:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778145523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n96cjoud6b7gGcGCxgilXJOyt0BXkInXAAjxeklbEt4=; b=tKlFPOs78u6VcxUZjsktsy0VG7hf0EoFhCKhZ0YiOS+PmnSdhMMO/kIpVXDXi3kmh6ppRx 6fnGOqqOT9ypxrE6flM0L/NfGjFwSPr/tiYVYzrT3ztTN/GiHfd9Mahvi8tkHOtl0wKom8 oO1/PjlhSmgqAwTaAP4OlTuhMUj4SDe9V422TfNQ+JWGUgtjqD7Ht7EypoXyVLK35q/Pxc dMUZ9pkIdaXHfsaj8cKccssqRluJLG1gDlNB9tdthkTG1r3/WXXMTKFZmZ6LJwo98S+Ule 4soqpDejzVpezku4F6s6ct7VOVGBoXcF/yYMZqqhkZvvrRgW2n/M5g3pQzYOvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778145523; a=rsa-sha256; cv=none; b=qAyG7B31Ve2w1dnN90IC0Y7/uixutqSiNDjMGDEQa5Gp+j78siYcdoQ1n6lzz1Vj2Jli8q xi6FjcO2bHgRigwNnw0zZCCXALMy1Scs4SpOIfepzrgcf2Wex8ZkmiKNIH4DnRKu7eUHL8 ++S0e74guDncvgBMF9VWNPnDG6GvEgPWfGAiRaGS/ZHnbBPrveZkrmJEksEPkE5vJcbdne Xu174pD41vAaU2gnA4dE/0VkLFd/6R6siuA6CdYaR5TjTbiWyExHgCZdcw6t44Vsk1O5pP HwJOWYZcOKUbMkGC22NtN4Qd3zxIkFDn0tMWvfvf6mYruAyQXxkSefl1RZamjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778145523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n96cjoud6b7gGcGCxgilXJOyt0BXkInXAAjxeklbEt4=; b=TEG9sefivtRqO+g7VJSrzy6bBP+BN7UMeHU6u17oA6F2+Ko7m+G+6Yc/Edcpmf8/xs3xHJ 06oJbIbMUk33wMIGSSFS3pmJ5VQz8xGGtj/Gd7RYXwcfuYRmQYdYUOfQIioxpjvk+g7+K7 DMIpmzNg+gvwdFLMFdBHsMm+dWP96aEDCtqYEg6RIMtfzNI60mwyFUfHQBSumzx8GSoSaL a7Qk8MJlWWz+828LVbtX4P0zvbRvZx9xuP23vq1eHxdDWqJaLbj930Ml3YEzw5dTCBgi/x EnrdZNRpsAxhISVh9Z2mJj+BJW1uCCo2Uro2STuAHrFyl7ESEDl8cESjjJuNQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB6BC09k1z4V2 for ; Thu, 07 May 2026 09:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2070b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 09:18:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ed919bf54acf - stable/15 - snd_uaudio: Support Roland UA-33 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: ed919bf54acfde48a36ab07b83186e3639223137 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 09:18:37 +0000 Message-Id: <69fc58ed.2070b.5ec9a053@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ed919bf54acfde48a36ab07b83186e3639223137 commit ed919bf54acfde48a36ab07b83186e3639223137 Author: Christos Margiolis AuthorDate: 2026-04-28 16:39:45 +0000 Commit: Christos Margiolis CommitDate: 2026-05-07 09:18:31 +0000 snd_uaudio: Support Roland UA-33 Apply the appropriate quirk. Also, introduce a new uaudio_vendor_audio table, similar to uaudio_vendor_midi, which includes non-standard USB audio devices. The Roland UA-33 needs this, bceause it comes with bInterfaceClass = 0xff (vendor-specific), so snd_uaudio(4) doesn't detect it. PR: 294814 Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: emaste Pull Request: https://ron-dev.freebsd.org/FreeBSD/src/pulls/24 (cherry picked from commit 549e740619873716b796a841a10f56fae3c3ad49) --- sys/dev/sound/usb/uaudio.c | 10 ++++++++++ sys/dev/usb/quirk/usb_quirk.c | 1 + sys/dev/usb/usbdevs | 1 + 3 files changed, 12 insertions(+) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 65976ced8a75..f477eb768fde 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -713,6 +713,10 @@ static driver_t uaudio_driver = { .size = sizeof(struct uaudio_softc), }; +static const STRUCT_USB_HOST_ID uaudio_vendor_audio[] = { + { USB_VPI(USB_VENDOR_ROLAND, 0x0132, 0) }, /* UA-33 */ +}; + /* The following table is derived from Linux's quirks-table.h */ static const STRUCT_USB_HOST_ID uaudio_vendor_midi[] = { { USB_VPI(USB_VENDOR_YAMAHA, 0x1000, 0) }, /* UX256 */ @@ -868,6 +872,11 @@ uaudio_probe(device_t dev) /* lookup non-standard device(s) */ + if (usbd_lookup_id_by_uaa(uaudio_vendor_audio, + sizeof(uaudio_vendor_audio), uaa) == 0) { + return (BUS_PROBE_SPECIFIC); + } + if (usbd_lookup_id_by_uaa(uaudio_vendor_midi, sizeof(uaudio_vendor_midi), uaa) == 0) { return (BUS_PROBE_SPECIFIC); @@ -6258,4 +6267,5 @@ MODULE_DEPEND(snd_uaudio, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_DEPEND(snd_uaudio, hid, 1, 1, 1); MODULE_VERSION(snd_uaudio, 1); USB_PNP_HOST_INFO(uaudio_devs); +USB_PNP_HOST_INFO(uaudio_vendor_audio); USB_PNP_HOST_INFO(uaudio_vendor_midi); diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 69e16c91604f..6237df4b4fe0 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -565,6 +565,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { USB_QUIRK(CMEDIA, CM6206, UQ_AU_SET_SPDIF_CM6206), USB_QUIRK(PLOYTEC, SPL_CRIMSON_1, UQ_CFG_INDEX_1), USB_QUIRK(ROLAND, UA25EX_AD, UQ_AU_VENDOR_CLASS), + USB_QUIRK(ROLAND, UA33, UQ_AU_VENDOR_CLASS), /* DYMO LabelManager Pnp */ USB_QUIRK(DYMO, LABELMANAGERPNP, UQ_MSC_DYMO_EJECT), diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index bb039f59ce19..e8eee7f330c5 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -4196,6 +4196,7 @@ product ROLAND UA700 0x002b UA-700 Audio I/F product ROLAND PCR300 0x0033 EDIROL PCR-300 MIDI I/F product ROLAND UA25EX_AD 0x00e6 EDIROL UA-25EX (Advanced Driver) product ROLAND UA25EX_CC 0x00e7 EDIROL UA-25EX (Class Compliant) +product ROLAND UA33 0x0132 UA-33 Audio I/F /* Rockfire products */ product ROCKFIRE GAMEPAD 0x2033 gamepad 203USB From nobody Thu May 7 09:57:23 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gB72x0YZVz6byRG for ; Thu, 07 May 2026 09:57: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 4gB72w6w03z3h9J for ; Thu, 07 May 2026 09:57:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778147849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BYJe3kaj/4UYIpZC6wKUa93/zy13BJkGnN+Q1nPPesk=; b=jvbWsgSb5IGCWO6x60wOmfwMKIn1xgt3cYhzg1fucKB7OXnD3XGliAC95hkFa1TmIdCnvc oyNcy11hzNxYgJWpSKt56pvwLaWkY+1eMOl8oyVTMmpYL/eFyynsQYrMg9lS1Qotke3Yq8 9KMdUEgWAkWF/NFuiTj3Hze8Qor12QW6dQiTNAIHnrBjzwMg1aq8vEeMeKayNf8Vc14MTZ +1lw3LxiFBWHWPnYxChGRYNHzTf8Ml4ez9CDb/ONSE4aB4OIK4A120DkO2/yhKV4yS9zjH 5UEv/ZZL2oE/IiBKUH2AJsPCpDJwHj8/DXeCPZ2FNFu7jlRwuJGYcTtTW776Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778147849; a=rsa-sha256; cv=none; b=JNn4Vi2oOylnySFmKQtDrUvUDGL7oV3FMMU+uhF7EVOv/7vd6exXtTBlLtxELFzEqe0pMB x2fcnWYYbj7oaKMzffkJl0txpnHBVfa35w8xk1ASN7fF93K8WML8dnMa+yQp6wNIHfEWXI o0nuWyLowyG1MwNnCA8XsKEAaLCbKAC6lELrVEAXnNrHkpclz8w8/azx7MoWZGszwxRLA4 0m93LjqV6NX8o04EVbM0tr11o3iMHvBYTOVWazVqXrE0Z3BrUiGiO1Jw4mIEzXpqS8XlvG 2FfkikUY02Lg7MYX4584f+8PPWwsK/O3eSoEYaDs17xbIDX5kKPohiLZzO90fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778147849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BYJe3kaj/4UYIpZC6wKUa93/zy13BJkGnN+Q1nPPesk=; b=PdF8rDaGkyHsIqSulfxpVP7KlWx+5hmNjlbRpjpV53j7POyb+G3s0U9bkFypJkeJ3hswod aWTNTzBy9YdR926OLNgswGwuNKqnlBORZAkMoRk+SWXjLqtBFv5rKENJWKlutvvVEWWc+2 85iX/EOVI6s8yJpq4hjWemVHjhNDzH5GPzyV8NBMQIB1/KErlFi1DnNQbCeOIri11PGwf/ tMUS3ZOTN8YWMeZc8WlUu5vHPjh+jkP4oio9wkwm+IKFwhHF4LITLjjhj+/WJDvu7kk7IF ge6cHuOdaK1k7dm8hLnlyLjNnjw9cpg8uAzsAK5dc/59gTkHiyICvD+U1ajgUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB72w6PtGz5Sr for ; Thu, 07 May 2026 09:57:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24c8e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 09:57:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 242050278a37 - main - dtrace: Document the syscall provider List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 242050278a377f5ca6906545ddc924b60ad8aa58 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 09:57:23 +0000 Message-Id: <69fc6203.24c8e.1b704a4a@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=242050278a377f5ca6906545ddc924b60ad8aa58 commit 242050278a377f5ca6906545ddc924b60ad8aa58 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-05-05 12:57:53 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-07 09:57:03 +0000 dtrace: Document the syscall provider MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56831 --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 3 +- lib/libsys/intro.2 | 5 +- share/man/man4/Makefile | 1 + share/man/man4/dtrace_syscall.4 | 87 ++++++++++++++++++++++++++++ share/man/man4/linux.4 | 3 +- 5 files changed, 95 insertions(+), 4 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 5173074ee63e..45cb8c863f7a 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -20,7 +20,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 20, 2026 +.Dd May 7, 2026 .Dt DTRACE 1 .Os .Sh NAME @@ -1310,6 +1310,7 @@ in .Xr dtrace_profile 4 , .Xr dtrace_sched 4 , .Xr dtrace_sctp 4 , +.Xr dtrace_syscall 4 , .Xr dtrace_tcp 4 , .Xr dtrace_udp 4 , .Xr dtrace_udplite 4 , diff --git a/lib/libsys/intro.2 b/lib/libsys/intro.2 index 008936b278ae..33dfecf648c5 100644 --- a/lib/libsys/intro.2 +++ b/lib/libsys/intro.2 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 19, 2024 +.Dd May 7, 2026 .Dt INTRO 2 .Os .Sh NAME @@ -756,7 +756,8 @@ during a system boot. .El .Sh SEE ALSO .Xr intro 3 , -.Xr perror 3 +.Xr perror 3 , +.Xr dtrace_syscall 4 .Sh HISTORY The .Nm Ns Pq 2 diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 60ab6e8bdab6..44671c564239 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1029,6 +1029,7 @@ _dtrace_provs= dtrace_audit.4 \ dtrace_profile.4 \ dtrace_sched.4 \ dtrace_sctp.4 \ + dtrace_syscall.4 \ dtrace_tcp.4 \ dtrace_udp.4 \ dtrace_udplite.4 \ diff --git a/share/man/man4/dtrace_syscall.4 b/share/man/man4/dtrace_syscall.4 new file mode 100644 index 000000000000..e154e4c6046b --- /dev/null +++ b/share/man/man4/dtrace_syscall.4 @@ -0,0 +1,87 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2026 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.Dd May 7, 2026 +.Dt DTRACE_SYSCALL 4 +.Os +.Sh NAME +.Nm dtrace_syscall +.Nd a DTrace provider for system calls +.Sh SYNOPSIS +.Nm syscall Ns Cm \&: Ns Ar abi Ns Cm \&: Ns Ar syscall Ns Cm :entry +.Nm syscall Ns Cm \&: Ns Ar abi Ns Cm \&: Ns Ar syscall Ns Cm :return +.Sh DESCRIPTION +The +.Nm syscall +provider provides entry and return probes for system calls. +.Pp +The module in the probe's description is +.Ar abi , +which indicates what system call ABI a +.Ar syscall +belongs to. +.Nm +supports the following system call ABIs: +.Pp +.Bl -tag -offset indent -width freebsd32 -compact +.It Cm freebsd +Native ABI. +.It Cm freebsd32 +Non-native, 32-bit ABI. +.It Cm linux +Refer to +.Xr linux 4 . +.It Cm linux32 +Refer to +.Xr linux 4 . +.El +.Pp +The arguments to the +.Cm entry +probes are the arguments passed to the system call. +.Pp +The +.Cm return +probe stores the system call's return value in both +.Fa arg0 +and +.Fa arg1 . +.Pp +Inspect the +.Xr d 7 Ap s +.Va errno +variable to check if a system call failed. +.Sh EXAMPLES +.Ss Example 1 : Count Up System Calls +The following script traces all system calls and counts them for every process +on the system. +.Bd -literal -offset 2n +syscall:::entry { + @[execname, pid] = count(); +} +.Ed +.Sh SEE ALSO +.Xr dtrace 1 , +.Xr intro 2 , +.Xr tracing 7 +.Rs +.%B The illumos Dynamic Tracing Guide +.%O Chapter syscall Provider +.%D 2008 +.%U https://illumos.org/books/dtrace/chp-syscall.html +.Re +.Rs +.%A Brendan Gregg +.%A Jim Mauro +.%B DTrace: Dynamic Tracing in Oracle Solaris, Mac OS X and FreeBSD +.%I Prentice Hall +.%O Chapter Syscall Provider +.%P pp. 315\(en327 +.%D 2011 +.%U https://www.brendangregg.com/dtracebook/ +.Re +.Sh AUTHORS +This manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . diff --git a/share/man/man4/linux.4 b/share/man/man4/linux.4 index 711ac11e8fce..ec8342efe705 100644 --- a/share/man/man4/linux.4 +++ b/share/man/man4/linux.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 19, 2024 +.Dd May 7, 2026 .Dt LINUX 4 .Os .Sh NAME @@ -179,6 +179,7 @@ Linux kernel objects file system, see .El .Sh SEE ALSO .Xr brandelf 1 , +.Xr dtrace_syscall 4 , .Xr fdescfs 4 , .Xr linprocfs 4 , .Xr linsysfs 4 , From nobody Thu May 7 11:16:28 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gB8pB3Sdsz6c5Zh for ; Thu, 07 May 2026 11:16: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 4gB8pB2pNXz3pjr for ; Thu, 07 May 2026 11:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778152594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VYFIziOLtYyHld6tjSKep9F6hqjmDs58m/brVAaEQOM=; b=JW0nn6Zqj6WyJNI82OgM20NLlp+dNLIYYnUeifi8gMXbKeQ4NOrJkw8ZcV76fp94SwIQgH 9shP5yxAmhodvahbCJ9HJ3vL3mJ6bBB0QB0Wwa4EeEkWxucyJzMpPTDuC+IFyEurrwshEG IH4fzspxite+lEV9b6VX3j9hQEYGLWvSeESZREtLPVoObFoVD2qApwlTbrgXmWy2MwSMf7 JpyQJf9tfJfjapvTkaSb3/4tlu9687zIklUAIwe+119/rLNA+1CNqRFAHmy1S6nlIB/AEh XHFf2E/hzj9jszmNfVNiaWxrA67heODTU244Hm9OZxPMQ0D6ScGxXtFIG9KjdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778152594; a=rsa-sha256; cv=none; b=Cg4ewuoW2MEGdDNd3d2W9jkm+kDGEPs89mU5js5XeU4+FkfdQPVgFirhg6jhKm8d6e5Oo1 4Yr3CxxFt1RHKqq/9qa1hZwuZckLOkrYbVYkDCBFkAhKYHgQvZT6j/hKUHYkZBiqgYO8bd d5qJ0MhmWE1TylKvoKD3O0sD29kKEsaUALos39SyH/D9rF4M+QU3FmZEr7BHJxY0/zWMAC 6smLKHjn6SL/QWGYegHZvrbw8/zrWuIlaZF1M0XZOgI1jSwgeXzArwtOHuQHpe6QSLPxwV kWfn3fkX/nYY+1tyEUE2g6aECB74e5U8FpYrBFE8cE/U1rqa3R/x68x9BZUl9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778152594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VYFIziOLtYyHld6tjSKep9F6hqjmDs58m/brVAaEQOM=; b=R58cxjHNcM42Mtgp/6w5vGw1LMqUVyFgMgJ11cB1gt/rtXqIMJbYSNUqtR1E2ysW8sjaAk UaBLHYpTE7q7+eL5cc0YQSZcKm5TsuW5+gKmik5O9wSCnFF0w8p0CYtXd3V+vEGVC4QekS OEsFwq42XspmvP2oztQAaA5u0oooSj0wQXy44JbJsNgZECOSjos/QIV7uhBi6HKkxlXyZq KtovDCxZeAcZ2NH1LOik8BLilt88aBORpS5w7xseeOC/Omjp/M0wsBznGKxFBSGAGT4ac1 q6R53w3p6cxmEitxzre8LVw81EYtXZJfv4iWWZZumhpndchnhzlFqNYIl8BO+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 4gB8pB23BZz7tB for ; Thu, 07 May 2026 11:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3613c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 11:16:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: c81f51651211 - stable/15 - linuxkpi: Implement `module_*()` APIs as static functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c81f516512111fa5ac8d5a9f3f7e64c2fb5ab5a3 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 11:16:28 +0000 Message-Id: <69fc748c.3613c.7771ec2@gitrepo.freebsd.org> The branch stable/15 has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=c81f516512111fa5ac8d5a9f3f7e64c2fb5ab5a3 commit c81f516512111fa5ac8d5a9f3f7e64c2fb5ab5a3 Author: Jean-Sébastien Pédron AuthorDate: 2026-05-07 11:16:09 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-05-07 11:16:09 +0000 linuxkpi: Implement `module_*()` APIs as static functions This fixes an "unused variable" warning when building DRM drivers. Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56780 (cherry picked from commit 658bb99db9c7872f92ccb86ed2674c72636436d2) --- sys/compat/linuxkpi/common/include/linux/module.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/module.h b/sys/compat/linuxkpi/common/include/linux/module.h index fbe57cbbed82..de4be1e9ebe9 100644 --- a/sys/compat/linuxkpi/common/include/linux/module.h +++ b/sys/compat/linuxkpi/common/include/linux/module.h @@ -136,9 +136,14 @@ _module_run(void *arg) #define module_exit_order(fn, order) \ SYSUNINIT(fn, SI_SUB_OFED_MODINIT, (order), _module_run, (fn)) -#define module_get(module) -#define module_put(module) -#define try_module_get(module) 1 +static inline void module_get(struct module *module) {} +static inline void module_put(struct module *module) {} + +static inline bool +try_module_get(struct module *module) +{ + return (true); +} #define postcore_initcall(fn) module_init(fn) From nobody Thu May 7 11:58:34 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gB9km1f63z6c96v for ; Thu, 07 May 2026 11:58: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 4gB9kl6T1kz3sxm for ; Thu, 07 May 2026 11:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778155119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SbIUzAkKYjYAKmNYwSRuJhBhH9o4ce6/X2ETO58VhXc=; b=X7Zyuej4tQOnnFq/satQn+kxNL1B3j9x7I0q+wU/O5U5/q5KRhYxaCLZMR8YKq+AlDvr+7 Ej5HOoi8uGmI6eU2XlSdioWbK+Giw/p2o2uYt0pQKQ3wxAzqoQHaQbmcc/t/ivVJgjKsW2 PpjU9OOk4/ah5qEZ5zz7DKJBEFU14D1G/3YJpssUK8gcVHXaZD6NH2xI4s2ovmmrAaAxRL xJO6+jkrbd89HgZUB8aggQsX8ogVkOxlcVdnkRUCFVWVUInV0gp9Fo0eFHD2Xp2e2x8Zit Ju1RI9CLNi4/BPDBYjcpEBwZCosMTLNW+ekMHf28AKW8OoT5EEcPxKl6QzVcVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778155119; a=rsa-sha256; cv=none; b=VGGBDKN9qgXS7/8z5LCspU5BJP5j56CW3OaWZ5tlCZFx2cffl7pRpfbS10cNCm26dQy/hZ krKrR8jCo/L0PSI+trdtHqtz0ndmSg+D9ZIac6AAfcyRHzVZuLxQR1lIY+Wb22mD1WmP1Q Ky4FMsr0xEtFosHBGFXvstIypEyhaF/qvmJxkX2PHNWf2RXqfuYFag4SS80SmEObeo5fSa ly3+rYGOxB5WBwcwHSjF4yjk0m+vUnsBKqZ+T0dgFo+njJ/HTTK7CHxndfZ4NPzho8ybOX fCTUKOht6DKCgH6Vuz7ywbwyXlSxwts8HGPm0EDbSLbI1tBPG6UwgQIDUPCBQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778155119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SbIUzAkKYjYAKmNYwSRuJhBhH9o4ce6/X2ETO58VhXc=; b=ys9uD+V9JabtmdAgR3AeNjMW9bGhFH6FbxtSmYRwGBKxeHf8Y+5jVYK6y/x+BzA2E+uOUw t3w7bUNhbC0aq5qaa99OrWAGJFB6wgyWW8hZ/xyOfbLn1vSxl/t7oNKw09wtUBgPiW9dsT TuSBpgXBn688Y5Yl7vY8tVK2wULxs35IYkiXv7uLQ0HGpwAONdIx0SJ4uXDz0A1l5Qi2Mq 4JxVJ1bIZjAB+JboBDmcaqgEhQtwcZaqxl6gAPd4N09b+zaMT1y6SgIEsQIhEjVsXM0Zkv sRVdh7oNUpCSUAwOax3+WesVIvwaoDZsawXZiCrOdJAi8kn7x2vPnnTxS8+yYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB9kl56YQz935 for ; Thu, 07 May 2026 11:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39d39 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 11:58:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: ef19cae25337 - main - dtrace_mib.4: Document the DTrace MIB provider List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef19cae25337e7449f338914650bbfab0fbea99f Auto-Submitted: auto-generated Date: Thu, 07 May 2026 11:58:34 +0000 Message-Id: <69fc7e6a.39d39.72740059@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=ef19cae25337e7449f338914650bbfab0fbea99f commit ef19cae25337e7449f338914650bbfab0fbea99f Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2025-07-18 15:46:25 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-07 11:53:50 +0000 dtrace_mib.4: Document the DTrace MIB provider Reviewed by: kp MFC after: 1 week Obtained from: 60d8dbbef075 netinet: add a probe point for IP, IP6, ICMP, ICMP6, UDP and TCP stats counters Differential Revision: https://reviews.freebsd.org/D53709 --- cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 | 1 + sbin/sysctl/sysctl.8 | 3 +- share/man/man4/Makefile | 1 + share/man/man4/dtrace_ip.4 | 3 +- share/man/man4/dtrace_mib.4 | 123 +++++++++++++++++++++++++++ share/man/man4/dtrace_tcp.4 | 3 +- share/man/man4/icmp.4 | 3 +- share/man/man4/icmp6.4 | 3 +- share/man/man4/ifmib.4 | 3 +- share/man/man4/ip.4 | 3 +- share/man/man4/ipsec.4 | 3 +- share/man/man4/tcp.4 | 3 +- share/man/man4/udp.4 | 3 +- share/man/man7/stats.7 | 5 +- 14 files changed, 149 insertions(+), 11 deletions(-) diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 index 45cb8c863f7a..e78b6e1875ae 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 +++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 @@ -1304,6 +1304,7 @@ in .Xr dtrace_ip 4 , .Xr dtrace_kinst 4 , .Xr dtrace_lockstat 4 , +.Xr dtrace_mib 4 , .Xr dtrace_pid 4 , .Xr dtrace_proc 4 , .Xr dtrace_priv 4 , diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8 index e0e35f075a78..b97bce320898 100644 --- a/sbin/sysctl/sysctl.8 +++ b/sbin/sysctl/sysctl.8 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 31, 2025 +.Dd May 7, 2026 .Dt SYSCTL 8 .Os .Sh NAME @@ -336,6 +336,7 @@ The option has been deprecated and is silently ignored. .Sh SEE ALSO .Xr sysctl 3 , +.Xr dtrace_mib 4 , .Xr loader.conf 5 , .Xr sysctl.conf 5 , .Xr security 7 , diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 44671c564239..b9c441e97597 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1023,6 +1023,7 @@ _dtrace_provs= dtrace_audit.4 \ dtrace_ip.4 \ dtrace_kinst.4 \ dtrace_lockstat.4 \ + dtrace_mib.4 \ dtrace_pid.4 \ dtrace_priv.4 \ dtrace_proc.4 \ diff --git a/share/man/man4/dtrace_ip.4 b/share/man/man4/dtrace_ip.4 index e9fbdfa3cf43..6faeb305ffc5 100644 --- a/share/man/man4/dtrace_ip.4 +++ b/share/man/man4/dtrace_ip.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 14, 2015 +.Dd May 7, 2026 .Dt DTRACE_IP 4 .Os .Sh NAME @@ -266,6 +266,7 @@ This provider is compatible with the providers found in Solaris and Darwin. .Sh SEE ALSO .Xr dtrace 1 , +.Xr dtrace_mib 4 , .Xr dtrace_tcp 4 , .Xr dtrace_udp 4 , .Xr ip 4 , diff --git a/share/man/man4/dtrace_mib.4 b/share/man/man4/dtrace_mib.4 new file mode 100644 index 000000000000..e8c2dd3a6f05 --- /dev/null +++ b/share/man/man4/dtrace_mib.4 @@ -0,0 +1,123 @@ +.\" +.\" Copyright (c) 2025-2026 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd May 7, 2026 +.Dt DTRACE_MIB 4 +.Os +.Sh NAME +.Nm dtrace_mib +.Nd a DTrace provider for Management Information Base +.Sh SYNOPSIS +.Cm mib: Ns Ar module Ns Cm \&:count: Ns Ar counter +.Pp +In +.Xr config 5 : +.Cd "options KDTRACE_MIB_SDT" +.Sh DESCRIPTION +The +.Nm mib +provider allows tracing of Management Information Base stats counters. +.Pp +The list of instrumented +.Ar module Ns s +includes: +.Bl -tag -offset indent -width ipcomp -compact +.It Cm ah +IP Authentication Header (RFC 2402), +.Xr ipsec 4 +.It Cm esp +IP Encapsulating Security Payload (RFC 1827, RFC 2406), +.Xr ipsec 4 +.It Cm icmp +.Xr icmp 4 +.It Cm icmp6 +.Xr icmp6 4 +.It Cm ip +.Xr ip 4 +.It Cm ip6 +.Xr ip6 4 +.It Cm ipcomp +IP Payload Compression Protocol, +.Xr ipsec 4 +.It Cm ipsec +.Xr ipsec 4 +.It Cm tcp +.Xr tcp 4 +.It Cm udp +.Xr udp 4 +.El +.Pp +The +.Cm mib: Ns Ar module Ns Cm \&:count: Ns Ar counter +probes fire when the +.Ar counter +in +.Ar module Ns s +increases. +.Pp +The first probe argument, +.Vt uint64_t Va args[0] , +is the increment that the +.Ar counter +will increase by. +.Pp +Note that some probes like +.Cm mib:esp:count:esps_hist +or +.Cm mib:icmp6:count:icp6s_outhist +provide additional probe-specific arguments. +.Sh EXAMPLES +.Ss Example 1 : Tracing IP Stats Counters +When debugging network issues one common clue is an unexpectedly +incrementing error counter. +This is helpful, in that it gives us an +idea of what might be going wrong, but often these counters may be +incremented in different functions. +.Pp +Trace all +.Nm mib +probes in the +.Xr ip 4 +module and print the current count and a stack trace: +.Pp +.Bd -literal -offset 2n +# dtrace -n 'mib:ip:count: { printf("%d", arg0); stack(); }' +dtrace: description 'mib:ip:count: ' matched 29 probes +CPU ID FUNCTION:NAME + 7 98784 count:ips_localout 1 + kernel`ip_output+0x17a2 + kernel`udp_send+0xaca + kernel`sosend_dgram+0x315 + kernel`sousrsend+0x79 + kernel`kern_sendit+0x1be + kernel`sendit+0x1ab + kernel`sys_sendmsg+0x5b + kernel`amd64_syscall+0x169 + kernel`0xffffffff81094b8b +.Ed +.Sh SEE ALSO +.Xr dtrace 1 , +.Xr dtrace_ip 4 , +.Xr dtrace_tcp 4 , +.Xr dtrace_udp 4 , +.Xr tracing 7 , +.Xr sysctl 8 +.Sh STANDARDS +The probe descriptions in +the +.Fx +.Nm mib +provider are not compatible with those in the Solaris/illumos mib provider. +.Sh AUTHORS +.An -nosplit +The +.Nm mib +provider was added to +.Fx +by +.An Kristof Provost Aq Mt kp@FreeBSD.org . +.Pp +This manual page was written by +.An Mateusz Piotrowski Aq Mt 0mp@FreeBSD.org . diff --git a/share/man/man4/dtrace_tcp.4 b/share/man/man4/dtrace_tcp.4 index af57f6e94a63..5570dd965706 100644 --- a/share/man/man4/dtrace_tcp.4 +++ b/share/man/man4/dtrace_tcp.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 2, 2023 +.Dd May 7, 2026 .Dt DTRACE_TCP 4 .Os .Sh NAME @@ -501,6 +501,7 @@ provider in Solaris. .Sh SEE ALSO .Xr dtrace 1 , .Xr dtrace_ip 4 , +.Xr dtrace_mib 4 , .Xr dtrace_sctp 4 , .Xr dtrace_udp 4 , .Xr dtrace_udplite 4 , diff --git a/share/man/man4/icmp.4 b/share/man/man4/icmp.4 index c8c92a794e24..493d2d218cec 100644 --- a/share/man/man4/icmp.4 +++ b/share/man/man4/icmp.4 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 11, 2024 +.Dd May 7, 2026 .Dt ICMP 4 .Os .Sh NAME @@ -264,6 +264,7 @@ exists. .Xr recv 2 , .Xr send 2 , .Xr sysctl 3 , +.Xr dtrace_mib 4 , .Xr inet 4 , .Xr intro 4 , .Xr ip 4 , diff --git a/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4 index 8730e3fefacb..d9a8bd34a81a 100644 --- a/share/man/man4/icmp6.4 +++ b/share/man/man4/icmp6.4 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 1, 2018 +.Dd May 7, 2026 .Dt ICMP6 4 .Os .Sh NAME @@ -243,6 +243,7 @@ structure as the option value. .Xr setsockopt 2 , .Xr socket 2 , .Xr getprotobyname 3 , +.Xr dtrace_mib 4 , .Xr inet6 4 , .Xr ip6 4 , .Xr netintro 4 diff --git a/share/man/man4/ifmib.4 b/share/man/man4/ifmib.4 index 20b5613b6873..48e79c1f9411 100644 --- a/share/man/man4/ifmib.4 +++ b/share/man/man4/ifmib.4 @@ -25,7 +25,7 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 26, 2020 +.Dd May 7, 2026 .Dt IFMIB 4 .Os .Sh NAME @@ -165,6 +165,7 @@ and implements a superset of the MIB for Ethernet-like networks. .Sh SEE ALSO .Xr sysctl 3 , +.Xr dtrace_mib 4 , .Xr intro 4 , .Xr ifnet 9 .\" .Xr ethermib 4 , diff --git a/share/man/man4/ip.4 b/share/man/man4/ip.4 index fb5ea398c840..140866f6fcf6 100644 --- a/share/man/man4/ip.4 +++ b/share/man/man4/ip.4 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 9, 2021 +.Dd May 7, 2026 .Dt IP 4 .Os .Sh NAME @@ -907,6 +907,7 @@ field was not equal to the length of the datagram written to the socket. .Xr byteorder 3 , .Xr CMSG_DATA 3 , .Xr sourcefilter 3 , +.Xr dtrace_mib 4 , .Xr icmp 4 , .Xr igmp 4 , .Xr inet 4 , diff --git a/share/man/man4/ipsec.4 b/share/man/man4/ipsec.4 index 9fd6207c2f14..0c60e0e3c121 100644 --- a/share/man/man4/ipsec.4 +++ b/share/man/man4/ipsec.4 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 4, 2025 +.Dd May 7, 2026 .Dt IPSEC 4 .Os .Sh NAME @@ -336,6 +336,7 @@ routines from looking into the IP payload. .Xr socket 2 , .Xr ipsec_set_policy 3 , .Xr crypto 4 , +.Xr dtrace_mib 4 , .Xr enc 4 , .Xr icmp6 4 , .Xr if_ipsec 4 , diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4 index 3c9f4ff83f3d..4c01daf4e14e 100644 --- a/share/man/man4/tcp.4 +++ b/share/man/man4/tcp.4 @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 5, 2025 +.Dd May 7, 2026 .Dt TCP 4 .Os .Sh NAME @@ -1098,6 +1098,7 @@ when trying to use a TCP function block that is not available; .Xr stats 3 , .Xr sysctl 3 , .Xr blackhole 4 , +.Xr dtrace_mib 4 , .Xr inet 4 , .Xr intro 4 , .Xr ip 4 , diff --git a/share/man/man4/udp.4 b/share/man/man4/udp.4 index b1dbff56154f..db9d0e0ae2c7 100644 --- a/share/man/man4/udp.4 +++ b/share/man/man4/udp.4 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 20, 2025 +.Dd May 7, 2026 .Dt UDP 4 .Os .Sh NAME @@ -175,6 +175,7 @@ exists. .Xr send 2 , .Xr socket 2 , .Xr blackhole 4 , +.Xr dtrace_mib 4 , .Xr inet 4 , .Xr intro 4 , .Xr ip 4 , diff --git a/share/man/man7/stats.7 b/share/man/man7/stats.7 index 0b57d525522c..f81c2fef0155 100644 --- a/share/man/man7/stats.7 +++ b/share/man/man7/stats.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 28, 2025 +.Dd May 7, 2026 .Dt STATS 7 .Os .Sh NAME @@ -44,6 +44,8 @@ are currently included in the base system, with more appearing periodically. Show Bluetooth socket information .It Nm ctlstat CAM Target Layer statistics utility +.It Nm dtrace_mib +Access the MIB stats counters with DTrace .It Nm dwatch Watch processes as they trigger a particular DTrace probe .It Nm fstat @@ -99,6 +101,7 @@ Report ZFS I/O statistics .Xr sockstat 1 , .Xr stat 1 , .Xr systat 1 , +.Xr dtrace_mib 4 , .Xr intro 7 , .Xr tuning 7 , .Xr ctlstat 8 , From nobody Thu May 7 11:59:29 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gB9lj6RH3z6c94L for ; Thu, 07 May 2026 11:59:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gB9lj30sVz3t6R for ; Thu, 07 May 2026 11:59:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778155169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=27lrEmY1Z9Zo+eVBSgTLwKY7jiW3CH9L3eJjU12d0tk=; b=NYyYSV+2UQ2AO1Ku2ZiqDMYY6hcrUKPS27L/Jn7vRfGtnq1kdKfr4jWopwuVticVWVhAWj PDj5pc3A1NC8MqHexPJvNifreOrIZ8dHxz40jZf07B8K6Q2UiQxrOEkj+VzzoPRNpXRVW1 FVqO9ZnVJx4ba0mMTRqocuGvu8yyl7fVQUumrkguwp9iSXs9T7ODeD1yMiSdF7rVXKl8YG VxQoMVLAKq75PSZmp5UTnMgpmncyQYbFvJXykhgHuVTp/aA5F46Y+hzuaEeksEwmfqg96u LQRJ4QQ18TLtYbt2rDh8eOmrPsKbXiOrJNw4UYsnrn/yIkNLK6qURyInsUpryA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778155169; a=rsa-sha256; cv=none; b=G63FaK0RLxMau1/w/CulKCLe6UXJcM/ARBDRfrLeBlsCZAIAfDfOoeIepKt5DReAgJmhcN XZ7L860ZZduh72V2E5sw9PW0byvuc0LxiiV0hUBfvcoQhY0mi6zNYW2ue3wwkcSWf6AYXP LiXSIzXluhUDqtiRL0JeCf55eZ/dVldgA4ezKy4SO5CgMNOOMpYK+3K7aYDw2tRvqHo1/1 i3vVEZfHYHP+AETQIFEFKfNfN2K+WBKHT14oaZ3K/1rYBxoA9HPCfvFGzJJxO3lmo63ub9 KmpZVRqgRS424CC3fYusJ2IEW9WGFPfMxvPoTj0S5kCF6PglHOdYBtmixGFFLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778155169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=27lrEmY1Z9Zo+eVBSgTLwKY7jiW3CH9L3eJjU12d0tk=; b=wFup6dMrlUSpScE+a3OTgbpOz4O2ya/OmnBZzHoVWwoybtGoYw79chwxH4E7jP+sIlIUN0 MJ3fTL98XA7hLYtnzXOIsBFY6R/lX69dQ5Nsa9PXjkI0zw8A0RgdnEM7+88CzQi2Gbd6qq 5jepDzv13a7zKzCV8E2N1NBcD/XLSFKGOezGz84u/UxJpMFvkl2IiW7bcw3VtoV30cTFuV JYCaeOpTFedvlkyyvLdW3NFfopMEOA1QOAn+YJe5irmpFW1U5BvoUl/M4elv4RCnu2pPCf CaWNae+VrN3OLLZEEjxcgCwXPSwz06uDbiG9KBvPf+UM6vOxkV+ESs6pbS7IDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB9lj2VdVz8m0 for ; Thu, 07 May 2026 11:59:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38277 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 11:59:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ce4e8c478a26 - main - bufspace_wait(): only try to help bufdaemon if there is a chance to help List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce4e8c478a261ce6c7af7d81817f86420c5239b9 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 11:59:29 +0000 Message-Id: <69fc7ea1.38277.2ead2076@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ce4e8c478a261ce6c7af7d81817f86420c5239b9 commit ce4e8c478a261ce6c7af7d81817f86420c5239b9 Author: Konstantin Belousov AuthorDate: 2026-04-22 05:09:34 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-07 11:59:11 +0000 bufspace_wait(): only try to help bufdaemon if there is a chance to help Only call buf_flush() if there are some dirty buffers belonging to the vnode we are allocating the buffer for. Otherwise the bd dirty queue scan cannot find anything and it makes no sense to spend CPU doing it. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/kern/vfs_bio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 8f47a7abbc5e..675f6fb4e526 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -727,7 +727,8 @@ bufspace_wait(struct bufdomain *bd, struct vnode *vp, int gbflags, BD_LOCK(bd); while (bd->bd_wanted) { if (vp != NULL && vp->v_type != VCHR && - (td->td_pflags & TDP_BUFNEED) == 0) { + (td->td_pflags & TDP_BUFNEED) == 0 && + vp->v_bufobj.bo_dirty.bv_cnt > 0) { BD_UNLOCK(bd); /* * getblk() is called with a vnode locked, and From nobody Thu May 7 12:08:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gB9xy1ym6z6c9Tl for ; Thu, 07 May 2026 12:08:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gB9xx6p3Tz3v69 for ; Thu, 07 May 2026 12:08:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778155702; 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=fnWAZTz6fBp47AK/a+NCMpJ1BOHSdqEzbUAD5ke1GBk=; b=JUt5ZMaC+FeYA5Dn88SEzlTsgh47x9fq7HrGWcyszBhpQZYb/je2E2HEx4hR1keYNLq7d8 fuhzMluhyN5EbYFP4SFK06BgWWAAZajru+mgr1vB3LumTPTLko0142M00tLFfFjBP/6fRZ waNkLXna7ZPWc3BY7eMWnjkbvFZbRo0t9KE8nWSunykg6U8SrhxZOQ2JbG+mhY8ayjyv1r bylz5HPxsa1B1fZnhT00+m5y3LBBXdiBQ7P8PAuvH5h9N6fOrexr/v4YKwWIK/8AVx+lyR Esy6xlSNsvrNKa84FiQBbOr1za3ggIjWUq91w/lb0olFL1iO/CCW+vto44AUpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778155702; a=rsa-sha256; cv=none; b=pe2oPCtQQ7AeHAXKNk0NnwMxYfToe5Z01fW+1AQQ3BQyPMeYDhSJNd6HD+zqUTC4BEezs9 oT8pThoQS2Xwpn4j9CEqW4GrFOUhsJJCzT322yUV4deWug+hndJDa6ks6XP3S1SydS20PW FEzVt1o3c9Dc7iWSbPoqyyfWTCJZq7ZNpFUTpyWHiCJnlULzqGb2amWFKYQNexPQ5GfkoN rRcBUPlICGlhYZPdkS/t7VDwGiu5/FQZnKk+Mss/TxDdl2GpLC+n89Rn5ABB1vjPQfzbxx HwcqHk5g+IYLQZM54AnD4mkxIh6GAzGrgMSQr7qJ5ooVJUcP7HGkeQkEmyepKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778155702; 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=fnWAZTz6fBp47AK/a+NCMpJ1BOHSdqEzbUAD5ke1GBk=; b=nltpOBW5i5Rhm1+fLnvuIQeYNV/blCsxaz363nkpcfz+VlOdh/WJBsjHCGN3/yfvehyLoj srDN94rpfggLclloL3iz23aCAmthOAw9LC3VeNTYbA6cCB7DVIeJe8PdfSX2sPNAGMBnPM AxNH3CgE9Cikvq8jYyuc+QGf+nYbM2DpvpiMhJhiMTa6XhwOmzObwC2S4av7lofH/zk5gO 5DIgnxvLiisJfTJzhU2cYMTbczpQltDlgIaEjzSdMixSF9OTYiACHJ77itUI145BRaY3JF SXQYwzatvM6X3d5AOPdlY6HnusG0ixs5oJ34CSij+attQJQtyi8p4LHQlj5zgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gB9xx5wf8z8sr for ; Thu, 07 May 2026 12:08:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39d61 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 12:08:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Boris Lytochkin From: Andrey V. Elsukov Subject: git: 4e57c937999d - stable/15 - etcupdate: fix arguments order of diff command List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 4e57c937999df5b186ccf827542aee717baab07c Auto-Submitted: auto-generated Date: Thu, 07 May 2026 12:08:16 +0000 Message-Id: <69fc80b0.39d61.3bdd9662@gitrepo.freebsd.org> The branch stable/15 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=4e57c937999df5b186ccf827542aee717baab07c commit 4e57c937999df5b186ccf827542aee717baab07c Author: Boris Lytochkin AuthorDate: 2026-04-30 11:31:34 +0000 Commit: Andrey V. Elsukov CommitDate: 2026-05-07 12:06:54 +0000 etcupdate: fix arguments order of diff command Due to misplacement of the second -L argument of diff command, it is treated by getopt_long as an error. Also add -l option for a diff command that alters the way it shows differences. Instead of printing full diff, it reports changed file the same way as added/removed files are reported. Reviewed by: imp Obtained from: Yandex LLC Differential Revision: https://reviews.freebsd.org/D56708 (cherry picked from commit 6d65c91b9a4743bbffc3508bf754e68b65bbd494) --- usr.sbin/etcupdate/etcupdate.8 | 7 ++++++- usr.sbin/etcupdate/etcupdate.sh | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/usr.sbin/etcupdate/etcupdate.8 b/usr.sbin/etcupdate/etcupdate.8 index bf7ddb792907..6216722fc81f 100644 --- a/usr.sbin/etcupdate/etcupdate.8 +++ b/usr.sbin/etcupdate/etcupdate.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 15, 2024 +.Dd April 30, 2026 .Dt ETCUPDATE 8 .Os .Sh NAME @@ -51,6 +51,7 @@ .Ar tarball .Nm .Cm diff +.Op Fl l .Op Fl d Ar workdir .Op Fl D Ar destdir .Op Fl I Ar patterns @@ -468,6 +469,10 @@ shell pattern. This option may be specified multiple times to specify multiple patterns. Multiple space-separated patterns may also be specified in a single option. +.It Fl l +In +.Cm diff +mode list files that are changed locally, omit printing content difference. .It Fl L Ar logfile Specify an alternate path for the log file. The diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh index 7bddd6593b56..f62343a24eee 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -531,9 +531,15 @@ diffnode() echo ;; $COMPARE_DIFFFILES) + if [ -n "$difflistonly" ]; then + echo + echo "Changed: $3" + echo + break; + fi echo "Index: $3" rule "=" - diff -u $diffargs -L "$3 ($4)" $1/$3 -L "$3 ($5)" $2/$3 + diff -u $diffargs -L "$3 ($4)" -L "$3 ($5)" $1/$3 $2/$3 ;; esac } @@ -1791,11 +1797,15 @@ ignore= nobuild= preworld= noroot= -while getopts "d:m:nprs:t:A:BD:FI:L:M:N" option; do +difflistonly= +while getopts "d:lm:nprs:t:A:BD:FI:L:M:N" option; do case "$option" in d) WORKDIR=$OPTARG ;; + l) + difflistonly=YES + ;; m) MAKE_CMD=$OPTARG ;; From nobody Thu May 7 12:11:10 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBB1B5w2Nz6cB1b for ; Thu, 07 May 2026 12:11: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 4gBB1B4HD4z3vpr for ; Thu, 07 May 2026 12:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778155870; 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=zw8pH8CyhjPR4Lpvtdres0uZgwET3Fex5JD++0nzwY0=; b=ZE40Cx3J8Q4VgborKGN97Gq7VqHsAD2S6la5jKwW+uaep3jzfjk4cxhVw0LgVM/ZEIlgYI oJOJhYWC2Mgo/IiDo2D5GosLg9DYqTF3/hb2f/LbVYULWRw9RC7PpET+WqHyeGWM4ifR2y 3xkt8yRfDyXm7LQ3Y/Ejt3KAHFcTwR7RvcgnKVN2fsW5KKYOmia8fnBI/+x8ZEfQ+zpZoH z5X45IZvI63jT8W53jB4Kl3ys+cI/+wz/nTgZxFX9FWHxmH4ObmpOPk7EJnEsOnjR/qb07 o2PlVwN9D10yw29gRgahh4OAnZeOcrC4eUGYiHyw+Ax0BqLpp9rSRM3Ffo746g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778155870; a=rsa-sha256; cv=none; b=iZkXKOLkjbI11hnurF5uPwElyOYZvR83D2iPJFnuTQZG6smRDihxfRtNxdSG46zUSh0/OA RWcDWHjiIBJ0s8hUjamedymo9AcL9lJia3KG7oMs1OMoWBfqCatoJqnhpMuftzoV/b6q9Z gXa4J8npQ+MQtlVGtOmarTiePIiCGDGzytfsyULs9pue52Tr4/8gH4J0iKtoK+xN18mrJg jAUu7OkWZPKiIKlZFhLrPWgCh6grTETvpepMnalywl4w+uouczJvPQMN42cOHZS5ZS8gYO +ab5YDB2lhHm+jYbF+jyCTCDPFV1QOZDs1si56TWEM+ZaKIzPfFbg4q02ULZ4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778155870; 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=zw8pH8CyhjPR4Lpvtdres0uZgwET3Fex5JD++0nzwY0=; b=OpdWYZP3U+s06vDp0LppSHXWqkuOdbw3WMejNsl9m6lRQKZuVIzqvke34eqzOW8UeSopbJ ngWAHh0X7/lvbgt9zK6PvwHvLppMwBeh0Ocd8TMkKf4hlXxapgduFLioJDDH7ZGLRN7mB1 /Joq0EZRobRBRQYQaJdLiGjcBlVkPK686SikmuvWn2YG/3TNcNuM40e3rqp61QQm5cPgQT krJbQmz5KPdfeMf6xReRr3JgHVZxMTaalmaLwEyjixoRAW2gDH0AcnPtuVbRvwq+aTgtOT XVnqjattXOSrMMDrKGyMSBJf/KE5doNcDzhRbHvXFP1/ow8+bOBhlLOESi8gNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBB1B1Nv0z8nD for ; Thu, 07 May 2026 12:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b257 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 12:11:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Boris Lytochkin From: Andrey V. Elsukov Subject: git: 81df9a1045c3 - stable/14 - etcupdate: fix arguments order of diff command List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 81df9a1045c3e1778c551fcd62125e0b5d2b76f2 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 12:11:10 +0000 Message-Id: <69fc815e.3b257.27996b85@gitrepo.freebsd.org> The branch stable/14 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=81df9a1045c3e1778c551fcd62125e0b5d2b76f2 commit 81df9a1045c3e1778c551fcd62125e0b5d2b76f2 Author: Boris Lytochkin AuthorDate: 2026-04-30 11:31:34 +0000 Commit: Andrey V. Elsukov CommitDate: 2026-05-07 12:09:41 +0000 etcupdate: fix arguments order of diff command Due to misplacement of the second -L argument of diff command, it is treated by getopt_long as an error. Also add -l option for a diff command that alters the way it shows differences. Instead of printing full diff, it reports changed file the same way as added/removed files are reported. Reviewed by: imp Obtained from: Yandex LLC Differential Revision: https://reviews.freebsd.org/D56708 (cherry picked from commit 6d65c91b9a4743bbffc3508bf754e68b65bbd494) --- usr.sbin/etcupdate/etcupdate.8 | 7 ++++++- usr.sbin/etcupdate/etcupdate.sh | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/usr.sbin/etcupdate/etcupdate.8 b/usr.sbin/etcupdate/etcupdate.8 index 5eb2aa644037..3c546b324311 100644 --- a/usr.sbin/etcupdate/etcupdate.8 +++ b/usr.sbin/etcupdate/etcupdate.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 9, 2022 +.Dd April 30, 2026 .Dt ETCUPDATE 8 .Os .Sh NAME @@ -51,6 +51,7 @@ .Ar tarball .Nm .Cm diff +.Op Fl l .Op Fl d Ar workdir .Op Fl D Ar destdir .Op Fl I Ar patterns @@ -468,6 +469,10 @@ shell pattern. This option may be specified multiple times to specify multiple patterns. Multiple space-separated patterns may also be specified in a single option. +.It Fl l +In +.Cm diff +mode list files that are changed locally, omit printing content difference. .It Fl L Ar logfile Specify an alternate path for the log file. The diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh index 7bddd6593b56..f62343a24eee 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -531,9 +531,15 @@ diffnode() echo ;; $COMPARE_DIFFFILES) + if [ -n "$difflistonly" ]; then + echo + echo "Changed: $3" + echo + break; + fi echo "Index: $3" rule "=" - diff -u $diffargs -L "$3 ($4)" $1/$3 -L "$3 ($5)" $2/$3 + diff -u $diffargs -L "$3 ($4)" -L "$3 ($5)" $1/$3 $2/$3 ;; esac } @@ -1791,11 +1797,15 @@ ignore= nobuild= preworld= noroot= -while getopts "d:m:nprs:t:A:BD:FI:L:M:N" option; do +difflistonly= +while getopts "d:lm:nprs:t:A:BD:FI:L:M:N" option; do case "$option" in d) WORKDIR=$OPTARG ;; + l) + difflistonly=YES + ;; m) MAKE_CMD=$OPTARG ;; From nobody Thu May 7 13:14:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBCPw5kRfz6cGs2 for ; Thu, 07 May 2026 13:14: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 4gBCPw4j0yz441X for ; Thu, 07 May 2026 13:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778159652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cJ4idQMj7MKg7KjOqTH1Ebclw1pJfo4Uqby/yk1kM5M=; b=Hsz3EGBGJeJh9vbd+vtNG1o7YnTz31sO8gYxGAd6Ba1/ToAoL9fhavCEGN53ZiK7bklF1P h0P833wlTPgzZdnKdUpmr7p5kpb7KVNUvefZQa6NzXGbATLv+DPdZaTz9WNWg0kRhurYdt j+I1CJthmFYXQK11I90t0vdioip+y4mi758EZiBE5WxUvXYw3jFqjUhKTFjzCsS4vXUvQ7 gqVS2i7xM3l8YDiKI5XQTSA05QXojJOMIk4TU7xibIH0pmLWde+I+rbi9b0sofgb1v2Ot2 0iKxixd5IpFxzmERRi/YbPqf9UAFDQ69QYmemtmgXa4P3SOswD8+JbfFxUR05w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778159652; a=rsa-sha256; cv=none; b=Mm73K/yEYLos6LqetqEKMg282ANrF9KOCiNoU2qQCsUzeAgHkpc6giNgd9xHrGBQnUzA1N kW2DoC4p4rDBg1/JTfB1Vr6qTksarr2CG4KNclbf/nZQ/XwQz1QWXx7sWUgUKxZ/g+LuK0 e7ykZ5PFBj5JX9L/vJYy6tjm9Hy4+rpB/VDwCE1ELnH+Pz0a24df9rXk+ywRV41QNbuejJ hPrvz2AqhjrTrM/R3m1A8sN1gL3UrPCIru3TEQ1GW2s0SQqYYNR7PqJdsWUAtYj1Lpx84+ YwmQ2ZgK0HCZi+voLDMAB4D/OrpxYkewb93HK0V38t2PDJUbft4b4oVkka4goQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778159652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cJ4idQMj7MKg7KjOqTH1Ebclw1pJfo4Uqby/yk1kM5M=; b=CxgFQl+3ItdOl5ut66tmYMZk560AafpZz8fT5gsptH5OiVA1XuGJRzkHA7w//6YrOHaZue vTqtDQdLRXnM674ndqut3QGoM7a/cn3GT02aJ0UgAeIfQHA+tqWk3rSMEWrnMDAVb2KSFn NuDhfAipwJGashYGJDrXK6AV46++HnYobs1yyzfNXEPLcqN8PkeTQC5DkEVo8JqH88vfNp 4DlSB9mqFA8+KWCbOiK3Cx0MnRe5186y/pGMJheibWa+qrTCkk/MKjrhw68QE5pWWTKvxq rEN2KbKxYrzCM6K+aGuese8b1QKuJjxel8ryZDMOhZjz54aQX3T1nbIVLd3+ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBCPw46zRzBxc for ; Thu, 07 May 2026 13:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a4d1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 13:14:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 640af0d9067b - main - cam: Cross-reference dtrace_cam.4 and cam.4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 640af0d9067bee6e8f300c158f0cf928e666977c Auto-Submitted: auto-generated Date: Thu, 07 May 2026 13:14:07 +0000 Message-Id: <69fc901f.1a4d1.24894f23@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=640af0d9067bee6e8f300c158f0cf928e666977c commit 640af0d9067bee6e8f300c158f0cf928e666977c Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-05-07 13:11:13 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-07 13:13:47 +0000 cam: Cross-reference dtrace_cam.4 and cam.4 While here, remove empty sections from cam.4. MFC after: 3 days Fixes: 1a7151f79664 cam: Add probes for xpt actions --- share/man/man4/dtrace_cam.4 | 6 ++---- share/man/man4/scsi.4 | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/man/man4/dtrace_cam.4 b/share/man/man4/dtrace_cam.4 index e5b7ae34c391..8e2790e72d22 100644 --- a/share/man/man4/dtrace_cam.4 +++ b/share/man/man4/dtrace_cam.4 @@ -2,7 +2,7 @@ .\" .\" SPDX-License-Identifier: BSD-2-Clause .\" -.Dd December 26, 2025 +.Dd May 7, 2026 .Dt DTRACE_CAM 4 .Os .Sh NAME @@ -25,11 +25,9 @@ probe fires when that request completes. The .Fn cam::xpt:async-cb probe fires just before an async callback is called. -.Sh ARGUMENTS -.Sh FILES -.Sh EXAMPLES .Sh SEE ALSO .Xr dtrace 1 , +.Xr cam 4 , .Xr SDT 9 .Sh HISTORY The diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4 index e66fccf53e64..b6390fec646e 100644 --- a/share/man/man4/scsi.4 +++ b/share/man/man4/scsi.4 @@ -22,7 +22,7 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.Dd December 11, 2025 +.Dd May 7, 2026 .Dt CAM 4 .Os .Sh NAME @@ -530,6 +530,8 @@ for details. .\" .Xr ps3cdrom 4 , .Xr sbp 4 , .Xr twa 4 +.It Sy DTrace Providers: +.Xr dtrace_cam 4 .El .Sh HISTORY The From nobody Thu May 7 14:23:12 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBDxX42rXz6cN06 for ; Thu, 07 May 2026 14:23:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBDxX3Llbz4B7g for ; Thu, 07 May 2026 14:23:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778163792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0/fGZizJpvRdw4uKOe+pEqWnQfWC55ur+3t2fPHn6xs=; b=PY/PufbX8olGoH8zusBXJuT6KT6EAa+UsfYeMdlD4Bzntj7iRURaORwdn6bZzF9vQrr+6j dWR6iQMRRqv5KWXCME99xqPpjm7pbB6yAoIWe5fZxyQSy183GpVo751BGxqTKGDjkvQYKp 3wfgLbJlJGFawAV35mK5g6EoPCzWMjpUeZmcaa8W8hF6ZFUjahbVjv0j9eMX3YkJAK4NX4 cSau5a2hPWBZv5IXw9VKAlblHEGo6hb0290HNyR3acMyeamxaWLnHh1vWEb18G/miu2r7l GmTr0QpIrM6+T+vegzu+0xcFc2QLxm4++LCuzgnKSahykgDJxx/OuGZ1RUWeVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778163792; a=rsa-sha256; cv=none; b=U7hRh6NU6E1vFqO6Sag6ehOIDJV8xpQ4ppOH08Cc3VpBZME7gcSR5dFKOesqAK8skcXEtI HzaKSFqJp+qJRZhhKgcWHd5QtVr3k/ZEILGXrFhkPNi+hCgJB3PyddpFgXBanRLvEIa0du Xr+0leOgMD1YdntdgoNyq3rxx4L49SFzKiAlSCIgUkf1IozuTZzYygeo8NsJAlijtII+aa OY8cIJ5V4NCQ8gB2D3k7/D2VdhcxPMYpuoRisO/6RbTq8iZmiO1m5xPYeUfUqp3V8y3pMb FP4NXy/tb11z3cdvZ4nGin4BYodSG32DaaCKeS5WotF6ieJw9iV7rMMDgi6VfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778163792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0/fGZizJpvRdw4uKOe+pEqWnQfWC55ur+3t2fPHn6xs=; b=qDJsbR1JY28f0XhUBGSmc0bK2JQPDHnjXCL8Fkjt9f2vXNtBGpgLXr3Kce46BSVrbUSCHw sPfgZ85Ig9egGqUph1gfyKoMCcGB7wqbCLXM5oPhSNVvfSQN2cyMyku/7e9OXP3r5aUeDC lY1yQpVYjrwsZjfCZiM9eUNdf8U7DqBHJtdi4VQKRChu43vrYhDJ/q8EZ5tjE3SLGZL73V R+L7aOdfbZVV9Sr0D1Mgb2lJbT9GJeaHQXReFWW03MM7ILD8oKocnVWel7NNultIA7llp0 x4Yh3QHVYIM7AB3KttLPwbIzxkS99aRNRGDGGG28588UDGKv/X80qYgWkOXMhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBDxX2vY8zTYm for ; Thu, 07 May 2026 14:23:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 223c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 14:23:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 2b9301a22bc6 - main - d.7: Document macro variables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b9301a22bc677239d3c0dc783d970f17e7ca294 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 14:23:12 +0000 Message-Id: <69fca050.223c2.1cd02282@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=2b9301a22bc677239d3c0dc783d970f17e7ca294 commit 2b9301a22bc677239d3c0dc783d970f17e7ca294 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-05-07 14:20:46 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-07 14:20:46 +0000 d.7: Document macro variables MFC after: 1 week --- share/man/man7/d.7 | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/share/man/man7/d.7 b/share/man/man7/d.7 index 59b3389b121b..792f6d36ce73 100644 --- a/share/man/man7/d.7 +++ b/share/man/man7/d.7 @@ -1,9 +1,9 @@ .\" .\" SPDX-License-Identifier: BSD-2-Clause .\" -.\" Copyright (c) 2025 Mateusz Piotrowski <0mp@FreeBSD.org> +.\" Copyright (c) 2025-2026 Mateusz Piotrowski <0mp@FreeBSD.org> .\" -.Dd October 28, 2025 +.Dd May 7, 2026 .Dt D 7 .Os .Sh NAME @@ -39,6 +39,41 @@ This manual page serves as a short reference of the language. Refer to books listed in .Sx SEE ALSO for a complete reference. +.Sh MACRO VARIABLES +.Bl -column "$1, $2, $3, ..." "Syntax" +.It Sy Name Ta Sy Description +.It Va $1 , $2 , $3 , .\&.\&. Ta Macro arguments +.It Va $egid Ta Effective group ID Pq Xr getegid 2 +.It Va $euid Ta Effective user ID Pq Xr geteuid 2 +.It Va $gid Ta Real group ID Pq Xr getgid 2 +.It Va $pid Ta Process ID Pq Xr getpid 2 +.It Va $pgid Ta Process group ID Pq Xr getpgrp 2 +.It Va $ppid Ta Parent process ID Pq Xr getppid 2 +.It Va $sid Ta Session ID Pq Xr getsid 2 +.It Va $target Ta Target process ID of the process +specified via the +.Fl p +flag or created via the +.Fl c +flag. +.It Va $uid Ta Real user ID Pq Xr getuid 2 +.El +.Pp +The macro arguments correspond to the command-line operands. +They expand to an integer, identifier, or string depending on the context. +Prepending a macro argument with an extra dollar sign +.Pq Ql $ +forces string expansion. +.Pp +For example, +.Bd -literal -compact -offset indent +dtrace -n 'syscall::fstatat: /execname == $$1/ {}' -- ls +.Ed +uses +.Va $$1 +instead of +.Va $1 +to expand to a string instead rather than to a global variable identifier. .Sh PROBE'S DESCRIPTION A probe's description consists of four elements: .Sm off @@ -411,3 +446,10 @@ variable which typically provides the current working directory is not supported on .Fx at the moment. +.Pp +Macro variables +.Va $projid +and +.Va $taskid +are always 0 on +.Fx . From nobody Thu May 7 15:27:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBGMG0Kpzz6cjVK for ; Thu, 07 May 2026 15:27: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 4gBGMF5dfSz3RQ9 for ; Thu, 07 May 2026 15:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778167625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZjzZQ3S4ST5TvBnhnz3eXuy/XB3l5Y+odWYzxgJUFVY=; b=NjU2Xe+LVb47foWy/eU2tE+gZTDvY9gytYduAbF/lqT3qekATGYp79V/yG4NnlgjSJUVnK NHYaFytvBncehC+2InVooznbeF5VD2FJknmnrM6XNVLAXZr4vXxyFY0qOcPMHmF3e/K9SJ 5XfL7QM+hXczlcAtWLOzz9HMbJiWqOGLZDYbOYc4p9w5U0s+w4Ki76Hw7eYgSlTW9kiRsK rmHnHEdSz0n5Pegg+UH8UU05l38qFTgAQOCazaPbo3Yl7M3PKDpQA/sDhClGEyBfWewbFd alzag4iK3nsmNJZbXNEo7D49IV1GkKTULooSIaAt4iUKOR0xZxD3/dwYrtDg5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778167625; a=rsa-sha256; cv=none; b=HAiVLbDZa74nfSRb0g8Nxhj8zXCVOPqUiVPrFIb6bRsA53cH3dzPlQesDNishoB6cUEEJh +29tzpXOnmM8QIMnZYbSktM4M/lVqLMyCElqIhdhQCMSVDLaZIx5NN5eZuZFVTFUj9KleB EOjEEyZvz9buEZjvTcv7KlPOHH83yPrGKrBzMSEdGV+4uqWQAsRjZ/UZGtFGySzs4JOTyF /hEXDcM7GpOP5s3/T9JdOlXEFscOwnzp1dWuGgYTk4Y/Q1c2on8G+CZ6d3uhtGW/eLdbh1 f+zMujlElotZ6Wui97oLYsTOtj8UppYfKkXVDxrZI9j474Hj98jgDI0DxeYuQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778167625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZjzZQ3S4ST5TvBnhnz3eXuy/XB3l5Y+odWYzxgJUFVY=; b=LqwX4V6tGY+hz7LbgLe8XaLjrJVRUi3b6g2vGwplF7iw+/Et6/GZ2ZZpMIclPfKkB2RtdQ eqUm+0FYJbTpYH7rory1CdROQbxilhjzcUEDRAEnRKD6a+YUMLcPOd20XTx9Rrp9Ep4xPO /H29d7CB0XgaJfeFWi4ULDosHCDL5Zqqpi8/SZ2wNupm284CkF+UE3qM/2r2PB04F7ZlnZ 9uCrE0s5qQXTH/hPCfKqpq7C5jQj58rKEh1DIe7//rXXuBAU6Ydh5tNLEtYCy3PuscepnY h9xWPP41mtihsUokzm0hWb4oLXopkrNxTQsUKgeGWRoyaR+gcTaFa5KMVV1UoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBGMF4VRWzXpw for ; Thu, 07 May 2026 15:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30137 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 15:27:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 4211f280ba08 - stable/15 - nuageinit: only parse user_data as yaml when necessary List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 4211f280ba087c75dcd84f9b592238b2eae33af9 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 15:27:05 +0000 Message-Id: <69fcaf49.30137.708c942d@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=4211f280ba087c75dcd84f9b592238b2eae33af9 commit 4211f280ba087c75dcd84f9b592238b2eae33af9 Author: Baptiste Daroussin AuthorDate: 2026-05-06 20:14:17 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-07 15:26:10 +0000 nuageinit: only parse user_data as yaml when necessary This fixes a regression introduced in cae280931c9e which prevents user_data as a shell script to be used PR: 295062 Reported by: Ross McKelvie MFC After: 1 day (cherry picked from commit c316ec259011e9e22e40eaa72d834f3bfac95c28) --- libexec/nuageinit/nuageinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index f7700f7d8e70..a1ebd3f52b25 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -727,7 +727,7 @@ local function load_userdata() f:close() local obj = nil - if ud then + if ud and line == "#cloud-config" then f = io.open(ni_path .. "/" .. ud) obj = yaml.load(f:read("*a")) f:close() From nobody Thu May 7 15:27:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBGMG6byqz6cjBv for ; Thu, 07 May 2026 15:27: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 4gBGMG5ln6z3RDL for ; Thu, 07 May 2026 15:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778167626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0hvtXIh5KDeue8X90OERMSCpEC11W3J9X2kGvMNlcik=; b=Pmbox/otZNLfGhWOrYKdSEVSvkSkgp7Kx1u8zj/Vx2bO0BawTolS1oAU9iy2+0eHFphhjo 8+t2fFarxxMtBDfcS10jobdsfxRdEn8RIzBU3HLNafjWmBoz1H8/OvnZfI7Cu25R2/MCP4 T/3nJyCfFvE6Zu+sQDrca+LQxjMTXNDHAzBokzykVRFttgpQtKiAg+G8ruwDYXEXTnQxvl lACb/+sK0wnM63JDcJ8+4aCRzZlOveGMKRp8aIeWx/wlstUCbh0CQ4vty3FTpQA2311PuX xpK50o7Fpg6VF/KbWxU19Cp7UqumLXDDSLbvdKVFGTyX090daQVaPeFDEttOUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778167626; a=rsa-sha256; cv=none; b=isbmMRniM+PM00axxFG13LWXQ9hB/zVd927uVs6ubfG1J8beoTKktldo5CaflXWoLIS3o+ H0vC50HrOS9vu+R6A2l1KkLPRUfAyWg6Ty4nKZW0T9U0++LSH+KN0VpGvKlnowD3wgPB3w JlyIVnUCAjZrwxr90j1jZb+HNisiNH/rRhSt+69TkOBMfT0WTgvvOCSWkoBmAYEH91btB5 /V4JgcNxAh0DUIjpSVGetnPoKCwNrB4VBePEsDQHieb1frCRHCBDqmsDLsCn12Z63nC1bK ZS9FNMqb0GXEn7L2RRIyWgcs02aOwZBewYIu1DMXimPcqDH5yvKYd1aEl61x6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778167626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0hvtXIh5KDeue8X90OERMSCpEC11W3J9X2kGvMNlcik=; b=wpfQkPSEaXZr/m+4UfVlvlLjXtBKtvDiPVefdi2IB2sMIlwhaQ6Z0KGdAWW5RgbAWOHwW6 TjoDOxEeDM8NJUV58Z9xqaJGjJ+53OWBrqBJ9uPoIT3SplLjo9zy55IXGXbGThMgS0k2Cb WO63TXumxeb2f1X5nUv+TQNupfEneJDZuhVDHX+HlZ8GmrMKIgyGL25U/4xIafl7rm57UU +KRbct7Fbz9hA8PdKlzXc+kDu3xIj2bbCqk83oq4joh5MbX1/V7GldCXQV3NRBe/yv8ghc m1m0S/qOEYHR252EZDu7v+hewXrAjdWt8/2QgdKylvys0xRlLMZPmF7V+/icIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBGMG53jvzWgs for ; Thu, 07 May 2026 15:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30652 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 15:27:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: da3414a1a892 - stable/15 - nuageninit: modify the test to show the issue fixed inc316ec259011 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: da3414a1a8924327931cd8842a45693eeff7012a Auto-Submitted: auto-generated Date: Thu, 07 May 2026 15:27:06 +0000 Message-Id: <69fcaf4a.30652.3379ed9e@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=da3414a1a8924327931cd8842a45693eeff7012a commit da3414a1a8924327931cd8842a45693eeff7012a Author: Baptiste Daroussin AuthorDate: 2026-05-06 20:45:50 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-07 15:26:10 +0000 nuageninit: modify the test to show the issue fixed inc316ec259011 Ensure the script used is invalid when parsed by libyaml which highlight the issue revealed in PR295062 while at here validate the mode of the file is properly changed PR: 295062 MFC After: 1 day (cherry picked from commit 2a86992ab5019b4997ccadf7427011ba44e33c97) --- libexec/nuageinit/tests/nuageinit.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 3a01413f8487..1fd68d5a178e 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -76,10 +76,12 @@ nocloud_userdata_script_body() { mkdir -p media/nuageinit printf "instance-id: iid-local01\n" > "${PWD}"/media/nuageinit/meta-data - printf "#!/bin/sh\necho yeah\n" > "${PWD}"/media/nuageinit/user-data - chmod 755 "${PWD}"/media/nuageinit/user-data + # ensure this is an invalid when parsed with the yaml parser + printf "#!/bin/sh\n: ${test:-yes}\necho $test\n" > "${PWD}"/media/nuageinit/user-data + chmod 644 "${PWD}"/media/nuageinit/user-data atf_check -s exit:0 /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud - atf_check -o inline:"#!/bin/sh\necho yeah\n" cat var/cache/nuageinit/user_data + atf_check test -x var/cache/nuageinit/user_data + atf_check -o inline:"#!/bin/sh\n: ${test:-yes}\necho $test\n" cat var/cache/nuageinit/user_data } nocloud_user_data_script_body() From nobody Thu May 7 15:27:04 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBGML1tpsz6cjVS for ; Thu, 07 May 2026 15:27: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 4gBGMK5dRwz3RKj for ; Thu, 07 May 2026 15:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778167629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5s4pvBWxC7Omf0brDShojEfI2xz8nv6etWfCAk0DG4A=; b=V3olgQ+uq5Is30qIcKHehI92oFriBa85bWaFcFhxvKKWIGz0NSgC/rSwsMq2n3KDsHsc6W 0f8dPBmm1xJUQupWXW+0KSEQYGnd9yMiK5j1sahozBjMDDusJ7oUXepItsOqqqJGDYgDho jPPHkrkFOVVt98oWxNi5YAscXJnRlGRytbSlclAgaRwGEunltXO7wY/EdMgM8Uvs0YJ8eX hufaWhHnuZk44osRhZZywHuptGSz52m1XrfpFWz/SzYWaBIZK/lq9NnVPWqppLA1fZr4ag SDE6OXM5gU7WVmaSsg6X3YdYd86+sm52ClCDZtKaPOgOp2YZxSzNAOCQfTlfPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778167629; a=rsa-sha256; cv=none; b=uxcCoeVQzN+iFbujbWGdadPNGPX0VDOxJ2nYznxeX1wPDl06b9xKWhsK6SZ7UTHw7U8cCn RKai7cGCZ4U767O2sBfndcl0pSZxDDP0Nl4s1RYqzsFwRit7eNeTYjMnpcSGmep2OIxqJv tQGv5xx1yX/gQ9MR8rTwnJ2VbQaSyP/WUVO0rCNC6X13VKQlYbOZZuqUYjHX1N96Wlx3cA xDR5ZsmRH8MVDm1ntmgqry+62lB+Hwuh/XGheYtYdyA0es4dsLcM3+oWoA3ZgQWf05cqfu LmdKYMCPHB8l8tOm10sFcKwf41GvgOtZEJK1Q/kYlRsdyC94I59DIOg9GwDOKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778167629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5s4pvBWxC7Omf0brDShojEfI2xz8nv6etWfCAk0DG4A=; b=TrLJopHCyPkBtKEKqpxfYmbSR72MFKdzg7ylRF3egVojY+qUYa1nloJI2VNbqYRUlgdcWv mdIXZHXsimToymGAUZg+Kd0yu93Na7izBmYGlKk5iePrAw5PvhrvgerAzpYtuCKnOGv/xb 7ZrWBJrDuOIYbe9KviFMJuEBFsY+dyQes0CuV95wm+FR4Eg2jLpWnIuQtf4BVy6H7Vyi3y FHhtYfvlb6tX6l8xVPbXpBw6GIEUC/2r4g7k0orbZsG6LwnLp+IVTCnH6Bb0voc9ctib7Q X2ldMjPjIypjGr1y75fkkH68Lq5rjJcO7Vfcz7tr+JvbeeRZuMiMMUvFJ4aOZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBGMK5D5kzWgt for ; Thu, 07 May 2026 15:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3021b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 15:27:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: ee2fc974e071 - stable/15 - nlsysevent: add manpage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: ee2fc974e0716040622926c7c8ca8df09284e6f9 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 15:27:04 +0000 Message-Id: <69fcaf48.3021b.327c5aca@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ee2fc974e0716040622926c7c8ca8df09284e6f9 commit ee2fc974e0716040622926c7c8ca8df09284e6f9 Author: Baptiste Daroussin AuthorDate: 2026-04-09 08:50:41 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-07 15:26:10 +0000 nlsysevent: add manpage Reviewed by: des (cherry picked from commit 72d701eb1d83cfb3479e4c839412325ff9efc97c) --- share/man/man4/Makefile | 1 + share/man/man4/nlsysevent.4 | 132 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 62d0b8f77f0f..23057e016f7d 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -428,6 +428,7 @@ MAN= aac.4 \ ng_vjc.4 \ ng_vlan.4 \ ng_vlan_rotate.4 \ + nlsysevent.4 \ nmdm.4 \ ${_ntb.4} \ ${_ntb_hw_amd.4} \ diff --git a/share/man/man4/nlsysevent.4 b/share/man/man4/nlsysevent.4 new file mode 100644 index 000000000000..3b46ab65f568 --- /dev/null +++ b/share/man/man4/nlsysevent.4 @@ -0,0 +1,132 @@ +.\" +.\" Copyright (c) 2026 Baptiste Daroussin +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd April 9, 2026 +.Dt NLSYSEVENT 4 +.Os +.Sh NAME +.Nm nlsysevent +.Nd Netlink-based kernel event notification module +.Sh SYNOPSIS +To load the driver as a module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +nlsysevent_load="YES" +.Ed +.Pp +Alternatively, to load the module at runtime: +.Bd -literal -offset indent +kldload nlsysevent +.Ed +.Sh DESCRIPTION +The +.Nm +kernel module provides a +.Xr netlink 4 +Generic Netlink interface for receiving kernel device events. +It hooks into the +.Xr devctl 4 +notification system and re-publishes all kernel events as Generic Netlink +multicast messages under the +.Dv NETLINK_GENERIC +protocol family. +.Pp +This provides an alternative to reading events from +.Pa /dev/devctl +.Pq used by Xr devd 8 , +with the advantage that multiple consumers can subscribe to events +simultaneously, and consumers can selectively subscribe to specific +event groups. +.Ss Generic Netlink Family +The module registers a Generic Netlink family named +.Dq Li nlsysevent . +The dynamically-assigned family identifier can be resolved using the +standard +.Dv CTRL_CMD_GETFAMILY +request as described in +.Xr genetlink 4 . +.Ss Commands +The following command is defined: +.Bl -tag -width indent +.It Dv NLSE_CMD_NEWEVENT +Sent when a kernel event occurs. +This message is never solicited by userland; it is only delivered to +sockets that have subscribed to one or more multicast groups. +.El +.Ss Attributes +Each +.Dv NLSE_CMD_NEWEVENT +message contains the following TLV attributes: +.Bl -tag -width indent +.It Dv NLSE_ATTR_SYSTEM +(string) The system name that generated the event +.Pq e.g., Dq Li ACPI , Dq Li IFNET , Dq Li USB . +.It Dv NLSE_ATTR_SUBSYSTEM +(string) The subsystem name within the system. +.It Dv NLSE_ATTR_TYPE +(string) The type of the event. +.It Dv NLSE_ATTR_DATA +(string) Optional extra data associated with the event. +This attribute may be absent if no extra data was provided. +.El +.Ss Multicast Groups +The module creates one multicast group per system name. +The following groups are pre-registered when the module is loaded: +.Pp +.Bl -column "HYPERV_NIC_VF" -offset indent -compact +.It Li ACPI +.It Li AEON +.It Li CAM +.It Li CARP +.It Li coretemp +.It Li DEVFS +.It Li device +.It Li ETHERNET +.It Li GEOM +.It Li HYPERV_NIC_VF +.It Li IFNET +.It Li INFINIBAND +.It Li KERNEL +.It Li nvme +.It Li PMU +.It Li RCTL +.It Li USB +.It Li VFS +.It Li VT +.It Li ZFS +.El +.Pp +Additional groups are created dynamically as new system names appear in +kernel events, up to a maximum of 64 groups. +.Pp +The group identifier for a given system name can be resolved via +.Dv CTRL_CMD_GETFAMILY +and then subscribed to using the +.Dv NETLINK_ADD_MEMBERSHIP +socket option. +.Sh EXAMPLES +The +.Xr genl 1 +utility can be used to monitor events: +.Bd -literal -offset indent +genl monitor nlsysevent +.Ed +.Sh SEE ALSO +.Xr genl 1 , +.Xr snl 3 , +.Xr devctl 4 , +.Xr genetlink 4 , +.Xr netlink 4 , +.Xr devd 8 +.Sh HISTORY +The +.Nm +module first appeared in +.Fx 15.0 . +.Sh AUTHORS +The +.Nm +kernel module and this manual page were written by +.An Baptiste Daroussin Aq Mt bapt@FreeBSD.org . From nobody Thu May 7 15:28:12 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBGNX36Jfz6cjfr for ; Thu, 07 May 2026 15:28: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 4gBGNX2Dnxz3ScB for ; Thu, 07 May 2026 15:28:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778167692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fni3cTJB3bR7lCqpMn/CG2aRjK82tP/y/JTYvtvxr5M=; b=KRtDvRHNsoTRBkwNfIucvqc+7bq8shU5hTfP2pDQjRDt8keK2FaIfBixg/7aAMPlUroMd0 eiwM8Uxr2KgGQAITCXCLLcbOAcXQb9RF3l3cGyzP57Si9KHDGXEaGU3UnKQCivYYB1eY9s wbsv07UVjV5fWiTMfxtAub8zmt0vWFWcpjFuUWsioUWLubQwr7yNUe13yqycxijXSMdAlO 2u5RIg4z9fUQBddQF+YLFMVmmKHON1vkQLRD1K2uKWvFZPPzXkstSVf1yBtw6Pqr8aKYzt MjdUTi65FM4Oia1ymTxNcmk4+ygGMqqhOPYHCWS0jxJDpxSyjVNVck2bde+eUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778167692; a=rsa-sha256; cv=none; b=KIF7gKujUuQGBhVIAd+Irr9XZ+DJGEXkJtV/Cz7sNnOmNJ0WvoX6nZASD/7QdAHbrJOfVm Lg58id03oyPfJFevnQ5rVQBFTqbuK40tXunYl6D3G75G9OPHMcvxJUsmvKOWDpAnRI7M5m BRsD2x9XX/3b4D+smtwyh3wDfnKPLb12+1WXXBYxTru9Qsjk/wu/Kvh9HBFxhaKDvHjNGQ n/L51nwLg8hYAxSMBELYzZ075qHDHnMCaICN2L5bk5tBO4KzOUnHvFdLmrFdn8XLBkiiDC oH741D0ECVCLcJZHBR/msu3Q521tom0M9ljKN//hoLbaPAVZb8+iQWU0Pjj/7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778167692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fni3cTJB3bR7lCqpMn/CG2aRjK82tP/y/JTYvtvxr5M=; b=jvx9cZ3aQGi7uZFb1wjYCokaxxLutZUO5lvucmAhsGvz5Y+3CuoSJ/q2zwriNY96DUimgs UsK/w4zfmlIyWV80+lqVjl9S9ZGjq9Tm7BaXKMnpa0puESL+RML6q3tJrzAOa5UgNbZp12 MTPA5VFFXNleWeGduM3tx0o15oGVsoe0oiSUfPah590uwPB0OrW+jDndr4yQy6GQX1wEuv HZh+n8BI5Dzz9VzIFsCuED/CqzFuy4XvhmDv4xIaGDfe1yRLXnVZ7meWwcuIiWiglRsW9o qRQwCoIqeNkodZjPmEAUo/yDHRNwulgHJRxCW1EOq1Pcm4ul6aiYJ/sZTv6NEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBGNX1KSTzXq2 for ; Thu, 07 May 2026 15:28:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 275c6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 15:28:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: e7913c8c79ec - stable/14 - nuageinit: only parse user_data as yaml when necessary List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: e7913c8c79ec54d2522ca3311bad58ccecb27991 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 15:28:12 +0000 Message-Id: <69fcaf8c.275c6.3a7fad5d@gitrepo.freebsd.org> The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=e7913c8c79ec54d2522ca3311bad58ccecb27991 commit e7913c8c79ec54d2522ca3311bad58ccecb27991 Author: Baptiste Daroussin AuthorDate: 2026-05-06 20:14:17 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-07 15:28:03 +0000 nuageinit: only parse user_data as yaml when necessary This fixes a regression introduced in cae280931c9e which prevents user_data as a shell script to be used PR: 295062 Reported by: Ross McKelvie MFC After: 1 day (cherry picked from commit c316ec259011e9e22e40eaa72d834f3bfac95c28) --- libexec/nuageinit/nuageinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index f7700f7d8e70..a1ebd3f52b25 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -727,7 +727,7 @@ local function load_userdata() f:close() local obj = nil - if ud then + if ud and line == "#cloud-config" then f = io.open(ni_path .. "/" .. ud) obj = yaml.load(f:read("*a")) f:close() From nobody Thu May 7 15:28:13 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBGNY3qJ4z6cjCJ for ; Thu, 07 May 2026 15:28: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 4gBGNY2gtcz3SYk for ; Thu, 07 May 2026 15:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778167693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=belrPqvag8cqm67X7WX0Uuy+8TgCU+jBB39e3qczMuQ=; b=g0KHvzAiAQS8V2tAsy7r1eGcMkgFdE971q++/Lm1Fl4G5fmMj4ER5rsU5Bvp7wp2Rpzari BS+cwqrsJdyvQa4LTROnsYg/v6IC+GRJi7zaubvAtirDsqqoRydUHjBJqL5ApIP/tgNn4j gs+sW+n9sDDTqAtxp796J4HrnaSCJZ2LBmifBieRMGXOl35m/k0zZJ3sNEaS3gsdq9Q8Qv PNF1XbiJZlmvboUVjJ/FmLR2O+dMM3bO42aRhQKTQSCfdCXTUMLqPSvzA3vdgCJ+qzUTN2 JHpL407BA/Rq109M810PSP4+eBAWmdOOf6xfW6MwjNayNT1Mzi0BwzAqOu1KOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778167693; a=rsa-sha256; cv=none; b=hBhyktaL35yADdqXShaATO/5j+VXXEVYMHsBNbU748Gq+JgS6iFCgDPJJQ2AIOoW3SQzqS QMFQnhhwDhQnT/gY6OZie5TxsoltibWq1eeLs4cDnusq4ceElxrYw0SBpv37eFFvCHAz53 LSE6tR+8MotDKfoGRz/JXfcgUFnqQof7i/P/3LXH5Tc7tmzz9r/xGXGBdi6DS+S6ow/Mw/ foXWTh7RaIoSTlN6hmO4O3PEgiXrmO0CkDoZBIhv0ymCPxQTflqE9hhYRRSsNdUXYqZCjS 0GVgL8lyqAfLSknXwgDhLWB1EQ65e0OoeFP/oiQP0TIqWUHAt7cZPWjkuoi/yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778167693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=belrPqvag8cqm67X7WX0Uuy+8TgCU+jBB39e3qczMuQ=; b=XRKnMjq8VdBpoA4rPNfwKEGgXOnIH+bWCG94KzOis9Yuk98mHrcIH5EHQgLk/AM5bQ1/Wp XmfoXZtqnBdfqeHolUsbhdNPdUqtZKHMsXJ6DR52ypTDnLkysPOESPSOGTh3hG3kuw9vkQ DskgY092KjPXMQj66zXiyA6HP0mCWMeCffB33y3cvxuu+MEa68OgbIIpy4EBtigSwUC6Dd PZx66mY55o5T45dVvfO7GLxEojq4/GsYMlMJRJLLPLiG0slN8L87SrXLu6h0qChKyBYU2x +rgSmBFiiboi6ARDt/VxM1J/CMh5ymUKKiAHDRzqdFMF7mDNYjhfGdjL9qGWnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBGNY2BbSzY1Q for ; Thu, 07 May 2026 15:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30334 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 15:28:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 48862dc1d8fc - stable/14 - nuageninit: modify the test to show the issue fixed inc316ec259011 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 48862dc1d8fc03fec7523fe26c7b2e98be9d6bc9 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 15:28:13 +0000 Message-Id: <69fcaf8d.30334.170ae21e@gitrepo.freebsd.org> The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=48862dc1d8fc03fec7523fe26c7b2e98be9d6bc9 commit 48862dc1d8fc03fec7523fe26c7b2e98be9d6bc9 Author: Baptiste Daroussin AuthorDate: 2026-05-06 20:45:50 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-07 15:28:03 +0000 nuageninit: modify the test to show the issue fixed inc316ec259011 Ensure the script used is invalid when parsed by libyaml which highlight the issue revealed in PR295062 while at here validate the mode of the file is properly changed PR: 295062 MFC After: 1 day (cherry picked from commit 2a86992ab5019b4997ccadf7427011ba44e33c97) --- libexec/nuageinit/tests/nuageinit.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 3a01413f8487..1fd68d5a178e 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -76,10 +76,12 @@ nocloud_userdata_script_body() { mkdir -p media/nuageinit printf "instance-id: iid-local01\n" > "${PWD}"/media/nuageinit/meta-data - printf "#!/bin/sh\necho yeah\n" > "${PWD}"/media/nuageinit/user-data - chmod 755 "${PWD}"/media/nuageinit/user-data + # ensure this is an invalid when parsed with the yaml parser + printf "#!/bin/sh\n: ${test:-yes}\necho $test\n" > "${PWD}"/media/nuageinit/user-data + chmod 644 "${PWD}"/media/nuageinit/user-data atf_check -s exit:0 /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud - atf_check -o inline:"#!/bin/sh\necho yeah\n" cat var/cache/nuageinit/user_data + atf_check test -x var/cache/nuageinit/user_data + atf_check -o inline:"#!/bin/sh\n: ${test:-yes}\necho $test\n" cat var/cache/nuageinit/user_data } nocloud_user_data_script_body() From nobody Thu May 7 16:24:01 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBHcx4FGqz6cnXN for ; Thu, 07 May 2026 16:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBHcx3kBlz3b5q for ; Thu, 07 May 2026 16:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778171041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ph1vOjhk+azFvM9SPwBdv8JCLjXZdNlHibpWZltyHIE=; b=C5OZWMn5BXFjuyI8+fGoxqjMFpjerzSCrNTJalH+KsbiClJsCCnfhcHZGldiemJyOFF49L p3IkcHjT33aiqwUnSxKOuqsFCfL6DH3CWo+50fhugg0kIMoP28u7oWLfcFVBmuh2rIIGjm dKoclQjie4YXWemFLLTIoU3Xy7Z4v9QSh6SVOWVdTjWDvGtosyd8G9HPkJ7YgV6lnkqkpO e9t8+wEtzsjLvhV7t1oPUU3KYecAjiBOO3rK+peeRGyzwD7QSfZcgVLk4rZ8ESm1GPs9Ao H6+vbV4Z3yLJGY/sx40PnR2E0QSWnl2OIfPUIIA6mx6+urfncfduKMWePsvcUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778171041; a=rsa-sha256; cv=none; b=XONh/Jz0tvtQFxLjawGT/hOZqGprclJurKTgxSXI4WdY4YP+ss5cw9fDy9raoRH3zWmYvw yh1RPffTwH07jb+J2172XMV0wYVND2aGpULLN3Cugd4Tkm9wsRIBS4EWB+r2X6+SQNuXnT UlQV0/s1i5XaYy3hbTHKR0PhRZWmGXa/C01/Uu6HGgFxet22qelrfyRUMTKCheeIlaED9/ MsRQtvhjBkvQB55ZvWykC+FAN/AGs+3luatALVYX7h791uREYJ0ttc+7WbQmLTFCTiiz+5 38xM2xHH6kI4YPbULmBO68w41tsfWdWPAqJN5ru+sWASkdl5FwkILJtmiIx7Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778171041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ph1vOjhk+azFvM9SPwBdv8JCLjXZdNlHibpWZltyHIE=; b=p3XpoPRvr3A4WkzBEIXavUz5Xtc7b5mCglQznrSkHJZhAKaRffeA7OwlK3EHdEH+Si7qTr sZryW6MElHdShHBQSELAEMiNS5GKR3ssORwOMtOMyjFyfb6GgFxX+FM7PKAhjmfZJ/HxIO h4F96WkalQ/ld84fXCrh0QiiuVGSRpbdnsvPs9oONZBfukt5ZaJRgC3hYfcfXkmwg9+FIP VnkNv7Rf6whAo58wbcgH/jrPaEqqCBRPsBTKPM3YeGwU00BaFaVOa59VNIvIknsejh6029 Q5iRH5Rusi+jiX+oHiv0DyESbWi5hCRoMYoVaBihWBAYa4OAy23zMiU4+6j/0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBHcx3HKKzZmT for ; Thu, 07 May 2026 16:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37289 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 16:24:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 726ff260ecfa - main - pfctl: optionally print the rule in the state overview List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 726ff260ecfa38878aec982456c44ddb0f9c791b Auto-Submitted: auto-generated Date: Thu, 07 May 2026 16:24:01 +0000 Message-Id: <69fcbca1.37289.79d664df@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=726ff260ecfa38878aec982456c44ddb0f9c791b commit 726ff260ecfa38878aec982456c44ddb0f9c791b Author: Kristof Provost AuthorDate: 2026-05-05 12:42:16 +0000 Commit: Kristof Provost CommitDate: 2026-05-07 15:06:56 +0000 pfctl: optionally print the rule in the state overview When dumping states optionally (at '-vv') also show the rule which created the state. This can be helpful if the ruleset changed and we want to know what rule created the state. Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 4 + lib/libpfctl/libpfctl.h | 2 + sbin/pfctl/pf_print_state.c | 4 + sbin/pfctl/pfctl.c | 3 + sys/netpfil/pf/pf_nl.c | 189 +++++++++++++++++++++++--------------- sys/netpfil/pf/pf_nl.h | 2 + tests/sys/netpfil/pf/get_state.sh | 44 +++++++++ tests/sys/netpfil/pf/killstate.sh | 2 +- 8 files changed, 173 insertions(+), 77 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index ac60a924c228..4e51167b401a 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -1929,6 +1929,8 @@ static const struct snl_attr_parser nla_p_skey[] = { SNL_DECLARE_ATTR_PARSER(skey_parser, nla_p_skey); #undef _OUT +SNL_DECLARE_ATTR_PARSER(rule_parser, ap_getrule); + #define _IN(_field) offsetof(struct genlmsghdr, _field) #define _OUT(_field) offsetof(struct pfctl_state, _field) static struct snl_attr_parser ap_state[] = { @@ -1963,6 +1965,7 @@ static struct snl_attr_parser ap_state[] = { { .type = PF_ST_RT_IFNAME, .off = _OUT(rt_ifname), .cb = snl_attr_store_ifname }, { .type = PF_ST_SRC_NODE_FLAGS, .off = _OUT(src_node_flags), .cb = snl_attr_get_uint8 }, { .type = PF_ST_RT_AF, .off = _OUT(rt_af), .cb = snl_attr_get_uint8 }, + { .type = PF_ST_CREATED_BY_RULE, .off = _OUT(created_by_rule), .arg = &rule_parser, .cb = snl_attr_get_nested }, }; #undef _IN #undef _OUT @@ -1988,6 +1991,7 @@ pfctl_get_states_h(struct pfctl_handle *h, struct pfctl_state_filter *filter, pf snl_add_msg_attr_u8(&nw, PF_ST_AF, filter->af); snl_add_msg_attr_ip6(&nw, PF_ST_FILTER_ADDR, &filter->addr.v6); snl_add_msg_attr_ip6(&nw, PF_ST_FILTER_MASK, &filter->mask.v6); + snl_add_msg_attr_bool(&nw, PF_ST_INCLUDE_RULE, filter->include_rule); hdr = snl_finalize_msg(&nw); if (hdr == NULL) diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 1012be53db65..3080209ec7a0 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -406,6 +406,7 @@ struct pfctl_state { char rt_ifname[IFNAMSIZ]; sa_family_t rt_af; uint8_t src_node_flags; + struct pfctl_rule created_by_rule; }; TAILQ_HEAD(pfctl_statelist, pfctl_state); @@ -504,6 +505,7 @@ struct pfctl_state_filter { sa_family_t af; struct pf_addr addr; struct pf_addr mask; + bool include_rule; }; typedef int (*pfctl_get_state_fn)(struct pfctl_state *, void *); int pfctl_get_states_iter(pfctl_get_state_fn f, void *arg); diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c index 1c5a46f86b35..9b0c57fd73d3 100644 --- a/sbin/pfctl/pf_print_state.c +++ b/sbin/pfctl/pf_print_state.c @@ -434,6 +434,10 @@ print_state(struct pfctl_state *s, int opts) if (strcmp(s->ifname, s->orig_ifname) != 0) printf(" origif: %s\n", s->orig_ifname); + + printf(" rule: "); + print_rule(&s->created_by_rule, "", 0, 0); + printf("\n"); } } diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index f35baf25ec35..c349487ed9d2 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1996,6 +1996,9 @@ pfctl_show_states(int dev, const char *iface, int opts) if (iface != NULL) strlcpy(filter.ifname, iface, IFNAMSIZ); + if (opts & PF_OPT_VERBOSE2) + filter.include_rule = true; + arg.opts = opts; arg.dotitle = opts & PF_OPT_SHOWALL; arg.iface = iface; diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index e4ce9e64f637..d1beb7681c21 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -51,8 +51,11 @@ #include _DECLARE_DEBUG(LOG_DEBUG); +static bool nlattr_add_labels(struct nl_writer *nw, int attrtype, + const struct pf_krule *r); +static bool nlattr_add_rule(struct nl_writer *nw, const struct pf_krule *rule); static bool nlattr_add_pf_threshold(struct nl_writer *, int, - struct pf_kthreshold *); + const struct pf_kthreshold *); struct nl_parsed_state { uint8_t version; @@ -63,6 +66,7 @@ struct nl_parsed_state { sa_family_t af; struct pf_addr addr; struct pf_addr mask; + bool include_rule; }; #define _IN(_field) offsetof(struct genlmsghdr, _field) @@ -75,6 +79,7 @@ static const struct nlattr_parser nla_p_state[] = { { .type = PF_ST_PROTO, .off = _OUT(proto), .cb = nlattr_get_uint16 }, { .type = PF_ST_FILTER_ADDR, .off = _OUT(addr), .cb = nlattr_get_in6_addr }, { .type = PF_ST_FILTER_MASK, .off = _OUT(mask), .cb = nlattr_get_in6_addr }, + { .type = PF_ST_INCLUDE_RULE, .off = _OUT(include_rule), .cb = nlattr_get_bool }, }; static const struct nlfield_parser nlf_p_generic[] = { { .off_in = _IN(version), .off_out = _OUT(version), .cb = nlf_get_u8 }, @@ -146,8 +151,26 @@ dump_state_key(struct nl_writer *nw, int attr, const struct pf_state_key *key) return (true); } +static bool +nlattr_add_rule_nested(struct nl_writer *nw, int attr, const struct pf_krule *r) +{ + int off; + bool ret; + + off = nlattr_add_nested(nw, attr); + if (off == 0) + return (false); + + ret = nlattr_add_rule(nw, r); + + nlattr_set_len(nw, off); + + return (ret); +} + static int -dump_state(struct nlpcb *nlp, const struct nlmsghdr *hdr, struct pf_kstate *s, +dump_state(struct nlpcb *nlp, const struct nlmsghdr *hdr, + struct nl_parsed_state *attrs, struct pf_kstate *s, struct nl_pstate *npt) { struct nl_writer *nw = npt->nw; @@ -231,6 +254,9 @@ dump_state(struct nlpcb *nlp, const struct nlmsghdr *hdr, struct pf_kstate *s, if (!dump_state_peer(nw, PF_ST_PEER_DST, &s->dst)) goto enomem; + if (attrs->include_rule && s->rule != NULL) + nlattr_add_rule_nested(nw, PF_ST_CREATED_BY_RULE, s->rule); + if (nlmsg_end(nw)) return (0); @@ -282,7 +308,7 @@ handle_dumpstates(struct nlpcb *nlp, struct nl_parsed_state *attrs, &attrs->mask, &attrs->addr, af)) continue; - error = dump_state(nlp, hdr, s, npt); + error = dump_state(nlp, hdr, attrs, s, npt); if (error != 0) break; } @@ -307,7 +333,7 @@ handle_getstate(struct nlpcb *nlp, struct nl_parsed_state *attrs, s = pf_find_state_byid(attrs->id, attrs->creatorid); if (s == NULL) return (ENOENT); - ret = dump_state(nlp, hdr, s, npt); + ret = dump_state(nlp, hdr, attrs, s, npt); PF_STATE_UNLOCK(s); return (ret); @@ -465,7 +491,8 @@ NL_DECLARE_ATTR_PARSER(rule_addr_parser, nla_p_ruleaddr); #undef _OUT static bool -nlattr_add_rule_addr(struct nl_writer *nw, int attrtype, struct pf_rule_addr *r) +nlattr_add_rule_addr(struct nl_writer *nw, int attrtype, + const struct pf_rule_addr *r) { struct pf_addr_wrap aw = {0}; int off = nlattr_add_nested(nw, attrtype); @@ -687,7 +714,8 @@ nlattr_get_nested_timeouts(struct nlattr *nla, struct nl_pstate *npt, const void } static bool -nlattr_add_timeout(struct nl_writer *nw, int attrtype, uint32_t *timeout) +nlattr_add_timeout(struct nl_writer *nw, int attrtype, + const uint32_t *timeout) { int off = nlattr_add_nested(nw, attrtype); @@ -875,76 +903,10 @@ out: return (error); } -struct nl_parsed_get_rule { - char anchor[MAXPATHLEN]; - uint8_t action; - uint32_t nr; - uint32_t ticket; - uint8_t clear; -}; -#define _OUT(_field) offsetof(struct nl_parsed_get_rule, _field) -static const struct nlattr_parser nla_p_getrule[] = { - { .type = PF_GR_ANCHOR, .off = _OUT(anchor), .arg = (void *)MAXPATHLEN, .cb = nlattr_get_chara }, - { .type = PF_GR_ACTION, .off = _OUT(action), .cb = nlattr_get_uint8 }, - { .type = PF_GR_NR, .off = _OUT(nr), .cb = nlattr_get_uint32 }, - { .type = PF_GR_TICKET, .off = _OUT(ticket), .cb = nlattr_get_uint32 }, - { .type = PF_GR_CLEAR, .off = _OUT(clear), .cb = nlattr_get_uint8 }, -}; -#undef _OUT -NL_DECLARE_PARSER(getrule_parser, struct genlmsghdr, nlf_p_empty, nla_p_getrule); - -static int -pf_handle_getrule(struct nlmsghdr *hdr, struct nl_pstate *npt) +static bool +nlattr_add_rule(struct nl_writer *nw, const struct pf_krule *rule) { - char anchor_call[MAXPATHLEN]; - struct nl_parsed_get_rule attrs = {}; - struct nl_writer *nw = npt->nw; - struct genlmsghdr *ghdr_new; - struct pf_kruleset *ruleset; - struct pf_krule *rule; - u_int64_t src_nodes_total = 0; - int rs_num; - int error; - - error = nl_parse_nlmsg(hdr, &getrule_parser, npt, &attrs); - if (error != 0) - return (error); - - if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) - return (ENOMEM); - - ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); - ghdr_new->cmd = PFNL_CMD_GETRULE; - - PF_RULES_WLOCK(); - ruleset = pf_find_kruleset(attrs.anchor); - if (ruleset == NULL) { - PF_RULES_WUNLOCK(); - error = ENOENT; - goto out; - } - - rs_num = pf_get_ruleset_number(attrs.action); - if (rs_num >= PF_RULESET_MAX) { - PF_RULES_WUNLOCK(); - error = EINVAL; - goto out; - } - - if (attrs.ticket != ruleset->rules[rs_num].active.ticket) { - PF_RULES_WUNLOCK(); - error = EBUSY; - goto out; - } - - rule = TAILQ_FIRST(ruleset->rules[rs_num].active.ptr); - while ((rule != NULL) && (rule->nr != attrs.nr)) - rule = TAILQ_NEXT(rule, entries); - if (rule == NULL) { - PF_RULES_WUNLOCK(); - error = EBUSY; - goto out; - } + u_int64_t src_nodes_total = 0; nlattr_add_rule_addr(nw, PF_RT_SRC, &rule->src); nlattr_add_rule_addr(nw, PF_RT_DST, &rule->dst); @@ -1050,6 +1012,81 @@ pf_handle_getrule(struct nlmsghdr *hdr, struct nl_pstate *npt) nlattr_add_u8(nw, PF_RT_SOURCE_LIMIT, rule->sourcelim.id); nlattr_add_u32(nw, PF_RT_SOURCE_LIMIT_ACTION, rule->sourcelim.limiter_action); + return (true); +} + +struct nl_parsed_get_rule { + char anchor[MAXPATHLEN]; + uint8_t action; + uint32_t nr; + uint32_t ticket; + uint8_t clear; +}; +#define _OUT(_field) offsetof(struct nl_parsed_get_rule, _field) +static const struct nlattr_parser nla_p_getrule[] = { + { .type = PF_GR_ANCHOR, .off = _OUT(anchor), .arg = (void *)MAXPATHLEN, .cb = nlattr_get_chara }, + { .type = PF_GR_ACTION, .off = _OUT(action), .cb = nlattr_get_uint8 }, + { .type = PF_GR_NR, .off = _OUT(nr), .cb = nlattr_get_uint32 }, + { .type = PF_GR_TICKET, .off = _OUT(ticket), .cb = nlattr_get_uint32 }, + { .type = PF_GR_CLEAR, .off = _OUT(clear), .cb = nlattr_get_uint8 }, +}; +#undef _OUT +NL_DECLARE_PARSER(getrule_parser, struct genlmsghdr, nlf_p_empty, nla_p_getrule); + +static int +pf_handle_getrule(struct nlmsghdr *hdr, struct nl_pstate *npt) +{ + char anchor_call[MAXPATHLEN]; + struct nl_parsed_get_rule attrs = {}; + struct nl_writer *nw = npt->nw; + struct genlmsghdr *ghdr_new; + struct pf_kruleset *ruleset; + struct pf_krule *rule; + int rs_num; + int error; + + error = nl_parse_nlmsg(hdr, &getrule_parser, npt, &attrs); + if (error != 0) + return (error); + + if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) + return (ENOMEM); + + ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); + ghdr_new->cmd = PFNL_CMD_GETRULE; + + PF_RULES_WLOCK(); + ruleset = pf_find_kruleset(attrs.anchor); + if (ruleset == NULL) { + PF_RULES_WUNLOCK(); + error = ENOENT; + goto out; + } + + rs_num = pf_get_ruleset_number(attrs.action); + if (rs_num >= PF_RULESET_MAX) { + PF_RULES_WUNLOCK(); + error = EINVAL; + goto out; + } + + if (attrs.ticket != ruleset->rules[rs_num].active.ticket) { + PF_RULES_WUNLOCK(); + error = EBUSY; + goto out; + } + + rule = TAILQ_FIRST(ruleset->rules[rs_num].active.ptr); + while ((rule != NULL) && (rule->nr != attrs.nr)) + rule = TAILQ_NEXT(rule, entries); + if (rule == NULL) { + PF_RULES_WUNLOCK(); + error = EBUSY; + goto out; + } + + nlattr_add_rule(nw, rule); + error = pf_kanchor_copyout(ruleset, rule, anchor_call, sizeof(anchor_call)); MPASS(error == 0); @@ -1729,7 +1766,7 @@ pf_handle_get_ruleset(struct nlmsghdr *hdr, struct nl_pstate *npt) static bool nlattr_add_pf_threshold(struct nl_writer *nw, int attrtype, - struct pf_kthreshold *t) + const struct pf_kthreshold *t) { int off = nlattr_add_nested(nw, attrtype); int conn_rate_count = 0; diff --git a/sys/netpfil/pf/pf_nl.h b/sys/netpfil/pf/pf_nl.h index 6591c707d9a4..4d0186ea86a5 100644 --- a/sys/netpfil/pf/pf_nl.h +++ b/sys/netpfil/pf/pf_nl.h @@ -152,6 +152,8 @@ enum pfstate_type_t { PF_ST_RT_IFNAME = 37, /* string */ PF_ST_SRC_NODE_FLAGS = 38, /* u8 */ PF_ST_RT_AF = 39, /* u8 */ + PF_ST_INCLUDE_RULE = 40, /* bool */ + PF_ST_CREATED_BY_RULE = 41, /* nested, pf_rule_type_t */ }; enum pf_addr_type_t { diff --git a/tests/sys/netpfil/pf/get_state.sh b/tests/sys/netpfil/pf/get_state.sh index eb2bc854c800..eb2e2f37a15d 100644 --- a/tests/sys/netpfil/pf/get_state.sh +++ b/tests/sys/netpfil/pf/get_state.sh @@ -74,7 +74,51 @@ many_cleanup() pft_cleanup } +atf_test_case "rule" "cleanup" +rule_head() +{ + atf_set descr 'Test retrieving original state establishing rule' + atf_set require.user root +} + +rule_body() +{ + pft_init + + epair=$(vnet_mkepair) + ifconfig ${epair}a 192.0.2.1/24 up + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up + jexec alcatraz pfctl -e + + pft_set_rules alcatraz \ + "pass in proto icmp label \"icmplabel\"" + + # Establish state + atf_check -o ignore ping -c 1 -W 1 192.0.2.2 + + # We should see the rule now + atf_check -o match:"rule: pass in proto icmp all keep state label \"icmplabel\"" \ + -e ignore \ + jexec alcatraz pfctl -ss -vv + + pft_set_rules noflush alcatraz \ + "pass" + + # Even after the rules changes we should see the original rule + atf_check -o match:"rule: pass in proto icmp all keep state label \"icmplabel\"" \ + -e ignore \ + jexec alcatraz pfctl -ss -vv +} + +rule_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "many" + atf_add_test_case "rule" } diff --git a/tests/sys/netpfil/pf/killstate.sh b/tests/sys/netpfil/pf/killstate.sh index f5925d715e7c..161a8b7668f2 100644 --- a/tests/sys/netpfil/pf/killstate.sh +++ b/tests/sys/netpfil/pf/killstate.sh @@ -666,7 +666,7 @@ key_body() --replyif ${epair}a # Get the state key - key=$(jexec alcatraz pfctl -ss -vvv | awk '/icmp/ { print($2 " " $3 " " $4 " " $5); }') + key=$(jexec alcatraz pfctl -ss -vvv | awk '/all icmp/ { print($2 " " $3 " " $4 " " $5); }') bad_key=$(echo ${key} | sed 's/icmp/tcp/') # Kill the wrong key From nobody Thu May 7 16:24:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBHcz0pw7z6cpB4 for ; Thu, 07 May 2026 16:24:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBHcy5cPmz3b5r for ; Thu, 07 May 2026 16:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778171042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zNUb01ErcAJA2KA+vhWeJB+m8tRZxtZZh5vH15+KcsY=; b=f/NC2vAXFGW12hshDC5oyGyFwv5nxfMiqShRnC+6MCsUpnHqw2br5rd4SzTVPJvnl1xf83 xGoI0jPyS9+xQYjmeq/3eRakpoR65jOChEiASd+VUNj0qnOIj+gTtPKKSCHMVwqTkhmqhr rpEOdA5m57eY7rm7ucSCX1dqVH/gjDWpIk2SA/K8e55jf+dnAisWSfNDLN9H0cwdngA4e9 8K6GUYtOkvQGkYVS8Qwnk1Ky1bC1wJ21728cbWjA0sG/BK9+lypR7Z0ZxDHqCzuSbsUJUZ c+Y4xXSvXBnQfqHmAvEGg+1mN5MaNlBnHQVnEMZmlmh0HbwJTNc402n0hSqP2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778171042; a=rsa-sha256; cv=none; b=DckxotR9kFNQo60IDFACDFZ/H3jfvvNryUbtwCfs9Zc8BTDb0yk9jhflqc3Ds9NDNI5XPK /Tts8cdiExuonrSO0UrSOHv8G6TL94J/HMKsoaJGoQSNkZl/IOtmxiOXt5Ty/8qqq6juPx qdU+tQr3Kv6m7kVxIZ52OiO8sL+E6UuoMkZ55I/zH2sOzhiAL11u6zGPHAHAvqbydBF82f 1FjsZHhhtBJWzLGvb89G553MsiXCqLvrTERydubQ5L98U9QfM9ffAES2TAW1pRIPzG6v0N kUWlLGdRwiqfyCHaYkxgmvab22rrlIjm8rc0jkUwBemTX92RbQ807ekRxjTFLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778171042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zNUb01ErcAJA2KA+vhWeJB+m8tRZxtZZh5vH15+KcsY=; b=eHxeNVhffWM/cRojfdRmsN4VEc72DUoTNmELd8fqM7ocpHZUj4ZNDj+IRQdr4Rqli3Df10 dFOMSp3zhIibUgC4PqpVsE65wtlJSRqln/dEZX05ywvtKk17nRwLmv+KOXYuZX5PpSiGtU t/oMCVXB1ZCMMmYuZmtg1ZoW5fBgac4IFLAzPOv+O6uZePlNvBG9aef3SkVNue0cr8KMVD 1LKyAMkuDzdXoV+o+FaxvVKiG9OX1tZBrNxo9DBKTAbBMCKO5y8dVaBsCvQelTMv4n5zDQ el7kylkg4L8YqNXqwNCHXaLflRyetxWgjff0hQw9bW2XeqH0idq/rrsRHnEHLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBHcy3hRczZwP for ; Thu, 07 May 2026 16:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36ea1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 16:24:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 4e7c1ff95a51 - main - pfctl: relax interface name requirement List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e7c1ff95a5187faee524055f22c4cf4134d1147 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 16:24:02 +0000 Message-Id: <69fcbca2.36ea1.5fb90566@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4e7c1ff95a5187faee524055f22c4cf4134d1147 commit 4e7c1ff95a5187faee524055f22c4cf4134d1147 Author: Kristof Provost AuthorDate: 2026-05-07 09:58:17 +0000 Commit: Kristof Provost CommitDate: 2026-05-07 15:07:23 +0000 pfctl: relax interface name requirement The FreeBSD network stack, for better or worse, does not impose any requirements on interface names. As such it's valid for an interface name to start with a number (or indeed, be something like '⭐'). Allow this in pfctl, and add a test case for the specific case of interface names starting with a number. Note that we don't support UTF-8 names fully, so those may still fail. PR: 295064 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 2 +- tests/sys/netpfil/pf/names.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 57a5140ffeb7..7e9d81da6ed9 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -4242,7 +4242,7 @@ dynaddr : '(' STRING ')' { char *p, *op; op = $2; - if (!isalpha(op[0])) { + if (op[0] == '\0') { yyerror("invalid interface name '%s'", op); free(op); YYERROR; diff --git a/tests/sys/netpfil/pf/names.sh b/tests/sys/netpfil/pf/names.sh index e47b0917cfec..c6f2a06c15f9 100644 --- a/tests/sys/netpfil/pf/names.sh +++ b/tests/sys/netpfil/pf/names.sh @@ -95,8 +95,48 @@ group_cleanup() pft_cleanup } +atf_test_case "start_number" "cleanup" +start_number_head() +{ + atf_set descr 'Test interface names starting with a number' + atf_set require.user root +} + +start_number_body() +{ + pft_init + + epair=$(vnet_mkepair) + ifconfig ${epair}a 192.0.2.1/24 up + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up + jexec alcatraz ifconfig ${epair}b name 4ever + jexec alcatraz pfctl -e + + jexec alcatraz ifconfig + + pft_set_rules alcatraz \ + "block" \ + "pass in from any to (4ever)" + + atf_check -o ignore ping -c 3 192.0.2.2 + + # Negative test, if the interface doesn't exist we don't pass packets + pft_set_rules alcatraz \ + "block" \ + "pass in from any to (5ever)" + atf_check -s exit:2 -o ignore ping -c 1 -t 1 192.0.2.2 +} + +start_number_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "names" atf_add_test_case "group" + atf_add_test_case "start_number" } From nobody Thu May 7 17:00:58 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBJRb1qYdz6crLy for ; Thu, 07 May 2026 17:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBJRb0r1bz3gBH for ; Thu, 07 May 2026 17:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778173259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7P6LVwzgTnCeha5dSIEPidZFWnVpgOjMbQc7CRZTsAo=; b=vHfEGZ16pDfHszgamOu7KqDgywMwPThlHyuBpjknm3doY0lrueR5LGHtX108f2arH3uaXq pHOdYl5BAq7Xp8mBsKMLXIYIOw/I640gCLxP3timWCZ+m7cVnvvF7OxU8hygz324av1R9d KsNRVL/Cz8oS9ZVJW+JC7bm6gvf7fNJDVI+YrWi3LwiMRfJ4F4w94yNDc+NvlN6t+oKhlx Q0yrVffwscVCtG0k++mLODuHLUSy9aXZoO3nJ0u7/QTpAXQS7bdnHuyKdLB9i4pHFFUPq0 JxPcDodB/sE0V1bessgRS5WSmxcKW61bmJZS46Qq2pvXyT6NrfO1keChCEWZjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778173259; a=rsa-sha256; cv=none; b=AxwO6iBiSBeHACvpD6oDZHePOEdTxR/LOCbh/DTwVV/AWN/fHbgeeBZZUvBFD/FIehxkPG p6NFUgIu93oaWygi2Oj4pfD5/L/i8g9osgdwOKqeDe72jJpg3IY80hvL9PAJgIsdTR2/Gc 44WnTXH30UEtlB2UiyUbK3PqqpYrtJV2chKXWHBBxWY+9DIQ1EFUYjz1gEqfv7JIEl/ojo cAoxTlxP+cl4AxOoigBcttPw8zQdzB8Mjk+aIM0Ae3pN/q0SqaHok/b6vfAzj7dCTL+1td nmca6JPZphLp0NqJuQiMKEayaE/HIt/8K8HAVW0xe2dYK0UhTUov4k3Fq1Xryw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778173259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7P6LVwzgTnCeha5dSIEPidZFWnVpgOjMbQc7CRZTsAo=; b=HRPybOijlS19xaoJJtnPk4Tw3s7vAcQwkxdMu9aOLhO4pNOV70eA7BSfoikqgeCtLutVGt nvJ9cxa3Ban/m44/E/yq+vn/lkX23ycG22ZRLzOUBHQeJjfLfM0QcYFLoPx94PlOhpLiod Ue2sPKaWj+vzXVH7GBJjlwCdoWVpGS+CuaHTsmLb2laLVFwnFjdMish8DJTfRq0aEyZ8pu 6o/HWS/ERFZF0G4wxVuG7ZXz3PazTCrOM0iPSOwNKgC6dMDe8Pc0L6S/AMrpoaH0Ht6T1d d06RZlNqC3Tq4CVMVL97PnkXN/ZGC6zyVeAc0ua0gwuN0BkwPo36MZ3Ltp5Dqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBJRZ6yyfzbmP for ; Thu, 07 May 2026 17:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39ea9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 17:00:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 18c5a26f8a74 - main - vm_map_growstack(): give a hint to user that stack was blown out List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18c5a26f8a747583b9bca3a6a1ae9db1ed4591a3 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 17:00:58 +0000 Message-Id: <69fcc54a.39ea9.7d6605ea@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=18c5a26f8a747583b9bca3a6a1ae9db1ed4591a3 commit 18c5a26f8a747583b9bca3a6a1ae9db1ed4591a3 Author: Konstantin Belousov AuthorDate: 2026-05-06 22:53:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-07 17:00:14 +0000 vm_map_growstack(): give a hint to user that stack was blown out Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56863 --- sys/vm/vm_map.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 0a81e62d2d63..7ead7d7e6472 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4723,6 +4723,11 @@ vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize, return (rv); } +static bool report_stackoverflow = true; +SYSCTL_BOOL(_vm, OID_AUTO, report_stackoverflow, CTLFLAG_RWTUN, + &report_stackoverflow, 0, + "uprintf() on stack overflow"); + /* * Attempts to grow a vm stack entry. Returns KERN_SUCCESS if we * successfully grow the stack. @@ -4787,8 +4792,12 @@ retry: if (guard > max_grow) return (KERN_NO_SPACE); max_grow -= guard; - if (grow_amount > max_grow) + if (grow_amount > max_grow) { + if (report_stackoverflow) + uprintf("pid %d comm %s tid %d stack overflow\n", + p->p_pid, p->p_comm, td->td_tid); return (KERN_NO_SPACE); + } /* * If this is the main process stack, see if we're over the stack @@ -4796,8 +4805,12 @@ retry: */ is_procstack = addr >= (vm_offset_t)vm->vm_maxsaddr && addr < (vm_offset_t)vm->vm_stacktop; - if (is_procstack && (ctob(vm->vm_ssize) + grow_amount > stacklim)) + if (is_procstack && (ctob(vm->vm_ssize) + grow_amount > stacklim)) { + if (report_stackoverflow) + uprintf("pid %d comm %s tid %d stack overflow\n", + p->p_pid, p->p_comm, td->td_tid); return (KERN_NO_SPACE); + } #ifdef RACCT if (racct_enable) { From nobody Thu May 7 17:00:57 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBJRg0T4Xz6cr7N for ; Thu, 07 May 2026 17:01: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 4gBJRf6XPZz3g4F for ; Thu, 07 May 2026 17:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778173262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KC8+/rvDxT7Vv7/FdRVlbQzG8lrEYqbAJOJuHjtHXyo=; b=LBbKPiUXmyVNlFclRPXpzSfuaTPXff3jnbgb7QcA9g536hAwQSQn3zZvBxxKm6B9Zv6h+t Bl2FGjq1aR6FMSsGzkGwn9Y3P6J8/A5w6wguqZshzXlMVo7mBZas4qVjQqxSOXGWZPpAlf ah4SQrV9ZynUv+TRHacsRrvrvXW5lrkB4WRxi/cdWTbaaDhv5nEaO7ba/R/zi5axeJFKdC y6dIUq1Act4A6co+c+4qM+gznQ+LpGgaO51g3MI1iBFxphPbO+FowensOJMh3/M9KG42pb WxVkVrGGsULv/zdsUBq2DVIm2ytOkrWw2ABUUANvMtpkgDoGfcrb8nfl1SOSbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778173262; a=rsa-sha256; cv=none; b=Xo1IMwRahQp0K95ZHGQaRJk51YsvfwcvDMmc6NQHUmi3ufNmR0fj6pikltg+Hy487ldRtt sG1pZOuUe5q+cbfDWFbXpOKbGpDFQ5OIvVUWr3THvWZfr092XGLAnTMBS5Gy8eks2vOK2e ml5Cc8NYRKKLhwu6qsvJCr1hzu8Z/HxCTf0LotEFzsUed5kmpTp99f85XTWMOCURDGDRYp Ez1o68AI71p47gdaYDcMxPiMTsL9qCFWiebDPviC2BFx9sTICTX7PhTExTDVVbHsgSWh/t PgpctrHJb1KH3tjCS/wx5zRewH1VYKJD9eihyw4Yvw58iceDO3IeN8s2vmECmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778173262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KC8+/rvDxT7Vv7/FdRVlbQzG8lrEYqbAJOJuHjtHXyo=; b=LmDUmsgmTmEXU2em9R3NBHYFMwAj5yGydp2o3qq/qmC1XRSpXt3YqYcUAXgJHSDg+q1vgw vZfB9r7zM6WsaMpO4iT0hjmlx3A6m3duqxdvuqsKrLXfHfaSD5w2sC0MUd8sMTufD/tMgT 1S60neRxgzIhyWzpY5iHGWCfj9ARuFLEFAtX3Foxt8zFswtBCUwB3ByN2xgfh2OaXIusoB X8Hmh/iwSjnuphzCcyivbzZKPTXoHERClPpQso8yH4zHpQ9B+U4elK9fNseg9MzZpmrurJ bGGvA9lhCO7jkMKhdH+sm/rhjLS0L552ALzsV1QGeUZByYSyREhTq0d9ZgiTiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBJRf678PzbPC for ; Thu, 07 May 2026 17:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39fd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 17:00:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 642dd17ee943 - main - vm_map_growstack(): consistently use local vars instead of curthread/proc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 642dd17ee94377c3d5533d05d0d9a58b88f60387 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 17:00:57 +0000 Message-Id: <69fcc549.39fd6.602c9f25@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=642dd17ee94377c3d5533d05d0d9a58b88f60387 commit 642dd17ee94377c3d5533d05d0d9a58b88f60387 Author: Konstantin Belousov AuthorDate: 2026-05-07 16:00:31 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-07 17:00:14 +0000 vm_map_growstack(): consistently use local vars instead of curthread/proc Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56863 --- sys/vm/vm_map.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 63bdce9d60f8..0a81e62d2d63 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4731,6 +4731,7 @@ static int vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) { vm_map_entry_t stack_entry; + struct thread *td; struct proc *p; struct vmspace *vm; vm_offset_t gap_end, gap_start, grow_start; @@ -4746,7 +4747,8 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) int error __diagused; #endif - p = curproc; + td = curthread; + p = td->td_proc; vm = p->p_vmspace; /* @@ -4760,9 +4762,9 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) MPASS(!vm_map_is_system(map)); - lmemlim = lim_cur(curthread, RLIMIT_MEMLOCK); - stacklim = lim_cur(curthread, RLIMIT_STACK); - vmemlim = lim_cur(curthread, RLIMIT_VMEM); + lmemlim = lim_cur(td, RLIMIT_MEMLOCK); + stacklim = lim_cur(td, RLIMIT_STACK); + vmemlim = lim_cur(td, RLIMIT_VMEM); retry: /* If addr is not in a hole for a stack grow area, no need to grow. */ if (gap_entry == NULL && !vm_map_lookup_entry(map, addr, &gap_entry)) @@ -4778,8 +4780,8 @@ retry: } else { return (KERN_FAILURE); } - guard = ((curproc->p_flag2 & P2_STKGAP_DISABLE) != 0 || - (curproc->p_fctl0 & NT_FREEBSD_FCTL_STKGAP_DISABLE) != 0) ? 0 : + guard = ((p->p_flag2 & P2_STKGAP_DISABLE) != 0 || + (p->p_fctl0 & NT_FREEBSD_FCTL_STKGAP_DISABLE) != 0) ? 0 : gap_entry->next_read; max_grow = gap_entry->end - gap_entry->start; if (guard > max_grow) From nobody Thu May 7 17:17:45 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBJq25cSDz6cshb for ; Thu, 07 May 2026 17:17: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 4gBJq23WTXz3jqM for ; Thu, 07 May 2026 17:17:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lXZrHm81HrksYnBqpi0RrX/VUxIk0j8DaqF+Y4PJ5us=; b=LeVgZIjHEH4DFEYBJ0qj3Lh1xFXGs5/5IDSQ/UXPpOXvjei8vBk4v2rVN2daahtBdFj6rl u5nD7zO9L4stpw209Ox1DEHl8ogJMlj5dxuGJfvZYDL8AvKZCvDIzwOiD72H5Q3YNQ6E0m bVmlSeGttytMt2ozz9XOPJ6z7ji8ZxXXMuUHhrURo49489CY2LxnEEU4HzCrMyYPhz9XHB 1PPwb6fuzzppFa+osfGY2TGzbf/IK5L/VG6SZZM7nMINacXWz+QHG7vCLqjD0hFeSZ42aE ShPjWwOjN3TKz6wYMkWRZYb8Vwn5ZjTeqZJ8P3EMvVfpPHY1PMteQQJQSFFUQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778174270; a=rsa-sha256; cv=none; b=hAOoymZuOys8QS6Y5fKltDdTv7k+/Wi5r4j0hcWFBWnAbhqN53xzZHoEX4OqD3hOsJcxVt d+JjrHUpIN1d0VXXqjq5JQICloN4UHv3REMqWPjs7N6swKpobuUwX2rAv/OaWsftnI/f0D 2NxINcs6r0wvZakekgmCITAGIQFRSX996oL3dm7MVBok7nNtO5NobvMYdtw0MVNVkIHjjA Yzlcdw4fPIJb4aMZXVB2Rx9ZJZF1sTVn7yGFX57A7CAG1zXYmJy8ebH4y8z8zEJNe2giZ4 OWVtKeegIrX8wJ3qQ7bUdLAc7ghzefOB1int7oxDFgYfOTDhwP/jEbn7zmh9ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lXZrHm81HrksYnBqpi0RrX/VUxIk0j8DaqF+Y4PJ5us=; b=to5mB2A4+DfxwFzTTTy4XX6OC4L8I9doHhPkLYRB+O7cbi0L5XjBfEQLLzdeNV9S1WyHzv aCooYjcXvZPkIodSNv2xQDmnydaujQtnvztF2eEmg6Qqj0P2YruVs3BP4bCAjXIEKwXFhM BRJet5TUaB/g4+3ggIuqrCZKnaY2Ymenlz1ZQ7KfKl3CjxlyJYgLaL6+IrOnuzdtQnbB7A U2ZoRVm6oJHzK+bR/KDWdEr6ASpbwZvpahHIgipJwLLQh0ZHHT31AQK+5V2kXOLCf2NHez XqnZ4bradAYpOpD8YnqsmdObB3gwBT9u775Yr4vZQxgdVm27MHOj8pmdwoWlmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBJq22bg5zc2d for ; Thu, 07 May 2026 17:17:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c618 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 17:17:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: dcdc1af66999 - stable/15 - bsdinstall: Always use pkg.FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: dcdc1af669999aa3182c39ef9f162b625593785f Auto-Submitted: auto-generated Date: Thu, 07 May 2026 17:17:45 +0000 Message-Id: <69fcc939.3c618.159aa7ec@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=dcdc1af669999aa3182c39ef9f162b625593785f commit dcdc1af669999aa3182c39ef9f162b625593785f Author: Colin Percival AuthorDate: 2026-05-05 02:43:59 +0000 Commit: Colin Percival CommitDate: 2026-05-07 17:17:23 +0000 bsdinstall: Always use pkg.FreeBSD.org The FreeBSD-base bits are accessible via pkg.FreeBSD.org, even for releases, so there is no need to point at pkgbase.FreeBSD.org. MFC after: 3 days (cherry picked from commit 89b97931d6d415d7a2504d8ea2c99beafd77cf24) --- usr.sbin/bsdinstall/FreeBSD-base.conf.in | 2 +- usr.sbin/bsdinstall/Makefile | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bsdinstall/FreeBSD-base.conf.in b/usr.sbin/bsdinstall/FreeBSD-base.conf.in index 86ec8fabe253..13c94bbb8a64 100644 --- a/usr.sbin/bsdinstall/FreeBSD-base.conf.in +++ b/usr.sbin/bsdinstall/FreeBSD-base.conf.in @@ -1,5 +1,5 @@ FreeBSD-base: { - url: "pkg+https://%%PKGHOST%%.FreeBSD.org/${ABI}/%%SUBURL%%", + url: "pkg+https://pkg.FreeBSD.org/${ABI}/%%SUBURL%%", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/%%KEYSDIR%%", diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index a576f2d0794e..f796a8710c5b 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -21,26 +21,22 @@ _REVISION!= ${MAKE} -C ${SRCTOP}/release -V REVISION REVISION?= ${_REVISION} .if ${BRANCH} == CURRENT || ${BRANCH} == STABLE -PKGHOST= pkg KEYSDIR= pkg SUBURL= base_latest .elif ${BRANCH} == RELEASE -PKGHOST= pkgbase KEYSDIR= pkgbase-${REVISION:C/\.[0-9]+//} SUBURL= base_release_${REVISION:C/[0-9]+\.//} .elif ${BRANCH:C/[0-9]+$//} == BETA || \ ${BRANCH:C/[0-9]+$//} == RC -PKGHOST= pkgbase KEYSDIR= pkgbase-${REVISION:C/\.[0-9]+//} SUBURL= base_release_${REVISION:C/[0-9]+\.//}_${BRANCH:tl} .else .warning Invalid branch "${BRANCH}" -PKGHOST= pkg KEYSDIR= pkg SUBURL= base_latest .endif FreeBSD-base.conf: FreeBSD-base.conf.in - sed "s|%%PKGHOST%%|${PKGHOST}|;s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET} + sed "s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET} .include From nobody Thu May 7 17:19:11 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBJrb3XMlz6ct5T for ; Thu, 07 May 2026 17:19:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBJrb1HTBz3kGx for ; Thu, 07 May 2026 17:19:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8zWMCRB7m5PMANhu0qqZ8HeC9mQGb+OmHL952xipXuo=; b=pnEjEY+xooR718FBPPZnhqZWTHLqULlGZwt61PaDAIy+mYdDxG8bs+M0MiDwEOqciVENqR fLB6vWPWaJwsEvYwFqYvVIFl4Fi/o/wYoRmDdWLb4M5nTewBAharTGXyBQpHs5SyGT/L6/ 9r2nxXLUfI5RSdxV+8pkdAh2AsjUCXm48TNi1oorOpWfFT1hHK5qb91mp+9HKJssk+uPn4 W7MzzrgJPWVpZaNiUUlrz7a0b5gEKapB34d0WFEA13nkx+nMDh5nrCETT6LAYNAhIHofMG 9jxEybvc4Invz52XEzCyPbMGQpQqd4+WOVWQ8BzCB3CFAybjyvew20Rpbig5ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778174351; a=rsa-sha256; cv=none; b=Jp5gQfQtNPdqY4+KB0Ia6RSC/mVW/U17pLJ/l85hlelaW0dFAP+6/SrNP+Ziznfrwvol3c hBoUxrfC28YNdpwO+InCnWep4QnUIo9wb2NFmEPReKYNvTSOJuwf3qak704m68oGzdA0J3 urL1KdMjgzz+Yq1iEnZ7dT5cm4fNz/uv4sqw5/P2T0ueoTRb9BGBlpBiTbTuSUl7YQrZOM rXiWlYRWr+isdVc2TcZCY3+/psnAIDWQw0nlQO6Uv0XUKg3CtWaFEcFoaMTHh1V3EqZNZt CeHOO/vHh3sAE9Y86gvlP2IK7tSTYVCUXuXNxOtoFOAJDPoX/nNkQ345pCuBKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8zWMCRB7m5PMANhu0qqZ8HeC9mQGb+OmHL952xipXuo=; b=N8hokd/4uGx2dLrxkUxKFXVKuiTl0Fud7l8XO7vkJQgeaG68AMUfzEzjquNLF5Z9tCW+fS dW+hJ3Qy3lf2nDGj+JmMK+Q3RYqSYaTMYpdu1FxgAZpXXCqODCZh0/zStRMDj+lU0zCSvO F5aV14P5orFaZK0942RP1lEc9BlEcuVAsAUCwOmkXC45viyd2csyWLFZXDA6yd6hEcjBTj PFvdyPtm/N8SIJULR0ZPJrQBZVPqUgi/5EgwHAgelaCZPhblud6rJo8m8aaJcZjjp6J0QG ikSXdJilCh4z5+GYvbDjDlkXpB0/w7HodSMI6gV9UzRql+YpRpOBhufqoD+70A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBJrb0pJRzbT7 for ; Thu, 07 May 2026 17:19:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a87d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 17:19:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 54625dfb363a - main - git-arc: Update the usage message to mention create -d List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54625dfb363a4a00841ef7d7ee8e5cc5ea1156e0 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 17:19:11 +0000 Message-Id: <69fcc98f.3a87d.1c4265a8@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=54625dfb363a4a00841ef7d7ee8e5cc5ea1156e0 commit 54625dfb363a4a00841ef7d7ee8e5cc5ea1156e0 Author: Mark Johnston AuthorDate: 2026-05-07 17:18:32 +0000 Commit: Mark Johnston CommitDate: 2026-05-07 17:18:32 +0000 git-arc: Update the usage message to mention create -d Fixes: 448ec129bcef ("git-arc: Add a create-draft mode") --- tools/tools/git/git-arc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index 395787df970c..f2a325f3452a 100755 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -57,7 +57,7 @@ err_usage() Usage: git arc [-vy] Commands: - create [-l] [-r [,...]] [-s subscriber[,...]] [|] + create [-dl] [-r [,...]] [-s subscriber[,...]] [|] list | patch [-bcrs] [ ...] stage [-b branch] [|] From nobody Thu May 7 17:25:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBJzV0BZ3z6ct1f for ; Thu, 07 May 2026 17:25: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 4gBJzT3kwGz3l92 for ; Thu, 07 May 2026 17:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kQy40CqxnZqhblxQTMqJAgrJgnck/TVEXASd3IKst88=; b=WF0JgyqcerFHF75kQODnEsyn/sR8vXVlI24XTFwmQP/dOKiWOCwRvJUQdDoig+O4ClibI7 ENmXf4sGq+VsRkWKTw7G7ouwqsubU7dJOPdMRX7iI/AV/IPo2OdhoK7BUVJGlcxr4PxgV/ LNHI0gAuV1s6dkhHHoFel0/t4w76XQ0JNuHRw4/c3qkxGRpPEZQm2SxzsfpcBi9VoxG9cJ fWQ8xVhTKgq48zSaXwknXv/cOGQUW63GMYYk9tR9cCNtzKzElllDux0iDuOX0a57u5/ocj jd05MBMAYXNTsC2mIXOmT9egoqOom8BxUeaRhvkLPa/beKWEdYgfUfD3mP0btA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778174709; a=rsa-sha256; cv=none; b=dk8cak0OTKVXq7sefCfpcGI6Qk6m5y5fs8cvX01qw+516y71M8O7R5UcYZh9SzNHKMG8rh R9kWMq7wlc/YDpUZdEJyT0cpZgwR4Lb3HRfs1gh4j9HKKMtlGGFX4Tj4aEvlW9x8TNWcNG qJwM+XnXBOmQ9+KCTkIEHN195BTcCqF3MgYEQNiNvYG+TGtrOzAIYuxMKCWV2bZ64uFZ0z 7HgVoNGhX5tixcr0homqPDy4UdHoRnFY0J2ch+yvKQGO5hUbpKzBSwFS0WPbOaOIx2lTBn q0/lSNoD6pPe0oPeOjGgKBxZALdNXa9EpFWV5eGB/ivK/cDUjWYp2BPgkPsRXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kQy40CqxnZqhblxQTMqJAgrJgnck/TVEXASd3IKst88=; b=kdmnMORnyVNe9uxiDmk+iHuXoHkOEjdbcxGP0aoM7/Ou11rRFC0x0Q8S9+AwUz7ZN3eNmA 6V9oZStrCEQpxIe8XNijXoZMCGpiBdPan0yjjG7H94NE9gsdj3zwGz/xuB0a2jsBxq8FB2 5EtEMrxrHJtPDUqcze7y7LUeMRoSXshJxVvIkeb+rzdT43cTCN0GKDIGXN/Vqw/wDbGFUZ 3BvtwucCxnmAqcAwRW2IB6ePB3xQL2esj3UZQuJuUJ64U4ohIg8Fu3W1QR+8lXDwPFaHoN 5gyeGnG1ppq+YkJjdDu3jQU8kmCnf18GKHI39RhRgExx8IwjZVjQLHd5H0hxFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBJzT33fZzcQS for ; Thu, 07 May 2026 17:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b0f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 17:25:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 317817c9acaa - releng/15.1 - bsdinstall: Always use pkg.FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 317817c9acaa63e439d748b645cc954e93c6cf88 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 17:25:09 +0000 Message-Id: <69fccaf5.3b0f0.210668ca@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=317817c9acaa63e439d748b645cc954e93c6cf88 commit 317817c9acaa63e439d748b645cc954e93c6cf88 Author: Colin Percival AuthorDate: 2026-05-05 02:43:59 +0000 Commit: Colin Percival CommitDate: 2026-05-07 17:23:23 +0000 bsdinstall: Always use pkg.FreeBSD.org The FreeBSD-base bits are accessible via pkg.FreeBSD.org, even for releases, so there is no need to point at pkgbase.FreeBSD.org. Approved by: re (cperciva) MFC after: 3 days (cherry picked from commit 89b97931d6d415d7a2504d8ea2c99beafd77cf24) (cherry picked from commit dcdc1af669999aa3182c39ef9f162b625593785f) --- usr.sbin/bsdinstall/FreeBSD-base.conf.in | 2 +- usr.sbin/bsdinstall/Makefile | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bsdinstall/FreeBSD-base.conf.in b/usr.sbin/bsdinstall/FreeBSD-base.conf.in index 86ec8fabe253..13c94bbb8a64 100644 --- a/usr.sbin/bsdinstall/FreeBSD-base.conf.in +++ b/usr.sbin/bsdinstall/FreeBSD-base.conf.in @@ -1,5 +1,5 @@ FreeBSD-base: { - url: "pkg+https://%%PKGHOST%%.FreeBSD.org/${ABI}/%%SUBURL%%", + url: "pkg+https://pkg.FreeBSD.org/${ABI}/%%SUBURL%%", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/%%KEYSDIR%%", diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index a576f2d0794e..f796a8710c5b 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -21,26 +21,22 @@ _REVISION!= ${MAKE} -C ${SRCTOP}/release -V REVISION REVISION?= ${_REVISION} .if ${BRANCH} == CURRENT || ${BRANCH} == STABLE -PKGHOST= pkg KEYSDIR= pkg SUBURL= base_latest .elif ${BRANCH} == RELEASE -PKGHOST= pkgbase KEYSDIR= pkgbase-${REVISION:C/\.[0-9]+//} SUBURL= base_release_${REVISION:C/[0-9]+\.//} .elif ${BRANCH:C/[0-9]+$//} == BETA || \ ${BRANCH:C/[0-9]+$//} == RC -PKGHOST= pkgbase KEYSDIR= pkgbase-${REVISION:C/\.[0-9]+//} SUBURL= base_release_${REVISION:C/[0-9]+\.//}_${BRANCH:tl} .else .warning Invalid branch "${BRANCH}" -PKGHOST= pkg KEYSDIR= pkg SUBURL= base_latest .endif FreeBSD-base.conf: FreeBSD-base.conf.in - sed "s|%%PKGHOST%%|${PKGHOST}|;s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET} + sed "s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET} .include From nobody Thu May 7 17:25:10 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBJzW18Lsz6ctNr for ; Thu, 07 May 2026 17:25: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 4gBJzV4vLVz3l4p for ; Thu, 07 May 2026 17:25:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174710; 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=51cic++4TFbf0LERAS1lrDyxvAOjUf9jUVeCBp5/h6c=; b=Nl3TOX/YrMm1jICmLodRudEzkbp3FGoYJKhScdoNJ5eOewDBHuNApPJC+cy/kK1qta9OuR Nx8bWoIAWI2kAYrRij8n2gLCViQw+MQpbBbgaVBul8bc5rlR0tiPivJYOUI3dzzw/Qv8+a cIRyFYzxjHDmS0blT7p25O8ApNBLeiRQFTSDIDn/i/vchDUP0Cq+cNoWJ1H6JZFJFbxMk2 /QcQB7QzGNtntAdXrtnDO8IF6LBYP0Az2JLGHoT+KLvFCSDZP8BUJ4kPdtrLBLGu9/pS7b STGVmQnJMo2KS3Dgn58ZQTkNg3u8gkXoWPQ35q1Tkex27hx1MFxVrl6vM4Ndcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778174710; a=rsa-sha256; cv=none; b=GogOaMeBaXE2+UjNPB3LGcK3m3qI2YlIg8FJtu0Z2yLChBtaj5KUVjNc1fDsmi5T6WgwHB T756ld77iJO20MhyiYTBEJbhFHMBMG9KwMZpIq5hdRcUYhztB+mOllyDzehQHXBhWGJizM 685DkEY1FTOojbuQMHEEfEmP4Xbp/xdNP/ht6Q6YqDh5RpNCHz42Yg7GeRm32vHITsDJ5c WfYjzjxUKC71Qb9hm6AlRdlosVMUojfdae9l5Wz+P/QZvm4KbDc43QL6KenlZJqh2bDI5C KphSQNsNYoMiwSwp+LRNpXsJzCalx5Bh3wE2+w3Lx8tW/1/Q3XvawmBuZtz7HQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174710; 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=51cic++4TFbf0LERAS1lrDyxvAOjUf9jUVeCBp5/h6c=; b=BnTIxKJSxL8VgQHlwJO5/2VKFtB13cJAks8cCD7LYoaqVP9IIvPJUvHNd41NaCWjjgQ4b/ A3CR+00GQI+8kYHQnQ/5njaS0vinLRGLfSFJK8ifE4oeJ939Wkjp9fqlkr4Hdnjp6I8Ktg fzylcBSvhHFeltw1g5EdFm4dgENtsQd6LxP3zAn/EbH2xMgi060rezRoTd7F8usZfDYF38 8FMCLhF45a8mgR676vFviNil+/UyeuyAHHD4slCuqGTE5qHzc3B/4b8SlsmMQ3qbAjE51w AUdHaZ9ZUo8M1obUd6RUdRJlPbqXN8eExOONDgL3S8AJ9F35UJNGinzmC0j7yA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBJzV4RchzcF4 for ; Thu, 07 May 2026 17:25:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bf3f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 17:25:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Xin LI From: Colin Percival Subject: git: 109324d5e7ab - releng/15.1 - MFV less v691 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 109324d5e7ab893c15540fe97325b3eeaee88d20 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 17:25:10 +0000 Message-Id: <69fccaf6.3bf3f.a6dd976@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=109324d5e7ab893c15540fe97325b3eeaee88d20 commit 109324d5e7ab893c15540fe97325b3eeaee88d20 Author: Xin LI AuthorDate: 2026-05-07 03:51:51 +0000 Commit: Colin Percival CommitDate: 2026-05-07 17:24:43 +0000 MFV less v691 Approved by: re (cperciva) Relnotes: yes (cherry picked from commit dafba19e42e78cd3d7c9264ece49ddd3d7d70da5) MFV: less v692. (cherry picked from commit e2abec625bf07c054f7ac2df2402d6c454113df8) (cherry picked from commit 423b0bc492d5264ee518c6569d3c90ee0efb338c) --- contrib/less/LICENSE | 2 +- contrib/less/NEWS | 83 +++ contrib/less/README | 60 +- contrib/less/brac.c | 2 +- contrib/less/ch.c | 14 +- contrib/less/charset.c | 31 +- contrib/less/charset.h | 2 +- contrib/less/cmd.h | 26 +- contrib/less/cmdbuf.c | 138 ++-- contrib/less/command.c | 87 +-- contrib/less/compose.uni | 14 +- contrib/less/cvt.c | 2 +- contrib/less/decode.c | 107 ++- contrib/less/edit.c | 16 +- contrib/less/evar.c | 2 +- contrib/less/filename.c | 20 +- contrib/less/fmt.uni | 2 +- contrib/less/forwback.c | 37 +- contrib/less/funcs.h | 75 ++- contrib/less/help.c | 9 +- contrib/less/ifile.c | 12 +- contrib/less/input.c | 3 +- contrib/less/jump.c | 18 +- contrib/less/lang.h | 5 +- contrib/less/less.h | 19 +- contrib/less/less.hlp | 7 +- contrib/less/less.nro | 1495 ++++++++++++++++++++++++++++-------------- contrib/less/lessecho.c | 2 +- contrib/less/lessecho.nro | 37 +- contrib/less/lesskey.c | 2 +- contrib/less/lesskey.h | 2 +- contrib/less/lesskey.nro | 389 +++++++---- contrib/less/lesskey_parse.c | 37 +- contrib/less/lglob.h | 2 +- contrib/less/line.c | 39 +- contrib/less/linenum.c | 2 +- contrib/less/lsystem.c | 22 +- contrib/less/main.c | 55 +- contrib/less/mark.c | 154 +++-- contrib/less/omit.uni | 2 +- contrib/less/optfunc.c | 132 ++-- contrib/less/option.c | 134 ++-- contrib/less/option.h | 3 +- contrib/less/opttbl.c | 11 +- contrib/less/os.c | 65 +- contrib/less/output.c | 38 +- contrib/less/pattern.c | 2 +- contrib/less/pattern.h | 2 +- contrib/less/pckeys.h | 45 +- contrib/less/position.c | 16 +- contrib/less/position.h | 2 +- contrib/less/prompt.c | 38 +- contrib/less/screen.c | 527 ++++++++++----- contrib/less/scrsize.c | 2 +- contrib/less/search.c | 23 +- contrib/less/signal.c | 30 +- contrib/less/tags.c | 9 +- contrib/less/ttyin.c | 6 +- contrib/less/ubin.uni | 2 +- contrib/less/version.c | 21 +- contrib/less/wide.uni | 23 +- contrib/less/xbuf.c | 12 +- contrib/less/xbuf.h | 11 +- usr.bin/less/defines.h | 116 ++-- 64 files changed, 2852 insertions(+), 1451 deletions(-) diff --git a/contrib/less/LICENSE b/contrib/less/LICENSE index b9b72a3d088b..313cebd4f66f 100644 --- a/contrib/less/LICENSE +++ b/contrib/less/LICENSE @@ -2,7 +2,7 @@ ------------ Less -Copyright (C) 1984-2025 Mark Nudelman +Copyright (C) 1984-2026 Mark Nudelman Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/contrib/less/NEWS b/contrib/less/NEWS index 442fe21e406a..0f767aaeb059 100644 --- a/contrib/less/NEWS +++ b/contrib/less/NEWS @@ -9,6 +9,89 @@ Report bugs, suggestions or comments at https://github.com/gwsw/less/issues. +====================================================================== + + Major changes between "less" versions 691 and 692 + +* Revert HOME key to scroll to beginning of file and END key + to scroll to end of file (github #658). + +* Configure tty to leave CR and NL unmodified (github #703). + +* Add commands to lesskey parser (forw-bell-hilite, goto-pos and osc8-jump). + +* Add key sequences to lesskey parser (\kE, \kF, \kH, \kI, \kM, and \kS). + +* Fix bug using negative value with -z option (github #709). + +* Fix bug handling empty terminfo capabilties (github #710). + +* Fix memory leak in setupterm (github #707). + +* Make lesstest ignore system locale (nl_langinfo) (github #708). + +====================================================================== + + Major changes between "less" versions 685 and 691 + +* Add --autosave option (github #678). + +* Add ESC-f command (github #680). + +* Add column number to long prompt and = message. + +* Add prompt prototype sequences %C, %W, %Q and ?Q (github #685). + +* Map keypad keys, and use terminfo rather than termcap since keypad + definitions don't exist in termcap (github #650). + +* Change HOME key to scroll fully left and END key to scroll fully right. + Add shift-HOME and ctrl-HOME to scroll left and jump to top, and + add shift-END and ctrl-END to scroll right and jump to end (github #658). + +* Add LESSNOCONFIG environment variable. + +* Add --without-termlib to configure (github #701). + +* When setting line number colors (-DN), don't force bold attribute. + To set bold, you must append "d" or "*" to the color string (github #684). + +* While waiting for file data, only ^C or ^X will interrupt, not any command. + This reverts to behavior that existed before less-670 (github #700). + +* When --save-marks is not used, retain any marks saved in the history file + (github #662). + +* Defer sending the terminal init string until the first char is read + from the input file (github #682). + +* Make SIGHUP do an orderly exit like SIGTERM. + +* Implement modeline handling in Windows build. + +* Fix bugs and improve behavior of screen resize on Windows. + +* Fix bug when entering search modifier key at start of non-empty + search string (github #668). + +* Fix bug repainting screen with --form-feed (github #672). + +* Fix bugs passing invalid negative values to some command line + options (github #675). + +* Fix incorrect display of Lit indicator (github #670). + +* Fix incorrect display when returning to a mark after resizeing window + (github #681). + +* Fix bug using --pattern with --incsearch (github #696). + +* Disallow mouse click to open OSC8 link in SECURE mode (github #676). + +* Add SECURE_COMPILE environment variable for Windows builds. + +* Update Unicode tables. + ====================================================================== Major changes between "less" versions 679 and 685 diff --git a/contrib/less/README b/contrib/less/README index 4bfdc5e5a67f..a6954eb67c1e 100644 --- a/contrib/less/README +++ b/contrib/less/README @@ -84,7 +84,7 @@ INSTALLATION (Unix & Linux systems only): Makefile now. Take particular notice of the list of "terminal" libraries in the LIBS definition in the Makefile; these may need to be edited. The terminal libraries will be some subset of - -lncurses -lcurses -ltermcap -ltermlib + -ltinfo -ltinfow -lxcurses -lncursesw -lncurses -lcurses -ltermcap -ltermlib If you wish, you may edit defines.h to remove some optional features. If you choose not to include some features in your version, you may @@ -117,6 +117,29 @@ programmers", not "persons who attempt to circumvent computer security".) +======================================================================= +INSTALLATION (Windows-95, Windows-98 and Windows-NT systems only, + with Microsoft Visual C++, mingw, or Borland C) + +1. Move the distributed source to its own directory. + +2. If you wish, you may edit defines.wn to remove some optional features. + If you choose not to include some features in your version, you may + wish to edit the manual page less.man and the help page help.c + to remove the descriptions of the features which you are removing. + +3. If you are using Microsoft Visual C++, run "nmake -f Makefile.wnm". + If you are using mingw, run "make -f Makefile.wng". + If you are using Borland C, run "make -f Makefile.wnb". + + If the environment variable SECURE_COMPILE is to 1 during the make, + a "secure" version of less is built, with some features disabled. + +4. If the make succeeds, it will generate the programs "less.exe" and + "lesskey.exe" in your current directory. Test the generated programs. + + + ======================================================================= INSTALLATION (MS-DOS systems only, with Microsoft C, Borland C, or DJGPP) @@ -156,34 +179,6 @@ INSTALLATION (MS-DOS systems only, -======================================================================= -INSTALLATION (Windows-95, Windows-98 and Windows-NT systems only, - with Borland C or Microsoft Visual C++) - -1. Move the distributed source to its own directory. - -2. If you are using Borland C, rename Makefile.wnb to Makefile. - If you are using Microsoft Visual C++, rename Makefile.wnm to Makefile. - -3. Check the Makefile to make sure the definitions look ok. - -4. If you wish, you may edit defines.wn to remove some optional features. - If you choose not to include some features in your version, you may - wish to edit the manual page less.man and the help page help.c - to remove the descriptions of the features which you are removing. - -5. Type "make" and watch the fun. - -6. If the make succeeds, it will generate the programs "less.exe" and - "lesskey.exe" in your current directory. Test the generated programs. - -7. When satisfied that it works, if you wish to install it - in a public place, type "make install". - See step 6 of the Unix installation instructions for details - on how to change the default installation directories. - - - ======================================================================= INSTALLATION (OS/2 systems only, with EMX C) @@ -245,10 +240,3 @@ INSTALLATION (OS-9 systems only, See step 6 of the Unix installation instructions for details on how to change the default installation directories. -======================================================================= -ACKNOWLEDGMENTS: - Some versions of the less distribution are packaged using - Info-ZIP's compression utility. - Info-ZIP's software is free and can be obtained as source - code or executables from various anonymous-ftp sites, - including ftp.uu.net:/pub/archiving/zip. diff --git a/contrib/less/brac.c b/contrib/less/brac.c index 36f31d0316f4..b3b74e07d18a 100644 --- a/contrib/less/brac.c +++ b/contrib/less/brac.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2025 Mark Nudelman + * Copyright (C) 1984-2026 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. diff --git a/contrib/less/ch.c b/contrib/less/ch.c index fb7572e7f88a..47d31ecffadd 100644 --- a/contrib/less/ch.c +++ b/contrib/less/ch.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2025 Mark Nudelman + * Copyright (C) 1984-2026 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -22,7 +22,7 @@ typedef POSITION BLOCKNUM; -public int ignore_eoi; +public lbool ignore_eoi = FALSE; /* * Pool of buffers holding the most recently used blocks of the input file. @@ -883,13 +883,13 @@ public void ch_init(int f, int flags, ssize_t nread) */ ch_fsize = (flags & CH_HELPFILE) ? size_helpdata : filesize(ch_file); - /* - * This is a kludge to workaround a Linux kernel bug: files in some - * pseudo filesystems like /proc and tracefs have a size of 0 according - * to fstat() but have readable data. - */ if (ch_fsize == 0 && nread > 0) { + /* + * This is a kludge to workaround a Linux kernel bug: files in some + * pseudo filesystems like /proc and tracefs have a size of 0 according + * to fstat() but have readable data. + */ ch_flags |= CH_NOTRUSTSIZE; } diff --git a/contrib/less/charset.c b/contrib/less/charset.c index 0f62739bc88d..74159404148b 100644 --- a/contrib/less/charset.c +++ b/contrib/less/charset.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2025 Mark Nudelman + * Copyright (C) 1984-2026 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -202,20 +202,20 @@ static void ichardef_utf(constant char *s) switch (*s++) { case 'b': - xbuf_add_data(&user_ubin_array, (unsigned char *) &range, sizeof(range)); + xbuf_add_data(&user_ubin_array, &range, sizeof(range)); break; case 'c': - xbuf_add_data(&user_compose_array, (unsigned char *) &range, sizeof(range)); + xbuf_add_data(&user_compose_array, &range, sizeof(range)); break; case 'd': - xbuf_add_data(&user_omit_array, (unsigned char *) &range, sizeof(range)); + xbuf_add_data(&user_omit_array, &range, sizeof(range)); break; case 'w': - xbuf_add_data(&user_wide_array, (unsigned char *) &range, sizeof(range)); - xbuf_add_data(&user_prt_array, (unsigned char *) &range, sizeof(range)); + xbuf_add_data(&user_wide_array, &range, sizeof(range)); + xbuf_add_data(&user_prt_array, &range, sizeof(range)); break; case 'p': case '.': - xbuf_add_data(&user_prt_array, (unsigned char *) &range, sizeof(range)); + xbuf_add_data(&user_prt_array, &range, sizeof(range)); break; case '\0': s--; @@ -429,13 +429,21 @@ static void set_charset(void) /* * Try using the codeset name as the charset name. */ - s = nl_langinfo(CODESET); - if (icharset(s, 1)) - return; +#if LESSTEST + /* + * Don't check nl_langinfo in lesstest mode; charset should come + * only from environment variables, not from the system locale. + */ + if (0) /* {{ unfortunately it's too early to use is_lesstest }} */ +#endif + { + s = nl_langinfo(CODESET); + if (icharset(s, 1)) + return; + } #endif #endif -#if HAVE_STRSTR /* * Check whether LC_ALL, LC_CTYPE or LANG look like UTF-8 is used. */ @@ -448,7 +456,6 @@ static void set_charset(void) if (icharset("utf-8", 1)) return; } -#endif #if HAVE_LOCALE /* diff --git a/contrib/less/charset.h b/contrib/less/charset.h index 4acf494b4ed5..cf2e02547cb5 100644 --- a/contrib/less/charset.h +++ b/contrib/less/charset.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2025 Mark Nudelman + * Copyright (C) 1984-2026 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. diff --git a/contrib/less/cmd.h b/contrib/less/cmd.h index 07c57b111aee..945f99719d0c 100644 --- a/contrib/less/cmd.h +++ b/contrib/less/cmd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2025 Mark Nudelman + * Copyright (C) 1984-2026 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -86,6 +86,7 @@ #define A_OSC8_JUMP 74 #define A_START_PASTE 75 /* must not overlap EC_* */ #define A_END_PASTE 76 /* must not overlap EC_* */ +#define A_F_FOREVER_BELL 77 /* These values must not conflict with any A_* or EC_* value. */ #define A_INVALID 100 @@ -155,4 +156,27 @@ #define SK_BACKTAB 15 #define SK_CTL_BACKSPACE 16 #define SK_BACKSPACE 17 +#define SK_PAD_U 18 +#define SK_PAD_D 19 +#define SK_PAD_R 20 +#define SK_PAD_L 21 +#define SK_PAD_UR 22 +#define SK_PAD_UL 23 +#define SK_PAD_DR 24 +#define SK_PAD_DL 25 +#define SK_PAD_CENTER 26 +#define SK_PAD_STAR 27 +#define SK_PAD_SLASH 28 +#define SK_PAD_DASH 29 +#define SK_PAD_PLUS 30 +#define SK_PAD_DOT 31 +#define SK_PAD_COMMA 32 +#define SK_PAD_ZERO 33 +#define SK_SHIFT_HOME 34 +#define SK_SHIFT_END 35 +#define SK_CTL_HOME 36 +#define SK_CTL_END 37 +#define SK_SHIFT_LEFT_ARROW 38 +#define SK_SHIFT_RIGHT_ARROW 39 + #define SK_CONTROL_K 40 diff --git a/contrib/less/cmdbuf.c b/contrib/less/cmdbuf.c index f2963cf4c9da..1c3b3d461ad9 100644 --- a/contrib/less/cmdbuf.c +++ b/contrib/less/cmdbuf.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2025 Mark Nudelman + * Copyright (C) 1984-2026 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -23,7 +23,7 @@ extern int sc_width; extern int utf_mode; extern int no_hist_dups; -extern int marks_modified; +extern lbool marks_modified; extern int no_paste; public lbool pasting = FALSE; @@ -35,6 +35,9 @@ static int cmd_offset; /* Index into cmdbuf of first displayed char */ static lbool literal; /* Next input char should not be interpreted */ static size_t updown_match; /* Prefix length in up/down movement */ static lbool have_updown_match = FALSE; +#if LESS_INSERT_MODE +static lbool insert_mode = TRUE; +#endif static int cmd_complete(int action); /* @@ -189,7 +192,7 @@ public int len_cmdbuf(void) */ public lbool cmdbuf_empty(void) { - return cp == cmdbuf && cmd_mbc_buf_len == 0; + return cmdbuf[0] == '\0' && cmd_mbc_buf_len == 0; } /* @@ -454,39 +457,6 @@ static int cmd_left(void) return (CC_OK); } -/* - * Insert a char into the command buffer, at the current position. - */ -static int cmd_ichar(constant char *cs, size_t clen) -{ - char *s; - - if (strlen(cmdbuf) + clen >= sizeof(cmdbuf)-1) - { - /* No room in the command buffer for another char. */ - bell(); - return (CC_ERROR); - } - - /* - * Make room for the new character (shift the tail of the buffer right). - */ - for (s = &cmdbuf[strlen(cmdbuf)]; s >= cp; s--) - s[clen] = s[0]; - /* - * Insert the character into the buffer. - */ - for (s = cp; s < cp + clen; s++) - *s = *cs++; - /* - * Reprint the tail of the line from the inserted char. - */ - have_updown_match = FALSE; - cmd_repaint(cp); - cmd_right(); - return (CC_OK); -} - /* * Backspace in the command buffer. * Delete the char to the left of the cursor. @@ -502,7 +472,7 @@ static int cmd_erase(void) * Backspace past beginning of the buffer: * this usually means abort the command. */ - return (CC_QUIT); + return CC_QUIT; } /* * Move cursor left (to the char being erased). @@ -532,7 +502,7 @@ static int cmd_erase(void) * to abort the current command, if CF_QUIT_ON_ERASE is set. */ if ((curr_cmdflags & CF_QUIT_ON_ERASE) && cp == cmdbuf && *cp == '\0') - return (CC_QUIT); + return CC_QUIT; return (CC_OK); } @@ -554,6 +524,43 @@ static int cmd_delete(void) return (CC_OK); } +/* + * Insert a char into the command buffer, at the current position. + */ +static int cmd_ichar(constant char *cs, size_t clen) +{ + char *s; + + if (strlen(cmdbuf) + clen >= sizeof(cmdbuf)-1) + { + /* No room in the command buffer for another char. */ + lbell(); + return (CC_ERROR); + } + +#if LESS_INSERT_MODE + if (!insert_mode) + cmd_delete(); +#endif + /* + * Make room for the new character (shift the tail of the buffer right). + */ + for (s = &cmdbuf[strlen(cmdbuf)]; s >= cp; s--) + s[clen] = s[0]; + /* + * Insert the character into the buffer. + */ + for (s = cp; s < cp + clen; s++) + *s = *cs++; + /* + * Reprint the tail of the line from the inserted char. + */ + have_updown_match = FALSE; + cmd_repaint(cp); + cmd_right(); + return (CC_OK); +} + /* * Delete the "word" to the left of the cursor. */ @@ -612,7 +619,7 @@ static int cmd_kill(void) if (cmdbuf[0] == '\0') { /* Buffer is already empty; abort the current command. */ - return (CC_QUIT); + return CC_QUIT; } cmd_offset = 0; cmd_home(); @@ -625,7 +632,7 @@ static int cmd_kill(void) * to abort the current command, if CF_QUIT_ON_ERASE is set. */ if (curr_cmdflags & CF_QUIT_ON_ERASE) - return (CC_QUIT); + return CC_QUIT; return (CC_OK); } @@ -660,7 +667,7 @@ static int cmd_updown(int action) /* * The current command has no history list. */ - bell(); + lbell(); return (CC_OK); } @@ -705,7 +712,7 @@ static int cmd_updown(int action) /* * We didn't find a history entry that matches. */ - bell(); + lbell(); return (CC_OK); } @@ -796,6 +803,15 @@ public void cmd_addhist(struct mlist *mlist, constant char *cmd, lbool modified) * Thus, an UPARROW will always retrieve the previous command. */ mlist->curr_mp = ml->next; + if (modified) + { + if (mlist == &mlist_search && autosave_action('/')) + save_cmdhist(); +#if SHELL_ESCAPE || PIPEC + else if (mlist == &mlist_shell && autosave_action('!')) + save_cmdhist(); +#endif + } #endif } @@ -904,6 +920,9 @@ static int cmd_edit(char c, lbool stay_in_completion) return (CC_OK); case EC_INSERT: not_in_completion(); +#if LESS_INSERT_MODE + insert_mode = !insert_mode; +#endif return (CC_OK); case EC_BACKSPACE: not_in_completion(); @@ -914,7 +933,7 @@ static int cmd_edit(char c, lbool stay_in_completion) case EC_ABORT: not_in_completion(); (void) cmd_kill(); - return (CC_QUIT); + return CC_QUIT; case EC_W_BACKSPACE: not_in_completion(); return (cmd_werase()); @@ -950,17 +969,23 @@ static int cmd_istr(constant char *str) { constant char *endline = str + strlen(str); constant char *s; - int action; - + int action = CC_OK; +#if LESS_INSERT_MODE + lbool save_insert_mode = insert_mode; + insert_mode = TRUE; +#endif for (s = str; *s != '\0'; ) { constant char *os = s; step_charc(&s, +1, endline); action = cmd_ichar(os, ptr_diff(s, os)); if (action != CC_OK) - return (action); + break; } - return (CC_OK); +#if LESS_INSERT_MODE + insert_mode = save_insert_mode; +#endif + return (action); } /* @@ -1171,7 +1196,7 @@ static int cmd_complete(int action) #endif /* TAB_COMPLETE_FILENAME */ if (tk_text == NULL) { - bell(); + lbell(); return (CC_OK); } if (action == EC_EXPAND) @@ -1239,7 +1264,7 @@ static int cmd_complete(int action) fail: in_completion = FALSE; - bell(); + lbell(); return (CC_OK); } @@ -1281,7 +1306,7 @@ static int cmd_uchar(char c, size_t *plen) } else { /* UTF8_INVALID or stray UTF8_TRAIL */ - bell(); + lbell(); return (CC_ERROR); } } else if (IS_UTF8_TRAIL(c)) @@ -1293,14 +1318,14 @@ static int cmd_uchar(char c, size_t *plen) { /* complete, but not well formed (non-shortest form), sequence */ cmd_mbc_buf_len = 0; - bell(); + lbell(); return (CC_ERROR); } } else { /* Flush incomplete (truncated) sequence. */ cmd_mbc_buf_len = 0; - bell(); + lbell(); /* Handle new char. */ goto retry; } @@ -1388,7 +1413,6 @@ public LINENUM cmd_int(mutable long *frac) { constant char *p; LINENUM n = 0; - lbool err; for (p = cmdbuf; *p >= '0' && *p <= '9'; p++) { @@ -1401,8 +1425,8 @@ public LINENUM cmd_int(mutable long *frac) *frac = 0; if (*p++ == '.') { - *frac = getfraction(&p, NULL, &err); - /* {{ do something if err is set? }} */ + /* {{ Just ignore error in fractional part. }} */ + (void) getfraction(&p, frac); } return (n); } @@ -1447,7 +1471,7 @@ static int mlist_size(struct mlist *ml) static char * histfile_find(lbool must_exist) { constant char *home = lgetenv("HOME"); - char *name = NULL; + char *name; /* Try in $XDG_STATE_HOME, then in $HOME/.local/state, then in $XDG_DATA_HOME, then in $HOME. */ #if OS2 @@ -1738,7 +1762,7 @@ public void save_cmdhist(void) int skip_shell; struct save_ctx ctx; constant char *s; - FILE *fout = NULL; + FILE *fout; int histsize = 0; if (!secure_allow(SF_HISTORY) || !histfile_modified()) diff --git a/contrib/less/command.c b/contrib/less/command.c index 390385547385..1bb8d006f8ec 100644 --- a/contrib/less/command.c +++ b/contrib/less/command.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2025 Mark Nudelman + * Copyright (C) 1984-2026 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -32,7 +32,7 @@ extern int jump_sline; extern lbool quitting; extern int wscroll; extern int top_scroll; -extern int ignore_eoi; +extern lbool ignore_eoi; extern int hshift; extern int bs_mode; extern int proc_backspace; @@ -49,7 +49,6 @@ extern void *ml_examine; extern int wheel_lines; extern int def_search_type; extern lbool search_wrapped; -extern lbool no_poll; extern int no_paste; extern lbool pasting; extern int no_edit_warn; @@ -154,7 +153,7 @@ static void start_mca(int action, constant char *prompt, void *mlist, int cmdfla set_mlist(mlist, cmdflags); } -public int in_mca(void) +public lbool in_mca(void) { return (mca != 0 && mca != A_PREFIX); } @@ -476,7 +475,7 @@ static int mca_opt_nonfirst_char(char c) } } else if (!ambig) { - bell(); + lbell(); } return (MCA_MORE); } @@ -575,7 +574,10 @@ static int mca_search_char(char c) */ if (!cmdbuf_empty() || literal_char) { + lbool was_literal_char = literal_char; literal_char = FALSE; + if (was_literal_char) + mca_search1(); return (NO_MCA); } @@ -639,6 +641,17 @@ static int mca_search_char(char c) return (NO_MCA); } +/* + * Jump back to the starting position of an incremental search. + */ +static void jump_search_incr_pos(void) +{ + if (search_incr_pos.pos == NULL_POSITION) + return; + hshift = search_incr_hshift; + jump_loc(search_incr_pos.pos, search_incr_pos.ln); +} + /* * Handle a character of a multi-character command. */ @@ -772,30 +785,21 @@ static int mca_char(char c) if (*pattern == '\0') { /* User has backspaced to an empty pattern. */ - undo_search(1); - hshift = search_incr_hshift; - jump_loc(search_incr_pos.pos, search_incr_pos.ln); + undo_search(TRUE); + jump_search_incr_pos(); } else { - /* - * Suppress tty polling while searching. - * This avoids a problem where tty input - * can cause the search to be interrupted. - */ - no_poll = TRUE; if (search(st | SRCH_INCR, pattern, 1) != 0) { /* No match, invalid pattern, etc. */ - undo_search(1); - hshift = search_incr_hshift; - jump_loc(search_incr_pos.pos, search_incr_pos.ln); + undo_search(TRUE); + jump_search_incr_pos(); } - no_poll = FALSE; } /* Redraw the search prompt and search string. */ if (is_screen_trashed() || !full_screen) { - clear(); + lclear(); repaint(); } mca_search1(); @@ -851,7 +855,7 @@ static void make_display(void) * We need to clear and repaint screen before any change. */ if (!full_screen && !(quit_if_one_screen && one_screen)) - clear(); + lclear(); /* * If nothing is displayed yet, display starting from initial_scrpos. */ @@ -864,9 +868,9 @@ static void make_display(void) } else if (is_screen_trashed() || !full_screen) { int save_top_scroll = top_scroll; - int save_ignore_eoi = ignore_eoi; + lbool save_ignore_eoi = ignore_eoi; top_scroll = 1; - ignore_eoi = 0; + ignore_eoi = FALSE; if (is_screen_trashed() == 2) { /* Special case used by ignore_eoi: re-open the input file @@ -1304,29 +1308,31 @@ static void multi_search(constant char *pattern, int n, int silent) /* * Forward forever, or until a highlighted line appears. */ -static int forw_loop(int until_hilite) +static int forw_loop(int action) { - POSITION curr_len; + POSITION prev_hilite; if (ch_getflags() & CH_HELPFILE) return (A_NOACTION); cmd_exec(); jump_forw_buffered(); - curr_len = ch_length(); - highest_hilite = until_hilite ? curr_len : NULL_POSITION; - ignore_eoi = 1; + highest_hilite = prev_hilite = 0; + ignore_eoi = TRUE; while (!sigs) { - if (until_hilite && highest_hilite > curr_len) + if (action != A_F_FOREVER && highest_hilite > prev_hilite) { - bell(); - break; + lbell(); + if (action == A_F_UNTIL_HILITE) + break; + prev_hilite = highest_hilite; } make_display(); forward(1, FALSE, FALSE, FALSE); } - ignore_eoi = 0; + highest_hilite = NULL_POSITION; + ignore_eoi = FALSE; ch_set_eof(); /* @@ -1334,7 +1340,7 @@ static int forw_loop(int until_hilite) * a non-abort signal (e.g. window-change). */ if (sigs && !ABORT_SIGS()) - return (until_hilite ? A_F_UNTIL_HILITE : A_F_FOREVER); + return (action); return (A_NOACTION); } @@ -1401,7 +1407,6 @@ public void commands(void) #endif search_type = SRCH_FORW; - wscroll = (sc_height + 1) / 2; newaction = A_NOACTION; for (;;) @@ -1507,7 +1512,9 @@ public void commands(void) * want erase_char/kill_char to be treated * as line editing characters. */ - constant char tbuf[2] = { c, '\0' }; + char tbuf[2]; + tbuf[0] = c; + tbuf[1] = '\0'; action = fcmd_decode(tbuf, &extra); } /* *** 8507 LINES SKIPPED *** From nobody Thu May 7 17:25:11 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBJzX2DC5z6ctcR for ; Thu, 07 May 2026 17:25: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 4gBJzW5VjFz3lCN for ; Thu, 07 May 2026 17:25:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174711; 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=/Iaxz21FaNAiFf8KS3Sw37wIGtWSW+9yJgKi406zCJc=; b=kJ+TgJqVfDB91KzG3eAJW/r9vHcNzyzvKzx6M9twfXzVNQmwS6XaY/jJjJpEB41v9jIQ8W omD0PTfeRZl6sjKVXyhv/pBww0GPTLD3mgLVu9GmpONRzdmPiz506V7bt+9nZdtdcuyJXy F8dwzROBT9rWICjJ6MCanDISepUiqMJPrlKcZcCn9HpivyM6wYRZifJBkwF7HI0kgHcqDb RAenZ8C8UmImB2y7IE5kCKz5r0VZRoVS3RkaM8BS+hIIwqNViXIb59tKXtqZwbwXOOX2pm GTfwTTH6ji+7AkfyGNDJJIUdZLEXmWYPz6kpO7OOHI2PQ4USM0nDJ4qMQMDgNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778174711; a=rsa-sha256; cv=none; b=cY7SjKFRSkjZ+MaaQ7cqq46/M0Zwzjj3N2T7Exsvmye+z4Z2tanXLoxsSWwXZTr1YDGQ2h csCGI32kCM/OWkaxhbPjRy+1UWmn/4WkYayrC/8sKLGIrFzX2SuIoPPwJTXjwHidFDUDiP vh9U3zHwwLmyki8pTfTgRN79p7tMZTE3YWTWn4YMcRPJNMf1rpaC9mN0rm9v+I/XTKLWdu sBpJPSivOC1xdOyD1fR8rqioTKchntVmD0gMX9CXDf3uc3dX9G/cLuoS1UMimSYG+fRMux 5sxrCCQu2KtQfJYQUiUNoxj19nKMCNjf9wQcGgzO+OQN1hcSEKN6RZJl2XlRog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174711; 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=/Iaxz21FaNAiFf8KS3Sw37wIGtWSW+9yJgKi406zCJc=; b=TuLgxgf3dzQpFghwiIdf/PYAXkE1WG9oRkVqB7BilyASPJPrUctUuQpA5Qbo/1kF+O7gpf oBTFh5BB7kePtkU2TaqktHOo2AUJoZwIgOecG6Q5QbzeOknJI5T7XOrDygMsdvyypw1ZSs x7kfvbQSTPiAamjm+/6KrD5sXzWBUnS77jzKyvxB2MT+YBwvH+x2HQ2PmbE3tNKVnE0Iie EqDHRVQie1XdI+gYTb9rtTo/IAzud3nvXEeVUEUgaDbuc+msLCwGGPQP58lJ5j46A0mgoW DYsC17OFDhm9Vs9qQsZP0yB93AAXaQM+eQcuosmzBqCdGLybp5JHLZT9YPm0Hg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBJzW4v1TzcPm for ; Thu, 07 May 2026 17:25:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b0f4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 17:25:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Michal Meloun From: Colin Percival Subject: git: ed0ef0322eb6 - releng/15.1 - arm64: Define the .iplt section placement. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: ed0ef0322eb64d31dab03b6c975c8f9ad7c8c7ab Auto-Submitted: auto-generated Date: Thu, 07 May 2026 17:25:11 +0000 Message-Id: <69fccaf7.3b0f4.6f76104e@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ed0ef0322eb64d31dab03b6c975c8f9ad7c8c7ab commit ed0ef0322eb64d31dab03b6c975c8f9ad7c8c7ab Author: Michal Meloun AuthorDate: 2026-04-15 09:32:54 +0000 Commit: Colin Percival CommitDate: 2026-05-07 17:24:46 +0000 arm64: Define the .iplt section placement. Ensure that the .plt and .ipld sections are in the executable memory segment. Approved by: re (cperciva) Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D56403 (cherry picked from commit 1dddb580f950a27fb9859b2879755dde114c9d8b) (cherry picked from commit 5169e95b7596b5a96cb50dee69ee8c20445a9a9e) --- sys/conf/ldscript.arm64 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/conf/ldscript.arm64 b/sys/conf/ldscript.arm64 index ae231c3037e6..7ec0d4324270 100644 --- a/sys/conf/ldscript.arm64 +++ b/sys/conf/ldscript.arm64 @@ -15,6 +15,12 @@ SECTIONS *(.gnu.warning) *(.gnu.linkonce.t*) } =0x9090 + .plt : + { + *(.plt) + *(.iplt) + } + /* * Align to the the largest page size the kernel could be built for. * If we don't then building page tables in locore.S could fail as it @@ -66,7 +72,6 @@ SECTIONS .rel.plt : { *(.rel.plt) } .rela.plt : { *(.rela.plt) } .init : { *(.init) } =0x9090 - .plt : { *(.plt) } . = ALIGN(4); _extab_start = .; From nobody Thu May 7 17:25:12 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBJzZ116Mz6ctRc for ; Thu, 07 May 2026 17:25: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 4gBJzY46Dkz3kys for ; Thu, 07 May 2026 17:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174713; 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=oG8VDx0EVwCCY5h/GhGBpRosI1V9B1Ydc8kBDzdo+b8=; b=QztM722tcnrBMy3a/WbtLxa1GjxzBdLjhDGr0ltJTb+EWHpwcn0lqLYYSiAL0XPEKnFzE0 vt8oPHPcA0L0lkwNGqW349QukNTu0j3ypWZAfQU5TaE8LHbxG2HED780kv+dA/LulYFOMt VVdQN4MrxEtS+w8r+mwAw1bnx91yQJEbq8vbQaDDYs1hPleU++/GioqZ866bSK94twJ3Ag NjjsdOyUcmcXW7oNXMAq8gxsBlyEYkA8ip6uj8bCkzTh3/GASF8RzQOqLf5XRJcKsiGGlw 1D/V6DplPZMONN0j5pToRnV4e56MgIMGUfox/+/1rfRF98f6ciwB6Y0WUXJCdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778174713; a=rsa-sha256; cv=none; b=sd0TpSQ/599SY9vtGbpx+4zlAjS/tmlDVgpyKCHHKLwCiqogobCvdCMsK2c//kHNjOiYFB o4RBIIYRIlNIYg+WY4fIw2swVVE2/oWo9vBCjCI0mJAR4ThDAE/mimX53mi1YnCsy49H6w ADeXqIbG0wX7VdSW+nO5DRiqLkfIRmtq/8jo2Po2+0Jp0B+Z00Xe7riu9tzS9lHIumwF56 nkTdGq284oKu6Q3+lfBX8YZ6vVqNfcQ/Y+jf59/5pblaE672V/0LFLz+4mZRRa6VvGTJ+q Lodd0X9LxrMNfOx9UaQRixGSML2uNSZmZateQAdn6Pe7j13wKrWCTH5ScezEJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174713; 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=oG8VDx0EVwCCY5h/GhGBpRosI1V9B1Ydc8kBDzdo+b8=; b=D8qLBoGJzy0zYWRnuDJDAdluf5s5P+Wfde+NFSIv86G62DjghPD067Bz5zMwo3wAnDT06G 3kNneuwoj1mSrhIoRsoaPL4iOVvvSlqtW1+GFyc2w467ozJZIIs1+MPQ0HQffYci0v5HTH w4DDa+b71aJNwoomq3wz/L5bdRdrdrU37o0OK3t4OTK4bm++63hNfBbsMAPityOj81pPjC ZIA8pfWuz1zTbmh2CEUcyM9fsTi9bcNbdaa3XGBMtE8DaowFDedEIlAsxxpeme3RGYyxSJ fd5RpMlajYtfbzZXH+n0rpq4iqBhXpH9QlUfb1N0DbN5jqfGuuAnmbU/JkMp7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBJzY3N04zcF6 for ; Thu, 07 May 2026 17:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cd2a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 17:25:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Xin LI From: Colin Percival Subject: git: 1aa2b46a0707 - releng/15.1 - MFV: zstd 1.5.7. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 1aa2b46a07075ea79d22e91a1325b88de4efd27e Auto-Submitted: auto-generated Date: Thu, 07 May 2026 17:25:12 +0000 Message-Id: <69fccaf8.3cd2a.28f340b5@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1aa2b46a07075ea79d22e91a1325b88de4efd27e commit 1aa2b46a07075ea79d22e91a1325b88de4efd27e Author: Xin LI AuthorDate: 2026-05-07 04:29:03 +0000 Commit: Colin Percival CommitDate: 2026-05-07 17:24:49 +0000 MFV: zstd 1.5.7. Approved by: re (cperciva) MFC after: 2 weeks Relnotes: yes (cherry picked from commit c0d9a07101a1e72769ee0619a583f63a078fb391) (cherry picked from commit 7c9418613a31571e4eceda55a417f7183d26acb5) (cherry picked from commit 111a42d7d78a88ba6ff7b5d61b0867faccc00276) (cherry picked from commit ff426ceef657d7c478471e631349c5d1a8b96453) --- lib/libzstd/Makefile | 4 + sys/conf/files | 1 + sys/contrib/zstd/.buckconfig | 9 - sys/contrib/zstd/.buckversion | 1 - sys/contrib/zstd/CHANGELOG | 148 +- sys/contrib/zstd/CONTRIBUTING.md | 489 --- sys/contrib/zstd/FREEBSD-Xlist | 11 +- sys/contrib/zstd/LICENSE | 8 +- sys/contrib/zstd/Makefile | 439 --- sys/contrib/zstd/README.md | 96 +- sys/contrib/zstd/SECURITY.md | 15 + sys/contrib/zstd/TESTING.md | 43 - sys/contrib/zstd/appveyor.yml | 205 -- sys/contrib/zstd/doc/README.md | 25 - sys/contrib/zstd/doc/educational_decoder/Makefile | 62 - sys/contrib/zstd/doc/educational_decoder/README.md | 36 - sys/contrib/zstd/doc/educational_decoder/harness.c | 119 - .../zstd/doc/educational_decoder/zstd_decompress.c | 2320 ------------- .../zstd/doc/educational_decoder/zstd_decompress.h | 61 - sys/contrib/zstd/doc/images/CSpeed2.png | Bin 73335 -> 0 bytes sys/contrib/zstd/doc/images/DCspeed5.png | Bin 69278 -> 0 bytes sys/contrib/zstd/doc/images/DSpeed3.png | Bin 27123 -> 0 bytes sys/contrib/zstd/doc/images/cdict_v136.png | Bin 33330 -> 0 bytes sys/contrib/zstd/doc/images/dict-cr.png | Bin 90412 -> 0 bytes sys/contrib/zstd/doc/images/dict-cs.png | Bin 91518 -> 0 bytes sys/contrib/zstd/doc/images/dict-ds.png | Bin 98316 -> 0 bytes sys/contrib/zstd/doc/images/zstd_cdict_v1_3_5.png | Bin 93969 -> 0 bytes sys/contrib/zstd/doc/images/zstd_logo86.png | Bin 5963 -> 0 bytes sys/contrib/zstd/doc/zstd_compression_format.md | 1692 ---------- sys/contrib/zstd/doc/zstd_manual.html | 1908 ----------- sys/contrib/zstd/examples/Makefile | 93 - sys/contrib/zstd/examples/README.md | 46 - sys/contrib/zstd/examples/common.h | 234 -- sys/contrib/zstd/examples/dictionary_compression.c | 97 - .../zstd/examples/dictionary_decompression.c | 99 - .../zstd/examples/multiple_simple_compression.c | 116 - .../zstd/examples/multiple_streaming_compression.c | 133 - sys/contrib/zstd/examples/simple_compression.c | 68 - sys/contrib/zstd/examples/simple_decompression.c | 65 - sys/contrib/zstd/examples/streaming_compression.c | 140 - .../examples/streaming_compression_thread_pool.c | 180 -- .../zstd/examples/streaming_decompression.c | 100 - sys/contrib/zstd/examples/streaming_memory_usage.c | 137 - sys/contrib/zstd/lib/BUCK | 232 -- sys/contrib/zstd/lib/Makefile | 357 -- sys/contrib/zstd/lib/README.md | 35 +- sys/contrib/zstd/lib/common/allocations.h | 55 + sys/contrib/zstd/lib/common/bits.h | 205 ++ sys/contrib/zstd/lib/common/bitstream.h | 192 +- sys/contrib/zstd/lib/common/compiler.h | 211 +- sys/contrib/zstd/lib/common/cpu.h | 38 +- sys/contrib/zstd/lib/common/debug.c | 8 +- sys/contrib/zstd/lib/common/debug.h | 42 +- sys/contrib/zstd/lib/common/entropy_common.c | 52 +- sys/contrib/zstd/lib/common/error_private.c | 12 +- sys/contrib/zstd/lib/common/error_private.h | 93 +- sys/contrib/zstd/lib/common/fse.h | 108 +- sys/contrib/zstd/lib/common/fse_decompress.c | 144 +- sys/contrib/zstd/lib/common/huf.h | 245 +- sys/contrib/zstd/lib/common/mem.h | 112 +- sys/contrib/zstd/lib/common/pool.c | 38 +- sys/contrib/zstd/lib/common/pool.h | 19 +- sys/contrib/zstd/lib/common/portability_macros.h | 56 +- sys/contrib/zstd/lib/common/threading.c | 88 +- sys/contrib/zstd/lib/common/threading.h | 23 +- sys/contrib/zstd/lib/common/xxhash.c | 16 +- sys/contrib/zstd/lib/common/xxhash.h | 3417 ++++++++++++++------ sys/contrib/zstd/lib/common/zstd_common.c | 37 +- sys/contrib/zstd/lib/common/zstd_deps.h | 14 +- sys/contrib/zstd/lib/common/zstd_internal.h | 195 +- sys/contrib/zstd/lib/common/zstd_trace.h | 19 +- sys/contrib/zstd/lib/compress/clevels.h | 2 +- sys/contrib/zstd/lib/compress/fse_compress.c | 146 +- sys/contrib/zstd/lib/compress/hist.c | 12 +- sys/contrib/zstd/lib/compress/hist.h | 9 +- sys/contrib/zstd/lib/compress/huf_compress.c | 472 +-- sys/contrib/zstd/lib/compress/zstd_compress.c | 3322 +++++++++++++------ .../zstd/lib/compress/zstd_compress_internal.h | 671 ++-- .../zstd/lib/compress/zstd_compress_literals.c | 156 +- .../zstd/lib/compress/zstd_compress_literals.h | 24 +- .../zstd/lib/compress/zstd_compress_sequences.c | 20 +- .../zstd/lib/compress/zstd_compress_sequences.h | 15 +- .../zstd/lib/compress/zstd_compress_superblock.c | 393 ++- .../zstd/lib/compress/zstd_compress_superblock.h | 2 +- sys/contrib/zstd/lib/compress/zstd_cwksp.h | 279 +- sys/contrib/zstd/lib/compress/zstd_double_fast.c | 244 +- sys/contrib/zstd/lib/compress/zstd_double_fast.h | 32 +- sys/contrib/zstd/lib/compress/zstd_fast.c | 704 ++-- sys/contrib/zstd/lib/compress/zstd_fast.h | 21 +- sys/contrib/zstd/lib/compress/zstd_lazy.c | 1063 +++--- sys/contrib/zstd/lib/compress/zstd_lazy.h | 198 +- sys/contrib/zstd/lib/compress/zstd_ldm.c | 101 +- sys/contrib/zstd/lib/compress/zstd_ldm.h | 22 +- sys/contrib/zstd/lib/compress/zstd_ldm_geartab.h | 2 +- sys/contrib/zstd/lib/compress/zstd_opt.c | 570 ++-- sys/contrib/zstd/lib/compress/zstd_opt.h | 58 +- sys/contrib/zstd/lib/compress/zstd_preSplit.c | 238 ++ sys/contrib/zstd/lib/compress/zstd_preSplit.h | 33 + sys/contrib/zstd/lib/compress/zstdmt_compress.c | 414 ++- sys/contrib/zstd/lib/compress/zstdmt_compress.h | 21 +- sys/contrib/zstd/lib/decompress/huf_decompress.c | 1031 +++--- .../zstd/lib/decompress/huf_decompress_amd64.S | 139 +- sys/contrib/zstd/lib/decompress/zstd_ddict.c | 8 +- sys/contrib/zstd/lib/decompress/zstd_ddict.h | 2 +- sys/contrib/zstd/lib/decompress/zstd_decompress.c | 410 ++- .../zstd/lib/decompress/zstd_decompress_block.c | 723 +++-- .../zstd/lib/decompress/zstd_decompress_block.h | 9 +- .../zstd/lib/decompress/zstd_decompress_internal.h | 18 +- sys/contrib/zstd/lib/deprecated/zbuff.h | 2 +- sys/contrib/zstd/lib/deprecated/zbuff_common.c | 2 +- sys/contrib/zstd/lib/deprecated/zbuff_compress.c | 2 +- sys/contrib/zstd/lib/deprecated/zbuff_decompress.c | 4 +- sys/contrib/zstd/lib/dictBuilder/cover.c | 141 +- sys/contrib/zstd/lib/dictBuilder/cover.h | 12 +- sys/contrib/zstd/lib/dictBuilder/divsufsort.h | 10 - sys/contrib/zstd/lib/dictBuilder/fastcover.c | 8 +- sys/contrib/zstd/lib/dictBuilder/zdict.c | 125 +- sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h | 6 + sys/contrib/zstd/lib/legacy/zstd_legacy.h | 39 +- sys/contrib/zstd/lib/legacy/zstd_v01.c | 69 +- sys/contrib/zstd/lib/legacy/zstd_v01.h | 2 +- sys/contrib/zstd/lib/legacy/zstd_v02.c | 107 +- sys/contrib/zstd/lib/legacy/zstd_v02.h | 2 +- sys/contrib/zstd/lib/legacy/zstd_v03.c | 111 +- sys/contrib/zstd/lib/legacy/zstd_v03.h | 2 +- sys/contrib/zstd/lib/legacy/zstd_v04.c | 99 +- sys/contrib/zstd/lib/legacy/zstd_v04.h | 2 +- sys/contrib/zstd/lib/legacy/zstd_v05.c | 107 +- sys/contrib/zstd/lib/legacy/zstd_v05.h | 2 +- sys/contrib/zstd/lib/legacy/zstd_v06.c | 132 +- sys/contrib/zstd/lib/legacy/zstd_v06.h | 2 +- sys/contrib/zstd/lib/legacy/zstd_v07.c | 117 +- sys/contrib/zstd/lib/legacy/zstd_v07.h | 2 +- sys/contrib/zstd/lib/libzstd.mk | 98 +- sys/contrib/zstd/lib/libzstd.pc.in | 10 +- sys/contrib/zstd/lib/module.modulemap | 16 +- sys/contrib/zstd/lib/zdict.h | 101 +- sys/contrib/zstd/lib/zstd.h | 1157 +++++-- sys/contrib/zstd/lib/zstd_errors.h | 44 +- sys/contrib/zstd/programs/BUCK | 44 - sys/contrib/zstd/programs/Makefile | 435 --- sys/contrib/zstd/programs/README.md | 191 +- sys/contrib/zstd/programs/benchfn.c | 12 +- sys/contrib/zstd/programs/benchfn.h | 14 +- sys/contrib/zstd/programs/benchzstd.c | 1287 +++++--- sys/contrib/zstd/programs/benchzstd.h | 80 +- sys/contrib/zstd/programs/datagen.c | 2 +- sys/contrib/zstd/programs/datagen.h | 10 +- sys/contrib/zstd/programs/dibio.c | 33 +- sys/contrib/zstd/programs/dibio.h | 2 +- sys/contrib/zstd/programs/fileio.c | 1887 ++++++----- sys/contrib/zstd/programs/fileio.h | 35 +- sys/contrib/zstd/programs/fileio_asyncio.c | 663 ++++ sys/contrib/zstd/programs/fileio_asyncio.h | 195 ++ sys/contrib/zstd/programs/fileio_common.h | 121 + sys/contrib/zstd/programs/fileio_types.h | 86 + sys/contrib/zstd/programs/lorem.c | 285 ++ sys/contrib/zstd/programs/lorem.h | 32 + sys/contrib/zstd/programs/platform.h | 46 +- sys/contrib/zstd/programs/timefn.c | 139 +- sys/contrib/zstd/programs/timefn.h | 70 +- sys/contrib/zstd/programs/util.c | 408 ++- sys/contrib/zstd/programs/util.h | 66 +- sys/contrib/zstd/programs/zstd.1 | 489 ++- sys/contrib/zstd/programs/zstd.1.md | 598 ++-- sys/contrib/zstd/programs/zstdcli.c | 648 ++-- sys/contrib/zstd/programs/zstdcli_trace.c | 2 +- sys/contrib/zstd/programs/zstdcli_trace.h | 2 +- sys/contrib/zstd/programs/zstdgrep.1 | 10 +- sys/contrib/zstd/programs/zstdgrep.1.md | 10 +- sys/contrib/zstd/programs/zstdless | 8 +- sys/contrib/zstd/programs/zstdless.1 | 6 +- sys/contrib/zstd/programs/zstdless.1.md | 6 +- sys/contrib/zstd/zlibWrapper/BUCK | 22 - sys/contrib/zstd/zlibWrapper/Makefile | 119 - sys/contrib/zstd/zlibWrapper/README.md | 4 +- sys/contrib/zstd/zlibWrapper/examples/example.c | 629 ---- .../zstd/zlibWrapper/examples/example_original.c | 618 ---- sys/contrib/zstd/zlibWrapper/examples/fitblk.c | 254 -- .../zstd/zlibWrapper/examples/fitblk_original.c | 233 -- sys/contrib/zstd/zlibWrapper/examples/minigzip.c | 640 ---- sys/contrib/zstd/zlibWrapper/examples/zwrapbench.c | 1016 ------ sys/contrib/zstd/zlibWrapper/gzclose.c | 6 +- sys/contrib/zstd/zlibWrapper/gzcompatibility.h | 16 +- sys/contrib/zstd/zlibWrapper/gzguts.h | 20 +- sys/contrib/zstd/zlibWrapper/gzlib.c | 99 +- sys/contrib/zstd/zlibWrapper/gzread.c | 95 +- sys/contrib/zstd/zlibWrapper/gzwrite.c | 89 +- sys/contrib/zstd/zlibWrapper/zstd_zlibwrapper.c | 90 +- sys/contrib/zstd/zlibWrapper/zstd_zlibwrapper.h | 15 +- usr.bin/zstd/Makefile | 2 + 191 files changed, 17754 insertions(+), 23515 deletions(-) diff --git a/lib/libzstd/Makefile b/lib/libzstd/Makefile index 4a1557a14517..82e9d2a5b243 100644 --- a/lib/libzstd/Makefile +++ b/lib/libzstd/Makefile @@ -15,6 +15,7 @@ SRCS= entropy_common.c \ zstd_compress_literals.c \ zstd_compress_sequences.c \ zstd_compress_superblock.c \ + zstd_preSplit.c \ zstdmt_compress.c \ huf_decompress.c \ zstd_ddict.c \ @@ -54,6 +55,9 @@ ZSTDDIR= ${SRCTOP}/sys/contrib/zstd .include +# These symbols are needed by dll-linked CLI zstd(1). +CFLAGS.pool.c+= -fvisibility=default + CFLAGS.huf_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} # https://github.com/facebook/zstd/commit/812e8f2a [zstd 1.4.1] diff --git a/sys/conf/files b/sys/conf/files index 9d6488a415cb..7f925bfc3f23 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -651,6 +651,7 @@ contrib/zstd/lib/compress/zstd_compress.c optional zstdio compile-with ${ZSTD_C} contrib/zstd/lib/compress/zstd_compress_literals.c optional zstdio compile-with ${ZSTD_C} contrib/zstd/lib/compress/zstd_compress_sequences.c optional zstdio compile-with ${ZSTD_C} contrib/zstd/lib/compress/zstd_compress_superblock.c optional zstdio compile-with "${ZSTD_C} ${NO_WUNUSED_BUT_SET_VARIABLE}" +contrib/zstd/lib/compress/zstd_preSplit.c optional zstdio compile-with ${ZSTD_C} contrib/zstd/lib/compress/fse_compress.c optional zstdio compile-with ${ZSTD_C} contrib/zstd/lib/compress/hist.c optional zstdio compile-with ${ZSTD_C} contrib/zstd/lib/compress/huf_compress.c optional zstdio compile-with ${ZSTD_C} diff --git a/sys/contrib/zstd/.buckconfig b/sys/contrib/zstd/.buckconfig deleted file mode 100644 index 483f6053b265..000000000000 --- a/sys/contrib/zstd/.buckconfig +++ /dev/null @@ -1,9 +0,0 @@ -[cxx] - cppflags = -DXXH_NAMESPACE=ZSTD_ -DZSTD_LEGACY_SUPPORT=4 - cflags = -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef -Wpointer-arith - cxxppflags = -DXXH_NAMESPACE=ZSTD_ -DZSTD_LEGACY_SUPPORT=4 - cxxflags = -std=c++11 -Wno-deprecated-declarations - gtest_dep = //contrib/pzstd:gtest - -[httpserver] - port = 0 diff --git a/sys/contrib/zstd/.buckversion b/sys/contrib/zstd/.buckversion deleted file mode 100644 index 892fad966fce..000000000000 --- a/sys/contrib/zstd/.buckversion +++ /dev/null @@ -1 +0,0 @@ -c8dec2e8da52d483f6dd7c6cd2ad694e8e6fed2b diff --git a/sys/contrib/zstd/CHANGELOG b/sys/contrib/zstd/CHANGELOG index 4e0045b950c9..92df0f462ee0 100644 --- a/sys/contrib/zstd/CHANGELOG +++ b/sys/contrib/zstd/CHANGELOG @@ -1,3 +1,145 @@ +V1.5.7 (Feb 2025) +fix: compression bug in 32-bit mode associated with long-lasting sessions +api: new method `ZSTD_compressSequencesAndLiterals()` (#4217, #4232) +api: `ZSTD_getFrameHeader()` works on skippable frames (#4228) +perf: substantial compression speed improvements (up to +30%) on small data, by @TocarIP (#4144) and @cyan4973 (#4165) +perf: improved compression speed (~+5%) for dictionary compression at low levels (#4170) +perf: much faster speed for `--patch-from` at high compression levels (#4276) +perf: higher `--patch-from` compression ratios, notably at high levels (#4288) +perf: better speed for binaries on Windows (@pps83) and when compiled with Visual Studio (@MessyHack) +perf: slight compression ratio improvement thanks to better block boundaries (#4136, #4176, #4178) +perf: slight compression ratio improvement for `dfast`, aka levels 3 and 4 (#4171) +perf: runtime bmi2 detection enabled on x86 32-bit mode (#4251) +cli: multi-threading as default CLI setting, by @daniellerozenblit +cli: new `--max` command (#4290) +build: improve `msbuild` version autodetection, support VS2022, by @ManuelBlanc +build: fix `meson` build by @artem and @Victor-C-Zhang, and on Windows by @bgilbert +build: compatibility with Apple Framework, by @Treata11 +build: improve icc/icx compatibility, by @josepho0918 and @luau-project +build: improve compatibility with Android NDK, by Adenilson Cavalcanti +portability: linux kernel branch, with improved support for Sequence producers (@embg, @gcabiddu, @cyan4973) +portability: improved qnx compatibility, suggested by @rainbowball +portability: improved install script for FreeBSD, by @sunpoet +portability: fixed test suite compatibility with gnu hurd, by @diegonc +doc: clarify specification, by @elasota +misc: improved tests/decodecorpus validation tool (#4102), by antmicro + +V1.5.6 (Mar 2024) +api: Promote `ZSTD_c_targetCBlockSize` to Stable API by @felixhandte +api: new `ZSTD_d_maxBlockSize` experimental parameter, to reduce streaming decompression memory, by @terrelln +perf: improve performance of param `ZSTD_c_targetCBlockSize`, by @Cyan4973 +perf: improved compression of arrays of integers at high compression, by @Cyan4973 +lib: reduce binary size with selective build-time exclusion, by @felixhandte +lib: improved huffman speed on small data and linux kernel, by @terrelln +lib: accept dictionaries with partial literal tables, by @terrelln +lib: fix CCtx size estimation with external sequence producer, by @embg +lib: fix corner case decoder behaviors, by @Cyan4973 and @aimuz +lib: fix zdict prototype mismatch in static_only mode, by @ldv-alt +lib: fix several bugs in magicless-format decoding, by @embg +cli: add common compressed file types to `--exclude-compressed`` by @daniellerozenblit +cli: fix mixing `-c` and `-o` commands with `--rm`, by @Cyan4973 +cli: fix erroneous exclusion of hidden files with `--output-dir-mirror` by @felixhandte +cli: improved time accuracy on BSD, by @felixhandte +cli: better errors on argument parsing, by @KapJI +tests: better compatibility with older versions of `grep`, by @Cyan4973 +tests: lorem ipsum generator as default backup content, by @Cyan4973 +build: cmake improvements by @terrelln, @sighingnow, @gjasny, @JohanMabille, @Saverio976, @gruenich, @teo-tsirpanis +build: bazel support, by @jondo2010 +build: fix cross-compiling for AArch64 with lld by @jcelerier +build: fix Apple platform compatibility, by @nidhijaju +build: fix Visual 2012 and lower compatibility, by @Cyan4973 +build: improve win32 support, by @DimitriPapadopoulos +build: better C90 compliance for zlibWrapper, by @emaste +port: make: fat binaries on macos, by @mredig +port: ARM64EC compatibility for Windows, by @dunhor +port: QNX support by @klausholstjacobsen +port: MSYS2 and Cygwin makefile installation and test support, by @QBos07 +port: risc-v support validation in CI, by @Cyan4973 +port: sparc64 support validation in CI, by @Cyan4973 +port: AIX compatibility, by @likema +port: HP-UX compatibility, by @likema +doc: Improved specification accuracy, by @elasota +bug: Fix and deprecate ZSTD_generateSequences (#3981) + +v1.5.5 (Apr 2023) +fix: fix rare corruption bug affecting the high compression mode, reported by @danlark1 (#3517, @terrelln) +perf: improve mid-level compression speed (#3529, #3533, #3543, @yoniko and #3552, @terrelln) +lib: deprecated bufferless block-level API (#3534) by @terrelln +cli: mmap large dictionaries to save memory, by @daniellerozenblit +cli: improve speed of --patch-from mode (~+50%) (#3545) by @daniellerozenblit +cli: improve i/o speed (~+10%) when processing lots of small files (#3479) by @felixhandte +cli: zstd no longer crashes when requested to write into write-protected directory (#3541) by @felixhandte +cli: fix decompression into block device using -o, reported by @georgmu (#3583) +build: fix zstd CLI compiled with lzma support but not zlib support (#3494) by @Hello71 +build: fix cmake does no longer require 3.18 as minimum version (#3510) by @kou +build: fix MSVC+ClangCL linking issue (#3569) by @tru +build: fix zstd-dll, version of zstd CLI that links to the dynamic library (#3496) by @yoniko +build: fix MSVC warnings (#3495) by @embg +doc: updated zstd specification to clarify corner cases, by @Cyan4973 +doc: document how to create fat binaries for macos (#3568) by @rickmark +misc: improve seekable format ingestion speed (~+100%) for very small chunk sizes (#3544) by @Cyan4973 +misc: tests/fullbench can benchmark multiple files (#3516) by @dloidolt + +v1.5.4 (Feb 2023) +perf: +20% faster huffman decompression for targets that can't compile x64 assembly (#3449, @terrelln) +perf: up to +10% faster streaming compression at levels 1-2 (#3114, @embg) +perf: +4-13% for levels 5-12 by optimizing function generation (#3295, @terrelln) +pref: +3-11% compression speed for `arm` target (#3199, #3164, #3145, #3141, #3138, @JunHe77 and #3139, #3160, @danlark1) +perf: +5-30% faster dictionary compression at levels 1-4 (#3086, #3114, #3152, @embg) +perf: +10-20% cold dict compression speed by prefetching CDict tables (#3177, @embg) +perf: +1% faster compression by removing a branch in ZSTD_fast_noDict (#3129, @felixhandte) +perf: Small compression ratio improvements in high compression mode (#2983, #3391, @Cyan4973 and #3285, #3302, @daniellerozenblit) +perf: small speed improvement by better detecting `STATIC_BMI2` for `clang` (#3080, @TocarIP) +perf: Improved streaming performance when `ZSTD_c_stableInBuffer` is set (#2974, @Cyan4973) +cli: Asynchronous I/O for improved cli speed (#2975, #2985, #3021, #3022, @yoniko) +cli: Change `zstdless` behavior to align with `zless` (#2909, @binhdvo) +cli: Keep original file if `-c` or `--stdout` is given (#3052, @dirkmueller) +cli: Keep original files when result is concatenated into a single output with `-o` (#3450, @Cyan4973) +cli: Preserve Permissions and Ownership of regular files (#3432, @felixhandte) +cli: Print zlib/lz4/lzma library versions with `-vv` (#3030, @terrelln) +cli: Print checksum value for single frame files with `-lv` (#3332, @Cyan4973) +cli: Print `dictID` when present with `-lv` (#3184, @htnhan) +cli: when `stderr` is *not* the console, disable status updates, but preserve final summary (#3458, @Cyan4973) +cli: support `--best` and `--no-name` in `gzip` compatibility mode (#3059, @dirkmueller) +cli: support for `posix` high resolution timer `clock_gettime()`, for improved benchmark accuracy (#3423, @Cyan4973) +cli: improved help/usage (`-h`, `-H`) formatting (#3094, @dirkmueller and #3385, @jonpalmisc) +cli: Fix better handling of bogus numeric values (#3268, @ctkhanhly) +cli: Fix input consists of multiple files _and_ `stdin` (#3222, @yoniko) +cli: Fix tiny files passthrough (#3215, @cgbur) +cli: Fix for `-r` on empty directory (#3027, @brailovich) +cli: Fix empty string as argument for `--output-dir-*` (#3220, @embg) +cli: Fix decompression memory usage reported by `-vv --long` (#3042, @u1f35c, and #3232, @zengyijing) +cli: Fix infinite loop when empty input is passed to trainer (#3081, @terrelln) +cli: Fix `--adapt` doesn't work when `--no-progress` is also set (#3354, @terrelln) +api: Support for Block-Level Sequence Producer (#3333, @embg) +api: Support for in-place decompression (#3432, @terrelln) +api: New `ZSTD_CCtx_setCParams()` function, set all parameters defined in a `ZSTD_compressionParameters` structure (#3403, @Cyan4973) +api: Streaming decompression detects incorrect header ID sooner (#3175, @Cyan4973) +api: Window size resizing optimization for edge case (#3345, @daniellerozenblit) +api: More accurate error codes for busy-loop scenarios (#3413, #3455, @Cyan4973) +api: Fix limit overflow in `compressBound` and `decompressBound` (#3362, #3373, Cyan4973) reported by @nigeltao +api: Deprecate several advanced experimental functions: streaming (#3408, @embg), copy (#3196, @mileshu) +bug: Fix corruption that rarely occurs in 32-bit mode with wlog=25 (#3361, @terrelln) +bug: Fix for block-splitter (#3033, @Cyan4973) +bug: Fixes for Sequence Compression API (#3023, #3040, @Cyan4973) +bug: Fix leaking thread handles on Windows (#3147, @animalize) +bug: Fix timing issues with cmake/meson builds (#3166, #3167, #3170, @Cyan4973) +build: Allow user to select legacy level for cmake (#3050, @shadchin) +build: Enable legacy support by default in cmake (#3079, @niamster) +build: Meson build script improvements (#3039, #3120, #3122, #3327, #3357, @eli-schwartz and #3276, @neheb) +build: Add aarch64 to supported architectures for zstd_trace (#3054, @ooosssososos) +build: support AIX architecture (#3219, @qiongsiwu) +build: Fix `ZSTD_LIB_MINIFY` build macro, which now reduces static library size by half (#3366, @terrelln) +build: Fix Windows issues with Multithreading translation layer (#3364, #3380, @yoniko) and ARM64 target (#3320, @cwoffenden) +build: Fix `cmake` script (#3382, #3392, @terrelln and #3252 @Tachi107 and #3167 @Cyan4973) +doc: Updated man page, providing more details for `--train` mode (#3112, @Cyan4973) +doc: Add decompressor errata document (#3092, @terrelln) +misc: Enable Intel CET (#2992, #2994, @hjl-tools) +misc: Fix `contrib/` seekable format (#3058, @yhoogstrate and #3346, @daniellerozenblit) +misc: Improve speed of the one-file library generator (#3241, @wahern and #3005, @cwoffenden) + +v1.5.3 (dev version, unpublished) + v1.5.2 (Jan, 2022) perf: Regain Minimal memset()-ing During Reuse of Compression Contexts (@Cyan4973, #2969) build: Build Zstd with `noexecstack` on All Architectures (@felixhandte, #2964) @@ -19,7 +161,7 @@ build: support for m68k (Motorola 68000's), by @cyan4973 build: improved AIX support, by @Helflym build: improved meson unofficial build, by @eli-schwartz cli : custom memory limit when training dictionary (#2925), by @embg -cli : report advanced parameters information when compressing in very verbose mode (``-vv`), by @Svetlitski-FB +cli : report advanced parameters information when compressing in very verbose mode (`-vv`), by @Svetlitski-FB v1.5.0 (May 11, 2021) api: Various functions promoted from experimental to stable API: (#2579-2581, @senhuang42) @@ -86,7 +228,7 @@ api: Add Function to Generate Skippable Frame (#2439, @senhuang42) perf: New Algorithms for the Long Distance Matcher (#2483, @mpu) perf: Performance Improvements for Long Distance Matcher (#2464, @mpu) perf: Don't Shrink Window Log when Streaming with a Dictionary (#2451, @terrelln) -cli: Fix `--output-dir-mirror`'s Rejection of `..`-Containing Paths (#2512, @felixhandte) +cli: Fix `--output-dir-mirror` rejection of `..` -containing paths (#2512, @felixhandte) cli: Allow Input From Console When `-f`/`--force` is Passed (#2466, @felixhandte) cli: Improve Help Message (#2500, @senhuang42) tests: Remove Flaky Tests (#2455, #2486, #2445, @Cyan4973) @@ -373,7 +515,7 @@ misc: added /contrib/docker script by @gyscos v1.3.3 (Dec 21, 2017) perf: faster zstd_opt strategy (levels 16-19) -fix : bug #944 : multithreading with shared ditionary and large data, reported by @gsliepen +fix : bug #944 : multithreading with shared dictionary and large data, reported by @gsliepen cli : fix : content size written in header by default cli : fix : improved LZ4 format support, by @felixhandte cli : new : hidden command `-S`, to benchmark multiple files while generating one result per file diff --git a/sys/contrib/zstd/CONTRIBUTING.md b/sys/contrib/zstd/CONTRIBUTING.md deleted file mode 100644 index e7e545129e51..000000000000 --- a/sys/contrib/zstd/CONTRIBUTING.md +++ /dev/null @@ -1,489 +0,0 @@ -# Contributing to Zstandard -We want to make contributing to this project as easy and transparent as -possible. - -## Our Development Process -New versions are being developed in the "dev" branch, -or in their own feature branch. -When they are deemed ready for a release, they are merged into "release". - -As a consequences, all contributions must stage first through "dev" -or their own feature branch. - -## Pull Requests -We actively welcome your pull requests. - -1. Fork the repo and create your branch from `dev`. -2. If you've added code that should be tested, add tests. -3. If you've changed APIs, update the documentation. -4. Ensure the test suite passes. -5. Make sure your code lints. -6. If you haven't already, complete the Contributor License Agreement ("CLA"). - -## Contributor License Agreement ("CLA") -In order to accept your pull request, we need you to submit a CLA. You only need -to do this once to work on any of Facebook's open source projects. - -Complete your CLA here: - -## Workflow -Zstd uses a branch-based workflow for making changes to the codebase. Typically, zstd -will use a new branch per sizable topic. For smaller changes, it is okay to lump multiple -related changes into a branch. - -Our contribution process works in three main stages: -1. Local development - * Update: - * Checkout your fork of zstd if you have not already - ``` - git checkout https://github.com//zstd - cd zstd - ``` - * Update your local dev branch - ``` - git pull https://github.com/facebook/zstd dev - git push origin dev - ``` - * Topic and development: - * Make a new branch on your fork about the topic you're developing for - ``` - # branch names should be concise but sufficiently informative - git checkout -b - git push origin - ``` - * Make commits and push - ``` - # make some changes = - git add -u && git commit -m - git push origin - ``` - * Note: run local tests to ensure that your changes didn't break existing functionality - * Quick check - ``` - make shortest - ``` - * Longer check - ``` - make test - ``` -2. Code Review and CI tests - * Ensure CI tests pass: - * Before sharing anything to the community, create a pull request in your own fork against the dev branch - and make sure that all GitHub Actions CI tests pass. See the Continuous Integration section below for more information. - * Ensure that static analysis passes on your development machine. See the Static Analysis section - below to see how to do this. - * Create a pull request: - * When you are ready to share you changes to the community, create a pull request from your branch - to facebook:dev. You can do this very easily by clicking 'Create Pull Request' on your fork's home - page. - * From there, select the branch where you made changes as your source branch and facebook:dev - as the destination. - * Examine the diff presented between the two branches to make sure there is nothing unexpected. - * Write a good pull request description: - * While there is no strict template that our contributors follow, we would like them to - sufficiently summarize and motivate the changes they are proposing. We recommend all pull requests, - at least indirectly, address the following points. - * Is this pull request important and why? - * Is it addressing an issue? If so, what issue? (provide links for convenience please) - * Is this a new feature? If so, why is it useful and/or necessary? - * Are there background references and documents that reviewers should be aware of to properly assess this change? - * Note: make sure to point out any design and architectural decisions that you made and the rationale behind them. - * Note: if you have been working with a specific user and would like them to review your work, make sure you mention them using (@) - * Submit the pull request and iterate with feedback. -3. Merge and Release - * Getting approval: - * You will have to iterate on your changes with feedback from other collaborators to reach a point - where your pull request can be safely merged. - * To avoid too many comments on style and convention, make sure that you have a - look at our style section below before creating a pull request. - * Eventually, someone from the zstd team will approve your pull request and not long after merge it into - the dev branch. - * Housekeeping: - * Most PRs are linked with one or more Github issues. If this is the case for your PR, make sure - the corresponding issue is mentioned. If your change 'fixes' or completely addresses the - issue at hand, then please indicate this by requesting that an issue be closed by commenting. - * Just because your changes have been merged does not mean the topic or larger issue is complete. Remember - that the change must make it to an official zstd release for it to be meaningful. We recommend - that contributors track the activity on their pull request and corresponding issue(s) page(s) until - their change makes it to the next release of zstd. Users will often discover bugs in your code or - suggest ways to refine and improve your initial changes even after the pull request is merged. - -## Static Analysis -Static analysis is a process for examining the correctness or validity of a program without actually -executing it. It usually helps us find many simple bugs. Zstd uses clang's `scan-build` tool for -static analysis. You can install it by following the instructions for your OS on https://clang-analyzer.llvm.org/scan-build. - -Once installed, you can ensure that our static analysis tests pass on your local development machine -by running: -``` -make staticAnalyze -``` - -In general, you can use `scan-build` to static analyze any build script. For example, to static analyze -just `contrib/largeNbDicts` and nothing else, you can run: - -``` -scan-build make -C contrib/largeNbDicts largeNbDicts -``` - -### Pitfalls of static analysis -`scan-build` is part of our regular CI suite. Other static analyzers are not. - -It can be useful to look at additional static analyzers once in a while (and we do), but it's not a good idea to multiply the nb of analyzers run continuously at each commit and PR. The reasons are : - -- Static analyzers are full of false positive. The signal to noise ratio is actually pretty low. -- A good CI policy is "zero-warning tolerance". That means that all issues must be solved, including false positives. This quickly becomes a tedious workload. -- Multiple static analyzers will feature multiple kind of false positives, sometimes applying to the same code but in different ways leading to : - + torteous code, trying to please multiple constraints, hurting readability and therefore maintenance. Sometimes, such complexity introduce other more subtle bugs, that are just out of scope of the analyzers. - + sometimes, these constraints are mutually exclusive : if one try to solve one, the other static analyzer will complain, they can't be both happy at the same time. -- As if that was not enough, the list of false positives change with each version. It's hard enough to follow one static analyzer, but multiple ones with their own update agenda, this quickly becomes a massive velocity reducer. - -This is different from running a static analyzer once in a while, looking at the output, and __cherry picking__ a few warnings that seem helpful, either because they detected a genuine risk of bug, or because it helps expressing the code in a way which is more readable or more difficult to misuse. These kind of reports can be useful, and are accepted. - -## Continuous Integration -CI tests run every time a pull request (PR) is created or updated. The exact tests -that get run will depend on the destination branch you specify. Some tests take -longer to run than others. Currently, our CI is set up to run a short -series of tests when creating a PR to the dev branch and a longer series of tests -when creating a PR to the release branch. You can look in the configuration files -of the respective CI platform for more information on what gets run when. - -Most people will just want to create a PR with the destination set to their local dev -branch of zstd. You can then find the status of the tests on the PR's page. You can also -re-run tests and cancel running tests from the PR page or from the respective CI's dashboard. - -Almost all of zstd's CI runs on GitHub Actions (configured at `.github/workflows`), which will automatically run on PRs to your -own fork. A small number of tests run on other services (e.g. Travis CI, Circle CI, Appveyor). -These require work to set up on your local fork, and (at least for Travis CI) cost money. -Therefore, if the PR on your local fork passes GitHub Actions, feel free to submit a PR -against the main repo. - -### Third-party CI -A small number of tests cannot run on GitHub Actions, or have yet to be migrated. -For these, we use a variety of third-party services (listed below). It is not necessary to set -these up on your fork in order to contribute to zstd; however, we do link to instructions for those -who want earlier signal. - -| Service | Purpose | Setup Links | Config Path | -|-----------|------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------| -| Travis CI | Used for testing on non-x86 architectures such as PowerPC | https://docs.travis-ci.com/user/tutorial/#to-get-started-with-travis-ci-using-github
    https://github.com/marketplace/travis-ci | `.travis.yml` | -| AppVeyor | Used for some Windows testing (e.g. cygwin, mingw) | https://www.appveyor.com/blog/2018/10/02/github-apps-integration/
    https://github.com/marketplace/appveyor | `appveyor.yml` | -| Cirrus CI | Used for testing on FreeBSD | https://github.com/marketplace/cirrus-ci/ | `.cirrus.yml` | -| Circle CI | Historically was used to provide faster signal,
    but we may be able to migrate these to Github Actions | https://circleci.com/docs/2.0/getting-started/#setting-up-circleci
    https://youtu.be/Js3hMUsSZ2c
    https://circleci.com/docs/2.0/enable-checks/ | `.circleci/config.yml` | - -Note: the instructions linked above mostly cover how to set up a repository with CI from scratch. -The general idea should be the same for setting up CI on your fork of zstd, but you may have to -follow slightly different steps. In particular, please ignore any instructions related to setting up -config files (since zstd already has configs for each of these services). - -## Performance -Performance is extremely important for zstd and we only merge pull requests whose performance -landscape and corresponding trade-offs have been adequately analyzed, reproduced, and presented. -This high bar for performance means that every PR which has the potential to -impact performance takes a very long time for us to properly review. That being said, we -always welcome contributions to improve performance (or worsen performance for the trade-off of -something else). Please keep the following in mind before submitting a performance related PR: - -1. Zstd isn't as old as gzip but it has been around for time now and its evolution is -very well documented via past Github issues and pull requests. It may be the case that your -particular performance optimization has already been considered in the past. Please take some -time to search through old issues and pull requests using keywords specific to your -would-be PR. Of course, just because a topic has already been discussed (and perhaps rejected -on some grounds) in the past, doesn't mean it isn't worth bringing up again. But even in that case, -it will be helpful for you to have context from that topic's history before contributing. -2. The distinction between noise and actual performance gains can unfortunately be very subtle -especially when microbenchmarking extremely small wins or losses. The only remedy to getting -something subtle merged is extensive benchmarking. You will be doing us a great favor if you -take the time to run extensive, long-duration, and potentially cross-(os, platform, process, etc) -benchmarks on your end before submitting a PR. Of course, you will not be able to benchmark -your changes on every single processor and os out there (and neither will we) but do that best -you can:) We've adding some things to think about when benchmarking below in the Benchmarking -Performance section which might be helpful for you. -3. Optimizing performance for a certain OS, processor vendor, compiler, or network system is a perfectly -legitimate thing to do as long as it does not harm the overall performance health of Zstd. -This is a hard balance to strike but please keep in mind other aspects of Zstd when -submitting changes that are clang-specific, windows-specific, etc. - -## Benchmarking Performance -Performance microbenchmarking is a tricky subject but also essential for Zstd. We value empirical -testing over theoretical speculation. This guide it not perfect but for most scenarios, it -is a good place to start. - -### Stability -Unfortunately, the most important aspect in being able to benchmark reliably is to have a stable -benchmarking machine. A virtual machine, a machine with shared resources, or your laptop -will typically not be stable enough to obtain reliable benchmark results. If you can get your -hands on a desktop, this is usually a better scenario. - -Of course, benchmarking can be done on non-hyper-stable machines as well. You will just have to -do a little more work to ensure that you are in fact measuring the changes you've made not and -noise. Here are some things you can do to make your benchmarks more stable: - -1. The most simple thing you can do to drastically improve the stability of your benchmark is -to run it multiple times and then aggregate the results of those runs. As a general rule of -thumb, the smaller the change you are trying to measure, the more samples of benchmark runs -you will have to aggregate over to get reliable results. Here are some additional things to keep in -mind when running multiple trials: - * How you aggregate your samples are important. You might be tempted to use the mean of your - results. While this is certainly going to be a more stable number than a raw single sample - benchmark number, you might have more luck by taking the median. The mean is not robust to - outliers whereas the median is. Better still, you could simply take the fastest speed your - benchmark achieved on each run since that is likely the fastest your process will be - capable of running your code. In our experience, this (aggregating by just taking the sample - with the fastest running time) has been the most stable approach. - * The more samples you have, the more stable your benchmarks should be. You can verify - your improved stability by looking at the size of your confidence intervals as you - increase your sample count. These should get smaller and smaller. Eventually hopefully - smaller than the performance win you are expecting. - * Most processors will take some time to get `hot` when running anything. The observations - you collect during that time period will very different from the true performance number. Having - a very large number of sample will help alleviate this problem slightly but you can also - address is directly by simply not including the first `n` iterations of your benchmark in - your aggregations. You can determine `n` by simply looking at the results from each iteration - and then hand picking a good threshold after which the variance in results seems to stabilize. -2. You cannot really get reliable benchmarks if your host machine is simultaneously running -another cpu/memory-intensive application in the background. If you are running benchmarks on your -personal laptop for instance, you should close all applications (including your code editor and -browser) before running your benchmarks. You might also have invisible background applications -running. You can see what these are by looking at either Activity Monitor on Mac or Task Manager -on Windows. You will get more stable benchmark results of you end those processes as well. - * If you have multiple cores, you can even run your benchmark on a reserved core to prevent - pollution from other OS and user processes. There are a number of ways to do this depending - on your OS: - * On linux boxes, you have use https://github.com/lpechacek/cpuset. - * On Windows, you can "Set Processor Affinity" using https://www.thewindowsclub.com/processor-affinity-windows - * On Mac, you can try to use their dedicated affinity API https://developer.apple.com/library/archive/releasenotes/Performance/RN-AffinityAPI/#//apple_ref/doc/uid/TP40006635-CH1-DontLinkElementID_2 -3. To benchmark, you will likely end up writing a separate c/c++ program that will link libzstd. -Dynamically linking your library will introduce some added variation (not a large amount but -definitely some). Statically linking libzstd will be more stable. Static libraries should -be enabled by default when building zstd. -4. Use a profiler with a good high resolution timer. See the section below on profiling for -details on this. -5. Disable frequency scaling, turbo boost and address space randomization (this will vary by OS) -6. Try to avoid storage. On some systems you can use tmpfs. Putting the program, inputs and outputs on -tmpfs avoids touching a real storage system, which can have a pretty big variability. - -Also check our LLVM's guide on benchmarking here: https://llvm.org/docs/Benchmarking.html - -### Zstd benchmark -The fastest signal you can get regarding your performance changes is via the in-build zstd cli -bench option. You can run Zstd as you typically would for your scenario using some set of options -and then additionally also specify the `-b#` option. Doing this will run our benchmarking pipeline -for that options you have just provided. If you want to look at the internals of how this -benchmarking script works, you can check out programs/benchzstd.c - -For example: say you have made a change that you believe improves the speed of zstd level 1. The -very first thing you should use to asses whether you actually achieved any sort of improvement -is `zstd -b`. You might try to do something like this. Note: you can use the `-i` option to -specify a running time for your benchmark in seconds (default is 3 seconds). -Usually, the longer the running time, the more stable your results will be. - -``` -$ git checkout -$ make && cp zstd zstd-old -$ git checkout -$ make && cp zstd zstd-new -$ zstd-old -i5 -b1 - 1 : 8990 -> 3992 (2.252), 302.6 MB/s , 626.4 MB/s -$ zstd-new -i5 -b1 - 1 : 8990 -> 3992 (2.252), 302.8 MB/s , 628.4 MB/s -``` - -Unless your performance win is large enough to be visible despite the intrinsic noise -on your computer, benchzstd alone will likely not be enough to validate the impact of your -changes. For example, the results of the example above indicate that effectively nothing -changed but there could be a small <3% improvement that the noise on the host machine -obscured. So unless you see a large performance win (10-15% consistently) using just -this method of evaluation will not be sufficient. - -### Profiling -There are a number of great profilers out there. We're going to briefly mention how you can -profile your code using `instruments` on mac, `perf` on linux and `visual studio profiler` -on windows. - -Say you have an idea for a change that you think will provide some good performance gains -for level 1 compression on Zstd. Typically this means, you have identified a section of -code that you think can be made to run faster. - -The first thing you will want to do is make sure that the piece of code is actually taking up -a notable amount of time to run. It is usually not worth optimizing something which accounts for less than -0.0001% of the total running time. Luckily, there are tools to help with this. -Profilers will let you see how much time your code spends inside a particular function. -If your target code snippet is only part of a function, it might be worth trying to -isolate that snippet by moving it to its own function (this is usually not necessary but -might be). - -Most profilers (including the profilers discussed below) will generate a call graph of -functions for you. Your goal will be to find your function of interest in this call graph -and then inspect the time spent inside of it. You might also want to to look at the -annotated assembly which most profilers will provide you with. - -#### Instruments -We will once again consider the scenario where you think you've identified a piece of code -whose performance can be improved upon. Follow these steps to profile your code using -Instruments. - -1. Open Instruments -2. Select `Time Profiler` from the list of standard templates -3. Close all other applications except for your instruments window and your terminal -4. Run your benchmarking script from your terminal window - * You will want a benchmark that runs for at least a few seconds (5 seconds will - usually be long enough). This way the profiler will have something to work with - and you will have ample time to attach your profiler to this process:) - * I will just use benchzstd as my bencharmking script for this example: -``` -$ zstd -b1 -i5 # this will run for 5 seconds -``` -5. Once you run your benchmarking script, switch back over to instruments and attach your -process to the time profiler. You can do this by: - * Clicking on the `All Processes` drop down in the top left of the toolbar. - * Selecting your process from the dropdown. In my case, it is just going to be labeled - `zstd` - * Hitting the bright red record circle button on the top left of the toolbar -6. You profiler will now start collecting metrics from your benchmarking script. Once -you think you have collected enough samples (usually this is the case after 3 seconds of -recording), stop your profiler. -7. Make sure that in toolbar of the bottom window, `profile` is selected. -8. You should be able to see your call graph. - * If you don't see the call graph or an incomplete call graph, make sure you have compiled - zstd and your benchmarking script using debug flags. On mac and linux, this just means - you will have to supply the `-g` flag alone with your build script. You might also - have to provide the `-fno-omit-frame-pointer` flag -9. Dig down the graph to find your function call and then inspect it by double clicking -the list item. You will be able to see the annotated source code and the assembly side by -side. - -#### Perf - -This wiki has a pretty detailed tutorial on getting started working with perf so we'll -leave you to check that out of you're getting started: - -https://perf.wiki.kernel.org/index.php/Tutorial - -Some general notes on perf: -* Use `perf stat -r # ` to quickly get some relevant timing and -counter statistics. Perf uses a high resolution timer and this is likely one -of the first things your team will run when assessing your PR. -* Perf has a long list of hardware counters that can be viewed with `perf --list`. -When measuring optimizations, something worth trying is to make sure the hardware -counters you expect to be impacted by your change are in fact being so. For example, -if you expect the L1 cache misses to decrease with your change, you can look at the -counter `L1-dcache-load-misses` -* Perf hardware counters will not work on a virtual machine. - -#### Visual Studio - -TODO - -## Issues -We use GitHub issues to track public bugs. Please ensure your description is -clear and has sufficient instructions to be able to reproduce the issue. - -Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe -disclosure of security bugs. In those cases, please go through the process -outlined on that page and do not file a public issue. - -## Coding Style -It's a pretty long topic, which is difficult to summarize in a single paragraph. -As a rule of thumbs, try to imitate the coding style of -similar lines of codes around your contribution. -The following is a non-exhaustive list of rules employed in zstd code base: - -### C90 -This code base is following strict C90 standard, -with 2 extensions : 64-bit `long long` types, and variadic macros. -This rule is applied strictly to code within `lib/` and `programs/`. -Sub-project in `contrib/` are allowed to use other conventions. - -### C++ direct compatibility : symbol mangling -All public symbol declarations must be wrapped in `extern “C” { … }`, -so that this project can be compiled as C++98 code, -and linked into C++ applications. - -### Minimal Frugal -This design requirement is fundamental to preserve the portability of the code base. -#### Dependencies -- Reduce dependencies to the minimum possible level. - Any dependency should be considered “bad” by default, - and only tolerated because it provides a service in a better way than can be achieved locally. - The only external dependencies this repository tolerates are - standard C libraries, and in rare cases, system level headers. -- Within `lib/`, this policy is even more drastic. - The only external dependencies allowed are ``, ``, ``, - and even then, not directly. - In particular, no function shall ever allocate on heap directly, - and must use instead `ZSTD_malloc()` and equivalent. - Other accepted non-symbol headers are `` and ``. -- Within the project, there is a strict hierarchy of dependencies that must be respected. - `programs/` is allowed to depend on `lib/`, but only its public API. - Within `lib/`, `lib/common` doesn't depend on any other directory. - `lib/compress` and `lib/decompress` shall not depend on each other. - `lib/dictBuilder` can depend on `lib/common` and `lib/compress`, but not `lib/decompress`. -#### Resources -- Functions in `lib/` must use very little stack space, - several dozens of bytes max. - Everything larger must use the heap allocator, - or require a scratch buffer to be emplaced manually. - -### Naming -* All public symbols are prefixed with `ZSTD_` - + private symbols, with a scope limited to their own unit, are free of this restriction. - However, since `libzstd` source code can be amalgamated, - each symbol name must attempt to be (and remain) unique. - Avoid too generic names that could become ground for future collisions. - This generally implies usage of some form of prefix. -* For symbols (functions and variables), naming convention is `PREFIX_camelCase`. - + In some advanced cases, one can also find : - - `PREFIX_prefix2_camelCase` - - `PREFIX_camelCase_extendedQualifier` -* Multi-words names generally consist of an action followed by object: - - for example : `ZSTD_createCCtx()` -* Prefer positive actions - - `goBackward` rather than `notGoForward` -* Type names (`struct`, etc.) follow similar convention, - except that they are allowed and even invited to start by an Uppercase letter. - Example : `ZSTD_CCtx`, `ZSTD_CDict` -* Macro names are all Capital letters. - The same composition rules (`PREFIX_NAME_QUALIFIER`) apply. -* File names are all lowercase letters. - The convention is `snake_case`. - File names **must** be unique across the entire code base, - even when they stand in clearly separated directories. - -### Qualifiers -* This code base is `const` friendly, if not `const` fanatical. - Any variable that can be `const` (aka. read-only) **must** be `const`. - Any pointer which content will not be modified must be `const`. - This property is then controlled at compiler level. - `const` variables are an important signal to readers that this variable isn’t modified. - Conversely, non-const variables are a signal to readers to watch out for modifications later on in the function. -* If a function must be inlined, mention it explicitly, - using project's own portable macros, such as `FORCE_INLINE_ATTR`, - defined in `lib/common/compiler.h`. - -### Debugging -* **Assertions** are welcome, and should be used very liberally, - to control any condition the code expects for its correct execution. - These assertion checks will be run in debug builds, and disabled in production. -* For traces, this project provides its own debug macros, - in particular `DEBUGLOG(level, ...)`, defined in `lib/common/debug.h`. - -### Code documentation -* Avoid code documentation that merely repeats what the code is already stating. - Whenever applicable, prefer employing the code as the primary way to convey explanations. - Example 1 : `int nbTokens = n;` instead of `int i = n; /* i is a nb of tokens *./`. - Example 2 : `assert(size > 0);` instead of `/* here, size should be positive */`. -* At declaration level, the documentation explains how to use the function or variable - and when applicable why it's needed, of the scenarios where it can be useful. -* At implementation level, the documentation explains the general outline of the algorithm employed, - and when applicable why this specific choice was preferred. - -### General layout -* 4 spaces for indentation rather than tabs -* Code documentation shall directly precede function declaration or implementation -* Function implementations and its code documentation should be preceded and followed by an empty line - - -## License -By contributing to Zstandard, you agree that your contributions will be licensed -under both the [LICENSE](LICENSE) file and the [COPYING](COPYING) file in the root directory of this source tree. diff --git a/sys/contrib/zstd/FREEBSD-Xlist b/sys/contrib/zstd/FREEBSD-Xlist index f39005add49f..7d87acac5f4a 100644 --- a/sys/contrib/zstd/FREEBSD-Xlist +++ b/sys/contrib/zstd/FREEBSD-Xlist @@ -1,10 +1,19 @@ -.circleci +*/BUCK +.buckconfig +.buckversion .cirrus.yml .github .gitignore .travis.yml +CODE_OF_CONDUCT.md +CONTRIBUTING.md +Makefile +Package.swift +TESTING.md build contrib +doc +examples lib/dll programs/windres tests diff --git a/sys/contrib/zstd/LICENSE b/sys/contrib/zstd/LICENSE index a793a8028925..75800288cc24 100644 --- a/sys/contrib/zstd/LICENSE +++ b/sys/contrib/zstd/LICENSE @@ -2,7 +2,7 @@ BSD License For Zstandard software -Copyright (c) 2016-present, Facebook, Inc. All rights reserved. +Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -14,9 +14,9 @@ are permitted provided that the following conditions are met: this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name Facebook nor the names of its contributors may be used to - endorse or promote products derived from this software without specific *** 60805 LINES SKIPPED *** From nobody Thu May 7 17:25:14 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBJzb12CHz6ctRf for ; Thu, 07 May 2026 17:25: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 4gBJzZ4RBMz3l6Z for ; Thu, 07 May 2026 17:25:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174714; 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=9bcf27d9F6F7+nWaqt1/4X4KOh6KZc2irBwqB84RVzs=; b=CuskXGFAVNRkw4zT+kvXHrOQXV+aBgwIl8orNO9f0LLZX5CA3Mhw0iHxjBxIbA6lGa3Ko6 MkUA7eaBMtFnVCFA+p4pPsbKY6CU2lMcgcW3xmM3YCk03lU21rUSzC2FoLHJyvk97UvzLe 1vFMOxcr8bmDX6BYS+vx0/oUbr1AAVeVmrhBwp5vxVqgGXCJcBIBTccJXkS5SQWshamWf9 8dk2hvLPNEKnSWjF8ce5nLJ3pP6TcAhoOa71j21iiXpYlUHBDs/O1WJk4ZZgy81vF7pghl /VvKoFehPWuPToDRBCiPBBMClofSVKP2dE7cQdzsiqdQfI4+YgiORQHwXSzJAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778174714; a=rsa-sha256; cv=none; b=w1YkeM/gZqa7lOrRtL06O6WRYpROwlZoGtHCTQL4miWepweujTe8sA9MYickhtiiXyH+eX 7b6g8FoGwn27nu6hPHM/0PokIDJ7aiiZpuCzQnX/7YMXA1efcSt8CaJAkLZvW7Oskxp3TU 6ViBW/6qCpvE0EU9GTyBkkB2bavHprQYdFS4QpTNlXXQ4xaQwwjwgeJg3YBHbWrwUMr16u BUz6I28J/QT2xdvnpPu/PSjeWWEQxQhJQbyQuUDQazhwR45ahwKi0vkE5Sn5FEjpsHpz+C uehS7aXQXxFMM6isDBEw1Vz81Dt0kovDAwEIWtEBIHWccK9lXmAbcLef6nOguw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174714; 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=9bcf27d9F6F7+nWaqt1/4X4KOh6KZc2irBwqB84RVzs=; b=QImSRSCbNw2IaP2S6vtc21qumvR/rY/PFVZe9WzveMVGjACWdBAn/qJUCn9mtX9p78szjt tpqUPgWwAwUkRk/HHC+7jvRekKvtApGjjjb3C3jVlywz97RZpCe58KAYVyo4oYaLcnKY1V L5wdrJOR9QQy9TI5KrQRxAhCpmnK7HN0mnioGu8sm6+t7CkguWFIXbDkXlgLqXWQYgpsSh gwX0jJhrbhXNnAseCp4ThNvTlz0eglwPm+n/cp8GS6waSasSDdj/5AF/XXZOMwCnskO9ZU Ft8KdYLTNtpT/YxMt9xWLMMcnZ1S3niXatrrfvwzdEwESltOGETXUN2CqopZEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBJzZ3pvqzcF7 for ; Thu, 07 May 2026 17:25:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d008 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 17:25:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron From: Colin Percival Subject: git: 123476ad8464 - releng/15.1 - linuxkpi: Implement `module_*()` APIs as static functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 123476ad84646c6b25f345840f753202312de464 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 17:25:14 +0000 Message-Id: <69fccafa.3d008.41539f74@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=123476ad84646c6b25f345840f753202312de464 commit 123476ad84646c6b25f345840f753202312de464 Author: Jean-Sébastien Pédron AuthorDate: 2026-05-07 11:16:09 +0000 Commit: Colin Percival CommitDate: 2026-05-07 17:24:52 +0000 linuxkpi: Implement `module_*()` APIs as static functions This fixes an "unused variable" warning when building DRM drivers. Approved by: re (cperciva) Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56780 (cherry picked from commit 658bb99db9c7872f92ccb86ed2674c72636436d2) (cherry picked from commit c81f516512111fa5ac8d5a9f3f7e64c2fb5ab5a3) --- sys/compat/linuxkpi/common/include/linux/module.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/module.h b/sys/compat/linuxkpi/common/include/linux/module.h index fbe57cbbed82..de4be1e9ebe9 100644 --- a/sys/compat/linuxkpi/common/include/linux/module.h +++ b/sys/compat/linuxkpi/common/include/linux/module.h @@ -136,9 +136,14 @@ _module_run(void *arg) #define module_exit_order(fn, order) \ SYSUNINIT(fn, SI_SUB_OFED_MODINIT, (order), _module_run, (fn)) -#define module_get(module) -#define module_put(module) -#define try_module_get(module) 1 +static inline void module_get(struct module *module) {} +static inline void module_put(struct module *module) {} + +static inline bool +try_module_get(struct module *module) +{ + return (true); +} #define postcore_initcall(fn) module_init(fn) From nobody Thu May 7 17:26:29 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBK12063rz6ctcj for ; Thu, 07 May 2026 17:26: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 4gBK114Fg7z3mVc for ; Thu, 07 May 2026 17:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174789; 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=xoBWzbVgimd3n8Xed2JlYD+7IjpfuhhPhiUy8ZuPhkI=; b=cAOIJOd/rMe8dy5BD7XC3mxwo5rO0ufFLBFEkzBU1K9CQ2C6rqI7oXLRRwstpKmMT0IC2i VTyEHSc9tSgR6/rXFAC7hDSCNGG4f3TBkyezgLFoWGtywbN2byH/2FIYlqe/W7wpasOVjD aLW/nER8YACcFVuHo0MSU/G+zVzbEnUaCe7YiJ2Qkx2xd9DqtP0LqNI6ouIsgJ7ZhXb1Ew wvcNTU6sCx2cZUlt0R5CZi7oaDPa5pQ6pWBuFgM5W8ORWAIUvGqsavlQESFwb5liE2KsB1 DDLH5RPaDuYPvxz+LInZPvJSbuq7IAq0kLDFg4tv4zI7L/517TJa0y+aE5l4/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778174789; a=rsa-sha256; cv=none; b=EHT09Wf5KVr8YshYpQf23JDW1I/LzgwPp3n8JszUCb7bwpd+JgoFEDTtvaMrSr/5sRGtJJ kVy8ASBWGBAz/D59J0YmzeHMOvAPXqY3nxtfNxEpy+vZKjeNoLPOdx1AqnbJIt9yXkYQL4 7Ma0Z7Ij+f/RwbtAVUcVUEynV2bEZc68ziT0t+zuKZLotQj+EL9kI897Y+jCIcCjlHlDxS QNIb1vPYusZUrKStGWgE28Xm1UCuwqt9fh9f7ICDZy6B6SurzNecKbcQCe7+pVyWDefUo3 GcgWrVdE6JsdLbwztPjQ6wyygihTlMQ80HAsjaEGovRWRl+yQXdNnw9mVMNjSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174789; 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=xoBWzbVgimd3n8Xed2JlYD+7IjpfuhhPhiUy8ZuPhkI=; b=kveylPApxAp/VtTW3z0TS4uVHkkphWEicwbpe37uM1CAwYGh5PpeLeZ9f8lWA5TYCDmE+0 MzwGzAtuEONIqKD1CkCjbftczqiVsLsTxuZIbXO8izDKfUhT6EV0clQnWuy9kvsk5Uk6Oz vJ6RJR4pPEKiDQwC1U3vt2E8waRzBW0LLi6s28+tmC9Zv62eknLo0JiZSAcYyXElP3N8R2 ZE8ZNtqS+lr6nLkjxowwOAkP+PRsfcAJEjF7VTEbL0Nf5CfMo0pTfBQ7Bmwyws+gNA1aza BMAlihkyW9iuD8vKpxFYpPJ3TpTLZOLE0rM4eRxnIKCVnoCHtmae0A1k53ff0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBK112wVKzcYW for ; Thu, 07 May 2026 17:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c55e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 17:26:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jan Bramkamp From: Kyle Evans Subject: git: c35bb8ba8984 - stable/15 - jail: avoid leaking jail config fds to exec.* hooks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: c35bb8ba898482920bf9b57967a9a11f98a89c81 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 17:26:29 +0000 Message-Id: <69fccb45.3c55e.7b30f10a@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c35bb8ba898482920bf9b57967a9a11f98a89c81 commit c35bb8ba898482920bf9b57967a9a11f98a89c81 Author: Jan Bramkamp AuthorDate: 2026-05-06 23:28:53 +0000 Commit: Kyle Evans CommitDate: 2026-05-07 17:26:18 +0000 jail: avoid leaking jail config fds to exec.* hooks The jail(8) command must not leave parsed configuration files open since the file descriptors will be leaked to child processes including the untrusted exec.start or exec.stop hooks. While fopen() doesn't provide direct access to O_CLOEXEC, it does provide access to FD_CLOEXEC via "e" in the mode string which provides the desired defense in depth against leaking file descriptors into exec.* hooks since those always execve() into a shell. Jail configuration is potentially sensitive and some hooks execute from within the jail context, leaving some opening for the jail to exfiltrate information about the host environment. (Commit message wordsmithed by kevans) PR: 295052 Reviewed by: kevans (cherry picked from commit 276d9b88a9e6fd6fd90e57c36444756ad297d2ab) --- usr.sbin/jail/config.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c index 1bad04ccde68..f1e2da215790 100644 --- a/usr.sbin/jail/config.c +++ b/usr.sbin/jail/config.c @@ -321,6 +321,7 @@ static void parse_config(const char *cfname, int is_stdin) { struct cflex cflex = {.cfname = cfname, .error = 0}; + FILE *yfp = NULL; void *scanner; yylex_init_extra(&cflex, &scanner); @@ -328,7 +329,7 @@ parse_config(const char *cfname, int is_stdin) cflex.cfname = "STDIN"; yyset_in(stdin, scanner); } else { - FILE *yfp = fopen(cfname, "r"); + yfp = fopen(cfname, "re"); if (!yfp) err(1, "%s", cfname); yyset_in(yfp, scanner); @@ -336,6 +337,8 @@ parse_config(const char *cfname, int is_stdin) if (yyparse(scanner) || cflex.error) exit(1); yylex_destroy(scanner); + if (yfp != NULL) + fclose(yfp); } /* From nobody Thu May 7 17:27:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBK1k3jyPz6ctZM for ; Thu, 07 May 2026 17:27: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 4gBK1k1D6lz3mvc for ; Thu, 07 May 2026 17:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174826; 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=B5xx2/XbcUW8c4BRnsa2fI9GyUlMVUtAqbIFechaX88=; b=pb3h6ef/WdVubPL44qwYa9AavxOA9ONFdqB5B6b9uVezFoIfy79RMs+o9geVMltngWmLX/ eqClcmLHCb6A/J0LY2U/YfZUQuu+y1CmlTUVCxGc5Ve6PR7abbd6sdCXsebXTXx+WmeLta X6qWKm3FCNN0wLSaXs3WpqKlJOdlcMRaBknw6DTb4kkqj5EkpJcqknbY9wf9UcxuKUcmhB /9vyJ+o+wTKTZOXgEV2TrmRu9AE5jkfhb1/FGIRopTTXPDK2Pxsssi2xLRXsrYgScbBhgJ aWNqy081c2jftevZQKlHUO4Nx12Bl7jvEhyuWqX7eFFXRQBzOZ6yRW9wrbz/Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778174826; a=rsa-sha256; cv=none; b=ZB0DTcnKjulMk3mpHBEwt10W6w3oRR13ydT9T9iXeSKY5tm6t85sXStfWu8HcaL84IOrKq HxoAQDozaNhlClQzxvGzSwCmqS5LttDZCZiTEHLG2HkQ5PNlngeH88se9pjWJhn2fGh1j4 mnINhVGpjCRsz/1hvx4lmwLW7Q5QSPZAnfvrWwXCGsgP0iXIKQTRvmyl+Um939t6ciR8lU LmX3zTx7Sb55u1Gp3DNUR0bLst0/r4TsMiKJAD5+TOwvhv5j8E7t70Zeu8y4ebOs3/omkn 5cIKYCCiczIEEDJsHsCS9/2E1OKt+wcGjEGHicXviXWu7R+WnvUDbbSRsJqVfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174826; 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=B5xx2/XbcUW8c4BRnsa2fI9GyUlMVUtAqbIFechaX88=; b=cY5bbf/NNg20M4qhhBOPQId6DJJ+IkApv5zZ4WYyVVk2GvsD2Jk3R2MnjX6v0kHeB9ADdA nAokPQf6Pv7i+pj4uvi6j1n/40MceMKJEMdGhYoCZqILcHLqHKKrIQPvhjFNjKwJFxiumc KN1mWRjcwK6MjdnWqJLFBsH30GBAranhigdq1x2VJG/pe9ua4Zfmubjm5j7JEyEWp881Lg CLHqjPmMypXIPrRI0X4JJGZ/loEePRyZBdy1g1cza1MaYjC3ZrOftTqFYhYGCQvmz/zhbB in2uYZzD3lhHl2XSq+JPgucdy5CWu9fv+tZUucYGy7u8jH5j/riAIZWVyBK1pw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBK1k0FN6zcWG for ; Thu, 07 May 2026 17:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d178 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 17:27:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jan Bramkamp From: Kyle Evans Subject: git: 187de25ef99e - stable/14 - jail: avoid leaking jail config fds to exec.* hooks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 187de25ef99e49dd7a6a4bfa630f10ab9571ef17 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 17:27:06 +0000 Message-Id: <69fccb6a.3d178.a311759@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=187de25ef99e49dd7a6a4bfa630f10ab9571ef17 commit 187de25ef99e49dd7a6a4bfa630f10ab9571ef17 Author: Jan Bramkamp AuthorDate: 2026-05-06 23:28:53 +0000 Commit: Kyle Evans CommitDate: 2026-05-07 17:27:03 +0000 jail: avoid leaking jail config fds to exec.* hooks The jail(8) command must not leave parsed configuration files open since the file descriptors will be leaked to child processes including the untrusted exec.start or exec.stop hooks. While fopen() doesn't provide direct access to O_CLOEXEC, it does provide access to FD_CLOEXEC via "e" in the mode string which provides the desired defense in depth against leaking file descriptors into exec.* hooks since those always execve() into a shell. Jail configuration is potentially sensitive and some hooks execute from within the jail context, leaving some opening for the jail to exfiltrate information about the host environment. (Commit message wordsmithed by kevans) PR: 295052 Reviewed by: kevans (cherry picked from commit 276d9b88a9e6fd6fd90e57c36444756ad297d2ab) --- usr.sbin/jail/config.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c index 4465839cba0b..5cf2e34a8340 100644 --- a/usr.sbin/jail/config.c +++ b/usr.sbin/jail/config.c @@ -321,6 +321,7 @@ static void parse_config(const char *cfname, int is_stdin) { struct cflex cflex = {.cfname = cfname, .error = 0}; + FILE *yfp = NULL; void *scanner; yylex_init_extra(&cflex, &scanner); @@ -328,7 +329,7 @@ parse_config(const char *cfname, int is_stdin) cflex.cfname = "STDIN"; yyset_in(stdin, scanner); } else { - FILE *yfp = fopen(cfname, "r"); + yfp = fopen(cfname, "re"); if (!yfp) err(1, "%s", cfname); yyset_in(yfp, scanner); @@ -336,6 +337,8 @@ parse_config(const char *cfname, int is_stdin) if (yyparse(scanner) || cflex.error) exit(1); yylex_destroy(scanner); + if (yfp != NULL) + fclose(yfp); } /* From nobody Thu May 7 17:32:08 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBK7X4BfHz6ctvN for ; Thu, 07 May 2026 17:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBK7X3H0Wz3nnW for ; Thu, 07 May 2026 17:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778175128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4+lUhU3vmI0ppXQDAX57CD1W2o11vdXOSI3UaSOqc64=; b=WCpM+yqvwbe7Vsr7LfePHoT7WKv/vDcbKUFb7QbJfiTPwiACKRhPFV+VenRiC5Dcttb57e lYryu0rL3zp7euiGUdvBUem2hd0/8d9IpkwLyFbjP+8olIVLaGUeuGlE0WYO9TJWHJIG6L fedmlXef4vhsY6CZqYFFKq8653FFYVtGo7DIlmeq6Anqsvt7ln+vh3CMhEoOqCPPFUNMxn FJWIOkn8wD0AFPnmyh7oJUEqxaANmaDdpQyE7XU3o4cd6q9UmdZV4HG9E2QXNeis0ykPX2 OGUj/gowwMgmU+DWDjUqApGbmoaNtoFKiE0FOpxtRnjcPm8yzaWEOhDjhf9DUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778175128; a=rsa-sha256; cv=none; b=fDJCuODLbSuitwBjEFcIlBrNvUSNOQEVL8HOWW3+ZL6OTyUNjNxikHmtK2E8RWyxijWMDS MqnPlJxrF3pqtY+xKjYxZsYK9khXzxZmvtzPYkzzfUiobx6WgB4pMrSr8JV7xTK4Xea3SH NKdg0O/qp/hlJ0HbaOgdvkrTyzmn0jAciDxjUDKZD3bVytm5tyHddzrfkY36agZG4OtfdA Myc770HsyDJSBIEhhaQTYWMEFzRZEyBf1cArhz4iESZJdOIhsCBMdwY/2JYh6lawIFsldo STgUwqwia3CxoTTVlY4x3T9EVnCEm4sURGKMmPklmC5h/DKBa90KVZTKckjqcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778175128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4+lUhU3vmI0ppXQDAX57CD1W2o11vdXOSI3UaSOqc64=; b=wMLFHmndWYPkvYwGxt5Tx2sP7GpSsxyDK+ig/BA/GG7L3z5XfwylJSjrD/wLievS85rVKR x6ZkuF6CFHKEHm4tt4UgGtIddp8NK5UpDVpPu1EKvm/e9CpHV85qNGbONyYA4kWMwzS1Je hCUea9OJcHsc/haCcoeSWyJUGwj0fBdM2Te1N2wBPsx38XErWi0QsoQGtOqWU2D4zvvhkh mp2zXG0/UVcLrJIiHOZvmGW/qC5dVg7ofv1+qEZh87y+PIr+GlyZKyOjhW7sVLoUv9uknC k74lBdT1k56Agoy89UoQ+B9IpzWhMFUJETUg2IzKL5AlRKORGe0DaI+Ap7MVqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBK7X2kYyzcG1 for ; Thu, 07 May 2026 17:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c66f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 17:32:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 944a4eb089b3 - main - stand/libsa/zfs: disable ZSTD_TRACE and DYNAMIC_BMI2 code paths List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 944a4eb089b33241b21979253e0a373ce0bdf984 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 17:32:08 +0000 Message-Id: <69fccc98.3c66f.1f43e0bb@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=944a4eb089b33241b21979253e0a373ce0bdf984 commit 944a4eb089b33241b21979253e0a373ce0bdf984 Author: Ryan Libby AuthorDate: 2026-05-07 17:30:05 +0000 Commit: Ryan Libby CommitDate: 2026-05-07 17:30:05 +0000 stand/libsa/zfs: disable ZSTD_TRACE and DYNAMIC_BMI2 code paths Enabling ZSTD_TRACE leaves behind undefined weak symbols, which causes a problem for gcc builds. The bfd linker emits an obscure error about overlapping FDEs. We don't need ZSTD_TRACE for libsa, so just disable it. Also disable BMI2 instruction optimizations. The addition of the optional BMI2 code paths caused the boot loader binaries to grow larger (28 KiB for clang, 32 KiB for gcc). The boot loader binaries are size constrained, and this pushed the gcc-generated lua_loader.bin over the 500000 byte limit, and the clang one to within 4k of the limit. Fixes: 8a62a2a5659d ("zfs: merge openzfs/zfs@f8e5af53e") Reviewed by: delphij, imp, mm Differential Revision: https://reviews.freebsd.org/D56866 --- stand/libsa/zfs/Makefile.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc index 3df6779559c9..540635d144ef 100644 --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -75,9 +75,13 @@ CFLAGS.zfs.c+= -DHAS_ZSTD_ZFS \ # # ZSTD coding style has some issues, so suppress clang's warnings. Also, zstd's # use of BMI instrucitons is broken in this environment, so avoid them. +# Avoid generating the DYNAMIC_BMI2 code paths because the code duplication +# inflates the resulting binaries. Disable ZSTD_TRACE because we don't need it +# and the bfd linker trips over the weak undefined symbols it generates. # .for i in ${ZSTD_SRC} -CFLAGS.$i+= -U__BMI__ ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.$i+= -U__BMI__ -DDYNAMIC_BMI2=0 -DZSTD_TRACE=0 \ + ${NO_WBITWISE_INSTEAD_OF_LOGICAL} .endfor CFLAGS.zfs_zstd.c+= -DIN_BASE -DIN_LIBSA From nobody Thu May 7 18:08:40 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBKxj1N3Nz6cx9C for ; Thu, 07 May 2026 18:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBKxh6XGfz3sbH for ; Thu, 07 May 2026 18:08:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778177320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RV0o9z6B8GoXh6wSfIJGBTbavhJUwKHRbBob0pCxDyo=; b=FYCcu2XxC7WB4drpVIncW0YvGRYQIer4swBgjhIJUR6/69SeNC3JMjdFLLXzu3WWug+Y8e xpMNaPch9EBlH8LY4KlY6FSxo2BU7qbWGwyYu7CiF6INf7XvDDkC6u/Ntj3XkUd0R8FNjX mMRv7q2MAgtGEyS5B8HZVkz5aw9S5YMqL7ONcqTA1A+IotUlknClvV7SZYF2v4304CuS1N L4ICXAyqE24sF51uThHNkcerBS9o4saPWXkB5cKh1wD9SA+Qdi0vzCGa0qVQqi0iGRMYOM 2X4TG0E0YiI+DeUPe28aX+lBSMyBFcNVLqFsAA6rycirFZwlouV52SeQrlFzQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778177320; a=rsa-sha256; cv=none; b=TPrParZ7//CabFgHTWU3Fg/5INZzriWNkpskCp181q1SSo4UEr+T2ZE9QOdwf2q8VC7nkO +LdAMfAS/aKtt5/jYzSYAQ/tnS7s44XjubtSxvSDZpZeHLdGQusweyurapcBDxH1pbmklV lqiIW5ReOdpRynCekesqtnu+FsX6ug9NW6rcZ47lgjAHri40nvMj9nvqR+Dk8h5WZHb/dS 9/SOS5G0YstPblQPMAZ7xpwSGnqGFG1nvp2eA45yHp70+5+S3Fjq8PfYDGFcJaWQqJPEYh WU2S7o2mB+JU+mkReVW4yfEELtJmYm8G7t4wgZjjTuFHbDl5P2wtnqpjCWWglg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778177320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RV0o9z6B8GoXh6wSfIJGBTbavhJUwKHRbBob0pCxDyo=; b=PhB2ZsWZ9YKstAjjFUBgli9q3weVAI0owBdkZvJhpDhalmSa2yDVoc9PbN83U7rZuUAcKt 6DJA4nQ8+Zm0H9gQQpuroJDZWDOO9KNlqr9yMJ8q4W8lRrWsZjlb810YJnYcBxr9/uDwvm wKycxgSdlnD56vpeu/xtxgrgQicOPfkpsGYGwRsx8SquLNoE+tENvbkDCu5Dh8Q/Xul2W/ u4UpBXCt9DH/09Zu0bGu3Vb1cWM8PdTSnANrM2Eit+vDt/P4T7dAtmrsRlyYnFX71KENPX 74yoh7e6chmMEjhoXn6yCOpZVE3BhvWc1e/yNHbC9G/Xi+cIVh3KyIemw8lWGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBKxh4ZP4zdTW for ; Thu, 07 May 2026 18:08:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fe37 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 18:08:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Hall Subject: git: e9912b7e88e7 - main - smartpqi.4: Document runtime debug_level sysctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrhall X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9912b7e88e7d66c0ab5fec1cfe61dcd18377166 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 18:08:40 +0000 Message-Id: <69fcd528.3fe37.163a645@gitrepo.freebsd.org> The branch main has been updated by jrhall: URL: https://cgit.FreeBSD.org/src/commit/?id=e9912b7e88e7d66c0ab5fec1cfe61dcd18377166 commit e9912b7e88e7d66c0ab5fec1cfe61dcd18377166 Author: John Hall AuthorDate: 2026-05-04 22:14:28 +0000 Commit: John Hall CommitDate: 2026-05-07 18:08:27 +0000 smartpqi.4: Document runtime debug_level sysctl Update smartpqi(4) to document the dev.smartpqi..debug_level sysctl for runtime debug level changes, and note that device add/remove and controller event messages always appear in dmesg regardless of the debug_level setting. PR: 294161 Reviewed by: imp Approved by: imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56832 --- share/man/man4/smartpqi.4 | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/share/man/man4/smartpqi.4 b/share/man/man4/smartpqi.4 index ef5f903fe422..ae85e184114d 100644 --- a/share/man/man4/smartpqi.4 +++ b/share/man/man4/smartpqi.4 @@ -1,4 +1,4 @@ -.\" Copyright (C) 2019-2025, Microchip Technology Inc. and its subsidiaries +.\" Copyright (C) 2019-2026, Microchip Technology Inc. and its subsidiaries .\" Copyright (C) 2016-2018, Microsemi Corporation .\" Copyright (C) 2016, PMC-Sierra, Inc. .\" Written by John Hall @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 28, 2025 +.Dd April 14, 2026 .Dt SMARTPQI 4 amd64 .Os .Sh NAME @@ -64,11 +64,13 @@ OEM Controllers based on the Microchip Technology Inc. SmartROC and SmartIOC Chipsets .El .Sh DEBUGGING -Driver diagnostic printing is controlled in +Driver diagnostic printing is controlled at boot time in .Xr loader.conf 5 by using the global .Va hw.smartpqi.debug_level -tunable. +tunable, or at runtime via the per-controller +.Va dev.smartpqi..debug_level +sysctl. .Pp The .Va debug_level @@ -82,11 +84,27 @@ The following levels are available: .It 0x0002 Ta info Ta Basic information .It 0x0004 Ta function Ta Used to show function entry and exit .It 0x0008 Ta io Ta Logging data from controller -.It 0x0010 Ta discovery Ta Device discovery +.It 0x0010 Ta discovery Ta Device discovery state transitions .It 0x0020 Ta warning Ta Operational warnings .It 0x0040 Ta error Ta Parameter errors and programming bugs .It 0x0080 Ta note Ta More detailed information .El +.Pp +In addition to the level-gated debug output, the driver always logs +device addition, device removal, and controller events +(hotplug, hardware, physical/logical device changes, AIO state and +configuration changes) via +.Xr device_printf 9 , +which appear in +.Xr dmesg 8 +regardless of the +.Va debug_level +setting. +.Pp +For example, to enable discovery logging at runtime on the first controller: +.Bd -literal -offset indent +sysctl dev.smartpqi.0.debug_level=0x0070 +.Ed .Sh DEVICE HINTS The following tunable values can be set in .Pa /boot/device.hints @@ -162,7 +180,9 @@ https://www.microchip.com/design-centers/storage .Xr xpt 4 , .Xr loader.conf 5 , .Xr camcontrol 8 , -.Xr kldload 8 +.Xr dmesg 8 , +.Xr kldload 8 , +.Xr sysctl 8 .Sh HISTORY The .Nm From nobody Thu May 7 18:08:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBKxn1smyz6cx5R for ; Thu, 07 May 2026 18:08: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 4gBKxn0Jc6z3t3s for ; Thu, 07 May 2026 18:08:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778177325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iT4juC+mJSQfUO6CzfefH1eLZ6NFiPQ6X+PUS9mmWs8=; b=CioJOabXpU3m4Py/N1qu8mvATYu2/eg6zAYK2x4ZyOQSlbPoFJCPsKcmDT4ps1ZAKHeIcv o7QQhQKgiUvNUvjDz531liE5uRAUNZbQfaKympdxNACjcouJfzuU4SUoDvuwpzSFKFPmEz CUWbfWqM3DvBpjlAxvBIH2oEWA/So3QbS1M4yFAuQc+ZxSoqF9n6kCGeXp5er+rjFdq7xY 0XaBP7VPL9ba+UuCwJsC6dZw4LN22YpFay4ci85LAMUoCTiPMLpUCyIKicd2uoyTGa0HOQ 4aZmbIiC0kxOSnMgOphwos2K3oXZGFM+fAF2o3bo+jTv6Vb6Kr1H23zsgbvruQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778177325; a=rsa-sha256; cv=none; b=UGQNxnF3fTrC35IURkJ8z+cZreTMSt2D0t1sk2qRBxn2RBxUZvVcCT2hHbDfvOyk4ZXSHb H9ZKmb/ojn3XHr+9BRv6tfhLLphKrI26Oc80985uQceTdM8AxLpc7JiNT7BAU/rQ9k+W61 Es9HfcldDpdofvZi9fFDHyC+LzK8rymb53YWtmuoa3RKGrLV77Q3Mz58eIW38NYe5/an7z KhJmMkmxtksRcmWsroMLKda9xxhoAzlvS/hqTFmu5DNSJ+m86VThq6gkRgNgccfHvgYPwn 8ylwFDVGSCCW8QYaNJBqLfRr4IUtz9B20HJ5WremElHdIcevmM7hdQcHNCff5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778177325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iT4juC+mJSQfUO6CzfefH1eLZ6NFiPQ6X+PUS9mmWs8=; b=Ckmobyxh5sto/c+kW12oeccUUAoB7iHDaETQEbX3boMCopJ+ZEE5bSTmIVH/cwJK7hV5fn gHQdepVoJ0dYEyf3DdWyP8KxCLUERuJhhrJ0/+n9bPyCW/HnVX6lsy377EzjU9WKcLQbXD l82F+q72FFEL8hTGg5I2pQXh8RcdMvmgplGMn75lsKi6jrfGwX3T2Z8ZXXWbwQeOYh+evz cn1G79GDygo5cNo+DA2ydwE/0w0IL9bR+8l/4pd2z8Qs6+ovEYawPDO+GIaUzPcarhLakG sv4c+/apU9X2tqGP6rct10TZJOGwPdWzU3h2643JEDsF7YlbUMg7vzspjuL3qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBKxm6QqQzdMH for ; Thu, 07 May 2026 18:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 411fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 18:08:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Hall Subject: git: 0d48d6d7bba7 - main - smartpqi: Add runtime sysctl for debug_level and log device state changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrhall X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d48d6d7bba77d6c3736ce56ea5667bfbde89705 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 18:08:39 +0000 Message-Id: <69fcd527.411fb.36380f0d@gitrepo.freebsd.org> The branch main has been updated by jrhall: URL: https://cgit.FreeBSD.org/src/commit/?id=0d48d6d7bba77d6c3736ce56ea5667bfbde89705 commit 0d48d6d7bba77d6c3736ce56ea5667bfbde89705 Author: John Hall AuthorDate: 2026-05-04 21:43:27 +0000 Commit: John Hall CommitDate: 2026-05-07 18:08:26 +0000 smartpqi: Add runtime sysctl for debug_level and log device state changes The smartpqi driver did not log device add/remove or controller events to syslog, and hw.smartpqi.debug_level could only be set at boot via loader.conf with no runtime sysctl interface. Add a read-write sysctl at dev.smartpqi.N.debug_level for runtime debug level changes. Add device_printf calls for device addition, removal, and controller events (hotplug, hardware, physical/logical device, AIO state/config changes) so state changes always appear in dmesg. Add DBG_DISC logging for discovery state transitions. Fix spelling errors in strings and comments across the driver. Bump driver version to 14.4691.1.2000 / 15.2.1.2000. PR: 294161 Reviewed by: imp Approved by: imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D56832 --- sys/dev/smartpqi/smartpqi_cam.c | 4 ++-- sys/dev/smartpqi/smartpqi_defines.h | 8 ++++---- sys/dev/smartpqi/smartpqi_discovery.c | 21 ++++++++++++++++++--- sys/dev/smartpqi/smartpqi_event.c | 17 ++++++++++++++--- sys/dev/smartpqi/smartpqi_main.c | 12 +++++++++++- sys/dev/smartpqi/smartpqi_misc.c | 4 ++-- sys/dev/smartpqi/smartpqi_queue.c | 4 ++-- sys/dev/smartpqi/smartpqi_request.c | 4 ++-- sys/dev/smartpqi/smartpqi_response.c | 4 ++-- sys/dev/smartpqi/smartpqi_sis.c | 6 +++--- sys/dev/smartpqi/smartpqi_structures.h | 4 ++-- 11 files changed, 62 insertions(+), 26 deletions(-) diff --git a/sys/dev/smartpqi/smartpqi_cam.c b/sys/dev/smartpqi/smartpqi_cam.c index 690b38c9f855..6ded8aa97e39 100644 --- a/sys/dev/smartpqi/smartpqi_cam.c +++ b/sys/dev/smartpqi/smartpqi_cam.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -1300,7 +1300,7 @@ register_sim(struct pqisrc_softstate *softs, int card_index) csa.callback_arg = softs; xpt_action((union ccb *)&csa); if (csa.ccb_h.status != CAM_REQ_CMP) { - DBG_ERR("Unable to register smartpqi_aysnc handler: %d!\n", + DBG_ERR("Unable to register smartpqi_async handler: %d!\n", csa.ccb_h.status); } diff --git a/sys/dev/smartpqi/smartpqi_defines.h b/sys/dev/smartpqi/smartpqi_defines.h index 0277abd3e318..c4084f069588 100644 --- a/sys/dev/smartpqi/smartpqi_defines.h +++ b/sys/dev/smartpqi/smartpqi_defines.h @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -944,12 +944,12 @@ typedef uint8_t *passthru_buf_type_t; #define PQISRC_DRIVER_MAJOR __FreeBSD__ #if __FreeBSD__ <= 14 -#define PQISRC_DRIVER_MINOR 4690 +#define PQISRC_DRIVER_MINOR 4691 #else #define PQISRC_DRIVER_MINOR 2 #endif -#define PQISRC_DRIVER_RELEASE 0 -#define PQISRC_DRIVER_REVISION 2008 +#define PQISRC_DRIVER_RELEASE 1 +#define PQISRC_DRIVER_REVISION 2000 #define STR(s) # s #define PQISRC_VERSION(a, b, c, d) STR(a.b.c-d) diff --git a/sys/dev/smartpqi/smartpqi_discovery.c b/sys/dev/smartpqi/smartpqi_discovery.c index a7de5a149810..8682e6cabd7e 100644 --- a/sys/dev/smartpqi/smartpqi_discovery.c +++ b/sys/dev/smartpqi/smartpqi_discovery.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -155,7 +155,7 @@ pqisrc_remove_target_bit(pqisrc_softstate_t *softs, int target) softs->bit_map.bit_vector[target] = SLOT_AVAILABLE; } -/* Use bit map to find availible targets */ +/* Use bit map to find available targets */ int pqisrc_find_avail_target(pqisrc_softstate_t *softs) { @@ -1423,7 +1423,11 @@ pqisrc_add_device(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) if(device->expose_device) { pqisrc_init_device_active_io(softs, device); - /* TBD: Call OS upper layer function to add the device entry */ + device_printf(softs->os_specific.pqi_dev, + "device added: vendor=%s model=%s B%d:T%d:L%d type=%s\n", + device->vendor, device->model, + device->bus, device->target, device->lun, + device->is_physical_device ? "physical" : "logical"); os_add_device(softs,device); } DBG_FUNC("OUT\n"); @@ -1451,6 +1455,11 @@ pqisrc_remove_device(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device) } /* Wait for device outstanding Io's */ pqisrc_wait_for_device_commands_to_complete(softs, device); + device_printf(softs->os_specific.pqi_dev, + "device removed: vendor=%s model=%s B%d:T%d:L%d type=%s\n", + device->vendor, device->model, + device->bus, device->target, device->lun, + device->is_physical_device ? "physical" : "logical"); /* Call OS upper layer function to remove the exposed device entry */ os_remove_device(softs,device); DBG_FUNC("OUT\n"); @@ -1674,10 +1683,14 @@ pqisrc_update_device_list(pqisrc_softstate_t *softs, case DEVICE_NOT_FOUND: /* Device not found in existing list */ device->new_device = true; + DBG_DISC("new device found B%d:T%d:L%d\n", + device->bus, device->target, device->lun); break; case DEVICE_CHANGED: /* Actual device gone need to add device to list*/ device->new_device = true; + DBG_DISC("device changed B%d:T%d:L%d\n", + device->bus, device->target, device->lun); break; case DEVICE_IN_REMOVE: /*Older device with same target/lun is in removal stage*/ @@ -1686,6 +1699,8 @@ pqisrc_update_device_list(pqisrc_softstate_t *softs, * free call*/ device->new_device = false; same_device->schedule_rescan = true; + DBG_DISC("device in removal B%d:T%d:L%d, scheduling rescan\n", + device->bus, device->target, device->lun); break; default: break; diff --git a/sys/dev/smartpqi/smartpqi_event.c b/sys/dev/smartpqi/smartpqi_event.c index 77a70f9fb031..c3c27c9e1c0b 100644 --- a/sys/dev/smartpqi/smartpqi_event.c +++ b/sys/dev/smartpqi/smartpqi_event.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -204,6 +204,17 @@ pqisrc_process_event_intr_src(pqisrc_softstate_t *softs,int obq_id) } if (event_index >= 0) { + static const char *event_names[] = { + [PQI_EVENT_HOTPLUG] = "hotplug", + [PQI_EVENT_HARDWARE] = "hardware", + [PQI_EVENT_PHYSICAL_DEVICE] = "physical device", + [PQI_EVENT_LOGICAL_DEVICE] = "logical device", + [PQI_EVENT_AIO_STATE_CHANGE] = "AIO state change", + [PQI_EVENT_AIO_CONFIG_CHANGE] = "AIO config change", + }; + device_printf(softs->os_specific.pqi_dev, + "event: %s (type=0x%x)\n", + event_names[event_index], response.event_type); if(response.request_acknowledge) { pending_event = &softs->pending_events[event_index]; pending_event->pending = true; @@ -385,7 +396,7 @@ pqisrc_report_event_config(pqisrc_softstate_t *softs) pqi_event_config_request_t request; pqi_event_config_t *event_config_p ; dma_mem_t buf_report_event ; - /*bytes to be allocaed for report event config data-in buffer */ + /*bytes to be allocated for report event config data-in buffer */ uint32_t alloc_size = sizeof(pqi_event_config_t) ; memset(&request, 0 , sizeof(request)); @@ -446,7 +457,7 @@ pqisrc_set_event_config(pqisrc_softstate_t *softs) pqi_event_config_request_t request; pqi_event_config_t *event_config_p; dma_mem_t buf_set_event; - /*bytes to be allocaed for set event config data-out buffer */ + /*bytes to be allocated for set event config data-out buffer */ uint32_t alloc_size = sizeof(pqi_event_config_t); memset(&request, 0 , sizeof(request)); diff --git a/sys/dev/smartpqi/smartpqi_main.c b/sys/dev/smartpqi/smartpqi_main.c index 1f006939bf7c..fbfbcc962f35 100644 --- a/sys/dev/smartpqi/smartpqi_main.c +++ b/sys/dev/smartpqi/smartpqi_main.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -427,6 +427,16 @@ smartpqi_attach(device_t dev) goto out; } + /* Register sysctl for runtime debug_level changes */ + { + struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(dev); + struct sysctl_oid *tree = device_get_sysctl_tree(dev); + + SYSCTL_ADD_ULONG(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "debug_level", CTLFLAG_RW, &logging_level, + "Debug logging bitmask"); + } + goto out; dma_out: diff --git a/sys/dev/smartpqi/smartpqi_misc.c b/sys/dev/smartpqi/smartpqi_misc.c index 6db0d80ed993..fd0b907aa252 100644 --- a/sys/dev/smartpqi/smartpqi_misc.c +++ b/sys/dev/smartpqi/smartpqi_misc.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -252,7 +252,7 @@ bsd_set_hint_scatter_gather_config(struct pqisrc_softstate *softs) DBG_FUNC("IN\n"); - /* At least > 16 sg's required to wotk hint correctly. + /* At least > 16 sg's required to work hint correctly. * Default the sg count set by driver/controller. */ if ((!softs->hint.sg_segments) || (softs->hint.sg_segments > diff --git a/sys/dev/smartpqi/smartpqi_queue.c b/sys/dev/smartpqi/smartpqi_queue.c index e8a467531aa4..679d956f6f36 100644 --- a/sys/dev/smartpqi/smartpqi_queue.c +++ b/sys/dev/smartpqi/smartpqi_queue.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -729,7 +729,7 @@ pqisrc_create_op_ibq(pqisrc_softstate_t *softs, op_ib_q->pi_register_offset); } else { int i = 0; - DBG_WARN("Error Status Decsriptors\n"); + DBG_WARN("Error Status Descriptors\n"); for (i = 0; i < 4; i++) DBG_WARN(" %x\n",admin_resp.resp_type.create_op_iq.status_desc[i]); } diff --git a/sys/dev/smartpqi/smartpqi_request.c b/sys/dev/smartpqi/smartpqi_request.c index c5f8ac3c41ba..655660615797 100644 --- a/sys/dev/smartpqi/smartpqi_request.c +++ b/sys/dev/smartpqi/smartpqi_request.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -1998,7 +1998,7 @@ pqisrc_send_raid_tmf(pqisrc_softstate_t *softs, pqi_scsi_dev_t const *devp, if (softs->timeout_in_tmf && tmf_type == SOP_TASK_MANAGEMENT_LUN_RESET) { - /* OS_TMF_TIMEOUT_SEC - 1 to accomodate driver processing */ + /* OS_TMF_TIMEOUT_SEC - 1 to accommodate driver processing */ tmf_req.timeout_in_sec = OS_TMF_TIMEOUT_SEC - 1; } diff --git a/sys/dev/smartpqi/smartpqi_response.c b/sys/dev/smartpqi/smartpqi_response.c index 38695860e520..1ae74a5b95ff 100644 --- a/sys/dev/smartpqi/smartpqi_response.c +++ b/sys/dev/smartpqi/smartpqi_response.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -275,7 +275,7 @@ pqisrc_is_innocuous_error(pqisrc_softstate_t *softs, rcb_t *rcb, void *err_info) if (raid_err->data_out_result == PQI_RAID_DATA_IN_OUT_UNDERFLOW) return true; - /* We get these a alot: leave a tiny breadcrumb about the error, + /* We get these a lot: leave a tiny breadcrumb about the error, but don't do full spew about it */ if (raid_err->status == PQI_AIO_STATUS_CHECK_CONDITION) { diff --git a/sys/dev/smartpqi/smartpqi_sis.c b/sys/dev/smartpqi/smartpqi_sis.c index 82eb999ca4b8..99aa952eb149 100644 --- a/sys/dev/smartpqi/smartpqi_sis.c +++ b/sys/dev/smartpqi/smartpqi_sis.c @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -26,7 +26,7 @@ #include "smartpqi_includes.h" -/* Function for disabling msix interrupots */ +/* Function for disabling msix interrupts */ void sis_disable_msix(pqisrc_softstate_t *softs) { @@ -96,7 +96,7 @@ sis_disable_interrupt(pqisrc_softstate_t *softs) sis_disable_msix(softs); break; default: - DBG_ERR("Inerrupt mode none!\n"); + DBG_ERR("Interrupt mode none!\n"); break; } diff --git a/sys/dev/smartpqi/smartpqi_structures.h b/sys/dev/smartpqi/smartpqi_structures.h index 0c9ad375823d..ada6676ada8f 100644 --- a/sys/dev/smartpqi/smartpqi_structures.h +++ b/sys/dev/smartpqi/smartpqi_structures.h @@ -1,5 +1,5 @@ /*- - * Copyright 2016-2025 Microchip Technology, Inc. and/or its subsidiaries. + * Copyright 2016-2026 Microchip Technology, Inc. and/or its subsidiaries. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -1168,7 +1168,7 @@ typedef struct bmic_sense_feature_page_header { uint8_t page; uint8_t sub_page; uint16_t total_length; /** Total length of the page. - * The length is the same wheteher the request buffer is too short or not. + * The length is the same whether the request buffer is too short or not. * When printing out the page, only print the buffer length. */ } OS_ATTRIBUTE_PACKED bmic_sense_feature_page_header_t; From nobody Thu May 7 18:45:58 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBLmr2MMKz6d13w for ; Thu, 07 May 2026 18:46: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 4gBLmr1mmcz42R2 for ; Thu, 07 May 2026 18:46:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778179564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kjs9BSwcq/0ZofYeAxaKmNV7s/4odaKiYW5HO562fDA=; b=mT5wWT5pxcfXxhrvwdUJZ7f/Jwy6JF11vypCE6st3w01LM6+CO0EOBFDUFhZDIiwP7OAJ+ oijmy269L12g2phoof8EfX5Ry3qr1NVMRXaLt+0EluD1c5X/T3d/I6815RjEhKt2P/+m4M 1E5weNntaYRhL11diNSDpnmnky+Oo7XWx9NFrC49Z4VsnMLSsZzminSuByOH3aV5b9h9lQ nr2YYTiuzEu3mFi0jjFZHVVy8YmlAmKhXqioTYS49tSKAA1ZDZtcQKUnJnnvlB7YhoFxay XM3g6VTprb0IUEVC1A2yiFFjKIFvH1rg0ptJ8t7wXJhaQIUf2yL8item3QumHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778179564; a=rsa-sha256; cv=none; b=Q5K8QrK3pd1AK1mRR/1V19ZiQO96f+JWlD14CECn3x4lAxtDGsr5cVeJdC1F8T5xPxmRp2 ajHyScUHzI7D1DCOdyn/5aSkQsxX5hXj/SY/xsHW4jden1eGStu7BJwzPBLb4111jfRvJ2 DPRSSlJmwavy4z8tBXTBHkhM93GHY6o4lzMS8Vp7w36Fgvv1PEH20pf2tNGHEXucQuHLVB j+lrVKvoMlhagGYMoW/tA11yLXLbgfS8duBmNwuTsq3gA3k8cN1+S9DZTlwnBCu6eKLBcD gxiHguTw+Y1wFvwx0qLIzGS2dGyW1rcHm07FhlnuT2ziKeyqbP/1QbLsEetJjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778179564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kjs9BSwcq/0ZofYeAxaKmNV7s/4odaKiYW5HO562fDA=; b=MVOeG4H3MizCM50MV/0Cgr5upfmUeOsB3Bwh1cGmj588VZ1qcIUNc2PxzqkPYG+o5/V4rF DiGU7k5BlDEnjnrkYMl5W/4pxZMCtfysWKOQudjkef7ys+RjU647/vWdPuSw0gHKO33Li2 poM/QLVXc2wGU4Un+PK+9jkLE6+KVNPTBTSizf7vAf8z3h0iBZ1LZgaYdeFEy8rgeyiS/B gIdSc6p75pfBN+D4RSIiC45T42r2BZxZK8qTqmjVFyJ5EqAZNEaMTg/mJVsRe6m9bnsocZ KZ/dpUnMlSin+O85pAWa7UgisIHw+xKFfXWwP809Pw7iUWiPlmWezImrSb/D/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBLmr18wgzfYp for ; Thu, 07 May 2026 18:46:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44d55 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 18:45:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 2c88636e0e7a - main - stat: Expand devname test case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c88636e0e7a0316d5e6d146874bdb2751f75c40 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 18:45:58 +0000 Message-Id: <69fcdde6.44d55.73a37995@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2c88636e0e7a0316d5e6d146874bdb2751f75c40 commit 2c88636e0e7a0316d5e6d146874bdb2751f75c40 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-07 18:45:14 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-07 18:45:14 +0000 stat: Expand devname test case Test what happens when we ask for the rdev of a non-device. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D56838 --- usr.bin/stat/tests/stat_test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/stat/tests/stat_test.sh b/usr.bin/stat/tests/stat_test.sh index 282efc91303f..aa8563c62ccc 100755 --- a/usr.bin/stat/tests/stat_test.sh +++ b/usr.bin/stat/tests/stat_test.sh @@ -26,6 +26,7 @@ # : ${CHKPATH:="mnt"} +: ${NODEV:="#NODEV"} atf_test_case F_flag F_flag_head() @@ -323,6 +324,7 @@ devname_body() atf_check -o inline:"$devname\n" stat -f '%Sd' "$CHKPATH" atf_check -o inline:"$devname\n" stat -f '%Sr' "$devpath" + atf_check -o inline:"$NODEV\n" stat -f '%Sr' "$CHKPATH" } devname_cleanup() { From nobody Thu May 7 18:59:20 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBM490QS0z6d26M for ; Thu, 07 May 2026 18:59: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 4gBM484m8Bz438l for ; Thu, 07 May 2026 18:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778180360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=651Emll/T1lG2Sz2qbdCr/TI08pZDzAFgieXhbR5BX4=; b=D+G2ESjvrhSzJ3dUpQRfnnC2HAry30qK4Mc7Nvr4DSbG2g9ye9uyLT53PLPKZeF2dqig0C f04AMbI5aBoQ7VA9r7Z3L7K1fBUCs44qIRm+YN6eByfiJMNdtE3zWTPiV7ZoANJ0Ra5/PS WZoN4XB2++1pzs1VMlkprDeAKqSaWuSVyAd5A/W+hb+QQgtJ92bExDbh32kHdFNOQco7Iw QKi0FoKjTxP42wAPD63l/TfSXQZ2BTfANitjfUJ3PSduu0ZyEezIbJsSUG32Ek61Rm6blM tvhoIRPXg/Kq7znlo22uHW5At/RJC+LeJcLgJMvC2BzLqNjAKWUyW9Ay6yyczQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778180360; a=rsa-sha256; cv=none; b=Zx+Wc2X63CeujgvtcXBXS95nEuD+aQIlcwmywTpksVw3PBD1iGs4PeOGHv20X/No7XAks/ /rv7IxZrNdzVxzjknOxvR2duDHt7QtSIuB3f+8r6/IKbPj46lck0pgqmgfB7GnKG+8v2UT 3cm0m2TEsKNf9WZjUExV4vIO9s0FbULhIxsoeOLV/p+74DaKI+MbtxvVImuuyX5IisgmAA liNyjfpHTRCcBey/R6ICK0J+D3Md4amCOnVtQ67knVb2X1C+nNrYYISjZ7uO/zZs/xuSYs uEv4zEtUgFcCfP0GYPPyQEQDhWLctZ/RDGClZndp2Xz6FrgH2Oq+jyNAsi6WDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778180360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=651Emll/T1lG2Sz2qbdCr/TI08pZDzAFgieXhbR5BX4=; b=iVUwBPIRQ/iAuVrEusa8DoPuR/usf3vqLDrMx/SxriLR23y9r/Rz6eaa0UhT2NqlH7OLsS 6NZgfQUGgjbDorkT9OzeAHbf91J1xRfkK7NqYxwzcWKtUpmnUZGADa4rH/2xNT36eh6pmp x41OiSZqC2IDRrQi9b0KvPii/qqPN+3SWXdl0pVyZZS5452zvLdLTn5vaimfo28AQXocuI tzXbtAC+1FCaqDhqhbCv81n8CO36bcAWtJDB6M9lFfZdxK4XR8+3pvAPAy7QCo1KB//Qhv YbPyiqi5vQWC+YgolDtLCGy5AzQDlrTiSKsY2BGidSvpa2o0a7WHLSLy+VIQgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBM4844FHzftC for ; Thu, 07 May 2026 18:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46151 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 18:59:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: f9626b7e55e1 - stable/15 - md5: Don't generate test cases just to skip them List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: f9626b7e55e11322ad45da2201cd482b43eeabb6 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 18:59:20 +0000 Message-Id: <69fce108.46151.1fa28944@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f9626b7e55e11322ad45da2201cd482b43eeabb6 commit f9626b7e55e11322ad45da2201cd482b43eeabb6 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-05 19:44:29 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-07 18:48:10 +0000 md5: Don't generate test cases just to skip them Don't waste time generating Perl test cases for algorithms that are not supported in Perl mode only to skip them when they are run. MFC after: 1 week Reviewed by: ngie Differential Revision: https://reviews.freebsd.org/D56687 (cherry picked from commit fd386e76fa2b29d99525c246cbfc05768a1f4a76) --- sbin/md5/tests/md5_test.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sbin/md5/tests/md5_test.sh b/sbin/md5/tests/md5_test.sh index 34bdf43f13ea..a7632664c7aa 100644 --- a/sbin/md5/tests/md5_test.sh +++ b/sbin/md5/tests/md5_test.sh @@ -176,6 +176,7 @@ out_7_skein1024="cf21a613620e6c119eca31fdfaad449a8e02f95ca256c21d2a105f8e4157048 out_8_skein1024="e6799b78db54085a2be7ff4c8007f147fa88d326abab30be0560b953396d8802feee9a15419b48a467574e9283be15685ca8a079ee52b27166b64dd70b124b1d4e4f6aca37224c3f2685e67e67baef9f94b905698adc794a09672aba977a61b20966912acdb08c21a2c37001785355dc884751a21f848ab36e590331ff938138" for alg in $algorithms ; do + eval "perl=\$name_perl_${alg}" # supported in Perl mode? eval " atf_test_case self_test_${alg} self_test_${alg}_head() { @@ -228,14 +229,13 @@ gnu_${alg}_vec${i}_body() { atf_check -o inline:\"\$out_${i}_${alg} -\0\" ${alg}sum -z - in atf_check -o inline:\"\$out_${i}_${alg} -\n\" shasum \$alg_perl_${alg} digests :>stdout :>stderr @@ -394,14 +393,15 @@ EOF atf_init_test_cases() { for alg in $algorithms ; do + eval "perl=\$name_perl_${alg}" # supported in Perl mode? atf_add_test_case self_test_${alg} for i in $(seq $n) ; do atf_add_test_case bsd_${alg}_vec${i} atf_add_test_case gnu_${alg}_vec${i} - atf_add_test_case perl_${alg}_vec${i} + [ -n "$perl" ] && atf_add_test_case perl_${alg}_vec${i} done atf_add_test_case gnu_check_${alg} - atf_add_test_case perl_check_${alg} + [ -n "$perl" ] && atf_add_test_case perl_check_${alg} done atf_add_test_case gnu_bflag atf_add_test_case gnu_cflag From nobody Thu May 7 18:59:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBM474lv1z6d21T for ; Thu, 07 May 2026 18:59: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 4gBM4740FGz43C9 for ; Thu, 07 May 2026 18:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778180359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+qpPDAmstKzKfTIc+5TTHW+TPS9MhLEfQmjS6srttRs=; b=S8Y6GOmvy4FcjMi7WMhoHDg6QsnRNAO0jUCkCulO8wczYka5sM/HdbTn+KwDV5iaenBB7F AH1gUTNwM7VpfmTIgQIMspuI/RC+dsNB+IPJKV246yiDwNpObQ9N6zL3ZnyHlm1a7mkOkk AX89DAt7L+TlgSAydC+z/SXat3o3VyOeb//eaRK1vBcSXOS9xAzjeTlmz1K9HZlnng7a/F ADUqJUU3o4i8R0THly7lytrG3PJdAXt+wYdzDMrmKAx4yp/4qMRX69DSgURjlflLV85RaC OMU8qI1U5E8HWfTQr6lCRj4528EGm/+ho6AI+VzG75fAlFlKWJQETQt/GmFcIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778180359; a=rsa-sha256; cv=none; b=iutgrAXgknH/n+X9gVP6pLTjiZwJoaanQlJztWIgfnzebtC9rxkpzLOrT9jm6qEpbEYcnM GBl2cWSX8gzOG4wjvvpvyCxt2EIBD2C28gXSei6KQR9R4lpLr0jEefV4ojSo1wpPFQaaIq Z1lRwGpBiAdHqYqIrNPR01GzR3WMsBWOWoVmaY1dwdcIiErYve0msINhzlQm3wu/HcTPeG N1+xg9C5l3AsGyC6PCqQe0b4qHw6UxMzQotg7YxPEDiuMuJ/QLcpRf9lrGVuxIJxmbntjx cG9w9oiXV/Dv3jw55PvhLb+g5OHluilK8O2qEXw4CPc9D15SkmoxqzFm7l3oMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778180359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+qpPDAmstKzKfTIc+5TTHW+TPS9MhLEfQmjS6srttRs=; b=msCuNzA2xnaoOupQw62p7Mf0iEBo3wO7EW09ExmulFd8e8us9GDgwk5hTFOSdAFoA9vREx 0lbAhLSrNZ5LgyqTYrzfEy7bsewA3J7q7k/vMK2vzLSRM2koklpTkVULq/kTqd/xuZUZ0h xfEQFJgEvGWDv8xKQN8xtMFOH9D9zO+S4t4YR4/WFeZVK1ikh6gBcQSD5qmL4WBDtaF3Bs AzLnivtR5LUq0z5Gfn5R/jV4nWONNWzOr6MUfw2KMdqlKVkztzs+oAuUFNwrjmTAY6E3sj PNJ5KU7Jl3P9OgHPYPoz/YY6/4lAlczW42TWwzGR8RbzxM+LRyUaudtACgATbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBM473B6BzftB for ; Thu, 07 May 2026 18:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 459d5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 18:59:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b21f08f97ba0 - stable/15 - vis.3: Try to better describe VIS_SAFE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: b21f08f97ba0c1e254b55e2ac66ec6853ad281f7 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 18:59:19 +0000 Message-Id: <69fce107.459d5.2502e028@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b21f08f97ba0c1e254b55e2ac66ec6853ad281f7 commit b21f08f97ba0c1e254b55e2ac66ec6853ad281f7 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-04 12:08:10 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-07 18:48:10 +0000 vis.3: Try to better describe VIS_SAFE The current text fails to draw the reader's attention to the fact that VIS_SAFE essentially exempts certain characters from being encoded. While here, fix some markup nits. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56716 (cherry picked from commit 8acc4c16c6635c3cd8871d0ee1221b62d48d71b9) --- contrib/libc-vis/vis.3 | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/contrib/libc-vis/vis.3 b/contrib/libc-vis/vis.3 index 18329589d940..9b7b8152be3e 100644 --- a/contrib/libc-vis/vis.3 +++ b/contrib/libc-vis/vis.3 @@ -29,7 +29,7 @@ .\" .\" @(#)vis.3 8.1 (Berkeley) 6/9/93 .\" -.Dd April 22, 2017 +.Dd May 3, 2026 .Dt VIS 3 .Os .Sh NAME @@ -246,19 +246,22 @@ alter this: Also encode double quotes .It Dv VIS_GLOB Also encode the magic characters -.Ql ( * , +.Po +.Ql * , .Ql \&? , .Ql \&[ , and -.Ql # ) +.Ql # +.Pc recognized by .Xr glob 3 . .It Dv VIS_SHELL Also encode the meta characters used by shells (in addition to the glob characters): -.Ql ( ' , +.Po +.Ql ' , .Ql ` , -.Ql \&" , +.Ql \&\(dq , .Ql \&; , .Ql & , .Ql < , @@ -272,7 +275,8 @@ characters): .Ql \&! , .Ql \&^ , and -.Ql ~ ) . +.Ql ~ +.Pc . .It Dv VIS_SP Also encode space. .It Dv VIS_TAB @@ -286,13 +290,15 @@ Synonym for Synonym for .Dv VIS_WHITE | VIS_GLOB | VIS_SHELL . .It Dv VIS_SAFE -Only encode -.Dq unsafe -characters. -Unsafe means control characters which may cause common terminals to perform -unexpected functions. -Currently this form allows space, tab, newline, backspace, bell, and -return \(em in addition to all graphic characters \(em unencoded. +Leave +.Dq safe +characters unencoded. +Characters are only considered unsafe if they cause common terminals +to perform unexpected functions. +Setting the +.Dv VIS_SAFE +flag exempts the backspace, bell, and return characters from being +encoded. .El .Pp (The above flags have no effect for From nobody Thu May 7 18:59:21 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBM4B2mgCz6d1wH for ; Thu, 07 May 2026 18:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBM495hjGz43CF for ; Thu, 07 May 2026 18:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778180361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hhW3/3a1K55kFVjVhU7WxqfLMVW9CLSa8p1z23HrlnI=; b=WfRWr1DaFSyrbk9Ws3eX1lx/6C4xcIJmEtB5ANNqa5W2Xk47RjUIL9BP2h1RQ6RnHD2OFK QPQzNntSutlW0PwwXTUojXBx3Nb9BhgI0XVEVV5HBhF9w0r64RWH7zADNG33RLbIZFRKtp kraggnj7NHnL7+h6pb/UyMxEalHk+Gu9mh8SJX7hUQGDA3N/l8/aZyJaAvhDik6S05KObU npS73h9uZ9VL3MKv8N9hEL8Cp4vkajqUkzmopHqp64IN4UCIWU1hAThVAuIRnidthuYLdZ vmfSoC320adPu2878Jf+yp1WeEExy6TlE5n3G+1X0xqYJUsr25CcZ3OwLCDlSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778180361; a=rsa-sha256; cv=none; b=laM54Rf3dCp4catileD50B6mrAVlaM9KAcUJ6wUAi7g/mNumuFAWCWuPJaMkLh8S5fLJP8 wbYpCDIS09TnAZ/gLXZceutyfNP7gcNaxqJZL8i0tBZLAYQ/i66sxEpBOuO1pn4mw82USg dBvfj7+sOVWUApvaQmm2qm7QMI/BQTgwbOZRxA5UpmciSJ4s9aLg3gL5KpFVoxs+eRvGXJ cm9QOM2Xj94WQTB9gef1nH3ZiIJ9KJerAo7C7PFzpaq9fXVJO3L7+2Axxmbfint0Rdktkn i7g1OSZiDeups+i7LsH/fwgxf2FN2J1KXypsrmRLA0kxR1/RYTWbnyiSyWM/EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778180361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hhW3/3a1K55kFVjVhU7WxqfLMVW9CLSa8p1z23HrlnI=; b=KPKjvTSG9IePgFQLMpGsNxe8GqRsdBIMty7YhiZvTxzR9XvtVBNo8Bp9jSfOiHvHfHK9Ka ZS+JyaQL6hjhQOzPpNXZgEwUpbhsgJGe/IfIUN7uPo2byUqQrXq87mEsgjoPBt5KOIGJXW iTZZGW8Eq+oreibRQvroqfsPEYbn+Dqzop+lVOKm+biElVD2BYVWQfOizyYp20F1RlO43g cBzJvIKbuThBmgqJKCcApSng6XrB2mCUguk3FwC7uoWmhQcopZWtye88ogXRk22cKgFyQc omGUBkcdM/j/q9+LTdENrtbcxedWZHdR1aOved9v73yx/oUqIceOffHAhj92zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBM4950W2zflp for ; Thu, 07 May 2026 18:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45e44 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 18:59:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: c65e233a52c6 - stable/15 - certctl: Unstickify (un)trusted certificates List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: c65e233a52c61bf24fb935d1971e38fbde10791d Auto-Submitted: auto-generated Date: Thu, 07 May 2026 18:59:21 +0000 Message-Id: <69fce109.45e44.6c0f99bd@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c65e233a52c61bf24fb935d1971e38fbde10791d commit c65e233a52c61bf24fb935d1971e38fbde10791d Author: Dag-Erling Smørgrav AuthorDate: 2026-05-05 22:30:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-07 18:48:10 +0000 certctl: Unstickify (un)trusted certificates Ever since certctl was rewritten in C, the rehash command has reingested TRUSTDESTDIR / UNTRUSTDESTDIR in addition to TRUSTPATH / UNTRUSTPATH. This seemed like a good idea at the time but was, in retrospect, a mistake, as it means a (un)trusted certificate remains (un)trusted forever (or at least until it expires) even if it is removed from (UN)TRUSTPATH. Among other issues, it causes ports QA to fail for any port that either installs certificates or depends on a port that does. Although this behavior was undocumented, the change may surprise users who have added certificates manually, so update the manual page to point it out and add prominent warnings to the trust and untrust commands. PR: 290078 MFC after: 1 week Reviewed by: kevans, bcr Differential Revision: https://reviews.freebsd.org/D56617 (cherry picked from commit 2fef18ff594328a771b6aa659e8ffa5a7e076540) --- usr.sbin/certctl/certctl.8 | 15 ++++++- usr.sbin/certctl/certctl.c | 81 ++++++++++++++++++++++------------ usr.sbin/certctl/tests/certctl_test.sh | 3 +- 3 files changed, 67 insertions(+), 32 deletions(-) diff --git a/usr.sbin/certctl/certctl.8 b/usr.sbin/certctl/certctl.8 index 2d38ce020c04..7df89e4d35d0 100644 --- a/usr.sbin/certctl/certctl.8 +++ b/usr.sbin/certctl/certctl.8 @@ -24,7 +24,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 3, 2025 +.Dd April 24, 2026 .Dt CERTCTL 8 .Os .Sh NAME @@ -113,8 +113,19 @@ In addition, a bundle containing the trusted certificates is placed in .Ev BUNDLE . .It Ic untrust Add the specified file to the untrusted list. +Note that the next +.Ic rehash +will remove it unless a copy of it is also placed somewhere in a +directory included in +.Ev UNTRUSTPATH . .It Ic trust -Remove the specified file from the untrusted list. +Add the specified file to the trusted list, unless it is already +untrusted. +Note that the next +.Ic rehash +will remove it unless a copy of it is also placed somewhere in a +directory included in +.Ev TRUSTPATH . .El .Sh ENVIRONMENT .Bl -tag -width UNTRUSTDESTDIR diff --git a/usr.sbin/certctl/certctl.c b/usr.sbin/certctl/certctl.c index 7fdc644bc09f..cf737565ca9e 100644 --- a/usr.sbin/certctl/certctl.c +++ b/usr.sbin/certctl/certctl.c @@ -636,23 +636,18 @@ write_bundle(const char *dir, const char *file, struct cert_tree *tree) * Returns the number of certificates loaded. */ static unsigned int -load_trusted(bool all, struct cert_tree *exclude) +load_trusted(void) { unsigned int i, n; int ret; /* load external trusted certs */ - for (i = n = 0; all && trusted_paths[i] != NULL; i++) { - ret = read_certs(trusted_paths[i], &trusted, exclude); + for (i = n = 0; trusted_paths[i] != NULL; i++) { + ret = read_certs(trusted_paths[i], &trusted, &untrusted); if (ret > 0) n += ret; } - /* load installed trusted certs */ - ret = read_certs(trusted_dest, &trusted, exclude); - if (ret > 0) - n += ret; - info("%d trusted certificates found", n); return (n); } @@ -663,24 +658,19 @@ load_trusted(bool all, struct cert_tree *exclude) * Returns the number of certificates loaded. */ static unsigned int -load_untrusted(bool all) +load_untrusted(void) { char *path; unsigned int i, n; int ret; /* load external untrusted certs */ - for (i = n = 0; all && untrusted_paths[i] != NULL; i++) { + for (i = n = 0; untrusted_paths[i] != NULL; i++) { ret = read_certs(untrusted_paths[i], &untrusted, NULL); if (ret > 0) n += ret; } - /* load installed untrusted certs */ - ret = read_certs(untrusted_dest, &untrusted, NULL); - if (ret > 0) - n += ret; - /* load legacy untrusted certs */ path = expand_path(LEGACY_PATH); ret = read_certs(path, &untrusted, NULL); @@ -796,8 +786,8 @@ certctl_list(int argc, char **argv __unused) { if (argc > 1) usage(); - /* load trusted certificates */ - load_trusted(false, NULL); + /* load installed trusted certificates */ + read_certs(trusted_dest, &trusted, NULL); /* list them */ list_certs(&trusted); free_certs(&trusted); @@ -814,8 +804,8 @@ certctl_untrusted(int argc, char **argv __unused) { if (argc > 1) usage(); - /* load untrusted certificates */ - load_untrusted(false); + /* load installed untrusted certificates */ + read_certs(untrusted_dest, &untrusted, NULL); /* list them */ list_certs(&untrusted); free_certs(&untrusted); @@ -842,10 +832,10 @@ certctl_rehash(int argc, char **argv __unused) } /* load untrusted certs first */ - load_untrusted(true); + load_untrusted(); /* load trusted certs, excluding any that are already untrusted */ - load_trusted(true, &untrusted); + load_trusted(); /* save everything */ ret = save_all(); @@ -859,7 +849,8 @@ certctl_rehash(int argc, char **argv __unused) } /* - * Manually add one or more certificates to the list of trusted certificates. + * Manually add one or more certificates to the list of trusted + * certificates. * * Returns 0 on success and -1 on failure. */ @@ -875,10 +866,10 @@ certctl_trust(int argc, char **argv) usage(); /* load untrusted certs first */ - load_untrusted(true); + load_untrusted(); /* load trusted certs, excluding any that are already untrusted */ - load_trusted(true, &untrusted); + load_trusted(); /* now load the additional trusted certificates */ n = 0; @@ -891,9 +882,9 @@ certctl_trust(int argc, char **argv) warnx("no new trusted certificates found"); free_certs(&untrusted); free_certs(&trusted); - free_certs(&extra); return (0); } + warnx("%u new trusted certificate%s found", n, n > 1 ? "s" : ""); /* * For each new trusted cert, move it from the extra list to the @@ -906,10 +897,16 @@ certctl_trust(int argc, char **argv) RB_INSERT(cert_tree, &trusted, cert); if ((other = RB_FIND(cert_tree, &untrusted, cert)) != NULL) { warnx("%s was previously untrusted", cert->name); + warnx("source of untrust: %s", other->path); RB_REMOVE(cert_tree, &untrusted, other); free_cert(other); } } + warnx("This operation is not persistent. To persistently add"); + warnx("trusted certificates to the system store, copy them to"); + warnx("one of these directories, then run `certctl rehash`:"); + for (i = 0; trusted_paths[i] != NULL; i++) + warnx(" %s", trusted_paths[i]); /* save everything */ ret = save_all(); @@ -929,6 +926,8 @@ certctl_trust(int argc, char **argv) static int certctl_untrust(int argc, char **argv) { + struct cert_tree extra = RB_INITIALIZER(&extra); + struct cert *cert, *other, *tmp; unsigned int n; int i, ret; @@ -936,23 +935,47 @@ certctl_untrust(int argc, char **argv) usage(); /* load untrusted certs first */ - load_untrusted(true); + load_untrusted(); + + /* load trusted certs, excluding any that are already untrusted */ + load_trusted(); /* now load the additional untrusted certificates */ n = 0; for (i = 1; i < argc; i++) { - ret = read_cert(argv[i], &untrusted, NULL); + ret = read_cert(argv[i], &extra, NULL); if (ret > 0) n += ret; } if (n == 0) { warnx("no new untrusted certificates found"); free_certs(&untrusted); + free_certs(&trusted); return (0); } + warnx("%u new untrusted certificate%s found", n, n > 1 ? "s" : ""); - /* load trusted certs, excluding any that are already untrusted */ - load_trusted(true, &untrusted); + /* + * For each new untrusted cert, move it from the extra list to the + * untrusted list, then check if a matching certificate exists on + * the trusted list. If that is the case, warn the user, then + * remove the matching certificate from the trusted list. + */ + RB_FOREACH_SAFE(cert, cert_tree, &extra, tmp) { + RB_REMOVE(cert_tree, &extra, cert); + RB_INSERT(cert_tree, &untrusted, cert); + if ((other = RB_FIND(cert_tree, &trusted, cert)) != NULL) { + warnx("%s was previously trusted", cert->name); + warnx("source of trust: %s", other->path); + RB_REMOVE(cert_tree, &trusted, other); + free_cert(other); + } + } + warnx("This operation is not persistent. To persistently add"); + warnx("untrusted certificates to the system store, copy them to"); + warnx("one of these directories, then run `certctl rehash`:"); + for (i = 0; untrusted_paths[i] != NULL; i++) + warnx(" %s", untrusted_paths[i]); /* save everything */ ret = save_all(); diff --git a/usr.sbin/certctl/tests/certctl_test.sh b/usr.sbin/certctl/tests/certctl_test.sh index 74749db0b3f5..133d65854c42 100644 --- a/usr.sbin/certctl/tests/certctl_test.sh +++ b/usr.sbin/certctl/tests/certctl_test.sh @@ -271,7 +271,8 @@ untrust_body() crtfile=usr/share/certs/trusted/${crtname}.crt check_trusted "${crtname}" check_in_bundle ${crtfile} - atf_check certctl untrust "${crtfile}" + atf_check -e match:"1 new untrusted" \ + certctl untrust "${crtfile}" check_untrusted "${crtname}" check_not_in_bundle ${crtfile} } From nobody Thu May 7 18:59:18 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBM4D199Wz6d26R for ; Thu, 07 May 2026 18:59: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 4gBM4C5Q9kz43Q7 for ; Thu, 07 May 2026 18:59:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778180363; 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=0KkAggV5ZCGnvb5KrxkJ0hi/nwEmJUN3r6GyOivNCd8=; b=lk6+7ldB9R9SRCVipo6du8dVqru6xJU0VYASCIOBxjw16C35uH0/1rDc7/M/3I7NhWypyG IhC0i5NXkCvEtLJIrz/LeZ1ZspG2cxsXh9z497Y7FKswDdssGp0B6Cv0RlgkRj40tWlCw/ dW2IhxCBEaPxd039uuRy/nFD/16ddWicxPNhpHxkFvnogCMB0A6bQYr5KmeCKk9xZUjatV kcFOKYQ7vRG4tYJtj472mp9ksdgcAIMqIcGCEcBvUNjUFs9m0tr+QqNYwTdQG/H5M2oWmH qx+xbpKQokVU1nmprTVBlwzpfew12DS+i6MVGq4m9YKefe7BKsTPpTjWADCDpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778180363; a=rsa-sha256; cv=none; b=Fca65Azf7v90XoPVQ1kd2xwFyOITYQqYsgnT1ut/Bg8W/oqe2gn01j0At9vHF5mNvlorxz jmMbQhXHUdqslXCX9YGcF2tKxpZakLVUnkePqtLTAi36hFjZAEGhs2UCqEHgOkrsPJEPyG StS9xBPC/Ry24NLt3JSfqJDocznY1hnaLkrjWmiJvGoQfWf7/FlLJ97NQfy7JFAh5cQZyv Pr4IyMSa+p3B+Vbwu12LwqIUc53SWhYsj1PVTqVynbSQWm1V0+bfC49cJeN6BP7OgB7bcX LuNLjavQF3MpCKOGnLBk/iDDQNqt+MDiDfaRNlsv9wj6reqWNpTu7bJd2tJRgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778180363; 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=0KkAggV5ZCGnvb5KrxkJ0hi/nwEmJUN3r6GyOivNCd8=; b=yPN9yrCJTj8KC8NShI139i4+EYmTvrC54xZJTnDzmTKburYJcCGUCR3HQM025zlgFQXMez M+aarKZs4L3//IKGCoGSYSaRtXtT9u42TxnVircfhe0IbCkgF7b9SbKqNEq/PARRATVs5y j0TTW6GJeOiFcACHaQYKKuHEw+Yt/rPiPMTvjVnspzgvMN9yL5JW2tz0FrHEop/Yqyi7Q3 I/pzd5DLonEB8QpAYW9PJb3r3oAmhxuNfHjB3S1TiVCt9DP923+UTwbMAPiOLUu/pzzFKk 1iCa+0AoOrW552JdlhypC+zbZZF+cU5/dRNRn2nkbmnp7NdIPqMU2p9IlilRdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBM4C3MKMzftD for ; Thu, 07 May 2026 18:59:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 449d3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 18:59:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Kyle Evans From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 88f5520fa564 - stable/15 - stat: fix use of devname(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 88f5520fa564ef1050bab6e091ead4040eb6d170 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 18:59:18 +0000 Message-Id: <69fce106.449d3.33288d22@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=88f5520fa564ef1050bab6e091ead4040eb6d170 commit 88f5520fa564ef1050bab6e091ead4040eb6d170 Author: Kyle Evans AuthorDate: 2026-05-01 03:00:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-07 18:46:54 +0000 stat: fix use of devname(3) Besides being a little hard to parse through visually, this had its own bug of inspecting st->st_mode to determine what to pass to devname(3), which is only correct for st_rdev. For st_dev, you're likely to be looking at files or directories and attempting to assess what device they're located on, so the mode is meaningless- we just have to assume that our filesystems are on character devices and attempt to resolve st_dev as such. Reviewed by: des, kib (previous version) Differential Revision: https://reviews.freebsd.org/D56565 (cherry picked from commit 4d4acdbfc22c84081037f31cff4fb03d18373036) stat: The devname test case requires root Fixes: 4d4acdbfc22c ("stat: fix use of devname(3)") (cherry picked from commit 72b1aae09bf0bcc01c76df757699e27ad7cf7ecc) stat: Set the timezone before testing -t flag The test assumes UTC, which is what I use on my development systems and clearly what is used on our CI runners. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D56836 (cherry picked from commit 49e496d2776870fb36ed8ea4c8139b5eb9f7f747) stat: Expand devname test case Test what happens when we ask for the rdev of a non-device. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D56838 (cherry picked from commit 2c88636e0e7a0316d5e6d146874bdb2751f75c40) --- usr.bin/stat/stat.c | 14 +++++++++++--- usr.bin/stat/tests/stat_test.sh | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c index 0ed5d3ae5b53..ad2b3f9fb3d1 100644 --- a/usr.bin/stat/stat.c +++ b/usr.bin/stat/stat.c @@ -650,6 +650,7 @@ format1(const struct stat *st, struct timespec ts; struct tm *tm; int l, small, formats; + mode_t dtype; tsp = NULL; formats = 0; @@ -665,9 +666,16 @@ format1(const struct stat *st, small = (sizeof(st->st_dev) == 4); data = (what == SHOW_st_dev) ? st->st_dev : st->st_rdev; #if HAVE_DEVNAME - sdata = devname(what == SHOW_st_dev ? st->st_dev : - st->st_rdev, S_ISCHR(st->st_mode) ? S_IFCHR : - (S_ISBLK(st->st_mode) ? S_IFBLK : 0)); + switch (what) { + case SHOW_st_dev: + dtype = S_IFCHR; + break; + case SHOW_st_rdev: + dtype = st->st_mode & (S_IFCHR | S_IFBLK); + break; + } + + sdata = devname(data, dtype); #endif /* HAVE_DEVNAME */ if (hilo == HIGH_PIECE) { data = major(data); diff --git a/usr.bin/stat/tests/stat_test.sh b/usr.bin/stat/tests/stat_test.sh index 6043686396be..aa8563c62ccc 100755 --- a/usr.bin/stat/tests/stat_test.sh +++ b/usr.bin/stat/tests/stat_test.sh @@ -1,7 +1,7 @@ # # Copyright (c) 2017 Dell EMC # All rights reserved. -# Copyright (c) 2025 Klara, Inc. +# Copyright (c) 2025-2026 Klara, Inc. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -25,6 +25,9 @@ # SUCH DAMAGE. # +: ${CHKPATH:="mnt"} +: ${NODEV:="#NODEV"} + atf_test_case F_flag F_flag_head() { @@ -232,9 +235,9 @@ t_flag_head() { atf_set "descr" "Verify the output format for -t" } - t_flag_body() { + export TZ=UTC atf_check touch foo atf_check touch -d 1970-01-01T00:00:42 foo atf_check -o inline:'42\n' \ @@ -301,6 +304,38 @@ x_flag_body() done } +atf_test_case devname cleanup +devname_head() +{ + atf_set "descr" "Verify that %Sd outputs a device name" + atf_set "require.user" "root" +} +devname_body() +{ + local devname devpath + + atf_check -o save:dev mdconfig -t malloc -s 16M + read devname < dev + devpath="/dev/$devname" + atf_check -o not-empty newfs "$devpath" + + atf_check mkdir "$CHKPATH" + atf_check mount "$devpath" "$CHKPATH" + + atf_check -o inline:"$devname\n" stat -f '%Sd' "$CHKPATH" + atf_check -o inline:"$devname\n" stat -f '%Sr' "$devpath" + atf_check -o inline:"$NODEV\n" stat -f '%Sr' "$CHKPATH" +} +devname_cleanup() +{ + if [ -d "$CHKPATH" ]; then + umount "$CHKPATH" || true + fi + if [ -f dev ]; then + mdconfig -d -u $(cat dev) || true + fi +} + atf_init_test_cases() { atf_add_test_case F_flag @@ -315,4 +350,5 @@ atf_init_test_cases() atf_add_test_case s_flag atf_add_test_case t_flag atf_add_test_case x_flag + atf_add_test_case devname } From nobody Thu May 7 18:59:38 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBM4V3B9gz6d1t9 for ; Thu, 07 May 2026 18:59: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 4gBM4V0lhwz43np for ; Thu, 07 May 2026 18:59:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778180378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KHCtDgOEO6cgy4MjcPLh78nRAG5rmI675rtUoBrNEvI=; b=NOazRjHyG7hdSTV3WQNr8WqDj3SlhrW3uIoUAp915SMFlMjkMIW0amCZtjANGQnfU2owEJ nqUnJXyYwYLYagsa9NUvl9QK1pdO1v7iMv9mS660G4OSJTtkBrVRJvgb3z7Zze9p1LSZO2 jBtLLPYWnrq+aKX/LSuLkYMadT0XKNC+z5N7xnkaI4tYUpR3IDc7k/BuTqf0ytBwR6ujwA 3kzbWJU0uHw57huy7iW3FM3iEhrjgr8rItlMKTP8KoPkh6Ug5nfRp8CEQ1C6DUmvDqjPcz AEbCuwJPqbL1gIR35wILpKxW2ViRmZSbQHU+D/2oDYdIn+mg88858NuKh1LpQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778180378; a=rsa-sha256; cv=none; b=sQpHSc+fhNsjvG3N/+odJBH/YCQp3NmXc0dXX4vhWk1XYJEt32tCmYz1CQpLkpnvGpULMr dsZRTJLr+nAf+9KaINYnTcG/19mR/pzzfP7NOwXnm1eBzF4kfFMi4bWF4lLwEULJnK7VYJ bDwM9QlKLVkCGqFGW6YNivAeAdNT5KkwW2EEJPuumnarnrn/j/jDMklxVneZSy3RQj71Nm 4SLRzVW6iqbioIuM/kJxZybTn6SUuKLohfpsxvi9eymw91gg9s74BJTTEVMcKnqC67+d8X vc2qXRvFuxbXlISMOdaaZBQci0r6D0fQjKJhkfJidsZ9W+1MMhAN2UZBW+Nkww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778180378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KHCtDgOEO6cgy4MjcPLh78nRAG5rmI675rtUoBrNEvI=; b=Zqs+mO9KF/zk+YhijmdqH6BqhkIUlcxRitDe2hP/PsGHg/8nQMP3xeEfN5CjpQ5+41dco5 k0oCEGS3qSsg9kseomo0u+nzEV+lxj1tH2vN08qAGt6gKOiRm/cQB64tc/Q7scl5Le3D8Y jM2lh91AdyzV2ULBvm+sxtEWpumrGcPEbdrkZMbgz2Haeq54Wey9ZPZDgQmnEjeLVZKZuC XGsa8qluZSnaHyCaz2f90yDNX9OLLKc+kX010akkzmih5caICcCSzQyGCCOu2rXzBdIFUk CfJXZFvT4wjlbdAxpABs8v1BBHRQyjfPquGvxYbdNae4A9w/l0QSnYN/JYzvzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBM4V0FHYzfbm for ; Thu, 07 May 2026 18:59:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45265 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 18:59:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 219c49468f55 - stable/14 - vis.3: Try to better describe VIS_SAFE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 219c49468f55e3aee4fc3fdafeb9d2b9eae34016 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 18:59:38 +0000 Message-Id: <69fce11a.45265.5eae03a0@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=219c49468f55e3aee4fc3fdafeb9d2b9eae34016 commit 219c49468f55e3aee4fc3fdafeb9d2b9eae34016 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-04 12:08:10 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-07 18:54:28 +0000 vis.3: Try to better describe VIS_SAFE The current text fails to draw the reader's attention to the fact that VIS_SAFE essentially exempts certain characters from being encoded. While here, fix some markup nits. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56716 (cherry picked from commit 8acc4c16c6635c3cd8871d0ee1221b62d48d71b9) --- contrib/libc-vis/vis.3 | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/contrib/libc-vis/vis.3 b/contrib/libc-vis/vis.3 index 18329589d940..9b7b8152be3e 100644 --- a/contrib/libc-vis/vis.3 +++ b/contrib/libc-vis/vis.3 @@ -29,7 +29,7 @@ .\" .\" @(#)vis.3 8.1 (Berkeley) 6/9/93 .\" -.Dd April 22, 2017 +.Dd May 3, 2026 .Dt VIS 3 .Os .Sh NAME @@ -246,19 +246,22 @@ alter this: Also encode double quotes .It Dv VIS_GLOB Also encode the magic characters -.Ql ( * , +.Po +.Ql * , .Ql \&? , .Ql \&[ , and -.Ql # ) +.Ql # +.Pc recognized by .Xr glob 3 . .It Dv VIS_SHELL Also encode the meta characters used by shells (in addition to the glob characters): -.Ql ( ' , +.Po +.Ql ' , .Ql ` , -.Ql \&" , +.Ql \&\(dq , .Ql \&; , .Ql & , .Ql < , @@ -272,7 +275,8 @@ characters): .Ql \&! , .Ql \&^ , and -.Ql ~ ) . +.Ql ~ +.Pc . .It Dv VIS_SP Also encode space. .It Dv VIS_TAB @@ -286,13 +290,15 @@ Synonym for Synonym for .Dv VIS_WHITE | VIS_GLOB | VIS_SHELL . .It Dv VIS_SAFE -Only encode -.Dq unsafe -characters. -Unsafe means control characters which may cause common terminals to perform -unexpected functions. -Currently this form allows space, tab, newline, backspace, bell, and -return \(em in addition to all graphic characters \(em unencoded. +Leave +.Dq safe +characters unencoded. +Characters are only considered unsafe if they cause common terminals +to perform unexpected functions. +Setting the +.Dv VIS_SAFE +flag exempts the backspace, bell, and return characters from being +encoded. .El .Pp (The above flags have no effect for From nobody Thu May 7 19:06:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBMD401wFz6d2HY for ; Thu, 07 May 2026 19:06: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 4gBMD34W5Hz4528 for ; Thu, 07 May 2026 19:06:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778180771; 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=297Pp/0+oKXpjf0Ss7eMJ5ioW8JIFJzXk0gaM3AtUAA=; b=ivGSss5g8yUr5mChUaElCKDHO37f9l/+UDPjDWf24bC24mEmpJ+faHE1geZq4z9pfg23lV sL2c1a1goUU+lBQAau3SlfYcPvrQmwnjKPUsWeW929/6wiGHxMZbL06BrIT5R0AnADnps3 EkvUMbHT39jBWmIJReC2LSWkDRdcIL4reViGOh+x2E4VcLTaRVrGokMKwxQ64jLXsf8Ta9 uiXgyaizmJvGlwn1uGBE0xV+M67jIBXdX2Y/VwZIHILzc9jL+qBH4LWy6zC9ToFalydyXK gydKoPkAQYX7X8+a6MaRS61mNlnHrCV4TMDU2xkhqXKH66xnk53KNuj0zrtYxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778180771; a=rsa-sha256; cv=none; b=Qk5hq00oWeiHvA9x6Crqi+CMFkr0JruJilgRh7Rw/V0yBjEWpiJKsQC5b+YWm/ggioU/fm /y/BACeKjK5bHkeC2RotLbu/KdVuIjAKXVdfLZmb+r/fEWmnlUoz+f2DxJI6Bs1FLdcLmx fa5Z/VBta4pWk11pnURoTTryiYv9TSicf61kQi6z56cjStB6K3yvV6/58H+qD2L/liSg86 gGSwYaJI8bSxWi20QxcUN/n0+Jr14Z+TOo7lNa0/V9tgqUn4aJnNfE6Ov8kjrSkmP5Njy5 02h+65Id3Rep47x5OPT59ESjykHvIcSSSFHBdbBRMFEI8PajiMSVqFQwYFeMGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778180771; 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=297Pp/0+oKXpjf0Ss7eMJ5ioW8JIFJzXk0gaM3AtUAA=; b=k0K87HKidP4o2otqZec3h2bEsdK3nA0oLKxG11EQw7/wywArEo/cTYL+33xHciwHYKo2mm pDreuSI+WIE0xFodtL/ZMp7Ajr9z3+HwxcFwjoaQ+2n7TeOileorZqBX8xyOW8qQsLVq56 OfBjQsl4hwfZw4RT12g+jBOajJNajPJJHinZpqZA3VBjdcpGg59fRXoA2899Gs+9DqMVox ztssqWiOqDT093jLV7TzFEH5oninXGLzM06IsNmJTILCPlPFkzx4ELVmrrwGwvrbuGdzAY 8J+UNIjnr/DBJqCPkorpneD10NmTKMemtt8i7Co8hAmuY4lhT7MPZCaAsCwi5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBMD345VPzfv1 for ; Thu, 07 May 2026 19:06:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44f63 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 19:06:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: tickerguy From: Pouria Mousavizadeh Tehrani Subject: git: 18caefe84708 - stable/15 - rtadvd(8): Honor pltime/vltime in interface declarations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 18caefe847086a9e89812db600c852b225467090 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 19:06:06 +0000 Message-Id: <69fce29e.44f63.4372d537@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=18caefe847086a9e89812db600c852b225467090 commit 18caefe847086a9e89812db600c852b225467090 Author: tickerguy AuthorDate: 2025-09-29 16:05:29 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-07 19:04:43 +0000 rtadvd(8): Honor pltime/vltime in interface declarations Currently rtadvd ignores interface pltime/vltime specifications unless the (static) address range is also included in the config file. This extends the validity of a pltime and/or vltime stanza in the config file for an interface to delegated addresses from an upstream provider. Signed-off-by: tickerguy PR: 288426 Reviewed by: pouria Pull Request: https://github.com/freebsd/freebsd-src/pull/1863 (cherry picked from commit 103f9883d1ed7431c432caa6ab9c61cd4d0831d0) --- usr.sbin/rtadvd/config.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index 628ca3be886f..c02997337da3 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -1095,6 +1095,7 @@ get_prefix(struct rainfo *rai) ifi = rai->rai_ifinfo; for (ifa = ifap; ifa; ifa = ifa->ifa_next) { + int64_t val64; int plen; if (strcmp(ifa->ifa_name, ifi->ifi_ifname) != 0) @@ -1143,9 +1144,26 @@ get_prefix(struct rainfo *rai) "<%s> add %s/%d to prefix list on %s", __func__, ntopbuf, pfx->pfx_prefixlen, ifi->ifi_ifname); + MAYHAVE(val64, "vltime", DEF_ADVVALIDLIFETIME); + if (val64 < 0 || val64 > 0xffffffff) { + syslog(LOG_WARNING, + "<%s> vltime (%" PRIu64 ") for %s/%d on %s " + "is out of range, use default value instead.", __func__, + val64, ntopbuf, pfx->pfx_prefixlen, ifi->ifi_ifname); + pfx->pfx_validlifetime = DEF_ADVVALIDLIFETIME; + } else + pfx->pfx_validlifetime = val64; + MAYHAVE(val64, "pltime", DEF_ADVPREFERREDLIFETIME); + if (val64 < 0 || val64 > 0xffffffff) { + syslog(LOG_WARNING, + "<%s> pltime (%" PRIu64 ") for %s/%d on %s " + "is out of range, use default value instead.", __func__, + val64, ntopbuf, pfx->pfx_prefixlen, ifi->ifi_ifname); + pfx->pfx_preflifetime = DEF_ADVPREFERREDLIFETIME; + } else + pfx->pfx_preflifetime = val64; + /* set other fields with protocol defaults */ - pfx->pfx_validlifetime = DEF_ADVVALIDLIFETIME; - pfx->pfx_preflifetime = DEF_ADVPREFERREDLIFETIME; pfx->pfx_onlinkflg = 1; pfx->pfx_autoconfflg = 1; pfx->pfx_origin = PREFIX_FROM_KERNEL; From nobody Thu May 7 20:00:35 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBNQw1xlCz6d6YQ for ; Thu, 07 May 2026 20:00: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 4gBNQw1Fc7z3G0d for ; Thu, 07 May 2026 20:00:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778184040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y01ppdNtwnkOASAvu+46fAD6Sj9neys2S6v2lENG+98=; b=v4mkcr4ZQtAQRRoM+Na2sxdDnGj/PucCr+D3iTIS25P2uPAU6xrdwhjRNI7mXkZyktJUhQ I9H0CJxqWp9cohm7WIH/Ajd4bcMrMXRbNQ2kxa9+1IwlcBtX8ej2JWYRs7zBAw+SZUw0KY z1HjEmZ86nrKVnNYj3OwNQJat+Ek0WXWwWb8dVzE5ZtEksmO6oByAIqDC7bqb6q4jHuQVk ZN7fijDQvU04LEi2OXHgeSstynkyaYccR682U4GCDAXzLb2Ejj7sinSu94BbyFhvs6VOh0 4SKUpzJ+G8SHKQSp6zy5v13tdigUkAOz9pSi2GI5rQSr3ApRTt3KBUYXKVACYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778184040; a=rsa-sha256; cv=none; b=p5xFnnbsjcDequ/Lp64Jr8LGWKsMQdp3l8A8qS1bLeTprFxWoTV9KNS/UdOLFqPGJhry5j eF1K1ErXs9uqtpy0bQdnGMY+10LRK4NgBmXuYZDuNPNtMa4Wxaq6Q/MG5BDLKVmhbFiIPd MQt50Z3kPZL8bJGqO4KrvTybZY3jy/r7Fa7Uypj0wLLYs1SBHKfszqJkajQKsRAZG2rpO8 Rri+79yEkpmfgtZ1Be5D0zlVBLbR36hIjujhaylx90d1q2QqkWpxDSgjBTvU2/PApFxk/h 0RBX6opVwcnI0go2il59C70x7Hb9JqH0sJ9T/x94E918gSC9sNbmAbwCANaX5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778184040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y01ppdNtwnkOASAvu+46fAD6Sj9neys2S6v2lENG+98=; b=abe9lTxpRvfUopy2xuRqtE8Cp+o1pvtDik6MPiRyi935I/0sDLCEqF7ak5OrqlLuwp8v91 O3T4x4myRCpbfEtGB+h5kWiXvI/RljqRBHC9kZlz2q+M04IjtN6F5yNbDNtkhaQPAfNmcZ fGfxvQhSPD8ZslQ+LDmfxxKk2C57gZcOWmSKgBqK0jmUaAZt3DaruMtRCSU69tXsULX/vS Fb59OXd2Gi8Cyl/3RUtPzT/BI4geQJIWUYwbKBQHQ9D4s1PxMSijeHbzG9NYewfJ6HbIq1 ka1uCOKQqrfopIW9Ob0K5fKgqgqRLJAx8X+VUzgNpSuX/8SRbtKVc2ppuSumig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBNQw0YD3zhJv for ; Thu, 07 May 2026 20:00:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e649 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 20:00:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8eef59db2542 - main - vm_map_growstack(): use local for p->p_vmspace List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8eef59db254283eaaee47be94d4ea9f2fef4f2ad Auto-Submitted: auto-generated Date: Thu, 07 May 2026 20:00:35 +0000 Message-Id: <69fcef63.1e649.1c12c448@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8eef59db254283eaaee47be94d4ea9f2fef4f2ad commit 8eef59db254283eaaee47be94d4ea9f2fef4f2ad Author: Konstantin Belousov AuthorDate: 2026-05-07 19:58:18 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-07 19:58:18 +0000 vm_map_growstack(): use local for p->p_vmspace Noted by: alc Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/vm/vm_map.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 7ead7d7e6472..94dd7d3a19bc 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4761,8 +4761,7 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) * debugger or AIO daemon. The reason is that the wrong * resource limits are applied. */ - if (p != initproc && (map != &p->p_vmspace->vm_map || - p->p_textvp == NULL)) + if (p != initproc && (map != &vm->vm_map || p->p_textvp == NULL)) return (KERN_FAILURE); MPASS(!vm_map_is_system(map)); From nobody Thu May 7 20:19:14 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBNrM1wTxz6d7vV for ; Thu, 07 May 2026 20:19: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 4gBNrM0FqLz3HQf for ; Thu, 07 May 2026 20:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778185155; 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=ucO2mZDRpDlYUN94oyP+ZngcJML0iYz9auZI7wyr0xE=; b=Oye5XDDsAXdtNPSQsuHUsWje1Ra7DMWayz33Kdf/lfE+rzQAD7vJfbZCErR0lOYpy3jIE6 A+WDbqkGmnG9+Gy18YrdJ7QeQzMxqfzdephQdZSdAtldsdj2JBMxEio5aQnmfuj0cx/kb4 PrBaoFhOAKir/MI3x75DnsWrwk2iIAOgSh9H3iC7qlNv8R8tMj6UXR8EtdSwDZ9wsWqzMY xfh2/Qiuir2V9hP04JFez0JYSqxpX/ENVId594r3ITJBYwoCTJm5zMttWZwsRr2HU0lT97 zlamuznyUaIraIkAqcYsmbVvbxIC9HftVK0GAAhnKR90q6JQer1riF3R2C8VCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778185155; a=rsa-sha256; cv=none; b=fT1oFd5Zi1+M9w7XdpLRGwDMlFWb/1V9VCxHKDtC//qvg/Z2s5D0XFe6R0EBX0nwVXObV4 uhEKgx/vRAYSmw9+aE/0tHSbrLNXaQRfxAnodihkcC/3vjeUqXuiz9kOtE5XJ0A/HOKBxs a/YbhJjYPAXDmS5MytVwLGpp1xh/Yr1SGtPvnj265MgLV4IUBu3uRdbAB4RS++jV/zE0SX CCBtp32askuNnekG2O/s/k3EczczAbDKJ8gcunpta17tmvzWTlFQ1mxf5d1qFEdc0e0604 owgV5EQJ3oX4NWhVtL+t60NuVg8Y+pTZZf3kS47bdxqttm1yxsvBTn09GvfIbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778185155; 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=ucO2mZDRpDlYUN94oyP+ZngcJML0iYz9auZI7wyr0xE=; b=R9z9VTmWFcEW3PJ1tYvAAe6wve14zPJz+nMJxKcVPmm/izv8P/Q5tMFXnfgkqvfH9uAfK0 h0X5+rI5ENQLbB6u5xDCL+YnN6UCmtRxUAdSzlRxKWKelEv3lSpEZ0//lu1OLcbB0ejA58 GM+1KzwGbVYfAPNuThdZUYfoEgHKtx1yiu5uNNOkgDevxBFKrS9/LdwiRCzM8FbRYtgTKe iT6rdPNo2THhrIyaK8FsBZYMmP+wIMINlj3d2dsCJmBy92rV1YQxIHeiK6qrSyzPonK0EN 4863Cp/1bhcYBdF6TbK4aMml+sTRzlcHBwn6PmfwQaU5R0Tqsuuqp/ZsQUMLvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBNrL66fczhx6 for ; Thu, 07 May 2026 20:19:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f0e8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 20:19:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Baptiste Daroussin From: Colin Percival Subject: git: 56a5d11dd69f - releng/15.1 - nlsysevent: add manpage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 56a5d11dd69f726ca2455139c885146906c53de0 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 20:19:14 +0000 Message-Id: <69fcf3c2.1f0e8.575f2296@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=56a5d11dd69f726ca2455139c885146906c53de0 commit 56a5d11dd69f726ca2455139c885146906c53de0 Author: Baptiste Daroussin AuthorDate: 2026-04-09 08:50:41 +0000 Commit: Colin Percival CommitDate: 2026-05-07 20:18:46 +0000 nlsysevent: add manpage Approved by: re (cperciva) Reviewed by: des (cherry picked from commit 72d701eb1d83cfb3479e4c839412325ff9efc97c) (cherry picked from commit ee2fc974e0716040622926c7c8ca8df09284e6f9) --- share/man/man4/Makefile | 1 + share/man/man4/nlsysevent.4 | 132 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 62d0b8f77f0f..23057e016f7d 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -428,6 +428,7 @@ MAN= aac.4 \ ng_vjc.4 \ ng_vlan.4 \ ng_vlan_rotate.4 \ + nlsysevent.4 \ nmdm.4 \ ${_ntb.4} \ ${_ntb_hw_amd.4} \ diff --git a/share/man/man4/nlsysevent.4 b/share/man/man4/nlsysevent.4 new file mode 100644 index 000000000000..3b46ab65f568 --- /dev/null +++ b/share/man/man4/nlsysevent.4 @@ -0,0 +1,132 @@ +.\" +.\" Copyright (c) 2026 Baptiste Daroussin +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd April 9, 2026 +.Dt NLSYSEVENT 4 +.Os +.Sh NAME +.Nm nlsysevent +.Nd Netlink-based kernel event notification module +.Sh SYNOPSIS +To load the driver as a module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +nlsysevent_load="YES" +.Ed +.Pp +Alternatively, to load the module at runtime: +.Bd -literal -offset indent +kldload nlsysevent +.Ed +.Sh DESCRIPTION +The +.Nm +kernel module provides a +.Xr netlink 4 +Generic Netlink interface for receiving kernel device events. +It hooks into the +.Xr devctl 4 +notification system and re-publishes all kernel events as Generic Netlink +multicast messages under the +.Dv NETLINK_GENERIC +protocol family. +.Pp +This provides an alternative to reading events from +.Pa /dev/devctl +.Pq used by Xr devd 8 , +with the advantage that multiple consumers can subscribe to events +simultaneously, and consumers can selectively subscribe to specific +event groups. +.Ss Generic Netlink Family +The module registers a Generic Netlink family named +.Dq Li nlsysevent . +The dynamically-assigned family identifier can be resolved using the +standard +.Dv CTRL_CMD_GETFAMILY +request as described in +.Xr genetlink 4 . +.Ss Commands +The following command is defined: +.Bl -tag -width indent +.It Dv NLSE_CMD_NEWEVENT +Sent when a kernel event occurs. +This message is never solicited by userland; it is only delivered to +sockets that have subscribed to one or more multicast groups. +.El +.Ss Attributes +Each +.Dv NLSE_CMD_NEWEVENT +message contains the following TLV attributes: +.Bl -tag -width indent +.It Dv NLSE_ATTR_SYSTEM +(string) The system name that generated the event +.Pq e.g., Dq Li ACPI , Dq Li IFNET , Dq Li USB . +.It Dv NLSE_ATTR_SUBSYSTEM +(string) The subsystem name within the system. +.It Dv NLSE_ATTR_TYPE +(string) The type of the event. +.It Dv NLSE_ATTR_DATA +(string) Optional extra data associated with the event. +This attribute may be absent if no extra data was provided. +.El +.Ss Multicast Groups +The module creates one multicast group per system name. +The following groups are pre-registered when the module is loaded: +.Pp +.Bl -column "HYPERV_NIC_VF" -offset indent -compact +.It Li ACPI +.It Li AEON +.It Li CAM +.It Li CARP +.It Li coretemp +.It Li DEVFS +.It Li device +.It Li ETHERNET +.It Li GEOM +.It Li HYPERV_NIC_VF +.It Li IFNET +.It Li INFINIBAND +.It Li KERNEL +.It Li nvme +.It Li PMU +.It Li RCTL +.It Li USB +.It Li VFS +.It Li VT +.It Li ZFS +.El +.Pp +Additional groups are created dynamically as new system names appear in +kernel events, up to a maximum of 64 groups. +.Pp +The group identifier for a given system name can be resolved via +.Dv CTRL_CMD_GETFAMILY +and then subscribed to using the +.Dv NETLINK_ADD_MEMBERSHIP +socket option. +.Sh EXAMPLES +The +.Xr genl 1 +utility can be used to monitor events: +.Bd -literal -offset indent +genl monitor nlsysevent +.Ed +.Sh SEE ALSO +.Xr genl 1 , +.Xr snl 3 , +.Xr devctl 4 , +.Xr genetlink 4 , +.Xr netlink 4 , +.Xr devd 8 +.Sh HISTORY +The +.Nm +module first appeared in +.Fx 15.0 . +.Sh AUTHORS +The +.Nm +kernel module and this manual page were written by +.An Baptiste Daroussin Aq Mt bapt@FreeBSD.org . From nobody Thu May 7 20:19:15 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBNrN2rXDz6d7sh for ; Thu, 07 May 2026 20:19:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBNrM6z7Mz3HqP for ; Thu, 07 May 2026 20:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778185156; 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=RU6Olh2ECJ7pZHVEunOTC8tnd+RVFCI8FTaM2YDCWgU=; b=u+0U85LF64tG8matOhhH41n2CALrQCkOFFeSfuES8F39HXTIhjwVE2wKNOe/QoUIc/CrxK +cMwlck8gFQfBZEzMtCLBcbCMRE9lBUqIhozm8lJMJNOcZix4j+MRv0GOPwfn+c8g8N7tT P4s2ks8LCnZohAYkYeeQb2dn+p3PXddzdrnd7HM20fbCpo0dw5nnj0MkKBMs2C1peR0TXn hQBH26NKGwoloYHh/PyK5sxjOT25jjtu4DuJElcSDpu1Pfkbdr+3nWB6xPfN45vwrZMMIc KSHKLTIfFBICeIF97KUcJjJxqQX2IOOiLm6RxLiL7kZkaf4FTxTOtVvqW79azg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778185156; a=rsa-sha256; cv=none; b=hUjUQqAcc+Jq805Wdnbrafcy1VvN14A5fSVnf58KwoF83Ltf5HDM9Q8EQxJj8usLN9Ge59 o0AbwcEa0UB2cA/mXjewaQOJp9ppot9S+pdbpme9AAh8061PJfmCxw4+J4rjo1ZcshcOId QN1IMRyIkX8Ts+YlVZBGabW7uJ9GYOR5jpHznxICbzZZRAoLakDjMHJRgQ0G3CglyoFbL3 xspqd5ZVPAmUeZ2z/lNSJAGFfW0mGVjZ74whjMYCpf0Q9Lp+pCg6OdKV9s1ST6g+gpBbMJ xN0ewfyuWWq6GlFXCuQ7qNbeShsL2rN8hFj+bcNA51qzAYxwIg+0wgGbkbglUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778185156; 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=RU6Olh2ECJ7pZHVEunOTC8tnd+RVFCI8FTaM2YDCWgU=; b=pfqIFpE4d+2nYjWX20fTsOWeSRr8FspT7uH6w5bKzz0haDp2ymib54H4U9WcKHfw+uRyu2 YsUFhTeGv3VJDxJnCeHE3hYbdKCBE0HL7XrExJmuFoEMHYy1mYqppavYOOmxzrNtKVG1s/ YF/nPNcKOGmJ2tjbtk284436+FZoYNg/4ltWCcDDetDpBTGOONkEBMHQSfUO1CQSJjSDmi dKuBTIR+FBqR6crNOdHiMyqr+0ZM3V9qWHWTWRCc8ATjLWX0r+7I8gs6HECyGsHHb3oih+ 28YIJ0J8XW3nxiUhZVBe8T3nE3vJ6h/ihAMY4t6IyruQs/nZQEs41QuKHRsB7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBNrM6Tddzh10 for ; Thu, 07 May 2026 20:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e7e0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 20:19:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Kyle Evans From: Colin Percival Subject: git: 60a521a8941c - releng/15.1 - stat: fix use of devname(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 60a521a8941c4b0386dff3a925bae431b3064fcb Auto-Submitted: auto-generated Date: Thu, 07 May 2026 20:19:15 +0000 Message-Id: <69fcf3c3.1e7e0.73079593@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=60a521a8941c4b0386dff3a925bae431b3064fcb commit 60a521a8941c4b0386dff3a925bae431b3064fcb Author: Kyle Evans AuthorDate: 2026-05-01 03:00:26 +0000 Commit: Colin Percival CommitDate: 2026-05-07 20:18:48 +0000 stat: fix use of devname(3) Besides being a little hard to parse through visually, this had its own bug of inspecting st->st_mode to determine what to pass to devname(3), which is only correct for st_rdev. For st_dev, you're likely to be looking at files or directories and attempting to assess what device they're located on, so the mode is meaningless- we just have to assume that our filesystems are on character devices and attempt to resolve st_dev as such. Approved by: re (cperciva) Reviewed by: des, kib (previous version) Differential Revision: https://reviews.freebsd.org/D56565 (cherry picked from commit 4d4acdbfc22c84081037f31cff4fb03d18373036) stat: The devname test case requires root Fixes: 4d4acdbfc22c ("stat: fix use of devname(3)") (cherry picked from commit 72b1aae09bf0bcc01c76df757699e27ad7cf7ecc) stat: Set the timezone before testing -t flag The test assumes UTC, which is what I use on my development systems and clearly what is used on our CI runners. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D56836 (cherry picked from commit 49e496d2776870fb36ed8ea4c8139b5eb9f7f747) stat: Expand devname test case Test what happens when we ask for the rdev of a non-device. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D56838 (cherry picked from commit 2c88636e0e7a0316d5e6d146874bdb2751f75c40) (cherry picked from commit 88f5520fa564ef1050bab6e091ead4040eb6d170) --- usr.bin/stat/stat.c | 14 +++++++++++--- usr.bin/stat/tests/stat_test.sh | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c index 0ed5d3ae5b53..ad2b3f9fb3d1 100644 --- a/usr.bin/stat/stat.c +++ b/usr.bin/stat/stat.c @@ -650,6 +650,7 @@ format1(const struct stat *st, struct timespec ts; struct tm *tm; int l, small, formats; + mode_t dtype; tsp = NULL; formats = 0; @@ -665,9 +666,16 @@ format1(const struct stat *st, small = (sizeof(st->st_dev) == 4); data = (what == SHOW_st_dev) ? st->st_dev : st->st_rdev; #if HAVE_DEVNAME - sdata = devname(what == SHOW_st_dev ? st->st_dev : - st->st_rdev, S_ISCHR(st->st_mode) ? S_IFCHR : - (S_ISBLK(st->st_mode) ? S_IFBLK : 0)); + switch (what) { + case SHOW_st_dev: + dtype = S_IFCHR; + break; + case SHOW_st_rdev: + dtype = st->st_mode & (S_IFCHR | S_IFBLK); + break; + } + + sdata = devname(data, dtype); #endif /* HAVE_DEVNAME */ if (hilo == HIGH_PIECE) { data = major(data); diff --git a/usr.bin/stat/tests/stat_test.sh b/usr.bin/stat/tests/stat_test.sh index 6043686396be..aa8563c62ccc 100755 --- a/usr.bin/stat/tests/stat_test.sh +++ b/usr.bin/stat/tests/stat_test.sh @@ -1,7 +1,7 @@ # # Copyright (c) 2017 Dell EMC # All rights reserved. -# Copyright (c) 2025 Klara, Inc. +# Copyright (c) 2025-2026 Klara, Inc. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -25,6 +25,9 @@ # SUCH DAMAGE. # +: ${CHKPATH:="mnt"} +: ${NODEV:="#NODEV"} + atf_test_case F_flag F_flag_head() { @@ -232,9 +235,9 @@ t_flag_head() { atf_set "descr" "Verify the output format for -t" } - t_flag_body() { + export TZ=UTC atf_check touch foo atf_check touch -d 1970-01-01T00:00:42 foo atf_check -o inline:'42\n' \ @@ -301,6 +304,38 @@ x_flag_body() done } +atf_test_case devname cleanup +devname_head() +{ + atf_set "descr" "Verify that %Sd outputs a device name" + atf_set "require.user" "root" +} +devname_body() +{ + local devname devpath + + atf_check -o save:dev mdconfig -t malloc -s 16M + read devname < dev + devpath="/dev/$devname" + atf_check -o not-empty newfs "$devpath" + + atf_check mkdir "$CHKPATH" + atf_check mount "$devpath" "$CHKPATH" + + atf_check -o inline:"$devname\n" stat -f '%Sd' "$CHKPATH" + atf_check -o inline:"$devname\n" stat -f '%Sr' "$devpath" + atf_check -o inline:"$NODEV\n" stat -f '%Sr' "$CHKPATH" +} +devname_cleanup() +{ + if [ -d "$CHKPATH" ]; then + umount "$CHKPATH" || true + fi + if [ -f dev ]; then + mdconfig -d -u $(cat dev) || true + fi +} + atf_init_test_cases() { atf_add_test_case F_flag @@ -315,4 +350,5 @@ atf_init_test_cases() atf_add_test_case s_flag atf_add_test_case t_flag atf_add_test_case x_flag + atf_add_test_case devname } From nobody Thu May 7 20:19:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBNrP326Nz6d7kJ for ; Thu, 07 May 2026 20:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBNrP0vvyz3Hn0 for ; Thu, 07 May 2026 20:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778185157; 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=pj9nwGlLE3iktIlS/ozUyY9RL449XV//l3XIYoxyA9U=; b=E7S4uRWZ5pNxrbnf81nyQwVkNoPgUF0XBI97siZbjH2xcDVqvEnvZNeGVMaONm2iBQ1+2C O9TRF5Fw+FRkV7AeD+xjHMsFXkVeHnZ+lGUWiLt9+/6IjhNEBHj8K4+3YgPZsZr3FHD57P h8jzh1+e75T/WjOQo3BfWcwNb3VEJMh4c5RdREDve7EVAWwnkeJ2DBBMC/KH0WZRJlK4SS zledJWt1POEJ6OXJuwuM1C7RbNztRBptYTKxscJlTmEKLIsyKyWJsyv9mR5NhKgkrIvGF7 HeHoZCRHhxlT4KqGeepZ3ls9EngqQTyPSje9lb/nsw7as0YOgembdOKW4XUYSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778185157; a=rsa-sha256; cv=none; b=E6AHf0A0GkeIA+AWXFbmBKS/BZu/luvuAv8Msht6N5mUA3HvDzwYldyy1ptIRuA8IMhV5u qqkYoOLkSUZpOWrB5G2aPup5NNhZZOJvS5K7Q6qParWY1/dmCdFYakKbXzJIu8L8noHqAD na6hWDrPO2HpM0WKtNPVdjN37sDANn+pjHHLYyxDgOms6eOtS8bcGWSnDvZ+6LCssLVNt9 xaDzvJo4ZjqqmLcrRvQcaf01n/rWFA99M0a4tiBNbjlVPFVq/5YO3eiQuFiE22jTdMZ2yv b9LYnasyVDfobC3S98CwC4j6rPBhea07CiCk8xJBH5HiOK1I1L+8zSnVBattgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778185157; 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=pj9nwGlLE3iktIlS/ozUyY9RL449XV//l3XIYoxyA9U=; b=jprXlEweCg/HSyOBcO28ynIV33AAyaTNXWZSDtOIrNJPTjLqEIN1EnFTaffNzy+fIuRsqq wBFjMwgsgs0iBoRV6fYgF+LsuFGcX3F+SqigW8EP2VQV7vK1TTeegbkk3P1RTyxuMRI3iz 94Zsa2V4aPnaOqfxcJRqb4IOYNP/ivCYDENKFEdxAQcXS5QbFdGOj023HUvI82oDQjWSoN CABo65e9pddNgTOuLgRqTkuOhxSloSLgrzDufC6nr4TY2OS2nOr7b+oYcnKXtlLpCzi1MR PhhXhUi7g1g5M4PH4I1gsmoUwkUJ4i5MwfkwF0HXchLOuuhfbdE/nwKLEvIIig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBNrP09bczhLW for ; Thu, 07 May 2026 20:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f3fa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 20:19:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Colin Percival Subject: git: 1981ce9f03dc - releng/15.1 - vis.3: Try to better describe VIS_SAFE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 1981ce9f03dc6d92e4351b7a88e7df15f6d21fe1 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 20:19:17 +0000 Message-Id: <69fcf3c5.1f3fa.61949859@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1981ce9f03dc6d92e4351b7a88e7df15f6d21fe1 commit 1981ce9f03dc6d92e4351b7a88e7df15f6d21fe1 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-04 12:08:10 +0000 Commit: Colin Percival CommitDate: 2026-05-07 20:18:53 +0000 vis.3: Try to better describe VIS_SAFE The current text fails to draw the reader's attention to the fact that VIS_SAFE essentially exempts certain characters from being encoded. While here, fix some markup nits. Approved by: re (cperciva) MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56716 (cherry picked from commit 8acc4c16c6635c3cd8871d0ee1221b62d48d71b9) (cherry picked from commit b21f08f97ba0c1e254b55e2ac66ec6853ad281f7) --- contrib/libc-vis/vis.3 | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/contrib/libc-vis/vis.3 b/contrib/libc-vis/vis.3 index 18329589d940..9b7b8152be3e 100644 --- a/contrib/libc-vis/vis.3 +++ b/contrib/libc-vis/vis.3 @@ -29,7 +29,7 @@ .\" .\" @(#)vis.3 8.1 (Berkeley) 6/9/93 .\" -.Dd April 22, 2017 +.Dd May 3, 2026 .Dt VIS 3 .Os .Sh NAME @@ -246,19 +246,22 @@ alter this: Also encode double quotes .It Dv VIS_GLOB Also encode the magic characters -.Ql ( * , +.Po +.Ql * , .Ql \&? , .Ql \&[ , and -.Ql # ) +.Ql # +.Pc recognized by .Xr glob 3 . .It Dv VIS_SHELL Also encode the meta characters used by shells (in addition to the glob characters): -.Ql ( ' , +.Po +.Ql ' , .Ql ` , -.Ql \&" , +.Ql \&\(dq , .Ql \&; , .Ql & , .Ql < , @@ -272,7 +275,8 @@ characters): .Ql \&! , .Ql \&^ , and -.Ql ~ ) . +.Ql ~ +.Pc . .It Dv VIS_SP Also encode space. .It Dv VIS_TAB @@ -286,13 +290,15 @@ Synonym for Synonym for .Dv VIS_WHITE | VIS_GLOB | VIS_SHELL . .It Dv VIS_SAFE -Only encode -.Dq unsafe -characters. -Unsafe means control characters which may cause common terminals to perform -unexpected functions. -Currently this form allows space, tab, newline, backspace, bell, and -return \(em in addition to all graphic characters \(em unencoded. +Leave +.Dq safe +characters unencoded. +Characters are only considered unsafe if they cause common terminals +to perform unexpected functions. +Setting the +.Dv VIS_SAFE +flag exempts the backspace, bell, and return characters from being +encoded. .El .Pp (The above flags have no effect for From nobody Thu May 7 20:19:18 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBNrQ6bmQz6d7vZ for ; Thu, 07 May 2026 20:19: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 4gBNrQ41Ftz3Hst for ; Thu, 07 May 2026 20:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778185158; 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=9NTkOc7m/aMPyflMic6vVBzIV0ksh5uWY2F5lRAB7aI=; b=jM9boVP9xuWFNZ4P66slMlyqx90UbZph/fl3/YbatLS0GQ7HcZi1CD9wZPj2wbQXXBNcZg 7JqmWw0V7Q+SivdPCOATD9LCDxP2ynOncUqWgEWUDH5gA/je6f5YaJtH5UqPcNYU2OtvX3 ZsCPXBwR2InERtFKqNnD26s1o4qHBfW7W4E+C3EU/6w9ePRlJcPgWszw2TXwsOdbsKiMB5 hYhakhkqnnva9UUFrOiezleOFBIwD2SRUFhpb9dOF7MfSd6NHM9XhlZ/hwVo5a1Y3v0iV/ KpGAs/lHo4q/KdcoJY2MskYqMInFXsUYyDH7Vy62/UtfUlO/A7VpWos3ZwIHQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778185158; a=rsa-sha256; cv=none; b=l3ZrGu5+t4lIoN8A2uv6QsbE/C1GUjDN9z92eyQXzfwqX5OxDZxu9WqhYa8k/6AbdVl66+ pjnRaAwfL/WfUNehUjFktM+5WUS+LRSiiNLi4pk6EYZjpNS9+mQQ1avk+xLz/2ZvEe4mjF Tl83zorXEAyg9S5NbAyGM0Ifo3qX6bWZsbpku6LKQ6GMzlHklUKVAFi2MRBhKyBeZ7wcAl qx1ZFCIMkxpL9+4JPYNcom76UsYkNfAvZjkumKez4QmNsCFGc6KT9xhmSPprMMnDr3sf+A oKfoeyiGEM9hBKTbR47gkVpmxIFQ0Y9MnSt8vAtQqUdximAmrVLthTwFX6DmNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778185158; 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=9NTkOc7m/aMPyflMic6vVBzIV0ksh5uWY2F5lRAB7aI=; b=A/v+aMvyDYegZEy2NHltMAEFW00v8z182+S3svKH32UWRIceFROEwV8Bo1uKPH+hleG73m 9B48zNgoOz5F2+50Y7UVYWsXLU5u9zArsQ4/wUXEpA+fzVN8tLiDzLm1KJOoDDWdtfE3Dk qx4MdX2PHAW3ffv5lq838AZFqkTqvhsJhLFUVhwMwH3Gete6heAXLh/Ni+st0gueBMhWkV 6S7cV6jUjQzQRSK5tT/ac57U/wjlvYEKP8G92gF7BomQ5UQWZas+42OwwEF9QZYW87WMkL a02118NSZSstVV/mHWwbxM7y80DaTp6KyMnjxXyBN9M+OqB1HknQSVtt0B8HKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBNrQ12vGzhjn for ; Thu, 07 May 2026 20:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ef2a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 20:19:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Colin Percival Subject: git: 9536a3a2de01 - releng/15.1 - md5: Don't generate test cases just to skip them List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 9536a3a2de012bcb98c9a49eeb05dd1935131c84 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 20:19:18 +0000 Message-Id: <69fcf3c6.1ef2a.47bd31ab@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9536a3a2de012bcb98c9a49eeb05dd1935131c84 commit 9536a3a2de012bcb98c9a49eeb05dd1935131c84 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-05 19:44:29 +0000 Commit: Colin Percival CommitDate: 2026-05-07 20:18:56 +0000 md5: Don't generate test cases just to skip them Don't waste time generating Perl test cases for algorithms that are not supported in Perl mode only to skip them when they are run. Approved by: re (cperciva) MFC after: 1 week Reviewed by: ngie Differential Revision: https://reviews.freebsd.org/D56687 (cherry picked from commit fd386e76fa2b29d99525c246cbfc05768a1f4a76) (cherry picked from commit f9626b7e55e11322ad45da2201cd482b43eeabb6) --- sbin/md5/tests/md5_test.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sbin/md5/tests/md5_test.sh b/sbin/md5/tests/md5_test.sh index 34bdf43f13ea..a7632664c7aa 100644 --- a/sbin/md5/tests/md5_test.sh +++ b/sbin/md5/tests/md5_test.sh @@ -176,6 +176,7 @@ out_7_skein1024="cf21a613620e6c119eca31fdfaad449a8e02f95ca256c21d2a105f8e4157048 out_8_skein1024="e6799b78db54085a2be7ff4c8007f147fa88d326abab30be0560b953396d8802feee9a15419b48a467574e9283be15685ca8a079ee52b27166b64dd70b124b1d4e4f6aca37224c3f2685e67e67baef9f94b905698adc794a09672aba977a61b20966912acdb08c21a2c37001785355dc884751a21f848ab36e590331ff938138" for alg in $algorithms ; do + eval "perl=\$name_perl_${alg}" # supported in Perl mode? eval " atf_test_case self_test_${alg} self_test_${alg}_head() { @@ -228,14 +229,13 @@ gnu_${alg}_vec${i}_body() { atf_check -o inline:\"\$out_${i}_${alg} -\0\" ${alg}sum -z - in atf_check -o inline:\"\$out_${i}_${alg} -\n\" shasum \$alg_perl_${alg} digests :>stdout :>stderr @@ -394,14 +393,15 @@ EOF atf_init_test_cases() { for alg in $algorithms ; do + eval "perl=\$name_perl_${alg}" # supported in Perl mode? atf_add_test_case self_test_${alg} for i in $(seq $n) ; do atf_add_test_case bsd_${alg}_vec${i} atf_add_test_case gnu_${alg}_vec${i} - atf_add_test_case perl_${alg}_vec${i} + [ -n "$perl" ] && atf_add_test_case perl_${alg}_vec${i} done atf_add_test_case gnu_check_${alg} - atf_add_test_case perl_check_${alg} + [ -n "$perl" ] && atf_add_test_case perl_check_${alg} done atf_add_test_case gnu_bflag atf_add_test_case gnu_cflag From nobody Thu May 7 20:19:13 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBNrR26fgz6d7qJ for ; Thu, 07 May 2026 20:19: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 4gBNrQ75lBz3HnH for ; Thu, 07 May 2026 20:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778185159; 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=z9PBz/uhQwDt0nXMqENuW6TyNVEf0FhOJP1qyXHpgAM=; b=Mx/XbjIpZyWYcaQt3dpOlcAlXX7lLfuSsM69bKJtMmRvtvSsX04mfGPjOEkB6d8XgI8txo qGQ6ifPT/WznA1UYydZYE/8uVq7aqJwWFd+njnhAU+lXAEkLmZLWzXf6ghuBRx9eUUNhY4 dG8W0272XsVu1/ZuGSCx/KfGrg/gS7WzMc1UoOSHhamNS3OFZ7yWhEmfg5i6jtvOonEy2E U+RZN0Skcuo1dKHQwpu6dhFfalXLJb+i4B+61Tvg4mJaiyt/q9x8xv+sknhGOAhQldq+Uz 6RM+OQE3srgiY0Bj9eBO3zWj3LFrAYVx4MxEI8BgqYy2o+Ts2KGzKUAsNsbcQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778185159; a=rsa-sha256; cv=none; b=AJHroRSImAnQzj0vy1zs7kupbfE0jzodYiITVlpbxFqL0yyhWZrqiRz7d5QL7j2Ju0GLjd 2Vqtb20YOF6Ys/1jEoxdMhmcy39C6NoW8IifISKzCz+z2VqzDwFgKOt8bZQ98RDoK7RUtk sa/qqRcVx7Wk/ABMr9W5FLOxBB6Hf4il4Hd9FIm5gNGeUZMv7pck1Mv2SuRiNPpqqZMVDT 7N65Nkb9i/muwMeI0KDsP488evbTC9nURz5yYDIPKLDgjBJb2QIk3pLgvzyINjbAhFim9V ccGD45Xlt5j2dH9jDx51Cr83cpjMiundU6d9YQnYK832QzQrhxwH3oWKzDcU+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778185159; 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=z9PBz/uhQwDt0nXMqENuW6TyNVEf0FhOJP1qyXHpgAM=; b=a2RYeTk/cn3aZUTZEd8zmPBha/y8aVM6Pp0vGDJH9s905qUe0DNZn/UzrgDCLPMuKU/s2Z 7+cRNpRgiqlKV1x1yfCsBEW2KWPvJeEB928x/YkSmieN3KKFKGzaJZVd/I5t/wWJgGVDEG Bezedg6fmpbuTeGL+YYQLf+jH60Ky58g7KbygdodKdBWXhcJrFT3xxqpwYhXqyDioq89sk Hamt8uVw91jDEDBxcf6CCti4Y3nPLCelkpcZs3oatCnvhSmz1xEF9Rf2EuARG2y/YhYxiR dU2ien6R30n5+60TtNnrxI8lUaowKrJezw/9jpYlD5qFPT4ptETS1IKSefOC8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBNrQ6hkVzhx9 for ; Thu, 07 May 2026 20:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ef25 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 20:19:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Baptiste Daroussin From: Colin Percival Subject: git: 78c1ba506b85 - releng/15.1 - nuageinit: only parse user_data as yaml when necessary List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 78c1ba506b858a1702720ea7e51b6a05a4691787 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 20:19:13 +0000 Message-Id: <69fcf3c1.1ef25.2f737ac8@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=78c1ba506b858a1702720ea7e51b6a05a4691787 commit 78c1ba506b858a1702720ea7e51b6a05a4691787 Author: Baptiste Daroussin AuthorDate: 2026-05-06 20:14:17 +0000 Commit: Colin Percival CommitDate: 2026-05-07 20:18:43 +0000 nuageinit: only parse user_data as yaml when necessary This fixes a regression introduced in cae280931c9e which prevents user_data as a shell script to be used Approved by: re (cperciva) PR: 295062 Reported by: Ross McKelvie MFC After: 1 day (cherry picked from commit c316ec259011e9e22e40eaa72d834f3bfac95c28) (cherry picked from commit 4211f280ba087c75dcd84f9b592238b2eae33af9) --- libexec/nuageinit/nuageinit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index f7700f7d8e70..a1ebd3f52b25 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -727,7 +727,7 @@ local function load_userdata() f:close() local obj = nil - if ud then + if ud and line == "#cloud-config" then f = io.open(ni_path .. "/" .. ud) obj = yaml.load(f:read("*a")) f:close() From nobody Thu May 7 20:19:20 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBNrS40lTz6d7fZ for ; Thu, 07 May 2026 20:19: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 4gBNrS2kHWz3Hqq for ; Thu, 07 May 2026 20:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778185160; 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=OgJRgNytAVF/7i6rA0QBqSOwUe7+MTTjgN/DqmF55a4=; b=QwkWwSEkbzq0wV9hYxQd3CF44MhpsaNCZYnDF4gFZI9t/+Rhe0sqDsRs8WJy+5aetxhtl0 DMeQM+9PY5HFU3jV3r91UEyquV4lPlRUvqiNHESicpj5Ul5lSWtCnXcRC3sXfJDy10KoIB L5vL2jHG5BK+7DVZAEPZdMkQsAHh6g6goJ8T7dBAPUKLvq1aW5VkgpIrvlx8UuQg9El/kT xjJvV/8H27tFW64JbJKnCZOpDCpjK3jIbcgmFEYbToPpEyQbYx+eYAwRyGuAN7oTeYyv0G k/xCDZArKWFRcfbtqnqcN5IJLn4OT6AfsFOvMB8R/wb5zWaCD5jgClXn7KpK9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778185160; a=rsa-sha256; cv=none; b=ru2dGteji+suCLK6QUXbCi3V6FXktPgF/k8GXXhNAR7T6heKxqFfXxUiVKBFnCQbxr2P11 82diGl95ub73SykTgaU7aONFb+q8OznksZWX2ELqReNI6w28B/lTNiPwHR1P48fT9Ingau HMGfXqpjv5iUs+2aG/iyOvOfl7JUcSiQ1qEJ2T/Xsc+8p1o63v1y0/hsGHfWkl2lqMvnTz b8W+jcxFr1OfHC6jA5NnZQnLDrVV7kNsil16eYydu2csNnT35Kuzkih9tYitlv2JK1BAB+ iKMRu39jgAx59TfkQPOBiFd9aeDH0mmILynfdr3sY0rpKIfipUEu6PdzzTVhAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778185160; 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=OgJRgNytAVF/7i6rA0QBqSOwUe7+MTTjgN/DqmF55a4=; b=xh4olJ8dro39IN5sr2cSBbXdBe248ZL4D5BKfWso8JJ27azBjbLRE4aJzaJKXJ/ouINDXY jvdw88aCYVSOeW2NsSMUVDdXEx4nAlv6G5/8Jdg5l55TDNPpAJoKe96FjK4paBG89UyPoH /ZV1tR2Mv0hGhhk6osYlKy080Owrzboyu8QboIduNgErtPln7owyuc3Zx2tcESbL5kIRoe 4tLDounchp0cWpeikVrU6V1T8a1piwSltcvWFi7EkB6/3DFnvkOzwj634PYDUG/F7FEuGv Z0y4g5GTv1wITvwny9zPNM43Fp64BFERVOf1CMB04aW5S4jasPEkwWvyDf12rA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBNrS2BrQzhV1 for ; Thu, 07 May 2026 20:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ee9c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 20:19:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: tickerguy From: Colin Percival Subject: git: 13c70ef568c3 - releng/15.1 - rtadvd(8): Honor pltime/vltime in interface declarations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 13c70ef568c35b974ff3c19a7b6834e8486a6b42 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 20:19:20 +0000 Message-Id: <69fcf3c8.1ee9c.6c8b5c87@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=13c70ef568c35b974ff3c19a7b6834e8486a6b42 commit 13c70ef568c35b974ff3c19a7b6834e8486a6b42 Author: tickerguy AuthorDate: 2025-09-29 16:05:29 +0000 Commit: Colin Percival CommitDate: 2026-05-07 20:19:02 +0000 rtadvd(8): Honor pltime/vltime in interface declarations Currently rtadvd ignores interface pltime/vltime specifications unless the (static) address range is also included in the config file. This extends the validity of a pltime and/or vltime stanza in the config file for an interface to delegated addresses from an upstream provider. Approved by: re (cperciva) Signed-off-by: tickerguy PR: 288426 Reviewed by: pouria Pull Request: https://github.com/freebsd/freebsd-src/pull/1863 (cherry picked from commit 103f9883d1ed7431c432caa6ab9c61cd4d0831d0) (cherry picked from commit 18caefe847086a9e89812db600c852b225467090) --- usr.sbin/rtadvd/config.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index 628ca3be886f..c02997337da3 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -1095,6 +1095,7 @@ get_prefix(struct rainfo *rai) ifi = rai->rai_ifinfo; for (ifa = ifap; ifa; ifa = ifa->ifa_next) { + int64_t val64; int plen; if (strcmp(ifa->ifa_name, ifi->ifi_ifname) != 0) @@ -1143,9 +1144,26 @@ get_prefix(struct rainfo *rai) "<%s> add %s/%d to prefix list on %s", __func__, ntopbuf, pfx->pfx_prefixlen, ifi->ifi_ifname); + MAYHAVE(val64, "vltime", DEF_ADVVALIDLIFETIME); + if (val64 < 0 || val64 > 0xffffffff) { + syslog(LOG_WARNING, + "<%s> vltime (%" PRIu64 ") for %s/%d on %s " + "is out of range, use default value instead.", __func__, + val64, ntopbuf, pfx->pfx_prefixlen, ifi->ifi_ifname); + pfx->pfx_validlifetime = DEF_ADVVALIDLIFETIME; + } else + pfx->pfx_validlifetime = val64; + MAYHAVE(val64, "pltime", DEF_ADVPREFERREDLIFETIME); + if (val64 < 0 || val64 > 0xffffffff) { + syslog(LOG_WARNING, + "<%s> pltime (%" PRIu64 ") for %s/%d on %s " + "is out of range, use default value instead.", __func__, + val64, ntopbuf, pfx->pfx_prefixlen, ifi->ifi_ifname); + pfx->pfx_preflifetime = DEF_ADVPREFERREDLIFETIME; + } else + pfx->pfx_preflifetime = val64; + /* set other fields with protocol defaults */ - pfx->pfx_validlifetime = DEF_ADVVALIDLIFETIME; - pfx->pfx_preflifetime = DEF_ADVPREFERREDLIFETIME; pfx->pfx_onlinkflg = 1; pfx->pfx_autoconfflg = 1; pfx->pfx_origin = PREFIX_FROM_KERNEL; From nobody Thu May 7 20:19:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBNrR6gf2z6d7vb for ; Thu, 07 May 2026 20:19: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 4gBNrR2H6xz3HnS for ; Thu, 07 May 2026 20:19:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778185159; 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=ZWHGlf8mAHOKP+IB1wh0f2f50aVVG5TSpMrusV7zTbU=; b=xVippHBTyKJZutErXaRVHKIRjBTMBWwp4JFF/a/DTE6Zx9ETFhvi6309S7Z00Jr/kTBwYb HNGnY/4/tGupUQGOWxVVJwCLukdGH/HJsgW3+6YiHAOT4+/XMRwZPl2m5cfis+GJQIq2OA oeKxMok+fVVxXeKtMN1nznGwiyda5Ux48qLe7ceEUFtPvmGI1wRkrKuyi7+M2zLUTmggwn VnnuyWul4lUHb6ayZA0Q5i4CnHEFEbd3T681ixB7NlM311kB3sIi0mD016p0azzAzZ9sDY 1mZP3OTL77Noi5Wtur8r8BRN4lY34yNppH/1uQN/TxMPvR6luWBLFEPxke4OUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778185159; a=rsa-sha256; cv=none; b=CXe5aevUSCkBXfeTc/rm3o9ZEdR2z/mGbfy7EMuHyYhalH3O6nWl2eQ3lNa1dsuvBvilsY tEPxU3NBRfjcDKo8CSyLjCyQ7Oyi5TjyhsUIfDxY4qju9oAdwxqIISSFAshiOW2eTmeQO3 1U5snPuiz3BAujLeKCLJafql2zAVP1gLowDR5NdQYIj4FHREfGzGXuSwkdr93HdufVABT7 U71XDAXIdDTmO5uMRoEJcDHPIdd/39VrTjmV9hKX//3UNxYyweH6AUb494MZyeGV9U2N4x vZBk0MwTxeWrqcnLLhReWHAFQ5697Y/wIO7AWFoWRe0FHMbvgHxYgl57W3dCIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778185159; 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=ZWHGlf8mAHOKP+IB1wh0f2f50aVVG5TSpMrusV7zTbU=; b=MoXdXv2VCd9PRjydju86nIN0KVdGVdZupySArnVf3w6/1J7l8ES8T9mJMQ2sAjSCxvUxPG LYMdbdr+jFBEwzlxIQZYSi2q5D2S18254Tp2mlcfzq2/S8y3fOHB+eBFqNrWyQFWixAimx s8aPzuQHhpl75gwuIHruo1lgLUUeutM6GiDuTSIoIZ1pDzacylLME6PbdL/cGz1nsYQRDV yQIgtJCUbKV7A3c29bez/mguoVG/M2fwyDyRjfUJFwjn05WM+GjGOWnrhTK1SBej/w0dc8 CXSPaKG3U19FV1R/0r4pQOhC3geGo38lqVMgxfhRpH+os6Z+2K9Ih+ysD5Us5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBNrR1fT3zhZy for ; Thu, 07 May 2026 20:19:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ed9b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 20:19:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Colin Percival Subject: git: cef90b438635 - releng/15.1 - certctl: Unstickify (un)trusted certificates List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: cef90b4386354618126925716cbadff6b1961a2e Auto-Submitted: auto-generated Date: Thu, 07 May 2026 20:19:19 +0000 Message-Id: <69fcf3c7.1ed9b.f9965d2@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=cef90b4386354618126925716cbadff6b1961a2e commit cef90b4386354618126925716cbadff6b1961a2e Author: Dag-Erling Smørgrav AuthorDate: 2026-05-05 22:30:52 +0000 Commit: Colin Percival CommitDate: 2026-05-07 20:18:58 +0000 certctl: Unstickify (un)trusted certificates Ever since certctl was rewritten in C, the rehash command has reingested TRUSTDESTDIR / UNTRUSTDESTDIR in addition to TRUSTPATH / UNTRUSTPATH. This seemed like a good idea at the time but was, in retrospect, a mistake, as it means a (un)trusted certificate remains (un)trusted forever (or at least until it expires) even if it is removed from (UN)TRUSTPATH. Among other issues, it causes ports QA to fail for any port that either installs certificates or depends on a port that does. Although this behavior was undocumented, the change may surprise users who have added certificates manually, so update the manual page to point it out and add prominent warnings to the trust and untrust commands. Approved by: re (cperciva) PR: 290078 MFC after: 1 week Reviewed by: kevans, bcr Differential Revision: https://reviews.freebsd.org/D56617 (cherry picked from commit 2fef18ff594328a771b6aa659e8ffa5a7e076540) (cherry picked from commit c65e233a52c61bf24fb935d1971e38fbde10791d) --- usr.sbin/certctl/certctl.8 | 15 ++++++- usr.sbin/certctl/certctl.c | 81 ++++++++++++++++++++++------------ usr.sbin/certctl/tests/certctl_test.sh | 3 +- 3 files changed, 67 insertions(+), 32 deletions(-) diff --git a/usr.sbin/certctl/certctl.8 b/usr.sbin/certctl/certctl.8 index 2d38ce020c04..7df89e4d35d0 100644 --- a/usr.sbin/certctl/certctl.8 +++ b/usr.sbin/certctl/certctl.8 @@ -24,7 +24,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 3, 2025 +.Dd April 24, 2026 .Dt CERTCTL 8 .Os .Sh NAME @@ -113,8 +113,19 @@ In addition, a bundle containing the trusted certificates is placed in .Ev BUNDLE . .It Ic untrust Add the specified file to the untrusted list. +Note that the next +.Ic rehash +will remove it unless a copy of it is also placed somewhere in a +directory included in +.Ev UNTRUSTPATH . .It Ic trust -Remove the specified file from the untrusted list. +Add the specified file to the trusted list, unless it is already +untrusted. +Note that the next +.Ic rehash +will remove it unless a copy of it is also placed somewhere in a +directory included in +.Ev TRUSTPATH . .El .Sh ENVIRONMENT .Bl -tag -width UNTRUSTDESTDIR diff --git a/usr.sbin/certctl/certctl.c b/usr.sbin/certctl/certctl.c index 7fdc644bc09f..cf737565ca9e 100644 --- a/usr.sbin/certctl/certctl.c +++ b/usr.sbin/certctl/certctl.c @@ -636,23 +636,18 @@ write_bundle(const char *dir, const char *file, struct cert_tree *tree) * Returns the number of certificates loaded. */ static unsigned int -load_trusted(bool all, struct cert_tree *exclude) +load_trusted(void) { unsigned int i, n; int ret; /* load external trusted certs */ - for (i = n = 0; all && trusted_paths[i] != NULL; i++) { - ret = read_certs(trusted_paths[i], &trusted, exclude); + for (i = n = 0; trusted_paths[i] != NULL; i++) { + ret = read_certs(trusted_paths[i], &trusted, &untrusted); if (ret > 0) n += ret; } - /* load installed trusted certs */ - ret = read_certs(trusted_dest, &trusted, exclude); - if (ret > 0) - n += ret; - info("%d trusted certificates found", n); return (n); } @@ -663,24 +658,19 @@ load_trusted(bool all, struct cert_tree *exclude) * Returns the number of certificates loaded. */ static unsigned int -load_untrusted(bool all) +load_untrusted(void) { char *path; unsigned int i, n; int ret; /* load external untrusted certs */ - for (i = n = 0; all && untrusted_paths[i] != NULL; i++) { + for (i = n = 0; untrusted_paths[i] != NULL; i++) { ret = read_certs(untrusted_paths[i], &untrusted, NULL); if (ret > 0) n += ret; } - /* load installed untrusted certs */ - ret = read_certs(untrusted_dest, &untrusted, NULL); - if (ret > 0) - n += ret; - /* load legacy untrusted certs */ path = expand_path(LEGACY_PATH); ret = read_certs(path, &untrusted, NULL); @@ -796,8 +786,8 @@ certctl_list(int argc, char **argv __unused) { if (argc > 1) usage(); - /* load trusted certificates */ - load_trusted(false, NULL); + /* load installed trusted certificates */ + read_certs(trusted_dest, &trusted, NULL); /* list them */ list_certs(&trusted); free_certs(&trusted); @@ -814,8 +804,8 @@ certctl_untrusted(int argc, char **argv __unused) { if (argc > 1) usage(); - /* load untrusted certificates */ - load_untrusted(false); + /* load installed untrusted certificates */ + read_certs(untrusted_dest, &untrusted, NULL); /* list them */ list_certs(&untrusted); free_certs(&untrusted); @@ -842,10 +832,10 @@ certctl_rehash(int argc, char **argv __unused) } /* load untrusted certs first */ - load_untrusted(true); + load_untrusted(); /* load trusted certs, excluding any that are already untrusted */ - load_trusted(true, &untrusted); + load_trusted(); /* save everything */ ret = save_all(); @@ -859,7 +849,8 @@ certctl_rehash(int argc, char **argv __unused) } /* - * Manually add one or more certificates to the list of trusted certificates. + * Manually add one or more certificates to the list of trusted + * certificates. * * Returns 0 on success and -1 on failure. */ @@ -875,10 +866,10 @@ certctl_trust(int argc, char **argv) usage(); /* load untrusted certs first */ - load_untrusted(true); + load_untrusted(); /* load trusted certs, excluding any that are already untrusted */ - load_trusted(true, &untrusted); + load_trusted(); /* now load the additional trusted certificates */ n = 0; @@ -891,9 +882,9 @@ certctl_trust(int argc, char **argv) warnx("no new trusted certificates found"); free_certs(&untrusted); free_certs(&trusted); - free_certs(&extra); return (0); } + warnx("%u new trusted certificate%s found", n, n > 1 ? "s" : ""); /* * For each new trusted cert, move it from the extra list to the @@ -906,10 +897,16 @@ certctl_trust(int argc, char **argv) RB_INSERT(cert_tree, &trusted, cert); if ((other = RB_FIND(cert_tree, &untrusted, cert)) != NULL) { warnx("%s was previously untrusted", cert->name); + warnx("source of untrust: %s", other->path); RB_REMOVE(cert_tree, &untrusted, other); free_cert(other); } } + warnx("This operation is not persistent. To persistently add"); + warnx("trusted certificates to the system store, copy them to"); + warnx("one of these directories, then run `certctl rehash`:"); + for (i = 0; trusted_paths[i] != NULL; i++) + warnx(" %s", trusted_paths[i]); /* save everything */ ret = save_all(); @@ -929,6 +926,8 @@ certctl_trust(int argc, char **argv) static int certctl_untrust(int argc, char **argv) { + struct cert_tree extra = RB_INITIALIZER(&extra); + struct cert *cert, *other, *tmp; unsigned int n; int i, ret; @@ -936,23 +935,47 @@ certctl_untrust(int argc, char **argv) usage(); /* load untrusted certs first */ - load_untrusted(true); + load_untrusted(); + + /* load trusted certs, excluding any that are already untrusted */ + load_trusted(); /* now load the additional untrusted certificates */ n = 0; for (i = 1; i < argc; i++) { - ret = read_cert(argv[i], &untrusted, NULL); + ret = read_cert(argv[i], &extra, NULL); if (ret > 0) n += ret; } if (n == 0) { warnx("no new untrusted certificates found"); free_certs(&untrusted); + free_certs(&trusted); return (0); } + warnx("%u new untrusted certificate%s found", n, n > 1 ? "s" : ""); - /* load trusted certs, excluding any that are already untrusted */ - load_trusted(true, &untrusted); + /* + * For each new untrusted cert, move it from the extra list to the + * untrusted list, then check if a matching certificate exists on + * the trusted list. If that is the case, warn the user, then + * remove the matching certificate from the trusted list. + */ + RB_FOREACH_SAFE(cert, cert_tree, &extra, tmp) { + RB_REMOVE(cert_tree, &extra, cert); + RB_INSERT(cert_tree, &untrusted, cert); + if ((other = RB_FIND(cert_tree, &trusted, cert)) != NULL) { + warnx("%s was previously trusted", cert->name); + warnx("source of trust: %s", other->path); + RB_REMOVE(cert_tree, &trusted, other); + free_cert(other); + } + } + warnx("This operation is not persistent. To persistently add"); + warnx("untrusted certificates to the system store, copy them to"); + warnx("one of these directories, then run `certctl rehash`:"); + for (i = 0; untrusted_paths[i] != NULL; i++) + warnx(" %s", untrusted_paths[i]); /* save everything */ ret = save_all(); diff --git a/usr.sbin/certctl/tests/certctl_test.sh b/usr.sbin/certctl/tests/certctl_test.sh index 74749db0b3f5..133d65854c42 100644 --- a/usr.sbin/certctl/tests/certctl_test.sh +++ b/usr.sbin/certctl/tests/certctl_test.sh @@ -271,7 +271,8 @@ untrust_body() crtfile=usr/share/certs/trusted/${crtname}.crt check_trusted "${crtname}" check_in_bundle ${crtfile} - atf_check certctl untrust "${crtfile}" + atf_check -e match:"1 new untrusted" \ + certctl untrust "${crtfile}" check_untrusted "${crtname}" check_not_in_bundle ${crtfile} } From nobody Thu May 7 20:40:21 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBPJk0xvfz6bwFY for ; Thu, 07 May 2026 20:40:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBPJj6vmvz3Np2 for ; Thu, 07 May 2026 20:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778186422; 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=BrkIADxkYIuZDHMtepuLDRtqiIHmtSGzIcwdIU456Zw=; b=vVB/K/xPJRdDalo4zNE+2S35O5Zrc07S0uVJdcFP7I6llCsLS8hxM21h+hLLYmRl7aq7Rx rYhGMjwSNOy/PYas24hjpfMwcrhzy8nT3S7AAZyIx1UMXKhROsUmH9AlJPNgPgXPAqBAN8 KqPqRTlmcBH33B4bWzf0PhC7nWzlFAdhK9JIBLIljnvtlwytScdbEdufwdlIo+bAcrOXpU iZHW91sgOs7BzcA7OMnGO3/rASXlyi3bm8f+IKjGerd9NQI7NopwJHldtZi8WAas30F6bY DtjgMdvZ6g3nRpzEeApgTJHlcuSUcu9htFoNyMht6ShNrGgmOWiMN8Xik/Ia4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778186422; a=rsa-sha256; cv=none; b=xR+e8kHZzV2xg5muuTs1SsNVSUpEOYshPMhIbTw3IFK+3Ho07p0FLipsxvKhoGi+rS6rZk 5cCp7kGOXFCb4G74duueyX3S3aPWwrqH2xsHLloJHMCileTYjxpw2Bd5qQxvCKkWGXuPjn 0+n3SRC8b7trWdjYLjDn2/XP/IHVpdMDMmiduqNONA08z3wf5gz0EtpBXfq6GaiNnugS4V hHaIe6nO9GekNC8Pa0Pe2jUbSE0vwFxViEF+StAU7KohezF7Nfi8bCtMfp49ZIEraW0ffJ 7YKfjX3anGy3wh/+56Htav6E4jlV1IE5OYLAmPcyNEhogFuztojSG1RR68UV7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778186422; 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=BrkIADxkYIuZDHMtepuLDRtqiIHmtSGzIcwdIU456Zw=; b=cMW1jxMAqAADgrmoUnIU3WxQxplfVG+sJHVWNfUr7RFARaNosFVgoVmemIKV6m+sQ1tb3U 0slj0BoBaAmqBASfhBq86SybwgNXXqdlAxzIEkNzS68OPfgDDar8eVUZfnTcRwPJKDHfdv HpHi81Q1spjHIkVgilzLpmJC3oiDR/WS4ds09KBy1tsBaSXrzoPPIwU9XbhG7PB4B5+sHe Xxe2qLI8wRf+mZBw/tspKJ0gRwXuHGHXI5gvcZBA0+Mqz+oIxfFm75YnKK65WM4q+TVwkL ECDqjdvX5mr7NQABc6x5wS7eaNaFJfQPRfydn6KcZDv69Ku2Rb5hPKHzPz9ySA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBPJj5tzmzj07 for ; Thu, 07 May 2026 20:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2221d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 20:40:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jan Bramkamp From: Colin Percival Subject: git: 38c5d60c367e - releng/15.1 - jail: avoid leaking jail config fds to exec.* hooks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 38c5d60c367e788341e059ee3940183c293956ba Auto-Submitted: auto-generated Date: Thu, 07 May 2026 20:40:21 +0000 Message-Id: <69fcf8b5.2221d.3c6fd090@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=38c5d60c367e788341e059ee3940183c293956ba commit 38c5d60c367e788341e059ee3940183c293956ba Author: Jan Bramkamp AuthorDate: 2026-05-06 23:28:53 +0000 Commit: Colin Percival CommitDate: 2026-05-07 20:39:42 +0000 jail: avoid leaking jail config fds to exec.* hooks The jail(8) command must not leave parsed configuration files open since the file descriptors will be leaked to child processes including the untrusted exec.start or exec.stop hooks. While fopen() doesn't provide direct access to O_CLOEXEC, it does provide access to FD_CLOEXEC via "e" in the mode string which provides the desired defense in depth against leaking file descriptors into exec.* hooks since those always execve() into a shell. Jail configuration is potentially sensitive and some hooks execute from within the jail context, leaving some opening for the jail to exfiltrate information about the host environment. (Commit message wordsmithed by kevans) Approved by: re (cperciva) PR: 295052 Reviewed by: kevans (cherry picked from commit 276d9b88a9e6fd6fd90e57c36444756ad297d2ab) (cherry picked from commit c35bb8ba898482920bf9b57967a9a11f98a89c81) --- usr.sbin/jail/config.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c index 1bad04ccde68..f1e2da215790 100644 --- a/usr.sbin/jail/config.c +++ b/usr.sbin/jail/config.c @@ -321,6 +321,7 @@ static void parse_config(const char *cfname, int is_stdin) { struct cflex cflex = {.cfname = cfname, .error = 0}; + FILE *yfp = NULL; void *scanner; yylex_init_extra(&cflex, &scanner); @@ -328,7 +329,7 @@ parse_config(const char *cfname, int is_stdin) cflex.cfname = "STDIN"; yyset_in(stdin, scanner); } else { - FILE *yfp = fopen(cfname, "r"); + yfp = fopen(cfname, "re"); if (!yfp) err(1, "%s", cfname); yyset_in(yfp, scanner); @@ -336,6 +337,8 @@ parse_config(const char *cfname, int is_stdin) if (yyparse(scanner) || cflex.error) exit(1); yylex_destroy(scanner); + if (yfp != NULL) + fclose(yfp); } /* From nobody Thu May 7 20:40:22 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBPJl1RcKz6bwNL for ; Thu, 07 May 2026 20:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBPJk6txYz3NjS for ; Thu, 07 May 2026 20:40:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778186423; 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=btRRCOaPyqTwHQrKP0I4n9vijFeXhSOSPzQMn7EozHU=; b=cBHM2GdnUBUhvI9jJYjLmVYiomVyTR2j976DXCd+0YdHpnLwg0c+UhkkeTZU5k8qUhNnDR Lq2dESznYZj3cp0CAPoDZ4FCqI7VzDXaJow+O1Lhq6RVW9nVwL9U/A+Twp7RJB5kl5qy2/ ya5Mw3l/1nXZNmBmT5oMJcGngQH1aCs0F1VKHXPHcn5KcKtEaf4/7oHdCAisAI+TCfx4Tq vuZWYmKp+GLVVEF2PPLBxwStR7SR84vS/5+nyOC8+gnkzvkAhcIWUs8TyVfcvvT73dZ+4L FozCHWuFT/gy/RybUrZmPTCFRJAhRBiaJISkLZvXVaBl02qBqV3sPSHWt4Az+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778186423; a=rsa-sha256; cv=none; b=xxDujdxmaWQG5hG2dG5iqdq04zTrW2Jj/a6nhzQgenWFFP9jEqFwfVqbPvIQL1Yuhsjg5Y g/TQvG3qyU041sBxA2jD95Wb8FwK3NpLjoKsrK0rsvHa1hZ/udagzVVr3hew0iR64U12uN tO+bkEZfGaghSNV17cdzkvGuvY7PlrR3RNfz/rbu7S+dXFVhErnqMMxUiOSzxIhtmDHYOH Bk5Ef7r/1YcB865ifAYEy2WCT1OG2I6HvbTCl9pyNk3Lb2XvsfYYpUEhbh4/iscEMlTDcL wCliCuanp5gPedA5+m2N6UT6TF+zRX29rd2KQV8G4hTmX5yWny+x6IVJgvBIEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778186423; 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=btRRCOaPyqTwHQrKP0I4n9vijFeXhSOSPzQMn7EozHU=; b=iYLnUt1pKXuJsfViVdnOP6YSrCfviL+YFFq3gKNJIUeOAy7N4Yhp7j41fxpWLW619Qmocb 3xjkBb5vi45kOTRGqkXwIQRf96AC7JvDXjFDt+QgJUxEYt9/+m5w5elunk2rhmMJcKdSlr CXZ4ACwRfFvpXanW2oUbp43xoajjPfBUACaNrTJD49bcGUo1V+dYa0oQhVLkUrQVLfJ/JK 3yWOY/5mT21g9W5J+8ohxc0xaPackYeL5SilTkD5bBZlP09mqnh6bV7qQT4stDsRkW9zv2 LAJqLyHYRMJZjGXYYSGT86vB60Ckcgac2n2soj1FGCFhSSrZYuWRvfbEOXunHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBPJk6Fr9zj3V for ; Thu, 07 May 2026 20:40:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fd6d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 20:40:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mark Johnston From: Colin Percival Subject: git: 88e12ccd9afc - releng/15.1 - tests/socket_afinet: Fix the bind_connected_port test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 88e12ccd9afc55d8e5f66e0fefb0ea71ccb91476 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 20:40:22 +0000 Message-Id: <69fcf8b6.1fd6d.402e7c5f@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=88e12ccd9afc55d8e5f66e0fefb0ea71ccb91476 commit 88e12ccd9afc55d8e5f66e0fefb0ea71ccb91476 Author: Mark Johnston AuthorDate: 2026-04-20 15:07:20 +0000 Commit: Colin Percival CommitDate: 2026-05-07 20:39:59 +0000 tests/socket_afinet: Fix the bind_connected_port test The test verifies that a socket can bind to a local address assigned by connect(2) to a different socket. It was however trying to bind to the wrong address, and the check of the result was inverted, so this went unnoticed. It also needs to set SO_REUSEADDR for this to succeed. Approved by: re (cperciva) Reported by: glebius MFC after: 1 week (cherry picked from commit d3d0466cae546254c50c80cf3e0c060bbbbba53c) (cherry picked from commit 9e8d7d83ecfbf8b34b785d7981a29dda567d0bc6) --- tests/sys/netinet/socket_afinet.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/sys/netinet/socket_afinet.c b/tests/sys/netinet/socket_afinet.c index 9c718fc5a901..56d98c7b3241 100644 --- a/tests/sys/netinet/socket_afinet.c +++ b/tests/sys/netinet/socket_afinet.c @@ -516,6 +516,7 @@ bind_connected_port_test(const atf_tc_t *tc, int domain) struct sockaddr_in sin; struct sockaddr_in6 sin6; struct sockaddr *sinp; + socklen_t slen; int error, sd[3], tmp; bool res; @@ -554,16 +555,15 @@ bind_connected_port_test(const atf_tc_t *tc, int domain) sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); error = connect(sd[1], sinp, sinp->sa_len); ATF_REQUIRE_MSG(error == 0, "connect failed: %s", strerror(errno)); - tmp = accept(sd[0], NULL, NULL); + slen = sinp->sa_len; + tmp = accept(sd[0], sinp, &slen); ATF_REQUIRE_MSG(tmp >= 0, "accept failed: %s", strerror(errno)); - ATF_REQUIRE(close(sd[0]) == 0); - sd[0] = tmp; /* bind() should succeed even from an unprivileged user. */ - res = child_bind(tc, SOCK_STREAM, sinp, 0, false); - ATF_REQUIRE(!res); - res = child_bind(tc, SOCK_STREAM, sinp, 0, true); - ATF_REQUIRE(!res); + res = child_bind_priv(tc, SOCK_STREAM, sinp, SO_REUSEADDR); + ATF_REQUIRE(res); + res = child_bind_unpriv(tc, SOCK_STREAM, sinp, SO_REUSEADDR); + ATF_REQUIRE(res); } /* From nobody Thu May 7 20:40:23 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBPJm1m2xz6bvb0 for ; Thu, 07 May 2026 20:40: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 4gBPJm00f9z3Np4 for ; Thu, 07 May 2026 20:40:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778186424; 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=DThAdjnFMwqMWzTUoRJ5MIjTexvKDh96f+32UYlP4QY=; b=Vpq0BGIBjUdF1rdXVHiqpgd9eAnpFeSjN9d4dTcb1zKEzsK7gH7FGGda1/B0RBWCeIsXOv NDDO8u8iAeIzFj4UeQCbKlBAJo/G8+x6jFvecZ84wlsUwyF9wk80Hp0Eu/B4U0a87G3K1x jWjeHj+OLaSmBdBOhllktLfPUxqcmw4oYFubjnkSoGxR0/IbpSFZgQcYNzYzS2Q4DhL2/k RrComFUDkA89PEz3k6/9p22jl6pLUbYP0Jiei20ulyMewCV8OI+sAG902ESs2HyjUbJvZ7 CW6GwHsol3hecmSLDm+R5LvYYQJQFSvvFmNw6hwHMrg+5OOY2eAsFMDO9WtxSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778186424; a=rsa-sha256; cv=none; b=Ds1GtD2FaHD/kzKeghPv1wZ+osTqPngMfIoS9wCw7Lm/EgfZzpMa1ncpYK8rEhYw5rO2GR njzg2j9GeFuqO8KVZRJj4vIy0EPAs94By3+G11qS3gtV4a2CaIJSQV9giz8dfn60/Se9Sq zHdsn7Th7IKXvWl2VSq6raOYhxYrcitixp+Krwt9wzpltE0/QFaxVfOD6Feq2KiXOEQXUU JnUY9KMgQh+1GuCaieeBuwQ9tBtUrlb0f7Phrl+Y/0OmTePqfmuXouCWYKdqPmubbepYBt +vPogJvcNCLF9Agw7/dAZgv5KF2Xb3IvtOFfruPQ96NXlia03oj29UZep8211w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778186424; 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=DThAdjnFMwqMWzTUoRJ5MIjTexvKDh96f+32UYlP4QY=; b=GoskHBuS8/iVBRW13YDTQEnt4FKNaAb+mpdIqTs2oNI1RlIXyxUYCdIqEzheseY5QhtC+Z 1mBIipJ4yzb+bw88IaVDmSdqKgHa9Q/Lw+7r4jtOZ0szwt5deEcXkLc9JoI8A5wp6jTHXW MOq8fGSIji2qEuYOtVPtZdaZpMq/Wz0X8zT+ufngcUtax2sD4+FXaLI5MmFp4A4mDqnque mu68g1LvGTd1yfl2hU0Ms8sgTMvEQQmCHvFBBh5hpKsv+Uj3VLUZNJ8FtwSUStyZ8p1lrW habDrK6wJRJc5CJEpav4ZqqE5q24xWT1u9LI0WY9pzKDYQBG8RXKe0raAW1KJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBPJl6g68zjWc for ; Thu, 07 May 2026 20:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22222 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 20:40:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mark Johnston From: Colin Percival Subject: git: a096a97448cf - releng/15.1 - so_splice: Fix the KTLS check for the sink socket in so_splice() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: a096a97448cfc7e593bcf8873c0f0d3b94f219f1 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 20:40:23 +0000 Message-Id: <69fcf8b7.22222.492f7340@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a096a97448cfc7e593bcf8873c0f0d3b94f219f1 commit a096a97448cfc7e593bcf8873c0f0d3b94f219f1 Author: Mark Johnston AuthorDate: 2026-04-16 19:57:36 +0000 Commit: Colin Percival CommitDate: 2026-05-07 20:40:02 +0000 so_splice: Fix the KTLS check for the sink socket in so_splice() Approved by: re (cperciva) Reviewed by: gallatin Reported by: Claude Sonnet 4.6 Fixes: 1000cc4a0d39 ("so_splice: Disallow splicing with KTLS-enabled sockets") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56385 (cherry picked from commit d88a159da42a75dbd46ea4f6f9c8059975dab5e8) (cherry picked from commit 43b1de5970d1246aa54d8e34b0f211511cc2b103) --- sys/kern/uipc_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 358393a3bf9a..d2ad4e147da5 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1736,7 +1736,7 @@ so_splice(struct socket *so, struct socket *so2, struct splice *splice) return (error); } SOCK_SENDBUF_LOCK(so2); - if (so->so_snd.sb_tls_info != NULL) { + if (so2->so_snd.sb_tls_info != NULL) { SOCK_SENDBUF_UNLOCK(so2); SOCK_UNLOCK(so2); mtx_lock(&sp->mtx); From nobody Thu May 7 20:40:25 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBPJn4Ng6z6bwQ7 for ; Thu, 07 May 2026 20:40: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 4gBPJn0zD3z3Nrc for ; Thu, 07 May 2026 20:40:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778186425; 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=NnnhsGvuR7+ReRuv6gjufb90+BmSjLvt6luscsPwMss=; b=vS3X2Xm18hE7gwr2ZDZSnB2ViiVYfAymCfGe9ZEUVtCz1amY1FmubNjlB0ByA642qG8sdh zJc+KEAs0YJxkvwn0r6F6b0uaHKphe89+Qv2TfOz3bxdtm2L9qu7Wz46nmUyKuiF3e7/yx FqlUgEpJULJlLHvYK3AoLsbBDkTBhOJmz1/sLj5XzC9bdXNMJ/stWY2TFr+EBsySlmjAyt waXI1rUJMBCBmAQ+XOMmCWbJYJ5Y+8MQhWFJymDFK4/aAC+3loOqgdqqcG2aQXVGOQQ3QU rggnIUPt4nLAugLbFRv+BKH7x6006kmHGK++SCFH1DjUPGPPcA5WKG9cJe1RGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778186425; a=rsa-sha256; cv=none; b=fhnr1oml0OD7GQ7Yf+4PNAWyIAbaTT1I5gVOuvm9ulHJ3mC7EZPMpdQpKfxqc1WpDMpw/e zp/PoiHV/s1PniHQKerfBhZG4LdbxBqFxougnoSNlPPmFX3jBYFB8/b65le1bebAOW+6sx 2Duc4+gAvnJtixrnQdONwaYfELrr+3vs7t2sJoxRQj0y0HJKuFMjzTLlcIx+RIkWGGxO1R vLJTYzEFucdqFSbdJ9IB+fAQqTtmZfG7eKJM5FA356sbqDK5FR8QXlFgY10g627PiHhTWi FlQPxP0LzG+jo7hkxf8DXx7l9BFcMpw9Btl/KxZE/ljjWxdm0H5VEJEL0LsREw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778186425; 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=NnnhsGvuR7+ReRuv6gjufb90+BmSjLvt6luscsPwMss=; b=ZQM5+1/p5Ca6LAxBwxD9DOBb57DDw5TkVa9ziB99REbClKU9Z3E20YEtq+X5brq+k7/pEJ pC3iX6X3sD05JmSMKVLT/DLJUiIDIrPkQ39a8ABHoOm1AIXytMXi8OQ85tOnCq2Djax8po E0MohB7YggVlaPZlxZLH8SJWOdB7fOFQfSWvDtjWeDjaPHBGttL4YBKdwAa9rin3eSYkvF XIH1TpJsaZJ2l/yxlLwVy9h7X3+IFJBe8wDHMlJvusYMzxQkOLPpj3MpYbx8G2hc3vdvgc YeFb6R3c2xuUc5xmUGRm1hSy2mVjmg6LOqi8H7VQTnVhsZgyFtiODu20NVjQIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBPJn0Lnjzj08 for ; Thu, 07 May 2026 20:40:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22503 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 20:40:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mark Johnston From: Colin Percival Subject: git: fdd8f30b9f31 - releng/15.1 - nullfs: Clear inotify flags during reclaim List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: fdd8f30b9f314d04698f864c4b2a80b43a71114a Auto-Submitted: auto-generated Date: Thu, 07 May 2026 20:40:25 +0000 Message-Id: <69fcf8b9.22503.6e76b142@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=fdd8f30b9f314d04698f864c4b2a80b43a71114a commit fdd8f30b9f314d04698f864c4b2a80b43a71114a Author: Mark Johnston AuthorDate: 2026-04-26 01:35:37 +0000 Commit: Colin Percival CommitDate: 2026-05-07 20:40:04 +0000 nullfs: Clear inotify flags during reclaim The inotify flags are copied from the lower vnode into the nullfs vnode so that the INOTIFY() macro will invoke VOP_INOTIFY on the nullfs vnode; this is then bypassed to the lower vnode. However, when a nullfs vnode is reclaimed we should clear these flags, as the vnode is now doomed and no longer forwards VOPs to the lower vnode. Add regression tests. Remove a test in vn_inotify_revoke() which is no longer needed after this change. Approved by: re (cperciva) PR: 292495 Reviewed by: kib Reported by: Jed Laundry Fixes: f1f230439fa4 ("vfs: Initial revision of inotify") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56639 (cherry picked from commit a02d794f5acd12ba3cf1de5c204a8dd56af47edd) (cherry picked from commit 10567c80b6845717306c5301d104e7440033c4f5) --- sys/fs/nullfs/null_vnops.c | 12 +++++ sys/kern/vfs_inotify.c | 4 -- tests/sys/kern/inotify_test.c | 112 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 4 deletions(-) diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index a3daa2d8dd54..ee7d89db6b05 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -927,6 +927,7 @@ null_reclaim(struct vop_reclaim_args *ap) struct vnode *vp; struct null_node *xp; struct vnode *lowervp; + short flags; vp = ap->a_vp; xp = VTONULL(vp); @@ -956,6 +957,17 @@ null_reclaim(struct vop_reclaim_args *ap) else if (vp->v_writecount < 0) vp->v_writecount = 0; + /* + * Undo the effects of null_copy_inotify(): setting VIRF_INOTIFY* causes + * the VFS to invoke VOP_INOTIFY on the marked vnode, and for nullfs + * vnodes this is bypassed to the lower vnode. The inotify watch holds + * a ref on the lower vnode, but not the upper vnode, so VOP_INOTIFY + * must not be called on the upper vnode after this point. + */ + flags = vn_irflag_read(vp) & (VIRF_INOTIFY | VIRF_INOTIFY_PARENT); + if (flags != 0) + vn_irflag_unset_locked(vp, flags); + VI_UNLOCK(vp); if ((xp->null_flags & NULLV_NOUNLOCK) != 0) diff --git a/sys/kern/vfs_inotify.c b/sys/kern/vfs_inotify.c index 716fdc96e5fb..94e65973a36b 100644 --- a/sys/kern/vfs_inotify.c +++ b/sys/kern/vfs_inotify.c @@ -889,10 +889,6 @@ vn_inotify_add_watch(struct vnode *vp, struct inotify_softc *sc, uint32_t mask, void vn_inotify_revoke(struct vnode *vp) { - if (vp->v_pollinfo == NULL) { - /* This is a nullfs vnode which shadows a watched vnode. */ - return; - } inotify_log(vp, NULL, 0, IN_UNMOUNT, 0); } diff --git a/tests/sys/kern/inotify_test.c b/tests/sys/kern/inotify_test.c index 0a4df4e5fcaa..d3799b12ce20 100644 --- a/tests/sys/kern/inotify_test.c +++ b/tests/sys/kern/inotify_test.c @@ -392,6 +392,116 @@ ATF_TC_CLEANUP(inotify_nullfs, tc) } } +/* + * Watch a file in a nullfs mount, and remove it from the lower mount. Make + * sure that we get an IN_DELETE_SELF event and that the watch is removed. + */ +ATF_TC_WITH_CLEANUP(inotify_nullfs_remove); +ATF_TC_HEAD(inotify_nullfs_remove, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(inotify_nullfs_remove, tc) +{ + char dir[PATH_MAX], path[PATH_MAX], *p; + int error, fd, ifd, wd; + + strlcpy(dir, "./test.XXXXXX", sizeof(dir)); + p = mkdtemp(dir); + ATF_REQUIRE(p == dir); + + error = mkdir("./mnt", 0755); + ATF_REQUIRE(error == 0); + + /* Mount the testdir onto ./mnt. */ + mount_nullfs("./mnt", dir); + + snprintf(path, sizeof(path), "%s/file", dir); + fd = open(path, O_RDWR | O_CREAT, 0644); + ATF_REQUIRE(fd != -1); + close_checked(fd); + + ifd = inotify(IN_NONBLOCK); + wd = inotify_add_watch(ifd, "./mnt/file", IN_DELETE_SELF); + ATF_REQUIRE(wd != -1); + + error = unlink(path); + ATF_REQUIRE(error == 0); + + consume_event(ifd, wd, IN_DELETE_SELF, 0, NULL); + consume_event(ifd, wd, 0, IN_IGNORED, NULL); + + close_inotify(ifd); +} +ATF_TC_CLEANUP(inotify_nullfs_remove, tc) +{ + int error; + + error = unmount("./mnt", 0); + if (error != 0) { + perror("unmount"); + exit(1); + } +} + +/* + * Exercise a scenario where a watched lower vnode is deleted by a rename. The + * deletion causes the upper vnode to be reclaimed, and after that point it + * should stop trying to forward events back to the (now detached) lower vnode. + */ +ATF_TC_WITH_CLEANUP(inotify_nullfs_rename); +ATF_TC_HEAD(inotify_nullfs_rename, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} +ATF_TC_BODY(inotify_nullfs_rename, tc) +{ + char dir[PATH_MAX], path1[PATH_MAX], path2[PATH_MAX], *p; + int error, fd, ifd, wd; + + strlcpy(dir, "./test.XXXXXX", sizeof(dir)); + p = mkdtemp(dir); + ATF_REQUIRE(p == dir); + + error = mkdir("./mnt", 0755); + ATF_REQUIRE(error == 0); + + /* Mount the testdir onto ./mnt. */ + mount_nullfs("./mnt", dir); + + ifd = inotify(IN_NONBLOCK); + + /* Create two files, they will be renamed in the upper layer. */ + snprintf(path1, sizeof(path1), "%s/file1", dir); + fd = open(path1, O_RDWR | O_CREAT, 0644); + ATF_REQUIRE(fd != -1); + close_checked(fd); + snprintf(path2, sizeof(path2), "%s/file2", dir); + fd = open(path2, O_RDWR | O_CREAT, 0644); + ATF_REQUIRE(fd != -1); + close_checked(fd); + + wd = inotify_add_watch(ifd, "./mnt/file1", IN_DELETE_SELF); + ATF_REQUIRE(wd != -1); + error = rename("./mnt/file2", "./mnt/file1"); + ATF_REQUIRE(error == 0); + + consume_event(ifd, wd, IN_DELETE_SELF, 0, NULL); + consume_event(ifd, wd, 0, IN_IGNORED, NULL); + + close_inotify(ifd); +} +ATF_TC_CLEANUP(inotify_nullfs_rename, tc) +{ + int error; + + error = unmount("./mnt", 0); + if (error != 0) { + perror("unmount"); + exit(1); + } +} + /* * Make sure that exceeding max_events pending events results in an overflow * event. @@ -878,6 +988,8 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, inotify_coalesce); ATF_TP_ADD_TC(tp, inotify_mask_create); ATF_TP_ADD_TC(tp, inotify_nullfs); + ATF_TP_ADD_TC(tp, inotify_nullfs_remove); + ATF_TP_ADD_TC(tp, inotify_nullfs_rename); ATF_TP_ADD_TC(tp, inotify_queue_overflow); /* Tests for the various inotify event types. */ ATF_TP_ADD_TC(tp, inotify_event_access_file); From nobody Thu May 7 20:40:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBPJp4Lb2z6bwNR for ; Thu, 07 May 2026 20:40: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 4gBPJp1WD9z3NpQ for ; Thu, 07 May 2026 20:40:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778186426; 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=sCafn+2iLyaxalQWyoVd2P57Gl6UzaKBXoV2iBkpr7s=; b=LYDgGuH5y5hi5jJvIoyDfKi2ieQ/qe0kO9veP3EKkxni9fbsvyricB0UABIzG5JJ3jB2/z UW3n5cJXGzcmyM76qfgIa2Aa8qg6L95JUIhrGD+MKk5kSgzTrM4xZ+vCaWDGUVwcKs4K+J Wtegeio+fPXIGP2G++xF4QbQVsl8ek0J0hX0g3syPJtAxS/N6O+a+bBaiRWXrLeksTZuKl MPexgRZtIIWYkjK17CSYcdKuANPz+A/aHqXeuVjRaxgFwtZNXXwAPV0PIUTSDSHymwX2ko 0PsN7KVW16vg03Z7yK+PqJleZTybX50D4GkqM1QxhKoyzukFGfHunKPh+KmnXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778186426; a=rsa-sha256; cv=none; b=W578Wu/DPxmE3B/fvbIJcVe8jHZafS3PSBDY0A+q09JRMrjIf49+gAFW+tfln3XlmlYsw3 lhkS8FQuFQS8S5Pmg70wT411zJ2uswAanlp5zrzMSJgeQCZCohbjfbgM5Y0G7lHCphEAJM iURO7iNrxRFzE91s5GzVL04IKpX8uVDefamS47/2Pk8V2ntvB69YSiU7gpCm9VYlpQg8yb tUcxeG4xE6PLy1ObbTskWXsnOqhbLIfcdDfN+l3wV7Wy+lMr6PA0oXIc6EZKjwcpw0WhqZ iJhdBRnWhdi9zDRsI70PA+1fWJ+a0/LGzCEp4DlhR8PlI/9QJoJx9xr1vXbYMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778186426; 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=sCafn+2iLyaxalQWyoVd2P57Gl6UzaKBXoV2iBkpr7s=; b=LtmfflI1Ho2B4oVQTLJ+SqcDJvEMqrjDCkJsEIEdtzA7+kfIai5SqirfA4TPraYLH3pvNg nslwtNdtqGVM9gdHaOvTZeVXtbfrG9wmGn9scwxbRjxtJiPy3/wpCBMs9TKQ57TV+egA35 HsUXB6Jiz8hcIjA4KodrZw9PfI6oLZp86aIoFYP16ELI3jN7ezJ79s9www1oiwU4dmIGjs O9p4PXY9QaDuuu+rDyq97fj9XA03kydzAwofRsJkDXVm78qYpHnJwUtSi+HXIreIZJdM/p uN7BghHRcHyIVracCYP0I3ajOXYSbXVgsBnkffLnMc1pW9xqK/6tFYAUOM571g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBPJp0ktBzj6N for ; Thu, 07 May 2026 20:40:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 223a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 20:40:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mark Johnston From: Colin Percival Subject: git: 87054ce8fb07 - releng/15.1 - tests/posixshm: Check for hardware support in largepage_pkru List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 87054ce8fb0739cde2399e06af7ea083dc2a9c58 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 20:40:26 +0000 Message-Id: <69fcf8ba.223a4.1c3cce77@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=87054ce8fb0739cde2399e06af7ea083dc2a9c58 commit 87054ce8fb0739cde2399e06af7ea083dc2a9c58 Author: Mark Johnston AuthorDate: 2026-04-24 13:23:03 +0000 Commit: Colin Percival CommitDate: 2026-05-07 20:40:09 +0000 tests/posixshm: Check for hardware support in largepage_pkru Approved by: re (cperciva) MFC after: 3 days Fixes: ca87c0b8e396 ("pkru: Fix handling of 1GB largepage mappings") (cherry picked from commit 75c66218401c00f4728d5312e2b933b8d3aefde1) (cherry picked from commit 8988b4de4e3b85baa97fd76254e00da7d3304b35) --- tests/sys/posixshm/posixshm_test.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/sys/posixshm/posixshm_test.c b/tests/sys/posixshm/posixshm_test.c index 8333faa90594..fe6386c6aa4b 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -39,6 +39,8 @@ #include #ifdef __amd64__ +#include +#include #include #endif @@ -1966,6 +1968,14 @@ ATF_TC_BODY(largepage_pkru, tc) struct sigaction sa; char *addr, *addr1; int error, fd, pscnt; + u_int regs[4]; + + do_cpuid(0, regs); + if (regs[0] < 7) + atf_tc_skip("PKU not supported"); + cpuid_count(7, 0, regs); + if ((regs[2] & CPUID_STDEXT2_PKU) == 0) + atf_tc_skip("PKU not supported"); memset(&sa, 0, sizeof(sa)); sa.sa_sigaction = sigsegv; From nobody Thu May 7 20:40:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBPJq4nKZz6bwQB for ; Thu, 07 May 2026 20:40: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 4gBPJq1znxz3Njr for ; Thu, 07 May 2026 20:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778186427; 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=2cMsekQCueSfsYcbgVuFaeucQX/zaQ93r858eaJWgxY=; b=RkaPdgJ1ZGTN5Lm07Om8dV3UUq1ewfyG83+COY7+HvdJ9dmnUHUiENrA4gVTR5SWgMQ+FJ vcKS3UG3OgSO1CqKDQM8iEMdqbxnexKSFJF4UvsqlPqyw8pRR1tJWnjUjWuFEPCn7srZu/ zv5LTt+Sk1/JHAk3i8o/ABuEOYebzRrgpXZ22i+vnoIrXrZh5TwrxEO8a0TCeq2rRcpbv1 I/+hvcCKWZYTWVSM2sNOgPlEphuh1lb51kwjZttlicXMbY1Ji+EnyLMLyCblz8un3h6BTu y1RlDyUsKjEQQ+0Gu1ZFziYEUU6cT5viyVsl7ZTvx3XGOuBv8o4KSF6sZ35Swg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778186427; a=rsa-sha256; cv=none; b=itXOKAUU6u5JE8ceeOBAxMf9BwMeYVck1//qlxpqBEzUb3iwD7JVUvIG0ZjvEJ61iiUK7I tAeadW/sIuumUI1VnxpEIV17mnBYFurFOe/FocmewXK+T2I98B1KCOZcwR33aPdqTljp8t B14KivhFGxHug0dTnwLUMoermbGphZr2p2qADocEBnAT0O1xIjEPUINeo2QiOSVCSRVtck P+PPoKJAZTbWC3GVOILrj1Em8diGc61mducq4Y8g+LR9TYwSYuWUCAMRu96mygdz5x60mf SbdqNYsiMK35OVl7yD4jgZ1j2crsbOvJ/MRDnzcAAB6BJLyZJISyqRQe6HYikA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778186427; 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=2cMsekQCueSfsYcbgVuFaeucQX/zaQ93r858eaJWgxY=; b=XxhgP+r1dFsD+QJ3NN0ARlNFBqyWcCbqzhaKVmlu/8Yhay6v6xR4QrWHU0eJerz5kJ0zNz RQKIJN2bwRtyuTpepHV58mXJPnSnV+ruYqdSDj+wPqf2PgN4cjODpsDyuEDXVsrlzSIYuL FGRcV1OgkVtiumSBj84gufgRuxGFx2lY/1tElSWMs1gB6sG4wOg0vnK1Bua4bdcwX/9UBT LhbORaY8y7NxFJ7xGpfz6j4WchChMPfw61Rf9qkhnGlekeCY/6lLXgw0u0FNq2wqYRp+v8 tTfB75iZkovu16HKJJ4/tpf+eHKF3NP/n5n/0pq4muj/nf+u3koJVHL7bP6nRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBPJq1WK6zj0B for ; Thu, 07 May 2026 20:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22b1c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 20:40:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mark Johnston From: Colin Percival Subject: git: 5dca0c89c81e - releng/15.1 - tests/socket_afinet: Remove a conditional skip List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 5dca0c89c81e2c4c3596e968115ef2170b681a11 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 20:40:27 +0000 Message-Id: <69fcf8bb.22b1c.37cf6671@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5dca0c89c81e2c4c3596e968115ef2170b681a11 commit 5dca0c89c81e2c4c3596e968115ef2170b681a11 Author: Mark Johnston AuthorDate: 2026-04-17 12:48:39 +0000 Commit: Colin Percival CommitDate: 2026-05-07 20:40:12 +0000 tests/socket_afinet: Remove a conditional skip The test runs without any unexpected results when mac_portacl is loaded. Approved by: re (cperciva) PR: 238781 MFC after: 1 week (cherry picked from commit 9f6041fb579106aa6fa358071a14eddabd581998) (cherry picked from commit ae6c11642b54f304490434ec5fe1eb2b470ff620) --- tests/sys/netinet/socket_afinet.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/sys/netinet/socket_afinet.c b/tests/sys/netinet/socket_afinet.c index 56d98c7b3241..f462bed5c4ae 100644 --- a/tests/sys/netinet/socket_afinet.c +++ b/tests/sys/netinet/socket_afinet.c @@ -57,9 +57,6 @@ ATF_TC_BODY(socket_afinet_bind_zero, tc) int sd, rc; struct sockaddr_in sin; - if (atf_tc_get_config_var_as_bool_wd(tc, "ci", false)) - atf_tc_skip("doesn't work when mac_portacl(4) loaded (https://bugs.freebsd.org/238781)"); - sd = socket(PF_INET, SOCK_DGRAM, 0); ATF_CHECK(sd >= 0); From nobody Thu May 7 21:07:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBPvh6b7Mz6bymB for ; Thu, 07 May 2026 21:07: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 4gBPvh65bGz3VSJ for ; Thu, 07 May 2026 21:07:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778188032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zbQDsj+h8XikRGaixweOV9biTwP7GrRZqzzx2TFUEzs=; b=SD1UfPlE7t8iocBEqvkGADFzL2INpDspzrOTD0wr4WKCtre3tMuyoNUg6C2A972lOdtp5Y 9qmKWz9v7e2iUr93UCY9+cFx1pcky/q/TJmUMoc5RGrjTvL2pbS1k+W3SexDaQz74eOge7 BvYw9IscSDkww7XQnPff8QXOe1CUxpQTPex43QCFmkfJWAiPBina7Ohh0HJCZ+dc4TVoJz 2XZ+HG2CLeyPNUA+AUv9qlSZkfcQauO5kZITgwDiG5KkpvMZMsqr0kYyLqW2J/g++2tvAU uqIRsaF/tTAoRhaPqW598ZQPMaUM2usOtcGw/ESZ0lPzUSyJ7y/WG+nixV2CvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778188032; a=rsa-sha256; cv=none; b=dYdTCFtYKSkpT2ca0zTdAAZmZThpbs2uOKpdRtgdZTEUVvNcMvTXKJLHClPSigAgQO8S6F Z9SanNxSYcd6uVnsaIFZx2543w6jyZF4bn6AltoU5FfkJiGgnKuYxPlgwqCxEXU2a/amS4 WynPYRdex90YNL6ztxdujBQSkCldEIHpkgBjCxTBDO9vF3OG3HgBQfugaP7fQGWy3bc6QS gqIZbWCL7pClFcGQ/sKajR3M8Oyuq/HUGOAuwhSGUm8mLAG6jaCa8/DHMN80UYv4dbC6z8 iICgu1jEufcBkZ1LgnQt4nfS7m4FK4km8UVBf1h6Zsx1QlaDzrHrpmhq4VO5xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778188032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zbQDsj+h8XikRGaixweOV9biTwP7GrRZqzzx2TFUEzs=; b=X9jmuNekB34X9PPc8cB7vcrcmKta68NWwl+0Thvq1/rOnbJboqZb7/uB1JbruOJJ85Fk4T Jm3v4lwkyc2S1kfUI2ZPlw0njXNfEAqgrejmje/Y33JH1SqeLW0I1lzTwXDyVKa7CEl9og wDDOgsEMpk9Jj9L+AlI2Xr8h6HY6SVh8qhlUKFjJiQLaeP4yox9edyAWStdcVSSzZH4JCu epaeLj2LK14Okpv6h9J8GpZDHnY9KwB6EL3KxZYFUxOu+ayZbVHtOMyrgcCjXtL0F4k4Li y+zlNJxZZJURoyfO+tPInx/mWl1dO1S4LzhrMWF2g/m5ehtQxPijDELz6H/7dQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBPvh5QSWzk0G for ; Thu, 07 May 2026 21:07:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24e0d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 21:07:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 1d24638d3e88 - main - Fix LOCAL_PEERCRED in 32-bit compat mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d24638d3e8875e4b99a4b5e39f4241e37221b3d Auto-Submitted: auto-generated Date: Thu, 07 May 2026 21:07:07 +0000 Message-Id: <69fcfefb.24e0d.5cdbd5a5@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=1d24638d3e8875e4b99a4b5e39f4241e37221b3d commit 1d24638d3e8875e4b99a4b5e39f4241e37221b3d Author: Alan Somers AuthorDate: 2026-04-27 23:46:53 +0000 Commit: Alan Somers CommitDate: 2026-05-07 20:52:35 +0000 Fix LOCAL_PEERCRED in 32-bit compat mode Previously the cr_pid field would be incorrectly copied to userland, due to a size mismatch between the structure as defined in 32-bit vs 64-bit builds. Fix it by converting the structure before copying it to userland. PR: 294833 Sponsored by: ConnectWise MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D56675 --- sys/kern/uipc_usrreq.c | 21 +++++++++++++++++++-- sys/sys/ucred.h | 11 +++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 8ff9822ee9eb..2508f7edd1c5 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -83,6 +83,7 @@ #include #include #include +#include #include #include #include @@ -2752,8 +2753,24 @@ uipc_ctloutput(struct socket *so, struct sockopt *sopt) error = EINVAL; } UNP_PCB_UNLOCK(unp); - if (error == 0) - error = sooptcopyout(sopt, &xu, sizeof(xu)); + if (error != 0) + break; +#ifdef COMPAT_FREEBSD32 + if (SV_PROC_FLAG(sopt->sopt_td->td_proc, SV_ILP32)) { + struct xucred32 xu32 = {}; + int i; + + xu32.cr_version = xu.cr_version; + xu32.cr_uid = xu.cr_uid; + xu32.cr_ngroups = xu.cr_ngroups; + for (i = 0; i < XU_NGROUPS; i++) + xu32.cr_groups[i] = xu.cr_groups[i]; + xu32.cr_pid = xu.cr_pid; + error = sooptcopyout(sopt, &xu32, sizeof(xu32)); + break; + } +#endif + error = sooptcopyout(sopt, &xu, sizeof(xu)); break; case LOCAL_CREDS: diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index ba241cf9ff3a..4bf48a5e4b87 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -193,6 +193,17 @@ struct setcred32 { uint32_t sc_label; /* struct mac32 [*] */ }; +#ifdef COMPAT_FREEBSD32 +/* 32-bit compatible version of xucred */ +struct xucred32 { + u_int cr_version; /* structure layout version */ + uid_t cr_uid; /* effective user id */ + short cr_ngroups; /* number of groups (incl. cr_gid). */ + gid_t cr_groups[XU_NGROUPS]; /* groups */ + pid_t cr_pid; +}; +#endif + struct thread; /* Common native and 32-bit compatibility entry point. */ From nobody Thu May 7 22:17:30 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBRSp4dw8z6c5CC for ; Thu, 07 May 2026 22:17: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 4gBRSp3zrRz3csy for ; Thu, 07 May 2026 22:17:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778192250; 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=7RHjCEE0BpLzufmYA29QI1MkbXALdFSdeabZKGL8GAA=; b=xXlT/q/pq8gg/nprDlOS4yqWnRYxn+1SJYnYtvV174063vjp1Hi0bE0u8pMQ23ITvrXx8x U8ZzhPOt0O87brcPHkDgLG8kpzS+trMAD6O3QoAfU5s7NFrkXE3jTXNaKtzjJjZV1nsgLw nY8PbQMLLZo/YciBYC3Q7AHblVjyqgnLJZLmvDNLhcw+yhBtrbgtQQzmdnxkk2eAP33fx5 a/vsJclop38QQGd+2uzxiyHDBu2FSarPBW4zIwIuz7Ttyq/t/7LjxnkFcF032ihWylfAh8 VC0woR07l13N7uI1G+p1un4/XCld272gFBwEk3odYlb3XtqcGRxiWGGbaBTJlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778192250; a=rsa-sha256; cv=none; b=x79JOSV95JqF1Kjmtu7ic4JxQ3UdbQMs4otxx+roHCmDzkXETANlNC4m+rRD6X8s1Tf08z AT9vp328bbfR+AkhbGu2nivZn4zsCx0g7E/HOfmg+nTLooc0PZtd0G9BL2Gynop2Fdm928 +WOiAt5+iRJjVvQ+JG97nDLn+Dcm0vjyO1kZPbOfn+idmxKSVLXRRP2Ol6NVHzz7WNbaZK lWeiuectZfPbxzXpuFABb+XcewidBYqJMjmomtdn9FIWbJcosajT62ArWcmjz9BQETK5lH QlRI/nvkFPhggY7ekZKSBvFOU9gA6PxdjaDaxeQQkwsTSr+lUs1dOpTzJI1BDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778192250; 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=7RHjCEE0BpLzufmYA29QI1MkbXALdFSdeabZKGL8GAA=; b=X0j/c/7JHn1FP6TXcRQ2BQrwY74gfMlJdc8RihIA7qM+qlu6ZqJiCYsqRPj5MAPE15UdGz PwHLt8U2cxtS/ctdspeKGHIE0mhfY1CRvvpKFXO8BVAphYG9Sk1HRASJOhXvyrEiK2H6j8 GtUYNGlQPOvHk3NERJfkLe6nvzNDrywDbzWyY1ZxFCpMwMoaYzatjX9uQzOtoRCtHAM7B7 QzL+hGMaHenmxz3UcTkuZFtcSKrLvbBnLMzFoGr54c1HRlLCZIvr33thzIpOaUCJbZrVpo yIqvHmGssV1kqdxkCxFwqpWC8IpwHZ0Xv5Fdspp3M7zRIAc1sAzC1U3bmTxJXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBRSp3b8Czm1P for ; Thu, 07 May 2026 22:17:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32db0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 22:17:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: b3027c2e233f - releng/15.1 - ocs_fc.4: Cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: b3027c2e233f0dc36167bd363cd3bd42b308f49e Auto-Submitted: auto-generated Date: Thu, 07 May 2026 22:17:30 +0000 Message-Id: <69fd0f7a.32db0.51732c86@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b3027c2e233f0dc36167bd363cd3bd42b308f49e commit b3027c2e233f0dc36167bd363cd3bd42b308f49e Author: Alexander Ziaee AuthorDate: 2026-05-03 18:27:05 +0000 Commit: Colin Percival CommitDate: 2026-05-07 22:16:22 +0000 ocs_fc.4: Cleanup + more consistent document description + enumerate available options in synopsis in vt.4 style + tag spdx + tweak list rendering + cleanup HARDWARE + reflow excessively long lines silencing linter warnings + fix link macros Approved by: re (cperciva) MFC after: 3 days Reported by: michaelo (hardware notes) Differential Revision: https://reviews.freebsd.org/D56753 (cherry picked from commit dd97c3d83f9a92bbeb9740ceff4c1c74c451293e) (cherry picked from commit 4da464b1ec4669e658a9839c8ed33f11342b0296) --- share/man/man4/ocs_fc.4 | 93 +++++++++++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 38 deletions(-) diff --git a/share/man/man4/ocs_fc.4 b/share/man/man4/ocs_fc.4 index 714bb2655c15..b132a6eb24ed 100644 --- a/share/man/man4/ocs_fc.4 +++ b/share/man/man4/ocs_fc.4 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-3-Clause +.\" .\" Copyright (c) 2017 Broadcom. All rights reserved. .\" The term "Broadcom" refers to Broadcom Limited and/or its subsidiaries. .\" @@ -27,24 +30,37 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 29, 2021 +.Dd May 1, 2026 .Dt OCS_FC 4 .Os .Sh NAME .Nm ocs_fc -.Nd "Device driver for Emulex Fibre Channel Host Adapters" +.Nd Emulex Fibre Channel Host Adapter driver .Sh SYNOPSIS -To compile this driver into the kernel, add this line to the -kernel configuration file: -.Bd -ragged -offset indent -.Cd "device ocs_fc" -.Ed +.Cd device ocs_fc .Pp -To load the driver as a module at boot, add this line to +In +.Xr device.hints 5 : +.Cd hint.ocs_fc.N.initiator +.Cd hint.ocs_fc.N.target +.Cd hint.ocs_fc.N.topology +.Cd hint.ocs_fc.N.speed +.Pp +In .Xr loader.conf 5 : -.Bd -literal -offset indent -ocs_fc_load="YES" -.Ed +.Cd ocs_fc_load="YES" +.Pp +In +.Xr loader.conf 5 +or +.Xr sysctl.conf 5 : +.Cd dev.ocs_fc.N.port_state +.Cd dev.ocs_fc.N.wwpn +.Cd dev.ocs_fc.N.wwnn +.Cd dev.ocs_fc.N.configured_speed +.Cd dev.ocs_fc.N.configured_topology +.Cd dev.ocs_fc.N.current_speed +.Cd dev.ocs_fc.N.current_topology .Sh DESCRIPTION The .Nm @@ -58,7 +74,8 @@ and Fabric connections. FC-Tape is highly recommended for connections to tape drives that support it. FC-Tape includes four elements from the T-10 FCP-4 specification: -.Bl -bullet -offset indent +.Pp +.Bl -bullet -offset indent -compact .It Precise Delivery of Commands .It @@ -71,29 +88,31 @@ Task Retry Identification .Pp Together these features allow for link level error recovery with tape devices. -Without link level error recovery, an initiator cannot, for instance, tell whether a tape write -command that has timed out resulted in all, part, or none of the data going to -the tape drive. +Without link level error recovery, an initiator cannot, for instance, +tell whether a tape write command that has timed out resulted in all, +part, or none of the data going to the tape drive. FC-Tape is automatically enabled when both the controller and target support it. .Sh HARDWARE The .Nm -driver supports these Fibre Channel adapters: -.Bl -tag -width xxxxxx -offset indent -.It Emulex 16/8G FC GEN 5 HBAS -.Bd -literal -offset indent -LPe15004 FC Host Bus Adapters -LPe160XX FC Host Bus Adapters -.Ed -.It Emulex 32/16G FC GEN 6 HBAS -.Bd -literal -offset indent -LPe3100X FC Host Bus Adapters -LPe3200X FC Host Bus Adapters -.Ed -.It Emulex 64/32G FC GEN 7 HBAS -.Bd -literal -offset indent -LPe3500X FC Host Bus Adapters -.Ed +driver supports the following PCIe Fibre Channel adapters: +.Pp +.Bl -bullet -compact +.It +LPe3500X FC Host Bus Adapter +.Pq Emulex 64/32G FC Gen 7 HBA +.It +LPe3200X FC Host Bus Adapter +.Pq Emulex 32/16G FC Gen 6 HBA +.It +LPe3100X FC Host Bus Adapter +.Pq Emulex 32/16G FC Gen 6 HBA +.It +LPe160XX FC Host Bus Adapter +.Pq Emulex 16/8G FC Gen 5 HBA +.It +LPe15004 FC Host Bus Adapter +.Pq Emulex 16/8G FC Gen 5 HBA .El .Sh UPDATING FIRMWARE Adapter firmware updates are persistent. @@ -131,11 +150,9 @@ Check kernel messages regarding status of the operation Reboot the machine .El .Sh BOOT OPTIONS -Options are controlled by setting values in -.Pa /boot/device.hints . -.Pp -They are: -.Bl -tag -width indent +The following boot options are controlled by setting values in +.Pa /boot/device.hints : +.Bl -tag -width hint.ocs_fc.N.initiator .It Va hint.ocs_fc.N.initiator Enable initiator functionality. Default 1 (enabled), 0 to disable. @@ -181,9 +198,9 @@ Current Port Topology (read-only). .Sh SUPPORT For general information and support, go to the Broadcom website at: -.Pa http://www.broadcom.com/ +.Lk http://www.broadcom.com/ or E-Mail at -.Pa ocs-driver-team.pdl@broadcom.com . +.Mt ocs-driver-team.pdl@broadcom.com . .Sh SEE ALSO .Xr ifconfig 8 .Sh AUTHORS From nobody Thu May 7 22:17:31 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBRSr0DWlz6c574 for ; Thu, 07 May 2026 22:17: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 4gBRSq4PtCz3d17 for ; Thu, 07 May 2026 22:17:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778192251; 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=oUpU97YPYQu6ckOLJjSOwWjloA9F4yt2SGn2EjJ4jNo=; b=ue1+VUQz9cPm6TM1/pM1xehApzvrUfFcF9UQeHujkOg3jOAKfrJHx4NV+m+G3j/fRTyp5H qTDH5CZE+8E73Rp3HpOMll2n+dN6QShL+f29QVNTt1JULRjVbMLg0K3TEPJ3EjMAR8Ffor cxOK3q7/wxgJoReNZszPbso0O1lazsU31QW5LZ/ILz5vNoWAhzRbNvUKvMtfo30/UUt4JK y6pwRBFhb03qFQROoOHGVqS7t0rN9XbFsfTtn34NV2k49wHzqEZzn5Z20+fFQlRIa+h2vG ylnJ8E2iAxqaaG9ExPfUP6SKBx3fxOVkhz5JmgOOlOSh3FdhUEKWdH4hSGlMgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778192251; a=rsa-sha256; cv=none; b=cG/N1aD503ksq1uMT4uVWJ8tJ8pXlhTCYDHO2EUMHezfr/RBE2QLR196Zmh/l76J9UCad2 iSZO4AaidebTtU3n4t+XIwSBdIA/Rc+pCfjv5h/Uw+J7v8z2NSscDvQM3IlahaPvvh6q25 p1qVr0qDrXLcu+hDzHgxyDBnpBd2MWkdA/vkfOiw53LUmD+2JpSuPZaaRJpV1FIdd+wDo5 TV2PcGVRULN4Kutcu7Vw+ndYLWAfm7Rxp4CJ42ET+ztBN6h4xXI2arEt12XhFrkNa4wi/6 jlM1szWwJr2r8UfJZJrQ5S4KZRgvlslsOh1DfvvTL2Ag3w6IParmqVQIo2J8Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778192251; 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=oUpU97YPYQu6ckOLJjSOwWjloA9F4yt2SGn2EjJ4jNo=; b=Itfgi4tW+IP3qkDZAlHAA3EHU0ip2byiuWSq6YSYRPHizwItT2rgcWpLAnpp351bA3xikI HitG+Gq8LqCFPkXaKisOu61cMYmlxoI00SRgGQWQ2yYJOoGPJNU4Y/xoFR8LnZ2fGVv9qT DKi9OC52bySymsRYhSXYDNUKZDxp4W77V/9Pd6oFx0RiXaIYnDit52SESdS47iQ5SA7Zk6 aWwYBtn1/qWRRHNDeEj+Ugxtg+5RIXpoZ/fImF29NklNzBStAx2uKTUb8adnPiF1bbTMg8 yQU9rUOnoJEGo3AHFl9H5X+isHVOS+iIB8aG/tqyrZu0DfHe4CICjhudzyY1Ww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBRSq3tqpzm8s for ; Thu, 07 May 2026 22:17:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3442f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 22:17:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: 519c687b64d5 - releng/15.1 - nvram.8: Align option list and tag SPDX List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 519c687b64d5f6046241372eb9a5c4360fabd4d6 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 22:17:31 +0000 Message-Id: <69fd0f7b.3442f.4f7a5b6@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=519c687b64d5f6046241372eb9a5c4360fabd4d6 commit 519c687b64d5f6046241372eb9a5c4360fabd4d6 Author: Alexander Ziaee AuthorDate: 2026-05-03 17:39:27 +0000 Commit: Colin Percival CommitDate: 2026-05-07 22:16:26 +0000 nvram.8: Align option list and tag SPDX Approved by: re (cperciva) MFC after: 3 days (cherry picked from commit 33fbfceeb4d9daf1145089a10ce7b25110d8840f) (cherry picked from commit 8318c2f613bea98573aa4cd9ef7a4249d5010dd3) --- usr.sbin/nvram/nvram.8 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/nvram/nvram.8 b/usr.sbin/nvram/nvram.8 index f0b63cdbc731..c326551b72c9 100644 --- a/usr.sbin/nvram/nvram.8 +++ b/usr.sbin/nvram/nvram.8 @@ -1,4 +1,6 @@ -.\"- +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2006 Maxim Sobolev .\" All rights reserved. .\" @@ -51,7 +53,7 @@ following by sign. .Pp The following options are available: -.Bl -tag -width indent +.Bl -tag -width "-d name" .It Fl d Ar name Delete the variable selected by .Ar name From nobody Thu May 7 22:17:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBRSs5bWcz6c5CH for ; Thu, 07 May 2026 22:17: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 4gBRSs0RB0z3d3f for ; Thu, 07 May 2026 22:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778192253; 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=hVIeQQRdoKgfn0zvBClS5dOddYax0yr//hnYnaYyZJU=; b=nQu4W939dYNmw3SwWUtSO5Wi1oMcqQHSjhPAQfw30cs2YBynnIfB0nSxc6PfsF6135+74X rWonJUUbnS1DARMODQlcDhJD4zBsOcgAV9yr5IIInejGYAhDGhZ8y1doXFeN8DENe5NiJL 9ZTTu4ILpna8Shofw8sKL/pF/0g8iSARzyh/5kLULw9CkBH6joyMiC+RpjIiySEqTipCTs CCdKI9EB3CFnwE4Kq3Vl12OKYlaUiOGWd7PVO+44lfwBLxbxG/44nEOGT+ufkBaNBS1t9a eJiDlH0SNAA100zkdPo/et0FGeTsE1oqiJtPot2d18OL27SYN330XcBOK+O2Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778192253; a=rsa-sha256; cv=none; b=dKGTFbH6aMeI8JVY23d2bHj8U2k1LA0I7af9wcXHHMFz5df48vQQW+R7MkpgzotMsUcdr7 AXl0rn9kg9ZV36h2Zyr3tizGYwzDAZQc7iu0O0zNe9TtlbK6GLriucUzYAhRsc9xlpvzcB m0u1Hn4f/LtZCyYOmpMikul1so4MI/A0NTNVYB6vmQXGihsqO7VOa1ZiwTbAskmqH45Q6C N2oEHaXn3oDIbw3b18csj+72TTCvoi4Y9oTYb0ZUfZmOjXWMasamHRpPL/I+q32OwMnVFc egWhnwA9MT50zZXA1+BfQvMbE/g5q86t0ULc9k1fsRnD3M7M2isyI2WwcZwdzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778192253; 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=hVIeQQRdoKgfn0zvBClS5dOddYax0yr//hnYnaYyZJU=; b=cXNltsGlxSNdEyvcltRsK+05B8NObcbd4R2s0gacwnGE6lTPtOLY2vdbqFhHLI8Wn99bDu 9uc7++gcndCdDA9tDgPTwJy8jEuKTiiMFOCoRzp9VaCuxUBlvx+NWpmc8QDnukW0uGnIc7 z1DUZUpmNKfrNm2hDFZ4UOZjx4oz+/iK0DZZq1t/xJbXQEnSnOVoSF3HlxBUNw0cZ6oXuP tUoyNjiaEIp9tyleygjZyY6lbZfmcXmmCI2ryBJ04Be7e7YF2eb7T48+5LnBCkFhJASkRO fpSi+nD4FuevPkuMaEOpvhq9wBpPNfnk0k/2pDgzod5AzuSdOIwBXIa/Ry/6jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBRSr4NVMzlcJ for ; Thu, 07 May 2026 22:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32db5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 22:17:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: 1b5b7867b67f - releng/15.1 - ports.7/FILES: Expand and refactor into 3 tables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 1b5b7867b67fdbe412cc4136834f21dbeef26bea Auto-Submitted: auto-generated Date: Thu, 07 May 2026 22:17:32 +0000 Message-Id: <69fd0f7c.32db5.10ee48b2@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1b5b7867b67fdbe412cc4136834f21dbeef26bea commit 1b5b7867b67fdbe412cc4136834f21dbeef26bea Author: Alexander Ziaee AuthorDate: 2026-05-03 17:25:41 +0000 Commit: Colin Percival CommitDate: 2026-05-07 22:16:28 +0000 ports.7/FILES: Expand and refactor into 3 tables Add make.conf, CHANGES, CONTRIBUTING.Md, UPDATING, and Tools/scripts. Refactor the FILES section of the ports reference manual into a bigger table with three sections separated by root directory. Remove preceeding article from all but "the big Kahuna", and root dirs where reasonable. Approved by: re (cperciva) MFC after: 3 days Relnotes: yes Reported by: adamw, arrowd, linimon Differential Revision: https://reviews.freebsd.org/D55441 (cherry picked from commit 28deec9b7e2b08b00160eb39de84ade6f27eb125) (cherry picked from commit aa519edfe50a65db516e62752914cb6922b3227f) --- share/man/man7/ports.7 | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7 index 6e28f85da964..f187a1d8c1ce 100644 --- a/share/man/man7/ports.7 +++ b/share/man/man7/ports.7 @@ -25,7 +25,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 February 21, 2026 +.Dd February 24, 2026 .Dt PORTS 7 .Os .Sh NAME @@ -596,30 +596,41 @@ Which directory to use for the data. .El .Sh FILES -.Bl -tag -width "/usr/ports/Mk/bsd.port.mk" -compact -.It Pa /usr/ports/ -The default ports directory. -.It Pa /usr/ports/Mk/bsd.port.mk -The big Kahuna. -.It Pa /var/db/ports/ -The directory where the results of configuring -.Va OPTIONS -are stored. +.Bl -tag -width "ports/CONTRIBUTING.md" -compact +.It Pa ports/CHANGES +BREAKING NEWS to read before creating ports! +.It Pa ports/CONTRIBUTING.md +Instructions for contributing to the ports tree. +.It Pa ports/Mk/bsd.port.mk +The inner workings of the ports framework. +.It Pa ports/Tools/scripts/ +Grab bag of tools for maintaining ports. +.It Pa ports/UPDATING +BREAKING NEWS to read before upgrading ports! +.It Pa ports/distfiles/ +Directory where fetched files are stored. +.Pp .It Pa ${PORT}/Makefile -The specification for building the port. -.It Pa ${PORT}/distfiles -The directory where fetched files are stored. +Specification for building the port. .It Pa ${PORT}/distinfo -The checksums generated with +Checksums generated with .Ql make makesum . .It Pa ${PORT}/files/ -The directory for any patches. +Directory for patches or any additional files. .It Pa ${PORT}/pkg-descr -The long description of the port. +Long description of the port. .It Pa ${PORT}/pkg-plist -The list of all files installed by the port. -.It Pa ${PORT}/work +List of all files installed by the port. +.It Pa ${PORT}/work/ The port's building and staging directory. +.Pp +.It Pa /etc/make.conf +Settings for the port-building framework. +.It Pa /usr/ports/ +Canonical ports tree location. +.It Pa /var/db/ports/ +Directory for storing configured +.Va OPTIONS . .El .Sh EXAMPLES .Bl -tag -width 0n From nobody Thu May 7 22:17:33 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBRSt2l7pz6c5Gq for ; Thu, 07 May 2026 22:17: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 4gBRSs6Bzfz3cqR for ; Thu, 07 May 2026 22:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778192253; 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=6Z3MsxnWUr7dxc2e2ncJXtSEUH8ghUkM/kAoRTj38gE=; b=SAMzsAvCeNaiHp/lTVR2ydonhd4IXWG22j1Y/jXCoLSIbl7Is0ZW2dRntnUcE/mFQ6RpLC 8esk52Ei8CdTetI6uILciATe/D8Ud9iIHaTQyKJwVTvy138Ypa1VpsJI9En3ZS4sZYaR6J FWBARuWbZNbgM0equDwnj+v2jFLZPBNFiTwmnvPl5UYmDR4BCkBJ6bHcupYz/0BF8jFlER frmiT7h0niBkz4KU4poM+BuMaJ2e8ox+EZaeC27iMeWx4PSyFc8ZtW84ztfN+FtGylD8XH ZwvVdZM5Bcgc5wpjOiAA64Jx0XZ2oLJqZNrII9ncplQOawkBp3xHDe0rCfLmqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778192253; a=rsa-sha256; cv=none; b=rUy6uE0YwZQDGMEPb9aujw28PKJhqcvp4S3sJuXv/p6X/Dv0J+wqkte/WVbZFRozEpYJ37 ukuX/ySNCAmkaPv5GBzLZSsbPKkoxStPW1QTzsWgik/jX6ENF7Dj8STuVaTISo+0gOSi/q AV1Zl77xKAqf07auk9MUaqDriDOoNseX0STl3dxZg1zuMrH9Wton+8FmBSZxxDswmP7yzj m3WYh0C00nXx2VmmWz1hAaiOOoDXtPmAdCmkObpbjbQ2krD2RgOahYI/mdGORwq8HXnEbs RMTSc/BvFQ1tvGi7Qr63BP+Xve0V1ZCe0s3l07sK0//zlgrdxduMMjfj1A47uQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778192253; 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=6Z3MsxnWUr7dxc2e2ncJXtSEUH8ghUkM/kAoRTj38gE=; b=P32OTmKWHzB3ako2WoVJbig8OeQjFRQnp4ASSqWrOfolKyL6PYSqWdvy9UCkKi3Ou0clnl 4+w95rZboX9EvdjLiOdF1w7M7m0ezqo7ZFekuPjZv7jeQ+NgDdktD/LvNanBWTqzF7I2AI OSgd7uxMwHLq2XGt3bj/t3vf8CUSiNHdwLbyy6n0RNMb80oTZfIMGYf5gTD1qeOWI3ziTR UthcLEnjl+mp0R7TjY5BNwcl3ntVWVRqRkgULibCOlZf/UavsnzfkXNWgGFks/gqZJma3G REETDuUQsJs+felqg8GXS1W/JZFt2bJSnfsZfXNifn4ZdiFtcEnNEdo+APfF0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBRSs59F8zm6c for ; Thu, 07 May 2026 22:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 339de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 22:17:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: bf5ca5ced57d - releng/15.1 - bsdinstall: Improve auto-partition message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: bf5ca5ced57d615093056e7f8013497b0fe4068f Auto-Submitted: auto-generated Date: Thu, 07 May 2026 22:17:33 +0000 Message-Id: <69fd0f7d.339de.4ad9f0f8@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=bf5ca5ced57d615093056e7f8013497b0fe4068f commit bf5ca5ced57d615093056e7f8013497b0fe4068f Author: Alexander Ziaee AuthorDate: 2026-04-28 16:59:19 +0000 Commit: Colin Percival CommitDate: 2026-05-07 22:16:32 +0000 bsdinstall: Improve auto-partition message Manually tuning ZFS for systems with <8GB ram hasn't been necessary at least since the switch to OpenZFS. We have users reporting using 1GB RAM with no manual tuning/issues. Further, the page this links to is a stale wiki page, which is causing complaints. Remove this misleading note and replace it with a similar message for UFS. While here, reword that note to be a bit clearer. Approved by: re (cperciva) PR: 287719 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D50971 (cherry picked from commit 5ed26c21e4ff1d478d4611abbf3dc14cc1b77244) (cherry picked from commit 5702d242429f1f791e05a720a9a411b1e64212dc) --- usr.sbin/bsdinstall/scripts/auto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index 2204b33ae105..5017fe15d826 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -50,10 +50,10 @@ msg_abort="Abort" msg_an_installation_step_has_been_aborted="An installation step has been aborted. Would you like\nto restart the installation or exit the installer?" msg_auto_ufs="Auto (UFS)" msg_auto_ufs_desc="Guided UFS Disk Setup" -msg_auto_ufs_help="Menu options help choose which disk to setup using UFS and standard partitions" +msg_auto_ufs_help="Choose which disk to setup using UFS and standard partition layout" msg_auto_zfs="Auto (ZFS)" msg_auto_zfs_desc="Guided Root-on-ZFS" -msg_auto_zfs_help="To use ZFS with less than 8GB RAM, see https://wiki.freebsd.org/ZFSTuningGuide" +msg_auto_zfs_help="Choose which disk to setup using ZFS and standard partition layout" msg_exit="Exit" msg_freebsd_installer="$OSNAME Installer" msg_gpt_active_fix="Your hardware is known to have issues booting in CSM/Legacy/BIOS mode from GPT partitions that are not set active. Would you like the installer to apply this workaround for you?" From nobody Thu May 7 22:17:29 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBRSt4YZ6z6c4w1 for ; Thu, 07 May 2026 22:17: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 4gBRSt3CYXz3ctH for ; Thu, 07 May 2026 22:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778192254; 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=DRCX86gmBU6nYdOpFLznFlsn2RoO2yMhDcTIdotIKeo=; b=F0ZvvfHXa+TOi81pq1+8cqnevrSQLXwNazAu3jHyqe7Mnm8s/np/N3yyuP4MkIjCPjiJfl WDw7o+3MPW5OpQX3E5eprCNiYUZlCvVzy38282ilPw2EPw+PcdhTSW/fNwR46eoCyygRNw t9vQ5P/5SBYFcvEzRakD4BwGevkKz5soYyA3y2T+GBJbMM+u6DnH+ALXd7Yw466pMeYLNN Uj/Bk1UsBX5+8naF/8nzSMIQ1ehYnSy1zUOdQZQV8odxl5mcihuxmdmNjlWEEs7zy5Zf7I /uXoIBGOSo6ZYMxrlFte9GPr0QNz+AzD46sGiV89UcBGWK7dvdqRt7FHHAKXSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778192254; a=rsa-sha256; cv=none; b=YuuO/+a/QDEshaie6LA6K0fcwxPaFIFJkuijDfbOGlkV4DnkE2Pq6mNIcIFTXzdn24pAa8 cSqsYmPAJ4FoDKTx8Zbwt4rNiQeffcEwWbU3mpQtIEK1keXf+1xieZNMSjCedHoz/pTP7J JCbhvp+VmoFa9/a4tKUAsFqknEOpKEpmuQ/gg59eNV445u2zw2sGENZAwmuPhm6HwIRSm9 AVKi63PVvdZXafgvv4hwW4y20VCLza+rCTFj4Ic/5EIK8TMLv5lukmnWJPI7T+dlreS2nP EXFQ4JuCzavBfvrkAJK8RxERR+hCd1Bcz/lBxi45/FBaXcJL3+FEJXmqBbCZBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778192254; 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=DRCX86gmBU6nYdOpFLznFlsn2RoO2yMhDcTIdotIKeo=; b=hA1F8ps/Z6FVfe7bhOgQrVdVkvxDRQxGTo/GaHDHSvTvc89n8z7qMjk6iHi4ctfcJz4oFz S2JZlj2XizhISa0HRiX2QJPaMEMrUGpeNEiVCnBvYpnaxrrXkDpojWJSAcQOKAds7DD954 jqii4ArU2nI/1XVF/VJlwwlbaDn7V6FkY/EzCT2WzKPcekyx7Zyd4s/O2L+rMj0C2uhBsM FjOrCHkkSKwaHJSrK4c6ZZeoYrBRMDmTWaKqIVOrf3ykWyX42rgunfnBihOJhMF3X5xWM/ HIyT7SGJbO2cyTrp3KYC9sMxWSk1g38/YCEL4/46zyYCrWyOPrKEEDQZlCA24Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBRSt2THwzlsN for ; Thu, 07 May 2026 22:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32dab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 22:17:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: a9b681e4a5c7 - releng/15.1 - man: Kill off MANSUBDIRs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: a9b681e4a5c7c9ff1ef7f67886b27a2dab541c17 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 22:17:29 +0000 Message-Id: <69fd0f79.32dab.10bbb2fb@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a9b681e4a5c7c9ff1ef7f67886b27a2dab541c17 commit a9b681e4a5c7c9ff1ef7f67886b27a2dab541c17 Author: Alexander Ziaee AuthorDate: 2026-05-03 17:53:25 +0000 Commit: Colin Percival CommitDate: 2026-05-07 22:16:16 +0000 man: Kill off MANSUBDIRs 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 unconditionally installed, and noted at the top of the rendered manual. Approved by: re (cperciva) MFC after: 3 days (cherry picked from commit 809504f331fd3588e36b54255196379bdb59890a) (cherry picked from commit 55709c8a46a470af78c0c818b36ac90615728c44) --- ObsoleteFiles.inc | 9 +++++++++ usr.sbin/apm/Makefile | 1 - usr.sbin/apmd/Makefile | 1 - usr.sbin/nvram/Makefile | 1 - 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index d8090aa28cc7..ebf2f4e6ceba 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,15 @@ # xargs -n1 | sort | uniq -d; # done +# 20260503: Kill off MANSUBDIRs +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 +OLD_FILES+=usr/share/man/man8/powerpc/nvram.8.gz +OLD_DIRS+=usr/share/man/man8/amd64 +OLD_DIRS+=usr/share/man/man8/i386 +OLD_DIRS+=usr/share/man/man8/powerpc + # 20260430: Regenerate trust store OLD_FILES+=usr/share/certs/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem OLD_FILES+=usr/share/certs/trusted/AffirmTrust_Premium.pem diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile index f9b3e11d22fa..81f47b8ff7b6 100644 --- a/usr.sbin/apm/Makefile +++ b/usr.sbin/apm/Makefile @@ -1,6 +1,5 @@ PROG= apm MAN= apm.8 -MANSUBDIR= /${MACHINE_CPUARCH} PACKAGE=apm diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile index bfe59cc7cd7d..9e693c630308 100644 --- a/usr.sbin/apmd/Makefile +++ b/usr.sbin/apmd/Makefile @@ -1,7 +1,6 @@ CONFS= apmd.conf PROG= apmd MAN= apmd.8 -MANSUBDIR= /i386 SRCS= apmd.c apmdlex.l apmdparse.y y.tab.h PACKAGE=apm diff --git a/usr.sbin/nvram/Makefile b/usr.sbin/nvram/Makefile index 7d27790ed132..4988763c73b4 100644 --- a/usr.sbin/nvram/Makefile +++ b/usr.sbin/nvram/Makefile @@ -1,5 +1,4 @@ PROG= nvram MAN= nvram.8 -MANSUBDIR= /powerpc .include From nobody Thu May 7 22:17:34 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBRSv0j5cz6c5FR for ; Thu, 07 May 2026 22:17: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 4gBRSt60lqz3cbR for ; Thu, 07 May 2026 22:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778192254; 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=74cknobqVmAohWUnZz5WP6U6IF73UA14CXljHb7ze+8=; b=eBiLpe9B8cHkmpxVYrMCQfy20X7upE4L4jG6km4ldR4mVerL8Kq+E1gPe4fkma3eiLXkmY mFxfqjuLfzS7lXQ2ua5QA0E4dVuDD52xrWM5UD8dZ6emvmM3jRaHx37+3z3t4tCcK77ycj Sufq0hGhUfUhOTzmDDWFDvjhPmIN28h4MymRMzJLB5SzI1ESrHBJ7mQyuvXZmtZQTXjBPU xTCKRArqOf6sILrdxh30P1OHhwHKpM/LUDMju0iEhzUWJs+usk22dZo8s3KZPq07FzHWwj tBgjtoIWdLD7wl+Z19RLWlKng6bDqf4/d9L25+288Q8KEx2SBxQEwlxbVsG4NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778192254; a=rsa-sha256; cv=none; b=wSuSTtGmf7W+gpyRqiZoZi45zshvG9FIia3kS652Wf8QCOvsOWLteCJL4TlqHMnrXFfUEl WTKIi4cFK+iBF6nSYCFGJCP0zxAuT6fqhmuQ1uaTNNhmWARXjpEGsw/NPF4FlVJ/ErVjAp o5C6rTRMdPB/OOqk2YDE8n31EiVRGDY0JaLrY94sVnx0JM22Rz78QA6KI4UGKp7SGkH2ln HwQjECKZvLUNLizZ22QOf6mjPpew1OLPahHcx47kG36cxUiKj9TSZfKRmAC4T2VmlPW9WQ d01L71RThtpYgK3BdX5ErmaUAM6siSE12K22LIVRKq/66c1m0wqJTgTNAXAHuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778192254; 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=74cknobqVmAohWUnZz5WP6U6IF73UA14CXljHb7ze+8=; b=cKnZVGGpslu1uPTD7I3aXzWcLzM7wXjrmCVu/NPl0SYNtPjTMTm9/x5qvfO4HxHUMwGuTf PBG6RUl3Ipokj5an/xhOevxctogu3rUqMicA4nNpcIMI6rX31kz85NPxBqxOTh0dxTlNBK Hn4wIkMNA19Ehmd1XhkSZJZL6ToKNXNur/z5cdoGltFzaEHJBCK8e9p8GeiDRbVIHnjMgh VHF3X6VGCYi3tW7NCVML0DKtmgBMX7x5AJ06AfPX1w4lGFEMsZAhjiLzL7hwQrqH+DvH3E GWE3ixlIpoiBrHyX8Z/5kT7iMQmJ080wR+t5qxBh2AKMRRyil2dNoQNmLYAYMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBRSt5XVgzlxt for ; Thu, 07 May 2026 22:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33524 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 22:17:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: df38b410cfed - releng/15.1 - build.7: Explain update-packages repo signing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: df38b410cfedfc12250cb66fb7fd8b852fb21335 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 22:17:34 +0000 Message-Id: <69fd0f7e.33524.e61cca8@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=df38b410cfedfc12250cb66fb7fd8b852fb21335 commit df38b410cfedfc12250cb66fb7fd8b852fb21335 Author: Alexander Ziaee AuthorDate: 2026-04-28 16:55:11 +0000 Commit: Colin Percival CommitDate: 2026-05-07 22:16:35 +0000 build.7: Explain update-packages repo signing Approved by: re (cperciva) MFC after: 3 days Reported by: kevans Reviewed by: kevans, ngie Differential Revision: https://reviews.freebsd.org/D56607 (cherry picked from commit ab98fd3234304ea10db3dee70205828d372c443a) (cherry picked from commit dd926806a723b99c9184ce44ab68b83c03fdc173) --- share/man/man7/build.7 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index 6d040b6f8f02..7947f6186b71 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 22, 2026 +.Dd April 28, 2026 .Dt BUILD 7 .Os .Sh NAME @@ -373,10 +373,18 @@ defaults to Create or update the .Xr freebsd-base 7 package repository for the base system. +.Bl -bullet +.It If an old repository is being updated, then packages whose contents have not changed since the previous version will be copied into the new repository to avoid needless updating of the version number. +.It +If +.Va PKG_REPO_SIGNING_KEY +is defined, the repo will be signed according to +.Xr pkg-repo 8 . +.El .It Cm xdev-build Builds for the .Cm xdev @@ -1152,6 +1160,7 @@ Study the examples above. .Xr config 8 , .Xr etcupdate 8 , .Xr nextboot 8 , +.Xr pkg-repo 8 , .Xr shutdown 8 .Sh HISTORY The From nobody Thu May 7 22:17:35 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBRSw2v05z6c5CS for ; Thu, 07 May 2026 22:17: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 4gBRSv6V4kz3cwK for ; Thu, 07 May 2026 22:17:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778192255; 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=JkiI90Lf/H9X+mpc0rv2gvMIi1HKGI8l4N8dLB28Bq4=; b=tBmiUwVZEiXLIZj4du+JpOZcAnOtHv9ISl4CDZsZVbDtGVFJEDWkGIASPKnW+l98w2TEuK SQkZ6EepS5hIYP0bT5BzxrC5Vau8xH46tP3Rw6h7FNpG/dwKiVd8mcy+vNAI7R8OAqj2gI jZApolJcamnTgtoDmqdG+DzRv0+lgL4XuDGrzfgXOzA0hsfmEq8/BAz2zP/K800CksSkzr hC5k4JzlWElMI4YVirvhMQyjwaZtId8db99+3OIb5fbAJWQN8E23P3EjmFx6hRsunIvYL0 heFntXDCFbsBAYzUanRs5rYVBL5qYc/9+NJTO8sZXc4vevqLU4McjME7Xdls6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778192255; a=rsa-sha256; cv=none; b=nYhf3Ih04/jKIYFawZasyIkda/HekF3oxAsG/xdH7L/4vFLTpB7kz+2/j4xZDuI4SGibCF GGU/m4u468F6vN+9RVHHtMZ8y0ZD070FjA6NHIVFHvqFgFEG9ESnytbrzVo8TqGSX16JT1 7f4HA87/znfG6bWbkPtHNGWGAXzDYRdtGSLMSCntJhGRhHuCmRFTc5Pzx/8RwFDUl6k4/4 VdLwSE2wR5XqsBzSWka8tNYgGT3ZEm5K865vJYlI9WFi0hc8LwPD6UODqRNpUwBlU2qOfH 9Md/olBYIATeNjXwETwqDDXvUYEzl6BLQ4Lis+POZcxaRIIPbRwgwaRRVS2YHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778192255; 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=JkiI90Lf/H9X+mpc0rv2gvMIi1HKGI8l4N8dLB28Bq4=; b=Hx75FzV94PHqxphWsuhfK0OKFtYse1d1/0n9ouYal0/h5IlstKxmJ3Fsbf+x/ThHrX/LJb /TaB+2hVvxNWne5Mpy6T1mUa6/Ftxkm1U3+XNgsSYTb13YhZ0GbDTARU8B3eTb3hNLC4R6 TI1JtdW5f4nzyUANTPQEFwCWOkANadtoBJb9CO9x4FUI4pHUQxavSk/3Wz8DeUNmRa+ew3 BcqBpLTDP413/u1jQdfPS3pjK3Zrt5OWX0F/zxBFFgUaQZK4g5ghBSN2a8EkGarGwc53j+ sUIpCCy4/mmw7imxW7EwBVDs3mZ6Pps7Dm+7rbhvJxYSU1aXpc/qjgi17opkUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBRSv5thjzm1R for ; Thu, 07 May 2026 22:17:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 314fd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 22:17:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: 7781f5e09ffc - releng/15.1 - dtrace: Improve dmesg kernel message prefix List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 7781f5e09ffc70e7b0618533b65838882a47c4ba Auto-Submitted: auto-generated Date: Thu, 07 May 2026 22:17:35 +0000 Message-Id: <69fd0f7f.314fd.71fc6d78@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7781f5e09ffc70e7b0618533b65838882a47c4ba commit 7781f5e09ffc70e7b0618533b65838882a47c4ba Author: Alexander Ziaee AuthorDate: 2026-04-17 15:25:01 +0000 Commit: Colin Percival CommitDate: 2026-05-07 22:16:38 +0000 dtrace: Improve dmesg kernel message prefix Provide intuitive log search keywords and increased system consistency. Approved by: re (cperciva) MFC after: 2 weeks Reported by: mav Reviewed by: 0mp, dteske OpenZFS change: d45c8d648 (Improve dmesg kernel message prefix) Differential Revision: https://reviews.freebsd.org/D55765 (cherry picked from commit 49e9b3061df036a73e8bc424c026158f3f57b183) (cherry picked from commit b5f45474517646c3df377a75e50260026742ee92) --- sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c b/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c index 24abeb66ea51..a9c2a0906ef2 100644 --- a/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c +++ b/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c @@ -35,21 +35,21 @@ vcmn_err(int ce, const char *fmt, va_list adx) prefix = NULL; /* silence unwitty compilers */ switch (ce) { case CE_CONT: - prefix = "Solaris(cont): "; + prefix = "dtrace(cont): "; break; case CE_NOTE: - prefix = "Solaris: NOTICE: "; + prefix = "dtrace: NOTICE: "; break; case CE_WARN: - prefix = "Solaris: WARNING: "; + prefix = "dtrace: WARNING: "; break; case CE_PANIC: - prefix = "Solaris(panic): "; + prefix = "dtrace(panic): "; break; case CE_IGNORE: break; default: - panic("Solaris: unknown severity level"); + panic("dtrace: unknown severity level"); } if (ce == CE_PANIC) { vsnprintf(buf, sizeof(buf), fmt, adx); @@ -76,7 +76,7 @@ int assfail(const char *a, const char *f, int l) { - panic("solaris assert: %s, file: %s, line: %d", a, f, l); + panic("dtrace assert: %s, file: %s, line: %d", a, f, l); return (0); } @@ -86,6 +86,6 @@ assfail3(const char *a, uintmax_t lv, const char *op, uintmax_t rv, const char *f, int l) { - panic("solaris assert: %s (0x%jx %s 0x%jx), file: %s, line: %d", + panic("dtrace assert: %s (0x%jx %s 0x%jx), file: %s, line: %d", a, lv, op, rv, f, l); } From nobody Fri May 8 00:00:05 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBTlG3Sr6z6cDR6 for ; Fri, 08 May 2026 00:00: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 4gBTlG1p4Wz3rGp for ; Fri, 08 May 2026 00:00:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778198410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MvewZ/CNIobN6s/LBcR2r0hVYjSDes8e6LnYGkTy4eA=; b=vG3nF8U1ASKRS1czVzxT9EPOthO4xUGhjqPosZZXHayTMXd17TWpuVfHyW6mw7lF3J0gcq w7U0VDxN0of/5GL5mStJ8EoI9eNX+b0wdrGp38e/rEPWuqTbrXBHBbf8COD/78BtA6fqFQ WdBXtseOlHbHy9i7+P20W+T56W0bfJlecFSbin7sZRSStlVw/FZBKGSZT6menAI1+7PY8O XOg/mdbhp/ZsBCAbja3phBVJpPR8CZhcn5eytcNL/BMQNz7r4fzssnZzauPcd5nAHVhqzC I3/dHH9LT3LmLxbEiQCOOfc4wiMtfyZQNjUNpq//zrJXISNdby10NBNmcfzsUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778198410; a=rsa-sha256; cv=none; b=QW3oIXRcR/5T9FTm9srhw2xbLR+MDJppdIXAaImldqTeb4qiqsI8Tq7619IFUr4R71znUD t3a62V8lQMikg2/XBur3jw5RQtHc6nwp6z+EYDLO6vkNryYONcdI/vkezUECYNVOo8awjB janiWoVKMP5lirHvzN2Q5ydy6R5ltKSnKgKgpV3/yFsCaD6rJg8455oGh6xKJazpJDN/Rj bqF7H8yomJ7jkoxf1NB0Zzr3CXBAlYuCBbIXUJope9DqQypbX5r+ykp+v0/DZjbRG8dys/ O5XBP59Ac5r3y1N5M+hB0S51OBhdHE1iRUvwR5bPDhXoVoIG3wyDt14OfTL4lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778198410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MvewZ/CNIobN6s/LBcR2r0hVYjSDes8e6LnYGkTy4eA=; b=bH72eR2z84fZeKUmU162TuWEKnJ9jbD1QJXEU/1L7gg42vWzpGwAqPd7zv57jp4S1b/cY5 uruI9x+exNhaSDN5w1V8ZLnZYYh3pvwLZuCIC1tJlnnAmrgKs0sMJpn+sVc/Yk3aM4/Qyc zGzu1SC9nIQ36gn0y63Pt36ptxhOZqegGggViPWLMB3SwUjZvg+aZvuP1ueFUsFUEXEEyl G76PlP3l1EgQW5Zc/bJhQJ3+wDBq3qGdDpnqlHADWnTEEsdaD84zKup/k+rUlcaCivTnUH jmS6EWBHne+h74if8c4tSXuiAmm1FG93rmJ3ZV4+47J5UzwBgeUfFRoijgMf/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBTlG0sCMzpL2 for ; Fri, 08 May 2026 00:00:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f400 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 00:00:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: b3f9be4f9437 - releng/15.1 - 15.1: Update to BETA2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: b3f9be4f94379cd3d714139e2635183d7a01aa71 Auto-Submitted: auto-generated Date: Fri, 08 May 2026 00:00:05 +0000 Message-Id: <69fd2785.3f400.38e86c2b@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b3f9be4f94379cd3d714139e2635183d7a01aa71 commit b3f9be4f94379cd3d714139e2635183d7a01aa71 Author: Colin Percival AuthorDate: 2026-05-08 00:00:00 +0000 Commit: Colin Percival CommitDate: 2026-05-08 00:00:00 +0000 15.1: Update to BETA2 Approved by: re (implicit) Sponsored by: OpenSats Initiative --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index aeb438a80e90..cbf4cab89dc5 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -51,7 +51,7 @@ TYPE="FreeBSD" REVISION="15.1" -BRANCH="BETA1" +BRANCH="BETA2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri May 8 00:30:22 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBVQC6q81z6cGnC for ; Fri, 08 May 2026 00:30: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 4gBVQC4rnmz3w1j for ; Fri, 08 May 2026 00:30:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778200227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=phlJYeXjNOq3HGp0CSCPHP+V8+vfyY48H1SRfuYJMiU=; b=oWD4bw5VVu93Jg6HoSHDr0aLQDxERS1gIBL+PV6W8KCdGz14ay4NlgXa5rJJvgdikZ0sv5 4rChVBcf4s6zwDv4SQPSF0bqav+iLmY+DI2o485PXiX/4olgn2NzYSLhnp1F1+38Gq8C1z Db0vouKH9gyWe8f8zllKn1x5dB5I7QLvx7iMVzBwMbuN22uJbOkIn9CNJ8G2ky5bvk/Fmc 84M6USPmVJqROLzqXWx4k1WolJjoRowPwNTgpwMrbiUDosy8dRKX5O2NDsNNVhqzqBP1Qm GCCkRQBCG3Fj8llJStYK9YweQNm8OWw1LBxZo1JWY9Vt+K9rQS090L3TLSr6aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778200227; a=rsa-sha256; cv=none; b=Hq35+gOAMmLOZyCqXqfVL5qfQ0SQ7kvL/FAFRYpd6XTRIhAYNEBtrJe2WozWnv3w7WfiCc 9WPTBuIQC+6UQGLuJFdtIi33cI+Cp2SUZ9Dl/2mGlOJAkR7/NNcIQR5/NK+/kNSLzLGfGV Z/gFNJNC/88jm234sBedhVldxnto7IP/FLisQJMwo2BfGDH33QyGBLa6WPQyenQ0bjZlPa ySQUkujpe97ehVqVp+VvU3ENwd9N7U4EybJVVMFy5vAOb49NjRezf7JDlN0Cfu6E+i2AJM a/k2m5HOco26H9MIU6c7qrWRS97BSGFA7BozYmgEt5KDYeiC6OfAvigghjLTYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778200227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=phlJYeXjNOq3HGp0CSCPHP+V8+vfyY48H1SRfuYJMiU=; b=QZp3i9zuzN2woYh+c8q8VCKgOW78dJUt7tAfGmFy3yziF6sGD7e0PB7/yaxubBSxszyMqt bhkaC4c5dpPNJVvMkp+3bbcZVIaSMpp6I8VdySpEUCFp1vJvtUN6fLgacQoWkxAgaLpOJ6 wthcJazxaUe/rlZ/U5s/yc2HasLnWRwmqMWlwXKm5S4cGiKiOlLBaD4TQTmbCFpIHNlh/e xNXgqnDlPrv/D9ls1+thZGsAArW1E2KU0ffgQD8Qdc8EPxLgNt3bFUQ9M2tNAR7BqbX+s/ jPZ7fMZV1ICXmg9j2GSfCp+ND64l1Ig42eJf1PodGAO2f2hp16RpQGiUB+Qw6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBVQC3tcCzqdK for ; Fri, 08 May 2026 00:30:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41440 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 00:30:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c335dafd7736 - stable/15 - uipc_shm.c: make large page allocation interruptible List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: c335dafd77363b67493d37ab260bc82e70c8cfa7 Auto-Submitted: auto-generated Date: Fri, 08 May 2026 00:30:22 +0000 Message-Id: <69fd2e9e.41440.f3b4ee2@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c335dafd77363b67493d37ab260bc82e70c8cfa7 commit c335dafd77363b67493d37ab260bc82e70c8cfa7 Author: Konstantin Belousov AuthorDate: 2026-04-28 02:34:49 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-08 00:29:36 +0000 uipc_shm.c: make large page allocation interruptible (cherry picked from commit 839d3266d8c6f6471cb92a3c0ae32eb16d117427) --- sys/kern/uipc_shm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 0ad5be2e8d71..197409d97f0c 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -829,12 +829,20 @@ shm_dotruncate_largepage(struct shmfd *shmfd, off_t length, void *rl_cookie) * object lock might allowed mapping of them. */ while (object->size < newobjsz) { + error = sig_intr(); + if (error != 0) + return (error); m = vm_page_alloc_contig(object, object->size, aflags, pagesizes[psind] / PAGE_SIZE, 0, ~0, pagesizes[psind], 0, VM_MEMATTR_DEFAULT); if (m == NULL) { VM_OBJECT_WUNLOCK(object); + error = sig_intr(); + if (error != 0) { + VM_OBJECT_WLOCK(object); + return (error); + } if (shmfd->shm_lp_alloc_policy == SHM_LARGEPAGE_ALLOC_NOWAIT || (shmfd->shm_lp_alloc_policy == From nobody Fri May 8 00:31:04 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBVR12fH5z6cGyZ for ; Fri, 08 May 2026 00:31: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 4gBVR11DFDz3wH0 for ; Fri, 08 May 2026 00:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778200269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SoZwD+HbNuOVz+R8M4eBvAli75cStJQLV/ZP1cLgiFE=; b=ZiIfZe0dc6kLWAiPbRZLO8a+0gKayCXH9ptb3Na6Eipg6L+JhFxrr3PjBkO6tSA06sW/t2 h7hJwIY0KEEy3h54a/DC5zr6lRgpspHY9l7BKoiT1MyV/5eH5S9eA3hkc1QxOiT4rvO6jm SUviGlHIA24gQBlWOH+TK7dn02+39ZEyi5dxunzzJtk1yTogAveytYAB+TEUXBP1g4b6UJ irrsvk8TMeeyV0WOk4U30lXxLsY9zqB33G5MJ0INm8u1BaNNDpu/SsevgV/rm/Z2Wy7tW6 8Xq6hDmUoLgHrXLbs7tNyiyCHRwRO6at/8mY7iqKPFCQwq5M4SgcJl2CuUnrGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778200269; a=rsa-sha256; cv=none; b=XcecXcDXg4uxhKaWpy8WQFOYwy70KmNXH6Tg6FgAzPkyFwryUmRKKr1FtS3Q8mcAoZ0GI4 u58iA7B+rOp43F3Amw7gAF9jOIp66Czye1g9sQ8o6C2CK7ohjQfUGyv2/4TrxY0TgM/vzX GiOyLjLnxIdJ1/nVxreiC7ywjsN/T0oTnlahKEB/MwTsAYpmQ7AauoAvyz+KQgDgVLNvy7 /TqzOPYJpwGmpWqK1bv5zhg3+mtw6tkTRS1+STHGpfla6TX8xu2gUcPOk9zjrJGW3ZpK75 q5XMDjhzOnrNtDd9+yHk28NTtKFnuS86BIzC+RpydqWl0dKlmAao57bRGh8MVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778200269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SoZwD+HbNuOVz+R8M4eBvAli75cStJQLV/ZP1cLgiFE=; b=GZapHl4u8DXykEfqnFOoXUoNASO4O8suEVee4eKi58qnErHwSf+7QAZwte+4up4yO49iA4 2A6S9/DidUPxed+pFJoalh5M/errOQ4wzpAiUMSl4HsGOYEo757MHmmhsloxC8zM1nWKnZ UR9Lf+m30m8Svx8msr/k3BkZ/8kdKuwT3D7vJ2x7eUiMqBKL1gu5esFJEJOpK02/GhIpNV wkjHYfXKuzvEXkxIdTqbyrgYuNz8+t/Iz1AbztaGTpD8OjuXxDeMNriOA9cGOIr/HqnoPz pbYQPdcy/QGOkUmA9rTKS3aQAR6zq0ApHa8r9VA46DC4fZtCWIbcbyzEQ+GvAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBVR10chWzqgw for ; Fri, 08 May 2026 00:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40fb5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 00:31:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6933fdcb547e - stable/14 - uipc_shm.c: make large page allocation interruptible List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 6933fdcb547e264f756535e442b23cdf621c3360 Auto-Submitted: auto-generated Date: Fri, 08 May 2026 00:31:04 +0000 Message-Id: <69fd2ec8.40fb5.73990a81@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6933fdcb547e264f756535e442b23cdf621c3360 commit 6933fdcb547e264f756535e442b23cdf621c3360 Author: Konstantin Belousov AuthorDate: 2026-04-28 02:34:49 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-08 00:30:32 +0000 uipc_shm.c: make large page allocation interruptible (cherry picked from commit 839d3266d8c6f6471cb92a3c0ae32eb16d117427) --- sys/kern/uipc_shm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 1fc398e93ae6..cd79d2039ebf 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -867,12 +867,20 @@ shm_dotruncate_largepage(struct shmfd *shmfd, off_t length, void *rl_cookie) * object lock might allowed mapping of them. */ while (object->size < newobjsz) { + error = sig_intr(); + if (error != 0) + return (error); m = vm_page_alloc_contig(object, object->size, aflags, pagesizes[psind] / PAGE_SIZE, 0, ~0, pagesizes[psind], 0, VM_MEMATTR_DEFAULT); if (m == NULL) { VM_OBJECT_WUNLOCK(object); + error = sig_intr(); + if (error != 0) { + VM_OBJECT_WLOCK(object); + return (error); + } if (shmfd->shm_lp_alloc_policy == SHM_LARGEPAGE_ALLOC_NOWAIT || (shmfd->shm_lp_alloc_policy == From nobody Fri May 8 09:09:14 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBjwq1Zbvz6bwh3 for ; Fri, 08 May 2026 09:09: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 4gBjwp5Cbyz3W9B for ; Fri, 08 May 2026 09:09:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778231354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tpJOdoMh1/Ivf9vZAtwu0gEtTL40iuuSHn/BVQjrxdc=; b=jQVcGd0hGVH9FmOl/sKSoBQlBbQZ1CN6qKdiGl+VSVg6NcpPIafjP+saaDA0jY7ZSsrL1J sqkTteYaxJ3GCH60ClsrDvXeJ+TI/YxPml5Js/6hPYOkFWHGiZlHcug4zT4qJF3lCnjJot 2ektvAX9jApPwZMf8Q1RKtU+Js3ntn5mdp4psZotjvQfI/u+laDG+ZBLWPxL0cy6ZncIMi FGrOPOQ73az7RI369FfmjOyjkH60y1uVrtzx2nvSLYRChJa/iqvVZBuxI/jytl1i8urrHv lksiUsaK5vZlr0o1ZltuRdOdJOnJQsvEq8SnxftMM7+65AH5tlFchn7CcHxrsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778231354; a=rsa-sha256; cv=none; b=LITlfpsWhqurttXEhKex/7UL5cZRSHtvRv6roXZp89UUKbDhW70f8T2PotIEN7PBOSV23Q wclC7WttZC14BzX0pbTqGHrGKbF2SyNxpp2/rvEZH79nbp6khLBIc2bi2hdRJojkve077G 1f3b9d9BH3G9Uu6Z6dEetAoQpsq05wXPKxiht6/9L4FpI0HXaWyNoj7leKH7RVaBLB2eYi ILIbPlMZXTmA7oLndseyoDtpTGRci91b99w5lF/gYUHWFKDwhP+rpFE/v3pb4oXrOo4qNb Ws6PRBPuQa0DOU14BecHoiJar7xItybwJP8vr4OIJgpiPwtUT268apU/EEfV3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778231354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tpJOdoMh1/Ivf9vZAtwu0gEtTL40iuuSHn/BVQjrxdc=; b=aUqWD34/IKzBjaUqYESDJbbRuIZYmuQrgTtvfiHxLmn5jJFBW16i4QeLA9aeIz6XU7/zFg htBU8iaNM+aKN8HT+icid8L647H6dSxaERZS7c3khiXR6PpMIrB8T3MO0Xi7zHMbCwfnRP m+1Kn5GvFpKf96mLNemjxUBpbq0P9zsn1loKN0a/lJ7w803BBZMMRZG9IcE3Wt/O+irSoI ORDWA9n7z8HT2q7oRwpOD6MM7IK5s3d1cWskRjzXhEVIcUUmaglPrGoNLdL3F5nu8Yfkry UzwrBnZsQkmejW28jkKNHJ6OULd0/h3zCnSOmK978guMZFVYOjbygUU6CLvB1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBjwp43qJz167L for ; Fri, 08 May 2026 09:09:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20450 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 09:09:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 076e44839160 - main - uio.9: Document uiomove_fromphys() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 076e44839160f74f96fda83fa81c3acb41b9ebc8 Auto-Submitted: auto-generated Date: Fri, 08 May 2026 09:09:14 +0000 Message-Id: <69fda83a.20450.75b6eef0@gitrepo.freebsd.org> The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=076e44839160f74f96fda83fa81c3acb41b9ebc8 commit 076e44839160f74f96fda83fa81c3acb41b9ebc8 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2026-03-20 07:52:28 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2026-05-08 09:05:57 +0000 uio.9: Document uiomove_fromphys() Reviewed by: kib Discussed with: markj, royger MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54070 --- share/man/man9/Makefile | 1 + share/man/man9/uio.9 | 45 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 29c822c10eb2..fbb981891ce4 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -2333,6 +2333,7 @@ MLINKS+=uidinfo.9 uifind.9 \ uidinfo.9 uihold.9 MLINKS+=uio.9 uiomove.9 \ uio.9 uiomove_frombuf.9 \ + uio.9 uiomove_fromphys.9 \ uio.9 uiomove_nofault.9 MLINKS+=unr.9 alloc_unr.9 \ unr.9 alloc_unrl.9 \ diff --git a/share/man/man9/uio.9 b/share/man/man9/uio.9 index b143eb6e8e62..a7563125a351 100644 --- a/share/man/man9/uio.9 +++ b/share/man/man9/uio.9 @@ -23,13 +23,14 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 22, 2025 +.Dd May 7, 2026 .Dt UIO 9 .Os .Sh NAME .Nm uio , .Nm uiomove , .Nm uiomove_frombuf , +.Nm uiomove_fromphys , .Nm uiomove_nofault .Nd device driver I/O routines .Sh SYNOPSIS @@ -37,25 +38,29 @@ .In sys/uio.h .Bd -literal struct uio { - struct iovec *uio_iov; /* scatter/gather list */ - int uio_iovcnt; /* length of scatter/gather list */ - off_t uio_offset; /* offset in target object */ - ssize_t uio_resid; /* remaining bytes to copy */ - enum uio_seg uio_segflg; /* address space */ - enum uio_rw uio_rw; /* operation */ - struct thread *uio_td; /* owner */ + struct iovec *uio_iov; /* scatter/gather list */ + int uio_iovcnt; /* length of scatter/gather list */ + off_t uio_offset; /* offset in target object */ + ssize_t uio_resid; /* remaining bytes to process */ + enum uio_seg uio_segflg; /* address space */ + enum uio_rw uio_rw; /* operation */ + struct thread *uio_td; /* owner */ }; .Ed +.Pp .Ft int .Fn uiomove "void *buf" "int howmuch" "struct uio *uiop" .Ft int .Fn uiomove_frombuf "void *buf" "int howmuch" "struct uio *uiop" .Ft int +.Fn uiomove_fromphys "vm_page_t ma[]" "vm_offset_t offset" "int howmuch" "struct uio *uiop" +.Ft int .Fn uiomove_nofault "void *buf" "int howmuch" "struct uio *uiop" .Sh DESCRIPTION The functions .Fn uiomove , .Fn uiomove_frombuf , +.Fn uiomove_fromphys , and .Fn uiomove_nofault are used to transfer data between buffers and I/O vectors that might @@ -152,10 +157,27 @@ When .Va uio_offset is greater than or equal to the buffer size, the result is success with no bytes transferred, effectively signaling EOF. +.Pp +The +.Fn uiomove_fromphys +function provides a machine-independent way to copy memory +to and from the physical address space. +The +.Fa "ma[]" +argument is an array of physical pages. +Every physical page address in the array provides +a page-sized chunk of the physical space. +The +.Fa "offset" +argument is the offset into the +.Fa "ma[]" +array. +In particular, the offset does not have to lie within the first page. .Sh RETURN VALUES On success .Fn uiomove , .Fn uiomove_frombuf , +.Fn uiomove_fromphys , and .Fn uiomove_nofault will return 0; on error they will return an appropriate error code. @@ -168,7 +190,7 @@ will not work (the buffer pointer is not being advanced in case of a partial read), it is just here to demonstrate the .Nm handling. -.Bd -literal +.Bd -literal -offset 2n /* MIN() can be found there: */ #include @@ -200,7 +222,8 @@ fooread(struct cdev *dev, struct uio *uio, int flag) } .Ed .Sh ERRORS -.Fn uiomove +.Fn uiomove , +.Fn uiomove_fromphys and .Fn uiomove_nofault will fail and return the following error code if: @@ -211,7 +234,7 @@ The invoked or .Xr copyout 9 returned -.Er EFAULT +.Er EFAULT . .El .Pp In addition, From nobody Fri May 8 11:55:07 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBncC6pCvz6cBCx for ; Fri, 08 May 2026 11:55: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 4gBncC4b84z3kxZ for ; Fri, 08 May 2026 11:55:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778241307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PMLS+EMDqi+pjwuhZpSZp1RsMqxGymx8Njse+IyZiL0=; b=Y6eaZB1Jspol2OkJaTvfnF+AuirrRrSrtegCm/G3Jnj/0bm3rxXpu5MIN61Fb5DyfNjC71 Phzlp/RqhU7YXfPgFouvDDk5YlWbyaIVrzvm9rpe1qK8pPLdaC8RXNNQjEmR/cJYIrjsvC jlOXZ3E0hXfR20kKFEWOI5nBACKE1507fDrPGKgFhOT2hM75ExtqSyzZxJU5/eftuRLgxi 1ZWdXT+oX3eLJEaFYLixfKCoOtRa+95/UKn5UEvlEcFYfVqxa6UIeGRdbyv5vZKjbcQytC cQDkGB8phYBA9puuRRCwYg4mT9xYHOwtO6StVXsLq/RP6zsuv5T0FKmhXwjfzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778241307; a=rsa-sha256; cv=none; b=NJqBLvyb1vt6Kbnm3irxZ2mJ/aHkTAqPdI4ZPe3565w2+lw26O4YhGbUjRSrl+9V9pnmj0 JaPcDUcZQOdMg6uYalhGWto7KEx7SU7ChaPV11LY4J3FzFVSqrWO+0yT245voh5mS0X+5B Yb3sd1T8uFlk22DjpHBVpBkJLSw/hCrKuocqWvV+IrBN3WMqqQTzf25HY6lRwPTIR8Lkmd Y3iTRHI0D8CZv6K+IT6MjJlaidX+atjsCQFgu1mLw+ja6uWYYhoKowaUxTvqkMSgAsD60i FP6q94fi4Xo6gLgIESDg0mC28eXOkYQTNm0O258MQy2yOHu6N3cVZIB/FyR86g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778241307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PMLS+EMDqi+pjwuhZpSZp1RsMqxGymx8Njse+IyZiL0=; b=iGr5OplyORvirB5OctD/4sB45fzW3jfAWFGwu/R5U41umO0Bn9Z3/jZp9Dk5sInnbn7E3p 9c35TaoaMriArGMWPl7LADmM4mB8UOewhPP4HWlDoUiGtAk9pl8NYs6AYrP+dQYvn8ZPXs bXrjhbShX/taY6jiEsYlHb3ufUWbe192TYSEmhpBvhP4kJ/cERofL5CzIyR/0VXqKw5hnw peRU6ssqV+SvkMjusrRs0+tnekRzLOL+OWhZ5+9MO3OBCYegQy6gR4IqJo6dKJfkKdAfLb J45d02BEL3a7+8gaLQiLmk/kKHmpg0/ItuZpG9EGEhIWjIyA1A8shq2YiJ/sbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBncC3w18z1BKh for ; Fri, 08 May 2026 11:55:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39bba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 11:55:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: c70f196453a3 - stable/15 - Define stdint.h macros unconditionally List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c70f196453a39c703f6520b53fb25ca749a37f95 Auto-Submitted: auto-generated Date: Fri, 08 May 2026 11:55:07 +0000 Message-Id: <69fdcf1b.39bba.14f4a077@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c70f196453a39c703f6520b53fb25ca749a37f95 commit c70f196453a39c703f6520b53fb25ca749a37f95 Author: Dimitry Andric AuthorDate: 2026-05-01 18:07:11 +0000 Commit: Dimitry Andric CommitDate: 2026-05-08 10:27:14 +0000 Define stdint.h macros unconditionally Similar to glibc, define all the stdint.h macros such as `SIZE_MAX`, `UINT64_C`, etc unconditionally. I.e. no longer check whether `__STDC_CONSTANT_MACROS` or `__STDC_LIMIT_MACROS` are defined. See also . This is part of reverting base 00bee6fcd77f, which reverted an upstream libc++ commit that eliminated libc++'s stdint.h wrapper header. Submitted by: Nikolas Klauser MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D56746 (cherry picked from commit 966fb94cb3575ccd39da211165d0858fd0eb0ef2) --- sys/arm/include/_stdint.h | 8 -------- sys/arm64/include/_stdint.h | 8 -------- sys/powerpc/include/_stdint.h | 8 -------- sys/riscv/include/_stdint.h | 8 -------- sys/x86/include/_stdint.h | 8 -------- 5 files changed, 40 deletions(-) diff --git a/sys/arm/include/_stdint.h b/sys/arm/include/_stdint.h index 2ebc6ea4f89f..9f9b7eb8a554 100644 --- a/sys/arm/include/_stdint.h +++ b/sys/arm/include/_stdint.h @@ -33,8 +33,6 @@ #ifndef _MACHINE__STDINT_H_ #define _MACHINE__STDINT_H_ -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) - #define INT8_C(c) (c) #define INT16_C(c) (c) #define INT32_C(c) (c) @@ -48,10 +46,6 @@ #define INTMAX_C(c) INT64_C(c) #define UINTMAX_C(c) UINT64_C(c) -#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) - /* * ISO/IEC 9899:1999 * 7.18.2.1 Limits of exact-width integer types @@ -176,6 +170,4 @@ #define WINT_WIDTH INT32_WIDTH #endif /* __ISO_C_VISIBLE >= 2023 */ -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ - #endif /* !_MACHINE__STDINT_H_ */ diff --git a/sys/arm64/include/_stdint.h b/sys/arm64/include/_stdint.h index 0b360b8ab460..621e5ce53721 100644 --- a/sys/arm64/include/_stdint.h +++ b/sys/arm64/include/_stdint.h @@ -35,8 +35,6 @@ #ifndef _MACHINE__STDINT_H_ #define _MACHINE__STDINT_H_ -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) - #define INT8_C(c) (c) #define INT16_C(c) (c) #define INT32_C(c) (c) @@ -50,10 +48,6 @@ #define INTMAX_C(c) INT64_C(c) #define UINTMAX_C(c) UINT64_C(c) -#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) - /* * ISO/IEC 9899:1999 * 7.18.2.1 Limits of exact-width integer types @@ -178,8 +172,6 @@ #define WINT_WIDTH INT32_WIDTH #endif /* __ISO_C_VISIBLE >= 2023 */ -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ - #endif /* !_MACHINE__STDINT_H_ */ #endif /* !__arm__ */ diff --git a/sys/powerpc/include/_stdint.h b/sys/powerpc/include/_stdint.h index 6eb988f86ed7..68ae89e23cdc 100644 --- a/sys/powerpc/include/_stdint.h +++ b/sys/powerpc/include/_stdint.h @@ -40,8 +40,6 @@ #ifndef _MACHINE__STDINT_H_ #define _MACHINE__STDINT_H_ -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) - #define INT8_C(c) (c) #define INT16_C(c) (c) #define INT32_C(c) (c) @@ -61,10 +59,6 @@ #define INTMAX_C(c) INT64_C(c) #define UINTMAX_C(c) UINT64_C(c) -#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) - #ifndef __INT64_C #ifdef __LP64__ #define __INT64_C(c) (c ## L) @@ -223,6 +217,4 @@ #define WINT_WIDTH INT32_WIDTH #endif /* __ISO_C_VISIBLE >= 2023 */ -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ - #endif /* !_MACHINE__STDINT_H_ */ diff --git a/sys/riscv/include/_stdint.h b/sys/riscv/include/_stdint.h index 48080ecfe2cf..9afe01c8a318 100644 --- a/sys/riscv/include/_stdint.h +++ b/sys/riscv/include/_stdint.h @@ -31,8 +31,6 @@ #ifndef _MACHINE__STDINT_H_ #define _MACHINE__STDINT_H_ -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) - #define INT8_C(c) (c) #define INT16_C(c) (c) #define INT32_C(c) (c) @@ -46,10 +44,6 @@ #define INTMAX_C(c) INT64_C(c) #define UINTMAX_C(c) UINT64_C(c) -#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) - /* * ISO/IEC 9899:1999 * 7.18.2.1 Limits of exact-width integer types @@ -174,6 +168,4 @@ #define WINT_WIDTH INT32_WIDTH #endif /* __ISO_C_VISIBLE >= 2023 */ -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ - #endif /* !_MACHINE__STDINT_H_ */ diff --git a/sys/x86/include/_stdint.h b/sys/x86/include/_stdint.h index 2dea911b5c88..4c65b0f095ea 100644 --- a/sys/x86/include/_stdint.h +++ b/sys/x86/include/_stdint.h @@ -40,8 +40,6 @@ #ifndef _MACHINE__STDINT_H_ #define _MACHINE__STDINT_H_ -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) - #define INT8_C(c) (c) #define INT16_C(c) (c) #define INT32_C(c) (c) @@ -61,10 +59,6 @@ #define INTMAX_C(c) INT64_C(c) #define UINTMAX_C(c) UINT64_C(c) -#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) - /* * ISO/IEC 9899:1999 * 7.18.2.1 Limits of exact-width integer types @@ -217,6 +211,4 @@ #define WINT_WIDTH INT32_WIDTH #endif /* __ISO_C_VISIBLE >= 2023 */ -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ - #endif /* !_MACHINE__STDINT_H_ */ From nobody Fri May 8 11:55:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBncJ117Yz6cBMd for ; Fri, 08 May 2026 11:55: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 4gBncH6tYrz3lLr for ; Fri, 08 May 2026 11:55:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778241312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=462yzSlm6jawqmdf+quDt9wHK/VXLMaBuc3gzdT1hho=; b=u4eyaW6DPEQV4qv8X0pCNfRjq1etdmPZjpIqy/jEEsvfS3Z7s4W8YZaD5uWE4Gur41nj/f UXmidew2J2jyALRaIeM3/6QjUgCnS5IKgQctV5L6BD8AYTY7ouBPW7mEw+4Q6lnCwOhcIr pnzSAAIqjyvJX9z4SnLcL/rbOtIlpSG8aExaNKIDEW7664dtESqJgHmS1JapVpJZGcaVva nyqql526q0RSXY5/NVR9G9BmI7Fq6gXPYPfTps5WTSu9KjRSCTOYt816KOMyT7sF6N1lRk MecDL8tNVIDNcghR6Lsp8erD9qT8l0WfaUCihxewBHw/zvvo3VycitSa6MtzLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778241312; a=rsa-sha256; cv=none; b=Da2p8TJ95E/otlxGUfTdeSc5i6KHw1XyrTI8w5on143QpbgP+xSAg8W6oW2mw7PVHZ6scd z/jfEjI7QF3UH0aR9yLG7O/tN/4Q+KMs4SjypLavrGVv4YcGxKk82lUln+RkyoRWLK1S4f 1k9eEuzZMh7f4hubkUxcYrNdnOUUbuD8sBvuiDjrcbPbfyei8lGozNZfAScCVnGtnwPBh3 hu4cuVgfEr3O+wH0nSaseZGZlI56axK19CcblL9TZfwoq7dTGggpjGsnGKUFYbratgb4XA sLFhQZpfmp371ibSQ3MHidO8ouqR0jHGfPO3Ax8XyeULmXQr8HIpEeGG3xIDpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778241312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=462yzSlm6jawqmdf+quDt9wHK/VXLMaBuc3gzdT1hho=; b=LntSYZ3dBFJAlvY3DEQS22WfYrC93NhkviNH27d6kfyoBLl1q9wCSFJuyoAnDcagLSArJp T/HdhoDNyqVMmu5u0ig89Pkx3fIbr0bU9zSIBdybFQJrgB04hxPLUD+NhwfuW2Ga4LG3CX rkmO/q+jf/6vE/Fvotno1kKa0kYfhXQ/l8KOksPRP1lTJZgBQdi2dJmU46VMaaG9jtJrD2 h8LAi934ZGoIVwt25k6z2w3o7dop7116lvClL7/w7ASSHfwZGtki3RwiMDOM/vzOlQqiz0 GJ1DuLsajnfPI44KWWRNcGvo5ZFfJwS7/PoiJ8yJhQCTkh3Arpp32i4J3Fqa4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBncH5KgCz19ys for ; Fri, 08 May 2026 11:55:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b4ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 11:55:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 4699fffc6a62 - stable/15 - Remove extraneous tab characters at EOL in various _stdint.h files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4699fffc6a62d706c82094615409d1db136542df Auto-Submitted: auto-generated Date: Fri, 08 May 2026 11:55:06 +0000 Message-Id: <69fdcf1a.3b4ff.6547c270@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4699fffc6a62d706c82094615409d1db136542df commit 4699fffc6a62d706c82094615409d1db136542df Author: Dimitry Andric AuthorDate: 2026-05-01 18:08:26 +0000 Commit: Dimitry Andric CommitDate: 2026-05-08 10:27:14 +0000 Remove extraneous tab characters at EOL in various _stdint.h files MFC after: 3 days (cherry picked from commit daeab702f9adbbb718ecf48e17de8dd619cfe7b8) --- sys/powerpc/include/_stdint.h | 4 ++-- sys/riscv/include/_stdint.h | 2 +- sys/x86/include/_stdint.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/powerpc/include/_stdint.h b/sys/powerpc/include/_stdint.h index 385c33389809..6eb988f86ed7 100644 --- a/sys/powerpc/include/_stdint.h +++ b/sys/powerpc/include/_stdint.h @@ -173,14 +173,14 @@ #ifdef __LP64__ /* Limits of ptrdiff_t. */ -#define PTRDIFF_MIN INT64_MIN +#define PTRDIFF_MIN INT64_MIN #define PTRDIFF_MAX INT64_MAX /* Limit of size_t. */ #define SIZE_MAX UINT64_MAX #else /* Limits of ptrdiff_t. */ -#define PTRDIFF_MIN INT32_MIN +#define PTRDIFF_MIN INT32_MIN #define PTRDIFF_MAX INT32_MAX /* Limit of size_t. */ diff --git a/sys/riscv/include/_stdint.h b/sys/riscv/include/_stdint.h index 9df000b0eac4..48080ecfe2cf 100644 --- a/sys/riscv/include/_stdint.h +++ b/sys/riscv/include/_stdint.h @@ -137,7 +137,7 @@ * 7.18.3 Limits of other integer types */ /* Limits of ptrdiff_t. */ -#define PTRDIFF_MIN INT64_MIN +#define PTRDIFF_MIN INT64_MIN #define PTRDIFF_MAX INT64_MAX /* Limits of sig_atomic_t. */ diff --git a/sys/x86/include/_stdint.h b/sys/x86/include/_stdint.h index 1b8523bf656b..2dea911b5c88 100644 --- a/sys/x86/include/_stdint.h +++ b/sys/x86/include/_stdint.h @@ -163,7 +163,7 @@ */ #ifdef __LP64__ /* Limits of ptrdiff_t. */ -#define PTRDIFF_MIN INT64_MIN +#define PTRDIFF_MIN INT64_MIN #define PTRDIFF_MAX INT64_MAX /* Limits of sig_atomic_t. */ From nobody Fri May 8 11:55:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBncP1tGxz6cB7g for ; Fri, 08 May 2026 11:55:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBncP0JtYz3lK1 for ; Fri, 08 May 2026 11:55:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778241317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jcin+ZAGuR6wuNPQeOxAdt6uA50D2mAHXQGEmVcjRoQ=; b=xj2Evl7mRC7bfPfvwUIKctxJ06HPfspowm2h09d9mGjZVtryuJj5lVVYoCfnNQnPTsazoX b5nxrxhRyjrvoJMGCZvbi05etVJD4XBFCEE333iF6/jPlrknp0KzceC4f4e0a00YPnZTAY 3TZeFp/F+uz9rtxn3AwpdIHmrxS7Fc1D5OI+al+6/HACW3Qyl1X8hk/0Ro0FrgjxMAtdJF pDCWdUa3Kylk98qiXjNgfDjRFhPVEPzeKqzOyygDC16k4tHmBMJeoY4kao1lAs5x+yx0ll 3OFkhmb+pWa+EiAOspOkZjz7Rsb1UWr8B70X4CZLDPGeupnogdrPZ3eYDZ0g0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778241317; a=rsa-sha256; cv=none; b=MnaZoB+YieNRok7bOF/lf6AuwCaaBofF5Y/LPbxnMhWYMdV4sl+RaCenVJTxKmd39994gs zs7HUbDL4Qsyhsf69Z0I2KGBlqpEvqfR1qhaRpnZC9KV4I19f2I7HU+g7L7NI5qZktFgW1 F+3ObfDumBxwP3T3JMq+o4zRy+jSpA3CfTOFjeEpmqb/obr5VIhwcoyuLT4P8iQHV0cDGE XVNOtyBcV5m7/mz2Q6alPHJz9gLjjH6rV16fxZPcg2ZivUjHhRhH8fmKvMoeZoDrjo+Pkf /xeN3n0RWV+ux6zoKyc5i9XKKiWv3uSQx9f1+CtuTVSFx0CPm+hP/DlczwbTuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778241317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jcin+ZAGuR6wuNPQeOxAdt6uA50D2mAHXQGEmVcjRoQ=; b=IQIE+nlzg/J029WvmfvqPrMaIuMSp/ssrhfQ5ei2U8oqJCzm88RCJAIQ6j6h5xzz81YclH Oy6bfuntkV9Zit8BhZV/ZF/j+CZcwbuPSQhSCRcsgEWUJbZcBv0AW6Js0HQqyksRWaqU93 SIBTU3iZbqNWiVTasBVEh3qHyLwut3NVlEYk+W2lnVH03VtBqhU5/7Gu+VOkmwAE5fy2PN Z5HMCjaxcZFrSm7DNKpmtQu3tHOzLoovqQHrix9N4XQBgiz+eelyAZ/tpF+k0B0rSOMHDD U39q4SLnfxpt1znMR2/rUxsTlBBJj9SRv8B5slqSME9HQURv8rRwNTcIQBH6Ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBncN6Q2mz1BRk for ; Fri, 08 May 2026 11:55:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3aefe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 11:55:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: a4d15ef8aa7a - stable/14 - Remove extraneous tab characters at EOL in various _stdint.h files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a4d15ef8aa7a904a67d06e0cf36acd9a51b761df Auto-Submitted: auto-generated Date: Fri, 08 May 2026 11:55:16 +0000 Message-Id: <69fdcf24.3aefe.4fc1e911@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a4d15ef8aa7a904a67d06e0cf36acd9a51b761df commit a4d15ef8aa7a904a67d06e0cf36acd9a51b761df Author: Dimitry Andric AuthorDate: 2026-05-01 18:08:26 +0000 Commit: Dimitry Andric CommitDate: 2026-05-08 10:26:59 +0000 Remove extraneous tab characters at EOL in various _stdint.h files MFC after: 3 days (cherry picked from commit daeab702f9adbbb718ecf48e17de8dd619cfe7b8) --- sys/powerpc/include/_stdint.h | 4 ++-- sys/riscv/include/_stdint.h | 2 +- sys/x86/include/_stdint.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/powerpc/include/_stdint.h b/sys/powerpc/include/_stdint.h index 67719432259d..7fbb0118643f 100644 --- a/sys/powerpc/include/_stdint.h +++ b/sys/powerpc/include/_stdint.h @@ -169,7 +169,7 @@ */ #ifdef __LP64__ /* Limits of ptrdiff_t. */ -#define PTRDIFF_MIN INT64_MIN +#define PTRDIFF_MIN INT64_MIN #define PTRDIFF_MAX INT64_MAX /* Limits of sig_atomic_t. */ @@ -180,7 +180,7 @@ #define SIZE_MAX UINT64_MAX #else /* Limits of ptrdiff_t. */ -#define PTRDIFF_MIN INT32_MIN +#define PTRDIFF_MIN INT32_MIN #define PTRDIFF_MAX INT32_MAX /* Limits of sig_atomic_t. */ diff --git a/sys/riscv/include/_stdint.h b/sys/riscv/include/_stdint.h index 4e032c8b0a1d..c871d4c12f36 100644 --- a/sys/riscv/include/_stdint.h +++ b/sys/riscv/include/_stdint.h @@ -137,7 +137,7 @@ * 7.18.3 Limits of other integer types */ /* Limits of ptrdiff_t. */ -#define PTRDIFF_MIN INT64_MIN +#define PTRDIFF_MIN INT64_MIN #define PTRDIFF_MAX INT64_MAX /* Limits of sig_atomic_t. */ diff --git a/sys/x86/include/_stdint.h b/sys/x86/include/_stdint.h index 59aab4b39c0c..8f743377d170 100644 --- a/sys/x86/include/_stdint.h +++ b/sys/x86/include/_stdint.h @@ -163,7 +163,7 @@ */ #ifdef __LP64__ /* Limits of ptrdiff_t. */ -#define PTRDIFF_MIN INT64_MIN +#define PTRDIFF_MIN INT64_MIN #define PTRDIFF_MAX INT64_MAX /* Limits of sig_atomic_t. */ From nobody Fri May 8 11:55:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBncQ2Lh9z6cBYv for ; Fri, 08 May 2026 11:55: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 4gBncQ06X7z3l9x for ; Fri, 08 May 2026 11:55:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778241318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bznEfiP0VhKfku0TsymxtZ9otT6blDsyzVHwdOt/FHM=; b=h4P/47LFrdQ3qZZMSW/GVyeTkjGu3y5Md2jylUVZtgzsLxjtp2O2oaD8LaRETooEX2ZoY/ 3L+r4lZKLZwOCmBuRgJrjZocM9bw7XFCLA4c3SRolMi6MN+zndT9lH04XcLRd29lbyICmP buB78/G7xW334QfDRYb+hPpI4jfzzY5q4N6biU374k74Ix9YyhdEkjNHWM0T4GVrapbBCR VAG0A9qx9ryVqt0eYhk1zTIEZOig2hpSdIwmQvA91HocRGeSUqSFJvdPkV10+7j7h7a5GW NIImF5PEN34RdM+I8xLJxFzrNQ3fQCPY+xFPvffSn9SRbR59MMPqkZ42+rrw5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778241318; a=rsa-sha256; cv=none; b=Ii4UUGCP2CvQxaSn3hBZ+eju+lA4nTq8F4JTiZtNkKfEC81TZcPS5XFfmWZg5xlldsNJEX 73bmQzzisH+LozfChIWicNKAJV+auTgCxvptAbaaSazLkhsdPxVL62JRVwYUDogMyGznb3 Uw91xyneQKvt/L4pZ0n/whImg+Eb3f4PM318YwscUWXEudFOru5dZMSdmsW8lRsC98eeCv N/1V9ON56Y3bhDvyYZ3CcLQgwFTcdFajQtNO/vf0LdlgAwEaHxQF1C9DX/uIZ3HAEb9Ohn n992V5bmLJq+vL+Oi2ljzcwfa9eZKTWzXqjnL0j/GemaKa11vS+VwlwgMosA0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778241318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bznEfiP0VhKfku0TsymxtZ9otT6blDsyzVHwdOt/FHM=; b=vjQQOXjtUkxShjp3klob6rzmsI3JPQgIfHGHMxAkMK9Uj14D+OcLZPOC75e/93FIULT6KX lea2O9xQoww3Zzw1dKIk5lqGObIeM6KXnkV5dMmshh24G98AqRSm0ms7tAnDfai5ul5plT oSbEnKqIV801aT29ZzF2zOvoXQag8QFckrLSW8r5yb1wMPeHGsyvCsv0UFt6v9gGHxoYZo PNdqFFmGJ2Uq7k8LhJ8iJ61G5OSCRHRVJMpKwBygZPUFQf5mydLkJpsCNWJxZNuEtVq91Z c8ooCd9kru8AF0YVl9mHfPCNMEygL4b2voX5EKnP7PHqC9QIhMrXVuegi00Ykw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBncP6mXvz19yw for ; Fri, 08 May 2026 11:55:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 388f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 11:55:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: eba1c36898da - stable/14 - Define stdint.h macros unconditionally List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eba1c36898dac1469755914d5839d9fe2d573348 Auto-Submitted: auto-generated Date: Fri, 08 May 2026 11:55:17 +0000 Message-Id: <69fdcf25.388f8.135fe6b@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=eba1c36898dac1469755914d5839d9fe2d573348 commit eba1c36898dac1469755914d5839d9fe2d573348 Author: Dimitry Andric AuthorDate: 2026-05-01 18:07:11 +0000 Commit: Dimitry Andric CommitDate: 2026-05-08 10:26:59 +0000 Define stdint.h macros unconditionally Similar to glibc, define all the stdint.h macros such as `SIZE_MAX`, `UINT64_C`, etc unconditionally. I.e. no longer check whether `__STDC_CONSTANT_MACROS` or `__STDC_LIMIT_MACROS` are defined. See also . This is part of reverting base 00bee6fcd77f, which reverted an upstream libc++ commit that eliminated libc++'s stdint.h wrapper header. Submitted by: Nikolas Klauser MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D56746 (cherry picked from commit 966fb94cb3575ccd39da211165d0858fd0eb0ef2) --- sys/arm/include/_stdint.h | 8 -------- sys/arm64/include/_stdint.h | 8 -------- sys/powerpc/include/_stdint.h | 8 -------- sys/riscv/include/_stdint.h | 8 -------- sys/x86/include/_stdint.h | 8 -------- 5 files changed, 40 deletions(-) diff --git a/sys/arm/include/_stdint.h b/sys/arm/include/_stdint.h index 9931f8b56ef5..b7dee286fb8c 100644 --- a/sys/arm/include/_stdint.h +++ b/sys/arm/include/_stdint.h @@ -33,8 +33,6 @@ #ifndef _MACHINE__STDINT_H_ #define _MACHINE__STDINT_H_ -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) - #define INT8_C(c) (c) #define INT16_C(c) (c) #define INT32_C(c) (c) @@ -48,10 +46,6 @@ #define INTMAX_C(c) INT64_C(c) #define UINTMAX_C(c) UINT64_C(c) -#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) - /* * ISO/IEC 9899:1999 * 7.18.2.1 Limits of exact-width integer types @@ -153,6 +147,4 @@ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ - #endif /* !_MACHINE__STDINT_H_ */ diff --git a/sys/arm64/include/_stdint.h b/sys/arm64/include/_stdint.h index 0c183bd60dca..87734357e978 100644 --- a/sys/arm64/include/_stdint.h +++ b/sys/arm64/include/_stdint.h @@ -35,8 +35,6 @@ #ifndef _MACHINE__STDINT_H_ #define _MACHINE__STDINT_H_ -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) - #define INT8_C(c) (c) #define INT16_C(c) (c) #define INT32_C(c) (c) @@ -50,10 +48,6 @@ #define INTMAX_C(c) INT64_C(c) #define UINTMAX_C(c) UINT64_C(c) -#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) - /* * ISO/IEC 9899:1999 * 7.18.2.1 Limits of exact-width integer types @@ -155,8 +149,6 @@ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ - #endif /* !_MACHINE__STDINT_H_ */ #endif /* !__arm__ */ diff --git a/sys/powerpc/include/_stdint.h b/sys/powerpc/include/_stdint.h index 7fbb0118643f..9619b731d695 100644 --- a/sys/powerpc/include/_stdint.h +++ b/sys/powerpc/include/_stdint.h @@ -40,8 +40,6 @@ #ifndef _MACHINE__STDINT_H_ #define _MACHINE__STDINT_H_ -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) - #define INT8_C(c) (c) #define INT16_C(c) (c) #define INT32_C(c) (c) @@ -61,10 +59,6 @@ #define INTMAX_C(c) INT64_C(c) #define UINTMAX_C(c) UINT64_C(c) -#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) - #ifndef __INT64_C #ifdef __LP64__ #define __INT64_C(c) (c ## L) @@ -195,6 +189,4 @@ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ - #endif /* !_MACHINE__STDINT_H_ */ diff --git a/sys/riscv/include/_stdint.h b/sys/riscv/include/_stdint.h index c871d4c12f36..0822277001bb 100644 --- a/sys/riscv/include/_stdint.h +++ b/sys/riscv/include/_stdint.h @@ -31,8 +31,6 @@ #ifndef _MACHINE__STDINT_H_ #define _MACHINE__STDINT_H_ -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) - #define INT8_C(c) (c) #define INT16_C(c) (c) #define INT32_C(c) (c) @@ -46,10 +44,6 @@ #define INTMAX_C(c) INT64_C(c) #define UINTMAX_C(c) UINT64_C(c) -#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) - /* * ISO/IEC 9899:1999 * 7.18.2.1 Limits of exact-width integer types @@ -151,6 +145,4 @@ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ - #endif /* !_MACHINE__STDINT_H_ */ diff --git a/sys/x86/include/_stdint.h b/sys/x86/include/_stdint.h index 8f743377d170..0745fb400a39 100644 --- a/sys/x86/include/_stdint.h +++ b/sys/x86/include/_stdint.h @@ -40,8 +40,6 @@ #ifndef _MACHINE__STDINT_H_ #define _MACHINE__STDINT_H_ -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) - #define INT8_C(c) (c) #define INT16_C(c) (c) #define INT32_C(c) (c) @@ -61,10 +59,6 @@ #define INTMAX_C(c) INT64_C(c) #define UINTMAX_C(c) UINT64_C(c) -#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) - /* * ISO/IEC 9899:1999 * 7.18.2.1 Limits of exact-width integer types @@ -184,6 +178,4 @@ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ - #endif /* !_MACHINE__STDINT_H_ */ From nobody Fri May 8 11:55:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBncb2vMZz6cBGw for ; Fri, 08 May 2026 11:55: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 4gBncb1WWNz3lYs for ; Fri, 08 May 2026 11:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778241327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VypNfV8Wtri0hk5nxY9sP2MiKGo346gXQADYDXh11aI=; b=egH8AXYNSCjyW3orsN5GgfYHveCY9jmAHAfVdgAYiMqMc5r+6igYbc5vYnUWkDrG+17C59 9KKxAWCgr93qpHn3HWMQ+AtPDrrz1fq5tZQCVNOM8/gGkB+9hWZM/zLq0/XjjrhOOupghM Q6Rk2i+SJAHgcbTCL7cVp2hjBWC4wK+FTAWRPfR5d/FVvh/+hIiHdLNRB0oJ6POJyF6ocx HzL93YrLDuSIOTm4PjXCh/0kLMOt+TJ7N0Ge4hmy5WO6ws6ku+wsStiXZw2xGQTSv8TSU8 q4AbDM1iZRpjDeRgu6kACIQltgBSe+IWOnSk/Y+fb2N0r70IP2no36QWvA9kJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778241327; a=rsa-sha256; cv=none; b=XwpZO+j0/nZAV34ff8xlSK1XqrDzUoFSA03UuIRV3pho+9m/br3Sf/wkPU4V65W934FnWn vWKYI8EG4jxaH2L/qM/SMJVWGZPzQVUy2e7C2wSPqHiTvfh19gshUkEj4FDoAYD0tBwJHq c2YZB/jTKtQFzBdAdvyUc14rIPDLkErX9bN41zLS/Y6hBolfXwrTuuJwaOT6bxDOdbXdtV W948QqLNIKwGDm4h8o4i8PQsBixomznJ1l1crFZIzNm6g6wQrXEXMGu9OhHhmxy0aWdY/k eB7P1eZJpV/gv/mQbrrcpmgRYkD0etsdXxeokPn2wnafGLSSPw+O87dVd1thMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778241327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VypNfV8Wtri0hk5nxY9sP2MiKGo346gXQADYDXh11aI=; b=tu2HCtc5QDR/QCMOG0gBTwEibjUHcqnhoMQCY7TBGgYwnMj2mHglLPw0AuqJWPIO6aPg9i wAmNEv2V9YoAmjGsN0fetbUYHWUubjAzn1/A2Gwg8t2yR1dxHl7eOY0f9OK8gZXCeyV/TJ IlMLbeoCqxEsu5l/nZYZu+g5KAtZ24VhfoZQzK4tYawtB2RN11GRoBGNes+kKjIWYn+JMf QSX/ozQa0iXfxgs1ve9+6xG9ndjeAvLROs6lCJns4dhkw7uR74K7SAbq/cwLjBoqWLVV9M 3P24m2y1YSweA6YtCUV+c9Fc11Dx6+QejeDxu8MRG1MwHn+QDx2vVUcVowypBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBncb10Hkz19yy for ; Fri, 08 May 2026 11:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39a4e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 11:55:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 57efbb1094e4 - stable/13 - Define stdint.h macros unconditionally List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 57efbb1094e4f90c6e150de60cf4dc20cd44d6d8 Auto-Submitted: auto-generated Date: Fri, 08 May 2026 11:55:27 +0000 Message-Id: <69fdcf2f.39a4e.7fa6298a@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=57efbb1094e4f90c6e150de60cf4dc20cd44d6d8 commit 57efbb1094e4f90c6e150de60cf4dc20cd44d6d8 Author: Dimitry Andric AuthorDate: 2026-05-01 18:07:11 +0000 Commit: Dimitry Andric CommitDate: 2026-05-08 10:28:09 +0000 Define stdint.h macros unconditionally Similar to glibc, define all the stdint.h macros such as `SIZE_MAX`, `UINT64_C`, etc unconditionally. I.e. no longer check whether `__STDC_CONSTANT_MACROS` or `__STDC_LIMIT_MACROS` are defined. See also . This is part of reverting base 00bee6fcd77f, which reverted an upstream libc++ commit that eliminated libc++'s stdint.h wrapper header. Submitted by: Nikolas Klauser MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D56746 (cherry picked from commit 966fb94cb3575ccd39da211165d0858fd0eb0ef2) --- sys/arm/include/_stdint.h | 8 -------- sys/arm64/include/_stdint.h | 8 -------- sys/powerpc/include/_stdint.h | 8 -------- sys/riscv/include/_stdint.h | 8 -------- sys/x86/include/_stdint.h | 8 -------- 5 files changed, 40 deletions(-) diff --git a/sys/arm/include/_stdint.h b/sys/arm/include/_stdint.h index 9931f8b56ef5..b7dee286fb8c 100644 --- a/sys/arm/include/_stdint.h +++ b/sys/arm/include/_stdint.h @@ -33,8 +33,6 @@ #ifndef _MACHINE__STDINT_H_ #define _MACHINE__STDINT_H_ -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) - #define INT8_C(c) (c) #define INT16_C(c) (c) #define INT32_C(c) (c) @@ -48,10 +46,6 @@ #define INTMAX_C(c) INT64_C(c) #define UINTMAX_C(c) UINT64_C(c) -#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) - /* * ISO/IEC 9899:1999 * 7.18.2.1 Limits of exact-width integer types @@ -153,6 +147,4 @@ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ - #endif /* !_MACHINE__STDINT_H_ */ diff --git a/sys/arm64/include/_stdint.h b/sys/arm64/include/_stdint.h index 914d1bb41b5b..8c98e4300036 100644 --- a/sys/arm64/include/_stdint.h +++ b/sys/arm64/include/_stdint.h @@ -31,8 +31,6 @@ #ifndef _MACHINE__STDINT_H_ #define _MACHINE__STDINT_H_ -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) - #define INT8_C(c) (c) #define INT16_C(c) (c) #define INT32_C(c) (c) @@ -46,10 +44,6 @@ #define INTMAX_C(c) INT64_C(c) #define UINTMAX_C(c) UINT64_C(c) -#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) - /* * ISO/IEC 9899:1999 * 7.18.2.1 Limits of exact-width integer types @@ -151,6 +145,4 @@ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ - #endif /* !_MACHINE__STDINT_H_ */ diff --git a/sys/powerpc/include/_stdint.h b/sys/powerpc/include/_stdint.h index 7fbb0118643f..9619b731d695 100644 --- a/sys/powerpc/include/_stdint.h +++ b/sys/powerpc/include/_stdint.h @@ -40,8 +40,6 @@ #ifndef _MACHINE__STDINT_H_ #define _MACHINE__STDINT_H_ -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) - #define INT8_C(c) (c) #define INT16_C(c) (c) #define INT32_C(c) (c) @@ -61,10 +59,6 @@ #define INTMAX_C(c) INT64_C(c) #define UINTMAX_C(c) UINT64_C(c) -#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) - #ifndef __INT64_C #ifdef __LP64__ #define __INT64_C(c) (c ## L) @@ -195,6 +189,4 @@ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ - #endif /* !_MACHINE__STDINT_H_ */ diff --git a/sys/riscv/include/_stdint.h b/sys/riscv/include/_stdint.h index b2276940e9e4..ec6a5bc5902a 100644 --- a/sys/riscv/include/_stdint.h +++ b/sys/riscv/include/_stdint.h @@ -31,8 +31,6 @@ #ifndef _MACHINE__STDINT_H_ #define _MACHINE__STDINT_H_ -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) - #define INT8_C(c) (c) #define INT16_C(c) (c) #define INT32_C(c) (c) @@ -46,10 +44,6 @@ #define INTMAX_C(c) INT64_C(c) #define UINTMAX_C(c) UINT64_C(c) -#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) - /* * ISO/IEC 9899:1999 * 7.18.2.1 Limits of exact-width integer types @@ -151,6 +145,4 @@ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ - #endif /* !_MACHINE__STDINT_H_ */ diff --git a/sys/x86/include/_stdint.h b/sys/x86/include/_stdint.h index e7fb926e4b1c..e49a111bf0cc 100644 --- a/sys/x86/include/_stdint.h +++ b/sys/x86/include/_stdint.h @@ -42,8 +42,6 @@ #include -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) - #define INT8_C(c) (c) #define INT16_C(c) (c) #define INT32_C(c) (c) @@ -63,10 +61,6 @@ #define INTMAX_C(c) INT64_C(c) #define UINTMAX_C(c) UINT64_C(c) -#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) - /* * ISO/IEC 9899:1999 * 7.18.2.1 Limits of exact-width integer types @@ -186,6 +180,4 @@ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ - #endif /* !_MACHINE__STDINT_H_ */ From nobody Fri May 8 11:55:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBncZ64CXz6cBDB for ; Fri, 08 May 2026 11:55: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 4gBncZ14tdz3lhR for ; Fri, 08 May 2026 11:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778241326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zOP5jdeI1XkP7OxNr/JkDjBdXlqA2XJ4WIZvunK9xv4=; b=H1ai07SYqqxBeNUKayk04eV+AeqLOx/Ur3RZYCJ8GSGRh9n9CobIWfOzbLJeUNP3lJCWzm NisfP6T+n6LMnCzMmqZYiyU3G2UdVhjJ6MHPj3uwIHqQVkMd2gLmJD8g6pElcmr1KXSglu SHDPtVPmSf71a1x/wIH2f7Kdz84mXu/GjMAFRP1djceOZzfkUGVHWxSFJKGNm87obzDLo0 RDBNT5RVuXRr6jkC/sVwu06q4WErXv5S0/P8SB6QPIQDH53d8T8ENJhBpH3yNSZStA2TS+ DuFhswCXd4RuC4zaAZ6qpaHawAWRgLrgsT19aROTAL0oFEx8gDdyT2RUBJE7oQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778241326; a=rsa-sha256; cv=none; b=VrWYsVgQOvcinsolbAOvuHTUmNN1vqS5G/vFPCCr+yGDb+FVWH6m8Y5ZFOBKUNS9HTRmrz 4j3wRfFPcVAPwNY4Vs8dEKpd04e/wmjxD9JhtGToMDVGnaVriUnfASbXvsLtrGZuRfTMBh LxV8z/6AXmOCpD2+ic+S69nRrsSU9tujZPHvQWNhA9ugeV/jagJlrJVST0XSBBdrl4dyzm FrK2eyWcIydFyvYuvSr4aAro2zLfUqYrafGE9mVDpQoT7ob3vtmIaD/aj9NGjZ2cQSq3A6 bC//RI2EgsfIWnNcbTey8QXa6HDi5Xcu8cYzBjQoHtrUAgM+tTUGcRI85Bkv8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778241326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zOP5jdeI1XkP7OxNr/JkDjBdXlqA2XJ4WIZvunK9xv4=; b=dWhDGg9vgT0EciB/guecFWliYCqN3zZPUAaJTJp9rA+RMflwfLAY8aHZXDx6SldHl/2zMP fSkt0bqYBxHIurQEshUiyxkMggVZXBf+nxYTU4tXHoM/fMRwB3g8mBt6Wr2XM0JGSlUEJP GBaYTY3I5ZzlpMM54KJS5qd9UCxTpS0tnmYU3oO3/iO+wV7N8uglos4SI6lQ8EtDDIFXP4 MOalmL+H+9qkKn1W00l59384WAOF+LYwyp7KsJQ5Ll+HMweRtxrB/k2rkXgsxnW7RVdmii KBtMpgxBTz0CS6kGugwRG5RX9rIhC3goMx4XeHQxtFutasNTR+9qFcoKz83qCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBncZ0MwCz19yx for ; Fri, 08 May 2026 11:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a79c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 11:55:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 9a69511b2167 - stable/13 - Remove extraneous tab characters at EOL in various _stdint.h files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9a69511b2167829f6dcc942371998053bd2f046f Auto-Submitted: auto-generated Date: Fri, 08 May 2026 11:55:26 +0000 Message-Id: <69fdcf2e.3a79c.15414e5f@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9a69511b2167829f6dcc942371998053bd2f046f commit 9a69511b2167829f6dcc942371998053bd2f046f Author: Dimitry Andric AuthorDate: 2026-05-01 18:08:26 +0000 Commit: Dimitry Andric CommitDate: 2026-05-08 10:27:22 +0000 Remove extraneous tab characters at EOL in various _stdint.h files MFC after: 3 days (cherry picked from commit daeab702f9adbbb718ecf48e17de8dd619cfe7b8) --- sys/powerpc/include/_stdint.h | 4 ++-- sys/riscv/include/_stdint.h | 2 +- sys/x86/include/_stdint.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/powerpc/include/_stdint.h b/sys/powerpc/include/_stdint.h index 67719432259d..7fbb0118643f 100644 --- a/sys/powerpc/include/_stdint.h +++ b/sys/powerpc/include/_stdint.h @@ -169,7 +169,7 @@ */ #ifdef __LP64__ /* Limits of ptrdiff_t. */ -#define PTRDIFF_MIN INT64_MIN +#define PTRDIFF_MIN INT64_MIN #define PTRDIFF_MAX INT64_MAX /* Limits of sig_atomic_t. */ @@ -180,7 +180,7 @@ #define SIZE_MAX UINT64_MAX #else /* Limits of ptrdiff_t. */ -#define PTRDIFF_MIN INT32_MIN +#define PTRDIFF_MIN INT32_MIN #define PTRDIFF_MAX INT32_MAX /* Limits of sig_atomic_t. */ diff --git a/sys/riscv/include/_stdint.h b/sys/riscv/include/_stdint.h index 914d1bb41b5b..b2276940e9e4 100644 --- a/sys/riscv/include/_stdint.h +++ b/sys/riscv/include/_stdint.h @@ -137,7 +137,7 @@ * 7.18.3 Limits of other integer types */ /* Limits of ptrdiff_t. */ -#define PTRDIFF_MIN INT64_MIN +#define PTRDIFF_MIN INT64_MIN #define PTRDIFF_MAX INT64_MAX /* Limits of sig_atomic_t. */ diff --git a/sys/x86/include/_stdint.h b/sys/x86/include/_stdint.h index ef9c76ca0b5d..e7fb926e4b1c 100644 --- a/sys/x86/include/_stdint.h +++ b/sys/x86/include/_stdint.h @@ -165,7 +165,7 @@ */ #ifdef __LP64__ /* Limits of ptrdiff_t. */ -#define PTRDIFF_MIN INT64_MIN +#define PTRDIFF_MIN INT64_MIN #define PTRDIFF_MAX INT64_MAX /* Limits of sig_atomic_t. */ From nobody Fri May 8 15:18:08 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBt6Z3WNYz6cSRL for ; Fri, 08 May 2026 15:18: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 4gBt6Z1qMLz4744 for ; Fri, 08 May 2026 15:18:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778253494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qwNuBP4an8uoXzZKRsutyarObHF1j74fPaDxlataix8=; b=rHZZlW0m63noaKmn4hp+qcp3l8XosbsQSeuyZuQRTYsYkIqTfzcciTACE84q6JfBkgNazo vzaAIPEPE+RriGWWIhJOoDkQ4UfxAUkPA1BgJ5erdmYeJR2r2hP2UMlnDMhaRVTcK1KmJx Q+xXLemMbLpAXc8diKqnPYDuhHdxYuL1IfNZfW2ISXw5r+bacdD+zVtwZB9jWqs7gAaNcx tjrx80lWCLkm3THI5vJirdH7bQAbv3LFmfLT+AHkyUeixyO6r5w0yNJu+bMsSxZ1VY+QRv BeOhkWb+dinu7FlGmGz/0QjBsJasQIrrHojVl6FOiM3t0FIXecTJ6BuEd7d5sA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778253494; a=rsa-sha256; cv=none; b=uwiyHyrjWdntQpmNM9GzDXmW3vcqvI/juNd2XIKSApMXSSAQX6meNy8TLfx4HodKPsLB/G p5esxsrynk9rhf+u/9U5WtO537cp0HiD4sLgzdsYPj65OeSgZNkH15a52KRZMsujgCOio+ aZcpXsL0G4l0gSQGQwwosXMEGoGOWT3KosmVVvBs5bHkn/fwqOehJZnO6MFJSM3DxIfaDO 5+nJV3hGDHMhhVz2kiVBN5Qh+gKZGFJj7ghapZCe3z3lT/2wgNTT2yuxblDoAibfV64Z/Y XDZ1VPiAGCQHd6CQ2xhpNUSsiLrJPJaN/vZ/ZwoxdNtCeJ+mRA7lWykrHP6MHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778253494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qwNuBP4an8uoXzZKRsutyarObHF1j74fPaDxlataix8=; b=ZhrYczUkIu3GhQRoud8G/wy5YMgYVRW2cPClNleMICxM/s2lzOM6RrkW//suWLQ8NCigO+ rWzI+JSkBTIDJLzMbXCd2rmIoNgbKQiKxZoj7MBu4HHj/r1pn1wyrjw2ccznu8j72QnqGb xMsCY1k+eRcRMqBHKggftfyJrJDn7MV7MQMk1dDYwrdJn6j4fylBy5Hnbq3Prqy2inYChw 7EqYdMT/RpO3sKcNDQ4DDiWgyC8pDtys+lNCGi6fcwZ6NSGbYBnu/L0bhCyk418WpJh7mx 9BYlV23yfru6ZzWYG3CVewJEchdMZHmloD8URm6wE0eac/wL5I9+DY/kmlf7kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBt6Z0vTYz3k8 for ; Fri, 08 May 2026 15:18:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 308c7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 15:18:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: bd1e789b8452 - main - Make "make update-packages" idempotent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd1e789b8452a8c2f166a3b4defb95330c71dadd Auto-Submitted: auto-generated Date: Fri, 08 May 2026 15:18:08 +0000 Message-Id: <69fdfeb0.308c7.27da5a2b@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=bd1e789b8452a8c2f166a3b4defb95330c71dadd commit bd1e789b8452a8c2f166a3b4defb95330c71dadd Author: Alan Somers AuthorDate: 2026-05-07 18:18:29 +0000 Commit: Alan Somers CommitDate: 2026-05-08 15:17:57 +0000 Make "make update-packages" idempotent If the user runs "make update-packages" without bumping BRANCH, then it isn't possible to copy packages from the old location to the new one (because the two locations are the same). So just skip that step. Sponsored by: ConnectWise PR: 295085 MFC after: 1 week Reviewed by: ivy, emaste Differential Revision: https://reviews.freebsd.org/D56872 --- Makefile.inc1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index b07b5f9c1a65..2927054c2e83 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2128,7 +2128,7 @@ real-packages: stage-packages create-packages sign-packages .PHONY real-update-packages: stage-packages .PHONY ${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} create-packages -.if defined(PKG_VERSION_FROM_DIR) +.if defined(PKG_VERSION_FROM_DIR) && ${PKG_VERSION} != ${PKG_VERSION_FROM} @echo "==> Checking for new packages (comparing ${PKG_VERSION} to ${PKG_VERSION_FROM})" @for pkg in ${PKG_VERSION_FROM_DIR}/${PKG_NAME_PREFIX}-*; do \ pkgname=$$(${PKG_CMD} query -F $${pkg} '%n' | sed 's/${PKG_NAME_PREFIX}-\(.*\)/\1/') ; \ @@ -2146,6 +2146,8 @@ real-update-packages: stage-packages .PHONY echo "==> New package $${newpkgname}" ; \ fi ; \ done +.elif defined(PKG_VERSION_FROM_DIR) + @echo "==> Package version ${PKG_VERSION} unchanged, keeping old package set" .else @echo "==> Bootstrapping repository, not checking for new packages" .endif From nobody Fri May 8 15:35:29 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBtVT69PMz6cV9Y for ; Fri, 08 May 2026 15:35: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 4gBtVT5hTyz49sp for ; Fri, 08 May 2026 15:35:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778254529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Ppvg1wPMWPiGMD0XUgMsqdDwQPjFjdlnk4FPVEwcvM=; b=aDMLepdbDM2MzvE9jIcisRPEBqwn0C3RRC7+tooA5QfC2eqL9Vq5OKLgoDIadC6id/mu6p qF1sUgdWTLZCLiW04PyOcAuo2FfEJdK38P9jNCbGGJiVHpW//DPA7WlK/Wcj5zWjiBJOH9 mDCflIK+QJT28DWaQrhuIQRvdzgFsiS5rc3RQRY27QDiqUa36SsL5HY9P1wphmmHDHbUVj 9eApYZBkji1WGE7lQjY1prNQj7TNFu21oCQTY5NOJwaNVAaJ1W+dFFdRcamgh260D/wDAH OjIAkR87hnSWSCgQm4tyJxbJbpZ9QdYMpaQEh+4hH9qV1P8/lltv44Dp3eGTgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778254529; a=rsa-sha256; cv=none; b=x0zk8zncDr0q3+Km16es1hH9OYHLVzj8VHIMyXA8en64def6A8FoaPuw5Mf6RID+b6nL5J 5eXhSBOQq8YH05f9i+K9KcqlOaYzMtMfm1BzG1DUzah/HoQmROx/hAhjqNUXHzmEQ8tdjM lZL3F7I+tIarxIPscbYdV7W4DF35t0Ietw2tCtLD1XxNvZZsrVDR1JO+wNbIiVxPd3VGrg T313SSkOxt7iVKMAUqcPHaMmn7kjONWdvf/WL5EMirOFelw/ebPJwTojgqsz//tUdHscsQ /zO1DxEVL8qk2WywLu4RZ0gcLykBof6C/P5QnjU1erQdIwRJG7VBo9lAU5shEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778254529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Ppvg1wPMWPiGMD0XUgMsqdDwQPjFjdlnk4FPVEwcvM=; b=cL24RVGvewXoil3K96Y3aS73a2b1DSLLgFQxBYo8WnFUjjTjy9G2MET+yEbHzwoNDXaSmp mG+Q9PbBE+smYuXjblglN0enR/tf64jbGX2SeHftBwH97jVzElvaISzu6YkGkzJoTPeInO smpBhPcMUn/6EHYFAaX09YJvw/YwHwDQQ4Wn1rlrnmdtS9awix2O92pgsE/rrVQ+Dd+W09 2aEcSHj81QNgcRPPwkP7AGYfa/CpIOXKl8clDluBmIdj/UqtvpU0G0QFwruzZvM2X59TGx U0ki76tia9+A7r3167bJ9WCED5ZL0zFFfMuVPrPx3N0fRHtHa+vZi7+8bGUFqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBtVT5GZjz3Wb for ; Fri, 08 May 2026 15:35:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31ef5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 15:35:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ryan Libby Subject: git: cab150feb82e - stable/14 - sys/time: appease gcc -Wtype-limits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: cab150feb82ebae3edf59565de28df68be5cf281 Auto-Submitted: auto-generated Date: Fri, 08 May 2026 15:35:29 +0000 Message-Id: <69fe02c1.31ef5.59564ceb@gitrepo.freebsd.org> The branch stable/14 has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=cab150feb82ebae3edf59565de28df68be5cf281 commit cab150feb82ebae3edf59565de28df68be5cf281 Author: Ryan Libby AuthorDate: 2026-04-15 08:08:37 +0000 Commit: Ryan Libby CommitDate: 2026-05-08 15:34:15 +0000 sys/time: appease gcc -Wtype-limits In environments where time_t is 32 bits, including the 32-bit library build on amd64, the overflow being tested for cannot happen, and gcc complains with -Wtype-limits, causing the gcc build to fail. Work around this by ifdef'ing out the saturation code on i386. Reviewed by: imp, jfree Discussed with: markj Fixes: e3799530b3ba ("sys/time: Add saturating sbt conversions") Differential Revision: https://reviews.freebsd.org/D56369 (cherry picked from commit 00dccc3164c6dff38350a1baeeea7238acf2efc3) --- sys/sys/time.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/sys/time.h b/sys/sys/time.h index 66fbd2dd41f4..195d3d12e953 100644 --- a/sys/sys/time.h +++ b/sys/sys/time.h @@ -357,10 +357,12 @@ tstosbt(struct timespec _ts) static __inline sbintime_t tstosbt_sat(struct timespec _ts) { +#ifndef __i386__ if (_ts.tv_sec > SBT_MAX >> 32) return (SBT_MAX); if (_ts.tv_sec < -(SBT_MAX >> 32) - 1) return (-SBT_MAX - 1); +#endif return (tstosbt(_ts)); } @@ -384,10 +386,12 @@ tvtosbt(struct timeval _tv) static __inline sbintime_t tvtosbt_sat(struct timeval _tv) { +#ifndef __i386__ if (_tv.tv_sec > SBT_MAX >> 32) return (SBT_MAX); if (_tv.tv_sec < -(SBT_MAX >> 32) - 1) return (-SBT_MAX - 1); +#endif return (tvtosbt(_tv)); } From nobody Fri May 8 18:15:34 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gBy3J47nMz6ckph for ; Fri, 08 May 2026 18:15: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 4gBy3J2kfbz3b7G for ; Fri, 08 May 2026 18:15:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778264140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CELeftaOYM1jZR+CxTVkYJVGPloyd1pQUYO5wuVjXpI=; b=YInEWT50PlVJBZIQNnedct8tH9UCWShg8QVOUZj2mo21e+qKJ5HCQo+wB7uCTqTtBXVkw+ g8DsUjR1OYTEAQFSOkgzjJ4zhswPT9DpKVdsmzuXRlRDvwyb4BrmOUUqs4BPQyMFAV5YhZ iMnIwkLIZ/VXijYSBvH9i5Yyd3JcwiWX4NSyNbfPzt9vCGSGYvJmQU8JLxNRcbsFef0FfO CU/d5rTto39kd7gzvEdHi6eJRPDHFaoXlYRz02IpFxiAZs+Ki2nHxcZoRyE9E9vyacVP+m W7+YuGAYC4TuzgZ3iZxGL1nMc3XYiYJPGfQdmApnYB+pd+ph7diu4d9jl7Wpzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778264140; a=rsa-sha256; cv=none; b=Fsq4Y4Ncj2aDoAK2CUo8hogTY1iCOCnFR7bnhO2NVwIeDHxZ36A1IexDkocIQvrBhrDxWW T0+jONvv8xutGcMaOLstDvg6q5Qbe2HTILJ70Ma7i4WyRQ/5fr4oIFNfLabQjYSbVdWuaU FuutRq2P0PcuDtJz2SWF9yiZCCcrO7pEKiMqkma1Y8dwN6LGjqVJjngIG9bKw/Z0Bvbsq4 fPtgnbQnQ8eousWXWl5/YKr2TNYFAw1/Y4aRE6hslPPWYpCcI0ExsR6RgqIde5OOnnO3cW mDz9S9ln68D3YLOlCUHllr2d3/YaaQ7xAZLkbmdGb4tlNryyFqbxJthmtXyqzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778264140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CELeftaOYM1jZR+CxTVkYJVGPloyd1pQUYO5wuVjXpI=; b=Y29VTQrH0tELLPWnlgdHKKl5RkEPn7YanWkjdzgTYEU4iIxvuTcXC7VrE25k6MmWCoVxZb qLD4BSf1qaeIOAQB4FoCE//CX9B6f071sdh6z7eRsIYZfvXeyotd9rkrDdlCnp0uC/mayz yNYI5Np9TChrLZSdNV6Xau8SzGrRIt2RkBr+k1XFmXDxwZgezWc4GTVeFeIgkmNC7CwCnp 5e8A7VEWpKgAYALlYOak+sjdplbrOJsiK5/DCmqB2pA/xayt+RfHJzV2AOjVJcy0oy2ruA CIHaXUDBklmfb1ovWp/d6E63FcjMqHQKLh71Sijd3F2kS/CUMVmU8s/fRQ0noQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBy3J0jbbz82j for ; Fri, 08 May 2026 18:15:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42ccf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 18:15:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: d9b272a19d39 - main - Merge commit 871038759afb from llvm git (by Marco Elver): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9b272a19d39f71665b529860bfed731bcfd99f5 Auto-Submitted: auto-generated Date: Fri, 08 May 2026 18:15:34 +0000 Message-Id: <69fe2846.42ccf.7f445ce5@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d9b272a19d39f71665b529860bfed731bcfd99f5 commit d9b272a19d39f71665b529860bfed731bcfd99f5 Author: Dimitry Andric AuthorDate: 2026-05-08 17:59:54 +0000 Commit: Dimitry Andric CommitDate: 2026-05-08 17:59:54 +0000 Merge commit 871038759afb from llvm git (by Marco Elver): Thread Safety Analysis: Fix pointer handling of variables with deprecated attributes (#148974) de10e44b6fe7 ("Thread Safety Analysis: Support warning on passing/returning pointers to guarded variables") added checks for passing pointer to guarded variables. While new features do not necessarily need to support the deprecated attributes (`guarded_var`, and `pt_guarded_var`), we need to ensure that such features do not cause the compiler to crash. As such, code such as this: struct { int v __attribute__((guarded_var)); } p; int *g() { return &p.v; // handleNoMutexHeld() with POK_ReturnPointer } Would crash in debug builds with the assertion in handleNoMutexHeld() triggering. The assertion is meant to capture the fact that this helper should only be used for warnings on variables (which the deprecated attributes only applied to). To fix, the function handleNoMutexHeld() should handle all POK cases that apply to variables explicitly, and produce a best-effort warning. We refrain from introducing new warnings to avoid unnecessary code bloat for deprecated features. Fixes: https://github.com/llvm/llvm-project/issues/140330 This fixes an assertion while building the net/openvswitch port: "Assertion failed: ((POK == POK_VarAccess || POK == POK_VarDereference) && "Only works for variables"), function handleNoMutexHeld, file /usr/src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp, line 2120.' Reported by: cy PR: 295101, 292067 MFC after: 1 month --- .../clang/lib/Sema/AnalysisBasedWarnings.cpp | 25 +++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp b/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp index ec39bca6039f..ab55cbceeaa8 100644 --- a/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp +++ b/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp @@ -2116,11 +2116,26 @@ class ThreadSafetyReporter : public clang::threadSafety::ThreadSafetyHandler { void handleNoMutexHeld(const NamedDecl *D, ProtectedOperationKind POK, AccessKind AK, SourceLocation Loc) override { - assert((POK == POK_VarAccess || POK == POK_VarDereference) && - "Only works for variables"); - unsigned DiagID = POK == POK_VarAccess? - diag::warn_variable_requires_any_lock: - diag::warn_var_deref_requires_any_lock; + unsigned DiagID = 0; + switch (POK) { + case POK_VarAccess: + case POK_PassByRef: + case POK_ReturnByRef: + case POK_PassPointer: + case POK_ReturnPointer: + DiagID = diag::warn_variable_requires_any_lock; + break; + case POK_VarDereference: + case POK_PtPassByRef: + case POK_PtReturnByRef: + case POK_PtPassPointer: + case POK_PtReturnPointer: + DiagID = diag::warn_var_deref_requires_any_lock; + break; + case POK_FunctionCall: + llvm_unreachable("Only works for variables"); + break; + } PartialDiagnosticAt Warning(Loc, S.PDiag(DiagID) << D << getLockKindFromAccessKind(AK)); Warnings.emplace_back(std::move(Warning), getNotes()); From nobody Fri May 8 20:05:50 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gC0VQ4m4xz6ctlT for ; Fri, 08 May 2026 20:05:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gC0VQ1qgXz3mCF for ; Fri, 08 May 2026 20:05:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778270750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4VEoqt6FpjzPUFbfBsUZvFdgyFyeryvwGz6ycDzavUk=; b=Io5XlxtyxvFVqJyCZwpt8S0+/c0O+hkIjDqWkHqr7i440rHunCGMB4ZS2yRqe0m+zbd0XI oNCWcXTZgkO5G8hVU1bW44dWzLXkRii+U8Sakn7sUAeIocRp4upjEeoI7h0K0tHaGo9ZiK Te3RnEEWEhCIeWawHk6ysDWKGWTGXuX7gL9K0mz2RfpSDjGDBysfJOkU+7c8HQVDJFXdn+ wG/i9Lfblmhi3OefJ8WkP5P/ld3tfh0dusSWiSNb1iY4ifig37RmgNP9jOAJA11nJm0ocB 6I5/DPhPpnBdoqqiAaokNdYfOH40aSE21QtbmajYlRlsXrG2P0UjGKqcTbPACQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778270750; a=rsa-sha256; cv=none; b=ALBAaW0AGjIyYWUiMqRJDAT3N4pauQxrN2f3Y74wxsNjnOSJgo6yFQ3yF2cClRct9PC3rc mrPGXo0Jy15s8nF3L+Yei2jMkahr/GU5koGN1uvHoj2GszBXYC58q2PkrME53esvX+Mecb AYLqp1WTFfhULxuwb/WbJ0vrXGVa+oNi+2Ezna/HiSNOzdRqTjtdxgyKTa2jtVyS7P/A4a aVqHTmGqL0E2XTTEz8s6v9+4PbHtkNpMYNDQOvupBBkXnWeQZulzvuY6bZKK9i5K+xWWQ0 CzfguQlVTZ5f3KkhUt42vk7gDgHY2BPJlM6+FiksW3JzQ8wBfqtKqVe/FsWAMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778270750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4VEoqt6FpjzPUFbfBsUZvFdgyFyeryvwGz6ycDzavUk=; b=BrWXFmffXwLe4jWT/kUDg93yqAlOtLm0meZu3T9NVeWcGHUVje0DToPn+F/S6LfOSchFEj Nwpesphr/7r+v6cw+nKR7gvxoAY+lhJ5lD80YpPKbgT/0iqlN3KIEuN6NPQxhuvpS29nOh G1jxFj4gSIRLbxUm+KTCn8YmFu0TH7nQxiX3Li6bHfflnNOO968CU3kqEFwvye3q2pDGcu frrbGHrm27kG6VkYoJQD0pxFjWdOZsyFP7Gpn6yS8eObtjBl9CfIermXatTbD4AhLNQFgI Aml12UKqH5vHaZ6ZvoNQbaTkAyZvxPxtpjdKOauOUxd/msMusL35HQyxEZ0ycQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gC0VQ1Pf0zC7X for ; Fri, 08 May 2026 20:05:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e236 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 20:05:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 324d53c26b23 - main - sys/time: rework saturation ifdef to avoid direct arch ref List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 324d53c26b2399d9b44fdd08e9c5af650f4ec3ae Auto-Submitted: auto-generated Date: Fri, 08 May 2026 20:05:50 +0000 Message-Id: <69fe421e.1e236.606f6a05@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=324d53c26b2399d9b44fdd08e9c5af650f4ec3ae commit 324d53c26b2399d9b44fdd08e9c5af650f4ec3ae Author: Ryan Libby AuthorDate: 2026-05-08 19:37:24 +0000 Commit: Ryan Libby CommitDate: 2026-05-08 19:37:24 +0000 sys/time: rework saturation ifdef to avoid direct arch ref Suggested by: kib Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D56401 --- sys/sys/time.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/time.h b/sys/sys/time.h index 6f18d8bd844d..5255d3bc9c7e 100644 --- a/sys/sys/time.h +++ b/sys/sys/time.h @@ -355,7 +355,7 @@ tstosbt(struct timespec _ts) static __inline sbintime_t tstosbt_sat(struct timespec _ts) { -#ifndef __i386__ +#if __SIZEOF_TIME_T > 4 if (_ts.tv_sec > SBT_MAX >> 32) return (SBT_MAX); if (_ts.tv_sec < -(SBT_MAX >> 32) - 1) @@ -384,7 +384,7 @@ tvtosbt(struct timeval _tv) static __inline sbintime_t tvtosbt_sat(struct timeval _tv) { -#ifndef __i386__ +#if __SIZEOF_TIME_T > 4 if (_tv.tv_sec > SBT_MAX >> 32) return (SBT_MAX); if (_tv.tv_sec < -(SBT_MAX >> 32) - 1) From nobody Fri May 8 20:05:49 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gC0VV2dsTz6cthF for ; Fri, 08 May 2026 20:05: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 4gC0VV1jGJz3mNx for ; Fri, 08 May 2026 20:05:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778270754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zlz3LODCYoH9xbKl+YxG7Pw27th1G7aMO0zIT0yA6yo=; b=DlgSCvignBFLyS5dvdIueJDZ8GOC4yi64/naW4bjO5yZ+3S9RwLMsKrQ5aW/fw6HVTu6O4 l3mR+zclPef+Eh4fqb+i2H3yLaVTiCfOHlV1w1Dc47i3P5tHQngy+v13hUCXdsKhHHDTYR SO/6/lIgN04MHSNpgAppGAdJ7GzDdMCHcszfC10ZgOQg3mYG0WiQrZTnIRWkVRR4NGW5M6 XmD+mXb3kcZWBTGG4ckbj4b818zllektjLUxhDPq3R7JiQ53K5gD1pfobIhOJs95cJUx76 yqwPE/1pT3zsKahfg6l2MfEehxzT9Z0hjFjQzpvAdbbGgD+9C9wGz14loaj71Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778270754; a=rsa-sha256; cv=none; b=X6S/Lhd9QoabkM+xpPpoPOoh779qOBLgnY+rjXIc1Q3jg1x3RX2ZaBZ9ScPjTqn/u5TFEc GcNQpp+txLmSGHlLXHastYcoWag5muUUWIdetI5FGJxgbUMZj67CCedPXCBtaYiqan5CaK KccUH6i6s6PWzA8wdg+A02xjpFrHseof6i1ThXwExYEQN9wBuDQeKt3CjPLFoLSDUTBuCu hsyhaS5gTC/QqFujCfKtUlH+kbsX1+948vd06zLGkvx7H64f7NUYY0/9nYOIUwEdZHEA3I zPr4548RygQ1yw1Y5t2Vd51jRzdZCuKdx9ZfbOh9nwd7W7NNCQNrKloeBy0+Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778270754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zlz3LODCYoH9xbKl+YxG7Pw27th1G7aMO0zIT0yA6yo=; b=Xj0GB6UxH6W0LbedDYOB6KKBTkgFwl5ihBRexU2Rar6NKKW3dv7NpYgTxmTPiI4wP24iaQ dls/BoBt6S4Tl2M/9wulFhepPf9E1v9WITr/wT6PeeA5EEm7mectrquLBCf3yJMtYgYvM4 zJw0W4QgCEziapBhzcCXWbpaMwbNsCna+w4D6EHlIXPDNN0iUQ4l1xlKmgehrD5j45maLQ dJl6oqW7uvkKvHlLJfYK6+WlsTXaeEL6hxje4txLJx/z0I6ujViigPQFTZ1zcNeCVDsh/I U3EgBqxEJqJy1efkpWJfuoGkVE7xrWzuuWPpAt+2aocQZlJ/eHc1p8Lk46N7Ww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gC0VV0q0BzCSk for ; Fri, 08 May 2026 20:05:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eb98 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 20:05:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 94323513dd50 - main - types: provide __SIZEOF_{INT{8,16,32,64},TIME,TIME32}_T List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94323513dd5070bf1fc3c191c560bd7e17da8931 Auto-Submitted: auto-generated Date: Fri, 08 May 2026 20:05:49 +0000 Message-Id: <69fe421d.1eb98.ccdad19@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=94323513dd5070bf1fc3c191c560bd7e17da8931 commit 94323513dd5070bf1fc3c191c560bd7e17da8931 Author: Ryan Libby AuthorDate: 2026-05-08 19:37:24 +0000 Commit: Ryan Libby CommitDate: 2026-05-08 19:37:24 +0000 types: provide __SIZEOF_{INT{8,16,32,64},TIME,TIME32}_T Suggested by: kib Reviewed by: imp, kib Discussed with: emaste, jrtc27 Differential Revision: https://reviews.freebsd.org/D56783 --- sys/arm/include/_types.h | 1 + sys/arm64/include/_types.h | 1 + sys/powerpc/include/_types.h | 1 + sys/riscv/include/_types.h | 1 + sys/sys/_types.h | 5 +++++ sys/sys/abi_types.h | 2 ++ sys/x86/include/_types.h | 2 ++ 7 files changed, 13 insertions(+) diff --git a/sys/arm/include/_types.h b/sys/arm/include/_types.h index 7319d950443b..9fde5fc5d7c9 100644 --- a/sys/arm/include/_types.h +++ b/sys/arm/include/_types.h @@ -57,6 +57,7 @@ typedef __int64_t __int_fast64_t; typedef __int32_t __register_t; typedef __int32_t __segsz_t; /* segment size (in pages) */ typedef __int64_t __time_t; /* time()... */ +#define __SIZEOF_TIME_T __SIZEOF_INT64_T typedef __uint32_t __uint_fast8_t; typedef __uint32_t __uint_fast16_t; typedef __uint32_t __uint_fast32_t; diff --git a/sys/arm64/include/_types.h b/sys/arm64/include/_types.h index 98f7dea67520..c46f64b2b252 100644 --- a/sys/arm64/include/_types.h +++ b/sys/arm64/include/_types.h @@ -55,6 +55,7 @@ typedef __int64_t __int_fast64_t; typedef __int64_t __register_t; typedef __int64_t __segsz_t; /* segment size (in pages) */ typedef __int64_t __time_t; /* time()... */ +#define __SIZEOF_TIME_T __SIZEOF_INT64_T typedef __uint32_t __uint_fast8_t; typedef __uint32_t __uint_fast16_t; typedef __uint32_t __uint_fast32_t; diff --git a/sys/powerpc/include/_types.h b/sys/powerpc/include/_types.h index 33cc6e731b50..746f9a4837c6 100644 --- a/sys/powerpc/include/_types.h +++ b/sys/powerpc/include/_types.h @@ -66,6 +66,7 @@ typedef __int32_t __register_t; typedef __int32_t __segsz_t; /* segment size (in pages) */ #endif typedef __int64_t __time_t; /* time()... */ +#define __SIZEOF_TIME_T __SIZEOF_INT64_T typedef __uint32_t __uint_fast8_t; typedef __uint32_t __uint_fast16_t; typedef __uint32_t __uint_fast32_t; diff --git a/sys/riscv/include/_types.h b/sys/riscv/include/_types.h index 3e9abd27a156..a9f95d4b6839 100644 --- a/sys/riscv/include/_types.h +++ b/sys/riscv/include/_types.h @@ -51,6 +51,7 @@ typedef __int64_t __int_fast64_t; typedef __int64_t __register_t; typedef __int64_t __segsz_t; /* segment size (in pages) */ typedef __int64_t __time_t; /* time()... */ +#define __SIZEOF_TIME_T __SIZEOF_INT64_T typedef __uint32_t __uint_fast8_t; typedef __uint32_t __uint_fast16_t; typedef __uint32_t __uint_fast32_t; diff --git a/sys/sys/_types.h b/sys/sys/_types.h index a2ee83a862da..bc438c17c8c0 100644 --- a/sys/sys/_types.h +++ b/sys/sys/_types.h @@ -40,18 +40,23 @@ */ typedef signed char __int8_t; typedef unsigned char __uint8_t; +#define __SIZEOF_INT8_T __SIZEOF_CHAR__ typedef short __int16_t; typedef unsigned short __uint16_t; +#define __SIZEOF_INT16_T __SIZEOF_SHORT__ typedef int __int32_t; typedef unsigned int __uint32_t; +#define __SIZEOF_INT32_T __SIZEOF_INT__ #if __SIZEOF_LONG__ == 8 typedef long __int64_t; typedef unsigned long __uint64_t; +#define __SIZEOF_INT64_T __SIZEOF_LONG__ #elif __SIZEOF_LONG__ == 4 __extension__ typedef long long __int64_t; __extension__ typedef unsigned long long __uint64_t; +#define __SIZEOF_INT64_T __SIZEOF_LONG_LONG__ #else #error unsupported long size #endif diff --git a/sys/sys/abi_types.h b/sys/sys/abi_types.h index 44d1bd733bbd..ddacd08ff011 100644 --- a/sys/sys/abi_types.h +++ b/sys/sys/abi_types.h @@ -27,8 +27,10 @@ typedef struct { #if defined(__amd64__) || defined(__i386__) typedef __int32_t time32_t; +#define __SIZEOF_TIME32_T __SIZEOF_INT32_T #else typedef __int64_t time32_t; +#define __SIZEOF_TIME32_T __SIZEOF_INT64_T #endif #define __HAVE_TIME32_T diff --git a/sys/x86/include/_types.h b/sys/x86/include/_types.h index b33dc0bfc7af..2630af1257c7 100644 --- a/sys/x86/include/_types.h +++ b/sys/x86/include/_types.h @@ -71,10 +71,12 @@ typedef __int64_t __int_fast64_t; typedef __int64_t __register_t; typedef __int64_t __segsz_t; /* segment size (in pages) */ typedef __int64_t __time_t; /* time()... */ +#define __SIZEOF_TIME_T __SIZEOF_INT64_T #else typedef __int32_t __register_t; typedef __int32_t __segsz_t; typedef __int32_t __time_t; +#define __SIZEOF_TIME_T __SIZEOF_INT32_T #endif typedef __uint32_t __uint_fast8_t; typedef __uint32_t __uint_fast16_t; From nobody Fri May 8 22:51:34 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gC49k0zTmz6d75R; Fri, 08 May 2026 22:51:38 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gC49j5lyXz3H0b; Fri, 08 May 2026 22:51:37 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001b.ext.cloudfilter.net ([10.228.9.171]) by cmsmtp with ESMTPS id LRx9wxPUyk14SLU2iwwVMo; Fri, 08 May 2026 22:51:36 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id LU2hwUzoquxscLU2iwW3UC; Fri, 08 May 2026 22:51:36 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=BZrVE7t2 c=1 sm=1 tr=0 ts=69fe68f8 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=NGcC8JguVDcA:10 a=6I5d2MoRAAAA:8 a=NEAV23lmAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=yJNcuj67nJIjCl48qfAA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id D3826146; Fri, 08 May 2026 15:51:34 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 98C9F10C; Fri, 08 May 2026 15:51:34 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Dimitry Andric cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: d9b272a19d39 - main - Merge commit 871038759afb from llvm git (by Marco Elver): In-reply-to: <69fe2846.42ccf.7f445ce5@gitrepo.freebsd.org> References: <69fe2846.42ccf.7f445ce5@gitrepo.freebsd.org> Comments: In-reply-to Dimitry Andric message dated "Fri, 08 May 2026 18:15:34 -0000." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 08 May 2026 15:51:34 -0700 Message-Id: <20260508225134.98C9F10C@slippy.cwsent.com> X-CMAE-Envelope: MS4xfBbNgGmi8dHeVfkX7Nte3KmOx+8UK0j7qeCfFz6smsBPAnWgYbU0oPUybqvQW+LVYYjSQxheImydP2khGHZipFXrLMuK+du/3cD2VFdsVX4CT0ly+eEA 82M8MTXMRKMG3ImumCzECbtJu49lue4yc2Dl59FC8RoZ4ZWZDITEGJrtgr9RGYFa85EYifAz4PyG6bmrjLfdV/z6yr6n/jNY1dK3a1ywQCK02yXvABGTAZWX qjuXhHTTimnSJacY/wgmkNm9XKeRj5SF9ovggB5GJjGBrBiODOiqBbQw1IRjEwgnPAofHH0UIu6KVzen3hv2PXCS4HpgNOPHmbnAgvYENa4= X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4gC49j5lyXz3H0b X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated In message <69fe2846.42ccf.7f445ce5@gitrepo.freebsd.org>, Dimitry Andric writes : > The branch main has been updated by dim: > > URL: https://cgit.FreeBSD.org/src/commit/?id=d9b272a19d39f71665b529860bfed731 > bcfd99f5 > > commit d9b272a19d39f71665b529860bfed731bcfd99f5 > Author: Dimitry Andric > AuthorDate: 2026-05-08 17:59:54 +0000 > Commit: Dimitry Andric > CommitDate: 2026-05-08 17:59:54 +0000 > > Merge commit 871038759afb from llvm git (by Marco Elver): > > Thread Safety Analysis: Fix pointer handling of variables with deprecat > ed attributes (#148974) > > de10e44b6fe7 ("Thread Safety Analysis: Support warning on > passing/returning pointers to guarded variables") added checks for > passing pointer to guarded variables. While new features do not > necessarily need to support the deprecated attributes (`guarded_var`, > and `pt_guarded_var`), we need to ensure that such features do not caus > e > the compiler to crash. > > As such, code such as this: > > struct { > int v __attribute__((guarded_var)); > } p; > > int *g() { > return &p.v; // handleNoMutexHeld() with POK_ReturnPointer > } > > Would crash in debug builds with the assertion in handleNoMutexHeld() > triggering. The assertion is meant to capture the fact that this helper > should only be used for warnings on variables (which the deprecated > attributes only applied to). > > To fix, the function handleNoMutexHeld() should handle all POK cases > that apply to variables explicitly, and produce a best-effort warning. > > We refrain from introducing new warnings to avoid unnecessary code bloa > t > for deprecated features. > > Fixes: https://github.com/llvm/llvm-project/issues/140330 > > This fixes an assertion while building the net/openvswitch port: > "Assertion failed: ((POK == POK_VarAccess || POK == POK_VarDereference) > && "Only works for variables"), function handleNoMutexHeld, file > /usr/src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp, > line 2120.' > > Reported by: cy > PR: 295101, 292067 > MFC after: 1 month > --- > .../clang/lib/Sema/AnalysisBasedWarnings.cpp | 25 +++++++++++++++++--- > -- > 1 file changed, 20 insertions(+), 5 deletions(-) > > diff --git a/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp b/ > contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp > index ec39bca6039f..ab55cbceeaa8 100644 > --- a/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp > +++ b/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp > @@ -2116,11 +2116,26 @@ class ThreadSafetyReporter : public clang::threadSafe > ty::ThreadSafetyHandler { > > void handleNoMutexHeld(const NamedDecl *D, ProtectedOperationKind POK, > AccessKind AK, SourceLocation Loc) override { > - assert((POK == POK_VarAccess || POK == POK_VarDereference) && > - "Only works for variables"); > - unsigned DiagID = POK == POK_VarAccess? > - diag::warn_variable_requires_any_lock: > - diag::warn_var_deref_requires_any_lock; > + unsigned DiagID = 0; > + switch (POK) { > + case POK_VarAccess: > + case POK_PassByRef: > + case POK_ReturnByRef: > + case POK_PassPointer: > + case POK_ReturnPointer: > + DiagID = diag::warn_variable_requires_any_lock; > + break; > + case POK_VarDereference: > + case POK_PtPassByRef: > + case POK_PtReturnByRef: > + case POK_PtPassPointer: > + case POK_PtReturnPointer: > + DiagID = diag::warn_var_deref_requires_any_lock; > + break; > + case POK_FunctionCall: > + llvm_unreachable("Only works for variables"); > + break; > + } > PartialDiagnosticAt Warning(Loc, S.PDiag(DiagID) > << D << getLockKindFromAccessKind(AK)); > Warnings.emplace_back(std::move(Warning), getNotes()); > After updating the system and the poudriere jail it's still experiencing the same issue. A Snippet of poudriere output below. /bin/sh ./libtool --tag=CC --mode=compile cc -DHAVE_CONFIG_H -I. -I ./include -I ./include -I ./lib -I ./lib -I/usr/include -Wstrict-prototypes -Wall -Wextra -Wno-sign-compare -Wpointer-arith -Wformat -Wformat-security -Wswitch-enum -Wunused-parameter -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-field-initializers -Wthread-safety -fno-strict-aliasing -Wswitch-bool -Wlogical-not-parentheses -Wsizeof-array-argument -Wshift-negative-value -Qunused-arguments -Wshadow -Wno-null-pointer-arithmetic -Warray-bounds-pointer-arithmetic -O2 -pipe -Wno-misleading-indentation -Wno-tautological-overlap-compare -Wno-unused-but-set-variable -Wno-deprecated-literal-operator -Wno-misleading-indentation -Wno-tautological-overlap-compare -Wno-unused-but-set-variable -fstack-protector-strong -fno-strict-aliasing -mno-avx512f -MT lib/util.lo -MD -MP -MF $depbase.Tpo -c -o lib/util.lo lib/util.c &&\ mv -f $depbase.Tpo $depbase.Plo #0 0x000015af6c783b06 llvm::sys::PrintStackTrace(llvm::raw_ostream&, int) /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/Unix/Signals.inc:0:13 #1 0x000015af6c781543 llvm::sys::RunSignalHandlers() /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/Signals.cpp:105:18 #2 0x000015af6c7255a2 HandleCrash /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/CrashRecoveryContext.cpp:73:5 #3 0x000015af6c7255a2 CrashRecoverySignalHandler /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/CrashRecoveryContext.cpp:390:51 #4 0x000015af6f03493c handle_signal /opt/src/git-src/lib/libthr/thread/thr_sig.c:0:3 #5 0x000015af6f033f5b thr_sighandler /opt/src/git-src/lib/libthr/thread/thr_sig.c:262:1 #6 0x000015af60e282d3 ([vdso]+0x2d3) #7 0x000015af74a3fd8a _thr_kill /export/obj/opt/src/git-src/amd64.amd64/lib/libsys/thr_kill.S:4:0 #8 0x000015af71a58a54 raise /opt/src/git-src/lib/libc/gen/raise.c:0:10 #9 0x000015af71b0a769 abort /opt/src/git-src/lib/libc/stdlib/abort.c:67:17 #10 0x000015af71a3b591 (/lib/libc.so.7+0xa2591) #11 0x000015af662b64e6 handleNoMutexHeld /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp:0:5 #12 0x000015af65576664 hasAttrs /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:521:34 #13 0x000015af65576664 attr_begin /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:543:12 #14 0x000015af65576664 specific_attr_begin /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:568:38 #15 0x000015af65576664 specific_attrs /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:563:29 #16 0x000015af65576664 checkAccess /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:1775:27 #17 0x000015af65577976 examineArguments /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:2150:35 #18 0x000015af6557594b getCallee /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/Expr.h:3023:53 #19 0x000015af6557594b getCalleeDecl /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/Expr.h:3054:12 #20 0x000015af6557594b VisitCallExpr /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:2223:46 #21 0x000015af6556837b Visit /export/obj/opt/src/git-src/amd64.amd64/lib/clang/libclang/clang/AST/StmtNodes.inc:1622:1 #22 0x000015af6556837b runAnalysis /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:2655:26 #23 0x000015af655645ee operator() /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__vector/vector.h:250:18 #24 0x000015af655645ee ~vector /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__vector/vector.h:262:67 #25 0x000015af655645ee ~ThreadSafetyAnalyzer /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:1082:7 #26 0x000015af655645ee clang::threadSafety::runThreadSafetyAnalysis(clang::AnalysisDeclContext&, clang::threadSafety::ThreadSafetyHandler&, clang::threadSafety::BeforeSet**) /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:2743:1 #27 0x000015af662aa7d6 emitDiagnostics /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp:1997:44 #28 0x000015af662aa7d6 clang::sema::AnalysisBasedWarnings::IssueWarnings(clang::sema::AnalysisBasedWarnings::Policy, clang::sema::FunctionScopeInfo*, clang::Decl const*, clang::QualType) /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp:2982:14 #29 0x000015af6634f5e4 clang::Sema::PopFunctionScopeInfo(clang::sema::AnalysisBasedWarnings::Policy const*, clang::Decl const*, clang::QualType) /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/Sema.cpp:2458:3 #30 0x000015af664d892f reset /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__memory/unique_ptr.h:287:21 #31 0x000015af664d892f ~unique_ptr /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__memory/unique_ptr.h:259:71 #32 0x000015af664d892f clang::Sema::ActOnFinishFunctionBody(clang::Decl*, clang::Stmt*, bool) /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp:16687:3 #33 0x000015af6628555c clang::Parser::ParseFunctionStatementBody(clang::Decl*, clang::Parser::ParseScope&) /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/ParseStmt.cpp:2402:18 #34 0x000015af6629f843 clang::Parser::ParseFunctionDefinition(clang::ParsingDeclarator&, clang::Parser::ParsedTemplateInfo const&, clang::Parser::LateParsedAttrList*) /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:0:0 #35 0x000015af661ca5bc clang::Parser::ParseDeclGroup(clang::ParsingDeclSpec&, clang::DeclaratorContext, clang::ParsedAttributes&, clang::Parser::ParsedTemplateInfo&, clang::SourceLocation*, clang::Parser::ForRangeInit*) /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp:2266:18 #36 0x000015af6629e9bf clang::Parser::ParseDeclOrFunctionDefInternal(clang::ParsedAttributes&, clang::ParsedAttributes&, clang::ParsingDeclSpec&, clang::AccessSpecifier) /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:0:10 #37 0x000015af6629e1a5 clang::Parser::ParseDeclarationOrFunctionDefinition(clang::ParsedAttributes&, clang::ParsedAttributes&, clang::ParsingDeclSpec*, clang::AccessSpecifier) /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:1209:12 #38 0x000015af6629d10a clang::Parser::ParseExternalDeclaration(clang::ParsedAttributes&, clang::ParsedAttributes&, clang::ParsingDeclSpec*) /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:0:14 #39 0x000015af6629b8a5 clang::Parser::ParseTopLevelDecl(clang::OpaquePtr&, clang::Sema::ModuleImportState&) /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:745:10 #40 0x000015af661b4a4e clang::ParseAST(clang::Sema&, bool, bool) /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/ParseAST.cpp:169:5 #41 0x000015af6601fe48 clang::FrontendAction::Execute() /opt/src/git-src/contrib/llvm-project/clang/lib/Frontend/FrontendAction.cpp:1225:10 #42 0x000015af65fa08cd getPtr /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/Support/Error.h:278:42 #43 0x000015af65fa08cd operator bool /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/Support/Error.h:241:16 #44 0x000015af65fa08cd clang::CompilerInstance::ExecuteAction(clang::FrontendAction&) /opt/src/git-src/contrib/llvm-project/clang/lib/Frontend/CompilerInstance.cpp:1055:23 #45 0x000015af660c02a5 clang::ExecuteCompilerInvocation(clang::CompilerInstance*) /opt/src/git-src/contrib/llvm-project/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp:299:25 #46 0x000015af1464f224 cc1_main /opt/src/git-src/contrib/llvm-project/clang/tools/driver/cc1_main.cpp:297:15 #47 0x000015af1465d0a5 ExecuteCC1Tool /opt/src/git-src/contrib/llvm-project/clang/tools/driver/driver.cpp:225:12 #48 0x000015af65c6198e operator() /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Job.cpp:436:30 #49 0x000015af65c6198e callback_fn<(lambda at /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Job.cpp:436:22)> /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/ADT/STLFunctionalExtras.h:46:12 #50 0x000015af6c7251fc operator() /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/ADT/STLFunctionalExtras.h:0:12 #51 0x000015af6c7251fc llvm::CrashRecoveryContext::RunSafely(llvm::function_ref) /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/CrashRecoveryContext.cpp:426:3 #52 0x000015af65c60f0a clang::driver::CC1Command::Execute(llvm::ArrayRef>, std::__1::basic_string, std::__1::allocator>*, bool*) const /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Job.cpp:436:7 #53 0x000015af65c20844 clang::driver::Compilation::ExecuteCommand(clang::driver::Command const&, clang::driver::Command const*&, bool) const /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Compilation.cpp:196:15 #54 0x000015af65c20acc clang::driver::Compilation::ExecuteJobs(clang::driver::JobList const&, llvm::SmallVectorImpl>&, bool) const /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Compilation.cpp:251:13 #55 0x000015af65c40186 empty /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/ADT/SmallVector.h:82:46 #56 0x000015af65c40186 clang::driver::Driver::ExecuteCompilation(clang::driver::Compilation&, llvm::SmallVectorImpl>&) /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Driver.cpp:2246:23 #57 0x000015af1465c76c clang_main /opt/src/git-src/contrib/llvm-project/clang/tools/driver/driver.cpp:406:21 #58 0x000015af1465ae22 main /opt/src/git-src/usr.bin/clang/clang/clang-driver.cpp:17:10 #59 0x000015af71a2d3cf __libc_start1 /opt/src/git-src/lib/libc/csu/libc_start1.c:180:2 cc: error: clang frontend command failed with exit code 134 (use -v to see invocation) FreeBSD clang version 21.1.8 (https://github.com/llvm/llvm-project.git llvmorg-21.1.8-0-g2078da43e25a) Target: x86_64-unknown-freebsd16.0 Thread model: posix InstalledDir: /usr/bin Build config: +assertions cc: note: diagnostic msg: ******************** PLEASE ATTACH THE FOLLOWING FILES TO THE BUG REPORT: Preprocessed source(s) and associated run script(s) are located at: cc: note: diagnostic msg: /tmp/timeval-562747.c cc: note: diagnostic msg: /tmp/timeval-562747.sh cc: note: diagnostic msg: ******************** Trying this on a physical machine results in the same LLVM panic. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Fri May 8 23:33:04 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gC55Z6CDmz6bx15; Fri, 08 May 2026 23:33:06 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gC55Z5vYXz3LRq; Fri, 08 May 2026 23:33:06 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778283186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Yu2A20Z/iiTniBNFySHRSyWBeYYWJbz8ImiQoXutkhE=; b=toHVg9SOKvIPmTwBEIa03yFBtTnaXDd+RVnedhTgvHYPMmJvHIqs6f2hFcdWVTGa8U641Q QOg4GQRxxP5v2mWa8VUT+yBjZN76rlxS+sNjFuLkuxyWXEFDCq9vrlCXMfyzfAedBii6iC 3tqXpQ/ZglPrpw2YdG93pCHja7t2fE8m6BzHuLRafCPCX3w7F8S15Ycb+PBm895pJT80g6 SKbX3DzO9uH/J5Y05W15hTe9BEZQ3vpS6nPmkeQyhkfudiMcy/vA4R67hyiSTpQH2Tlk7i QJLTkkiO+qHd48QfWgP+F1ovRFj7z8r2Ldm/HMzRdJGa0WPOkV0VIwIQGITyLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778283186; a=rsa-sha256; cv=none; b=MIYP7PfYsHbZUa/jSFmb1ZYGuiXFbscryjk3Pryb4/2ZbY0TO8+iyoe5PpA8O471K9dLZ0 P79whpV44K1QzEgWWfF8p6YcWg3BeIxls78zPNjrUpaT4umWX22jv35WxYhJgwXNWv+f/k TNQhklpRPC2AxH9WkeoEST7xBueIueAvIUw6HY9Sb9I8adhMwFCJhMvPKF8llKM/oyHzWz sv++CPdu8DswJq+tbEr2Tgv9E+7HJwsaPFJfp2hJLaUvl16wh7CRFH7L4IdEFvQji3zqvw yNrpwPvAmnH2rdjQmjhOflZBEqYi29ARQU/5LziaHdyiIzVCSXt6WPSALY70hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778283186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Yu2A20Z/iiTniBNFySHRSyWBeYYWJbz8ImiQoXutkhE=; b=yB5pJ+4yfVcJYgqchCEF2IN5ZkRIv+Ok6Tf9v1IjuABXvM0Ag+mGc2/fSdij/fH4pV9YZK B1bkIl5qpnmKDWcRcMC07fFJaViqW9HLE24BAVrg4faozcqV0XJX07IntkJcQGG9RIrIUk e3s5B8VlNd8CyUB5FBQx7NRC0nDRfKXIOcGACgP7tblYINiZjOU4f6kKI+bvi2mtVJnQch PmXfrWezENq5LDf2VShIQ1VD19L7KrAZellU4UBQSrjOPz9isAbYVaYh8VDfyN/tTUSSvs NIMgfhlho4ta4LAmwWVgsxnTQHzyHv+T6c1aRs+RjXGFPGhc5U3y/weBhIvhnQ== Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "E7" (not verified)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4gC55Z4gybz16vF; Fri, 08 May 2026 23:33:06 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (bladnoch.home.andric.com [192.168.0.20]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 26A8C61BD7; Sat, 09 May 2026 01:33:05 +0200 (CEST) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81.1.6\)) Subject: Re: git: d9b272a19d39 - main - Merge commit 871038759afb from llvm git (by Marco Elver): From: Dimitry Andric In-Reply-To: <20260508225134.98C9F10C@slippy.cwsent.com> Date: Sat, 9 May 2026 01:33:04 +0200 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <69fe2846.42ccf.7f445ce5@gitrepo.freebsd.org> <20260508225134.98C9F10C@slippy.cwsent.com> To: Cy Schubert X-Mailer: Apple Mail (2.3826.700.81.1.6) On 9 May 2026, at 00:51, Cy Schubert wrote: >=20 > In message <69fe2846.42ccf.7f445ce5@gitrepo.freebsd.org>, Dimitry = Andric writes > : >> The branch main has been updated by dim: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dd9b272a19d39f71665b529860bfed731= >> bcfd99f5 >>=20 >> commit d9b272a19d39f71665b529860bfed731bcfd99f5 >> Author: Dimitry Andric >> AuthorDate: 2026-05-08 17:59:54 +0000 >> Commit: Dimitry Andric >> CommitDate: 2026-05-08 17:59:54 +0000 >>=20 >> Merge commit 871038759afb from llvm git (by Marco Elver): >>=20 >> Thread Safety Analysis: Fix pointer handling of variables with = deprecat >> ed attributes (#148974) >>=20 >> de10e44b6fe7 ("Thread Safety Analysis: Support warning on >> passing/returning pointers to guarded variables") added checks = for >> passing pointer to guarded variables. While new features do not >> necessarily need to support the deprecated attributes = (`guarded_var`, >> and `pt_guarded_var`), we need to ensure that such features do = not caus >> e >> the compiler to crash. >>=20 >> As such, code such as this: >>=20 >> struct { >> int v __attribute__((guarded_var)); >> } p; >>=20 >> int *g() { >> return &p.v; // handleNoMutexHeld() with = POK_ReturnPointer >> } >>=20 >> Would crash in debug builds with the assertion in = handleNoMutexHeld() >> triggering. The assertion is meant to capture the fact that this = helper >> should only be used for warnings on variables (which the = deprecated >> attributes only applied to). >>=20 >> To fix, the function handleNoMutexHeld() should handle all POK = cases >> that apply to variables explicitly, and produce a best-effort = warning. >>=20 >> We refrain from introducing new warnings to avoid unnecessary = code bloa >> t >> for deprecated features. >>=20 >> Fixes: https://github.com/llvm/llvm-project/issues/140330 >>=20 >> This fixes an assertion while building the net/openvswitch port: >> "Assertion failed: ((POK =3D=3D POK_VarAccess || POK =3D=3D = POK_VarDereference) >> && "Only works for variables"), function handleNoMutexHeld, file >> = /usr/src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp, >> line 2120.' >>=20 >> Reported by: cy >> PR: 295101, 292067 >> MFC after: 1 month >> --- >> .../clang/lib/Sema/AnalysisBasedWarnings.cpp | 25 = +++++++++++++++++--- >> -- >> 1 file changed, 20 insertions(+), 5 deletions(-) >>=20 >> diff --git = a/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp b/ >> contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp >> index ec39bca6039f..ab55cbceeaa8 100644 >> --- a/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp >> +++ b/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp >> @@ -2116,11 +2116,26 @@ class ThreadSafetyReporter : public = clang::threadSafe >> ty::ThreadSafetyHandler { >>=20 >> void handleNoMutexHeld(const NamedDecl *D, ProtectedOperationKind = POK, >> AccessKind AK, SourceLocation Loc) override = { >> - assert((POK =3D=3D POK_VarAccess || POK =3D=3D = POK_VarDereference) && >> - "Only works for variables"); >> - unsigned DiagID =3D POK =3D=3D POK_VarAccess? >> - diag::warn_variable_requires_any_lock: >> - diag::warn_var_deref_requires_any_lock; >> + unsigned DiagID =3D 0; >> + switch (POK) { >> + case POK_VarAccess: >> + case POK_PassByRef: >> + case POK_ReturnByRef: >> + case POK_PassPointer: >> + case POK_ReturnPointer: >> + DiagID =3D diag::warn_variable_requires_any_lock; >> + break; >> + case POK_VarDereference: >> + case POK_PtPassByRef: >> + case POK_PtReturnByRef: >> + case POK_PtPassPointer: >> + case POK_PtReturnPointer: >> + DiagID =3D diag::warn_var_deref_requires_any_lock; >> + break; >> + case POK_FunctionCall: >> + llvm_unreachable("Only works for variables"); >> + break; >> + } >> PartialDiagnosticAt Warning(Loc, S.PDiag(DiagID) >> << D << getLockKindFromAccessKind(AK)); >> Warnings.emplace_back(std::move(Warning), getNotes()); >>=20 >=20 > After updating the system and the poudriere jail it's still = experiencing the same > issue. A Snippet of poudriere output below. >=20 > /bin/sh ./libtool --tag=3DCC --mode=3Dcompile cc -DHAVE_CONFIG_H = -I. -I ./include -I ./include -I ./lib -I ./lib -I/usr/include = -Wstrict-prototypes -Wall -Wextra -Wno-sign-compare -Wpointer-arith = -Wformat -Wformat-security -Wswitch-enum -Wunused-parameter = -Wbad-function-cast -Wcast-align -Wstrict-prototypes = -Wold-style-definition -Wmissing-prototypes -Wmissing-field-initializers = -Wthread-safety -fno-strict-aliasing -Wswitch-bool = -Wlogical-not-parentheses -Wsizeof-array-argument -Wshift-negative-value = -Qunused-arguments -Wshadow -Wno-null-pointer-arithmetic = -Warray-bounds-pointer-arithmetic -O2 -pipe = -Wno-misleading-indentation -Wno-tautological-overlap-compare = -Wno-unused-but-set-variable -Wno-deprecated-literal-operator = -Wno-misleading-indentation -Wno-tautological-overlap-compare = -Wno-unused-but-set-variable -fstack-protector-strong = -fno-strict-aliasing -mno-avx512f -MT lib/util.lo -MD -MP -MF = $depbase.Tpo -c -o lib/util.lo lib/util.c &&\ > mv -f $depbase.Tpo $depbase.Plo > #0 0x000015af6c783b06 llvm::sys::PrintStackTrace(llvm::raw_ostream&, = int) = /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/Unix/Signals.inc:0:= 13 > #1 0x000015af6c781543 llvm::sys::RunSignalHandlers() = /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/Signals.cpp:105:18 > #2 0x000015af6c7255a2 HandleCrash = /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/CrashRecoveryContex= t.cpp:73:5 > #3 0x000015af6c7255a2 CrashRecoverySignalHandler = /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/CrashRecoveryContex= t.cpp:390:51 > #4 0x000015af6f03493c handle_signal = /opt/src/git-src/lib/libthr/thread/thr_sig.c:0:3 > #5 0x000015af6f033f5b thr_sighandler = /opt/src/git-src/lib/libthr/thread/thr_sig.c:262:1 > #6 0x000015af60e282d3 ([vdso]+0x2d3) > #7 0x000015af74a3fd8a _thr_kill = /export/obj/opt/src/git-src/amd64.amd64/lib/libsys/thr_kill.S:4:0 > #8 0x000015af71a58a54 raise /opt/src/git-src/lib/libc/gen/raise.c:0:10 > #9 0x000015af71b0a769 abort = /opt/src/git-src/lib/libc/stdlib/abort.c:67:17 > #10 0x000015af71a3b591 (/lib/libc.so.7+0xa2591) > #11 0x000015af662b64e6 handleNoMutexHeld = /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings= .cpp:0:5 > #12 0x000015af65576664 hasAttrs = /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:5= 21:34 > #13 0x000015af65576664 attr_begin = /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:5= 43:12 > #14 0x000015af65576664 specific_attr_begin = /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:5= 68:38 > #15 0x000015af65576664 specific_attrs = /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:5= 63:29 > #16 0x000015af65576664 checkAccess = /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= 1775:27 > #17 0x000015af65577976 examineArguments = /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= 2150:35 > #18 0x000015af6557594b getCallee = /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/Expr.h:3023:= 53 > #19 0x000015af6557594b getCalleeDecl = /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/Expr.h:3054:= 12 > #20 0x000015af6557594b VisitCallExpr = /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= 2223:46 > #21 0x000015af6556837b Visit = /export/obj/opt/src/git-src/amd64.amd64/lib/clang/libclang/clang/AST/StmtN= odes.inc:1622:1 > #22 0x000015af6556837b runAnalysis = /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= 2655:26 > #23 0x000015af655645ee operator() = /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__vector/ve= ctor.h:250:18 > #24 0x000015af655645ee ~vector = /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__vector/ve= ctor.h:262:67 > #25 0x000015af655645ee ~ThreadSafetyAnalyzer = /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= 1082:7 > #26 0x000015af655645ee = clang::threadSafety::runThreadSafetyAnalysis(clang::AnalysisDeclContext&, = clang::threadSafety::ThreadSafetyHandler&, = clang::threadSafety::BeforeSet**) = /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= 2743:1 > #27 0x000015af662aa7d6 emitDiagnostics = /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings= .cpp:1997:44 > #28 0x000015af662aa7d6 = clang::sema::AnalysisBasedWarnings::IssueWarnings(clang::sema::AnalysisBas= edWarnings::Policy, clang::sema::FunctionScopeInfo*, clang::Decl const*, = clang::QualType) = /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings= .cpp:2982:14 > #29 0x000015af6634f5e4 = clang::Sema::PopFunctionScopeInfo(clang::sema::AnalysisBasedWarnings::Poli= cy const*, clang::Decl const*, clang::QualType) = /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/Sema.cpp:2458:3 > #30 0x000015af664d892f reset = /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__memory/un= ique_ptr.h:287:21 > #31 0x000015af664d892f ~unique_ptr = /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__memory/un= ique_ptr.h:259:71 > #32 0x000015af664d892f = clang::Sema::ActOnFinishFunctionBody(clang::Decl*, clang::Stmt*, bool) = /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp:16687:3 > #33 0x000015af6628555c = clang::Parser::ParseFunctionStatementBody(clang::Decl*, = clang::Parser::ParseScope&) = /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/ParseStmt.cpp:2402:1= 8 > #34 0x000015af6629f843 = clang::Parser::ParseFunctionDefinition(clang::ParsingDeclarator&, = clang::Parser::ParsedTemplateInfo const&, = clang::Parser::LateParsedAttrList*) = /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:0:0 > #35 0x000015af661ca5bc = clang::Parser::ParseDeclGroup(clang::ParsingDeclSpec&, = clang::DeclaratorContext, clang::ParsedAttributes&, = clang::Parser::ParsedTemplateInfo&, clang::SourceLocation*, = clang::Parser::ForRangeInit*) = /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp:2266:1= 8 > #36 0x000015af6629e9bf = clang::Parser::ParseDeclOrFunctionDefInternal(clang::ParsedAttributes&, = clang::ParsedAttributes&, clang::ParsingDeclSpec&, = clang::AccessSpecifier) = /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:0:10 > #37 0x000015af6629e1a5 = clang::Parser::ParseDeclarationOrFunctionDefinition(clang::ParsedAttribute= s&, clang::ParsedAttributes&, clang::ParsingDeclSpec*, = clang::AccessSpecifier) = /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:1209:12 > #38 0x000015af6629d10a = clang::Parser::ParseExternalDeclaration(clang::ParsedAttributes&, = clang::ParsedAttributes&, clang::ParsingDeclSpec*) = /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:0:14 > #39 0x000015af6629b8a5 = clang::Parser::ParseTopLevelDecl(clang::OpaquePtr&, = clang::Sema::ModuleImportState&) = /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:745:10 > #40 0x000015af661b4a4e clang::ParseAST(clang::Sema&, bool, bool) = /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/ParseAST.cpp:169:5 > #41 0x000015af6601fe48 clang::FrontendAction::Execute() = /opt/src/git-src/contrib/llvm-project/clang/lib/Frontend/FrontendAction.cp= p:1225:10 > #42 0x000015af65fa08cd getPtr = /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/Support/Error.h:27= 8:42 > #43 0x000015af65fa08cd operator bool = /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/Support/Error.h:24= 1:16 > #44 0x000015af65fa08cd = clang::CompilerInstance::ExecuteAction(clang::FrontendAction&) = /opt/src/git-src/contrib/llvm-project/clang/lib/Frontend/CompilerInstance.= cpp:1055:23 > #45 0x000015af660c02a5 = clang::ExecuteCompilerInvocation(clang::CompilerInstance*) = /opt/src/git-src/contrib/llvm-project/clang/lib/FrontendTool/ExecuteCompil= erInvocation.cpp:299:25 > #46 0x000015af1464f224 cc1_main = /opt/src/git-src/contrib/llvm-project/clang/tools/driver/cc1_main.cpp:297:= 15 > #47 0x000015af1465d0a5 ExecuteCC1Tool = /opt/src/git-src/contrib/llvm-project/clang/tools/driver/driver.cpp:225:12= > #48 0x000015af65c6198e operator() = /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Job.cpp:436:30 > #49 0x000015af65c6198e callback_fn<(lambda at = /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Job.cpp:436:22)> = /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/ADT/STLFunctionalE= xtras.h:46:12 > #50 0x000015af6c7251fc operator() = /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/ADT/STLFunctionalE= xtras.h:0:12 > #51 0x000015af6c7251fc = llvm::CrashRecoveryContext::RunSafely(llvm::function_ref) = /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/CrashRecoveryContex= t.cpp:426:3 > #52 0x000015af65c60f0a = clang::driver::CC1Command::Execute(llvm::ArrayRef>, std::__1::basic_string, = std::__1::allocator>*, bool*) const = /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Job.cpp:436:7 > #53 0x000015af65c20844 = clang::driver::Compilation::ExecuteCommand(clang::driver::Command = const&, clang::driver::Command const*&, bool) const = /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Compilation.cpp:196= :15 > #54 0x000015af65c20acc = clang::driver::Compilation::ExecuteJobs(clang::driver::JobList const&, = llvm::SmallVectorImpl>&, bool) const = /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Compilation.cpp:251= :13 > #55 0x000015af65c40186 empty = /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/ADT/SmallVector.h:= 82:46 > #56 0x000015af65c40186 = clang::driver::Driver::ExecuteCompilation(clang::driver::Compilation&, = llvm::SmallVectorImpl>&) = /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Driver.cpp:2246:23 > #57 0x000015af1465c76c clang_main = /opt/src/git-src/contrib/llvm-project/clang/tools/driver/driver.cpp:406:21= > #58 0x000015af1465ae22 main = /opt/src/git-src/usr.bin/clang/clang/clang-driver.cpp:17:10 > #59 0x000015af71a2d3cf __libc_start1 = /opt/src/git-src/lib/libc/csu/libc_start1.c:180:2 > cc: error: clang frontend command failed with exit code 134 (use -v to = see invocation) > FreeBSD clang version 21.1.8 (https://github.com/llvm/llvm-project.git = llvmorg-21.1.8-0-g2078da43e25a) > Target: x86_64-unknown-freebsd16.0 > Thread model: posix > InstalledDir: /usr/bin > Build config: +assertions > cc: note: diagnostic msg:=20 > ******************** >=20 > PLEASE ATTACH THE FOLLOWING FILES TO THE BUG REPORT: > Preprocessed source(s) and associated run script(s) are located at: > cc: note: diagnostic msg: /tmp/timeval-562747.c > cc: note: diagnostic msg: /tmp/timeval-562747.sh > cc: note: diagnostic msg:=20 >=20 > ******************** >=20 > Trying this on a physical machine results in the same LLVM panic. How did you rebuild the poudriere jail? I think due to dependency issues = you might not have gotten a new compiler, because for me it works OK = now. I'll see if I can bump the FREEBSD_CC_VERSION if it's needed, but I'd = rather not. You should probably try a fresh build. -Dimitry From nobody Fri May 8 23:49:47 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gC5Sv2p6qz6bxxw; Fri, 08 May 2026 23:49:51 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gC5Sv0Nxlz3Mcl; Fri, 08 May 2026 23:49:50 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002b.ext.cloudfilter.net ([10.228.9.233]) by cmsmtp with ESMTPS id LMgowx6X1k14SLUx3wxZMB; Fri, 08 May 2026 23:49:49 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id LUx2wnXR0M2qiLUx3wmGpv; Fri, 08 May 2026 23:49:49 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=b+a/I9Gx c=1 sm=1 tr=0 ts=69fe769d a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=NGcC8JguVDcA:10 a=6I5d2MoRAAAA:8 a=NEAV23lmAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=SMJLPe1anlQe-p-EpDAA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 1C7C716A; Fri, 08 May 2026 16:49:48 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id D2B6C2A; Fri, 08 May 2026 16:49:47 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Dimitry Andric cc: Cy Schubert , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: d9b272a19d39 - main - Merge commit 871038759afb from llvm git (by Marco Elver): In-reply-to: References: <69fe2846.42ccf.7f445ce5@gitrepo.freebsd.org> <20260508225134.98C9F10C@slippy.cwsent.com> Comments: In-reply-to Dimitry Andric message dated "Sat, 09 May 2026 01:33:04 +0200." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 08 May 2026 16:49:47 -0700 Message-Id: <20260508234947.D2B6C2A@slippy.cwsent.com> X-CMAE-Envelope: MS4xfN4+d4O091XYomEnCla6iBOvcpdUInT1FIY33jBgxSNQaZI+UE2bpPGiRLAxAdRPRc1TEBtB63OWL4+TnNSRxrxeTrvOxfeQYTnEMA+M9oMHdBGQ1MiB 2NK/SYsLMHc7V/xGKzMevP20QNuZMI5dgA783ktOSUhWKTKWKzqlFocs9nO4zH/i1dbgTRQnDQ0CkMrnio7vsvIKzb1vPSrkmJrK2rXwXsgHVw6uAz71iFJ4 OvOlCDP/EK5pOSOeARgaxjxY1cmSFEJOJOBBLQjNHzkn+0FPQXblohdQRxy4ghJIQzVxgHiQ/EkC1QU5gm+YvIPgSy/YRG2QXE9HIwwr/3I= X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4gC5Sv0Nxlz3Mcl X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated In message , Dimitry Andric w rites: > On 9 May 2026, at 00:51, Cy Schubert wrote: > >=20 > > In message <69fe2846.42ccf.7f445ce5@gitrepo.freebsd.org>, Dimitry = > Andric writes > > : > >> The branch main has been updated by dim: > >>=20 > >> URL: = > https://cgit.FreeBSD.org/src/commit/?id=3Dd9b272a19d39f71665b529860bfed731= > > >> bcfd99f5 > >>=20 > >> commit d9b272a19d39f71665b529860bfed731bcfd99f5 > >> Author: Dimitry Andric > >> AuthorDate: 2026-05-08 17:59:54 +0000 > >> Commit: Dimitry Andric > >> CommitDate: 2026-05-08 17:59:54 +0000 > >>=20 > >> Merge commit 871038759afb from llvm git (by Marco Elver): > >>=20 > >> Thread Safety Analysis: Fix pointer handling of variables with = > deprecat > >> ed attributes (#148974) > >>=20 > >> de10e44b6fe7 ("Thread Safety Analysis: Support warning on > >> passing/returning pointers to guarded variables") added checks = > for > >> passing pointer to guarded variables. While new features do not > >> necessarily need to support the deprecated attributes = > (`guarded_var`, > >> and `pt_guarded_var`), we need to ensure that such features do = > not caus > >> e > >> the compiler to crash. > >>=20 > >> As such, code such as this: > >>=20 > >> struct { > >> int v __attribute__((guarded_var)); > >> } p; > >>=20 > >> int *g() { > >> return &p.v; // handleNoMutexHeld() with = > POK_ReturnPointer > >> } > >>=20 > >> Would crash in debug builds with the assertion in = > handleNoMutexHeld() > >> triggering. The assertion is meant to capture the fact that this = > helper > >> should only be used for warnings on variables (which the = > deprecated > >> attributes only applied to). > >>=20 > >> To fix, the function handleNoMutexHeld() should handle all POK = > cases > >> that apply to variables explicitly, and produce a best-effort = > warning. > >>=20 > >> We refrain from introducing new warnings to avoid unnecessary = > code bloa > >> t > >> for deprecated features. > >>=20 > >> Fixes: https://github.com/llvm/llvm-project/issues/140330 > >>=20 > >> This fixes an assertion while building the net/openvswitch port: > >> "Assertion failed: ((POK =3D=3D POK_VarAccess || POK =3D=3D = > POK_VarDereference) > >> && "Only works for variables"), function handleNoMutexHeld, file > >> = > /usr/src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp, > >> line 2120.' > >>=20 > >> Reported by: cy > >> PR: 295101, 292067 > >> MFC after: 1 month > >> --- > >> .../clang/lib/Sema/AnalysisBasedWarnings.cpp | 25 = > +++++++++++++++++--- > >> -- > >> 1 file changed, 20 insertions(+), 5 deletions(-) > >>=20 > >> diff --git = > a/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp b/ > >> contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp > >> index ec39bca6039f..ab55cbceeaa8 100644 > >> --- a/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp > >> +++ b/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings.cpp > >> @@ -2116,11 +2116,26 @@ class ThreadSafetyReporter : public = > clang::threadSafe > >> ty::ThreadSafetyHandler { > >>=20 > >> void handleNoMutexHeld(const NamedDecl *D, ProtectedOperationKind = > POK, > >> AccessKind AK, SourceLocation Loc) override = > { > >> - assert((POK =3D=3D POK_VarAccess || POK =3D=3D = > POK_VarDereference) && > >> - "Only works for variables"); > >> - unsigned DiagID =3D POK =3D=3D POK_VarAccess? > >> - diag::warn_variable_requires_any_lock: > >> - diag::warn_var_deref_requires_any_lock; > >> + unsigned DiagID =3D 0; > >> + switch (POK) { > >> + case POK_VarAccess: > >> + case POK_PassByRef: > >> + case POK_ReturnByRef: > >> + case POK_PassPointer: > >> + case POK_ReturnPointer: > >> + DiagID =3D diag::warn_variable_requires_any_lock; > >> + break; > >> + case POK_VarDereference: > >> + case POK_PtPassByRef: > >> + case POK_PtReturnByRef: > >> + case POK_PtPassPointer: > >> + case POK_PtReturnPointer: > >> + DiagID =3D diag::warn_var_deref_requires_any_lock; > >> + break; > >> + case POK_FunctionCall: > >> + llvm_unreachable("Only works for variables"); > >> + break; > >> + } > >> PartialDiagnosticAt Warning(Loc, S.PDiag(DiagID) > >> << D << getLockKindFromAccessKind(AK)); > >> Warnings.emplace_back(std::move(Warning), getNotes()); > >>=20 > >=20 > > After updating the system and the poudriere jail it's still = > experiencing the same > > issue. A Snippet of poudriere output below. > >=20 > > /bin/sh ./libtool --tag=3DCC --mode=3Dcompile cc -DHAVE_CONFIG_H = > -I. -I ./include -I ./include -I ./lib -I ./lib -I/usr/include = > -Wstrict-prototypes -Wall -Wextra -Wno-sign-compare -Wpointer-arith = > -Wformat -Wformat-security -Wswitch-enum -Wunused-parameter = > -Wbad-function-cast -Wcast-align -Wstrict-prototypes = > -Wold-style-definition -Wmissing-prototypes -Wmissing-field-initializers = > -Wthread-safety -fno-strict-aliasing -Wswitch-bool = > -Wlogical-not-parentheses -Wsizeof-array-argument -Wshift-negative-value = > -Qunused-arguments -Wshadow -Wno-null-pointer-arithmetic = > -Warray-bounds-pointer-arithmetic -O2 -pipe = > -Wno-misleading-indentation -Wno-tautological-overlap-compare = > -Wno-unused-but-set-variable -Wno-deprecated-literal-operator = > -Wno-misleading-indentation -Wno-tautological-overlap-compare = > -Wno-unused-but-set-variable -fstack-protector-strong = > -fno-strict-aliasing -mno-avx512f -MT lib/util.lo -MD -MP -MF = > $depbase.Tpo -c -o lib/util.lo lib/util.c &&\ > > mv -f $depbase.Tpo $depbase.Plo > > #0 0x000015af6c783b06 llvm::sys::PrintStackTrace(llvm::raw_ostream&, = > int) = > /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/Unix/Signals.inc:0:= > 13 > > #1 0x000015af6c781543 llvm::sys::RunSignalHandlers() = > /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/Signals.cpp:105:18 > > #2 0x000015af6c7255a2 HandleCrash = > /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/CrashRecoveryContex= > t.cpp:73:5 > > #3 0x000015af6c7255a2 CrashRecoverySignalHandler = > /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/CrashRecoveryContex= > t.cpp:390:51 > > #4 0x000015af6f03493c handle_signal = > /opt/src/git-src/lib/libthr/thread/thr_sig.c:0:3 > > #5 0x000015af6f033f5b thr_sighandler = > /opt/src/git-src/lib/libthr/thread/thr_sig.c:262:1 > > #6 0x000015af60e282d3 ([vdso]+0x2d3) > > #7 0x000015af74a3fd8a _thr_kill = > /export/obj/opt/src/git-src/amd64.amd64/lib/libsys/thr_kill.S:4:0 > > #8 0x000015af71a58a54 raise /opt/src/git-src/lib/libc/gen/raise.c:0:10 > > #9 0x000015af71b0a769 abort = > /opt/src/git-src/lib/libc/stdlib/abort.c:67:17 > > #10 0x000015af71a3b591 (/lib/libc.so.7+0xa2591) > > #11 0x000015af662b64e6 handleNoMutexHeld = > /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings= > .cpp:0:5 > > #12 0x000015af65576664 hasAttrs = > /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:5= > 21:34 > > #13 0x000015af65576664 attr_begin = > /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:5= > 43:12 > > #14 0x000015af65576664 specific_attr_begin = > /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:5= > 68:38 > > #15 0x000015af65576664 specific_attrs = > /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/DeclBase.h:5= > 63:29 > > #16 0x000015af65576664 checkAccess = > /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= > 1775:27 > > #17 0x000015af65577976 examineArguments = > /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= > 2150:35 > > #18 0x000015af6557594b getCallee = > /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/Expr.h:3023:= > 53 > > #19 0x000015af6557594b getCalleeDecl = > /opt/src/git-src/contrib/llvm-project/clang/include/clang/AST/Expr.h:3054:= > 12 > > #20 0x000015af6557594b VisitCallExpr = > /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= > 2223:46 > > #21 0x000015af6556837b Visit = > /export/obj/opt/src/git-src/amd64.amd64/lib/clang/libclang/clang/AST/StmtN= > odes.inc:1622:1 > > #22 0x000015af6556837b runAnalysis = > /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= > 2655:26 > > #23 0x000015af655645ee operator() = > /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__vector/ve= > ctor.h:250:18 > > #24 0x000015af655645ee ~vector = > /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__vector/ve= > ctor.h:262:67 > > #25 0x000015af655645ee ~ThreadSafetyAnalyzer = > /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= > 1082:7 > > #26 0x000015af655645ee = > clang::threadSafety::runThreadSafetyAnalysis(clang::AnalysisDeclContext&, = > clang::threadSafety::ThreadSafetyHandler&, = > clang::threadSafety::BeforeSet**) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Analysis/ThreadSafety.cpp:= > 2743:1 > > #27 0x000015af662aa7d6 emitDiagnostics = > /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings= > .cpp:1997:44 > > #28 0x000015af662aa7d6 = > clang::sema::AnalysisBasedWarnings::IssueWarnings(clang::sema::AnalysisBas= > edWarnings::Policy, clang::sema::FunctionScopeInfo*, clang::Decl const*, = > clang::QualType) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/AnalysisBasedWarnings= > .cpp:2982:14 > > #29 0x000015af6634f5e4 = > clang::Sema::PopFunctionScopeInfo(clang::sema::AnalysisBasedWarnings::Poli= > cy const*, clang::Decl const*, clang::QualType) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/Sema.cpp:2458:3 > > #30 0x000015af664d892f reset = > /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__memory/un= > ique_ptr.h:287:21 > > #31 0x000015af664d892f ~unique_ptr = > /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/include/c++/v1/__memory/un= > ique_ptr.h:259:71 > > #32 0x000015af664d892f = > clang::Sema::ActOnFinishFunctionBody(clang::Decl*, clang::Stmt*, bool) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Sema/SemaDecl.cpp:16687:3 > > #33 0x000015af6628555c = > clang::Parser::ParseFunctionStatementBody(clang::Decl*, = > clang::Parser::ParseScope&) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/ParseStmt.cpp:2402:1= > 8 > > #34 0x000015af6629f843 = > clang::Parser::ParseFunctionDefinition(clang::ParsingDeclarator&, = > clang::Parser::ParsedTemplateInfo const&, = > clang::Parser::LateParsedAttrList*) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:0:0 > > #35 0x000015af661ca5bc = > clang::Parser::ParseDeclGroup(clang::ParsingDeclSpec&, = > clang::DeclaratorContext, clang::ParsedAttributes&, = > clang::Parser::ParsedTemplateInfo&, clang::SourceLocation*, = > clang::Parser::ForRangeInit*) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/ParseDecl.cpp:2266:1= > 8 > > #36 0x000015af6629e9bf = > clang::Parser::ParseDeclOrFunctionDefInternal(clang::ParsedAttributes&, = > clang::ParsedAttributes&, clang::ParsingDeclSpec&, = > clang::AccessSpecifier) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:0:10 > > #37 0x000015af6629e1a5 = > clang::Parser::ParseDeclarationOrFunctionDefinition(clang::ParsedAttribute= > s&, clang::ParsedAttributes&, clang::ParsingDeclSpec*, = > clang::AccessSpecifier) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:1209:12 > > #38 0x000015af6629d10a = > clang::Parser::ParseExternalDeclaration(clang::ParsedAttributes&, = > clang::ParsedAttributes&, clang::ParsingDeclSpec*) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:0:14 > > #39 0x000015af6629b8a5 = > clang::Parser::ParseTopLevelDecl(clang::OpaquePtr&, = > clang::Sema::ModuleImportState&) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/Parser.cpp:745:10 > > #40 0x000015af661b4a4e clang::ParseAST(clang::Sema&, bool, bool) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Parse/ParseAST.cpp:169:5 > > #41 0x000015af6601fe48 clang::FrontendAction::Execute() = > /opt/src/git-src/contrib/llvm-project/clang/lib/Frontend/FrontendAction.cp= > p:1225:10 > > #42 0x000015af65fa08cd getPtr = > /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/Support/Error.h:27= > 8:42 > > #43 0x000015af65fa08cd operator bool = > /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/Support/Error.h:24= > 1:16 > > #44 0x000015af65fa08cd = > clang::CompilerInstance::ExecuteAction(clang::FrontendAction&) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Frontend/CompilerInstance.= > cpp:1055:23 > > #45 0x000015af660c02a5 = > clang::ExecuteCompilerInvocation(clang::CompilerInstance*) = > /opt/src/git-src/contrib/llvm-project/clang/lib/FrontendTool/ExecuteCompil= > erInvocation.cpp:299:25 > > #46 0x000015af1464f224 cc1_main = > /opt/src/git-src/contrib/llvm-project/clang/tools/driver/cc1_main.cpp:297:= > 15 > > #47 0x000015af1465d0a5 ExecuteCC1Tool = > /opt/src/git-src/contrib/llvm-project/clang/tools/driver/driver.cpp:225:12= > > > #48 0x000015af65c6198e operator() = > /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Job.cpp:436:30 > > #49 0x000015af65c6198e callback_fn<(lambda at = > /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Job.cpp:436:22)> = > /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/ADT/STLFunctionalE= > xtras.h:46:12 > > #50 0x000015af6c7251fc operator() = > /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/ADT/STLFunctionalE= > xtras.h:0:12 > > #51 0x000015af6c7251fc = > llvm::CrashRecoveryContext::RunSafely(llvm::function_ref) = > /opt/src/git-src/contrib/llvm-project/llvm/lib/Support/CrashRecoveryContex= > t.cpp:426:3 > > #52 0x000015af65c60f0a = > clang::driver::CC1Command::Execute(llvm::ArrayRef :StringRef>>, std::__1::basic_string, = > std::__1::allocator>*, bool*) const = > /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Job.cpp:436:7 > > #53 0x000015af65c20844 = > clang::driver::Compilation::ExecuteCommand(clang::driver::Command = > const&, clang::driver::Command const*&, bool) const = > /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Compilation.cpp:196= > :15 > > #54 0x000015af65c20acc = > clang::driver::Compilation::ExecuteJobs(clang::driver::JobList const&, = > llvm::SmallVectorImpl const*>>&, bool) const = > /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Compilation.cpp:251= > :13 > > #55 0x000015af65c40186 empty = > /opt/src/git-src/contrib/llvm-project/llvm/include/llvm/ADT/SmallVector.h:= > 82:46 > > #56 0x000015af65c40186 = > clang::driver::Driver::ExecuteCompilation(clang::driver::Compilation&, = > llvm::SmallVectorImpl const*>>&) = > /opt/src/git-src/contrib/llvm-project/clang/lib/Driver/Driver.cpp:2246:23 > > #57 0x000015af1465c76c clang_main = > /opt/src/git-src/contrib/llvm-project/clang/tools/driver/driver.cpp:406:21= > > > #58 0x000015af1465ae22 main = > /opt/src/git-src/usr.bin/clang/clang/clang-driver.cpp:17:10 > > #59 0x000015af71a2d3cf __libc_start1 = > /opt/src/git-src/lib/libc/csu/libc_start1.c:180:2 > > cc: error: clang frontend command failed with exit code 134 (use -v to = > see invocation) > > FreeBSD clang version 21.1.8 (https://github.com/llvm/llvm-project.git = > llvmorg-21.1.8-0-g2078da43e25a) > > Target: x86_64-unknown-freebsd16.0 > > Thread model: posix > > InstalledDir: /usr/bin > > Build config: +assertions > > cc: note: diagnostic msg:=20 > > ******************** > >=20 > > PLEASE ATTACH THE FOLLOWING FILES TO THE BUG REPORT: > > Preprocessed source(s) and associated run script(s) are located at: > > cc: note: diagnostic msg: /tmp/timeval-562747.c > > cc: note: diagnostic msg: /tmp/timeval-562747.sh > > cc: note: diagnostic msg:=20 > >=20 > > ******************** > >=20 > > Trying this on a physical machine results in the same LLVM panic. > > How did you rebuild the poudriere jail? I think due to dependency issues = > you might not have gotten a new compiler, because for me it works OK = > now. I install my jail using my /usr/obj and update using, poudriere jail -j HEADamd64 -u > > I'll see if I can bump the FREEBSD_CC_VERSION if it's needed, but I'd = > rather not. You should probably try a fresh build. World should have been built incrementally but looking at bash history I may have only built the kernel. My mistake. Sorry for the noise. > > -Dimitry -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0 From nobody Fri May 8 23:55:14 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gC5bC4XjTz6byy5 for ; Fri, 08 May 2026 23:55: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 4gC5bC4F4Xz3Ncr for ; Fri, 08 May 2026 23:55:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778284519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B+aoTseTtBcxmocZ36fyuA7Conoh6tsEaZO4CkGzmtc=; b=B5e925oRNvFDKnYAC23E//CWeePYOpOtiZOljpjVsqb5gGYhcCNdVJNuBcQdxq3b+fwITX sbbaj6Jo2/HA/72lt2HlCvMGdwilPSuck4CBPAKSJJdYpxsXwnmbzdhFW/IltZV8fvYmm5 EI5+1sgmEpEUbMT5kz/r0rrlA3NUrGmkXzknwN8N8Z5dJmdJOspb0pYb7mTjwG/nKDd5Wt tCEr8UAuqXMf9oriZnT9Wp6+YlBc2pYphWvkj6Fl6d0uE+zyvRPoh8w5T0Pz4LfIUxZPJo u6uvaORmPdZS3ivZIgCPBncIbYxwL8Zal8i8YzVFsFJ1MWq2sXjvJa2qDkxtIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778284519; a=rsa-sha256; cv=none; b=X8mrXm/MxDuSXIUZBi2rK5M5o0LdgohpzaGa/5YluMCAGVPr4y3lXVlQAgb/HJnvaBH/Oj o2Daew+zoaLAnaoYwlhqdo9XnzZfNRsaUTpMSbOnG3GBdD1AsbaP/kuR6Zbqdu2dx4F/3v Mu8Fqu5K0AQXE1ckRCPpWYMziRVoep0BPFt5qkrMlqNnXokX+ee7iHd4QRpWPv2+I8HI95 lxadrwLhwfr4cMa8IdmYFQXDx6NLgPbZFC6U2TD9FbfjLOR+tZk2G1W9UDOhFaTIVBBtOr oeUKZ1tBbHPz1rUJlMl40Az/lqmAX0yY5P5XMJ+6rnRQn3qJlWC3vnE8omjO9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778284519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B+aoTseTtBcxmocZ36fyuA7Conoh6tsEaZO4CkGzmtc=; b=P6WWGy6kbKcCo13ysT9Ocixd6Po14495qN5uPak2jhbaxw/vS8jsE+GBdKU4vcpNd7cHvd a6Kuj/PoIhmaEUZGSz0WBpy3LiDlTRHubmEFczgVEhC9aXylEoGsxfEEghe17VnNLoF4IQ xm5lvoMWPDOFEbc7vhrh9u5PTgnTDdi76JuzyoHd6irFS67c/PXFTqDFreTLk03pj03yRH DpSfGtPcgRWu5PG+ky2Dja7O9GVEkcoLZr7qV7KrK2oK0b4OY6PcHtgpXdheq1VcA8wGHP YzTpYmOmchMTyD1be1dkTzQlSRzVBJq+c0QuLBz1pzgJFbPk00YnaxYy/SXXaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gC5bC3rD2zbWc for ; Fri, 08 May 2026 23:55:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f107 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 08 May 2026 23:55:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 1bef5535c1f1 - main - cxgbe(4): Updates to the hw and fw headers and config file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bef5535c1f191055e545cad029eabe939d93d24 Auto-Submitted: auto-generated Date: Fri, 08 May 2026 23:55:14 +0000 Message-Id: <69fe77e2.3f107.57b32233@gitrepo.freebsd.org> The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=1bef5535c1f191055e545cad029eabe939d93d24 commit 1bef5535c1f191055e545cad029eabe939d93d24 Author: Navdeep Parhar AuthorDate: 2026-03-09 18:19:49 +0000 Commit: Navdeep Parhar CommitDate: 2026-05-08 22:26:02 +0000 cxgbe(4): Updates to the hw and fw headers and config file MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/common/t4_regs.h | 51 ++++++-------- sys/dev/cxgbe/firmware/t4fw_interface.h | 107 +++++++++++++++++++++++++++--- sys/dev/cxgbe/firmware/t7fw_cfg.txt | 19 +++--- sys/dev/cxgbe/firmware/t7fw_cfg_uwire.txt | 19 +++--- sys/dev/cxgbe/t4_main.c | 15 +++-- 5 files changed, 154 insertions(+), 57 deletions(-) diff --git a/sys/dev/cxgbe/common/t4_regs.h b/sys/dev/cxgbe/common/t4_regs.h index 09d0d4aa2c08..9984461352d0 100644 --- a/sys/dev/cxgbe/common/t4_regs.h +++ b/sys/dev/cxgbe/common/t4_regs.h @@ -1465,10 +1465,10 @@ #define A_SGE_INT_ENABLE3 0x1040 #define A_SGE_FL_BUFFER_SIZE0 0x1044 -#define S_SIZE 4 +#define CXGBE_S_SIZE 4 #define CXGBE_M_SIZE 0xfffffffU -#define V_SIZE(x) ((x) << S_SIZE) -#define G_SIZE(x) (((x) >> S_SIZE) & CXGBE_M_SIZE) +#define CXGBE_V_SIZE(x) ((x) << S_SIZE) +#define CXGBE_G_SIZE(x) (((x) >> S_SIZE) & CXGBE_M_SIZE) #define S_T6_SIZE 4 #define M_T6_SIZE 0xfffffU @@ -26578,15 +26578,10 @@ #define V_CIM_ULP_TX_PKT_ERR_CODE(x) ((x) << S_CIM_ULP_TX_PKT_ERR_CODE) #define G_CIM_ULP_TX_PKT_ERR_CODE(x) (((x) >> S_CIM_ULP_TX_PKT_ERR_CODE) & M_CIM_ULP_TX_PKT_ERR_CODE) -#define S_CIM_SGE1_PKT_ERR_CODE 8 -#define M_CIM_SGE1_PKT_ERR_CODE 0xffU -#define V_CIM_SGE1_PKT_ERR_CODE(x) ((x) << S_CIM_SGE1_PKT_ERR_CODE) -#define G_CIM_SGE1_PKT_ERR_CODE(x) (((x) >> S_CIM_SGE1_PKT_ERR_CODE) & M_CIM_SGE1_PKT_ERR_CODE) - -#define S_CIM_SGE0_PKT_ERR_CODE 0 -#define M_CIM_SGE0_PKT_ERR_CODE 0xffU -#define V_CIM_SGE0_PKT_ERR_CODE(x) ((x) << S_CIM_SGE0_PKT_ERR_CODE) -#define G_CIM_SGE0_PKT_ERR_CODE(x) (((x) >> S_CIM_SGE0_PKT_ERR_CODE) & M_CIM_SGE0_PKT_ERR_CODE) +#define S_CIM_SGE_PKT_ERR_CODE 0 +#define M_CIM_SGE_PKT_ERR_CODE 0xffU +#define V_CIM_SGE_PKT_ERR_CODE(x) ((x) << S_CIM_SGE_PKT_ERR_CODE) +#define G_CIM_SGE_PKT_ERR_CODE(x) (((x) >> S_CIM_SGE_PKT_ERR_CODE) & M_CIM_SGE_PKT_ERR_CODE) #define S_CIM_PCIE_PKT_ERR_CODE 8 #define M_CIM_PCIE_PKT_ERR_CODE 0xffU @@ -60550,17 +60545,15 @@ #define A_MAC_PORT_PTP_DRIFT_ADJUST_COUNT 0x9a0 #define A_MAC_PORT_PTP_OFFSET_ADJUST_FINE 0x9a4 -#if 0 -#define S_B 16 -#define M_B 0xffffU -#define V_B(x) ((x) << S_B) -#define G_B(x) (((x) >> S_B) & M_B) -#endif +#define CXGBE_S_B 16 +#define CXGBE_M_B 0xffffU +#define CXGBE_V_B(x) ((x) << CXGBE_S_B) +#define CXGBE_G_B(x) (((x) >> CXGBE_S_B) & CXGBE_M_B) -#define S_A 0 -#define M_A 0xffffU -#define V_A(x) ((x) << S_A) -#define G_A(x) (((x) >> S_A) & M_A) +#define CXGBE_S_A 0 +#define CXGBE_M_A 0xffffU +#define CXGBE_V_A(x) ((x) << CXGBE_S_A) +#define CXGBE_G_A(x) (((x) >> CXGBE_S_A) & CXGBE_M_A) #define A_MAC_PORT_PTP_OFFSET_ADJUST_TOTAL 0x9a8 #define A_MAC_PORT_PTP_CFG 0x9ac @@ -62257,10 +62250,10 @@ #define A_MAC_PORT_MTIP_VLAN_TPID_0 0x1a00 -#define S_VLANTAG 0 +#define CXGBE_S_VLANTAG 0 #define CXGBE_M_VLANTAG 0xffffU -#define V_VLANTAG(x) ((x) << S_VLANTAG) -#define G_VLANTAG(x) (((x) >> S_VLANTAG) & M_VLANTAG) +#define CXGBE_V_VLANTAG(x) ((x) << CXGBE_S_VLANTAG) +#define CXGBE_G_VLANTAG(x) (((x) >> CXGBE_S_VLANTAG) & CXGBE_M_VLANTAG) #define A_MAC_PORT_MTIP_VLAN_TPID_1 0x1a04 #define A_MAC_PORT_MTIP_VLAN_TPID_2 0x1a08 @@ -69613,10 +69606,10 @@ #define V_INIT_ENABLE(x) ((x) << S_INIT_ENABLE) #define F_INIT_ENABLE V_INIT_ENABLE(1U) -#define S_WAIT 16 -#define M_WAIT 0xfffU -#define CXGBE_V_WAIT(x) ((x) << S_WAIT) -#define G_WAIT(x) (((x) >> S_WAIT) & M_WAIT) +#define CXGBE_S_WAIT 16 +#define CXGBE_M_WAIT 0xfffU +#define CXGBE_V_WAIT(x) ((x) << CXGBE_S_WAIT) +#define CXGBE_G_WAIT(x) (((x) >> CXGBE_S_WAIT) & CXGBE_M_WAIT) #define S_EN_MULTI_RANK_SEL 4 #define V_EN_MULTI_RANK_SEL(x) ((x) << S_EN_MULTI_RANK_SEL) diff --git a/sys/dev/cxgbe/firmware/t4fw_interface.h b/sys/dev/cxgbe/firmware/t4fw_interface.h index b11552dce021..6235a2c3fab4 100644 --- a/sys/dev/cxgbe/firmware/t4fw_interface.h +++ b/sys/dev/cxgbe/firmware/t4fw_interface.h @@ -2560,6 +2560,22 @@ struct fw_ri_wr { __be32 tpt_offset_t10_config; __be32 r8[2]; } nvmet_init; + struct fw_ri_iscsi_init { + __u8 type; + __u8 dcrc_dis_to_hcrc; + __u8 r4[3]; + __u8 qp_caps; + __be16 r5; + __be32 pdid; + __be32 qpid; + __be32 sq_eqid; + __be32 r6; + __be32 scqid; + __be32 rcqid; + __be32 r7[4]; + __be32 r8[2]; + __be64 r9; + } iscsi_init; struct fw_ri_fini { __u8 type; __u8 r3[7]; @@ -2634,6 +2650,37 @@ struct fw_ri_wr { #define G_FW_RI_WR_T10_CONFIG(x) \ (((x) >> S_FW_RI_WR_T10_CONFIG) & M_FW_RI_WR_T10_CONFIG) +#define S_FW_RI_WR_DCRC_DIS 7 +#define M_FW_RI_WR_DCRC_DIS 0x1 +#define V_FW_RI_WR_DCRC_DIS(x) ((x) << S_FW_RI_WR_DCRC_DIS) +#define G_FW_RI_WR_DCRC_DIS(x) \ + (((x) >> S_FW_RI_WR_DCRC_DIS) & M_FW_RI_WR_DCRC_DIS) +#define F_FW_RI_WR_DCRC_DIS V_FW_RI_WR_DCRC_DIS(1U) + +#define S_FW_RI_WR_HCRC_DIS 6 +#define M_FW_RI_WR_HCRC_DIS 0x1 +#define V_FW_RI_WR_HCRC_DIS(x) ((x) << S_FW_RI_WR_HCRC_DIS) +#define G_FW_RI_WR_HCRC_DIS(x) \ + (((x) >> S_FW_RI_WR_HCRC_DIS) & M_FW_RI_WR_HCRC_DIS) +#define F_FW_RI_WR_HCRC_DIS V_FW_RI_WR_HCRC_DIS(1U) + +#define S_FW_RI_WR_PSZ_IDX 4 +#define M_FW_RI_WR_PSZ_IDX 0x3 +#define V_FW_RI_WR_PSZ_IDX(x) ((x) << S_FW_RI_WR_PSZ_IDX) +#define G_FW_RI_WR_PSZ_IDX(x) \ + (((x) >> S_FW_RI_WR_PSZ_IDX) & M_FW_RI_WR_PSZ_IDX) + +#define S_FW_RI_WR_DCRC 1 +#define M_FW_RI_WR_DCRC 0x1 +#define V_FW_RI_WR_DCRC(x) ((x) << S_FW_RI_WR_DCRC) +#define G_FW_RI_WR_DCRC(x) (((x) >> S_FW_RI_WR_DCRC) & M_FW_RI_WR_DCRC) +#define F_FW_RI_WR_DCRC V_FW_RI_WR_DCRC(1U) + +#define S_FW_RI_WR_HCRC 0 +#define M_FW_RI_WR_HCRC 0x1 +#define V_FW_RI_WR_HCRC(x) ((x) << S_FW_RI_WR_HCRC) +#define G_FW_RI_WR_HCRC(x) (((x) >> S_FW_RI_WR_HCRC) & M_FW_RI_WR_HCRC) +#define F_FW_RI_WR_HCRC V_FW_RI_WR_HCRC(1U) /****************************************************************************** * R o C E V 2 W O R K R E Q U E S T s @@ -2951,6 +2998,24 @@ struct fw_v2_nvmet_tx_data_wr { #endif }; +#define S_FW_V2_NVMET_TX_DATA_WR_DACK_CHANGE 20 +#define M_FW_V2_NVMET_TX_DATA_WR_DACK_CHANGE 0x1 +#define V_FW_V2_NVMET_TX_DATA_WR_DACK_CHANGE(x) \ + ((x) << S_FW_V2_NVMET_TX_DATA_WR_DACK_CHANGE) +#define G_FW_V2_NVMET_TX_DATA_WR_DACK_CHANGE(x) \ + (((x) >> S_FW_V2_NVMET_TX_DATA_WR_DACK_CHANGE) & \ + M_FW_V2_NVMET_TX_DATA_WR_DACK_CHANGE) +#define F_FW_V2_NVMET_TX_DATA_WR_DACK_CHANGE \ + V_FW_V2_NVMET_TX_DATA_WR_DACK_CHANGE(1U) + +#define S_FW_V2_NVMET_TX_DATA_WR_DACK_MODE 18 +#define M_FW_V2_NVMET_TX_DATA_WR_DACK_MODE 0x3 +#define V_FW_V2_NVMET_TX_DATA_WR_DACK_MODE(x) \ + ((x) << S_FW_V2_NVMET_TX_DATA_WR_DACK_MODE) +#define G_FW_V2_NVMET_TX_DATA_WR_DACK_MODE(x) \ + (((x) >> S_FW_V2_NVMET_TX_DATA_WR_DACK_MODE) & \ + M_FW_V2_NVMET_TX_DATA_WR_DACK_MODE) + #define S_FW_V2_NVMET_TX_DATA_WR_FLAGS_HI 10 #define M_FW_V2_NVMET_TX_DATA_WR_FLAGS_HI 0x3fffff #define V_FW_V2_NVMET_TX_DATA_WR_FLAGS_HI(x) \ @@ -4990,6 +5055,16 @@ struct fw_crypto_update_sa_wr { } key; }; +#define S_FW_CRYPTO_UPDATE_SA_WR_EG_IPVER 3 +#define M_FW_CRYPTO_UPDATE_SA_WR_EG_IPVER 0x1 +#define V_FW_CRYPTO_UPDATE_SA_WR_EG_IPVER(x) \ + ((x) << S_FW_CRYPTO_UPDATE_SA_WR_EG_IPVER) +#define G_FW_CRYPTO_UPDATE_SA_WR_EG_IPVER(x) \ + (((x) >> S_FW_CRYPTO_UPDATE_SA_WR_EG_IPVER) & \ + M_FW_CRYPTO_UPDATE_SA_WR_EG_IPVER) +#define F_FW_CRYPTO_UPDATE_SA_WR_EG_IPVER \ + V_FW_CRYPTO_UPDATE_SA_WR_EG_IPVER(1U) + #define S_FW_CRYPTO_UPDATE_SA_WR_SAOP 2 #define M_FW_CRYPTO_UPDATE_SA_WR_SAOP 0x1 #define V_FW_CRYPTO_UPDATE_SA_WR_SAOP(x) \ @@ -8952,24 +9027,40 @@ enum fw_port_type { FW_PORT_TYPE_KX4 = 5, /* No, 4, No, No, Yes, Yes, 10G */ FW_PORT_TYPE_CX4 = 6, /* No, 4, No, No, No, No, 10G */ FW_PORT_TYPE_KX = 7, /* No, 1, No, No, Yes, No, 1G */ - FW_PORT_TYPE_KR = 8, /* No, 1, No, No, Yes, Yes, 10G */ + FW_PORT_TYPE_KR = 8, /* No, 1, No, No, Yes, Yes, 10G BP AN */ FW_PORT_TYPE_SFP = 9, /* No, 1, Yes, No, No, No, 10G */ - FW_PORT_TYPE_BP_AP = 10, /* No, 1, No, No, Yes, Yes, 10G, BP ANGE */ - FW_PORT_TYPE_BP4_AP = 11, /* No, 4, No, No, Yes, Yes, 10G, BP ANGE */ + FW_PORT_TYPE_BP_AP = 10, /* No, 1, No, No, Yes, Yes, 10G, BP AN */ + FW_PORT_TYPE_BP4_AP = 11, /* No, 4, No, No, Yes, Yes, 10G, BP AN */ FW_PORT_TYPE_QSFP_10G = 12, /* No, 1, Yes, No, No, No, 10G */ FW_PORT_TYPE_QSA = 13, /* No, 1, Yes, No, No, No, 10G */ FW_PORT_TYPE_QSFP = 14, /* No, 4, Yes, No, No, No, 40G */ - FW_PORT_TYPE_BP40_BA = 15, /* No, 4, No, No, Yes, Yes, 40G/10G/1G, BP ANGE */ - FW_PORT_TYPE_KR4_100G = 16, /* No, 4, 100G/40G/25G, Backplane */ + FW_PORT_TYPE_BP40_BA = 15, /* No, 4, No, No, Yes, Yes, 40G/10G/1G, BP AN */ + FW_PORT_TYPE_KR4_100G = 16, /* No, 4, 100G/40G/50G/25G/10G/1G, BP AN */ FW_PORT_TYPE_CR4_QSFP = 17, /* No, 4, 100G/40G/25G */ - FW_PORT_TYPE_CR_QSFP = 18, /* No, 1, 25G Spider cable */ - FW_PORT_TYPE_CR2_QSFP = 19, /* No, 2, 50G */ + FW_PORT_TYPE_CR_QSFP = 18, /* No, 1, 25G, Spider cable */ + FW_PORT_TYPE_CR2_QSFP = 19, /* No, 2, 50G, Spider cable */ FW_PORT_TYPE_SFP28 = 20, /* No, 1, 25G/10G/1G */ FW_PORT_TYPE_KR_SFP28 = 21, /* No, 1, 25G/10G/1G using Backplane */ FW_PORT_TYPE_KR_XLAUI = 22, /* No, 4, 40G/10G/1G, No AN*/ + FW_PORT_TYPE_BARE_LINK_50G = 23, /* No, 1, 50G */ + FW_PORT_TYPE_BARE_LINK_100G = 24, /* No, 2, 100G/50G */ + FW_PORT_TYPE_BARE_LINK_200G = 25, /* No, 4, 200G/100G/50G */ FW_PORT_TYPE_SFP56 = 26, /* No, 1, 50G/25G */ FW_PORT_TYPE_QSFP56 = 27, /* No, 4, 200G/100G/50G/25G */ - FW_PORT_TYPE_QSFPDD = 34, /* No, 8, 400G/200G/100G/50G */ + FW_PORT_TYPE_QSFP56_4_50G = 28, /* No, 1, 50G, Spider cable */ + FW_PORT_TYPE_KR_50G = 29, /* No, 1, 50G/25G/10G/1G, BP AN */ + FW_PORT_TYPE_KR2_100G = 30, /* No, 2, 100G/50G/25G/10G/1G, BP AN */ + FW_PORT_TYPE_KR4_200G = 31, /* No, 4, 200G/100G/40G/50G/25G/10G/1G, BP AN */ + FW_PORT_TYPE_QSFP56_2_50G = 32, /* No, 1, 50G, Spider cable */ + FW_PORT_TYPE_OSFP = 33, /* No, 8, 400G/200G/100G/50G */ + FW_PORT_TYPE_QSFPDD = 34, /* No, 8, 400G/200G/100G/50G */ + FW_PORT_TYPE_OSFP_2_200G = 35, /* No, 4, 200G, Spider cable */ + FW_PORT_TYPE_QSFPDD_2_200G = 36,/* No, 4, 200G, Spider cable */ + FW_PORT_TYPE_KR8_400G = 37, /* No, 8, 400G/200G/100G/50G/40G/25G/10G/1G, BP AN */ + FW_PORT_TYPE_QSFP56_2_100G = 38,/* No, 2, 100G, Spider cable */ + FW_PORT_TYPE_QSFPDD_4_100G = 39,/* No, 2, 100G, Spider cable */ + FW_PORT_TYPE_KR2_50G = 40, /* No, 1, 50G/25G/10G/1G, BP AN */ + FW_PORT_TYPE_MAX, FW_PORT_TYPE_NONE = M_FW_PORT_CMD_PORTTYPE32 }; diff --git a/sys/dev/cxgbe/firmware/t7fw_cfg.txt b/sys/dev/cxgbe/firmware/t7fw_cfg.txt index 70b05da04a23..33c703fdc9d7 100644 --- a/sys/dev/cxgbe/firmware/t7fw_cfg.txt +++ b/sys/dev/cxgbe/firmware/t7fw_cfg.txt @@ -175,6 +175,11 @@ # TPT error. # Err2uP = 0 + # ULP_TX_ACCELERATOR_CTL + reg[0x8f90] = 0x00000015/0x00000015 # Compression block clock gating + # Dedupe clock gating + # Erasure Coding clock gating + #ULP_RX_CTL1 reg[0x19330] = 0x000000f0/0x000000f0 # RDMA_Invld_Msg_Dis = 3 # ROCE_Invld_Msg_Dis = 3 @@ -201,7 +206,7 @@ # default gc enabled. # HMA configuration (uncomment following lines to enable HMA) - hma_size = 128 # Size (in MBs) of host memory expected + hma_size = 256 # Size (in MBs) of host memory expected hma_regions = iscsi,rrq,tls,ddp,pmrx,stag,pbl,rq # What all regions to place in host memory #mc[0]=0 @@ -394,8 +399,7 @@ neq = 16 # niqflint + nethctrl Egress Queues nexactf = 8 # number of exact MPSTCAM MAC filters cmask = all # access to all channels - #pmask = 0x4 # access to only one port - pmask = 0x1 # access to only one port + pmask = 0x4 # access to only one port [function "3"] nvf = 16 # NVF on this function @@ -407,7 +411,7 @@ neq = 16 # niqflint + nethctrl Egress Queues nexactf = 8 # number of exact MPSTCAM MAC filters cmask = all # access to all channels - #pmask = 0x2 # access to only one port + pmask = 0x8 # access to only one port # Some OS Drivers manage all application functions for all ports via PF4. # Thus we need to provide a large number of resources here. For Egress @@ -421,7 +425,7 @@ r_caps = all # read permissions for all commands nvi = 28 # NVI_UNIFIED niqflint = 170 # NFLIQ_UNIFIED + NLFIQ_WD - nethctrl = 224 # NETHCTRL_UNIFIED + NETHCTRL_WD + nethctrl = 288 # NETHCTRL_UNIFIED + NETHCTRL_WD neq = 252 # NEQ_UNIFIED + NEQ_WD nqpcq = 12288 nexactf = 40 # NMPSTCAM_UNIFIED @@ -435,8 +439,7 @@ nserver = 480 # number of server region entries nhash = 12288 # number of hash region entries nhpfilter = 64 # number of high priority filter region entries - #protocol = nic_vm, ofld, rddp, rdmac, iscsi_initiator_pdu, iscsi_target_pdu, iscsi_t10dif, tlskeys, crypto_lookaside, ipsec_inline, rocev2, nic_hashfilter, ofld_sendpath - protocol = nic_vm, ofld, rddp, rdmac, iscsi_initiator_pdu, iscsi_target_pdu, iscsi_t10dif, tlskeys, crypto_lookaside, ipsec_inline, rocev2, nic_hashfilter, nvme_tcp + protocol = nic_vm, ofld, rddp, rdmac, iscsi_initiator_pdu, iscsi_target_pdu, iscsi_t10dif, tlskeys, crypto_lookaside, ipsec_inline, rocev2, nic_hashfilter, nvme_tcp, ofld_sendpath tp_l2t = 3072 tp_ddp = 2 tp_ddp_iscsi = 2 @@ -643,7 +646,7 @@ [fini] version = 0x1425001d - checksum = 0x3671da3b + checksum = 0x2419f987 # Total resources used by above allocations: # Virtual Interfaces: 104 diff --git a/sys/dev/cxgbe/firmware/t7fw_cfg_uwire.txt b/sys/dev/cxgbe/firmware/t7fw_cfg_uwire.txt index b1f5129238eb..9da841153138 100644 --- a/sys/dev/cxgbe/firmware/t7fw_cfg_uwire.txt +++ b/sys/dev/cxgbe/firmware/t7fw_cfg_uwire.txt @@ -175,6 +175,11 @@ # TPT error. # Err2uP = 0 + # ULP_TX_ACCELERATOR_CTL + reg[0x8f90] = 0x00000015/0x00000015 # Compression block clock gating + # Dedupe clock gating + # Erasure Coding clock gating + #ULP_RX_CTL1 reg[0x19330] = 0x000000f0/0x000000f0 # RDMA_Invld_Msg_Dis = 3 # ROCE_Invld_Msg_Dis = 3 @@ -201,7 +206,7 @@ # default gc enabled. # HMA configuration (uncomment following lines to enable HMA) - hma_size = 128 # Size (in MBs) of host memory expected + hma_size = 256 # Size (in MBs) of host memory expected hma_regions = iscsi,rrq,tls,ddp,pmrx,stag,pbl,rq # What all regions to place in host memory #mc[0]=0 @@ -394,8 +399,7 @@ neq = 16 # niqflint + nethctrl Egress Queues nexactf = 8 # number of exact MPSTCAM MAC filters cmask = all # access to all channels - #pmask = 0x4 # access to only one port - pmask = 0x1 # access to only one port + pmask = 0x4 # access to only one port [function "3"] nvf = 16 # NVF on this function @@ -407,7 +411,7 @@ neq = 16 # niqflint + nethctrl Egress Queues nexactf = 8 # number of exact MPSTCAM MAC filters cmask = all # access to all channels - #pmask = 0x2 # access to only one port + pmask = 0x8 # access to only one port # Some OS Drivers manage all application functions for all ports via PF4. # Thus we need to provide a large number of resources here. For Egress @@ -421,7 +425,7 @@ r_caps = all # read permissions for all commands nvi = 28 # NVI_UNIFIED niqflint = 170 # NFLIQ_UNIFIED + NLFIQ_WD - nethctrl = 224 # NETHCTRL_UNIFIED + NETHCTRL_WD + nethctrl = 288 # NETHCTRL_UNIFIED + NETHCTRL_WD neq = 252 # NEQ_UNIFIED + NEQ_WD nqpcq = 12288 nexactf = 40 # NMPSTCAM_UNIFIED @@ -435,8 +439,7 @@ nserver = 480 # number of server region entries nhash = 12288 # number of hash region entries nhpfilter = 64 # number of high priority filter region entries - #protocol = nic_vm, ofld, rddp, rdmac, iscsi_initiator_pdu, iscsi_target_pdu, iscsi_t10dif, tlskeys, crypto_lookaside, ipsec_inline, rocev2, nic_hashfilter, ofld_sendpath - protocol = nic_vm, ofld, rddp, rdmac, iscsi_initiator_pdu, iscsi_target_pdu, iscsi_t10dif, tlskeys, crypto_lookaside, ipsec_inline, rocev2, nic_hashfilter, nvme_tcp + protocol = nic_vm, ofld, rddp, rdmac, iscsi_initiator_pdu, iscsi_target_pdu, iscsi_t10dif, tlskeys, crypto_lookaside, ipsec_inline, rocev2, nic_hashfilter, nvme_tcp, ofld_sendpath tp_l2t = 3072 tp_ddp = 2 tp_ddp_iscsi = 2 @@ -643,7 +646,7 @@ [fini] version = 0x1425001d - checksum = 0x96513217 + checksum = 0x83f95163 # Total resources used by above allocations: # Virtual Interfaces: 104 diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 69ecfce1dade..d73204eb808c 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -3760,10 +3760,17 @@ port_mword(struct port_info *pi, uint32_t speed) return (IFM_NONE); } break; - case M_FW_PORT_CMD_PTYPE: /* FW_PORT_TYPE_NONE for old firmware */ - if (chip_id(pi->adapter) >= CHELSIO_T7) - return (IFM_UNKNOWN); - /* fall through */ + case FW_PORT_TYPE_KR4_200G: { + /* + * Pre-T7 firmware used M_FW_PORT_CMD_PTYPE for PORT_TYPE_NONE + * and driver needs to deal with both. + */ + _Static_assert(M_FW_PORT_CMD_PTYPE == FW_PORT_TYPE_KR4_200G, + "driver/firmware mismatch"); + if (chip_id(pi->adapter) < CHELSIO_T7) + return (IFM_NONE); + return (IFM_200G_KR4_PAM4); + } case FW_PORT_TYPE_NONE: return (IFM_NONE); } From nobody Sat May 9 04:57:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCDHw3sMMz6cgHk for ; Sat, 09 May 2026 04:57:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCDHw2rqfz3sFn for ; Sat, 09 May 2026 04:57:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778302652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HJcDvZNznLPAx8aXc5e0O5B10bPbZa/p3eUkeCKroVo=; b=jXIBfcbSm4gIHu0jvuypaIXlmrUPg+MKPS0XyzBqeOBd7nWPOWL6sbn49T5UvhziYrTRtZ UX6NmTgW5yUqNsYFkUvZJuKqBfWc4MZRnGiTSOxzr5j9OzruwKRSAes7nvQSH1ZI83x8X0 cs+mCYoEPjWRUtDr9D18t7UFQqcNqx46hogp3qOhPsvHSgTNaEoI2y4rr6jCgQkoSY2ie0 J8t0dqjy2o119/X1FmY/dU4UFnyUih5AOchKm7fG698MzzuJkihTzdvSNZ4DuHbm3CjtGS f7GoB+O7h77f57PAzZkdxfBy/zo4b5iI51tcqphnBqw0Hj/v7LUVx3RtHhy4AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778302652; a=rsa-sha256; cv=none; b=SJloBuk3gKoBXo/CL8bzAriL/McwXo0KL0/vonnMTWePS0Km/LewkCIKgj4nBUr9MOrpyR K7DZYBOdwCfLMajMTgLe+3zySvV3Biig5GBeDYcKLg7VUkI1PFxJ7tn3HgtFeWT1IN3Onq XBHJOUhO5KTrwGjfVkhhmjBCVwIR55glYauHXlB9TEx2lJntftUj9sjplV3rdF80QkwFLc HzW5hZr9Z6MWt2sdP6fPgqjKPhhNROUxSMz50uuUEa9Wlz02Njj3ihipTEj3Ut9X0nHDMx HGMLWKEpAh3ZE4eLs2AQSc2CSjUI2KjoMBx2gIwv64azYB0igI1V+IUTX55IHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778302652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HJcDvZNznLPAx8aXc5e0O5B10bPbZa/p3eUkeCKroVo=; b=ZfGosSm7RjrQnIpAD0QUijATUVzGMXR9M0TU4xy2ddsKYUgoPvYe8+HL/5y/OjML6It1fk QNfcCmLXqGvov0N3fX37m3lHChnPA0dwD00FYEuxVRgDpcWy7gmePagHz+rGb8MkXuAxNT v8Qs3ZQpme8pZuRZnRaIOYlglQRZ4c4zJ7MtDxv6qEeAsiW4YLaV77Ss9M68B3z2x8oAaQ imLvfqDAO2YcBJlYtNEP0FtcxVn6o3n0/K1z8UjrKuzqtzEnlTm9tfSKlhpqOkBIOPMLfu olZLA5HCxcA4hskBpOLO3nfCGskOqCLTg7kkn0hjxDB6Omt//mJcHUhz3rlIzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCDHw1pGVzldJ for ; Sat, 09 May 2026 04:57:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3749a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 04:57:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Lianwei Wang From: Xin LI Subject: git: 10e342c1ec78 - main - fsck_msdosfs: fix FAT header correction not persisting in cache mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10e342c1ec78af5a0b97739c806b16a632118fa5 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 04:57:27 +0000 Message-Id: <69febeb7.3749a.5499531@gitrepo.freebsd.org> The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=10e342c1ec78af5a0b97739c806b16a632118fa5 commit 10e342c1ec78af5a0b97739c806b16a632118fa5 Author: Lianwei Wang AuthorDate: 2026-05-09 04:56:12 +0000 Commit: Xin LI CommitDate: 2026-05-09 04:56:12 +0000 fsck_msdosfs: fix FAT header correction not persisting in cache mode When fsck_msdosfs runs with FAT32 cache mode (used for large filesystems that cannot be mmap'd), a detected FAT header correction was written into the in-memory buffer but the corresponding cache entry (fat32_cache_allentries[0]) was never marked dirty. As a result, fat_flush_fat32_cache_entry() skipped it, the corrected bytes were never written to disk, and copyfat() propagated the uncorrected on-disk data to all backup FAT copies. Every subsequent fsck run would repeat the same "FAT starts with odd byte sequence / FIXED" cycle indefinitely. Fix by marking fat32_cache_allentries[0].dirty = true after applying the in-memory correction, ensuring the chunk is flushed before copyfat() runs. Obtained from: https://android-review.googlesource.com/c/platform/external/fsck_msdos/+/4047981 MFC after: 3 days --- sbin/fsck_msdosfs/fat.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c index 567bfcd428cb..5ead0b1bf783 100644 --- a/sbin/fsck_msdosfs/fat.c +++ b/sbin/fsck_msdosfs/fat.c @@ -927,6 +927,17 @@ readfat(int fs, struct bootblock *boot, struct fat_descriptor **fp) default: break; } + /* + * In cache mode the header lives in + * fat32_cache_allentries[0]. Mark it + * dirty so it is flushed to disk (either + * on eviction or in writefat()) before + * copyfat() copies the primary FAT to + * backup copies. + */ + if (fat->use_cache) + fat->fat32_cache_allentries[0].dirty = + true; } } } From nobody Sat May 9 08:38:57 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCKCV6Mzxz6cwfv for ; Sat, 09 May 2026 08:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCKCV3vwDz4D8p for ; Sat, 09 May 2026 08:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778315942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7LA5/ilhIlmXlFLjmWr5HpdIauWTYW3XCLn2zVpVFAk=; b=NUXCgq4lzPLqwVr89B03Hia4pbkTrVjIglFpFtz5AArdYi+hHpS/yx7/BEonTRqwndaKqP BblV3x6MrNq++Un8eUdMmEJOHyHoCIh+Sixg6VLZGiGIX9BUTHyu7Z3Cz48L+j/58CkZY2 AH+UVx5FdQH/BcKb9fT1XEdmRCiWXvX+GdZEiQvgaxhY1/ltbhG+8jKAq8BBK6rU1vdJYT s0Ay7SIZZJmtr0vOKiUS84CmsFXQi5A0w7os9TvzXgdO4QhazA3S8F2m8NQ+o8vxUY8KtY 4pfxc8lAM+hKjZMdYnmQRDJMCMEfZXXwH96GdF5vAg83uVWCawHWl7ZzwjGuRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778315942; a=rsa-sha256; cv=none; b=hBe/SuFTmdwZ6bLwDDeNYnIYxjIbBBV5ClhK6As3rKKB/q4d0NMMXeKrP4e4qU7TEpdplB fo6/fHDJ31kUTrd+lox01BPgEvB8X484AbWFYQNiiR+GYGhSndbe2PnSv/hwc+VNNo+Red 2B6Cx2cpwa7jBHjdQYLaoaSvM4jmOy0j3C9ncFwv8K3iRu9PnC66lHjJi2pEDvOAp1n3Py ARpSuTCnsUChmRhQNjlXuuuiG7dQTYgugA9o9JwF+lKfUIAyja9PYeqA3lU8YXwlw/1xP0 4EDXaOgP8lNWvZwDfJqew9od6DzEteIOAWb5AMJmsjQVFYQj0prHbpWNfo8Qgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778315942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7LA5/ilhIlmXlFLjmWr5HpdIauWTYW3XCLn2zVpVFAk=; b=LtCeRNnrsRwv9jJoeI+fiTb5dh89G3kRJq+Z7kYK6h6h7aq8v+aCbp1DOHwCXVUNWcygGA Kgnf5dApNxxFxS8EvIpQcmVgBFzVMbxLf2Uc10La9KEJVy2Gi4y504/Ky+mlj+8VKTavvI /YBnvw4mKDmMLIN+ms+ToMsqxsemUU/U+PuLrSABTU1vrVJnPhZLI45yolHWPuvG59ZJdy IvMsffC3rmJNVaFxzp5H4skhymrZhzQEwQKTPwP8mmD2A4NJ9OapqoxuGXifg1fp+20qrO VskP8TAiInzubbQCMJeUdZpjRRD/n4570T9UceB8uFXvjSvbb3iM47Lq32tcDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCKCV2zSzzrsq for ; Sat, 09 May 2026 08:39:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c8d3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 08:38:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Laurent Chardon From: ShengYi Hung Subject: git: 072f79d0a287 - main - hwpstate_amd: Initialize CPPC driver type List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 072f79d0a287528b11da866d6115f726a69eca0d Auto-Submitted: auto-generated Date: Sat, 09 May 2026 08:38:57 +0000 Message-Id: <69fef2a1.1c8d3.514df1b6@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=072f79d0a287528b11da866d6115f726a69eca0d commit 072f79d0a287528b11da866d6115f726a69eca0d Author: Laurent Chardon AuthorDate: 2026-04-30 12:08:30 +0000 Commit: ShengYi Hung CommitDate: 2026-05-09 08:38:21 +0000 hwpstate_amd: Initialize CPPC driver type Assign the driver type instead of preserving uninitialized stack data PR: 294899 Reviewed by: aokblast --- sys/x86/cpufreq/hwpstate_amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 5e075a26a57b..bbc6592579e3 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -745,7 +745,7 @@ hwpstate_settings(device_t dev, struct cf_setting *sets, int *count) static int hwpstate_type_cppc(device_t dev, int *type) { - *type |= CPUFREQ_TYPE_ABSOLUTE | CPUFREQ_FLAG_INFO_ONLY | + *type = CPUFREQ_TYPE_ABSOLUTE | CPUFREQ_FLAG_INFO_ONLY | CPUFREQ_FLAG_UNCACHED; return (0); } From nobody Sat May 9 09:04:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCKnT2jCfz6d0Hb for ; Sat, 09 May 2026 09:05: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 4gCKnT0m2gz4HHS for ; Sat, 09 May 2026 09:05:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778317501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PLCCDMx/Ea9IPMn2GdCuI8cydGQ5Be0BfwUlecopv6U=; b=hP7zEXF8evwq/ZjgS9HD8wG9RJ2I2mrdISy4u/PgYJ3zrftIXRBxTwf0ffddQOcXdl65H2 p8fFGuoN0YA7DV24+I8fabCE2kZXP8JoP8WvPqw2L6/bQlT8OvqHO4iqRJHYe2ABDRwYpN KEro0G9LiUYUOPXXaSDIsWMxt6qMDE3ENYudxud4uc0NZBS0Kjpr8q2QSvK7IzYJJlFaPD x4XkrJ602EYwDWyP/qu1F/P6ayH5rWa/1UjR0UQbVd7vEUawAUBI6038ORELrED5mHWy9D HeIQx2IoJtah1DlG+w7Pf1bjTqBBnTkbWgiQ3ua9CO6zmOYCG/iWc15k8G/G4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778317501; a=rsa-sha256; cv=none; b=Z5gfRXEXfMyh8pORtvDnGJxAWp1deqWDP5bXlu9xl8mhDbuFVTLqTfavdWwbICQpHFQsMs Db2xLqsCQRZPjOAVfOlqKuFvIYIcuOYEFDnnTa9oTR+w5iqCqcMY5f6yBjqXmlgoz+b0xe ejrhjnA6hZGKxNtu5Kj7Ns5bLMSCh8DOtA2rBSxz73O2PcQ3jSXfVYqYnR5R6YiT9aiB7q TUyPNFUyKs0Mbjpmsat1IJF4U3gQkye7bNnyK9tgvwRPYsLtXpABCJ0yS98M4b2uLIPeGb D8woOTxsq2iVlXYeIRlFSQ1pOa7Ykm1sRK0Sfshr5dtWv/oyJrpC0Am9wk9U7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778317501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PLCCDMx/Ea9IPMn2GdCuI8cydGQ5Be0BfwUlecopv6U=; b=CS99VKTl2jJ7usrAoXFQoOTWLCPbHctC6Y2thc3MF/YdP3O8JZpN82U2P38dAdwGiFsR2U PQAD5CLfT6zdc/HGDBZ/8bIuAqRmIOZktL3ISY7t8ypMJPXw59zjDCxhPXQfA33NDu9vTs qeRIZEXIYMQEvVrj7K5UTBtyo3I20fh7f16LZXLC+W226gp1UUAYldserbE0Tq1zZ4pZhr 8CDolXYWmUWRxutrX8d4Ypr3aQpwpQubAOGy0U6AzII3VpkOBg4Ut/7eNFjKUhTZssNCc7 j09vdJzThZBv43VrnLjcFG+DxbxRlMOdVLlFPRPdLAkMAQYHjM1mx4G4PxH5oA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCKnT0DBFzsnr for ; Sat, 09 May 2026 09:05:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eb7b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 09:04:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 44338ccd1268 - main - BSD.root.dist: Correct tag for /etc/sysctl.kld.d List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44338ccd12685621c4b1c57e692a4f27f5a655d3 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 09:04:55 +0000 Message-Id: <69fef8b7.1eb7b.2d49774d@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=44338ccd12685621c4b1c57e692a4f27f5a655d3 commit 44338ccd12685621c4b1c57e692a4f27f5a655d3 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-09 09:04:08 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-09 09:04:25 +0000 BSD.root.dist: Correct tag for /etc/sysctl.kld.d This is only used by rc.subr and belongs in rc, not runtime. Fixes: fa6d67cd16b5 ("BSD.root.dist: Add package tag for all directories") MFC after: 3 days Reviewed by: ivy Differential Revision: https://reviews.freebsd.org/D56900 --- etc/mtree/BSD.root.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index d5ef29c51a92..274397769cac 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -105,7 +105,7 @@ untrusted tags=package=caroot .. .. - sysctl.kld.d tags=package=runtime + sysctl.kld.d tags=package=rc .. syslog.d tags=package=syslogd .. From nobody Sat May 9 09:09:28 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCKtk04J2z6d0Xf for ; Sat, 09 May 2026 09:09:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCKtj4hCyz4Hgq for ; Sat, 09 May 2026 09:09:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778317773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=melgQ2BZ+8xiyZkjEn7KjmxuZ0WdtL1vz98Rf+uZh/U=; b=wQtIGYPXWoTkYQ/0BtDIzbY25u6QYtL5BhL1Nh8DFJe6x7E432eoDR/Vas87yYOoXD6jDL /jUnyHC6v8wIest3jDwMvlo03j4QqZv/e4NMIR+CMKJVq4Oca7iQCTviuBUf2K949IjpM5 Wq399uhT7QhAqGPgxeZxjpgyaZC92fhLLDl6Vaolm2G1Uh+zbymabWcteS91tc8noFFj3k q/kQ7coPTBdEy4qFzOPDI3akIW7MMyvc6923Pgahm/5iyTPzrZ+dla1TvYzof2D17GgfRv xn8bGr7qYy3Pj5MCrDE1Kzy2pmNZ0Iii6a3jyOf+Km86kelzoNBgDPvBNfj/rQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778317773; a=rsa-sha256; cv=none; b=niXMlzyGW8/nM/1h663h6Qbg1udOJOIPhgx77trTvDIH7rJxzsMGEhnLnGVMDw9PAyC+3a weWNBk/aeL4WjqQn9b/Ymk6X4eM4Jhjor88X2VkWsUbrh7Nix1nisNkjpCnyuM6F74uf1f x6L4ddemb8hNGTm56VTVF3kLFv5PjOz1HaQekXc1aMsPhWJDfo9lvZRPv/38Vyev9TEbi8 fpnWPMP9Y3mqSnweVCJidXSE2umhYFDd7I2YbvDuoDTMPwGcLWl7odAIiT3PGPwX9yaD5S 09UIRUHnxeuiezjZrScm0/fyKQNI9qmnOjjbz7aisE0195AxhxLK9XCVaBPm5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778317773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=melgQ2BZ+8xiyZkjEn7KjmxuZ0WdtL1vz98Rf+uZh/U=; b=gJ/KsBVWUAz2h7thtAsW1/Il7hyXoUdpByfNBb6okNVKxW4CQDejMmbY1tLZy4BSRnPBNE QPlzW3S3lMpGtCvcOtLADzOozzZbwuFNFy9Dn7T8ExlIoQT5Btzr3DpYSH6W1mV37lYv1a 5goZBsL3jocwc+6D/BTBR8NERfWFdMzq+AdM7PURMytMXikZH4EOHb3kxXxoWtc5kFHrAh sEPxmm1DMzBN7KldholA+gCYJU+c9921OmWbviKmPZsy4klkvYEaON9tcaShMkYnfu/iBw y5jNEjX8AGSdTq3/C7b/0RrxR64cExYoKLEZ3Ne5x0ROVhyiWuKMRsAhuK+EFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCKtj3qM0zsLy for ; Sat, 09 May 2026 09:09:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21772 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 09:09:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Gisle Nes From: ShengYi Hung Subject: git: 555ffd9022de - main - pci: use uint32_t for eecp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 555ffd9022de0c497881bafc413e3e1d05af10d4 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 09:09:28 +0000 Message-Id: <69fef9c8.21772.3c013dce@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=555ffd9022de0c497881bafc413e3e1d05af10d4 commit 555ffd9022de0c497881bafc413e3e1d05af10d4 Author: Gisle Nes AuthorDate: 2026-04-07 16:48:15 +0000 Commit: ShengYi Hung CommitDate: 2026-05-09 09:09:05 +0000 pci: use uint32_t for eecp eecp holds the extended capability offset. If that offset is larger than 0xff, storing it in uint8_t truncates it, which can make the early EHCI/XHCI capability walk read the wrong location and loop during boot. Seen on AMD device 1022:151e, where HCCPARAMS1 = 0x0118ffc5 and the first xHCI extended capability offset is 0x460. Widen eecp to uint32_t in xhci_early_takeover(), matching xhci_pci_take_controller(). Signed-off-by: Gisle Nes Reviewed by: zlei, aokblast MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/2127 Closes: https://github.com/freebsd/freebsd-src/pull/2127 --- sys/dev/pci/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 0dddd2dd263f..b5a3012accd6 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -3756,7 +3756,7 @@ xhci_early_takeover(device_t self) struct resource *res; uint32_t cparams; uint32_t eec; - uint8_t eecp; + uint32_t eecp; uint8_t bios_sem; uint8_t offs; int rid; From nobody Sat May 9 13:30:37 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCRgx54Fnz6bcWZ for ; Sat, 09 May 2026 13:30: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 4gCRgx2Dc0z3SwC for ; Sat, 09 May 2026 13:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778333437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ap1ZqMpsK/ubnOMGZViMbdVfMjDuwNkfZ/d4XxabZOk=; b=TUSoqc8yteKF/teyMT8eMx1hiTDN+IxF/jTSRCPxexUhC5684RdP1G0bk7NWG0l29y56SU 3Z60uprUpbioQPcm0hXeAgSv6/Rt0xRhjSt0xy7JDP2UU1MWtDxG88fz0QFXpL/VYpmYI4 taTcHfKO+Bg/+ic/ELdN/HB1/aAQXdqt6YNgl8josvPE95/ru84Arr9kLpeo64OFKhCasq cd28UzlTPYUqQU2iApB97F54h58DA6kMhRECXgnPG8SGInMcjN/Rft3Q4WiFvgwbw4BPXJ 64iCjlVgu8ToQNiS2nceqMGiP769S3lGoeDDHMvtfw9r5tf/E0fqZoM6eyEVMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778333437; a=rsa-sha256; cv=none; b=CzZ/R/EhKLX5zsg1uJW2nfAuiXnD1qQSJ1EOl0PhzLcjO4XkIu49GIawgwJUcmQt4QwXfw FKXLKxNEYwQP4/qZYLgN4p/YjAFHJMfiC9GPYuPJcWRVg//8KXkPYDMLZikdCOPpK+r40z bJnCOhJn4wb8wWXZrUvZOP1wbUV98zMEOFlPvqZPbQKgrv79QWxIa85L1K7GgN85d3sbHj g7mZyMptVs+BsWvpDf1ZIy3znzLSAtMhNzr/2EI3LtHmwX/3fgA8zxSsweRf6OE6CDmXBr mnNxlR8nT83yNPmoJrC0jisBnjrIaV5Axrcj8v07769dNcqq/QKRysnIjuXuFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778333437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ap1ZqMpsK/ubnOMGZViMbdVfMjDuwNkfZ/d4XxabZOk=; b=FLtWwkGEOUpMsp7naQoZDLxW+jcBuR6+9IOU+GdlwJ4CrWKO96NSjDiz/qlfiJ85vLC56l fRV4vme53luZnPXG1zyw5ZHo8/f4Cb+kiTJC1eaKfFiS5bsss++zWwtvU/7pL4qcpcso+R uO2VkOP+tAy3QztTS/4+8ClyxCMQ1+g1K1Z072RWIjwpATZRIkwisKLdYTMlaODkkMP9kD Fb9hP0oUQa7PJTbZYDOO1uLpCJMf6iSCsTeHFGdY+vrG/4sdd41Pom3ZTFj1V1QhijkHTB zdzCibI55zL8buntP4fxulVkuMertttQMaG2B+Id6PBFZDnT3MsQ+bh6fA7F4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCRgx1H3Dz1135 for ; Sat, 09 May 2026 13:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c1ec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 13:30:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: fab9bfc92751 - stable/15 - pf: do not reject rules with colliding hashes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fab9bfc92751ac7c676a2f59e44c5ce5ff414e20 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 13:30:37 +0000 Message-Id: <69ff36fd.1c1ec.156f0f88@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fab9bfc92751ac7c676a2f59e44c5ce5ff414e20 commit fab9bfc92751ac7c676a2f59e44c5ce5ff414e20 Author: Kristof Provost AuthorDate: 2026-04-29 15:04:44 +0000 Commit: Kristof Provost CommitDate: 2026-05-09 08:06:01 +0000 pf: do not reject rules with colliding hashes We insert rules in pf_krule_global solely for the benefit of the 'keepcounters' feature. Failing to insert (beause the rule hash collides, or an identical rule already exists) would be worse than restoring counts to the wrong rule (or failing to restore them at all). PR: 282863, 294860, 294859, 294858 MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D56745 (cherry picked from commit a0e4c65f1814a7a677364dc29bb703f84323d175) --- sys/netpfil/pf/pf_ioctl.c | 24 ++++++++---------------- tests/sys/netpfil/pf/match.sh | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 16 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 0825a69b8f63..18abc4c09f9e 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -2438,14 +2438,12 @@ pf_ioctl_addrule(struct pf_krule *rule, uint32_t ticket, PF_RULES_WUNLOCK(); pf_hash_rule(rule); - if (RB_INSERT(pf_krule_global, ruleset->rules[rs_num].inactive.tree, rule) != NULL) { - PF_RULES_WLOCK(); - TAILQ_REMOVE(ruleset->rules[rs_num].inactive.ptr, rule, entries); - ruleset->rules[rs_num].inactive.rcount--; - pf_free_rule(rule); - rule = NULL; - ERROUT(EEXIST); - } + /** + * Note: rule hashes may collide. Accept this, because the worst that can + * happen is that we get counter preservation wrong. + * Failing to insert here would be worse. + **/ + RB_INSERT(pf_krule_global, ruleset->rules[rs_num].inactive.tree, rule); PF_CONFIG_UNLOCK(); return (0); @@ -4111,14 +4109,8 @@ DIOCGETRULENV_error: ruleset->rules[rs_num].active.rcount--; } else { pf_hash_rule(newrule); - if (RB_INSERT(pf_krule_global, - ruleset->rules[rs_num].active.tree, newrule) != NULL) { - pf_free_rule(newrule); - PF_RULES_WUNLOCK(); - PF_CONFIG_UNLOCK(); - error = EEXIST; - goto fail; - } + RB_INSERT(pf_krule_global, + ruleset->rules[rs_num].active.tree, newrule); if (oldrule == NULL) TAILQ_INSERT_TAIL( diff --git a/tests/sys/netpfil/pf/match.sh b/tests/sys/netpfil/pf/match.sh index 992e32d9f887..c732ec7c5c17 100644 --- a/tests/sys/netpfil/pf/match.sh +++ b/tests/sys/netpfil/pf/match.sh @@ -234,10 +234,46 @@ double_match_cleanup() pft_cleanup } +atf_test_case "duplicate_rules" "cleanup" +duplicate_rules_head() +{ + atf_set descr 'Test identical rules' + atf_set require.user root +} + +duplicate_rules_body() +{ + pft_init + + epair=$(vnet_mkepair) + vnet_mkjail alcatraz ${epair}b + + ifconfig ${epair}a 192.0.2.1/24 up + jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up + + # Sanity check + atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "block" \ + "pass tagged FOO" \ + "match tag FOO" \ + "pass tagged FOO" + + atf_check -s exit:0 -o ignore ping -c 3 192.0.2.2 +} + +duplicate_rules_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "dummynet" atf_add_test_case "quick" atf_add_test_case "allow_opts" atf_add_test_case "double_match" + atf_add_test_case "duplicate_rules" } From nobody Sat May 9 13:30:38 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCRgz27VCz6bcl2 for ; Sat, 09 May 2026 13:30:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCRgy6lC0z3TDd for ; Sat, 09 May 2026 13:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778333438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o/0ncNpmmH+jfn+OHMhUAIKBhdo9zknYfpjZUxyPW3s=; b=jgisfLyka7mL0rxqvarn2SkXtAphqG5EOwdKRU5d9bL414Y/mc4M10Y6wopcnUqsE2pD+9 vTpW17DxYQjsRk9oBWURk4Qo+anjtMUDZJ3iOiTWZ6KKIFUwaXoM5n7xbRYLv8Jn5xGyFT 1Laye2/SBf++VAl8H8qAaKyk8OnzurCO9NJXPpXojanEODKNKG+XhgWMaZzTaXypfDsbrI dtTBAUzEHL0AsAwBpG13OXAY/EagJ7DWjDft9a7mVEldeXN4d4Q8SwPknzkZf+SLuQdjEQ l9nvjw1vSZV6A73QIYTZvl3Osdj19uZwjHj9GRK+5LOAbml2yttpM6+sIAiWcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778333438; a=rsa-sha256; cv=none; b=jtxNaYtEiuzopKP8pI1ibyJ+6Qrq36H9EODMsWrjfhWnlJLR9qCAETbe/Vy4HsE64AR8lu +/Ws/xnvSKf5hKaqFo49PJf1vBcMN85A0qRZXtJ2FgYiIGXtyHTk2pBTS7MQNGzNr61BPL 1ysMYqB6sfpje9+48xnvVUOTvIj13pKOaO2TIQIkXED6ieqYS5oucK1jQ7dIh6o56vOoZa gB9j6v/XhewsTSzGzK38BSs6YQOKAs1/JzcOjWLXdnRrPfGAjJU2pSaiuzgVhE1EO4xgwO R1sqanrx+MhHeIftwDZTcXF94IaRXKu9E0dTV+ySPCDNsjw1kr/YSE3/tKudzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778333438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o/0ncNpmmH+jfn+OHMhUAIKBhdo9zknYfpjZUxyPW3s=; b=y39xz4zh3ejz1MvWxyEcQ3434UxSzK6UFtouA5AKju+0yPi04tcmt/fIKH+btp3PN8eKko ApahzFVCIm1NPUXOlczNmKlXeZo+gF4nLNeSd15Kkh68kiWYA+pe2kSImHMBDXLIkg3nmP B6NBEWW1KRYrZmmxtopqdBPCAiizCY6ckxAMd6jRUkzzzFctrjelyS3Fbq8J+3UXczcQTV JECFuiBMlRneMwwOz6Ku20eUJjEmlqdBpgmO0CxaNQyFqTn6Al+mHPVc0cV7CCPZeL5xVQ nZJZ65Znq44IEYXJOqsijf6ufjV2bV6bSPpqvTCquCFezZ9ErQtJ6FynJVzSKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCRgy4YGcz117F for ; Sat, 09 May 2026 13:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d240 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 13:30:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 0cd655f71b46 - stable/14 - pf: do not reject rules with colliding hashes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0cd655f71b46ada2c353c371e2a2f9f0dac29613 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 13:30:38 +0000 Message-Id: <69ff36fe.1d240.246b23a1@gitrepo.freebsd.org> The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0cd655f71b46ada2c353c371e2a2f9f0dac29613 commit 0cd655f71b46ada2c353c371e2a2f9f0dac29613 Author: Kristof Provost AuthorDate: 2026-04-29 15:04:44 +0000 Commit: Kristof Provost CommitDate: 2026-05-09 13:29:04 +0000 pf: do not reject rules with colliding hashes We insert rules in pf_krule_global solely for the benefit of the 'keepcounters' feature. Failing to insert (beause the rule hash collides, or an identical rule already exists) would be worse than restoring counts to the wrong rule (or failing to restore them at all). PR: 282863, 294860, 294859, 294858 MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D56745 (cherry picked from commit a0e4c65f1814a7a677364dc29bb703f84323d175) --- sys/netpfil/pf/pf_ioctl.c | 24 ++++++++---------------- tests/sys/netpfil/pf/match.sh | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 16 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index e824dfcff453..39d3536fe38e 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -2376,14 +2376,12 @@ pf_ioctl_addrule(struct pf_krule *rule, uint32_t ticket, PF_RULES_WUNLOCK(); pf_hash_rule(rule); - if (RB_INSERT(pf_krule_global, ruleset->rules[rs_num].inactive.tree, rule) != NULL) { - PF_RULES_WLOCK(); - TAILQ_REMOVE(ruleset->rules[rs_num].inactive.ptr, rule, entries); - ruleset->rules[rs_num].inactive.rcount--; - pf_free_rule(rule); - rule = NULL; - ERROUT(EEXIST); - } + /** + * Note: rule hashes may collide. Accept this, because the worst that can + * happen is that we get counter preservation wrong. + * Failing to insert here would be worse. + **/ + RB_INSERT(pf_krule_global, ruleset->rules[rs_num].inactive.tree, rule); PF_CONFIG_UNLOCK(); return (0); @@ -3693,14 +3691,8 @@ DIOCGETRULENV_error: ruleset->rules[rs_num].active.rcount--; } else { pf_hash_rule(newrule); - if (RB_INSERT(pf_krule_global, - ruleset->rules[rs_num].active.tree, newrule) != NULL) { - pf_free_rule(newrule); - PF_RULES_WUNLOCK(); - PF_CONFIG_UNLOCK(); - error = EEXIST; - break; - } + RB_INSERT(pf_krule_global, + ruleset->rules[rs_num].active.tree, newrule); if (oldrule == NULL) TAILQ_INSERT_TAIL( diff --git a/tests/sys/netpfil/pf/match.sh b/tests/sys/netpfil/pf/match.sh index bb088c5bf47c..5a1bfb4d51ea 100644 --- a/tests/sys/netpfil/pf/match.sh +++ b/tests/sys/netpfil/pf/match.sh @@ -67,7 +67,43 @@ dummynet_cleanup() pft_cleanup } +atf_test_case "duplicate_rules" "cleanup" +duplicate_rules_head() +{ + atf_set descr 'Test identical rules' + atf_set require.user root +} + +duplicate_rules_body() +{ + pft_init + + epair=$(vnet_mkepair) + vnet_mkjail alcatraz ${epair}b + + ifconfig ${epair}a 192.0.2.1/24 up + jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up + + # Sanity check + atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "block" \ + "pass tagged FOO" \ + "match tag FOO" \ + "pass tagged FOO" + + atf_check -s exit:0 -o ignore ping -c 3 192.0.2.2 +} + +duplicate_rules_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "dummynet" + atf_add_test_case "duplicate_rules" } From nobody Sat May 9 14:04:08 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCSQc6tCnz6bw3q for ; Sat, 09 May 2026 14:04:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCSQc5wNxz3bdC for ; Sat, 09 May 2026 14:04:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778335448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+xqTIY8Bs6VLGidp3VRH/iCgZ26ZEmnU8Z8f7QUQDVM=; b=ngLv8GSMsN+EHbRltgoYVl5cy+PiXYUpsqD5otVSmH0VHzzeJV9rVBIy8LT+ZIuOZvSNgO /KxUFyQ+vhn2KjV+/4y10S/mJmkPdEX90KoTxJOKPFUT2yCKQRHxkPiRd3RF3HoueLpce8 ZbDN27ClfA4HPsaAKYzt87rT2j60E0ML25VNG6A2KA1zihJjDXWxRLND5UrYLMB7XPTKAD 7pXBchDVyZwvVVfQ+LWZSxEsoiR4BcepAiXe9T9+B67oxk7pqLURzv/mskJvNzmckqCepe GM/S10mmN1WBHRXOWbtxutvcgkqhkFcD7E/O0vhajeHT5Fj1eMxmVHUV8dsmXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778335448; a=rsa-sha256; cv=none; b=tvo0dJgqZVk/4RBWkUNaluT6F4UDBihuoNHiLOaNEnONg9SG7orDQ7WiJ/u9kk/g+LUFhF iBkZ7KYzngIfVYsMY7+uYtleg3wTIG+zhNqjLrG+/M46zpnyxLJ1I4JISU/qz2mKZsHDE6 EOHg4Hj4iVc/XZik/FsO1kKrJNw6W4DIskGe5ZxmdfsnKHTnRf7NuyY7CrYF6dkp3nMciy N3S9/t8BH5pFMTmWh8OSWy0dEaFPzJn+/e/PWexSfSEWb7Re+sjrPlMtn7u/EwsEpT6d+o va96nIFfo+z5uPvrepBOlM27MscFAe6/2ZkHDb3FIlmR17FmKd/fF4WD0DTibQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778335448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+xqTIY8Bs6VLGidp3VRH/iCgZ26ZEmnU8Z8f7QUQDVM=; b=ml0Iw0sJJtzGaj1bSl0bwbstp0JQ5SHQ8SItsdmpSbAy+U6Rv15nPseaifdAklr4iZ7w+Y 53saCJRf1pa51zuf6FWHPchYSvfC39NSws5Tq2aNGJeMnJ9P/W0rk6RzG9BpPTBpTmUUu9 70R45cyyPqY431oAAw9V/b6FzhsyU0O7PqjLLxrkeyVYFMTTwWBZw+7qb2iQJOEcD6Xa6M MkZW6AeZV3gh9FCFvqx/xIOLG+8MocOj1WBLVQXF1w5BpLi4FJd9tNQnL5OCrgoCGHe3Fs 6iq7fduiGzlLG7Te3l/0VdHYRh0i188ERg2JoycH+NmyKugQY+4EzLatyV9Rig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCSQc5Q8Zz12Hh for ; Sat, 09 May 2026 14:04:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21905 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 14:04:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Paarth Shirsat From: Benedict Reuschling Subject: git: 6499888ca741 - main - gpart(7): Fix reference to the zfsprops man page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6499888ca741bf3db90d7fd352d5480f7314337f Auto-Submitted: auto-generated Date: Sat, 09 May 2026 14:04:08 +0000 Message-Id: <69ff3ed8.21905.3b5d6c41@gitrepo.freebsd.org> The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/src/commit/?id=6499888ca741bf3db90d7fd352d5480f7314337f commit 6499888ca741bf3db90d7fd352d5480f7314337f Author: Paarth Shirsat AuthorDate: 2026-05-09 13:58:36 +0000 Commit: Benedict Reuschling CommitDate: 2026-05-09 14:01:12 +0000 gpart(7): Fix reference to the zfsprops man page PR: 292147 --- lib/geom/part/gpart.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/geom/part/gpart.8 b/lib/geom/part/gpart.8 index 32a247529dfe..89bfc3be6f8a 100644 --- a/lib/geom/part/gpart.8 +++ b/lib/geom/part/gpart.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 20, 2026 +.Dd May 9, 2026 .Dt GPART 8 .Os .Sh NAME @@ -1527,7 +1527,7 @@ zvol will show up as a GEOM provider only if its .Sy volmode is set properly .Po refer to -.Xr zfsprops 8 +.Xr zfsprops 7 for details .Pc . .El From nobody Sat May 9 15:55:03 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCVth621cz6c56c for ; Sat, 09 May 2026 15:55:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCVth53x1z3ryN for ; Sat, 09 May 2026 15:55:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778342108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WXguVpRi4tQSKnyGf+GNTRe07RTFwB/AdF7DIUMBUlU=; b=gexlGpY0NMgaIBk+P0YpzGKEH8kwfVfXL1mT2Gka3pKD8oKLkSLinppxEplms71HJZvnt4 MluyDovJYFzaol+CcAhHcAhZiC2bJe1Wd6EWLEayVKM22nGuQJLfSzTkOX5s6qYKeXLzUl 7AmENimiNxrydrq0kpmriAFtgrSjTwoI6XKDG+xdRfCkKvMf6z0xFOQrArQHNSL0ixhATa kYfdyS28iRwrzO+wTGVYTCg3ZsCsvTxtPkMIq06f0bEg5m82JQKDYwEOK4Yb+teOJGb6oJ 3LXkMJMcHOIqnEF9qetk9WOzsu/zq3alYXWASbhwvUEttBLHg8EsoBP1qnfmpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778342108; a=rsa-sha256; cv=none; b=Sxxd8yfka6EjrswuUSwsBHGFhCASWFitq5iEkMfIV7iAZV4WbZPGGWWCzhy4HhEuqjDrdz daDMpUWqj1EdQUXS7RUwyOT4/BXgcQFK+zm9MKDnGhqH2ZxGQKpFWCKiZzZYJZotqkDT/0 +3NOzglQtBBf9OVFDfvqb7goOP3SHZAx1biBmKitTqDbDP26Msokl6UfAoO0eL8XlyIqE5 IayvgnE/ZGZF7Ez63cVk5RUiksGd+N1iKE3bLVicuz1RFkAznxKgI+pmiqUyw/cG34zVv4 NYeiA7yaas+ozUafde8gxM81wMKDshrvVcrCLoL7N+ga7zLMwGitXhuEt0HOuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778342108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WXguVpRi4tQSKnyGf+GNTRe07RTFwB/AdF7DIUMBUlU=; b=eLqFq4BbxapSOAYw+RqRcL5S+iQW4peIUKtzCM7w/rxHbroxJm+ZoVAZyHm2qckPat1XTr CxAtSAkx1Au2+sl46tpc2bvDKNhNHGn32Lfhjek4fbc7oXi6kx/b9P5ynsQ1hNb/MWk/lZ n3J4hAzGwsgx68zcRKiR874o2miovTPGW7ivlJgIOArAac9gJ/FXsr+BAtlBERbhHd116Y lZEFWXlLe6bYfsJ4aaKT4XH64qQ0LZqt7oRKlJxjM4t8bsI1CXbsIZ/cR6FDmgpEMiO6x8 +THT5vfQSYnXlukTYUg0x492IDZefFDPifZgNPqkUeN3qC42FcGbAjnhKRfMbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCVth4Thzz15Pk for ; Sat, 09 May 2026 15:55:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 336ba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 15:55:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Chuck Silvers From: Hartmut Brandt Subject: git: 7906084ba2fd - main - Fix some memory leaks when fetching the mibII. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: harti X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7906084ba2fd50022f38ce2e8d0bcef212a4ff19 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 15:55:03 +0000 Message-Id: <69ff58d7.336ba.123f34ad@gitrepo.freebsd.org> The branch main has been updated by harti: URL: https://cgit.FreeBSD.org/src/commit/?id=7906084ba2fd50022f38ce2e8d0bcef212a4ff19 commit 7906084ba2fd50022f38ce2e8d0bcef212a4ff19 Author: Chuck Silvers AuthorDate: 2026-05-09 15:52:14 +0000 Commit: Hartmut Brandt CommitDate: 2026-05-09 15:52:14 +0000 Fix some memory leaks when fetching the mibII. Reviewed by: glebius Sponsored by: Netflix Differential Revision: --- contrib/bsnmp/snmp_mibII/mibII.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/bsnmp/snmp_mibII/mibII.c b/contrib/bsnmp/snmp_mibII/mibII.c index 59f3836d1ede..4cf4f231facc 100644 --- a/contrib/bsnmp/snmp_mibII/mibII.c +++ b/contrib/bsnmp/snmp_mibII/mibII.c @@ -485,6 +485,7 @@ mib_fetch_ifmib(struct mibif *ifp) syslog(LOG_WARNING, "sysctl linkmib estimate (%s): %m", ifp->name); if (ifp->specmib != NULL) { + free(ifp->specmib); ifp->specmib = NULL; ifp->specmiblen = 0; } @@ -492,6 +493,7 @@ mib_fetch_ifmib(struct mibif *ifp) } if (len == 0) { if (ifp->specmib != NULL) { + free(ifp->specmib); ifp->specmib = NULL; ifp->specmiblen = 0; } @@ -500,6 +502,7 @@ mib_fetch_ifmib(struct mibif *ifp) if (ifp->specmiblen != len) { if ((newmib = realloc(ifp->specmib, len)) == NULL) { + free(ifp->specmib); ifp->specmib = NULL; ifp->specmiblen = 0; goto out; @@ -510,6 +513,7 @@ mib_fetch_ifmib(struct mibif *ifp) if (sysctl(name, nitems(name), ifp->specmib, &len, NULL, 0) == -1) { syslog(LOG_WARNING, "sysctl linkmib (%s): %m", ifp->name); if (ifp->specmib != NULL) { + free(ifp->specmib); ifp->specmib = NULL; ifp->specmiblen = 0; } @@ -546,9 +550,11 @@ mib_fetch_ifmib(struct mibif *ifp) alias_maxlen = MIBIF_ALIAS_SIZE_MAX; /* + * Free any alias memory allocated by a previous call. * Allocate maximum memory for a buffer and later reallocate * to free extra memory. */ + free(ifp->alias); if ((ifp->alias = malloc(alias_maxlen)) == NULL) { syslog(LOG_WARNING, "malloc(%d) failed: %m", (int)alias_maxlen); goto fin; From nobody Sat May 9 16:05:54 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCW7D0vBQz6c6KV for ; Sat, 09 May 2026 16: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 4gCW7C5m7Tz44pN for ; Sat, 09 May 2026 16: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=1778342759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G6S4DG8637ogAhGy6hMfnEX/PFjfVsLOhyrbsFPQGNY=; b=VN8oRdp1Yvuyt1rnTu8OeHOUHi8B94ds2hKkwSPd165FVV420+U7gvrobb+sylLSm5hvMI +3HoMeXc70Svmb0GK4n6fjbODEIX37qVNYk89lGeCFv+z+C9045e8S7iWO2mp3CzUQwNHU /EXMX3DExGNpWBCIFb6dwOAmfmaqC7inNFrOJQDwsoPrJ6EqwHtJGPeT7cK+T/2d2mDjMf UL0VKAKKBu7Q2F+IzMXDgR09GH9YZ563CU7ddg//aahN8ebDhX4cdfayjx/n3BY9zT39wR wRZaatDNOPpwlgTE/PmEyA9O261TezLUEG3fA7CTxoCPycu8cL8cxmeQcmwPcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778342759; a=rsa-sha256; cv=none; b=EusZEBR3NTm/kViD2hGgn7H2ocVTLxnGqP5Q1t5Q5X5igCcFVdIleu698hQy+A+H9QD7KR 5EuHvOnVBD5JBjxXI4l91znT1ONxD38nB4B53tXUJuofOfbziSrYq8uMvJDm0/Cyfwj5ij MMflo0NoBL5sX4lR4OnFRPnWargyAwleInyDfjyH3c8vZyWz19LWpORdxWDERsqFn0OQzQ F29psi3DCF1l1M/kdv9x9GpiVU67bnRzD8AT19yzlNAAc6FNcO6/HpPhE41hMGgZDlC7wS K+urpjBu1s/WT7jk2y2p9kc1tVCRDAnramt8P0tEfd+5AChMpysa/e+V1MZ1tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778342759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G6S4DG8637ogAhGy6hMfnEX/PFjfVsLOhyrbsFPQGNY=; b=C2YBclm0Z+DRiTG10uckiv3baMSzIfeJdpFkj7inHJvyklYnXNnAQA9PX0EAxeZqJsmc/S PrIJxoCoQwef3798a2PRU5hDZUYKZHbdErKy7UUjsN0xcFOlrmjHAVnQl/W/d+ac1bFUbe afe+R9jmNshNBG/K+gXUzUyO6AxH8RZBEHCkWVMqbOCOy4//Febv1QjKSiJVnT258xJ/gO wxIHDrCgpv97DqUgmfKqcAatuRbOpFjRFDvqRVdMLNBWh/rlnlBsVZlXtpGkfhCFxC307R psWr96EKt+OGXYX0a9uO9T4/aH2R27Tj8CxyNV2fyK92W5KKbVPQq5kQYKAi9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCW7C53d1z159r for ; Sat, 09 May 2026 16:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33ee3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 16:05:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hartmut Brandt Subject: git: 27ad506d2620 - main - Document some more OIDs that are used by bsnmp. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: harti X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27ad506d26209e72d3cb2055de98f8a2eccc83be Auto-Submitted: auto-generated Date: Sat, 09 May 2026 16:05:54 +0000 Message-Id: <69ff5b62.33ee3.1228ecf0@gitrepo.freebsd.org> The branch main has been updated by harti: URL: https://cgit.FreeBSD.org/src/commit/?id=27ad506d26209e72d3cb2055de98f8a2eccc83be commit 27ad506d26209e72d3cb2055de98f8a2eccc83be Author: Hartmut Brandt AuthorDate: 2026-05-09 16:04:45 +0000 Commit: Hartmut Brandt CommitDate: 2026-05-09 16:04:45 +0000 Document some more OIDs that are used by bsnmp. --- contrib/bsnmp/oid-list | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/contrib/bsnmp/oid-list b/contrib/bsnmp/oid-list index 6bd2fe18c25f..7733cd5be063 100644 --- a/contrib/bsnmp/oid-list +++ b/contrib/bsnmp/oid-list @@ -10,11 +10,25 @@ enterprises 12325 FOKUS 1 BEGEMOT 1 BEGEMOT-SNMPD + 1 begemotSnmpdObjects + 1 begemotSnmpdConfig + 2 begemotTrapSinkTable + 4 begemotSnmpdPortTable + 5 begemotSnmpdCommunityTable + 6 begemotSnmpdModuleTable + 7 begemotSnmpdStats + 8 begemotSnmpdDebug + 9 begemotSnmpdLocalPortTable + 10 begemotSnmpdTransportMappings + 11 begemotSnmpdTransInetTable + 13 begemotSnmpdTraps + 14 begemotSnmpdContextTable 2 BEGEMOT-NETGRAPH snmpd netgraph module 3 BEGEMOT-IP snmpd IP related stuff. 4 BEGEMOT-IFACE-MIB interface MIB private stuff 5 BEGEMOT-IPSTATS-MIB IP statistics 6 BEGEMOT-IP-MIB IP objects + 7 BEGEMOT-VACM VACM support objects 100 BEGEMOT-ILMID snmpd ILMID module 101 BEGEMOT-ATM snmpd ATM module 200 BEGEMOT-PF snmpd PF module (phillip@freebsd.org) @@ -25,10 +39,14 @@ enterprises 205 begemotBridge bridge module 210 begemotWlan WLAN module 220 begemotHast HAST module + 230 begemotJails jails module 300 BEGEMOT-ACM DLR ACM project 303 BEGEMOT-WLINK DLR WLINK simulator 304 BEGEMOT-SATX DLR SatX simulator + 305 BEGEMOT-INET inet transport module + 306 BEGEMOT-LSOCK local socket transport module + 307 BEGEMOT-UDP UDP transport module 405 mysql (vanilla@fatpipi.com) 406 varnish (vanilla@fatpipi.com) From nobody Sat May 9 18:52:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCZqX16Wvz6cMBR for ; Sat, 09 May 2026 18:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCZqX0BwBz3VCL for ; Sat, 09 May 2026 18:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778352760; 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=n5+sJXD8D1wahU7Bhc5xfz7VnWediEJQfabP+0r/mTs=; b=XsEnZJA3l+LBR4o+Gf2NszKamzTHlEYBrg+iUhc/0JmN8Kb3XAowhoK9NqcDwCISER+5Cg RsvvEEf7SzhMwxlOxx1L88YwMmoFZpURzz0a4W/V61RpCNHT1jGdsE3WdB64PkYeQ/L3pv vW3eOhN8xii0jtWbmnEAK9c47nqVwU+NKXJMF2oK+wjHzrTak3pn7CybbG1BJdbC1ZUQaP vqQo6qh11UwNHm+rZ3uv6DPsnSjw7kbG5m1tTp6vGPf/OdIhxDyL+9EhmNP44a69rAPMzd A9oe3bYJ8xZt5QbmhhJLm1F96nmzPtg68SSAU3UvGS90gO80wIaOpA86amrd4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778352760; a=rsa-sha256; cv=none; b=kBd/y1PNTmAzpNBNbvKWhMl1tybm+DXiKyBYMUnNUVrm5A3uyZH+Q7hKauyVbOVLo5aSyQ 2R1WtqXUPs1bBe8D8VdpyuEAuAqKbkOR0g+M/X9TuDfolhxHfrHUSdwzgdBuIF1f2hZ3uF GjGJy2fmnLy3tqsR9quOwE4QDnoo1bEMpAEB8xDLg9cn9lPjpGxpwRm9gMFZiYzD+Zmn1D mCEhhIBM+4JndFnU1tjoSa72oBNR3c7Zg29SdTyt3K4NaXp60UUF7zQHMI5d2eFgl5YM/b bAB6Gn8kuXFhuNgkV3u0G0GKu/IEBLhnTX7h4E5vtAoHPDmFlQ8OxclSyAjOng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778352760; 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=n5+sJXD8D1wahU7Bhc5xfz7VnWediEJQfabP+0r/mTs=; b=auLR1APcsYfwtMfV/U5H2Z9I4+R0HvOJhu0Pq8eTlyH6RJVLKdi55HiOmeFyWBPEeawQFL eET+5jsznRM5Lv+i4ztEHVArz86hzqFiLpI5VP++OV2BvvwIu7iBKQ5b+nR3AQmAlGzUfk NT0MdPtAw8huv+EyoE8J7yjN01yYmf2pH2HQk/V1EKHJAYmWwHgy/3ZCOxTSsAncfwOtFe DXtBk++KGcmaAzs63lYo4t23Y5bYV7l5DWOv95F5xli1AEmlahHqbGVFvyNmnhP3cq/9hV tRg/NZGkMOzk/W/W1DhAnETAAmLf6XnlRyuUALBygREt1cRELM+zMdb6m0c+eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCZqW6g6yz1BJq for ; Sat, 09 May 2026 18:52:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46328 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 18:52:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gleb Smirnoff From: Zhenlei Huang Subject: git: 332485a47372 - stable/15 - tests/carp: make sleep interval in the wait loop smaller List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 332485a473724c7532690be34ed1be06d9521448 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 18:52:39 +0000 Message-Id: <69ff8277.46328.38b69eb5@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=332485a473724c7532690be34ed1be06d9521448 commit 332485a473724c7532690be34ed1be06d9521448 Author: Gleb Smirnoff AuthorDate: 2025-12-04 18:40:34 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-09 18:51:11 +0000 tests/carp: make sleep interval in the wait loop smaller Makes tests to finish slightly faster. (cherry picked from commit e353cbffd600ae3c00c8584dddcabf9d0ae1202a) --- tests/sys/netinet/carp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh index 568d2beaf914..a9c99a7d701f 100755 --- a/tests/sys/netinet/carp.sh +++ b/tests/sys/netinet/carp.sh @@ -43,7 +43,7 @@ wait_for_carp() while [ -z "$(is_master ${jail1} ${itf1})" ] && [ -z "$(is_master ${jail2} ${itf2})" ]; do - sleep 1 + sleep 0.1 done if [ -n "$(is_master ${jail1} ${itf1})" ] && From nobody Sat May 9 18:52:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCZqY38s8z6cMHG for ; Sat, 09 May 2026 18:52: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 4gCZqY0g55z3VZ6 for ; Sat, 09 May 2026 18:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778352761; 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=gwFgJYgRMmuObm1AxCvBuqXveflQLJdcQID+ExH3M1I=; b=rStQdQOjx8PajGMjENyrfpfbVhUGZfjfRq3WMO1UXlO/ZEDoXMo3ZYFfDrcQtbwctzL8M4 JOKjjHuB8mWMDEq2Dgt237Hnz/87wuQhPFvJD5j2t7TmQQADSjMN8nWa6o98mGK0KiMGiR +2aJc3bkSRK6hoSjCX9XJ4eDmnUVThYACBaa7lXqGWnT+XtWVF060t6x0FBuC6nFuL+2A6 7Dc+cTt+9CvU1o586/PdlywaU/QqsMtXTw4QUd2jG3VfjMOH44Y/AUafjuup866jj5S3g9 UW+RqsKleI04kEI8jPY2xSz9csleQMy8neWSlxmaGppRjCrJbMowb3YgpkdX0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778352761; a=rsa-sha256; cv=none; b=nfwpp2kkcrgSDh9SUu+rZNjR8usg8Blf7NG0ieS43yGVcWD8sfc4k52aegoHK5Jej79TGR soOdtQaOQ/MrrsC6ye8KODF/7WeMvUPI8IiLha6BtMW8bhshtvbATGDR/jt/Kb/PdskPEE 32blCidH/nl0G05W8xfs2xv+uw1A/PVMlKDqkMjcxggJ3FzqVqMRT9kL1Yus7iy7vtgdQA DHuqY1bNEVud3VaSugKj8jU18mLTn/kP7rM68lynyXzhMtW18tVAf/V4lNsrw7VsV2psN4 V8W83nUJDRhe1nvP7S44g/ydyAe1h1POQIEilIu8gckjcy9fg7F1noZBbl32Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778352761; 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=gwFgJYgRMmuObm1AxCvBuqXveflQLJdcQID+ExH3M1I=; b=wBuvrfk7pocDt5jzb5lzfzT5RzbzITfj7g9+vGtZYD7b1SsEZP762xkS7ShYGWQRlpRvHt f4oIfGHXflO9XXqK4rs3X/aYDt2u+CILydiMI4BzcWRpdrcMFRUSCLfLuMbXU2jlypzZVv UPoxC2NSij5s6xRPlxVLtBD1ByJgtNuCb0uaGIwA5BIWNSa3vUwb8J2bfArarEktYudC5E orq2p3EPfjoQoT0dHEtwU/27QyfpMJenxtjDv1QajH7i+eKtkRrZUxhtGMpHtJ4PfygudC WZGMM7M7FmQWOasvXljZDyl/2a4sc2AOJxz37qqapxtCGHob0KaTlk68yVAOcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCZqY03s4z19yj for ; Sat, 09 May 2026 18:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4632d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 18:52:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gleb Smirnoff From: Zhenlei Huang Subject: git: ad2fff6d6a4d - stable/15 - tests/carp: make a 0.2 second pause before configuring second jail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ad2fff6d6a4d74b6bb9008e447eafc567e8660e0 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 18:52:41 +0000 Message-Id: <69ff8279.4632d.49abbea9@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ad2fff6d6a4d74b6bb9008e447eafc567e8660e0 commit ad2fff6d6a4d74b6bb9008e447eafc567e8660e0 Author: Gleb Smirnoff AuthorDate: 2025-12-04 18:41:19 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-09 18:51:12 +0000 tests/carp: make a 0.2 second pause before configuring second jail for all scenarios where both jails have same priority/advskew. There is a tiny chance that on both sides carp_master_down() will be executed in parallel and advertisements will also fly through the bridge(4) in parallel, thus both sides will switch to MASTER before receiving the announcement from peer. This makes the test to fail. So far this flakyness was observed for carp:vrrp_v4 only, but in theory it is possible for any of the patched scenarios. Note that this sleep does not prolong execution of the tests, as the first jail is already configured, and if we slept before configuring the second, we would sleep less in wait_for_carp(). (cherry picked from commit 27ff90cd3d8d2ac8198f30cbebeefb15a49d41bc) --- tests/sys/netinet/carp.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh index a9c99a7d701f..90ed9d6f9baf 100755 --- a/tests/sys/netinet/carp.sh +++ b/tests/sys/netinet/carp.sh @@ -90,6 +90,7 @@ basic_v4_body() jexec carp_basic_v4_two ifconfig ${epair_one}b 192.0.2.202/29 up jexec carp_basic_v4_two ifconfig ${epair_one}b add vhid 1 192.0.2.1/29 + sleep 0.2 jexec carp_basic_v4_three ifconfig ${epair_two}b 192.0.2.203/29 up jexec carp_basic_v4_three ifconfig ${epair_two}b add vhid 1 \ 192.0.2.1/29 @@ -137,6 +138,7 @@ vrrp_v4_body() jexec ${j}_two ifconfig ${epair_one}b 192.0.2.202/29 up jexec ${j}_two ifconfig ${epair_one}b add vhid 1 carpver 3 192.0.2.1/29 + sleep 0.2 jexec ${j}_three ifconfig ${epair_two}b 192.0.2.203/29 up jexec ${j}_three ifconfig ${epair_two}b add vhid 1 carpver 3 \ 192.0.2.1/29 @@ -182,6 +184,7 @@ unicast_v4_body() jexec carp_uni_v4_two ifconfig ${epair_one}b add vhid 1 \ peer 198.51.100.224 192.0.2.1/32 + sleep 0.2 jexec carp_uni_v4_three sysctl net.inet.ip.forwarding=1 jexec carp_uni_v4_three ifconfig ${epair_two}b 198.51.100.224/25 up jexec carp_uni_v4_three route add 198.51.100.2 198.51.100.129 @@ -253,6 +256,7 @@ basic_v6_body() jexec carp_basic_v6_two ifconfig ${epair_one}b inet6 add vhid 1 \ 2001:db8::0:1/64 + sleep 0.2 jexec carp_basic_v6_three ifconfig ${epair_two}b inet6 2001:db8::1:3/64 up no_dad jexec carp_basic_v6_three ifconfig ${epair_two}b inet6 add vhid 1 \ 2001:db8::0:1/64 @@ -303,6 +307,7 @@ vrrp_v6_body() jexec ${j}_two ifconfig ${epair_one}b inet6 add vhid 1 carpver 3 \ 2001:db8::0:1/64 + sleep 0.2 jexec ${j}_three ifconfig ${epair_two}b inet6 2001:db8::1:3/64 up no_dad jexec ${j}_three ifconfig ${epair_two}b inet6 add vhid 1 carpver 3 \ 2001:db8::0:1/64 @@ -358,6 +363,7 @@ unicast_v6_body() peer6 2001:db8:2::2 \ 2001:db8::0:1/64 + sleep 0.2 jexec carp_uni_v6_three ifconfig ${epair_two}b inet6 2001:db8:2::2/64 \ no_dad up jexec carp_uni_v6_three route -6 add default 2001:db8:2::1 @@ -423,6 +429,7 @@ unicast_ll_v6_body() jexec ${j}_two ifconfig ${epair_one}b inet6 add vhid 1 \ peer6 ${ll_two} \ 2001:db8::0:1/64 + sleep 0.2 jexec ${j}_three ifconfig ${epair_two}b inet6 add vhid 1 \ peer6 ${ll_one} \ 2001:db8::0:1/64 From nobody Sat May 9 18:52:42 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCZqZ5Gywz6cMMC for ; Sat, 09 May 2026 18:52: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 4gCZqZ1NbDz3VJ5 for ; Sat, 09 May 2026 18:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778352762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jqUqWiMXzOUFGjCLAZI05QlmwXaUGP1ue77eMZ6D2Ek=; b=hZVytHq+sCmbWj19J0VcDqiXEcPSJIB5riHyVq7p0nsPyb3S2ZWweKnERWQ3kz7P70jwRk JbTE8uWWoKdBNDvDIFKAd6tF++YioffBlubW95Gyy4N7GQ1Kxp7hN0O0XglVSbgDYwpSjw EHhZTiYZ2IASxsv0ExaoZMXzdQzkjXb5k2WwFdcR3BZWW+4p7FutIcO2V8CAKTkWleT7NP QouwCAS7zQ/OiNa8iSVxJj9klak4bDNmcpALWy6ntwY/rd3G+QfeDYqBQ+KG793gtRhNHY aPM9ZK9nd5EkKuinxHPMA9cHNvupPt7/X2Imcb27bIOBd79XI0od/qwpqG4hlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778352762; a=rsa-sha256; cv=none; b=iI+T6XzSVvDN6+M3aQgU2pAm+XUB/N94/xvj/PHZyaoHGxerKMPHYKJ13jDaRw1rRmpimL CgTBAxvfcfdnn/6271K8q2zlnXfgUsm9DbBwgeh+uyT0+Xbh0H5WmqXYujcVVOqOpJUIg1 nLnV/JI5G3Aw2rxncj3fIah93hwCCWNW7gFcEmLKJbTlNcNNsYSvd3+oK2tjDRjHkU8Xt2 OveVVLmOYN5EvpqkpfKVsL/GRbTbFQ4xum3VuEqhkjyPKCSmp7XC4NLQkgAtXrACKb60iy eqQ5x+fz3/PnhcHdZlw1LH6n9dK+/OWrg3sXaYY/VQ3gYldB1/SkIy5QsWGp/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=1778352762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jqUqWiMXzOUFGjCLAZI05QlmwXaUGP1ue77eMZ6D2Ek=; b=N2zUAv7AxfPPJveIi4pCKu8f+75RKBhkhLezbilb/wZ9asPRsMlIhbmd81BnlGuaD3sPP/ 3+KMZt748T8Q8UG+3LO7nqeNLykHvgmAACAhhhFAXOId8FnFi5Eh2PvS/YADr/FCZd6cjB bM4m3yp7ozFZ8a8/ufG99YxnOlQV5DDLt4T+hdyWlE0cgi1Keg24dQyXIM8RGbcozulA5B 4dSwX9tMX+1OI4RG4br9jB4drG5KU92OX9FMdvhQdtwgtjSl/dva12Qh/a8ZVz/9AVtQJ4 NivBRdd12g17bdsxXWAkNYiR8YRJYLBXORCgopLa7hrTf8c9DMBuB7gMp21JMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCZqZ0nJvz19mg for ; Sat, 09 May 2026 18:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 462d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 18:52:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 107ef0c29503 - stable/15 - tests/carp: Rework unicast_v4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 107ef0c29503e5be2b81d22930ec0c675efba140 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 18:52:42 +0000 Message-Id: <69ff827a.462d9.2decc0ef@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=107ef0c29503e5be2b81d22930ec0c675efba140 commit 107ef0c29503e5be2b81d22930ec0c675efba140 Author: Zhenlei Huang AuthorDate: 2026-05-03 11:02:15 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-09 18:51:12 +0000 tests/carp: Rework unicast_v4 For unicast tests, it is sufficient to use wait_for_carp() to verify the setup is sane. Additional sanity checks are not necessarily required but can serve purpose for redundancy. For some unclear reason routed(8) is advertising route to carp BACKUP. That makes the test flaky. Also routed(8) is marked deprecated and may be removed from base in the future. Let's just add static route entry manually for additional sanity checks. Other noticeable changes: 1. Add atf_check to configuration steps to prevent potential failure on setup. That helps diagnosing on failure. 2. Shorten the names of jails to improve readability. 3. Prefer `[ifconfig|route|sysctl] -j` over `jexec [ifconfig|route|sysctl]` to make the lines shorter. MFC note: At the time writing, routed(8) does not know carp addresses and does not distinguish carp addresses in MASTER|BACKUP|INIT state, hence insists advertising the wrong addresses. PR: 294817 Reviewed by: glebius (previous version), pouria, markj Fixes: 93fbdef51a13 tests: carp: Update test case unicast_v4 to catch PR 284872 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56761 (cherry picked from commit 9137c66c2ea6cc09e3a6f8a042ecdc5a62e0f39e) --- tests/sys/netinet/carp.sh | 80 ++++++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 36 deletions(-) diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh index 90ed9d6f9baf..e6521d0a0708 100755 --- a/tests/sys/netinet/carp.sh +++ b/tests/sys/netinet/carp.sh @@ -169,58 +169,66 @@ unicast_v4_body() epair_one=$(vnet_mkepair) epair_two=$(vnet_mkepair) - vnet_mkjail carp_uni_v4_one ${epair_one}a ${epair_two}a - vnet_mkjail carp_uni_v4_two ${epair_one}b - vnet_mkjail carp_uni_v4_three ${epair_two}b + j="carp_uni_v4_" - jexec carp_uni_v4_one sysctl net.inet.ip.forwarding=1 - jexec carp_uni_v4_one ifconfig ${epair_one}a inet 198.51.100.1/25 - jexec carp_uni_v4_one ifconfig ${epair_two}a inet 198.51.100.129/25 + # The router + vnet_mkjail ${j}one ${epair_one}a ${epair_two}a + # The hosts + vnet_mkjail ${j}two ${epair_one}b + vnet_mkjail ${j}three ${epair_two}b - jexec carp_uni_v4_two sysctl net.inet.ip.forwarding=1 - jexec carp_uni_v4_two ifconfig ${epair_one}b 198.51.100.2/25 up - jexec carp_uni_v4_two route add 198.51.100.224 198.51.100.1 - # A peer address x.x.x.224 to catch PR 284872 - jexec carp_uni_v4_two ifconfig ${epair_one}b add vhid 1 \ - peer 198.51.100.224 192.0.2.1/32 + atf_check -o ignore sysctl -j ${j}one net.inet.ip.forwarding=1 + atf_check ifconfig -j ${j}one ${epair_one}a inet 198.51.100.1/25 + atf_check ifconfig -j ${j}one ${epair_two}a inet 198.51.100.129/25 - sleep 0.2 - jexec carp_uni_v4_three sysctl net.inet.ip.forwarding=1 - jexec carp_uni_v4_three ifconfig ${epair_two}b 198.51.100.224/25 up - jexec carp_uni_v4_three route add 198.51.100.2 198.51.100.129 - jexec carp_uni_v4_three ifconfig ${epair_two}b add vhid 1 \ - peer 198.51.100.2 192.0.2.1/32 + atf_check ifconfig -j ${j}two ${epair_one}b 198.51.100.2/25 up + atf_check -o ignore route -j ${j}two -n add default 198.51.100.1 + atf_check ifconfig -j ${j}three ${epair_two}b 198.51.100.224/25 up + atf_check -o ignore route -j ${j}three -n add default 198.51.100.129 + + sleep 0.1 # Sanity check - atf_check -s exit:0 -o ignore jexec carp_uni_v4_two \ + atf_check -o ignore jexec ${j}one \ + ping -c 1 198.51.100.2 + atf_check -o ignore jexec ${j}one \ + ping -c 1 198.51.100.224 + atf_check -o ignore jexec ${j}two \ ping -c 1 198.51.100.224 - wait_for_carp carp_uni_v4_two ${epair_one}b \ - carp_uni_v4_three ${epair_two}b + # A peer address x.x.x.224 to catch PR 284872 + atf_check ifconfig -j ${j}two ${epair_one}b add vhid 1 \ + peer 198.51.100.224 192.0.2.1/32 + sleep 0.2 + atf_check ifconfig -j ${j}three ${epair_two}b add vhid 1 \ + peer 198.51.100.2 192.0.2.1/32 - # Setup RIPv2 route daemon - jexec carp_uni_v4_two routed -s -Pripv2 - jexec carp_uni_v4_three routed -s -Pripv2 - jexec carp_uni_v4_one routed -Pripv2 + wait_for_carp ${j}two ${epair_one}b \ + ${j}three ${epair_two}b - # XXX Wait for route propagation - sleep 3 + if is_master ${j}two ${epair_one}b ; then + atf_check -o ignore \ + route -j ${j}one -n add 192.0.2.1 198.51.100.2 + fi - atf_check -s exit:0 -o ignore jexec carp_uni_v4_one \ - ping -c 3 192.0.2.1 + if is_master ${j}three ${epair_two}b ; then + atf_check -o ignore \ + route -j ${j}one -n add 192.0.2.1 198.51.100.224 + fi + + # Not necessarily required, but just in case + atf_check -o ignore jexec ${j}one \ + ping -c 1 192.0.2.1 # Check that we remain in unicast when tweaking settings - atf_check -s exit:0 -o ignore \ - jexec carp_uni_v4_two ifconfig ${epair_one}b vhid 1 advskew 2 - atf_check -s exit:0 -o match:"peer 198.51.100.224" \ - jexec carp_uni_v4_two ifconfig ${epair_one}b + atf_check -o ignore \ + ifconfig -j ${j}two ${epair_one}b vhid 1 advskew 2 + atf_check -o match:"peer 198.51.100.224" \ + ifconfig -j ${j}two ${epair_one}b } unicast_v4_cleanup() { - jexec carp_uni_v4_one killall routed - jexec carp_uni_v4_two killall routed - jexec carp_uni_v4_three killall routed vnet_cleanup } From nobody Sat May 9 18:52:38 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCZqc3ZMSz6cMHQ for ; Sat, 09 May 2026 18:52: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 4gCZqc1RqYz3VLj for ; Sat, 09 May 2026 18:52:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778352764; 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=ZQqfj8I8gsJWF02rNa+Gl9/qNQG/2pgOyz90uGQLVIs=; b=MlskTupOSvM2EVhtY/UEB14FKZaYS1DGUdC6xg5SqtY7GrRXy5aet2IZx9gCOscu9dX4ju BqefIXRnMHAGZPpdJaUwv5CVcY4zGTMaCkMKnUsXQ9F/pe2IWIkYZApLWoFWUvyXUa9sRl N3NaPU6kp71RJJrzSz6qh3m7FOeI6+4GD8yjJTce398ELuGYVZbprg8Z1NR9C8X996WAkB /jTDSUWJi1b8lpVgbXTvWgF+92cXpkyfX9kHAzPAK+k7WIauMG94W/hyfX3Q0jElJbSJ0l V6TtXuyEeinq32C/FW+Vkr3OVg6SAGVYLxCud8+7aT1f6g0PSl6WlnKOm1OMig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778352764; a=rsa-sha256; cv=none; b=exwpPQq9Lwlq3/HPzoIsafKQAlcBHEK+pzNrngt7igMD7/Y9NrEYL8rg05lG01zoZqPn+k 5RdYEG5kMsdsK/44J6369rXEOXijTTl0/STqU/7GTNNfyXlUlcOnJL/jy4OoQP/Ym8FFe0 C+8ORu2shEpg0PEQYPIaOI9jgS9L45HNRlN601D0kf0XzTyDLrhzDGu8m2OOU4Kw8pYR3B qX/qcF4h3HWEgzVoJEQ1MYVRSfaSGOlEyj5ViURVn8bVGbTNnydP1T9fY2OIxXmG98Offn vpcdOlpGQ5TXhI1iZs8QZbffum68vOamvSD/9qvrfnXiNTVrvilFQZt3wrk0ZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778352764; 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=ZQqfj8I8gsJWF02rNa+Gl9/qNQG/2pgOyz90uGQLVIs=; b=gW8AthhRmnY8+AV/Dpksnw4pvUnwONHmtqfvoIl2vGtSKXWEnacgyZ0hymPbjv1GiRI4xy ZbOI6xSt6JNvD/TktVXlELxTC1uXnSBfAu53exJBujB5L79fXgw8hzKVf8woFjs38FreXs C+tKtseIrd00vRHl93cPI630O0AjCIfm2jpshWZ2oZA9KIMeBGuXbE8nazAJ6kFk4yDSmQ IbDLvbDhULAwGX/msHMQekQ8TvCcpkx0H2rEEk5U1YM+1d3EDdHusSqdtRAQJ44GwAPcxo Cw33G3on5gy8FS/MUt2AZy26pkfvZbTArQuAbnyolviuRvzDi+LJrKsTcQNCzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCZqc10qGz1B91 for ; Sat, 09 May 2026 18:52:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47606 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 18:52:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gleb Smirnoff From: Zhenlei Huang Subject: git: 89096d660ea8 - stable/15 - tests/carp: kill routed(8) before destroying interfaces List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 89096d660ea8e3f4696abeb6745ffedf15e7aa89 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 18:52:38 +0000 Message-Id: <69ff8276.47606.3e8ea2d5@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=89096d660ea8e3f4696abeb6745ffedf15e7aa89 commit 89096d660ea8e3f4696abeb6745ffedf15e7aa89 Author: Gleb Smirnoff AuthorDate: 2025-10-15 18:44:54 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-09 18:51:11 +0000 tests/carp: kill routed(8) before destroying interfaces Otherwise routed logs a warning: "MCAST_LEAVE_GROUP ALLROUTERS: Can't assign requested address" that may be misinterpreted as a problem. (cherry picked from commit 8596810d02a1e361e0312d116339aa106aca4b19) --- tests/sys/netinet/carp.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh index 2aae2854826e..568d2beaf914 100755 --- a/tests/sys/netinet/carp.sh +++ b/tests/sys/netinet/carp.sh @@ -215,6 +215,9 @@ unicast_v4_body() unicast_v4_cleanup() { + jexec carp_uni_v4_one killall routed + jexec carp_uni_v4_two killall routed + jexec carp_uni_v4_three killall routed vnet_cleanup } From nobody Sat May 9 19:24:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCbXY0z8yz6cfWr for ; Sat, 09 May 2026 19:24: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 4gCbXX5byLz3Ymg for ; Sat, 09 May 2026 19:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778354684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aL/xUmuHpH0KlVSwvnfhHPQwj1oAIaNLIwMlY5By4Yo=; b=nzexF8PtaUQr/tog2KX6dVNAeipMV9sHnFtUXdcYbrTkwKnzDOWJfyg+TYTVtMyG7waeU5 v3tssSDCOSay4pjBae+kw6CIVL/wSO7XEXSMZ+LHVZDNDgjNS1450M7WRMDoAae8cGz2S0 XXRd2xVaf3K777EMHtAWA6plPBgUc89dcyv6vjzJVUBF/tM/hO3FpjKHvR+RQV+2RJns8R EeQjSaSDaviSgcUfkq6giDD2FdAHrHgZZQvWyChbTptlFp2IE4kr2aPT4c9KJtAfLOZyBd 3NgVKBlDlpvGvIPSEToBsp3FLEsSu9M5fpEI6sEJKGTl7iV8vUwZePHhL/DSbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778354684; a=rsa-sha256; cv=none; b=A3hFzpln24w8tcspTEJVRIbxxnN17MuCFkWFM+BYIV1mVOF+nV6pQoM6ARDp35Apw5t8zU dzNrDw9AgKaoqJgwPAju9eNQ+y+cS4zlorIZ972+JDwoJnMkDAYp0capzXQLx+108fNJKd xIhY0VroOiUcLOq9XGOh475KIQ9xSuOwGn/PNcaYNt6dXaC2FT4OBgES+qBkFC2zC/l6ik HbXylx6LEhmSeVICis61O+JvtKxHtgE/l76c04vaTENRnMSMl8C863LeS7SRe355W3iDkx fv5BAkJnGbsgO910Z52RRjB+W+Q8HEoY3JpimegPEC+F6PHBUBo2q/Q17VvdQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778354684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aL/xUmuHpH0KlVSwvnfhHPQwj1oAIaNLIwMlY5By4Yo=; b=TusdX8sSFQ3byX4r9qpXBpmBmb6w1ZU5KBZMNsMbJDeY3y/jtrVmlJPXlnwp+G6ew3RnV3 hyHmvnlX/CMwI54n0h4DL0SzRSXVHVU/Bfqae1o5ERRa1UW+c/PK7i7qbXJchPhkCd10// vxJ+2iiA1xL+WecWsr7KKyyFdQMvpoBcezQOxuMjYZoASQR9g2mP23uTcpsu8yClbO5fRJ mpwNl3Up3cJrmbJuSPYdRNUra5kEWGrcYVfg5WQG7Uq7juO2AozZIVPJkyLByX71eHnI4B ilR4EyvXqPtdnnHLZYhH2z00NR5vIUpVq1Y7t1y6kvHO8NBAX0xXME4sIoIMhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCbXX44J0z1Bk9 for ; Sat, 09 May 2026 19:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bb84 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 19:24:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f06697907f36 - stable/15 - unix: Make sure we signal EOF on the write side when disconnecting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: f06697907f360b02682594c6179a7361644d3c87 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 19:24:44 +0000 Message-Id: <69ff89fc.1bb84.f469540@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f06697907f360b02682594c6179a7361644d3c87 commit f06697907f360b02682594c6179a7361644d3c87 Author: Mark Johnston AuthorDate: 2026-05-03 15:46:22 +0000 Commit: Mark Johnston CommitDate: 2026-05-09 19:16:02 +0000 unix: Make sure we signal EOF on the write side when disconnecting Add a regression test. PR: 294014 Reported by: diizzy Reviewed by: glebius MFC after: 1 week Fixes: d15792780760 ("unix: new implementation of unix/stream & unix/seqpacket") Differential Revision: https://reviews.freebsd.org/D56764 (cherry picked from commit 476805133f5736c2c8638e41d2b5d8dd2c597f3a) --- sys/kern/uipc_usrreq.c | 2 ++ tests/sys/kern/unix_stream.c | 77 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 62 insertions(+), 17 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 6569422a3710..44d0185e9d1c 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -3162,6 +3162,8 @@ unp_soisdisconnected(struct socket *so) so->so_state |= SS_ISDISCONNECTED; so->so_state &= ~SS_ISCONNECTED; so->so_rcv.uxst_peer = NULL; + selwakeuppri(&so->so_wrsel, PSOCK); + KNOTE_LOCKED(&so->so_snd.sb_sel->si_note, 0); socantrcvmore_locked(so); } diff --git a/tests/sys/kern/unix_stream.c b/tests/sys/kern/unix_stream.c index 442b766ac885..df8dd1a15f85 100644 --- a/tests/sys/kern/unix_stream.c +++ b/tests/sys/kern/unix_stream.c @@ -109,6 +109,7 @@ typedef void check_func_t(struct check_ctx *); struct check_ctx { check_func_t *method; int sv[2]; + int kq; bool timeout; union { enum { SELECT_RD, SELECT_WR } select_what; @@ -156,24 +157,47 @@ check_poll(struct check_ctx *ctx) } static void -check_kevent(struct check_ctx *ctx) +add_kevent(struct check_ctx *ctx) { struct kevent kev; - int nfds, kq; + int kq, nfds; + + if (ctx->kq <= 0) { + kq = kqueue(); + ATF_REQUIRE(kq > 0); + ctx->kq = kq; + } - ATF_REQUIRE(kq = kqueue()); EV_SET(&kev, ctx->sv[0], ctx->kev_filter, EV_ADD, 0, 0, NULL); - nfds = kevent(kq, &kev, 1, NULL, 0, NULL); + nfds = kevent(ctx->kq, &kev, 1, NULL, 0, NULL); ATF_REQUIRE_MSG(nfds == 0, "kevent() returns %d errno %d", nfds, errno); - nfds = kevent(kq, NULL, 0, &kev, 1, ctx->timeout ? +} + +static void +check_kevent(struct check_ctx *ctx) +{ + struct kevent kev; + int nfds; + + nfds = kevent(ctx->kq, NULL, 0, &kev, 1, ctx->timeout ? &(struct timespec){.tv_nsec = 1000000} : NULL); ATF_REQUIRE_MSG(nfds == ctx->nfds, "kevent() returns %d errno %d", nfds, errno); - ATF_REQUIRE(kev.ident == (uintptr_t)ctx->sv[0] && - kev.filter == ctx->kev_filter && - (kev.flags & ctx->kev_flags) == ctx->kev_flags); - close(kq); + if (nfds > 0) { + ATF_REQUIRE_EQ(kev.ident, (uintptr_t)ctx->sv[0]); + ATF_REQUIRE_EQ(kev.filter, ctx->kev_filter); + ATF_REQUIRE_EQ(kev.flags & ctx->kev_flags, ctx->kev_flags); + } + close(ctx->kq); + ctx->kq = -1; +} + +static void +add_and_check_kevent(struct check_ctx *ctx) +{ + add_kevent(ctx); + check_kevent(ctx); } static void @@ -287,7 +311,7 @@ ATF_TC_WITHOUT_HEAD(full_writability_kevent); ATF_TC_BODY(full_writability_kevent, tc) { struct check_ctx ctx = { - .method = check_kevent, + .method = add_and_check_kevent, .kev_filter = EVFILT_WRITE, }; @@ -312,7 +336,7 @@ ATF_TC_BODY(connected_writability, tc) ctx.poll_events = POLLOUT | POLLWRNORM; check_poll(&ctx); ctx.kev_filter = EVFILT_WRITE; - check_kevent(&ctx); + add_and_check_kevent(&ctx); close(ctx.sv[0]); close(ctx.sv[1]); @@ -333,13 +357,13 @@ ATF_TC_BODY(unconnected_writability, tc) ctx.poll_events = POLLOUT | POLLWRNORM; check_poll(&ctx); ctx.kev_filter = EVFILT_WRITE; - check_kevent(&ctx); + add_and_check_kevent(&ctx); close(ctx.sv[0]); } -ATF_TC_WITHOUT_HEAD(peerclosed_writability); -ATF_TC_BODY(peerclosed_writability, tc) +ATF_TC_WITHOUT_HEAD(peerclosed_writability_level); +ATF_TC_BODY(peerclosed_writability_level, tc) { struct check_ctx ctx = { .timeout = false, @@ -355,6 +379,24 @@ ATF_TC_BODY(peerclosed_writability, tc) check_poll(&ctx); ctx.kev_filter = EVFILT_WRITE; ctx.kev_flags = EV_EOF; + add_and_check_kevent(&ctx); + + close(ctx.sv[0]); +} + +ATF_TC_WITHOUT_HEAD(peerclosed_writability_edge); +ATF_TC_BODY(peerclosed_writability_edge, tc) +{ + struct check_ctx ctx = { + .timeout = false, + .nfds = 1, + }; + + do_socketpair(ctx.sv); + ctx.kev_filter = EVFILT_WRITE; + ctx.kev_flags = EV_EOF; + add_kevent(&ctx); + close(ctx.sv[1]); check_kevent(&ctx); close(ctx.sv[0]); @@ -384,7 +426,7 @@ ATF_TC_BODY(peershutdown_writability, tc) * and then this test will also expect EV_EOF in returned flags. */ ctx.kev_filter = EVFILT_WRITE; - check_kevent(&ctx); + add_and_check_kevent(&ctx); close(ctx.sv[0]); close(ctx.sv[1]); @@ -463,7 +505,7 @@ ATF_TC_WITHOUT_HEAD(peershutdown_wakeup_kevent); ATF_TC_BODY(peershutdown_wakeup_kevent, tc) { peershutdown_wakeup(&(struct check_ctx){ - .method = check_kevent, + .method = add_and_check_kevent, .kev_filter = EVFILT_READ, .kev_flags = EV_EOF, }); @@ -525,7 +567,8 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, full_writability_select); ATF_TP_ADD_TC(tp, full_writability_poll); ATF_TP_ADD_TC(tp, full_writability_kevent); - ATF_TP_ADD_TC(tp, peerclosed_writability); + ATF_TP_ADD_TC(tp, peerclosed_writability_level); + ATF_TP_ADD_TC(tp, peerclosed_writability_edge); ATF_TP_ADD_TC(tp, peershutdown_writability); ATF_TP_ADD_TC(tp, peershutdown_readability); ATF_TP_ADD_TC(tp, peershutdown_wakeup_select); From nobody Sat May 9 19:27:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCbbn2GG3z6cfr9 for ; Sat, 09 May 2026 19:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCbbm66QTz3cTF for ; Sat, 09 May 2026 19:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778354852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0m9KBb3MqY/W6V1e+C2tz1VOGY4VwP2nWL8RCmZdtUY=; b=aedxbz/J3uBdwFC9iGXkDlcvogM8aTxOFl4ORTtaFFoBgO/RCSWCdY1FTcCakWdtx/1EPP xwIur/s/UL3uQ68x83n18ZBAwVcGrDIz/2Kysk8SbjRaorB0iTJHHHZkKNcXztNvnUKYuu SGqVuH19wlpSv3ebY8sNgt+Yg178yg4Al4PD0k0EEAebv/KyR4MAMPfandlvse6B9hx745 7vgN2d6IT9vzE6nHyjnB3kfSaw3III7PSVKBiuw3oe+vi6M5VGooJMZ06WcHBGVsDj1Pa1 +vrfoYKFLdWI91vt3PTrzdOjgkVMEvhqNxtoNb5NQtbbSQJNNDlj3GIixhojEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778354852; a=rsa-sha256; cv=none; b=erau/ztGJpQjTgyXGh89uNevIfmWxa0eECpxPCFFNXmVzxGEmvB9Gw1UHzWj+7KGjlIXvz /gmF2CJ+6NpWAnINMpHmB8SAFbg57nvSjescmm+DMNyHvXn7VaLjCj8XAZOxt4QreU2zW0 OVFYjzmNkqYXhVWZXAQ2PPTe7wYHyonFbwaGA/cLesXqJxcdHkZrAKsokYQjotUt04oUTz Z/A+s9s9yvxaeRxGeKVCgYGw0Xob/jqscaQf17F+wU4/Xwfzqe1C5Za4vnoaAZST7Hgpc1 cdIFgv1TeBfS4np9kehNUTSrHH5TYmRhjhQQV1pVFsQgtu9GQs63XcBlgsiM/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778354852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0m9KBb3MqY/W6V1e+C2tz1VOGY4VwP2nWL8RCmZdtUY=; b=TthnsqKagHK2OEbD4dukhlWwvpNdlX/qrHlqhCgTdJiYbFtzYKCc5re1yEoKr7h3gdaxA/ BAjgVYjc+mqicWJ0dLS2SFoJEm0Az0/7oH+EmnrsXAHQrt0ydAAE4WcHk1NvEHY9lhqJQN TaUVcl1L/xpL0fNmHRgvjY+A9zsKYxdVGcldIrpctJytNaxyoZ0CfSAe5F0NyyKKQJnF/A dTOZIZDR9Ax/OIHr16XbUwWD2XLVZ9RvuJh4Gp7hQ/EUdkZ+u2TUqTdygNJEuQ5bsA3SIp VwkMVhUm4rKnYaOYnl59lLhLg7prKX10nPH65bLIBOGxhKFVvgbhF8Eq5XVd6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCbbm59vRz1BvH for ; Sat, 09 May 2026 19:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19667 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 19:27:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: fdd7daa2318e - main - thunderbolt: Fix typo in comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fdd7daa2318ed3177e2674b9a3d18d21e2035ee1 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 19:27:32 +0000 Message-Id: <69ff8aa4.19667.279aa722@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=fdd7daa2318ed3177e2674b9a3d18d21e2035ee1 commit fdd7daa2318ed3177e2674b9a3d18d21e2035ee1 Author: Aymeric Wibo AuthorDate: 2026-05-09 17:22:41 +0000 Commit: Aymeric Wibo CommitDate: 2026-05-09 17:47:30 +0000 thunderbolt: Fix typo in comment Reported by: adrian Sponsored by: The FreeBSD Foundation --- sys/dev/thunderbolt/tbcfg_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/thunderbolt/tbcfg_reg.h b/sys/dev/thunderbolt/tbcfg_reg.h index bb68faa543b0..6ae5c6fea7fa 100644 --- a/sys/dev/thunderbolt/tbcfg_reg.h +++ b/sys/dev/thunderbolt/tbcfg_reg.h @@ -52,7 +52,7 @@ struct tb_cfg_read { uint32_t crc; }; -/* Config space read request, 6.4.2.4 */ +/* Config space read response, 6.4.2.4 */ struct tb_cfg_read_resp { tb_route_t route; uint32_t addr_attrs; From nobody Sat May 9 20:44:21 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCdJQ1sXwz6cmQy for ; Sat, 09 May 2026 20:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCdJQ0QFJz3nTG for ; Sat, 09 May 2026 20:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778359462; 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=KbLu2Jts0rFU6C12r7vlXFVLIicsD6VYUHrDsvhHxek=; b=danRtERRKxwtyAIrkz+oQzKPEn/yfYKPXyOmbow5fqcD0g4aR/XTg9AgfQEgXA39KTMarc Xbtg18wDB0nBQ8VXgEx422/yhccTKTdn4zZlXRoEU9cHmcltZ4b0x5fhaFS7vujmExQljF Mozb3FkTFTCxc81phF11P8vr08t2v5UOMklg/B3zdPk5cTcJcovfcFftYiJIZS7ZAo/PLj yfyPDDKaX6KHWjxfnXl/tv8PewzVcNxPYfxwOxsQoAaD3Pg1c1FZBcnAzyjO/nc5m7zZn8 irKnAa0DtjJ/dp2RHVN0l3HR7RzGSCGtXfSE9yIHmX3VEbc996fV0tfxe2KLig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778359462; a=rsa-sha256; cv=none; b=YIUjCWoOU/JnCo6TvrdFj+ZoNmSM+557S2NaHcTerDugL5Q1UWKAlFpZNk0g3L/ayUWT0/ EpddoIzb1tESgtHEHEV2u+kCbk+GZ5Yduw7dKfVunA7QluuNbgTYbmn4QH1aWuNVTj9GPu YW0xEUN1/4CTeHJz4IytqZ8xiuu/YMcLaJG+dBUImLB9/IE8i9MrC5/FGP+qdiHFanfFUb Ax5yLfcAVbdLh/UNER5xLBfbdrdED+7ersHRc6c1H0hyxTwMsJzjfeF0YyeweRaCGR3M6V qAxj9jVMaR9reNQgtCqMoAiT0nl88T4jv/kX78YKdXN8mSm3+lKEYuwj51uXOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778359462; 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=KbLu2Jts0rFU6C12r7vlXFVLIicsD6VYUHrDsvhHxek=; b=IQJoQXbGVsupFJZHcZ2oDrmD1bK3FP7bO41VIdIQzUhGrwPHdtf6+y8tPPriMyT5BVySJt zygNf5+dbzvzX63rUk0laAIJZ6QA1OJpMeOPJ8HLfqiBga6VvcID7niD8ID6F23n+lqO8u yFrIxv1p+QL6plt3dQjsv7ars4NstVExGTEuRzOZRZ+izDmm9Y8OL4/zM187ebnWv1dkNk /lpQ20c/L+vA44w1mQbS2dH0YN1XEBFkc9+yNqX/AwQnsNXba0hIH3byShEupEjJoDvRgv fDyup4uVNQq8pBI9DIpwroQ7Li6CwYOu8vek3Dtm6EEjB2B8kGSfJHRDK+tvwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCdJP6n0Dz1DsY for ; Sat, 09 May 2026 20:44:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23d0e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 20:44:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Colin Percival Subject: git: b333b8799af0 - releng/15.1 - uipc_shm.c: make large page allocation interruptible List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: b333b8799af00b2b95681219a6b222403c3bfdc9 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 20:44:21 +0000 Message-Id: <69ff9ca5.23d0e.20d7599b@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b333b8799af00b2b95681219a6b222403c3bfdc9 commit b333b8799af00b2b95681219a6b222403c3bfdc9 Author: Konstantin Belousov AuthorDate: 2026-04-28 02:34:49 +0000 Commit: Colin Percival CommitDate: 2026-05-09 20:44:10 +0000 uipc_shm.c: make large page allocation interruptible Approved by: re (cperciva) (cherry picked from commit 839d3266d8c6f6471cb92a3c0ae32eb16d117427) (cherry picked from commit c335dafd77363b67493d37ab260bc82e70c8cfa7) --- sys/kern/uipc_shm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 0ad5be2e8d71..197409d97f0c 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -829,12 +829,20 @@ shm_dotruncate_largepage(struct shmfd *shmfd, off_t length, void *rl_cookie) * object lock might allowed mapping of them. */ while (object->size < newobjsz) { + error = sig_intr(); + if (error != 0) + return (error); m = vm_page_alloc_contig(object, object->size, aflags, pagesizes[psind] / PAGE_SIZE, 0, ~0, pagesizes[psind], 0, VM_MEMATTR_DEFAULT); if (m == NULL) { VM_OBJECT_WUNLOCK(object); + error = sig_intr(); + if (error != 0) { + VM_OBJECT_WLOCK(object); + return (error); + } if (shmfd->shm_lp_alloc_policy == SHM_LARGEPAGE_ALLOC_NOWAIT || (shmfd->shm_lp_alloc_policy == From nobody Sat May 9 20:44:20 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCdJV20C8z6cmbt for ; Sat, 09 May 2026 20:44: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 4gCdJV0zy8z3nCP for ; Sat, 09 May 2026 20:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778359466; 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=sK3mhCBS/PBNGSL5QPfcyylXhQK/S6DkHRTKnr4Kzk8=; b=GD1aqxIYZjtkR3XSOkh+EDfCJ2eMc2e90+9uADWyy/BqdoTX+E6mgFURhYao2IHchAo+9m HhVLnd32m1Rapq1UDmLOCVrszZEJdsfDGqEEKZsraApGRJC/0uYHoCTiAugTrkP1OSLpIX IGoQGDOecSTpg2tU5cpYWpaR7Ca1jJqaLXBDdxkoosPiEYYfrQpEqSf5gHK8lXqr9bP+FM HFk7vLvwHfCSVnQttIOzXezlDyDVbrzOSB5GQZ9ig1oz4C4G8A+UYWX2kcdl9nNA40sNCI mW4jPLTpr2JPbzm6BK92Eqgsv7emMQWFO5Yb3pDR9r6bbNEkoTyl7kfSiqUDTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778359466; a=rsa-sha256; cv=none; b=bMNgOH3AaQXU/WgkezpX+dPG+mPSAMML1pfUG3qnOctkhbq6gZ6JAO3RHsJNAXOTnzzaUg 2cqdlZg2A5+C+MH7F8WOP3QNquivJ0V0ngEK/Yc7njouIT5ypl2RpenPcu9tR4HHesooYf AswNte3KVywLT+9ZZgrdgiFPN4G/TkF0Ce2D5NnKmpplHCne00hiQ0ekrpQo9BHqbpOXbG 0fAXMcFo3TNB7enGlsrXF1G6HQY2hoZs6EjCMECcMZuYWmdMXlnJ5T1yFso3MG4WoHPwz0 hB5KSvgnPe+wCE9PCM6i/uQvp/0pfQJt3H7ZmFALkoAa9S3Ra5vXk+KW9pz/Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778359466; 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=sK3mhCBS/PBNGSL5QPfcyylXhQK/S6DkHRTKnr4Kzk8=; b=tOZ7HvzACXP1fmO9WmXKt2TFKo83+Gfdl1f0vKD2iNTtltKrv7esuLvp/G+hKTqbf7kpfw 5VW9XTMzUu0i3di7Ylwt3F4KmhBIha6ebfV9/AMTFZEfxUSFrIechki8QVnBT+VD0Q+zjV zoGJ+zzXs98PYQlzQBeAjFZpjW12S1Vd/VpJRXRZZLB0y+BFCPph0VeD2WQL/Gg4JkA21u kCsmG/eyNqbhNB+33qHtJtqKecvFqGLaGhYHC0cyNGmTzBevDmD9+MYBf38grJHUpuEd1Z 2uzxm00KPQPfstyPrOxbGzoXSlKj8uKkLjRrl+giqz+AZW34yIcF8sQeU6FTcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCdJT6cbFz1F8h for ; Sat, 09 May 2026 20:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23ffe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 20:44:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mark Johnston From: Colin Percival Subject: git: 037b285b80e5 - releng/15.1 - unix: Make sure we signal EOF on the write side when disconnecting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 037b285b80e5cb35c8e9cec4e85966b20f03d91a Auto-Submitted: auto-generated Date: Sat, 09 May 2026 20:44:20 +0000 Message-Id: <69ff9ca4.23ffe.55918be4@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=037b285b80e5cb35c8e9cec4e85966b20f03d91a commit 037b285b80e5cb35c8e9cec4e85966b20f03d91a Author: Mark Johnston AuthorDate: 2026-05-03 15:46:22 +0000 Commit: Colin Percival CommitDate: 2026-05-09 20:44:04 +0000 unix: Make sure we signal EOF on the write side when disconnecting Add a regression test. Approved by: re (cperciva) PR: 294014 Reported by: diizzy Reviewed by: glebius MFC after: 1 week Fixes: d15792780760 ("unix: new implementation of unix/stream & unix/seqpacket") Differential Revision: https://reviews.freebsd.org/D56764 (cherry picked from commit 476805133f5736c2c8638e41d2b5d8dd2c597f3a) (cherry picked from commit f06697907f360b02682594c6179a7361644d3c87) --- sys/kern/uipc_usrreq.c | 2 ++ tests/sys/kern/unix_stream.c | 77 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 62 insertions(+), 17 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 6569422a3710..44d0185e9d1c 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -3162,6 +3162,8 @@ unp_soisdisconnected(struct socket *so) so->so_state |= SS_ISDISCONNECTED; so->so_state &= ~SS_ISCONNECTED; so->so_rcv.uxst_peer = NULL; + selwakeuppri(&so->so_wrsel, PSOCK); + KNOTE_LOCKED(&so->so_snd.sb_sel->si_note, 0); socantrcvmore_locked(so); } diff --git a/tests/sys/kern/unix_stream.c b/tests/sys/kern/unix_stream.c index 442b766ac885..df8dd1a15f85 100644 --- a/tests/sys/kern/unix_stream.c +++ b/tests/sys/kern/unix_stream.c @@ -109,6 +109,7 @@ typedef void check_func_t(struct check_ctx *); struct check_ctx { check_func_t *method; int sv[2]; + int kq; bool timeout; union { enum { SELECT_RD, SELECT_WR } select_what; @@ -156,24 +157,47 @@ check_poll(struct check_ctx *ctx) } static void -check_kevent(struct check_ctx *ctx) +add_kevent(struct check_ctx *ctx) { struct kevent kev; - int nfds, kq; + int kq, nfds; + + if (ctx->kq <= 0) { + kq = kqueue(); + ATF_REQUIRE(kq > 0); + ctx->kq = kq; + } - ATF_REQUIRE(kq = kqueue()); EV_SET(&kev, ctx->sv[0], ctx->kev_filter, EV_ADD, 0, 0, NULL); - nfds = kevent(kq, &kev, 1, NULL, 0, NULL); + nfds = kevent(ctx->kq, &kev, 1, NULL, 0, NULL); ATF_REQUIRE_MSG(nfds == 0, "kevent() returns %d errno %d", nfds, errno); - nfds = kevent(kq, NULL, 0, &kev, 1, ctx->timeout ? +} + +static void +check_kevent(struct check_ctx *ctx) +{ + struct kevent kev; + int nfds; + + nfds = kevent(ctx->kq, NULL, 0, &kev, 1, ctx->timeout ? &(struct timespec){.tv_nsec = 1000000} : NULL); ATF_REQUIRE_MSG(nfds == ctx->nfds, "kevent() returns %d errno %d", nfds, errno); - ATF_REQUIRE(kev.ident == (uintptr_t)ctx->sv[0] && - kev.filter == ctx->kev_filter && - (kev.flags & ctx->kev_flags) == ctx->kev_flags); - close(kq); + if (nfds > 0) { + ATF_REQUIRE_EQ(kev.ident, (uintptr_t)ctx->sv[0]); + ATF_REQUIRE_EQ(kev.filter, ctx->kev_filter); + ATF_REQUIRE_EQ(kev.flags & ctx->kev_flags, ctx->kev_flags); + } + close(ctx->kq); + ctx->kq = -1; +} + +static void +add_and_check_kevent(struct check_ctx *ctx) +{ + add_kevent(ctx); + check_kevent(ctx); } static void @@ -287,7 +311,7 @@ ATF_TC_WITHOUT_HEAD(full_writability_kevent); ATF_TC_BODY(full_writability_kevent, tc) { struct check_ctx ctx = { - .method = check_kevent, + .method = add_and_check_kevent, .kev_filter = EVFILT_WRITE, }; @@ -312,7 +336,7 @@ ATF_TC_BODY(connected_writability, tc) ctx.poll_events = POLLOUT | POLLWRNORM; check_poll(&ctx); ctx.kev_filter = EVFILT_WRITE; - check_kevent(&ctx); + add_and_check_kevent(&ctx); close(ctx.sv[0]); close(ctx.sv[1]); @@ -333,13 +357,13 @@ ATF_TC_BODY(unconnected_writability, tc) ctx.poll_events = POLLOUT | POLLWRNORM; check_poll(&ctx); ctx.kev_filter = EVFILT_WRITE; - check_kevent(&ctx); + add_and_check_kevent(&ctx); close(ctx.sv[0]); } -ATF_TC_WITHOUT_HEAD(peerclosed_writability); -ATF_TC_BODY(peerclosed_writability, tc) +ATF_TC_WITHOUT_HEAD(peerclosed_writability_level); +ATF_TC_BODY(peerclosed_writability_level, tc) { struct check_ctx ctx = { .timeout = false, @@ -355,6 +379,24 @@ ATF_TC_BODY(peerclosed_writability, tc) check_poll(&ctx); ctx.kev_filter = EVFILT_WRITE; ctx.kev_flags = EV_EOF; + add_and_check_kevent(&ctx); + + close(ctx.sv[0]); +} + +ATF_TC_WITHOUT_HEAD(peerclosed_writability_edge); +ATF_TC_BODY(peerclosed_writability_edge, tc) +{ + struct check_ctx ctx = { + .timeout = false, + .nfds = 1, + }; + + do_socketpair(ctx.sv); + ctx.kev_filter = EVFILT_WRITE; + ctx.kev_flags = EV_EOF; + add_kevent(&ctx); + close(ctx.sv[1]); check_kevent(&ctx); close(ctx.sv[0]); @@ -384,7 +426,7 @@ ATF_TC_BODY(peershutdown_writability, tc) * and then this test will also expect EV_EOF in returned flags. */ ctx.kev_filter = EVFILT_WRITE; - check_kevent(&ctx); + add_and_check_kevent(&ctx); close(ctx.sv[0]); close(ctx.sv[1]); @@ -463,7 +505,7 @@ ATF_TC_WITHOUT_HEAD(peershutdown_wakeup_kevent); ATF_TC_BODY(peershutdown_wakeup_kevent, tc) { peershutdown_wakeup(&(struct check_ctx){ - .method = check_kevent, + .method = add_and_check_kevent, .kev_filter = EVFILT_READ, .kev_flags = EV_EOF, }); @@ -525,7 +567,8 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, full_writability_select); ATF_TP_ADD_TC(tp, full_writability_poll); ATF_TP_ADD_TC(tp, full_writability_kevent); - ATF_TP_ADD_TC(tp, peerclosed_writability); + ATF_TP_ADD_TC(tp, peerclosed_writability_level); + ATF_TP_ADD_TC(tp, peerclosed_writability_edge); ATF_TP_ADD_TC(tp, peershutdown_writability); ATF_TP_ADD_TC(tp, peershutdown_readability); ATF_TP_ADD_TC(tp, peershutdown_wakeup_select); From nobody Sat May 9 22:03:38 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCg3v3Cp3z6csmb for ; Sat, 09 May 2026 22:03:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCg3v0BvXz438Y for ; Sat, 09 May 2026 22:03:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778364219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y/WUvu9iDiXaQ/iU2iEts6hQLor1oarFU9u3oNV60U4=; b=ld1yVpUv01aXRl3kavEGZJtnOrhp6RE8Cs7FxiQ9i6nZcRs1IcHzhkwzpr9w9ru4lOnRQx SasCX5QFi0m6zmXU3iMb5v2LQUlZyBuzOGzNI9P/NlRhiQi2fty9rSt7i5AYG+Z1S/PVQ0 +zmB4erIkFCtyF+ct7lTFh++LQAwrYrZ8g3PtGdD3TCA5Xu4Ra3Vb/mczaQhrxYa5C7RfW OBoGE5r/MXKbRkGyoVK6lAEzWg7KDR/mSGwuozaRrvzyt613PrA+rnGUV9brrFLXMYuAi0 3VfXiVF3CKvNbDiLk7k3vGoMzbxWzajeSPh9i5J21AbhtJ5UvCg9bufS6Dcfqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778364219; a=rsa-sha256; cv=none; b=CqRH4OHeBHsb96SqZ52nVQ1XO/NVB6K14O24u6/2Ssldx00q0NNz3aqYVOLAF1b/iNLaHu hTdi/Ux6GYBixsiTvXR+4gCeF2bxFCqmSiaH9YXixNl5P3wKVUGOvw4hSHZ4Qu/2qygiFL KI+xxVLSboToHsyB3aZCb0Ef/gEHzh5vHeb2BMxArAhUgqxIxXRNSlTv+v5ugwurxFly1d oujxHYWTN8FhKVpAqeswGKuL4hhT2WGxBJlNh9QcFhLh6cp/mTfFqhygu15xCm4hCxV732 LGUNLV/Br7wIGJUa/MynmkXGZepgK8OdD5tKweH2ZLwVmfw6xoCeFwPhqhamuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778364219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y/WUvu9iDiXaQ/iU2iEts6hQLor1oarFU9u3oNV60U4=; b=Yn0UTIXiRyiaJ3p6k4W+bAABPWHmdEIVyhSgv4lUs9sLq+Ayyiqv9HFVaTyh4YYE1liKzk P80OAaoaLcTHtfAjB8M9Pm+yWYhXCsgtElPyjgGZvrq1zVDNIFjwb/IaOMOlhkdrhvPvmd nvs75keA+ilf4V1cjwVyYpjv2MW/ojI0ZcwMgDxHaYcjIsdhWzniFkt4yN2qqaiFeMgHZM juEM6qFo1yKqCfChbalh7dcu1Allhfi7J769PkpY23p2L/Pli+xzXOEF6M0EpqOTraGK3/ vs4YCBLqgV6Y5a7yz/ih2MvyHBe2V0EJ8Of7L+CxxTC8hsJCoCVqWUc9iHBLhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCg3t6vdRz1GpZ for ; Sat, 09 May 2026 22:03:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34539 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 22:03:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jilles Tjoelker Subject: git: 3ca8ec19b6ec - main - libc: correct posix_spawn_file_actions_init ENOMEM error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jilles X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ca8ec19b6ecc8ae4413d0505ce2d0efdd3e52c8 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 22:03:38 +0000 Message-Id: <69ffaf3a.34539.6a178982@gitrepo.freebsd.org> The branch main has been updated by jilles: URL: https://cgit.FreeBSD.org/src/commit/?id=3ca8ec19b6ecc8ae4413d0505ce2d0efdd3e52c8 commit 3ca8ec19b6ecc8ae4413d0505ce2d0efdd3e52c8 Author: Jilles Tjoelker AuthorDate: 2026-05-09 22:01:50 +0000 Commit: Jilles Tjoelker CommitDate: 2026-05-09 22:02:25 +0000 libc: correct posix_spawn_file_actions_init ENOMEM error The return value of posix_spawn_file_actions_init() is an error number. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56911 --- lib/libc/gen/posix_spawn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c index 11cdb5a29d03..faddb0d1494f 100644 --- a/lib/libc/gen/posix_spawn.c +++ b/lib/libc/gen/posix_spawn.c @@ -424,7 +424,7 @@ posix_spawn_file_actions_init(posix_spawn_file_actions_t *ret) fa = malloc(sizeof(struct __posix_spawn_file_actions)); if (fa == NULL) - return (-1); + return (errno); STAILQ_INIT(&fa->fa_list); *ret = fa; From nobody Sun May 10 00:59:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCkyq6H5wz6d5d7 for ; Sun, 10 May 2026 00:59: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 4gCkyq4D3Xz3bhl for ; Sun, 10 May 2026 00:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778374771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ljt0422W1AOgTcqtqEtihhL2+zbaLdNCrWQwEblOI88=; b=WHXf7AeKmVDNX5lfVdyEqSqekd/LMoAH9+NhEFHV2hAOLkyUH5Yx5clI40G827IkPDnfZA N3NIeRZAkLNupwQOWeNrnb5wPNVW0ecvJT6KCATnkVTyMuGkhKJgTSjz6GIvXy13+JzLxI butJJ3xBkznilMmuc4nbaTfyn8V1t2TITCtgewi4KQhMj9hbgWX5J9zRN5rOl8MLtkenpQ wTD+8C8PY6GT6Fdz9HDBnWLyQgITBeE/d7fTx74dSqoElZ79qN+fpHRzZ8aQkW/cVYN/+t K80AgoBgb3d2yQ5UZrkA+vaaBsAMKKTjApulqq8olUMBogmlxurLFCmjmm379Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778374771; a=rsa-sha256; cv=none; b=pQwaz/HVQbvmnMDmrwxzC9xi8Qi5NFS86ebNTrahHmEL8ZaDpI3bffkRLN5M/f1GuXe+PD gsYhGyPxPee71kGyXUbXgHF9GlKYcuhhBnrZMQ1B4Rs175cas+OvQFm0XE5bpn2OGqd2VC 8yblCMg6qofcHK7/Y5NYccHHaWvjikcmKaW2EelBfaiQjrw738AFSbx7oQvabjgdbZDx0I LeK4UWKtnP/fvVG19Zoc+WV7s3oHmK567QYNbnPKlMpGLwlnGuLCM+rP288QyGUgovhMiV YAETO7TD/M9hiLASU3Oa1BYPcQUw/9yabWEbp29h5U8w3vV5SWGODL7vbaqPOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778374771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ljt0422W1AOgTcqtqEtihhL2+zbaLdNCrWQwEblOI88=; b=pDmAtqlfHL7Q4twCBpY6oUfIMQXRYB3JCITiwsOpztk6a4SY33cVascK6UE2tp9+u0959O WB7BmBKhbiZQEuuI2c06QDXxxMFRsI5gKlfmi2cznpkui9tr2yuElTXNqSytAWhn6pVcq3 d+sM6JCbygcr8IAHrqrbxJFoXjipsi66+gQrTgXVj89qPIhs8eBfW+kElGVdkqrgCDxx/g vf1qC3va5rgvCawDE94Z/c4UFHSl2gmDjtd1oC+EmLzrpqzZScjBuGRBW76SL40SQkBa1f EMx5CexIWsgthTIXI6zXlzcnvZDsrpNubeoo9MPDhVkj84wixgoP47rkdOMSSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCkyq327Vz1MfZ for ; Sun, 10 May 2026 00:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 448ba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 00:59:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 0f36cf87a5a2 - stable/15 - blocklistd: Fix RFC1918 typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 0f36cf87a5a2ece436f2c19596f99fdb7dd9db3e Auto-Submitted: auto-generated Date: Sun, 10 May 2026 00:59:26 +0000 Message-Id: <69ffd86e.448ba.384acf48@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=0f36cf87a5a2ece436f2c19596f99fdb7dd9db3e commit 0f36cf87a5a2ece436f2c19596f99fdb7dd9db3e Author: Jose Luis Duran AuthorDate: 2026-05-03 05:31:51 +0000 Commit: Jose Luis Duran CommitDate: 2026-05-10 00:51:24 +0000 blocklistd: Fix RFC1918 typo The address in the configuration file example was intended to be from the 192.168.0.0/16 range of IPv4 private addresses (RFC1918). Reported on mastodon.social at https://mastodon.social/@asmodai/116316630762241486. Fix submitted upstream by emaste@. Fixing locally first. Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56773 (cherry picked from commit 5a6d9479ae2271a97dd23ceee8ad284770302874) --- usr.sbin/blacklistd/blacklistd.conf | 2 +- usr.sbin/blocklistd/blocklistd.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/blacklistd/blacklistd.conf b/usr.sbin/blacklistd/blacklistd.conf index ec995e038574..04a09f8d3dea 100644 --- a/usr.sbin/blacklistd/blacklistd.conf +++ b/usr.sbin/blacklistd/blacklistd.conf @@ -14,7 +14,7 @@ submission stream * * * 3 24h # adr/mask:port type proto owner name nfail duration [remote] -#129.168.0.0/16 * * * = * * +#192.168.0.0/16 * * * = * * #[2001:db8::]/32:ssh * * * = * * #6161 = = = =/24 = = #* stream tcp * = = = diff --git a/usr.sbin/blocklistd/blocklistd.conf b/usr.sbin/blocklistd/blocklistd.conf index c6c7f7c2fafc..db9a6fc5c720 100644 --- a/usr.sbin/blocklistd/blocklistd.conf +++ b/usr.sbin/blocklistd/blocklistd.conf @@ -10,7 +10,7 @@ submission stream * * * 3 24h # adr/mask:port type proto owner name nfail duration [remote] -#129.168.0.0/16 * * * = * * +#192.168.0.0/16 * * * = * * #[2001:db8::]/32:ssh * * * = * * #6161 = = = =/24 = = #* stream tcp * = = = From nobody Sun May 10 01:00:40 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCl0G2VZzz6d5hH for ; Sun, 10 May 2026 01:00: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 4gCl0G0lJBz3cF6 for ; Sun, 10 May 2026 01:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778374846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jrXF1HUsyhDRPoq+bCOMmGnUl8X3P86tdzWtuDc+7sc=; b=DAR6TyLRxEfjCHnQP3800vuv9b6B20vJYfksMtV15tFDHw+khZWKtza2xdS+gW03bLv4di /l7wIhY6peuog+8RqcJHpBdkVhWFbMRemW/uCzVYbNoA0sYsdB7atimjJ1REEsVnZZtNEY FClSx3G2jW+HA4xn/zyUV1YfHa+/1OPtxds3lVa1RQ6icw52dgEg5uY8ziJOoixEqDuK6i 5RLkEnsHKkB3A5GVyJ1FSAKXLJBSxJ3jRh/f+ghnhdq5jv7aHEXE2WLwRqoph75hMIKl3o Iuok1o8R12kU5viDn1USWTeF+TGG0Ae/XSQol9layAwgyj/rK7OXRy4ZY4NKkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778374846; a=rsa-sha256; cv=none; b=bo5qtcZiBs3HJV7EoqOu/tvVqslWkf0MgKiosStjmC37bMn9L/zC2xBlzis6Rd2ixJemZ7 T2h4RzWRuYI/SeJZQoHHWgMT6YoYHyHjdDLcHy5VIj0qsSKp8giKAxJYRDSHm1P4aIOq96 sx23Y1Gd/XmjQC/d91YM6EInrvmLDKl9WrWddJMEN/1NpBvXbAFcQS2VJM73de7m0iUMxn qap03jK2z1H7bsRWvlj1DncXRqKwMWM0vbqBMR9fNqWVhxhKY7bEDHvCQnLBoqxNIABnsz yEAhdpUu/gpQwANfdZ7o//h30yKXNONzigm71Xd/RPYnT9koIppXE1fR3sc0IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778374846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jrXF1HUsyhDRPoq+bCOMmGnUl8X3P86tdzWtuDc+7sc=; b=KAc+gLaqDHTe4kpuXPW0o8gTU5n0g708H7vNWrRJuTs4AzdiqALiLlLyuHc9Uy7N9Wivi1 0CxAjdHleeHKER2XHf8NS9PE2fxabSrHCsO+KoSk7SfJbf93e19rXGkzew1tmQgGOu8gvN BrCze+SgK0oD/Knj3In+8JJR4j0hE8w/e0CxczgzOx5ZlKn7OYH4Ok4ESK7Di4G6jj8AWA teXYYR4m6AhgR+7sCs59AWrmSmjToMfcAv4heUYG23fd7haq0XK94WGs32G4RMEceH8YSk bXHtKLPdac4QkmLWSN+vDaC4pfisnPToL151D4Q13VZOIaotPmc4kO+xd0WjjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCl0F6lKZz1MSV for ; Sun, 10 May 2026 01:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45740 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 01:00:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 8fe76a3c1240 - stable/14 - blacklistd: Fix RFC1918 typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8fe76a3c1240d2f8f759f9261ac15ec0cff76d32 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 01:00:40 +0000 Message-Id: <69ffd8b8.45740.7650f9a6@gitrepo.freebsd.org> The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=8fe76a3c1240d2f8f759f9261ac15ec0cff76d32 commit 8fe76a3c1240d2f8f759f9261ac15ec0cff76d32 Author: Jose Luis Duran AuthorDate: 2026-05-03 05:31:51 +0000 Commit: Jose Luis Duran CommitDate: 2026-05-10 00:58:35 +0000 blacklistd: Fix RFC1918 typo This is a direct commit to the stable/14 branch, partially cherry picked from commit 5a6d9479ae2271a97dd23ceee8ad284770302874, as the stable/14 branch only has blacklistd. The address in the configuration file example was intended to be from the 192.168.0.0/16 range of IPv4 private addresses (RFC1918). Reported on mastodon.social at https://mastodon.social/@asmodai/116316630762241486. Fix submitted upstream by emaste@. Fixing locally first. Reported by: asmodai Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56773 --- usr.sbin/blacklistd/blacklistd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/blacklistd/blacklistd.conf b/usr.sbin/blacklistd/blacklistd.conf index b8dee6768cc7..35af9567df53 100644 --- a/usr.sbin/blacklistd/blacklistd.conf +++ b/usr.sbin/blacklistd/blacklistd.conf @@ -11,6 +11,6 @@ submission stream * * * 3 24h # adr/mask:port type proto owner name nfail disable [remote] -#129.168.0.0/16 * * * = * * +#192.168.0.0/16 * * * = * * #6161 = = = =/24 = = #* stream tcp * = = = From nobody Sun May 10 04:43:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCqx40yFLz6KZZ9 for ; Sun, 10 May 2026 04:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCqx36nFyz445g for ; Sun, 10 May 2026 04:43:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778388200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ky67kWNOAvyCsf5msQuNdJTUmfs4bUsybaFktx9+nzQ=; b=AjJC+vroisY3l3477D3VOw2ZUuPwDngwkkdAjgIzP9pWcm9lsYxZB1rWqcdHHgzNLYnEbQ iErriDf3qPyi/f4cBuPlisDIy+cTkbeuke4rKvX22RRX4LFJReHkO6W48TAAMw8cRcCklY R2hGXSQDHmUyiyJdh7/NBGAhedOjjFy7EFHsxn8G+vB5BRzBcryht35y46emcb375RO3r2 C45xfkHe2VtBVmjMQg+JK+Z17++QXBf9rTfDFP6nVtbS9BrHK3E0TEiwKDfPHR1LCIwbXB YPvEcDQVgSVjXQWfZpe/FHfo7Tm+DajquAS2SmDbVT9DE0LAK3CaOMHcHhoQ+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778388200; a=rsa-sha256; cv=none; b=KVM90p2eOXP0RlecPZ0LoX6IkhoOkL9AmFXgIzS4+vhhM7XLTTw+FosyeTdBfy9vK3/3y1 P+TSiqEzR5TYd6vVyfJpkplAWZqYn7siaiOKZ7exX+PNTNyyX/mVvUAHRhVUEEcTpQYkwY UerFJq25I3a/B0X306eyvdlhhxAV9PmC3gW1KiK7pa5VreisJi6kzArtD2R0sS67GJ7WVl ye53mHfJbY6XEkXECrDobZAMXEubekQVStKjWtd1F13mb7FnT5yDMNBI8PV8xlwodt3BCq Qu7Cm2LE5iW9OEpWzMWJ3ktEL/9p5X6A30fejyKDZZBAwWjneSgmrgxravcZKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778388200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ky67kWNOAvyCsf5msQuNdJTUmfs4bUsybaFktx9+nzQ=; b=c33AhkgqoZkobdetyqK45u6CC6m92v3NkY8BM1XbwfQe77ewmZ0KRl/nyDnJKdgT+si16/ /MfOBt6/mWWXm33t7HVb/OG37lCnzbsNh9v90ux1t079ITMwZbJq/0I+rnhHGS5KYhJl3Y YKZhVl3kKCiWiWAnmg5Tmwznbx6m16i67GtPkHoqc7kaOFASRyCK7qsVwHSeNi7rTgXbQm 4PaqHQobxn3wVJPj8WomQ5L7lPj3q6YsvO7cc+LDfpXJeXvxnbzKUNgDt1n2yHCe6/mmew 5s9q8uwrDP3exb17K0iGvULHK+ppIWNKoWzNlD5Gtyqz0gkL9PI10PJArA5Uhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCqx36Fc3zgC for ; Sun, 10 May 2026 04:43:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37700 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 04:43:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 0f6c880fcecd - main - stand/i386: quiet executable stack warning List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f6c880fcecdbb9cc84ed03ee85a518dd3c66f12 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 04:43:19 +0000 Message-Id: <6a000ce7.37700.78957453@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=0f6c880fcecdbb9cc84ed03ee85a518dd3c66f12 commit 0f6c880fcecdbb9cc84ed03ee85a518dd3c66f12 Author: Ryan Libby AuthorDate: 2026-05-10 04:25:43 +0000 Commit: Ryan Libby CommitDate: 2026-05-10 04:25:43 +0000 stand/i386: quiet executable stack warning Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D56908 --- stand/i386/boot2/sio.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stand/i386/boot2/sio.S b/stand/i386/boot2/sio.S index de554efb5b3e..5c4650dc0533 100644 --- a/stand/i386/boot2/sio.S +++ b/stand/i386/boot2/sio.S @@ -80,3 +80,5 @@ sio_ischar: movw $SIO_PRT+0x5,%dx # Line status register inb (%dx),%al # Received data andb $0x1,%al # ready? ret # To caller + + .section .note.GNU-stack,"",%progbits From nobody Sun May 10 04:43:18 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCqx80xwCz6KZG8 for ; Sun, 10 May 2026 04:43: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 4gCqx76PLQz44Pk for ; Sun, 10 May 2026 04:43:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778388203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qjeb960T8q6/tBNpk7e5HYTEeVRdK6TueiXifKnDVhI=; b=mWnLlsSxlkCwBKRYX626Wi+5Jyf5KcVUgprxFvN9liDYx80UYn2wrN6D2RZdovcIUH8XJp E2L2MfWLpu1SrmrSpbKu9KZDTMQhMrdnlDDwcfLdDweNEQ8BTlb0BPanb61abULbsrCq36 D+UTihIbUpNPogLNlRHG9pwjlzTbr20gQv3yIDhze4AOgH8vF1ile5SEjOmRV7BAHDFR/w 6bpt/owkDlb84YHRbVWMk5SAP6uZ8fYdntaAiwtEC9QqdRvcFQajO2bekz8DDYYNzBLSH8 qz5T00NuyfeGA/XUL7RwyggW7FESkByn/bXqxku2aUKsG8ijgB/qq3ElUOp4Iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778388203; a=rsa-sha256; cv=none; b=BgA7TjI+xvHbMrOiLXHvojRT1Tn3Ub+2mQAd8ISkkMJx33Gk1sB/bS5Qe/V542mJDv/KT3 gPdTYINj+xxnDRHtYu8MqAZpHc64CUEJpgNkRs1wugTDgQmX19mxTvJlXcvGYtWrX+IYoO Y/ZhnE86D+DunV5lneqfXl+u4NKzxZ4DmEO8x46hDBn68JXHqrCxGXPgdmO7B+GCl3W+uw 36mRi2eEj6N4un3X8OfSegLNTq21rZ2xmC69QkP388VIcUeE/DdpgnQx8WmZRJQQ9laEAy Ngfr3uFnN7UpHkpzDckTBf8j0zh44WQFV6hNT5PQzxShzB8xJOa2cWj2lDTzFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778388203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qjeb960T8q6/tBNpk7e5HYTEeVRdK6TueiXifKnDVhI=; b=y3cQOX4jo5vHQFZkMJrK+qC0Wx1UrTL+KI8ofhpRb7YPfHgPSt4jG7GC8dg3Ycp3+Ez3Yl rWKuEnQvsxiK2eO+XwtxtD2E4xK9lcDPw0ekgnOO0sgfjSchrcyJXkvvlAmiHX723TvAw6 wnwOHDYFMY37JUIIsczO/ACKk+cztRfzA0st0fNsTQl0mA4Xevs8PIr2jUe8TqOnxKgxXc amnEXJ8U+SBjuaHmq84lN/W8854DEM+n+MEUTGU048HVDeVu9mdTTNjOvey4Y7NpygWDBD b8qPWiBkdR16LX+moTkNMx0BMrU6jrSqlThxqd9X2GTjt2G+EsjpxfT9Cf48ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCqx75lR8z7D for ; Sun, 10 May 2026 04:43:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3679f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 04:43:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 58e5b4dbd959 - main - vfs_subr: mark uma zone and smr pointers __read_mostly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58e5b4dbd9594f9553cfe9df68a19a294e245ed7 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 04:43:18 +0000 Message-Id: <6a000ce6.3679f.32629671@gitrepo.freebsd.org> The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=58e5b4dbd9594f9553cfe9df68a19a294e245ed7 commit 58e5b4dbd9594f9553cfe9df68a19a294e245ed7 Author: Ryan Libby AuthorDate: 2026-05-10 04:25:12 +0000 Commit: Ryan Libby CommitDate: 2026-05-10 04:25:12 +0000 vfs_subr: mark uma zone and smr pointers __read_mostly Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D56892 --- sys/kern/vfs_subr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 823ccc6cab71..bba0f3575300 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -237,15 +237,15 @@ static struct mtx mntid_mtx; */ static struct mtx __exclusive_cache_line vnode_list_mtx; -static uma_zone_t buf_trie_zone; -static smr_t buf_trie_smr; +static __read_mostly uma_zone_t buf_trie_zone; +static __read_mostly smr_t buf_trie_smr; /* Zone for allocation of new vnodes - used exclusively by getnewvnode() */ -static uma_zone_t vnode_zone; -MALLOC_DEFINE(M_VNODEPOLL, "VN POLL", "vnode poll"); - +static __read_mostly uma_zone_t vnode_zone; __read_frequently smr_t vfs_smr; +MALLOC_DEFINE(M_VNODEPOLL, "VN POLL", "vnode poll"); + /* * The workitem queue. * From nobody Sun May 10 06:27:13 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCtDx3cq6z6bJjT for ; Sun, 10 May 2026 06:27: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 4gCtDx2vFfz4Gpp for ; Sun, 10 May 2026 06:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778394433; 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=UeZajD9qIeBLIQtYsQt2VDDVanOxeTYZOBiLtEKtdkc=; b=QW8eqVw5R7st+tq0iaIWUay6YRxP4ySDa+46+2naNbKkQ0wIgqFdRVwGYfJFlQ0lCbghUJ y/N+oSv/qjMe8j0NHj9qH5O8PHqQ5JQBT4s0h6TtwBLTt7PZyPV8/Hd3jmlS7v/AAXXojn y0wbdArEXWn6EtrNb5W4zZthbkyIPtCvRuCaf3NfYUitXJoyZQ/iBgq8Mf1sfHm9LZcjgL /yGflgnI4WQPGl+A9d9P+frlbVzjHk2UCwSW93cqdp0jLHyB6Mza4bHRZD0KmAteEa97dP XBc6r4qKoa7LmhW42LUhJKBrqTpHYldzWhF3WwfMexhT0xso5C/mTbaWhX21zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778394433; a=rsa-sha256; cv=none; b=ytzBJK/4bHaaDbd8GLc1GzYryCK2CSRA09MbFF/A6iTYKCHbkfVo63AOEwmSdLBSX4nmyo IirAbiQp421soyxTxnaJPdDtkfElRQsREOAQrNbfVWWuvNaKvPsi5n2e4QcTpaBSrNbnL5 OG5gPhwBYDIQk1LB/VnWpzUOmR5J96VfK/9W/4iCaRyzTNW8mugLij9JVhwINrdqSDBj2B 1ZRH4k4zwuwGRB6WtIGzLzlQgRy6VZPLhiiJoh5CZSXJI0lflxYfLWwx4g9y0NHPkowoaF 9Ef9o6PGRNfRL5iy04sN8j/q4Otx78fbyEhQJWzXrGNo1dLWoCdPF4fAuaBkFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778394433; 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=UeZajD9qIeBLIQtYsQt2VDDVanOxeTYZOBiLtEKtdkc=; b=WexyfUly2xOlUuORmPu4tzw2HLLdRN+4dC7e3k66rKaNuLhXv5Nk1095EOeT9KxUQzl+La Ej0Ai8FYOjsVdX0brBgHTUO8rjhjzvD7FBv5kqHvOrqCFxa4PD8KfLE434JhKDUdovrSp/ OUOcKvonyXiHLSsldWaQ3Mm7orYMqlbVPRkDfHiWaMF8y0XkpzcTnqWAXZ1lFvjEQuU9oZ Td4Txb2WO9qDvnbFMiuZE0Y/s5kibnonYNgal1xDTADkyAGEXJgfvE1o/2+TkfCM6VEORm wHs1JC9mODWAZpm9eC7SqoWOZCBRmJGj+owlxQXJZ0DvnB5rk7BmcJ+ivvh9kQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCtDx23Gfz2cJ for ; Sun, 10 May 2026 06:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18f40 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 06:27:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gleb Smirnoff From: Zhenlei Huang Subject: git: a08d321948ef - stable/14 - tests/carp: kill routed(8) before destroying interfaces List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a08d321948ef172160b0c88d828e8b4b36e96acb Auto-Submitted: auto-generated Date: Sun, 10 May 2026 06:27:13 +0000 Message-Id: <6a002541.18f40.241d5063@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a08d321948ef172160b0c88d828e8b4b36e96acb commit a08d321948ef172160b0c88d828e8b4b36e96acb Author: Gleb Smirnoff AuthorDate: 2025-10-15 18:44:54 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-10 06:25:55 +0000 tests/carp: kill routed(8) before destroying interfaces Otherwise routed logs a warning: "MCAST_LEAVE_GROUP ALLROUTERS: Can't assign requested address" that may be misinterpreted as a problem. (cherry picked from commit 8596810d02a1e361e0312d116339aa106aca4b19) (cherry picked from commit 89096d660ea8e3f4696abeb6745ffedf15e7aa89) --- tests/sys/netinet/carp.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh index e14bedb4f878..b861fcf47eab 100755 --- a/tests/sys/netinet/carp.sh +++ b/tests/sys/netinet/carp.sh @@ -168,6 +168,9 @@ unicast_v4_body() unicast_v4_cleanup() { + jexec carp_uni_v4_one killall routed + jexec carp_uni_v4_two killall routed + jexec carp_uni_v4_three killall routed vnet_cleanup } From nobody Sun May 10 06:27:14 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCtDy50y1z6bJCB for ; Sun, 10 May 2026 06:27: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 4gCtDy2Sd2z4Glt for ; Sun, 10 May 2026 06:27:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778394434; 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=lawnAhuym+zzGsWPb5qn2NkgCE4PKlqaETmR4SER2a4=; b=Z93ip6yZovJR599WVL4fWoSpgpCe3cp3uZwXEjrEdyFpvat0YRWNJH9pAEy+jR1UpGKqBY Ki1o4AzuO2wM5vuDWuDddiZ2Q5+OPv+IvSl1KBO5KizQ8V96YtI/nABZh4x7MdLVlbG80B ZphZ2ljv6/+EYMXdczUupOc54s3QHcVY4MoN0Ag1bYryYrUyVkM3XiEXYKf3or7BtwtkOl 2cFnbFHayB9S2M2RtG22m67C/pMPSKP9fERZPRcDMhskW4XvjmPNE4BBGKWRs6nZSAHcse YhXT6DDWga9l+7qJ8o3xlzNDe4NgpcpSIjCDJYeZDmeqs1qXtGBJ2bgZStYbPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778394434; a=rsa-sha256; cv=none; b=YK21APLsHE2v7IhjKJ0WN7JIzkSGwptpnXtUAtq8hz2wbg9LIcx6/+nawiv2Z7AMNO0rqY 6b5G9Mz7F/xeIhF7TigSauoRQnucSkXHMnlxR2V+nL4/mcbPsK7J/IoS18uuqC6S9twicJ UC89R1YwZVtS2S5PFvH9kwjc45mMVsBU/FQgiEQ1Bg6s7/eJGar09EqA7o7Yx+lTPXM6Az GmIl4fJ9gYSy59UZKlazz8rvQhdTp5MyQdJSmIMbYBdDTeu4/aOl9f/FaI97McdOGAySSR PTYvnu3xRnAXINOtBHWHgNuX2ZIwDYR2mulSd+Q5l0A528nQj5uQlHSG7F9jqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778394434; 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=lawnAhuym+zzGsWPb5qn2NkgCE4PKlqaETmR4SER2a4=; b=anQCMKeMEOavtN+rXSvRWRIOB8yeypvelBr+c+3LsLCpkv9ff+Z8pd/7e+a09rMHg3q5se x6YMePF//IwH76L9+qxInlB9BWJ9+Ik8wG6Moz1WpexqwF7ZVpbnvob2BpKs/aa0w9vYv/ 97Prls9VPd8JXA8vVPV6Hb8mkUuEkjSHnLRDJzgK90qCsgkEX0W8rYlD90Gs6m9eO3mxPS JtIL8tGN2lRtY1Cm4NEQj3KffFdC4z7RRNDw0tFs2ZdOcebowoe/14IXcbKd62lNldvgCD gjqSSJpYKVm0CUHBhb6sGyV7iEK7/WuhA4ZVcSv/Wj4ytdQuLn57zmVBz0VAIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCtDy1snxz3BX for ; Sun, 10 May 2026 06:27:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1859b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 06:27:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gleb Smirnoff From: Zhenlei Huang Subject: git: 19552d9749dd - stable/14 - tests/carp: make sleep interval in the wait loop smaller List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 19552d9749dd87f296a33ad96cb4f225799fb15d Auto-Submitted: auto-generated Date: Sun, 10 May 2026 06:27:14 +0000 Message-Id: <6a002542.1859b.200c7f0b@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=19552d9749dd87f296a33ad96cb4f225799fb15d commit 19552d9749dd87f296a33ad96cb4f225799fb15d Author: Gleb Smirnoff AuthorDate: 2025-12-04 18:40:34 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-10 06:25:56 +0000 tests/carp: make sleep interval in the wait loop smaller Makes tests to finish slightly faster. (cherry picked from commit e353cbffd600ae3c00c8584dddcabf9d0ae1202a) (cherry picked from commit 332485a473724c7532690be34ed1be06d9521448) --- tests/sys/netinet/carp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh index b861fcf47eab..4d58bcf03c12 100755 --- a/tests/sys/netinet/carp.sh +++ b/tests/sys/netinet/carp.sh @@ -43,7 +43,7 @@ wait_for_carp() while [ -z "$(is_master ${jail1} ${itf1})" ] && [ -z "$(is_master ${jail2} ${itf2})" ]; do - sleep 1 + sleep 0.1 done if [ -n "$(is_master ${jail1} ${itf1})" ] && From nobody Sun May 10 06:27:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCtF06cL2z6bJRy for ; Sun, 10 May 2026 06:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCtF049Pcz4Gq3 for ; Sun, 10 May 2026 06:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778394436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+xoqztOCwcD3roywFBU9x+onllk7KBYbDyjGWekCa4A=; b=Tf231Ulz21oGAy2U9TWuRvyvnm1ui8nHoF7HkMzek3bBRxtlXq71ScoSEHv/7LmkPsij6W 9cJEuP0hm7/IRUeLbkvVmz9e13sbQLV+nZrW8F9RvjcpY/xMW5a2YcUvuLO+CWMxdMm2yG ZyXQR8AmmMA6pECtqiIsa4QBA0nqbZVOvxznwwTH5yLoXFP+AULK08/+NSkAF5O2SUSYL3 l5Xm39XXqgh2UK6HJhH5fEb9sxv4fPxw8uwvxbsD+GmOqr4/fzB+DPvQIF9rjMkMpjeJzs 2mKlbDjlCdOgp3Oo9M7BKysZUtMbi42Fz6ir5fRnH5rzhQDZ2GmFhvN9VC997w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778394436; a=rsa-sha256; cv=none; b=mtFh+HJy/UmjcFjddEq0La+RSsfvfVC4l5TFxwbSwVaM+wKW0y3muM+gAsKw5ICkBZ8Iwp AWC7VZL06CZMerExv2y5Of/fCUt+V1ogZ9v/k3K+9avPINJAAo/e5aHkSthfYy1jbvu+Cf DoyFcpLXG+J/PAzuzsilER0CzJ7xGAuNtxNo8uypO/MxHOe0znTJW4gbHePKHtYd8lozh0 +PNYPLz0wSDbMRcnuOz/JlxlkCZIWJnW8t4ik9u2/ouKUD2RFItZkqEnp3uwF4CkYP9wDY MhCOm6L3WUbDiGqgnqdNuiiUmUrC9Mn3O0f0WRqFNh7VyX20rISG3F2Y2SEpLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778394436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+xoqztOCwcD3roywFBU9x+onllk7KBYbDyjGWekCa4A=; b=UWAOfcofvnVrWRt8DfscwbxQYSzN4f0UgHqFVDtNeREWglUXtkPeQL31dSi8LtdKoouzj1 ndrY6bPCWiw3jAnK6df0ii7CtVxw4mP256FNK4TqKGsmhLknCtN8UiPZwf92Uvg1c4OQSC 14p6VVxrgkwRkwqMQDSwwQI5f3l77lkFVtuWW2yah14Wua+BXSnAjcILgomlDIarw+FUn+ Ha4Zj+gPycQB9nZsDK9p/2Uox5P5X+fyi/Mcjhnyn5ym2PlqehTyYBjGI8LrntHo+KEH9I qNCKsQhUNSIiNUYgxo9dujiKWPzqQZ0SLpeClBl7eyBiG4PGds3D1mkVAMtdRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCtF039pbz3HQ for ; Sun, 10 May 2026 06:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1882a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 06:27:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: f956c425d4c6 - stable/14 - tests/carp: Rework unicast_v4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f956c425d4c6b93efefea357f34cd28a7d749db1 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 06:27:16 +0000 Message-Id: <6a002544.1882a.74f87f82@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f956c425d4c6b93efefea357f34cd28a7d749db1 commit f956c425d4c6b93efefea357f34cd28a7d749db1 Author: Zhenlei Huang AuthorDate: 2026-05-03 11:02:15 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-10 06:25:56 +0000 tests/carp: Rework unicast_v4 For unicast tests, it is sufficient to use wait_for_carp() to verify the setup is sane. Additional sanity checks are not necessarily required but can serve purpose for redundancy. For some unclear reason routed(8) is advertising route to carp BACKUP. That makes the test flaky. Also routed(8) is marked deprecated and may be removed from base in the future. Let's just add static route entry manually for additional sanity checks. Other noticeable changes: 1. Add atf_check to configuration steps to prevent potential failure on setup. That helps diagnosing on failure. 2. Shorten the names of jails to improve readability. 3. Prefer `[ifconfig|route|sysctl] -j` over `jexec [ifconfig|route|sysctl]` to make the lines shorter. MFC note: At the time writing, routed(8) does not know carp addresses and does not distinguish carp addresses in MASTER|BACKUP|INIT state, hence insists advertising the wrong addresses. PR: 294817 Reviewed by: glebius (previous version), pouria, markj Fixes: 93fbdef51a13 tests: carp: Update test case unicast_v4 to catch PR 284872 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56761 (cherry picked from commit 9137c66c2ea6cc09e3a6f8a042ecdc5a62e0f39e) (cherry picked from commit 107ef0c29503e5be2b81d22930ec0c675efba140) --- tests/sys/netinet/carp.sh | 80 ++++++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 36 deletions(-) diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh index 4fc682f14449..31a8aa57189d 100755 --- a/tests/sys/netinet/carp.sh +++ b/tests/sys/netinet/carp.sh @@ -121,58 +121,66 @@ unicast_v4_body() epair_one=$(vnet_mkepair) epair_two=$(vnet_mkepair) - vnet_mkjail carp_uni_v4_one ${epair_one}a ${epair_two}a - vnet_mkjail carp_uni_v4_two ${epair_one}b - vnet_mkjail carp_uni_v4_three ${epair_two}b + j="carp_uni_v4_" - jexec carp_uni_v4_one sysctl net.inet.ip.forwarding=1 - jexec carp_uni_v4_one ifconfig ${epair_one}a inet 198.51.100.1/25 - jexec carp_uni_v4_one ifconfig ${epair_two}a inet 198.51.100.129/25 + # The router + vnet_mkjail ${j}one ${epair_one}a ${epair_two}a + # The hosts + vnet_mkjail ${j}two ${epair_one}b + vnet_mkjail ${j}three ${epair_two}b - jexec carp_uni_v4_two sysctl net.inet.ip.forwarding=1 - jexec carp_uni_v4_two ifconfig ${epair_one}b 198.51.100.2/25 up - jexec carp_uni_v4_two route add 198.51.100.224 198.51.100.1 - # A peer address x.x.x.224 to catch PR 284872 - jexec carp_uni_v4_two ifconfig ${epair_one}b add vhid 1 \ - peer 198.51.100.224 192.0.2.1/32 + atf_check -o ignore sysctl -j ${j}one net.inet.ip.forwarding=1 + atf_check ifconfig -j ${j}one ${epair_one}a inet 198.51.100.1/25 + atf_check ifconfig -j ${j}one ${epair_two}a inet 198.51.100.129/25 - sleep 0.2 - jexec carp_uni_v4_three sysctl net.inet.ip.forwarding=1 - jexec carp_uni_v4_three ifconfig ${epair_two}b 198.51.100.224/25 up - jexec carp_uni_v4_three route add 198.51.100.2 198.51.100.129 - jexec carp_uni_v4_three ifconfig ${epair_two}b add vhid 1 \ - peer 198.51.100.2 192.0.2.1/32 + atf_check ifconfig -j ${j}two ${epair_one}b 198.51.100.2/25 up + atf_check -o ignore route -j ${j}two -n add default 198.51.100.1 + atf_check ifconfig -j ${j}three ${epair_two}b 198.51.100.224/25 up + atf_check -o ignore route -j ${j}three -n add default 198.51.100.129 + + sleep 0.1 # Sanity check - atf_check -s exit:0 -o ignore jexec carp_uni_v4_two \ + atf_check -o ignore jexec ${j}one \ + ping -c 1 198.51.100.2 + atf_check -o ignore jexec ${j}one \ + ping -c 1 198.51.100.224 + atf_check -o ignore jexec ${j}two \ ping -c 1 198.51.100.224 - wait_for_carp carp_uni_v4_two ${epair_one}b \ - carp_uni_v4_three ${epair_two}b + # A peer address x.x.x.224 to catch PR 284872 + atf_check ifconfig -j ${j}two ${epair_one}b add vhid 1 \ + peer 198.51.100.224 192.0.2.1/32 + sleep 0.2 + atf_check ifconfig -j ${j}three ${epair_two}b add vhid 1 \ + peer 198.51.100.2 192.0.2.1/32 - # Setup RIPv2 route daemon - jexec carp_uni_v4_two routed -s -Pripv2 - jexec carp_uni_v4_three routed -s -Pripv2 - jexec carp_uni_v4_one routed -Pripv2 + wait_for_carp ${j}two ${epair_one}b \ + ${j}three ${epair_two}b - # XXX Wait for route propagation - sleep 3 + if is_master ${j}two ${epair_one}b ; then + atf_check -o ignore \ + route -j ${j}one -n add 192.0.2.1 198.51.100.2 + fi - atf_check -s exit:0 -o ignore jexec carp_uni_v4_one \ - ping -c 3 192.0.2.1 + if is_master ${j}three ${epair_two}b ; then + atf_check -o ignore \ + route -j ${j}one -n add 192.0.2.1 198.51.100.224 + fi + + # Not necessarily required, but just in case + atf_check -o ignore jexec ${j}one \ + ping -c 1 192.0.2.1 # Check that we remain in unicast when tweaking settings - atf_check -s exit:0 -o ignore \ - jexec carp_uni_v4_two ifconfig ${epair_one}b vhid 1 advskew 2 - atf_check -s exit:0 -o match:"peer 198.51.100.224" \ - jexec carp_uni_v4_two ifconfig ${epair_one}b + atf_check -o ignore \ + ifconfig -j ${j}two ${epair_one}b vhid 1 advskew 2 + atf_check -o match:"peer 198.51.100.224" \ + ifconfig -j ${j}two ${epair_one}b } unicast_v4_cleanup() { - jexec carp_uni_v4_one killall routed - jexec carp_uni_v4_two killall routed - jexec carp_uni_v4_three killall routed vnet_cleanup } From nobody Sun May 10 06:27:15 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gCtF44dhrz6bJCH for ; Sun, 10 May 2026 06:27: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 4gCtF4354gz4GmW for ; Sun, 10 May 2026 06:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778394440; 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=scmeMR6u+ELrBOF2dajfIK1azZ2Q23ZzMohdUUUvQLs=; b=xzpYfMikuZH4DaFUtkO2j+xnU5ELON2h1Sldc2SH6K5aedlkC06//9hTxJD8p4iAZBbzL5 RtIsnOmZKrYm/8j7sp9hg6mk8hINEZoVz+NP7mHDjZPalToiiXLLtDYCSbqaitY5GmmI64 tmN0caqE5lY/QS+hUajYtyJj+6N3f5FyI/yZlyhy7ug8zjwrvVTKbysCrsdQ/k7VtcITpG rAPAmFXWFjKFoUqShBfeN6EVXzszkCA1Bc935c+pPRCMjnzZT3xjLJPO65P3UPpi0Y5zFz yu4N7APS8OmryWV1KoCVxu2tg2eKWppHEMOmkuq6tSPIq5i9N6W/PPqPRSprmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778394440; a=rsa-sha256; cv=none; b=XXhdLkPYqYSfM6b9YXs8v+lpqi4iulr+ShaxPE9U36smMX0z8QX9wufZqIs5LtUpN8QZa9 osUfY6DgqN/n8AG0TDwPF/nXtuZjhOX5wEN7c8FeMhnEPHqRb8GyR+GxvaeLuz7HRifcjj NxKfsvXXZgmHNQ4iJCH5VevOhispPioNVZ86+9ieB/HePbiqlaTl7/IDiYe+I9CKCRAPCa /hz59DBkjx2cvby3p4EPVWyDPbSP14nn90GXQFIyewyOUBRH+s1K4jN3LoZHrk7spGqtDL iCLiw09qKx8kOgT0aM0z4UtfU7jR2WE/rqalpcj+iR1lGfjeZJ+htGJGQsx7gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778394440; 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=scmeMR6u+ELrBOF2dajfIK1azZ2Q23ZzMohdUUUvQLs=; b=gle//DeXs5I5dqEFOLZLArd4JCioucZYKlREnn2JlfasVYchMPQWX9tkPnSzHzuaJgKLwj RMGRP0veHjv5Vdh84Jfy3OFbvDtjvPAxgIsdz5hGI/B35mHkk0EZISg+UssHzl5Dvh64r4 AuE7D3uX4ZsEHawKPL5fWs9boK6JdxlI5FGUw3ZC48Tz0t7IITIUykS70W6tQaPOlCEc6c l+ckKzbjwYbI/MR9/fM7InJde0sqqd+r4k6GZHrORNH1zKAALi4eRRlXwk84V2voupKxBf k6wce5RvjRqo31d2WU5bDx4yRufV48hBFMpXg8EEGwiQbOAe1vyxvSHLvzK/og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCtF42WhTz3F7 for ; Sun, 10 May 2026 06:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18dbe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 06:27:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gleb Smirnoff From: Zhenlei Huang Subject: git: 1f8eae9a7a45 - stable/14 - tests/carp: make a 0.2 second pause before configuring second jail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1f8eae9a7a45f3e816b112ae3e7cf19ece1a5b98 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 06:27:15 +0000 Message-Id: <6a002543.18dbe.1ef88af1@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1f8eae9a7a45f3e816b112ae3e7cf19ece1a5b98 commit 1f8eae9a7a45f3e816b112ae3e7cf19ece1a5b98 Author: Gleb Smirnoff AuthorDate: 2025-12-04 18:41:19 +0000 Commit: Zhenlei Huang CommitDate: 2026-05-10 06:25:56 +0000 tests/carp: make a 0.2 second pause before configuring second jail for all scenarios where both jails have same priority/advskew. There is a tiny chance that on both sides carp_master_down() will be executed in parallel and advertisements will also fly through the bridge(4) in parallel, thus both sides will switch to MASTER before receiving the announcement from peer. This makes the test to fail. So far this flakyness was observed for carp:vrrp_v4 only, but in theory it is possible for any of the patched scenarios. Note that this sleep does not prolong execution of the tests, as the first jail is already configured, and if we slept before configuring the second, we would sleep less in wait_for_carp(). (cherry picked from commit 27ff90cd3d8d2ac8198f30cbebeefb15a49d41bc) (cherry picked from commit ad2fff6d6a4d74b6bb9008e447eafc567e8660e0) --- tests/sys/netinet/carp.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh index 4d58bcf03c12..4fc682f14449 100755 --- a/tests/sys/netinet/carp.sh +++ b/tests/sys/netinet/carp.sh @@ -90,6 +90,7 @@ basic_v4_body() jexec carp_basic_v4_two ifconfig ${epair_one}b 192.0.2.202/29 up jexec carp_basic_v4_two ifconfig ${epair_one}b add vhid 1 192.0.2.1/29 + sleep 0.2 jexec carp_basic_v4_three ifconfig ${epair_two}b 192.0.2.203/29 up jexec carp_basic_v4_three ifconfig ${epair_two}b add vhid 1 \ 192.0.2.1/29 @@ -135,6 +136,7 @@ unicast_v4_body() jexec carp_uni_v4_two ifconfig ${epair_one}b add vhid 1 \ peer 198.51.100.224 192.0.2.1/32 + sleep 0.2 jexec carp_uni_v4_three sysctl net.inet.ip.forwarding=1 jexec carp_uni_v4_three ifconfig ${epair_two}b 198.51.100.224/25 up jexec carp_uni_v4_three route add 198.51.100.2 198.51.100.129 @@ -206,6 +208,7 @@ basic_v6_body() jexec carp_basic_v6_two ifconfig ${epair_one}b inet6 add vhid 1 \ 2001:db8::0:1/64 + sleep 0.2 jexec carp_basic_v6_three ifconfig ${epair_two}b inet6 2001:db8::1:3/64 up no_dad jexec carp_basic_v6_three ifconfig ${epair_two}b inet6 add vhid 1 \ 2001:db8::0:1/64 @@ -261,6 +264,7 @@ unicast_v6_body() peer6 2001:db8:2::2 \ 2001:db8::0:1/64 + sleep 0.2 jexec carp_uni_v6_three ifconfig ${epair_two}b inet6 2001:db8:2::2/64 \ no_dad up jexec carp_uni_v6_three route -6 add default 2001:db8:2::1 @@ -326,6 +330,7 @@ unicast_ll_v6_body() jexec ${j}_two ifconfig ${epair_one}b inet6 add vhid 1 \ peer6 ${ll_two} \ 2001:db8::0:1/64 + sleep 0.2 jexec ${j}_three ifconfig ${epair_two}b inet6 add vhid 1 \ peer6 ${ll_one} \ 2001:db8::0:1/64 From nobody Sun May 10 14:54:43 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gD5VW29Hlz6cxR4 for ; Sun, 10 May 2026 14:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD5VW1PTMz3sm7 for ; Sun, 10 May 2026 14:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778424883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5mYKT94xkutQFS21vXToTAroJfEuqCIl+eI6d4RpWdc=; b=TW+0vfYDs0qbdh2P6jsxOf4elIcltcNe8DPTcmcke+qHkAhoTYLcU5n90RrK3UyLcJkazd 5yZFLAGP+qJssnZn/sRHfv+enlC1g938oPltrifnr00Oz0rLLYe7MQ3crQWDHOjaIP4yCN Z29JejRBf/8Xh+aiuWMVDLmaHs5Z+9x5pYydtic22pfX1KhTiPffZq7TzZINZdwnrJBPnG OES7jg4X6J1wj8ASuk5LeIZn3Dux6+Nxwwra4eBt9uNSP10xcOM36D8tMJSPwRGMRXhLbM uQDR9xTDw4f6dCdOtyQIXB/P6zCD8sUSf2dKJL5Gsm1ebeeAjNyQpRKoDDewvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778424883; a=rsa-sha256; cv=none; b=cYKzxFEdgi5wP9fbaVwqz2WyXSWtp+7FtKTnqqwvxMqzOH4uvzTTl4f3yUXFL2jkE4ue9t TYdgmH0F2JDF3XLbGUv/hc1DdVpOSej4Kl/kNgRV+5FxgwC9gqhOI3XLgYn2qQicsZktF6 VCjvW0uAsvVwtTXSNIjF8KyQXqtuzQKV6x81neRJAJ0t9nT4Myt8kcV3gX23UYG8aMy0+6 FcGEnmLlDalTyugxmM4pz+eCc3A+8jb6Mtsp7KmeYMWUbnxDkLjXjayTkDPw3rEcPhyAFl 182aSq7Dh9p+Bwe0BqDfecNtKZHkV7eU+x5BDBdF1/JuXUf4VPXRQsGJ/nbJcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778424883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5mYKT94xkutQFS21vXToTAroJfEuqCIl+eI6d4RpWdc=; b=bDLinIUg3CQKKpXGcUGOGd55qiHLQ4LfPXRayHtW6YyJ3nSAKfChaiXLpTp1894uRd/9kV vdnvCZP5k2R2aUFgRPUs/H7Br61kDNiWIjNzsMgYv4xBD3ebzrb/ha7iqaTLvLFqL6x4Lm McgM4t7eATHWDCvlZFAJpQskUL1+r1aI6Tp0y86NmErZ0a2OfP7zgKLiJ8xodUjYD0+mGY uBZCfgj1skh9ESxP01Z6P2PphgFGcR/xfFgrgZVhgGNgOOLar7/Nvz0q2nrJrtzMybiSbK PTMJwXW5J59ychLUTpTO1DJXpdBcTU/SUKfMvEtvR+GLx08axC+Gn4fwpe19Wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD5VW1130zbHm for ; Sun, 10 May 2026 14:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25866 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 14:54:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 428da7d65b1c - main - Add O_SYMLINK emulation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 428da7d65b1c41c81a8786f66c1ce2f4242ac8bb Auto-Submitted: auto-generated Date: Sun, 10 May 2026 14:54:43 +0000 Message-Id: <6a009c33.25866.2ce3165b@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=428da7d65b1c41c81a8786f66c1ce2f4242ac8bb commit 428da7d65b1c41c81a8786f66c1ce2f4242ac8bb Author: Konstantin Belousov AuthorDate: 2026-04-20 20:02:13 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 14:53:20 +0000 Add O_SYMLINK emulation for MacOSX partial compatibility, defined as O_PATH | O_NOFOLLOW. fstat(2) and freadlink(3) works on the resulting file descriptors, but reads on the regular file do not. More complete but more hackish version was developed but deemed too hackish. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D56365 --- sys/sys/fcntl.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h index 0b13241f0ee3..80cbca4ea753 100644 --- a/sys/sys/fcntl.h +++ b/sys/sys/fcntl.h @@ -142,6 +142,13 @@ typedef __pid_t pid_t; #define O_EMPTY_PATH 0x02000000 #define O_NAMEDATTR 0x04000000 /* NFSv4 named attributes */ #define O_XATTR O_NAMEDATTR /* Solaris compatibility */ + +/* + * Emulate MacOSX compatibility flag without consuming a flags bit. + * It is not fully correct since reads over regular files opened with + * this definition fail. + */ +#define O_SYMLINK (O_PATH | O_NOFOLLOW) #endif #if __POSIX_VISIBLE >= 202405 From nobody Sun May 10 14:54:42 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gD5Vb4Bb9z6cxR9 for ; Sun, 10 May 2026 14:54:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD5Vb38qdz3syj for ; Sun, 10 May 2026 14:54:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778424887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QLFAsQ1+NzctI7RKZgTXJL9rutWkrN5XG8J1CyRuP6w=; b=OwtQ6XB+7Mgs87LI24P34ociJNOUyFbtZIrTusRArjAV2SjZz3BI7CIDWDWmbo4gnO7JuV lQPwsjQmmDPrt6ZQDIk8CXrUc3CRVZcIZozA5UN0qpdk+CxXD3Vu9LHmFgOK5X94tFVz0O Rxi+ATJkYJG3Ln0UNQPDxiCXOCjKGnLPpWqLrI54bdfGES+mScngZsnLqSOUNlNmfFFygP Jc8AuGH5du+jO9t1A5fcR1cCrsOC9ZkfFeDADErwsoixgzhCxXd7crV5fN4g32oZjRsON8 Y9qYvHyZMBKjtOExjHa21nTKwc51uXz/VNBVtzE1boc1FNPccCDfTey1v5VPXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778424887; a=rsa-sha256; cv=none; b=q0TVW9mDow72HJ5AnWzcncCOlVyxgGyQsGD8WNhaciyz+nvH1p6iCrDlSCKhBvtMg2UG4l MzPFVP1u4OC4ZLlTJSDQ+wYtAeqvuIIr1d+i+XXC2RecAUR3KlIUkC4agIGO8wwKY5KoZm zzN7+UFy+3tgQPrU8JtrvUn9rFumQpY820w2FWBX1TBOU/h3Db5geDLW+w9vLosfRF7O1R xY+IIL08sxNr1q493pXkUbSp/KtbFOXx1rWwb8xpC0Zmnl4qFXbzhBIO8fyhWc1oI50C1b lMiQ2DxtoYfHUCTkPGs3TzgXKSTaflSeBgXMpUBXRweW5xYSkApJPEAPz6ZLEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778424887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QLFAsQ1+NzctI7RKZgTXJL9rutWkrN5XG8J1CyRuP6w=; b=u2PxdBz3sTwGCnKpUMOtBFX0Ldp4rO8zpz05L0dKX31RfMcvp1uT/DFrhgm7dgGqW3YcoI HxjYZJVXajlrgxRX/ND2xgjk2v19ymfzfVQmY2GWvecwWQEbnf7slkCmZBHL8cl0Ax2B6P IIKAexHC5O3K/TFatOSIzh2T7pJwuJ79mduif5sLtmFURZ8uBZyMQTgrxRFNromZ0+OF+1 uWPwhqj5GoT9M5MiGolsWjgDjVkF8ygu0uakKqduf7RbJ2yWlsGam2C8DoFtsgL7J2AtcF cu/KCO9jDrvDxSF+2mk1Qp46NR4aR802NYtowtG3Yv6ztlJXunC+khuqtd6hgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD5Vb2SWRzZsd for ; Sun, 10 May 2026 14:54:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2719a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 14:54:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: a2e0822543e9 - main - libc: add freadlink(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2e0822543e93a8d815acd2d1c3d51ef73d6e262 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 14:54:42 +0000 Message-Id: <6a009c32.2719a.14640cae@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a2e0822543e93a8d815acd2d1c3d51ef73d6e262 commit a2e0822543e93a8d815acd2d1c3d51ef73d6e262 Author: Konstantin Belousov AuthorDate: 2026-04-12 08:56:26 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 14:53:20 +0000 libc: add freadlink(3) Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56365 --- include/unistd.h | 1 + lib/libc/gen/Makefile.inc | 1 + lib/libc/gen/Symbol.map | 1 + lib/libc/gen/freadlink.c | 16 ++++++++++++++++ 4 files changed, 19 insertions(+) diff --git a/include/unistd.h b/include/unistd.h index 797eac4c364d..290bcce6a0b3 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -518,6 +518,7 @@ int execvpe(const char *, char * const *, char * const *); int feature_present(const char *); int fchroot(int); char *fflagstostr(u_long); +ssize_t freadlink(int fd, char *buf, size_t bufsize); int getdomainname(char *, int); int getentropy(void *, size_t); int getgrouplist(const char *, gid_t, gid_t *, int *); diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index c31f789fd1d1..18a68902f50a 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -56,6 +56,7 @@ SRCS+= \ fmtmsg.c \ fnmatch.c \ fpclassify.c \ + freadlink.c \ frexp.c \ fstab.c \ ftok.c \ diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index 60f34b3a1923..4d22251f7ec5 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -475,6 +475,7 @@ FBSD_1.8 { }; FBSD_1.9 { + freadlink; posix_spawn_file_actions_addchdir; posix_spawn_file_actions_addfchdir; posix_spawnattr_getexecfd_np; diff --git a/lib/libc/gen/freadlink.c b/lib/libc/gen/freadlink.c new file mode 100644 index 000000000000..e1ed7aba6c06 --- /dev/null +++ b/lib/libc/gen/freadlink.c @@ -0,0 +1,16 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright 2026 The FreeBSD Foundation + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + */ + +#include + +ssize_t +freadlink(int fd, char *buf, size_t bufsize) +{ + return (readlinkat(fd, "", buf, bufsize)); +} From nobody Sun May 10 15:56:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gD6sl6fgNz6d2dZ for ; Sun, 10 May 2026 15:56: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 4gD6sl5v0Rz44bs for ; Sun, 10 May 2026 15:56:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778428587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+obgy3UMByLjqGUKgB/USYEigFT7InwUqad12XKsCyo=; b=MKEoy4hm9SNhEcylJty0cmMgX6jXkkqDqTtys6ova14lNT8MRXs0+MhaJCL+TUNecvU0mw ZvTg3/MNMSvuJdkExtLmKp2rYipornWVhXFSRuE/d3FXXgFhJEFH4wDC5FeS2c2oWiRkbO 6X8F2NHbgVfw/zhPM3u8GlXA1teFfFvREWY3479VV37yVu5TGIYLVSx84XWvWu0JsDqKLS HuJ3Q3a9I6CTHVhWuDLkCC3DwPxeD03Cqndgf4R3+JREcYdhjFg9A2oagHFo03VQtt24LB uFWfXJPL04OBbx0aNP5Xzwqql07CosCT+eC2fl0iQZHk3cRZEzg6o5cNGQwfJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778428587; a=rsa-sha256; cv=none; b=rDWriK8phGmbyKsUS+V1eVK7yvpFBZLBQJIhzB08m5N/yPivX85Oz0Q4YAN2ySTltMHqbs O7+fqxOZU6cWizwwA990UHYeUzS9nVapGUkqXlBdNXSwan4M4Izg4v/Pqo45CMEotcaxtH i2v+e4dTWvqs4T9BBFwvkES0MoyJL5+wa7QgJgGSrD9eK2BbwL7CC8Vq9O4v4tY9lAVDtH hJeaRgoRcUearZDVxJp0sbadtQch/RejJcKi/GlmY/a5wQi/FMfCctvlhSL9zbh+0VXhhS B/14M1Ak3+AoOBCsQJjRsCmYpFKftkPjcnO2zHMNgdZ7zLODHyjUY/sxR0UASw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778428587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+obgy3UMByLjqGUKgB/USYEigFT7InwUqad12XKsCyo=; b=vh0pWfjjoTU2SDOlITWBR2wqbNRCMidlL+k0+rw7Qhyy20JDEVANU6wYEfaio30SfvajA5 zSoX/QYUq8DaEsR5o0iHMByJkSiS0ukJYGXUc6MkbjDbeKFt2exo+ZE44btOzQVJmaJ/SG lQOJMI5ZxzHz1hUPGXs5OIPOGSsK+ZPyk+oWgY01FQI3mep4UYAg3i68GNY8gWYLJ7jqWN CDZP3/xAuqK5fb5/xppDrChSzu+gQpwCWF4uMt6jP4VqR9QTkb+HWzVIKYGtwCfPCyJFfv XXL0hqZl7vzSzEXbGXOqGT8D+11k5iShadVUQbsV1/10VvxLPM9223T4LvS8kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD6sl5T8TzcqQ for ; Sun, 10 May 2026 15:56:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36915 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 15:56:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: a49b3b10aae2 - main - nuageinit: add addsudo tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a49b3b10aae2db1f4a4ecf310fdedc80eb6bb7e2 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 15:56:27 +0000 Message-Id: <6a00aaab.36915.3ae93688@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=a49b3b10aae2db1f4a4ecf310fdedc80eb6bb7e2 commit a49b3b10aae2db1f4a4ecf310fdedc80eb6bb7e2 Author: Baptiste Daroussin AuthorDate: 2026-05-10 15:54:47 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-10 15:54:47 +0000 nuageinit: add addsudo tests --- libexec/nuageinit/tests/Makefile | 1 + libexec/nuageinit/tests/addsudo.lua | 61 +++++++++++++++++++++++++++++++++++++ libexec/nuageinit/tests/nuage.sh | 7 +++++ 3 files changed, 69 insertions(+) diff --git a/libexec/nuageinit/tests/Makefile b/libexec/nuageinit/tests/Makefile index feca49784c9e..d13ad14f1d8f 100644 --- a/libexec/nuageinit/tests/Makefile +++ b/libexec/nuageinit/tests/Makefile @@ -19,5 +19,6 @@ ${PACKAGE}FILES+= settimezone.lua ${PACKAGE}FILES+= warn.lua ${PACKAGE}FILES+= addfile.lua ${PACKAGE}FILES+= decode_base64.lua +${PACKAGE}FILES+= addsudo.lua .include diff --git a/libexec/nuageinit/tests/addsudo.lua b/libexec/nuageinit/tests/addsudo.lua new file mode 100644 index 000000000000..7fc5865d83f4 --- /dev/null +++ b/libexec/nuageinit/tests/addsudo.lua @@ -0,0 +1,61 @@ +#!/usr/libexec/flua +--- +-- SPDX-License-Identifier: BSD-2-Clause +-- +-- Copyright (c) 2026 Baptiste Daroussin + +local n = require("nuage") + +local root = os.getenv("NUAGE_FAKE_ROOTDIR") +if not root then + root = "" +end + +local function get_localbase() + local f = io.popen("sysctl -in user.localbase 2> /dev/null") + local lb = f:read("*l") + f:close() + if lb == nil or lb:len() == 0 then + lb = "/usr/local" + end + return lb +end + +local function read_sudoers() + local path = root .. get_localbase() .. "/etc/sudoers.d/90-nuageinit-users" + local f = io.open(path, "r") + if not f then + return nil + end + local content = f:read("*a") + f:close() + return content +end + +-- test with a single string rule +n.addsudo({ name = "testuser", sudo = "ALL=(ALL) NOPASSWD:ALL" }) +local content = read_sudoers() +if not content then + n.err("sudoers file not created") +end +if content ~= "testuser ALL=(ALL) NOPASSWD:ALL\n" then + n.err("unexpected sudoers content for string rule: '" .. content .. "'") +end + +-- remove file for next test +os.remove(root .. get_localbase() .. "/etc/sudoers.d/90-nuageinit-users") + +-- test with a table of rules +n.addsudo({ + name = "testuser", + sudo = { "ALL=(ALL) NOPASSWD:/usr/sbin/pw", "ALL=(ALL) ALL" } +}) +content = read_sudoers() +if not content then + n.err("sudoers file not created for table") +end +if content ~= "testuser ALL=(ALL) NOPASSWD:/usr/sbin/pw\ntestuser ALL=(ALL) ALL\n" then + n.err("unexpected sudoers content for table: '" .. content .. "'") +end + +os.exit(0) diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 1c8d717a5b67..9e3442281c15 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -15,6 +15,7 @@ atf_test_case adduser_passwd atf_test_case addgroup atf_test_case addfile atf_test_case decode_base64 +atf_test_case addsudo settimezone_body() { @@ -97,6 +98,11 @@ decode_base64_body() atf_check /usr/libexec/flua $(atf_get_srcdir)/decode_base64.lua } +addsudo_body() +{ + atf_check /usr/libexec/flua $(atf_get_srcdir)/addsudo.lua +} + atf_init_test_cases() { atf_add_test_case sethostname @@ -106,4 +112,5 @@ atf_init_test_cases() atf_add_test_case addgroup atf_add_test_case addfile atf_add_test_case decode_base64 + atf_add_test_case addsudo } From nobody Sun May 10 15:56:28 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gD6sn4ZY8z6d2df for ; Sun, 10 May 2026 15:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD6sn0MfTz44dn for ; Sun, 10 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=1778428589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t1mlQB0ptcVJDPD+czd6Ho0sZ4gxCAnIs7cXYrqH1pw=; b=qJERSlTP0wztW2pulHNFwpRiw8FkJxlu9fm67h0QLLZ/8WY4k/vWjE3XZZiHAq3HvoIWbV 2HMnm0IV8qOWbTVZVQzrpfv9GnC2TTgtnssrE64urfxm0LvTmFzu7vSJM67XsHvlPkKU8t 3V+GaBMARwKStGjYS3xZWpZmCoPqVyGU4C8jhqZumxDj/4YcRkEljZ+Jh9fJ4wku1wfbtD omee8SuxTYOfWc/NXm15O1qTqLWJCfApMHCd5m3BO5DWzUp5mvK6QjZk4NGcs/LsdzseWO p2RPw6ER10bCzCTKcqiwQGP0ZiZCNRi/A3IZcZproHNlbD9K5uFSxWGG6/VdBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778428589; a=rsa-sha256; cv=none; b=boxmFNwvsz/Gulyo82hNzIc3ognhcjWJQC2gMPNITsus58sGL5Hw2hXrHxMqG+A+SIaUxQ 9nYmv6ISks095XPx2qUk/9vBRMZ7VxfgnaJsG/CzbQ2rQL6Hr4lKOhhFCUaV2cqzIr7oK9 lekuDyP5AutIaEd6gKUYD0+1EQ1yVKhbGpnEwBrEUhF04I5nY2Ll8Wgs5LM3Viww7+bOV1 fwX8R13DYNKx6Uhxi1xvMY2lIFW049qnXfGWYKlDCfVlz8voYFmiHtRtB9RKF55c4rzf/g 1r8KeQ7f/BC9g9qaOXzg98nGHf93IKL+OpouI88OadAR4c35rTy2ojlniYIXBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778428589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t1mlQB0ptcVJDPD+czd6Ho0sZ4gxCAnIs7cXYrqH1pw=; b=Il9zJXLESmmsI9IDE6zisRJx+pBD4cHRbB/1ex1hjMpbca+COs4fC1zDYOoOMDnqADTXpt xGTt+JvD13TsNcMjUkQlsqSkNHACH9DG9YBjkf/iukDW6GAtLSN+KgMo/vMCLiaMyd9aiX VNywt+rgTcfcaht8S97vCElIbDPLaZSXqLZ0RCOQ/FKzSF940G56YH20XlwZNeENzkfjRY hVpx495PZS6UkEH3/uYE9DHK6qUndCt4EtZho/DndtZ4GFRdh13aRMBAZp0NLScj/Yx2N6 IvwW3AZF/fJyi/izUsmWfibbmFgdZNv+R7rEPNoVVUIGQRZCizctiu72He55Eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD6sm5xVXzcqR for ; Sun, 10 May 2026 15:56:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36919 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 15:56:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 0f92bee2b3e0 - main - nuageinit: add adddoas tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f92bee2b3e08ffa34720a2eeffbce01af3f19f9 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 15:56:28 +0000 Message-Id: <6a00aaac.36919.48a21cc3@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0f92bee2b3e08ffa34720a2eeffbce01af3f19f9 commit 0f92bee2b3e08ffa34720a2eeffbce01af3f19f9 Author: Baptiste Daroussin AuthorDate: 2026-05-10 15:54:48 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-10 15:54:48 +0000 nuageinit: add adddoas tests --- libexec/nuageinit/tests/Makefile | 1 + libexec/nuageinit/tests/adddoas.lua | 64 +++++++++++++++++++++++++++++++++++++ libexec/nuageinit/tests/nuage.sh | 7 ++++ 3 files changed, 72 insertions(+) diff --git a/libexec/nuageinit/tests/Makefile b/libexec/nuageinit/tests/Makefile index d13ad14f1d8f..4c99f8e31ce3 100644 --- a/libexec/nuageinit/tests/Makefile +++ b/libexec/nuageinit/tests/Makefile @@ -20,5 +20,6 @@ ${PACKAGE}FILES+= warn.lua ${PACKAGE}FILES+= addfile.lua ${PACKAGE}FILES+= decode_base64.lua ${PACKAGE}FILES+= addsudo.lua +${PACKAGE}FILES+= adddoas.lua .include diff --git a/libexec/nuageinit/tests/adddoas.lua b/libexec/nuageinit/tests/adddoas.lua new file mode 100644 index 000000000000..d4bab41ecc3d --- /dev/null +++ b/libexec/nuageinit/tests/adddoas.lua @@ -0,0 +1,64 @@ +#!/usr/libexec/flua +--- +-- SPDX-License-Identifier: BSD-2-Clause +-- +-- Copyright (c) 2026 Baptiste Daroussin + +local n = require("nuage") + +local root = os.getenv("NUAGE_FAKE_ROOTDIR") +if not root then + root = "" +end + +local function get_localbase() + local f = io.popen("sysctl -in user.localbase 2> /dev/null") + local lb = f:read("*l") + f:close() + if lb == nil or lb:len() == 0 then + lb = "/usr/local" + end + return lb +end + +local function read_doasconf() + local path = root .. get_localbase() .. "/etc/doas.conf" + local f = io.open(path, "r") + if not f then + return nil + end + local content = f:read("*a") + f:close() + return content +end + +-- test with a single string rule with %u substitution +n.adddoas({ name = "testuser", doas = "permit persist %u as root" }) +local content = read_doasconf() +if not content then + n.err("doas.conf not created") +end +if content ~= "permit persist testuser as root\n" then + n.err("unexpected doas.conf content with %u: '" .. content .. "'") +end + +-- remove file for next test +os.remove(root .. get_localbase() .. "/etc/doas.conf") + +-- test with a table of rules +n.adddoas({ + name = "testuser", + doas = { + "deny %u as foobar", + "permit persist %u as root cmd whoami" + } +}) +content = read_doasconf() +if not content then + n.err("doas.conf not created for table") +end +if content ~= "deny testuser as foobar\npermit persist testuser as root cmd whoami\n" then + n.err("unexpected doas.conf content for table: '" .. content .. "'") +end + +os.exit(0) diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 9e3442281c15..01c4612eb8ec 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -16,6 +16,7 @@ atf_test_case addgroup atf_test_case addfile atf_test_case decode_base64 atf_test_case addsudo +atf_test_case adddoas settimezone_body() { @@ -103,6 +104,11 @@ addsudo_body() atf_check /usr/libexec/flua $(atf_get_srcdir)/addsudo.lua } +adddoas_body() +{ + atf_check /usr/libexec/flua $(atf_get_srcdir)/adddoas.lua +} + atf_init_test_cases() { atf_add_test_case sethostname @@ -113,4 +119,5 @@ atf_init_test_cases() atf_add_test_case addfile atf_add_test_case decode_base64 atf_add_test_case addsudo + atf_add_test_case adddoas } From nobody Sun May 10 15:56:29 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gD6sp2BDRz6d2dg for ; Sun, 10 May 2026 15:56:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD6sp0JJQz44NH for ; Sun, 10 May 2026 15:56:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778428590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5JpvIQ8op4qrqR8dOs2qFCCOyxOmmq3JToiz9mYnvUI=; b=ngYCXNxbo5Q/ILoaOAzTM3pRnjoql/DQMXpNZ21WFE6Dv63x4P5ugWmdhR4W/CT5GfmyjZ vct9Nxmuus6b1BTMZTE/Yz2mM5OZixN6jdpoXrWid/6vBMZNjzGuRhGfGdCbDCZ5Wb6j05 vNQOiadjv1U5xBKhOBJGRU/YKINyz922sghAUw2VKlLAxY/x4S6FfF9WkNXoo8g3pSGRcT jAasvJL2ytHamp5HVWmzQPaxLyWWoQj7g26X9KUpYOGBIm7YMnQ6syaV4PmuOFCdNRj+NM W4mWaRDmWCBMwNiMd+gijJqO9OgSMLp/gc6UUqhnVhLItGtvkucg+RJGzSmfLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778428590; a=rsa-sha256; cv=none; b=ID5+XLo0Uh5XWN9ndKjg7J6/o9AoMoe7lxcZV4tXhkw++frDUdxyI2Ap5LkU6OxPE40MxC 778Y5JqR6nSOvexpr1JTq+/QKywpIlSoUDdEL5Ix7FoRIyqtTUdVGxHEQwVyM2FGlCx3OB TF6dOB1QpPy1ujwC4K+fGarBmZFoP8XE9cAXtFoPCMldBfe/Kwkr4cQ1JZ+fSDUWXSDmMW e7/3H8UEVW/tckK9ev+zwL8IA1nPVnjwwfnze5TRFumfLPmwCgXRu8ttg8k/WYU0L9zPZs 2xB3FQ7bS/foZfA7MdY6UxtgEGzKmjwOwhTggjrnzPYovUnFreIYreFsol72OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778428590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5JpvIQ8op4qrqR8dOs2qFCCOyxOmmq3JToiz9mYnvUI=; b=cxC4GTwLpo+ctwEHr0hCLuk4rGg6VH3MTc4CSS5n0A1D2+jI6nOs0K7cs6RVX7q0TIAcoH brs62CNEIkVV/UOExHaItETS52i38xGTGSsb35dfqHTc77gXpoefaKYDfY/GqVg7XZ3FuZ ID3Xy1P3FsLmQKwifQLqV/XYxPiXz0HF7YPlNgj71ON0XdQM/Cf3N985kVrDTX1YIGvHK4 U9Ejk2DNPu3vMt2rZZImLy6QuTGg1SprjQ2L/S+V4Zl0Tl72B8kpB5vWTQzP6RK+cqVBb3 actrTKKuS6oFNcUrLzCuPrIj+N9J2uPO8xijSjdUFdC9mZVg96Cei/WIUhE9Pw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD6sn6w7NzchS for ; Sun, 10 May 2026 15:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36389 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 15:56:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 8b03193289e8 - main - nuageinit: add update_sshd_config tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b03193289e87fd243acc50c5128c80459792667 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 15:56:29 +0000 Message-Id: <6a00aaad.36389.7cda12d1@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8b03193289e87fd243acc50c5128c80459792667 commit 8b03193289e87fd243acc50c5128c80459792667 Author: Baptiste Daroussin AuthorDate: 2026-05-10 15:54:48 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-10 15:54:48 +0000 nuageinit: add update_sshd_config tests --- libexec/nuageinit/tests/Makefile | 1 + libexec/nuageinit/tests/nuage.sh | 8 +++ libexec/nuageinit/tests/update_sshd_config.lua | 73 ++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/libexec/nuageinit/tests/Makefile b/libexec/nuageinit/tests/Makefile index 4c99f8e31ce3..fc7765268660 100644 --- a/libexec/nuageinit/tests/Makefile +++ b/libexec/nuageinit/tests/Makefile @@ -21,5 +21,6 @@ ${PACKAGE}FILES+= addfile.lua ${PACKAGE}FILES+= decode_base64.lua ${PACKAGE}FILES+= addsudo.lua ${PACKAGE}FILES+= adddoas.lua +${PACKAGE}FILES+= update_sshd_config.lua .include diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 01c4612eb8ec..348a8d93ba09 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -17,6 +17,7 @@ atf_test_case addfile atf_test_case decode_base64 atf_test_case addsudo atf_test_case adddoas +atf_test_case update_sshd_config settimezone_body() { @@ -109,6 +110,12 @@ adddoas_body() atf_check /usr/libexec/flua $(atf_get_srcdir)/adddoas.lua } +update_sshd_config_body() +{ + mkdir -p etc/ssh + atf_check /usr/libexec/flua $(atf_get_srcdir)/update_sshd_config.lua +} + atf_init_test_cases() { atf_add_test_case sethostname @@ -120,4 +127,5 @@ atf_init_test_cases() atf_add_test_case decode_base64 atf_add_test_case addsudo atf_add_test_case adddoas + atf_add_test_case update_sshd_config } diff --git a/libexec/nuageinit/tests/update_sshd_config.lua b/libexec/nuageinit/tests/update_sshd_config.lua new file mode 100644 index 000000000000..ac56c29986ac --- /dev/null +++ b/libexec/nuageinit/tests/update_sshd_config.lua @@ -0,0 +1,73 @@ +#!/usr/libexec/flua +--- +-- SPDX-License-Identifier: BSD-2-Clause +-- +-- Copyright (c) 2026 Baptiste Daroussin + +local n = require("nuage") + +local root = os.getenv("NUAGE_FAKE_ROOTDIR") +if not root then + root = "" +end + +local sshd_config = root .. "/etc/ssh/sshd_config" + +local function setup(content) + local dir = root .. "/etc/ssh" + n.mkdir_p(dir) + local f = assert(io.open(sshd_config, "w")) + f:write(content) + f:close() +end + +local function read_config() + local f = assert(io.open(sshd_config, "r")) + local content = f:read("*a") + f:close() + return content +end + +-- Key not found: appended +setup("SomeOtherKey yes\n") +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "SomeOtherKey yes\nPasswordAuthentication yes\n" then + n.err("Key not found: should be appended") +end + +-- Key with same value: no change +setup("PasswordAuthentication yes\n") +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "PasswordAuthentication yes\n" then + n.err("Same value: should not change") +end + +-- Key with different value: changed +setup("PasswordAuthentication no\n") +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "PasswordAuthentication yes\n" then + n.err("Different value: should change") +end + +-- Key with comment +setup("PasswordAuthentication no # keep this\n") +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "PasswordAuthentication yes\n" then + n.err("Comment stripped: '" .. read_config() .. "'") +end + +-- Case insensitive key matching +setup("passwordauthentication no\n") +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "PasswordAuthentication yes\n" then + n.err("Case insensitive matching failed") +end + +-- Extra spaces +setup(" PasswordAuthentication no \n") +n.update_sshd_config("PasswordAuthentication", "yes") +if read_config() ~= "PasswordAuthentication yes\n" then + n.err("Extra spaces handling failed: '" .. read_config() .. "'") +end + +os.exit(0) From nobody Sun May 10 15:56:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gD6sr5W5Xz6d33x for ; Sun, 10 May 2026 15:56: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 4gD6sq5jHGz44ck for ; Sun, 10 May 2026 15:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778428591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kgPEt56gTkjgu3YvioKEvSIlHn5kMmSHZnRaxYe+GBE=; b=AIMcB0VcgEsufuCrD5I3jBKNUYoViAEtZQ83A0wX2sYdKGelYrzlSx5MIGPKu6cwOkGqmt 72H3Mv404dyZq69tcAo+lL4pXhtPs/mz8BqSe5C58J/I0Wu7tymkgjLMmW55T30LS3en8N vIG8mHyQw4gwnY8ZzJ8ntAhzgmPuy9imEHlpyc0WnGm1Ho5JdP9+U+FpAFhJcWObnN/uCZ h+IiwG8BouEBwhehXJjLh4cjJS2ippYC9dk0ZP1v9rBuC4dNgww89a2LipsF+dxBMYmFBY TBhLRlk/GuNv1hhtydSB1OE2PDwM21Q2F0Q+KzqgYmKHdjUwoCscLIMUA6GGGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778428591; a=rsa-sha256; cv=none; b=WWHq4z/Fs8wwNWBCBKdYprkrRh48gQ5B3VThXWyhkVZ0D3WvGjzFms/iotoKpJmEb5bAit 3gS7JWrT534NDDZGyAZ0u6q6pHPjmpRnXcHXLUysEOkVIyzG10a7kJ5uemtz4EKoYbaSFO A+ijDuf3p4cCy+G+3jGsBKyEoeWA2xIMnQdtzL2z3AsPp3MYKuCQT94cWBQePa0LDzpjaw XWxFfNYY2cSYN89QxG3jkeowgDvRpL9b2K/FFXWUYFQn6v5y6o4kbFY9OmrGJay3HcphL0 zQawP+eAwlVtQklWTopYKC068cxyyBizA9xTj+9CX1Bpz0MhAMMdA73GUy7/Jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778428591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kgPEt56gTkjgu3YvioKEvSIlHn5kMmSHZnRaxYe+GBE=; b=lLDRGkSYuAOfvDwBYTUx0i5TSSs1dywZfNQbu4djg54dHSEX+zhPOnMwTi3WH/j892c793 yATvzl9wq9kmPtkujQh5ZSQZ12zqY4+qlAEZTF3NmmsPu2/y6Tosz/oJZY9KU4gxi+em2B US7A4Xw3WXyt6fvwjzFhb5qhXSYrMNjMHcCu+KpZznYb2yaaTcgfUDfJCz5M621t+KhdVo NXQpWo+7HbYYWAtvTCmkUdnq5ripzkTc3kmKRROr+qhww+ESRD2JklDrcB/v9OZrqRxFko Ze9PPMSSlWdsWPhCeB3iVQhRXLwrzbK2+2GHgx1cDxNORnbsb5WsLS9Jcxk+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 4gD6sq4vLhzcjx for ; Sun, 10 May 2026 15:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36506 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 15:56:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 68fd0feacb8c - main - nuageinit: add decode_base64 tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68fd0feacb8ce5da9c47deea5505b3241b2ba6ec Auto-Submitted: auto-generated Date: Sun, 10 May 2026 15:56:26 +0000 Message-Id: <6a00aaaa.36506.4c33e375@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=68fd0feacb8ce5da9c47deea5505b3241b2ba6ec commit 68fd0feacb8ce5da9c47deea5505b3241b2ba6ec Author: Baptiste Daroussin AuthorDate: 2026-05-07 17:17:56 +0000 Commit: Baptiste Daroussin CommitDate: 2026-05-10 15:50:53 +0000 nuageinit: add decode_base64 tests --- libexec/nuageinit/tests/Makefile | 1 + libexec/nuageinit/tests/decode_base64.lua | 61 +++++++++++++++++++++++++++++++ libexec/nuageinit/tests/nuage.sh | 8 ++++ 3 files changed, 70 insertions(+) diff --git a/libexec/nuageinit/tests/Makefile b/libexec/nuageinit/tests/Makefile index dc8997717b59..feca49784c9e 100644 --- a/libexec/nuageinit/tests/Makefile +++ b/libexec/nuageinit/tests/Makefile @@ -18,5 +18,6 @@ ${PACKAGE}FILES+= sethostname.lua ${PACKAGE}FILES+= settimezone.lua ${PACKAGE}FILES+= warn.lua ${PACKAGE}FILES+= addfile.lua +${PACKAGE}FILES+= decode_base64.lua .include diff --git a/libexec/nuageinit/tests/decode_base64.lua b/libexec/nuageinit/tests/decode_base64.lua new file mode 100644 index 000000000000..0951d77f0ed7 --- /dev/null +++ b/libexec/nuageinit/tests/decode_base64.lua @@ -0,0 +1,61 @@ +#!/usr/libexec/flua +--- +-- SPDX-License-Identifier: BSD-2-Clause +-- +-- Copyright (c) 2026 Baptiste Daroussin + +local n = require("nuage") + +-- decode_base64 is not exported, test via addfile + +local function test_decode(input, expected) + local r, err = n.addfile({ + content = input, + encoding = "base64", + path = "/tmp/nuage_test_b64" + }, false) + if not r then + n.err(err) + end + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + if not root then + root = "" + end + local f = assert(io.open(root .. "/tmp/nuage_test_b64", "r")) + local str = f:read("*all") + f:close() + if str ~= expected then + n.err("base64 decode failed: expected '" .. expected + .. "' got '" .. str .. "'") + end +end + +-- empty input +test_decode("", "") + +-- single byte: 'a' +test_decode("YQ==", "a") + +-- two bytes: 'ab' +test_decode("YWI=", "ab") + +-- three bytes: 'abc' +test_decode("YWJj", "abc") + +-- newline in base64 +test_decode("YmxhCg==", "bla\n") + +-- spaces should be ignored +test_decode("Y Q = =", "a") + +-- b64 alias +local r, err = n.addfile({ + content = "YQ==", + encoding = "b64", + path = "/tmp/nuage_test_b64_b64" +}, false) +if not r then + n.err("b64 encoding alias should work: " .. tostring(err)) +end + +os.exit(0) diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 57d83b62928a..1c8d717a5b67 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -14,6 +14,7 @@ atf_test_case adduser atf_test_case adduser_passwd atf_test_case addgroup atf_test_case addfile +atf_test_case decode_base64 settimezone_body() { @@ -90,6 +91,12 @@ addfile_body() atf_check /usr/libexec/flua $(atf_get_srcdir)/addfile.lua } +decode_base64_body() +{ + mkdir tmp + atf_check /usr/libexec/flua $(atf_get_srcdir)/decode_base64.lua +} + atf_init_test_cases() { atf_add_test_case sethostname @@ -98,4 +105,5 @@ atf_init_test_cases() atf_add_test_case adduser_passwd atf_add_test_case addgroup atf_add_test_case addfile + atf_add_test_case decode_base64 } From nobody Sun May 10 16:37:37 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gD7nL3W5zz6d5r5 for ; Sun, 10 May 2026 16:37:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD7nL3BLwz47pb for ; Sun, 10 May 2026 16:37:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778431062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xCPJ2DpcwX+UhFBv2TmWWNPLK6c0n5t+6ulcyxKAv98=; b=pQ7CSaIyhWpX4sNwUwR7hkrIJ1R+H30GNvVLC1uXTV7WYx6pKZaVWvdSmS+57fdisZH+KX t7sV4Wlz01TqxTduqPHI4AiLKE8goIQlQswY+00E12Yi2I4pS1GgsAEryq+LsXUA+ffH+5 bFlAj4BBM+HbP7VoBdVGPzuXJiWJIclz4+k8/iu+CYrWLL2FqoS4daC9OJxfzwp3dhzey0 XburJNqRYTwr57CLrt/Q1qdlVHcaznVhaRnX8hztNqC3Ne3dvsq7GlsWYHYWhuf07Vnrdt UEhdPyjbMJUUQJ29s/rLQiklvLGM9CjYBt4TAxAusq4k6d5XV1fdz84U3ULZpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778431062; a=rsa-sha256; cv=none; b=crgxoa1Ol7Rhr/wIxpjv5Qmx7R/vhpKqP0p0RQqeDNaP+WUa3ku1k8nS4OFLH5nZ9TPbhc Oe0/+v8dAMimAJmH7p+uR4oEIJGyxB3PHgDlxueNynLnqqkI31Fpgya0oQKMzVxwqF1yjO L8IhgsNOy1MhjqnMhvRQSNHFFpqyI2C2qsDLlmUD4oJnQl8Kf4zruGhKrqXnwYYSE1QMTZ gPvh751iASoM7YGnJgjF6YYnB3RLosee0uaNRBXNdkiN49Rxrir/h+EUXpyBUbpczsWFxl 1jVbJI3Bf5P7YPKb9i6c9gzh5Wc2WDaZv55UYQ0SdZe6NKfUTjIpLNJ1aNCQzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778431062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xCPJ2DpcwX+UhFBv2TmWWNPLK6c0n5t+6ulcyxKAv98=; b=jsuqumL2IRE4AzAWZPmUU4Cq/oZgZDXDpltFikxLiuGa+oxoHn+51umYJcCMICrv+Nefr3 Mx3PdWuzim+E2QrGmjJnYrvIUO8XIqO0Q3sI4QdvA5Az5ucGH37ZTNG9AY19897sHrNeus sudVxTV3B7kMh61YYOSOPw8lJKSMvDgzdB+/kmjdDZPPm8VZmZzW7wQI66YFxUxO3ID5Yx yB7KygUspYyHioJGqmMgMfQCvvDYD4eWlcwlrIDD+mWmcYvr2RYnTq8r9tVFyhbQvdTfYs 2CfsmkPpQF5kq+rZTDkhQrLdWIzRjBlNFgHPRXn9YakqTdEdBNNFg9eAhkfuxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD7nL2gtyzf2n for ; Sun, 10 May 2026 16:37:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a09a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 16:37:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Steve Kargl From: Konstantin Belousov Subject: git: 3085fc9d97bd - main - [libm] implementation of rsqrt, rsqrtf, and rsqrtl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3085fc9d97bd83785ba3ba43e0378d7d67987d1f Auto-Submitted: auto-generated Date: Sun, 10 May 2026 16:37:37 +0000 Message-Id: <6a00b451.3a09a.1326ab95@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3085fc9d97bd83785ba3ba43e0378d7d67987d1f commit 3085fc9d97bd83785ba3ba43e0378d7d67987d1f Author: Steve Kargl AuthorDate: 2026-05-08 14:06:08 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 16:36:33 +0000 [libm] implementation of rsqrt, rsqrtf, and rsqrtl From the PR: The attached diff implements the inverse square root function, i.e, rsqrt(x) = 1 / sqrt(x). Exhaustive testing of the float version suggests that it is correctly rounded in round-to-nearest for all test values in the range [0x1p-127,0x1p126]. Exhaustive testing of rsqrt and rsqrtl cannot be done, but 1100M values of x for rsqrt and 400M values for rsqrtl were tested. All tested values were correctly rounded. I do not have access to LD128 (i.e., IEEE 128-bit floating point) hardware, so the implementation of rsqrtl() is untested. The following is a summary of changes to source code. * lib/msun/Makefile: . Add s_rsqrt.c and s_rsqrtf.c to COMMON_SRCS. . For non-53-bit long double targets, add s_rsqrtl.c to COMMON_SRCS. . Add MLINKS for rsqrt.3, rsqrtf.3, and rsqrtl.3 to sqrt.3. * lib/msun/Symbol.map: . Add rsqrt, rsqrtf, and rsqrtl to the Symbol map for shared libm.so. * lib/msun/man/sqrt.3: . Update the sqrt.3 manual page to include information for rsqrt[fl]. . Note, these function come from ISO C23 (and IEEE-754 2008). * lib/msun/src/math.h: . Add prototypes for new functions. * lib/msun/src/math_private.h: . Add _SPLIT, _FAST2SUM, _SLOW2SUM, _XADD, _MUL, and _XMUL macros to perform type-type arthimetic (i.e., float-float). * src/s_rsqrt.c: . New file with the implementation of 'double rsqrt(double)'. . For 53-bit long double targets, add a weak reference for rsqrtl. * src/s_rsqrtf.c: . New file with the implementation of 'float rsqrt(float)'. * src/s_rsqrtl.c . New file with the implementation of 'long double rsqrt(long double)'. Note, the LD80 version uses bit twiddling and LD128 version is a straight C language implementation. The LD128 is untested due to lack of hardware. PR: 295089 MFC after: 1 week --- lib/msun/Makefile | 6 +- lib/msun/Symbol.map | 3 + lib/msun/man/sqrt.3 | 53 +++++++++++- lib/msun/src/math.h | 3 + lib/msun/src/math_private.h | 83 ++++++++++++++++++ lib/msun/src/s_rsqrt.c | 153 +++++++++++++++++++++++++++++++++ lib/msun/src/s_rsqrtf.c | 155 +++++++++++++++++++++++++++++++++ lib/msun/src/s_rsqrtl.c | 203 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 654 insertions(+), 5 deletions(-) diff --git a/lib/msun/Makefile b/lib/msun/Makefile index a9b07babc0a6..5e9adb533760 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -88,7 +88,7 @@ COMMON_SRCS= b_tgamma.c \ s_lround.c s_lroundf.c s_lroundl.c s_modff.c \ s_nan.c s_nearbyint.c s_nextafter.c s_nextafterf.c \ s_nexttowardf.c s_remquo.c s_remquof.c \ - s_rint.c s_rintf.c s_round.c s_roundf.c \ + s_rint.c s_rintf.c s_round.c s_roundf.c s_rsqrt.c s_rsqrtf.c \ s_scalbln.c s_scalbn.c s_scalbnf.c s_signbit.c \ s_signgam.c s_significand.c s_significandf.c s_sin.c \ s_sincos.c s_sincosf.c s_sinf.c \ @@ -143,7 +143,7 @@ COMMON_SRCS+= b_tgammal.c catrigl.c \ s_fminimum_numl.c s_fminimum_mag_numl.c \ s_frexpl.c s_logbl.c s_logl.c s_nanl.c \ s_nextafterl.c s_nexttoward.c s_remquol.c s_rintl.c s_roundl.c \ - s_scalbnl.c s_sinl.c s_sincosl.c s_sinpil.c \ + s_scalbnl.c s_sinl.c s_sincosl.c s_sinpil.c s_rsqrtl.c \ s_tanhl.c s_tanl.c s_tanpil.c s_truncl.c w_cabsl.c # Work around this warning from gcc: # lib/msun/ld80/e_powl.c:275:1: error: floating constant exceeds range of @@ -289,7 +289,7 @@ MLINKS+=sincos.3 sincosf.3 sin.3 sincosl.3 MLINKS+=sinh.3 sinhf.3 sinh.3 sinhl.3 MLINKS+=sinpi.3 sinpif.3 sinpi.3 sinpil.3 MLINKS+=sqrt.3 cbrt.3 sqrt.3 cbrtf.3 sqrt.3 cbrtl.3 sqrt.3 sqrtf.3 \ - sqrt.3 sqrtl.3 + sqrt.3 sqrtl.3 sqrt.3 rsqrt.3 sqrt.3 rsqrtf.3 sqrt.3 rsqrtl.3 MLINKS+=tan.3 tanf.3 tan.3 tanl.3 MLINKS+=tanh.3 tanhf.3 tanh.3 tanhl.3 MLINKS+=tanpi.3 tanpif.3 tanpi.3 tanpil.3 diff --git a/lib/msun/Symbol.map b/lib/msun/Symbol.map index 00222c960f80..2484cc13013b 100644 --- a/lib/msun/Symbol.map +++ b/lib/msun/Symbol.map @@ -344,4 +344,7 @@ FBSD_1.9 { fminimum_mag_num; fminimum_mag_numf; fminimum_mag_numl; + rsqrt; + rsqrtf; + rsqrtl; }; diff --git a/lib/msun/man/sqrt.3 b/lib/msun/man/sqrt.3 index f4a217353af0..6da6407ecc4b 100644 --- a/lib/msun/man/sqrt.3 +++ b/lib/msun/man/sqrt.3 @@ -25,17 +25,20 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 15, 2020 +.Dd May 7, 2026 .Dt SQRT 3 .Os .Sh NAME .Nm cbrt , .Nm cbrtf , .Nm cbrtl , +.Nm rsqrt , +.Nm rsqrtf , +.Nm rsqrtl, .Nm sqrt , .Nm sqrtf , .Nm sqrtl -.Nd cube root and square root functions +.Nd cube root, square root, and inverse square root functions .Sh LIBRARY .Lb libm .Sh SYNOPSIS @@ -47,6 +50,12 @@ .Ft long double .Fn cbrtl "long double x" .Ft double +.Fn rsqrt "double x" +.Ft float +.Fn rsqrtf "float x" +.Ft long double +.Fn rsqrtl "long double x" +.Ft double .Fn sqrt "double x" .Ft float .Fn sqrtf "float x" @@ -63,6 +72,15 @@ the cube root of .Fa x . .Pp The +.Fn rsqrt , +.Fn rsqrtf , +and +.Fn rsqrtl +functions compute +the inverse square root of +.Fa x . +.Pp +The .Fn sqrt , .Fn sqrtf , and @@ -77,6 +95,23 @@ The and .Fn cbrtl functions return the requested cube root. +.Pp +The +.Fn rsqrt , +.Fn rsqrtf , +and +.Fn rsqrtl +functions return 1 divided by the square root of +.Fa x +unless an error occurs. +An attempt to take the +.Fn rsqrt +of negative +.Fa x +raises an invalid exception and causes an \*(Na to be returned. +The inverse square root of \*(Pm0 returns \*(Pm\(if and +raises a divide-by-zero exception. +.Pp The .Fn sqrt , .Fn sqrtf , @@ -104,6 +139,13 @@ and .Fn sqrtl functions conform to .St -isoC-99 . +The +.Fn rsqrt , +.Fn rsqrtf , +and +.Fn rsqrtl +functions conform to ISO/IEC 9899:2024 ("ISO C23"). +.\" .St -isoC-24 . .Sh HISTORY The .Fn cbrt @@ -120,3 +162,10 @@ The .Fn cbrtl function appeared in .Fx 9.0 . +The +.Fn rsqrt , +.Fn rsqrtf , +and +.Fn rsqrtl +functions appeared in +.Fx 16.0 . diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h index 9894401160d4..e5c2ccb786a4 100644 --- a/lib/msun/src/math.h +++ b/lib/msun/src/math.h @@ -544,6 +544,9 @@ long double fminimum_mag_numl(long double, long double); double fminimum_num(double, double); float fminimum_numf(float, float); long double fminimum_numl(long double, long double); +double rsqrt(double); +float rsqrtf(float); +long double rsqrtl(long double); #endif /* __ISO_C_VISIBLE >= 2023 */ __END_DECLS diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index fbd84e246ca7..e9055a9a8c61 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -471,6 +471,89 @@ do { \ (a) = __tmp; \ } while (0) +/* + * Split x into high and low bits where CC is 0x1p(N/2) + 1 where + * N is rounded up for types with odd precisions. + * + * #define _CC (0x1p12F + 1) // float + * #define _CC (0x1p27 + 1) // double + * #define _CC (0x1p32L + 1) // long double (LD80) + * #define _CC (0x1p57L + 1) // long double (LD128) + */ +#define _SPLIT(x, xh, xl) \ +do { \ + typeof(x) __t1; \ + __t1 = (x) * _CC; \ + xh = __t1 + ((x) - __t1); \ + xl = (x) - xh; \ +} while(0) + +/* + * FAST2SUM requires |x| >= |y|. x and y are full precision. + * Note, _2SUMF(x,y) above destroys x and y. + */ +#define _FAST2SUM(x, y, hi, lo) \ +do { \ + hi = (x) + (y); \ + lo = (y) - (hi - (x)); \ +} while(0) + +/* + * SLOW2SUM does not require |x| >= |y|. Here, x and y are full precision. + * The t1 temporary variable is volatile to prevent compiler optimizations. + * Note, _2SUM(x,y) above destroys x and y. + */ +#define _SLOW2SUM(x, y, hi, lo) \ +do { \ + volatile typeof(x) __t1; \ + typeof(x) __t2; \ + hi = (x) + (y); \ + __t1 = hi - (y); \ + __t2 = hi - __t1; \ + lo = ((x) - __t1) + ((y) - __t2); \ +} while(0) + +/* + * x and y are full precision quantities that have been split into high + * and low parts via the _SPLIT macro. x and y are added to give z as + * high and low parts. + */ +#define _XADD(xh, xl, yh, yl, zh, zl) \ +do { \ + typeof(xh) __s1, __s2, __s3, __s4, __s5, __s6; \ + _SLOW2SUM(xh, yh, __s1, __s2); \ + _SLOW2SUM(xl, yl, __s3, __s4); \ + _FAST2SUM(__s1, __s2 + __s3, __s5, __s6); \ + _FAST2SUM(__s5, __s6 + __s4, zh, zl); \ +} while(0) + +/* + * x and y are full precision quantities. r1 and r2 are full precision + * high and low parts of the multiplication x * y. + */ +#define _MUL(x, y, r1 ,r2) \ +do { \ + typeof(x) __xh, __xl, __yh, __yl; \ + typeof(x) __t1; \ + _SPLIT(x, __xh, __xl); \ + _SPLIT(y, __yh, __yl); \ + r1 = (x) * (y); \ + __t1 = __xh * __yl + (__xh * __yh - r1); \ + r2 = __xl * __yl + (__xl * __yh + __t1); \ +} while(0) + +/* + * x and y are full precision quantities that have been split into high + * and low parts via the _SPLIT macro. x and y are multiplied to give z + * as high and low parts. + */ +#define _XMUL(xh, xl, yh, yl, ph, pl) \ +do { \ + _MUL(xh, yh, ph, pl); \ + pl += xl * yl + xl * yh + xh * yl; \ +} while(0) + + /* * Common routine to process the arguments to nan(), nanf(), and nanl(). */ diff --git a/lib/msun/src/s_rsqrt.c b/lib/msun/src/s_rsqrt.c new file mode 100644 index 000000000000..0a513afe8ed2 --- /dev/null +++ b/lib/msun/src/s_rsqrt.c @@ -0,0 +1,153 @@ +/*- + * Copyright (c) 2026 Steven G. Kargl + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * Compute the inverse sqrt of x, i.e., rsqrt(x) = 1 / sqrt(x). + * + * First, filter out special cases: + * + * 1. rsqrt(+-0) = +-inf, and raise FE_DIVBYZERO exception. + * 2. rsqrt(nan) = NaN. + * 3. rsqrt(+inf) returns +0. + * 2. rsqrt(x<0) = NaN, and raises FE_INVALID. + * + * If x is a subnormal, scale x into the normal range by x*0x1pN; while + * recording the exponent of the scale factor N. Split the possibly + * scaled x into f*2^n with f in [0.5,1). Set m=n or m=n-N (subnormal). + * If n is odd, then set f = f/2 and increase n to n+1. Thus, f is + * in [0.25,1) with n even. + * + * An initial estimate of y = rqrt[f](x) is 1 / sqrt[f](x). Exhaustive + * testing of rsqrtf() gave a max ULP of 1.49; while testing 500M x in + * [0,1000] gave a max ULP of 1.24 for rsqrt(). The value of y is then + * used with one iteration of Goldschmidt's algorithm: + * + * z = x * y + * h = y / 2 + * r = 0.5 - h * z + * y = h * r + h + * + * A factor of 2 appears missing in the above, but it is included in the + * exponent m. + */ +#include +#include +#include "math.h" +#include "math_private.h" + +#pragma STDC FENV_ACCESS ON + +#ifdef _CC +#undef _CC +#endif +#define _CC (0x1p27 + 1) + +double +rsqrt(double x) +{ + volatile static const double vzero = 0; + static const double half = 0.5; + int hx, m, rnd; + uint32_t lx, ux; + double h, ph, pl, rh, rl, y, zh, zl; + + EXTRACT_WORDS(hx, lx, x); + ux = (uint32_t)hx & 0x7fffffff; + + /* x = +-0. Raise exception. */ + if ((ux | lx) == 0) + return (1 / x); + + /* x is NaN. */ + if (ux > 0x7ff00000) + return (x + x); + + /* x is +-inf. */ + if (ux == 0x7ff00000) + return (hx & 0x80000000 ? vzero / vzero : 0.); + + /* x < 0. Raise exception. */ + if (hx < 0) + return (vzero / vzero); + + /* + * If x is subnormal, then scale it into the normal range. + * Split x into significand and exponent, x = f * 2^m, with + * f in [0.5,1) and m a biased exponent. + */ + m = 0; + if (hx < 0x00100000) { /* Subnormal */ + x *= 0x1p54; + GET_HIGH_WORD(hx, x); + m = -54; + } + m += (hx >> 20) - 1022; + hx = (hx & 0x000fffff) | 0x3fe00000; + SET_HIGH_WORD(x, hx); + + /* m is odd. Put x into [0.25,5) and increase m. */ + if (m & 1) { + x /= 2; + m += 1; + } + m = -(m >> 1); /* Prepare for 2^(-m/2). */ + + y = 1 / sqrt(x); /* ~52-bit estimate. */ + + h = y / 2; + + /* + * For values of x with a representation of 0x1.ffffffffffffepN + * with N an odd integer, the computed rsqrt() is not correctly + * rounded in round-to-nearest without toggling the rounding mode + * to FE_TOWARDZERO. Note, FE_DOWNWARD also works. However, + * messing with the rounding mode is expensive, so only do it + * when necessary. Example, x = 3.9999999999999991 + * gives y --> hx = 0x3ff00000, lx = 0x00000001 + */ + EXTRACT_WORDS(hx, lx, y); + if ((hx & 0x000fffff) == 0 && lx == 1) { + rnd = fegetround(); + fesetround(FE_TOWARDZERO); + _MUL(x, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + fesetround(rnd); + } else { + _MUL(x, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + } + + _XADD(-ph, -pl, half, 0, rh, rl); + y = rh * h + h; + + ux = (m + 1024) << 20; + INSERT_WORDS(x, ux, 0); + return (y *= x); +} + +#if LDBL_MANT_DIG == 53 +__weak_reference(rsqrt, rsqrtl); +#endif diff --git a/lib/msun/src/s_rsqrtf.c b/lib/msun/src/s_rsqrtf.c new file mode 100644 index 000000000000..b71f7baf5657 --- /dev/null +++ b/lib/msun/src/s_rsqrtf.c @@ -0,0 +1,155 @@ +/*- + * Copyright (c) 2026 Steven G. Kargl + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * Compute the inverse sqrt of x, i.e., rsqrt(x) = 1 / sqrt(x). + * + * First, filter out special cases: + * + * 1. rsqrt(+-0) = +-inf, and raise FE_DIVBYZERO exception. + * 2. rsqrt(nan) = NaN. + * 3. rsqrt(+inf) returns +0. + * 2. rsqrt(x<0) = NaN, and raises FE_INVALID. + * + * If x is a subnormal, scale x into the normal range by x*0x1pN; while + * recording the exponent of the scale factor N. Split the possibly + * scaled x into f*2^n with f in [0.5,1). Set m=n or m=n-N (subnormal). + * If n is odd, then set f = f/2 and increase n to n+1. Thus, f is + * in [0.25,1) with n even. + * + * An initial estimate of y = rqrt[f](x) is 1 / sqrt[f](x). Exhaustive + * testing of rsqrtf() gave a max ULP of 1.49; while testing 500M x in + * [0,1000] gave a max ULP of 1.24 for rsqrt(). The value of y is then + * used with one iteration of Goldschmidt's algorithm: + * + * z = x * y + * h = y / 2 + * r = 0.5 - h * z + * y = h * r + h + * + * A factor of 2 appears missing in the above, but it is included in the + * exponent m. + */ +#include +#include +#include "math.h" +#include "math_private.h" + +#pragma STDC FENV_ACCESS ON + +#ifdef _CC +#undef _CC +#endif +#define _CC (0x1p12F + 1) + +float +rsqrtf(float x) +{ + volatile static const float vzero = 0; + static const float half = 0.5; + uint32_t ix, ux; + int m, rnd; + float h, ph, pl, rh, rl, y, zh, zl; + + GET_FLOAT_WORD(ix, x); + ux = ix & 0x7fffffff; + + /* x = +-0. Raise exception. */ + if (ux == 0) + return (1 / x); + + /* x is NaN. */ + if (ux > 0x7f800000) + return (x + x); + + /* x is +-inf. */ + if (ux == 0x7f800000) + return (ix & 0x80000000 ? vzero / vzero : 0.F); + + /* x < 0. Raise exception. */ + if (ix & 0x80000000) + return (vzero / vzero); + + /* + * If x is subnormal, then scale it into the normal range. + * Split x into significand and exponent, x = f * 2^m, with + * f in [0.5,1) and m a biased exponent. + */ + m = 0; + if (ux < 0x00800000) { /* Subnormal */ + x *= 0x1p25f; + GET_FLOAT_WORD(ix, x); + m = -25; + } + m += (ix >> 23) - 126; /* Unbiased exponent */ + ix = (ix & 0x007fffff) | 0x3f000000; + SET_FLOAT_WORD(x, ix); /* x is in [0.5,1). */ + + /* m is odd. Put x into [0.25,5) and increase m. */ + if (m & 1) { + x /= 2; + m += 1; + } + m = -(m >> 1); /* Prepare for 2^(-m/2). */ + + /* + * Exhaustive testing of rsqrtf(x) = 1 / sqrtf(x) with x in + * [0x1p-127,0x1p126] shows the this approximation gives a + * 22- to 23-bit estimate of rsqrt(f). This is equivalent to + * a max ulp of ~1.49. + */ + y = 1 / sqrtf(x); + + h = y / 2; + + /* + * For values of x with a representation of 0x1.fffffcpN with + * N an odd integer, the computed rsqrtf() is not correctly + * rounded in round-to-nearest without toggling the rounding + * mode to FE_TOWARDZERO. Note, FE_DOWNWARD also works. + * However, messing with the rounding mode is expensive, so + * only do it when necessary. Example, x = 0x1.fffffcp3 gives + * y --> 0x3f800001. + */ + GET_FLOAT_WORD(ix, y); + if ((ix & 0x000fffff) == 1) { + rnd = fegetround(); + fesetround(FE_TOWARDZERO); + _MUL(x, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + fesetround(rnd); + } else { + _MUL(x, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + } + + _XADD(-ph, -pl, half, 0, rh, rl); + y = h * rh + h; + + ix = (uint32_t)(m + 128) << 23; + SET_FLOAT_WORD(x, ix); + return (y *= x); +} diff --git a/lib/msun/src/s_rsqrtl.c b/lib/msun/src/s_rsqrtl.c new file mode 100644 index 000000000000..34d5cdc48173 --- /dev/null +++ b/lib/msun/src/s_rsqrtl.c @@ -0,0 +1,203 @@ +/*- + * Copyright (c) 2026 Steven G. Kargl + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * Compute the inverse sqrt of x, i.e., rsqrt(x) = 1 / sqrt(x). + * + * First, filter out special cases: + * + * 1. rsqrt(+-0) = +-inf, and raise FE_DIVBYZERO exception. + * 2. rsqrt(nan) = NaN. + * 3. rsqrt(+inf) returns +0. + * 2. rsqrt(x<0) = NaN, and raises FE_INVALID. + * + * If x is a subnormal, scale x into the normal range by x*0x1pN; while + * recording the exponent of the scale factor N. Split the possibly + * scaled x into f*2^n with f in [0.5,1). Set m=n or m=n-N (subnormal). + * If n is odd, then set f = f/2 and increase n to n+1. Thus, f is + * in [0.25,1) with n even. + * + * An initial estimate of y = rqrt[f](x) is 1 / sqrt[f](x). Exhaustive + * testing of rsqrtf() gave a max ULP of 1.49; while testing 500M x in + * [0,1000] gave a max ULP of 1.24 for rsqrt(). The value of y is then + * used with one iteration of Goldschmidt's algorithm: + * + * z = x * y + * h = y / 2 + * r = 0.5 - h * z + * y = h * r + h + * + * A factor of 2 appears missing in the above, but it is included in the + * exponent m. + */ +#include +#include +#include "math.h" +#include "math_private.h" +#include "fpmath.h" + +#pragma STDC FENV_ACCESS ON + +#if LDBL_MANT_DIG == 64 + +#ifdef _CC +#undef _CC +#endif +#define _CC (0x1p32L + 1) + +long double +rsqrtl(long double x) +{ + volatile static const double vzero = 0; + static const double half = 0.5; + uint32_t ux; + int m, rnd; + long double h, ph, pl, rh, rl, y, zh, zl; + union IEEEl2bits u; + + u.e = x; + ux = (u.bits.manl | u.bits.manh); + + /* x = +-0. Raise exception. */ + if ((u.bits.exp | ux) == 0) + return (1 / x); + + /* x is NaN or x is +-inf. */ + if (u.bits.exp == 0x7fff) + return (ux ? (x + x) : (u.bits.sign ? vzero / vzero : 0)); + + /* x < 0. Raise exception. */ + if (u.bits.sign) + return (vzero / vzero); + + /* + * If x is subnormal, then scale it into the normal range. + * Split x into significand and exponent, x = f * 2^m, with + * f in [0.5,1) and m a biased exponent. + */ + ENTERI(); + + if (u.bits.exp == 0) { /* Subnormal */ + u.e *= 0x1p512; + m = u.bits.exp - 0x41fe; + } else { + m = u.bits.exp - 0x3ffe; + } + u.bits.exp = 0x3ffe; + + /* m is odd. Put x into [0.25,5) and increase m. */ + if (m & 1) { + u.e /= 2; + m += 1; + } + m = -(m >> 1); /* Prepare for 2^(-m/2). */ + + y = 1 / sqrt((double)u.e); /* ~52-bit estimate. */ + y -= y * (u.e * y * y - 1) / 2; /* ~63-bit estimate. */ + + h = y / 2; + + _MUL(u.e, y, zh, zl); + _XMUL(zh, zl, h, 0, ph, pl); + _XADD(-ph, -pl, half, 0, rh, rl); + y = rh * h + h; + + u.e = 1; + u.xbits.expsign = 0x3fff + m + 1; + RETURNI(y * u.e); +} + +#else + +#ifdef _CC +#undef _CC +#endif +#define _CC (0x1p57L + 1) + +long double +rsqrtl(long double x) +{ + volatile static const double vzero = 0; + int hx, m, rnd; + long double y; + + /* x = +-0. Raise exception. */ + if (x == 0) + return (1 / x); + + /* x is NaN. */ + if (isnan(x)) + return (x + x); + + /* x is +-inf. */ + if (isinf(x)) + return (x > 0 ? 0 : vzero / vzero); + + /* x < 0. Raise exception. */ + if (x < 0) + return (vzero / vzero); + + /* + * If x is subnormal, then scale it into the normal range. + * Split x into significand and exponent, x = f * 2^m, with + * f in [0.5,1) and m a biased exponent. + */ + m = 0; + if (!isnormal(x)) { + x *= 0x1p114L; + m = -114; + } + x = frexpl(x, &hx); + m += hx; + + /* m is odd. Put x into [0.25,5) and increase m. */ + if (m & 1) { + x /= 2; + m += 1; + } + m = -(m >> 1); /* Prepare for 2^(-m/2). */ + + y = 1 / sqrt((double)x); /* ~52-bit estimate. */ + y -= y * (x * y * y - 1) / 2; /* ~104-bit estimate. */ + + static const double half = 0.5; + long double h, ph, pl, rh, rl, zh, zl; + + h = y / 2; + + rnd = fegetround(); + fesetround(FE_TOWARDZERO); + _MUL(x, y, zh, zl); + _XMUL(zh, zl, -h, 0, ph, pl); + fesetround(rnd); + + _XADD(ph, pl, half, 0, rh, rl); + y = rh * h + h; + m++; + + RETURNI(ldexpl(y, m)); +} +#endif From nobody Sun May 10 18:11:14 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gD9sH2M4Dz6cjgS for ; Sun, 10 May 2026 18:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD9sG73hyz3KBM for ; Sun, 10 May 2026 18:11:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jthWbcPTEkGKruRb4G3A+e5DmLbc2pK4+sNhRcCzV1s=; b=ROcXorN5XwispPxWjlzb7jxO9cDZm8H7vGOq8gEltuOv9JdAV1sQslbqGIfVo1XVEGqPo/ GDd7T4b2/nt0FYYA6FfUc4eP1CsaNmjoSGuD+O2D/qIAmEPdAm8Sn7x55UK+hAP98WyXuQ kgx4Bc0JVbpHUIEChX4V2QtvuOMKEAvLIYWqIYTxQ8CwcoECGoPx8/HugE5mW+h6LlZLDT jsPQfCSdR3Gi07yof9vENSgDiaHxGL8bwDEfRfhxWu/UymesU7mFJYw3wfeRJu+Wu2b78J LTTLMA3Tn4tAiWjVAtZquENjGShxG7A9CMY81bUd7dkeN7PbtIzfsbZCKRACSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778436675; a=rsa-sha256; cv=none; b=bMBZkr7wgab5GZjpd7u8vMUo/WieZbcIPg/zyLt4pQWOn9jUnRWwEHa284+HvKtU4yxIjt toL4VCS9j7mjdikn8C46Qz+sa8MRnV1QLNngPn/AMlqhuu3Lv458zrWE2B0AdqaHdjqNaK khnlIJAOoGr9ln1VQDCTTaxiLDqzbhoBpRXqhyQkUEaEth4lhJkxjSwTV6fdqOBVkJdcS8 7cnnUyof98oO0qMEzTyGBcwIch+I0i5COGJzqEE6tkYxv1iFpfWElPNKZgIwetloNaoe5z x+I8buQ6aaeBy/t6X7+jjsamS17N7rOuRQSNMI0WCM5VA9q0lbyZ+85teEQkcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jthWbcPTEkGKruRb4G3A+e5DmLbc2pK4+sNhRcCzV1s=; b=q46bViW1VSPjpKP0ah+VUZXXmpwYgf5zxpRgADJZaExJJtN4y2d+bi2cFkqdhbxAPtFBZg 3dcI/s7a/FIobGFmFO1oatTsMQfUmz943d5IBFAo8N6D+8VoBOG23Q4DLCmJI0VCuGRaqr 7VRHPIszr4YsvLxZ7LLZKO0s8Zrpc5fET+W1dZq+fmKReEB8Vt7bvWL/qbfw6dAlc/JZCi eLjp1TYL8psGCrwtVb7nfiQSF3tHbirpaKaCd8dGIrWyERLK+XWtqo80W9fyJopydQvxUw 2Omf/fa+NwpApuJxZ5t9H3vgw6lu/CQlJAso/a+WesXkJauPP3e9Ju5VsfwkLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD9sG6dVXzghd for ; Sun, 10 May 2026 18:11:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44476 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 18:11:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 1d5e4020e36e - main - vnode: add VIRF_KNOTE flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d5e4020e36e1cc9e906200c9c3c784ef43d977e Auto-Submitted: auto-generated Date: Sun, 10 May 2026 18:11:14 +0000 Message-Id: <6a00ca42.44476.4762460f@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1d5e4020e36e1cc9e906200c9c3c784ef43d977e commit 1d5e4020e36e1cc9e906200c9c3c784ef43d977e Author: Konstantin Belousov AuthorDate: 2026-04-24 01:31:27 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 17:43:46 +0000 vnode: add VIRF_KNOTE flag to indicate non-empty vnode knote list. Use it instead of VN_KNLIST_EMPTY() and guard note activations with it. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56611 --- sys/kern/vfs_subr.c | 14 ++++++++++---- sys/sys/mount.h | 12 ++++++++++-- sys/sys/vnode.h | 29 ++++++++++++----------------- 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 48bfea2f5bf9..f46c666b115c 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -6090,7 +6090,7 @@ vop_create_post(void *ap, int rc) a = ap; dvp = a->a_dvp; vn_seqc_write_end(dvp); - if (!rc) { + if (rc == 0) { VFS_KNOTE_LOCKED(dvp, NOTE_WRITE); INOTIFY_NAME(*a->a_vpp, dvp, a->a_cnp, IN_CREATE); } @@ -6244,7 +6244,7 @@ vop_mknod_post(void *ap, int rc) a = ap; dvp = a->a_dvp; vn_seqc_write_end(dvp); - if (!rc) { + if (rc == 0) { VFS_KNOTE_LOCKED(dvp, NOTE_WRITE); INOTIFY_NAME(*a->a_vpp, dvp, a->a_cnp, IN_CREATE); } @@ -6512,7 +6512,7 @@ vop_read_pgcache_post(void *ap, int rc) { struct vop_read_pgcache_args *a = ap; - if (!rc) + if (rc == 0) VFS_KNOTE_UNLOCKED(a->a_vp, NOTE_READ); } @@ -6659,6 +6659,8 @@ vfs_knlunlock(void *arg) { struct vnode *vp = arg; + if (KNLIST_EMPTY(&vp->v_pollinfo->vpi_selinfo.si_note)) + vn_irflag_unset(vp, VIRF_KNOTE); VOP_UNLOCK(vp); } @@ -6706,7 +6708,11 @@ vfs_kqfilter(struct vop_kqfilter_args *ap) return (ENOMEM); knl = &vp->v_pollinfo->vpi_selinfo.si_note; vhold(vp); - knlist_add(knl, kn, 0); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + knlist_add(knl, kn, 1); + if ((vn_irflag_read(vp) & VIRF_KNOTE) == 0) + vn_irflag_set(vp, VIRF_KNOTE); + VOP_UNLOCK(vp); return (0); } diff --git a/sys/sys/mount.h b/sys/sys/mount.h index f99d0856f16e..480a6c16badf 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -952,14 +952,22 @@ vfs_statfs_t __vfs_statfs; } \ } while (0) +#include + #define VFS_KNOTE_LOCKED(vp, hint) do \ { \ - VN_KNOTE((vp), (hint), KNF_LISTLOCKED); \ + if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { \ + KNOTE_LOCKED(&vp->v_pollinfo->vpi_selinfo.si_note, \ + hint); \ + } \ } while (0) #define VFS_KNOTE_UNLOCKED(vp, hint) do \ { \ - VN_KNOTE((vp), (hint), 0); \ + if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { \ + KNOTE_UNLOCKED(&vp->v_pollinfo->vpi_selinfo.si_note, \ + hint); \ + } \ } while (0) #include diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 3fd2c770cda1..d1d20778a8ec 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -224,18 +224,14 @@ _Static_assert(sizeof(struct vnode) <= 448, "vnode size crosses 448 bytes"); /* XXX: These are temporary to avoid a source sweep at this time */ #define v_object v_bufobj.bo_object -/* We don't need to lock the knlist */ -#define VN_KNLIST_EMPTY(vp) ((vp)->v_pollinfo == NULL || \ - KNLIST_EMPTY(&(vp)->v_pollinfo->vpi_selinfo.si_note)) - -#define VN_KNOTE(vp, b, a) \ - do { \ - if (!VN_KNLIST_EMPTY(vp)) \ - KNOTE(&vp->v_pollinfo->vpi_selinfo.si_note, (b), \ - (a) | KNF_NOKQLOCK); \ - } while (0) -#define VN_KNOTE_LOCKED(vp, b) VN_KNOTE(vp, b, KNF_LISTLOCKED) -#define VN_KNOTE_UNLOCKED(vp, b) VN_KNOTE(vp, b, 0) +#define VN_KNOTE(vp, b, a) do { \ + if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { \ + KNOTE(&vp->v_pollinfo->vpi_selinfo.si_note, (b), \ + (a) | KNF_NOKQLOCK); \ + } \ +} while (0) +#define VN_KNOTE_LOCKED(vp, b) VN_KNOTE(vp, b, KNF_LISTLOCKED) +#define VN_KNOTE_UNLOCKED(vp, b) VN_KNOTE(vp, b, 0) /* * Vnode flags. @@ -260,6 +256,7 @@ _Static_assert(sizeof(struct vnode) <= 448, "vnode size crosses 448 bytes"); #define VIRF_INOTIFY 0x0080 /* This vnode is being watched */ #define VIRF_INOTIFY_PARENT 0x0100 /* A parent of this vnode may be being watched */ +#define VIRF_KNOTE 0x0200 /* Has knlist */ #define VI_UNUSED0 0x0001 /* unused */ #define VI_MOUNT 0x0002 /* Mount in progress */ @@ -1052,7 +1049,7 @@ void vop_rename_fail(struct vop_rename_args *ap); off_t osize, ooffset, noffset; \ \ osize = ooffset = noffset = 0; \ - if (!VN_KNLIST_EMPTY((ap)->a_vp)) { \ + if ((vn_irflag_read((ap)->a_vp) & VIRF_KNOTE) != 0) { \ error = VOP_GETATTR((ap)->a_vp, &va, (ap)->a_cred); \ if (error) \ return (error); \ @@ -1063,10 +1060,8 @@ void vop_rename_fail(struct vop_rename_args *ap); #define vop_write_post(ap, ret) \ noffset = (ap)->a_uio->uio_offset; \ if (noffset > ooffset) { \ - if (!VN_KNLIST_EMPTY((ap)->a_vp)) { \ - VFS_KNOTE_LOCKED((ap)->a_vp, NOTE_WRITE | \ - (noffset > osize ? NOTE_EXTEND : 0)); \ - } \ + VFS_KNOTE_LOCKED((ap)->a_vp, NOTE_WRITE | \ + (noffset > osize ? NOTE_EXTEND : 0)); \ INOTIFY((ap)->a_vp, IN_MODIFY); \ } From nobody Sun May 10 18:11:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gD9sJ2bmkz6cjH3 for ; Sun, 10 May 2026 18:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD9sJ12DKz3JqM for ; Sun, 10 May 2026 18:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=msTKjj2kLvey+sn1thoSevPvkSNQU8+5m2QoC8Emb84=; b=NWmIsPunhtgIeCO4gsoww4Sdk7E3wxk8CropElXe2HwSfVS4NQFYtRRfFJCxhUfUHuErjP s0i7Wtcfsw5xU83B+gH5NHSBKTv8UxfDsR0+dp9Hz6y37Nd44BCTNoJaET7s1Yk7ywKWKh OMozgfY2wcjjbwg2fEDJqfOsUuk9hTVSMJU1rcrYM/hrb7gTl2y72008WL5ByHlaSunhRq KFZKCYSTqh/5CDuDb8+jnVryYkySZPtCSO54IDXfVTR6tYNdnl5JlrJ46zdj8B3/DDpXL+ 0P5FF1vhhLgBFXk3nU7LGP7eysA38CTlGY+MasFddf3FNVshV7eD/ZA9X41hjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778436676; a=rsa-sha256; cv=none; b=D2s91tLoy4T/tITUgXJzm2/w1nqLNIwHJ3pp92nbaoBDHeZ40qusBMfIgYXAfg9FTTFNbf CcH78wJOCk0i914pDVVKKuesq0i77GyE+88B7JN911Uqft6ijfdP18DXDYZxglnKlJG0j3 bnQosF4pPqu0c5TuwajBVDlYefmAydQYjz8cPWYkOpegaFkTgSWNPCqOYDsMYgBRBJRl3s ALvR1A1h1AllWTPEB3qBqbqpTAPpEBi2ROofwS/adns7IYyljjv/tPrzJKXL9qzsp31SU2 kvwwo3LEiHpS/L+IKTDElhfkr5bcEqkYyOL5Bg0RSyVF8L1bNLLDwqJXgt9X3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=msTKjj2kLvey+sn1thoSevPvkSNQU8+5m2QoC8Emb84=; b=rjBRmgoxR/vCUCWO+Q639mzq7ep7CEz33WUT5i2jkWfZJ9fqFL8g1pwAD6/8OEigYNdj5M iSMg4/XabUp+XqCfQ/GAWHf/EDJEYRM9eKnfGsS1Ub+YXbbiktkEMVaAM6owfBuu/jgZoq sJJcF2dYGP6ro/MN1GNgpTWK0L1K1oDRaVDL66JT7wqGZDIq9s6Fz7B79WoJriIVnQMzso bjok0jDOecdW9uRZpFgM+bUZm305O4PoQEakV634ghzPkc8KYhqeYxWoV4Rx2BJ5Urk3rp mBidN3KUisFI3R9HaD3wjZoS5zHIBUeEDJCddtjS7a60g5+okmpb7XjFoLrk8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD9sJ0T1jzghf for ; Sun, 10 May 2026 18:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43d05 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 18:11:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e9a5eb0e5e44 - main - vop_read_pgcache_post(): report inotify IN_ACCESS same as for vop_read_post() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9a5eb0e5e44e79d0f8dc71274b0183926abd562 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 18:11:16 +0000 Message-Id: <6a00ca44.43d05.7e8be65@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e9a5eb0e5e44e79d0f8dc71274b0183926abd562 commit e9a5eb0e5e44e79d0f8dc71274b0183926abd562 Author: Konstantin Belousov AuthorDate: 2026-05-06 20:29:28 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 17:43:46 +0000 vop_read_pgcache_post(): report inotify IN_ACCESS same as for vop_read_post() Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56611 --- sys/kern/vfs_subr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index f46c666b115c..4bfbc0a7057e 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -6512,8 +6512,10 @@ vop_read_pgcache_post(void *ap, int rc) { struct vop_read_pgcache_args *a = ap; - if (rc == 0) - VFS_KNOTE_UNLOCKED(a->a_vp, NOTE_READ); + if (rc == 0) { + VFS_KNOTE_LOCKED(a->a_vp, NOTE_READ); + INOTIFY(a->a_vp, IN_ACCESS); + } } static struct knlist fs_knlist; From nobody Sun May 10 18:11:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gD9sL4SvXz6cj6K for ; Sun, 10 May 2026 18:11: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 4gD9sK5HGXz3KBc for ; Sun, 10 May 2026 18:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y6/oeATvRCxqCBsYGYEuqtYFaGBdggsW3YRcG2lN71A=; b=Ug4PKyk0HN8Xe8zk1mdomCqwIEpKbhtrFmC1b4Ai3y5+WDqkyX3SrxBaEvicBYK0E0ca7f Hcr8k3bZyhKMkVO6cRZJ8JLtPNUyjwbGIEMneN4eumlcHIoMRhVRiMYbCTfaHkzaCc2Z1Z uJ6x4Pjszi3LEXrJWNfxPtqDL8qmRICZTwvvwr+dwPDPU+hHqYSco2Z+HPE7wneUxTDbfP R7kVMXi5F0KWl6Zw1vmrHnN4qHHjCTGiTRc3mxgVPHUpRoZFiteij75a0c1+1vR85YCRxJ UraopDuCrUm3tvOF0L/xie+mJFOiBB+ZdC5fPjF19SaVJ+C91jIoFV5ZJHUfng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778436677; a=rsa-sha256; cv=none; b=fSgVDaxQ6KGzQ947sKbBrPydVGvksRAV09WCHeCnAMAqH92TR5zG3u1KvSI2z0+fovuJKq joPgSwmqovbmg4tkfD+O9uXCaPJlgYQbhdqecdcw6fyaZbKUcWOUZBkUZlbXzGYI+4rqy1 6s994CDIS6UtSmyH91/4WAxrQb9HbxAbYBaWzGuYaLZP/d5nSayBe3zHZGoL2R/Ke21wlY roIzvlPJKsoXChWbdp02SpVIEfG+4BrIVVUqk4yJ30nrP4UeH05lGYnDwg7BmcKgyZ1WwL SP/SGofRKnNDS8JfQiNP1YmsNpSwZ/HHhYzeYQI+q9A5OR4YwXw5RZmo+51eQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y6/oeATvRCxqCBsYGYEuqtYFaGBdggsW3YRcG2lN71A=; b=swWqCCD7qCZyyuWL7DlveiP+FGhzELeOywlwcMdzwTqoSnbpqByduupumTq5PxYbBE+QgX Pg5jaTfxsqVnNVRPW/UgEpHj5MWlfXhPzcl4nIpMP5tfl+khWkjL/fppzfoYPoCARBEb2g tapK1rs+wUNcSXzh1qq4HIljp4smq4q8fmewpj3teHUFavAzXZL43XBebhbCQf2Jp25Ura OYA+HflqenZRagay9Q+YxCqVNwLzQBi3NNComlASdCgKuLA60Acr/L1lOqDFiX5rEUhqZK bk80CWYwDJ5jWp52wsYUFAQOFnR3x3tnvRhnvhewmClXHJ8NPcHL3vWM9DT6RQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD9sK153Czgny for ; Sun, 10 May 2026 18:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43575 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 18:11:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: a57420b214b0 - main - vfs: convert VFS_OPs from macros to static inlines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a57420b214b04de3d066236b555925ffbcb93daa Auto-Submitted: auto-generated Date: Sun, 10 May 2026 18:11:17 +0000 Message-Id: <6a00ca45.43575.42544519@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a57420b214b04de3d066236b555925ffbcb93daa commit a57420b214b04de3d066236b555925ffbcb93daa Author: Konstantin Belousov AuthorDate: 2026-04-24 01:31:27 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 17:43:46 +0000 vfs: convert VFS_OPs from macros to static inlines Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56611 --- sys/sys/mount.h | 230 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 121 insertions(+), 109 deletions(-) diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 480a6c16badf..d6696bba0a4f 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -853,122 +853,134 @@ struct vfsops { vfs_statfs_t __vfs_statfs; -#define VFS_MOUNT(MP) ({ \ - int _rc; \ - \ - TSRAW(curthread, TS_ENTER, "VFS_MOUNT", (MP)->mnt_vfc->vfc_name);\ - _rc = (*(MP)->mnt_op->vfs_mount)(MP); \ - TSRAW(curthread, TS_EXIT, "VFS_MOUNT", (MP)->mnt_vfc->vfc_name);\ - _rc; }) - -#define VFS_UNMOUNT(MP, FORCE) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_unmount)(MP, FORCE); \ - _rc; }) - -#define VFS_ROOT(MP, FLAGS, VPP) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_root)(MP, FLAGS, VPP); \ - _rc; }) - -#define VFS_CACHEDROOT(MP, FLAGS, VPP) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_cachedroot)(MP, FLAGS, VPP); \ - _rc; }) - -#define VFS_QUOTACTL(MP, C, U, A, MP_BUSY) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_quotactl)(MP, C, U, A, MP_BUSY); \ - _rc; }) - -#define VFS_STATFS(MP, SBP) ({ \ - int _rc; \ - \ - _rc = __vfs_statfs((MP), (SBP)); \ - _rc; }) - -#define VFS_SYNC(MP, WAIT) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_sync)(MP, WAIT); \ - _rc; }) - -#define VFS_VGET(MP, INO, FLAGS, VPP) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_vget)(MP, INO, FLAGS, VPP); \ - _rc; }) - -#define VFS_FHTOVP(MP, FIDP, FLAGS, VPP) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_fhtovp)(MP, FIDP, FLAGS, VPP); \ - _rc; }) - -#define VFS_CHECKEXP(MP, NAM, EXFLG, CRED, NUMSEC, SEC) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_checkexp)(MP, NAM, EXFLG, CRED, NUMSEC,\ - SEC); \ - _rc; }) - -#define VFS_EXTATTRCTL(MP, C, FN, NS, N) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_extattrctl)(MP, C, FN, NS, N); \ - _rc; }) - -#define VFS_SYSCTL(MP, OP, REQ) ({ \ - int _rc; \ - \ - _rc = (*(MP)->mnt_op->vfs_sysctl)(MP, OP, REQ); \ - _rc; }) - -#define VFS_SUSP_CLEAN(MP) do { \ - if (*(MP)->mnt_op->vfs_susp_clean != NULL) { \ - (*(MP)->mnt_op->vfs_susp_clean)(MP); \ - } \ -} while (0) +static inline int +VFS_MOUNT(struct mount *mp) +{ + int rc; -#define VFS_RECLAIM_LOWERVP(MP, VP) do { \ - if (*(MP)->mnt_op->vfs_reclaim_lowervp != NULL) { \ - (*(MP)->mnt_op->vfs_reclaim_lowervp)((MP), (VP)); \ - } \ -} while (0) + TSRAW(curthread, TS_ENTER, "VFS_MOUNT", mp->mnt_vfc->vfc_name); + rc = mp->mnt_op->vfs_mount(mp); + TSRAW(curthread, TS_EXIT, "VFS_MOUNT", mp->mnt_vfc->vfc_name); + return (rc); +} -#define VFS_UNLINK_LOWERVP(MP, VP) do { \ - if (*(MP)->mnt_op->vfs_unlink_lowervp != NULL) { \ - (*(MP)->mnt_op->vfs_unlink_lowervp)((MP), (VP)); \ - } \ -} while (0) +static inline int +VFS_UNMOUNT(struct mount *mp, int force) +{ + return (mp->mnt_op->vfs_unmount(mp, force)); +} -#define VFS_PURGE(MP) do { \ - if (*(MP)->mnt_op->vfs_purge != NULL) { \ - (*(MP)->mnt_op->vfs_purge)(MP); \ - } \ -} while (0) +static inline int +VFS_ROOT(struct mount *mp, int flags, struct vnode **vpp) +{ + return (mp->mnt_op->vfs_root(mp, flags, vpp)); +} + +static inline int +VFS_CACHEDROOT(struct mount *mp, int flags, struct vnode **vpp) +{ + return (mp->mnt_op->vfs_cachedroot(mp, flags, vpp)); +} + +static inline int +VFS_QUOTACTL(struct mount *mp, int cmds, uid_t uid, void *arg, bool *mp_busy) +{ + return (mp->mnt_op->vfs_quotactl(mp, cmds, uid, arg, mp_busy)); +} + +static inline int +VFS_STATFS(struct mount *mp, struct statfs *sbp) +{ + return (__vfs_statfs(mp, sbp)); +} + +static inline int +VFS_SYNC(struct mount *mp, int waitfor) +{ + return (mp->mnt_op->vfs_sync(mp, waitfor)); +} + +static inline int +VFS_VGET(struct mount *mp, ino_t ino, int flags, struct vnode **vpp) +{ + return (mp->mnt_op->vfs_vget(mp, ino, flags, vpp)); +} + +static inline int +VFS_FHTOVP(struct mount *mp, struct fid *fidp, int flags, struct vnode **vpp) +{ + return (mp->mnt_op->vfs_fhtovp(mp, fidp, flags, vpp)); +} + +static inline int +VFS_CHECKEXP(struct mount *mp, struct sockaddr *nam, uint64_t *extflagsp, + struct ucred **credanonp, int *numsecflavors, int *secflavors) +{ + return (mp->mnt_op->vfs_checkexp(mp, nam, extflagsp, credanonp, + numsecflavors, secflavors)); +} + +static inline int +VFS_EXTATTRCTL(struct mount *mp, int cmd, struct vnode *filename_vp, + int attrnamespace, const char *attrname) +{ + return (mp->mnt_op->vfs_extattrctl(mp, cmd, filename_vp, + attrnamespace, attrname)); +} + +static inline int +VFS_SYSCTL(struct mount *mp, fsctlop_t op, struct sysctl_req *req) +{ + return (mp->mnt_op->vfs_sysctl(mp, op, req)); +} + +static inline void +VFS_SUSP_CLEAN(struct mount *mp) +{ + if (mp->mnt_op->vfs_susp_clean != NULL) + mp->mnt_op->vfs_susp_clean(mp); +} + +static inline void +VFS_RECLAIM_LOWERVP(struct mount *mp, struct vnode *vp) +{ + if (mp->mnt_op->vfs_reclaim_lowervp != NULL) + mp->mnt_op->vfs_reclaim_lowervp(mp, vp); +} + +static inline void +VFS_UNLINK_LOWERVP(struct mount *mp, struct vnode *vp) +{ + if (mp->mnt_op->vfs_unlink_lowervp != NULL) + mp->mnt_op->vfs_unlink_lowervp(mp, vp); +} + +static inline void +VFS_PURGE(struct mount *mp) +{ + if (mp->mnt_op->vfs_purge != NULL) + mp->mnt_op->vfs_purge(mp); +} #include -#define VFS_KNOTE_LOCKED(vp, hint) do \ -{ \ - if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { \ - KNOTE_LOCKED(&vp->v_pollinfo->vpi_selinfo.si_note, \ - hint); \ - } \ -} while (0) +static inline void +VFS_KNOTE_LOCKED(struct vnode *vp, int hint) +{ + if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { + KNOTE_LOCKED(&vp->v_pollinfo->vpi_selinfo.si_note, + hint); + } +} -#define VFS_KNOTE_UNLOCKED(vp, hint) do \ -{ \ - if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { \ - KNOTE_UNLOCKED(&vp->v_pollinfo->vpi_selinfo.si_note, \ - hint); \ - } \ -} while (0) +static inline void +VFS_KNOTE_UNLOCKED(struct vnode *vp, int hint) +{ + if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { + KNOTE_UNLOCKED(&vp->v_pollinfo->vpi_selinfo.si_note, + hint); + } +} #include From nobody Sun May 10 18:11:18 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gD9sM2H5Dz6cjgd for ; Sun, 10 May 2026 18:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gD9sL3Ht3z3JlB for ; Sun, 10 May 2026 18:11:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m2J/J5x/F/weqBCeJvgxryVe2q8Zqpr3AUfCGI+16sM=; b=BpA5J7GZzXaU0ISdrToDdEFswthOYR5nWNhnO+uDLhl39QRcXYtOmPr35H+jDw+3WxtiyG lskXbk4KlPDty9WdgiJijTlJff8pflmD8Vp7W5GPoA8dbp+kWdhdBEDFxMPHl71GW/KsEj nEzn0yqBOP3p7ZbUGPSDrlepNjkJJDYeVMHcXkRqEBIxMwS3Aa9hvjxHpxCBl+QF1jLkso RNjXMcHPTQ+2var02omCKnUJRO/uK0Z7CWjf2aVqpNH7B0GZ2y59DUpjxss8uFFvz585QT Ymfx/dYZr5PmKYJfaIDMTYymbG88a/sBjxYEGSimPE5+5pdKtP6dg1ypZlSM7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778436678; a=rsa-sha256; cv=none; b=jJB5m1/7mwgFmq5PEQoqjZBAXQWBFAz71F0zC2E3M4QRiXYCo5q/spyCm0+sSxAGnYAmAK HPr+DYcWtSUNdZQ7STbyHfW+pwGPdHx+VXECDNRH5bZkeHHD9JIiTnXQvAwwDUwkF/y0FQ N15bZnmuFa1LwXplgnpMz4jcrop0z/4lQSbfLXq2SW4uOGgpx5PwsKNFKjGst+mzPs45+E ieSWGkgRtiNKI1+F+znHfWnRsnM0ndJ+l/jYkzxwcqIUG5P+3ts+0H81yhGFSy3QlUymT7 kI7C3PxCtxFiN629E1kgL52dYfjqwDt3Fqc3u8/XX4vHMzUJ7dbssyL91CUyvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m2J/J5x/F/weqBCeJvgxryVe2q8Zqpr3AUfCGI+16sM=; b=jf4twBHN9AzZtsxerECU+wLN+yst9mMTSeGle1uVVu8VaetfavZcMZuIS+Br8eBCYroeCl gMcACs58/Z5bRCdLcPa1qwufxwhI8tVfxFtVMgdrNzeik34hn2+VGfOt3lWSB37+8hXUka gQTybyFJ1BgIST/8T6PzlSXdSmwlz3gp6zzo+CJGQq6BsL7c1vUzzyX3rsbVryv5xY92Y3 cImui+dfiJQhyVUf/TKUdZ7B9VHICy+Ib/DDiQxeUBg5gN3T+P+PWPBx4i+k4w7gn91i3J KkqCy/oV1CGGco7F5ugNgXMuKu9LkJ1XlN3vRCOTye+ntixHV7g9SPuVjrMAAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD9sL1ptYzgdY for ; Sun, 10 May 2026 18:11:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41de6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 18:11:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 5e4947f7e08a - main - sys/vnode.h: remove stale comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e4947f7e08a90ba50f9e8cea9ae5e128717cb5f Auto-Submitted: auto-generated Date: Sun, 10 May 2026 18:11:18 +0000 Message-Id: <6a00ca46.41de6.75480034@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5e4947f7e08a90ba50f9e8cea9ae5e128717cb5f commit 5e4947f7e08a90ba50f9e8cea9ae5e128717cb5f Author: Konstantin Belousov AuthorDate: 2026-04-24 02:06:02 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 17:43:46 +0000 sys/vnode.h: remove stale comment The source sweep is not going to happen. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56611 --- sys/sys/vnode.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index d1d20778a8ec..4fee025a93ea 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -221,7 +221,6 @@ _Static_assert(sizeof(struct vnode) <= 448, "vnode size crosses 448 bytes"); #define bo2vnode(bo) __containerof((bo), struct vnode, v_bufobj) -/* XXX: These are temporary to avoid a source sweep at this time */ #define v_object v_bufobj.bo_object #define VN_KNOTE(vp, b, a) do { \ From nobody Sun May 10 18:11:13 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gD9sN0Lgzz6cjDg for ; Sun, 10 May 2026 18:11: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 4gD9sM1X3zz3JlM for ; Sun, 10 May 2026 18:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wpt5Hz3NNbSW5sCS+FM5HxusYX0jaXGP3cswk5gvhyE=; b=wSF/oidPdFFEddIwAhsWnFOJG4NlBKL0hMmdI8n4Jslz+7CJDmIzKSwJ5MvrTZqJCE9CYq bDD10Jj5guaDfSQCg+3JKi58PQETU9VrC5FaE+guAMXTDwcdt2hwBBeB+c3jthxN6SjgYg o9MR/T6Rt2aLrvlMms6Rii7kUYGTbRp1TokWziSp2wtIkcHH3ZiSp2V9Rnj+8QZsuQpvK4 Up1dCHZJpQ/UMuLfKYSxUWiJ3HUJ4XhhBb5XEP7QMMZRY56u8qWUSThrZIMgDqJ/QdVMPE 21ONFEYgsEkw4cIKmT0iNz2PaGT4wj14rqEpkd3CwjB/aotfTatQZHeQa4qiHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778436679; a=rsa-sha256; cv=none; b=t+wUQNJCzlBFOUGqNCclIKHaZoehTRSOwAX8MwVObuHiu7sgeYYW8BHZ2YPMxlvCWT9J5s gJ/fqhk3Wasc164y6RffHrE4ltuVqn6adYKUA7vihUv/C7M6JBwRzMP6eNc1FfRiH4kUK1 xG1QPJAET39ZinT8ep569QHTuR/4mw+u4qRCews9xMvgLmHQOzWrPd8ZqgJoPkl2Q+AqL6 33dDBjRoGF4pCu3MTjAIJqWxfBv2eU9i/Xxq2Yzy3Eq+Xb51Jm7Wl2A/dmQxMn8C3vkRY1 kWwr3UwU3TrzfxIKYlQ0Kenr8DJkY6ygmCiph0qzd/YdnlMZ2kXKQilw3YODbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wpt5Hz3NNbSW5sCS+FM5HxusYX0jaXGP3cswk5gvhyE=; b=QHSwXhLLBI4ESH9O4IJ02UxEkLi+urHb11N2nax7qNCVg2658a1mKAUrcaMHqdMJS4wLja xIT8nxfULh6OuO2wAR2Mi3OfQhux/ikDepVlhKZu+CnSMKp6L4FNaNeZlhamxVjcNikliU XZgNo4yDanmwQpbyl2STJVH9L8IxsGqiGYFJHJkzqMuP1Ley0jOFg/e6iEwzgRiPXawR3D ZxW/3ENYArh7bNX/PXN4CAWhGzaRCpvv6FoqEp0I0rjM2Gho7jlWLeoTMe8ZLlOIGO54BW EkRaoA1t14BlYUcsrF8rQxIwdSjOiLxIo/vZilDPN84S10TcBffSdk/L/zzcqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD9sM0wBCzh0R for ; Sun, 10 May 2026 18:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 414fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 18:11:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 32cf4514cad6 - main - vfs: convert vfs_op_thread_* macros to static inlines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32cf4514cad66ff69ffc96ede20d8debc9b96790 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 18:11:13 +0000 Message-Id: <6a00ca41.414fb.617f2e5f@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=32cf4514cad66ff69ffc96ede20d8debc9b96790 commit 32cf4514cad66ff69ffc96ede20d8debc9b96790 Author: Konstantin Belousov AuthorDate: 2026-04-24 01:26:11 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 17:43:46 +0000 vfs: convert vfs_op_thread_* macros to static inlines Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56611 --- sys/kern/vfs_cache.c | 4 +-- sys/kern/vfs_mount.c | 6 ++-- sys/kern/vfs_subr.c | 6 ++-- sys/kern/vfs_vnops.c | 4 +-- sys/sys/mount.h | 97 +++++++++++++++++++++++++++++++--------------------- 5 files changed, 68 insertions(+), 49 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 3f8591bd0ba7..66210bf58a7c 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -5737,7 +5737,7 @@ cache_fplookup_climb_mount(struct cache_fpl *fpl) prev_mp = NULL; for (;;) { - if (!vfs_op_thread_enter_crit(mp, mpcpu)) { + if (!vfs_op_thread_enter_crit(mp, &mpcpu)) { if (prev_mp != NULL) vfs_op_thread_exit_crit(prev_mp, prev_mpcpu); return (cache_fpl_partial(fpl)); @@ -5792,7 +5792,7 @@ cache_fplookup_cross_mount(struct cache_fpl *fpl) return (0); } - if (!vfs_op_thread_enter_crit(mp, mpcpu)) { + if (!vfs_op_thread_enter_crit(mp, &mpcpu)) { return (cache_fpl_partial(fpl)); } if (!vn_seqc_consistent(vp, vp_seqc)) { diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index ddc5a1b70887..fff05a627162 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -500,7 +500,7 @@ vfs_ref_from_vp(struct vnode *vp) if (__predict_false(mp == NULL)) { return (mp); } - if (vfs_op_thread_enter(mp, mpcpu)) { + if (vfs_op_thread_enter(mp, &mpcpu)) { if (__predict_true(mp == vp->v_mount)) { vfs_mp_count_add_pcpu(mpcpu, ref, 1); vfs_op_thread_exit(mp, mpcpu); @@ -527,7 +527,7 @@ vfs_ref(struct mount *mp) struct mount_pcpu *mpcpu; CTR2(KTR_VFS, "%s: mp %p", __func__, mp); - if (vfs_op_thread_enter(mp, mpcpu)) { + if (vfs_op_thread_enter(mp, &mpcpu)) { vfs_mp_count_add_pcpu(mpcpu, ref, 1); vfs_op_thread_exit(mp, mpcpu); return; @@ -645,7 +645,7 @@ vfs_rel(struct mount *mp) struct mount_pcpu *mpcpu; CTR2(KTR_VFS, "%s: mp %p", __func__, mp); - if (vfs_op_thread_enter(mp, mpcpu)) { + if (vfs_op_thread_enter(mp, &mpcpu)) { vfs_mp_count_sub_pcpu(mpcpu, ref, 1); vfs_op_thread_exit(mp, mpcpu); return; diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index bba0f3575300..48bfea2f5bf9 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -876,7 +876,7 @@ vfs_busy(struct mount *mp, int flags) MPASS((flags & ~MBF_MASK) == 0); CTR3(KTR_VFS, "%s: mp %p with flags %d", __func__, mp, flags); - if (vfs_op_thread_enter(mp, mpcpu)) { + if (vfs_op_thread_enter(mp, &mpcpu)) { MPASS((mp->mnt_kern_flag & MNTK_DRAINING) == 0); MPASS((mp->mnt_kern_flag & MNTK_UNMOUNT) == 0); MPASS((mp->mnt_kern_flag & MNTK_REFEXPIRE) == 0); @@ -939,7 +939,7 @@ vfs_unbusy(struct mount *mp) CTR2(KTR_VFS, "%s: mp %p", __func__, mp); - if (vfs_op_thread_enter(mp, mpcpu)) { + if (vfs_op_thread_enter(mp, &mpcpu)) { MPASS((mp->mnt_kern_flag & MNTK_DRAINING) == 0); vfs_mp_count_sub_pcpu(mpcpu, lockref, 1); vfs_mp_count_sub_pcpu(mpcpu, ref, 1); @@ -6985,7 +6985,7 @@ vfs_cache_root(struct mount *mp, int flags, struct vnode **vpp) struct vnode *vp; int error; - if (!vfs_op_thread_enter(mp, mpcpu)) + if (!vfs_op_thread_enter(mp, &mpcpu)) return (vfs_cache_root_fallback(mp, flags, vpp)); vp = atomic_load_ptr(&mp->mnt_rootvnode); if (vp == NULL || VN_IS_DOOMED(vp)) { diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 4061b2272193..15704634ff62 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -2083,7 +2083,7 @@ vn_start_write_refed(struct mount *mp, int flags) struct mount_pcpu *mpcpu; int error, mflags; - if ((flags & V_XSLEEP) == 0 && vfs_op_thread_enter(mp, mpcpu)) { + if ((flags & V_XSLEEP) == 0 && vfs_op_thread_enter(mp, &mpcpu)) { MPASS((mp->mnt_kern_flag & MNTK_SUSPEND) == 0); vfs_mp_count_add_pcpu(mpcpu, writeopcount, 1); vfs_op_thread_exit(mp, mpcpu); @@ -2252,7 +2252,7 @@ vn_finished_write(struct mount *mp) if (mp == NULL) return; - if (vfs_op_thread_enter(mp, mpcpu)) { + if (vfs_op_thread_enter(mp, &mpcpu)) { vfs_mp_count_sub_pcpu(mpcpu, writeopcount, 1); vfs_mp_count_sub_pcpu(mpcpu, ref, 1); vfs_op_thread_exit(mp, mpcpu); diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 1ca492929813..f99d0856f16e 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -36,8 +36,10 @@ #include #include #ifdef _KERNEL +#include #include #include +#include #include #include #include @@ -1137,47 +1139,64 @@ void resume_all_fs(void); */ #define vfs_mount_pcpu(mp) zpcpu_get(mp->mnt_pcpu) #define vfs_mount_pcpu_remote(mp, cpu) zpcpu_get_cpu(mp->mnt_pcpu, cpu) +static void vfs_op_thread_exit_crit(struct mount *mp, struct mount_pcpu *mpcpu); -#define vfs_op_thread_entered(mp) ({ \ - MPASS(curthread->td_critnest > 0); \ - struct mount_pcpu *_mpcpu = vfs_mount_pcpu(mp); \ - _mpcpu->mntp_thread_in_ops == 1; \ -}) - -#define vfs_op_thread_enter_crit(mp, _mpcpu) ({ \ - bool _retval_crit = true; \ - MPASS(curthread->td_critnest > 0); \ - _mpcpu = vfs_mount_pcpu(mp); \ - MPASS(mpcpu->mntp_thread_in_ops == 0); \ - _mpcpu->mntp_thread_in_ops = 1; \ - atomic_interrupt_fence(); \ - if (__predict_false(mp->mnt_vfs_ops > 0)) { \ - vfs_op_thread_exit_crit(mp, _mpcpu); \ - _retval_crit = false; \ - } \ - _retval_crit; \ -}) - -#define vfs_op_thread_enter(mp, _mpcpu) ({ \ - bool _retval; \ - critical_enter(); \ - _retval = vfs_op_thread_enter_crit(mp, _mpcpu); \ - if (__predict_false(!_retval)) \ - critical_exit(); \ - _retval; \ -}) - -#define vfs_op_thread_exit_crit(mp, _mpcpu) do { \ - MPASS(_mpcpu == vfs_mount_pcpu(mp)); \ - MPASS(_mpcpu->mntp_thread_in_ops == 1); \ - atomic_interrupt_fence(); \ - _mpcpu->mntp_thread_in_ops = 0; \ -} while (0) +static inline bool +vfs_op_thread_entered(struct mount *mp) +{ + struct mount_pcpu *mpcpu = vfs_mount_pcpu(mp); -#define vfs_op_thread_exit(mp, _mpcpu) do { \ - vfs_op_thread_exit_crit(mp, _mpcpu); \ - critical_exit(); \ -} while (0) + MPASS(curthread->td_critnest > 0); + return (mpcpu->mntp_thread_in_ops == 1); +} + +static inline bool +vfs_op_thread_enter_crit(struct mount *mp, struct mount_pcpu **mpcpup) +{ + struct mount_pcpu *mpcpu; + bool retval_crit = true; + + MPASS(curthread->td_critnest > 0); + mpcpu = vfs_mount_pcpu(mp); + MPASS(mpcpu->mntp_thread_in_ops == 0); + mpcpu->mntp_thread_in_ops = 1; + atomic_interrupt_fence(); + if (__predict_false(mp->mnt_vfs_ops > 0)) { + vfs_op_thread_exit_crit(mp, mpcpu); + retval_crit = false; + } + *mpcpup = mpcpu; + return (retval_crit); +} + +static inline bool +vfs_op_thread_enter(struct mount *mp, struct mount_pcpu **mpcpup) +{ + bool retval; + + critical_enter(); + retval = vfs_op_thread_enter_crit(mp, mpcpup); + if (__predict_false(!retval)) + critical_exit(); + return (retval); +} + +static inline void +vfs_op_thread_exit_crit(struct mount *mp, struct mount_pcpu *mpcpu) +{ + MPASS(mpcpu == vfs_mount_pcpu(mp)); + MPASS(mpcpu->mntp_thread_in_ops == 1); + + atomic_interrupt_fence(); + mpcpu->mntp_thread_in_ops = 0; +} + +static inline void +vfs_op_thread_exit(struct mount *mp, struct mount_pcpu *mpcpu) +{ + vfs_op_thread_exit_crit(mp, mpcpu); + critical_exit(); +} #define vfs_mp_count_add_pcpu(_mpcpu, count, val) do { \ MPASS(_mpcpu->mntp_thread_in_ops == 1); \ From nobody Sun May 10 18:14:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gD9xL5tsgz6ck6y for ; Sun, 10 May 2026 18:14: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 4gD9xL40qQz3M90 for ; Sun, 10 May 2026 18:14:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fGQsMtDBvLDyBCL1MUxjlqtuwJwvYmiPsHpNQoITAuU=; b=Pt4sDIu0As15VKqmmYf0o81B1PLGjSzrQute2kdDxcfS5r2tp9FyPajLHru/O9zHpb0O2C zGcxSUp+yN2WPN+xhDlwAofDQZAw18bo2vCkiNpTMRx/laHuKa/6rZVO8daEskWpzM4lsJ Q+huDNeOi5r3zf9yQDXPHEt9pihTgRavi0QK+Z3UsD2sXyASH8ufrxy2EZmPF2qjg9NMW7 zjTp+ld4NmykgFjF2bHhnmnPWmYMP7BOK0fSMjmEHbinPO8TUn+ntzRNkc/e3dxaV7ejUA 9s3aMPX5jnUGIUz9wEG1Nry9+2LLJ76zZdqfV+f8qmMGe7KbLY/Tk4+EV1IYBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778436886; a=rsa-sha256; cv=none; b=UrwAfSbr1Ixj7nLKGWQk0AnOvHsoJWW6Z0H+ES2oMZcRKTPPiws5cY4n2/iCL2zdBIGSQs 2nDQnIL54WzCP/H4JoWrOh1+f/aYJJSSzRgIMgCBWvnfivZeg7WGZBCdeqyl9PGEpQpIwL lVRHyiBpOmymTcxLG1T956vy0daDbl84u4qU1OaU9nQOf9tvqC0ZjHxF0pGrZ6FxLUJMhw mym2eiD0b1lEYL+Ma0vlZvQUD/ykEmNlq727SRTb5dT3uTikDtkrAxEw6bPAqkNBTQz70j aGcF+FjQ//axfIQXI/ZPtRthhMiakCnIMBbrECxGh2mcKY3gCJqE/ZXqmkBwEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778436886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fGQsMtDBvLDyBCL1MUxjlqtuwJwvYmiPsHpNQoITAuU=; b=WoDszaTAlVWyKrhPeVGpehc05SCwKpWn8anoS3nMRNRbJpt4ds3C1Q23Ky51MZiOc/amEu rOM8lasmCJHR8zGPAKcEnMUnd/fjADARDQGTHAgEm2StG7Rl9lKY0c0lKSwSIoI4xVouF6 iqMWw99XybC4EFckM3WC4xTgarn1KWnNCXd71vv1pLAFBBQOU97Z1AYbJLfW/Zq2mAPPiV HFQJX5J32NTGq8l8+aA9QT0CUzCmT3yBERJGl4dz55s3QZUVHPRdCOoFu/dXmHW6Oj0Avg omH6/40yOEjVATIM1phMCSeaAQl4VME/WrHUgZ4qcQ+td7rZJ7k9kW3V38q+Cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gD9xL3DYMzgdv for ; Sun, 10 May 2026 18:14:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4418e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 18:14:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ea72f6d5a8b9 - main - sys/cdefs.h: move __BEGIN_DECLS/__END_DECLS into a helper sys/_decls.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea72f6d5a8b9386a09e23fbdc933effb007ca899 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 18:14:41 +0000 Message-Id: <6a00cb11.4418e.735c08d5@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ea72f6d5a8b9386a09e23fbdc933effb007ca899 commit ea72f6d5a8b9386a09e23fbdc933effb007ca899 Author: Konstantin Belousov AuthorDate: 2026-05-08 14:13:35 +0000 Commit: Konstantin Belousov CommitDate: 2026-05-10 18:14:18 +0000 sys/cdefs.h: move __BEGIN_DECLS/__END_DECLS into a helper sys/_decls.h There are situations where nothing from sys/cdefs.h is needed except for the declaration braces. More, the other facilities from sys/cdefs.h might unnecessarly pollute the namespace. Reviewed by: markj, imp Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D56889 --- sys/sys/_decls.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ sys/sys/cdefs.h | 8 +------- tools/build/Makefile | 1 + 3 files changed, 48 insertions(+), 7 deletions(-) diff --git a/sys/sys/_decls.h b/sys/sys/_decls.h new file mode 100644 index 000000000000..2ef61671dd70 --- /dev/null +++ b/sys/sys/_decls.h @@ -0,0 +1,46 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 1991, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Berkeley Software Design, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _SYS__DECLS_H_ +#define _SYS__DECLS_H_ + +#if defined(__cplusplus) +#define __BEGIN_DECLS extern "C" { +#define __END_DECLS } +#else +#define __BEGIN_DECLS +#define __END_DECLS +#endif + +#endif diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index a08c50c8439a..d0a34f1bdfc0 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -61,13 +61,7 @@ #define __has_builtin(x) 0 #endif -#if defined(__cplusplus) -#define __BEGIN_DECLS extern "C" { -#define __END_DECLS } -#else -#define __BEGIN_DECLS -#define __END_DECLS -#endif +#include /* * This code has been put in place to help reduce the addition of diff --git a/tools/build/Makefile b/tools/build/Makefile index f0856900b281..d71cc710be87 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -360,6 +360,7 @@ DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h .if ${.MAKE.OS} == "FreeBSD" # Needed to build most of the things below, which include sys/cdefs.h either # directly or transitively +SYSINCS+= ${SRCTOP}/sys/sys/_decls.h SYSINCS+= ${SRCTOP}/sys/sys/_visible.h SYSINCS+= ${SRCTOP}/sys/sys/cdefs.h .endif From nobody Sun May 10 19:41:36 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gDCsd3rvlz6cr6C for ; Sun, 10 May 2026 19:41: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 4gDCsd1LXzz3VhK for ; Sun, 10 May 2026 19:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778442101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C7FpZeADhT0VtSnFfNZrRCMDVwQNvGo0aSAZjgmhqoc=; b=cfMhZp75rWIb4hQayaH7V2mfGjPUjIqykx2dkjg+6VAvcIdbK7eECvPygb8V7ZqCpE65MG 0kcpBqKWU2T+TxoJXPa9qOigY8v4lAgm0ZLykVV4WdVOw3cWvAhzEJvRt//Amnu9swQ5zL 41YMFLMZIBavoykkdQX/ZV9j7jgJFgNhtttnDF72NXh/fHSVk37yfpi9AbPQWYJXgNRn12 C0LhQ41WWdAglq2POibp1agUOd6r8EcUkXEmy8gJvUVy0hOB1T2eFzlfem0w/nE0xMPzzV RYB9EX3JKXOkkz5FQkMM69X14+IL/S3AqihHkBnvhEjaBpjaT92SmaRkbzeXCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778442101; a=rsa-sha256; cv=none; b=Wj6fwWkQ4Ielg8tM5TbaE5yXhxLL5+ZmCKdJER+UIzN4Ret/c3wIZ0NY0II3LZoT1ZlMB0 w9nX0ryis+apFYaoHLzCQYpOcVJgzK/Emgci8HlPEEQ9yVEnz277Q7RWwZmTzBVtmiG1iC wZuXAimPhIX2HGXnoFQkQBJ/EV6e0FEby2Bp7UpRbS7NAFJwVY8li4J8MmmgQVhy6WLH/b ep6Qxlz07foRvDxZUZy7LjAzB3xe9OKEstkO6y6+E6cI7OkVys+ggy9SGnfWVLq/Oz6LfY HU0arxXHz8GPJqtEdKquQkafGDBvJxCzCQOZcSvd56g1Y0lgBpajPknC0tsuPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778442101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C7FpZeADhT0VtSnFfNZrRCMDVwQNvGo0aSAZjgmhqoc=; b=Kf6xKvs7pT/mnHUKGkUTFRPBrdWQ9uVKRvruMP3I6boZj7PozST6o9Vs6uv14QA/RLUm7h 8JZGUSCjdQm+/g7EJHCyQZMHtpgZlMVrYHpwcEwtahWa198iXoHsn7DxU0v/4kKUOP1UOZ aBCxk29v2CCa2POQA1NIqQCXx0m8hTbtRvDYUeoveKbrQY9vrYkfV3DKhugu7wQTMc2NHA t7HhSrlarl402hcdAVwEJj1DpuHDhEy9L+/pIxfueA3Xo4JqvZ+bZsLCy1Ue8vvuwaujyu Xz7mWLl6nJHPSBXTNywkRLN3v2Bhc8dJHiFvsYtC8UjCifm3P9ooC7fkYMVwCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gDCsd0wg8zkgJ for ; Sun, 10 May 2026 19:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bef0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 10 May 2026 19:41:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 70ef02b5d3fd - main - if_geneve: Fix uninitialized variable use in geneve_udp_input() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70ef02b5d3fdbc4f51ea81404c4cbca310083ce6 Auto-Submitted: auto-generated Date: Sun, 10 May 2026 19:41:36 +0000 Message-Id: <6a00df70.1bef0.3cd82247@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=70ef02b5d3fdbc4f51ea81404c4cbca310083ce6 commit 70ef02b5d3fdbc4f51ea81404c4cbca310083ce6 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-05-10 19:25:53 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-05-10 19:38:52 +0000 if_geneve: Fix uninitialized variable use in geneve_udp_input() Set the ifp variable as soon as soft_c becomes available so that interface statistics can be incremented. PR: 295129 Reported by: Robert Morris Fixes: e44d2e941e8e ("if_geneve: Add Support for Geneve ...") --- sys/net/if_geneve.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_geneve.c b/sys/net/if_geneve.c index ab8b313e860a..59822045b77b 100644 --- a/sys/net/if_geneve.c +++ b/sys/net/if_geneve.c @@ -3021,6 +3021,7 @@ geneve_udp_input(struct mbuf *m, int offset, struct inpcb *inpcb, if (sc == NULL) return (false); + ifp = sc->gnv_ifp; if ((sc->gnv_flags & GENEVE_FLAG_RUNNING) == 0) goto out; @@ -3043,7 +3044,6 @@ geneve_udp_input(struct mbuf *m, int offset, struct inpcb *inpcb, if (error != 0) goto out; - ifp = sc->gnv_ifp; if (ifp == m->m_pkthdr.rcvif) /* XXX Does not catch more complex loops. */ goto out;