From nobody Mon Jan 19 10:53:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvnP33vNdz6NZnC for ; Mon, 19 Jan 2026 10:53: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 4dvnP31Stmz442m for ; Mon, 19 Jan 2026 10:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768819991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FoPGmwyd7TdxgacRuesTRclcz0oHLJ3ggoLLD0zVkpo=; b=VvcbVSjfaMiHyv8UsPgajJoT9SXM/fp890p5KNApa/49N49Hm5AaYh+74RNpPMCJ4E3ed4 PWVDuZeqR4vdymH5XMv2O10efY24R1YPQODswI/CJM/d3CnTkL7PW9u6f0xgGkQcN1PAjw IN8QzLuk+g+LYbtSYfUDtwgu6T2CYdooxaj3XFFE7K3q6ZB4pgWFt53yJZpzAOARbA3DqU cIiTXt5cHuyZQAUf2fqv/NhpBCcWni9gWgOsHf0LeCCswU9LpJpdIrX8niYDsgQwBXFx3S MVhwCkxtFD4ZGsxHQc1rD5/uN5dniWCVzPzOsdMk4Hn+zM6uP6nhCpgiRhQXeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768819991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FoPGmwyd7TdxgacRuesTRclcz0oHLJ3ggoLLD0zVkpo=; b=pKeQbLWAeUCN/sBMRo2goMf4Im0lzfWviUv7rD0U1i6oNX0tQrPJUt6v8XerIqfZh2YSO7 VMjnGIpl+gN8pYJ/FmXAsSwCn7x9cNO2aKSqq/eESc4PfBAmcJCy42KIlLgX5fAThhNxgy pGgdMpFSLP/ZnnPMWUEKWoBrsidu3duTnlEwf0R2t3Q2sUXkX0amB3QPfZUedl1fgyurMD pIUbgLuw2L3yyVYjK6sJ/PpLWT/ChwsyBo+2xdNhYGkpB4jLMSJaME8oM1TfidmBkWyOi+ 5Pdq/C0WKoMezHYbotuWHM9NfyOHLTyccFewB3Xk1PyjOhiOCFVBv7rDJYbDtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768819991; a=rsa-sha256; cv=none; b=TL0iCDSSYmf6f0PWvxY0Obcmp6ciDXNDlw6JHOCCRJ0YkFQGIUuM9mVwOKCRH1rZRKbXuH xDbt0ksa3gO7nBGDiCTGT0Yf2f7NLmYB3zfaA0Uj10qGX8L/k//r/Gq+b27pu0rCtmRC6n aVB5alH0czODeh5fDYIvMAsZiqMfUtwbtzLfR9dPrtcaE7Z8i3fR22hXcaWUC1wQR76lI/ i21y+zaiPdW5GYC4SR8ButgXRNP1+BhMFySTUzYxr2JKxncKniwbD7bgYRmYzxQrljktAf Qe9BTIc4T1HIDC8ombKIuYf8i0eKkNIKSmaHXJRpaOKv96Lxzwp7Da956nbVqA== 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 4dvnNy0rXnzCmD for ; Mon, 19 Jan 2026 10:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 340f9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 10:53:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: a2c87d4f88e1 - main - symlink.7: add a new section "mount options" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2c87d4f88e1bfe3b7007fa7148ebc7d37fc54cc Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 10:53:06 +0000 Message-Id: <696e0d12.340f9.18aa526@gitrepo.freebsd.org> The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=a2c87d4f88e1bfe3b7007fa7148ebc7d37fc54cc commit a2c87d4f88e1bfe3b7007fa7148ebc7d37fc54cc Author: Wolfram Schneider AuthorDate: 2026-01-19 10:47:53 +0000 Commit: Wolfram Schneider CommitDate: 2026-01-19 10:47:53 +0000 symlink.7: add a new section "mount options" Add a new section "mount options" to explain the mount option nosymfollow in more details. Differential Revision: https://reviews.freebsd.org/D54530 --- bin/ln/symlink.7 | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/bin/ln/symlink.7 b/bin/ln/symlink.7 index 28d9908f2053..db251e1d2985 100644 --- a/bin/ln/symlink.7 +++ b/bin/ln/symlink.7 @@ -72,13 +72,15 @@ or a loop is detected. links that may be followed, and an error results if this limit is exceeded.) .Pp -There are three separate areas that need to be discussed. +There are four separate areas that need to be discussed. They are as follows: .Pp .Bl -enum -compact -offset indent .It Symbolic links used as file name arguments for system calls. .It +Mount options to ignore symbolic links. +.It Symbolic links specified as command line arguments to utilities that are not traversing a file tree. .It @@ -178,6 +180,20 @@ The system call was added later when the limitations of the new .Xr chown 2 became apparent. +.Ss Mount options +.Fx +has a +.Xr mount 8 +option nosymfollow. When this option is enabled, the kernel +does not follow symlinks on the mounted file system and return EACCES. +You can still create or remove symlinks, or read the value of a symbolic link. +.Pp +This option is intended to be used when mounting file systems from +untrusted external storage systems or public writable /tmp file systems +to prevent symlink-based privilege escalation and sandbox escape attacks. +.Pp +The mount option nosymfollow first appeared in +.Fx 3.0 .Ss Commands not traversing a file tree. The second area is symbolic links, specified as command line file name arguments, to commands which are not traversing a file tree. @@ -478,4 +494,5 @@ whether specified on the command line or encountered in the tree walk. .Xr unlink 2 , .Xr fts 3 , .Xr remove 3 , -.Xr chown 8 +.Xr chown 8 , +.Xr mount 8 From nobody Mon Jan 19 14:33:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvtGt1S3nz6Ns7T for ; Mon, 19 Jan 2026 14:33: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 4dvtGs6BrTz3dtp for ; Mon, 19 Jan 2026 14:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768833189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SDAj4/MBtMn3HJx0k+QzduBh5BBFcbvA2VuJQIwC6+s=; b=nua7y1mNhl8Bb1BEzf+lqelTq+ip3b2Hsaj0Gm12r7WMLHr2QeoOXWSjT7yvdGZ1SvUOYA z/HIBI4MY/YkDzcCyfCDD7WsovjhOfAVu2CouZ3wZ9ypVTDxKkRQhHVQyebUc+1cyhSbD/ gOtx7lojCVmJajD/M1Q2Jb9DzRKzkFisMUR583p14utJ023fuTH3SV23dAiW7dh4HToQ5v Ft6gVsXZUtdATb2aFcOnuX/uOQPpoQMcDyhVJSen4u5qzHNBPI3Ff7Y61eEx8m8TPOLb8K dM6KpCR1Mj8udylX1BukjupkkydZFOJoO1r87wu606BC3OwJD+Q876IZhsHxTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768833189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SDAj4/MBtMn3HJx0k+QzduBh5BBFcbvA2VuJQIwC6+s=; b=v+01SbrhmzCUKfS+KBNNBR+C7fUaigtCoTxHcPtbU/970M5Zzi73zNE4ay0lfU3fi7bwHU 3C94KD551b4GYgIIWyPmVn6klU/MHaJKweNR9IPdFaYDUUek/DceHKJqZI8KYn9MFq8wD+ a0imOaqaaQXJF55W8dQpzG/tIaAr8WvuOjEtwGuzlCTO6RlrgLX9kq8eHRpHJqdF4m/PJc sdgMYpWAAi2P0WLVg4BxDYrV7SR4cyX99usZl5mL5KG7zAyS8+2U9J+ixKTjyMy6LOrEwe 1WmIOFBkYz00ZQcpVygBAhJOtbvoIoE+1DTYeUMEWunWNqStUNk1ZOaxKUTvAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768833189; a=rsa-sha256; cv=none; b=AfcgkF6oMThVdc2zeXVX6og589k8/EGWqMOy0IJAOIE5hY8hhaHJnLuCigpTFI8zABG8se nMLcbFdhaHYAKbB2AzhmSwDsTvOSOZcss96bogNgkPAqcLvH5MUP82VQ42ROmM/xaPYkNe ZlWq6lzbAnkoJurUMnLWJZhGDkih7J7dZ0h+GiEn34o4VVNkNSiEG1it1UY+3tKZJ9284Q JoDYjGWBmHHYvpf19Aqy+IUuWR/wdAF2o2y2qv+bTUGl1xueVC8fgRs0YUov5zV2zDfAZS 6sxokrp+P/S6mm6AX07qbtF6jAPDHxLCHWAqIob70DN7BjQcYyG9P50C7gUlAg== 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 4dvtGs5pKRzc5F for ; Mon, 19 Jan 2026 14:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2106b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 14:33:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 99afbc5cc7ae - main - vmm: Avoid clobbering errors from vmm_modinit() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 99afbc5cc7ae8ba7b112fbafbf24ea2575a65ba4 Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 14:33:09 +0000 Message-Id: <696e40a5.2106b.55f274bf@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=99afbc5cc7ae8ba7b112fbafbf24ea2575a65ba4 commit 99afbc5cc7ae8ba7b112fbafbf24ea2575a65ba4 Author: Mark Johnston AuthorDate: 2026-01-19 14:29:33 +0000 Commit: Mark Johnston CommitDate: 2026-01-19 14:29:33 +0000 vmm: Avoid clobbering errors from vmm_modinit() Reported by: novel Reviewed by: bnovkov Fixes: e758074458df ("vmm: Move the module load handler to vmm_dev.c") Differential Revision: https://reviews.freebsd.org/D54750 --- sys/dev/vmm/vmm_dev.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/vmm/vmm_dev.c b/sys/dev/vmm/vmm_dev.c index a5322f05d28f..fa51dc950459 100644 --- a/sys/dev/vmm/vmm_dev.c +++ b/sys/dev/vmm/vmm_dev.c @@ -1228,9 +1228,11 @@ vmm_handler(module_t mod, int what, void *arg) if (error == 0) vmm_initialized = true; else { - error = vmmdev_cleanup(); - KASSERT(error == 0, - ("%s: vmmdev_cleanup failed: %d", __func__, error)); + int error1 __diagused; + + error1 = vmmdev_cleanup(); + KASSERT(error1 == 0, + ("%s: vmmdev_cleanup failed: %d", __func__, error1)); } break; case MOD_UNLOAD: From nobody Mon Jan 19 15:50:01 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvvzY64CDz6NyZS for ; Mon, 19 Jan 2026 15:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dvvzY4FPGz3qZQ for ; Mon, 19 Jan 2026 15:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768837801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yjquCRfFG38L+lJX6lHNkSfyLiJYySD8+BswKac1A78=; b=hxPns3bhg6PnOTbYA2+6c8lDcxL0MgZOfRDdMmGSqMS2h/e13xLxOUFwttAK89MPzqiwUp 3r5uW+UMd29r2UmZXbi4jybXmqBz6vDBxi8H0ClHsXjwMrkf2RPjuX0D89gJkR1p9wlKMK SP9C19/2C5FjblT7KgQZkT+IY0sUe4SVPUXKVCTZgRoBlAO3jpKnEY/Z/JSG8T7jGCAVsc iE7XHDWShqNcE1tY80NlNJzQL7fptCqTekRgO9FpMuZOPU0xymlIQAfgZcoMjIJ3Fd9ZMs 3t0C3ok4TxZZNrle0PuGhloKd0K8wAEjT7217sEzusBjyDG2PsT3bmtgg0Gmpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768837801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yjquCRfFG38L+lJX6lHNkSfyLiJYySD8+BswKac1A78=; b=WE4/FHlFDDe34SEJO5RbotdptDEgCepz1o03EkU4MDriixVf6ij7kKs02X3B6d1wntiFd8 1wzv1pKAAYyPRA9rMVzHXRI5X/Bqbkax++b8NdYZXxYJpmbU8tXNoB2vt73420BUPEljFh v3p7G1eiNCnEyJdh0lmXSFsJCmfXbPJUSeyZaquLyTGmV/80z1lMRyh9IQK5VJCnrd1Tww v5Z+Dg7MlBXzYyYHZ0xS/yeyYBOdEj+uYlD2GLx7qyaDuo5Hervs8v7fBI+KPytZEEjjEX 0EwFsN2lgLU9DYKGIc5EBUaKE/nW5P3J98WBo/tGiUrZrQlIics3zw9qP8w+KA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768837801; a=rsa-sha256; cv=none; b=CxU7X6Tgqz4SWsxDkWD9wDR2W899/RFTjETkz5+mM4NKM4tX8ayAZXWJBVGjo/72ldok9F 0Pc4PLOMYJpDiFiqDLS0iYbiBSGTRcKraVTyOss/P6EvSEG/skQ8cs3ybjEBZ8hIFOkmJ3 WMUKUSJB2mPZLYqOtQQkK8ssxY8doPdTTvVEbbuGFNN6n+2KHI2tCkBXjUVu9lANZaCKTd yQi32i9BzPiEZZWLpnuey7j1+GFsym+YCTJP5gtUvcf+x2/CNBmM/9+7MvHqfyJ4d8qrmk Lc+M9OvxNyA0f6x0ARuQ3Kf/AmaJrt0noDJLqptg5WdHNE/hJvpZNTGtZKKOAQ== 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 4dvvzY3p3pzfMT for ; Mon, 19 Jan 2026 15:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 308e8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 15:50:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: d91ae61f8fc2 - main - iflib: null out freed mbuf in iflib_txsd_free List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: d91ae61f8fc2dd4ab3c208f25570b91a0725e2e4 Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 15:50:01 +0000 Message-Id: <696e52a9.308e8.211fdd74@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=d91ae61f8fc2dd4ab3c208f25570b91a0725e2e4 commit d91ae61f8fc2dd4ab3c208f25570b91a0725e2e4 Author: Andrew Gallatin AuthorDate: 2026-01-19 15:41:02 +0000 Commit: Andrew Gallatin CommitDate: 2026-01-19 15:45:49 +0000 iflib: null out freed mbuf in iflib_txsd_free When adding the IFLIB_GET_MBUF/FLAGS, I neglected to NULL out the mbuf in the descriptor ring. I didn't think this should matter as the I thought this code was only used when the ring was about to be freed. But I was wrong, and leaving a stale mbuf in there can cause panics. Reported by: Marek Zarychta (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=292547) Fixes: 14d93f612f26 Sponsored by: Netflix --- sys/net/iflib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 5c37f199e84c..b0e4bb9470c9 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -1890,6 +1890,7 @@ iflib_txsd_free(if_ctx_t ctx, iflib_txq_t txq, int i) bus_dmamap_unload(txq->ift_tso_buf_tag, txq->ift_sds.ifsd_tso_map[i]); } + txq->ift_sds.ifsd_m[i] = NULL; m_freem(m); DBG_COUNTER_INC(tx_frees); } From nobody Mon Jan 19 15:56:49 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvw7Q1L5bz6Nyk1 for ; Mon, 19 Jan 2026 15:56: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 4dvw7Q01hhz3t1Z for ; Mon, 19 Jan 2026 15:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768838210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bZz4j7UA1aj+WglDzXFwYTrtX71iMyPPCuMnb2ugD2U=; b=KdsviMxrJY1zFBqLlhuKsPqE4GONf1lsQ5ERKyiJ8iax9NCZUitvVokkQrgqMQXKcGNZc9 3B1My7FYX41dK+XMTMu1i94RKCuF9sl+Q7VNro1Bsvkmuwlu/JgneB0gmhyrxKRna5v4Ze 4O/WM7Yt8q1hZ6SLdU690CF40cRXBRjAEFoPnzr4MXdfMXTVmCoZ3jGll9MUcHNKj+cAN0 ASt8LhB2MS2mi8EB2fX9BVKoWqdxlDqdO4T5h1b0lpmei+RXrZxyoOJounPHk+Nw5uW6e+ HdJECgNk+7mjn9PCz8kNNqtk4fCyzzQu7d6AWs5YlUpa+Yxe7Aicf7/VMUBdQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768838210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bZz4j7UA1aj+WglDzXFwYTrtX71iMyPPCuMnb2ugD2U=; b=e8zKdMLmarSJoToQvuFFos15zgv52mckl8AAJWGgZ60GNgBnIHcGleZNcleahW2WSLX5BU O4iZabsnzAMQFIJy+0rfe2WimmU0SxMZ92I67De5Iy8F68Ezi7Ca7qbq9Xi29mSrWwZ7Xu 2H5Mx7pkoKIIGv74wE9JSI9FgUwVF/9lvWC20j4sKuy/2YXCh1kXWa4ACackmTfYvG82A5 AUWS3tBG69VqbgwFDoBPn+jpg8Xcv2Qp7ZTsuNfplVrVYA8y5oEDFROzGycZJ8bQpnmkUg vW9ElKYA6bD2X2uj32epAIMOpgzgZ3XYGPoeBv5Xw6FSaRKkkFwyWQvCKgcOuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768838210; a=rsa-sha256; cv=none; b=H9V+mayyb8fDIALBMJoiWCuyHO93mUlzZTgAvkCqmh3h5ju3X/UyFrBiJ67eJS72t7BeYI 4HhUN2rsW/pUeYSJGABqHamsi46PJPBzpIVR++zJQrJCJFIAyaLSyQKKa4GhiBoaSHazjK EUafom8kzBQR1Y37tgBijmDX2lxQ94UR5Jkql3cxTfVUez3CRh19K1TdNqhUiXm51H0aPE dnmQ1ICYdl8IVfujuP8g9kEveEqsDY0o1DQRMkKGYlePH9iNmiQ0203Bsv/DK3Bt4VM/Kd OXMriGfqA+uAP5PX4SOd1s17MS45APqkNPGB98fjnkqJ2binSU61bTm6Tb4oeQ== 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 4dvw7P6SVTzfCy for ; Mon, 19 Jan 2026 15:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3121e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 15:56:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3a6289e1e53f - main - .github: Disable checklist workflow on forks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a6289e1e53ffe11b91b754d3b8241001b2cbfb8 Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 15:56:49 +0000 Message-Id: <696e5441.3121e.5126d838@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3a6289e1e53ffe11b91b754d3b8241001b2cbfb8 commit 3a6289e1e53ffe11b91b754d3b8241001b2cbfb8 Author: John Baldwin AuthorDate: 2026-01-19 15:56:20 +0000 Commit: John Baldwin CommitDate: 2026-01-19 15:56:20 +0000 .github: Disable checklist workflow on forks Reviewed by: imp Obtained from: CheriBSD Sponsored by: AFRL, DARPA Pull Request: https://github.com/freebsd/freebsd-src/pull/1973 --- .github/workflows/checklist.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/checklist.yml b/.github/workflows/checklist.yml index 303db9eb8534..65e640a2a0e4 100644 --- a/.github/workflows/checklist.yml +++ b/.github/workflows/checklist.yml @@ -13,6 +13,7 @@ permissions: jobs: checklist: name: commit + if: github.repository == 'freebsd/freebsd-src' runs-on: ubuntu-latest steps: - uses: actions/github-script@v7 From nobody Mon Jan 19 16:20:46 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvwg32sYsz6P1fk for ; Mon, 19 Jan 2026 16:20: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 4dvwg26tVfz3y0W for ; Mon, 19 Jan 2026 16:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768839647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t+TYdzAe4vYqr32nLq7Omu1VfZU+M3itrsXbLOQaifw=; b=K1dolN5Y+7YKOlnay2Y5nDe/N1jOzrol+BmEu43/Pvkh/pGR+9p+oR0rkjebG/0V7mRzHd dnSpXhjr303NJaa7MXizuYivjFsc9OLsr7HutypFGfLhb3NfITCYe9fKxw+1cCHasApZVX lInI4nORE/QPpI4QPdHy73MkiExqcoMe4w/uz15a9nHTQe7rf6BL2vK0JqCH0tQMUesGuD oCykJgFzhsWCDMidmZFg10LME0tqS7UlWVgN3YHUSCAkvSXpcLg6swgVsRGVmvmtW37dKz m7mXJgodmrfc78oegvXl02+eeFx82odI/0n5+/JuOUIGQgL5mVqu3X+DKFnXfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768839647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t+TYdzAe4vYqr32nLq7Omu1VfZU+M3itrsXbLOQaifw=; b=ZXkK+UJ6EW1mNbHCEqX7mpcu5fmpKKigt/xw5iySgRh7pWiSj5qqJG9j9b+5VfCPJZjcw7 DoIkCWJd+o+y0Ek97BmGtEiYHZuF+wUQ/qSjQmS8ANXNASWliktWd5RATL9+bDlJK33YUz 4qgQe4EJ/wtB1S/PLMu5BpoeAQifGaqItvdWu9QeYhnKYsNK+VnEgND6JOIJrcHrFfh+Ep FGf1BpAbvBOoiRIc7dIAl3oRDUEQGSRV6VQC3yOP2ILMhWf8OSS5yvjr1eb614zCm36cun JShMJWjP8U7cPX0DfRQLLw9nLGm7qjryUOjo8PFjNlC3q0WsplH0G0TSu4JURw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768839647; a=rsa-sha256; cv=none; b=EEta3w0nzdLLoO6jAabfN6+hDyB5fetv4p2Z8yNjNNR1nseQRE9tLeu733xE8U7zfugaHA O6V/vZRx0ednSyZ1r5KUHkA9/5UA/W6DuNZYmMzZ1AAmpDco0zm37QYHT9iLSdB2JFDCYG jZakkBptEMzBWE3CsgPViaQo42F3S6rRcjNxKT+IX4RvwZzsZVJMoN5EYr3dGQYMiAgeFb 7L9KJhCdH/jiCPciNtYl9BCh1wd5ZASATS6OpTEpAQRaQVGV7+kG7En4wD9Ymp7JxtCwrq JqKxLvJiejB5cyM1LNjW9c6+Gw3JefclPdDnFqmlkjYwFf+/jVIOq2V9PbniRg== 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 4dvwg264LPzg09 for ; Mon, 19 Jan 2026 16:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34332 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 16:20:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 83d988288675 - main - sys: do not allow entering vm_fault() on boot until VM is initialized List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 83d98828867591b5d842573ed6edcec7392f82df Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 16:20:46 +0000 Message-Id: <696e59de.34332.c043f54@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=83d98828867591b5d842573ed6edcec7392f82df commit 83d98828867591b5d842573ed6edcec7392f82df Author: Konstantin Belousov AuthorDate: 2026-01-18 21:14:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-19 16:20:36 +0000 sys: do not allow entering vm_fault() on boot until VM is initialized On amd64, a hack sets td_critnest to 1 in hammer_time(), and then clear it before returning from hammer_time(), which is too early. Instead, set TDP_NOFAULTING for thread0, and clear the flag after vm_init() finished. Noted by: adrian Reviewed by: adrian (previous version), markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54768 --- 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 4144297d674c..39357b8d4440 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 Mon Jan 19 16:20:49 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvwg55j2Vz6P1jL for ; Mon, 19 Jan 2026 16:20: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 4dvwg50XqSz3xWv for ; Mon, 19 Jan 2026 16:20:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768839649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xC9hYirVVMIh6xTPYvfTEx5NxynJHn2QI6Xd5UjmwFM=; b=Y2RzELve1WSJFyv8hTars41mQup5rLdjOhRo+ue9/4G9RiqHVyt9FbUM5ocKcaTAB0/+GB SA1GrP9mudJvRE7D7yySBOshvWTQjnz8VczgC8Fx9mybPvDYXhoyVSKabJEMHouG8Wx+t8 LcIDYRcaeZ5jwMSTwVqEk+A7dhyAxPuS1g6baZbFxtLf0DNnYpx2DoTv1XRPFnBPp9CP2j etfyzXAYK+H5Ia7JE+bm4qcU4rOh1j1bV3cjLJ39UETNZpH1qjhe9oAqGCTSmb0TKCwu82 BaeQAOkoRA/yHDERePlAuK0EOSL8hOx8SdLzPw+aFcvcJvfNAiVsNceAQRHT3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768839649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xC9hYirVVMIh6xTPYvfTEx5NxynJHn2QI6Xd5UjmwFM=; b=HE1vSW69yCd1NcwJtgt5Oq8whjekQsMEKDr32QSJgBaT0IrDKJ88SAGTp4cmEePCe8uYaq pheFxi51I/dyhTqASAvidBgRzosCS8egfaTcz19qkSmZMJnYbG2+letLsFukbRbQzzD0fH N5YwZV8UWrJXhhDFozkAJ9KV75uNFa+tGyG2uyJKJDGqiBZss5/ayEhOzuWy53l+P4DHUK xXjkGZ5ILCR9Dqdz8ke8cOLy7Q2XqKMWA+8GObN3zoZTfz3Lm0L9RqS3jxGbZEZSWvmrAo oPl9L6YRjhadRW5639pd3RhgcwJ1hjhDwMdqWqXzcwNJpWvXdYYlGaoBd0cOQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768839649; a=rsa-sha256; cv=none; b=jjNlLZoqpl3QIr9qpZeOzu10XtwpD0MU3CZDyTAWwysKFdElFM4qjjO9oB0vdN65EnZPKd 0zXHcAAjkYf3yb/rRV78OxnXiuHS+k9XeirLOD3oUsuHoKbMU2oZaf6IwSXqZqIBncmX7k 31+IC1+/iXgThT2DZUlvKb7Nrs4Uy2+ONumAYdE1aIm/t4Aw0gIo10f2OPCbFQYOL8Nl2j heZ6/K0964PTxZClNZ7F9x/uOgdXg7ISMfqXdUWSLfvR14B9+9aMYTiSOKl9yqMhAUSU3n NvXxMiho3VUu3uQlehRTDqovwTJCmsRwlRlYsAilNu1KHOrVW7hWfro72ZCTsg== 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 4dvwg505kJzfbT for ; Mon, 19 Jan 2026 16:20:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33d19 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 16:20:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 709a53c8b20b - main - x86/local_apic.c: Properly calculate the number of LVT entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 709a53c8b20b5770f7e2f117d4799b5617479976 Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 16:20:49 +0000 Message-Id: <696e59e1.33d19.4d981373@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=709a53c8b20b5770f7e2f117d4799b5617479976 commit 709a53c8b20b5770f7e2f117d4799b5617479976 Author: Konstantin Belousov AuthorDate: 2026-01-19 11:55:36 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-19 16:20:37 +0000 x86/local_apic.c: Properly calculate the number of LVT entries First, the CMCI entry index is APIC_LVT_MAX, so it was excluded unconditionall [1]. Second, the number of entries is reported by the version register, and we must not access past the last reported entry. Reported by: olivier [1] Fixes: 11f954b021a1aadde1d03d40ed5d6b529e14da98 Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54773 --- 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 Mon Jan 19 16:20:47 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvwg42Q8sz6P1ZZ for ; Mon, 19 Jan 2026 16:20: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 4dvwg404knz3xnh for ; Mon, 19 Jan 2026 16:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768839648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=chMWPVCWMkgQ6GOc8Z3YraneEkWOVdVolOpSZfqdK6Y=; b=AUKMUO/EViN7OHWMLwnhvw0AJT09g561mrPkme1bjYdxFXNcx8KYc0rfgQbYqB+L/7BKjY N/lZB7lHAw5QD3GbNAqf/0pTkLy4HnjpVG7oF5jsg/4J3N6fLlteao7M6ZmU0EIlNMOsw4 8Hfg7ysYOerppFbKdqQkYFer/tnGBrrFErvWX84Ri7tjhSqzolte5rlzvMihP79meDhaPe XPFpDYCYzmlXksm05XDF3obx8OPOJHvK1mBIeFAMZbAioygf5bXnH1pfg/UsnC0aIVhne0 3/HxmJ4bXGutIz5REpZwJun3E2E7k+30uBNba4abccXhnRt0B7tw+QTqg5gAcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768839648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=chMWPVCWMkgQ6GOc8Z3YraneEkWOVdVolOpSZfqdK6Y=; b=AgVQRUw2Lp5AjuLXANShyiwd2gjVDv9x3XrwNwGju0KHue0Kug29FkeGO/XDUlyV3AQ7pV W48CGI5MwrGZYmt96czSk01GL0mUl/A639vFb2jQcKpeRLz2jNDVSpwPGPOkYnn+xlnBU3 TNdaIE7wOTvNpSSiH7R528FC+IlM6LIAbl25HBDSLccT1QG0qYDRTqhA6xMpNtA+hH6abr H6a4Z3X3xD9zCRSPEeDSD9inpg0EYrUgeqezY+7hFkwrBPTaCX3PTC6yrbZ0QyKL/9Yeba 4N3kPbBum1xM6FfVIu8ecnWnICtwrZq/A5rbHplv36cyIoI+TinhtInxapCZjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768839648; a=rsa-sha256; cv=none; b=mf1Z38v2fuJpAO1S6vqLeGrMGkh7EFwRCKjkMhhw4Wayznt778jUBBNDDCPjARQOcJwVnB c5CrRemImJ+LdISAh9s+/zQkJI6ENQXHPPlp/52KGfDIXrot6yQNeFNzA0oxm6rwkSVIxb bYrrCuwzWLzMbmXLh6Dzp89Uv5THOVRu9KhxjmAjoDjpfsJhdOeV/c9bOpT3Zaka6a6bqn jEXDBEZwg66yuBDL49naX5YYrkKvZGsaw/CvE5VNFEOV1vPq2UqBtw7wCY0/Xfyp9lFTMm d9aOvg0eaz00CmavvLojvgFkzeweBUcNpecP1d2858SfnnDNH4THyNajcue+/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 4dvwg36K7ZzfwW for ; Mon, 19 Jan 2026 16:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33c97 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 16:20:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ad5e3cb95034 - main - x86/local_apic.c: add lapic_maxlvt() helper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: ad5e3cb950344f9822dbbd90f5ac7c256f97fa4c Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 16:20:47 +0000 Message-Id: <696e59df.33c97.37dc64f0@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ad5e3cb950344f9822dbbd90f5ac7c256f97fa4c commit ad5e3cb950344f9822dbbd90f5ac7c256f97fa4c Author: Konstantin Belousov AuthorDate: 2026-01-19 12:50:09 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-19 16:20:36 +0000 x86/local_apic.c: add lapic_maxlvt() helper that calculates the max index of the present LVT entry from the value of the LAPIC version register. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54773 --- 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 Mon Jan 19 16:30:18 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvwt23xKDz6P26g for ; Mon, 19 Jan 2026 16:30: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 4dvwt21MYBz41gy for ; Mon, 19 Jan 2026 16:30:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768840218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qo3HCuSQQw5aINDbk1SlPG/IlvwGmHkh1b/n3hZRNLI=; b=XTn+Z+ENo8LvKgDNOoTh15GZkihSKXptuHt5pT3sxOA1ECw55iZzLZfssLxekMqvMe8AkF VLdFSKJ9+76uyqFN6DM6ai3Xy/gKLsgNZ74kPrxqiUGQBW0ByNNpzR64oTs9rfAiJCWlja BetDAdgk/SoPwJYv0j/51B0WEPEl9CtcNA1xltD4nKGirZVgK1U8YH1PBDbmo3pL1jI6Ge TuWln8bIxFGGpAjpQhWWNOsbUBRpbrmBJOrR3RvvfrzVZUBaHZNMKrWIq21rJrHHdoZljU DqQT+l9b0QCCyKxdJf4ln4NJEDr1CF18OUkHQvf+0TUlwfQhciyX/HVOmwGM8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768840218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qo3HCuSQQw5aINDbk1SlPG/IlvwGmHkh1b/n3hZRNLI=; b=SH2s7f55EEpcMoOI6BRIJhI+IDMepnYjnfq+KAlSnoYPZL3YMU/U8EVVvQqRLjKx2aAua4 T4fdjRLrsCepEfPx4oo4ROwa/Dw0e9T/o/4s0onqOhst1byU7EP3chtU8gGYmiMHop3pSU pLb0dUdSoEgDQiT6xmwrH5VojYuLcxZee9z19sn7k3L5TDrMVdyi8mDKTnVc6v3b7UppG6 88D3CPCKZZ/Enu0lD31axzEz+w8noSyyXO1DdiG+ukhD6GcYTMUGA+bdfB6UfTMP7xSrmN wPEuDQFe65m/sErPgj6MIBmxEqfIvGM+tiQJvvwjxPM61UAhrmb/ahJ7/NSQ9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768840218; a=rsa-sha256; cv=none; b=cYlYZ8Z2JIOofjdtmXEFuuFgsJTlunjTTbIup0URhIMjub9ucohlL2gz5n6WroiTFAZmGZ RjMWPFAmjg/lWYIzYuJFvfu0Iof4jiREvt0N1sCaRSeiskwpMrOhTKAtn4TcWgaheZcQ1U /SnCGRPEcMgdy0LO2FU6TmgXiK8X0TZL6oYXfq/UXF97l9yeTGt+R6QgEm1FDY9DaKvKQO 20LqZk5zJShPSyjGBMp0b5Yj3ALyz/6skaMJbeh01yIqZMoDMxlmIOq5qrRDckPi7RtBm/ onbFR12NqIObUv74ZYIYDK0mYRvVb6Q9lswuqceBumTSRh2bwj4mIOOg9qRY0w== 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 4dvwt20kJzzgMR for ; Mon, 19 Jan 2026 16:30:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33bf8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 16:30:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 4b534b814aa0 - main - acpi: Fix not calling AcpiLeaveSleepState() in S3 path List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b534b814aa03b44660ede6d5f1a62cb33c24115 Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 16:30:18 +0000 Message-Id: <696e5c1a.33bf8.2bac138f@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=4b534b814aa03b44660ede6d5f1a62cb33c24115 commit 4b534b814aa03b44660ede6d5f1a62cb33c24115 Author: Aymeric Wibo AuthorDate: 2026-01-19 13:19:52 +0000 Commit: Aymeric Wibo CommitDate: 2026-01-19 16:30:10 +0000 acpi: Fix not calling AcpiLeaveSleepState() in S3 path When resuming from ACPI suspend, the ACPI_SS_SLP_PREP bit in slp_state was being checked and subsequently unset when calling resumeclock(). This bit was also being checked for the AcpiLeaveSleepState() call in the non-s2idle path, but having just been unset, it was never actually being called. Change this so that resumeclock() is always being called (since we never goto breakout between suspendclock() and resumeclock() anyway) and ACPI_SS_SLP_PREP is purely used for AcpiEnterSleepStatePrep() and AcpiLeaveSleepState() in the non-s2idle paths. PR: 292568 Reported by: Marek Zarychta Reviewed by: olce Tested by: Marek Zarychta Approved by: olce Fixes: 7669cbd0f064 (“acpi: Suspend-to-idle support (s2idle)”) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54777 --- sys/dev/acpica/acpi.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 518cbce19e33..c76bc8477537 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -3645,8 +3645,8 @@ acpi_EnterSleepState(struct acpi_softc *sc, enum power_stype stype) AcpiFormatException(status)); goto backout; } + slp_state |= ACPI_SS_SLP_PREP; } - slp_state |= ACPI_SS_SLP_PREP; if (sc->acpi_sleep_delay > 0) DELAY(sc->acpi_sleep_delay * 1000000); @@ -3672,16 +3672,13 @@ acpi_EnterSleepState(struct acpi_softc *sc, enum power_stype stype) case POWER_STYPE_UNKNOWN: __unreachable(); } + resumeclock(); /* * Back out state according to how far along we got in the suspend * process. This handles both the error and success cases. */ backout: - if ((slp_state & ACPI_SS_SLP_PREP) != 0) { - resumeclock(); - slp_state &= ~ACPI_SS_SLP_PREP; - } if ((slp_state & ACPI_SS_GPE_SET) != 0) { acpi_wake_prep_walk(sc, stype); sc->acpi_stype = POWER_STYPE_AWAKE; @@ -3691,7 +3688,7 @@ backout: DEVICE_RESUME(root_bus); slp_state &= ~ACPI_SS_DEV_SUSPEND; } - if (stype != POWER_STYPE_SUSPEND_TO_IDLE && (slp_state & ACPI_SS_SLP_PREP) != 0) { + if ((slp_state & ACPI_SS_SLP_PREP) != 0) { AcpiLeaveSleepState(acpi_sstate); slp_state &= ~ACPI_SS_SLP_PREP; } From nobody Mon Jan 19 16:45:46 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvxCt2Qg5z6P38x for ; Mon, 19 Jan 2026 16:45: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 4dvxCt1P3qz45Lp for ; Mon, 19 Jan 2026 16:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768841146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Ce3k8V2nZpVytRQPg8JzyzF9TIvUYqEEwEjrRuid7A=; b=RfxmltWSHcQwnoG8e4qyescPdcaOwGkThgBNCPpiScsO/hMJr3TshIXQErOLDs03wrZ2hR GxD8V7RxGbBSadOJJCmEbet44PD4LFKaXmutpaQN0NpoLFq9ERhifYId6E9Fb1QtpCyWzc 4YOjl5RXiVaXPkSgr8OzMLR/887GjUPQgwkVrG2YLqXaCxgYlhZqPFQakEDjDsG7EGakla 2NYArUdUupXfOJc8S7HB6kwZO1aOzeNd9pB+t6ZkcLuM9V97ldaIWdQ3e57eSeM2P1da6R jSFtt0pAFhy0APq7KebPG61JL59TUB5cZfCz0Rbmn/dgufjur8CYo9C9hi4xyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768841146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Ce3k8V2nZpVytRQPg8JzyzF9TIvUYqEEwEjrRuid7A=; b=Cbe5va0XmIXaYR7+2FkfA1+aZIfnmOxbedgj3D3zTE0YN5pC13tcdU8zVxb8ngU4+HsBta jC1YC8KoK7YX/c/Y95VQ1NOgmzIwcKi2FQHrqgFbgVqgT7nGsaUmPzYA9X7bAcUt5tOG+H HBZi+57DhZqKORoLyTLk4QRpnuRxM3M0B18RPWdtxj+mc1eu1ITwBz+uTmU9oNvq1lORgG 8kpVKvYNbW3VnfVcRDl2ZmpsAjI4ixeoN1nYgPMiqOYldE6HfSloAX/3tZSBAjyX/YUB1C KcBMmUi3hkRm3SC8EOwcfUHhCseW3BZ5Md9RjUG3mLyjR0pKMq0+IUek/EjIMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768841146; a=rsa-sha256; cv=none; b=n8PibcXjZFjk+dUA+Q1ufqJC4+0ngZF3TEZEpd9oiqmnRFuv1nvtMNzu5gGCd0JLzNKh3i Soz8weunqlDJoXf+CryVJcXGbSKHn7kjeal667GXXeHL4r65nU1Z2T9fy2TeP2CYi/IMGA gtnlukS68PpkHqfvp2nzuc7ERF976JjZYJGQHa8d3/JWkLqTDWKIA4OTVvnC1yrVsRN00Y 5U6MPB0ZCrnXsnNH+u7qog5Q0/as5OiNMfkNS5yqm4Inf4h6YESaocbsKU7N9o2newaWKr H9/Cx4/vWj7Dcc5KHS/0ieVXipg7SZo5e+aCkPlbR9HCK+kzJaSFQqkyA9/JhQ== 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 4dvxCt0v40zgC2 for ; Mon, 19 Jan 2026 16:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3650e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 16:45:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 002c50ea23b9 - main - amd64/vmm: remove unused static function vcpu_state2str() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 002c50ea23b99b415b1b392d3dd5ea6223c3a74c Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 16:45:46 +0000 Message-Id: <696e5fba.3650e.2726d423@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=002c50ea23b99b415b1b392d3dd5ea6223c3a74c commit 002c50ea23b99b415b1b392d3dd5ea6223c3a74c Author: Konstantin Belousov AuthorDate: 2026-01-19 16:25:50 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-19 16:45:40 +0000 amd64/vmm: remove unused static function vcpu_state2str() It is guarded by #ifdef KTR, so the warning does not show up under usual kernel configs. Fixes: ed85203fb7a0334041db6da07e45ddda4caef13d Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D54781 --- sys/amd64/vmm/vmm.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 6312fafa2975..050cc93d2605 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -204,26 +204,6 @@ VMM_STAT(VMEXIT_USERSPACE, "number of vm exits handled in userspace"); VMM_STAT(VMEXIT_RENDEZVOUS, "number of times rendezvous pending at exit"); VMM_STAT(VMEXIT_EXCEPTION, "number of vm exits due to exceptions"); -#ifdef KTR -static const char * -vcpu_state2str(enum vcpu_state state) -{ - - switch (state) { - case VCPU_IDLE: - return ("idle"); - case VCPU_FROZEN: - return ("frozen"); - case VCPU_RUNNING: - return ("running"); - case VCPU_SLEEPING: - return ("sleeping"); - default: - return ("unknown"); - } -} -#endif - static void vcpu_cleanup(struct vcpu *vcpu, bool destroy) { From nobody Mon Jan 19 16:57:15 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvxT73wt4z6P3yN for ; Mon, 19 Jan 2026 16:57: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 4dvxT71dM0z46G2 for ; Mon, 19 Jan 2026 16:57:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768841835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pmoorP8p5FI9m7UShxOnPPzN2te0VKb1uKSfPZJm0n0=; b=OAmxbwxbFtbwPN9/CU2LVpsefYMYyflvaSRAusfBxUFVdaH5mU/5ZxPN4EG475SoB0kdWK AiegYL1oFb+hfOwHAkYayl8LoTKEd8tjoxOND6QJiSux4JqEU7YO6NHGymxGu3dkT+uofD 8DzcEtMxD7SqiVDaHXw1VuX+C+Sf/J53I6wDXG6VeqjNfHk86qLKf4VPS/YCPjUe1fet0o jTfLSPRtqhn04nD1ua8qAZIvPKLNAprXHb0+wEpr0OI2yhJqKVA2ju8g2WNui4+5ZrAd3a 3KDFDG1z+o5yYnwmU0+I8eYafhnoyv0oALpx8OyTPL7lXQBwOjStY3NhQhNOog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768841835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pmoorP8p5FI9m7UShxOnPPzN2te0VKb1uKSfPZJm0n0=; b=r7Ze7kyPHYiuWQ34IrUjFuK5OS6SdHgCyNe3YV1f169WvKJSikhuQNs30/U1F8mMKXOB3P ry0RInCiPUN3x6Zz2rwY0yP3W4bShXfWiNSKbD7+puKxArKt7SXPCb3LgiKLsna2dptsNy JdS/VPPlQJSpSP5VmSWNZYyQCmCFwmAnddVTWlJLHXhCJTNp6OZcSQ6lhdxiqJQ4Pn9Q0I nQgQb5xPa28CJBPhkTKcVZI+I7x/Xd/yFnQgHhBBaDG1VodzvmJAEqxtSeNBZEWIKsjm8n bPHdmFpjp0ZAKBGaTSQ83cYn5pfajrf8Vmeycs6hWmy7GnxxulTdPg4l+QE/pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768841835; a=rsa-sha256; cv=none; b=bcnwFSLFsbgIjJCTbf1JR9dDJd0suqoqmwqy62hdE5zPOyLR8IfORihLvf4ZHwR3N/CdM3 IhAOT4EL5PrI9TlNE54QDRX0yNbN0fFSah9mTpxbusVI9cLxOgsAObfUvO7GXDI/KdRky/ KmdAuab8yQWm3xZexuPtxpMIhN2SYT2etnIX+BjEeEuf+IuiEmj1CNE1DLLEA2XvBwJEVg SPIjt9pkUWtX0dUf/pOUavverQBMgwPc3i4lEUToz2zqutQK7gU7zjYTD3+VXU5t7ljHgT bOPB8ehL5hQLHh8CZjX5zGUgUw+NJKRWmLQB4FSkaAZ/qaE5iCbyuMcGlXqlFw== 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 4dvxT70TsPzh7t for ; Mon, 19 Jan 2026 16:57:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36d12 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 16:57:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ce16be73707e - main - libthr/thread/thr_join.c: deduplicate backout_join() helper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: ce16be73707eedc798b26e0741dcd70d1168ac10 Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 16:57:15 +0000 Message-Id: <696e626b.36d12.5457e375@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ce16be73707eedc798b26e0741dcd70d1168ac10 commit ce16be73707eedc798b26e0741dcd70d1168ac10 Author: Konstantin Belousov AuthorDate: 2026-01-18 12:23:14 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-19 16:49:51 +0000 libthr/thread/thr_join.c: deduplicate backout_join() helper Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54766 --- 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 Mon Jan 19 16:57:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvxT93CvQz6P3yR for ; Mon, 19 Jan 2026 16:57: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 4dvxT91yjbz46JW for ; Mon, 19 Jan 2026 16:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768841837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WGg8lC+UGkpIi3+2n3/Zs38TTGDT3GXyAdZsNzI+I5c=; b=oJvuZ2skCIXwj186z/mlGanCStZfbRlvta7SLOezyM/AUeHTS59cBReJaZxpHsJfKfaiQ4 jFrXuetEidi6KLMHdecx6sDQ0IyGlwhGkCQRN71M6Lxo8eii1jImw3ymsLlXapMetWzCPN a4xAU3BNMP6pu6l51uHJNfxReqnbgfU/QRU4SDhCrBok60VGhF8H8f8E+Pwf/fNHQ0euEL d4H7tt9YljT4v20De5ir6d1MAGM98xY2mzg6kH+Fz3TUpcc7QnkOG3rnkN7rjWLs0WrsXB /NTc9YLMOZDd6R9UXGFbW+Strg9oAcYdPwKk0kAn/uxrqslFnI5MowsUFNqovA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768841837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WGg8lC+UGkpIi3+2n3/Zs38TTGDT3GXyAdZsNzI+I5c=; b=oPDfN7OQgRmn0Z9DuAZ4mfRZPqloDcMgbkas7R0cnMM9o1VeU2B/P7ILHaQESehVqNr5jI QOCaWRCq7mVaIJV3xTqhP4Lb8GNwhYUWvRD2YRgiYHC0zAnsu0n+/qy6nEuzHdwrEJfNGs SnRjHz7dGykGeNc9w6VCDjN/+oy/HrXfDuPF+Alz0MovKYG21PP/W5lQmaXsM+eJeT9WuC MU/vAsXhg36OJZGdeWzOTKcTRbcWDttT4lYWF3fZcC2GRqDrU0WZSlT3w3ZsdfTTpIqReJ c52lT0a0jdNWVkuqU04jLLiuSkbxfGx1e/QcSqo2AoaiqZA0j2cJEY/yhs0gVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768841837; a=rsa-sha256; cv=none; b=fZ+h09qsy/bEwxlOIBhVQ4hZZ0NCEKiWWQZFvJ2uIHH90ZK7ENoIwVi43UsmZUBkBHJ+Gj /CMbxolwICg0BwToVQqnsOS+3kh/eYzV/QSKlr1N4I5lCwQyjKm7CVPlKkyHETwm2f5O+Y uL74Lf51332oRYV6BroiK6a00OcMWWnnlSaLwDlA6jWvJxMvm2M4rI0AmiddVARk0kWVti FjkowWHJNNvwm6eG75dvA11pElroy7wYwa/PmJdvgr/AuSlY88gHKh3j6n+wZBxebjf953 KjAxFeNkPqt8kSgjGNRQ044ZT/yxfT2xefEC4rcc2tyHZwHCXir1/SpI0BZpEA== 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 4dvxT91RvYzgFw for ; Mon, 19 Jan 2026 16:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36d97 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 16:57:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7f026a58691d - main - Document pthread_tryjoin_np(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f026a58691db1763203ab8c7c8f34f738bfd9d5 Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 16:57:17 +0000 Message-Id: <696e626d.36d97.214fb984@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7f026a58691db1763203ab8c7c8f34f738bfd9d5 commit 7f026a58691db1763203ab8c7c8f34f738bfd9d5 Author: Konstantin Belousov AuthorDate: 2026-01-18 12:53:12 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-19 16:50:02 +0000 Document pthread_tryjoin_np(3) Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54766 --- 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 Mon Jan 19 16:57:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvxT85D5kz6P3vy for ; Mon, 19 Jan 2026 16:57: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 4dvxT81KVgz46fv for ; Mon, 19 Jan 2026 16:57:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768841836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VcbF4YTfNuQcQYiNCgOTKQ+acK3AkCka5BixFE9rGbE=; b=F2gf4Rl9JqpuDnRg66ooYo4QRJYNxYEjlrCYqrH6jhBzkBYpdDTG7Nx8/gTsCAmvBuFyCz kdtr6PFMGc+kJO8zGWceIACGa/dInuAma7Zc4oCt4pRqJgKGF5BvXbkxcKmd/XPkmhO1KB fMIhzONw+S9estcF70JZZO+Kf1OnYKW4eX6Yqd2l2He2RTFFRS48u2s78zcon8YjjFkj19 +ojF0TW0JvlDi5d6V+9Yrd9d6zgZchRrXARw/gRlealYCrtriIvaxJ38yjYH1zVL6bciw/ h9eBx/Fwe5p50vjhO6u1v/VonTm/YAU9CvJkhc9L8XJpazNuToD2AwUSGDqVvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768841836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VcbF4YTfNuQcQYiNCgOTKQ+acK3AkCka5BixFE9rGbE=; b=GXNisrn96PsvdJZHaEHrFwZ4U96uImXnbrSSvXh2ipxfa8aFibu4pcfjrMVWadtAFcRv7z iKHO9t3DHCmtF2i3RmNjRRroaSzehG6OhBmf//P3IT/wOoHSQi1qlqKr3a4ixPIqEUIDP/ WqAWbCMHJajleUR2ggPWxAR2ERYccDnq0kOQE47iCYF5Qfao+Ufx65oG9PcXzqBs1/4aFw dtO3fHPIwicFUqXe6lbPYm3XfcCmJ9kmsdjySn0FdRI92Sh74i3Qx7ZQBrSOhuD6U0S6+n SZYb0UGzBaEVBT/S2ABG8uQnEBoE3UHeaAL8muM5JRnl7a8EpQtaPzLQqYVYPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768841836; a=rsa-sha256; cv=none; b=IbAOGCffOMHSNQUMyyT14dEcwVUh4eCquvd4Wn9kaSP1ZOQFOWfLQOMvYuPfwDN06VMU4E uPj6fWkL+V/TriDHUkwv60b1DF1daP307/N6Ckzugr3TJil5NoF3WJZz7BldUXmuqKErq2 pc/bZL7F5cteSSu7VippeIF1PM+pyGAs6IgktSiyO3qM0R+fQvgJuNvX3dsZ4q1UlsogX2 4f8aoWZ9SRpOcMHFmsgS460QFrJVjeSwoZqBYbJmAjkV6l92I973cIpS3ze/Mp0564m1/U 7AkRVs2xlFxEEl2wKNA1JoqHQKOLaWmSKG+V0FSNwC/+Ul5O8ueqvBWgkNFXJw== 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 4dvxT80qL6zgw9 for ; Mon, 19 Jan 2026 16:57:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36aed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 16:57:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: afa70a8496e9 - main - libthr: add pthread_tryjoin_np() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: afa70a8496e90fa751418be8d1b55e3d559a281a Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 16:57:16 +0000 Message-Id: <696e626c.36aed.44afc106@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=afa70a8496e90fa751418be8d1b55e3d559a281a commit afa70a8496e90fa751418be8d1b55e3d559a281a Author: Konstantin Belousov AuthorDate: 2026-01-18 12:26:46 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-19 16:49:57 +0000 libthr: add pthread_tryjoin_np() Similar to the same glibc function. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54766 --- 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 Mon Jan 19 16:57:18 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvxTB5NVxz6P44H for ; Mon, 19 Jan 2026 16:57: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 4dvxTB3WvHz46NR for ; Mon, 19 Jan 2026 16:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768841838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=snZBkR2xRvYOGj+I+oOIAzC0e2EsMFBXvoE00t7SvbI=; b=nIWWfLDZn4gu7+MORiRhboJWQwf0vPh3zlYhojoDRgFS2ufLcLy01pC5ZyS8FgRerHTVwZ Lw5XKdeHUfcl9zy8gWCAjT5exyzWnnZmmU2PcVi44xvuoAf0j/kG9UpoO/8NGHMW6zhXgR X2RxPXmHpaihkBPjpsvQsuZKvZuTqnaHwuFAC9JyP1p8Ma9W7U7qpTT30L8M/3wbWoW9xT YdpbeOEe0WKn2wfFmRjt9E9AX5OdR0O73XIPFQqdFClddUgBDcyG6QOMRtkdfblqzbUIA3 KoIW2WWoXnuKSmlKvgft3O9Ew/aTqv7O5dynk+ALJ4aAVzlyg1JUy5ZWVGctwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768841838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=snZBkR2xRvYOGj+I+oOIAzC0e2EsMFBXvoE00t7SvbI=; b=AmXc9gUUgO/lCD/FvQI5gfrKAZxkisELLvdIhCPk+fBTKGYsD8e+Q0JhJQUOIGtDvF0PDL JvvX9uSWSH02N5sMCojre1jwgWIK92C4fTXqM+foUfTa2dHoApm+NbYvKo0+MF4vTA90yC rDBf12wQS2Zj8PJOApfEd7MwNhipLPQkmOVrZwWNsavtS3aT7HoJ39wguPOVKMJJi5+END GBc7z+M84Lg01tI1ug1jjKv8zBvBiapClzQcGHTTYeKPJ8a6g3wHzzco4mZGItTH6BXMIY 9uRlkYAuIXBXuAbwATHNVUvee5/vSHjgvCw4Jej3/s4E5V7/dKCbeNss+A1VQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768841838; a=rsa-sha256; cv=none; b=GrwdzGrOsSTM7Da/Jv3DcriXImrgbzqb3u8FudFH4dTfL27FAmu9wSJ8cfO+OZKdgVQK1r y4SzaWLMAGrPnwcPRt40NBhgoYlhqY67oeU8Jnuoba9LX6YcCTpsSgCmTDXzs0eAwv3cq3 cDFz0mw/oBU9Udt4r3qxgt2CSZ7TM8+H/OtUmSM65vd5IV5v9w8hSY7MkjxsKdeMmvOqTF 701kGdTZ8AgPFrh0/Bp7tvcPtqMSrfEAcS51yP+XbaBKUkf8whO/sNJf1WX3cceqcr1SG3 J6obgpEHOuFQoxMYddiTxTM/XokmL9NtjnNvne3sFqEkLwYCxvwqtGlKxA4UzQ== 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 4dvxTB2MJ4zggw for ; Mon, 19 Jan 2026 16:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 362dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 16:57:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 902e3057cd5c - main - lib/libthr: add pthread_tryjoin(3) test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 902e3057cd5c7a076b78dd559b7b264610af59aa Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 16:57:18 +0000 Message-Id: <696e626e.362dc.783d32c2@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=902e3057cd5c7a076b78dd559b7b264610af59aa commit 902e3057cd5c7a076b78dd559b7b264610af59aa Author: Konstantin Belousov AuthorDate: 2026-01-18 12:47:40 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-19 16:50:08 +0000 lib/libthr: add pthread_tryjoin(3) test Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54766 --- 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 Mon Jan 19 17:45:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvyYN5Knhz6P737 for ; Mon, 19 Jan 2026 17:46: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 4dvyYN4HVHz3JJk for ; Mon, 19 Jan 2026 17:46:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768844760; h=from:from:reply-to:subject:subject: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=Oeh3mea1Qsq5WHkQ71iL6HYI1ucfechUSdZA2QbHb5GXzVUYg3lbDFFdS+Z7ueka67hEiQ YmTqKTVpKzm5NuOShbZHjQ2NdTI7KsdOsx5wASAM6bP3Za4m+ibxrQsWwld9QQVGcSuB4w SdzUt+hwt/wgFaKoQxTmbTfTZhVnlJF1U7/Yd8ei1uBHfrDy8oXdM5/Lslka3S0CWsgpKq Ntd1hYbmz2WjrmyCkP5an+POhwwZdNDdYGw33J9dFwHtmvaI/3lYBvmhE2kaYd9dgnWNsO GkYJDvG2dG7Ke/iULQLvbC0HcSoEmLaKDtNXc2pAwzJ89+2Efrmeh4Eo8wVXtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768844760; h=from:from:reply-to:subject:subject: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=FFCpb5RZM48a8X2GkphOjvhmQMdb6qMTBViv2o+o/z9KGiqdAqsDLMNJoVBK/n743jZQei t38VW3jjqI0toRSw+x5ap6RBuIJX78i7mkWGKLbgmdIa6G3Xkq9A3QfiMtoHAzKjhqR18z 95WFxFPBe4cAtmjXmuZVo3i01wJ/CdWH0R5z844OLBVEY/BIQaxOGjksQ8+DjgqKZHW9nD KID70Imv3NwtvFYxunsPihBJAH7A82BzhFuKFPTe7lYbnhHPh6CjZvt7+OIcgDOvjc8Aj9 oyIiWwmSjfHVZkI1QxE56zmV7gd4nbEvBYd5qdEtI5Jxiu2cQVusiSyKFTO9Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768844760; a=rsa-sha256; cv=none; b=VFaO1gA72Jev3k7YiXeopPVv30/xA6qhMCWdi+H0XD7DhxqFPz1LjndUjmAIxqD5RnUjyn fPQ/h7r1xCcArzjLHWTYRGz3XADYqnezw/hptAIWkOmDTgVQdO8Od4CjmJVmh99zt/MnT+ JTzwZ2elsvWv2q21KQ/8GLt5bacIUCeoyA4xJWNrI9cz0VGSizubrUNWRW8cnsXycVXKNJ nujPb2xShYPYxziSfStToaF6c2U/mewio+M8TvFwouhmZ5ZlPlqLC5KWEgP8BDT68F5klL jcKR/3WSyWvC4Sa6YfGcAsZnOKALxiH/K9vFtu+V36G3JddnYgEc/eBdaMKBqA== 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 4dvyYN3v2Pzj2Z for ; Mon, 19 Jan 2026 17:46:00 +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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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:45:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvyYJ69yXz6P77h 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 4dvyYJ5LrFz3JCs 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 4dvyYJ4dxLzjLG 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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:47:04 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvyZd2HVZz6P71Z 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 4dvyZd0g0fz3JcJ 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 4dvyZc731kzj7T 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvyZc0jp2z6P7B5 for ; Mon, 19 Jan 2026 17:47:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dvyZb6gb5z3JLq for ; Mon, 19 Jan 2026 17:47:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768844823; h=from:from:reply-to:subject:subject: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=KcX9AGne76LQqL12ELvJcZdjrofzxlbLLL0T9clLuhgMum4c31EkcgzyG87h9o4jgDmaEV Imf7QoeFz86mC7QJ0wKTbFCxdIZLAJ34tMH7zE1q527lU2rlzlrcfjTPo11O6exAhdebaU ou9it/Fm4HLe7L+eD08JYw4ylIWxib7NI4+jdVMQ2Bw3tGVjGTyBdQHdDztKGaP2SwfC3U R/DT2c12J1y442dJKkSASXVsyY057z9plHmQbWak6q6E40UXMM0N47pFLjA7xCBDQ+9DHk zWzKTaYbibOnfHJ974jAbnutHoWxNagFVMjoX5h5cfFhZrVutPz6b9JvL9Sb+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768844823; h=from:from:reply-to:subject:subject: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=ujDzVrD3kYujgCoMV58sJ8z47j0lJYIgZxuad1qSLcjbp2nhwyJF/M0iBwnZkyYVLgBPjE o4cwDpfr3G/+b0xVBTt0opB6aJ0bmocqJO/Se/k/oNiPeec242PIZQrlOSLAKloBdLdekz r6hlRp5C3qwfOBTdXP/bVDgbrnXrAmgawp51UtN2ndIdB+o7f5kyCXmUdBV11Sv8KQYiG0 o6kzYkFLr3b6cpR0LKcJMNwo41TIdDKNE7X0aZziwhkoHcvTGV6LucxZTdSagK/J3Fnci1 lach1sFI9DAbDfYca0eYDgUpYvmeCFm+Ort8dsNL3AEKv5oncKy7sNnkv2MIVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768844823; a=rsa-sha256; cv=none; b=WW1BAOVWum4LUIpjGZ/+wgzrtL9ouV8DLFiX+PZm41mLA3Uag0HOdQgE/izzDIs1ktO9K0 w/5YnWpRf7zPorkNVO8Zuke+x+b8kE91a5pk7Ap69nVeGGhCD98E1daNNt141XRAH7+sBv BCs2xpFhK2K+trr3ucViXGor7WoBis3FVzLwUsoOSxn+e3n/mbv/58gF3wd6kMdoRRhPDq r/2ShYJoByF1w7dAM1aOM/2c1mxmc1zLtD8rlCIK53Vkq8uyCUYZz+62bREF9XX2PCA9jW uafM5FUFifnIhLmPGavt4Mcc70aFLLPaf34yEWw+AZFXrbLwTNLCUIqIrfIiqw== 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 4dvyZb6FZXzj98 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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 18:19:25 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dvzHx5cx8z6P95G for ; Mon, 19 Jan 2026 18:19: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 4dvzHx4dt5z3SMb for ; Mon, 19 Jan 2026 18:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768846765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kdna1fjb2jgazFnnZZdpOV+9X3HUuwO1YLPRh1ogvMk=; b=Gd0E6HerzZa310Lux/RlcVlDhkPevoS3fot6mEGn+M7PlBTAsOawOb94hE6w5u970hX2or evd8Kg/FlT5Hqhg9SvOjIqjqZIwi7JujsNZBZUC/EjfoRFvI8Nu4egzSo2bE5n+u6gunP6 0KW4jPzIek4L5JRaqTUvnCvYIlA7EfyRi680Z9a9xvOHHmJMkZwZul4mcJn6gzYyHXccyw 1EXqszgT2vPYHm/vjnOZJTMCf8PD04AcqkPp7lWrOOZcxILviuS6UTKAbmK/ujTSn6pOm6 eHNsyhc1ekwVplQoD0+LIwwry57XeNma69jNhRHTxX5oOVYucI473jKJnlmaeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768846765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kdna1fjb2jgazFnnZZdpOV+9X3HUuwO1YLPRh1ogvMk=; b=YpoyfIC+ctQ7mUzGDPAp1W3iyBfH3PBEG/8gpPnFZKgDaFI6TJ37N7eWY6dySh17vSUCvh sTywgAflpG98x7JaDHsqPKr6LmATvN550DZyqzmREiRA0sR3s5MFwNiYbEtRY5SclDqpQQ vTU/s5Z9WWoUN03ezkLmpo0hC2kiEdPcFFAVk3/iBgMuSH6fTCzTye44jrluxTXe9uYQ6f NZHbfih2BAuH5anY+2StNjP8+z92CVrHQTkwDTVhs9e/t1UhL+QqA/45DS+bjbg0/CIvf+ TltK4W0BgQTs7sBHkZVQ7cmKcPM4t0sdu3KUZlZ6sICchqMsOeCxMVaHgAgFiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768846765; a=rsa-sha256; cv=none; b=hDLpTGOBp1eXJzYVw3xCBtRIYBwXIa1dsR355CmA8Ljj2hfrs89/HxUivyrjiH58Ux/gNr AMu+dmhTj5aFRcQjfTYHK6TWALHOF127iK94pECf+12wQTDdHFWC6H21RizvHHov9oALBq hEA8jMrN3aXMA5omjaA0umY8a0lSZAMhV/k4Qt6xE9GFmkGzHIF3tnTZA12/ICmxi4VNF2 O/kqKIlNgsgdaLKUkcGzzA7LR3FT9YfIfABj9cy+ddjPiAYi/oGjPKv9d6v52/jrP0p1pm epCBLMP2Bo1E5mw3Mw2vY9Y41AHwRJ/fVj/TWeMnuyINDjbDIoeWmRrHPUc24w== 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 4dvzHx3z6bzk8x for ; Mon, 19 Jan 2026 18:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ed98 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 18:19:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: c0898bdc8661 - main - usbhidctl.1: adjust option list indent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0898bdc8661842c51fecfe467a1c921a2d81774 Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 18:19:25 +0000 Message-Id: <696e75ad.3ed98.7065b831@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c0898bdc8661842c51fecfe467a1c921a2d81774 commit c0898bdc8661842c51fecfe467a1c921a2d81774 Author: Mitchell Horne AuthorDate: 2026-01-19 18:18:01 +0000 Commit: Mitchell Horne CommitDate: 2026-01-19 18:19:01 +0000 usbhidctl.1: adjust option list indent For improved legibility. --- usr.bin/usbhidctl/usbhidctl.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/usbhidctl/usbhidctl.1 b/usr.bin/usbhidctl/usbhidctl.1 index d1cbe67ba85c..d8722bccb45e 100644 --- a/usr.bin/usbhidctl/usbhidctl.1 +++ b/usr.bin/usbhidctl/usbhidctl.1 @@ -79,7 +79,7 @@ flag is specified attempts to set the specified items to the given values. .Pp The options are as follows: -.Bl -tag -width Ds +.Bl -tag -width "-f device" .It Fl a Show all items and their current values if device returns. .It Fl f Ar device From nobody Mon Jan 19 19:41:12 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dw16f0fL7z6PGT5 for ; Mon, 19 Jan 2026 19:41:30 +0000 (UTC) (envelope-from jlduran@gmail.com) Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dw16d4ywDz3d5H for ; Mon, 19 Jan 2026 19:41:29 +0000 (UTC) (envelope-from jlduran@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of jlduran@gmail.com designates 209.85.222.170 as permitted sender) smtp.mailfrom=jlduran@gmail.com Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-8c5369cd163so24098685a.0 for ; Mon, 19 Jan 2026 11:41:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768851684; x=1769456484; h=content-transfer-encoding:cc:to:subject:message-id:date:from :reply-to:in-reply-to:references:mime-version:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=is84He/YYjmJHn6XWSRgi7K1lplKg9kZbS4R9YZWrEI=; b=vhY7dHJvO19gs0OEQ0lRXpst2TnNmEbp5bYCk7514gHtDJPquoELOrOc9Kts2xxthB A2qbJsmPGaJ3cT5UQdFvUMlH9+dhXcdXL2Ur/Vfd5KPT5nlZIaNH9G/lq0Lw0aggocoy mmso4haXJeBmr0iIQKEwwxe/MIaREEc93NUTzSfCMqkLXsmNV6SUXtMGtxN5KDC4cPHH J8DEOVWFaDx1Vk90n6yWKl1qrG+BX4CIGm8xlOd8wW6TGA3k+GPuGPODXK5Dm/1zwbQU RsL8wHydaHCe7ZWfTErHgEeXhMVy65fVRhtuBGkKQlNAS2XEsyjLgaaJStBjsjrgY/zM /9tw== X-Forwarded-Encrypted: i=1; AJvYcCXlCpvn90l95ZJq9jOxqdc1BIxSGotVe6BaIe8me+xCjX6t2robS+MqW6ZURJXplBx+uXPjmdrw2S8eaGSOfHI+2FFg@freebsd.org X-Gm-Message-State: AOJu0YynNTptTcRIm9WXVFwOZWzw8J5Bbc8ybu0zxY2aJyMfDMpFey0e v4n8q70V8Duz7VpeGTel1Q5LLLYsLzYwyGBfv273G8XYM59DC86lj6vpssR9+d/S X-Gm-Gg: AY/fxX7OYKyp69UoZnBycL0gB5cWkB9vsjaONV0cD5gxg4AsYtFAVMbzYP+KbPIHvdI 6aSTw6N/4ooO0vAl+gtv4AHBooq4BUxsnt/S7XgjvEf2tePPbRO0DOEh8pZYrRWdmHkIPcHnv2X 1sJrf84hK3nnr9oWrQRhMa1eFdsZheghih8yyesquFage0DRVUJQp+wRUjBBzDBtDoTsDuzJ330 toQ5KSEt/0mDSITKfHO4hTYv2FaI9yjHsa3nSkNj+fCQ4qJtK1A2nNZJCXMwdfS0s7QGbVvTbi9 Vv6q94n/roMWlrVYRl95XfjMY4gB+4Sa2CvqHZWbgUFRTNKhy/OP0xsBBPmztecg3jvM90KZnN3 XWzalifp1BHWDssypy8Z6Bq8PZzAksveNnrORaibnmnrQ/JanRa/jZMdwR4l1ONTmEUIKO9i2eC 3fdsNEUQ86V0fa4cj3CJshFJCn6PHuTeQqDmoXHr1dGjTcGtgSVto= X-Received: by 2002:a05:620a:1995:b0:8be:7dd7:f041 with SMTP id af79cd13be357-8c6a6799061mr1171395185a.7.1768851683492; Mon, 19 Jan 2026 11:41:23 -0800 (PST) Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com. [209.85.160.176]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8c6a71ab272sm871265885a.2.2026.01.19.11.41.23 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 Jan 2026 11:41:23 -0800 (PST) Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-50146605f2cso8764721cf.3 for ; Mon, 19 Jan 2026 11:41:23 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVQkDRLntlHM96tCmCZHq+q1+/bgMU1ZB7of7rKPkVM3wgHapPMQOoNPKk9Dtw6RhtUB9y1/WnGJx+bfv2FUuXPK0V+@freebsd.org X-Received: by 2002:ac8:7fc8:0:b0:501:4ba0:e06a with SMTP id d75a77b69052e-502a165ca89mr141668301cf.8.1768851682921; Mon, 19 Jan 2026 11:41:22 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <6969853a.3b3a2.692d2f0d@gitrepo.freebsd.org> In-Reply-To: <6969853a.3b3a2.692d2f0d@gitrepo.freebsd.org> Reply-To: jlduran@freebsd.org From: Jose Luis Duran Date: Mon, 19 Jan 2026 16:41:12 -0300 X-Gmail-Original-Message-ID: X-Gm-Features: AZwV_QgPuPGuZcz_OjnqS2SsIUftlHVnqKryZTva68Mb8xMSddVg9DgDYzQcGWo Message-ID: Subject: Re: git: db3b39f063d9 - main - libjail: extend struct handlers to included MAC labels To: Kyle Evans Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: - X-Spamd-Result: default: False [-1.42 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999]; NEURAL_HAM_LONG(-0.38)[-0.379]; FORGED_SENDER(0.30)[jlduran@freebsd.org,jlduran@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; NEURAL_HAM_SHORT(-0.14)[-0.142]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; REPLYTO_DOM_EQ_TO_DOM(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; MISSING_XM_UA(0.00)[]; FREEFALL_USER(0.00)[jlduran]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TO_MATCH_ENVRCPT_SOME(0.00)[]; REPLYTO_ADDR_EQ_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jlduran@freebsd.org,jlduran@gmail.com]; RCVD_IN_DNSWL_NONE(0.00)[209.85.222.170:from,209.85.160.176:received]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.222.170:from]; HAS_REPLYTO(0.00)[jlduran@freebsd.org] X-Rspamd-Queue-Id: 4dw16d4ywDz3d5H On Thu, Jan 15, 2026 at 9:25=E2=80=AFPM Kyle Evans wro= te: > > The branch main has been updated by kevans: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Ddb3b39f063d9f05ee808b9c5a1= 1146ed6810d857 > > commit db3b39f063d9f05ee808b9c5a11146ed6810d857 > Author: Kyle Evans > AuthorDate: 2025-11-27 05:24:14 +0000 > Commit: Kyle Evans > CommitDate: 2026-01-16 00:23:40 +0000 > > libjail: extend struct handlers to included MAC labels > > MAC label handling is a little special; to avoid being too disruptive= , > we allocate a `mac_t *` here for the value so that we can mac_prepare= () > or mac_from_text() into. As a result, we need: > > - A custom free() handler to avoid leaking the *jp_value > - A custom jailparam_get() handler to mac_prepare() the mac_t and > populate the iove properly, so that the kernel doesn't have to > do something funky like copyin, dereference, copyin again. > - A custom jailparam_set() handler to similarly populate the iovec > properly. > > Reviewed by: jamie > Differential Revision: https://reviews.freebsd.org/D53960 Hi Kyle! After this commit, the following tests are failing: - https://ci.freebsd.org/view/Test/job/FreeBSD-main-amd64-test/27642/testRe= port/junit/bin.pkill/pgrep-j_test/main/ - https://ci.freebsd.org/view/Test/job/FreeBSD-main-amd64-test/27642/testRe= port/junit/bin.pkill/pkill-j_test/main/ Seems like "jls -s" is not working. --=20 Jose Luis Duran From nobody Mon Jan 19 20:09:32 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dw1l26NQ0z6PHgZ; Mon, 19 Jan 2026 20:09:34 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dw1l25XJtz3hkq; Mon, 19 Jan 2026 20:09:34 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768853374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BRR3vl4lyIOG+qnGztpn6W7gwvg0dCq8q4Iqec4BJ1E=; b=ouFmsb2kqWMXttiPdPpDqmvrX4VL2dYIEaYbXCCLS7Tlar8yiSEmENUVximtKgVekVJP0S YptytUxTp46/WQNgWeLiwoadY3Fo09C0bQaP5Lo304E5THFhMUmAA8ONmX4L03ll9sT9wv OPu9He/JtQ7TDR/qjVflfMlBmgq94RRDnesQ8hJiKEZokGMet5kJ9uUIHFTbYtQuTa49Pf IlkuBJc7Xpcdvj/6ahc9LGioD9RKtSaTtEbM4vFsaCwpm+R5p/KCALr81+Qu/fQ1hN1GxT Eu/eHIyEGrOwrg+zKoasdWc0xUcUNrvuQIO8YaS3nwdrRrdAwghyC/g6xJxIqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768853374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BRR3vl4lyIOG+qnGztpn6W7gwvg0dCq8q4Iqec4BJ1E=; b=h7ccwnA89Du406N7Rwis/LOaJfoBIr2j1H2xt2Pr37vp3pyAjgLoFUSPoEnPcTwujNcTbx 8cyvOsIepih0IdM/ZpuW+JBQyARV1FghU6++AeTz35hqWrTUrrkDyp7yFAfkKYywmvuYRY 4Jur4XkM1/RahWkcRZ8pPraXSBr7Xv+m5Y3kgmoEvVt/fm1i8VmbM+h4DYPQ/sC+Mf/asr DCA0Wbg4rVjzvMUKUJ246JF1Pa/tL+u/mYUBca/y++mS3wokUtsRM3pVNzan9tRv62cQBi 815jKQBgVPW7oLPuVSCYmhAOJpiQWDsZWjUuFxJpdjCtQWzU8lhuGvH70jy4rA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768853374; a=rsa-sha256; cv=none; b=bx30sUbZzAQMdx5cyn0ur4nVy/xWlAcGlagWgfd3Coo21eu/cLFvn7wy0gps5DYjE5dHyj i/8jTCRHBgrggyE3rcDzalCs2sqeClpFuOPu7eUPb4dNK02bl6hZ/dk4ZBYMuxagTf0ILm A4fa9yrD8In6mxzX4ymNNjfgKLQXnsbNZpzeicuzq27kcf4CA9O3ENghFn8idpwnlmus5u MCgFybqL3Gd8GWSHewYOXew7bf0i80Bx174TfAHNDEfRNPEdxhgYB5VwLcQRAamgn3yEoi OYqvmDrSqqqGnKoHj8XpyzLUN4x5r2xy0Kd93A5B+mB3tmlAf1ZlTSdzGmGMpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [10.9.4.95] (unknown [209.182.120.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dw1l20c6GzGrj; Mon, 19 Jan 2026 20:09:34 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <43240081-b17d-46a8-acad-99843fd43a51@FreeBSD.org> Date: Mon, 19 Jan 2026 14:09:32 -0600 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: db3b39f063d9 - main - libjail: extend struct handlers to included MAC labels To: jlduran@freebsd.org Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <6969853a.3b3a2.692d2f0d@gitrepo.freebsd.org> Content-Language: en-US From: Kyle Evans In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 1/19/26 13:41, Jose Luis Duran wrote: > On Thu, Jan 15, 2026 at 9:25 PM Kyle Evans wrote: >> >> The branch main has been updated by kevans: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=db3b39f063d9f05ee808b9c5a11146ed6810d857 >> >> commit db3b39f063d9f05ee808b9c5a11146ed6810d857 >> Author: Kyle Evans >> AuthorDate: 2025-11-27 05:24:14 +0000 >> Commit: Kyle Evans >> CommitDate: 2026-01-16 00:23:40 +0000 >> >> libjail: extend struct handlers to included MAC labels >> >> MAC label handling is a little special; to avoid being too disruptive, >> we allocate a `mac_t *` here for the value so that we can mac_prepare() >> or mac_from_text() into. As a result, we need: >> >> - A custom free() handler to avoid leaking the *jp_value >> - A custom jailparam_get() handler to mac_prepare() the mac_t and >> populate the iove properly, so that the kernel doesn't have to >> do something funky like copyin, dereference, copyin again. >> - A custom jailparam_set() handler to similarly populate the iovec >> properly. >> >> Reviewed by: jamie >> Differential Revision: https://reviews.freebsd.org/D53960 > > Hi Kyle! > > After this commit, the following tests are failing: > > - https://ci.freebsd.org/view/Test/job/FreeBSD-main-amd64-test/27642/testReport/junit/bin.pkill/pgrep-j_test/main/ > - https://ci.freebsd.org/view/Test/job/FreeBSD-main-amd64-test/27642/testReport/junit/bin.pkill/pkill-j_test/main/ > > Seems like "jls -s" is not working. > Hi, Woof- I will have a patch for this momentarily. Thanks, Kyle Evans From nobody Mon Jan 19 20:45:18 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dw2XG5zWhz6PL7w for ; Mon, 19 Jan 2026 20:45: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 4dw2XG34x0z3mxH for ; Mon, 19 Jan 2026 20:45:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768855518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CSS7my6EFARM99Ra4bemnkDx5oDWNtKGM8g5oEW3FMA=; b=o8X0d9LogMWOjkOeifKu7aOYFE76TvZ9Gf0HKaQRV/wrSuJAREKGmSjnbMR+uC7O5pE7dY cvXWS609raAkTla0otl78coXxwk+anOw2neZyNgi4x/u9qqxT0vYmwxyVvt8R0SDPwZOX3 t9tbazxcuLfAZXdOlLFoW8ckfunBxIpztqqwaqUEGouHR2QCI4PdGtdKtzNFc0geY6QgjO yLanGNa+FOR/pNLEjFNmLSrCtkPdOL5osqz2Aja7KxXFQhB21RAlEOgWX6XO/LMTmwy/ih faXXNGEiUtTN6ONyLeEQlvLTdo0vuCVRemFE1i0FkiDqmAPIyrHQaG+acgVasg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768855518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CSS7my6EFARM99Ra4bemnkDx5oDWNtKGM8g5oEW3FMA=; b=meML1BKP4PHzQgAGs+Cw+3z3Z9UHuT2VC3XwLx0TR0rVODDccQ885IH14Hn5I/Bk+e5PvS qXP4vlVcJYqZ/rkNbiOFybMEHDi7YCZgtccmzT6LNxkNC38YYvdbz0yr/0Dl1oc1ExePIi MQGAH4DbAk6bqsaHcC8l8NCMDpKbVdG9oc/WYDiKgeVmNe2kcat3Dk0pX+0Hg9zl29b6lf vMfYV/6VMmFMG6DARsAnbuhEjKm6cHXLjycJjD2B7KXRia3a9GqnpkRGJ/2zvmiTgvoWBz r06qiLxQG0/SzJu7cBMqfggLI1Zkj8t6X/V+DWNNQoyVgGHorQppZdjJ2gMjrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768855518; a=rsa-sha256; cv=none; b=ykGWV1gGnMXA+BXJyGlXfLDy1D8y5y/LyyINrR4fwmVBa53t7sh+NAYiRoNIflL5wDcStV EwmmIbEuK0DzHxoJaPeL5JHKc4JxqYEkf5QwAJ+AunO11mfDa9mGbBpeChkSncL/jCwGUb zGoHg+QpxToleB6MDUYm/ccdmmHszckX4EVQcJqI4eXcTE0DtXzNTYHDegCGt0HQ8+tifk Jo8ck4y1lO7j/V4hn4/rt1Kn4tawmodoG4yEUb9HBHkQx/AU0GTeP3H3caWVxzk6GRxOWi RmH8+fPZ4hqWeItwkCo4e1oycUBvaBUAA+NbG/KC5xA/1ZovGbp3Z5sCBTEW0g== 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 4dw2XG2Q2GznZT for ; Mon, 19 Jan 2026 20:45:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26802 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 20:45:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 68a449f09e2a - main - sctp: improve compilation as module List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 68a449f09e2a38def9df822d42f91ecd2f27b0e2 Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 20:45:18 +0000 Message-Id: <696e97de.26802.7dbfa4b9@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=68a449f09e2a38def9df822d42f91ecd2f27b0e2 commit 68a449f09e2a38def9df822d42f91ecd2f27b0e2 Author: Michael Tuexen AuthorDate: 2026-01-19 20:38:37 +0000 Commit: Michael Tuexen CommitDate: 2026-01-19 20:38:37 +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. MFC after: 3 days --- 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 Mon Jan 19 22:08:49 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dw4Nf2LXDz6PQlF 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 4dw4Nd6WXLz40hr 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=1768860529; h=from:from:reply-to:subject:subject: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=XuoHE7IRgEddw9V6qYS1xb0XYB4e+o0aw71FIluTA3YbtLRUnY9mUKJnrdtOVfddkN8Y9/ E38P/l7eWhlyg8X96JoMompUNNzGzM4JsncLsdukWZEMf0K5U/tkUA4hRVNe5EThblyVpj +00KCd1UxRM17FStNxxqa8Jll+fvYTvaBAKqZ9ezEJBDN2+Mke8i4E2sA5sdGAymDRvaPo WiawOBnTkZVzoqr1iZwgrQPWJZ/eTeCd4fh+RY0nq8yoVDnaCM9cIpIA57rrbiwo0TYp9a kvdTZHyx5tUFiEl5CIEFcp9nHVMy/nfcER9WjjEHKp3s7YFSKO3sBN8HHLW4pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768860529; h=from:from:reply-to:subject:subject: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=JUpnVYOKnjRgkL+U++L1V0lllOHSwFo0MOd4aayPAHQisQlTfXC78DNPqpFypW2w7it2Ml XpGB+D6lojOr5GiwgKiWXZxkiBUcnXuYMT6a6Ijsli98pl68d42K6o7Q9sITJCqzVvGvVi bTxt1OyBIjdp1mlfgRReWkXvSbffYoJDW+gcloh/dTakmvOutV2M+xojxlZXC4jYgbt9Yq UBuORxGaqPQQ7fdkYk7L3hk8iMv/HOxTrbuijpJ18LW2fECgsFNlGPFu/hPAB57nXIAgjS iQKBiifD8VRBIzXvFq8x8rdlAEKlSgStpOjMinwHRRJNRbY13BXnDnHr8S7aTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768860529; a=rsa-sha256; cv=none; b=be6+rHzn7hrMTZG4q56TeNPUjZaYUl3sK9/Cc+yEndN0cRrj1xaDF8j60UKbc2RxSEuDCS Vj6g5peTi46E7xiYDG0DlzfJYra+YjMuaVyDNUNinaeyQmZjzyq7a3CTmTjAQE0SEKUC4U Mml4rXrNAwr60ujmEySnvtT2hUyi/isigDRR/wOmR4DR8fT5jxW4l5w0pCprWrqbuH2jF3 SnKQ6HgOBBcU5cQs5V7YtjGntpyjnj5Jzkn7fLo+9/cEXh6Sp2SmVe+zjzflW9Mow9znWw X37tG8p9s/IztyPEofHmDDjRC4MhB3Xz9Kk8bUFbCQ5ptA0SnI4jB0/Zw+0rqg== 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 4dw4Nd62w5zqky 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dw4RK72Mgz6PQlh 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 4dw4RK54hgz40qH 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 4dw4RK4f9Xzr0F 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dw4V96TTXz6PRTn 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 4dw4V93FMMz41j9 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 4dw4V92dR9zr4g 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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 Mon Jan 19 22:57:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dw5TD3VcTz6PTwj for ; Mon, 19 Jan 2026 22:57: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 4dw5TD1Tbsz46M1 for ; Mon, 19 Jan 2026 22:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768863472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XMd2jChycD/ugIPYA22UK5EBfLLWJuMSmIY69g2W/BE=; b=rTo4i+tU8iiaewZ1aH1IJFj2twuLoJAvOCmpWI4xS/isWL2dQmsda8sZSds/9E3kEbXR1W e4jBpobZq69pqVv6XdT2BSIxSJNmJI/EFuIVB7XtTvrObDHdxZB9qYFZv0cFWEnq0EDzL9 IHdZKmQNyTCAImTHB90kY1qaP2geiXwz1UVviYLderoHxtwTaaSAYRfk0Pzet4+iTb2mTo u9bVk5JQHy2LWipIgOm9Zx4CrKuk0xX7ojRP3T5lNoeBoqs/GO2uhqGoKe90O9OrTYFVqV nZ3bX0RvvdLrpe5NGjSjVP4zNen4c0UDBPcI4XPt5YxOFFV/WOjDm9Nndj7xgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768863472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XMd2jChycD/ugIPYA22UK5EBfLLWJuMSmIY69g2W/BE=; b=AFIzs0esLMNbrL+14eX0LvlBrbA23nH9KQE82n3aAPgdsLOtlqQDOzgH0gY4vL5+GLykvy 9dyXHjNEJ9wATW+jxnGxkaA+Ks7t2JuMFnAHeA36IOEDdRXJDAvhDJ2BKUcHEaeQfMOiYW qwrBGXgP9zNmdbFZPURoVwDHYViyvOzO0lQm6UeLz3JwzKuVgGmBR4RYEkdBu0npEUo7Tv doQtsmQIoH9cGcb7eYZgWYLBBxCNzSPNneTkP4kbLkBhdbxo8bzksmjaaIcnclPzqcDBxO CRKXvIw/Vitm3cQ1dQFH2qy/6AWP83oiir8AiVtEQzXTI47XLSiQ1Ua5AggWoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768863472; a=rsa-sha256; cv=none; b=C8J78W3lKoVnT6FF9lTadnQRXk4YQXERiFCLA9eJE3jNga/8RnSkmvBX8po+e+/fyLHnJ9 8ycJK9xc/EWPa9Ntq/HTtlM1GooZ/IgzjHjM/R2kSu2Jvb2QRAP3OGftTkn0nYE9gXnikh 0neZcfWTK7Yco4nWRWnmoOHzTCfiX9VDmaI7CJSkArCZ3Rgo0mVSg90MyAUX2ZCOuHijJw CP5fMRkxbr+Ny+RJvLkonMoNyrJG8V85h+Mlnapp8wrtmgMwM/jfm/qmxlLyr/u2zMsIDL w97tevwsQ730c7X0VhfvagopbZWbOPEp7yFXUVq2EPwmVGkCp3LvUhddNTR5Jg== 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 4dw5TD0Jpnzs49 for ; Mon, 19 Jan 2026 22:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a4ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 22:57:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 2e0e45a516b9 - main - pfctl(8): change default limiter action from no-match to block List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 2e0e45a516b93cc72771a5de8b87cd0a07a55f07 Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 22:57:51 +0000 Message-Id: <696eb6ef.3a4ac.5e216a0a@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2e0e45a516b93cc72771a5de8b87cd0a07a55f07 commit 2e0e45a516b93cc72771a5de8b87cd0a07a55f07 Author: Kristof Provost AuthorDate: 2026-01-16 17:30:55 +0000 Commit: Kristof Provost CommitDate: 2026-01-19 22:04:55 +0000 pfctl(8): change default limiter action from no-match to block pf(4) users who use limiters in current should update the rules accordingly to reflect the change in default behavior. The existing rule which reads as follows: pass in from any to any state limiter test needs to be changed to: pass in from any to any state limiter test (no-match) OK dlg@ Obtained from: OpenBSD, sashan , c600931321 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 2 +- sbin/pfctl/tests/files/pf1076.in | 2 +- sbin/pfctl/tests/files/pf1077.ok | 2 +- share/man/man5/pf.conf.5 | 22 +++++++++++----------- sys/netpfil/pf/pf.h | 2 ++ tests/sys/netpfil/pf/limiters.sh | 6 +++--- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 72589f309f54..57a5140ffeb7 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -2787,7 +2787,7 @@ sourcelim_filter_opt } ; -limiter_opt_spec: /* empty */ { $$ = PF_LIMITER_NOMATCH; } +limiter_opt_spec: /* empty */ { $$ = PF_LIMITER_DEFAULT; } | '(' limiter_opt ')' { $$ = $2; } ; diff --git a/sbin/pfctl/tests/files/pf1076.in b/sbin/pfctl/tests/files/pf1076.in index af815fd4c5ef..117fb90a11d2 100644 --- a/sbin/pfctl/tests/files/pf1076.in +++ b/sbin/pfctl/tests/files/pf1076.in @@ -1,2 +1,2 @@ state limiter "dns-server" id 1 limit 1000 rate 1/10 -pass in proto tcp to port domain state limiter "dns-server" +pass in proto tcp to port domain state limiter "dns-server" (no-match) diff --git a/sbin/pfctl/tests/files/pf1077.ok b/sbin/pfctl/tests/files/pf1077.ok index 834399c40d8a..4a7cb3606aef 100644 --- a/sbin/pfctl/tests/files/pf1077.ok +++ b/sbin/pfctl/tests/files/pf1077.ok @@ -1,2 +1,2 @@ source limiter dns-server id 1 entries 2 limit 3 rate 4/5 inet mask 16 -pass in proto tcp from any to any port = domain flags S/SA keep state source limiter id 1 (no-match) +pass in proto tcp from any to any port = domain flags S/SA keep state source limiter id 1 (block) diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index aa3899e48596..707053233e5a 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -27,7 +27,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd January 12, 2026 +.Dd January 16, 2026 .Dt PF.CONF 5 .Os .Sh NAME @@ -2368,12 +2368,12 @@ block in proto icmp probability 20% .It Cm state limiter Ar name Oo Cm (limiter options) Oc Use the specified state limiter to restrict the creation of states by this rule. -By default if capacity is not available, the rule is ignored -and ruleset evaluation continues with next rule.. +By default if capacity is not available, the packet gets blocked +and ruleset evaluation stops. Use -.Ic block -option to change default behavior such packet is blocked -when limit is reached. +.Ic no-match +option to change default behavior such rule is ignored and ruleset +evaluation continues with next rule. See the .Sx State Limiters section for more information. @@ -2381,12 +2381,12 @@ section for more information. .It Cm source limiter Ar name Oo Cm (limiter options) Oc Use the specified source limiter to restrict the creation of states by this rule. -By default if capacity is not available, the rule is ignored -and ruleset evaluation continues with next rule.. +By default if capacity is not available, the packet gets blocked +and ruleset evaluation stops. Use -.Ic block -option to change default behavior such packet is blocked -when limit is reached. +.Ic no-match +option to change default behavior such rule is ignored and ruleset +evaluation continues with next rule. See the .Sx Source Limiters section for more information. diff --git a/sys/netpfil/pf/pf.h b/sys/netpfil/pf/pf.h index 4c950c7eab9c..09bcd424db3e 100644 --- a/sys/netpfil/pf/pf.h +++ b/sys/netpfil/pf/pf.h @@ -506,6 +506,8 @@ enum { PF_LIMITER_BLOCK }; +#define PF_LIMITER_DEFAULT PF_LIMITER_BLOCK + struct pf_rule { struct pf_rule_addr src; struct pf_rule_addr dst; diff --git a/tests/sys/netpfil/pf/limiters.sh b/tests/sys/netpfil/pf/limiters.sh index 4775039a4a94..8d9a199db787 100644 --- a/tests/sys/netpfil/pf/limiters.sh +++ b/tests/sys/netpfil/pf/limiters.sh @@ -54,7 +54,7 @@ state_basic_body() "set timeout icmp.error 120" \ "state limiter \"server\" id 1 limit 1" \ "block in proto icmp" \ - "pass in proto icmp state limiter \"server\"" + "pass in proto icmp state limiter \"server\" (no-match)" atf_check -s exit:0 -o ignore \ ping -c 2 192.0.2.1 @@ -103,7 +103,7 @@ state_rate_body() "set timeout icmp.error 120" \ "state limiter \"server\" id 1 limit 1000 rate 1/5" \ "block in proto icmp" \ - "pass in proto icmp state limiter \"server\"" + "pass in proto icmp state limiter \"server\" (no-match)" atf_check -s exit:0 -o ignore \ ping -c 2 192.0.2.1 @@ -217,7 +217,7 @@ source_basic_body() "set timeout icmp.error 120" \ "source limiter \"server\" id 1 entries 128 limit 1" \ "block in proto icmp" \ - "pass in proto icmp source limiter \"server\"" + "pass in proto icmp source limiter \"server\" (no-match)" atf_check -s exit:0 -o ignore \ ping -S 192.0.2.2 -c 2 192.0.2.1 From nobody Tue Jan 20 02:57:58 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwBpG4dFNz6NqZY for ; Tue, 20 Jan 2026 02:57: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 4dwBpG2Gq2z3PpY for ; Tue, 20 Jan 2026 02:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768877878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q0I7o3F8s3sLZccZgxjhFg8l084ac+iQWBXvuOkBaUY=; b=fuDcirzI30u2FTPZLndVyEAGKT5JMQXeonWfOJ3clK1xzLNJX0GqXrVZVsXxTu4XXuFk6F //56zb1WKNqCLmlceiFgjAan9r1bmOMk4IedFyRZ2OArKZXctMuomTFEbfGZa1RSQyPRm7 Bhgth5HCkZgiMUlRFWMNqlSq3WEiH1f6matY4Znf6yL3IfnfYaQ8PPIgvuPLlMMptZrbld Om7oaLTD4NBNW0xCz5IDhkpKShXgYF93DVBl5tc+7TWjqe638E3v7FW6lxAEE0BwgKedNR PdmvjMLP34fGBR7J+CQi8knW28xQMD2CAaQzBoSkhZJUc6sptq4Ut9mlwY8yyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768877878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q0I7o3F8s3sLZccZgxjhFg8l084ac+iQWBXvuOkBaUY=; b=Ghehsz33HTIyrfy/m7TXeRXk+7bEHfLZfqCX2lJ3sbMJd7U3Be7VqUZQvVP/UaHqMp0Gvq nj0/+J0OZBpQxgTLiIhKNFRpjdbNwYjTfl44BdMX/PBQT2BY78BdBKb2IuO4ruhgySz718 g6NVDx4+RMJKXq4LTs5NiwhnsTAoD3rqTxbnwYQ+oEO1eUv1qKv7vnoZP++EX4yvyu10BK KEk5ViRemiLcoIHiw6aIVxlczUC8eN4cBHt2DtkvAvkC/+3uBGDZikYn4sJ2ZmHmpgddp9 rAFnfj+ypr9KptqknkpuS1KtGW892MTLjAuvRrjfwzfmx9uwv6/ZABzRih0bkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768877878; a=rsa-sha256; cv=none; b=BTSQgLN0F47aiAHPuVw0/TZU7E9+BHTmQwkSCTtpXpFq8ycjP4sNM8wpmOjOXos/yeCUKp yAuUSRDELJjsjPOBg7+XVo1nUJKsWETuzLb4H6Z7f2Omo2UwzdGTIzwgvjBFKeSXscqHJ4 1c66HwCLaVnRpKNQQKN91KNvI06Q8StNWTaH7KCb7mc1rQRvfkdrU7yVRspPRHQz9A4SmY /MTDi78JIr9M+Hc7Lg5T3yk1C2gNdSVjR2OP1HBXn1gZbO6X0/epdU10CagoISOriX+ojp rjv5G96u29uGg7XlpN9ncD+PfG+wXhsIvEllsRVJfekD2qRju2lDKWPMHLFP8A== 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 4dwBpG1qyCzyx8 for ; Tue, 20 Jan 2026 02:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 208b5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 02:57:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: bef0475b6810 - main - mac(4): also list jails in the example enumeration of objects List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: bef0475b6810b9cc725bb786a8100a6e54b54891 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 02:57:58 +0000 Message-Id: <696eef36.208b5.1bc20e90@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=bef0475b6810b9cc725bb786a8100a6e54b54891 commit bef0475b6810b9cc725bb786a8100a6e54b54891 Author: Kyle Evans AuthorDate: 2026-01-20 02:57:42 +0000 Commit: Kyle Evans CommitDate: 2026-01-20 02:57:42 +0000 mac(4): also list jails in the example enumeration of objects The prison may also be considered part of the subject by way of its ucred association, but I don't think this is significantly different enough today than before recent work -- policies could have always taken them into account, and some did (e.g., mac_bsdextended). Reported by: olce Reviewed by: olce, ziaee Differential Revision: https://reviews.freebsd.org/D54748 --- share/man/man4/mac.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/mac.4 b/share/man/man4/mac.4 index d7ae30a1bac4..bdb7de018d3d 100644 --- a/share/man/man4/mac.4 +++ b/share/man/man4/mac.4 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 15, 2026 +.Dd January 16, 2026 .Dt MAC 4 .Os .Sh NAME @@ -68,7 +68,7 @@ Currently, the following MAC policy modules are shipped with .El .Ss MAC Labels Each system subject (processes, sockets, etc.) and each system object -(file system objects, sockets, etc.) can carry with it a MAC label. +(file system objects, jails, sockets, etc.) can carry with it a MAC label. MAC labels contain data in an arbitrary format taken into consideration in making access control decisions for a given operation. From nobody Tue Jan 20 02:57:59 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwBpJ1KDnz6NqPL for ; Tue, 20 Jan 2026 02:58: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 4dwBpH3LTMz3PxS for ; Tue, 20 Jan 2026 02:57:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768877879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/1WDvFGtcqxhB8y9AcMCwcEVGajiWTLn0kOVF7s2E4k=; b=TGv4js0Xecy/tnKleda80Hddare0tKNVmi0HGhSADhTq1RkCVrLIzA+RkzdHzHBiX0m6Md yoqD9QdfRmO0swQoSoVkCaslf3ZXxhdjwo3ppAfi1OVyI8QSsMydpJxsfbPA8ZUtEJT0Ml ur/Dzf9kHu1mgjcMMJwsHMhaiDqrkwimp7sK1g7Iy4hyqFK/X82sFphimN+12bmXjiDx9W EfvUqZJKCvzVmmvJWLdAT4fxg+Z/zSnp6DdKJ1xhiGhNbshLmfo0kQOtMvggzO2LJueC8K t//TPvoPWViDwDQC0vSJZygo/0NcXfTQU36tRroQV5/oodmxjgoamkyn1iy8XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768877879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/1WDvFGtcqxhB8y9AcMCwcEVGajiWTLn0kOVF7s2E4k=; b=HsZ5xpQhNVNPjrHmuHFvlpOy/PC9LRfEWXp1yD7Cb85DAk0Af70ntBWWxbvgQXP7dHT/YP FWzJck/FZn8mJIDZ8EiDDHNAXqE5eRbQH/MMYM6SaPJETnf+h6wj7sHYdJMoMeLW8lC6UG DplaKK8YydOBqMpp0D8iZLBsvuu0sjq0YWz6xczjHp73i7tdhbmZwbRW7oBbq40xsnujsu aX2ib4Jqq2JAtOWYcFSmmtqhwftwMYIg7cfiJ23XU9G/ZwlskGdwsgraZuuAJc0Rf1RKTV XwRztmc7kbH3DVnL/w7cVA6BKUfZQkL0R0JI2tB3O3t9NEGI2Yk9UQ131ptsKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768877879; a=rsa-sha256; cv=none; b=l6gtwDwcN4KkRVvDEurYptPK+K6ftH4U4EmUno3A/gx+3sk640BS7Mm0a6J7kkzALHqjoi ChFxHkL7YVfuFwjHyWF6xUfAQsUl1EH9Wy0vl24muPpuTBj72vdhroDPeHalO/CW7EYWav hYFKgBG+yrN7ZHgwAAui1bm3mUpWMYgFN7ZVyKOgCerNTDusCLHfzbROCReQzW6cj1Ceeq dCUWSCuI/kmI3iKd3F7iKZv2QF9ci931l55zIVJmNYMBIXFfjnT+krNn+sGX+9g4V0Jp8Y SXCGN0OP5P/gGN2x9NnS5QA6r27b7bdlcyNEWJZGtavqtX2BAbVZAXpJq5qsQw== 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 4dwBpH2g1Wzyx9 for ; Tue, 20 Jan 2026 02:57:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20d63 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 02:57:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 3f3b53e68a7b - main - jail(3): fix common usage after mac.label support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f3b53e68a7b2f9319ee1fdac82b511c9f9f22d7 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 02:57:59 +0000 Message-Id: <696eef37.20d63.467132d4@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3f3b53e68a7b2f9319ee1fdac82b511c9f9f22d7 commit 3f3b53e68a7b2f9319ee1fdac82b511c9f9f22d7 Author: Kyle Evans AuthorDate: 2026-01-20 02:57:42 +0000 Commit: Kyle Evans CommitDate: 2026-01-20 02:57:42 +0000 jail(3): fix common usage after mac.label support Nobody else's mac.conf(5) has any entries for jails, so they get a trivial ENOENT and we fail before we can fetch any jail parameters. Most notably, this breaks `jls -s` / `jls -n` if you do not have any loaded policy that applies jail labels. Add an entry that works for everyone, and hardcode that as an ENOENT fallback in libjail to provide a smoother transition. This is probably not harmful to leave in long-term, since mac.conf(5) will override it. This unearthed one additional issue, in that mac_get_prison() in the MAC framework handled the no-label-policies bit wrong. We don't want to break jail utilities enumerating jail parameters automatically, so we must ingest the label in all cases -- we can still use it as a small optimization to avoid trying to copy out any label. We will break things if a non-optional element is specified in the copied in label, but that's expected. The APIs dedicated to jaildescs remain unphased, since they won't be used in the same way. Fixes: db3b39f063d9f05 ("libjail: extend struct handlers [...]") Fixes: bd55cbb50c58876 ("kern: add a mac.label jail parameter") Reported by: jlduran (on behalf of Jenkins) Reviewed by: jlduran Differential Revision: https://reviews.freebsd.org/D54786 --- lib/libc/posix1e/mac.conf | 1 + lib/libc/posix1e/mac.conf.5 | 3 ++- lib/libjail/jail.c | 15 +++++++++------ sys/security/mac/mac_syscalls.c | 8 ++------ 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/lib/libc/posix1e/mac.conf b/lib/libc/posix1e/mac.conf index 011143abf073..7da9bb8a9638 100644 --- a/lib/libc/posix1e/mac.conf +++ b/lib/libc/posix1e/mac.conf @@ -12,6 +12,7 @@ default_labels file ?biba,?lomac,?mls,?sebsd default_labels ifnet ?biba,?lomac,?mls,?sebsd +default_labels jail ? default_labels process ?biba,?lomac,?mls,?partition,?sebsd default_labels socket ?biba,?lomac,?mls diff --git a/lib/libc/posix1e/mac.conf.5 b/lib/libc/posix1e/mac.conf.5 index 98aa62dd83a7..99d75584a0d7 100644 --- a/lib/libc/posix1e/mac.conf.5 +++ b/lib/libc/posix1e/mac.conf.5 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 25, 2015 +.Dd January 19. 2026 .Dt MAC.CONF 5 .Os .Sh NAME @@ -79,6 +79,7 @@ and # Default label set to be used by simple MAC applications default_labels file ?biba,?lomac,?mls,?sebsd +default_labels jail ? default_labels ifnet ?biba,?lomac,?mls,?sebsd default_labels process ?biba,?lomac,?mls,?partition,?sebsd default_labels socket ?biba,?lomac,?mls diff --git a/lib/libjail/jail.c b/lib/libjail/jail.c index 75fd411c70c8..baabeb4afed9 100644 --- a/lib/libjail/jail.c +++ b/lib/libjail/jail.c @@ -1436,18 +1436,21 @@ jps_get_mac_label(struct jailparam *jp, struct iovec *jiov) int error; error = mac_prepare_type(pmac, "jail"); + if (error != 0 && errno == ENOENT) { + /* + * We special-case the scenario where a system has a custom + * mac.conf(5) that doesn't include a jail entry -- just let + * an empty label slide. + */ + error = mac_prepare(pmac, "?"); + } if (error != 0) { int serrno = errno; free(jp->jp_value); jp->jp_value = NULL; - if (serrno == ENOENT) { - snprintf(jail_errmsg, sizeof(jail_errmsg), - "jail_get: no mac.conf(5) jail config"); - } else { - strerror_r(serrno, jail_errmsg, JAIL_ERRMSGLEN); - } + strerror_r(serrno, jail_errmsg, JAIL_ERRMSGLEN); errno = serrno; return (-1); } diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index 1035c6dbb84b..9bafa6d30c36 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -331,18 +331,14 @@ mac_get_prison(struct thread *const td, struct prison *pr, goto out_nomac; } - if (!(mac_labeled & MPC_OBJECT_PRISON)) { - error = EINVAL; - goto out; - } - intlabel = mac_prison_label_alloc(M_NOWAIT); if (intlabel == NULL) { error = ENOMEM; goto out; } - mac_prison_copy_label(pr->pr_label, intlabel); + if ((mac_labeled & MPC_OBJECT_PRISON) != 0) + mac_prison_copy_label(pr->pr_label, intlabel); /* * Externalization may want to acquire an rmlock. We already tapped out From nobody Tue Jan 20 04:09:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNc33YPz6Nw8k for ; Tue, 20 Jan 2026 04:09: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 4dwDNc0bJFz3VRX for ; Tue, 20 Jan 2026 04:09:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882160; h=from:from:reply-to:subject:subject: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=AXHNngJ98Zs6OoytbgIIEEaTqkskxrvG2AxdwdyI7BoaaN7g7aPuENcUjma5NuVcQsXrTE wjE5LZU5sw50aYKJthMZJXwlVlHtdOsCpkl0Q81R0A5QqBahFv7JEOIYEhEqiaJU4IjqwM C8kBMom8udEwlP3Zs2mlU/+76iGWuGJhSUltRIreyTI9GhAQiJ8XNGDBP3GLX4GmF5xIx9 Rm/HAOGmrB+QFZgaXNquNtXCbxuZtOYMnd/K2qPS4e/58SxR1aX4UX9InvgWwZ/8xLn+t2 YbBlQtJMIUUZJhzmF9lOrClmwX9jJbBWoveYh4m5TB6axqryBQ8/2YhxxoVuOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768882160; h=from:from:reply-to:subject:subject: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=YI8V+bQ3FANnolyaX5RhJjczPt8kpFpxLOOlenEq03B4LhU8zTxZy8tun/FOZhEbfx3Dl6 JKoFsok7cVFZXIY4ulDJUwnQ5k1LJQFcx9mb3mcTyx4j2D1tPRUtDwKgA5SbiT2EVbrXrG YRURjrP7GSDR+R3GBQv36phmCwN2bHob+lUAscltrqQyTdVWosSoaI5u8oWDMz9loGXsLA 0yt1jxh/jlt+4bGdbprriR2BD3GOM0nSiWK18/HOJBtQgIKmJhQdBUn6d/FTBVXDGU/vaF eGbr6nahrDc29xpW8LEQcEJpc2Dd8Nez4VjTVfQsUfWNmWPfZPqLnlD59Ks1Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768882160; a=rsa-sha256; cv=none; b=hQaegq4TdbD75SnX35NAMRVb3nxDbkaatZH1OAkqaWRmyTy6HPudBZUpWhqngnPj34vV5C R1pQxR4YziXESzFBWJPXtdqZp5mQW0CDu6QVRh6FLEmuZsrxFtB/MPZvvrrF0wl7F2i+wh xH6wKCErqn5KhcfQFcVqF9fPLTTpgdGjECAlUm4VUMQVtXl6vpjWBRHGNz4abtiqYL4FKL BKy7e62azfu8GIAuVuJllu0nlRuntXnOwPd8eG9yKNJFVgns+FtI4rMg7vhVivwAukGLz2 MRgx8E/FxhCoXuZVnVG69bI//OLG5uLlONCx+05x+jdDiIHbXmcC+S+WeC6dUw== 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 4dwDNb6nzjz11d0 for ; Tue, 20 Jan 2026 04:09:19 +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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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:21 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNd36l1z6Nw3P 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 4dwDNd0x2Xz3VM8 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 4dwDNd0BhKz127P 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNf2bffz6NvXT 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 4dwDNf1Ttgz3VPX 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 4dwDNf0kqZz11r4 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNg46ZBz6Nw8w 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 4dwDNg21CQz3VPj 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 4dwDNg1Zwcz11xH 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNj08dbz6NwBP 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 4dwDNh37BZz3Vc4 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 4dwDNh2SN0z11xJ 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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:25 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNk09t6z6NwDp for ; Tue, 20 Jan 2026 04:09: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 4dwDNj3cQDz3VX9 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 4dwDNj39jWz12B5 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNz69J3z6Nw6G 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 4dwDNz3Rbyz3W0P 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 4dwDNz2z2sz12B7 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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:38 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDNy5f9rz6NwHT 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 4dwDNy30GYz3VtB 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 4dwDNy28Gzz120Y 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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:40 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDP10nMcz6Nvsx 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 4dwDP04PFyz3W2w 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 4dwDP03r9Lz11xM 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDP22S64z6Nvsy 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 4dwDP1525mz3W79 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 4dwDP14dxrz12B8 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDP30lgnz6Nw2Q 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 4dwDP25jZDz3W39 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 4dwDP254qGz11pW 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwDP43HkYz6Nw6L 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 4dwDP36N6Dz3WNy 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 4dwDP35sx0z120b 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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 10:27:08 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwNmX4b9Sz6PMJj for ; Tue, 20 Jan 2026 10:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwNmX3jNnz49Xl for ; Tue, 20 Jan 2026 10:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768904828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G/2yspGpOO/3TOU1aQxoFiNyuXUGNJokXfyXBPDoUIE=; b=UkQNdOZGZq7mafPznUKcU0mUAj3cB82iEHYYriRT3ZYvqCpce2h1Cdqlhl5xGtN8p3Lwno E1Xf3vH++EKhI/W55G1ucEQzXNsH65WF6Zq06VOokARuNqlbKlggVOknYYwDT5MgBx9CCX Bat+Qj9J2zP/CtoYrb8k6tFOZ+9NYx+Z30pU3FizJua+ErtGgbrqjE5ZWhEg4qAKev1Bpb +/dM69yaHbE9NpVcFGgf8OU7Uh7crgkVz/gu32uURuNBE+mzcCiAIsKRHOqempJRgUE6up /qfudkGTgrjTKEQSEqpXQraSF+9gBIBRVAvvk9nFMd4iG9c6E3cRNxDarQtKuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768904828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G/2yspGpOO/3TOU1aQxoFiNyuXUGNJokXfyXBPDoUIE=; b=F62g9EDoSYZsQLA0kHZYLfzxtS3xpno9Ex+uuKU/cwzBIDjLrIydobk0h+/T3Q8lmv+RyT IvPM61bXRzyhwbBEpwxJxefPneVVugcVIKa2Q28ms7Mno5D+o0nLcF3uyqHLV9lCNdjWV6 a92HjvcObKAICFeXD3p3RZPuuG3SpN7rZOCkrNpx4PoK7joMGv48GlCQ37Y+UkG3PC9Xkq gMdmgfqe+AiaBSOq64dvRKac1A6T1gS4FEOj2o7RzBRStzyOF2DW/61xxJH8oGuG+fTp+5 mdFDxsQOhNcPC0VY2jpgNftfFYx24+uFGF8jefsUfPbK1fWSiVBKQDAp3+jDmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768904828; a=rsa-sha256; cv=none; b=IW8jwR4VdA7QDWCUZZ6I99r7q/G10Cb8BK7Bmg5xdlc6xzyNU6rhFxuDpfW1zrjr69MXBO uk70iIxWotGUT6a+ONzEupQS4E3DwsecHnBpRsP1IdPe55fuIRjsg+90T5bRezOsahYViE uqqBxX8qnCU3ECvQKZf24ZJtpcpl4Sf2GBb5Q8by4nv93/SthIV4T9+8q0qIuBbJmjifNA lfUZ9Ni0f1FIV/r8ETDvVsRoSROqJSjV/TuxvjLUvmu7Fdv50qQye7sHZiXzeNI7GMi8Ad CP29IADhijsodeNpbO84a432cBtNbRI1g81kbO2sswJpqVi98RCDcyUp79lzWA== 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 4dwNmX2gm5z1Cmg for ; Tue, 20 Jan 2026 10:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 352aa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 10:27:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 3d771e0db66d - main - dwc: cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d771e0db66da77da5a7f323df1c0638e6b586ea Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 10:27:08 +0000 Message-Id: <696f587c.352aa.761cce38@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3d771e0db66da77da5a7f323df1c0638e6b586ea commit 3d771e0db66da77da5a7f323df1c0638e6b586ea Author: Michael Tuexen AuthorDate: 2026-01-20 10:25:31 +0000 Commit: Michael Tuexen CommitDate: 2026-01-20 10:25:31 +0000 dwc: cleanup No functional change intended. Reviewed by: Timo Völker MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54788 --- 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 Tue Jan 20 10:37:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwP0F03LYz6PMpQ for ; Tue, 20 Jan 2026 10:37: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 4dwP0D6Xswz3Cps for ; Tue, 20 Jan 2026 10:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768905436; h=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=qdym7IhN68lpcprCUtAH6qshgN9v2iFGTxBEobXOTWA=; b=v0AiMS5V7qrPpWskXQ4fZT0Bgn4gjkX0Ee1Ke05jhZXjvsVALE2EYHH4yhZUYW3IJDYVjx /7suf1RN23H8n1ahYZP6cUFt5oqSFsF2Q+TvH+8WelVU+l4zdPEcm1t3jj3qS7aw3LKvpw uV04oy1+oEQmo2Bro+Hy3qtn9Q9bY55zcnHLb1xyhkMPka+pnRzdcVmx1yeJIo8Ydpx6Ju 61K6aBENGY869ge3Oa8TDTUtwvgIwxDs1gG3F0SiBNjxHzK1NS2SOJ7zqfxhpGSr7y+t6Z 07IIfDPzyZJ/HVyZPDrgyyMXFU3qSNqESsJuOvd3/xMzFZafJaC2L0P2Nr6t+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768905436; h=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=qdym7IhN68lpcprCUtAH6qshgN9v2iFGTxBEobXOTWA=; b=WIN2hXR59Wmmg40I5h6aPWzY4/GJYlW48kZN//qlWqYTHWjwbSvPSRHMxWKeLaTuIqkoTF WcE76wzGUdRqPTWPddGoOkvtF7br9Q6uyn7+HAaGpvaxMo5g1B4Bm3XrgO6IZ0UjQnmWWH ccKTn2lsCaeUYtLccc1nxymOSlgmotr1LRSIU6O7DPnRgvm6gm4YOKH2MouB079To0ukDZ kG6p37nilbjnMi36z+EPFD0u0jJhNfFeGSjDbvKSDvVocZB7FPPwyHuQgESjBiOs6YTRFF DNrGwmR14fMcd3XTG1bfBhiSlyt8l8FYl4t/s0sGb4U5AQflXqjElWl6f1hSHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768905436; a=rsa-sha256; cv=none; b=Qv3eFupipHsZpGdfj2nZkaGkXI+JZA8Wfx7bexfuxL2PXpDBKpQpGffr41S0XZAyAiqmaW zGfIWqjfCEmGvAVCCc6GfLwKh4Hd69TKa3/uKt1mj1SAqxEO+ft9RW/jMO0/XZoeFwJ31Y UoDHw/OBBIE7DnNAWIMn1eupHPzsGV8iRDSIVOOKWl98vFgNU5PUYVQaLoT8c6TjyOgezB Ki5d03x8/uTThlY8jiyJWCbNS8+5ij5nV5tWtTcfIteQ89U8qrPsl04UaCgkeZ8zGaxfu2 mrxQEKojUk7LYTQqrNXsraRwqZ57L/Nmo248XIpQEqqTXnplS1HND949lUgzEQ== 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 4dwP0D64SNz1CXk for ; Tue, 20 Jan 2026 10:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37534 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 10:37:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Timo =?utf-8?Q?V=C3=B6lker?= From: Michael Tuexen Subject: git: 6f15ba8004c3 - main - ip: improve deferred computation of checksums List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 6f15ba8004c3fdc2fb12f0cd6618d1b3a40aab7d Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 10:37:16 +0000 Message-Id: <696f5adc.37534.64e386d7@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6f15ba8004c3fdc2fb12f0cd6618d1b3a40aab7d commit 6f15ba8004c3fdc2fb12f0cd6618d1b3a40aab7d Author: Timo Völker AuthorDate: 2026-01-20 10:30:19 +0000 Commit: Michael Tuexen CommitDate: 2026-01-20 10:36:40 +0000 ip: improve deferred computation of checksums This patch adds the same functionality for the IPv4 header checksum as was done erlier for the SCTP/TCP/UDP transport checksum. When the IP implementation sends a packet, it does not compute the corresponding checksum but defers that. It will determine whether the network interface selected for the packet has the requested capability and computes the checksum in software, if the selected network interface does not have the requested capability. Do this not only for packets being sent by the local IP stack, but also when forwarding packets. Furthermore, when such packets are delivered to a local IP stack, do not compute or validate the checksum, since such packets have never been on the wire. This allows to support checksum offloading also in the case of local virtual machines or jails. Support for epair interfaces will be added in a separate commit. Reviewed by: pouria, tuexen MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54455 --- share/man/man9/mbuf.9 | 5 +++-- sys/netinet/ip_fastfwd.c | 32 +++++++++++++++++++++++--------- sys/netinet/ip_input.c | 6 ++++++ 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9 index e4f30962ccab..265a6dddda98 100644 --- a/share/man/man9/mbuf.9 +++ b/share/man/man9/mbuf.9 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 1, 2025 +.Dd January 20, 2026 .Dt MBUF 9 .Os .\" @@ -1216,13 +1216,14 @@ in is not set, since SCTP does not use a pseudo header checksum. .Pp If IP delivers a packet with the flags +.Dv CSUM_IP , .Dv CSUM_SCTP , .Dv CSUM_TCP , or .Dv CSUM_UDP set in .Va csum_flags -to a local SCTP, TCP, or UDP stack, the packet will be processed without +to a local IP, SCTP, TCP, or UDP stack, the packet will be processed without computing or validating the checksum, since the packet has not been on the wire. This can happen if the packet was handled by a virtual interface such as diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c index d3d42afb2d84..6001ce781bc8 100644 --- a/sys/netinet/ip_fastfwd.c +++ b/sys/netinet/ip_fastfwd.c @@ -359,15 +359,20 @@ passin: } /* - * Decrement the TTL and incrementally change the IP header checksum. - * Don't bother doing this with hw checksum offloading, it's faster - * doing it right here. + * Decrement the TTL. + * If the IP header checksum field contains a valid value, incrementally + * change this value. Don't use hw checksum offloading, which would + * recompute the checksum. It's faster to just change it here + * according to the decremented TTL. + * If the checksum still needs to be computed, don't touch it. */ ip->ip_ttl -= IPTTLDEC; - if (ip->ip_sum >= (u_int16_t) ~htons(IPTTLDEC << 8)) - ip->ip_sum -= ~htons(IPTTLDEC << 8); - else - ip->ip_sum += htons(IPTTLDEC << 8); + if (__predict_true((m->m_pkthdr.csum_flags & CSUM_IP) == 0)) { + if (ip->ip_sum >= (u_int16_t) ~htons(IPTTLDEC << 8)) + ip->ip_sum -= ~htons(IPTTLDEC << 8); + else + ip->ip_sum += htons(IPTTLDEC << 8); + } #ifdef IPSTEALTH } #endif @@ -465,9 +470,18 @@ passout: gw = (const struct sockaddr *)dst; /* - * If TCP/UDP header still needs a valid checksum and interface will not - * calculate it for us, do it here. + * If the IP/SCTP/TCP/UDP header still needs a valid checksum and the + * interface will not calculate it for us, do it here. + * Note that if we defer checksum calculation, we might send an ICMP + * message later that reflects this packet, which still has an + * invalid checksum. */ + if (__predict_false(m->m_pkthdr.csum_flags & CSUM_IP & + ~nh->nh_ifp->if_hwassist)) { + ip->ip_sum = 0; + ip->ip_sum = in_cksum(m, (ip->ip_hl << 2)); + m->m_pkthdr.csum_flags &= ~CSUM_IP; + } if (__predict_false(m->m_pkthdr.csum_flags & CSUM_DELAY_DATA & ~nh->nh_ifp->if_hwassist)) { in_delayed_cksum(m); diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 2e0635f8e482..1e1747d04c45 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -532,6 +532,12 @@ ip_input(struct mbuf *m) if (m->m_pkthdr.csum_flags & CSUM_IP_CHECKED) { sum = !(m->m_pkthdr.csum_flags & CSUM_IP_VALID); + } else if (m->m_pkthdr.csum_flags & CSUM_IP) { + /* + * Packet from local host that offloaded checksum computation. + * Checksum not required since the packet wasn't on the wire. + */ + sum = 0; } else { if (hlen == sizeof(struct ip)) { sum = in_cksum_hdr(ip); From nobody Tue Jan 20 11:01:04 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwPWj0C1vz6PPHJ for ; Tue, 20 Jan 2026 11:01: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 4dwPWh4DThz3HDy for ; Tue, 20 Jan 2026 11:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768906864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BjZVjRh8/s5Up4yJXtssZJvaSHSoYi5IN+6Y4d4UVCg=; b=CtQITmTAZvxbjKA+dEXzFnlywceA3Gf1c4MagGmgXL6F7dl0FhGqCHHfYNA/Voanb1VIsZ TipI4VimtSXGPgOSG3YJguVFIKnPjfybroX78dto9Dg8qLRWkJCsiqOi0JeroMsu6q3uaD 25QE5n/GB1955jtz/C5PXzCOhiSk+UUkh9dTSk4LeEsdZ5ZXbY2dgDS9WeXbWsl1nCld0n s6dhiUvyu3waUigILnC7D38FvXEKmqqoYpMW7StvDaDr9oDOAlL8z2YXNc65Z/Imc8OvmL vv7u/f42k9dtuY/n/WT9DrAhMHbcAWVtCCCNgLskKE5wEe8BbqbnmLLsEJafwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768906864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BjZVjRh8/s5Up4yJXtssZJvaSHSoYi5IN+6Y4d4UVCg=; b=T2t5sz4xALUXQErhRFpmUwPObaJ1yJEhPoj+zMxu3hlpRO67FX1D9cdgeS+JtcG9+dqE10 rTrAXcjHx4Am5iy0WyUPpbLP+psD+sFiNI3fV05xRH2qnpSqrJG/uiyLTY/Aot0V/Q/9Y9 ptaRX+ZSladvajzdpwPps7SF+MrpMsVzrB5C6pzuTnMcPp09YM0PZwQtDHEl4wKMjVPA5x QgT9Vp0uVXiKbwC/5Qhfm7xhICYwGOEvQ5F9G5OzPUWeIJqBzThMQdDBaQrk0ZXu4kpETp WkstPXA+e7Tq+Mg403vJwpBA8LKu7Z6oRWG/bvmf452ytF9RNuIu6KgrJJibuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768906864; a=rsa-sha256; cv=none; b=erdysVo+upFzub3HoOcbiNPSgO/LD1cVquQ0iz5MZIu/JiKxA2POm1BiF3qyI0bVxIowqb PCNsNBmynhwGMAfU9SFH8juXyyFX5TuwgSVihpvNco5Daful2Oe/Ri0n6RPVf4xOAwCgxV nW246x3faRylB5Sly7mne38+tnRyxbVAHP5/nCUuDR9bLczDRxPAZG562LkrNwO5YbRf/v 1ruZ9xLD6nbeyAtKf96b8dhCbD0Cnw0D7HJj/ITVs3G0LRuywPfDaC4fc+8kDVXxoMRzWJ MGs7f+vdwUKtgSWXanldVCKCPLLsv7JxAMdBsCW59kNgyEiQrQEbZkI5FslJ4w== 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 4dwPWh39f4z1CYx for ; Tue, 20 Jan 2026 11:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a030 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 11:01:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Bjoern A. Zeeb Subject: git: f4669ef6cf78..f136a9cdb399 - vendor/Linux/ath10k - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/vendor/Linux/ath10k X-Git-Reftype: branch X-Git-Commit: f136a9cdb3992d69660c24316eafc316aaf65b5f X-Git-Oldrev: f4669ef6cf7860919442e67106e83f616ed36f51 X-Git-Newrev: f136a9cdb3992d69660c24316eafc316aaf65b5f Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 11:01:04 +0000 Message-Id: <696f6070.3a030.27d068ac@gitrepo.freebsd.org> The branch vendor/Linux/ath10k has been updated by bz: URL: https://cgit.FreeBSD.org/src/log/?id=f4669ef6cf78..f136a9cdb399 f136a9cdb399 ath10k: update Atheros/QCA's ath10k driver From nobody Tue Jan 20 11:01:37 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwPXK64Khz6PPMb for ; Tue, 20 Jan 2026 11:01: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 4dwPXK4wz2z3HjL for ; Tue, 20 Jan 2026 11:01:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768906897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OQf3a42ElAuSMTbgC/cmwBA6O8krXNQrEUrQACUbuTg=; b=RX5/ZePQoctowXAigeHqq4XhqYN/DPcOYD8moZv38FFqfUBUnvqdeGWYlpe+TXvO7K32DY 9uO+V/iv6X9E/zMHFOge/3KnYVq5acG3+v/itv2zFXp85Ykwxuzv5mUaZY/7O6tGGgNDN1 tVAZbyK9QxPntYe7ASV/WhArHjXt9tEjlNdPDS+SPiGFOTVwqFQjvdKJfG6VNo+XitSFQR skcOsSlio3edNGaStYofqDqnoYFQ/lItO6nlP/U1zMGiXZK+1zarMh1yuEg/bL/fu+RnWQ TFDJ8hU4uY3MBLHpbErvZ3tCZ8hymvfc3cpHupSEr8UbKf1a+lJ4liPvDRA9cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768906897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OQf3a42ElAuSMTbgC/cmwBA6O8krXNQrEUrQACUbuTg=; b=GmCLvCtRYuVen9+mX8syREXHP7AGMfX6WrQH3t3DAGQXPiHFT0Bw4UUk6WpNwwZnXpWDPE 6EzgaBB5DUbN4QZ3IHi1cQn8bMAcZg93mV2K8hmOccbHtHRgdeLdcGJM1FUPyBAoVKpP6A N5NL6uMD6IX+QJRunPiLDxwNcBW+wGo3FMVOD4U5130lT/i3jeMIOmcBny/OlCUNSBclOR cFbD1XarJrNkI+ZS7x3hlSxnXi4p2iC5SPelIAPFRr7LxNiXoe7pBpuvGTlfu3OUraT7Rw ZU4N2p7VE99lbLTZ8SQTGaYhlPcIHJkH/WaxTCMAsTi5ZaZvqq9oeRylHUe5kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768906897; a=rsa-sha256; cv=none; b=YgP7mA0hVCL9gQ8vjqt8tK3H8oR3GebaNqc78qnZnIu7pr+nlxWT4zlfQdnt35w6FhIkJL T/Qc6iyyt99czxfBuN3ioNXMXlc4bAxds+/aaDR+0JcyViV6DdZqu0MalU44tGSoRqCPJH LCmuut7yGodWlK1AHAjypOofQBiNBqTMpCkyYIMzdMuQsW96H9RCvRcAphgD+ylgCWIAzn 56zg4cv+j+s8Odp+iYsFe3rtrpY7Ba6Z6wMYfhqfZqPj5CLBOWZtWWomBrFeGeRCYmmChE 5AUxMvUgpx2E0EXefVu9YADivwxnb2pxdBm6VvCcb5iKLSp1oT+DTr8fsfQ3EA== 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 4dwPXK3x0Yz1DWb for ; Tue, 20 Jan 2026 11:01:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3abcb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 11:01:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 989a88787ef2..4c115eaec2fd - vendor/Linux/ath11k - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/vendor/Linux/ath11k X-Git-Reftype: branch X-Git-Commit: 4c115eaec2fdbcd0c5fc614e0529fa68152501ef X-Git-Oldrev: 989a88787ef2c1a73f44b82031a6f4f4470e2676 X-Git-Newrev: 4c115eaec2fdbcd0c5fc614e0529fa68152501ef Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 11:01:37 +0000 Message-Id: <696f6091.3abcb.13286861@gitrepo.freebsd.org> The branch vendor/Linux/ath11k has been updated by bz: URL: https://cgit.FreeBSD.org/src/log/?id=989a88787ef2..4c115eaec2fd 4c115eaec2fd ath11k: update Atheros/QCA's ath11k driver From nobody Tue Jan 20 11:01:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwPXT1XTGz6PPkp for ; Tue, 20 Jan 2026 11:01: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 4dwPXS6Nckz3J5m for ; Tue, 20 Jan 2026 11:01:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768906904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G8Vu4QdMnozvsH8mVIKdwcvynAx/QF1U/OJEEacXuVo=; b=Uq3RJurrzYXxJy9EnZPcXbivWb4dRHLTJQKjiaLx9idqwU8O/6ByY2CbKtBOaS1uIrag74 AgClHaObQJpzPg2DY9eCfXnsrZG330siMPZIsayy+JSb6O7jvZtCGEV8EgZ6DuudczVAzX cIzqA5W21CR/eRKvq1xImxL+WcolDxKMNDRnNXrRlhZWwbT/9090fV3nVx0Pav3nV/BCDs p40bHgO6KL316JnwKku6FBfZbno0yF/IP/+O44gEwYxp+k/ashzdV+2ACUveLNS7cptsln lXwKOx7LzhP0+UDMunoHMRiazn6PoFyRYkd47q5EP/vu+U4P360YqTmOoXyl0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768906904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G8Vu4QdMnozvsH8mVIKdwcvynAx/QF1U/OJEEacXuVo=; b=WqNPHIqsHRTDq++B6k/WaHuGKoEtz19/jBmoxGF31QgVbrmYVjYgVNSuVP0wfY5ylUnmNB uwAw7y//cnFN0o72U5Lua2xgkibx7to2XzQG+tHGT1mmP3FGpRzgFKJUAST516IRKdvDH/ x81J1ibNsuIOLeujf2HhK2SgpbCb4RRyfSNzl816nZ9pxwrWmvoaltZonERKR0ZA10WQSe NbJ5+mOxxjRCdNu9qe7Rfc/Z9GXRMPg+K6xih7bpr1vHhDqwTyeB48Oko3dtSXX0TRhZXq s1ZsIY7KBdE0DYzN5tFAis4a4kCjWiFFye8Gc6ilmR6yCjFIlOYyTYtWPw5dXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768906904; a=rsa-sha256; cv=none; b=EPJyqrmv/zmVRtF21es8a7nrI8TrJXXO5hGZci7WGhftKPtuE0G1aosQnXOiMaEBrN31KF l49NlsrJzHzrzCGzPj11QtP4VCtDhIkdC1Jnv4RLKpG+7RQy8NGdNcCouYWzvdD6EQgqrd n7HxRR5RvkA/+AROx7H/T3QYnz3HMJbd3ZPc4mwv8VF4JdaNRAop+uX6c6g6Ld0QzG5oTc 0QMJPLVXmcDuE4jRZqo86l0MmJEzSOfgTymiBlmtaUNNq12Uk4lGPSXSKCXoVa3uiIWnjg DKeAz9sI1CpNJ4KzkXziWw1IQx8cKEnKLxkVj8K2IGlLxxTt6PyPg0z+E7mllg== 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 4dwPXS5gRwz1DWc for ; Tue, 20 Jan 2026 11:01:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39c9a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 11:01:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 11a8516c7473..025f935ee5ee - vendor/Linux/ath12k - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/vendor/Linux/ath12k X-Git-Reftype: branch X-Git-Commit: 025f935ee5ee369bd6444a095f4eb2e0368e857e X-Git-Oldrev: 11a8516c7473c871441d1bef01984484af7c88b1 X-Git-Newrev: 025f935ee5ee369bd6444a095f4eb2e0368e857e Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 11:01:44 +0000 Message-Id: <696f6098.39c9a.7048d02a@gitrepo.freebsd.org> The branch vendor/Linux/ath12k has been updated by bz: URL: https://cgit.FreeBSD.org/src/log/?id=11a8516c7473..025f935ee5ee 025f935ee5ee ath12k: update Atheros/QCA's ath12k driver From nobody Tue Jan 20 11:01:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwPXc1gQDz6PPWb for ; Tue, 20 Jan 2026 11:01: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 4dwPXb6pBCz3J9N for ; Tue, 20 Jan 2026 11:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768906911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QXeLL+zBc2C4KNsPUS8O9NERy//5a1Z/SHE+RGakPzQ=; b=WNJV3jADa4bMO6kFUpkXNN8KKNSI7SVY68dQHKPnYWrGAfYcnpB8W2sahJ/4Uc2qeraCol JHs48dUTI/wSIcN/jJo0TfMmHEoiZLV2kQwDo7VdCIJmzxsQ1Ykd1oJ06SVsiwtiNwsH2+ abapLEhrnPrUhqSPObBw7y25oo0NW7CYHC7dFQ4jGUYYbzhhOhUn2jz4B1BMmC/TfiQdsK EPs/gijaF4AFIHxHIlkPWf4yBgqCAPGpFTjD3AIExyLTC/d7073ba5oSX7E4HX0ZBeE9ug 6zVFzBORhqv4qLXt/VZfbp+/wdfsk2OYwswK3IV5h+GmQtu+a9DNKmqPk8FAZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768906911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QXeLL+zBc2C4KNsPUS8O9NERy//5a1Z/SHE+RGakPzQ=; b=tF9syeMB1Ogr+APvDjyzLhqYj3BnK72HSqCLXXQTdSOqIvHVbBt4rj4uDqL0bPdyLPRWLX 90H0mvUp9t04zjsu8ncZRYnuKGOxTA/tmUtVjcter8HNEXUL9wj+chz234/iK8/rHBlLeX 9Ul65krg68v+NljeQjzRpvgoeO6lcxXPbvLVcmmenoPhjJ5D6Zjsygg4NK6fCTbalJOIfq +eNRQuykx//kcn+6qVkQK69jeex6eC2isb6f4mbVXrwhaNEeytSaF7r/dADUmJXd0l5cng qBt0o5mrkmnHvjo/iYfMjnze/m6CCO9nQpVQt44y4HJJINpMFo377To5MGvtTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768906912; a=rsa-sha256; cv=none; b=Y+JvMRlA9TVVXWYqrHknYjYtv0bHxz6h854sUtZqd+0Z4U4eipUYKrHDHVesfkMssUWVxU xWZwIkqCwK+at/wN1gM7G6C/nyAhaIgMl1K82sZPzi5zQDq606QMWypfA8HKlmy9jMzpFn 5WX7WEJuKQ39YY01KEZ4EixtaeLU7iWgyUxojPQU6bwBArvU2243WZfr6VcVChXao2jCeA m9T2Iou3utRLhD/bC+4TN3DR2BRJOgC7ME5KQFHWW66r6aZGm/MSBjaLHtLzUN5AwO2ysI XBqJsDKF4084kSDnkMS+d6pJXCa8WKHGwV0iaSZwIXlFZvqdnRtiCVE3uhK81w== 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 4dwPXb6358z1DTY for ; Tue, 20 Jan 2026 11:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 391d3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 11:01:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 192bfd712d43..127e3efc8501 - vendor/Linux/brcm80211 - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/vendor/Linux/brcm80211 X-Git-Reftype: branch X-Git-Commit: 127e3efc850139279d539791cdab8c8175db2a6d X-Git-Oldrev: 192bfd712d43c313cb52e74187602a7bbedc5378 X-Git-Newrev: 127e3efc850139279d539791cdab8c8175db2a6d Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 11:01:51 +0000 Message-Id: <696f609f.391d3.78d659ac@gitrepo.freebsd.org> The branch vendor/Linux/brcm80211 has been updated by bz: URL: https://cgit.FreeBSD.org/src/log/?id=192bfd712d43..127e3efc8501 127e3efc8501 brcm80211: update Broadcom wireless brcmsmac and brcmfmac drivers From nobody Tue Jan 20 11:01:59 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwPXl4D5wz6PPnH for ; Tue, 20 Jan 2026 11:01: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 4dwPXl3jhKz3JPl for ; Tue, 20 Jan 2026 11:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768906919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/E7no1K9Je9tJWSreyDGzBsf449iEJd53SmCNFJyBPE=; b=yKkCb/6fxcYouqiYH33h2VW6XJHyx4O+o51j+bdWGgAXidjLmc34RUxtmUbE8GDShujDxV bkAxyraFDDnm1jySVGx4yLo6JxIfXl8DVPC9vNAlki2eTR/HsX1ZupTO4JIVpgkf4w+TZv xl6MjFfg1mRJ2xDw1dAoCwzooyBI482njU3CKN0nbrTCHvchbCq51x8tc4i6f0/uU8bRxs JA9eTjRrHTgAA9djcF+WaQkAOsk/V67V1zyWGk+vR2DszwF4EeoyGkFPX9CNzvxCne+DH0 uWprM947jmuVlk6bMUeYETSeKaww1d68nGNN/6tIH9GIRpze9YhQwIsU/z4FPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768906919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/E7no1K9Je9tJWSreyDGzBsf449iEJd53SmCNFJyBPE=; b=rRWetgvXRzSbKuZvSjcj5sqT6Z3JceQwj1KA0/TtXmKjukAKw7/F4EzP3DMFXKiuiJiAxM XndTW+IfEDEXPglCb0wYf6SxLeDtdHPXn30YyrDvNfN8x4mDlaJd+ymXimutSgy1dtvqjj 3MLAM3KIct3Lfi45kDU8ckXCq9NUDTRtDThZyGpi6nnr9rj+BdFMvrCbiN6+LzlLYVCe2F hOhsbBQ9qruR2/kkH2UxyuHOrptV7C22rXgeh/jHjbbQfX4UnSLeMY85ijLYYG16XSsECo IEqhNBTvyUnNsNl6aUFkqQhAoDuMs7obuFl+h5xC3X5Vaxx6bIwjVcb/FZorZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768906919; a=rsa-sha256; cv=none; b=C8BtBz8kOmi+RKIKUzxA8E2+IbOM044J4nndzvn4n0IqG/K+udE1tpJtpt3/vaN0HiNNub N0LzVLzHHpDm22cbvrI5oqAyN4B3irXjeeoYLdKjivX5BU8sYeBC2u44R1BC3TW0S247E3 Vm+aDFURgMO4VWUnQwn4L/lQFSnsXupFSmTiP+vbyZg7K9azY8bSWXsBqT6jMI5pPMW9Jo kREHaMyMh/F5jP3aywbfgw0vwd7bB5JxAGS7r0gad2OgfBzpXGiphybpC/+feoHSGANBeh MaMwYjMZcegGfdkkaiH1mycfff0vt+3+bgyN0ElmRqGEPuyzcMfMkfUjxXNsZg== 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 4dwPXl2llcz1CpR for ; Tue, 20 Jan 2026 11:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a6bd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 11:01:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Bjoern A. Zeeb Subject: git: fca83bcec33d..a4829696f279 - vendor/Linux/iwlwifi - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/vendor/Linux/iwlwifi X-Git-Reftype: branch X-Git-Commit: a4829696f279b529cce08b86aa8f055ab1523b60 X-Git-Oldrev: fca83bcec33db6844fc7e7024cd6ac280b66a366 X-Git-Newrev: a4829696f279b529cce08b86aa8f055ab1523b60 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 11:01:59 +0000 Message-Id: <696f60a7.3a6bd.34cb8da6@gitrepo.freebsd.org> The branch vendor/Linux/iwlwifi has been updated by bz: URL: https://cgit.FreeBSD.org/src/log/?id=fca83bcec33d..a4829696f279 a4829696f279 iwlwifi: update Intel's mvm/mld drivers From nobody Tue Jan 20 11:02:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwPXt6lmYz6PPN0 for ; Tue, 20 Jan 2026 11:02: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 4dwPXt478Zz3Jl7 for ; Tue, 20 Jan 2026 11:02:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768906926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nU2vmusFdaFcI9WKx0HKIcQUASQNb521jzbjYmECJr0=; b=vWlQyY8vI1VeIMylHMWx6PzVhw2rKdoTZkO2f7LWHpv7mAiMxT/qTFpyM+0c0wo6/nZulL xY4I+JA1smueDygziUzMly4mRM5L3JMLlcMyEFXrR00UAiI1xZk2XAWYt4NjJEmrWPe9Nm NmOiJd2m9QnVsRgr4kuYankP5cZtqHWRL+KSE6BF7JQM/gpkECqDjJ7E2jA49rJNGdXWEm BIz/yekS2UiMlMGsgN21mY9hSqX3qzD1QU1jjcsmIjtktbJn8RjNtOJj8L66nIoyJ4Wp+w KbvyZetLqe/mLKT4zYHt7O6dfCSGZK4SETushMXAhvpNoXHi+ujAXhTPG0TM4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768906926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nU2vmusFdaFcI9WKx0HKIcQUASQNb521jzbjYmECJr0=; b=opYCDSKBEBNlDePmA3Tdn5K/zTWgBFTcXX09xMt02gWEc6JJ/c2K2hSvK4YTKd0+NMXlPb OBj8cDpL1jwmEOmzqZQUTKNyO20/Hhqdl7WhrLxD/EynY7mz6Vw8ItwT8x81S+UZrbFRWW IWUZII6T6bKk+cZ4Et9+akk70XDTIPzz82rhaA0yvwtqm9oFqj0aBajModVQLIK/Ug5dHY uo/+kikR6psv1fpFUpkVpMOSJj7qIpOhppoG0wzlVzh+M4wsp7wv7NEETyMmafOrojjZOO Dhe3NLuEz6qTgkyTYWvq0ukw+DBPngjo8jEMiOcfn1lOWYIk13CcajywTruGxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768906926; a=rsa-sha256; cv=none; b=GLe7gNxJYFJrhze58G+kM3B45EWsql1Y65C3ALB6NMBMikTRpOJz8gUr/UQXjKEP+cxdK5 R530BJAEKI1RQw9/wJMVwd+7twako8Lh8vbLe6tLsmr5OsKkmjJArrpukYXxLFSgNm6Ckw 9so5cZnw8WFwD65E743kRv+qFzMwwVTHKj8M38DwEnzO6g3+ZHwIkKaY7K9r3BVokqM6Z8 nz4j3c7M1xjIJU9qaN+ZstoYVZUUFHuCZrhFWCdwlGVuwzSv9a0zyYB/g//X6rjahIpeN5 PHJQMwoYcezDMVivS5bpNAfuDeviiwXwF2bu7ITWI0PAiEecq3QoWVxqPcnaBw== 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 4dwPXt343sz1Dhr for ; Tue, 20 Jan 2026 11:02:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 391d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 11:02:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 793e6427d908..316122010afd - vendor/Linux/mt76 - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/vendor/Linux/mt76 X-Git-Reftype: branch X-Git-Commit: 316122010afd2d7ff718b59c4821963df8a2c9ee X-Git-Oldrev: 793e6427d9089ce2724005ea3dadd839334065ae X-Git-Newrev: 316122010afd2d7ff718b59c4821963df8a2c9ee Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 11:02:06 +0000 Message-Id: <696f60ae.391d6.48f2927b@gitrepo.freebsd.org> The branch vendor/Linux/mt76 has been updated by bz: URL: https://cgit.FreeBSD.org/src/log/?id=793e6427d908..316122010afd 316122010afd mt76: update Mediatek's mt76 driver From nobody Tue Jan 20 11:02:15 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwPY375kwz6PPnR for ; Tue, 20 Jan 2026 11:02: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 4dwPY35FsWz3KD5 for ; Tue, 20 Jan 2026 11:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768906935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XrqEaDqNLAtT74K+FGZAx9Hdw8UMLthCyKeqtww9RXM=; b=mUa2JC+a7AS+D5afRLL2IPMSvxxG6GEwOG/v5622ZfpDyr+5hWbZzjJ9SwtosXsLepKPAU 0hBGSU8fWiVVGkB0x/gXFoS/B75qm3cvBRw5WcZTqOHR0h+n9iMvEprzrBIgvUiQzhK279 d40ztEWqS1YHnue3p2NttZXjr5uMbCpXPGrBfYoaxLfUCpmviKcK1UlpO82REzRhEybgBJ qhsC3fb+ZYtZ2QZJV/I8i6x4G3tUgQi2ivpO2oSR5l2qy07/+/NW6rubZ0jCgoOzRLH1q3 icl9k2DRzScolx6WSCOs2otVKVrF+GsqZSMKJCKs3XsURbl8n4Y9xrh2UgJx4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768906935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XrqEaDqNLAtT74K+FGZAx9Hdw8UMLthCyKeqtww9RXM=; b=uTFdoFzsHlM2s7nfKu4c79hhmj4Omf9Kk7exAkQWGHLLJ8vhMyE63OsVjf6Q5TJVYmx9dQ QfqjlZcf2B2fbnc8va5Sc9oIdaS9kSsQ5pm1Lt+1bkfCt2wZVhr1dkHlHR6JLjqOtv6u7X MziJNiqxrtC0JiuGCOlapPfqUJnNMM/+p+47WspxMJ2AxeK/ZJP2xhbw1Ip53rSyj74cKv 70Llb46fk9Gx7CHWfOaLiSBu7G4XjT2gGtoT1wFGNu4TGlrldYpdevjzhujJY6k05/2WVZ sUYS5unWdg0NnOc+x6xHY/Nu4Pa0byGqBbJEQKiiu5hF2Az7ZZsA4Rf5ue9tZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768906935; a=rsa-sha256; cv=none; b=lotcMnn9nGBffezs/HxbAr0xs2IpIRE04atQQIcfMwuWjoQRXjzGk1aeF9Op2yOvhQ0r4T mSOj+5V0pQpeCjp+Y9EKxZAGqjzojRg+IF7s6KzIX/EvMYgdBcYEBtDIEKTlDFkn2GYCo9 fi0Wh5yz29gqlwI0HWQCL0Y50O6uSK5bO3+REezL6iid511ZiWDINroLPs7q8KNnM+7sew KQ/u8IHktBSw22z+dXg4fkjG4T+yPoimGzBmSmaQhlZXA2wZvRfV8Ar01ud7nBXdMz5NAE ZqVJ6TV6v1kseE0QrxGFdwY3XFf7HYwtgOH+nQSMEquumAdqioK4HROg394Qag== 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 4dwPY341qhz1DJ8 for ; Tue, 20 Jan 2026 11:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38d65 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 11:02:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Bjoern A. Zeeb Subject: git: e543442afe3a..225a2dcb0294 - vendor/Linux/rtw88 - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/vendor/Linux/rtw88 X-Git-Reftype: branch X-Git-Commit: 225a2dcb02943b5ed98b90f4a5c53b2a9b50f5a9 X-Git-Oldrev: e543442afe3ad5b27616575be2d2402b988656eb X-Git-Newrev: 225a2dcb02943b5ed98b90f4a5c53b2a9b50f5a9 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 11:02:15 +0000 Message-Id: <696f60b7.38d65.2c112132@gitrepo.freebsd.org> The branch vendor/Linux/rtw88 has been updated by bz: URL: https://cgit.FreeBSD.org/src/log/?id=e543442afe3a..225a2dcb0294 225a2dcb0294 rtw88: update Realtek's rtw88 driver From nobody Tue Jan 20 11:02:22 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwPYB6n1Zz6PPRR for ; Tue, 20 Jan 2026 11:02: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 4dwPYB5MGZz3KQF for ; Tue, 20 Jan 2026 11:02:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768906942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c5WStQSKDfwh/xNngdsrTjQt3yYrTLr3IyQeoJp/MQQ=; b=tP67Ommrq8nMV8WBJWQ8Q41VuhXOnHstflwG5jKRvGAxBZ+H8TRnoo40XQ5OEfG1jyxEsz kt0Rd/R8c2o+CBCvHUReNTZkiEqLhwO+3+JAMLKbCfQIdx/WRyQZ6dKyehbWrc1V32cY8Y Cub5lH9CdfMhDUInxo+L9HW8r5Jslg24SK0SBgORSRIgiqOknBgHFG5/Fm3o7ABEdpCMCH yfR73zr55BIKKooNZbJbH14HzhVTXW9J9SQMFeTbWZnMW30WbWSbPu7r4URaoFASxrD+Di /MNKJ3gfpvIRcPPcBGFOMhrGCcvE+k+dLvh2SzhOaoA9WFyPpVRkLaCupmDgMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768906942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c5WStQSKDfwh/xNngdsrTjQt3yYrTLr3IyQeoJp/MQQ=; b=bjGTx+YOg1LsYFOXAW9omw9Ka2HjXEKLEuy+XUPwkbziS5NY+4G693O99cULBzfU+Wh6lM fEPxZxM9teZnkD/dgdHEy1k2ycXtpFYxl+/y9CLysJHPfuBp6cy10QL0teGL2hWyaPuLwG Sc2X8JGDnpaAuV85GzMekQ+75KUUvlcpb4/khNhpBUU3lt3ffjGzNgSYEiKVe5JgJjpp2u kd7T/gs7PsznGyFVbXOl8VzBAgferkdgCFpzEXWzr9L2hIktaHhcekQejhOS06feOKxfd9 xcfOYoI00e+K3WUsePzpBzKKULVgdK3+6ZbBBOHkrD0fIpb69wJeqA2zxpCiYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768906942; a=rsa-sha256; cv=none; b=O7B8DkzCnxbeI3djRzp6jW4UXjOmqBLuDn/aSdXysHIBrv5aetHal7buNeZNuMwb0g64nl KXpoDMP8e51xdkFPrwl8jfkarPchIP2P0+lBNfWCqJkN3GMGb3tLzG2gYTnrmNFbqP1/ys JQ+nfGNY9FdSGFlqBzyojLflLfw+pc2gLOil2+SQKILLXnD06LrK9kdJ5eyfYlSDQhgOnJ iPScugxJ0OaUwCX7g1Mrwj2+Hf9gUYV9H3P8VOk0R+9BCEgAsPCpgHdP+28vSpnKjbvSA/ 6nAnAQpDbLXn/xbNA46kcfryXEtnR8g9AqiXWieNcsKXEj9Y2vQoBja3lyVAdg== 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 4dwPYB4b4Bz1D3t for ; Tue, 20 Jan 2026 11:02:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38fb7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 11:02:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 4fbdf5199e13..f5eb24d531de - vendor/Linux/rtw89 - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/vendor/Linux/rtw89 X-Git-Reftype: branch X-Git-Commit: f5eb24d531de64cd493796fc0790fc8fc825d161 X-Git-Oldrev: 4fbdf5199e134d02e5c153245c2a70a8f61805e7 X-Git-Newrev: f5eb24d531de64cd493796fc0790fc8fc825d161 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 11:02:22 +0000 Message-Id: <696f60be.38fb7.29085dad@gitrepo.freebsd.org> The branch vendor/Linux/rtw89 has been updated by bz: URL: https://cgit.FreeBSD.org/src/log/?id=4fbdf5199e13..f5eb24d531de f5eb24d531de rtw89: update Realtek's rtw89 driver From nobody Tue Jan 20 11:34:03 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwQFr4HP9z6PRCN for ; Tue, 20 Jan 2026 11:34:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwQFl3ghcz3N0F for ; Tue, 20 Jan 2026 11:34:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768908843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FEbxBCvHke58HReoVhvmS50AiKLJzyMMgsvOhbY0Qh4=; b=MDuen9cDYQ1d2mhR0AxpVaXr72OQtn+OhfK66ruGv/eB7pXrzv4Y1o8Hzkt40AjVjf2rId GmuwizaDE3JFTLpsYMS2c3y6fEY/G9LQ0d5mVTNBEIrrGIbx7uANZ4ZvE0POptok6NHkkX LoNQ5ag0EDZUWZaFgBudymi39ResnInk1aQM4s84hjsIfX2vmIEqhB0GhWcxQeRlx2QgbI 4Gz2EYhSsJKc0t/diUQPKj03+xlN0hn/IxIuGi7lmqBWRUbNdaNS2UZNDROo/gqHrkjez4 84zsL1gTLrtY7QI1ZmAPN8helhyLiNjbgaQOOFj98dK1gn3Hmdao4LOeDsPBKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768908843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FEbxBCvHke58HReoVhvmS50AiKLJzyMMgsvOhbY0Qh4=; b=RjbLzMQ+s/z1SW5fH3mElvL2lJFV8fBPDoyhqEKjo8WW40aCPkX6VuIYcmB98kSi4s5FGL MlGfCXm4ODwcERnd2bZgL+44j8hZpnChsZuCOTsuZj7lij+fUiW5FE9Gv5OE1TsTUJN/5K 0f+MjhaditT98qz0yQvUl9PfgjAZJobZJ8+/4mFmXznFCUtJL3Nc/uombpjHna3G08TbCT s1xG40yJ/bQwguaB1lrBFCOqVd5xbBbVI62WwROEk/skmvTito8zWjT+n9bEiMd5dhVx1/ faQ4XikzfN2xQg76C95QCg8W6vbVlQydW7dcQeqJ9uMMRVC8DvSsKv4OABN38w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768908843; a=rsa-sha256; cv=none; b=xCPr0XG3OaFEWXIcU9SVSPRB3Ah4SMEcCsRAAAkmylGw1xTB8sTqW3O/z2xHyJOfjVY3YK 162d+6lIbDE+Sq5n725eBl3jpKV50BoAYfVL3u4Ijnxchc1A/NUN46jwLULydV5hYx0xLJ DKLO3jIKgVlOG0zU4Rke/DkCLgnkOXFIn5qy4KOqeLQe3F9U6B1+F4mea9/COVu0mZRsTw 2fG33hJu30T3AAJULuDHVEQTvr/KO0XNAReOiBBPNXRZM3eQ7kC8B5iNKfJCKExxiyVd2t 2+BFqXMktNhZpSLyjZhlnDDXa0Nn6Wx/+ilmArl2p/T/SX7Fv/tHbPTaMUFR3g== 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 4dwQFl35yNz1DnY for ; Tue, 20 Jan 2026 11:34:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c07b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 11:34:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Bjoern A. Zeeb Subject: git: ecf2949504d8 - Create tag vendor/Linux/ath10k/torvalds-v6.19-rc6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/tags/vendor/Linux/ath10k/torvalds-v6.19-rc6 X-Git-Reftype: annotated tag X-Git-Commit: ecf2949504d8e2bc9bba071280677fbfa8c7aca8 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 11:34:03 +0000 Message-Id: <696f682b.3c07b.5f952de3@gitrepo.freebsd.org> The annotated tag vendor/Linux/ath10k/torvalds-v6.19-rc6 has been created by bz: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/Linux/ath10k/torvalds-v6.19-rc6 tag vendor/Linux/ath10k/torvalds-v6.19-rc6 Tagger: Bjoern A. Zeeb TaggerDate: 2026-01-20 11:29:46 +0000 ath10k: update Atheros/QCA's ath10k driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). commit f136a9cdb3992d69660c24316eafc316aaf65b5f Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 10:55:32 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-20 10:55:32 +0000 ath10k: update Atheros/QCA's ath10k driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). From nobody Tue Jan 20 11:34:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwQG01RBfz6PRWS for ; Tue, 20 Jan 2026 11:34: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 4dwQG00sNnz3NfQ for ; Tue, 20 Jan 2026 11:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768908856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=54h2PD9eq8VjjRHr+zayXKFGuhwt5e1oa5Xt944utX0=; b=Y9PNkNZwZ8lRRIeuMXj0p2w+TuAXXRYFlTpImUnRa/C2NIPQBd5YuI/mFcLLdgJ7F+kr16 oyBexGw7vSbQpj2W4ZK0rNbNSK1/SHW6kofMuzcxWlYVaYveKAIogfgr9b4Qi3/SGSYx+9 SpL0aC3KvDuxIFc5FdgI+ZlU/w4fflFGOJFn785Q13FwxC+QAMrUhwH4NSx4nkCv1dZQIH cwLn3rS27uAwm7kWXKLcfn6tsMJkG8ywM+/bLhZNZ1IDrbbwgg7QlXWHVG5xltRsvlg6ED +TJC3Kk853JfEWD9ukheVnSeI8AuinlgOYH2sR1/PFovuD9ZeLe3NGrx8tcwzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768908856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=54h2PD9eq8VjjRHr+zayXKFGuhwt5e1oa5Xt944utX0=; b=PuR/e65ToCY5Jl9a7yf7JXbO1sXylkQq78Ef6A/1GbQfEYTcRqHdhIJNqvIemgbafRGMlw QD63gFVM5i23MHhBg3d55bFctYANW/ChHKYZwr6pZVgJPVWTQXXS6fO458FrJioshvUxTb n3cqYw4mUXPBP67yINKfH5btpTDakaO3DkI6maCV6G0P456uIWZk9uynBJ7m67AYR1J/PF 3hKos/mR0oDZIqndCSMMT/mWeg7dlB5fYCUvWX7VGGYRmKfxUyIWrwYdJuHF7TqeQH9Yrv wEMPQkhh+yl1OHI5jOLLZo2AkbkRKhWOllDTNZV7S5mgeaf/8f2KUvvvZ3XKlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768908856; a=rsa-sha256; cv=none; b=Mkk+6FxUiHZQpG+o2LVc5kKJ4iRUFHRJ4wBF300bahN4gGXtPNhATQ30DtrD5Zij/shNkT cfwZXqsz4MDbhCwQVET8PHoztTIhiqE9T9kGiX4fnSPDtphy7HTwIWrR0CIfa0WjvPgXSc cvtSO4HjZ38Oh1NlxjBvwQ7O7jM6NrLx0DYrtlSyhD3Qd5rD4WIxe9EcMmmAX6hD8s2HXX YcO5Nx/f25EMgR7ONRQlmfyoHPR92SStKCsvpmEn/Jg1SLbKdbar9NrDYRkeesi3OpV0gA iaiEALtfGluYbmAaV4ozAJcO/6Cj7qDaE8FNQKNqukNxOiJHxS8DUHvN+R8l6w== 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 4dwQG00BMYz1FTQ for ; Tue, 20 Jan 2026 11:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d009 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 11:34:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Bjoern A. Zeeb Subject: git: e22ffe435403 - Create tag vendor/Linux/ath11k/torvalds-v6.19-rc6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/tags/vendor/Linux/ath11k/torvalds-v6.19-rc6 X-Git-Reftype: annotated tag X-Git-Commit: e22ffe4354033ed11e15be147ab7afc8b3b151a2 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 11:34:16 +0000 Message-Id: <696f6838.3d009.8df0c1@gitrepo.freebsd.org> The annotated tag vendor/Linux/ath11k/torvalds-v6.19-rc6 has been created by bz: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/Linux/ath11k/torvalds-v6.19-rc6 tag vendor/Linux/ath11k/torvalds-v6.19-rc6 Tagger: Bjoern A. Zeeb TaggerDate: 2026-01-20 11:29:46 +0000 ath11k: update Atheros/QCA's ath11k driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). commit 4c115eaec2fdbcd0c5fc614e0529fa68152501ef Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 10:55:41 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-20 10:55:41 +0000 ath11k: update Atheros/QCA's ath11k driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). From nobody Tue Jan 20 11:34:21 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwQG601RWz6PR4B for ; Tue, 20 Jan 2026 11:34: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 4dwQG56Pwgz3Nk8 for ; Tue, 20 Jan 2026 11:34:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768908861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IF3hdPD2bTcRA+BMA8KDFsgNmvAmX82B8yi/glWiXBY=; b=x4dJuF534J0DICgLiQp8uPyH4+/b8h++zAKCbc9rW8PqqARTDwYMw64Z0Kqu6PJmufMwZN mtSHTfovLswh0vVNZs8brdvMEaf+WY1tEVd8dNJIuis1t5ZHHEN3WkVJ08ylat9K+5XFG+ /wc0Wd7+RjWBVmopuHoBCSOcv0r8FuZiV07Qysv6OqrKgFQrtie2apBBx/AA5KfDsdJ/hk Q5wYQttKn1ekH9VdvBX6FDhiPK3GcniUq7n2u+KxLn00nhDMALSMC10TO9RWootH+gLHSN 53MdXPdYiWhu/BgL5JCT6CyZg833sFrldC0mirgt5XRvkMME7TXmw7F37tJOZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768908861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IF3hdPD2bTcRA+BMA8KDFsgNmvAmX82B8yi/glWiXBY=; b=koTXjW5RqxLMWUBY/tOyGVGCIcnrkkI42Y/rRU5aq1wxPD/LhmPVN7SMnUK2HXuBkpHtUr 33bXO6Vy/3irmexUlkXByxFXigR8YpYIzu7kXppkLEW3MM5x+fIH3AsV5Ycw3E5q48Mi7y ZSiQHbzbnWGdW0EHFtwKCDSAt2RrjaVqxBvQXx3zvVJh4pCCY6oHbp0C8jLXMxR/P1xENr RuMfkorss19ad6Lce1NDNIG+UlAUudbL6AsoNtrmGwrJv/GS6YNhL/grgPm/3pcGq6R3rH i5io9JCaEfGlCO+k2ipCM3fu1WMJtPWQDBRcIyuxS0n9nWp8QtyPO++8mcWTvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768908861; a=rsa-sha256; cv=none; b=o+xz3SXPLoPgaPI2NCefc1kjiV6Sldm9YiSYzCNuoQq/S38uCUyzCPY4zClwUWK92wOvOd JYEQ8bdrjptI/FIUF86xJIvb2LInThoYkxVIQ4d5kE8PclTYsytW8Xu7ltqy/bsB8AnK7X 1mVzSvWOENKcTYR1Sqvrv5jZl1FTN8+h24tnZhvJTaT/eZuO3v1tHmtb6bxeNDUYVL0nvp g2lI6ZxmlWbEm8U+If0rwT5JhDH1TSq1HIYMrlKgKz9RRC5vXJStEHRDmLkoOooHcIu8DW LnARhKD+O6bVVJ76asiZ9K0H/i/7bQ+Z8eQrHzolpmQSe8gK+Lq6qnBd2SNn9A== 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 4dwQG5607Lz1FGv for ; Tue, 20 Jan 2026 11:34:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cc91 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 11:34:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 17a9f4a27e30 - Create tag vendor/Linux/ath12k/torvalds-v6.19-rc6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/tags/vendor/Linux/ath12k/torvalds-v6.19-rc6 X-Git-Reftype: annotated tag X-Git-Commit: 17a9f4a27e304cfb90db7925cb5ff4f7432686b4 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 11:34:21 +0000 Message-Id: <696f683d.3cc91.6cbf8b45@gitrepo.freebsd.org> The annotated tag vendor/Linux/ath12k/torvalds-v6.19-rc6 has been created by bz: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/Linux/ath12k/torvalds-v6.19-rc6 tag vendor/Linux/ath12k/torvalds-v6.19-rc6 Tagger: Bjoern A. Zeeb TaggerDate: 2026-01-20 11:29:46 +0000 ath12k: update Atheros/QCA's ath12k driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). commit 025f935ee5ee369bd6444a095f4eb2e0368e857e Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 10:55:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-20 10:55:45 +0000 ath12k: update Atheros/QCA's ath12k driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). From nobody Tue Jan 20 11:34:28 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwQGF0xvGz6PRFw for ; Tue, 20 Jan 2026 11:34: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 4dwQGD5thPz3P1b for ; Tue, 20 Jan 2026 11:34:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768908868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v0/Yb5c5Q3v6jLspsZHSZPXOhutSPGuUtrXkt5RZAnw=; b=S/LZlKlBNHjJdNapWCzCnfQTdJmCUdKolJrPhDYTf+qXKKQJEzzxTa8P9fZ+7RSCjlNPmN Dr5dvNNHE2C+89NFEupzikIEUs6c11XCB4LxE5pOgUvD2Eubv9mSnq63MNBXad7wva+otw TFIZF7fUMST8wYnsOOqa6/Jv7KS9atMdkRrWVYrGkwWUMkIgTrwJRuE2cRVW2D/ESnHn/H ZIvGXpODH8C5r7Kw25hMLi66VlbPIYHClEJJEegA5STDrvuX4G37vWr482rlgrCSWK938W 2WONHrJMexUTBiAhnajhmpSNUdwBa/uG9dkWmnUcX3O3/WFrVMRmbtxTl4hvUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768908868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v0/Yb5c5Q3v6jLspsZHSZPXOhutSPGuUtrXkt5RZAnw=; b=VoH0v1eFC+831BBVA+RSnMfF09u17xCLq0rTQIPyiommST5FNN1I0a1Z9imukmI4sid+j1 So2mN39laRl6UBHHdotvsOE14vVFxm2hW5020ou7pL0lZ5k3f7xWmFVE+DpTZzHlwqcfdo qwRh97NGKIPl5zXp5ysy7biHGaWbsCxn+u98fIEw+6O+mXR5M9A7ETSYv3s11yIDH5wpTE /Q54kVZQ4vt0KVX4V6fPdV6sq8AmJKrJ2XMtI/7ac52JOVZT4f8X4BKVryVN8s621w0Jx6 uRDNc8/sUmC5DNuy79nZymaiWU1eSFzmQjfiHDTQDSlhZAvSscgv4UVPh/as2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768908868; a=rsa-sha256; cv=none; b=KqKQ78BOCQ1K2FYROXGWfiHjM161Xima1x1wbGBPbuod8eI7Di4bZZ3Hds8Zroz9ooBs6C Pzz07kIPwaGA//FUaiwSY2IVX2pgWxbAOhzbEYokGfB8QuiizGY+twg5M+ujbPHLnu1V/D PQKVEjfK6xnHb+CtjHxp5PLYAwOchxdAcUbj/Qvu0BnFtvdjWBK/1NOZ+Pem9WOQV+nFdn zNXhlUvUYxt8iFAgF7cLQcg4CfN+wL6H58zTm0hl1yYVZa7v10KMO5t/mpl/3GomVQjsCC ssABB6p6ybb4o1gvLLq7v8zuH7GFZWRIpaGF17B0GntqMKXOlXwZEURRymAM1w== 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 4dwQGD5VX2z1FKS for ; Tue, 20 Jan 2026 11:34:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d00c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 11:34:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Bjoern A. Zeeb Subject: git: aa40b4903f3a - Create tag vendor/Linux/brcm80211/torvalds-v6.19-rc6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/tags/vendor/Linux/brcm80211/torvalds-v6.19-rc6 X-Git-Reftype: annotated tag X-Git-Commit: aa40b4903f3a61cab9dfe1a8f46082e4c8c9426c Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 11:34:28 +0000 Message-Id: <696f6844.3d00c.52c1d321@gitrepo.freebsd.org> The annotated tag vendor/Linux/brcm80211/torvalds-v6.19-rc6 has been created by bz: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/Linux/brcm80211/torvalds-v6.19-rc6 tag vendor/Linux/brcm80211/torvalds-v6.19-rc6 Tagger: Bjoern A. Zeeb TaggerDate: 2026-01-20 11:29:46 +0000 brcm80211: update Broadcom wireless brcmsmac and brcmfmac drivers This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). commit 127e3efc850139279d539791cdab8c8175db2a6d Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 10:55:49 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-20 10:55:49 +0000 brcm80211: update Broadcom wireless brcmsmac and brcmfmac drivers This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). From nobody Tue Jan 20 11:34:35 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwQGM5xX3z6PRWZ for ; Tue, 20 Jan 2026 11:34: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 4dwQGM44r0z3P5f for ; Tue, 20 Jan 2026 11:34:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768908875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AtFfSqvai4+aeMR8J1UYOT4Td5H1pc/vregouuOUN5o=; b=ed+z3QbMpMdZaM+jTc3o3l2wXHq2YpumunRcycc2AWNRYWxJlwcckZmkhQAL3OzzMWBkwe HX0K0/IiixUfPt4FHIG08Hd4QoLBK3RixBzjM70jHQ4p309xV9Ek4aNXvtU+6Z4R6qu4E3 pizGVdLBnmVuQlJTHWbC8LqvjOXzUkz0/CYQDkW5THdcAedcUPyAf+zKOzeEhPpsA/K9/u 2Z7jPpItciNNG7oUq9NForZpoB0qVqNf3Y20/AWH3MG0ibr5ReXo17BKUw0fCrnAqE2027 VekrPtCzO0bYf5CNTpCyvbK0t0ly+s6axGDPxWnmb/oZKEbqXsuwIkwRFdYTTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768908875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AtFfSqvai4+aeMR8J1UYOT4Td5H1pc/vregouuOUN5o=; b=QCFRbLKKqZASuixo7vF+Kj8RMVDCRCdql7IguVaznWrUJFHmsQLXROnHKQXgTvVoeV0kTO N5A1ks9ORdmhOZGBJN2YEQhW4bAZ0/xxNACGX+7LaS+d4Mdr3wtm4tEmzfKsRRjrQXFoqJ s855Zr5ePrRX/M+3XbG5EwNaY/EgZunaKvcUSMqVv4TKgC+YyZihCG8ucHsb/A8kzccfIA 0cNHf54GsJgxWr0GHpNXgMDu/iRtu5ahTSqNdWBrY0Yz+SHDCxGqBqjSwoVTr7K+b7pi71 pqG1KccPFpHbBIuUVNKDsX70LRp+pBHCm7LA6otVglu+x2xNqlkynUN62Ara/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768908875; a=rsa-sha256; cv=none; b=WLzwdv/hOAWfc5xbIRRmBtmed6+HTH6NC/bpR9RqlQOTb5Rvt/BsjZRjWokT+KQJXJHrzN hQjjeCJArNA8NTYwNy6mUqVgBbYWyXwLPQfrzL37dtilC0XTnriMc+VRugkpq0bQZobDbX XaS1++Sy6aXPYeZcVTYBKU5BovXIWHnBjww0Dpzp+Pduo+tV6DH44wmpvUKaFtUwz0/6u/ EkqkCHsn/wNSt8rCxujzbQuEuJmH+88ZYJafkpilSw95eHrhryb7fqT/BpXWuwHJIPWPLf hrmNU5F4FixJVUiTLFy6LVoiUMaQhfzo7G6p/dgRQ8o8ibyxlHJg5T3JwQ3usg== 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 4dwQGM3gxwz1FKT for ; Tue, 20 Jan 2026 11:34:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d00f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 11:34:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 818006192433 - Create tag vendor/Linux/iwlwifi/torvalds-v6.19-rc6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/tags/vendor/Linux/iwlwifi/torvalds-v6.19-rc6 X-Git-Reftype: annotated tag X-Git-Commit: 81800619243347fb7181666324fbd569560364ef Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 11:34:35 +0000 Message-Id: <696f684b.3d00f.75fbcae0@gitrepo.freebsd.org> The annotated tag vendor/Linux/iwlwifi/torvalds-v6.19-rc6 has been created by bz: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/Linux/iwlwifi/torvalds-v6.19-rc6 tag vendor/Linux/iwlwifi/torvalds-v6.19-rc6 Tagger: Bjoern A. Zeeb TaggerDate: 2026-01-20 11:29:46 +0000 iwlwifi: update Intel's mvm/mld drivers This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). commit a4829696f279b529cce08b86aa8f055ab1523b60 Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 10:56:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-20 10:56:01 +0000 iwlwifi: update Intel's mvm/mld drivers This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). From nobody Tue Jan 20 11:34:42 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwQGW0NDWz6PR1p for ; Tue, 20 Jan 2026 11:34: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 4dwQGV69clz3PY7 for ; Tue, 20 Jan 2026 11:34:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768908882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ObTMuG2wuX2yQXKgF/moNYjpUtlaSSgDaBkY6XAg1pw=; b=k01nneQi+H7nL4gwV3tnJTZSWnbQxa+Q4iC4fbYJDq+gyTYHqiebI4JuXMaWdyHOE8QS0l huL+WQEhzbLvjx4k8tYGwxE0Hgwgu83dz1yEmcXlzCnOj3BG0yz+1xePQJSC8AbMVFg5dG p02tnKPO4YI5OShRpiFFoqOA08sACfDjH9YduAVqgtO5gd8LcD5fvXoda8pUQupxKqA+9b 2H/K0UDshEukh6Gsm1LmJVBbXnbu+abB2anhNrjUi/o0VeO7Nh9MDIjy8jBw3nhP/5ItLU OlGo38ZDe8unJIb+Sm8ZTuLyxKxXZTpjxS5bYB9UrqR/gCnmeL5vtlbkADQaCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768908882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ObTMuG2wuX2yQXKgF/moNYjpUtlaSSgDaBkY6XAg1pw=; b=VMEGHYnXphBLFk0dLvPYBayfcvOUs2GiOO7cbauRc2j/dAKUqaw1t7tC0DQG5vbUPhpiEu zE3oswEX5f6+nJiX6SXgDIK8/h2+kz/56vvK1tJrGWDrjbJuwEwEoCyV/aL67o7kVJTgi2 9d9UJzi/ikRwwiLlUjPwVCjwZmHUc4HKHlx9Lu4N2lcmhzcmZwiQ1sINCVwfVZ9AVhKKZm /FKNiRv9ChJwlEip96aDH4AbTrx520gHMNwC01/uYnry54+I6ICaWQlheTIgVelktknmew YYmTKYg2QipBfkXv0xlwS6xmFAf3QIsNB7QBShqoX7KXQWh+uHPxgxabaisj4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768908882; a=rsa-sha256; cv=none; b=gYDRyS7sS0LmFT6UrDlexDxs51pO0PiiJd9SMA/I6ZUthqSruk47xmLRdZxxBMenJYZAQ5 ncsSBB3MCocLL4Ow/VL4Ap7ZKcJGEX8cNMUOLhE++buncsrIIcDJu46Fdyc4uBZSEBPFRV arJLKSZNrR9Xq/sowDRvXri4Nren92LIfN177Z/t0Dp9WigFkG7qGkN8ThWH9VNXJ4dGCf cdGfaNqDUEvmzN4TA5OiC+cq1gHCDNaGeUkFzooGahNMK0ey1yjGSWrYyp6M4nEnV6loh5 vv+nMLVhWk/KJskEHz1KSlACjMwbZRhdHgc3WVHevMY+rXYSYsHxy7wrcUZqFA== 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 4dwQGV5WYcz1FKV for ; Tue, 20 Jan 2026 11:34:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cb93 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 11:34:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 8a6799ac9389 - Create tag vendor/Linux/mt76/torvalds-v6.19-rc6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/tags/vendor/Linux/mt76/torvalds-v6.19-rc6 X-Git-Reftype: annotated tag X-Git-Commit: 8a6799ac93897e1c1b28c8abbd480689fc7918db Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 11:34:42 +0000 Message-Id: <696f6852.3cb93.2e28eaa8@gitrepo.freebsd.org> The annotated tag vendor/Linux/mt76/torvalds-v6.19-rc6 has been created by bz: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/Linux/mt76/torvalds-v6.19-rc6 tag vendor/Linux/mt76/torvalds-v6.19-rc6 Tagger: Bjoern A. Zeeb TaggerDate: 2026-01-20 11:29:46 +0000 mt76: update Mediatek's mt76 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). commit 316122010afd2d7ff718b59c4821963df8a2c9ee Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 10:56:27 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-20 10:56:27 +0000 mt76: update Mediatek's mt76 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). From nobody Tue Jan 20 11:34:49 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwQGd6L7nz6PRfw for ; Tue, 20 Jan 2026 11:34: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 4dwQGd5Zbgz3Pj8 for ; Tue, 20 Jan 2026 11:34:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768908889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rot44r3+w8WE/7J3y3nDWLsTXw0aN2hqT5nDb4sW12g=; b=q8o3BrXpLxbjMEugfgKHCvSALgAPnkz+N/mHsGZJy0riHyOb496KQpZu/mUuHIGp1z34lW ttiAaeCtoUjDpW3BVkuHDDD5alZC0CsCpPs2rbmuNjgnpqQpA3lt7gJOIODZhOa0D8Afw9 DlQCb8FLARYwcGtZbYvXjLGYVH2JGHfa+AXEMt4vFQLRZ33f+fQbepXib8p7amXnAXaCU2 zFWTZ8WB8OKFZAICJcpcIQ6d14+j85UBNs/i6MDAOaHdaK2JJLrlyJBmwoEfN3iMVrDmTC 6B1dtwOmM4NKEm6jUzUBv78cjZHjgOE31DZ7xwuckBelaPi4GOFfoe3APMT9Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768908889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rot44r3+w8WE/7J3y3nDWLsTXw0aN2hqT5nDb4sW12g=; b=BmddGHmsOAbdpYzJxEGdyFxHTTy+rDuc2WPFDIclcpghY3Vd/AQGurgDL758RJDWjqmoe9 QthVDerlfTegOIptd11y+QuP2VOAU0y8DMNh1CqwXk2ZDK4zQSYUvGTiduF2rC0k60QrfA L1SCOMC4z1e0x5euXczvRJrkrj8L3RcXHPlsCmxYWNGSlcoGF7ziCUF+REii7rXS/KOCg2 Gh1naVBr37/o5Aj3VmiRFN9wlm7Tzznhv5IXnuNPj4hYoH0h5NmpZDUW60h70+FfujyVtD GET27VM+eBjmTGt6eOg6PRhEgUpIUX76uiNv/pR8MSPv+dzMjUBozahwlKHiPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768908889; a=rsa-sha256; cv=none; b=tTAVmUddulNQXzd+m2+EE5iJDlXSdMJxeIVQSafmHIJIrpQY28XATuRCaImN5iSwb7ykJp mmsod1S0cP9frpDmY1t9FR7UlwHehyBGugXBUk4bDkKYhGupwD5TOrUWB1+j0df2XuBbcu vSbx6IAjCvWdnyAc1Q/j6sgWaTzA0MrtA1Kb6BBu4fmrJQAN9D2INEyaGvYG11sk1bmKfG 83MSTWfYbV8+ThpuQH41OXiNm3qtqMJV+ck++GwULJGdqfhn4qf7eRZ2ZCFb0BJMIllEct oSyOBRbo0roPcEXNf8+aRr/v1a+WEGfnPq7vg5mje4l445zuoNWm6+rkmv3BRA== 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 4dwQGd59gxz1DY9 for ; Tue, 20 Jan 2026 11:34:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3db52 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 11:34:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 09435e702b4f - Create tag vendor/Linux/rtw88/torvalds-v6.19-rc6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/tags/vendor/Linux/rtw88/torvalds-v6.19-rc6 X-Git-Reftype: annotated tag X-Git-Commit: 09435e702b4fa928ac4147b9c2530312162479cb Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 11:34:49 +0000 Message-Id: <696f6859.3db52.61b16c16@gitrepo.freebsd.org> The annotated tag vendor/Linux/rtw88/torvalds-v6.19-rc6 has been created by bz: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/Linux/rtw88/torvalds-v6.19-rc6 tag vendor/Linux/rtw88/torvalds-v6.19-rc6 Tagger: Bjoern A. Zeeb TaggerDate: 2026-01-20 11:29:46 +0000 rtw88: update Realtek's rtw88 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). commit 225a2dcb02943b5ed98b90f4a5c53b2a9b50f5a9 Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 10:56:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-20 10:56:33 +0000 rtw88: update Realtek's rtw88 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). From nobody Tue Jan 20 11:34:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwQGm3j7Fz6PR1v for ; Tue, 20 Jan 2026 11:34: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 4dwQGm30V7z3PtP for ; Tue, 20 Jan 2026 11:34:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768908896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xp2MbUq6+MwMmO7v6Df0cTw+qowmf8+UT0lAGtf1skc=; b=Jwp2rOiTC8J7lpxKRrd6rdW1yqOCZ4jVSY1dSl35Yi2o4dN8FP7MXLpMgrVfn4XETQNax/ zzS77oho6k2BePnn5o5L8nExUOvIDnOqI1JgNX7tEXkOPwUs360YRdQiptbcfVaVH4BKN4 zokpdtNpYaIwFI6RVTYtGAKistlubHfhbadY5J3pg1pQOpmNefhC2Z6QA4tah7cdYMMEP8 E+J97wbBbZiatsxZj5qKXIjK51afEZffxZzUJqYC+4Zme35tzYWbN+m45xnNzAkfV5LhqZ h0IrnViG21nzLqylE03JBFCIUGbWAFoVYn6x4Qd1DBuD0Nl4czeZY/QNtYJ2zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768908896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xp2MbUq6+MwMmO7v6Df0cTw+qowmf8+UT0lAGtf1skc=; b=UGWfclov6gfXMgzg18B4wGh1IFNz69SNGxaI+qTo3YRP6B9QX9hJTMs2zmlXp17Q2TK7uq 7IVjWFet1qIUzPnXzsoExMcOEW2ky7Fcz2UPPbL4UAumipy6PSFYPC8iQZqdEu7NP0ISab DEeQEMwv+y2oyvvaHctiPEgePz+yk9OxpNXljv0eNN7bpQ6jYqO4Vk16WbsXOYnOdpjXwl PSJH2iFtHcqEXgz/5xhW6xBcYZDqIGdoNXl3EqDAV+n1DvGmWG/Nqr+BBLwaCcEk9N434K Og09pHrg+7BW2Y2rekohm/KyGAnqgpDOHkdSKIJvjiwh+aRniUeNx6akvzA+Bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768908896; a=rsa-sha256; cv=none; b=azkb6GDq8DlKmXIgKZcTOqQol89J3lW4AMFload9gkHQAfiXYyIw8EyNI8AfUL9/wlaiBQ d2qXH+fWWTG5R3Ld8HxA8nVIqJNCZTlUiSRgIhWwgfTjWhVX3bb+bZD/d9MKe7FFNZVwj7 tneSsbmrtwLeFSrnmKu74bJI3hRSlhScxpH0K0AM1Zy4D7Es7pLyfK7pphFgRvERnCvgd5 1j+mVctq6lD5JSgLz/6RG22iTevIeK4VKdDj19MAR0fRFFv083Wb4OR7SXx4m+pa4VWqDh EZgMq1YaH7jmVfSNEcicmHDJbLkrg2i2vv0J7ncLT3tHUY/I6UeFB7WPweWSug== 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 4dwQGm2TwQz1FKY for ; Tue, 20 Jan 2026 11:34:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cb96 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 11:34:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 118cf6cffb38 - Create tag vendor/Linux/rtw89/torvalds-v6.19-rc6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/tags/vendor/Linux/rtw89/torvalds-v6.19-rc6 X-Git-Reftype: annotated tag X-Git-Commit: 118cf6cffb3810c12c292ad67e4d031d5b5e30c6 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 11:34:56 +0000 Message-Id: <696f6860.3cb96.32d939fc@gitrepo.freebsd.org> The annotated tag vendor/Linux/rtw89/torvalds-v6.19-rc6 has been created by bz: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/Linux/rtw89/torvalds-v6.19-rc6 tag vendor/Linux/rtw89/torvalds-v6.19-rc6 Tagger: Bjoern A. Zeeb TaggerDate: 2026-01-20 11:29:46 +0000 rtw89: update Realtek's rtw89 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). commit f5eb24d531de64cd493796fc0790fc8fc825d161 Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 10:56:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-20 10:56:45 +0000 rtw89: update Realtek's rtw89 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). From nobody Tue Jan 20 13:24:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwSjQ0rXmz6PZTD 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 4dwSjQ00wWz3lMh 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 4dwSjP6WnCz1HcD 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwSlX0Thtz6PZTy 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 4dwSlW6v8Vz3lrW 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 4dwSlW6Vrlz1J4d 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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 13:41:47 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwT5F0KBNz6Pb9s for ; Tue, 20 Jan 2026 13:41: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 4dwT5D6vCRz3nBn for ; Tue, 20 Jan 2026 13:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768916513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qRXd5yd/hCeHvlh2VaP9QMrlzyOvyIy0QBbst31s0X8=; b=Ui+S4JIdbOxTg4IjkgC4gusdzclRPpEuz8YnDsFe0frPfYAk1HBJ5DzrOeXDd6xlxgsb5w 0COmkG2OI36oW2KkJT51LqyzptVE4dSiBZgXTutf4pvehnA1kssgVVHboL8jGjH2Goz1pd iLNYqZnEhtAIPUxfHvLIJbaGMZKY6HLFWG5GWh9SqYqT418uZg3F2cUdfbOeOw9H/Rwen3 9am679SDlxGfuW+mZNccwwvmQy3BIJIiDzL6G57pW4tGyFUgAM3DiWn/ZROID17jnFPc/K 5VvDzE7pMDqvW9RVI5JYAiQ/Jd+Guk0Z98BGEWIX+E/LV93TnM5+r0ieogqdvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768916512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qRXd5yd/hCeHvlh2VaP9QMrlzyOvyIy0QBbst31s0X8=; b=C+X2QCek9SXncmYa/F5lKBMoYSPJuFVEoFr4lbaaBLdsReQrOGM83Hm5RY89YOegqaeA5Z nQcrz0QxwqUAnxOZqV/MJcTIAf9CV3ilvOt2MICCw2kI73M4CACM6qliNo0FGm0UsjkfZC ydZF4FI2+caBPo6244T73jQ21rBWubT5Mf45maUEVZcEdvT/05ds9x29PvVNpILV7hijN/ b4kfIwIZlnTfRGjLfIhIpHpoT9KWXtM21BWma0vYzbtzntUMbD1Aln8r8q8TMiv1gYvf05 JjLV/jWCunufCJnkdvdY3GhC5898+MjDE9yrEvGrfJTtWv0jEi6DHJY5s1xsyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768916512; a=rsa-sha256; cv=none; b=yI/Gj0h0cz1C2sQtBB9NxMNLOTNCmxZFBI8as4WKtw3m0Kmxogzu3TQmDK+kVpNJGyDv10 L8W6eY1zL0860dGABfyliJBK/fegEctQhzljlUCyEajNL5BuG5mABKap/SB1QPDOiUa10G PR4v4UByQeMPX5Pi/SD0pVXWJv/zxp6qL5uY8TOgtVHy1iVy+T1YcuXSltdsXMbLvkgS5f d5kRgTRgvOd8sHEKLPifqHHRObTs56PqxsJulpCBEyf5bu/Me+wiN4P2Qhm8fl8n07CF6w KZ3uNKpG/oi43jecQkIci20f7AzfZbZ9S8AMMvItsjkm4aGIvoSaiOAfGGpAhw== 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 4dwT5D6Rp5z1JNP for ; Tue, 20 Jan 2026 13:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 89b7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 13:41:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 1876de606eb8 - main - krb5: Expose missing symbols List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1876de606eb876b7a97beccfe6fcc89e60a72a25 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 13:41:47 +0000 Message-Id: <696f861b.89b7.312a8d05@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=1876de606eb876b7a97beccfe6fcc89e60a72a25 commit 1876de606eb876b7a97beccfe6fcc89e60a72a25 Author: Cy Schubert AuthorDate: 2025-12-18 00:50:44 +0000 Commit: Cy Schubert CommitDate: 2026-01-20 13:41:02 +0000 krb5: Expose missing symbols Add symbols found in the port but not in base. This requires replacing a shared libkrb5profile.so with libkrb5profile.a (with -fPIC so it can be used by shared libraries). We do this by making libkrb5profile INTERNALLIB. Base currently has libkrb5profile in a shared library. The patch moves those functions to the various "consumer" libraries as the port does. Symbols that should be in the other libraries are in libkrb5profile.so. This is causing some ports issues. PR: 291695 Reported by: michaelo, markj, Chris Inacio Tested by: michaelo Fixes: ae07a5805b19 Reviewed by: michaelo (previous version) MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D54323 --- ObsoleteFiles.inc | 4 + krb5/lib/apputils/Makefile | 1 + krb5/lib/crypto/Makefile | 3 +- krb5/lib/crypto/version.map | 59 ++ krb5/lib/gssapi/Makefile | 3 +- krb5/lib/gssapi/version.map | 308 ++++++++ krb5/lib/kadm5clnt/Makefile | 3 +- krb5/lib/kadm5clnt/version.map | 36 + krb5/lib/kadm5srv/Makefile | 3 +- krb5/lib/kadm5srv/version.map | 29 + krb5/lib/kadmin_common/Makefile | 1 + krb5/lib/kdb/Makefile | 3 +- krb5/lib/kdb/version.map | 27 + krb5/lib/kprop_util/Makefile | 1 + krb5/lib/krad/Makefile | 1 + krb5/lib/krad/version.map | 11 + krb5/lib/krb5/Makefile | 5 +- krb5/lib/krb5/version.map | 1196 ++++++++++++++++++++++++++++++ krb5/lib/rpc/Makefile | 1 + krb5/lib/rpc/version.map | 28 + krb5/libexec/kadmind/Makefile | 3 +- krb5/libexec/kdc/Makefile | 1 + krb5/libexec/kprop/Makefile | 3 +- krb5/libexec/kpropd/Makefile | 3 +- krb5/libexec/kproplog/Makefile | 3 +- krb5/plugins/audit/Makefile | 1 + krb5/plugins/k5tls/Makefile | 3 +- krb5/plugins/kdb/db2/Makefile | 3 +- krb5/plugins/kdb/db2/version.map | 148 ++++ krb5/plugins/preauth/otp/Makefile | 3 +- krb5/plugins/preauth/otp/version.map | 3 + krb5/plugins/preauth/pkinit/Makefile | 3 +- krb5/plugins/preauth/pkinit/version.map | 128 ++++ krb5/plugins/preauth/spake/Makefile | 3 +- krb5/plugins/preauth/spake/version.map | 22 + krb5/plugins/preauth/test/Makefile | 3 +- krb5/plugins/preauth/test/version.map | 2 + krb5/usr.bin/gss-client/Makefile | 3 +- krb5/usr.bin/kadmin/Makefile | 3 +- krb5/usr.bin/kdestroy/Makefile | 3 +- krb5/usr.bin/kinit/Makefile | 3 +- krb5/usr.bin/klist/Makefile | 3 +- krb5/usr.bin/kpasswd/Makefile | 3 +- krb5/usr.bin/ksu/Makefile | 1 + krb5/usr.bin/kswitch/Makefile | 3 +- krb5/usr.bin/ktutil/Makefile | 3 +- krb5/usr.bin/kvno/Makefile | 3 +- krb5/usr.bin/sclient/Makefile | 3 +- krb5/usr.bin/sim_client/Makefile | 3 +- krb5/usr.sbin/gss-server/Makefile | 3 +- krb5/usr.sbin/kadmin.local/Makefile | 3 +- krb5/usr.sbin/kdb5_util/Makefile | 3 +- krb5/usr.sbin/sim_server/Makefile | 3 +- krb5/usr.sbin/sserver/Makefile | 3 +- krb5/util/et/version.map | 2 + krb5/util/profile/Makefile | 4 +- krb5/util/profile/version.map | 74 -- krb5/util/support/version.map | 5 + krb5/util/verto/version.map | 7 + lib/libpam/modules/pam_krb5/Makefile | 1 + lib/libpam/modules/pam_ksu/Makefile | 1 + share/mk/src.libnames.mk | 2 +- tools/build/depend-cleanup.sh | 9 + tools/build/mk/OptionalObsoleteFiles.inc | 2 - 64 files changed, 2103 insertions(+), 111 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 8f44feb757e5..5231cbb3fe13 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20260120: Made libkrb5profile INTERNALLIB +OLD_LIBS+=usr/lib/libkrb5profile.so.122 +OLD_FILES+=usr/lib/libkrb5profile.so + # 20260114: remove ncurses html documentation OLD_FILES+=usr/share/doc/ncurses/hackguide.html OLD_FILES+=usr/share/doc/ncurses/ncurses-intro.html diff --git a/krb5/lib/apputils/Makefile b/krb5/lib/apputils/Makefile index 1a79b3800863..38491579a619 100644 --- a/krb5/lib/apputils/Makefile +++ b/krb5/lib/apputils/Makefile @@ -22,6 +22,7 @@ SRCS= net-server.c \ CFLAGS+=-I${KRB5_DIR}/lib/apputils \ -I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include \ + -I${KRB5_OBJTOP}/util/profile \ -I${.OBJDIR} .include diff --git a/krb5/lib/crypto/Makefile b/krb5/lib/crypto/Makefile index 9521b48f020c..a130a858cfa4 100644 --- a/krb5/lib/crypto/Makefile +++ b/krb5/lib/crypto/Makefile @@ -41,6 +41,7 @@ CFLAGS+=-I${.CURDIR:H:H}/include \ -I${KRB5_DIR}/lib/crypto/builtin/md5 \ -I${KRB5_DIR}/lib/crypto/builtin/sha1 \ -I${KRB5_DIR}/lib/crypto/builtin/sha2 \ - -I${SRCTOP}/crypto/openssl/include + -I${SRCTOP}/crypto/openssl/include \ + -I${KRB5_OBJTOP}/util/profile .include diff --git a/krb5/lib/crypto/version.map b/krb5/lib/crypto/version.map index 702abf195db0..4cb528537201 100644 --- a/krb5/lib/crypto/version.map +++ b/krb5/lib/crypto/version.map @@ -106,5 +106,64 @@ k5crypto_3_MIT { k5_enctype_to_ssf; krb5int_c_deprecated_enctype; krb5_c_checksum_length; + k5_derive_random_rfc3961; + k5_des_fixup_key_parity; + k5_iov_cursor_get; + k5_iov_cursor_init; + k5_iov_cursor_put; + k5_rand2key_des3; + k5_rand2key_direct; + k5_sp800_108_counter_hmac; + k5_sp800_108_feedback_cmac; + krb5_decrypt_data; + krb5_random_confounder; + krb5int_MD4Final; + krb5int_MD4Init; + krb5int_MD4Update; + krb5int_aes2_crypto_length; + krb5int_aes2_prf; + krb5int_aes2_string_to_key; + krb5int_aes_crypto_length; + krb5int_aes_string_to_key; + krb5int_arcfour_crypto_length; + krb5int_arcfour_decrypt; + krb5int_arcfour_encrypt; + krb5int_arcfour_prf; + krb5int_arcfour_string_to_key; + krb5int_arcfour_translate_usage; + krb5int_c_iov_decrypt_stream; + krb5int_c_locate_iov; + krb5int_c_padding_length; + krb5int_camellia_crypto_length; + krb5int_camellia_string_to_key; + krb5int_cksumtypes_list; + krb5int_default_free_state; + krb5int_derive_keyblock; + krb5int_des_init_state; + krb5int_des_prf; + krb5int_dk_checksum; + krb5int_dk_cmac_checksum; + krb5int_dk_cmac_decrypt; + krb5int_dk_cmac_encrypt; + krb5int_dk_cmac_prf; + krb5int_dk_crypto_length; + krb5int_dk_decrypt; + krb5int_dk_encrypt; + krb5int_dk_prf; + krb5int_dk_string_to_key; + krb5int_enctypes_list; + krb5int_etm_checksum; + krb5int_etm_decrypt; + krb5int_etm_encrypt; + krb5int_hash_sha1; + krb5int_hmac_keyblock; + krb5int_hmacmd5_checksum; + krb5int_pbkdf2_hmac; + krb5int_raw_crypto_length; + krb5int_raw_decrypt; + krb5int_raw_encrypt; + krb5int_unkeyed_checksum; + mit_des_fixup_key_parity; + unsupported_etypes; }; HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/krb5/lib/gssapi/Makefile b/krb5/lib/gssapi/Makefile index a434b29a2dfb..eca8dd6ffde9 100644 --- a/krb5/lib/gssapi/Makefile +++ b/krb5/lib/gssapi/Makefile @@ -43,7 +43,8 @@ CFLAGS+=${DEFINES} \ -I${KRB5_OBJTOP}/lib/gssapi \ -I${KRB5_OBJTOP}/lib \ -I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${KRB5_OBJTOP}/util/profile .include diff --git a/krb5/lib/gssapi/version.map b/krb5/lib/gssapi/version.map index 42f32cc55edf..e6358e8226fe 100644 --- a/krb5/lib/gssapi/version.map +++ b/krb5/lib/gssapi/version.map @@ -172,5 +172,313 @@ gssapi_krb5_2_MIT { gss_add_cred_from; gss_store_cred_into; gssint_g_seqstate_init; + GSS_C_INQ_ODBC_SESSION_KEY; + et_ggss_error_table; + et_k5g_error_table; + generic_gss_add_buffer_set_member; + generic_gss_add_oid_set_member; + generic_gss_copy_oid; + generic_gss_copy_oid_set; + generic_gss_create_empty_buffer_set; + generic_gss_create_empty_oid_set; + generic_gss_display_mech_attr; + generic_gss_oid_compose; + generic_gss_oid_decompose; + generic_gss_oid_to_str; + generic_gss_release_buffer; + generic_gss_release_buffer_set; + generic_gss_release_oid; + generic_gss_release_oid_set; + generic_gss_str_to_oid; + generic_gss_test_oid_set_member; + gss_krb5int_ccache_name; + gss_krb5int_copy_ccache; + gss_krb5int_export_lucid_sec_context; + gss_krb5int_extract_authtime_from_sec_context; + gss_krb5int_extract_authz_data_from_sec_context; + gss_krb5int_free_lucid_sec_context; + gss_krb5int_get_cred_impersonator; + gss_krb5int_get_tkt_flags; + gss_krb5int_import_cred; + gss_krb5int_initialize_library; + gss_krb5int_inq_odbc_session_key; + gss_krb5int_inq_sspi_session_key; + gss_krb5int_lib_fini; + gss_krb5int_lib_init; + gss_krb5int_make_seal_token_v3_iov; + gss_krb5int_register_acceptor_identity; + gss_krb5int_rotate_left; + gss_krb5int_sec_context_sasl_ssf; + gss_krb5int_set_allowable_enctypes; + gss_krb5int_set_cred_rcache; + gss_krb5int_unseal_v3_iov; + gss_ma_known_attrs; + gss_mech_set_spnego; + gss_mech_spnego; + gss_spnegoint_lib_fini; + gss_spnegoint_lib_init; + gssint_convert_name_to_union_name; + gssint_create_copy_buffer; + gssint_create_union_context; + gssint_delete_internal_sec_context; + gssint_display_internal_name; + gssint_export_internal_name; + gssint_g_display_com_err_status; + gssint_g_display_major_status; + gssint_g_get_token_header; + gssint_g_make_string_buffer; + gssint_g_make_token_header; + gssint_g_seqstate_check; + gssint_g_seqstate_externalize; + gssint_g_seqstate_free; + gssint_g_seqstate_internalize; + gssint_g_seqstate_size; + gssint_g_token_size; + gssint_g_verify_token_header; + gssint_get_mech_type; + gssint_get_mechanism; + gssint_get_mechanism_cred; + gssint_get_modOptions; + gssint_get_public_oid; + gssint_import_internal_name; + gssint_krb5_keytab_lock; + gssint_make_public_oid_set; + gssint_mecherrmap_destroy; + gssint_mecherrmap_get; + gssint_mecherrmap_init; + gssint_mecherrmap_map; + gssint_mecherrmap_map_errcode; + gssint_mechglue_initialize_library; + gssint_register_mechinfo; + gssint_release_internal_name; + gssint_select_mech_type; + gssint_unwrap_aead; + gssint_wrap_aead; + gssspi_exchange_meta_data; + gssspi_query_mechanism_info; + gssspi_query_meta_data; + iakerb_gss_accept_sec_context; + iakerb_gss_acquire_cred; + iakerb_gss_acquire_cred_from; + iakerb_gss_acquire_cred_with_password; + iakerb_gss_context_time; + iakerb_gss_delete_sec_context; + iakerb_gss_export_sec_context; + iakerb_gss_get_mic; + iakerb_gss_get_mic_iov; + iakerb_gss_get_mic_iov_length; + iakerb_gss_import_name; + iakerb_gss_import_sec_context; + iakerb_gss_init_sec_context; + iakerb_gss_inquire_context; + iakerb_gss_inquire_sec_context_by_oid; + iakerb_gss_process_context_token; + iakerb_gss_pseudo_random; + iakerb_gss_set_sec_context_option; + iakerb_gss_unwrap; + iakerb_gss_unwrap_iov; + iakerb_gss_verify_mic; + iakerb_gss_verify_mic_iov; + iakerb_gss_wrap; + iakerb_gss_wrap_iov; + iakerb_gss_wrap_iov_length; + iakerb_gss_wrap_size_limit; + iakerb_make_finished; + iakerb_verify_finished; + initialize_ggss_error_table; + initialize_k5g_error_table; + kg_acceptor_princ; + kg_all_mechs; + kg_allocate_iov; + kg_arcfour_docrypt; + kg_arcfour_docrypt_iov; + kg_caller_provided_ccache_name; + kg_checksum_channel_bindings; + kg_compare_name; + kg_compose_deleg_cred; + kg_confounder_size; + kg_cred_resolve; + kg_cred_set_initial_refresh; + kg_cred_time_to_refresh; + kg_ctx_externalize; + kg_ctx_internalize; + kg_ctx_size; + kg_decrypt; + kg_decrypt_iov; + kg_duplicate_name; + kg_encrypt; + kg_encrypt_inplace; + kg_encrypt_iov; + kg_fixup_padding_iov; + kg_get_ccache_name; + kg_get_defcred; + kg_get_seq_num; + kg_init_name; + kg_integ_only_iov; + kg_iov_msglen; + kg_kdc_flag_mutex; + kg_locate_header_iov; + kg_locate_iov; + kg_make_checksum_iov_v1; + kg_make_checksum_iov_v3; + kg_make_confounder; + kg_make_seed; + kg_make_seq_num; + kg_release_iov; + kg_release_name; + kg_seal; + kg_seal_iov; + kg_seal_iov_length; + kg_set_ccache_name; + kg_setup_keys; + kg_sync_ccache_name; + kg_translate_flag_iov; + kg_unseal_iov; + kg_value_from_cred_store; + kg_verify_checksum_iov_v3; + kg_verify_checksum_v1; + kg_verify_checksum_v3; + kg_verify_mic_v1; + krb5_gss_accept_sec_context; + krb5_gss_accept_sec_context_ext; + krb5_gss_acquire_cred; + krb5_gss_acquire_cred_from; + krb5_gss_acquire_cred_impersonate_name; + krb5_gss_acquire_cred_with_password; + krb5_gss_canonicalize_name; + krb5_gss_compare_name; + krb5_gss_context_time; + krb5_gss_convert_static_mech_oid; + krb5_gss_delete_error_info; + krb5_gss_delete_name_attribute; + krb5_gss_delete_sec_context; + krb5_gss_display_name; + krb5_gss_display_status; + krb5_gss_duplicate_name; + krb5_gss_export_cred; + krb5_gss_export_name; + krb5_gss_export_name_composite; + krb5_gss_export_sec_context; + krb5_gss_get_error_message; + krb5_gss_get_mic; + krb5_gss_get_mic_iov; + krb5_gss_get_mic_iov_length; + krb5_gss_get_name_attribute; + krb5_gss_import_cred; + krb5_gss_import_name; + krb5_gss_import_sec_context; + krb5_gss_indicate_mechs; + krb5_gss_init_context; + krb5_gss_init_sec_context; + krb5_gss_init_sec_context_ext; + krb5_gss_inquire_context; + krb5_gss_inquire_cred; + krb5_gss_inquire_cred_by_mech; + krb5_gss_inquire_name; + krb5_gss_inquire_names_for_mech; + krb5_gss_inquire_sec_context_by_oid; + krb5_gss_internal_release_oid; + krb5_gss_map_name_to_any; + krb5_gss_oid_array; + krb5_gss_process_context_token; + krb5_gss_pseudo_random; + krb5_gss_release_any_name_mapping; + krb5_gss_release_cred; + krb5_gss_release_name; + krb5_gss_release_oid; + krb5_gss_save_error_info; + krb5_gss_save_error_message; + krb5_gss_save_error_string; + krb5_gss_set_name_attribute; + krb5_gss_set_sec_context_option; + krb5_gss_store_cred; + krb5_gss_store_cred_into; + krb5_gss_unwrap; + krb5_gss_unwrap_iov; + krb5_gss_validate_cred; + krb5_gss_validate_cred_1; + krb5_gss_verify_mic; + krb5_gss_verify_mic_iov; + krb5_gss_wrap; + krb5_gss_wrap_iov; + krb5_gss_wrap_iov_length; + krb5_gss_wrap_size_limit; + krb5int_gss_use_kdc_context; + negoex_accept; + negoex_add_auth_mech; + negoex_add_exchange_message; + negoex_add_nego_message; + negoex_add_verify_message; + negoex_add_verify_no_key_alert; + negoex_common_auth_schemes; + negoex_delete_auth_mech; + negoex_init; + negoex_locate_alert_message; + negoex_locate_auth_scheme; + negoex_locate_exchange_message; + negoex_locate_nego_message; + negoex_locate_verify_message; + negoex_parse_token; + negoex_prep_context_for_negoex; + negoex_prep_context_for_spnego; + negoex_random; + negoex_release_context; + negoex_restrict_auth_schemes; + negoex_select_auth_mech; + spnego_gss_accept_sec_context; + spnego_gss_acquire_cred; + spnego_gss_acquire_cred_from; + spnego_gss_acquire_cred_impersonate_name; + spnego_gss_acquire_cred_with_password; + spnego_gss_compare_name; + spnego_gss_complete_auth_token; + spnego_gss_context_time; + spnego_gss_delete_name_attribute; + spnego_gss_delete_sec_context; + spnego_gss_display_name; + spnego_gss_display_name_ext; + spnego_gss_display_status; + spnego_gss_duplicate_name; + spnego_gss_export_cred; + spnego_gss_export_name_composite; + spnego_gss_export_sec_context; + spnego_gss_get_mic; + spnego_gss_get_mic_iov; + spnego_gss_get_mic_iov_length; + spnego_gss_get_name_attribute; + spnego_gss_import_cred; + spnego_gss_import_name; + spnego_gss_import_sec_context; + spnego_gss_init_sec_context; + spnego_gss_inquire_attrs_for_mech; + spnego_gss_inquire_context; + spnego_gss_inquire_cred; + spnego_gss_inquire_cred_by_oid; + spnego_gss_inquire_mech_for_saslname; + spnego_gss_inquire_name; + spnego_gss_inquire_names_for_mech; + spnego_gss_inquire_saslname_for_mech; + spnego_gss_inquire_sec_context_by_oid; + spnego_gss_localname; + spnego_gss_map_name_to_any; + spnego_gss_process_context_token; + spnego_gss_pseudo_random; + spnego_gss_release_any_name_mapping; + spnego_gss_release_cred; + spnego_gss_release_name; + spnego_gss_set_cred_option; + spnego_gss_set_name_attribute; + spnego_gss_set_neg_mechs; + spnego_gss_set_sec_context_option; + spnego_gss_unwrap; + spnego_gss_unwrap_aead; + spnego_gss_unwrap_iov; + spnego_gss_verify_mic; + spnego_gss_verify_mic_iov; + spnego_gss_wrap; + spnego_gss_wrap_aead; + spnego_gss_wrap_iov; + spnego_gss_wrap_iov_length; + spnego_gss_wrap_size_limit; }; HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/krb5/lib/kadm5clnt/Makefile b/krb5/lib/kadm5clnt/Makefile index ef01a5f779e3..27546a87949e 100644 --- a/krb5/lib/kadm5clnt/Makefile +++ b/krb5/lib/kadm5clnt/Makefile @@ -35,7 +35,8 @@ CFLAGS+=-I${KRB5_DIR}/lib \ -I${KRB5_DIR}/include \ -I${KRB5_OBJTOP}/include/krb5_private \ -I${KRB5_SRCTOP}/include \ - -I${KRB5_OBJTOP}/lib + -I${KRB5_OBJTOP}/lib \ + -I${KRB5_OBJTOP}/util/profile INCSDIR=${INCLUDEDIR}/kadm5 INCS= admin.h \ diff --git a/krb5/lib/kadm5clnt/version.map b/krb5/lib/kadm5clnt/version.map index bb3feb11cff1..4343dbd9f04e 100644 --- a/krb5/lib/kadm5clnt/version.map +++ b/krb5/lib/kadm5clnt/version.map @@ -117,5 +117,41 @@ kadm5clnt_mit_12_MIT { kadm5_init_iprop; xdr_calias_arg; kadm5_create_alias; + chpass_principal3_2; + chpass_principal_2; + chrand_principal3_2; + chrand_principal_2; + create_alias_2; + create_policy_2; + create_principal3_2; + create_principal_2; + delete_policy_2; + delete_principal_2; + et_ovk_error_table; + et_ovku_error_table; + get_policy_2; + get_pols_2; + get_principal_2; + get_principal_keys_2; + get_princs_2; + get_privs_2; + get_strings_2; + init_2; + initialize_ovk_error_table; + initialize_ovku_error_table; + krb5_aprof_get_string_all; + modify_policy_2; + modify_principal_2; + purgekeys_2; + rename_principal_2; + set_string_2; + setkey_principal3_2; + setkey_principal4_2; + setkey_principal_2; + xdr_gstrings_arg; + xdr_gstrings_ret; + xdr_krb5_string_attr; + xdr_purgekeys_arg; + xdr_sstring_arg; }; HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/krb5/lib/kadm5srv/Makefile b/krb5/lib/kadm5srv/Makefile index 9eecd20ca822..826a9edad25a 100644 --- a/krb5/lib/kadm5srv/Makefile +++ b/krb5/lib/kadm5srv/Makefile @@ -41,7 +41,8 @@ CFLAGS+=-I${KRB5_DIR}/lib \ -I${KRB5_OBJTOP}/lib \ -I${KRB5_OBJTOP}/lib/gssapi \ -I${KRB5_DIR}/lib/gssapi/krb5 \ - -I${KRB5_DIR}/lib/gssapi/generic + -I${KRB5_DIR}/lib/gssapi/generic \ + -I${KRB5_OBJTOP}/util/profile CWARNFLAGS.gcc+=-Wno-alloc-size-larger-than GEN_KADM_ERR= kadm_err.et diff --git a/krb5/lib/kadm5srv/version.map b/krb5/lib/kadm5srv/version.map index 4eb5ba7c3ead..d8dc8cfe0b0d 100644 --- a/krb5/lib/kadm5srv/version.map +++ b/krb5/lib/kadm5srv/version.map @@ -136,5 +136,34 @@ kadm5srv_mit_12_MIT { kadm5_init_iprop; xdr_calias_arg; kadm5_create_alias; + destroy_pwqual; + et_ovk_error_table; + et_ovku_error_table; + init_pwqual; + initialize_ovk_error_table; + initialize_ovku_error_table; + k5_kadm5_hook_alias; + k5_kadm5_hook_chpass; + k5_kadm5_hook_create; + k5_kadm5_hook_free_handles; + k5_kadm5_hook_load; + k5_kadm5_hook_modify; + k5_kadm5_hook_remove; + k5_kadm5_hook_rename; + k5_pwqual_check; + k5_pwqual_free_handles; + k5_pwqual_load; + k5_pwqual_name; + kadm5_get_admin_service_name; + kdb_free_keyblocks; + kdb_get_active_mkey; + kdb_get_entry; + kdb_get_hist_key; + master_keyblock; + pwqual_dict_initvt; + pwqual_empty_initvt; + pwqual_hesiod_initvt; + pwqual_princ_initvt; + xdr_kadm5_key_data; }; HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/krb5/lib/kadmin_common/Makefile b/krb5/lib/kadmin_common/Makefile index 9eed31bc94f3..926a7b266c05 100644 --- a/krb5/lib/kadmin_common/Makefile +++ b/krb5/lib/kadmin_common/Makefile @@ -27,6 +27,7 @@ CFLAGS+=-I${KRB5_DIR}/lib/krad \ -I${KRB5_SRCTOP}/include \ -I${KRB5_DIR}/util \ -I${KRB5_OBJTOP}/util \ + -I${KRB5_OBJTOP}/util/profile \ -I${.OBJDIR} CLEANFILES= kadmin_ct.c ktutil_ct.c diff --git a/krb5/lib/kdb/Makefile b/krb5/lib/kdb/Makefile index 80039ad83502..52087f9cd389 100644 --- a/krb5/lib/kdb/Makefile +++ b/krb5/lib/kdb/Makefile @@ -37,7 +37,8 @@ CFLAGS+=${DEFINES} \ -I${KRB5_DIR}/lib/kdb \ -I${KRB5_OBJTOP}/lib/kdb \ -I${KRB5_DIR}/include \ - -I${KRB5_SRCTOP}/include + -I${KRB5_SRCTOP}/include \ + -I${KRB5_OBJTOP}/util/profile ADB_ERR= adb_err.et ADB_ERR_C= ${ADB_ERR:S/.et$/.c/} diff --git a/krb5/lib/kdb/version.map b/krb5/lib/kdb/version.map index 54a093ff72bc..4a0b0d3df1b7 100644 --- a/krb5/lib/kdb/version.map +++ b/krb5/lib/kdb/version.map @@ -110,5 +110,32 @@ kdb5_10_MIT { krb5_dbe_sort_key_data; krb5_dbe_make_alias_entry; krb5_dbe_read_alias; + et_adb_error_table; + initialize_adb_error_table; + krb5_db_def_fetch_mkey; + krb5_db_def_rename_principal; + krb5_db_load_module; + krb5_dbe_def_cpw; + krb5_dbe_def_search_enctype; + krb5_dbe_delete_tl_data; + krb5_dbe_free_tl_data; + krb5_def_fetch_mkey_list; + krb5int_delete_principal_no_log; + krb5int_put_principal_no_log; + ulog_conv_2dbentry; + ulog_conv_2logentry; + xdr_kdb_sno_t; + xdr_kdb_ulog_t; + xdr_kdbe_attr_type_t; + xdr_kdbe_data_t; + xdr_kdbe_key_t; + xdr_kdbe_princ_t; + xdr_kdbe_pw_hist_t; + xdr_kdbe_t; + xdr_kdbe_time_t; + xdr_kdbe_tl_t; + xdr_kdbe_val_t; + xdr_update_status_t; + xdr_utf8str_t; }; HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/krb5/lib/kprop_util/Makefile b/krb5/lib/kprop_util/Makefile index aaaeb969058d..d29f17e20b65 100644 --- a/krb5/lib/kprop_util/Makefile +++ b/krb5/lib/kprop_util/Makefile @@ -21,6 +21,7 @@ SRCS= kprop_util.c CFLAGS+=-I${KRB5_DIR}/lib/krad \ -I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include \ + -I${KRB5_OBJTOP}/util/profile \ -I${.OBJDIR} .include diff --git a/krb5/lib/krad/Makefile b/krb5/lib/krad/Makefile index 36074dff1296..17cd4f8142b5 100644 --- a/krb5/lib/krad/Makefile +++ b/krb5/lib/krad/Makefile @@ -27,6 +27,7 @@ SRCS= attr.c \ CFLAGS+=-I${KRB5_DIR}/lib/krad \ -I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include \ + -I${KRB5_OBJTOP}/util/profile \ -I${.OBJDIR} .include diff --git a/krb5/lib/krad/version.map b/krb5/lib/krad/version.map index a18fa4665e50..6ffe589a4226 100644 --- a/krb5/lib/krad/version.map +++ b/krb5/lib/krad/version.map @@ -23,5 +23,16 @@ krad_0_MIT { krad_client_new; krad_client_free; krad_client_send; + kr_attr_decode; + kr_attr_encode; + kr_attr_valid; + kr_attrset_decode; + kr_attrset_encode; + kr_remote_cancel; + kr_remote_cancel_all; + kr_remote_equals; + kr_remote_free; + kr_remote_new; + kr_remote_send; }; HIDDEN { local: __*; _rest*; _save*; *; }; diff --git a/krb5/lib/krb5/Makefile b/krb5/lib/krb5/Makefile index b3587cf58c2b..b232a8a3e6ee 100644 --- a/krb5/lib/krb5/Makefile +++ b/krb5/lib/krb5/Makefile @@ -51,7 +51,10 @@ CFLAGS+=${DEFINES} \ -I${KRB5_DIR}/util/profile \ -I${KRB5_DIR}/include \ -I${KRB5_SRCTOP}/include \ - -I${KRB5_DIR} + -I${KRB5_DIR} \ + -I${KRB5_OBJTOP}/util/profile + +LDFLAGS+=-Wl,--error-limit=0 MANGROUPS= KRB5 KRB5= k5identity.5 \ diff --git a/krb5/lib/krb5/version.map b/krb5/lib/krb5/version.map index 3de2fdd879d0..924737afcedc 100644 --- a/krb5/lib/krb5/version.map +++ b/krb5/lib/krb5/version.map @@ -634,5 +634,1201 @@ krb5_3_MIT { k5_addr_directional_init; k5_print_addr; k5_print_addr_port; + _krb5_use_dns_kdc; + _krb5_use_dns_realm; + anon_princ; + aux_info_address_1_untagged; + aux_info_authdata_1_untagged; + aux_info_authdata_types; + aux_info_bitstring_data; + aux_info_checksum_1_untagged; + aux_info_der_data; + aux_info_etype_info2_1_def_untagged; + aux_info_etype_info_1_def_untagged; + aux_info_etype_list; + aux_info_gstring_data; + aux_info_keyblock_1_untagged; + aux_info_oid_data; + aux_info_ostring_data; + aux_info_pa_data_2_untagged; + aux_info_pa_pk_as_rep; + aux_info_pa_spake; + aux_info_princname_1_untagged; + aux_info_req_body_8_untagged; + aux_info_spake_support_0_untagged; + aux_info_typed_data_1_untagged; + aux_info_utf8_data; + ccselect_hostname_initvt; + ccselect_k5identity_initvt; + ccselect_realm_initvt; + clpreauth_encrypted_challenge_initvt; + clpreauth_encrypted_timestamp_initvt; + clpreauth_otp_initvt; + clpreauth_sam2_initvt; + decode_krb5_auth_pack; + decode_krb5_checksum; + decode_krb5_etype_list; + decode_krb5_kdc_dh_key_info; + decode_krb5_pa_pk_as_rep; + decode_krb5_pa_pk_as_req; + decode_krb5_principal_name; + decode_krb5_reply_key_pack; + decode_krb5_safe_with_body; + decode_krb5_td_dh_parameters; + decode_krb5_td_trusted_certifiers; + encode_krb5_auth_pack; + encode_krb5_etype_list; + encode_krb5_fast_req; + encode_krb5_kdc_dh_key_info; + encode_krb5_pa_fx_fast_request; + encode_krb5_pa_pac_req; + encode_krb5_pa_pk_as_rep; + encode_krb5_pa_pk_as_req; + encode_krb5_reply_key_pack; + encode_krb5_safe_with_body; + encode_krb5_setpw_req; + encode_krb5_td_dh_parameters; + encode_krb5_td_trusted_certifiers; + et_k5e1_error_table; + et_prof_error_table; + hostrealm_dns_initvt; + hostrealm_domain_initvt; + hostrealm_profile_initvt; + hostrealm_registry_initvt; + initialize_prof_error_table; + interface_names; + k5_asn1_decode_atype; + k5_asn1_decode_bitstring; + k5_asn1_decode_bool; + k5_asn1_decode_bytestring; + k5_asn1_decode_generaltime; + k5_asn1_decode_int; + k5_asn1_decode_uint; + k5_asn1_encode_atype; + k5_asn1_encode_bitstring; + k5_asn1_encode_bool; + k5_asn1_encode_bytestring; + k5_asn1_encode_generaltime; + k5_asn1_encode_int; + k5_asn1_encode_uint; + k5_asn1_full_decode; + k5_asn1_full_encode; + k5_atype_ad_kdc_issued; + k5_atype_ad_kdcissued_0; + k5_atype_ad_kdcissued_0_untagged; + k5_atype_ad_kdcissued_1; + k5_atype_ad_kdcissued_1_untagged; + k5_atype_ad_kdcissued_2; + k5_atype_ad_kdcissued_2_untagged; + k5_atype_ad_kdcissued_3; + k5_atype_ad_kdcissued_3_untagged; + k5_atype_address; + k5_atype_address_0; + k5_atype_address_0_untagged; + k5_atype_address_1; + k5_atype_address_1_untagged; + k5_atype_address_ptr; + k5_atype_algid_0; + k5_atype_algid_1; + k5_atype_algorithm_identifier; + k5_atype_ap_rep; + k5_atype_ap_rep_0; + k5_atype_ap_rep_1; + k5_atype_ap_rep_2; + k5_atype_ap_rep_2_untagged; + k5_atype_ap_rep_enc_part; + k5_atype_ap_rep_enc_part_0; + k5_atype_ap_rep_enc_part_0_untagged; + k5_atype_ap_rep_enc_part_1; + k5_atype_ap_rep_enc_part_1_untagged; + k5_atype_ap_rep_enc_part_2; + k5_atype_ap_rep_enc_part_2_untagged; + k5_atype_ap_rep_enc_part_3; + k5_atype_ap_rep_enc_part_3_untagged; + k5_atype_ap_rep_msg_type; + k5_atype_ap_req; + k5_atype_ap_req_0; + k5_atype_ap_req_1; + k5_atype_ap_req_2; + k5_atype_ap_req_2_untagged; + k5_atype_ap_req_3; + k5_atype_ap_req_3_untagged; + k5_atype_ap_req_4; + k5_atype_ap_req_4_untagged; + k5_atype_ap_req_msg_type; + k5_atype_as_rep; + k5_atype_as_req; + k5_atype_as_req_2; + k5_atype_as_req_encode; + k5_atype_as_req_msg_type; + k5_atype_auth_data; + k5_atype_auth_data_ptr; + k5_atype_auth_pack; + k5_atype_auth_pack_0; + k5_atype_auth_pack_0_untagged; + k5_atype_auth_pack_1; + k5_atype_auth_pack_1_untagged; + k5_atype_auth_pack_2; + k5_atype_auth_pack_2_untagged; + k5_atype_auth_pack_3; + k5_atype_auth_pack_3_untagged; + k5_atype_auth_pack_4; + k5_atype_auth_pack_4_untagged; + k5_atype_authdata_0; + k5_atype_authdata_0_untagged; + k5_atype_authdata_1; + k5_atype_authdata_1_untagged; + k5_atype_authdata_elt; + k5_atype_authdata_elt_ptr; + k5_atype_authdata_elt_type; + k5_atype_authdata_elt_type_0; + k5_atype_authdata_types; + k5_atype_authenticator; + k5_atype_authenticator_0; + k5_atype_authenticator_1; + k5_atype_authenticator_1_untagged; + k5_atype_authenticator_2; + k5_atype_authenticator_2_untagged; + k5_atype_authenticator_3; + k5_atype_authenticator_3_untagged; + k5_atype_authenticator_4; + k5_atype_authenticator_4_untagged; + k5_atype_authenticator_5; + k5_atype_authenticator_5_untagged; + k5_atype_authenticator_6; + k5_atype_authenticator_6_untagged; + k5_atype_authenticator_7; + k5_atype_authenticator_7_untagged; + k5_atype_authenticator_8; + k5_atype_authenticator_8_untagged; + k5_atype_bitstring_data; + k5_atype_cammac; + k5_atype_cammac_0; + k5_atype_cammac_0_untagged; + k5_atype_cammac_1; + k5_atype_cammac_1_untagged; + k5_atype_cammac_2; + k5_atype_cammac_2_untagged; + k5_atype_cammac_3; + k5_atype_cammac_3_untagged; + k5_atype_checksum; + k5_atype_checksum_0; + k5_atype_checksum_0_untagged; + k5_atype_checksum_1; + k5_atype_checksum_1_untagged; + k5_atype_checksum_ptr; + k5_atype_cred_0; + k5_atype_cred_1; + k5_atype_cred_2; + k5_atype_cred_2_untagged; + k5_atype_cred_3; + k5_atype_cred_3_untagged; + k5_atype_cred_info; + k5_atype_cred_info_0; + k5_atype_cred_info_0_untagged; + k5_atype_cred_info_1; + k5_atype_cred_info_10; + k5_atype_cred_info_10_untagged; + k5_atype_cred_info_1_untagged; + k5_atype_cred_info_2; + k5_atype_cred_info_2_untagged; + k5_atype_cred_info_3; + k5_atype_cred_info_3_untagged; + k5_atype_cred_info_4; + k5_atype_cred_info_4_untagged; + k5_atype_cred_info_5; + k5_atype_cred_info_5_untagged; *** 2018 LINES SKIPPED *** From nobody Tue Jan 20 14:42:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwVRS5tTkz6PfdN for ; Tue, 20 Jan 2026 14:42: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 4dwVRS4T2lz3xtv for ; Tue, 20 Jan 2026 14:42:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768920164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bxx61Cy1aVqfz36ByEPcZyAIKNPw8J4vsOsWtEsVlNE=; b=rMNKT0EQpvEm9quvN3biNgHhakQvsYaLqww11cWHV/0/h/ZMGhnCldjOevUV+u/UR4vKB7 q9OHInLgGVP1CTFUQ8g5aLVNKhL0+hOOuWMBv8cKGVTJ0Ci1qYDMrPi/PAQvuRO+YxEXwt c55Cjsq3jgzAFZjPiEAENqYdDfyZNUjBJwYh8dgu9fc9FhAsUa8tXbBjWslO7Nx+sQLfYi 96LRZ3A6UwCJdUH1pNgLBCd7uvrFr2/2zyM2NWPIF9LCgiLH9Ic8aYRJtH8YinWskYEjGZ b6hlB9VZTpCgzSSdrzFukq//GkBsSSBaJtEDnhpAmjTsTn/43avwMrTUjIDAfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768920164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bxx61Cy1aVqfz36ByEPcZyAIKNPw8J4vsOsWtEsVlNE=; b=oxPwLEHMdaV5non8PVYLZWaAsa6lrrzp+40bp2pFdCTyWD+JgcXh3LhLsJNprHiFQONw+h p7rYcdBYQRe4gQuvBFcRigq3mZDdHDg0RulZbkTdK1pZE/p7WkW/jelGGRz6ENErOh0uYp eIGG33LYPZv38MPrYh8GYKcrdFsv36T85od8FywmH/LFU4Ou7ELXJg+8ZUv3CLbLfdReyN KJGw8PgSv+Sy3klOSvGInlOG1pH7gnHel4Tr4P+YYLrpzOl2ha1I55VUt28pEmJ7Z2KKZx FdyLGxQcoIyQ00tl4fvBZXzJnA2RdrbXTc9UouN9MUY9QdSDX4zwOuf0b0XI8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768920164; a=rsa-sha256; cv=none; b=gAlj/WSDpvoINk/IVEYftwBsdLyEjbs/ZTx8b7X7efpWPWzFrm/a41vaCnIYroci135dtX CIugEvv7XtnoOixN6swItMm5gjaRiRVEXN8Xr9fmhvYToGlS4ZMDsHX6+Y5QxNORXm/kWw ytFh55EDCXiNvG0mqsOMZj83ycEYCrOR6KK5rzQZcjdjE3kRTehvcdI7Jm9vYdPdVE7Hjy dw0Cny+kkd3/bsiMp6LSgZe8wyxSECVC99ILP0/MkSBtW7Y7ueao2Fo54u2AAHYlG4a6si y9/oT6r7tIfvnlu78k/90MwOdkV4ly+ML57kH05ke61VkV2a7qtZ33LqMGaPvg== 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 4dwVRS421Jz1Kk1 for ; Tue, 20 Jan 2026 14:42:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f369 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 14:42:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: be1b2da855cc - main - sys/abi_compat.h: fix UB for bintime32 handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: be1b2da855cc38531733b5c97891cd4a40a993bc Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 14:42:44 +0000 Message-Id: <696f9464.f369.3821ab5e@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=be1b2da855cc38531733b5c97891cd4a40a993bc commit be1b2da855cc38531733b5c97891cd4a40a993bc Author: Konstantin Belousov AuthorDate: 2026-01-12 04:46:15 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-20 14:42:35 +0000 sys/abi_compat.h: fix UB for bintime32 handling Do not cast and then access potentially unaligned uint64_t in the BT_CP() macro. Use freebsd32_uint64_t type and FU64_CP() for the frac member. Noted by: des Reviewed by: des, emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54663 --- sys/compat/freebsd32/freebsd32.h | 2 +- sys/sys/abi_compat.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 7324f9adf70c..7d21a5be5570 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -70,7 +70,7 @@ struct itimerspec32 { struct bintime32 { time32_t sec; - uint32_t frac[2]; + freebsd32_uint64_t frac; }; struct ffclock_estimate32 { diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h index 0a7110191430..bd99a21d8e23 100644 --- a/sys/sys/abi_compat.h +++ b/sys/sys/abi_compat.h @@ -77,7 +77,7 @@ #define BT_CP(src, dst, fld) do { \ CP((src).fld, (dst).fld, sec); \ - *(uint64_t *)&(dst).fld.frac[0] = (src).fld.frac; \ + FU64_CP((src).fld, (dst).fld, frac); \ } while (0) #endif /* !_COMPAT_H_ */ From nobody Tue Jan 20 14:42:43 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwVRX55dPz6PfDV for ; Tue, 20 Jan 2026 14:42: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 4dwVRX3wmqz3xwF for ; Tue, 20 Jan 2026 14:42:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768920168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J/8N9EA+8qH3u/KJwsF/m2sot3IRfvt2SPl1Ky5XNBU=; b=FHtU0BUNAIl3MmIUWyQdaUpIeSYj9ywjGUBN6LNmHNJSVC2B0MHtTXccTgIi0Kqe4TXTDc FBrNM0OoBUXpnfWOeKeAAQ2zwa9B4YVY1faR+BrxWNGWPRGhjIIIZ4TndPRfaBGqJMl4xP 9LLu5+E7/flWAtZCi38yFoLOyhF/H6HlfLBnR4f5EjrIrEROmm5mmccrlR7NnffGdR0TKT LCA1bFJ0vGamiKujuLPwQCubDoDpgeYHWM9SujgVhl8NoRl3WuE0AnFun/LTTfBCtmnnSs +/RndKh/F9mqLljyOXxibEucgTrusDsYZMFNHOZbpVJPD7vIBmox+SScO4qBOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768920168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J/8N9EA+8qH3u/KJwsF/m2sot3IRfvt2SPl1Ky5XNBU=; b=uAUjmsJGGP5Pe3uM345R8c5vFlNTBJ1OL7pOJlHUhy3yn5OAsnEefS5gf1PCg6Upzb2KyB L5UrsA/pBdjmQti0c9n7WMZ/N/W3xCmD+t7/ZH0AgD0jVYdC2WEMO8fGhtEHGNw596Eb1d LGYSZGa/B+VsRCpufaT9aX7i4UbHE3opbZ6W0v1Whak8URa6kZ3eby7Xb+zpcssbBVr86W hrbCtJq07Isu7IE68o/XZYF3Kq/61e7zRNyglFBGiIMDK/IQ/ypRZc9n0ap1O+Ta5sMbmj Xv6EPTUr29z3J905WF9RH5Nnb+tbselurH30Jcjc26DBTdvNi/iXdEerGAtXyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768920168; a=rsa-sha256; cv=none; b=aassgsIRAF/bTkcl33f4lnrGfjuYyWCBcEwCnIihMxNurayNYG2D/QVuWl2w+WXtr5PSPN wthm781PIdYhXLjZMR4Cc/2sm4smrXIo9rwPnxL6MaZlByXnWbHdmxEwj7BkI4qf6L2OB4 BfJafr+2uCUQWVIdTKYxfWiLjdQBL8qiw7XDFUEZL2OGFvQYGvrSeCs2i+smUdeecFt1At L3IkPjIWAlmDzNX9xvouXk9XoQOuUZ8gJAhboB0o2SptNfW+jzroNnefNl5IOqzB2HbCi3 a1VxRZj5rhvhujzmwA8wg9qMa7FYhjutvKEP3xc1hVNX1/atBB4vpbo1SWq53Q== 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 4dwVRX3MvCz1LQd for ; Tue, 20 Jan 2026 14:42:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f398 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 14:42:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 96acaa960023 - main - compat32: provide a type and a macro for (u)int64_t handling on non-x86 arches List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 96acaa960023c20e852e04e7cc5c6a5faca36c67 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 14:42:43 +0000 Message-Id: <696f9463.f398.7ea9495a@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=96acaa960023c20e852e04e7cc5c6a5faca36c67 commit 96acaa960023c20e852e04e7cc5c6a5faca36c67 Author: Konstantin Belousov AuthorDate: 2026-01-12 04:45:36 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-20 14:42:35 +0000 compat32: provide a type and a macro for (u)int64_t handling on non-x86 arches uint64_t is 4-byte aligned on i386, but is 8-bytes aligned on all other 32bit arches FreeBSD supports. Provide the freebsd32_uint64_t type and the FU64_CP() macro, which are intended to be used where 32bit ABI uses (u)int64_t type, and do proper layout and copying for the aggregate type. Reviewed by: des, emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54663 --- sys/compat/freebsd32/freebsd32.h | 11 ++++++++++- sys/sys/abi_compat.h | 8 ++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 9d724c93fee7..7324f9adf70c 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -36,8 +36,17 @@ #include /* - * i386 is the only arch with a 32-bit time_t + * i386 is the only arch with a 32-bit time_t. + * Also it is the only arch with (u)int64_t having 4-bytes alignment. */ +typedef struct { +#ifdef __amd64__ + uint32_t val[2]; +#else + uint64_t val; +#endif +} freebsd32_uint64_t; + #ifdef __amd64__ typedef int32_t time32_t; #else diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h index c2233f2eac2c..0a7110191430 100644 --- a/sys/sys/abi_compat.h +++ b/sys/sys/abi_compat.h @@ -67,6 +67,14 @@ TS_CP((src), (dst), it_value); \ } while (0) +#define FU64_CP(src, dst, fld) do { \ + _Static_assert(sizeof((src).fld) == sizeof(uint64_t), \ + "FU64_CP src: " #src "." #fld "is not 8 bytes"); \ + _Static_assert(sizeof((dst).fld) == sizeof(uint64_t), \ + "FU64_CP dst: " #dst "." #fld "is not 8 bytes"); \ + memcpy(&(dst).fld, &(src).fld, sizeof(uint64_t)); \ +} while (0) + #define BT_CP(src, dst, fld) do { \ CP((src).fld, (dst).fld, sec); \ *(uint64_t *)&(dst).fld.frac[0] = (src).fld.frac; \ From nobody Tue Jan 20 15:36:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwWd51980z6PjRK for ; Tue, 20 Jan 2026 15:36: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 4dwWd50TCQz49FW for ; Tue, 20 Jan 2026 15:36:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768923369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Y1oMINzCy53YL2nNV5InaCjwkoL9V5K5nSTQndnyg4=; b=eE43lK35sYamefgRCkT3d0eXGdB0zB0ZOZDQy4obxRZ+3Vz3ARrM/YPbVI+tGgGsDogW5G 0B9Z0S8CPQFfabaKzCQIbmkhwUT9ox0YJI1J2RA5vGVtQeCHBJzrZ3/Qo0wq9W+kw2KPaz b+kXSZ7akNmUYWX/3i9AmN9QIqUbqzvLWBaQmm/66DTi2/C5N5xOORJ0SU1NaVg2ilzc3o +d4zc/rbIGcRm946vDIuUqVBq1xWdsp8azi75iPNkqB8jZIs6N9aib2POTn8m6OB36Pqp3 pvVoXNJPfC1jSX16SNTpVKP5ALOWp84v2lJv8d/8J4syYtjOXgmZ9ZLi2H+Qng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768923369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Y1oMINzCy53YL2nNV5InaCjwkoL9V5K5nSTQndnyg4=; b=w0YEZw6tNya82yvaEjPmp7Qwh9220Vk2RSIHJRrlxew+785HEFYg7kdosjppbxw2tu+w6b 3SAnbnQWBAJTFPTuI/KnLzqn5BeOY0XY0Auv+LfqsjYEcvwZYDdNuKOI9uI7+6KGPKXhxt GhYEEh0oAFFy630GMbasbKPBOb74eacHORcZlj/dD+d+IddmLqAVMqnY0cy6BYbaVufQ9O 4orOCmMGq8nIiVH53Vw3uIKWZfADOVdzOKJKUWjWJQpxUQhTZHiWupd39y6rZwdVgHBHtu soqZHqSqA/ONaH6rvM/Oaa+srrhn3tEYS+iaMXvPm1gBxY4lfiVxRsrYvLKWOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768923369; a=rsa-sha256; cv=none; b=Ig7dTMbKMZI/VTkSirJsAkZ5H3X/yYKxs1WhuoGWdbF21sR0p7vatQyJBm3XisF6nr09v9 zEVDb965+jAnLHQXnES1GyeQlxm/CNCkVSDPYDkO8HxCkMHTfaGMSFTopdwDVYJcYwwYgi q8JbifRKIyI4Uq7GW5ORMsz0a1kLCP6/8bUNrEjWRN6bIespjX9AoIu+tGR3KhcoXrm2Ta WYIJcka3XUI2ZnYNagEn0fMqOk8aAotqwy7zxV5Rl/wCc8F70C/jGsiNp4h9XbbxZxP2dO wRQSA8/gOntEVWO7hqkjHXD6phNUx0EnIyS0yWjAbXnxkpwgDJgR5HiLBxyhcQ== 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 4dwWd502Z2z1MB5 for ; Tue, 20 Jan 2026 15:36:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2382d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 15:36:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 6637e8f616f0 - main - krb5: Fix gcc14 build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6637e8f616f0e94c7801698dd11bee5ebcf3799a Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 15:36:09 +0000 Message-Id: <696fa0e9.2382d.3372540b@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=6637e8f616f0e94c7801698dd11bee5ebcf3799a commit 6637e8f616f0e94c7801698dd11bee5ebcf3799a Author: Cy Schubert AuthorDate: 2026-01-20 15:35:00 +0000 Commit: Cy Schubert CommitDate: 2026-01-20 15:35:00 +0000 krb5: Fix gcc14 build Fixes: 1876de606eb8 X-MFC with: 1876de606eb8 MFC After: 2 weeks --- krb5/lib/krb5/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/krb5/lib/krb5/Makefile b/krb5/lib/krb5/Makefile index b232a8a3e6ee..a502b10f9a03 100644 --- a/krb5/lib/krb5/Makefile +++ b/krb5/lib/krb5/Makefile @@ -54,8 +54,6 @@ CFLAGS+=${DEFINES} \ -I${KRB5_DIR} \ -I${KRB5_OBJTOP}/util/profile -LDFLAGS+=-Wl,--error-limit=0 - MANGROUPS= KRB5 KRB5= k5identity.5 \ k5login.5 \ From nobody Tue Jan 20 15:44:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwWq054Bdz6Pjld for ; Tue, 20 Jan 2026 15:44: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 4dwWq02JqYz3CHV for ; Tue, 20 Jan 2026 15:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768923884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VobHibdT+15pBpqyFlffigdEfIwhXLCB33n0f8NyKRU=; b=O1JL/vJ0hYcDU2oUKD4X2twdTElzMGm5StgleekesezLZWN3fg2GI7cNex6XWoD/3yQWRI U5OJdkXthtWWPyv6sCnPFfvta1rtYIulRFYrVx2IXu8eB3hXEaBFDMgg4IYoeC/StfzXDX l7+NRoDJ4jMIBcBSTFcfS7aUbZkPLC+Y3dN/8dg3rlSY+mInh9zen6oynzHxhZ4blzkHkv mpuCUDd5Vt1EHwMDs8a9BLHz8nRo2hdpenuveC8aqeTiCiAYjY230AQ1m7pnBEksiVdwPA dx50XfDW3Hlf/gHd0J0FVi40cL/6jX4uJHfvXPYnkplwXTt4O/zNySveE6Uk9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768923884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VobHibdT+15pBpqyFlffigdEfIwhXLCB33n0f8NyKRU=; b=uYoH5pO4GC5wxay2OZRu7WMgy+XE61s1IqE2UDm67CGbfaZQGVaprKhuj27kx7Za+oYqYp S5NFWHaA1d7/isl9BicjUA+I4uoxV47EL20H238u+1SWlr7eNwJrCvsST/dyk7UljVy2Is 5QQJMQhRZkSEv0FUxWtlXmAod4PHiVY7vu2Zo0202hIrAXmvgVnXE1rJEQ3qiBQH94tJt1 QHfGTSzJlggVRlSs9inV4n83oIPio7WTLR+jD30AC8GCUdu1AlRnWbF/3fEHcJx9YJjnz/ JfdZ5sipeNuJGR5kWbW5+JFnI4pIRjERthkfgM7lfxnv9Ke9cAl8HuRiXu1UWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768923884; a=rsa-sha256; cv=none; b=C26fLZ3Oodt0bxNFLT+4aIBtaIUamUZyShC0Ff+4prIZ0FKiDDWJrpYg+hbWqe42o9xeg8 ClAiTftGhV3d3JNkpUMUjyiiP1fPxxZSdo64z9vbkUSaODDXfyZnlzqyppk+vF6QbdVl3b rgcBMXdSe9j4GYcJQXVWZoFqYxa1iHFALbBrdx45s0ZkGyHRStxTq7vi4W701ISpH7Gte/ AiZos9V+gWJzFNWYJmDfprvORhsDKuwo/Z4SNA+3D2VQUBPc8PN+wRVdFhkqrYwbuCiYtQ /OrCTouLBzY4APMkV5R37EFPb1bV9UyW5A9bPdWLd9+Hk3QFu58j+S7cS2cNxA== 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 4dwWq01wfwz1MBV for ; Tue, 20 Jan 2026 15:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25bc2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 15:44:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 768332d61948 - main - LinuxKPI: 802.11: factor out rate logic for mandatory channels List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 768332d619484834a7866fde4bf2695d4262355a Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 15:44:44 +0000 Message-Id: <696fa2ec.25bc2.5df41946@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=768332d619484834a7866fde4bf2695d4262355a commit 768332d619484834a7866fde4bf2695d4262355a Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 13:33:16 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-20 15:44:30 +0000 LinuxKPI: 802.11: factor out rate logic for mandatory channels I was looking at rate work for another problem and found more flags in ath9k (which we will likely never need). The documentation then revealed the "mandatory" flags as well and with discussions about cfg80211 going on I decided to use the momentum and split our "supp_rates" setup between lkpi_lsta_alloc() and wiphy_register(). There should be no functional change. While there also initialize max_rc_amsdu_len. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- .../linuxkpi/common/include/linux/ieee80211.h | 13 ++- sys/compat/linuxkpi/common/include/net/cfg80211.h | 4 +- sys/compat/linuxkpi/common/src/linux_80211.c | 110 ++++++++++++++++----- 3 files changed, 100 insertions(+), 27 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 12160df43915..b5051a9f7d21 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -108,7 +108,18 @@ struct ieee80211_mmie_16 { #define IEEE80211_QOS_CTL_MESH_CONTROL_PRESENT 0x0100 enum ieee80211_rate_flags { - IEEE80211_RATE_SHORT_PREAMBLE = BIT(0), + IEEE80211_RATE_SHORT_PREAMBLE = BIT(0), /* 2.4Ghz, CCK */ + IEEE80211_RATE_SUPPORTS_5MHZ = BIT(1), + IEEE80211_RATE_SUPPORTS_10MHZ = BIT(2), + IEEE80211_RATE_ERP_G = BIT(3), + + /* + * According to documentation these are flags initialized internally. + * See lkpi_wiphy_band_annotate(). + */ + IEEE80211_RATE_MANDATORY_A = BIT(4), + IEEE80211_RATE_MANDATORY_G = BIT(5), + IEEE80211_RATE_MANDATORY_B = BIT(6), }; enum ieee80211_rate_control_changed_flags { diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index d7ed2bc97c98..4b21f82a0762 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -1230,6 +1230,7 @@ struct cfg80211_ops { struct wiphy *linuxkpi_wiphy_new(const struct cfg80211_ops *, size_t); void linuxkpi_wiphy_free(struct wiphy *wiphy); +int linuxkpi_80211_wiphy_register(struct wiphy *); void linuxkpi_wiphy_work_queue(struct wiphy *, struct wiphy_work *); void linuxkpi_wiphy_work_cancel(struct wiphy *, struct wiphy_work *); @@ -1749,8 +1750,7 @@ wiphy_net(struct wiphy *wiphy) static __inline int wiphy_register(struct wiphy *wiphy) { - TODO(); - return (0); + return (linuxkpi_80211_wiphy_register(wiphy)); } static __inline void diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 1ac28dfef448..7972d9d0f667 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -896,41 +896,34 @@ lkpi_lsta_alloc(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN], /* Deflink information. */ for (band = 0; band < NUM_NL80211_BANDS; band++) { struct ieee80211_supported_band *supband; + uint32_t rate_mandatory;; supband = hw->wiphy->bands[band]; if (supband == NULL) continue; + switch (band) { + case NL80211_BAND_2GHZ: + /* We have to assume 11g support here. */ + rate_mandatory = IEEE80211_RATE_MANDATORY_G | + IEEE80211_RATE_MANDATORY_B; + break; + case NL80211_BAND_5GHZ: + rate_mandatory = IEEE80211_RATE_MANDATORY_A; + break; + default: + continue; + } + for (i = 0; i < supband->n_bitrates; i++) { - switch (band) { - case NL80211_BAND_2GHZ: - switch (supband->bitrates[i].bitrate) { - case 240: /* 11g only */ - case 120: /* 11g only */ - case 110: - case 60: /* 11g only */ - case 55: - case 20: - case 10: - sta->deflink.supp_rates[band] |= BIT(i); - break; - } - break; - case NL80211_BAND_5GHZ: - switch (supband->bitrates[i].bitrate) { - case 240: - case 120: - case 60: - sta->deflink.supp_rates[band] |= BIT(i); - break; - } - break; - } + if ((supband->bitrates[i].flags & rate_mandatory) != 0) + sta->deflink.supp_rates[band] |= BIT(i); } } sta->deflink.smps_mode = IEEE80211_SMPS_OFF; sta->deflink.bandwidth = IEEE80211_STA_RX_BW_20; + sta->deflink.agg.max_rc_amsdu_len = IEEE80211_MAX_MPDU_LEN_HT_BA; sta->deflink.rx_nss = 1; sta->deflink.sta = sta; @@ -8028,6 +8021,75 @@ linuxkpi_wiphy_free(struct wiphy *wiphy) kfree(lwiphy); } +static void +lkpi_wiphy_band_annotate(struct wiphy *wiphy) +{ + int band; + + for (band = 0; band < NUM_NL80211_BANDS; band++) { + struct ieee80211_supported_band *supband; + int i; + + supband = wiphy->bands[band]; + if (supband == NULL) + continue; + + switch (band) { + case NL80211_BAND_2GHZ: + case NL80211_BAND_5GHZ: + break; + default: + IMPROVE("band %d(%s) not yet supported", + band, lkpi_nl80211_band_name(band)); + /* For bands added here, also check lkpi_lsta_alloc(). */ + continue; + } + + for (i = 0; i < supband->n_bitrates; i++) { + switch (band) { + case NL80211_BAND_2GHZ: + switch (supband->bitrates[i].bitrate) { + case 110: + case 55: + case 20: + case 10: + supband->bitrates[i].flags |= + IEEE80211_RATE_MANDATORY_B; + /* FALLTHROUGH */ + /* 11g only */ + case 240: + case 120: + case 60: + supband->bitrates[i].flags |= + IEEE80211_RATE_MANDATORY_G; + break; + } + break; + case NL80211_BAND_5GHZ: + switch (supband->bitrates[i].bitrate) { + case 240: + case 120: + case 60: + supband->bitrates[i].flags |= + IEEE80211_RATE_MANDATORY_A; + break; + } + break; + } + } + } +} + +int +linuxkpi_80211_wiphy_register(struct wiphy *wiphy) +{ + TODO("Lots of checks and initialization"); + + lkpi_wiphy_band_annotate(wiphy); + + return (0); +} + static uint32_t lkpi_cfg80211_calculate_bitrate_ht(struct rate_info *rate) { From nobody Tue Jan 20 15:48:38 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwWvV6tKMz6Pk2n for ; Tue, 20 Jan 2026 15:48: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 4dwWvV6D8wz3DMb for ; Tue, 20 Jan 2026 15:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768924118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7FitRjs7rgvI6G1tDNr4KJgbyjM2td3+ETsa9MNjREQ=; b=ix85Jxh3W95mQLtsQut92lv0WgdZF+1wfbfxBA1ZCOGuidPC/l8Qt1c0MDnxft6BAiR/Al 8pZSnRERwDvuhGzRa15RysGRU58k2Kubn9vSNn6Vjo9mtx5hYzJyDKGcYZz+ug8zSqogQ9 ccSmeZWrJ2gKY31QOW5Zag6+j8FJY8QQFJ0zMNhbDOPVtmWiwvjJtnQfoARyajrdKMyiM/ uf/f4sgtZWiT3sp9alh7CLPeztZosfpkwq7nMmW9hge2rc6VSLd+GKIPfrYyaNgQceYoSM LXiRgUxzbF6jYLCi8uovI064qi/bMOtjcyR7mMJxFX28IZakQXzx5Qk9XWnoOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768924118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7FitRjs7rgvI6G1tDNr4KJgbyjM2td3+ETsa9MNjREQ=; b=SRZ35z/5RmY9Rah7Is5mNUPoGS7INOm3y/niZZMxLRk/5zAd9LKfG1oGm/l7fPhGcw03eQ Zo0RM1/DYsEkdgbjqE6H6/7MxS+p76NliDcZIQz+Wzbh2+YPuCuwojstx9ylsFXiPIDRL7 mq99Ss2aQVYRiEXDDwSToeNtVUe6UirZWP1nuM6X2+6RMqEJOM8WiJYEHYvBJ6Ox2rIPcS VfFpZ2DNbnLeGy+Rs37WJdkWq9cvGsfs4g6woyGHnlHuyjAW5sTZjai8YNh2av1gDZZuI8 0rMQhJQsFYgVAwcbr2xfsY1laUqh+PB1vcxAEe6GWkZ/+uGxJBMA19+x3zPavw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768924118; a=rsa-sha256; cv=none; b=lfWLxdlrpyV2qThh26/Fir5RlGVV+f+1VLJJrD//Gjeufxhk/UOoAqCq2KgvCHZ60srzAd jUYTaCG8E/viDvkXVDLmblI3CkTOcv3FaTp47RuCNALr+UmPBuplkh/iJ2RwkEHIi8TzqO 1g4q6zE7DgAD3IDYKbUo7lKhlfDrd716ckfmg0gvDEUpwe9HKWYj5L0BOBKUBLLRNwAmMS u9fZC40YtpgBiy/HAVBAPkjBQMdybLiB6z/yXDkFAlFg+ea9qgqhcYeCRmhuLooRVM/1F5 TCOfB9RrEWRlC0B+UGZV6Q6EXskRe0wYuggQ5dYHh/urCr/Ncn2Mi7CqnQra0Q== 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 4dwWvV5YhLz1Mjf for ; Tue, 20 Jan 2026 15:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25a08 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 15:48:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: c670af3725d0 - main - net80211: correct return code for ieee80211_ampdu_request() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c670af3725d0bb5494caf0846994ae6997175cb6 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 15:48:38 +0000 Message-Id: <696fa3d6.25a08.564dd35e@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c670af3725d0bb5494caf0846994ae6997175cb6 commit c670af3725d0bb5494caf0846994ae6997175cb6 Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 13:48:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-20 15:45:58 +0000 net80211: correct return code for ieee80211_ampdu_request() We used to return the result of (*ic_send_action) directly but ieee80211_ampdu_request() returns 1 on success and 0 on error, which is contrary to the result of (*ic_send_action). Deal with that accordingly and update the documentation of the function. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D54794 --- sys/net80211/ieee80211_ht.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index a8a767785fce..88e614e266a1 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -2766,10 +2766,15 @@ ieee80211_ampdu_enable(struct ieee80211_node *ni, return 1; } -/* - * Request A-MPDU tx aggregation. Setup local state and - * issue an ADDBA request. BA use will only happen after +/** + * @brief Request A-MPDU tx aggregation. + * + * Setup local state and issue an ADDBA request. BA use will only happen after * the other end replies with ADDBA response. + * + * @param ni ieee80211_node update + * @param tap tx_ampdu state + * @returns 1 on success and 0 on error */ int ieee80211_ampdu_request(struct ieee80211_node *ni, @@ -2777,7 +2782,7 @@ ieee80211_ampdu_request(struct ieee80211_node *ni, { struct ieee80211com *ic = ni->ni_ic; uint16_t args[5]; - int tid, dialogtoken; + int tid, dialogtoken, error; static int tokens = 0; /* XXX */ /* XXX locking */ @@ -2828,8 +2833,11 @@ ieee80211_ampdu_request(struct ieee80211_node *ni, args[4] = _IEEE80211_SHIFTMASK(tap->txa_start, IEEE80211_BASEQ_START) | _IEEE80211_SHIFTMASK(0, IEEE80211_BASEQ_FRAG) ; - return ic->ic_send_action(ni, IEEE80211_ACTION_CAT_BA, + + error = ic->ic_send_action(ni, IEEE80211_ACTION_CAT_BA, IEEE80211_ACTION_BA_ADDBA_REQUEST, args); + /* Silly return of 1 for success here. */ + return (error == 0); } /* From nobody Tue Jan 20 16:05:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwXH71N3Yz6PkvQ for ; Tue, 20 Jan 2026 16:05:39 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwXH65swmz3GDS for ; Tue, 20 Jan 2026 16:05:33 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-42fbc544b09so3563305f8f.1 for ; Tue, 20 Jan 2026 08:05:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768925132; x=1769529932; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=BBmtJeB9tD5sAXnop96+jO2ZhO/fw7awIyAxIM5nKa0=; b=nBdg0RaDVTSFiofbr5BUCQ3Kf0IypLWJg/K3N64OAtCv1g6HarhFyZ9EkXqSU5MdY6 GcXOiweJxdcloKV1Y9fGhxh4kGvI6oC+lCcBu0pMclwcG3kx3QvL1qzpTHhNCW6WQX1X cHTKgetgDSkxzX8i3xor2fFTFbkRW/c0bzoIzvZDhkF7Jyaat6Bf9+vnEh935y8ZXRAw j9Rtkvnl3qfXxrfUOGNK8gkxdHQSAd17q9Vdywsed9uv679T51I9VKkzvoK2CCm4lfPl O6DigdL3CaWUjDbY9WmtXomT9EN5fV2rjl5t7EgHIMHElFfrWCWHqSxqKMk4/90ZOfaQ TFqw== X-Forwarded-Encrypted: i=1; AJvYcCXOFOjGuFyxBOIP7JxXflb5ouAS4acC2k5L58mlIL2hlmeX2sDLfIvyKbb0LXTguVZtOhDW1R9ZvyLZJPjRhNJxvLa8@freebsd.org X-Gm-Message-State: AOJu0YyVEv8VnKGXWGuiMxDfl7TDD0VAy1VvMIDaIF73sFt1vHolmokX BbPfxq0AA20e406+Ax5xfXdd38FM3eFXYMBYXB7jogqTr44m9I9TunoMsvZA0olGF10= X-Gm-Gg: AZuq6aJUFMe2l4QzHgWVkJ5iiNQvLwf5RXwG3Byi5TFeJ5WlcVUkmY8QUwTS+6BpDFe +z845E5nuJOqjqMqQ2OmkjXKZwyzjghQglJUHdqPuNxSOjlQZRGzlCKKywj7YSp2Lff32k8MCUB mXOTXD7tD5Qk5+k+R5AdUh7q9PeCaONKCJkqJBbMRamBcdUCZy5Rrtj84zbHR2ksG8ZphGWj9UB sHwKvX3GLHiGQ2xCb0ODjUBm5f9d+hQlE5Q0SG3Z9CAiBcKP5ChqQ51KvrZnlHTXXd8KAVR6wu3 76hTYgrw5Bq6DbXmvLyA+Wxr3B/GDxCnaBStNaLW7eOI4XAGID7TPjSYNqTbpksba/LbAHqC5Bi +clxSwOOyB42CvshWXsYQhzMqZOKl9el+EDo3MoDIp0PB16dsUgNkZWHu6PnHdmj5g4xeSeCRFm 7z2iCwv4tXJZAL4TgdV3FEdAbg9olPTiDnBKa6Il/733PdMCieI0vS X-Received: by 2002:a05:6000:4210:b0:430:f68f:ee96 with SMTP id ffacd0b85a97d-4358ff56807mr3854083f8f.36.1768925130893; Tue, 20 Jan 2026 08:05:30 -0800 (PST) Received: from smtpclient.apple (nat-184-7.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43595e0a6fasm1956494f8f.10.2026.01.20.08.05.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Jan 2026 08:05:30 -0800 (PST) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.300.41.1.7\)) Subject: Re: git: 96acaa960023 - main - compat32: provide a type and a macro for (u)int64_t handling on non-x86 arches From: Jessica Clarke In-Reply-To: <696f9463.f398.7ea9495a@gitrepo.freebsd.org> Date: Tue, 20 Jan 2026 16:05:19 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <7F0190E5-8B20-40A5-9D31-1D56BCF39E71@freebsd.org> References: <696f9463.f398.7ea9495a@gitrepo.freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3864.300.41.1.7) X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dwXH65swmz3GDS On 20 Jan 2026, at 14:42, Konstantin Belousov wrote: >=20 > The branch main has been updated by kib: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D96acaa960023c20e852e04e7cc5c6a5f= aca36c67 >=20 > commit 96acaa960023c20e852e04e7cc5c6a5faca36c67 > Author: Konstantin Belousov > AuthorDate: 2026-01-12 04:45:36 +0000 > Commit: Konstantin Belousov > CommitDate: 2026-01-20 14:42:35 +0000 >=20 > compat32: provide a type and a macro for (u)int64_t handling on = non-x86 arches >=20 > uint64_t is 4-byte aligned on i386, but is 8-bytes aligned on all = other > 32bit arches FreeBSD supports. Provide the freebsd32_uint64_t type = and > the FU64_CP() macro, which are intended to be used where 32bit ABI = uses > (u)int64_t type, and do proper layout and copying for the aggregate = type. >=20 > Reviewed by: des, emaste > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > Differential revision: https://reviews.freebsd.org/D54663 > --- > sys/compat/freebsd32/freebsd32.h | 11 ++++++++++- > sys/sys/abi_compat.h | 8 ++++++++ > 2 files changed, 18 insertions(+), 1 deletion(-) >=20 > diff --git a/sys/compat/freebsd32/freebsd32.h = b/sys/compat/freebsd32/freebsd32.h > index 9d724c93fee7..7324f9adf70c 100644 > --- a/sys/compat/freebsd32/freebsd32.h > +++ b/sys/compat/freebsd32/freebsd32.h > @@ -36,8 +36,17 @@ > #include >=20 > /* > - * i386 is the only arch with a 32-bit time_t > + * i386 is the only arch with a 32-bit time_t. > + * Also it is the only arch with (u)int64_t having 4-bytes alignment. > */ > +typedef struct { > +#ifdef __amd64__ > + uint32_t val[2]; > +#else > + uint64_t val; > +#endif > +} freebsd32_uint64_t; Any reason not to use: typedef uint64_t freebsd32_uint64_t __aligned(4); on amd64 (and normal typedef elsewhere)? Then you can just use the normal CP. See for example https://godbolt.org/z/svseWv7xo. Jessica From nobody Tue Jan 20 16:07:50 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwXKw6wkPz6PlGn; Tue, 20 Jan 2026 16:08:04 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwXKw3Q85z3GjH; Tue, 20 Jan 2026 16:08:04 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 60KG7oxK069210; Tue, 20 Jan 2026 18:07:53 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 60KG7oxK069210 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 60KG7oVN069209; Tue, 20 Jan 2026 18:07:50 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 20 Jan 2026 18:07:50 +0200 From: Konstantin Belousov To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 96acaa960023 - main - compat32: provide a type and a macro for (u)int64_t handling on non-x86 arches Message-ID: References: <696f9463.f398.7ea9495a@gitrepo.freebsd.org> <7F0190E5-8B20-40A5-9D31-1D56BCF39E71@freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7F0190E5-8B20-40A5-9D31-1D56BCF39E71@freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dwXKw3Q85z3GjH On Tue, Jan 20, 2026 at 04:05:19PM +0000, Jessica Clarke wrote: > On 20 Jan 2026, at 14:42, Konstantin Belousov wrote: > > > > The branch main has been updated by kib: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=96acaa960023c20e852e04e7cc5c6a5faca36c67 > > > > commit 96acaa960023c20e852e04e7cc5c6a5faca36c67 > > Author: Konstantin Belousov > > AuthorDate: 2026-01-12 04:45:36 +0000 > > Commit: Konstantin Belousov > > CommitDate: 2026-01-20 14:42:35 +0000 > > > > compat32: provide a type and a macro for (u)int64_t handling on non-x86 arches > > > > uint64_t is 4-byte aligned on i386, but is 8-bytes aligned on all other > > 32bit arches FreeBSD supports. Provide the freebsd32_uint64_t type and > > the FU64_CP() macro, which are intended to be used where 32bit ABI uses > > (u)int64_t type, and do proper layout and copying for the aggregate type. > > > > Reviewed by: des, emaste > > Sponsored by: The FreeBSD Foundation > > MFC after: 1 week > > Differential revision: https://reviews.freebsd.org/D54663 > > --- > > sys/compat/freebsd32/freebsd32.h | 11 ++++++++++- > > sys/sys/abi_compat.h | 8 ++++++++ > > 2 files changed, 18 insertions(+), 1 deletion(-) > > > > diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h > > index 9d724c93fee7..7324f9adf70c 100644 > > --- a/sys/compat/freebsd32/freebsd32.h > > +++ b/sys/compat/freebsd32/freebsd32.h > > @@ -36,8 +36,17 @@ > > #include > > > > /* > > - * i386 is the only arch with a 32-bit time_t > > + * i386 is the only arch with a 32-bit time_t. > > + * Also it is the only arch with (u)int64_t having 4-bytes alignment. > > */ > > +typedef struct { > > +#ifdef __amd64__ > > + uint32_t val[2]; > > +#else > > + uint64_t val; > > +#endif > > +} freebsd32_uint64_t; > > Any reason not to use: > > typedef uint64_t freebsd32_uint64_t __aligned(4); > > on amd64 (and normal typedef elsewhere)? Then you can just use the > normal CP. See for example https://godbolt.org/z/svseWv7xo. Yes, this way it uses only std C instead of the GNU extension, and not depend on compiler properly handle unaligned types. IMO it is better that way, and all machinery is hidden under the typedef+ the macro. From nobody Tue Jan 20 16:21:15 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwXdP0gV9z6PmFN for ; Tue, 20 Jan 2026 16:21:29 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwXdN5r8yz3M3y for ; Tue, 20 Jan 2026 16:21:28 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-47edd9024b1so35728325e9.3 for ; Tue, 20 Jan 2026 08:21:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768926087; x=1769530887; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=LAjc+9kEWG9zkdDiJQph8LlnLhQGdfB4tpYOCS5I11A=; b=amqPSwXiMjaiK2Zq/pAevPH7U9NbF4/2WZ5OF7pWb6bQyjs32WgvczltBc/EgQqPee dlJNJ5JWKqVaXzK3dUIWKzRREkNmVdnbUO45YtCnTaWVNJnPBz79P40XgY5hpN0Yh2Gb KxzAyL82vvoXLsVN3wypTAZL8R8KdFs+ukhCpCA6uYK0ut0nbTqKhCbHnwRzgbQdYzM8 cIdqaZgCwXPWjuv6jnHdOGf906Y3nVT9Z2Eq93OOaSvaauReXz8YS1AkisMiUrMom3di LTi4OnoduzvuyCYE+siU3889IkGK2R6HsHc2lzdlyHySXySQY6zJKBGaf6s8KSy2u2xc rZYA== X-Forwarded-Encrypted: i=1; AJvYcCUgeZAqY4/ZEL6YCCKMKmNgGUv019TZFSfVyeO5QbN+NBFL91XH/dEPf8ullqz4Ayrm5dYV5Vx3GctWzKN7iAvkBfnr@freebsd.org X-Gm-Message-State: AOJu0YwUPZdlEtJ8VY14LqfCS5magn8c64gdziQgr74QWq3qIhbo7nly V8gZ4LieI+I1+xqX0GR00XPDNq/RLOLxTtjCvrgRSdkCWFpYaOMMtOCSScZ4dZ6Kbh8= X-Gm-Gg: AY/fxX45IyucGubKmcqR8770vHEgFPsPm6Bh58M5xRZD7QSIt7QH/sWEXSy1dX84pc4 Rf55cEpEQ0UqPgJEZhsNCvf3EUVAjfXRWhSzkMoYx+nmj+xcRaWHUm86uhTFwz+I5xCDtlLIhtr oRqycktANZhzHl8oUbKJkd3PTpIP0Bmert15AIsNXGPMzI4uBrp1EyRDRb5pRYk3OLNdAgHfnMn CEKGItbt+ngEuusF86Du49abUNmHz9wOFUBR0O8+WYk83u9fdGLBh032OHDQ9fzZTsvWMvzHPjz dcPeWy5eRA9RNjt3mYV6kEdl6pfI52BVuKFOEHYFZNOzj+wXXbZERNnsza7TCUCwfDnTxfYHgFM EJacxB+SCedShP5cstITNOb89XGhYkiEx51sqK9BOQHZcai2r9RW3p0hIxMub7XDwF1NwRERNzx sAI+cE4Y7a1JAHOkUv+q0PFEBOYiY40cBzXyG6UHoBYwNq35BhlZd6 X-Received: by 2002:a05:600c:608a:b0:477:2f7c:314f with SMTP id 5b1f17b1804b1-48025ccb812mr161618685e9.10.1768926087373; Tue, 20 Jan 2026 08:21:27 -0800 (PST) Received: from smtpclient.apple (nat-184-7.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4801e8c05c3sm248953255e9.11.2026.01.20.08.21.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Jan 2026 08:21:26 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.300.41.1.7\)) Subject: Re: git: 96acaa960023 - main - compat32: provide a type and a macro for (u)int64_t handling on non-x86 arches From: Jessica Clarke In-Reply-To: Date: Tue, 20 Jan 2026 16:21:15 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <4D876814-AA9D-4007-A165-4E0B7881B5C2@freebsd.org> References: <696f9463.f398.7ea9495a@gitrepo.freebsd.org> <7F0190E5-8B20-40A5-9D31-1D56BCF39E71@freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3864.300.41.1.7) X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dwXdN5r8yz3M3y On 20 Jan 2026, at 16:07, Konstantin Belousov = wrote: >=20 > On Tue, Jan 20, 2026 at 04:05:19PM +0000, Jessica Clarke wrote: >> On 20 Jan 2026, at 14:42, Konstantin Belousov = wrote: >>>=20 >>> The branch main has been updated by kib: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D96acaa960023c20e852e04e7cc5c6a5f= aca36c67 >>>=20 >>> commit 96acaa960023c20e852e04e7cc5c6a5faca36c67 >>> Author: Konstantin Belousov >>> AuthorDate: 2026-01-12 04:45:36 +0000 >>> Commit: Konstantin Belousov >>> CommitDate: 2026-01-20 14:42:35 +0000 >>>=20 >>> compat32: provide a type and a macro for (u)int64_t handling on = non-x86 arches >>>=20 >>> uint64_t is 4-byte aligned on i386, but is 8-bytes aligned on all = other >>> 32bit arches FreeBSD supports. Provide the freebsd32_uint64_t = type and >>> the FU64_CP() macro, which are intended to be used where 32bit ABI = uses >>> (u)int64_t type, and do proper layout and copying for the = aggregate type. >>>=20 >>> Reviewed by: des, emaste >>> Sponsored by: The FreeBSD Foundation >>> MFC after: 1 week >>> Differential revision: https://reviews.freebsd.org/D54663 >>> --- >>> sys/compat/freebsd32/freebsd32.h | 11 ++++++++++- >>> sys/sys/abi_compat.h | 8 ++++++++ >>> 2 files changed, 18 insertions(+), 1 deletion(-) >>>=20 >>> diff --git a/sys/compat/freebsd32/freebsd32.h = b/sys/compat/freebsd32/freebsd32.h >>> index 9d724c93fee7..7324f9adf70c 100644 >>> --- a/sys/compat/freebsd32/freebsd32.h >>> +++ b/sys/compat/freebsd32/freebsd32.h >>> @@ -36,8 +36,17 @@ >>> #include >>>=20 >>> /* >>> - * i386 is the only arch with a 32-bit time_t >>> + * i386 is the only arch with a 32-bit time_t. >>> + * Also it is the only arch with (u)int64_t having 4-bytes = alignment. >>> */ >>> +typedef struct { >>> +#ifdef __amd64__ >>> + uint32_t val[2]; >>> +#else >>> + uint64_t val; >>> +#endif >>> +} freebsd32_uint64_t; >>=20 >> Any reason not to use: >>=20 >> typedef uint64_t freebsd32_uint64_t __aligned(4); >>=20 >> on amd64 (and normal typedef elsewhere)? Then you can just use the >> normal CP. See for example https://godbolt.org/z/svseWv7xo. > Yes, this way it uses only std C instead of the GNU extension, and not > depend on compiler properly handle unaligned types. >=20 > IMO it is better that way, and all machinery is hidden under the = typedef+ > the macro. Well, except (a) the kernel uses GNU C for all manner of things already (b) unaligned types are already well-supported otherwise packed structs wouldn=E2=80=99t work, which we=E2=80=99re happy to use (c) your = structure approach hides less as you have to use the magic FU64_CP macro so is less abstracted than my proposal. Also, I just thought to check Linux, and it uses the same GNU C aligned trick, so we=E2=80=99re in good company and any issues with it would = show up there, especially given people do use Clang to build Linux in production these days. So I disagree with your assessment entirely. Jessica From nobody Tue Jan 20 16:40:10 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwY2y5lmsz6NnhL 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 4dwY2y5H5Xz3RTl 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 4dwY2y460cz1NxZ 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwY300Qnsz6NnnK 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 4dwY2z42fGz3RRV 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 4dwY2z3f6Kz1NT4 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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:51:37 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwYJB0ywPz6NpDJ for ; Tue, 20 Jan 2026 16:51: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 4dwYJB09vKz3TRY for ; Tue, 20 Jan 2026 16:51:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768927898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JZ9UHZw9+FuxKEkbo4K6s42Ipas/YDJDibk389QYiLA=; b=VUtn1dwC9gV0ZlMYVYeSvqfHO7WSShRNMK2AtrViGbbmvjf9zbTajKyO7PYx47nbo0uQzC sZS3sd0lAr/DBOkI83wQWt5F6Vu90W5dHhyuWdD3oaiK/0zTsKO/l86gofE3mjvzwqqUI2 /8ru2MmqPiNoKlRi5IUACvlkSRmQy2FYeRRrdjFmVoeXiSV7ZaXclaojA02+BEn+ItCpVd z9ToXzy1RgPdAS/cR2DZDPAgU8jk8ogCHoMe21shO/bLrC+eLeI9H5ej/MVR/ZiDSm6WPd JMLhQsusKTmOI38dP3xAZJCMw82/RKu1ijxJYmUS8ERMXgA+4pnoDGFNzwwx8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768927898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JZ9UHZw9+FuxKEkbo4K6s42Ipas/YDJDibk389QYiLA=; b=QrkCULFtLnF8LEKaSTOOpwvlIDOQTLIE0KpBIyFukHznv7FMJeEOxGUeFKPtx4vypFmUpx YDRC+zIiUPhWmf7sak279Py7V+gzaj0l/1xLUdgaJSgGzIyF/aNqPnmenSLgPWCB5bdYY4 aeZ/n08g9veKFIvDnsfL55cb9PVYPmaE17+6X2QF0i0OME/9bE5orXBV0dmfuUOlozLRHe Xv8+++yDUpxsHJLz7dSDRv6kt3PiwxXesc+SypwJoxdb1mcMGlEGBLYVI6DGh1VNCBRby5 AA5alwX5uBI9DvsbMnbZagUDYfyDJGsFhruIM5FQ0IaZYmKTwkhu7gBV0n81Vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768927898; a=rsa-sha256; cv=none; b=bB2UlUFrjHfq/fHvb4zwDZUMu8UQjs314oGg1NWcL13UXCA8e9tg7cfS9tAChPlaLDP6u+ l1zRPJ6UHi2ie3WSXsYIku3to7QHlmJ9Q22x+vGvdX7CE/yLvRavGPvcoUvvIu227aY/Vq F0ox5F8DCyui/lmF0yCPUY4W9/YjKtIU0WEUGQKt2nUw92mkNeaqi48qRtDPzs2KybmL+i on3CUbo22hzlwI/UclCyWBXR+UJpJ+7ETDXKr7zGMgHl47VBZcWdPO1vakwUsn/Gp0aaeE VKMjlmp3G0OrWErtvtG9FI67xkAfY8SiXCE1x+7Gsm05TfiwBOQ0nY5IiVxqvw== 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 4dwYJ96fjjz1P1N for ; Tue, 20 Jan 2026 16:51:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34db8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 16:51:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: aed4089c2573 - main - nanobsd: Use NANO_DEF_{UNAME,GNAME} List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: aed4089c2573420be042a90af51fb538d0b63fe5 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 16:51:37 +0000 Message-Id: <696fb299.34db8.411530a6@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=aed4089c2573420be042a90af51fb538d0b63fe5 commit aed4089c2573420be042a90af51fb538d0b63fe5 Author: Jose Luis Duran AuthorDate: 2026-01-20 16:51:06 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-20 16:51:06 +0000 nanobsd: Use NANO_DEF_{UNAME,GNAME} Prefer to use NANO_DEF_UNAME and NANO_DEF_GNAME instead of a fixed "root/wheel". Fixes: 61ac7309c366 ("nanobsd: Add a provisional populate_part function") MFC after: 3 days --- tools/tools/nanobsd/defaults.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index 86aaeffdc944..a0a186cee42f 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -780,8 +780,8 @@ _populate_part() ( cd "${dir}" mtree -bc -k flags,gid,gname,link,mode,uid,uname | mtree -C | tail -n +2 | - sed 's/uid=[[:digit:]]*/uname=root/g' | - sed 's/gid=[[:digit:]]*/gname=wheel/g' >> "${metalog}" + sed "s/uid=[[:digit:]]*/uname=${NANO_DEF_UNAME}/g" | + sed "s/gid=[[:digit:]]*/gname=${NANO_DEF_GNAME}/g" >> "${metalog}" ) fi From nobody Tue Jan 20 16:51:39 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwYJC22wSz6NpL6 for ; Tue, 20 Jan 2026 16:51: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 4dwYJC0k8Tz3TZC for ; Tue, 20 Jan 2026 16:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768927899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hdVvqNlIOmIorWKyN6679VyXa+g0yWSEKvendKZiUt4=; b=uVKR4dMFvooG/pZ4AiPBaj1Z+kMP7VNNkuWfC5oRNvddOWyYyjUIoGuXMsiyrJeFTPyWdm Zbfwj7/V2ltS2tVdJf0Dq8Yzp08iaRzWfklUtAYcVarP0tFoandjlxcykGD+9EKqA4raNN MJ/oxmU4VCkgg4GmKwME7BU9GsoXep0cGx2pcwftJ5ZDovCat5fZqdpl//zxEI0SAxlWIK kPKRQw5wHfXEqJ8l2OGC4LUk7o03gPb0zBnQLLPQmYEw3CWo/8td4hL9LPCg/sj80ZdLQh 0O+nOG2cbPP8JiPPY8PudKQonT/f4dp74AjE1MVe6vtDLkVRyB+rnu8joQaj+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768927899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hdVvqNlIOmIorWKyN6679VyXa+g0yWSEKvendKZiUt4=; b=vw4ZZA7XvUrQU1PH29z+FbYFq/zGCI2ySaQcgRoqbZ2a69Iyd8lj9DMQ8mHHMhNAfYlZ3W g61n9p6Nnegp2lqbClqhOXvaU2X5SgT7yIW0zZNcWJ6n4uXUVx8QmKQ4Sk/DRhIaQrfZaT R7NPuqcOLY1h6DkradM0X+ogk0Pqgzijg+4giAZxepSzkNUyyN867HX0R/XYaDU9kXc99e fdN/ZjOXhHbpcTijFN/4pWvzyQbJ1fjF2Pg+Szlmn2LSbe80YpHrekv/T9TFohRCRjD98E VDeQwwlkt7R6J/eXB2iRDsSdrk2J6/7O3rsEhxxS9j3lb5kxTUpcH0sbv/9N4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768927899; a=rsa-sha256; cv=none; b=b+h7ReDPJ4au+Sg+68i2+ewOOynP4cUw7DCgaRnjAcafyMH5HsfhRTKZSyf2bOU22Qt8az 51YF2vutrFmZjlV2tOZJxKnmEtM2dxLTBVoWH7dM9HuTj21Q/IXLFpnX7HPS4LpYC1Gqry 043RPyvgW1YUe0BRtr7A+tniLTzYGccN/dH1eFbsBTNPd9wK5zXW5sD0BWaD6fitsDspnS lPVnOQqojPMnDLPW88CDW114i5mF7K0URpQYqpIc9dKALtAo+l1iAShCUqC49nBIHU4rSV o8QRHwHNPv6awOIKZNXu/nNOaIVCGb99EHO/z2swnvNSfdVSC9dW9PnLjXEySQ== 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 4dwYJC0BPYz1PTH for ; Tue, 20 Jan 2026 16:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 335ec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 16:51:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: eced166af015 - main - nanobsd: Avoid unnecessary subshell execution List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: eced166af01565fb1d6278a8918e844ebc4412a6 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 16:51:39 +0000 Message-Id: <696fb29b.335ec.dabfd9a@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=eced166af01565fb1d6278a8918e844ebc4412a6 commit eced166af01565fb1d6278a8918e844ebc4412a6 Author: Jose Luis Duran AuthorDate: 2026-01-20 16:50:47 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-20 16:51:09 +0000 nanobsd: Avoid unnecessary subshell execution Mimic c99bb5747f5e ("nanobsd: minor formatting cleanup") and cleanup _create_code_slice(), somehow I missed it when rebasing. No functional change intended. Fixes: ecc039be7fdd ("nanobsd: Add a NO_ROOT build option") MFC after: 3 days --- tools/tools/nanobsd/legacy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh index efb9c68254c9..06dce15ffa0a 100644 --- a/tools/tools/nanobsd/legacy.sh +++ b/tools/tools/nanobsd/legacy.sh @@ -155,7 +155,7 @@ create_code_slice() { ) > ${NANO_OBJ}/_.cs 2>&1 } -_create_code_slice ( ) ( +_create_code_slice() { pprint 2 "build code slice" pprint 3 "log: ${NANO_OBJ}/_.cs" @@ -181,7 +181,7 @@ _create_code_slice ( ) ( rm -f "${NANO_OBJ}/_.disk.part" ) > ${NANO_OBJ}/_.cs 2>&1 -) +} create_diskimage() { pprint 2 "build diskimage" From nobody Tue Jan 20 16:52:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwYKh3Yh6z6NpZk 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 4dwYKh0yR0z3VW9 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 4dwYKh0F7Cz1PgG 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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:07:45 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwYfp2Hrvz6NqDy for ; Tue, 20 Jan 2026 17:07: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 4dwYfp0Nwnz3WBb for ; Tue, 20 Jan 2026 17:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768928866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6pI2RebRmkbzMg8ZE99aTMC1/xO1iiphISzdzuV7sLU=; b=ojFS7xHOmjuDSxihRGqOZo5iBpGzhyQRmji3k3omZ+ZlqFX+SYeWbil/ltpAf5yoE4QSPT GOBOVFc9BWjRiYSSqOBLC/s2XgEAzgPq1AFQ3of7S0hiX2RSlYOdO0KRHjJ97DMISNusnb zQYS8ypJFDz9McFNMQcUpfhrwEpUPDgPOeDOALojYnjjilQm5BeejuKLfhmBpMLSLUD5rb AwBG8X63qHmMQ7FF9w9OqGCtSL9FCMDxtYV3xpQ8p4dEgD32LgLfJI+iWYQEecMNXC2CKx ZIbKPhS5Z+bj/0nhDvze/lc52K0b5gPRxh6AH2/moE/fIM6hdL/KTJ2sWe9swQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768928866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6pI2RebRmkbzMg8ZE99aTMC1/xO1iiphISzdzuV7sLU=; b=FfmSkq9+0cj2IWrvG3SlSh1IbUhQO/2vSrnP2mfsxZlPuEBVegwXLREZfUpagsC2PgPYGx BggoQ32s3E/+GLXIFg04KmT66e52PQYRatDMhB4MG6ckkQK5KFtNPxfXZ1j4kxHA/N+YBo FRz5oJVrMwXny5J8D949VEGReSSxQAfHWW1IhCYeXWgzxzDffxAR2gIYjMQVCh/NGl/XZS WGxxtjWqHvk08fWbPcvlALsumuSh6bezO0m0ZB61S4hhH09Swugv7Lt0gVoORUQP67FQ8E RUBuw+G9YyAmBABIjLH6XpArI1sBbjW+FpExMbFU90ETDiM4nudwIcYfB3pqKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768928866; a=rsa-sha256; cv=none; b=CuppS4QOdkqe4ia8jnwM3ihIxWwbwEaU/B0srXpVPh0rdzzXOxOljZMKsR3R2n124N5oI5 xnbByoL8RQkIzHzqxlb4+iqYv1jMa/wMS7UHtTfDxKsC+ng4sGst+GKsUpaKriTEaISoQG 5HvIduDhiYJjoQv/lVjVU4TFEFBe0qYzuYlZOVT7zhh3LCqClIESVBgY4DdgNMX34SXAYU 8CCayPPRl0H2Y58/48+rQAu5Mz7k6zmz7LpBH6RXkaNefbdXOwwJ3s8b5cQI6dt5uknRFv M3FJDfGFk6oCk1lYzifwFxiRma0NdMAnVI/1u0qGu4DlKDj7EKuIrYnA4ELD2A== 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 4dwYfn6srjz1P9R for ; Tue, 20 Jan 2026 17:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34cd2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 17:07:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 8e1c85f03260 - main - OptionalObsoleteFiles.inc: Treat compat runtime loaders as libraries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e1c85f03260ff9d214fcd99c7ad1a848e3ac23b Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 17:07:45 +0000 Message-Id: <696fb661.34cd2.26788967@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8e1c85f03260ff9d214fcd99c7ad1a848e3ac23b commit 8e1c85f03260ff9d214fcd99c7ad1a848e3ac23b Author: John Baldwin AuthorDate: 2026-01-20 17:07:21 +0000 Commit: John Baldwin CommitDate: 2026-01-20 17:07:21 +0000 OptionalObsoleteFiles.inc: Treat compat runtime loaders as libraries Binaries require the runtime loader to use shared libraries, and removing the runtime loader in `make delete-old` while leaving the libraries around makes it impossible to use those shared libraries. Treat rtld as a de facto dependency of shared libraries to ensure it is not removed until the corresponding shared libraries are removed. Differential Revision: https://reviews.freebsd.org/D52210 --- tools/build/mk/OptionalObsoleteFiles.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 6d8472dc8e83..1cf8b44eaca3 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3833,7 +3833,7 @@ OLD_DIRS+=usr/share/moused .for LIBCOMPAT libcompat in ${_ALL_LIBCOMPATS_libcompats} . if ${MK_LIB${LIBCOMPAT}} == no OLD_FILES+=etc/mtree/BSD.lib${libcompat}.dist -OLD_FILES+=libexec/ld-elf${libcompat}.so.1 +OLD_LIBS+=libexec/ld-elf${libcompat}.so.1 . if exists(${DESTDIR}/usr/lib${libcompat}) LIB${LIBCOMPAT}_DIRS!=find ${DESTDIR}/usr/lib${libcompat} -type d \ | sed -e 's,^${DESTDIR}/,,'; echo From nobody Tue Jan 20 17:10:00 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwYjN6f5Rz6NqT3 for ; Tue, 20 Jan 2026 17:10: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 4dwYjN5wzQz3WrY for ; Tue, 20 Jan 2026 17:10:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768929000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FUiIp8/UIjof94VjlqmHZzqBIkLiOZBI0WvNUofJ2CE=; b=cHP7B1jXykXf7DR59BovaSB7OFDkUGGHAnljmhUV+h+UbZn7T1gtu9IwytWmW6SxEh1P5P SGa7XzCmkJdZSFhVXVIbBhwpFi0naq66qBvdawokh4I/LXuC3hN0udDo2UI89tjGUpGeUT e5oZAdLjkWjE4mfQILYw7kR8oVYEpcqQ/Ue9R3GIhMMWmpAvC9OYfMg7uTlLW0iwV7OelY tJ/+3mBksorH2RvFVGz0qSguETpcg3WsE20kDwOrspvXf8PzMsJFf4dcoYNHWgFuiQ1ieE ERRjfOkAXPQIO47SYNxrC6GbZYzpm3Neo6THJBFbnONPXymCzN4W+5ZyNKWW7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768929000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FUiIp8/UIjof94VjlqmHZzqBIkLiOZBI0WvNUofJ2CE=; b=Ey+qJ993gpz81E35FvQ9kM20f7ce59YWRF/m6cO4MbXJWTyAxfSC0AangL7DxK3ZKRnCdE PCD4X5diFnQ7AbJTysml5vy7fjf8B5NOYJ3WIsRv+eQru9fsOBadntAXDXQF0BoxPsGWat HW1ym0i2BWXZXt2SK8mnXx9xZnHdNWj7thXow0vGwPuuNY4em4ugXvMw/f44E95sPBG2IY 6U7xdcma8tgTxzw1CcR12wMyiHu+zK07O6o0DzxT59rn4cvE3yIlQh91AGYASBC/vxqFzT mkh+g/KIInYiLO3RxDH8zfKOZTVeePtnH2UhCSyT7tQTZJD5fhQsBkJvCg5r0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768929000; a=rsa-sha256; cv=none; b=BHb2bf5D2L5Qz9Zy99aJ2pv+lCB6PFPDamVBTNmsqbpbZ3TEYi7/ofziQtnYxQOD63bl4v 6C5xvlJC4Ir4nCEnAq44I0hBn4nROKlRKE2+FGgSc4l6uL4DRCTAc7/EVdAB1B54wq8141 NPZ9XmSPFqt42sLS6uNwLKz7AcptJVdHuHp4II7d091nhn09QNrc9NtPXdOasNhAxc4zAm uguwp8owWufCnFOukEX5FcENsxO40WnceJYsqKu1NFrwjajgmJHjiaMBx3RxzR0zg8f41Q W/XXiLwO0UTR8ipeR89cprjdgok6AZit1HHlbU0iAjZM/j3Mir9pzWhMUKWXhQ== 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 4dwYjN5TYwz1Pwq for ; Tue, 20 Jan 2026 17:10:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36515 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 17:10:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 8d82dafa568b - main - sctp: support bridge interfaces List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d82dafa568baf7be46e5e443dd7310986a28aa9 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 17:10:00 +0000 Message-Id: <696fb6e8.36515.58db1eea@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8d82dafa568baf7be46e5e443dd7310986a28aa9 commit 8d82dafa568baf7be46e5e443dd7310986a28aa9 Author: Michael Tuexen AuthorDate: 2026-01-20 17:04:35 +0000 Commit: Michael Tuexen CommitDate: 2026-01-20 17:06:17 +0000 sctp: support bridge interfaces Reported by: Timo Völker Tested by: Timo Völker MFC after: 3 days --- 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 Tue Jan 20 17:14:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwYpB0rnhz6NqgC for ; Tue, 20 Jan 2026 17:14: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 4dwYpB06Wlz3XMG for ; Tue, 20 Jan 2026 17:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768929250; h=from:from:reply-to:subject:subject: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=vszmlt8e2vXnqAqYoXhnGTZ+tmMGE8Rgn/IH1ys59hQGF+3BIjoFxcOX+j1vvp6gKBVGWP 1g4GCK/hpRF6vmwDWRxfrway5YYRvRS1TXDZtFuYsUe6FlzhrBCISaw751gszUBS3esOsk rqKVijdihxG1erSXz/3yd+IXqMpdlYoeTaU1lGIucskHGLDmEVfzpNaWCJaoWjcWdDg4ao PYo3kL1M+m7lGNo2qWHEx1a3LBtMYlsKNGdSW8VsRtE8ooe31F1auVihheJDB8JOzwZNCh hN0gKUgeTDOiOLVIb6zMGHN+eHc7U36Ay6PQAIPsDBQ6nBaivTCpPlH49dOWZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768929250; h=from:from:reply-to:subject:subject: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=KQyyWFE/lLPW138jE++QNEUr94n2N68C3GoBTv5D7K4BEUdW8TTPv/O+vqsAa1DY7S7zyB sztSKZIaqAUAO0t/IRzSVHJlAhglWYnvqZWfhi1n+F7x5eL+WT3g5J1noCcYTKU3ey6tc0 MOmigWMMXdH+v32fpyWtinUryefr4qXBH2LWSWULZtGEPToxSSCZ4Jl90Z2+afVwUVY9Xg xLVRmLZOtJq9fKxTbRJje72Kwx1AAcplYzQXgnku1D94xqaaIrmiDo+BXBh0er1QOBgTD7 goaVRJRMU2UxCINnxn2exPhJVAr/VKWgyXgTPpsQpaFC8ORQNCawY6AqaGhajw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768929250; a=rsa-sha256; cv=none; b=v1szVN1MNyWYxF0ivbsKluXT/N6buzHRlgNBVAnWTt0y60YwreH2Icaz4hLQTcA5/460DX 6EQrFpzapAMAVXkUqFv2pt/r7sTWaiSDYzKzfgqSOMFszHFWnOaxvm5thTdh3tq6I4fbtm 9INl0aDr96URKGj9zz1MeMZmpfoZvufizjysFRA8W1pMkzKedrkGeFRICjM0a0zjmmE9uG DESa+Mzok1m4ux7N7X5ruwXDXFIM+ff052eZYpUk6fKaHBV9JtdXVkjNAHU901DUvdL0tE mvaBmiMTsrqHYNxaTNb8I186bkxVtu4lUOazpZIsCP8w9t1pcYvBuq8EXm32+A== 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 4dwYp96gpvz1PkM for ; Tue, 20 Jan 2026 17:14:09 +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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwYqC6dJNz6Nqsl 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 4dwYqC5hJhz3XrR 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 4dwYqC5D8qz1Pxj 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwYrH4fs8z6Nqdv 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 4dwYrH3wKTz3YMN 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 4dwYrH39xSz1P2J 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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 17:19:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwYwc6pC0z6Nr68 for ; Tue, 20 Jan 2026 17:19: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 4dwYwc5yKpz3YVC for ; Tue, 20 Jan 2026 17:19:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768929584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eSCzKzFNyXcQdEI9wl5CcTFSzM0wu5F64jlJtNB3GfQ=; b=Ul3mpdziHyL9TiQTIZ6oRzrtp8w2Oh5v6sKH0AY9M3LGpUcUhZKJD0naocOyxUFmFDFSe6 ApvnIpz7c87SaDqcrqXBfRZK7i0TJs6iqkt19eJ8sq9L4ckfm6OvA5I5zbwM7oPJQIMstI RwALSFFpn2YFFhCmo9raMMG6FRS0whVZBnomgOmIumktboQvqjgjW3x6L1cg5oCH6DAn2j Lp+YrQEN6F54poKshwpbJqp6Z6ISeB/bYcgQGlk4mDfK32F48FXHGt60gByaylBK7ZctW0 UIe5iJ2DX9J5qAACyz5bdX+FtN63hv0tWYQgGNNFqmN+FzsWYwzg7ELAnpMNRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768929584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eSCzKzFNyXcQdEI9wl5CcTFSzM0wu5F64jlJtNB3GfQ=; b=kpFMEpzwlY/fCOaBPiesgz/5P31dQTyQqRux7Xc3WpLHAdUUexpCRd1mKoIBlDyTMuiscK zMZr7sw+Uv+xO0o0ilJYbEF7mdj2c6StcUbEhpyZl6zY+kUAYuFOVXw87xi9M6KCq8hkp4 IPoYNA4ZZYdcfG9aiPwzV+uwu2kdXmeehz0Zk2P4VfXtLYd4k0ntHWelIw4ngF6QE23ktR Fmtdvrr3aML9BqVfu9tZQAnqfpaPK+KCYKJyCFrfJMwyZnzwJRTDz6d9F1Hz0iwurgmhlO +RetGXAmU3NjsrZeE8tttRV5Ws4dO94cLRXW0ue+Lzxgaa13M+56nxBs0QWQBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768929584; a=rsa-sha256; cv=none; b=Oo+UKcJcuyvTA2ik5Ovs1CnV8CvXhb1WMpR09Fi0jEXbs4Vw3hwwojxukWWsi0RF5J+SYr Kmz7S2B8UlbosUjEN/Z1sKAd3BnxJtIupD8s/6GbcY+NaugNLjjBGtErqeFononDXf8EEn a/1zjntaQb5Ht3ianOaOM2fNwJ1m+raX6lKwEm2ihwm+b2LJTddSQmFqln8GW+k6ndFiON omN92Zcpp/K1Tiuj92b+FsGS7c0yit4Dj0PpCNOwRzyZfSJXKTOsI62wIrBpaR9Bae4wco TCdKczOiR2XRlbrgiGYjh7ubn+SEOOHeMTbiffDc3Zv/AXHmZ5pSEROtszpDfQ== 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 4dwYwc4wXnz1PSj for ; Tue, 20 Jan 2026 17:19:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36707 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 17:19:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: c592d54a24b9 - main - LinuxKPI: 802.11: fix build for non-debug kernels List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c592d54a24b984f2e23b337a6abeac09b9c357b5 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 17:19:44 +0000 Message-Id: <696fb930.36707.24000ed8@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c592d54a24b984f2e23b337a6abeac09b9c357b5 commit c592d54a24b984f2e23b337a6abeac09b9c357b5 Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 17:16:50 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-20 17:19:29 +0000 LinuxKPI: 802.11: fix build for non-debug kernels lkpi_nl80211_band_name() is only available under LINUXKPI_DEBUG_80211. IMPROVE in theory should be as well or defined to nothing but we cannot do that in cfg80211.h mac80211.h where we possibly (re-)define this. Put an #ifdef around the IMPROVE call for now (untested). Sponsored by: The FreeBSD Foundation MFC after: 3 days Fixes: 768332d61948 Reported by: CI --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 7972d9d0f667..d25b32f1dae8 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -8039,9 +8039,11 @@ lkpi_wiphy_band_annotate(struct wiphy *wiphy) case NL80211_BAND_5GHZ: break; default: +#ifdef LINUXKPI_DEBUG_80211 IMPROVE("band %d(%s) not yet supported", band, lkpi_nl80211_band_name(band)); /* For bands added here, also check lkpi_lsta_alloc(). */ +#endif continue; } From nobody Tue Jan 20 17:40:59 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwZP764Ttz6NsqP for ; Tue, 20 Jan 2026 17:40: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 4dwZP75VWpz3csh for ; Tue, 20 Jan 2026 17:40:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768930859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=poEDeOx1FOOeZy1U36X8wToalUKqP6Bnvic5W1CgvQc=; b=ZNAgURNRBdplHlbavluVtrJn4jJb9t2MfaLnmRRtqU8yVheTgwOVFXHo2RVGCaWOuUyqbJ IdTO4ZMzG0KvynhdCs26jTtiWBFVsTvZ3TN9u+/WUKMv9Z0JduSZDWr1d0IdVJbihnjKnM +ekw5CvgQMNAQNmnqxmVDQVqV52Sdp0yPhRXsl4bohA17lcHjlaz99Q7FprboUre+kfv8G KI6R3BqFEYmtv7vUoUi/xlS2m+XbwJ9DfoAWN4tWbO2k1fwKh4JJP3DEeVoNPu/28kFVag 0NVQgTymM4rnD9hcdLlE3NUZdOiWPOcxCBU72uagwHW1NILzK42C6iuUb+2jAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768930859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=poEDeOx1FOOeZy1U36X8wToalUKqP6Bnvic5W1CgvQc=; b=W7j1fkXE7a99uqrmoDB3lh/vajNUmdFZhZv4qkF3/cHoj6Cu3s0oyj9u4KLDZ7qYZTJfYD BVeKb350IaCPsn8tq1HAwtGs4PjWbJQCK98k5/FUGuAu1f1qNwnQQHoep//a8YiJxgxDgL 6AFGOQvmBNuxR21ywqO/pNfIUFo1HvrAi1nUBv2RlIEMt4ZzDu/NAhOqIm/kpWTeIIZCLH lTXh64UHbZHWInAm4nJAE7VMmH+UesUAQvIBz3QklDBkiWdQ6/9FMycYPBjIjVKL/8uWFF 5V15PZOFf4EuetlyY8LOhFuq1dpbaqkF1moRx4BcN+s2RhBK6BGRh/lqz5jK/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768930859; a=rsa-sha256; cv=none; b=Bu/U2le4OcTb/h9BubZxJIJ8Ow4cJGH6Cb1Ve+OkcV0IuzXu/EAB6takblz3ktnns0Id93 q1Dz1LmpxlHh+2CR+ncnxU8zoJdvgm5F2SEQ9lGs+HMd7OXl/YVPlha6JNmGkVzG7jExbw LsnP/b4dhQCqQ/9M56KfJclciCUzL0BwKxIC5V6GiTRXqch7N4HfmhV2jOLO7ctncBJbL+ HTPAc4dK4t24+fMIzW7AKd+G8XC19nnmTucDm9iHBrMi4y+gyhhZv7oip6yU7uUlZ1Qdjp F1fTQfRhfk7f1dq+5Hxw6i7uAGiDb96X0/OMoRvjwiXNzbD2qwv9M+AkRq+0CQ== 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 4dwZP755stz1Qjm for ; Tue, 20 Jan 2026 17:40:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38c9c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 17:40:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 2d8ec3bab2d8 - main - krb5: Fix another GCC build issue List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d8ec3bab2d8af9d0f3322c4d752ff928620491c Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 17:40:59 +0000 Message-Id: <696fbe2b.38c9c.1b99cc21@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2d8ec3bab2d8af9d0f3322c4d752ff928620491c commit 2d8ec3bab2d8af9d0f3322c4d752ff928620491c Author: Cy Schubert AuthorDate: 2026-01-20 17:33:17 +0000 Commit: Cy Schubert CommitDate: 2026-01-20 17:40:52 +0000 krb5: Fix another GCC build issue Fixes: 1876de606eb8 X-MFC with: 1876de606eb8 MFC after: 2 weeks --- krb5/lib/krb5/version.map | 4 ---- 1 file changed, 4 deletions(-) diff --git a/krb5/lib/krb5/version.map b/krb5/lib/krb5/version.map index 924737afcedc..18104fc97564 100644 --- a/krb5/lib/krb5/version.map +++ b/krb5/lib/krb5/version.map @@ -1741,8 +1741,6 @@ krb5_3_MIT { localauth_rule_initvt; profile_abandon; profile_add_node; - profile_add_relation; - profile_clear_relation; profile_close_file; profile_copy; profile_copy_file; @@ -1798,7 +1796,6 @@ krb5_3_MIT { profile_release_string; profile_remove_node; profile_rename_node; - profile_rename_section; profile_ser_externalize; profile_ser_internalize; profile_ser_size; @@ -1806,7 +1803,6 @@ krb5_3_MIT { profile_unlock_global; profile_update_file_data; profile_update_file_data_locked; - profile_update_relation; profile_verify_node; profile_write_tree_file; profile_write_tree_to_buffer; From nobody Tue Jan 20 18:13:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwb6P5KkQz6Nvx5 for ; Tue, 20 Jan 2026 18:13: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 4dwb6P4dTxz3fvs for ; Tue, 20 Jan 2026 18:13:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768932797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AynxJghS7QqBRE6Wh2SEvBz2mj+l96zlaI6QZo0gOWA=; b=Az2fKRTDoSkYBP9BqyVT78fq9u2iNFcMDKDBrI5wieLVbjiQx7qt80WKS1lXFSf/a2vTKH uLcvcwa2NSHPXndLiJcqNQ6gGM5tWkWc1uzjrKzw39AD+qDvCADyq2tHCWZ91NZEueb9Tl oJhLdpl3dlZzWtJVoy20CL6wY6zSSt1EtjzzSY+rYTHBrT90zZm9yEyERZrD2IPyYLQ57W SBwMqP+H08qmCiD4faHaersgDpKuEjNPb/O7macRs33Q3fpIqO20tvht3cgwc/pMZYiETe rOG1YUPj2cU7lhxC/qGFfwvVReePdgqumf9rQG7kOw487RTQrnzvco4CWSTBYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768932797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AynxJghS7QqBRE6Wh2SEvBz2mj+l96zlaI6QZo0gOWA=; b=Bnb/f5FZ0/HVvExwSWgnX/QGuEZ912Vh3jEgQsZvZDkXH/OcuQrhlIwqEw8BE/9baqg1Z4 MrRvUl9Sa2ghVz2VrXhEFZHZ3NLdc0JXJl7A7GrcrqyzI9jynzHN2XFtGUDZu4usq4EvUv lk0l22ulOXFmj4JXs4VImaJa24QbKd/iKhrqYa3ZqQ/9HFZ3qG6SMqv89ZJgjl9uI88ROo gycvCJ6eVNQgaq/tOlQce4ki5UUrKhcc+Krj2Nk0jDxTOMTXF/ec1eNVDg8gALDmaptA3v 9YhAtujHvtZppIBJSUdXvBfEBw40zMcqvsy1qhfqJHN+vx9tnkTgkGbL7rrkvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768932797; a=rsa-sha256; cv=none; b=Y42R90GD19tv3+MnkBck7gJX2izQxby6s4DKGwiUUs0E5RnCSSvnVqPUE6ZrOG73IMWz3Q OfSVW8wQO7OmwQPZ6aIw2pDchueWLFtgnaX5LzUEi07GoIK0TH1rs4PyYdWJTt7S/JAER5 PRkvjVlKdUrRZt2RK35EPa0+MIjj4aFn8AnyqbgXl5M92Fynu7Xe35tqq4eQg/uDoUaQJd nsHAlNoPgObqYForwr5PHC73mGERFxCu4q0nj2s72fa0SFx8Tnr+JUFmuRn1sfowvdfoHQ hPHj6mfUZHEg5SScgSjV1hVskH8dHrpxdeVwHzG0SArFE+5JHIeFS+sr/BHfOA== 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 4dwb6P45mLz1Qw6 for ; Tue, 20 Jan 2026 18:13:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b4d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 18:13:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 466bad427d74 - main - src.conf.5: Add WITHOUT_SOUND description List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 466bad427d74e666e85445729b2e63b82e10d18f Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 18:13:17 +0000 Message-Id: <696fc5bd.3b4d7.413fa2a7@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=466bad427d74e666e85445729b2e63b82e10d18f commit 466bad427d74e666e85445729b2e63b82e10d18f Author: Ed Maste AuthorDate: 2026-01-20 18:07:13 +0000 Commit: Ed Maste CommitDate: 2026-01-20 18:13:10 +0000 src.conf.5: Add WITHOUT_SOUND description Fixes: f74f891581bc ("src.opts: Introduce MK_SOUND") Sponsored by: The FreeBSD Foundation --- share/man/man5/src.conf.5 | 7 ++++++- tools/build/options/WITHOUT_SOUND | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 339ca2bd3e8f..e3c4139e304e 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 January 16, 2026 +.Dd January 20, 2026 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1652,6 +1652,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/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 . From nobody Tue Jan 20 19:43:36 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwd6c56b3z6P3J2 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 4dwd6c47Hnz3sx6 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 4dwd6c3RJlz1DC 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwd6f1V2Gz6P2wS 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 4dwd6d5n03z3sjn 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 4dwd6d4BXDztr 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwd6g0NFdz6P3R5 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 4dwd6f6RhLz3sdL 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 4dwd6f531Mz1TL 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwd6h3cmmz6P3LC 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 4dwd6g6D1Xz3t3N for ; Tue, 20 Jan 2026 19:43:39 +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 4dwd6g5KdRz1K2 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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 19:45:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwd8b3v1Dz6P2wk for ; Tue, 20 Jan 2026 19:45: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 4dwd8b35Nmz3v4b for ; Tue, 20 Jan 2026 19:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768938319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KrLqEp7XTC9BOR4UGSKa9AL6q0cDEYxdkGy09RfaND8=; b=hi/cDe/2xqmMwPXYeaCh3qQh4uRZbcjUaFqgBWino/2hiXKViwBmv3H4sOsPZPCZS95rC0 ycvZLLG8T58DqEsAsT1WUZPzkj5jlnZqhRuLLjIA3QuBUznpcyeDXgkxbZVZFHj6oFHrQr 89bFzTHqPlnUVrxD0cb7E5vfhn9ip+8vo3bYODxrdPec/J/SX7im3FghIvyhyCjrlzzstK Hpie7RtU/CiHPzKf7CFX2IECkDJ1z5nKxyL1xQ3LUPNEQVibXPZnBwPWvGtzLwlPq3ODoh 69JtxPB0FPjHvE1Ji2lzlKxN0Jz+skUKQLtif9XQdTzFiqiPQaRDvzVVwWSYbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768938319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KrLqEp7XTC9BOR4UGSKa9AL6q0cDEYxdkGy09RfaND8=; b=NtORWeR+t/FxAElpVAgOfCQdFyfPA3k02ASrNmBCxOyVgbS3yGu2gC1zRZDaK45nZCSAK0 bNNF3h036X8TtZMU1P/e1NiMixp1tS3aZfpwVAcKyKIYW33hJ8E3iE0P8BZ+9cpJwGQB02 vc2zDVduM4It566bWae6e/HC4oZfH6vkQjBeDmuMAQurMHISumiv1y3OdWm3qY29X276nJ sDpa+LpsDyvx3ovQYIimNuVGK4NWiwdIyGuuChnZQKHx0bBNmb20rgroSzFuW6WNhBvXkR o07JYIFAebihwFYW20pad53VqaNAx2dcQyxVcMtiPG0To03c2T3nJTGrXAQ5Hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768938319; a=rsa-sha256; cv=none; b=i5vRmqPTuTowVzOC3dMGiB/nwON+qyYT8DbbPvzxhdA+p5RtaQKMCWzclFfS370geXd1IB rwJLiP3IhaSxSf0dc3wUUfc0bhx45NZS1oMhUkU6o2ZZwu00/LCGFts82sAvm/RTNqRmng l+mCjI2QABMRW+J1rJN3Vo7U7fsBh3S3TB6OCKiz6Q8zV9QOAtFlgOtN8u17KYBUZ/O06Y c8YTS4t2xKsD3GIuAB8aKhipUnyFzvvrqVaCfa9hJStNHBWichBsAwNLkjkY2TrKsnTpyr RrN/jXqzFoypwtGv9r8f0odKvgD2Eaccz8ENtTa6gs40OaXuZEu4xIlSTdxyXw== 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 4dwd8b2hB7z1Mm for ; Tue, 20 Jan 2026 19:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c0b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 19:45:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6bb3f208617b - main - ktrace: do not enqueue request if the process' ktrioparams are freed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 6bb3f208617b58a54e2204eb31bae3f9a86117a7 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 19:45:19 +0000 Message-Id: <696fdb4f.c0b6.47f1bc32@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6bb3f208617b58a54e2204eb31bae3f9a86117a7 commit 6bb3f208617b58a54e2204eb31bae3f9a86117a7 Author: Konstantin Belousov AuthorDate: 2026-01-20 15:01:08 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-20 19:44:54 +0000 ktrace: do not enqueue request if the process' ktrioparams are freed The p_ktrioparms are freed on termination of tracing. Any ktr requests added to the queue after that would hang there and leak on the struct proc recycling, or trigger an assert in the process destructor for debug builds. Reported and tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54804 --- sys/kern/kern_ktrace.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index 15a8a4ab4fa4..b58e69a3f38e 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -373,11 +373,17 @@ ktr_getrequest(int type) static void ktr_enqueuerequest(struct thread *td, struct ktr_request *req) { + bool sched_ast; mtx_lock(&ktrace_mtx); - STAILQ_INSERT_TAIL(&td->td_proc->p_ktr, req, ktr_list); + sched_ast = td->td_proc->p_ktrioparms != NULL; + if (sched_ast) + STAILQ_INSERT_TAIL(&td->td_proc->p_ktr, req, ktr_list); + else + ktr_freerequest_locked(req); mtx_unlock(&ktrace_mtx); - ast_sched(td, TDA_KTRACE); + if (sched_ast) + ast_sched(td, TDA_KTRACE); } /* From nobody Tue Jan 20 21:54:47 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwh251fSxz6PCPF for ; Tue, 20 Jan 2026 21:54: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 4dwh1z5V3Fz47mP 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 4dwh1z4rp1z4Yw 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwhrc40Fgz6PFJY 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 4dwhrc1r4Jz4CbR 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 4dwhrc0zsQz5Qs 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwhrd4hMcz6PFNb 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 4dwhrd2jy0z4CbS 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 4dwhrd1Wn0z5Qt 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwhrh3Y6Xz6PFJd 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 4dwhrh1MKWz4ChW 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 4dwhrh08Yrz5tp 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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 00:24:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwlLg2rFCz6PMNx for ; Wed, 21 Jan 2026 00:24: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 4dwlLg0JQFz4LBK for ; Wed, 21 Jan 2026 00:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768955067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LY/7EKFhvp7r/hFmmRfCkzkwMHy3Rgz0v5BQBKOhXco=; b=gwmr0rzGh85agNMYDYxzxuxfKCkVV3MAl8QkDoYsbM36KWdZC7qz/sdvJGoM91ygsBt0h7 d8bqHOp5NBfGQnmhqjVev6aPOEQgcpx++hKDq7jXXoRgnq3U70rmsTWhdf+tQRCB+VEK8V 4Ta8x1EJAMRn+35UCF03OJTcF0CXz8mFG8WfKwJnH9Szq9UPlYd4Aqe4+Kuff55M0DBTJr 0dzfLlcvYfMN3YMHw2zS+h1yg7c1eW1cCy1KS+8PdlNDX8edr2dgquBd0++SL3NoHBWwMU oXtYl57EAv4/d5r1AFbXYyXNaANpOBU9B3oYVoyY8E4sgWZE0j/i4EtR17RhRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768955067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LY/7EKFhvp7r/hFmmRfCkzkwMHy3Rgz0v5BQBKOhXco=; b=d1WjeTS9NZ/tjTCY1BZ0Zvp0xA8gBzgmkv9ucdM912bedas4WevnzIV7lhghu8j2ZH6MZL Iic141r1s67fcPQrS0q1wrmoFmJsHOZOzDlLDupXoTLwVCt9dJDs7PbOhkOA+pHuB47s7c K4ftzTN4s5Zs97lbC0abM0u2F7StUmw/rtzYOaNQT8a4KrSJ2RVD9tEvleTCNf0mgOrZEv ycdRwtT3M0Ka7k2P+6afaDQT1gKHhddthBbntABBmCIQqEqEQIj+ZVtWVmqo2j4k5IId2u 9IM51JyuP0gxr4a//JgfPWD1bRodLux9LV+KNbZ5vEDLzOztA0XpG1jzHDHLyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768955067; a=rsa-sha256; cv=none; b=Nd9Mhog+dOmqrA7v/UKKtJ6StKVQY1CD1dzh4E1h/QOxrgJS+GkbomA0hS/qCivrRjHB5G mdqQXorUaBEgfKLs+1etAjaV7ztpsnmcYuHzJy2jGUKpTIruhUfmj1mzxVR4VkMO5f8wjz VcRdBbZzSOoFRwrkuftmpc0NtxSRe/e+XjLoDWfI6Y+pZEjH1Z9+OfR4oFp2cF4Z3WOn5s UKtG6O0B+MRDHqOcm0obAorAh4xgaeIOvrLROl2gSUsHVQNAS0U8ddoJDebIDVh0Lk41D5 BzxTZ5cQAM7+ylhQHGTyEKg8AhnJ+ruFHwBtZaXnLavlPbZ7/p1et83ghDSvmg== 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 4dwlLf652nz8LX for ; Wed, 21 Jan 2026 00:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3facc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 00:24:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: f2155a6fb568 - main - nfscl: Fix handling of case insensitive file systems List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: f2155a6fb5681c3dca4524a3b2b862a72218a541 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 00:24:26 +0000 Message-Id: <69701cba.3facc.37d4dc75@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=f2155a6fb5681c3dca4524a3b2b862a72218a541 commit f2155a6fb5681c3dca4524a3b2b862a72218a541 Author: Rick Macklem AuthorDate: 2026-01-21 00:21:52 +0000 Commit: Rick Macklem CommitDate: 2026-01-21 00:21:52 +0000 nfscl: Fix handling of case insensitive file systems Name caching must be handled somewhat differently for case insensitive file systems. Negative name caching does not work and, for rename, all names associated with the rename'd vnode must be disabled. For a case insensitive ZFS file system that is exported, the unpatched code did work, since the change in mtime or ctime of the directory when other case names were created or rename'd would disable the false name cache hit. However, an export of an msdosfs file system breaks the NFS client, because it only works if ctime/mtime is changed whenever a name is added/removed. Depending on what the server file system is, this may not happen, due to clock resolution or lack of support for these attributes. This patch checks to see if the server file system is case insensitive and modifies the name caching to handle this. There is still a problem if a case insensitive file system is a subtree of a non-case insensitive is exported by the NFSv4 server. This can be fixed someday, when the NFSv4 client gets support for submounts within the mount. Suggested by: kib MFC after: 2 weeks --- sys/fs/nfs/nfsport.h | 2 ++ sys/fs/nfsclient/nfs_clrpcops.c | 19 ++++++++++++++++--- sys/fs/nfsclient/nfs_clvnops.c | 12 +++++++++++- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/sys/fs/nfs/nfsport.h b/sys/fs/nfs/nfsport.h index 4e9aae70da6f..f6b6cfb22908 100644 --- a/sys/fs/nfs/nfsport.h +++ b/sys/fs/nfs/nfsport.h @@ -1040,6 +1040,7 @@ void ncl_copy_vattr(struct vnode *vp, struct vattr *dst, struct vattr *src); #define NFSSTA_HASWRITEVERF 0x00040000 /* Has write verifier */ #define NFSSTA_GOTFSINFO 0x00100000 /* Got the fsinfo */ #define NFSSTA_OPENMODE 0x00200000 /* Must use correct open mode */ +#define NFSSTA_CASEINSENSITIVE 0x00400000 /* Case insensitive fs */ #define NFSSTA_FLEXFILE 0x00800000 /* Use Flex File Layout */ #define NFSSTA_NOLAYOUTCOMMIT 0x04000000 /* Don't do LayoutCommit */ #define NFSSTA_SESSPERSIST 0x08000000 /* Has a persistent session */ @@ -1073,6 +1074,7 @@ void ncl_copy_vattr(struct vnode *vp, struct vattr *dst, struct vattr *src); #define NFSHASPNFS(n) ((n)->nm_state & NFSSTA_PNFS) #define NFSHASFLEXFILE(n) ((n)->nm_state & NFSSTA_FLEXFILE) #define NFSHASOPENMODE(n) ((n)->nm_state & NFSSTA_OPENMODE) +#define NFSHASCASEINSENSITIVE(n) ((n)->nm_state & NFSSTA_CASEINSENSITIVE) #define NFSHASONEOPENOWN(n) (((n)->nm_flag & NFSMNT_ONEOPENOWN) != 0 && \ (n)->nm_minorvers > 0) #define NFSHASTLS(n) (((n)->nm_newflag & NFSMNT_TLS) != 0) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 0cdcde6cca28..0213534d9230 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -4995,11 +4995,13 @@ nfsrpc_statfs(vnode_t vp, struct nfsstatfs *sbp, struct nfsfsinfo *fsp, uint32_t *leasep, uint32_t *cloneblksizep, struct ucred *cred, NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp) { + struct nfsvattr na; + struct nfsv3_pathconf pc; u_int32_t *tl = NULL; struct nfsrv_descript nfsd, *nd = &nfsd; struct nfsmount *nmp; nfsattrbit_t attrbits; - int error; + int attrflag, error; *attrflagp = 0; if (cloneblksizep != NULL) @@ -5066,6 +5068,15 @@ nfsrpc_statfs(vnode_t vp, struct nfsstatfs *sbp, struct nfsfsinfo *fsp, sbp->sf_bfree = fxdr_unsigned(u_int32_t, *tl++); sbp->sf_bavail = fxdr_unsigned(u_int32_t, *tl); } + + /* Try and find out if the server fs is case-insensitive. */ + error = nfsrpc_pathconf(vp, &pc, NULL, NULL, cred, p, &na, &attrflag); + if (error == 0 && pc.pc_caseinsensitive != 0) { + NFSLOCKMNT(nmp); + nmp->nm_state |= NFSSTA_CASEINSENSITIVE; + NFSUNLOCKMNT(nmp); + } + error = 0; nfsmout: m_freem(nd->nd_mrep); return (error); @@ -5086,9 +5097,11 @@ nfsrpc_pathconf(vnode_t vp, struct nfsv3_pathconf *pc, bool *has_namedattrp, int error; struct nfsnode *np; - *has_namedattrp = false; + if (has_namedattrp != NULL) + *has_namedattrp = false; *attrflagp = 0; - *clone_blksizep = 0; + if (clone_blksizep != NULL) + *clone_blksizep = 0; nmp = VFSTONFS(vp->v_mount); if (NFSHASNFSV4(nmp)) { np = VTONFS(vp); diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 1bd77ab27ced..8e4d58c0e554 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -1492,7 +1492,8 @@ handle_error: return (EJUSTRETURN); } - if ((cnp->cn_flags & MAKEENTRY) != 0 && dattrflag) { + if ((cnp->cn_flags & MAKEENTRY) != 0 && dattrflag && + !NFSHASCASEINSENSITIVE(nmp)) { /* * Cache the modification time of the parent * directory from the post-op attributes in @@ -2205,6 +2206,14 @@ nfs_rename(struct vop_rename_args *ap) if ((error = NFSVOPLOCK(fvp, LK_EXCLUSIVE)) != 0) goto out; + /* + * For case insensitive file systems, there may be multiple + * names cached for the one name being rename'd, so purge + * all names from the cache. + */ + if (NFSHASCASEINSENSITIVE(nmp)) + cache_purge(fvp); + /* * We have to flush B_DELWRI data prior to renaming * the file. If we don't, the delayed-write buffers @@ -2221,6 +2230,7 @@ nfs_rename(struct vop_rename_args *ap) if ((nmp->nm_flag & NFSMNT_NOCTO) == 0 || !NFSHASNFSV4(nmp) || !NFSHASNFSV4N(nmp) || nfscl_mustflush(fvp) != 0) error = VOP_FSYNC(fvp, MNT_WAIT, curthread); + NFSVOPUNLOCK(fvp); if (error == 0 && tvp != NULL && ((nmp->nm_flag & NFSMNT_NOCTO) == 0 || !NFSHASNFSV4(nmp) || !NFSHASNFSV4N(nmp) || From nobody Wed Jan 21 01:34:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwmvj3MwPz6PRMS for ; Wed, 21 Jan 2026 01:34: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 4dwmvj2pnLz4Pqt for ; Wed, 21 Jan 2026 01:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768959281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZhPt7PBAKcLp32RypSGr/fIntJvSO+lGZAT50FpWkPs=; b=QA0Vgw75fK8G7dvC+Hpzrt/ekKZ+oPR/639PXpcwze6jKkcPvm9R9i3w8/pYxicz+uf3Ws zLdvT2BaOQMvmIkkdeQdOPNyXYfTptbTXbi8pT1wfd6PeBEuK+hb2F8qhG8jC6w/tGwhw4 R03ZN8NhKTlCHkmushcoJXxNAH+3XOijp8Zvn5iI5B9yTO1doLTq3jqpI5/qjiVnhIv2XW iQdxHijUrlTY4xoRj9cRENeCfKoW7gTS6t+53OAs5pzhDDEcx7qdleoE77ewsZlGdgxVlz 9rgLnip9qpdts2snS89wfJt7fFTXR78SEv3E4xbLPEPgkVa3LWUoe0gHvqx9tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768959281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZhPt7PBAKcLp32RypSGr/fIntJvSO+lGZAT50FpWkPs=; b=DSgBsFRM1CCQLJbojmibh+PBF7zWrvdz9wRDCL19Qsmg27Ce04eRo6ZcmeReNHwYuk7ZG0 PMj+So0yW3VXpriC2V7wnr9GMWDLiR55XJs1oL6UqYiZm4GACpFVXM+FnGmwWQdnsWmqDB X+hxzmEVPAivqjeh3DN5DCNAwgYC+57cj4Aqn5q6alAz0zpNPure0YvmjHVwn41FVv4ODV 3UMNcxUfrrtWEwtHyZCs0zLUzW7yAXOd7iY3kRsvNBkVkv0i4IAxDl0jGWnUHzNxwRhWvX z/s0azv2sTZ4vKBTXolePfQR8bLSZLcJo2vPv46ILAhdiSlfFWhW8KK7Y2Pzcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768959281; a=rsa-sha256; cv=none; b=eiFqfgT9wIzH9g+jc6dQw4L9m+vbUre1FcSh0UEXU58l6DooOfFJD0bNLXXG35sbl+KhfO /5I1JUhyhytz20bXNHodSdMhTC8CEc5R2GrZBnM+eh7trhC7zMFy39RuJjwJdjnOJoBXxl NIfxuCFaTKizXcBQbxL5vuEGgTB06C+3920/+oUlz6LJjhyx8mBBiPvqIXyNmID+Cu4NRO 8yhYqVaa0QQM3nvCMmH7oBDNhuM7/nqbGLyxZgXCPRAhWbEK7ppIgm1p7VAYqkK7+PLea1 aeDAdfeKwOiLI73tlreeWqb+OuDhqFr/nyMzaXdxwsLHEg6WWoyHKcuM3Jbidg== 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 4dwmvj239mzBft for ; Wed, 21 Jan 2026 01:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id fe4c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 01:34:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 053449fa5c6c - main - nfscl: Fix the build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 053449fa5c6c9fdbff1d1014482a5842bc860811 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 01:34:41 +0000 Message-Id: <69702d31.fe4c.4a9785a8@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=053449fa5c6c9fdbff1d1014482a5842bc860811 commit 053449fa5c6c9fdbff1d1014482a5842bc860811 Author: Rick Macklem AuthorDate: 2026-01-21 01:32:23 +0000 Commit: Rick Macklem CommitDate: 2026-01-21 01:32:23 +0000 nfscl: Fix the build Fixes: f2155a6fb568 ("nfscl: Fix handling of case insensitive file systems") --- sys/fs/nfsclient/nfs_clrpcops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 0213534d9230..974d08611a00 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -5070,7 +5070,8 @@ nfsrpc_statfs(vnode_t vp, struct nfsstatfs *sbp, struct nfsfsinfo *fsp, } /* Try and find out if the server fs is case-insensitive. */ - error = nfsrpc_pathconf(vp, &pc, NULL, NULL, cred, p, &na, &attrflag); + error = nfsrpc_pathconf(vp, &pc, NULL, NULL, cred, p, &na, &attrflag, + NULL); if (error == 0 && pc.pc_caseinsensitive != 0) { NFSLOCKMNT(nmp); nmp->nm_state |= NFSSTA_CASEINSENSITIVE; From nobody Wed Jan 21 01:51:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwnGt6vpnz6PSNt; Wed, 21 Jan 2026 01:51:18 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwnGt3rwgz3CLx; Wed, 21 Jan 2026 01:51:18 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 60L1p6pd088555; Wed, 21 Jan 2026 03:51:09 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 60L1p6pd088555 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 60L1p6p5088554; Wed, 21 Jan 2026 03:51:06 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 21 Jan 2026 03:51:06 +0200 From: Konstantin Belousov To: Rick Macklem Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: f2155a6fb568 - main - nfscl: Fix handling of case insensitive file systems Message-ID: References: <69701cba.3facc.37d4dc75@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <69701cba.3facc.37d4dc75@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dwnGt3rwgz3CLx On Wed, Jan 21, 2026 at 12:24:26AM +0000, Rick Macklem wrote: > The branch main has been updated by rmacklem: > > URL: https://cgit.FreeBSD.org/src/commit/?id=f2155a6fb5681c3dca4524a3b2b862a72218a541 > > commit f2155a6fb5681c3dca4524a3b2b862a72218a541 > Author: Rick Macklem > AuthorDate: 2026-01-21 00:21:52 +0000 > Commit: Rick Macklem > CommitDate: 2026-01-21 00:21:52 +0000 > > nfscl: Fix handling of case insensitive file systems > > Name caching must be handled somewhat differently > for case insensitive file systems. Negative name > caching does not work and, for rename, all names > associated with the rename'd vnode must be disabled. Also for unlink. At least I did not found this in the patch. From nobody Wed Jan 21 01:53:34 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwnKV575hz6PSWG 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 4dwnKV4DsWz3Ddq 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 4dwnKV3r3nzBYY 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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:33 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwnKZ4QbHz6PSYs for ; Wed, 21 Jan 2026 01:53: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 4dwnKT3jJ8z3DYV 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 4dwnKT35RFzBJq 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwnKs6Rskz6PSRc 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 4dwnKs3bYtz3F1n 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 4dwnKs2v3jzBbn 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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 02:05:14 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwnbK1QnKz6PT9D for ; Wed, 21 Jan 2026 02:05:33 +0000 (UTC) (envelope-from rick.macklem@gmail.com) Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dwnbJ4ZwSz3GvF for ; Wed, 21 Jan 2026 02:05:32 +0000 (UTC) (envelope-from rick.macklem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-65813e3e215so606493a12.0 for ; Tue, 20 Jan 2026 18:05:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1768961126; cv=none; d=google.com; s=arc-20240605; b=WXmZxan9DKUpWpkqZ7vMspRXNsbYEij8uJ3YL02bVD3Xqstvqui/2lwVh5v4bqV0Ni 2RpNqbjMZHFx74/cYvTYtIlatbHPRkLhqc//xmoZT+qBhibxSFkyuZPNDdTBUbHzlX3K 6c9zrUt4dVbE1DeUEr1yu2QIIvRt6lzExmu6vTRtS9yjRue8hPFVwfVXfC5DGbpZ8J+f 0/sG+cZgTzHhIhC5ehp1xflM1QnbcknO2HIKmXewO6I+I3BQOrmgYDPpHimfhGWXzbF7 uedEZb6yh6VNdrUMafJyqZ3l3l5LiND3UXXTiZ5mixBP66YO6SriIucCdWETIKuHlPNv 4DGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=LmLSHKGOrC2GDwYZ+3CFwLaJ5crAkvDQhbUEmh290MI=; fh=GfSWW2CXY321syr/siTnQ4nEQhD3aIiRBuDnituq1+I=; b=IvPf3YmY0xounPMSpQVL48f0X+5OPZcjWZDMfoi+8lkaP4cKr0zcVnz7xyVkCoO1tC J0GgP5lcCqNegmcRFPpv+oYnMZyJAJZKdfgHt1Yqb1hP9ytKcEhKryKW+8GPFKPtjgG9 6v7x6H8q2a2yirvDzf59RiYAu3Oe6+vS1gHC6Qfm5Haol+957UCLc/gKsEghWg2/Xt9x cSU5EW2M0LzfhewT4XyzBbM9RXuEsyZ/BUVKc+wODfRiTrFsuuo8L9rniVJk6CwNSyXb kRZAD/ZZd0eqpuWXNbV7tEpiC535W28zAodmZPuLLE1jm+R0FzdVczfem+aCcTwvKOzQ tqVw==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768961126; x=1769565926; darn=freebsd.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=LmLSHKGOrC2GDwYZ+3CFwLaJ5crAkvDQhbUEmh290MI=; b=UZWUkLasI+xFZCNYdn9+Ldn7t5+uxdCjz49HUoKlxIe6meQY0fT0BvM/zZzMA3TKSr TqHxp4kv21t1AXbVo9i+A8hhmu+EpGVC5LC8dd3HUh1WSn1awGsIFlCjB4112CxXrghs JfroHdlnmL36A0ikcXMq2OUUV+BGlPshcyFRyldNB2bQcJH65OneAgzZXWUKVY1qKuVl ydrxMJhOLlSclmt3vzWQYxLmJ+vbdO5rTOdf6Chbr7fci6N8IT0G0ph+P64sM85DO+Sl ixM5jiR0hmE8G3veyxs/iCsSl0CmTEsyExXWmV3vl3mi1tV19OxglHcH2RKPAV9YCLPM E7HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768961126; x=1769565926; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=LmLSHKGOrC2GDwYZ+3CFwLaJ5crAkvDQhbUEmh290MI=; b=Umfqc6vTEYk52jsEs55zcVgqJI35TsWUAuLlHrOqg37BHLCvwxSU/uDiUE7YLCffI1 /T49hIoWO1wm6ZjU6/KcBXm7O4TeTgvro9ZRCbN3Ox/V9LwMr/j8cdHd2u6ED/zr4/K2 zJUEQ9ySKbjyhBFMQbBbj6Jrz9K52BoNSXBR1aOxlfgoBxNRpXfvr8PtAV5xLuvHWzte 7rulLfetc+LHBu87K22I+tdtdZ3rZwdlEwQUQ4Ta64adiDk2oORR1/WQL18q78H7Gd1M zPHK4IOx2vjYv4OHw4V54ebqhRT2Xex4tESVb/L/m9UKu1eEC1UR/Lu8mMHUswOWysYa Td5Q== X-Forwarded-Encrypted: i=1; AJvYcCU+oFRGUzVY16+n+nVBw4CxELSjlTEJiHf3SNnPSw7jK1QuBFzi4MVc1W0uQc1JyN36PgbSJfZuPI0E7QWIKgwkfeRv@freebsd.org X-Gm-Message-State: AOJu0Yxt4vpjiCG9q8HrcI+9myGVqmCMN627p+bo371BmEiX19KaD8Oh 88LyamXeDZ34F29haBfHOd6VeUu6KwVt/X8Q9ZuF19DMzM0d1dl8poLGoFI+3ZEI1/91L3KVz0K MxvAS4AI84jwW3QZuNAvnESyjDIcX+q6GB54= X-Gm-Gg: AZuq6aJFKHFrPoA0LAIkMhDDnFPpA94OJXFpZz/NqoCE8viDXFkTf64LHDD3M4IE0jR gdROBe4iMR7kwLlDsxsQRsODYP3RVbYb1eoS/8x9yws1fp6fLJ1QMqdEheN/OC/miBjmlMWo4jz yl5ue8hzgB+q5fI7VepJg9R73ZxPdwnSLwmhtk1w80YMlPrRDE+hyrwfzRqWll0dbD90A14alGs 3dwytLRftgKzLwkmHTHLZr+T+4pDEfguCx1AHLQvEJiHiQ1ixrwnLcQaIsHlyGXEGWSO4ulsAce 5MtS95KXBnvEpaL2jFUgqrhbeEpUfwGobzG6hpI= X-Received: by 2002:a05:6402:26d3:b0:64b:42a6:3946 with SMTP id 4fb4d7f45d1cf-654b93641a7mr12721387a12.7.1768961125709; Tue, 20 Jan 2026 18:05:25 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <69701cba.3facc.37d4dc75@gitrepo.freebsd.org> In-Reply-To: From: Rick Macklem Date: Tue, 20 Jan 2026 18:05:14 -0800 X-Gm-Features: AZwV_QgGfzb9tG1Sh9jfj30oOToruxALZAzHGeEmZcCX63-dVWeOQfYvwQ0bM6M Message-ID: Subject: Re: git: f2155a6fb568 - main - nfscl: Fix handling of case insensitive file systems To: Konstantin Belousov Cc: Rick Macklem , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dwnbJ4ZwSz3GvF On Tue, Jan 20, 2026 at 5:51=E2=80=AFPM Konstantin Belousov wrote: > > CAUTION: This email originated from outside of the University of Guelph. = Do not click links or open attachments unless you recognize the sender and = know the content is safe. If in doubt, forward suspicious emails to IThelp@= uoguelph.ca. > > On Wed, Jan 21, 2026 at 12:24:26AM +0000, Rick Macklem wrote: > > The branch main has been updated by rmacklem: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Df2155a6fb5681c3dca4524a3= b2b862a72218a541 > > > > commit f2155a6fb5681c3dca4524a3b2b862a72218a541 > > Author: Rick Macklem > > AuthorDate: 2026-01-21 00:21:52 +0000 > > Commit: Rick Macklem > > CommitDate: 2026-01-21 00:21:52 +0000 > > > > nfscl: Fix handling of case insensitive file systems > > > > Name caching must be handled somewhat differently > > for case insensitive file systems. Negative name > > caching does not work and, for rename, all names > > associated with the rename'd vnode must be disabled. > Also for unlink. At least I did not found this in the patch. nfs_remove() already does a cache_purge(vp), where "vp" is the file being removed. And testing for msdosfs, it worked ok. rick > From nobody Wed Jan 21 02:47:50 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwpX624tBz6PWy0 for ; Wed, 21 Jan 2026 02:47: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 4dwpX61Jhtz3Ktq for ; Wed, 21 Jan 2026 02:47:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768963670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9J1IuaCmerVZ9taLu/KZmg1kYnFW9fkMT1rG2J4hRco=; b=DaBMjMLYm5jwKFNUUf+4G1pHMXEIHRdl81X8in2jMDpQk8gjlzyfSTNeHgEWt+z9sX2o6g Nj8DeZ/PKwMWc/+TkwFuGfOSuvDUle740g2kR+G1pmHcOhlaRVCJPVv/fXCg4kmIThjP0m LAO2H7kmiHPssHYWNp0d0eNPowLNNQL9P93a3+2yVZ3XrEnTUphcsgksJS0h+NAeKi+vZY N9yO0vSozb5mgHuCGW6sCaKQc2eSbMZayPWUq/ni85wkQZ8x2Hq0T3cr35Kma4CJlFa3to EWG9wVeJr1Tkw4Fa/EBeloGii+HN/3Zu4aWUb0Qlocde0HoFef5ZeAUlzujszg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768963670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9J1IuaCmerVZ9taLu/KZmg1kYnFW9fkMT1rG2J4hRco=; b=FkpvR5vnQg3tiY6sjMvILRTCHEeJCdk4veDCaSBYVHm/z8Iq8/yvWEXlg6Kpbrc8PVWgja noAuJeXndJEEAcHNOBwaG604PrSRwXGIKqzqvGk3fjMfohEQfCIt0GGlw9muZ4nzRQeBbf XzrwpXtH58ddmltlRt2g0MFypRXxugdPjsskZUR7Hy0haO2GQaXglsVt2X2SojFXGt5Bl0 LjOCgznI7l/caLT+kx98HBXHYNOiDHD+itsIyIO71272VcHOaWHNJb2lPna68a6knVIfuj d59yUKu/bhe9et0+X4S2U0xQSxNQ5dtT5xHXebZx3pPBYBGR/LyyH9eu6zH9tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768963670; a=rsa-sha256; cv=none; b=KXjkvwWTEzPrwzKETlwluOJ5S/VTLFq/A0tJ3paU2Eza0FxuSkP3BQfFKk2cgSvraIYuNY 7V0A6t7bXNya61Nlo9Il9xUm4DPadUvDiUAuMFhJsQVUhsuKhxrU9p+gY3I5+4YQj5+his O5yB5tf43jc5yr9ZoROr5iXzZSaT2NCcIh5voRBF7lKx+NNhUS7VIz8LYYkFVO+hJ6B1iD 5UD4P9Is0BSK3rPLGZDOUpA5yCcB9Y9BKo9zJddU56TLGiDefTsXNinweE4ayJmiffahER 9ebL5tSThMODUeu58e3akiSKOpiugw3BGdV2j3ANPf2GCgtQrYsWFOg19wauQA== 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 4dwpX60ZCzzDK2 for ; Wed, 21 Jan 2026 02:47:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26c33 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 02:47:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 12444a4da514 - main - cron: Implement full PAM session lifecycle for user jobs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12444a4da514e91fdf984b31e1691d042d5f88d2 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 02:47:50 +0000 Message-Id: <69703e56.26c33.5caa0953@gitrepo.freebsd.org> The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=12444a4da514e91fdf984b31e1691d042d5f88d2 commit 12444a4da514e91fdf984b31e1691d042d5f88d2 Author: Xin LI AuthorDate: 2025-12-29 09:32:24 +0000 Commit: Xin LI CommitDate: 2026-01-21 02:47:16 +0000 cron: Implement full PAM session lifecycle for user jobs Extend PAM integration beyond account checks to include credential establishment and session management, allowing PAM modules to configure the execution environment for user cron jobs. Previously, cron only called pam_acct_mgmt() to verify account validity but immediately terminated the PAM handle before job execution. This prevented PAM modules from establishing sessions, setting credentials (e.g., Kerberos tickets), or exporting environment variables needed by jobs. The PAM handle now persists in the intermediate process throughout the job execution, enabling proper session open/close pairing. Credentials are established and sessions opened while still running as root, before dropping privileges in the grandchild. PAM environment variables are exported in the job process with user crontab variables taking precedence. A session rule (pam_permit.so) is added to /etc/pam.d/cron to enable session support without changing default behavior. Administrators can replace this with other modules as needed. System crontab entries continue to bypass all PAM operations. PR: bin/244844 Reviewed by: des MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54415 --- lib/libpam/pam.d/cron | 3 + usr.sbin/cron/cron/do_command.c | 144 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 142 insertions(+), 5 deletions(-) diff --git a/lib/libpam/pam.d/cron b/lib/libpam/pam.d/cron index 733631306641..490663508a72 100644 --- a/lib/libpam/pam.d/cron +++ b/lib/libpam/pam.d/cron @@ -6,3 +6,6 @@ # account account required pam_nologin.so account required pam_unix.so + +# session +session required pam_permit.so diff --git a/usr.sbin/cron/cron/do_command.c b/usr.sbin/cron/cron/do_command.c index 58eed70c1be6..f757b7175126 100644 --- a/usr.sbin/cron/cron/do_command.c +++ b/usr.sbin/cron/cron/do_command.c @@ -76,6 +76,41 @@ do_command(entry *e, user *u) Debug(DPROC, ("[%d] main process returning to work\n", getpid())) } +#ifdef PAM +static void +pam_cleanup(pam_handle_t **pamhp, int *session_opened, int *cred_established, + char ***pam_envp, const char *usernm, pid_t pid, int log_errors, + int end_status) +{ + int pam_err; + + if (*pamhp == NULL) + return; + if (*session_opened) { + pam_err = pam_close_session(*pamhp, PAM_SILENT); + if (log_errors && pam_err != PAM_SUCCESS) { + log_it(usernm, pid, "SESSION-CLOSE", + pam_strerror(*pamhp, pam_err)); + } + *session_opened = 0; + } + if (*cred_established) { + pam_err = pam_setcred(*pamhp, PAM_DELETE_CRED); + if (log_errors && pam_err != PAM_SUCCESS) { + log_it(usernm, pid, "CRED-DELETE", + pam_strerror(*pamhp, pam_err)); + } + *cred_established = 0; + } + if (*pam_envp != NULL) { + openpam_free_envlist(*pam_envp); + *pam_envp = NULL; + } + pam_end(*pamhp, end_status); + *pamhp = NULL; +} +#endif + static void child_process(entry *e, user *u) @@ -88,6 +123,14 @@ child_process(entry *e, user *u) int bytes = 1; int status = 0; const char *homedir = NULL; +#ifdef PAM + pam_handle_t *pamh = NULL; + int pam_err = PAM_SUCCESS; + int pam_session_opened = 0; + int pam_cred_established = 0; + /* Keep PAM env list in the middle process for the grandchild to use. */ + char **pam_envp = NULL; +#endif # if defined(LOGIN_CAP) struct passwd *pwd; login_cap_t *lc; @@ -115,8 +158,6 @@ child_process(entry *e, user *u) * as any user. */ if (strcmp(u->name, SYS_NAME)) { /* not equal */ - pam_handle_t *pamh = NULL; - int pam_err; struct pam_conv pamc = { .conv = openpam_nullconv, .appdata_ptr = NULL @@ -139,14 +180,50 @@ child_process(entry *e, user *u) exit(ERROR_EXIT); } + pam_err = pam_set_item(pamh, PAM_TTY, "cron"); + if (pam_err != PAM_SUCCESS) { + log_it("CRON", getpid(), "error", "can't set PAM_TTY"); + pam_cleanup(&pamh, &pam_session_opened, + &pam_cred_established, &pam_envp, usernm, + getpid(), 0, pam_err); + exit(ERROR_EXIT); + } + pam_err = pam_acct_mgmt(pamh, PAM_SILENT); /* Expired password shouldn't prevent the job from running. */ if (pam_err != PAM_SUCCESS && pam_err != PAM_NEW_AUTHTOK_REQD) { log_it(usernm, getpid(), "USER", "account unavailable"); + pam_cleanup(&pamh, &pam_session_opened, + &pam_cred_established, &pam_envp, usernm, + getpid(), 0, pam_err); + exit(ERROR_EXIT); + } + + pam_err = pam_setcred(pamh, PAM_ESTABLISH_CRED); + if (pam_err != PAM_SUCCESS) { + log_it(usernm, getpid(), "CRED", + pam_strerror(pamh, pam_err)); + pam_cleanup(&pamh, &pam_session_opened, + &pam_cred_established, &pam_envp, usernm, + getpid(), 0, pam_err); + exit(ERROR_EXIT); + } + pam_cred_established = 1; + + /* Establish the session while still root in the middle process. */ + pam_err = pam_open_session(pamh, PAM_SILENT); + if (pam_err != PAM_SUCCESS) { + log_it(usernm, getpid(), "SESSION", + pam_strerror(pamh, pam_err)); + pam_cleanup(&pamh, &pam_session_opened, + &pam_cred_established, &pam_envp, usernm, + getpid(), 0, pam_err); exit(ERROR_EXIT); } + pam_session_opened = 1; - pam_end(pamh, pam_err); + /* Collect PAM env now; apply only in grandchild before exec. */ + pam_envp = pam_getenvlist(pamh); } #endif @@ -161,6 +238,13 @@ child_process(entry *e, user *u) */ if (pipe(stdin_pipe) != 0 || pipe(stdout_pipe) != 0) { log_it("CRON", getpid(), "error", "can't pipe"); +#ifdef PAM + if (pamh != NULL && strcmp(u->name, SYS_NAME)) { + pam_cleanup(&pamh, &pam_session_opened, + &pam_cred_established, &pam_envp, usernm, + getpid(), 1, pam_err); + } +#endif exit(ERROR_EXIT); } @@ -207,12 +291,23 @@ child_process(entry *e, user *u) switch (jobpid = fork()) { case -1: log_it("CRON", getpid(), "error", "can't fork"); +#ifdef PAM + if (pamh != NULL && strcmp(u->name, SYS_NAME)) { + pam_cleanup(&pamh, &pam_session_opened, + &pam_cred_established, &pam_envp, usernm, + getpid(), 1, pam_err); + } +#endif exit(ERROR_EXIT); /*NOTREACHED*/ case 0: Debug(DPROC, ("[%d] grandchild process fork()'ed\n", getpid())) +#ifdef PAM + /* Grandchild runs the user job; PAM handle remains in parent. */ + pamh = NULL; +#endif if (e->uid == ROOT_UID) Jitter = RootJitter; if (Jitter != 0) { @@ -329,8 +424,8 @@ child_process(entry *e, user *u) * the homedir given by the pw entry otherwise. * * If !LOGIN_CAP, then HOME is always set in e->envp. - * - * XXX: probably should also consult PAM. + * PAM environment is applied later for the job; we do not + * use it for cwd to avoid changing historical behavior. */ { char *new_home = env_get("HOME", e->envp); @@ -351,6 +446,29 @@ child_process(entry *e, user *u) char *shell = env_get("SHELL", e->envp); char **p; +#ifdef PAM + if (pam_envp != NULL) { + char **pp; + + /* Apply PAM-provided env only to the job process. */ + for (pp = pam_envp; *pp != NULL; pp++) { + /* + * Hand off each PAM string directly to the + * environment; this process must not free + * pam_envp after putenv() since the strings + * must persist until exec. The parent will + * free its copy after fork. + */ + if (putenv(*pp) != 0) { + warn("putenv"); + _exit(ERROR_EXIT); + } + } + /* Free the pointer array; strings stay for exec. */ + free(pam_envp); + pam_envp = NULL; + } +#endif /* Apply the environment from the entry, overriding * existing values (this will always set LOGNAME and * SHELL). putenv should not fail unless malloc does. @@ -400,6 +518,14 @@ child_process(entry *e, user *u) break; } +#ifdef PAM + if (jobpid > 0 && pam_envp != NULL) { + /* Parent doesn't need PAM env list after the fork. */ + openpam_free_envlist(pam_envp); + pam_envp = NULL; + } +#endif + /* middle process, child of original cron, parent of process running * the user's command. */ @@ -640,6 +766,14 @@ child_process(entry *e, user *u) if (*input_data && stdinjob > 0) wait_on_child(stdinjob, "grandchild stdinjob"); + +#ifdef PAM + if (pamh != NULL && strcmp(u->name, SYS_NAME)) { + /* Close the PAM session after the job finishes. */ + pam_cleanup(&pamh, &pam_session_opened, &pam_cred_established, + &pam_envp, usernm, getpid(), 1, PAM_SUCCESS); + } +#endif } static WAIT_T From nobody Wed Jan 21 04:37:44 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwryw75BVz6PdSB for ; Wed, 21 Jan 2026 04:37: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 4dwryw5KwRz3Sp1 for ; Wed, 21 Jan 2026 04:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768970264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7iinI/k9WhlYokJDOuO09Hf6a5EUp5yPoc4ImjyZHJI=; b=RgP+G3fPlV+xScWbjR12Ag3c3GKBrfhrFz4i5fbx0Ar1/oRigPhyziVc+tUJjVkvRVd3wl 09O7mexucytWU28r6EzLOxRwitq0pela7OSPHW3QfPA94jGdZKg//kZKfWxa/5sWp4nt58 NG0l4TAdy/Te9CIJI/GOkr59bzfXUk71vJd8TXtq+Oh+IWrH/hITKe9wTcj6PYz02NuLgk GRDe6ke6DKVYHxXwCKFwL5f2NmuWGubHgXY7TTn4hBgZ+WEt+rdGJ6ELCK05/EgzjrSE28 b7iirQulz4W8OSEBu9x+aR319qalPgnyl15ZOsig7i045wFjK3dS0Jv/T99fCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768970264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7iinI/k9WhlYokJDOuO09Hf6a5EUp5yPoc4ImjyZHJI=; b=dxySLL06ds+CWGQdVGusEIVXQVwDqXcwL5VZ0SC35B+i39u0UvQr3x2OoBC0RqZFYAeI8l lxlf6zHnPJtSkCWYL+B5UNPcglPKCPagJtmgdQBAJ5HDQl0RNF2rGzUBp+mbMsBtF2c8yt LMEKePLdXheVpCyFkGr8kWd7LslgHv6RX/YcP+4fOr+wgZE8M0BHS3f8vgwbwFFOyjUiOW 4ovUSNkeRSMgl6cgM/R0SXw1kkvl4SC4Yd7CEYNEVjO2xirkEkCl47Q1yvx8lJ8xhjJD4O pyheiH04Zj4ogZY/LmYQRk1DmZTfm8kCLPwC2Qy54Ud90Ol0VaHhcPAfkIH2Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768970264; a=rsa-sha256; cv=none; b=G93LXU9r1gomoIryrZSrDg84+zw/9e6aUX9H09RDobDBa9axKOv8LwuGV7mZ1zCk5KnUC3 nKefvddGdkHCgZ1FzQG0NVUbFw5h1csBfdVgox0h9v93BZyH3NX85voO6H68I6Nhcpo9Ca cFacEUYo8Y6DVa6rlDxxxdY08MAaZXKdH6BwxgM7D0nv6wluqRIv5yoIpNGrwnZoFqanA2 6S1A3ooF6pvsVmE+k3pS+iBzTdBmgK7C2Q6v/ZnAh1XEEfCySquWxC6dkKUGvwinCGDr2h +bvo3lo0PZg850oHCwCN6PgHOU/A9h9BRh7comG6F7o4+k5aeelZ8U4sL1b//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 4dwryw4fyvzYxg for ; Wed, 21 Jan 2026 04:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39cff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 04:37:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: c611ef5747a5 - main - dpaa: Simplify CPU binding for bman and qman List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c611ef5747a5d2ceb094331d3dd74d5c8b523b9c Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 04:37:44 +0000 Message-Id: <69705818.39cff.240125b2@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=c611ef5747a5d2ceb094331d3dd74d5c8b523b9c commit c611ef5747a5d2ceb094331d3dd74d5c8b523b9c Author: Justin Hibbits AuthorDate: 2026-01-21 04:16:04 +0000 Commit: Justin Hibbits CommitDate: 2026-01-21 04:28:40 +0000 dpaa: Simplify CPU binding for bman and qman If cpu-handle property doesn't exist simply iterate and assign the CPUs in sequence rather than following the convoluted search which may not bear fruit in some cases. If cpu-handle doesn't exist for one portal it probably doesn't exist for any of them. --- sys/dev/dpaa/bman_fdt.c | 39 +++++++++------------------------------ sys/dev/dpaa/qman_fdt.c | 40 +++++++++------------------------------- 2 files changed, 18 insertions(+), 61 deletions(-) diff --git a/sys/dev/dpaa/bman_fdt.c b/sys/dev/dpaa/bman_fdt.c index dffec52d5248..34b29ad6e236 100644 --- a/sys/dev/dpaa/bman_fdt.c +++ b/sys/dev/dpaa/bman_fdt.c @@ -136,25 +136,6 @@ bman_portals_fdt_probe(device_t dev) return (BUS_PROBE_DEFAULT); } -static phandle_t -bman_portal_find_cpu(int cpu) -{ - phandle_t node; - pcell_t reg; - - node = OF_finddevice("/cpus"); - if (node == -1) - return (node); - - for (node = OF_child(node); node != 0; node = OF_peer(node)) { - if (OF_getprop(node, "reg", ®, sizeof(reg)) <= 0) - continue; - if (reg == cpu) - return (node); - } - return (-1); -} - static int bman_portals_fdt_attach(device_t dev) { @@ -185,17 +166,15 @@ bman_portals_fdt_attach(device_t dev) } /* Checkout related cpu */ if (OF_getprop(child, "cpu-handle", (void *)&cpu, - sizeof(cpu)) <= 0) { - cpu = bman_portal_find_cpu(cpus); - if (cpu <= 0) - continue; - } - /* Acquire cpu number */ - cpu_node = OF_instance_to_package(cpu); - if (OF_getencprop(cpu_node, "reg", &cpu_num, sizeof(cpu_num)) <= 0) { - device_printf(dev, "Could not retrieve CPU number.\n"); - return (ENXIO); - } + sizeof(cpu)) > 0) { + cpu_node = OF_instance_to_package(cpu); + /* Acquire cpu number */ + if (OF_getencprop(cpu_node, "reg", &cpu_num, sizeof(cpu_num)) <= 0) { + device_printf(dev, "Could not retrieve CPU number.\n"); + return (ENXIO); + } + } else + cpu_num = cpus; cpus++; diff --git a/sys/dev/dpaa/qman_fdt.c b/sys/dev/dpaa/qman_fdt.c index 3f22ea4d651a..35016073ba0e 100644 --- a/sys/dev/dpaa/qman_fdt.c +++ b/sys/dev/dpaa/qman_fdt.c @@ -136,25 +136,6 @@ qman_portals_fdt_probe(device_t dev) return (BUS_PROBE_DEFAULT); } -static phandle_t -qman_portal_find_cpu(int cpu) -{ - phandle_t node; - pcell_t reg; - - node = OF_finddevice("/cpus"); - if (node == -1) - return (-1); - - for (node = OF_child(node); node != 0; node = OF_peer(node)) { - if (OF_getprop(node, "reg", ®, sizeof(reg)) <= 0) - continue; - if (reg == cpu) - return (node); - } - return (-1); -} - static int qman_portals_fdt_attach(device_t dev) { @@ -213,18 +194,15 @@ qman_portals_fdt_attach(device_t dev) } /* Checkout related cpu */ if (OF_getprop(child, "cpu-handle", (void *)&cpu, - sizeof(cpu)) <= 0) { - cpu = qman_portal_find_cpu(cpus); - if (cpu <= 0) - continue; - } - /* Acquire cpu number */ - cpu_node = OF_instance_to_package(cpu); - if (OF_getencprop(cpu_node, "reg", &cpu_num, sizeof(cpu_num)) <= 0) { - device_printf(dev, "Could not retrieve CPU number.\n"); - return (ENXIO); - } - + sizeof(cpu)) > 0) { + cpu_node = OF_instance_to_package(cpu); + /* Acquire cpu number */ + if (OF_getencprop(cpu_node, "reg", &cpu_num, sizeof(cpu_num)) <= 0) { + device_printf(dev, "Could not retrieve CPU number.\n"); + return (ENXIO); + } + } else + cpu_num = cpus; cpus++; if (ofw_bus_gen_setup_devinfo(&ofw_di, child) != 0) { From nobody Wed Jan 21 04:37:45 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwryy3TrYz6Pd8T for ; Wed, 21 Jan 2026 04:37: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 4dwryx6kr5z3T59 for ; Wed, 21 Jan 2026 04:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768970266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5pAqhLrFjQaf/eU7EbbQGyRnP8fQCWdcEb5gL4mA6XM=; b=txIY0zPPvhGNFzw5/Xwl9jVD92l4FfwGNika0vKJVRfNUTxEqfOTWa/uROcKSIDqyJ6DzP JuEcFOiYgVZ0DCHmK7xwZ2UrOx/MdH8FNkkLin+u0tQn4ZMHK+JjCUZE4Bq+/yfMLiuHkW R75V6W1ZNWCYJdouMUT2aWaXq7FxTW42zBZwlGGK2HCp1vsIXCgD+L4BStJhQ5O/9ystIq iVrus475uynRKbyGyttOI0qey8KkaHFSriptq0YdPcktCDi0/1EoR+0lSQr9tcTVkAjUrz UhmQgVkiwAAH5Dd2V8TiHdZ4CHHAm10ZvRqEHs78pOaehB8s4Amg/AlTjunTXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768970266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5pAqhLrFjQaf/eU7EbbQGyRnP8fQCWdcEb5gL4mA6XM=; b=G3tjW149tIiWMr/6uULnZhAa6i/7sV2K8ysUrw1y81EpNHxtDh6CaCuYDzL3+GXmqVokhu zGAU9Hg4UvUBdsudc3KcihYbjdATRtr7FBlPl9naLG6sgAkNqi939rFXkPduG1Gfsa0IwI mDZfjnNyPzjKXKte33faPzJ6hc5iSY5ALt9p03O6COPsCkZ2hgz7CSkMNDRew6AXg3+syO +X+trb+fSwDq1T9Ft8S4aUut6fqBxAz2AcHVnBDondRYR/PGn1iRaVllhv802Gef1d1q6C DB5seyrxuJKf1Hn0yNF+jj15pXe03C2/fQTl3eHTDXuJUe0JwS8vrkcTnPy1rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768970266; a=rsa-sha256; cv=none; b=o1pYkKTi+emBzr6ePuq55bTgLRCYwo3OTGi5YOeSdnr4DnKsIJl3proxFJyUkqvtsAzef8 9TghrYCdClltyK0FGYkHgwW9wFhE2E87NARcO2MGfUMbXwGeHrpmqgyfUD9g9+B8Id05pW sQNU2ztouz4HWUemnfvj3Z+mqo6FqjqjSUQhh/nc6X1OMseQLGuf38frniKUyJqgBP5pDg VfAX168AoGoR4GJNFkQ8OBHPgw4312w0ntOJcDEgxp3giZqDlud1jWg7Esq9kKM77z+c1t OVuufBvxIxbJLDrH/b5FhIpELT4REPjsuvr1MaWRA1bSTacFUJsA+5LPIp+nrw== 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 4dwryx5VBCzYvK for ; Wed, 21 Jan 2026 04:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39b20 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 04:37:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 24d048be7aae - main - powerpc/mpc85xx: Set pc_hwref to the primary thread ID List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 24d048be7aae10e101596bd0d0f09a901a6f97f0 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 04:37:45 +0000 Message-Id: <69705819.39b20.fe1347d@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=24d048be7aae10e101596bd0d0f09a901a6f97f0 commit 24d048be7aae10e101596bd0d0f09a901a6f97f0 Author: Justin Hibbits AuthorDate: 2026-01-21 04:16:17 +0000 Commit: Justin Hibbits CommitDate: 2026-01-21 04:28:40 +0000 powerpc/mpc85xx: Set pc_hwref to the primary thread ID On multithreaded cores (e6500) the CPU ID in the device tree (reg[0]) is the primary core, which may not match the cpuid, until Book-E threading is added. --- sys/powerpc/mpc85xx/platform_mpc85xx.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sys/powerpc/mpc85xx/platform_mpc85xx.c b/sys/powerpc/mpc85xx/platform_mpc85xx.c index 6653c40b01a3..cc2ad829eb05 100644 --- a/sys/powerpc/mpc85xx/platform_mpc85xx.c +++ b/sys/powerpc/mpc85xx/platform_mpc85xx.c @@ -302,14 +302,26 @@ mpc85xx_smp_first_cpu(platform_t plat, struct cpuref *cpuref) static int mpc85xx_smp_next_cpu(platform_t plat, struct cpuref *cpuref) { + phandle_t node; + pcell_t reg; + int i; if (cpu >= maxcpu) return (ENOENT); cpuref->cr_cpuid = cpu++; - cpuref->cr_hwref = cpuref->cr_cpuid; + + node = OF_finddevice("/cpus"); + for (i = 0, node = OF_child(node); i < cpuref->cr_cpuid; + i++, node = OF_peer(node)) + ; + if (OF_getencprop(node, "reg", ®, sizeof(reg)) > 0) + cpuref->cr_hwref = reg; + else + cpuref->cr_hwref = cpuref->cr_cpuid; if (bootverbose) - printf("powerpc_smp_next_cpu: cpuid %d\n", cpuref->cr_cpuid); + printf("powerpc_smp_next_cpu: cpuid %d, hwref %d\n", + cpuref->cr_cpuid, (int)cpuref->cr_hwref); return (0); } From nobody Wed Jan 21 04:37:46 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwryz4Wnwz6PdLs for ; Wed, 21 Jan 2026 04:37: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 4dwryz0Dj4z3Sp8 for ; Wed, 21 Jan 2026 04:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768970267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iwsvze9QWj1CX9LvTea8eQ3UsIwfa5iFRht+kqvxke4=; b=K7LcfZFnoyVi+p2ZjcuKCegeurlvAJZXqqVZxoSdHmnTUR2ejEF9m4FpHBAmiIuA/VNjy3 0g88PHexFG6dYUtuVHxKV+71s3DiOMKkWBgaul2qvFzx/Zz+a0BASN1QpQeaEWKmoNrg9Y +9AeLNO4PCZ4CHCKcaAeL1x1407/veyBoAM4ocmF+qq3hVF68Aek1TgaCvMJzCBPvAVoZt pKfsKj7MIkFRzLUMTbgGeF7+uabgVX0Hz9Oc3ajoEdDAO7c3TSE7AnqDya81U/o1yrGsaI XU4Tuyh0Di9L5QwjKagW+ubI/HFJtUyu9esF1iWAb3slDJSmSeCyCORaWVBTTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768970267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iwsvze9QWj1CX9LvTea8eQ3UsIwfa5iFRht+kqvxke4=; b=Phb5nIQ0394AacdFna9Xk2sRmrUs17gn6KFVrhCSU+aJvzwJIyH6SF2FDI9wUj1zUJCYRO FUW3snIINlH8C8hsOzSB1PfxirjtaITSCnGJ8GvSWNF5JbGyzKdEt/mBb7EscQ0Cd6TBxW GwIH6ukDuVkHOLrWpkRgImnQoB87h6NLA+InM6xzXjA1KwJUxivQMIwkU3EvnXs4fct91N 2B8hcjqonFikdyw0evJBubJfZB6d1jj78iyBbJwq5rc90TtxUd9Ta9EdSU+CoTS1LSCcif 1IVoBR9cVegybYLFIh1kkYeIOY0xtfCeQrcSnwRKZ0BW8R5LYbDw4ahd37JIUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768970267; a=rsa-sha256; cv=none; b=Gcjp+dLvTUY0qgReuNUtampA9RuQXxy+w43hwYcZVHeF9mWmggTA64Ca4lEZxMC5eHrggC 1SgQQRwij+89HlLWdP6W32T0DTKoDk24bT+v8PVSvkQcbbEXjQEikjFNUocZgBT0w5MnAd 7OCwqtQ+8FAvrn/vP0a5IwEy2VkBlqBQnbpWr07nWYvB+5h2y1tVb1CaajU2gfzvolWMTS Oqn3Ii+yNnz7KsKYY8I63nDX6CQmdG4bOnFxoKqp+Sr39r66XttZi1uolATuyu6R7MOwP6 6RFnEGZQk1nG1WlHPOHXiUqkj+kA8s+EpBQ/PUf57H7SlUHkvEb3sfGYl9r9tg== 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 4dwryy6K9qzY5V for ; Wed, 21 Jan 2026 04:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38bb7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 04:37:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 21a7a9ef8b49 - main - powerpc/mpc85xx: Fix PCI attach error cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21a7a9ef8b49ce21b87c8526b526f97cc91fdd43 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 04:37:46 +0000 Message-Id: <6970581a.38bb7.e6a6502@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=21a7a9ef8b49ce21b87c8526b526f97cc91fdd43 commit 21a7a9ef8b49ce21b87c8526b526f97cc91fdd43 Author: Justin Hibbits AuthorDate: 2026-01-21 04:19:28 +0000 Commit: Justin Hibbits CommitDate: 2026-01-21 04:28:41 +0000 powerpc/mpc85xx: Fix PCI attach error cleanup If an error occurs during attach after ofw_pcib_init() runs, the device is torn down, leaving the rmans embedded in the softc attached to the rman list, thus corrupting the rman list. Fix this by undoing everything that was done by this point. MFC after: 1 week --- sys/powerpc/mpc85xx/pci_mpc85xx.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sys/powerpc/mpc85xx/pci_mpc85xx.c b/sys/powerpc/mpc85xx/pci_mpc85xx.c index 8e349df03a51..33dca7ab6c50 100644 --- a/sys/powerpc/mpc85xx/pci_mpc85xx.c +++ b/sys/powerpc/mpc85xx/pci_mpc85xx.c @@ -360,13 +360,13 @@ fsl_pcib_attach(device_t dev) error = ofw_pcib_init(dev); if (error) - return (error); + goto err; /* * Configure decode windows for PCI(E) access. */ if (fsl_pcib_decode_win(node, sc) != 0) - goto err; + goto err1; cfgreg = fsl_pcib_cfgread(sc, 0, 0, 0, PCIR_COMMAND, 2); cfgreg |= PCIM_CMD_SERRESPEN | PCIM_CMD_BUSMASTEREN | PCIM_CMD_MEMEN | @@ -392,6 +392,7 @@ fsl_pcib_attach(device_t dev) if (sc->sc_pcie) { ltssm = fsl_pcib_cfgread(sc, 0, 0, 0, PCIR_LTSSM, 1); if (ltssm < LTSSM_STAT_L0) { + /* Stay attached, it may change later. */ if (bootverbose) printf("PCI %d: no PCIE link, skipping\n", device_get_unit(dev)); @@ -432,7 +433,15 @@ fsl_pcib_attach(device_t dev) return (ofw_pcib_attach(dev)); +err1: + ofw_pcib_fini(dev); err: + if (sc->sc_irq_res != NULL) + bus_release_resource(dev, sc->sc_irq_res); + if (sc->sc_res != NULL) + bus_release_resource(dev, sc->sc_res); + mtx_destroy(&sc->sc_cfg_mtx); + return (ENXIO); } @@ -680,9 +689,15 @@ fsl_pcib_detach(device_t dev) return (error); sc = device_get_softc(dev); + ofw_pcib_fini(dev); mtx_destroy(&sc->sc_cfg_mtx); + if (sc->sc_irq_res != NULL) + bus_release_resource(dev, sc->sc_irq_res); + if (sc->sc_res != NULL) + bus_release_resource(dev, sc->sc_res); + return (0); } From nobody Wed Jan 21 06:34:08 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwvYF1md7z6PlLh for ; Wed, 21 Jan 2026 06:34: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 4dwvYF0W6Kz3dCS for ; Wed, 21 Jan 2026 06:34:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768977249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uqhkosCdFQtUvlUeDcvGOVJFGGd5XA9rlz7POEx9RIU=; b=H4btYm2tcs5HJgzkkg0T/Mr8VRrp7c8NNloSPWffONJ8kPqGsgOT8w8/LWI9cB93qC0QGx rSwc3WqB86lX6IRzVpVb0yQbUuM7Nk3PTM3M/taGqUUuBbvAMptGJEIK+vBHyy3pH2HGBX 1BLJUAkbLhOURzoo6wrgNs38S0xlCEfHBUbehTegfNNGfyWUx1OTW99r8NkCR5F5ADCx42 18+5ZJEIkSrv/RV8GMHmcuDxaAl0J+3F7wPXCA+lGuVEddfrjcKfdAG6w+dDcjDt8BEyHD Ggh4zRqPCqT1LaiAzsRGOSXhQyirZd/N+pvaF68VgMK9jlbP5n92Qx8ioUtlUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768977249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uqhkosCdFQtUvlUeDcvGOVJFGGd5XA9rlz7POEx9RIU=; b=beq9ZVTYN1z+pPA/A8IpD30ka10ka59YPuUG8N2L38SHiafH4+IeAde44gyJqV2T5NrYiY 4c9TPGYhrWzcoReMbCJSTmQuErqrXtHmCkcJKP3UngDtWKu3L1jtAotIEJmWsyYu6Cjuq1 NsOFMdhvwwf+lbji1zH3WZcerqyjcip1YdVSDeGnha28jP+2yN11CiXC+zFXu+5imcS4NL zEaLWAZmnxtILpE4da3i0QgCpChChnmusCGKTE/JMUlRB81BR3LYRz2I51IsA9oZ8qddCi 0uUvL6U85833i72HSLFebk4s4UdIXySsyYG2Xl0SvKup7vSGnzga7PUWhpo7QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768977249; a=rsa-sha256; cv=none; b=gy6bUKeAyTG2Wm5kTTK7dkE1C6Q5y/KgkUTx3jQURkMdI5qSqiBXOTmpp5FtiL/kI3wak2 Qyte9h1f5UYOwrxgvUNpBOLFKbEhOt8Y6Isd0uyc6meg7mQZ/zc5lUQee/pPLJAGtTqoqo oezhC/IfAuKnCpSIFSbcPee9AoqpAiSIPCMeFDgXSt924/d0KoQ4kZYHCRkmwRIGbb4+YM tnH3GGq86zJNAfDICgg3ndy8Y5K//jumrwM5JFK95IrRl11u2eJn1iKG7bhmjPEugs55ox o9g2Dz+RplqLd4CdkD7Iqrqa3dO81EhH1kjBxzI1HnVMB4ylemfEnEfN/HrN7g== 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 4dwvYF0416zcvK for ; Wed, 21 Jan 2026 06:34:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 442ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 06:34:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 53d6b23765ca - main - cron.8: clarify system crontab format List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53d6b23765ca27ac7eca4096b2a83e84631c4ec8 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 06:34:08 +0000 Message-Id: <69707360.442ac.6a268f92@gitrepo.freebsd.org> The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=53d6b23765ca27ac7eca4096b2a83e84631c4ec8 commit 53d6b23765ca27ac7eca4096b2a83e84631c4ec8 Author: Xin LI AuthorDate: 2026-01-21 06:28:39 +0000 Commit: Xin LI CommitDate: 2026-01-21 06:33:48 +0000 cron.8: clarify system crontab format PR: 234504 MFC after: 1 week --- usr.sbin/cron/cron/cron.8 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/usr.sbin/cron/cron/cron.8 b/usr.sbin/cron/cron/cron.8 index 782bbce2fb6e..23a295393df5 100644 --- a/usr.sbin/cron/cron/cron.8 +++ b/usr.sbin/cron/cron/cron.8 @@ -19,7 +19,7 @@ .\" .\" $Id: cron.8,v 1.2 1998/08/14 00:32:36 vixie Exp $ .\" -.Dd February 9, 2022 +.Dd January 20, 2026 .Dt CRON 8 .Os .Sh NAME @@ -53,14 +53,15 @@ for crontab files which are named after accounts in crontabs found are loaded into memory. The .Nm -utility also searches for +utility also searches .Pa /etc/crontab and files in .Pa /etc/cron.d and -.Pa /usr/local/etc/cron.d -which are in a different format (see -.Xr crontab 5 ) . +.Pa /usr/local/etc/cron.d , +which use the system crontab format described in +.Xr crontab 5 +(including a user field). .Pp The .Nm From nobody Wed Jan 21 07:18:18 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dwwXB2Tnmz6Pnq2 for ; Wed, 21 Jan 2026 07:18: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 4dwwXB1cXzz3gx0 for ; Wed, 21 Jan 2026 07:18:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768979898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KyBJ1+3yXPExyH5L8LDjt9RxJiSk5QaP5TEENVV5ISU=; b=sdfxwr8ZA/S1is8/Zrk1LOVVYTwBhQyW4idTIoi8h+jZfUUaoHpHpoP5yJlDWsPfaycSKC e6N9wORTnxTKe6+tVSatV0ORZAA8s5ghn/P9usbHtPAJJ2zVQHZtUvEp9wG7/4e0wLrI5i +v8QumdswISUZe1KLRlQv5/KxSGluxPrmYP/T12P1oMtlGf4kFcfYXHhg7L1Ni+bh0GRWO 2YWsIqx9eGWoC1wDzN1AD1iSrddArvaGcSoA+Lc8YCMkVYgkT6vlZpHwkdgDOu3AvGSrVA 7kpQLhyY92FaLJI9T1yHjgMQ9ZuK/DJ37euzFWv5ZVuBnBRoipPev6ttCwdRbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768979898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KyBJ1+3yXPExyH5L8LDjt9RxJiSk5QaP5TEENVV5ISU=; b=QZLtl+6XlTuHyheZtmXU1nVSBc+SfurwJPBtGcyhVy5V+VaCunzVarUVFgxY9iaNGJWXbr UI9dnkJj1oVyxnwIaeviIi6vWuRuPdSqJQslDNZH96dKxrIDUPHvv1YgCuj1MMVH4t2bR7 I/+O+P8GiFHwNhJr/GHslWSJ8HKVghsWlk3otSU7/PEnT3qD+DB2FvIyiPm5EGdVczngtv bcF2a6XJ7t3ex2tsMgewvo9uIvhrLSc2oxDgktoB2Y7MP4Yd4FTB/yVyufofiO3sNuZ1Ke 6KlQOHmWgRqEj359zx5zaoJakt8hgklQQQfnE1SUQRq1j/K6uf594cz6yuRCvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768979898; a=rsa-sha256; cv=none; b=pOHXtF0Je+1OdDFUXMJOLq5qwH5adtjQVJXybVu3fY9pMNtwkQx14BQhIUAzfgXqpqVMio 3zwZMkTQpjXbr5v6QvaN2SMEX1S1iAuzDA5rRiANcnodHjXy+Yz7z1Ua8LG4o3BzqdWtU7 UFLZVsHnScYun6arpf2hAwm/2vaMnT4Uwarm6wONAWIYU7lyzQtFBDClbvaZSLPJZcMBPc /GCSlfSx39nsFvsBrY4UXhO2VEOVSQCOmglfKuAkp40CdRhHT1MF298bFdtCY0SdcOIL0w /SrgRORW8CGW6Kp1ybCU5ucV0/FC649klDiP3MiEjwOAPSxuTAdm2icszVvoYg== 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 4dwwXB0xkzzdt0 for ; Wed, 21 Jan 2026 07:18:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8df3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 07:18:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: d8b8dc776b7c - main - dpaa2: cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8b8dc776b7ce28bff8939dd185b4d6554b5e351 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 07:18:18 +0000 Message-Id: <69707dba.8df3.19765619@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d8b8dc776b7ce28bff8939dd185b4d6554b5e351 commit d8b8dc776b7ce28bff8939dd185b4d6554b5e351 Author: Michael Tuexen AuthorDate: 2026-01-21 07:16:46 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 07:16:46 +0000 dpaa2: cleanup No functional change intended. Reviewed by: bz, dsl MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54805 --- sys/dev/dpaa2/dpaa2_ni.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/sys/dev/dpaa2/dpaa2_ni.c b/sys/dev/dpaa2/dpaa2_ni.c index 98a6c6047188..eda5bab78bde 100644 --- a/sys/dev/dpaa2/dpaa2_ni.c +++ b/sys/dev/dpaa2/dpaa2_ni.c @@ -2598,26 +2598,10 @@ dpaa2_ni_ioctl(if_t ifp, u_long c, caddr_t data) break; case SIOCSIFCAP: changed = if_getcapenable(ifp) ^ ifr->ifr_reqcap; - if (changed & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) { - if ((ifr->ifr_reqcap & changed) & - (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) { - if_setcapenablebit(ifp, - IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6, 0); - } else { - if_setcapenablebit(ifp, 0, - IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6); - } - } - if (changed & (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6)) { - if ((ifr->ifr_reqcap & changed) & - (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6)) { - if_setcapenablebit(ifp, - IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6, 0); - } else { - if_setcapenablebit(ifp, 0, - IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6); - } - } + if ((changed & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) != 0) + if_togglecapenable(ifp, IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6); + if ((changed & (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6)) != 0) + if_togglecapenable(ifp, IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6); rc = dpaa2_ni_setup_if_caps(sc); if (rc) { From nobody Wed Jan 21 12:36:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx3bZ1bp6z6P7w4 for ; Wed, 21 Jan 2026 12:36: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 4dx3bY5GMkz3FKb 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 4dx3bY41qwzmmD 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx3f7245xz6P7rG for ; Wed, 21 Jan 2026 12:38: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 4dx3f71FWZz3FjC 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=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=xk48vM6uEJQduxXUTkZHKD8jMn58chTrBcpe4ny0L+U+Bx4qFrgb1sjvdHCIliuVoUpOEL ybgudnBMQNFBOVmzWwrdUPlnaKho0ix199whAPH5K0Ns7epWXtcLcUcM/V3C7il/0Zwgbv u9eOjAFy7ygBnoeb2n9FdKKlbfL087GwRnpZXdaPRYXn/8R+0cAnGHOjPiydTpvzl57Ffc UIbDfZ+nMnT5ufO7MTF4NzZE+PXnogUHoMNbYHrNudMxSNdwY4tU+E1trGuA4DJp+JGh7/ iXxUqlgXNw8sgGxGytAA+SVFzVpShe0siNY9KzjW9zoDAygKRy1bqy4+AuXQuw== 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 4dx3f66cjszp1K 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx3fd01ddz6P7G7 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 4dx3fc69jTz3FqL 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 4dx3fc5fvNznRw 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx3g83FpLz6P808 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 4dx3g81jTnz3GD4 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 4dx3g81GP5zmmG 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx3jl2PZpz6P85Y for ; Wed, 21 Jan 2026 12:42: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 4dx3jl1dPDz3Gjw for ; Wed, 21 Jan 2026 12:42:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999323; h=from:from:reply-to:subject:subject: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=ul8Bt4OlGKDgaKotufyFIRoQWORhT+fisuJczAdWFf8GY8o9APmlWnecw6lV4qh6y2jUBJ 901j3RlPq8Iid90l9nzrIlKSokkm8toZ9xg9WDMs/cF9tu3duXhD7+kEK5fh9ROzaLkaFk FvfTGd27yULIWJRyejC0vNUkjnM355T3gF9r1w5VtK6Au+ZBsjLSHsSLkdNPcGS5mY6Cly Nraim76nwio8qZKT6XAo2V4G2n6pCMChfmMBqzODwi1woAg/D+kFbIkVudJeHBhIKnyG3K Jzy3/DGyKoDuTUCciEU4PQ/aNRJBXVDrHPgdCai5pAJTvFg/GXSRrdlmUx9qSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768999323; h=from:from:reply-to:subject:subject: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=ZA+RyVQ+/BIgSYlM5JsNoeVPSdnLkoGBtwNdbV8VKuBPIQeXEam+SVF4TE8iinxNSUVuXX GTcxFmDL3YIgtoSb8Oq6yezmuV+hb4tTsBfVN87SevVB5KC6UwOhNuZPBr6UrIchjmO9Hj v9evLgaPPGRcOwnA9X7tpoN+5G8OShLGfXHHLg2W8lkqX85EHMeHPK8/4qUsSteBNGFvjD D5/rneOC6dxTEH5yyhnklr4kEG/Bw0b62Eo+h4lXz5OL1pm1cySUK0+0ccH0LrqXar3zSR aQ0Y132cEyTeRmKNITa2IZTOyb+ur6K7D9qzLwgE8nCG/bl8IcyUeqi3Qv9HAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768999323; a=rsa-sha256; cv=none; b=k+uq0vuK94pPKal/XPjKDu0yxf7l95bCCzupD5BwXHSaBugumyBQSxgN0SplNoN4FU0PMp KDyCmXQXvXTi7J7YtmusS+XG7MUc4LII0g+XLMtgLzVWV+qLINei3OxMaAOSNNhDFGUaAE 5QpR6iAvjo3ZwPQKUO7MTvpVANRZZKhpBDESdyWldWIlMG1cjPzA58pzgPiPqmPCpxoq80 Ca4S89nrJsxZ9O9dyk54Qu7Y7VGq1X0NwKWbHN39xYxNEmKedvvHXO823QkoAIBiPMMyca 2yH0fWP43QWllZBXOEGaMWk/PMxJjxRtLkkDvLbmzKpf9C+vYFywwYa38F1gQw== 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 4dx3jl0xyczpDG for ; Wed, 21 Jan 2026 12:42:03 +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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx3m368TKz6P8X3 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 4dx3m350fdz3H6Y 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 4dx3m34V5szpDN 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx3pW33kTz6P8rK 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 4dx3pW2TW8z3HZk 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 4dx3pW1mPWznn1 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx3sX2qBGz6P8xL 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 4dx3sX1k80z3HgT 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 4dx3sX00g6znkh for ; Wed, 21 Jan 2026 12:48:48 +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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx53F18w3z6PD9r 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 4dx53F0Y8Kz3N7h 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 4dx53D6wwczqn0 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx5Xt4N2sz6PG2V 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 4dx5Xt1Tf0z3Qgy 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 4dx5Xt0zsLzqr3 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx5jF5P4lz6PGYk 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 4dx5jF2gcCz3Sjx 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 4dx5jF2HLyzqrB 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx5vt0W6qz6PGJ4 for ; Wed, 21 Jan 2026 14:20: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 4dx5vs6PwJz3TdY for ; Wed, 21 Jan 2026 14:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769005257; h=from:from:reply-to:subject:subject: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=qV8x6CNd0oTnwOYaPs7GkYYha+JC8LAKH6UMqlyZV+DjiRCRrI9mKrPTkJFsmZZsFtEVy+ e6JYTcG3dPCwUc6nTfRZyTntoWEJ6sHRHFaB6uWJZb9nBvCi1ZAZkcAHWnTAldqgWZm+d+ B/x2IyrQ3P5mwRAXo/n5QmcEsEV6MMV3WwA6o1Vil6VdH59E3GvH5wP8tXY8JE+bEPosLz SsqlgykSCCk4LZ2t5PuXnovtqMd+Yzs7xVIOdDKc/lGOhUtJoJaFT/5SHu7SKVz3FdL7nz PgF3fmztztKF1UtcZdULJjEy18tvJmtckgr3nyD9JPNCGPsaIWGKKbOn8qzsag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769005257; h=from:from:reply-to:subject:subject: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=H5RS+4QyVzkyGgkiQuEVHhM9BtqdEwF/ygQ+AJ8KBx8DA/GBdZaB+ybO2cfKsMjRys5qcZ 3oN2bydUks5dOgA5oEpmH5pYP/DLJPoxAuCPL1l11QVPH9Y1GOls9GTJ2GW+qX9Na0VleV Q01leJhPVNfXzKdi1rQeUF0m5gwILcqt9+luIycxzBcIMAY1N+gog4sT9UMN2z97Zj8XGF v7Nn6yCiYSv31VfrG3rEYab7OZju1D7PQrtEXFC8taxRGwI34UOxEHp0MXOiKaybKq5KC/ cyx5rlSZjwY5I9N5TWoY2npSJTMpJbvf713kzBtpReOVZttXaL6Z29NnlSJzLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769005257; a=rsa-sha256; cv=none; b=mwBewOPlLEW3ac8DjFqKxFFuShvezqa09erFKfaHzfcN1Dfm15A/8ESkOT13yOacN2QOew WvvVFvbkwHp4zGbTQMy2cW9R7kYyEawhU7L+u0P8o9VYdQrM77JlNdxOr0TERene2cU1tV bVPoAd+7QCR1srU5bRJS1ztr+E4jqzjt/jinRkCu/KVD1k1PxBjUFv5lCktMPZGrUlnWjp k+7CfRyvuHwMc+4Ya6CPB4dxL0J8Cl+DFQuL/VthbB/3A8HVUWPoZaopA8+jvcK08iOuaj 31D0zPeyK+TyJztZKQu3TRIBAijq6FQWFoQ+HQXrsZdQqjB4seFaiX8anTr9IA== 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 4dx5vs5z0XzrZN for ; Wed, 21 Jan 2026 14:20:57 +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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx60Q1nkHz6PH8F 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 4dx60Q0hGyz3VRd 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 4dx60Q09fxzrlQ 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx6636Jkbz6PHDc 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 4dx6634VJJz3Vqj 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 4dx6633HdQzrbC 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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 14:40:53 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx6Lt1pFWz6PHsS for ; Wed, 21 Jan 2026 14:40: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 4dx6Ls6G1Xz3X92 for ; Wed, 21 Jan 2026 14:40:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769006453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V1+b+Opz5zpLMidzj+ml6FdqPaHgxCGc0z69XEXPy08=; b=cvlIBL+0VZrkJr/t2jMXXBcxy/b7WXDfBQYwRtS+cyuvvceCdOdBK0RGSbtHTCse2Jsm+d Fykd5ikFZY+M/4aG52xeogjdREkLiHtz7B2HjyzjfbvvDeV53QLg0yu/U4yxqV6PEbo4jb IKPLOtTIjFS6mbu29QzEx9WE2RIjazwfniqCKvd6yMPt1ukqi0nI6VQmLw6yi5rozpNaXT Ac0FJsF/d6q8M3UOJ505xmPncpyEIJVciTOBEyXM62UdDMgWom7hSQy8Rzp44ZCLs2JmnT VmIwehQzEv0gV9eNNdbEkqnlG6JIRFZkFz+pJPTjXDY20d1M9HcTsvoeRIln2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769006453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V1+b+Opz5zpLMidzj+ml6FdqPaHgxCGc0z69XEXPy08=; b=aNzxlXHKVyhUkcH8GwkckKG4DSjGtmyWij0K2HCMl2c/lB8OHUaNAxiWRaTnfXtuOW69de 0YyjMUlLv4PydVU0WdfNem6IUHtEeJEhF7ODYDmkgWh6TCZ1J6kMYjgdOHllL1Bs39cMr+ 9IZdq8nILSOzNWKYN6CwWv8j4io9xbCUJZnBPtOVxIdOZLToCKRL2dxrHyhalnsySwaVXq M5JYkJsef54RmF8rwell9RMvY/5r3WfA6hvixUtlZZs7/z/QCCZtqwIX3vLEJGM74EM2YX p264m2qt1QWt+wd5wM1hy65iSw0J9x7Z/Kk3FDovrjm0ZM+/EDdN8Qa4Ere/gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769006453; a=rsa-sha256; cv=none; b=E2AhlH1B18P1OFrwN5kL8aOcf0tvxfOFyQDYYIErtvQkCBR29gr7J93IRVM++xy50mccJH eibHzWVOXssY3IoNxISMESQXn58+JiS4biiQxcWvDPNT3PuCt5acF2ujioupzq95L9ep1Y VkBUHVbxlqYv5gfpmt5T6DN2Nj30vaTxxkOFlyluivlLjRb2scjExq34GQyckjut4UXQdT 3s3vuHAjZr/8ycyO5XFKqsEuMp4yo7WHSl4lfS5OOw2gwwDG2cODHOwm3+pwRzAZisifhr MkHpJu2iR15bMFJmgT6IV7AvH8bPU/lSLIeHKqR0F6FD4amscz9sYpDqV3I75A== 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 4dx6Ls5fvmzrmx for ; Wed, 21 Jan 2026 14:40:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24ac9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 14:40:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 76ca619f10cc - main - MAINTAINERS: remove stale entry List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76ca619f10cc4f75e2eb5750f905f6bc55c8ef02 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 14:40:53 +0000 Message-Id: <6970e575.24ac9.280e17b4@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=76ca619f10cc4f75e2eb5750f905f6bc55c8ef02 commit 76ca619f10cc4f75e2eb5750f905f6bc55c8ef02 Author: Warner Losh AuthorDate: 2026-01-21 14:39:59 +0000 Commit: Warner Losh CommitDate: 2026-01-21 14:39:59 +0000 MAINTAINERS: remove stale entry --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 494a20f39298..a752e7d0600e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -86,7 +86,7 @@ procfs des Pre-commit review requested, email only. pseudofs des Pre-commit review requested, email only. random(4), random(9) csprng Pre-commit discussion and review required, -release/release.sh gjb,re Pre-commit review and regression tests +release/release.sh re Pre-commit review and regression tests requested. sctp rrs,tuexen Pre-commit review requested (changes need to be backported to github). sendmail gshapiro Pre-commit review requested. From nobody Wed Jan 21 15:10:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx70d33tyz6PKV7 for ; Wed, 21 Jan 2026 15:10: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 4dx70d2WGcz3bHj for ; Wed, 21 Jan 2026 15:10:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769008209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sQeIkBp1kzEGfbsuKPMFvxgX599M6ENnTkAdWHcHX+g=; b=g8PyUr5v2tNhf3SARt/AznqRm2Yz7pj+v/mV6Shf/XTkGK9q9iRpLyjhfgZ/4Y6X4W+77Y 3cCwh7y0E078M2vCXoXM88BCWhaMNVZn1e+lrcbsAQfxQmktpHo7TD/AOfj4PtIeXTVgos wrWac8VtiFXlroU60lkwo9ofa6FON6XaW2QgPRUrPByIG4fPccR5uTyC2cBQ88wTwLf6fR 1/1aQRjmvO6bvGfm/sumgd4T5sTHkZ/zNsZzMcSziiruFShjuV/9GTQ80vM4a+3DadqJlc A+d96wCjqNIqQXeKOwTAi6+5P8WeOS0wfEBUwQGEzpf1MtJdkHrYPJFei387SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769008209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sQeIkBp1kzEGfbsuKPMFvxgX599M6ENnTkAdWHcHX+g=; b=TVe9SbRtyWSbdSaUHPOSctEmiK+k6yPPPZ9uJBmniyqr8tLxTTT0/Z3qpVbePuIgKx29At 8Rvl3dYpmV30l66j2bb/orqE73/8bZgdZ77qB2qdn0RHQrxXn/xk8C8sgbzxgAlw79DW2r KajFdBbBz0hvXA9C3BpSACSeey0nZ655h8+xtWJ+p2txIoiNhgCwxTQgqvImSJaPZRPyPD 1GOaBzAdf1inCX8JpRwUxpVjqgPbLgVZ0/AM0bob0mYhQnu1puHOP1jZt0PSO7woa1Uaei ewNpcMD9wGZYPQdC/hb25ffS84aZUZ+aavlWHf9VCz09QGv7178N3j2XNcA6BQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769008209; a=rsa-sha256; cv=none; b=uQ2L/FXaXjn0e68jgXfqV9UdwYErAQ8tulTVHYKmpJ82AESPK2Y3+fft7hroKqVMXTUYON N4pZcdtPQoOUFAgdw6/q3oMOpL7wXpYy0FtJ1SgwO5qWOrWOZoy1Kr6U5rhq8Gx4VNcLsF Y/F8DCnHZyHsentg51SvgUo8oK2o/kF4aEk5lY4EV2g05Qbje6Cc3fyILLjaDVYEo+DHo9 nm/e3Qr/nSEmAm1dVZRs0EhP+PPxo28NzIuWjAxMnOefo1bfcoRPpuiG6jcqeHoivfwYNg 1DCzPDVcT1o4gfVvoQgtMt+WbCnP9Tj/f0/B3PXsjBO7Yp+vQk5kyNB0Z9anoQ== 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 4dx70d1pDvzs8x for ; Wed, 21 Jan 2026 15:10:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 269da by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 15:10:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 37de3763b8d5 - main - CODEOWNERS: Add myself for openssh and makefs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 37de3763b8d589c6916a1207bb46bbaefb75b4c3 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 15:10:09 +0000 Message-Id: <6970ec51.269da.77e17839@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=37de3763b8d589c6916a1207bb46bbaefb75b4c3 commit 37de3763b8d589c6916a1207bb46bbaefb75b4c3 Author: Ed Maste AuthorDate: 2026-01-21 15:09:05 +0000 Commit: Ed Maste CommitDate: 2026-01-21 15:09:58 +0000 CODEOWNERS: Add myself for openssh and makefs --- .github/CODEOWNERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index fb518975b83f..0bc99da6544f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -48,7 +48,7 @@ /contrib/one-true-awk/ @bsdimp /contrib/openpam/lib/libpam/ @dag-erling /contrib/pjdfstest @ngie-eign @asomers -/crypto/openssh @dag-erling +/crypto/openssh @dag-erling @emaste /crypto/openssl/ @juikim /etc/mail @gshapiro /etc/sendmail @gshapiro @@ -130,3 +130,4 @@ /usr.sbin/blocklistctl @jlduran /usr.sbin/blocklistd @jlduran /usr.sbin/lpr @gbergling +/usr.sbin/makefs @emaste From nobody Wed Jan 21 15:17:50 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx79W12zMz6PKtQ 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 4dx79W0VjGz3c72 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 4dx79V6tMRzt1T 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx7Bl3R63z6PLBh for ; Wed, 21 Jan 2026 15:18: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 4dx7Bf2f25z3cFN 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 4dx7Bf1xNVzsWv 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx7GW1jV6z6PLSb 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 4dx7GW0w1mz3cnp 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 4dx7GW0Whgzspv 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx7RK1wNmz6PLWs 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 4dx7RJ67Z4z3dHZ 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 4dx7RJ5NLcztFV 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx7VG6s0Tz6PMKh 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 4dx7VG5prSz3frG 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 4dx7VG5PTnzt30 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx8GX1xx5z6PNqL 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 4dx8GX16qZz3jpb 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 4dx8GX0bS7zv1W 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx8GY3t3nz6PNnB 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 4dx8GY1njwz3k6K 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 4dx8GY1Ns6zvHw 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx8GZ5S1bz6PNkg 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 4dx8GZ2Dw1z3k7l 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 4dx8GZ1pTGzv2y 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx8Gb5fTQz6PNf0 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 4dx8Gb3QgTz3jqt 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 4dx8Gb2gxjzv30 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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 16:11:11 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx8M34NP6z6PP0d for ; Wed, 21 Jan 2026 16:11: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 4dx8M322yRz3lHW for ; Wed, 21 Jan 2026 16:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769011871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7CYtteL/fMXRHikaJMqNBiWiG684DD/egawoI+gjpjY=; b=if+mpKNOqmRh5iZvRtJLMLwfvGCCcMJNV1Er9dAgQGGy7nx0NEo99lCgIOfGplYOvEpKKi KTPcY5d8c7wIflt3Y/JAtjjo6+2LOiB7VZnw1j5fZb5sdcCUN/KM3pAw1+8kRim7vsr4ZE nNNzmqnWVddwae39PEqRGv0JShXqwSJ9Z7+eEl4zoPjSDxX4W4/7IGC2MUOq+QlLNKkIwb cTE/TnlnFfwN61ZoVqC59nDrh//9dkRhZU+qiHmePM1NuA/89SaPqozx+dBPIkRZbOqJSJ lUeHgUQt9FLoQN7F7NMWwdA/iJVtuzZP+O8tVkAoEbwhBya2vSJiZiTlh/p2wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769011871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7CYtteL/fMXRHikaJMqNBiWiG684DD/egawoI+gjpjY=; b=AY6Osr50oHmWoxEyDdmYXLd2CXX82tcGJYL7Sd7O+AjCEp9bfEHumSSzXUgo1u39Xl/Zjy uKuLMXN+/ZdcY51U3VmhVeEDhZjUOeyuHPju8Db8nds3kij66Xsfw+ZB3Q423uRvMlA+zn UBgVup3CWbwUjw5bwIgSnXXKqZt0BVupGaawstibZkx+DaLQ0jhffVnbNkPpnWgiOAKOmG eFoMKBz9fTwF5yNTVlyh6uKcKJxCQ6qvJmAyZbupKBBBx+EOVAbwgGOkiXhQIDCOPdTAH2 ISzTTaNOSCK71lb9S+DxJS/d2OS/6HyV4Nt6fSy9R130HF2qx7p+qEkK/JO1sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769011871; a=rsa-sha256; cv=none; b=gp//lctMAxpymevBkkNWL2LbuwdodxwGTm/8vJOAR8nBIT64upiXvppyEJ1o7EstmF20Iz Uj9C2A/C1C2E/jrDZ3JH+m0lYSln3O/VMTRYBs00aaXQk8VHR80rcSQfb6T9ppSc1a3fgl 3xaXEtx6Y7KmvtII/y/imjWgbEtrC4cIFxYjvYlljAJa+F7yAQXo/5TQY4u8t6YMOhzYY4 mmLWPRi1d1e54EbE6C9I4/zs5EjLuRJDPTDmFxILdw0nqwS2K21p/y5RgG/UdLhMIlahAz haPxeiHuXy6oBFKnJIotAWZLRmiYin7z+OfSLPfraVETJOsJYTWyxSV00X5cgQ== 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 4dx8M31STmzv5Z for ; Wed, 21 Jan 2026 16:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37424 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 16:11:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5eb1d4eec676 - main - rpctls_impl.c: Use a direct cast to uintptr_t instead of __DECONST List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5eb1d4eec67685a933cedd5a20fbec86febcd3a9 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 16:11:11 +0000 Message-Id: <6970fa9f.37424.809a279@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5eb1d4eec67685a933cedd5a20fbec86febcd3a9 commit 5eb1d4eec67685a933cedd5a20fbec86febcd3a9 Author: John Baldwin AuthorDate: 2026-01-21 16:10:53 +0000 Commit: John Baldwin CommitDate: 2026-01-21 16:10:53 +0000 rpctls_impl.c: Use a direct cast to uintptr_t instead of __DECONST This fixes the build on CHERI architectures where the compiler warns about a direct cast between uint64_t and const void * inside of __DECONST. However, GCC would also complain about this on 32-bit kernels due to uint64_t not being the same size as a pointer. Also, a direct cast to uintptr_t to right-size the cookie value is more direct than using __DECONST given that there is no "const" pointer involved in the expression. Reviewed by: brooks, glebius Obtained from: CheriBSD Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D54797 --- sys/rpc/rpcsec_tls/rpctls_impl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/rpc/rpcsec_tls/rpctls_impl.c b/sys/rpc/rpcsec_tls/rpctls_impl.c index 51fe270b13d9..22ba699a6fab 100644 --- a/sys/rpc/rpcsec_tls/rpctls_impl.c +++ b/sys/rpc/rpcsec_tls/rpctls_impl.c @@ -163,7 +163,7 @@ sys_rpctls_syscall(struct thread *td, struct rpctls_syscall_args *uap) mtx_lock(&rpctls_lock); upsp = RB_FIND(upsock_t, &upcall_sockets, &(struct upsock){ - .so = __DECONST(struct socket *, uap->socookie) }); + .so = (struct socket *)(uintptr_t)uap->socookie }); if (__predict_true(upsp != NULL)) { RB_REMOVE(upsock_t, &upcall_sockets, upsp); /* From nobody Wed Jan 21 16:52:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dx9GT5lFDz6PRjY for ; Wed, 21 Jan 2026 16:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dx9GT5408z3rkt for ; Wed, 21 Jan 2026 16:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769014337; h=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=+jL9MG2rLOOtSReqO5PnnhcgCfEWZQK5Vfcoh9Ne6LA=; b=C7uhV5RFLR6Mw49zESA+CIqmXByqp9XZknD11hEfrLsk8VzJOtA41m+wdYAMNl+CxLQYxX AmV2GwbnGfI/YPVLxM23Daq6etNlhmsWEIWh3NZ5AYT0d2txUcawjlq6Jdn8icD9NC5pAV NK2ay9maQHNF7Z1lLHyQyprcsriA7wUagevMq3sLeTohgWArXeZ4IUJ0Vo5YFDSHTYBTOl FyjECILdoUxFF6WHNRwm9aO2TadSNBWg1Sxqjoy4wES5+e6/fqr1/G+VQLrpggQq2n2Pct muOd2bbKqUr0n7QZh/UxKJQOG1eNv/TeCWprYM2TmmQ1KerFzcmJZQBYbH/eeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769014337; h=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=+jL9MG2rLOOtSReqO5PnnhcgCfEWZQK5Vfcoh9Ne6LA=; b=FQLxkO/z7P6+ZGCfpiqawsyoTLDFU0TZ+7/ugD4C4eVPUyVt149FgBz4iMYXWXVUJt6mfu EdK0BnDeUel0RsxDAnh7y0FnBmMtfvdKPpWDmpCdtXtJRhX+wFbut41DETGf6CdDeNTouy /sjbJTQDKtQNnvytI1TQb4uK1IVSYGszIg4Vidal8vLcNAYd1RqdtDIeeGCFrSpTW/KDhh Ps8DSZ/ddKMl7ITO41pxN5PvPKisvHtncREeMmq3X3a4IZbSnj5PompD7pW5cxZCyHAz1U iUryviKqHSLWkfCUmCpLbHxWRGxrrc8E8PeSErORaH7MAcEM2sKONjj7ooAJHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769014337; a=rsa-sha256; cv=none; b=V++TyB/uF4EAqNKDik0FMNxZD0eBG6NOKzGDTBxWRDIQztxMVomNhrjDPMcFDLlJ+w59JV 0sT3HrwKOrLArdupai9w0bvgGr7LECQF3Y/1AwvEx2wAZa7Co9+KkT4w3D5zQAT1N04K9l C2oNCPA768hPUP7C5eoiOH+PCQCF8SlZNP3hEeenlZvyGjz5IkHqGpSu3YL9OAeasLTbNe LGi7PMqUtFXBNrlbNvLqEb2jFkpHeB4l3ASSu6oKoif8UTfBD1uHdhYCnSnHJCUVs6OZ1g ICYVOpr1tts/PKj6pq2RZSJtLaBZPCO7tjnGq0BlzGaKkgfEP0qJxN6+h7HSJw== 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 4dx9GT4cFRzw7N for ; Wed, 21 Jan 2026 16:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3875f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 16:52:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Alexander Ziaee Subject: git: 98cb4874e2bb - main - simd.7: Add Arm MOPS memcpy(), memmove() and memset() to manpage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98cb4874e2bb9a56e1bd883ede72108eb1c39e6e Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 16:52:17 +0000 Message-Id: <69710441.3875f.7d63d4e1@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=98cb4874e2bb9a56e1bd883ede72108eb1c39e6e commit 98cb4874e2bb9a56e1bd883ede72108eb1c39e6e Author: Sarah Walker AuthorDate: 2026-01-21 16:47:19 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-21 16:51:10 +0000 simd.7: Add Arm MOPS memcpy(), memmove() and memset() to manpage Fixes: 41ccf82b29f3 (Use MOPS implementations) Reviewed by: ziaee Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54812 --- share/man/man7/simd.7 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 3343508df504..a446112e5b6a 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -61,10 +61,10 @@ Enhanced functions are present for the following architectures: .It memchr Ta A Ta Ta S1 Ta Ta Ta S .It memcmp Ta A Ta S Ta S1 Ta S .It memccpy Ta A Ta Ta S1 -.It memcpy Ta A Ta S Ta S Ta S Ta SV Ta S -.It memmove Ta A Ta S Ta S Ta S Ta SV +.It memcpy Ta AM Ta S Ta S Ta S Ta SV Ta S +.It memmove Ta AM Ta S Ta S Ta S Ta SV .It memrchr Ta A Ta Ta S1 -.It memset Ta A Ta S Ta S Ta S Ta Ta S +.It memset Ta AM Ta S Ta S Ta S Ta Ta S .It rindex Ta A Ta Ta S1 Ta S Ta Ta S .It stpcpy Ta A Ta Ta S1 .It stpncpy Ta Ta Ta S1 @@ -101,7 +101,8 @@ or PowerPC\ 2.05, .Sy 3 Ns :\ x86-64-v3, .Sy 4 Ns :\ x86-64-v4, .Sy V Ns :\ PowerPC\ VSX, -.Sy A Ns :\ Arm\ ASIMD (NEON). +.Sy A Ns :\ Arm\ ASIMD (NEON), +.Sy M Ns :\ Arm\ MOPS. . .Sh ENVIRONMENT .Bl -tag From nobody Wed Jan 21 17:28:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxB4m6KZnz6PTnx for ; Wed, 21 Jan 2026 17:28: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 4dxB4m3zZ1z3vgv for ; Wed, 21 Jan 2026 17:28:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769016536; h=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=0maPFdCZUanXOKF4iCmdVfDIe1ZIbmWBOh6Cqmn7mCk=; b=SxczM/a4pAN5h7coZPZKv4s8EKctDTYZ9/yDVP1vUUPSd9lqJiWLFglPrC/IJDWz19dzgT HgejSuzHqA6alTjeM6p8LmuzIdhcdDOGLPbQM3/cKLGGFSxk/E410IsIsn/KQp/DHjC3No OXgHi+Jm+hqiUPNl+KQZD2DCkgK4E3y2svlp2hnrs8wb69YvyT9CEzsz+fxIdvrsRTisxG ilQ4tMWfSF0dLO2OxHLUhiNelJNgo75UiBEpQb2oL/Yk8nC+COrvdRN2rfAc4q4YRVRkDR f0ta4v+2jaLGRMSMx7vtZ9diEBWRJcBqn1ObKC6WKhZ+fzFP3JPDbMX4Gm6Ezw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769016536; h=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=0maPFdCZUanXOKF4iCmdVfDIe1ZIbmWBOh6Cqmn7mCk=; b=L/XpIDatqnew6cdUgvx/FxfgdMPIavIJR0NlULAUs0AR4tPfzFppeSyhafx9t0cQ4wHYOY e5TrwrMRru7Z5EmN8pF4GDgDVft7x9e7+qqePVVWHhOvoNTa44LUInARQL/1gRMdFBsU0S STs8cccI3w6TygU7ZbJCj0IYGZezwVGu5aCXPjbBFDa9DM8uqmNoBhibm6YHkYufsjHXnO oJHvXFvx9IdgOSDjR+MvRbP4JTkmFikOV3hqkFRrQ7qdgcBa7cHwfIXAjvYO3b2oD0Wk94 FI4sSSCaL1A6kRSZbtFrXPPeVpeM3KXYMZfGd8VqXktwWijoXq5Wnj3gnUjIxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769016536; a=rsa-sha256; cv=none; b=XkseKGGXa8C/AExbwyiFZgIMcIxkBjIOh7jqBCzIgbK5lzBCiI2IYM6BJCgi8OMax+Ri+6 +zEYyVnknF1xQPSQwGjieBDxOmW7YdqotKj/nMWKYoVIrrVcc+b4CLIx6AyRwQUnK8AhN7 J/izGl34WUSfAj4K8AoyrI4b9YjUijCfMvW6+szlVbBoqV6gAgOMDp5kbYeY5/zbJFo9Kc QEa5YWwKdSdGx/ZsvXH+AHj16ADDnJ1olp9bgAMQox5AuJj89zx9dDFoUTRdZu+UZUImI+ u9WXIca0GiPSgsbf7Y1Nm0vsSWtkCk1I2MxdTNIapBhgNPhl0IPw3qjCkUU/3g== 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 4dxB4m2HzZzx4C for ; Wed, 21 Jan 2026 17:28:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d7ad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 17:28:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Artem Bunichev From: Alexander Ziaee Subject: git: 2c6bee2b23db - main - socket.2: Cross-reference protocol families List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c6bee2b23db9ec231a6fa2979093eeae10aaf91 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 17:28:56 +0000 Message-Id: <69710cd8.3d7ad.5cdc1956@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=2c6bee2b23db9ec231a6fa2979093eeae10aaf91 commit 2c6bee2b23db9ec231a6fa2979093eeae10aaf91 Author: Artem Bunichev AuthorDate: 2026-01-21 17:25:29 +0000 Commit: Alexander Ziaee CommitDate: 2026-01-21 17:25:36 +0000 socket.2: Cross-reference protocol families While here, make wider use of Dv for socket types and protocol families and reference fcntl(2) flags for the `type` argument values. MFC after: 3 days Reviewed by: glebius, ziaee Differential Revision: https://reviews.freebsd.org/D54434 --- lib/libsys/socket.2 | 137 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 110 insertions(+), 27 deletions(-) diff --git a/lib/libsys/socket.2 b/lib/libsys/socket.2 index 48b8f4e87489..fbf6b4e12df0 100644 --- a/lib/libsys/socket.2 +++ b/lib/libsys/socket.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 28, 2025 +.Dd January 17, 2026 .Dt SOCKET 2 .Os .Sh NAME @@ -52,20 +52,66 @@ These families are defined in the include file .In sys/socket.h . The currently understood formats are: .Pp -.Bd -literal -offset indent -compact -PF_LOCAL Host-internal protocols (alias for PF_UNIX), -PF_UNIX Host-internal protocols, -PF_INET Internet version 4 protocols, -PF_INET6 Internet version 6 protocols, -PF_DIVERT Firewall packet diversion/re-injection, -PF_ROUTE Internal routing protocol, -PF_KEY Internal key-management function, -PF_NETGRAPH Netgraph sockets, -PF_NETLINK Netlink protocols, -PF_BLUETOOTH Bluetooth protocols, -PF_INET_SDP OFED socket direct protocol (IPv4), -PF_HYPERV HyperV sockets -.Ed +.Bl -tag -width "PF_BLUETOOTH" +.It Dv PF_LOCAL +Host-internal protocols (alias for +.Dv PF_UNIX ) . +.It Dv PF_UNIX +Host-internal protocols. +See +.Xr unix 4 . +.It Dv PF_INET +Internet version 4 protocols. +See +.Xr icmp 4 , +.Xr igmp 4 , +.Xr ip 4 , +.Xr sctp 4 , +.Xr tcp 4 , +.Xr udp 4 , +.Xr udplite 4 . +.It Dv PF_INET6 +Internet version 6 protocols. +See +.Xr icmp6 4 , +.Xr ip6 4 , +.Xr mld 4 . +.It Dv PF_DIVERT +Firewall packet diversion/re-injection. +See +.Xr divert 4 . +.It Dv PF_ROUTE +Legacy protocol to control routing tables and receive network +configuration events from the kernel. +New applications should prefer +.Xr rtnetlink 4 +over +.Xr route 4 . +.It Dv PF_KEY +Internal key-management function. +See +.Xr ipsec 4 . +.It Dv PF_NETGRAPH +Netgraph sockets. +See +.Xr netgraph 3 +and +.Xr ng_socket 4 . +.It Dv PF_NETLINK +Netlink protocols. +See +.Xr genetlink 4 , +.Xr netlink 4 , +.Xr rtnetlink 4 . +.It Dv PF_BLUETOOTH +Bluetooth protocols. +See +.Xr ng_btsocket 4 . +.It Dv PF_INET_SDP +OFED socket direct protocol (IPv4). +.It Dv PF_HYPERV +HyperV sockets. +.El .Pp Each protocol family is connected to an address family, which has the same name except that the prefix is @@ -82,22 +128,47 @@ which specifies the semantics of communication. Currently defined types are: .Pp -.Bd -literal -offset indent -compact -SOCK_STREAM Stream socket, -SOCK_DGRAM Datagram socket, -SOCK_RAW Raw-protocol interface, -SOCK_SEQPACKET Sequenced packet stream -.Ed +.Bl -tag -width "SOCK_SEQPACKET" +.It Dv SOCK_STREAM +Stream socket. +.It Dv SOCK_DGRAM +Datagram socket. +.It Dv SOCK_RAW +Raw-protocol interface. +.It Dv SOCK_SEQPACKET +Sequenced packet stream. +.El .Pp Additionally, the following flags are allowed in the .Fa type argument: .Pp -.Bd -literal -offset indent -compact -SOCK_CLOEXEC Set close-on-exec on the new descriptor, -SOCK_CLOFORK Set close-on-fork on the new descriptor, -SOCK_NONBLOCK Set non-blocking mode on the new socket -.Ed +.Bl -tag -width "SOCK_NONBLOCK" +.It Dv SOCK_CLOEXEC +Set close-on-exec on the new socket. +See +.Xr fcntl 2 +.Dv FD_CLOEXEC +flag for +.Dv F_GETFD +command. +.It Dv SOCK_CLOFORK +Set close-on-fork on the new socket. +See +.Xr fcntl 2 +.Dv FD_CLOFORK +flag for +.Dv F_GETFD +command. +.It Dv SOCK_NONBLOCK +Set non-blocking mode on the new socket. +See +.Xr fcntl 2 +.Dv O_NONBLOCK +flag for +.Dv F_SETFL +command. +.El .Pp The .Fa protocol @@ -423,10 +494,22 @@ The socket type is not supported by the protocol. .Xr write 2 , .Xr CMSG_DATA 3 , .Xr getprotoent 3 , +.Xr netgraph 3 , .Xr divert 4 , +.Xr genetlink 4 , +.Xr icmp 4 , +.Xr icmp6 4 , +.Xr igmp 4 , .Xr ip 4 , .Xr ip6 4 , -.Xr netgraph 4 , +.Xr ipsec 4 , +.Xr netlink 4 , +.Xr ng_socket 4 , +.Xr route 4 , +.Xr rtnetlink 4 , +.Xr sctp 4 , +.Xr tcp 4 , +.Xr udp 4 , .Xr protocols 5 .Rs .%T "An Introductory 4.3 BSD Interprocess Communication Tutorial" From nobody Wed Jan 21 18:32:12 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxCTm3lV6z6PYT1 for ; Wed, 21 Jan 2026 18:32: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 4dxCTm2B9sz44lN for ; Wed, 21 Jan 2026 18:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769020332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UqPakvf1VnM/we2qaJKwXI4i1RDf7fLGWKb9yb9buNo=; b=UTtROtlEVWTL35Uz3UoVXIFrVks9h9wDqqqyrJcVq1IaJEbc2q0rc/00737w1qD5tLxVIp uuztLW63YKKNi7LEY25DiVOMOmgvnigmPRb8KPQiZwyh5VsDEAq7mjlIFryyc6lb3kw/ga Sja2GX7YO6LBzinbxCEJfuxkq6mKyeAKy8xPsNNbKERpDprQNaAlxFGM11peaCoUrcw035 jLr350U8isFcfNnhBg+XDmPFv7H8QJr3F9Yf4GDN+1ulwSPdVZ/7uoc7jHynqKerqGVUQU ahQbgdu79tg0ESHMmDcCq0UdJdGaAlyn+kRG5Z9moKI/qFzLDmXcda70jCQVWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769020332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UqPakvf1VnM/we2qaJKwXI4i1RDf7fLGWKb9yb9buNo=; b=bB6CAjobhFiYWtcPPBuqqQBVkfhK6zIZqV5rY62Gn5+eGEyJubgdU/RN4WXAKo4G8SfmU9 5Ee9kIRLKvnJpOcEKS+Tg2T3xGrqB+iQmKkwytU/Oo5+E/T+f2j750WuXeN65u7F1Ap26g GGr6sh8qYJS6w8LmlIjPBjq0YktL0MDJ86PirOilA0c8Z9Fqd338oR1XzE1lHq6d9eBAlM 6+R/zdSkxAaZ+Z/rju/2foan7ZqIAuNghLeyIdr/OmJKSWtgNNkFNaGZqAJM3S/RD7dGbB 85ZIVlzl3Kre31e8Fd/6EZ/vmIK/VNEfE5D95pz+XybolIzQj1dvT66NQDOUYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769020332; a=rsa-sha256; cv=none; b=Vt/RfBus/NqiMJKwr19IoUzX1+jhRgszWQxRuyr2HZYWYYzvepetyzuX0HSjRN36JKyda/ ybJrD1UkE23SH+paN9IcfggjIATk5LtourVLukXybfAwIvkIvwrgNXQF74rLlIT9tp/pta ibMpFMMnX7JJcBYkOLBwnbCObZAZE7iBhMkzhCsTlLC+IZCcHzokgS85ygNUwclWjn/2jA sd5OZqed8B5zojg+hJHhMzQeyUG3hErHCcjSE3NeZetG9O1Nm1PJgHZOWx4Av2X47pCrXP d7LmkIwJwtWrpsm6MWkAyo9nlMR56ujhGAz4+s8Cu2d+gXcp16EH2/01nzoHtg== 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 4dxCTm1mdTzyMq for ; Wed, 21 Jan 2026 18:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 447c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 18:32:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: e4a4841d7acb - main - LinuxKPI: 802.11: Management MIC element can have 8 or 16 octets MIC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4a4841d7acbded7862175d46dfe325b44016495 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 18:32:12 +0000 Message-Id: <69711bac.447c2.131a74c1@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e4a4841d7acbded7862175d46dfe325b44016495 commit e4a4841d7acbded7862175d46dfe325b44016495 Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 18:55:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-21 18:31:07 +0000 LinuxKPI: 802.11: Management MIC element can have 8 or 16 octets MIC Management MIC element (MME) can have 8 or 16 octets MIC. Add a second structure used by at least iwlwifi and update reference to latest standard version. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index b5051a9f7d21..c81ddf7d24b2 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2025 The FreeBSD Foundation + * Copyright (c) 2020-2026 The FreeBSD Foundation * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -51,8 +51,16 @@ extern int linuxkpi_debug_80211; #define IMPROVE(fmt, ...) if (linuxkpi_debug_80211 & D80211_IMPROVE) \ printf("%s:%d: XXX LKPI80211 IMPROVE " fmt "\n", __func__, __LINE__, ##__VA_ARGS__) - -/* 9.4.2.55 Management MIC element (CMAC-256, GMAC-128, and GMAC-256). */ +/* 802.11-2024, 9.4.2.53 MME. */ +/* BIP-CMAC-128 */ +struct ieee80211_mmie { + uint8_t element_id; + uint8_t length; + uint16_t key_id; + uint8_t ipn[6]; + uint8_t mic[8]; +}; +/* BIP-CMAC-256, BIP-GMAC-128, BIP-GMAC-256 */ struct ieee80211_mmie_16 { uint8_t element_id; uint8_t length; From nobody Wed Jan 21 18:32:13 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxCTn6WLWz6PYNC for ; Wed, 21 Jan 2026 18:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxCTn3p5rz44Yp for ; Wed, 21 Jan 2026 18:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769020333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5wFX6ddhpwziX2xlwWibKa/3rqmk03i6RKWuktvpkP4=; b=x9oIu/MO/n0zBW4ZuLzgMBBoSWduWj9Do7p0mvtmcNvspWokV17PUXm5bY4aFkUggbWk7i ZR7vk789y5Wvb3SkSnzpbwREUAPRzngs9BlAysLhnSeJMse9gCMi+2oq8WTDq/RUnvUyNK o4S2zs2IusDWn+9oDH4WldkmE/HJLcm51u+YbXtowGFYk28hvdcY/b4eRdKhis0OZgFSsz dEc2mI2x6hf7xr0TZp2Qdu4UWN7/w9PD09OE5ypZ7eYf9Nuowuxl6tvanT4v94h9TLEoTD pfKS+6tHiQx9CFYwGzIz+jLP+wBjmJuy9meql1xVuOag9yGjE0JuSc0tGyLTEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769020333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5wFX6ddhpwziX2xlwWibKa/3rqmk03i6RKWuktvpkP4=; b=fvXyKhbn7TZgecRvl+5uImFbS+4TEQKJu1BuerOrkzPaII8GpNgP1RJ18WtFS14McxRVCw Fj6qbcrEvVIxOuEnl3r/1Dke4+cWGH0ib0K1aEqePfo1yLyxNyJ00DaLrrADEoyLmd2fDo iaB+yikl7Y9Hk/MH/eqe06xPCh2ypu5zFyeCZci8MtrYITPvo51/RB4RDQQ8is0gFfFZeb 50HkI87A2i9Ce52h9rGc0c0ZzMrBqAa2CYVvgclu/DDE3W5I9i+ItKxkPPlcV7k3yU6oFJ clgSt9rc5/MOviD7xz39iuGPV7mqnRa+eUM+WgvfZWkjtYZpjEDRxSmV4Q4Szw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769020333; a=rsa-sha256; cv=none; b=hoX7JC4CAam9YbfDk1xuALDb1s2CBqm2niQljJraw+Ni4C5RBVsel3VgCB6IlpfMoRRQmw 6Gm4tqNAUO2Aln9n4wXFqPccvwosgmFlgH01NV8hni2JIZ7BONmp4HZUI0V6XbKwGvY1xS D0xfBZR0ZZ9anIzBgt0rqkVIMo+epj4olxEvzA5WgRFZrwiUyBxtlI6ZCh6sX7Tqn8xm2f 0t9lcCrlAgyD1kR2ZaAHFUwcTwBzCK4czB/Ty5SMzwK5BfoHaOb/z/KyjKN5Zgbh1/aQT2 Z1AO7iZ634q2jIRBRJVzbDGo74WsPFzoOt2IYJgIFg5vZE2WcT21S9XhThCpYg== 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 4dxCTn2nK2zyr4 for ; Wed, 21 Jan 2026 18:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44cb3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 18:32:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 5f7b5dde1051 - main - radiotap: add more EHT definitions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f7b5dde10518d4436e1ec07a76873bf31d28425 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 18:32:13 +0000 Message-Id: <69711bad.44cb3.149d4769@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5f7b5dde10518d4436e1ec07a76873bf31d28425 commit 5f7b5dde10518d4436e1ec07a76873bf31d28425 Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 18:57:19 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-21 18:31:07 +0000 radiotap: add more EHT definitions Add more EHT definitions used by at least iwlwifi. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/net80211/ieee80211_radiotap.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sys/net80211/ieee80211_radiotap.h b/sys/net80211/ieee80211_radiotap.h index d44f81b68b8c..d729323fce3a 100644 --- a/sys/net80211/ieee80211_radiotap.h +++ b/sys/net80211/ieee80211_radiotap.h @@ -512,8 +512,11 @@ struct ieee80211_radiotap_lsig { uint16_t data1; uint16_t data2; } __packed; + +#define IEEE80211_RADIOTAP_LSIG_DATA1_RATE_KNOWN 0x0001 #define IEEE80211_RADIOTAP_LSIG_DATA1_LENGTH_KNOWN 0x0002 +#define IEEE80211_RADIOTAP_LSIG_DATA2_RATE 0x000F #define IEEE80211_RADIOTAP_LSIG_DATA2_LENGTH 0xFFF0 /* https://www.radiotap.org/fields/MCS.html */ @@ -615,6 +618,24 @@ struct ieee80211_radiotap_eht { #define IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_2_2_2 0x000001ff #define IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_2_2_2_KNOWN 0x00000200 +#define IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_1_2_3 0x0007fc00 +#define IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_1_2_3_KNOWN 0x00080000 +#define IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_2_2_3 0x1ff00000 +#define IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_2_2_3_KNOWN 0x20000000 + +#define IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_4 0x000001ff +#define IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_4_KNOWN 0x00000200 +#define IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_2_2_4 0x0007fc00 +#define IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_2_2_4_KNOWN 0x00080000 +#define IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_5 0x1ff00000 +#define IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_5_KNOWN 0x20000000 + +#define IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_2_2_5 0x000001ff +#define IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_2_2_5_KNOWN 0x00000200 +#define IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_1_2_6 0x0007fc00 +#define IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_1_2_6_KNOWN 0x00080000 +#define IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_2_2_6 0x1ff00000 +#define IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_2_2_6_KNOWN 0x20000000 #define IEEE80211_RADIOTAP_EHT_DATA7_NSS_S 0x0000f000 #define IEEE80211_RADIOTAP_EHT_DATA7_BEAMFORMED_S 0x00010000 From nobody Wed Jan 21 18:32:15 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxCTr025Tz6PYT4 for ; Wed, 21 Jan 2026 18:32: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 4dxCTq4lMxz44Th for ; Wed, 21 Jan 2026 18:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769020335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2YU7MoDeUgJUsMHowzg73qhifgbxUsSLw4WOgCEoXvw=; b=o5PILOpUrcZy+EvCrfPgQVI+ILwsVdGQnemtIFuFFU39T0+slPeufO7qKaIPk0Yo5a5631 TyQJ2nQsVAXuSxtBSjenkEM8nKIy3Gi3ptJDk8D0lgp1KKvbd3vhgHKGS0BOfOfpA/WNct nxtb4xB3wb0ixfNxgNRHTa/Sk+y0UIDy/r38LUnc0H4n3kUAW96+HSegy6Bv9UkB/qlzgL KKtxoKMvog9t8l8c4CvnhEB9Bkds5Af+MWW5WtH5dn9UmyJXgcbZxMO9YzzqrBqTo95BtL z8h4jRyTsq6ILB2bItEGwRRvtQ6bnH1SqT65J2D2YGw4jOi0iQO91nwUG8fKBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769020335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2YU7MoDeUgJUsMHowzg73qhifgbxUsSLw4WOgCEoXvw=; b=kiMaA/doBwMQ3dRVK+sv+aPP+ACf1GIfQQttRgrcGxGNwTY2qiITLG9snd/iqjqT0ACga6 co9r9WRFo2osq7nfYMPl/H0V30QKWwEq60x+X5SrEivTber4Bt+AMPXpDjl7VjqDBuXbdj e6QtL0X+IW0MF4Wn2doD4NIN1GIahO74kMlwJa//UlwR0grh7rO7362lCJHyF4reiFhpch jLgXEuunVHimfFsnHM3XrHasCsjkjef6DPfVlzqao5QSivTkMJKJLcEprdlH3pc4vjj0bo n4+p1zzA55ywGunFAmpGc4p9y/0bqlofUnGtH3CM1KK7cYJMO1H8qHb9fBHYXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769020335; a=rsa-sha256; cv=none; b=DFGP8lfNd+8Q6VTqvmtgNuZCP2x7nWWFd1dXopJg8wk1Jp0g9nf3VYlxj19r3u+LeHuSF+ O1APAsCfGarrU9zSGCQL5U/fwjGf7oZORXuiFIrECkXKNLK3L2otktk0Gz2/r+DUVETRjs QWzU8GBkadv3wsK5zKwk/6Zw5QmDVduQplpp22JrFbf3K4bU2tx5NW4LjWohAXITfELF36 XELUajWiGnon+f3XAC2+JhDo82uzRMziMDetES6J+SgKoDkoIOWPNqtMN8CO4+ocFPLBe3 fvX4Wd9jy+Vl+LanYAHRXEI1wfQXatStny+VWAAF8vvdJUfr0JJuGwygzwo4SA== 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 4dxCTq3hwmzysX for ; Wed, 21 Jan 2026 18:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 447c6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 18:32:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: b2c90d106c66 - main - LinuxKPI: 802.11: rename enum ieee80211_tx_rate_flags and move file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2c90d106c66daf6dc7fb300c250b4ad0aa274f5 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 18:32:15 +0000 Message-Id: <69711baf.447c6.2178211e@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b2c90d106c66daf6dc7fb300c250b4ad0aa274f5 commit b2c90d106c66daf6dc7fb300c250b4ad0aa274f5 Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 22:47:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-21 18:31:07 +0000 LinuxKPI: 802.11: rename enum ieee80211_tx_rate_flags and move file What we used to call enum ieee80211_tx_rate_flags is now used as enum mac80211_rate_control_flags for the ieee80211_tx_rate.flags in rtw89(4). Rename the enum and move it to mac80211 as it seems to belong there. Sponsonred by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 12 ------------ sys/compat/linuxkpi/common/include/net/mac80211.h | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index c81ddf7d24b2..a9033581a315 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -480,18 +480,6 @@ enum ieee80211_tx_control_flags { IEEE80211_TX_CTRL_MLO_LINK = 0xF0000000, /* This is IEEE80211_LINK_UNSPECIFIED on the high bits. */ }; -enum ieee80211_tx_rate_flags { - /* XXX TODO .. right shift numbers */ - IEEE80211_TX_RC_40_MHZ_WIDTH = BIT(0), - IEEE80211_TX_RC_80_MHZ_WIDTH = BIT(1), - IEEE80211_TX_RC_160_MHZ_WIDTH = BIT(2), - IEEE80211_TX_RC_GREEN_FIELD = BIT(3), - IEEE80211_TX_RC_MCS = BIT(4), - IEEE80211_TX_RC_SHORT_GI = BIT(5), - IEEE80211_TX_RC_VHT_MCS = BIT(6), - IEEE80211_TX_RC_USE_SHORT_PREAMBLE = BIT(7), -}; - #define IEEE80211_RNR_TBTT_PARAMS_PSD_RESERVED -128 #define IEEE80211_HT_CTL_LEN 4 diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 6e2f3f2d8781..8d3d04c9afe5 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2025 The FreeBSD Foundation + * Copyright (c) 2020-2026 The FreeBSD Foundation * Copyright (c) 2020-2025 Bjoern A. Zeeb * * This software was developed by Björn Zeeb under sponsorship from @@ -789,10 +789,21 @@ struct ieee80211_tx_queue_params { struct ieee80211_he_mu_edca_param_ac_rec mu_edca_param_rec; }; +enum mac80211_rate_control_flags { + IEEE80211_TX_RC_40_MHZ_WIDTH = BIT(0), + IEEE80211_TX_RC_80_MHZ_WIDTH = BIT(1), + IEEE80211_TX_RC_160_MHZ_WIDTH = BIT(2), + IEEE80211_TX_RC_GREEN_FIELD = BIT(3), + IEEE80211_TX_RC_MCS = BIT(4), + IEEE80211_TX_RC_SHORT_GI = BIT(5), + IEEE80211_TX_RC_VHT_MCS = BIT(6), + IEEE80211_TX_RC_USE_SHORT_PREAMBLE = BIT(7), +}; + struct ieee80211_tx_rate { uint8_t idx; uint16_t count:5, - flags:11; + flags:11; /* enum mac80211_rate_control_flags */ }; enum ieee80211_vif_driver_flags { From nobody Wed Jan 21 18:32:14 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxCTq08smz6PYNK for ; Wed, 21 Jan 2026 18:32: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 4dxCTp3mCSz44p6 for ; Wed, 21 Jan 2026 18:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769020334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CCaSbAIneudVcwRSxOOJJINCCRyHMNWruOTptkxOVKE=; b=W9n4gQRv8SNfNJKVlH2ZpKUWgVaye16d5T6soB1Uznzav8coX22gGqjvhx4BWCPcI0Yo/E LnwmDPjzmkK/lQw1LIrE+cNUuhk1yLkbDxThxoyrbM15d84lF5eniKPoH9xhKYNLrgzmhk otS+X2SwajAIpFC3FuP+4TsYu0Ix13bmLYxHBShaK1qLwR1gCbG6vKWeg/L5BAxjdAZ+Jq PRrLPnkGFGeiO0aXD1tYLG4bHlAY24gKi+ymPasX5OAxps+qG7EIoDCXOIakYSTLnOhErR negLNTxzqxRh/HE+MliHwvSzG1t233k/6gCTFF7Qds81ANXBooVBc+W4P1vzzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769020334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CCaSbAIneudVcwRSxOOJJINCCRyHMNWruOTptkxOVKE=; b=A6pObVxI+3RIa0AiF+mlbGcmMZs8LcQkbSgCHs9WHejD/O7f+GnAMBNqXkL9vqY5WOu2J8 NF5VQEL+YXsZmJrujT6ek1CND6Yyu8iFZWZRxrHG5kb6txYEzw55o3wm+/inriyyvAiqg1 30Ykl6JuzTNAaPEyLPZBy5kk5wp1qkPjgoZb2hd3vV1N4uVRM+EVl+bxjvudFC2xWXgjfO 5evrWqbqTJiOg8XOB2pJBEd0ANN0FcAK34N+xAstouxmEDUG7vW7ZOI6iDCT+Ka39UHkhZ 8gjPjjLE7YERlN9d9lr8HA5ts7txczpuCbDf2AqXQcCd9t7f2ai1kJlSBhJeQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769020334; a=rsa-sha256; cv=none; b=MzJmdjzeWhoQyDAg03XKkOfBJ8zPwnkz6dlUEBW9E+PPWcW4Gr1k8UzlqItEg4dBceXG7N JPGNn3PH/3t4D6u0lJI9h6ogXcmwUYtypTQoNXhbOopAnjE18VowOUs2KvvXMlkK6mMsCL 8zf7tmfNQIbu22hwmOVAc10pqn5XiTE1GVLA+EGET5AeRZVEAbSEtQ0ZzugYiBrtZJBp+6 C7guodDqLVTDjhlRUZ5QYchVq6R0QEOf7OR4929QvvVLRQ3b0NqLbx3Ucq2IXzs/rjwBnt 4///eTF4kgAc6MvYpSDc57RNjcbydohyHBF++Sc6Ltywycf59XiUwrbvTAP3dw== 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 4dxCTp33qhzymw for ; Wed, 21 Jan 2026 18:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4383e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 18:32:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 18de28308c29 - main - LinuxKPI: 802.11: add new field to struct cfg80211_bitrate_mask List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18de28308c2916d18fca4e9d8988910176b14951 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 18:32:14 +0000 Message-Id: <69711bae.4383e.304a8b2c@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=18de28308c2916d18fca4e9d8988910176b14951 commit 18de28308c2916d18fca4e9d8988910176b14951 Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 22:44:43 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-21 18:31:07 +0000 LinuxKPI: 802.11: add new field to struct cfg80211_bitrate_mask rtw89(4) accesses eht_mcs[]. Add the field to struct cfg80211_bitrate_mask. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 4b21f82a0762..a8ca560a1ec1 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -152,6 +152,8 @@ struct linuxkpi_ieee80211_channel { int orig_mpwr; }; +#define NL80211_EHT_NSS_MAX 16 + struct cfg80211_bitrate_mask { /* TODO FIXME */ struct { @@ -159,6 +161,7 @@ struct cfg80211_bitrate_mask { uint8_t ht_mcs[IEEE80211_HT_MCS_MASK_LEN]; uint16_t vht_mcs[8]; uint16_t he_mcs[8]; + uint16_t eht_mcs[NL80211_EHT_NSS_MAX]; enum nl80211_txrate_gi gi; enum nl80211_he_gi he_gi; uint8_t he_ltf; /* XXX enum? */ From nobody Wed Jan 21 18:32:16 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxCTs1vb6z6PYHC for ; Wed, 21 Jan 2026 18:32: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 4dxCTr56g4z4507 for ; Wed, 21 Jan 2026 18:32:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769020336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/b19gIseMN2BgyJd5xgfQ85votNa/zTKUkbOcxSdCpI=; b=YFXDsGkZZZvYXoscYNhtu4XqbOIIrXQe3zTnLvPbsEOD7qiOCh4D90yM7KKcrHcSsDMW8f MntYfWJnR6hIsGAjgDiV/hrNkFI6pS4S/Kw+LEwD6+31lumLLAIsFxfnqRGpwFg5ihPaU6 /xeLJCwXHxq2MQzowBZeEiHRJ3dnVxX2kgBtmG4i0jfmAwOw7VS+3uP1IKAenzeOZ2eakj TE/BiMk+ldUd3kIQDP8jafC3OUJnK+FkiWX/968F/wlX59tcYdxcj+dUpR3eOrNudjC3xz neg2wW0+nwW8BgQvDaXnqFT78W/HwWl8wOEuAeBBuAMSdUMxmUlsH7Qpf032zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769020336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/b19gIseMN2BgyJd5xgfQ85votNa/zTKUkbOcxSdCpI=; b=H15RKPB5fxLn884wZVMSbH3jZ7RXC2Lsb1+u+syIAxnBBznQF5OUu1uAAN6M5bB8WBoP9l fb1Mu2Qywh7ZaEGiNE8EBSMHtSRB/5fIVnkr52R1DTfSXofpU4QyqdFT2OK1QpOX6YSVW3 tGjCThcu/C6XVHb2u6Dh2QNDM+tjjzmVaXi3SFmim3bXulehBYh+iq56PLNmJe6T0M2KO8 a10XGP/2QhGL6/EbKTqHXEw+9qpqlzzxP5b6c0Nvkb2YxjJ/dCwCmCXSUg4EACMZ4m+Whv Xe6dprMR/qlpwiDlqp5/+11+xcRY1nEDFhrKfjKmvEGRFGU/AHK4tUhE/iYnFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769020336; a=rsa-sha256; cv=none; b=C44pzmDtHFSyU/3ck1Ik8BrMd213hbn9grB17GjC67gsPyAYXEeHsKBhh5ecqPbwtS6lQ9 Akjv+d+F677gsIBoKvrhD0QaJxCByIYGu1HPwm66pokQGs/KSDBobMF9P+qStIqTfFvNG7 e3iaINCAKpDs6LDYnXSdQdrHhRnRuAYyUAxsvOZiTZkAt/Q9/8lypwi26wcVURXuGfgCFp gADpXF9kUPA4R+c7i05dOzeDid/B+0N0+yR8QAQOauFXn45p4+XQf7AhU0QGNpD9G9pKSh DJBS8uDJ1T95HCENv6whawBK3JP4AthBZijVMFkC53HHf9oWiBaRos+UFBP3uQ== 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 4dxCTr4RtXzymx for ; Wed, 21 Jan 2026 18:32:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44d00 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 18:32:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: f1d7eea9dc1e - main - LinuxKPI: skbuff: implement skb_queue_splice() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1d7eea9dc1e78ecd247e060f4e8395ba4e77346 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 18:32:16 +0000 Message-Id: <69711bb0.44d00.5269e32c@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f1d7eea9dc1e78ecd247e060f4e8395ba4e77346 commit f1d7eea9dc1e78ecd247e060f4e8395ba4e77346 Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 22:49:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-21 18:31:08 +0000 LinuxKPI: skbuff: implement skb_queue_splice() Add skb_queue_splice() and use it in skb_queue_splice_init() which already had that functionality (plus the init bit). The new function is used by rtw89(4). Sponosred by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index 2e560a120e41..c43d6daff5ee 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -770,7 +770,7 @@ ___skb_queue_splice(const struct sk_buff_head *from, } static inline void -skb_queue_splice_init(struct sk_buff_head *from, struct sk_buff_head *to) +skb_queue_splice(const struct sk_buff_head *from, struct sk_buff_head *to) { SKB_TRACE2(from, to); @@ -780,6 +780,13 @@ skb_queue_splice_init(struct sk_buff_head *from, struct sk_buff_head *to) ___skb_queue_splice(from, (struct sk_buff *)to, to->next); to->qlen += from->qlen; +} + +static inline void +skb_queue_splice_init(struct sk_buff_head *from, struct sk_buff_head *to) +{ + + skb_queue_splice(from, to); __skb_queue_head_init(from); } From nobody Wed Jan 21 18:32:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxCTs73hkz6PYHD for ; Wed, 21 Jan 2026 18:32: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 4dxCTs5PS6z44rk for ; Wed, 21 Jan 2026 18:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769020337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3TmMLxEDwUUeMScMf3inhbLYRBxYxTEP0u9O5vtbFkY=; b=ZR+UlMRqY4xDxFevBNnfB3mm0zDnNupGIXLODsqCxjtkFFBG6+ON4/e3PRWzL5iNm+ua5y ZeL61UPFv8VB6EdDeVeHXQufU4Zl9O2xnkVf3VN61Ff8aXqt+dfPFtSTsZach6oxMrTGeL uEdYLcKmFSqweS/4fzjLHsa5MRSSfZYza1ivF4VXSh4Q3oha0M1QAc1oD01K+pEG4rHDuy aE66Pb3ny6VqkmDg5eKig1UpBU/HnoXU2ZEfyVgbcOp7iIM0GJUJCqXq44UXlytlbqghBQ +4GfzkmWezKbKLmYfsVMdzCGOtsa+wvaZy66lNXbqLgd8o0GhipeanvbhLkXuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769020337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3TmMLxEDwUUeMScMf3inhbLYRBxYxTEP0u9O5vtbFkY=; b=KT4RSk+yYWtR9MFtM2nb7dKnYuIy7U2UFV+oZ7MKe7nH/sjgKI6IHk1WYABvq/pNu7B1+D 8LfvLJ5SGO5uKaJWLs2HlbI3RJhoHNFN8rGVuUwRwr/fIFCP4e/Krr/obVBs8mznCpYlkX WRYZWLsVu+lnvIdBRXSSsz9CJblPZhpbMsdHlF9I2HR6sQnt+Wa/sEszMmF8tS6NT18r0e iOYY42BVfDqadEdNcFM91lz7+TxrfmXuKB9mxX4iRB3c+rWrfJ3gjK4+ephzdGhl4BpmFj eML6+3IUeggIIrBT215E0SOITkM4tgXWLJ2upP6yOpDrM4l3J+6rw4t/HYqYfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769020337; a=rsa-sha256; cv=none; b=PMdPKqDrdFI7ustBz5uxTCcmIT4oRIWLOMjJE4dxZFuPwmw/npGmoYPH5RgNlmTP1zAdK9 adytKEIVyDmY5e8tyDvkYmdZq9eMljQAI+OhhrPKmvKwC7n59BQbgvW5gQr3UaSyLdLAhb JJLYXlbT6aAzmQt8v01dFF9L+bVmF8NGn9yXo2wAda0dtdanIc6Wbn0pYxNT1U0FrVNOrM v9x+zjW05VXVRZy5KDvIFWMZaEwDnWd1UCFujzFKJNPDkizMRQqQbNAgzUqE9Tk60gmxgf ySQF5hZqJSs8rHkSYLeyYwt7gHTCHEfLjOc/vpintjVtSYT0G1BmPpqvYguYew== 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 4dxCTs4z9Wz1036 for ; Wed, 21 Jan 2026 18:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4420e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 18:32:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: d4898c6e01d8 - main - LinuxKPi: 802.11: add more defines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4898c6e01d80850e4a93a1aa805c44b5f8ca63f Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 18:32:17 +0000 Message-Id: <69711bb1.4420e.53d0cd44@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d4898c6e01d80850e4a93a1aa805c44b5f8ca63f commit d4898c6e01d80850e4a93a1aa805c44b5f8ca63f Author: Bjoern A. Zeeb AuthorDate: 2026-01-21 13:52:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-21 18:31:08 +0000 LinuxKPi: 802.11: add more defines Add more defines and a mac80211 op function pointer used by mt76(4) at Linux v6.19-rc6. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 1 + sys/compat/linuxkpi/common/include/net/cfg80211.h | 1 + sys/compat/linuxkpi/common/include/net/mac80211.h | 2 ++ 3 files changed, 4 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index a9033581a315..d1eba94a3ad8 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -219,6 +219,7 @@ enum ieee80211_min_mpdu_start_spacing { #define IEEE80211_FCTL_TODS (IEEE80211_FC1_DIR_TODS << 8) #define IEEE80211_FCTL_MOREFRAGS (IEEE80211_FC1_MORE_FRAG << 8) #define IEEE80211_FCTL_PM (IEEE80211_FC1_PWR_MGT << 8) +#define IEEE80211_FCTL_MOREDATA (IEEE80211_FC1_MORE_DATA << 8) #define IEEE80211_FTYPE_MGMT IEEE80211_FC0_TYPE_MGT #define IEEE80211_FTYPE_CTL IEEE80211_FC0_TYPE_CTL diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index a8ca560a1ec1..94d34fb9dc0c 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -124,6 +124,7 @@ enum ieee80211_channel_flags { IEEE80211_CHAN_PSD = BIT(12), IEEE80211_CHAN_ALLOW_6GHZ_VLP_AP = BIT(13), IEEE80211_CHAN_CAN_MONITOR = BIT(14), + IEEE80211_CHAN_NO_EHT = BIT(15), }; #define IEEE80211_CHAN_NO_HT40 (IEEE80211_CHAN_NO_HT40MINUS|IEEE80211_CHAN_NO_HT40PLUS) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 8d3d04c9afe5..18891d035094 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -1103,6 +1103,8 @@ struct ieee80211_ops { void (*rfkill_poll)(struct ieee80211_hw *); + int (*net_fill_forward_path)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *, struct net_device_path_ctx *, struct net_device_path *); + /* #ifdef CONFIG_MAC80211_DEBUGFS */ /* Do not change depending on compile-time option. */ void (*sta_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *, struct dentry *); void (*vif_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *); From nobody Wed Jan 21 18:32:18 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxCTv35L6z6PYKw for ; Wed, 21 Jan 2026 18: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 4dxCTt6y0Lz44rw for ; Wed, 21 Jan 2026 18: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=1769020339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=55hGRVFnk4zz9NOt9+lyLbG4Qq5lEcptGnOf7lyvJpE=; b=GUyEanUyXpz1Uv68GJGkJSU9CJStS/BtK47ZX4Q4vfYLiKYCHY0HQ1vagVu49nbsHdPtQf Qwv5KH9vHVxNr14OT2c5KvJuHCrTpbPadxNaBcUfBcmvIN2Mpd4XKxpSniTS9n3K6aWxhT HtWURdeqHMoTcY3pzhjj5soPJwdycPcUrcOcmBpWJcUKxkRpKTDwYjHg7Oqwoawxzz5WBM q53KKaYW883J7+EDqK/JCmf4vWnMdV+z+wSniRtGNxfGB4tHigccfnp6N7i95x8Fb5nXEj InoQsoN8Dpp9rMl77S2hwofHgGXYwY61QBoaeYGHmpn2AsTgsUIRN8aiTrVh8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769020339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=55hGRVFnk4zz9NOt9+lyLbG4Qq5lEcptGnOf7lyvJpE=; b=slXuM5PEVFQwVDKH91QLtEdBT1ZbzfjGI/re1QQ86t3fWfTrWG2sYHP6u/FgnfY2/EH/qo sBt81YGPXwKqGyJve0hyUHmjMJGQJaDGFsX1ZhJgGOKhEHd0Tn1gQzTjrTBaeiHo/sqOJK ZxTdDYYvXcHXF3sf+z03BW6MRDioq6Fb0QM8lN7VVYQ2i0zr703ZIouukXEqtsrTa0qII1 hee0UGQh84zWFCfttB1oY5Cc1EmIE4QvIMj1LiLtmIYJJhP0pG9hZe9CenHp3gfQk9MRhx imyljlgk7UACoONCC5+l1X5ARp7MVCq3/CA6xZuKEV4Zcj2FbavyVc5wXxZkrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769020339; a=rsa-sha256; cv=none; b=Ji6QFatIdZyI1qea/VVRXS/tgjGTrecqmIgY6qhbPcZm+rx57oyr+kFCqtGf8vq4/LxisU /X8IIqI8yfw5oWr6ZRizwtJt8Kcmo3fH0NmJQBVapzcMwB+vELX1cNf8c/a0SZIs9mkB/Y RNpQYN731vTFF1VZKVa03196B1xgDjPBxwICZnKOw9LdKbNvgipi2BS0RyfL5byG0WRbg2 GNolLzRK11upb4l/x6gg1UJWXqvlx4dttlqtFNXv4x9yqse2xkfFiD18mpQGlv+inxKyjn BpqAinb+Gplib0TxHgXrpJcziE9/wzwrGtPDFh1Bzs/g7DTlKy8kzH1Q8F7Qng== 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 4dxCTt5nG6zylD for ; Wed, 21 Jan 2026 18:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 420d3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 18:32:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 275c7f513114 - main - LinuxKPI: netdevice: add structs net_device_path, net_device_path_ctx List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 275c7f513114a8808ba246a1304cbcf7bafbcc21 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 18:32:18 +0000 Message-Id: <69711bb2.420d3.2c8b7055@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=275c7f513114a8808ba246a1304cbcf7bafbcc21 commit 275c7f513114a8808ba246a1304cbcf7bafbcc21 Author: Bjoern A. Zeeb AuthorDate: 2026-01-21 13:55:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-21 18:31:08 +0000 LinuxKPI: netdevice: add structs net_device_path, net_device_path_ctx mt76(4) is using this along with a mac80211.h functiontion pointer to resolve a path in an offload case. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- .../linuxkpi/common/include/linux/netdevice.h | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/netdevice.h b/sys/compat/linuxkpi/common/include/linux/netdevice.h index cf27753bcb80..dfed5fbd61b4 100644 --- a/sys/compat/linuxkpi/common/include/linux/netdevice.h +++ b/sys/compat/linuxkpi/common/include/linux/netdevice.h @@ -160,6 +160,30 @@ struct net_device { #define SET_NETDEV_DEV(_ndev, _dev) (_ndev)->dev.parent = _dev; +enum net_device_path_type { + DEV_PATH_MTK_WDMA, +}; + +struct net_device_path { + enum net_device_path_type type; + const struct net_device *dev; + /* We assume there's a struct per type. */ + union { + struct { + uint16_t wcid; + uint8_t wdma_idx; + uint8_t queue; + uint8_t bss; + uint8_t amsdu; + } mtk_wdma; + }; +}; + +struct net_device_path_ctx { + const struct net_device *dev; +}; + + /* -------------------------------------------------------------------------- */ /* According to linux::ipoib_main.c. */ struct netdev_notifier_info { From nobody Wed Jan 21 19:45:36 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxF6S5XTBz6PdW3 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 4dxF6S34NXz3F5L 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 4dxF6S25Fnz11W3 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxF7r07Xnz6PdlJ 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 4dxF7q3tGcz3FcR 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 4dxF7q2q8Gz11W4 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxF8P5MqMz6PdXy 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 4dxF8P4bBtz3Fq9 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 4dxF8P43Jrz11nD 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxF8t6rC1z6PdfL 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 4dxF8t5TJGz3G99 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 4dxF8t4hmJz11Yp 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxF9d6hKCz6PdRv 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 4dxF9d5Jtlz3GbS 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 4dxF9d4fsDz11W5 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFBK2bx5z6Pdlh 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 4dxFBK1gq3z3Gj0 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 4dxFBK17byz11nG 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFC326Tjz6PdcZ 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 4dxFC31Hxnz3GqC 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 4dxFC30T5Rz11dw 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFCq5v3Mz6Pdjg 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 4dxFCq4Ytgz3H7S 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 4dxFCq40vlz11Ky 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFDX57WRz6Pdvm 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 4dxFDX2TGHz3Hh1 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 4dxFDX0PNhz11Yy 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFF70yd1z6PdnB 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 4dxFF66Gm5z3HmG 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 4dxFF65dNVz11Z4 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFFw0mtCz6PdwD for ; Wed, 21 Jan 2026 19:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxFFv63nsz3JQb for ; Wed, 21 Jan 2026 19:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025123; h=from:from:reply-to:subject:subject: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=ACkBfesfxx24Eihg7QuEpR/Z4Im/Gczz+RMMJEglSxZVqt3zALEIPqZ4Fzj+PMBk1LBVmA ItUW/r/5Fz1mXDntKhnEb4HGgxTjtNyg5IeJ+ctlxqh6SGu7nL0Mto1vEZFUSghYAHVuh/ DgTz03NMnqoAtbhFvlMONmkhEONa+gIZv+g6Phg86Wcn/JNXBNQeQVSpaCchckMTG7ScNp yIVKFjClh0nKiyc/YCoHM10Yq8Bygn0d/jFZr/PiSqsoi+te2S9gux7ZY9/1JzgywABh9Z /EPPhT+kgMpaeTh7o+7JPgSK5COOJZXuJaIe+LuzObKpXKJfRwbStvwIP6jHyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025123; h=from:from:reply-to:subject:subject: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=feTg28O/UXYo9R33F7zsr/uVMCKWHAp2LTmqDl+DPJeAt2d8u8VsG1Co+pdyC4bU8nPy4y RHeZKULg8rw5fH6Caw39aOda+XWljS01Hjw6ISkCN5rFUQ91cQW5oQF9ddap5A567lpqhe X4vnPjOyz7/dMyfk3AGW2ebyuhNXSRhdHgrsnZ0bo4hJvEZioXhxcon13YATnJvZ806pbV eXUMtRRCZOPsBlNJ8kPDNUP5dF+497FAkksaU3EqAldM14LN1SKybQKWwVkOrCzuhJiI3n VNTHPXrdy3P02BE8Ktvee+2iFEqANqK4ab4MDTw2d1/AP59c0ddH01ygccZCLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769025123; a=rsa-sha256; cv=none; b=e8Yw4/78j8NxZwj2tSNu9zYeKv6Gv1/7bHlvctKypbc06iSBQ/tndvbrCkGHKQkWtWXBjO b+kh8ci0mIPrsBy9StqkjOws1eBdKHcWnTCua7YEZhPRXOVPKX8D5qKU+Xtq0qTtIgBdF8 CdZjhVjg+/yDAgKJgc9ngTcN4YUmUFfxsboHamWc2yR/76PHAFBJkuONy/04Ho2688TtaQ 3BcpOnCO5eAqOciJ2Cxgy0MxA8IpLRHMjWDEeRsQDdMrQ/Ols2WPRCsOVuUAK+IPgNsmnG G7OaDHTa0AQQ42aa4UqZbk1Nh4C+lp3EEZJ4DtAnnGRMCLeCbamaUk6Nq4Jl+Q== 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 4dxFFv3lq2z11LL for ; Wed, 21 Jan 2026 19:52:03 +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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFGS13VWz6Pdqj 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 4dxFGQ6fPRz3JfL 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 4dxFGQ6F9Qz1235 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFH65Dgwz6PdyK 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 4dxFH61fY1z3Kg3 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 4dxFH61Fvkz11cR 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFHj4WKQz6PfHj 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 4dxFHj3gWyz3KyN 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 4dxFHj2rNkz11Zq 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFJB1RF8z6Pf7g 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 4dxFJB0Ct5z3L5Q 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 4dxFJ96gKBz126G 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFJw6CpMz6Pf8v 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 4dxFJw3cn3z3Lb0 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 4dxFJw2lNWz11cV 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFKX3Db9z6Pf92 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 4dxFKX01dRz3Lg5 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 4dxFKW6jDwz11X2 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFLN3lz8z6PfGh 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 4dxFLN1Zhdz3MBd 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 4dxFLN17MTz120V 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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 Wed Jan 21 20:02:37 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFV624n5z6Pg0G for ; Wed, 21 Jan 2026 20:02: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 4dxFV60cXnz3NQZ for ; Wed, 21 Jan 2026 20:02:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/sC0iXLFHflNsFQNBYKvlmN60iDktc/09aG57uiCtvk=; b=q9uWpxbXRVsVkhiCAb1pC3CAsjJVLwUoXVghQm+S9VGFzW+0KjBePYq60Wdm7b/vNZAPoi tXfzlE6Xnh3RZwGPOSF7XJ+ooKLtt7jsF7IQJOQndNm6X/q6GyI+kGjJSxyP6rCmOrD270 ay/LRZHQPWndJLWh0/oNmF65jgRrQYpha2WOXeyhqNf5+NtM+Oq1o+XFzJFcizrvqZ0x55 821FImIjBp1yJ73MuxWBAcJOEZy8D1MtG8ngjAcTTvIXnv9naTTbotMeZwYfyqcXeHllnp cRV7mCtyd9ahqDdshYMvz7lopXo9N6/zJ3J0JFGjC2aV/2oRsLM6Ch34o9bq6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/sC0iXLFHflNsFQNBYKvlmN60iDktc/09aG57uiCtvk=; b=XqPft8t5WmYDMwquqqMvzlHB8l1QVZ4uJi7vitJDB0BiBRZp62qoJSx8vSdD0WMXijkvB3 iE6Uhp2u5MxZa052HqD4GeI9idMtCWODJEGk/uQzHiB84GEN9M8foKTHl63E5fd8T3xId1 xBBnS7gK0fFom8JTa4evckh4pKNlOBBI3YIaF13yJcrA44KVSMe+MCjPc6mmbUoYfMy+Mr /xmO+uZbdUabFu533YOVsm2YMINDyZihCUQVWLxELdYVLvuyrYNH+2d5IvgAGWomFiRqqM qyV1A7S6E/NSyVAwNaERUd3Wa6Hl3IXMCF8bNZ7FNLFA3eYyKdX8yGt7n340Jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769025758; a=rsa-sha256; cv=none; b=UPknU2GA/dn700vN09lN31E8SHh+l97N9DLyy7k3cfuIF2G5gXJ60TVb5tP3Ebc5LyPA9A 1gMH5CFWr8mrk9E4+AyHGkCoHwlWhxTwsegKSxQloHDdV7s5nOZNS9aK8QWzE4mSzj/xyP COgOyreImspmYQXH405R6v3zmiET/FedKD+iW/hyCoTzQ/APfVpU69rWKcQU21VHGrcQBY a0OJTrVCyVsSlAWaA3bnW+jfc3RYYGE37lvhhoscldefwYqNh7O/Ux/CDF10EuulPr0Px5 DQ5vQpDM1cTYRyvIq18t6YMyHlZYTY0Z+w+UNnj12zshu3SCWr5Ah9OgmsD+tw== 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 4dxFV606JKz11gf for ; Wed, 21 Jan 2026 20:02:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id be5e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 20:02:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 6c61f58562b9 - main - ath10k: update Atheros/QCA's ath10k driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c61f58562b932eb46b2e05b2f5a82d34250435a Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 20:02:37 +0000 Message-Id: <697130dd.be5e.2b1fba1d@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6c61f58562b932eb46b2e05b2f5a82d34250435a commit 6c61f58562b932eb46b2e05b2f5a82d34250435a Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 10:55:32 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-21 19:57:42 +0000 ath10k: update Atheros/QCA's ath10k driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). Sponsored by: The FreeBSD Foundation --- sys/contrib/dev/athk/ath10k/core.c | 28 ++-- sys/contrib/dev/athk/ath10k/core.h | 6 +- sys/contrib/dev/athk/ath10k/mac.c | 2 +- sys/contrib/dev/athk/ath10k/qmi.c | 2 +- sys/contrib/dev/athk/ath10k/testmode.c | 253 +++++++++++++++++++++++++++---- sys/contrib/dev/athk/ath10k/testmode_i.h | 15 ++ sys/contrib/dev/athk/ath10k/wmi.h | 19 ++- sys/modules/ath10k/Makefile | 1 + 8 files changed, 275 insertions(+), 51 deletions(-) diff --git a/sys/contrib/dev/athk/ath10k/core.c b/sys/contrib/dev/athk/ath10k/core.c index a0407f693659..9ec08b402fd2 100644 --- a/sys/contrib/dev/athk/ath10k/core.c +++ b/sys/contrib/dev/athk/ath10k/core.c @@ -3,7 +3,6 @@ * Copyright (c) 2005-2011 Atheros Communications Inc. * Copyright (c) 2011-2017 Qualcomm Atheros, Inc. * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ @@ -1212,7 +1211,7 @@ static int ath10k_download_fw(struct ath10k *ar) u32 address, data_len; const void *data; int ret; - struct pm_qos_request latency_qos; + struct pm_qos_request latency_qos = {}; address = ar->hw_params.patch_load_addr; @@ -1246,7 +1245,6 @@ static int ath10k_download_fw(struct ath10k *ar) ret); } - memset(&latency_qos, 0, sizeof(latency_qos)); cpu_latency_qos_add_request(&latency_qos, 0); ret = ath10k_bmi_fast_download(ar, address, data, data_len); @@ -2570,8 +2568,9 @@ static int ath10k_init_hw_params(struct ath10k *ar) return 0; } -static bool ath10k_core_needs_recovery(struct ath10k *ar) +static void ath10k_core_recovery_check_work(struct work_struct *work) { + struct ath10k *ar = container_of(work, struct ath10k, recovery_check_work); long time_left; /* Sometimes the recovery will fail and then the next all recovery fail, @@ -2581,7 +2580,7 @@ static bool ath10k_core_needs_recovery(struct ath10k *ar) ath10k_err(ar, "consecutive fail %d times, will shutdown driver!", atomic_read(&ar->fail_cont_count)); ar->state = ATH10K_STATE_WEDGED; - return false; + return; } ath10k_dbg(ar, ATH10K_DBG_BOOT, "total recovery count: %d", ++ar->recovery_count); @@ -2595,27 +2594,24 @@ static bool ath10k_core_needs_recovery(struct ath10k *ar) ATH10K_RECOVERY_TIMEOUT_HZ); if (time_left) { ath10k_warn(ar, "previous recovery succeeded, skip this!\n"); - return false; + return; } /* Record the continuous recovery fail count when recovery failed. */ atomic_inc(&ar->fail_cont_count); /* Avoid having multiple recoveries at the same time. */ - return false; + return; } atomic_inc(&ar->pending_recovery); - - return true; + queue_work(ar->workqueue, &ar->restart_work); } void ath10k_core_start_recovery(struct ath10k *ar) { - if (!ath10k_core_needs_recovery(ar)) - return; - - queue_work(ar->workqueue, &ar->restart_work); + /* Use workqueue_aux to avoid blocking recovery tracking */ + queue_work(ar->workqueue_aux, &ar->recovery_check_work); } EXPORT_SYMBOL(ath10k_core_start_recovery); @@ -3440,7 +3436,7 @@ EXPORT_SYMBOL(ath10k_core_stop); */ static int ath10k_core_probe_fw(struct ath10k *ar) { - struct bmi_target_info target_info; + struct bmi_target_info target_info = {}; int ret = 0; ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_NORMAL); @@ -3451,7 +3447,6 @@ static int ath10k_core_probe_fw(struct ath10k *ar) switch (ar->hif.bus) { case ATH10K_BUS_SDIO: - memset(&target_info, 0, sizeof(target_info)); ret = ath10k_bmi_get_target_info_sdio(ar, &target_info); if (ret) { ath10k_err(ar, "could not get target info (%d)\n", ret); @@ -3463,7 +3458,6 @@ static int ath10k_core_probe_fw(struct ath10k *ar) case ATH10K_BUS_PCI: case ATH10K_BUS_AHB: case ATH10K_BUS_USB: - memset(&target_info, 0, sizeof(target_info)); ret = ath10k_bmi_get_target_info(ar, &target_info); if (ret) { ath10k_err(ar, "could not get target info (%d)\n", ret); @@ -3473,7 +3467,6 @@ static int ath10k_core_probe_fw(struct ath10k *ar) ar->hw->wiphy->hw_version = target_info.version; break; case ATH10K_BUS_SNOC: - memset(&target_info, 0, sizeof(target_info)); ret = ath10k_hif_get_target_info(ar, &target_info); if (ret) { ath10k_err(ar, "could not get target info (%d)\n", ret); @@ -3824,6 +3817,7 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev, INIT_WORK(&ar->register_work, ath10k_core_register_work); INIT_WORK(&ar->restart_work, ath10k_core_restart); + INIT_WORK(&ar->recovery_check_work, ath10k_core_recovery_check_work); INIT_WORK(&ar->set_coverage_class_work, ath10k_core_set_coverage_class_work); diff --git a/sys/contrib/dev/athk/ath10k/core.h b/sys/contrib/dev/athk/ath10k/core.h index cb250ca6991d..eaf122d4b112 100644 --- a/sys/contrib/dev/athk/ath10k/core.h +++ b/sys/contrib/dev/athk/ath10k/core.h @@ -3,7 +3,6 @@ * Copyright (c) 2005-2011 Atheros Communications Inc. * Copyright (c) 2011-2017 Qualcomm Atheros, Inc. * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ @@ -1216,6 +1215,7 @@ struct ath10k { struct work_struct register_work; struct work_struct restart_work; + struct work_struct recovery_check_work; struct work_struct bundle_tx_work; struct work_struct tx_complete_work; @@ -1267,9 +1267,13 @@ struct ath10k { struct { /* protected by conf_mutex */ struct ath10k_fw_components utf_mode_fw; + u8 ftm_msgref; /* protected by data_lock */ bool utf_monitor; + u32 data_pos; + u32 expected_seq; + u8 *eventdata; } testmode; struct { diff --git a/sys/contrib/dev/athk/ath10k/mac.c b/sys/contrib/dev/athk/ath10k/mac.c index 6725c2c742bd..e2bda3c0d925 100644 --- a/sys/contrib/dev/athk/ath10k/mac.c +++ b/sys/contrib/dev/athk/ath10k/mac.c @@ -3,7 +3,6 @@ * Copyright (c) 2005-2011 Atheros Communications Inc. * Copyright (c) 2011-2017 Qualcomm Atheros, Inc. * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ @@ -5442,6 +5441,7 @@ static void ath10k_stop(struct ieee80211_hw *hw, bool suspend) cancel_work_sync(&ar->set_coverage_class_work); cancel_delayed_work_sync(&ar->scan.timeout); cancel_work_sync(&ar->restart_work); + cancel_work_sync(&ar->recovery_check_work); } static int ath10k_config_ps(struct ath10k *ar) diff --git a/sys/contrib/dev/athk/ath10k/qmi.c b/sys/contrib/dev/athk/ath10k/qmi.c index f1f33af0170a..8275345631a0 100644 --- a/sys/contrib/dev/athk/ath10k/qmi.c +++ b/sys/contrib/dev/athk/ath10k/qmi.c @@ -986,7 +986,7 @@ static int ath10k_qmi_new_server(struct qmi_handle *qmi_hdl, ath10k_dbg(ar, ATH10K_DBG_QMI, "wifi fw qmi service found\n"); - ret = kernel_connect(qmi_hdl->sock, (struct sockaddr *)&qmi->sq, + ret = kernel_connect(qmi_hdl->sock, (struct sockaddr_unsized *)&qmi->sq, sizeof(qmi->sq), 0); if (ret) { ath10k_err(ar, "failed to connect to a remote QMI service port\n"); diff --git a/sys/contrib/dev/athk/ath10k/testmode.c b/sys/contrib/dev/athk/ath10k/testmode.c index 3fcefc55b74f..d3bd385694d6 100644 --- a/sys/contrib/dev/athk/ath10k/testmode.c +++ b/sys/contrib/dev/athk/ath10k/testmode.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: ISC /* * Copyright (c) 2014-2017 Qualcomm Atheros, Inc. + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ #include "testmode.h" @@ -10,12 +11,17 @@ #include "debug.h" #include "wmi.h" +#include "wmi-tlv.h" #include "hif.h" #include "hw.h" #include "core.h" #include "testmode_i.h" +#define ATH10K_FTM_SEG_NONE ((u32)-1) +#define ATH10K_FTM_SEGHDR_CURRENT_SEQ GENMASK(3, 0) +#define ATH10K_FTM_SEGHDR_TOTAL_SEGMENTS GENMASK(7, 4) + static const struct nla_policy ath10k_tm_policy[ATH10K_TM_ATTR_MAX + 1] = { [ATH10K_TM_ATTR_CMD] = { .type = NLA_U32 }, [ATH10K_TM_ATTR_DATA] = { .type = NLA_BINARY, @@ -25,41 +31,19 @@ static const struct nla_policy ath10k_tm_policy[ATH10K_TM_ATTR_MAX + 1] = { [ATH10K_TM_ATTR_VERSION_MINOR] = { .type = NLA_U32 }, }; -/* Returns true if callee consumes the skb and the skb should be discarded. - * Returns false if skb is not used. Does not sleep. - */ -bool ath10k_tm_event_wmi(struct ath10k *ar, u32 cmd_id, struct sk_buff *skb) +static void ath10k_tm_event_unsegmented(struct ath10k *ar, u32 cmd_id, + struct sk_buff *skb) { struct sk_buff *nl_skb; - bool consumed; int ret; - ath10k_dbg(ar, ATH10K_DBG_TESTMODE, - "testmode event wmi cmd_id %d skb %p skb->len %d\n", - cmd_id, skb, skb->len); - - ath10k_dbg_dump(ar, ATH10K_DBG_TESTMODE, NULL, "", skb->data, skb->len); - - spin_lock_bh(&ar->data_lock); - - if (!ar->testmode.utf_monitor) { - consumed = false; - goto out; - } - - /* Only testmode.c should be handling events from utf firmware, - * otherwise all sort of problems will arise as mac80211 operations - * are not initialised. - */ - consumed = true; - nl_skb = cfg80211_testmode_alloc_event_skb(ar->hw->wiphy, 2 * sizeof(u32) + skb->len, GFP_ATOMIC); if (!nl_skb) { ath10k_warn(ar, "failed to allocate skb for testmode wmi event\n"); - goto out; + return; } ret = nla_put_u32(nl_skb, ATH10K_TM_ATTR_CMD, ATH10K_TM_CMD_WMI); @@ -68,7 +52,7 @@ bool ath10k_tm_event_wmi(struct ath10k *ar, u32 cmd_id, struct sk_buff *skb) "failed to put testmode wmi event cmd attribute: %d\n", ret); kfree_skb(nl_skb); - goto out; + return; } ret = nla_put_u32(nl_skb, ATH10K_TM_ATTR_WMI_CMDID, cmd_id); @@ -77,7 +61,7 @@ bool ath10k_tm_event_wmi(struct ath10k *ar, u32 cmd_id, struct sk_buff *skb) "failed to put testmode wmi event cmd_id: %d\n", ret); kfree_skb(nl_skb); - goto out; + return; } ret = nla_put(nl_skb, ATH10K_TM_ATTR_DATA, skb->len, skb->data); @@ -86,10 +70,122 @@ bool ath10k_tm_event_wmi(struct ath10k *ar, u32 cmd_id, struct sk_buff *skb) "failed to copy skb to testmode wmi event: %d\n", ret); kfree_skb(nl_skb); - goto out; + return; + } + + cfg80211_testmode_event(nl_skb, GFP_ATOMIC); +} + +static void ath10k_tm_event_segmented(struct ath10k *ar, u32 cmd_id, struct sk_buff *skb) +{ + struct wmi_ftm_cmd *ftm = (struct wmi_ftm_cmd *)skb->data; + u8 total_segments, current_seq; + struct sk_buff *nl_skb; + u8 const *buf_pos; + u16 datalen; + u32 data_pos; + int ret; + + if (skb->len < sizeof(*ftm)) { + ath10k_warn(ar, "Invalid ftm event length: %d\n", skb->len); + return; + } + + current_seq = FIELD_GET(ATH10K_FTM_SEGHDR_CURRENT_SEQ, + __le32_to_cpu(ftm->seg_hdr.segmentinfo)); + total_segments = FIELD_GET(ATH10K_FTM_SEGHDR_TOTAL_SEGMENTS, + __le32_to_cpu(ftm->seg_hdr.segmentinfo)); + datalen = skb->len - sizeof(*ftm); + buf_pos = ftm->data; + + if (current_seq == 0) { + ar->testmode.expected_seq = 0; + ar->testmode.data_pos = 0; + } + + data_pos = ar->testmode.data_pos; + + if ((data_pos + datalen) > ATH_FTM_EVENT_MAX_BUF_LENGTH) { + ath10k_warn(ar, "Invalid ftm event length at %u: %u\n", + data_pos, datalen); + ret = -EINVAL; + return; + } + + memcpy(&ar->testmode.eventdata[data_pos], buf_pos, datalen); + data_pos += datalen; + + if (++ar->testmode.expected_seq != total_segments) { + ar->testmode.data_pos = data_pos; + ath10k_dbg(ar, ATH10K_DBG_TESTMODE, "partial data received %u/%u\n", + current_seq + 1, total_segments); + return; + } + + ath10k_dbg(ar, ATH10K_DBG_TESTMODE, "total data length %u\n", data_pos); + + nl_skb = cfg80211_testmode_alloc_event_skb(ar->hw->wiphy, + 2 * sizeof(u32) + data_pos, + GFP_ATOMIC); + if (!nl_skb) { + ath10k_warn(ar, "failed to allocate skb for testmode wmi event\n"); + return; + } + + ret = nla_put_u32(nl_skb, ATH10K_TM_ATTR_CMD, ATH10K_TM_CMD_TLV); + if (ret) { + ath10k_warn(ar, "failed to put testmode wmi event attribute: %d\n", ret); + kfree_skb(nl_skb); + return; + } + + ret = nla_put_u32(nl_skb, ATH10K_TM_ATTR_WMI_CMDID, cmd_id); + if (ret) { + ath10k_warn(ar, "failed to put testmode wmi event cmd_id: %d\n", ret); + kfree_skb(nl_skb); + return; + } + + ret = nla_put(nl_skb, ATH10K_TM_ATTR_DATA, data_pos, &ar->testmode.eventdata[0]); + if (ret) { + ath10k_warn(ar, "failed to copy skb to testmode wmi event: %d\n", ret); + kfree_skb(nl_skb); + return; } cfg80211_testmode_event(nl_skb, GFP_ATOMIC); +} + +/* Returns true if callee consumes the skb and the skb should be discarded. + * Returns false if skb is not used. Does not sleep. + */ +bool ath10k_tm_event_wmi(struct ath10k *ar, u32 cmd_id, struct sk_buff *skb) +{ + bool consumed; + + ath10k_dbg(ar, ATH10K_DBG_TESTMODE, + "testmode event wmi cmd_id %d skb %p skb->len %d\n", + cmd_id, skb, skb->len); + + ath10k_dbg_dump(ar, ATH10K_DBG_TESTMODE, NULL, "", skb->data, skb->len); + + spin_lock_bh(&ar->data_lock); + + if (!ar->testmode.utf_monitor) { + consumed = false; + goto out; + } + + /* Only testmode.c should be handling events from utf firmware, + * otherwise all sort of problems will arise as mac80211 operations + * are not initialised. + */ + consumed = true; + + if (ar->testmode.expected_seq != ATH10K_FTM_SEG_NONE) + ath10k_tm_event_segmented(ar, cmd_id, skb); + else + ath10k_tm_event_unsegmented(ar, cmd_id, skb); out: spin_unlock_bh(&ar->data_lock); @@ -281,12 +377,18 @@ static int ath10k_tm_cmd_utf_start(struct ath10k *ar, struct nlattr *tb[]) goto err_release_utf_mode_fw; } + ar->testmode.eventdata = kzalloc(ATH_FTM_EVENT_MAX_BUF_LENGTH, GFP_KERNEL); + if (!ar->testmode.eventdata) { + ret = -ENOMEM; + goto err_power_down; + } + ret = ath10k_core_start(ar, ATH10K_FIRMWARE_MODE_UTF, &ar->testmode.utf_mode_fw); if (ret) { ath10k_err(ar, "failed to start core (testmode): %d\n", ret); ar->state = ATH10K_STATE_OFF; - goto err_power_down; + goto err_release_eventdata; } ar->state = ATH10K_STATE_UTF; @@ -302,6 +404,10 @@ static int ath10k_tm_cmd_utf_start(struct ath10k *ar, struct nlattr *tb[]) return 0; +err_release_eventdata: + kfree(ar->testmode.eventdata); + ar->testmode.eventdata = NULL; + err_power_down: ath10k_hif_power_down(ar); @@ -341,6 +447,9 @@ static void __ath10k_tm_cmd_utf_stop(struct ath10k *ar) release_firmware(ar->testmode.utf_mode_fw.fw_file.firmware); ar->testmode.utf_mode_fw.fw_file.firmware = NULL; + kfree(ar->testmode.eventdata); + ar->testmode.eventdata = NULL; + ar->state = ATH10K_STATE_OFF; } @@ -424,6 +533,85 @@ out: return ret; } +static int ath10k_tm_cmd_tlv(struct ath10k *ar, struct nlattr *tb[]) +{ + u16 total_bytes, num_segments; + u32 cmd_id, buf_len; + u8 segnumber = 0; + u8 *bufpos; + void *buf; + int ret; + + mutex_lock(&ar->conf_mutex); + + if (ar->state != ATH10K_STATE_UTF) { + ret = -ENETDOWN; + goto out; + } + + buf = nla_data(tb[ATH10K_TM_ATTR_DATA]); + buf_len = nla_len(tb[ATH10K_TM_ATTR_DATA]); + cmd_id = WMI_PDEV_UTF_CMDID; + + ath10k_dbg(ar, ATH10K_DBG_TESTMODE, + "cmd wmi ftm cmd_id %d buffer length %d\n", + cmd_id, buf_len); + ath10k_dbg_dump(ar, ATH10K_DBG_TESTMODE, NULL, "", buf, buf_len); + + bufpos = buf; + total_bytes = buf_len; + num_segments = total_bytes / MAX_WMI_UTF_LEN; + ar->testmode.expected_seq = 0; + + if (buf_len - (num_segments * MAX_WMI_UTF_LEN)) + num_segments++; + + while (buf_len) { + u16 chunk_len = min_t(u16, buf_len, MAX_WMI_UTF_LEN); + struct wmi_ftm_cmd *ftm_cmd; + struct sk_buff *skb; + u32 hdr_info; + u8 seginfo; + + skb = ath10k_wmi_alloc_skb(ar, (chunk_len + + sizeof(struct wmi_ftm_cmd))); + if (!skb) { + ret = -ENOMEM; + goto out; + } + + ftm_cmd = (struct wmi_ftm_cmd *)skb->data; + hdr_info = FIELD_PREP(WMI_TLV_TAG, WMI_TLV_TAG_ARRAY_BYTE) | + FIELD_PREP(WMI_TLV_LEN, (chunk_len + + sizeof(struct wmi_ftm_seg_hdr))); + ftm_cmd->tlv_header = __cpu_to_le32(hdr_info); + ftm_cmd->seg_hdr.len = __cpu_to_le32(total_bytes); + ftm_cmd->seg_hdr.msgref = __cpu_to_le32(ar->testmode.ftm_msgref); + seginfo = FIELD_PREP(ATH10K_FTM_SEGHDR_TOTAL_SEGMENTS, num_segments) | + FIELD_PREP(ATH10K_FTM_SEGHDR_CURRENT_SEQ, segnumber); + ftm_cmd->seg_hdr.segmentinfo = __cpu_to_le32(seginfo); + segnumber++; + + memcpy(&ftm_cmd->data, bufpos, chunk_len); + + ret = ath10k_wmi_cmd_send(ar, skb, cmd_id); + if (ret) { + ath10k_warn(ar, "failed to send wmi ftm command: %d\n", ret); + goto out; + } + + buf_len -= chunk_len; + bufpos += chunk_len; + } + + ar->testmode.ftm_msgref++; + ret = 0; + +out: + mutex_unlock(&ar->conf_mutex); + return ret; +} + int ath10k_tm_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif, void *data, int len) { @@ -439,9 +627,14 @@ int ath10k_tm_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif, if (!tb[ATH10K_TM_ATTR_CMD]) return -EINVAL; + ar->testmode.expected_seq = ATH10K_FTM_SEG_NONE; + switch (nla_get_u32(tb[ATH10K_TM_ATTR_CMD])) { case ATH10K_TM_CMD_GET_VERSION: - return ath10k_tm_cmd_get_version(ar, tb); + if (!tb[ATH10K_TM_ATTR_DATA]) + return ath10k_tm_cmd_get_version(ar, tb); + else /* ATH10K_TM_CMD_TLV */ + return ath10k_tm_cmd_tlv(ar, tb); case ATH10K_TM_CMD_UTF_START: return ath10k_tm_cmd_utf_start(ar, tb); case ATH10K_TM_CMD_UTF_STOP: diff --git a/sys/contrib/dev/athk/ath10k/testmode_i.h b/sys/contrib/dev/athk/ath10k/testmode_i.h index ee1cb27c1d60..1603f5276682 100644 --- a/sys/contrib/dev/athk/ath10k/testmode_i.h +++ b/sys/contrib/dev/athk/ath10k/testmode_i.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: ISC */ /* * Copyright (c) 2014,2017 Qualcomm Atheros, Inc. + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ /* "API" level of the ath10k testmode interface. Bump it after every @@ -14,6 +15,7 @@ #define ATH10K_TESTMODE_VERSION_MINOR 0 #define ATH10K_TM_DATA_MAX_LEN 5000 +#define ATH_FTM_EVENT_MAX_BUF_LENGTH 2048 enum ath10k_tm_attr { __ATH10K_TM_ATTR_INVALID = 0, @@ -57,4 +59,17 @@ enum ath10k_tm_cmd { * ATH10K_TM_ATTR_DATA. */ ATH10K_TM_CMD_WMI = 3, + + /* The command used to transmit a test command to the firmware + * and the event to receive test events from the firmware. The data + * received only contain the TLV payload, need to add the tlv header + * and send the cmd to firmware with command id WMI_PDEV_UTF_CMDID. + * The data payload size could be large and the driver needs to + * send segmented data to firmware. + * + * This legacy testmode command shares the same value as the get-version + * command. To distinguish between them, we check whether the data attribute + * is present. + */ + ATH10K_TM_CMD_TLV = ATH10K_TM_CMD_GET_VERSION, }; diff --git a/sys/contrib/dev/athk/ath10k/wmi.h b/sys/contrib/dev/athk/ath10k/wmi.h index 0faefc0a9a40..7f50a1de6b97 100644 --- a/sys/contrib/dev/athk/ath10k/wmi.h +++ b/sys/contrib/dev/athk/ath10k/wmi.h @@ -3,7 +3,7 @@ * Copyright (c) 2005-2011 Atheros Communications Inc. * Copyright (c) 2011-2017 Qualcomm Atheros, Inc. * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ #ifndef _WMI_H_ @@ -7418,6 +7418,23 @@ struct wmi_pdev_bb_timing_cfg_cmd { __le32 bb_xpa_timing; } __packed; +struct wmi_ftm_seg_hdr { + __le32 len; + __le32 msgref; + __le32 segmentinfo; + __le32 pdev_id; +} __packed; + +struct wmi_ftm_cmd { + __le32 tlv_header; + struct wmi_ftm_seg_hdr seg_hdr; + u8 data[]; +} __packed; + +#define WMI_TLV_LEN GENMASK(15, 0) +#define WMI_TLV_TAG GENMASK(31, 16) +#define MAX_WMI_UTF_LEN 252 + struct ath10k; struct ath10k_vif; struct ath10k_fw_stats_pdev; diff --git a/sys/modules/ath10k/Makefile b/sys/modules/ath10k/Makefile index 98df270b6791..d8196854b681 100644 --- a/sys/modules/ath10k/Makefile +++ b/sys/modules/ath10k/Makefile @@ -29,6 +29,7 @@ SRCS+= leds.c .endif CFLAGS+= -DKBUILD_MODNAME='"ath10k"' +CFLAGS+= -DLINUXKPI_VERSION=61900 CFLAGS+= -I${DEVATH10KDIR} CFLAGS+= -I${DEVATH10KDIR}/.. From nobody Wed Jan 21 20:02:36 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxFV53Cngz6PgDT for ; Wed, 21 Jan 2026 20:02: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 4dxFV46jrXz3NQX for ; Wed, 21 Jan 2026 20:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HH1xE+BlE97OjH1J8QjsFtUqWwG5IUZh4QjUbq78pTQ=; b=EBuL6TUFLU+HsRaQaqjOnUi0jiI4r43zM8caX79RqzUtkzcrLprKL7MWWbUnaG1tiO1FW0 Y09OrCTSLkF0+0C+uWE5rYkFfDaDRv/XH8Zte8qYz4EmbbWXjGUpMVnnQEgKihPp3C0C4w Qgz3cR8UhMBAvb+GRQbI5mjOSHFkFR3kOW67j0CE8lPxrlheC0JRYC1Uil3ppc2A+AIsfi Y6K04ZThKRA/S45giQ96SphYDWPvjndWIzCL3YDO5Y75+k45+RnAEHFGH/Z9Olu//Ob2zA epnWXr3W0I2aK0xtPr5vy+oaJTcYnQe66WfDos6JwL7dUU94ojaZL0YYmBbQVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769025757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HH1xE+BlE97OjH1J8QjsFtUqWwG5IUZh4QjUbq78pTQ=; b=fsItGfPwtjd87pt8/C+SVAVLBOjB0tcebksRtr2YPAHaTMnoTrt2L1izRX/q8FGPsvo1Gm nI1oViXdXPHPioMtrP1jFFdSsYgZz+VD5p7HI/nqwOxzpztSTuqcRTcbiiEG3+u8YyFoeu 8B7Isu3D0InHJJdxTnjek6Pda/XKBIZSeygXQHl052wBGp6muRdGguq4d0fhXT8GBBUfkv 9OcrsC9qpcbLr/ODQMYnt59bdUXWHyOZH0EqrIygQxiZPTYixAanATYeZl3HiPpih3nDbG yYPsuLMyXWqAJ7cWhZn0aY0GjyQd7DTBDsb34UtGfHkgMJMEulQdUjVcB+BhYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769025757; a=rsa-sha256; cv=none; b=DfEKs5K/1SHSBdc72O5OYzpVnXJB4MqPdCoNKjOB6z7ZB0Lasx7ZfVoDhgx7CwSsaeJ3kl 8SGxlH+KrrOiAIfAszMoyWZBkB26rzPZK5ePkRZxrYrzVBJtigqO1myzfRGwlaUsWK2zxn xt2yJTN4WjR1waaeS4eda+9AZ8ka5PLNXuGoqZD5wAV0VkqipKwsIwEguyF6F1/01edfxt L8elz/yFoX9JUL/l4tPLw8HgE9N8PWc+5Di5Nxh0bu0CaFx0qVmmF34ofOX8McSPuVgHZI lulpSYjeQ91zyVTk2Szf+P/vMOvPiGyQ7rf0c+Cj6wwND9sH9VbyYIBX8DmJJQ== 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 4dxFV46K32z11gd for ; Wed, 21 Jan 2026 20:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ce85 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 20:02:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 80ba8933a991 - main - rtw88: update Realtek's rtw88 driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 80ba8933a991d245b3983f9e2ed1171b11ccaf8a Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 20:02:36 +0000 Message-Id: <697130dc.ce85.5dee3196@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=80ba8933a991d245b3983f9e2ed1171b11ccaf8a commit 80ba8933a991d245b3983f9e2ed1171b11ccaf8a Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 10:56:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-21 19:57:15 +0000 rtw88: update Realtek's rtw88 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). Sponsored by: The FreeBSD Foundation --- sys/contrib/dev/rtw88/bf.c | 8 +++++++- sys/contrib/dev/rtw88/bf.h | 7 +++++++ sys/contrib/dev/rtw88/rtw8822bu.c | 2 ++ sys/contrib/dev/rtw88/rtw8822cu.c | 2 ++ sys/contrib/dev/rtw88/sdio.c | 4 +++- sys/modules/rtw88/Makefile | 2 +- 6 files changed, 22 insertions(+), 3 deletions(-) diff --git a/sys/contrib/dev/rtw88/bf.c b/sys/contrib/dev/rtw88/bf.c index 16c6a1d972e5..8969a1e0cb47 100644 --- a/sys/contrib/dev/rtw88/bf.c +++ b/sys/contrib/dev/rtw88/bf.c @@ -129,8 +129,11 @@ void rtw_bf_init_bfer_entry_mu(struct rtw_dev *rtwdev, void rtw_bf_cfg_sounding(struct rtw_dev *rtwdev, struct rtw_vif *vif, enum rtw_trx_desc_rate rate) { + u8 csi_rsc = CSI_RSC_FOLLOW_RX_PACKET_BW; u32 psf_ctl = 0; - u8 csi_rsc = 0x1; + + if (rtwdev->chip->id == RTW_CHIP_TYPE_8822C) + csi_rsc = CSI_RSC_PRIMARY_20M_BW; psf_ctl = rtw_read32(rtwdev, REG_BBPSF_CTRL) | BIT_WMAC_USE_NDPARATE | @@ -392,6 +395,9 @@ void rtw_bf_cfg_csi_rate(struct rtw_dev *rtwdev, u8 rssi, u8 cur_rate, csi_cfg = rtw_read32(rtwdev, REG_BBPSF_CTRL) & ~BIT_MASK_CSI_RATE; cur_rrsr = rtw_read16(rtwdev, REG_RRSR); + if (rtwdev->chip->id == RTW_CHIP_TYPE_8822C) + csi_cfg |= BIT_CSI_FORCE_RATE; + if (rssi >= 40) { if (cur_rate != DESC_RATE54M) { cur_rrsr |= BIT(DESC_RATE54M); diff --git a/sys/contrib/dev/rtw88/bf.h b/sys/contrib/dev/rtw88/bf.h index 7b40c2c03856..a5d3010e6be6 100644 --- a/sys/contrib/dev/rtw88/bf.h +++ b/sys/contrib/dev/rtw88/bf.h @@ -33,6 +33,7 @@ #define BIT_SHIFT_R_MU_RL 12 #define BIT_SHIFT_WMAC_TXMU_ACKPOLICY 4 #define BIT_SHIFT_CSI_RATE 24 +#define BIT_CSI_FORCE_RATE BIT(15) #define BIT_MASK_R_MU_RL (R_MU_RL << BIT_SHIFT_R_MU_RL) #define BIT_MASK_R_MU_TABLE_VALID 0x3f @@ -48,6 +49,12 @@ #define RTW_SND_CTRL_REMOVE 0x98 #define RTW_SND_CTRL_SOUNDING 0x9B +enum csi_rsc { + CSI_RSC_PRIMARY_20M_BW = 0, + CSI_RSC_FOLLOW_RX_PACKET_BW = 1, + CSI_RSC_DUPLICATE_MODE = 2, +}; + enum csi_seg_len { HAL_CSI_SEG_4K = 0, HAL_CSI_SEG_8K = 1, diff --git a/sys/contrib/dev/rtw88/rtw8822bu.c b/sys/contrib/dev/rtw88/rtw8822bu.c index efda9887cc41..2886f470df71 100644 --- a/sys/contrib/dev/rtw88/rtw8822bu.c +++ b/sys/contrib/dev/rtw88/rtw8822bu.c @@ -79,6 +79,8 @@ static const struct usb_device_id rtw_8822bu_id_table[] = { .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* D-Link DWA-T185 rev. A1 */ { USB_DEVICE_AND_INTERFACE_INFO(0x0411, 0x03d1, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* BUFFALO WI-U2-866DM */ + { USB_DEVICE_AND_INTERFACE_INFO(0x0411, 0x03d0, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* BUFFALO WI-U3-866DHP */ {}, }; MODULE_DEVICE_TABLE(usb, rtw_8822bu_id_table); diff --git a/sys/contrib/dev/rtw88/rtw8822cu.c b/sys/contrib/dev/rtw88/rtw8822cu.c index 90fcbb8ec629..a5f8311c022b 100644 --- a/sys/contrib/dev/rtw88/rtw8822cu.c +++ b/sys/contrib/dev/rtw88/rtw8822cu.c @@ -21,6 +21,8 @@ static const struct usb_device_id rtw_8822cu_id_table[] = { .driver_info = (kernel_ulong_t)&(rtw8822c_hw_spec) }, { USB_DEVICE_AND_INTERFACE_INFO(0x13b1, 0x0043, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&(rtw8822c_hw_spec) }, /* Alpha - Alpha */ + { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x3329, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t)&(rtw8822c_hw_spec) }, /* D-Link AC13U rev. A1 */ {}, }; MODULE_DEVICE_TABLE(usb, rtw_8822cu_id_table); diff --git a/sys/contrib/dev/rtw88/sdio.c b/sys/contrib/dev/rtw88/sdio.c index 99d7c629eac6..e35de52d8eb4 100644 --- a/sys/contrib/dev/rtw88/sdio.c +++ b/sys/contrib/dev/rtw88/sdio.c @@ -144,8 +144,10 @@ static u32 rtw_sdio_to_io_address(struct rtw_dev *rtwdev, u32 addr, static bool rtw_sdio_use_direct_io(struct rtw_dev *rtwdev, u32 addr) { + bool might_indirect_under_power_off = rtwdev->chip->id == RTW_CHIP_TYPE_8822C; + if (!test_bit(RTW_FLAG_POWERON, rtwdev->flags) && - !rtw_sdio_is_bus_addr(addr)) + !rtw_sdio_is_bus_addr(addr) && might_indirect_under_power_off) return false; return !rtw_sdio_is_sdio30_supported(rtwdev) || diff --git a/sys/modules/rtw88/Makefile b/sys/modules/rtw88/Makefile index ee47df54bcf9..0ce6ad3f99bb 100644 --- a/sys/modules/rtw88/Makefile +++ b/sys/modules/rtw88/Makefile @@ -46,7 +46,7 @@ SRCS+= ${LINUXKPI_GENSRCS} SRCS+= opt_wlan.h opt_inet6.h opt_inet.h CFLAGS+= -DKBUILD_MODNAME='"rtw88"' -CFLAGS+= -DLINUXKPI_VERSION=61700 +CFLAGS+= -DLINUXKPI_VERSION=61900 CFLAGS+= -I${DEVRTW88DIR} CFLAGS+= ${LINUXKPI_INCLUDES} From nobody Wed Jan 21 23:35:54 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxLDC0Pkmz6PtlC for ; Wed, 21 Jan 2026 23:35: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 4dxLDB6wHJz3mRW for ; Wed, 21 Jan 2026 23:35:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769038555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/xXdqrRuEJJqziANRt6kFqlCVP7tcMKzhJEwLimi0W8=; b=q9V0abrr+VlqHQ1d1+gQ917n2A10DM4PyPcuCbxMQpd8L1mDC2+RzLGH/qOsWVIoyDterk EZIiYYN3wK5WD+7g/OZqx+rpfT0D7IuIeDnJqPn/cOsjMY4b/fxuYa5B7kQ+T15rYB1Rzn F292+G5H2oCAO5tsf1xbmyOcOU0NqoQ7SaseesmuL1DuiXCSCvYmRNIhIfwSjOQCK7TO5R c561FElXpjf1nq1BZ/wOY5xVbHvUrHHs1LNenI/o0+9VwmTsdVJyzTjzhDEsFCzYsp2x5Y TPq/McMRlGOqlO4Y3hCYGlM9O53X9pa12WT5ECCGMQ37Vz8E2GcQVzoFYIU73w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769038555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/xXdqrRuEJJqziANRt6kFqlCVP7tcMKzhJEwLimi0W8=; b=wsrflafCFBp7yGBuoui3yXI5jdqEKzL1bRUGu9VwRM0RhvH81tWnCuW1TXup3zpMhLb8Ll fPLiSeI6qjftmeQ/1HuNkWFsGob5/izAZZS027WeNLXzSvVZSfwIDEuF6/b5+Ob2FuY3Z/ eG6WonKCTSCtC4watuMMXj7U+YkilFdskcoC7G9SsEHi6TckVKeJDJPnSew483rzrYpGfE T9pUpD99YJeyQQ3BVkuv8e89ZarrXFCjqyRNUwzO8ZQUOZszmZCDDfG5KEGVVLpBWpYwL2 Ej+/eRM4pt9nwp5Ok7FNE6DQqEJ9gbmTmSQKUGq8AkBD354OXwrPWPnPYdRiXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769038555; a=rsa-sha256; cv=none; b=dh6fv7+cEwjnN1bLehBpl2LQIh3xy9co6IsD1PR32VZ1GZL0kF2SFdz4wP0C/Ft5whb1Um 5Ud9oExBjzEIncE5yGs5qigVrgO5TqaAU93C1FIpKG+YSMbq3MaFwnut6rKT/swS4cd4n3 udnLtolDIQdFXy4Vri2VurWXgpGfybPgh+vylkhuwJUF4iyu40uZfXhVA6Qx3syyLln+40 WSI+uxBbOfbCraDR1OSarQYye+j+rB3hpCsKDNq+Qv9GYFUKFzyQhVbl+qKIrM6K0GA/g3 TQ3ORfiF0yibETmgsfot48pX6N5c55Ibot6b5am/rGqQAdkiL54VeX6Hdvqyng== 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 4dxLDB6Fczz17Gr for ; Wed, 21 Jan 2026 23:35:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a73d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 23:35:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: eacc501eff52 - main - truncate: fix a minor nit + add a hole-punching test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eacc501eff52db16b7b784c89a3a4a03c9a3ef34 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 23:35:54 +0000 Message-Id: <697162da.3a73d.48c66da4@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=eacc501eff52db16b7b784c89a3a4a03c9a3ef34 commit eacc501eff52db16b7b784c89a3a4a03c9a3ef34 Author: Kyle Evans AuthorDate: 2026-01-21 23:34:27 +0000 Commit: Kyle Evans CommitDate: 2026-01-21 23:35:25 +0000 truncate: fix a minor nit + add a hole-punching test The struct spacectl_range we use is only really used in these three lines of code, so re-scope it down to just the dealloc branch. This is marginally easier to reason about what might be necessary to replace in porting our truncate(1) to other platforms. While we're here, add a test for the -d flag to be sure it really does punch a hole in the file. The test also tries to confirm that it does not disturb other segments of the file in the process, just to inspire some confidence that it's not corrupting the file somehow. Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D51207 --- usr.bin/truncate/tests/truncate_test.sh | 48 +++++++++++++++++++++++++++++++++ usr.bin/truncate/truncate.c | 3 ++- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/usr.bin/truncate/tests/truncate_test.sh b/usr.bin/truncate/tests/truncate_test.sh index ec219059de42..845b3e1b4d84 100644 --- a/usr.bin/truncate/tests/truncate_test.sh +++ b/usr.bin/truncate/tests/truncate_test.sh @@ -438,6 +438,53 @@ rounddown_zero_body() [ ${st_size} -eq 0 ] || atf_fail "new file should now be 0 bytes" } +atf_test_case deallocate +deallocate_head() +{ + atf_set "descr" "Verifies that -d punches a hole in the file" + atf_set "require.user" "root" +} +deallocate_body() +{ + blocksz=$(stat -h . | cut -f1 -d' ') + atf_check test -n "$blocksz" + + # We use /dev/random here to defeat ZFS compression, which would + # collapse ranges of zeroes into holes without us deallocating it. This + # isn't a concern below because those are specificially for creating our + # reference files -- we expect the deallocate operation to result in + # ranges of zeroes, whether they end up creating a hole or not. + filesz=$((blocksz * 3)) + atf_check -e not-empty dd if=/dev/random of=sparse \ + bs=${filesz} count=1 conv=notrunc + + atf_check cp sparse sparse.orig + atf_check cp sparse sparse.orig.orig + + # Punch a hole in the middle, ensure that bit is zeroed out. + atf_check -e not-empty dd if=/dev/zero of=sparse.orig \ + bs=${blocksz} oseek=1 count=1 conv=notrunc + atf_check truncate -d -o ${blocksz} -l ${blocksz} sparse + atf_check cmp -s sparse sparse.orig + + # Clobber the end part of the original file and punch a hole in + # the same spot on the new file, ensure that it has zeroed out that + # portion. + atf_check -e not-empty dd if=/dev/zero of=sparse.orig \ + bs=${blocksz} oseek=2 count=1 conv=notrunc + atf_check truncate -d -o $((blocksz * 2)) -l ${blocksz} sparse + atf_check cmp -s sparse sparse.orig + + # Now bring the original file back and make sure that punching a hole + # in data at the beginning doesn't disturb the data at the end. + atf_check cp sparse.orig.orig sparse.orig + atf_check cp sparse.orig.orig sparse + atf_check -e not-empty dd if=/dev/zero of=sparse.orig \ + bs=${blocksz} oseek=0 count=1 conv=notrunc + atf_check truncate -d -l ${blocksz} sparse + atf_check cmp -s sparse sparse.orig +} + atf_init_test_cases() { atf_add_test_case illegal_option @@ -459,4 +506,5 @@ atf_init_test_cases() atf_add_test_case roundup atf_add_test_case rounddown atf_add_test_case rounddown_zero + atf_add_test_case deallocate } diff --git a/usr.bin/truncate/truncate.c b/usr.bin/truncate/truncate.c index d8484257294a..15be339df0e3 100644 --- a/usr.bin/truncate/truncate.c +++ b/usr.bin/truncate/truncate.c @@ -62,7 +62,6 @@ main(int argc, char **argv) int do_refer; int got_size; char *fname, *rname; - struct spacectl_range sr; fd = -1; rsize = tsize = sz = off = 0; @@ -198,6 +197,8 @@ main(int argc, char **argv) tsize = 0; if (do_dealloc == 1) { + struct spacectl_range sr; + sr.r_offset = off; sr.r_len = len; r = fspacectl(fd, SPACECTL_DEALLOC, &sr, 0, &sr); From nobody Thu Jan 22 04:44:08 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxT3x49WCz6PGrP for ; Thu, 22 Jan 2026 04:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxT3r3GnLz4P96 for ; Thu, 22 Jan 2026 04:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769057048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BB1CcWaaZ8FvnrAbiTMto+UjmfpMhctd3ijJqkMKWnI=; b=G14qqewxQyCfnbKYPHRH+WNg32EmaNaIegdbADAXFxw1PRlLh75cIdI4RZVV4RwqmJwm1e e9sfXg2DC2duQ9K2q+IO2iiS2L3pKa5sLQrmcy/+99DJ5wZMsX7K7AWr79x4HziqBWCVoY bMsrGhJVBo4ifKRGGc1EtXnvtJvpprwPyrtmBzWHwCT2Zf8mnkKUHOMHNc9En/eP/KSs7d /taQVMk/bnyhJ/piKIIZA9s9d/077qAHNpyt+Zzfor+/DqmvjTISe/HhDXGrqOIGPrzR4B wMVqOWD6y8jC0qbG5Jo6ZQDMZsQ+s46dR4HSN9W+EKDFxO7/xc9lNK39ByFwIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769057048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BB1CcWaaZ8FvnrAbiTMto+UjmfpMhctd3ijJqkMKWnI=; b=IdGA6Bf3jX/usaqmkQhpvuaDAghOBvH0xB2EARcECM4FWICHZnavrodh/N4GlVr81QcKSv MJ3tyBfU5TA07RiIbUyWaRnVoPY674pmsqwjx6M6/kzIUmYDBUOFz4RYcRuPV8GI1kEEJ9 6DU6hleebDTCdQPbds1J0/uoE/TT/uSs9hkeibDNPguJZnS30qKz2lZ+2DZho6S4OtzAL6 bJdw+hjdKQ4dZaPikstk8B9tLzGohE7h3sIgrM1J7TyPboMjBSq0ORvGkjBjtb6q174oco 6kg5BtjjHyTu/1t5C4k74fwpvmGCtSluFAnW+FddXgxHDooQxnD1EPmECH8Pbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769057048; a=rsa-sha256; cv=none; b=Y0wEH32dR6PIV+4ZRxTLueXNzau9s3nWQVnc5x1FS/Tch6Z3eUFPi3viQw7OTw6lJk4qL2 TElAg4rPmppvoD+rcRLm7lgyiv7ALHoBIwy5yttyCfl1OLjNjPtwgXO3FipizhPYLiengT bMdueSLYI1IBC88u6xHxLyE7Shf4N5cg7+NXqsefgg42ZmvKT52kq9u6K0wfBfJ4tKRU/S 2rQ2B6U9cdCZsNMjQeswHfUdrzh77JleihzgI1D0843NxI+d0k5jVCRqE/nRuNm14n9alK uGEzQPKmse52gv6j0W2+ACELP21wb04R0FuZ+rl0P16LVLutK5K5H+r8Ss55Zw== 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 4dxT3r2k8Gz3Tx for ; Thu, 22 Jan 2026 04:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38afd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Jan 2026 04:44:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: ad9932995cf8 - main - hwpstate: Add CPPC enable tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad9932995cf8f93143ff033712016d95b5cb7a50 Auto-Submitted: auto-generated Date: Thu, 22 Jan 2026 04:44:08 +0000 Message-Id: <6971ab18.38afd.283ab0b9@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=ad9932995cf8f93143ff033712016d95b5cb7a50 commit ad9932995cf8f93143ff033712016d95b5cb7a50 Author: Cy Schubert AuthorDate: 2026-01-05 04:53:51 +0000 Commit: Cy Schubert CommitDate: 2026-01-22 04:36:33 +0000 hwpstate: Add CPPC enable tunable The Framework 13 runs very hot the maximum frequency is possible. By disabling CPPC (reverting to Cool`n'Quiet 2.0) we can use powerd to limit the CPU frequency to 2200, thereby reducing the CPU temperature. Some systems may run slower with CPPC enabled. See PR/292615 for that bug. Those experiencing either of these issues may add the following to their loader.conf or device.hints to disable CPPC: machdep.hwpstate_amd_cppc_enable="0" PR: 292615 Reviewed by: lwhsu, olce Differential revision: https://reviews.freebsd.org/D54803 --- sys/x86/cpufreq/hwpstate_amd.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 5676d8ce7dae..34838753e221 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -179,6 +179,11 @@ SYSCTL_BOOL(_machdep, OID_AUTO, hwpstate_pkg_ctrl, CTLFLAG_RDTUN, &hwpstate_pkg_ctrl_enable, 0, "Set 1 (default) to enable package-level control, 0 to disable"); +static bool hwpstate_amd_cppc_enable = true; +SYSCTL_BOOL(_machdep, OID_AUTO, hwpstate_amd_cppc_enable, CTLFLAG_RDTUN, + &hwpstate_amd_cppc_enable, 0, + "Set 1 (default) to enable AMD CPPC, 0 to disable"); + static device_method_t hwpstate_methods[] = { /* Device interface */ DEVMETHOD(device_identify, hwpstate_identify), @@ -667,7 +672,8 @@ hwpstate_probe(device_t dev) sc = device_get_softc(dev); - if (amd_extended_feature_extensions & AMDFEID_CPPC) { + if (hwpstate_amd_cppc_enable && + (amd_extended_feature_extensions & AMDFEID_CPPC)) { sc->flags |= PSTATE_CPPC; device_set_desc(dev, "AMD Collaborative Processor Performance Control (CPPC)"); From nobody Thu Jan 22 08:42:34 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxZLy4VGKz6PXJf for ; Thu, 22 Jan 2026 08:42: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 4dxZLy3rhmz3VR8 for ; Thu, 22 Jan 2026 08:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769071354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dZ2FxNPveIrd7XBNweWzECnMNFn4AM1duPZz6Ac9aFg=; b=aq7zK59SEl2Q+YMLYQA92sJdNgeaPl2Ew8VzKtOmj2u8BZLmkDDQT739hZNwdYKBttFUrS Qge+Cnc3JBcdopo/vMrBZdZUd3OZkC1hZXCJSyj84lb6SEba+SpO4WxeAufYgNdnqSd0RA fBlMvo+D1X41ANMshv8ZacP4Y0MNwD3eDKdAVdvKsnESeIRMGKk/pBpKBYEZJsvPqI4DPZ e93Gp9NJHV3RoIAVM0aEf2vRlh8IsI/IFR3xhrz7CYo64gU1Ee5hc06RisEWrvlNa3Pq5g rlN3n3v7hwQAia1X5IClmTqxMM4aPaxil79Emr+GsW4j9eijEA4r5apBocigtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769071354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dZ2FxNPveIrd7XBNweWzECnMNFn4AM1duPZz6Ac9aFg=; b=c3IXHUfStI1tLKd0CcXloJXeFwqI0Ej7as6PXNPxEZDC73pLkR9Ho0gSBK+Jv5S2RcQi0M 1ZUY3ozIJbH2EDUcWE7I/BiFkbh9Qa8rsJTU3c+TJa+mFnWk/fs2NsIjk+D2UpItaeOAlx vzNDapDqfKMfLfQLUHkBbeJQGNPduD0+9Z4ig+gIhBTehh+0RpT/pTq3PmLdhcOq0MOk8E IH1GuftltaZYLwG/ciQwjNbs9k2RoZPxgJRP/1/cvVKC+xjNpnNz0pD2KXanzxbNAzy0bF Jj8s7Fxhhx+RrnoSCSlZcVWMQIguJFQ0YSMY2wk2ykqjxbVZypSi64keBP7ACw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769071354; a=rsa-sha256; cv=none; b=WLjLYWsbvrUXJcTS9jkdZaGMtQl96+iag73fdTfnxoq53hWuZ13ORTsmNtI1pkJ+dAMhz8 0UKbvInX6a0BqVvdc0i1Rs/0Jrqm92RkMDIzFGQ5SeqIN/YybZqxRJPJCnp86iCK2lBPqs biPb040LhfedP8Dpu4LGosFMMEnswK8lVf80zOJw5MnUporiLRpy8F7yVjWRzIi3o4FmQR BWqGRHYxiPMFv0zfZeENb/uM/GvMcu5LF4HaytZanpMNTfdUZBr7H021aRSFB8CmwwWVov MlBcUoe2e9Kj3PQaL9REXaAEVkqLpIC4IHi4AC0WeY9e18EZCMqrAoSNcNgkCQ== 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 4dxZLy3BxMz9yj for ; Thu, 22 Jan 2026 08:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d8f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Jan 2026 08:42:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: 8f8a7f6fffd7 - main - libfetch: apply timeout to SSL_read() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 8f8a7f6fffd7dca09013f7c4bfa075bc3825fb8e Auto-Submitted: auto-generated Date: Thu, 22 Jan 2026 08:42:34 +0000 Message-Id: <6971e2fa.d8f3.445991e5@gitrepo.freebsd.org> The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=8f8a7f6fffd7dca09013f7c4bfa075bc3825fb8e commit 8f8a7f6fffd7dca09013f7c4bfa075bc3825fb8e Author: Eugene Grosbein AuthorDate: 2026-01-22 08:40:35 +0000 Commit: Eugene Grosbein CommitDate: 2026-01-22 08:40:35 +0000 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(). MFC after: 3 days --- lib/libfetch/common.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index 2e1364edff04..a9935ef176da 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 Thu Jan 22 14:39:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxkHH3btrz6Pv8k for ; Thu, 22 Jan 2026 14:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxkHH2jrtz3G9f for ; Thu, 22 Jan 2026 14:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769092795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ykBcNVUYPoNPvom8xs4SRP/XrGcux0ZWIbUQzKBKckU=; b=S0DSOPnbmbtjWjIHVOgJAQzqTE8hwvNBLkQRg/TWBBSppgKVd7qzGNTehVfP3adxymHb/I xROUEUdLy9rerAtUrUWmCBu2iMJ8F5Z/cePiop0ObVvQ5Pb3eJafii8tS7A66o40cJrZGa Wnl7ud4c/cwjbsOP25RBLJtOdtJFwcj9yxsV7ZgZpYEKzIH4EmYLa1OvYRjdgG6EvOZDav iePNs3XEE+3MpU6ci8vaewD32W7c6LF/4Y6vg1piWq1K1X3EzLqOcsHZhME9eOb+To8/QQ Z+on1NTNlsaYU9nEVTf/6yPAj1GwvprBeizTRVwxyORSoRw5Aym3/rHduiedDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769092795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ykBcNVUYPoNPvom8xs4SRP/XrGcux0ZWIbUQzKBKckU=; b=qR2gGZq2oZhc/XUH0YlCzbE3N8v9yPF9E+u0ZutPnZR+DbdpPJLt8/ePoXsY6sbQc0p8Y9 affWmTBNiZuURpN7V3XjaUBDJU9sJl1baRA7BxQyno3J8pZGPO/Q5S7yPO+UgJ/EXtHcvA y9Q7fr8oiCX7h9xXt/618keLTicc0f8KrgCMKslAk1gSJBDQkRhOkD4IHHOyIO771JrB9A w/DIhPB3RY/tTjUDNzJqZ+fcwC6L/SYiiCbrbAhPxVS5IjOk37UlhGTW+jlryPNnerKD6A +zPBSuw2THyWDf+4FKpzGdrZwW7w0KHk0j6a5AZUH63vQFKhsyMyA3HHMBL5ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769092795; a=rsa-sha256; cv=none; b=gDzKJB4wJb8dIYyCU9kr4mFyp6UyYdkPaj9f6rOegG/c3KvPIgQJSfOTgJTMZIxyfE9P48 pIBHUq0FwWdJzH4luMZEh9y1A3jVI63GScj244bW3sB+4PkBxNz6ugWRSGRw5l5x+yjau7 wdB5gjKbC+SxoYU1ljHEXrPsWcU5ZKfU1YRABtvAyrJaYMf3hPEsLkh4vRPjIQi5Zx5nY2 xxVxrluqiKv1Nmyewydc0LqaK6f7egkSeEGZ7pAI153xl7+Tz5Bp6kBwGO7zCYx2UHf2+z NwIchnmR9V4R1BpKdcWdYVVQZNCUvobVkiX7zPv3+kydyv6PH/DyudTFJzKC3g== 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 4dxkHH1Trqzcwd for ; Thu, 22 Jan 2026 14:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2249b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Jan 2026 14:39:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: 129aec722502 - main - libfetch: allow disabling TLS v1.3 when the connection List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 129aec72250266e60c07ff4643623188f7c27a9d Auto-Submitted: auto-generated Date: Thu, 22 Jan 2026 14:39:55 +0000 Message-Id: <697236bb.2249b.2e32478a@gitrepo.freebsd.org> The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=129aec72250266e60c07ff4643623188f7c27a9d commit 129aec72250266e60c07ff4643623188f7c27a9d Author: Eugene Grosbein AuthorDate: 2026-01-22 14:37:54 +0000 Commit: Eugene Grosbein CommitDate: 2026-01-22 14:37:54 +0000 libfetch: allow disabling TLS v1.3 when the connection MFC after: 3 days --- 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 a9935ef176da..9b36a9e61a75 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 Thu Jan 22 15:36:59 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxlY81HjJz6PyBh for ; Thu, 22 Jan 2026 15:37: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 4dxlY75wsyz3RMf for ; Thu, 22 Jan 2026 15:36:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769096219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PKZNkwskfnjm5Xps8oJ0ELKiPQAvoQAOfk7AFjCsefY=; b=k+V6fF/Zl/5lylJ70Ka4Z3XhkpO97zzBDHcj+28pz9QczeOhYxFfgLnzH1+li8e7uVDs9S LsdV5VkYDygL4CnYpwAbOmEdUAh5/0OoSE+2RmZQoCQBkCgzLaZRkwFdA9CUu5JH8yRzjy LnD08GhUuv+J5kGQ48LLhwlZOO3InfXx7dStWTFw6t0J1pETruSm4cGVcBo8yMIDvPykfI dh42q4G1tCqtpVzvM/rRSqiqYZKCZg0MyX7eMoneFmtE6ASj66yDKGq2VOvyk0WGAYarMH JuoIGFpxHnQ6PHdBmLvkHm7M3UGnyrZLtWKHeHFul5st/DNRm1EH41Z0Sl3qeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769096219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PKZNkwskfnjm5Xps8oJ0ELKiPQAvoQAOfk7AFjCsefY=; b=EcMuFKmEm8o7iUh7nPemxLLnswpsr4wrKcXhT2KJfLfH7dfLg0KV1L4j4+uakDQAu0lduK Fo2SkjDMmWhmQG2FWKsiOBmIgsHCQxD39AQIWKKcMfEAgi8CeICwJVctqWbkv3N0cjiqnk /FD3udxRzIlOILhJj6iy2M62z+05VvVjro02Fs5k0w3at+uwLHGeff2tieWTaZJRhVwdo9 AOvwQqA0A2QvnvOp9GM7yPhnlKpe/+KlNACQ8qzUoRz63oj4lDEvw9XnwMzfnEe8kMVOGz +w+Rc8I2Ji9jXNLR54qG3K0FOgZVpXAnHLHIDPJqN85Rk+R6hhlvF7Ud/T06Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769096219; a=rsa-sha256; cv=none; b=eZPCK91ZlTECTUmwp8nt0+AekWzhvuH4YGvltU0abGU2IJRKHoMP2mnHCLFnR2wFxnOT79 md+cwUEzT76C1oqFbfqSGcAfDMCH0WcaR8opnKBSOMsediQIS/HYCHn1pcqmAequ36l1zP ZLOckOPbIbrIA0ChMJb/pm25+88BvUV64/vBkT62wGtUtiirQS7YjTjYJrDYHQ2lA87T6x VNEvvc46MfcamnU54fM2NGDYAEfsx97ISzzYPwCz7ctWMNj/uMuXWrRaaJWWIushqqt8Aq wiFw96rtZ9M7CJrClZ6ijf2qvlFHRJ5dAqR75mcgkzaOI18u5iC5WYSoyuosdg== 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 4dxlY75DL9zfpT for ; Thu, 22 Jan 2026 15:36:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2587f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Jan 2026 15:36:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: dec3ea45b654 - main - libiconv: Fix typo in comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dec3ea45b65442b4f3cafcd8a672f1e13b69a066 Auto-Submitted: auto-generated Date: Thu, 22 Jan 2026 15:36:59 +0000 Message-Id: <6972441b.2587f.733fe14f@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=dec3ea45b65442b4f3cafcd8a672f1e13b69a066 commit dec3ea45b65442b4f3cafcd8a672f1e13b69a066 Author: Ed Maste AuthorDate: 2026-01-13 14:31:29 +0000 Commit: Ed Maste CommitDate: 2026-01-22 15:36:37 +0000 libiconv: Fix typo in comment --- lib/libiconv_modules/mapper_std/citrus_mapper_std.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libiconv_modules/mapper_std/citrus_mapper_std.c b/lib/libiconv_modules/mapper_std/citrus_mapper_std.c index 5db142fcd36a..4284995e169b 100644 --- a/lib/libiconv_modules/mapper_std/citrus_mapper_std.c +++ b/lib/libiconv_modules/mapper_std/citrus_mapper_std.c @@ -307,7 +307,7 @@ rowcol_init(struct _citrus_mapper_std *ms) rc->rc_dst_ilseq = be32toh(eix->eix_dst_ilseq); } - /* calcurate expected table size */ + /* calculate expected table size */ i = rc->rc_src_rowcol_len; lz = &rc->rc_src_rowcol[--i]; table_size = lz->width; From nobody Thu Jan 22 17:17:54 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxnnb1q4vz6Q48g for ; Thu, 22 Jan 2026 17:17: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 4dxnnb0Kkbz3dsQ for ; Thu, 22 Jan 2026 17:17:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769102275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Q8ggcrhTIb4BcPYUfJeM9zsz06Q1sxubEhpCSICss4=; b=hzlSqYyZkd3Kv+jUm6KyWvnN7qm9B6l10nNVoGkSGc0SdCCvZ2qVPkjvMBjUjfmdZ72OJq FDyFFSbbgn9vWiggN1hWUDjfr34K4ObUush6wjYP/GvAT0ED/2zJQa3w9merhO9t9L6OlU ymq4mWLUFCbEJ96/ZmXTs4P1WbZSYNaEau3pEOHy6swJ7tgDm5XNZtkMifDmNGzcSS/8/5 hkfyvC0jVZG+NLbXGkeSJfqoaO02ny+aR+2dNquXkukZ8XnU9o8mbqOR0EHQMWPkVZZ+oa Bf4Yt8bhDJyBBq/DKafG2zQMXmr6juuYfznz4JJuDodZRDxD3YsZK0awIjGheA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769102275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Q8ggcrhTIb4BcPYUfJeM9zsz06Q1sxubEhpCSICss4=; b=HRxv82qaNADFBcrYn5PCSWS6zNaxZbO8cWrfB4Lbaa8dvvv8tEKDRMPdglvNvonW/uipOQ EStahCSetY0EfggXiHw10i0z4ssEruL03kmwsxYGCGsPlMCZIp2Tbu6hShAIvmGLgQRf1f DFAIsvTBDmg1WoqhAgbpAa+YRn30J1jzv3DpvIvcdObEfh4AGPktFA8F/drrSWNr+GLGJU L1xxoKtUSzcn2sI/G43LhvDh8LV3FaHK0mUltAbmj69fV5wnYQByd5t5dWxpQUO5lRrzRc 6uH4HhGCsrrFlGw80mBUI0MxX0P64YTyFi2hc3GIhAyQbRPld493cJGVXP5mow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769102275; a=rsa-sha256; cv=none; b=cIstQmeP3tuR9c57BE1l9qwArAWtqUii608j0t9dLRCljo+88L4x+iGA4wJ8TrMOeB//hv Ll3/oK1vsSBso5HB74GI5n9OcxeAlCbBQk14CRH57b+TvV5zkdS6becKQszj3pst0WL9Wf iBoGN6e800Dib+K+kiFsIKhHOglfhOjrii/O1Ui/vF8C+w8xa8fHrKjNi4mSKlljHauQ0h 8oWtsAkWTfTVP/Uak1GVNX9S7zqzniJ6u1kf+k5wnwTle2Kv18mmmbhccGp+01Xe0suKBg 1K534UMtz9nqslF4WjI1XDwSu65HwzFqECfMiTUHMopo3JA4wPr9wfS6wvcXlQ== 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 4dxnnZ6brXzj8w for ; Thu, 22 Jan 2026 17:17:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 373f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Jan 2026 17:17:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ffdbc1bc2170 - main - syslogd/tests: Use a helper function to log from within a jail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffdbc1bc2170226547fcad036f01f379625886dd Auto-Submitted: auto-generated Date: Thu, 22 Jan 2026 17:17:54 +0000 Message-Id: <69725bc2.373f3.631c259e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ffdbc1bc2170226547fcad036f01f379625886dd commit ffdbc1bc2170226547fcad036f01f379625886dd Author: Mark Johnston AuthorDate: 2026-01-22 15:50:14 +0000 Commit: Mark Johnston CommitDate: 2026-01-22 15:50:14 +0000 syslogd/tests: Use a helper function to log from within a jail This is just for consistency with all other logger(1) invocations, which happen from the syslogd_log() function. No functional change intended. Reviewed by: jlduran MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54778 --- usr.sbin/syslogd/tests/syslogd_test.sh | 60 ++++++++++++++------------- usr.sbin/syslogd/tests/syslogd_test_common.sh | 7 ++++ 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/usr.sbin/syslogd/tests/syslogd_test.sh b/usr.sbin/syslogd/tests/syslogd_test.sh index 5422e78f6831..fbe390d93aae 100644 --- a/usr.sbin/syslogd/tests/syslogd_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_test.sh @@ -419,15 +419,16 @@ allowed_peer_body() syslogd_start -j syslogd_allowed_peer -b 169.254.0.1:514 -a '169.254.0.2/32' # Make sure that a message from 169.254.0.2:514 is logged. - atf_check jexec syslogd_client \ - logger -p user.debug -t test1 -h 169.254.0.1 -S 169.254.0.2:514 "hello, world" + syslogd_log_jail syslogd_client \ + -p user.debug -t test1 -h 169.254.0.1 -S 169.254.0.2:514 "hello, world" atf_check -o match:"test1: hello, world" cat "${logfile}" + # ... but not a message from port 515. - atf_check -o ignore jexec syslogd_client \ - logger -p user.debug -t test2 -h 169.254.0.1 -S 169.254.0.2:515 "hello, world" + syslogd_log_jail syslogd_client \ + -p user.debug -t test2 -h 169.254.0.1 -S 169.254.0.2:515 "hello, world" atf_check -o not-match:"test2: hello, world" cat "${logfile}" - atf_check -o ignore jexec syslogd_client \ - logger -p user.debug -t test2 -h 169.254.0.1 -S 169.254.0.3:515 "hello, world" + syslogd_log_jail syslogd_client \ + -p user.debug -t test2 -h 169.254.0.1 -S 169.254.0.3:515 "hello, world" atf_check -o not-match:"test2: hello, world" cat "${logfile}" syslogd_stop @@ -435,11 +436,11 @@ allowed_peer_body() # Now make sure that we can filter by port. syslogd_start -j syslogd_allowed_peer -b 169.254.0.1:514 -a '169.254.0.2/32:515' - atf_check jexec syslogd_client \ - logger -p user.debug -t test3 -h 169.254.0.1 -S 169.254.0.2:514 "hello, world" + syslogd_log_jail syslogd_client \ + -p user.debug -t test3 -h 169.254.0.1 -S 169.254.0.2:514 "hello, world" atf_check -o not-match:"test3: hello, world" cat "${logfile}" - atf_check jexec syslogd_client \ - logger -p user.debug -t test4 -h 169.254.0.1 -S 169.254.0.2:515 "hello, world" + syslogd_log_jail syslogd_client \ + -p user.debug -t test4 -h 169.254.0.1 -S 169.254.0.2:515 "hello, world" atf_check -o match:"test4: hello, world" cat "${logfile}" syslogd_stop @@ -472,10 +473,10 @@ allowed_peer_forwarding_body() # A message forwarded to 169.254.0.1:514 should be logged, but one # forwarded to 169.254.0.1:515 should not. - atf_check jexec syslogd_client \ - logger -h 169.254.0.2 -p user.debug -t test1 "hello, world" - atf_check jexec syslogd_client \ - logger -h 169.254.0.2 -p mark.debug -t test2 "hello, world" + syslogd_log_jail syslogd_client \ + -h 169.254.0.2 -p user.debug -t test1 "hello, world" + syslogd_log_jail syslogd_client \ + -h 169.254.0.2 -p mark.debug -t test2 "hello, world" atf_check -o match:"test1: hello, world" cat "${logfile}" atf_check -o not-match:"test2: hello, world" cat "${logfile}" @@ -502,19 +503,19 @@ allowed_peer_wildcard_body() syslogd_start -j syslogd_allowed_peer -b 169.254.0.1:514 -a '169.254.0.2/32:*' # Make sure that a message from 169.254.0.2:514 is logged. - atf_check jexec syslogd_client \ - logger -p user.debug -t test1 -h 169.254.0.1 -S 169.254.0.2:514 "hello, world" + syslogd_log_jail syslogd_client \ + -p user.debug -t test1 -h 169.254.0.1 -S 169.254.0.2:514 "hello, world" atf_check -o match:"test1: hello, world" cat "${logfile}" # ... as is a message from 169.254.0.2:515, allowed by the wildcard. - atf_check jexec syslogd_client \ - logger -p user.debug -t test2 -h 169.254.0.1 -S 169.254.0.2:515 "hello, world" + syslogd_log_jail syslogd_client \ + -p user.debug -t test2 -h 169.254.0.1 -S 169.254.0.2:515 "hello, world" atf_check -o match:"test2: hello, world" cat "${logfile}" # ... but not a message from 169.254.0.3. - atf_check -o ignore jexec syslogd_client \ - logger -p user.debug -t test3 -h 169.254.0.1 -S 169.254.0.3:514 "hello, world" + syslogd_log_jail syslogd_client \ + -p user.debug -t test3 -h 169.254.0.1 -S 169.254.0.3:514 "hello, world" atf_check -o not-match:"test3: hello, world" cat "${logfile}" - atf_check -o ignore jexec syslogd_client \ - logger -p user.debug -t test3 -h 169.254.0.1 -S 169.254.0.3:515 "hello, world" + syslogd_log_jail syslogd_client \ + -p user.debug -t test3 -h 169.254.0.1 -S 169.254.0.3:515 "hello, world" atf_check -o not-match:"test3: hello, world" cat "${logfile}" syslogd_stop @@ -567,15 +568,16 @@ __EOF__ syslogd_start -j syslogd_server -f ${PWD}/server_config -b 169.254.0.1 -b 169.254.0.2 syslogd_start -j syslogd_client -f ${PWD}/client_config -P ${SYSLOGD_PIDFILE}.2 - atf_check jexec syslogd_client \ - logger -h 169.254.0.3 -P $SYSLOGD_UDP_PORT -p user.debug -t test1 "hello, world" - atf_check jexec syslogd_client \ - logger -h 169.254.0.3 -P $SYSLOGD_UDP_PORT -p mail.debug -t test2 "you've got mail" - atf_check jexec syslogd_client \ - logger -h 169.254.0.3 -P $SYSLOGD_UDP_PORT -p ftp.debug -t test3 "transfer complete" - + syslogd_log_jail syslogd_client \ + -h 169.254.0.3 -P $SYSLOGD_UDP_PORT -p user.debug -t test1 "hello, world" atf_check -o match:"test1: hello, world" cat "${logfile}" + + syslogd_log_jail syslogd_client \ + -h 169.254.0.3 -P $SYSLOGD_UDP_PORT -p mail.debug -t test2 "you've got mail" atf_check -o match:"test2: you've got mail" cat "${logfile}" + + syslogd_log_jail syslogd_client \ + -h 169.254.0.3 -P $SYSLOGD_UDP_PORT -p ftp.debug -t test3 "transfer complete" atf_check -o match:"test3: transfer complete" cat "${logfile}" } forward_cleanup() diff --git a/usr.sbin/syslogd/tests/syslogd_test_common.sh b/usr.sbin/syslogd/tests/syslogd_test_common.sh index f06eb417d423..87e9080d99ca 100644 --- a/usr.sbin/syslogd/tests/syslogd_test_common.sh +++ b/usr.sbin/syslogd/tests/syslogd_test_common.sh @@ -96,6 +96,13 @@ syslogd_log() atf_check -s exit:0 -o empty -e empty logger $* } +syslogd_log_jail() +{ + local jailname=$1 + shift + atf_check -s exit:0 -o empty -e empty jexec ${jailname} logger $* +} + # Make syslogd reload its configuration file. syslogd_reload() { From nobody Thu Jan 22 17:17:55 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxnnc22dQz6Q4YB for ; Thu, 22 Jan 2026 17:17: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 4dxnnc06J6z3dqd for ; Thu, 22 Jan 2026 17:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769102276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tTt9tmM9lH6XY0uWDt43HLf5NVmRnR6PSphkDTUzgTU=; b=mGSofMSIwmSVsL8uugaWFLH6vHxJ6U6q3zGdjN4uyLEoDnVngv8WuUtSleuMV9G4RX7cQM sm92HoahsnXuvVnuQy9fa0pfC4flJ8EadJmFGtPFHljXTdIBjP0R6SRSzJ9jySGCqeabLk P1xHOzjXKgUjiZ+AefB35pIrqbLBIR8sp/q75cjBwmWWu8k7ky9+dUU/Kk/Tc4QS6Zv7Ic uN6RUKKJ+a0QZUb1IULT7k2e3SH4J+E5VoTG8eWd0xoQKx39QzRnOoEgOaDXY9wHuSTfdy 9GJQQqtCtmm9GO/0DkWnwjoQr8OxsDevGTnH0KPCUoI2ygBsSsf06+OmP78How== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769102276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tTt9tmM9lH6XY0uWDt43HLf5NVmRnR6PSphkDTUzgTU=; b=xvP7BooJikGbXni2CLR3a0bSdfuThJuFvmvYaSX/TDklsBxY+lPfHzmzwYVGT2kWD8lRt/ vhWjXVhj2Nw5QiWlm2sTLQTXssi7h9durYlGOIvbEtGBNcihHMTmeMs1sTDkuaayUl8YLo 7Axp9ZoJOghMqKvmBpYZdFAsOH5SYSXvS5rbIaZwmSP68mXXJkOK8uAiMVpJnSTn7dlRoq sgl1tPhJ4XAieaqbYCH1KV4bgrFUtfuQp2TPaLkJe5kRMZtIgwkXy2YRhcOD3fThhFtGIi IrCZ3WURBmNApYB0pyopgallfHRP4aZ69ubMY4ikzreyH3dgcVdcaqlLe2lrzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769102276; a=rsa-sha256; cv=none; b=hII6Mu9wa/ICrqLTjH+4bt/md0XR/KNsw9hi0A4m2LAMjbY14yY+MOSG4NQXvApWRZTai4 3iMpLLp/NlczUybp/GwSVwD51FFD7wvwfOa3xfaLEuIKhl9RjwLMQIgEyh6wU8skHzwHVp znWRak9jzC8gluspMML7b/0BRX1vGZFpnf+LzjCqEOmTZVtqndAFMzLmSmK0mPZQXxZzv7 zlRt/efMk7g3D9CIjdERbdD+DBwzXJmRP5ev49UmLNASW/GHGnHNcCkYJAsnERLFYdhw3i kgegeYuSQmtf6tw0OMCr74EyUQENZvZNoLvpmiJTQdhhH1v/vODJIoIglZpexA== 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 4dxnnb6pnLzjhF for ; Thu, 22 Jan 2026 17:17:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 398ea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Jan 2026 17:17:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 560c22937ba9 - main - syslogd/tests: Address races List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 560c22937ba96e8bab57de395dcf340ecf8d6794 Auto-Submitted: auto-generated Date: Thu, 22 Jan 2026 17:17:55 +0000 Message-Id: <69725bc3.398ea.7ee6a928@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=560c22937ba96e8bab57de395dcf340ecf8d6794 commit 560c22937ba96e8bab57de395dcf340ecf8d6794 Author: Mark Johnston AuthorDate: 2026-01-22 15:50:25 +0000 Commit: Mark Johnston CommitDate: 2026-01-22 15:50:25 +0000 syslogd/tests: Address races I occasionally see failures in the syslogd test suite. The problem is that the tests are racy: they send a message using logger(1), then immediately check whether the message was logged to a log file. If the syslogd instance under test doesn't get a chance to run before the second step, the test fails. This change reworks things to avoid the race while minimizing the amount of time sleeping. 1) Each test uses a single logfile, so have them use a new common variable, SYSLOGD_LOGFILE, instead of something test-specific. 2) In syslogd_start(), if the configuration references SYSLOGD_LOGFILE, wait for it to be created by syslogd before returning. 3) Add a helper syslogd_check_log(), to check for a given log entry in the last line of SYSLOGD_LOGFILE, instead of using atf_check directly. 4) In syslogd_check_log(), poll the logfile until the desired log entry appears, or the test times out. With this change, I was able to run the tests 1000 times in a loop with 4-way parallelism without seeing any test failures. Without the change I usually get a failure within 10 loops. Reviewed by: jlduran MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54779 --- .../syslogd/tests/syslogd_basic_format_test.sh | 28 +-- .../syslogd/tests/syslogd_format_test_common.sh | 1 - .../syslogd/tests/syslogd_forwarded_format_test.sh | 42 ++-- .../syslogd/tests/syslogd_relayed_format_test.sh | 30 +-- usr.sbin/syslogd/tests/syslogd_test.sh | 241 ++++++++++----------- usr.sbin/syslogd/tests/syslogd_test_common.sh | 33 +++ 6 files changed, 184 insertions(+), 191 deletions(-) diff --git a/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh b/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh index 09477a568ba8..219c3e045676 100644 --- a/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_basic_format_test.sh @@ -11,9 +11,8 @@ setup_basic_format_test() { local format="$1" - local logfile="$2" - printf "user.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + printf "user.debug\t${SYSLOGD_LOGFILE}\n" > "${SYSLOGD_CONFIG}" syslogd_start \ -O "${format}" \ @@ -33,11 +32,10 @@ O_flag_bsd_basic_head() O_flag_bsd_basic_body() { local format="bsd" - local logfile="${PWD}/O_flag_${format}_basic.log" - setup_basic_format_test "${format}" "${logfile}" + setup_basic_format_test "${format}" - atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + syslogd_check_log "${REGEX_RFC3164_LOGFILE}" } O_flag_bsd_basic_cleanup() { @@ -52,11 +50,10 @@ O_flag_rfc3164_basic_head() O_flag_rfc3164_basic_body() { local format="rfc3164" - local logfile="${PWD}/O_flag_${format}_basic.log" - setup_basic_format_test "${format}" "${logfile}" + setup_basic_format_test "${format}" - atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + syslogd_check_log "${REGEX_RFC3164_LOGFILE}" } O_flag_rfc3164_basic_cleanup() { @@ -71,11 +68,10 @@ O_flag_rfc3164strict_basic_head() O_flag_rfc3164strict_basic_body() { local format="rfc3164-strict" - local logfile="${PWD}/O_flag_${format}_basic.log" - setup_basic_format_test "${format}" "${logfile}" + setup_basic_format_test "${format}" - atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + syslogd_check_log "${REGEX_RFC3164_LOGFILE}" } O_flag_rfc3164strict_basic_cleanup() { @@ -90,11 +86,10 @@ O_flag_syslog_basic_head() O_flag_syslog_basic_body() { local format="syslog" - local logfile="${PWD}/O_flag_${format}_basic.log" - setup_basic_format_test "${format}" "${logfile}" + setup_basic_format_test "${format}" - atf_check -s exit:0 -o match:"${REGEX_RFC5424_LOGFILE}" cat "${logfile}" + syslogd_check_log "${REGEX_RFC5424_LOGFILE}" } O_flag_syslog_basic_cleanup() { @@ -109,11 +104,10 @@ O_flag_rfc5424_basic_head() O_flag_rfc5424_basic_body() { local format="rfc5424" - local logfile="${PWD}/O_flag_${format}_basic.log" - setup_basic_format_test "${format}" "${logfile}" + setup_basic_format_test "${format}" - atf_check -s exit:0 -o match:"${REGEX_RFC5424_LOGFILE}" cat "${logfile}" + syslogd_check_log "${REGEX_RFC5424_LOGFILE}" } O_flag_rfc5424_basic_cleanup() { diff --git a/usr.sbin/syslogd/tests/syslogd_format_test_common.sh b/usr.sbin/syslogd/tests/syslogd_format_test_common.sh index 995bb048881b..99623015c15d 100644 --- a/usr.sbin/syslogd/tests/syslogd_format_test_common.sh +++ b/usr.sbin/syslogd/tests/syslogd_format_test_common.sh @@ -55,7 +55,6 @@ confirm_INET_support_or_skip() set_common_atf_metadata() { - atf_set timeout 5 atf_set require.user root } diff --git a/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh b/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh index b17627a935c8..db607a33d093 100644 --- a/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_forwarded_format_test.sh @@ -14,8 +14,7 @@ SERVER_2_PORT="5141" setup_forwarded_format_test() { local format="$1" - local logfile="$2" - local pcapfile="$3" + local pcapfile="$2" confirm_INET_support_or_skip @@ -25,7 +24,7 @@ setup_forwarded_format_test() tcpdump_pid="$!" # Start first server: receive UDP, log to file - printf "user.debug\t${logfile}\n" > "$(config_filename ${SERVER_1_PORT})" + printf "user.debug\t${SYSLOGD_LOGFILE}\n" > "$(config_filename ${SERVER_1_PORT})" syslogd_start_on_port "${SERVER_1_PORT}" -O "${format}" # Start second server: send UDP, log to first server @@ -49,14 +48,13 @@ O_flag_bsd_forwarded_head() O_flag_bsd_forwarded_body() { local format="bsd" - local logfile="${PWD}/${format}_forwarded.log" local pcapfile="${PWD}/${format}_forwarded.pcap" - setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + setup_forwarded_format_test "${format}" "${pcapfile}" atf_expect_fail \ "PR 220246 syslog -O bsd deviates from RFC 3164 recommendations" - atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + syslogd_check_log "${REGEX_RFC3164_LOGFILE}" atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC3164_PAYLOAD}" \ tcpdump -A -r "${pcapfile}" } @@ -76,14 +74,13 @@ O_flag_rfc3164_forwarded_head() O_flag_rfc3164_forwarded_body() { local format="rfc3164" - local logfile="${PWD}/${format}_forwarded.log" local pcapfile="${PWD}/${format}_forwarded.pcap" - setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + setup_forwarded_format_test "${format}" "${pcapfile}" atf_expect_fail \ "PR 220246 syslog -O rfc3164 deviates from RFC 3164 recommendations" - atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + syslogd_check_log "${REGEX_RFC3164_LOGFILE}" atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC3164_PAYLOAD}" \ tcpdump -A -r "${pcapfile}" } @@ -103,12 +100,11 @@ O_flag_rfc3164strict_forwarded_head() O_flag_rfc3164strict_forwarded_body() { local format="rfc3164-strict" - local logfile="${PWD}/${format}_forwarded.log" local pcapfile="${PWD}/${format}_forwarded.pcap" - setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + setup_forwarded_format_test "${format}" "${pcapfile}" - atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + syslogd_check_log "${REGEX_RFC3164_LOGFILE}" atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC3164_PAYLOAD}" \ tcpdump -A -r "${pcapfile}" } @@ -128,12 +124,11 @@ O_flag_syslog_forwarded_head() O_flag_syslog_forwarded_body() { local format="syslog" - local logfile="${PWD}/${format}_forwarded.log" local pcapfile="${PWD}/${format}_forwarded.pcap" - setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + setup_forwarded_format_test "${format}" "${pcapfile}" - atf_check -s exit:0 -o match:"${REGEX_RFC5424_LOGFILE}" cat "${logfile}" + syslogd_check_log "${REGEX_RFC5424_LOGFILE}" atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC5424_PAYLOAD}" \ tcpdump -A -r "${pcapfile}" } @@ -153,12 +148,11 @@ O_flag_rfc5424_forwarded_head() O_flag_rfc5424_forwarded_body() { local format="rfc5424" - local logfile="${PWD}/${format}_forwarded.log" local pcapfile="${PWD}/${format}_forwarded.pcap" - setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + setup_forwarded_format_test "${format}" "${pcapfile}" - atf_check -s exit:0 -o match:"${REGEX_RFC5424_LOGFILE}" cat "${logfile}" + syslogd_check_log "${REGEX_RFC5424_LOGFILE}" atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC5424_PAYLOAD}" \ tcpdump -A -r "${pcapfile}" } @@ -180,13 +174,11 @@ O_flag_bsd_forwarded_legacy_head() O_flag_bsd_forwarded_legacy_body() { local format="bsd" - local logfile="${PWD}/${format}_forwarded_legacy.log" local pcapfile="${PWD}/${format}_forwarded.pcap" - setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + setup_forwarded_format_test "${format}" "${pcapfile}" - atf_check -s exit:0 -o match:"${REGEX_RFC3164_LEGACY_LOGFILE}" \ - cat "${logfile}" + syslogd_check_log "${REGEX_RFC3164_LEGACY_LOGFILE}" atf_check -s exit:0 -e ignore \ -o match:"${REGEX_RFC3164_LEGACY_PAYLOAD}" \ tcpdump -A -r "${pcapfile}" @@ -208,13 +200,11 @@ O_flag_rfc3164_forwarded_legacy_head() O_flag_rfc3164_forwarded_legacy_body() { local format="rfc3164" - local logfile="${PWD}/${format}_forwarded_legacy.log" local pcapfile="${PWD}/${format}_forwarded.pcap" - setup_forwarded_format_test "${format}" "${logfile}" "${pcapfile}" + setup_forwarded_format_test "${format}" "${pcapfile}" - atf_check -s exit:0 -o match:"${REGEX_RFC3164_LEGACY_LOGFILE}" \ - cat "${logfile}" + syslogd_check_log "${REGEX_RFC3164_LEGACY_LOGFILE}" atf_check -s exit:0 -e ignore \ -o match:"${REGEX_RFC3164_LEGACY_PAYLOAD}" \ tcpdump -A -r "${pcapfile}" diff --git a/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh b/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh index d3e0db4e0f1c..6a5aeba77a25 100644 --- a/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_relayed_format_test.sh @@ -15,8 +15,7 @@ readonly SERVER_3_PORT="5142" setup_relayed_format_test() { local format="$1" - local logfile="$2" - local pcapfile="$3" + local pcapfile="$2" confirm_INET_support_or_skip @@ -26,7 +25,7 @@ setup_relayed_format_test() tcpdump_pid="$!" # Start first (central) server: receive UDP, log to file - printf "user.debug\t${logfile}\n" \ + printf "user.debug\t${SYSLOGD_LOGFILE}\n" \ > "$(config_filename ${SERVER_1_PORT})" syslogd_start_on_port "${SERVER_1_PORT}" -O "${format}" @@ -56,13 +55,12 @@ O_flag_bsd_relayed_head() O_flag_bsd_relayed_body() { local format="bsd" - local logfile="${PWD}/${format}_relayed.log" local pcapfile="${PWD}/${format}_relayed.pcap" - setup_relayed_format_test "${format}" "${logfile}" "${pcapfile}" + setup_relayed_format_test "${format}" "${pcapfile}" atf_expect_fail "PR 220246 issue with the legacy bsd format" - atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + syslogd_check_log "${REGEX_RFC3164_LOGFILE}" atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC3164_PAYLOAD}" \ tcpdump -A -r "${pcapfile}" } @@ -83,13 +81,12 @@ O_flag_rfc3164_relayed_head() O_flag_rfc3164_relayed_body() { local format="rfc3164" - local logfile="${PWD}/${format}_relayed.log" local pcapfile="${PWD}/${format}_relayed.pcap" - setup_relayed_format_test "${format}" "${logfile}" "${pcapfile}" + setup_relayed_format_test "${format}" "${pcapfile}" atf_expect_fail "PR 220246 issue with the legacy rfc3164 format" - atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + syslogd_check_log "${REGEX_RFC3164_LOGFILE}" atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC3164_PAYLOAD}" \ tcpdump -A -r "${pcapfile}" } @@ -110,12 +107,11 @@ O_flag_rfc3164strict_relayed_head() O_flag_rfc3164strict_relayed_body() { local format="rfc3164-strict" - local logfile="${PWD}/${format}_relayed.log" local pcapfile="${PWD}/${format}_relayed.pcap" - setup_relayed_format_test "${format}" "${logfile}" "${pcapfile}" + setup_relayed_format_test "${format}" "${pcapfile}" - atf_check -s exit:0 -o match:"${REGEX_RFC3164_LOGFILE}" cat "${logfile}" + syslogd_check_log "${REGEX_RFC3164_LOGFILE}" atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC3164_PAYLOAD}" \ tcpdump -A -r "${pcapfile}" } @@ -136,12 +132,11 @@ O_flag_syslog_relayed_head() O_flag_syslog_relayed_body() { local format="syslog" - local logfile="${PWD}/${format}_relayed.log" local pcapfile="${PWD}/${format}_relayed.pcap" - setup_relayed_format_test "${format}" "${logfile}" "${pcapfile}" + setup_relayed_format_test "${format}" "${pcapfile}" - atf_check -s exit:0 -o match:"${REGEX_RFC5424_LOGFILE}" cat "${logfile}" + syslogd_check_log "${REGEX_RFC5424_LOGFILE}" atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC5424_PAYLOAD}" \ tcpdump -A -r "${pcapfile}" } @@ -162,12 +157,11 @@ O_flag_rfc5424_relayed_head() O_flag_rfc5424_relayed_body() { local format="rfc5424" - local logfile="${PWD}/${format}_relayed.log" local pcapfile="${PWD}/${format}_relayed.pcap" - setup_relayed_format_test "${format}" "${logfile}" "${pcapfile}" + setup_relayed_format_test "${format}" "${pcapfile}" - atf_check -s exit:0 -o match:"${REGEX_RFC5424_LOGFILE}" cat "${logfile}" + syslogd_check_log "${REGEX_RFC5424_LOGFILE}" atf_check -s exit:0 -e ignore -o match:"${REGEX_RFC5424_PAYLOAD}" \ tcpdump -A -r "${pcapfile}" } diff --git a/usr.sbin/syslogd/tests/syslogd_test.sh b/usr.sbin/syslogd/tests/syslogd_test.sh index fbe390d93aae..d43473eac12d 100644 --- a/usr.sbin/syslogd/tests/syslogd_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_test.sh @@ -23,15 +23,12 @@ unix_head() } unix_body() { - local logfile="${PWD}/unix.log" - - printf "user.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + printf "user.debug\t${SYSLOGD_LOGFILE}\n" > "${SYSLOGD_CONFIG}" syslogd_start syslogd_log -p user.debug -t unix -h "${SYSLOGD_LOCAL_SOCKET}" \ "hello, world (unix)" - atf_check -s exit:0 -o match:"unix: hello, world \(unix\)" \ - tail -n 1 "${logfile}" + syslogd_check_log "unix: hello, world \(unix\)" } unix_cleanup() { @@ -45,19 +42,16 @@ inet_head() } inet_body() { - local logfile="${PWD}/inet.log" - [ "$(sysctl -n kern.features.inet)" != "1" ] && atf_skip "Kernel does not support INET" - printf "user.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + printf "user.debug\t${SYSLOGD_LOGFILE}\n" > "${SYSLOGD_CONFIG}" syslogd_start # We have INET transport; make sure we can use it. syslogd_log -4 -p user.debug -t inet -h 127.0.0.1 -P "${SYSLOGD_UDP_PORT}" \ "hello, world (v4)" - atf_check -s exit:0 -o match:"inet: hello, world \(v4\)" \ - tail -n 1 "${logfile}" + syslogd_check_log "inet: hello, world \(v4\)" } inet_cleanup() { @@ -71,19 +65,16 @@ inet6_head() } inet6_body() { - local logfile="${PWD}/inet6.log" - [ "$(sysctl -n kern.features.inet6)" != "1" ] && atf_skip "Kernel does not support INET6" - printf "user.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + printf "user.debug\t${SYSLOGD_LOGFILE}\n" > "${SYSLOGD_CONFIG}" syslogd_start # We have INET6 transport; make sure we can use it. syslogd_log -6 -p user.debug -t unix -h ::1 -P "${SYSLOGD_UDP_PORT}" \ "hello, world (v6)" - atf_check -s exit:0 -o match:"unix: hello, world \(v6\)" \ - tail -n 1 "${logfile}" + syslogd_check_log "unix: hello, world \(v6\)" } inet6_cleanup() { @@ -97,25 +88,24 @@ reload_head() } reload_body() { - logfile="${PWD}/reload.log" - printf "user.debug\t/${logfile}\n" > "${SYSLOGD_CONFIG}" + printf "user.debug\t${SYSLOGD_LOGFILE}\n" > "${SYSLOGD_CONFIG}" syslogd_start syslogd_log -p user.debug -t reload -h "${SYSLOGD_LOCAL_SOCKET}" \ "pre-reload" - atf_check -s exit:0 -o match:"reload: pre-reload" tail -n 1 "${logfile}" + syslogd_check_log "reload: pre-reload" # Override the old rule. - truncate -s 0 "${logfile}" - printf "news.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + printf "news.debug\t${SYSLOGD_LOGFILE}\n" > "${SYSLOGD_CONFIG}" syslogd_reload syslogd_log -p user.debug -t reload -h "${SYSLOGD_LOCAL_SOCKET}" \ "post-reload user" syslogd_log -p news.debug -t reload -h "${SYSLOGD_LOCAL_SOCKET}" \ "post-reload news" - atf_check -s exit:0 -o not-match:"reload: post-reload user" cat ${logfile} - atf_check -s exit:0 -o match:"reload: post-reload news" cat ${logfile} + sleep 0.5 + syslogd_check_log_nopoll "reload: post-reload news" + syslogd_check_log_nomatch "reload: post-reload user" } reload_cleanup() { @@ -129,30 +119,36 @@ prog_filter_head() } prog_filter_body() { - logfile="${PWD}/prog_filter.log" - printf "!prog1,prog2\nuser.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + printf "!prog1,prog2\nuser.debug\t${SYSLOGD_LOGFILE}\n" > "${SYSLOGD_CONFIG}" syslogd_start - for i in 1 2 3; do - syslogd_log -p user.debug -t "prog${i}" -h "${SYSLOGD_LOCAL_SOCKET}" \ - "hello this is prog${i}" - done - atf_check -s exit:0 -o match:"prog1: hello this is prog1" cat "${logfile}" - atf_check -s exit:0 -o match:"prog2: hello this is prog2" cat "${logfile}" - atf_check -s exit:0 -o not-match:"prog3: hello this is prog3" cat "${logfile}" + syslogd_log -p user.debug -t "prog1" -h "${SYSLOGD_LOCAL_SOCKET}" \ + "hello this is prog1" + syslogd_check_log "prog1: hello this is prog1" + + syslogd_log -p user.debug -t "prog2" -h "${SYSLOGD_LOCAL_SOCKET}" \ + "hello this is prog2" + syslogd_check_log "prog2: hello this is prog2" + + syslogd_log -p user.debug -t "prog3" -h "${SYSLOGD_LOCAL_SOCKET}" \ + "hello this is prog3" + syslogd_check_log_nomatch "prog3: hello this is prog3" # Override the old rule. - truncate -s 0 ${logfile} - printf "!-prog1,prog2\nuser.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + printf "!-prog1,prog2\nuser.debug\t${SYSLOGD_LOGFILE}\n" > "${SYSLOGD_CONFIG}" syslogd_reload - for i in 1 2 3; do - syslogd_log -p user.debug -t "prog${i}" -h "${SYSLOGD_LOCAL_SOCKET}" \ - "hello this is prog${i}" - done - atf_check -s exit:0 -o not-match:"prog1: hello this is prog1" cat "${logfile}" - atf_check -s exit:0 -o not-match:"prog2: hello this is prog2" cat "${logfile}" - atf_check -s exit:0 -o match:"prog3: hello this is prog3" cat "${logfile}" + syslogd_log -p user.debug -t "prog1" -h "${SYSLOGD_LOCAL_SOCKET}" \ + "hello this is prog1" + syslogd_check_log_nomatch "prog1: hello this is prog1" + + syslogd_log -p user.debug -t "prog2" -h "${SYSLOGD_LOCAL_SOCKET}" \ + "hello this is prog2" + syslogd_check_log_nomatch "prog2: hello this is prog2" + + syslogd_log -p user.debug -t "prog3" -h "${SYSLOGD_LOCAL_SOCKET}" \ + "hello this is prog3" + syslogd_check_log "prog3: hello this is prog3" } prog_filter_cleanup() { @@ -166,30 +162,32 @@ host_filter_head() } host_filter_body() { - logfile="${PWD}/host_filter.log" - printf "+host1,host2\nuser.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + printf "+host1,host2\nuser.debug\t${SYSLOGD_LOGFILE}\n" > "${SYSLOGD_CONFIG}" syslogd_start - for i in 1 2 3; do - syslogd_log -p user.debug -t "host${i}" -H "host${i}" \ - -h "${SYSLOGD_LOCAL_SOCKET}" "hello this is host${i}" - done - atf_check -s exit:0 -o match:"host1: hello this is host1" cat "${logfile}" - atf_check -s exit:0 -o match:"host2: hello this is host2" cat "${logfile}" - atf_check -s exit:0 -o not-match:"host3: hello this is host3" cat "${logfile}" + syslogd_log -p user.debug -t "host1" -H "host1" \ + -h "${SYSLOGD_LOCAL_SOCKET}" "hello this is host1" + syslogd_check_log "host1: hello this is host1" + syslogd_log -p user.debug -t "host2" -H "host2" \ + -h "${SYSLOGD_LOCAL_SOCKET}" "hello this is host2" + syslogd_check_log "host2: hello this is host2" + syslogd_log -p user.debug -t "host3" -H "host3" \ + -h "${SYSLOGD_LOCAL_SOCKET}" "hello this is host3" + syslogd_check_log_nomatch "host3: hello this is host3" # Override the old rule. - truncate -s 0 ${logfile} - printf "\-host1,host2\nuser.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + printf "\-host1,host2\nuser.debug\t${SYSLOGD_LOGFILE}\n" > "${SYSLOGD_CONFIG}" syslogd_reload - for i in 1 2 3; do - syslogd_log -p user.debug -t "host${i}" -H "host${i}" \ - -h "${SYSLOGD_LOCAL_SOCKET}" "hello this is host${i}" - done - atf_check -s exit:0 -o not-match:"host1: hello this is host1" cat "${logfile}" - atf_check -s exit:0 -o not-match:"host2: hello this is host2" cat "${logfile}" - atf_check -s exit:0 -o match:"host3: hello this is host3" cat "${logfile}" + syslogd_log -p user.debug -t "host1" -H "host1" \ + -h "${SYSLOGD_LOCAL_SOCKET}" "hello this is host1" + syslogd_check_log_nomatch "host1: hello this is host1" + syslogd_log -p user.debug -t "host2" -H "host2" \ + -h "${SYSLOGD_LOCAL_SOCKET}" "hello this is host2" + syslogd_check_log_nomatch "host2: hello this is host2" + syslogd_log -p user.debug -t "host3" -H "host3" \ + -h "${SYSLOGD_LOCAL_SOCKET}" "hello this is host3" + syslogd_check_log "host3: hello this is host3" } host_filter_cleanup() { @@ -203,47 +201,43 @@ prop_filter_head() } prop_filter_body() { - logfile="${PWD}/prop_filter.log" - printf ":msg,contains,\"FreeBSD\"\nuser.debug\t${logfile}\n" \ + printf ":msg,contains,\"FreeBSD\"\nuser.debug\t${SYSLOGD_LOGFILE}\n" \ > "${SYSLOGD_CONFIG}" syslogd_start syslogd_log -p user.debug -t "prop1" -h "${SYSLOGD_LOCAL_SOCKET}" "FreeBSD" syslogd_log -p user.debug -t "prop2" -h "${SYSLOGD_LOCAL_SOCKET}" "freebsd" - atf_check -s exit:0 -o match:"prop1: FreeBSD" cat "${logfile}" - atf_check -s exit:0 -o not-match:"prop2: freebsd" cat "${logfile}" + syslogd_check_log "prop1: FreeBSD" + syslogd_check_log_nomatch "prop2: freebsd" - truncate -s 0 ${logfile} - printf ":msg,!contains,\"FreeBSD\"\nuser.debug\t${logfile}\n" \ + printf ":msg,!contains,\"FreeBSD\"\nuser.debug\t${SYSLOGD_LOGFILE}\n" \ > "${SYSLOGD_CONFIG}" syslogd_reload syslogd_log -p user.debug -t "prop1" -h "${SYSLOGD_LOCAL_SOCKET}" "FreeBSD" syslogd_log -p user.debug -t "prop2" -h "${SYSLOGD_LOCAL_SOCKET}" "freebsd" - atf_check -s exit:0 -o not-match:"prop1: FreeBSD" cat "${logfile}" - atf_check -s exit:0 -o match:"prop2: freebsd" cat "${logfile}" + syslogd_check_log_nomatch "prop1: FreeBSD" + syslogd_check_log "prop2: freebsd" - truncate -s 0 ${logfile} - printf ":msg,icase_contains,\"FreeBSD\"\nuser.debug\t${logfile}\n" \ + printf ":msg,icase_contains,\"FreeBSD\"\nuser.debug\t${SYSLOGD_LOGFILE}\n" \ > "${SYSLOGD_CONFIG}" syslogd_reload syslogd_log -p user.debug -t "prop1" -h "${SYSLOGD_LOCAL_SOCKET}" "FreeBSD" + syslogd_check_log "prop1: FreeBSD" syslogd_log -p user.debug -t "prop2" -h "${SYSLOGD_LOCAL_SOCKET}" "freebsd" - atf_check -s exit:0 -o match:"prop1: FreeBSD" cat "${logfile}" - atf_check -s exit:0 -o match:"prop2: freebsd" cat "${logfile}" + syslogd_check_log "prop2: freebsd" - truncate -s 0 ${logfile} - printf ":msg,!icase_contains,\"FreeBSD\"\nuser.debug\t${logfile}\n" \ + printf ":msg,!icase_contains,\"FreeBSD\"\nuser.debug\t${SYSLOGD_LOGFILE}\n" \ > "${SYSLOGD_CONFIG}" syslogd_reload syslogd_log -p user.debug -t "prop1" -h "${SYSLOGD_LOCAL_SOCKET}" "FreeBSD" syslogd_log -p user.debug -t "prop2" -h "${SYSLOGD_LOCAL_SOCKET}" "freebsd" syslogd_log -p user.debug -t "prop3" -h "${SYSLOGD_LOCAL_SOCKET}" "Solaris" - atf_check -s exit:0 -o not-match:"prop1: FreeBSD" cat "${logfile}" - atf_check -s exit:0 -o not-match:"prop2: freebsd" cat "${logfile}" - atf_check -s exit:0 -o match:"prop3: Solaris" cat "${logfile}" + syslogd_check_log_nomatch "prop1: FreeBSD" + syslogd_check_log_nomatch "prop2: freebsd" + syslogd_check_log "prop3: Solaris" } prop_filter_cleanup() { @@ -258,13 +252,12 @@ host_action_head() host_action_body() { local addr="192.0.2.100" - local logfile="${PWD}/host_action.log" atf_check ifconfig lo1 create atf_check ifconfig lo1 inet "${addr}/24" atf_check ifconfig lo1 up - printf "user.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + printf "user.debug\t${SYSLOGD_LOGFILE}\n" > "${SYSLOGD_CONFIG}" syslogd_start -b "${addr}" printf "user.debug\t@${addr}\n" > "${SYSLOGD_CONFIG}.2" @@ -276,8 +269,7 @@ host_action_body() syslogd_log -p user.debug -t "test" -h "${SYSLOGD_LOCAL_SOCKET}.2" \ "message from syslogd2" - atf_check -s exit:0 -o match:"test: message from syslogd2" \ - cat "${logfile}" + syslogd_check_log "test: message from syslogd2" } host_action_cleanup() { @@ -296,17 +288,17 @@ pipe_action_head() } pipe_action_body() { - logfile="${PWD}/pipe_action.log" printf "\"While I'm digging in the tunnel, the elves will often come to me \ - with solutions to my problem.\"\n-Saymore Crey" > ${logfile} + with solutions to my problem.\"\n-Saymore Crey" > testfile printf "!pipe\nuser.debug\t| sed -i '' -e 's/Saymore Crey/Seymour Cray/g' \ - ${logfile}\n" > "${SYSLOGD_CONFIG}" + testfile\n" > "${SYSLOGD_CONFIG}" syslogd_start syslogd_log -p user.debug -t "pipe" -h "${SYSLOGD_LOCAL_SOCKET}" \ "fix spelling error" - atf_check -s exit:0 -o match:"Seymour Cray" cat "${logfile}" + sleep 0.5 + atf_check -o match:"Seymour Cray" cat testfile } pipe_action_cleanup() { @@ -320,16 +312,15 @@ pipe_action_reload_head() } pipe_action_reload_body() { - local logfile="${PWD}/pipe_reload.log" local pipecmd="${PWD}/pipe_cmd.sh" cat <<__EOF__ > "${pipecmd}" #!/bin/sh -echo START > ${logfile} +echo START > ${SYSLOGD_LOGFILE} while read msg; do - echo \${msg} >> ${logfile} + echo \${msg} >> ${SYSLOGD_LOGFILE} done -echo END >> ${logfile} +echo END >> ${SYSLOGD_LOGFILE} exit 0 __EOF__ chmod +x "${pipecmd}" @@ -338,8 +329,9 @@ __EOF__ syslogd_start syslogd_log -p user.debug -t "pipe" -h "${SYSLOGD_LOCAL_SOCKET}" "MSG" - syslogd_reload - atf_check -s exit:0 -o match:"END" tail -n 1 "${logfile}" + atf_check pkill -HUP -F "${1:-${SYSLOGD_PIDFILE}}" + sleep 0.1 + syslogd_check_log_nopoll "END" } pipe_action_reload_cleanup() { @@ -354,17 +346,14 @@ jail_noinet_head() } jail_noinet_body() { - local logfile - syslogd_mkjail syslogd_noinet - logfile="${PWD}/jail_noinet.log" - printf "user.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + printf "user.debug\t${SYSLOGD_LOGFILE}\n" > "${SYSLOGD_CONFIG}" syslogd_start -j syslogd_noinet -s -s syslogd_log -p user.debug -t "test" -h "${SYSLOGD_LOCAL_SOCKET}" \ "hello, world" - atf_check -s exit:0 -o match:"test: hello, world" cat "${logfile}" + syslogd_check_log "test: hello, world" } jail_noinet_cleanup() { @@ -410,26 +399,25 @@ allowed_peer_head() } allowed_peer_body() { - local logfile - allowed_peer_test_setup - logfile="${PWD}/jail.log" - printf "user.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + printf "user.debug\t${SYSLOGD_LOGFILE}\n" > "${SYSLOGD_CONFIG}" syslogd_start -j syslogd_allowed_peer -b 169.254.0.1:514 -a '169.254.0.2/32' # Make sure that a message from 169.254.0.2:514 is logged. syslogd_log_jail syslogd_client \ - -p user.debug -t test1 -h 169.254.0.1 -S 169.254.0.2:514 "hello, world" - atf_check -o match:"test1: hello, world" cat "${logfile}" + -p user.debug -t test1 -h 169.254.0.1 -S 169.254.0.2:514 "hello, world" + syslogd_check_log "test1: hello, world" # ... but not a message from port 515. syslogd_log_jail syslogd_client \ - -p user.debug -t test2 -h 169.254.0.1 -S 169.254.0.2:515 "hello, world" - atf_check -o not-match:"test2: hello, world" cat "${logfile}" + -p user.debug -t test2 -h 169.254.0.1 -S 169.254.0.2:515 "hello, world" + sleep 0.5 + syslogd_check_log_nomatch "test2: hello, world" syslogd_log_jail syslogd_client \ - -p user.debug -t test2 -h 169.254.0.1 -S 169.254.0.3:515 "hello, world" - atf_check -o not-match:"test2: hello, world" cat "${logfile}" + -p user.debug -t test2 -h 169.254.0.1 -S 169.254.0.3:515 "hello, world" + sleep 0.5 + syslogd_check_log_nomatch "test2: hello, world" syslogd_stop @@ -438,10 +426,10 @@ allowed_peer_body() syslogd_log_jail syslogd_client \ -p user.debug -t test3 -h 169.254.0.1 -S 169.254.0.2:514 "hello, world" - atf_check -o not-match:"test3: hello, world" cat "${logfile}" + syslogd_check_log_nomatch "test3: hello, world" syslogd_log_jail syslogd_client \ -p user.debug -t test4 -h 169.254.0.1 -S 169.254.0.2:515 "hello, world" - atf_check -o match:"test4: hello, world" cat "${logfile}" + syslogd_check_log "test4: hello, world" syslogd_stop } @@ -458,16 +446,13 @@ allowed_peer_forwarding_head() } allowed_peer_forwarding_body() { - local logfile - allowed_peer_test_setup printf "user.debug\t@169.254.0.1\n" > client_config printf "mark.debug\t@169.254.0.1:515\n" >> client_config syslogd_start -j syslogd_client -b 169.254.0.2:514 -f ${PWD}/client_config - logfile="${PWD}/jail.log" - printf "+169.254.0.2\nuser.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + printf "+169.254.0.2\nuser.debug\t${SYSLOGD_LOGFILE}\n" > "${SYSLOGD_CONFIG}" syslogd_start -j syslogd_allowed_peer -P ${SYSLOGD_PIDFILE}.2 \ -b 169.254.0.1:514 -a 169.254.0.2/32 @@ -478,8 +463,8 @@ allowed_peer_forwarding_body() syslogd_log_jail syslogd_client \ -h 169.254.0.2 -p mark.debug -t test2 "hello, world" - atf_check -o match:"test1: hello, world" cat "${logfile}" - atf_check -o not-match:"test2: hello, world" cat "${logfile}" + syslogd_check_log "test1: hello, world" + syslogd_check_log_nomatch "test2: hello, world" } allowed_peer_forwarding_cleanup() { @@ -494,29 +479,28 @@ allowed_peer_wildcard_head() } allowed_peer_wildcard_body() { - local logfile - allowed_peer_test_setup - logfile="${PWD}/jail.log" - printf "user.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + printf "user.debug\t${SYSLOGD_LOGFILE}\n" > "${SYSLOGD_CONFIG}" syslogd_start -j syslogd_allowed_peer -b 169.254.0.1:514 -a '169.254.0.2/32:*' # Make sure that a message from 169.254.0.2:514 is logged. syslogd_log_jail syslogd_client \ -p user.debug -t test1 -h 169.254.0.1 -S 169.254.0.2:514 "hello, world" - atf_check -o match:"test1: hello, world" cat "${logfile}" + syslogd_check_log "test1: hello, world" + # ... as is a message from 169.254.0.2:515, allowed by the wildcard. syslogd_log_jail syslogd_client \ -p user.debug -t test2 -h 169.254.0.1 -S 169.254.0.2:515 "hello, world" - atf_check -o match:"test2: hello, world" cat "${logfile}" + syslogd_check_log "test2: hello, world" + # ... but not a message from 169.254.0.3. syslogd_log_jail syslogd_client \ -p user.debug -t test3 -h 169.254.0.1 -S 169.254.0.3:514 "hello, world" - atf_check -o not-match:"test3: hello, world" cat "${logfile}" + syslogd_check_log_nomatch "test3: hello, world" syslogd_log_jail syslogd_client \ -p user.debug -t test3 -h 169.254.0.1 -S 169.254.0.3:515 "hello, world" - atf_check -o not-match:"test3: hello, world" cat "${logfile}" + syslogd_check_log_nomatch "test3: hello, world" syslogd_stop } @@ -533,9 +517,9 @@ forward_head() } forward_body() { - syslogd_check_req epair + local epair - local epair logfile + syslogd_check_req epair atf_check -o save:epair ifconfig epair create epair=$(cat epair) @@ -558,11 +542,10 @@ mail.debug @169.254.0.2 ftp.debug @169.254.0.1 __EOF__ - logfile="${PWD}/jail.log" cat <<__EOF__ > ./server_config -user.debug ${logfile} -mail.debug ${logfile} -ftp.debug ${logfile} +user.debug ${SYSLOGD_LOGFILE} +mail.debug ${SYSLOGD_LOGFILE} +ftp.debug ${SYSLOGD_LOGFILE} __EOF__ syslogd_start -j syslogd_server -f ${PWD}/server_config -b 169.254.0.1 -b 169.254.0.2 @@ -570,15 +553,15 @@ __EOF__ syslogd_log_jail syslogd_client \ -h 169.254.0.3 -P $SYSLOGD_UDP_PORT -p user.debug -t test1 "hello, world" - atf_check -o match:"test1: hello, world" cat "${logfile}" + syslogd_check_log "test1: hello, world" syslogd_log_jail syslogd_client \ -h 169.254.0.3 -P $SYSLOGD_UDP_PORT -p mail.debug -t test2 "you've got mail" - atf_check -o match:"test2: you've got mail" cat "${logfile}" + syslogd_check_log "test2: you've got mail" syslogd_log_jail syslogd_client \ -h 169.254.0.3 -P $SYSLOGD_UDP_PORT -p ftp.debug -t test3 "transfer complete" - atf_check -o match:"test3: transfer complete" cat "${logfile}" + syslogd_check_log "test3: transfer complete" } forward_cleanup() { diff --git a/usr.sbin/syslogd/tests/syslogd_test_common.sh b/usr.sbin/syslogd/tests/syslogd_test_common.sh index 87e9080d99ca..a4aea07f8528 100644 --- a/usr.sbin/syslogd/tests/syslogd_test_common.sh +++ b/usr.sbin/syslogd/tests/syslogd_test_common.sh @@ -15,6 +15,7 @@ readonly SYSLOGD_CONFIG="${PWD}/syslog.conf" readonly SYSLOGD_LOCAL_SOCKET="${PWD}/log.sock" readonly SYSLOGD_PIDFILE="${PWD}/syslogd.pid" readonly SYSLOGD_LOCAL_PRIVSOCKET="${PWD}/logpriv.sock" +readonly SYSLOGD_LOGFILE="${PWD}/log" # Start a private syslogd instance. syslogd_start() @@ -83,6 +84,11 @@ syslogd_start() & # Give syslogd a bit of time to spin up. + if grep -q "[[:space:]]${SYSLOGD_LOGFILE}$" "${conf_file:-${SYSLOGD_CONFIG}}"; then + while [ ! -f "${SYSLOGD_LOGFILE}" ]; do + sleep 0.1 + done + fi while [ "$((i+=1))" -le 20 ]; do [ -S "${socket:-${SYSLOGD_LOCAL_SOCKET}}" ] && return sleep 0.1 @@ -106,7 +112,9 @@ syslogd_log_jail() # Make syslogd reload its configuration file. syslogd_reload() { + atf_check truncate -s 0 ${SYSLOGD_LOGFILE} atf_check pkill -HUP -F "${1:-${SYSLOGD_PIDFILE}}" + sleep 0.1 } # Stop a private syslogd instance. @@ -165,3 +173,28 @@ syslogd_cleanup() ifconfig $(cat epair) destroy fi } + +# Check the last entry in the log file for a given message. +syslogd_check_log_nopoll() +{ + local msg=$1 + + atf_check -o match:"${msg}" tail -n 1 "${SYSLOGD_LOGFILE}" +} + +# Same as above, but first wait for syslogd to write to the log file. +syslogd_check_log() +{ + local msg=$1 + + atf_check -r 10 -o match:"${msg}" tail -n 1 "${SYSLOGD_LOGFILE}" +} + +# Make sure no log entry matching the given message exists. +syslogd_check_log_nomatch() +{ + local msg=$1 + + sleep 0.5 + atf_check -o not-match:"${msg}" cat "${SYSLOGD_LOGFILE}" +} From nobody Thu Jan 22 17:17:57 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxnnd2qMCz6Q4Vs for ; Thu, 22 Jan 2026 17:17: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 4dxnnd1XYLz3f8p for ; Thu, 22 Jan 2026 17:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769102277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hk4Ge8N5nilOyGa+gKX9srKUsE5v0P4vd0W5YP37a3Y=; b=mRIeFwkSj/qg/58PWkwkr9ydCHa0dtNG1RjUTOOMbrHX/WYLkkteKKA7F9NUo5ZPQykjfQ TaNYp3LqJJAYeiu6kOGif8pD+fv9TkYRHXWcRXB4pPvnXSpFFo+4wceaClCJqcYRoXdvA2 ikyzG+7K8VPUtP4/CFKgmSXJ1J8Gk/SRI9GkW1ie4PUUUVVDWTEIFilM+1WBkIvIfn3zV4 fCwD6vdQAExwvAaBsrxvnVAg8B02Os2raYqA98mX0d3wzdyL5jNv1RDOKdSMqsGt0sL+/2 Mp/ckaxthOVx24t6lQ4ht5OUHvvd56NbCXYVEWFjMxVzXaD/LKh+vvmH8GmWdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769102277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hk4Ge8N5nilOyGa+gKX9srKUsE5v0P4vd0W5YP37a3Y=; b=Rb7Z8Ucqtj/HQr050pzQZ1rZ2y5Nyo2CuZeXWLBjCh+3eifqewlTE1sIffUx5bXhCW3Jjv QPcONkbVpSFVFF5ApI9oU6Xi7kVajEiP6urDYXs1f++Xq2O3fJqgKpItixJvJHKhD26FGL vjI7c7Lzi/sTTMn0oyXbjOwBKdtrHNoUBfpLMuavHM9eruaF8sWUZv1/062nKofg9ynUhx xCYmWz01jVXAp8eB2s6dItfCO3jvzgSvMesa3cVx2DY2V05N92DH4QjGXVg50qnkgcHKVJ PWsjYBSTxtfuEybfx+DP2iwCnccVFPDE4krSu+A07oRSyFCejxj28b/Pq6KMtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769102277; a=rsa-sha256; cv=none; b=EnDucONeL3/tZ/rvlgNMxf3gy1oTXtEFdFr8jKVc3maXkP/cXdoRdzwpcJd+YpADxLXORY t2D5PpQxnD9wQXpUdh3yAVvfvRdk746HCFqhm7cPcPWXBU8Kwp4yM1PChYqVwiDOF16fp+ oWOav+3oDrDdQrlSmRn9ZPdUrBhJZMpqvD3tSdIU+6OOYjqsPwtTt5PlGyZo+YNL7qXnIy SGY4RB7uGi3AHgZH8AILcPBWzAaFiVTv+LLKeSwUeHfNGuDYmhaUVIDU5tgKNp5HMoihtf g2VWpQ+2MEAxZfx7d34fq/TUHMPAakLPHig8+gLwYUUhEe1QnbRCfqZIv7VZHA== 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 4dxnnd0Tbtzj8y for ; Thu, 22 Jan 2026 17:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a99d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Jan 2026 17:17:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 92d251472edb - main - syslogd/tests: Improve loopback interface initialization List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 92d251472edba6c1c16a899797982251c585d706 Auto-Submitted: auto-generated Date: Thu, 22 Jan 2026 17:17:57 +0000 Message-Id: <69725bc5.3a99d.505b8c3f@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=92d251472edba6c1c16a899797982251c585d706 commit 92d251472edba6c1c16a899797982251c585d706 Author: Mark Johnston AuthorDate: 2026-01-22 15:51:42 +0000 Commit: Mark Johnston CommitDate: 2026-01-22 15:51:42 +0000 syslogd/tests: Improve loopback interface initialization - In syslogd_start(), assign the lo0 address in the specified jail. - Use the correct netmask. Reviewed by: jlduran MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54799 --- usr.sbin/syslogd/tests/syslogd_test.sh | 4 ---- usr.sbin/syslogd/tests/syslogd_test_common.sh | 8 +++++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/usr.sbin/syslogd/tests/syslogd_test.sh b/usr.sbin/syslogd/tests/syslogd_test.sh index d43473eac12d..d4723b9e05b3 100644 --- a/usr.sbin/syslogd/tests/syslogd_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_test.sh @@ -380,10 +380,8 @@ allowed_peer_test_setup() atf_check ifconfig ${epair}a vnet syslogd_allowed_peer atf_check ifconfig ${epair}b vnet syslogd_client atf_check jexec syslogd_allowed_peer ifconfig ${epair}a inet 169.254.0.1/16 - atf_check jexec syslogd_allowed_peer ifconfig lo0 inet 127.0.0.1/8 atf_check jexec syslogd_client ifconfig ${epair}b inet 169.254.0.2/16 atf_check jexec syslogd_client ifconfig ${epair}b alias 169.254.0.3/16 - atf_check jexec syslogd_client ifconfig lo0 inet 127.0.0.1/8 } allowed_peer_test_cleanup() @@ -529,12 +527,10 @@ forward_body() atf_check ifconfig ${epair}a vnet syslogd_server atf_check jexec syslogd_server ifconfig ${epair}a inet 169.254.0.1/16 atf_check jexec syslogd_server ifconfig ${epair}a alias 169.254.0.2/16 - atf_check jexec syslogd_server ifconfig lo0 inet 127.0.0.1/8 syslogd_mkjail syslogd_client vnet atf_check ifconfig ${epair}b vnet syslogd_client atf_check jexec syslogd_client ifconfig ${epair}b inet 169.254.0.3/16 - atf_check jexec syslogd_client ifconfig lo0 inet 127.0.0.1/8 cat <<__EOF__ > ./client_config user.debug @169.254.0.1 diff --git a/usr.sbin/syslogd/tests/syslogd_test_common.sh b/usr.sbin/syslogd/tests/syslogd_test_common.sh index a4aea07f8528..2f21137cf026 100644 --- a/usr.sbin/syslogd/tests/syslogd_test_common.sh +++ b/usr.sbin/syslogd/tests/syslogd_test_common.sh @@ -23,9 +23,6 @@ syslogd_start() local jail bind_arg conf_file pid_file socket privsocket local opt next other_args - # Setup loopback so we can deliver messages to ourself. - atf_check ifconfig lo0 inet 127.0.0.1/16 - OPTIND=1 while getopts ":b:f:j:P:p:S:" opt; do case "${opt}" in @@ -71,6 +68,11 @@ syslogd_start() esac done + # Setup loopback so we can deliver messages to ourself. + if [ $($jail sysctl -n security.jail.vnet) -ne 0 ]; then + atf_check $jail ifconfig lo0 inet 127.0.0.1/8 + fi + $jail syslogd \ ${bind_arg:--b :${SYSLOGD_UDP_PORT}} \ -C \ From nobody Thu Jan 22 17:17:58 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxnng1QVrz6Q4Qk for ; Thu, 22 Jan 2026 17:17: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 4dxnnf4Rgsz3fKq for ; Thu, 22 Jan 2026 17:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769102278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OMATC7mnO0otYXpiGOtNxsibzMHICGw1EX2KVnqc/34=; b=S8xmIY1KJL0KAtFa00vpmDhf424qnYsJkx4cvWx5kKWt3/GxJszwDDFV+as1O+mojZtv33 F92vvcUZBfjID6rmvzZM1SwR+Ztw8VgKtmMTRBKq2VVA+1jjCwLSIA621mpuMxQp1Eqmd7 ZlEQHM0U38hU79DBd7NsNdPX6al8z8rDFdS+GCrFUy4x12zFfl28TOfke+FU26eZYWLAGw 3KADcxVWwddAvP/cdqDOkCncnFaH7ZylkJZPahPduO6Gbj/WT3iw1K2j0sgaY+OYVgLEUl /h+dPXSzGvPg8Oes4niER0ly3QNar5O6sIlbJmi/bUqFsA8VlBFzyud6Io2G9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769102278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OMATC7mnO0otYXpiGOtNxsibzMHICGw1EX2KVnqc/34=; b=Ek6V1fhJ440n6BB36wFAEGhDD061hFPiprPtdSwVxIw0sJw+VJsi+8XYNhWncR7YhUOnKS RblA3ih4JWyhMS/khhrtxzN/kAO4MGZr4EIfAagKRe53HjwAcCtzrmpCkgfK9MTnc4Ehte LsWabwUItnQbVgNrI7MPsK3uZfEmJJP5oQwISbA2QlCn/mixLxDpL/dfbJuz1K4S9v7BH/ ewOPJwWnCPFcbQbJbP+w4do/lJbSP1eT74Udo3F19cbUoXri/6BVjGHp29e5h6cA749jC/ jqgE9w7hUheAScvdEnnOIPaeW6gruPqndvo361AwDak5Pr9c/edhd8MpexfQfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769102278; a=rsa-sha256; cv=none; b=ZxJZHLteZeJ3TVchOv+LeZmhQdozZTNbGP5paaTMeEuMBoUnrqPgqW7L1HgbZWyZPY/c6n iYLoFO5Lz9aC8kqZ4rEQ+TbV9S7uftvdsgtvKwYMqeeh0//wxb3OXKtVrTYvDgOssvM0nG ieGKn2Rrf6yUYYvw9QsIZdhIwi1xODDmbus6LKBWYm34kQY6DbmEbPbnpxBqozE0gGULPX EJkt0SyLeFGGvOfb3WN3srBqenvZU1n0trh6+A3ixhw3/vQKH+UDTKZxQ+M3/0RqcO/ilw Kqk6aDiFAa1FyzGQBjEi5g3NCvmc+dd5z+iagzq4pUIC0BNBYUBp+dP9kkbqQA== 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 4dxnnf19hWzjCj for ; Thu, 22 Jan 2026 17:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a34c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Jan 2026 17:17:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 14dce731d706 - main - syslogd/tests: Fix flakiness in forwarding tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14dce731d70686e08ed689729f53c6a5e2225498 Auto-Submitted: auto-generated Date: Thu, 22 Jan 2026 17:17:58 +0000 Message-Id: <69725bc6.3a34c.90c1bb0@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=14dce731d70686e08ed689729f53c6a5e2225498 commit 14dce731d70686e08ed689729f53c6a5e2225498 Author: Mark Johnston AuthorDate: 2026-01-22 15:52:00 +0000 Commit: Mark Johnston CommitDate: 2026-01-22 15:52:00 +0000 syslogd/tests: Fix flakiness in forwarding tests syslogd_start() waits for the local log socket to appear before returning, to ensure that the daemon is ready to handle log messages. Some tests start two daemons, so by default the socket already exists when the second daemon is started, so syslogd_start() returns early. The test subsequently sends a message to this second daemon, which sometimes isn't ready. Define a separate log socket for the second daemon. Add a check to syslogd_start() to help catch this type of bug. Reviewed by: jlduran MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54800 --- usr.sbin/syslogd/tests/syslogd_test.sh | 8 +++++--- usr.sbin/syslogd/tests/syslogd_test_common.sh | 9 +++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/usr.sbin/syslogd/tests/syslogd_test.sh b/usr.sbin/syslogd/tests/syslogd_test.sh index d4723b9e05b3..1f235c476c49 100644 --- a/usr.sbin/syslogd/tests/syslogd_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_test.sh @@ -452,7 +452,7 @@ allowed_peer_forwarding_body() printf "+169.254.0.2\nuser.debug\t${SYSLOGD_LOGFILE}\n" > "${SYSLOGD_CONFIG}" syslogd_start -j syslogd_allowed_peer -P ${SYSLOGD_PIDFILE}.2 \ - -b 169.254.0.1:514 -a 169.254.0.2/32 + -b 169.254.0.1:514 -a 169.254.0.2/32 -p ${PWD}/peer # A message forwarded to 169.254.0.1:514 should be logged, but one # forwarded to 169.254.0.1:515 should not. @@ -544,8 +544,10 @@ mail.debug ${SYSLOGD_LOGFILE} ftp.debug ${SYSLOGD_LOGFILE} __EOF__ - syslogd_start -j syslogd_server -f ${PWD}/server_config -b 169.254.0.1 -b 169.254.0.2 - syslogd_start -j syslogd_client -f ${PWD}/client_config -P ${SYSLOGD_PIDFILE}.2 + syslogd_start -j syslogd_server -f ${PWD}/server_config \ + -b 169.254.0.1 -b 169.254.0.2 + syslogd_start -j syslogd_client -f ${PWD}/client_config \ + -p ${PWD}/client -P ${SYSLOGD_PIDFILE}.2 syslogd_log_jail syslogd_client \ -h 169.254.0.3 -P $SYSLOGD_UDP_PORT -p user.debug -t test1 "hello, world" diff --git a/usr.sbin/syslogd/tests/syslogd_test_common.sh b/usr.sbin/syslogd/tests/syslogd_test_common.sh index 2f21137cf026..47fca62e66d0 100644 --- a/usr.sbin/syslogd/tests/syslogd_test_common.sh +++ b/usr.sbin/syslogd/tests/syslogd_test_common.sh @@ -68,6 +68,11 @@ syslogd_start() esac done + socket=${socket:-${SYSLOGD_LOCAL_SOCKET}} + if [ -S "${socket}" ]; then + atf_fail "socket ${socket} already exists" + fi + # Setup loopback so we can deliver messages to ourself. if [ $($jail sysctl -n security.jail.vnet) -ne 0 ]; then atf_check $jail ifconfig lo0 inet 127.0.0.1/8 @@ -80,7 +85,7 @@ syslogd_start() -f "${conf_file:-${SYSLOGD_CONFIG}}" \ -H \ -P "${pid_file:-${SYSLOGD_PIDFILE}}" \ - -p "${socket:-${SYSLOGD_LOCAL_SOCKET}}" \ + -p "${socket}" \ -S "${privsocket:-${SYSLOGD_LOCAL_PRIVSOCKET}}" \ ${other_args} \ & @@ -92,7 +97,7 @@ syslogd_start() done fi while [ "$((i+=1))" -le 20 ]; do - [ -S "${socket:-${SYSLOGD_LOCAL_SOCKET}}" ] && return + [ -S "${socket}" ] && return sleep 0.1 done atf_fail "timed out waiting for syslogd to start" From nobody Thu Jan 22 18:16:56 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxq5h5R7Mz6Q7Ws for ; Thu, 22 Jan 2026 18:16: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 4dxq5h2bpXz3pPD for ; Thu, 22 Jan 2026 18:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769105816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DGKElnf1k0LQikzn83PDm+djwnLfb12xgRAi8LI3x7I=; b=KIPj0TKs2/8HS6EZdyb8PjRBZXlamf5BBedYXLsZsRyv8HAVflv2zqP7yWdBzs4HcqLtDQ dFzUmCe7lovyOlNhRTWXaz5BJ2L5FcOdvc+etQyFaoqCZmbAtgcwQzpGrsDI16rJg4aYET 7Nan6/P8nu9AlYC0kecGrKk+0BKPjqlN0gogUcl8ZrruRvvRGh/DiVb9tQgA3o3P2cYEMi MBpAH7jlQ9HogvijrXVbGoV2NX5yjZFDb91QZSmG3BK659UGXQ2wSwYYF2qwhVnTbWEFSO 6KqJvMaXIk8dVXxM35ZfdYm35OMUXXlyBWRLHSEDTQ4T891HEryCsqwH9AUxCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769105816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DGKElnf1k0LQikzn83PDm+djwnLfb12xgRAi8LI3x7I=; b=X9cTzI2Cr0ZgVIz5A9hCaqS0Ar4OOnuTBsGtt9hHp469gAEhOpHOvC706Jv4kGXNPlV8UE Za52cMit5WnZmMNV+oyuAg0RHZMSly0wK+twTKX/4TAKDLBKSxRLa/CvtuelAvU5dXa/S6 tcLiVTwEn3/nL+iD8Py3DIWxXGx90PUFS+bI0hO3ZRFYj/6BNIMWY3oaV5m0INcRiIW0x5 q8+flWB0aJAe2Hk+/Nd2vOZiKPun+7+ZHSVrTEx5COVTKGexTOyEJ/SxHWmccHPqUt8aKJ Qy7pftVIA01o5w8MWdCojH2beSJ5UtFf7NcDy9BM73thWDmcD38lcSYYeJuyMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769105816; a=rsa-sha256; cv=none; b=BHiKLH71272Dffh/nXlo+5fc6QJfvT5FeQ18Npj/QarOFYDuuuvnKF4GsT76FrSJa+/IUg hrcySjq6t2gVMjliQvz/XY/VooEXOHxdDXUmbu8ZJ3P1YU/cGyFCd4AcIjrgkhT4og/LFj MWqQTk9wbCcSoFI+hNUsiQkTdkpNJk6PxeI+wRUfnKSLKCOiCjiAzrcPOYT7zbOZEMDFRE 30a/yjfdUwKx+hXl0Yd6Nl79TyxHSHDzHYV0g020KWpRoSbFj0yqY2yF3DJT23CYCs+WRG UEkB4NqkvQL8JyuclGD34iBEeYR2Uaz04Fc2iaF9GAE0/0A3rRq42nHCT1iG2g== 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 4dxq5h1GvRzkV7 for ; Thu, 22 Jan 2026 18:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f637 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Jan 2026 18:16:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 4b9620433855 - main - mdmfs: Fix soft updates logic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b9620433855b75989164c1a8a8a2e1a9b5fbff2 Auto-Submitted: auto-generated Date: Thu, 22 Jan 2026 18:16:56 +0000 Message-Id: <69726998.3f637.1ee0b78f@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4b9620433855b75989164c1a8a8a2e1a9b5fbff2 commit 4b9620433855b75989164c1a8a8a2e1a9b5fbff2 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-22 18:16:37 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-22 18:16:45 +0000 mdmfs: Fix soft updates logic Now that newfs(8) has a command-line argument to disable soft updates, use that instead of running tunefs(8) after the fact to turn them off. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: mckusick, imp Differential Revision: https://reviews.freebsd.org/D54783 --- sbin/mdmfs/mdmfs.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c index 69149b3fb465..cd0bf7c96143 100644 --- a/sbin/mdmfs/mdmfs.c +++ b/sbin/mdmfs/mdmfs.c @@ -104,7 +104,7 @@ main(int argc, char **argv) bool detach, softdep, autounit, newfs; const char *mtpoint, *size_arg, *skel, *unitstr; char *p; - int ch, idx, rv; + int ch, idx; void *set; unsigned long ul; @@ -343,8 +343,7 @@ main(int argc, char **argv) if (!have_mdtype) mdtype = MD_SWAP; - if (softdep) - argappend(&newfs_arg, "-U"); + argappend(&newfs_arg, softdep ? "-U" : "-u"); if (mdtype != MD_VNODE && !newfs) errx(1, "-P requires a vnode-backed disk"); @@ -357,13 +356,6 @@ main(int argc, char **argv) do_mdconfig_attach(mdconfig_arg, mdtype); if (newfs) do_newfs(newfs_arg); - if (!softdep) { - rv = run(NULL, "%s %s /dev/%s%d", _PATH_TUNEFS, - "-n disable", mdname, unit); - if (rv) - errx(1, "tunefs exited %s %d", run_exitstr(rv), - run_exitnumber(rv)); - } do_mount_md(mount_arg, mtpoint); } From nobody Thu Jan 22 19:09:42 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxrGZ66xNz6QBrJ for ; Thu, 22 Jan 2026 19: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 4dxrGZ4ZD0z3xYn for ; Thu, 22 Jan 2026 19: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=1769108982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1rs6P6ivYyX0CKaceqdbfA3oiKBWyr8EHwJNu+gL2/U=; b=kG6uOwzZIP5VZqb9DpYvK4TEmUbqEcIPwW+9/hIg4jDsBdosEcKU8Sd/G1hLPFYXYSYV3+ ZhHdUyI7/8pjo6Im2Hboc2/Aif3F786NyJugsivUgSOjVAA0dJJiqwgUc2bSuDwv5rEGzB tfMboZ6eLwifw55M2GH1Dtr4qL1pC/GoELBIDh9SKYcCscsz3WA9+9RNXYQtcW5QvZUWcK W0uImVJYyYauBzxDq+uQJnBvA5tj3SkCMUPDQafSd95g7biDdgYcoRAIGBqPNS54CPJQMc LK8Xnc4j50OXN2krFMunlZ4fPI5kK0OU+8CpK2pRmO430KrQPs1nOEtsbhkcJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769108982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1rs6P6ivYyX0CKaceqdbfA3oiKBWyr8EHwJNu+gL2/U=; b=BVts2bNq4qd6iSNnF1Q8OqfVzQ63pRxEtPBjB8pqEhcKrpL7dhCNM9vwzeCWKlyw68je7k LIQx01JZdWJdSEfNoR5ZquxFCahe0pr87VQozPNAtgTU7bl1BtqHSZPlALwMaQthzr2Wse +TdEHfV9Dh3gXE4U88MS47amLPBabAJO0TkpLUhwoBWfWn4UiwK2jOfcHFFFBB8xtYuy2Q hZVL3XIz/qR37K7QNnCXIKzZS6lOEGoNsJyQqW/jNX67dDYGlbs271uxnCVkus3ze0Y+IC HiKQxEafKcbdINbmU9KH/ochNalifJyDvmAF+4iRdgnd5OTZnzKlIEQSqEKzIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769108982; a=rsa-sha256; cv=none; b=yQ7fYbsN833w6rU8otaEDeOR7QYAF5Te3npbDliz5ZYgsLr1wLvL45QJCZ+dVr8eenMz31 Y9uHNA07VsxGy2Bk0R4oOGTzkSa8MA4cRhwsjXaB7FeHvclMFQSRlRymkPQsNX0CbAaCU5 wI/eHqWdBK+pusbW6ctZDrdeYeFfOvSrmmrOJJTKF+AFHgY7BOxr/dzERMHUXTrrMRjLl8 kW4dQHvBNReCevLqMM6OJoF8ZB6wwdebJirDzoyXU32MGtx5Wk3K9qnqNQYTQMKytS8c/g t9n/eKZHZPagAd7WnTp7m6CqG9m596sS08YU5gTA0uul8VfG8Bi86M9kGhroLQ== 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 4dxrGZ2zYMzmDN for ; Thu, 22 Jan 2026 19:09:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9b6e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Jan 2026 19:09:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2b1db07bec92 - main - x86: add machine/ifunc.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b1db07bec92e9447e6574a74366d4dd606e80a6 Auto-Submitted: auto-generated Date: Thu, 22 Jan 2026 19:09:42 +0000 Message-Id: <697275f6.9b6e.4ba32b9a@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2b1db07bec92e9447e6574a74366d4dd606e80a6 commit 2b1db07bec92e9447e6574a74366d4dd606e80a6 Author: Konstantin Belousov AuthorDate: 2026-01-22 05:08:30 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-22 19:09:21 +0000 x86: add machine/ifunc.h Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/amd64/include/ifunc.h | 5 +++++ sys/i386/include/ifunc.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/sys/amd64/include/ifunc.h b/sys/amd64/include/ifunc.h new file mode 100644 index 000000000000..1af46757b836 --- /dev/null +++ b/sys/amd64/include/ifunc.h @@ -0,0 +1,5 @@ +/* + * This file is in the public domain. + */ + +#include diff --git a/sys/i386/include/ifunc.h b/sys/i386/include/ifunc.h new file mode 100644 index 000000000000..1af46757b836 --- /dev/null +++ b/sys/i386/include/ifunc.h @@ -0,0 +1,5 @@ +/* + * This file is in the public domain. + */ + +#include From nobody Thu Jan 22 19:09:43 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxrGc0jVKz6QBrN for ; Thu, 22 Jan 2026 19: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 4dxrGb3cnCz3xZ3 for ; Thu, 22 Jan 2026 19: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=1769108983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=69OdUQYLyAJrO4NS9NdfAOKcASiDT8Xep0anhm7Hj2s=; b=faS2x4pyFlMg2634Oj5q5MToexWMt3JAUE4Kzy3MdLOgo2mdBbhLPj3r5tEQ6eAQ92YJHa IxgmAQVp+Jp2aPjwbQklebcSad+XyvUlpmYHlpKG4DcOYBgRgNjMjVHOA0tJ1YXbfSEJtk 59feclHt7YH/HqeO5ltc1LtXLWYlShqZX+S5islSftHjFseOPHNEdCLrsAOI3GIikKyp5t KRsqsZZPMSTfcLm2jqMqD9ysSlSLk8d6d37w+WNuVf2rJ4B2/91FFQKjRnwkKvwSTg5fYU H7fTuKG8SWJWQUE7aqvpEgPxE0aS8t03+TLvDwZGGgRS2vLhO9qXOV0gXi6f/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769108983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=69OdUQYLyAJrO4NS9NdfAOKcASiDT8Xep0anhm7Hj2s=; b=SGydIuk2y1XpS61g5OPW/sqIzdK/rMOxhSamrkzxlywBVdtr/lOhkWdABv9Vqq21ggDnP+ 1tix+1WsdfriGjYgZBx/qPzwneEyh6P3yQl8M5b/6OcK/d5sQjlUhM0WPaVPkNZo4yvHc0 LggYLaa8qGVmwLEQAjJd1ZKPYLsEtFL2lE6PLkxRzXO6JklRlBr+e736OrX11EIeNNNxu9 Pr3wRIckbe9p8594S5WCt9T1PGVM0inNalzGk83ThiR2LsCCmGU3m6kPLfDiHdqRL7H04k gFvVgsmZFaPDI9eNKfuMe4kmIdMXGAYP4UWu2N/m9sWOvwFb1ulPv2ogzsADRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769108983; a=rsa-sha256; cv=none; b=qcaC7gjJ90779Z20fVXMWdEhjIIhLRgQprL1/SGVcsTa6GjEslLXhbsa83E4WTElHAw0Is RrfDZh4g92kaaGFH9mIDOK0f21ETsmxVoYKje0u7UFaZLG2xxPuXrDq0CeKaIAojuXdKJQ mCi2962T1y1aVDgriteVJ8aiW68Es8Jloie0A9ZIdNS1UKUJ1Ff+SGlIoge7uq5Ngk3tM4 xvWb12I0+79xneO/4ryihf9SL7C9oYeHJrdYkHVgpSqEKm5CvvyppghkzPKctxMf4zvOqe g9eZFVgQaiLnro3YGEA9WLM/LiYPK2ua4NSwRTBmV63spXpTqxQb9FlEe9+xhw== 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 4dxrGb31rnzlyJ for ; Thu, 22 Jan 2026 19:09:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bd4c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Jan 2026 19:09:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: dfc4186c6dcf - main - x86 lapic: Dump LVTs from the ddb show lapic command List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dfc4186c6dcf2986b510fac108784011a236554d Auto-Submitted: auto-generated Date: Thu, 22 Jan 2026 19:09:43 +0000 Message-Id: <697275f7.bd4c.5a32280@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=dfc4186c6dcf2986b510fac108784011a236554d commit dfc4186c6dcf2986b510fac108784011a236554d Author: Konstantin Belousov AuthorDate: 2026-01-22 18:00:56 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-22 19:09:21 +0000 x86 lapic: Dump LVTs from the ddb show lapic command Add description for each LVT element, use it in show lapic dump. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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 Thu Jan 22 19:50:47 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dxs9z4YBCz6QDqF for ; Thu, 22 Jan 2026 19:50: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 4dxs9z2Bpsz474M for ; Thu, 22 Jan 2026 19:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769111447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0kJiaCEIcGVfA1WCwvf92bx4Qmmj/TOlOWdiaShX4NM=; b=GTCk/MVuxVxcV4gTJfRADt8hkblFg/nlMOt2v/1I7JmwNYtLp7CMfXDlURXbQYivLW2WVb UBvDrE8IbB9TL642H1gIdTLisFCTyIqNRt5n0VX3GEIncADlYcdWjbxM6T1u/xOJ2p0N/W WCrk6nk/PftJYjn1tVIXDDFKk2W+VRGW6SF2ytjv03uvHbrciofqFJ4OFS3UAa1WVksLiZ RnAgzD9TAAJHOmMpv53FAIRiQSMwLa+coyPE5x6JTnXIJJ8DH7LWXc1LVAXsb5F8hyx9sV qoSkaPE4XXW/cqNQEFrQxZOc4aK7zVRQqmx2zBvSvyRH6U2jUupmOk+vxqMp9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769111447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0kJiaCEIcGVfA1WCwvf92bx4Qmmj/TOlOWdiaShX4NM=; b=CTr9eyTSYI6oAlCp8+ySUKyyY9pTlXAPWjSBRBIxF6bstYLchywi+s/gKXfIbc6KWAj5hz xuQtIANuuVdvEX1KpKygdpe73KsDyhszY08hOaYdmI/J64aiA7YmqknQpRKa5cFfkTEsIf 3I+59R9+M+inUxA5QlUJWpSgAsH02wWoI+zPT9DrL9tGnyrB+xgaKJ7zR4YtY/leIy0uJO XDRJd9JlKyF6aJ39UrKjvqeNJyQEf242rrEwHbeHbZntWz7qRvSXr3OFidrYM+NeSlLNSh 5OfDsFHfwp83ySQ4An4pB0Wsd8K3MsjeOqCN2+hoY3srPsT+Owl7QU1AEc4W8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769111447; a=rsa-sha256; cv=none; b=cOTQ2I6Bus10gh4qCizVSGWZLRG2mANxUBJuA7AulC0MJbGtW95r/nn90Va2XSlXdgrk8o 51FrA0Y11Aw25TfuY8E6KYOhVDvEXlDctPKBqqpefuNOj83EkVFhb9vsUrYtAcs053LanU Qely0C5LLwY14F0ACD8fDrN3nnY1I+QSubhdFXkt1IAsRvfqHMvSyC2qXnKsvPfYQ0e2A0 PZZIoYDagiHxrbirFhjErGAtAOFyzhwgdi/yiLIJhzn6L2UK1Xo6Dc7CObFcITTE9n+XMH 7MEfG54Ax/5AScB0TJdINXBGf76dIfExDSxn3tD14sXi+7JNCOT+sbnmaxBNhw== 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 4dxs9z1hS1znRP for ; Thu, 22 Jan 2026 19:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21b85 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Jan 2026 19:50:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Siva Mahadevan Subject: git: 8352e24d0bc5 - main - tests/ktest_netlink_message_writer: remove INVARIANTS requirement List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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/main X-Git-Reftype: branch X-Git-Commit: 8352e24d0bc59f9730980986600bde7d8cdce21d Auto-Submitted: auto-generated Date: Thu, 22 Jan 2026 19:50:47 +0000 Message-Id: <69727f97.21b85.7e8c5cdb@gitrepo.freebsd.org> The branch main has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=8352e24d0bc59f9730980986600bde7d8cdce21d commit 8352e24d0bc59f9730980986600bde7d8cdce21d Author: Siva Mahadevan AuthorDate: 2026-01-22 19:49:51 +0000 Commit: Siva Mahadevan CommitDate: 2026-01-22 19:49:51 +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 MFC after: 3 days Signed-off-by: Siva Mahadevan Sponsored by: The FreeBSD Foundation --- 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 Fri Jan 23 07:55:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dy9Ff3Xgyz6Pq2s 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 4dy9Ff275xz3GDM 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 4dy9Ff1Nwdz18bt 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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 08:00:09 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dy9MY4cFJz6PqPR for ; Fri, 23 Jan 2026 08:00: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 4dy9MY3MlRz3H1x for ; Fri, 23 Jan 2026 08:00:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769155209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WM02WunT/mN3Fm0Vhgx5jGF4Cgen81bjAA5h0DHXP5E=; b=XLxue6a9S3+bS/P4Zczcvcumbym8fT8a5dbHRrBXUEffdT2Z+S0xk++op8SbW22b9qrhpP 9PqRMtYVEixFNqL3DkTEAn7TbeaCacwWVsl9JmYMGFruIKDUQVTLFjKB5bUQE682WeP3Jb Tk02QcowiHG6wy7yUGYHvPgKVIYGrZ5UNCXNWy87NXvNCX5zzuoLje/2byvguWAziHbhMg hdsirImSrC4kZltatXeGtaR82+ztdDozouxKb8t4yHFMrYPWyDZ0v3mAOfUOUtKWS2sgO7 ACdidmB25D87gtpOOy6w9O51cf3PL+1/ticdWuqTqA90VqWYdUv8INzeT4Tz6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769155209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WM02WunT/mN3Fm0Vhgx5jGF4Cgen81bjAA5h0DHXP5E=; b=U9LiBAecmnvrxcLZ3H/XaNNiuaqoEp5ZT4h0UojhHPmdRj5WMeF+ZReJhMl8Rds1NVRliW qOLvIAa1hfOTRsmTA08Bvkho6SLr8AJtVn+T84ZCeTkNAxXUif43WUc+A72ZX4sdsu51Um /vEJ+rofqW2BOVhdk2rIV/uzWoNWLrVxRQVIuFwZdClg7B/+Gnyyw614qRXoCnyuKB/imq SundBSBSXBLUDC8p/CgA1SbFIAQZdvA1pJg0MkAddItnIX2TDKuDtW/187+8+ZXPzYHi4j wbSk1uCo5N+XqzdAdBtO865uJaXeIGskDUWVD7pEBRSl/MjmCPo1YD1ClMNtyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769155209; a=rsa-sha256; cv=none; b=nb7Oi20CeFE5eQ8NVsPP2na2dmfGSAGMIpAdflD1hm134nPGKZVBowAvKwGFZYiPvkX1UK YnlwJe8/dg0lFs/E/0vHfCrYG1QIQGEANJrjwvohkYekmZDhRBRh45wvj2sG+SEnGBKI47 R49QUGKM9rwwV8I5qBDOIL6c7e6u5xL9h2rHf2ONQmSt0xEG3YVp7yshOv7+vZ305DDHUY y5nw2s7DUbGvPn2gScNnucnjhPtHG+bw0BApxKr8NBR99A8VtdlVZP0D1et5YVFk3XDXjm ioRDjRO3zJFiPvK780wdNgJWOTlYBrWPLYpF8n9vue758/UjjlYVsAqUiuaJLQ== 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 4dy9MY2zhFz18G5 for ; Fri, 23 Jan 2026 08:00:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20f59 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 08:00:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: f31336b3e314 - main - dpnaa2: announce transmit checksum support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f31336b3e3146fed9cc517fef8e877c17496f9e0 Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 08:00:09 +0000 Message-Id: <69732a89.20f59.12971f05@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f31336b3e3146fed9cc517fef8e877c17496f9e0 commit f31336b3e3146fed9cc517fef8e877c17496f9e0 Author: Michael Tuexen AuthorDate: 2026-01-23 07:59:57 +0000 Commit: Michael Tuexen CommitDate: 2026-01-23 07:59:57 +0000 dpnaa2: announce transmit checksum support Let the network stack know that the NIC supports checksum offloading for the IPv4 header checksum and the TCP and UDP transport checksum. This avoids the computation in software and therefore provides the expected performance gain. PR: 292006 Reviewed by: dsl, Timo Völker MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54809 --- sys/dev/dpaa2/dpaa2_ni.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/dev/dpaa2/dpaa2_ni.c b/sys/dev/dpaa2/dpaa2_ni.c index eda5bab78bde..5f796e6e472b 100644 --- a/sys/dev/dpaa2/dpaa2_ni.c +++ b/sys/dev/dpaa2/dpaa2_ni.c @@ -220,6 +220,9 @@ MALLOC_DEFINE(M_DPAA2_TXB, "dpaa2_txb", "DPAA2 DMA-mapped buffer (Tx)"); #define RXH_L4_B_2_3 (1 << 7) /* dst port in case of TCP/UDP/SCTP */ #define RXH_DISCARD (1 << 31) +/* Transmit checksum offload */ +#define DPAA2_CSUM_TX_OFFLOAD (CSUM_IP | CSUM_DELAY_DATA | CSUM_DELAY_DATA_IPV6) + /* Default Rx hash options, set during attaching. */ #define DPAA2_RXH_DEFAULT (RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3) @@ -559,6 +562,7 @@ dpaa2_ni_attach(device_t dev) if_settransmitfn(ifp, dpaa2_ni_transmit); if_setqflushfn(ifp, dpaa2_ni_qflush); + if_sethwassist(sc->ifp, DPAA2_CSUM_TX_OFFLOAD); if_setcapabilities(ifp, IFCAP_VLAN_MTU | IFCAP_HWCSUM | IFCAP_HWCSUM_IPV6 | IFCAP_JUMBO_MTU); if_setcapenable(ifp, if_getcapabilities(ifp)); @@ -2600,8 +2604,10 @@ dpaa2_ni_ioctl(if_t ifp, u_long c, caddr_t data) changed = if_getcapenable(ifp) ^ ifr->ifr_reqcap; if ((changed & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) != 0) if_togglecapenable(ifp, IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6); - if ((changed & (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6)) != 0) - if_togglecapenable(ifp, IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6); + if ((changed & (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6)) != 0) { + if_togglecapenable(ifp, IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6); + if_togglehwassist(ifp, DPAA2_CSUM_TX_OFFLOAD); + } rc = dpaa2_ni_setup_if_caps(sc); if (rc) { From nobody Fri Jan 23 11:07:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyFWg1g7Jz6P38h for ; Fri, 23 Jan 2026 11:07: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 4dyFWg0zpJz3Y2L for ; Fri, 23 Jan 2026 11:07:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769166447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A9gHN5YDlgtq5OIdfvhlWwaSwSdUV4Q8IGovvh298Qs=; b=jMLfcpnGp2/INaZ3t7Z47g32dF0QiBtGddtGWDaUBmNeKUo6F08dNiDl9cbWEUnc+y8mal LZjGyLXOAZIUiHslYy8n0K0aySKSQ7JumqgKeFHyWVNJJnc+WWDt2K+Di2hO/cc5E/LfK9 k++oziVtxzgQeUiIe3hHm8bVOyMpQo1632LW28J4gh/5pzB+Ka5GRGlVFly4EbBYCRHbKc Sl9E2KXSl4h5cJP4KXzW9KGTIqaLflw8WNAKqoQn/65IjgTzzXRDohsPMEAmQLNcvJ1DL7 lK0/HNT/on6XqOKr3h8MIw1ipI64CCiXxDvT2iKCI98Oo2E2tzsv37DLA+BMDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769166447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A9gHN5YDlgtq5OIdfvhlWwaSwSdUV4Q8IGovvh298Qs=; b=Ki288F14QAdYi045ME4MtXTRtHsyuxl9Ja6q/ss0V1gDTftuB7xZ+dmIFCvAO1pr4llcov vD0sh9fgBBo6Ors5LNswfCP9znoDZcWSPh+hVHt05uQoen1nSrnK2jkMboifEmNX7ZuW79 9iEqzpdeOsWLRL95nDwILcXKNt/xUqHgwFzw7ZhxeLsPr8wtomelNAL25yqg/IDgsObJNQ wmphYcSFftq2KqpYDwFe1RGAiaFcZqDEUELEGDVqATj4tLWxUo84LNapkY4Qlm3Q2lUXUG FxcbaKbmxq97Uwhndkoigmj6/mTDxsNsC9RuW1THHF7i06jzRIqwTiLGB6wC+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769166447; a=rsa-sha256; cv=none; b=R4BEYPCeETp7dxQSUA6rZJx5w7dF2tDhmOvZNKXQ+j+zw/2M5doidYofxb1gUMFEdHot1o cMIZUdmlQXddsjslzxtUhG8JUPjS4c+j9AbRgMUgGQo0H5NnBIc9KeXmbDmfakdBFd4YUi 5S+EzjfMkQgK/2rwz2VLk7EUMvmzBBmp6ujWDi/Q8timoCKghfn64FDR9XbWs2/BzYkEp+ AtduSzGGoPfI88Tgh/uu81ldQGFUyirzVcZCd1BWt+myzWUzJc7kCZiyFL+bHqgIZs8doV f5qsrQAEvIDWoFnJUJCtuevHIIzNHKMtuiyVyXEOi1Cp/OwkRSOtlQmX9eDF2w== 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 4dyFWg0VLjz1Zw for ; Fri, 23 Jan 2026 11:07:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ab34 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 11:07:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: ac5a19ec6989 - main - rpc/xdr.h: make xdrproc_t always take two arguments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac5a19ec6989675c8ec6c3ca245dba243d1a6416 Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 11:07:27 +0000 Message-Id: <6973566f.3ab34.6138d266@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=ac5a19ec6989675c8ec6c3ca245dba243d1a6416 commit ac5a19ec6989675c8ec6c3ca245dba243d1a6416 Author: Brooks Davis AuthorDate: 2026-01-23 10:35:32 +0000 Commit: Brooks Davis CommitDate: 2026-01-23 10:35:32 +0000 rpc/xdr.h: make xdrproc_t always take two arguments The type of xdrproc_t is clearly defined in the comments as a function with two arguments, an XDR * and a void * (sometimes spelled caddr_t). It was initialy defined as: typedef bool_t (*xdrproc_t)(); At some point people started giving it a non-empty argument list. Unfortunatly, there has been widespread disagreement about how arguments are passed. There seems to have been a widespread view that it should be allowed to pass three argument function pointer to xdrproc_t. Most notable is xdr_string which takes a maximum length parameter. This lead to all sorts of prototypes (all of which have been present in the FreeBSD source tree): FreeBSD userspace (nominally from tirpc, but seemingly local): typedef bool_t (*xdrproc_t)(XDR *, ...); FreeBSD kernel, glibc: typedef bool_t (*xdrproc_t)(XDR *, void *, ...); rcp/xdr.h with _KERNEL defined (not used?): typedef bool_t (*xdrproc_t)(XDR *, void *, u_int); gssrpc (in krb5) and Linux kernel: typedef bool_t (*xdrproc_t)(XDR *, void *); For two argument functions on current ABIs, these all equivalent as these arguments are passed in registers regardless of decleration and definition, but we end up with two problems: - xdr_free((xdrproc_t)xdr_string, ...) calls xdr_string with no third argument and (at least on FreeBSD) may fail to free memory if the string is shorter than the value lying around in the third argument register. There are no instance of this in tree, but I found some with Debian code search, in particular in OpenAFS. - Under CheriABI, variadic arguments are passed in a separate, bounded array so theses prototypes aren't equilvalent to the non-variadic calling convention of the functions. The reality is that that xdr_string should not be cast to xdrproc_t and xdr_wrapstring should be used instead so we do not need to support this case. Instances of the former behavior are now extremely rare. With this change we bring FreeBSD in line with gssrpc and the Linux Kernel. Warnings about casts should now be correct and should be fixed. Bump __FreeBSD_version as some software required adaptation if it is declaring functions to cast to xdrproc_t. Update OpenZFS's workaround of this historic mess accordingly. Effort: CHERI upstreaming Sponsored by: Innovate UK Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D54824 --- include/rpc/xdr.h | 9 +-------- lib/libc/rpc/rpc.3 | 4 ++-- sys/contrib/openzfs/module/nvpair/nvpair.c | 3 ++- sys/rpc/xdr.h | 9 +-------- sys/sys/param.h | 2 +- 5 files changed, 7 insertions(+), 20 deletions(-) diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index ecf10e1659e4..4c75bcc5bbf7 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -129,14 +129,7 @@ typedef struct XDR { * to be decoded. If this pointer is 0, then the type routines should * allocate dynamic storage of the appropriate size and return it. */ -#ifdef _KERNEL -typedef bool_t (*xdrproc_t)(XDR *, void *, u_int); -#else -/* - * XXX can't actually prototype it, because some take three args!!! - */ -typedef bool_t (*xdrproc_t)(XDR *, ...); -#endif +typedef bool_t (*xdrproc_t)(XDR *, void *); /* * Operations defined on a XDR handle diff --git a/lib/libc/rpc/rpc.3 b/lib/libc/rpc/rpc.3 index 12d19df117ad..7ae3ec5c5aeb 100644 --- a/lib/libc/rpc/rpc.3 +++ b/lib/libc/rpc/rpc.3 @@ -254,9 +254,9 @@ enum xdr_op { * structure of the data type to be decoded. If this points to 0, * then the type routines should allocate dynamic storage of the * appropriate size and return it. - * bool_t (*xdrproc_t)(XDR *, caddr_t *); + * bool_t (*xdrproc_t)(XDR *, void *); */ -typedef bool_t (*xdrproc_t)(); +typedef bool_t (*xdrproc_t)(XDR *, void *); /* * The XDR handle. diff --git a/sys/contrib/openzfs/module/nvpair/nvpair.c b/sys/contrib/openzfs/module/nvpair/nvpair.c index eb8c14b4a783..cb3a024ec95c 100644 --- a/sys/contrib/openzfs/module/nvpair/nvpair.c +++ b/sys/contrib/openzfs/module/nvpair/nvpair.c @@ -3246,7 +3246,8 @@ nvs_xdr_nvl_fini(nvstream_t *nvs) * xdrproc_t-compatible callbacks for xdr_array() */ -#if defined(_KERNEL) && defined(__linux__) /* Linux kernel */ +#if (defined(__FreeBSD_version) && __FreeBSD_version >= 1600010) || \ + defined(_KERNEL) && defined(__linux__) /* Linux kernel */ #define NVS_BUILD_XDRPROC_T(type) \ static bool_t \ diff --git a/sys/rpc/xdr.h b/sys/rpc/xdr.h index 4307b5101477..b3eafcb864b2 100644 --- a/sys/rpc/xdr.h +++ b/sys/rpc/xdr.h @@ -133,14 +133,7 @@ typedef struct XDR { * to be decoded. If this pointer is 0, then the type routines should * allocate dynamic storage of the appropriate size and return it. */ -#ifdef _KERNEL -typedef bool_t (*xdrproc_t)(XDR *, void *, ...); -#else -/* - * XXX can't actually prototype it, because some take three args!!! - */ -typedef bool_t (*xdrproc_t)(XDR *, ...); -#endif +typedef bool_t (*xdrproc_t)(XDR *, void *); /* * Operations defined on a XDR handle diff --git a/sys/sys/param.h b/sys/sys/param.h index a5dd31519ea5..410d18b53df6 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -74,7 +74,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1600009 +#define __FreeBSD_version 1600010 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Fri Jan 23 11:07:28 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyFWh4TcDz6Q22s for ; Fri, 23 Jan 2026 11:07: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 4dyFWh1rHXz3Y4b for ; Fri, 23 Jan 2026 11:07:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769166448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q0oSXconJfFs7ECQ58/EnjDEjbGo2Kvp320wwMhPzg0=; b=Ul/0k3js4vn+0lNJWOucsFxbwJQffjSRFqggPwe1ZTRfPNmYWLPFEoIM6YaTBD8vqcH3LS fjxkNijNsZJ1uW4l+vuPcwWWhZYb9jml72exH4tlbFqo4g0H4GzrLodBslqLc5VnHzo5Cv GcV8RKgj49hn2toELzd1m95NEAN4lXXvYJMVhV99qEv3DRa+Fdz9Y+lLd1jn4/d2TF4ydS o4PKVfDLIeWe0BhH2UxdTretVOL3aZrhhdlHbTAHYPjy7M7jk0uCzsei+3s7YZILUJKd5H 2502QGwr50xmLGCNbH6zJWnhFoq34XK3c3H41CPtCmY3VpRdvzkIHFbJ9r+M9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769166448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q0oSXconJfFs7ECQ58/EnjDEjbGo2Kvp320wwMhPzg0=; b=m9l+eXf9lcmY4M/oERkyybR+E8zKBNVvze6KEC5C+CC+O54u1saWWaKVrmISbQWcBw3Ln3 +qfCYKwTuwIrHneQJPih7i5jFEQ2CcNX8p75mqrXreAjepPGicHnKEwvlv/mu8xpFJZ4y5 ttqWlYb3+PmBuciH7X12HlK2xPSWVJDExUsFIhuK3fhBxaJlwqZXLLNCP1NAC3MerAXSnV 9yLKbxv8SCKvm1msfKOcSTUW4sN8CiQMI5LnRdqeSP6mPlBe/VhN8P8eEDODRKx1SwWvxP tdS5Tp7Aj/nZu65xdKS5vNj0jC+oVSbQQ0w3YoQamVcP/S9OzBpd51Cugdr2Lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769166448; a=rsa-sha256; cv=none; b=Ifg2UYQXxf5JFWwQyMb7qit3kOdr2+JcpSPzCwtuvEITA8EOUGk240D2inXvshHGG4+FPu vHUsttUxFJGboMRhyD2ElSUc6LFN5QCa51AHsBsJbOxvK9y/ez1yfQ4y91Usv3mqryIh+N VwpbJg6pyuz4h28xbA467L67YN610jfGzWYRCoz1cKmH1Y3FYGvtQF9KwkjtskRRxaH5mq WH3mXYkEJKpCEJKgEaaOUaoWyi5RV8qI+VYMszyToy4lz8VjhbUkZr1x9ztwLJE5lxvfYI 2d84D+pcToQLHgHx0lDx7BD7RyyW+HZ2hKXpdCjQyU5HsEyAlN9aBT4xW3RgrA== 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 4dyFWh0vsSz1Y2 for ; Fri, 23 Jan 2026 11:07:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a7ab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 11:07:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: e17d7ab869bb - main - xdr_string: don't leak strings with xdr_free List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e17d7ab869bbfe3fa5a7da4b74d9f4fa51a0d69f Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 11:07:28 +0000 Message-Id: <69735670.3a7ab.5637ae5a@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=e17d7ab869bbfe3fa5a7da4b74d9f4fa51a0d69f commit e17d7ab869bbfe3fa5a7da4b74d9f4fa51a0d69f Author: Brooks Davis AuthorDate: 2026-01-23 10:35:55 +0000 Commit: Brooks Davis CommitDate: 2026-01-23 10:35:55 +0000 xdr_string: don't leak strings with xdr_free Historically (and in a small amount of older software such as OpenAFS), developers would attempt to free XDR strings with xdr_free((xdrproc_t)xdr_string, &string) This resulted in xdr_free calling xdr_string with only two intentional arguments and whatever was left in the third argument register. If the register held a sufficently small number, xdr_string would return FALSE and not free the string (no one checks the return values). Software should instead free strings with: xdr_free((xdrproc_t)xdr_wrapstring, &string) Because buggy software exists in the wild, act as though xdr_wrapstring was used in the XDR_FREE case and plug these leaks. Reviewed by: kib MFC after: 3 days Effort: CHERI upstreaming Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D54825 --- lib/libc/xdr/xdr.c | 7 +++++++ sys/xdr/xdr.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c index 59a843405abf..47aafea4bc30 100644 --- a/lib/libc/xdr/xdr.c +++ b/lib/libc/xdr/xdr.c @@ -696,6 +696,13 @@ xdr_string(XDR *xdrs, char **cpp, u_int maxsize) if (sp == NULL) { return(TRUE); /* already free */ } + /* + * XXX: buggy software may call this without a third + * argument via xdr_free(). Ignore maxsize since it may + * be invalid. Otherwise, if it's very small, we might + * fail to free the string. + */ + maxsize = RPC_MAXDATASIZE; /* FALLTHROUGH */ case XDR_ENCODE: size = strlen(sp); diff --git a/sys/xdr/xdr.c b/sys/xdr/xdr.c index 81d238ebf19f..f983a474abdd 100644 --- a/sys/xdr/xdr.c +++ b/sys/xdr/xdr.c @@ -620,6 +620,13 @@ xdr_string(XDR *xdrs, char **cpp, u_int maxsize) if (sp == NULL) { return(TRUE); /* already free */ } + /* + * XXX: buggy software may call this without a third + * argument via xdr_free(). Ignore maxsize since it may + * be invalid. Otherwise, if it's very small, we might + * fail to free the string. + */ + maxsize = RPC_MAXDATASIZE; /* FALLTHROUGH */ case XDR_ENCODE: size = strlen(sp); From nobody Fri Jan 23 11:37:31 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyGBM5RQgz6P5Ms for ; Fri, 23 Jan 2026 11:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dyGBM4DDbz3bSF for ; Fri, 23 Jan 2026 11:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769168251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=et1JM1HIMUgtU7MlUyIW+VjLG5iVnaZ1GBxdR9C53oc=; b=rzO2j/rnDbqNGYItFQx2pErUZhbfJeDH+UFoUltn0UiCAGmA80vzGsZDgKroegOQWsmP+5 ztE1INKivxh94klcMuZY38MLEVEZmBBxZNzJ1DvGKoI82QMK9KhQiU3qFRvCMRz18FIPgU S4n2F4lNPmAb+eC0tq8XsxFS/kvWhNbLVqBZZL797mBSeKfEtm7o/ur1cZ5KRABe8Jcpca HCjJ4WjXUFmOBFrEkWPwv4RomBgo1fIwMN0+C3U+Z8H1vZHPJKVYJlwEh/tW+NBVS3bpzf xjQymzxqwbCW4jEb+kq/Q4dPMnFuTN67Tja+lzNF0UC5Qypu4mrDM/dSLOySPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769168251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=et1JM1HIMUgtU7MlUyIW+VjLG5iVnaZ1GBxdR9C53oc=; b=ezSPSky/2sbS0k749D+cEpGjAps91fRTS52TCnUmyekNpIXSh/e7/mjP6p/j0/tFbYwdNm sY+QX3ruJM5hXr+oF7Zo9bxLkGNtsRUtPOqD1kVDj/CjxQ7RosTgNRfak7t5/5x9A917Q0 m+6g7XXXy7D8n3ce2OzxFRVKPEEvJfw+wbbOGauCDEerR9EL7Iv9sRCOHiOkdvTlTp4pnr hlO0czYnAXmAOQngbkg/SXNFRr71ziB7qQ/qiDZbXL+ZqBwhbTfUTPM/dylXpzdO0HCxKk uKBnH8S89VuUxrqbXgisXxkqFo0dzkzZCRyfg3kt4kBO9Y126r+9FRMMO5enTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769168251; a=rsa-sha256; cv=none; b=o4UOd8KXEMajJgC4t2ZXb9NBxhodPKZwkpK8Ne3tfKD/malmRarZvOz7Y6Yh1pT6P+Jxvj NTbA7Gp0umPYqN9C+gcsK/mbxrCERFX2cIT+u1LjTWN9MTUvHMiWAFzSLzsuhpK/8EWXtA Y5ZnQI3PS+9o3NT5gK9M6PADcP9NXzVcd0S9/3Ozcj3QRGZ6idd0ns+oHFscPycgbaXgyh lLyYkR0Bz0xUHdZndEliWOThCPXi0RC03o+2XcfnkxIg8Esa77R3Y/RDtHlptXwJ+Sp2px mo7t7xfadZeXYPmujXk819ywU/IE3OxLOttbO56p6xLvQukAAZea/70FOnJHuA== 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 4dyGBM3KQzz2dY for ; Fri, 23 Jan 2026 11:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e9f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 11:37:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 498fe07257aa - main - buf_ring: Rename some variables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 498fe07257aa75f0f1eb4639f4a6ae39fafda901 Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 11:37:31 +0000 Message-Id: <69735d7b.3e9f8.6b24ae7f@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=498fe07257aa75f0f1eb4639f4a6ae39fafda901 commit 498fe07257aa75f0f1eb4639f4a6ae39fafda901 Author: Dag-Erling Smørgrav AuthorDate: 2026-01-23 11:35:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-01-23 11:36:21 +0000 buf_ring: Rename some variables The elements we store in buffer rings are buffers, so refer to them as `buf` throughout instead of a mixture of `buf`, `ret`, and `new`, especially since the latter breaks C++ code that directly or indirectly includes this header. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: siderop1_netapp.com, markj Differential Revision: https://reviews.freebsd.org/D54827 --- sys/sys/buf_ring.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/sys/buf_ring.h b/sys/sys/buf_ring.h index 00870cbf3531..07a4fa52891e 100644 --- a/sys/sys/buf_ring.h +++ b/sys/sys/buf_ring.h @@ -266,7 +266,7 @@ buf_ring_advance_sc(struct buf_ring *br) * the compare and an atomic. */ static __inline void -buf_ring_putback_sc(struct buf_ring *br, void *new) +buf_ring_putback_sc(struct buf_ring *br, void *buf) { uint32_t cons_idx, mask; @@ -274,7 +274,7 @@ buf_ring_putback_sc(struct buf_ring *br, void *new) cons_idx = atomic_load_32(&br->br_cons_head) & mask; KASSERT(cons_idx != (atomic_load_32(&br->br_prod_tail) & mask), ("Buf-Ring has none in putback")) ; - br->br_ring[cons_idx] = new; + br->br_ring[cons_idx] = buf; } /* @@ -305,7 +305,7 @@ static __inline void * buf_ring_peek_clear_sc(struct buf_ring *br) { uint32_t cons_head, prod_tail, mask; - void *ret; + void *buf; #if defined(DEBUG_BUFRING) && defined(_KERNEL) if (!mtx_owned(br->br_lock)) @@ -319,7 +319,7 @@ buf_ring_peek_clear_sc(struct buf_ring *br) if (cons_head == prod_tail) return (NULL); - ret = br->br_ring[cons_head & mask]; + buf = br->br_ring[cons_head & mask]; #ifdef DEBUG_BUFRING /* * Single consumer, i.e. cons_head will not move while we are @@ -327,13 +327,12 @@ buf_ring_peek_clear_sc(struct buf_ring *br) */ br->br_ring[cons_head & mask] = NULL; #endif - return (ret); + return (buf); } static __inline int buf_ring_full(struct buf_ring *br) { - return (atomic_load_32(&br->br_prod_head) == atomic_load_32(&br->br_cons_tail) + br->br_cons_size - 1); } @@ -341,7 +340,6 @@ buf_ring_full(struct buf_ring *br) static __inline int buf_ring_empty(struct buf_ring *br) { - return (atomic_load_32(&br->br_cons_head) == atomic_load_32(&br->br_prod_tail)); } From nobody Fri Jan 23 13:56:40 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyKGx0Xwzz6PGGN for ; Fri, 23 Jan 2026 13:56: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 4dyKGx0Gbnz3r21 for ; Fri, 23 Jan 2026 13:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769176601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HSJJo/P/tSyN9+f4xaZ/rNHtyMT90LbogtEQJPf9/VY=; b=M0yz4e1wvugSg0+2Syuu2NtW3h/O5I5QhlB/38CwfIe9/BUyYOsrB7RzLXqK6N9NwIazEq gHl/MePd2v/8a+N9bTi3QDsUSo3PYLREnRsT8j8lt/8MnKBdAGOGqDoU/G1BLhdVTYYZGM DMAnCuk/hP+QN/R9n+/Ncw1bvIT4tfr88K0iw957bCkhVFlAhEQzPJqBT+HP4nsyqfmK0R 3qho076B8oE5EmkcqhAL6BKSGW8BKYu76hqRb0V1InO9qKX00f1nlutREj/oTDGga/nolZ N+FEmfsR8BHUWDKc5tFd6fuG/8xxXNWOcjivhynit9WbENZSG4KkaIiLwg+J5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769176601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HSJJo/P/tSyN9+f4xaZ/rNHtyMT90LbogtEQJPf9/VY=; b=EfrhkBx2/H7hjN+x7vystHkaM7sgybdlf4RYHBDD4cfQJheeiBd45FaAneOdptOqxjPBJw G2pxE4mrzHertU57Y1F2Kzp+TCXyn5f3EWdYnlWJRN35LOiz0v2iMtRMlZjC36ikWPhpYB tbJynUBBUHSw7NeR3ImLzbp6dqePS6eklml/SDJmxgpl4obW1bX3ZYdFjaGWJSuacFFmn3 YfGyX02DW0QXksRqLNoaxLIujjQjaSA/wpXMT22tQhM8TqH72Q+cBMPLn7uWRdQkK/6mGu iBphBHbQCA2Jjkbah4PDTsRVJNDzOXngx6qgBcLHzkJPEm29StsdUVbuDGaiHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769176601; a=rsa-sha256; cv=none; b=EaUtGNGqBQ8eCWo/R44BbXaJrBODItSSaG4Qam55GvR/Hl1KLQQoY5AJFnxzl+uwUdD8iT LyLwqixxpDp81Cs+bEnBaUGrznXBASNmqE9ikJM3tDzMu5IgOX4hZgUDaX1zkSUquSHzfS pN+HR2TIqZBsE3psc1moLmg31zo3+p6b5d7jZsUzqLKMO7cZ6eg2LmK0t45k+l8BFhspcw O7xg1xRVeagngZItCsgpNCEvlihYuZ123oiwoDuecOIL/nZ3i44k+gFh8YWL+UJrKdvIBa 7nB3R105DOXUG/uUJSnlnaW5ROSMXt3lQT2pnwBvuzv1D81Sd7MEd3+ywHhHLg== 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 4dyKGw6cwTz5rJ for ; Fri, 23 Jan 2026 13:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b55d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 13:56:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: b1bebaaba9b9 - main - mt76: update Mediatek's mt76 driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1bebaaba9b9c0ddfe503c43ca8e9e3917ee2c57 Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 13:56:40 +0000 Message-Id: <69737e18.b55d.3815fcbd@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b1bebaaba9b9c0ddfe503c43ca8e9e3917ee2c57 commit b1bebaaba9b9c0ddfe503c43ca8e9e3917ee2c57 Merge: 498fe07257aa 316122010afd Author: Bjoern A. Zeeb AuthorDate: 2026-01-23 13:52:47 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-23 13:52:47 +0000 mt76: update Mediatek's mt76 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). Notable change: license got switched from ISC to BSD-3-Clause-Clear. util.h is now imported from upstream given it is no longer GPL-only. See the upstream repository 909675fd4344f73aad5f75f123bd271ada2ab9fb and a96fed2825d8dfb068bf640419c619b5f2df4218. For us the new version should also help with page pools and DMA32. Sponsored by: The FreeBSD Foundation .../include/linux/soc/airoha/airoha_offload.h | 48 ++ .../common/include/linux/soc/mediatek/mtk_wed.h | 14 +- sys/contrib/dev/mediatek/mt76/Kconfig | 51 ++ sys/contrib/dev/mediatek/mt76/Makefile | 48 ++ sys/contrib/dev/mediatek/mt76/agg-rx.c | 4 +- sys/contrib/dev/mediatek/mt76/channel.c | 15 +- sys/contrib/dev/mediatek/mt76/debugfs.c | 6 +- sys/contrib/dev/mediatek/mt76/dma.c | 302 ++++++-- sys/contrib/dev/mediatek/mt76/dma.h | 98 ++- sys/contrib/dev/mediatek/mt76/eeprom.c | 87 ++- sys/contrib/dev/mediatek/mt76/mac80211.c | 65 +- sys/contrib/dev/mediatek/mt76/mcu.c | 2 +- sys/contrib/dev/mediatek/mt76/mmio.c | 20 +- sys/contrib/dev/mediatek/mt76/mt76.h | 232 +++++- sys/contrib/dev/mediatek/mt76/mt7603/Kconfig | 12 + sys/contrib/dev/mediatek/mt76/mt7603/Makefile | 7 + sys/contrib/dev/mediatek/mt76/mt7603/beacon.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7603/core.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7603/debugfs.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7603/dma.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7603/eeprom.c | 5 +- sys/contrib/dev/mediatek/mt76/mt7603/eeprom.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7603/init.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7603/mac.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7603/mac.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7603/main.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7603/mcu.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7603/mcu.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7603/mt7603.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7603/pci.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7603/regs.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7603/soc.c | 4 +- sys/contrib/dev/mediatek/mt76/mt7615/Kconfig | 56 ++ sys/contrib/dev/mediatek/mt76/mt7615/Makefile | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/debugfs.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/dma.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/eeprom.c | 6 +- sys/contrib/dev/mediatek/mt76/mt7615/eeprom.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/init.c | 7 +- sys/contrib/dev/mediatek/mt76/mt7615/mac.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/mac.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/main.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/mcu.c | 6 +- sys/contrib/dev/mediatek/mt76/mt7615/mcu.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/mmio.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/mt7615.h | 2 +- .../dev/mediatek/mt76/mt7615/mt7615_trace.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/pci.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/pci_init.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/pci_mac.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/regs.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/sdio.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/soc.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/testmode.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/trace.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/usb.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7615/usb_sdio.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76_connac.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76_connac2_mac.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76_connac3_mac.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76_connac3_mac.h | 9 +- sys/contrib/dev/mediatek/mt76/mt76_connac_mac.c | 21 +- sys/contrib/dev/mediatek/mt76/mt76_connac_mcu.c | 39 +- sys/contrib/dev/mediatek/mt76/mt76_connac_mcu.h | 4 +- sys/contrib/dev/mediatek/mt76/mt76x0/pci.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x0/pci_mcu.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x0/usb_mcu.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_beacon.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_debugfs.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_dfs.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_dfs.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_dma.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_eeprom.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_eeprom.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_mac.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_mac.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_mcu.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_mcu.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_mmio.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_phy.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_phy.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_regs.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_trace.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_trace.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_txrx.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_usb.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_usb_core.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_usb_mcu.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x02_util.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/Kconfig | 29 + sys/contrib/dev/mediatek/mt76/mt76x2/Makefile | 15 + sys/contrib/dev/mediatek/mt76/mt76x2/eeprom.c | 6 +- sys/contrib/dev/mediatek/mt76/mt76x2/eeprom.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/init.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/mac.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/mac.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/mcu.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/mcu.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/mt76x2.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/mt76x2u.h | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/pci.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/pci_init.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/pci_main.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/pci_mcu.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/pci_phy.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/phy.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/usb.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/usb_init.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/usb_mac.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/usb_main.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/usb_mcu.c | 2 +- sys/contrib/dev/mediatek/mt76/mt76x2/usb_phy.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7915/Kconfig | 2 +- sys/contrib/dev/mediatek/mt76/mt7915/Makefile | 2 +- sys/contrib/dev/mediatek/mt76/mt7915/coredump.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7915/coredump.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7915/debugfs.c | 76 +- sys/contrib/dev/mediatek/mt76/mt7915/dma.c | 6 +- sys/contrib/dev/mediatek/mt76/mt7915/eeprom.c | 6 +- sys/contrib/dev/mediatek/mt76/mt7915/eeprom.h | 8 +- sys/contrib/dev/mediatek/mt76/mt7915/init.c | 13 +- sys/contrib/dev/mediatek/mt76/mt7915/mac.c | 4 +- sys/contrib/dev/mediatek/mt76/mt7915/mac.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7915/main.c | 4 +- sys/contrib/dev/mediatek/mt76/mt7915/mcu.c | 203 +++-- sys/contrib/dev/mediatek/mt76/mt7915/mcu.h | 8 +- sys/contrib/dev/mediatek/mt76/mt7915/mmio.c | 8 +- sys/contrib/dev/mediatek/mt76/mt7915/mt7915.h | 11 +- sys/contrib/dev/mediatek/mt76/mt7915/pci.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7915/regs.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7915/soc.c | 23 +- sys/contrib/dev/mediatek/mt76/mt7915/testmode.c | 4 +- sys/contrib/dev/mediatek/mt76/mt7915/testmode.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7921/Kconfig | 2 +- sys/contrib/dev/mediatek/mt76/mt7921/Makefile | 2 +- sys/contrib/dev/mediatek/mt76/mt7921/debugfs.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7921/init.c | 8 +- sys/contrib/dev/mediatek/mt76/mt7921/mac.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7921/main.c | 4 +- sys/contrib/dev/mediatek/mt76/mt7921/mcu.c | 4 +- sys/contrib/dev/mediatek/mt76/mt7921/mcu.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7921/mt7921.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7921/pci.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7921/pci_mac.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7921/pci_mcu.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7921/regs.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7921/sdio.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7921/sdio_mac.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7921/sdio_mcu.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7921/testmode.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7921/usb.c | 5 +- sys/contrib/dev/mediatek/mt76/mt7925/Kconfig | 2 +- sys/contrib/dev/mediatek/mt76/mt7925/Makefile | 4 +- sys/contrib/dev/mediatek/mt76/mt7925/debugfs.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7925/init.c | 156 +--- sys/contrib/dev/mediatek/mt76/mt7925/mac.c | 6 +- sys/contrib/dev/mediatek/mt76/mt7925/mac.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7925/main.c | 107 +-- sys/contrib/dev/mediatek/mt76/mt7925/mcu.c | 127 +++- sys/contrib/dev/mediatek/mt76/mt7925/mcu.h | 10 +- sys/contrib/dev/mediatek/mt76/mt7925/mt7925.h | 11 +- sys/contrib/dev/mediatek/mt76/mt7925/pci.c | 41 +- sys/contrib/dev/mediatek/mt76/mt7925/pci_mac.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7925/pci_mcu.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7925/regd.c | 265 +++++++ sys/contrib/dev/mediatek/mt76/mt7925/regd.h | 19 + sys/contrib/dev/mediatek/mt76/mt7925/regs.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7925/testmode.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7925/usb.c | 5 +- sys/contrib/dev/mediatek/mt76/mt792x.h | 5 +- sys/contrib/dev/mediatek/mt76/mt792x_acpi_sar.c | 2 +- sys/contrib/dev/mediatek/mt76/mt792x_acpi_sar.h | 2 +- sys/contrib/dev/mediatek/mt76/mt792x_core.c | 9 +- sys/contrib/dev/mediatek/mt76/mt792x_debugfs.c | 2 +- sys/contrib/dev/mediatek/mt76/mt792x_dma.c | 8 +- sys/contrib/dev/mediatek/mt76/mt792x_mac.c | 2 +- sys/contrib/dev/mediatek/mt76/mt792x_regs.h | 2 +- sys/contrib/dev/mediatek/mt76/mt792x_trace.c | 2 +- sys/contrib/dev/mediatek/mt76/mt792x_trace.h | 2 +- sys/contrib/dev/mediatek/mt76/mt792x_usb.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7996/Kconfig | 9 +- sys/contrib/dev/mediatek/mt76/mt7996/Makefile | 3 +- sys/contrib/dev/mediatek/mt76/mt7996/coredump.c | 2 +- sys/contrib/dev/mediatek/mt76/mt7996/coredump.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7996/debugfs.c | 74 +- sys/contrib/dev/mediatek/mt76/mt7996/dma.c | 343 +++++++-- sys/contrib/dev/mediatek/mt76/mt7996/eeprom.c | 5 +- sys/contrib/dev/mediatek/mt76/mt7996/eeprom.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7996/init.c | 390 +++++++--- sys/contrib/dev/mediatek/mt76/mt7996/mac.c | 836 +++++++++++++++++---- sys/contrib/dev/mediatek/mt76/mt7996/mac.h | 2 +- sys/contrib/dev/mediatek/mt76/mt7996/main.c | 614 +++++++++------ sys/contrib/dev/mediatek/mt76/mt7996/mcu.c | 378 +++++----- sys/contrib/dev/mediatek/mt76/mt7996/mcu.h | 19 +- sys/contrib/dev/mediatek/mt76/mt7996/mmio.c | 113 ++- sys/contrib/dev/mediatek/mt76/mt7996/mt7996.h | 144 +++- sys/contrib/dev/mediatek/mt76/mt7996/pci.c | 10 +- sys/contrib/dev/mediatek/mt76/mt7996/regs.h | 34 +- sys/contrib/dev/mediatek/mt76/pci.c | 2 +- sys/contrib/dev/mediatek/mt76/scan.c | 15 +- sys/contrib/dev/mediatek/mt76/sdio.c | 2 +- sys/contrib/dev/mediatek/mt76/sdio.h | 2 +- sys/contrib/dev/mediatek/mt76/sdio_txrx.c | 2 +- sys/contrib/dev/mediatek/mt76/testmode.c | 2 +- sys/contrib/dev/mediatek/mt76/testmode.h | 2 +- sys/contrib/dev/mediatek/mt76/trace.c | 2 +- sys/contrib/dev/mediatek/mt76/trace.h | 2 +- sys/contrib/dev/mediatek/mt76/tx.c | 11 +- sys/contrib/dev/mediatek/mt76/usb.c | 2 +- sys/contrib/dev/mediatek/mt76/usb_trace.c | 2 +- sys/contrib/dev/mediatek/mt76/usb_trace.h | 2 +- sys/contrib/dev/mediatek/mt76/util.c | 2 +- sys/contrib/dev/mediatek/mt76/util.h | 132 ++-- sys/contrib/dev/mediatek/mt76/wed.c | 20 +- sys/modules/mt76/Makefile.inc | 3 +- sys/modules/mt76/mt7925/Makefile | 2 +- 217 files changed, 4191 insertions(+), 1624 deletions(-) diff --cc sys/compat/linuxkpi/common/include/linux/soc/airoha/airoha_offload.h index 000000000000,000000000000..ade0b06d839f new file mode 100644 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/soc/airoha/airoha_offload.h @@@ -1,0 -1,0 +1,48 @@@ ++/*- ++ * Copyright (c) 2026 Bjoern A. Zeeb ++ * ++ * SPDX-License-Identifier: BSD-2-Clause ++ */ ++ ++#ifndef _LINUXKPI_LINUX_SOC_AIROHA_AIROHA_OFFLOAD_H ++#define _LINUXKPI_LINUX_SOC_AIROHA_AIROHA_OFFLOAD_H ++ ++#include /* pr_debug */ ++ ++enum airoha_npu_wlan_get_cmd { ++ __dummy_airoha_npu_wlan_get_cmd, ++}; ++enum airoha_npu_wlan_set_cmd { ++ __dummy_airoha_npu_wlan_set_cmd, ++}; ++ ++struct airoha_npu { ++}; ++struct airoha_npu_rx_dma_desc { ++}; ++struct airoha_npu_tx_dma_desc { ++}; ++ ++static __inline int ++airoha_npu_wlan_send_msg(void *npu, int ifindex, ++ enum airoha_npu_wlan_set_cmd cmd, void *val, size_t len, gfp_t gfp) ++{ ++ pr_debug("%s: TODO\n", __func__); ++ return (-EOPNOTSUPP); ++} ++ ++static __inline int ++airoha_npu_wlan_get_msg(void *npu, int ifindex, ++ enum airoha_npu_wlan_get_cmd cmd, void *val, size_t len, gfp_t gfp) ++{ ++ pr_debug("%s: TODO\n", __func__); ++ return (-EOPNOTSUPP); ++} ++ ++static __inline void ++airoha_npu_wlan_enable_irq(struct airoha_npu *npu, int q) ++{ ++ pr_debug("%s: TODO\n", __func__); ++} ++ ++#endif /* _LINUXKPI_LINUX_SOC_AIROHA_AIROHA_OFFLOAD_H */ diff --cc sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h index 2b9c6ae4911e,000000000000..64daa8c78c9d mode 100644,000000..100644 --- a/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h +++ b/sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h @@@ -1,71 -1,0 +1,83 @@@ +/*- - * Copyright (c) 2022-2025 Bjoern A. Zeeb ++ * Copyright (c) 2022-2026 Bjoern A. Zeeb + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#ifndef _LINUXKPI_LINUX_SOC_MEDIATEK_MTK_WED_H +#define _LINUXKPI_LINUX_SOC_MEDIATEK_MTK_WED_H + +#include /* pr_debug */ + +struct mtk_wed_device { +}; + +#define WED_WO_STA_REC 0x6 + +#if defined(CONFIG_NET_MEDIATEK_SOC_WED) +#define mtk_wed_device_start(_dev, _mask) do { pr_debug("%s: TODO\n", __func__); } while(0) +#define mtk_wed_device_detach(_dev) do { pr_debug("%s: TODO\n", __func__); } while(0) +#define mtk_wed_device_irq_get(_dev, _mask) 0 +#define mtk_wed_device_irq_set_mask(_dev, _mask) do { pr_debug("%s: TODO\n", __func__); } while(0) +#define mtk_wed_device_update_msg(_dev, _id, _msg, _len) ({ pr_debug("%s: TODO\n", __func__); -ENODEV; }) +#define mtk_wed_device_dma_reset(_dev) do { pr_debug("%s: TODO\n", __func__); } while (0) +#define mtk_wed_device_ppe_check(_dev, _skb, _reason, _entry) \ + do { pr_debug("%s: TODO\n", __func__); } while (0) +#define mtk_wed_device_stop(_dev) do { pr_debug("%s: TODO\n", __func__); } while(0) +#define mtk_wed_device_start_hw_rro(_dev, _mask, _b) do { pr_debug("%s: TODO\n", __func__); } while(0) +#define mtk_wed_device_setup_tc(_dev, _ndev, _type, _tdata) ({ pr_debug("%s: TODO\n", __func__); -EOPNOTSUPP; }) + +static inline bool +mtk_wed_device_active(struct mtk_wed_device *dev __unused) +{ + pr_debug("%s: TODO\n", __func__); + return (false); +} + +static inline bool +mtk_wed_get_rx_capa(struct mtk_wed_device *dev __unused) +{ ++ pr_debug("%s: TODO\n", __func__); ++ return (false); ++} + ++static inline bool ++mtk_wed_is_amsdu_supported(struct mtk_wed_device *dev __unused) ++{ + pr_debug("%s: TODO\n", __func__); + return (false); +} + +#else /* ! CONFIG_NET_MEDIATEK_SOC_WED */ + +#define mtk_wed_device_start(_dev, _mask) do { } while(0) +#define mtk_wed_device_detach(_dev) do { } while(0) +#define mtk_wed_device_irq_get(_dev, _mask) 0 +#define mtk_wed_device_irq_set_mask(_dev, _mask) do { } while(0) +#define mtk_wed_device_update_msg(_dev, _id, _msg, _len) -ENODEV +#define mtk_wed_device_dma_reset(_dev) do { } while (0) +#define mtk_wed_device_ppe_check(_dev, _skb, _reason, _entry) do { } while (0) +#define mtk_wed_device_stop(_dev) do { } while(0) +#define mtk_wed_device_start_hw_rro(_dev, _mask, _b) do { } while(0) +#define mtk_wed_device_setup_tc(_dev, _ndev, _type, _tdata) -EOPNOTSUPP + +static inline bool +mtk_wed_device_active(struct mtk_wed_device *dev __unused) +{ + return (false); +} + +static inline bool +mtk_wed_get_rx_capa(struct mtk_wed_device *dev __unused) +{ + return (false); +} ++ ++static inline bool ++mtk_wed_is_amsdu_supported(struct mtk_wed_device *dev __unused) ++{ ++ return (false); ++} +#endif /* CONFIG_NET_MEDIATEK_SOC_WED */ + +#endif /* _LINUXKPI_LINUX_SOC_MEDIATEK_MTK_WED_H */ diff --cc sys/contrib/dev/mediatek/mt76/Kconfig index 000000000000,502303622a53..502303622a53 mode 000000,100644..100644 --- a/sys/contrib/dev/mediatek/mt76/Kconfig +++ b/sys/contrib/dev/mediatek/mt76/Kconfig diff --cc sys/contrib/dev/mediatek/mt76/Makefile index 000000000000,000000000000..1d42adfe8030 new file mode 100644 --- /dev/null +++ b/sys/contrib/dev/mediatek/mt76/Makefile @@@ -1,0 -1,0 +1,48 @@@ ++# SPDX-License-Identifier: BSD-3-Clause-Clear ++obj-$(CONFIG_MT76_CORE) += mt76.o ++obj-$(CONFIG_MT76_USB) += mt76-usb.o ++obj-$(CONFIG_MT76_SDIO) += mt76-sdio.o ++obj-$(CONFIG_MT76x02_LIB) += mt76x02-lib.o ++obj-$(CONFIG_MT76x02_USB) += mt76x02-usb.o ++obj-$(CONFIG_MT76_CONNAC_LIB) += mt76-connac-lib.o ++obj-$(CONFIG_MT792x_LIB) += mt792x-lib.o ++obj-$(CONFIG_MT792x_USB) += mt792x-usb.o ++ ++mt76-y := \ ++ mmio.o util.o trace.o dma.o mac80211.o debugfs.o eeprom.o \ ++ tx.o agg-rx.o mcu.o wed.o scan.o channel.o ++ ++mt76-$(CONFIG_MT76_NPU) += npu.o ++mt76-$(CONFIG_PCI) += pci.o ++mt76-$(CONFIG_NL80211_TESTMODE) += testmode.o ++ ++mt76-usb-y := usb.o usb_trace.o ++mt76-sdio-y := sdio.o sdio_txrx.o ++ ++CFLAGS_trace.o := -I$(src) ++CFLAGS_usb_trace.o := -I$(src) ++CFLAGS_mt76x02_trace.o := -I$(src) ++CFLAGS_mt792x_trace.o := -I$(src) ++ ++mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o mt76x02_mcu.o \ ++ mt76x02_eeprom.o mt76x02_phy.o mt76x02_mmio.o \ ++ mt76x02_txrx.o mt76x02_trace.o mt76x02_debugfs.o \ ++ mt76x02_dfs.o mt76x02_beacon.o ++ ++mt76x02-usb-y := mt76x02_usb_mcu.o mt76x02_usb_core.o ++ ++mt76-connac-lib-y := mt76_connac_mcu.o mt76_connac_mac.o mt76_connac3_mac.o ++ ++mt792x-lib-y := mt792x_core.o mt792x_mac.o mt792x_trace.o \ ++ mt792x_debugfs.o mt792x_dma.o ++mt792x-lib-$(CONFIG_ACPI) += mt792x_acpi_sar.o ++mt792x-usb-y := mt792x_usb.o ++ ++obj-$(CONFIG_MT76x0_COMMON) += mt76x0/ ++obj-$(CONFIG_MT76x2_COMMON) += mt76x2/ ++obj-$(CONFIG_MT7603E) += mt7603/ ++obj-$(CONFIG_MT7615_COMMON) += mt7615/ ++obj-$(CONFIG_MT7915E) += mt7915/ ++obj-$(CONFIG_MT7921_COMMON) += mt7921/ ++obj-$(CONFIG_MT7996E) += mt7996/ ++obj-$(CONFIG_MT7925_COMMON) += mt7925/ diff --cc sys/contrib/dev/mediatek/mt76/dma.c index af902a761e42,000000000000..5c04a0dce1fa mode 100644,000000..100644 --- a/sys/contrib/dev/mediatek/mt76/dma.c +++ b/sys/contrib/dev/mediatek/mt76/dma.c @@@ -1,1062 -1,0 +1,1204 @@@ - // SPDX-License-Identifier: ISC ++// SPDX-License-Identifier: BSD-3-Clause-Clear +/* + * Copyright (C) 2016 Felix Fietkau + */ + +#include +#if defined(__FreeBSD__) +#include +#include +#endif +#include "mt76.h" +#include "dma.h" + - #if IS_ENABLED(CONFIG_NET_MEDIATEK_SOC_WED) - - #define Q_READ(_q, _field) ({ \ - u32 _offset = offsetof(struct mt76_queue_regs, _field); \ - u32 _val; \ - if ((_q)->flags & MT_QFLAG_WED) \ - _val = mtk_wed_device_reg_read((_q)->wed, \ - ((_q)->wed_regs + \ - _offset)); \ - else \ - _val = readl(&(_q)->regs->_field); \ - _val; \ - }) - - #define Q_WRITE(_q, _field, _val) do { \ - u32 _offset = offsetof(struct mt76_queue_regs, _field); \ - if ((_q)->flags & MT_QFLAG_WED) \ - mtk_wed_device_reg_write((_q)->wed, \ - ((_q)->wed_regs + _offset), \ - _val); \ - else \ - writel(_val, &(_q)->regs->_field); \ - } while (0) - - #else - - #define Q_READ(_q, _field) readl(&(_q)->regs->_field) - #define Q_WRITE(_q, _field, _val) writel(_val, &(_q)->regs->_field) - - #endif - +static struct mt76_txwi_cache * +mt76_alloc_txwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t; + dma_addr_t addr; + u8 *txwi; + int size; + + size = L1_CACHE_ALIGN(dev->drv->txwi_size + sizeof(*t)); + txwi = kzalloc(size, GFP_ATOMIC); + if (!txwi) + return NULL; + + addr = dma_map_single(dev->dma_dev, txwi, dev->drv->txwi_size, + DMA_TO_DEVICE); + if (unlikely(dma_mapping_error(dev->dma_dev, addr))) { + kfree(txwi); + return NULL; + } + + t = (struct mt76_txwi_cache *)(txwi + dev->drv->txwi_size); + t->dma_addr = addr; + + return t; +} + +static struct mt76_txwi_cache * +mt76_alloc_rxwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t; + + t = kzalloc(L1_CACHE_ALIGN(sizeof(*t)), GFP_ATOMIC); + if (!t) + return NULL; + + t->ptr = NULL; + return t; +} + +static struct mt76_txwi_cache * +__mt76_get_txwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t = NULL; + + spin_lock(&dev->lock); + if (!list_empty(&dev->txwi_cache)) { + t = list_first_entry(&dev->txwi_cache, struct mt76_txwi_cache, + list); + list_del(&t->list); + } + spin_unlock(&dev->lock); + + return t; +} + +static struct mt76_txwi_cache * +__mt76_get_rxwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t = NULL; + + spin_lock_bh(&dev->wed_lock); + if (!list_empty(&dev->rxwi_cache)) { + t = list_first_entry(&dev->rxwi_cache, struct mt76_txwi_cache, + list); + list_del(&t->list); + } + spin_unlock_bh(&dev->wed_lock); + + return t; +} + +static struct mt76_txwi_cache * +mt76_get_txwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t = __mt76_get_txwi(dev); + + if (t) + return t; + + return mt76_alloc_txwi(dev); +} + +struct mt76_txwi_cache * +mt76_get_rxwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t = __mt76_get_rxwi(dev); + + if (t) + return t; + + return mt76_alloc_rxwi(dev); +} +EXPORT_SYMBOL_GPL(mt76_get_rxwi); + +void +mt76_put_txwi(struct mt76_dev *dev, struct mt76_txwi_cache *t) +{ + if (!t) + return; + + spin_lock(&dev->lock); + list_add(&t->list, &dev->txwi_cache); + spin_unlock(&dev->lock); +} +EXPORT_SYMBOL_GPL(mt76_put_txwi); + +void +mt76_put_rxwi(struct mt76_dev *dev, struct mt76_txwi_cache *t) +{ + if (!t) + return; + + spin_lock_bh(&dev->wed_lock); + list_add(&t->list, &dev->rxwi_cache); + spin_unlock_bh(&dev->wed_lock); +} +EXPORT_SYMBOL_GPL(mt76_put_rxwi); + +static void +mt76_free_pending_txwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t; + + local_bh_disable(); + while ((t = __mt76_get_txwi(dev)) != NULL) { + dma_unmap_single(dev->dma_dev, t->dma_addr, dev->drv->txwi_size, + DMA_TO_DEVICE); + kfree(mt76_get_txwi_ptr(dev, t)); + } + local_bh_enable(); +} + +void +mt76_free_pending_rxwi(struct mt76_dev *dev) +{ + struct mt76_txwi_cache *t; + + local_bh_disable(); + while ((t = __mt76_get_rxwi(dev)) != NULL) { + if (t->ptr) + mt76_put_page_pool_buf(t->ptr, false); + kfree(t); + } + local_bh_enable(); +} +EXPORT_SYMBOL_GPL(mt76_free_pending_rxwi); + ++static void ++mt76_dma_queue_magic_cnt_init(struct mt76_dev *dev, struct mt76_queue *q) ++{ ++ if (!mt76_queue_is_wed_rro(q)) ++ return; ++ ++ q->magic_cnt = 0; ++ if (mt76_queue_is_wed_rro_ind(q)) { ++ struct mt76_wed_rro_desc *rro_desc; ++ u32 data1 = FIELD_PREP(RRO_IND_DATA1_MAGIC_CNT_MASK, ++ MT_DMA_WED_IND_CMD_CNT - 1); ++ int i; ++ ++ rro_desc = (struct mt76_wed_rro_desc *)q->desc; ++ for (i = 0; i < q->ndesc; i++) { ++ struct mt76_wed_rro_ind *cmd; ++ ++ cmd = (struct mt76_wed_rro_ind *)&rro_desc[i]; ++ cmd->data1 = cpu_to_le32(data1); ++ } ++ } else if (mt76_queue_is_wed_rro_rxdmad_c(q)) { ++ struct mt76_rro_rxdmad_c *dmad = (void *)q->desc; ++ u32 data3 = FIELD_PREP(RRO_RXDMAD_DATA3_MAGIC_CNT_MASK, ++ MT_DMA_MAGIC_CNT - 1); ++ int i; ++ ++ for (i = 0; i < q->ndesc; i++) ++ dmad[i].data3 = cpu_to_le32(data3); ++ } ++} ++ +static void +mt76_dma_sync_idx(struct mt76_dev *dev, struct mt76_queue *q) +{ + Q_WRITE(q, desc_base, q->desc_dma); - if (q->flags & MT_QFLAG_WED_RRO_EN) ++ if ((q->flags & MT_QFLAG_WED_RRO_EN) && !mt76_npu_device_active(dev)) + Q_WRITE(q, ring_size, MT_DMA_RRO_EN | q->ndesc); + else + Q_WRITE(q, ring_size, q->ndesc); ++ ++ if (mt76_queue_is_npu_tx(q)) { ++ writel(q->desc_dma, &q->regs->desc_base); ++ writel(q->ndesc, &q->regs->ring_size); ++ } + q->head = Q_READ(q, dma_idx); + q->tail = q->head; +} + - void __mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q, - bool reset_idx) ++void mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q, ++ bool reset_idx) +{ + if (!q || !q->ndesc) + return; + - if (!mt76_queue_is_wed_rro_ind(q)) { ++ if (!mt76_queue_is_wed_rro_ind(q) && ++ !mt76_queue_is_wed_rro_rxdmad_c(q) && !mt76_queue_is_npu(q)) { + int i; + + /* clear descriptors */ + for (i = 0; i < q->ndesc; i++) + q->desc[i].ctrl = cpu_to_le32(MT_DMA_CTL_DMA_DONE); + } + ++ mt76_dma_queue_magic_cnt_init(dev, q); + if (reset_idx) { - Q_WRITE(q, cpu_idx, 0); ++ if (mt76_queue_is_emi(q)) ++ *q->emi_cpu_idx = 0; ++ else ++ Q_WRITE(q, cpu_idx, 0); + Q_WRITE(q, dma_idx, 0); + } + mt76_dma_sync_idx(dev, q); +} + - void mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q) - { - __mt76_dma_queue_reset(dev, q, true); - } - +static int +mt76_dma_add_rx_buf(struct mt76_dev *dev, struct mt76_queue *q, + struct mt76_queue_buf *buf, void *data) +{ + struct mt76_queue_entry *entry = &q->entry[q->head]; + struct mt76_txwi_cache *txwi = NULL; ++ u32 buf1 = 0, ctrl, info = 0; + struct mt76_desc *desc; + int idx = q->head; - u32 buf1 = 0, ctrl; + int rx_token; + + if (mt76_queue_is_wed_rro_ind(q)) { + struct mt76_wed_rro_desc *rro_desc; + + rro_desc = (struct mt76_wed_rro_desc *)q->desc; + data = &rro_desc[q->head]; + goto done; ++ } else if (mt76_queue_is_wed_rro_rxdmad_c(q)) { ++ data = &q->desc[q->head]; ++ goto done; + } + + desc = &q->desc[q->head]; + ctrl = FIELD_PREP(MT_DMA_CTL_SD_LEN0, buf[0].len); +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT + buf1 = FIELD_PREP(MT_DMA_CTL_SDP0_H, buf->addr >> 32); +#endif + - if (mt76_queue_is_wed_rx(q)) { ++ if (mt76_queue_is_wed_rx(q) || mt76_queue_is_wed_rro_data(q)) { + txwi = mt76_get_rxwi(dev); + if (!txwi) + return -ENOMEM; + + rx_token = mt76_rx_token_consume(dev, data, txwi, buf->addr); + if (rx_token < 0) { + mt76_put_rxwi(dev, txwi); + return -ENOMEM; + } + + buf1 |= FIELD_PREP(MT_DMA_CTL_TOKEN, rx_token); + ctrl |= MT_DMA_CTL_TO_HOST; ++ ++ txwi->qid = q - dev->q_rx; ++ } ++ ++ if (mt76_queue_is_wed_rro_msdu_pg(q) && ++ dev->drv->rx_rro_add_msdu_page) { ++ if (dev->drv->rx_rro_add_msdu_page(dev, q, buf->addr, data)) ++ return -ENOMEM; ++ } ++ ++ if (q->flags & MT_QFLAG_WED_RRO_EN) { ++ info |= FIELD_PREP(MT_DMA_MAGIC_MASK, q->magic_cnt); ++ if ((q->head + 1) == q->ndesc) ++ q->magic_cnt = (q->magic_cnt + 1) % MT_DMA_MAGIC_CNT; + } + + WRITE_ONCE(desc->buf0, cpu_to_le32(buf->addr)); + WRITE_ONCE(desc->buf1, cpu_to_le32(buf1)); + WRITE_ONCE(desc->ctrl, cpu_to_le32(ctrl)); - WRITE_ONCE(desc->info, 0); ++ WRITE_ONCE(desc->info, cpu_to_le32(info)); + +done: + entry->dma_addr[0] = buf->addr; + entry->dma_len[0] = buf->len; + entry->txwi = txwi; + entry->buf = data; + entry->wcid = 0xffff; + entry->skip_buf1 = true; + q->head = (q->head + 1) % q->ndesc; + q->queued++; + + return idx; +} + +static int +mt76_dma_add_buf(struct mt76_dev *dev, struct mt76_queue *q, + struct mt76_queue_buf *buf, int nbufs, u32 info, + struct sk_buff *skb, void *txwi) +{ + struct mt76_queue_entry *entry; + struct mt76_desc *desc; + int i, idx = -1; + u32 ctrl, next; + + if (txwi) { + q->entry[q->head].txwi = DMA_DUMMY_DATA; + q->entry[q->head].skip_buf0 = true; + } + + for (i = 0; i < nbufs; i += 2, buf += 2) { + u32 buf0 = buf[0].addr, buf1 = 0; + + idx = q->head; + next = (q->head + 1) % q->ndesc; + + desc = &q->desc[idx]; + entry = &q->entry[idx]; + + if (buf[0].skip_unmap) + entry->skip_buf0 = true; + entry->skip_buf1 = i == nbufs - 1; + + entry->dma_addr[0] = buf[0].addr; + entry->dma_len[0] = buf[0].len; + + ctrl = FIELD_PREP(MT_DMA_CTL_SD_LEN0, buf[0].len); +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT + info |= FIELD_PREP(MT_DMA_CTL_SDP0_H, buf[0].addr >> 32); +#endif + if (i < nbufs - 1) { + entry->dma_addr[1] = buf[1].addr; + entry->dma_len[1] = buf[1].len; + buf1 = buf[1].addr; + ctrl |= FIELD_PREP(MT_DMA_CTL_SD_LEN1, buf[1].len); +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT + info |= FIELD_PREP(MT_DMA_CTL_SDP1_H, + buf[1].addr >> 32); +#endif + if (buf[1].skip_unmap) + entry->skip_buf1 = true; + } + + if (i == nbufs - 1) + ctrl |= MT_DMA_CTL_LAST_SEC0; + else if (i == nbufs - 2) + ctrl |= MT_DMA_CTL_LAST_SEC1; + + WRITE_ONCE(desc->buf0, cpu_to_le32(buf0)); + WRITE_ONCE(desc->buf1, cpu_to_le32(buf1)); + WRITE_ONCE(desc->info, cpu_to_le32(info)); + WRITE_ONCE(desc->ctrl, cpu_to_le32(ctrl)); + + q->head = next; + q->queued++; + } + + q->entry[idx].txwi = txwi; + q->entry[idx].skb = skb; + q->entry[idx].wcid = 0xffff; + + return idx; +} + +static void +mt76_dma_tx_cleanup_idx(struct mt76_dev *dev, struct mt76_queue *q, int idx, + struct mt76_queue_entry *prev_e) +{ + struct mt76_queue_entry *e = &q->entry[idx]; + + if (!e->skip_buf0) + dma_unmap_single(dev->dma_dev, e->dma_addr[0], e->dma_len[0], + DMA_TO_DEVICE); + + if (!e->skip_buf1) + dma_unmap_single(dev->dma_dev, e->dma_addr[1], e->dma_len[1], + DMA_TO_DEVICE); + + if (e->txwi == DMA_DUMMY_DATA) + e->txwi = NULL; + + *prev_e = *e; + memset(e, 0, sizeof(*e)); +} + +static void +mt76_dma_kick_queue(struct mt76_dev *dev, struct mt76_queue *q) +{ + wmb(); - Q_WRITE(q, cpu_idx, q->head); ++ if (mt76_queue_is_emi(q)) ++ *q->emi_cpu_idx = cpu_to_le16(q->head); ++ else ++ Q_WRITE(q, cpu_idx, q->head); +} + +static void +mt76_dma_tx_cleanup(struct mt76_dev *dev, struct mt76_queue *q, bool flush) +{ + struct mt76_queue_entry entry; + int last; + + if (!q || !q->ndesc) + return; + + spin_lock_bh(&q->cleanup_lock); + if (flush) + last = -1; + else + last = Q_READ(q, dma_idx); + + while (q->queued > 0 && q->tail != last) { + mt76_dma_tx_cleanup_idx(dev, q, q->tail, &entry); ++ mt76_npu_txdesc_cleanup(q, q->tail); + mt76_queue_tx_complete(dev, q, &entry); + + if (entry.txwi) { + if (!(dev->drv->drv_flags & MT_DRV_TXWI_NO_FREE)) + mt76_put_txwi(dev, entry.txwi); + } + + if (!flush && q->tail == last) + last = Q_READ(q, dma_idx); + } + spin_unlock_bh(&q->cleanup_lock); + + if (flush) { + spin_lock_bh(&q->lock); + mt76_dma_sync_idx(dev, q); + mt76_dma_kick_queue(dev, q); + spin_unlock_bh(&q->lock); + } + + if (!q->queued) + wake_up(&dev->tx_wait); +} + ++static void * ++mt76_dma_get_rxdmad_c_buf(struct mt76_dev *dev, struct mt76_queue *q, ++ int idx, int *len, bool *more) ++{ ++ struct mt76_queue_entry *e = &q->entry[idx]; ++ struct mt76_rro_rxdmad_c *dmad = e->buf; ++ u32 data1 = le32_to_cpu(dmad->data1); ++ u32 data2 = le32_to_cpu(dmad->data2); ++ struct mt76_txwi_cache *t; ++ u16 rx_token_id; ++ u8 ind_reason; ++ void *buf; ++ ++ rx_token_id = FIELD_GET(RRO_RXDMAD_DATA2_RX_TOKEN_ID_MASK, data2); ++ t = mt76_rx_token_release(dev, rx_token_id); ++ if (!t) ++ return ERR_PTR(-EAGAIN); ++ ++ q = &dev->q_rx[t->qid]; ++ dma_sync_single_for_cpu(dev->dma_dev, t->dma_addr, ++ SKB_WITH_OVERHEAD(q->buf_size), ++ page_pool_get_dma_dir(q->page_pool)); ++ ++ if (len) ++ *len = FIELD_GET(RRO_RXDMAD_DATA1_SDL0_MASK, data1); ++ if (more) ++ *more = !FIELD_GET(RRO_RXDMAD_DATA1_LS_MASK, data1); ++ ++ buf = t->ptr; ++ ind_reason = FIELD_GET(RRO_RXDMAD_DATA2_IND_REASON_MASK, data2); ++ if (ind_reason == MT_DMA_WED_IND_REASON_REPEAT || ++ ind_reason == MT_DMA_WED_IND_REASON_OLDPKT) { ++ mt76_put_page_pool_buf(buf, false); ++ buf = ERR_PTR(-EAGAIN); ++ } ++ t->ptr = NULL; ++ t->dma_addr = 0; *** 45385 LINES SKIPPED *** From nobody Fri Jan 23 14:05:34 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyKTC2S39z6PGjs for ; Fri, 23 Jan 2026 14:05: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 4dyKTB5fDLz3ttN for ; Fri, 23 Jan 2026 14:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769177134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=24UrIDgWjRfXbyWPmqohBDuZB+YKBQSD3+oObbxQF0E=; b=HivXrudoOmb1aaZm5QngYE/SCkPJrg9NUrfb5YqrKMQhYH0uEd4TOFvD0cR+3UBBzHH1kY f2BzSDI49+7YuvhBcWgLQQa1tIjVZIfIljE7lLaxkQ/Y0YB5LWeCMYD9Vl8xcK5wI4HQoa 3xV2JfO78q7AHLVXmJuDlf9kyRHAljuHVzQt6Z4loBA8aDMDyWFMEKh0YnUlDDYsOLh5jd bxJO8nGVhmffduW/0kCJiFLQRnxECP7qZe3ApFXjS0iJagpcnw0fhK6mJY6XXHlrGxVero QYlvctm9xe3tfKlkXYdSZ27BZugyzLsfv8ks6g01LXT3C63mPpoRV+EyfiQwsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769177134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=24UrIDgWjRfXbyWPmqohBDuZB+YKBQSD3+oObbxQF0E=; b=oNAoURQWOxgXZEyNTQoJu5GqV61nRYqVjWXg9Sk1AKt2KF6goj8b3onDzkPUMGKI1DG49h Fk6sumCI/gFCEGojCJuMLPJtcBsF6vxAHXQ65YP58gs7FV/HYjy2nFU/2WKVWrjB0k0vJl OoxzWo8SWw5pwjjwEDQ6By0lAwxJMqqDnuSHBYaN79oMN/OAmWIkhEesmlIIqZBaJRzeo/ YGQ6rC1ORuXQMLPKICp01zZPZC8b9EJmzyVDVij1JUB57U7oSmD1PzM1KwHkzll2Z7iHdC oQsNT3Jdb5AT5+FmAmSl63oMlcZvnXu2XKSivv3tDDT088nD7xsTD9xuiJJYlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769177134; a=rsa-sha256; cv=none; b=e+ZUNqIZaawNck/6J/tgQGDcvjqKosx8IS3e8xgedX3U4U4aeQYVN1AULNudzhwg7qTEqL 39QICjxZEjyp32TF6YPAmO15vz/SQIPSTlSBbGgXEKn7gLtwO9pBVFGZgKpoIwTQCglG1T mZzItmhyqytGpzoheD1YHXquEwFKFlVW7pWqqncm41VFl0CWS0aIEqykxy5HLCw5PFnDRm Scko+zmZWo4hj1B1CFhplKbg1tzdCHCuZRGKtw35bDEqXLeV7mBX15CRkk5EREuuguRRGj X+cn+OJ+AP+N8ZWccstrRMo+aT35tf4jskX4cTr6ocxwAO3R/EfDPuOXtN7QZA== 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 4dyKTB4R5Wz5sH for ; Fri, 23 Jan 2026 14:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d184 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 14:05:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 6b9cbeed6437 - main - CONTRIBUTING.md: Tweaks for clarity List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b9cbeed643756e90b6323f5b735f9765dcda0ad Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 14:05:34 +0000 Message-Id: <6973802e.d184.2b76f650@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6b9cbeed643756e90b6323f5b735f9765dcda0ad commit 6b9cbeed643756e90b6323f5b735f9765dcda0ad Author: Warner Losh AuthorDate: 2026-01-23 14:00:11 +0000 Commit: Warner Losh CommitDate: 2026-01-23 14:04:41 +0000 CONTRIBUTING.md: Tweaks for clarity Add a few tweaks to clarify the author and signed-off-by lines. Add clarifying note about the style checker. Refine the AI statements for clarity, but these will need to be revised once the AI policy has been completed. Sponsored by: Netflix --- CONTRIBUTING.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6f02f2598025..d80163fcd104 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,19 +39,19 @@ A pull request will be considered if: * You can respond to feedback quickly. If feedback is requested and one month passes without a response we may close the pull request. * It touches fewer than about 10 files and the changes are less than about 200 lines. Changes larger than this may be OK, or you may be asked to submit multiple pull requests of a more manageable size. * Each logical change is a separate commit within the pull request. Commit messages for each change should follow the [commit log message guide](https://docs.freebsd.org/en/articles/committers-guide/#commit-log-message). -* All commits have, as the author, your name and valid email address as you would like to see them in the FreeBSD repository. Fake github.com addresses cannot be used. But see [Author Name and Email][#author-name-and-email] for details. +* All commits have, as the git author, your name and valid email address as you would like to see them in the FreeBSD repository. Fake github.com addresses cannot be used. But see [Author Name and Email][#author-name-and-email] for details. * The scope of the pull request should not change during review. If the review suggests changes that expand the scope, please create an independent pull request. * Fixup commits should be squashed with the commit they are fixing. Each commit in your branch should be suitable for FreeBSD's repository. -* Commits should include one or more `Signed-off-by:` lines with name and email address certifying [Developer Certificate of Origin](https://developercertificate.org/). But see [Author Name and Email][#author-name-and-email] for details. +* Commit messages should include one or more `Signed-off-by:` trailer lines with name and email address certifying [Developer Certificate of Origin](https://developercertificate.org/). But see [Author Name and Email][#author-name-and-email] for details. * The commits follow FreeBSD's style guide. See [Style](#Style). -* Run tools/build/checkstyle9.pl on your Git branch and eliminate all errors, or provide an explanation for exceptions. +* Run tools/build/checkstyle9.pl on your Git branch and eliminate all errors, or provide an explanation for exceptions. The tool sometimes makes mistakes, and providing an explanation shows you have examined the output. * The commits do not introduce trailing white space. * If the commit fixes a bug, please add 'PR: \' to the commit message to document the Bugzilla Problem Report number. * If there's a code review related to this change, please include its URL in the commit message. However, where possible, please do not open both a differential review and a GitHub pull request. * If you have run FreeBSD's sources through a static analysis tool, please don't submit the raw results. Please also see the chunking up guidelines. Also, please make sure that kyua tests are the same before / after your change. Ideally, you'd also create a test case that shows an actual bug that's being fixed by these changes. * FreeBSD committers submitting pull requests are responsible for pushing them into the tree (possibly with approval if cross-repo commit bit policy needs it). Pull requests by FreeBSD committers will be closed after a month unless there's a very good reason not to. -* Submissions using generative AI will be rejected. -* Submissions from AI chatbots will result in the account being banned. +* Low quality submimssions will be rejected, especially if they were generated by AI with little to no refinement. +* Submissions by AI chatbots will result in the account being banned. Do not use pull requests interaction to train your LLM or similar AI model. When revising your pull request after feedback, please rebase with a forced push rather than a merge commit. From nobody Fri Jan 23 16:25:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyNZ70Qlgz6PRBr for ; Fri, 23 Jan 2026 16:25: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 4dyNZ65Crvz4G2V for ; Fri, 23 Jan 2026 16:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769185502; h=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=Wjq07nWAo8ZOC3sx9SQo1b2w3KeEw8G5tDgx7MvNSts=; b=yZ20PrajcW6XBtwJFXd1lFLXlD5r5s0ALQDrtIH+2hfm1AatbCv6EBjV7hAxkJrSjrSOV6 sWxwJa6pwAtYCCLNctbD/0iSHOsWF3D5plZBRTBk2FClxjv5hbBzz8TWQE6niT1sc01sZU eIrWZE+XhxfLHdQ6/2iIN8qsYYHnzCPlTR3DJDcgmslihxhMbwVMsGYnaCzypntym5MN0g tyrmxGy2gWlFYRHhGaXpCMEfU6SwkQisw+E7RypdEBGY2oKQw9kbZQwPsTfbcegUXPzSng ZBX5rfm15zTLkbR7t1ClTWscsWlQM2vc61DsTy848d3ah4OnS/eEpITtzaeKcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769185502; h=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=Wjq07nWAo8ZOC3sx9SQo1b2w3KeEw8G5tDgx7MvNSts=; b=n0Qa4eYXo3pUu+1mcNmgIC//7I/9JqS071JiDdJFioeaSp8RYCc6xUmDqf9XgaCPohiKUB h/xUVLQy3VOxRLqc2ETsXj5uFOVMtzxDpZE1u5i2D70AARnZr3wIe8SwmYMQ1DZPlNoeIe +fjM3BLskRjdceAfnyVwpTieyNBU/IpmKwbyqIgUC1tYCaY5wIsYVGYuqsb6fxGC5QZ2Hs sMUSgZmVm1Cq2ua0RoMg9vp9Qb1AqwCeGLq7UuefkRl8Nwmve5iO36ibClVhDghoqgnjO+ pql2Na/sGhkINIXg6NexeL4newABoEY8RKoE4Iiq8f4Fm/LRSmJP6N/N59aQHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769185502; a=rsa-sha256; cv=none; b=ca/9Is8vz1Q8xAJiwchCtMHTUl6IN7ns6dcAAyVOklm25pqlne6rYniWu0yzAVCSbqoNAj pl5rGCAvTZzNVgAJJy+fBM04Q3Ih+oBmf8mTEJrWintLeZmUQyc8IgXTbP5mSDv9g3W+lW +MZHuWh4dES3XMiCCf4VHuHPfB0w5d4/iyr+b3WtIwOg8QAiSYiXSpi4d66qvmv9CXv4oO cL6IH5hktCD2rRHPQwwMvGbgqUHjCOIMj9+D9aa1wiwJyCPRcf6hANytN3jSMkFj+w5GbO ZJ4gBPWN+q46VY037e1gwcMT3UhW9BjBnR1rKlVZ/A//9GA/EhW5Q5hZ/rBcEg== 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 4dyNZ64X0tz9Y2 for ; Fri, 23 Jan 2026 16:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31f4f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 16:25:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Artem Bunichev From: Jose Luis Duran Subject: git: e6bafbeb1ee7 - main - capsicum.4: Replace 'fi' ligature and smart quotation mark List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: e6bafbeb1ee7a61ddfe92ba052c476c7646c405b Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 16:25:02 +0000 Message-Id: <6973a0de.31f4f.455fb27e@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=e6bafbeb1ee7a61ddfe92ba052c476c7646c405b commit e6bafbeb1ee7a61ddfe92ba052c476c7646c405b Author: Artem Bunichev AuthorDate: 2026-01-23 16:17:46 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-23 16:22:46 +0000 capsicum.4: Replace 'fi' ligature and smart quotation mark While here, wrap the line to 80 characters. Reviewed by: jlduran Fixes: c54534e60263 ("capsicum.4: Add some more detail from the Capsicum paper") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54761 --- share/man/man4/capsicum.4 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/man/man4/capsicum.4 b/share/man/man4/capsicum.4 index 1de8e4531f4f..2c65ea27f91c 100644 --- a/share/man/man4/capsicum.4 +++ b/share/man/man4/capsicum.4 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 17, 2025 +.Dd January 23, 2026 .Dt CAPSICUM 4 .Os .Sh NAME @@ -39,7 +39,7 @@ is a lightweight OS capability and sandbox framework implementing a hybrid capability system model. .Nm is designed to blend capabilities with UNIX. -This approach achieves many of the benefits of least-privilege operation, while +This approach achieves many of the benefits of least-privilege operation, while preserving existing UNIX APIs and performance, and presents application authors with an adoption path for capability-oriented design. .Pp @@ -72,10 +72,10 @@ constrained. For instance, .Xr sysctl 2 can be used to query process-local information such as address space layout, -but also to monitor a system’s network connections. +but also to monitor a system's network connections. .Xr sysctl 2 -is constrained by explicitly marking \(~~60 of over 15000 parameters as permitted -in capability mode; all others are denied. +is constrained by explicitly marking \(~~60 of over 15000 parameters as +permitted in capability mode; all others are denied. .Pp The system calls which require constraints are .Xr sysctl 2 , From nobody Fri Jan 23 17:03:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyPQv3yqSz6PTf2 for ; Fri, 23 Jan 2026 17:03: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 4dyPQv36j2z4M4R for ; Fri, 23 Jan 2026 17:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769187831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ZuWOSrV7a/oO3bymLvdCrgK2jvlHhDoBSJcvL0gqEw=; b=ONt5Q9aqaLS1Cm66Gj+3GKary8n4lhcBB4Fc5wDZSAGgSgGAG6qTg+oxCKOIl3yGKBac11 lLfeh7ldSeaWL2G2M5Kgz0KrCkuZW3FPRbCjfJ+JPaJUyjOQIZknjHzKm0cI6n0o5tbgNb Bh+2ykO54lxuDWD9i4xvbk9JZHf+jhbgGmDWPxiLJ+bACsGcssVHottKk22JqYxKRD4YFI xeX45A8NZPr0dOZmedw9UfaOmVxo5NElM8SLPPjyUtpPLCgY5ueSQ/qQZas7HG7aXZVUEA M/oJHx9S92+B56LIhzU8Ryy3KqCCewwwvzb+0C52QC4XdzTmIbv9s1vWabFItQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769187831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5ZuWOSrV7a/oO3bymLvdCrgK2jvlHhDoBSJcvL0gqEw=; b=pNoF2o5ium12bdpPnDHk+OMKBwPhC2WBODlnppn58xaIYWXRqEdBgOp2l8w/6dQb0gkSbY LFHym30J4h5y0KNQxe9LuqI8PUfomdUCOt7oQEg1Y4oRatixb5EWRWgnXvVhXIJakEnLoU 4GrOuI2ZxHttOGzasSqRAp9R8n0Tsv9cYwFvivPzNp1LmSL3KsOXkKpE8aZIzjMNp2h2MZ CTHRYfn4DHBScbBYmRWm2ueO3LTRtwrdynNIUcKHwt2GlEgsftcpyzYhoM7juYNMLi12nv o42JdBAffPwoN3F7rDrk/AJpaxAR0WYsSLJ5CJKo8WZeo4vYTBipXf37yTLk6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769187831; a=rsa-sha256; cv=none; b=rV/iw31tyPtkaBIsc0CECgDDxWdw9mxWahlNEj+oyDCq7d7g6ghtTKWzpDdcLqeuvGxXq3 LyoYm3KPeaTTnZ7jjn+rDDxC94rO2tLLMDo4jwGTy3TsYHmMc9e3512ITRWTW/3F/Fyq4f I2lnuPorM8NWLy4+R8m1EOie9FiL1z3JmSKtd6+cw/1tOUDKEbroRTPvQ0yc66zwxq1kYN sbkDXMsKK0/JXQZUTMrsnqF4kM+ceSCq3aLWFXVeaCebPwyMFkYj/zQp4kkH74ilLV7JZC wBg7Iyu7FqFYOkmyWOI0Y1UTFf+cp4PNu9SGFy/P2WvNYRrYlHtgN74zJw8u5A== 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 4dyPQv2RhHzCC3 for ; Fri, 23 Jan 2026 17:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3767f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 17:03:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 6c5fdba45a63 - main - arm/gic: Detect broken configurations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c5fdba45a63d66984e15ddc6996f5e88a55f22c Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 17:03:51 +0000 Message-Id: <6973a9f7.3767f.22208c22@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=6c5fdba45a63d66984e15ddc6996f5e88a55f22c commit 6c5fdba45a63d66984e15ddc6996f5e88a55f22c Author: Andrew Turner AuthorDate: 2026-01-23 14:31:04 +0000 Commit: Andrew Turner CommitDate: 2026-01-23 17:02:29 +0000 arm/gic: Detect broken configurations Some virtualization platforms provide broken configurations. There is a GIC interrupt controller, however accessing the CPU interface registers leads to an external data abort. As these are needed to handle interrupts we are unable to boot further. Detect this misconfiguration and panic to tell the user the issue. Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54832 --- sys/arm/arm/gic.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c index e33bda4886b9..64f19c848ea2 100644 --- a/sys/arm/arm/gic.c +++ b/sys/arm/arm/gic.c @@ -151,6 +151,8 @@ static struct arm_gic_softc *gic_sc = NULL; /* CPU Interface */ #define gic_c_read_4(_sc, _reg) \ bus_read_4((_sc)->gic_res[GIC_RES_CPU], (_reg)) +#define gic_c_peek_4(_sc, _reg, _val) \ + bus_peek_4((_sc)->gic_res[GIC_RES_CPU], (_reg), (_val)) #define gic_c_write_4(_sc, _reg, _val) \ bus_write_4((_sc)->gic_res[GIC_RES_CPU], (_reg), (_val)) /* Distributor Interface */ @@ -347,7 +349,18 @@ arm_gic_attach(device_t dev) goto cleanup; } - icciidr = gic_c_read_4(sc, GICC_IIDR); + /* + * Try accessing a CPU interface register. On some broken + * virtualization environments this will raise an external + * data abort. When this happens we can detect it using + * by peeking at the register & checking for the fault. + * As there is no way to continue with a normal boot we + * panic. + */ + if (gic_c_peek_4(sc, GICC_IIDR, &icciidr) != 0) + panic("Unable to access %s CPU registers, " + "broken hardware or hypervisor configuration", + device_get_nameunit(dev)); device_printf(dev, "pn 0x%x, arch 0x%x, rev 0x%x, implementer 0x%x irqs %u\n", GICD_IIDR_PROD(icciidr), GICD_IIDR_VAR(icciidr), From nobody Fri Jan 23 17:16:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyPjX3bj9z6PVG9 for ; Fri, 23 Jan 2026 17:16: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 4dyPjX2Y0wz4PSr for ; Fri, 23 Jan 2026 17:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769188592; h=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=K1BxwlQFHu1dhN7YoDa978ksUYfo40TPQ83qQW0cj2qoYZFqBqWkOxT7dhWqq/uvb6a1O2 pJVZFO3Jej5FnKwqrZMDD8swuDBDW2+VzROS23V2s/A5ph8sttNWTstuenn/d82XM9G7w1 3k5zNQkdeS+aH4oaH5OlBWvIc5RTmoeCumLQw5M0D8IULtLooJ/zcX7tfDOEqB02zFbiJl SrlZOeLlRMpBLxJ3C+pOnXwICoi0chkPmP+vTTiiAkc6aYukmhWtP1A+p1no+UDWicodHX FxeF6CAg9o/UgR/lfmpUursVzypOFK1McZO05eI2AkOS/P4ldEHquCwo8bimKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769188592; h=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=LerWcK+kbW05UJtqzvwZKz+OLdZa+N8seQ68ZGA9+vybl5yDqpc659/3i9M1eNyeS/3NnE GutbfXmTnLhT7Bn7o8TZJQbXCVtPXFNZr5mS/X8z5tdRn4bRXqp8l1OM795tyUH/RQ2/wi PTH/ZoNHAFIie0l/Qeg5A3TpoyVyzfMYNjZbwaC07FJqtPVklR+m1iqMMldBlB4T9yd6Fr 0ep3ptS0hyc/Og/OmH2x6lDYpASdnslaUp/ldsG8mo2+VCPt0fr24cVKhAEMv0RMjpBPm5 oPY6rrm2CicO55wTJpTmUxisVD4BWUlNuG2ONONr/67vuLjZplENaaiAo0d5Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769188592; a=rsa-sha256; cv=none; b=InPZu38uJ6jbBQ4iSq3h7pOTTfNP0itSljLxAfCg9ps5pKlnjXiXoVnnkjzP/NeotyqCHC MYReh2zhcEatS/UueYLCgIg4nYXNh6gkA+V9kZ95yTPMbJdAZW8RN41E8ko7O67MkrAUD2 k3Fb8IAGRk0NIapB/wvQwYF0J/J2KS0yctwr8n/gGNzhdPOJ/DtLpVsLOAnjfow6no5Ypz le3925rGexsf3Wv2KcKzFLsD6zIRehJ0A4frXtcw7jI04/QHluQM8VLKZ7vu+cIjh2J7BK uapw7HgJowWOwQQNmxpFpoc3A/49338DDllSRHEKb5JUUe3Ld7XZmLpM0reGMw== 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 4dyPjX1sr1zCJv for ; Fri, 23 Jan 2026 17:16:32 +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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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 17:33:33 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyQ5B17STz6PWD8 for ; Fri, 23 Jan 2026 17:33: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 4dyQ5B0P21z3G3q for ; Fri, 23 Jan 2026 17:33:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769189614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IHMAzSbkr5GhdTRTukVIf7X4ltaBVADJ/1qtCQ3BN28=; b=atfIUyP8DvogsGjLbEC/O4BkWps5tL4kitRimivq1bi27EuQUSsLTYoR3DwZWfjZTvTDpM cRaKwbbjIXf4domCjCu+RH5NdQ7v10oWAsF8BPkkLzZNZZ16A57MHgoPK6LT62E9w+kuyT W43nbIiA1hPkSmMA4mIkxMYs5GiO3HK7joA+HQkExkWbyZKZw9Gz3NIPIs5NwiSDonH0j0 X8UZt/0S5E1oz1U4Ptasmm6IIUqBWmlNXdvLBGIre3U9foShK8/dB1Kl+DQNIUgUlKrokB 9iBayIA2C8CnhVFm6ALUdTY/oB206Y3HQNkHXdeNzJKIafQ7RQQSQ6IfHL1g+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769189614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IHMAzSbkr5GhdTRTukVIf7X4ltaBVADJ/1qtCQ3BN28=; b=ohzX/J83hctfxYLSpgBXx6mtnxlkmatAgvnSRil1bpS7vO01Q0HVQOYE56oORN4opPD7yz nYnYiwY8zJJK7kAFQtREyBRJE8BlI14J1i30uQb+0jhqzfwZGZWNafquWVN6YiQzddRLZV 8Z4SpOpKdph425dDi/kHE/99+KrsxqmgLFwuTufgEYbnyMQupSFqwzPiib1MLIK/+xtjK7 3Kesaa9vdG6qRF8S/spH+DOPM0lCrSr02iLan7r4HjS5wobuT7lQoNSUdqFV+Cg8guoTOz CSdfEAaE59BQgjalcdggjKOVQYJnv98gkjM/5xq2hGZ2e07lvuwMHdFtiUK6PA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769189614; a=rsa-sha256; cv=none; b=Xowb4K2F64QlN1u7ukaBx38/shVjpOs6ENariG0jHayO9Zd+ZLi694yj7z9uj1Yen5dgaX 7vaCXbBZWkedUbsiVz4l/78IWdgL6aOHmdYDTYLPWDNRhjx+TwhezGXb7BzqzCaGFu8Z4d pkLWnLeoyHARFJGOQnX7YPzJhWbD3+hR3s10B0y3YadsOTMtL72+I8oy6wp9wT3R3lFShv DXHRz+OstOIbKeyc8D0Nqm4y4tFinAZHJvVx4+ebHhcaL0DDylNQckEfz4mpfMyx6bVdB4 VhksAl7H2SCUt14c8rdJn2b0O4o96qAE7BveILAfZiOgdCyicPE7hoP78sRFWQ== 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 4dyQ596mKCzCZg for ; Fri, 23 Jan 2026 17:33:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39ec8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 17:33:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 3cdb6c9d92ec - main - libc++ inttypes.h: define __STDC_CONSTANT_MACROS and __STDC_LIMIT_MACROS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cdb6c9d92ecf479a0df338267f3f844ef6feeb2 Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 17:33:33 +0000 Message-Id: <6973b0ed.39ec8.2658aed8@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3cdb6c9d92ecf479a0df338267f3f844ef6feeb2 commit 3cdb6c9d92ecf479a0df338267f3f844ef6feeb2 Author: Dimitry Andric AuthorDate: 2026-01-23 17:31:53 +0000 Commit: Dimitry Andric CommitDate: 2026-01-23 17:33:23 +0000 libc++ inttypes.h: define __STDC_CONSTANT_MACROS and __STDC_LIMIT_MACROS Before transitively including the base version of inttypes.h, define __STDC_CONSTANT_MACROS and __STDC_LIMIT_MACROS, because the base inttypes.h directly includes sys/stdint.h, instead of going through the 'regular' stdint.h. The libc++ version of the latter does define those macros, to ensure things like UINT64_C() and SIZE_MAX are defined even in C++98 or C++03. MFC after: 3 days --- contrib/llvm-project/libcxx/include/inttypes.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/inttypes.h b/contrib/llvm-project/libcxx/include/inttypes.h index 8664412bd52f..501cb1c11d53 100644 --- a/contrib/llvm-project/libcxx/include/inttypes.h +++ b/contrib/llvm-project/libcxx/include/inttypes.h @@ -241,12 +241,19 @@ uintmax_t wcstoumax(const wchar_t* restrict nptr, wchar_t** restrict endptr, int # pragma GCC system_header #endif -/* C99 stdlib (e.g. glibc < 2.18) does not provide format macros needed - for C++11 unless __STDC_FORMAT_MACROS is defined +/* C99 stdlib (e.g. glibc < 2.18) does not provide macros needed + for C++11 unless __STDC_CONSTANT_MACROS, __STDC_FORMAT_MACROS + and __STDC_LIMIT_MACROS are defined */ +#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS) +# define __STDC_CONSTANT_MACROS +#endif #if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) # define __STDC_FORMAT_MACROS #endif +#if defined(__cplusplus) && !defined(__STDC_LIMIT_MACROS) +# define __STDC_LIMIT_MACROS +#endif #if __has_include_next() # include_next From nobody Fri Jan 23 18:09:46 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyQtz0gMsz6PYZb for ; Fri, 23 Jan 2026 18:09: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 4dyQty74zKz3Kfh for ; Fri, 23 Jan 2026 18:09:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769191787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j2bFCyLLsQMYCy2+1c7prJIg8jLN8EBOQwtkqT8iGOE=; b=lGm2JucbLMad46iH6MIXMoSpK951JVv/uVkRYJSoZXfKWXMsyF4Bdd1OW5+tlhkZMLljL4 2Rzx93ScBoor2nTrBBiVzTYSkB/5AEqJUfe2/KAKmi95iaoX0/sYqSyZ3Tn20SbsD9KiYr f8mXN4IQ1oE1h2LfC0mGMH9jX7tglPTrhfVWT/yfy6fV0djvbewvwpbZycLAl5/ZBpnDSo gS1lbuMTfXsUMRvTPsl/HVSqW7ddle6zVtszxvGbQxRY6FPKcD6G/gRdy1BI1Yz0avq6zY mhTVsP965+gqxvzN+mzLJ5ndirRdoNx4FYyRE1kTQUy8Pker+Fz4dzJl/bYw5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769191787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j2bFCyLLsQMYCy2+1c7prJIg8jLN8EBOQwtkqT8iGOE=; b=h8nXick8HQYvdyfCoNLcpE2js8iUMnPWADwdUEfxHyyIA1QZp4p/hbvYNE3pi7+sofl3DP NE5YhLYJjWa/FVn9r+8Kn53saqbtLaNmXnTBukIEcH1nwhj3A2mo8f1WyHGaQAwQ1CWFKQ pP6hixUKh9xD6XOTal99kV6pZj7MZZFKuVdP2iAu0QueL34sBUoXGQ5THn/3esncaMMEhR REEeNdIA6X4idPCxFzFWvj3Yw/P5ELrQojTdBIH5/semJSjXBmm27eUS89bHsgLVw7Nnpq Jvl1GtCfoe4c10tlmu0/wbVuUHxYgEoqLK+x/i3X/pBFEdosBbs31tFZOM3l/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769191787; a=rsa-sha256; cv=none; b=ksP1fcf4pd4tzlaysIsODnDVgj7tLwzoN3hG54ganDyn4L/zKKp9mZt562bq/sJwPcs50P /nZmownRL3xuixeVb2JBde1mjdfui7UyJJbQ3+24rFYnOhXucuaFLWD9e3yy9hMS6RNFEn 3pUlOCVewO0rO/rkm+K345G1xf7sjJAjO6MwTiB+7Y9E5G7pGvm0zS2n0o3ceIPy/uONhw yz/O4t7JjtqzzkomJc9LqBI6gy18RjVZLSxHurZNGBK15f+DUuohhTZr6pO3wNpWl+zseZ kGXHAO/qyOZVQel1Ip38pRU0y9in/Nk2KEI6nvq01723OsWlb512sIDVjiLLsg== 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 4dyQty6NMwzTWc for ; Fri, 23 Jan 2026 18:09:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c1f4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 18:09:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4990cf83f5fa - main - MAINTAINERS: Remove some stale entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4990cf83f5fa474f619293c8c8ed1c8ba4b74692 Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 18:09:46 +0000 Message-Id: <6973b96a.3c1f4.48e571de@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4990cf83f5fa474f619293c8c8ed1c8ba4b74692 commit 4990cf83f5fa474f619293c8c8ed1c8ba4b74692 Author: Warner Losh AuthorDate: 2026-01-23 18:03:26 +0000 Commit: Warner Losh CommitDate: 2026-01-23 18:08:16 +0000 MAINTAINERS: Remove some stale entries Remove some stale entries, preen some others. Longer term, we need a better format. Also, if there's mistakes, let us know: we want it to be useful to people seeking review, not be perscriptive about who can do what. Reviewed by: srcmgr@ --- MAINTAINERS | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a752e7d0600e..307932dee240 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -58,16 +58,15 @@ fusefs(4) asomers Pre-commit review requested. geli pjd Pre-commit review requested (both sys/geom/eli/ and sbin/geom/class/eli/). iwm(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org iwn(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -kqueue jmg Pre-commit review requested. Documentation Required. libdpv dteske Pre-commit review requested. Keep in sync with dpv(1). -libfetch des Pre-commit review requested, email only. +libfetch des Pre-commit review requested libfigpar dteske Pre-commit review requested. libm freebsd-numerics Send email with patches to freebsd-numerics@ libpam des Pre-commit review requested, email only. linprocfs des Pre-commit review requested, email only. lpr gad Pre-commit review requested, particularly for lpd/recvjob.c and lpd/printjob.c. -nanobsd imp Pre-commit phabricator review requested. +nanobsd imp,jlduran Pre-commit phabricator review requested. net80211 adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org nfs freebsd-fs@FreeBSD.org, rmacklem is best for reviews. mpi3mr(4) imp Pre-commit review requested. @@ -76,11 +75,11 @@ mps(4) imp Pre-commit review requested. nvd(4) imp Pre-commit review requested. nvme(4) imp Pre-commit review requested. nvmecontrol(8) imp Pre-commit review requested. -opencrypto jmg Pre-commit review requested. Documentation Required. -openssh des Pre-commit review requested, email only. +opencrypto jhb Pre-commit review requested. +openssh emaste Pre-commit review requested. openssl benl Pre-commit review requested. otus(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -pci bus imp,jhb Pre-commit review requested. +sys/dev/pci imp,jhb Pre-commit review requested. pmcstudy(8) rrs Pre-commit review requested. procfs des Pre-commit review requested, email only. pseudofs des Pre-commit review requested, email only. @@ -93,7 +92,7 @@ sendmail gshapiro Pre-commit review requested. sh(1) jilles Pre-commit review requested. This also applies to kill(1), printf(1) and test(1) which are compiled in as builtins. -share/man ziaee Pre-commit review please +share/man ziaee Pre-commit review please share/mk imp, bapt, bdrewery, emaste, sjg Make is hard. share/mk/*.test.mk imp,bapt,bdrewery, Pre-commit review requested. emaste,ngie,sjg,#test @@ -103,33 +102,26 @@ stand imp Pre-commit review strongly requested. sys/compat/linuxkpi pre-commit review requested via #linuxkpi phabricator group. sys/contrib/dev/ice erj Pre-commit phabricator review requested. sys/netpfil/ipfilter cy Pre-commit review requested. -sys/dev/e1000 erj Pre-commit phabricator review requested. -sys/dev/ixgbe erj Pre-commit phabricator review requested. -sys/dev/ixl erj Pre-commit phabricator review requested. -sys/dev/ice erj Pre-commit phabricator review requested. +sys/dev/e1000 #intel_networking Pre-commit phabricator review requested. +sys/dev/ixgbe #intel_networking Pre-commit phabricator review requested. +sys/dev/ixl #intel_networking Pre-commit phabricator review requested. +sys/dev/ice #intel_networking Pre-commit phabricator review requested. sys/dev/xen royger Pre-commit review recommended. sys/netinet/ip_carp.c glebius Pre-commit review recommended. sys/netpfil/pf kp,glebius Pre-commit review recommended. sys/x86/xen royger Pre-commit review recommended. sys/xen royger Pre-commit review recommended. tests ngie,#test Pre-commit review requested. -tools/build imp Pre-commit review requested, especially to fix bootstrap issues. +tools/build imp,jrtc27 Pre-commit review requested, especially to fix bootstrap issues. top(1) eadler Pre-commit review requested. ufshci(4) jaeyoon Pre-commit review requested. usr.sbin/bsdconfig dteske Pre-commit phabricator review requested. usr.sbin/dpv dteske Pre-commit review requested. Keep in sync with libdpv. usr.sbin/pkg pkg@ Please coordinate behavior or flag changes with pkg team. usr.sbin/sysrc dteske Pre-commit phabricator review requested. Keep in sync with bsdconfig(8) sysrc.subr. -vmm(4) jhb Pre-commit review requested via #bhyve - phabricator group. -libvmmapi jhb Pre-commit review requested via #bhyve - phabricator group. -usr.sbin/bhyve* jhb Pre-commit review requested via #bhyve - phabricator group. -autofs(4) trasz Pre-commit review recommended. -iscsi(4) trasz Pre-commit review recommended. -rctl(8) trasz Pre-commit review recommended. -sys/dev/ofw nwhitehorn Pre-commit review recommended. +vmm(4) #bhyve Pre-commit review requested via #bhyve phabricator group. +libvmmapi #bhyve Pre-commit review requested via #bhyve phabricator group. +usr.sbin/bhyve* #bhyve Pre-commit review requested via #bhyve phabricator group. sys/dev/usb/wlan adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org sys/arm/allwinner manu Pre-commit review requested sys/arm64/rockchip manu Pre-commit review requested From nobody Fri Jan 23 18:19:41 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyR6P6Mf5z6PZ9W 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 4dyR6P47ZLz3LxC 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 4dyR6P30KqzTtc 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyR6Q6t0zz6PYvD 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 4dyR6Q4Rnzz3LxD 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 4dyR6Q3dzQzTpB 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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 Fri Jan 23 19:01:48 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyS305tGyz6Pcmf for ; Fri, 23 Jan 2026 19:01: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 4dyS305V7Xz3TRY for ; Fri, 23 Jan 2026 19:01:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769194908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4RMnbRgnukBgbgOLVtQQTunET/0S8sOKYrHjFMll/TA=; b=gMDW3xtLts44eHBJNJszSgS1A9oE/8/UHIUvbsg7CbHuyL/lZghUrSkFHopqaJeCfliBzx zQGzgfFlFKBsilaFMEha+T8X2JnS9so0v4hBB9sGFXpEphhb7RZZZ4Hen/tZcvANP4NP5b 2YKAEyKmYbaIPX8Zaw8TL6tsjT5ZQJrEBDj7NYSECylhT+XRdNbHQfZ26YaDo3lsPGg+l0 ULuGlncUIDaQYJZ7a9+Vj4SUHuVYjfmiiPM83Nms0Y9+vlLjwzSuO21c4aczjotkglDCAV g3pDOn8dvitD6eATnDLNxEHR1Yd7wKHYRctDHX/objh5QpJPxoHUAWzC6UZPBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769194908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4RMnbRgnukBgbgOLVtQQTunET/0S8sOKYrHjFMll/TA=; b=gD6KdaG4IYWHIYVdSE9NW9jWktTWUGg5ZzNiYpULomT4PvL9wYOcpZh8X2GbAVVHR14lTt zF3cZm/AX38YtjEcPsv0HOoYg4KIetLW906BPQAmEue9X0lqcybbF/Zm9YcZkQaeWDAQch wCoScu4rcplxVjvHfqSZ0Uznk7JTzHiDwlIGa9mVAKfFn4ZFrFtE6LrNG/1PL37fibETMa /+C3uTqOdm7euikDzNOqJ3O2KCMfYM5+hJzLk2RrseYFQ+61CwSoETJgfK3aV65kGJdfMc VzivY+sQJHoyZnLawbX8JqNl4RAPgDXqd5Nj6gmlZXInZBSkQXavmQkjYOf6pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769194908; a=rsa-sha256; cv=none; b=GRc5A2h1+3II5SlyEZV5LhaAnxLyhlna49lhf8NRA4tYx6OaF6JWjbaH2+X14gdCnQHOTH 4XskPksWPY2Br5ViUWlaDM6Y+TRfi3sScQhnnlFeWeCsSGJI/k+xpNmCgk93z+b/I372lm 9lreRrQLaZfrQ2VmqyDyuziY1zvKtPOOSzuQJEyVPBbUwh07gkAIvyGRmN3hT7umpHjngA HPz5TUTdjCjwn0i3YO3Qd6ei6Pqty4UFv6DDqo6jhf2Auz/EdLorv1CFjM5YBgOkV8zvtO kl8kgIVFUVYzhcDfFiujxjZJ/bLL+4TGbw1O4XYNRoLeKkGPys/UnDQGsNHLYQ== 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 4dyS304twBzXMY for ; Fri, 23 Jan 2026 19:01:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id a716 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 19:01:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 37d11fde8f58 - main - tests/kern: add test for SSL_sendfile() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37d11fde8f581a1d18c2fea235085d0d63e09384 Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 19:01:48 +0000 Message-Id: <6973c59c.a716.4e45f27c@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=37d11fde8f581a1d18c2fea235085d0d63e09384 commit 37d11fde8f581a1d18c2fea235085d0d63e09384 Author: Gleb Smirnoff AuthorDate: 2026-01-21 04:05:21 +0000 Commit: Gleb Smirnoff CommitDate: 2026-01-23 19:00:49 +0000 tests/kern: add test for SSL_sendfile() --- tests/sys/kern/Makefile | 2 + tests/sys/kern/ssl_sendfile.c | 514 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 516 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 7a77fa08e2b1..e56dd560414a 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -47,6 +47,7 @@ TEST_METADATA.sigwait+= is_exclusive="true" ATF_TESTS_C+= subr_physmem_test .endif PLAIN_TESTS_C+= subr_unit_test +ATF_TESTS_C+= ssl_sendfile ATF_TESTS_C+= sysctl_kern_proc ATF_TESTS_C+= sys_getrandom ATF_TESTS_C+= tty_pts @@ -83,6 +84,7 @@ PROGS+= sendfile_helper LIBADD.copy_file_range+= md LIBADD.jail_lookup_root+= jail util +LIBADD.ssl_sendfile+= pthread crypto ssl CFLAGS.sys_getrandom+= -I${SRCTOP}/sys/contrib/zstd/lib LIBADD.sys_getrandom+= zstd LIBADD.sys_getrandom+= c diff --git a/tests/sys/kern/ssl_sendfile.c b/tests/sys/kern/ssl_sendfile.c new file mode 100644 index 000000000000..928a44a50811 --- /dev/null +++ b/tests/sys/kern/ssl_sendfile.c @@ -0,0 +1,514 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 Gleb Smirnoff + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +#define FSIZE (size_t)(1024 * 1024) + +struct ctx { + EVP_PKEY *pkey; /* Self-signed key ... */ + X509 *cert; /* ... and certificate */ + SSL_CTX *ctx; /* client context */ + SSL *cln; /* client connection */ + SSL *srv; /* server connection */ + int cs; /* client socket */ + int ss; /* server socket */ + int fd; /* test file descriptor */ + void *mfd; /* mapped contents of the test file */ + uint16_t port; /* server listening port */ + pthread_t thr; /* server thread */ + off_t offset; /* SSL_sendfile offset */ + size_t size; /* SSL_sendfile size */ + bool nb; /* SSL_sendfile mode */ + ossl_ssize_t sbytes; /* SSL_sendfile returned sbytes */ + enum { + INIT, + READY, + RUNNING, + EXITING, + } state; + pthread_mutex_t mtx; + pthread_cond_t cv; +}; + +static void *server_thread(void *arg); + +static void +common_init(struct ctx *c) +{ + char hostname[sizeof("localhost:65536")]; + char tempname[] = "/tmp/ssl_sendfile_test.XXXXXXXXXX"; + X509_NAME *name; + X509_EXTENSION *ext; + SSL *ssl; + bool enable; + size_t len = sizeof(enable); + + if (sysctlbyname("kern.ipc.tls.enable", &enable, &len, NULL, 0) == -1) { + if (errno == ENOENT) + atf_tc_skip("kernel does not have options KERN_TLS"); + atf_libc_error(errno, "Failed to read kern.ipc.tls.enable"); + } + if (!enable) + atf_tc_skip("kern.ipc.tls.enable is off"); + + c->state = INIT; + + /* + * Generate self signed key & certificate. + */ + SSL_library_init(); + OpenSSL_add_all_algorithms(); + SSL_load_error_strings(); + ATF_REQUIRE(c->pkey = EVP_RSA_gen(2048)); + ATF_REQUIRE(c->cert = X509_new()); + ASN1_INTEGER_set(X509_get_serialNumber(c->cert), 1); + X509_set_version(c->cert, 2); + X509_gmtime_adj(X509_get_notBefore(c->cert), 0); + X509_gmtime_adj(X509_get_notAfter(c->cert), 60L*60*24*365); + X509_set_pubkey(c->cert, c->pkey); + name = X509_get_subject_name(c->cert); + X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC, + (unsigned char *)"localhost", -1, -1, 0); + X509_set_issuer_name(c->cert, name); + ext = X509V3_EXT_conf_nid(NULL, NULL, NID_basic_constraints, + "critical,CA:FALSE"); + X509_add_ext(c->cert, ext, -1); + X509_EXTENSION_free(ext); + ATF_REQUIRE(X509_sign(c->cert, c->pkey, EVP_sha256()) > 0); + + /* + * Create random filled file with memory mapping. + */ + ATF_REQUIRE((c->fd = mkstemp(tempname)) > 0); + ATF_REQUIRE(unlink(tempname) == 0); + ATF_REQUIRE(ftruncate(c->fd, FSIZE) == 0); + ATF_REQUIRE((c->mfd = mmap(NULL, FSIZE, PROT_READ | PROT_WRITE, + MAP_SHARED, c->fd, 0)) != MAP_FAILED); + arc4random_buf(c->mfd, FSIZE); + + ATF_REQUIRE(pthread_mutex_init(&c->mtx, NULL) == 0); + ATF_REQUIRE(pthread_cond_init(&c->cv, NULL) == 0); + + /* + * Start server and wait for it to finish bind(2) + listen(2). + */ + ATF_REQUIRE(pthread_mutex_lock(&c->mtx) == 0); + ATF_REQUIRE(pthread_create(&c->thr, NULL, server_thread, c) == 0); + if (c->state != READY) + ATF_REQUIRE(pthread_cond_wait(&c->cv, &c->mtx) == 0); + ATF_REQUIRE(c->state == READY); + ATF_REQUIRE(pthread_mutex_unlock(&c->mtx) == 0); + + /* + * Connect client. + */ + ATF_REQUIRE(c->ctx = SSL_CTX_new(TLS_client_method())); + ATF_REQUIRE(X509_STORE_add_cert(SSL_CTX_get_cert_store(c->ctx), + c->cert)); + ATF_REQUIRE(ssl = c->cln = SSL_new(c->ctx)); + ATF_REQUIRE((c->cs = socket(AF_INET, SOCK_STREAM, 0)) > 0); + ATF_REQUIRE(connect(c->cs, (struct sockaddr *)&(struct sockaddr_in) + { .sin_family = AF_INET, .sin_len = sizeof(struct sockaddr_in), + .sin_addr.s_addr = htonl(INADDR_LOOPBACK), .sin_port = c->port }, + sizeof(struct sockaddr_in)) == 0); + ATF_REQUIRE(SSL_set_fd(ssl, c->cs) == 1); + ATF_REQUIRE(snprintf(hostname, sizeof(hostname), "localhost:%u", + ntohs(c->port)) >= (int)sizeof("localhost:0")); + ATF_REQUIRE(SSL_set_tlsext_host_name(ssl, hostname) == 1); + SSL_set_verify(ssl, SSL_VERIFY_PEER, NULL); + ATF_REQUIRE(SSL_connect(ssl) == 1); + SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY); + ATF_REQUIRE(fcntl(c->cs, F_SETFL, O_NONBLOCK) != -1); +} + +static void +common_cleanup(struct ctx *c) +{ + + ATF_REQUIRE(pthread_mutex_lock(&c->mtx) == 0); + c->state = EXITING; + ATF_REQUIRE(pthread_cond_signal(&c->cv) == 0); + ATF_REQUIRE(pthread_mutex_unlock(&c->mtx) == 0); + ATF_REQUIRE(pthread_join(c->thr, NULL) == 0); + + ATF_REQUIRE(pthread_mutex_destroy(&c->mtx) == 0); + ATF_REQUIRE(pthread_cond_destroy(&c->cv) == 0); + + SSL_free(c->cln); + SSL_CTX_free(c->ctx); + X509_free(c->cert); + EVP_PKEY_free(c->pkey); +} + +static void * +server_thread(void *arg) { + struct ctx *c = arg; + SSL_CTX *srv; + SSL *ssl; + struct sockaddr_in sin = { + .sin_family = AF_INET, + .sin_len = sizeof(sin), + .sin_addr.s_addr = htonl(INADDR_LOOPBACK), + }; + int s; + + ATF_REQUIRE(srv = SSL_CTX_new(TLS_server_method())); + ATF_REQUIRE(SSL_CTX_set_options(srv, SSL_OP_ENABLE_KTLS) & + SSL_OP_ENABLE_KTLS); + SSL_CTX_use_PrivateKey(srv, c->pkey); + SSL_CTX_use_certificate(srv, c->cert); + ATF_REQUIRE((s = socket(AF_INET, SOCK_STREAM, 0)) > 0); + ATF_REQUIRE(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &(socklen_t){1}, + sizeof(int)) == 0); + ATF_REQUIRE(bind(s, (struct sockaddr *)&sin, sizeof(sin)) == 0); + ATF_REQUIRE(getsockname(s, (struct sockaddr *)&sin, + &(socklen_t){ sizeof(sin) }) == 0); + ATF_REQUIRE(listen(s, -1) == 0); + + ATF_REQUIRE(pthread_mutex_lock(&c->mtx) == 0); + c->port = sin.sin_port; + c->state = READY; + ATF_REQUIRE(pthread_cond_signal(&c->cv) == 0); + ATF_REQUIRE(pthread_mutex_unlock(&c->mtx) == 0); + + ATF_REQUIRE((c->ss = accept(s, NULL, NULL)) > 0); + ssl = c->srv = SSL_new(srv); + SSL_set_fd(ssl, c->ss); + SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY); + ATF_REQUIRE(SSL_accept(ssl) > 0); + + ATF_REQUIRE(pthread_mutex_lock(&c->mtx) == 0); + while (c->state != EXITING) { + if (c->state == RUNNING) { + ATF_REQUIRE(fcntl(c->ss, F_SETFL, + c->nb ? O_NONBLOCK : 0) != -1); + c->sbytes = SSL_sendfile(ssl, c->fd, c->offset, + c->size, 0); + c->state = READY; + } + ATF_REQUIRE(c->state == READY); + ATF_REQUIRE(pthread_cond_signal(&c->cv) == 0); + ATF_REQUIRE(pthread_cond_wait(&c->cv, &c->mtx) == 0); + } + ATF_REQUIRE(pthread_mutex_unlock(&c->mtx) == 0); + + SSL_shutdown(ssl); + SSL_free(ssl); + close(c->ss); + SSL_CTX_free(srv); + close(s); + + return (NULL); +} + +static void +sendme_locked(struct ctx *c, off_t offset, size_t size, bool nb) +{ + ATF_REQUIRE(c->state == READY); + c->state = RUNNING; + c->offset = offset; + c->size = size; + c->nb = nb; + ATF_REQUIRE(pthread_cond_signal(&c->cv) == 0); +} + +static void +sendme(struct ctx *c, off_t offset, size_t size, bool nb) +{ + ATF_REQUIRE(pthread_mutex_lock(&c->mtx) == 0); + sendme_locked(c, offset, size, nb); + ATF_REQUIRE(pthread_mutex_unlock(&c->mtx) == 0); +} + +/* + * Block until non-blocking socket has at least a byte. + */ +static int +SSL_read_b(SSL *ssl, void *buf, int size) +{ + int rv, fd; + + ATF_REQUIRE((fd = SSL_get_fd(ssl)) > 0); + while ((rv = SSL_read(ssl, buf, size)) <= 0 && + SSL_get_error(ssl, rv) == SSL_ERROR_WANT_READ) + ATF_REQUIRE(poll(&(struct pollfd){ .fd = fd, .events = POLLIN }, + 1, INFTIM) == 1); + + return (rv); +} + +ATF_TC_WITHOUT_HEAD(basic); +ATF_TC_BODY(basic, tc) +{ + struct ctx c; + char buf[64]; + size_t nread; + int n; + + common_init(&c); + + sendme(&c, 0, 0, false); + nread = 0; + while (nread < FSIZE && (n = SSL_read_b(c.cln, buf, sizeof(buf))) > 0) { + ATF_REQUIRE(memcmp((char *)c.mfd + nread, buf, n) == 0); + nread += n; + } + ATF_REQUIRE(nread == FSIZE); + ATF_REQUIRE(c.sbytes == FSIZE); + + common_cleanup(&c); +} + +ATF_TC_WITHOUT_HEAD(random); +ATF_TC_BODY(random, tc) +{ + struct ctx c; +#define RSIZE (256*1024) + + common_init(&c); + + for (u_int i = 0; i < 10; i++) { + char buf[RSIZE]; + off_t offset; + size_t size, n, nread, expect; + + offset = arc4random() % FSIZE; + size = arc4random() % RSIZE; + sendme(&c, offset, size, false); + expect = offset + size < FSIZE ? size : FSIZE - offset; + nread = 0; + while (nread < expect && + (n = SSL_read_b(c.cln, buf, sizeof(buf))) > 0) { + ATF_REQUIRE(memcmp((char *)c.mfd + offset + nread, buf, + n) == 0); + nread += n; + } + ATF_REQUIRE(nread == expect); + ATF_REQUIRE(c.sbytes == (ssize_t)expect); + } + + common_cleanup(&c); +} + +/* Truncate the file while sendfile(2) is working on it. */ +ATF_TC_WITHOUT_HEAD(truncate); +ATF_TC_BODY(truncate, tc) +{ + struct ctx c; + char buf[128 * 1024]; + size_t nread; + int n; +#define TRUNC (FSIZE / 2) + + common_init(&c); + + sendme(&c, 0, 0, false); + /* Make sure sender is waiting on the socket buffer. */ + while (poll(&(struct pollfd){ .fd = c.ss, .events = POLLOUT }, 1, 1) + != 0) + ; + ATF_REQUIRE(ftruncate(c.fd, TRUNC) == 0); + nread = 0; + while (nread < TRUNC && (n = SSL_read_b(c.cln, buf, sizeof(buf))) > 0) { + ATF_REQUIRE(memcmp((char *)c.mfd + nread, buf, n) == 0); + nread += n; + } + ATF_REQUIRE(nread == TRUNC); + ATF_REQUIRE(c.sbytes == TRUNC); + + common_cleanup(&c); +} + +/* Grow the file while sendfile(2) is working on it. */ +ATF_TC_WITHOUT_HEAD(grow); +ATF_TC_BODY(grow, tc) +{ + struct ctx c; + char buf[128 * 1024]; + size_t nread; + void *map; + int n; +#define GROW (FSIZE/2) + + common_init(&c); + + sendme(&c, 0, 0, false); + /* Make sure sender is waiting on the socket buffer. */ + while (poll(&(struct pollfd){ .fd = c.ss, .events = POLLOUT }, 1, 1) + != 0) + ; + /* Grow the file and create second map. */ + ATF_REQUIRE(ftruncate(c.fd, FSIZE + GROW) == 0); + ATF_REQUIRE((map = mmap(NULL, GROW, PROT_READ | PROT_WRITE, + MAP_SHARED, c.fd, FSIZE)) != MAP_FAILED); + arc4random_buf(map, GROW); + + /* Read out original part. */ + nread = 0; + while (nread < FSIZE && (n = SSL_read_b(c.cln, buf, + FSIZE - nread > sizeof(buf) ? sizeof(buf) : FSIZE - nread)) > 0) { + ATF_REQUIRE(memcmp((char *)c.mfd + nread, buf, n) == 0); + nread += n; + } + ATF_REQUIRE(nread == FSIZE); + /* Read out grown part. */ + nread = 0; + while (nread < GROW && (n = SSL_read_b(c.cln, buf, sizeof(buf))) > 0) { + ATF_REQUIRE(memcmp((char *)map + nread, buf, n) == 0); + nread += n; + } + ATF_REQUIRE(nread == GROW); + ATF_REQUIRE(c.sbytes == FSIZE + GROW); + + common_cleanup(&c); +} + +ATF_TC_WITHOUT_HEAD(offset_beyond_eof); +ATF_TC_BODY(offset_beyond_eof, tc) +{ + struct ctx c; + + common_init(&c); + + c.sbytes = -1; + sendme(&c, FSIZE + 1, 0, false); + ATF_REQUIRE(pthread_mutex_lock(&c.mtx) == 0); + while (c.state != READY) + ATF_REQUIRE(pthread_cond_wait(&c.cv, &c.mtx) == 0); + ATF_REQUIRE(c.sbytes == 0); + ATF_REQUIRE(pthread_mutex_unlock(&c.mtx) == 0); + + common_cleanup(&c); +} + +/* + * Prove that we can differentiate a short write due to EAGAIN from one due to + * end of file. + */ +ATF_TC_WITHOUT_HEAD(eagain_vs_eof); +ATF_TC_BODY(eagain_vs_eof, tc) +{ + struct ctx c; + char buf[16 * 1024]; + ssize_t nread; + int n; + + common_init(&c); + + /* + * Exercise short write due to no buffer space on non-blocking + * socket. Internall sendfile(2) returns -1 and errno == EAGAIN. + */ + ATF_REQUIRE(pthread_mutex_lock(&c.mtx) == 0); + sendme_locked(&c, 0, FSIZE, true); + while (c.state != READY) + ATF_REQUIRE(pthread_cond_wait(&c.cv, &c.mtx) == 0); + ATF_REQUIRE(c.sbytes > 0); + ATF_REQUIRE(SSL_get_error(c.srv, c.sbytes) == 0); +#if 0 /* see https://github.com/openssl/openssl/issues/29742 */ + ATF_REQUIRE(BIO_should_retry(SSL_get_wbio(c.srv))); +#endif + + /* + * Exercise second attempt on already full buffer. + */ + sendme_locked(&c, 0, FSIZE, true); + while (c.state != READY) + ATF_REQUIRE(pthread_cond_wait(&c.cv, &c.mtx) == 0); + ATF_REQUIRE(c.sbytes == -1); + ATF_REQUIRE(SSL_get_error(c.srv, c.sbytes) == SSL_ERROR_WANT_WRITE); + ATF_REQUIRE(BIO_should_retry(SSL_get_wbio(c.srv))); + + /* Clear the buffer. */ + nread = 0; + while (nread < c.sbytes && + (n = SSL_read_b(c.cln, buf, sizeof(buf))) > 0) { + ATF_REQUIRE(memcmp((char *)c.mfd + nread, buf, n) == 0); + nread += n; + } + + /* + * Exercise zero length write: offset == file size. + * + * SSL_ERROR_SYSCALL seems a strange error code, as the syscall did not + * fail, and errno is clear, because a request to send 0 bytes is + * legitimate one. This test just documents the existing behavior + * rather than asserts that this is a correct behavior. + */ + sendme_locked(&c, FSIZE, 0, true); + while (c.state != READY) + ATF_REQUIRE(pthread_cond_wait(&c.cv, &c.mtx) == 0); + ATF_REQUIRE(c.sbytes == 0); + ATF_REQUIRE(SSL_get_error(c.srv, c.sbytes) == SSL_ERROR_SYSCALL); +#if 0 /* see https://github.com/openssl/openssl/issues/29742 */ + ATF_REQUIRE(!BIO_should_retry(SSL_get_wbio(c.srv))); +#endif + + /* + * Exercise short write due to end of file. + */ + sendme_locked(&c, FSIZE - 100, 0, true); + while (c.state != READY) + ATF_REQUIRE(pthread_cond_wait(&c.cv, &c.mtx) == 0); + ATF_REQUIRE(c.sbytes == 100); + ATF_REQUIRE(SSL_get_error(c.srv, c.sbytes) == 0); +#if 0 /* see https://github.com/openssl/openssl/issues/29742 */ + ATF_REQUIRE(!BIO_should_retry(SSL_get_wbio(c.srv))); +#endif + + ATF_REQUIRE(pthread_mutex_unlock(&c.mtx) == 0); + + common_cleanup(&c); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, basic); + ATF_TP_ADD_TC(tp, random); + ATF_TP_ADD_TC(tp, truncate); + ATF_TP_ADD_TC(tp, grow); + ATF_TP_ADD_TC(tp, offset_beyond_eof); + ATF_TP_ADD_TC(tp, eagain_vs_eof); + + return atf_no_error(); +} From nobody Fri Jan 23 20:57:42 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dyVd10whdz6PllX for ; Fri, 23 Jan 2026 20:57: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 4dyVd03mjyz3gGk for ; Fri, 23 Jan 2026 20:57:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769201876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tNt588Pq3ctuA+exaTHjihLnA1i1z8DC/7sqAVxQ2Fs=; b=AVOEHqT+gDZdtxAojJVECGNpFWlJ6xjBp5iMfF7gx1eoTS/v+sKPQkL8ts3fj8NMksZbAt B6eE6YjlKNDOJ2LuhRvkC7n5w2AIuaFAHUa6YMnqZKv4RmtvMal6RIwo4atiW50FVoEgJR cTPlLwC0qgLHhi+bNCp8/yKuu6fMyg0nKTuLRSPxosLlNR/VC6LkSLGPmUSD0tSsSYrUaR jkzCCxqjegbqFsTzQ2VR5BEsRbIFNUizdc7uuGWLTIVHKKa37qs+JAP7wLCOCYtVE3nado zvWbWLnCvMzitnHW4T7olMDG0l5vFtOqF8WUiE83UVFvw1hOnK/xkqzXY1IZRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769201876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tNt588Pq3ctuA+exaTHjihLnA1i1z8DC/7sqAVxQ2Fs=; b=mWoWUEiskNidqysLmAV+IeNYAVpo42gRei3CtjAhpwtaIFG+AX/J0cO9F8+DtJANuqGgU1 /ZDC+iSVSiJeFOqdF348uh+qFpbzhUVuqotd74IEpKJC6618VEzZUi9f6qoviYj+PHFp3Q t77GSzEcazj+7a01W9G8Nx8WxLYuWX/fscI5DEhq959oHzs6kwbqO6uTx3SHy/1qX4rGyy NMkGBQpev+/BDWoQgoXEV5vxsWhXPOoq41VXB37CFxvtxq/ap6RrG38yd5MIPQ8zpb2Ve5 aVQLxz3RCBODe28h8GDT+Oz5vbBxvnKnqTGpA7er4JVd1KDBJgzvFMLdKtIYMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769201876; a=rsa-sha256; cv=none; b=HTLzjcFC9lXDTyeUTTyBLn90EQ72sLIYli0VtgkhdQno82SOBPLWrk4sF2tiOGz+vMH6pv 6m262U+8pDCKA88+R4f1Bem3RxU2WNLzJ4P1T38EclxtLWvd3/F7AWFmHV6cQUQcv+PHky +arGgevcmILwEstrSJeE2McvN5KHzkFZ6TBjZJ/t4oZX58kyFnyr8Qb6rcak7wrg1Fn2mK 4kXtlhiTclyBYCGCZaiFPUtq4gp1rzbsw8N8PESPci8hSzH67vfgwrMXBFRA78rk/HHdq+ 76YWWrlrq9DksdnxZvG2ggxcIvL3sqW/qlFsqqrtCiD6MHK2anRUNJWTSV9S5Q== 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 4dyVcq5m6rzbZs for ; Fri, 23 Jan 2026 20:57:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24be9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 20:57:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 3aa8d5395c42 - main - mkimg(1): Sync mkimg(1) and usage() with the implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3aa8d5395c4223f1613f28d6f39904c2df4f92d4 Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 20:57:42 +0000 Message-Id: <6973e0c6.24be9.2295dea@gitrepo.freebsd.org> The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=3aa8d5395c4223f1613f28d6f39904c2df4f92d4 commit 3aa8d5395c4223f1613f28d6f39904c2df4f92d4 Author: Li-Wen Hsu AuthorDate: 2026-01-23 20:55:32 +0000 Commit: Li-Wen Hsu CommitDate: 2026-01-23 20:55:32 +0000 mkimg(1): Sync mkimg(1) and usage() with the implementation Reviewed by: imp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54419 --- usr.bin/mkimg/mkimg.1 | 54 ++++++++++++++++++++++++++++++++------------------- usr.bin/mkimg/mkimg.c | 3 +++ 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/usr.bin/mkimg/mkimg.1 b/usr.bin/mkimg/mkimg.1 index ae48904eb16c..d3e6285d110f 100644 --- a/usr.bin/mkimg/mkimg.1 +++ b/usr.bin/mkimg/mkimg.1 @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 25, 2025 +.Dd December 30, 2025 .Dt MKIMG 1 .Os .Sh NAME @@ -39,6 +39,7 @@ .Op Fl C Ar max_capacity .Op Fl -capacity Ar capacity .Op Fl f Ar format +.Op Fl h .Op Fl o Ar outfile .Op Fl a Ar active .Op Fl t Ar timestamp @@ -144,6 +145,10 @@ option causes any timestamps embedded in the output file to be set to the given time, specified in seconds since the epoch. .Pp The +.Fl h +option prints a usage message and exits. +.Pp +The .Fl v option increases the level of output that the .Nm @@ -301,34 +306,43 @@ may be used multiple times to specify a list of created partition entries. A specification that is a single dash indicates an unused partition entry. Otherwise, a partition specification has the following format: .Bd -literal -offset indent - ':' +[/