From nobody Mon Jan 19 17:45:56 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvyYJ69w8z6P6jB for ; Mon, 19 Jan 2026 17:45: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dvyYJ5PSVz3JCt for ; Mon, 19 Jan 2026 17:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768844756; 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=Z5a7W9irpGrglTXa1jGcdGp8CEjt7mkoLOh1b3OQmk4=; b=PeaKiyh/VEWGVApJW0J3cyFhjGC0uWZWj8Z7EnE2NEBkAOykh41al+aAUQ1LFl/oOrCAKf zMhkHFDqllRUSI9se92IMOToKVFayP3B2Npp9VSXFUB6B+guQnhuMzTM18IE0JTwXsRm0t dCU4kjFtg+C/eTNxs8RB5P34CSrBrhyR5FILhC41VdYj45MkN0KrQLEvFL7q2PEFQyVSdE 4zAomgjg3QG3uiZ3a4Bl1Pd0rC2H0zcIg0CYOfUSuMp1TUeZd1b6duHMk/ZL9LnGtuGm9K RWHt6I07m3z3qHETu0jzE0Z+/bmodpDfHnjAwDsdFEtDpprHV72ZXMW+Nc8pSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768844756; 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=Z5a7W9irpGrglTXa1jGcdGp8CEjt7mkoLOh1b3OQmk4=; b=jSXXt6U2xsurOCJU6M3WrvhcLR3lfHbWd9GsM9SkOGEVeP9nLFvrknWc8BfFl5oZTxK2Bn 442IVufji0dun6gQ4a71Q+xLNr7akYEAev0OSOK+QEGmOR+Jrh9eXI/1DcQBWV7BC0tnsL 3GuGKrcJvCoPrc+VpX/NwCIUO7Q22N1SHTerBuBmnQRqkerDVDbhjReS85QAVU0ASDAuPs herGx4VMXJ8AaarklVc5WOZUGCAt3djkXU9YNUxBJ3TNygYcrTs83+TbLfBawdrzwarsft FyNOilWMEGAm0eQOJ2hqI0liVkJgmjPyZdTGlpM9buwt4jkXr+WI/B9qJ0PIrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768844756; a=rsa-sha256; cv=none; b=M47ZPaCSXQhm1CtjOQFZWQ8OGMWVVeGwV/fyl87a4sLkE/EWyE7G9G91wYTFrvxOzteWQ1 tYxDx6h/MxBsCjUAoCT44pNyzlCP5WmuMlnliUdQbEVam6tkFAiDFRCLx1ijNxd9UwJRj6 e6bk2J/qxJY9v5B7ePFBZc8f1TQFnzV6trMI3zKnHquNzBlJthICFhpm2BIUfDyl8VfjmB 029yjf0SZLRS68OBy+fgxhbgUB/2/O8lGb7I27QkoXqfewn2tvw63un16w112rkXOZjuwB zCERu/k4ebamuI+RX3P0C1TqwxPz7b/Vkx/ieKFBfX0FMtjrxqT+AukMZ6tk4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dvyYJ4fxPzjR0 for ; Mon, 19 Jan 2026 17:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c780 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 17:45:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mark Johnston From: Craig Leres Subject: git: dccf0058ef62 - stable/14 - grep/tests: Fix up the zgrep executable path in a newly added test List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dccf0058ef62802fc44e041b4fd6ba1a3fb4439c Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 17:45:56 +0000 Message-Id: <696e6dd4.3c780.7b0fef3f@gitrepo.freebsd.org> The branch stable/14 has been updated by leres: URL: https://cgit.FreeBSD.org/src/commit/?id=dccf0058ef62802fc44e041b4fd6ba1a3fb4439c commit dccf0058ef62802fc44e041b4fd6ba1a3fb4439c Author: Mark Johnston AuthorDate: 2026-01-12 13:56:56 +0000 Commit: Craig Leres CommitDate: 2026-01-19 17:45:14 +0000 grep/tests: Fix up the zgrep executable path in a newly added test Fixes: da5d94d29a5e ("Remove obsolete BUGS section from zgrep(1) man page, add test") (cherry picked from commit 045112f148fa092c92ec53204708f638b226ff8f) --- usr.bin/grep/tests/grep_freebsd_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/grep/tests/grep_freebsd_test.sh b/usr.bin/grep/tests/grep_freebsd_test.sh index ae9a9c1274f3..338fc7a3ee1f 100755 --- a/usr.bin/grep/tests/grep_freebsd_test.sh +++ b/usr.bin/grep/tests/grep_freebsd_test.sh @@ -133,7 +133,7 @@ eflags_body() printf "aaa bbb ccc\n111 222 333\ndon't match this line" > in atf_check -o 'inline:aaa bbb ccc\n111 222 333\n' \ - /tmp/zgrep.sh -eaaa -e333 in + zgrep -eaaa -e333 in } atf_init_test_cases() From nobody Mon Jan 19 17:45:55 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvyYH5ptsz6P75v for ; Mon, 19 Jan 2026 17:45: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dvyYH4GyJz3JNH for ; Mon, 19 Jan 2026 17:45:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768844755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i0ZKyfLs3h567w/RMe/iwDKTpwXcJqAjh59soRFPBc0=; b=VVwMRpXbQo827a/BzoQ5wFMy3SwbvXF6BnX36w3BAojqs3JRni89renPMNkOKs9Id50N+8 do38rdqeiUHNZHoVn4m9eb1yjtlyH6yoDVPnVLHOQ1AwIaPTrwvyw5auTfMNtEKP8Lc7+y 03zMMyXiMwmt9i7Lc7ymNrOlXJ5wJKLExB04hdbDErOiSQ58Djtnw9LVSfngYUyvQgOvmR nX286U+V91UIdvgQOQ0LvP2nrbaAWw3bbQc70WC4M8d7cds2iRjoSKx+2D7hxn75YHPZHY mMIxl4wA5FrfXMCbZeA+CC4XIYNtgDXaYEW6LshwP84UwAtGqtZ/Fsqp3GzA5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768844755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i0ZKyfLs3h567w/RMe/iwDKTpwXcJqAjh59soRFPBc0=; b=OG3KWRuRvmzsgEIdgFTD1Hng9pKpJXrR4teRAbWB5dSg/aqqmtHNLIitqTWKKkYuqXAHG3 HyA6fvk3Ydm0B/GGGmqUiE2H6ItHBtV62DCC1VaqFWIuNhv/l+Miubr3Wpia701Y72+tYJ 5XHXytbgjx6GKYRM5vVeivMJAQ08FMm+rbwgQ6SkrO7Owc4vt/NQ+hD8nc93oZk8JJV+9R kja1X/MzD17HcpnhrvHW/HSpbH7cCE5ZGCR/uz8lXJsZQFsklywSV5IbrIJ1/MibMeL6Al TAYVdwz6yv/dGRZKxNeffPbK2x9g7/u1GQ+Ep/BtJ9hFLBanPk4WCmLaLNkamQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768844755; a=rsa-sha256; cv=none; b=QGe9yocrnRY32bma+CXprGeKo1ve+ZGW50J31waDSeqQZ/vP0lXixqkzbmNxKcRzMEdLnf bUqK6Y9VrGTL/xPKoU5ciFjsNxiKdJctEvBi1EW3/dcS8YlXVOPzfWGNxUFmBdR9IbeX/K GvPRh2sooeDdux6L5HqXge5Ub9Zgvo23SMhdKg+LNpnajurFr1rzh1UHBuiuDbiLOXtoL9 4UYYde460m/sD/EM5CZo3NzME+oppljviy8kO95IzM36GPmYEwip6ukB/J7VRrJrj934P+ Ymm6aNR+Oa22e/ybylqfDldf5D+Uu2En0DdoqMxuFitZh/uA2epsqqytidpGdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dvyYH3tDvzj7R for ; Mon, 19 Jan 2026 17:45:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 394e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 17:45:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Craig Leres Subject: git: 582882558ce9 - stable/14 - Remove obsolete BUGS section from zgrep(1) man page, add test List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 582882558ce9e894e467aed31571f67aa8ae7e65 Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 17:45:55 +0000 Message-Id: <696e6dd3.394e3.409715b1@gitrepo.freebsd.org> The branch stable/14 has been updated by leres: URL: https://cgit.FreeBSD.org/src/commit/?id=582882558ce9e894e467aed31571f67aa8ae7e65 commit 582882558ce9e894e467aed31571f67aa8ae7e65 Author: Craig Leres AuthorDate: 2026-01-10 00:34:39 +0000 Commit: Craig Leres CommitDate: 2026-01-19 17:45:06 +0000 Remove obsolete BUGS section from zgrep(1) man page, add test I forgot to check/update the man page with D54217. While here add a test for multiple -e flags. Reviewed by: markj Approved by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54632 (cherry picked from commit da5d94d29a5ec29817476c39ae2b2ad1666c3f06) --- usr.bin/grep/tests/grep_freebsd_test.sh | 11 +++++++++++ usr.bin/grep/zgrep.1 | 18 ------------------ 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/usr.bin/grep/tests/grep_freebsd_test.sh b/usr.bin/grep/tests/grep_freebsd_test.sh index eaf3694c2b1e..ae9a9c1274f3 100755 --- a/usr.bin/grep/tests/grep_freebsd_test.sh +++ b/usr.bin/grep/tests/grep_freebsd_test.sh @@ -126,6 +126,16 @@ qflag_body() atf_check zgrep -q '1 2' in } +atf_test_case eflags +eflags_body() +{ + # Test use with more than one -e expression + printf "aaa bbb ccc\n111 222 333\ndon't match this line" > in + + atf_check -o 'inline:aaa bbb ccc\n111 222 333\n' \ + /tmp/zgrep.sh -eaaa -e333 in +} + atf_init_test_cases() { atf_add_test_case grep_r_implied @@ -134,4 +144,5 @@ atf_init_test_cases() atf_add_test_case zflag atf_add_test_case color_dupe atf_add_test_case qflag + atf_add_test_case eflags } diff --git a/usr.bin/grep/zgrep.1 b/usr.bin/grep/zgrep.1 index 76eb145db82d..7fa42c916002 100644 --- a/usr.bin/grep/zgrep.1 +++ b/usr.bin/grep/zgrep.1 @@ -92,21 +92,3 @@ This version of the .Nm utility was written by .An Thomas Klausner Aq Mt wiz@NetBSD.org . -.Sh BUGS -.Xr zgrep 1 -does not handle flags that take arguments if there is no whitespace -between the flag and the argument, for example: -.Pp -.Dl "zgrep -enfs /etc/rpc" -.Pp -When more than one -.Fl e -flag is used matching -should occur for any of the patterns (similar to multiple patterns -supplied in a file with the -.Fl f -flag). -.Xr zgrep 1 -only matches the last -.Fl e -pattern. From nobody Mon Jan 19 17:47:04 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvyZd2lNBz6P7DJ for ; Mon, 19 Jan 2026 17:47: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dvyZd0N6hz3JYt for ; Mon, 19 Jan 2026 17:47:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768844825; 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=Su+fnItzzB1zBkRwMZ8Vi1g3uHqusDNW/O0DFAwYdLc=; b=ewqlL6eLA/NES34rbvzOKtLieNfizPiK846TMG4KfcP+E1WpT6SyY/O/Kd9ldnY3cUvBTE zeCdT07AR7Ely/Zukcuc9Y3d7xBjZt236/42py6DZVkv4IOjFcapmrd1MEjuquTfJqjyRz J9w/g+7Ui6E78yCyXq405b5NlYvPnerkuUE6gqw3Rcqsn+cewt3bGszouU/DyNvIApFKmJ cHgPXQXms5MUk8vWS/XnFJQPTFdHbxBdI9UJY4hLf2xIa2n8lLAQdvMLfn8TCamQIE9lpK Lt5wg5ficTwX9jQweejdDIQJURViUk5ntHBA31qiwyyCdya9lYZDEp78LurVvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768844825; 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=Su+fnItzzB1zBkRwMZ8Vi1g3uHqusDNW/O0DFAwYdLc=; b=YAxnQKXeCoLBPd/5a89AJteF2hnkbjQpoIo300RD/m2uyPjvEZwS+S5edAYa/xrpMwKO/P d/4gX4Y6IjxYZuR/fXDQEpl9qLpkR7HDwi/965OspTod3yBGa+WqzjcNj4i8dVDWtokpoG mAJ0dErNw4pKRNmWwo5v9mpijXh0IDuH0U6E4rvXphx5yDVNWBsv/GIT6641cACHoEjjSL ITYyESTZikMlWWxj9ub6fxtyPZIlU6sv/kbJX9lF86pLXd0AvmMDVLdWGT4ZRf0LVY5/8O fzKTkz+mpyQgvppnrRzr6FXfSfTUB5tp9vskwonC/S1auTPKTtoe1YnAjq4pLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768844825; a=rsa-sha256; cv=none; b=NludHUFOnS+RA+65bca0ocAbTh74QnAUzlOfHB3Z/S2HjhqKmH3adYWSk/G8JHcBBGDVGL ekyAP/yRSrg5lO6c8yx0fVCW7SsQQTSrDoJvl9w6jEwVFlCFCoURtlU3X5/ybMbAxJHg/K B4NIX16PU6V2pZFsNrH32zFO0uy0HCSnxZlGItAdRBIfl9ETgZyunn9NYsMdl3iJahdR/P a1Wmdwr9fJVa95e2AsfqPF0s2MLzy4QL5VyLzkyK8d7CO9SssK0f8WIJoEGjEcIHeOugaa aX5u7XX6k0Af0aswfs++vQtNcbD6imej0SrJ1u7IVlp1BhjVkd7mXcxOHHwiwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dvyZc72WJzj2c for ; Mon, 19 Jan 2026 17:47:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3acfc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 17:47:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mark Johnston From: Craig Leres Subject: git: d80f249cbacc - stable/15 - grep/tests: Fix up the zgrep executable path in a newly added test List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d80f249cbaccc3ef30714a08163db7e01e729663 Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 17:47:04 +0000 Message-Id: <696e6e18.3acfc.52ecea5c@gitrepo.freebsd.org> The branch stable/15 has been updated by leres: URL: https://cgit.FreeBSD.org/src/commit/?id=d80f249cbaccc3ef30714a08163db7e01e729663 commit d80f249cbaccc3ef30714a08163db7e01e729663 Author: Mark Johnston AuthorDate: 2026-01-12 13:56:56 +0000 Commit: Craig Leres CommitDate: 2026-01-19 17:46:42 +0000 grep/tests: Fix up the zgrep executable path in a newly added test Fixes: da5d94d29a5e ("Remove obsolete BUGS section from zgrep(1) man page, add test") (cherry picked from commit 045112f148fa092c92ec53204708f638b226ff8f) --- usr.bin/grep/tests/grep_freebsd_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/grep/tests/grep_freebsd_test.sh b/usr.bin/grep/tests/grep_freebsd_test.sh index ae9a9c1274f3..338fc7a3ee1f 100755 --- a/usr.bin/grep/tests/grep_freebsd_test.sh +++ b/usr.bin/grep/tests/grep_freebsd_test.sh @@ -133,7 +133,7 @@ eflags_body() printf "aaa bbb ccc\n111 222 333\ndon't match this line" > in atf_check -o 'inline:aaa bbb ccc\n111 222 333\n' \ - /tmp/zgrep.sh -eaaa -e333 in + zgrep -eaaa -e333 in } atf_init_test_cases() From nobody Mon Jan 19 17:47:03 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvyZj0XM4z6P71f for ; Mon, 19 Jan 2026 17:47: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dvyZh6jklz3JNd for ; Mon, 19 Jan 2026 17:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768844829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BufCJrxJdlNiv+MMDMZiXhKRbZuIFLrSi30J03dDKpo=; b=GCO0ybL1L7fcTpxDhd/u1awmU+xAjipWFH94hpjxNGVIOedy94At6VNWoMxEa/IYU4Trcb SIYPs6PjKS6kRF6jPoDMUR2qxMI3KUtsnsqQtxc1lKui7VZU9s1ziO+KpAEEGp0R3V7dDE JcccK7MHZsKNO6zc0L0322b9okaYSeKjVq3deAoEM1wr2yUlOGQ+nzH+FlF3iBCA82oOgw seMH/esL3i0CTQjsfhdtYe8YNOTd1FtqEQtriWbdTIWcJSnCbmD3qgIdBGkq/nwb344O72 s/baOPOJBKE8rmul9W0nFxiHBugoRNvCXUwXyJvGzS8B5LtcnKYRy++OoYkNvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768844829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BufCJrxJdlNiv+MMDMZiXhKRbZuIFLrSi30J03dDKpo=; b=kD9RWMR8dRd+Z/FMkrO1iWuSsx8S4PPrzMS9rNn9qteIi5hpRyzsPpKZlUKTuDqEJtXsxs loBNZRNTqtANRFqI6/CQTgp+eX1MoD/pGN1lNx5ruFrwZqPw/MvpOMUKwqtDqcBmZYKXOy 5/KOlfWCOgIsHwiocUd9hPVIrD6iGX6PGeoz4JmAiKrVfwsVoa4eNPpV8N7f19QQtZoEYY qQBq5/RQiXmOzJQUn2on4DfNlY3plqTm9t8wgEFlgr+aD88K18l/fld7Q5KIt8fh6maXYQ pE9pCDjvcwlwuqyPGvJfOPJp2H0coD2a/91XkBRZXvCvnMQEBcSQJkRLvMBxlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768844829; a=rsa-sha256; cv=none; b=HB4KJwXzKxUM0H4svR9Qi3WigsiEIIgI34eUo+t9UE6DRUj8sptW6VtPUV6SRAGyVLkNUK dUAOdY6obSiSYkYq+w6PnvMiBEJAFjGm1l5Ad23mj/+AKxD5289bgy1X9PRPr7N6jQrhd5 zpU04PFUOLfPRMqz4xJ8JwBwUuxp9YsiCFQS0jwuFKQgZpwzzB48h6chB6kotQ9DB8Ssc/ e+jGyyi3VuA+gw8Y970zQjNslZLVCT8LITw7bN1z468tE3um7SGuYRWyiDBy1Puvm+VZ8e 45/OV44gCHtT0kI5lAweoFJGlaHSeH6EjOxXjxqJTzLDYNlvGJ8BXOmtfiXVCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dvyZb6Ff5zj2b for ; Mon, 19 Jan 2026 17:47:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c20f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 17:47:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Craig Leres Subject: git: 6aca792f6f00 - stable/15 - Remove obsolete BUGS section from zgrep(1) man page, add test List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6aca792f6f003dceb5ec1b50698c78c33e9b271d Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 17:47:03 +0000 Message-Id: <696e6e17.3c20f.55cf1d01@gitrepo.freebsd.org> The branch stable/15 has been updated by leres: URL: https://cgit.FreeBSD.org/src/commit/?id=6aca792f6f003dceb5ec1b50698c78c33e9b271d commit 6aca792f6f003dceb5ec1b50698c78c33e9b271d Author: Craig Leres AuthorDate: 2026-01-10 00:34:39 +0000 Commit: Craig Leres CommitDate: 2026-01-19 17:46:37 +0000 Remove obsolete BUGS section from zgrep(1) man page, add test I forgot to check/update the man page with D54217. While here add a test for multiple -e flags. Reviewed by: markj Approved by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54632 (cherry picked from commit da5d94d29a5ec29817476c39ae2b2ad1666c3f06) --- usr.bin/grep/tests/grep_freebsd_test.sh | 11 +++++++++++ usr.bin/grep/zgrep.1 | 18 ------------------ 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/usr.bin/grep/tests/grep_freebsd_test.sh b/usr.bin/grep/tests/grep_freebsd_test.sh index eaf3694c2b1e..ae9a9c1274f3 100755 --- a/usr.bin/grep/tests/grep_freebsd_test.sh +++ b/usr.bin/grep/tests/grep_freebsd_test.sh @@ -126,6 +126,16 @@ qflag_body() atf_check zgrep -q '1 2' in } +atf_test_case eflags +eflags_body() +{ + # Test use with more than one -e expression + printf "aaa bbb ccc\n111 222 333\ndon't match this line" > in + + atf_check -o 'inline:aaa bbb ccc\n111 222 333\n' \ + /tmp/zgrep.sh -eaaa -e333 in +} + atf_init_test_cases() { atf_add_test_case grep_r_implied @@ -134,4 +144,5 @@ atf_init_test_cases() atf_add_test_case zflag atf_add_test_case color_dupe atf_add_test_case qflag + atf_add_test_case eflags } diff --git a/usr.bin/grep/zgrep.1 b/usr.bin/grep/zgrep.1 index 76eb145db82d..7fa42c916002 100644 --- a/usr.bin/grep/zgrep.1 +++ b/usr.bin/grep/zgrep.1 @@ -92,21 +92,3 @@ This version of the .Nm utility was written by .An Thomas Klausner Aq Mt wiz@NetBSD.org . -.Sh BUGS -.Xr zgrep 1 -does not handle flags that take arguments if there is no whitespace -between the flag and the argument, for example: -.Pp -.Dl "zgrep -enfs /etc/rpc" -.Pp -When more than one -.Fl e -flag is used matching -should occur for any of the patterns (similar to multiple patterns -supplied in a file with the -.Fl f -flag). -.Xr zgrep 1 -only matches the last -.Fl e -pattern. From nobody Mon Jan 19 22:08:49 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dw4Nf2LY1z6PR5g for ; Mon, 19 Jan 2026 22:08: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dw4Nd6m7yz40gY for ; Mon, 19 Jan 2026 22:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768860530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FAUWK3BDszfOUdttIrgdNR414VMCIVYIydFatjXRxd0=; b=nCufRWWIf8wtPaoOmQim+wnSz0LDcBu3tbz7UozNNZKejkiVH3f/7D1xMmkesblj+iH9vE L1kjRA+MIT/kfhAW7gB6eSKboFxm4271Cp4zAMzVBEcikV4U9j82vSRSOVkpnjvkxGRay+ 5baXJR3qJAJSfrk5XugUTEEWPBmvGsOU4rfcJGHvNL+HYWrtZrJ+Il2F/9lkzOasZKzvFi xsVBAO4mOvuREOh+HF5/wtQmKe11/x+bJ2aukFQZdDapv93qiV3F/Yas3GoEJjkwKDh5w4 PFroNii2QZ50ZUJmE2AeJ6VSgSFX7ALJPicqwe5+lvdfOXD+ggRfT3wdH2zu+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768860530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FAUWK3BDszfOUdttIrgdNR414VMCIVYIydFatjXRxd0=; b=VTV0qViYmwgUjfhbLHC/bK0kJE7HytwRvSlEMh7GuRtTPU2wNyw/IpqL55x0LobZdrMkpl r9rXt2s4IpVafVHbIR5c0enLe26JhGqxCZg9+m/AEcMpKrS+utMv8feHg5iplMxijCynkE SYq22TvPxm1tlypwBxxE1Cc4e1X4jFra5v2AAwjLQuiZi0CtV/6sXoSFrki7nPy6MUxR+J gNiMix1bkT+za07r4c8EfOi3IepEzAjMQeN4t6cLaEKkyMV/+KH2z7JAncH6W2Wc1G/R5D 538fzl0AF08qZnR5iuYbnSLZIfvSp3G+tyiTGFg/4XIFlSMR8B5dzj2fbuKsHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768860530; a=rsa-sha256; cv=none; b=bwbAJoDsn4Tow8pLYmNhZbeIJRv0KBtkSbmkUzZWtbuITaOuQk3x2OyaeiVAfolXkx3wQ4 s63TQ24WAb4rmuGRLKYstSt6DanAskpSe1alXUnzBaYzKjKVtjutQXqhREzE8TpetZuiAX JCBY/gUWsUTZ9GiJdkFeqZI4QwOqpeVBBQx/uqNp00Zrz6B/M/MLdcwH/28J8XoKcrG/J+ oWVyW4RNkFgRPP+9vM1cf6C15oZQpSSWqLzMRWfeYgPD6PRYhqPWaENX3FShizWktd9YX1 wD71TlUFvoi8tVCssmlpr1zKbWFvDO9xe+eMnn33BzoT8SRtEg3xXgsbos+6GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dw4Nd64BNzr01 for ; Mon, 19 Jan 2026 22:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35c4c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 22:08:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: f51bc79200fe - stable/15 - sockstat: improve formataddr() according to style(9) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f51bc79200fea740de3beb3d7dbdec1537a2839b Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 22:08:49 +0000 Message-Id: <696eab71.35c4c.2e87414c@gitrepo.freebsd.org> The branch stable/15 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=f51bc79200fea740de3beb3d7dbdec1537a2839b commit f51bc79200fea740de3beb3d7dbdec1537a2839b Author: Michael Osipov AuthorDate: 2025-12-29 21:31:49 +0000 Commit: Michael Osipov CommitDate: 2026-01-19 22:08:30 +0000 sockstat: improve formataddr() according to style(9) Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54412 (cherry picked from commit f89f7e58ba1d54c6a683e3cc899938895496c088) --- usr.bin/sockstat/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/sockstat/main.c b/usr.bin/sockstat/main.c index 07663e54534d..75c4b2aad223 100644 --- a/usr.bin/sockstat/main.c +++ b/usr.bin/sockstat/main.c @@ -895,8 +895,8 @@ static int formataddr(struct sockaddr_storage *ss, char *buf, size_t bufsize) { struct sockaddr_un *sun; - char addrstr[NI_MAXHOST] = { '\0', '\0' }; int error, off, port = 0; + char addrstr[NI_MAXHOST] = ""; switch (ss->ss_family) { case AF_INET: @@ -929,11 +929,11 @@ formataddr(struct sockaddr_storage *ss, char *buf, size_t bufsize) if (is_xo_style_encoding) { xo_emit("{:address/%s}", addrstr); xo_emit("{:port/%d}", port); - return 0; + return (0); } if (port == 0) - return snprintf(buf, bufsize, "%s:*", addrstr); - return snprintf(buf, bufsize, "%s:%d", addrstr, port); + return (snprintf(buf, bufsize, "%s:*", addrstr)); + return (snprintf(buf, bufsize, "%s:%d", addrstr, port)); } static const char * From nobody Mon Jan 19 22:11:09 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dw4RK72NGz6PRQw for ; Mon, 19 Jan 2026 22:11: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dw4RK54q6z40yZ for ; Mon, 19 Jan 2026 22:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768860669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3FMliBoHGedJx0Iu7d4ww6dZPt2GWnoRAyByoYCt89U=; b=fB+Ha8x+7N5HXOWjSm/Tx6LwH5l5lHwYt99DIcZTYmvJPtDkMLjWSgJUrtGbLuMb2pf53K VNm5wjLXa/FFS3f2OvjYCJqUWtWqTTfUNfT+bd2xXuZXOHsdPNNFx921jgucWiAIN5vPyb 4ZJQKfmkUmuJaOMeUC+8xILhRHHQ3aV7NJXBrBrtwGNECVxyxD5qPbem5aMn318fqc8Puw B1Bu1t7L1YvZ5sbO//BFP9ZZnx7hv3bxEyVidqlQDTVy468CG37YUw9p5Cbsd2IVdTtnQg wFtVu2RhBLwDBZ7Kms3pTks9Z4AVLL8yHXWNvnQoTO1l59u6OU4d5ohnU8eTzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768860669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3FMliBoHGedJx0Iu7d4ww6dZPt2GWnoRAyByoYCt89U=; b=KPRZKGHBrZZEAes7KPjOwvJrem5ujULAS484uQUckZOPWwlBwP1ULWdNWzvzRssxZgVEil 8jm59JehCbN3pp6vtDBA24zpzmHrej4ZdgLmE3ajSMBsp9nQBtHrBvONTgITvtuGSL4cfg JdtO0c7fgHSy++ofsP6gVg0xLkkZVym71ZW6SQCqzMnUmJ2bWYZqmjDVqrqXnSBN9wvoc8 44VQfqYSJoV3Dc2hZlGaw9lGdIgsnCGGc7Oc6dJyO8ilEm3GX2DhC8PD5u7erlKexWZkLQ 2m70VMdECPuq8pBvqoFG2vMYAZ9+YZJ7KEAeZDbWpIg1FB2cBsqEErhpd4A1cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768860669; a=rsa-sha256; cv=none; b=Bxito4EISG0McTcL185Mq2CP9UL1KyiLO3wvTBk+bmCQB9A7qf1905EU0BIbHLxa53nLRd AR43a+i3QFuGIOVHDyFEQ5CB2nxY4/G3Yr3XozDuhJTRFTGBbqc4LIyNgIvw5bqpFAN0Gt i7/XeMa/onZL1+Os5XN9EflYX7VmXAU/fwOfyI5Q+fTA/kn/HbNMfa4Dft41TRRtRf/9M1 PcrOlIfSkuMc8a0Q1Hkdn3ZvaWMz9fYCu9P/+Xxl6VIqIBAvFhRW8kWjJag2gcN5SmrhDn EyZhtswmUEqH4td85a8fsOXcmXDG5MCG0M+0xJf58RwGVLIEHT+jaCkFgsP0ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dw4RK4fqlzqwj for ; Mon, 19 Jan 2026 22:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 358da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 22:11:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: b46515ed59a8 - stable/14 - sockstat: improve printaddr() according to style(9) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b46515ed59a8c1923f1a6bec04729feef72cf4bc Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 22:11:09 +0000 Message-Id: <696eabfd.358da.7d204d69@gitrepo.freebsd.org> The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=b46515ed59a8c1923f1a6bec04729feef72cf4bc commit b46515ed59a8c1923f1a6bec04729feef72cf4bc Author: Michael Osipov AuthorDate: 2025-12-29 21:31:49 +0000 Commit: Michael Osipov CommitDate: 2026-01-19 22:10:59 +0000 sockstat: improve printaddr() according to style(9) Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54412 (cherry picked from commit f89f7e58ba1d54c6a683e3cc899938895496c088) --- usr.bin/sockstat/sockstat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c index 587647e5950f..805e48715529 100644 --- a/usr.bin/sockstat/sockstat.c +++ b/usr.bin/sockstat/sockstat.c @@ -954,7 +954,7 @@ static int printaddr(struct sockaddr_storage *ss) { struct sockaddr_un *sun; - char addrstr[NI_MAXHOST] = { '\0', '\0' }; + char addrstr[NI_MAXHOST] = ""; int error, off, port = 0; switch (ss->ss_family) { @@ -980,9 +980,9 @@ printaddr(struct sockaddr_storage *ss) errx(1, "cap_getnameinfo()"); } if (port == 0) - return xprintf("%s:*", addrstr); + return (xprintf("%s:*", addrstr)); else - return xprintf("%s:%d", addrstr, port); + return (xprintf("%s:%d", addrstr, port)); } static const char * From nobody Mon Jan 19 22:13:37 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dw4V96TDGz6PRFm for ; Mon, 19 Jan 2026 22:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dw4V93F28z41qh for ; Mon, 19 Jan 2026 22:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768860817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RRW1H5YGs3dnmD8HjBDmsWMAivEcFz3jnkUY/cHX1yo=; b=VrgR85zVKmHgsKu9Dimwj8RbHmcj87K/0Yxk71EXBO6czWHaMibJ9q5jIed5yd4VkNlVxx yKVzYwk7sH1ZhAn1+f97KoRmbNaaD9G9JGBzkISq7KeZxU8rMUjK3sLa7c9ElY2a0HAcrU 6kjzkj59+JmxZ5G89W2mBQ4UP5IymcZ0+d0XhnO3JJGqljuw1mE+kgGcjngD/lSiGyNpF8 Ym470jaImaKMnOT2EZcZtQBm3nNpMi3jg/Zvj+d8J0pbpOnWkFWoyQ94GL1UK+o/kiHpbZ twZ/SnFI9GVXaWgQJS9hlaULjgxPpXtqt/DmdG2JhZOtfFj0r7j2humB11XZLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768860817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RRW1H5YGs3dnmD8HjBDmsWMAivEcFz3jnkUY/cHX1yo=; b=haky1Y8vv76L+6n5K9pGwfBNlE4NjC2FDZ0EYucRXg30dnByDvMY+9ftr/KPkCo79y72+c z8SoIAEV/M266jFi/WjB+DXBbteAqQL+Ind8z5+RIauIdfzOD6rRxaDHR5IzVQnKhQke2F 7QCi0QHx4HzcKpUWZAQx7B3ZABfg85bDGuWUrtljDRQNZURBPpGN3Yh6/duFZhYpY5S8Ou 9FfsRTsju70xqtRD/5D6Em7k8j4KJAPpGEv8TZOdQbUxhrmEvE7OXB4CfzELYM0hYJ7tWN ZqtwaxtYEJJgXhKi4l5IqkWHp4EIKmJOfXLI2pIJS1LDCQv8cz3FUL3aHdLTYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768860817; a=rsa-sha256; cv=none; b=BrQbcHXOCNApCa6MBFMT/9M8if+mPZukswj92cItkLbL7o+S2/oe/xaSMDQuupXOdFG1V1 JYSsSbzPQ9elyeJmR3kY67IBkIU9iXsOkwoMMXdmorwLN+XK9dO1DBvPlC7CJimThAjRKf 7cm7uCoH9FdHIZEYCDWv8hEkOfQZXhMwKzxrft2maiAwYdLO5Vq2xrmduLhwyPUFpGmQnw tNeMWftc0WylnkOkw66SvL98AzPDKE/vzBQOTZ1LtDlsXDSiCFU1NOkWFSC1n28Ed2rj5l QVagTyQJNSHjyy/8HyCPQEht7ZfqWCGu0p9K0OMhCec0/h9J/UL/BNYujIDLFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dw4V92cyPzqcF for ; Mon, 19 Jan 2026 22:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35f67 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 22:13:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: b016fa60c87f - stable/13 - sockstat: improve printaddr() according to style(9) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b016fa60c87f9806e76c2992aae1dedd4a7fedd4 Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 22:13:37 +0000 Message-Id: <696eac91.35f67.55d07b25@gitrepo.freebsd.org> The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=b016fa60c87f9806e76c2992aae1dedd4a7fedd4 commit b016fa60c87f9806e76c2992aae1dedd4a7fedd4 Author: Michael Osipov AuthorDate: 2025-12-29 21:31:49 +0000 Commit: Michael Osipov CommitDate: 2026-01-19 22:13:23 +0000 sockstat: improve printaddr() according to style(9) Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54412 (cherry picked from commit f89f7e58ba1d54c6a683e3cc899938895496c088) --- usr.bin/sockstat/sockstat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c index d024c983a84b..fed63d6031f3 100644 --- a/usr.bin/sockstat/sockstat.c +++ b/usr.bin/sockstat/sockstat.c @@ -853,7 +853,7 @@ static int printaddr(struct sockaddr_storage *ss) { struct sockaddr_un *sun; - char addrstr[NI_MAXHOST] = { '\0', '\0' }; + char addrstr[NI_MAXHOST] = ""; int error, off, port = 0; switch (ss->ss_family) { @@ -879,9 +879,9 @@ printaddr(struct sockaddr_storage *ss) errx(1, "getnameinfo()"); } if (port == 0) - return xprintf("%s:*", addrstr); + return (xprintf("%s:*", addrstr)); else - return xprintf("%s:%d", addrstr, port); + return (xprintf("%s:%d", addrstr, port)); } static const char * From nobody Tue Jan 20 04:09:21 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNd371Yz6Nw3Q for ; Tue, 20 Jan 2026 04:09: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwDNd0zLwz3V8s for ; Tue, 20 Jan 2026 04:09:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d+h2RZXx54lKenO49a0hqmvfdBHZM+FVIW8C6vkY6SQ=; b=Ntzcfny7ONv/f6w8pYPtjCUBSLMQ9ImP/5/i+DxyTxMVr4HoO8GHBOso/qeGUWKoSsaHR2 VMwn/uXrzKpRujkhUz6VkQqLuj5YNo5ADV3lvboQ5gIsjaKAQe5co0AqIqWFv26AqfQCw8 F17J8oQuYltovWkTx1yTq7JqiYWeqJMgTNGvAw90V8dgYr9UQU5D0jdvP5uxf+cxo0MAQH FZ6ICwwWWpl/ziO6Ggv9Kvwkt9V/Q5KKpIsvLSZhzel75DFB4S5/bA7Ym1HMdyfPULFQr7 +FGSRWE52JQFT+akyFer5ULo0IdO8C3EH3Ye1jcKtFzWTQz163wOyo+48L/6zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d+h2RZXx54lKenO49a0hqmvfdBHZM+FVIW8C6vkY6SQ=; b=yKkxFzXYcAc9KIz0mn2gUItIjdCVrk1tgIYrJgYDFHJZfonQpJd1jocPHhesMtN4JrcoL5 GtTDtBF/ExTf5brqTcC5Nq0gHyI17xwnERkl33xc7dWjhJcY3NOxBCO4aCNDtxDPp/m522 A6qXDU9xQfs2PmBsJMNvsfP/t52Bw2Ijd/S3zFiK6yrjYUZSe2V2w3gOMcdze/VyNopoNv Z4NGfm8JZFvN+pf0pXjEVzFYUI2ApgqIh0w8riurfL2qnP7OpGGsO0IFN55Eg4ghREHOAd fwKY6yBjFwfJPMGhS1yGkIZStojyhRx044r0vtobjaN+9wwJ2gWVf+r+Ftywuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768882161; a=rsa-sha256; cv=none; b=lP6oLbXIc7s+w+p0f4EEEpOI5qw7y41aEldIipf1N2rGw4dKhqO2ue8D1x0Bsr1hm0NHnz gqiV4tnt1vg2dpv6xWH1q7EMBRKXZiUiIXG/XJez4PzZk/jg6Bcts3P0Y2htHNul7IIVEZ BnKwE0ZxNBGz5HaMM83zWx5W5VkiWd/fSqZckgmGqbaUcH290nn6ZTXwBDbLu3Vqzuw845 jjQHZBcBlLRO46lGBU9j2fFTjarghT0f3ZHTrIUX8gFrfj9m/9apjHjK5Ww8IB5WZN6cXI nQ8pbsfyFcrHcdbggE9RbaKBPIssC37oE/dfR4pitHcej2UCmGCxmymuNbpeOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNd0C8mz11d1 for ; Tue, 20 Jan 2026 04:09:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3091d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 04:09:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: d15be6d470d6 - stable/15 - libutil: defer setting the MAC label until after the login class List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d15be6d470d631dce2e0b5e07c4def8952a0f753 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 04:09:21 +0000 Message-Id: <696efff1.3091d.79dcdd01@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d15be6d470d631dce2e0b5e07c4def8952a0f753 commit d15be6d470d631dce2e0b5e07c4def8952a0f753 Author: Kyle Evans AuthorDate: 2025-10-29 02:37:21 +0000 Commit: Kyle Evans CommitDate: 2026-01-20 04:04:17 +0000 libutil: defer setting the MAC label until after the login class MAC policies, like mac_biba(4), may forbid changing the login class once a label has been applied. For setting up the initial login context, this isn't really expected and in-fact may break some class-based configuration. Defer setting the MAC label until after the login class is set, and remove the requirement that we have a pwd entry since the label is pulled from the login class -- we only use pwd for syslog in this path. Patch is largely by Kevin Barry, with some modifications and this commit message by kevans@. PR: 177698 Reviewed by: des, olce Co-authored-by: Kevin Barry (cherry picked from commit 98edcbcce0a4650084bd86e704cfa38bf590250c) --- lib/libutil/login_class.c | 55 ++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index c3c1b0ddda27..9478b4dc98ca 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -543,7 +543,7 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in /* we need a passwd entry to set these */ if (pwd == NULL) - flags &= ~(LOGIN_SETGROUP | LOGIN_SETLOGIN | LOGIN_SETMAC); + flags &= ~(LOGIN_SETGROUP | LOGIN_SETLOGIN); /* Set the process priority */ if (flags & LOGIN_SETPRIORITY) @@ -564,6 +564,27 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in } } + /* Set the sessions login */ + if ((flags & LOGIN_SETLOGIN) && setlogin(pwd->pw_name) != 0) { + syslog(LOG_ERR, "setlogin(%s): %m", pwd->pw_name); + login_close(llc); + return (-1); + } + + /* Inform the kernel about current login class */ + if (lc != NULL && lc->lc_class != NULL && (flags & LOGIN_SETLOGINCLASS)) { + error = setloginclass(lc->lc_class); + if (error != 0) { + syslog(LOG_ERR, "setloginclass(%s): %m", lc->lc_class); +#ifdef notyet + login_close(llc); + return (-1); +#endif + } + } + + setlogincontext(lc, pwd, flags); + /* Set up the user's MAC label. */ if ((flags & LOGIN_SETMAC) && mac_is_present(NULL) == 1) { const char *label_string; @@ -572,8 +593,10 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in label_string = login_getcapstr(lc, "label", NULL, NULL); if (label_string != NULL) { if (mac_from_text(&label, label_string) == -1) { - syslog(LOG_ERR, "mac_from_text('%s') for %s: %m", - pwd->pw_name, label_string); + syslog(LOG_ERR, "mac_from_text('%s') for %s %s: %m", + label_string, pwd != NULL ? "user" : "class", + pwd != NULL ? pwd->pw_name : lc->lc_class); + login_close(llc); return (-1); } if (mac_set_proc(label) == -1) @@ -582,33 +605,15 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in error = 0; mac_free(label); if (error != 0) { - syslog(LOG_ERR, "mac_set_proc('%s') for %s: %s", - label_string, pwd->pw_name, strerror(error)); + syslog(LOG_ERR, "mac_set_proc('%s') for %s %s: %s", + label_string, pwd != NULL ? "user" : "class", + pwd != NULL ? pwd->pw_name : lc->lc_class, strerror(error)); + login_close(llc); return (-1); } } } - /* Set the sessions login */ - if ((flags & LOGIN_SETLOGIN) && setlogin(pwd->pw_name) != 0) { - syslog(LOG_ERR, "setlogin(%s): %m", pwd->pw_name); - login_close(llc); - return (-1); - } - - /* Inform the kernel about current login class */ - if (lc != NULL && lc->lc_class != NULL && (flags & LOGIN_SETLOGINCLASS)) { - error = setloginclass(lc->lc_class); - if (error != 0) { - syslog(LOG_ERR, "setloginclass(%s): %m", lc->lc_class); -#ifdef notyet - login_close(llc); - return (-1); -#endif - } - } - - setlogincontext(lc, pwd, flags); login_close(llc); /* This needs to be done after anything that needs root privs */ From nobody Tue Jan 20 04:09:22 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNf2bBvz6NvXS for ; Tue, 20 Jan 2026 04:09: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwDNf1VY8z3VM9 for ; Tue, 20 Jan 2026 04:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6wuVX2LUbSsHDapuHBFnQkH3rs72p61vD8SzZnO30us=; b=D3UadUep8LFkWpGKZ5Y1eIq2WH79IXh3FUvuANm9eCztYLayo3BgtgDsfjySWsum12cH67 qNuBJymGNDDDkpx7CIpIHUt3tnHxBwl6fcFJaI/SAoPouMaoasRQsPMhZw5GcJpFPOcOT0 qZHV9VYDODvqkhRv177Cby/wVHupmyhCFDG8Ps17oJ6czX/JaGVad5Kr86oLLTjhoVYkRY nUVbFV4zd+X7+Czub0N7dsLXiwK+LCbvswOtvj5nrIvpPQbCL/eZHy+wrUwdwqCUIaEP7w l6P/bA2QmUrAbz0+VdunvZRy7ifTDOf1xfSXbnrwjhC9YMP6EoT1c+6xq9cwBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6wuVX2LUbSsHDapuHBFnQkH3rs72p61vD8SzZnO30us=; b=t1nyfl2fuUcLouR7c0N21AH2ayxo3eCRQEIatS3nBtgkvZnJhMsMbVdvu7j+9SK/UA5h7N Dt90W6wKqQ81hdrG1oFnjR9p9hwyU0LcTn1Lgi+amyXYY7D1CxKm4RGAyc+xTAb4Xdqbk6 njbpeTzahWlueXYBiUp1LpjGU2av88MJDAHTmPcWJdVhEzLjGD/m2nmeScufsU5VFCMtJL JVlLOd8C/f79dvQCZG4eQq/fWyw/MzkYnAxdocrRIHf2nT4yMnyAl/w7MMwNHvcQ6BuwlR B/IXLQ3/X+GTNXZpoe5MrVCtu6U9ma7M54ZKjIVDa9fF3j29/ZRXlz4HSmAV0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768882162; a=rsa-sha256; cv=none; b=vn/0n1Xor5Z94Pm82Tli/Qz3pnoFqGloYY3OftlT1XIZHypHGsYTm50MSM4XBgixUu1ryG 3iGQCxDaR7XHVmhGkAaXFjNz+Bzqqb955QZ64rKPrRKq9TirdDaPY07Q+RrFIrxmKCkHar eFu+ixTDT37I1wx0pTaFPThKUZHWmpbWk5mbcBzIlOb9Yacae8rQo0++MZSn8/PWFjMKBw VQv9ev9ITF9JeN5JKmx5BxfJicRZZFN39DOXX4ujsMbK30brkylSucYqDjndy6KmnIqwJ6 ZTMMZtPPsjna9V1ddO79GgyMP1Vlw8+TSmPVOrCX1E+ZbSppZj43JKwdyT2Xmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNf0kpnz11xG for ; Tue, 20 Jan 2026 04:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 310e9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 04:09:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: e760f45b5974 - stable/15 - libc: report _SC_NPROCESSORS_ONLN more accurately in cpu-limited jails List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e760f45b597453e2b216ecfb5060cc689ca63c10 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 04:09:22 +0000 Message-Id: <696efff2.310e9.16599e62@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e760f45b597453e2b216ecfb5060cc689ca63c10 commit e760f45b597453e2b216ecfb5060cc689ca63c10 Author: Kyle Evans AuthorDate: 2025-10-29 16:32:30 +0000 Commit: Kyle Evans CommitDate: 2026-01-20 04:04:28 +0000 libc: report _SC_NPROCESSORS_ONLN more accurately in cpu-limited jails We don't support CPU hotplug, but we do support cpuset(8) restrictions on jails (including prison0, which uses cpuset 1). The process cannot widen its cpuset beyond its root set, so it makes sense to instead report the number of cpus enabled there rather than the total number in the system. This change is effectively a nop for the majority of systems and jails in the wild, though it does reduce the performance of this query now that we can't take advantage of AT_NCPUS being provided in the auxinfo. The implementation here is notably different than Linux, which would not take cgroups into account. They do, however, take CPU hotplug into account, so the possibility for it to diverge from (and be lower than) the # configured count to reflect what the process can actually be scheduled on doesn't really diverge in semantics. Reviewed by: kib (cherry picked from commit d617806aac1469319970e3551656e9deabb98a35) --- lib/libc/gen/sysconf.3 | 6 +- lib/libc/gen/sysconf.c | 16 ++++- lib/libc/tests/sys/cpuset_test.c | 140 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 156 insertions(+), 6 deletions(-) diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3 index e38357b898a7..290ef0dc158c 100644 --- a/lib/libc/gen/sysconf.3 +++ b/lib/libc/gen/sysconf.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 26, 2013 +.Dd August 30, 2025 .Dt SYSCONF 3 .Os .Sh NAME @@ -77,7 +77,9 @@ The maximum number of supplemental groups. .It Li _SC_NPROCESSORS_CONF The number of processors configured. .It Li _SC_NPROCESSORS_ONLN -The number of processors currently online. +The number of processors currently online, taking into account current jail +restrictions to report only the number of processors that are usable to the +process. .It Li _SC_OPEN_MAX One more than the maximum value the system may assign to a new file descriptor. .It Li _SC_PAGESIZE diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c index b5b732eed05d..87aedc07c110 100644 --- a/lib/libc/gen/sysconf.c +++ b/lib/libc/gen/sysconf.c @@ -72,6 +72,7 @@ long sysconf(int name) { struct rlimit rl; + cpuset_t cpus; size_t len; int mib[2], sverrno, value; long lvalue, defaultresult; @@ -581,8 +582,21 @@ yesno: return (_POSIX_IPV6); #endif - case _SC_NPROCESSORS_CONF: case _SC_NPROCESSORS_ONLN: + /* + * Consult our root set first, because our CPU availability + * may not match the total number of CPUs available on the + * system and we may have a non-uniform layout even within + * userland. In particular, each jail has a root set that can + * be constrained by its parent and processes within the jail + * cannot widen beyond those constraints, so to those processes + * it makes sense to claim the more limited count. + */ + if (cpuset_getaffinity(CPU_LEVEL_ROOT, CPU_WHICH_PID, -1, + sizeof(cpus), &cpus) == 0) + return (CPU_COUNT(&cpus)); + /* FALLTHROUGH */ + case _SC_NPROCESSORS_CONF: if (_elf_aux_info(AT_NCPUS, &value, sizeof(value)) == 0) return ((long)value); mib[0] = CTL_HW; diff --git a/lib/libc/tests/sys/cpuset_test.c b/lib/libc/tests/sys/cpuset_test.c index 53d6a8215bbc..c8ad225fadfc 100644 --- a/lib/libc/tests/sys/cpuset_test.c +++ b/lib/libc/tests/sys/cpuset_test.c @@ -34,8 +34,10 @@ #include #include +#include #include #include +#include #include #include @@ -107,6 +109,19 @@ skip_ltncpu(int ncpu, cpuset_t *mask) atf_tc_skip("Test requires %d or more cores.", ncpu); } +static void +skip_ltncpu_root(int ncpu, cpuset_t *mask) +{ + + CPU_ZERO(mask); + ATF_REQUIRE_EQ(0, cpuset_getaffinity(CPU_LEVEL_ROOT, CPU_WHICH_PID, + -1, sizeof(*mask), mask)); + if (CPU_COUNT(mask) < ncpu) { + atf_tc_skip("Test requires cpuset root with %d or more cores.", + ncpu); + } +} + ATF_TC(newset); ATF_TC_HEAD(newset, tc) { @@ -234,9 +249,8 @@ ATF_TC_BODY(deadlk, tc) } static int -do_jail(int sock) +create_jail(void) { - struct jail_test_info info; struct iovec iov[2]; char *name; int error; @@ -250,8 +264,22 @@ do_jail(int sock) iov[1].iov_base = name; iov[1].iov_len = strlen(name) + 1; - if (jail_set(iov, 2, JAIL_CREATE | JAIL_ATTACH) < 0) + error = jail_set(iov, 2, JAIL_CREATE | JAIL_ATTACH); + free(name); + if (error < 0) return (FAILURE_JAIL); + return (0); +} + +static int +do_jail(int sock) +{ + struct jail_test_info info; + int error; + + error = create_jail(); + if (error != 0) + return (error); /* Record parameters, kick them over, then make a swift exit. */ CPU_ZERO(&info.jail_tidmask); @@ -641,6 +669,111 @@ ATF_TC_BODY(jail_attach_disjoint, tc) try_attach(jid, &smask); } +struct nproc_info { + long nproc_init; + long nproc_final; + long nproc_global; +}; + +ATF_TC(jail_nproc); +ATF_TC_HEAD(jail_nproc, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test that _SC_PROCESSORS_ONLN reflects jail cpuset constraints"); +} +ATF_TC_BODY(jail_nproc, tc) +{ + cpuset_t jmask; + struct nproc_info ninfo = { }; + int sockpair[2]; + cpusetid_t setid; + ssize_t readsz; + pid_t pid; + int fcpu, error, pfd, sock; + char okb = 0x7f, rcvb; + + skip_ltncpu_root(2, &jmask); + fcpu = CPU_FFS(&jmask) - 1; + + /* + * Just adjusting our affinity should not affect the number of + * processors considered online- we want to be sure that it's only + * adjusted if our jail's root set is. + */ + CPU_CLR(fcpu, &jmask); + error = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, + sizeof(jmask), &jmask); + ATF_REQUIRE_EQ(0, error); + ATF_REQUIRE(sysconf(_SC_NPROCESSORS_ONLN) > CPU_COUNT(&jmask)); + + ATF_REQUIRE_EQ(0, socketpair(PF_UNIX, SOCK_STREAM, 0, sockpair)); + + /* We'll wait on the procdesc, too, so we can fail faster if it dies. */ + ATF_REQUIRE((pid = pdfork(&pfd, 0)) != -1); + + if (pid == 0) { + /* First child sets up the jail. */ + sock = sockpair[SP_CHILD]; + close(sockpair[SP_PARENT]); + + error = create_jail(); + if (error != 0) + _exit(error); + + ninfo.nproc_init = sysconf(_SC_NPROCESSORS_ONLN); + + /* Signal the parent that we're jailed. */ + readsz = write(sock, &okb, sizeof(okb)); + assert(readsz == sizeof(okb)); + + /* Wait for parent to adjust our mask and signal OK. */ + readsz = read(sock, &rcvb, sizeof(rcvb)); + assert(readsz == sizeof(rcvb)); + assert(rcvb == okb); + + ninfo.nproc_final = sysconf(_SC_NPROCESSORS_ONLN); + ninfo.nproc_global = sysconf(_SC_NPROCESSORS_CONF); + readsz = write(sock, &ninfo, sizeof(ninfo)); + assert(readsz == sizeof(ninfo)); + + _exit(0); + } + + close(sockpair[SP_CHILD]); + sock = sockpair[SP_PARENT]; + + /* Wait for signal that they are jailed. */ + readsz = read(sock, &rcvb, sizeof(rcvb)); + assert(readsz == sizeof(rcvb)); + assert(rcvb == okb); + + /* Grab the cpuset id and adjust it. */ + error = cpuset_getid(CPU_LEVEL_ROOT, CPU_WHICH_PID, pid, &setid); + ATF_REQUIRE_EQ(0, error); + error = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_CPUSET, + setid, sizeof(jmask), &jmask); + ATF_REQUIRE_EQ(0, error); + + /* Signal OK to proceed. */ + readsz = write(sock, &okb, sizeof(okb)); + ATF_REQUIRE_EQ(sizeof(okb), readsz); + + /* Grab our final nproc info. */ + readsz = read(sock, &ninfo, sizeof(ninfo)); + ATF_REQUIRE_EQ(sizeof(ninfo), readsz); + + /* + * We set our own affinity to jmask, which is derived from *our* root + * set, at the beginning of the test. The jail would inherit from this + * set, so we just re-use that mask here to confirm that + * _SC_NPROCESSORS_ONLN did actually drop in response to us limiting the + * jail, and that its _SC_NPROCESSORS_CONF did not. + */ + ATF_REQUIRE_EQ(CPU_COUNT(&jmask) + 1, ninfo.nproc_init); + ATF_REQUIRE_EQ(CPU_COUNT(&jmask) + 1, ninfo.nproc_global); + ATF_REQUIRE_EQ(CPU_COUNT(&jmask), ninfo.nproc_final); +} + ATF_TC(badparent); ATF_TC_HEAD(badparent, tc) { @@ -686,6 +819,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, jail_attach_prevbase); ATF_TP_ADD_TC(tp, jail_attach_plain); ATF_TP_ADD_TC(tp, jail_attach_disjoint); + ATF_TP_ADD_TC(tp, jail_nproc); ATF_TP_ADD_TC(tp, badparent); return (atf_no_error()); } From nobody Tue Jan 20 04:09:23 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNg46Qzz6Nw8t for ; Tue, 20 Jan 2026 04:09: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwDNg1zbVz3VPh for ; Tue, 20 Jan 2026 04:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qIFnMtVgkNX6UnZjzTntfa1nysiVJhnFFsvDRJFEM94=; b=Ht4l6uZ/dah4eNvi4rzrlxOmmxhAkg1WDsXb0JvTT8/Xf2SkQQHDyLm+ItA5+G0ZQmL6aR zgzd878bhfMg6bW57WOZHjD1XH6mn1N6hcaKVBxTwtiTDQWraQ4lCpXWT7F2HAUB8dCEBl zc/7rff7Sh7rkLePGTdKY2BKtY19ju0IokTSGkOff1Io0zOac8fTq7Rb7C/RW9Lq1b2OuW ysKfcXGWEjuu8YGQxgejeACIvAmRmGT9JLqhck4YHWs0V9aG0HSYk0nYtiYr05nvrs+4Wj k5yncSbGjTdFSBB9b7E73Tc+y3LIsxrmn3JgIyxUyqzJHVAbrRNH9raQBg/1MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qIFnMtVgkNX6UnZjzTntfa1nysiVJhnFFsvDRJFEM94=; b=PnbNEYDeqnHFWwvNfZCHFTo73lbKo4chk/O2O4dmR2w1fBFz+N0Cy6sHP4IpNXYMYQ0cHp JU5GitZGKnFBHgEYHT0+l4tdmxaj/bNsXf2Dhz8vu3sY93yfqXm5RIunh+ZaG4uDwhj38n ytQ7d0Y81092HNXwVcYS8KqJ3cC/5XaVAyocLd5JawW4w9If0XpNahgdRBbqFmlSgnvCAy cn2YmxJ2HAdzENZV69AjGVQGAUR9cU8ACXlnURPV+G9qzevHwNYPid4UoFBQ+Czf3boPGh 7zjIai1GwX9JwB4F04AsNj7vyofbjvLsJ31QZU2ZZyylP+pTKxTNK5yzJoVcwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768882163; a=rsa-sha256; cv=none; b=SVDx3mbddfkL5sOk/213ttNrp4IyzJGgkNGg7yo2fQWot8Fn8qb15In3LiPtZc/HimSNhH kfywxaC6JKzHl8L6hldJQ8guT/JuxZu/45NBJwqPJcrDh38GC5B6DJmnwZ6CHSUtdpoQ2R m+BEW5zqXT0Hd2svrWPpqTLMrqZmtWK/GGWF2LY2jli0QYisHwF4LbPfKNdbhqG4P4JWk7 niZ+E5W6sjELtCla3+V0DlGuUeUV/voMQRUKY8vzi+EW8HSwbI+ARoJYnUTzgvtiQMLeWa ktczRpeE9nI5zvTiCDrmQ2VTzJkCtGmSQw6i6yoU2yKQcBD8Jzxxvp/yIIRejg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNg1Zvnz11F9 for ; Tue, 20 Jan 2026 04:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27bae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 04:09:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 5b2a74210408 - stable/15 - makedev(9): drop an additional note about cdevpriv dtors List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5b2a742104082dbeb2a9c4433117b16dcbeaa62d Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 04:09:23 +0000 Message-Id: <696efff3.27bae.488b5785@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=5b2a742104082dbeb2a9c4433117b16dcbeaa62d commit 5b2a742104082dbeb2a9c4433117b16dcbeaa62d Author: Kyle Evans AuthorDate: 2025-11-05 00:28:02 +0000 Commit: Kyle Evans CommitDate: 2026-01-20 04:04:33 +0000 makedev(9): drop an additional note about cdevpriv dtors These were previously somewhat safe to call destroy_dev(9), but will now also cause a deadlock in the same fashion that d_close doing so would previously. Amend the note to point it out, in case it's useful for someone. Reviewed by: imp, kib, markj (cherry picked from commit 90314c04f10f583c37c59ec51fd628e3deaf3622) --- share/man/man9/make_dev.9 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/share/man/man9/make_dev.9 b/share/man/man9/make_dev.9 index de56f350faa5..9f2c36fb39a4 100644 --- a/share/man/man9/make_dev.9 +++ b/share/man/man9/make_dev.9 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 19, 2025 +.Dd November 4, 2025 .Dt MAKE_DEV 9 .Os .Sh NAME @@ -387,14 +387,18 @@ function is the same as: destroy_dev_sched_cb(cdev, NULL, NULL); .Ed .Pp -The +Neither the .Fn d_close -driver method cannot call +driver method, nor a +.Xr devfs_cdevpriv 9 +.Fa dtr +method can .Fn destroy_dev directly. Doing so causes deadlock when .Fn destroy_dev -waits for all threads to leave the driver methods. +waits for all threads to leave the driver methods and finish executing any +per-open destructors. Also, because .Fn destroy_dev sleeps, no non-sleepable locks may be held over the call. From nobody Tue Jan 20 04:09:24 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNj04rZz6Nw3Y for ; Tue, 20 Jan 2026 04:09: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwDNh35x7z3VfW for ; Tue, 20 Jan 2026 04:09:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882164; 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=I+GB1uGRvTsOhE7qiqpo0xSvXD4vQ022LW9bVUMKGLs=; b=YHG3Oogz4Ab0ouG5su2INExQwGi8yNAvBHsIGABYN/4qR4cE5xbtLjDTXjSev1UihehhvL DI4YpeO4CXbKUJ9nENDjKQ1vWFda/jw5JoTpoNb0iZZgpPd6sZBS5DTfBP9n1Irrvto7Da sAt9Nh2LrncY1UOA7jmV/sb5dLWC1tGmoIexhV6ukBmOfsoRNclGR1IUNnRy6CifA6pMFT Kg9RwE6g3NQb94J1iXP7J3xuKCs8QAVb3TcbMVd0TVi5djcbAwSiXnuNXJ4BK9oPp8+Y+o GOBBY/HwYVNhNab/vj8Jzs3SfUwHNYLMeDVJz2T6QDJdi+fi90aCfTZRJ5Vhjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882164; 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=I+GB1uGRvTsOhE7qiqpo0xSvXD4vQ022LW9bVUMKGLs=; b=LYpl2rsR5KVEm6w/fNPgcbPFqj6XEOGkffzeeB8IIqAGCB8XLsm6ojHMaPjExT5J9Tyq9T ITEV6Q8u3lCTsaMaJ2LUDIs7rxfeYHJDOgTrRPPM2YNrOQM7nB+ye91EkCpfqJLXpkWO6O 82mlxXcxQh2Vw3u3GpH8GpN/XzeoWCzGqj9GX2TGoSLryNYkOr3eHfs2rKF+Jv/XoxG7SG Irtxmx9LXvxCDhVxrCTqHAi2W/WLxuGa50xlQ4Z0eM0iHLD8gohNRS6IvWniQsKVABowla qhO51EpTfWnR92Z4BDPkaHGSWAkw4llUeHl+9PUaNMxIVBc0BiO1iclXU4E6MA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768882164; a=rsa-sha256; cv=none; b=VY9DDgTyDuSL1b1MyGR2T3o+B1Ga4nGx5PP7X+R/ycy/XFlXGAKiTrbbFvng8hhvvlY4HF EP2Zs6Rf9qWSbr4RUfoBGRR5d9wrYLJWNWJmvrPV1ZyBbSKsl9uSMvkhEo7iRTx5o+YECJ G53ZZvyu1Lp11fAHAjouVRKxQZ2TTIMkoiVUwrAcRDAY/LP+pEUCoUKBbIw0bef/2IvXQx niEDIx9NzC2wXn8FlfF7AM1vanXtFO22YuM7HtIiHMcm5WPydh/hfVkmSXpnXzoGdkDCer FGa+BVUY2LREPsWeWx5WcfVBixv9BagsV99agNpBUjmB6nOeWg25+08jLp6ffA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNh2RbLz120X for ; Tue, 20 Jan 2026 04:09:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27ce8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 04:09:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Rob Norris From: Kyle Evans Subject: git: bc859baeea57 - stable/15 - bectl: log modifying functions to zpool history List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bc859baeea57ca90eeca2fca5b83993ebfa90ad3 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 04:09:24 +0000 Message-Id: <696efff4.27ce8.11db5ca3@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=bc859baeea57ca90eeca2fca5b83993ebfa90ad3 commit bc859baeea57ca90eeca2fca5b83993ebfa90ad3 Author: Rob Norris AuthorDate: 2025-12-17 17:00:47 +0000 Commit: Kyle Evans CommitDate: 2026-01-20 04:04:40 +0000 bectl: log modifying functions to zpool history Modeled directly after the method used by the zfs/zpool commands: flag commands with a "please log me" flag, and when there, reconstruct the command line. On success, call the library function to add it to the log. (Majority of the change by Rob; minor edits by kevans@) Signed-off-by: Rob Norris Co-authored-by: Kyle Evans Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. (cherry picked from commit 2a87929671e6e6919c18f2c25d60f2c73c3d18f4) --- lib/libbe/be.c | 12 +++++++++ lib/libbe/be.h | 2 ++ lib/libbe/libbe.3 | 16 ++++++++++-- sbin/bectl/bectl.c | 73 ++++++++++++++++++++++++++++++++++++++++++------------ 4 files changed, 85 insertions(+), 18 deletions(-) diff --git a/lib/libbe/be.c b/lib/libbe/be.c index 613235d5e908..4a7c2e43b2c1 100644 --- a/lib/libbe/be.c +++ b/lib/libbe/be.c @@ -1343,3 +1343,15 @@ be_activate(libbe_handle_t *lbh, const char *bootenv, bool temporary) return (BE_ERR_SUCCESS); } + +int +be_log_history(libbe_handle_t *lbh, const char *message) +{ + int err; + + err = zpool_log_history(lbh->lzh, message); + if (err) + return (set_error(lbh, BE_ERR_UNKNOWN)); + + return (BE_ERR_SUCCESS); +} diff --git a/lib/libbe/be.h b/lib/libbe/be.h index 01ee94fd03ca..d3f47c0604fe 100644 --- a/lib/libbe/be.h +++ b/lib/libbe/be.h @@ -107,6 +107,8 @@ int be_exists(libbe_handle_t *, const char *); int be_export(libbe_handle_t *, const char *, int fd); int be_import(libbe_handle_t *, const char *, int fd); +int be_log_history(libbe_handle_t *, const char *); + #if SOON int be_add_child(libbe_handle_t *, const char *, bool); #endif diff --git a/lib/libbe/libbe.3 b/lib/libbe/libbe.3 index 3b10711dd0f9..4331713e9227 100644 --- a/lib/libbe/libbe.3 +++ b/lib/libbe/libbe.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 20, 2025 +.Dd December 11, 2025 .Dt LIBBE 3 .Os .Sh NAME @@ -144,6 +144,9 @@ .Pp .Ft void .Fn be_prop_list_free "nvlist_t *prop_list" +.Pp +.Ft int +.Fn be_log_history "libbe_handle_t *hdl" "const char *message" .Sh DESCRIPTION .Nm interfaces with libzfs to provide a set of functions for various operations @@ -536,6 +539,14 @@ exactly as specified by The .Fn be_prop_list_free function will free the property list. +.Pp +The +.Fn be_log_history +function will log the given +.Fa message +to the zpool history, which can be later retrieved using the +.Xr zpool-history 8 +command. .Sh DIAGNOSTICS Upon error, one of the following values will be returned: .Bl -bullet -offset indent -compact @@ -583,7 +594,8 @@ BE_ERR_UNKNOWN BE_ERR_INVORIGIN .El .Sh SEE ALSO -.Xr bectl 8 +.Xr bectl 8 , +.Xr zpool-history 8 .Sh HISTORY .Xr bectl 8 and diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index 95715b34336b..28483dae17b2 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -76,27 +77,28 @@ struct command_map_entry { int (*fn)(int argc, char *argv[]); /* True if libbe_print_on_error should be disabled */ bool silent; + bool save_history; }; static struct command_map_entry command_map[] = { - { "activate", bectl_cmd_activate,false }, - { "create", bectl_cmd_create, false }, - { "destroy", bectl_cmd_destroy, false }, - { "export", bectl_cmd_export, false }, - { "import", bectl_cmd_import, false }, + { "activate", bectl_cmd_activate,false, true }, + { "create", bectl_cmd_create, false, true }, + { "destroy", bectl_cmd_destroy, false, true }, + { "export", bectl_cmd_export, false, true }, + { "import", bectl_cmd_import, false, true }, #if SOON - { "add", bectl_cmd_add, false }, + { "add", bectl_cmd_add, false, true }, #endif - { "jail", bectl_cmd_jail, false }, - { "list", bectl_cmd_list, false }, - { "mount", bectl_cmd_mount, false }, - { "rename", bectl_cmd_rename, false }, - { "unjail", bectl_cmd_unjail, false }, - { "ujail", bectl_cmd_unjail, false }, - { "unmount", bectl_cmd_unmount, false }, - { "umount", bectl_cmd_unmount, false }, - { "check", bectl_cmd_check, true }, + { "jail", bectl_cmd_jail, false, false }, + { "list", bectl_cmd_list, false, false }, + { "mount", bectl_cmd_mount, false, false }, + { "rename", bectl_cmd_rename, false, true }, + { "unjail", bectl_cmd_unjail, false, false }, + { "ujail", bectl_cmd_unjail, false, false }, + { "unmount", bectl_cmd_unmount, false, false }, + { "umount", bectl_cmd_unmount, false, false }, + { "check", bectl_cmd_check, true, false }, }; static struct command_map_entry * @@ -523,12 +525,42 @@ bectl_cmd_check(int argc, char *argv[] __unused) return (0); } +static char * +save_cmdline(int argc, char *argv[]) +{ + char *cmdline, *basename, *p; + int len, n, i; + + len = MAXPATHLEN * 2 + 1; /* HIS_MAX_RECORD_LEN from zfs.h */ + cmdline = p = malloc(len); + if (cmdline == NULL) + err(2, "malloc"); + + basename = strrchr(argv[0], '/'); + if (basename == NULL) + basename = argv[0]; + else + basename++; + + n = strlcpy(p, basename, len); + for (i = 1; i < argc; i++) { + if (n >= len) + break; + p += n; + *p++ = ' '; + len -= (n + 1); + n = strlcpy(p, argv[i], len); + } + + return (cmdline); +} + int main(int argc, char *argv[]) { struct command_map_entry *cmd; const char *command; - char *root = NULL; + char *root = NULL, *cmdline = NULL; int opt, rc; while ((opt = getopt(argc, argv, "hr:")) != -1) { @@ -565,10 +597,19 @@ main(int argc, char *argv[]) return (-1); } + if (cmd->save_history) + cmdline = save_cmdline(argc+optind, argv-optind); + libbe_print_on_error(be, !cmd->silent); rc = cmd->fn(argc, argv); + if (cmd->save_history) { + if (rc == 0) + be_log_history(be, cmdline); + free(cmdline); + } + libbe_close(be); return (rc); } From nobody Tue Jan 20 04:09:19 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNj4vlxz6Nw8x for ; Tue, 20 Jan 2026 04:09: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwDNj0QQwz3Vj7 for ; Tue, 20 Jan 2026 04:09:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BvosE4rtwzbdUR8PY9RYHQlh6KWQ4qK+01n0UiUrKHs=; b=F1r/bvriJLxrsE+J3u1lShAwBy8TKrzq1ghhyX78gm+QbwYC4dErOmFqR7DRsJ2iOdT4yu EVYOa2Fm5DYpnsXuBBO+7TpRaWAQJvR6lejXTnaBaR6vFqsUal+ZFxWQ5evEUIwaWzzN7x zR9uYRFfYQBQ0DzTJa/08pauJJTDVv09H3sOpp23+bQD/Ea3uq7GqSL+Y5zg4XP1cDyw0W b41Au7rnqUWtcOKBC9BjU++gWO2suDvexe+8WGoYPro2St1Uy/yvr3h6iz17RayjoCptof r8A4OqObdRyD2PEL0Re+8zn+izzHV/K8IHvnhvLWjruXoRdfwIijpivF2ckIqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BvosE4rtwzbdUR8PY9RYHQlh6KWQ4qK+01n0UiUrKHs=; b=X/0Zxu7Yr5ixkmyL/4zExNo7wL7+TPXiGssKQkPBA+KkrwdVa3MgNPfNOwhwqqN/GdPM4+ 2Fwj+t02aDFKZiaKbMI1vetjpHRYHrpD2UPIZoXlWf/HSdrmNrZRnV928yEUG+IDSJqM6d AIZ48CYbyoqAgc7tpNgjeIykQ9xd8UDLAxWO2EsduxXJfHN6jQuzgnlioKOvGvVeKFLibS N6C540LY96tvKJp+EvfwQ4vxNz90v9RSYXv9o0mMuqebnl8hNbSZ/MKWl6ILRiKhJ+WVDF ly4mPtfVGy8IXK3PIF5LRe7HrfuHnPFlBS3G8jH8rwxahDjoO1C11LWq52SNFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768882165; a=rsa-sha256; cv=none; b=SLaTaNzdGVFAfgu/OvbAYEj2jGC5xYblrihQGDUTMAekc6pnhGGU+I2MVSBzfu2lPeQB5n PZaUQMsRkJRnE16vgx+GrnuHqtBx1UfJkDg8yNIWh1N+Jgc8z6j776x4RrDYee0MNr3O9v PmJlv/+MFXJNTXdzYSlkq2ZpbbC9FOzB/Vd8tDf6SSoqfLTESQeFrGQayz/uvcM7WMS3rZ Y/ZEeqYbWD7ieXyJ3KogtR9a9I0Ih+HqClQ15vSRpozAIOgDRLtWcHRAoYXV7abl0J7yzZ g2iciQzq0F/XEShs5UcK0y4L8p+ECHOzrmiAJ5wT9rsolhOzP98qEmKR1nniAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNh6cJxz11FJ for ; Tue, 20 Jan 2026 04:09:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3111a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 04:09:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: b5b3bf57e9fb - stable/15 - libc: fix description issues in mac_text(3)/mac_free(3) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b5b3bf57e9fb35f8445b92e638a9fe351490825c Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 04:09:19 +0000 Message-Id: <696effef.3111a.6aba9a12@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b5b3bf57e9fb35f8445b92e638a9fe351490825c commit b5b3bf57e9fb35f8445b92e638a9fe351490825c Author: Kyle Evans AuthorDate: 2025-10-26 15:10:34 +0000 Commit: Kyle Evans CommitDate: 2026-01-20 04:04:08 +0000 libc: fix description issues in mac_text(3)/mac_free(3) mac_text(3) as-written would seem to indicate that a `mac_t` should be freed with free(3), but this isn't the case. One can derive from context from when the change was introduced and COMPATIBILITY that this was intended to talk about *text in `mac_to_text`, so move the comment there. PR: 179832 Co-authored-by: Priit Järv (cherry picked from commit 081218b7a2006e5b6783e51f66fd751871ac1272) --- lib/libc/posix1e/mac_free.3 | 4 ++-- lib/libc/posix1e/mac_text.3 | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/libc/posix1e/mac_free.3 b/lib/libc/posix1e/mac_free.3 index 4ed68b70f3a3..6674ca2e9094 100644 --- a/lib/libc/posix1e/mac_free.3 +++ b/lib/libc/posix1e/mac_free.3 @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 21, 2023 +.Dd October 26, 2025 .Dt MAC_FREE 3 .Os .Sh NAME @@ -85,7 +85,7 @@ is a complex structure in the implementation, .Fn mac_free is specific to -.Vt mac_3 , +.Vt mac_t , and must not be used to free the character strings returned from .Fn mac_to_text . Doing so may result in undefined behavior. diff --git a/lib/libc/posix1e/mac_text.3 b/lib/libc/posix1e/mac_text.3 index 29c1aacca485..7633f4b0da64 100644 --- a/lib/libc/posix1e/mac_text.3 +++ b/lib/libc/posix1e/mac_text.3 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 21, 2023 +.Dd October 26, 2025 .Dt MAC_TEXT 3 .Os .Sh NAME @@ -52,14 +52,16 @@ into the internal policy label format and places it in .Fa *mac , which must later be freed with -.Xr free 3 . +.Xr mac_free 3 . .Pp The .Fn mac_to_text function allocates storage for .Fa *text , which will be set to the text representation of -.Fa label . +.Fa label +and must later be freed with +.Xr free 3 . .Pp Refer to .Xr maclabel 7 From nobody Tue Jan 20 04:09:25 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNj5Lcwz6Nvwk for ; Tue, 20 Jan 2026 04:09: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwDNj3Zjgz3VSD for ; Tue, 20 Jan 2026 04:09:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nl3Q339xUCWjQay+WA1xHgQWuQBketjB3WYPSOcnZWk=; b=SUq1s94KanWYM9QxrjejzL7Ci668bg8RpxugJfkhZC2vacfaF4fY8amn4A71qc5747LV0/ x2fL9alXhC7lq+c8sfSK3lxLnSNlNcKt13iRDat/MX6hZpcdsSc1dhmw/ChDVWallwBqZQ bnOTAuFbmg/gAsc7Pe+ZaZKrwhCOyZjGJc57JK+u8cb5W+10io/DJGDlmEwWJqq3sIYb9i itm6XRRUEhlOJEoC2RHwaw/qWgI30Df/ag7Cl/df/PzJZc3Fhj0TgNg3pfcv0o6ObEKugI NXHk3/KQhgDfa5smMvxKw3XnEDIpcdCnbtSng7XFzPSASKMtVOQjSddhXsrUSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nl3Q339xUCWjQay+WA1xHgQWuQBketjB3WYPSOcnZWk=; b=SMGZJPFzrSN6RS3c3NzRL+N7F3Awiob2gxmJZ3OVIRit7YepTnzqEe0Cp5/OfBju5esmpH Rx18QetvgJNBEcZs33B091oGAlpjJG70v6ae2wD52KUZ84pj8D5a0pn2zPxF6Zk98qmSSt X1SaJK6KYnMUw2o6fpvpiIXCBqSgyuw/Q4GFovCYjZFjCa5QatbwVHkKue+1K7DdnidKdP nLGBkHRUB6Aa23/s7nbitWc111QiZm7CyOihmGFl2qKzRUF6ZmNCZH7iyU5uYIQhKwxPrm dewCZfOi1v7RWzT8QoPjOxDYF4wcBYPQDd16p0Clo8WHmbZeqZffbI40eM5/NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768882165; a=rsa-sha256; cv=none; b=Gmqr6UYYvFtx4e/VG0hf4RRzWCcbn3cmQurmkk0X4AUVJAcu+6dwhUr8p5r2cjtkKpUL9a is6kERzfGUt7djN5V4kQzUk7ZsKbNAyz9YZ2+LO3AMQTgITd1c5x8wEflZOYLILl4hZL5p PZeVo1JqmoATqG/IpNgIWoyn53Io7cyEWp4E2REWg6eEe3xj0cKdcUtp1R/E7j82qRMpvw 9VrvORSlHxbt5glgSnfzWYfycWbfL/BQ/sHcmJMOtCav6zlhSNTg23e+xlBrne/v/CaWR1 Qc/y0WMNsN5GBQ+fMp+kZIhuVU3mbxRtoDrhcumFfdudaOZ62M0tGwfvphWoDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNj39cdz127f for ; Tue, 20 Jan 2026 04:09:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 278e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 04:09:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 6dabfd3efefa - stable/15 - lualoader: fix pruning of non-existent default kernel List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6dabfd3efefaeb2bc24b8f16e1c5aae8dedc4d0c Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 04:09:25 +0000 Message-Id: <696efff5.278e3.48e6fe5c@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6dabfd3efefaeb2bc24b8f16e1c5aae8dedc4d0c commit 6dabfd3efefaeb2bc24b8f16e1c5aae8dedc4d0c Author: Kyle Evans AuthorDate: 2026-01-07 18:20:05 +0000 Commit: Kyle Evans CommitDate: 2026-01-20 04:04:46 +0000 lualoader: fix pruning of non-existent default kernel Removing the kernel from the list of available kernels is sufficient to avoid rendering it in the list, but we need more for booting to actually work. Notably, the 'kernel' loader.conf var was left intact to its default value, so if one didn't use the kernel selector in the menu then we'd try to boot the nonexistent 'kernel' instead of the new default (first autodetected). There's room to improve the error messages here, but for now let's just make it actually work correctly. PR: 292232 Fixes: d04415c520b03 ("loader: lua: remove the default kernel [...]") (cherry picked from commit e30086ab4c8778ea70a3b19e83546ce1b4a16492) --- stand/lua/core.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/stand/lua/core.lua b/stand/lua/core.lua index f42be6fbebb7..d06f41511a47 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -289,6 +289,12 @@ function core.kernelList() kernels[n] = kernels[n + 1] end end + + -- The config/boot bits use the env var as a fallback if the + -- menu's kernel selector remains untouched, so we want to + -- update our notion of the default kernel to one that is + -- actually present. + loader.setenv("kernel", kernels[1]) end core.cached_kernels = kernels From nobody Tue Jan 20 04:09:38 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNy5h2Hz6NwHV for ; Tue, 20 Jan 2026 04:09: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwDNy2zQ6z3W2T for ; Tue, 20 Jan 2026 04:09:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9LVWRKqtOacyLb/Z8inUJyEqnf6QTavFxIQ6bi2Ra7U=; b=bGTm5tWJBcdZ5kw2Whkq3zT53wNjMuTagURXAZ8bh5CMi184akHmViTIb5OGasfl/PzniP TmKxYbm53IqNiXaJ5XZrJVs7cjuyTs4VVso/Phd2VRU7hj0LoArMkOoPYmbQT/uMbolHw0 KKpbbTB5EUlp7FmzhkrJbPw+d0BQbn2rmdCyi/U0iuXcP7bAhVtLrBM5HM231v249q1W1W fcIDJeyBE3Bj5TujL9vi5UK4xOIob2nZsvemfAvT6x/kfNPETvYd89gpvv6CND5r2ydB7B oHFJFji/N/hTHCNJxRGyRKsVVQoneyUq3pKwqj57uP/LVnKAXIvZvXQxlh+Ayg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9LVWRKqtOacyLb/Z8inUJyEqnf6QTavFxIQ6bi2Ra7U=; b=tuE39adx5zRDysN/PMOW9579CvcbTCswVLTC3nSLfBvVe4hb83TsjjXpMPlIKEeBuwg6Lm O+GFbhSlpoSbPlfaWF4bOaZQROlM1IFWQw1gkza8DTBgVsbyZIY7rAcgZVOI0lvMP56duI iIB6nfgq4kyG1YspXKfHhAvKb6IBAiWv0HhshADkN64/7WqUaAoeG0sY3CsZ+jGl+/fAuh vmd7ym2XelbEv5ZM3x7FJ2N12mICxbzYE2iVx3VVKFCGc2smJvJ6+BAkc8NL17TfAOxD0I e0+IpBDbU6dg91j/Sf0RQrx52pVyhQ190f0tmy7ccPhNZRjCSQgkBrXjabeThA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768882178; a=rsa-sha256; cv=none; b=UhFDJBnXg9itDXa0bGSV5RHdk0OvI8mVn3fYDoAQFUTVLMUgMqjAkJE443DFM5YLl/wsuv wGNiXl2LXTIbsLLKMSSJv16o67MqL5DQ6KUeYdthocvO+b779ClGjjHUEcJPa/xpbQ9Z4a U5aDNU9bbP4L4ZDwLHUbQm6RNgpr5BBZzWClanvf9ddQU9YzjpwN9cvB77NIFG78a+RKEM MSMeTZyKmDSZt6RFdpio5jH8xO+weCb7OpdyN3fLabrTN25vP1TcJI/BbmN7zKM+Vd7yY4 ZAscmkXlaLkM7XLrjlpe23aB6PVSJeC1pZWa8vweHd9xEAx4iNES7W5rYcLpHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNy28MBz127Q for ; Tue, 20 Jan 2026 04:09:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30b69 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 04:09:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: f00ebc7eb3a6 - stable/14 - libc: fix description issues in mac_text(3)/mac_free(3) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f00ebc7eb3a65494749fb85b3fd8f27ea09296ae Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 04:09:38 +0000 Message-Id: <696f0002.30b69.5ebb5afb@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f00ebc7eb3a65494749fb85b3fd8f27ea09296ae commit f00ebc7eb3a65494749fb85b3fd8f27ea09296ae Author: Kyle Evans AuthorDate: 2025-10-26 15:10:34 +0000 Commit: Kyle Evans CommitDate: 2026-01-20 04:05:37 +0000 libc: fix description issues in mac_text(3)/mac_free(3) mac_text(3) as-written would seem to indicate that a `mac_t` should be freed with free(3), but this isn't the case. One can derive from context from when the change was introduced and COMPATIBILITY that this was intended to talk about *text in `mac_to_text`, so move the comment there. PR: 179832 Co-authored-by: Priit Järv (cherry picked from commit 081218b7a2006e5b6783e51f66fd751871ac1272) --- lib/libc/posix1e/mac_free.3 | 4 ++-- lib/libc/posix1e/mac_text.3 | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/libc/posix1e/mac_free.3 b/lib/libc/posix1e/mac_free.3 index 4ed68b70f3a3..6674ca2e9094 100644 --- a/lib/libc/posix1e/mac_free.3 +++ b/lib/libc/posix1e/mac_free.3 @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 21, 2023 +.Dd October 26, 2025 .Dt MAC_FREE 3 .Os .Sh NAME @@ -85,7 +85,7 @@ is a complex structure in the implementation, .Fn mac_free is specific to -.Vt mac_3 , +.Vt mac_t , and must not be used to free the character strings returned from .Fn mac_to_text . Doing so may result in undefined behavior. diff --git a/lib/libc/posix1e/mac_text.3 b/lib/libc/posix1e/mac_text.3 index 29c1aacca485..7633f4b0da64 100644 --- a/lib/libc/posix1e/mac_text.3 +++ b/lib/libc/posix1e/mac_text.3 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 21, 2023 +.Dd October 26, 2025 .Dt MAC_TEXT 3 .Os .Sh NAME @@ -52,14 +52,16 @@ into the internal policy label format and places it in .Fa *mac , which must later be freed with -.Xr free 3 . +.Xr mac_free 3 . .Pp The .Fn mac_to_text function allocates storage for .Fa *text , which will be set to the text representation of -.Fa label . +.Fa label +and must later be freed with +.Xr free 3 . .Pp Refer to .Xr maclabel 7 From nobody Tue Jan 20 04:09:39 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNz68P2z6Nw2J for ; Tue, 20 Jan 2026 04:09: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwDNz3lVtz3VtP for ; Tue, 20 Jan 2026 04:09:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b93pFQKvRl5RequZFmVW0eV9n1l7mxes2cNp0gYkD1E=; b=vcPL528/z2cfIOw88oj2gsAvX3CMMnzAo5d+zxB7ivlTgA4hbNlEC5ma9yuESPwbxTckPh BEttBNRV4X8J7aS+seJKbtb9d8o9k2r4QWhGUc02Ttsp1G9ELN9KPP76XjIQRkJ6E3LivL l+2dQXx1p5JI3+1NQIh+k2re56QlORW4Twb62Wqt/qCEMqz1FdfumZBFPXYTTiyO+xXsWg fO+c8Dgrq8h3xWN7f7QvgKfxPeiUPy+3Pnc/ppK8xFWYbir7/YzNFu1R1Foe0etaoWqNcv mR7X/AWt3fDWZvaWY0y4GJvTCIkqAPwEvHFJS3DlS5YTeerNZkJEtoGF+oS6ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b93pFQKvRl5RequZFmVW0eV9n1l7mxes2cNp0gYkD1E=; b=f6DKCIp0XzJgV+i3LHhkwKuZkaLu1e1nCqt2N6ur7LFiIuX6JTx8a+rtqCmwdCBiG1WKFj +4Y7XF+UJ/DuiQv89SL0eRFkWAPDZ+rnZbDqCMrFEdHQKjA/EllaNeZfdnv6n5PHQ8xsUA TFx944UL+sslzIaFzk+79sJ/YUNs3y//i56a4xl+JEaOyIqEO46Fy3QOMeWB8m9qJxSddZ 6DgDWXI6DuhRo80x2+4YdzuGLY8C3RBM+v2uJwYRslF2tNzY6EotzJu4fVaWTH9esQVCzA G4HRw2ia/WwUTQEI2/ApmS8mEth74ABjfs8uruGR+gnccY2y0jWuWDt+9H9Apg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768882179; a=rsa-sha256; cv=none; b=qt0rkHe5duvPbv/wKCM2RMwLyKOO6tIsJd9ZZ5SLl0Q01SOFQXY29O4Y60gzLpuPaCpq3x 1/0Pb+UY+pmKbvPEADt2+dSv0ZE+TXbsIyY80Qg+lTd3eI8tTb2Oj6GLGqwiyRiyDX3pN6 G59ScGhM6ZwsAX01bcajjlYMiXh6bByCCdJQhh/n7AACivi0nuuJAeiaA8nfs1yZUirj4O nGIYERLAO8GItOmA0NW7bvO6asTVIDB9YV7iiBLdSq4iR1DmJHYkQiHcCM0LlzuMb0/XQ7 h/mJ298GgOgHjWSmSJOOAB2TKqvuvV+TWOKQUxMpoPpYbSiJAeKdTMEX11lZmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNz2z5Yz11pT for ; Tue, 20 Jan 2026 04:09:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27cef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 04:09:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 57b08d98db0a - stable/14 - libutil: defer setting the MAC label until after the login class List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 57b08d98db0a5bc16a6f0b47ade5b25021564d14 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 04:09:39 +0000 Message-Id: <696f0003.27cef.7b254ad8@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=57b08d98db0a5bc16a6f0b47ade5b25021564d14 commit 57b08d98db0a5bc16a6f0b47ade5b25021564d14 Author: Kyle Evans AuthorDate: 2025-10-29 02:37:21 +0000 Commit: Kyle Evans CommitDate: 2026-01-20 04:05:44 +0000 libutil: defer setting the MAC label until after the login class MAC policies, like mac_biba(4), may forbid changing the login class once a label has been applied. For setting up the initial login context, this isn't really expected and in-fact may break some class-based configuration. Defer setting the MAC label until after the login class is set, and remove the requirement that we have a pwd entry since the label is pulled from the login class -- we only use pwd for syslog in this path. Patch is largely by Kevin Barry, with some modifications and this commit message by kevans@. PR: 177698 Reviewed by: des, olce Co-authored-by: Kevin Barry (cherry picked from commit 98edcbcce0a4650084bd86e704cfa38bf590250c) --- lib/libutil/login_class.c | 55 ++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index 172da78aaf17..db0218f94371 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -544,7 +544,7 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in /* we need a passwd entry to set these */ if (pwd == NULL) - flags &= ~(LOGIN_SETGROUP | LOGIN_SETLOGIN | LOGIN_SETMAC); + flags &= ~(LOGIN_SETGROUP | LOGIN_SETLOGIN); /* Set the process priority */ if (flags & LOGIN_SETPRIORITY) @@ -565,6 +565,27 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in } } + /* Set the sessions login */ + if ((flags & LOGIN_SETLOGIN) && setlogin(pwd->pw_name) != 0) { + syslog(LOG_ERR, "setlogin(%s): %m", pwd->pw_name); + login_close(llc); + return (-1); + } + + /* Inform the kernel about current login class */ + if (lc != NULL && lc->lc_class != NULL && (flags & LOGIN_SETLOGINCLASS)) { + error = setloginclass(lc->lc_class); + if (error != 0) { + syslog(LOG_ERR, "setloginclass(%s): %m", lc->lc_class); +#ifdef notyet + login_close(llc); + return (-1); +#endif + } + } + + setlogincontext(lc, pwd, flags); + /* Set up the user's MAC label. */ if ((flags & LOGIN_SETMAC) && mac_is_present(NULL) == 1) { const char *label_string; @@ -573,8 +594,10 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in label_string = login_getcapstr(lc, "label", NULL, NULL); if (label_string != NULL) { if (mac_from_text(&label, label_string) == -1) { - syslog(LOG_ERR, "mac_from_text('%s') for %s: %m", - pwd->pw_name, label_string); + syslog(LOG_ERR, "mac_from_text('%s') for %s %s: %m", + label_string, pwd != NULL ? "user" : "class", + pwd != NULL ? pwd->pw_name : lc->lc_class); + login_close(llc); return (-1); } if (mac_set_proc(label) == -1) @@ -583,33 +606,15 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in error = 0; mac_free(label); if (error != 0) { - syslog(LOG_ERR, "mac_set_proc('%s') for %s: %s", - label_string, pwd->pw_name, strerror(error)); + syslog(LOG_ERR, "mac_set_proc('%s') for %s %s: %s", + label_string, pwd != NULL ? "user" : "class", + pwd != NULL ? pwd->pw_name : lc->lc_class, strerror(error)); + login_close(llc); return (-1); } } } - /* Set the sessions login */ - if ((flags & LOGIN_SETLOGIN) && setlogin(pwd->pw_name) != 0) { - syslog(LOG_ERR, "setlogin(%s): %m", pwd->pw_name); - login_close(llc); - return (-1); - } - - /* Inform the kernel about current login class */ - if (lc != NULL && lc->lc_class != NULL && (flags & LOGIN_SETLOGINCLASS)) { - error = setloginclass(lc->lc_class); - if (error != 0) { - syslog(LOG_ERR, "setloginclass(%s): %m", lc->lc_class); -#ifdef notyet - login_close(llc); - return (-1); -#endif - } - } - - setlogincontext(lc, pwd, flags); login_close(llc); /* This needs to be done after anything that needs root privs */ From nobody Tue Jan 20 04:09:40 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDP10mPPz6Nw2K for ; Tue, 20 Jan 2026 04:09: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwDP04PC9z3W58 for ; Tue, 20 Jan 2026 04:09:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RpcPE8oxol0c82R+G1jhhkW95QdzrmRcLNN+EeONW0A=; b=QsVzvYwM3OsliWgQFjM6w0+I3HYp7TcMQKE9R1crVqOJt0yGsOCLyEZva/45gOkX51p9+d rmRAsCxCO6O/BQviqf23/18L/xGBTqNhrjle0AYA0Q8nO+3D4NUzJXlyxZYSJB3o3iaqzU /IfTX24jviPlKzpjatlDkeJVPAs2jluFU7HL1dOamDHPINaxnqWuz/WevEAjQyns2jRKOQ EnsKvOkJ9g9IgYdTrdv+rMMq1BrKrJDlmM9H5UAu8KcjTLq3z4TjgJWLq4Vof45XWTY9Vq 4F1VI7JLVSkd4iJu3ayI8qiSXymjO2WsPMq83Dv0ovDbnrErHsgY6McaPpnZDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RpcPE8oxol0c82R+G1jhhkW95QdzrmRcLNN+EeONW0A=; b=CTk6dbYqS8Xj8uJdL3oN401CY85nE3G+GmyheQXO7bp9kbZfetPGtCjCjKZOYEu7rQAxoN XdHi+D81Jtp1xUNPNTI1EqChTTw6Wi5Ypt7E6/dEOjGqPYIOXdgV7f1X8nG7bBEhm76u2J nq9ID4/WeXgPoncUEUhQI7555Wxe7LqGpO88BPfJIWr2htuoTO3OVa0vAywURtP2/i03Zg 8r3pEyOgA9eBiwGwlzB8d6mDfcbdLI2pHVvjAbq3SZQeS8t8QnTk/F8aV3mv4kRdVidQX/ PGcpmlB+bSxTCalm7XK1VDDaK1Z4BmYbynjFWObSZ1gozOatuGCSt706PxYAdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768882180; a=rsa-sha256; cv=none; b=fxQ+Up0hk6vNAKOKJZwAB6ECKjAZfIzc0DqUd+YESJyW4VlOC+rST8fv5/sjWoIoWimeDf mI5xp/hbgNwicK199kMKw7ZjhRia+4G9Al/ANetQpbHtH1Suzt50yE1VIqOse3iyiTIonD MPcog9eH+hIEJPPqcEf6HadZyWqGwAWXgCjHTW1cwFSr1wfa75AvVbgoBJn0pJGQW4nOlS R4BtQl63VQfM7wYOoRqZAaK0chb/NF3umZLmqL0H/CQwlxdd85ce5TlI/Q8BDo/7ZKVOWB 18q7NXF/xfApbKUNbwP1jWFmkOLLcucxij7x38/HUrKN3KHxgY50i4rcRGyDJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwDP03rwyz11d2 for ; Tue, 20 Jan 2026 04:09:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30ba6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 04:09:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: b196a718ca0e - stable/14 - libc: report _SC_NPROCESSORS_ONLN more accurately in cpu-limited jails List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b196a718ca0e77685b8e40aaac0911f11604d00c Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 04:09:40 +0000 Message-Id: <696f0004.30ba6.135c78fe@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b196a718ca0e77685b8e40aaac0911f11604d00c commit b196a718ca0e77685b8e40aaac0911f11604d00c Author: Kyle Evans AuthorDate: 2025-10-29 16:32:30 +0000 Commit: Kyle Evans CommitDate: 2026-01-20 04:06:56 +0000 libc: report _SC_NPROCESSORS_ONLN more accurately in cpu-limited jails We don't support CPU hotplug, but we do support cpuset(8) restrictions on jails (including prison0, which uses cpuset 1). The process cannot widen its cpuset beyond its root set, so it makes sense to instead report the number of cpus enabled there rather than the total number in the system. This change is effectively a nop for the majority of systems and jails in the wild, though it does reduce the performance of this query now that we can't take advantage of AT_NCPUS being provided in the auxinfo. The implementation here is notably different than Linux, which would not take cgroups into account. They do, however, take CPU hotplug into account, so the possibility for it to diverge from (and be lower than) the # configured count to reflect what the process can actually be scheduled on doesn't really diverge in semantics. Reviewed by: kib (cherry picked from commit d617806aac1469319970e3551656e9deabb98a35) --- lib/libc/gen/sysconf.3 | 6 +- lib/libc/gen/sysconf.c | 16 ++++- lib/libc/tests/sys/cpuset_test.c | 140 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 156 insertions(+), 6 deletions(-) diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3 index 56d4c0bc5aa6..73338ae30349 100644 --- a/lib/libc/gen/sysconf.3 +++ b/lib/libc/gen/sysconf.3 @@ -27,7 +27,7 @@ .\" .\" @(#)sysconf.3 8.3 (Berkeley) 4/19/94 .\" -.Dd April 26, 2013 +.Dd August 30, 2025 .Dt SYSCONF 3 .Os .Sh NAME @@ -79,7 +79,9 @@ The maximum number of supplemental groups. .It Li _SC_NPROCESSORS_CONF The number of processors configured. .It Li _SC_NPROCESSORS_ONLN -The number of processors currently online. +The number of processors currently online, taking into account current jail +restrictions to report only the number of processors that are usable to the +process. .It Li _SC_OPEN_MAX One more than the maximum value the system may assign to a new file descriptor. .It Li _SC_PAGESIZE diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c index 4b43cb48840c..fd9bc658ae40 100644 --- a/lib/libc/gen/sysconf.c +++ b/lib/libc/gen/sysconf.c @@ -73,6 +73,7 @@ long sysconf(int name) { struct rlimit rl; + cpuset_t cpus; size_t len; int mib[2], sverrno, value; long lvalue, defaultresult; @@ -580,8 +581,21 @@ yesno: return (_POSIX_IPV6); #endif - case _SC_NPROCESSORS_CONF: case _SC_NPROCESSORS_ONLN: + /* + * Consult our root set first, because our CPU availability + * may not match the total number of CPUs available on the + * system and we may have a non-uniform layout even within + * userland. In particular, each jail has a root set that can + * be constrained by its parent and processes within the jail + * cannot widen beyond those constraints, so to those processes + * it makes sense to claim the more limited count. + */ + if (cpuset_getaffinity(CPU_LEVEL_ROOT, CPU_WHICH_PID, -1, + sizeof(cpus), &cpus) == 0) + return (CPU_COUNT(&cpus)); + /* FALLTHROUGH */ + case _SC_NPROCESSORS_CONF: if (_elf_aux_info(AT_NCPUS, &value, sizeof(value)) == 0) return ((long)value); mib[0] = CTL_HW; diff --git a/lib/libc/tests/sys/cpuset_test.c b/lib/libc/tests/sys/cpuset_test.c index 53d6a8215bbc..c8ad225fadfc 100644 --- a/lib/libc/tests/sys/cpuset_test.c +++ b/lib/libc/tests/sys/cpuset_test.c @@ -34,8 +34,10 @@ #include #include +#include #include #include +#include #include #include @@ -107,6 +109,19 @@ skip_ltncpu(int ncpu, cpuset_t *mask) atf_tc_skip("Test requires %d or more cores.", ncpu); } +static void +skip_ltncpu_root(int ncpu, cpuset_t *mask) +{ + + CPU_ZERO(mask); + ATF_REQUIRE_EQ(0, cpuset_getaffinity(CPU_LEVEL_ROOT, CPU_WHICH_PID, + -1, sizeof(*mask), mask)); + if (CPU_COUNT(mask) < ncpu) { + atf_tc_skip("Test requires cpuset root with %d or more cores.", + ncpu); + } +} + ATF_TC(newset); ATF_TC_HEAD(newset, tc) { @@ -234,9 +249,8 @@ ATF_TC_BODY(deadlk, tc) } static int -do_jail(int sock) +create_jail(void) { - struct jail_test_info info; struct iovec iov[2]; char *name; int error; @@ -250,8 +264,22 @@ do_jail(int sock) iov[1].iov_base = name; iov[1].iov_len = strlen(name) + 1; - if (jail_set(iov, 2, JAIL_CREATE | JAIL_ATTACH) < 0) + error = jail_set(iov, 2, JAIL_CREATE | JAIL_ATTACH); + free(name); + if (error < 0) return (FAILURE_JAIL); + return (0); +} + +static int +do_jail(int sock) +{ + struct jail_test_info info; + int error; + + error = create_jail(); + if (error != 0) + return (error); /* Record parameters, kick them over, then make a swift exit. */ CPU_ZERO(&info.jail_tidmask); @@ -641,6 +669,111 @@ ATF_TC_BODY(jail_attach_disjoint, tc) try_attach(jid, &smask); } +struct nproc_info { + long nproc_init; + long nproc_final; + long nproc_global; +}; + +ATF_TC(jail_nproc); +ATF_TC_HEAD(jail_nproc, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Test that _SC_PROCESSORS_ONLN reflects jail cpuset constraints"); +} +ATF_TC_BODY(jail_nproc, tc) +{ + cpuset_t jmask; + struct nproc_info ninfo = { }; + int sockpair[2]; + cpusetid_t setid; + ssize_t readsz; + pid_t pid; + int fcpu, error, pfd, sock; + char okb = 0x7f, rcvb; + + skip_ltncpu_root(2, &jmask); + fcpu = CPU_FFS(&jmask) - 1; + + /* + * Just adjusting our affinity should not affect the number of + * processors considered online- we want to be sure that it's only + * adjusted if our jail's root set is. + */ + CPU_CLR(fcpu, &jmask); + error = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, + sizeof(jmask), &jmask); + ATF_REQUIRE_EQ(0, error); + ATF_REQUIRE(sysconf(_SC_NPROCESSORS_ONLN) > CPU_COUNT(&jmask)); + + ATF_REQUIRE_EQ(0, socketpair(PF_UNIX, SOCK_STREAM, 0, sockpair)); + + /* We'll wait on the procdesc, too, so we can fail faster if it dies. */ + ATF_REQUIRE((pid = pdfork(&pfd, 0)) != -1); + + if (pid == 0) { + /* First child sets up the jail. */ + sock = sockpair[SP_CHILD]; + close(sockpair[SP_PARENT]); + + error = create_jail(); + if (error != 0) + _exit(error); + + ninfo.nproc_init = sysconf(_SC_NPROCESSORS_ONLN); + + /* Signal the parent that we're jailed. */ + readsz = write(sock, &okb, sizeof(okb)); + assert(readsz == sizeof(okb)); + + /* Wait for parent to adjust our mask and signal OK. */ + readsz = read(sock, &rcvb, sizeof(rcvb)); + assert(readsz == sizeof(rcvb)); + assert(rcvb == okb); + + ninfo.nproc_final = sysconf(_SC_NPROCESSORS_ONLN); + ninfo.nproc_global = sysconf(_SC_NPROCESSORS_CONF); + readsz = write(sock, &ninfo, sizeof(ninfo)); + assert(readsz == sizeof(ninfo)); + + _exit(0); + } + + close(sockpair[SP_CHILD]); + sock = sockpair[SP_PARENT]; + + /* Wait for signal that they are jailed. */ + readsz = read(sock, &rcvb, sizeof(rcvb)); + assert(readsz == sizeof(rcvb)); + assert(rcvb == okb); + + /* Grab the cpuset id and adjust it. */ + error = cpuset_getid(CPU_LEVEL_ROOT, CPU_WHICH_PID, pid, &setid); + ATF_REQUIRE_EQ(0, error); + error = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_CPUSET, + setid, sizeof(jmask), &jmask); + ATF_REQUIRE_EQ(0, error); + + /* Signal OK to proceed. */ + readsz = write(sock, &okb, sizeof(okb)); + ATF_REQUIRE_EQ(sizeof(okb), readsz); + + /* Grab our final nproc info. */ + readsz = read(sock, &ninfo, sizeof(ninfo)); + ATF_REQUIRE_EQ(sizeof(ninfo), readsz); + + /* + * We set our own affinity to jmask, which is derived from *our* root + * set, at the beginning of the test. The jail would inherit from this + * set, so we just re-use that mask here to confirm that + * _SC_NPROCESSORS_ONLN did actually drop in response to us limiting the + * jail, and that its _SC_NPROCESSORS_CONF did not. + */ + ATF_REQUIRE_EQ(CPU_COUNT(&jmask) + 1, ninfo.nproc_init); + ATF_REQUIRE_EQ(CPU_COUNT(&jmask) + 1, ninfo.nproc_global); + ATF_REQUIRE_EQ(CPU_COUNT(&jmask), ninfo.nproc_final); +} + ATF_TC(badparent); ATF_TC_HEAD(badparent, tc) { @@ -686,6 +819,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, jail_attach_prevbase); ATF_TP_ADD_TC(tp, jail_attach_plain); ATF_TP_ADD_TC(tp, jail_attach_disjoint); + ATF_TP_ADD_TC(tp, jail_nproc); ATF_TP_ADD_TC(tp, badparent); return (atf_no_error()); } From nobody Tue Jan 20 04:09:41 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDP22TkVz6Nw6H for ; Tue, 20 Jan 2026 04:09:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwDP154nBz3Vtg for ; Tue, 20 Jan 2026 04:09:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wg6j9htLrmOWWNmnNGEA+W2Lmx0hmLQ9DlcB4Q66+YU=; b=SQe0PIAfc54T5T+wRiEW3TzUJ0l+WfgSQi/mnzV4i9LzhXjV4avSm0XvQs3JLA6v0SV+Se InyBGSl6Z8VOtXuAzSAVt2TgSZ5X7bsvneMaBb2g2+xBnjZUUoautH/KvmLYNuDoRCI8Yl vto67TqyX//Bg/7iofMk7M5D1XAM5RPlLUBis8AOquplcx1bw036u96fCzabUml79jHxkU Ys+x2w/sDWLq8LdGizo3hBaLVQh9ZuWWvdpnX8vNavOkQ5eRLRGuUr5zrYf/Y1SAYOICwf YKFj1vGLGO/wDXZMUmdbFuTm5wHdivkpRP8a1WySUIKsQNqF29Dxh4V1/OwLiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wg6j9htLrmOWWNmnNGEA+W2Lmx0hmLQ9DlcB4Q66+YU=; b=JYq3ZDNMHb6RD/wseAqT+TJIBzTUzFCcaF7K/x3mf8Iw17sEnbXZ/N4rExMcMfSb+oaazn 4CKCeGT31BVnXk50m6i2J0NWch/dWHzowrJDcUcBEwtGyLTU2BBsvJGRNPils83EuaDgEK F4fFyzMJsCdnwSCPVVw2vsjzGNQPHMuFV1tw7IUIFmiw/9V3VaLVhYGwadQTE0eNHxZmPg Cap5bPIRUQUxv13Fl6JrDQ74ac2uDtAsnYQN03mfoIAEnvG8RA5GW3F6HRTsH1ENz9Ws19 Pl7ZcS+PTeSC+uo8KhCnTSntZkZDuf88CkQnNnEyTi0A6ko7igmXuRmRt4hCSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768882181; a=rsa-sha256; cv=none; b=oRricO0zwvISgn/JpxxK0PH8BTdfkVAiDovubx8OyrvbbPQ1sRZJdg+2kZuMRAuwKXMi4l uF5m339vSMbRXfd+Z9Y9G9YojA6Xiax5S2aXwoTo2eBPuUVfnCcP/1sGwE6BhUGR1dstmV TdcpeiqbFlP7+huqYXBXmw3C+U8vS8DCY4cFdwr8oKgaWM5jAllxDWcqICAlSdwznGUB1P rrmwVuLkGvIvu+Lb3IQ9iHNzmb48+SwgFzmGcap1AKPUcV3x2HEaxsM5XfCmOfoisn8Yaq QZlwoTs3Wlz3A9ee+BUcl6kORZsrmoDYFt4PgBvVDavusZHxQHG80ArZHirbeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwDP14dwDz127h for ; Tue, 20 Jan 2026 04:09:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26a60 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 04:09:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: d3c523b6f5aa - stable/14 - makedev(9): drop an additional note about cdevpriv dtors List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d3c523b6f5aa644e85d7c2c1177953f5d73e8529 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 04:09:41 +0000 Message-Id: <696f0005.26a60.7c9df80d@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d3c523b6f5aa644e85d7c2c1177953f5d73e8529 commit d3c523b6f5aa644e85d7c2c1177953f5d73e8529 Author: Kyle Evans AuthorDate: 2025-11-05 00:28:02 +0000 Commit: Kyle Evans CommitDate: 2026-01-20 04:07:00 +0000 makedev(9): drop an additional note about cdevpriv dtors These were previously somewhat safe to call destroy_dev(9), but will now also cause a deadlock in the same fashion that d_close doing so would previously. Amend the note to point it out, in case it's useful for someone. Reviewed by: imp, kib, markj (cherry picked from commit 90314c04f10f583c37c59ec51fd628e3deaf3622) --- share/man/man9/make_dev.9 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/share/man/man9/make_dev.9 b/share/man/man9/make_dev.9 index 052f9a0cfd87..c8f495c2777b 100644 --- a/share/man/man9/make_dev.9 +++ b/share/man/man9/make_dev.9 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 19, 2025 +.Dd November 4, 2025 .Dt MAKE_DEV 9 .Os .Sh NAME @@ -387,14 +387,18 @@ function is the same as: destroy_dev_sched_cb(cdev, NULL, NULL); .Ed .Pp -The +Neither the .Fn d_close -driver method cannot call +driver method, nor a +.Xr devfs_cdevpriv 9 +.Fa dtr +method can .Fn destroy_dev directly. Doing so causes deadlock when .Fn destroy_dev -waits for all threads to leave the driver methods. +waits for all threads to leave the driver methods and finish executing any +per-open destructors. Also, because .Fn destroy_dev sleeps, no non-sleepable locks may be held over the call. From nobody Tue Jan 20 04:09:42 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDP30jhbz6Nw9Q for ; Tue, 20 Jan 2026 04:09: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwDP25lFYz3W3B for ; Tue, 20 Jan 2026 04:09:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882182; 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=CKcDFUBZu6eHayp8j/LylxdJ2QrZgOLzaSc6N1IjJJY=; b=S49NvalBn3Ff5hw8KJjvWc+4S5JwTLUitQBAcgXbVA1AY+iemTluII3MPSZwZGTYGSSmQB eNbiKM5ztqSySj06Cc75GowzFmKFLxENqMu1n5SE6cuqvCKc5TLOYqB7tm3C69y1w+pjFS krJlD59wpRkGNC3pXYgwdS5665eXtTcD1zmhz4zUbJbBoEgy3GidhGUmAHNMW9Cb/XiKDt Xi0sXpVTHveV8dvnme+9fn0Aja5sj3dQ6EO+sxqOtFNjM73T9f+kC7DGlipu4V8De5/UOg hla9zkSVMaoOe5ORkhtj3+T2/SRZF+8sscfUY79Twd4wMEumTMawj+q9cfZhdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882182; 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=CKcDFUBZu6eHayp8j/LylxdJ2QrZgOLzaSc6N1IjJJY=; b=KJxUhR3X0aIx/c7j+TKT2Lg3QKv4zDmOZxtpWM8HXdVD34JULWmoQ59o/LUxwukTU8ZVRa 2DZE2FxdEjHHnTCuLpU1QhbtxWFBOd62W9EQ6tr90WnkbTThoDiHB8Q8SerTFwxVlaKUBb 99UJuhRH/0+LQl9aN8eJob3PEBboojoQsour1kEd+ZlwOLgB/MTYH2FYBDW8OrWYiBaUSA x0kCEqMuJAiJjdFVZwn+uUbgt96+9XURYVVPOBLi58gcVLTDPr3zMxNLbvKVCnD74eWetQ bNwPD4XPKwCnLN46StNWsfPiaXjfvWrUxmV04JUAua4Qo2GSl2C3C5kMgXwafA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768882182; a=rsa-sha256; cv=none; b=f88w64Y2uNV8JEp61AkduI3LnIXCTXLDtuvTSbSgd0kNL9EdvA6k7KaT6ajiJVUgJQM0Yd HcG+ZiJMakXJYW5Spl6tWERaShcV3Y4EuHQTUrqz4HILUVIOtTQlVF98sI7RfrPGOc3ZmC xfIIEHMmnfHzJhljzM0NudHw0/8IcFpjNzIWqijsTIH2IOAD2NkqdkiZITrWjpKTYDCMKL VeN/MVoM+kI71XRgfEzh2SMVow1RR95pY+afb3VKBIHjE4ThB25mMyOvs/AwoHvOPLRSWV UcmmLQM5l+RLDn/z9lfqDta4RmsJ0qJw+ME9aXmIS4hW02PAf1eqrz86ZFA/Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwDP254xLz120Z for ; Tue, 20 Jan 2026 04:09:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2795c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 04:09:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Rob Norris From: Kyle Evans Subject: git: 919c1e19058d - stable/14 - bectl: log modifying functions to zpool history List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 919c1e19058d2e214fa3c33498123adb6ca3366c Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 04:09:42 +0000 Message-Id: <696f0006.2795c.2a070bf1@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=919c1e19058d2e214fa3c33498123adb6ca3366c commit 919c1e19058d2e214fa3c33498123adb6ca3366c Author: Rob Norris AuthorDate: 2025-12-17 17:00:47 +0000 Commit: Kyle Evans CommitDate: 2026-01-20 04:08:09 +0000 bectl: log modifying functions to zpool history Modeled directly after the method used by the zfs/zpool commands: flag commands with a "please log me" flag, and when there, reconstruct the command line. On success, call the library function to add it to the log. (Majority of the change by Rob; minor edits by kevans@) Signed-off-by: Rob Norris Co-authored-by: Kyle Evans Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. (cherry picked from commit 2a87929671e6e6919c18f2c25d60f2c73c3d18f4) --- lib/libbe/be.c | 12 +++++++++ lib/libbe/be.h | 2 ++ lib/libbe/libbe.3 | 16 ++++++++++-- sbin/bectl/bectl.c | 73 ++++++++++++++++++++++++++++++++++++++++++------------ 4 files changed, 85 insertions(+), 18 deletions(-) diff --git a/lib/libbe/be.c b/lib/libbe/be.c index de98f3b5e69e..0eaf0e6a5477 100644 --- a/lib/libbe/be.c +++ b/lib/libbe/be.c @@ -1327,3 +1327,15 @@ be_activate(libbe_handle_t *lbh, const char *bootenv, bool temporary) return (BE_ERR_SUCCESS); } + +int +be_log_history(libbe_handle_t *lbh, const char *message) +{ + int err; + + err = zpool_log_history(lbh->lzh, message); + if (err) + return (set_error(lbh, BE_ERR_UNKNOWN)); + + return (BE_ERR_SUCCESS); +} diff --git a/lib/libbe/be.h b/lib/libbe/be.h index 01ee94fd03ca..d3f47c0604fe 100644 --- a/lib/libbe/be.h +++ b/lib/libbe/be.h @@ -107,6 +107,8 @@ int be_exists(libbe_handle_t *, const char *); int be_export(libbe_handle_t *, const char *, int fd); int be_import(libbe_handle_t *, const char *, int fd); +int be_log_history(libbe_handle_t *, const char *); + #if SOON int be_add_child(libbe_handle_t *, const char *, bool); #endif diff --git a/lib/libbe/libbe.3 b/lib/libbe/libbe.3 index c1bf52e42324..032a95a00c9d 100644 --- a/lib/libbe/libbe.3 +++ b/lib/libbe/libbe.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 25, 2025 +.Dd January 19, 2026 .Dt LIBBE 3 .Os .Sh NAME @@ -144,6 +144,9 @@ .Pp .Ft void .Fn be_prop_list_free "nvlist_t *prop_list" +.Pp +.Ft int +.Fn be_log_history "libbe_handle_t *hdl" "const char *message" .Sh DESCRIPTION .Nm interfaces with libzfs to provide a set of functions for various operations @@ -536,6 +539,14 @@ exactly as specified by The .Fn be_prop_list_free function will free the property list. +.Pp +The +.Fn be_log_history +function will log the given +.Fa message +to the zpool history, which can be later retrieved using the +.Xr zpool-history 8 +command. .Sh DIAGNOSTICS Upon error, one of the following values will be returned: .Bl -bullet -offset indent -compact @@ -583,7 +594,8 @@ BE_ERR_UNKNOWN BE_ERR_INVORIGIN .El .Sh SEE ALSO -.Xr bectl 8 +.Xr bectl 8 , +.Xr zpool-history 8 .Sh HISTORY .Nm and its corresponding command, diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index f37a1473680e..94bb9c6e5ea6 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -77,27 +78,28 @@ struct command_map_entry { int (*fn)(int argc, char *argv[]); /* True if libbe_print_on_error should be disabled */ bool silent; + bool save_history; }; static struct command_map_entry command_map[] = { - { "activate", bectl_cmd_activate,false }, - { "create", bectl_cmd_create, false }, - { "destroy", bectl_cmd_destroy, false }, - { "export", bectl_cmd_export, false }, - { "import", bectl_cmd_import, false }, + { "activate", bectl_cmd_activate,false, true }, + { "create", bectl_cmd_create, false, true }, + { "destroy", bectl_cmd_destroy, false, true }, + { "export", bectl_cmd_export, false, true }, + { "import", bectl_cmd_import, false, true }, #if SOON - { "add", bectl_cmd_add, false }, + { "add", bectl_cmd_add, false, true }, #endif - { "jail", bectl_cmd_jail, false }, - { "list", bectl_cmd_list, false }, - { "mount", bectl_cmd_mount, false }, - { "rename", bectl_cmd_rename, false }, - { "unjail", bectl_cmd_unjail, false }, - { "ujail", bectl_cmd_unjail, false }, - { "unmount", bectl_cmd_unmount, false }, - { "umount", bectl_cmd_unmount, false }, - { "check", bectl_cmd_check, true }, + { "jail", bectl_cmd_jail, false, false }, + { "list", bectl_cmd_list, false, false }, + { "mount", bectl_cmd_mount, false, false }, + { "rename", bectl_cmd_rename, false, true }, + { "unjail", bectl_cmd_unjail, false, false }, + { "ujail", bectl_cmd_unjail, false, false }, + { "unmount", bectl_cmd_unmount, false, false }, + { "umount", bectl_cmd_unmount, false, false }, + { "check", bectl_cmd_check, true, false }, }; static struct command_map_entry * @@ -524,12 +526,42 @@ bectl_cmd_check(int argc, char *argv[] __unused) return (0); } +static char * +save_cmdline(int argc, char *argv[]) +{ + char *cmdline, *basename, *p; + int len, n, i; + + len = MAXPATHLEN * 2 + 1; /* HIS_MAX_RECORD_LEN from zfs.h */ + cmdline = p = malloc(len); + if (cmdline == NULL) + err(2, "malloc"); + + basename = strrchr(argv[0], '/'); + if (basename == NULL) + basename = argv[0]; + else + basename++; + + n = strlcpy(p, basename, len); + for (i = 1; i < argc; i++) { + if (n >= len) + break; + p += n; + *p++ = ' '; + len -= (n + 1); + n = strlcpy(p, argv[i], len); + } + + return (cmdline); +} + int main(int argc, char *argv[]) { struct command_map_entry *cmd; const char *command; - char *root = NULL; + char *root = NULL, *cmdline = NULL; int opt, rc; while ((opt = getopt(argc, argv, "hr:")) != -1) { @@ -566,10 +598,19 @@ main(int argc, char *argv[]) return (-1); } + if (cmd->save_history) + cmdline = save_cmdline(argc+optind, argv-optind); + libbe_print_on_error(be, !cmd->silent); rc = cmd->fn(argc, argv); + if (cmd->save_history) { + if (rc == 0) + be_log_history(be, cmdline); + free(cmdline); + } + libbe_close(be); return (rc); } From nobody Tue Jan 20 04:09:43 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDP43HFhz6NwHY for ; Tue, 20 Jan 2026 04:09: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwDP36McJz3WCm for ; Tue, 20 Jan 2026 04:09:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4slsG30DaePhKdFQ70IrFz/FKUiEn1eAk6Ml37Z8aQ=; b=KQ58nrCGIsdqko9cXMc7Roi1tPvBO5KJFoupx82a+DVvmS/3kkchEosv+ULnxN3C9Ua29i eDMut3m/oLpfyL9W1n3BFxUJZbolOQ+yST1r2MZYgqXgsKbbNsUKfZ5TtWO9Sa3Gk0Z23D gNUBEHTmmAB9hEVQ1O6QG5LJIZyENr+lb7YP0MRH0Q+WB/emvbk0TEpp1F/ndwQ5w6NjA8 bxYEua7AxbNZZxv/PDTYLVpiS5RJ3yCyQkXncXoYSxL3Iw/SBS/C4akLxZ3H4LPlD/ZSi4 dHVqoBvdhdqHeBeTRPUptFe6byug6kCSjCPviZgUz+skFJ7EHsi2+Pnmj8nIRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4slsG30DaePhKdFQ70IrFz/FKUiEn1eAk6Ml37Z8aQ=; b=BDh1+p59KpVwH1jJT2duS56dlru5TsGEqCM+HksL1fp0li9TQRSrtWaf7Zr+zSkk2LAKMN x5OcDBjAu1o4jhzAMDWfpiWEDLgO7uem16JeH8TgrV/oDjLk3dUGx5s6KDUiC8T3SvZLT/ L2yh3IWKCoQXezKdGS3uknvqzjImHNoJm+hP5sqnfgZwjfnkDX4u5Waxrg8JI2vfG1veal QHHNuttBkLgrfiTWKeKnnpey5ilvEAO0jRaMFMckizhIek26kChzigTiIoFk0144yAYkJJ qMFS92AGMmdDdM21nA/ibm5+84KCvyx3n3C5MQl6R8gQUwgmAXFpJe7FZN03zA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768882183; a=rsa-sha256; cv=none; b=pdt633qb5ieqJ4++44edDMXxzF5zv2pRuKhGW8yC7kBJh2WX/zhLznQSwlwR1sc7yPXcGe nTMw5DPCGjcSA91jdEf7cfW5L+U2Yz/4S2hRUpzeDpiXF7IlW2TRl+DrqegeE1OUzhAcqg NwEIVzVeIolh26qbWBgAC0RK40eXXtOxOjsvKx3RRztx0BQkR66JWcyB9auoerqMpRzdKq PFRXIsuncChOk3o68NqT/pMOHgUID3+4PcZvb7xUNQZ15um81J/LMxYzPXVE4XNUT+AdVT 3qgksHqnUvVKfteNYO4ZSlf6vuWe8xFsA4b1F4uxGK+CGPmpHINqUBvKfrzJHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwDP35srvz11r9 for ; Tue, 20 Jan 2026 04:09:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26a64 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 04:09:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 4f0342cf84db - stable/14 - lualoader: fix pruning of non-existent default kernel List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f0342cf84dbe4fadbfea02e3279aafab36ea848 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 04:09:43 +0000 Message-Id: <696f0007.26a64.304dec79@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4f0342cf84dbe4fadbfea02e3279aafab36ea848 commit 4f0342cf84dbe4fadbfea02e3279aafab36ea848 Author: Kyle Evans AuthorDate: 2026-01-07 18:20:05 +0000 Commit: Kyle Evans CommitDate: 2026-01-20 04:08:11 +0000 lualoader: fix pruning of non-existent default kernel Removing the kernel from the list of available kernels is sufficient to avoid rendering it in the list, but we need more for booting to actually work. Notably, the 'kernel' loader.conf var was left intact to its default value, so if one didn't use the kernel selector in the menu then we'd try to boot the nonexistent 'kernel' instead of the new default (first autodetected). There's room to improve the error messages here, but for now let's just make it actually work correctly. PR: 292232 Fixes: d04415c520b03 ("loader: lua: remove the default kernel [...]") (cherry picked from commit e30086ab4c8778ea70a3b19e83546ce1b4a16492) --- stand/lua/core.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/stand/lua/core.lua b/stand/lua/core.lua index d66d9719fdcb..ccd8213a718d 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -287,6 +287,12 @@ function core.kernelList() kernels[n] = kernels[n + 1] end end + + -- The config/boot bits use the env var as a fallback if the + -- menu's kernel selector remains untouched, so we want to + -- update our notion of the default kernel to one that is + -- actually present. + loader.setenv("kernel", kernels[1]) end core.cached_kernels = kernels From nobody Tue Jan 20 13:24:41 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwSjQ0rjbz6PZ79 for ; Tue, 20 Jan 2026 13:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwSjQ00xfz3lY0 for ; Tue, 20 Jan 2026 13:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768915482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L7DqrKixBrtC29/gIPbQmsNWA1qMkYCAnz1jeKaeV78=; b=Xzsq1MYNnWjwA92iYDPTFqqIXT63E22BXZgR0U2z2O9LO7yXX1kCHJ1SJ8HBhQwz2/ss5N oZkcqvK5R5DCBDo+jYunYHAthYg3o2eliXI+LsUECYMrDPRPpnELE9Vvlxytski+mqPaLH Oq16pp8IB8dMa/eW8vdfhe3BnRMOuWaeXmIwLh0E/0LYcKnkKMziFHvtDuCtG77UI81Ko7 6QPgvyGaSdlUNXMYBSYsFEy+JsW7p74aXUL8CEIOWfLyi1OZzi4a4XAXn1txNO2IHhyhF3 /Sv653glK9SN+rc0p3ySKSREpR/q+zRmdmPkqclWo1I4vMl5++r0kb57hIG+GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768915482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L7DqrKixBrtC29/gIPbQmsNWA1qMkYCAnz1jeKaeV78=; b=S+F0LcWWxS3W4/qyfisqGb/OYnEqtJtj0aBDNtKicbLJzLeLM0frI+AZo6dEPY/4yVClXu QenIWEZe2yZY8KadoaPlbeCK605Z/8YXRVMwSR02ZpkBrk+/apDjLHVgKOT9/GIkSCnssZ K3FzgRscfGz6pTq26BKfffHWjzK4ZAAWnnXV+EitnOUFnmyeewOars+XBvEg33ixsxkU4p 1f+8FGxWgVck7BiQdQ83nJSJtF9Qf4czUAsCN47+F3yJqa9Ma658ij6hMBQRMoyNfAXx91 JMCMNeQA+8sSuuwvJqrj0ZnrGShmyYK5yWFyofVwaODbglnUr4EP3ftW64rQIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768915482; a=rsa-sha256; cv=none; b=Mf28i3v2ehJEpyIPw4VctiUrLLnIVcTyy5aUW+656+rxYAk68aAmQrxB+N3SMhP6mZsaCX lxdaGKylH/1vHwWGjgSjYVooujd00ZqQkEUy4XuyWxuIe1LS+svrEnMWGjXOtWtXXH+CLM MVetG07mikDGcWkzFFGE5PQouj1QIZjmPew9y0JqKjU/68DBmxY//AR9zqE/AKHGxqUXuc 4oznEaOZvGmx8qj5eWXZ65En6Rrl78GC5yQ6Mmh9MprWGqAsZLG8eofY3sv72tBi28BH7Q kMOC5AJR/k213f+ZRHjeZRVJdNNHdY3BVSOzsibQhUaExWflyLceiJcYN7uyzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwSjP6WFcz1HJq for ; Tue, 20 Jan 2026 13:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8588 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 13:24:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Johan=?utf-8?Q? S=C3=B6llv?=ander Subject: git: 01ffd4516f3c - stable/15 - netstat: Remove padding from cc and stack fields List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: js X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 01ffd4516f3ce26d0b6d797818b47a974e7caabf Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 13:24:41 +0000 Message-Id: <696f8219.8588.5789dc9b@gitrepo.freebsd.org> The branch stable/15 has been updated by js: URL: https://cgit.FreeBSD.org/src/commit/?id=01ffd4516f3ce26d0b6d797818b47a974e7caabf commit 01ffd4516f3ce26d0b6d797818b47a974e7caabf Author: Johan Söllvander AuthorDate: 2026-01-15 14:21:07 +0000 Commit: Johan Söllvander CommitDate: 2026-01-20 11:47:30 +0000 netstat: Remove padding from cc and stack fields Trim white space padding that gets added libxo fields cc and stack when using -C and -c. The padding is only visible if you're using multiple stacks or congestion algorithms. PR: 292262 Reviewed by: asomers, tuexen Approved by: asomers (mentor) Differential Revision: https://reviews.freebsd.org/D54709 (cherry picked from commit faa31fc0e7acc1c53bba2b69a63e9ff55d24faf7) --- usr.bin/netstat/inet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index dee245b63a87..1435de95613c 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -542,11 +542,11 @@ protopr(u_long off, const char *name, int af1, int proto) } if (istcp) { if (cflag) - xo_emit(" {:stack/%-*.*s}", + xo_emit(" {t:stack/%-*.*s}", fnamelen, fnamelen, tp->xt_stack); if (Cflag) - xo_emit(" {:cc/%-*.*s}" + xo_emit(" {t:cc/%-*.*s}" " {:snd-cwnd/%10lu}" " {:snd-ssthresh/%10lu}" " {:t-maxseg/%5u} {:ecn/%3s}", From nobody Tue Jan 20 13:26:26 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwSlX0TpMz6PZHT for ; Tue, 20 Jan 2026 13:26: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwSlW6v7wz3lnt for ; Tue, 20 Jan 2026 13:26:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768915592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KzcPT2ksIl65TZPULik7OmQSUJDgolRmoi1KfReSrLc=; b=Y0W8N237qANR2ABOG9tR83E24ShdHziNvaZWY84VbN0HQULrQkic1QywtkbyBCiKD/iG7q t7q9SxMRXOrTl10cDZbQWpsv8vph/n0WIqbuoVGxbRe2XjkzxTKQOOE3S2hUEU1xQsEbT3 FIu7R7q+8Ceeaw4ET4vQ8DVD2noKe81bCd0/dTgpFlu7rrKyJ8sngeclXweWV0VELdiCtB lQMK7RC7Obr5e10DIRSW6yQXe75BCS1B9LvjiouBzlnuyA9KDW4nCL1vYdWlXCLYH9BBY7 1/PiF+CZvek5atHikHPRJf1SlaYbBvREqaPvqMpgVL9fN/UifX+YVJPbnQCzLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768915592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KzcPT2ksIl65TZPULik7OmQSUJDgolRmoi1KfReSrLc=; b=Jn0i6GILqsrKwlIBtFgZBgjWC4tsAxp82viNGszdaBmh2GppdB6xG1fZ+r8NFZLSYtQelH 3B1FryVhFf9CTf5KYb1MOV7F4LzhlJhWn4gHFdRhMVNBGWVbTlsp+oxv9dL2Fc+wNtZ2aJ 6QO7ahE2MAc1TA0r+sj1oDoDqGJlpnCM2vMBn6INl/X7fD42KAFWUexUq8wGulKXH1KjBW Ny4AsQQImkICLFWZR264GLM9vvPwISQz3G1BHj6u5efcLihFlH6xZ2i4Ag1PfvMxTkyXxN wta11XedFpTfZ+mgUjuc2GWXlAfS8x4zHq/HIi3auLMsQb3mYB6EOQ5eb813vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768915592; a=rsa-sha256; cv=none; b=RYHpok/U6VizvwHjbJ8UJo+NGNbEJ+44KZQhCBpGYSnNb8b3D93vr8TkmjYn05AKqAUyHQ DeusevmtufhZhFDJ4iem3PtmFyYS8OBRhtuZPTj+K+rZn8zAM9uZdRhQnNgpCug26XLEBb kK8xDjC/ksXFU63lCAfx6jiEw7gtbWCHilJ2hMlbCLWI8pfnjrhI6ZuS27R+DDfBnIgWxV 4BVe1+XOCFMvAm0bTAwDI5RjAjl9mEWqDSPCPHzxQ9nM3+St9hxjfJ3bOlQSVDAq5YqQiE b9QF4oxYycNH4Mj9Le3It9EqpCZG4k6f4Vl1K8GkoluGdIMviIw50GTQTcPCWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwSlW6VqHz1J72 for ; Tue, 20 Jan 2026 13:26:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46ac6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 13:26:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Johan=?utf-8?Q? S=C3=B6llv?=ander Subject: git: af46d309a72b - stable/14 - netstat: Remove padding from cc and stack fields List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: js X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: af46d309a72b73398c3d0e4bee9b21437af17d7a Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 13:26:26 +0000 Message-Id: <696f8282.46ac6.28e04769@gitrepo.freebsd.org> The branch stable/14 has been updated by js: URL: https://cgit.FreeBSD.org/src/commit/?id=af46d309a72b73398c3d0e4bee9b21437af17d7a commit af46d309a72b73398c3d0e4bee9b21437af17d7a Author: Johan Söllvander AuthorDate: 2026-01-15 14:21:07 +0000 Commit: Johan Söllvander CommitDate: 2026-01-20 13:25:39 +0000 netstat: Remove padding from cc and stack fields Trim white space padding that gets added libxo fields cc and stack when using -C and -c. The padding is only visible if you're using multiple stacks or congestion algorithms. PR: 292262 Reviewed by: asomers, tuexen Approved by: asomers (mentor) Differential Revision: https://reviews.freebsd.org/D54709 (cherry picked from commit faa31fc0e7acc1c53bba2b69a63e9ff55d24faf7) --- usr.bin/netstat/inet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index 898158ce288a..c4e3bd683a17 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -549,11 +549,11 @@ protopr(u_long off, const char *name, int af1, int proto) } if (istcp) { if (cflag) - xo_emit(" {:stack/%-*.*s}", + xo_emit(" {t:stack/%-*.*s}", fnamelen, fnamelen, tp->xt_stack); if (Cflag) - xo_emit(" {:cc/%-*.*s}" + xo_emit(" {t:cc/%-*.*s}" " {:snd-cwnd/%10lu}" " {:snd-ssthresh/%10lu}" " {:t-maxseg/%5u} {:ecn/%3s}", From nobody Tue Jan 20 16:40:10 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwY2y5lpGz6Nnfb for ; Tue, 20 Jan 2026 16:40: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwY2y56Lqz3Rbv for ; Tue, 20 Jan 2026 16:40:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768927210; 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=Pvqd5bfnk6pniE/+/Basa+RZVNFl1XJAdVlEcpoSTXQ=; b=aHuDtdSkEueFPoZ6wH05niJ3t5HDtvzlnNKbYZdI0PELOBOfZPcyl4caPXwnPR01SDUrG/ 8ISJ0pGq1kF4FAdY8I1d3IExE2OZWfhyFMBA0OVec83aiJiRGPQX4NSYlS3Yn7BG6wf7UE MpZoqAwXpHsSUyqPZWATW+43bOvjmydbupUZVduC/ejOiS7eEpw/Z1hZTICbA54o+izgAT 5biVqMvt8rT/uoPPDEOVlFTqatJRF556mZ9XbIWdubpg6EryBI6azI3KvS63VvffsUe/5z a3iqmNtMSFvh97HPc/CDSMSGSs/npmj88qzVGaXhVAD2maZ8iHP66BxAmBXDTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768927210; 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=Pvqd5bfnk6pniE/+/Basa+RZVNFl1XJAdVlEcpoSTXQ=; b=aRtclu9oZ/IUgDOHq1ZWoXaHKgGUETvMS8ZpsSx+IYJRGbC3Ed9T6RFfc/KAwfD/gqZic3 F8Q123YiByvazKxwwnnDD8rw5Zg/WdB4sg6OZNUw4dgpNYDqkzlEwkkMV97gFS/4sQ1WUd L1hSu/8lZR5XX4+HkHmyVg9zoehpK+VCokmwHtbPUQOYNu79v79PNY6rdnNKRhlo6mhf4E d83wXDH+P3yVEMJJiLg+yyjzev2wj3yWyT7uktnUaL4h3ypyNySvnzS6aTmRyhZMXONi+d WDTN9+g/6DBauuEMNhYS2yNOuaOCKGlN630/NgtbNsJCfdc/aAnbc0+B2+AI6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768927210; a=rsa-sha256; cv=none; b=NnaBC0JGRjN1ldOT+RqvMlcOqpEzqAVlAWQ59k+OKvykbwK1Fwb9CpFW3Sl7to6f3A9QHj jkq35XYPHqVYWj95rdRmcRryVhzajL1ttwIcjzdXLXM7qp0xPt3qlraCz+be9aO4mqyn2K dQDTEQO2JACDQNyhWys7fmAlNU2/Cy0GXXi7XM3mROWLCNeJLfnszlNzGKLeUPs9oC7mAI CRJxOwRa1ThtgSOJxV7sYH9aLUU/lrL2UwnMPNkwh2u+3hL4jdu40GEOqjkvZG9W3XV+ls 2prDwQI2DbFiskpVziABbeadAFWkPHmeAlgBgeORSPZXXn3amnY3ioVe6P4/uQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwY2y3xx1z1P0K for ; Tue, 20 Jan 2026 16:40:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3378f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 16:40:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Kristof Provost From: Jose Luis Duran Subject: git: 3830c62b12ac - stable/15 - pf tests: give rules_counter:4G more time List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3830c62b12ac35bc27977872d776a1c7f66cd691 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 16:40:10 +0000 Message-Id: <696fafea.3378f.11e57e94@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=3830c62b12ac35bc27977872d776a1c7f66cd691 commit 3830c62b12ac35bc27977872d776a1c7f66cd691 Author: Kristof Provost AuthorDate: 2025-10-09 07:29:14 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-20 16:35:17 +0000 pf tests: give rules_counter:4G more time Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 8217075f9ecb12fa9a4cf746541b9d3e1dc57e79) --- tests/sys/netpfil/pf/rules_counter.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/sys/netpfil/pf/rules_counter.sh b/tests/sys/netpfil/pf/rules_counter.sh index 98f96a7adca1..e80a46e9d6c6 100644 --- a/tests/sys/netpfil/pf/rules_counter.sh +++ b/tests/sys/netpfil/pf/rules_counter.sh @@ -153,6 +153,7 @@ atf_test_case "4G" "cleanup" { atf_set descr 'Test keepcounter for values above 32 bits' atf_set require.user root + atf_set timeout 900 } 4G_body() From nobody Tue Jan 20 16:40:11 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwY300QZQz6NnX2 for ; Tue, 20 Jan 2026 16:40: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwY2z45xqz3RRW for ; Tue, 20 Jan 2026 16:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768927211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kCH+pzjTxL/HEV0aPkSZgJgPufeMw9UyCB/WDaj8uYY=; b=VsPDs/roy0l4rlwK9qGVsIzrqz5+gK0eJpakCMYierzWYamhoW8Q66Uu+j9a4JdoyoPhTm U0XCryF/CWfGMvSHoUKTTKjrWkJctULjImz7dRI6U+1/e1CU2X2oJcutCsvYp43uG+GH0A NpUOQcZAumhmd8b+SD9Gq+GA5CP6vvNmpwzrtrxzLsy6hAz2hquOom5+80mlRthwDkrp/Z Dw2o2x7HFyaEHx4EYVrDxMe6fQ6gCbanVvYwW/upPsOAgym9oCffENow8Ygw3DQfHXch+w ognFtTexZSkcRh9FUPs0ZKJEM1Fen4A6ycNGqNChkm6IiCSlp+m1TayvDPO4SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768927211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kCH+pzjTxL/HEV0aPkSZgJgPufeMw9UyCB/WDaj8uYY=; b=R5KEwXDyXAVxymjMkOnzNI9fT3uBOwoHK9KDyFSY50QOOQ/+Dy2hydpQKpqGtqWd5oOeF5 Fxco6AxVJUGS7j2UMW0+ZAT/swdiKZEKLP/C+VCZMAPjO1YPWdM/xjAtTdEUivhZ1oygbC 98E+YHhQK6gX1y1B0/W/+KCzojPo4rXpW1LYSDKCCTEsYJpV3SDVBKXIexTOBd4MLiAbLu gkhWf2ztsOozmJFauHt+pYMXkDFD2FMRYkfCZcTOwN8iSVckpmAHMl/jspT7pON+9bEuXG FVUNIOMELJw3Do4Wx55x6uqjrebvGlEb0owPWLvphDTcfA+38q0ZHEWehV5gyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768927211; a=rsa-sha256; cv=none; b=DPxPo8G6mNpHryqrYcFEUBiSWsm3sMctzOauUoIhmJ451MsX41/aDmCMHhO0RHegJTglld 6RSENKRllrOcPY/CCqUbVLHG9c+vCBIemZQS8kBE74ZSecin12wooRvPfCj52leOFEPIjw 8aOrB1icDkjIwR1JVwmDGX2FyJmdIAEuTztwDSNWp8OdRHLjhOa49s7WMbqDzVYlcEkVYC ppcbCH7ppWKGpmMwkyxT0PEa65SBXRL28iNaD19g7ggdKdtj0eS+PSpkyyTXghuFtl9Bf3 oOQ1pdJ/5WrjiZJm1wTK6nFTTzIUr2cyTnnQQXJtO4B4ow8O996yIbaENuFr7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwY2z3gHmz1P7f for ; Tue, 20 Jan 2026 16:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32a5f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 16:40:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 9fb909d32081 - stable/15 - tests: Increase timeout List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9fb909d32081aea630996f695071024a4c0c909d Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 16:40:11 +0000 Message-Id: <696fafeb.32a5f.42d84383@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=9fb909d32081aea630996f695071024a4c0c909d commit 9fb909d32081aea630996f695071024a4c0c909d Author: Jose Luis Duran AuthorDate: 2026-01-07 17:52:26 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-20 16:36:55 +0000 tests: Increase timeout Bump the timeout value, to avoid cutoff on emulated architectures on ci.freebsd.org. Reported by: Jenkins Reviewed by: ngie MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54550 (cherry picked from commit 47015e4546619151f9bff548a3758b72286d04ed) (cherry picked from commit a551b0524953cbfa4f1035c6d968623e64f4436a) (cherry picked from commit a4f0a60e05293f3f517324f3ebc41046a79a9feb) --- tests/sys/fs/fusefs/Makefile | 2 +- tests/sys/fs/tarfs/tarfs_test.sh | 2 +- tests/sys/geom/class/eli/online_resize_test.sh | 1 + tests/sys/geom/class/eli/reentrancy_test.sh | 2 +- tests/sys/kern/jailmeta.sh | 2 +- tests/sys/mac/portacl/Makefile | 2 +- tests/sys/netpfil/pf/rules_counter.sh | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/sys/fs/fusefs/Makefile b/tests/sys/fs/fusefs/Makefile index a21512798597..6366676b6fc5 100644 --- a/tests/sys/fs/fusefs/Makefile +++ b/tests/sys/fs/fusefs/Makefile @@ -70,7 +70,7 @@ TEST_METADATA.nfs+= required_user="root" TEST_METADATA.ctl+= is_exclusive="true" TEST_METADATA.ctl+= required_user="root" -TEST_METADATA+= timeout=10 +TEST_METADATA+= timeout=20 TEST_METADATA+= required_kmods="fusefs" FUSEFS= ${SRCTOP}/sys/fs/fuse diff --git a/tests/sys/fs/tarfs/tarfs_test.sh b/tests/sys/fs/tarfs/tarfs_test.sh index 505bfc5325f0..c8579781b51c 100644 --- a/tests/sys/fs/tarfs/tarfs_test.sh +++ b/tests/sys/fs/tarfs/tarfs_test.sh @@ -401,7 +401,7 @@ tarfs_large_head() { atf_set "descr" "Test support for large files" atf_set "require.user" "root" atf_set "require.kmods" "tarfs" - atf_set "timeout" "600" + atf_set "timeout" "2400" } tarfs_large_body() { tarfs_setup diff --git a/tests/sys/geom/class/eli/online_resize_test.sh b/tests/sys/geom/class/eli/online_resize_test.sh index ef6fe85c63d0..b33efbb25c23 100755 --- a/tests/sys/geom/class/eli/online_resize_test.sh +++ b/tests/sys/geom/class/eli/online_resize_test.sh @@ -7,6 +7,7 @@ online_resize_head() { atf_set "descr" "online resize of geli providers" atf_set "require.user" "root" + atf_set "timeout" 600 } online_resize_body() { diff --git a/tests/sys/geom/class/eli/reentrancy_test.sh b/tests/sys/geom/class/eli/reentrancy_test.sh index 92a85d4df10a..f70c574d5965 100755 --- a/tests/sys/geom/class/eli/reentrancy_test.sh +++ b/tests/sys/geom/class/eli/reentrancy_test.sh @@ -42,7 +42,7 @@ init_head() { atf_set "descr" "Initialize a geli provider on top of another" atf_set "require.user" "root" - atf_set "timeout" 600 + atf_set "timeout" 900 } init_body() { diff --git a/tests/sys/kern/jailmeta.sh b/tests/sys/kern/jailmeta.sh index 9a63f958231f..f030e44b14c3 100644 --- a/tests/sys/kern/jailmeta.sh +++ b/tests/sys/kern/jailmeta.sh @@ -515,7 +515,7 @@ keyvalue_contention_head() atf_set descr 'Try to stress metadata read/write mechanism with some contention' atf_set require.user root atf_set execenv jail - atf_set timeout 30 + atf_set timeout 60 } keyvalue_stresser() { diff --git a/tests/sys/mac/portacl/Makefile b/tests/sys/mac/portacl/Makefile index 28c3a5cd71ce..2b0f4634c802 100644 --- a/tests/sys/mac/portacl/Makefile +++ b/tests/sys/mac/portacl/Makefile @@ -10,7 +10,7 @@ TAP_TESTS_SH+= root_test .for t in ${TAP_TESTS_SH} TEST_METADATA.$t+= required_kmods="mac_portacl" TEST_METADATA.$t+= required_user="root" -TEST_METADATA.$t+= timeout="450" +TEST_METADATA.$t+= timeout="600" TEST_METADATA.$t+= is_exclusive="true" .endfor diff --git a/tests/sys/netpfil/pf/rules_counter.sh b/tests/sys/netpfil/pf/rules_counter.sh index e80a46e9d6c6..54a65a907b4f 100644 --- a/tests/sys/netpfil/pf/rules_counter.sh +++ b/tests/sys/netpfil/pf/rules_counter.sh @@ -153,7 +153,7 @@ atf_test_case "4G" "cleanup" { atf_set descr 'Test keepcounter for values above 32 bits' atf_set require.user root - atf_set timeout 900 + atf_set timeout 1200 } 4G_body() From nobody Tue Jan 20 16:52:56 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwYKh3Yt4z6NpJX for ; Tue, 20 Jan 2026 16:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwYKh0yQJz3VL3 for ; Tue, 20 Jan 2026 16:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768927976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oc0yM8hqapGGbbsy6ZoIQs4T7C9rXFUOrkfC7xLe2nU=; b=mn6oIZc6JBNt9fhvDdv1T2q5lbQTg4An0F4+AN85dCQFIt72mwsXooIjEI+ouiiLzfGOVo UIZTVeZS2n3QQSXNlplSSDwar+ybnUbNl6FwoJ+jDv+CuJjmoCpRiUaThSP0VQ3Y49Wtux D12uSLzxVNmNByHleuUXNQBEKfPu92eduhwCHVJ/csgd4mXG01yeRkWp7QqqktaZDatjkm uI6NwSBuiHD34g3nKLuPSXe9ue8tdGEfJbjsxcJoce1nchS1mL/ky7cVee21lQPRrVHWbG Gpank25EEKQqF0q7NCCPMmfh16DsK338aedjYBqa3HvhW5ujAG74WtfM7GF9qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768927976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oc0yM8hqapGGbbsy6ZoIQs4T7C9rXFUOrkfC7xLe2nU=; b=jgmXcR2JHW0MGib3/gCsazHdbifxQcY4FXodjLnWmhrv4FNdPlRUu0zVunqYvC4PWJqnlC +aY2IDqq3S05rHxgGBJsJCyB06+Xgn7P7kkZx++gA3D2nfJHYoAmNG7tw42uvzvu9uJG0/ 2fdI+Fo23o6nCxwPb8atMEPVx3WHu+1lALy489o0+f6q/3PgsltkRjEf6ZXid0F6Ybi2Gs UEYczQCUuyyKp5nQvVw/23Jq2ECwiBlYcubtmznF57swvAVBSjcBBPgbvpN/wIx0YQHmBj cxOlmDb9KDXRqtB93LdimbupifTaB6eK5d/IwlbpO2/lZfs2O1h7LhGqySFwpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768927976; a=rsa-sha256; cv=none; b=sWvJTtHAuvRvgPH5fwgKy2v/Lg6QvICIhRsoQVkWneTDdyUEBu6II3CV5tc7fL+TmOuh8+ jfByt8wPNqZQCrRLxs1mL4eTH9XAizHrJMIHNkQw23FD6pLogzkpeBaK9HhNMLHgVA+4Ld 2sjLf4y4QExKFX+IgNVWzepO3KExfOykYwvy7aEENci2uF4yCeF/Il93tShfj5MWU9oV8n Q1VS15gh2KwLZ57selfGgQZjd/kZCF56OEgjNab9fVnEO0d2gJ42nQAMpt8QQkuTX9rqbK n4pJzCz0O+a80ofTZzPerNc542hq1ulY9TBml9K0g5Mz3OLa5tOjiELTuiF8LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwYKh0Yc2z1PCH for ; Tue, 20 Jan 2026 16:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34695 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 16:52:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 9b91d4905583 - stable/15 - makeman.lua: Update for src.conf in the src tree List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9b91d490558342d4a4a0893b15306c7099430c66 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 16:52:56 +0000 Message-Id: <696fb2e8.34695.7e74b544@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9b91d490558342d4a4a0893b15306c7099430c66 commit 9b91d490558342d4a4a0893b15306c7099430c66 Author: Ed Maste AuthorDate: 2025-12-16 16:04:31 +0000 Commit: Ed Maste CommitDate: 2026-01-20 16:50:09 +0000 makeman.lua: Update for src.conf in the src tree Copy the text change from the shell makeman to makeman.lua. Fixes: dd8c666d8b78 ("src.sys.mk: Support src.conf in SRCTOP") Sponsored by: The FreeBSD Foundation (cherry picked from commit 2619d439fa860db734dbbf4b153c5ac9b15c7e49) --- tools/build/options/makeman.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/build/options/makeman.lua b/tools/build/options/makeman.lua index e96e6f50174b..7ce919f7a8de 100644 --- a/tools/build/options/makeman.lua +++ b/tools/build/options/makeman.lua @@ -44,8 +44,11 @@ variables that control the aspects of how the system builds. .Pp The default location of .Nm -is -.Pa /etc/src.conf , +is the top level of the source tree, or +.Pa /etc/src.conf +if no +.Nm +is found in the source tree itself, though an alternative location can be specified in the .Xr make 1 variable From nobody Tue Jan 20 17:14:09 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwYpH4RMtz6NqXs for ; Tue, 20 Jan 2026 17: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwYpH03fGz3XhJ for ; Tue, 20 Jan 2026 17: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=1768929255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kqAgLxzzh8ZEMqNWNe89jf6G5iqyS2csBMvKKXLYeIE=; b=JsvNbMpxMNWtQWJSOWjMaU6VgI6BvejQtY6gOx2Z/G3Ws7ZlFjjIPGHkZymtF0ISKU+utS O7mlRdMnmp9X/3BY4LMh9miPuzOg5dxq70L6xQThpoNDIJPDeBNmfmrb+PfmW89WcG51NI iLzOppnpTVdUsbmEEmpWoYUTCQHhk6waaJs8IVth6D+sOBo3fxAK7zAtaCSgTVOx2nudzB Qk9xNM58ggZxteNZeOKPbE928zGrmGFhyCj+lZJb3gYuc9sNo2+W2sLBndF3dKAbZnvBab Q6UT3NTOOOgicZCcziYpdKXRhgNstQ/lcqUE+YcfHDOmC5FSHxS9ZgGqHREe7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768929255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kqAgLxzzh8ZEMqNWNe89jf6G5iqyS2csBMvKKXLYeIE=; b=nWJ6gbzZN3zJlbly79kAd61cM/fCVBrCgR+GqnPFCNSQxOqQ0th8aRzUzOYDxHf1p5R1dI heQ6S1D85L7xmYbUFMeWpGzqp0L0kxbiCkMztYG0K1DQD8M0YgZ0mYTLvxg1Q2ygB2gt/H nmPAGsBHBpnvKbTLFOR+N0nMAQUjYBU6xhQhfVl6EfRSqGOPA3Gw5THT7gL7gY4+pmY/sv sssH2h/QslBbLAkshgbSXWmG0HclhCr0O3jBPPmH4IOiTfojWZKMnwsFrO7huXvaBWDEoc gttps4cm+BIjR/4WQ+tr6Dn40ZV50cQ/rnnj0jPDAOeEFuXtrp4oVlxLNbg5RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768929255; a=rsa-sha256; cv=none; b=fOfiHgBb+KbkB+omGLIApQL/qQN/ZZyKzfp3lfFLHbHI8g9My3dS3mLR1L6rjKnx66cfSX 7f9wCGwaLTMTKR84Q3JpbYcHMIWUib5xKRS/3Ap+QoFmILRlydubTNY5IebQwdYaZxo2Yf R+skqeooCmo/ipglPtvh49FGgEorufEIgVeuUKyxJWslY/03teZDOQmOR5vSDa+DITqaPd MUwsjQChK2qc8QbNnxRqRW/+bJppswuhrPNEouzenEJazby/lP+Ui7gkdbyKuBTBo2F24k /v3zb30IVzb723Eg+Ni7ysmrFazwl8dskECRoXE8zLgn5uCrf48nLd+DTH1Xpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwYpG6j1Kz1Pxg for ; Tue, 20 Jan 2026 17:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 345e6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 17:14:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 3b44f04225bc - stable/14 - gpart: "gpart --libxo:JP list" duplicates attribute keys List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3b44f04225bc3f2ca33cff90273b8cdfea67774e Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 17:14:09 +0000 Message-Id: <696fb7e1.345e6.5017d01f@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=3b44f04225bc3f2ca33cff90273b8cdfea67774e commit 3b44f04225bc3f2ca33cff90273b8cdfea67774e Author: Alan Somers AuthorDate: 2025-12-05 16:16:53 +0000 Commit: Alan Somers CommitDate: 2026-01-20 17:12:53 +0000 gpart: "gpart --libxo:JP list" duplicates attribute keys Add leaf-list modifier to attrib as it's possible to have multiple attributes on a gpart provider. I purposely made it so that the normal output still says "attrib:" just so we don't break any scripts people may be using to parse the output, but the libxo output now says "attribute" just like `gpart show` will do once https://reviews.freebsd.org/D53950 is merged. PR: 291377 Reviewed by: asomers Sponsored by: ConnectWise Differential Revision: https://reviews.freebsd.org/D54080 (cherry picked from commit a0347b0f3a6088872c29eddb85154478d543dffb) --- sbin/geom/core/geom.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c index 6631e6b7f6af..b00cea2b75d3 100644 --- a/sbin/geom/core/geom.c +++ b/sbin/geom/core/geom.c @@ -913,8 +913,12 @@ list_one_provider(struct gprovider *pp, const char *padding) } xo_emit("{P:/%s}{Lcw:Mode}{:mode}\n", padding, pp->lg_mode); LIST_FOREACH(conf, &pp->lg_config, lg_config) { - xo_emit("{P:/%s}{Lcwa:}{a:}\n", padding, conf->lg_name, - conf->lg_name, conf->lg_val ? conf->lg_val : ""); + if (strcmp(conf->lg_name, "attrib") != 0) + xo_emit("{P:/%s}{Lcwa:}{a:}\n", padding, conf->lg_name, + conf->lg_name, conf->lg_val ? conf->lg_val : ""); + else + xo_emit("{P:/%s}{Lcw:attrib}{l:attribute}\n", padding, + conf->lg_val ? conf->lg_val : ""); } } From nobody Tue Jan 20 17:15:03 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwYqC6dL5z6NqYL for ; Tue, 20 Jan 2026 17:15: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwYqC5hM5z3XjX for ; Tue, 20 Jan 2026 17:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768929303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iJw4blFNK9P/Nm77NDyzObCd790cT+Hbjk0FQomjfwM=; b=IOkQtwjod2uDN2EVfn9KltQ6POBtSe3WMZxF6Hhjqw/rog47RRwRxt14VLd4A+1kLtbmAm 4OmTWSndQMS5oYQB5iL6Hz82nwONnIHoTy6IRzpLN+xpRpf8X81CHXkMrkGSm3SzUGY8H+ TA4+bLKz/aq2VMkpWpBJpCV5xiJjeIKHLcB0YSeiJpTKreQl0f3NEaFubu25Rdj36/wX8R ewQ5vS39PkQw7B8pggJVG1c/sDy9YWVV9AyNyxy+u6//BIKLQ9I4gKkw0U9xldLb9pncw5 89coyECI5CIe83qjFJ2ezQh2EqQqK8gOybPewz1sNQ7dCtzCuGL16w0u3qv+IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768929303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iJw4blFNK9P/Nm77NDyzObCd790cT+Hbjk0FQomjfwM=; b=g2Q6HZolssVk8mmvVfu5ZfHACjFalpotm0ydaWeZ7Gz1PjwaUghPISlbrHD+KjcXVn0H79 OX10gE+/Ohb4EB+YctF9bk2wXp34zwuS8Vdq1NdifsmRObjI+sqyOltMlMI9g4vWecX3VE exftiUocR1yKlXIABwRVHcW9V7mpI7jslfaXHqmSHPUuToNE2uAyzY/SwAoNkwxD6wTcqf /kZ3En574SLg+vDeJG4u92XJw5v/Y3jqopncEdvYcB77mDc1aw0HpaxtloOd6h9PkytwGG AtkssMbFTQ36thSeihH3HTOZP56Etdb9G9Y6yYxKJe2nWO43nmijBGWDMEFLvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768929303; a=rsa-sha256; cv=none; b=FJ67fvQGkgQJo+qznM9ZZjFBcAzz4ANfpyI/IAYfbM//muN568e3FOEGnj1tQTqpg90mJ9 7Qj2x0pu+Uae9RstT9UY+uPHM4GCcrugmkUeHBjzAeX1h7XuTM24lF8Ewg497EX8ocNCjh Y7CBqepTxvssaT5rOG/4WsnivJ6lvTEyB0hWBu79ZZPKhpSxx1ZsIECoJUoVc9LQJPlW7L mKCW3NPqDvvQ11ZInP3GhBriMP+Vmv6LJn9LbrEobXrL1QKPX54U/Es0yxyW/DJmKe74Jq jmYgDzkX4mnNjEZtRvq7LNLdLeTGTmb0WY1K3S4wpbNjjghoL+RVJSv3w7brjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwYqC5DfSz1PSh for ; Tue, 20 Jan 2026 17:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 355cd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 17:15:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 3b5c296fa151 - stable/14 - fusefs: Fix further intermittency in the BadServer.ShortWrite test case List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3b5c296fa1519a7fbfb8c48703bcacadd4b7d9c0 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 17:15:03 +0000 Message-Id: <696fb817.355cd.6b4fa95@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=3b5c296fa1519a7fbfb8c48703bcacadd4b7d9c0 commit 3b5c296fa1519a7fbfb8c48703bcacadd4b7d9c0 Author: Alan Somers AuthorDate: 2025-12-21 15:32:31 +0000 Commit: Alan Somers CommitDate: 2026-01-20 17:14:21 +0000 fusefs: Fix further intermittency in the BadServer.ShortWrite test case After being unmounted, the mockfs server would occasionally read from /dev/fuse again, if the main function didn't exit fast enough, getting an ENODEV error. Handle that appropriately. Reported by: Siva Mahadevan Fixes: d86025c1d49c84c4dc8c3635c83c078ad56e5a53 Reviewed by: Siva Mahadevan Differential Revision: https://reviews.freebsd.org/D54331 (cherry picked from commit f51e9d0e0988df58c94db586ab5c8b5fd091c004) --- tests/sys/fs/fusefs/mockfs.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index 74458d7ca4cd..ba4c3381eff2 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -981,7 +981,11 @@ void MockFS::read_request(mockfs_buf_in &in, ssize_t &res) { } res = read(m_fuse_fd, &in, sizeof(in)); - if (res < 0 && errno != EBADF && !m_quit && !m_expect_unmount) { + if (res < 0 && errno == ENODEV && m_expect_unmount) { + /* The kernel unmounted us, as expected. */ + m_quit = true; + } + if (res < 0 && errno != EBADF && !m_quit) { m_quit = true; FAIL() << "read: " << strerror(errno); } From nobody Tue Jan 20 17:15:59 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwYrH4cw0z6Nqgr for ; Tue, 20 Jan 2026 17:15: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwYrH3w3jz3Y5k for ; Tue, 20 Jan 2026 17:15:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768929359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0asRxFoSCt5F6Q25WEtwsdwgOJgi/vn62bmC1opqp9s=; b=a4E/o2JGSJwDHO4WS1qHudtIJ/WlvFwEGs891pE3AAInUKJuT9V1dPI3lQ/dmKLO8LMOUn 7b6qWFJTcnRquSXvNwyrv54qAVDLWFZzAphoUXXbiYxyFALzvUCc3W0PixZVw84Es4cEAy UhTb+aYWbo+NSUprGGwsgIv+/3fY+7Oyne5pIruvGxpPY3+2cKMGF3w5/oc9/0sndjao/n NitzmizOFhnWUHuBallVVfnTKJPvf10pxXJifcRtXu/nI/nvXFZlICDpe76ZpzqidKgCyM TTJOdUxtKP9ihvJO0l+FHBEpqnhzwuMibIhdNUinZWOtayx4t1uq4qH1ZVxUHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768929359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0asRxFoSCt5F6Q25WEtwsdwgOJgi/vn62bmC1opqp9s=; b=ZqZRSFdeuioq6CQ6HssXAYqIgWWVVKsRpmj2DdMD/vZBDW3eak14yE98+pYZcoVBjqJ9B3 7eMTffReYzcQ+ZkuIPxKDwOPfh8cG4cLd0UWqO9HGbKUNrWN29PF9yqzlG176YZwzXFD3t KCsJH167Ix1wrU7jO9PgAEtOECqhqUnCIsKG2A4loDFXbaFYi6BfKvZk/ecRso0K905Ken BAvOGyVOd2cqMJhhtPrh0F8FStg5LCVG2np18HBEq9F3rbEfWIrUof8VCo+aSYdPKKt28X IdNcmW2eOOXhvjd+7sRAZavxlylc4d1JS3mXwUkpGeUc1MK09IKGV0SLJYuuzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768929359; a=rsa-sha256; cv=none; b=sMOZziduDBOx0zmawB2t+Dt9NuD9Fn88/IwYIl+gxZxYVtE8WcqdJqZxhIByS95ex0HUvF xWxtriHeKQqJh4tfQvuSoE3b2Af+k5PZgAkyAVth0I2H0Is+VjIYEJ4vIKKD5WYDOx7gsB ngQmT/lrioSomKHgW8lp3ygSU0OhNwpNF7NHI98uII2y3eiteMsKIk+/pLfGORhqAOuBeO fgDz0Ayj4b9ejqZvPFweXwCnzWzF6o2cDj+r7VaA/JA3Ssgg4OssQYhs2IA4Y6lFh3p1qJ BxZVc6r7So8VLyWZ5EqSQX3av8plR5Y1HVdfQ5IZiWBDHzxto1Mn8FwtFTXFEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwYrH39wDz1Q9F for ; Tue, 20 Jan 2026 17:15:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35548 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 17:15:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: b3647e2a408e - stable/14 - netstat: fix a segfault with --libxo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b3647e2a408e8a0246ec2240a152f8c41c3482cb Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 17:15:59 +0000 Message-Id: <696fb84f.35548.38a91efb@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=b3647e2a408e8a0246ec2240a152f8c41c3482cb commit b3647e2a408e8a0246ec2240a152f8c41c3482cb Author: Alan Somers AuthorDate: 2026-01-06 22:19:57 +0000 Commit: Alan Somers CommitDate: 2026-01-20 17:15:13 +0000 netstat: fix a segfault with --libxo Fix a segfault when printing the "protocol" field. The field-format and encoding-format were expecting different numbers of arguments. Also, fix the width of the tcp-state field in encoded output. PR: 292228 Fixes: c2b08c13c20 netstat: add support for UDP-Lite endpoints Sponsored by: ConnectWise Reviewed by: tuexen, js, des Differential Revision: https://reviews.freebsd.org/D54567 (cherry picked from commit 3b6615ec0332f901fcc9e9307f78717424f09c1e) --- usr.bin/netstat/inet.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index c4e3bd683a17..7057e4628cf9 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -401,11 +401,10 @@ protopr(u_long off, const char *name, int af1, int proto) if (istcp && (tp->t_flags & TF_TOE) != 0) xo_emit("{:protocol/%-3.3s%-6.6s/%s%s} ", "toe", vchar); else { - int len; + int l = max (2, 9 - strlen(name)); - len = max (2, 9 - strlen(name)); - xo_emit("{:protocol/%.7s%-*.*s/%s%s} ", name, len, len, - vchar); + xo_emit("{d:protocol/%.7s%-*.*s} ", name, l, l, vchar); + xo_emit("{e:protocol/%s%s}", name, vchar); } if (Lflag) { char buf1[33]; @@ -530,9 +529,9 @@ protopr(u_long off, const char *name, int af1, int proto) } if (istcp && !Lflag && !xflag && !Tflag && !Rflag) { if (tp->t_state < 0 || tp->t_state >= TCP_NSTATES) - xo_emit("{:tcp-state/%-11d}", tp->t_state); + xo_emit("{:tcp-state/%-11d/%d}", tp->t_state); else { - xo_emit("{:tcp-state/%-11s}", + xo_emit("{:tcp-state/%-11s/%s}", tcpstates[tp->t_state]); #if defined(TF_NEEDSYN) && defined(TF_NEEDFIN) /* Show T/TCP `hidden state' */ From nobody Tue Jan 20 19:43:36 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwd6c56pxz6P3NY for ; Tue, 20 Jan 2026 19:43: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwd6c44h1z3sXV for ; Tue, 20 Jan 2026 19:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768938216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JLg8LYxJxj8w8E66p0UUl5asbMUwlPxt5eQR4WgS1pE=; b=aAJfbqXzAicdJ+jz9Pm/X4WWqFDxBEIJ0ysIQ5BeHw6mc4ob6FVP9rdVX6CecWh0bLzVch YgKgybKeBrYfPNoAZxIKSwK4ahcjUAYevhOkj0Qg/jeuqZOhJsPXvu0T1Xf0qIvjDfMPCD KxVNj4TPoFbTEzWUFyRkefL6Up1OSOTsm/6U8uOkRS9sU9YA/ZuGTbpSYpCgxz5PAUdeKU JtR36Tz+YA3TlBQuxw4z2zTAMMlNlCcdTlKVM1dnXETGL8LVFzdnz/r3WxCvb8n52dmpg6 AqN46xDiN5D6XdoNPn22tuvuu0//oXICXGQfkdw5fU0g2OWHm1Ozl3caMIUF7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768938216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JLg8LYxJxj8w8E66p0UUl5asbMUwlPxt5eQR4WgS1pE=; b=XZkZT2I8Sj/lT87DcaD3bCCnQJkq2QVLMT1G89SlyEPaEWziUudxfHS559ltbspflvMAlC SrQ9Tf6rVy77Z+hA+2L6Ont0NMV8OMfEgL2iFlp7Bj1mdDiaeN851VfrGNK3l//+x7m38i 1pVHNpNBFj6mA5ynMZSxq1wxAtO3VgmvYUcfs70Tcczcr0MSR59aFvLgDdfTEo6CV/mYeG /58bKvBxxQklKIWthJaA7clvNtvIwbkpAhffP+0WgaatwKMBVKBLTkltPHFF/7cszE+c2y Fh0ph4ijfntLgVE24TOvqCET9zvXHjNKqtYCfkg2eG5VK7XJaIEvPlcDakhLFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768938216; a=rsa-sha256; cv=none; b=Xgc/thUYfFFc2LigWftDkbw5Fw5iKRi3M6C3bB0CtQb0192FxgiPhHtJ8RhicOmdsW6TBM dITWImSZmvHI0E67xxOC0RSsE8lXICJSiWMvLoKwjEP5PGdQAsG1fMH73N5qW/ThMbJJxQ p5IRxvWKHrvVoJB7Uo1IAERiPqAGh7v0k5qTuNB5bn9yT2+HTasYMB4HW0GiirIRBBUaER mJfR7cdbqpe7ooHTUvnOiG8bK1lEBhQfZ93uFJc8XGJcqOebx0wyqN1DK7x3lFCkDxokBl 18ROnuHWh7UWx+ZVM+lL/DdnhPVjzEV5zbM8MLBNVCb9nKKdxoDZPhJCcVbqvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwd6c3RLBzlD for ; Tue, 20 Jan 2026 19:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d5c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 19:43:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 7ca599aa6139 - stable/14 - OpenSSH: Update to 10.0p2 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7ca599aa613955a939284292f0993b59b0d9fef3 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 19:43:36 +0000 Message-Id: <696fdae8.d5c2.703e5979@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7ca599aa613955a939284292f0993b59b0d9fef3 commit 7ca599aa613955a939284292f0993b59b0d9fef3 Author: Ed Maste AuthorDate: 2025-08-01 15:56:45 +0000 Commit: Ed Maste CommitDate: 2026-01-20 19:41:59 +0000 OpenSSH: Update to 10.0p2 Full release notes are available at https://www.openssh.com/txt/release-10.0 Selected highlights from the release notes: Potentially-incompatible changes - This release removes support for the weak DSA signature algorithm. [This change was previously merged to FreeBSD main.] - This release has the version number 10.0 and announces itself as "SSH-2.0-OpenSSH_10.0". Software that naively matches versions using patterns like "OpenSSH_1*" may be confused by this. - sshd(8): this release removes the code responsible for the user authentication phase of the protocol from the per-connection sshd-session binary to a new sshd-auth binary. Security - sshd(8): fix the DisableForwarding directive, which was failing to disable X11 forwarding and agent forwarding as documented. [This change was previously merged to FreeBSD main.] New features - ssh(1): the hybrid post-quantum algorithm mlkem768x25519-sha256 is now used by default for key agreement. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51630 (cherry picked from commit 8e28d84935f2f0ee081d44f9803f3052b960e50b) (cherry picked from commit e600fc7295a7082041388113a5d677f6c4cf7ce7) --- crypto/openssh/.depend | 16 +- crypto/openssh/.git_allowed_signers | 6 +- crypto/openssh/.github/ci-status.md | 8 + crypto/openssh/.github/configs | 31 +- crypto/openssh/.github/run_test.sh | 22 +- crypto/openssh/.github/setup_ci.sh | 13 + crypto/openssh/.github/workflows/c-cpp.yml | 88 +- crypto/openssh/.github/workflows/selfhosted.yml | 63 +- crypto/openssh/.github/workflows/upstream.yml | 21 +- crypto/openssh/.gitignore | 8 +- crypto/openssh/.skipped-commit-ids | 2 + crypto/openssh/ChangeLog | 9510 +++++++++++--------- crypto/openssh/FREEBSD-upgrade | 3 - crypto/openssh/INSTALL | 12 +- crypto/openssh/Makefile.in | 65 +- crypto/openssh/PROTOCOL.agent | 4 +- crypto/openssh/PROTOCOL.certkeys | 15 +- crypto/openssh/README | 20 +- crypto/openssh/README.md | 4 +- crypto/openssh/addr.c | 22 +- crypto/openssh/addr.h | 11 - crypto/openssh/auth2-pubkey.c | 91 +- crypto/openssh/auth2.c | 4 +- crypto/openssh/authfile.c | 4 +- crypto/openssh/buildpkg.sh.in | 20 +- crypto/openssh/channels.c | 40 +- crypto/openssh/channels.h | 3 +- crypto/openssh/cipher.c | 28 +- crypto/openssh/clientloop.c | 7 +- crypto/openssh/config.h | 27 +- crypto/openssh/configure.ac | 145 +- crypto/openssh/contrib/cygwin/ssh-user-config | 2 +- crypto/openssh/contrib/redhat/openssh.spec | 30 +- crypto/openssh/contrib/suse/openssh.spec | 2 +- crypto/openssh/defines.h | 30 +- crypto/openssh/dh.c | 8 +- crypto/openssh/groupaccess.c | 2 +- crypto/openssh/includes.h | 3 + crypto/openssh/libcrux_mlkem768_sha3.h | 8 +- crypto/openssh/log.c | 174 +- crypto/openssh/log.h | 26 +- crypto/openssh/loginrec.c | 76 +- crypto/openssh/loginrec.h | 3 + crypto/openssh/mdoc2man.awk | 4 +- crypto/openssh/misc.c | 5 +- crypto/openssh/mlkem768.sh | 10 +- crypto/openssh/moduli | 844 +- crypto/openssh/monitor.c | 111 +- crypto/openssh/monitor.h | 3 + crypto/openssh/monitor_wrap.c | 84 +- crypto/openssh/monitor_wrap.h | 6 + crypto/openssh/mux.c | 3 +- crypto/openssh/myproposal.h | 14 +- crypto/openssh/openbsd-compat/bsd-pselect.c | 106 +- crypto/openssh/openbsd-compat/openssl-compat.h | 4 +- crypto/openssh/openbsd-compat/port-linux.c | 13 + crypto/openssh/openbsd-compat/port-linux.h | 4 + crypto/openssh/pathnames.h | 3 + crypto/openssh/platform-listen.c | 17 + crypto/openssh/platform.h | 1 + crypto/openssh/progressmeter.c | 3 +- crypto/openssh/readconf.c | 125 +- crypto/openssh/readconf.h | 9 +- crypto/openssh/regress/Makefile | 3 +- crypto/openssh/regress/agent-restrict.sh | 6 +- crypto/openssh/regress/agent.sh | 27 +- crypto/openssh/regress/cert-userkey.sh | 62 +- crypto/openssh/regress/cfginclude.sh | 14 +- crypto/openssh/regress/cfgmatch.sh | 70 +- crypto/openssh/regress/dropbear-ciphers.sh | 4 +- crypto/openssh/regress/dropbear-kex.sh | 17 +- crypto/openssh/regress/hostkey-agent.sh | 28 +- crypto/openssh/regress/key-options.sh | 7 +- .../regress/misc/fuzz-harness/agent_fuzz_helper.c | 1 + crypto/openssh/regress/misc/sk-dummy/Makefile | 66 + .../regress/misc/ssh-verify-attestation/Makefile | 79 + .../ssh-verify-attestation.c | 433 + crypto/openssh/regress/percent.sh | 42 +- crypto/openssh/regress/servcfginclude.sh | 14 +- crypto/openssh/regress/sftp-resume.sh | 43 + crypto/openssh/regress/sshfp-connect.sh | 8 +- crypto/openssh/regress/test-exec.sh | 27 +- crypto/openssh/regress/unittests/authopt/Makefile | 27 + crypto/openssh/regress/unittests/misc/Makefile | 33 + crypto/openssh/sandbox-capsicum.c | 30 +- crypto/openssh/sandbox-darwin.c | 17 +- crypto/openssh/sandbox-null.c | 12 - crypto/openssh/sandbox-pledge.c | 77 - crypto/openssh/sandbox-rlimit.c | 17 +- crypto/openssh/sandbox-seccomp-filter.c | 17 +- crypto/openssh/sandbox-solaris.c | 14 - crypto/openssh/sandbox-systrace.c | 218 - crypto/openssh/scp.1 | 59 +- crypto/openssh/scp.c | 5 +- crypto/openssh/servconf.c | 69 +- crypto/openssh/servconf.h | 1 + crypto/openssh/serverloop.c | 5 +- crypto/openssh/session.c | 11 +- crypto/openssh/sftp-client.c | 3 +- crypto/openssh/sftp.1 | 59 +- crypto/openssh/sftp.c | 3 +- crypto/openssh/sk-usbhid.c | 9 +- crypto/openssh/srclimit.c | 2 +- crypto/openssh/ssh-agent.1 | 62 +- crypto/openssh/ssh-agent.c | 136 +- crypto/openssh/ssh-ecdsa-sk.c | 2 +- crypto/openssh/ssh-keygen.1 | 8 +- crypto/openssh/ssh-keygen.c | 12 +- crypto/openssh/ssh-keyscan.c | 19 +- crypto/openssh/ssh-keysign.c | 4 +- crypto/openssh/ssh-pkcs11.c | 6 +- crypto/openssh/ssh-sandbox.h | 2 - crypto/openssh/ssh.1 | 34 +- crypto/openssh/ssh.c | 93 +- crypto/openssh/ssh.h | 17 +- crypto/openssh/ssh_api.c | 25 +- crypto/openssh/ssh_config.5 | 105 +- crypto/openssh/ssh_namespace.h | 11 +- crypto/openssh/sshconnect.c | 5 +- crypto/openssh/sshconnect.h | 14 +- crypto/openssh/sshconnect2.c | 8 +- crypto/openssh/sshd-auth.c | 888 ++ crypto/openssh/sshd-debug.sh | 52 + crypto/openssh/sshd-session.c | 334 +- crypto/openssh/sshd.c | 402 +- crypto/openssh/sshd_config | 4 +- crypto/openssh/sshd_config.5 | 40 +- crypto/openssh/sshkey.c | 18 +- crypto/openssh/sshkey.h | 4 +- crypto/openssh/sshsig.c | 13 +- crypto/openssh/version.h | 6 +- secure/libexec/Makefile | 1 + secure/libexec/sshd-auth/Makefile | 49 + secure/libexec/sshd-session/Makefile | 4 +- 134 files changed, 9724 insertions(+), 6339 deletions(-) diff --git a/crypto/openssh/.depend b/crypto/openssh/.depend index 45fc6b9afea1..152905fb7b78 100644 --- a/crypto/openssh/.depend +++ b/crypto/openssh/.depend @@ -26,8 +26,8 @@ auth2-kbdint.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd- auth2-methods.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h log.h ssherr.h misc.h servconf.h openbsd-compat/sys-queue.h xmalloc.h hostfile.h auth.h auth-pam.h audit.h loginrec.h auth2-none.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h atomicio.h xmalloc.h sshkey.h hostfile.h auth.h auth-pam.h audit.h loginrec.h packet.h openbsd-compat/sys-queue.h dispatch.h log.h ssherr.h misc.h servconf.h ssh2.h monitor_wrap.h auth2-passwd.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h packet.h openbsd-compat/sys-queue.h dispatch.h ssherr.h log.h sshkey.h hostfile.h auth.h auth-pam.h audit.h loginrec.h monitor_wrap.h misc.h servconf.h -auth2-pubkey.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h ssh.h ssh2.h packet.h openbsd-compat/sys-queue.h dispatch.h kex.h mac.h crypto_api.h sshbuf.h log.h ssherr.h misc.h servconf.h compat.h sshkey.h hostfile.h auth.h auth-pam.h audit.h loginrec.h -auth2-pubkey.o: pathnames.h uidswap.h auth-options.h canohost.h monitor_wrap.h authfile.h match.h channels.h session.h sk-api.h +auth2-pubkey.o: audit.h loginrec.h pathnames.h uidswap.h auth-options.h canohost.h monitor_wrap.h authfile.h match.h channels.h session.h sk-api.h +auth2-pubkey.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/glob.h xmalloc.h ssh.h ssh2.h packet.h openbsd-compat/sys-queue.h dispatch.h kex.h mac.h crypto_api.h sshbuf.h log.h ssherr.h misc.h servconf.h compat.h sshkey.h hostfile.h auth.h auth-pam.h auth2-pubkeyfile.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ssh.h log.h ssherr.h misc.h sshkey.h digest.h hostfile.h auth.h auth-pam.h audit.h loginrec.h auth-options.h authfile.h match.h auth2.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h atomicio.h xmalloc.h ssh2.h packet.h openbsd-compat/sys-queue.h dispatch.h log.h ssherr.h sshbuf.h misc.h servconf.h sshkey.h hostfile.h auth.h auth-pam.h audit.h loginrec.h pathnames.h monitor_wrap.h dig est.h kex.h auth2.o: mac.h crypto_api.h @@ -99,20 +99,18 @@ platform.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-comp poly1305.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h poly1305.h progressmeter.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h progressmeter.h atomicio.h misc.h utf8.h readconf.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/glob.h xmalloc.h ssh.h ssherr.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h pathnames.h log.h sshkey.h misc.h readconf.h match.h kex.h mac.h crypto_api.h uidswap.h -readconf.o: myproposal.h digest.h +readconf.o: myproposal.h digest.h version.h readpass.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h misc.h pathnames.h log.h ssherr.h ssh.h uidswap.h rijndael.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h rijndael.h sandbox-capsicum.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h sandbox-darwin.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h sandbox-null.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h -sandbox-pledge.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h sandbox-rlimit.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h sandbox-seccomp-filter.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h sandbox-solaris.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h -sandbox-systrace.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h scp.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/glob.h xmalloc.h ssh.h atomicio.h pathnames.h log.h ssherr.h misc.h progressmeter.h utf8.h sftp.h sftp-common.h sftp-client.h servconf.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/glob.h openbsd-compat/sys-queue.h xmalloc.h ssh.h log.h ssherr.h sshbuf.h misc.h servconf.h pathnames.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h sshkey.h kex.h -servconf.o: mac.h crypto_api.h match.h channels.h groupaccess.h canohost.h packet.h dispatch.h hostfile.h auth.h auth-pam.h audit.h loginrec.h myproposal.h digest.h +servconf.o: mac.h crypto_api.h match.h channels.h groupaccess.h canohost.h packet.h dispatch.h hostfile.h auth.h auth-pam.h audit.h loginrec.h myproposal.h digest.h version.h serverloop.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/sys-queue.h xmalloc.h packet.h dispatch.h sshbuf.h log.h ssherr.h misc.h servconf.h canohost.h sshpty.h channels.h ssh2.h sshkey.h cipher.h cipher-chachapoly.h chacha.h poly1305.h ciph er-aesctr.h serverloop.o: rijndael.h kex.h mac.h crypto_api.h hostfile.h auth.h auth-pam.h audit.h loginrec.h session.h auth-options.h serverloop.h session.o: hostfile.h auth.h auth-pam.h audit.h loginrec.h auth-options.h authfd.h pathnames.h log.h misc.h servconf.h sshlogin.h serverloop.h canohost.h session.h kex.h mac.h crypto_api.h monitor_wrap.h sftp.h atomicio.h @@ -161,9 +159,11 @@ sshconnect.o: authfd.h kex.h mac.h crypto_api.h sshconnect.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h xmalloc.h hostfile.h ssh.h sshbuf.h packet.h openbsd-compat/sys-queue.h dispatch.h sshkey.h sshconnect.h log.h ssherr.h match.h misc.h readconf.h atomicio.h dns.h monitor_fdpass.h ssh2.h version.h authfile.h sshconnect2.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h openbsd-compat/sys-queue.h xmalloc.h ssh.h ssh2.h sshbuf.h packet.h dispatch.h compat.h cipher.h cipher-chachapoly.h chacha.h poly1305.h cipher-aesctr.h rijndael.h sshkey.h kex.h mac.h crypto_api.h sshconnect2.o: sshconnect.h authfile.h dh.h authfd.h log.h ssherr.h misc.h readconf.h match.h canohost.h msg.h pathnames.h uidswap.h hostfile.h utf8.h ssh-sk.h sk-api.h -sshd-session.o: chacha.h poly1305.h cipher-aesctr.h rijndael.h digest.h sshkey.h kex.h mac.h crypto_api.h authfile.h pathnames.h atomicio.h canohost.h hostfile.h auth.h auth-pam.h audit.h loginrec.h authfd.h msg.h channels.h session.h monitor.h monitor_wrap.h ssh-sandbox.h auth-options.h version.h sk-api.h srclimit.h dh.h +sshd-auth.o: chacha.h poly1305.h cipher-aesctr.h rijndael.h digest.h sshkey.h kex.h mac.h crypto_api.h authfile.h pathnames.h atomicio.h canohost.h hostfile.h auth.h auth-pam.h audit.h loginrec.h authfd.h msg.h channels.h session.h monitor.h monitor_wrap.h auth-options.h version.h sk-api.h srclimit.h ssh-sandbox.h dh.h +sshd-auth.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ./openbsd-compat/sys-tree.h openbsd-compat/sys-queue.h xmalloc.h ssh.h ssh2.h sshpty.h packet.h dispatch.h log.h ssherr.h sshbuf.h misc.h match.h servconf.h uidswap.h compat.h cipher.h cipher-chachapoly.h +sshd-session.o: chacha.h poly1305.h cipher-aesctr.h rijndael.h digest.h sshkey.h kex.h mac.h crypto_api.h authfile.h pathnames.h atomicio.h canohost.h hostfile.h auth.h auth-pam.h audit.h loginrec.h authfd.h msg.h channels.h session.h monitor.h monitor_wrap.h auth-options.h version.h sk-api.h srclimit.h dh.h sshd-session.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ./openbsd-compat/sys-tree.h openbsd-compat/sys-queue.h xmalloc.h ssh.h ssh2.h sshpty.h packet.h dispatch.h log.h ssherr.h sshbuf.h misc.h match.h servconf.h uidswap.h compat.h cipher.h cipher-chachapoly.h -sshd.o: audit.h loginrec.h authfd.h msg.h version.h sk-api.h addr.h srclimit.h +sshd.o: audit.h loginrec.h authfd.h msg.h version.h sk-api.h addr.h srclimit.h atomicio.h sshd.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h ./openbsd-compat/sys-tree.h openbsd-compat/sys-queue.h xmalloc.h ssh.h sshpty.h log.h ssherr.h sshbuf.h misc.h servconf.h compat.h digest.h sshkey.h authfile.h pathnames.h canohost.h hostfile.h auth.h auth-pam.h ssherr.o: ssherr.h sshkey-xmss.o: includes.h config.h defines.h platform.h openbsd-compat/openbsd-compat.h openbsd-compat/base64.h openbsd-compat/sigact.h openbsd-compat/readpassphrase.h openbsd-compat/vis.h openbsd-compat/getrrsetbyname.h openbsd-compat/sha1.h openbsd-compat/sha2.h openbsd-compat/md5.h openbsd-compat/blf.h openbsd-compat/fnmatch.h openbsd-compat/getopt.h openbsd-compat/bsd-signal.h openbsd-compat/bsd-misc.h openbsd-compat/bsd-setres_id.h openbsd-compat/bsd-statvfs.h openbsd-compat/bsd-waitpid.h openbsd-compat/bsd-poll.h openbsd-compat/fake-rfc2553.h openbsd-compat/bsd-cygwin_util.h openbsd-compat/port-aix.h openbsd-compat/port-irix.h openbsd-compat/port-linux.h openbsd-compat/port-solaris.h openbsd-compat/port-net.h openbsd-compat/port-uw.h openbsd-compat/bsd-nextstep.h entropy.h diff --git a/crypto/openssh/.git_allowed_signers b/crypto/openssh/.git_allowed_signers index 2a5fdc67c6ed..04fe425ab891 100644 --- a/crypto/openssh/.git_allowed_signers +++ b/crypto/openssh/.git_allowed_signers @@ -1,7 +1,11 @@ -dtucker@dtucker.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKecyjh9aNmD4rb8WblA8v91JjRb0Cd2JtkzqxcggGeG +dtucker@dtucker.net valid-before="20241206" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKecyjh9aNmD4rb8WblA8v91JjRb0Cd2JtkzqxcggGeG dtucker@dtucker.net sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBDV81zWQ1+XVfWH5z4L4klDQ/z/6l2GLphfSTX/Rmq6kL5H8mkfzUlryxLlkN8cD9srtVJBAmwJWfJBNsCo958YAAAAEc3NoOg== +dtucker@dtucker.net sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIElSYahCw60CGct39Eg9EY8OLV9Ppr7tsudvSiMyNHOhAAAABHNzaDo= djm@mindrot.org sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBLnJo3ZVDENYZGXm5uO9lU7b0iDFq5gHpTu1MaHPWTEfPdvw+AjFQQ/q5YizuMJkXGsMdYmblJEJZYHpm9IS7ZkAAAAEc3NoOg== djm@mindrot.org sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBJoAXBTQalfg+kC5wy1vE7HkIHtVnmV6AUuuIo9KQ1P+70juHwvsFKpsGaqQbrHJkTVgYDGVP02XHj8+Fb18yBIAAAAEc3NoOg== djm@mindrot.org sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBH+z1I48s6ydOhP5SJmI02zVCLf0K15B+UMHgoTIKVfUIv5oDoVX7e9f+7QiRmTeEOdZfQydiaVqsfi7qPSve+0AAAAEc3NoOg== djm@mindrot.org sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBPM4BmUg/fMnsl42JwktTekk/mB8Be3M+yK2ayg6lqYsqEri8yhRx84gey51OHKVk1TwlGbJjcMHI4URreDBEMQAAAAEc3NoOg== + +tim@multitalents.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC/L8E1DfiZ9cHzygqx0IzRCSAlmh4tXH7mZPwWZEY1L + diff --git a/crypto/openssh/.github/ci-status.md b/crypto/openssh/.github/ci-status.md index 17fa97bdc309..68275715dfb1 100644 --- a/crypto/openssh/.github/ci-status.md +++ b/crypto/openssh/.github/ci-status.md @@ -9,3 +9,11 @@ master : 9.9 : [![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg?branch=V_9_9)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml?query=branch:V_9_9) [![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg?branch=V_9_9)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:V_9_9) + +9.8 : +[![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg?branch=V_9_8)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml?query=branch:V_9_8) +[![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg?branch=V_9_8)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:V_9_8) + +9.7 : +[![C/C++ CI](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml/badge.svg?branch=V_9_7)](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml?query=branch:V_9_7) +[![C/C++ CI self-hosted](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml/badge.svg?branch=V_9_7)](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:V_9_7) diff --git a/crypto/openssh/.github/configs b/crypto/openssh/.github/configs index 4f47f820b506..2526e3ef4812 100755 --- a/crypto/openssh/.github/configs +++ b/crypto/openssh/.github/configs @@ -129,6 +129,7 @@ case "$config" in kitchensink) CONFIGFLAGS="--with-kerberos5 --with-libedit --with-pam" CONFIGFLAGS="${CONFIGFLAGS} --with-security-key-builtin --with-selinux" + CONFIGFLAGS="${CONFIGFLAGS} --with-linux-memlock-onfault" CFLAGS="-DSK_DEBUG -DSANDBOX_SECCOMP_FILTER_DEBUG" ;; hardenedmalloc) @@ -136,6 +137,13 @@ case "$config" in ;; tcmalloc) CONFIGFLAGS="--with-ldflags=-ltcmalloc" + # tcmalloc may, depending on the stacktrace generator it uses, create + # pipe(2) fds during shared library initialisation. These will later + # get clobbered by ssh/sshd calling closefrom() and chaos will ensue. + # Tell tcmalloc to use an unwinder that doesn't pull this stuff. + TCMALLOC_STACKTRACE_METHOD=generic_fp + TEST_SSH_SSHD_ENV="TCMALLOC_STACKTRACE_METHOD=generic_fp" + export TCMALLOC_STACKTRACE_METHOD TEST_SSH_SSHD_ENV ;; krb5|heimdal) CONFIGFLAGS="--with-kerberos5" @@ -161,6 +169,9 @@ case "$config" in CONFIGFLAGS="--disable-pkcs11" LIBCRYPTOFLAGS="--with-ssl-dir=/opt/boringssl --with-rpath=-Wl,-rpath," ;; + aws-lc) + LIBCRYPTOFLAGS="--with-ssl-dir=/opt/aws-lc --with-rpath=-Wl,-rpath," + ;; libressl-*) LIBCRYPTOFLAGS="--with-ssl-dir=/opt/libressl --with-rpath=-Wl,-rpath," ;; @@ -181,7 +192,7 @@ case "$config" in CONFIGFLAGS="--with-selinux" ;; sk) - CONFIGFLAGS="--with-security-key-builtin" + CONFIGFLAGS="--with-security-key-builtin --with-security-key-standalone" ;; without-openssl) LIBCRYPTOFLAGS="--without-openssl" @@ -266,6 +277,10 @@ case "${TARGET_HOST}" in # Native linker is not great with PIC so OpenSSL is built w/out. CONFIGFLAGS="${CONFIGFLAGS} --disable-security-key" ;; + fbsd14-ppc64) + # Disable security key tests for bigendian interop test. + CONFIGFLAGS="${CONFIGFLAGS} --disable-security-key" + ;; hurd) SKIP_LTESTS="forwarding multiplex proxy-connect hostkey-agent agent-ptrace" ;; @@ -296,8 +311,20 @@ case "${TARGET_HOST}" in # SHA256 functions in sha2.h conflict with OpenSSL's breaking sk-dummy CONFIGFLAGS="${CONFIGFLAGS} --without-hardening --disable-security-key" ;; + openwrt-mipsel) + # Test most of the flags that OpenWRT sets for their package build. + # We only do this on one OpenWRT target for better coverage. + # The installed shared libraries installed by default are stripped and + # can't be linked to on the target systems. + OPENWRT_FLAGS="--disable-strip --disable-lastlog + --disable-utmp --disable-utmpx --disable-wtmp --disable-wtmpx + --with-stackprotect --with-cflags-after=-fzero-call-used-regs=skip" + CONFIGFLAGS="${CONFIGFLAGS} $(echo ${OPENWRT_FLAGS}) --without-zlib --disable-security-key" + LIBCRYPTOFLAGS="--without-openssl" + TEST_TARGET="t-exec" + ;; openwrt-*) - CONFIGFLAGS="${CONFIGFLAGS} --without-zlib" + CONFIGFLAGS="${CONFIGFLAGS} --without-zlib --disable-security-key" LIBCRYPTOFLAGS="--without-openssl" TEST_TARGET="t-exec" ;; diff --git a/crypto/openssh/.github/run_test.sh b/crypto/openssh/.github/run_test.sh index 17c1731ff860..74ab2423c0d8 100755 --- a/crypto/openssh/.github/run_test.sh +++ b/crypto/openssh/.github/run_test.sh @@ -33,17 +33,31 @@ output_failed_logs() { } trap output_failed_logs 0 +env="" +if [ ! -z "${SUDO}" ]; then + env="${env} SUDO=${SUDO}" +fi +if [ ! -z "${TCMALLOC_STACKTRACE_METHOD}" ]; then + env="${env} TCMALLOC_STACKTRACE_METHOD=${TCMALLOC_STACKTRACE_METHOD}" +fi +if [ ! -z "${TEST_SSH_SSHD_ENV}" ]; then + env="${env} TEST_SSH_SSHD_ENV=${TEST_SSH_SSHD_ENV}" +fi +if [ ! -z "${env}" ]; then + env="env${env}" +fi + if [ -z "${LTESTS}" ]; then - make ${TEST_TARGET} SKIP_LTESTS="${SKIP_LTESTS}" + ${env} make ${TEST_TARGET} SKIP_LTESTS="${SKIP_LTESTS}" else - make ${TEST_TARGET} SKIP_LTESTS="${SKIP_LTESTS}" LTESTS="${LTESTS}" + ${env} make ${TEST_TARGET} SKIP_LTESTS="${SKIP_LTESTS}" LTESTS="${LTESTS}" fi if [ ! -z "${SSHD_CONFOPTS}" ]; then echo "rerunning t-exec with TEST_SSH_SSHD_CONFOPTS='${SSHD_CONFOPTS}'" if [ -z "${LTESTS}" ]; then - make t-exec SKIP_LTESTS="${SKIP_LTESTS}" TEST_SSH_SSHD_CONFOPTS="${SSHD_CONFOPTS}" + ${env} make t-exec SKIP_LTESTS="${SKIP_LTESTS}" TEST_SSH_SSHD_CONFOPTS="${SSHD_CONFOPTS}" else - make t-exec SKIP_LTESTS="${SKIP_LTESTS}" LTESTS="${LTESTS}" TEST_SSH_SSHD_CONFOPTS="${SSHD_CONFOPTS}" + ${env} make t-exec SKIP_LTESTS="${SKIP_LTESTS}" LTESTS="${LTESTS}" TEST_SSH_SSHD_CONFOPTS="${SSHD_CONFOPTS}" fi fi diff --git a/crypto/openssh/.github/setup_ci.sh b/crypto/openssh/.github/setup_ci.sh index 7e1becaac2df..f6c4a5c84fb5 100755 --- a/crypto/openssh/.github/setup_ci.sh +++ b/crypto/openssh/.github/setup_ci.sh @@ -142,6 +142,10 @@ for TARGET in $TARGETS; do INSTALL_BORINGSSL=1 PACKAGES="${PACKAGES} cmake ninja-build" ;; + aws-lc) + INSTALL_AWSLC=1 + PACKAGES="${PACKAGES} cmake ninja-build" + ;; putty-*) INSTALL_PUTTY=$(echo "${TARGET}" | cut -f2 -d-) PACKAGES="${PACKAGES} cmake" @@ -240,6 +244,15 @@ if [ ! -z "${INSTALL_BORINGSSL}" ]; then cp -r ${HOME}/boringssl/include /opt/boringssl) fi +if [ ! -z "${INSTALL_AWSLC}" ]; then + (cd ${HOME} && git clone --depth 1 --branch v1.46.1 https://github.com/aws/aws-lc.git && + cd ${HOME}/aws-lc && mkdir build && cd build && + cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF .. && ninja && + mkdir -p /opt/aws-lc/lib && + cp ${HOME}/aws-lc/build/crypto/libcrypto.a /opt/aws-lc/lib && + cp -r ${HOME}/aws-lc/include /opt/aws-lc) +fi + if [ ! -z "${INSTALL_ZLIB}" ]; then (cd ${HOME} && git clone https://github.com/madler/zlib.git && cd ${HOME}/zlib && ./configure && make && diff --git a/crypto/openssh/.github/workflows/c-cpp.yml b/crypto/openssh/.github/workflows/c-cpp.yml index c179f73d16e0..424c193fb207 100644 --- a/crypto/openssh/.github/workflows/c-cpp.yml +++ b/crypto/openssh/.github/workflows/c-cpp.yml @@ -2,9 +2,9 @@ name: C/C++ CI on: push: - paths: [ '**.c', '**.h', '**.m4', '**.sh', '**/Makefile.in', 'configure.ac', '.github/configs', '.github/workflows/c-cpp.yaml' ] + paths: [ '**.c', '**.h', '**.m4', '**.sh', '**/Makefile.in', 'configure.ac', '.github/configs', '.github/workflows/c-cpp.yml' ] pull_request: - paths: [ '**.c', '**.h', '**.m4', '**.sh', '**/Makefile.in', 'configure.ac', '.github/configs', '.github/workflows/c-cpp.yaml' ] + paths: [ '**.c', '**.h', '**.m4', '**.sh', '**/Makefile.in', 'configure.ac', '.github/configs', '.github/workflows/c-cpp.yml' ] jobs: ci: @@ -15,11 +15,13 @@ jobs: matrix: # First we test all OSes in the default configuration. target: - - ubuntu-20.04 - ubuntu-22.04 - - macos-12 + - ubuntu-latest + - ubuntu-22.04-arm + - ubuntu-24.04-arm - macos-13 - macos-14 + - macos-15 - windows-2019 - windows-2022 config: [default] @@ -28,33 +30,36 @@ jobs: include: - { target: windows-2019, config: cygwin-release } - { target: windows-2022, config: cygwin-release } - - { target: ubuntu-20.04, config: valgrind-1 } - - { target: ubuntu-20.04, config: valgrind-2 } - - { target: ubuntu-20.04, config: valgrind-3 } - - { target: ubuntu-20.04, config: valgrind-4 } - - { target: ubuntu-20.04, config: valgrind-unit } - - { target: ubuntu-20.04, config: c89 } - - { target: ubuntu-20.04, config: clang-6.0 } - - { target: ubuntu-20.04, config: clang-8 } - - { target: ubuntu-20.04, config: clang-9 } - - { target: ubuntu-20.04, config: clang-10 } - - { target: ubuntu-20.04, config: clang-11 } - - { target: ubuntu-20.04, config: clang-12-Werror } - - { target: ubuntu-20.04, config: clang-sanitize-address } - - { target: ubuntu-20.04, config: clang-sanitize-undefined } - - { target: ubuntu-20.04, config: gcc-sanitize-address } - - { target: ubuntu-20.04, config: gcc-sanitize-undefined } - - { target: ubuntu-20.04, config: gcc-7 } - - { target: ubuntu-20.04, config: gcc-8 } - - { target: ubuntu-20.04, config: gcc-10 } + - { target: ubuntu-22.04, config: c89 } + - { target: ubuntu-22.04, config: clang-11 } + - { target: ubuntu-22.04, config: clang-12-Werror } + - { target: ubuntu-22.04, config: clang-14 } + - { target: ubuntu-22.04, config: clang-sanitize-address } + - { target: ubuntu-22.04, config: clang-sanitize-undefined } + - { target: ubuntu-22.04, config: gcc-9 } - { target: ubuntu-22.04, config: gcc-11-Werror } - { target: ubuntu-22.04, config: gcc-12-Werror } - - { target: ubuntu-20.04, config: pam } - - { target: ubuntu-20.04, config: kitchensink } + - { target: ubuntu-22.04, config: gcc-sanitize-address } + - { target: ubuntu-22.04, config: gcc-sanitize-undefined } - { target: ubuntu-22.04, config: hardenedmalloc } - - { target: ubuntu-20.04, config: tcmalloc } - - { target: ubuntu-20.04, config: musl } + - { target: ubuntu-22.04, config: heimdal } + - { target: ubuntu-22.04, config: kitchensink } + - { target: ubuntu-22.04, config: krb5 } + - { target: ubuntu-22.04, config: libedit } + - { target: ubuntu-22.04, config: pam } + - { target: ubuntu-22.04, config: selinux } + - { target: ubuntu-22.04, config: sk } + - { target: ubuntu-22.04, config: valgrind-1 } + - { target: ubuntu-22.04, config: valgrind-2 } + - { target: ubuntu-22.04, config: valgrind-3 } + - { target: ubuntu-22.04, config: valgrind-4 } + - { target: ubuntu-22.04, config: valgrind-unit } + - { target: ubuntu-22.04, config: without-openssl } + - { target: ubuntu-latest, config: gcc-14 } + - { target: ubuntu-latest, config: clang-15 } + - { target: ubuntu-latest, config: clang-19 } - { target: ubuntu-latest, config: boringssl } + - { target: ubuntu-latest, config: aws-lc } - { target: ubuntu-latest, config: libressl-master } - { target: ubuntu-latest, config: libressl-3.2.6 } - { target: ubuntu-latest, config: libressl-3.3.6 } @@ -63,18 +68,20 @@ jobs: - { target: ubuntu-latest, config: libressl-3.6.1 } - { target: ubuntu-latest, config: libressl-3.7.2 } - { target: ubuntu-latest, config: libressl-3.8.4 } - - { target: ubuntu-latest, config: libressl-3.9.1 } + - { target: ubuntu-latest, config: libressl-3.9.2 } + - { target: ubuntu-latest, config: libressl-4.0.0 } - { target: ubuntu-latest, config: openssl-master } - { target: ubuntu-latest, config: openssl-noec } - { target: ubuntu-latest, config: openssl-1.1.1 } - { target: ubuntu-latest, config: openssl-1.1.1t } - { target: ubuntu-latest, config: openssl-1.1.1w } - { target: ubuntu-latest, config: openssl-3.0.0 } - - { target: ubuntu-latest, config: openssl-3.0.13 } + - { target: ubuntu-latest, config: openssl-3.0.15 } - { target: ubuntu-latest, config: openssl-3.1.0 } - - { target: ubuntu-latest, config: openssl-3.1.5 } - - { target: ubuntu-latest, config: openssl-3.2.1 } - - { target: ubuntu-latest, config: openssl-3.3.0 } + - { target: ubuntu-latest, config: openssl-3.1.7 } + - { target: ubuntu-latest, config: openssl-3.2.3 } + - { target: ubuntu-latest, config: openssl-3.3.2 } + - { target: ubuntu-latest, config: openssl-3.4.0 } - { target: ubuntu-latest, config: openssl-1.1.1_stable } - { target: ubuntu-latest, config: openssl-3.0 } # stable branch - { target: ubuntu-latest, config: openssl-3.1 } # stable branch @@ -90,19 +97,18 @@ jobs: - { target: ubuntu-latest, config: putty-0.78 } - { target: ubuntu-latest, config: putty-0.79 } - { target: ubuntu-latest, config: putty-0.80 } + - { target: ubuntu-latest, config: putty-0.81 } + - { target: ubuntu-latest, config: putty-0.82 } + - { target: ubuntu-latest, config: putty-0.83 } - { target: ubuntu-latest, config: putty-snapshot } - { target: ubuntu-latest, config: zlib-develop } - - { target: ubuntu-22.04, config: pam } - - { target: ubuntu-22.04, config: krb5 } - - { target: ubuntu-22.04, config: heimdal } - - { target: ubuntu-22.04, config: libedit } - - { target: ubuntu-22.04, config: sk } - - { target: ubuntu-22.04, config: selinux } - - { target: ubuntu-22.04, config: kitchensink } - - { target: ubuntu-22.04, config: without-openssl } - - { target: macos-12, config: pam } + - { target: ubuntu-latest, config: tcmalloc } + - { target: ubuntu-latest, config: musl } + - { target: ubuntu-22.04-arm, config: kitchensink } + - { target: ubuntu-24.04-arm, config: kitchensink } - { target: macos-13, config: pam } - { target: macos-14, config: pam } + - { target: macos-15, config: pam } runs-on: ${{ matrix.target }} steps: - name: set cygwin git params diff --git a/crypto/openssh/.github/workflows/selfhosted.yml b/crypto/openssh/.github/workflows/selfhosted.yml index 755bb0cacb69..d892a28c3eb6 100644 --- a/crypto/openssh/.github/workflows/selfhosted.yml +++ b/crypto/openssh/.github/workflows/selfhosted.yml @@ -21,6 +21,7 @@ jobs: REMOTE: ${{ startsWith(matrix.host, 'remote') }} VM: ${{ startsWith(matrix.host, 'libvirt') || startsWith(matrix.host, 'persist') }} SSHFS: ${{ startsWith(matrix.host, 'libvirt') || startsWith(matrix.host, 'persist') || startsWith(matrix.host, 'remote') }} + BIGENDIAN: ${{ matrix.target == 'aix51' || matrix.target == 'fbsd14-ppc64' || matrix.target == 'openwrt-mips' }} strategy: fail-fast: false # We use a matrix in two parts: firstly all of the VMs are tested with the @@ -40,11 +41,11 @@ jobs: - fbsd12 - fbsd13 - fbsd14 - - minix3 - nbsd3 - nbsd4 - nbsd8 - nbsd9 + - nbsd10 - obsd51 - obsd67 - obsd72 @@ -62,6 +63,7 @@ jobs: include: # Long-running/slow tests have access to high priority runners. - { target: aix51, config: default, host: libvirt-hipri } + - { target: fbsd14-ppc64, config: default, host: libvirt-hipri } - { target: openindiana, config: pam, host: libvirt-hipri } - { target: sol10, config: default, host: libvirt-hipri } - { target: sol10, config: pam, host: libvirt-hipri } @@ -96,14 +98,9 @@ jobs: - { target: ARM64, config: pam, host: ARM64 } # Physical hosts with remote runners. - { target: debian-riscv64, config: default, host: remote-debian-riscv64 } - - { target: openwrt-mips, config: default, host: remote-openwrt-mips } - { target: openwrt-mipsel, config: default, host: remote-openwrt-mipsel } steps: - - name: unmount stale workspace - if: env.SSHFS == 'true' - run: fusermount -u ${GITHUB_WORKSPACE} || true - working-directory: ${{ runner.temp }} - name: shutdown VM if running if: env.VM == 'true' run: vmshutdown @@ -147,6 +144,60 @@ jobs: if: always() && env.SSHFS == 'true' run: fusermount -u ${GITHUB_WORKSPACE} || true working-directory: ${{ runner.temp }} + + - name: bigendian interop - mount regress + if: env.SSHFS == 'true' && env.BIGENDIAN == 'true' + run: | + set -x + vmrun sudo chown -R $LOGNAME ~/$(basename ${GITHUB_WORKSPACE}) || true + vmrun "cd $(basename ${GITHUB_WORKSPACE}/regress) && sudo make clean" + sshfs_mount regress + vmrun "sudo mkdir -p $(dirname ${GITHUB_WORKSPACE})" + vmrun "sudo ln -s ~/$(basename ${GITHUB_WORKSPACE}) ${GITHUB_WORKSPACE}" + working-directory: ${{ runner.temp }} + + - name: bigendian interop - host build + if: env.SSHFS == 'true' && env.BIGENDIAN == 'true' + run: | + set -x + ./.github/configure.sh ${{ matrix.config }} + pwd + ls -ld regress || true + ls -l regress/check-perm || true + make clean + make + + - name: bigendian interop - test + if: env.SSHFS == 'true' && env.BIGENDIAN == 'true' + env: + TEST_SSH_UNSAFE_PERMISSIONS: 1 + run: | + set -x + echo "#!/bin/sh" >remote_sshd + echo "exec /usr/bin/ssh ${TARGET_DOMAIN} exec /home/builder/$(basename ${GITHUB_WORKSPACE})/sshd "'$@' >>remote_sshd + chmod 755 remote_sshd + make t-exec TEST_SSH_SSHD=`pwd`/remote_sshd LTESTS="try-ciphers kextype keytype" + + - name: bigendian interop - save logs + if: failure() && env.BIGENDIAN == 'true' + uses: actions/upload-artifact@main + with: + name: ${{ matrix.target }}-${{ matrix.config }}-interop-logs + path: | + config.h + config.log + regress/*.log + regress/log/* + + - name: bigendian interop - unmount regress + if: always() && env.SSHFS == 'true' && env.BIGENDIAN == 'true' + run: fusermount -z -u ${GITHUB_WORKSPACE}/regress || true + working-directory: ${{ runner.temp }} + + - name: lazily unmount workspace + if: always() && env.SSHFS == 'true' + run: fusermount -z -u ${GITHUB_WORKSPACE} || true + working-directory: ${{ runner.temp }} - name: shutdown VM if: always() && env.VM == 'true' run: vmshutdown diff --git a/crypto/openssh/.github/workflows/upstream.yml b/crypto/openssh/.github/workflows/upstream.yml index e25adb423917..615a7763fb9b 100644 --- a/crypto/openssh/.github/workflows/upstream.yml +++ b/crypto/openssh/.github/workflows/upstream.yml @@ -9,19 +9,25 @@ jobs: selfhosted: name: "upstream ${{ matrix.target }} ${{ matrix.config }}" if: github.repository == 'openssh/openssh-portable-selfhosted' - runs-on: 'libvirt' + runs-on: ${{ matrix.host }} env: DEBUG_ACTIONS: true EPHEMERAL: true - HOST: 'libvirt' + HOST: ${{ matrix.host }} TARGET_HOST: ${{ matrix.target }} TARGET_CONFIG: ${{ matrix.config }} TARGET_DOMAIN: ${{ format('{0}-{1}-{2}', matrix.target, matrix.config, github.run_id) || matrix.target }} strategy: fail-fast: false matrix: + host: + - libvirt target: [ obsdsnap, obsdsnap-i386 ] config: [ default, without-openssl, ubsan ] + include: + - { host: libvirt-arm64, target: obsdsnap-arm64, config: default } + - { host: libvirt-arm64, target: obsdsnap-arm64, config: without-openssl } + - { host: libvirt-arm64, target: obsdsnap-arm64, config: ubsan } steps: - name: unmount stale workspace run: fusermount -u ${GITHUB_WORKSPACE} || true @@ -49,17 +55,22 @@ jobs: env: SUDO: sudo timeout-minutes: 300 + - name: show logs + if: failure() + run: vmrun 'for i in /usr/src/regress/usr.bin/ssh/obj/*.log; do echo ====; echo logfile $i; echo =====; cat $i; done' - name: save logs if: failure() uses: actions/upload-artifact@main with: name: ${{ matrix.target }}-${{ matrix.config }}-logs path: | - /usr/obj/regress/usr.bin/ssh/obj/*.log - /usr/obj/regress/usr.bin/ssh/obj/log/* + /usr/src/regress/usr.bin/ssh/obj/*.log + /usr/src/regress/usr.bin/ssh/obj/log/* - name: unmount workspace if: always() - run: fusermount -u ${GITHUB_WORKSPACE} || true + run: | + fusermount -u ${GITHUB_WORKSPACE} || true + fusermount -z -u ${GITHUB_WORKSPACE} || true working-directory: ${{ runner.temp }} - name: shutdown VM if: always() diff --git a/crypto/openssh/.gitignore b/crypto/openssh/.gitignore index 41d505c46dde..c419d0fd662b 100644 --- a/crypto/openssh/.gitignore +++ b/crypto/openssh/.gitignore @@ -12,6 +12,8 @@ survey.sh **/*.o **/*.lo **/*.so +**/*.dylib +**/*.dll **/*.out **/*.a **/*.un~ @@ -29,7 +31,9 @@ ssh-keysign ssh-pkcs11-helper ssh-sk-helper sshd -!regress/misc/fuzz-harness/Makefile -!regress/unittests/sshsig/Makefile +sshd-session +sshd-auth +!regress/misc/**/Makefile +!regress/unittests/**/Makefile tags diff --git a/crypto/openssh/.skipped-commit-ids b/crypto/openssh/.skipped-commit-ids index ec7831e5ff53..7988e25006f4 100644 --- a/crypto/openssh/.skipped-commit-ids +++ b/crypto/openssh/.skipped-commit-ids @@ -37,6 +37,8 @@ ef9341d5a50f0d33e3a6fbe995e92964bc7ef2d3 Makefile relinking changes fb39324748824cb0387e9d67c41d1bef945c54ea Makefile change 5f378c38ad8976d507786dc4db9283a879ec8cd0 Makefile change 112aacedd3b61cc5c34b1fa6d9fb759214179172 Makefile change +a959fc45ea3431b36f52eda04faefc58bcde00db groupaccess.c changes +6d07e4606997e36b860621a14dd41975f2902f8f Makefile.inc Old upstream tree: diff --git a/crypto/openssh/ChangeLog b/crypto/openssh/ChangeLog index 2ef1164e6cfb..60a06386e42d 100644 --- a/crypto/openssh/ChangeLog +++ b/crypto/openssh/ChangeLog @@ -1,6764 +1,7464 @@ -commit 6ebc4dd77a479892d5ca0cd2a567a651f70aad82 +commit 8725dbc5b5fcc3e326fc71189ef8dba4333362cc Author: Damien Miller -Date: Tue Feb 18 19:03:42 2025 +1100 +Date: Wed Apr 9 17:02:17 2025 +1000 - openssh-9.9p2 + update version numbers -commit 38df39ecf278a7ab5794fb03c01286f2cfe82c0d +commit cc7feb9458ad3b893b53dc9c7500d1affd208bde Author: djm@openbsd.org -Date: Tue Feb 18 08:02:48 2025 +0000 +Date: Wed Apr 9 07:00:21 2025 +0000 - upstream: Fix cases where error codes were not correctly set - - Reported by the Qualys Security Advisory team. ok markus@ + upstream: openssh-10.0 - OpenBSD-Commit-ID: 7bcd4ffe0fa1e27ff98d451fb9c22f5fae6e610d + OpenBSD-Commit-ID: db5b4a1f1c9e988f8f166b56dc5643606294b403 -commit 5e07dee272c34e193362fba8eda0e3c453f3c773 +commit fc86875e6acb36401dfc1dfb6b628a9d1460f367 Author: djm@openbsd.org -Date: Tue Feb 18 08:02:12 2025 +0000 +Date: Wed Apr 9 07:00:03 2025 +0000 - upstream: Don't reply to PING in preauth phase or during KEX + upstream: Fix logic error in DisableForwarding option. This option - Reported by the Qualys Security Advisory team. ok markus@ + was documented as disabling X11 and agent forwarding but it failed to do so. + Spotted by Tim Rice. - OpenBSD-Commit-ID: c656ac4abd1504389d1733d85152044b15830217 + OpenBSD-Commit-ID: fffc89195968f7eedd2fc57f0b1f1ef3193f5ed1 -commit fb071011fb843142282b8b8a69cbb15e9b0b9485 +commit dd73459e351b0a2908aed90910c8ff9b0b381c6d Author: djm@openbsd.org -Date: Mon Feb 10 23:00:29 2025 +0000 +Date: Wed Apr 9 01:24:40 2025 +0000 - upstream: fix "Match invalid-user" from incorrectly being activated - - in initial configuration pass when no other predicates were present on the - match line + upstream: oops, I accidentally backed out the typo fix - OpenBSD-Commit-ID: 02703b4bd207fafd03788bc4e7774bf80be6c9a8 + OpenBSD-Commit-ID: f485f79bf3e9ebbe1de13ac96150cf458956cfd8 -commit 729a26a978dd39db60d4625bdfb5405baa629e59 -Author: Damien Miller -Date: Wed Oct 30 14:25:14 2024 +1100 +commit 0cb945891944bada5850e85d60afa3c807cf1af6 +Author: djm@openbsd.org +Date: Wed Apr 9 01:23:47 2025 +0000 - fix uint64_t types; reported by Tom G. Christensen + upstream: typo + + OpenBSD-Commit-ID: f912725c7d303720706b3ccfb2cb846d46296d13 -commit 33c5f384ae03a5d1a0bd46ca0fac3c62e4eaf784 +commit cd4a6bd50b658d707867caa1f5aa40b35c2b6c19 Author: Damien Miller -Date: Sun Oct 27 13:28:11 2024 +1100 +Date: Wed Apr 9 09:49:55 2025 +1000 - htole64() etc for systems without endian.h + initialise websafe_allowlist in agent fuzzer -commit fe8d28a7ebbaa35cfc04a21263627f05c237e460 +commit 55b7cb48af96c1102ef8ab5a73bb329cbed30945 Author: djm@openbsd.org -Date: Sun Oct 27 02:06:59 2024 +0000 +Date: Tue Apr 8 23:10:46 2025 +0000 - upstream: explicitly include endian.h + upstream: typo - OpenBSD-Commit-ID: 13511fdef7535bdbc35b644c90090013da43a318 + OpenBSD-Regress-ID: 08477b936d1d0c1e8a98aa1c0e1bdde8871894c9 -commit 11f348196b3fb51c3d8d1f4f36db9d73f03149ed +commit 985d8cbcd3438cc36b4e709476f1783e358ddfb1 Author: djm@openbsd.org -Date: Sun Oct 27 02:06:01 2024 +0000 +Date: Tue Apr 8 23:10:08 2025 +0000 - upstream: fix ML-KEM768x25519 KEX on big-endian systems; spotted by + upstream: typo - jsg@ feedback/ok deraadt@ + OpenBSD-Commit-ID: 6e683e13e72bf1e43bbd3bbc6a8332d5a98bdc99 + +commit 000c3d14e94d8f7597087c457260ea9417045b65 +Author: dtucker@openbsd.org +Date: Mon Apr 7 08:12:22 2025 +0000 + + upstream: Include time.h for time(). - OpenBSD-Commit-ID: 26d81a430811672bc762687166986cad40d28cc0 + Fixes warning on some platforms when building without openssl. + + OpenBSD-Commit-ID: 04ca29b8eaae1860c7adde3e770baa1866e30a54 -commit 19bcb2d90c6caf14abf386b644fb24eb7afab889 -Author: djm@openbsd.org -Date: Thu Sep 26 23:55:08 2024 +0000 +commit 49b8b9bf829e08af22366530614a5e59ac341ca9 +Author: tb@openbsd.org +Date: Wed Apr 2 04:28:03 2025 +0000 - upstream: fix previous change to ssh_config Match, which broken on + upstream: Wrap #include in #ifdef WITH_DSA - negated Matches; spotted by phessler@ ok deraadt@ + ok djm - OpenBSD-Commit-ID: b1c6acec66cd5bd1252feff1d02ad7129ced37c7 + OpenBSD-Commit-ID: ed01a7c102243f84e4a317aefb431916d98aab15 + +commit f80fb819e5521e13f167edbcc3eed66e22ad0c2a +Author: Damien Miller +Date: Thu Apr 3 09:10:19 2025 +1100 + + remove all instances of -pie from LDFLAGS + + Previously only the first instance of this flag was removed. + Unbreaks build on OpenSUSE Tumbleweed. Patch from Antonio Larrosa -commit 66878e12a207fa9746dee3e2bdcca29b704cf035 +commit 6c9872faa1c297a84c6d3e3b95a927be99eadbf6 Author: djm@openbsd.org -Date: Wed Sep 25 01:24:04 2024 +0000 +Date: Tue Apr 1 23:23:20 2025 +0000 - upstream: fix regression introduced when I switched the "Match" + upstream: remove ability to enable DSA support. Actual code will be - criteria tokeniser to a more shell-like one. Apparently the old tokeniser - (accidentally?) allowed "Match criteria=argument" as well as the "Match - criteria argument" syntax that we tested for. + g/c'd separately. ok deraadt@ - People were using this syntax so this adds back support for - "Match criteria=argument" + OpenBSD-Commit-ID: 2a032b75156c4d922e8343fa97ff6bc227f09819 + +commit 8460aaa4e1f8680f03cc5334556b9440b401f010 +Author: dtucker@openbsd.org +Date: Fri Mar 28 21:45:55 2025 +0000 + + upstream: Add TEST_SSH_SSHD_ENV to sshd lines here too. - bz3739 ok dtucker + OpenBSD-Regress-ID: 045f2c88b42d694b404db51c5de5eca20d748ff1 + +commit 5e60f5937b9c33190b9d7614f72d85d4a9b38d3d +Author: dtucker@openbsd.org +Date: Fri Mar 28 06:04:07 2025 +0000 + + upstream: Pass "ControlMaster no" to ssh when invoked by scp & sftp. - OpenBSD-Commit-ID: d1eebedb8c902002b75b75debfe1eeea1801f58a + If you have ControlMaster auto (or yes) in your config, and the + first connection you make is via scp or sftp, then you may get a + few unexpected options applied to it (eg ForwardX11 no), since sftp + and sftp explicitly disable those for reasons. These effects will + persist beyond the initial scp or sftp command. + + This explicitly disables persistent session *creation* by scp and sftp. + It will not prevent them from using an existing session if one has + already been created. + + From Github PR#557, ok djm@ kn@ + + OpenBSD-Commit-ID: 9dad7c737466837e0150c4318920f46d844770c4 -commit ff2cd1dd5711ff88efdf26662d6189d980439a1f -Author: Damien Miller -Date: Wed Sep 25 11:15:45 2024 +1000 +commit bbd36869dfb4b770cc9e6a345c04a585a0955aec +Author: dtucker@openbsd.org +Date: Fri Mar 28 05:41:15 2025 +0000 - gss-serv.c needs sys/param.h + upstream: Set sshd environment variables during sshd test run too. - From Void Linux + OpenBSD-Regress-ID: 50cb325d92c390a2909662c901f6ac5d80b6f74d -commit 2c12ae8cf9b0b7549ae097c4123abeda0ee63e5b -Author: Damien Miller -Date: Wed Sep 25 11:13:05 2024 +1000 +commit 98f05b1484daddef2f56b79e24540523b5016143 +Author: dtucker@openbsd.org +Date: Fri Mar 28 05:36:24 2025 +0000 - build construct_utmp() when USE_BTMP is set + upstream: Add TEST_SSH_SSHD_ENV variable which is added to sshd's - Fixes compile error on Void Linux/Musl + environment. Will be used in Portable to tweak behaviour of tcmalloc's + debugging. + + OpenBSD-Regress-ID: 67e38c3c4517ddb72c8a3549a3325a166d7bb6d6 -commit c7fda601186ff28128cfe3eab9c9c0622de096e1 -Author: Christoph Ostarek *** 22191 LINES SKIPPED *** From nobody Tue Jan 20 19:43:37 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwd6f1VLLz6P3Cs for ; Tue, 20 Jan 2026 19:43: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwd6d5mFKz3t39 for ; Tue, 20 Jan 2026 19:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768938217; 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=yBAP/kQZgmSh/yUaS7qqkV+hc4S7ZJeEk+6xxNYFd+E=; b=hqwD/QKQ9FZIFr38LdBh0YKzEtFDGXy9mXEf6bvorxv6GaIMoz+4ZU739qw5cu4TerJbki smkxssqPwUOSJ5v561gEAnYRFSteP+63fKS5wXULkNysJR8xJ7eZo5A/rCUUJRY3LQWbPs q+xcFBXz3SznD+srJX8vKc1xa7QjUXkB2y6vwc6+kLDTJdiTmA3nPc7mgtZ6VY86uOCnZc Uzv5Lu4ixlkEFdB0eUs7+Kisxo7yxlZOY+Mn1/tGn7oMTdkYSFQPqwZqaxuwNzl4rnjfUq xenQFhT6uY2XYW6iX+T+7bubndxUV3PIpVhHn4+bCT0SqgG2VDacE5Qw+CoG2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768938217; 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=yBAP/kQZgmSh/yUaS7qqkV+hc4S7ZJeEk+6xxNYFd+E=; b=S2I1+GmLG5QSUVLGOIq+nSMZDKQf3QZBdH9Blprc0o+QBYlOL9cxievo8l2PQUiuZCgAA+ 2qHFv91U295vk875rs4P75eqrH5t7gpqtLCgOtZMXyueCK0xbWaKl4O4zYSP2yjLT41tj4 ebVIMvz0+1ibAFJ8bQ2fZnCdkh21segLy7GaKZVyG78YHNJvWJwSNb0CWs1zNBGiqt9/pH YLh4bPN2Fxylcc79t45vWxtRIfb0BmgnHFjNcftGnMHW8KTvMSV9ggOMqdf88mOSj9zmga doCUwIIS4F7trOxwbs/vQCPJXXSOCI46lLoCEhmVBs2CG8bSZ5zcYpHotJxbUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768938217; a=rsa-sha256; cv=none; b=T4BxS0j7MGj1sYqjdQBhISrtSXh4AIaJKX4djaheczwAAndKzhlWJl3q6cX92LsRgztaSz 8ajo+ezucx+Ts7jB3IG7HfZxSsKZQdcal/nu8wrDZhWBDAjeKCfeCM8pXyoho18aq+bhLP fNqBmxCt0l8t8VDEnl/NNI0nZ3D0x/QEBQOIfYYqtU8Ysk1bpLcL0To4JxzgxJyx0t6YQ4 cwRezjkOYKq0ReZMXYrK42Kr7Zs2e4RzEyGH3eEIkpPfUgOAENB0fLjACfouoISWxMgcj5 ksu3fUXx5Z6ue9Uogc+gd2kTU2KmNafK+gFSAcKAzNlOp1LHTEIvnUR0IutJiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwd6d4BZCzts for ; Tue, 20 Jan 2026 19:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d509 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 19:43:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin From: Ed Maste Subject: git: b19f74cfc43b - stable/14 - openssh: Include explicitly in includes.h List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b19f74cfc43b2b555875fa8be35ae23cab6e6096 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 19:43:37 +0000 Message-Id: <696fdae9.d509.802d206@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b19f74cfc43b2b555875fa8be35ae23cab6e6096 commit b19f74cfc43b2b555875fa8be35ae23cab6e6096 Author: John Baldwin AuthorDate: 2025-08-08 17:43:36 +0000 Commit: Ed Maste CommitDate: 2026-01-20 19:42:08 +0000 openssh: Include explicitly in includes.h This was previously included due to nested includes in Heimdal's headers. Without this, the build fails with an error due to redefining AT_FDCWD. clang: In file included from crypto/openssh/sshd-session.c:46: /usr/obj/.../tmp/usr/include/fcntl.h:232:9: error: 'AT_FDCWD' macro redefined [-Werror,-Wmacro-redefined] 232 | #define AT_FDCWD -100 | ^ crypto/openssh/openbsd-compat/bsd-misc.h:69:10: note: previous definition is here 69 | # define AT_FDCWD (-2) | ^ GCC (can't be disabled): In file included from crypto/openssh/sshd-session.c:46: sys/sys/fcntl.h:232:9: error: "AT_FDCWD" redefined [-Werror] 232 | #define AT_FDCWD -100 | ^~~~~~~~ In file included from crypto/openssh/openbsd-compat/openbsd-compat.h:218, from crypto/openssh/includes.h:173, from crypto/openssh/sshd-session.c:30: openssh/openbsd-compat/bsd-misc.h:69:10: note: this is the location of the previous definition 69 | # define AT_FDCWD (-2) | ^~~~~~~~ Reviewed by: des Differential Revision: https://reviews.freebsd.org/D51809 (cherry picked from commit 7de6d9d9b6bd8b1cd5e190cf4f12df498b34a646) --- crypto/openssh/includes.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crypto/openssh/includes.h b/crypto/openssh/includes.h index 8f933568d337..96cddbc26089 100644 --- a/crypto/openssh/includes.h +++ b/crypto/openssh/includes.h @@ -34,6 +34,9 @@ #ifdef HAVE_ENDIAN_H # include #endif +#ifdef HAVE_FCNTL_H +# include +#endif #ifdef HAVE_TTYENT_H # include #endif From nobody Tue Jan 20 19:43:38 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwd6g0LSSz6P3R4 for ; Tue, 20 Jan 2026 19:43: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwd6f6Hznz3syD for ; Tue, 20 Jan 2026 19:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768938218; 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=nQYssoxyzBScvUDePAuKi92ddXMBoQyf+gvfRjUtcB0=; b=UoGa4nkVqe8fD52LIGiFeAirnjoD5TIg33NPQ417qhEMJr8Cz0PUrnqr7c9Ub9DmROJvno K/qa/2FoIdoMX7RoUJb/PB0bWqBOdALYbxtVw1w/QcjD/1VqPFxHK9HyAbcWMDHnhLyKCw R7pv6YyVq2qbw4tFHFSRSOhwh7JMZo0nximGajvg/f/lx6KiudYFtslIoU+pBdmpBYZOcm 6XtBn2hW5sEPtx8giNDLRQlO1ah+K2fiJBgFMAnXeM4MOEfmnY8J3Gz2RQgzsYfyi7LdcX +MFwHCfzTYOJfd/C6t2N/3choOBE18UHWOuANhgLySaepNiKFOC7C2h3fYidEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768938218; 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=nQYssoxyzBScvUDePAuKi92ddXMBoQyf+gvfRjUtcB0=; b=A9EM1V5D+wOY/mn4uHwBnwrWMTcYg0BZ6OsW/acTuQSvkwx5GzGDO/9w5dRQOh2gzrwv58 1xJcTe0hDO5+uNlbDjyVyMrzpYISZtPH0uHbqfyYjf3HuUYhkznadOgrtgIS0BL1dgsubb LiRUR01oNqwzcjApxVAyl0oQhweMp1IctqPGuFkwzjHOuunZwaEygdQni4QoMoXY4aieTc wb1TqfwNlaZrPzFX8RPVkuMrtmBc2sk9y/lDb/cNH4g7n1ww3qFQTgQxqh1g2Y/FdTcAze qHBHHQErzeHMovPDNRdSV22D0u7hmzFIbsiiwKwqYz2QVuXLcWehWc8pqBCiDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768938218; a=rsa-sha256; cv=none; b=pb4Equ1UAMjDD/ygt1XtiqDMLPHd2yllhVfPC32cdOFpEoSGMJDO1Yh/v/XgPZUZd2MzAV jhmLHfSuko/ZC6OC7HB3/dmQWTYn/2BE4xDoueFKWemmuGPYvuyuO+yKWFkrqW5HXeEwc3 /VKzQWQppVicUTDZH+YImwAzMtHMtuAHohv/xfXHdzodelMduvt8VCZP7CdNtnuWhhI4te j0v+rvOvn+4DM542mZXRkBqRxMq2wD7ouGSwUW1uBfuoBCmC86AurC6zJXFcfil4O8STSP +0KR2XofRDjrsvGWSbLa3vqYiSh94tP2PIGjONaV/L4ka5xaL8B4dFX3ARO34A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwd6f52pTz1Mk for ; Tue, 20 Jan 2026 19:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d889 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 19:43:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin From: Ed Maste Subject: git: 79041942fa9a - stable/14 - openssh: Don't include an unused EVP_CIPHER_CTX_get_iv() stub List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 79041942fa9a4496c11f437e323fb0fc767fcce5 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 19:43:38 +0000 Message-Id: <696fdaea.d889.5ea5c308@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=79041942fa9a4496c11f437e323fb0fc767fcce5 commit 79041942fa9a4496c11f437e323fb0fc767fcce5 Author: John Baldwin AuthorDate: 2025-08-08 17:43:56 +0000 Commit: Ed Maste CommitDate: 2026-01-20 19:42:08 +0000 openssh: Don't include an unused EVP_CIPHER_CTX_get_iv() stub This stub isn't actually used on modern versions of OpenSSL for which OpenSSH uses EVP_CIPHER_CTX_get_updated_iv instead via a wrapper macro. However, the wrapper macro conflicted with the existing namespace macro triggering an error on GCC: In file included from crypto/openssh/sshd-session.c:65: crypto/openssh/openbsd-compat/openssl-compat.h:71:11: error: "EVP_CIPHER_CTX_get_iv" redefined [-Werror] 71 | # define EVP_CIPHER_CTX_get_iv EVP_CIPHER_CTX_get_updated_iv | ^~~~~~~~~~~~~~~~~~~~~ In file included from : crypto/openssh/ssh_namespace.h:12:9: note: this is the location of the previous definition 12 | #define EVP_CIPHER_CTX_get_iv Fssh_EVP_CIPHER_CTX_get_iv | ^~~~~~~~~~~~~~~~~~~~~ The error was masked on clang due to MIT krb5 adding a blanket -Wno-macro-redefined. Building sshd-session without Kerberos support was sufficient to trigger a warning from clang. Reviewed by: des Differential Revision: https://reviews.freebsd.org/D51810 (cherry picked from commit e8633bc76ad935fa44156034713c608477bc3da0) --- crypto/openssh/openbsd-compat/libressl-api-compat.c | 8 +++++--- crypto/openssh/ssh_namespace.h | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/crypto/openssh/openbsd-compat/libressl-api-compat.c b/crypto/openssh/openbsd-compat/libressl-api-compat.c index 59be17397c56..2381df57ac2b 100644 --- a/crypto/openssh/openbsd-compat/libressl-api-compat.c +++ b/crypto/openssh/openbsd-compat/libressl-api-compat.c @@ -26,6 +26,7 @@ #include #ifndef HAVE_EVP_CIPHER_CTX_GET_IV +# ifndef HAVE_EVP_CIPHER_CTX_GET_UPDATED_IV int EVP_CIPHER_CTX_get_iv(const EVP_CIPHER_CTX *ctx, unsigned char *iv, size_t len) { @@ -44,14 +45,15 @@ EVP_CIPHER_CTX_get_iv(const EVP_CIPHER_CTX *ctx, unsigned char *iv, size_t len) if (len != 0) { if (iv == NULL) return 0; -# ifdef HAVE_EVP_CIPHER_CTX_IV +# ifdef HAVE_EVP_CIPHER_CTX_IV memcpy(iv, EVP_CIPHER_CTX_iv(ctx), len); -# else +# else memcpy(iv, ctx->iv, len); -# endif /* HAVE_EVP_CIPHER_CTX_IV */ +# endif /* HAVE_EVP_CIPHER_CTX_IV */ } return 1; } +# endif /* HAVE_EVP_CIPHER_CTX_GET_UPDATED_IV */ #endif /* HAVE_EVP_CIPHER_CTX_GET_IV */ #ifndef HAVE_EVP_CIPHER_CTX_SET_IV diff --git a/crypto/openssh/ssh_namespace.h b/crypto/openssh/ssh_namespace.h index 7a0c73f2d312..0fa812218c06 100644 --- a/crypto/openssh/ssh_namespace.h +++ b/crypto/openssh/ssh_namespace.h @@ -9,7 +9,6 @@ #define Blowfish_initstate Fssh_Blowfish_initstate #define Blowfish_stream2word Fssh_Blowfish_stream2word #define Decode Fssh_Decode -#define EVP_CIPHER_CTX_get_iv Fssh_EVP_CIPHER_CTX_get_iv #define EVP_CIPHER_CTX_set_iv Fssh_EVP_CIPHER_CTX_set_iv #define Encode Fssh_Encode #define Hide Fssh_Hide From nobody Tue Jan 20 19:43:39 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwd6h3hltz6P3Ng for ; Tue, 20 Jan 2026 19:43: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwd6h1Vxqz3syX for ; Tue, 20 Jan 2026 19:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768938220; 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=aT8C5SeESpw084hcqTPaZ/CNXU2SkeW6yBZc+wStxPU=; b=eJTZ+B2PoTMXU0rGUIk6uloaawNWctc9hU8DYhxN6lbfTBwgxwJRmp9z0SClvaNjTNgqxp 3wbFlNazOIhzoqUe5gaBv9q1Tf0ityEOiYq+S38ARZhTwjBha6NGRssUiljXVofBc4Qmdr FL5xynMF6yb+b1fWvzQD8aV5Wx9q5kq0d+Hux+oXPhrHzGHs4zU24Q1Vo0WXu4ucLRpbdu ftnUm3nRP6mB7hnngfRi1VQuF809ErWtJ0t3QPMHNlDuCmv2OkE4lmnoth7ZUDbG7kHGlE fdCLxq1j0tUsN3ZjflYUy1gQmcaP3SNB1vq+0Hw7JSZkfZeQYJoGd1aUe/uoog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768938220; 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=aT8C5SeESpw084hcqTPaZ/CNXU2SkeW6yBZc+wStxPU=; b=ni+CXez9ycGMFWszCn8VKOettBC9y5/wUSoNkR6oQ2GGfBF8Tlf0MY10tB2ldrdP7BFtes Z4/kvXz1iSBfYMeUIwPMuiwkRu7WIpRRrxvIsHQztMDKg0lpB8wLqaOoMUZ/4fjCYxH5tV iuMyJqBhveos0/t8DDUplp0ZMdq1Q7SSQLTdifEvulAAaRM36wU/UCwYI0z3tTXIzoWEPj KCVBLcaXRz9rETVs9J8gIHdHCAwU9ZrS8EZRznljOSQWwfFbqGb3F1sJGJwkyMEJ5KsOIN TjrjSBltVPj9YWrkbpRd1Rj94EwhP4pwJwv8Ug3w0C3A2lgEr5s/s6tTvd7Q/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768938220; a=rsa-sha256; cv=none; b=VpDZQ1GPyPzq/3azym4ViFkcMPN3K0jP3cCE3SnBBQiPxdcugcgX3jXp1EbYoNkbAnycd/ Q8jsUqYChTsfgUlbG5XloT4yx4Z+TOjPzU8VAU7h2n4CHuMUjruRrjsS7al7hmL7XT9dCI +UW6NMdMucmhJ+fDLrByQY7MUncddrI90dQA3AnQl2iZsXjfpUJcorhR+XVCZ8KfFBbVXt DwiuYgZb7oIoEsrMbNY3bea/r2oD5Or2rCcokxzOKR4x00qsLWo8pvS8HGC6gTkPItyN4f eobCpep7zHp9iYq5+1aZClZub0t18scBpdQeid0kXQNsp9tzOcdoOVhY099eyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwd6g5Kfrz1TM for ; Tue, 20 Jan 2026 19:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c744 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 19:43:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jose Luis Duran From: Ed Maste Subject: git: e5e98c244fe9 - stable/14 - openssh: blocklist: Use NetBSD probes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e5e98c244fe9889db7efb6789a2d0bd2ca1d151b Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 19:43:39 +0000 Message-Id: <696fdaeb.c744.1c6512bb@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e5e98c244fe9889db7efb6789a2d0bd2ca1d151b commit e5e98c244fe9889db7efb6789a2d0bd2ca1d151b Author: Jose Luis Duran AuthorDate: 2025-09-29 16:32:36 +0000 Commit: Ed Maste CommitDate: 2026-01-20 19:42:08 +0000 openssh: blocklist: Use NetBSD probes Use NetBSD probe locations for consistency. We have submitted all improved or missing probes, keeping them synchronized with NetBSD (our blocklist upstream) should simplify upgrades and maintenance, as the locations of these probes are a moving target, depending on upstream OpenSSH changes. Additionally, use BLACKLIST_AUTH_FAIL exclusively for now. At the time of this commit BLACKLIST_BAD_USER, is a no-op. However, it will change in a future upgrade. Also, enhance blacklist notification messages for better debugging by making them more descriptive. Reviewed by: emaste Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52749 (cherry picked from commit e02003bce726333872d65b7b9a1557d97b6d91a0) (cherry picked from commit 53dc967db74fba0d7b5bed413a7bc3216f16c55d) (cherry picked from commit 9c82c17c2a3ac61a69cb5337cb6f92ae88bc0b08) (cherry picked from commit 7161c525abffe6cdb19ac01223d058fcbabf49c5) --- crypto/openssh/auth-pam.c | 4 ++-- crypto/openssh/auth.c | 6 ++++-- crypto/openssh/auth2.c | 5 +---- crypto/openssh/monitor.c | 14 ++++++++++++-- crypto/openssh/packet.c | 2 -- crypto/openssh/sshd-session.c | 13 +++++++++---- 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/crypto/openssh/auth-pam.c b/crypto/openssh/auth-pam.c index f95f6abbcbe0..df08dbd99a9d 100644 --- a/crypto/openssh/auth-pam.c +++ b/crypto/openssh/auth-pam.c @@ -937,8 +937,8 @@ sshpam_query(void *ctx, char **name, char **info, sshbuf_free(buffer); return (0); } - BLACKLIST_NOTIFY(NULL, BLACKLIST_BAD_USER, - sshpam_authctxt->user); + BLACKLIST_NOTIFY(NULL, BLACKLIST_AUTH_FAIL, + "PAM illegal user"); error("PAM: %s for %s%.100s from %.100s", msg, sshpam_authctxt->valid ? "" : "illegal user ", sshpam_authctxt->user, sshpam_rhost); diff --git a/crypto/openssh/auth.c b/crypto/openssh/auth.c index 961082b76667..0a1c8f71b390 100644 --- a/crypto/openssh/auth.c +++ b/crypto/openssh/auth.c @@ -289,7 +289,8 @@ auth_log(struct ssh *ssh, int authenticated, int partial, else { authmsg = authenticated ? "Accepted" : "Failed"; if (authenticated) - BLACKLIST_NOTIFY(ssh, BLACKLIST_AUTH_OK, "ssh"); + BLACKLIST_NOTIFY(ssh, BLACKLIST_AUTH_OK, + "Authenticated"); } if ((extra = format_method_key(authctxt)) == NULL) { @@ -338,6 +339,7 @@ auth_maxtries_exceeded(struct ssh *ssh) { Authctxt *authctxt = (Authctxt *)ssh->authctxt; + BLACKLIST_NOTIFY(ssh, BLACKLIST_AUTH_FAIL, "Maximum attempts exceeded"); error("maximum authentication attempts exceeded for " "%s%.100s from %.200s port %d ssh2", authctxt->valid ? "" : "invalid user ", @@ -498,7 +500,7 @@ getpwnamallow(struct ssh *ssh, const char *user) aix_restoreauthdb(); #endif if (pw == NULL) { - BLACKLIST_NOTIFY(ssh, BLACKLIST_BAD_USER, user); + BLACKLIST_NOTIFY(ssh, BLACKLIST_AUTH_FAIL, "Invalid user"); logit("Invalid user %.100s from %.100s port %d", user, ssh_remote_ipaddr(ssh), ssh_remote_port(ssh)); #ifdef CUSTOM_FAILED_LOGIN diff --git a/crypto/openssh/auth2.c b/crypto/openssh/auth2.c index eac1d26a4aaf..82f6e6211259 100644 --- a/crypto/openssh/auth2.c +++ b/crypto/openssh/auth2.c @@ -52,7 +52,6 @@ #include "dispatch.h" #include "pathnames.h" #include "ssherr.h" -#include "blacklist_client.h" #ifdef GSSAPI #include "ssh-gss.h" #endif @@ -443,10 +442,8 @@ userauth_finish(struct ssh *ssh, int authenticated, const char *packet_method, } else { /* Allow initial try of "none" auth without failure penalty */ if (!partial && !authctxt->server_caused_failure && - (authctxt->attempt > 1 || strcmp(method, "none") != 0)) { + (authctxt->attempt > 1 || strcmp(method, "none") != 0)) authctxt->failures++; - BLACKLIST_NOTIFY(ssh, BLACKLIST_AUTH_FAIL, "ssh"); - } if (authctxt->failures >= options.max_authtries) { #ifdef SSH_AUDIT_EVENTS mm_audit_event(ssh, SSH_LOGIN_EXCEED_MAXTRIES); diff --git a/crypto/openssh/monitor.c b/crypto/openssh/monitor.c index 2179553d3401..b826ecdb9065 100644 --- a/crypto/openssh/monitor.c +++ b/crypto/openssh/monitor.c @@ -85,6 +85,8 @@ #include "misc.h" #include "servconf.h" #include "monitor.h" +#include "blacklist_client.h" + #ifdef GSSAPI #include "ssh-gss.h" #endif @@ -353,16 +355,24 @@ monitor_child_preauth(struct ssh *ssh, struct monitor *pmonitor) } } if (authctxt->failures > options.max_authtries) { + BLACKLIST_NOTIFY(ssh, BLACKLIST_AUTH_FAIL, + "Too many authentication attempts"); /* Shouldn't happen */ fatal_f("privsep child made too many authentication " "attempts"); } } - if (!authctxt->valid) + if (!authctxt->valid) { + BLACKLIST_NOTIFY(ssh, BLACKLIST_AUTH_FAIL, + "Authenticated invalid user"); fatal_f("authenticated invalid user"); - if (strcmp(auth_method, "unknown") == 0) + } + if (strcmp(auth_method, "unknown") == 0) { + BLACKLIST_NOTIFY(ssh, BLACKLIST_AUTH_FAIL, + "Authentication method name unknown"); fatal_f("authentication method name unknown"); + } debug_f("user %s authenticated by privileged process", authctxt->user); auth_attempted = 0; diff --git a/crypto/openssh/packet.c b/crypto/openssh/packet.c index cc114c837e31..9dea2cfc5188 100644 --- a/crypto/openssh/packet.c +++ b/crypto/openssh/packet.c @@ -96,7 +96,6 @@ #include "packet.h" #include "ssherr.h" #include "sshbuf.h" -#include "blacklist_client.h" #ifdef PACKET_DEBUG #define DBG(x) x @@ -2022,7 +2021,6 @@ sshpkt_vfatal(struct ssh *ssh, int r, const char *fmt, va_list ap) case SSH_ERR_NO_KEX_ALG_MATCH: case SSH_ERR_NO_HOSTKEY_ALG_MATCH: if (ssh->kex && ssh->kex->failed_choice) { - BLACKLIST_NOTIFY(ssh, BLACKLIST_AUTH_FAIL, "ssh"); ssh_packet_clear_keys(ssh); errno = oerrno; logdie("Unable to negotiate with %s: %s. " diff --git a/crypto/openssh/sshd-session.c b/crypto/openssh/sshd-session.c index 902718524279..5d677a1968d1 100644 --- a/crypto/openssh/sshd-session.c +++ b/crypto/openssh/sshd-session.c @@ -1201,6 +1201,8 @@ main(int ac, char **av) ssh_signal(SIGCHLD, SIG_DFL); ssh_signal(SIGINT, SIG_DFL); + BLACKLIST_INIT(); + /* * Register our connection. This turns encryption off because we do * not have a key. @@ -1277,8 +1279,10 @@ main(int ac, char **av) } if ((r = kex_exchange_identification(ssh, -1, - options.version_addendum)) != 0) + options.version_addendum)) != 0) { + BLACKLIST_NOTIFY(ssh, BLACKLIST_AUTH_FAIL, "Banner exchange"); sshpkt_fatal(ssh, r, "banner exchange"); + } ssh_packet_set_nonblocking(ssh); @@ -1298,8 +1302,6 @@ main(int ac, char **av) fatal("sshbuf_new loginmsg failed"); auth_debug_reset(); - BLACKLIST_INIT(); - if (privsep_preauth(ssh) != 1) fatal("privsep_preauth failed"); @@ -1425,7 +1427,10 @@ cleanup_exit(int i) audit_event(the_active_state, SSH_CONNECTION_ABANDON); #endif /* Override default fatal exit value when auth was attempted */ - if (i == 255 && auth_attempted) + if (i == 255 && auth_attempted) { + BLACKLIST_NOTIFY(the_active_state, BLACKLIST_AUTH_FAIL, + "Fatal exit"); _exit(EXIT_AUTH_ATTEMPTED); + } _exit(i); } From nobody Tue Jan 20 21:54:47 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwh201Gb8z6PCSf for ; Tue, 20 Jan 2026 21:54:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwh1z5tlTz47rj for ; Tue, 20 Jan 2026 21: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=1768946087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pnw0MbySWdCe3TVWR69+V2aMybB76qDbUG2lEMlJfso=; b=PnvyglKNkNw00lzDfe2+SMu8lSxB8Xrur3S/B2FWIPcc/DIVGkhoksVwVdZ9Lnj4mGekK8 XDb3qDlW3/LdAc2FmbT/Hw9XldQ/TB0NRvqjG/PGnjkm4Y0Q8H6Vc898/glyH2c4YKuywc 7rG3x2imyNq4Uo2kzHvzK/oKRJN+yDifCNEzf/y+tQefHlYA2WuCBPm2ztbJ7HCGYTvGyy 2XW4893hQkKWAPtmB8dJJSBu2ggWj9t/XC87KonWgWiInnOd2HCceftXBMFyv4d76ztPRg wmPb7w3QlLc1hhlfaWnVwsBMCKaGU0QVdkShumxsHnkIX8cnZGPbFw02vz8mzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768946087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pnw0MbySWdCe3TVWR69+V2aMybB76qDbUG2lEMlJfso=; b=R9css1iRZdANH6HdEhiUeO+yaUsEUvZx53WmIAURWU0bnshbEirJCs63LpSRCaVI2a5Mak XCp3+QXOz+JL1W7UJcPQyMA13W12JqWD0v3nh1h1lVUL8q73SgKZAWhB3jF/k4kZNItIpV cfSgMR1XzW7DKHFa6C79AsSwI2whok23RtDpKC3RzOFib3ZIxW6jdTTQZflSS/6x0pfhG6 Zt3qpEZxysQqHZ0vqO8mdhQ4D5LIeXJ9smaI2vX/YdkwJthp8JEM+6pR+xo/P85NzEQ23z yCso081yKWHSdb+dLXWhStZ0lqdG/wsJU2yo6y93eHHGiJ36srDOiAbCq4SuOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768946087; a=rsa-sha256; cv=none; b=SEaTCN3EXGejbzcd6o5cNRxTe7sh8XPeHF3uT7LusUoVVA4EdMNO+3OHwYu4f+3wCQaslt yIInpkQtayXIMzqA2GnvZaSl7BsriX6SjL2ojhXGWPda3itg/xWgQXzMqX8voV7/KEs7OK XQx6ACX/vzA/wBtBGIcHPCSglzUpDviyQV6I0UimW/ZdwA28WcrG9dPZSse+JssoAHpP2X mLrM0veKbERtP+fQ3aPO7Jv8CiE5qKW2+OTAckyLAB2tQmdJ9jgLrYI9+rHAJL9T9uFc7O 1jCFodkZm8hIB1DfZv8+PFWSSJV0LqxWuTWM3QVNuTOGrKwNMUIkP7JkVJGrKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwh1z555Rz4Wt for ; Tue, 20 Jan 2026 21:54:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3230c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 21:54:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 2c42d62fd3a1 - stable/15 - pf: fix min-ttl and set-tos for nat64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2c42d62fd3a19d02e86271f7e2ac55413775a7af Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 21:54:47 +0000 Message-Id: <696ff9a7.3230c.75aecbe2@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2c42d62fd3a19d02e86271f7e2ac55413775a7af commit 2c42d62fd3a19d02e86271f7e2ac55413775a7af Author: Kristof Provost AuthorDate: 2025-12-15 14:26:57 +0000 Commit: Kristof Provost CommitDate: 2026-01-20 19:08:31 +0000 pf: fix min-ttl and set-tos for nat64 If we have both af-to and min-ttl or set-tos on a single rule we didn't apply the new ttl or tos. That's because the scrub code still applied the change, but we subsequently create a new header for the new address family. That's done based on the ttl/tos saved in the struct pf_pdesc, which are the values from the incoming packet, before the scrub modification(s). Also update the struct pf_pdesc values when we update packets. Reported by: Marek Zarychta Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit cdbc9b76ff4901816b5ebdca5d0b7e9947a015cb) --- sys/netpfil/pf/pf_norm.c | 6 ++-- tests/sys/netpfil/pf/nat64.sh | 69 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index a684d778ab42..93d40641eb80 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -2232,14 +2232,14 @@ pf_scrub(struct pf_pdesc *pd) h->ip_ttl < pd->act.min_ttl) { u_int16_t ip_ttl = h->ip_ttl; - h->ip_ttl = pd->act.min_ttl; + pd->ttl = h->ip_ttl = pd->act.min_ttl; h->ip_sum = pf_cksum_fixup(h->ip_sum, ip_ttl, h->ip_ttl, 0); } #ifdef INET6 /* Enforce a minimum ttl, may cause endless packet loops */ if (pd->af == AF_INET6 && pd->act.min_ttl && h6->ip6_hlim < pd->act.min_ttl) - h6->ip6_hlim = pd->act.min_ttl; + pd->ttl = h6->ip6_hlim = pd->act.min_ttl; #endif /* INET6 */ /* Enforce tos */ if (pd->act.flags & PFSTATE_SETTOS) { @@ -2249,6 +2249,7 @@ pf_scrub(struct pf_pdesc *pd) ov = *(u_int16_t *)h; h->ip_tos = pd->act.set_tos | (h->ip_tos & IPTOS_ECN_MASK); + pd->tos = h->ip_tos & ~IPTOS_ECN_MASK; nv = *(u_int16_t *)h; h->ip_sum = pf_cksum_fixup(h->ip_sum, ov, nv, 0); @@ -2258,6 +2259,7 @@ pf_scrub(struct pf_pdesc *pd) case AF_INET6: h6->ip6_flow &= IPV6_FLOWLABEL_MASK | IPV6_VERSION_MASK; h6->ip6_flow |= htonl((pd->act.set_tos | IPV6_ECN(h6)) << 20); + pd->tos = IPV6_DSCP(h6); break; #endif /* INET6 */ } diff --git a/tests/sys/netpfil/pf/nat64.sh b/tests/sys/netpfil/pf/nat64.sh index 6631e3eca2c7..e2a87a6eee40 100644 --- a/tests/sys/netpfil/pf/nat64.sh +++ b/tests/sys/netpfil/pf/nat64.sh @@ -1179,6 +1179,74 @@ v6_gateway_cleanup() pft_cleanup } +atf_test_case "scrub_min_ttl" "cleanup" +scrub_min_ttl_head() +{ + atf_set descr 'Ensure scrub min-ttl applies to nat64 traffic' + atf_set require.user root +} + +scrub_min_ttl_body() +{ + pft_init + + epair=$(vnet_mkepair) + epair_link=$(vnet_mkepair) + epair_link_two=$(vnet_mkepair) + + ifconfig ${epair}a inet6 2001:db8::2/64 up no_dad + route -6 add default 2001:db8::1 + + vnet_mkjail rtr ${epair}b ${epair_link}a + jexec rtr ifconfig ${epair}b inet6 2001:db8::1/64 up no_dad + jexec rtr ifconfig ${epair_link}a 192.0.2.1/24 up + jexec rtr route add default 192.0.2.2 + + vnet_mkjail rtr2 ${epair_link}b ${epair_link_two}a + jexec rtr2 ifconfig ${epair_link}b 192.0.2.2/24 up + jexec rtr2 ifconfig ${epair_link_two}a 198.51.100.2/24 up + jexec rtr2 sysctl net.inet.ip.forwarding=1 + + vnet_mkjail dst ${epair_link_two}b + jexec dst ifconfig ${epair_link_two}b 198.51.100.1/24 up + jexec dst route add default 198.51.100.2 + + # Sanity checks + atf_check -s exit:0 -o ignore \ + ping6 -c 1 2001:db8::1 + atf_check -s exit:0 -o ignore \ + jexec rtr ping -c 1 192.0.2.2 + atf_check -s exit:0 -o ignore \ + jexec rtr ping -c 1 198.51.100.2 + atf_check -s exit:0 -o ignore \ + jexec rtr ping -c 1 198.51.100.1 + + jexec rtr pfctl -e + pft_set_rules rtr \ + "pass" \ + "pass in on ${epair}b inet6 from any to 64:ff9b::/96 af-to inet from (${epair_link}a)" + + # Ping works with a normal TTL + atf_check -s exit:0 -o ignore \ + ping6 -c 1 64:ff9b::198.51.100.1 + + # If we set a TTL of two the packet gets dropped + atf_check -s exit:2 -o ignore \ + ping6 -c 1 -m 2 64:ff9b::198.51.100.1 + + # But if we have pf enforce a minimum ttl of 10 the ping does pass + pft_set_rules rtr \ + "pass" \ + "pass in on ${epair}b inet6 from any to 64:ff9b::/96 af-to inet from (${epair_link}a) scrub (min-ttl 10)" + atf_check -s exit:0 -o ignore \ + ping6 -c 1 -m 2 64:ff9b::198.51.100.1 +} + +scub_min_ttl_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "icmp_echo_in" @@ -1206,4 +1274,5 @@ atf_init_test_cases() atf_add_test_case "route_to" atf_add_test_case "reply_to" atf_add_test_case "v6_gateway" + atf_add_test_case "scrub_min_ttl" } From nobody Tue Jan 20 22:31:44 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwhrc3zN6z6PFGX for ; Tue, 20 Jan 2026 22:31: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwhrc1ZFCz4CbQ for ; Tue, 20 Jan 2026 22:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768948304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hvxHyKYusUgC8tPuDBf546jyy24KOuudSk+Kd66JKJ4=; b=RXlOBFlLnzza4+BGe3kAlB+EbpNIU7sYFkDSW0ZM1MkmkTyTYkHUUHJLXi/mlTkeqKGSbb 63J7qHP7V0KTdiJW1bikhA0QCaMVd0YUk0yWR4hOs6/T0t8R9acoz2ryqvazJ4VU9f407P s/jQKeFdFQQdOHHMS898RqshBiVKW6G3YQC9CuWnzg12FkNLMjSlPVfhWp2MMmXhmQI5iM WDjbdEQIR22YF0LXbETByOU/DTaQur06RMdcf+HlbidHrMt1FHN/rlgC44Mwj4TmfbCCWE CSYVEK/DjEuyd2rq3Ohb/3RLRgxqYDgw1P6s2+WpHYzqibpaoNzuWK+PocKHkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768948304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hvxHyKYusUgC8tPuDBf546jyy24KOuudSk+Kd66JKJ4=; b=oGQm6nZZUsjmc/3yTt97VIvyxQ9hLteWjEe5P32IyYqbL5ZeiPohX9Su3q9AXvvPxVeI9M J5XCJHObrOGrEnwbqzYE8c0pCDQebfDtbZukTNQGMFb/SQGuUAKxPdVbb87CuC//2JfUMI 0IJDeq2bDzendyPyGtBO2gZntB9BRD5koFg6iDO/gwWszBij8DzKRxS8X4QcQtfWHNuZNR qjfw4rE33J/JCrAum9Z1IVbfRrsz7AzM89i+dcin1MdJtzXP3Eaq2km2SBjXnfKqznMe7u 3HhV80YuHEaATXO+6NRkPsFlCWuvKTBKLm+lI1yih+qt+3eSqxaWMEoA/acBcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768948304; a=rsa-sha256; cv=none; b=CN0NXOvZIN8jhS4MYO/nxkzLZD6/HKo9A2Zmjs6xnRfnHHiHoZYteaf96417HM3FisLJfY RS/qlv0tGwBCWj++suKHeTw0rCqMtdCmHUmal+GHWwxi9qUOg9S885qpf2Ro+mQZNyYCVb B0js4qjXB/9rtzGFIEk6kBgFgINiP5YM/21j6TqwkMywaU+PPZrqp8itIbDZn315/0/OHL f7V9cdIfn+dhdsRZh+uSE9K6ar9Yr3tMrOYYsuaDrwlqi+vgiRu22up5MNXgF8WGFmqPS7 Mf5fBTZBmu5v1EutovsZg8RPoEjfXxLXOm9T+0KyK0M7cVd2uUTfSAGHionq0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwhrc0yZJz5Qr for ; Tue, 20 Jan 2026 22:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 351b7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 22:31:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: b6533f67c399 - stable/15 - fusefs: Fix further intermittency in the BadServer.ShortWrite test case List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b6533f67c3990dd7db5b37625730db83bf2adc18 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 22:31:44 +0000 Message-Id: <69700250.351b7.1398e01e@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=b6533f67c3990dd7db5b37625730db83bf2adc18 commit b6533f67c3990dd7db5b37625730db83bf2adc18 Author: Alan Somers AuthorDate: 2025-12-21 15:32:31 +0000 Commit: Alan Somers CommitDate: 2026-01-20 22:31:30 +0000 fusefs: Fix further intermittency in the BadServer.ShortWrite test case After being unmounted, the mockfs server would occasionally read from /dev/fuse again, if the main function didn't exit fast enough, getting an ENODEV error. Handle that appropriately. Reported by: Siva Mahadevan Fixes: d86025c1d49c84c4dc8c3635c83c078ad56e5a53 Reviewed by: Siva Mahadevan Differential Revision: https://reviews.freebsd.org/D54331 (cherry picked from commit f51e9d0e0988df58c94db586ab5c8b5fd091c004) --- tests/sys/fs/fusefs/mockfs.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/sys/fs/fusefs/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index b6a32d9b60af..a377ba832ef5 100644 --- a/tests/sys/fs/fusefs/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc @@ -980,7 +980,11 @@ void MockFS::read_request(mockfs_buf_in &in, ssize_t &res) { } res = read(m_fuse_fd, &in, sizeof(in)); - if (res < 0 && errno != EBADF && !m_quit && !m_expect_unmount) { + if (res < 0 && errno == ENODEV && m_expect_unmount) { + /* The kernel unmounted us, as expected. */ + m_quit = true; + } + if (res < 0 && errno != EBADF && !m_quit) { m_quit = true; FAIL() << "read: " << strerror(errno); } From nobody Tue Jan 20 22:31:45 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwhrd51XVz6PFJb for ; Tue, 20 Jan 2026 22:31: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwhrd35x4z4CdQ for ; Tue, 20 Jan 2026 22:31:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768948305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BKfuRX7/ws0hrypyZOdJ61gTzgHyGauMuvl6E8mexio=; b=XORJ8CLRwaZWyZI2HZbXmYk4JH898akT15Q2VDZjlt8phZUgIKOWdTh4Az+axac88gtCzG jD2u8SZrxSVzzw4BdamSHnOijsLABqnEp8ZgkFAPMsfaJYoBsf6sZF4Z86ZjM9sOdRpSCU 2Wu3A6nMwtyepz3hoU5M8Lhgv9fGYFPjgUVVp+Cd+95Wql7wWbR7E4BP4JtkdyT6GxuGNu u9f2u7mjNHsNYyEXkyi7EfnxxeL+ahWBzM6RUseM2QeCmMYNmAwSbyzlOYrkmuoQq782j6 o+4w98EEavsXoJgsDWPk+v5cxOEu1xPok7YS1pkz99fGywBGSLfk2XhBuxEsvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768948305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BKfuRX7/ws0hrypyZOdJ61gTzgHyGauMuvl6E8mexio=; b=GUri6VkzkEJEjIqIOeV7gC3uL6gzZ/OwcMlkk+DEBNmDXRDGQ5NQO6jc77wJYAs+aq2LnU vYXz9Ybf9ea8bufpmh158eIyyfkF1weCEShmx1l7vQeOuevnWxZWTMybf84kqRavttInVJ dNWxXHJ6gOuZQhpebaVjLRpBLrj/yNsM1BPvxYpdJhz4PvAPHnR3nJDN2qNx1ypJY44c4t SPWRijySSO/Awt5RAFZp6P5FhAaMXF0k/lYa669FmM0+JYTeTVjtWyTZo+7jquPDNvYxF6 S7w/JLJcGq92zHIQym5Bwd1VVUfURR22vUgYC2bTuByh8zMEdLtWMLAIIYkf6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768948305; a=rsa-sha256; cv=none; b=h96+SoIIKx0rnxFmILVTDdJwXiVi6HFQn1OGM+yxZ4b0ySp1o0cwSV1UMZHGeEzjnSzSC+ dYAnQZ8WQkqFQVpPP0XPKHur66qvv6eAICbURoK8eQe+jqXIKmFowi9AcWKmNafYL4UFKO 9ReZMdf4+3qFoXtkA/6eFh//X0uDJHBQHlLHd4yeaFiRhXwFtRgoRqPdUZsnYpw3islfEy 3kNEgdA47H5ydF6maLUmEVILmUXWNStFErBJo8pauDMp+ZeiyREV0Dbajk0O7/NV68Gr6L 2b+9vKE9bpeYzDPjWCf1SrIpC11U9Py1lVFIXsei+xsQVOht3hRsAsF2IL77NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwhrd22rBz5hf for ; Tue, 20 Jan 2026 22:31:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35058 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 22:31:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 1ad466ca8385 - stable/15 - netstat: fix a segfault with --libxo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1ad466ca83852694d7ecee441dc94faf61c27bd4 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 22:31:45 +0000 Message-Id: <69700251.35058.aba5ed1@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=1ad466ca83852694d7ecee441dc94faf61c27bd4 commit 1ad466ca83852694d7ecee441dc94faf61c27bd4 Author: Alan Somers AuthorDate: 2026-01-06 22:19:57 +0000 Commit: Alan Somers CommitDate: 2026-01-20 22:31:30 +0000 netstat: fix a segfault with --libxo Fix a segfault when printing the "protocol" field. The field-format and encoding-format were expecting different numbers of arguments. Also, fix the width of the tcp-state field in encoded output. PR: 292228 Fixes: c2b08c13c20 netstat: add support for UDP-Lite endpoints Sponsored by: ConnectWise Reviewed by: tuexen, js, des Differential Revision: https://reviews.freebsd.org/D54567 (cherry picked from commit 3b6615ec0332f901fcc9e9307f78717424f09c1e) --- usr.bin/netstat/inet.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index 1435de95613c..ddc9a2fdd2f4 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -394,11 +394,10 @@ protopr(u_long off, const char *name, int af1, int proto) if (istcp && (tp->t_flags & TF_TOE) != 0) xo_emit("{:protocol/%-3.3s%-6.6s/%s%s} ", "toe", vchar); else { - int len; + int l = max (2, 9 - strlen(name)); - len = max (2, 9 - strlen(name)); - xo_emit("{:protocol/%.7s%-*.*s/%s%s} ", name, len, len, - vchar); + xo_emit("{d:protocol/%.7s%-*.*s} ", name, l, l, vchar); + xo_emit("{e:protocol/%s%s}", name, vchar); } if (Lflag) { char buf1[33]; @@ -523,9 +522,9 @@ protopr(u_long off, const char *name, int af1, int proto) } if (istcp && !Lflag && !xflag && !Tflag && !Rflag) { if (tp->t_state < 0 || tp->t_state >= TCP_NSTATES) - xo_emit("{:tcp-state/%-11d}", tp->t_state); + xo_emit("{:tcp-state/%-11d/%d}", tp->t_state); else { - xo_emit("{:tcp-state/%-11s}", + xo_emit("{:tcp-state/%-11s/%s}", tcpstates[tp->t_state]); #if defined(TF_NEEDSYN) && defined(TF_NEEDFIN) /* Show T/TCP `hidden state' */ From nobody Tue Jan 20 22:31:43 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwhrh33y4z6PFJc for ; Tue, 20 Jan 2026 22:31:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwhrh1MHWz4CYQ for ; Tue, 20 Jan 2026 22:31:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768948308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a6mcLWGaoantFxS8hkFEc9qw63Fno8YhMxr0mfTLSRQ=; b=aCrIls/tKn6tPnDuKSRVQreZM/Dm7tTFClctEWPF+dsBXJUZhstiiaR9cViRjiAU8Luzpg Fx3O5yyPWZEGcoPMzVtwJ7haqYEQohCx5h8gxNsdzVZhkO8LW6ZAzNpzY4B9BDi71DSoXT tJypROK1FOAbEprxBHAtNhvenHbccbUK8AZpH0bSqKdGOD/IU7/Q3KvMlKxqs/T9aSut/g nn2CgHKgmWIgScLsIEeNIEj2vVd18gNOG3XHmUswwCO6E/k8wP+k8bPGAr28rg6eJ/r8Xz uFG3eQGpCtb5euP3d2Mo2Deqrq7sxeHVBeBeTNk6UEgk7K/eA4TWvM7DXFHNYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768948308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a6mcLWGaoantFxS8hkFEc9qw63Fno8YhMxr0mfTLSRQ=; b=D/wi9/EzFFhsuYcdjR+GlFeJm+2LGkSytXNk4H1VhbumB+rCwmVGod3IXkjFAjuCQ/jaVo 2np9vidU6GPQ9wrekahhb6jLuod4FjGzBL14YSnPn/CpyrU50gt3+XvQNMmJ7S3dHLIwUj 3Z02dWbFNFR2di+nKKxDerE0QqqnyoCdKe80GqBrYN2xHqzXZEFUQ/yFI3evuXpoZ7IE2S is5m8WEemfd83zhGZxmR6mNL+8fRCP4n5dQylflu9K4dqHIABwvikWnYr3fwpoeBfgJQZH KTxgjZKxvi25SGDo/ZEaQNo9R4NP4EUvwqfG2REmkizIz2HP3r2BM/MK1nW6MQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768948308; a=rsa-sha256; cv=none; b=e5kW3JzYHQ6n8CJ7rWf+MmYkFhdqqm4dOT9ljZYoc8+a5nyowEz3reINn+BQ+hPHDkiVoy V66LoHXOZj8rEie5HHm3FR5KroYMWCDPZZmFdGKRpjMed7EtBg1lHWF5MyCUvqlM6CDTwc 0ayO2dEKJ7nU1fOaIJ7o7sKznDMlyK6U9PrGmTc2o9JdQebAVH1Nav8dU4VZyazErN0mAQ mu8BaVPl+alSOjwa5kkVmDyZ8znIRnS9+ZytdZlhxo/UUny1E45CuF6UD8qzVnVJeYrLEd dy5HRTnTZ+gU1XGq38QtPshyoTT7S4/RmqycH2+nhZ3br3YGi6wKIGbYOUJfVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwhrh06fhz5Qv for ; Tue, 20 Jan 2026 22:31:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 350d0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 22:31:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 46a760e578f5 - stable/15 - gpart: "gpart --libxo:JP list" duplicates attribute keys List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 46a760e578f553d54c2e2ef6b295d3e9c71bd558 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 22:31:43 +0000 Message-Id: <6970024f.350d0.549a2fd3@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=46a760e578f553d54c2e2ef6b295d3e9c71bd558 commit 46a760e578f553d54c2e2ef6b295d3e9c71bd558 Author: Alan Somers AuthorDate: 2025-12-05 16:16:53 +0000 Commit: Alan Somers CommitDate: 2026-01-20 22:31:29 +0000 gpart: "gpart --libxo:JP list" duplicates attribute keys Add leaf-list modifier to attrib as it's possible to have multiple attributes on a gpart provider. I purposely made it so that the normal output still says "attrib:" just so we don't break any scripts people may be using to parse the output, but the libxo output now says "attribute" just like `gpart show` will do once https://reviews.freebsd.org/D53950 is merged. PR: 291377 Reviewed by: asomers Sponsored by: ConnectWise Differential Revision: https://reviews.freebsd.org/D54080 (cherry picked from commit a0347b0f3a6088872c29eddb85154478d543dffb) --- sbin/geom/core/geom.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c index 51ea52a3e858..a1b1b351ebb3 100644 --- a/sbin/geom/core/geom.c +++ b/sbin/geom/core/geom.c @@ -912,8 +912,12 @@ list_one_provider(struct gprovider *pp, const char *padding) } xo_emit("{P:/%s}{Lcw:Mode}{:mode}\n", padding, pp->lg_mode); LIST_FOREACH(conf, &pp->lg_config, lg_config) { - xo_emit("{P:/%s}{Lcwa:}{a:}\n", padding, conf->lg_name, - conf->lg_name, conf->lg_val ? conf->lg_val : ""); + if (strcmp(conf->lg_name, "attrib") != 0) + xo_emit("{P:/%s}{Lcwa:}{a:}\n", padding, conf->lg_name, + conf->lg_name, conf->lg_val ? conf->lg_val : ""); + else + xo_emit("{P:/%s}{Lcw:attrib}{l:attribute}\n", padding, + conf->lg_val ? conf->lg_val : ""); } } From nobody Wed Jan 21 01:53:33 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwnKT4RpNz6PSRM for ; Wed, 21 Jan 2026 01:53: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwnKT3jGdz3DWN for ; Wed, 21 Jan 2026 01:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768960413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9JD3QkZqEN6n90trmxGF3UH1u0eFc8b8ADeKhlR2edk=; b=Xde3/cCBFYxWZbhrlNHgE0Pg7YJ+khBPqzv9wAHJWPnOPs4D6X+JaVoOXxZxbvM5AYO1nn 76oTzIZXlurQ+Bsgialk7h+vUvgTV5sR8NVsxqNxoY9wBpHSFE2PJHE4EA8PGb1u2dkDH9 da404AptsUG5BdzZ6NZHHzTbAd0mMGmqhHdca0xpVN4TL7J6PAY4Kfe+Ujwy52hB6vfTel QIQ/82ftLkMLiwUOfstIXRCixXDowfn2UJfj0hJb/rLlHiKZK7j9qaCwxm4/0TzvOq3nwf ogRmHYhMLjkNku6PuKVExl1USjCeEciUDWOw+ZTiNlSfLLk94c/ZfjINIlVBOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768960413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9JD3QkZqEN6n90trmxGF3UH1u0eFc8b8ADeKhlR2edk=; b=ZJknfHTULlhrQ6/eJ3/3HiUcI/3MvSj6X4Wx83K0Xr6Pn28Mwbf0HHVUflXTtXngoGzmM7 nN5JjnhjdYPwYCipe0wLURB6JoRKikrmwVef/+aoq3sAvybX3O6Qdc5C9nd67T/vyFssvU MhWVphv6dpFxB+g+EW/r3EjBPB9Vwml8qIGBqrHLEyqbJCOkkRKcoe0TqxsgFzosH/u57j xd0mdXEKUOZ0/eHQhnmyC5yYhFdWul8hFKDk6HTEEzAg2u2BSrxxEjpB0Ten7VM5CmkLJ+ mnxMba7Qg5i7z+TST5oPtPPdn+wJ2zQTbzjBaI8E1pfpfqeIFUHQFOVcm8uPBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768960413; a=rsa-sha256; cv=none; b=EQc2szU1XaN9kV1Z66L0BjKXwEAEFU9D2dj6hVwV7ztu7ebqrLrzuIQJHy0OiT20MGBfb4 wSEJyk5mLhbtrbO7iiQ1MeDi2SSWRiQ2mSgtniTLSsasGK5b2Na5OI70/MRWkg23V+FvPH 5wWdpBO0e/LRpafWj09KkiL0/RlP3Tww1ebYHH2Mghldue9sLfa4gkr5WjDwsOfXvy2PBM PWk93BSYq7CVaejt4wzr/c18huRKsnkv5tV1tUvWpretecNmTf+dqURkVp/18W7++l0oCu hzKm7IcmlVoc9pE1nwauEjFdNmBZIIgVjWZH84lb+gBYYPczjP3aOXHTdb89nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwnKT34LJzBfB for ; Wed, 21 Jan 2026 01:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 220f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 01:53:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 27bf077ab3a5 - stable/15 - gdb: Add missing mtree debug entry List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 27bf077ab3a5487b20a1104e2584873898b2c9e7 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 01:53:33 +0000 Message-Id: <6970319d.220f7.66784db6@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=27bf077ab3a5487b20a1104e2584873898b2c9e7 commit 27bf077ab3a5487b20a1104e2584873898b2c9e7 Author: Jose Luis Duran AuthorDate: 2026-01-14 14:27:51 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-21 01:50:01 +0000 gdb: Add missing mtree debug entry Reviewed by: markj Fixes: ea675a43f09b ("libexec/kgdb: Add new modules and install them together with debug info") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54680 (cherry picked from commit 0d9fd06b03e06ae642fa54510473b15361034a54) --- etc/mtree/BSD.debug.dist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist index a75edff4f865..8959b281f578 100644 --- a/etc/mtree/BSD.debug.dist +++ b/etc/mtree/BSD.debug.dist @@ -9,6 +9,8 @@ .. boot kernel + gdb + .. .. modules .. From nobody Wed Jan 21 01:53:34 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwnKV5G33z6PSRR for ; Wed, 21 Jan 2026 01:53: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwnKV4DtPz3Dq5 for ; Wed, 21 Jan 2026 01:53:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768960414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6qqC4/1fvgoj7Q2vFtOi6CTSFz3XXQVpQyyFfFX35RU=; b=tQGRGkhpuM8Z1vBYLMIs0iKfY4JHpTQnTqjl/+ImMUYUuoWW80o8nXWEg35SRy5nAEF8To /A9/Kstm6WDaWYMaOJbxlCAD9eb+g0ifo0UjbAqfdUp6gf4bqHgEQ2Yta5DKK0tApKjNP3 6FGnTF2XkeaKp1NdaUwjKdwvQ2+zNsCvEbGtEr8NC46Wq4FsC77ArjWSZ1OxJvFY8uvN/7 cUDo5OJqENAk1qZ3dYyBiDaJiuTnCQAvuH2CEKaVLcZ/TOOtcr7R73mqKzaJW7VRh6Ti1s vZPxbPPqi8mFBOxsqmHPHt4cAU9i9xHZ5X+KbO4/SDPaJ7c/nS2siJA8s7B4uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768960414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6qqC4/1fvgoj7Q2vFtOi6CTSFz3XXQVpQyyFfFX35RU=; b=HCRXriUh/jJRjC9+I+NbyRPrVQwoKhbHvHaQZsCNG4GNPsaHP3XrwIj1yBZH+WOa3HLE6c OYVqtnmKSo5aXpTzmtngXMy1leCGCH/IiMuoSkQ9Th1l2BPB9rUhTzVeNSbt5JPG6cyVod aFjpEsMqlopGtwx7uO28rCMNLOAfdiRpwUa7PBpcnX0Emoy64SNsZKiPqqYEaD1PjQixR9 sKly9Z0dEhzqquPz7VMl0woxPdQcg895l4rPhYG/tJtffJLa/VbvCwMRxCEZ5tcbJ8nq/d 4d1C3YmEVEJYLGFBCz5TnfxMbt7ScQ4nG0N6k7qk/W1hA5il5oh1+o7Fi+eSOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768960414; a=rsa-sha256; cv=none; b=inAxX9CkWcPBSaM0TU1ZPZX3xWyiLCrJhtnlY9jRy3uAAcVMvUNGZyZe84RNJm5P5o/4hT GsBC1siudJxQNt7XFsLWCx8542Mf3WNQ2SozMtSjz9WY9zCZkLaFoQDENXwLlNzbVahE4C azAkJy8QpP+j7iEW1j5xAW3FQ0IH5ZxzjKwvkgevu53gALsWwgTs33DPoiJvZIjSEQp5K7 BXcq2ibvM5jDzdJCg9VtlmRYAlUo2xM3qknLxnnZf6sDQx9pqIMNUkPXRS4ZwAM5HQgVtq ytAYzP0ywx7s9URe+LJAz89PTCUbAOMpB6/5A1Nj1S2pLTyGOIO32F10luMUJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwnKV3rZCzC3t for ; Wed, 21 Jan 2026 01:53:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f7d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 01:53:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 9f90e5a3ce9d - stable/15 - libexecinfo: tests: Expect failure on aarch64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9f90e5a3ce9d4adc0cb02ebde832a8fd51f0a6bb Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 01:53:34 +0000 Message-Id: <6970319e.f7d7.7c449cee@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=9f90e5a3ce9d4adc0cb02ebde832a8fd51f0a6bb commit 9f90e5a3ce9d4adc0cb02ebde832a8fd51f0a6bb Author: Jose Luis Duran AuthorDate: 2026-01-14 17:06:14 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-21 01:50:39 +0000 libexecinfo: tests: Expect failure on aarch64 Add a guard that expects a failure of the test on aarch64. Reviewed by: emaste Fixes: df1ea5887326 ("tests: Test libexecinfo backtrace call througth signal trampoline") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54675 (cherry picked from commit fef84fd8ae845e19cec0f6b9aac0e6451cca3d7a) --- lib/libexecinfo/tests/sigtramp_test.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/libexecinfo/tests/sigtramp_test.c b/lib/libexecinfo/tests/sigtramp_test.c index a4943d8d7f4f..5dead9a4146b 100644 --- a/lib/libexecinfo/tests/sigtramp_test.c +++ b/lib/libexecinfo/tests/sigtramp_test.c @@ -45,6 +45,14 @@ handler(int signum __unused) ATF_TC_WITHOUT_HEAD(test_backtrace_sigtramp); ATF_TC_BODY(test_backtrace_sigtramp, tc) { +#if defined(__aarch64__) + /* + * https://reviews.llvm.org is deprecated and + * this review is never going to be updated or completed + */ + atf_tc_expect_fail("https://reviews.llvm.org/D155066"); +#endif + struct sigaction act; pid_t child; int status; From nobody Wed Jan 21 01:53:53 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwnKs6S58z6PSx2 for ; Wed, 21 Jan 2026 01:53: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwnKs3cvHz3F6Y for ; Wed, 21 Jan 2026 01:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768960433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8MQv8yhhNP5Kl2zW6nHYkKjx/+CDk21ZUi/Q5oSlwwk=; b=UXiv0Q2mjuEi8sJhppJLdvCSps6UKD9VN6hRsWTo6sjjVzkQgQ8ZwbuXbrtMO0WCrKk4oU wcRWr543MFv8/MQ7y75tBjFhFDlp9oQVXSOCTefMfBaK0sHEwRgRfh2AQjLp3zngpJyc3l 1dH200y6MAEnucuLVdGulOIWjxngJoXtaUDNsSn5tOGWhgAlT0+5Isdjmx10e1J0PhDDxO PvlUmPgBiL1OlrvTKK3BVwTINnklmrryHiU9wDs3jL555D38Y7/GCg6G6KrTbnA2RYVDg1 Wccf0bXP4LPT9i3klIZXN600OCMJbmmlu0SHAyUQ3K+eqVEOcv3jv+kcCXK9iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768960433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8MQv8yhhNP5Kl2zW6nHYkKjx/+CDk21ZUi/Q5oSlwwk=; b=LstaRnCP4oXsIX2SP8jVcJ1ymSvU7kV8SvbkUA3VB7WAoRaW/GbxQm+KI+cshnAIlKuPB0 jLqUEdi73akTriESycnaDUIouAHbEphqyF+W9353FykYbXFUmWKou2C+k428wg3IqcwBLN GK1ooUSjhsbxWGoqIKyDOredAyYvhcseIwxUn5hki9GlSc0VdjeZ4cx2OilH9NjYfmmgs/ kX8imMGys7H+FqDk26VJYyETv5Yo9kMndO5orOQzNevRO4ZkT9O4C32JmSnX6m1S+NSOri I5cC/gkzEhUoe9hXk8wLzaeDr5YNtkEjKjQC8C0wCpVvNZC/3B61UOhXVvk9Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768960433; a=rsa-sha256; cv=none; b=oCfRMGwh/CTv+3AS2jwaoo7auRqO+gdyNJPVkjA4XWsA9aLivf2iRI0jT76Y/vFF+BYizl mnmuouFxEyrF+ff5z/0HsXNDD89luNuJ1PDC82FmE1j2ZxYXWUqES9tdyqADBpkIkIRCpd ziTio5MJdp6Z4RtU2/8YMc0gxLYC+n1feS5oDjDz8bo1fd8vws9uX3P3RUpom+51RQRRXf 3UIEXgDOK+RUCBpBXVaz/F7j5Dbsq7CzMUV6nEA5VH7xsGT6rhj5ZTfvgNuA6f0zo0NYUs HEONSNsjZnCWL2xQr4OCv2uOHH3pEy/FUkFzn6edbt3C6MUaLiZBJZ/WGstWlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwnKs2v3BzBJr for ; Wed, 21 Jan 2026 01:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f858 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 01:53:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 8e49c6c84cae - stable/14 - libexecinfo: tests: Expect failure on aarch64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8e49c6c84cae980196b10886290e0c87c711cfdb Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 01:53:53 +0000 Message-Id: <697031b1.f858.6f42b67a@gitrepo.freebsd.org> The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=8e49c6c84cae980196b10886290e0c87c711cfdb commit 8e49c6c84cae980196b10886290e0c87c711cfdb Author: Jose Luis Duran AuthorDate: 2026-01-14 17:06:14 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-21 01:51:35 +0000 libexecinfo: tests: Expect failure on aarch64 Add a guard that expects a failure of the test on aarch64. Reviewed by: emaste Fixes: df1ea5887326 ("tests: Test libexecinfo backtrace call througth signal trampoline") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54675 (cherry picked from commit fef84fd8ae845e19cec0f6b9aac0e6451cca3d7a) --- lib/libexecinfo/tests/sigtramp_test.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/libexecinfo/tests/sigtramp_test.c b/lib/libexecinfo/tests/sigtramp_test.c index b8eecfddf43d..ab90f49c24a5 100644 --- a/lib/libexecinfo/tests/sigtramp_test.c +++ b/lib/libexecinfo/tests/sigtramp_test.c @@ -45,6 +45,14 @@ handler(int signum __unused) ATF_TC_WITHOUT_HEAD(test_backtrace_sigtramp); ATF_TC_BODY(test_backtrace_sigtramp, tc) { +#if defined(__aarch64__) + /* + * https://reviews.llvm.org is deprecated and + * this review is never going to be updated or completed + */ + atf_tc_expect_fail("https://reviews.llvm.org/D155066"); +#endif + struct sigaction act; pid_t child; int status; From nobody Wed Jan 21 12:36:41 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx3bY5GkXz6P84P for ; Wed, 21 Jan 2026 12:36: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx3bY4lGFz3FDw for ; Wed, 21 Jan 2026 12:36:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=186XnWuMPA2aFDOGJyvB9GkH0zLqo4eU1WbW3IGcBhI=; b=GtyyOCNEUdbBTjYNeFWk48MqcUDI6luxUyQLvILLCh/SXK/i7jWWIfFe+R3Av8H3bJOdGI mI4WTDtGWZAczQGivtu/pqf/fVUxOpPscQ/Ziezy5NnOOu2OlCTBh3TW0u9X5u0S3OLPEk unonxZfQSuJi14STjsL+aT5zd7J6fNBiiZvMyDrpk/WN7DuJEmaVfmcscr/06yBklBlLjo hgAm9x8EwHl7ranL4fmhFLCJK8Ku4Vpq8vsTjtdDz84KUt0E+Zlfq6UI9JVuG3TWUw6K1r kPjtJnsk1RZ0GmpYKtlT4QWkbmqb2VEWuaR9S9lxBeQc+obCBLi541GAEvHGNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=186XnWuMPA2aFDOGJyvB9GkH0zLqo4eU1WbW3IGcBhI=; b=qsG2mOdggooQLDFJrPYmetAKvW/RT2apxwjuiRbSA7sW2FAsKysnX/Yl1xGJ3IVDLjPcFg cF/icNEjlg1yhlu7bsZZoUjiGMheKFSHTpUho8Xoov6uwpESoJLkxe3acyPQoIEQH4HQpz LACkaU5GwD3G1P54RYAeHcNiQG3PinFzBrGmcJhHG40Z1Qq9zs3Axf9GJK12pBhSdWRoPz j3mAVzJRHUgtb6izyshUyyifGwprg+cc00yeWkZzDHmBS5UZO1nK2/tgIXwg08SFfpqrus vPlhs3kaJSj0C3+HxL9CIXOrvIXTqGszouePqk6pEqeb9HmGx7VNLTpt0vTdew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768999001; a=rsa-sha256; cv=none; b=ZHYMixP93u8cTuPUKCpwM/T7pcRksjUA1/5tQ0EP9DG+yYOCvwJfSlvZ3eNFcJvktsSEZ2 l5RuxyKjRfA7QKnWmomPuMAKUPoptqCGA10Y2Qt6UWaYZQCWPeQW6Jf1aN+vTyyfx3hzc6 RTqWJd+cShv9LjmbUjwwSac4Bpg3vIdhRuS3D3xQIvAO+FJ9UlVNQ5aK7X6kgs6ErCOs2c tSe3HF2uDupVb/RWQ1ajDtZ7VK5eCazyOS4Rpds+IoBmti/F5A1fWn6fKxZJF53aLl3Xwm MJUWCCaS1E0IvYfXRniiGXx9aPvykXC4DN+Zey1mAvieu7QLTAxEtD/SlDCGrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx3bY3zSyznhG for ; Wed, 21 Jan 2026 12:36:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 913d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 12:36:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 21f6087286c6 - stable/14 - vtnet: define flags in a consistent way List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 21f6087286c682c799c1c575d780e50a81a5ff2a Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 12:36:41 +0000 Message-Id: <6970c859.913d.7b16fcbc@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=21f6087286c682c799c1c575d780e50a81a5ff2a commit 21f6087286c682c799c1c575d780e50a81a5ff2a Author: Michael Tuexen AuthorDate: 2025-12-18 12:41:29 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 12:34:31 +0000 vtnet: define flags in a consistent way This allows adding flags in the upper 32 bits in a consistent way. No functional change intended. (cherry picked from commit e0c6c4ecfc755b78ac9135033053d2f15c62bf04) --- sys/dev/virtio/network/virtio_net.h | 46 ++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/sys/dev/virtio/network/virtio_net.h b/sys/dev/virtio/network/virtio_net.h index 4b728f7af21a..e0ca40a7acbb 100644 --- a/sys/dev/virtio/network/virtio_net.h +++ b/sys/dev/virtio/network/virtio_net.h @@ -32,29 +32,29 @@ #define _VIRTIO_NET_H /* The feature bitmap for virtio net */ -#define VIRTIO_NET_F_CSUM 0x000001 /* Host handles pkts w/ partial csum */ -#define VIRTIO_NET_F_GUEST_CSUM 0x000002 /* Guest handles pkts w/ partial csum*/ -#define VIRTIO_NET_F_CTRL_GUEST_OFFLOADS 0x000004 /* Dynamic offload configuration. */ -#define VIRTIO_NET_F_MTU 0x000008 /* Initial MTU advice */ -#define VIRTIO_NET_F_MAC 0x000020 /* Host has given MAC address. */ -#define VIRTIO_NET_F_GSO 0x000040 /* Host handles pkts w/ any GSO type */ -#define VIRTIO_NET_F_GUEST_TSO4 0x000080 /* Guest can handle TSOv4 in. */ -#define VIRTIO_NET_F_GUEST_TSO6 0x000100 /* Guest can handle TSOv6 in. */ -#define VIRTIO_NET_F_GUEST_ECN 0x000200 /* Guest can handle TSO[6] w/ ECN in. */ -#define VIRTIO_NET_F_GUEST_UFO 0x000400 /* Guest can handle UFO in. */ -#define VIRTIO_NET_F_HOST_TSO4 0x000800 /* Host can handle TSOv4 in. */ -#define VIRTIO_NET_F_HOST_TSO6 0x001000 /* Host can handle TSOv6 in. */ -#define VIRTIO_NET_F_HOST_ECN 0x002000 /* Host can handle TSO[6] w/ ECN in. */ -#define VIRTIO_NET_F_HOST_UFO 0x004000 /* Host can handle UFO in. */ -#define VIRTIO_NET_F_MRG_RXBUF 0x008000 /* Host can merge receive buffers. */ -#define VIRTIO_NET_F_STATUS 0x010000 /* virtio_net_config.status available*/ -#define VIRTIO_NET_F_CTRL_VQ 0x020000 /* Control channel available */ -#define VIRTIO_NET_F_CTRL_RX 0x040000 /* Control channel RX mode support */ -#define VIRTIO_NET_F_CTRL_VLAN 0x080000 /* Control channel VLAN filtering */ -#define VIRTIO_NET_F_CTRL_RX_EXTRA 0x100000 /* Extra RX mode control support */ -#define VIRTIO_NET_F_GUEST_ANNOUNCE 0x200000 /* Announce device on network */ -#define VIRTIO_NET_F_MQ 0x400000 /* Device supports Receive Flow Steering */ -#define VIRTIO_NET_F_CTRL_MAC_ADDR 0x800000 /* Set MAC address */ +#define VIRTIO_NET_F_CSUM (1ULL << 0) /* Host handles pkts w/ partial csum */ +#define VIRTIO_NET_F_GUEST_CSUM (1ULL << 1) /* Guest handles pkts w/ partial csum*/ +#define VIRTIO_NET_F_CTRL_GUEST_OFFLOADS (1ULL << 2) /* Dynamic offload configuration. */ +#define VIRTIO_NET_F_MTU (1ULL << 3) /* Initial MTU advice */ +#define VIRTIO_NET_F_MAC (1ULL << 5) /* Host has given MAC address. */ +#define VIRTIO_NET_F_GSO (1ULL << 6) /* Host handles pkts w/ any GSO type */ +#define VIRTIO_NET_F_GUEST_TSO4 (1ULL << 7) /* Guest can handle TSOv4 in. */ +#define VIRTIO_NET_F_GUEST_TSO6 (1ULL << 8) /* Guest can handle TSOv6 in. */ +#define VIRTIO_NET_F_GUEST_ECN (1ULL << 9) /* Guest can handle TSO[6] w/ ECN in. */ +#define VIRTIO_NET_F_GUEST_UFO (1ULL << 10) /* Guest can handle UFO in. */ +#define VIRTIO_NET_F_HOST_TSO4 (1ULL << 11) /* Host can handle TSOv4 in. */ +#define VIRTIO_NET_F_HOST_TSO6 (1ULL << 12) /* Host can handle TSOv6 in. */ +#define VIRTIO_NET_F_HOST_ECN (1ULL << 13) /* Host can handle TSO[6] w/ ECN in. */ +#define VIRTIO_NET_F_HOST_UFO (1ULL << 14) /* Host can handle UFO in. */ +#define VIRTIO_NET_F_MRG_RXBUF (1ULL << 15) /* Host can merge receive buffers. */ +#define VIRTIO_NET_F_STATUS (1ULL << 16) /* virtio_net_config.status available*/ +#define VIRTIO_NET_F_CTRL_VQ (1ULL << 17) /* Control channel available */ +#define VIRTIO_NET_F_CTRL_RX (1ULL << 18) /* Control channel RX mode support */ +#define VIRTIO_NET_F_CTRL_VLAN (1ULL << 19) /* Control channel VLAN filtering */ +#define VIRTIO_NET_F_CTRL_RX_EXTRA (1ULL << 20) /* Extra RX mode control support */ +#define VIRTIO_NET_F_GUEST_ANNOUNCE (1ULL << 21) /* Announce device on network */ +#define VIRTIO_NET_F_MQ (1ULL << 22) /* Device supports Receive Flow Steering */ +#define VIRTIO_NET_F_CTRL_MAC_ADDR (1ULL << 23) /* Set MAC address */ #define VIRTIO_NET_F_SPEED_DUPLEX (1ULL << 63) /* Device set linkspeed and duplex */ #define VIRTIO_NET_S_LINK_UP 1 /* Link is up */ From nobody Wed Jan 21 12:38:54 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx3f82ZFmz6P86r for ; Wed, 21 Jan 2026 12:38: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx3f70RFDz3Ffr for ; Wed, 21 Jan 2026 12:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=81iZ8XDnRbkT7tMIBWKt94HRVv5+l7UyrvuJ/Dd+YEI=; b=xZSP+9ClC5O72GFuorOkjnADvgjP5g5stDWfCApDKkZQ1ZAR0t6HCYwrSVP6S9rYsc/1v8 jy8Dbx9HL/MaxA9uQhmAlFwlNc1TpvIuY6NsD1GRI6yNYoklPvST3c5pUX3oiplC0NSPOU MzYKUhiPmEFAp6rF3rc97okPV1dIdD5nHJgP8pg6jDeys/NMBnO1tOlOije1nXWdAmn0c8 HPbyuQyJn7PUlmfgl5QGV9mcIDuHmASRQzvcBVMtOGfxuLLAsmr8mUSvuilQQWDAlyB4jj eyNXQIR7EBbpMLtqeZOK4byRowi955sgXXwpsRnAkn/wnHV+lm2A7xlsBG8atw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=81iZ8XDnRbkT7tMIBWKt94HRVv5+l7UyrvuJ/Dd+YEI=; b=MWvyLgk52GiElP8YzS9Z5hCzLbpmTSxRWTPRjQi1LP1Nunf4uQbrfaXpuwhoQjWhpHrvGB NsfrxSt9y78tkhFpugoQHm+rNOWWlQs/gAkfG8gbs9GWaCWZAenq/rQ/ruN+xoLwJnDF06 Cbqcov3N2BJsayD9/50kNrIyMAPPO4Z764QdGB9cgzrdzh0xPET2pG1WiRrJi0iSAVp+SI qJ+Gfeh3ylfaqdwK1DadJOP/2vWuArVLkAstoNsUcvsJlMmZ8JivtWrK7DuS69pbuoiYiW M11AGjBKKksFCILZeNMft4JLRg1SaLe3cIH4inhSr9gi4I4olzkak41+W+XjtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768999135; a=rsa-sha256; cv=none; b=FCqcYe1JDIe0QhQBFj5cyZOiseP7wq+AFp5wg7/BxQI+atEQvVik4o8YzNAc6AQssKNVXD Ep19YfRIPQEUeCCIusQyQRrapV0zovi9UAMAL2sHWIt2vPt/g8GWA6imNuxmKMG57zq08w Mx+RqfsuxJCt0k15uWGtPytrW9oWyhMngqdr58wuPaKrlMxyNNLAK2jAWuN2KPxC+4+CWs ZX260ioXGwMFES8frkv8eereiJ2yzHCaolpQV+kmo122fmun9o7R15pOavfQOFl15fz5iK AUkvVIIBJHEr6ylfBNQ1KaNaIYcBz4jNc7Na9qrSrk5AAlhFOwaXDg8elJ2F9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx3f66Z0vzmmF for ; Wed, 21 Jan 2026 12:38:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8c8e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 12:38:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 58e5923bf6fc - stable/14 - vtnet: expose flags via sysctl tree List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 58e5923bf6fc59328a499b818052b4be1675f4c0 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 12:38:54 +0000 Message-Id: <6970c8de.8c8e.2d69f38a@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=58e5923bf6fc59328a499b818052b4be1675f4c0 commit 58e5923bf6fc59328a499b818052b4be1675f4c0 Author: Michael Tuexen AuthorDate: 2025-12-18 14:42:13 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 12:37:04 +0000 vtnet: expose flags via sysctl tree Provide the flags used for a vtnet interface via the sysctl tree. This is mostly used for debugging purposes. Reviewed by: Timo Völker Differential Revision: https://reviews.freebsd.org/D54283 (cherry picked from commit e3a0571ad74d8429a95fcae9efc1d91cc109a337) --- share/man/man4/vtnet.4 | 4 +++- sys/dev/virtio/network/if_vtnet.c | 20 ++++++++++++++++++++ sys/dev/virtio/network/if_vtnetvar.h | 5 +++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vtnet.4 b/share/man/man4/vtnet.4 index dbe1283eceab..da35c93ae8ef 100644 --- a/share/man/man4/vtnet.4 +++ b/share/man/man4/vtnet.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 30, 2025 +.Dd December 18, 2025 .Dt VTNET 4 .Os .Sh NAME @@ -267,6 +267,8 @@ The number of active virtqueue pairs. The number of requested virtqueue pairs. .It Va dev.vtnet. Ns Ar X Ns Va .max_vq_pairs The maximum number of supported virtqueue pairs. +.It Va dev.vtnet. Ns Ar X Ns Va .flags +The flags of the interface. Mostly for debugging purposes. .El .Sh SEE ALSO .Xr arp 4 , diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 643353190966..f95f99f9dd28 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -4401,6 +4402,22 @@ vtnet_setup_stat_sysctl(struct sysctl_ctx_list *ctx, "Times the transmit interrupt task rescheduled itself"); } +static int +vtnet_sysctl_flags(SYSCTL_HANDLER_ARGS) +{ + struct vtnet_softc *sc; + struct sbuf *sb; + int error; + + sb = sbuf_new_auto(); + sc = (struct vtnet_softc *)arg1; + sbuf_printf(sb, "%b", sc->vtnet_flags, VTNET_FLAGS_BITS); + sbuf_finish(sb); + error = SYSCTL_OUT(req, sbuf_data(sb), sbuf_len(sb) + 1); + sbuf_delete(sb); + return (error); +} + static void vtnet_setup_sysctl(struct vtnet_softc *sc) { @@ -4423,6 +4440,9 @@ vtnet_setup_sysctl(struct vtnet_softc *sc) SYSCTL_ADD_INT(ctx, child, OID_AUTO, "act_vq_pairs", CTLFLAG_RD, &sc->vtnet_act_vq_pairs, 0, "Number of active virtqueue pairs"); + SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "flags", + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0, + vtnet_sysctl_flags, "A", "Flags"); vtnet_setup_stat_sysctl(ctx, child, sc); } diff --git a/sys/dev/virtio/network/if_vtnetvar.h b/sys/dev/virtio/network/if_vtnetvar.h index 8d508f500f17..8544ecfaebae 100644 --- a/sys/dev/virtio/network/if_vtnetvar.h +++ b/sys/dev/virtio/network/if_vtnetvar.h @@ -193,6 +193,11 @@ struct vtnet_softc { char vtnet_mtx_name[16]; uint8_t vtnet_hwaddr[ETHER_ADDR_LEN]; }; +/* vtnet flag descriptions for use with printf(9) %b identifier. */ +#define VTNET_FLAGS_BITS \ + "\20\1MODERN\2MAC\3CTRL_VQ\4CTRL_RX\5CTRL_MAC\6VLAN_FILTER\7TSO_ECN" \ + "\10MRG_RXBUFS\11LRO_NOMRG\12MQ\13INDIRECT\14EVENT_IDX\15SUSPENDED" \ + "\16FIXUP_NEEDS_CSUM\17SW_LRO" static bool vtnet_modern(struct vtnet_softc *sc) From nobody Wed Jan 21 12:39:20 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx3fd01Rpz6P84f for ; Wed, 21 Jan 2026 12:39: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx3fc69kWz3Fj3 for ; Wed, 21 Jan 2026 12:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6sEI0C1FQ26gued/dA8RDaVmrRK0ss56ojx061+mao0=; b=eNfk+bswTqV+7u/8B9WR9tYTkdN07sm0b9gUE7xg5zcHHR7Bfc5eIk1g67lGrAg5gyqDxQ X2IB2JY2HZdq3MkEVe6/x7FfgMmaslRHSOGxm9EfuQ60FFQN8wIqVWHQqImNJ+efrgiTmQ ByOqjZuo7ohMlzRVnJAJxLwW8FUbFdDlog6Z3bG4kFonb7ZZn/Id4BUw5+5e4+QW/9N0j1 SN3ezjTGWfH1+T/Ao4pCu1wsnYXD6bKvu0GLDSm0oqeA2BgDF9aIrQ+LTUdKFtLXqnTJJk bG+Etu3K+p8Rn7qm7A6c6asPEaKCoU7BPJTl0U7wIYvCQfKuCMSO0punrJMiSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6sEI0C1FQ26gued/dA8RDaVmrRK0ss56ojx061+mao0=; b=mApw2oji2xz6L6BgCuu7TgLeRDRe13CpCEXR7N0FqSVOfze6vI74MpHasouxjNTCSmtRDk a/8NfR2tNpUa4TMx4G9oExEHLPSR6poTnfLX6B6VpUL5pLSfHqrE9w7JIs0w8LjxcrhgSX LHn7jOEpGPu3YWLi5oGvjO0X0AQ6SlCsH782cY7lQzSjmSarGXrbND4+cX1+YRT7gBVwbM tIZr1sIvjlNFnoH5DdUmS/0R3wqQv5jAK2i9jmC/zgj1Swr2dIK7aTLHf2W0GoeZLjP/m6 NhRckQ7tBx7lLFtEFo6PuaDB4UfraR4CxlwTbeI3X9sTLA5ntvAbaBMSBOcUbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768999160; a=rsa-sha256; cv=none; b=UYv2o3nhyKHqeYNk5FILyzp7s4ez4T8CARTAsf1+4Rq+ePsbsc3tf24BavKEpkhnCcm67L Jwjm8hyJM2wjjYImBB9l9fE9AgDgC3gD5zWhbHKtXmH7dCULlvdmfkATKwEcOfoXvmwmzd 6ZH3bHhgsqYx7iDBzshss6uson56yNr/Iippj0a/yYwP37QcGyXCj/+sZseXasbC1/gvsi 3kSu0ci6miFc5CuMmRKhHhjWw9NowipYgKGJ6/e74ldjfZKu7deslg/FEwD5IVvfzg0Nl4 A6n7pSddwJ+RX0uDLT3vwMVH9r1mgAnL+yHSa2z3/iFbL+kBsdyHDRYEr/f2rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx3fc5h1qznmV for ; Wed, 21 Jan 2026 12:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 80e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 12:39:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 02494584a52e - stable/14 - vtnet.4: put each sentence on its own line List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 02494584a52eceee40c6a638170fc3f9366a5bf2 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 12:39:20 +0000 Message-Id: <6970c8f8.80e3.3bb12e8f@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=02494584a52eceee40c6a638170fc3f9366a5bf2 commit 02494584a52eceee40c6a638170fc3f9366a5bf2 Author: Michael Tuexen AuthorDate: 2025-12-18 14:57:46 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 12:39:05 +0000 vtnet.4: put each sentence on its own line Reported by: ziaee Fixes: e3a0571ad74d ("vtnet: expose flags via sysctl tree") (cherry picked from commit f6e183301851e3e826d53a29e76cfc9bc7626477) --- share/man/man4/vtnet.4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vtnet.4 b/share/man/man4/vtnet.4 index da35c93ae8ef..9836f38cb274 100644 --- a/share/man/man4/vtnet.4 +++ b/share/man/man4/vtnet.4 @@ -268,7 +268,8 @@ The number of requested virtqueue pairs. .It Va dev.vtnet. Ns Ar X Ns Va .max_vq_pairs The maximum number of supported virtqueue pairs. .It Va dev.vtnet. Ns Ar X Ns Va .flags -The flags of the interface. Mostly for debugging purposes. +The flags of the interface. +Mostly for debugging purposes. .El .Sh SEE ALSO .Xr arp 4 , From nobody Wed Jan 21 12:39:48 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx3g83G1Rz6P85G for ; Wed, 21 Jan 2026 12:39:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx3g81gvJz3G9n for ; Wed, 21 Jan 2026 12:39:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kAaw1KjPSWq+j4a+76qnuSbRtdWMcbkawpnW5ON/vtI=; b=ZWrEk8EgJVnjZO4Zc0jyBSwDMgwYzKTVO2Ql5k85Tt3WMhfZRAux7tbKwZ1J4wk896ZBov Cs9sfUNpuYjUFEIbVckNLcevae8wjArh6YOGh6rUcESpwRz3gXWdx7BW5waHgow1KgC8SN v6VUE9bLdCqX5vS1BfaqdStTFNQTD51vuKHnic20vWR3en3JeZvnqssYRs+6O3Zlvu8SWS TCXmKgkl8pcelwOJ2TInaEDcUAQcX68em9Ad2wbPBaVvnhb+zdIvojFpRh4LCKE+Ry5Wjs YZeP+t5bsf/sB0kEm/VDZwqaoZiKAftqQFR5nHCYWgiuQKU6ghpqkX0+fH+HUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kAaw1KjPSWq+j4a+76qnuSbRtdWMcbkawpnW5ON/vtI=; b=GOxuSUmXvAQrCtwLFU7f9wu0iuYUVRMaC75mi3nuDB65XwQvUlwivKx1wYze5ldd7/MNNS W2F4PGPVH/4EXaJCAZb0qtwDIqbrmAh8p9pA+ADX/9tyw7/v3FDbZk6g0PAJL2WbmhM8MR Xbeu2c9ILwt1Q/McZrAUNsZSYtbyZ0ghTtF+KbzZ4KNNybaG4SrdlpBfFwwXniUAkpF/3E 22iSSt9S51Gxu9kThDh/Iuzdizy1jIA0UELy82zyRN3HrlQE0nk7/rWLu3xLAFjWxqhI3G MY936kkV7bwqsj3nDY/7vNsHGQrUwG7leb0y1XcRoPPthB3uSDS+Ovb6yP/BCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768999188; a=rsa-sha256; cv=none; b=aJTA2Dc6Unw4kBpr59o7HGLb+5/dnC1yB/sRXjvPdWAs7euTQ0OwGOh8EoR6ER4DBPlJSE 8XSBdzfXNV5b4VEh61Z/hfxSL6GBleQERhL0fDeknPXkIyaVEEyUyAsEd715gPqZaUCeYR s4VROZwxANPjdTJBVyilF3BIa0meAllPqTTrDJynR7FR5OgvcHmh+tzmxDa1rS05YkNUVJ OuSuseWd+sCIBskGpg72d2ioq06sVQZwHO7adO4hE70I5AHVVjJV1SWhghx4VwqaQrIiRv fPybpteqEuMcIv8upbOjejmQFYy9F/fWTZROuo6v6v9zfZiSrwahaMVM6KfphQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx3g81GQczncw for ; Wed, 21 Jan 2026 12:39:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ffab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 12:39:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 1923671644e2 - stable/14 - printf.9: fix style List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1923671644e2b82030e6d5e9c90bf7e3b62df699 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 12:39:48 +0000 Message-Id: <6970c914.3ffab.4cac0f96@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1923671644e2b82030e6d5e9c90bf7e3b62df699 commit 1923671644e2b82030e6d5e9c90bf7e3b62df699 Author: Michael Tuexen AuthorDate: 2025-12-18 22:49:51 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 12:39:31 +0000 printf.9: fix style Follow the style described by style.9. Reported by: markj (cherry picked from commit 391e8709315d4a0e8f5ba91912e370571ab6841b) --- share/man/man9/printf.9 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/share/man/man9/printf.9 b/share/man/man9/printf.9 index 9f026d1d2004..8006590b3d2a 100644 --- a/share/man/man9/printf.9 +++ b/share/man/man9/printf.9 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 25, 2023 +.Dd December 18, 2025 .Dt PRINTF 9 .Os .Sh NAME @@ -162,7 +162,6 @@ The function void printf_test(void) { - printf("reg=%b\en", 3, "\e10\e2BITTWO\e1BITONE"); printf("out: %4D\en", "AAZZ", ":"); } From nobody Wed Jan 21 12:41:58 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx3jf1sx6z6P7y4 for ; Wed, 21 Jan 2026 12:41: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx3jf1PJsz3GTW for ; Wed, 21 Jan 2026 12:41:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MaBsZ9LdxQEmS/kV6wgqBQVmU2x7UV4azlwK2+OY1SQ=; b=DYJW99ifOB90fY3CcpQ3sthCpmK5TsLD9yIYd/RbPmQk3HSVAr/qfgIQ6um4AfqfbUu1e+ Ue/x3DIggmjKWKVY3lvAJLq3J76GaBCGD1aDRhVfWFmBf5ywqJI219+mWddsH5qO2c9AOI t2NjwJ5GrBn0zkunAZDSUA4y/hTkOZi8LjfWh9VwpK/DMiQToczO2FdlYasBXpJJLN8KI+ 6Es3+h5Avi1DoYf1HahpjBzojZGQh5QCFGpD0iLZHXwkOYLufQE5gw6b1qDnwRlEUuDhvr 1tVBpcPxycV4RzF8vB2uwDXiZaM7k1VHMKE3an3pymdeOKyzLJ2YcxcqUzZq/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MaBsZ9LdxQEmS/kV6wgqBQVmU2x7UV4azlwK2+OY1SQ=; b=LKUjyPbvSHlSxuSBhRArgxQqcj9Ws4jYUX+k38FY3z+nzKxOYggIfwKzgHX5jJA/bhRcju HpuC2rKeP3mrFnjjuxNRfZauFSsqi+/2bICyIhhh1ONnPfYl5kzaaIUTLRd5YjkmLzjHNn vOnbdGIEBFyKsCBJlUMk3PqyfMTssDbgziwgiulrPnmJIVCsLT47GimAHaBg2LMeKzgED2 B9q021fEgBIfDu72igPuLoV+RHC+X4LX/ds/1Qbm5/t2cnVsWaEQGDbtWxflzLV2ijTPGm EGIsevtXXz4sg1OeOLir0XfP4tSdW38NtAY3bRJiLF2zKh69XW6kNptWLofhMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768999318; a=rsa-sha256; cv=none; b=jzohtVLYDqK4Ce1epETHL+dwKVbPpxQzEhFyf+3BokssDAdBQ4sDSMridxMm8JOt/V4hNb Lum0RSbVxSsj5W7KHCdtKBEvZyJkY5OjJXSlJ9ico3f9BW08d4A4B7170ew+/N4tJbVos7 Hv+GOEqTod0cEbPi4u13fWcccSa2U1/HXalKnMCHhsd2QQoIzs7MwCFae0Ag/P7tnB4ihR GVT61iB92Ctd5MiodJESK86RUDno7HCVCi5BT6JaNjKNSkmfpOl2IE85mvgZA/irAlp1lq Kbn6o/5LjFDazhDxJybTdX2qNqrXU20lxeik0d1+9Ef/uzzq17S7J04crtHqpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx3jf0tD8zpDD for ; Wed, 21 Jan 2026 12:41:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 86cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 12:41:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 39140d9d9a27 - stable/14 - printf.9: Support more than 32 bits in %b List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 39140d9d9a27884b5941107abe3ddf92751d41b5 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 12:41:58 +0000 Message-Id: <6970c996.86cb.87a0bf7@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=39140d9d9a27884b5941107abe3ddf92751d41b5 commit 39140d9d9a27884b5941107abe3ddf92751d41b5 Author: Michael Tuexen AuthorDate: 2025-12-19 16:26:37 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 12:40:05 +0000 printf.9: Support more than 32 bits in %b This will be usable after clang has been extended to accept length modifiers for %b when compiling kernel code. But we need FreeBSD to support it first... Reviewed by: markj, Timo Völker Differential Revision: https://reviews.freebsd.org/D54286 (cherry picked from commit d2cb9cab8457b2a84898f0ac86f7b45e907f872c) --- share/man/man9/printf.9 | 25 ++++++++++++++++++------- sys/kern/subr_prf.c | 40 +++++++++++++++++++++++++++++++--------- 2 files changed, 49 insertions(+), 16 deletions(-) diff --git a/share/man/man9/printf.9 b/share/man/man9/printf.9 index 8006590b3d2a..5c819acbec09 100644 --- a/share/man/man9/printf.9 +++ b/share/man/man9/printf.9 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 18, 2025 +.Dd December 19, 2025 .Dt PRINTF 9 .Os .Sh NAME @@ -95,14 +95,15 @@ arguments. The base value is the output base (radix) expressed as an octal value; for example, \e10 gives octal and \e20 gives hexadecimal. The arguments are made up of a sequence of bit identifiers. -Each bit identifier begins with an -.Em octal -value which is the number of the bit (starting from 1) this identifier -describes. +Each bit identifier begins with a character specifying the number of the bit +(starting from 1) this identifier describes. +The characters from \e01 to \e40 can be used to specify bit numbers in the +range from 1 to 32 and characters from \e200 to \e377 to specify bit numbers +in the range from 1 to 128. The rest of the identifier is a string of characters containing the name of the bit. -The string is terminated by either the bit number at the start of the next -bit identifier or +The identifier is terminated by either the bit number at the start of the next +bit identifier or by .Dv NUL for the last bit identifier. .Pp @@ -173,6 +174,16 @@ reg=3 out: 41:41:5a:5a .Ed .Pp +The same output will be generated by the following function: +.Bd -literal -offset indent +void +printf_test(void) +{ + printf("reg=%b\en", 3, "\e10\e201BITTWO\e200BITONE"); + printf("out: %4D\en", "AAZZ", ":"); +} +.Ed +.Pp The call .Bd -literal -offset indent log(LOG_DEBUG, "%s%d: been there.\en", sc->sc_name, sc->sc_unit); diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index 60040a085162..23e51d7f456b 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -624,6 +624,18 @@ ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper) return (p); } +static inline bool +isbitpos(char c) +{ + return (c != '\0' && (c <= ' ' || (c & 0x80) != 0)); +} + +static inline bool +isprintnospace(char c) +{ + return (isprint(c) && c != ' '); +} + /* * Scaled down version of printf(3). * @@ -636,9 +648,12 @@ ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper) * * where is the output base expressed as a control character, e.g. * \10 gives octal; \20 gives hex. Each arg is a sequence of characters, - * the first of which gives the bit number to be inspected (origin 1), and - * the next characters (up to a control character, i.e. a character <= 32), - * give the name of the register. Thus: + * the first of which gives the bit number to be inspected and the next + * characters (up to the bit number of the next argument or a final NUL + * character), give the name of the register. + * The bit number can be encoded as a character between 1 and 32 or as a + * character between 128 and 255. + * Thus: * * kvprintf("reg=%b\n", 3, "\10\2BITTWO\1BITONE"); * @@ -646,6 +661,10 @@ ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper) * * reg=3 * + * The same output would be generated by using: + * + * kvprintf("reg=%b\n", 3, "\10\201BITTWO\200BITONE"); + * * XXX: %D -- Hexdump, takes pointer and separator string: * ("%6D", ptr, ":") -> XX:XX:XX:XX:XX:XX * ("%*D", len, ptr, " " -> XX XX XX XX ... @@ -947,15 +966,18 @@ number: if (bconv && num != 0) { /* %b conversion flag format. */ tmp = retval; - while (*q) { - n = *q++; - if (num & (1 << (n - 1))) { + while (isbitpos(*q)) { + if ((*q & 0x80) != 0) + n = *q++ & 0x7f; + else + n = *q++ - 1; + if (num & (1ULL << n)) { PCHAR(retval != tmp ? ',' : '<'); - for (; (n = *q) > ' '; ++q) - PCHAR(n); + for (; isprintnospace(*q); ++q) + PCHAR(*q); } else - for (; *q > ' '; ++q) + for (; isprintnospace(*q); ++q) continue; } if (retval != tmp) { From nobody Wed Jan 21 12:44:03 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx3m368szz6P8D6 for ; Wed, 21 Jan 2026 12:44: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx3m34xrJz3HFn for ; Wed, 21 Jan 2026 12:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/5va34ZnZS5Red8SYq12V4gZJgyFq/lcPqN/G5eIe5A=; b=wzgi4VZjYjJdLvy8sWRt2GLjaklj+LNoM/9EQJybXtF8rB2Upa2xSdibOdL9/l+AdnX1+n x35W2iuGhSxnktfWe6ZgAik1wVHWoyMvEd92jeXk0G84C64kZun7h0KT0Cm6kRldu4VIEb SCxcFtjmRrtPRSmE5NYjr/wCt3L1kIi5+G7HjdJYajw0yKdiZlXoy38C4tPkOdEiq1GPfS dJ8lQ4yjrglA4O9ZRU/SeoaIkFBHR3bLk0DfrY/iPwsmOC34kL0ZH/7aVl07tb2dXdtNkZ yrvpc5cN7P6QiWzkJ2I+2RyYdcMKrsHL4jhu6NoGnKlnWEhGCL2vKaVXP12wKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/5va34ZnZS5Red8SYq12V4gZJgyFq/lcPqN/G5eIe5A=; b=l8tFMDVatlnC62W5L5Od35158/v9XOfHzUPavbXdseoBKeOstkhJOLRcfVvD06kWZB6unI v38Dr7kFBSJS/ZGODUlRa/bATYAGtrK54vf+2Lsi0pKplWwE+Ul1hHjX+u2zgZxBGRzrlk MQLZxW0heZ8paG1tXmX6C3fqP/L3M1r2mVtLSbInda3qhBoG9guoBUzoxYDkVJrwucg/ue /sqDrUWruOak4VJs0AAjNaSbfnQX+M/Vn+STPfMDnyb8id5UnZ8x9bmR+PzAldJXHRnrhm bdHH2LjaUb1yB3HQfuPR2k/ZKgdkTB0z3pK0HB6txmOD0D6zsGRDddRUEsozQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768999443; a=rsa-sha256; cv=none; b=qgXERGREFReaHi9vlih7/Gm+to3darWd497droEmJMJR5BUHrE86MuTxLd/7CaN3rosuw0 T/qGjzENiCj8DphHY0rQm1Sgla8i5TiT7zjPKJGLLbzcSC0+nDiDVWSm8ROTSjhSpy7ztI 4H6TgPzAz2wXOD4l1HJF+jgcxyIIAiy6Qc+KIy5ZJgYdPrSQe6M7vM7AWm+7+fBDSJJave pZrf3FiFHQ4ygMs2AEo7mdRsSUGQ5MbSaudf3p8VzWs/1UPnI5XhtEv0L9SN0cMisDrZvm EKtiSEbI/5caqBPhaM7400BdtId3qatom60abGAQGUSS32MTG+igcnBdDPDuYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx3m34V7ZznSZ for ; Wed, 21 Jan 2026 12:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9902 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 12:44:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 9d246c6be2b2 - stable/14 - vtnet: expose features via sysctl tree List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9d246c6be2b2c4d8845961c3170d6d65b4a92e3c Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 12:44:03 +0000 Message-Id: <6970ca13.9902.2b9d87c2@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9d246c6be2b2c4d8845961c3170d6d65b4a92e3c commit 9d246c6be2b2c4d8845961c3170d6d65b4a92e3c Author: Michael Tuexen AuthorDate: 2025-12-19 16:38:35 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 12:42:09 +0000 vtnet: expose features via sysctl tree Right now the 64-bit flags field needs to be casted to a 32-bit field, because clang warns if more than 32-bits are used. Once clang is fixed, this restriction will be removed and more bits will be added. Reviewed by: markj, Timo Völker Differential Revision: https://reviews.freebsd.org/D54288 (cherry picked from commit 634d9c0d111b630c3d63a1cf25d15c32a37afab8) --- share/man/man4/vtnet.4 | 4 +++- sys/dev/virtio/network/if_vtnet.c | 18 ++++++++++++++++++ sys/dev/virtio/network/virtio_net.h | 8 ++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vtnet.4 b/share/man/man4/vtnet.4 index 9836f38cb274..7a4c64a8e5d5 100644 --- a/share/man/man4/vtnet.4 +++ b/share/man/man4/vtnet.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 18, 2025 +.Dd December 19, 2025 .Dt VTNET 4 .Os .Sh NAME @@ -270,6 +270,8 @@ The maximum number of supported virtqueue pairs. .It Va dev.vtnet. Ns Ar X Ns Va .flags The flags of the interface. Mostly for debugging purposes. +.It Va dev.vtnet. Ns Ar X Ns Va .features +The features of the interface as defined by the virtio specification. .El .Sh SEE ALSO .Xr arp 4 , diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index f95f99f9dd28..5688b21e92a3 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -4402,6 +4402,21 @@ vtnet_setup_stat_sysctl(struct sysctl_ctx_list *ctx, "Times the transmit interrupt task rescheduled itself"); } +static int +vtnet_sysctl_features(SYSCTL_HANDLER_ARGS) +{ + struct sbuf sb; + struct vtnet_softc *sc = (struct vtnet_softc *)arg1; + int error; + + sbuf_new_for_sysctl(&sb, NULL, 0, req); + sbuf_printf(&sb, "%b", (uint32_t)sc->vtnet_features, + VIRTIO_NET_FEATURE_BITS); + error = sbuf_finish(&sb); + sbuf_delete(&sb); + return (error); +} + static int vtnet_sysctl_flags(SYSCTL_HANDLER_ARGS) { @@ -4440,6 +4455,9 @@ vtnet_setup_sysctl(struct vtnet_softc *sc) SYSCTL_ADD_INT(ctx, child, OID_AUTO, "act_vq_pairs", CTLFLAG_RD, &sc->vtnet_act_vq_pairs, 0, "Number of active virtqueue pairs"); + SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "features", + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0, + vtnet_sysctl_features, "A", "Features"); SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "flags", CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0, vtnet_sysctl_flags, "A", "Flags"); diff --git a/sys/dev/virtio/network/virtio_net.h b/sys/dev/virtio/network/virtio_net.h index e0ca40a7acbb..961d330ced8a 100644 --- a/sys/dev/virtio/network/virtio_net.h +++ b/sys/dev/virtio/network/virtio_net.h @@ -57,6 +57,14 @@ #define VIRTIO_NET_F_CTRL_MAC_ADDR (1ULL << 23) /* Set MAC address */ #define VIRTIO_NET_F_SPEED_DUPLEX (1ULL << 63) /* Device set linkspeed and duplex */ +/* virtio net feature flag descriptions for use with printf(9) %b identifier. */ +#define VIRTIO_NET_FEATURE_BITS \ + "\20\200CSUM\201GUEST_CSUM\202CTRL_GUEST_OFFLOADS\203MTU\205MAC\206GSO" \ + "\207GUEST_TSO4\210GUEST_TSO6\211GUEST_ECN\212GUEST_UFO\213HOST_TSO4" \ + "\214HOST_TSO6\215HOST_ECN\216HOST_UFO\217MRG_RXBUF\220STATUS\221CTRL_VQ" \ + "\222CTRL_RX\223CTRL_VLAN\224CTRL_RX_EXTRA\225GUEST_ANNOUNCE\226MQ" \ + "\227CTRL_MAC_ADDR\277SPEED_DUPLEX" + #define VIRTIO_NET_S_LINK_UP 1 /* Link is up */ #define VIRTIO_NET_S_ANNOUNCE 2 /* Announcement is needed */ From nobody Wed Jan 21 12:46:11 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx3pW67sFz6P8lq for ; Wed, 21 Jan 2026 12:46: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx3pW2sgtz3HMt for ; Wed, 21 Jan 2026 12:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j6uePahMxB89mASBu5HnvEi+zkpxu2TxyA4gu3ow2hQ=; b=lHjmNQlG+AZPK3yUGbF3J+chAPnXwQ8wLYi4R4wkenzgoh3nQ8Ti2jV6GPxwMGu4sB1q8q JF86F5cx1uizPK887wLFxXobwN99lk2yu5CT+MnwEJwu6mdDmquE6onvgu6Xod3uK/Zwat C36IO/VH6lEksTlloCcYTUts4hocLObqU9FXXbLs47xHFjdMqFZy5xleEVCjtOoTMeXzD4 BOwiqJDmC6OaozGzdi6FsYSSysJJRP+VlYZcveNzrrXZHUPU1E8Zo40uS86752Q/VDEeYW r14u/Q+jA4loFe37XLzx5AYuSQH9RnlH9UE8G1frdZEdzM1IFKmOqRrtTMTabQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j6uePahMxB89mASBu5HnvEi+zkpxu2TxyA4gu3ow2hQ=; b=WkPs9NV/ZIA3STOr91/1cWJ7BA0ceOn+8o7am4ZUyflxev2r5pRvOYtKej0+ZY47v/oLKp ybaqxVZid3SvgXtRkOq1LBA/T2Rsc3i6/SPMeByQ4H6Wu4rxxNPWZVTi6DNUntpYX/7Ufk JtKyb9222pJVlVPHH+XM6r4v5FR7q6+5s4Tth0oRWoVWERmeVhkd3ew1dJ9fi4gSd6NM1g 9CHgT2p8xMcEntOjkham6dyzveY2KDrEYRqLBPb8K1KQQnEhGvd74r9SzN5hUT6JBMEBx8 JPbMoMJQPqoG6NrhoSpN4swfFPhIDVTzGUMZohOlKKqJVECF1j2YNn3JQFnfHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768999571; a=rsa-sha256; cv=none; b=J+5u5CTMrQShVXfYj+ADEIs+gOcmCpAz/b6hgtAp1IRhv5R/otL2Sq8JNLFUPRRwTagwpT WdiuRvUig3wZbOmBzd2PG0Y7e76dBKVNTZBWPOFDHxBChdeQfmQZiJBmHS6kl3+pKCV3fJ /qxaJL5oZddHAOHhZQbKYilU68FL3fpaGu2afFOB1H8MaDBa3U41Btqv640+B0oBRihVxb Ie/V/MqgQ9eXfsk0eMOFMyK1OMgsFM7mGsq7OtYAwOYUqmwI/8UOCZNLXfUHDopp3VuBh4 Ez8kXcl6QRuYByXZUmSDqhbcHkMWxQbhmrOOrApgRFRmi8KzJxY0mFTzvsOWhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx3pW1nSjznqG for ; Wed, 21 Jan 2026 12:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9cbf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 12:46:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: c1b29bcd789e - stable/14 - vtnet: improve consistency List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c1b29bcd789ebcb5c7b6a3aa10f00de3032cad06 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 12:46:11 +0000 Message-Id: <6970ca93.9cbf.108bbfff@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c1b29bcd789ebcb5c7b6a3aa10f00de3032cad06 commit c1b29bcd789ebcb5c7b6a3aa10f00de3032cad06 Author: Michael Tuexen AuthorDate: 2025-12-19 16:44:20 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 12:44:16 +0000 vtnet: improve consistency Use sbuf_new_for_sysctl() instead of sbuf_new_auto() when exposing the flags via sysctl. (cherry picked from commit 8da838ac31692e381adfc63d83ea49f2adabbf23) --- sys/dev/virtio/network/if_vtnet.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 5688b21e92a3..28a161ecd924 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -4420,16 +4420,14 @@ vtnet_sysctl_features(SYSCTL_HANDLER_ARGS) static int vtnet_sysctl_flags(SYSCTL_HANDLER_ARGS) { - struct vtnet_softc *sc; - struct sbuf *sb; + struct sbuf sb; + struct vtnet_softc *sc = (struct vtnet_softc *)arg1; int error; - sb = sbuf_new_auto(); - sc = (struct vtnet_softc *)arg1; - sbuf_printf(sb, "%b", sc->vtnet_flags, VTNET_FLAGS_BITS); - sbuf_finish(sb); - error = SYSCTL_OUT(req, sbuf_data(sb), sbuf_len(sb) + 1); - sbuf_delete(sb); + sbuf_new_for_sysctl(&sb, NULL, 0, req); + sbuf_printf(&sb, "%b", sc->vtnet_flags, VTNET_FLAGS_BITS); + error = sbuf_finish(&sb); + sbuf_delete(&sb); return (error); } From nobody Wed Jan 21 12:48:47 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx3sX2q9fz6P8Fs for ; Wed, 21 Jan 2026 12:48:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx3sX12JJz3Hjv for ; Wed, 21 Jan 2026 12:48:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999728; 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=SXuI0mKghKV9cGsKtWhw495RIWvp3jm0/HpAbZLw86c=; b=QhOdJu60UXIVggF8sagAD8JAbq8cB+Ciu3gT+6dabP8r4mSJBawjdJ0mITsli/TJubcQ/q 9XfTg54lXAKhF7sdoM7JkrLCv5QXns+bC6X7ldSOgygh2fqHmSMkboGh1myQNtQK1wMcbf TYl4+01PvMsgaEjv9Oyl86nv82EWmyLFlqw3l4F1/upFPCHA1+t+iCGSZ7Io0uWvSCxLUA WEOEG15RJ7D6qmgQEDBPIrxUNHck1L1pyxKqg3EyCEjlxyW1ekX9vgTzhN8HWt8tJdC03H pHOjZXmzfOEA4GwpZ2x85ayOUURimSVtp3GRA/b0VipnignU3KZzSwB1BS+b5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999728; 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=SXuI0mKghKV9cGsKtWhw495RIWvp3jm0/HpAbZLw86c=; b=lJv3ljgRSc6WP8RD3gK/QGWOOjPSpaGKSOwG2FmIu8ytrMlejPIs15laoNfcm67/C7IrUV 7l5/IAj9A7OVnChpPM23UsQdUld/aoNf2tMo3qdBRh/Fn1zOVZc+BmJLoJLTlaBFQ0naIE zdlC6vUHPlPrfcHNkNGjYaBznRh5nQBvefP/0s0SORQQm3+xkSaPxQA5/JwQHTMwuzyMdr m/4X8cJ8+bfKpt5ARcDNp5qHzd74/t1SjriYxDOtfUUEW4lIh0swvOQCHnvR6vanbyPEwi UcmryNgWO/Mgxlb6iFDrD6awkvQZEET/DUfvSgODxweJTRuuUq2OmSpqEcpV7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768999728; a=rsa-sha256; cv=none; b=K3StNYDJBwxOKsmDDxCJ7XQ4t71JU7+F7X5SknnR39sAf8NMPt2y0wDwh9PmunCFJhZEw9 /kLxc2y2OyLfiM1YmaHO9+hfnyB1YRPuvCw6xEqnje4jqjKB0b2h4wyQV/lHa6lbIzzzl2 pxhI+qQJxPQoZaGFvgo2Q0S4W4RT1rCxyHVru8fPCZW3OA1tvf/KLFb0ZtTho4Rw3zV/uE GPqw0AtRwRDu7FatkXsZgaYZSuFgTjsBDPOs+YFByG3vfi+3Rsjjux5eppYZEXSxzk7voH aTvlBZo8s16ipsbbUk6WKDgiJAQz9q+Y/R1soBAJ1wMnHPru/BL7x3roZ/qH7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx3sW74Zkznkg for ; Wed, 21 Jan 2026 12:48:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ffc6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 12:48:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Timo =?utf-8?Q?V=C3=B6lker?= From: Michael Tuexen Subject: git: fab0a83ff748 - stable/14 - tcp: fix checksum calculation bug List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fab0a83ff7484a069f04ec9c6b5657ec9676c7dd Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 12:48:47 +0000 Message-Id: <6970cb2f.3ffc6.51b1a398@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=fab0a83ff7484a069f04ec9c6b5657ec9676c7dd commit fab0a83ff7484a069f04ec9c6b5657ec9676c7dd Author: Timo Völker AuthorDate: 2025-12-19 16:50:20 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 12:46:28 +0000 tcp: fix checksum calculation bug The new function in_delayed_cksum_o() was introduced to compute the checksum in the case the mbuf chain does not start with the IP header. The offset of the IP header is specified by the parameter iph_offset. If iph_offset was positive, the function computed an incorrect checksum. Reviewed by: sobomax, tuexen Fixes: 5feb38e37847 ("netinet: provide "at offset" variant of the in_delayed_cksum() API") Differential Revision: https://reviews.freebsd.org/D54269 (cherry picked from commit c8b3b605ae854ead6c8804e0400d80cb8fa73fdf) --- sys/netinet/ip_output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index e3ef8e2c7dd9..e97e10db0e6b 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1068,8 +1068,8 @@ in_delayed_cksum_o(struct mbuf *m, uint16_t iph_offset) if (csum == 0) csum = 0xffff; } else { - cklen = ntohs(ip->ip_len); - csum = in_cksum_skip(m, cklen, offset); + cklen = ntohs(ip->ip_len) - (ip->ip_hl << 2); + csum = in_cksum_skip(m, cklen + offset, offset); } offset += m->m_pkthdr.csum_data; /* checksum offset */ From nobody Wed Jan 21 13:42:16 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx53F19N2z6PD9s for ; Wed, 21 Jan 2026 13:42: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx53F0V6gz3N2l for ; Wed, 21 Jan 2026 13:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769002937; 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=8Ny0L9HiNf6UnEhe2EAvF7LXRK67zduUUGui4LuHP/c=; b=ePSPr4DVGgEchqALOuJoCn0TNOatNFHzAMF975LF5AH9yx3+3is9z3XnUEsGFtSymysDwl ERMnwvWPp089RQN70vOGzkeDSLqGi2VZ0z6/P1cZjulhahb5WLovVedZo3zG2qlgsj21MD bnlUE6GZk5ncVDovLCCHdTyuJWQPTAgBxhW1QborKtqxGAUvyaLpxdlw1I5Z62w1OJSbcF 2TCNgbMAg71BMMyZ7t+KxrtLnymdT0xg3DSiwXkL33cFFq1SLzkJtkRwutDHG5EmR5puGh Hn5MpoWEIxjHKDCrDGvKP1nZEsWJobhh9a/3VWsUhBgsgbdT6DWT+yqx03qrHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769002937; 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=8Ny0L9HiNf6UnEhe2EAvF7LXRK67zduUUGui4LuHP/c=; b=pdoHbyEPHqV9V78adttdGR4G35PZJ/NriDunbNZXTEVz+eI7Yv9uMqdF/Dyk1qDFTaRcN8 ZcbC/5O0czm5ktZMm/WJ4/ioZeCg/zND3WOPxEZmlEZQHrjzfcXH3/VFdRIefP6qxEfJRi 4U455FUcaucOiVICM23AA6JvReDGw0mBXaKxjUqo8+PPccOY5FdJU/OMrrFG6ZCs1XK0d0 yzMjnqNrBaEIWbATxla3HtjbKAgMamQvRpu7bOG8o6zDhJJVN0B6N9X/YSgN630yXH7Dzf Gw/opJq2Tmg5C7vSTxhwFS8cAMoqFq0/zi6U7mhjGWZ+ZZfeW5tPX+EmGOr3kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769002937; a=rsa-sha256; cv=none; b=unHL+PcjrYg9Sy1GNn9Gg+erRbUSQJeknFVXV88ii/wOKvOnHKbB1cx5bq0fj/kOtsI2e/ 2hKCNMnkJItFyFSk+euwsAgy1qBWzAYwRx/JxVQW2KfMMAH1irYwvpFrG+8RQd5FXcukjG 34nK4/jp+WN7KmCsW5lO+qZwCoOq/KqL8hmcFJ/ep7BYgDE5BhO/EylvYYA+/4qXV2DtIv 8tZnARTpu2IxRBypvJJ+fhRkYtEzMCSIVCKNsbxyfhwnrPOYV6uxN9iVlrIGQ5kACI15Ti 3jV02uKJFLjZX08dfpdVhPN1nvBCIOKl5iNra0W6hO5a+YBOyjXXO+QNB9nZjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx53D6wGszqkb for ; Wed, 21 Jan 2026 13:42:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f838 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 13:42:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron From: Ed Maste Subject: git: 0b2cf69287bb - stable/14 - linuxkpi: Take const root in read-only radix tree functions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0b2cf69287bbb97d29042a4062b01ea4d9e9e054 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 13:42:16 +0000 Message-Id: <6970d7b8.f838.603e6f21@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0b2cf69287bbb97d29042a4062b01ea4d9e9e054 commit 0b2cf69287bbb97d29042a4062b01ea4d9e9e054 Author: Jean-Sébastien Pédron AuthorDate: 2025-09-07 16:40:49 +0000 Commit: Ed Maste CommitDate: 2026-01-21 13:41:57 +0000 linuxkpi: Take const root in read-only radix tree functions This is a preparation step for a future addition to this file. This is also closer to what Linux does. Reviewed by: emaste Sponsored by: The FreeBSD Foundation (cherry picked from commit cf39b51d36d82214ebdfd03055d321ddd2d85274) (cherry picked from commit c5445540995fd37c390ad371a2e95d300ee83988) --- sys/compat/linuxkpi/common/include/linux/radix-tree.h | 4 ++-- sys/compat/linuxkpi/common/src/linux_radix.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/radix-tree.h b/sys/compat/linuxkpi/common/include/linux/radix-tree.h index a1204cb20a79..48fbb9e26c43 100644 --- a/sys/compat/linuxkpi/common/include/linux/radix-tree.h +++ b/sys/compat/linuxkpi/common/include/linux/radix-tree.h @@ -73,11 +73,11 @@ radix_tree_exception(void *arg) return ((uintptr_t)arg & RADIX_TREE_ENTRY_MASK); } -void *radix_tree_lookup(struct radix_tree_root *, unsigned long); +void *radix_tree_lookup(const struct radix_tree_root *, unsigned long); void *radix_tree_delete(struct radix_tree_root *, unsigned long); int radix_tree_insert(struct radix_tree_root *, unsigned long, void *); int radix_tree_store(struct radix_tree_root *, unsigned long, void **); -bool radix_tree_iter_find(struct radix_tree_root *, struct radix_tree_iter *, void ***); +bool radix_tree_iter_find(const struct radix_tree_root *, struct radix_tree_iter *, void ***); void radix_tree_iter_delete(struct radix_tree_root *, struct radix_tree_iter *, void **); #endif /* _LINUXKPI_LINUX_RADIX_TREE_H_ */ diff --git a/sys/compat/linuxkpi/common/src/linux_radix.c b/sys/compat/linuxkpi/common/src/linux_radix.c index f0f7cce128e6..01f493877a5e 100644 --- a/sys/compat/linuxkpi/common/src/linux_radix.c +++ b/sys/compat/linuxkpi/common/src/linux_radix.c @@ -42,7 +42,7 @@ static MALLOC_DEFINE(M_RADIX, "radix", "Linux radix compat"); static inline unsigned long -radix_max(struct radix_tree_root *root) +radix_max(const struct radix_tree_root *root) { return ((1UL << (root->height * RADIX_TREE_MAP_SHIFT)) - 1UL); } @@ -65,7 +65,7 @@ radix_tree_clean_root_node(struct radix_tree_root *root) } void * -radix_tree_lookup(struct radix_tree_root *root, unsigned long index) +radix_tree_lookup(const struct radix_tree_root *root, unsigned long index) { struct radix_tree_node *node; void *item; @@ -86,8 +86,8 @@ out: } bool -radix_tree_iter_find(struct radix_tree_root *root, struct radix_tree_iter *iter, - void ***pppslot) +radix_tree_iter_find(const struct radix_tree_root *root, + struct radix_tree_iter *iter, void ***pppslot) { struct radix_tree_node *node; unsigned long index = iter->index; From nobody Wed Jan 21 14:04:30 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx5Xt4MWXz6PFjG for ; Wed, 21 Jan 2026 14:04: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx5Xt1NBFz3Qgw for ; Wed, 21 Jan 2026 14:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769004270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yRBMOu6mpONK01WQ8romIEJ+ScgLOiloRnjHBQUWVEc=; b=rTlVhjFXhrb2km/nSuosaWNM/P1vUkgYaNxyPGNyA+KvJ+rzsqBE0p0kfksiZ6q4npIhAJ D9xRLwUIroE7m9JLXAiGoq+2cAzM6a1mIW3YcnanemuMxyQKFxpUdfFvjFwR4NCdxMDOHA fA0SjZryhmC3Sy3jB6JNvWmA5GsSk+qHXn3o8B1xK1vkDQnXVDCU5rspLvxdjPoFDWtM8+ dlW8dyTWUwzS/oW1TJQJt/am8g4SoffmmfejC+UFC8aOCrUg6bfAUB4uTc0aFBi0gmTDOP D+pnE/q6ULHL5SL6zK5FNpKShs+MKeUKNK2mn62t9TEQ2HE1nEk1PNsDuOdqqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769004270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yRBMOu6mpONK01WQ8romIEJ+ScgLOiloRnjHBQUWVEc=; b=EUq0qEK0vBpSHGvTq8oo7JnRieKZCZuBury9o1Xu5EtREiRz6ZMnxE+iHPRK05unK0lxes 2SRpLZ/KAdpOj8V8e+MqIsxJ0oSIS/JS5KKtQPgO8WGmpZNLma6mf2TohtJaD4lOvt2/Yc b0apQuX8g39PUEZ/Wh6BSOal5CzFevpd77Y/i3R+nv7zwSqzQ8lG4TCeOEO4mrGSlXgEuu ZvsPJoLL9VhPhcB9xN9/FS2WCwpnPgStlm2592wYDYhhZVPN16uFb6q84mfl8VSStxr+wa L9CZmeFBjgsa45NIEeQzPwlKKbuIJig2SOjmqbRV7zAewxpJDuTuus5S5IEV+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769004270; a=rsa-sha256; cv=none; b=RM4l6dIiG033WcavtKC3V3f40UUpZPTlxyONL9ZsR/KF7dDL1amGAW4JOnyql10CDk+dwP V1C8MhOe9CbFRRrByEzE1E+eF7Fac8xML5h6ndiTQ83027DTZUGUqAJdvpqSYPZPrNU2qg +fWYMP5Gpb5UGXpmIEMmFjKzuVd4P/qGDwDFyTeqhPoTFo3pLvP7oM5kcuQ4buzxFsz00g /M5Xj8eaMRTjv017HTQ+Iiw9lVmFbo8152NrqVUd4PGpfobTNA0KV8JN+mVBHi36yl6Jkr nMw+KR0FNrPz8qrpzP3jcnunRdSqC8UkaDomM7ypTJXPFOK5SHEBWldBvs+4/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx5Xt0yjqzr5r for ; Wed, 21 Jan 2026 14:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 216ab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 14:04:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: a83f6427c15d - stable/14 - dwc: improve IPv4 transmit checksum offloading List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a83f6427c15d0ae24c89c583e72abab9a4669d8f Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 14:04:30 +0000 Message-Id: <6970dcee.216ab.711f4298@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a83f6427c15d0ae24c89c583e72abab9a4669d8f commit a83f6427c15d0ae24c89c583e72abab9a4669d8f Author: Michael Tuexen AuthorDate: 2026-01-16 11:02:53 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 14:04:21 +0000 dwc: improve IPv4 transmit checksum offloading This patch provides two improvements for TCP/IPv4 and UDP/IPv4 transmit checksum offloading: (1) Use *CIC_SEG instead of *CIC_FULL, since FreeBSD always provides a pseudo header checksum. (2) Don't make transmit IPv4 header checksum offloading a prerequisite for TCP/IPv4 or UDP/IPv4 transmit checksum offloading. This is the root cause of PR 291696, since right now the epair interface does not support transmit IPv4 header checksum offloading, but TCP/IPv4 and UDP/IPv4 transmit checksum offloading. PR: 291696 Reviewed by: Timo Voelker Tested by: Marek Benc Differential Revision: https://reviews.freebsd.org/D54395 (cherry picked from commit f8ddf74175c8013268e65b18750e247306fa088a) --- sys/dev/dwc/if_dwc.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index 18e86ac025d4..62de67653761 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -685,7 +685,7 @@ dwc_setup_txbuf(struct dwc_softc *sc, int idx, struct mbuf **mp) struct bus_dma_segment segs[TX_MAP_MAX_SEGS]; int error, nsegs; struct mbuf * m; - uint32_t flags = 0; + uint32_t flags; int i; int first, last; @@ -713,19 +713,12 @@ dwc_setup_txbuf(struct dwc_softc *sc, int idx, struct mbuf **mp) m = *mp; - if ((m->m_pkthdr.csum_flags & CSUM_IP) != 0) { - if ((m->m_pkthdr.csum_flags & (CSUM_TCP|CSUM_UDP)) != 0) { - if (sc->mactype != DWC_GMAC_EXT_DESC) - flags = NTDESC1_CIC_FULL; - else - flags = ETDESC0_CIC_FULL; - } else { - if (sc->mactype != DWC_GMAC_EXT_DESC) - flags = NTDESC1_CIC_HDR; - else - flags = ETDESC0_CIC_HDR; - } - } + if ((m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) != 0) + flags = (sc->mactype != DWC_GMAC_EXT_DESC) ? NTDESC1_CIC_SEG : ETDESC0_CIC_SEG; + else if ((m->m_pkthdr.csum_flags & CSUM_IP) != 0) + flags = (sc->mactype != DWC_GMAC_EXT_DESC) ? NTDESC1_CIC_HDR : ETDESC0_CIC_HDR; + else + flags = (sc->mactype != DWC_GMAC_EXT_DESC) ? NTDESC1_CIC_NONE : ETDESC0_CIC_NONE; bus_dmamap_sync(sc->txbuf_tag, sc->txbuf_map[idx].map, BUS_DMASYNC_PREWRITE); From nobody Wed Jan 21 14:11:45 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx5jF5P6Hz6PGVy for ; Wed, 21 Jan 2026 14:11: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx5jF2jSjz3SNN for ; Wed, 21 Jan 2026 14:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769004705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XotLaQObxIp0Eo1PBkZKwjg6fNgsceZJhDgCnYgu9gg=; b=fCkrY4g73CHTi7Yy0w9RaxSnJDSTONebu39bILp3n73+wz45Xl2kxWpKjaV52frRHvhmJ7 TPJdRO7FaNae/slqhnR1CVBhiUTtSzZ+9UdB024/bejliy+NteqRFr3F1DcYIDI+74plR8 ST6KuhtjxavNsM3pv76PtEXJQL+lDetlEkzSu9ef6I9RnvIWeW4NZ+3hpQ0D4GQpj4ftcV 0VbOdr6QGiyIX2FAvOsXm61oXop62EEqQvdFigjluYzq81UBbqYQ8McYqcxueRBkKLgv4T 4sR/9MDyCAWL15i+R3NREGR6Pv4oOO3n5eKs6qb2Ibspv+7uOtThz83Y8D+aYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769004705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XotLaQObxIp0Eo1PBkZKwjg6fNgsceZJhDgCnYgu9gg=; b=oys7Ohq6BXlIsv+6/YVnrZ8PPBtihKCH1ZH/4Bs5jVHxWYsmOIUwl20t7NwbHXW+y6q16B hLpHtaepeAepI2ioU0wTRfopUk9cbalW/frW93ii2LVC3dzB/10TnbyQVOGTxj9iKxYoi4 TcJdKi6yKgUQGSWnLQBOXKyGdCrjIp/UpDBKvb2wFtq1NBIRSQejJFtTZMaiiAp+iX4NMf F7T4wWS/4XgvtlLhet/10uiZhr3sC4um+6FYGcYKZoLQOkVXUTvj/TkyMeuLhPcg06wXG3 4MrUXwQHCl9joamgkBbEZS53pEWRtnBmkTTrTlUwl9sittPESWf9doBnzW5ReA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769004705; a=rsa-sha256; cv=none; b=Bo9V0moCHDaPUSaVeYKWnAH9eZrDyjiOjZBZQBmMVn0nRwM24CvDeGzMIn5yGt3eUijRfq 6z6TK/8yCJwjNNwW+exbAxH3FG280TScM8aUsBhIgu/6uKrsszyvc7D5pz9EtfInJgRfl4 xijyR/L4Mxm9u5Exe6IcSi/zkkTb1WXCcFLL9mlcn0VaCMzm6/L8/b7k2x97o58FzNjU6q MFvr3/K4tMlrgqPhSvBOQVP/Wl6FZD+Yg7KdM0/IgKEH998tfpDlRMkJLy+jqal8KCGLk1 EvwWYDcILDEekx7u7jvy/3uD7Day2qE9NeDqRXmhOu6FUNH3LbU1waFK2AmMvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx5jF2GS6zqmb for ; Wed, 21 Jan 2026 14:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 227f6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 14:11:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 3fdfc6c77aad - stable/14 - ipv6: account for jumbo payload option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3fdfc6c77aad8eacce0a8e609cc435db1070d726 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 14:11:45 +0000 Message-Id: <6970dea1.227f6.54c824cf@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3fdfc6c77aad8eacce0a8e609cc435db1070d726 commit 3fdfc6c77aad8eacce0a8e609cc435db1070d726 Author: Michael Tuexen AuthorDate: 2026-01-16 11:49:40 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 14:05:01 +0000 ipv6: account for jumbo payload option If a jumbo payload option is added, the length of the mbuf chain is increased by 8 but the actual hop-by-hop extension header with the jumbo playload option is only inserted in the packet if there are other options. Therefore, adjust optlen to reflect the actual size of IPv6 extension headers including the hop-by-hop extension header containing the jumbo payload option. Reported by: syzbot+73fe316271df473230eb@syzkaller.appspotmail.com Reviewed by: markj, Timo Voelker Differential Revision: https://reviews.freebsd.org/D54394 (cherry picked from commit 1f5b1de1fdf2924066c1851ed6c73f36fe20b438) --- sys/netinet6/ip6_output.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index afc8b60e4cbe..10569b7d1026 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -584,6 +584,7 @@ no_ipsec:; if ((error = ip6_insert_jumboopt(&exthdrs, plen)) != 0) goto freehdrs; ip6->ip6_plen = 0; + optlen += 8; /* JUMBOOPTLEN */ } else ip6->ip6_plen = htons(plen); nexthdrp = &ip6->ip6_nxt; From nobody Wed Jan 21 14:20:52 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx5vn0YyTz6PGnY for ; Wed, 21 Jan 2026 14:20: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx5vm6WHdz3TP4 for ; Wed, 21 Jan 2026 14:20:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769005252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9GT+mFmKFSr/sHANH5yLrfMp1pHTJgZpmdCmmv83zD0=; b=t/W/FWUh9u985WwAlfVfT/0rfSxc62D92f2BstGtIZ6jA0L8FafLiTPGtUL8n27I1S4OGD 26/UtVVvETO2hZ6riXXc/j81oJJH2VVeJF/7xjK093PMME9RyPRBQckVmS5mvmMZ3rf4Vp 8/MYFRCaVdGmnwj+3lbFM1YQIt8kEAVTzGPgaRtaoDOQRBwWaIafXPT++bn42i2qHkY0LX RhSRiwtctvXlkWTNEODMl58aCaKKN2QQPi38lXTpZVWNIpiOOEIQtdaCI4zA3vf6o++Txr XNKJq0IPBHcmBJRC68kxA7BqwHkUDwCG7gAaIcMLGRj0fS/noMLUdpFF8TJn/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769005252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9GT+mFmKFSr/sHANH5yLrfMp1pHTJgZpmdCmmv83zD0=; b=JV+00hEkWdISchv8Q594qg9CcbVqgSTDLldNegYSIrYkLTOBwYFNkIh3hLjf7XbzNkL6oj ob9uErMO/75JR99Nx0No09yEBAbCor9vMFgveUNHQLCbr7aDfrisBEaV7U9YVWTflcsHA5 P7XsA3zeQ352iv6qH2o9Jke5w6x4Os99rrofSi2GrdYVoQsR20WJrsnI41phm8kKA1TA1b /1oUiTt+fI4dBpdejD7wTVpIeaLCNXGP75++GFpH/URzXdrCppJOAmn2ii+9C9XxxQPoR3 ATbFjxDidZ35CEk51O9fFNWgdXQY+QpiDJbqgatsfV4sYJVfdRtA9/Imef4apQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769005252; a=rsa-sha256; cv=none; b=gJdOUjLtf/KwZBXkUWoghoCaZH1tkCYtjrW/39Dj/XhhAXurO7Ax9WI168N1jCBitCPUbR hzvCbbWL/aDWsztWs7Rx3Lf+ueqAe/cSNzBXoTTLeYXUeGQg6Fpv/XuLo5t7meO3qor3Ck 1j5xpsZ2aNIHOg18yQ7p7jz9eZxWGAdZ0Skki7U2QC3LJG7l1rj6h5vHl5sNfe/GDYv2tW KzUsIdoRqlbcwnpo/tV4Ar0dzriVtzLUxGnqZjqyy5bHdX04M0HD4QnEnuYTFYh6/Tfg3H ccF0tZL6SxIcfQexPGPEvMOwRMES2rlS8i50CFECh75W/LMf6+W7wtXoqW0eMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx5vm60CpzrWs for ; Wed, 21 Jan 2026 14:20:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24253 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 14:20:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 39a25aa8a736 - stable/14 - bge: disable TXCSUM if UDP transmit checksum offloading is disabled List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 39a25aa8a736a827f7a99e682fdb1579af4e8df5 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 14:20:52 +0000 Message-Id: <6970e0c4.24253.152137dc@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=39a25aa8a736a827f7a99e682fdb1579af4e8df5 commit 39a25aa8a736a827f7a99e682fdb1579af4e8df5 Author: Michael Tuexen AuthorDate: 2026-01-16 12:32:13 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 14:11:56 +0000 bge: disable TXCSUM if UDP transmit checksum offloading is disabled The bge interface is special with respect to transmit checksumi offloading. In the default settings, an bge interface announces TXCSUM capabilities, but only supports TCP/IPv4 and not UDP/IPv4 due to limitations of some of the NICs. This results in problems when the bge interface becomes a member of a bridge. Since currently only the TXCSUM capabilities are synced when a member is added to a bridge and not the protocol specific capabilities, this can result in a situation where UDP packets are sent out using a bge interface without having a correct checksum. To mitigate this problem, initially don't announce TXCSUM capabilities, when UDP transmit checksum is disabled. It is still possible to enable TXCSUM capabilities via ifconfig. PR: 291420 Reviewed by: Timo Voelker Differential Revision: https://reviews.freebsd.org/D54486 (cherry picked from commit bbd30927b1af44226c8de0512912a7fedfce2824) --- share/man/man4/bge.4 | 10 +++++++++- sys/dev/bge/if_bge.c | 14 +++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/share/man/man4/bge.4 b/share/man/man4/bge.4 index de559c16df3c..fdf46fec0073 100644 --- a/share/man/man4/bge.4 +++ b/share/man/man4/bge.4 @@ -29,7 +29,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 18, 2017 +.Dd January 16, 2026 .Dt BGE 4 .Os .Sh NAME @@ -276,3 +276,11 @@ Also, due to the lack of hotplug support, Thunderbolt-based interfaces must not while the system is up as the kernel is currently unable to cope with a .Nm interface disappearing. +.Pp +The UDP transmit checksum offloading is disabled by default, see +.Va dev.bge.%d.forced_udpcsum . +To avoid problems when the interface is a member of a +.Xr bridge 4 +interface, all transmit checksum offloading is initially disabled in this case. +Transmit checksum offloading can be enabled using +.Xr ifconfig 8 . diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index 6c3301b1473a..b676f03f715d 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -3721,7 +3721,12 @@ bge_attach(device_t dev) if_setgetcounterfn(ifp, bge_get_counter); if_setsendqlen(ifp, BGE_TX_RING_CNT - 1); if_setsendqready(ifp); - if_sethwassist(ifp, sc->bge_csum_features); + /* Initially enable checksum offloading either for all of IPv4, TCP/IPv4 + * and UDP/IPv4, or for none. This avoids problems when the interface + * is added to a bridge. + */ + if (sc->bge_csum_features & CSUM_UDP) + if_sethwassist(ifp, sc->bge_csum_features); if_setcapabilities(ifp, IFCAP_HWCSUM | IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU); if ((sc->bge_flags & (BGE_FLAG_TSO | BGE_FLAG_TSO3)) != 0) { @@ -3732,6 +3737,13 @@ bge_attach(device_t dev) if_setcapabilitiesbit(ifp, IFCAP_VLAN_HWCSUM, 0); #endif if_setcapenable(ifp, if_getcapabilities(ifp)); + /* + * Disable TXCSUM capability initially, if UDP checksum offloading is + * not enabled. This avoids problems when the interface is added to a + * bridge. + */ + if ((sc->bge_csum_features & CSUM_UDP) == 0) + if_setcapenablebit(ifp, 0, IFCAP_TXCSUM); #ifdef DEVICE_POLLING if_setcapabilitiesbit(ifp, IFCAP_POLLING, 0); #endif From nobody Wed Jan 21 14:24:54 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx60Q1nC5z6PGL3 for ; Wed, 21 Jan 2026 14:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx60Q0hJ0z3VcL for ; Wed, 21 Jan 2026 14:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769005494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QtajNH8iaK+gum4ZzhznH0UYR6iEPTPU2Brvx7TdRl8=; b=bMVq2aOPIHjVzU80Iffu60XM6MrMV7meJBiQy2F3kOT1JHfYAx5rQeoaTST1GOQPojMkwR ZNLsyono76WA9bPWvgyAsHSsItLDsYP4cwOwpLY+SgY/IpwNDLn1cNXj1jb6fCznPCvOAc T0xw59ktaL4fUfG55ZA6sTfuYea4WLOmhQHI9SpxUlEibkWxIk1HpTBOCYh5sX5qEBIUWz kJl95RQAikQ5/qQfMKcwcwt7ew1fnXgccA+cpSv6GNGZuHhkwjrRBlek0gO3F7y/l1B0vR tQ1y/XkS/w1Cbtx/zzYl4lcQpqyWie4jRiGXmWSUsyonHm4+jNzTOdVFKcbZjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769005494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QtajNH8iaK+gum4ZzhznH0UYR6iEPTPU2Brvx7TdRl8=; b=s210LPpr/ZM6dzOS+M+bjApOejxQmRWr/ZH4HfYUfDfth5FB4LeNTHXsnvJdk6mKyd+un4 s2D7wpFjougoJ3/2d87eareY4xdqDPPYlUpFYrINChnBikpnnwNBvuZPEfuPL5G/FqzmHc ucK79x6jtYo4rmzvOFa93GwET/PkNT5w64snth2qJ6+6Dn8kO+xS2SIf/cf+Het6V/xS2C kEW9AWcdjM2mz55LG8jD46JRhoUFrxiMba43GIqJoI/epwRw5tOAUMNVYnvmaqNoNn0ubc bodGvwIMSux6AMleb5VlyC/Fl8+P/hsmufCqd7Km5FT7+dvdID1xgAc5qdqwWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769005494; a=rsa-sha256; cv=none; b=tgxlLa+PjWimuUWzvfTIFrQ00ZCKM6jlLXAS3InN4gjhG5WZT3Oqf33VpE4ykZrSaI/Rxl JI8D7mZ+9NpPft2mwxJdbIfvudzXBeOJzABZvF+4o/AuTjIIoj00I23NJGikfi4kdJivA2 lsKz4xmjrk6Nsx55PcT95z9yiB43GVz5wCXCpquB3lTermypXOE9kbEb0TdyjpWG+hqr96 KYrg/MajBlgW1sVB+IvthRQcwceYITrj2AWO/AAitPNYKGDWGAC2qjpfM75ulhNR2Cgpbg m0xMUJ7dSQvr5NNV0wz89VAYZriOeL8i9cgB26bY+GwgbgDvuBdzpTRHm/PP9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx60Q097jzrm7 for ; Wed, 21 Jan 2026 14:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23e2b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 14:24:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 88249c111d43 - stable/14 - dwc: prepare for IPv6 transmit checksum offloading List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 88249c111d4372a8a307bfc08e0c87d1b5c6a7a7 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 14:24:54 +0000 Message-Id: <6970e1b6.23e2b.5b22e862@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=88249c111d4372a8a307bfc08e0c87d1b5c6a7a7 commit 88249c111d4372a8a307bfc08e0c87d1b5c6a7a7 Author: Michael Tuexen AuthorDate: 2026-01-16 17:28:01 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 14:22:49 +0000 dwc: prepare for IPv6 transmit checksum offloading No functional change intended. (cherry picked from commit 97b177f51fb939943ef920415e541d00789d12f4) --- sys/dev/dwc/if_dwc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index 62de67653761..3bf49081e2da 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -1257,9 +1257,9 @@ dwc_ioctl(if_t ifp, u_long cmd, caddr_t data) if (mask & IFCAP_TXCSUM) if_togglecapenable(ifp, IFCAP_TXCSUM); if ((if_getcapenable(ifp) & IFCAP_TXCSUM) != 0) - if_sethwassistbits(ifp, CSUM_IP | CSUM_UDP | CSUM_TCP, 0); + if_sethwassistbits(ifp, CSUM_IP | CSUM_DELAY_DATA, 0); else - if_sethwassistbits(ifp, 0, CSUM_IP | CSUM_UDP | CSUM_TCP); + if_sethwassistbits(ifp, 0, CSUM_IP | CSUM_DELAY_DATA); if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) { DWC_LOCK(sc); @@ -1728,7 +1728,7 @@ dwc_attach(device_t dev) if_setinitfn(ifp, dwc_init); if_setsendqlen(ifp, TX_MAP_COUNT - 1); if_setsendqready(sc->ifp); - if_sethwassist(sc->ifp, CSUM_IP | CSUM_UDP | CSUM_TCP); + if_sethwassist(sc->ifp, CSUM_IP | CSUM_DELAY_DATA); if_setcapabilities(sc->ifp, IFCAP_VLAN_MTU | IFCAP_HWCSUM); if_setcapenable(sc->ifp, if_getcapabilities(sc->ifp)); From nobody Wed Jan 21 14:29:47 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx6634frDz6PHDb for ; Wed, 21 Jan 2026 14: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx6634Btyz3Vw3 for ; Wed, 21 Jan 2026 14: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=1769005787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X8X0Gh8hzYAB3htOONpQL5jIw4SHFgyV5NrfuEJ/Dto=; b=dKWo9LS524gWUFelxs9TjG9NnakyM7AjEr3qnOfj2jRr4I6W2nkgm96TCArmakpE/1E2JA fwR39Ai3l6mhbjpe42rCbVi1dJJNF8OUwaVQbUhiCahtiWoUPwCdhSXp3iILk0xczU+Jum EurF2zTpQDfI+JIHx6bQIlLrb4d25Vp1klr+Q1/hRfDewl2YGarir+tIx/1942PqxO8fNM XmFqq7/s5B98yKjo8fn5sHVmEAtk4ND8ygO6H0Jxh64IqVlC6NP5x7Cu+K3CL1Gjs68cO2 WCAfPXwU/CW7gPMKVSUEq3bciQU1cviIh4tfZYC4khPyLSN9i0bqAyboSE+4EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769005787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X8X0Gh8hzYAB3htOONpQL5jIw4SHFgyV5NrfuEJ/Dto=; b=u0+0Qldone39zA+1pg0VVN2wtCisZMY383M1+YFoQquzZGc17OYmA/WK8umWUtzVGcwymx kBOVAISj+bW9O7aUePB2mGCN9izzKzmqCzgO5qnDxIxnGN1Dph6+94XqtyUY0Em+3jGpKQ VeshpwimgD+iaBHg6Rs9xK4NhIQ47WEmdgPXSfRqFs9+9Xt7yvbpmMwURnPCt0ou+aE17X HzJT+2lT/4+zyDcq7JJ9M12Tth2HL2EGYhwaRoLDOUfBT7rg9zdDYaUOzajlJjwvu67tAv Ks3Af9+5Zh/5jlu3DEjvgpV35cxpR+r6SIHjjLYGs2PFWH1mFFdeWGComM4nbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769005787; a=rsa-sha256; cv=none; b=VgOdl+FNOvOC+gKgiAmkMkA7klcBguQt0GfQpwLalaDia6HZRyc17Mga11Ca1i4TzALx4Y zjAzYtJnVYk0Q9q5Cuj9MKMJyxsI0Yi0tfk18KdQ6wdcSB/lg9a31vTMSWNKuKHl1akPkQ 9y0SF5ErcOWMw/vC2kiKoOAx5L4G+ue/M/mmbLxTsoYv/8CtaKnfn5e31/SGYmVFE/9393 hHDDQ+O2WSzSOQss6wkff84RiGW5jsdF2xiKn0wg+A156JvDR6jk2b5TPNAzbGzNCppzgW tVpny3zbciBQCvNyq6E0sDPnsGM2JH1ysb1hxUOHvRCPiiAVotCW3qqTT7H1tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx6633GgxzrbB for ; Wed, 21 Jan 2026 14:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23aa2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 14:29:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 81bddae7a4dc - stable/14 - dwc: add transmit checksum offload for IPv6 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 81bddae7a4dcea29998ed417ad55421ad401c579 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 14:29:47 +0000 Message-Id: <6970e2db.23aa2.7ef2af7b@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=81bddae7a4dcea29998ed417ad55421ad401c579 commit 81bddae7a4dcea29998ed417ad55421ad401c579 Author: Michael Tuexen AuthorDate: 2026-01-17 20:01:54 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 14:27:48 +0000 dwc: add transmit checksum offload for IPv6 This patch adds support for transmit checksum offload for TCP/IPv6 and UDP/IPv6. Reviewed by: Timo Völker Differential Revision: https://reviews.freebsd.org/D54754 (cherry picked from commit aca67c37a5215448828a2974a2ff44e75e9159bc) --- sys/dev/dwc/if_dwc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index 3bf49081e2da..6d9b3b192c06 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -1260,6 +1260,12 @@ dwc_ioctl(if_t ifp, u_long cmd, caddr_t data) if_sethwassistbits(ifp, CSUM_IP | CSUM_DELAY_DATA, 0); else if_sethwassistbits(ifp, 0, CSUM_IP | CSUM_DELAY_DATA); + if (mask & IFCAP_TXCSUM_IPV6) + if_togglecapenable(ifp, IFCAP_TXCSUM_IPV6); + if ((if_getcapenable(ifp) & IFCAP_TXCSUM_IPV6) != 0) + if_sethwassistbits(ifp, CSUM_DELAY_DATA_IPV6, 0); + else + if_sethwassistbits(ifp, 0, CSUM_DELAY_DATA_IPV6); if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) { DWC_LOCK(sc); @@ -1728,8 +1734,8 @@ dwc_attach(device_t dev) if_setinitfn(ifp, dwc_init); if_setsendqlen(ifp, TX_MAP_COUNT - 1); if_setsendqready(sc->ifp); - if_sethwassist(sc->ifp, CSUM_IP | CSUM_DELAY_DATA); - if_setcapabilities(sc->ifp, IFCAP_VLAN_MTU | IFCAP_HWCSUM); + if_sethwassist(sc->ifp, CSUM_IP | CSUM_DELAY_DATA | CSUM_DELAY_DATA_IPV6); + if_setcapabilities(sc->ifp, IFCAP_VLAN_MTU | IFCAP_HWCSUM | IFCAP_TXCSUM_IPV6); if_setcapenable(sc->ifp, if_getcapabilities(sc->ifp)); /* Attach the mii driver. */ From nobody Wed Jan 21 15:17:50 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx79W3LZPz6PL09 for ; Wed, 21 Jan 2026 15:17: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx79W1DGZz3btn for ; Wed, 21 Jan 2026 15:17:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769008671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fgHTYXx1U5i95AFm/vev/KUbj2xTyHZUr2MxNqeDVpc=; b=VUJFnjHw8HUA2uhcYPnElmhhYPeN+DR9DHVBbI7xR1TVNUtdy4u8VVkjUTvtB2mw8tOQjS OD0nGUngYpLH6Thmc5Sw1z50gJh4B46LOVJEz5jI8igUY187H6bhmWRV+f316rxXcHfCXU ssIy/cNNgMqSccqQ7BbL0jhY09o23fbprxd6tGv+zi8X8SC+MaMpqc2PB7lQhAZFhJe8vy UJHbkngHRl/61+mf45U0+6lCuA+O9ylipwKXgys1zRXO7l6JkyFvjM51ISEnHg7O+nq9/c 8eW0vFVqR3QCFxN1MMyhGALzU+tWIKRYGWgJwfBfhq500myvHzYXZS1i5ssADw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769008671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fgHTYXx1U5i95AFm/vev/KUbj2xTyHZUr2MxNqeDVpc=; b=kiw7d8W4ErxYjedPW2bAG82hVh8X5KOWbV85NKWBxAkz4ZJ7oBJ7c8vKyDBrhtT5hqJdtz 7RR2L1TitHldjnmfnuF6CzbifaNPImfHVgDLM9g/n5J/ygFBFxswKq3yolbWtUIOi/1fNv yjjT7h6lakBfVdmIHa+ZIwLVOel3AwfiuNwPTerQ37pHxi38DvWeWVvcVAJHDyc8Nl9ejJ kJZXQnfisURYMHM4GpxwPKaB2Ui/1jR2Z5C7zo6FyLu1M9ykQA7QP0oQXfnm+hVrYUykwe 4e3xtQR/9B4CaOrjL9P7tqUZ5WSKiolhMvhFuM5g//xq6P8D8pGm8QHqveVqaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769008671; a=rsa-sha256; cv=none; b=mWbgLRyLrE7UVpGX4v0VPaVhV4Ql98s9BNqpm7QDYS/3duNH6dJ9DZrFzJSnES7jbQXzpw CGn4cDKMmptEpUij7LAiERmNqgeJeBqE8Re6V7qINW85bXqVbbgqOfWPtxFCKQ5BIbDDzR NbFbePxwIZdj1KGBlbkE7r4js5JUveQMq/V8pPdI/fFu70cfh96ZCVUSBK2hyNfG2Q8oMl rjYJeAC6Lcyt/lfuOToFvNI1V7uTkhNV5PR7UFkSR9mfBwBRvzca+gORRWNKaDG8WBljd9 AQOA14Evp311m1Vs88qbhv+sLoTZgAIJgzu7BOhetzqlApP/z2lUvS11Si7U7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx79V6x52zsyk for ; Wed, 21 Jan 2026 15:17:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 306d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 15:17:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: d9665287cd60 - stable/14 - dwc: add receive checksum offload for IPv6 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d9665287cd602314ab54e2aba93c1096d61457e6 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 15:17:50 +0000 Message-Id: <6970ee1e.306d2.12c3c855@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d9665287cd602314ab54e2aba93c1096d61457e6 commit d9665287cd602314ab54e2aba93c1096d61457e6 Author: Michael Tuexen AuthorDate: 2026-01-17 20:06:28 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 15:15:50 +0000 dwc: add receive checksum offload for IPv6 This patch adds support for receive checksum offload for TCP/IPv6 and UDP/IPv6. Since receive checksum offload can't be configured separately for IPv4 and IPv6, IFCAP_RXCSUM and IFCAP_RXCSUM_IPV6 can't be changed independently. Reviewed by: Timo Völker Differential Revision: https://reviews.freebsd.org/D54756 (cherry picked from commit 5d8777f3a7aee04eabbc9f3cf12138f9b56e3ebc) --- sys/dev/dwc/if_dwc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index 6d9b3b192c06..898fc75d2653 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -1252,8 +1252,8 @@ dwc_ioctl(if_t ifp, u_long cmd, caddr_t data) /* No work to do except acknowledge the change took */ if_togglecapenable(ifp, IFCAP_VLAN_MTU); } - if (mask & IFCAP_RXCSUM) - if_togglecapenable(ifp, IFCAP_RXCSUM); + if (mask & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) + if_togglecapenable(ifp, IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6); if (mask & IFCAP_TXCSUM) if_togglecapenable(ifp, IFCAP_TXCSUM); if ((if_getcapenable(ifp) & IFCAP_TXCSUM) != 0) @@ -1735,7 +1735,7 @@ dwc_attach(device_t dev) if_setsendqlen(ifp, TX_MAP_COUNT - 1); if_setsendqready(sc->ifp); if_sethwassist(sc->ifp, CSUM_IP | CSUM_DELAY_DATA | CSUM_DELAY_DATA_IPV6); - if_setcapabilities(sc->ifp, IFCAP_VLAN_MTU | IFCAP_HWCSUM | IFCAP_TXCSUM_IPV6); + if_setcapabilities(sc->ifp, IFCAP_VLAN_MTU | IFCAP_HWCSUM | IFCAP_HWCSUM_IPV6); if_setcapenable(sc->ifp, if_getcapabilities(sc->ifp)); /* Attach the mii driver. */ From nobody Wed Jan 21 15:18:50 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx7Bf3SR8z6PLBC for ; Wed, 21 Jan 2026 15:18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx7Bf2bV4z3cKF for ; Wed, 21 Jan 2026 15:18:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769008730; h=from:from:reply-to:subject:subject: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/yfh0z+K760xLlccd91eDNvCRaT4l0GHFT/NXY54RA=; b=As8YSB3feaDS8cw+4p3sdZLaG8iWl3MKVRnpdidIsFKCzvtQKpQ18bYZNZ1thxRnGunNuI n909H6OojzRmII2DVMWGnFywpLvlslFK6IZfnOChAynGe4SFUfhIj2yTV44QaK3wesygha EungkaH0jsyp6CL5Z5z4Ed0qscFV1KnQPYleKEHfC6Te6+GjXuxNpo2CBCeAb8QEVMFNuF BSmO90Ap7++pOLEcN/kTn2IRinHKvBLOBSQZhuHwVVF/IkwXUt/xH+qp3ZeeZFOyMcgFIN 5GQH6u4Y/inn0kmVHCWf42kujuWXQIoVTKGN7STVh4EmocYo0M4wk73j8fesgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769008730; h=from:from:reply-to:subject:subject: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/yfh0z+K760xLlccd91eDNvCRaT4l0GHFT/NXY54RA=; b=Y8y2mMlqmCHWzgwz0mHgUUm1P+LSoXyN412zx0gCCoFQl+7uElqs9Vgqc6rho3fB560Ui6 r1VmWcn56QwS9zG1pkkIQaleAuMzzwJSAY2oN8VfgLltCDlWr197uGjcNR8/0U5WNWU1FA 6QATkFBtQFfjDrx5f6gTr+jrOuIaPX3zP8np4mP5LZS4B/L+OXS2Jvu7nsVzAtwKoPs8M7 KDGP6FiDdVoIjVIJNrvP32/Uvh7H8mFyHArQGWnsfdp/pGQbZAXPheFe17daHCJW6GR8H7 2+zWYYrr8ymrFbgxUaJZ+5DXt1yXhRjDIwFHpl6Z6+GpkzTLGUsX6985ZZ1fGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769008730; a=rsa-sha256; cv=none; b=J1r5tnbdPZZg7uBbzzDYC+TeC1DtKsuqdqZzzhns63kbx4d1WXXEHbU8ans2x4XO8OF/U8 3zWC8puUhLtVGqnbVgUMHfD2ADhBc46++uRVtMO5OKuFJrwBCmdsc0g2AnTfe/A2WxiGL6 3mUrGxgzBDruZhShUWasKfRXl/6WEfQ53bG0PH/DckduMheoYH16u5s3hJqW/seuAtfJBT ZdHhK6hfzmWjOvqU6IifKDKRxLLWJ/bQ3Q+2o1TNzXL4JhuD+LMMShgAfl2w8e+nlBLVDc d51IMyKVBKX0PZsSQbjlaC/Hxyxr0RPhHE7ZaVldSokrFJm4C/PVRvzAaUyNww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx7Bf1whjzsp9 for ; Wed, 21 Jan 2026 15:18:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 316e6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 15:18:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: e8731113c601 - stable/14 - netstat: fix typo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e8731113c601a4ed0d2faa3a1e8aaee643176760 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 15:18:50 +0000 Message-Id: <6970ee5a.316e6.ec1bf05@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e8731113c601a4ed0d2faa3a1e8aaee643176760 commit e8731113c601a4ed0d2faa3a1e8aaee643176760 Author: Michael Tuexen AuthorDate: 2026-01-18 12:26:52 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 15:18:14 +0000 netstat: fix typo (cherry picked from commit 0ef8f7133d0f1ee28af1689f013f18e002eeae9f) --- usr.bin/netstat/sctp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c index 87573929010c..1ff949e78985 100644 --- a/usr.bin/netstat/sctp.c +++ b/usr.bin/netstat/sctp.c @@ -660,7 +660,7 @@ sctp_stats(u_long off, const char *name, int af1 __unused, int proto __unused) "{N:/output AUTH chunk%s}\n"); p1a(sctps_senderrors, "\t\t{:send-errors/%ju} " "{N:/ip_output error counter}\n"); - p1a(sctps_sendswcrc, "\t\t{:performed-receive-crc32c-computation/%ju} " + p1a(sctps_sendswcrc, "\t\t{:performed-transmit-crc32c-computation/%ju} " "{N:/performed transmit crc32c computation}\n"); p1a(sctps_sendhwcrc, "\t\t{:performed-transmit-crc32c-offloading/%ju} " "{N:/performed transmit crc32c offloading}\n"); From nobody Wed Jan 21 15:22:11 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx7GW1jHJz6PLVy for ; Wed, 21 Jan 2026 15:22: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx7GW0yzRz3d2P for ; Wed, 21 Jan 2026 15:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769008931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1K6XwSGfTY/B3D5bNaW/MFR5FHHq9KE1rQUv4zMaO9g=; b=aMAwHbpFoL3SVaU1wO+BNZjiHhHRVznw8gmWrjlsoDE0FQIz04AJJPU+fX9HHfI7TSz/cD jDplRK2+253bcGciAH1PlZobdZl6enpEV6GTtLbMLybhaLdLCWAG3dTsY9wbOthev/d3HO QB37om1A5aUD9qFJXr2RDjk7g3oL4CJqKQv1Ye/wMGw4RouttqQEhqm8HO6NH65o6vhZR8 yF9yxPHvxwON8QwyUitv0eGT+z1Guk30Ok4kssbN2vmWGsNO0iosGxx5Ajuf25Mwuoi9sx bOn85JrtLBqMjp6BcjuBCkOI7GKr/uvo+zOBHMXX0rS7LCVow0fQ+PRVLecgig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769008931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1K6XwSGfTY/B3D5bNaW/MFR5FHHq9KE1rQUv4zMaO9g=; b=Wre2P3EioS66w6eqpGxmmwXap2KywT6tG8QAxcHHKbfn74TRNv66llQHhHFLSYch7xo5yH Re0kXNOb9QiUOu8flc3HJWm4I1eNFoOayRc22AwTcKFW8ey3JCPT3ZqHvL8Ojj5kVkSJqb AxIgyfJY0S6PeMp2oidUm4pbtg0G5dmHRq4dkuGAnYQBIsYj1f841pe/XYSX1uRWs10E24 eJQlYdkbPrPDYHEjTiDKvYlDv2ZXWInOrpFp7esCx/5YE6DrbwKQg5BnsWrcXYj+9v4CJa SDDttqNaRGjhTwEvOEPPge83Zy77M1Ztmrhff8PJh9+KaLTHOEKwy/IBzlwCVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769008931; a=rsa-sha256; cv=none; b=ubJ8mlyIuSRkSpHNSpo2r1gZAx+mHDuddyz8byaO3KgDP5odb81Nl55AmS0SwubsXeMFIZ iBxL6iKTkId5X8zhjhZtOcof3z+EhLoKfbIeyClVnUCQGRwBM2qiS92N6fOCBpMq0I73H/ JD3rLmWF2EYG9gwXVM/Bwe6e8jWFfb1faFiV5HxMAkxraLEQHvP6z8F8i/zm+Kd+vlw5cw mPs3W1WdtjHvmeZF/q/HMDjr0Muw7izEkMjW8ONf7yqykU+iyQDziIs8fQ2SC8aLUR9i41 5M8PGgg0tBib54dNBudlovPwcytmZTvguG9Dmpt6KLx2yOy6b6Wt+opiBslVIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx7GW0XDnzspw for ; Wed, 21 Jan 2026 15:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31bd2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 15:22:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: ae83ce2e7ada - stable/14 - sctp: improve compilation as module List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ae83ce2e7ada37a5362da621ba9c6c09e75a2c68 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 15:22:11 +0000 Message-Id: <6970ef23.31bd2.4f4721c@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ae83ce2e7ada37a5362da621ba9c6c09e75a2c68 commit ae83ce2e7ada37a5362da621ba9c6c09e75a2c68 Author: Michael Tuexen AuthorDate: 2026-01-19 20:38:37 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 15:20:01 +0000 sctp: improve compilation as module When compiling SCTP as a module, don't compile sctp_crc32.c into the module. This avoids code and variable duplication since sctp_crc32.c is compiled into the kernel. In particular, the variable system_base_info is not duplicated. This fixes the handling of the statistic counters sctps_sendhwcrc and sctps_sendswcrc when using sctp_delayed_cksum. (cherry picked from commit 68a449f09e2a38def9df822d42f91ecd2f27b0e2) --- sys/modules/sctp/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/modules/sctp/Makefile b/sys/modules/sctp/Makefile index 4e91d7572ab0..86fc166eb91e 100644 --- a/sys/modules/sctp/Makefile +++ b/sys/modules/sctp/Makefile @@ -7,7 +7,6 @@ SRCS= sctp_asconf.c \ sctp_auth.c \ sctp_bsd_addr.c \ sctp_cc_functions.c \ - sctp_crc32.c \ sctp_indata.c \ sctp_input.c \ sctp_kdtrace.c \ From nobody Wed Jan 21 15:29:48 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx7RK1x2nz6PLd7 for ; Wed, 21 Jan 2026 15:29: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx7RJ6g9yz3dfp for ; Wed, 21 Jan 2026 15:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769009388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Nhq8U/YgIhNRMd4WXf6YYGkYYwYAMeNhUWcVRaL28c=; b=TRA0kAxWBy73hs3IEFxP2t1rMxndltZmqdRZ9MEqqh8PPB/QJ74Q3UYo6zpX5dgp2z9uFU F1BsXmCreLWv+8x8O4sBXk1Zt15KltPh5EO2aGAkmMV8flZNjQotujlHrKd9EJ4TWn9JWw +llGfKlTzFEP4HpJsSB8dVuu+rVXxh8zu/ZVHLBp7MD7cPkmlXm9pku51Yx82w5qWrr1N6 yRPzZ5RFQ73qCg/UOoWZjibYRK0NjKyZffqh1dgv3IYunrKd11mPStv6vHWwn2i/t23VCp hNXfI3dZdV8Z1sKvO+vxxcuGRw2nXDNc/+oXHMmUTVJHfhXA8QHyy6pgm/ldUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769009388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Nhq8U/YgIhNRMd4WXf6YYGkYYwYAMeNhUWcVRaL28c=; b=lhjmrMryZGMozJg7kp7K7zH8bj4jm6Mv8nEc0lnULEJK+j0dAiOTEOZuS86T7/4ogLKLTV 73m/Y++cTqqtu6542dTzAncz3oMouySeZ7JmeYtVZrIw8YpInjIP8oY9TCE495Fsciws7O zujE0xJW9WV76fHM3nb9dJOkJf4IYi2IvPQpZTJIHpaNNu/Uj0N5zuGONYfMu+bD0BxkW+ e3Nf0ZRsHcjoEn7naDmUYTRazCgZJzx/jAFtXPMdzXLJxpv04ZSkeHLbCekgRUTvm81yXh OcVAcOhc8Ijjalv5zIFtE0S5ZjyVXNhFciL9/WEvoNTymccfgQl/Q0eF5nl9FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769009388; a=rsa-sha256; cv=none; b=Z+ABuXEN72OfHZx53Z5or0Tw+o1q6ajv8H94t+H/on9tavC4ovb6opaS6SlLTIDPlRV2vf kYcJLT7eeC9vRymPr/tFzktnZXj9aIJz1b/AhO7KNlWp1rqje2axtFvJ1o4ta/TvDK84vO 5NAQ3dJE5rJrl1dRHFT/66eJU9NerpFfGCxBWSx8n5poT2zjpuF6ehtuaD32QT/mkp0X2s htNYYhDsoRgk6Qb9Y/7DiZ4pYIS6NTxItXBdVLXHCH9b4wBrv9UurTQxynMF9XHI2MxKoz U6lHbyDuvnAPGKA9UafhcI2aLhnuZo3pX0qEohuxjGTt/tf/rbjt7s5t6Q6Eew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx7RJ5QxQzt0J for ; Wed, 21 Jan 2026 15:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30aa2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 15:29:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 35c9d8f04a19 - stable/14 - dwc: cleanup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 35c9d8f04a192310d37aa13e5749f3a6933693e8 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 15:29:48 +0000 Message-Id: <6970f0ec.30aa2.1dabe027@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=35c9d8f04a192310d37aa13e5749f3a6933693e8 commit 35c9d8f04a192310d37aa13e5749f3a6933693e8 Author: Michael Tuexen AuthorDate: 2026-01-20 10:25:31 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 15:26:48 +0000 dwc: cleanup Reviewed by: Timo Völker Differential Revision: https://reviews.freebsd.org/D54788 (cherry picked from commit 3d771e0db66da77da5a7f323df1c0638e6b586ea) --- sys/dev/dwc/if_dwc.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index 898fc75d2653..147b6351a9f8 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -523,7 +523,7 @@ dwc_enable_csum_offload(struct dwc_softc *sc) DWC_ASSERT_LOCKED(sc); reg = READ4(sc, MAC_CONFIGURATION); - if ((if_getcapenable(sc->ifp) & IFCAP_RXCSUM) != 0) + if ((if_getcapenable(sc->ifp) & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) != 0) reg |= CONF_IPC; else reg &= ~CONF_IPC; @@ -713,7 +713,7 @@ dwc_setup_txbuf(struct dwc_softc *sc, int idx, struct mbuf **mp) m = *mp; - if ((m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) != 0) + if ((m->m_pkthdr.csum_flags & (CSUM_DELAY_DATA | CSUM_DELAY_DATA_IPV6)) != 0) flags = (sc->mactype != DWC_GMAC_EXT_DESC) ? NTDESC1_CIC_SEG : ETDESC0_CIC_SEG; else if ((m->m_pkthdr.csum_flags & CSUM_IP) != 0) flags = (sc->mactype != DWC_GMAC_EXT_DESC) ? NTDESC1_CIC_HDR : ETDESC0_CIC_HDR; @@ -854,7 +854,7 @@ dwc_rxfinish_one(struct dwc_softc *sc, struct dwc_hwdesc *desc, m->m_len = len; if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); - if ((if_getcapenable(ifp) & IFCAP_RXCSUM) != 0 && + if ((if_getcapenable(ifp) & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) != 0 && (rdesc0 & RDESC0_FT) != 0) { m->m_pkthdr.csum_flags = CSUM_IP_CHECKED; if ((rdesc0 & RDESC0_ICE) == 0) @@ -1254,18 +1254,14 @@ dwc_ioctl(if_t ifp, u_long cmd, caddr_t data) } if (mask & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) if_togglecapenable(ifp, IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6); - if (mask & IFCAP_TXCSUM) + if (mask & IFCAP_TXCSUM) { if_togglecapenable(ifp, IFCAP_TXCSUM); - if ((if_getcapenable(ifp) & IFCAP_TXCSUM) != 0) - if_sethwassistbits(ifp, CSUM_IP | CSUM_DELAY_DATA, 0); - else - if_sethwassistbits(ifp, 0, CSUM_IP | CSUM_DELAY_DATA); - if (mask & IFCAP_TXCSUM_IPV6) + if_togglehwassist(ifp, CSUM_IP | CSUM_DELAY_DATA); + } + if (mask & IFCAP_TXCSUM_IPV6) { if_togglecapenable(ifp, IFCAP_TXCSUM_IPV6); - if ((if_getcapenable(ifp) & IFCAP_TXCSUM_IPV6) != 0) - if_sethwassistbits(ifp, CSUM_DELAY_DATA_IPV6, 0); - else - if_sethwassistbits(ifp, 0, CSUM_DELAY_DATA_IPV6); + if_togglehwassist(ifp, CSUM_DELAY_DATA_IPV6); + } if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) { DWC_LOCK(sc); From nobody Wed Jan 21 15:32:22 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx7VG6rq9z6PMLS for ; Wed, 21 Jan 2026 15:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx7VG5sRCz3fhp for ; Wed, 21 Jan 2026 15:32:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769009542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jYYAgEybmfqot3V+syREM357WKh/u0BrgviklFok5S4=; b=PjsMpH4hAU/jc3sJeDl/MXDVBGH3rxjOT3cLVmldTS9BuPjS55oHE5Ywwaql39K+ASz0cV KxUnO7cQmTxAE2KJd6NAGHJqRuzvRMLwtdKx0Lq7LNbvrQ5l2Lh/tRSTPLOXBWvWjwhWrd Uri/LnZfKVdS1Sya+zJpWH+7rxNp2IGAKwMHJJeGUHjiYX2c1ASXcoAYbnquChFsg3RZ1d vHimL6WuSMXWJxiduMjwl5Pb6Cx+D3/Pwtiev4g7S2AqgBZPeRfIvwufUnOCf8dPYBIOBh w5kqkLLm3BA8XdV0Q9r3bp7fJpjeBpeY5S1DY9kypG4FpB1pIFJHKUIYggQQng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769009542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jYYAgEybmfqot3V+syREM357WKh/u0BrgviklFok5S4=; b=UPzI10S3Lw0nNsEMEprxQ+dFcSGrZ/RHqB/tLCBjJiExHU2rx4rgxUmuUz44hc8UHN0tM/ UezNEMPNKo1XY/OTpjdoM5zjZ2xnk8JemBsBmZXdQG2tZaBhsotErZDckkBUfyHHIboNqY bCVZ+dPcbHQijxjQCtv2PkcyzGp9HkhnWya5W8P1aIubXUHqhE/jj5i7c4+kF0UYDeGJ5N 1gaBWwcPksVmq2ieSBiRRCB7ORiAu8GNrUSNfN3lIyKCZvkoBRLbrwHD8yPKKCjYeC/qWg ZC71XiRYpfj2Y3/D4V0NAq4SqEQfaaj9m6brPgcfH4Ovjvr/HF8LiHhuriIi7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769009542; a=rsa-sha256; cv=none; b=wa2tbtYVzkQFwJelq/Hv42ulUs0v1JcLufhM2qtK07IIZCl4nFryAGvf7Vjd7V28DCoNNL 0DK+yH6oWvFavYNI/0cjYgFNyCmgldNkXArQcYoOT9wQmxf8RIYjwbVIv4xh4RSBvsmn8d C8RndoMxF9OgEFIU768LQYko2sIYEvrdSV8779UUoKoPfW/w60zwkfERWMZ1eqUwHACqDi LAKhzsHnSeWxOFzUQmmz/CBEDWSaSTfQlCDJgM6KtR4NqqBjCS9585SP2lHUtm9kOA4czK NTKOp11fLQSatBtpTliVhQ1SvDv0kHVdAehmb3vVWKjImlr1mZpqoHJT8kotrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx7VG5PTGztFx for ; Wed, 21 Jan 2026 15:32:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 327a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 15:32:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 631d6cc0275c - stable/14 - sctp: support bridge interfaces List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 631d6cc0275c301bff27aa507a0d8922619d88cc Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 15:32:22 +0000 Message-Id: <6970f186.327a8.39b80d4b@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=631d6cc0275c301bff27aa507a0d8922619d88cc commit 631d6cc0275c301bff27aa507a0d8922619d88cc Author: Michael Tuexen AuthorDate: 2026-01-20 17:04:35 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 15:30:09 +0000 sctp: support bridge interfaces Reported by: Timo Völker Tested by: Timo Völker (cherry picked from commit 8d82dafa568baf7be46e5e443dd7310986a28aa9) --- sys/netinet/sctp_bsd_addr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet/sctp_bsd_addr.c b/sys/netinet/sctp_bsd_addr.c index ac715d8298ec..f1c364d7b57a 100644 --- a/sys/netinet/sctp_bsd_addr.c +++ b/sys/netinet/sctp_bsd_addr.c @@ -174,6 +174,7 @@ sctp_is_desired_interface_type(struct ifnet *ifn) case IFT_IPOVERCLAW: case IFT_PROPVIRTUAL: /* NetGraph Virtual too */ case IFT_VIRTUALIPADDRESS: + case IFT_BRIDGE: result = 1; break; default: From nobody Wed Jan 21 16:07:16 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx8GX1xxhz6PP4R for ; Wed, 21 Jan 2026 16:07: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx8GX16Zcz3kBS for ; Wed, 21 Jan 2026 16:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769011636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4NMpCilAPqTym2SXF9SB8vosC96ELVBusXAY6AOnFRQ=; b=ySo1rsGdH9VJsulb5cZrSG4Q6GcQ/Bzc0ZEASLxHdqPRSz53KBlmN61EFAsbSqu+ScGnU6 kXRUOFKyfTQUYpV14/31BPTgHm6MfG6e74cH8v/lzcw99+Qx/p0IRwJB8M2lelW4a2IdMg OWc/xxdLP34h08rQfu8OS6/xwKDAX2T3/S0GnMUfgKB/+GTTkMUq0U/Tr6QamlbueBdfqi 0bBxELTUpvlGNOvPrcktewFrZMr/VTNr+uJ/lJ89u6QhxbZjlx363mEY50R0qxjKNTsp4/ 3DtSQ+E1o5RSHKIcXKu7JHgxwIoU3xnS8aIoMDg+nsJG5i8hpzIuUAdzGC1caQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769011636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4NMpCilAPqTym2SXF9SB8vosC96ELVBusXAY6AOnFRQ=; b=obT4QiAn0OQdV2j7HGdz5g3LEQmO6QeSnlDJEd9DNZcq0ds3e79JKKfdgmbUuinOPPNRZ9 5dMx9GUGoliWvTLa14fP4Tlj4iIEnuueb8c8REx2nn4WTbxnt7KXr29dRW6aWLjOBBZWpg GFGWmRgPQnjtdnmegdAbKcZ3tKem6Jts7FRut0sIPPTx/QEovP/iUafpsAB0AcxOXGdQlp Ks/ej/6zM3XyD0Wm20uIsqqtzjBg23rdlQMGj5e4QTIni7uk1rRpNrKU7FSl2qBSEeOOKT XhQf771R7Xgwva+lsmuqteb4sjp2Jtqd7pJ3SyNbAXHS92tWXtQmthGNyD/+nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769011636; a=rsa-sha256; cv=none; b=OD9qvKYheoBZyrOoCMfRSt01qdouZSpvfN67ECb6OpBKmqgbFxJmIMuP4LQUbLDgkLczRU j46lZmdF0Rf00YlZ5IMZponiG1IS78Jtg4OTJuMnVntT3TdmxKlyQ7yUiPYYCBFYTgL+WF PW0FDbVTbuGcG+xcmkyyF7bz7u8R9L6nZrjor8+OesxgWqUsjfGVM3C56xqR0lIwb0ilSn GoaWqRvR4gVAamIMop6RhP/F0/Jz3IFD4hqbxZBmrxcdVgSu6/dFnz+x3zGDTE5EGioKEZ b2rm1zMWyxWKEJgHi3LWWhgBcFCfhLs7KLJbJ/gPL2fBuHUmWpNKTXfjtURr2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx8GX0bTQzvHv for ; Wed, 21 Jan 2026 16:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 347b2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 16:07:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 0d33cdd04da7 - stable/15 - sound: Unlock around uiomove() in midi_{read,write}() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0d33cdd04da7498a2070fe3f1557b2d519cc66fb Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 16:07:16 +0000 Message-Id: <6970f9b4.347b2.f896c80@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0d33cdd04da7498a2070fe3f1557b2d519cc66fb commit 0d33cdd04da7498a2070fe3f1557b2d519cc66fb Author: Christos Margiolis AuthorDate: 2026-01-12 11:27:15 +0000 Commit: Christos Margiolis CommitDate: 2026-01-21 16:05:31 +0000 sound: Unlock around uiomove() in midi_{read,write}() Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54130 (cherry picked from commit 6b69d6726a7d3455fb295abfcf9aedd48c580d4a) --- sys/dev/sound/midi/midi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index c86f5fb41b14..8c38b00f15ad 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -391,9 +391,11 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) used = MIN(used, MIDI_RSIZE); MIDIQ_DEQ(m->inq, buf, used); + mtx_unlock(&m->lock); retval = uiomove(buf, used, uio); if (retval) - goto err1; + goto err0; + mtx_lock(&m->lock); } /* @@ -457,9 +459,11 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) used = MIN(MIDIQ_AVAIL(m->outq), uio->uio_resid); used = MIN(used, MIDI_WSIZE); + mtx_unlock(&m->lock); retval = uiomove(buf, used, uio); if (retval) - goto err1; + goto err0; + mtx_lock(&m->lock); MIDIQ_ENQ(m->outq, buf, used); /* * Inform the bottom half that data can be written From nobody Wed Jan 21 16:07:17 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx8GY3vNVz6PP91 for ; Wed, 21 Jan 2026 16:07: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx8GY1r0xz3kFF for ; Wed, 21 Jan 2026 16:07:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769011637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R1ZHW244XJsp7XO5A+WgpOcbyF0cJwtU4J5V1va82Q0=; b=FJqKFp/Nzw9TykHGg1dDdIEnRcffdJbzvJB0uhfoe6gsEXrF9hzBFMHWsj9tVovhnpYQwN FhkxmCOxnc23v7VvLnDjZlJ/AgP7w5uinhB7/EVd70JxeyDe5wsYfyNOVI5DO+erN8mTTM qnVu0btqElZfsf/WOFleRJAeKto/lx9zgv3U8ykTLTvOIvsjONIO671SqLQgP9fl2cZ4pV k/xqLil9EEADarfj2RLDUnMfVJe5EC9WxtlMcOyqpsw8YCat8ze8nBJVdEzjKbNRflxFbN NX/Nf9kYPZBY+IbT4K/UM7wVQtRYQqbVf8Xty9iLiJCK64oVZ2GbWMQFXHVuqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769011637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R1ZHW244XJsp7XO5A+WgpOcbyF0cJwtU4J5V1va82Q0=; b=hIIUEMto1ArxqyNYWkbBA2Sr5adl92sIT16qpowvwVwH7AH1TbpeV9wC9o7b9qujimnTwv yf69JCzvc/O4fq4SdrZpP9KGncQqMmxY0Dzjvokf8XVcb68Gyjy1F1MsPqMQ2z1suz/HWJ 8EpoZ/9ORws1sKTnTH1Ja1fw6HfT1nexComumdN56T7q4k5hv4Ap7zZ5lx53UL1a3c7azG 1HZ3sObUQy4CpKs5zv4YctjbdkbuAMYel2CG4vQ7elPmmRQc8VqbpGl3KYx4vBfabgRv0Q 2B18XhN6YVM+PvaLTGQFY+LpGHBWlmAZM71DtIlF+8qveSjF8pE8GtW3e966pQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769011637; a=rsa-sha256; cv=none; b=fsvGte0ciyEdcm4kAKk27+Ez3ljpCAmEMsuEoJgooe4bVMZnzfniCK9t11FIrXPpPqdJUt Okd2s/CIVecFjcmWsnnSeyaSVdBtFmK0CAZRDNpABwQbZRUE8448c5d11WOF/mCa4sE1GO Jrc2coJR+XpBhUyXbT9fSlt0qMYM3BSeuAoEhkg8WnRV0N2zHwPHBr2Eb4faWtWN1zMdn+ 9TIjA54mWMF9qWna9dgr8Ib7NWjTPZUO++t5kC9q1NQC4C96y+lSzH6ZKrGJ/LRcTfxzvy 5w2PgYkddxbQk/AoGt69gn0fdJWIPt1JpPfjUm2E/W6l3OnT+WK3hxPgEZsPww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx8GY1NtYztmG for ; Wed, 21 Jan 2026 16:07:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3483a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 16:07:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 17ed747f1e2f - stable/15 - sndctl(8): Add libxo support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 17ed747f1e2f2b7f5af6e8acba126be522f40181 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 16:07:17 +0000 Message-Id: <6970f9b5.3483a.5e539296@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=17ed747f1e2f2b7f5af6e8acba126be522f40181 commit 17ed747f1e2f2b7f5af6e8acba126be522f40181 Author: Christos Margiolis AuthorDate: 2026-01-12 13:32:06 +0000 Commit: Christos Margiolis CommitDate: 2026-01-21 16:05:31 +0000 sndctl(8): Add libxo support Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: ziaee, mckusick Differential Revision: https://reviews.freebsd.org/D54032 (cherry picked from commit aa58af04dc88aabf9d2fade2c7d126031cb66f42) --- usr.sbin/sndctl/Makefile | 2 +- usr.sbin/sndctl/sndctl.8 | 11 +++- usr.sbin/sndctl/sndctl.c | 151 +++++++++++++++++++++++++++++++---------------- 3 files changed, 111 insertions(+), 53 deletions(-) diff --git a/usr.sbin/sndctl/Makefile b/usr.sbin/sndctl/Makefile index d6697bb88fd5..cb06b84f5766 100644 --- a/usr.sbin/sndctl/Makefile +++ b/usr.sbin/sndctl/Makefile @@ -5,6 +5,6 @@ PACKAGE= sound PROG= sndctl SRCS= ${PROG}.c MAN= ${PROG}.8 -LDFLAGS+= -lnv -lmixer +LDFLAGS+= -lnv -lmixer -lxo -lsbuf .include diff --git a/usr.sbin/sndctl/sndctl.8 b/usr.sbin/sndctl/sndctl.8 index 4c3810f3c16b..73414bd95325 100644 --- a/usr.sbin/sndctl/sndctl.8 +++ b/usr.sbin/sndctl/sndctl.8 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 5, 2025 +.Dd December 2, 2025 .Dt SNDCTL 8 .Os .Sh NAME @@ -35,6 +35,7 @@ .Nd list and modify soundcard properties .Sh SYNOPSIS .Nm +.Op Fl -libxo .Op Fl f Ar device .Op Fl hov .Op Ar control Ns Oo = Ns Ar value Oc Ar ... @@ -46,6 +47,13 @@ control-driven interface, in order to filter and/or set specific properties. .Pp The options are as follows: .Bl -tag -width "-f device" +.It Fl -libxo +Generate output via +.Xr libxo 3 +in a selection of different human and machine readable formats. +See +.Xr xo_options 7 +for details on command line arguments. .It Fl f Ar device Choose a specific audio device .Pq see Sx FILES . @@ -175,6 +183,7 @@ $ sndctl -f /dev/dsp0 `cat info` .Sh SEE ALSO .Xr sndstat 4 , .Xr sound 4 , +.Xr xo_options 7 , .Xr mixer 8 , .Xr sysctl 8 .Sh AUTHORS diff --git a/usr.sbin/sndctl/sndctl.c b/usr.sbin/sndctl/sndctl.c index e6dac67e2ea7..bbc2da6a4ab9 100644 --- a/usr.sbin/sndctl/sndctl.c +++ b/usr.sbin/sndctl/sndctl.c @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -45,6 +46,9 @@ #include #include #include +#include + +#define SNDCTL_XO_VERSION "1" /* Taken from sys/dev/sound/pcm/ */ #define STATUS_LEN 64 @@ -171,7 +175,7 @@ static struct snd_ctl dev_ctls[] = { static struct snd_ctl chan_ctls[] = { #define F(member) offsetof(struct snd_chan, member) - /*{ "name", F(name), STR, NULL },*/ + { "name", F(name), STR, NULL }, { "parentchan", F(parentchan), STR, NULL }, { "unit", F(unit), NUM, NULL }, { "caps", F(caps), STR, NULL }, @@ -342,7 +346,7 @@ sysctl_int(const char *buf, const char *arg, int *var) size = sizeof(int); /* Read current value. */ if (sysctlbyname(buf, &prev, &size, NULL, 0) < 0) { - warn("sysctlbyname(%s)", buf); + xo_warn("sysctlbyname(%s)", buf); return (-1); } @@ -351,24 +355,24 @@ sysctl_int(const char *buf, const char *arg, int *var) errno = 0; n = strtol(arg, NULL, 10); if (errno == EINVAL || errno == ERANGE) { - warn("strtol(%s)", arg); + xo_warn("strtol(%s)", arg); return (-1); } /* Apply new value. */ if (sysctlbyname(buf, NULL, 0, &n, size) < 0) { - warn("sysctlbyname(%s, %d)", buf, n); + xo_warn("sysctlbyname(%s, %d)", buf, n); return (-1); } } /* Read back applied value for good measure. */ if (sysctlbyname(buf, &n, &size, NULL, 0) < 0) { - warn("sysctlbyname(%s)", buf); + xo_warn("sysctlbyname(%s)", buf); return (-1); } - if (arg != NULL) + if (arg != NULL && xo_get_style(NULL) == XO_STYLE_TEXT) printf("%s: %d -> %d\n", buf, prev, n); if (var != NULL) *var = n; @@ -386,7 +390,7 @@ sysctl_str(const char *buf, const char *arg, char *var, size_t varsz) /* Read current value. */ size = sizeof(prev); if (sysctlbyname(buf, prev, &size, NULL, 0) < 0) { - warn("sysctlbyname(%s)", buf); + xo_warn("sysctlbyname(%s)", buf); return (-1); } @@ -395,26 +399,26 @@ sysctl_str(const char *buf, const char *arg, char *var, size_t varsz) size = strlen(arg); /* Apply new value. */ if (sysctlbyname(buf, NULL, 0, arg, size) < 0) { - warn("sysctlbyname(%s, %s)", buf, arg); + xo_warn("sysctlbyname(%s, %s)", buf, arg); return (-1); } /* Get size of new string. */ if (sysctlbyname(buf, NULL, &size, NULL, 0) < 0) { - warn("sysctlbyname(%s)", buf); + xo_warn("sysctlbyname(%s)", buf); return (-1); } } if ((tmp = calloc(1, size)) == NULL) - err(1, "calloc"); + xo_err(1, "calloc"); /* Read back applied value for good measure. */ if (sysctlbyname(buf, tmp, &size, NULL, 0) < 0) { - warn("sysctlbyname(%s)", buf); + xo_warn("sysctlbyname(%s)", buf); free(tmp); return (-1); } - if (arg != NULL) + if (arg != NULL && xo_get_style(NULL) == XO_STYLE_TEXT) printf("%s: %s -> %s\n", buf, prev, tmp); if (var != NULL) strlcpy(var, tmp, varsz); @@ -436,27 +440,27 @@ read_dev(char *path) int fd, caps, unit, t1, t2, t3; if ((fd = open("/dev/sndstat", O_RDONLY)) < 0) - err(1, "open(/dev/sndstat)"); + xo_err(1, "open(/dev/sndstat)"); if (ioctl(fd, SNDSTIOC_REFRESH_DEVS, NULL) < 0) - err(1, "ioctl(SNDSTIOC_REFRESH_DEVS)"); + xo_err(1, "ioctl(SNDSTIOC_REFRESH_DEVS)"); arg.nbytes = 0; arg.buf = NULL; if (ioctl(fd, SNDSTIOC_GET_DEVS, &arg) < 0) - err(1, "ioctl(SNDSTIOC_GET_DEVS#1)"); + xo_err(1, "ioctl(SNDSTIOC_GET_DEVS#1)"); if ((arg.buf = malloc(arg.nbytes)) == NULL) - err(1, "malloc"); + xo_err(1, "malloc"); if (ioctl(fd, SNDSTIOC_GET_DEVS, &arg) < 0) - err(1, "ioctl(SNDSTIOC_GET_DEVS#2)"); + xo_err(1, "ioctl(SNDSTIOC_GET_DEVS#2)"); if ((nvl = nvlist_unpack(arg.buf, arg.nbytes, 0)) == NULL) - err(1, "nvlist_unpack"); + xo_err(1, "nvlist_unpack"); if (nvlist_empty(nvl) || !nvlist_exists(nvl, SNDST_DSPS)) - errx(1, "no soundcards attached"); + xo_errx(1, "no soundcards attached"); if (path == NULL || (path != NULL && strcmp(basename(path), "dsp") == 0)) unit = mixer_get_dunit(); @@ -475,12 +479,12 @@ read_dev(char *path) break;; } if (i == nitems) - errx(1, "device not found"); + xo_errx(1, "device not found"); #define NV(type, item) \ nvlist_get_ ## type (di[i], SNDST_DSPS_ ## item) if ((dp = calloc(1, sizeof(struct snd_dev))) == NULL) - err(1, "calloc"); + xo_err(1, "calloc"); dp->unit = -1; strlcpy(dp->name, NV(string, NAMEUNIT), sizeof(dp->name)); @@ -492,9 +496,9 @@ read_dev(char *path) #undef NV if (dp->play.pchans && !nvlist_exists(di[i], SNDST_DSPS_INFO_PLAY)) - errx(1, "%s: playback channel list empty", dp->name); + xo_errx(1, "%s: playback channel list empty", dp->name); if (dp->rec.pchans && !nvlist_exists(di[i], SNDST_DSPS_INFO_REC)) - errx(1, "%s: recording channel list empty", dp->name); + xo_errx(1, "%s: recording channel list empty", dp->name); #define NV(type, mode, item) \ nvlist_get_ ## type (nvlist_get_nvlist(di[i], \ @@ -526,7 +530,7 @@ read_dev(char *path) goto done; if (!nvlist_exists(di[i], SNDST_DSPS_PROVIDER_INFO)) - errx(1, "%s: provider_info list empty", dp->name); + xo_errx(1, "%s: provider_info list empty", dp->name); #define NV(type, item) \ nvlist_get_ ## type (nvlist_get_nvlist(di[i], \ @@ -549,13 +553,13 @@ read_dev(char *path) if (sysctl_int("hw.snd.latency", NULL, &t1) || sysctl_int("hw.snd.latency_profile", NULL, &t2) || sysctl_int("kern.timecounter.alloweddeviation", NULL, &t3)) - err(1, "%s: sysctl", dp->name); + xo_err(1, "%s: sysctl", dp->name); if (t1 == 0 && t2 == 0 && t3 == 0) dp->realtime = 1; if (!nvlist_exists(nvlist_get_nvlist(di[i], SNDST_DSPS_PROVIDER_INFO), SNDST_DSPS_SOUND4_CHAN_INFO)) - errx(1, "%s: channel info list empty", dp->name); + xo_errx(1, "%s: channel info list empty", dp->name); cdi = nvlist_get_nvlist_array( nvlist_get_nvlist(di[i], SNDST_DSPS_PROVIDER_INFO), @@ -567,7 +571,7 @@ read_dev(char *path) #define NV(type, item) \ nvlist_get_ ## type (cdi[j], SNDST_DSPS_SOUND4_CHAN_ ## item) if ((ch = calloc(1, sizeof(struct snd_chan))) == NULL) - err(1, "calloc"); + xo_err(1, "calloc"); strlcpy(ch->name, NV(string, NAME), sizeof(ch->name)); strlcpy(ch->parentchan, NV(string, PARENTCHAN), @@ -654,7 +658,7 @@ print_dev_ctl(struct snd_dev *dp, struct snd_ctl *ctl, bool simple, struct snd_ctl *cp; size_t len; - if (ctl->type != GRP) { + if (ctl->type != GRP && xo_get_style(NULL) == XO_STYLE_TEXT) { if (simple) printf("%s=", ctl->name); else @@ -663,10 +667,10 @@ print_dev_ctl(struct snd_dev *dp, struct snd_ctl *ctl, bool simple, switch (ctl->type) { case STR: - printf("%s\n", (char *)dp + ctl->off); + xo_emit("{a:%s/%s}\n", ctl->name, (char *)dp + ctl->off); break; case NUM: - printf("%d\n", *(int *)((intptr_t)dp + ctl->off)); + xo_emit("{a:%s/%d}\n", ctl->name, *(int *)((intptr_t)dp + ctl->off)); break; case VOL: break; @@ -691,7 +695,7 @@ print_chan_ctl(struct snd_chan *ch, struct snd_ctl *ctl, bool simple, size_t len; int v; - if (ctl->type != GRP) { + if (ctl->type != GRP && xo_get_style(NULL) == XO_STYLE_TEXT) { if (simple) printf("%s.%s=", ch->name, ctl->name); else @@ -700,14 +704,14 @@ print_chan_ctl(struct snd_chan *ch, struct snd_ctl *ctl, bool simple, switch (ctl->type) { case STR: - printf("%s\n", (char *)ch + ctl->off); + xo_emit("{a:%s/%s}\n", ctl->name, (char *)ch + ctl->off); break; case NUM: - printf("%d\n", *(int *)((intptr_t)ch + ctl->off)); + xo_emit("{a:%s/%d}\n", ctl->name, *(int *)((intptr_t)ch + ctl->off)); break; case VOL: v = *(int *)((intptr_t)ch + ctl->off); - printf("%.2f:%.2f\n", + xo_emit("{a:%s/%.2f:%.2f}\n", ctl->name, MIX_VOLNORM(v & 0x00ff), MIX_VOLNORM((v >> 8) & 0x00ff)); break; case GRP: @@ -728,31 +732,46 @@ print_dev(struct snd_dev *dp) { struct snd_chan *ch; struct snd_ctl *ctl; + struct sbuf sb; + char buf[16]; - if (!oflag) { - printf("%s: <%s> %s", dp->name, dp->desc, dp->status); + xo_open_instance("devices"); - printf(" ("); + if (!oflag || xo_get_style(NULL) != XO_STYLE_TEXT) { + sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN); + + sbuf_printf(&sb, "("); if (dp->play.pchans) - printf("play"); + sbuf_printf(&sb, "play"); if (dp->play.pchans && dp->rec.pchans) - printf("/"); + sbuf_printf(&sb, "/"); if (dp->rec.pchans) - printf("rec"); - printf(")\n"); + sbuf_printf(&sb, "rec"); + sbuf_printf(&sb, ")"); + + xo_emit("{:header/%s: <%s> %s %s}\n", + dp->name, dp->desc, dp->status, sbuf_data(&sb)); + + sbuf_delete(&sb); } for (ctl = dev_ctls; ctl->name != NULL; ctl++) print_dev_ctl(dp, ctl, oflag, false); if (vflag) { + xo_open_list("channels"); TAILQ_FOREACH(ch, &dp->chans, next) { - if (!oflag) + xo_open_instance("channels"); + if (!oflag && xo_get_style(NULL) == XO_STYLE_TEXT) printf(" %s\n", ch->name); for (ctl = chan_ctls; ctl->name != NULL; ctl++) print_chan_ctl(ch, ctl, oflag, false); + xo_close_instance("channels"); } + xo_close_list("channels"); } + + xo_close_instance("devices"); } static int @@ -916,8 +935,9 @@ mod_rec_format(struct snd_dev *dp, void *arg) static void __dead2 usage(void) { - fprintf(stderr, "usage: %s [-f device] [-hov] [control[=value] ...]\n", + xo_error("usage: %s [--libxo] [-f device] [-hov] [control[=value] ...]\n", getprogname()); + xo_finish(); exit(1); } @@ -932,6 +952,10 @@ main(int argc, char *argv[]) bool show = true, found; int c; + argc = xo_parse_args(argc, argv); + if (argc < 0) + exit(1); + while ((c = getopt(argc, argv, "f:hov")) != -1) { switch (c) { case 'f': @@ -952,11 +976,20 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; + xo_set_version(SNDCTL_XO_VERSION); + xo_open_container("sndctl"); + dp = read_dev(path); + xo_open_container("executed_controls"); while (argc > 0) { - if ((s = strdup(*argv)) == NULL) - err(1, "strdup(%s)", *argv); + if ((s = strdup(*argv)) == NULL) { + xo_close_container("executed_controls"); + xo_close_container("sndctl"); + if (xo_finish() < 0) + xo_err(1, "xo_finish"); + xo_err(1, "strdup(%s)", *argv); + } propstr = strsep(&s, "="); if (propstr == NULL) @@ -966,11 +999,19 @@ main(int argc, char *argv[]) for (ctl = dev_ctls; ctl->name != NULL; ctl++) { if (strcmp(ctl->name, propstr) != 0) continue; - if (s == NULL) { - print_dev_ctl(dp, ctl, true, true); + if (s == NULL) show = false; - } else if (ctl->mod != NULL && ctl->mod(dp, s) < 0) - warnx("%s(%s) failed", ctl->name, s); + else if (ctl->mod != NULL && ctl->mod(dp, s) < 0) + xo_warnx("%s(%s) failed", ctl->name, s); + if (s == NULL || xo_get_style(NULL) != XO_STYLE_TEXT) { + /* + * Print the control in libxo mode in all + * cases, otherwise we'll not be printing any + * controls that were modified or whose + * ctl->mod() failed. + */ + print_dev_ctl(dp, ctl, true, true); + } found = true; break; } @@ -985,17 +1026,25 @@ main(int argc, char *argv[]) } } if (!found) - warnx("%s: no such property", propstr); + xo_warnx("%s: no such property", propstr); next: free(s); argc--; argv++; } + xo_close_container("executed_controls"); - if (show) { + if (show || xo_get_style(NULL) != XO_STYLE_TEXT) { + xo_open_list("devices"); print_dev(dp); + xo_close_list("devices"); } free_dev(dp); + + xo_close_container("sndctl"); + if (xo_finish() < 0) + xo_err(1, "xo_finish"); + return (0); } From nobody Wed Jan 21 16:07:18 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx8GZ5RqZz6PP94 for ; Wed, 21 Jan 2026 16:07: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx8GZ2F6cz3kFM for ; Wed, 21 Jan 2026 16:07:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769011638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rF+IwYbCm2iIy6C6xyIOis2+zXeMGAt9PTfGTHvYlmE=; b=m3odfjdmlzag0fi1N3JP64IG87VZFwIinittia9rSvKdga3aRf+EKjKvPtFjF5PmYNF8F6 aYIyBqJZT9lbENIOlYg1qByFmSMxpGfQ6q/+zkNfipjhNzQABeAlK0qyG07VDvYdT/auUd dOHskCTIKJ2YQaDeXaN2l80rhRsxpcWVfIBug2kVyPmOwt9sc+thXFwFGL6QTbXhfvNnog krARqUH9dzj6VRn/qJRn9C0ZApC7xAHAWa0JGOQ4sXWJrRvjAtN+qmrOEXhOnHpB2oAURm umDGH9idI4s0AT+gl9dxxpY71BkARE+iScXIA3GFBrmMm6boGL1USP5/k1PFeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769011638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rF+IwYbCm2iIy6C6xyIOis2+zXeMGAt9PTfGTHvYlmE=; b=hFX093zjdYVpeBF39gX57SswwVhSJXu4OKcpiPau48NdqqDNgNbSpyJI3uR+eLyPNEnZVT 05bHH7VZA1GROuoeIqVcpPCGs7+UiIhcoKodveou40OHN83DHxRzzUqF2y7a8Ojw34p+SS 9CWbtTaf0BwvI+GAcNi5Qk6jHMHYo4z+B/xpCatBQg5Lf2auwlp2Td7Mtl3A+aeQgQuPsy Tx5ZV5/etBM54XFliubRpDFpGjD+waMhXL9VfwSa0J9nrMcJ1RzzqKePvUfww+BPMg3p+j Bkqg8Bhpwe8tgQychFvgMkmsdu3yjL/+R6IYDTYM24qHgQPn+Tgk9F84HSM4Tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769011638; a=rsa-sha256; cv=none; b=FDsxn2lpF37/VEX4BSkywb0xTwr+2ps7MlTybnULD/NrMPfznOYqPL44blV6R8/WdICbpD JMG1G7/CdadTiA/hdJvuXuQv1k1a5jOD3rHH/Z/EgnYS+ZlE+xkrknREbY+/7DmJv4ybUl i4Z2i2pakFpCyJapPecM1Efac87DJQMZoXdgYBkWLLSzBawFAriMbKm9sJAP/Re6ucMpeU nwEqBn4Q2xzqDTbioVyA+Ba4XdwIp5ce1Q1DPdzKv3diVVD/Ej7WkGG6Kg2Nhp3tNERfL4 dJnznWGPQzirjns5B430o3ULcRsUgqTHVrbEfkk7yLCUN2R3btMSiWH9wjb0Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx8GZ1pXvzvHx for ; Wed, 21 Jan 2026 16:07:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35e22 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 16:07:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 47917383c6d4 - stable/15 - sound: Replace MIN() with min() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 47917383c6d4b7d595ef672b6816e9430cd10347 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 16:07:18 +0000 Message-Id: <6970f9b6.35e22.28647188@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=47917383c6d4b7d595ef672b6816e9430cd10347 commit 47917383c6d4b7d595ef672b6816e9430cd10347 Author: Christos Margiolis AuthorDate: 2026-01-12 13:38:39 +0000 Commit: Christos Margiolis CommitDate: 2026-01-21 16:05:31 +0000 sound: Replace MIN() with min() We use min() in most places. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit eccd366b0a8ba7d902fcf0b1bec447926a75c36c) --- sys/dev/sound/midi/midi.c | 10 +++++----- sys/dev/sound/midi/midiq.h | 4 ++-- sys/dev/sound/pci/cs4281.c | 2 +- sys/dev/sound/pci/hdspe-pcm.c | 4 ++-- sys/dev/sound/usb/uaudio.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 8c38b00f15ad..4fd0e3dcf134 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -236,7 +236,7 @@ midi_out(struct snd_midi *m, uint8_t *buf, int size) return (0); } - used = MIN(size, MIDIQ_LEN(m->outq)); + used = min(size, MIDIQ_LEN(m->outq)); if (used) MIDIQ_DEQ(m->outq, buf, used); if (MIDIQ_EMPTY(m->outq)) { @@ -387,8 +387,8 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) * At this point, it is certain that m->inq has data */ - used = MIN(MIDIQ_LEN(m->inq), uio->uio_resid); - used = MIN(used, MIDI_RSIZE); + used = min(MIDIQ_LEN(m->inq), uio->uio_resid); + used = min(used, MIDI_RSIZE); MIDIQ_DEQ(m->inq, buf, used); mtx_unlock(&m->lock); @@ -456,8 +456,8 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) * We are certain than data can be placed on the queue */ - used = MIN(MIDIQ_AVAIL(m->outq), uio->uio_resid); - used = MIN(used, MIDI_WSIZE); + used = min(MIDIQ_AVAIL(m->outq), uio->uio_resid); + used = min(used, MIDI_WSIZE); mtx_unlock(&m->lock); retval = uiomove(buf, used, uio); diff --git a/sys/dev/sound/midi/midiq.h b/sys/dev/sound/midi/midiq.h index 80825974283e..8ffa4a40d23d 100644 --- a/sys/dev/sound/midi/midiq.h +++ b/sys/dev/sound/midi/midiq.h @@ -56,7 +56,7 @@ struct name { \ * No protection against overflow, underflow */ #define MIDIQ_ENQ(head, buf, size) do { \ - MIDIQ_MOVE(&(head).b[(head).h], (buf), sizeof(*(head).b) * MIN((size), (head).s - (head).h)); \ + MIDIQ_MOVE(&(head).b[(head).h], (buf), sizeof(*(head).b) * min((size), (head).s - (head).h)); \ if( (head).s - (head).h < (size) ) { \ MIDIQ_MOVE((head).b, (buf) + (head).s - (head).h, sizeof(*(head).b) * ((size) - (head).s + (head).h) ); \ } \ @@ -67,7 +67,7 @@ struct name { \ #define MIDIQ_DEQ_I(head, buf, size, move, update) do { \ if(MIDIQ_FULL(head)) (head).h=(head).t; \ - if (move) MIDIQ_MOVE((buf), &(head).b[(head).t], sizeof(*(head).b) * MIN((size), (head).s - (head).t)); \ + if (move) MIDIQ_MOVE((buf), &(head).b[(head).t], sizeof(*(head).b) * min((size), (head).s - (head).t)); \ if( (head).s - (head).t < (size) ) { \ if (move) MIDIQ_MOVE((buf) + (head).s - (head).t, (head).b, sizeof(*(head).b) * ((size) - (head).s + (head).t) ); \ } \ diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c index 5b0b229a021b..eecfc740bb3f 100644 --- a/sys/dev/sound/pci/cs4281.c +++ b/sys/dev/sound/pci/cs4281.c @@ -350,7 +350,7 @@ cs4281chan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize) /* 2 interrupts are possible and used in buffer (half-empty,empty), * hence factor of 2. */ - ch->blksz = MIN(blocksize, sc->bufsz / 2); + ch->blksz = min(blocksize, sc->bufsz / 2); sndbuf_resize(ch->buffer, 2, ch->blksz); ch->dma_setup = 0; adcdac_prog(ch); diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index 678693960e5e..0ccdf69c32ee 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -474,7 +474,7 @@ buffer_mux_port(uint32_t *dma, uint32_t *pcm, uint32_t subset, uint32_t ports, channels = hdspe_channel_count(ports, pcm_width); /* Only copy as much as supported by both hardware and pcm channel. */ - slots = hdspe_port_slot_width(subset, MIN(adat_width, pcm_width)); + slots = hdspe_port_slot_width(subset, min(adat_width, pcm_width)); /* Let the compiler inline and loop unroll common cases. */ if (slots == 2) @@ -520,7 +520,7 @@ buffer_demux_port(uint32_t *dma, uint32_t *pcm, uint32_t subset, uint32_t ports, channels = hdspe_channel_count(ports, pcm_width); /* Only copy as much as supported by both hardware and pcm channel. */ - slots = hdspe_port_slot_width(subset, MIN(adat_width, pcm_width)); + slots = hdspe_port_slot_width(subset, min(adat_width, pcm_width)); /* Let the compiler inline and loop unroll common cases. */ if (slots == 2) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 0987ca12d933..7f49bae9ce5e 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -150,7 +150,7 @@ SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, debug, CTLFLAG_RWTUN, #define UAUDIO_NCHANBUFS 2 /* number of outstanding request */ #define UAUDIO_RECURSE_LIMIT 255 /* rounds */ #define UAUDIO_BITS_MAX 32 /* maximum sample size in bits */ -#define UAUDIO_CHANNELS_MAX MIN(64, AFMT_CHANNEL_MAX) +#define UAUDIO_CHANNELS_MAX min(64, AFMT_CHANNEL_MAX) #define UAUDIO_MATRIX_MAX 8 /* channels */ #define MAKE_WORD(h,l) (((h) << 8) | (l)) @@ -1651,7 +1651,7 @@ uaudio20_check_rate(struct usb_device *udev, uint8_t iface_no, * buffer. Try using a larger buffer and see if that * helps: */ - rates = MIN(UAUDIO20_MAX_RATES, (255 - 2) / 12); + rates = min(UAUDIO20_MAX_RATES, (255 - 2) / 12); error = USB_ERR_INVAL; } else { rates = UGETW(data); From nobody Wed Jan 21 16:07:19 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx8Gb5hw0z6PP95 for ; Wed, 21 Jan 2026 16:07: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx8Gb3M9gz3kBm for ; Wed, 21 Jan 2026 16:07:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769011639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8XeGGmPTbBxix/QHsUJevK8EnaoFIdpUtEXxWxNdsW8=; b=PWTfO69Sp2Ey2O1ud43f1MPWGxslpDhUtpRGK/YEUDOGV4c/nxyAMyfTuMAFV1zmFAoMpi OU6ZOonrUg+OCN5MpQ65AM4uIALfQvtxlCmdUenhPnls6DpRntVA+lWcT1w5hys3dAPuMk j64sY5E5hdCHYrdzT+czOUH/8LVfr3KLteycMW8bp6A9aDsivBRLoz4KIFal9+R/XBX3aL Aju9zi+U9HNyehacJjLDRJdgSMkVVM1HKhT4tSBUsAgLRyzt4xtk0WiFCMBkJDEtdGLHZO co5emrbyutJVbJ89OLc/VkfUfrIcdhm9aLopBSx4pZcIOXqUmjtvrCl69eu8sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769011639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8XeGGmPTbBxix/QHsUJevK8EnaoFIdpUtEXxWxNdsW8=; b=ReOS95lHZPdx9H+Svr3e7knm3CJkaxYcPApvqGwJjyUZc+bidOrBYM/JkISQ/NPJrOkW2v 2NWeX1negr67xVSWHoPbhp+PPyo5UuqvUEDRiLGwMukTNmGlq+FP1XCDjLbFfho3mYBJlt xojvC4tSoodH8a20hGQowz46BSc77dhMM3xpuELRFLW94+/X442jVxpdlvF4i1QA9+fume pcpbvmidr5WnN+6ws171uMYmNq/k4qT4TVnjpU2vyw2OS8egYG6id5IvYGcMkZsE+IeUmH 70JC+RD7KEf9/pGi8dcbrtedDu6RxxCV4G9znYqyq+wUvJfluxdeT5cdgVMYxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769011639; a=rsa-sha256; cv=none; b=vhJOccDLgx4g/7njGzM3mprYFXYtZStgzFCTENXz9zh12Z6Jb21Q/YJQ79yoveLFIyynAp cmkNlqThRVglMxikx3jl+1XxFCI5v6OudE3WBrT5ipvMtIPJIqcK36MZnXgvbaL1U2H7ES 2Pnp56QJv9Q5DyxHTgxAJPbULCuaKAEBDqvrJ/qiaDyRXB8eh6IXzsRMg+QJJxLFlMI/Gl G369/mXf30EK2VGcjvsK92yZbjBYGTWETVkiRoRwnuKqg/ivZrF6NZAm4CmSkC8ZaExffB Lpu5/hq8pNZGs2cSzaB7L7I8uHrVktEmxGnMt3mJN1Tu5ejhhQaeJ+sS9kufIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dx8Gb2h00zv1X for ; Wed, 21 Jan 2026 16:07:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 346b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 16:07:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 2bee4bb7f1b3 - stable/15 - src.opts: Introduce MK_SOUND List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2bee4bb7f1b3605fa0e44bed4578dc87fca2c694 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 16:07:19 +0000 Message-Id: <6970f9b7.346b8.148512b1@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2bee4bb7f1b3605fa0e44bed4578dc87fca2c694 commit 2bee4bb7f1b3605fa0e44bed4578dc87fca2c694 Author: Christos Margiolis AuthorDate: 2026-01-12 14:16:35 +0000 Commit: Christos Margiolis CommitDate: 2026-01-21 16:06:42 +0000 src.opts: Introduce MK_SOUND PR: 291853 Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: zarychtam_plan-b.pwste.edu.pl, markj Differential Revision: https://reviews.freebsd.org/D54456 (cherry picked from commit f74f891581bc4df20431607de9b761107f6a0aa7) (cherry picked from commit 37164224eefd11278b0203e1367e1d9d1454da3f) (cherry picked from commit 241a43cf9da8933f500e7d0df7fff621fd52168c) (cherry picked from commit cf34eb8264954a8fd1e92081bcf67719bddbc2aa) (cherry picked from commit 466bad427d74e666e85445729b2e63b82e10d18f) --- lib/Makefile | 4 ++-- libexec/rc/rc.d/Makefile | 8 ++++---- sbin/devd/Makefile | 12 +++++++----- share/man/man5/src.conf.5 | 7 ++++++- share/mk/src.opts.mk | 6 ++++++ tools/build/mk/OptionalObsoleteFiles.inc | 13 +++++++++++++ tools/build/options/WITHOUT_SOUND | 4 ++++ tools/build/options/WITH_SOUND | 1 + usr.bin/Makefile | 4 ++-- usr.sbin/Makefile | 6 +++--- 10 files changed, 48 insertions(+), 17 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 216ba1d58473..c3a95f00d4ef 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -73,7 +73,6 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ liblzma \ libmemstat \ libmd \ - libmixer \ libmt \ lib80211 \ libnetbsd \ @@ -176,7 +175,6 @@ SUBDIR+= clang .endif SUBDIR.${MK_CUSE}+= libcuse -SUBDIR.${MK_CUSE}+= virtual_oss SUBDIR.${MK_TOOLCHAIN}+=libpe SUBDIR.${MK_DIALOG}+= libdpv libfigpar SUBDIR.${MK_FDT}+= libfdt @@ -238,6 +236,8 @@ SUBDIR.${MK_PMC}+= libpmc libpmcstat SUBDIR.${MK_RADIUS_SUPPORT}+= libradius SUBDIR.${MK_SENDMAIL}+= libmilter libsm libsmdb libsmutil SUBDIR.${MK_TELNET}+= libtelnet +SUBDIR.${MK_SOUND}+= libmixer +SUBDIR.${MK_CUSE}.${MK_SOUND}+= virtual_oss SUBDIR.${MK_TESTS_SUPPORT}+= atf SUBDIR.${MK_TESTS_SUPPORT}+= liblutok SUBDIR.${MK_TESTS}+= tests diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 3b7f45e8f101..f25338c68766 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -36,7 +36,6 @@ CONFS= DAEMON \ linux \ local \ localpkg \ - mixer \ motd \ mountcritlocal \ mountcritremote \ @@ -301,9 +300,10 @@ CONFGROUPS.${MK_VI}+= VI VIPACKAGE= vi VI= virecover -CONFGROUPS.${MK_CUSE}+= VOSS -VOSSPACKAGE= sound -VOSS= virtual_oss +CONFGROUPS.${MK_SOUND}+= SOUND +SOUNDPACKAGE= sound +SOUND= mixer \ + virtual_oss CONFGROUPS.${MK_WIRELESS}+= HOSTAPD HOSTAPDPACKAGE= hostapd diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile index 553aecf4ee88..3dab9f7c9a25 100644 --- a/sbin/devd/Makefile +++ b/sbin/devd/Makefile @@ -32,11 +32,6 @@ CONSOLEDIR= ${DEVDDIR} CONSOLE+= moused.conf syscons.conf CONSOLEPACKAGE= console-tools -CONFGROUPS+= SND -SNDDIR= ${DEVDDIR} -SND= snd.conf -SNDPACKAGE= sound - .if ${MK_BLUETOOTH} != "no" CONFGROUPS+= BLUETOOTH BLUETOOTHDIR= ${DEVDDIR} @@ -56,6 +51,13 @@ NVMEDIR= ${DEVDDIR} NVME+= nvmf.conf NVMEPACKAGE= nvme-tools +.if ${MK_SOUND} != "no" +CONFGROUPS+= SND +SNDDIR= ${DEVDDIR} +SND= snd.conf +SNDPACKAGE= sound +.endif + .if ${MK_USB} != "no" DEVD+= uath.conf ulpt.conf .endif diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index bd8a40589d07..e62290c30b7b 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd December 21, 2025 +.Dd January 20, 2026 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1639,6 +1639,11 @@ legacy docs. .It Va WITH_SORT_THREADS Enable threads in .Xr sort 1 . +.It Va WITHOUT_SOUND +Do not build userland sound utilities such as +.Xr beep 1 +and +.Xr mixer 8 . .It Va WITHOUT_SOURCELESS Do not build kernel modules that include sourceless code (either microcode or native code for host CPU). When set, it enforces these options: diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 754f6b2be0d2..1b6ca9b7a5cc 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -171,6 +171,7 @@ __DEFAULT_YES_OPTIONS = \ SERVICESDB \ SETUID_LOGIN \ SHAREDOCS \ + SOUND \ SOURCELESS \ SOURCELESS_HOST \ SOURCELESS_UCODE \ @@ -500,6 +501,11 @@ MK_CLANG_FULL:= no MK_LLVM_COV:= no .endif +# CUSE is needed only by virtual_oss, but virtual_oss is part of MK_SOUND. +.if ${MK_CUSE} == "no" +MK_SOUND:= no +.endif + .if ${MK_ASAN} == "yes" # In order to get sensible backtraces from ASAN we have to install # llvm-symbolizer as /usr/bin/addr2line instead of the elftoolchain version. diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index a7ae52650999..4e602c929568 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -7387,6 +7387,19 @@ OLD_DIRS+=var/spool/clientmqueue OLD_FILES+=var/db/services.db .endif +.if ${MK_SOUND} == no +OLD_DIRS+=lib/mixer +OLD_DIRS+=lib/virtual_oss +OLD_DIRS+=usr.bin/beep +OLD_DIRS+=usr.bin/mididump +OLD_DIRS+=usr.sbin/mixer +OLD_DIRS+=usr.sbin/sndctl +OLD_DIRS+=usr.sbin/virtual_oss +OLD_FILES+=libexec/rc/rc.d/mixer +OLD_FILES+=libexec/rc/rc.d/virtual_oss +OLD_FILES+=sbin/devd/snd.conf +.endif + .if ${MK_NUAGEINIT} == no OLD_FILES+=etc/rc.d/nuageinit OLD_FILES+=usr/libexec/nuageinit diff --git a/tools/build/options/WITHOUT_SOUND b/tools/build/options/WITHOUT_SOUND new file mode 100644 index 000000000000..b4ca08f1263c --- /dev/null +++ b/tools/build/options/WITHOUT_SOUND @@ -0,0 +1,4 @@ +Do not build userland sound utilities such as +.Xr beep 1 +and +.Xr mixer 8 . diff --git a/tools/build/options/WITH_SOUND b/tools/build/options/WITH_SOUND new file mode 100644 index 000000000000..0e2de52511ac --- /dev/null +++ b/tools/build/options/WITH_SOUND @@ -0,0 +1 @@ +Compile with sound utilities and libraries support. diff --git a/usr.bin/Makefile b/usr.bin/Makefile index da1a9b3a681f..6d703c151135 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -7,7 +7,6 @@ SUBDIR= alias \ backlight \ banner \ basename \ - beep \ bintrans \ brandelf \ bsdcat \ @@ -86,7 +85,6 @@ SUBDIR= alias \ mandoc \ mdo \ mesg \ - mididump \ ministat \ mkdep \ mkfifo \ @@ -240,6 +238,8 @@ SUBDIR.${MK_NIS}+= ypwhich SUBDIR.${MK_OPENSSH}+= ssh-copy-id SUBDIR.${MK_QUOTAS}+= quota SUBDIR.${MK_SENDMAIL}+= vacation +SUBDIR.${MK_SOUND}+= beep +SUBDIR.${MK_SOUND}+= mididump SUBDIR.${MK_TALK}+= talk SUBDIR.${MK_TELNET}+= telnet SUBDIR.${MK_TESTS_SUPPORT}+= kyua diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 0290ed4f1c58..3d3a8443a7cf 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -41,7 +41,6 @@ SUBDIR= adduser \ makefs \ memcontrol \ mfiutil \ - mixer \ mlxcontrol \ mountd \ mount_smbfs \ @@ -84,7 +83,6 @@ SUBDIR= adduser \ setpmac \ smbmsg \ snapinfo \ - sndctl \ spi \ spray \ syslogd \ @@ -131,7 +129,6 @@ SUBDIR.${MK_BSNMP}+= bsnmpd .if ${MK_CAROOT} != "no" SUBDIR.${MK_OPENSSL}+= certctl .endif -SUBDIR.${MK_CUSE}+= virtual_oss SUBDIR.${MK_CXGBETOOL}+= cxgbetool SUBDIR.${MK_EFI}+= efivar efidp efibootmgr efitable efiwake .if ${MK_OPENSSL} != "no" @@ -200,6 +197,9 @@ SUBDIR.${MK_SENDMAIL}+= mailstats SUBDIR.${MK_SENDMAIL}+= makemap SUBDIR.${MK_SENDMAIL}+= praliases SUBDIR.${MK_SENDMAIL}+= sendmail +SUBDIR.${MK_SOUND}+= mixer +SUBDIR.${MK_SOUND}+= sndctl +SUBDIR.${MK_CUSE}.${MK_SOUND}+= virtual_oss SUBDIR.${MK_TCP_WRAPPERS}+= tcpdchk SUBDIR.${MK_TCP_WRAPPERS}+= tcpdmatch SUBDIR.${MK_TOOLCHAIN}+= config From nobody Wed Jan 21 19:45:36 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxF6S5XMMz6PdSd for ; Wed, 21 Jan 2026 19:45: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxF6S2mBzz3Ds2 for ; Wed, 21 Jan 2026 19:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769024736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EnQgS/CemYwBY9uK4sSyAl/vd9rDNA4gkMRca8UYR1Y=; b=WPCbLscla5DTmyT0VEMCvEkGfO4R2kNvLyQ0MSvnW5yTuAx2Dm6It7e7VGD6H0wAka+2qp bt/VGePPhcNZQPQ+mDTUV5qik65yIA0wCEkQsUVGXkm/H3D32LfB38Mdq8j+eZcftSM+9t /1ByGZXSBKw8TUrDi8J76NhkufQUwNgqWmK9a9fhPmy1gPxSUPhLj8xRnHvvBzuPZkx9eN UgmznpLYtCMngXPXFCMJS6bUrn8BZWG1szqa3OukZbae5YG7Bc+CyshpXfGqWUKbByXXRL 2YWS/LlfE+xKcx1P2/xgmb3YZan9v3rQJLxfi0eZDIC2VfVq85QjPNrGl2uRqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769024736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EnQgS/CemYwBY9uK4sSyAl/vd9rDNA4gkMRca8UYR1Y=; b=g8DmjcdSJlfX90fo1+BGDIFBMmwD5M9J8yu2eXlJ3PVrzsHmBqHY569XlQPTKOIAxH1YLf Cd86vpNBuKx08uAyKKVKhvgD8HMeu9r+ohTP6j5e6W03DoLmpTsS5gTjjkDVM3aTV6POOF 2J3KzdqwZDFIjktmmfBIGaeS1OrRUmr+ud8kRGUwKz+IEj48XkB8cWnwSw6LFBYPs8p0o5 hgEoDSeI2aTGiQ/ar+MULkETYywiCjYuluIcVYiAPjWoCvMkjUqJwerhOAX4pgvxBCmK0T 1Y5XOYZTkEa3DTsm/2VIQzrTQbYwk67ToW9o0w3Q4pxpQ/bEFi7dxvLJICz7nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769024736; a=rsa-sha256; cv=none; b=V3n2QlsLcmr5r1iZdNLH7C290alEtisBOW7PtGOacIA+4QngACgXfa49CgDF4AFPnsb2y2 9TDrKJqU3pKRXDnNkFRoNM+b+jSuxMMkD+/d4kulgYD1OwVMBMMwooFU0PQa5LSovi7hsA CwnxaOSHwZkAM+5yV/XYOeimTa5JjzW3Z9yDAnOk9h2/DiS8uwsDlao812sjN73yHSi6vO W/OWOfS+lpfj+Fns5nvsgEH0EYqCHlGRClCoaK0BEkTUQEa7Esv5HeX5H8ihyOptHU0aTV /ST2GkEb222hbfU7huOSXK/pWoILJXVktYnPAM0qCweuQRsa3DGLJL8wn8yQCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxF6S245xz11W2 for ; Wed, 21 Jan 2026 19:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b311 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:45:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 4d95227f637e - stable/15 - vtnet: define flags in a consistent way List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4d95227f637e746ca2f59068d9a810ca89c41e94 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:45:36 +0000 Message-Id: <69712ce0.b311.17524490@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4d95227f637e746ca2f59068d9a810ca89c41e94 commit 4d95227f637e746ca2f59068d9a810ca89c41e94 Author: Michael Tuexen AuthorDate: 2025-12-18 12:41:29 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:45:08 +0000 vtnet: define flags in a consistent way This allows adding flags in the upper 32 bits in a consistent way. No functional change intended. (cherry picked from commit e0c6c4ecfc755b78ac9135033053d2f15c62bf04) --- sys/dev/virtio/network/virtio_net.h | 46 ++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/sys/dev/virtio/network/virtio_net.h b/sys/dev/virtio/network/virtio_net.h index 9ea53cbe2376..e61a4a993052 100644 --- a/sys/dev/virtio/network/virtio_net.h +++ b/sys/dev/virtio/network/virtio_net.h @@ -32,29 +32,29 @@ #define _VIRTIO_NET_H /* The feature bitmap for virtio net */ -#define VIRTIO_NET_F_CSUM 0x000001 /* Host handles pkts w/ partial csum */ -#define VIRTIO_NET_F_GUEST_CSUM 0x000002 /* Guest handles pkts w/ partial csum*/ -#define VIRTIO_NET_F_CTRL_GUEST_OFFLOADS 0x000004 /* Dynamic offload configuration. */ -#define VIRTIO_NET_F_MTU 0x000008 /* Initial MTU advice */ -#define VIRTIO_NET_F_MAC 0x000020 /* Host has given MAC address. */ -#define VIRTIO_NET_F_GSO 0x000040 /* Host handles pkts w/ any GSO type */ -#define VIRTIO_NET_F_GUEST_TSO4 0x000080 /* Guest can handle TSOv4 in. */ -#define VIRTIO_NET_F_GUEST_TSO6 0x000100 /* Guest can handle TSOv6 in. */ -#define VIRTIO_NET_F_GUEST_ECN 0x000200 /* Guest can handle TSO[6] w/ ECN in. */ -#define VIRTIO_NET_F_GUEST_UFO 0x000400 /* Guest can handle UFO in. */ -#define VIRTIO_NET_F_HOST_TSO4 0x000800 /* Host can handle TSOv4 in. */ -#define VIRTIO_NET_F_HOST_TSO6 0x001000 /* Host can handle TSOv6 in. */ -#define VIRTIO_NET_F_HOST_ECN 0x002000 /* Host can handle TSO[6] w/ ECN in. */ -#define VIRTIO_NET_F_HOST_UFO 0x004000 /* Host can handle UFO in. */ -#define VIRTIO_NET_F_MRG_RXBUF 0x008000 /* Host can merge receive buffers. */ -#define VIRTIO_NET_F_STATUS 0x010000 /* virtio_net_config.status available*/ -#define VIRTIO_NET_F_CTRL_VQ 0x020000 /* Control channel available */ -#define VIRTIO_NET_F_CTRL_RX 0x040000 /* Control channel RX mode support */ -#define VIRTIO_NET_F_CTRL_VLAN 0x080000 /* Control channel VLAN filtering */ -#define VIRTIO_NET_F_CTRL_RX_EXTRA 0x100000 /* Extra RX mode control support */ -#define VIRTIO_NET_F_GUEST_ANNOUNCE 0x200000 /* Announce device on network */ -#define VIRTIO_NET_F_MQ 0x400000 /* Device supports Receive Flow Steering */ -#define VIRTIO_NET_F_CTRL_MAC_ADDR 0x800000 /* Set MAC address */ +#define VIRTIO_NET_F_CSUM (1ULL << 0) /* Host handles pkts w/ partial csum */ +#define VIRTIO_NET_F_GUEST_CSUM (1ULL << 1) /* Guest handles pkts w/ partial csum*/ +#define VIRTIO_NET_F_CTRL_GUEST_OFFLOADS (1ULL << 2) /* Dynamic offload configuration. */ +#define VIRTIO_NET_F_MTU (1ULL << 3) /* Initial MTU advice */ +#define VIRTIO_NET_F_MAC (1ULL << 5) /* Host has given MAC address. */ +#define VIRTIO_NET_F_GSO (1ULL << 6) /* Host handles pkts w/ any GSO type */ +#define VIRTIO_NET_F_GUEST_TSO4 (1ULL << 7) /* Guest can handle TSOv4 in. */ +#define VIRTIO_NET_F_GUEST_TSO6 (1ULL << 8) /* Guest can handle TSOv6 in. */ +#define VIRTIO_NET_F_GUEST_ECN (1ULL << 9) /* Guest can handle TSO[6] w/ ECN in. */ +#define VIRTIO_NET_F_GUEST_UFO (1ULL << 10) /* Guest can handle UFO in. */ +#define VIRTIO_NET_F_HOST_TSO4 (1ULL << 11) /* Host can handle TSOv4 in. */ +#define VIRTIO_NET_F_HOST_TSO6 (1ULL << 12) /* Host can handle TSOv6 in. */ +#define VIRTIO_NET_F_HOST_ECN (1ULL << 13) /* Host can handle TSO[6] w/ ECN in. */ +#define VIRTIO_NET_F_HOST_UFO (1ULL << 14) /* Host can handle UFO in. */ +#define VIRTIO_NET_F_MRG_RXBUF (1ULL << 15) /* Host can merge receive buffers. */ +#define VIRTIO_NET_F_STATUS (1ULL << 16) /* virtio_net_config.status available*/ +#define VIRTIO_NET_F_CTRL_VQ (1ULL << 17) /* Control channel available */ +#define VIRTIO_NET_F_CTRL_RX (1ULL << 18) /* Control channel RX mode support */ +#define VIRTIO_NET_F_CTRL_VLAN (1ULL << 19) /* Control channel VLAN filtering */ +#define VIRTIO_NET_F_CTRL_RX_EXTRA (1ULL << 20) /* Extra RX mode control support */ +#define VIRTIO_NET_F_GUEST_ANNOUNCE (1ULL << 21) /* Announce device on network */ +#define VIRTIO_NET_F_MQ (1ULL << 22) /* Device supports Receive Flow Steering */ +#define VIRTIO_NET_F_CTRL_MAC_ADDR (1ULL << 23) /* Set MAC address */ #define VIRTIO_NET_F_SPEED_DUPLEX (1ULL << 63) /* Device set linkspeed and duplex */ #define VIRTIO_NET_S_LINK_UP 1 /* Link is up */ From nobody Wed Jan 21 19:46:47 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxF7r07Gqz6Pdc7 for ; Wed, 21 Jan 2026 19:46:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxF7q5Lf0z3FGY for ; Wed, 21 Jan 2026 19:46:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769024807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z3J4YxZXf8FAhgvKTNU3GIOGKz6wkcppKDlYcxlNzIk=; b=p4iQ/BIzX1OI3GNspsPCNSUgU2x111nCCybayDrM5rZ73hjt24knjXmJhqNJDnN2J5gULG DcZ3oBb7h6YFtC3pnJxKzlHGTlLONfSS6h1svwmTQnPOhT4vb6cx3fk3nDv8BC+jitYifk FeNk5kcKEpQufXnoJuVKSjN1Kw8QoQJLGMmrCzhhaP088ZX4BMgwaL9I1sXdTLxmzKXR7x UXeMWajoh/8V+dvuJMofZo7tNrRHvA9UCNQDPUgQYPW0LY8q0sN8+MJCmYMJe3+Fu+aBGT jHtK7d6+NxeXwzCuHZgy3lcpcvbVxAXcrqbl/nCew4zE8XsazF9mg0YnZYof9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769024807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z3J4YxZXf8FAhgvKTNU3GIOGKz6wkcppKDlYcxlNzIk=; b=Fv8kdTES73FoeCzgOPqcviO4pUMu3qUGZRtTtJrxczJSGeL5c8V8RnyAB1rx69IH/bWUXU xhFee6fdkjcZGd7yuHSmQ6vJAldeeB96I9qp6G/wHvRSsYSTLHKfheDx8Z6M2IoSeCpIu0 kCILYMnkllC5UCXvzx8geNFJa1UqqeV13aDxnoETUnQ5B21XwCopWDv00pgeQQiS1eY06b dleNSOY5hv23GX9ZHKyC/AgtG9Ky2GQN0uwzlnNTWJyaWZIlHv7TdLaZNdXAbiBtWEZpTS BKAqqMOUxYTAMp8w6nqTDEMjHC7Tpa5EziVJe6qzosVqMUqRI54uRAdDhum2Jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769024807; a=rsa-sha256; cv=none; b=W1KUmL85+oC+o3mL/cdEyos7gSHTGxwfGqHF/YGELKCX7mA3xJArmv29JlZvVLupF05TWj PSgzWY+I8lDv7zUFAWiry9hD4WXPoCmwk4L57BovUDYKGDqYnGL9ODAgxCwfaKeIB1O+w2 yQkqiZK4qv0HKXKEMthS/C3Yo6RAxCb4FR7xkuvaBaPwSexvZG/KlF05NU4LM3+rcdfZ2V uNZK2nxB3cx8HL9en49h/vgFAqdLtaM2pcK+GUCgyJ8Vf8bgWbtzJ93WzgsZ2NdeJKCs4n MdwEoNZWVnOVnDGvGBVbTCObtLHUMKQWB+Ud/RN3wsqxfyRIU3kO7o17KVdYmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxF7q3Hbhz11sk for ; Wed, 21 Jan 2026 19:46:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a4f2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:46:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: baa28f50d1c5 - stable/15 - vtnet: expose flags via sysctl tree List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: baa28f50d1c5412a8cf47e4117252238fe551863 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:46:47 +0000 Message-Id: <69712d27.a4f2.494e8b24@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=baa28f50d1c5412a8cf47e4117252238fe551863 commit baa28f50d1c5412a8cf47e4117252238fe551863 Author: Michael Tuexen AuthorDate: 2025-12-18 14:42:13 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:45:51 +0000 vtnet: expose flags via sysctl tree Provide the flags used for a vtnet interface via the sysctl tree. This is mostly used for debugging purposes. Reviewed by: Timo Völker Differential Revision: https://reviews.freebsd.org/D54283 (cherry picked from commit e3a0571ad74d8429a95fcae9efc1d91cc109a337) --- share/man/man4/vtnet.4 | 4 +++- sys/dev/virtio/network/if_vtnet.c | 20 ++++++++++++++++++++ sys/dev/virtio/network/if_vtnetvar.h | 5 +++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vtnet.4 b/share/man/man4/vtnet.4 index fd41b36882a6..92f72030fc31 100644 --- a/share/man/man4/vtnet.4 +++ b/share/man/man4/vtnet.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 30, 2025 +.Dd December 18, 2025 .Dt VTNET 4 .Os .Sh NAME @@ -271,6 +271,8 @@ The number of active virtqueue pairs. The number of requested virtqueue pairs. .It Va dev.vtnet. Ns Ar X Ns Va .max_vq_pairs The maximum number of supported virtqueue pairs. +.It Va dev.vtnet. Ns Ar X Ns Va .flags +The flags of the interface. Mostly for debugging purposes. .El .Sh SEE ALSO .Xr arp 4 , diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index d9daa5bfd70a..58cef9b34449 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -4398,6 +4399,22 @@ vtnet_setup_stat_sysctl(struct sysctl_ctx_list *ctx, "Times the transmit interrupt task rescheduled itself"); } +static int +vtnet_sysctl_flags(SYSCTL_HANDLER_ARGS) +{ + struct vtnet_softc *sc; + struct sbuf *sb; + int error; + + sb = sbuf_new_auto(); + sc = (struct vtnet_softc *)arg1; + sbuf_printf(sb, "%b", sc->vtnet_flags, VTNET_FLAGS_BITS); + sbuf_finish(sb); + error = SYSCTL_OUT(req, sbuf_data(sb), sbuf_len(sb) + 1); + sbuf_delete(sb); + return (error); +} + static void vtnet_setup_sysctl(struct vtnet_softc *sc) { @@ -4420,6 +4437,9 @@ vtnet_setup_sysctl(struct vtnet_softc *sc) SYSCTL_ADD_INT(ctx, child, OID_AUTO, "act_vq_pairs", CTLFLAG_RD, &sc->vtnet_act_vq_pairs, 0, "Number of active virtqueue pairs"); + SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "flags", + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0, + vtnet_sysctl_flags, "A", "Flags"); vtnet_setup_stat_sysctl(ctx, child, sc); } diff --git a/sys/dev/virtio/network/if_vtnetvar.h b/sys/dev/virtio/network/if_vtnetvar.h index cab7ced639a7..eb5e6784b07f 100644 --- a/sys/dev/virtio/network/if_vtnetvar.h +++ b/sys/dev/virtio/network/if_vtnetvar.h @@ -191,6 +191,11 @@ struct vtnet_softc { char vtnet_mtx_name[16]; uint8_t vtnet_hwaddr[ETHER_ADDR_LEN]; }; +/* vtnet flag descriptions for use with printf(9) %b identifier. */ +#define VTNET_FLAGS_BITS \ + "\20\1MODERN\2MAC\3CTRL_VQ\4CTRL_RX\5CTRL_MAC\6VLAN_FILTER\7TSO_ECN" \ + "\10MRG_RXBUFS\11LRO_NOMRG\12MQ\13INDIRECT\14EVENT_IDX\15SUSPENDED" \ + "\16FIXUP_NEEDS_CSUM\17SW_LRO" static bool vtnet_modern(struct vtnet_softc *sc) From nobody Wed Jan 21 19:47:17 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxF8P5MZmz6PdRh for ; Wed, 21 Jan 2026 19:47: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxF8P4bDYz3Fff for ; Wed, 21 Jan 2026 19:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769024837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KE6q0cS1yU7I6MiNE4g24yO/lpVjz2wjrbV4aWJE+uo=; b=BEHYVPmtMjIxpe8iC6QfUY/zHdv0MEX+wA8D9o9xA2yJRxz09CS+O+tR7Zx+pF4CXuZ9vA xYqpG9K2WxMIqaWvgAFHk4TI0tYNzERCCjXRTHXg2sVYQdRxuculrxms74MpxKlYyaCazU Rf/Rlyva98qkKRQ6NB2P1KFw0YrYe3zyzi16CU6BVb9nhITEF6sfFYTZb6V9/aoBNE+cSq ZIw/Usd6ZLDMEDtUuDHOVLjOcuRAoCpMJ8oJS63ME/Wx4yyS2aKgAy9e7IDXI2Y09o5bcS MHppvruSqKMnWy1SsQ6S26zKPLg4n+WpKOZTg3xUvaN1mHRugvAMM0bynl5ZZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769024837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KE6q0cS1yU7I6MiNE4g24yO/lpVjz2wjrbV4aWJE+uo=; b=c/OubZFuxk0My6HcoSZe6bGQaaozVhq3IdmScuzEcIr5vCzJVH1a/Q5atM+ALzOrGASNPo 4+zYgv20B3d6cfIKwZ8Sq4d+GXZEUJKsagrXKMjXfN9sMr8DQ5vNbdsb1gDMC5gnnsgcDg gWP4s0Ekj8PafmDy1kd/eDgONCXuT0ayeT6cEGmwMDJQuNIrvCDbfvqwn2iCBZ+gAIvcTH lmV3JpZAeS5dCaPvDvLwbWBSFcuRDDGoL/evFw7LQxBYBhSsnfSG2E53lidIRQAlSu5IsZ tM1Lt4y0fDJwb3hnJ5Y2d2Ujmdq8z6M0yCVGf574TlFBVV8N0zWXx0vRRCPHfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769024837; a=rsa-sha256; cv=none; b=vHYuwQZo1vrDIT0wvuYenEV0Uc/ej3EwPPYg611fTujuLFSAF7QMtW8/6P6e95C9OtuRxR /AmXiPpdnARr4ZFRzeguZ0s/m6TonsT6KohTTu68E1679ZuUin5MCwxArRmoiHR9LU0rV9 wQCmRX6mdv+9gCIoQPuJv1tmOYethBSPAJ3pNvEpPx+a9/imZAqgEV3IuEFqx9WRDEYIaW FDvNM5yfI25IvRSt8oze5TkTY4LKiEv00qVTzWSNjvnsOMLLTmJ/y0wbAHiNWkDt0zifHA XqxEgLTPzkyFY9lWcqxp6asf9+JMUW4fSTx/fDuDX8QNciRqdlCTZxm+ytC2Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxF8P41Tnz11dt for ; Wed, 21 Jan 2026 19:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b315 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:47:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 14cf01b120c9 - stable/15 - vtnet.4: put each sentence on its own line List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 14cf01b120c95006c937cfbb649f99a1ddd73f3d Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:47:17 +0000 Message-Id: <69712d45.b315.2e6de6e8@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=14cf01b120c95006c937cfbb649f99a1ddd73f3d commit 14cf01b120c95006c937cfbb649f99a1ddd73f3d Author: Michael Tuexen AuthorDate: 2025-12-18 14:57:46 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:47:00 +0000 vtnet.4: put each sentence on its own line Reported by: ziaee Fixes: e3a0571ad74d ("vtnet: expose flags via sysctl tree") (cherry picked from commit f6e183301851e3e826d53a29e76cfc9bc7626477) --- share/man/man4/vtnet.4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vtnet.4 b/share/man/man4/vtnet.4 index 92f72030fc31..4ef8693305cf 100644 --- a/share/man/man4/vtnet.4 +++ b/share/man/man4/vtnet.4 @@ -272,7 +272,8 @@ The number of requested virtqueue pairs. .It Va dev.vtnet. Ns Ar X Ns Va .max_vq_pairs The maximum number of supported virtqueue pairs. .It Va dev.vtnet. Ns Ar X Ns Va .flags -The flags of the interface. Mostly for debugging purposes. +The flags of the interface. +Mostly for debugging purposes. .El .Sh SEE ALSO .Xr arp 4 , From nobody Wed Jan 21 19:47:42 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxF8t6qvRz6Pdng for ; Wed, 21 Jan 2026 19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxF8t5Tpgz3GCT for ; Wed, 21 Jan 2026 19: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=1769024862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5P3+ykoiMZnX2snsTMpmZEYRvaBbrSQzzmoHchJfGpY=; b=SOfJ94LdmKrBqOKbedlK0HJPvN+IBp8xMYM0BlDJcYVV0iljTiyEMk/EynQJZ30cyQ1Tq7 nNbc5hzXADwVX6hyxSRBd8YbmdH81uGEfz3adD6ODrZqunYvQtlymIDYLriJ/KTnoYFOzk 3RLNdae5mqkV4151npi7D03UV7wup8V+CNDl/zIzt5Svec/labn0q06J/O0Exg7fx1sZrZ 6krMOAqPsZd0CNlkKsiHThPyip8lbiOktOossnQonxxacbJW7bWvUUbxkTCZUGYm3O+2jI XYmGOOI8HDQ//JpkLCrqBI1hUSUaXUHJzg9IqbUU0qxJxLcaeEx25qG0jV6cIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769024862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5P3+ykoiMZnX2snsTMpmZEYRvaBbrSQzzmoHchJfGpY=; b=mVm16bYbU9VH/ymMnOS3bD0mWYNbKQWrN2YyZ9WNly0yRhhTqgLTVwyZqh6An3/mxoePUA yyQ+wPkCT2K8DsN+QogQmxE8szbFf2cqLy6b21k525J87loFJrNWlLwBsHqIW1tYqraNZI SDsCfRB0Z1Hg+luLsjZ+bxI7Z0Sbt03jilcpdtAF39d/qk0xLtw59CYLch1CSCUcc1lZHm asrn7Q6S3QyaBuqOXEnN0nHW/0al31Q6eaoMRC1jlUFV0boZgHhPqDK6mtypEz8h2DhZvc jGDOVjlKS/pGaRQZmOfCsIQ2qIJ2eg8PxTwc1J09Wq1ppN/3uO7oM2W3y4QP6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769024862; a=rsa-sha256; cv=none; b=Gt9MJZCOgREKJLVVO4d/CqGKDEhrFdeKQ8r+oL8TLOh9XZPEhyTWQqfo/ib7k8B9BA66I0 EX0NbeZMmI5TpIC1mRkVKB/ZRsrUCnTVVTpZl/Jzu0tXZxt8HGVs54KzmQ3pQ9w6BoEVhK IDCEbx+C5zDBHKvnItyksz2ie8Dq7n3NhkvCWVZiuHaOPyJvEmhi7uyms+M1OIR76I7uEc FZqAXp9TomtEYZzFqJp1P1wQBIOlpwwNSmi17kcwIhxnxfwjWbAkqqdcqX2yFRfAjFwfYt j7EKLYUS8AIPjhRb5tbsg0vveTRTmMbsGVrfMJ264lE8W+SYrrmUzSMta8XJ7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxF8t4hrhz11sm for ; Wed, 21 Jan 2026 19:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b01d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:47:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 18b92d66eda5 - stable/15 - printf.9: fix style List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 18b92d66eda5618f7328e8bd9462b868b2328a20 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:47:42 +0000 Message-Id: <69712d5e.b01d.1af2c47a@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=18b92d66eda5618f7328e8bd9462b868b2328a20 commit 18b92d66eda5618f7328e8bd9462b868b2328a20 Author: Michael Tuexen AuthorDate: 2025-12-18 22:49:51 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:47:27 +0000 printf.9: fix style Follow the style described by style.9. Reported by: markj (cherry picked from commit 391e8709315d4a0e8f5ba91912e370571ab6841b) --- share/man/man9/printf.9 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/share/man/man9/printf.9 b/share/man/man9/printf.9 index 9f026d1d2004..8006590b3d2a 100644 --- a/share/man/man9/printf.9 +++ b/share/man/man9/printf.9 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 25, 2023 +.Dd December 18, 2025 .Dt PRINTF 9 .Os .Sh NAME @@ -162,7 +162,6 @@ The function void printf_test(void) { - printf("reg=%b\en", 3, "\e10\e2BITTWO\e1BITONE"); printf("out: %4D\en", "AAZZ", ":"); } From nobody Wed Jan 21 19:48:21 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxF9d6jSLz6PdfN for ; Wed, 21 Jan 2026 19:48: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxF9d5JvQz3GY3 for ; Wed, 21 Jan 2026 19:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769024901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yk4I9B4sxQxl3Cle8tu0E3YRGCDvU3vNvSreyoRKFaM=; b=oFzkLONfgKJ9hcWzkSkuMiskM9lIGHn1hGp5tdIxkkV9f3c/1K+UVnDeE2S42XBmM4R5qv FBmo0pENuPkufV4d0cjrR8fIrgkZjhyref9QlqaaYI1JSs/6Q9Z6kaI5CWj6ZjGrqVeGb2 nrd6dRkK4SKeALw/vT970tPyH5jcBnrT1VNZt3tvr9XqW458ZeQOf+CTVvQP5ec5Ap6RZf De8dpft16CmG985wz7iGrJHLwEkeGZmAT1HzfH8sqTdm6WbNPpkf6UgDpJjuda+90xREpB Qfv7kgFSu1Tx1lGKqy7LViMqu5NLQO2OC/BQ1AJmqKdKCgPU5EMKA3SlD7mkoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769024901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yk4I9B4sxQxl3Cle8tu0E3YRGCDvU3vNvSreyoRKFaM=; b=cPr+Axg68ytkSfrBsNX16nbsuEAxtp4MXaZXilF8DFS0D3otnDCNyIfYsUiGprNaHnyo+x xlgsfxwgrKJknrdYma45Bee2YnJTlLiFXQEgu3czMfrKFdX7ht7g3qkJQg+LoMjIx+Ak7a NcBX0s9kqfyKqjHpnGMG+36MJYVSiLdt1wRHQXbAP6J6COUXCRWJEa8ET3AJzwH98i2K3z Lmj8fsAtkvISSkIEmAcs2f1wJCIw8zcm7TS1gdkiaOjUJsq0pL13JXFYnclmWAwnZxdz2t u3fMGs6imUbQWxCmkuEnk/fc1Dkr1SsinJQe5oieF5aYLYHsTXJFTxQhBQN2FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769024901; a=rsa-sha256; cv=none; b=UPlt7xij1RWFBR88hGMDV/p359d2AuS5APxhUQk6hrWPb8Tg/aAOzmQadZgDeXfutWfzKo aQjcccHAnGZ7AddoXk0M9mthulu17OFqc3e1nBI0N3+4v0xQSRPwiQ4X+gA0rSF4LhQ5Tm w0oG17Bqqtczwg28kOjc5UBv/GDlr8slYDPb8RQ+EyiOpD4G7gUZyyeOrEDuZ/LMNZmKZQ LQpDg3vEFq+9UMLSsdfNzydnef4t1ahAAuBxKa7Iw9nkP70gWreRSwcUIrTyZEwcvB/wS7 ELQI65QeGRDm/xodGXk77LzxlSbM0sTZDLP9refkIcboTZ2qTqU9tSSWP8HX7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxF9d4frWz11BR for ; Wed, 21 Jan 2026 19:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8479 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:48:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: ccfd67819281 - stable/15 - printf.9: Support more than 32 bits in %b List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ccfd678192811f09b0fda78fa96482c79121b44a Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:48:21 +0000 Message-Id: <69712d85.8479.6cd45107@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ccfd678192811f09b0fda78fa96482c79121b44a commit ccfd678192811f09b0fda78fa96482c79121b44a Author: Michael Tuexen AuthorDate: 2025-12-19 16:26:37 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:47:54 +0000 printf.9: Support more than 32 bits in %b This will be usable after clang has been extended to accept length modifiers for %b when compiling kernel code. But we need FreeBSD to support it first... Reviewed by: markj, Timo Völker Differential Revision: https://reviews.freebsd.org/D54286 (cherry picked from commit d2cb9cab8457b2a84898f0ac86f7b45e907f872c) --- share/man/man9/printf.9 | 25 ++++++++++++++++++------- sys/kern/subr_prf.c | 40 +++++++++++++++++++++++++++++++--------- 2 files changed, 49 insertions(+), 16 deletions(-) diff --git a/share/man/man9/printf.9 b/share/man/man9/printf.9 index 8006590b3d2a..5c819acbec09 100644 --- a/share/man/man9/printf.9 +++ b/share/man/man9/printf.9 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 18, 2025 +.Dd December 19, 2025 .Dt PRINTF 9 .Os .Sh NAME @@ -95,14 +95,15 @@ arguments. The base value is the output base (radix) expressed as an octal value; for example, \e10 gives octal and \e20 gives hexadecimal. The arguments are made up of a sequence of bit identifiers. -Each bit identifier begins with an -.Em octal -value which is the number of the bit (starting from 1) this identifier -describes. +Each bit identifier begins with a character specifying the number of the bit +(starting from 1) this identifier describes. +The characters from \e01 to \e40 can be used to specify bit numbers in the +range from 1 to 32 and characters from \e200 to \e377 to specify bit numbers +in the range from 1 to 128. The rest of the identifier is a string of characters containing the name of the bit. -The string is terminated by either the bit number at the start of the next -bit identifier or +The identifier is terminated by either the bit number at the start of the next +bit identifier or by .Dv NUL for the last bit identifier. .Pp @@ -173,6 +174,16 @@ reg=3 out: 41:41:5a:5a .Ed .Pp +The same output will be generated by the following function: +.Bd -literal -offset indent +void +printf_test(void) +{ + printf("reg=%b\en", 3, "\e10\e201BITTWO\e200BITONE"); + printf("out: %4D\en", "AAZZ", ":"); +} +.Ed +.Pp The call .Bd -literal -offset indent log(LOG_DEBUG, "%s%d: been there.\en", sc->sc_name, sc->sc_unit); diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index db0ceb17b9f0..28f41eaf6d4d 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -628,6 +628,18 @@ ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper) return (p); } +static inline bool +isbitpos(char c) +{ + return (c != '\0' && (c <= ' ' || (c & 0x80) != 0)); +} + +static inline bool +isprintnospace(char c) +{ + return (isprint(c) && c != ' '); +} + /* * Scaled down version of printf(3). * @@ -640,9 +652,12 @@ ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper) * * where is the output base expressed as a control character, e.g. * \10 gives octal; \20 gives hex. Each arg is a sequence of characters, - * the first of which gives the bit number to be inspected (origin 1), and - * the next characters (up to a control character, i.e. a character <= 32), - * give the name of the register. Thus: + * the first of which gives the bit number to be inspected and the next + * characters (up to the bit number of the next argument or a final NUL + * character), give the name of the register. + * The bit number can be encoded as a character between 1 and 32 or as a + * character between 128 and 255. + * Thus: * * kvprintf("reg=%b\n", 3, "\10\2BITTWO\1BITONE"); * @@ -650,6 +665,10 @@ ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper) * * reg=3 * + * The same output would be generated by using: + * + * kvprintf("reg=%b\n", 3, "\10\201BITTWO\200BITONE"); + * * XXX: %D -- Hexdump, takes pointer and separator string: * ("%6D", ptr, ":") -> XX:XX:XX:XX:XX:XX * ("%*D", len, ptr, " " -> XX XX XX XX ... @@ -950,15 +969,18 @@ number: if (bconv && num != 0) { /* %b conversion flag format. */ tmp = retval; - while (*q) { - n = *q++; - if (num & (1 << (n - 1))) { + while (isbitpos(*q)) { + if ((*q & 0x80) != 0) + n = *q++ & 0x7f; + else + n = *q++ - 1; + if (num & (1ULL << n)) { PCHAR(retval != tmp ? ',' : '<'); - for (; (n = *q) > ' '; ++q) - PCHAR(n); + for (; isprintnospace(*q); ++q) + PCHAR(*q); } else - for (; *q > ' '; ++q) + for (; isprintnospace(*q); ++q) continue; } if (retval != tmp) { From nobody Wed Jan 21 19:48:57 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFBK2bsyz6PdfV for ; Wed, 21 Jan 2026 19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxFBK1gnQz3GnR for ; Wed, 21 Jan 2026 19: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=1769024937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Is0mAH91BifJ/UX+BVq7E3YYTCXb896KN2JYHFGanE=; b=MiBHR3eXHKUgkQIJlo3gQTQZ3ZhZS8Ad7c43SHVbnwtUM0MTpiwzFB5xZQCh1dpXIwIQQc IoAQYW2gpHTFRf0DohkT8o9tZWXLOKpGB8T7igeYV/XIDZu1CK3qW/As8nFqHKfYGPs6Lv HFdLefBGTfkTZ25VWvoNmNH7zjmBQ+dzdKCDxn9IWC28WrF5bbhpKwHufTxoCq8NabmHz9 OcIF8cxLoWQFQ2hP9GFMCPcwbGxmXDfMXHfZz+CM1K3bY+y6BlwM+//k3btyIY+7zOytt5 cApkdtzrNpPEn3XFwO59ne0C3g2mESwYodH/Z1SdzCxnWd3R4sbCeuSIrlaW5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769024937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Is0mAH91BifJ/UX+BVq7E3YYTCXb896KN2JYHFGanE=; b=B+DNLnTt9HZ32LATz2NZa+sBUefliyYAaNP4aLVCY1qGvzFAdesM/5haj1YCBPpeQq8tVb h2QI+Ge3fZyvjh54WY0WdipBBS82lL5Wf9KOscIMexXqVScfV/V84+rAyUW/I23zaHLwCH n4OkdFpjEli+xTUBKXrhwBcQCZZIoVcuv2KG+kRBB1MwnilLAxVJEI1cg+Y1877Zc3vCpV tAMnzyZmXfcJF73zauNmq+tm40IjPn61a8WV0jky4UqX+TkSpAQtzACoihzIDSmDqTDEEX 87dMEiTFbMmfYnGFntjkWfVDKUyMcHjPcXif5S5Kl4xmyu62A1VsbUy0CAu9oA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769024937; a=rsa-sha256; cv=none; b=VZFHUJkDHQQy6+cJXtlZXd7zDjx8YzBaGRqcps1yTe7rVKa8vfbgwV9lRRhSoZ+gkHkugs bbDOt9cUQk6JpcoviZBh5RzSMzeHU63G/0gV9stSnwIiMBsT97zSAVfc9zKoXZWba1gDP3 b1t1FszSts3bqHFNC14ONnANFlDQWXjWVZYJQcT7dXFaI+zbx22pF7hDUUw0U9a2zAaWT/ KTkErdZ7qTc0yTbi4COOtxL0ftWB+kJF3weYKqt0fgY0tBxG2mSlUaAFBbdOttgERtEydD NrsQMThJ8ChNmHm/HWCuQoOBpFlBG9IGxhWMNAerdFA9btlOv2qQomkLuJSOQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxFBK17crz11W6 for ; Wed, 21 Jan 2026 19:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ab91 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:48:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: c9e4a98abeb2 - stable/15 - vtnet: expose features via sysctl tree List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c9e4a98abeb26464fda487742417cb7d46994b47 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:48:57 +0000 Message-Id: <69712da9.ab91.4036373a@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c9e4a98abeb26464fda487742417cb7d46994b47 commit c9e4a98abeb26464fda487742417cb7d46994b47 Author: Michael Tuexen AuthorDate: 2025-12-19 16:38:35 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:48:31 +0000 vtnet: expose features via sysctl tree Right now the 64-bit flags field needs to be casted to a 32-bit field, because clang warns if more than 32-bits are used. Once clang is fixed, this restriction will be removed and more bits will be added. Reviewed by: markj, Timo Völker Differential Revision: https://reviews.freebsd.org/D54288 (cherry picked from commit 634d9c0d111b630c3d63a1cf25d15c32a37afab8) --- share/man/man4/vtnet.4 | 4 +++- sys/dev/virtio/network/if_vtnet.c | 18 ++++++++++++++++++ sys/dev/virtio/network/virtio_net.h | 8 ++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vtnet.4 b/share/man/man4/vtnet.4 index 4ef8693305cf..926f504d8070 100644 --- a/share/man/man4/vtnet.4 +++ b/share/man/man4/vtnet.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 18, 2025 +.Dd December 19, 2025 .Dt VTNET 4 .Os .Sh NAME @@ -274,6 +274,8 @@ The maximum number of supported virtqueue pairs. .It Va dev.vtnet. Ns Ar X Ns Va .flags The flags of the interface. Mostly for debugging purposes. +.It Va dev.vtnet. Ns Ar X Ns Va .features +The features of the interface as defined by the virtio specification. .El .Sh SEE ALSO .Xr arp 4 , diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 58cef9b34449..73f34808e008 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -4399,6 +4399,21 @@ vtnet_setup_stat_sysctl(struct sysctl_ctx_list *ctx, "Times the transmit interrupt task rescheduled itself"); } +static int +vtnet_sysctl_features(SYSCTL_HANDLER_ARGS) +{ + struct sbuf sb; + struct vtnet_softc *sc = (struct vtnet_softc *)arg1; + int error; + + sbuf_new_for_sysctl(&sb, NULL, 0, req); + sbuf_printf(&sb, "%b", (uint32_t)sc->vtnet_features, + VIRTIO_NET_FEATURE_BITS); + error = sbuf_finish(&sb); + sbuf_delete(&sb); + return (error); +} + static int vtnet_sysctl_flags(SYSCTL_HANDLER_ARGS) { @@ -4437,6 +4452,9 @@ vtnet_setup_sysctl(struct vtnet_softc *sc) SYSCTL_ADD_INT(ctx, child, OID_AUTO, "act_vq_pairs", CTLFLAG_RD, &sc->vtnet_act_vq_pairs, 0, "Number of active virtqueue pairs"); + SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "features", + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0, + vtnet_sysctl_features, "A", "Features"); SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "flags", CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0, vtnet_sysctl_flags, "A", "Flags"); diff --git a/sys/dev/virtio/network/virtio_net.h b/sys/dev/virtio/network/virtio_net.h index e61a4a993052..f4256664fba8 100644 --- a/sys/dev/virtio/network/virtio_net.h +++ b/sys/dev/virtio/network/virtio_net.h @@ -57,6 +57,14 @@ #define VIRTIO_NET_F_CTRL_MAC_ADDR (1ULL << 23) /* Set MAC address */ #define VIRTIO_NET_F_SPEED_DUPLEX (1ULL << 63) /* Device set linkspeed and duplex */ +/* virtio net feature flag descriptions for use with printf(9) %b identifier. */ +#define VIRTIO_NET_FEATURE_BITS \ + "\20\200CSUM\201GUEST_CSUM\202CTRL_GUEST_OFFLOADS\203MTU\205MAC\206GSO" \ + "\207GUEST_TSO4\210GUEST_TSO6\211GUEST_ECN\212GUEST_UFO\213HOST_TSO4" \ + "\214HOST_TSO6\215HOST_ECN\216HOST_UFO\217MRG_RXBUF\220STATUS\221CTRL_VQ" \ + "\222CTRL_RX\223CTRL_VLAN\224CTRL_RX_EXTRA\225GUEST_ANNOUNCE\226MQ" \ + "\227CTRL_MAC_ADDR\277SPEED_DUPLEX" + #define VIRTIO_NET_S_LINK_UP 1 /* Link is up */ #define VIRTIO_NET_S_ANNOUNCE 2 /* Announcement is needed */ From nobody Wed Jan 21 19:49:35 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFC326kkz6Pdtl for ; Wed, 21 Jan 2026 19:49: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxFC31FKWz3GyK for ; Wed, 21 Jan 2026 19:49:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769024975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dESupBuyaf4rjiSqJLO9xaQfB+f7MYu/mGJfJtCD/9s=; b=n8dVp5+kNrlQqiA6/AQx8VHeexvBBwp7mK4hRyhlAZHMzgZvJuovRDTuSiIaOunmEhdIHS 9/QQS9EOL7I+xXgjarkz2EmMUPaSGMhMRTcXZdqS2YwgW+SImM63uyZxuiDfmxfDGufVJi wFz1xfTNsp0xR5xEgPB0DUwcq5ktNfJcRNOEoUpXzS2CWLrylue8K3yHBuX6wDPmf+9HE9 25l5DGPb290bqLcotse7BtoKcvwhnyTuZ73NjSsKjVS0wvFzcE4nDIihv3D1chIC8FKosm HiaJ1NmqlWJmOSnpmKmEpOaLA9uAxASCWav0ObmXlBNa4hjkMWc19rpVWxDdbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769024975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dESupBuyaf4rjiSqJLO9xaQfB+f7MYu/mGJfJtCD/9s=; b=MOnsmvXmSb8d7RT+Qhwt/bKWKZg4YKTqj4WEVRNg2hQUGRHgxfKEJvoaLE0tnJMozTKHRK WVdLW6e07+WGGsKBwJ2SRSU5/RhbtqQf9dS+ZAV6yhUQ6UNyXAkghBFxel/p5jyoWQQOuK VUSHB7Oj9MCJBDgqbj+XnRyBE8eYNbdILRZJoE5TIihsONME8Jv8RhGXAW7FpuPfMdK5Gp 2fYgZnY/q0eK80MtYARYFQVMcyXBAL+Lf0xWxoOB1oV3KgMCCJVQJEJa0vDcawspf6sMuv B6D9KH67YwBkvHuwC5/flmxF/CSS9m66pfXvgNvFnjHt85J93KOyeHR+TbEt2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769024975; a=rsa-sha256; cv=none; b=JU94PwRLrNGuiqbnv6LIOmlAuyIj5+oTzOEQ4rRgYJvCgUMfub+Hor2TaYQpHQZN/eRJtI TbEg0mnNcoDN4Wa7KCwC05AnD+b6ZFMg9e6sothYG8CxO9jZmKZsd4G2JXlINkQLOxsSMJ QXQpbGqguvkIHOVRp3FtjpmEn6GwMXEylZ2x7euprUA7GK5jgJOAc8rMz3vvWI37fvXLPr 8KGl4cYyLg7PtzYk3UUJJCiImV5sZiiV/Ts1H9Lsc+r994OR/uFvSHGN54y4vTLFEHNyL+ 6MvEWOYqfeYIWF2eqhR0JMnJs6D6BxbhMIu6u7DeBAYb0wOTs3uvDesWjxLEIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxFC30T8Hz11bg for ; Wed, 21 Jan 2026 19:49:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8edc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:49:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 4666ba9da903 - stable/15 - vtnet: improve consistency List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4666ba9da903bfccd3e61105cb529b0871f2e250 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:49:35 +0000 Message-Id: <69712dcf.8edc.5f07542@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4666ba9da903bfccd3e61105cb529b0871f2e250 commit 4666ba9da903bfccd3e61105cb529b0871f2e250 Author: Michael Tuexen AuthorDate: 2025-12-19 16:44:20 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:49:07 +0000 vtnet: improve consistency Use sbuf_new_for_sysctl() instead of sbuf_new_auto() when exposing the flags via sysctl. (cherry picked from commit 8da838ac31692e381adfc63d83ea49f2adabbf23) --- sys/dev/virtio/network/if_vtnet.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 73f34808e008..19775416f8d4 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -4417,16 +4417,14 @@ vtnet_sysctl_features(SYSCTL_HANDLER_ARGS) static int vtnet_sysctl_flags(SYSCTL_HANDLER_ARGS) { - struct vtnet_softc *sc; - struct sbuf *sb; + struct sbuf sb; + struct vtnet_softc *sc = (struct vtnet_softc *)arg1; int error; - sb = sbuf_new_auto(); - sc = (struct vtnet_softc *)arg1; - sbuf_printf(sb, "%b", sc->vtnet_flags, VTNET_FLAGS_BITS); - sbuf_finish(sb); - error = SYSCTL_OUT(req, sbuf_data(sb), sbuf_len(sb) + 1); - sbuf_delete(sb); + sbuf_new_for_sysctl(&sb, NULL, 0, req); + sbuf_printf(&sb, "%b", sc->vtnet_flags, VTNET_FLAGS_BITS); + error = sbuf_finish(&sb); + sbuf_delete(&sb); return (error); } From nobody Wed Jan 21 19:50:15 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFCq5tjhz6Pdln for ; Wed, 21 Jan 2026 19:50: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxFCq4Z5Qz3HGF for ; Wed, 21 Jan 2026 19:50:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025015; 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=7GfPMEseabg+H+lg8drahajKfT18bQOw62rHthY15/g=; b=WvVgAdyc1Vo8bxgFmTGWt2pt/S5x8mCspWv9rHB6ZMzvqEkaYDnnjErzQjjwXGO7ErORvK tp+P152YXp1/rN/8u+ym/S7XaFV/QyDdJQck523Gj9xSTMBoD8G8668uumAMuD1P4YLg6Y IBUc8JVZjZ5V72LD0oYlvnnIJ5Bq4pZzKVVnB0GXGKKM76sWqxFz1LoqnDwA2D3QXYqZ5G paA0YzNeQpbrlAJabPMuX4F9VTI2M0PC/Xz3Knj5gz49R+2+gRgCPmlC66SfOsQzi65RD2 8t6nxLcSVC7TbOtgmShdbX0lBtAvAN7TZD8UsjccugCDfUflFXb3w1yxlMwFeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025015; 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=7GfPMEseabg+H+lg8drahajKfT18bQOw62rHthY15/g=; b=RH8ZnX4PRVcWrPmMbhMoO/tEKyNB2sPST1+8TLCUaJnFiv3GBhzSuXLG7zrRMaw0fh5ZF3 yfn/jjm/0Bp+44wShtvv7oGn7gMianKg1bm32wyEEiceI7vIatSj9y0XQz2ljsuN9qQsGj PDF75KLXL0Q9pAamEtDJ2kH0NVBc5wnVjrceJaAOZ5B48eXnZnDTV2Glngnw2JKQptLQX9 SceAkf10xaYTN3JoXvEasrG52q36OU1MFuQCwDk4yr0FiKmqw+vlgT+fS6ZLCz9n+0RTfR U1iDCaJWqy8w9tlEhZy7g6nC7HJQQ4SCXJ0Bc8Lx+GoubE8PfH053KGYts7GoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769025015; a=rsa-sha256; cv=none; b=NhpX29/+A9gcJ3VtWskkUqrQb4M6w+LiQhtLDcrd/Jr29g6ut2A4eNwCuqhtWhIfNkLU5x 9msJRZd4nZmklmnoQgGN3KCXxVeDPKiRj4w8lweHhXC80Kv+3w2w2ygTCEfmGUV4RTTZlP PHXIcg08cdydImjG+nZ8lo4SsiHDY+7+8VjDkreqyMWjlKNRW11jnkN32Z6vAaxU8P78Yf CFTwPKy6d3OhRgGKaPRVydzxUCSj83g9+CWAO6yxvOu9sRE9bZTjb59ih6SoXmp+aQc3uO RMYpe0oWML8a52TZqZjYwG6tPaHErICzi060k+qoTARbTVpbXG128T9BFUxXcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxFCq40xXz11Yr for ; Wed, 21 Jan 2026 19:50:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bd5f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:50:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Timo =?utf-8?Q?V=C3=B6lker?= From: Michael Tuexen Subject: git: ba49ad50c0b9 - stable/15 - tcp: fix checksum calculation bug List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ba49ad50c0b92dfc2efd97d45bb6e2931dd9aaa3 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:50:15 +0000 Message-Id: <69712df7.bd5f.494c49ea@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ba49ad50c0b92dfc2efd97d45bb6e2931dd9aaa3 commit ba49ad50c0b92dfc2efd97d45bb6e2931dd9aaa3 Author: Timo Völker AuthorDate: 2025-12-19 16:50:20 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:49:46 +0000 tcp: fix checksum calculation bug The new function in_delayed_cksum_o() was introduced to compute the checksum in the case the mbuf chain does not start with the IP header. The offset of the IP header is specified by the parameter iph_offset. If iph_offset was positive, the function computed an incorrect checksum. Reviewed by: sobomax, tuexen Fixes: 5feb38e37847 ("netinet: provide "at offset" variant of the in_delayed_cksum() API") Differential Revision: https://reviews.freebsd.org/D54269 (cherry picked from commit c8b3b605ae854ead6c8804e0400d80cb8fa73fdf) --- sys/netinet/ip_output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index ef08b9cfd3d6..bd87e9f2d6a6 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1067,8 +1067,8 @@ in_delayed_cksum_o(struct mbuf *m, uint16_t iph_offset) if (csum == 0) csum = 0xffff; } else { - cklen = ntohs(ip->ip_len); - csum = in_cksum_skip(m, cklen, offset); + cklen = ntohs(ip->ip_len) - (ip->ip_hl << 2); + csum = in_cksum_skip(m, cklen + offset, offset); } offset += m->m_pkthdr.csum_data; /* checksum offset */ From nobody Wed Jan 21 19:50:52 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFDY0fKfz6PdkK for ; Wed, 21 Jan 2026 19:50: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxFDX2VCfz3Hbb for ; Wed, 21 Jan 2026 19:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zsCLX8dUrsPXQrB+WgEugxyNw+wINd+tiypQNjBz4oo=; b=BvRdKfhCtta7O3KIHmNRh3aAOh6OEiONKMpZifFDG686CaYc81+CmN5WFPRj58McLjktSo XFTy5xBRqIyPYxdMHOtP3MJfRzVydSeqkMcKqodNcNYfmPMcKQtGd/2OP3S3WWBE/Zaabz U/YYsk6KmnT6QHdzczO5xQkOw05n86H2f5wQdx5B2yEWpA/nwauf42jJ886T+PFU8sE+mR Qrs+W5hrcLLqi2yxx2Qnzx4J2Uw+u+9K758CzcgSbRdQppL9rbhWl0MyXaeoZ8+R5f1VJS Nqd8J9xhwP8ymy0Zw7KEDHbimvBUF5E+H79X3Ezr5ceqRKroOarHiu1VtgJQ4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zsCLX8dUrsPXQrB+WgEugxyNw+wINd+tiypQNjBz4oo=; b=h0epYA6A5OVM2v0EBv5EN9H1A2szQEYeyyKtVVFbIEFTvke0aVxQhU7riHc5VPdpX1lERM rgPs81LDHgSLb99McAelPXq+fGwQ1HBWQYRYXyEHltroC/BYS9t7xD4uBfhhp9hsNaDuk3 3JCMMECxwC9egscdhqcYKjQLPbQakBcIZ+WuheX2duEZBf7BuRGQav+PQ+VYK5DFQ/XvaV hJoSWtM2E3B62gf83KVQrhLU4xxFX2q51hAwk+4KO3Shmk6XfKzZSuokfAQjIUZKH774FG VU8AR94SE/GEAJhGw8PbJv2Sv9XjWjN8x/pigTXvR9Uv20S9NgvXq40NYxEbUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769025052; a=rsa-sha256; cv=none; b=i1dSt4qnP6bx0nnmaOg4zQnstd5Wx7TpUKXJFJ3O0GvLC+vGJ2PoaQrPYn5gztP8SimyIl nmRBmGg+W0L9tD8rnDOIdstGx2z/i4hOim8HZxgSbohoKfn86CYd/BHO5ejqiEdvn6wFA3 K/FhR8UbBTmbsHSESg2ag/zdUozAlr+HbaTinL2FJvlGrsFivU4XlCawjAkFpbMNaZT61Y 8wEoiejTiQl9IA6p3P8DixjniJJOHoPLhlDK80qCZJyAL5tGHa++gkUXhx2kSx1/Qf/k6K 2qDRBLzpUjORnlFVEbJaGMIAZsiJ2hR7Pr1zAmd5fBU65JtR0Gn9EtNbabcD7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxFDX0P4Pz11WD for ; Wed, 21 Jan 2026 19:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bb91 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:50:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: decd5ea5d248 - stable/15 - dwc: improve IPv4 transmit checksum offloading List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: decd5ea5d248db46b4cdf46baccc738b28f0713e Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:50:52 +0000 Message-Id: <69712e1c.bb91.59a77d02@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=decd5ea5d248db46b4cdf46baccc738b28f0713e commit decd5ea5d248db46b4cdf46baccc738b28f0713e Author: Michael Tuexen AuthorDate: 2026-01-16 11:02:53 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:50:29 +0000 dwc: improve IPv4 transmit checksum offloading This patch provides two improvements for TCP/IPv4 and UDP/IPv4 transmit checksum offloading: (1) Use *CIC_SEG instead of *CIC_FULL, since FreeBSD always provides a pseudo header checksum. (2) Don't make transmit IPv4 header checksum offloading a prerequisite for TCP/IPv4 or UDP/IPv4 transmit checksum offloading. This is the root cause of PR 291696, since right now the epair interface does not support transmit IPv4 header checksum offloading, but TCP/IPv4 and UDP/IPv4 transmit checksum offloading. PR: 291696 Reviewed by: Timo Voelker Tested by: Marek Benc Differential Revision: https://reviews.freebsd.org/D54395 (cherry picked from commit f8ddf74175c8013268e65b18750e247306fa088a) --- sys/dev/dwc/dwc1000_dma.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/sys/dev/dwc/dwc1000_dma.c b/sys/dev/dwc/dwc1000_dma.c index 44b9f0d114bf..8cc145216c2d 100644 --- a/sys/dev/dwc/dwc1000_dma.c +++ b/sys/dev/dwc/dwc1000_dma.c @@ -248,7 +248,7 @@ dma1000_setup_txbuf(struct dwc_softc *sc, int idx, struct mbuf **mp) struct bus_dma_segment segs[TX_MAP_MAX_SEGS]; int error, nsegs; struct mbuf * m; - uint32_t flags = 0; + uint32_t flags; int i; int last; @@ -276,19 +276,12 @@ dma1000_setup_txbuf(struct dwc_softc *sc, int idx, struct mbuf **mp) m = *mp; - if ((m->m_pkthdr.csum_flags & CSUM_IP) != 0) { - if ((m->m_pkthdr.csum_flags & (CSUM_TCP|CSUM_UDP)) != 0) { - if (!sc->dma_ext_desc) - flags = NTDESC1_CIC_FULL; - else - flags = ETDESC0_CIC_FULL; - } else { - if (!sc->dma_ext_desc) - flags = NTDESC1_CIC_HDR; - else - flags = ETDESC0_CIC_HDR; - } - } + if ((m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) != 0) + flags = sc->dma_ext_desc ? ETDESC0_CIC_SEG : NTDESC1_CIC_SEG; + else if ((m->m_pkthdr.csum_flags & CSUM_IP) != 0) + flags = sc->dma_ext_desc ? ETDESC0_CIC_HDR : NTDESC1_CIC_HDR; + else + flags = sc->dma_ext_desc ? ETDESC0_CIC_NONE : NTDESC1_CIC_NONE; bus_dmamap_sync(sc->txbuf_tag, sc->txbuf_map[idx].map, BUS_DMASYNC_PREWRITE); From nobody Wed Jan 21 19:51:22 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFF70ycKz6PdkX for ; Wed, 21 Jan 2026 19:51: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxFF66GfNz3HpQ for ; Wed, 21 Jan 2026 19:51:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rhn0NYspTd3xI6pRfAH0/ZYp/Mc5JvBGpyPIjZFLSHc=; b=S+iELNuo4fhiuIoKQLBMn3i8o3yKJTRJdGd51O8vR6ODYqvaabvlFR0lpYb7zuxmTrHg6/ BpmEH4l/u586/a4XyIiXxXHTj29yJUbQB3JwEMiXkv7UF8elUrseQVwedCRze+yohWO+ei AC4zWToDODeVYUOUgJbGKJ+fAsd/QbmKj6G3NRRntG84e4gofxVITaT03VXVajsYlsFsAW sUyfiq0xNcrDwpJsdcc1ULM9E31wL/K8uL6973QEVgPPAhEezREA0oDIBqRWvWnWPkwNFr 8pQK06+akHOP7/bEyXlMR0nWuN5rrnaRkZ3SAVw8HmtZ6HAtcj0NIvY1X9evMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rhn0NYspTd3xI6pRfAH0/ZYp/Mc5JvBGpyPIjZFLSHc=; b=poFTU3Bl/TNc+dKgDQFKMX8oW9yLQ9cSUZzz020rZXLiMFWbV0uBqyHzjQU1RpH9izozo+ BZmtb3gvxtx9KeyYoKuTDMwyafhd7kYJPUZhB2PhCtpoVBahxOD0rxNRodi5S7bu8t+lDW WX2TepDND7Bv6fQhDKvvJ4oRmfS3rtbuuihb0AdhlVDr/H7Q/GEUdevDb9WXfsBg4dFxvf cwdCwg/RmU/WS9jiuBI7KKS5l9NieiPd+g2MGUWMpN/C8kcF/9xs0j2ih/K6IeCXb2sPdY fvTnlmnw0cJO8I2OkMOxjFTgvu2NWuinABZ0wky07TEMDxVp90DiEb/jzIbDAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769025082; a=rsa-sha256; cv=none; b=SDXaYPYZGRL5xtOOuYpT66VgSIAqx1Gp65LlioidLOtDNjACG4LVv7m5RzqMdwP3YGEvSx EgYzzBoXq/8IdL5YEuUHGSpo/XpNAls4jyjRzhRRCgbz+HlKQ8fwr7NXy0KuRlw7nklmZ3 21tIt4GPafMY9jg/5bh1CYbYWYqDYNUyCTni6PfMTZ/yJiQoQVOzG2wP2LsDHGRphS7yAY 66Oode3bop9UUc9eKztmAQWVz01fDizh9hZBXgRBWdag2guUhc9bASz6nesFEq+6/7o7YD OVRREzyRyWPapOTdFGrFKvoLarqcrRKvVzVL0EEYBbfBR8w3gcGwsj533D3GVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxFF65dG3z11LD for ; Wed, 21 Jan 2026 19:51:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c195 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:51:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: fac164c2b341 - stable/15 - ipv6: account for jumbo payload option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fac164c2b341afe6a84cb4da487d5233caa5af6e Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:51:22 +0000 Message-Id: <69712e3a.c195.5bbe3955@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=fac164c2b341afe6a84cb4da487d5233caa5af6e commit fac164c2b341afe6a84cb4da487d5233caa5af6e Author: Michael Tuexen AuthorDate: 2026-01-16 11:49:40 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:51:01 +0000 ipv6: account for jumbo payload option If a jumbo payload option is added, the length of the mbuf chain is increased by 8 but the actual hop-by-hop extension header with the jumbo playload option is only inserted in the packet if there are other options. Therefore, adjust optlen to reflect the actual size of IPv6 extension headers including the hop-by-hop extension header containing the jumbo payload option. Reported by: syzbot+73fe316271df473230eb@syzkaller.appspotmail.com Reviewed by: markj, Timo Voelker Differential Revision: https://reviews.freebsd.org/D54394 (cherry picked from commit 1f5b1de1fdf2924066c1851ed6c73f36fe20b438) --- sys/netinet6/ip6_output.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 6299ce6e146b..6e256b1105bf 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -557,6 +557,7 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt, if ((error = ip6_insert_jumboopt(&exthdrs, plen)) != 0) goto freehdrs; ip6->ip6_plen = 0; + optlen += 8; /* JUMBOOPTLEN */ } else ip6->ip6_plen = htons(plen); nexthdrp = &ip6->ip6_nxt; From nobody Wed Jan 21 19:51:58 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFFp5krkz6PdxZ for ; Wed, 21 Jan 2026 19:51: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxFFp4Byvz3JN5 for ; Wed, 21 Jan 2026 19:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5aRlDXKFT3aaWEAme0DD9UJJOO85+OgyzYfNELesykw=; b=EVKP1sEKzoaC69P8drCN034o2EcKCNjjVp7vv79DsGy6dqOQ0ut0CmsKttP5ajlf/sq+iy g75tTyV+58pR+jWCx79g1eBnDxybHmTYBBMSAAbhttG2ESZ4l/yzZpLLKIbVWNk/A5SER3 6s/PvT8xXPLUdevcdQMZcf6H7z7R1H4nSBsiAPkG0H4UnwX3mVcBqgZP5tkPymC+9m/V8W efGGCqtqACRi8net8OK78YHuv9sktJ6Wz9BLvjmP2waOKtI4P1E3VyaEuLF7h3G5X0LyDT ZTo3vvh0d1iocq6Qwz6ccibbeIlJayCj0gBTiV+JxbGehbwNYevoQ7T7YF3koA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5aRlDXKFT3aaWEAme0DD9UJJOO85+OgyzYfNELesykw=; b=OSiukTfNIUazHdP8PVaLDDXWkPxMZ/6Szl9XrHWfWHuBXrpQcPToQn/Uq0oRwYHDhIalCG ivQp44w6s/okHNXH6lhSnVLpAcAeGwrP4luRYEAFoAJtTJHM4llBwDWlpO8yAZBTJ9JuYE bk6TsY7iYs79Ls7rX9BSVRS2IeA77alNsy4mBLEByJ4dXov8TTv4hIZrPAr7KBGOtToVK9 89YmIHARiD3R6+J0QVWAdNJHKCXDRBeV5fRWXs9DW/ksw+CaWjSzONgx7MXgqZm1Tu4K4o UufJk58yr9R9Co216tdF3zHcFMwVv++ORh5Nj2pObHz5pjkjJbeWlFtp0h9BWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769025118; a=rsa-sha256; cv=none; b=XNh350vqbnUJl4VYRoGYs0ZoLFe1xxnGYw1/t26jW3r53EkBiCkZNg2IkHovLuDdb4hsrn NmmdJ272iQD9pGUZdboq39E+gih9Wcm8QwxVcPzZsobzczlA3xJoo5l1CAd8OJXsNuDad1 /7tNAtgZsSYCBPhZlDBvkehyMgXYB6J9eu+HXom1kHiQQWadc1fI0moRnPcN0ax6a4U3Mq 4TO8VklwV8PrPAth0nWCLxXV/Jow8mxx0KJqbEGhk1ej6/NlOIQx9VLjl/1GDVHege1vVT Xw+5f3mDpRchX94RiahmEX2O8qWX3rJEe4gkAxOjIBsIPX4Q25Y+z82he0YymQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxFFp3mhYz11ZG for ; Wed, 21 Jan 2026 19:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bb18 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:51:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: a148f7e54c4a - stable/15 - bge: disable TXCSUM if UDP transmit checksum offloading is disabled List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a148f7e54c4ac521d650a256126a0d33af4c2023 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:51:58 +0000 Message-Id: <69712e5e.bb18.7c8511f4@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a148f7e54c4ac521d650a256126a0d33af4c2023 commit a148f7e54c4ac521d650a256126a0d33af4c2023 Author: Michael Tuexen AuthorDate: 2026-01-16 12:32:13 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:51:34 +0000 bge: disable TXCSUM if UDP transmit checksum offloading is disabled The bge interface is special with respect to transmit checksumi offloading. In the default settings, an bge interface announces TXCSUM capabilities, but only supports TCP/IPv4 and not UDP/IPv4 due to limitations of some of the NICs. This results in problems when the bge interface becomes a member of a bridge. Since currently only the TXCSUM capabilities are synced when a member is added to a bridge and not the protocol specific capabilities, this can result in a situation where UDP packets are sent out using a bge interface without having a correct checksum. To mitigate this problem, initially don't announce TXCSUM capabilities, when UDP transmit checksum is disabled. It is still possible to enable TXCSUM capabilities via ifconfig. PR: 291420 Reviewed by: Timo Voelker Differential Revision: https://reviews.freebsd.org/D54486 (cherry picked from commit bbd30927b1af44226c8de0512912a7fedfce2824) --- share/man/man4/bge.4 | 10 +++++++++- sys/dev/bge/if_bge.c | 14 +++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/share/man/man4/bge.4 b/share/man/man4/bge.4 index de559c16df3c..fdf46fec0073 100644 --- a/share/man/man4/bge.4 +++ b/share/man/man4/bge.4 @@ -29,7 +29,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 18, 2017 +.Dd January 16, 2026 .Dt BGE 4 .Os .Sh NAME @@ -276,3 +276,11 @@ Also, due to the lack of hotplug support, Thunderbolt-based interfaces must not while the system is up as the kernel is currently unable to cope with a .Nm interface disappearing. +.Pp +The UDP transmit checksum offloading is disabled by default, see +.Va dev.bge.%d.forced_udpcsum . +To avoid problems when the interface is a member of a +.Xr bridge 4 +interface, all transmit checksum offloading is initially disabled in this case. +Transmit checksum offloading can be enabled using +.Xr ifconfig 8 . diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index cf3084f9b768..2feb19bff677 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -3721,7 +3721,12 @@ bge_attach(device_t dev) if_setgetcounterfn(ifp, bge_get_counter); if_setsendqlen(ifp, BGE_TX_RING_CNT - 1); if_setsendqready(ifp); - if_sethwassist(ifp, sc->bge_csum_features); + /* Initially enable checksum offloading either for all of IPv4, TCP/IPv4 + * and UDP/IPv4, or for none. This avoids problems when the interface + * is added to a bridge. + */ + if (sc->bge_csum_features & CSUM_UDP) + if_sethwassist(ifp, sc->bge_csum_features); if_setcapabilities(ifp, IFCAP_HWCSUM | IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU); if ((sc->bge_flags & (BGE_FLAG_TSO | BGE_FLAG_TSO3)) != 0) { @@ -3732,6 +3737,13 @@ bge_attach(device_t dev) if_setcapabilitiesbit(ifp, IFCAP_VLAN_HWCSUM, 0); #endif if_setcapenable(ifp, if_getcapabilities(ifp)); + /* + * Disable TXCSUM capability initially, if UDP checksum offloading is + * not enabled. This avoids problems when the interface is added to a + * bridge. + */ + if ((sc->bge_csum_features & CSUM_UDP) == 0) + if_setcapenablebit(ifp, 0, IFCAP_TXCSUM); #ifdef DEVICE_POLLING if_setcapabilitiesbit(ifp, IFCAP_POLLING, 0); #endif From nobody Wed Jan 21 19:52:30 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFGS0mhKz6Pf77 for ; Wed, 21 Jan 2026 19:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxFGR0vT4z3Jw3 for ; Wed, 21 Jan 2026 19:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AFVfMIGaLalxl+ffdakc7pkiNcYJZRULvPjsM/wpFI0=; b=SxPfy51NJvKEqlR3G8iGw4s2NTVYbMAPidxA/8GytOJ08b3xkFj/7ABULhYanzLXHF6GGb E74rosxRDZ5YcpPC4x+TEqg49xkZXqo3ggJfBOFexN/V9+aLl/gDKiGvv9mdGMYCmf8Pju aV/Ex6W1g0JEGntAdA/Rh9I6xBZaljJqxC+KXu1IVcCIopVueLzQQyIfOaxDdyxovkFYvD AM4sEDn4cmDwpq78rSWozh8fnC+g7CWCRK/7j7tTxd3m7Wh8QguFnVG6SZijEhITzeW+8M oKs/Ks+p0tJNUuClwbvHmrl9rhn5o9LNpTi2wYkQb1077zTCeIhtbxVYWPgAsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AFVfMIGaLalxl+ffdakc7pkiNcYJZRULvPjsM/wpFI0=; b=FoZrHqu/Fozd6lS3DQ+mZIHZz4qrveoUBx0MdL1ZmUFVeITC/9OJcO85K0aByXlvGVJaV0 8A5/vl6NKjW2GuGQOCAJD4gWu5DUGOq3dwja54k/Oy4q+LXLmvbXre+Jsj65vVLwsAW+5m Pzfe/3wcO/y3PO3FbU9DsqQaBB8tk2iXueb9aIIyG5v0WIDDbrnm/HposbuwSAhzysWMeA +86062/7IaLBtw9snE3SjHuLFBsrNvGQsK1yzG4U/QKc9M7yOhE0ntru7tC3Y55c0k+SKg TAQaw7PEI1XorH0CSUHsq4ez3FCTPrCg0vVjctw3988/C3YA80gV2x66d3LzJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769025151; a=rsa-sha256; cv=none; b=sxhHLq5NRth4FNIwPDJySfYQ0vc0FV7mX60ArwovDLmz2JCPofx/LzyLF6pfleV34lqUcF CxdNBiW1oAwBxuKV+CmQT3U4oA8ng8/QPJHqt1RW30WpEjIgpeSgrhxY+MQfHmBehCKmec rgGlrJVp1A5c5/V7/v8HhuMksqCrl5INOJSCyrTW6USma7Ewk0MGsaxD4lS091qeRNADhj WYQw9TK9R7UqVshEfap9nRZDLLUeisuxm7zRq3On6hJpDkwdbaa7Q1OoPjWFaeuuftPp7a TKoXjIterP7bELACynb1AWD6XtEf+v4xmmy+Zl0WR2kSvhiPhgvZ0DkfsMf42g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxFGQ6F9yz11Zp for ; Wed, 21 Jan 2026 19:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bd66 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:52:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 8c54cf52f37f - stable/15 - dwc: prepare for IPv6 transmit checksum offloading List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8c54cf52f37fc5f3e197f2252ea549e3a69ac847 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:52:30 +0000 Message-Id: <69712e7e.bd66.281cdf7a@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8c54cf52f37fc5f3e197f2252ea549e3a69ac847 commit 8c54cf52f37fc5f3e197f2252ea549e3a69ac847 Author: Michael Tuexen AuthorDate: 2026-01-16 17:28:01 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:52:08 +0000 dwc: prepare for IPv6 transmit checksum offloading No functional change intended. (cherry picked from commit 97b177f51fb939943ef920415e541d00789d12f4) --- sys/dev/dwc/if_dwc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index 1b4b4be68747..458ee01536ef 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -268,9 +268,9 @@ dwc_ioctl(if_t ifp, u_long cmd, caddr_t data) if (mask & IFCAP_TXCSUM) if_togglecapenable(ifp, IFCAP_TXCSUM); if ((if_getcapenable(ifp) & IFCAP_TXCSUM) != 0) - if_sethwassistbits(ifp, CSUM_IP | CSUM_UDP | CSUM_TCP, 0); + if_sethwassistbits(ifp, CSUM_IP | CSUM_DELAY_DATA, 0); else - if_sethwassistbits(ifp, 0, CSUM_IP | CSUM_UDP | CSUM_TCP); + if_sethwassistbits(ifp, 0, CSUM_IP | CSUM_DELAY_DATA); if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) { DWC_LOCK(sc); @@ -607,7 +607,7 @@ dwc_attach(device_t dev) if_setinitfn(ifp, dwc_init); if_setsendqlen(ifp, TX_MAP_COUNT - 1); if_setsendqready(sc->ifp); - if_sethwassist(sc->ifp, CSUM_IP | CSUM_UDP | CSUM_TCP); + if_sethwassist(sc->ifp, CSUM_IP | CSUM_DELAY_DATA); if_setcapabilities(sc->ifp, IFCAP_VLAN_MTU | IFCAP_HWCSUM); if_setcapenable(sc->ifp, if_getcapabilities(sc->ifp)); From nobody Wed Jan 21 19:53:06 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFH65Brhz6Pf2s for ; Wed, 21 Jan 2026 19:53: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxFH61gxPz3KLh for ; Wed, 21 Jan 2026 19:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CiaQTKIe7jiFma1YTB1tT/ejF92cUyiUWTfv5POvSxg=; b=whziNduUChr55lV5T16enKMZl9sLqenxOQgkUR6WHj/VaqM67xnFpN/sVEb4+WyIFqkwhZ X1BATblBXaohaMtJbu9G814z6YaLh15x/D00r5oMmXN4A/ZpaX3qTFr9o+wTwetwaAbGSd MXwBSJkw8yvB3lnINIlIADxT6bINM2BE8QNjA3daW5c7QXVQRNODvfltWVYARIwXDCZND3 BRNhY7C+CoGfxDezWIOEOnTzhyMvhEGX8yQz9y75X5BzSGZ18VX/o/SpLcC4KTJtwri9rP /KrGn+TIp1VLDT+f6OBmrKbqIJUqia1yInJoCHuetQjhCjLStkxCZxE7egfRKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CiaQTKIe7jiFma1YTB1tT/ejF92cUyiUWTfv5POvSxg=; b=CXPCxVJ4RU8HhfQHQYkYcfvl/uq0X48kKo+CUeNxcKIBvOA5Oc9MtfDzF5ar12/Lx2taHo iGjOIBfPV44aWWwWzCWezrx9ttaep9WCmrgOvPlc28Y0uYTFMv6zpMgX9ViyYEyKSbjmFQ 4AHnGOSC9YCkSxRDPncc/X1/ueKWwF4yDxUSTrKKobGi6zXdlU3OSVTMpO1wjcoxoI+NsG zNvX77ciaWT0ieKdlEbfFSPibA9opiJ21F9XQYK3vJy5b3v+6BNi59gr5OA1SGyz6XtzGT xJ5DC9npZQtX8tk9BPTHlTNjJDS/wBzwkl123VruasX8W2LlU3P/TTCjV9/9yQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769025186; a=rsa-sha256; cv=none; b=rSQNFeFGeCR2kFzPxMjseJk/VbVR7lLJqN994kq13K12ufBIcJp/1h3VWc8CAmkUTtYupH 9l9rDvvIkl7saY3m2B3n2Y/yseVOAtcusqrL9Dv0MLHuj44q5rA+z5dYok4uwUrn/ctODL hfYtCc6f7m91FqjkQU4qkDJjLkt3vPhDIyRmceOIbF4knGJaU9do0/bRN/OSW0H+gGjh8Z 5VZO8J9PZo2vX3tWp7BPYG3YlkPYktImeo6frg56iSuMgRKsZidrIyc42bD3Q5rajgDhfq bT95IEao/NLroAHo+LYzbmWnATYUWvG4qvpyzirAtvuDJew5AUzYOWOZ/cNt1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxFH61Fpvz11X0 for ; Wed, 21 Jan 2026 19:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bec1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:53:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 97f7fb06b9e1 - stable/15 - dwc: add transmit checksum offload for IPv6 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 97f7fb06b9e1730c8c6183f7da55f6764e6dc54c Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:53:06 +0000 Message-Id: <69712ea2.bec1.219ec02b@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=97f7fb06b9e1730c8c6183f7da55f6764e6dc54c commit 97f7fb06b9e1730c8c6183f7da55f6764e6dc54c Author: Michael Tuexen AuthorDate: 2026-01-17 20:01:54 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:52:46 +0000 dwc: add transmit checksum offload for IPv6 This patch adds support for transmit checksum offload for TCP/IPv6 and UDP/IPv6. Reviewed by: Timo Völker Differential Revision: https://reviews.freebsd.org/D54754 (cherry picked from commit aca67c37a5215448828a2974a2ff44e75e9159bc) --- sys/dev/dwc/dwc1000_dma.c | 2 +- sys/dev/dwc/if_dwc.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/dev/dwc/dwc1000_dma.c b/sys/dev/dwc/dwc1000_dma.c index 8cc145216c2d..a2a6fbc84e58 100644 --- a/sys/dev/dwc/dwc1000_dma.c +++ b/sys/dev/dwc/dwc1000_dma.c @@ -276,7 +276,7 @@ dma1000_setup_txbuf(struct dwc_softc *sc, int idx, struct mbuf **mp) m = *mp; - if ((m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) != 0) + if ((m->m_pkthdr.csum_flags & (CSUM_DELAY_DATA | CSUM_DELAY_DATA_IPV6)) != 0) flags = sc->dma_ext_desc ? ETDESC0_CIC_SEG : NTDESC1_CIC_SEG; else if ((m->m_pkthdr.csum_flags & CSUM_IP) != 0) flags = sc->dma_ext_desc ? ETDESC0_CIC_HDR : NTDESC1_CIC_HDR; diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index 458ee01536ef..ac6e440cf95c 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -271,6 +271,12 @@ dwc_ioctl(if_t ifp, u_long cmd, caddr_t data) if_sethwassistbits(ifp, CSUM_IP | CSUM_DELAY_DATA, 0); else if_sethwassistbits(ifp, 0, CSUM_IP | CSUM_DELAY_DATA); + if (mask & IFCAP_TXCSUM_IPV6) + if_togglecapenable(ifp, IFCAP_TXCSUM_IPV6); + if ((if_getcapenable(ifp) & IFCAP_TXCSUM_IPV6) != 0) + if_sethwassistbits(ifp, CSUM_DELAY_DATA_IPV6, 0); + else + if_sethwassistbits(ifp, 0, CSUM_DELAY_DATA_IPV6); if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) { DWC_LOCK(sc); @@ -607,8 +613,8 @@ dwc_attach(device_t dev) if_setinitfn(ifp, dwc_init); if_setsendqlen(ifp, TX_MAP_COUNT - 1); if_setsendqready(sc->ifp); - if_sethwassist(sc->ifp, CSUM_IP | CSUM_DELAY_DATA); - if_setcapabilities(sc->ifp, IFCAP_VLAN_MTU | IFCAP_HWCSUM); + if_sethwassist(sc->ifp, CSUM_IP | CSUM_DELAY_DATA | CSUM_DELAY_DATA_IPV6); + if_setcapabilities(sc->ifp, IFCAP_VLAN_MTU | IFCAP_HWCSUM | IFCAP_TXCSUM_IPV6); if_setcapenable(sc->ifp, if_getcapabilities(sc->ifp)); /* Attach the mii driver. */ From nobody Wed Jan 21 19:53:37 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFHj4Wxgz6Pf7T for ; Wed, 21 Jan 2026 19:53: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxFHj3hZKz3Kn5 for ; Wed, 21 Jan 2026 19:53:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dlk6sz+3MOrZ9hhOt51OCJBaK0TAeuZpyRsdaRJHba8=; b=c/J0xNKm/iSUevFvWIeCIEZyBcypAFmYWdh/mpjzhOjarEGJG196THqdNY8czOApx6goxs c8TKcaG5EpTYNnNkFpYkakJAwnAVc+7ugPLLpsuYbmaqQC/fwrtu48nIZUSgF8D6qAmT2a Iw08irCRQL8rrRgxsjgm4YHdTNqEkpeM3nSTuKWMg9Cuxwvpf+X180YEIxkmimqpqt/yJn H8rq2h8gkagmzX9kgsGA6FzbJfZw/lNrExXMmvXbi0PnkjIRWFBBxLA5s21yP2DVyW4DW/ KNPZ4dxHtF3uzfKKnkvRFvJjOQn+82A4EIaT0+Yx5uJaXW5SAwzuet2nTO00LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dlk6sz+3MOrZ9hhOt51OCJBaK0TAeuZpyRsdaRJHba8=; b=SI7D1jvStAOIOSeK3eflUs/Q4nU5BieqjUNkIdgKRnWkFsPVcEx6D08p9s9qJYsG9yRBGy CCq4aPV5w5mgu4QmDrxPtJZ+BEtLyFVszv1sWbJ+mco4/+J25ii6K4st3UvPoZT/j9vVFv sALB/eQ5v66SxcgoKj010sx3gQz0p6cNI6Vmz+IEVkOj1lFJlqtNoOKjPjD1j/P4uB1WGM mipTR2waBRkF6VMN2BnY6phVGdeW8gJFMKHHvtef7Co64kvAvSuJX/ypEeUZM57rOvHoVI v0c39MxH748erLNL4Kv5o71JljHJL7UagNA+r8Lykh7qUp9mVCRanYATcHojFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769025217; a=rsa-sha256; cv=none; b=CQJQ3V60WFt1BzUD03VqHx/o6O83OUzVIfhix7LCw9guQiIs3oVjlU4tacLwVFztruX46m Xhe+NFRYUvEyzp89AHkg4C43vx+nA3MnZi3iSskiP6mkmo4xm+Xe+230lt1LqAJW7WQhWG vF+9SvVoTO5AhfR5+PGZQ+kvhkHoyO+QABBvOoEGbsuUZwAP+J0Pju9lzGsuOxR8AnI9QY 48BQLh8agJA5U9j0htrbNybgj2sQ2LRu46gZZjBQ++89n1ZkpAkx1fjAFerRze6I5ZmI27 VcqvE/vWIsCChN6w6uAtDCk7KP2UMXx2BdnYfwmaZllBwXh2BGeuO91VljIKwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxFHj2rRGz126F for ; Wed, 21 Jan 2026 19:53:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9c58 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:53:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 75ea0ed365a2 - stable/15 - dwc: add receive checksum offload for IPv6 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 75ea0ed365a2e9e5d9a306cc0f8dba9b87006610 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:53:37 +0000 Message-Id: <69712ec1.9c58.762c0e1d@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=75ea0ed365a2e9e5d9a306cc0f8dba9b87006610 commit 75ea0ed365a2e9e5d9a306cc0f8dba9b87006610 Author: Michael Tuexen AuthorDate: 2026-01-17 20:06:28 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:53:16 +0000 dwc: add receive checksum offload for IPv6 This patch adds support for receive checksum offload for TCP/IPv6 and UDP/IPv6. Since receive checksum offload can't be configured separately for IPv4 and IPv6, IFCAP_RXCSUM and IFCAP_RXCSUM_IPV6 can't be changed independently. Reviewed by: Timo Völker Differential Revision: https://reviews.freebsd.org/D54756 (cherry picked from commit 5d8777f3a7aee04eabbc9f3cf12138f9b56e3ebc) --- sys/dev/dwc/dwc1000_core.c | 2 +- sys/dev/dwc/dwc1000_dma.c | 4 ++-- sys/dev/dwc/if_dwc.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/dwc/dwc1000_core.c b/sys/dev/dwc/dwc1000_core.c index ba895f991b50..ab1d50c61150 100644 --- a/sys/dev/dwc/dwc1000_core.c +++ b/sys/dev/dwc/dwc1000_core.c @@ -238,7 +238,7 @@ dwc1000_enable_csum_offload(struct dwc_softc *sc) DWC_ASSERT_LOCKED(sc); reg = READ4(sc, MAC_CONFIGURATION); - if ((if_getcapenable(sc->ifp) & IFCAP_RXCSUM) != 0) + if ((if_getcapenable(sc->ifp) & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) != 0) reg |= CONF_IPC; else reg &= ~CONF_IPC; diff --git a/sys/dev/dwc/dwc1000_dma.c b/sys/dev/dwc/dwc1000_dma.c index a2a6fbc84e58..6457503d2a7f 100644 --- a/sys/dev/dwc/dwc1000_dma.c +++ b/sys/dev/dwc/dwc1000_dma.c @@ -390,8 +390,8 @@ dwc_rxfinish_one(struct dwc_softc *sc, struct dwc_hwdesc *desc, m->m_len = len; if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); - if ((if_getcapenable(ifp) & IFCAP_RXCSUM) != 0 && - (rdesc0 & RDESC0_FT) != 0) { + if ((if_getcapenable(ifp) & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) != 0 && + (rdesc0 & RDESC0_FT) != 0) { m->m_pkthdr.csum_flags = CSUM_IP_CHECKED; if ((rdesc0 & RDESC0_ICE) == 0) m->m_pkthdr.csum_flags |= CSUM_IP_VALID; diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index ac6e440cf95c..5e2ca216b3c0 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -263,8 +263,8 @@ dwc_ioctl(if_t ifp, u_long cmd, caddr_t data) /* No work to do except acknowledge the change took */ if_togglecapenable(ifp, IFCAP_VLAN_MTU); } - if (mask & IFCAP_RXCSUM) - if_togglecapenable(ifp, IFCAP_RXCSUM); + if (mask & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) + if_togglecapenable(ifp, IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6); if (mask & IFCAP_TXCSUM) if_togglecapenable(ifp, IFCAP_TXCSUM); if ((if_getcapenable(ifp) & IFCAP_TXCSUM) != 0) @@ -614,7 +614,7 @@ dwc_attach(device_t dev) if_setsendqlen(ifp, TX_MAP_COUNT - 1); if_setsendqready(sc->ifp); if_sethwassist(sc->ifp, CSUM_IP | CSUM_DELAY_DATA | CSUM_DELAY_DATA_IPV6); - if_setcapabilities(sc->ifp, IFCAP_VLAN_MTU | IFCAP_HWCSUM | IFCAP_TXCSUM_IPV6); + if_setcapabilities(sc->ifp, IFCAP_VLAN_MTU | IFCAP_HWCSUM | IFCAP_HWCSUM_IPV6); if_setcapenable(sc->ifp, if_getcapabilities(sc->ifp)); /* Attach the mii driver. */ From nobody Wed Jan 21 19:54:01 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFJB1PXZz6PfLJ for ; Wed, 21 Jan 2026 19:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxFJB0Cnlz3LCT for ; Wed, 21 Jan 2026 19:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Pd7KiqLQhImi5YoYXzAy4OWshri8w4XO3U696waT8s=; b=qnzC7u4xB5RL7q02pdoT/VvLpELJpXoGWDeYbijb3dAM6veY3cjHIH6ZF5JiFEowSzD1WR aMfM124D0IawaP81diFpxenbYtXD7BngvPlHTnvlaDV98UPoBFCDbighhDa0gMpkE0cFeX is5+rprFL1MCaKDHOM8cT1iqhjvCizgIFwWT4EiSPnlfJPSfvXXHmrXbtH8HWODYp9JnBj /Qnmw8Ff04sqYMh6A+Xha607Rx9uD1OgI46EwQEpK9WAVlBM+5NzjW3IC8KAj7T1XsWe7Z lMjqzIfF6lMZlyL7XJVvnvklPzAfpYHEtF8U8c3mjZ+WmppJmOi7j00RNGUOWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Pd7KiqLQhImi5YoYXzAy4OWshri8w4XO3U696waT8s=; b=R8h1XeoJPwwR4FFiDbKlyX9ATJ3fRnGqvyQ6WfnSNkkYV7BaHw4MYAkcL+bWNkSBUbw0H5 FNA9a/s4oU+yLYqZKVmPzWKZ6AzqVdAtGU7JnDCUScbITMKKAJ997A2nAsJQx0DEU9QyVI DEIa+rmyRzzlyEEWeNf+r0UIbtMEue6DTjHTYHvifSMCgn5RoqIZQsxMlr2nB9PnFXip1A GNBLNv1SDdTneJ9vm0x9Y5oRt/hNs+gk6y36vcueKTnGDk1A9PUBH05ozC57MT6zynW0BQ hxw+GsFcGbgFTD//D+obEFJibaxAY/RYa97ndmkDOopatXKLxjrUw8JAqn0ZAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769025242; a=rsa-sha256; cv=none; b=oU2988KD3RT9UryC4u1UegWFbM8xOOt/bpAMVnqG7xDvxqG4kkA3VVe6EdhAELAKKsmZYr RyNCMDQ63QNIp9dVxTgMgAPHlxijbj7On5LpSgkF9pMmsZo9QbRyTId4/br2VFpn3dyK8A gD3oE2w0Yab84/JQ77582XCquE3oQObO+0/Ru4NMYq6HyN+w4Z9HMI5axCio8vWMWM/UD0 YsKVEclcq4TL8ric+9AjA4rJeut5XJD6Umc3laRnORtlY0F6IeDBNWacvzBxTXLDD4oFIG YSZ2MKgwR0J0C8H+Up/n2oAw+BOT9GjlxXkr2+A7oHFoX9VXFV5blN3wGyOZPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxFJ96gWpz11fd for ; Wed, 21 Jan 2026 19:54:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b2f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:54:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: cb94b17460ae - stable/15 - netstat: fix typo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cb94b17460ae73706b1babad63b63aa740809c8b Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:54:01 +0000 Message-Id: <69712ed9.b2f8.6a8a3ced@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=cb94b17460ae73706b1babad63b63aa740809c8b commit cb94b17460ae73706b1babad63b63aa740809c8b Author: Michael Tuexen AuthorDate: 2026-01-18 12:26:52 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:53:47 +0000 netstat: fix typo (cherry picked from commit 0ef8f7133d0f1ee28af1689f013f18e002eeae9f) --- usr.bin/netstat/sctp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c index 08cfc31c12c9..49ad09d7c2db 100644 --- a/usr.bin/netstat/sctp.c +++ b/usr.bin/netstat/sctp.c @@ -652,7 +652,7 @@ sctp_stats(u_long off, const char *name, int af1 __unused, int proto __unused) "{N:/output AUTH chunk%s}\n"); p1a(sctps_senderrors, "\t\t{:send-errors/%ju} " "{N:/ip_output error counter}\n"); - p1a(sctps_sendswcrc, "\t\t{:performed-receive-crc32c-computation/%ju} " + p1a(sctps_sendswcrc, "\t\t{:performed-transmit-crc32c-computation/%ju} " "{N:/performed transmit crc32c computation}\n"); p1a(sctps_sendhwcrc, "\t\t{:performed-transmit-crc32c-offloading/%ju} " "{N:/performed transmit crc32c offloading}\n"); From nobody Wed Jan 21 19:54:40 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFJw6CCRz6PfLS for ; Wed, 21 Jan 2026 19:54: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxFJw3d3dz3Lb1 for ; Wed, 21 Jan 2026 19:54:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uNL0nAbQbflqwVWXbeL4LHG2HS76Z6JwzVaqi6DsQfA=; b=SLZlnuYoY2oELCmXp6WGxUQgbAlc9LP45R7rSmIiOm9W9U8YopqoEjpWoPrfso0frDSWP6 lwTbg1bRiMFNMD5QRwjHOv/pFLPPAOIhlOulmLZD99LliBSYiduHV48EzOZdJft1fKP1CB JQ+A3O8oiUAx4DLN5Jx72HpHCx/NN/bG0dl1dhG+D/72m5+9CW3KL/ECfaBBVHc/GCpuCy QPaZFCWUIImeAntEMxjaLjucTkRNQFJCLoBcNSOnLzsYn6d/fNeS0Iw67G0mANNjfl5ny0 ZLJCa5MSPJrpxT4zhgHlMpGAhkUjsbbEWAuIqRjbKE7+tic4ZSqqrL83UqChrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uNL0nAbQbflqwVWXbeL4LHG2HS76Z6JwzVaqi6DsQfA=; b=WSf5rKMLbIlB4Vz75+F+9/t/Wb+ST36fEg7ArQqTOMocAk8wemTCvXreFfv05Mwyz5YGLa YKETt4WlFFWM3VISrntOSRRaQpeRglsiblJy3NbhdNLYlO5ZENTuJaz5zj1WMbqCfYhMil yBBV/qnr7crRqOr2Sf6w6XMuRTcNg9kVfaO5Nuk5vr0wVTiFh2kdUzemNCUov+bE5NDhhQ zMQv+UHpMop7GnxGxwnuEEPzfCNM6Q0O2lWKeeDCruMOgUV9y/+nuEe5yibD/9+UvH178W 8lyb99dbA3O9W2YTDoLAB3feEayA50TKxDm491sLNIJbjjpIKTwQC52IpKwayg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769025280; a=rsa-sha256; cv=none; b=vnZegCyD/gbMtb/d7zh4ULmsAPPgAP0gS1t26dd2es5PlLkZdl2w/Uog5Y6COROERAKeTC i7dlicegAtJstYmet6XHo6KIT7frMWgXkJrdNZ+8QvuAwpezwrJUDjCnqtrvyDCOyiAy2H sFfiUwKhqUAIMAjy/d+KwhgpLnNPzn45jSriZm50Vs7zZSmjek6xgb9UFvB+6N1ndRlS45 +cL4uKery01tdPu0htKq3zTD5yDs8GZ8uwS6uvG3hjD3YG/J/2jeGKpn6XPmzvb2XKKINp oodSSwxhOm8cOmi8DkDc4KnjqA8VGYUuT0kejuPN2zlvtcvZx8KyNRH8E2ojjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxFJw2q5vz11cW for ; Wed, 21 Jan 2026 19:54:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b8b2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:54:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 6f8adc8cec75 - stable/15 - sctp: improve compilation as module List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6f8adc8cec753cd8ba27da5ab07a26e233f6664a Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:54:40 +0000 Message-Id: <69712f00.b8b2.7ac5a308@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6f8adc8cec753cd8ba27da5ab07a26e233f6664a commit 6f8adc8cec753cd8ba27da5ab07a26e233f6664a Author: Michael Tuexen AuthorDate: 2026-01-19 20:38:37 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:54:15 +0000 sctp: improve compilation as module When compiling SCTP as a module, don't compile sctp_crc32.c into the module. This avoids code and variable duplication since sctp_crc32.c is compiled into the kernel. In particular, the variable system_base_info is not duplicated. This fixes the handling of the statistic counters sctps_sendhwcrc and sctps_sendswcrc when using sctp_delayed_cksum. (cherry picked from commit 68a449f09e2a38def9df822d42f91ecd2f27b0e2) --- sys/modules/sctp/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/modules/sctp/Makefile b/sys/modules/sctp/Makefile index 626f195dbf1f..4b47e1e63478 100644 --- a/sys/modules/sctp/Makefile +++ b/sys/modules/sctp/Makefile @@ -6,7 +6,6 @@ SRCS= sctp_asconf.c \ sctp_auth.c \ sctp_bsd_addr.c \ sctp_cc_functions.c \ - sctp_crc32.c \ sctp_indata.c \ sctp_input.c \ sctp_kdtrace.c \ From nobody Wed Jan 21 19:55:11 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFKX3CGjz6Pf7y for ; Wed, 21 Jan 2026 19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxFKX01h7z3LjC for ; Wed, 21 Jan 2026 19:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e+lqjOdMvTB8LLNAhwIpkXJ5UMbcnHVTw1FGZxlVQ/I=; b=ZoKR67DLaR0VeflOBq7fkzaFDyz0xijepw+Fve2lAWhsHBedU0YfWikHr+BQ0mDCMpQEXS IKeBUbQkTReZ4W3hlgGbXA+ApkmT54DHnwTwxgyV14k7GOmQavrcG8qCGxVz8YwGd9jbnS VMZncg1sWrip41ZAeFQRfCiMd8PCM9Yfzz/MIQUsmV9euRnsj2dHDJ1I9lKBw/M8ir44Qc nCi+9auJFjGLReAkfYlXMrgNpmjTEiES70Z6l+olfId5626UVeTrCt3IFbqQmh0KY7FV2L rUILAcQLTnYozY4kEZiAARLLfh5Ov3dEAEJ/FeuwlSvMB9+ohVJWYEoT3am8zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e+lqjOdMvTB8LLNAhwIpkXJ5UMbcnHVTw1FGZxlVQ/I=; b=Ngqz0MzbEnDaEwrp+/DS6G2kBA4WjZRqDxhiE238IUdVK4t4dvP5TwXN+NGlX5Xc9wCOEo duHt8XIzoOFqRSMO+bGUpXRKSHt9gDtO6tFLahbfacGNPIBrmui6nobfqBSYfuKh2ukuul IIvymFUwbqHXwtT+/UxMhzFZtlwSqo0XnpOq0sG8fasW0blD56yuMWYu5b6wZLni9R5/be i9/FpzIbj0reOUp5rC1zr4JmIYZkxojmmCK0xVBIWg6slKnd13M7ldyBBtaIzekXtGDIgI RJPFK9S3WynzciCkVNtmnoJAsg638/d09AOjeLANgbwsVni3qRHwokrmrR1LFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769025312; a=rsa-sha256; cv=none; b=fkXSVp7bOBDkv1D3jWZYKXRXZV/iL99M6FGSoDzmsuk05woJqY/odlFPeDaCphMettGG2G l1V13yNnknk7GDDkzjKkPyq9yeC/pOq9+hsdAw61NtAc7clCsp0h8k9SFAprbTfiJoOvCo wa7JS/idZ9S+9kwy9WDz7zQhIC8jNwi8DfrkmcQaiD/2b/73z7NkgnTz5A5MVUxcw1azF7 gMXcBh6QJVbRdlRhfqKC4DMu0SLaoQDCWroAOZkXHZdBxoUOSGGw/nECr15ZZPf/BprZYH qtbf93E/CRiFMXDkvJGIAkavwezVVf9PbpEvL+KiS7nqj0xOmQIF8y+TajnYsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxFKW6j9Rz126K for ; Wed, 21 Jan 2026 19:55:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b047 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:55:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 2e19631f32f9 - stable/15 - dwc: cleanup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2e19631f32f98e5e59f6cfc34170ffbef986636c Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:55:11 +0000 Message-Id: <69712f1f.b047.34cf8358@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2e19631f32f98e5e59f6cfc34170ffbef986636c commit 2e19631f32f98e5e59f6cfc34170ffbef986636c Author: Michael Tuexen AuthorDate: 2026-01-20 10:25:31 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:54:50 +0000 dwc: cleanup No functional change intended. Reviewed by: Timo Völker Differential Revision: https://reviews.freebsd.org/D54788 (cherry picked from commit 3d771e0db66da77da5a7f323df1c0638e6b586ea) --- sys/dev/dwc/if_dwc.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index 5e2ca216b3c0..f57a19e8a112 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -265,18 +265,14 @@ dwc_ioctl(if_t ifp, u_long cmd, caddr_t data) } if (mask & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) if_togglecapenable(ifp, IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6); - if (mask & IFCAP_TXCSUM) + if (mask & IFCAP_TXCSUM) { if_togglecapenable(ifp, IFCAP_TXCSUM); - if ((if_getcapenable(ifp) & IFCAP_TXCSUM) != 0) - if_sethwassistbits(ifp, CSUM_IP | CSUM_DELAY_DATA, 0); - else - if_sethwassistbits(ifp, 0, CSUM_IP | CSUM_DELAY_DATA); - if (mask & IFCAP_TXCSUM_IPV6) + if_togglehwassist(ifp, CSUM_IP | CSUM_DELAY_DATA); + } + if (mask & IFCAP_TXCSUM_IPV6) { if_togglecapenable(ifp, IFCAP_TXCSUM_IPV6); - if ((if_getcapenable(ifp) & IFCAP_TXCSUM_IPV6) != 0) - if_sethwassistbits(ifp, CSUM_DELAY_DATA_IPV6, 0); - else - if_sethwassistbits(ifp, 0, CSUM_DELAY_DATA_IPV6); + if_togglehwassist(ifp, CSUM_DELAY_DATA_IPV6); + } if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) { DWC_LOCK(sc); From nobody Wed Jan 21 19:55:56 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFLN3qMnz6PfNv for ; Wed, 21 Jan 2026 19:55: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxFLN1X36z3MBc for ; Wed, 21 Jan 2026 19:55:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X7Qx4C4DUHQdB4jnX+/oyrSZpmSXzpUZJWeL24VCCZw=; b=wSNjeMU/Zg/PPuOFNd1yfMfPjFN/0BSiMywLgrzFzpEvb5EpP54Vo5UQMEr4a1padZnBOo dZ1h9dTTk8o4Dqiy7zeqaIjH721vstluh7uuGEKLhm5ExoDVOXDeLA9w941iICuRU/at1k RMqxM0XVrJ6J+hTYsTqjFdAj+HlLAgGmrsXsbrfaVmDpHZBKRC3aOWdrGPcqr89QKthE/b TPIvZUMXvhYTLMPZJH+ygSQjf2OAyazerRFhPVrtjk1DVyehihci1KHHP7iV8LtZ3WMvp0 JJ7lBOrRYjLZo9cyJgrLc/50Fojjvzc+/fN3HK0pUgltBTslH2O3r1K83BG5Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X7Qx4C4DUHQdB4jnX+/oyrSZpmSXzpUZJWeL24VCCZw=; b=w9A9M8DI4NZtD5tzkhbj6IDg1ymp48jqIuH6Sfq/Ewg4LSJf3co97ESNpRREYgTdwpg2n9 PUFCjrdSxeafW76hHpGhxXpeaRkhF6DBgGa0WBNuFWpiti8YmlSaSwSBviinfLbD324eWd csncU638RUKqA9QzdUvMBbZTlw3YhhnGR+Gkkc55xW8Gvv5KoUJ303uzYlrHfe/d+hmBT5 QCLCKaeJ4z0DJHUtBdYKeM9+nuzGnmsrZKw2qjLZP58Xz7ZalPLkpWqBccXyzxvAB8YzYH EIMtgHOrn2CDuDrKhEHHNWc5Fnym2WfUg4jsRsSkm3ubPCMfO3uWXYXrYkJTTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769025356; a=rsa-sha256; cv=none; b=rfn+pH2bdQjjbrjANw4bWXxIXP7Q8ASVbYAscgdwfuGEDnEeQTN80IfXKzxmeVVDLVWlzl C6i8go/l9aOaTgc1YDNm2xcgGB3TCNTVHESTKA1WnNHrD+9XhramABErckiL7P5RmngIXp C8ta4KFGtuW3ufWBcEdfHuemUKnM5OdUB0oadUJUCpNHRywBP+YKu1MlfJseD8fyJq+0JV 00EHbygPz8Coy6KH7HV6fnBeHJP5E1QG4WxAA3MK5+vhPFddSpyaep93kmjszFOpnX3VEy VlUccFXiXed07Gd0Kpduul8PkiYZGR7pwtfgnn0HphzRky5+oM8FBmgJkqylIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxFLN16s0z1236 for ; Wed, 21 Jan 2026 19:55:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b2fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:55:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: d4d13a5e1647 - stable/15 - sctp: support bridge interfaces List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d4d13a5e16472bc20307a026e645576c7508a611 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:55:56 +0000 Message-Id: <69712f4c.b2fc.338fae1a@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d4d13a5e16472bc20307a026e645576c7508a611 commit d4d13a5e16472bc20307a026e645576c7508a611 Author: Michael Tuexen AuthorDate: 2026-01-20 17:04:35 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:55:36 +0000 sctp: support bridge interfaces Reported by: Timo Völker Tested by: Timo Völker (cherry picked from commit 8d82dafa568baf7be46e5e443dd7310986a28aa9) --- sys/netinet/sctp_bsd_addr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet/sctp_bsd_addr.c b/sys/netinet/sctp_bsd_addr.c index ac715d8298ec..f1c364d7b57a 100644 --- a/sys/netinet/sctp_bsd_addr.c +++ b/sys/netinet/sctp_bsd_addr.c @@ -174,6 +174,7 @@ sctp_is_desired_interface_type(struct ifnet *ifn) case IFT_IPOVERCLAW: case IFT_PROPVIRTUAL: /* NetGraph Virtual too */ case IFT_VIRTUALIPADDRESS: + case IFT_BRIDGE: result = 1; break; default: From nobody Fri Jan 23 07:55:02 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dy9Ff3bL1z6Ppwf for ; Fri, 23 Jan 2026 07:55: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dy9Ff2mD1z3G0F for ; Fri, 23 Jan 2026 07:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769154902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d+lPR/efYqTgpx62Qiap6svytysp/AbSIPnTXgyFL1g=; b=Pzx/ndBwUK6iApVRe060c5l9XI+md3bR53wdkhABWKxwHnNY+X6CIrOHmVByAVPN+djzZs v4gqJjqSu9KRFKgwIbwA0Ck9iIkWdrVDxHV6BYzPr5sX9c3+OQ6/cMfWhjQfuRbHKXg3XG q9psjgTfrBKmlFDZ73Ymi10O31y/9ZwI2nt3prugTGwTTff6lPkNZSOY8dXQoYA5g2SF0i Mv0lAj1X57B4bbfZdS6mD0iUvqcu9fD/raWtfPJva8rbMOWKiWB9bNZrTuVBao+k35OsGR X3PTIC9Uhpv223ob0E2g7lG8qXgOS93DYoMybPqLBz5nZ/J6ILWM8b0qlRj2pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769154902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d+lPR/efYqTgpx62Qiap6svytysp/AbSIPnTXgyFL1g=; b=AEbm6iBQ93ipROgYcJAldct2y5Tnl29ak2qxaFp4jZFagxJ6w1+mQq5Ma92+mO/tjsFmt8 3I4VagS2QPAl12u9CV8z6YMJyazn1XQ7ObGX7FDtzwp3ygWvfG6RECV4epGOOPyZbIhBYt TfvfUPPDPddpddXdf5QIbH2WMx8zq7ZhzaD8QThZdyqA61wxF0byJUJoU41fJAT85a1TA2 CS7n60mf9UuceUKdWTUDR+cexllKj9M5xY/n3wzw/rPjqjkZqOjntmJ5RzNCA0PXKUFH9+ TVz6HBPK2f1ih9WZZbxPB6erVgwZTJqu82to2tw/WeZhISJJA0XOunpsuenldQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769154902; a=rsa-sha256; cv=none; b=ckgPiEbqX/5lwtg8p7og2Z1Ukv1yCh07WO0iQRBp9uMhTv1ff5TyUVczLcSslbg0TG0gPN nvgQNhwoO7hw77H2ByUh6osBAP/v07H9Lkjgp6j1hKYPZS6iKo8YbFlRbxiuOGv7C3Ldxd 1jbDeSMocz4itKyO3Iipg0Cd9KzB41uW8wmXzBi4qm5cS+Efxxk5EnCvU7LrbuqH/+EyI5 JmY9KEUZI+e6xh4te0fR7EdaPQbw15Fh6QpZJ9/kijHSbkWXNnz4FD9Pf+ean48Xp580EA xA1BjmMpwdrk/SG8+Nr5jLxD2AewbBR2/U0FmelSd5vcftpPfB4/13vhjInHWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dy9Ff1RXwz190V for ; Fri, 23 Jan 2026 07:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 205da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 07:55:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: f5ea3d46d600 - stable/14 - 14.4: Update stable/14 to -PRERELEASE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f5ea3d46d600c290752a4ebd8a5f8282d9b4887a Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 07:55:02 +0000 Message-Id: <69732956.205da.4f912cbc@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f5ea3d46d600c290752a4ebd8a5f8282d9b4887a commit f5ea3d46d600c290752a4ebd8a5f8282d9b4887a Author: Colin Percival AuthorDate: 2026-01-23 07:53:55 +0000 Commit: Colin Percival CommitDate: 2026-01-23 07:53:55 +0000 14.4: Update stable/14 to -PRERELEASE This marks the start of the FreeBSD 14.4 release cycle; the stable/14 tree is now in "code slush". Developers are encouraged to prioritize fixing bugs (and/or merging bug fixes from HEAD) over new features at this time. Commit approval from re@ is not required but if new features introduce problems they may be removed from the release. Approved by: re (implicit) Sponsored by: OpenSats Initiative --- sys/conf/newvers.sh | 4 ++-- usr.bin/yacc/config.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 13f6c2de9bde..a4b3980168cd 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -52,8 +52,8 @@ # TYPE="FreeBSD" -REVISION="14.3" -BRANCH="STABLE" +REVISION="14.4" +BRANCH="PRERELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi diff --git a/usr.bin/yacc/config.h b/usr.bin/yacc/config.h index b9cc6d4df057..c4c079c18cb9 100644 --- a/usr.bin/yacc/config.h +++ b/usr.bin/yacc/config.h @@ -92,7 +92,7 @@ /* #undef STDC_NORETURN */ /* Define to the system name. */ -#define SYSTEM_NAME "freebsd14.3" +#define SYSTEM_NAME "freebsd14.4" /* "Define to 1 if you want to use dbmalloc for testing." */ /* #undef USE_DBMALLOC */ From nobody Fri Jan 23 17:16:27 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyPjR3JZ8z6PVJ6 for ; Fri, 23 Jan 2026 17:16: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dyPjR2mkMz4Pgp for ; Fri, 23 Jan 2026 17:16:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769188587; 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=hifESEqc+sa4SFsMtmoraxOOxHc53XcvEmmO3QnFu+E=; b=gouWS13mRY30JLra7B3M1e5eQ9T6c6GCu+LqvGk6xbMzzl+4BCMQ9lFBBw9N20Jj6XsnQd spCa9XGRHpSAnWK4LKrW1bW8q2wYeYJ5XTga9oeXE3/M33pugkX6LTthnyqn2joI7x4ruT 8SIXmWYICED+gK1Ka6hTpiTLbe4u2gANwWm1rRmJqMzotl4j55C78vkkTpwBTzCHx5/rPf kCMJpvuWxPUQhboGQA7hrMipQ4Z5zDzhTZ1J3HDY5LYjgMXQN6k/FEfYBSnmoDpc81/9wb nijkRyRStv0itslAoaAa9n5Tnc9SJiy8SJYDLIrvxeLyYj6Y7KDJgrO9Cws+qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769188587; 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=hifESEqc+sa4SFsMtmoraxOOxHc53XcvEmmO3QnFu+E=; b=e7A15NHfRYh1yJpTIDrWQubzDUSsUBpmGWhXfJuNtBSIOe0Q7j4kaj1vmdj/fWvpdCOvx+ GvTro1gJGX1ebxk9pZPx4Ul0YYjg2Wo4hEh2qeF9TixbB6XbQp9YD1ErDOiE5X1bdLoPDS boKw5EmTt2U0YkpYrkWQ7rx+Gdjgzqq7EnagoCN9t3qAc9QTkqmfSsUqv3/HGlesPu8pzS iYaDVGxZ8avzrpsr6SoqK7DX9njClyle7oK1PkMxokeWpa/oahtDWQ2TxX21ZqXDlskpsD c0NQFfEDSHfx2tVIpZJVB3FJIo1RKOhqdiw0pEbXlbTBgqGn7QAkhYPXzYg/cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769188587; a=rsa-sha256; cv=none; b=iBtq5upl5Zl0FTg7IRG4HX7TzcuIUEN6del6udQjvyUd57l8rQwcFyqlhdLMMKKu+E4+78 BffxwtSPTSm8E3BCo/SX1QccLzB33SbFdvzkC6NVv4tTLN2lJvr8EVNz6lulpOSuYAj1Uk kUy2xySqi20gF0eCpPhPa93bluxryuSAWokxrvvdLpnDP+m42eX5iF9uItRV+kQ6HmxNaf xHYrsN7e1QBBdkY8nFF5joLOyhj38LJ5fr0AFUZtg8sJ8pCUDUB1cj8ilaLRn9vaD6bJrO U+uSOGweYNP41yxa/u1Ekg9w2uAxK8bqLeAobznh0z0twlbFC4UiwFbLpoq6lA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dyPjR23XSzCJt for ; Fri, 23 Jan 2026 17:16:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38212 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 17:16:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Motin From: Mark Johnston Subject: git: 6abefcdd2585 - stable/14 - Fix SATA NCQ error recovery after 25375b1415 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6abefcdd2585019bda24dddeab49040ee39f4079 Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 17:16:27 +0000 Message-Id: <6973aceb.38212.6d23604f@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6abefcdd2585019bda24dddeab49040ee39f4079 commit 6abefcdd2585019bda24dddeab49040ee39f4079 Author: Alexander Motin AuthorDate: 2024-06-27 13:29:23 +0000 Commit: Mark Johnston CommitDate: 2026-01-23 17:12:50 +0000 Fix SATA NCQ error recovery after 25375b1415 Since that commit ahci(4), siis(4) and mvs(4) drivers ended up using wrong command to fetch error information for NCQ commands. Since ATA errors are not very informative to begin with, the only noticeable effect is a lack of retries on those errors by CAM. MFC after: 1 week PR: 279978 (cherry picked from commit 87085c12ba8fa51f777bc636df67008b45e20d1c) --- sys/dev/ahci/ahci.c | 2 +- sys/dev/mvs/mvs.c | 2 +- sys/dev/siis/siis.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c index 80cbdefd1e29..f9a44f93c26f 100644 --- a/sys/dev/ahci/ahci.c +++ b/sys/dev/ahci/ahci.c @@ -2177,7 +2177,7 @@ completeall: } xpt_setup_ccb(&ccb->ccb_h, ch->hold[i]->ccb_h.path, ch->hold[i]->ccb_h.pinfo.priority); - if (ccb->ccb_h.func_code == XPT_ATA_IO) { + if (ch->hold[i]->ccb_h.func_code == XPT_ATA_IO) { /* READ LOG */ ccb->ccb_h.recovery_type = RECOVERY_READ_LOG; ccb->ccb_h.func_code = XPT_ATA_IO; diff --git a/sys/dev/mvs/mvs.c b/sys/dev/mvs/mvs.c index 21e0984342d0..0c4c36d001ec 100644 --- a/sys/dev/mvs/mvs.c +++ b/sys/dev/mvs/mvs.c @@ -1799,7 +1799,7 @@ completeall: } xpt_setup_ccb(&ccb->ccb_h, ch->hold[i]->ccb_h.path, ch->hold[i]->ccb_h.pinfo.priority); - if (ccb->ccb_h.func_code == XPT_ATA_IO) { + if (ch->hold[i]->ccb_h.func_code == XPT_ATA_IO) { /* READ LOG */ ccb->ccb_h.recovery_type = RECOVERY_READ_LOG; ccb->ccb_h.func_code = XPT_ATA_IO; diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c index 1e5fd5648c2d..372b3ca8a380 100644 --- a/sys/dev/siis/siis.c +++ b/sys/dev/siis/siis.c @@ -1396,7 +1396,7 @@ completeall: } xpt_setup_ccb(&ccb->ccb_h, ch->hold[i]->ccb_h.path, ch->hold[i]->ccb_h.pinfo.priority); - if (ccb->ccb_h.func_code == XPT_ATA_IO) { + if (ch->hold[i]->ccb_h.func_code == XPT_ATA_IO) { /* READ LOG */ ccb->ccb_h.recovery_type = RECOVERY_READ_LOG; ccb->ccb_h.func_code = XPT_ATA_IO; From nobody Fri Jan 23 18:19:41 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyR6P6N1Qz6PZ2T for ; Fri, 23 Jan 2026 18:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dyR6P3sr9z3LwC for ; Fri, 23 Jan 2026 18:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769192381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kIIgTo3DjbPT4TYNKavVJE23Tovcihc5K1/wVSOZI8w=; b=pGqamLMZ2L1N/PuxnGJaTbXFpyuZ30al2vbDLMOD2jqbdKDJcvHdhs8jn8T96NEPpbYDQq m+kLi37wEvjY2MaoVLK/+m2nJppfaYn86hyZ9772WzsyxKvoQEdchOjbtT0ykMQh26uTIL Q7KjYQJ4Oru4IjbcmGgDF73YWgZo22vjTrozoAi84gc1dzndDbSj3ZHN1pEbYistY4Glj7 NBuKU4ESX2nDWxkQ85t/QiH1UvL5lC/YQXQ9XQNjkwrZyGKSEYXaFTPUiH5jnZBpTnuH2Z uY3qFnlleMUIZPX8TMEw7fRT07HaMOOoCrriKbII3exAfvXHHMkQFEKSzsAoQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769192381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kIIgTo3DjbPT4TYNKavVJE23Tovcihc5K1/wVSOZI8w=; b=YaqNyAeZlSREFeX3CSVoFBnf94L4dGv9IvdklXf79sW0KxXyeHLFfZuff2+4ImzukKUTlp 7N3R1WkKMyEIsGy2OFLVUl1TXvACQ6OZa/dY8Vtx8IWolmrkuzmAFzi6Rg2vF4MwD5hcbj up3p7fB90Bj0DLVC6ja7hxuLA0QFQmxiGB/dabm930O8xVnTqzRMA1oWwd8ElQWLsk6oOq Qd71JX5o8qgMBsfhsGC0yA/CTjNF8yumjvhF21RspefnwLzK15GAClGyojL9LRMk8RiqtO CrunGB05Ph6LbuEWeO7hyJYXncIgGWJn9MZdHNM01MjjvEZZgFCngMj5ND/siw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769192381; a=rsa-sha256; cv=none; b=ILgefO07SrG+YofQxcFNocWQon0Y454f6fR1ShH03tqbAfKFuR5NjykVV5co7OtJVpDB/r /nT+DT94Q0HogE6FCxXKOzlvGc5Z4sJRUwcaZkxU09GLz4x3RhT/681AT5eHkpSu2DhnLJ YjAyzrhgPJU044yhVyy0fn2NxUTfLMYZJ+j67p5Jr3sl0VYqznPfuEtEbcvoG7vLGi68FL BGCvoa5qa3Q7AeXpYEcyUc1u0KaR72vCyoLE6FgVXB1Wkqa5bEJakPIjHHuoudxHS+d0qW hbsagC0hfj+CzI8aMUK1a++d4D8V0/FWAI81QwPDyNdWll8MbmUpipo/aGFX6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dyR6P2z0xzTp9 for ; Fri, 23 Jan 2026 18:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e1d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 18:19:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Gallatin Subject: git: 72326db3c0e3 - stable/15 - ktls: Capture initial tls seqno at time offload is initiated List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 72326db3c0e372883f27144b96f2d4f8388889d6 Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 18:19:41 +0000 Message-Id: <6973bbbd.3e1d2.6e02a4ba@gitrepo.freebsd.org> The branch stable/15 has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=72326db3c0e372883f27144b96f2d4f8388889d6 commit 72326db3c0e372883f27144b96f2d4f8388889d6 Author: Andrew Gallatin AuthorDate: 2025-12-20 21:10:12 +0000 Commit: Andrew Gallatin CommitDate: 2026-01-23 15:00:53 +0000 ktls: Capture initial tls seqno at time offload is initiated Some drivers want the TLS seqno when offload starts. Capture this for them by adding a union for initial_seqno, sharing space with the TLS 1.0 next_seqno. Reviewed by: jhb Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D54275 MFC After: 1 month (cherry picked from commit 4d692068f6850282dabde9e35b3098a4ebec9592) --- sys/kern/uipc_ktls.c | 3 +++ sys/sys/ktls.h | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index 66ce1b5a081d..35009ad77722 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -1406,6 +1406,9 @@ ktls_enable_tx(struct socket *so, struct tls_enable *en) if (error) return (error); + /* some ktls offload NICs require initial seqno to start offload */ + tls->initial_offload_seqno = be64dec(en->rec_seq); + /* Prefer TOE -> ifnet TLS -> software TLS. */ #ifdef TCP_OFFLOAD error = ktls_try_toe(so, tls, KTLS_TX); diff --git a/sys/sys/ktls.h b/sys/sys/ktls.h index a940bcfaba25..6c7e7d3c5ee3 100644 --- a/sys/sys/ktls.h +++ b/sys/sys/ktls.h @@ -221,9 +221,12 @@ struct ktls_session { bool tx; bool sync_dispatch; bool sequential_records; - - /* Only used for TLS 1.0. */ - uint64_t next_seqno; + union { + /* Only used for TLS 1.0. */ + uint64_t next_seqno; + /* Needed by some ktls offload NICs */ + uint64_t initial_offload_seqno; + }; STAILQ_HEAD(, mbuf) pending_records; /* Used to destroy any kTLS session */ From nobody Fri Jan 23 18:19:42 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyR6Q6t0Kz6PZ6m for ; Fri, 23 Jan 2026 18:19: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dyR6Q4Rppz3M7H for ; Fri, 23 Jan 2026 18:19:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769192382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Om5YKpZMmfEqjcFqYrlS/wW2wS3HvwoCaxkM8456BvY=; b=eolurGq8yVg2AXzyFrqfZgh1pBrZ99M1kJGlP8oClA42hUI3Aa5tOayRkm6C3jcNJOmFoK 55h2C/dXXGlKoVyKcxcLnJTG3gQgsnS9MSZChSvgYgOSjjdJ9e6g3c557f3NxsVP382MNd PrzjRI/wJENMBE+Pkkr57KFqon9MzN385hICL1+ARP9uaR6suXL3m3YN3uragmfUwYUHq0 xWuA4yr+0qanjEGz1Pkbol6WyNSCHXnT6xH/4PoQeFGfE4UfvVCgDUldC5DWnitSgWUDJX Se2TIcDtcqo1Sw3c0Jzn1oyv8Bx0/PKi9ZDj8T3GVReSP/fEJQvQxYrqVkwIRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769192382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Om5YKpZMmfEqjcFqYrlS/wW2wS3HvwoCaxkM8456BvY=; b=DiCMdJ0pxjZabNcvgIlK0LMkqjGJvkS8jkNr4WlryOiKrFWwT5ydvKIG34wVN69fdHzoE6 J9uTqNykVhpUMki7Ti7/rX5LyHstZGgL+B2R/Tn0B3i9ssVTyH1ZVOV2jv6xXw0nl9bDFw 8ZLwqAwcs1lTJyRmFAj+DxST0+GUoTKc3I+8TrxAxFm300s35u8qz0l5xJva16v1lKatsU vnEtwNm2/IJ1inKVGiLBMheL4TGVA3q21CQu6NhssIn2Ixqbu0GfDzhkJRwfjoztIg4Ur2 YDQIqa5vFkV03di2qf7wAgV6XmB9I6WtrWXLG/Z8cuPK4HI58yKTKMn6r59imA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769192382; a=rsa-sha256; cv=none; b=aUQfswx7njR8Ez0h5c2nvw870vh9cw4DXsKa00lOjNyR/Zue2UPROti6f+LfhrNHJfAcio dWDF0S0uCqOueyC2FO9qNE/lodncKvyERtk4QMfhDnGeqgOJvAWMS676O5CZpK6I0Wffdu 7Jhylgfz1Gek1QRKNgFucWB0Mf1mqm9INeHey4k4oTgOWM5tgXm7d14pwyxKDZQAXbcL1M 3F/MfSpafQg0B4F9pJClNFkQrwTAOcmk1ZI0yniP745rpFTddBkPDiSsvt3SI64cxZDIoi VlAouMxQ4GDRfVmGXQeg3QTVXxtVOnuu/ZB6Zh0dQIOoSWsswuiORbffIPwn7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dyR6Q3c4GzTXF for ; Fri, 23 Jan 2026 18:19:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d82d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 18:19:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Gallatin Subject: git: f61e2bf9da3a - stable/15 - iflib: support for transmit side nic KTLS offload List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f61e2bf9da3a6b75b33b985628ac7f08dc99eb48 Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 18:19:42 +0000 Message-Id: <6973bbbe.3d82d.1de707fa@gitrepo.freebsd.org> The branch stable/15 has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=f61e2bf9da3a6b75b33b985628ac7f08dc99eb48 commit f61e2bf9da3a6b75b33b985628ac7f08dc99eb48 Author: Andrew Gallatin AuthorDate: 2025-12-19 20:48:36 +0000 Commit: Andrew Gallatin CommitDate: 2026-01-23 15:16:18 +0000 iflib: support for transmit side nic KTLS offload This change adds support to iflib for drivers that want to do transmit-side NIC ktls offload. This change does 2 things: 1) Extends the pkt info to include an optional mbuf pointer. This gives drivers the ability to find the start of a TLS record if they need to re-DMA part of the record to re-construct TLS state on the NIC. This mbuf pointer is only passed when CSUM_SND_TAG is present on the pkthdr. Note that I don't bother to inspect the send tag on purpose; this will only be present for TLS offloaded or paced connections 2) Allows the driver to specify how much ring padding is needed before the ring is considered to be full using the new isc_tx_pad field in if_softc_ctx. This re-uses a field that was marked spare in 2019 via d49e83eac3baf. Iflib initializes this to the previous value of 2 slots and allows the driver to override it. The TXQ_AVAIL() macro has been adjusted to subtract this padding, and uses of the macro have removed +2 from the other side of the comparison. To avoid potential cache misses from looking at the ifc_softc_ctx in TXQ_AVAIL(), the value is mirrored in the txq (in an alignment hole). Reviewed by: kbowling, kgalazka, sumit.saxena_broadcom.com, shurd Sponsored by: Netflix MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D54274 (cherry picked from commit 43d7ee540efe0df1def80ce24255b32f9f9396ba) --- sys/net/iflib.c | 27 +++++++++++++++++---------- sys/net/iflib.h | 5 +++-- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 2b8d0901032f..f6b25558d0e8 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -369,6 +369,7 @@ struct iflib_txq { struct ifmp_ring *ift_br; struct grouptask ift_task; qidx_t ift_size; + qidx_t ift_pad; uint16_t ift_id; struct callout ift_timer; #ifdef DEV_NETMAP @@ -439,7 +440,8 @@ get_inuse(int size, qidx_t cidx, qidx_t pidx, uint8_t gen) return (used); } -#define TXQ_AVAIL(txq) (txq->ift_size - get_inuse(txq->ift_size, txq->ift_cidx, txq->ift_pidx, txq->ift_gen)) +#define TXQ_AVAIL(txq) ((txq->ift_size - txq->ift_pad) -\ + get_inuse(txq->ift_size, txq->ift_cidx, txq->ift_pidx, txq->ift_gen)) #define IDXDIFF(head, tail, wrap) \ ((head) >= (tail) ? (head) - (tail) : (wrap) - (tail) + (head)) @@ -1872,6 +1874,7 @@ iflib_txq_setup(iflib_txq_t txq) txq->ift_cidx_processed = 0; txq->ift_pidx = txq->ift_cidx = txq->ift_npending = 0; txq->ift_size = scctx->isc_ntxd[txq->ift_br_offset]; + txq->ift_pad = scctx->isc_tx_pad; for (i = 0, di = txq->ift_ifdi; i < sctx->isc_ntxqs; i++, di++) bzero((void *)di->idi_vaddr, di->idi_size); @@ -3041,7 +3044,7 @@ iflib_txd_db_check(iflib_txq_t txq, int ring) max = TXQ_MAX_DB_DEFERRED(txq, txq->ift_in_use); /* force || threshold exceeded || at the edge of the ring */ - if (ring || (txq->ift_db_pending >= max) || (TXQ_AVAIL(txq) <= MAX_TX_DESC(ctx) + 2)) { + if (ring || (txq->ift_db_pending >= max) || (TXQ_AVAIL(txq) <= MAX_TX_DESC(ctx))) { /* * 'npending' is used if the card's doorbell is in terms of the number of descriptors @@ -3579,14 +3582,18 @@ defrag: return (err); } ifsd_m[pidx] = m_head; + if (m_head->m_pkthdr.csum_flags & CSUM_SND_TAG) + pi.ipi_mbuf = m_head; + else + pi.ipi_mbuf = NULL; /* * XXX assumes a 1 to 1 relationship between segments and * descriptors - this does not hold true on all drivers, e.g. * cxgb */ - if (__predict_false(nsegs + 2 > TXQ_AVAIL(txq))) { + if (__predict_false(nsegs > TXQ_AVAIL(txq))) { (void)iflib_completed_tx_reclaim(txq, RECLAIM_THRESH(ctx)); - if (__predict_false(nsegs + 2 > TXQ_AVAIL(txq))) { + if (__predict_false(nsegs > TXQ_AVAIL(txq))) { txq->ift_no_desc_avail++; bus_dmamap_unload(buf_tag, map); DBG_COUNTER_INC(encap_txq_avail_fail); @@ -3604,7 +3611,7 @@ defrag: */ txq->ift_rs_pending += nsegs + 1; if (txq->ift_rs_pending > TXQ_MAX_RS_DEFERRED(txq) || - iflib_no_tx_batch || (TXQ_AVAIL(txq) - nsegs) <= MAX_TX_DESC(ctx) + 2) { + iflib_no_tx_batch || (TXQ_AVAIL(txq) - nsegs) <= MAX_TX_DESC(ctx)) { pi.ipi_flags |= IPI_TX_INTR; txq->ift_rs_pending = 0; } @@ -3627,10 +3634,9 @@ defrag: txq->ift_gen = 1; } /* - * drivers can need as many as - * two sentinels + * drivers can need up to ift_pad sentinels */ - MPASS(ndesc <= pi.ipi_nsegs + 2); + MPASS(ndesc <= pi.ipi_nsegs + txq->ift_pad); MPASS(pi.ipi_new_pidx != pidx); MPASS(ndesc > 0); txq->ift_in_use += ndesc; @@ -3786,7 +3792,7 @@ iflib_txq_can_drain(struct ifmp_ring *r) iflib_txq_t txq = r->cookie; if_ctx_t ctx = txq->ift_ctx; - if (TXQ_AVAIL(txq) > MAX_TX_DESC(ctx) + 2) + if (TXQ_AVAIL(txq) > MAX_TX_DESC(ctx)) return (1); bus_dmamap_sync(txq->ift_ifdi->idi_tag, txq->ift_ifdi->idi_map, BUS_DMASYNC_POSTREAD); @@ -3850,7 +3856,7 @@ iflib_txq_drain(struct ifmp_ring *r, uint32_t cidx, uint32_t pidx) #endif do_prefetch = (ctx->ifc_flags & IFC_PREFETCH); err = 0; - for (i = 0; i < count && TXQ_AVAIL(txq) >= MAX_TX_DESC(ctx) + 2; i++) { + for (i = 0; i < count && TXQ_AVAIL(txq) >= MAX_TX_DESC(ctx); i++) { int rem = do_prefetch ? count - i : 0; mp = _ring_peek_one(r, cidx, i, rem); @@ -4706,6 +4712,7 @@ iflib_reset_qvalues(if_ctx_t ctx) scctx->isc_ntxd[i] = sctx->isc_ntxd_default[i]; } } + scctx->isc_tx_pad = 2; } static void diff --git a/sys/net/iflib.h b/sys/net/iflib.h index 3817445228d0..47b461311b09 100644 --- a/sys/net/iflib.h +++ b/sys/net/iflib.h @@ -127,7 +127,8 @@ typedef struct if_pkt_info { uint8_t ipi_ip_tos; /* IP ToS field data */ uint8_t ipi_mflags; /* packet mbuf flags */ uint8_t __spare0__; - uint8_t __spare1__; + uint8_t __spare1__; + struct mbuf *ipi_mbuf; /* mbuf for ktls */ } *if_pkt_info_t; typedef struct if_irq { @@ -191,7 +192,7 @@ typedef struct if_softc_ctx { int isc_vectors; int isc_nrxqsets; int isc_ntxqsets; - uint16_t __spare0__; + uint16_t isc_tx_pad; uint32_t __spare1__; int isc_msix_bar; /* can be model specific - initialize in attach_pre */ int isc_tx_nsegments; /* can be model specific - initialize in attach_pre */ From nobody Sat Jan 24 00:32:18 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dybNL3ZpVz6Q1DG for ; Sat, 24 Jan 2026 00:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dybNL23SMz44tc for ; Sat, 24 Jan 2026 00:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TuIeTCJ0jR1FhFdg6dOqG4+NWT4/tOUN6g1N6BLC9xQ=; b=gjgw7NHZ5MCND5ikis1KV0XSwqnNtTIdaNwxDz71j3OuTP/aXQwSqcYTGeGkrb79deHnv9 xbyLZHoM3OIholFUQ6xippKWPUQj7HdNhX1Mj3reF31BMHnlRk1aIXr+i2fNMBag1PyXl7 YrObEM0fyDsJqB1Z8InXCorn8Vcw6sfJ1dYRSgI7/g5lm30Of4i6lst1oAJvGfnOMGDNvZ LPL5DPbd7FAwto2o6YMPo+koWaX634VSlZHyihdA1/z2EzpDwRoJxYuRNQ7XHRGa4tCqsc VHd//3GmECWiDh3yYVqPVO1yDeqhH2/lrP6abKoYlTc3WsVkoB0FusuZxpVjng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TuIeTCJ0jR1FhFdg6dOqG4+NWT4/tOUN6g1N6BLC9xQ=; b=xlVZP5b10ZPBx6+ava6AKtQ1iL1MBSqn3Mp6CsVEpvPV/yuih4NZR05HPgCpa4hCdQjdz3 AEkfxVmhofL1F5tjt08a9eNL0RNt304ue4YkPC29y17poedXkF6OXRH5vrB8n7UjDNiGRS e9rl2+ppjY2GH8LDQ1EY19ft52Rd0mXuaJXhEw8Ar2OGSQdGI4ZnY1HNjopgy/+EkzQfCI gxTWKQcsCJZUyNiavBsHUZaDjtKJZfK9rhtiiMtx1ZQfH02Ym/YwcPNP95fcUbhazLzk3o x1j43yEJ/PWwNFLhsI6iZFzozTDfWdkFI+gnkGlMOi9n9fMnJ3k2XiydRZZtbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214738; a=rsa-sha256; cv=none; b=GZej4mex91vyu7jdNkaqKDwhKOquMCFl0IWwdDBtjfVUftA51Lo8O+tLSuYXJOIE+SFQh3 8oQfQhvAMMTsdxoC/vfNrd44NCseEXEKRoF3WQVOcAfei5vfc1YbnL+ZEtRte63YXIzOXK /9Z7Iuc8kkYQqE9fOS1ixXidzoZsgSdE1iUwBfOkwEKxNmNJolWqcL4wdntwMHD4PDb8dT mvYiOonVmz1MU1JEX5sKLPBDGzS3+qVJNlGj3selOrwODfj9eaOvOIts//1Q9ljnUufVOu RqZSm/zqY848iXRuKNFFbkQ80r8gs11tuu5yMbcK+WUBXtYtWkgk/IHJ5dpNlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dybNL1ZhzzhvT for ; Sat, 24 Jan 2026 00:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 98db by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 84cab089ed77 - stable/15 - vm_object_coalesce(): remove commented out code List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 84cab089ed771511e302ac7b4af56cec0f63cac3 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:18 +0000 Message-Id: <69741312.98db.5f0ab995@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=84cab089ed771511e302ac7b4af56cec0f63cac3 commit 84cab089ed771511e302ac7b4af56cec0f63cac3 Author: Konstantin Belousov AuthorDate: 2025-12-20 16:09:38 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-24 00:26:44 +0000 vm_object_coalesce(): remove commented out code (cherry picked from commit efcb109940ca607130af4498e1e33b54c58ba43c) --- sys/vm/vm_object.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 117900135ac3..a8ec98f2c98d 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2223,20 +2223,9 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, * Remove any pages that may still be in the object from a previous * deallocation. */ - if (next_pindex < prev_object->size) { + if (next_pindex < prev_object->size) vm_object_page_remove(prev_object, next_pindex, next_pindex + next_size, 0); -#if 0 - if (prev_object->cred != NULL) { - KASSERT(prev_object->charge >= - ptoa(prev_object->size - next_pindex), - ("object %p overcharged 1 %jx %jx", prev_object, - (uintmax_t)next_pindex, (uintmax_t)next_size)); - prev_object->charge -= ptoa(prev_object->size - - next_pindex); - } -#endif - } /* * Extend the object if necessary. From nobody Sat Jan 24 00:32:19 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dybNM5273z6Q1lH for ; Sat, 24 Jan 2026 00:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dybNM2fTnz45DD for ; Sat, 24 Jan 2026 00:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lfe1toyBY1vlPCFILFzIVa5sREezfw1UAP0pDc4t13Y=; b=rwr8CEHNKZLErRSE/CrkGLNB+V7Dzk07bZuq92mDLkM2WyQYTEoJG69DQNA1amZyptzT2E tXOtUeHz2Kipk1d3daLlc8XFhuI0KZTYTtSfbB3xb7kCv96uiYGoFd4nslIhGnLeMvDkR8 YigKLmw1VygFF3V4UzFm4cTAkY0Wp5Zu5T1qxSkHqXiS6v0OBCYPZUj5UZTGFv+zOkEqWh XaHZ9UHxXyfB+enjkvsp2hSoPMl+65L5weA2/VGBCC/09+H98i3VBDfzH/lOeyqOYiHyxX nxftBoN964WT6ZF8wY9F0Qx0KwJW62csZTeLcWiOEdhYCkLU9d3o/hszCHAdJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lfe1toyBY1vlPCFILFzIVa5sREezfw1UAP0pDc4t13Y=; b=qpqu/BcpAvcZRIWwU8L7SXenMPowaHMRh+Y/NhVZS5v/5GXnKCki1gTSGaaKWYjcBNr4Yt 6HeGdOyWcj3RZQJmbY/szli1JvPDiUUfKvKR2Us5zdS1SJkbYtrmMRrW5XiBz/HETbIrcw AJbXq7wDBpwPYdmdQHf9WGRFz2X/1rZpOkb17M10qJfZ7mJlrClyoLW6IP+frzoifYQr+W p/hgpdIz+47ANk69hh4gXCnoiqOmpSRqMko39uhoIZBBy2GFEtHeOA5NjNjjWiyywJl1/1 HvmXOJPerpgpiP+YcE6ANoyjWsrqgy2s9V5+sTYLRpbxVZqD/fx0ZmbdpyWUew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214739; a=rsa-sha256; cv=none; b=bFA06SLsTdh8iJOQvKqrBdAeg7dIkpfnoHTjq2c2BwRUxFyr2GK76q9HnGPsk/gggSAFWo 1y1jb0RIctxiRoW+bzNgNuw+Zpo6GyCKWRLQFNsBgAZDNFgYQ9gj6weaOc3KxLUBluwJGV 6SI8vl1RTq0jXdFXmQ+VftMfAkpBs6loQVSjGt8dSyKw9GW1wdx8gi6bkUFqSCGrWPrNiP KHuW2xAqxWsT5iW65qv9j/zB7eNoVupbd9GH32dohAyLayvCTCG+GpjXkUNV+EaLc1y/Pl r8Y5BdcDt+WRuxu51f1FUr15Yl2kKfyOeU2EMQHn/y20+32PNJHG6R7KX6ycbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dybNM22LyzhP2 for ; Sat, 24 Jan 2026 00:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b23b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 99fab30f7272 - stable/15 - vm_object_coalesce(): simplify common expression List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 99fab30f7272c3448d11f5e4a0b98e5ecb9de537 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:19 +0000 Message-Id: <69741313.b23b.112e7efa@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=99fab30f7272c3448d11f5e4a0b98e5ecb9de537 commit 99fab30f7272c3448d11f5e4a0b98e5ecb9de537 Author: Konstantin Belousov AuthorDate: 2025-12-18 22:14:29 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-24 00:26:44 +0000 vm_object_coalesce(): simplify common expression (cherry picked from commit e7053d9a126a60b3c0b1348b6c5131b5f2025894) --- sys/vm/vm_object.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index a8ec98f2c98d..36edb279bbce 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2163,7 +2163,7 @@ boolean_t vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, vm_size_t prev_size, vm_size_t next_size, boolean_t reserved) { - vm_pindex_t next_pindex; + vm_pindex_t next_end, next_pindex; if (prev_object == NULL) return (TRUE); @@ -2197,6 +2197,8 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, return (FALSE); } + next_end = next_pindex + next_size; + /* * Account for the charge. */ @@ -2224,14 +2226,13 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, * deallocation. */ if (next_pindex < prev_object->size) - vm_object_page_remove(prev_object, next_pindex, next_pindex + - next_size, 0); + vm_object_page_remove(prev_object, next_pindex, next_end, 0); /* * Extend the object if necessary. */ - if (next_pindex + next_size > prev_object->size) - prev_object->size = next_pindex + next_size; + if (next_end > prev_object->size) + prev_object->size = next_end; #ifdef INVARIANTS /* @@ -2243,7 +2244,7 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, vm_pindex_t pidx; pidx = swap_pager_seek_data(prev_object, next_pindex); - KASSERT(pidx >= next_pindex + next_size, + KASSERT(pidx >= next_end, ("found obj %p pindex %#jx e %#jx %#jx %#jx", prev_object, pidx, (uintmax_t)prev_offset, (uintmax_t)prev_size, (uintmax_t)next_size)); From nobody Sat Jan 24 00:32:20 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dybNN5c4jz6Q1g0 for ; Sat, 24 Jan 2026 00:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dybNN3qh5z4536 for ; Sat, 24 Jan 2026 00:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZuV/e5gPjC2tpAbiue4XqUJFsYIKVth58NUJl4DeqrE=; b=AtTt82NZionXVe91tjGbHKGofi3qp4ZbwiS6eTDE0ltRhIyy4amvxOgsKZzF5gzCM+dgHc 8GMBjkl1Ttz0sF3Fe5w7Mv6iIVjQZf4I4OZPDMWbYb3/GX3X55zY8DMgBJ1Rf7TRboyfuP Q89usk7nTMRHpChONCocdd6GDH0ElaSnctzGse6Xu5ow5KA4O/Icm2pfm+t2DJOyMzD4JV s706uNKojyW/NLmvxyYr5rzjvMImWOUy7tPeXXWEVuk54lau7Z7nW4DRomJpRXQIroCu+t l17nhu46oK6OYX8e6LDU9eHBTV4YiAhT1MjhWPcC20fs5Iv6Cttg2BesHlJWUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZuV/e5gPjC2tpAbiue4XqUJFsYIKVth58NUJl4DeqrE=; b=UEzqtMtlX90Hyvwk+jaXYnHpE/kbboDxihZJILpqbS5VZ9nch3BCUL0kI/cuhLymukqmyn PBo2Pqs1YRcEm395MD1XZvEkvnAI6djTRBY8hDDcG/1onwSpaEaD6W/kHjvr1ihLpBHcLd DzarAur+P0ZupPOWnDxSb6CHD3SLAcwDBc5gHX0Zjsn1/aRi78gL3Eh6eI7aMCXQSu7ZxU RjgdCJ0p35O9iMWrwK0XGJRGR1NXSdwwM9qB5y2TRNEOscq7mEqtHRhw3ASj/J6j4E4vqF QUwKHHoMQK0BQU608zLRxx0Lc2vNF3mOvcwfZavsNtRGetyAe6dhDhsCISDstA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214740; a=rsa-sha256; cv=none; b=GXMWi+Gmt+hqiqOpHhihBjhXoEWS9d/3hXJznSOppXYHlDJxruBco4kn5qRmF5UOJW27na KjKbSTblpTeNiVKvirHNL7Qs2MLo+Ka80wgS+Sm9LZGUJq4DmPD5UDlo78mSAinRIKIH2J BwLVVeBxXDDQlseOaX/MK3vBl8WTzs1Bte9KWzA72Zefca4+TVrM7NKUQ2Y+ooj3iIZRiH 293sfn/gnr/I+ALMCR2mewjCK6UWx7CFlPug+ixwtESueeIBhsGVve495yLh6WyL2QlUjY 0oxFG99qyqs2SlV6apClqNlNuAEmF15tySYiba2QJeLCMJvjGpKTqZsrvYYqpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dybNN2p7vzjL5 for ; Sat, 24 Jan 2026 00:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b736 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1e1727a7d7bd - stable/15 - vm_object_coalesce(): do not account holes twice List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1e1727a7d7bdead736c221b0e4971bcba307fc94 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:20 +0000 Message-Id: <69741314.b736.6c0a6f3c@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1e1727a7d7bdead736c221b0e4971bcba307fc94 commit 1e1727a7d7bdead736c221b0e4971bcba307fc94 Author: Konstantin Belousov AuthorDate: 2025-11-27 21:53:24 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-24 00:26:44 +0000 vm_object_coalesce(): do not account holes twice (cherry picked from commit 353ba3bf08fdef69b77e3e565435e50784a51412) --- sys/vm/vm_object.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 36edb279bbce..c216fdc01af1 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2202,7 +2202,8 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, /* * Account for the charge. */ - if (prev_object->cred != NULL) { + if (prev_object->cred != NULL && + next_pindex + next_size > prev_object->size) { /* * If prev_object was charged, then this mapping, * although not charged now, may become writable @@ -2213,12 +2214,14 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, * entry, and swap reservation for this entry is * managed in appropriate time. */ - if (!reserved && !swap_reserve_by_cred(ptoa(next_size), - prev_object->cred)) { + vm_size_t charge = ptoa(next_pindex + next_size - + prev_object->size); + if (!reserved && + !swap_reserve_by_cred(charge, prev_object->cred)) { VM_OBJECT_WUNLOCK(prev_object); return (FALSE); } - prev_object->charge += ptoa(next_size); + prev_object->charge += charge; } /* From nobody Sat Jan 24 00:32:21 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dybNP63lpz6Q1lP for ; Sat, 24 Jan 2026 00:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dybNP474Sz4539 for ; Sat, 24 Jan 2026 00:32:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FXNuSSTt85gBzxByOK8wlch/32UHahH9yFQ+WuAY7MU=; b=FpJ/PPpq6FMaDh1jDoEbgBuDZucm/XcEEw5CaSRK89NUbY7EPL/Yk7G3T8NWKA5UGUOJjo 4gPvmippxMDnpza7fhOsDVsbMC1eBf19MMFAbzIQHBIKFrKn1ajcf1OUTj4alWZHvjSH1t jy4zuml4feTH/RYx735e68mjT1smc+pt+4nXLqhOTFbw8cdMdDj4iOHo3nsOfMJzFOg2Mw yw+CaCr6AEJ4xej1vWvh0VXZXD95yEGtzExxkeoZvh/7erxslNDcjWzTD9A4vRo44gNGto tkWru0zoSf8kniexBIucIjXt8I3/qSGyQwXVJqW0DGRKIbgOwqq4kgP9BrZOSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FXNuSSTt85gBzxByOK8wlch/32UHahH9yFQ+WuAY7MU=; b=gy06Y58KPDK/4KoqpD4cePQdJjaFlx/vk4ugULJUQFZO22/qSncq8msakRVyGRBi+BQdkq 3mriydkCNdS8Z1hAXsxz/m3scUPj8AEbX1ddvRXuVrmpuAmSMncR850+iPvm+bjSfWQ9gp f18cxPMlFLde87zcLO//XZG0GRTHdbdXKCdvBQX9VzzQfwPSBU42pXA44Ekt7KdvPHgZTj 3eSynZc8473neP9fGsLDCkjgGknfY9uWti7bfq2AtKxZntuFRKIH1kBz7eyLhGKVm4bbOo zN5OfLjY1Iul9h/9TGplvG2ty+5hVDzTfxf6oeSxBWALHpvlss1IG6xQbBMung== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214741; a=rsa-sha256; cv=none; b=afR4hnvll4FCdqlJXuUAtrLh8KbIP7Wa+d3NO19UmMfnxt4Ki5B/YVMIITgJMff1mBQ7t+ rf59HxSB8ox+2q3xSR+ldmd4dlAejnmp2gN50kI6+XKCK2/1B2sPeih+8ef9eQY70u1w5H binyJdUx9CMEBSdt7qayOsH7PTAoHG0PcmYCOcd//ZGrW/37Jc5wFpAHgAFMfd6YNxlA4x ss0i1642hte2Abns2nJjS5o+GubRaXFgAO6njv6/5UgbscWlRJeqLIJcmRNt4FZcy3hv8K Pr3TphMv8soaluATIzDASapXXnl8AIKQCaOAdHt9kUPVvpUPs8JzwDMZdQayaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dybNP3fZvzjL7 for ; Sat, 24 Jan 2026 00:32:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b916 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 249939298daf - stable/15 - vm_object_coalesce(): return swap reservation back if overcharged List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 249939298daf62f003cf75cb3bd265c6a7b20c08 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:21 +0000 Message-Id: <69741315.b916.418d64df@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=249939298daf62f003cf75cb3bd265c6a7b20c08 commit 249939298daf62f003cf75cb3bd265c6a7b20c08 Author: Konstantin Belousov AuthorDate: 2025-12-20 16:03:40 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-24 00:26:44 +0000 vm_object_coalesce(): return swap reservation back if overcharged (cherry picked from commit 7685aaea8850f5b6995a17740a016019e0956c70) --- sys/vm/vm_map.c | 44 ++++++++++++++++++++++++++++++-------------- sys/vm/vm_object.c | 41 +++++++++++++++++++++++++++++++---------- sys/vm/vm_object.h | 8 +++++++- 3 files changed, 68 insertions(+), 25 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 6b09552c5fee..68dcadd2b2f1 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1620,6 +1620,7 @@ vm_map_insert1(vm_map_t map, vm_object_t object, vm_ooffset_t offset, vm_inherit_t inheritance; u_long bdry; u_int bidx; + int cflags; VM_MAP_ASSERT_LOCKED(map); KASSERT(object != kernel_object || @@ -1696,20 +1697,36 @@ vm_map_insert1(vm_map_t map, vm_object_t object, vm_ooffset_t offset, } cred = NULL; - if ((cow & (MAP_ACC_NO_CHARGE | MAP_NOFAULT | MAP_CREATE_GUARD)) != 0) - goto charged; - if ((cow & MAP_ACC_CHARGED) || ((prot & VM_PROT_WRITE) && - ((protoeflags & MAP_ENTRY_NEEDS_COPY) || object == NULL))) { - if (!(cow & MAP_ACC_CHARGED) && !swap_reserve(end - start)) - return (KERN_RESOURCE_SHORTAGE); - KASSERT(object == NULL || - (protoeflags & MAP_ENTRY_NEEDS_COPY) != 0 || - object->cred == NULL, - ("overcommit: vm_map_insert o %p", object)); - cred = curthread->td_ucred; + if ((cow & (MAP_ACC_NO_CHARGE | MAP_NOFAULT | MAP_CREATE_GUARD)) != 0) { + cflags = OBJCO_NO_CHARGE; + } else { + cflags = 0; + if ((cow & MAP_ACC_CHARGED) != 0 || + ((prot & VM_PROT_WRITE) != 0 && + ((protoeflags & MAP_ENTRY_NEEDS_COPY) != 0 || + object == NULL))) { + if ((cow & MAP_ACC_CHARGED) == 0) { + if (!swap_reserve(end - start)) + return (KERN_RESOURCE_SHORTAGE); + + /* + * Only inform vm_object_coalesce() + * that the object was charged if + * there is no need for CoW, so the + * swap amount reserved is applicable + * to the prev_entry->object. + */ + if ((protoeflags & MAP_ENTRY_NEEDS_COPY) == 0) + cflags |= OBJCO_CHARGED; + } + KASSERT(object == NULL || + (protoeflags & MAP_ENTRY_NEEDS_COPY) != 0 || + object->cred == NULL, + ("overcommit: vm_map_insert o %p", object)); + cred = curthread->td_ucred; + } } -charged: /* Expand the kernel pmap, if necessary. */ if (map == kernel_map && end > kernel_vm_end) { int rv; @@ -1741,8 +1758,7 @@ charged: vm_object_coalesce(prev_entry->object.vm_object, prev_entry->offset, (vm_size_t)(prev_entry->end - prev_entry->start), - (vm_size_t)(end - prev_entry->end), cred != NULL && - (protoeflags & MAP_ENTRY_NEEDS_COPY) == 0)) { + (vm_size_t)(end - prev_entry->end), cflags)) { /* * We were able to extend the object. Determine if we * can extend the previous map entry to include the diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index c216fdc01af1..f4c54ba91742 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2161,7 +2161,7 @@ vm_object_populate(vm_object_t object, vm_pindex_t start, vm_pindex_t end) */ boolean_t vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, - vm_size_t prev_size, vm_size_t next_size, boolean_t reserved) + vm_size_t prev_size, vm_size_t next_size, int cflags) { vm_pindex_t next_end, next_pindex; @@ -2202,8 +2202,7 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, /* * Account for the charge. */ - if (prev_object->cred != NULL && - next_pindex + next_size > prev_object->size) { + if (prev_object->cred != NULL && (cflags & OBJCO_NO_CHARGE) == 0) { /* * If prev_object was charged, then this mapping, * although not charged now, may become writable @@ -2214,14 +2213,36 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, * entry, and swap reservation for this entry is * managed in appropriate time. */ - vm_size_t charge = ptoa(next_pindex + next_size - - prev_object->size); - if (!reserved && - !swap_reserve_by_cred(charge, prev_object->cred)) { - VM_OBJECT_WUNLOCK(prev_object); - return (FALSE); + if (next_end > prev_object->size) { + vm_size_t charge = ptoa(next_end - prev_object->size); + + if ((cflags & OBJCO_CHARGED) == 0) { + if (!swap_reserve_by_cred(charge, + prev_object->cred)) { + VM_OBJECT_WUNLOCK(prev_object); + return (FALSE); + } + } else if (prev_object->size > next_pindex) { + /* + * The caller charged, but: + * - the object has already accounted for the + * space, + * - and the object end is between previous + * mapping end and next_end. + */ + swap_release_by_cred(ptoa(prev_object->size - + next_pindex), prev_object->cred); + } + prev_object->charge += charge; + } else if ((cflags & OBJCO_CHARGED) != 0) { + /* + * The caller charged, but the object has + * already accounted for the space. Whole new + * mapping charge should be released, + */ + swap_release_by_cred(ptoa(next_size), + prev_object->cred); } - prev_object->charge += charge; } /* diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index a7f2e9a2b785..fdc0bcfc9f28 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -228,6 +228,12 @@ struct vm_object { #define OBJPR_NOTMAPPED 0x2 /* Don't unmap pages. */ #define OBJPR_VALIDONLY 0x4 /* Ignore invalid pages. */ +/* + * Options for vm_object_coalesce(). + */ +#define OBJCO_CHARGED 0x1 /* The next_size was charged already */ +#define OBJCO_NO_CHARGE 0x2 /* Do not do swap accounting at all */ + TAILQ_HEAD(object_q, vm_object); extern struct object_q vm_object_list; /* list of allocated objects */ @@ -356,7 +362,7 @@ vm_object_t vm_object_allocate_anon(vm_pindex_t, vm_object_t, struct ucred *, vm_size_t); vm_object_t vm_object_allocate_dyn(objtype_t, vm_pindex_t, u_short); boolean_t vm_object_coalesce(vm_object_t, vm_ooffset_t, vm_size_t, vm_size_t, - boolean_t); + int); void vm_object_collapse (vm_object_t); void vm_object_deallocate (vm_object_t); void vm_object_destroy (vm_object_t); From nobody Sat Jan 24 00:32:22 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dybNR0rsYz6Q1RD for ; Sat, 24 Jan 2026 00:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dybNQ4gYCz453R for ; Sat, 24 Jan 2026 00:32:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MQj8mWobCVZrEWS20SaNd4+uHlheJK0RI3BJtaHz6hM=; b=cglYyDHpIEDLyH8IMkUhVNc7hhX/K9Kae4wI88uUvm3xwgijBoIfYNCB8nYh+jZfUC8j6m j1l+klnEjr/oRMFjlaeqRvGl/5+cYLhZ9zU5yO9wB1gXytML/ubVTR1D7NqhnDPrE87WS0 zynDpHdo34b972CujDn/GOboBIFs3oGgz+AOjMMJrcibasyyh5d3SUW/Q9d9DhCXE4Riye YZAN5MuzGIw9OVc/+0219owTG5XmHr/y5S8GmFXT75qwxCEAkoDeeKH28+bpYTGorSGzCp t2g308QZISpmJEUN3QCr4WggfiAPy5/lPHl3VKaRdt5FpSPkYMldQKIbhF4YUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MQj8mWobCVZrEWS20SaNd4+uHlheJK0RI3BJtaHz6hM=; b=kMMvvOzAkwIY0syloYoLKm+YIGlBEJ1RSdg5Ys9MSp9T/kUT5CyxcP/P/Pn8z3lv76unpk B/gKNALw0q8PClL9r3F8AqwUCXXDsaPy9Ae0+QCPuOZYxyvM4K793UlongUmiyYSiI4zqp 1F6ZwU/Svt+yorsgt7O0DHcxf19AKHxQ1xxqmW8SSIb5WmxSYbW4LHkd1WhX9yiq8qznkE MiqKD5q+XT/gGXFs1g5GlAnIi4NIMVFKWlKPAMiIovnB7tJHhJWlQqMS+7H1r5a3XYh24X qLvcgWtj7pQjN228ca6g/R/gOSTLwgP0+TVNouD20m4ycqy5NhclZpoOcoV0+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214742; a=rsa-sha256; cv=none; b=AyopzL7XJRKyomdNR4cnbtZw8QiI09yy2pEkGHKOq4NX+V97b4QokKJOdwYK050fvXY0sT zoj4gXcOzhLf5Ktf5O77W9VrEXGZPdF/Op15FUQX5Lb8DqQplfiOBTfnIzjFizrxvlPoC4 BvcxugCsz1CvGsw/QcG/rW5xitqor0GzUzTNs0iLi5fy91ZQQxhjXREc9p71r8FZz7xRuf OA+B4O9uMW+w9DLEp3F6tdx5clJySpsotQ7QxxPzVKl69zi0b/nctiBENjNhIR9Ma6rEPw M9/Lb2bwh+NJh0N3mHi2H1TjOOX8j4+mluyeI86KOF7JTN95NzuE6rg3F/pvDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dybNQ4Gg6zhP5 for ; Sat, 24 Jan 2026 00:32:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b197 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1f6db7d73474 - stable/15 - swap_release_by_cred*(): give some additional info on panics due to underflow List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1f6db7d73474a823723473a88e5af0917f93f2e9 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:22 +0000 Message-Id: <69741316.b197.485c1f6b@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1f6db7d73474a823723473a88e5af0917f93f2e9 commit 1f6db7d73474a823723473a88e5af0917f93f2e9 Author: Konstantin Belousov AuthorDate: 2026-01-02 09:31:54 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-24 00:26:45 +0000 swap_release_by_cred*(): give some additional info on panics due to underflow (cherry picked from commit 7361727d4584b5e303183c836497ae2754ce0e53) --- sys/vm/swap_pager.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index ab95bde34ceb..e0bdca07ff0f 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -239,7 +239,8 @@ swap_release_by_cred_rlimit(u_long pdecr, struct ucred *cred) #ifdef INVARIANTS prev = atomic_fetchadd_long(&uip->ui_vmsize, -pdecr); KASSERT(prev >= pdecr, - ("negative vmsize for uid %d\n", uip->ui_uid)); + ("negative vmsize for uid %d, prev %#jx decr %#jx\n", + uip->ui_uid, (uintmax_t)prev, (uintmax_t)pdecr)); #else atomic_subtract_long(&uip->ui_vmsize, pdecr); #endif @@ -373,7 +374,8 @@ swap_release_by_cred(vm_ooffset_t decr, struct ucred *cred) pdecr = atop(decr); #ifdef INVARIANTS prev = atomic_fetchadd_long(&swap_reserved, -pdecr); - KASSERT(prev >= pdecr, ("swap_reserved < decr")); + KASSERT(prev >= pdecr, ("swap_reserved %#jx < decr %#jx", + (uintmax_t)prev, (uintmax_t)pdecr)); #else atomic_subtract_long(&swap_reserved, pdecr); #endif From nobody Sat Jan 24 00:32:24 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dybNT1WXFz6Q1jF for ; Sat, 24 Jan 2026 00:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dybNS5y6Qz44vD for ; Sat, 24 Jan 2026 00:32:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eDYBnXcvSzt80Xaxgt6zXnxBYW6z2UZmZbQqiEps0gY=; b=B4+M+h6FVH0N5cFF9ayqGXUSpc821h9e0oI6ytrOe3uldheYqq/jghkt/AM8NQLGqnq745 vDrO0VdHmVaqK4M1+7E8TxvDwwN7LCnWxQuVX2sANavVatqYD1Kk53MPOCN89HfrMXbRht vdlOhafvYP8Lyao4N1RkHkwV1qcdCJbEscpWtOCfMJ/OnakOZV6NOpeqzUq4Lv6829RAAb j3ebV/dwDQNQ8NhSOit3GqZGX1N8y3r8t3uD+YugkrjPAX13qgG0BEDe6ts/5ldxhgj6Zd q5LVWshj7T5ZfitP3t6oE8Noy5+9hCbl4IcdRC0fdhlpz3xFeadk6lbs/rOelA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eDYBnXcvSzt80Xaxgt6zXnxBYW6z2UZmZbQqiEps0gY=; b=Kf1DQy4zXYl0ts36Pir7Vc/zZF1O5eKZBw1x5Saqg2abjDvzw/I/jZrbKIaJkOtqbIjDu+ FbU7egYLDs7pbYPAC3xyAP4t7aNG3AjPzsWiZ8s/dHhQA/91X0GWuIsImZeA3EHjUbk7AW qWTEAFO8Lyh8Qrx4floigR0rX3b48r87SJayWuWELlZJoynGFgZYQX3al+vcMAm+Pyx6Tb udmlcTYWkXl2UCr8KbSXJ7OIPmTNTC/YMQKCOk54NrIIAHIDFc5AA5wXXOC8uOHH365DVo /8hjsgERp4hEorjMRcyDnevfGdjCJ7Fyq4RNWPyjZXQcY7+UX7m/8kZTrMa5IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214744; a=rsa-sha256; cv=none; b=BAU6BZkiUiJjzH3HCaY3ljb7dGN4wtJCfpZz1UB2yVq/Aon0GuC67S9I2BYvD9QKepArNt QJgYLJmMOSzvGzOfc8MjaGHgdc0QWDLb9QQ0hKNCR4nv1erG/fxj53Y4tuhojdM6wEimWG Rq56vvS6kam37+THp/GDxd94LjU7No+t1LyqMgNkToJfb/us0KIc7CLiR7cU6chhGf45li /kalcvOJdzVv8kE99XZqfnc7fAgU+t2ZJoExPBx+q3tTwy+cWkTwdQqZBnkNQVwkyturMB jgXFbTZjKUaQEaJ1puu/4Ou7QG7J2hsGHoUJu1Zjmek7dEF2L6cjdWY6O4HeeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dybNS5Dx0zhg2 for ; Sat, 24 Jan 2026 00:32:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a8f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a4123ac9f596 - stable/15 - vm_object: remove the charge member List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a4123ac9f596415a090e74849b7a4bedf548f97b Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:24 +0000 Message-Id: <69741318.a8f8.53ce1269@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a4123ac9f596415a090e74849b7a4bedf548f97b commit a4123ac9f596415a090e74849b7a4bedf548f97b Author: Konstantin Belousov AuthorDate: 2026-01-03 09:34:23 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-24 00:26:45 +0000 vm_object: remove the charge member (cherry picked from commit d160447129fe060b28bcd6ba429d17afdf494ff2) --- sys/dev/md/md.c | 2 -- sys/kern/uipc_shm.c | 2 -- sys/vm/swap_pager.c | 8 ++------ sys/vm/vm_fault.c | 5 ++--- sys/vm/vm_map.c | 45 ++++++++++++++++++++++----------------------- sys/vm/vm_object.c | 46 +++++++++++++++++++++++++++------------------- sys/vm/vm_object.h | 4 +--- 7 files changed, 54 insertions(+), 58 deletions(-) diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index 9d246d7c78fd..8d2908264aac 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -1617,7 +1617,6 @@ mdresize(struct md_s *sc, struct md_req *mdr) 0, 0); swap_release_by_cred(IDX_TO_OFF(oldpages - newpages), sc->cred); - sc->s_swap.object->charge = IDX_TO_OFF(newpages); sc->s_swap.object->size = newpages; VM_OBJECT_WUNLOCK(sc->s_swap.object); } else if (newpages > oldpages) { @@ -1637,7 +1636,6 @@ mdresize(struct md_s *sc, struct md_req *mdr) } } VM_OBJECT_WLOCK(sc->s_swap.object); - sc->s_swap.object->charge = IDX_TO_OFF(newpages); sc->s_swap.object->size = newpages; VM_OBJECT_WUNLOCK(sc->s_swap.object); } diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index eb1327f7f2de..fe3feab4149f 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -759,7 +759,6 @@ shm_dotruncate_locked(struct shmfd *shmfd, off_t length, void *rl_cookie) /* Free the swap accounted for shm */ swap_release_by_cred(delta, object->cred); - object->charge -= delta; } else { if ((shmfd->shm_seals & F_SEAL_GROW) != 0) return (EPERM); @@ -768,7 +767,6 @@ shm_dotruncate_locked(struct shmfd *shmfd, off_t length, void *rl_cookie) delta = IDX_TO_OFF(nobjsize - object->size); if (!swap_reserve_by_cred(delta, object->cred)) return (ENOMEM); - object->charge += delta; } shmfd->shm_size = length; mtx_lock(&shm_timestamp_lock); diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 3f077289ac30..efb0dd477c93 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -784,10 +784,7 @@ swap_pager_init_object(vm_object_t object, void *handle, struct ucred *cred, object->un_pager.swp.writemappings = 0; object->handle = handle; - if (cred != NULL) { - object->cred = cred; - object->charge = size; - } + object->cred = cred; return (true); } @@ -900,8 +897,7 @@ swap_pager_dealloc(vm_object_t object) * Release the allocation charge. */ if (object->cred != NULL) { - swap_release_by_cred(object->charge, object->cred); - object->charge = 0; + swap_release_by_cred(ptoa(object->size), object->cred); crfree(object->cred); object->cred = NULL; } diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 1f13869aebf1..addda72e2b56 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -2310,13 +2310,12 @@ vm_fault_copy_entry(vm_map_t dst_map, vm_map_t src_map __unused, * directly. */ dst_object = vm_object_allocate_anon(atop(dst_entry->end - - dst_entry->start), NULL, NULL, 0); + dst_entry->start), NULL, NULL); #if VM_NRESERVLEVEL > 0 dst_object->flags |= OBJ_COLORED; dst_object->pg_color = atop(dst_entry->start); #endif dst_object->domain = src_object->domain; - dst_object->charge = dst_entry->end - dst_entry->start; dst_entry->object.vm_object = dst_object; dst_entry->offset = 0; @@ -2329,7 +2328,7 @@ vm_fault_copy_entry(vm_map_t dst_map, vm_map_t src_map __unused, ("vm_fault_copy_entry: leaked swp charge")); dst_object->cred = curthread->td_ucred; crhold(dst_object->cred); - *fork_charge += dst_object->charge; + *fork_charge += ptoa(dst_object->size); } else if ((dst_object->flags & OBJ_SWAP) != 0 && dst_object->cred == NULL) { KASSERT(dst_entry->cred != NULL, ("no cred for entry %p", diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 4c33b786eaa0..04628f44a497 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2428,7 +2428,7 @@ vm_map_entry_back(vm_map_entry_t entry) KASSERT((entry->eflags & MAP_ENTRY_IS_SUB_MAP) == 0, ("map entry %p is a submap", entry)); object = vm_object_allocate_anon(atop(entry->end - entry->start), NULL, - entry->cred, entry->end - entry->start); + entry->cred); entry->object.vm_object = object; entry->offset = 0; entry->cred = NULL; @@ -2443,21 +2443,26 @@ vm_map_entry_back(vm_map_entry_t entry) static inline void vm_map_entry_charge_object(vm_map_t map, vm_map_entry_t entry) { + vm_object_t object; VM_MAP_ASSERT_LOCKED(map); KASSERT((entry->eflags & MAP_ENTRY_IS_SUB_MAP) == 0, ("map entry %p is a submap", entry)); - if (entry->object.vm_object == NULL && !vm_map_is_system(map) && + object = entry->object.vm_object; + if (object == NULL && !vm_map_is_system(map) && (entry->eflags & MAP_ENTRY_GUARD) == 0) vm_map_entry_back(entry); - else if (entry->object.vm_object != NULL && + else if (object != NULL && ((entry->eflags & MAP_ENTRY_NEEDS_COPY) == 0) && entry->cred != NULL) { - VM_OBJECT_WLOCK(entry->object.vm_object); - KASSERT(entry->object.vm_object->cred == NULL, + VM_OBJECT_WLOCK(object); + KASSERT(object->cred == NULL, ("OVERCOMMIT: %s: both cred e %p", __func__, entry)); - entry->object.vm_object->cred = entry->cred; - entry->object.vm_object->charge = entry->end - entry->start; + object->cred = entry->cred; + if (entry->end - entry->start < ptoa(object->size)) { + swap_reserve_force_by_cred(ptoa(object->size) - + entry->end + entry->start, object->cred); + } VM_OBJECT_WUNLOCK(entry->object.vm_object); entry->cred = NULL; } @@ -2956,7 +2961,7 @@ again: * we cannot distinguish between non-charged and * charged clipped mapping of the same object later. */ - KASSERT(obj->charge == 0, + KASSERT(obj->cred == NULL, ("vm_map_protect: object %p overcharged (entry %p)", obj, entry)); if (!swap_reserve(ptoa(obj->size))) { @@ -2968,7 +2973,6 @@ again: crhold(cred); obj->cred = cred; - obj->charge = ptoa(obj->size); VM_OBJECT_WUNLOCK(obj); } @@ -3942,7 +3946,7 @@ static void vm_map_entry_delete(vm_map_t map, vm_map_entry_t entry) { vm_object_t object; - vm_pindex_t offidxstart, offidxend, size1; + vm_pindex_t offidxstart, offidxend, oldsize; vm_size_t size; vm_map_entry_unlink(map, entry, UNLINK_MERGE_NONE); @@ -3989,15 +3993,11 @@ vm_map_entry_delete(vm_map_t map, vm_map_entry_t entry) OBJPR_NOTMAPPED); if (offidxend >= object->size && offidxstart < object->size) { - size1 = object->size; + oldsize = object->size; object->size = offidxstart; if (object->cred != NULL) { - size1 -= object->size; - KASSERT(object->charge >= ptoa(size1), - ("object %p charge < 0", object)); - swap_release_by_cred(ptoa(size1), - object->cred); - object->charge -= ptoa(size1); + swap_release_by_cred(ptoa(oldsize - + ptoa(object->size)), object->cred); } } } @@ -4198,7 +4198,7 @@ vm_map_copy_swap_object(vm_map_entry_t src_entry, vm_map_entry_t dst_entry, ("OVERCOMMIT: vm_map_copy_anon_entry: cred %p", src_object)); src_object->cred = src_entry->cred; - src_object->charge = size; + *fork_charge += ptoa(src_object->size) - size; } dst_entry->object.vm_object = src_object; if (charged) { @@ -4455,7 +4455,7 @@ vmspace_fork(struct vmspace *vm1, vm_ooffset_t *fork_charge) KASSERT(object->cred == NULL, ("vmspace_fork both cred")); object->cred = old_entry->cred; - object->charge = old_entry->end - + *fork_charge += old_entry->end - old_entry->start; old_entry->cred = NULL; } @@ -5145,7 +5145,7 @@ RetryLookupLocked: if (vm_map_lock_upgrade(map)) goto RetryLookup; entry->object.vm_object = vm_object_allocate_anon(atop(size), - NULL, entry->cred, size); + NULL, entry->cred); entry->offset = 0; entry->cred = NULL; vm_map_lock_downgrade(map); @@ -5403,9 +5403,8 @@ vm_map_print(vm_map_t map) (void *)entry->object.vm_object, (uintmax_t)entry->offset); if (entry->object.vm_object && entry->object.vm_object->cred) - db_printf(", obj ruid %d charge %jx", - entry->object.vm_object->cred->cr_ruid, - (uintmax_t)entry->object.vm_object->charge); + db_printf(", obj ruid %d ", + entry->object.vm_object->cred->cr_ruid); if (entry->eflags & MAP_ENTRY_COW) db_printf(", copy (%s)", (entry->eflags & MAP_ENTRY_NEEDS_COPY) ? "needed" : "done"); diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index f4c54ba91742..aa2d7676e6a8 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -196,9 +196,9 @@ vm_object_zdtor(void *mem, int size, void *arg) KASSERT(object->type == OBJT_DEAD, ("object %p has non-dead type %d", object, object->type)); - KASSERT(object->charge == 0 && object->cred == NULL, - ("object %p has non-zero charge %ju (%p)", - object, (uintmax_t)object->charge, object->cred)); + KASSERT(object->cred == NULL, + ("object %p has non-zero charge cred %p", + object, object->cred)); } #endif @@ -254,7 +254,6 @@ _vm_object_allocate(objtype_t type, vm_pindex_t size, u_short flags, refcount_init(&object->ref_count, 1); object->memattr = VM_MEMATTR_DEFAULT; object->cred = NULL; - object->charge = 0; object->handle = handle; object->backing_object = NULL; object->backing_object_offset = (vm_ooffset_t) 0; @@ -452,7 +451,7 @@ vm_object_allocate_dyn(objtype_t dyntype, vm_pindex_t size, u_short flags) */ vm_object_t vm_object_allocate_anon(vm_pindex_t size, vm_object_t backing_object, - struct ucred *cred, vm_size_t charge) + struct ucred *cred) { vm_object_t handle, object; @@ -466,7 +465,6 @@ vm_object_allocate_anon(vm_pindex_t size, vm_object_t backing_object, _vm_object_allocate(OBJT_SWAP, size, OBJ_ANON | OBJ_ONEMAPPING | OBJ_SWAP, object, handle); object->cred = cred; - object->charge = cred != NULL ? charge : 0; return (object); } @@ -1448,7 +1446,7 @@ vm_object_shadow(vm_object_t *object, vm_ooffset_t *offset, vm_size_t length, /* * Allocate a new object with the given length. */ - result = vm_object_allocate_anon(atop(length), source, cred, length); + result = vm_object_allocate_anon(atop(length), source, cred); /* * Store the offset into the source object, and fix up the offset into @@ -1511,6 +1509,7 @@ vm_object_split(vm_map_entry_t entry) struct pctrie_iter pages; vm_page_t m; vm_object_t orig_object, new_object, backing_object; + struct ucred *cred; vm_pindex_t offidxstart; vm_size_t size; @@ -1525,9 +1524,26 @@ vm_object_split(vm_map_entry_t entry) offidxstart = OFF_TO_IDX(entry->offset); size = atop(entry->end - entry->start); + if (orig_object->cred != NULL) { + /* + * vm_object_split() is currently called from + * vmspace_fork(), and it might be tempting to add the + * charge for the split object to fork_charge. But + * fork_charge is discharged on error when the copied + * vmspace is destroyed. Since the split object is + * inserted into the shadow hierarchy serving the + * source vm_map, it is kept even after the + * unsuccessful fork, meaning that we have to force + * its swap usage. + */ + cred = curthread->td_ucred; + crhold(cred); + swap_reserve_force_by_cred(ptoa(size), cred); + } else { + cred = NULL; + } - new_object = vm_object_allocate_anon(size, orig_object, - orig_object->cred, ptoa(size)); + new_object = vm_object_allocate_anon(size, orig_object, cred); /* * We must wait for the orig_object to complete any in-progress @@ -1550,12 +1566,6 @@ vm_object_split(vm_map_entry_t entry) new_object->backing_object_offset = orig_object->backing_object_offset + entry->offset; } - if (orig_object->cred != NULL) { - crhold(orig_object->cred); - KASSERT(orig_object->charge >= ptoa(size), - ("orig_object->charge < 0")); - orig_object->charge -= ptoa(size); - } /* * Mark the split operation so that swap_pager_getpages() knows @@ -2233,7 +2243,6 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, swap_release_by_cred(ptoa(prev_object->size - next_pindex), prev_object->cred); } - prev_object->charge += charge; } else if ((cflags & OBJCO_CHARGED) != 0) { /* * The caller charged, but the object has @@ -2786,9 +2795,8 @@ DB_SHOW_COMMAND(object, vm_object_print_static) db_iprintf("Object %p: type=%d, size=0x%jx, res=%d, ref=%d, flags=0x%x", object, (int)object->type, (uintmax_t)object->size, object->resident_page_count, object->ref_count, object->flags); - db_iprintf(" ruid %d charge %jx\n", - object->cred ? object->cred->cr_ruid : -1, - (uintmax_t)object->charge); + db_iprintf(" ruid %d\n", + object->cred ? object->cred->cr_ruid : -1); db_iprintf(" sref=%d, backing_object(%d)=(%p)+0x%jx\n", atomic_load_int(&object->shadow_count), object->backing_object ? object->backing_object->ref_count : 0, diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index fdc0bcfc9f28..b056ebe9a4b7 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -175,7 +175,6 @@ struct vm_object { } phys; } un_pager; struct ucred *cred; - vm_ooffset_t charge; void *umtx_data; }; @@ -358,8 +357,7 @@ void umtx_shm_object_terminated(vm_object_t object); extern int umtx_shm_vnobj_persistent; vm_object_t vm_object_allocate (objtype_t, vm_pindex_t); -vm_object_t vm_object_allocate_anon(vm_pindex_t, vm_object_t, struct ucred *, - vm_size_t); +vm_object_t vm_object_allocate_anon(vm_pindex_t, vm_object_t, struct ucred *); vm_object_t vm_object_allocate_dyn(objtype_t, vm_pindex_t, u_short); boolean_t vm_object_coalesce(vm_object_t, vm_ooffset_t, vm_size_t, vm_size_t, int); From nobody Sat Jan 24 00:32:23 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dybNS3tgXz6Q1DV for ; Sat, 24 Jan 2026 00:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dybNR6BNfz4513 for ; Sat, 24 Jan 2026 00:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=av3CD6WaYAlD/Zilnq7QDSlyXCCG/Qjv+riYkYqObXk=; b=N7kEGBIeQDadRZwxuUwDpcH+58oM0lEyng8pPNqIckE+BQBaC57g6NatMsdZ4mDvhj6iiM W1S7Sz8pziJjwwOrdVFZdhKlaSE5eMu4jMctDW1SIQkf3uljQ3DRViHJqwZcUSfur2YNRw ekp8YK6dG41WUPWzyJdbueRo3RTgP2vm2I7rmhpOeujMSU67S+5MvA3q110afaVMQjMzOF snYhOx6byel0+IFFHdHRGAR36SknnqgW48c9Y2PyG1lha/vPEoVF1ffQcX+xcuvwFG6E/H JxPQLHyO6IqjYFwhnYXRQXHfYEmAAOtJHqh5wV5xw6L52cdKEv9izeZ0yi9NfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=av3CD6WaYAlD/Zilnq7QDSlyXCCG/Qjv+riYkYqObXk=; b=lGxeTV8tLPzD+FXU7IJ2r9qHuKiRaCfyBzpXTX18z+Eng7gA1WHGEw6GKyQIyReqXzAci1 YspWna6ROK+GNOLm7bxnRy0MlFsnsoePWH0O2/FwT2bOrEqht+n6v7aj/Eg2MAFJE34DDs n6gKB0CpJ/XZXMY7lBEWUog9ljDtbR9XvTaVeQ8Z//y5vLt0Cl6po+JMWZgVbojw7yGyjn 7OeaPOnk4RCsZzVgz5XffoIsF2daB+c7QvRhUdrM6sZxMpTQS0MJ5mtagp0zgrDoUfyKCH PcvVrhWaVZAwpgvrVy7aUMv1WTOJx5dODG4MTSGzeRMyd+qBDSwbHWYBtEMaXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214743; a=rsa-sha256; cv=none; b=Qm9kCxoq+L+suJer18kg0tWAYO5O28utQjOhNkpM4T5o7qPTuEJCu1Q/yKwGvEoblFy9Xo LsIF6SBPG56yqdblJ4fJGn/7HtGfyYxGx4ePT4EAlXpS6ESIRXPGjVZnF7D+viu3ykL7Tr DfcrY/K5ALhWEOX4YxkD54qzwqf0ofjhEZFFJrHnY8Py6o3IT8RLci+Xav3EW87Jo2My7K 6eNPV4kkHYvcWaxnJzkBb1dr3wMTzDj4idKiX0iaeyxP6ko3hEMS9CWUuzrdZIYpjHrFSL kX8/zo1Vr24Z8AcNn8VTQ7WDlLvf/pU+1DNIE78Sc6jbBfnjyCFrL1kj/YASrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dybNR5HQszj6L for ; Sat, 24 Jan 2026 00:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b10d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0ab96c91676d - stable/15 - rfork(2): fix swap accounting in vmspace_unshare() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0ab96c91676d8f5158227ae1d1465019ef97cdb3 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:23 +0000 Message-Id: <69741317.b10d.7c225a06@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0ab96c91676d8f5158227ae1d1465019ef97cdb3 commit 0ab96c91676d8f5158227ae1d1465019ef97cdb3 Author: Konstantin Belousov AuthorDate: 2026-01-04 00:19:36 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-24 00:26:45 +0000 rfork(2): fix swap accounting in vmspace_unshare() (cherry picked from commit de770681234d001a1f4cdb8121179331dc3a2def) --- sys/vm/swap_pager.c | 10 ++++++++-- sys/vm/vm.h | 1 + sys/vm/vm_map.c | 7 +++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index e0bdca07ff0f..3f077289ac30 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -330,7 +330,7 @@ out_error: } void -swap_reserve_force(vm_ooffset_t incr) +swap_reserve_force_by_cred(vm_ooffset_t incr, struct ucred *cred) { u_long pincr; @@ -346,7 +346,13 @@ swap_reserve_force(vm_ooffset_t incr) #endif pincr = atop(incr); atomic_add_long(&swap_reserved, pincr); - swap_reserve_force_rlimit(pincr, curthread->td_ucred); + swap_reserve_force_rlimit(pincr, cred); +} + +void +swap_reserve_force(vm_ooffset_t incr) +{ + swap_reserve_force_by_cred(incr, curthread->td_ucred); } void diff --git a/sys/vm/vm.h b/sys/vm/vm.h index d28c84dd1c95..0da1891dfcc7 100644 --- a/sys/vm/vm.h +++ b/sys/vm/vm.h @@ -168,6 +168,7 @@ void vm_ksubmap_init(struct kva_md_info *); bool swap_reserve(vm_ooffset_t incr); bool swap_reserve_by_cred(vm_ooffset_t incr, struct ucred *cred); void swap_reserve_force(vm_ooffset_t incr); +void swap_reserve_force_by_cred(vm_ooffset_t incr, struct ucred *cred); void swap_release(vm_ooffset_t decr); void swap_release_by_cred(vm_ooffset_t decr, struct ucred *cred); diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 68dcadd2b2f1..4c33b786eaa0 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4957,6 +4957,13 @@ vmspace_unshare(struct proc *p) if (newvmspace == NULL) return (ENOMEM); if (!swap_reserve_by_cred(fork_charge, p->p_ucred)) { + /* + * The swap reservation failed. The accounting from + * the entries of the copied newvmspace will be + * subtracted in vmspace_free(), so force the + * reservation there. + */ + swap_reserve_force_by_cred(fork_charge, p->p_ucred); vmspace_free(newvmspace); return (ENOMEM); } From nobody Sat Jan 24 00:32:26 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dybNW1pD6z6Q1Dj for ; Sat, 24 Jan 2026 00:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dybNV6wPDz44mK for ; Sat, 24 Jan 2026 00:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+FLycsQ8ZakpqyuZ2eSUcCRe31uCzUWKp5gMNvC15bc=; b=vY96/z5XkGUaL2ICsz8XgA/ZJ//ov+VhwBVe24HhT9j8RT7XGsLwYG1CxOIuQZMC6TR6bt BdqBA3aTCqtBPOYOCBGBw4lnMkZlM4CfV/71XSMFR8hBZBq+uflXTTu6Bk82waTF8iY/I1 yE0iKEDhvOuWs/bP3C0tEzGeSKnhuzzy+bKggXLjfR6a6BH/jMnTpMWyto20DJtzgHijQP cmwRAI36RyINHJaZ0GBhgHkBt7sUZG3lQ0jrel2CsvhMRQDZOgUUYJ/9J9hTZluUNewmke gta1ok6gBRUqlM7TveETBgxxhbwXVxZKDfOm7iW9rgun/UPwu3KhtlKrq7HCgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+FLycsQ8ZakpqyuZ2eSUcCRe31uCzUWKp5gMNvC15bc=; b=j4vg3spE8tk4uVEyBrkP/fga8uZFZhSqaoZeC8jXCFYDdDYDTd+ITGmZnmsSsaFO2UYzcr SHEm3tFE4TL0YJsvbqBXCy24IAbEKNmmuDwNGLmWzhHFDYonGiJI+u45rc3KGCwWPQa/BI bB672L/vhR0+pZq0CV0HRJTgi4WBrMiOGakePbSEz/OcQ9PkL9sdPkyGJEucbbbmeIYpag 1l2bUhP2aSQarQ54Z4yoEkBuDN8FPngW6MNhxpojPJ4gD9lr5o802eNtF+6yqtM2BCxU1g Fsbe1K6p0EyStlIBgdniQxN+LbJGlZ9q6CLYmlGB+7mrqNP+tfY9SZoi/5vY9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214747; a=rsa-sha256; cv=none; b=LfNID2NFTkaRno6czxoAMrMO2aedfW40xezwtMoDfOJeYrXa82BPa+lvE0MJAwrg7i0Tg+ 39rCFRBCGyWKCHYhxXi3a5EB6zgVFd9loNMdTpebiRsJJhGnK2VyS4Oc2W5HFKC1xWNywh HKVqgqEm7tdW503v33lAvD3q/BVFJbZHE9o2HNw3Dt/uh/lM9cEEjuDN8ELsUC189OCpRp G0bBdKqMg5QlvkCq1aS8wVlMXPBm6kzvi5hnxUSO31FBNfEAeFA8zZQ2YWF3yK9ZdzfVyH WAjJnJns56i0620lucl+Xn8rqEMSSFp9BLwLGRutJQwpiMl3tQFPOY9F/BmagQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dybNV6SMGzjNS for ; Sat, 24 Jan 2026 00:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a235 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 9dbc47d79efe - stable/15 - vm_map_entry_delete(): fix the calculation of swap release List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9dbc47d79efed2ded49e723597176b60b0b15265 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:26 +0000 Message-Id: <6974131a.a235.41cf38b7@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9dbc47d79efed2ded49e723597176b60b0b15265 commit 9dbc47d79efed2ded49e723597176b60b0b15265 Author: Konstantin Belousov AuthorDate: 2026-01-13 16:22:48 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-24 00:26:45 +0000 vm_map_entry_delete(): fix the calculation of swap release (cherry picked from commit acb71820d68bd0dd98964240727e251bc62c92de) --- sys/vm/vm_map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 04628f44a497..b8295bb2108d 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -3997,7 +3997,7 @@ vm_map_entry_delete(vm_map_t map, vm_map_entry_t entry) object->size = offidxstart; if (object->cred != NULL) { swap_release_by_cred(ptoa(oldsize - - ptoa(object->size)), object->cred); + object->size), object->cred); } } } From nobody Sat Jan 24 00:32:25 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dybNV4Qcdz6Q1nj for ; Sat, 24 Jan 2026 00:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dybNT6FCWz44kH for ; Sat, 24 Jan 2026 00:32:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1woeZUwdza+8ZXjumuORQ8gkjhKwOckZxaFCjzKq4OQ=; b=haqNMubFYObP7BfiaW+AC1n2ic2iWFQuPUFHfKhpVu0715Qvni5XKTR5I+psFQyWvQtOD4 Ny7rsQalnHO+ppm6QCx3gv3JSRp0+GcYiRRuQ2B2p0qQwLJnhw2na+i7IiLmCe1WifBEpi n6E4kAUO+B0lqcFrCGZ4hoebvBbalpXLPR6sUUS3hgYoq6X6uj2mnAbU4ApEoggoweZ7WC 0Kx4mX7pGYVDSLoDbxwWBBUoWcCkp8Pt/iRmieN1bfpXXxt/5OEISctEsmEvFs9KZMCrMO zNPPCbE9aiAoXGdnrB9GzQJ/Y5f+7XrgbheciaBVhL7ZeJlhy8HxPSiTbGcXBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1woeZUwdza+8ZXjumuORQ8gkjhKwOckZxaFCjzKq4OQ=; b=O3S4rl4xkIi2dTfng8xfXj90jq9y/9nfKDV667CMFWg0iQOgK2FK11C6F7chZPAP6Hh3sC QSsLkw/OfIBl3anJc/Z/IiyHck6kRDyAKFjhEgGwFrE8z5YKofBzPXO0WXMCyHrSAd5vak N5G0xCutFEL7DTZgm6mfIU4seIAcl4FjAI6VngS9mzGxIeYi/CR1749lPwTR5H2OskVu5o vy8JJE4KD7MbLe91J0Ntj1VUSBsPtjNBBidUYpw+PWtzfgdB/UVJtTGCd9qpAJtZR4HLnH 9AkZgb0/KL0TVcQrurPKl1wJTwxWdvfFekfm4Hahj+SC5hAK9FnWX6UZqx0elw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214745; a=rsa-sha256; cv=none; b=Z8RnoOjec4IAtDjHQyOXN8Y6aB/pLYyHTNlU5EABNoJFNmKzA2xBMjSFg5FGkUg4vGhdA4 P79lwXiTvxVnBKK6Xi5BhAKQdjlMmQcBjqJ7IVZA5wioFtvTjfuksoH2AHioTLnkXCEwjf vOsOx/bLt/TpbJr8cE4/dl1Lf6Md8eZiFMWp+YX901SgCxL0gUirsVK53p/TiAp6UtKAE/ ljAcbEu09b9smVqgmeBp7NC02Fcby6lR4QfnjjWwrHlWCWjTc7N6OTVrVGEWsXezm2Sgxv aT/qJ8i8krj2f/vBEMDzIUzcubxnVosDZgpgWrX2kK/pa2QanmVDmkF+PjIVNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dybNT5dyGzj6M for ; Sat, 24 Jan 2026 00:32:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b240 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 10af3b3b71a0 - stable/15 - tuning.7: add more explanation about swap (over-)accounting List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 10af3b3b71a0aeb992c5edbba8c4c52715fb7c5b Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:25 +0000 Message-Id: <69741319.b240.153b6b1e@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=10af3b3b71a0aeb992c5edbba8c4c52715fb7c5b commit 10af3b3b71a0aeb992c5edbba8c4c52715fb7c5b Author: Konstantin Belousov AuthorDate: 2026-01-12 03:54:58 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-24 00:26:45 +0000 tuning.7: add more explanation about swap (over-)accounting (cherry picked from commit 457b940bfb6a228af1281f357b627ecf1e26fea5) --- share/man/man7/tuning.7 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7 index 44c427c4559d..a3709ce82b8c 100644 --- a/share/man/man7/tuning.7 +++ b/share/man/man7/tuning.7 @@ -222,6 +222,21 @@ and .Va vm.stats.vm.v_wire_count sysctls, respectively). .Pp +Due to the architecture of the +.Fx +virtual memory subsystem, the use of copy on write (CoW) anonymous +memory, e.g. on +.Xr fork 2 , +causes swap reservation for all three regions (VM objects), +as in the original pre-fork mapping, and its copies in +the parent and child, instead of only two. +Eventually the subsystem tries to optimize the internal layout +of the tracking for CoW and often removes (collapses) no longer +needed backing objects, re-assigning its pages and swap +reservations to the copies. +Coolapsing frees the swap reserve, but it is not guaranteed +to happen. +.Pp The .Va kern.ipc.maxpipekva loader tunable is used to set a hard limit on the From nobody Sat Jan 24 00:32:28 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dybNX4dkSz6Q1jL for ; Sat, 24 Jan 2026 00:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dybNX0Yvxz44w3 for ; Sat, 24 Jan 2026 00:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214748; 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=2OeA0+OhQD4B/+6b2cvPgkwHEZL2OIO+rMRZARc2JiE=; b=eS2CQhzuZMq8TUf+RxfmkMo1EVHKjv+pbdPkR17ycalOI6L73da6WeAouPkRL45hEK5fTz t1V0xhFtrj3Ac1EVXii27kczTgrKrALOurC07g9yy8ZqURg/wUEpHwU7EgQegLdwioHtr2 zzsvxXYoYEDpKMRWO+tbs5kvSJ2ciW+9rgr7GCobLu9w6XwLHHiqMYHTbVX7i0mPhQa5iT upq18ENOkXn02FoUlcyBz5dj2BwhpNDoIhzKZxpxwqzi+/CHX4fRY/nUuE3xopm0DjtL+E WHvKzFA/vYKcKdn1bM/kU69CIFby5gIN72++2WiHo4cQJhFb4P6FhOwnuDejGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214748; 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=2OeA0+OhQD4B/+6b2cvPgkwHEZL2OIO+rMRZARc2JiE=; b=uT2NVSmOnaLR3QMVQuuwwJWcU9nJ/KSWdoC9t0Shfp8bQCu6zsswQjaT9zXPvrGFaqxctH PU22vrlxsk6vpvIEO5K3+nGm5/S8Jiu0LakZfrR0DddBNjznTXoCNZqCd81NuyyRZFhg3A DLOKXWL1q5iblPx9Lima2mQ6RaeN83xNnQy+9QqVbqaxdLwNU91eLPrz0Aur7O4fmd4TeI GT5bpJ0lOKXQNzJmmSVUyMjpxIyZrN1R5YbRSLVbJoAbrHii+ZFpSDpkWGZYbeXy4421b6 NqCeWZBMsXCzj3XKcZJw/hX8jIA6JTu/UlPxJrn7JHncMMermTFbEg1djZDv3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214748; a=rsa-sha256; cv=none; b=V98J66+uVfCWE2Sodz4/7CbDXFLj005uZH70nyRTRjNqLc+UYBH7AfZqfkKbEYszFnlM8o SPRH04yR2m1jsTn3HDOF63hAiuZh8wFJy+RMBLKCb4nC7JldkXa1IISJfbiE1jaAaho93J 7d1pemUBJ80gLFn3RMDJALI1jEBxMOhbF8jED0cbuTBXIxXDNY9LScvk/DCyl9O287jgmA +HbxauG/pv+7IAHNOyYP2QcK+ZPHQAOQA53DVb46yrUfIOkCv7qod9Z7xvWv6Kqp4z7E9u 8+sBZ0JuPpOuOEO2sAr+oVLuvzxQOD3AACuZCJGVGK5e2WNuIy86MWpL6SI+Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dybNX064tzj6N for ; Sat, 24 Jan 2026 00:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9fda by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Oliver Pinter From: Konstantin Belousov Subject: git: 7768be681bed - stable/15 - tuning.7: use the correct word for collapsing List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7768be681bedaff7ba28bc0750c891fb3b42c809 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:28 +0000 Message-Id: <6974131c.9fda.68859d01@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7768be681bedaff7ba28bc0750c891fb3b42c809 commit 7768be681bedaff7ba28bc0750c891fb3b42c809 Author: Oliver Pinter AuthorDate: 2026-01-13 23:06:29 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-24 00:26:45 +0000 tuning.7: use the correct word for collapsing (cherry picked from commit 8cd687a726a8b6cc29f573cba7d6c7ecb683a954) --- share/man/man7/tuning.7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7 index a3709ce82b8c..daf941da5de3 100644 --- a/share/man/man7/tuning.7 +++ b/share/man/man7/tuning.7 @@ -234,7 +234,7 @@ Eventually the subsystem tries to optimize the internal layout of the tracking for CoW and often removes (collapses) no longer needed backing objects, re-assigning its pages and swap reservations to the copies. -Coolapsing frees the swap reserve, but it is not guaranteed +Collapsing frees the swap reserve, but it is not guaranteed to happen. .Pp The From nobody Sat Jan 24 00:32:29 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dybNY3Mpvz6Q1J1 for ; Sat, 24 Jan 2026 00:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dybNY1R9gz45G6 for ; Sat, 24 Jan 2026 00:32:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214749; h=from:from:reply-to:subject:subject: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+iqbp6NsNPrjiIPQU7Rt+VzCuMmwXRS/xftw/P0rD0=; b=Oyir7lDEEOGY48JYlxIxVY+uiTv+qmSb4o/LJDDPQomGYuLyAaHoR7MIgfr1CqtEItCDJ8 xniP3CeyzBqj6bFa4VeF3ntlLmm7SDXQjvg11ZBYiF3AutS43BxE5TZ/9FDw4I3pYQWSuq R+kk2NJilhDXCNLdF34cCbUa7GnxMtA2UChTd5HDlEZzwb0ylsm0TBOynPzczxzL7yNjlH bUzHbPPI8TH9uxgOrche4gcf6XOX2obG+ZTUp6Y6oO1vf5LDr6STrCXAA1vTmkvHnoc1yw BtHeT3CrBEGRUo6TavsTXNih4llHNMM49B/CJ85FwNgX/53W4Xm8cI0v5XgW0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214749; h=from:from:reply-to:subject:subject: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+iqbp6NsNPrjiIPQU7Rt+VzCuMmwXRS/xftw/P0rD0=; b=ivWL23FS5nD2pYeUPUrR5bZsHokvD/riyFSBraZH37GM7Bff7e9cYjDSv80RCiybQYPmFN pfu8gTs4byiBHiy3laYe7rUIuYwpHKbrfq9GZUkhxif5FBSC5WRMCmq2djIJJSlUdN8AEI kWrNd2vfY9SY6/vPFWjgTnIEVpYzyjI6OzypgeFIHs8DPJOjLPL4dL8XagqflYEdGRM2RC YslTFSvoFKNjrN7Vg9mR7aQVtWymU3Wi1sUnY61P9nOTsFmX14J3f1tiQLEV+FJyJKrsQU 1TYXRDSGCn1XowxOnEwkDF2FjFbNRo3qCCeKUN45F2EViDiV40I8fkBjndhkPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214749; a=rsa-sha256; cv=none; b=SADRdVLyJWyeStluoHgLl66D9Voqy5GQpjLDuX9oVo9AOiJlQwe+tARD0hTsBlm6UDLNir hiATxn56xKQ9FIB9SmNFCjUAQcWGWvmBwQ+oIMoMIB2GIqm29iu8LlXsQ1ZU0P/OyiLSeA iQRdFjmBvjOMP6aRA8PXhiPyp+yDyPkZaFHPmQUNv26oOLz7o4Iyk//o0wmIyNDyM3Ecli U6CQlY+Qvy+cWmL82tfj27S/wppVc1mMCQgs8RnHjKFsNoqcKPcW2ULRnCQe4/xENYjWaX lLdoAMFfyxnQ6gGfNMhkDsr12l0ULHWa9+6cS1su2iwRygDJhYDh7XExnoZsEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dybNY0r78zhvb for ; Sat, 24 Jan 2026 00:32:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 93cd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b3e6c8eb7eba - stable/15 - tuning.7: wording fixes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b3e6c8eb7eba15c216de1be835f18a8622e36547 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:29 +0000 Message-Id: <6974131d.93cd.4d9577b7@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b3e6c8eb7eba15c216de1be835f18a8622e36547 commit b3e6c8eb7eba15c216de1be835f18a8622e36547 Author: Konstantin Belousov AuthorDate: 2026-01-14 15:37:39 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-24 00:26:45 +0000 tuning.7: wording fixes (cherry picked from commit 6f41575a94b310614f5ffcee215aee48ced4ad2d) --- share/man/man7/tuning.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7 index daf941da5de3..c03cce0aba0f 100644 --- a/share/man/man7/tuning.7 +++ b/share/man/man7/tuning.7 @@ -227,8 +227,8 @@ Due to the architecture of the virtual memory subsystem, the use of copy on write (CoW) anonymous memory, e.g. on .Xr fork 2 , -causes swap reservation for all three regions (VM objects), -as in the original pre-fork mapping, and its copies in +causes swap reservation for all three regions (VM objects): +in the original pre-fork mapping, and its copies in the parent and child, instead of only two. Eventually the subsystem tries to optimize the internal layout of the tracking for CoW and often removes (collapses) no longer From nobody Sat Jan 24 00:32:30 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dybNZ5YGrz6Q1J2 for ; Sat, 24 Jan 2026 00:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dybNZ2X0wz45Kq for ; Sat, 24 Jan 2026 00:32:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/WgFngxipJLZgjFOqD3zOXXGTW/K85AgdxhgDUW56qI=; b=CmZ8/OMku560+18AyE5/OTgP3JaXMe/xfN47NhwrDsee+6eQ7oWbJ+6f+qhhFYBcMJYuSy 2ScRx9/J2f5C6rv1UgZgce+rhmpWovEuJOpxVPw/AlOcX4/jHXCcx+Gum7z+fhS1B0dE0u 6R4EwJLjEA9TIqn9O+xwE4vCgcMcHSXOGogDpocYq207twH8m5hr+TrISOZ+aAX7kdq5BR G6MBiQKCdQ89wVCJ5WYGNZNRx+9mEowqVE7qfQDFqj1gP2hIs5Zo4NG2/u2lndGxC8vlCE TX9BGgE1YVjpfw0MRbUEHHXWoLLwCc+GsHbMyaRM0lyUC/Ubwm7K+3WADAYtaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/WgFngxipJLZgjFOqD3zOXXGTW/K85AgdxhgDUW56qI=; b=Ucrc/yzFELGcJHOxAuYHmZAO2MisAqaxO8w3zepYEpuj+WhlBxpiCRzn5t4eQ7KEU2mgGk WZzUxL1C4cne3I0ClFhoLf2PYTvSnBdcyPYa3tzGRJQ2SzRF7zYjhAtv6CxFDEsEocZkN7 9wpjwm6OPamDrvDIvmJIqbixWXBXRZtVtQVvsVt6oGgBYSFxrL4iF7drLIYRw33FfKLuOl oYPpa+zOtUklzQjDhj4hz98IsDzwd0TY5pBxm+71tiqFqPKFuwoQ7jPS0PZhoVnV4dUKUl AH283Qv1w3fCgKAfNeq8gny6feJ9Xs3EViUPa12M+pT1VDbP/bB+T4qKYJCu/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214750; a=rsa-sha256; cv=none; b=vZJ11gasfEq0fztp2Ml+49m5zb0rJ0vnKWOu7k04piAt6TulqV+bS6DbaIOguCfST9vkci IeDKIxwCbMip/CMKp3tiENXahw+MnoysqFg6wQG0qgVPkfIyEsNtIOWSEuiBHaNZm2PlDI 8EXo5IFPLNC+oFfi4DNeNqWGd3ebR+b912A0a18Z+laaM5ZG5sfme5adOEpJn/gR2zp5YP 8Qx2xqMJJLrCVBCgjMKGFaS+ZDklgO9rrA/aMVQbwqExbMeUHp7BxmwnXIoPG31+ian3va EJGIw2BSbnkxgps3Egb9dCXL3+Wc4ODf1UzvnLOqRVCVhcw9Gh+cCjBkXtCguw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dybNZ1cBYzj8p for ; Sat, 24 Jan 2026 00:32:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a239 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a6cc48e22ba7 - stable/15 - sendfile: remove calculation of unused bsize List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a6cc48e22ba7357d368ef6f21c3a01b839d412a2 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:30 +0000 Message-Id: <6974131e.a239.635415dd@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a6cc48e22ba7357d368ef6f21c3a01b839d412a2 commit a6cc48e22ba7357d368ef6f21c3a01b839d412a2 Author: Konstantin Belousov AuthorDate: 2026-01-11 03:51:45 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-24 00:26:45 +0000 sendfile: remove calculation of unused bsize (cherry picked from commit 3fe275c1ef45d452d1adc537b7ec1ca6444739ba) --- sys/kern/kern_sendfile.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c index 8438298afc0e..588bdea229e0 100644 --- a/sys/kern/kern_sendfile.c +++ b/sys/kern/kern_sendfile.c @@ -566,8 +566,7 @@ sendfile_swapin(vm_object_t obj, struct sf_io *sfio, int *nios, off_t off, static int sendfile_getobj(struct thread *td, struct file *fp, vm_object_t *obj_res, - struct vnode **vp_res, struct shmfd **shmfd_res, off_t *obj_size, - int *bsize) + struct vnode **vp_res, struct shmfd **shmfd_res, off_t *obj_size) { vm_object_t obj; struct vnode *vp; @@ -578,7 +577,6 @@ sendfile_getobj(struct thread *td, struct file *fp, vm_object_t *obj_res, vp = *vp_res = NULL; obj = NULL; shmfd = *shmfd_res = NULL; - *bsize = 0; /* * The file descriptor must be a regular file and have a @@ -591,7 +589,6 @@ sendfile_getobj(struct thread *td, struct file *fp, vm_object_t *obj_res, error = EINVAL; goto out; } - *bsize = vp->v_mount->mnt_stat.f_iosize; obj = vp->v_object; if (obj == NULL) { error = EINVAL; @@ -766,7 +763,7 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio, struct sendfile_sync *sfs; struct vattr va; off_t off, sbytes, rem, obj_size, nobj_size; - int bsize, error, ext_pgs_idx, hdrlen, max_pgs, softerr; + int error, ext_pgs_idx, hdrlen, max_pgs, softerr; #ifdef KERN_TLS int tls_enq_cnt; #endif @@ -783,7 +780,7 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio, softerr = 0; use_ext_pgs = false; - error = sendfile_getobj(td, fp, &obj, &vp, &shmfd, &obj_size, &bsize); + error = sendfile_getobj(td, fp, &obj, &vp, &shmfd, &obj_size); if (error != 0) return (error); From nobody Sat Jan 24 00:32:31 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dybNc23Frz6Q1J7 for ; Sat, 24 Jan 2026 00:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dybNb6WxBz45LC for ; Sat, 24 Jan 2026 00:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Idnc91h8XGyXsDAWfgCsTsBEBRBk3ilpCHOyREUZf1I=; b=qFn3wBg2oWflZDZsSzpy5k4ge0yFf0NUazYGvHFX5fUggv4OjcCER4BumcY6SNW4BaYC4Q ++76zdG4V/k2puFeWUdaWZ8zGiwuA8xsRBYzUeFHfyiNG0CjMaJqnjPkEa1qdygcPZ5fRe hlBB5O9mi5mDO6+RbjbXIi5aTW7UlZffoTwGnu93I4K6TlrPZ5nDiYfwhOSLfT+SU5W1KR UPmQ7D5eDmQa6U53VCukI1hEbjywvTV9/NfjBo5HdbXb2UBv2h18/k6mUhJNN+yoSXMkJM E6mvQWuETsc3/U3CO9mBBzCirN4v/n+ErTr3SQ+ASQA1BTtblvNUNB8gq01ZOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Idnc91h8XGyXsDAWfgCsTsBEBRBk3ilpCHOyREUZf1I=; b=O4yr8f7JqDlRpIAgk+X2OLe7V46Ls7RAqY9Pa8XoXQCh0MQ708IlErFT5GXlzCddIZF+zU Afn8eETGHFOYsXqV5PNgQchrZiBe78L32c/j3nfi/jppjFYwCgQ5P/sZQ8BrAeE4R9exBC 9TTzcUi0/4/RPLF3rwwhoqsYSZT8SMhUk30DHd62GUt/F0L15A8Bh8PnKSbCNla/Pr4hEK chDSLOBC+oTvL8WQee08KBlK0yqB/rlYGK5od5ucL0ukJVnDo93dCXFRnAzFUHaFRmhsm/ GGG9AUx/R/dKVV0Ab8uyu62k24T9uMyfYWnkV9DmOuh2M8kDEP4OstVoHGqJRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214751; a=rsa-sha256; cv=none; b=HQ4lvX6zmuvgogGMX0WIeLRf2fU13vY3VtNuQWv12yIzPN/19SMbthKuQ4pE0MdZWXtSrN gF1FFNr3k5xp3ToX36TKVm8k+zk0+Vu+fSegSN3ZNLt/JkYCQ6/jdUG2ztl1wtepUlFPLg XQlwGAknCj9T/LAMk7HCA0xZ1EpeXCViNYc/c2AYRl8r6OcLmhrzld27p+Cg5l0EmL7M4F fcDvUcLnmdF9UOp92Rf/t2tV4e4VIRqv2bTB3mVQk0EHeNI43y6nDAOwjmPB6Oe07kFuEa 8XdIh9DJxZuU0IXr27dE2JBTdz4mSLsw7yYVDN0X5IGrTD3BqtRnOc7HbO4Inw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dybNb2Q33zhvd for ; Sat, 24 Jan 2026 00:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b91a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 102400e5d07a - stable/15 - swap_pager_getpages(): assert that bp->b_pages[] is accessed in bounds List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 102400e5d07a901e0b55a3645b6708e509000ff0 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:31 +0000 Message-Id: <6974131f.b91a.1e8fee1e@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=102400e5d07a901e0b55a3645b6708e509000ff0 commit 102400e5d07a901e0b55a3645b6708e509000ff0 Author: Konstantin Belousov AuthorDate: 2026-01-11 11:04:01 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-24 00:26:45 +0000 swap_pager_getpages(): assert that bp->b_pages[] is accessed in bounds (cherry picked from commit b02ddb59e64620733a6cbc48fb1d0583a62fef78) --- sys/vm/swap_pager.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index efb0dd477c93..012d89db3310 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -1396,6 +1396,9 @@ swap_pager_getpages_locked(struct pctrie_iter *blks, vm_object_t object, vm_object_prepare_buf_pages(object, bp->b_pages, count, &rbehind, &rahead, ma); bp->b_npages = rbehind + count + rahead; + KASSERT(bp->b_npages <= PBUF_PAGES, + ("bp_npages %d (rb %d c %d ra %d) not less than PBUF_PAGES %jd", + bp->b_npages, rbehind, count, rahead, (uintmax_t)PBUF_PAGES)); for (int i = 0; i < bp->b_npages; i++) bp->b_pages[i]->oflags |= VPO_SWAPINPROG; bp->b_blkno = swp_pager_meta_lookup(blks, pindex - rbehind); From nobody Sat Jan 24 00:32:33 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dybNd61Dbz6Q1J8 for ; Sat, 24 Jan 2026 00:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dybNd4V50z452b for ; Sat, 24 Jan 2026 00:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V6cx8WeAjOUWUCPY0SOkrQpSVRRj0eYwuraeNPYu0jI=; b=CZ/N2K1C5IvyCsoqtGQ79PJN737IMzmg3kqXcqb8RVURM48d8V++e86yNI9diPM2rS+AfS JoQJHRmIdsFbnzMKMjMbtPM+5CEr7G7x1xwyTRXPZg21vWawjHcxWZMyP5Rs+pE3/RHBZd OC+M1GsL9l/F0MclBeyDeui8a6wBNI1xUG/x32k2KkRrgt0lKiPyw75NWsFbJJOoV+cJpQ yq5lYmt9daDWP6lZooH9byqAPoLircNBzst6i2Fi8IbufKjpsBM9IFUBrsfgrMifor2s4E 37ag2bzyX2FVQ9MadLxzn0W0g3hg2WLIfaAsWcT16M1Yj0nTXkIWxdRljY6BDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V6cx8WeAjOUWUCPY0SOkrQpSVRRj0eYwuraeNPYu0jI=; b=ykhKBn6fXvDLhBijr07apLEo+9YWnuTrVJifcCiXE0KxOHCFT8Cays5jpYtEErIlL7eLX9 XUZgSGv9QA1h9awbNSU/mwUpsU2B/UCSTO+xePQ6MUUfbrPAl1Ny5IQFw8XYBOpdZRXeFK q+BNuZuZpk0dyw1jrnQL7yETRFH8kHxm3te1O3QdjlAzF4wjzgzY036MxKLpBxISYTfNc6 PSST2d5gVfkGDUrxwbRJFQwu469MPdTgfJczdrB91/BgMgYDhWOWnbsJzd3xZ/2mJzYEIn gcFHRKcfQjrJPYuoH3c/0tTzouUcR+pAiUF/PkS8nlxtJydz1F3dXWdAPTzPLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214753; a=rsa-sha256; cv=none; b=kKDPrrYH5QpHlRogghXhRB9Hs16p/Qu9GcYMC0VXR/XAz2vYarFjap8J4c0nrJvolc4HK1 vykYwcbqLgTj5Ixl+rCHLvkk3X9vPuNjnP72qmg5tVpESJYuJVrJ2Yi/eTiAlyCJ/Ew1Mr pU6v7FL9QOsbz56zlRJtITTVoqkTXRAMtwzED7Qrdhg2HeIiMF2JWKuN3p7EwRGjOkkC4n CPaGUY5p3JKENak52uVPQ6LxmK4jch6z+NOTJCFLqpCulBmHH5quIUOhchQgHT/jSNkoiw rBtpn5Fnf7hgxYCIs4Wl23AgnmaZDWFLDrprejnjmZpvIxSNfQzUb4jzbZP1rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dybNd41MBzjNd for ; Sat, 24 Jan 2026 00:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a05b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 95eec982c37a - stable/15 - vm/swap_pager.c: silence compiler warning List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 95eec982c37a7982e7a1b116554fbaa39466f281 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:33 +0000 Message-Id: <69741321.a05b.7d1e679c@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=95eec982c37a7982e7a1b116554fbaa39466f281 commit 95eec982c37a7982e7a1b116554fbaa39466f281 Author: Konstantin Belousov AuthorDate: 2026-01-17 03:30:09 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-24 00:26:45 +0000 vm/swap_pager.c: silence compiler warning (cherry picked from commit 325baf00735756d024b903bfcee50b4f09e90129) --- sys/vm/swap_pager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index f6d201309349..834c757aa385 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -1370,7 +1370,7 @@ swap_pager_getpages_locked(struct pctrie_iter *blks, vm_object_t object, KASSERT((object->flags & OBJ_SWAP) != 0, ("%s: object not swappable", __func__)); - for (i = 0; i < count; i++) { + for (pindex = 0, i = 0; i < count; i++) { m = ma[i]; if (m != bogus_page) { pindex = m->pindex - i; From nobody Sat Jan 24 00:32:32 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dybNc5Mnnz6Q1ln for ; Sat, 24 Jan 2026 00:32: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dybNc3kslz452P for ; Sat, 24 Jan 2026 00:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R0wntBkpzntS/3TlcyTVwo00aovrlwt7hq04DLDGNkE=; b=N3fsFFOHcL1xIt++BsKwoo4aOQ4YVQmGHJK4dpdCoWjFHEXIlqvu8/NKR3GsWYtDyXtJCs iJvSRiNvZKX+JTsSf1t47ysuCtuMtgcCy9IwCb45bo2e4pArBcYSH3MKN2sbvUgwDMEkBJ 9ACWCf04LkjjLMNZBNzuugIuWpx6Pdx7RGj3D7vDP45ZBeLtcFwFPcNOaWP9aVWT2eao5/ PPAOpzE2BaB3HDXPcpfvXt5JG4hy/s6ulKCKnaH5GgCi/SBj/6cZ/zYYl3s6jf5ITuxsmQ 91uYbGMsgixoi0CCrXC0UuZmoV39Z1yGQu05pVB/9aZ4U/58iEjZvcoQLVcG2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769214752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R0wntBkpzntS/3TlcyTVwo00aovrlwt7hq04DLDGNkE=; b=c7vMoQMyjz0qJ+z1dPsEK0/KLXdYKByQMo0RTgSgoSctE6rKe9fFZ705yslsOonyvZctdm jOTWZOOtM7sCrzZpUPfbHyv1BRLy5LwtnTLEYBSvmNL9l7lX0z9lEN6gseplXhQE/grWyA kkYoscJtXfdsv6Fo0Wu68jWrUl7i5FDyfSQoPD2LACB5q10d8odCDmIzrZ/cjyE8QNOAH5 eNFds8vAX3U+CCBzaypxp5+njTU+S1yZhaBTOlFxgGW7tl1j6CdfJaOrt6UDFW5DfOX8QY UJ8d+85QneTwQzwo0/RpPdTBmqlPav9NLlgO1kARh10WHtLCG6Ai8ZYJpxeNdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769214752; a=rsa-sha256; cv=none; b=XD9ILZod3nSw6L/BYjTXWmYxNJNoQ5/cIjr66Dps+2jqaH8QL6NY4XqDbdr7dZyDV4KwpS 0mJF1ujJxra8BcmX16WR8kxTwp6+fNU7TRAwsdotLk8Bw9CZo8kCtJp8rtZw/VZmvuWwmr QpgARIMVvcaJD1G7r+Nc3tx8UGvNCIg5jUdygB2VsdO5LdTCdZQZnRLjF4pcM+g8F8f7rG JOLI/Y1kvDYkWKmDOZ6VsCGZhJNZadneY09u/X74z9j0B4X9hsVhs1+TmLoAhnny+bTxlx Uj8em90g+pjDbL1Ntt2DfIo22qkI9PNZc2i2OmwUPkOdTa5wZ+kZVGA+SR8PoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dybNc3DJhzj8s for ; Sat, 24 Jan 2026 00:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 98e0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:32:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 2a27aefcefe0 - stable/15 - swap_pager_getpages(): some pages from ma[] might be bogus List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2a27aefcefe05fb531189b256bad63c3c8f5cea5 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:32:32 +0000 Message-Id: <69741320.98e0.46a7bbee@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2a27aefcefe05fb531189b256bad63c3c8f5cea5 commit 2a27aefcefe05fb531189b256bad63c3c8f5cea5 Author: Konstantin Belousov AuthorDate: 2026-01-13 13:35:28 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-24 00:26:45 +0000 swap_pager_getpages(): some pages from ma[] might be bogus (cherry picked from commit d198ad51ea73bbb162336923a387f52b0b1c1f1d) --- sys/vm/swap_pager.c | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 012d89db3310..f6d201309349 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -1362,14 +1362,22 @@ static int swap_pager_getpages_locked(struct pctrie_iter *blks, vm_object_t object, vm_page_t *ma, int count, int *a_rbehind, int *a_rahead, struct buf *bp) { + vm_page_t m; vm_pindex_t pindex; - int rahead, rbehind; + int i, rahead, rbehind; VM_OBJECT_ASSERT_WLOCKED(object); KASSERT((object->flags & OBJ_SWAP) != 0, ("%s: object not swappable", __func__)); - pindex = ma[0]->pindex; + for (i = 0; i < count; i++) { + m = ma[i]; + if (m != bogus_page) { + pindex = m->pindex - i; + break; + } + } + MPASS(i != count); if (!swp_pager_haspage_iter(pindex, &rbehind, &rahead, blks)) { VM_OBJECT_WUNLOCK(object); uma_zfree(swrbuf_zone, bp); @@ -1399,8 +1407,11 @@ swap_pager_getpages_locked(struct pctrie_iter *blks, vm_object_t object, KASSERT(bp->b_npages <= PBUF_PAGES, ("bp_npages %d (rb %d c %d ra %d) not less than PBUF_PAGES %jd", bp->b_npages, rbehind, count, rahead, (uintmax_t)PBUF_PAGES)); - for (int i = 0; i < bp->b_npages; i++) - bp->b_pages[i]->oflags |= VPO_SWAPINPROG; + for (i = 0; i < bp->b_npages; i++) { + m = bp->b_pages[i]; + if (m != bogus_page) + m->oflags |= VPO_SWAPINPROG; + } bp->b_blkno = swp_pager_meta_lookup(blks, pindex - rbehind); KASSERT(bp->b_blkno != SWAPBLK_NONE, ("no swap blocking containing %p(%jx)", object, (uintmax_t)pindex)); @@ -1448,8 +1459,14 @@ swap_pager_getpages_locked(struct pctrie_iter *blks, vm_object_t object, */ VM_OBJECT_WLOCK(object); /* This could be implemented more efficiently with aflags */ - while ((ma[0]->oflags & VPO_SWAPINPROG) != 0) { - ma[0]->oflags |= VPO_SWAPSLEEP; + for (i = 0; i < count; i++) { + m = ma[i]; + if (m != bogus_page) + break; + } + MPASS(i != count); + while ((m->oflags & VPO_SWAPINPROG) != 0) { + m->oflags |= VPO_SWAPSLEEP; VM_CNT_INC(v_intrans); if (VM_OBJECT_SLEEP(object, &object->handle, PSWP, "swread", hz * 20)) { @@ -1463,9 +1480,10 @@ swap_pager_getpages_locked(struct pctrie_iter *blks, vm_object_t object, /* * If we had an unrecoverable read error pages will not be valid. */ - for (int i = 0; i < count; i++) - if (ma[i]->valid != VM_PAGE_BITS_ALL) + for (i = 0; i < count; i++) { + if (ma[i] != bogus_page && ma[i]->valid != VM_PAGE_BITS_ALL) return (VM_PAGER_ERROR); + } return (VM_PAGER_OK); @@ -1730,6 +1748,9 @@ swp_pager_async_iodone(struct buf *bp) for (i = 0; i < bp->b_npages; ++i) { vm_page_t m = bp->b_pages[i]; + if (m == bogus_page) + continue; + m->oflags &= ~VPO_SWAPINPROG; if (m->oflags & VPO_SWAPSLEEP) { m->oflags &= ~VPO_SWAPSLEEP; From nobody Sat Jan 24 00:47:42 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dybk66M4xz6Q2Kh for ; Sat, 24 Jan 2026 00: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dybk65hbMz3Cbn for ; Sat, 24 Jan 2026 00: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=1769215662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1PCy2DU4x5PNBsH+UdqXo3aczi0iuRVBpuCMyeE7Nfs=; b=negcHJAGGgs6LuM2I85nb0GdYmyiAa4QDQUhMFZy3k/ywPwO6mcKdooQUclHh66N6qOfVZ rAvFjaIZHeDEhajfqwuQGXVgh1a1e16Kt6tDaSUtSJBw2Y4zt96XSYwmRvWOBsnLF6TZha yTvAYSUU6N2o6lSeEf1ZlVPjhA/Pd83RMOM6FOOuvhWR4wjx7P/tT5RgK8Dq5pgxo+3Hek GcxQDFAxHtS/d5bGXSMGklKSrT3x2iMiNgG3JqE8yxYCNj3ZS5UhGSmwcniWMmWdkLl2nS bDDWeX9KBN7OGeeWiKs5CITKZ9i55nNY913oGtSwGA8bqg6vnGwZmQBSDDcKeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769215662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1PCy2DU4x5PNBsH+UdqXo3aczi0iuRVBpuCMyeE7Nfs=; b=WlisSYtKtTAjxzj0q5bG50h0LudRmaxvpfOvVpjw9zYKoEw9PrYKMLnRKt1eGp3AojlBeN t/3S1km4CgHvK/R/IN8NYe8SbiIaoKTrrR2lV2aj4/ecP2t2RrocUhRVMjUgts/LHluUKo e11D8JUJO8bL8L4PM02ug7Rx0XSud1O7UgFAG8ElM2rAB29Y8QJmxH5izdzABx4WdsSREh KEzAGeD7gF2IFEawJ/lmeCP5KuGmeNcnA8ywPBIcRHRq+jOKT75hnsnkO3nEtuPZwDfpze usHyWt0hkVdVZ+aR/Rn/i0yTmHGm2mFPkyCuNjre0gnlXjUL5p1ceMVFddhRwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769215662; a=rsa-sha256; cv=none; b=UfJo096/yp2odN5xtmhh74avBRN5gcfuQO3HyFBjgcnxsasLd8Y6RB9qyD6wF/BLjgN/Jr EXqonwbP3daM+lRPq9/tv4kQKybbfWtTGJMr5+U/IQvZPcvVLTgyhHmKngfJuJo6qhJDDS 475GAhBDhJbp00gv/bYcedgX7K+klXh8Z38zm50uZ1wmMloXvjop/3NCEUV8VJ48q2Xbza ZmoWqgf6d0gwajlMrdNBLNgVWHejijjUzzs81WaPR0lg64/qetKpNrLuToMY5pMkrf5cO+ OTaU4ApqRc3eape0hS/EQxJoZfgRg8wBZ73f1LAsAJ2M/zr4VblidvCWk+Okew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dybk65F7YzjPV for ; Sat, 24 Jan 2026 00:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b1c4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 00:47:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 6fd7e55c9413 - stable/15 - nfsd: Fix handling of hidden/system during Open/Create List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6fd7e55c94134b01c6e0f14f53d3172f18ab786f Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 00:47:42 +0000 Message-Id: <697416ae.b1c4.602ef37@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=6fd7e55c94134b01c6e0f14f53d3172f18ab786f commit 6fd7e55c94134b01c6e0f14f53d3172f18ab786f Author: Rick Macklem AuthorDate: 2026-01-08 16:27:32 +0000 Commit: Rick Macklem CommitDate: 2026-01-24 00:43:05 +0000 nfsd: Fix handling of hidden/system during Open/Create When an NFSv4.n client specifies settings for the archive, hidden and/or system attributes during a Open/Create, the Open/Create fails for ZFS. This is caused by ZFS doing a secpolicy_xvattr() call, which fails for non-root. If this check is bypassed, ZFS panics. This patch resolves the problem by disabling va_flags for the VOP_CREATE() call in the NFSv4.n server and then setting the flags with a subsequent VOP_SETATTR(). This problem only affects FreeBSD-15 and main, since the archive, system and hidden attributes are not enabled for FreeBSD-14. I think a similar problem exists for the NFSv4.n Open/Create/Exclusive_41, but that will be resolved in a future commit. Note that the Linux, Solaris and FreeBSD clients do not set archive, hidden or system for Open/Create, so the bug does not affect mounts from those clients. PR: 292283 (cherry picked from commit a6d57f312f18bbeeda8a34e99d0a662b0db9a190) --- sys/fs/nfsserver/nfs_nfsdport.c | 11 +++++++++++ sys/fs/nfsserver/nfs_nfsdsubs.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index c05e0d67f0d6..18e5813596c6 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -1977,6 +1977,7 @@ nfsvno_open(struct nfsrv_descript *nd, struct nameidata *ndp, struct nfsexstuff nes; struct thread *p = curthread; uint32_t oldrepstat; + u_long savflags; if (ndp->ni_vp == NULL) { /* @@ -1991,6 +1992,15 @@ nfsvno_open(struct nfsrv_descript *nd, struct nameidata *ndp, } if (!nd->nd_repstat) { if (ndp->ni_vp == NULL) { + /* + * Most file systems ignore va_flags for + * VOP_CREATE(), however setting va_flags + * for VOP_CREATE() causes problems for ZFS. + * So disable them and let nfsrv_fixattr() + * do them, as required. + */ + savflags = nvap->na_flags; + nvap->na_flags = VNOVAL; nd->nd_repstat = VOP_CREATE(ndp->ni_dvp, &ndp->ni_vp, &ndp->ni_cnd, &nvap->na_vattr); /* For a pNFS server, create the data file on a DS. */ @@ -2003,6 +2013,7 @@ nfsvno_open(struct nfsrv_descript *nd, struct nameidata *ndp, nfsrv_pnfscreate(ndp->ni_vp, &nvap->na_vattr, cred, p); } + nvap->na_flags = savflags; VOP_VPUT_PAIR(ndp->ni_dvp, nd->nd_repstat == 0 ? &ndp->ni_vp : NULL, false); nfsvno_relpathbuf(ndp); diff --git a/sys/fs/nfsserver/nfs_nfsdsubs.c b/sys/fs/nfsserver/nfs_nfsdsubs.c index b09ec1b3a062..cc0e169af9b7 100644 --- a/sys/fs/nfsserver/nfs_nfsdsubs.c +++ b/sys/fs/nfsserver/nfs_nfsdsubs.c @@ -1697,6 +1697,44 @@ nfsrv_fixattr(struct nfsrv_descript *nd, vnode_t vp, NFSCLRBIT_ATTRBIT(attrbitp, NFSATTRBIT_OWNERGROUP); } } + + /* + * For archive, ZFS sets it by default for new files, + * so if specified, it must be set or cleared. + * For hidden and system, no file system sets them + * by default upon creation, so they only need to be + * set and not cleared. + */ + if (NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_ARCHIVE)) { + if (nva.na_flags == VNOVAL) + nva.na_flags = 0; + if ((nvap->na_flags & UF_ARCHIVE) != 0) + nva.na_flags |= UF_ARCHIVE; + change++; + NFSSETBIT_ATTRBIT(&nattrbits, NFSATTRBIT_ARCHIVE); + } + if (NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_HIDDEN)) { + if ((nvap->na_flags & UF_HIDDEN) != 0) { + if (nva.na_flags == VNOVAL) + nva.na_flags = 0; + nva.na_flags |= UF_HIDDEN; + change++; + NFSSETBIT_ATTRBIT(&nattrbits, NFSATTRBIT_HIDDEN); + } else { + NFSCLRBIT_ATTRBIT(attrbitp, NFSATTRBIT_HIDDEN); + } + } + if (NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_SYSTEM)) { + if ((nvap->na_flags & UF_SYSTEM) != 0) { + if (nva.na_flags == VNOVAL) + nva.na_flags = 0; + nva.na_flags |= UF_SYSTEM; + change++; + NFSSETBIT_ATTRBIT(&nattrbits, NFSATTRBIT_SYSTEM); + } else { + NFSCLRBIT_ATTRBIT(attrbitp, NFSATTRBIT_SYSTEM); + } + } if (change) { error = nfsvno_setattr(vp, &nva, nd->nd_cred, p, exp); if (error) { From nobody Sat Jan 24 09:18:05 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyq312qkCz6PV85 for ; Sat, 24 Jan 2026 09:18: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dyq311ymMz45dJ for ; Sat, 24 Jan 2026 09:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769246285; 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=+agXfWxVf438z6H6ItxEvBn+zMH+UHLo4+yuF6gJHQY=; b=VX/cjEvSpP96mDDKXCQGtMo9x4jfssyqMGm5G95Qcr7l5DRv6CMe76Z/QcnPQz6AgHytZV Ucyxz4ZPNAFqF73hSoHIqNjCy6iHmBz4oPX/T11bazkJ2WyBKTRq9Ga95nEnJA1DGr7V3w blgrCURhgjD8laUZQC9VMni1c1js6rn1IxnMIDp1A8peGeYexrjfFDassrizDRBfjsZ3xm rmeSDk39sT68mP6GuaVMzkb4txC0HizGJTaACjVIiSqPvqghKVM87nR5J/mvHhIPhEfy85 f+cUJa5bMCDtoo/9F8/rvt7pi+Fxfs5+HZoXsN7jIO14PFtX1QixtBvkJxovUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769246285; 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=+agXfWxVf438z6H6ItxEvBn+zMH+UHLo4+yuF6gJHQY=; b=jWZrm+SIEEjDUR4ZGzCnINBSOJbpsb3g7RrkrxV11JTfcZVzEKcH7Xvq7addFtzyxVbV8v F7U7sq216Uw1AUr1m3rTW7L7LM8gMRDfM4b6EYLgHUApWhXbJiMW5hukrFCAKkd8AtaOB9 7E6+aeWfe7af7b7woehxTvffu+Kgud1/0PzB5CZY7JPf7cC3DAwje1I2RpfLBQhdwrfQqk YVwQmZOJL8S61aNMW7D0wPHtBKcMn8H1+2EBv3bxT8NhyjzXydXRPYy1G4ohGxASNsguV3 0aOc219dEgnapzqo6IBcHXujPLy+uv88OyZuxHt4K634nfkhXoxS3sOZH7Kyaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769246285; a=rsa-sha256; cv=none; b=xyuxsLyl6OX3BzCAy1tZFIMqPQIqxbODxQ+7rpd/sh4If5UybdZu7N5WUFCufRLKSCy10X +ZKpJIKeWadK3AxNxuuSVqsFZ0rxfaO0xN+Ak9FvGh4xA28i4icP1DtHADRmEqjsZpiB2k MSY5/wQCWwunkLcBK2suHf4+1ulpcccAxckfwZD3EEi/zkwtc43UB8kDZj3/npiC1JuxLZ HmLYftiFOXXpQwJgJWkSgu9XQB4QrRY23D0zttGnTrvdj/vTffBpYbNa7dUltIkks1MpUf GSyvUBaBitohCEGjYtw1m8ZNmCmE0haFEJmGTTZZ8OUJrcpnnKpTT47KhXHcqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dyq311YTQzysN for ; Sat, 24 Jan 2026 09:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2669a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 09:18:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Marek Zarychta From: Pouria Mousavizadeh Tehrani Subject: git: f51e0f5e69cf - stable/15 - ng_netflow v9: fix template re-announcement using packet count List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f51e0f5e69cf9e3806d64b3ce85d70aca63d922b Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 09:18:05 +0000 Message-Id: <69748e4d.2669a.387333ea@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=f51e0f5e69cf9e3806d64b3ce85d70aca63d922b commit f51e0f5e69cf9e3806d64b3ce85d70aca63d922b Author: Marek Zarychta AuthorDate: 2026-01-16 10:12:11 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-01-24 09:09:02 +0000 ng_netflow v9: fix template re-announcement using packet count Increment fe->sent_packets after export9_send(). Previously, NetFlow v9 templates were only re-announced based on time, ignoring the packet count parameter (`templ_packets`). PR: 270083 Reviewed by: glebius pouria Approved by: glebius (mentor) MFC after: 1 week Sponsored by: Subcarpathian BSD User Group (cherry picked from commit d836dae9f0d888d441234ea11e3cd91614c86aa2) --- sys/netgraph/netflow/netflow_v9.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netgraph/netflow/netflow_v9.c b/sys/netgraph/netflow/netflow_v9.c index b6e9fca98408..e6b63a8aa36b 100644 --- a/sys/netgraph/netflow/netflow_v9.c +++ b/sys/netgraph/netflow/netflow_v9.c @@ -227,6 +227,7 @@ export9_send(priv_p priv, fib_export_p fe, item_p item, struct netflow_v9_packet else NG_FREE_ITEM(item); + fe->sent_packets++; free(t, M_NETFLOW_GENERAL); return (error); From nobody Sat Jan 24 09:28:00 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyqGS6pcQz6PVrn for ; Sat, 24 Jan 2026 09:28: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dyqGS4HfJz461m for ; Sat, 24 Jan 2026 09:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769246880; 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=KDEmyDes5zClQObdXVpkDLdvSzfkhzICXDhyu2RH/tg=; b=Ps3EO2v/9s6mUDoUrFGYsbUTNmB/0NZJDyM8ZqniFutrGZ8GohPmrCR/gGk9hCI5xJYXbL SyPtau8cOgCav9P/C8hMfkGJHzA9IlDKpSbA5eLDLPyzyBhGJt8qKVRst/xX5y1PViqQLw S6kq9foPIYdXDznIGWhwnMdJyy2wINEBB0yQ6dNaQPzG8RV2/anHM5P+MDNqdtG+BJG0Qy aaHPwhRMOVRGpddNJLskjga7bKxuIvCyciQzFd0X2wv34vjIs2oYqdsTmTUWYP+sgvP7WZ 3GBppF4dvVVT92EHM/ZQv8DwiYyhB/6JiBqO+xcrDYUoK7YrCxxt5DHZDel8Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769246880; 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=KDEmyDes5zClQObdXVpkDLdvSzfkhzICXDhyu2RH/tg=; b=ptUFUoRG0+KnPAYG+dELKOeBHrdjUosQRKN8qMoSoihiGbnj3ZkbRWUjsJjWAX2oKu8xU3 9goJm9+AWQXKTDNP/xMPrpMv8dmpIioh9C1l1DtUpLWN6EZM4Q+StOspXYVya4iQhSfSTz ZnCQXarm8vVhutsGN2Xvq5WzHBrs0+WCNseMYJuap32Sxssi79HGGMs3r3OAbQM5iX89KZ JBXHeyHyixr6THi9z8XYsF8w0uhudwF0pDULLalWgpbP/5SFTY1CwVEvrUN9LHy8KFrUYF mWvb2cuFO2OpLji5j3PnchBTEptZ0zlP1AbnWlWOgx8HbaU/hFoPDyjHbrCxVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769246880; a=rsa-sha256; cv=none; b=rfD8BPtwUOc2VhPJ//IfDbiMVFelmz6/k56O04G1h0mwXs4gsMxux4msIchaFbETspZxkR mz5hLnyEz4hVBV6h/XRMncq6+CXFrjGxADxYWusFRGtXjg54BYfH/PGxj2+xPGFfpbiYzg LXachQ8O6OcKWq+EJUf3tgEdih7JUGpDgLWwVvcOE7fPwPKiJe2DCEpUk0nKkNHHAiVzVJ 0Akpxcf/Mddoqw9RbkzpqI9D64ui6rbHBV63pCEZuFetixZRRHdxQ0DNarKRYxTnqUIzii zIJ1w5j4ltVIec0tJVVRwLTH9Ozi6SZtYtumWuWeyUnFCU6au8v8VcJoMVqkUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dyqGS2fpbz107G for ; Sat, 24 Jan 2026 09:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26ff5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 09:28:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Marek Zarychta From: Pouria Mousavizadeh Tehrani Subject: git: 40c0d6735538 - stable/14 - ng_netflow v9: fix template re-announcement using packet count List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 40c0d6735538a1557a9b53306dd70aa2fc8ae7d1 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 09:28:00 +0000 Message-Id: <697490a0.26ff5.3df22a52@gitrepo.freebsd.org> The branch stable/14 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=40c0d6735538a1557a9b53306dd70aa2fc8ae7d1 commit 40c0d6735538a1557a9b53306dd70aa2fc8ae7d1 Author: Marek Zarychta AuthorDate: 2026-01-16 10:12:11 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-01-24 09:23:28 +0000 ng_netflow v9: fix template re-announcement using packet count Increment fe->sent_packets after export9_send(). Previously, NetFlow v9 templates were only re-announced based on time, ignoring the packet count parameter (`templ_packets`). PR: 270083 Reviewed by: glebius pouria Approved by: glebius (mentor) MFC after: 1 week Sponsored by: Subcarpathian BSD User Group (cherry picked from commit d836dae9f0d888d441234ea11e3cd91614c86aa2) --- sys/netgraph/netflow/netflow_v9.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netgraph/netflow/netflow_v9.c b/sys/netgraph/netflow/netflow_v9.c index b6e9fca98408..e6b63a8aa36b 100644 --- a/sys/netgraph/netflow/netflow_v9.c +++ b/sys/netgraph/netflow/netflow_v9.c @@ -227,6 +227,7 @@ export9_send(priv_p priv, fib_export_p fe, item_p item, struct netflow_v9_packet else NG_FREE_ITEM(item); + fe->sent_packets++; free(t, M_NETFLOW_GENERAL); return (error); From nobody Sat Jan 24 11:12:34 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dysb62Dgnz6PdLs for ; Sat, 24 Jan 2026 11:12: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dysb61ZZtz3P7j for ; Sat, 24 Jan 2026 11:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769253154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YpXznXX7S+gpFJRl43MFEmbFxIEbSPqBQJ7A42xQ4aM=; b=B765CYeUpekUAHCRQP+OHWWDb9hfkfHA2KbinNGBrDzzJC8+BOHbT1+WS4YlvidxDKkPsd W3XtRRD6Bx8JsEkhkV/vQZlw3A3mhs0O6ntXhgn7Cdh+Ln1/Rl/UdynLj31CHRBh42PIA0 bC3I7jydmrm4zaS8mN3rL95N5LTHZgQxsNBX5VqPwgxtNz7bT4ITjhmSWGCRcCQMKfDI9T W/dCNSjvHqg9/7/2mNOPfrg8eyCSkK8Pf+AB/RG4Bx1WjekHp68G1xkTJV6wAv0tIdobEC 3xEraZEhZkcyD9RXfS1Eo34lyF1gXHfNnbF4Zf/NuiIqiCoBkbrWi9ojlfSF2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769253154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YpXznXX7S+gpFJRl43MFEmbFxIEbSPqBQJ7A42xQ4aM=; b=ubJxpC51tlV3hH6tfW8RT6s9bkoyOg4F7uehtfCsOKcOwoaVfmogDdOZpWVAOGlmCWcGDQ +tvqkRXmK7pFffM5NvQ+9HsuvWq5DA8IaFhOiCJs0U+A2mkHNOj5To7y9h+2o3BzBxahMm c+4nfC9HeJdjbSVE8a1JgHGVZKmhp0D3O4zi3xbbmTXsQjQXcGrBc9s9JS1SkLxrF6n5DT 8LI6ZrYCdfjVE1IQnSlMxmpKBuFvKQt3le44mzqvGzDrcOc4IIalYLxd0lYbsFgksHrSjj kOazAWlzFQCC/2bVnSltILPgVKrQp9fAh8qfcxRbVGdvz2+6VSxURAZu2Ohd+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769253154; a=rsa-sha256; cv=none; b=JHJfcYEEcSKJefL9olrTb5e0oQkncox62rqLrbIbhs0P+W5CuOX+503jMCR8fp0ZX8aAH4 vFW6XLuqUzNrg9lBxvf6GKvFp1SetJSworp/rKSjfymCFaBFkPsEjji2Py7EjB5D7JMtFC tNOWXUTXA252nsTVhqjKiQdpnNHu1witw9HmRfpfPp6jSOTTApfwo+ZcXZrEXKujoYLYWU ch7ff3dpTfYQK0VL54ZEWW1uJbxTx2+NNY63JrYpk8/uiNwN+0ecK+C1XLC1KNW8svtRfo XKlRYB4+Zux685Fckdtxo9pSPqP4MF0zYXvApsCeB4JYBBQLr7fxwA0ZU5tNcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dysb6122rz12kJ for ; Sat, 24 Jan 2026 11:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ace3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 11:12:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: e4730bb6bbd7 - stable/14 - Revert "e1000: Try auto-negotiation for fixed 100 or 10 configuration" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e4730bb6bbd703ae20b73922bb394c4038681b16 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 11:12:34 +0000 Message-Id: <6974a922.3ace3.6840f53@gitrepo.freebsd.org> The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=e4730bb6bbd703ae20b73922bb394c4038681b16 commit e4730bb6bbd703ae20b73922bb394c4038681b16 Author: Kevin Bowling AuthorDate: 2025-08-19 16:45:48 +0000 Commit: Kevin Bowling CommitDate: 2026-01-24 11:12:19 +0000 Revert "e1000: Try auto-negotiation for fixed 100 or 10 configuration" We've gotten a report of this breaking a fixed no autoneg setup. Since no link is worse than what this intends to fix (negotiating full duplex at forced speed), revert for the undeway 15.0 release cycle until this can be further reviewed. PR: 288827 Differential Revision: https://reviews.freebsd.org/D47336 This reverts commit 645c45e297c0fcbbb9d2d24cdeeb124234825019. (cherry picked from commit 3ff0231c87f360afa4521e635b46f6c711dc4ee3) --- sys/dev/e1000/e1000_phy.c | 5 ++--- sys/dev/e1000/if_em.c | 44 ++++++-------------------------------------- 2 files changed, 8 insertions(+), 41 deletions(-) diff --git a/sys/dev/e1000/e1000_phy.c b/sys/dev/e1000/e1000_phy.c index c34897e3b31a..634f48171c3e 100644 --- a/sys/dev/e1000/e1000_phy.c +++ b/sys/dev/e1000/e1000_phy.c @@ -1707,10 +1707,9 @@ s32 e1000_setup_copper_link_generic(struct e1000_hw *hw) * autonegotiation. */ ret_val = e1000_copper_link_autoneg(hw); - if (ret_val && !hw->mac.forced_speed_duplex) + if (ret_val) return ret_val; - } - if (!hw->mac.autoneg || (ret_val && hw->mac.forced_speed_duplex)) { + } else { /* PHY will be set to 10H, 10F, 100H or 100F * depending on user settings. */ diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 0a25f4ec46b5..553a334efd6d 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -2002,18 +2002,7 @@ em_if_media_status(if_ctx_t ctx, struct ifmediareq *ifmr) (sc->hw.phy.media_type == e1000_media_type_internal_serdes)) { if (sc->hw.mac.type == e1000_82545) fiber_type = IFM_1000_LX; - switch (sc->link_speed) { - case 10: - ifmr->ifm_active |= IFM_10_FL; - break; - case 100: - ifmr->ifm_active |= IFM_100_FX; - break; - case 1000: - default: - ifmr->ifm_active |= fiber_type | IFM_FDX; - break; - } + ifmr->ifm_active |= fiber_type | IFM_FDX; } else { switch (sc->link_speed) { case 10: @@ -2026,12 +2015,11 @@ em_if_media_status(if_ctx_t ctx, struct ifmediareq *ifmr) ifmr->ifm_active |= IFM_1000_T; break; } + if (sc->link_duplex == FULL_DUPLEX) + ifmr->ifm_active |= IFM_FDX; + else + ifmr->ifm_active |= IFM_HDX; } - - if (sc->link_duplex == FULL_DUPLEX) - ifmr->ifm_active |= IFM_FDX; - else - ifmr->ifm_active |= IFM_HDX; } /********************************************************************* @@ -2065,26 +2053,6 @@ em_if_media_change(if_ctx_t ctx) sc->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL; break; case IFM_100_TX: - sc->hw.mac.autoneg = DO_AUTO_NEG; - if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) { - sc->hw.phy.autoneg_advertised = ADVERTISE_100_FULL; - sc->hw.mac.forced_speed_duplex = ADVERTISE_100_FULL; - } else { - sc->hw.phy.autoneg_advertised = ADVERTISE_100_HALF; - sc->hw.mac.forced_speed_duplex = ADVERTISE_100_HALF; - } - break; - case IFM_10_T: - sc->hw.mac.autoneg = DO_AUTO_NEG; - if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) { - sc->hw.phy.autoneg_advertised = ADVERTISE_10_FULL; - sc->hw.mac.forced_speed_duplex = ADVERTISE_10_FULL; - } else { - sc->hw.phy.autoneg_advertised = ADVERTISE_10_HALF; - sc->hw.mac.forced_speed_duplex = ADVERTISE_10_HALF; - } - break; - case IFM_100_FX: sc->hw.mac.autoneg = false; sc->hw.phy.autoneg_advertised = 0; if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) @@ -2092,7 +2060,7 @@ em_if_media_change(if_ctx_t ctx) else sc->hw.mac.forced_speed_duplex = ADVERTISE_100_HALF; break; - case IFM_10_FL: + case IFM_10_T: sc->hw.mac.autoneg = false; sc->hw.phy.autoneg_advertised = 0; if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) From nobody Sat Jan 24 11:13:05 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dysbk1BSfz6PdWt for ; Sat, 24 Jan 2026 11:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dysbk066Sz3PQV for ; Sat, 24 Jan 2026 11:13:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769253186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pswSf5A9l1oc2WNtPfP6GuEjz+m8GaQYQWVDNYTk5I0=; b=eBkNRFqORY6oI6tmlr2ulGV1FC+UVId4/rrJLrsn2bKipD8aHS+Uz1d5k7eAhTGeQ66e9q 14GKjns5kSOYExBtOC+vEMr6uk72nYCtBVY0Msh3kW5dvqWC8lMTKa1HGdWMJgcpQJGiFt mzORQxxJCYkEunuqsGPDnGM0bHmRepS3KMWel0FSj+QhxITNcswa2KNfeX+svfn+UGNoqO yHWRr6j/luab0wA4Z9lYactS87llLViMLdlDUPb5rs4kLsrPHVyqJ1rAkcMFgBlWomu2yL bBLBJx9AGra1p5oweV58Ea+oOffmybvtAny/pNQjX/GOJ7muaH6aGTMSyb8Tjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769253186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pswSf5A9l1oc2WNtPfP6GuEjz+m8GaQYQWVDNYTk5I0=; b=rPIzL7qYgabw8kxDaMUmUFtS4+hic0sKk1FDlUaSxAze+gYdDdidoKoHrb6KMKLPY2kGC6 3RSQOPL7aVfBXOhKvoOdkAHk/U7fl85OSkRq0ctmqs4NBl9n2RE37FB3nQ89Xnvtj97XTV uRPNwHBkVHNhGjbZmNyGjLyz89y4NUBcfGthokiJGGMsOy88BwV15M0e7f6D/jGXyzIisL E7dv5mLijoWS6XWyFkOKAP9GD6tsv+edMsUA51xs6kJdq/ylftS2KgVHYtSxEfa5mmG935 ouCkVj7SqhCZ/dki9lxJbHFHaMIPdYU3rZkt7TNgexkEkclY+YiEbaSH+5qb6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769253186; a=rsa-sha256; cv=none; b=kUBWWuwsucwhqs7AoaK+iVz7/w0hQ7G8HYAu/Ng2PtnPbhrAHf4oTtW33sv53WOvHAYp+l 0o1vcxOLNFwisvYZe7FspSjfdSocJJ1ks0FBj1OR6v1jXceh/XxnAZEEKg3erRqVLDhl6O CkAcygzF9D3qS6QAweRA9p+dyaakzPRNRBwW5+Hg4wPrXvLEt1xH5rfiSLGtzm0qL7OQV0 UG3yBVnJgx9IOmqN8nyW93659w+XtSe5xxcH+08v4faHSPB+e0DtXhq5u5fwP/roxsdhtu Aqh2KH/YxxJJQFOKGwPi5GHjRCjebw1MoK5HYW7h0hM67PaHd4EeAGZOq2LLUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dysbj6ZQTz12W1 for ; Sat, 24 Jan 2026 11:13:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39674 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 11:13:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 44b0f31df65e - stable/13 - Revert "e1000: Try auto-negotiation for fixed 100 or 10 configuration" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 44b0f31df65ecc96e350f42a79a87b49d7cf8f46 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 11:13:05 +0000 Message-Id: <6974a941.39674.26c75446@gitrepo.freebsd.org> The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=44b0f31df65ecc96e350f42a79a87b49d7cf8f46 commit 44b0f31df65ecc96e350f42a79a87b49d7cf8f46 Author: Kevin Bowling AuthorDate: 2025-08-19 16:45:48 +0000 Commit: Kevin Bowling CommitDate: 2026-01-24 11:12:55 +0000 Revert "e1000: Try auto-negotiation for fixed 100 or 10 configuration" We've gotten a report of this breaking a fixed no autoneg setup. Since no link is worse than what this intends to fix (negotiating full duplex at forced speed), revert for the undeway 15.0 release cycle until this can be further reviewed. PR: 288827 Differential Revision: https://reviews.freebsd.org/D47336 This reverts commit 645c45e297c0fcbbb9d2d24cdeeb124234825019. (cherry picked from commit 3ff0231c87f360afa4521e635b46f6c711dc4ee3) --- sys/dev/e1000/e1000_phy.c | 5 ++--- sys/dev/e1000/if_em.c | 44 ++++++-------------------------------------- 2 files changed, 8 insertions(+), 41 deletions(-) diff --git a/sys/dev/e1000/e1000_phy.c b/sys/dev/e1000/e1000_phy.c index 53be6a48b671..4e2afc43a684 100644 --- a/sys/dev/e1000/e1000_phy.c +++ b/sys/dev/e1000/e1000_phy.c @@ -1707,10 +1707,9 @@ s32 e1000_setup_copper_link_generic(struct e1000_hw *hw) * autonegotiation. */ ret_val = e1000_copper_link_autoneg(hw); - if (ret_val && !hw->mac.forced_speed_duplex) + if (ret_val) return ret_val; - } - if (!hw->mac.autoneg || (ret_val && hw->mac.forced_speed_duplex)) { + } else { /* PHY will be set to 10H, 10F, 100H or 100F * depending on user settings. */ diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index fcf1ccbd9a3e..75b8940587f6 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1997,18 +1997,7 @@ em_if_media_status(if_ctx_t ctx, struct ifmediareq *ifmr) (sc->hw.phy.media_type == e1000_media_type_internal_serdes)) { if (sc->hw.mac.type == e1000_82545) fiber_type = IFM_1000_LX; - switch (sc->link_speed) { - case 10: - ifmr->ifm_active |= IFM_10_FL; - break; - case 100: - ifmr->ifm_active |= IFM_100_FX; - break; - case 1000: - default: - ifmr->ifm_active |= fiber_type | IFM_FDX; - break; - } + ifmr->ifm_active |= fiber_type | IFM_FDX; } else { switch (sc->link_speed) { case 10: @@ -2021,12 +2010,11 @@ em_if_media_status(if_ctx_t ctx, struct ifmediareq *ifmr) ifmr->ifm_active |= IFM_1000_T; break; } + if (sc->link_duplex == FULL_DUPLEX) + ifmr->ifm_active |= IFM_FDX; + else + ifmr->ifm_active |= IFM_HDX; } - - if (sc->link_duplex == FULL_DUPLEX) - ifmr->ifm_active |= IFM_FDX; - else - ifmr->ifm_active |= IFM_HDX; } /********************************************************************* @@ -2060,26 +2048,6 @@ em_if_media_change(if_ctx_t ctx) sc->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL; break; case IFM_100_TX: - sc->hw.mac.autoneg = DO_AUTO_NEG; - if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) { - sc->hw.phy.autoneg_advertised = ADVERTISE_100_FULL; - sc->hw.mac.forced_speed_duplex = ADVERTISE_100_FULL; - } else { - sc->hw.phy.autoneg_advertised = ADVERTISE_100_HALF; - sc->hw.mac.forced_speed_duplex = ADVERTISE_100_HALF; - } - break; - case IFM_10_T: - sc->hw.mac.autoneg = DO_AUTO_NEG; - if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) { - sc->hw.phy.autoneg_advertised = ADVERTISE_10_FULL; - sc->hw.mac.forced_speed_duplex = ADVERTISE_10_FULL; - } else { - sc->hw.phy.autoneg_advertised = ADVERTISE_10_HALF; - sc->hw.mac.forced_speed_duplex = ADVERTISE_10_HALF; - } - break; - case IFM_100_FX: sc->hw.mac.autoneg = false; sc->hw.phy.autoneg_advertised = 0; if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) @@ -2087,7 +2055,7 @@ em_if_media_change(if_ctx_t ctx) else sc->hw.mac.forced_speed_duplex = ADVERTISE_100_HALF; break; - case IFM_10_FL: + case IFM_10_T: sc->hw.mac.autoneg = false; sc->hw.phy.autoneg_advertised = 0; if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) From nobody Sun Jan 25 00:24:41 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzC955tzyz6Ptb0 for ; Sun, 25 Jan 2026 00:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzC954LNnz3clx for ; Sun, 25 Jan 2026 00:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=reYThcZMQehEHsV5fZ4idqKblHg7VTpPsyWdP4bYv2M=; b=mxogWj4VmbYFf7UhmgeQmoPneFhDZNpyg3eukH1Ya2nP1olQ4iRkujs+EcZ19eqKVS9e9c 95mjOLwAH8Y8Q+1n0e2K+wr9cTWrO8RIkQ8jCp4rS7kPKFgBv0rFq9hG2s4qYIvUWzKDYa 7VZwO0gfhRa5I/zw747JqaBM/JZsAV+Fcs0/wo25moZdxyeYUXwCqKNGTS6CP+SY6dNGwv H2qWfR93P2ACbkuWOP3tspbgn8YEc/GZPT7cgLaBRVJV4gf7orxGfnM1h6z+a9/LXGcfWT nYNu3Hts5X3CzVE9vriF2QjyU9xWbSGm1LFjDWE1BbVL8MZAXFDCjV1mb/7Krg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=reYThcZMQehEHsV5fZ4idqKblHg7VTpPsyWdP4bYv2M=; b=GXE8skdID26vZrni3TY7ySVxfIwJIRPYZMQ6uKgMT4D/a+/KVte6Z2TzaBoli0FCiFl/ln aBn/nXyyCmy9ZgDy00FoCSRCsrVCDzaU5Q3frqO07Yj+IkPSpM7UjKcdGO/MUCOPafkkCG QFY0xENoCa0XvVYL7Q+XBDmJ4ZZbcXu3mx9h7NB9qeg1wZNhI9tXdwHh3KVCsnqGzIf1zZ fa/6h6cpIm8MUV9wL5L7f0S0dJ2ZNqrpfsP9iXI47c+ylZEpnLdcUGkxY8rCO4bZwLz9XC NPajjjHKKgbPEz8ca4Zsn80z3dEKBmtq6AJqZLkIXQO1erPUao13Fr3MJRBDuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769300681; a=rsa-sha256; cv=none; b=wytzqExG2iWmmBtwj26GjVnSH2y1BGuo65aa43CmUwUHCgDLtlmhck0Askdf52gGBmDqTp 44y4y+99jZH5ns0SeJKwqEPt6WwB5x7vUYxGPcVTYI4Wih2f6tZL/EkJFbpdvlBhCLcmuS lulZR96+1mm/hUZIaV/DM0iFx+2GjmV5pLu9a7tmeczK1swIxwfiZOQ8osZkSIWkVzM7yj 8Hy2dfiDEn6vKZW7RrCLWa9FTmjOSqoKLYlS3f2wjo8Ko3go83kG5qYrxIz3v+Y9ct9NKF kCq71F3fYVaLIJO8B38uGVcV6S0iYvYMgXOHz+oAJs2ppFVPyFHbmM0A5OJ98Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzC953wtBz1QjD for ; Sun, 25 Jan 2026 00:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 837a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 00:24:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: dfd4c8759325 - stable/15 - x88/local_apic.c: for each lvt element, add LVT register index List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: dfd4c8759325ffad17e8e2806fa176b4f4376324 Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 00:24:41 +0000 Message-Id: <697562c9.837a.b897cff@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=dfd4c8759325ffad17e8e2806fa176b4f4376324 commit dfd4c8759325ffad17e8e2806fa176b4f4376324 Author: Konstantin Belousov AuthorDate: 2025-12-09 03:53:50 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-25 00:23:34 +0000 x88/local_apic.c: for each lvt element, add LVT register index (cherry picked from commit 87ed56a5c43521d97975d936df4fc36184f1b685) --- sys/x86/x86/local_apic.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 606c551ed921..aecad4cbd463 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -128,6 +128,7 @@ struct lvt { u_int lvt_active:1; u_int lvt_mode:16; u_int lvt_vector:8; + u_int lvt_reg; }; struct lapic { @@ -156,6 +157,7 @@ static struct lvt lvts[] = { .lvt_active = 1, .lvt_mode = APIC_LVT_DM_EXTINT, .lvt_vector = 0, + .lvt_reg = LAPIC_LVT_LINT0, }, /* LINT1: NMI */ [APIC_LVT_LINT1] = { @@ -165,6 +167,7 @@ static struct lvt lvts[] = { .lvt_active = 1, .lvt_mode = APIC_LVT_DM_NMI, .lvt_vector = 0, + .lvt_reg = LAPIC_LVT_LINT1, }, [APIC_LVT_TIMER] = { .lvt_edgetrigger = 1, @@ -173,6 +176,7 @@ static struct lvt lvts[] = { .lvt_active = 1, .lvt_mode = APIC_LVT_DM_FIXED, .lvt_vector = APIC_TIMER_INT, + .lvt_reg = LAPIC_LVT_TIMER, }, [APIC_LVT_ERROR] = { .lvt_edgetrigger = 1, @@ -181,6 +185,7 @@ static struct lvt lvts[] = { .lvt_active = 1, .lvt_mode = APIC_LVT_DM_FIXED, .lvt_vector = APIC_ERROR_INT, + .lvt_reg = LAPIC_LVT_ERROR, }, [APIC_LVT_PMC] = { .lvt_edgetrigger = 1, @@ -189,6 +194,7 @@ static struct lvt lvts[] = { .lvt_active = 1, .lvt_mode = APIC_LVT_DM_NMI, .lvt_vector = 0, + .lvt_reg = LAPIC_LVT_PCINT, }, [APIC_LVT_THERMAL] = { .lvt_edgetrigger = 1, @@ -197,6 +203,7 @@ static struct lvt lvts[] = { .lvt_active = 1, .lvt_mode = APIC_LVT_DM_FIXED, .lvt_vector = APIC_THERMAL_INT, + .lvt_reg = LAPIC_LVT_THERMAL, }, [APIC_LVT_CMCI] = { .lvt_edgetrigger = 1, @@ -205,6 +212,7 @@ static struct lvt lvts[] = { .lvt_active = 1, .lvt_mode = APIC_LVT_DM_FIXED, .lvt_vector = APIC_CMC_INT, + .lvt_reg = LAPIC_LVT_CMCI, }, }; @@ -217,6 +225,7 @@ static struct lvt elvts[] = { .lvt_active = 0, .lvt_mode = APIC_LVT_DM_FIXED, .lvt_vector = 0, + .lvt_reg = LAPIC_EXT_LVT0, }, [APIC_ELVT_MCA] = { .lvt_edgetrigger = 1, @@ -225,6 +234,7 @@ static struct lvt elvts[] = { .lvt_active = 0, .lvt_mode = APIC_LVT_DM_FIXED, .lvt_vector = APIC_CMC_INT, + .lvt_reg = LAPIC_EXT_LVT1, }, [APIC_ELVT_DEI] = { .lvt_edgetrigger = 1, @@ -233,6 +243,7 @@ static struct lvt elvts[] = { .lvt_active = 0, .lvt_mode = APIC_LVT_DM_FIXED, .lvt_vector = 0, + .lvt_reg = LAPIC_EXT_LVT2, }, [APIC_ELVT_SBI] = { .lvt_edgetrigger = 1, @@ -241,6 +252,7 @@ static struct lvt elvts[] = { .lvt_active = 0, .lvt_mode = APIC_LVT_DM_FIXED, .lvt_vector = 0, + .lvt_reg = LAPIC_EXT_LVT3, }, }; From nobody Sun Jan 25 00:24:42 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzC966sG3z6PtRZ for ; Sun, 25 Jan 2026 00:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzC965CKSz3cvS for ; Sun, 25 Jan 2026 00:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DNjm11rehQYXMaRcL/LmIyLc1WGfkO7UZH5OoUc/NLs=; b=VHz9X8xlL7LY2R3V4OxAUGJ1ygoLR7KbpDYL52bq3NC8utj2ZNpt6EqbdslFGoERG/mt6+ HsakOqicaf/UPFT9yINfqgZhSnAdpXxC+i8IjMbwfa/Wz5TdaEacIZ8AYsZZEXdXruKflb EX7K3OrQhUn74bX9o89XG8YBy8a0sivmhBhXOtJRt3TOnkxQ+j08IeznFXDgQ9zecWqbzM ktx7O7vtF0OPL6SxzlS94Pt7SezYYMVlICsp1BSJdi4c92zdmPENTeYMYEMhvhXvudSZVp MvwChsc6ApGeVpes8TyuxprQQmNKSQlDWRNNHoRBkQWO79o/xq2SIQ9pxoC7vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DNjm11rehQYXMaRcL/LmIyLc1WGfkO7UZH5OoUc/NLs=; b=x7qNvlO+8zW3LjH/Tt3cARp9K9OnE/xdG8vSFPeTVmWr9qYyBAUutq4M8eAoL+qGYkzFeq 0uho2tR/Jy4ri5rcjb+usBV+/xFC28v7zs0+DIO9i9H26wnJYRLGOgE4QIUiHOyNw4q+ay KTkNitJhh5TXk3GzP5U+HN6WQsE6WrhBgNPg2NlpqTh6DPGQQxsQZATTERmnaiOrw9fhvw z9PdbgVxq2e+U/VM7dXuYcIkIFbmcn8Cb5hh5LEIY7n3Ll1tVMdlNIOxw+tcIJ/8BbSoGe hguTJKqfBwXM9w7nrpJMv1JU822IP07iDHfmbXAbA6Xf7eeTwS9L/TzwiFtdrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769300682; a=rsa-sha256; cv=none; b=LJ9KXmpdZesLl1oBAV79wMGZBSZ1JZmor0Dq4+YP+WDT5MHVpT0DEErzB/H9vM63v0If/e C0DMdNdHHOvQ7weGopDPko8XuJ+mf3+QtBklvgMOlSzRaIreemdz/mQIqCk74iWcsuOeUj eZvT+EpSCOcjFUESLphVLXT/2RksXUBAgHUFzEd/q+Bi9EsfN4qPqrqnCmznr2IJX21e12 f/t20rSzTgOWtFhlivIKDyXINGx+BEgkRYN1+V9FemLyK5VhCuGlRzk3x3LI6O0WPNyoig DqqQ2hHOn0SJ4vy++DSpF/RqTBMQdv17NcYuFGw58TDbPtoeHqgIe5rTQFn0Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzC964mCqz1R0p for ; Sun, 25 Jan 2026 00:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fe1f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 00:24:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 2079e5864f20 - stable/15 - x86: mask all LAPIC vectors early, before BSP interrupts are enabled List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2079e5864f204c552b82b63809e1b39b13ccfd3c Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 00:24:42 +0000 Message-Id: <697562ca.3fe1f.4c16d866@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2079e5864f204c552b82b63809e1b39b13ccfd3c commit 2079e5864f204c552b82b63809e1b39b13ccfd3c Author: Konstantin Belousov AuthorDate: 2025-12-09 02:18:21 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-25 00:23:34 +0000 x86: mask all LAPIC vectors early, before BSP interrupts are enabled (cherry picked from commit 11f954b021a1aadde1d03d40ed5d6b529e14da98) --- sys/x86/x86/local_apic.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index aecad4cbd463..053d9814c14c 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -428,6 +428,7 @@ lapic_is_x2apic(void) (APICBASE_X2APIC | APICBASE_ENABLED)); } +static void lapic_early_mask_vecs(void); static void lapic_enable(void); static void lapic_resume(struct pic *pic, bool suspend_cancelled); static void lapic_timer_oneshot(struct lapic *); @@ -553,6 +554,7 @@ lapic_init(vm_paddr_t addr) /* Perform basic initialization of the BSP's local APIC. */ lapic_enable(); + lapic_early_mask_vecs(); /* Set BSP's per-CPU local APIC ID. */ PCPU_SET(apic_id, lapic_id()); @@ -791,6 +793,32 @@ lapic_xapic_mode(void) intr_restore(saveintr); } +static void +lapic_early_mask_vec(const struct lvt *l) +{ + uint32_t v; + + if (l->lvt_masked != 0) { + v = lapic_read32(l->lvt_reg); + v |= APIC_LVT_M; + lapic_write32(l->lvt_reg, v); + } +} + +/* Done on BSP only */ +static void +lapic_early_mask_vecs(void) +{ + int elvt_count, i; + + for (i = 0; i < APIC_LVT_MAX; i++) + lapic_early_mask_vec(&lvts[i]); + + elvt_count = amd_read_elvt_count(); + for (i = 0; i < elvt_count; i++) + lapic_early_mask_vec(&elvts[i]); +} + void lapic_setup(int boot) { From nobody Sun Jan 25 00:24:43 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzC981QG6z6Pttc for ; Sun, 25 Jan 2026 00:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzC976DtGz3cvd for ; Sun, 25 Jan 2026 00:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c/B3h/uQIkzXwelw1IvOwOK7+xyQE1lCsdTMPoC/+aw=; b=FjEvaMK9a60yt8f8Ad5ywlmPZQ+LX5gK6c+rSVGKO5q+OVMhsrCV122bn7Q0TWVAfOjaRZ 27rbZsRiqekcnV+Ir4m7SYbcxpzJnS2s49/c8y2kXuZjl6+tXmUj0CmpJb7m+PIpkT0wzx YTu5+bdhAOQF1ir/A6O48tdscrETjQLemSNRzJsl8vcXcQCcl2g/IIVz4XXzjrJApwExyI ErDZcZluaH/5Uk/wvzGphkrG2QMdynqD7lBmfOkxcILW0wobEsE8HzPW15tOzdUsuW3nNd DBwHMlrChLINsdz7Slw3v8ipO2MSBnBxuqCAhw2mb5w4Qt6/cFzCEh7Hjdmw1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c/B3h/uQIkzXwelw1IvOwOK7+xyQE1lCsdTMPoC/+aw=; b=r+nwUC2jla4dxZvpORFNE1RPNloq4UXEt4juYJHiDWqjlyOR9ewuOkb0RetLreUTA5Z007 QFB+9RJXwqwVkY9za1cu+tSKK5PbKgbwlY8qCg8iM4rDmn+0S+h80CUXO3cdh31gAFSyW8 edPiaDQ0IJ+lmVDBIRhNXpScW9Ulc7ce4+YbXA1FAntpa3a09RppXVlI6j/MOz/e7PmH5g C6yNy0nkLFhnPznvWZTxNtakVIcST7/OUjEOuZS4AxLJ3IQ/NxSyHmH30RYVNZGdlIPx5x 3j9l7MROb8cOpytPFP2ee2xjQPnQTVuLGhmlib005joLkbpoHNUvHyBi6j+pHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769300683; a=rsa-sha256; cv=none; b=TaCb6pBfB3LmTnzgO5qqnfGBpu/LeSa93UFloYHF+xQmyW1AsL/cMcy8ajmLvyXRS+FpEk 1tIq8g88StKVfz2/VWI42tYgZhE0WV8ONy0MwstuaKTtDPeYMByqYyfXv2+ZkEHZI/TAdc QvTMApFt9Fz8DLo2LjK5q1gcE+L4dwIHeKmE5w5EOeoyWMQSO71X9ajTLOnlZMR3JiAlRJ gyUFtGNlFnvT2zZpvfeQI6M35RKAspnTTTLT0UgTZnavkNmNvudvVqM6Z5GGo+h2aM6Zfx 3nJm7sV0XcOHYVWi5mc2ZSFjJedKpFyJhnRtpc5uJFn2XtBgHipQ1p4m3hMu9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzC975XWJz1QTH for ; Sun, 25 Jan 2026 00:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 863f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 00:24:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 9286d8fe2873 - stable/15 - x86/local_apic.c: add lapic_maxlvt() helper List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9286d8fe28732034f039fc26381ddb964d8a393f Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 00:24:43 +0000 Message-Id: <697562cb.863f.475275e@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9286d8fe28732034f039fc26381ddb964d8a393f commit 9286d8fe28732034f039fc26381ddb964d8a393f Author: Konstantin Belousov AuthorDate: 2026-01-19 12:50:09 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-25 00:23:34 +0000 x86/local_apic.c: add lapic_maxlvt() helper (cherry picked from commit ad5e3cb950344f9822dbbd90f5ac7c256f97fa4c) --- sys/x86/x86/local_apic.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 053d9814c14c..68f42c9eed0b 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -314,6 +314,16 @@ SYSCTL_INT(_hw_apic, OID_AUTO, ds_idle_timeout, CTLFLAG_RWTUN, static void lapic_calibrate_initcount(struct lapic *la); +/* + * Calculate the max index of the present LVT entry from the value of + * the LAPIC version register. + */ +static int +lapic_maxlvt(uint32_t version) +{ + return ((version & APIC_VER_MAXLVT) >> MAXLVTSHIFT); +} + /* * Use __nosanitizethread to exempt the LAPIC I/O accessors from KCSan * instrumentation. Otherwise, if x2APIC is not available, use of the global @@ -753,7 +763,7 @@ lapic_dump(const char* str) int i; version = lapic_read32(LAPIC_VERSION); - maxlvt = (version & APIC_VER_MAXLVT) >> MAXLVTSHIFT; + maxlvt = lapic_maxlvt(version); printf("cpu%d %s:\n", PCPU_GET(cpuid), str); printf(" ID: 0x%08x VER: 0x%08x LDR: 0x%08x DFR: 0x%08x", lapic_read32(LAPIC_ID), version, @@ -834,7 +844,7 @@ lapic_setup(int boot) la = &lapics[lapic_id()]; KASSERT(la->la_present, ("missing APIC structure")); version = lapic_read32(LAPIC_VERSION); - maxlvt = (version & APIC_VER_MAXLVT) >> MAXLVTSHIFT; + maxlvt = lapic_maxlvt(version); /* Initialize the TPR to allow all interrupts. */ lapic_set_tpr(0); @@ -990,7 +1000,7 @@ lapic_enable_pcint(void) #endif /* Fail if the PMC LVT is not present. */ - maxlvt = (lapic_read32(LAPIC_VERSION) & APIC_VER_MAXLVT) >> MAXLVTSHIFT; + maxlvt = lapic_maxlvt(lapic_read32(LAPIC_VERSION)); if (maxlvt < APIC_LVT_PMC) return (0); if (refcount_acquire(&pcint_refcnt) > 0) @@ -1014,7 +1024,7 @@ lapic_disable_pcint(void) #endif /* Fail if the PMC LVT is not present. */ - maxlvt = (lapic_read32(LAPIC_VERSION) & APIC_VER_MAXLVT) >> MAXLVTSHIFT; + maxlvt = lapic_maxlvt(lapic_read32(LAPIC_VERSION)); if (maxlvt < APIC_LVT_PMC) return; if (!refcount_release(&pcint_refcnt)) @@ -1883,7 +1893,7 @@ DB_SHOW_COMMAND_FLAGS(lapic, db_show_lapic, DB_CMD_MEMSAFE) v = lapic_read32(LAPIC_VERSION); db_printf("version = %d.%d\n", (v & APIC_VER_VERSION) >> 4, v & 0xf); - db_printf("max LVT = %d\n", (v & APIC_VER_MAXLVT) >> MAXLVTSHIFT); + db_printf("max LVT = %d\n", lapic_maxlvt(v)); v = lapic_read32(LAPIC_SVR); db_printf("SVR = %02x (%s)\n", v & APIC_SVR_VECTOR, v & APIC_SVR_ENABLE ? "enabled" : "disabled"); From nobody Sun Jan 25 00:24:44 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzC9938Zkz6Pttf for ; Sun, 25 Jan 2026 00: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzC990blNz3cpy for ; Sun, 25 Jan 2026 00:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZRoyBE/gAE9AI0anoItBshyFGOG2uScfJCouDLJ9mFw=; b=oiqLMeTQOh76kUc4+o48KTphyUwtfPX3XB9qlc+c/OwgSHJ6vDzCmnI1oMUZE/iCljn0pf 3Tl2OEE+HGt3C27Xy/6c6nY5g49NmXmvK7fM7bR4pt1IyaqPrHzqrRtuAf4WPuNpUBvttC nImbNuq9YfTzsToPTN/ksGV5zRivT9meun1VCUQJQG0pV7XhvHJPhMfWM8LzTTuBVD0b8T +tOWLkmY/baLUVC/sB1CSVV3HG0Qe7jEoZfh7GCe497+rMSD1wbZt2yVMO3Uet/0HTb0VW opfe47etdCAfnpjIOQzI4gkUUntOErdoJ6o4RB9CIFf0CBfJQWp7AYRZUG0iDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZRoyBE/gAE9AI0anoItBshyFGOG2uScfJCouDLJ9mFw=; b=Wfz/AKVPQ1duy38oYCdgqeanOjUMYN4NYhNeHdBJZnx7y3tB5dt4TLBOwqv7Pdc0IGYZkq OwzEjhA2U1Ss1WKmflH94t8cNT8JaGad/aOcG4/ojLhjlwa9OBKu2Zs4bZud07HTf+UwKt xQBj5IGejPWdBrdY2uw7ybwcpv78/N6GhvUh4m6a9lQuWKsGdsjTquG821ZamLB5znT+1d JD9YeHagfqREifIU1N2GmzQWxZK4wxCizLNgBswbLPX0V4qN3sznX5dmlBNTENz7Zs684w jUAtCACdPPsaJYHsHbTh/3VCGyAX7S0YOc63BJ7wmz6jfeYmaqgagfM6+Fvz5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769300685; a=rsa-sha256; cv=none; b=e+dSl0Y6dzme3aaHkdX4YNnHaZ+dK7Gea6Bd4WwciM++J52YsD4MTwUwfNusVPwgcxMOJg f74kyRarmHQ9WCBG7SGzX0+BI7PBVD9n3v/3CQ7sI6Lp+obxEPAOApqE429P2UO/4wkxVQ pVJrXs/MaxLNqFMn+qbjvige0evCE7jczRaXK2CzOtgjLxJ1C2U38QutyYSEup3C1BsHsf pA1mXPWvftqZiiVWDM99zYAeNHP5BJ5dTcG2JIOdVuKq4mrnrURxbEsUqn9Cr5iqcdnfIE /yI6J71b2jpjr6efn6qCnxLgheHa+f7ShKxnax4XjIig2jyUyktiLtoE640RPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzC986PKSz1QjG for ; Sun, 25 Jan 2026 00:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8559 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 00:24:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7d327e4ce6e0 - stable/15 - x86/local_apic.c: Properly calculate the number of LVT entries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7d327e4ce6e0e62ad7be87527d565bdb93ef92dc Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 00:24:44 +0000 Message-Id: <697562cc.8559.58d7c502@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7d327e4ce6e0e62ad7be87527d565bdb93ef92dc commit 7d327e4ce6e0e62ad7be87527d565bdb93ef92dc Author: Konstantin Belousov AuthorDate: 2026-01-19 11:55:36 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-25 00:23:34 +0000 x86/local_apic.c: Properly calculate the number of LVT entries (cherry picked from commit 709a53c8b20b5770f7e2f117d4799b5617479976) --- sys/x86/include/apicreg.h | 7 ++++++- sys/x86/x86/local_apic.c | 7 +++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/x86/include/apicreg.h b/sys/x86/include/apicreg.h index 1252647fbab3..4cc9cabdad9e 100644 --- a/sys/x86/include/apicreg.h +++ b/sys/x86/include/apicreg.h @@ -439,7 +439,12 @@ typedef struct IOAPIC ioapic_t; #define APIC_EXTF_SEIO_CAP 0x00000002 #define APIC_EXTF_IER_CAP 0x00000001 -/* LVT table indices */ +/* + * LVT table indices. + * Must be ordered following the appearance of the LVT entries in + * series the LAPIC versions, which is reported by LAPIC_VERSION + * MAXLVT field. + */ #define APIC_LVT_LINT0 0 #define APIC_LVT_LINT1 1 #define APIC_LVT_TIMER 2 diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 68f42c9eed0b..b444142d5481 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -819,9 +819,12 @@ lapic_early_mask_vec(const struct lvt *l) static void lapic_early_mask_vecs(void) { - int elvt_count, i; + int elvt_count, lvts_count, i; + uint32_t version; - for (i = 0; i < APIC_LVT_MAX; i++) + version = lapic_read32(LAPIC_VERSION); + lvts_count = min(nitems(lvts), lapic_maxlvt(version) + 1); + for (i = 0; i < lvts_count; i++) lapic_early_mask_vec(&lvts[i]); elvt_count = amd_read_elvt_count(); From nobody Sun Jan 25 00:24:40 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzC9B0m5pz6PtsN for ; Sun, 25 Jan 2026 00:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzC994NBYz3cy1 for ; Sun, 25 Jan 2026 00:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eu6jbH5LUfE7eda7e8oQS+PUdmm2vB0M9Li83zYAa+k=; b=VqC/1CMr00gijG3a+mcZ7FLife8SJQOLnizj10ScSzsErOBsPQ1b4jvZ8BRE5f9nyGOmCK aC/4JO+GTBSFGZIHw4l7/1cKtoA7lVyjDRIytycyxcfnLYYemcYkZgQcqHxPtUk5UMTent 3ereItmmW8HBC1YARfxyXHxbLe73Qc2NtiqqebcTJ1i2O99KHWS+4bf6Nwdg4xuj4A3Isi T1SUywBny/iNzDRIr8nrR98n3oz+PCZByaFRLRjsnqzjH3bslprONn5ejfAwvdaPTvePrZ uYv4kIizOqz7oEbUih8IaES0p2Izf+0XsEJGblKI77gY402/NIFn6kmMgEOeag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eu6jbH5LUfE7eda7e8oQS+PUdmm2vB0M9Li83zYAa+k=; b=TWCUpVeFc5lJXkdFGmAkSEP9rduz35Yfg9iIwdreepydDHQm7HN6tXKGiU0MIDfOom8sDl Wv953gGrAihtdhXe12L+tiRC+4EU4PA5m9z1THDeEkFiuKCENmSbQ57m5UNv0rUVjKv5ZE RiHW0Vuz3TciRy0HXCzoLz2Utkh7KaLVnOAof744Bs6j1Ju7l3pTTf46iKcfNWfeHe720q jc88uxpnuY/3IX9/HWv5gASK5P3RYCvKIn+sv8eJChzl4JdCgffCUL0gppcR/UDmqjRi4Q sRaXmyktqsNIEvFOKVZNb/j154TbHBsuTnvWbqMYYDeAhr4jYeYsUlbhTyG8qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769300685; a=rsa-sha256; cv=none; b=iimBDA8U37uYIzkMNdXCvC2S1E+ASwl5kUOEhXrHUaJWrtk4PmhRryzTE0CWVW/8fBvq06 V7Rz38yBgk7EYx6yTa3OpXjyVOfqfF9gQP9yBcD2l3wZ3S5MfKx3OXD8AVTuspPX09wfUf nsziQ3CsF856nJCDRq/nIn26CaJOvdl7qw9QmUJGHMeeA9oZVgs+KSnP5PfEoo0EFbEx46 nYbUvH4KJeKyke/iYhV4NS54VFOto2eiQ7OQ4KRiuXnoyXykpXV+B4RZ8lOJcSVjL5yYdK PHc4ZHtT/UYI1JPdghQuilCXDwS3v2JWeFB+FToPdIWDBgkpq9vWhsSkrXom+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzC993MJ7z1QxN for ; Sun, 25 Jan 2026 00:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3df7e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 00:24:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7c59e09a0df4 - stable/15 - x86/local_apic.c: convert lvts[] and elvts[] arrays to designated initializers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7c59e09a0df45581b28d5e99ea41c33aeede7f80 Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 00:24:40 +0000 Message-Id: <697562c8.3df7e.15c5bcbe@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7c59e09a0df45581b28d5e99ea41c33aeede7f80 commit 7c59e09a0df45581b28d5e99ea41c33aeede7f80 Author: Konstantin Belousov AuthorDate: 2025-12-09 01:52:04 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-25 00:23:34 +0000 x86/local_apic.c: convert lvts[] and elvts[] arrays to designated initializers (cherry picked from commit 4938ee8064868f120413405f1b3aa40344a6fabd) --- sys/x86/x86/local_apic.c | 105 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 92 insertions(+), 13 deletions(-) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index c1c9029531f5..606c551ed921 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -147,22 +147,101 @@ struct lapic { } static *lapics; /* Global defaults for local APIC LVT entries. */ -static struct lvt lvts[APIC_LVT_MAX + 1] = { - { 1, 1, 1, 1, APIC_LVT_DM_EXTINT, 0 }, /* LINT0: masked ExtINT */ - { 1, 1, 0, 1, APIC_LVT_DM_NMI, 0 }, /* LINT1: NMI */ - { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_TIMER_INT }, /* Timer */ - { 1, 1, 0, 1, APIC_LVT_DM_FIXED, APIC_ERROR_INT }, /* Error */ - { 1, 1, 1, 1, APIC_LVT_DM_NMI, 0 }, /* PMC */ - { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_THERMAL_INT }, /* Thermal */ - { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_CMC_INT }, /* CMCI */ +static struct lvt lvts[] = { + /* LINT0: masked ExtINT */ + [APIC_LVT_LINT0] = { + .lvt_edgetrigger = 1, + .lvt_activehi = 1, + .lvt_masked = 1, + .lvt_active = 1, + .lvt_mode = APIC_LVT_DM_EXTINT, + .lvt_vector = 0, + }, + /* LINT1: NMI */ + [APIC_LVT_LINT1] = { + .lvt_edgetrigger = 1, + .lvt_activehi = 1, + .lvt_masked = 0, + .lvt_active = 1, + .lvt_mode = APIC_LVT_DM_NMI, + .lvt_vector = 0, + }, + [APIC_LVT_TIMER] = { + .lvt_edgetrigger = 1, + .lvt_activehi = 1, + .lvt_masked = 1, + .lvt_active = 1, + .lvt_mode = APIC_LVT_DM_FIXED, + .lvt_vector = APIC_TIMER_INT, + }, + [APIC_LVT_ERROR] = { + .lvt_edgetrigger = 1, + .lvt_activehi = 1, + .lvt_masked = 0, + .lvt_active = 1, + .lvt_mode = APIC_LVT_DM_FIXED, + .lvt_vector = APIC_ERROR_INT, + }, + [APIC_LVT_PMC] = { + .lvt_edgetrigger = 1, + .lvt_activehi = 1, + .lvt_masked = 1, + .lvt_active = 1, + .lvt_mode = APIC_LVT_DM_NMI, + .lvt_vector = 0, + }, + [APIC_LVT_THERMAL] = { + .lvt_edgetrigger = 1, + .lvt_activehi = 1, + .lvt_masked = 1, + .lvt_active = 1, + .lvt_mode = APIC_LVT_DM_FIXED, + .lvt_vector = APIC_THERMAL_INT, + }, + [APIC_LVT_CMCI] = { + .lvt_edgetrigger = 1, + .lvt_activehi = 1, + .lvt_masked = 1, + .lvt_active = 1, + .lvt_mode = APIC_LVT_DM_FIXED, + .lvt_vector = APIC_CMC_INT, + }, }; /* Global defaults for AMD local APIC ELVT entries. */ -static struct lvt elvts[APIC_ELVT_MAX + 1] = { - { 1, 1, 1, 0, APIC_LVT_DM_FIXED, 0 }, - { 1, 1, 1, 0, APIC_LVT_DM_FIXED, APIC_CMC_INT }, - { 1, 1, 1, 0, APIC_LVT_DM_FIXED, 0 }, - { 1, 1, 1, 0, APIC_LVT_DM_FIXED, 0 }, +static struct lvt elvts[] = { + [APIC_ELVT_IBS] = { + .lvt_edgetrigger = 1, + .lvt_activehi = 1, + .lvt_masked = 1, + .lvt_active = 0, + .lvt_mode = APIC_LVT_DM_FIXED, + .lvt_vector = 0, + }, + [APIC_ELVT_MCA] = { + .lvt_edgetrigger = 1, + .lvt_activehi = 1, + .lvt_masked = 1, + .lvt_active = 0, + .lvt_mode = APIC_LVT_DM_FIXED, + .lvt_vector = APIC_CMC_INT, + }, + [APIC_ELVT_DEI] = { + .lvt_edgetrigger = 1, + .lvt_activehi = 1, + .lvt_masked = 1, + .lvt_active = 0, + .lvt_mode = APIC_LVT_DM_FIXED, + .lvt_vector = 0, + }, + [APIC_ELVT_SBI] = { + .lvt_edgetrigger = 1, + .lvt_activehi = 1, + .lvt_masked = 1, + .lvt_active = 0, + .lvt_mode = APIC_LVT_DM_FIXED, + .lvt_vector = 0, + }, }; static inthand_t *ioint_handlers[] = { From nobody Sun Jan 25 00:24:45 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzC9B5bBFz6Ptcj for ; Sun, 25 Jan 2026 00:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzC9B11Fvz3cy9 for ; Sun, 25 Jan 2026 00:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sOiO+qZFGJjMPINxgSkVIlB0QLL6YynYdtFI52elrLo=; b=e9tsS4pljzcR3VABv7m0J+RxwHBxcifLCdzkcANCU2PlG6Cqnm7GIGH5kKxlm5jpVQu8al S0RvP6JyXIkKilyo+EpetjYT49spgSzsdxnFnpAEiry0cssohLJYImxfB5ZVO4yNdogyFX d4+o8s1KL3TXoMPHgiOiFAqWl7J1jbA+4CxJNcfGg1pdZ91MzyIMP1+bmpywrjuB83ljhb Cmvk2iOvJWneHGEclUJt4FRcP1rxQ3VJoWQtKCiKqg8+5MRNXAEJzS2caqut/g0NIAWmuj ouLKtdsLvwzl1ENEj2FW9chEnaQqIuUc3PoxE3XJgOWv+bMMpbjDxT4n6gKvRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sOiO+qZFGJjMPINxgSkVIlB0QLL6YynYdtFI52elrLo=; b=oQ1e/n2B+Yq+kplsYj6V6ZbDodjKe07zxk8xKRzhZBVOZNm+uaj+zQttxsDRTQiF2EydB3 1Hr62zFxKBspAIY/blYBWiJMTX0k7t/3xMD8HLt7Wzm5Du3kLchIuhaky435o54oRJ7DxH 6k+aluuGVImGwlBWWcH3EMD9xZuhub/MCRf6Su6CcksSx3/thew0S8m268gw2bgTE7wAnL a/oRmu7GhjLiYba5+Q+w+GcxWwWoBjJP0o/Nj4cXOKnwxr8wwW6VeMnOGgA45nVj9sZmQb cZuQ1ZDWF/d7WgEEb9U1PbInbupmmNbMnPEV7xmAijeecFSu/odFAP+HSxsJwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769300686; a=rsa-sha256; cv=none; b=s13qWNYgIQpfCAOCTJmTq7ids9QPxRnU+ElmTtesgwfVO4e0D0h2iyQdBu1CsK02/eVf8Q G9jsdtJExRYu9LfhEn49pe8BFQoH8Ppw/f1oM7epNnPIvOPMkFH3X9ErzCawa0NDCXyzfi dSH5dygZ2xQZLhU7dVlQ5D7XZ+Doea7MGY70HieOSJwpbyRlzdLBX3YdJuoekyEPBZ8LL0 LRmxYtSg+jZj3wht0QYFSP+o74XkmwAWI0JuEbbznopa35TO/EungK9wP+hirt0uLW/lLW tQKler2FET4TkaDUf8g3x7JhubGoS/nBiS34Vn3dTl/KJV1C4uaXw60/iVYDrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzC9975FXz1QTJ for ; Sun, 25 Jan 2026 00:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ff88 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 00:24:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 854e0e480378 - stable/15 - x86 lapic: Dump LVTs from the ddb show lapic command List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 854e0e4803789c669edeff7c31e1ed4fd66e64b7 Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 00:24:45 +0000 Message-Id: <697562cd.3ff88.5a51a2bb@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=854e0e4803789c669edeff7c31e1ed4fd66e64b7 commit 854e0e4803789c669edeff7c31e1ed4fd66e64b7 Author: Konstantin Belousov AuthorDate: 2026-01-22 18:00:56 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-25 00:23:35 +0000 x86 lapic: Dump LVTs from the ddb show lapic command (cherry picked from commit dfc4186c6dcf2986b510fac108784011a236554d) --- sys/x86/x86/local_apic.c | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index b444142d5481..c5399984c896 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -129,6 +129,7 @@ struct lvt { u_int lvt_mode:16; u_int lvt_vector:8; u_int lvt_reg; + const char *lvt_desc; }; struct lapic { @@ -158,6 +159,7 @@ static struct lvt lvts[] = { .lvt_mode = APIC_LVT_DM_EXTINT, .lvt_vector = 0, .lvt_reg = LAPIC_LVT_LINT0, + .lvt_desc = "LINT0", }, /* LINT1: NMI */ [APIC_LVT_LINT1] = { @@ -168,6 +170,7 @@ static struct lvt lvts[] = { .lvt_mode = APIC_LVT_DM_NMI, .lvt_vector = 0, .lvt_reg = LAPIC_LVT_LINT1, + .lvt_desc = "LINT1", }, [APIC_LVT_TIMER] = { .lvt_edgetrigger = 1, @@ -177,6 +180,7 @@ static struct lvt lvts[] = { .lvt_mode = APIC_LVT_DM_FIXED, .lvt_vector = APIC_TIMER_INT, .lvt_reg = LAPIC_LVT_TIMER, + .lvt_desc = "TIMER", }, [APIC_LVT_ERROR] = { .lvt_edgetrigger = 1, @@ -186,6 +190,7 @@ static struct lvt lvts[] = { .lvt_mode = APIC_LVT_DM_FIXED, .lvt_vector = APIC_ERROR_INT, .lvt_reg = LAPIC_LVT_ERROR, + .lvt_desc = "ERROR", }, [APIC_LVT_PMC] = { .lvt_edgetrigger = 1, @@ -195,6 +200,7 @@ static struct lvt lvts[] = { .lvt_mode = APIC_LVT_DM_NMI, .lvt_vector = 0, .lvt_reg = LAPIC_LVT_PCINT, + .lvt_desc = "PMC", }, [APIC_LVT_THERMAL] = { .lvt_edgetrigger = 1, @@ -204,6 +210,7 @@ static struct lvt lvts[] = { .lvt_mode = APIC_LVT_DM_FIXED, .lvt_vector = APIC_THERMAL_INT, .lvt_reg = LAPIC_LVT_THERMAL, + .lvt_desc = "THERM", }, [APIC_LVT_CMCI] = { .lvt_edgetrigger = 1, @@ -213,6 +220,7 @@ static struct lvt lvts[] = { .lvt_mode = APIC_LVT_DM_FIXED, .lvt_vector = APIC_CMC_INT, .lvt_reg = LAPIC_LVT_CMCI, + .lvt_desc = "CMCI", }, }; @@ -226,6 +234,7 @@ static struct lvt elvts[] = { .lvt_mode = APIC_LVT_DM_FIXED, .lvt_vector = 0, .lvt_reg = LAPIC_EXT_LVT0, + .lvt_desc = "ELVT0", }, [APIC_ELVT_MCA] = { .lvt_edgetrigger = 1, @@ -235,6 +244,7 @@ static struct lvt elvts[] = { .lvt_mode = APIC_LVT_DM_FIXED, .lvt_vector = APIC_CMC_INT, .lvt_reg = LAPIC_EXT_LVT1, + .lvt_desc = "MCA", }, [APIC_ELVT_DEI] = { .lvt_edgetrigger = 1, @@ -244,6 +254,7 @@ static struct lvt elvts[] = { .lvt_mode = APIC_LVT_DM_FIXED, .lvt_vector = 0, .lvt_reg = LAPIC_EXT_LVT2, + .lvt_desc = "ELVT2", }, [APIC_ELVT_SBI] = { .lvt_edgetrigger = 1, @@ -253,6 +264,7 @@ static struct lvt elvts[] = { .lvt_mode = APIC_LVT_DM_FIXED, .lvt_vector = 0, .lvt_reg = LAPIC_EXT_LVT3, + .lvt_desc = "ELVT3", }, }; @@ -1890,18 +1902,34 @@ dump_mask(const char *prefix, uint32_t v, int base) /* Show info from the lapic regs for this CPU. */ DB_SHOW_COMMAND_FLAGS(lapic, db_show_lapic, DB_CMD_MEMSAFE) { - uint32_t v; + const struct lvt *l; + int elvt_count, lvts_count, i; + uint32_t v, vr; db_printf("lapic ID = %d\n", lapic_id()); v = lapic_read32(LAPIC_VERSION); - db_printf("version = %d.%d\n", (v & APIC_VER_VERSION) >> 4, - v & 0xf); + db_printf("version = %d.%d (%#x) \n", (v & APIC_VER_VERSION) >> 4, + v & 0xf, v); db_printf("max LVT = %d\n", lapic_maxlvt(v)); - v = lapic_read32(LAPIC_SVR); - db_printf("SVR = %02x (%s)\n", v & APIC_SVR_VECTOR, - v & APIC_SVR_ENABLE ? "enabled" : "disabled"); + vr = lapic_read32(LAPIC_SVR); + db_printf("SVR = %02x (%s)\n", vr & APIC_SVR_VECTOR, + vr & APIC_SVR_ENABLE ? "enabled" : "disabled"); db_printf("TPR = %02x\n", lapic_read32(LAPIC_TPR)); + lvts_count = min(nitems(lvts), lapic_maxlvt(v) + 1); + for (i = 0; i < lvts_count; i++) { + l = &lvts[i]; + db_printf("LVT%d (reg %#x %-5s) = %#010x\n", i, l->lvt_reg, + l->lvt_desc, lapic_read32(l->lvt_reg)); + } + + elvt_count = amd_read_elvt_count(); + for (i = 0; i < elvt_count; i++) { + l = &elvts[i]; + db_printf("ELVT%d (reg %#x %-5s) = %#010x\n", i, l->lvt_reg, + l->lvt_desc, lapic_read32(l->lvt_reg)); + } + #define dump_field(prefix, regn, index) \ dump_mask(__XSTRING(prefix ## index), \ lapic_read32(LAPIC_ ## regn ## index), \ From nobody Sun Jan 25 00:24:48 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzC9D3cN7z6PtsX for ; Sun, 25 Jan 2026 00:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzC9D1h9pz3cw8 for ; Sun, 25 Jan 2026 00:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vEuvFrusE6jU32Gx32MK1GpHgdviNOhAwtR6+Pr1gMU=; b=mBxu0maG+I0utfsWw0v5NrXMaJb1xSnIdycs1W5rSI35tVI/R1VdJLWDr4GGLCD+XB1FiQ dCZuIaG59LOrmG280YBdfBAqT5qeLQvQOxydGJ6gQXq34/rMeGuHy3fho8o2LB+MaCAyjJ p4VyJZlefTVkTJsPIJx4V5DmzvIZ8thzCjgYYIp0NyZpuBjVCS0kB+3bYmZ7+u3dKKmbgA pCb7W5lxZVDMOlJkxmVbNCho8FdP44au3CfjO0i6Htoe0ZyS1+H2TSumlMjz2z46qAcBsj uiXl8FFCDOuMi2vnXe0tfQ+v9eAmgoWj+CdkGvuwwDPVeX1SwhLNq27JjTLKrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vEuvFrusE6jU32Gx32MK1GpHgdviNOhAwtR6+Pr1gMU=; b=c1J30RvjHonY/uIrKF+KpiZn6v5klS1C7UWLiQi8QkJrcy+pmf5byEQil1gd/pN1N55xI+ r+j2uxMAd9LJJpvBTw1NVQOs0jUKELQYtia+OPnXn3TaJHy5mJ9yqxmhZPR4mmEsMGLGHl FCvNpQfRUQYfapwVb3vmecsfzeO7H2go9HdDht2NjkixWWEKsvLesnlshC34utjF3s8teC wYchb7yWWHbNP+7GIolGpjqf3p3E3KNL4DRtlFPzVmuTa6u3/gB5xk7ojO4ugTQg3jV3Lz GMjT+qebseOxbgI20LqOq24UHtHB9mSX/25JCMbJrhPcLJazVqIBON+sp6vttQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769300688; a=rsa-sha256; cv=none; b=jhLDgDnA3MQ6kxtoN3R2SfXVa3K3fLRDZrWTep00MDlmpma31mS6i6btLgN10+Lw/mR0OI 4rGwx2j0EbWKtLc07THO8dAnIYz150WpNGSBU2RtlAvlqfv95T2sSCDsdWgqFU1MoO1jTY VnTa8TBRyuQsSbUT8KnzZWNnRLs45wOKHhgRlA1Pwu8iAb3HpPxhB+eLeBIPNB29f4STjQ yryXZwnXMZtmFV8izK7A2F5JaoBZ7hbgJ2YW84F1FONoVlx9t5Fe9UYoSR/6D71rLCPqve eR3IK/1WRweXRq4PnRkHqmGZcGJ1x4w2zOt+p7JRcyMlp68H/tacLIrvOxpAYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzC9D17TXz1R0r for ; Sun, 25 Jan 2026 00:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 855d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 00:24:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c4522efca63f - stable/15 - libthr/thread/thr_join.c: deduplicate backout_join() helper List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c4522efca63f6b72a7d7083998f8482feaab83a6 Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 00:24:48 +0000 Message-Id: <697562d0.855d.6b2e2a3f@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c4522efca63f6b72a7d7083998f8482feaab83a6 commit c4522efca63f6b72a7d7083998f8482feaab83a6 Author: Konstantin Belousov AuthorDate: 2026-01-18 12:23:14 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-25 00:23:35 +0000 libthr/thread/thr_join.c: deduplicate backout_join() helper (cherry picked from commit ce16be73707eedc798b26e0741dcd70d1168ac10) --- lib/libthr/thread/thr_join.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/libthr/thread/thr_join.c b/lib/libthr/thread/thr_join.c index 53f28daa258d..56b316ec0f51 100644 --- a/lib/libthr/thread/thr_join.c +++ b/lib/libthr/thread/thr_join.c @@ -43,16 +43,23 @@ __weak_reference(_thr_join, _pthread_join); __weak_reference(_pthread_timedjoin_np, pthread_timedjoin_np); __weak_reference(_pthread_peekjoin_np, pthread_peekjoin_np); -static void backout_join(void *arg) +static void +backout_join(struct pthread *pthread, struct pthread *curthread) { - struct pthread *pthread = (struct pthread *)arg; - struct pthread *curthread = _get_curthread(); - THR_THREAD_LOCK(curthread, pthread); pthread->joiner = NULL; THR_THREAD_UNLOCK(curthread, pthread); } +static void +backout_join_pop(void *arg) +{ + struct pthread *pthread = (struct pthread *)arg; + struct pthread *curthread = _get_curthread(); + + backout_join(pthread, curthread); +} + int _thr_join(pthread_t pthread, void **thread_return) { @@ -149,10 +156,8 @@ join_common(pthread_t pthread, void **thread_return, _thr_cancel_leave(curthread, 0); THR_CLEANUP_POP(curthread, 0); - if (ret == ETIMEDOUT) { - THR_THREAD_LOCK(curthread, pthread); - pthread->joiner = NULL; - THR_THREAD_UNLOCK(curthread, pthread); + if (ret == ETIMEDOUT || ret == EBUSY) { + backout_join(pthread, curthread); } else { ret = 0; tmp = pthread->ret; From nobody Sun Jan 25 00:24:47 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzC9C3WLDz6PtsS for ; Sun, 25 Jan 2026 00:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzC9C0txvz3d1V for ; Sun, 25 Jan 2026 00:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iNt+IyyXhBEEJLC6UpAIGyk3Kj10cNxJ2hL6uQozEEg=; b=ugy9D5kyjhTRauORrJxgzIr0DpNZ3yfmbyboQOH1FLvG2knRPg47LiNyfVfjFBTfuv/+J1 VIvxHPbeLmR6+EqQGWZInZDymkqiqj00MIhWpY2FHhseX8aw/jQUXEJHz/jVBbZSOEzeZ2 klqgRWaptaEIjj3CxtP0BoK3hNEbGohpSRHm4SkRM5p8SnpvXMo3OcTH9XjZHDgdemwKHk 8OwSa/qAuf48QmVXm0/syejazlFu41stICcFUT77sM1YH9X/0oBpRqjFL1Hfu3VBJ8nH1Y tVIfeucUyBtABJ2HnBGr9LBZDsr/nnW9EIyYYEF2xqGVteilT38pm/0BT/Q1Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iNt+IyyXhBEEJLC6UpAIGyk3Kj10cNxJ2hL6uQozEEg=; b=T1fhGzbGDlxKwZINbXS5HRGn0kHabCHfMp115Q/2N1BeXtgO4e/3Hs0KLVeNuS/TqNY9Gg gmEPq4RDAsCDZd3nVf7j/LafnPVnzSD3LyQqoDirpZjlog64fyjYEFlSuoftT9VNbG8BTb GSJ4tr/RIIh/33HUIQXI+S+X8fklzXjVWgmnvlQdPn+3DlAk6DKXQqIMeK9hnxABOZS7kd kaoKiWtve3bVsAxTY1GWDa+OOCOGY31MUbZV4ImRfB/UdUf3GKBIyQDaA3pOz6FgeqUKX1 LoMuL+E7pADLJKpVvEeKWosrDBo+uvGLgEgYvjfUrU6cB/cDgFwToDTCgD2mQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769300687; a=rsa-sha256; cv=none; b=osGc0dP6HwOiQ/2e+MYgSNrRj80t78Bq+CDPvmQV+qknXWRTML2G5VSRYVIv/nx8BJAzym bFOMS4oxCb+HlRX5mH+SoHzbrUFXI5UdBaT1virD8kclZ0Rt5Xg8pUjbfGMGWKBF4lF2Dj Ox3Sg9TNw7ArRafwfs0qTKfBsq0ni8qAA63D8uhg+APjgDaM6eBnKIY4yeFbVi2syOTiyF ATU7vN8rGc8WWl/XmCGCyQnC15rKKxyET/cT6kNNtjS+guUDiJOCBuDcSOUGap3NwTi+z2 ZF7TTjoZTkzlzTpjQhlyZy6i2B+XZI8KG4DqizmkXPXMy6BAQuIOB9mbuC2vpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzC9C0RpKz1Qfs for ; Sun, 25 Jan 2026 00:24:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8088 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 00:24:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 21dd894a5e0f - stable/15 - sys: do not allow entering vm_fault() on boot until VM is initialized List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 21dd894a5e0ff42f2a7f34ad2fe4e4fc06a00126 Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 00:24:47 +0000 Message-Id: <697562cf.8088.11c51627@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=21dd894a5e0ff42f2a7f34ad2fe4e4fc06a00126 commit 21dd894a5e0ff42f2a7f34ad2fe4e4fc06a00126 Author: Konstantin Belousov AuthorDate: 2026-01-18 21:14:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-25 00:23:35 +0000 sys: do not allow entering vm_fault() on boot until VM is initialized (cherry picked from commit 83d98828867591b5d842573ed6edcec7392f82df) --- sys/amd64/amd64/machdep.c | 5 +---- sys/kern/init_main.c | 12 +++++++++++- sys/vm/vm_init.c | 8 ++++++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 2fce1a7e64b6..cae58181000f 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1518,13 +1518,11 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) /* * We initialize the PCB pointer early so that exception - * handlers will work. Also set up td_critnest to short-cut - * the page fault handler. + * handlers will work. */ cpu_max_ext_state_size = sizeof(struct savefpu); set_top_of_stack_td(&thread0); thread0.td_pcb = get_pcb_td(&thread0); - thread0.td_critnest = 1; /* * The console and kdb should be initialized even earlier than here, @@ -1615,7 +1613,6 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) #ifdef FDT x86_init_fdt(); #endif - thread0.td_critnest = 0; kasan_init(); kmsan_init(); diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 48cc9c1d95c4..4cccb2546a9a 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -104,7 +104,17 @@ void mi_startup(void); /* Should be elsewhere */ static struct session session0; static struct pgrp pgrp0; struct proc proc0; -struct thread0_storage thread0_st __aligned(32); +struct thread0_storage thread0_st __aligned(32) = { + .t0st_thread = { + /* + * thread0.td_pflags is set with TDP_NOFAULTING to + * short-cut the vm page fault handler until it is + * ready. It is cleared in vm_init() after VM + * initialization. + */ + .td_pflags = TDP_NOFAULTING, + }, +}; struct vmspace vmspace0; struct proc *initproc; diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c index a0d3651ba266..2764b438d27b 100644 --- a/sys/vm/vm_init.c +++ b/sys/vm/vm_init.c @@ -159,6 +159,14 @@ vm_mem_init(void *dummy) pmap_init(); vm_pager_init(); + /* + * Now we can properly handle calls into vm_fault() from + * kernel page faults during initialization, typically to + * panic. Clear the nofaulting flag set for thread0 in the + * image, see kern/init_main.c + */ + curthread->td_pflags &= ~TDP_NOFAULTING; + #ifdef INVARIANTS vm_check_pagesizes(); #endif From nobody Sun Jan 25 00:24:50 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzC9G5Jpwz6PtXQ for ; Sun, 25 Jan 2026 00:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzC9G2nMPz3cn2 for ; Sun, 25 Jan 2026 00:24:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lgy/PgdkQ696Qb5oCyfe0W4k6oy7o6o26Pc9xLLIo8k=; b=pBeHnaO2k45U7bXkC19WB5FNAeI/ICpWrr4OegmXpIOVGocF6Z0BSQOvmJJpw/OaItBnK6 43o9fYfUs9ZkDqU6hujAM6DWnxvyZLY+nWuHpbphqRxfND4t64meVs9pA6Ha4V3lwDRsqt qILpfX1H9n6U4joWOoBL78NHvirYDgOGY3tAHHjKnlpglzA7mzNXmcvYMfQLhkUyVeJUY5 tgV09EER4xXtwgjVdJm7yw5JH4TKFttGA+4yMwHJNQMFOuSatoCrMzoXlhuxFfS2kc1+m9 n22LX5IyoeD+5cSuCGFTo0CbJ3IbozjZz/AAJXzeLGHaDkG8Q9JfO/B4a7j/3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lgy/PgdkQ696Qb5oCyfe0W4k6oy7o6o26Pc9xLLIo8k=; b=XKeqMgV6O1k/CT55OlaFzggpSqLV/5BOtW0vU6Dh1kWlSbR46fyq+otjPQI3BjxTviLAVr 03tZeyEchh8isCRhxt92thWoxCvMzjl0QNwXMjIhXnLI3hQRlTXKEBGPvBxjPnoJQYlLef 1DYrRIeZqMSEb03n4KthdruHrr2EB8aQ/hb7H76yRD+bv6L3pOQwxY4GskPujcWUzM1n4I ZBbMlusAL4vQ1ShBM7p8uCaBm/eFAL1dqI4k+M5L+wyCY8GKKkQqccyzz8KzSUVGQVr3e8 S1bEb1cHfYGo6Tov8yCVPO8kpC5Q8BgpMVbd2T4ytsoVVZCMhyVoJzwx7FghYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769300690; a=rsa-sha256; cv=none; b=ffeSxkGaGh2L6J5aLY1eB0n0V7r00QjzWeLRW9t050EyunSbaKXaqklUuCnhFbVgvxIQAj g2L13CC0Y81Oz3u/DyQuQkbpzVXTolSe7Ec6+tPiVYyJGqxvPyEykq1QGls0JIomXkhT2f q4mGRz0HkuwrP7jmcXb8Vn/wDCh8hx6VrCqBIREkIwWSeCXqRnHfId3yaCnhTz3VcuKAcO olpbl3MN3XyIhgICV8fDstwV5LqPjhBARLQXkps4glcsCXdm/FIu9Du59iNmwjS7MDqraI LtGreoQsZUD2/J1NutfE1t4LImcOQfdS6acKyHwTt1Eu7xREDY9NHWmKXrsRqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzC9G2L0Sz1QxQ for ; Sun, 25 Jan 2026 00:24:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3efb6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 00:24:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d1ac644ccc43 - stable/15 - Document pthread_tryjoin_np(3) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d1ac644ccc43148525371d099ebbcb0fe4a471d0 Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 00:24:50 +0000 Message-Id: <697562d2.3efb6.6e1561bc@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d1ac644ccc43148525371d099ebbcb0fe4a471d0 commit d1ac644ccc43148525371d099ebbcb0fe4a471d0 Author: Konstantin Belousov AuthorDate: 2026-01-18 12:53:12 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-25 00:23:35 +0000 Document pthread_tryjoin_np(3) (cherry picked from commit 7f026a58691db1763203ab8c7c8f34f738bfd9d5) --- share/man/man3/Makefile | 3 ++- share/man/man3/pthread_join.3 | 26 +++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index 8e4aadc460a6..cae79b8f8182 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -540,6 +540,7 @@ PTHREAD_MLINKS+=pthread_spin_init.3 pthread_spin_destroy.3 \ PTHREAD_MLINKS+=pthread_testcancel.3 pthread_setcancelstate.3 \ pthread_testcancel.3 pthread_setcanceltype.3 PTHREAD_MLINKS+=pthread_join.3 pthread_peekjoin_np.3 \ - pthread_join.3 pthread_timedjoin_np.3 + pthread_join.3 pthread_timedjoin_np.3 \ + pthread_join.3 pthread_tryjoin_np.3 .include diff --git a/share/man/man3/pthread_join.3 b/share/man/man3/pthread_join.3 index 716b171e1295..671ce7bb445c 100644 --- a/share/man/man3/pthread_join.3 +++ b/share/man/man3/pthread_join.3 @@ -35,6 +35,7 @@ .Nm pthread_join , .Nm pthread_peekjoin_np , .Nm pthread_timedjoin_np +.Nm pthread_tryjoin_np .Nd inspect thread termination state .Sh LIBRARY .Lb libpthread @@ -54,6 +55,8 @@ .Fa "void **value_ptr" .Fa "const struct timespec *abstime" .Fc +.Ft int +.Fn pthread_tryjoin_np "pthread_t thread" "void **value_ptr" .Sh DESCRIPTION The .Fn pthread_join @@ -104,6 +107,13 @@ the .Fn pthread_join family of functions again. .Pp +The +.Fn pthread_tryjoin_np +function joins the thread if it is already terminated, same as +.Fn pthread_join . +If the thread has not yet terminated, the function returns +.Er EBUSY . +.Pp A thread that has exited but remains unjoined counts against [_POSIX_THREAD_THREADS_MAX]. .Sh RETURN VALUES @@ -147,7 +157,9 @@ waited for thread exit. .Pp The .Fn pthread_peekjoin_np -function will also fail if: +and +.Fn pthread_tryjoin_np +functions will also fail if: .Bl -tag -width Er .It Bq Er EBUSY The specified thread has not yet exited. @@ -168,7 +180,15 @@ function is a .Fx extension which first appeared in .Fx 6.1 . -Another extension, the +The .Fn pthread_peekjoin_np -function, first appearead in +function is a +.Fx +extension which first appearead in .Fx 13.0 . +The +.Fn pthread_tryjoin_np +function is a +.Fx +extension which first appearead in +.Fx 16.0 . From nobody Sun Jan 25 00:24:49 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzC9F3t91z6PtXP for ; Sun, 25 Jan 2026 00:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzC9F27Wjz3cwQ for ; Sun, 25 Jan 2026 00:24:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HB5VZSeKgOX7n6r3yvw+Nu57d+gVXKsA/BQgBfIBYGQ=; b=mMCTrut9HpnX0QXDtFKcy/FYnpHxwtFz62Q9K9oqisjPdXp6B612wkBpcIjk+acWQnjZM6 yKw+qHEMuCC1IWxCbKJSBuCvOmecJMJwmPJv+ywc+3hlBssdXNb8onFKqXZkWtqaZG2JHO T2WIsTC37aQDZZ5wPnaOS/Cq+Bf1myKefRPqwZhEbaL71HcxQQZqT/lXJAL9BnngA9wpka 3bUYVqwNQZ4GZ7g5G5obQeFX4cJhFDwk0N7A0nMxIfzxS+tmEJH/hA0Ra5NHUnXmvg+Epw a/Rxlfkto7WokBsqfOZYg8Bvh2hdpRt8ZS0SqKnQ65ZDbszGLystEwXFqhdH1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HB5VZSeKgOX7n6r3yvw+Nu57d+gVXKsA/BQgBfIBYGQ=; b=Rw4RCbURbAAXdvz7SAT+HQzRHErOZgmqr46MZJAmG3nMzJ6GWWA40e9reIu7c8I7HzWAL5 2jSbJfp8bEny88nxFUN/5ZDZk8fqaKOqa8JQiNub6M4pfgFPCq0iIISTaW6VNWUS5BvGmP n3V4A9iOZ9lI/VsUJvlhThHBdD2hV72TzQObzTcJ29N6HFpeR/SrrjWVeZ0ZoKje3HAcvW KlKl6ETap7iCBIWBR3QNlu2cMLEV2drT6wDDXc/q2iy8AxJ7uygmdNhk8X91QlQ6OS8YWv mF4UgQTST3TatkoPT7/PAaZkns4+MVoZRKfG+p+g8cVjZ1emFx0awGCgNelk7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769300689; a=rsa-sha256; cv=none; b=sIfLeLs3MNNio8al0HzZk6V8MqwFChc0zC2jeK6yCEaY1tzB74dJM4Um7mzMe6plB8WyK9 nyp6puQfP3hyFU1Y/pgqnIpTU9bshETnYu7YDX7WCVaV4a5dFyjMUX7BL1TBeYkscUVzNg ttZa2VwZtzhAZaF841yffz6gIc6K/VIOiYbCr8UKavcfYffVhNp6G+GcXG07iGJRTy/Nfv aNmSJJV1I2BBtfWc5HrsndN6z1gHxzivisyKHocYfKgFEr0smWWsYk2y1bqDYfud9wpapT s6m6dhlEY1z9Z6Z288bjsOFExKpVW7AhuggUVj5XX5PD/iIWs7C/gkwnPkkKVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzC9F1kbXz1QxP for ; Sun, 25 Jan 2026 00:24:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fcf3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 00:24:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a8891c29d6a0 - stable/15 - libthr: add pthread_tryjoin_np() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a8891c29d6a0a9a8ed32148332b890941e86a766 Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 00:24:49 +0000 Message-Id: <697562d1.3fcf3.20fac012@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a8891c29d6a0a9a8ed32148332b890941e86a766 commit a8891c29d6a0a9a8ed32148332b890941e86a766 Author: Konstantin Belousov AuthorDate: 2026-01-18 12:26:46 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-25 00:23:35 +0000 libthr: add pthread_tryjoin_np() (cherry picked from commit afa70a8496e90fa751418be8d1b55e3d559a281a) --- include/pthread_np.h | 1 + lib/libthr/pthread.map | 4 ++++ lib/libthr/thread/thr_join.c | 55 +++++++++++++++++++++++++++++++++----------- 3 files changed, 46 insertions(+), 14 deletions(-) diff --git a/include/pthread_np.h b/include/pthread_np.h index a9e738540db4..04c64a748b72 100644 --- a/include/pthread_np.h +++ b/include/pthread_np.h @@ -65,6 +65,7 @@ int pthread_single_np(void); void pthread_suspend_all_np(void); int pthread_suspend_np(pthread_t); int pthread_timedjoin_np(pthread_t, void **, const struct timespec *); +int pthread_tryjoin_np(pthread_t, void **); __END_DECLS #endif diff --git a/lib/libthr/pthread.map b/lib/libthr/pthread.map index 3a5353a32dc3..ad0c28de98c1 100644 --- a/lib/libthr/pthread.map +++ b/lib/libthr/pthread.map @@ -342,3 +342,7 @@ FBSD_1.8 { pthread_signals_unblock_np; pthread_sigqueue; }; + +FBSD_1.9 { + pthread_tryjoin_np; +}; diff --git a/lib/libthr/thread/thr_join.c b/lib/libthr/thread/thr_join.c index 56b316ec0f51..33eb18638169 100644 --- a/lib/libthr/thread/thr_join.c +++ b/lib/libthr/thread/thr_join.c @@ -34,14 +34,17 @@ #include "thr_private.h" int _pthread_peekjoin_np(pthread_t pthread, void **thread_return); +int _pthread_tryjoin_np(pthread_t pthread, void **thread_return); int _pthread_timedjoin_np(pthread_t pthread, void **thread_return, const struct timespec *abstime); -static int join_common(pthread_t, void **, const struct timespec *, bool peek); +static int join_common(pthread_t, void **, const struct timespec *, bool peek, + bool try); __weak_reference(_thr_join, pthread_join); __weak_reference(_thr_join, _pthread_join); __weak_reference(_pthread_timedjoin_np, pthread_timedjoin_np); __weak_reference(_pthread_peekjoin_np, pthread_peekjoin_np); +__weak_reference(_pthread_tryjoin_np, pthread_tryjoin_np); static void backout_join(struct pthread *pthread, struct pthread *curthread) @@ -63,7 +66,7 @@ backout_join_pop(void *arg) int _thr_join(pthread_t pthread, void **thread_return) { - return (join_common(pthread, thread_return, NULL, false)); + return (join_common(pthread, thread_return, NULL, false, false)); } int @@ -74,13 +77,34 @@ _pthread_timedjoin_np(pthread_t pthread, void **thread_return, abstime->tv_nsec >= 1000000000) return (EINVAL); - return (join_common(pthread, thread_return, abstime, false)); + return (join_common(pthread, thread_return, abstime, false, false)); } int _pthread_peekjoin_np(pthread_t pthread, void **thread_return) { - return (join_common(pthread, thread_return, NULL, true)); + return (join_common(pthread, thread_return, NULL, true, false)); +} + +int +_pthread_tryjoin_np(pthread_t pthread, void **thread_return) +{ + return (join_common(pthread, thread_return, NULL, false, true)); +} + +static void +join_common_joined(struct pthread *pthread, struct pthread *curthread, + void **thread_return) +{ + void *tmp; + + tmp = pthread->ret; + pthread->flags |= THR_FLAGS_DETACHED; + pthread->joiner = NULL; + _thr_try_gc(curthread, pthread); /* thread lock released */ + + if (thread_return != NULL) + *thread_return = tmp; } /* @@ -89,11 +113,10 @@ _pthread_peekjoin_np(pthread_t pthread, void **thread_return) */ static int join_common(pthread_t pthread, void **thread_return, - const struct timespec *abstime, bool peek) + const struct timespec *abstime, bool peek, bool try) { struct pthread *curthread = _get_curthread(); struct timespec ts, ts2, *tsp; - void *tmp; long tid; int ret; @@ -127,12 +150,22 @@ join_common(pthread_t pthread, void **thread_return, return (ret); } + /* Only try to join. */ + if (try) { + if (pthread->tid != TID_TERMINATED) { + THR_THREAD_UNLOCK(curthread, pthread); + return (EBUSY); + } + join_common_joined(pthread, curthread, thread_return); + return (0); + } + /* Set the running thread to be the joiner: */ pthread->joiner = curthread; THR_THREAD_UNLOCK(curthread, pthread); - THR_CLEANUP_PUSH(curthread, backout_join, pthread); + THR_CLEANUP_PUSH(curthread, backout_join_pop, pthread); _thr_cancel_enter(curthread); tid = pthread->tid; @@ -160,14 +193,8 @@ join_common(pthread_t pthread, void **thread_return, backout_join(pthread, curthread); } else { ret = 0; - tmp = pthread->ret; THR_THREAD_LOCK(curthread, pthread); - pthread->flags |= THR_FLAGS_DETACHED; - pthread->joiner = NULL; - _thr_try_gc(curthread, pthread); /* thread lock released */ - - if (thread_return != NULL) - *thread_return = tmp; + join_common_joined(pthread, curthread, thread_return); } return (ret); } From nobody Sun Jan 25 00:24:51 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzC9J029gz6PtXR for ; Sun, 25 Jan 2026 00:24: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzC9H39nZz3ctT for ; Sun, 25 Jan 2026 00:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U47JNNJiVbg7PySnjtwvt1Zu3NUHWF1OLbI4UdXBv/g=; b=WoZqmOyLDpqlNZ7glfIQcZotnBpIyzjGPjAQmoxrDtRw1vlhG2AWL0b5IHeOTQycQ865dn dsb6VsSsKx6Wv3DXlW82R1IQudfklm2Ksi104+WeUR4bSSNE4qZb727+v1Y9RVONxX6Ptw rlCktwpy2BxER/qLwRgZPePn0kHduiJ0tiyLoS9OSEK9wjrwSve50qUOC89B+DMpWtkve3 FNPi6HVJrg4bJ/YDWqq4jl7gadg+GCyzc9W5ceKFMOaRopcSQ4AfL5vXbVwjdHqC/wGjyW KZziemxsiWgRnouhk5UvqK06mnkQIUTqy8CbCj+fePVd3gzBwi5iC3u9AFtTzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U47JNNJiVbg7PySnjtwvt1Zu3NUHWF1OLbI4UdXBv/g=; b=gESFZgh/lhVT+M8JmF2H7HUzYlVoliRVuQIbuaf5CzcymWTbZmbPZq7JcVqHrY1R7O+IAk bcmZN3owvkgH5wFgLeSbcV8j12BXk+5WS9DVh6cwLKaoIntVwLdQ+tW1W9Ni0FvB3r6RPj FdrR+qpnasxTyHEyR4xRfXfFuOGPOR/QE+/7mIEVHj+VT+r9AsZwabUztMhEbA/vQQgt0p iCejOHSnx+EK2Qy9hOu9kN2QfEA5UCgvCdAm0WS0Z65VP5i8MPXSKugmEWRGyfH6XTWdro 9gw14G4AOhHDf2PNA8eCBIlKuGVlsRbZYZHMxSvtmPSvko+Oh0gfsrHswi2+ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769300691; a=rsa-sha256; cv=none; b=ZCBB6MdQfsFIejMV8YXkNpmwo4mknpKbgiwy3rfj4gk7OvmU1QNoo+1IG3SDgAAVRAngCq H37Z++bFGvmwDSgJUtzOGOgQoV/8iIhubPpZocTZN9+MzatbRKJ6T62JzUU4Lfyj7UkDrr fIPw8DLjQxFsSk4nh6ZeXHnGiB6x4UlsIMd5Vn2awLMHFrBDKkduX5au3wjx338Gjs/fIn nYWOsSS8fCLCKYQquRzIWmSBNirvIEh+YInR9rR3Evf0Fk4g4gZXonsQ+vkzFQKLa++oRC Oy/TiXKJC4GVkN9lCWS5JHP/ga3qVb3iYnzOPYG/r5z0pkTwTITqTBvpuQLUcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzC9H2lHWz1R0s for ; Sun, 25 Jan 2026 00:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8643 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 00:24:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 4f004c7924af - stable/15 - lib/libthr: add pthread_tryjoin(3) test List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4f004c7924afd04bf693584eab36d8f195da4083 Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 00:24:51 +0000 Message-Id: <697562d3.8643.56806a61@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4f004c7924afd04bf693584eab36d8f195da4083 commit 4f004c7924afd04bf693584eab36d8f195da4083 Author: Konstantin Belousov AuthorDate: 2026-01-18 12:47:40 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-25 00:23:35 +0000 lib/libthr: add pthread_tryjoin(3) test (cherry picked from commit 902e3057cd5c7a076b78dd559b7b264610af59aa) --- lib/libthr/tests/Makefile | 1 + lib/libthr/tests/pthread_tryjoin_test.c | 62 +++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/lib/libthr/tests/Makefile b/lib/libthr/tests/Makefile index 017b740157dc..5ffcd7b046c8 100644 --- a/lib/libthr/tests/Makefile +++ b/lib/libthr/tests/Makefile @@ -36,6 +36,7 @@ NETBSD_ATF_TESTS_SH+= resolv_test ATF_TESTS_C+= atfork_test ATF_TESTS_C+= umtx_op_test ATF_TESTS_C+= pthread_sigqueue_test +ATF_TESTS_C+= pthread_tryjoin_test LIBADD+= pthread LIBADD.fpu_test+= m diff --git a/lib/libthr/tests/pthread_tryjoin_test.c b/lib/libthr/tests/pthread_tryjoin_test.c new file mode 100644 index 000000000000..ba88ac2ed6f5 --- /dev/null +++ b/lib/libthr/tests/pthread_tryjoin_test.c @@ -0,0 +1,62 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright 2025 The FreeBSD Foundation + * + * This software was developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +static atomic_int finish; + +static void * +thr_fun(void *arg) +{ + while (atomic_load_explicit(&finish, memory_order_relaxed) != 1) + sleep(1); + atomic_store_explicit(&finish, 2, memory_order_relaxed); + return (arg); +} + +ATF_TC(pthread_tryjoin); +ATF_TC_HEAD(pthread_tryjoin, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Checks pthread_tryjoin(3)"); +} + +ATF_TC_BODY(pthread_tryjoin, tc) +{ + pthread_t thr; + void *retval; + int error, x; + + error = pthread_create(&thr, NULL, thr_fun, &x); + ATF_REQUIRE_EQ(error, 0); + + error = pthread_tryjoin_np(thr, &retval); + ATF_REQUIRE_EQ(error, EBUSY); + + atomic_store_explicit(&finish, 1, memory_order_relaxed); + while (atomic_load_explicit(&finish, memory_order_relaxed) != 2) + sleep(1); + + error = pthread_tryjoin_np(thr, &retval); + ATF_REQUIRE_EQ(error, 0); + ATF_REQUIRE_EQ(retval, &x); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, pthread_tryjoin); + return (atf_no_error()); +} From nobody Sun Jan 25 02:39:45 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzG8y0YPHz6Q4nD for ; Sun, 25 Jan 2026 02:39:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzG8x6yX9z3trN for ; Sun, 25 Jan 2026 02:39:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769308786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ku7FasUyW3n9KTfjrXwbCDCbyY5v8/krqhEqrg6AGDw=; b=dKTVD6GqlwMdyOn1dygI4FD3CEY3Jcw641E5QwdsifvW+nqpwmvcq//9iFM3iUxLtVsdYF xTVsFTw3f+RhXznkb2AX9ucyX0sNV40hddS1yV+95Bu1fBtqCfVm7xNHfOnE+9rfw7+Mmw cAMtf4+knbwvOhITImvzZ+saLah00Gtp7FuWnfYIWlkMI4708JEL0MG9CF3hjbT/pCGitE gZvdJkZJkPk2ywJj0nOiUD7uv1w2RZfRrl5nuCsXzfPpU4WXNPk8b05SD1fW9TdzgOR5iG /mHESbSEovvMZzeBVThgMeIbtBU47pljZUu6W6cMD/4IWE/9nzwr0zc0Se9A4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769308786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ku7FasUyW3n9KTfjrXwbCDCbyY5v8/krqhEqrg6AGDw=; b=RYTIRk3QZt8F8c5CLP5IndGxGn1ITcP39FqSGwmFglhH5rxOTszsceKX56GRW1aUxRfzqj bG7hp+/8Su2dOMc6RF5NeUjYk0y+LIqXceEoEJLeO774ANly6oJZpNn2Su74Mibdc9EQNt Qdlw2PUJB59W9GMGobmYppZnnelybfG3ZaWojSobYlDVasodr+96jidR7XkQ0FIhwO9gG/ Qx5n3HSruKAcNJ2BoET22ErrGkM4s+g4r9lAAQ5ErFIkJz/ZV5TG1xWHPQYgePXTDIHD+L 2yS5/cUtIyhbTAoTFmI2td2SRfVoVlgsAbpoiXEDWe7eiszxQ7VZGJMbDE8/cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769308786; a=rsa-sha256; cv=none; b=ZyKMj5UvJxH2bZMu/HG2l4EgHH6En8oifJeN29UmGqCJZWUuJkP7pGzioLU85XN5XYcTDO Sf0wrVkT/AB4L0O8bc/rBqbaG7m1YquyJjUNeTjLlmpu93I+gIk0+NIf7CalIMCtW+l0od LtiIM58PUUMB06yN3WqcZLNbuv2NC4PE+sVyVQbVV95fW67QFQswB4IKM7La+QAQc9S7kE zexSsUwDvEd8O6b+v/1rA60DyoWjJGuW47H7gmJOm6WPvDQz7tA7dtUvC7+Ky9FI3yMdis bFa03y2NgCRjHmdG3qLJtNTbKa+Z1w07r0F53mzezT9dOHmzfCfocpiid2CCSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzG8x6CgbzjB for ; Sun, 25 Jan 2026 02:39:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2502e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 02:39:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: a900227040b4 - stable/15 - tests/ktest_netlink_message_writer: remove INVARIANTS requirement List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a900227040b4b1b78b0a491b31d6773af50b617e Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 02:39:45 +0000 Message-Id: <69758271.2502e.2b9021fd@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=a900227040b4b1b78b0a491b31d6773af50b617e commit a900227040b4b1b78b0a491b31d6773af50b617e Author: Siva Mahadevan AuthorDate: 2026-01-22 19:49:51 +0000 Commit: Siva Mahadevan CommitDate: 2026-01-25 01:53:34 +0000 tests/ktest_netlink_message_writer: remove INVARIANTS requirement INVARIANTS is meant to be used to enable extra sanity checking for internal structures, not enable/disable tests in the freebsd kyua test suite. STABLE branches include a GENERIC kernconf without INVARIANTS, so ktest_netlink_message_writer is broken on such branches: https://ci.freebsd.org/job/FreeBSD-stable-15-amd64-test/253/testReport/sys.netlink.test_netlink_message_writer/py/__test_cases_list__/ Reviewed by: lwhsu, imp Approved by: lwhsu (mentor) Pull Request: https://github.com/freebsd/freebsd-src/pull/1889 Signed-off-by: Siva Mahadevan Sponsored by: The FreeBSD Foundation (cherry picked from commit 8352e24d0bc59f9730980986600bde7d8cdce21d) --- sys/netlink/ktest_netlink_message_writer.c | 5 ----- sys/netlink/ktest_netlink_message_writer.h | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/netlink/ktest_netlink_message_writer.c b/sys/netlink/ktest_netlink_message_writer.c index 805f52197f69..0e8b962bbd34 100644 --- a/sys/netlink/ktest_netlink_message_writer.c +++ b/sys/netlink/ktest_netlink_message_writer.c @@ -37,8 +37,6 @@ #define KTEST_CALLER #include -#ifdef INVARIANTS - struct test_nlbuf_attrs { uint32_t size; uint32_t expected_avail; @@ -98,16 +96,13 @@ test_nlbuf_writer_allocation(struct ktest_test_context *ctx) return (0); } -#endif static const struct ktest_test_info tests[] = { -#ifdef INVARIANTS { .name = "test_nlbuf_writer_allocation", .desc = "test different buffer sizes in the netlink writer", .func = &test_nlbuf_writer_allocation, .parse = &test_nlbuf_parser, }, -#endif }; KTEST_MODULE_DECLARE(ktest_netlink_message_writer, tests); diff --git a/sys/netlink/ktest_netlink_message_writer.h b/sys/netlink/ktest_netlink_message_writer.h index 447593e0e700..1abf0d48de95 100644 --- a/sys/netlink/ktest_netlink_message_writer.h +++ b/sys/netlink/ktest_netlink_message_writer.h @@ -28,7 +28,7 @@ #ifndef _NETLINK_KTEST_NETLINK_MESSAGE_WRITER_H_ #define _NETLINK_KTEST_NETLINK_MESSAGE_WRITER_H_ -#if defined(_KERNEL) && defined(INVARIANTS) +#if defined(_KERNEL) bool nlmsg_get_buf_wrapper(struct nl_writer *nw, size_t size, bool waitok); From nobody Sun Jan 25 04:11:43 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzJC36M1vz6QBVg for ; Sun, 25 Jan 2026 04:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzJC33WXMz43Tr for ; Sun, 25 Jan 2026 04:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769314303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Hr944tMoRpwxIbmbUDpQRf/dzdBRCnQ7X85IJV4kDw=; b=TGP1HbTa4Puke3tJKVGUiq7eZ2tIPAruia/FSKBnek+zIKfL3Jux8AMRqdpzXr9QMA59YT KTBMrQUgxUVBr+Bk02yF3SZT1f1TnnRWOlNQvx5aRmyv3X0ze9W7STEp7HeLpb8IklgMVJ ctPzv4uOdhRPkJch8jleMZbvEWhMsokefA+3FFT8IUH90BSJWax8bs5LKPWgfrOicBEZ6W Y1PVO7uqb07eR9TlEbfbiyCGe+rmLutmLkwR8zPAUJgJ++4D15GGrgpS+gCKe49KGA4CeG BiZJX+AYdutyZ1dBMd3AZHIp0Dk2qs74FMA8Zx+F2shC7dRYj6mLs9ImlxH82w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769314303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Hr944tMoRpwxIbmbUDpQRf/dzdBRCnQ7X85IJV4kDw=; b=Iiuev2Z0HHkjaL3wbxN0NTsHu0wc6lkjgOOeQoQ5cCTzeD7ILSerT8zid4fjtpIuUULadC GXSuzqo4oYHJMMFAizfoDD0zbiRNO1/ZZ3tHOmpcdZNT+gBZe9I9L7WajcndlKPNeczxaf BJkEErZLYiJoTkTqn6rqLCRxEDExEN99QmSE9aeGQPKIyORHDTSWGTvB3CW2I0NRZDO0GK /44fxfeDaCOe8i03/Z0IJNnPSC7IXgSxG8axF66B4W9QaIY2uhbnbIHMrE8TNgG4UzwzoT DMgGDL9JFlT9srcGJfCVeIp4lgMs6sz7evL9iVtr4uxsEdOtTlKfLCTDfZuNuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769314303; a=rsa-sha256; cv=none; b=yjuIROnaInDv1sdJfOWnVnWP/xQUVDIYktZfrRnAkLqIaS/3KTU4nqoIJxj4ZlHUVzTPJ1 smpK5bRcPZgGuHttghDByxj0nTxtD6DwaeOFsqBWyoqnpBvE4nmhgKYCJr0ShQjoaMSNWf 6b54Chi4OR3WJeI5ofeeXf6UUd43rYWk0IuyN/sknf4QpBKxqAaFMxglevweQTDSEg+pKM pcVH3tPmeh6gWiPJd6Ea6tpdBrdjG8zYTtNJJN7rUhJlaGqoly9ec+ow0r0vDEh3I/gbB7 LdTD8wfc1iBol8AkZgsoCN8Y4FL3i4Pvb4NIR9NTYSpLDxKlzkc+JudrwMadfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzJC337FDz3fL for ; Sun, 25 Jan 2026 04:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37527 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 04:11:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 8ec56236eddf - stable/15 - MFC: libfetch: apply timeout to SSL_read() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8ec56236eddfc586c5d9338134c20909b3064c6a Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 04:11:43 +0000 Message-Id: <697597ff.37527.4d7a3efd@gitrepo.freebsd.org> The branch stable/15 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=8ec56236eddfc586c5d9338134c20909b3064c6a commit 8ec56236eddfc586c5d9338134c20909b3064c6a Author: Eugene Grosbein AuthorDate: 2026-01-22 08:40:35 +0000 Commit: Eugene Grosbein CommitDate: 2026-01-25 04:11:25 +0000 MFC: libfetch: apply timeout to SSL_read() Currently, fetchTimeout works for non-SSL connections only, so does fetch -T. Fix it applying specified timeout to SSL_read(). (cherry picked from commit 8f8a7f6fffd7dca09013f7c4bfa075bc3825fb8e) --- lib/libfetch/common.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index 786d5647d993..9df0e9abeba8 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -1265,6 +1265,14 @@ fetch_ssl_read(SSL *ssl, char *buf, size_t len) { ssize_t rlen; int ssl_err; + struct timeval tv; + + if (fetchTimeout > 0) { + tv.tv_sec = fetchTimeout; + tv.tv_usec = 0; + setsockopt(SSL_get_fd(ssl), SOL_SOCKET, SO_RCVTIMEO, + &tv, sizeof(tv)); + } rlen = SSL_read(ssl, buf, len); if (rlen < 0) { From nobody Sun Jan 25 04:13:28 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzJF51G81z6QBTC for ; Sun, 25 Jan 2026 04:13: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzJF50JWrz4449 for ; Sun, 25 Jan 2026 04:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769314409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Swlk+Syf41KQR9NLah7RNC8ud+7sqGSRyekZUa8Rwzo=; b=qoBk44phsx2ISxjvvsxC6nO9XfDBhocmhO4TDkCsGCBiAQrpSr1dLTo+Jdb3K6OklDUk7k i0EEpfAbvvx8qeqZGTdLlFTg8kysKn3UOnTB1JmZkazbm0lDPCxxFkOGRv/jiu8lP7tETH cgCIHqiBYKuK7GMe+nC7VDhzLUNLZIo1oul3pHfb8IdjpRcJ39TLl/HmcAbFimnfpIZHpy WEcNfQqDB8xJfA2ItnWhuuR5q0PsEJKgYC9igdl4+5ENsmhPpSxW5LfGi+crXX5BirrqSN m0c5Qjrad96KCRzJ9KfFJTeNX9B+oupXRQRU6CxY2ursyuqT4aHCVBuuRLAwSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769314409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Swlk+Syf41KQR9NLah7RNC8ud+7sqGSRyekZUa8Rwzo=; b=TvQIQA4umN97FuVzaCeXS2tkXe7gISK6nDd+m3MgeoJC3OYaj7e+qQm0rUmEb3bofrKScI 2XJGSUAnkkGmwqG9h2hQ5md7zkIH9XhlJc0oTw585UjMWQPO7d6cdGU0YNW8R5RELhWsyE dcAWUUa8xanEVc+LAprRm6t/3emPGqppXBFEDLnnwgNenFzNkXUNUnynAAAdsNZA3J2xHO REgA+Ka2+HNd1zbl1eCz8xZ66olB17ZTnQOdm0FEQQXnWkSY14QTzthZqSvKjXZ3eVTv8g j4jxIHX2P4rbDOk69IYiHSzqC/st/epRbk2QSbTh1r+n6yb/8KL0bfph6C9f/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769314409; a=rsa-sha256; cv=none; b=gHlLF0DZobWZj6/Ogt8BgYaa2QykV+wEkoEPEiiHcJMXLc+cumpuobD4VKvhwqEHtBOkxZ oZQAKjE8tF5t7mXa1pi+k5ImEEHhW6ONDDMv8/PJo37ENKuKurf1nx73nFIFzrUYTisDcg hYfmywAlF5qbClSRIzTyrf7HmO4tp92dUMM4KpwtYZQTZxS4oTpkmXQf2CwAI+CLU5p0WZ dGYeOqXBtBV6gDV7eg/jvj3c5O51FX5BnbwOiywBZZCshShmLgTdtysw/PNJRHhjg4Xddg hAgfZg6c+VXnIhIKQ5ber9B4uEMfFypbIjMVmI90CV06DUZI6BWmYiAEqvHO9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzJF471TJz3nq for ; Sun, 25 Jan 2026 04:13:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37d03 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 04:13:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: fae1c84e95f7 - stable/14 - MFC: libfetch: apply timeout to SSL_read() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fae1c84e95f7be4deacdab8a97f140714d8d2ae8 Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 04:13:28 +0000 Message-Id: <69759868.37d03.60f06fa7@gitrepo.freebsd.org> The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=fae1c84e95f7be4deacdab8a97f140714d8d2ae8 commit fae1c84e95f7be4deacdab8a97f140714d8d2ae8 Author: Eugene Grosbein AuthorDate: 2026-01-22 08:40:35 +0000 Commit: Eugene Grosbein CommitDate: 2026-01-25 04:13:02 +0000 MFC: libfetch: apply timeout to SSL_read() Currently, fetchTimeout works for non-SSL connections only, so does fetch -T. Fix it applying specified timeout to SSL_read(). (cherry picked from commit 8f8a7f6fffd7dca09013f7c4bfa075bc3825fb8e) --- lib/libfetch/common.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index 22779876ded4..9721cc557b53 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -1266,6 +1266,14 @@ fetch_ssl_read(SSL *ssl, char *buf, size_t len) { ssize_t rlen; int ssl_err; + struct timeval tv; + + if (fetchTimeout > 0) { + tv.tv_sec = fetchTimeout; + tv.tv_usec = 0; + setsockopt(SSL_get_fd(ssl), SOL_SOCKET, SO_RCVTIMEO, + &tv, sizeof(tv)); + } rlen = SSL_read(ssl, buf, len); if (rlen < 0) { From nobody Sun Jan 25 04:15:12 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzJH4247xz6QBGq for ; Sun, 25 Jan 2026 04:15: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzJH41GDVz44vj for ; Sun, 25 Jan 2026 04:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769314512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lbT2DZ/NHNnV2utq0ZoLPtnWZTeEdLH5/lBrQT4r3zA=; b=G5CH7JQmDfQGwvVB+Wanbb4O5TuucB1EEjg6xVai814tabSQKGo4CfxQLTRI9S5clHRyBW +zLT1iFkDNi7cObIz/4O3DWUbX6Tqe/DNpG5QAQnZtCScMSgxylmMQipWRpIZXncFMy0mR VMm1DA7w984H2ew1T2xE5hcp9JpTX3onjUw3Zc5ylHujuRGuBpwIlT3Z5c+0z8ksEnbDsR /OJaPKB1nMeFbVvuk4HosgYvgm//mYPk50x5EYO4KxTc4WGiXov+JOZG5M3DLgoC7/g1+U 0R7PpXgs7Nl/rYPBEOpfHsfQTWdhKhDe+55WgLFwN91ESBGKKomBgAim9Gb2pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769314512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lbT2DZ/NHNnV2utq0ZoLPtnWZTeEdLH5/lBrQT4r3zA=; b=sBMfsf3FsPHjcKeJBlRS4Xfx8zrmm0uSet4N0P9pY3Ep7boW363jzD6YwWRU0MaEE1/0ZN 72OblHfXju7XSjNbfinafd9a11KyLMBGzIpvg2w9QeZ6vQ9tPv21YAFC/TBNTdv43UxeGO 7gQ0fargK5yaUIHKOJ+jki0NKbdJyaaeEQxFXQ3c+TFMu8UarxVj4jFyWlB7Kvm1XSx7kb 8iHnR6VzfM5prKC7WwxI+UX/APWkVBx5up/S8dPzHsjMo17ItmoT1NQoHkJoWa0oaEoavv FJyKo6y0V3QVDBtb9lpJ25lM+pbXuUwT+XMBy6gK31uPCDdGXCVdI7M8zc30PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769314512; a=rsa-sha256; cv=none; b=U1iDoJAq9VkfnS1WHmqhZgBgndV5vQhUZmUF/Iry+2sAHIhthDpVFBGwaJoWET7Reqg9pi Bl7pYvVthV9VAIaRa5tZZDQk18bDvZaPinE0twx0XFNNphMTlkoU0opmgfFaYNcPA/B3pM xa6SFFmVXwMc3L/+MiSFGf5a6F9R2O9IW1JQMt9lMpC7TDizui84twUcm7XZmj5xFvkvML feNsEbshGlg88lEX2wCnwoMbJSQ8MZ0J/YD8VObpFy/11ag4GqM5fUZilKDrpkUAN4Umxv GorsgY9qbSeecimFjT/kMH8JSpG59qZ83VF5vVRNgJoSjwLfmIOyUC6BuHCc1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzJH40pQ2z3j5 for ; Sun, 25 Jan 2026 04:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37d07 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 04:15:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 2305dcc115e8 - stable/13 - MFC: libfetch: apply timeout to SSL_read() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2305dcc115e815b1b6b0259977afddb918f31a26 Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 04:15:12 +0000 Message-Id: <697598d0.37d07.28da3c06@gitrepo.freebsd.org> The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=2305dcc115e815b1b6b0259977afddb918f31a26 commit 2305dcc115e815b1b6b0259977afddb918f31a26 Author: Eugene Grosbein AuthorDate: 2026-01-22 08:40:35 +0000 Commit: Eugene Grosbein CommitDate: 2026-01-25 04:14:54 +0000 MFC: libfetch: apply timeout to SSL_read() Currently, fetchTimeout works for non-SSL connections only, so does fetch -T. Fix it applying specified timeout to SSL_read(). (cherry picked from commit 8f8a7f6fffd7dca09013f7c4bfa075bc3825fb8e) --- lib/libfetch/common.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index 69b507109bc4..e392c9e1e285 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -1287,6 +1287,14 @@ fetch_ssl_read(SSL *ssl, char *buf, size_t len) { ssize_t rlen; int ssl_err; + struct timeval tv; + + if (fetchTimeout > 0) { + tv.tv_sec = fetchTimeout; + tv.tv_usec = 0; + setsockopt(SSL_get_fd(ssl), SOL_SOCKET, SO_RCVTIMEO, + &tv, sizeof(tv)); + } rlen = SSL_read(ssl, buf, len); if (rlen < 0) { From nobody Sun Jan 25 04:16:19 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzJJM4hb8z6QBZd for ; Sun, 25 Jan 2026 04:16: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzJJM3xNTz45Wl for ; Sun, 25 Jan 2026 04:16:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769314579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vZJLON5CT62aeLY2X8n3tyAaef2HEhtgNd8RiIF06ms=; b=lp+8bofQmoohvfTozkvGyVHGEojqmcewH4pvgS+ZN/bhfx0wwhUHpMUjQrAz3htSlX38tg M24w9vKXuFiCVMikI6fYsl64+vlCL1S8ACquuMth1BRcpV9s2HxLtxiAd1mQMPMO+hdq/T pV4ZIPgmNWUaSu/VTUIhoe0fnoQHMsSh+s3pkmTe9Eogf7Etita0NCPhHTtzOo7xX8cL4/ R7/MNvT/JI6QrUtKIdXlrnos6x3sn89fbPPr/Bue6esiZAl56Tay+zSGL91mQhkMZOC56J 8RJ3R5rWqLO56WOGDA4usK3zW+9HcmjFQg9JHkq6e9OZBl17yb6rb6hry8xeNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769314579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vZJLON5CT62aeLY2X8n3tyAaef2HEhtgNd8RiIF06ms=; b=Sv9ZD6TbUH7PLVWdQf03SY5/m9Z0mr8EZaoqZe+gb2Y486SwHgYio+qgV2SMu/jZiXbxno NwTeULbKe9vYV03I3taRbqTElUSSxV4BRjKUMDL5n6hgQgNqbqm/NOxlGaY6lukhVTxKrH 9sxCwHX5VIGSuRyUpdQq8Yn+dv7jQCcUQYaGUFkPN5quqV2h/DYV8fJtj6ICNaVdMza6r6 T9hUbwuw/YUshLOgIixoqtFJ4UpczSuY+jr5EQRBaHBEqI/hoy8nhRc4iK8x/5DnMsRprJ xJ6E4pJsrCQ4vc6P7zVS0Lp9gRNWvc/grroS4UVS2Z+xPbNehsQ9730jrcrkag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769314579; a=rsa-sha256; cv=none; b=CuUiO5EOsMbfjfcUbTPShFoabuWGQ1gwyMF4o6wXy1/wBjLTU2RBf4sqboJQrS8FhV4g4q 4gXaYAoyHNVGojSZutYJ4L8Mx3bfPN5gdVkVtnHxANkz8Q7LSpsx6VnMdmxSqTIaIECqhT MdvFjMtvLgeCokHl6wV98Xamsjht8NDhyhNegrgDamkh4OU0o2yJ/Lclp1wmJRCU6I9qIj ikvSvYRDjwl8qZGG/vuEhosVDPS6M7pEBRGdZy4+hX4qdvVhK6edbIA7qtu0wO4Vd7tniz vSEHLmJ90hLUt9ZXM23sclXInqbWsJJgYoL9witOSLsiLgJQFE0bFv8UdR7FHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzJJM3JYlz3nw for ; Sun, 25 Jan 2026 04:16:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36e8a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 04:16:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: edf3b67fbb0e - stable/15 - MFC: libfetch: allow disabling TLS v1.3 when negotiating the connection List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: edf3b67fbb0e527ab7be9d30a02e246e5050f0df Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 04:16:19 +0000 Message-Id: <69759913.36e8a.a9a6d5@gitrepo.freebsd.org> The branch stable/15 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=edf3b67fbb0e527ab7be9d30a02e246e5050f0df commit edf3b67fbb0e527ab7be9d30a02e246e5050f0df Author: Eugene Grosbein AuthorDate: 2026-01-22 14:37:54 +0000 Commit: Eugene Grosbein CommitDate: 2026-01-25 04:15:35 +0000 MFC: libfetch: allow disabling TLS v1.3 when negotiating the connection (cherry picked from commit 129aec72250266e60c07ff4643623188f7c27a9d) --- lib/libfetch/common.c | 2 ++ lib/libfetch/fetch.3 | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index 9df0e9abeba8..f59ef9a8bbb0 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -1048,6 +1048,8 @@ fetch_ssl_setup_transport_layer(SSL_CTX *ctx, int verbose) ssl_ctx_options |= SSL_OP_NO_TLSv1_1; if (getenv("SSL_NO_TLS1_2") != NULL) ssl_ctx_options |= SSL_OP_NO_TLSv1_2; + if (getenv("SSL_NO_TLS1_3") != NULL) + ssl_ctx_options |= SSL_OP_NO_TLSv1_3; if (verbose) fetch_info("SSL options: %lx", ssl_ctx_options); SSL_CTX_set_options(ctx, ssl_ctx_options); diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3 index 5f7489799cf6..20a22a263b5b 100644 --- a/lib/libfetch/fetch.3 +++ b/lib/libfetch/fetch.3 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 7, 2023 +.Dd January 22, 2026 .Dt FETCH 3 .Os .Sh NAME @@ -450,9 +450,11 @@ allows TLSv1 and newer when negotiating the connecting with the remote peer. You can change this behavior by setting the .Ev SSL_NO_TLS1 , -.Ev SSL_NO_TLS1_1 and -.Ev SSL_NO_TLS1_2 -environment variables to disable TLS 1.0, 1.1 and 1.2 respectively. +.Ev SSL_NO_TLS1_1 , +.Ev SSL_NO_TLS1_2 and +.Ev SSL_NO_TLS1_3 +environment variables to disable TLS 1.0, 1.1, 1.2 and 1.3 +respectively. .Sh AUTHENTICATION Apart from setting the appropriate environment variables and specifying the user name and password in the URL or the @@ -676,6 +678,8 @@ Do not allow TLS version 1.0 when negotiating the connection. Do not allow TLS version 1.1 when negotiating the connection. .It Ev SSL_NO_TLS1_2 Do not allow TLS version 1.2 when negotiating the connection. +.It Ev SSL_NO_TLS1_3 +Do not allow TLS version 1.3 when negotiating the connection. .It Ev SSL_NO_VERIFY_HOSTNAME If set, do not verify that the hostname matches the subject of the certificate presented by the server. From nobody Sun Jan 25 04:16:48 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzJJw5j2vz6QBVP for ; Sun, 25 Jan 2026 04:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzJJw4YM4z45dy for ; Sun, 25 Jan 2026 04: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=1769314608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fK/UV+8mkLDnhuQBJYhlLCsNl4ptYS9odAIBUpQ+h10=; b=jykzsmsdq786Wdrzu/Dna7btPxypvTgJuOlrY1uGnforg0tUcr9mvqEsGkdXltDwbz+j/G XX79NK6bEtmhybk1IXN/12AI6zYr1X4MLv5ich0wdXNZgLgiA2thDvOD/JbL0exazPMV3j co5sU3+UN9zLDAKAo0J3VLTADLNwE7SSxCU7Ksej9i3+ZeNtIeUajuq5BfAQXfFdsf44qy 0ArZt0QLxbVD56WOvc+/bbzVCmQlAFaU7dVoQxYyDsDR18pwP/doVP/vTTVvvBLX+OBP0d AyCLfSSPg5YOPBz2h2+SaBYi1M0vtc/kUPezRXNRySgakI8H/04NymZIlcOQfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769314608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fK/UV+8mkLDnhuQBJYhlLCsNl4ptYS9odAIBUpQ+h10=; b=fpcoZg/pIgVZK1UNQwG1eSvFMr0j3lUy10TMaPI8i2G4GDl6GyCCwfnFz69hkUdXEhFsHH iQdfrI+xIFuNtN+gc8TRSalANWrKWsyCCq3q85dHCYCJ8vbYBLF4qlJPCvf3dcZfHsVbYA FmvkBV6mpcZuDkyeAdH5gELsRFTgzOL/1PQVWZjV4UUmcSJkvV5slJNkwW6X5jmgZ6mR8f ta4ZENBMdoJ3cVEqFR1juMSzGSOa3LqmsoTwzw4/P9eabJQMlIyFQgiSUn51WhLgHsOPw3 Nb9hjooDxzxEsDg/f6RmG6mYioTAcYrRW+XKDgnHPdQCNUjJPVWwiJRPVMjxCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769314608; a=rsa-sha256; cv=none; b=sg4sSeHMYbPmrK4fB8ZsXICiTnElugO+UJNKmcmaFmAeDaKd9qRQ/J3gWyL2YI2FiLjs4h ORada44uDH92GedDcjmEZjzSemTOvG2+YCrJZwr5TXu8rQUIQUessVJOfeSgwsKbgwzMcW 3nuTJtV2e9osGVceiL2MQAodBK5yqk3oEPUZjQ+nSnkfPVCKN8lHDJYrvhoQd/y8loZ0iq tUCIbq85JJPbdxtZJbdv2q3wTkI2GCUB85MhZ5yk9qPrLDxmKK95cwvrf31QbdfDdDnIWS 6f9XyV9Ybs1NqpTCo92kuYPaWfvAF4HS/e73WJXVKjuSxCWPhmZCelo+0czUMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzJJw3vy7z3j8 for ; Sun, 25 Jan 2026 04:16:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37688 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 04:16:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: c41b12651a80 - stable/14 - MFC: libfetch: allow disabling TLS v1.3 when negotiating the connection List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c41b12651a80e5c3c227e7428c2804f66ec17f2c Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 04:16:48 +0000 Message-Id: <69759930.37688.2068fb53@gitrepo.freebsd.org> The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=c41b12651a80e5c3c227e7428c2804f66ec17f2c commit c41b12651a80e5c3c227e7428c2804f66ec17f2c Author: Eugene Grosbein AuthorDate: 2026-01-22 14:37:54 +0000 Commit: Eugene Grosbein CommitDate: 2026-01-25 04:16:30 +0000 MFC: libfetch: allow disabling TLS v1.3 when negotiating the connection (cherry picked from commit 129aec72250266e60c07ff4643623188f7c27a9d) --- lib/libfetch/common.c | 2 ++ lib/libfetch/fetch.3 | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index 9721cc557b53..a39bfb33e95c 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -1049,6 +1049,8 @@ fetch_ssl_setup_transport_layer(SSL_CTX *ctx, int verbose) ssl_ctx_options |= SSL_OP_NO_TLSv1_1; if (getenv("SSL_NO_TLS1_2") != NULL) ssl_ctx_options |= SSL_OP_NO_TLSv1_2; + if (getenv("SSL_NO_TLS1_3") != NULL) + ssl_ctx_options |= SSL_OP_NO_TLSv1_3; if (verbose) fetch_info("SSL options: %lx", ssl_ctx_options); SSL_CTX_set_options(ctx, ssl_ctx_options); diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3 index 5f7489799cf6..20a22a263b5b 100644 --- a/lib/libfetch/fetch.3 +++ b/lib/libfetch/fetch.3 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 7, 2023 +.Dd January 22, 2026 .Dt FETCH 3 .Os .Sh NAME @@ -450,9 +450,11 @@ allows TLSv1 and newer when negotiating the connecting with the remote peer. You can change this behavior by setting the .Ev SSL_NO_TLS1 , -.Ev SSL_NO_TLS1_1 and -.Ev SSL_NO_TLS1_2 -environment variables to disable TLS 1.0, 1.1 and 1.2 respectively. +.Ev SSL_NO_TLS1_1 , +.Ev SSL_NO_TLS1_2 and +.Ev SSL_NO_TLS1_3 +environment variables to disable TLS 1.0, 1.1, 1.2 and 1.3 +respectively. .Sh AUTHENTICATION Apart from setting the appropriate environment variables and specifying the user name and password in the URL or the @@ -676,6 +678,8 @@ Do not allow TLS version 1.0 when negotiating the connection. Do not allow TLS version 1.1 when negotiating the connection. .It Ev SSL_NO_TLS1_2 Do not allow TLS version 1.2 when negotiating the connection. +.It Ev SSL_NO_TLS1_3 +Do not allow TLS version 1.3 when negotiating the connection. .It Ev SSL_NO_VERIFY_HOSTNAME If set, do not verify that the hostname matches the subject of the certificate presented by the server. From nobody Sun Jan 25 04:17:19 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzJKW5y5Gz6QBCy for ; Sun, 25 Jan 2026 04:17: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzJKW5BsRz4607 for ; Sun, 25 Jan 2026 04:17:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769314639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kQt7LzQDpXaV+n+laJ05XIIABYXsXb2H3C4wiM1FulA=; b=HCBj/yO+o6yO6zrkhyfvMLmObjWywWjp+NLSx+4TV2bjg/frbUUp1Xbro4zKlecAy9m1hu oNpHFr8ksPnvRxq5qlXHrSnPZLltMix+ar6Sr3CHyCe30B4suYkHTDu4pBCghy0zOAUTrq j9f8rmYlp+g0oUXGKUyyWGxvuA1Kz83aOFPKfaJCJiM6ONyW9WCha7d1mbRQ0yrH6XYoRJ kl9h5YOtITTWBXr5Y5Uws2Cx1BO9hXvL1KmP6Uheh4pa9dygkoGcUfefnH4qGrCJqOzi2V gN8XfrsaKCUJZog8h+Z/c+MWocsG6IHdwUPpZwNPWcidplStSwu9zpmn4I6ruw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769314639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kQt7LzQDpXaV+n+laJ05XIIABYXsXb2H3C4wiM1FulA=; b=SBDgcRgGpLGInawLvjNjiXR6jNWdgjQDtGAO0pEwZrf+j8h1dGROsutnJqfNpAelMEjxUd dZEE1YJ3Fw3dHvs62Y+gwWy2E1a6V7SvvyAlMB2bz0C2kk5Qado0uB2mR4jgTiM2hAify1 fdUGp6doT8joGwTSD2kkzaqNzT5vdVkhYMyuGY61xKr4rByMjcVxPZBgeINFjaKNgvbtb4 CI4cuNyt2bTD+V0OwqbwQ/uvvIzFuWG2xbh4yVHWvVBPypxrcXrFNde05lS6lcQR8ryfwi 5cAr4Axd5cWlaWNPiire+Q7d7HLGaDXCdOYO4U1NmYioaRxps0qpQ2Gubprsxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769314639; a=rsa-sha256; cv=none; b=wJgTD0CsRjSDMp9AimJ8/lxfoygSJsP+yMVYFkQHSsIKFp4bqqqOObrXddPjwDFcjtwDzl EWEdbUD1ERE4fG14niC+NIorw9Lk6Wf2vATgybbldDQi+TISPyb7p3GHQMnwhOQ1oLWOAa eqrD7pmYLqLD0uikud4aZbUPS3DZXCrJQ+vihW5HF39+Fs34GtlLmLV90MF371Dx1+b1Gp UHjXj66vdrQ+DqIOx6Y1i2Z/+7yCMNd+2RRebxD6abdKy5RwzlccA9d5W0VzUAwWA4ree+ mhWcrMYGmjgpKONNWsBEthCPLH5p5zUOuxz/WBWq2UVgqMXZKAa5BYB00/m0gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzJKW4lVVz3t3 for ; Sun, 25 Jan 2026 04:17:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35142 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 04:17:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 6f358a6f2e55 - stable/13 - MFC: libfetch: allow disabling TLS v1.3 when negotiating the connection List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6f358a6f2e5590079094eca67926076d8afb67ed Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 04:17:19 +0000 Message-Id: <6975994f.35142.858148f@gitrepo.freebsd.org> The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=6f358a6f2e5590079094eca67926076d8afb67ed commit 6f358a6f2e5590079094eca67926076d8afb67ed Author: Eugene Grosbein AuthorDate: 2026-01-22 14:37:54 +0000 Commit: Eugene Grosbein CommitDate: 2026-01-25 04:17:00 +0000 MFC: libfetch: allow disabling TLS v1.3 when negotiating the connection (cherry picked from commit 129aec72250266e60c07ff4643623188f7c27a9d) --- lib/libfetch/common.c | 2 ++ lib/libfetch/fetch.3 | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index e392c9e1e285..766aa2200f26 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -1062,6 +1062,8 @@ fetch_ssl_setup_transport_layer(SSL_CTX *ctx, int verbose) ssl_ctx_options |= SSL_OP_NO_TLSv1_1; if (getenv("SSL_NO_TLS1_2") != NULL) ssl_ctx_options |= SSL_OP_NO_TLSv1_2; + if (getenv("SSL_NO_TLS1_3") != NULL) + ssl_ctx_options |= SSL_OP_NO_TLSv1_3; if (verbose) fetch_info("SSL options: %lx", ssl_ctx_options); SSL_CTX_set_options(ctx, ssl_ctx_options); diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3 index 663209f8fc79..ddf092a4ed9e 100644 --- a/lib/libfetch/fetch.3 +++ b/lib/libfetch/fetch.3 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 7, 2023 +.Dd January 22, 2026 .Dt FETCH 3 .Os .Sh NAME @@ -451,9 +451,11 @@ allows TLSv1 and newer when negotiating the connecting with the remote peer. You can change this behavior by setting the .Ev SSL_NO_TLS1 , -.Ev SSL_NO_TLS1_1 and -.Ev SSL_NO_TLS1_2 -environment variables to disable TLS 1.0, 1.1 and 1.2 respectively. +.Ev SSL_NO_TLS1_1 , +.Ev SSL_NO_TLS1_2 and +.Ev SSL_NO_TLS1_3 +environment variables to disable TLS 1.0, 1.1, 1.2 and 1.3 +respectively. .Sh AUTHENTICATION Apart from setting the appropriate environment variables and specifying the user name and password in the URL or the @@ -677,6 +679,8 @@ Do not allow TLS version 1.0 when negotiating the connection. Do not allow TLS version 1.1 when negotiating the connection. .It Ev SSL_NO_TLS1_2 Do not allow TLS version 1.2 when negotiating the connection. +.It Ev SSL_NO_TLS1_3 +Do not allow TLS version 1.3 when negotiating the connection. .It Ev SSL_NO_VERIFY_HOSTNAME If set, do not verify that the hostname matches the subject of the certificate presented by the server. From nobody Sun Jan 25 17:51:26 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzfNt2Cv6z6PrhD for ; Sun, 25 Jan 2026 17:51: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzfNt1YZ6z3cd0 for ; Sun, 25 Jan 2026 17:51:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769363486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Az5iMDXSoUQgoe3QG7iK5ZVtAvDBDOzZzWiB7tnKRU=; b=SHVMHnZUcV84w5GWNIsA2R/PI/vEHONqPopz1VJyAbWy5+dgSSW5XmqMwZ/3GPL8xXkJ46 DCpBs8Li63enoTszjIv3THsqDi4ZH2MOa5znYRsAsZfCchgEPTEnqWLETKhk0UNvszELpo 2PqiTGvvBdXIstr5MjWjkkwakm94yaWSJ6/JQz5fYi4FmaAXMCqkeAVw3KbQbS8dSNs7iO QX18qG/YmjA3KtHB0G7NMBXJ9fBU0xvO1squDHqNZSQrsup+/692Y90ilWQCrcPolNHKgl ywo3AIO/TOw/BsRsrqO6gUqY0hV0aT4T/LiXZ2g3U4ppRVcEat4KPJ+EdtRYpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769363486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Az5iMDXSoUQgoe3QG7iK5ZVtAvDBDOzZzWiB7tnKRU=; b=QgHV84+YnPhvk54RJgDCNyxRe1wXhsCgxd34Ap0XUzllCAEHzQw/5ukpONorQaRBk2ey9y cIm5Rad831z7zMGTTiJUQEnfEjF2BsvwW7di7svSgqr4XhqHsc4sjIFh3tfziX3H6rSg4e H2KSH8e1Bz8n0zXoUrQYa4WVRiwfz1hJc43ARphPvS5xJTDHJ0boCN0K7fvsjN6bvgG9aG tHGeyAVPD3h9Xx+y8BP6jLXvKE+Xs1jx2TN2jrLUSf7H++gl8WHCWvmaa42ATBqn1Mb0q6 0HEKVdwv2S7UIfwNHfH7QniIe8Fbj88QSsj6umwK3czbBPqTthWzdImts8inpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769363486; a=rsa-sha256; cv=none; b=q8H8TQQnAnIUWX7l6n64GWEP1HdbYxYO1PyPJm83oucmJsQWgqyhX/yQ2R2TLvZ5eHfK/o 1bcQZNOHEXjAXScEd8eKURdi3Dxh8EpIY5VaSjRSuVEMH0VQU1ta6ntIjmNuymu07QMMi7 yds69BbX6+lKJMrCFkUeYDwEW+UPDzSbTORuWcBfDV35MqftzxuXOSp1Kd1GvO4c+LihlZ CuKiOZwuattzNV9KOwExi+Ha2BIrks12n0lzV96ZKtud+9bnChkuAHyB8690oXr7Wt/wFP YH+jyZd493m36EEwFYD94F8aDEfTDO17vznJKMqaCBQnhRg6QqaKeVuV7o5jSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzfNt16DczlQK for ; Sun, 25 Jan 2026 17:51:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e8fa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 17:51:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: ad9c5a614f88 - stable/15 - rockship: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ad9c5a614f88887ca5c2e452b3c832af625f9373 Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 17:51:26 +0000 Message-Id: <6976581e.3e8fa.5f7894f6@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ad9c5a614f88887ca5c2e452b3c832af625f9373 commit ad9c5a614f88887ca5c2e452b3c832af625f9373 Author: Gordon Bergling AuthorDate: 2026-01-17 18:38:53 +0000 Commit: Gordon Bergling CommitDate: 2026-01-25 17:50:49 +0000 rockship: Fix a typo in a source code comment - s/vaues/values/ (cherry picked from commit cabb5add07a60c146698d09759445276aa96757a) --- sys/dev/clk/rockchip/rk_clk_fract.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/clk/rockchip/rk_clk_fract.c b/sys/dev/clk/rockchip/rk_clk_fract.c index aa7084c90d76..b06b13146e5f 100644 --- a/sys/dev/clk/rockchip/rk_clk_fract.c +++ b/sys/dev/clk/rockchip/rk_clk_fract.c @@ -80,7 +80,7 @@ DEFINE_CLASS_1(rk_clk_fract, rk_clk_fract_class, rk_clk_fract_methods, * http://en.wikipedia.org/wiki/Continued_fraction * * - n_input, d_input Given input fraction - * - n_max, d_max Maximum vaues of divider registers + * - n_max, d_max Maximum values of divider registers * - n_out, d_out Computed approximation */ From nobody Sun Jan 25 17:51:27 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzfNv4Y8fz6Pr4q for ; Sun, 25 Jan 2026 17:51: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzfNv2Jt2z3clt for ; Sun, 25 Jan 2026 17:51:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769363487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pUvjqxk3kWa6Z4A7gDc9811vWy63k7ODh5O1sB5qWaM=; b=k+gpEQNre+hVAWTqRP41Rt9QalAuI3JU/qcsa5cKgyBOOP/SXwMXQlBs+ayHKFaEx593SE VBrE7pFudwZw2mh4LRFPokDTwEEhnhwYTzAiyD9W+z5srMQfiN0wMb9IbbZziljvWMHnrl jeFWzeI9F4Aro7GVnIor7alTSwbGqMzuTO8Ru6zgBOsFXxRGQJ9Css0Aelq5X/Is+VB5wf 1ix6KjMrCrcAatc2eJ7nQ/rowsK8O1dqMUWg4rxJuDgfKccAIgpBPxDn0US+CFLEEfyhaL gy8hNUgzJyny2IcAwdT76o4cy7yqLX4Vo0NXnhuEi/pX7ma4iec4mOJ0Hszykg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769363487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pUvjqxk3kWa6Z4A7gDc9811vWy63k7ODh5O1sB5qWaM=; b=YuPNTk3nIpEwO/JhiOl3eB4HLHmNetWaJEaaJm42ICGd+Z7H/TrKXoquUFC6dw4SzsS3aF DwXQxLAZwUUPnum21J42xU31DumhVxz/xbhcji5FBGRNM61v/EjnrbPjii8iWGqrMbVhJh 84qU5E/9wN6q52swDsNrQy2wZNluHWJlZbVkpY8vmJ58hG2rjJLTePJSQzY08f2XsZfcqd X6znt9h/G7NYtQYzdnRSS3FhgHEE/u2L0507LGHTLkw6MvCCMOaTsshJLYyMM4eTkJG5mc m7VfmyBsFoDGEnR5YX7N10OA5812ID2qwMUasInqPumadR96R9Fmo0QT21DIOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769363487; a=rsa-sha256; cv=none; b=w2iiMpFew87PDD8FmeYJflaYI+XHBoxYQ30cxTP6M8/SFxfmAzhJVjuqSb+SSTTxwtoimx krpTvHNkZFbDdTGxgvQukfcwiUFkkanIdRs0F8SqihBtW7+ZMYifQZ/nqAW79iffA+puCN ddftgG4CrulTyMutU40z/VVro+RWrG32hYlOWQcsRO/JfrgKlaodyfzKKde3R40tmdbF9n t7hyt4ZBK0FwlgMb0LlBdxyr5K1rhRUFFYy7XR9BdE7mzLfdFs9FvH5YVCBQofVgjDZaUa Lv3rL21FJHfNmsBILh22UahdJb4LBvXDfgVfZQhjh0CgmDXG1xdaUnD8oRFm+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzfNv1t0mzlQL for ; Sun, 25 Jan 2026 17:51:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e8fe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 17:51:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 60e75e9e31a2 - stable/15 - netpfil/ipfw: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 60e75e9e31a291f6d367499ddce104133d450853 Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 17:51:27 +0000 Message-Id: <6976581f.3e8fe.727c4d26@gitrepo.freebsd.org> The branch stable/15 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=60e75e9e31a291f6d367499ddce104133d450853 commit 60e75e9e31a291f6d367499ddce104133d450853 Author: Gordon Bergling AuthorDate: 2026-01-17 18:39:55 +0000 Commit: Gordon Bergling CommitDate: 2026-01-25 17:51:12 +0000 netpfil/ipfw: Fix a typo in a source code comment - s/vaues/values/ (cherry picked from commit 9be9ab2a242080dea6254e187cf211604170de07) --- sys/netpfil/ipfw/ip_fw_table_value.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfw/ip_fw_table_value.c b/sys/netpfil/ipfw/ip_fw_table_value.c index e09323cd02c3..4f87b631e52e 100644 --- a/sys/netpfil/ipfw/ip_fw_table_value.c +++ b/sys/netpfil/ipfw/ip_fw_table_value.c @@ -147,7 +147,7 @@ get_value_ptrs(struct ip_fw_chain *ch, struct table_config *tc, int vshared, } /* - * Update pointers to real vaues after @pval change. + * Update pointers to real values after @pval change. */ static int update_tvalue(struct namedobj_instance *ni, struct named_object *no, void *arg) From nobody Sun Jan 25 17:52:24 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzfQ22f1jz6PrqP for ; Sun, 25 Jan 2026 17:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzfQ06jFxz3dc0 for ; Sun, 25 Jan 2026 17:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769363544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Puwdnu4KhbAGPw7R+lY3ZLWqgzPixhtiy9wMsDZkvy8=; b=mPoxODhKoCunpOoSNNfPNBQYmZ698mvsB8aWvX37cTvCR5/lYNutXwbUhwFhnCYOd/Yppl 5cNzKx/7ADrBQ3uBskE4QTuoIGbx8TSVYNCHL2EwDiDc0FuxhSBL1ab8c9T/bY8vQLnm2V MI6YmfSO4X4NRmMltH+Tmg6xp3/KsheoKuVbaL6LPEADPxn/B5mxhmnwEMVYeqUxoMCs41 uSXJSCRnL4hBzr7Y1p2IQlZwjkkbIPLDWqIsaodwtI2OkZNAIPA80/zCQxRl8fIlxB8sSZ IWWaRfgb6wWcujeZHCxJjM9WNvBU57GExxCzN4ydG9BWLpPXCBTa9Y3x+dBFbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769363544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Puwdnu4KhbAGPw7R+lY3ZLWqgzPixhtiy9wMsDZkvy8=; b=w7B2xon0AnL5dTiM7KIXxKii3kCq15tcxhiGU81KOeJwSHw5mCN3PSRBkIqoqdUUQ/Mjzw dGgNPtbwWYBW3IHinKGTs7qrd//5H8DoitupiEngbTFcvZnPlkQ2MW3rd+WOzME9S/eg4f FAN9clfie5w6M+52w7G8BDLR5wtDDGgP+PA9+zUhdpCYTqcdoNXzRDhXQJzz4EMlzHwsWF EIzdoRCc8aOt7H1vGliId74ciuq8evlp31fOMIDLEt4iCjF41RgX6iX0leWzQm1MYFvUNe ghoPr/mb5oGsQDwTUjqYec8FrB2YdgDJZLd3CvEjJbF7SWpUQWWWHuSCxT3yHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769363544; a=rsa-sha256; cv=none; b=dr3OeCK7qct/ZBQuFnR9JcHZg3RhJRk/4niJdj4g8TDKMYDJUGiVf3Mmh+LugQynEudBs/ y9G2+p49EIVyhtD3gl24hMON4f78q42PPoMS9ifbLgcMINuATBI3wjmtgK8bGAFZv2KlnS CdPnSyby+hGVtVs+Q9PRuRD1DN+f/nspaEeOaLtcsuZXcjxhUBEodEReSjabr6m/iB1//a sBWmDXbgYusDJerHrHhUZJC5WTrTc+BfKmZ4NPb3fUkI4t4zBh6RHIW1c7ZA7CnOiauNNu Cl4E8gD5QHovUjevlttv1p1HNqj3Sc4mwE8PTbTjqLa/v5GaIsfsO9vx3TEJgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzfQ06537zlc9 for ; Sun, 25 Jan 2026 17:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e730 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 17:52:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 711b0e19aa5b - stable/14 - netpfil/ipfw: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 711b0e19aa5b054bcf62177ef918df16580106fa Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 17:52:24 +0000 Message-Id: <69765858.3e730.1dc095a8@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=711b0e19aa5b054bcf62177ef918df16580106fa commit 711b0e19aa5b054bcf62177ef918df16580106fa Author: Gordon Bergling AuthorDate: 2026-01-17 18:39:55 +0000 Commit: Gordon Bergling CommitDate: 2026-01-25 17:52:14 +0000 netpfil/ipfw: Fix a typo in a source code comment - s/vaues/values/ (cherry picked from commit 9be9ab2a242080dea6254e187cf211604170de07) --- sys/netpfil/ipfw/ip_fw_table_value.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfw/ip_fw_table_value.c b/sys/netpfil/ipfw/ip_fw_table_value.c index 431707ae5d74..5a2377ba38a4 100644 --- a/sys/netpfil/ipfw/ip_fw_table_value.c +++ b/sys/netpfil/ipfw/ip_fw_table_value.c @@ -144,7 +144,7 @@ get_value_ptrs(struct ip_fw_chain *ch, struct table_config *tc, int vshared, } /* - * Update pointers to real vaues after @pval change. + * Update pointers to real values after @pval change. */ static int update_tvalue(struct namedobj_instance *ni, struct named_object *no, void *arg) From nobody Sun Jan 25 17:52:23 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dzfQ50BV1z6PrqQ for ; Sun, 25 Jan 2026 17:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzfQ45HRGz3dRW for ; Sun, 25 Jan 2026 17: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=1769363548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PKXKp0NpKJFg7Nny05rbGm+cd/bi9up+hY/i41hQpOg=; b=Y74TEILjuMpra9cYAFQWkBcFPOL+PMrR6225ZzHnVdvWkaVcXiRn0sLIyg/vp+VDW+VJBm Oc9hHF4Ct71a5Jpk5WyTP68lHYFIRWLoXC1vB4iBKSS2HcSUOFYo1biT3HaBjZWYvq/q3L p1vK1irvpdKLWC+UmCF3pfTE+wuSBjvuOIjlxQy45Ytiv1Dskp1NWwYLzQbTQBkhqgSb+k HO6MW5Ey6+S5+2u4Dwz/sYjr7i3c8quDZOv4AvC+u6kl6Oo2lw7c1cCtzaRAlKIv3+K104 13siWdmHLCwNd1//zz1cqQmlD0xw3awevPUkChWTTqA2dVLvK3fQr3nKp9rKMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769363548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PKXKp0NpKJFg7Nny05rbGm+cd/bi9up+hY/i41hQpOg=; b=lvAxHjagXvgvfgnw42r5Vndh+5O/F/btN7cdlwbTyldnO91MoNzx5/ai2yN+V0ET4U4Sre kULFPYv9lGHXOUhrfL+xCxhITLk3EHyEipvdBdGMrfkj2TfayVLcdf/2J0pyFBNmLWp+ro lvZ1eZarOTMRWMVExmvuoCqfhIJJhyurwyPp0oXS9jtzIezYivfHnPBxxlF2K+AZMeqyYR HbCiGZ2tJP+aezG57H1wFO+nJdLe1kboq4cVjIRBqkLKKmopimyEnRxHkxGTa4vHJR4Xf6 kJovDTnbemOjA9uevOKQeDwMVZDirnyaYFcvAv029vU2y3ca/AdoM/9WGwjUig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769363548; a=rsa-sha256; cv=none; b=G8fSFUosTyIEWzgafLSIuruM96njqDpH+fCMdgsDd0yyGpEKF8gdTW0PWZzabZ9Ghq7QW1 DFz7zFZo97VLLseUmc7HofkGAnwuXji0Ucn57H1L/EjllnNfjOeflpcNkFmY9EmVaARolm VLEyUA+KDWcEdmNxQ6dlYDUQaslnDY6Q6tbCWWcMPHpT3PZ4ldEx1oUefEpLyzoiRbivVY OnXIyDO6qiWHDFbS9VY16pNfFuX82Rrf6VP/Le1nctZeLAmo3mAdFc7RblChScyJVfAyvL seBC3TzohwdG/hGR7hWkCdsu4hojFL0vHJKdpQoz7jtRj6AzcRCXcgkeNQ/uKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzfQ44q2lzm38 for ; Sun, 25 Jan 2026 17:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8403 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 17:52:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: ed2b5f46cf1a - stable/14 - rockship: Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ed2b5f46cf1ad81cc5ee363a89c6d3a357c51509 Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 17:52:23 +0000 Message-Id: <69765857.8403.34013215@gitrepo.freebsd.org> The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ed2b5f46cf1ad81cc5ee363a89c6d3a357c51509 commit ed2b5f46cf1ad81cc5ee363a89c6d3a357c51509 Author: Gordon Bergling AuthorDate: 2026-01-17 18:38:53 +0000 Commit: Gordon Bergling CommitDate: 2026-01-25 17:52:03 +0000 rockship: Fix a typo in a source code comment - s/vaues/values/ (cherry picked from commit cabb5add07a60c146698d09759445276aa96757a) --- sys/arm64/rockchip/clk/rk_clk_fract.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/rockchip/clk/rk_clk_fract.c b/sys/arm64/rockchip/clk/rk_clk_fract.c index 0feae96b8e62..5bb3431e2cbe 100644 --- a/sys/arm64/rockchip/clk/rk_clk_fract.c +++ b/sys/arm64/rockchip/clk/rk_clk_fract.c @@ -81,7 +81,7 @@ DEFINE_CLASS_1(rk_clk_fract, rk_clk_fract_class, rk_clk_fract_methods, * http://en.wikipedia.org/wiki/Continued_fraction * * - n_input, d_input Given input fraction - * - n_max, d_max Maximum vaues of divider registers + * - n_max, d_max Maximum values of divider registers * - n_out, d_out Computed approximation */