From nobody Mon Jun 2 22:50:01 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bB8Dn5dmNz5xW8d; Mon, 02 Jun 2025 22: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bB8Dn541Wz49FV; Mon, 02 Jun 2025 22: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=1748904601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aj9aH8UTQ+pEhuSp4G1G+/pxoqoSW1yXztfBuhUugXA=; b=m66Fiz+lWRQmXSjqfajOYu9XhTlR7AmDccmD1HBPLactRoLoludWx1ZZWm+2vu6OUj5iz8 cRZwZoP2OLLTVbWQf6fAanQLMNIZrmCoqTshyUTE3f4eMM5dGkFZZnj9Yd833VwYTK53iz OnoujIi75kaktL3CjBwvQU1Fyb0h3/Dx/xWFbzRIoFChuU0fWdx7e7GCBD9IE+TsG/txP0 RGp0Ssys6zraw6jsIZYVqJ6UchXEkoMmhrrgh8i5pQZwt6jiOp/+soXEQjGYM/5XrAXQs6 YPIo4fntZvHh8pl3iXaZtmZX6yi4oLzCc8SEZ6qIbMxaAw3Hc0jHmPkbrMxFQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748904601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aj9aH8UTQ+pEhuSp4G1G+/pxoqoSW1yXztfBuhUugXA=; b=fDSVXXII+FLDJWnsh59c5EJ/hWbJNsUhQKbsDWdEk6g/WxT8EYqQgm1XIXjy57jKBg6Gaf 90ZK6Oir09N12yW+5R8PkGbJPBeuqkDCgbFcUHXNOLR70U0hehqTkG2MBHQPFPqtK8pWnX L9ssInqxBrZ8GqwiUP0IcHsM4R8zi7ypZqxaKe53bvGiPsQDtCooHYR5yutdqN6gbOSmQr 1qN2oqqujkTRTmAoV2GRvTpinGskO8DH6XX6Rayn3nh0x3NFN0voLP6JVHnUdLeqeJFlSK El5MQSHUouILEloF3MqUzr+PBo8ii1D5I6Af++aHy4cFvDdTSxOqgSIp3eb4og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748904601; a=rsa-sha256; cv=none; b=cCvSQSGdzjEXoGnjXgT23/1+XBbLourTAfodNWDxSbxsISn/hrM+j/0cEEH4tS+JE67x6N sKN4CUAjqjyiLsX16Ay6yKpModW9KHTdCGOdfuuPGof5fTKqg/W/SO7V+x5OCDW9zkK1lO V98B6fP91ZMydJSAG5chlddzWvC8S5n7rK3WlE+atDtdB7XDrzAFN8UtyKgpnKxLI2rUhz rQ/9xQ+wC3ah+qpKSambm07et2fPE5fQDNju4IlkjTU4XkmhbMO7uIs2ZfObJpKIOqFd+/ TeZO1l2DfZ2FCfbgGcJWpsnWy2mQ76BKvw6ZuB/o923YhKutDlAjw2BAMSxxxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bB8Dn4H9hz1R9M; Mon, 02 Jun 2025 22:50:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 552Mo1nv071708; Mon, 2 Jun 2025 22:50:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 552Mo1sn071703; Mon, 2 Jun 2025 22:50:01 GMT (envelope-from git) Date: Mon, 2 Jun 2025 22:50:01 GMT Message-Id: <202506022250.552Mo1sn071703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: ef4014882ee1 - stable/14 - Fix incorrect version introduced in manual pages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ef4014882ee1413eba75a78f6e307e16123c63d1 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ef4014882ee1413eba75a78f6e307e16123c63d1 commit ef4014882ee1413eba75a78f6e307e16123c63d1 Author: Tom Hukins AuthorDate: 2025-05-02 11:00:20 +0000 Commit: Warner Losh CommitDate: 2025-06-02 22:49:34 +0000 Fix incorrect version introduced in manual pages Several manual pages for releng/14.3 incorrectly claim that features were first introduced in FreeBSD 15.0. I discovered these by running: git checkout origin/releng/14.3 git grep -F '.Fx 15.0' MFC After: 3 days Reviewed by: imp, ziaee Pull Request: https://github.com/freebsd/freebsd-src/pull/1685 (cherry picked from commit 5b9660caff69c70c9b6d9df5e04a3f21f8cf7996) --- lib/libc/gen/psignal.3 | 2 +- lib/libc/gen/rtld_get_var.3 | 2 +- lib/libc/sys/getsockopt.2 | 2 +- lib/libc/sys/setcred.2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/gen/psignal.3 b/lib/libc/gen/psignal.3 index b02d23dc16f1..cce2a0c1a4d2 100644 --- a/lib/libc/gen/psignal.3 +++ b/lib/libc/gen/psignal.3 @@ -122,7 +122,7 @@ function appeared in The .Fn psiginfo function appeared in -.Fx 15.0 , +.Fx 14.3 , .Nx 6.0 , and .Dx 4.1 . diff --git a/lib/libc/gen/rtld_get_var.3 b/lib/libc/gen/rtld_get_var.3 index e211d78345e3..092114e86d78 100644 --- a/lib/libc/gen/rtld_get_var.3 +++ b/lib/libc/gen/rtld_get_var.3 @@ -103,4 +103,4 @@ is unknown. The .Nm function first appeared in -.Fx 15.0 . +.Fx 14.3 . diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2 index 868f40e97773..c738a152d859 100644 --- a/lib/libc/sys/getsockopt.2 +++ b/lib/libc/sys/getsockopt.2 @@ -676,7 +676,7 @@ The option originated in .Ox 4.9 and first appeared in -.Fx 15.0 . +.Fx 14.3 . The .Fx implementation aims to be source-compatible. diff --git a/lib/libc/sys/setcred.2 b/lib/libc/sys/setcred.2 index a1b819d24c52..86f61ddfdb30 100644 --- a/lib/libc/sys/setcred.2 +++ b/lib/libc/sys/setcred.2 @@ -248,7 +248,7 @@ does not. The .Fn setcred system call appeared in -.Fx 15.0 . +.Fx 14.3 . .Pp Traditionally in UNIX, all credential changes beyond shuffles of effective, real and saved IDs have been done by setuid binaries that successively call multiple From nobody Tue Jun 3 00:36:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bBBbC5c1Tz5xdQx; Tue, 03 Jun 2025 00:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bBBbC4qDjz3x2B; Tue, 03 Jun 2025 00:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748910967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ReTUqDdytuG7aLgjSvP2n76kg4goVUrxFQ2Sg+H+3OQ=; b=VQVF2iccIdkcXuSJ1X9Yx8U8IXR8Kb/5fpd/6GOGGbuIAcDRWZEIEd474pafdIQHMN8re7 wMk3rRb6rslZJXxmjSARjRhOTAbvlxkwB/jmPzs6qMZrXc/ZlDzKM3AfMhJauS1BqbPIa1 7U9gNgzdXBMK8XZvBHNMyIx8Qgzjd7sAhTGGXa+EUj5dlKlo6fyMi0BOxqy8JoZ8zkcF7D NlXvq49ccQ2w3cXiptGuLNTGjMsgbG65PQvKP/cMr1DGHMJN2kmRGN9ik8zD/NC5zzrLvz ykK3OLmi30zklbs5Wmbro9XZWyNPwO8DLmudPP0aPjetcWqfpw4naUsaPYDSKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748910967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ReTUqDdytuG7aLgjSvP2n76kg4goVUrxFQ2Sg+H+3OQ=; b=co9yHg84AgyL8JjTzewVPyJO9kLKmna6t1qMk2kyQoQrKNn/ApKD4crmbxAFtXmM0/1oO1 EADAggy/INUubFK1bK3Iwg+WRIErocDVqphkt/XI3g2vLATf/RiUcR+xt6cObgH10PBwRD YeB8lx9g+QhT6PdCm7dvlTZjJLDcid0h/lRf99JsuFCnIm1hY7WKCeWV2lLIcQ1VI6C/Ln 4F95Nz1L6fJG26qiEgYTZ9rLfVnDe726ZNEgx/s8eBqd/EbAuEHFd9Uko+/1347+OvxgiC Z39eSwb/e6nGmtT7RfA3N/bceYBUv0r6RxqjF14RWHGnodN5wWlyl25a+mIZNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748910967; a=rsa-sha256; cv=none; b=sSLzalQTs5QZ4hvEHEZDhXOV+KP8Kb7VPTvFlf82FsEseAEnFUBDfkPNjsTi+cHixCwNT7 ouX1OeVGYsoj0PZHjkv3OE7pUAGbD1je6m2J0fn+aljnRlE+XXY9A6XLDj5aAueem8bn0h 4t+WcEDC8xI0T0oCjmzLlDHmFLgMQ51X6lGxifogO1LpsYRzH2awfv4gLXq2B7VM7bUii7 8ThZAzOtbPXyt3ezBOBomSXR0I2FfccDc3KoPZRzLkjP99TKrV41v2ViT7C/L+250zGnAx pefNyadvaAEqx34F17/fQUnUy4nFUb/XRW30/p3+CSMjCHW6edTCNyu8KxkpuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bBBbC4CmMz1T1; Tue, 03 Jun 2025 00:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5530a7RS074532; Tue, 3 Jun 2025 00:36:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5530a7E8074529; Tue, 3 Jun 2025 00:36:07 GMT (envelope-from git) Date: Tue, 3 Jun 2025 00:36:07 GMT Message-Id: <202506030036.5530a7E8074529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: beae50a72396 - stable/14 - fsck_ffs: change struct bufarea member b_index type to uint64_t List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: beae50a72396e26e0caab50ade2d6c2ec6ca38eb Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=beae50a72396e26e0caab50ade2d6c2ec6ca38eb commit beae50a72396e26e0caab50ade2d6c2ec6ca38eb Author: Konstantin Belousov AuthorDate: 2025-05-25 18:11:58 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-03 00:35:47 +0000 fsck_ffs: change struct bufarea member b_index type to uint64_t (cherry picked from commit e36f069ecb478b9775b7ad717768d011251d479e) --- sbin/fsck_ffs/fsck.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index 2e15dad00d12..b34309ddafc9 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -154,7 +154,7 @@ struct bufarea { int b_flags; /* B_ flags below */ int b_type; /* BT_ type below */ int b_refcnt; /* ref count of users */ - int b_index; /* for BT_LEVEL, ptr index */ + uint64_t b_index; /* for BT_LEVEL, ptr index */ /* for BT_INODES, first inum */ union { char *b_buf; /* buffer space */ From nobody Tue Jun 3 13:05:43 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bBWD72gtDz5xcFf; Tue, 03 Jun 2025 13:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bBWD722Ggz40Xx; Tue, 03 Jun 2025 13:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748955943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2GnsOI0ZqMIewO3ACLiYlW2qVnyhIhssgzNJI8usfnA=; b=Fws9DZtDQcNia/4BtlR3Si70Q+Idn3TikSm2eAI9qpJFUvVHXavxBhr1fDVE2xUcN63+AS J0/2e0JpscwZEniJzkd+GQlQ9zc+EtaAOaYWVfa+dkPVPU8gZYNLyHsCE0h3glpIuHNHYe 7cnegV/BDzFteMO7rDflC6DjSGN3B4pcorc0O1uwFiFgGbQM5JCaiTx7+NMq5ahjm1XEQW xDQmw/HjAJ8MYDSMbyaXMT+TW9M+2SpfvbBV3PU1bmDC6a70uoicP/VGtaKqKWKqIKqMcE zqvDgNOkx75cUyXk1eFAoCW98GKtytdQ66lj4AIXWGAN6/9Ag2AwyGQ1wXskng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748955943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2GnsOI0ZqMIewO3ACLiYlW2qVnyhIhssgzNJI8usfnA=; b=saFtM4OLWvPuxEvKf0x8YReyPT7wCnx0u1JM0BWd+ak8Br8cilrKaTtTcJDHE16BG9ZlRh i9pn2aDPF96ELNT1/ycNeVVATmeB4Fz+EscmBUtOFMjFsjsVQKSR3bakW33nqwAsxHAMsn K4XC4tJFITUrmMVMIw4VhC2oxR2MDD2SiqYHxrFt2e8xixSfP8PEge+mX0zNQs8wmJ3Pki r0MRowEq/dkRT0L1xHYSAlbwTgrI7HexvbZPPaZYZiT6OD1Ofd2MxqdvkqtvLr6bo9HqnV L6rHiB0cnj1mHyWzAdcP/UAg1GUPU1d69m63/HifRtyuibKvUNgyFSPnxTgbDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748955943; a=rsa-sha256; cv=none; b=L2uxUp/EOzVDoGrM26AMay2N3ytz0nkSgiB/7YhUZK9kIWl4l1hJy1OBRn7dFa0xOwkItA 3b8IrXn9fKh860byjM5Npzuol9elhqa4mM64EOkwyEOxQav9TfkcYJuBda1WuVWzWJ7mak px4h5TTYL5uITxWg6P5r5i2cGnzlKhpIm8GBJZuywuTvZjcYce8zJnoLZg+jgnKQP+cMyG HzDBi5geAw6wir2MSuMFOjyaPBkEb4vtWpjHQrBSeRelde2HPcd+JH5NYZYxGm9DbfVMsM fuyEqqOepfkdvIsTd+IhTtiCNDvyAvSTKmUp8VFrSMHnN3Zf2Y+7Qd++dYPejQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bBWD71V1dzgQv; Tue, 03 Jun 2025 13:05:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 553D5h7w082164; Tue, 3 Jun 2025 13:05:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 553D5hbo082161; Tue, 3 Jun 2025 13:05:43 GMT (envelope-from git) Date: Tue, 3 Jun 2025 13:05:43 GMT Message-Id: <202506031305.553D5hbo082161@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 9b09a560d8fa - stable/14 - ipsec(4): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9b09a560d8fa61df9ba42b56314e4b5ce8666332 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9b09a560d8fa61df9ba42b56314e4b5ce8666332 commit 9b09a560d8fa61df9ba42b56314e4b5ce8666332 Author: Gordon Bergling AuthorDate: 2025-05-31 08:59:09 +0000 Commit: Gordon Bergling CommitDate: 2025-06-03 13:03:07 +0000 ipsec(4): Fix a typo in a source code comment - s/limitiation/limitation/ (cherry picked from commit 56a9d245eb16e774fece0334fcf0761058d59a0c) --- sys/netipsec/ipsec.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netipsec/ipsec.h b/sys/netipsec/ipsec.h index eea0a39af5ea..8e18d6378957 100644 --- a/sys/netipsec/ipsec.h +++ b/sys/netipsec/ipsec.h @@ -93,7 +93,7 @@ struct secpolicy { uint32_t id; /* It's unique number on the system. */ /* * lifetime handler. - * the policy can be used without limitiation if both lifetime and + * the policy can be used without limitation if both lifetime and * validtime are zero. * "lifetime" is passed by sadb_lifetime.sadb_lifetime_addtime. * "validtime" is passed by sadb_lifetime.sadb_lifetime_usetime. From nobody Tue Jun 3 13:05:44 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bBWD84B8Yz5xcfp; Tue, 03 Jun 2025 13:05: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bBWD83Dm4z40pS; Tue, 03 Jun 2025 13:05:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748955944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BgQupG4v9anPGaB6A6az/SNkuAW1+UNf+CyvchDHQks=; b=eTXFvkFIOd2l5IpiOkCvCaAe18P5fSqBbDKvfQ7/DINmfBlGQFs/ULRimpbMLoTu1fMs9a CDi26VpPbdDNkJv9bamlq5myvE8WLwRpKo7n2l7Y6HZXR3lh6qdNRfL6Us2954WaZD4+04 hWkzJeGuM+7M8epud7631SdZVIY84e4MUDyRpZlxcqoU3bboKkoEaTnI6y04IHvJNxgORG 3TgJM9XdxmGKvvXVyLRnOb/WpQBnYkYOG55j0PFGC6FYxksoVybLIOgw0Zuz5DYb8I+rsm SIBcKBSMFi96BTiByBa7xw3tWsFz4eJyLJ5VEDHyOKxC3PTxTc+EEH1pqt6/Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748955944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BgQupG4v9anPGaB6A6az/SNkuAW1+UNf+CyvchDHQks=; b=Ra9knGFfUrWOVVcDEsI/XVbyMErwjnlfKg2hqvwZ32ku8kngBi2jrAl8jDNSxJ22MA9AVD 0+tFVBqL5PP2PaZBzWeQd24RsmUTQPsaT4mUjDC/Y3Crxpc0vuCG5vwGzM+8AzAm4UEZjl GI/TqCa4iBTnhg3xDE+ReNGm1529k+n5GWQgjbMGwxaPXtIzqXTgkYf8z3tTKif5JkzF/i OfUyhUO+/O4Nj/Oe319OWeq+9OCoIjrP3HVul0MlxYtw3zjnBNZLENB93L6ptpz1/WluuH GtUXl9q/kXaespku2NR3kuZpkqrGfo6cDoNAMVZTVlrBWB7F6I19T6d9lPHeYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748955944; a=rsa-sha256; cv=none; b=WRdgOoTLfBNUMfBlID1c9HA8pVED1XIkdroMdtDWgDpsDEdHl+JP89osIm/vyOiLYJAC67 t3VfygLvhHFguWeEtcHTXbTRt99uVM45RPOFyu8W43Tn/KJW9u13VY0m+y6gqgfpit/ojP zBLvzYsRAm2+rHrGVThh05zUzWq0WV4WDc/Q30bJNcB2DrRDpDd+rCahhiRTmr/7puWmVB 0u7wqXdO8BuqDI3RnkCb7hWAEPIPZR6Roul7hw0yzeuUnKmWZlb1NqQf0QXWB/zsRTpa72 w0Pt39wSEpkk6LGm+su+xn34KGNfPKHIKP7Cs9tVeGXk5whqWjoDQ8t7OA2G1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bBWD82p44zg1s; Tue, 03 Jun 2025 13:05:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 553D5igi082197; Tue, 3 Jun 2025 13:05:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 553D5ibp082194; Tue, 3 Jun 2025 13:05:44 GMT (envelope-from git) Date: Tue, 3 Jun 2025 13:05:44 GMT Message-Id: <202506031305.553D5ibp082194@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 831c4e51886e - stable/14 - syscons(4): Fix a typo in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 831c4e51886eadec6fc394f722ce781220bae529 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=831c4e51886eadec6fc394f722ce781220bae529 commit 831c4e51886eadec6fc394f722ce781220bae529 Author: Gordon Bergling AuthorDate: 2025-05-31 09:01:57 +0000 Commit: Gordon Bergling CommitDate: 2025-06-03 13:03:41 +0000 syscons(4): Fix a typo in a source code comment - s/contants/constants/ (cherry picked from commit 62b3bac1a280e765f86901926c9e8d5f5b431bff) --- sys/dev/syscons/syscons.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 0985f03e1cb7..fd204491f8fc 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -3571,7 +3571,7 @@ sc_alloc_scr_buffer(scr_stat *scp, int wait, int discard) old = scp->vtb; sc_vtb_init(&new, VTB_MEMORY, scp->xsize, scp->ysize, NULL, wait); if (!discard && (old.vtb_flags & VTB_VALID)) { - /* retain the current cursor position and buffer contants */ + /* retain the current cursor position and buffer constants */ scp->cursor_oldpos = scp->cursor_pos; /* * This works only if the old buffer has the same size as or From nobody Tue Jun 3 13:05:45 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bBWD95wGBz5xcbV; Tue, 03 Jun 2025 13:05: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bBWD93qSJz40tw; Tue, 03 Jun 2025 13:05:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748955945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AISQlQKJK76s1ZsJKL/HnMDbEQJpNklF1aUdvaQIsu8=; b=Xvw+ypQjYFQTUXpKMRIVdsJ8k1ZzsnSwi4Ok8CPQYb58f12++FSCFuIXlexpAIwkCt5cwT GuzO1d9XkWQl19FoRMq7+TTpJ/ch3KQ7H1G4K7iPwV72N/xc0TAn2aXj+XZd6U6eYttPdC qI2807oQxVI7ZQap5UmaZEMAdbpzT/3fgJgQ4jd/Gi/WKLYd0+1KLo6cuKiVIsTC7EQpA9 Mh4fcLnB5vyAS4UR7+bwuWxXMaGF+LMFXZ0najb1x0spuvlP1G66e56952TCDftp1F88g8 LuS1NXsvl1tS1yVc9m4Em7f2GEqYcA9Q7H8mSRr59l6Ms747bPI15oZXROnbeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748955945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AISQlQKJK76s1ZsJKL/HnMDbEQJpNklF1aUdvaQIsu8=; b=mteD+k5++9O0dZfKPl7GKOnA9ES/m/bSI+PgCkqsz2ujNKiuQYf9mIGnuKxe4O5GZyzBEG 5QsgOENBZuuK/GJ0BhN+jA5naVmBLQjVJ57/pmhZ9arzbN9wECCq6SyPxMNfEFW8G4oAL3 GRhKy5ARHrUbhxjvY9g8ii5Ob7Yo1KQozt7qeP9v9/ipC+RyPrh0FNKrvNCyIlf307cR8E 2nuI7gJpgXM6hLuiRgGHXBb+5EgtBUF+II9YsNFMN1EjJTF8sdXRLWSX4Ye7mAkevOnUdu IX+C+yNYzxMRcDictRfEngGijJm3c7ErjpJHiTi9INEQ4x0oc1RKLFsHk3VFlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748955945; a=rsa-sha256; cv=none; b=QOtmtmMVBtsuxSN+tcLuP6ghBpyITGPW6/rGGKdVXEy5aeqAakmtcJ5oNkNZSRHDVteHDO hQuP2gC+Go7MQmPUJiOhKdzki9RjAu2yUPoYMXcn7JRcmhQgjKwDVnXEZroWr9VwICC3R7 BEJN93DXFPMKGZb6fYdkoV5spVhVEskAXCqiqSM+mY2eUTjGpu4PgfnIrJ03Bx1nBhXV6Q A1pXDH+9Gl8yUmfifn3I71JpOKi3RMtBIj0sRHrjuKLTq+iy1knmuLgfk7hZLixoOkI3KO KUfJ8JowTKqodEHdeHz98OC5B9ruiIRhD8XeaCBTiMOOwwnEJ/uV0gZuAGgxsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bBWD93Jb1zgFR; Tue, 03 Jun 2025 13:05:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 553D5jAC082233; Tue, 3 Jun 2025 13:05:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 553D5j36082229; Tue, 3 Jun 2025 13:05:45 GMT (envelope-from git) Date: Tue, 3 Jun 2025 13:05:45 GMT Message-Id: <202506031305.553D5j36082229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 5317335a9ac0 - stable/14 - cxgb(4): Fix two typos in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5317335a9ac0fcaf7fd4eba2dc9859a2b2350b9a Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5317335a9ac0fcaf7fd4eba2dc9859a2b2350b9a commit 5317335a9ac0fcaf7fd4eba2dc9859a2b2350b9a Author: Gordon Bergling AuthorDate: 2025-05-31 09:04:41 +0000 Commit: Gordon Bergling CommitDate: 2025-06-03 13:04:14 +0000 cxgb(4): Fix two typos in a source code comment - s/cotaining/containing/ (cherry picked from commit e86d9dd6cee18b035a34d54dbab93fc1ad6b527e) --- sys/dev/cxgb/cxgb_sge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/cxgb/cxgb_sge.c b/sys/dev/cxgb/cxgb_sge.c index 8469997b00a8..acd49d132094 100644 --- a/sys/dev/cxgb/cxgb_sge.c +++ b/sys/dev/cxgb/cxgb_sge.c @@ -1927,7 +1927,7 @@ again: reclaim_completed_tx_imm(q); /** * restart_ctrlq - restart a suspended control queue - * @qs: the queue set cotaining the control queue + * @qs: the queue set containing the control queue * * Resumes transmission on a suspended Tx control queue. */ @@ -2302,7 +2302,7 @@ again: reclaim_completed_tx(qs, 16, TXQ_OFLD); /** * restart_offloadq - restart a suspended offload queue - * @qs: the queue set cotaining the offload queue + * @qs: the queue set containing the offload queue * * Resumes transmission on a suspended Tx offload queue. */ From nobody Tue Jun 3 16:41:41 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bBc1K5lyJz5xrvv; Tue, 03 Jun 2025 16:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bBc1K51Txz3dbm; Tue, 03 Jun 2025 16:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748968901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9d7K+vDIZ3krsiiiHovryCrFbhiYSv3e4dnCoVMODXQ=; b=tW7Yip/+mbnNAMmfa7okNdksF29ukd9d7tv21oKn2YhFOIRn+A6LKKFIdlS4zZ77ciojag yh5I9DN8GCAJDKK+qkYMw0hDiVbV2WI7JpkvRXKmnr1nA6TruNK6qG1vEGYf45kgH2MWk4 1sabXU6itGxkG3aa7rW+79K0g26sDVdW2PmAzIEvlnEf6zyzB7sYwTHI3rlY5Sh48ofTxP sHCK0jioH7qfBbiSfkSblhgRDWBVJPDBFc4x1QsA9+euPzCRatCRLTTvwRdy9v6UqNRbV6 sGXu7KN1IDvqqLTsgBEGp6TvhMz59CVZX+WzOzoDljF2unNm/ANjGF8B8dvVAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748968901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9d7K+vDIZ3krsiiiHovryCrFbhiYSv3e4dnCoVMODXQ=; b=CJEhRUayST2QqNSQOqzMsRUaYoz4jO0onP1KxqkaKOtrBrnub/oTVFowqnijSjYmoZoI3v pFNEzwlAsVMvHQ33ooQtXxWAUsk+FQFYjkHAM58uMcsaQyzQ6BRbvQcBe+2YaGgmeiNseL eeBm/sfjrq5YnkoZBDU1X0LrRQHcJ8W0uy1xHHxFVIZpNUOaWRSc64BkRPplv/0drPhp3g Ll8kZyoc3JV+iwUFRuPMWbg+g4P7ftb+ZH+PVideNzidmAUUbvAhD5ZzB65GXBXRrVK9Qb vAufaSuRitZ4N7jdy7rPlO23qc65zrjRfY2PNvnHzQ4NzedDotPvuSbHUW/4Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748968901; a=rsa-sha256; cv=none; b=HoA1P2c9AiWEQJsTC44P3A7s5abYHLGar8jK8TMgxxIuQa2UaoWINw/rdxKZNv/YDBd6is vZX1+RLbAXUE6o1cz7NsbxbMiG9ttbIGO5FpjxRdxJaqrDpnlm3WyQ0tb9LB+6PWrY+IyS e/UXB7RuLEtuZlB3ZS4QL84WZpBf3ibg8CsFYIqzZFh9S1TipNs1sGzXS3W3HgQrHCY0gq az/pdFEYS3hSZs3yZncGrMY1wZucT3t3s7g1cA/2tLnPxfAyuuHazdHiJnw9fkjta1VF7m EkqObc5SgTO3eaPx9joWfmul+lk9riiKJfFbXymVHcr1nP5AsoAxP+E5IzpsAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bBc1K4RRjzmSs; Tue, 03 Jun 2025 16:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 553Gffoo087988; Tue, 3 Jun 2025 16:41:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 553GffU9087985; Tue, 3 Jun 2025 16:41:41 GMT (envelope-from git) Date: Tue, 3 Jun 2025 16:41:41 GMT Message-Id: <202506031641.553GffU9087985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Krzysztof Galazka Subject: git: ae08f9366346 - stable/14 - ppt: Fix panic when configuring unavailable MSI-X vector List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kgalazka X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ae08f93663462b4b557806bda8c5446d39a0345f Auto-Submitted: auto-generated The branch stable/14 has been updated by kgalazka: URL: https://cgit.FreeBSD.org/src/commit/?id=ae08f93663462b4b557806bda8c5446d39a0345f commit ae08f93663462b4b557806bda8c5446d39a0345f Author: Krzysztof Galazka AuthorDate: 2025-05-16 11:29:08 +0000 Commit: Krzysztof Galazka CommitDate: 2025-06-03 16:41:17 +0000 ppt: Fix panic when configuring unavailable MSI-X vector In some cases VM may have different idea about number of available MSI-X vectors then PPT driver. Return an error when VM requests setup for more vectors than expected. It was observed while using SR-IOV on an Intel E810 Ethernet adapter. VF driver in a VM sees a correct number of available MSI-X vectors, which depends on num-queues assigned in iovctl.conf, while pci_msix_count in the PPT driver always returns 1. Signed-off-by: Krzysztof Galazka Reviewed By: #bhyve, jhb Approved by: erj (mentor), kbowling (mentor) Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D48812 (cherry picked from commit 413197cef9ccbf22831eb914c2ef469880468d97) --- sys/amd64/vmm/io/ppt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/amd64/vmm/io/ppt.c b/sys/amd64/vmm/io/ppt.c index 7643ba0c2973..2db400cf0492 100644 --- a/sys/amd64/vmm/io/ppt.c +++ b/sys/amd64/vmm/io/ppt.c @@ -736,6 +736,9 @@ ppt_setup_msix(struct vm *vm, int bus, int slot, int func, } } + if (idx >= ppt->msix.num_msgs) + return (EINVAL); + if ((vector_control & PCIM_MSIX_VCTRL_MASK) == 0) { /* Tear down the IRQ if it's already set up */ ppt_teardown_msix_intr(ppt, idx); From nobody Tue Jun 3 18:32:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bBfSy0ZXWz5y0gp; Tue, 03 Jun 2025 18:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bBfSx6ypSz3TGp; Tue, 03 Jun 2025 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=1748975538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D2436OLDmkhWA1Hep0IUplnG2bxhwysnHKUNay9E+L0=; b=X6k/MgyrcbP1uK0buOfN2C4W1J9OgFkYK/7YLu1syBdhUdrXK9+L+2hrxVnIc5AzCClPfF r9s8Z2YxqmfEztm3Hdrqbe/nuMbE2KWUra75WkqLBxkFdKsK9oPf9eIgHO0VuaL3R/DNy+ uwhoxvC+HFGPwQxCSCVlYAIpL6j+fsHabtdqgMijlD48AMcf2WmbXJ6/Vc5ZUB8LVVPTB/ W/ytkBan76kcI4NKEO32EZT8dy51UUwlvBSQDDk3YlOvaZoofqsIPW9F5u0gf/45yvu3Z1 BVbKyC/LIrxWC2Sq6ERAKcnFjin8blICNyfP93Fstu5vAO2paIesojwGVd8TyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748975538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D2436OLDmkhWA1Hep0IUplnG2bxhwysnHKUNay9E+L0=; b=KYsTCV/trvjUzP2z2A4Gw5/m59fcMWZbGq7bPWS/W+oMxbTI3MmwCljAAUCvbqP+46x4Ej H6f7kh/DnERgN5Z6XYddPfeWnWRjn85Q2o2yA08EgJJ+GlCGU5QA+JDF89stvr4ysFSrDB Mi9I2U6UNOKdri1zAU5LrpysAJhAUeZVKjUeqF+RD4oGCOSOK0j+3PML+1+YVMuYAPnNKg 3Jl2JdjtbV7A7aYecYHlJv8qhVgyk/S8BUc50Jv3Gpx7aZTFMZZJs4H1jHEebqAIR40CUj HojKSHQCio1Q9wW3J9RoVmafGjAz9O7T5f4+iOUGufIX1e/nZSxg9VcuJNxsgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748975538; a=rsa-sha256; cv=none; b=X/zGkWXsrpBmLUS4oLtCw/Q96Re26rIglaa4b71RSAUAj3xIa3sMvO4bdr5QhHyP9GNRfW ST475NnJ2J5bxGLz1Rifccq2FpUaMsiFNdtJZ/fjbVts/sccgCP1lQZszoQfsCgU1sxBfd 5rmoWozdPxcmXGksO0TIfJfavVZT6YiDDSpwMJ1ITCJByn+s8rzmqph5PzrNUgmFPT2xVY dBbV4HjzsNHCbi6+BN/4NOtHOFoGndepPU13cvdk9y6/W3V7TaUhFinUyM7qMElkqRrVbP eT0sBIX0656spWIqgIHbuSAqbgJIABexDBJxDdIQ0GLu/CpPAtJvZsEAXbCpsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bBfSx6RjKzqZ5; Tue, 03 Jun 2025 18:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 553IWHJk098276; Tue, 3 Jun 2025 18:32:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 553IWHuH098273; Tue, 3 Jun 2025 18:32:17 GMT (envelope-from git) Date: Tue, 3 Jun 2025 18:32:17 GMT Message-Id: <202506031832.553IWHuH098273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 827153d21219 - stable/14 - puc.4: Add a HARDWARE section based off device data from pucdata.c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 827153d21219f76cf006d50af4cdf85f22b75de0 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=827153d21219f76cf006d50af4cdf85f22b75de0 commit 827153d21219f76cf006d50af4cdf85f22b75de0 Author: Kenneth Raplee AuthorDate: 2025-04-14 05:14:48 +0000 Commit: Colin Percival CommitDate: 2025-06-03 18:29:58 +0000 puc.4: Add a HARDWARE section based off device data from pucdata.c While here, change applicable uses of "ports" to "adapters" to be more precise and improve searchability. This is a 14.3 candate since it affects (positively) the release notes generated from the hardware secionts. MFC After: 3 days Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1663 (cherry picked from commit 794ee43e75066bfcbc00545b5bf600b9cda2d5f1) --- share/man/man4/puc.4 | 551 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 549 insertions(+), 2 deletions(-) diff --git a/share/man/man4/puc.4 b/share/man/man4/puc.4 index 076fd2ad2d0e..00517c13751d 100644 --- a/share/man/man4/puc.4 +++ b/share/man/man4/puc.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 24, 2008 +.Dd May 4, 2025 .Dt PUC 4 .Os .Sh NAME @@ -36,7 +36,10 @@ Communications driver .Cd "device uart" .Cd "device ppc" .Sh DESCRIPTION -This driver acts as a shim to connect PCI serial and parallel ports to the +The +.Nm +driver acts as a shim to connect +PCI multi-port serial and parallel adapters to the .Xr uart 4 and .Xr ppc 4 @@ -45,6 +48,550 @@ driver. The list of supported devices is in .Pa sys/dev/puc/pucdata.c . Support for new cards should be added there. +.Sh HARDWARE +The +.Nm +driver supports the following +PCI multi-port serial and parallel adapters: +.Pp +.Bl -bullet -compact +.It +Sunix SUN1889 +.It +HP Diva Serial [GSP] Multiport UART: +.Bl -dash -compact +.It +Tosca Console +.It +Tosca Secondary +.It +Maestro SP2 +.It +Superdome Console +.It +Keystone SP2 +.It +Everest SP2 +.El +.It +VScom: +.Bl -dash -compact +.It +PCI-800 +.It +PCI-400 +.It +PCI-200 +.El +.It +Boca Research Turbo Serial: +.Bl -dash -compact +.It +658 +.It +654 +.El +.It +Dolphin Peripherals: +.Bl -dash -compact +.It +4035 +.It +4014 +.El +.It +Applied Micro Circuits 8 Port UART +.It +Digi Neo: +.Bl -dash -compact +.It +PCI 4 Port +.It +PCI 8 Port +.It +PCIe 8 Port +.It +PCIe 4 Port +.It +PCIe 4 Port RJ45 +.It +PCIe 8 Port RJ45 +.El +.It +Comtrol RocketPort: +.Bl -dash -compact +.It +550/8 RJ11 part A +.It +550/8 RJ11 part B +.It +550/8 Octa part A +.It +550/8 Octa part B +.It +550/4 RJ45 +.It +550/Quad +.It +550/16 part A +.It +550/16 part B +.It +550/8 part A +.It +550/8 part B +.El +.It +IBM SurePOS 300 Series (481033H) serial ports +.It +SIIG Cyber I/O PCI (10x family and 20x family): +.Bl -dash -compact +.It +16C550 +.It +16C650 +.It +16C850 +.El +.It +SIIG Cyber Parallel Dual PCI (10x family and 20x family): +.It +SIIG Cyber Serial Dual PCI (10x family and 20x family): +.Bl -dash -compact +.It +16C550 +.It +16C650 +.It +16C850 +.El +.It +SIIG Cyber 2S1P PCI (10x family and 20x family): +.Bl -dash -compact +.It +16C550 +.It +16C650 +.It +16C850 +.El +.It +SIIG Cyber 4S PCI (10x family and 20x family): +.Bl -dash -compact +.It +16C550 +.It +16C650 +.It +16C850 +.El +.It +SIIG PS8000 8S PCI 16C650 (20x family) +.It +Brainboxes: +.Bl -dash -compact +.It +PX-101 +.It +PX-246 +.It +PX-257 +.It +PX-260 +.It +PX-279 +.It +PX-310 +.It +PX-313 +.It +PX-320 +.It +PX-346 +.It +PX-368 +.It +PX-420 +.It +PX-431 +.It +PX-475 +.It +PX-803 +.It +PX-820 +.It +PX-831 +.It +PX-846 +.It +PX-857 +.It +UC-101 +.It +UC-203 +.It +UC-253 +.It +UC-257 +.It +UC-260 +.It +UC-268 +.It +UC-279 +.It +UC-302 +.It +UC-310 +.It +UC-313 +.It +UC-346 +.It +UC-357 +.It +UC-368 +.It +UC-414 +.It +UC-420 +.It +UC-431 +.It +UC-475 +.It +UC-607 +.It +UC-836 +.It +UP-189 +.It +UP-200 +.It +UP-869 +.It +UP-880 +.El +.It +Intashield: +.Bl -dash -compact +.It +IS-200 +.It +IS-400 +.It +IX-100 +.It +IX-200 +.It +IX-400 +.El +.It +Quatech: +.Bl -dash -compact +.It +QSC-100 +.It +DSC-100 +.It +DSC-200/300 +.It +QSC-200/300 +.It +ESC-100D +.It +ESC-100M +.It +QSCLP-100 +.It +DSCLP-100 +.It +DSCLP-200/300 +.It +ESCLP-100 +.El +.It +Moxa Technologies: +.Bl -dash -compact +.It +Smartio CP-102E/PCIe +.It +Smartio CP-102EL/PCIe +.It +Smartio C104H/PCI +.It +Smartio CP-104UL/PCI +.It +Smartio CP-104JU/PCI +.It +Smartio CP-104EL/PCIe +.It +Smartio CP-104EL-A/PCIe +.It +CP-112UL +.It +Industio CP-114 +.It +Smartio CP-114EL/PCIe +.It +Smartio CP-118EL-A/PCIe +.It +C168H/PCI +.It +C168U/PCI +.It +CP-168EL/PCIe +.It +Smartio CP-168EL-A/PCIe +.El +.It +Exar: +.Bl -dash -compact +.It +XR17C/D152 +.It +XR17C154 +.It +XR17C158 +.It +XR17V258IV +.It +XR17V352 +.It +XR17V354 +.It +XR17V358 +.El +.It +Advantech +.Bl -dash -compact +.It +PCI-1602 Rev A +.It +2-port PCI (PCI-1602 Rev B1/PCI-1603) +.El +.It +Lava Computers: +.Bl -dash -compact +.It +Dual Serial +.It +Quatro A +.It +Quatro B +.It +Quattro-PCI A +.It +Quattro-PCI B +.It +Octo A +.It +Octo B +.El +.It +Sunix SUN1888 +.It +I-O DATA RSA-PCI2/R +.It +SIIG Cyber 4 PCI 16550 +.It +SIIG Cyber 4S PCI 16C650 (20x family) +.It +SIIG Quartet Serial 850 +.It +Kuroutoshikou SERIAL4P-LPPCI2 +.It +Oxford Semiconductor OX16PCI954 UARTs +.It +SIIG Cyber: +.Bl -dash -compact +.It +2S PCIe +.It +Serial Dual PCI 16C850 +.It +2SP1 PCIe +.El +.It +Oxford Semiconductor: +.Bl -dash -compact +.It +OX16PCI954 UARTs +.It +OX9160/OX16PCI954 UARTs (function 1) +.It +OX16PCI952 UARTs +.It +OX16PCI958 UARTs +.El +.It +Perle: +.Bl -dash -compact +.It +Ultraport4 Express +.It +Speed2 LE +.It +Speed4 LE +.It +Speed8 LE +.El +.It +Oxford Semiconductor OXPCIe952: +.Bl -dash -compact +.It +1S1P +.It +UARTs +.It +UARTs (function 1) +.El +.It +Oxford Semiconductor OXPCIe954: +.Bl -dash -compact +.It +UARTs +.It +UARTs (function 1) +.El +.It +Oxford Semiconductor OXPCIe958: +.Bl -dash -compact +.It +UARTs +.It +UARTs (function 1) +.El +.It +VScom: +.Bl -dash -compact +.It +PCI-100L +.It +PCI-200L +.It +200Li +.El +.It +Titan: +.Bl -dash -compact +.It +PCI-800H +.It +PCI-800H +.It +PCI-200H +.El +.It +Titan VScom: +.Bl -dash -compact +.It +PCI-800L +.It +PCI-200HV2 +.It +PCIex-800H +.It +PCIex-800H +.El +.It +Avlab Technology PCI IO 2S +.It +Avlab Low Profile PCI 4 Serial +.It +Syba Tech Ltd PCI-4S2P-550-ECP +.It +Sunix SER5xxxx +.Bl -dash -compact +.It +2-port serial +.It +4-port serial +.It +8-port serial +.El +.It +Sunix MIO5xxxx (1284 Printer port): +.Bl -dash -compact +.It +1-port serial +.It +2-port serial +.It +4-port serial +.El +.It +Feasso PCI FPP-02 2S1P +.It +Sun 1040 PCI Quad Serial +.It +Decision Computer Inc PCCOM: +.Bl -dash -compact +.It +4-port serial +.It +8-port serial +.El +.It +PCCOM dual port RS232/422/485 +.It +NetMos NM9815 Dual 1284 Printer port +.It +NetMos NM9835: +.Bl -dash -compact +.It +based 1-port serial +.It +based 2-port serial +.It +Dual UART and 1284 Printer port +.El +.It +NetMos NM9845: +.Bl -dash -compact +.It +6 Port UART +.It +Quad UART and 1284 Printer port +.El +.It +NetMos NM9865: +.Bl -dash -compact +.It +Dual UART +.It +Triple UART +.It +Quad UART +.It +Single UART and 1284 Printer port +.It +Dual UART and 1284 Printer port +.It +Dual 1284 Printer port +.El +.It +IC Book Labs: +.Bl -dash -compact +.It +Gunboat x4 Lite +.It +Gunboat x4 Pro +.It +Ironclad x8 Lite +.It +Ironclad x8 Pro +.It +Dreadnought x16 Pro +.It +Dreadnought x16 Lite +.It +Gunboat x2 Low Profile +.It +Gunboat x4 Low Profile +.El +.El .Sh SEE ALSO .Xr ppc 4 , .Xr uart 4 From nobody Tue Jun 3 18:32:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bBfSz5tjbz5y0gq; Tue, 03 Jun 2025 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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bBfSz15y3z3TPh; Tue, 03 Jun 2025 18:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748975539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uBl2I8/ibbGhr1wOzfaCN+2sJsFrIkO+L5c17F3imic=; b=OIz+UdM523rjuGKNeMw4GrATMoo2FMor2VXKpqdzqauxO0BXnL/8XAkEqeoQ831fG6KV1R PmfNtM9IBeRjSczYwc7h1WfBKiVcwgwXEs6Cv/kZEU+V6JzS0EqL/1S9WP+SSohwaoZlTu wKbbjtgq0r1iaTqoDBUQX0ZJFBFd7e0qvIjW9+yhx1lvxdxmdwchHO/4G3TpAslAd9Ebqu wHNgPnCE9O6ejc7egk3cawxfgVo+iVjz64Qiw8eFjd+lxlWK8NrQagkekHy+evM5ZFfG7o +FLN7VucASClpY2Lc0NsoP8bwlENIYBe78AMAFF+c8yR9fQK2cqmRrjmjSV5og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748975539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uBl2I8/ibbGhr1wOzfaCN+2sJsFrIkO+L5c17F3imic=; b=Vr78gCvg+EmXNQTgVby911HU5lL5739OQFHeLE1Hdj7CNcGBkR2B+NN3lsh8aPMEnHMfYG J5n1R9+tHZroHOLCo18fPd0kzXh2SuHK9n0JN0/mNc9H2kAfELqR/4krNUXLCn1q+hOZn/ jgv4xrWzX0GtnKwA1AFotqG/tC4ayP4JJ1P1JKJGIJjQyQRewmKmptHKC68hzXbuRoJash xtBy0QXwr1ml5wIHqPuMhS6ywccFpwWCiXq7x2ACltHfyE36OeNO5gi7liCylwZE+3zoCR BwSmwuG7mpKetThkfGVLVQ1GGIVxusgdfVLNpL2AKde+IxkmgwIzitgZKrVw6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748975539; a=rsa-sha256; cv=none; b=VbBrkEjqORDvxJ0+Hdx8QgM0k4tGWaFlX1OlEWzWaiBkMslOJBjBv5DzT1KbbqL4mKS+bz OsVPfFcxktdk5r8y0p8BTLbo3d+NHTuSuqclNk0At59MoK4cNCrZ4x1vtKJEw4Cf4gbJtu vWDRdmeisIzDWQL6bQquTVgF4SNXEhxhEkI/8lCyZxZ27MFPwuf72hlouZXhu/ur23P/T0 tCca5p3IhDKN6Fz+ApOntu/ULva55QLwHHtpi2pBLVQKIGjR2+kNX6pY88gDSmXn0valmP nqchbHvrm1JVDteLRDE060s+vHokertjlM4ABpr0qjPsxfJJ/RIs3liAdnt9vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bBfSz0ZkDzqT5; Tue, 03 Jun 2025 18:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 553IWIpC098308; Tue, 3 Jun 2025 18:32:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 553IWI4M098305; Tue, 3 Jun 2025 18:32:18 GMT (envelope-from git) Date: Tue, 3 Jun 2025 18:32:18 GMT Message-Id: <202506031832.553IWI4M098305@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: b529a06d1db4 - stable/14 - ure.4: description consistencies + tag spdx List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b529a06d1db4bb27895465ba8692d6c4427e32d8 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b529a06d1db4bb27895465ba8692d6c4427e32d8 commit b529a06d1db4bb27895465ba8692d6c4427e32d8 Author: Alexander Ziaee AuthorDate: 2024-08-14 06:50:18 +0000 Commit: Colin Percival CommitDate: 2025-06-03 18:31:26 +0000 ure.4: description consistencies + tag spdx + consistent document description languague with other USB-BaseT drivers + mention newly added adapters from 6ea4d9 + attempt to mention rgephy(4) phys feed into ure interfaces Fixes: 6ea4d9 (Move RTL8156 from cdce(4) to ure(4)) MFC after: 3 days Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1384 (cherry picked from commit 4c72525953fdf618a3fc0a45f3ef3f071dcc0c52) --- share/man/man4/ure.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/ure.4 b/share/man/man4/ure.4 index 8cc798ab4393..f5452fa8463b 100644 --- a/share/man/man4/ure.4 +++ b/share/man/man4/ure.4 @@ -30,7 +30,7 @@ .Os .Sh NAME .Nm ure -.Nd "RealTek RTL8152/RTL8153/RTL8153B/RTL8156/RTL8156B USB to Ethernet controller driver" +.Nd RealTek RTL8152/RTL8153/RTL8156 USB Ethernet driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your From nobody Tue Jun 3 18:32:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bBfT12vDVz5y11N; Tue, 03 Jun 2025 18:32:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bBfT02x8Zz3TRv; Tue, 03 Jun 2025 18:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748975540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=isuUyoxjByAAnQNbW0JBk4pufhn6bUVyUeXydTgLDRQ=; b=E/cU7D8knToLMlaGZo84wtjVcr2e2ToN9+hjzuAA9Mb0lv76FoLfdeoUCUrzCWVC1ALsdP MhsEq8X9niRb7n0b0Se9q7FX+/aRaXlodUI1cGEkJCUm0zG+Ao5FbVFByxhU7W30iwJleW 0PxbQatbISV9rDE78wmovocCkhr3heNFvYDkM2RdSQABAqZWY0wr8bDFxTKT6rzavfLf/G MvZQPA38j3spznUUEp36FxiFQMOcqJMIABR4ka2mbUDc9jZ4A2Od6bFu0EbK91r7FG064E qKlgWcK4sn7TYTtGRLwYmG0T6AD5EdKp0NvZ2+0J9g/a18zvqoEDBGwVxcivTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748975540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=isuUyoxjByAAnQNbW0JBk4pufhn6bUVyUeXydTgLDRQ=; b=FOcOv19oSozDbfnC5NZGA0e5QmW/iHQtgAH+eQPpijvhJXpu43UHQ/RDEyTUMIRyukz+32 n/Jzd+tEeDHIu7R4aFOIQEnhAxUgUspzLZTe20aeo/TcXL4NJmdwZUzaHrWL5hobcnn6UI 4Y6OhTqGTCL0W7P69ckMWpou0Mj1OBPS2Ay28McBmoVFCROS4QLImy/dFuHdCG5rm3DXxK r6NvRvL/w6dSIT3hiFU/zNEr5EtGgwn9arh3nwLU5Pw4KuGw1UUP7OVXQrqHUy+ujoAL3V /FY5CB4SJm2tqQKTPHgiRnRAU+kHIwq0qIP/sivmv/YP8rDrYplqpY72mixzog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748975540; a=rsa-sha256; cv=none; b=XRkcsWE1RnWNPFHH+29AcFSTvopBDJ4+iE6nX4t5pF13DZ26df7xckWXnX4qCvppb1uMM8 2BDxvraZ7yL48CLQDNuH3AMp0xlsqQLRhsFSh0tNNzCwETmM2WiYZ2bgwcCl7GV9dt0VJb 9sjFYJK6D02auhoo2fG0lCpAxCPAJmfHAsseR8RAVi7Pd5l6dz6MtKbKYzG9y6U8kkPI5j 3GxRSj+HzWsbSYIMSeJ4Cg+Q3eA2j96+VR9Xt3SC5IvgzN9VIL6SqmnefRuePPfll1W8lH u4W5GtVb3YKvJfaX/mZ/QsP9XhLFkK16X47VuyricK3R3a5PFPDOC6OswgXOTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bBfT017k4zqWP; Tue, 03 Jun 2025 18:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 553IWKWE098352; Tue, 3 Jun 2025 18:32:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 553IWKU5098347; Tue, 3 Jun 2025 18:32:20 GMT (envelope-from git) Date: Tue, 3 Jun 2025 18:32:20 GMT Message-Id: <202506031832.553IWKU5098347@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: f336a04960b6 - stable/14 - ure.4: add a HARDWARE section + add RTL8156BG as a compatible controller List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f336a04960b608d2caeaf964663c3a8425f31d71 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f336a04960b608d2caeaf964663c3a8425f31d71 commit f336a04960b608d2caeaf964663c3a8425f31d71 Author: Kenneth Raplee AuthorDate: 2025-04-08 18:30:46 +0000 Commit: Colin Percival CommitDate: 2025-06-03 18:31:30 +0000 ure.4: add a HARDWARE section + add RTL8156BG as a compatible controller While here, rename all instances of "RealTek" to "Realtek" for authenticity. Reviewed by: imp, lwshu, zaiee Pull Request: https://github.com/freebsd/freebsd-src/pull/1649 (cherry picked from commit 76ed6f2db316bf2240d36d3c92316da4d1e5b174) --- share/man/man4/ure.4 | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/share/man/man4/ure.4 b/share/man/man4/ure.4 index f5452fa8463b..0d14a20f5f44 100644 --- a/share/man/man4/ure.4 +++ b/share/man/man4/ure.4 @@ -25,12 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 3, 2024 +.Dd April 8, 2025 .Dt URE 4 .Os .Sh NAME .Nm ure -.Nd RealTek RTL8152/RTL8153/RTL8156 USB Ethernet driver +.Nd Realtek RTL8152/RTL8153/RTL8156 USB Ethernet driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -53,16 +53,7 @@ if_ure_load="YES" .Sh DESCRIPTION The .Nm -driver provides support for USB Ethernet adapters based on the RealTek -RTL8152, RTL8153/RTL8153B, and RTL8156/RTL8156B USB Ethernet controllers, -as well as USB Ethernet PHYs provided by -.Xr rgephy 4 . -.Pp -NICs based on the RTL8152 are capable of 10 and 100Mbps. -NICs based on the RTL8153 or provided by -.Xr rgephy 4 -are capable of 10, 100, and 1000Mbps. -NICs based on the RTL8156 are capable of 10, 100, 1000, and 2500Mbps operation. +driver supports the Realtek USB Ethernet Controller family. .Pp The .Nm @@ -94,12 +85,12 @@ or modes. .It Cm 1000baseTX Set 1000baseTX (Gigabit Ethernet) operation over twisted pair. -The RealTek gigE chips support 1000Mbps in +The Realtek gigE chips support 1000Mbps in .Cm full-duplex mode only. .It Cm 2500base-T Set 2500Base-T operation over twisted pair. -The RealTek 8156/8156B chips support 2500Mbps in +The Realtek 8156/8156B chips support 2500Mbps in .Cm full-duplex mode only. .El @@ -116,6 +107,17 @@ Force half-duplex operation. .Pp For more information on configuring this device, see .Xr ifconfig 8 . +.Sh HARDWARE +The +.Nm +driver supports the following USB Ethernet controllers: +.Bl -column "Realtek RTL8168/8169/8110/8211 via rgephy(4)" "10, 100, 1000, and 2500" +.It Model: Ta Speed (Mbps): +.It Realtek RTL8156/RTL8156B/RTL8156BG Ta 10, 100, 1000, and 2500 +.It Realtek RTL8153/RTL8153B Ta 10, 100, and 1000 +.It Realtek RTL8152 Ta 10 and 100 +.It Realtek RTL8168/8169/8110/8211 via rgephy(4) Ta 10, 100, and 1000 +.El .Sh DIAGNOSTICS .Bl -diag .It "ure%d: watchdog timeout" From nobody Tue Jun 3 18:36:37 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bBfYx4PZsz5y0sh; Tue, 03 Jun 2025 18:36: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bBfYx3s2zz3YvL; Tue, 03 Jun 2025 18:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748975797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0F40HNXEWG/s+d0hZzYoJRs6P24iyJu3DxAzjc1KFJM=; b=bxn6mSA/93rgoubn5jfoK9Yub8yFs4uEBEp+NXAIAkydCmUoemy4Egiw0UXeyCfmulNzVa rTu7QTsG47Wco7RtT5zBbr3R3XDQuoZtAqKemQBrxxOQpOpOnNPas9RhArtARDPLV5jqJS gtHOW6/R87LiApU3UM6iT6QnkvX6nwwQ5dzQ/Bar1kCa9NyjrI/1kj1QM4sn02N1N0AF3q PwccKtgbA9L0sY4CbKmegV/xu6eXTLsa5k/y2xmcmOJBlf9rZyFIac+mcT2wX4vEgHSG+V 5LTZlulPfJD5yD0yXzo0D9+ls0OYoAcDTKDymAqmJDn+u/FzF0U+6hruAwsa0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748975797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0F40HNXEWG/s+d0hZzYoJRs6P24iyJu3DxAzjc1KFJM=; b=V3Y1TxKZ2IrTmGRyRVqQ7B9Q060V7j6liHH9d84F+slCiZcFUzyiL5ERva66vniaGIMWpI lxqfy2ga9VJbiHhm3nnBoRfDO5qlvNRVC/HOSW9CJeMVwP1/F49XCZ5YLvFK7vtubH0nTI zAkBNgXkL/j6VbL0hqruLemtykGe6MIj9QrCziAc054yIqIeHbeC7pPKAKxDav55BWWtz1 rkvu2QYfz4QJJCoDSRARLbaYC5gqozhhxrhj3iyqBRt6tIepLqZz5Xt2eHPshYGxcgTa3R HmSu/3O1rodzze7uQ9XJA/pNBUaQqk+7oRxXu/icDBhWjwcKN4mHQvIxXjL+yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748975797; a=rsa-sha256; cv=none; b=mbU9fhi2iSNVjRjTZlLW6G/yt9rXS4/9SLDbJ1nkrrHEw2Cf+oaoXJEaSqRu+Dwk1VgaqF ulYk35o+oXprMKGi23KPAXwpv3i9HhYQT09gERfUOYiNWuKmVB3SSnIp/FheQjpCR/cGhZ rzF4sC3KkHFrVfFTyUyxs/0gmr/i4XOXdE1+o1+H/G5bpnpPJLKjElFocZuwY/umCCSQqO 0AZYR3rpyT1MNra19Ipk4N5AUzEGTxexA3VyMWbzr/SdP0sDE6p/tO9/noK79LF1JS0p8z wEeJebWOzASCBkURd4llmPaILouNys+aKw2g1MsYJSP92v3Gpy94b/NKeBzwzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bBfYx3RsdzqZ9; Tue, 03 Jun 2025 18:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 553Iabob099805; Tue, 3 Jun 2025 18:36:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 553IabCQ099802; Tue, 3 Jun 2025 18:36:37 GMT (envelope-from git) Date: Tue, 3 Jun 2025 18:36:37 GMT Message-Id: <202506031836.553IabCQ099802@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 9efdb081e824 - releng/14.3 - puc.4: Add a HARDWARE section based off device data from pucdata.c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 9efdb081e824e288679586d3d891e558b5638b1f Auto-Submitted: auto-generated The branch releng/14.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9efdb081e824e288679586d3d891e558b5638b1f commit 9efdb081e824e288679586d3d891e558b5638b1f Author: Kenneth Raplee AuthorDate: 2025-04-14 05:14:48 +0000 Commit: Colin Percival CommitDate: 2025-06-03 18:35:01 +0000 puc.4: Add a HARDWARE section based off device data from pucdata.c While here, change applicable uses of "ports" to "adapters" to be more precise and improve searchability. This is a 14.3 candate since it affects (positively) the release notes generated from the hardware secionts. Approved by: re (cperciva) MFC After: 3 days Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1663 (cherry picked from commit 794ee43e75066bfcbc00545b5bf600b9cda2d5f1) (cherry picked from commit 827153d21219f76cf006d50af4cdf85f22b75de0) --- share/man/man4/puc.4 | 551 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 549 insertions(+), 2 deletions(-) diff --git a/share/man/man4/puc.4 b/share/man/man4/puc.4 index 076fd2ad2d0e..00517c13751d 100644 --- a/share/man/man4/puc.4 +++ b/share/man/man4/puc.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 24, 2008 +.Dd May 4, 2025 .Dt PUC 4 .Os .Sh NAME @@ -36,7 +36,10 @@ Communications driver .Cd "device uart" .Cd "device ppc" .Sh DESCRIPTION -This driver acts as a shim to connect PCI serial and parallel ports to the +The +.Nm +driver acts as a shim to connect +PCI multi-port serial and parallel adapters to the .Xr uart 4 and .Xr ppc 4 @@ -45,6 +48,550 @@ driver. The list of supported devices is in .Pa sys/dev/puc/pucdata.c . Support for new cards should be added there. +.Sh HARDWARE +The +.Nm +driver supports the following +PCI multi-port serial and parallel adapters: +.Pp +.Bl -bullet -compact +.It +Sunix SUN1889 +.It +HP Diva Serial [GSP] Multiport UART: +.Bl -dash -compact +.It +Tosca Console +.It +Tosca Secondary +.It +Maestro SP2 +.It +Superdome Console +.It +Keystone SP2 +.It +Everest SP2 +.El +.It +VScom: +.Bl -dash -compact +.It +PCI-800 +.It +PCI-400 +.It +PCI-200 +.El +.It +Boca Research Turbo Serial: +.Bl -dash -compact +.It +658 +.It +654 +.El +.It +Dolphin Peripherals: +.Bl -dash -compact +.It +4035 +.It +4014 +.El +.It +Applied Micro Circuits 8 Port UART +.It +Digi Neo: +.Bl -dash -compact +.It +PCI 4 Port +.It +PCI 8 Port +.It +PCIe 8 Port +.It +PCIe 4 Port +.It +PCIe 4 Port RJ45 +.It +PCIe 8 Port RJ45 +.El +.It +Comtrol RocketPort: +.Bl -dash -compact +.It +550/8 RJ11 part A +.It +550/8 RJ11 part B +.It +550/8 Octa part A +.It +550/8 Octa part B +.It +550/4 RJ45 +.It +550/Quad +.It +550/16 part A +.It +550/16 part B +.It +550/8 part A +.It +550/8 part B +.El +.It +IBM SurePOS 300 Series (481033H) serial ports +.It +SIIG Cyber I/O PCI (10x family and 20x family): +.Bl -dash -compact +.It +16C550 +.It +16C650 +.It +16C850 +.El +.It +SIIG Cyber Parallel Dual PCI (10x family and 20x family): +.It +SIIG Cyber Serial Dual PCI (10x family and 20x family): +.Bl -dash -compact +.It +16C550 +.It +16C650 +.It +16C850 +.El +.It +SIIG Cyber 2S1P PCI (10x family and 20x family): +.Bl -dash -compact +.It +16C550 +.It +16C650 +.It +16C850 +.El +.It +SIIG Cyber 4S PCI (10x family and 20x family): +.Bl -dash -compact +.It +16C550 +.It +16C650 +.It +16C850 +.El +.It +SIIG PS8000 8S PCI 16C650 (20x family) +.It +Brainboxes: +.Bl -dash -compact +.It +PX-101 +.It +PX-246 +.It +PX-257 +.It +PX-260 +.It +PX-279 +.It +PX-310 +.It +PX-313 +.It +PX-320 +.It +PX-346 +.It +PX-368 +.It +PX-420 +.It +PX-431 +.It +PX-475 +.It +PX-803 +.It +PX-820 +.It +PX-831 +.It +PX-846 +.It +PX-857 +.It +UC-101 +.It +UC-203 +.It +UC-253 +.It +UC-257 +.It +UC-260 +.It +UC-268 +.It +UC-279 +.It +UC-302 +.It +UC-310 +.It +UC-313 +.It +UC-346 +.It +UC-357 +.It +UC-368 +.It +UC-414 +.It +UC-420 +.It +UC-431 +.It +UC-475 +.It +UC-607 +.It +UC-836 +.It +UP-189 +.It +UP-200 +.It +UP-869 +.It +UP-880 +.El +.It +Intashield: +.Bl -dash -compact +.It +IS-200 +.It +IS-400 +.It +IX-100 +.It +IX-200 +.It +IX-400 +.El +.It +Quatech: +.Bl -dash -compact +.It +QSC-100 +.It +DSC-100 +.It +DSC-200/300 +.It +QSC-200/300 +.It +ESC-100D +.It +ESC-100M +.It +QSCLP-100 +.It +DSCLP-100 +.It +DSCLP-200/300 +.It +ESCLP-100 +.El +.It +Moxa Technologies: +.Bl -dash -compact +.It +Smartio CP-102E/PCIe +.It +Smartio CP-102EL/PCIe +.It +Smartio C104H/PCI +.It +Smartio CP-104UL/PCI +.It +Smartio CP-104JU/PCI +.It +Smartio CP-104EL/PCIe +.It +Smartio CP-104EL-A/PCIe +.It +CP-112UL +.It +Industio CP-114 +.It +Smartio CP-114EL/PCIe +.It +Smartio CP-118EL-A/PCIe +.It +C168H/PCI +.It +C168U/PCI +.It +CP-168EL/PCIe +.It +Smartio CP-168EL-A/PCIe +.El +.It +Exar: +.Bl -dash -compact +.It +XR17C/D152 +.It +XR17C154 +.It +XR17C158 +.It +XR17V258IV +.It +XR17V352 +.It +XR17V354 +.It +XR17V358 +.El +.It +Advantech +.Bl -dash -compact +.It +PCI-1602 Rev A +.It +2-port PCI (PCI-1602 Rev B1/PCI-1603) +.El +.It +Lava Computers: +.Bl -dash -compact +.It +Dual Serial +.It +Quatro A +.It +Quatro B +.It +Quattro-PCI A +.It +Quattro-PCI B +.It +Octo A +.It +Octo B +.El +.It +Sunix SUN1888 +.It +I-O DATA RSA-PCI2/R +.It +SIIG Cyber 4 PCI 16550 +.It +SIIG Cyber 4S PCI 16C650 (20x family) +.It +SIIG Quartet Serial 850 +.It +Kuroutoshikou SERIAL4P-LPPCI2 +.It +Oxford Semiconductor OX16PCI954 UARTs +.It +SIIG Cyber: +.Bl -dash -compact +.It +2S PCIe +.It +Serial Dual PCI 16C850 +.It +2SP1 PCIe +.El +.It +Oxford Semiconductor: +.Bl -dash -compact +.It +OX16PCI954 UARTs +.It +OX9160/OX16PCI954 UARTs (function 1) +.It +OX16PCI952 UARTs +.It +OX16PCI958 UARTs +.El +.It +Perle: +.Bl -dash -compact +.It +Ultraport4 Express +.It +Speed2 LE +.It +Speed4 LE +.It +Speed8 LE +.El +.It +Oxford Semiconductor OXPCIe952: +.Bl -dash -compact +.It +1S1P +.It +UARTs +.It +UARTs (function 1) +.El +.It +Oxford Semiconductor OXPCIe954: +.Bl -dash -compact +.It +UARTs +.It +UARTs (function 1) +.El +.It +Oxford Semiconductor OXPCIe958: +.Bl -dash -compact +.It +UARTs +.It +UARTs (function 1) +.El +.It +VScom: +.Bl -dash -compact +.It +PCI-100L +.It +PCI-200L +.It +200Li +.El +.It +Titan: +.Bl -dash -compact +.It +PCI-800H +.It +PCI-800H +.It +PCI-200H +.El +.It +Titan VScom: +.Bl -dash -compact +.It +PCI-800L +.It +PCI-200HV2 +.It +PCIex-800H +.It +PCIex-800H +.El +.It +Avlab Technology PCI IO 2S +.It +Avlab Low Profile PCI 4 Serial +.It +Syba Tech Ltd PCI-4S2P-550-ECP +.It +Sunix SER5xxxx +.Bl -dash -compact +.It +2-port serial +.It +4-port serial +.It +8-port serial +.El +.It +Sunix MIO5xxxx (1284 Printer port): +.Bl -dash -compact +.It +1-port serial +.It +2-port serial +.It +4-port serial +.El +.It +Feasso PCI FPP-02 2S1P +.It +Sun 1040 PCI Quad Serial +.It +Decision Computer Inc PCCOM: +.Bl -dash -compact +.It +4-port serial +.It +8-port serial +.El +.It +PCCOM dual port RS232/422/485 +.It +NetMos NM9815 Dual 1284 Printer port +.It +NetMos NM9835: +.Bl -dash -compact +.It +based 1-port serial +.It +based 2-port serial +.It +Dual UART and 1284 Printer port +.El +.It +NetMos NM9845: +.Bl -dash -compact +.It +6 Port UART +.It +Quad UART and 1284 Printer port +.El +.It +NetMos NM9865: +.Bl -dash -compact +.It +Dual UART +.It +Triple UART +.It +Quad UART +.It +Single UART and 1284 Printer port +.It +Dual UART and 1284 Printer port +.It +Dual 1284 Printer port +.El +.It +IC Book Labs: +.Bl -dash -compact +.It +Gunboat x4 Lite +.It +Gunboat x4 Pro +.It +Ironclad x8 Lite +.It +Ironclad x8 Pro +.It +Dreadnought x16 Pro +.It +Dreadnought x16 Lite +.It +Gunboat x2 Low Profile +.It +Gunboat x4 Low Profile +.El +.El .Sh SEE ALSO .Xr ppc 4 , .Xr uart 4 From nobody Tue Jun 3 18:36:38 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bBfYy6RZrz5y14M; Tue, 03 Jun 2025 18:36: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bBfYy4MBVz3Ym4; Tue, 03 Jun 2025 18:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748975798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q3UxOmFzUMTNgo0nqCWI/dw/aQBvYynLWaYuf22Lqcs=; b=ZFt2PhjuCiI+agNU7HAdODY7Sb7psawScAHrsZ/FUSgYz7GOb1KR6aunz6eO9nQhRFrBTs xDvRIdV2CVWAtBXVkNm+HVsh8dLRSoJFcX13VabdXlk7q79Xj719eIKfNxIshIpkX25zES pGKCrRbaM2Y+QcHluuzlMAL2zo2NpGd0c2p1l1tErlZzIWxS5sTcD+6i7fNFiatm75sVcH 3cs/GeAl5yVYDXyZmCtWc7oKNQn4Ld0yx/DHTb/GaxoeNYq4VBzFSZzkeHJGyug1bSK3dw Vuq4lyYnpZdBDyqZOkpjpneZOHPJPb2m+g5Q1KjAnOyJ/w8K+do0Xf8vRvmVhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748975798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q3UxOmFzUMTNgo0nqCWI/dw/aQBvYynLWaYuf22Lqcs=; b=Pj6r9HyxV12J4wA6CtfvlZ/VLQCMGiRy1FT34R9ReNkRJDAfDEYDnIWVT3ciSFKDC6H2Tt 9LXVTclAzQwWPR194bIc4AyMrTXWodvidz3ciFETHbWAweFCmkIv5XatyaLDgdMiA9iRux dFr5BpROYEc0yiJ+USzRW2Vl8IlCX1Qm+jCgDzfukR4pBwMDw+U6qW2+WieJjBRsvE+k5M etY+EG51E3UwHVeF9bzgnSeWlwKXKV/bAkzJlqaY+Orj1eVHUhDe/yM4MA7s2bxDpHJe1d kRGUsQQFneXag6wq0ZG5gfVZbqaGplvaGGbdGpb3ELjXf5cphiLW0RUZIf+e5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748975798; a=rsa-sha256; cv=none; b=Ae7eXyQoeoj3+igHzS1AMcu8WrFXtTAAUZzC1wRu3P7Gliojk7owGSTOFUlM8lAHtFWS+f WX3epgJG9/z8ybodrPAwuTV98yAk28Ug4g/IawAyLj5EckzpgHD5gbFi2JUh6O/pWbvJBx Db/uFE0JI5janOX3wJ+Rkokivdk9pwAtNm9dOwkdbPeZOo2NK2HMGcvBDUnwEZe+SShQ2W yNV3FvnZ2abBQg6FkDAhGHx914QZ5VNRGWG56NEf7Ad+TN+cJzhotBADObKkIII0+xstEt mvWuWonAfOjuxeVr7GkAA3etr53kvHc5gvScWepaF5ohqmG/xF6m6ihuej+Flg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bBfYy3ql8zqCv; Tue, 03 Jun 2025 18:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 553IacM0099846; Tue, 3 Jun 2025 18:36:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 553IacdB099843; Tue, 3 Jun 2025 18:36:38 GMT (envelope-from git) Date: Tue, 3 Jun 2025 18:36:38 GMT Message-Id: <202506031836.553IacdB099843@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 6fe425b4c4a4 - releng/14.3 - ure.4: description consistencies + tag spdx List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 6fe425b4c4a4aa20936d98d820481dd502c56696 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6fe425b4c4a4aa20936d98d820481dd502c56696 commit 6fe425b4c4a4aa20936d98d820481dd502c56696 Author: Alexander Ziaee AuthorDate: 2024-08-14 06:50:18 +0000 Commit: Colin Percival CommitDate: 2025-06-03 18:35:11 +0000 ure.4: description consistencies + tag spdx + consistent document description languague with other USB-BaseT drivers + mention newly added adapters from 6ea4d9 + attempt to mention rgephy(4) phys feed into ure interfaces Approved by: re (cperciva) Fixes: 6ea4d9 (Move RTL8156 from cdce(4) to ure(4)) MFC after: 3 days Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1384 (cherry picked from commit 4c72525953fdf618a3fc0a45f3ef3f071dcc0c52) (cherry picked from commit b529a06d1db4bb27895465ba8692d6c4427e32d8) --- share/man/man4/ure.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/ure.4 b/share/man/man4/ure.4 index 8cc798ab4393..f5452fa8463b 100644 --- a/share/man/man4/ure.4 +++ b/share/man/man4/ure.4 @@ -30,7 +30,7 @@ .Os .Sh NAME .Nm ure -.Nd "RealTek RTL8152/RTL8153/RTL8153B/RTL8156/RTL8156B USB to Ethernet controller driver" +.Nd RealTek RTL8152/RTL8153/RTL8156 USB Ethernet driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your From nobody Tue Jun 3 18:36:39 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bBfYz74PNz5y12Z; Tue, 03 Jun 2025 18:36: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bBfYz5j8kz3YyC; Tue, 03 Jun 2025 18:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748975799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l4jQd4Rqk5oIVGHcWdp7D8zaVP6SctwGiFH1Ffa13xo=; b=tb9wPNW6KOLDY3ypgcNnp4+tA+lMQo+w9rvjU4ANi8gSR/yumLN0OacW/UlVN5lAasQrzJ flFRm/1qwpH98yuEv7hrQUWy28IyHSo/STQJZnAgMJpKUg7g1NfqPzpK4wRwbjzemxo2fR fynetTw/ygtgK4RLR9voBQRFPUSoaUkIx75b/LrOK3Lx64gAy/CAdrsEDSTaYDCjp9He/F C4QnwP+EBvHOwAy4atbctZJ7G64IOWRBR0ik5KAPx8BoR8gTFqGbCF4k+hcH30nfOHXO1v pILJvqphBWwtIE8z925FCTqWEQ57508Px3sioho87mJM5FW4f0F0UZS6k7jZ5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748975799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l4jQd4Rqk5oIVGHcWdp7D8zaVP6SctwGiFH1Ffa13xo=; b=nktq3ONviPQxb63pke1R3jz40cZV9v6Pwt1S4ldzZR57lWBX5i8QflGdP1ztXs6b9VP3kU gqFnKpHELIb+cvwzsgsN05CyZhsp8kJW5+xMdco91cME4Wk4S4jl/U3ocfeolXMSNAA8qa 4CiowuwEH6+8tZLAUBY3dubsKQYyO2oIpHISustD0CW05RLdqp6WxzGgi3pgR4OT3GmcDx C5w4ugim+2gtJht7/4FGv438+5kP/p6N9V6csn0+2Aurh2qn7s3yPgxRV3XJ/kyAsAroO4 Jvn5A46iQ0sAiFwdd/D9g8o/APJu+jCH/fazTHLmzLZr9sDtHQN91LGg2sB9Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748975799; a=rsa-sha256; cv=none; b=O5u5ZqzLiF7RwcKqRGH17jebLbPnvmHXwYZqAXKDShsV4oCEYiPj07PIRAmDSHJNn/l6Hu Zpv29tXSXAbEzni+SsD+XHHtrU5r6EaE42wx7Eip+JU4iYp3OeRRye8Js4lLqEADh7wSz1 WuC5nK/y+rnouaTwVC9mTeQ9+zRY6c2BZg/4KnzzNxnfzuY+xJaUKzTKJa8t6SI611vGSa uxoLXg6RgngriRETlFqcU1kyOt03f8/e11Eot90100q+opcghSIZKwT/yflTjQJyus02+S Tzgf/tfEafWjOYOlIVz1m0oFiNCYQTqxDv1f6cLaC2hlUUPr012xIOS4XerzFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bBfYz528lzqT7; Tue, 03 Jun 2025 18:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 553Iad7q099880; Tue, 3 Jun 2025 18:36:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 553IadX5099877; Tue, 3 Jun 2025 18:36:39 GMT (envelope-from git) Date: Tue, 3 Jun 2025 18:36:39 GMT Message-Id: <202506031836.553IadX5099877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: cd46420a6150 - releng/14.3 - ure.4: add a HARDWARE section + add RTL8156BG as a compatible controller List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: cd46420a61508e53c8afd710d54cf8f85547874b Auto-Submitted: auto-generated The branch releng/14.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=cd46420a61508e53c8afd710d54cf8f85547874b commit cd46420a61508e53c8afd710d54cf8f85547874b Author: Kenneth Raplee AuthorDate: 2025-04-08 18:30:46 +0000 Commit: Colin Percival CommitDate: 2025-06-03 18:35:21 +0000 ure.4: add a HARDWARE section + add RTL8156BG as a compatible controller While here, rename all instances of "RealTek" to "Realtek" for authenticity. Approved by: re (cperciva) Reviewed by: imp, lwshu, zaiee Pull Request: https://github.com/freebsd/freebsd-src/pull/1649 (cherry picked from commit 76ed6f2db316bf2240d36d3c92316da4d1e5b174) (cherry picked from commit f336a04960b608d2caeaf964663c3a8425f31d71) --- share/man/man4/ure.4 | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/share/man/man4/ure.4 b/share/man/man4/ure.4 index f5452fa8463b..0d14a20f5f44 100644 --- a/share/man/man4/ure.4 +++ b/share/man/man4/ure.4 @@ -25,12 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 3, 2024 +.Dd April 8, 2025 .Dt URE 4 .Os .Sh NAME .Nm ure -.Nd RealTek RTL8152/RTL8153/RTL8156 USB Ethernet driver +.Nd Realtek RTL8152/RTL8153/RTL8156 USB Ethernet driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -53,16 +53,7 @@ if_ure_load="YES" .Sh DESCRIPTION The .Nm -driver provides support for USB Ethernet adapters based on the RealTek -RTL8152, RTL8153/RTL8153B, and RTL8156/RTL8156B USB Ethernet controllers, -as well as USB Ethernet PHYs provided by -.Xr rgephy 4 . -.Pp -NICs based on the RTL8152 are capable of 10 and 100Mbps. -NICs based on the RTL8153 or provided by -.Xr rgephy 4 -are capable of 10, 100, and 1000Mbps. -NICs based on the RTL8156 are capable of 10, 100, 1000, and 2500Mbps operation. +driver supports the Realtek USB Ethernet Controller family. .Pp The .Nm @@ -94,12 +85,12 @@ or modes. .It Cm 1000baseTX Set 1000baseTX (Gigabit Ethernet) operation over twisted pair. -The RealTek gigE chips support 1000Mbps in +The Realtek gigE chips support 1000Mbps in .Cm full-duplex mode only. .It Cm 2500base-T Set 2500Base-T operation over twisted pair. -The RealTek 8156/8156B chips support 2500Mbps in +The Realtek 8156/8156B chips support 2500Mbps in .Cm full-duplex mode only. .El @@ -116,6 +107,17 @@ Force half-duplex operation. .Pp For more information on configuring this device, see .Xr ifconfig 8 . +.Sh HARDWARE +The +.Nm +driver supports the following USB Ethernet controllers: +.Bl -column "Realtek RTL8168/8169/8110/8211 via rgephy(4)" "10, 100, 1000, and 2500" +.It Model: Ta Speed (Mbps): +.It Realtek RTL8156/RTL8156B/RTL8156BG Ta 10, 100, 1000, and 2500 +.It Realtek RTL8153/RTL8153B Ta 10, 100, and 1000 +.It Realtek RTL8152 Ta 10 and 100 +.It Realtek RTL8168/8169/8110/8211 via rgephy(4) Ta 10, 100, and 1000 +.El .Sh DIAGNOSTICS .Bl -diag .It "ure%d: watchdog timeout" From nobody Tue Jun 3 23:48:36 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bBnTx2J9Vz5x5PG; Tue, 03 Jun 2025 23:48: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bBnTx1cS1z3bnk; Tue, 03 Jun 2025 23:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748994517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iKpUmv+Clhsx5wn//hNyyOUSPqkEFpKKWi0i0PChBvE=; b=X6hRJrSnEl60MSFWMg/5b/SeFCeDM58g2iJyxi9LV7V9aKakjWVY/lQuvaVAkM+Jyy9imv ie/BNlw4NI3F44wuiFShPiKDqCCPxlHpGzxmO180p9qLK1o+JGIlveD63X94LuUvQ9TGq5 QJf06fbjioEaM3dGGfEGVPfdSUvQgYLgb/ICaWjSiZj+/niuAhJemj3Z9ZbIyl3Xgj3nKH gxxyTbEbFmgLq/d719bQfArNuXZCwVJ3P/blbcq34pJL1JJHwmmaiwb6m9tQp3BlYkKnCg 1VR+gNSzDLz4DiPG7q7osXzk/CuGfLMAE9pbZ3vHoI4mNSlefZKwS8dJCSlWrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748994517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iKpUmv+Clhsx5wn//hNyyOUSPqkEFpKKWi0i0PChBvE=; b=GSJB67ZKuncJpJpU9ldjs0K5kXuKCuS9dK6r6fOrNw9VW4yQKVUYWwNZsFoQdS26pnmyOD R6ROiNYg7Ts9bS8ZEJ7VsfRtructp3/9xh+NaGRd1P5BBZqAqt/I1UxrmwfxiYcb9xojlm mqWty5P4Drl4yg1a6jW6CJ7qpNsnuuGJeqrsbVm8y7dvOq5KVs3EpnigdINX6FGHXb/Oz0 7pg4cMK/vkQwj7njZ44nsX9zGAbUku8ai6NmAZ9jMcmQnbBsyStgsvzZDFP59uwJW2H0k4 GSb0+AcMQcBHz2HyU4XYs7HmRWYYiZRww7YMdccCBTNvf4iL7WziUO6HTcRPhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748994517; a=rsa-sha256; cv=none; b=Y2J2hxB1K77JtCfsWHfbmcMnvkOJxY7dQOIZ/FFLv1ubQMtyEjIDMXoUNKKJDH3iShQbLn EMUB4joU9V8P31L1rTWk2RJhSnJPW2gKUP/mP5ZdtHuj7L0ksOJEI+++fp8Dlq7EHlLG8X 7iy1thKdb0BxhlQW7mHRcYK4I4a8dl3Aau6roUxxQXQDzLHtfGS3ajs1yhIdGlUoxWG/+Q GaXMMButSeNgLRcJx6YJPn3X25PLqxTRln3fodiedPtW8naKUWKhKF0u1fqXx6BvBDtQPO w9MibBVP+Bc+zn8PXbe6t81Qziq5ZuA/fNoda23oAkBE+RMh7QKk6pHi4hNUlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bBnTx0s96z100f; Tue, 03 Jun 2025 23:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 553Nma0T081057; Tue, 3 Jun 2025 23:48:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 553NmaqD081054; Tue, 3 Jun 2025 23:48:36 GMT (envelope-from git) Date: Tue, 3 Jun 2025 23:48:36 GMT Message-Id: <202506032348.553NmaqD081054@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: ffacf114e131 - releng/14.3 - Fix incorrect version introduced in manual pages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: ffacf114e1313ab610b7ac4ee4714d35d5a035be Auto-Submitted: auto-generated The branch releng/14.3 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ffacf114e1313ab610b7ac4ee4714d35d5a035be commit ffacf114e1313ab610b7ac4ee4714d35d5a035be Author: Tom Hukins AuthorDate: 2025-05-02 11:00:20 +0000 Commit: Warner Losh CommitDate: 2025-06-03 23:47:57 +0000 Fix incorrect version introduced in manual pages Several manual pages for releng/14.3 incorrectly claim that features were first introduced in FreeBSD 15.0. I discovered these by running: git checkout origin/releng/14.3 git grep -F '.Fx 15.0' Approved by: re (cperciva) MFC After: 3 days Reviewed by: imp, ziaee Pull Request: https://github.com/freebsd/freebsd-src/pull/1685 (cherry picked from commit 5b9660caff69c70c9b6d9df5e04a3f21f8cf7996) (cherry picked from commit ef4014882ee1413eba75a78f6e307e16123c63d1) --- lib/libc/gen/psignal.3 | 2 +- lib/libc/gen/rtld_get_var.3 | 2 +- lib/libc/sys/getsockopt.2 | 2 +- lib/libc/sys/setcred.2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/gen/psignal.3 b/lib/libc/gen/psignal.3 index b02d23dc16f1..cce2a0c1a4d2 100644 --- a/lib/libc/gen/psignal.3 +++ b/lib/libc/gen/psignal.3 @@ -122,7 +122,7 @@ function appeared in The .Fn psiginfo function appeared in -.Fx 15.0 , +.Fx 14.3 , .Nx 6.0 , and .Dx 4.1 . diff --git a/lib/libc/gen/rtld_get_var.3 b/lib/libc/gen/rtld_get_var.3 index e211d78345e3..092114e86d78 100644 --- a/lib/libc/gen/rtld_get_var.3 +++ b/lib/libc/gen/rtld_get_var.3 @@ -103,4 +103,4 @@ is unknown. The .Nm function first appeared in -.Fx 15.0 . +.Fx 14.3 . diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2 index 868f40e97773..c738a152d859 100644 --- a/lib/libc/sys/getsockopt.2 +++ b/lib/libc/sys/getsockopt.2 @@ -676,7 +676,7 @@ The option originated in .Ox 4.9 and first appeared in -.Fx 15.0 . +.Fx 14.3 . The .Fx implementation aims to be source-compatible. diff --git a/lib/libc/sys/setcred.2 b/lib/libc/sys/setcred.2 index a1b819d24c52..86f61ddfdb30 100644 --- a/lib/libc/sys/setcred.2 +++ b/lib/libc/sys/setcred.2 @@ -248,7 +248,7 @@ does not. The .Fn setcred system call appeared in -.Fx 15.0 . +.Fx 14.3 . .Pp Traditionally in UNIX, all credential changes beyond shuffles of effective, real and saved IDs have been done by setuid binaries that successively call multiple From nobody Wed Jun 4 00:19:36 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bBp9j2Z7gz5x7Xv; Wed, 04 Jun 2025 00:19: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bBp9h7106z47Ng; Wed, 04 Jun 2025 00:19:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748996377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lw4h34YtD3TR/5tHvOGKi6AJl/SqWRBfYUfi1UUL6vo=; b=J7/JqWYT5+aXmcwtDEAEBaVwcgfcRDzeAX87rJbFeh/T+CiJatsmPVF9pH22tqj+vxkpIE 3Tc2m0zZcduOGyc+7YE3vc5S4kYdJKp0rl7KSjf4dRZWwOccKxPfJZ3qLrhTArPbXLjUyP dR/Dnep2vpL1plIsR9CTA764yAAyQREv7azu5/ZbjNcvyoIvsgKonVr9mbhHi/6h3aUyq1 KF6U8bpgKDOMosrTBzhA3bQNliV/3Zh76TCOZI0R0i3n5H2WRBMZm6p/PtMyEB5AJmAqH9 n+uYfD8d4e6xeL8OObgHWF9Dc5p7lvNB3kf477qCWObjsdw6pjKx2NRrzyf+8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748996377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lw4h34YtD3TR/5tHvOGKi6AJl/SqWRBfYUfi1UUL6vo=; b=Nr++j6sesRsEugbYSkhRW+FKG4S+79WXNOd+ag0y+EpWC+bXDTqFFgN8HTF7hujyqIIpC0 2Li0XA5bAHeeWYgRMARh6vukkVjw9nwxJWAadNuNtHtzEW8ywPOQ5uLIk4cIFtyy3Diaz5 ny2wD+ynDkB8JJqijqW4fNN536+iuUUDUUBPcYWO35FX5wtJhl0R/v1e8ejZb7Wp/r1Uvq aXtzk9OFpF0uyAzS2HLSzNA5WnSp7hUxQjqIR57oiXur/cQo6zRkN/7m7mEhX6ld9A33YS 1zUuBQUv//q14jz1FUsO/r0kozXiXpdnh45K8AXBRTqK/8Ci9sDD9l+EmfK7tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748996377; a=rsa-sha256; cv=none; b=ysimc5z0QzTVwCib3uJ6WmFTJo130CBq8flRbwvdfPDbjDMDqJ3LKgli871S3jfRM9pccB CtW4dtn28O/DprjGkS+Ws8/I28veg4/nb5T5hb8f9MO4jB/bedeGxmOYAz8DbO5lb2RAkV 4X1qcWd3JaFzlbX/ayMEl+lZqOWdH8Z+FgprRdwTvA9/HVLYbvmYkHd6ucwgiKPZ2XXsT3 t8A2UNpdcIVlsyirbnsfb3BUf0sw1mHajUV2XHERxWXjcEnfzLumONqAuCia4qNwTzVd0f kEhxrdBTiL0zrCLzsrb+xlaseE7jbCXyIalUmaL+Nrhn4eOE05Cs8ZJ+dCwhLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bBp9h67Z0z114f; Wed, 04 Jun 2025 00:19:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5540JaNQ037997; Wed, 4 Jun 2025 00:19:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5540JaQU037994; Wed, 4 Jun 2025 00:19:36 GMT (envelope-from git) Date: Wed, 4 Jun 2025 00:19:36 GMT Message-Id: <202506040019.5540JaQU037994@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 22bf04389287 - stable/14 - vt: add US International keymap List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 22bf043892879a9334217589072e500d6b054e4c Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=22bf043892879a9334217589072e500d6b054e4c commit 22bf043892879a9334217589072e500d6b054e4c Author: Quentin Thébault AuthorDate: 2025-02-20 04:38:31 +0000 Commit: Warner Losh CommitDate: 2025-06-04 00:19:22 +0000 vt: add US International keymap This adds support for the US International keyboard layout to vt. It uses dead keys to generate diacritics such as accents, cedillas and umlauts. PR: 72465 Co-authored-by: Helge Oldach Reviewed-by: Serjei Mikailov Reviewed-by: Warner Losh MFC-after: 2 weeks Pull-Request: https://github.com/freebsd/freebsd-src/pull/1601 (cherry picked from commit a049678039e40bdf523230852f78887a12435def) --- share/vt/keymaps/INDEX.keymaps | 7 ++ share/vt/keymaps/us.intl.acc.kbd | 141 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+) diff --git a/share/vt/keymaps/INDEX.keymaps b/share/vt/keymaps/INDEX.keymaps index a3b59989cc5d..b650765d68df 100644 --- a/share/vt/keymaps/INDEX.keymaps +++ b/share/vt/keymaps/INDEX.keymaps @@ -547,6 +547,13 @@ us.acc.kbd:fr:États Unis d'Amérique (avec accents) us.acc.kbd:pt:Estados Unidos da América (com acentos) us.acc.kbd:es:Estadounidense (con acentos) +us.intl.acc.kbd:en:United States of America International (accent keys) +us.intl.acc.kbd:da:USA international (accenttaster) +us.intl.acc.kbd:de:US-amerikanisch international (mit Akzenten) +us.intl.acc.kbd:fr:États Unis d'Amérique International (avec accents) +us.intl.acc.kbd:pt:Estados Unidos da América Internacional (com acentos) +us.intl.acc.kbd:es:Estadounidense Internacional (con acentos) + us.dvorak.kbd:en:United States of America dvorak us.dvorak.kbd:da:USA dvorak us.dvorak.kbd:de:US-amerikanisch dvorak diff --git a/share/vt/keymaps/us.intl.acc.kbd b/share/vt/keymaps/us.intl.acc.kbd new file mode 100644 index 000000000000..5ae189da845d --- /dev/null +++ b/share/vt/keymaps/us.intl.acc.kbd @@ -0,0 +1,141 @@ +# Windows US-International Keyboard emulation +# Differences to the original: +# striking " and " does NOT yield "" but just " (same for other dead keys) +# alt shift 9 yields 0x93 (original: empty) +# alt shift 0 yields 0x94 (original: empty) +# alt shift - yields ± (original: empty) +# alt shift . yields · (original: empty) +# alt shift / yields ¶ (original: empty) +# ^ - yields ­ (original: empty) +# ^ shift - yields ¯ (original: empty) +# ^ shift . yields · (original: empty) +# alt +# scan cntrl alt alt cntrl lock +# code base shift cntrl shift alt shift cntrl shift state +# ------------------------------------------------------------------ + 000 nop nop nop nop nop nop nop nop O + 001 esc esc esc esc esc esc esc esc O + 002 '1' '!' nop nop 161 185 nop nop O + 003 '2' '@' nul nul 178 nop nul nul O + 004 '3' '#' nop nop 179 nop nop nop O + 005 '4' '$' nop nop 164 163 nop nop O + 006 '5' '%' nop nop 128 nop nop nop O + 007 '6' dcir rs rs 188 nop rs rs O + 008 '7' '&' nop nop 189 nop nop nop O + 009 '8' '*' nop nop 190 nop nop nop O + 010 '9' '(' nop nop 145 147 nop nop O + 011 '0' ')' nop nop 146 148 nop nop O + 012 '-' '_' us us 165 177 us us O + 013 '=' '+' nop nop 215 247 nop nop O + 014 bs bs del del bs bs del del O + 015 ht btab nop nop ht btab nop nop O + 016 'q' 'Q' dc1 dc1 228 196 dc1 dc1 C + 017 'w' 'W' etb etb 229 197 etb etb C + 018 'e' 'E' enq enq 233 201 enq enq C + 019 'r' 'R' dc2 dc2 174 nop dc2 dc2 C + 020 't' 'T' dc4 dc4 254 222 dc4 dc4 C + 021 'y' 'Y' em em 252 220 em em C + 022 'u' 'U' nak nak 250 218 nak nak C + 023 'i' 'I' ht ht 237 205 ht ht C + 024 'o' 'O' si si 243 211 si si C + 025 'p' 'P' dle dle 246 214 dle dle C + 026 '[' '{' esc esc 171 nop esc esc O + 027 ']' '}' gs gs 187 nop gs gs O + 028 cr cr nl nl cr cr nl nl O + 029 lctrl lctrl lctrl lctrl lctrl lctrl lctrl lctrl O + 030 'a' 'A' soh soh 225 193 soh soh C + 031 's' 'S' dc3 dc3 223 167 dc3 dc3 C + 032 'd' 'D' eot eot 240 208 eot eot C + 033 'f' 'F' ack ack nop nop ack ack C + 034 'g' 'G' bel bel nop nop bel bel C + 035 'h' 'H' bs bs nop nop bs bs C + 036 'j' 'J' nl nl nop nop nl nl C + 037 'k' 'K' vt vt nop nop vt vt C + 038 'l' 'L' ff ff 248 216 ff ff C + 039 ';' ':' nop nop 182 176 nop nop O + 040 dacu duml nop nop 180 168 nop nop O + 041 dgra dtil nop nop nop nop nop nop O + 042 lshift lshift lshift lshift lshift lshift lshift lshift O + 043 '\' '|' fs fs 172 166 fs fs O + 044 'z' 'Z' sub sub 230 198 sub sub C + 045 'x' 'X' can can nop nop can can C + 046 'c' 'C' etx etx 169 162 etx etx C + 047 'v' 'V' syn syn nop nop syn syn C + 048 'b' 'B' stx stx nop nop stx stx C + 049 'n' 'N' so so 241 209 so so C + 050 'm' 'M' cr cr 181 nop cr cr C + 051 ',' '<' nop nop 231 199 nop nop O + 052 '.' '>' nop nop 133 183 nop nop O + 053 '/' '?' nop nop 191 182 nop nop O + 054 rshift rshift rshift rshift rshift rshift rshift rshift O + 055 '*' '*' '*' '*' '*' '*' '*' '*' O + 056 lalt lalt lalt lalt lalt lalt lalt lalt O + 057 ' ' ' ' nul ' ' ' ' ' ' susp ' ' O + 058 clock clock clock clock clock clock clock clock O + 059 fkey01 fkey13 fkey25 fkey37 scr01 scr11 scr01 scr11 O + 060 fkey02 fkey14 fkey26 fkey38 scr02 scr12 scr02 scr12 O + 061 fkey03 fkey15 fkey27 fkey39 scr03 scr13 scr03 scr13 O + 062 fkey04 fkey16 fkey28 fkey40 scr04 scr14 scr04 scr14 O + 063 fkey05 fkey17 fkey29 fkey41 scr05 scr15 scr05 scr15 O + 064 fkey06 fkey18 fkey30 fkey42 scr06 scr16 scr06 scr16 O + 065 fkey07 fkey19 fkey31 fkey43 scr07 scr07 scr07 scr07 O + 066 fkey08 fkey20 fkey32 fkey44 scr08 scr08 scr08 scr08 O + 067 fkey09 fkey21 fkey33 fkey45 scr09 scr09 scr09 scr09 O + 068 fkey10 fkey22 fkey34 fkey46 scr10 scr10 scr10 scr10 O + 069 nlock nlock nlock nlock nlock nlock nlock nlock O + 070 slock slock slock slock slock slock slock slock O + 071 fkey49 '7' '7' '7' '7' '7' '7' '7' N + 072 fkey50 '8' '8' '8' '8' '8' '8' '8' N + 073 fkey51 '9' '9' '9' '9' '9' '9' '9' N + 074 fkey52 '-' '-' '-' '-' '-' '-' '-' N + 075 fkey53 '4' '4' '4' '4' '4' '4' '4' N + 076 fkey54 '5' '5' '5' '5' '5' '5' '5' N + 077 fkey55 '6' '6' '6' '6' '6' '6' '6' N + 078 fkey56 '+' '+' '+' '+' '+' '+' '+' N + 079 fkey57 '1' '1' '1' '1' '1' '1' '1' N + 080 fkey58 '2' '2' '2' '2' '2' '2' '2' N + 081 fkey59 '3' '3' '3' '3' '3' '3' '3' N + 082 fkey60 '0' '0' '0' '0' '0' '0' '0' N + 083 del '.' '.' '.' '.' '.' '.' '.' N + 084 nop nop nop nop nop nop nop nop O + 085 nop nop nop nop nop nop nop nop O + 086 nop nop nop nop nop nop nop nop O + 087 fkey11 fkey23 fkey35 fkey47 scr11 scr11 scr11 scr11 O + 088 fkey12 fkey24 fkey36 fkey48 scr12 scr12 scr12 scr12 O + 089 cr cr nl nl cr cr nl nl O + 090 rctrl rctrl rctrl rctrl rctrl rctrl rctrl rctrl O + 091 '/' '/' '/' '/' '/' '/' '/' '/' N + 092 nscr nscr nscr nscr nop nop nop nop O + 093 ralt ralt ralt ralt ralt ralt ralt ralt O + 094 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 O + 095 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 O + 096 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 O + 097 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 O + 098 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 O + 099 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 O + 100 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 O + 101 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 O + 102 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 O + 103 fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 O + 104 slock saver slock saver susp nop susp nop O + 105 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 O + 106 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 O + 107 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 O + 108 nop nop nop nop nop nop nop nop O + + dgra '`' ( 'A' 192 ) ( 'E' 200 ) ( 'I' 204 ) ( 'O' 210 ) + ( 'U' 217 ) ( 'a' 224 ) ( 'e' 232 ) ( 'i' 236 ) + ( 'o' 242 ) ( 'u' 249 ) + dacu ''' ( 'A' 193 ) ( 'C' 199 ) ( 'E' 201 ) ( 'I' 205 ) + ( 'O' 211 ) ( 'U' 218 ) ( 'Y' 221 ) ( 'a' 225 ) + ( 'c' 231 ) ( 'e' 233 ) ( 'i' 237 ) ( 'o' 243 ) + ( 'u' 250 ) ( 'y' 253 ) + dcir '^' ( 'A' 194 ) ( 'E' 202 ) ( 'I' 206 ) ( 'O' 212 ) + ( 'U' 219 ) ( 'a' 226 ) ( 'e' 234 ) ( 'i' 238 ) + ( 'o' 244 ) ( 'u' 251 ) ( '-' 173 ) ( '_' 175 ) + ( '.' 183 ) + dtil '~' ( 'A' 195 ) ( 'N' 209 ) ( 'O' 213 ) ( 'a' 227 ) + ( 'n' 241 ) ( 'o' 245 ) + duml '"' ( 'A' 196 ) ( 'E' 203 ) ( 'I' 207 ) ( 'O' 214 ) + ( 'U' 220 ) ( 'a' 228 ) ( 'e' 235 ) ( 'i' 239 ) + ( 'o' 246 ) ( 'u' 252 ) ( 'y' 255 ) From nobody Wed Jun 4 09:56:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bC3004kXRz5xn4P for ; Wed, 04 Jun 2025 09:57:04 +0000 (UTC) (envelope-from freebsd@oldach.net) Received: from mp80.oldach.net (hmo.in-vpn.de [IPv6:2001:67c:1407:60::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-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "nuc.oldach.net", Issuer "E5" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bC2zx6T0Rz3Nm7 for ; Wed, 04 Jun 2025 09:57:01 +0000 (UTC) (envelope-from freebsd@oldach.net) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of freebsd@oldach.net designates 2001:67c:1407:60::1 as permitted sender) smtp.mailfrom=freebsd@oldach.net; dmarc=pass (policy=none) header.from=oldach.net Received: from mp80.oldach.net (localhost [127.0.0.1]) by mp80.oldach.net (8.18.1/8.18.1) with ESMTPS id 5549umMJ087446 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 4 Jun 2025 11:56:48 +0200 (CEST) (envelope-from freebsd@oldach.net) Received: (from hmo@localhost) by mp80.oldach.net (8.18.1/8.18.1/Submit) id 5549umoF087445; Wed, 4 Jun 2025 11:56:48 +0200 (CEST) (envelope-from freebsd@oldach.net) Message-Id: <202506040956.5549umoF087445@mp80.oldach.net> X-Authentication-Warning: mp80.oldach.net: hmo set sender to freebsd@oldach.net using -f Subject: Re: git: 22bf04389287 - stable/14 - vt: add US International keymap In-Reply-To: <202506040019.5540JaQU037994@gitrepo.freebsd.org> from Warner Losh at "4 Jun 2025 00:19:36" To: imp@FreeBSD.org (Warner Losh) Date: Wed, 4 Jun 2025 11:56:48 +0200 (CEST) Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: freebsd@oldach.net (Helge Oldach) X-No-Archive: Yes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit X-Greylist: inspected by milter-greylist-4.6.4 (mp80.oldach.net [0.0.0.0]); Wed, 04 Jun 2025 11:56:48 +0200 (CEST) for IP:127.0.0.1 DOMAIN:localhost HELO:mp80.oldach.net FROM:freebsd@oldach.net RCPT: X-Spamd-Result: default: False [-1.01 / 15.00]; NEURAL_SPAM_MEDIUM(1.00)[1.000]; NEURAL_HAM_SHORT(-0.99)[-0.985]; DMARC_POLICY_ALLOW(-0.50)[oldach.net,none]; NEURAL_HAM_LONG(-0.22)[-0.223]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; ASN(0.00)[asn:29670, ipnet:2001:67c:1400::/45, country:DE]; HAS_XAW(0.00)[]; MISSING_XM_UA(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FROM_NO_DN(0.00)[]; R_DKIM_NA(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-branches@FreeBSD.org] X-Rspamd-Queue-Id: 4bC2zx6T0Rz3Nm7 X-Spamd-Bar: - Warner Losh wrote on Wed, 04 Jun 2025 02:19:36 +0200 (CEST): > The branch stable/14 has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=22bf043892879a9334217589072e500d6b054e4c > > commit 22bf043892879a9334217589072e500d6b054e4c > Author: Quentin Thébault > AuthorDate: 2025-02-20 04:38:31 +0000 > Commit: Warner Losh > CommitDate: 2025-06-04 00:19:22 +0000 > > vt: add US International keymap I believe us.intl.acc.kbd should get added to FILES in share/vt/keymaps/Makefile, else it won't get installed. Kind Regards Helge From nobody Wed Jun 4 17:00:24 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bCDNS4ZMRz5xJQ3; Wed, 04 Jun 2025 17:00:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bCDNS2RNfz4BM7; Wed, 04 Jun 2025 17:00:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749056424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zRQLwDg3DILYd3rIfFHWV0cQINao7sjWJz3ByzC/dkE=; b=AMaDVHHQn3d8trWaDLHYmyh0pRxyLM1h7MjAGJMqWqMnhHIEGRtz/xJyKXKrBAYzNqv2dw t2sxevvmEbQcWIRfeXNECbTaLjh0/29KCNT5NfGfO+IpMgoTnlDtTCnYylI67s878d8TcZ 3BYH1jjCxMySn8XK4T/D98lZPg0Fg93hV2kjjD0QeCBZLMIXcVYCi0RRECjy7S/JzSWC/A XVlxuQrRcLvrfYOY6QwkLBA1iNEPN8JFSpPmIqiIY4OGhDoq++M+6zqWxC83gXH7pDa49C hwxA1JskCZ7c3TD6VHsI2EMsdIvSnajWTwEUPBqv9soyxrY6O/iG3YlvbFPFaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749056424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zRQLwDg3DILYd3rIfFHWV0cQINao7sjWJz3ByzC/dkE=; b=ekqBItXwbXNzg3gWcsG0rym7CbOp+PsVJk4+JhXIEi1mXlmP69gPBWUUezxD+b5U/j/F7i xYxYeQC30xU5C3eS0e0ACd739LqfT/6uV+PqeNdf/EcwpkC95IaCIvE9pdZ5DJ9T4UgieJ SibVWXtBDz3URW1w+dC436ACH/iwG8dvhNefaLn+u7cjGbnmikLxCsZj9/hYMPBc0YNpQ1 C28fZn1PepDaY5VqjjG3N2D4CWKU5Q6XDt5jLOQ/2Utq64vN3Rp4PGz6ksnL9FKPGEfOY5 ZxTBea67a97BJQm8r+5aCbNfRP46/kC/4taIi6tqN/hplOQVukohiPFkWLC6LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749056424; a=rsa-sha256; cv=none; b=dUcx59yZXQ+bo0R5Pi/KtoRqRc7stKBYGlWdxEkf6S+FYJar8NT6w12+9YH1gentrOZt/u 0OWgostv0nU/uaKTuIIZMlMFgrdRvdwPm0rn6T4fTDuJsVFRITowD+X8suD4E3GROAR4E7 ixeY9p5dIqsmBu7DWQiMEQW/IpbQdlAJokeygWkOLpNy1n5+VTFD+No2CDPo8eP1Ewiqmk QLIepS5ZfKZ2PKF0xoTbidrs3ItaaaP27fPX9/D+lylK731JmlV2Y450tiVIiynFUTJeeT VX9mnbdVXPJo25Q1Kz6KuPWH4i28svdGK2ng/I6vV0fYQYAIF9CoWbdBxPQTRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bCDNS20ZqzYnK; Wed, 04 Jun 2025 17:00:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 554H0OcO027845; Wed, 4 Jun 2025 17:00:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 554H0OWl027842; Wed, 4 Jun 2025 17:00:24 GMT (envelope-from git) Date: Wed, 4 Jun 2025 17:00:24 GMT Message-Id: <202506041700.554H0OWl027842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 0344bfb60961 - stable/14 - Enable L1SS handling on RPI4 pcib List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0344bfb6096103209f485503f8cc541d264e1f3e Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=0344bfb6096103209f485503f8cc541d264e1f3e commit 0344bfb6096103209f485503f8cc541d264e1f3e Author: HP van Braam AuthorDate: 2024-04-16 23:01:20 +0000 Commit: Kyle Evans CommitDate: 2025-06-04 16:57:19 +0000 Enable L1SS handling on RPI4 pcib Thanks to @kevans91 for pointing me in the right direction. FreeBSD had the same bug as Linux (see https://bugzilla.kernel.org/show_bug.cgi?id=217276) where the ultimate solution was to honor the brcm,enable-l1ss FDT property. In current versions of the dtb files this property has been added by default. Without this on many, many pcie addin cards the pcib will Serror when trying to assert the clreq# pin on the pcie bus. Many cards do not have these hooked up. PR: 260131, 277638, 277605 Reviewed-by: emaste Signed-off-by: HP van Braam Pull-request: https://github.com/freebsd/freebsd-src/pull/1179 (cherry picked from commit 10e0c34bf842885b4bd78adbbdbd7fb00f133cb5) --- sys/arm/broadcom/bcm2835/bcm2838_pci.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2838_pci.c b/sys/arm/broadcom/bcm2835/bcm2838_pci.c index 2dfd6744127a..fb3e8df783c2 100644 --- a/sys/arm/broadcom/bcm2835/bcm2838_pci.c +++ b/sys/arm/broadcom/bcm2835/bcm2838_pci.c @@ -61,7 +61,7 @@ #define REG_BRIDGE_CTRL 0x9210 #define BRIDGE_DISABLE_FLAG 0x1 #define BRIDGE_RESET_FLAG 0x2 -#define REG_BRIDGE_SERDES_MODE 0x4204 +#define REG_PCIE_HARD_DEBUG 0x4204 #define REG_DMA_CONFIG 0x4008 #define REG_DMA_WINDOW_LOW 0x4034 #define REG_DMA_WINDOW_HIGH 0x4038 @@ -87,6 +87,9 @@ #define REG_EP_CONFIG_CHOICE 0x9000 #define REG_EP_CONFIG_DATA 0x8000 +#define L1SS_ENABLE 0x00200000 +#define CLKREQ_ENABLE 0x2 + /* * The system memory controller can address up to 16 GiB of physical memory * (although at time of writing the largest memory size available for purchase @@ -191,7 +194,7 @@ bcm_pcib_reset_controller(struct bcm_pcib_softc *sc) DELAY(100); - bcm_pcib_set_reg(sc, REG_BRIDGE_SERDES_MODE, 0); + bcm_pcib_set_reg(sc, REG_PCIE_HARD_DEBUG, 0); DELAY(100); } @@ -614,7 +617,7 @@ bcm_pcib_attach(device_t dev) struct bcm_pcib_softc *sc; pci_addr_t phys_base, pci_base; bus_size_t size; - uint32_t hardware_rev, bridge_state, link_state; + uint32_t hardware_rev, bridge_state, link_state, tmp; int error, tries; sc = device_get_softc(dev); @@ -720,7 +723,18 @@ bcm_pcib_attach(device_t dev) bcm_pcib_set_reg(sc, PCI_ID_VAL3, PCIC_BRIDGE << CLASS_SHIFT | PCIS_BRIDGE_PCI << SUBCLASS_SHIFT); - bcm_pcib_set_reg(sc, REG_BRIDGE_SERDES_MODE, 0x2); + tmp = bcm_pcib_read_reg(sc, REG_PCIE_HARD_DEBUG); + tmp |= CLKREQ_ENABLE; + + if (ofw_bus_has_prop(dev, "brcm,enable-l1ss")) { + if (bootverbose) + device_printf(dev, "note: enabling L1SS due to OF " + "property brcm,enable-l1ss\n"); + + tmp |= L1SS_ENABLE; + } + + bcm_pcib_set_reg(sc, REG_PCIE_HARD_DEBUG, tmp); DELAY(100); bcm_pcib_relocate_bridge_window(dev); From nobody Wed Jun 4 19:32:19 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bCHll2qGwz5xWY2; Wed, 04 Jun 2025 19: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bCHll1H7nz44Rf; Wed, 04 Jun 2025 19:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749065539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pHwxj6rdAcCmkWRgXGYdU0Ipw9mag+5NRGIdXINsong=; b=T1a+0FQpKoCxgktCVT/C+yVKRWBNffzrXOYl5FSw1ZrBS7MjiVAvcjdAdYBzrxAQ0ylc/f gfvJZlN/dKL+ecppxmUQkJJD8CKnjTL8PYxnvcaqCmcFL0GPfzIErAKYBZ19RgnMBymv5f 2yGlMgAQ3mUCPJhmujJoU5d/NgQui+dYlP3UwY5IE1IeONDlHwgjEXEFtkgHwxY0xXjkS2 8uNIQg2elXkd3X56gFszD7YM48oltl92Gg4TLQ15vh8Z+6u6i70mCNNuZbgq008f5yWfzO Jsk+4YHVoTa1Ut1FKe7Odjv8aiGkaKEm5Z9wLDctYw6SgJwPwHTXvx6rM5rYGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749065539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pHwxj6rdAcCmkWRgXGYdU0Ipw9mag+5NRGIdXINsong=; b=i6pUt/zefWunUQPqL2zvfBcjRy7g9GPsqwzXlGeRe6ZrPW1bAVhOFzTgFNSU6UoT2SaeDM 9dEeg2VzT+SODoCffoQUWPEgSSZ0OVRM/50iZYlpVZ2tmkU3U6uhILOUdHQLBo4ez8Or2g H+DNqrChqbOmpLw5xX22L2HeA7g1Q1xrTX71qY4qm2dotf2scgG+KXGQQhLjaHsyJ1QqwG 5mqNAvIndXOWLHGkaT5DiDh974asOQC6bS6fPytEwtUcszLo7YlkjRpR8rsgZu+Ji4qyAC o79XVkGCE2fO248wZlUKWa8tCdFX/m4HTGAocEekutZgkTqCUwUxN5E0PZ6tmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749065539; a=rsa-sha256; cv=none; b=BbLwP7Ma6VQlyGciavdIXwB8N2MkUgy7trpfO0gOkPvw5uageP6QnRXTm1gwW7vPu/pbDt WTmBgAcSsiRUBquuWR468o2n6MJtTRUYayOALShe7hU7ClQ856DieDN1HDoFlKN5d99KJD dKUnzzK+pNhyfmDf9HcV1l2IS3T+x5BByjlzC7NzqzPsnW4RDYHAB9ZX+lkjYC710+tmnR OcTpBazXAQOPrgO4VPDfJqBbms4eYPnRjYniUl3o/uopvdlepa3GwMb8jD5yjXx5OMcTSy 9g7Ap5Ga9djsSaBmNNwkum3WK6SnbqAtwhjtaWu2LPnaealpQ8ucM1C6WM+hNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bCHll0sx8zdNb; Wed, 04 Jun 2025 19:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 554JWJeM017055; Wed, 4 Jun 2025 19:32:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 554JWJqu017052; Wed, 4 Jun 2025 19:32:19 GMT (envelope-from git) Date: Wed, 4 Jun 2025 19:32:19 GMT Message-Id: <202506041932.554JWJqu017052@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 5f8831f2fe50 - stable/14 - caroot: Update certdata URL for GitHub switch List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5f8831f2fe50a0e2a8b04f1cbfe70c72027ddec9 Auto-Submitted: auto-generated The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=5f8831f2fe50a0e2a8b04f1cbfe70c72027ddec9 commit 5f8831f2fe50a0e2a8b04f1cbfe70c72027ddec9 Author: Michael Osipov AuthorDate: 2025-05-28 15:02:54 +0000 Commit: Michael Osipov CommitDate: 2025-06-04 19:32:03 +0000 caroot: Update certdata URL for GitHub switch Mozilla has migrated its projects' source code to GitHub, update certdata URL along with it. Reference: https://github.com/curl/curl/pull/17321 Reviewed by: jrm (mentor), otis (mentor), kevans MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50575 (cherry picked from commit 87c46facc3cf1744c30ecc9f63c10a778a1af104) --- secure/caroot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secure/caroot/Makefile b/secure/caroot/Makefile index 4390d4890b92..5e2bb85fc5d2 100644 --- a/secure/caroot/Makefile +++ b/secure/caroot/Makefile @@ -8,7 +8,7 @@ SUBDIR+= untrusted # To be used by secteam@ to update the trusted certificates fetchcerts: .PHONY - fetch --no-sslv3 --no-tlsv1 -o certdata.txt 'https://hg.mozilla.org/projects/nss/raw-file/tip/lib/ckfw/builtins/certdata.txt' + fetch --no-sslv3 --no-tlsv1 -o certdata.txt 'https://raw.githubusercontent.com/mozilla-firefox/firefox/refs/heads/release/security/nss/lib/ckfw/builtins/certdata.txt' cleancerts: .PHONY @${MAKE} -C ${.CURDIR}/trusted ${.TARGET} From nobody Wed Jun 4 19:33:01 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bCHmY71t7z5xWWW; Wed, 04 Jun 2025 19:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bCHmY6J18z44mx; Wed, 04 Jun 2025 19:33:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749065581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YSpNhbnZfNG3ES5dKICGBKrw/QF9QbQfhnwbOaaAcn8=; b=CfnFsCyDCLHuf+DWpWV1m48UMgLCS7+qOT4kVNDnS3igkVSK70sHiyexqH36iw5CxNRPBk rAfY5lZPpZD2e+GahcmLrZuuGuHIea5G2lY2njhAt8VbahhtU7FMHNiRrzN/bvrS3pJqty 3Gx7A7+QniZ1PoLsh7vLGV0NdC2AcTO+g/w+oUqpvE+sxn5traUVi1ynVM236YmgcIiEN2 uuPAVvZYqPyuw6Eqen05G1i+Txyljcr6BSEss7rjMSKlJopxUmZ4DJTmQ5WYeIoOJuOkpY QUjiN/4fzTdm8Td9Duy+DCXrn9s1xvAvbDuzuZ+CuA1QlJu9+91Spn3qwHdn0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749065581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YSpNhbnZfNG3ES5dKICGBKrw/QF9QbQfhnwbOaaAcn8=; b=csQYG3RX1H4Tm1pIlOCIjE+PXIcCsoPdpDSWB0jqYeqqasphPJJcCrKBK+YhRngj5Egdfp RhQ9UGaITYkSACtZ4zHJAD+q0/lA6GgoS1T8BiMSxQ/ecT/mOG9UYwt/oeVLmTQY9X5izc N5abV9gEpV4EpMWYgQJVkHc6DUtjMEo3CAB2cbA2mZMX2DMviJBWhnG/gmWb1zUABsvvvp AEZPXoN7gWd+H6KcOM0jlUErZLQcIz7RMd41+CgYk0Pdri74fWQux5emNnA85Drn8loUZG Rn3ddyDTXaoGasoyyzCHdHgD3M/OJZyp9SYzJkUvaZNG3eEy41780nmxIgriDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749065581; a=rsa-sha256; cv=none; b=O6g1wsfVwGxyedNKCV8goqFjIVB/Jl6+elEGMb0TjIZKio0mILOl1fAj8jIAnEQOLucR0M n/A+pN8fBjoGpH17SVqtlxbVSdk4Pp7+vL5B2XZm1kDr65xiGuFfC2RKu7bc7OHsGIttW5 VWzIzPr5gN/mKGJ63fmeMxU4blMF6j/IkhLku1QedR11Vb2v0Er24N/P7fK7KkNn50wCYs BMAkiRWwZ4d/3FJNhDW+3tA0jTJLlMHB5PZEtkUVgdbVjLsz/9taYYddrzAeXolJ5BKtcI F3pPkvtBpLSKS1mLCBei7vTJzPAMcmx3DJxbwE+0L8ig8581uGERRXmNWLah+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bCHmY5mJpzdj2; Wed, 04 Jun 2025 19:33:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 554JX1s8017406; Wed, 4 Jun 2025 19:33:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 554JX1Yd017403; Wed, 4 Jun 2025 19:33:01 GMT (envelope-from git) Date: Wed, 4 Jun 2025 19:33:01 GMT Message-Id: <202506041933.554JX1Yd017403@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: cda1b2b634ce - stable/13 - caroot: Update certdata URL for GitHub switch List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cda1b2b634ce39269f4e0e0b9856c205034ec2ab Auto-Submitted: auto-generated The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=cda1b2b634ce39269f4e0e0b9856c205034ec2ab commit cda1b2b634ce39269f4e0e0b9856c205034ec2ab Author: Michael Osipov AuthorDate: 2025-05-28 15:02:54 +0000 Commit: Michael Osipov CommitDate: 2025-06-04 19:32:53 +0000 caroot: Update certdata URL for GitHub switch Mozilla has migrated its projects' source code to GitHub, update certdata URL along with it. Reference: https://github.com/curl/curl/pull/17321 Reviewed by: jrm (mentor), otis (mentor), kevans MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50575 (cherry picked from commit 87c46facc3cf1744c30ecc9f63c10a778a1af104) --- secure/caroot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secure/caroot/Makefile b/secure/caroot/Makefile index ae9c1644b02a..a132fa407e55 100644 --- a/secure/caroot/Makefile +++ b/secure/caroot/Makefile @@ -8,7 +8,7 @@ SUBDIR+= blacklisted # To be used by secteam@ to update the trusted certificates fetchcerts: .PHONY - fetch --no-sslv3 --no-tlsv1 -o certdata.txt 'https://hg.mozilla.org/projects/nss/raw-file/tip/lib/ckfw/builtins/certdata.txt' + fetch --no-sslv3 --no-tlsv1 -o certdata.txt 'https://raw.githubusercontent.com/mozilla-firefox/firefox/refs/heads/release/security/nss/lib/ckfw/builtins/certdata.txt' cleancerts: .PHONY @${MAKE} -C ${.CURDIR}/trusted ${.TARGET} From nobody Wed Jun 4 22:23:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bCMYj2V40z5xk42; Wed, 04 Jun 2025 22:23: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bCMYj0dsYz44Vl; Wed, 04 Jun 2025 22:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749075833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xe2aziubiCaDtO3Xu9wrrRpfbHLBCCREVdtdzreSO0w=; b=iSRVFPXc2EqgXQWzLBcrjZLRPJKDs/35JQZZz1EX1pHxEG5SMJNkdaffyO9q8naLm6zo3h vxBYtopW6sBcdFeXTYDGXOrYTSulfeK5MTtt33HvE5R8jc7ygxVXyAzyOd+FVKWGV4XATw hsNBx2kRVmpZseJYWZ+8ghn1iEAL4ji3vonQe1nStTrbpDWxAWe4v9EQTUXWwuhiBmL5UU lltYrkiJqoLL519BcJj790rnmjXZLARfcaPH7TILq1gKrs09Wyo1eucXucIwqrD2N0xNBD JDVE+qAAwfgTZ+CXL//3/YLD+pRquTZDhannAdw6QW+4ugGHso8tfF+4nQJWUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749075833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xe2aziubiCaDtO3Xu9wrrRpfbHLBCCREVdtdzreSO0w=; b=WJU7Ak4WtuNwVwLl122JrvhgL+AzPM6LiBWttrvXoyMUVrJ1pYmk1eXhs1RxN3m9Kq+0wh TyVbn3qmJW157A/3bZhGeAoZLJ8n6NMwdDacpdnFfFA4IzLKIMnXcglSYdHZ+TJydqWp9b bE8Ce3PRrHkkh37ynLGLCl37xUtZwmzxH9EyhNcyEWfl4NgsjXJ9etayLCwN9mpUbGiGQ1 uyM1jmdB+d1UCnoeYitYtXUGpiT6YRvA03g/1AnsTiTqgdKCdqFpyEHzUUu62wc49LOLwL IHMlc4qTA6FLBg1GFcKN6p1qGn4T8xIjxXlVCdew7dR6KvSk4LWl1CHuzGUTAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749075833; a=rsa-sha256; cv=none; b=qjl/6y9znh1M0xle4waBgu/ClA6qPVZ+s/dvRvZ4j/6mFymg40VnKkKcbRmrOuEp1vtZOT 7YtdUtcElvMpiQrzWygIwJGaoI4r7I/ptDINwUkmORSmFvsQQjDfjjbylLozqkU4Pn6qaL i/JGFp3fiUpmzHTPcqK94jNpoVeMTZJcr+2UJ6yJVyDJiYk3S8BTbukZzE7GqKPbifQ9hh blIpS3H35KjYd/MrIcLBpDW8vdnmEt0FiGxE1EajDue7HQ+PT68IOcL2Fhjn4/MEET8Wio w0U+ib7R5zqtto7j15Kpmta1rFed/PHQDp6dxfZt2y2y7eOUTvswixpjZwelwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bCMYh755FzkDL; Wed, 04 Jun 2025 22:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 554MNqXn037706; Wed, 4 Jun 2025 22:23:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 554MNqmA037703; Wed, 4 Jun 2025 22:23:52 GMT (envelope-from git) Date: Wed, 4 Jun 2025 22:23:52 GMT Message-Id: <202506042223.554MNqmA037703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: c8b89c058f6d - stable/14 - ifconfig: 802.11: fix a warning message List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c8b89c058f6dbc11ad7d839868dbe30d06e34b2f Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c8b89c058f6dbc11ad7d839868dbe30d06e34b2f commit c8b89c058f6dbc11ad7d839868dbe30d06e34b2f Author: Bjoern A. Zeeb AuthorDate: 2025-05-27 19:34:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-04 22:23:30 +0000 ifconfig: 802.11: fix a warning message s/can/cannot/ Sponsored by: The FreeBSD Foundation Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D50552 (cherry picked from commit 08471a76e3d27ffa9e2605dab0ff3c4968e7fef6) --- sbin/ifconfig/ifieee80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index 9f66281931c0..182266eb642a 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -5082,7 +5082,7 @@ ieee80211_status(if_ctx *ctx) memset(&ik, 0, sizeof(ik)); ik.ik_keyix = i; if (get80211(ctx, IEEE80211_IOC_WPAKEY, &ik, sizeof(ik)) < 0) { - warn("WEP support, but can get keys!"); + warn("WEP support, but cannot get keys!"); goto end; } if (ik.ik_keylen != 0) { From nobody Wed Jun 4 22:23:54 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bCMYl0sgBz5xk9w; Wed, 04 Jun 2025 22:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bCMYk1Z4nz44KK; Wed, 04 Jun 2025 22:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749075834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Yk7UzCU0uDVXykU8NQUcO1u5lxfnuU+xrze/0m8P9Q=; b=cw0YDtxv3jElMeZx3/tYqNx6/O3btiytZKlnB5hJ2b0BA33woZPx30UdMsk7oSQOYBBInq 3lzi8QvmR/zcl6O2H0CNHVlp+dmcXPGagisK+JR7L+eM5TQJgdRhFtv6KY7YOpdHchyjT8 uJDU9herjyy9c1ZKMHZCbVBDjDa9frHQ0FbEdv9nHJCRJ1QPaIIK5eHbaWjvhxW7wt9GX5 Fz3e6z3ye9Y/oo83nA55WFw7+1n08yxZ+oP3HnAm5MtOVezOR6E4FY9HveMHjsg0tbojB7 NYOLmrKbP37MxMY4Firi3oNBd5J2M9pE/Zh1XwicoB4hLQ74afOYmKj8BkiJnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749075834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Yk7UzCU0uDVXykU8NQUcO1u5lxfnuU+xrze/0m8P9Q=; b=Se8ns4BTK2UJYoGjr86Ubdm8uU3Kg+LYnon6Kq+xi4H4OQwnTnde5fAe40B11Ms3+oGD/d OqVATVDjsM4bMl3N8gUjcavbcOA07Z07HcJgcGVsMC8F3svW77AEjRLs1AkC9hzwnDb2v0 9Ijn8a8Wlnt/myCtsAkieD9iKJ6E0ePhi01w+VPpM0oHhlhLvZBm4wZFukH/tqYOYrzbIc 4bVy0CBMYK7L8xoFXm1JuU2xSNkSaCLXVuf8fbQggmMkOoHeLh5fNlVjECo710Wh54jCxT e1ZOD/UrXI43GWs8xgtaf8Gr/MorIzL0DmROstaQGDs+GTDeD77B/i2q1ZmKeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749075834; a=rsa-sha256; cv=none; b=T/s8Mkbmb5hawCAV842Rnr+8upGeBPgIeLtMxZ0MhQfdwn2dYMhn+Qsau1KutW3f0ONHrl 8PDPyxMNFEUJqGvJu2hw4y79Z9Tntt37TQin7g2Q93P1mVy0z2oWGekHOTHWtCSiPiJ78W HpDooP14wx0kOEP9itm7mDxMdizs3MjidPIxkNGacAoeK4wUxoholPwXt7PCpSK+fdMVrB UaWMNV+SWnE1W2EoQeLSXIqddJDIqQS+rtlj53UbYhKVjzVZZCUa5qaCT3nOHz84J97mAV 5JFJ2czDbNP/VU+JCXawsVE7muTR1RtitXOh3nXygPekDY8TAoekfeIoUav7cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bCMYk0xX5zjtG; Wed, 04 Jun 2025 22:23:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 554MNs05037744; Wed, 4 Jun 2025 22:23:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 554MNsSj037741; Wed, 4 Jun 2025 22:23:54 GMT (envelope-from git) Date: Wed, 4 Jun 2025 22:23:54 GMT Message-Id: <202506042223.554MNsSj037741@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0a2e5ab96a7d - stable/14 - net80211: make sure to not start a BGSCAN if not enabled List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0a2e5ab96a7da51690f38d962305214e2973989d Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0a2e5ab96a7da51690f38d962305214e2973989d commit 0a2e5ab96a7da51690f38d962305214e2973989d Author: Bjoern A. Zeeb AuthorDate: 2025-05-24 17:01:59 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-04 22:23:30 +0000 net80211: make sure to not start a BGSCAN if not enabled On drivers not supporting background scanning (not having announced IEEE80211_C_BGSCAN) we repeatedly have seen scanning issues and BGSCAN was "on" according to, e.g., ddb show com /a. Turns out there are multiple problems: (a) the ioctl scanreq code can pass IEEE80211_[IOC_]SCAN_BGSCAN in (ifconfig wlanX scan will do so by default). That flag ends up on flags in the scanning code which have no other checks, and we are doing a BGSCAN. So make sure BGSCAN is announced by the driver and enabled (and it's STA mode for the full check) or filter the BGSCAN out. (b) ieee80211_bg_scan() never checked if background scanning was available/enabled. Do so now. (c) ieee80211_swscan_start_scan_locked() as a consequence of (a) would start the BGSCAN unconditionally. Also check for BGSCAN to be available/enabled here. Lastly, we should no longer reach ieee80211_swscan_bg_scan() without background scanning being available/enabled, so document that fact by placing a KASSERT. That will also help in case future changes will open a new hole or there are further which I have not noticed. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D50513 (cherry picked from commit 32af70fae827ecab34e995b49ea7656ea6e70608) --- sys/net80211/ieee80211_ioctl.c | 12 ++++++++++++ sys/net80211/ieee80211_scan.c | 13 +++++++++++++ sys/net80211/ieee80211_scan_sw.c | 8 +++++++- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 7447e3a05ed3..63f61ede1d7a 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -2600,6 +2600,18 @@ ieee80211_scanreq(struct ieee80211vap *vap, struct ieee80211_scan_req *sr) return EINVAL; /* cleanse flags just in case, could reject if invalid flags */ sr->sr_flags &= IEEE80211_IOC_SCAN_FLAGS; + + /* + * If the driver does not support BGSCAN, or BGSCAN is disabled + * do not allow the IEEE80211_SCAN_BGSCAN flag to go through + * to avoid accidentally enabling BGSCANs. + * Also if not STA mode [see ieee80211_vap_setup()]. + */ + if ((vap->iv_caps & IEEE80211_C_BGSCAN) == 0 || + (vap->iv_flags & IEEE80211_F_BGSCAN) == 0 || + vap->iv_opmode != IEEE80211_M_STA) + sr->sr_flags &= ~IEEE80211_IOC_SCAN_BGSCAN; + /* * Add an implicit NOPICK if the vap is not marked UP. This * allows applications to scan without joining a bss (or picking diff --git a/sys/net80211/ieee80211_scan.c b/sys/net80211/ieee80211_scan.c index 04fee33f48f1..e5bd8d76b260 100644 --- a/sys/net80211/ieee80211_scan.c +++ b/sys/net80211/ieee80211_scan.c @@ -428,6 +428,19 @@ ieee80211_bg_scan(struct ieee80211vap *vap, int flags) // IEEE80211_UNLOCK_ASSERT(sc); + /* + * If the driver has not announced BGSCAN capabilities + * or BGSCAN is disabled do not attempt to start a bg_scan. + * IEEE80211_F_BGSCAN only gets set if IEEE80211_C_BGSCAN + * was set by the driver, so no need to check for both here. + */ + if ((vap->iv_flags & IEEE80211_F_BGSCAN) == 0) { + IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, + "%s: BGSCAN not enabled; not starting bg_scan\n", + __func__); + return (0); + } + scan = ieee80211_scanner_get(vap->iv_opmode); if (scan == NULL) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, diff --git a/sys/net80211/ieee80211_scan_sw.c b/sys/net80211/ieee80211_scan_sw.c index e1d6b2779cf0..c85bdcd5f78b 100644 --- a/sys/net80211/ieee80211_scan_sw.c +++ b/sys/net80211/ieee80211_scan_sw.c @@ -201,7 +201,9 @@ ieee80211_swscan_start_scan_locked(const struct ieee80211_scanner *scan, vap->iv_stats.is_scan_passive++; if (flags & IEEE80211_SCAN_FLUSH) ss->ss_ops->scan_flush(ss); - if (flags & IEEE80211_SCAN_BGSCAN) + /* Only BGSCAN if enabled and requested. */ + if ((vap->iv_flags & IEEE80211_F_BGSCAN) != 0 && + (flags & IEEE80211_SCAN_BGSCAN) != 0) ic->ic_flags_ext |= IEEE80211_FEXT_BGSCAN; /* Set duration for this particular scan */ @@ -339,6 +341,10 @@ ieee80211_swscan_bg_scan(const struct ieee80211_scanner *scan, // IEEE80211_UNLOCK_ASSERT(ic); IEEE80211_LOCK(ic); + KASSERT((vap->iv_flags & IEEE80211_F_BGSCAN) != 0, + ("%s: vap %p iv_flags %#010x no IEEE80211_F_BGSCAN set", + __func__, vap, vap->iv_flags)); + scanning = ic->ic_flags & IEEE80211_F_SCAN; if (!scanning) { u_int duration; From nobody Wed Jun 4 22:23:55 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bCMYm0kzYz5xkF8; Wed, 04 Jun 2025 22:23: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bCMYl1zcTz44FS; Wed, 04 Jun 2025 22:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749075835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6nc/eyYXUmOVFlp5D22muqosUfjpNd6Iytw6HqYTjsg=; b=wazpSF7/yffpMCpcszag3aHNlV6vQbJmrMmf5fA7G27HDN2/pp8eg2JvV0wXj9pByUF6NS ghFJNHJXGlNuHgYs/jLNS1bVBZU0b/oz5alhuXLYC4yb4rzPPyAfqhSJNFkUyg1I72degf 778nBSffHslZ3aY7H1H5Qr6FUqo4AnWgbs0NYLWQw/+vDZPmkmcMo6iUBe/wULVeskcgko 8YP5dS1JfpGn5VV4cjRyheuT9UluG5fdUANEh0zTyFTC/lPFzDZeyUyjjmRDYfy74Jwk5K fHXc35yD5R89OlCVsRHlTf1DXmhTyu+1n01aLeflWS9F01crR8cV+hs1a1m+YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749075835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6nc/eyYXUmOVFlp5D22muqosUfjpNd6Iytw6HqYTjsg=; b=laUKoxOfh941k85LJL4JBfuyym0dAdsLTvxxQ7kDDuM/IuNMo9B2KpE3GDL8IrAP54QyQK scKRuHxRaUHnPt4e4GnB3CXOkct9CpRmY4NhSycHO3Ox1tLnOnX6eGFF7XXsM6+L99paMm uhm+GH3ipNxjHj6YJgbeEMLO2puin7ezEhsIZfPJT8unhL1a5njMlnXcBiHIeauz4ucQz6 3AWyFpSTQA7YFKMVLQNckrHVk1jZbFOcq7Frppc8gbMaTkf6fA1zuJ3lfxEYm1gXxyCL0K MnSn9YTS1kHDGDbgYGN1gbFttBfiBs8/OT2VRYemIKCPUm97eNUu9zxc8YzbGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749075835; a=rsa-sha256; cv=none; b=vEfHYomFUxJ0o5ax2SBu5z/QIfNnyrMHXJ0kPQXwmPJ1psOX6+uS/IIvW0oupKJYyjtbEr U7nJlO+sSDXR+lP/vK+6nKxDwaj09g9SsKC5mPLQ6jdeWLZIt8XMsO/J8jUJxOKGR3kMoo /RynJJDUMrhLtoei9d7KkuDQmOZUBRisU0+xMiiBqCeKdY9T0F7dOBgyljK8MhONd03miU 4vnSwM/om1YE3LSX6vQc6+xibVNoNcZZ6ihkY9mJgD2mKb0Nwoo26C1QuFPl5ZylA2Mk4l IRBvdkKTVSN6fMVuo4G3tBDhcMsbXZwAsssC0LfOIjm65bOghcYBwrzz/wYzyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bCMYl1WwJzjtH; Wed, 04 Jun 2025 22:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 554MNtgC037785; Wed, 4 Jun 2025 22:23:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 554MNtxd037782; Wed, 4 Jun 2025 22:23:55 GMT (envelope-from git) Date: Wed, 4 Jun 2025 22:23:55 GMT Message-Id: <202506042223.554MNtxd037782@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6573b7db7143 - stable/14 - LinuxKPI: add struct_group_tagged() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6573b7db71438f852fb80f10b3f5539f596f23f8 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6573b7db71438f852fb80f10b3f5539f596f23f8 commit 6573b7db71438f852fb80f10b3f5539f596f23f8 Author: Bjoern A. Zeeb AuthorDate: 2025-05-02 20:10:38 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-04 22:23:31 +0000 LinuxKPI: add struct_group_tagged() Restructure struct_group() into a wrapper around __struct_group(). Various callers have arguments annotated as /* no foo */ so try to add all we can find. Sponsored by: The FreeBSD Foundation Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D50157 (cherry picked from commit 54d0e1772fb6b83d72725764e0a5d3ead8337673) --- sys/compat/linuxkpi/common/include/linux/stddef.h | 26 ++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/stddef.h b/sys/compat/linuxkpi/common/include/linux/stddef.h index a3bc6b13765e..d04a5a4bf516 100644 --- a/sys/compat/linuxkpi/common/include/linux/stddef.h +++ b/sys/compat/linuxkpi/common/include/linux/stddef.h @@ -5,11 +5,27 @@ #include -#define struct_group(NAME, ...) \ +/* + * FreeBSD has multiple (vendor) drivers containing copies of this + * and including LinuxKPI headers. Put the #defines behind guards. + */ + +#ifndef __struct_group +#define __struct_group(_tag, _name, _attrs, _members...) \ union { \ - struct { __VA_ARGS__ }; \ - struct { __VA_ARGS__ } NAME; \ - } + struct { _members } _attrs; \ + struct _tag { _members } _attrs _name; \ + } _attrs +#endif -#endif /* _LINUXKPI_LINUX_STDDEF_H_ */ +#ifndef struct_group +#define struct_group(_name, _members...) \ + __struct_group(/* no tag */, _name, /* no attrs */, _members) +#endif +#ifndef struct_group_tagged +#define struct_group_tagged(_tag, _name, _members...) \ + __struct_group(_tag, _name, /* no attrs */, _members) +#endif + +#endif /* _LINUXKPI_LINUX_STDDEF_H_ */ From nobody Thu Jun 5 00:35:19 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bCQTM6vpyz5xtS0; Thu, 05 Jun 2025 00:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bCQTM5HDrz4Pjh; Thu, 05 Jun 2025 00:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749083719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+tfUk7buCDTYoo7c/hW3cfHtuP06cafAufp508NJDVo=; b=Y4xQk/A2T+srQ4xxhadMOIiI72mLsGBjvkqr+Zwhpq6xwEOxMMCmt25fNcMfaWMR+LtEWQ tXdLCE2IPXhGyMhE4lYQyUikaB9usKXQggIpcHxjMnkwx2aCDXGj/QPmIAaBhVJPBKAw3z Bv7uo5q1cia8kO1k7OZEvndiWnTRxMMlsd0y3Jset+r+Nj2ahBZ+kBZ8hVHbLA9nFyIpcw gWYWUjILzuI6MEDixq3wiyKkFbyNc1ZAnmHI12hjhaRMeMdclKe8udt9z/A/eo57rU200D wtpZ1gjZN4pW3bY6Ov9mAK3NGNr6txw9n3HUDe0Yh2YRaBY09iS2z05WhNXb8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749083719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+tfUk7buCDTYoo7c/hW3cfHtuP06cafAufp508NJDVo=; b=ONnVzB0T+rmcw9TQr7AG85g3bcqIB7NO5mFm570sI/x5s1y2LVtjUrEPSji36uCQYYUKPL eA9pOzeQniPq+JxbOZ/MS/mZ0x23RMQCoW3w72m8pwAZBjqe5s3YkaqnV+oOSHhuSpx87D hd6BjNDGQIaaInBXIAY6ev8KhYIvW4Q1OnprYghs2YBoAJMmOjc/FphGrPw9vm3dpdlS2x y5+/uYds5hm7izAh8XINrBgoenO5YcAmWT1bSvuR7IWPVroUGBjFts2P6G25Xx8ZsPQzOR Nv8mm0AyXwJG16rnEeflh7H1/r9GVinshi64dQYCXrXoX8r1N+LpHNZsAAWw8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749083719; a=rsa-sha256; cv=none; b=L5PDGVBt5AQY8/yYAJKTYXzxQt4SZ5ikiXRAd6OE4bT9UqsM3mZGdWrA76A/SA/gK/kbF0 kfZ7qi66JnBCBo3GRAEGSIKktw16z0SADHPC5IT+hMFNg9aC6sdJ92XU4anX4IxTaPGxZF bAjdSXzy67qstPwLJyrX4fyezLwwn9TF79D/9Uc2V+ZHYmQRteCwpAOrPO8U0gTQWk7rbE 83fnh+KPUOCK3dff4sYH0Bfu/V6n4Qe2YqfaHs7QU0E5AMs8/0t0WamwA9kXzxeWFR5EPX JihNtKb8UtCvghrB6OyWeTGODtJ1Uo8d9Xd7Y+VdoqkOjKvHtQPsjex79D6Z4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bCQTM4spcznT4; Thu, 05 Jun 2025 00:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5550ZJq1081561; Thu, 5 Jun 2025 00:35:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5550ZJ9C081558; Thu, 5 Jun 2025 00:35:19 GMT (envelope-from git) Date: Thu, 5 Jun 2025 00:35:19 GMT Message-Id: <202506050035.5550ZJ9C081558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 84074e207ee3 - stable/14 - kern_sig.c: make pt_attach_transparent global List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 84074e207ee30928b304d918a46a1150a44a021a Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=84074e207ee30928b304d918a46a1150a44a021a commit 84074e207ee30928b304d918a46a1150a44a021a Author: Konstantin Belousov AuthorDate: 2025-05-27 21:08:12 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-05 00:35:03 +0000 kern_sig.c: make pt_attach_transparent global (cherry picked from commit b57eb80596651c1f5972f3b6cd21ef95cc95ac85) --- sys/kern/kern_sig.c | 2 +- sys/sys/signalvar.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 84bac9fc77ed..0c0be79b05dc 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -176,7 +176,7 @@ SYSCTL_BOOL(_kern, OID_AUTO, sig_discard_ign, CTLFLAG_RWTUN, "Discard ignored signals on delivery, otherwise queue them to " "the target queue"); -static bool pt_attach_transparent = true; +bool pt_attach_transparent = true; SYSCTL_BOOL(_debug, OID_AUTO, ptrace_attach_transparent, CTLFLAG_RWTUN, &pt_attach_transparent, 0, "Hide wakes from PT_ATTACH on interruptible sleeps"); diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h index cf83af1db226..02b7bd6770ca 100644 --- a/sys/sys/signalvar.h +++ b/sys/sys/signalvar.h @@ -272,6 +272,7 @@ int __sys_sigfastblock(int cmd, void *ptr); #ifdef _KERNEL extern bool sigfastblock_fetch_always; +extern bool pt_attach_transparent; /* Return nonzero if process p has an unmasked pending signal. */ #define SIGPENDING(td) \ From nobody Thu Jun 5 00:35:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bCQTP1mKlz5xtWH; Thu, 05 Jun 2025 00:35: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bCQTN6Kh1z4PSl; Thu, 05 Jun 2025 00:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749083720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wDc9/h6t1A48kpMiRFP3ySJkoFJ/CjDvThUD9jO4fb0=; b=x5kD5QDlIxxrGx4ahn184tE7XarseygwKtMPEN8Ib03fxlOd0nafWVDe+6OGWVHCwsa6Gd jJIG7IwKweKIT2+n+IQgwbI/VSZH6BHEgg4zHI1X2Rh5fxY3eJEo5L3BGgbANlXEDlz/q4 Qx1/ZwTqOJs3wyHOyRwrm3ntY44PmRcvbNsSK3di53Ok1UgHREuOH/KVUs2ZoKZ6i3sSHK mXkMefUA+UZqq5/SXinAec8dXTiLEYKGcFDZupncixELPnRSRfONuGoLM4hdLKv9vZ4XeO +8NuDK450sgvAOu0YB8X66xebZm8HIg3vuviLfErwHEHxpUys0S1R8xrYl5gIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749083720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wDc9/h6t1A48kpMiRFP3ySJkoFJ/CjDvThUD9jO4fb0=; b=PECAkSdgHTp1k5BcfNquPYSs9XgCRupFA6cJtUobSrRCNKpVXEJDvz73MxFn4LFnzDBJur hG16HJg/9E27lFjAPNoOwDtJz8KGc87GzJWrBl6BYLCg7zn+uE4hie9TKn09OX1hpTXQqn b+VfdzCOYw9J7pQkKav3BmZye49mQl9UIzH/iX2n6h445dEpZLa2b19PlhN8RLiZHkBXO2 6+afR75fQD39XMHbqs1wOEgpAB6EkCm4txhzgI+qi6YoZOEXTI4vuNumYOWlkJEzgBcrt3 UURgwXpr6i7KCew6BxdnpwgbnDxUq16NTI9Bm2Ne85VjZFKvDTdbRMxJVKNYeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749083720; a=rsa-sha256; cv=none; b=wIk34Xty/6khtY8Ch67eNwWhndWJVxRXb8RU2atdby2UB8msAvLww9TkUaoImHLxGyK3Ge F1Ly9/jhE2UEI7VYQrSBvKmNz0ezuMmBaAoNnFh0TqeUMlKdGJmxoJYAvriQlH23KB9J5S MK1Z2UGrXRRIKwCkc0o0uKXDpZtVOmdnkYleB8WXHuajoHnlz1uaytluPNQQOESKQcxHzQ DlqgZtIwDj+JIn12GLkctDnDA6MN+ILWTfPcnDRWSbCszm3aVzvcOYz0vQ4gb0sEcRov23 VHLuCMhye/VrbNq7disX4FPRlnw//MaRy/WAnqyCq9Kgg5L7ni4b6brzr0zkCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bCQTN5qN1znCG; Thu, 05 Jun 2025 00:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5550ZK5x081599; Thu, 5 Jun 2025 00:35:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5550ZKJi081596; Thu, 5 Jun 2025 00:35:20 GMT (envelope-from git) Date: Thu, 5 Jun 2025 00:35:20 GMT Message-Id: <202506050035.5550ZKJi081596@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5e4d56259e9f - stable/14 - PT_CONTINUE: if pc is set, mark the thread state as modified by user List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5e4d56259e9f1d18a3c65fadd2ff7c6ca03d962a Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5e4d56259e9f1d18a3c65fadd2ff7c6ca03d962a commit 5e4d56259e9f1d18a3c65fadd2ff7c6ca03d962a Author: Konstantin Belousov AuthorDate: 2025-05-27 21:08:43 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-05 00:35:03 +0000 PT_CONTINUE: if pc is set, mark the thread state as modified by user (cherry picked from commit def0c056d3380b91ca7422d0a8727c6a4c8f6dae) --- sys/kern/sys_process.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index d4c0737a4769..5f647961d676 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -1239,6 +1239,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) (u_long)(uintfptr_t)addr); if (error) goto out; + td2->td_dbgflags |= TDB_USERWR; } switch (req) { case PT_TO_SCE: From nobody Thu Jun 5 00:35:21 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bCQTQ3j4hz5xth7; Thu, 05 Jun 2025 00:35: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bCQTP6wYKz4PSs; Thu, 05 Jun 2025 00:35:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749083722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vSV1NwMb6ywxgG5eJLnZvCRHRYGdlAsd8aFQl+Kie/s=; b=JCXIB83SJ8H0ntC0CnDIOR+58s67orCFCq2nW5MVmkGfXZ/f0ETh6DGCd+8EsNNR2knScJ hFeX4xpYcTbRY05Ieqvp+R5pZ++A2cNVglsGxJMN8KjShaamTGdeNU06t7GwBFWxBmgrtN mLHtAuJoo+c1+S2xf7t8Ch5eIGIL7QC2I/kQ9QpS8O6BCAQjCQr7m+GNgjUxlF2J7dSvSL Y2UqiO/PGqf0sQnKKfo5Ojid0Eg11perSNwHSPYULemDSFDH0sSH82hFo6jY0bTVinRAbE /H9a+4xod+WCoDzQVAtqGTgcyJMsXVRJAwDlmqR3bxn01CS041nitmFWETfo+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749083722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vSV1NwMb6ywxgG5eJLnZvCRHRYGdlAsd8aFQl+Kie/s=; b=rzLZ8pFXw2oy3mrNcBCj+ajEFSwcny43ebIN9umUPn17k/22VhBeNU69vFRQ69rjUi62l7 11Eqn6f/OSKWUI8dhfJ+VZ1S1iQiqOrNqw8p5JlAVRWX8JRjH39CkVr2hGHrZx0GYgdcxa J62Q9l1o2Qhdw6p7kRQzu63WKTEPTsKhtiIoTpByESIU2LTSUu3/Mcbzs8C/GVXz6wz+4V qHlNp83p1zNvCj1zwoYX7/G5s3ITZiu9myJfNvxKZBYdO9JOIwEr21/53mPLBigRuKVaQf ssqK1iUIHPMDfQmIs26Zi1wlv3DkcyaMFQ/tuV2xpEnXCQQ35zca0pTsZs0IHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749083722; a=rsa-sha256; cv=none; b=p46SQADAA6XFnSRcwDqRIaEa12tEykR0+RsIvS7c7ZI1tGrsI4/jebOAwpem7Wfe8QIQW4 SRste5edzTeKOlZnCx3TvaGC0XvOwAbRjJcjt6FBVy8+N2Dck14wREB5HIGsi8q2Tn77n0 1TPRbgs+cPlbIKVvRTpeOD+FuUWSxqIhMmBj1VvydD65WC8i1GbV1wP7BjvtnI0cVyPVTr 2bcTQnURD7tsJ+X3MMfdtuqZcW9NWfhb1kCfw25jteJM+DJ2Ejr2GIc/bVSEe0UHyEvNzt 6cCOs1mFPp7gEDLRXMimZ8n5sqxP8AGjm7B2l+iOE2FyCFoRyeabkHm/Tco23Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bCQTP6R7hznQj; Thu, 05 Jun 2025 00:35:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5550ZLsK081632; Thu, 5 Jun 2025 00:35:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5550ZL2O081629; Thu, 5 Jun 2025 00:35:21 GMT (envelope-from git) Date: Thu, 5 Jun 2025 00:35:21 GMT Message-Id: <202506050035.5550ZL2O081629@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 730405499ecb - stable/14 - PT_CONTINUE: undo transparent attach consequences List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 730405499ecb63f84b0f0aa9a866dbfd1250e75b Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=730405499ecb63f84b0f0aa9a866dbfd1250e75b commit 730405499ecb63f84b0f0aa9a866dbfd1250e75b Author: Konstantin Belousov AuthorDate: 2025-05-27 21:09:18 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-05 00:35:03 +0000 PT_CONTINUE: undo transparent attach consequences PR: 287050 (cherry picked from commit 99976934274de6fa19f049a0b6eac10856710f96) --- sys/kern/sys_process.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 5f647961d676..4d1d0ef21a15 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -1352,6 +1353,27 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) if (data == SIGKILL) proc_wkilled(p); + /* + * If the PT_CONTINUE-like operation is attempted on + * the thread on sleepq, this is possible only after + * the transparent PT_ATTACH. In this case, if the + * caller modified the thread state, e.g. by writing + * register file or specifying the pc, make the thread + * xstopped by waking it up. + */ + if ((td2->td_dbgflags & TDB_USERWR) != 0) { + if (pt_attach_transparent) { + thread_lock(td2); + if (TD_ON_SLEEPQ(td2) && + (td2->td_flags & TDF_SINTR) != 0) { + sleepq_abort(td2, EINTR); + } else { + thread_unlock(td2); + } + } + td2->td_dbgflags &= ~TDB_USERWR; + } + /* * Unsuspend all threads. To leave a thread * suspended, use PT_SUSPEND to suspend it before From nobody Fri Jun 6 00:00:08 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bD1fJ5L31z5x55b; Fri, 06 Jun 2025 00:00: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bD1fJ4QhVz3Qxv; Fri, 06 Jun 2025 00:00:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749168008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7wSkjI5SH3nZRAcs4LQLt+3aO+Mscldwn9cV/BbJ0Q0=; b=eRIiscEBlb7BZb/fSQrMAz9Mf4AIB/tXlxsNF7u7Y8t+lxT+yP6EN/AH7H/0Mh5f0fYa9r X4T4s94lbllG0H6P9Hz7f9y8WSpvPmJzgrnhunsAktxQntcp2MmvRzIfa7M6nvDd7p1/iD RtRZpBsFAJoG5mEiypNzqZuJ+HISEqj4OxJp8m/xgNvWAgwRwdyIz3aZs2Z1VGOnuXy7s/ 2tPN3OAzrsc0seTkgmNuudJeto2b3SDm6yXZ7pgq+sr5YXiB+WHUFFsYQsRkDUAhpfR4D4 1LtNiwRBA6SiRLfsa2AsRWObZQJ1xBCmw21VHizojuv1dkGf+xO6/lfs+UDeJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749168008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7wSkjI5SH3nZRAcs4LQLt+3aO+Mscldwn9cV/BbJ0Q0=; b=f4ga4xpS5OpHxSsCo0lKj9VwZ5QPV5mBJVa5IQnAGR3T0IAeBPMilKYPXOIvIKj9s4f72E q9MaLongW7NtK0BvS0OufblvHyWUTZ9ywnC2+FOUGLE/rSfTpBVp7rsvjgeMtrd4BG5CfI qL/4DEvIw6I+Y4IL7RgAI2J17o2GEM0YfFTGQ6slkiROFN7oVjJKAia6cVZQZSR5VWVthT LWHg49zmyL+rYejTbg/LwSvCcIulWxgEX+dPntSQMtBpS5VCf49HkRJi1aIdpvOMBG0VSs BcILGXJyRU5zSsFBNcdLHx+OxhKC/KNrbZE/ZzhIUufXsxND9WtTddB5g7KdzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749168008; a=rsa-sha256; cv=none; b=BZlUeHP2Hem1F7Y+ZkreSoSlzQkqmbRTCIe+y9CxxgKlStsVMtfQVyLjDAimTittJ1ypZ0 w7XOIMPD+yiMRTh+GJXOufmKPYKmJ/0mtDgBPxQ2+iZ4gAJ7qTgXGoVQcagUpZFsfp41am VEugF8NELbNeKtnVRN+h72e63drlCBB+n4RPkk3Ymbq4S5dlrr75ictPUH1D0SrO++dNda 3J+SKEoxduxv7K49zR9xslh8U0BrOx+9wdioJNTJF+RVLHjR5rtjgyWWJ9TqNRQzdsjXeT Mn/Lu2utrprQC9hVM2y8aqxoCkBK/iMWNIO43MDM9DRSu6bF2ZFoHzdxe/PqBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bD1fJ3ftYzWfY; Fri, 06 Jun 2025 00:00:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 556008pp013027; Fri, 6 Jun 2025 00:00:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 556008L6013022; Fri, 6 Jun 2025 00:00:08 GMT (envelope-from git) Date: Fri, 6 Jun 2025 00:00:08 GMT Message-Id: <202506060000.556008L6013022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 8c9ce319fef7 - releng/14.3 - Update in preparation for 14.3-RELEASE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 8c9ce319fef765890ce518cab85d3a470b669849 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8c9ce319fef765890ce518cab85d3a470b669849 commit 8c9ce319fef765890ce518cab85d3a470b669849 Author: Colin Percival AuthorDate: 2025-06-06 00:00:00 +0000 Commit: Colin Percival CommitDate: 2025-06-06 00:00:00 +0000 Update in preparation for 14.3-RELEASE - Bump BRANCH to RELEASE - Add the anticipated RELEASE announcement date - Set a static __FreeBSD_version Approved by: re (implicit) Sponsored by: Amazon --- UPDATING | 3 +++ lib/csu/common/crtbrand.S | 2 +- sys/conf/newvers.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/UPDATING b/UPDATING index 3227b70ac69c..75c40967a1ae 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,9 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20250610: + 14.3-RELEASE. + 20250419: LinuxKPI alloc routines were changed to return physically contiguous memory where expected. These changes may require out-of-tree drivers diff --git a/lib/csu/common/crtbrand.S b/lib/csu/common/crtbrand.S index a06f72daa99d..86e9d648538e 100644 --- a/lib/csu/common/crtbrand.S +++ b/lib/csu/common/crtbrand.S @@ -43,7 +43,7 @@ .4byte NT_FREEBSD_ABI_TAG 1: .asciz NOTE_FREEBSD_VENDOR 2: .p2align 2 -3: .4byte __FreeBSD_version +3: .4byte 1403000 4: .section .note.GNU-stack,"",%progbits diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 1ebacc6cc176..f3815c0d9b16 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.3" -BRANCH="RC1" +BRANCH="RELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Jun 6 00:00:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bD1fT5X7Fz5x5K9; Fri, 06 Jun 2025 00:00: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bD1fT4GkJz3RVj; Fri, 06 Jun 2025 00:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749168017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3vgPqefs0Y6A9de6HnrSVxga+2oT0Ym16Oy6GnG1Mlk=; b=P3lrZM91CSVJ4QpoBMYR51w18OTdigIeBvsHsItScrmdDBFGNqpL8pnM52JP+DfakKZb3t 9UMg7MwoO09L5tgAZ9BGdiwQDAO5xqvnxcRXbXQnhFZZOXJonT/805UxdinlcceZ1rdos0 kkdvYWojqV0gsx/apecRQCpt4OOXffJhKI4ebvaokPlMEeX2qQ5JELygWNXj3Xo/hM+2yU HeT3Uc9XbipUbVTiui28i/VQZvNQZixBUKoOgYEIMo8QpoYPhEl9nuSwAxIhAjJylD+rE0 nnyKmgkWjS3m0vBuRwTxuZD6glT7frcKdr3ukrrfLj6fLMnjrBBSviuei4NTMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749168017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3vgPqefs0Y6A9de6HnrSVxga+2oT0Ym16Oy6GnG1Mlk=; b=WWfUkdHj6t++Ok7vFpVgLkT5Y6xdoywa4E2gthAzRXvYSYf0WtV/7tKYlPp1lne1R7TRyi IZgbIbTMYFH1dtBIo45wsIcgIar8My6ndeTmY2xbmuy2HoX/uv4g6RvgcTlbg+wFsq0xFA 0EVfUFLHkI6pZy/36mJ0ap+yKsN61yAuvMbnL4qO0ghHRhaiIvY8F/UZ80YD7qNuNY8YUa uM0uLEyhAN+H3GmF9ylMP6bs7PwhahknLZGvtqcAl1GMErmxRxJdeyt9ekqq7/k4L6aquK CdHXr6Oh1+0fBKM8+l3teLkiT4rqxseaYHgG6nLIK3H/kHVBF5u0+9NQCqX/nQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749168017; a=rsa-sha256; cv=none; b=Ah6eLV2soQMsFRVgfqsGsZbvy8s6P070tYW7VHDTPhhl+hkupbARHnXdbqyqTa7KUHL95j l5IXiFAvUGnjkX9CAFXNQmadbKPwZyq6XsRZ7V/4ZsGeZa6stAiwE74yz2txZwVrmwx/x/ Alu8uo/iXq2kiLOJ3Gm5CTbaLlzjSesY/Csf6LDhdG33MactayHwGdQwSUothC5HIJT2Ix bIreR1HozWPlHpVxfe9KKRW8tVPiI7Y2iA1J+IAHU4oiB/RQr407PtCqFG3SJcOe+JWUJz f/kzGAIVLw3YPAnaPGQhsEKuPnoeWO6ymDBd2hZQije+omynxJWuzMXNAB8WVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bD1fT3kRbzWbn; Fri, 06 Jun 2025 00:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55600HXa018011; Fri, 6 Jun 2025 00:00:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55600HxO018002; Fri, 6 Jun 2025 00:00:17 GMT (envelope-from git) Date: Fri, 6 Jun 2025 00:00:17 GMT Message-Id: <202506060000.55600HxO018002@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: ab74684c4deb - Create tag release/14.3.0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/tags/release/14.3.0 X-Git-Reftype: annotated tag X-Git-Commit: ab74684c4debaec81dd8a1e57116cbd47f593e04 Auto-Submitted: auto-generated The annotated tag release/14.3.0 has been created by cperciva: URL: https://cgit.FreeBSD.org/src/tag/?h=release/14.3.0 tag release/14.3.0 Tagger: Colin Percival TaggerDate: 2025-06-06 00:00:00 +0000 Tag 14.3-RELEASE from 8c9ce319fef7 -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEglY7hNBiDtwN+4ZBOJfy4i5lrT8FAmhCHLIACgkQOJfy4i5l rT84jQ/8Cu/Ohv0SySlrYsT3hWukCL2cZwjUOkFc2PAuJAEimlLUch4qExgjj+Ex KxVhP6wym3fEnBNy2YMOowCi0KxT9LNFDMgv7CQ5YxwcyA2fMEV6buVzos9n8TR6 o/S0neDz8l2n00O/FEQqJt9CHLDos0bcNc9eV4VJkyARWebYno53r/wy1bFYQcZa QAGv7iqqaB8Pkw3MzwEQ6vs3JOAmgxU5+3DcohifTlJf78MAqTTxywT0pJ2AXhMP VG+oCehKxWOzrXLxKC7zq6D6dZaqLlzDfFqaehRxDEzmDcwyZnDjkJDquJMO0M88 6tzr0NlR5SqxbC7aD8YUGAFBLS+jzTzDpkrviE400zm+5E314L3Pl1UDWl8J1jqq itKhn874AlZy/zZwaHf0+86bxUZQa/xFGrNPFK7w/06QUUFkdJBW7s8ZT24b3AsX UN2TP0g+1jh+GbZQGYcwhFvIlnVgF+Yq90DF3aikKPfsVSXZKl588bdQZ+xPnjfg 8y1H6CcA9PoGUSrArnnxBL+odsauks7ejqwEadYJN76k/GQVSnU2TJshqxjX+wC9 o/Y90CcuxXH2Gir6nERIcxbwKAxV0v4E1mT+4Xvtzw5s072zMKTdeNpl+aUL7L6I IDUyCwIL1lCNelnjdxRvnUfTBBPE2PMpa6r1+IxyuPNlHKMUksk= =j4n+ -----END PGP SIGNATURE----- commit 8c9ce319fef765890ce518cab85d3a470b669849 Author: Colin Percival AuthorDate: 2025-06-06 00:00:00 +0000 Commit: Colin Percival CommitDate: 2025-06-06 00:00:00 +0000 Update in preparation for 14.3-RELEASE - Bump BRANCH to RELEASE - Add the anticipated RELEASE announcement date - Set a static __FreeBSD_version Approved by: re (implicit) Sponsored by: Amazon From nobody Fri Jun 6 21:21:22 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bDZ4g0L0zz5y22s; Fri, 06 Jun 2025 21:21: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bDZ4f6gj4z3mDv; Fri, 06 Jun 2025 21:21:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749244883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fjjsb0miMtYdZlMMFe3F6hfrKwqjzw/m0aR1RGLpADg=; b=a5D1VLoocK5+/oHhADpzRlE0TdSw6qqOwVnYa+eeyCDHoo/+oJg5hB04wXwkK6neSlF6M0 uXr8ebcVqdYBmShSqMTubAmuSp85zmdFFK1Pny5A+DScPwoPYTQMISOfCwidAXB2+aZRrG 2UH63YXc/h67KtOSa9fV4g8m82CPz82SWUPzK5Wsp5hWp0hr4NwDOxSNiNMsdwteQYMy/a SHQKw5q6EuI6gdTmI2SJANpgEPymOyNbB+9C8B95oxoSKtobYZmpsxbcEBFTksaYHbs9id XJsAmCqzIXiS6e5Ujr6HZBg8i5fSPo7ZlJ7yrL4YLespBClPZbBEOeHDKlvqyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749244883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fjjsb0miMtYdZlMMFe3F6hfrKwqjzw/m0aR1RGLpADg=; b=CBqsX7CafgwjWB9qbIpAz2CkInNuGx1s0HIQ9uZ1ve+AHTGplvWozmpaKAKDpo+SiZAP8y IuWRblydkb7EeTtPDvrL7DSXgI5He+Em0saTYKFXiHlbtrEjPPVpyFl1bGKpNLrzbrebGV Yyy4wQwdvIL5AmpYu1VrC9PV3M067hUKQvxmP84Ogfd3+k6hMKQ4eU1jdfnWwGPqGvEa7U Al8EandHTnaAKh2mbNBMZJdvow4F49fvszU83fPWzd2GZU1jRJLp/NFqEnsmc3yzzZiBvg am9AGJVCbAW38rJbGLaKcC/z0wpGO9BtQ0/ahtOFDpQNZd+NOP6z4AkGghx1jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749244883; a=rsa-sha256; cv=none; b=Uzg5HEmiu84kKzPt7In4+UJTziE4i25S1nYgdIgEfdyp3ll8XY/oU+oEDIbs9572C+72bM rBOtBHfc0ml3TlZlcL3+uJDLmCJN7+NjCvxGY3SBdxvbg/3nW82Ui8EdYcm5VZwB9fIu0o kufDU0VSIa0pQSomRN9mcY61weFx6pNYT8O/v9ISG+2DSG3vaBQHsbuIzNE/aUmaYN4x4H +m7NQOgrBELfBgVuoFZlxGfXP2dcI8NSnlOaxgbpcQogDW41KrPHE0I2ERh5TIkmWd5PL+ 7NvVFy8lum17yt5eHC0OesLNrxJ5wWwqWAr8KA85YsjwntKpLiASpyidIkKSfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bDZ4f624wz19wm; Fri, 06 Jun 2025 21:21:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 556LLMhq026557; Fri, 6 Jun 2025 21:21:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 556LLMEQ026554; Fri, 6 Jun 2025 21:21:22 GMT (envelope-from git) Date: Fri, 6 Jun 2025 21:21:22 GMT Message-Id: <202506062121.556LLMEQ026554@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 6f6ca5288060 - stable/14 - pf: fix panic in pf_return() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6f6ca5288060110c7385b9424e4729b192ed6308 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6f6ca5288060110c7385b9424e4729b192ed6308 commit 6f6ca5288060110c7385b9424e4729b192ed6308 Author: Kristof Provost AuthorDate: 2025-06-06 08:16:13 +0000 Commit: Kristof Provost CommitDate: 2025-06-06 08:24:48 +0000 pf: fix panic in pf_return() We (correctly) NULL out sk and nk before calling pf_return(), but that function still tried to use them to undo NAT transformations. Store the old port numbers and use those rather than sk/nk. This is a partial import of e11dacbf8484adc7bbb61b20fee3ab8385745925 (osport/odport), and the missing parts of bdea9cbcf2decafeb4da5a0280313efccc09e1b3. Direct commit to stable/14. PR: 287254 --- sys/net/pfvar.h | 6 ++++-- sys/netpfil/pf/pf.c | 31 ++++++++++++++++--------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 2f7e4b913c91..de18ead7281e 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1559,8 +1559,10 @@ struct pf_pdesc { struct pf_addr *dst; /* dst address */ struct pf_addr osrc; struct pf_addr odst; - u_int16_t *sport; - u_int16_t *dport; + u_int16_t *sport; + u_int16_t *dport; + u_int16_t osport; + u_int16_t odport; struct pf_mtag *pf_mtag; struct pf_rule_actions act; diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 8201d3e24db7..2ba2f2213fb7 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -333,7 +333,7 @@ static int pf_create_state(struct pf_krule *, struct pf_krule *, struct pf_krule *, struct pf_pdesc *, struct pf_ksrc_node *, struct pf_state_key *, struct pf_state_key *, struct mbuf *, int, - u_int16_t, u_int16_t, int *, struct pfi_kkif *, + int *, struct pfi_kkif *, struct pf_kstate **, int, u_int16_t, u_int16_t, int, struct pf_krule_slist *); static int pf_state_key_addr_setup(struct pf_pdesc *, struct mbuf *, @@ -3463,7 +3463,7 @@ pf_send_tcp(const struct pf_krule *r, sa_family_t af, static void pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, - struct pf_state_key *sk, int off, struct mbuf *m, struct tcphdr *th, + int off, struct mbuf *m, struct tcphdr *th, struct pfi_kkif *kif, u_int16_t bproto_sum, u_int16_t bip_sum, int hdrlen, u_short *reason, int rtableid) { @@ -3476,9 +3476,9 @@ pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, PF_ACPY(saddr, &pd->osrc, pd->af); PF_ACPY(daddr, &pd->odst, pd->af); if (pd->sport) - *pd->sport = sk->port[pd->sidx]; + *pd->sport = pd->osport; if (pd->dport) - *pd->dport = sk->port[pd->didx]; + *pd->dport = pd->odport; if (pd->proto_sum) *pd->proto_sum = bproto_sum; if (pd->ip_sum) @@ -4758,6 +4758,9 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, break; } + pd->osport = sport; + pd->odport = dport; + r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); /* check packet for BINAT/NAT/RDR */ @@ -5045,7 +5048,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, ((r->rule_flag & PFRULE_RETURNRST) || (r->rule_flag & PFRULE_RETURNICMP) || (r->rule_flag & PFRULE_RETURN))) { - pf_return(r, nr, pd, sk, off, m, th, kif, bproto_sum, + pf_return(r, nr, pd, off, m, th, kif, bproto_sum, bip_sum, hdrlen, &reason, r->rtableid); } @@ -5063,14 +5066,14 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, (pd->flags & PFDESC_TCP_NORM))) { int action; action = pf_create_state(r, nr, a, pd, nsn, nk, sk, m, off, - sport, dport, &rewrite, kif, sm, tag, bproto_sum, bip_sum, + &rewrite, kif, sm, tag, bproto_sum, bip_sum, hdrlen, &match_rules); sk = nk = NULL; if (action != PF_PASS) { pd->act.log |= PF_LOG_FORCE; if (action == PF_DROP && (r->rule_flag & PFRULE_RETURN)) - pf_return(r, nr, pd, sk, off, m, th, kif, + pf_return(r, nr, pd, off, m, th, kif, bproto_sum, bip_sum, hdrlen, &reason, pd->act.rtableid); return (action); @@ -5117,8 +5120,8 @@ cleanup: static int pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, struct pf_pdesc *pd, struct pf_ksrc_node *nsn, struct pf_state_key *nk, - struct pf_state_key *sk, struct mbuf *m, int off, u_int16_t sport, - u_int16_t dport, int *rewrite, struct pfi_kkif *kif, struct pf_kstate **sm, + struct pf_state_key *sk, struct mbuf *m, int off, + int *rewrite, struct pfi_kkif *kif, struct pf_kstate **sm, int tag, u_int16_t bproto_sum, u_int16_t bip_sum, int hdrlen, struct pf_krule_slist *match_rules) { @@ -5281,7 +5284,8 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, if (nr == NULL) { KASSERT((sk == NULL && nk == NULL), ("%s: nr %p sk %p, nk %p", __func__, nr, sk, nk)); - sk = pf_state_key_setup(pd, m, off, pd->src, pd->dst, sport, dport); + sk = pf_state_key_setup(pd, m, off, pd->src, pd->dst, + pd->osport, pd->odport); if (sk == NULL) goto csfailed; nk = sk; @@ -5306,15 +5310,12 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, pf_set_protostate(s, PF_PEER_SRC, PF_TCPS_PROXY_SRC); /* undo NAT changes, if they have taken place */ if (nr != NULL) { - struct pf_state_key *skt = s->key[PF_SK_WIRE]; - if (pd->dir == PF_OUT) - skt = s->key[PF_SK_STACK]; PF_ACPY(pd->src, &pd->osrc, pd->af); PF_ACPY(pd->dst, &pd->odst, pd->af); if (pd->sport) - *pd->sport = skt->port[pd->sidx]; + *pd->sport = pd->osport; if (pd->dport) - *pd->dport = skt->port[pd->didx]; + *pd->dport = pd->odport; if (pd->proto_sum) *pd->proto_sum = bproto_sum; if (pd->ip_sum) From nobody Fri Jun 6 21:22:57 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bDZ6V2FMyz5y2FV; Fri, 06 Jun 2025 21:22: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bDZ6V1MRDz3nyN; Fri, 06 Jun 2025 21:22:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749244978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O2rCdXyjLaAESMDFOcuVmh/db2FMBdOhgyrOxaSTIpU=; b=bOB5jEn8mACvjaiqLdEAkMHVH4IEaDVaWbD/FarrDtFUQrp5ufts8lBKddavRT5yfWbDhh qlag9Dpi1GWBD9Pavy4Rv/qo8XKXuTd8giIe1gxfmLybgh/TgOIhCxTl9cEyMotp8Q2c/Z SoWON9oHkNdB6ilFjUlB9JHJ7BrGymFFg5zttMHOEvBEUWisoE1No9RW/IFDg8eMTYFPAJ XNECmZZ8GYEUFinKXdsSIy6s8DGdm70rWuFPTS2xva2tKMaxwUbjuYPkv8N/jxHwvmWL9q rWyCb8T+pW+3MyIOqDQEPAKjah7IDc/c0zH0X2F3C3Eb+uncht0Ktnwgv8KUdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749244978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O2rCdXyjLaAESMDFOcuVmh/db2FMBdOhgyrOxaSTIpU=; b=QkDqNKrgkGoaoeg29SLjD1Z2euXPLGLPbHsErlL/wfLQ08kQGopGkybnhicoEKVIvitcmW WZDZ6XgIX8BYTk9+2lYp8Ky601v9I/Nc+EX1xT3HGDQgTFuDRTRVjJWkPQzCDR3VxlntXs 85ksB3Z4xy9HAsI8a9Y+FmJtKf+e/11Lj4YcFMh3ufmZIKqoYqUlK86gC0fiG51ipVTTGi 5QKzIYgM6eQAG9Q74GqF/Ij+WHiXNObh1pV0YBr76nFgt2TWAZfX7Q+oqx3UkYuPyTCP+c tOfSkAikNU1ng3FxkokOjXI1M82nt9hhnwVO4CsmA/GQiAjMjJsdDpszEBoRCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749244978; a=rsa-sha256; cv=none; b=atSbG6vKxT74ihT6PuK9qonYRJUVjGQtaeqe57YKG60SFCOqXD409ylqvVs0uh3yCeRRlf IISlp+el+/0mA4MkgdfphQtVzJWad5RKZlvo7OmwGQ9sTrXWojpXRFaTP0oyZLmyNkDzNb hMCManVH+C+hu3VB1bpwe67IzZR6B+7qQdkyOpY+TDDokonJBWVOAuFTIRD7PNPead8l72 GioPSESluhP26hDTMfLly5m1DOhMgTbzplXfAjAHPRsmYggM4oi0KoeAf7PU1PWOIh1JyI 8HheSR6fQH5SuSU2bqVzw7z1+vt2SCM0eRk63L4nFkdNCzGb8VCmhoTaXwDtBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bDZ6V0kjrz19tH; Fri, 06 Jun 2025 21:22:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 556LMw6J029396; Fri, 6 Jun 2025 21:22:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 556LMvvV029393; Fri, 6 Jun 2025 21:22:57 GMT (envelope-from git) Date: Fri, 6 Jun 2025 21:22:57 GMT Message-Id: <202506062122.556LMvvV029393@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 06664c3b0ec2 - stable/13 - pf: fix panic in pf_return() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 06664c3b0ec2f446466f0d7e53addad0d7c2dd64 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=06664c3b0ec2f446466f0d7e53addad0d7c2dd64 commit 06664c3b0ec2f446466f0d7e53addad0d7c2dd64 Author: Kristof Provost AuthorDate: 2025-06-06 21:20:16 +0000 Commit: Kristof Provost CommitDate: 2025-06-06 21:20:16 +0000 pf: fix panic in pf_return() We (correctly) NULL out sk and nk before calling pf_return(), but that function still tried to use them to undo NAT transformations. Store the old port numbers and use those rather than sk/nk. This is a partial import of e11dacbf8484adc7bbb61b20fee3ab8385745925 (osport/odport), and the missing parts of bdea9cbcf2decafeb4da5a0280313efccc09e1b3. Direct commit to stable/14. PR: 287254 (cherry picked from commit 6f6ca5288060110c7385b9424e4729b192ed6308) --- sys/net/pfvar.h | 6 ++++-- sys/netpfil/pf/pf.c | 31 ++++++++++++++++--------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index e2db4f8f5c3a..9661471daf5b 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1309,8 +1309,10 @@ struct pf_pdesc { struct pf_addr *dst; /* dst address */ struct pf_addr osrc; struct pf_addr odst; - u_int16_t *sport; - u_int16_t *dport; + u_int16_t *sport; + u_int16_t *dport; + u_int16_t osport; + u_int16_t odport; struct pf_mtag *pf_mtag; struct pf_rule_actions act; diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 1cf8d9b8e920..298793e6228e 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -304,7 +304,7 @@ static int pf_create_state(struct pf_krule *, struct pf_krule *, struct pf_krule *, struct pf_pdesc *, struct pf_ksrc_node *, struct pf_state_key *, struct pf_state_key *, struct mbuf *, int, - u_int16_t, u_int16_t, int *, struct pfi_kkif *, + int *, struct pfi_kkif *, struct pf_kstate **, int, u_int16_t, u_int16_t, int); static int pf_test_fragment(struct pf_krule **, int, @@ -3388,7 +3388,7 @@ pf_send_tcp(const struct pf_krule *r, sa_family_t af, static void pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, - struct pf_state_key *sk, int off, struct mbuf *m, struct tcphdr *th, + int off, struct mbuf *m, struct tcphdr *th, struct pfi_kkif *kif, u_int16_t bproto_sum, u_int16_t bip_sum, int hdrlen, u_short *reason) { @@ -3401,9 +3401,9 @@ pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, PF_ACPY(saddr, &pd->osrc, pd->af); PF_ACPY(daddr, &pd->odst, pd->af); if (pd->sport) - *pd->sport = sk->port[pd->sidx]; + *pd->sport = pd->osport; if (pd->dport) - *pd->dport = sk->port[pd->didx]; + *pd->dport = pd->odport; if (pd->proto_sum) *pd->proto_sum = bproto_sum; if (pd->ip_sum) @@ -4189,6 +4189,9 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, int direction, break; } + pd->osport = sport; + pd->odport = dport; + r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); /* check packet for BINAT/NAT/RDR */ @@ -4454,7 +4457,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, int direction, ((r->rule_flag & PFRULE_RETURNRST) || (r->rule_flag & PFRULE_RETURNICMP) || (r->rule_flag & PFRULE_RETURN))) { - pf_return(r, nr, pd, sk, off, m, th, kif, bproto_sum, + pf_return(r, nr, pd, off, m, th, kif, bproto_sum, bip_sum, hdrlen, &reason); } @@ -4472,13 +4475,13 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, int direction, (pd->flags & PFDESC_TCP_NORM))) { int action; action = pf_create_state(r, nr, a, pd, nsn, nk, sk, m, off, - sport, dport, &rewrite, kif, sm, tag, bproto_sum, bip_sum, + &rewrite, kif, sm, tag, bproto_sum, bip_sum, hdrlen); sk = nk = NULL; if (action != PF_PASS) { if (action == PF_DROP && (r->rule_flag & PFRULE_RETURN)) - pf_return(r, nr, pd, sk, off, m, th, kif, + pf_return(r, nr, pd, off, m, th, kif, bproto_sum, bip_sum, hdrlen, &reason); return (action); } @@ -4518,8 +4521,8 @@ cleanup: static int pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, struct pf_pdesc *pd, struct pf_ksrc_node *nsn, struct pf_state_key *nk, - struct pf_state_key *sk, struct mbuf *m, int off, u_int16_t sport, - u_int16_t dport, int *rewrite, struct pfi_kkif *kif, struct pf_kstate **sm, + struct pf_state_key *sk, struct mbuf *m, int off, + int *rewrite, struct pfi_kkif *kif, struct pf_kstate **sm, int tag, u_int16_t bproto_sum, u_int16_t bip_sum, int hdrlen) { struct pf_kstate *s = NULL; @@ -4673,7 +4676,8 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, if (nr == NULL) { KASSERT((sk == NULL && nk == NULL), ("%s: nr %p sk %p, nk %p", __func__, nr, sk, nk)); - sk = pf_state_key_setup(pd, m, off, pd->src, pd->dst, sport, dport); + sk = pf_state_key_setup(pd, m, off, pd->src, pd->dst, + pd->osport, pd->odport); if (sk == NULL) goto csfailed; nk = sk; @@ -4698,15 +4702,12 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, pf_set_protostate(s, PF_PEER_SRC, PF_TCPS_PROXY_SRC); /* undo NAT changes, if they have taken place */ if (nr != NULL) { - struct pf_state_key *skt = s->key[PF_SK_WIRE]; - if (pd->dir == PF_OUT) - skt = s->key[PF_SK_STACK]; PF_ACPY(pd->src, &pd->osrc, pd->af); PF_ACPY(pd->dst, &pd->odst, pd->af); if (pd->sport) - *pd->sport = skt->port[pd->sidx]; + *pd->sport = pd->osport; if (pd->dport) - *pd->dport = skt->port[pd->didx]; + *pd->dport = pd->odport; if (pd->proto_sum) *pd->proto_sum = bproto_sum; if (pd->ip_sum) From nobody Sun Jun 8 02:49:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bFKJb075Vz5yHHH; Sun, 08 Jun 2025 02:49: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bFKJZ5vvjz3W3v; Sun, 08 Jun 2025 02:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749350958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nRBCKBzoppw6XPuuZGKA7vZo9do/A5MsUYSJDbhro44=; b=ENrg3MP7+6KzUWHKqTVU093PYRYymTpu/jiVxvBHjtH2TCFaRuFAHKWu89AFmaNgqzydZ+ smBK6A5ikCSKt0jEHdVQ3UKkqtG/MRl4Ikfk3HbP99cDgjMLiJ+KfVTmxaN6VLWgjH+Khf lp19IdvLjvyOLuRw61aUwLkyUcZHLZ4zSRZwVkwGVk2PKaG8TS0LuvLE9iz0vWaONkueaY 8nLtFidtFfCq5MVhoxnar9rFAu5bf0UWPalgDlFE3TaIIKh0I8ShDi9Q0Oc9uayhMxYlpl YppbPKHUgLidpQ/3IYS2gjoe4ftgM0aMVylWhU1ine194RB7tmq6zbPpoPii7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749350958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nRBCKBzoppw6XPuuZGKA7vZo9do/A5MsUYSJDbhro44=; b=M/ga+aPGnUuxhFi8BoP8/jgAM2Syisfba9jPyWvW9CMCm4+B0r44yqXh3XljEAr5KIM8Zt xpjyIEJc7WwBz3a63pVEBu4stI8M4v43hQ9wTdHj29wr3GIUD3bLtcfAP4xf4Qe3ikkdfL ilAv6Z0kMBoJ/VYSau++JVpLVwHMmFRBENonQl45VssmSkaALRqpoASaZxB7RbiKSrthU4 FBlVA46WIXbsVZtXS7Ul/cRc/zxE5WZ+lZItuZuGN200E8sWvSu9BSbp41BGpTbu2H66lc ckJsY0Lg+t8hYzQyjbMT5/ohEPu5QhhiPUyAfqj11l4+HBNjuUSi5rVgUcZBwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749350958; a=rsa-sha256; cv=none; b=doFe/rV69QL146h0MN4LMp3lIp/ipIeR3rQIg3f3XFBvGuHicX9Uh72XUBp6LqMS/GrTf9 LsqOCHyLQ7ONGV4f/xANR4Qljrz/Pl3S+m7ybrq0o3RSivJcK6wbavUa7LFrytii8KemIB l57EztxuKLV2Jsf0lUwVZo92Ecp1kWKf3f+xHfK8IJiJjd1gnk9XJb30Cm5Q52WNEixvZr TcsonHSI5IxQFPUJ6rqkoM4g+CpzUDJ36K3+nIqNxvaz+U0FRFsNWhMYKsrKP6zW41ijbt ZdMJfFVqKSBxR+2YxBRGMfLdmkq5VVPfzFgCURjVrVlgNYAsaWMHelhaKCS5Bg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bFKJZ5Qkkz16PM; Sun, 08 Jun 2025 02:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5582nIgP026163; Sun, 8 Jun 2025 02:49:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5582nIYC026160; Sun, 8 Jun 2025 02:49:18 GMT (envelope-from git) Date: Sun, 8 Jun 2025 02:49:18 GMT Message-Id: <202506080249.5582nIYC026160@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7c05f298cdcc - stable/14 - pseudofs: fix typo in comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7c05f298cdcc53fa60a2fa85b24713bf7b095d62 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7c05f298cdcc53fa60a2fa85b24713bf7b095d62 commit 7c05f298cdcc53fa60a2fa85b24713bf7b095d62 Author: Konstantin Belousov AuthorDate: 2025-06-03 22:50:27 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-08 02:48:31 +0000 pseudofs: fix typo in comment (cherry picked from commit b63f298b1ff90d9c25dee09df7fdd0e509185587) --- sys/fs/pseudofs/pseudofs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c index eb4ca8a82456..fa9690264293 100644 --- a/sys/fs/pseudofs/pseudofs.c +++ b/sys/fs/pseudofs/pseudofs.c @@ -154,7 +154,7 @@ pfs_add_node(struct pfs_node *parent, struct pfs_node *pn) } /* - * Detach a node from its aprent + * Detach a node from its parent */ static void pfs_detach_node(struct pfs_node *pn)