From nobody Mon Mar 9 09:42:01 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTsVL0NrRz6VTfx for ; Mon, 09 Mar 2026 09:42:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTsVK6zbmz3c7L for ; Mon, 09 Mar 2026 09:42:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773049322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9vB1UvnXjkt/YNRA42syKlE3c5gE1C7s3OCVXrge01Q=; b=A37vh5zDaz/cKk3Xva+QAynQOJKLQzsh2oM+Bds87tPu5O+PMGTIHIF7VEAC2Zj3XpZA0T bxaA/6nIDw7tx0uInwE6kkXwdW75bweIccYZdSEQ3zRWiXGncaK05eRMGvGj01FZAxxEZN J3fhHIvskExAnNKYa/ak4lIlGgnxO7DOVu7qSf04upbvTzO1BYq4bPLz7dvKYT/lR8MGpV UhPqv8+UyThE6M2CYS/ZJbA1s4mX2QnfWAjIMb3GVjTvQ4KWhanvpNfwuQJBYgEErO8mjg 58keIQApvB+bv9gOSFPN9IPWDASEU7iR+bTgj3XPLFbVV7aLEHGq4D9K4v4UrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773049322; a=rsa-sha256; cv=none; b=eoNo+teLWhpP+1aBZcZ5ehCnqNpX5K6iF4H0uzV8gpXM8cs1UYRByy+CVAGR9EsgDDfaMG uxn8llJvNUpeTFihlbTEntcpuKLUU1Kz2BrQsXcifC6v8gG6bwrt8fOx0U2gcvEJ4My6ec 7q9co08D2DTP6IXdR3xYJNd4dxWsnxXBgHjZGs22TwuWYTXRuBkyUyjzG457uqF6kOjaNl jFf2kLOF4iD0VazJ4KnrQr0wyYGnuGzToAa3Qa2tT6HTPaqV54/vHHDvHImkCXV1q+gZSj HNQiyvsZJ8BlYHGWLB0hLHMVR1vj8sRNKsR/66u7uQzwfNMO6E+wfYaNsfDmxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773049322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9vB1UvnXjkt/YNRA42syKlE3c5gE1C7s3OCVXrge01Q=; b=eKk8Rp0ngxFHuD1V3BpMk6aIiywAEpVZPTCTsOvkARYJ/rotEBOfUPCjAMufhF6a2T7OTp XzoyIqsznMilLFyur7OYxIXSCIIQbmltNYi/iCrWsmE3W0D80gZiUVVHY+ZRZBlwQWb0Zm C7nfZAqRI97W55XRBhWlJ+c/MC65zBCEe2BLK+PLTdQLkanhZmTNej7c8cv2e4u3j5PFkB G4MlLoqVdRtfnptzHl7T8hhJuTgx55fSctx5YhJWgaCMz51POZcb3BKraiVojzbz2wbKuy eLabzfJZyBiuaD4P51hhtpDizFBQ+87gzgtdzgwMOA+v2hJWbuNf4VvdyjbaEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTsVK6MFzz4jG for ; Mon, 09 Mar 2026 09:42:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f5b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 09:42:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 8f0ea068db8a - stable/15 - netinet6: Fix memory leak on auto_linklocal List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8f0ea068db8a4b48575146579f30f6ef4fff6584 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 09:42:01 +0000 Message-Id: <69ae95e9.3f5b8.240b934e@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=8f0ea068db8a4b48575146579f30f6ef4fff6584 commit 8f0ea068db8a4b48575146579f30f6ef4fff6584 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-03-02 15:24:23 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-03-09 09:36:40 +0000 netinet6: Fix memory leak on auto_linklocal release the refcount of link-local prefix information to ensure it gets freed when the address is deleted. Reviewed By: zlei, ivy MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55593 (cherry picked from commit b55bffeaaf9bae5dc7aa21eae441d89c999ebab8) --- sys/netinet6/in6_ifattach.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index c9e951e93ec8..c35bc16903a2 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -629,8 +629,8 @@ in6_ifattach_linklocal(struct ifnet *ifp, struct ifnet *altifp) /* Reference prefix */ ia->ia6_ndpr = pr; pr->ndpr_addrcnt++; - } else - nd6_prefix_rele(pr); + } + nd6_prefix_rele(pr); return 0; } From nobody Mon Mar 9 11:03:41 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJY4MyBz6VZNP for ; Mon, 09 Mar 2026 11:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJY3rfWz3lPb for ; Mon, 09 Mar 2026 11:03:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xquofQbQQ4l0FrTjJ0WvW7/FryYN27lJhWEb0qYE1qM=; b=qA9JRBVhiaR3a4zH+fQaT1YSxtXj2zPFOk9LXVSffisVpeazNpCko9jlTEX0U32C898SGa fKg02LkG6Hhqcc2UMty0K/H8u0BOrHYfggBi9OsISOCVBnArsqvJyYFSoQFrHUQMjCJkBj yVerTXlcLRPVgsaVAy6aCsEG+Sp1vuQRJqhkC+6VbDZ/rYKi58iDEDg0rY8mWSyVTEJ0Yv IWGp8y4Iqxpyurh7dWDFSyXslHrdwt1lnQcx03WuR3Lg+M9uzFDcF6QGIspgSugf3+6vr/ Gn4L36UEZvjyWQlj9oSrxMDyfkrO4mWgnirOVcPTfvJDkTZiCJ6MHb2Tupv68g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054221; a=rsa-sha256; cv=none; b=NFNhFXgtM+p5OVwQVS2QiVDBYtLX7w2eUFX3nZNSUYIWI5NcoBxw5/Vsi+Lkf8HwQ2aDxr Zf3SyzcabwjKi3ym3oXi6JTjmPKbzFeL6P+DEG41GX87fSx7XS7pqgDHlpB3OlievAVuWY vgru9fQyALLVlgyJZNeA8QDwZRB5myGr/qZCm4+HRDuhIMdVxIiB02Vc6uBAeIYjP/3eYF 76KldUDPMjFhPPsmtd8p7JW4zzMdO9SlpqhCbT2k7G2SwlXKRg/U+ViU+QiG/WmVMVUrTS SN8gLU0bWFoUl41vYuP/hVDDNiev8q8anb2DQ0lVMNF1SgIn/+Z2CGESMcamGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xquofQbQQ4l0FrTjJ0WvW7/FryYN27lJhWEb0qYE1qM=; b=gI/2WQto9pleSsWiu/FUy6y8ktRfiq3G5C+GlC/Cy9bJSzv1+ul2HFoDxRmiWHx3yXWOux 87YVOqtciJEPKXfgutsEXWAYGMrw7+Jj4xCs183r7Ldt+OOc6cj9EWxToMYGiWTg+PcLD3 od4WUyNS1OFuExlPZkiFxj8KnP8FOar0Nl1yEDMXiGmFTBKxJHV+YCGUb9ASXXcP9cZm6u M3ZZYT7tRbnkSVYMMnwk9nMmt0Vw017O6zQ0n4GR7jRClzoT72rmFte4ZoVoqrIWGEuZVQ GUrThU6FOrmJ22HFRyvpGb/0Oo68k9pmUuG5oilEqML1YhmMhmwMHvXgu83Wvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJY3Lw7z6wC for ; Mon, 09 Mar 2026 11:03:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44cfe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: ad85b6b7c71d - stable/15 - dpaa2: improve error messages and log requested cluster size 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/15 X-Git-Reftype: branch X-Git-Commit: ad85b6b7c71de569695f9364687505154c76e8f4 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:41 +0000 Message-Id: <69aea90d.44cfe.3f4f2a97@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ad85b6b7c71de569695f9364687505154c76e8f4 commit ad85b6b7c71de569695f9364687505154c76e8f4 Author: Bjoern A. Zeeb AuthorDate: 2025-08-20 21:04:49 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:09 +0000 dpaa2: improve error messages and log requested cluster size If m_getjcl() fails we want to know the size we requested in order to have a chance to evaluate the problem better. Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D55555 (cherry picked from commit c3577fcf3fd0494cc992021d4debbca09241a49e) --- sys/dev/dpaa2/dpaa2_buf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/dpaa2/dpaa2_buf.c b/sys/dev/dpaa2/dpaa2_buf.c index 7739eda5d8de..8505b074fe4f 100644 --- a/sys/dev/dpaa2/dpaa2_buf.c +++ b/sys/dev/dpaa2/dpaa2_buf.c @@ -154,7 +154,8 @@ dpaa2_buf_seed_rxb(device_t dev, struct dpaa2_buf *buf, int size, if (__predict_true(buf->m == NULL)) { buf->m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, size); if (__predict_false(buf->m == NULL)) { - device_printf(dev, "%s: m_getjcl() failed\n", __func__); + device_printf(dev, "%s: m_getjcl(%d) failed\n", + __func__, size); error = ENOMEM; goto fail_mbuf_alloc; } From nobody Mon Mar 9 11:03:42 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJZ5bk4z6VZQh for ; Mon, 09 Mar 2026 11:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJZ4V8sz3krH for ; Mon, 09 Mar 2026 11:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EvToeuDWgn0Yznfj+BhQ1DxHF9wNcUiVBF0vxGuLdLE=; b=vN9cX5Ih6K4ZbRp97t99FlRKEtBSK08X8QW7rz34AZUobSxuqqAuHvkcvBiCTr27Bciv/f +t1kUC4R9V5rEHWEg1KHAlC9Oz/DYZx/ici3WyDdvDfLBu6bZMt9F1Lfb5Mj8aReafhYLR kV9ylFO49PwgbotJF6h3SIrK1oFnR2Y1I4dcwO5eJZjfbPqd50eUZFYpgNQvZhy6RdViga xpbmL3Na7aHzeP7+BihmYYhvPSXlBlpcIgkb8P3AejfcHA/hwAdHa7tSZ9cKanySRJPj/K 1LfnerlzVkcEIKGe4ZyTuq9VJYSk2tnJIiId7PazSSYUB9uhrdJ2Ra4iNrmbsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054222; a=rsa-sha256; cv=none; b=W7jOtvlKKzVbiPaN4yZSOMxFLli6WiXnEXuP2ELnlK8NUX+gSwRyQ8RDdzRiFKPj47zxRA x50DKt3+vzi9EGuUvJdrHLTib/m4rMeUPykXxeL2f7gQ4LZgrBQsgWkfYj8mX18uchjpq4 wxMhZ8tMbRXNSr7YVwwEql7znZUEzU0ZiLQfL1J4Q4DI9Ijl/DgUGhyyEJMYT/zTtV540q GUI51tkpSQmy2YB2R05zo3DGQ1897iFXgxPe97Fi1vo1rBINYeBUFKYPFpP8bCNoWPHxYl tjS07Rb4mkq0R8c5UnFBFxMwcMJIe0hqb6PkQ+3sZXi1Aon0cZfeoN1g8hF7hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EvToeuDWgn0Yznfj+BhQ1DxHF9wNcUiVBF0vxGuLdLE=; b=LKMzkZeBLcnplj4wAlUuV31MBQLWXAEposiM2Za3pO1ssHJ5zaDN2DxqJV8NLNbeGkWNmf CIQHq1Z91HC9o9SUCpJXDd4eBlnlMRWWfIjhtXoLBx6oeKvh06xBSOQs9At3qsGpy66iG2 o2PQ/X99z3IceLfheea4YyNIIRZG1/mMPuN39AyWE3oXpswAjOG+wN7akTsIw3BEy1dTvE AadxbnstXcNjN+oSZDrZoZMn8WW6S1Crw2P6PXrLUR/87uEsmmLVW6x1h69xqQidzxrOsm DZyIWIg4o8+VjHG61XU51dNMMKl18nPxGmb8uqMt3HA8SMZPDLpUTV/FPuyVxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJZ3nKHz6QF for ; Mon, 09 Mar 2026 11:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46338 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 81b53d35c54a - stable/15 - LinuxKPI: 802.11: fix typo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 81b53d35c54a529fb3b3706513b2ce35f9c9fee1 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:42 +0000 Message-Id: <69aea90e.46338.b251f90@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=81b53d35c54a529fb3b3706513b2ce35f9c9fee1 commit 81b53d35c54a529fb3b3706513b2ce35f9c9fee1 Author: Bjoern A. Zeeb AuthorDate: 2026-02-17 03:05:16 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:09 +0000 LinuxKPI: 802.11: fix typo Sponsored by: The FreeBSD Foundation (cherry picked from commit fa0f891d54449837b47f2ef2266163bdd9117879) --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 48b87ae47751..20ab5a641415 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3508,7 +3508,7 @@ lkpi_iv_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) } else { ic_printf(vap->iv_ic, "%s: only station mode currently supported: " - "cap %p iv_opmode %d\n", __func__, vap, vap->iv_opmode); + "vap %p iv_opmode %d\n", __func__, vap, vap->iv_opmode); return (ENOSYS); } From nobody Mon Mar 9 11:03:43 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJb6lrPz6VZL4 for ; Mon, 09 Mar 2026 11:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJb55Qbz3lH5 for ; Mon, 09 Mar 2026 11:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vpKKkW0+b5Ridfu2oTa4+G5R+HRvPtoP0P9CMeAUYa4=; b=GlEiwHgOkP4w3dAMjNMA1NPQLt63i68Uh+qeHLVdkeKcDtEddb3zJlXBv2b0719TCCkkEP W4dCxm3M9Gmqfkgt47JlE7FLpQKMia1vRCxyLgEF3SC93/w8cHAxIOpNqc6/ztVBERHzer tVXgnoHmm1r4W3RO2p+RhAq0LmKbr4X8/eQxziVTal5ofXZhFGv+eKOqrPkdf9Bc37SgK+ MCAlcmx8sSOrlJjrywfk5QDasVLZhzKXSoPYFoHtfVCuWig0r1Ls1aHjKSxnQvW+vyiXCA SCIubv4CcKhFD1pRirBkcuVDaeFACHFo+YdvF6W43j1Kx15dJG07vRx1a0VBfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054223; a=rsa-sha256; cv=none; b=LOYVVzvbUZ/HCphOCJQk7xLbOJbufaUOb/6/ku6SKICdA0Od0/6zBfv4NrnKboLKQfmPHq 7tIRiUAPndg2tm5Tmva/s325r+vbKnpRAdCQFpo9CckfIjhCtEAWSoE6VT0OoU7JN0uz9C 3zzuev9qH2bpxZXAbF1W5X6KHUONjZnfpq0LtI9hmp06ndG6cxJp4WmQOfgAJLkSRyh5Ep /+waRoL5wuGExUNsQq/Asp0WuRg9p1IP4Dz0uWF9/7qqGj9tFcWnl2qkf6xNCzs4fboMf5 1VmOv9CgN4m2DiDhfm16Jm0YCtM+14b9jn5ldebs2CYsNvdGicXpR3z9oom2PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vpKKkW0+b5Ridfu2oTa4+G5R+HRvPtoP0P9CMeAUYa4=; b=fEuwwKyqYEYIgEZKVwsfzzapdqVRkiCNT1eDScOB7ChiUXtuMNwDQO8wH2fCu7PXEtOcEF aJ0K/wUQXC1qpBbaTlHuowjDXX0wZcTBcdUI91w4WYj7aJQkCezN/USWRsIma9fs3EBiHG GL0QmoHJ21L2vFbajKcaUZf88F5CavC5Vr3Y4xkfQoPo94iz8AWLhraPfOZYr/8nmclxpX u5DLFQpM7tZ+b39Aq6w3tqPg9iZYyagkRIvN0vQfExaP3qMiyxohXY8jOwPDobx5JpP/fn /eltzfY+TfdhQEygAobzMP+xHeWXKZ5W4xdT3mvrq3I1NHrp9GTu4i1HzKmFjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJb4RH4z6QH for ; Mon, 09 Mar 2026 11:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47964 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: ca69d10943b2 - stable/15 - LinuxKPI: 802.11: move linuxkpi_ieee80211_handle_wake_tx_queue() 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/15 X-Git-Reftype: branch X-Git-Commit: ca69d10943b2eeaa551514bd77d410d470edf225 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:43 +0000 Message-Id: <69aea90f.47964.591c0b91@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ca69d10943b2eeaa551514bd77d410d470edf225 commit ca69d10943b2eeaa551514bd77d410d470edf225 Author: Bjoern A. Zeeb AuthorDate: 2026-03-04 08:11:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:09 +0000 LinuxKPI: 802.11: move linuxkpi_ieee80211_handle_wake_tx_queue() No functional changes. Just moved the function within the file. Sponsored by: The FreeBSD Foundation (cherry picked from commit 3d3303b756ad4ee3ae520f6d07df6978d049a871) --- sys/compat/linuxkpi/common/src/linux_80211.c | 76 ++++++++++++++-------------- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 20ab5a641415..7b61ff6603b7 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -8574,6 +8574,43 @@ linuxkpi_ieee80211_wake_queue(struct ieee80211_hw *hw, int qnum) spin_unlock_irqrestore(&lhw->txq_lock, flags); } +void +linuxkpi_ieee80211_handle_wake_tx_queue(struct ieee80211_hw *hw, + struct ieee80211_txq *txq) +{ + struct lkpi_hw *lhw; + + lhw = HW_TO_LHW(hw); + + LKPI_80211_LHW_TXQ_LOCK(lhw); + ieee80211_txq_schedule_start(hw, txq->ac); + do { + struct lkpi_txq *ltxq; + struct ieee80211_txq *ntxq; + struct ieee80211_tx_control control; + struct sk_buff *skb; + + ntxq = ieee80211_next_txq(hw, txq->ac); + if (ntxq == NULL) + break; + ltxq = TXQ_TO_LTXQ(ntxq); + + memset(&control, 0, sizeof(control)); + control.sta = ntxq->sta; + do { + skb = linuxkpi_ieee80211_tx_dequeue(hw, ntxq); + if (skb == NULL) + break; + ltxq->frms_tx++; + lkpi_80211_mo_tx(hw, &control, skb); + } while(1); + + ieee80211_return_txq(hw, ntxq, false); + } while (1); + ieee80211_txq_schedule_end(hw, txq->ac); + LKPI_80211_LHW_TXQ_UNLOCK(lhw); +} + /* -------------------------------------------------------------------------- */ /* This is just hardware queues. */ @@ -8675,45 +8712,6 @@ out: /* -------------------------------------------------------------------------- */ -void -linuxkpi_ieee80211_handle_wake_tx_queue(struct ieee80211_hw *hw, - struct ieee80211_txq *txq) -{ - struct lkpi_hw *lhw; - - lhw = HW_TO_LHW(hw); - - LKPI_80211_LHW_TXQ_LOCK(lhw); - ieee80211_txq_schedule_start(hw, txq->ac); - do { - struct lkpi_txq *ltxq; - struct ieee80211_txq *ntxq; - struct ieee80211_tx_control control; - struct sk_buff *skb; - - ntxq = ieee80211_next_txq(hw, txq->ac); - if (ntxq == NULL) - break; - ltxq = TXQ_TO_LTXQ(ntxq); - - memset(&control, 0, sizeof(control)); - control.sta = ntxq->sta; - do { - skb = linuxkpi_ieee80211_tx_dequeue(hw, ntxq); - if (skb == NULL) - break; - ltxq->frms_tx++; - lkpi_80211_mo_tx(hw, &control, skb); - } while(1); - - ieee80211_return_txq(hw, ntxq, false); - } while (1); - ieee80211_txq_schedule_end(hw, txq->ac); - LKPI_80211_LHW_TXQ_UNLOCK(lhw); -} - -/* -------------------------------------------------------------------------- */ - struct lkpi_cfg80211_bss { u_int refcnt; struct cfg80211_bss bss; From nobody Mon Mar 9 11:03:44 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJd1Kx5z6VZD2 for ; Mon, 09 Mar 2026 11:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJc5VQzz3kxW for ; Mon, 09 Mar 2026 11:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AxiIZpoRpRtyf6O/xnmZtDkPFbuqcbZhnrAihJKfcyI=; b=qErBPzPPpyQ7UNegLs+Go8L1RokpOv7Fe5EnBXMQ+vCHBGQ651NPidkviaf4lfet8CWkXU /jrtri3nXNAC183Op8Z2MzT2o/Of8mWFaIfqbKrR0Y7vyvhce+U19Soi55hsd+kZcgVJ/L 3OzI3DfcsPX9u0MU1YcrfIxXDHhOyP7Y10fG7cGn329jm8tE22dtAZb/rRNlMtEnvOjN0z s/OJbJcE4mkU19MholQPOTK9wgTiOW/7jYZwGk3y5PTqugWeKYeEfF/Nkl68knblICfoWR NIsLIBGI9H6tXAWpfWV8HqAQZe6oYMC0/HblbqTSJqR12Ruhazv3OHGQXTY/zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054224; a=rsa-sha256; cv=none; b=elY2NbvbE2herscp0xYB3j1vtgpFZkwYlgh5KhTJyjwKMq6lLZfy0iz1HO3+tOomVXFCpY bbMPZc9Ex+ry9LE6elgHVmlJ/waWbLWLiLNMirepYG/WGeKzbGBC1iBV0J3+amJNpmm/4U dV0b27MqcU6d5CnrVCJfktZAaJ0Y4BgB4/ISIPTgIf0hF0bwgDEzMsK2gnDUjBM6zitSas 9rFu8fpKIdywF0bq9v+5AwJN3B7ZDogt4t7ci1AGTnhLI2NqPR6YEiILRZzIE46bf1Mksm QIwhCx/Fu7n0akqCqG+6X+YxANtfumx35VVXKVQCFTowqB0Kt2hjHNU9dQnBUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AxiIZpoRpRtyf6O/xnmZtDkPFbuqcbZhnrAihJKfcyI=; b=hLev3Kpzzcu9QTtR3MnkjopTvIzYApDOq+dVepGZSFt8asidQyCuDOCPv7+TyhR+M2Ev/9 hFus4iPXtpwYUu2XduwM++ZGpGwCYYeonoxSpwSHv38Ot1OQjB2MmaI75r9PtsJyCj/FZ0 gMWolN/zKxbW5/LewjnQtSOk00ELowkl3Dz8ZnVEQlhBa5mrh+CryYYG1cP50McU5agCe2 xVfkr2Ryi8I3k6owwGv6yhebMg6gvgFrr+8GJvHYiCzd/dv9jM9QxHZnlQ32h2T27DsYkT Re85VmtYBgPn9bXP/WBZmGt0iB1QoAFaaaaiYgr/oJwkdx2eRkyce4OIo5O5eA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJc4s5dz6QK for ; Mon, 09 Mar 2026 11:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47996 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 748f77531805 - stable/15 - LinuxKPI: 802.11: improve prep_tx_info 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/15 X-Git-Reftype: branch X-Git-Commit: 748f77531805c9baa7226c24af765eed6a9263b0 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:44 +0000 Message-Id: <69aea910.47996.da1352a@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=748f77531805c9baa7226c24af765eed6a9263b0 commit 748f77531805c9baa7226c24af765eed6a9263b0 Author: Bjoern A. Zeeb AuthorDate: 2026-03-02 12:51:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:10 +0000 LinuxKPI: 802.11: improve prep_tx_info Over time struct ieee80211_prep_tx_info has grown further fields. One which is becoming mandatory is the subtype (of the mgmt frame). iwlwifi(mld) has a WARN for it if it does not match, so we now have to set this for proper operation. In addition we are tyring to improve the situation of setting/unsetting (prepare_tx/complete_tx) in various states and cleanup the use of other fields but link_id which we now leave as a marker for the future everywhere. The general problem we are facing is that our hook surface in this case is the state machine but likely would have to be tx/rx mgmt frames but we would alos have to driver the TX queues from there which is tricky. The long-term answer is to change net80211. Further the hardware flag DEAUTH_NEED_MGD_TX_PREP is dead and was removed again in favour of leting drivers deal with it. iwlwifi(mvm) likely being the only driver which ever used this. Sponsored by: The FreeBSD Foundation (cherry picked from commit 8f532c7b25d54906c307bfda6cb679632cc26313) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 1 - sys/compat/linuxkpi/common/src/linux_80211.c | 93 ++++++++++++++++++----- 2 files changed, 72 insertions(+), 22 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 18891d035094..4f3aad532810 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -431,7 +431,6 @@ enum ieee80211_hw_flags { IEEE80211_HW_BUFF_MMPDU_TXQ, IEEE80211_HW_CHANCTX_STA_CSA, IEEE80211_HW_CONNECTION_MONITOR, - IEEE80211_HW_DEAUTH_NEED_MGD_TX_PREP, IEEE80211_HW_HAS_RATE_CONTROL, IEEE80211_HW_MFP_CAPABLE, IEEE80211_HW_NEEDS_UNIQUE_STA_ADDR, diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 7b61ff6603b7..bbda35cb2e38 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2502,7 +2502,9 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* Start mgd_prepare_tx. */ memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.duration = PREP_TX_INFO_DURATION; + prep_tx_info.duration = PREP_TX_INFO_DURATION; /* SAE */ + prep_tx_info.subtype = IEEE80211_STYPE_AUTH; + prep_tx_info.link_id = 0; lkpi_80211_mo_mgd_prepare_tx(hw, vif, &prep_tx_info); lsta->in_mgd = true; @@ -2638,6 +2640,7 @@ lkpi_sta_auth_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, in /* End mgd_complete_tx. */ if (lsta->in_mgd) { memset(&prep_tx_info, 0, sizeof(prep_tx_info)); + prep_tx_info.subtype = IEEE80211_STYPE_AUTH; prep_tx_info.success = true; lkpi_80211_mo_mgd_complete_tx(hw, vif, &prep_tx_info); lsta->in_mgd = false; @@ -2648,7 +2651,8 @@ lkpi_sta_auth_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, in /* Start mgd_prepare_tx. */ if (nstate == IEEE80211_S_ASSOC && !lsta->in_mgd) { memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.duration = PREP_TX_INFO_DURATION; + prep_tx_info.subtype = IEEE80211_STYPE_ASSOC_REQ; + prep_tx_info.link_id = 0; lkpi_80211_mo_mgd_prepare_tx(hw, vif, &prep_tx_info); lsta->in_mgd = true; } @@ -2796,7 +2800,9 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* End mgd_complete_tx. (we do not have to check ostate == IEEE80211_S_ASSOC). */ if (lsta->in_mgd) { memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.success = true; + prep_tx_info.subtype = IEEE80211_STYPE_ASSOC_REQ; + prep_tx_info.success = true; /* Needs vif->cfg.assoc set! */ + prep_tx_info.link_id = 0; lkpi_80211_mo_mgd_complete_tx(hw, vif, &prep_tx_info); lsta->in_mgd = false; } @@ -2860,6 +2866,9 @@ out: * DOWN1 * "to assoc" means we are going back to State 2 from State 4[/3]. * This means ni still is authenticated, so we keep sta, chanctx, .. + * We will send a (Re)Assoc Request in case net80211 handles roadming. + * Note: this can be called as part of a DEAUTH going to State 1 as well, + * so for RoC prep_tx_info we need to check nstate (see run_to_{auth,scan,init}). */ static int lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) @@ -2910,15 +2919,33 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* flush, drop. */ lkpi_80211_mo_flush(hw, vif, nitems(sta->txq), true); - IMPROVE("What are the proper conditions for DEAUTH_NEED_MGD_TX_PREP?"); - if (ieee80211_hw_check(hw, DEAUTH_NEED_MGD_TX_PREP) && - !lsta->in_mgd) { - memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.duration = PREP_TX_INFO_DURATION; - prep_tx_info.was_assoc = true; - lkpi_80211_mo_mgd_prepare_tx(hw, vif, &prep_tx_info); - lsta->in_mgd = true; + /* We should make this a KASSERT. */ + if (lsta->in_mgd) { + ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p lsta %p in_mgd\n", + __func__, __LINE__, lvif, vap, lsta); } + /* + * Problem is that we should hook into the tx/rx flow and not + * try to re-model the state machine parts. We may miss a SME + * triggered frame this way. + */ + memset(&prep_tx_info, 0, sizeof(prep_tx_info)); + if (nstate == IEEE80211_S_ASSOC) { + if (vap->iv_roaming == IEEE80211_ROAMING_AUTO) { + if (arg) + prep_tx_info.subtype = IEEE80211_STYPE_REASSOC_REQ; + else + prep_tx_info.subtype = IEEE80211_STYPE_ASSOC_REQ; + } else { + /* wpa_supplicant upon RTM_IEEE80211_LEAVE. */ + prep_tx_info.subtype = IEEE80211_STYPE_DISASSOC; + } + } else + prep_tx_info.subtype = IEEE80211_STYPE_DEAUTH; + prep_tx_info.was_assoc = true; + prep_tx_info.link_id = 0; + lkpi_80211_mo_mgd_prepare_tx(hw, vif, &prep_tx_info); + lsta->in_mgd = true; wiphy_unlock(hw->wiphy); IEEE80211_LOCK(vap->iv_ic); @@ -2957,13 +2984,13 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_80211_mo_flush(hw, vif, nitems(sta->txq), false); /* End mgd_complete_tx. */ - if (lsta->in_mgd) { - memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.success = false; - prep_tx_info.was_assoc = true; - lkpi_80211_mo_mgd_complete_tx(hw, vif, &prep_tx_info); - lsta->in_mgd = false; + /* We should make this a KASSERT. */ + if (!lsta->in_mgd) { + ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p lsta %p !in_mgd\n", + __func__, __LINE__, lvif, vap, lsta); } + lkpi_80211_mo_mgd_complete_tx(hw, vif, &prep_tx_info); + lsta->in_mgd = false; #if 0 /* sync_rx_queues */ @@ -3047,6 +3074,7 @@ lkpi_sta_assoc_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, in struct ieee80211_vif *vif; struct ieee80211_node *ni; struct lkpi_sta *lsta; + struct ieee80211_prep_tx_info prep_tx_info; int error; lhw = vap->iv_ic->ic_softc; @@ -3077,6 +3105,20 @@ lkpi_sta_assoc_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, in lkpi_lsta_dump(lsta, ni, __func__, __LINE__); + /* End mgd_complete_tx. */ + if (lsta->in_mgd && vap->iv_state == IEEE80211_S_ASSOC) { + memset(&prep_tx_info, 0, sizeof(prep_tx_info)); + prep_tx_info.subtype = IEEE80211_STYPE_ASSOC_REQ; + prep_tx_info.link_id = 0; + lkpi_80211_mo_mgd_complete_tx(hw, vif, &prep_tx_info); + lsta->in_mgd = false; + } else if (lsta->in_mgd) { + ic_printf(vap->iv_ic, "%s:%d: in_mgd %d (%s) -> %d (%s) %d\n", + __func__, __LINE__, + vap->iv_state, ieee80211_state_name[vap->iv_state], + nstate, ieee80211_state_name[nstate], arg); + } + /* Take the station down. */ /* Update sta_state (AUTH to NONE). */ KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); @@ -3158,7 +3200,8 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* End mgd_complete_tx. */ if (lsta->in_mgd) { memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.success = false; + prep_tx_info.subtype = IEEE80211_STYPE_AUTH; + prep_tx_info.link_id = 0; lkpi_80211_mo_mgd_complete_tx(hw, vif, &prep_tx_info); lsta->in_mgd = false; } @@ -3342,17 +3385,25 @@ lkpi_sta_a_to_a(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) /* End mgd_complete_tx. */ if (lsta->in_mgd) { memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.success = false; + if (vap->iv_state == IEEE80211_S_AUTH) + prep_tx_info.subtype = IEEE80211_STYPE_AUTH; + else + prep_tx_info.subtype = IEEE80211_STYPE_ASSOC_REQ; + prep_tx_info.link_id = 0; lkpi_80211_mo_mgd_complete_tx(hw, vif, &prep_tx_info); lsta->in_mgd = false; } - /* Now start assoc. */ + /* Now start auth/assoc. */ /* Start mgd_prepare_tx. */ if (!lsta->in_mgd) { memset(&prep_tx_info, 0, sizeof(prep_tx_info)); - prep_tx_info.duration = PREP_TX_INFO_DURATION; + if (nstate == IEEE80211_S_AUTH) + prep_tx_info.subtype = IEEE80211_STYPE_AUTH; + else + prep_tx_info.subtype = IEEE80211_STYPE_ASSOC_REQ; + prep_tx_info.link_id = 0; lkpi_80211_mo_mgd_prepare_tx(hw, vif, &prep_tx_info); lsta->in_mgd = true; } From nobody Mon Mar 9 11:03:45 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJf1pl4z6VZNR for ; Mon, 09 Mar 2026 11:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJd63xJz3lBr for ; Mon, 09 Mar 2026 11:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QTUJdjKx1jkUUpwCXFKoys6BLffS8SBknLwaSzev9as=; b=m3dTNNSSXIMt9XXqUI4D2HKfPupXACVI5cEkmh5LMkaY+W2TemUay7vxwPvP7P4AzpGpxJ +HHdNeovxCRDCvosqCknRSKGUwf5JLtSqU1etAdX99a9wwE3eGlI7Q6EV1aTisHI/fK4Ey 16JnzGX4dhy4Rlrr+ER42Eh33oJVqE2hlpoi/E7Adq6pGutt0JfD65dDG5OW3PUJRhDXed Zhhtj8rkEpqx2goLrXoNxGgbKOzkUmw9bDLm2nIPFdAvjA5UjcX9Hz62Xly/O+O7m/1/Bo HT8h/qn6imHejKdHmjLHdLMbsTkyEFcH75RPh1JbzDiuIWIWXXrvKGyc7fDaDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054225; a=rsa-sha256; cv=none; b=n0+kxk41pi4fmB02BdpcMUqFQEo08fg/h7GNoTGcml1F899Ut/0UKfNsrh/e95fpL+Yudr DYfb2vvm9H0oV6e+nw2dCc9eVm4zFH2mJrABGpcEaEKZN+7iOuQWuktoo+Pj3aGulPcRyF oaPXfC2f5oql/hKcaxI9WBmEiug3q3ZV5yNCCSssVa9Lj5AwWOCBFZsSzs50Hv81frlvXD m43qKJ+6YC4UK9C26e/DAR62+3HEA7Ho+YUuTHNqA9YYaQwxu6Z7cUr1RgnqPCo9apEYcR MQFNzu/9tmIUOWm4GyvNA7t5bp6CnMLDtITIR64BVtxCRbYS8KSH6jJFNqkwWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QTUJdjKx1jkUUpwCXFKoys6BLffS8SBknLwaSzev9as=; b=HrocHMEkElEq4hGUktNTgokZVQMNQierosGpokl+C8fDXooTR0xvH+Awe+g3X8Z1YWEAs3 at9tk3/PW7gdGFb0dZA0G+fbUsU7FsHFYofzsBSV6kAbw8rqqOk16OqXyi9cFnO+yvJ/pk 4xZjf6Gn6ljauaim76dJW3aA/g3KceGmzdFQDQgFDI5N8nzEQVccAZ+sVFsUWFE1sXuOMX JKRb3Pl64EqzAGkgv9u5Ovtjo0TDK/iVnmiPJvwVa+P3LN/OZ+w1wazUMF5I9GB7Wogn6u mlBTajKdRhIEdiAhhRYs7Y8DI9+ozkJQ8Py6BA2yljkgSfkN2nd/6E7GqxqULQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJd5cwtz6Jj for ; Mon, 09 Mar 2026 11:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45652 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 9e989af660a9 - stable/15 - LinuxKPI: pass attrs in more places in dma-mapping.h List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9e989af660a9ee4fb69953306b5583e16693888b Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:45 +0000 Message-Id: <69aea911.45652.109a9b6d@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9e989af660a9ee4fb69953306b5583e16693888b commit 9e989af660a9ee4fb69953306b5583e16693888b Author: Bjoern A. Zeeb AuthorDate: 2026-02-19 23:17:47 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:10 +0000 LinuxKPI: pass attrs in more places in dma-mapping.h Various macros (dma_map_sg_attrs, dma_unmap_sg_attrs, dma_map_single_attrs, and dma_unmap_single_attrs) currently supress passing on the attrs argument. Their implementation (even though at times still marked the argument __unused; we remove that) have long gained support for handling the argument. With ofed fixed (5edf24aac1d09), pass the argument through so that other drivers using these functions may hopefully work just a bit better as well. Sponsored by: The FreeBSD Foundation Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D55391 (cherry picked from commit 31c3cba807839a1a16e6f4bca91d530d9342b61a) --- sys/compat/linuxkpi/common/include/linux/dma-mapping.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index 76efbfd51074..5e5d40ef8339 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -106,10 +106,10 @@ void lkpi_dma_unmap(struct device *, dma_addr_t, size_t, enum dma_data_direction, unsigned long); int linux_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl, int nents, enum dma_data_direction direction, - unsigned long attrs __unused); + unsigned long attrs); void linux_dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg, int nents __unused, enum dma_data_direction direction, - unsigned long attrs __unused); + unsigned long attrs); void linuxkpi_dma_sync(struct device *, dma_addr_t, size_t, bus_dmasync_op_t); static inline int @@ -201,10 +201,10 @@ dma_map_page_attrs(struct device *dev, struct page *page, size_t offset, /* linux_dma_(un)map_sg_attrs does not support attrs yet */ #define dma_map_sg_attrs(dev, sgl, nents, dir, attrs) \ - linux_dma_map_sg_attrs(dev, sgl, nents, dir, 0) + linux_dma_map_sg_attrs(dev, sgl, nents, dir, attrs) #define dma_unmap_sg_attrs(dev, sg, nents, dir, attrs) \ - linux_dma_unmap_sg_attrs(dev, sg, nents, dir, 0) + linux_dma_unmap_sg_attrs(dev, sg, nents, dir, attrs) static inline dma_addr_t dma_map_page(struct device *dev, struct page *page, @@ -361,10 +361,10 @@ dma_max_mapping_size(struct device *dev) } #define dma_map_single_attrs(dev, ptr, size, dir, attrs) \ - _dma_map_single_attrs(dev, ptr, size, dir, 0) + _dma_map_single_attrs(dev, ptr, size, dir, attrs) #define dma_unmap_single_attrs(dev, dma_addr, size, dir, attrs) \ - _dma_unmap_single_attrs(dev, dma_addr, size, dir, 0) + _dma_unmap_single_attrs(dev, dma_addr, size, dir, attrs) #define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, 0) #define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, 0) From nobody Mon Mar 9 11:03:46 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJg6WgWz6VZ77 for ; Mon, 09 Mar 2026 11:03:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJg0vbHz3lFk for ; Mon, 09 Mar 2026 11:03:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ao0t3NS9EO2AV5wgYSM5qUI7pT1o6ircY6nA581UcCM=; b=owXkXxRwzc5CWV07in7j+F7TUSveog+1IxQeoi9sJMrlwXsbQ/pD+AF7fvV/nkT9avrDLk bWhoqkl/XgaW3VHmRbR2QrtE46v6uDthJP+iwW9enGjObnJ0dnzHSOW2ZF3WzR3te5TcT+ 9BnZrt7NrnYSDJIpW0oSOvTPAMgoqPQSRfM2V4tfh9ZUREDqSaaPc6XWroHXXhzjtUjihU mPGgnMsKHhCmjtxlnz7UdUJSXBQBqoZHMk1kSXcgquXRMm3usVKwxJ9Ztc2NX1HllDKLcK dK3zCDQ1HIe3so1vuJ5CuiQTTTl/KyjluyNE7wBx4f6UAIG2HYVB/rcCn4a7dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054227; a=rsa-sha256; cv=none; b=mReQ0IE2sjnBNcxwwnP+yEt+1Zc3WdgCMSpPk9voEZA/+Rx/OjAN77aaz9ZH37kEjjopb8 5LXylGEe7GQ4ybXUfolmuYmaQnYYexPSsP9Vg/dcShIISr22B49ej+dHNegd2TYPfLMXw8 VyjCFbWYKNR+tQYZ3U7Gb/EapeNL+0zzxndy3UbS08+PTC7+3NtUW7td5+ZE2NBSH5Y9iJ 4FuSt+GUznt+6iyDzo7xHXu4IwSu1WMjs3M/zpAvnXWrcanpsH4K88HGv1YHliR7nJoOE1 UQLQt/TJXduJGhXnwy6HXNjekImBGz3NsxDduTBLFpFzk/OV7kw9E5aXw3cY0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ao0t3NS9EO2AV5wgYSM5qUI7pT1o6ircY6nA581UcCM=; b=M0lAi9S0MoUh/CKcLELXJHlw/OyJWWh09gwTEme2nwQwT4x4jVr72Kc2tkttxiSqbtCU40 SowOFfc2b/bc5hCSeVOzKVBe6+a/NFjgJ2kxq6czMzyeQ7Xt+jX5o5GUR+glkG9Sirx4rj uLRQVUhrJJ0g5W7j/aavRo7tHvp64Crr1tvGe2huLw+hQZrUScwa+Z1dJgpzf82eLF3hyl l/ySpvFnALeYODXjyomzWUSN6u94/+DrMB5tItdCo3NNvQicKA2jX3ndsz1wBqlc+Vges5 65Kd6ovcuzK+96BtiJoDVNDjIgesliA1GlV1KOIeHSTGnikOgzskvOtN+3aAxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJf6R1xz771 for ; Mon, 09 Mar 2026 11:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47968 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 4e7b6254920b - stable/15 - net80211: sta: use IEEE80211_STATUS_SUCCESS instead of magic 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4e7b6254920becc840b5d7322ec8e2964284aa00 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:46 +0000 Message-Id: <69aea912.47968.39743a25@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4e7b6254920becc840b5d7322ec8e2964284aa00 commit 4e7b6254920becc840b5d7322ec8e2964284aa00 Author: Bjoern A. Zeeb AuthorDate: 2026-03-02 10:33:53 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:10 +0000 net80211: sta: use IEEE80211_STATUS_SUCCESS instead of magic 0 Rather than using the status != 0 check use the way more descriptive status != IEEE80211_STATUS_SUCCESS definition. This makes it a lot more clear what is checked here. While here add a comment in case aof the (Re)Assoc Resp failure as we do not update state in that case but rely on a timeout which will bounce us back to State 1 (cf. 802.11-2024, Figure 11-23) which means SCAN in our case, rather than possibly moving us back to AUTH. We will likely have to revisit this when SAE hits the tree. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D55643 (cherry picked from commit 9b03cc2a70e4b6354c5f5b90e4c51b850b6b1dd2) --- sys/net80211/ieee80211_sta.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211_sta.c b/sys/net80211/ieee80211_sta.c index 19e5ffe9a367..3522b1b24742 100644 --- a/sys/net80211/ieee80211_sta.c +++ b/sys/net80211/ieee80211_sta.c @@ -1011,7 +1011,7 @@ sta_auth_open(struct ieee80211_node *ni, struct ieee80211_frame *wh, vap->iv_stats.is_rx_bad_auth++; return; } - if (status != 0) { + if (status != IEEE80211_STATUS_SUCCESS) { IEEE80211_NOTE(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, ni, "open auth failed (reason %d)", status); vap->iv_stats.is_rx_auth_fail++; @@ -1100,7 +1100,7 @@ sta_auth_shared(struct ieee80211_node *ni, struct ieee80211_frame *wh, IEEE80211_FREE(ni->ni_challenge, M_80211_NODE); ni->ni_challenge = NULL; } - if (status != 0) { + if (status != IEEE80211_STATUS_SUCCESS) { IEEE80211_NOTE_FRAME(vap, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, wh, "shared key auth failed (reason %d)", status); @@ -1766,7 +1766,12 @@ sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, int subtype, frm += 2; status = le16toh(*(uint16_t *)frm); frm += 2; - if (status != 0) { + if (status != IEEE80211_STATUS_SUCCESS) { + /* + * See ieee80211_tx_mgt_cb() for state handling. This + * essentially provokes a timeout bouncing us back to + * State 1 instead of dealing with it properly. + */ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC, wh->i_addr2, "%sassoc failed (reason %d)", ISREASSOC(subtype) ? "re" : "", status); From nobody Mon Mar 9 11:03:48 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJh3KKwz6VZfm for ; Mon, 09 Mar 2026 11:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJh0mt5z3lLB for ; Mon, 09 Mar 2026 11:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+B94TlW+iwcGoL9UXbbpCWPf1P62Kis0MXQryns/9RI=; b=ToFEFSfG5OX4tHjMWtHvBsMtAiW1n62kFlULfnpcd+UTmW2eSZmIvncs7OXrRGl7e2bKzt Utec+zwjch01MwnjaXNig+8S/zubq5C3BsamdSwHwYFxdPoETO50BINXGQmV2/nnHjVK5D 63mZUyD+XVSSDVjiSipM4Svik1NedSVvu5r+91l3n7yTb0SYGQO0FTgE6mxKbXOBpFiOFl ThoEwY17E4mDUaOXurHyI2z4eKVN+NFKU91FzrCNo4wuREARfBWRXm+LV5gwVfucJ/1bsQ pY7TbZhDlyKgY1ILYmKK8RSFZ6QnVt9CiMXpHp+adwniwyjQYX/Bi0DMoUr+og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054228; a=rsa-sha256; cv=none; b=hUPTKmNpGXkHT3mDY8dRM1Y8cJVzBGNc66KIfx5plDBek4sXGVPHPdkjwVA4qVErVQcUgb viIpWXkKZGevZwhf17TuM5TzknIm0rNAHLXOI8ESDawna61ArgKFGGtuM6lsWu6q6rSk40 y0qIK5MxmKMgM3SEBOy9nogS1LxVffWR4KUUqn6WmFoacz63bTbM6N2McdJfcD2LyDZSlx 2KOyDcM2aWRDQ2DqlRo9d8DFDsMSiCc8weY78o2UjSdul22R+99/jiqS1B65XCebMnO4+H 5hyQ1cuOgXRJOMs2QC6RGM6xpqTF7slKZpgoDNFioBmN3RKMr+mf6fofN+rWUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+B94TlW+iwcGoL9UXbbpCWPf1P62Kis0MXQryns/9RI=; b=IY5UziSwxGG33nSmZTGAPCvYcjjD7Cb8KwEbhTJEn5Mwi5PpL5wwEGxV54yorrKtXoBIYo AQpSCoTQ28Cm/fejrRemJv43oXhuj7rfM3wVM7TIJlptxEID72IPjFZDgiITGFif7ZU8r0 DJDoFXt3llDvwv/vtKeBumsT1OVlXQ3V0wD10Wt/s+Mvh1xaaPrebUsRf2lGS661U8C/hj PjxOqBiX8Pd5h7Otik7xy8ZgQP+ycfnBvFi41tKNdICegSDCDzJtkgrRs600RdtrXDVQTV P9Y2W1hZtLXogyGVP85bDMEJQ2q0mIM1oXxRGSt33iWYYJDq7HzSLvtfau0cow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJh056Lz6Jl for ; Mon, 09 Mar 2026 11:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45b68 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: d9f606424916 - stable/15 - iwlwifi: fixup link_id for certain cases 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/15 X-Git-Reftype: branch X-Git-Commit: d9f60642491649b6a05d8478ff16c3252acd8993 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:48 +0000 Message-Id: <69aea914.45b68.2eb90a93@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d9f60642491649b6a05d8478ff16c3252acd8993 commit d9f60642491649b6a05d8478ff16c3252acd8993 Author: Bjoern A. Zeeb AuthorDate: 2026-03-05 09:47:10 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:10 +0000 iwlwifi: fixup link_id for certain cases In iwl_mvm_mld_vif_cfg_changed_station() if we do not do MLO (which we do not do yet at all), dtim_period is not yet set but asssoc is (our common case) the link_id can become -1 as active_links is always 0 for the non-MLO case. This leads to logging of a WARN; Invalid link ID for session protection: 4294967295 Fixup the link_id if it is -1 to be 0. This is the deflink link_id so that should always be fine in this case. For Linux 7.0-rc2 that code is already gone so this is a local temporary stopgap measure for the mvm-mld devices (e.g., some AX210). Sponosred by: The FreeBSD Foundation (cherry picked from commit 760e0a18d3033152899fbd0e3f587dfe3c28d6bf) --- sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c b/sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c index bf24f8cb673e..8b88f211066d 100644 --- a/sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c +++ b/sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c @@ -838,6 +838,14 @@ static void iwl_mvm_mld_vif_cfg_changed_station(struct iwl_mvm *mvm, */ unsigned int link_id = ffs(vif->active_links) - 1; +#if defined(__FreeBSD__) + /* link_id is gone in Linux v7.0. + * For us it can become -1 if this is non-MLO + * and dtim_period is still 0. + */ + if (link_id == -1) + link_id = 0; +#endif /* If we're not restarting and still haven't * heard a beacon (dtim period unknown) then From nobody Mon Mar 9 11:03:49 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJj45N1z6VZNc for ; Mon, 09 Mar 2026 11:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJj1LL2z3lLV for ; Mon, 09 Mar 2026 11:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xPT8QimST3di0T+l4yaNN4VnL8phJYh4S/RSzqv/Qq0=; b=VHHRGidHHBd7wero+1589INTcsAiXT44BviPbkLz9y8T1BubrFF2WLuOLmagltxiC63zEv G5XWSz0z7ySjjGh8ncYQBp3yGbruvwhQV4Fdf6Sa0E6C8bl/ESL2ZFqmqpm3F01KDAgeaY wt1dkhQr0x2ghOeQMih0Zm0k+8moaCkY+CrcD5p5A1fw5P8g+SoWj6Px9TY/p4F86t63gV x9d67LWae2s7pG/8F1WTluzZ/04yqr3+VZOaZtu9K9rtRkODqBu/uZD4K3A++d9Aadg153 xj8OyHXTkgR9wnQ8ETEB5teXqPbc1aYRv7LEbirajQ14gzi0gmaNm9wLirRqvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054229; a=rsa-sha256; cv=none; b=vEFBhDk9h1rZciNlrRoX0XMITOre+Ke/0c0b3xA8lBQCr9bzjcX8/kRmLC+IxEzyx0enxY Q61DtrmgZwJ+NtNs9tWpmHzst/aMnpKOcYIZXP/4SNQkYZxFjDZxLmV0LKmZbh8zNq5azh t/YVlIVuy4JsdpjAXjvxoALNaZH0Z7TaqRcsgMjrUVTPjlREE7PpGWaywyty6aYor6+T3G IheH4BdjrcxW3ycZzu1CTgMKRrpRRrZdGkdKAhfzTKV9eV7A+CsLg9zM8nM1LtFgS3G+qk exFZN8vxQXW5mQf/A4Ll5JGrk473LN2Zfg1Ff1JhSiv/oso5pR+1958l5syLXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xPT8QimST3di0T+l4yaNN4VnL8phJYh4S/RSzqv/Qq0=; b=ywaRG9O+77yoNbaCARHHT2d0Y/4ejv5+iF3HCDizdTmNrBCsPOu7IYfZ2t4OaMe7pCwrZm +VdLyGp92KPL4qWK5GiMxtAJaY4KCy2CqpPLrAIEeLttjybSxkNxx7PFHMy+zJ6nXXweES O/415i+Rv4e1x3DUyAB2ltiPscsF6rUEi1tHtJoNDMuPE7gcLRGJoDhM+jcDkO9frGTU+j KooFvDhde7dYxJMQC3tfEi32BcmRDBo1OggFWqlNq8A6RJ97ohFCDdXw7iSR9FT2e1LH6X 93wfsu+lRXMzf2/NYDo6asPE4ZTLKCTJqc9SjxXFoCk+UzRUu1IFg3AyoZrXsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJj0rHTz6yW for ; Mon, 09 Mar 2026 11:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18082 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 651fcd5fa414 - stable/15 - LinuxKPI: 802.11: fix typo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 651fcd5fa41480d5aec1c3a8b3255e816f8fb105 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:49 +0000 Message-Id: <69aea915.18082.7047c674@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=651fcd5fa41480d5aec1c3a8b3255e816f8fb105 commit 651fcd5fa41480d5aec1c3a8b3255e816f8fb105 Author: Bjoern A. Zeeb AuthorDate: 2026-03-05 10:30:46 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:11 +0000 LinuxKPI: 802.11: fix typo Sponsored by: The FreeBSD Foundation (cherry picked from commit fa41408d6043df3779d94bd1ac871a5ba8f4dafb) --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index bbda35cb2e38..799ecb245661 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2004,7 +2004,7 @@ lkpi_update_dtim_tsf(struct ieee80211_vif *vif, struct ieee80211_node *ni, * we set the BSS_CHANGED_BEACON_INFO on the non-teardown * path so make sure we only do run this check once we are * assoc. (*iv_recv_mgmt)() will be called before we enter - * here so the ni will be updates with information from the + * here so the ni will be updated with information from the * beacon via net80211::sta_recv_mgmt(). We also need to * make sure we do not do it on every beacon we still may * get so only do if something changed. vif->bss_conf.dtim_period From nobody Mon Mar 9 11:03:50 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJk3Wzmz6VZGQ for ; Mon, 09 Mar 2026 11:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJk2813z3lbm for ; Mon, 09 Mar 2026 11:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+PzZqpPQEdamULXcShxfRHvrTDQaROFiYReXK45xRpk=; b=LTX4sIh6baVlPt+lDGQhRMj65CQgt05Kd8YOt0wDbhD6vgffiBU15bueK8gx2AyemiDAp7 /8jH2gQkqoi8z9nBqL+ZrPSHatCc+ZHZB4d1ucFXD2fRt4cNwmWN2d0NUbtkk61Xw3wfds DNxW+ZNvLYD74eXr8jIjgqJ5rW9GK2kWQ3VQKGyXy6eDgQP2cod8+j7FrAC7CaWaQZIhgy yi92WAs4E9coNnABDI/mXpOY6HBPH5i/EQbtE6W+S0hFDKsm7RariydqFv+0A1ZQ6mhVHq 1aLIcPpSW69sCeZwkla/kZzdSdvFNKZHQaqnKv8mKCi+aINd7eCua9kwKQXV7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054230; a=rsa-sha256; cv=none; b=GgiYELgFe4pviCtJwCTLCJaVtJKGRqFoN4tj0XYapDH47SuF0FhO4hYLnkBf2Yuq/DlKRq fWN2VoBXFP18+ldQEAoM1ncVOcAbu8dfM5NvaufmPVMbLQpVW37FZfsIIyTQRVZi9RBLI4 ow6n1eFPs3Wkh2N0rcsR8Kwt6KLTyvXo/A3gJOb09HBexyzMiBYAsxA81/80LLXCAlWGgB driX+XHjn4in83W3aXDNXt1DsS+N3o8eh9onjbn3JuSmNbqrB72GSGiMH4k/GrQKH714Oc S2LH6tAAGkrfrSzHeQsWUsFmvqgdjgVeefm5uxfGc9Yi0TFe6kEhVgm8VLD2Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+PzZqpPQEdamULXcShxfRHvrTDQaROFiYReXK45xRpk=; b=t2n9LFtCqKT5W8KE1KE43Y2BO9KUndq/T+jzUBQStlucMcLa4ti6SV6E9riXj4Hg1ouwzT JwIuDtXcYc3ofXtcwYFLjow1dLvMWKW0dDCCwR3L3jaZNuJm/6anKv1BCGnqP7dk+oWYlo UWoIBHWwf8uSm5+VDfSk/lk0M3SsNOA2c3efC0/87TtMzp3xiM3AFB/+8jE+dTX4nOzfk9 HozGGKP6/1RtEjlxAiqvoSqKdVqGPjuLZHAlw5NV9Qp9PZfI7C+k1aL71XH3+aSQ8xD++i Uhrl7hrLd7a6grw5EjhJdw1MIRSOUQjP9dV8jke0W85qnxJ5Jl0fiYTsmbQHfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJk1j4Sz5s5 for ; Mon, 09 Mar 2026 11:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46746 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 8642c8c68d9e - stable/15 - LinuxKPI: 802.11: split (*bss_info_changed) up for more modern drivers 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/15 X-Git-Reftype: branch X-Git-Commit: 8642c8c68d9e0e52732265e7f038924859e4609f Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:50 +0000 Message-Id: <69aea916.46746.2d541a1f@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8642c8c68d9e0e52732265e7f038924859e4609f commit 8642c8c68d9e0e52732265e7f038924859e4609f Author: Bjoern A. Zeeb AuthorDate: 2026-01-03 20:10:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:11 +0000 LinuxKPI: 802.11: split (*bss_info_changed) up for more modern drivers With the advent of MLO some of the updates (*bss_info_changed) would have done are not per-link. This had (*vif_cfg_changed) and (*link_conf_changed) introduced which are used by iwlwifi, rtw89, select mt76 drivers, and ath12k currently it seems. A driver normally only supports on or the other set. Factor out the call to (*bss_info_changed) into an internal function. There split the options up depending on whether they are for the vif or a link and leave a fallback to (*bss_info_changed) for older drivers. Add the mac80211 ops implementations for the two new calls along with a currently unused backup option for (*bss_info_changed) for each as I assume we will eventually call the directly rather than from the internal wrapper function. Sponsored by: The FreeBSD Foundation (cherry picked from commit 9592f563c36bd207d98f1b3a13839b88d5760d97) --- sys/compat/linuxkpi/common/src/linux_80211.c | 75 ++++++++++++++++++---- sys/compat/linuxkpi/common/src/linux_80211.h | 4 ++ .../linuxkpi/common/src/linux_80211_macops.c | 70 ++++++++++++++++++-- 3 files changed, 128 insertions(+), 21 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 799ecb245661..c003075ae601 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2242,6 +2242,53 @@ lkpi_remove_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif) free(lchanctx, M_LKPI80211); } +/* -------------------------------------------------------------------------- */ + +/* Any other options belong here? Check more drivers. */ +#define BSS_CHANGED_VIF_CFG_BITS \ + (BSS_CHANGED_SSID | BSS_CHANGED_IDLE | BSS_CHANGED_PS | BSS_CHANGED_ASSOC | \ + BSS_CHANGED_ARP_FILTER | BSS_CHANGED_MLD_VALID_LINKS | BSS_CHANGED_MLD_TTLM) + +static void +lkpi_bss_info_change(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + enum ieee80211_bss_changed bss_changed) +{ + struct lkpi_vif *lvif; + enum ieee80211_bss_changed vif_cfg_bits, link_info_bits; + + if (ieee80211_vif_is_mld(vif)) { + TODO("This likely needs a subset only; split up into 3 parts."); + } + + /* Nothing to do? */ + if (bss_changed == 0) + return; + + /* + * If the vif is not known to the driver there is nothing to notifiy for. + * We MUST NOT check for !lvif_bss_synched here (the reasonable it seems) + * as we need to execute the update(s) or we will have follow-up issues. + */ + lvif = VIF_TO_LVIF(vif); + if (!lvif->added_to_drv) + return; + + /* + * With the advent of MLO bss_conf got split up into vif and link + * change notfications, while historically it was one. + * We now need to support all possible models. + */ + vif_cfg_bits = bss_changed & BSS_CHANGED_VIF_CFG_BITS; + if (vif_cfg_bits != 0) + lkpi_80211_mo_vif_cfg_changed(hw, vif, vif_cfg_bits, false); + + link_info_bits = bss_changed & ~(BSS_CHANGED_VIF_CFG_BITS); + if (link_info_bits != 0) + lkpi_80211_mo_link_info_changed(hw, vif, &vif->bss_conf, + link_info_bits, 0, false); + + lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); +} /* -------------------------------------------------------------------------- */ @@ -2457,7 +2504,7 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* RATES */ IMPROVE("bss info: not all needs to come now and rates are missing"); - lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); + lkpi_bss_info_change(hw, vif, bss_changed); /* * Given ni and lsta are 1:1 from alloc to free we can assert that @@ -2791,7 +2838,7 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int } bss_changed |= lkpi_update_dtim_tsf(vif, ni, vap, __func__, __LINE__); - lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); + lkpi_bss_info_change(hw, vif, bss_changed); /* - change_chanctx (if needed) * - event_callback @@ -2851,7 +2898,7 @@ lkpi_sta_assoc_to_run(struct ieee80211vap *vap, enum ieee80211_state nstate, int bss_changed = 0; bss_changed |= lkpi_update_dtim_tsf(vif, ni, vap, __func__, __LINE__); - lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); + lkpi_bss_info_change(hw, vif, bss_changed); /* Prepare_multicast && configure_filter. */ lkpi_update_mcast_filter(vap->iv_ic); @@ -3289,7 +3336,7 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int /* XXX BSS_CHANGED_???? */ vif->bss_conf.dtim_period = 0; /* go back to 0. */ bss_changed |= BSS_CHANGED_BEACON_INFO; - lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); + lkpi_bss_info_change(hw, vif, bss_changed); LKPI_80211_LVIF_LOCK(lvif); /* Remove ni reference for this cache of lsta. */ @@ -3653,7 +3700,7 @@ lkpi_wme_update(struct lkpi_hw *lhw, struct ieee80211vap *vap, bool planned) struct chanAccParams chp; struct wmeParams wmeparr[WME_NUM_AC]; struct ieee80211_tx_queue_params txqp; - enum ieee80211_bss_changed changed; + enum ieee80211_bss_changed bss_changed; int error; uint16_t ac; @@ -3704,11 +3751,11 @@ lkpi_wme_update(struct lkpi_hw *lhw, struct ieee80211vap *vap, bool planned) ic_printf(ic, "%s: conf_tx ac %u failed %d\n", __func__, ac, error); } - changed = BSS_CHANGED_QOS; + bss_changed = BSS_CHANGED_QOS; if (!planned) - lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, changed); + lkpi_bss_info_change(hw, vif, bss_changed); - return (changed); + return (bss_changed); } #endif @@ -3774,7 +3821,7 @@ lkpi_iv_sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, * locking, see if queue_work() is fast enough. */ bss_changed = lkpi_update_dtim_tsf(vif, ni, ni->ni_vap, __func__, __LINE__); - lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, bss_changed); + lkpi_bss_info_change(hw, vif, bss_changed); } /* @@ -3820,7 +3867,7 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], struct ieee80211vap *vap; struct ieee80211_vif *vif; struct ieee80211_tx_queue_params txqp; - enum ieee80211_bss_changed changed; + enum ieee80211_bss_changed bss_changed; struct sysctl_oid *node; size_t len; int error, i; @@ -3937,8 +3984,8 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], LKPI_80211_LHW_LVIF_UNLOCK(lhw); /* Set bss_info. */ - changed = 0; - lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, changed); + bss_changed = 0; + lkpi_bss_info_change(hw, vif, bss_changed); /* Configure tx queues (conf_tx), default WME & send BSS_CHANGED_QOS. */ IMPROVE("Hardcoded values; to fix see 802.11-2016, 9.4.2.29 EDCA Parameter Set element"); @@ -3956,8 +4003,8 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], __func__, ac, error); } wiphy_unlock(hw->wiphy); - changed = BSS_CHANGED_QOS; - lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, changed); + bss_changed = BSS_CHANGED_QOS; + lkpi_bss_info_change(hw, vif, bss_changed); /* Force MC init. */ lkpi_update_mcast_filter(ic); diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index 3d25ab4a857b..8ae5c3d13d2d 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -469,6 +469,10 @@ void lkpi_80211_mo_change_chanctx(struct ieee80211_hw *, struct ieee80211_chanctx_conf *, uint32_t); void lkpi_80211_mo_remove_chanctx(struct ieee80211_hw *, struct ieee80211_chanctx_conf *); +void lkpi_80211_mo_vif_cfg_changed(struct ieee80211_hw *, struct ieee80211_vif *, + uint64_t, bool); +void lkpi_80211_mo_link_info_changed(struct ieee80211_hw *, struct ieee80211_vif *, + struct ieee80211_bss_conf *, uint64_t, uint8_t, bool); void lkpi_80211_mo_bss_info_changed(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, uint64_t); int lkpi_80211_mo_conf_tx(struct ieee80211_hw *, struct ieee80211_vif *, diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index 634cffddea9e..42067e36c953 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -546,24 +546,80 @@ lkpi_80211_mo_remove_chanctx(struct ieee80211_hw *hw, } void -lkpi_80211_mo_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - struct ieee80211_bss_conf *conf, uint64_t changed) +lkpi_80211_mo_vif_cfg_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + uint64_t vif_cfg_bits, bool fallback) +{ + struct lkpi_hw *lhw; + + might_sleep(); + /* XXX-FINISH all callers for lockdep_assert_wiphy(hw->wiphy); */ + + lhw = HW_TO_LHW(hw); + if (lhw->ops->vif_cfg_changed == NULL && + lhw->ops->bss_info_changed == NULL) + return; + + if (vif_cfg_bits == 0) + return; + + LKPI_80211_TRACE_MO("hw %p vif %p vif_cfg_bits %#jx", hw, vif, (uintmax_t)vif_cfg_bits); + if (lhw->ops->link_info_changed != NULL) + lhw->ops->vif_cfg_changed(hw, vif, vif_cfg_bits); + else if (fallback) + lhw->ops->bss_info_changed(hw, vif, &vif->bss_conf, vif_cfg_bits); +} + +void +lkpi_80211_mo_link_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *conf, uint64_t link_info_bits, uint8_t link_id, + bool fallback) { struct lkpi_hw *lhw; + might_sleep(); + /* XXX-FINISH all callers for lockdep_assert_wiphy(hw->wiphy); */ + lhw = HW_TO_LHW(hw); if (lhw->ops->link_info_changed == NULL && lhw->ops->bss_info_changed == NULL) return; - if (changed == 0) + if (link_info_bits == 0) return; - LKPI_80211_TRACE_MO("hw %p vif %p conf %p changed %#jx", hw, vif, conf, (uintmax_t)changed); + if (!ieee80211_vif_link_active(vif, link_id)) + return; + + LKPI_80211_TRACE_MO("hw %p vif %p conf %p link_info_bits %#jx", hw, vif, conf, (uintmax_t)link_info_bits); if (lhw->ops->link_info_changed != NULL) - lhw->ops->link_info_changed(hw, vif, conf, changed); - else - lhw->ops->bss_info_changed(hw, vif, conf, changed); + lhw->ops->link_info_changed(hw, vif, conf, link_info_bits); + else if (fallback) + lhw->ops->bss_info_changed(hw, vif, conf, link_info_bits); +} + +/* + * This is basically obsolete but one caller. + * The functionality is now split between lkpi_80211_mo_link_info_changed() and + * lkpi_80211_mo_vif_cfg_changed(). Those functions have a flag whether to call + * the (*bss_info_changed) fallback or not. See lkpi_bss_info_change(). + */ +void +lkpi_80211_mo_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *conf, uint64_t bss_changed) +{ + struct lkpi_hw *lhw; + + /* XXX-FINISH all callers for lockdep_assert_wiphy(hw->wiphy); */ + + lhw = HW_TO_LHW(hw); + if (lhw->ops->bss_info_changed == NULL) + return; + + if (bss_changed == 0) + return; + + LKPI_80211_TRACE_MO("hw %p vif %p conf %p changed %#jx", hw, vif, conf, (uintmax_t)bss_changed); + lhw->ops->bss_info_changed(hw, vif, conf, bss_changed); } int From nobody Mon Mar 9 11:03:51 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJl4gYpz6VZg0 for ; Mon, 09 Mar 2026 11:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJl2zrtz3lQj for ; Mon, 09 Mar 2026 11:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zeoRtZe0ikSBKF5AdM7GJZq/xmDGMFB1+b+usL1cNl0=; b=igA8M9YYurPW4YdOAMumV5nP20T6O2YuHQCB/GJTT0+OSDBJ6kUAgMjH2Pc3b7vFeuraiB GdNojdW5xb0642e1LB536p7x8qxP33RxOkKUmloOJN4c4uEf91a96LkTfUskIayugrVx74 n/sadA0sH3z7m58f/eCeE1s4yK6ugH4I+VnUoUm6kNLxFcS/8pgGgSnUdT9bcCS71+zacU xwvht+/G5pvzl2q6yiYYzYthDWpIs8BdKw31PRsjdytpkTi7Wny/I//y0JLnEawXoklmQi meZ6eJ7cfhUOcT+pth6NdbTtvsAOU5sRCNATFD50Dx2YMVT1EZNrrkzGLra24Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054231; a=rsa-sha256; cv=none; b=yS51XVI3vIrtI/rwWS9ag+u/hferZGC4A5RijjM8Z6pvRtwAlBI4Gm0PYc0SAYVLqvkvR3 z0UZF7gIFCuCRKx0iHP+R34dQZAHmdzTQRQTBjTo3yl06M3fdB3mVBgU6X5nmx10zmWYW2 q1sxPiJH1AzyxyWzzclV8eDO07IiDEu56IaSYVRHVYskGM1CdcDkTEmhmbooZlj5jr6dvk K+ZU+aW1PW+3s0YxlWJJAXaD8FC8fRS2oaU9riBowZRQT9y3r7Ieo6wrjqU+5DelCug7xI mJjtHme/r0PRm89LVJ3AoMKe1+iS5m3oz/an41jOIZ8LAYhW8RJ5YbFm+Yksuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zeoRtZe0ikSBKF5AdM7GJZq/xmDGMFB1+b+usL1cNl0=; b=AHiO0Wxao4JMCg4acvwxk+B/uoEivkC0qPgOvuBEkhZwvOpp8NVbBQIu60HgFnyFIikW4X pb2voxvi6bQNyOpudmXoITevKcyfn5B8iKX2JGA2D4TvX4fqg61KlXdJXWqc3RryZVY/la TSwlDy02bDctzPAFnSBxxjQtDiDkUsLkfhwWHMh/qVJDi14snVTqK+gpsefGf5jFR/SsAO Mn1DOA1ld2h9pxgV3neWj6kjxWFlGiFVOCMwRhuAkQsFo/VPbDa5bGZOpuhtBZdKmoSlks KSkoCk++Gb76G3Lwf7WYRaf9qGQQDXfJMzrQY2r5upN2RBLwcsGlzT80KOZKXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJl2WZwz6Jm for ; Mon, 09 Mar 2026 11:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45b6c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 5f68af167bfe - stable/15 - LinuxKPI: 802.11: change teardown order of disassoc and sta rm 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/15 X-Git-Reftype: branch X-Git-Commit: 5f68af167bfe761dbd5f7a141a612ac998e6f922 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:51 +0000 Message-Id: <69aea917.45b6c.3956cdaa@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5f68af167bfe761dbd5f7a141a612ac998e6f922 commit 5f68af167bfe761dbd5f7a141a612ac998e6f922 Author: Bjoern A. Zeeb AuthorDate: 2026-03-05 09:58:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:11 +0000 LinuxKPI: 802.11: change teardown order of disassoc and sta rm In lkpi_sta_auth_to_scan() we remove the sta from the firmware for everything supporting (*sta_state). We used to run into issues here with iwlwifi in that we had to use a specific order: set vif->cfg.assoc = false, .aid = 0, then remove the sta, and then send the mac update as otherwise we would either have the sta silently removed (if we run (*bss_info_change) first and fail then or silently not have the sta removed and upon sta add we would trigger the fw crash. The order of events seem to have changed now and especially BE200 (iwlwifi/mld) is picky about this and would crash the firmware with something like: iwlwifi0: 0x20103311 | ADVANCED_SYSASSERT iwlwifi0: 0x00000000 | umac branchlink1 iwlwifi0: 0xC00808AA | umac branchlink2 iwlwifi0: 0xD00D6E90 | umac interruptlink1 iwlwifi0: 0x0108C504 | umac interruptlink2 iwlwifi0: 0x00000000 | umac data1 (link_id? seen weird values there though) iwlwifi0: 0x00000006 | umac data2 (fw_sta_id) iwlwifi0: 0x00000001 | umac data3 if it would still think we were assoc. So the new order is as one would have expected initially: set assoc = false, aid = 0; do the remaining bss_conf (vif/link) changes and issue the (*vif_cfg_changed) / (*link_info_changed) or for older drivers (*bss_info_changed). That will tell the mac we are no longer associated. And only then remove the sta from the firmware. Update the comment there along so we do have the paper trail as to when and why this changed. Tested on: BE200, AX210 (11ac) Tested on: AX200. 9260, 8265, 3165 (11a) Sponsored by: The FreeBSD Foundation (cherry picked from commit f68ebebd8ae469e344f10ed2f3c4d9d983a29f41) --- sys/compat/linuxkpi/common/src/linux_80211.c | 57 +++++++++++++++------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index c003075ae601..63f92b8afb2b 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3281,24 +3281,27 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int bss_changed = 0; /* - * Start updating bss info (bss_info_changed) (assoc, aid, ..). + * Start updating bss info (*bss_info_changed) (assoc, aid, ..). * - * One would expect this to happen when going off AUTHORIZED. - * See comment there; removes the sta from fw if not careful - * (bss_info_changed() change is executed right away). + * One would expect this to happen when going off AUTHORIZED but + * not so. * - * We need to do this now, before sta changes to IEEE80211_STA_NOTEXIST - * as otherwise drivers (iwlwifi at least) will silently not remove - * the sta from the firmware and when we will add a new one trigger - * a fw assert. + * Immediately issuing the (*bss_info_changed) used to also remove the + * sta from firmware for iwlwifi; or we have problems with the sta + * silently not being removed and then crash upon the next sta add. + * Neither seems to be the case or a problem still. * - * The order which works best so far avoiding early removal or silent - * non-removal seems to be (for iwlwifi::mld-mac80211.c cases; - * the iwlwifi:mac80211.c case still to be tested): - * 1) lkpi_disassoc(): set vif->cfg.assoc = false (aid=0 side effect here) - * 2) call the last sta_state update -> IEEE80211_STA_NOTEXIST - * (removes the sta given assoc is false) - * 3) add the remaining BSS_CHANGED changes and call bss_info_changed() + * Contrary for BE200 (iwlwifi/mld) if we do not issue the + * (*vif_cfg_change) to tell FW that we are no longer assoc + * it will crash now upon sta rm. So the order now is as we once + * expected it: + * + * 1) lkpi_disassoc(): set vif->cfg.assoc = false and .aid=0 + * 2) add the remaining BSS_CHANGED changes and call (*bss_info_changed) + * (which may be split up into (*vif_cfg_change) and + * (*link_info_changed) for more modern drivers). + * 3) call the last sta_state update -> IEEE80211_STA_NOTEXIST + * (removes the sta given assoc is false) and tidy up our lists. * 4) call unassign_vif_chanctx * 5) call lkpi_hw_conf_idle * 6) call remove_chanctx @@ -3310,6 +3313,18 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_lsta_dump(lsta, ni, __func__, __LINE__); + IMPROVE("Any bss_info changes to announce?"); + vif->bss_conf.qos = false; + bss_changed |= BSS_CHANGED_QOS; + vif->cfg.ssid_len = 0; + memset(vif->cfg.ssid, '\0', sizeof(vif->cfg.ssid)); + bss_changed |= BSS_CHANGED_BSSID; + vif->bss_conf.use_short_preamble = false; + /* XXX BSS_CHANGED_???? */ + vif->bss_conf.dtim_period = 0; /* go back to 0. */ + bss_changed |= BSS_CHANGED_BEACON_INFO; + lkpi_bss_info_change(hw, vif, bss_changed); + /* Adjust sta and change state (from NONE) to NOTEXIST. */ KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); KASSERT(lsta->state == IEEE80211_STA_NONE, ("%s: lsta %p state not " @@ -3326,18 +3341,6 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int lkpi_lsta_dump(lsta, ni, __func__, __LINE__); - IMPROVE("Any bss_info changes to announce?"); - vif->bss_conf.qos = false; - bss_changed |= BSS_CHANGED_QOS; - vif->cfg.ssid_len = 0; - memset(vif->cfg.ssid, '\0', sizeof(vif->cfg.ssid)); - bss_changed |= BSS_CHANGED_BSSID; - vif->bss_conf.use_short_preamble = false; - /* XXX BSS_CHANGED_???? */ - vif->bss_conf.dtim_period = 0; /* go back to 0. */ - bss_changed |= BSS_CHANGED_BEACON_INFO; - lkpi_bss_info_change(hw, vif, bss_changed); - LKPI_80211_LVIF_LOCK(lvif); /* Remove ni reference for this cache of lsta. */ lvif->lvif_bss = NULL; From nobody Mon Mar 9 11:03:52 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJm6Lz9z6VZfh for ; Mon, 09 Mar 2026 11:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJm3lyYz3lYt for ; Mon, 09 Mar 2026 11:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cu23WnGWAUMzFNVORijRmagplOMeOiHKU6gavvarBW4=; b=F5a0Qx/j3ibBzMd2+idxDjXAu4T58Pppfqlt5A9212HpJ3POdTBRie310O+Qm433FP9xve Dnz5vt/3NM/vGT6reeQprApmqaarn1cwm+UfS9MEBtsY5qLREDA04hMK9zCyqsRzqEOp6D P1Q2gIfxKGLOo/y2h5NK/hy/oqnDxyN+0Z6N+osPVTlKhEGRxRnBTVIETr10onhFkUCCjA QXNFV6/n1aP17E+glndlIxug/OYBDB4+Q4rcAT6Tmu4x1TF2ruLEGeqUbvKyKgVU9M6/em W62cDO367x1y6SKJ9ex11t156sA8kYFnsGITM2gaart8vWGaL74iZGsfH7UiKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054232; a=rsa-sha256; cv=none; b=SnAjZzsPn5eYpSByeXJsf7wlmPF+2zjyLsQPnToBmCWrPncwbo1PEk1LPaVhkM9Vzg2z4I STsRlYHowSlTqG6nhEvXsiTdqFJpxx6tHD23fnpigopEs+/lP6K5cDoxGWL8R5eJMPw/Ek FsPDs6bv7v39UyKSLOf6xbn2DnxGpjUAIasswV0gMCDdmJZfZJdMHoel59lukqGc63pz9v R6f9gOyrLjmUFXc6TJM+mhw7qnFgGMl28MgSk0hDD/Mnl03Vook+4pxcRAL8ykbea/Y2Gw tBtRC8SNZuA1vSFWzdkz/vSWPgb7ewwbG06Qjv+AtiSzUZvmiH9/AE10Bv+nNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cu23WnGWAUMzFNVORijRmagplOMeOiHKU6gavvarBW4=; b=OheMQhlZCLFQQpi1hkNbfyNn7NJQsEyJb1bI9+5/voXftNjBRlS8t1KwyE8iliEtWbNczr Nq4Ig9fKXsPVxw8U1aqosifrp+lhxkxdl2dFn6wj+enqh/DGCDf/lS02fc39B8XRl6sBCl 24d6OvOyTUs0pJDcQPdIEmeKZLdnPYPTHtyqMbNDLEXRhPX0Fid89QjsPskn8/I+/dnv+T N1ZhA/LMEabM00iSeqd2klQk8sZtKGA9Odd3bW8T8JpCQLAPNM1cyxnySKP+F0yI9eXHgE fanNb7fHKeKrBJDjygpXTrA9BJprIlsh1Tk22rXMMNtr5Dx9jObyY3EfzlIpjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJm3JCCz5s6 for ; Mon, 09 Mar 2026 11:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4726f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 169ab967e24b - stable/15 - iwlwifi: mld: move module_init() to SI_ORDER_SECOND 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/15 X-Git-Reftype: branch X-Git-Commit: 169ab967e24bbb097f228e22c07ddb89ae3bfe5f Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:52 +0000 Message-Id: <69aea918.4726f.1a8b1b@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=169ab967e24bbb097f228e22c07ddb89ae3bfe5f commit 169ab967e24bbb097f228e22c07ddb89ae3bfe5f Author: Bjoern A. Zeeb AuthorDate: 2026-03-05 12:41:46 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:11 +0000 iwlwifi: mld: move module_init() to SI_ORDER_SECOND In FreeBSD the iwlwifi driver is a single kernel module. As for iwlwifi/mvm we need to make sure the common "iwlwifi drv" code is initialized before trying to register the mld sub-driver in order for lists, etc. in the registration code to be initialized. We do this by using an extended (FreeBSD specific) version of module_init which overrides the order parameter of the SYSINIT. Otherwise we can randomly (depending on SYSINIT run order) run into a NULL pointer deref panic. Sponsored by: The FreeBSD Foundation PR: 291120 (cherry picked from commit 551c4cb74a807ceae55288bf273f5cfeb37c7c91) --- sys/contrib/dev/iwlwifi/mld/mld.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/mld/mld.c b/sys/contrib/dev/iwlwifi/mld/mld.c index 7b46ccc306ab..8075b886ddbf 100644 --- a/sys/contrib/dev/iwlwifi/mld/mld.c +++ b/sys/contrib/dev/iwlwifi/mld/mld.c @@ -44,7 +44,11 @@ static int __init iwl_mld_init(void) return ret; } +#if defined(__linux__) module_init(iwl_mld_init); +#elif defined(__FreeBSD__) +module_init_order(iwl_mld_init, SI_ORDER_SECOND); +#endif static void __exit iwl_mld_exit(void) { From nobody Mon Mar 9 11:03:53 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJp0Y0xz6VZGZ for ; Mon, 09 Mar 2026 11:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJn4jTDz3lfl for ; Mon, 09 Mar 2026 11:03:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o5leoCGFqfyK7EFOG3/Yfdd3Xbr5SXwvupBXI2PsrXM=; b=Sa/9V8EFzZsEYQPC63ppBzGZ5YorSJ2UQxH2kFdJGNL450ATn9F36HTnJgG0RAnSysPzP/ oQ+AgCtyyaWbtZzeWpLerY6dbCt15Tszmvt5wZJG59RGc3HIaeXqdEU6wdTXpx43CpsJ3q USGDN52gNAbckC46AR8e95IGx3WvuFNiGWBER6ICjeDE/Yj9LlC7IakwyyxyVWRrR6CK/S aQMlgA0d6sEtYsZQS5hctW8yGdj9TnULhTwrcUSUmsF5ATaFgOXObn7i6kbBjFES747ZeF 0VjZyNQJiPLWjf0ZjZEn6nPxaBN7+CiMPGycRtM2w2HGEsNcWaKilbhBQ4aN7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054233; a=rsa-sha256; cv=none; b=qOKAlbhr7QNWj1c6ZQKx15mJnErxrEeuMoOZdYAZrKIG1SS1eDk2YUXf+zneMCIngpFDYa XjPAz6QHmlgzwCXmU0V9kxK0yAvk4x4u+2iMY9Ab6axdgTLJx5YIoaiOs3UXN9e7yc0oMQ +BtCHdvRP9NhM3IDzqmU4Immfb/9Oe2CJoq7lG4m8GTjBsNIj+J/ZMaaer4nB7vjw56sPM bbD2j8dGcPbkW2KBeDnSSyp75haJ5kOw1abDeDcY6gJuGw6hpGo2/pjaanxMKtgmSRa9A6 8q3W9uO5FD6RatWeT7ajPnK6mvTbjAffS9+oAwQlWyVyw8emNxXLEKeIuI6dmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o5leoCGFqfyK7EFOG3/Yfdd3Xbr5SXwvupBXI2PsrXM=; b=M6PGs735svN6fzEfuR1fmZj0GmTBMF7s8ma+aoz+sUnhKxYWVduj7j/6eg9iHRDpQB61J2 UqPioN9VlEZGsgyubInpsL4ROxnzn56UGB6C1MV7Hp6Wm45Nxy8mHTtgrVyKZGstT4OxAT 16G8kwv+oyGl+zSvEYyeSygVyTzPWbWrLhkKaHSw6eXeZBmJup2uGwpCptqHsTWHay2hie 9u2OAfikQ7ArySaIiVJsGY+AIPI0qQcffl9SSHcb+0OFJPzsZzPF7hTW4rWqxmOeUyyr9Q R+dcKrWWrO4OCr5ZhOPOokj8ElgvFFl7lkBDxRSJ2ikVVzzfeg8HZl61cgxXow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJn43n7z6Jp for ; Mon, 09 Mar 2026 11:03:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18002 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: a367a6264aac - stable/15 - iwlwifi: adjust driver description 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/15 X-Git-Reftype: branch X-Git-Commit: a367a6264aac3745479ad5e5091595d15cac9009 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:53 +0000 Message-Id: <69aea919.18002.a1507b2@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a367a6264aac3745479ad5e5091595d15cac9009 commit a367a6264aac3745479ad5e5091595d15cac9009 Author: Bjoern A. Zeeb AuthorDate: 2026-03-05 19:40:15 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:12 +0000 iwlwifi: adjust driver description Adjust the module driver descriptions for mvm and mld to make it clear that this is not a driver for Linux but a Linux-based driver for FreeBSD. Cleanup surroundings. Sponsored by: The FreeBSD Foundation (cherry picked from commit 782fe2f8d90488a61ecdbe1d4b245900a88bee56) --- sys/contrib/dev/iwlwifi/mld/mld.c | 6 ++++++ sys/contrib/dev/iwlwifi/mvm/ops.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/iwlwifi/mld/mld.c b/sys/contrib/dev/iwlwifi/mld/mld.c index 8075b886ddbf..3df9cabd34de 100644 --- a/sys/contrib/dev/iwlwifi/mld/mld.c +++ b/sys/contrib/dev/iwlwifi/mld/mld.c @@ -28,9 +28,15 @@ #include "iwl-nvm-parse.h" +#if defined(__linux__) #define DRV_DESCRIPTION "Intel(R) MLD wireless driver for Linux" +#elif defined(__FreeBSD__) +#define DRV_DESCRIPTION "Intel(R) MLD wireless Linux-based driver for FreeBSD" +#endif MODULE_DESCRIPTION(DRV_DESCRIPTION); +#if defined(__linux__) MODULE_LICENSE("GPL"); +#endif MODULE_IMPORT_NS("IWLWIFI"); static const struct iwl_op_mode_ops iwl_mld_ops; diff --git a/sys/contrib/dev/iwlwifi/mvm/ops.c b/sys/contrib/dev/iwlwifi/mvm/ops.c index 912fb6677a0d..2dee21163d4f 100644 --- a/sys/contrib/dev/iwlwifi/mvm/ops.c +++ b/sys/contrib/dev/iwlwifi/mvm/ops.c @@ -39,9 +39,8 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION); MODULE_LICENSE("GPL"); #elif defined(__FreeBSD__) -#define DRV_DESCRIPTION "The new Intel(R) wireless AGN/AC/AX based driver for FreeBSD" +#define DRV_DESCRIPTION "The new Intel(R) wireless AGN/AC/AX Linux-based driver for FreeBSD" MODULE_DESCRIPTION(DRV_DESCRIPTION); -MODULE_LICENSE("BSD"); #endif MODULE_IMPORT_NS("IWLWIFI"); From nobody Mon Mar 9 11:03:54 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJq0bLpz6VZjT for ; Mon, 09 Mar 2026 11:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJp5JLzz3lZT for ; Mon, 09 Mar 2026 11:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pe3/rs09oRRgKTQW4Zk9AaQgbn3AMOakiP2UJ5juc1U=; b=T93ftL8qpbVTD7vdd5vsA0+caZeejv2sFfGHP3PRx5vGbC8mTc60DICoBKNuR8CkPMFkJk ubOiKRKFAP+WcFrcdVP0Bd8jq8eQlGlwNs76dGZMoVIFcmTcZ9Ut4zLLz4PmB3b2zssCS8 +accHPQXfAOCVumh8fCffMZBnrIHn5F6jqEPsF9wU4BJ7xpQE1EH3RmstwOlznVPNylU5h X0013whbKaKSOZ5L+gowV+SiAZOkXFrDoAx9HwLLvxlt4L1eXwMAvIRNW1TVAEaG0g9sqW ly5Zjmnra+ZP4tHDPjDTjIg4fedcRY9PLzcHostLaOTaIhbyyBpKO4dAMiT5jQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054234; a=rsa-sha256; cv=none; b=Xy/E/JLvKDeBpWn0YNAWGDdFXE8UBrO5y+l2BW6TGIX2v6jYMDluaE1qYkJl9diPVW90dF rKAqrHzU5o0rD60/jKo/u9T8gPwGcZNSnJIvt1gAbOL0cknX5zsAzXA+C1bxKwM+qC5Uhn KKs9gybbF2REcT0ZLuMwXj+lOuPC86NiWSXgmvdRanmEIKI4v6hnNKfUd2CXvA48mv4p8z w56pDQttKgtwPAkv5n4GSuDxrxNVuFwxO1iY5CADMSNy1AJae9NeywDcKVHBELetPwi9By tTumYSLUt0kx0+dH3M5fgeUrBZfiy9PbHGkiTS/i8IfxAUAU4qOHXza72JnTxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pe3/rs09oRRgKTQW4Zk9AaQgbn3AMOakiP2UJ5juc1U=; b=oZijRuzoZOyrRRPmsQ2Qxf9x+OktylSdVUeWTDEc+oEP8zdWwVcigZXLaoV21RahTAcriM 3iNWxO4yCkA7VIgtPcRvXjpX2bQ9px5JI5hu5e5jHE58yq9Yu4ptCgxsKWNIkQatM5xVoN uMNDSeQBCYmpn/yvFzbakulFpbREOtBSm0R5v8r3zeDYfvGRlvYd7/J9mZkIu+W1baTsqH 8cZst4iMLTgZgNOf4jtkOTc2LVQscXacosvcSm0vF5vUPMDTXklP6cnbQ+Y5SaQyzSyFLA IjnS6vXzBObHsK2sKodmDN442PuI+b8c7cSYr2+3/OnJTKtdbKsaXw7Ji1G3gA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJp4qGMz6QP for ; Mon, 09 Mar 2026 11:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47708 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 0cac46229c1b - stable/15 - iwlwifi: mld: add LINUXKPI_PARAM_PREFIX 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/15 X-Git-Reftype: branch X-Git-Commit: 0cac46229c1b0480b72ecbb52e3b533891d22939 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:54 +0000 Message-Id: <69aea91a.47708.65fc7d4d@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0cac46229c1b0480b72ecbb52e3b533891d22939 commit 0cac46229c1b0480b72ecbb52e3b533891d22939 Author: Bjoern A. Zeeb AuthorDate: 2026-03-05 19:42:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:12 +0000 iwlwifi: mld: add LINUXKPI_PARAM_PREFIX Add a LINUXKPI_PARAM_PREFIX to mld to properly export the power_scheme module_param (sysctl). This is especially needed given mvm has the same parameter and we need to avoid a clash. Sponsored by: The FreeBSD Foundation (cherry picked from commit 7db8503bda2724ae145475c3260d581bb98613ad) --- sys/contrib/dev/iwlwifi/mld/mld.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/mld/mld.c b/sys/contrib/dev/iwlwifi/mld/mld.c index 3df9cabd34de..c2cabe855c01 100644 --- a/sys/contrib/dev/iwlwifi/mld/mld.c +++ b/sys/contrib/dev/iwlwifi/mld/mld.c @@ -2,6 +2,10 @@ /* * Copyright (C) 2024-2025 Intel Corporation */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX iwlwifi_mld_ +#endif + #include #include From nobody Mon Mar 9 11:03:55 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJr2HZqz6VZLY for ; Mon, 09 Mar 2026 11:03: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTvJr04WWz3ljN for ; Mon, 09 Mar 2026 11:03:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cZODhngZxVFKxma17EZIrjCNZTr12iYjG3okWc9S8qM=; b=czN+kT80ZNBOBfUSUqOeITmhMtAwWThOHUgpyG4d3IfFf58wGNKZls1fKK9nmzSAPACOR+ 6QJ75ROGQHfV8OxQ6loue0WErBzNoAT32u+vHu0taO00KZ0tP2ijvK/NMcJB3+HNej/pgZ aRuiBL9A9CMuQGlZ2tNxa1ij7PSlxYT/739w2jLUWkl1sDW0MCT0kPFgegnyrnDnev1K/F RrjuHPmxIymOAxYQq4BVnYv73rguzhm76ufpQl64eRy95zz01E2LvevX8D8IpgT3HMciKX XicS6rAl029dO6WbTTGP7hqGAmlww6J+gJxmuLQ2NdV1Q7EUBH/o6FvIZpviUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773054236; a=rsa-sha256; cv=none; b=fnkSgH0KS90ttSgkOX4uS5NhJgOE4llID+I/YrrMQQgboC4o5FuUv+FxMVeXam/3I5jt9C H4IoFeGdLRI3tT/qZzwG+ru6je8Qru6UoHm74t6Fxz7QwJ4h73ADZUkFIUC/3LcMFKgJRR yHDsBs3clzFs8AD8ru1ojvGPqJDmpQkjVksFGnTNPZORlLcP8hwXWmQZJbrA1oHjLzs/ku BV2u+pn3naa40c+lM84oK+gRTRJrZmmLBs3zzlmiBK1KEHWv3fBaz+KtC4ve7lvT55NkV/ fu3UgE2Xk1JCPuqOAyWOp3ll6g6C2Bd4bQQVOQhjCeKbkhGtYJfNK5ZWLZI8hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773054236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cZODhngZxVFKxma17EZIrjCNZTr12iYjG3okWc9S8qM=; b=FNgCIcUzQrO4VK1ENGhVzx/xGvqTnkUiDThsgyGUOIv/SJ62VJ1tYrRkKxm5EZo4tBHvAC 8vzAyuyu54/ak0Hdo4/tVjnQOq7BgrNC2oeh/Mse8TmslnRDSS+rUfydrXIgWkl74m7ER8 xTKQ+9dhLZbj6vcJJFc92oq5vcZH2XuYBPRYxcMmFCpmqOQM+JGpu2Lx3U4buMwucz4eCV DNWbet4vXOzKHvSUC0CE1ADHP6hq97/HNiSsZUiTxiT6qtWeIGnqkZxO4/TekcGwgqMjdL wWsnKc8gkN2cZslqQ12rBJpx2g/WhBuC9UOPmncmV4ZTldXqzjPtTCodX5UseA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTvJq6hQ2z775 for ; Mon, 09 Mar 2026 11:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47ae5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 11:03:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 79aafaec7e06 - stable/15 - iwlwifi: update Intel's mvm/mld drivers 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/15 X-Git-Reftype: branch X-Git-Commit: 79aafaec7e06718af959defe3c1d3374707bbbbb Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 11:03:55 +0000 Message-Id: <69aea91b.47ae5.4207f984@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=79aafaec7e06718af959defe3c1d3374707bbbbb commit 79aafaec7e06718af959defe3c1d3374707bbbbb Author: Bjoern A. Zeeb AuthorDate: 2026-03-06 10:45:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-09 11:03:12 +0000 iwlwifi: update Intel's mvm/mld drivers This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 05f7e89ab9731565d8a62e3b5d1ec206485eeb0b ( tag: v6.19 ). Sponsored by: The FreeBSD Foundation (cherry picked from commit 95dd8736f846dee1208fe4c306caf1b0baf3caba) --- sys/contrib/dev/iwlwifi/cfg/22000.c | 1 - sys/contrib/dev/iwlwifi/cfg/8000.c | 1 - sys/contrib/dev/iwlwifi/cfg/9000.c | 1 - sys/contrib/dev/iwlwifi/cfg/ax210.c | 1 - sys/contrib/dev/iwlwifi/cfg/bz.c | 20 +- sys/contrib/dev/iwlwifi/cfg/dr.c | 14 +- sys/contrib/dev/iwlwifi/cfg/rf-fm.c | 1 + sys/contrib/dev/iwlwifi/cfg/rf-gf.c | 22 +- sys/contrib/dev/iwlwifi/cfg/rf-hr.c | 2 +- sys/contrib/dev/iwlwifi/cfg/rf-pe.c | 1 + sys/contrib/dev/iwlwifi/cfg/rf-wh.c | 24 + sys/contrib/dev/iwlwifi/cfg/sc.c | 19 +- sys/contrib/dev/iwlwifi/fw/acpi.c | 6 +- sys/contrib/dev/iwlwifi/fw/acpi.h | 3 +- sys/contrib/dev/iwlwifi/fw/api/alive.h | 2 +- sys/contrib/dev/iwlwifi/fw/api/cmdhdr.h | 4 +- sys/contrib/dev/iwlwifi/fw/api/coex.h | 4 +- sys/contrib/dev/iwlwifi/fw/api/commands.h | 2 +- sys/contrib/dev/iwlwifi/fw/api/d3.h | 113 +- sys/contrib/dev/iwlwifi/fw/api/datapath.h | 5 + sys/contrib/dev/iwlwifi/fw/api/dbg-tlv.h | 14 +- sys/contrib/dev/iwlwifi/fw/api/debug.h | 2 +- sys/contrib/dev/iwlwifi/fw/api/location.h | 8 +- sys/contrib/dev/iwlwifi/fw/api/mac-cfg.h | 3 + sys/contrib/dev/iwlwifi/fw/api/nvm-reg.h | 134 +- sys/contrib/dev/iwlwifi/fw/api/offload.h | 2 +- sys/contrib/dev/iwlwifi/fw/api/power.h | 39 +- sys/contrib/dev/iwlwifi/fw/api/rs.h | 35 + sys/contrib/dev/iwlwifi/fw/api/rx.h | 286 ++++ sys/contrib/dev/iwlwifi/fw/api/scan.h | 78 +- sys/contrib/dev/iwlwifi/fw/api/sta.h | 6 +- sys/contrib/dev/iwlwifi/fw/api/stats.h | 39 +- sys/contrib/dev/iwlwifi/fw/api/tx.h | 2 +- sys/contrib/dev/iwlwifi/fw/dbg.c | 43 +- sys/contrib/dev/iwlwifi/fw/dump.c | 54 +- sys/contrib/dev/iwlwifi/fw/error-dump.h | 7 +- sys/contrib/dev/iwlwifi/fw/file.h | 74 +- sys/contrib/dev/iwlwifi/fw/img.h | 12 +- sys/contrib/dev/iwlwifi/fw/pnvm.c | 81 +- sys/contrib/dev/iwlwifi/fw/regulatory.c | 79 +- sys/contrib/dev/iwlwifi/fw/regulatory.h | 1 - sys/contrib/dev/iwlwifi/fw/runtime.h | 24 +- sys/contrib/dev/iwlwifi/fw/uefi.c | 7 +- sys/contrib/dev/iwlwifi/iwl-config.h | 51 +- sys/contrib/dev/iwlwifi/iwl-dbg-tlv.h | 4 +- sys/contrib/dev/iwlwifi/iwl-drv.c | 72 +- sys/contrib/dev/iwlwifi/iwl-drv.h | 12 +- sys/contrib/dev/iwlwifi/iwl-io.c | 96 +- sys/contrib/dev/iwlwifi/iwl-io.h | 2 +- sys/contrib/dev/iwlwifi/iwl-modparams.h | 4 +- sys/contrib/dev/iwlwifi/iwl-nvm-parse.c | 82 +- sys/contrib/dev/iwlwifi/iwl-nvm-parse.h | 91 +- sys/contrib/dev/iwlwifi/iwl-op-mode.h | 1 + sys/contrib/dev/iwlwifi/iwl-trans.c | 79 +- sys/contrib/dev/iwlwifi/iwl-trans.h | 87 +- sys/contrib/dev/iwlwifi/mld/constants.h | 2 + sys/contrib/dev/iwlwifi/mld/d3.c | 557 ++++--- sys/contrib/dev/iwlwifi/mld/debugfs.c | 8 +- sys/contrib/dev/iwlwifi/mld/fw.c | 14 +- sys/contrib/dev/iwlwifi/mld/iface.c | 54 +- sys/contrib/dev/iwlwifi/mld/iface.h | 5 +- sys/contrib/dev/iwlwifi/mld/key.c | 38 + sys/contrib/dev/iwlwifi/mld/key.h | 7 + sys/contrib/dev/iwlwifi/mld/link.c | 50 +- sys/contrib/dev/iwlwifi/mld/link.h | 2 + sys/contrib/dev/iwlwifi/mld/mac80211.c | 124 +- sys/contrib/dev/iwlwifi/mld/mld.c | 5 + sys/contrib/dev/iwlwifi/mld/mld.h | 25 +- sys/contrib/dev/iwlwifi/mld/mlo.c | 122 +- sys/contrib/dev/iwlwifi/mld/notif.c | 5 +- sys/contrib/dev/iwlwifi/mld/ptp.c | 7 + sys/contrib/dev/iwlwifi/mld/regulatory.c | 28 +- sys/contrib/dev/iwlwifi/mld/roc.c | 14 +- sys/contrib/dev/iwlwifi/mld/rx.c | 1717 ++++++++++++---------- sys/contrib/dev/iwlwifi/mld/rx.h | 5 +- sys/contrib/dev/iwlwifi/mld/scan.c | 4 +- sys/contrib/dev/iwlwifi/mld/sta.c | 10 +- sys/contrib/dev/iwlwifi/mld/stats.c | 11 +- sys/contrib/dev/iwlwifi/mld/tlc.c | 75 +- sys/contrib/dev/iwlwifi/mvm/coex.c | 131 -- sys/contrib/dev/iwlwifi/mvm/constants.h | 20 +- sys/contrib/dev/iwlwifi/mvm/d3.c | 398 +---- sys/contrib/dev/iwlwifi/mvm/debugfs-vif.c | 94 -- sys/contrib/dev/iwlwifi/mvm/debugfs.c | 3 +- sys/contrib/dev/iwlwifi/mvm/fw.c | 17 +- sys/contrib/dev/iwlwifi/mvm/link.c | 809 ---------- sys/contrib/dev/iwlwifi/mvm/mac-ctxt.c | 51 +- sys/contrib/dev/iwlwifi/mvm/mac80211.c | 124 +- sys/contrib/dev/iwlwifi/mvm/mld-mac80211.c | 141 +- sys/contrib/dev/iwlwifi/mvm/mld-sta.c | 2 - sys/contrib/dev/iwlwifi/mvm/mvm.h | 136 +- sys/contrib/dev/iwlwifi/mvm/ops.c | 53 - sys/contrib/dev/iwlwifi/mvm/phy-ctxt.c | 24 +- sys/contrib/dev/iwlwifi/mvm/ptp.c | 7 + sys/contrib/dev/iwlwifi/mvm/rx.c | 135 +- sys/contrib/dev/iwlwifi/mvm/rxmq.c | 23 +- sys/contrib/dev/iwlwifi/mvm/scan.c | 101 -- sys/contrib/dev/iwlwifi/mvm/sta.c | 89 -- sys/contrib/dev/iwlwifi/mvm/sta.h | 24 - sys/contrib/dev/iwlwifi/mvm/time-event.c | 17 +- sys/contrib/dev/iwlwifi/mvm/tx.c | 8 +- sys/contrib/dev/iwlwifi/mvm/utils.c | 22 +- sys/contrib/dev/iwlwifi/pcie/drv.c | 19 +- sys/contrib/dev/iwlwifi/pcie/gen1_2/internal.h | 53 +- sys/contrib/dev/iwlwifi/pcie/gen1_2/trans-gen2.c | 6 +- sys/contrib/dev/iwlwifi/pcie/gen1_2/trans.c | 252 +++- sys/contrib/dev/iwlwifi/pcie/gen1_2/tx.c | 5 +- sys/contrib/dev/iwlwifi/tests/Makefile | 2 +- sys/contrib/dev/iwlwifi/tests/devinfo.c | 29 + 109 files changed, 3118 insertions(+), 4423 deletions(-) diff --git a/sys/contrib/dev/iwlwifi/cfg/22000.c b/sys/contrib/dev/iwlwifi/cfg/22000.c index ca488931a33c..f0453f3f6ba6 100644 --- a/sys/contrib/dev/iwlwifi/cfg/22000.c +++ b/sys/contrib/dev/iwlwifi/cfg/22000.c @@ -38,7 +38,6 @@ static const struct iwl_family_base_params iwl_22000_base = { .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, .apmg_not_supported = true, .mac_addr_from_csr = 0x380, - .min_umac_error_event_table = 0x400000, .d3_debug_data_base_addr = 0x401000, .d3_debug_data_length = 60 * 1024, .mon_smem_regs = { diff --git a/sys/contrib/dev/iwlwifi/cfg/8000.c b/sys/contrib/dev/iwlwifi/cfg/8000.c index b56574006ee0..3c844cd419e8 100644 --- a/sys/contrib/dev/iwlwifi/cfg/8000.c +++ b/sys/contrib/dev/iwlwifi/cfg/8000.c @@ -50,7 +50,6 @@ static const struct iwl_family_base_params iwl8000_base = { .smem_offset = IWL8260_SMEM_OFFSET, .smem_len = IWL8260_SMEM_LEN, .apmg_not_supported = true, - .min_umac_error_event_table = 0x800000, }; static const struct iwl_tt_params iwl8000_tt_params = { diff --git a/sys/contrib/dev/iwlwifi/cfg/9000.c b/sys/contrib/dev/iwlwifi/cfg/9000.c index ac1fa291cf2f..5872fc9b8caf 100644 --- a/sys/contrib/dev/iwlwifi/cfg/9000.c +++ b/sys/contrib/dev/iwlwifi/cfg/9000.c @@ -41,7 +41,6 @@ static const struct iwl_family_base_params iwl9000_base = { .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, .apmg_not_supported = true, .mac_addr_from_csr = 0x380, - .min_umac_error_event_table = 0x800000, .d3_debug_data_base_addr = 0x401000, .d3_debug_data_length = 92 * 1024, .nvm_hw_section_num = 10, diff --git a/sys/contrib/dev/iwlwifi/cfg/ax210.c b/sys/contrib/dev/iwlwifi/cfg/ax210.c index ddf3d313da5a..582f61661062 100644 --- a/sys/contrib/dev/iwlwifi/cfg/ax210.c +++ b/sys/contrib/dev/iwlwifi/cfg/ax210.c @@ -33,7 +33,6 @@ static const struct iwl_family_base_params iwl_ax210_base = { .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, .apmg_not_supported = true, .mac_addr_from_csr = 0x380, - .min_umac_error_event_table = 0x400000, .d3_debug_data_base_addr = 0x401000, .d3_debug_data_length = 60 * 1024, .mon_smem_regs = { diff --git a/sys/contrib/dev/iwlwifi/cfg/bz.c b/sys/contrib/dev/iwlwifi/cfg/bz.c index 9f543946b285..d25445bd1e5c 100644 --- a/sys/contrib/dev/iwlwifi/cfg/bz.c +++ b/sys/contrib/dev/iwlwifi/cfg/bz.c @@ -9,11 +9,11 @@ #include "iwl-prph.h" #include "fw/api/txq.h" -/* Highest firmware API version supported */ -#define IWL_BZ_UCODE_API_MAX 102 +/* Highest firmware core release supported */ +#define IWL_BZ_UCODE_CORE_MAX 101 /* Lowest firmware API version supported */ -#define IWL_BZ_UCODE_API_MIN 98 +#define IWL_BZ_UCODE_API_MIN 100 /* Memory offsets and lengths */ #define IWL_BZ_SMEM_OFFSET 0x400000 @@ -38,7 +38,6 @@ static const struct iwl_family_base_params iwl_bz_base = { .smem_len = IWL_BZ_SMEM_LEN, .apmg_not_supported = true, .mac_addr_from_csr = 0x30, - .min_umac_error_event_table = 0xD0000, .d3_debug_data_base_addr = 0x401000, .d3_debug_data_length = 60 * 1024, .mon_smem_regs = { @@ -75,7 +74,7 @@ static const struct iwl_family_base_params iwl_bz_base = { }, }, .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, - .ucode_api_max = IWL_BZ_UCODE_API_MAX, + .ucode_api_max = ENCODE_CORE_AS_API(IWL_BZ_UCODE_CORE_MAX), .ucode_api_min = IWL_BZ_UCODE_API_MIN, }; @@ -90,6 +89,7 @@ const struct iwl_mac_cfg iwl_bz_mac_cfg = { .low_latency_xtal = true, .ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US, }; +EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_bz_mac_cfg); const struct iwl_mac_cfg iwl_gl_mac_cfg = { .device_family = IWL_DEVICE_FAMILY_BZ, @@ -101,8 +101,8 @@ const struct iwl_mac_cfg iwl_gl_mac_cfg = { .low_latency_xtal = true, }; -IWL_FW_AND_PNVM(IWL_BZ_A_FM_B_FW_PRE, IWL_BZ_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_BZ_A_FM_C_FW_PRE, IWL_BZ_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_BZ_A_FM4_B_FW_PRE, IWL_BZ_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_GL_B_FM_B_FW_PRE, IWL_BZ_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_GL_C_FM_C_FW_PRE, IWL_BZ_UCODE_API_MAX); +IWL_CORE_FW(IWL_BZ_A_FM_B_FW_PRE, IWL_BZ_UCODE_CORE_MAX); +IWL_CORE_FW(IWL_BZ_A_FM_C_FW_PRE, IWL_BZ_UCODE_CORE_MAX); +IWL_CORE_FW(IWL_BZ_A_FM4_B_FW_PRE, IWL_BZ_UCODE_CORE_MAX); +IWL_CORE_FW(IWL_GL_B_FM_B_FW_PRE, IWL_BZ_UCODE_CORE_MAX); +IWL_CORE_FW(IWL_GL_C_FM_C_FW_PRE, IWL_BZ_UCODE_CORE_MAX); diff --git a/sys/contrib/dev/iwlwifi/cfg/dr.c b/sys/contrib/dev/iwlwifi/cfg/dr.c index 807f4e29d55a..a279dcfd3083 100644 --- a/sys/contrib/dev/iwlwifi/cfg/dr.c +++ b/sys/contrib/dev/iwlwifi/cfg/dr.c @@ -8,11 +8,11 @@ #include "iwl-prph.h" #include "fw/api/txq.h" -/* Highest firmware API version supported */ -#define IWL_DR_UCODE_API_MAX 102 +/* Highest firmware core release supported */ +#define IWL_DR_UCODE_CORE_MAX 101 /* Lowest firmware API version supported */ -#define IWL_DR_UCODE_API_MIN 98 +#define IWL_DR_UCODE_API_MIN 100 /* Memory offsets and lengths */ #define IWL_DR_SMEM_OFFSET 0x400000 @@ -20,9 +20,6 @@ #define IWL_DR_A_PE_A_FW_PRE "iwlwifi-dr-a0-pe-a0" -#define IWL_DR_A_PE_A_FW_MODULE_FIRMWARE(api) \ - IWL_DR_A_PE_A_FW_PRE "-" __stringify(api) ".ucode" - static const struct iwl_family_base_params iwl_dr_base = { .num_of_queues = 512, .max_tfd_queue_size = 65536, @@ -36,7 +33,6 @@ static const struct iwl_family_base_params iwl_dr_base = { .smem_len = IWL_DR_SMEM_LEN, .apmg_not_supported = true, .mac_addr_from_csr = 0x30, - .min_umac_error_event_table = 0xD0000, .d3_debug_data_base_addr = 0x401000, .d3_debug_data_length = 60 * 1024, .mon_smem_regs = { @@ -73,7 +69,7 @@ static const struct iwl_family_base_params iwl_dr_base = { }, }, .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, - .ucode_api_max = IWL_DR_UCODE_API_MAX, + .ucode_api_max = ENCODE_CORE_AS_API(IWL_DR_UCODE_CORE_MAX), .ucode_api_min = IWL_DR_UCODE_API_MIN, }; @@ -89,5 +85,5 @@ const struct iwl_mac_cfg iwl_dr_mac_cfg = { .ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US, }; -MODULE_FIRMWARE(IWL_DR_A_PE_A_FW_MODULE_FIRMWARE(IWL_DR_UCODE_API_MAX)); +IWL_CORE_FW(IWL_DR_A_PE_A_FW_PRE, IWL_DR_UCODE_CORE_MAX); diff --git a/sys/contrib/dev/iwlwifi/cfg/rf-fm.c b/sys/contrib/dev/iwlwifi/cfg/rf-fm.c index 456a666c8dfd..fd82050e33a3 100644 --- a/sys/contrib/dev/iwlwifi/cfg/rf-fm.c +++ b/sys/contrib/dev/iwlwifi/cfg/rf-fm.c @@ -19,6 +19,7 @@ .non_shared_ant = ANT_B, \ .vht_mu_mimo_supported = true, \ .uhb_supported = true, \ + .eht_supported = true, \ .num_rbds = IWL_NUM_RBDS_EHT, \ .nvm_ver = IWL_FM_NVM_VERSION, \ .nvm_type = IWL_NVM_EXT diff --git a/sys/contrib/dev/iwlwifi/cfg/rf-gf.c b/sys/contrib/dev/iwlwifi/cfg/rf-gf.c index 7ff5170faaa9..c16cda087a7c 100644 --- a/sys/contrib/dev/iwlwifi/cfg/rf-gf.c +++ b/sys/contrib/dev/iwlwifi/cfg/rf-gf.c @@ -9,7 +9,7 @@ #define IWL_GF_UCODE_API_MAX 100 /* Lowest firmware API version supported */ -#define IWL_GF_UCODE_API_MIN 98 +#define IWL_GF_UCODE_API_MIN 100 #define IWL_SO_A_GF_A_FW_PRE "iwlwifi-so-a0-gf-a0" #define IWL_TY_A_GF_A_FW_PRE "iwlwifi-ty-a0-gf-a0" @@ -23,6 +23,18 @@ #define IWL_SC_A_GF_A_FW_PRE "iwlwifi-sc-a0-gf-a0" #define IWL_SC_A_GF4_A_FW_PRE "iwlwifi-sc-a0-gf4-a0" +#define IWL_BZ_A_GF_A_MODULE_FIRMWARE(api) \ + IWL_BZ_A_GF_A_FW_PRE "-" __stringify(api) ".ucode" + +#define IWL_BZ_A_GF4_A_MODULE_FIRMWARE(api) \ + IWL_BZ_A_GF4_A_FW_PRE "-" __stringify(api) ".ucode" + +#define IWL_SC_A_GF_A_MODULE_FIRMWARE(api) \ + IWL_SC_A_GF_A_FW_PRE "-" __stringify(api) ".ucode" + +#define IWL_SC_A_GF4_A_MODULE_FIRMWARE(api) \ + IWL_SC_A_GF4_A_FW_PRE "-" __stringify(api) ".ucode" + /* NVM versions */ #define IWL_GF_NVM_VERSION 0x0a1d @@ -67,7 +79,7 @@ IWL_FW_AND_PNVM(IWL_MA_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX); IWL_FW_AND_PNVM(IWL_MA_B_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX); IWL_FW_AND_PNVM(IWL_MA_A_GF4_A_FW_PRE, IWL_GF_UCODE_API_MAX); IWL_FW_AND_PNVM(IWL_MA_B_GF4_A_FW_PRE, IWL_GF_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_BZ_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_BZ_A_GF4_A_FW_PRE, IWL_GF_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_SC_A_GF_A_FW_PRE, IWL_GF_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_SC_A_GF4_A_FW_PRE, IWL_GF_UCODE_API_MAX); +MODULE_FIRMWARE(IWL_BZ_A_GF_A_MODULE_FIRMWARE(IWL_GF_UCODE_API_MAX)); +MODULE_FIRMWARE(IWL_BZ_A_GF4_A_MODULE_FIRMWARE(IWL_GF_UCODE_API_MAX)); +MODULE_FIRMWARE(IWL_SC_A_GF_A_MODULE_FIRMWARE(IWL_GF_UCODE_API_MAX)); +MODULE_FIRMWARE(IWL_SC_A_GF4_A_MODULE_FIRMWARE(IWL_GF_UCODE_API_MAX)); diff --git a/sys/contrib/dev/iwlwifi/cfg/rf-hr.c b/sys/contrib/dev/iwlwifi/cfg/rf-hr.c index 9f408d276ce9..6cf187d92dbf 100644 --- a/sys/contrib/dev/iwlwifi/cfg/rf-hr.c +++ b/sys/contrib/dev/iwlwifi/cfg/rf-hr.c @@ -9,7 +9,7 @@ #define IWL_HR_UCODE_API_MAX 100 /* Lowest firmware API version supported */ -#define IWL_HR_UCODE_API_MIN 98 +#define IWL_HR_UCODE_API_MIN 100 #define IWL_QU_B_HR_B_FW_PRE "iwlwifi-Qu-b0-hr-b0" #define IWL_QU_C_HR_B_FW_PRE "iwlwifi-Qu-c0-hr-b0" diff --git a/sys/contrib/dev/iwlwifi/cfg/rf-pe.c b/sys/contrib/dev/iwlwifi/cfg/rf-pe.c index 483f21659eff..408b9850bd10 100644 --- a/sys/contrib/dev/iwlwifi/cfg/rf-pe.c +++ b/sys/contrib/dev/iwlwifi/cfg/rf-pe.c @@ -12,5 +12,6 @@ const char iwl_killer_bn1850i_name[] = "Killer(R) Wi-Fi 8 BN1850i 320MHz Wireless Network Adapter (BN201.NGW)"; const char iwl_bn201_name[] = "Intel(R) Wi-Fi 8 BN201"; +const char iwl_bn203_name[] = "Intel(R) Wi-Fi 8 BN203"; const char iwl_be221_name[] = "Intel(R) Wi-Fi 7 BE221"; const char iwl_be223_name[] = "Intel(R) Wi-Fi 7 BE223"; diff --git a/sys/contrib/dev/iwlwifi/cfg/rf-wh.c b/sys/contrib/dev/iwlwifi/cfg/rf-wh.c index 97735175cb0e..b5803ea1eb78 100644 --- a/sys/contrib/dev/iwlwifi/cfg/rf-wh.c +++ b/sys/contrib/dev/iwlwifi/cfg/rf-wh.c @@ -4,8 +4,31 @@ */ #include "iwl-config.h" +/* NVM versions */ +#define IWL_WH_NVM_VERSION 0x0a1d + +#define IWL_DEVICE_WH \ + .ht_params = { \ + .stbc = true, \ + .ldpc = true, \ + .ht40_bands = BIT(NL80211_BAND_2GHZ) | \ + BIT(NL80211_BAND_5GHZ), \ + }, \ + .led_mode = IWL_LED_RF_STATE, \ + .non_shared_ant = ANT_B, \ + .vht_mu_mimo_supported = true, \ + .uhb_supported = true, \ + .num_rbds = IWL_NUM_RBDS_EHT, \ + .nvm_ver = IWL_WH_NVM_VERSION, \ + .nvm_type = IWL_NVM_EXT + /* currently iwl_rf_wh/iwl_rf_wh_160mhz are just defines for the FM ones */ +const struct iwl_rf_cfg iwl_rf_wh_non_eht = { + IWL_DEVICE_WH, + .eht_supported = false, +}; + const char iwl_killer_be1775s_name[] = "Killer(R) Wi-Fi 7 BE1775s 320MHz Wireless Network Adapter (BE211D2W)"; const char iwl_killer_be1775i_name[] = @@ -13,3 +36,4 @@ const char iwl_killer_be1775i_name[] = const char iwl_be211_name[] = "Intel(R) Wi-Fi 7 BE211 320MHz"; const char iwl_be213_name[] = "Intel(R) Wi-Fi 7 BE213 160MHz"; +const char iwl_ax221_name[] = "Intel(R) Wi-Fi 6E AX221 160MHz"; diff --git a/sys/contrib/dev/iwlwifi/cfg/sc.c b/sys/contrib/dev/iwlwifi/cfg/sc.c index 6d4a3bce49b9..ee00b2af7a1d 100644 --- a/sys/contrib/dev/iwlwifi/cfg/sc.c +++ b/sys/contrib/dev/iwlwifi/cfg/sc.c @@ -9,11 +9,11 @@ #include "iwl-prph.h" #include "fw/api/txq.h" -/* Highest firmware API version supported */ -#define IWL_SC_UCODE_API_MAX 102 +/* Highest firmware core release supported */ +#define IWL_SC_UCODE_CORE_MAX 101 /* Lowest firmware API version supported */ -#define IWL_SC_UCODE_API_MIN 98 +#define IWL_SC_UCODE_API_MIN 100 /* NVM versions */ #define IWL_SC_NVM_VERSION 0x0a1d @@ -41,7 +41,6 @@ static const struct iwl_family_base_params iwl_sc_base = { .smem_len = IWL_SC_SMEM_LEN, .apmg_not_supported = true, .mac_addr_from_csr = 0x30, - .min_umac_error_event_table = 0xD0000, .d3_debug_data_base_addr = 0x401000, .d3_debug_data_length = 60 * 1024, .mon_smem_regs = { @@ -78,7 +77,7 @@ static const struct iwl_family_base_params iwl_sc_base = { }, }, .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM, - .ucode_api_max = IWL_SC_UCODE_API_MAX, + .ucode_api_max = ENCODE_CORE_AS_API(IWL_SC_UCODE_CORE_MAX), .ucode_api_min = IWL_SC_UCODE_API_MIN, }; @@ -94,8 +93,8 @@ const struct iwl_mac_cfg iwl_sc_mac_cfg = { .ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US, }; -IWL_FW_AND_PNVM(IWL_SC_A_FM_B_FW_PRE, IWL_SC_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_SC_A_FM_C_FW_PRE, IWL_SC_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_SC_A_WH_A_FW_PRE, IWL_SC_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_SC2_A_FM_C_FW_PRE, IWL_SC_UCODE_API_MAX); -IWL_FW_AND_PNVM(IWL_SC2_A_WH_A_FW_PRE, IWL_SC_UCODE_API_MAX); +IWL_CORE_FW(IWL_SC_A_FM_B_FW_PRE, IWL_SC_UCODE_CORE_MAX); +IWL_CORE_FW(IWL_SC_A_FM_C_FW_PRE, IWL_SC_UCODE_CORE_MAX); +IWL_CORE_FW(IWL_SC_A_WH_A_FW_PRE, IWL_SC_UCODE_CORE_MAX); +IWL_CORE_FW(IWL_SC2_A_FM_C_FW_PRE, IWL_SC_UCODE_CORE_MAX); +IWL_CORE_FW(IWL_SC2_A_WH_A_FW_PRE, IWL_SC_UCODE_CORE_MAX); diff --git a/sys/contrib/dev/iwlwifi/fw/acpi.c b/sys/contrib/dev/iwlwifi/fw/acpi.c index 7ec22738b5d6..52edc19d8cdd 100644 --- a/sys/contrib/dev/iwlwifi/fw/acpi.c +++ b/sys/contrib/dev/iwlwifi/fw/acpi.c @@ -9,9 +9,9 @@ #include "acpi.h" #include "fw/runtime.h" -const guid_t iwl_guid = GUID_INIT(0xF21202BF, 0x8F78, 0x4DC6, - 0xA5, 0xB3, 0x1F, 0x73, - 0x8E, 0x28, 0x5A, 0xDE); +static const guid_t iwl_guid = GUID_INIT(0xF21202BF, 0x8F78, 0x4DC6, + 0xA5, 0xB3, 0x1F, 0x73, + 0x8E, 0x28, 0x5A, 0xDE); static const size_t acpi_dsm_size[DSM_FUNC_NUM_FUNCS] = { [DSM_FUNC_QUERY] = sizeof(u32), diff --git a/sys/contrib/dev/iwlwifi/fw/acpi.h b/sys/contrib/dev/iwlwifi/fw/acpi.h index 68d8fb5f6357..06cece4ea6d9 100644 --- a/sys/contrib/dev/iwlwifi/fw/acpi.h +++ b/sys/contrib/dev/iwlwifi/fw/acpi.h @@ -140,8 +140,6 @@ struct iwl_dsm_internal_product_reset_cmd { struct iwl_fw_runtime; -extern const guid_t iwl_guid; - union acpi_object *iwl_acpi_get_dsm_object(struct device *dev, int rev, int func, union acpi_object *args, const guid_t *guid); @@ -153,6 +151,7 @@ union acpi_object *iwl_acpi_get_dsm_object(struct device *dev, int rev, * @mcc: output buffer (3 bytes) that will get the MCC * * This function tries to read the current MCC from ACPI if available. + * Return: 0 on success, or a negative error code */ int iwl_acpi_get_mcc(struct iwl_fw_runtime *fwrt, char *mcc); diff --git a/sys/contrib/dev/iwlwifi/fw/api/alive.h b/sys/contrib/dev/iwlwifi/fw/api/alive.h index ad5b95cad0bf..ea2ba4b4cb7b 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/alive.h +++ b/sys/contrib/dev/iwlwifi/fw/api/alive.h @@ -88,7 +88,7 @@ struct iwl_imr_alive_info { __le32 enabled; } __packed; /* IMR_ALIVE_INFO_API_S_VER_1 */ -struct iwl_alive_ntf_v6 { +struct iwl_alive_ntf_v7 { __le16 status; __le16 flags; struct iwl_lmac_alive lmac_data[2]; diff --git a/sys/contrib/dev/iwlwifi/fw/api/cmdhdr.h b/sys/contrib/dev/iwlwifi/fw/api/cmdhdr.h index d130d4f85444..073f003bdc5d 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/cmdhdr.h +++ b/sys/contrib/dev/iwlwifi/fw/api/cmdhdr.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /* - * Copyright (C) 2005-2014 Intel Corporation + * Copyright (C) 2005-2014, 2025 Intel Corporation * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH */ @@ -98,7 +98,7 @@ struct iwl_cmd_header { } __packed; /** - * struct iwl_cmd_header_wide + * struct iwl_cmd_header_wide - wide command header * * This header format appears in the beginning of each command sent from the * driver, and each response/notification received from uCode. diff --git a/sys/contrib/dev/iwlwifi/fw/api/coex.h b/sys/contrib/dev/iwlwifi/fw/api/coex.h index ddc84430d895..616f00a8b603 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/coex.h +++ b/sys/contrib/dev/iwlwifi/fw/api/coex.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /* - * Copyright (C) 2023-2024 Intel Corporation + * Copyright (C) 2023-2025 Intel Corporation * Copyright (C) 2013-2014, 2018-2019 Intel Corporation * Copyright (C) 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2017 Intel Deutschland GmbH @@ -52,7 +52,7 @@ struct iwl_bt_coex_cmd { } __packed; /* BT_COEX_CMD_API_S_VER_6 */ /** - * struct iwl_bt_coex_reduced_txp_update_cmd + * struct iwl_bt_coex_reduced_txp_update_cmd - reduced TX power command * @reduced_txp: bit BT_REDUCED_TX_POWER_BIT to enable / disable, rest of the * bits are the sta_id (value) */ diff --git a/sys/contrib/dev/iwlwifi/fw/api/commands.h b/sys/contrib/dev/iwlwifi/fw/api/commands.h index 997b0c9ce984..8d64a271bb94 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/commands.h +++ b/sys/contrib/dev/iwlwifi/fw/api/commands.h @@ -60,7 +60,7 @@ enum iwl_legacy_cmds { * @UCODE_ALIVE_NTFY: * Alive data from the firmware, as described in * &struct iwl_alive_ntf_v3 or &struct iwl_alive_ntf_v4 or - * &struct iwl_alive_ntf_v5 or &struct iwl_alive_ntf_v6. + * &struct iwl_alive_ntf_v5 or &struct iwl_alive_ntf_v7. */ UCODE_ALIVE_NTFY = 0x1, diff --git a/sys/contrib/dev/iwlwifi/fw/api/d3.h b/sys/contrib/dev/iwlwifi/fw/api/d3.h index 53445087e9cb..d3bed0216df4 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/d3.h +++ b/sys/contrib/dev/iwlwifi/fw/api/d3.h @@ -367,6 +367,7 @@ enum iwl_wowlan_flags { ENABLE_NBNS_FILTERING = BIT(2), ENABLE_DHCP_FILTERING = BIT(3), ENABLE_STORE_BEACON = BIT(4), + HAS_BEACON_PROTECTION = BIT(5), }; /** @@ -631,9 +632,64 @@ struct iwl_wowlan_gtk_status_v3 { struct iwl_wowlan_all_rsc_tsc_v5 sc; } __packed; /* WOWLAN_GTK_MATERIAL_VER_3 */ +/** + * enum iwl_wowlan_key_status - Status of security keys in WoWLAN notifications + * @IWL_WOWLAN_NOTIF_NO_KEY: No key is present; this entry should be ignored. + * @IWL_WOWLAN_STATUS_OLD_KEY: old key exists; no rekey occurred, and only + * metadata is available. + * @IWL_WOWLAN_STATUS_NEW_KEY: A new key was created after a rekey; new key + * material is available. + */ +enum iwl_wowlan_key_status { + IWL_WOWLAN_NOTIF_NO_KEY = 0, + IWL_WOWLAN_STATUS_OLD_KEY = 1, + IWL_WOWLAN_STATUS_NEW_KEY = 2 +}; + +/** + * struct iwl_wowlan_gtk_status - GTK status + * @key: GTK material + * @key_len: GTK length, if set to 0, the key is not available + * @key_flags: information about the key: + * bits[0:1]: key index assigned by the AP + * bits[2:6]: GTK index of the key in the internal DB + * bit[7]: Set iff this is the currently used GTK + * @key_status: key status, see &enum iwl_wowlan_key_status + * @reserved: padding + * @tkip_mic_key: TKIP RX MIC key + * @sc: RSC/TSC counters + */ +struct iwl_wowlan_gtk_status { + u8 key[WOWLAN_KEY_MAX_SIZE]; + u8 key_len; + u8 key_flags; + u8 key_status; + u8 reserved; + u8 tkip_mic_key[IWL_MIC_KEY_SIZE]; + struct iwl_wowlan_all_rsc_tsc_v5 sc; +} __packed; /* WOWLAN_GTK_MATERIAL_VER_4 */ + #define IWL_WOWLAN_GTK_IDX_MASK (BIT(0) | BIT(1)) #define IWL_WOWLAN_IGTK_BIGTK_IDX_MASK (BIT(0)) +/** + * struct iwl_wowlan_igtk_status_v1 - IGTK status + * @key: IGTK material + * @ipn: the IGTK packet number (replay counter) + * @key_len: IGTK length, if set to 0, the key is not available + * @key_flags: information about the key: + * bits[0]: key index assigned by the AP (0: index 4, 1: index 5) + * (0: index 6, 1: index 7 with bigtk) + * bits[1:5]: IGTK index of the key in the internal DB + * bit[6]: Set iff this is the currently used IGTK + */ +struct iwl_wowlan_igtk_status_v1 { + u8 key[WOWLAN_KEY_MAX_SIZE]; + u8 ipn[6]; + u8 key_len; + u8 key_flags; +} __packed; /* WOWLAN_IGTK_MATERIAL_VER_1 */ + /** * struct iwl_wowlan_igtk_status - IGTK status * @key: IGTK material @@ -644,13 +700,17 @@ struct iwl_wowlan_gtk_status_v3 { * (0: index 6, 1: index 7 with bigtk) * bits[1:5]: IGTK index of the key in the internal DB * bit[6]: Set iff this is the currently used IGTK + * @key_status: key status, see &enum iwl_wowlan_key_status + * @reserved: padding */ struct iwl_wowlan_igtk_status { u8 key[WOWLAN_KEY_MAX_SIZE]; u8 ipn[6]; u8 key_len; u8 key_flags; -} __packed; /* WOWLAN_IGTK_MATERIAL_VER_1 */ + u8 key_status; + u8 reserved[3]; +} __packed; /* WOWLAN_IGTK_MATERIAL_VER_2 */ /** * struct iwl_wowlan_status_v6 - WoWLAN status @@ -700,7 +760,7 @@ struct iwl_wowlan_status_v6 { */ struct iwl_wowlan_status_v7 { struct iwl_wowlan_gtk_status_v2 gtk[WOWLAN_GTK_KEYS_NUM]; - struct iwl_wowlan_igtk_status igtk[WOWLAN_IGTK_KEYS_NUM]; + struct iwl_wowlan_igtk_status_v1 igtk[WOWLAN_IGTK_KEYS_NUM]; __le64 replay_ctr; __le16 pattern_number; __le16 non_qos_seq_ctr; @@ -735,7 +795,7 @@ struct iwl_wowlan_status_v7 { */ struct iwl_wowlan_info_notif_v1 { struct iwl_wowlan_gtk_status_v3 gtk[WOWLAN_GTK_KEYS_NUM]; - struct iwl_wowlan_igtk_status igtk[WOWLAN_IGTK_KEYS_NUM]; + struct iwl_wowlan_igtk_status_v1 igtk[WOWLAN_IGTK_KEYS_NUM]; __le64 replay_ctr; __le16 pattern_number; __le16 reserved1; @@ -817,8 +877,8 @@ struct iwl_wowlan_mlo_gtk { */ struct iwl_wowlan_info_notif_v3 { struct iwl_wowlan_gtk_status_v3 gtk[WOWLAN_GTK_KEYS_NUM]; - struct iwl_wowlan_igtk_status igtk[WOWLAN_IGTK_KEYS_NUM]; - struct iwl_wowlan_igtk_status bigtk[WOWLAN_BIGTK_KEYS_NUM]; + struct iwl_wowlan_igtk_status_v1 igtk[WOWLAN_IGTK_KEYS_NUM]; + struct iwl_wowlan_igtk_status_v1 bigtk[WOWLAN_BIGTK_KEYS_NUM]; __le64 replay_ctr; __le16 pattern_number; __le16 reserved1; @@ -832,6 +892,45 @@ struct iwl_wowlan_info_notif_v3 { u8 reserved2[2]; } __packed; /* WOWLAN_INFO_NTFY_API_S_VER_3 */ +/** + * struct iwl_wowlan_info_notif_v5 - WoWLAN information notification + * @gtk: GTK data + * @igtk: IGTK data + * @bigtk: BIGTK data + * @replay_ctr: GTK rekey replay counter + * @pattern_number: number of the matched patterns + * @qos_seq_ctr: QoS sequence counters to use next + * @wakeup_reasons: wakeup reasons, see &enum iwl_wowlan_wakeup_reason + * @num_of_gtk_rekeys: number of GTK rekeys + * @transmitted_ndps: number of transmitted neighbor discovery packets + * @received_beacons: number of received beacons + * @tid_tear_down: bit mask of tids whose BA sessions were closed + * in suspend state + * @station_id: station id + * @num_mlo_link_keys: number of &struct iwl_wowlan_mlo_gtk structs + * following this notif + * @tid_offloaded_tx: tid used by the firmware to transmit data packets + * while in wowlan + * @mlo_gtks: array of GTKs of size num_mlo_link_keys + */ +struct iwl_wowlan_info_notif_v5 { + struct iwl_wowlan_gtk_status_v3 gtk[WOWLAN_GTK_KEYS_NUM]; + struct iwl_wowlan_igtk_status_v1 igtk[WOWLAN_IGTK_KEYS_NUM]; + struct iwl_wowlan_igtk_status_v1 bigtk[WOWLAN_BIGTK_KEYS_NUM]; + __le64 replay_ctr; + __le16 pattern_number; + __le16 qos_seq_ctr; + __le32 wakeup_reasons; + __le32 num_of_gtk_rekeys; + __le32 transmitted_ndps; + __le32 received_beacons; + u8 tid_tear_down; + u8 station_id; + u8 num_mlo_link_keys; + u8 tid_offloaded_tx; + struct iwl_wowlan_mlo_gtk mlo_gtks[]; +} __packed; /* WOWLAN_INFO_NTFY_API_S_VER_5 */ + /** * struct iwl_wowlan_info_notif - WoWLAN information notification * @gtk: GTK data @@ -854,7 +953,7 @@ struct iwl_wowlan_info_notif_v3 { * @mlo_gtks: array of GTKs of size num_mlo_link_keys */ struct iwl_wowlan_info_notif { - struct iwl_wowlan_gtk_status_v3 gtk[WOWLAN_GTK_KEYS_NUM]; + struct iwl_wowlan_gtk_status gtk[WOWLAN_GTK_KEYS_NUM]; struct iwl_wowlan_igtk_status igtk[WOWLAN_IGTK_KEYS_NUM]; struct iwl_wowlan_igtk_status bigtk[WOWLAN_BIGTK_KEYS_NUM]; __le64 replay_ctr; @@ -869,7 +968,7 @@ struct iwl_wowlan_info_notif { u8 num_mlo_link_keys; u8 tid_offloaded_tx; struct iwl_wowlan_mlo_gtk mlo_gtks[]; -} __packed; /* WOWLAN_INFO_NTFY_API_S_VER_5 */ +} __packed; /* WOWLAN_INFO_NTFY_API_S_VER_6 */ /** * struct iwl_wowlan_wake_pkt_notif - WoWLAN wake packet notification diff --git a/sys/contrib/dev/iwlwifi/fw/api/datapath.h b/sys/contrib/dev/iwlwifi/fw/api/datapath.h index b1c6ee8ae2df..6a6e11a57dbf 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/datapath.h +++ b/sys/contrib/dev/iwlwifi/fw/api/datapath.h @@ -123,6 +123,11 @@ enum iwl_data_path_subcmd_ids { */ BEACON_FILTER_IN_NOTIF = 0xF8, + /** + * @PHY_AIR_SNIFFER_NOTIF: &struct iwl_rx_phy_air_sniffer_ntfy + */ + PHY_AIR_SNIFFER_NOTIF = 0xF9, + /** * @STA_PM_NOTIF: &struct iwl_mvm_pm_state_notification */ diff --git a/sys/contrib/dev/iwlwifi/fw/api/dbg-tlv.h b/sys/contrib/dev/iwlwifi/fw/api/dbg-tlv.h index 3173fa96cb48..b62f0687327a 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/dbg-tlv.h +++ b/sys/contrib/dev/iwlwifi/fw/api/dbg-tlv.h @@ -16,7 +16,7 @@ #define IWL_FW_INI_PRESET_DISABLE 0xff /** - * struct iwl_fw_ini_hcmd + * struct iwl_fw_ini_hcmd - debug configuration host command * * @id: the debug configuration command type for instance: 0xf6 / 0xf5 / DHC * @group: the desired cmd group @@ -199,7 +199,7 @@ struct iwl_fw_ini_region_tlv { } __packed; /* FW_TLV_DEBUG_REGION_API_S_VER_1 */ /** - * struct iwl_fw_ini_debug_info_tlv + * struct iwl_fw_ini_debug_info_tlv - debug info TLV * * debug configuration name for a specific image * @@ -311,7 +311,7 @@ struct iwl_fw_ini_conf_set_tlv { } __packed; /* FW_TLV_DEBUG_CONFIG_SET_API_S_VER_1 */ /** - * enum iwl_fw_ini_config_set_type + * enum iwl_fw_ini_config_set_type - configuration set type * * @IWL_FW_INI_CONFIG_SET_TYPE_INVALID: invalid config set * @IWL_FW_INI_CONFIG_SET_TYPE_DEVICE_PERIPHERY_MAC: for PERIPHERY MAC configuration @@ -337,7 +337,7 @@ enum iwl_fw_ini_config_set_type { } __packed; /** - * enum iwl_fw_ini_allocation_id + * enum iwl_fw_ini_allocation_id - allocation ID * * @IWL_FW_INI_ALLOCATION_INVALID: invalid * @IWL_FW_INI_ALLOCATION_ID_DBGC1: allocation meant for DBGC1 configuration @@ -356,7 +356,7 @@ enum iwl_fw_ini_allocation_id { }; /* FW_DEBUG_TLV_ALLOCATION_ID_E_VER_1 */ /** - * enum iwl_fw_ini_buffer_location + * enum iwl_fw_ini_buffer_location - buffer location * * @IWL_FW_INI_LOCATION_INVALID: invalid * @IWL_FW_INI_LOCATION_SRAM_PATH: SRAM location @@ -373,7 +373,7 @@ enum iwl_fw_ini_buffer_location { }; /* FW_DEBUG_TLV_BUFFER_LOCATION_E_VER_1 */ /** - * enum iwl_fw_ini_region_type + * enum iwl_fw_ini_region_type - region type * * @IWL_FW_INI_REGION_INVALID: invalid * @IWL_FW_INI_REGION_TLV: uCode and debug TLVs @@ -437,7 +437,7 @@ enum iwl_fw_ini_region_device_memory_subtype { }; /* FW_TLV_DEBUG_REGION_DEVICE_MEMORY_SUBTYPE_API_E */ /** - * enum iwl_fw_ini_time_point + * enum iwl_fw_ini_time_point - time point type * * Hard coded time points in which the driver can send hcmd or perform dump * collection diff --git a/sys/contrib/dev/iwlwifi/fw/api/debug.h b/sys/contrib/dev/iwlwifi/fw/api/debug.h index 0cf1e5124fba..61a850de26fc 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/debug.h +++ b/sys/contrib/dev/iwlwifi/fw/api/debug.h @@ -421,7 +421,7 @@ struct iwl_dbgc1_info { } __packed; /* INIT_DRAM_FRAGS_ALLOCATIONS_S_VER_1 */ /** - * struct iwl_dbg_host_event_cfg_cmd + * struct iwl_dbg_host_event_cfg_cmd - host event config command * @enabled_severities: enabled severities */ struct iwl_dbg_host_event_cfg_cmd { diff --git a/sys/contrib/dev/iwlwifi/fw/api/location.h b/sys/contrib/dev/iwlwifi/fw/api/location.h index 33541f92c7c7..2ee3a48aa5df 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/location.h +++ b/sys/contrib/dev/iwlwifi/fw/api/location.h @@ -1092,7 +1092,7 @@ struct iwl_tof_range_req_ap_entry { } __packed; /* LOCATION_RANGE_REQ_AP_ENTRY_CMD_API_S_VER_9 */ /** - * enum iwl_tof_response_mode + * enum iwl_tof_response_mode - TOF response mode * @IWL_MVM_TOF_RESPONSE_ASAP: report each AP measurement separately as soon as * possible (not supported for this release) * @IWL_MVM_TOF_RESPONSE_TIMEOUT: report all AP measurements as a batch upon @@ -1108,7 +1108,7 @@ enum iwl_tof_response_mode { }; /** - * enum iwl_tof_initiator_flags + * enum iwl_tof_initiator_flags - TOF initiator flags * * @IWL_TOF_INITIATOR_FLAGS_FAST_ALGO_DISABLED: disable fast algo, meaning run * the algo on ant A+B, instead of only one of them. @@ -1409,7 +1409,7 @@ enum iwl_tof_range_request_status { }; /** - * enum iwl_tof_entry_status + * enum iwl_tof_entry_status - TOF entry status * * @IWL_TOF_ENTRY_SUCCESS: successful measurement. * @IWL_TOF_ENTRY_GENERAL_FAILURE: General failure. @@ -1856,7 +1856,7 @@ struct iwl_tof_mcsi_notif { } __packed; /** - * struct iwl_tof_range_abort_cmd + * struct iwl_tof_range_abort_cmd - TOF range abort command * @request_id: corresponds to a range request * @reserved: reserved */ diff --git a/sys/contrib/dev/iwlwifi/fw/api/mac-cfg.h b/sys/contrib/dev/iwlwifi/fw/api/mac-cfg.h index b9f559dac39f..f76cea6e9ec8 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/mac-cfg.h +++ b/sys/contrib/dev/iwlwifi/fw/api/mac-cfg.h @@ -420,6 +420,8 @@ struct iwl_mac_config_cmd { * eht_support set to true. No longer used since _VER_3 of this command. * @LINK_CONTEXT_MODIFY_BANDWIDTH: Covers iwl_link_ctx_cfg_cmd::modify_bandwidth. * Request RX OMI to the AP to modify bandwidth of this link. + * @LINK_CONTEXT_MODIFY_UHR_PARAMS: covers iwl_link_ctx_cfg_cmd::npca_params and + * iwl_link_ctx_cfg_cmd::prio_edca_params. Since _VER_7. * @LINK_CONTEXT_MODIFY_ALL: set all above flags */ enum iwl_link_ctx_modify_flags { @@ -432,6 +434,7 @@ enum iwl_link_ctx_modify_flags { LINK_CONTEXT_MODIFY_BSS_COLOR_DISABLE = BIT(6), LINK_CONTEXT_MODIFY_EHT_PARAMS = BIT(7), LINK_CONTEXT_MODIFY_BANDWIDTH = BIT(8), + LINK_CONTEXT_MODIFY_UHR_PARAMS = BIT(9), LINK_CONTEXT_MODIFY_ALL = 0xff, }; /* LINK_CONTEXT_MODIFY_MASK_E_VER_1 */ diff --git a/sys/contrib/dev/iwlwifi/fw/api/nvm-reg.h b/sys/contrib/dev/iwlwifi/fw/api/nvm-reg.h index e90f3187e55c..4644fc1aa1ec 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/nvm-reg.h +++ b/sys/contrib/dev/iwlwifi/fw/api/nvm-reg.h @@ -18,13 +18,8 @@ enum iwl_regulatory_and_nvm_subcmd_ids { /** * @LARI_CONFIG_CHANGE: &struct iwl_lari_config_change_cmd_v1, - * &struct iwl_lari_config_change_cmd_v2, - * &struct iwl_lari_config_change_cmd_v3, - * &struct iwl_lari_config_change_cmd_v4, - * &struct iwl_lari_config_change_cmd_v5, * &struct iwl_lari_config_change_cmd_v6, - * &struct iwl_lari_config_change_cmd_v7, - * &struct iwl_lari_config_change_cmd_v10 or + * &struct iwl_lari_config_change_cmd_v8, * &struct iwl_lari_config_change_cmd */ LARI_CONFIG_CHANGE = 0x1, @@ -564,74 +559,6 @@ struct iwl_lari_config_change_cmd_v1 { __le32 config_bitmap; } __packed; /* LARI_CHANGE_CONF_CMD_S_VER_1 */ -/** - * struct iwl_lari_config_change_cmd_v2 - change LARI configuration - * @config_bitmap: bit map of the config commands. each bit will trigger a - * different predefined FW config operation - * @oem_uhb_allow_bitmap: bitmap of UHB enabled MCC sets - */ -struct iwl_lari_config_change_cmd_v2 { - __le32 config_bitmap; - __le32 oem_uhb_allow_bitmap; -} __packed; /* LARI_CHANGE_CONF_CMD_S_VER_2 */ - -/** - * struct iwl_lari_config_change_cmd_v3 - change LARI configuration - * @config_bitmap: bit map of the config commands. each bit will trigger a - * different predefined FW config operation - * @oem_uhb_allow_bitmap: bitmap of UHB enabled MCC sets - * @oem_11ax_allow_bitmap: bitmap of 11ax allowed MCCs. - * For each supported country, a pair of regulatory override bit and 11ax mode exist - * in the bit field. - */ -struct iwl_lari_config_change_cmd_v3 { - __le32 config_bitmap; - __le32 oem_uhb_allow_bitmap; - __le32 oem_11ax_allow_bitmap; -} __packed; /* LARI_CHANGE_CONF_CMD_S_VER_3 */ - -/** - * struct iwl_lari_config_change_cmd_v4 - change LARI configuration - * @config_bitmap: Bitmap of the config commands. Each bit will trigger a - * different predefined FW config operation. - * @oem_uhb_allow_bitmap: Bitmap of UHB enabled MCC sets. - * @oem_11ax_allow_bitmap: Bitmap of 11ax allowed MCCs. There are two bits - * per country, one to indicate whether to override and the other to - * indicate the value to use. - * @oem_unii4_allow_bitmap: Bitmap of unii4 allowed MCCs.There are two bits - * per country, one to indicate whether to override and the other to - * indicate allow/disallow unii4 channels. - */ -struct iwl_lari_config_change_cmd_v4 { - __le32 config_bitmap; - __le32 oem_uhb_allow_bitmap; - __le32 oem_11ax_allow_bitmap; - __le32 oem_unii4_allow_bitmap; -} __packed; /* LARI_CHANGE_CONF_CMD_S_VER_4 */ - -/** - * struct iwl_lari_config_change_cmd_v5 - change LARI configuration - * @config_bitmap: Bitmap of the config commands. Each bit will trigger a - * different predefined FW config operation. - * @oem_uhb_allow_bitmap: Bitmap of UHB enabled MCC sets. - * @oem_11ax_allow_bitmap: Bitmap of 11ax allowed MCCs. There are two bits *** 11897 LINES SKIPPED *** From nobody Mon Mar 9 13:24:56 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTyRY0KFkz6VkBl for ; Mon, 09 Mar 2026 13:24:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTyRX5FSgz44NS for ; Mon, 09 Mar 2026 13:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773062696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nBAkvEIw4OPyO5yEWLBjKbZtosnh3Bocs1++c8BifTA=; b=JamnToqxBVKIv11iSKBTNZuUPN1fjtLpImtvtq6nGifpkO2zZT6OCW6lSh2qWTkgZ7PUxi E76ImHpgP718WeTITIgy4jAH7iCIlit+1aRW/uyvZ7LP836hsUB2zbQWOSF3xspkmip8yT mEru0hKfT2YSgvwi7lmnEBQFjgV6YMYzJ9jERNF7wg3QsJFEZI3M23YvA1gj75+tg7W45N EcPzMru11jJ2ZnONcO28nPOWmOHcjnP8k9Uy/MbMwOm/R8nQi8Mb8O90KQmHMWGju9nLLt TjpdCxO7qqV4UfkwHYBKcY4MZokW+ivA8ODGJAVFZz9awOmC5IsuKsjqK36A0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773062696; a=rsa-sha256; cv=none; b=yRGfqg/0g7ci5VGVnsdZJBDAiP5i/Hf5ECxZVFxG21iLwKyemSGPgbKL0MB1Xr+8r1vAGd BkLSoJnp6YtyJjrO2XVAZ5S+MFePokPB/w7kuEi6QaU1hezKzL0PR2LMg0mdhE4yFbkVp7 PJuy8rpFbMQ2msZCWexqW7p/PR+IdDvcTCeP3h68p5Yv6h2qkbLo7/sjoRMvaw0Yc135Pm 5IxYBbvsDNkl8xbINTkKckaFJy6JrwMtu9Fj6G4C9Ea+trRVw/XRVRhBWBLI6mtPhrcfoT OEHfMQ3vJdm0gC70epTKUe8fcjO/NwLdeVY2lvXgS4jz7DLBhijZF/jcAeFxaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773062696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nBAkvEIw4OPyO5yEWLBjKbZtosnh3Bocs1++c8BifTA=; b=o90YpuzcqrY9VwAeMR86hFY9/TzVdHxTpiI21bTiLggfTQDOwK8UPU2dDiq40QPx9SW9jR PgUqflPEEbZT97XGWJ8HOndoS7f5bSkXwW6909cXHo+nzJK2Mi/s3jtWZBCq+R9JA0bhx6 PiK8BGUoqGouMept95myrALDk1X77NAJ5TJLbjmFWYfzjwaic1SwFeIYBVWs+w3+AgAHYV BptDiCbXxhbCrW9iJ2dhPaeQ7niNuGYa73sYDPVXW89hwn0x+v9/7ctmsr6nHcI/lqbNtu 3bkJp3yh0av9Z9DPR4SRX/lxJlH1nLH2Mra3tRGDDtoEBCCj3ffzMRRbof3iYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTyRX40gMzBZs for ; Mon, 09 Mar 2026 13:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24f1d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 13:24:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin From: Ed Maste Subject: git: 897711b7bd4b - stable/15 - Merge commit 81b20e110b3f from llvm git (by Roland McGrath): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 897711b7bd4ba8f34bab9e0b79495ce107cfef35 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 13:24:56 +0000 Message-Id: <69aeca28.24f1d.4ef6b441@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=897711b7bd4ba8f34bab9e0b79495ce107cfef35 commit 897711b7bd4ba8f34bab9e0b79495ce107cfef35 Author: John Baldwin AuthorDate: 2026-01-27 18:34:58 +0000 Commit: Ed Maste CommitDate: 2026-03-09 13:24:28 +0000 Merge commit 81b20e110b3f from llvm git (by Roland McGrath): [libc++] Work around new GCC 15 type_traits builtins that can't be used as Clang's can (#137871) GCC 15 has added builtins for various C++ type traits that Clang already had. Since `__has_builtin(...)` now finds these, the #if branches previously only used for Clang are now used for GCC 15. However, GCC 15 requires that these builtins only be used in type aliases, not in template aliases. For now, just don't use the `__has_builtin(...)` branches under newer GCC versions, so both 14 and 15 work during the transition. This can be cleaned up later to use all the GCC 15 builtins available. Fixed: #137704 Fixed: #117319 Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D54865 (cherry picked from commit bfc6e56f6327621171cef4fe29290c63edfc4d9c) --- .../llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h | 2 +- .../llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/decay.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h b/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h index a633e3904532..f583b4328830 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__add_lvalue_reference) +#if __has_builtin(__add_lvalue_reference) && !defined(_LIBCPP_COMPILER_GCC) template using __add_lvalue_reference_t = __add_lvalue_reference(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h index 5aac7d5cfa90..8f85ece33d6a 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h @@ -20,7 +20,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if !defined(_LIBCPP_WORKAROUND_OBJCXX_COMPILER_INTRINSICS) && __has_builtin(__add_pointer) +#if !defined(_LIBCPP_WORKAROUND_OBJCXX_COMPILER_INTRINSICS) && __has_builtin(__add_pointer) && !defined(_LIBCPP_COMPILER_GCC) template using __add_pointer_t = __add_pointer(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h b/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h index a54aae7ec8de..e5dc920e6a44 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__add_rvalue_reference) +#if __has_builtin(__add_rvalue_reference) && !defined(_LIBCPP_COMPILER_GCC) template using __add_rvalue_reference_t = __add_rvalue_reference(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/decay.h b/contrib/llvm-project/libcxx/include/__type_traits/decay.h index 7412044f9317..861dc2eb10d0 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/decay.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/decay.h @@ -25,7 +25,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__decay) +#if __has_builtin(__decay) && !defined(_LIBCPP_COMPILER_GCC) template using __decay_t _LIBCPP_NODEBUG = __decay(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h index d5373b51f522..a27e3bb48038 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__remove_all_extents) +#if __has_builtin(__remove_all_extents) && !defined(_LIBCPP_COMPILER_GCC) template struct remove_all_extents { using type _LIBCPP_NODEBUG = __remove_all_extents(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h index fe37b5c7266c..767331e102ad 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__remove_extent) +#if __has_builtin(__remove_extent) && !defined(_LIBCPP_COMPILER_GCC) template struct remove_extent { using type _LIBCPP_NODEBUG = __remove_extent(_Tp); From nobody Mon Mar 9 13:27:17 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTyVF4HwHz6Vl0b for ; Mon, 09 Mar 2026 13:27: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTyVF3TbSz44pq for ; Mon, 09 Mar 2026 13:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773062837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GhvCPrMz9YmjmCn8958CKday9SJj7Gl5Nf/k6TFhp/Y=; b=h2PYkkPqBReMHYEHw/ndUh21jiHWLMzZoaAEmopG9+tX6PA/LbmcSDSDi9VGNDTRiZcnHg 0DcMO3S78IkHeZrrqwnu6oC9yGyQBcPMOgPse5y+ndPRcphjcekvLaLnePn24fontfvYPT ioxORFWQ9MXmfIvpbQsTYqL0+N3l53oDOKM3Oa9JcROFTi2aw+U073KYHTyX9WV5oD5dMA CfXKOtSlLoYptsY6MpzXCm6la2b6RaKKSYTdo9rI2qHYBlYPWgfTHJ8nOPMvl31aOm8zQf pHZ1x+TSj+jD3TjG8qzpvhX8w8Nj7bXBxQNaZShUuPMjhEpSEjdETEJBGR+C3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773062837; a=rsa-sha256; cv=none; b=uXe15TX0ECA8RyIYBdZilxiu/Dkk4BNX3rOqRQjH8GNO1DDWQcd7evVPyyktqNLHUljPqO TCfsSUCYe/mRmiVTS0qtsuaUGgcIkiVXEckYspsOJuED92yeR0YQyu6XwY6BDU1GmroivU 8JtuwY9aFEqm6PsbKF4ceFXuTnCfwTfWiwUnJnDAd2fgHDO7bJfDECB6T3VYbjhhdvY8qd oNoKA3F7b3BeP+Wz9K0G3hu0IhODlrl+QheOmIbsKuRhpO57q2E2mz2zZPnAfCdz5Zm2YE dae6DeVjKPLr0++6UfK3T18abz7ciTQM/GbIEVid4L12GBF+YOpYyYtlhOqGJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773062837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GhvCPrMz9YmjmCn8958CKday9SJj7Gl5Nf/k6TFhp/Y=; b=T5oaQSYQGKvd6XGDds6VWQOwxwJZxtnXXmB6GRaosMRpYJAHlfb88pW1qHH6YZp0ocQ7y1 462HrVeEtG/8DiH1oJu+0wzM7SWM6aG9RR3floM85om2BBSmIDiHawB9gFmFLkGawphIpo cqMaLCMuibHPOOR6cgvjn1FKhl6KNPlqhavnv4oQKwAQmsm5cNblCQNKOfnTULAMmwgToC Eg3r8eJSroE/3i3fbFo4ZB8me54cyzn/ji5GwRJRv1L3M7moIdaD/NJoWeb2mBIY6XB9Fb en0dX3BYIpn9mrFHjryIUhZsLwcYa5p575GC3FUUOoERjIzEVHLPju4p6lQEHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTyVF34KvzB4S for ; Mon, 09 Mar 2026 13:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27691 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 13:27:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin From: Ed Maste Subject: git: 7fd8a2028034 - stable/14 - Merge commit 81b20e110b3f from llvm git (by Roland McGrath): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7fd8a2028034968b8dc7984e83046f4b7c1696ff Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 13:27:17 +0000 Message-Id: <69aecab5.27691.20ec51eb@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7fd8a2028034968b8dc7984e83046f4b7c1696ff commit 7fd8a2028034968b8dc7984e83046f4b7c1696ff Author: John Baldwin AuthorDate: 2026-01-27 18:34:58 +0000 Commit: Ed Maste CommitDate: 2026-03-09 13:25:54 +0000 Merge commit 81b20e110b3f from llvm git (by Roland McGrath): [libc++] Work around new GCC 15 type_traits builtins that can't be used as Clang's can (#137871) GCC 15 has added builtins for various C++ type traits that Clang already had. Since `__has_builtin(...)` now finds these, the #if branches previously only used for Clang are now used for GCC 15. However, GCC 15 requires that these builtins only be used in type aliases, not in template aliases. For now, just don't use the `__has_builtin(...)` branches under newer GCC versions, so both 14 and 15 work during the transition. This can be cleaned up later to use all the GCC 15 builtins available. Fixed: #137704 Fixed: #117319 Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D54865 (cherry picked from commit bfc6e56f6327621171cef4fe29290c63edfc4d9c) (cherry picked from commit 897711b7bd4ba8f34bab9e0b79495ce107cfef35) --- .../llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h | 2 +- .../llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/decay.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h b/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h index a633e3904532..f583b4328830 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/add_lvalue_reference.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__add_lvalue_reference) +#if __has_builtin(__add_lvalue_reference) && !defined(_LIBCPP_COMPILER_GCC) template using __add_lvalue_reference_t = __add_lvalue_reference(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h index 5aac7d5cfa90..8f85ece33d6a 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/add_pointer.h @@ -20,7 +20,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if !defined(_LIBCPP_WORKAROUND_OBJCXX_COMPILER_INTRINSICS) && __has_builtin(__add_pointer) +#if !defined(_LIBCPP_WORKAROUND_OBJCXX_COMPILER_INTRINSICS) && __has_builtin(__add_pointer) && !defined(_LIBCPP_COMPILER_GCC) template using __add_pointer_t = __add_pointer(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h b/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h index a54aae7ec8de..e5dc920e6a44 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/add_rvalue_reference.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__add_rvalue_reference) +#if __has_builtin(__add_rvalue_reference) && !defined(_LIBCPP_COMPILER_GCC) template using __add_rvalue_reference_t = __add_rvalue_reference(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/decay.h b/contrib/llvm-project/libcxx/include/__type_traits/decay.h index 7412044f9317..861dc2eb10d0 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/decay.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/decay.h @@ -25,7 +25,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__decay) +#if __has_builtin(__decay) && !defined(_LIBCPP_COMPILER_GCC) template using __decay_t _LIBCPP_NODEBUG = __decay(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h index d5373b51f522..a27e3bb48038 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_all_extents.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__remove_all_extents) +#if __has_builtin(__remove_all_extents) && !defined(_LIBCPP_COMPILER_GCC) template struct remove_all_extents { using type _LIBCPP_NODEBUG = __remove_all_extents(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h index fe37b5c7266c..767331e102ad 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_extent.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__remove_extent) +#if __has_builtin(__remove_extent) && !defined(_LIBCPP_COMPILER_GCC) template struct remove_extent { using type _LIBCPP_NODEBUG = __remove_extent(_Tp); From nobody Mon Mar 9 13:27:16 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fTyVK5M9xz6Vl5C for ; Mon, 09 Mar 2026 13:27: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fTyVK4KsWz454D for ; Mon, 09 Mar 2026 13:27:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773062841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IhhERmBOyzqPX0mfadWo74O5I7LCzopjpB3bPV0gRwc=; b=tz6COQZbdrJU4AUUy82l9wl4DPQ2P2Ic5JMpw5MUj7E4hiiFREV3zMdM8Oaz70LWG2qEpw IpReMfXqKprE4S2vQZdLM1tWSsISQWTh6Glk21VxfuXD/OHXsLyzLM2CiFpqwXa2ADQGsx m4GxMAAi0WqX7uwb5u5M3YMXPQzIGrgwvKIUF1FUK/mW/1qGrAY3IcpJEIGBmuh1rPn7CV FDt6M4psuwz9G2vU42JdekMN4Fv5Dwm1tsLe6zxJbUvmBKgYHZh9zLnDIANioH6SYeyvSN R9gwBqlxOXepRCftLETQ4qTj8bhPG638X8MeaKAWn0EBg2mB4SRjnWk4NV5mjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773062841; a=rsa-sha256; cv=none; b=C3k8Pb0021PR+cyDkulRteK10YzkBJlt3E4XOS2Uf1Fklg8E57IpRPUxqTFPqbXYLpiCaq 9NyGJSsFkXqBzWF6iDnDyozutYRwvSa25SYl/i9MBsn78pzVmnz6qd5BLqvfjmRc46orW9 N32gHusDMpZzWOsUseDdwTb20frcljRB6JO97Z/0CDpfW0aWyok+HDxb2bspsCvxxOdX2e xP8wLX3vK90nfD+iBr3tiI6WvC0hanBTUaX/onw7dtwFGKnxTVlFZqBwyutTjZ46wmCU1k 9D2Rsk5Xcq1zzSzClJKU1RThe5Tcy3ZTKtN2JapGiFWublM9XJTlS2/iZoAtkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773062841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IhhERmBOyzqPX0mfadWo74O5I7LCzopjpB3bPV0gRwc=; b=l2r1B2h5IsocTT9XJAhYkHatcm3t8sCtNvQe17qpMsXpfzkmg/06NTd5BfGVdrDgDpJT17 vmP5ijANseFXGRmsqE8L/44Ntj4BfsSfxthsOf4alRNpQEvXq0SsUA/TTYB5xpbud4hOD9 2z6gcbP6lxq4SuE2SSIj30WGs9/fYnJVMBNsilUACbbcj7F6KQ9qT9HAxR8I/v0IKkIpMV hrPV2qtmGwdjnDZS12PT3LVICIwttLNCawwGVNqf3IoLkbgC2ShLKzI5RgdCipcT38T9ex y6MWYZ1qq8744C8JZZHWZXWeNQaOxw2mnQva9nktsbFjIlmEMI9B/tUGpSxOgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fTyVK3VKHzBLD for ; Mon, 09 Mar 2026 13:27:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2758a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Mar 2026 13:27:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Mark Johnston From: Ed Maste Subject: git: 969c436a6c91 - stable/14 - bhyve: Fix truncate_iov() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 969c436a6c918be0f000bd317f06985a7dd92809 Auto-Submitted: auto-generated Date: Mon, 09 Mar 2026 13:27:16 +0000 Message-Id: <69aecab4.2758a.5a1ad16f@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=969c436a6c918be0f000bd317f06985a7dd92809 commit 969c436a6c918be0f000bd317f06985a7dd92809 Author: Mark Johnston AuthorDate: 2026-02-24 15:14:39 +0000 Commit: Ed Maste CommitDate: 2026-03-05 23:57:56 +0000 bhyve: Fix truncate_iov() The implementation was simply wrong. It would always just return the first entry in the iovec, even if the requested length is larger than that first entry. Note, this function will be removed soon, see D53468. Reported by: Vinod p n Reviewed by: des, emaste, Hans Rosenfeld MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55438 (cherry picked from commit d7d4da91de201841c57a6b8f89b450754b9b8696) (cherry picked from commit 119bdea35792006cd0cce3c864d5007f092a10c1) --- usr.sbin/bhyve/iov.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/usr.sbin/bhyve/iov.c b/usr.sbin/bhyve/iov.c index d01c7a5601f4..7b8564c302af 100644 --- a/usr.sbin/bhyve/iov.c +++ b/usr.sbin/bhyve/iov.c @@ -82,19 +82,14 @@ count_iov(const struct iovec *iov, int niov) void truncate_iov(struct iovec *iov, int *niov, size_t length) { - size_t done = 0; int i; - for (i = 0; i < *niov; i++) { - size_t toseek = MIN(length - done, iov[i].iov_len); - done += toseek; - - if (toseek <= iov[i].iov_len) { - iov[i].iov_len = toseek; - *niov = i + 1; - return; - } + for (i = 0; i < *niov && length > 0; i++) { + if (length < iov[i].iov_len) + iov[i].iov_len = length; + length -= iov[i].iov_len; } + *niov = i; } ssize_t From nobody Tue Mar 10 10:54:48 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVW3s0YzTz6VRk8 for ; Tue, 10 Mar 2026 10:54:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVW3s030vz4391 for ; Tue, 10 Mar 2026 10:54:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773140089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OLWmiM7sPGluVmC3u0+6ZSjQ+R+yJkg3wDJ4e46MIK4=; b=tHvoEmaM7lD/Mlh1eXlYXLK06e3+p2GpZv1QQ3q/D/Z3l8XEWFXZDSs9vyBEf2+goLY4rz ckU96l6f+dcmdo/J9/mldbb0C9D/UHY7PqFMcS67+oIT7+E43l6i3nb4LC23E+rPG6ALIh ix5jafS9i56jbJIa/K6A11XDdu4U4YTsvRY8CrH/oNF7F+Q8CoZQXo+2YmFh2Qx9VYwtd1 cdX2diwcfxUtBaiCyGL9seUuyT2HXnuwqhMScYZDnrdUEMnsTbfawsMv7a+PU2SlU/WHuJ tDwFWRLdttKet9ekbAloc9yB3nom95KHTNlZ1kT2+mPdCm124vkZEltVztGsVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773140089; a=rsa-sha256; cv=none; b=m1D1J4oZJKIjTIUaQ9RWf+tfwMcJyp5M8M+ErubeoLjBKTPEZL4JP7DsiaowiYfxl9/qzL gwjZ1/ADYoy1LDT0XX9FeGyHrfNeEpRXd8frSQkGgGX9YjOlyAnENUyRwGqv4il8KO8ntY 4cs+g0zThhpo3k5NNw295MNNcPgZXaYqCjTHTZ2c1APmyPaZ6Vox2/ZAU2ZAHkyw7Bhbgw ZwBbuZqyEGmeLv+7gvZUv658oyNLfRtVnzDCAviI/0D2qTBCbDxZ3qZRPXbD+whbGWI8G2 LYk0bQG1Zllcd8IBfryA+D6JPqp6dg5e/+cseuQCj/6dXBnx5TgE3Xi0F6WpFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773140089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OLWmiM7sPGluVmC3u0+6ZSjQ+R+yJkg3wDJ4e46MIK4=; b=Gj38RC1CeZ5wz8oGvcZYcKaNrok1VqBVYhad+aoCgPRwYnlzcSB9QyL02mEw1RMoXIgzrX iRcBYrDI5UYdWdC9upqsx/6vrZL8x1pwJosa1yfb864RL0QKSBpbNp3Ox7fJEHHWEfhtgu 0TjVddoJkJyXvAdwhx5Ng940qnXIGmHP1Rij3lylO6P8IeM7usOeYV0auhA2tSOEb5uBBC I9Jzr/uJFl0tc0nyNQINqQQfzxN38/8uRNPWcFPMvXN0rCSs59s4Z/kAa75v756mfohiGP YqooaivRZPUFy8aFZ3EX1Pub7XWMSK4K6xGlnFt3vnpIg5a7ph7ZbqCBvVJymw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVW3r6btSz17Zn for ; Tue, 10 Mar 2026 10:54:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 454e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 10:54:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 716773278a03 - stable/15 - sound: Notify devd on hw.snd.default_unit change List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 716773278a0349dcb468d13d22a957ed91602d1c Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 10:54:48 +0000 Message-Id: <69aff878.454e3.73552e57@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=716773278a0349dcb468d13d22a957ed91602d1c commit 716773278a0349dcb468d13d22a957ed91602d1c Author: Christos Margiolis AuthorDate: 2026-03-03 11:32:32 +0000 Commit: Christos Margiolis CommitDate: 2026-03-10 10:54:42 +0000 sound: Notify devd on hw.snd.default_unit change If we have virtual_oss running, this devd notification will make sure to automatically transfer sound to the new default unit, while also making sure that we switch to it only for the supported directions (recording and/or playback). For more information, please refer to 2ffaca551eaf ("snd_hda: Implement automatic redirection between associations"). Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55530 (cherry picked from commit d40189f8259e3565c69a40194f7b603d0ca648de) --- sys/dev/sound/pcm/sound.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 8ce369bfce5e..abd92d93e02d 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -81,6 +81,7 @@ static int sysctl_hw_snd_default_unit(SYSCTL_HANDLER_ARGS) { struct snddev_info *d; + char buf[32]; int error, unit; unit = snd_unit; @@ -95,6 +96,12 @@ sysctl_hw_snd_default_unit(SYSCTL_HANDLER_ARGS) snd_unit = unit; snd_unit_auto = 0; bus_topo_unlock(); + + snprintf(buf, sizeof(buf), "cdev=dsp%d", snd_unit); + if (d->reccount > 0) + devctl_notify("SND", "CONN", "IN", buf); + if (d->playcount > 0) + devctl_notify("SND", "CONN", "OUT", buf); } return (error); } From nobody Tue Mar 10 10:54:50 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVW3t21hNz6VRQZ for ; Tue, 10 Mar 2026 10:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVW3t0wLGz4369 for ; Tue, 10 Mar 2026 10:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773140090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gshTLW+yged2rCXsvOXPlReSsS4GBMH6XayFJSBgMJM=; b=UD17rGQQ2WBjBYHLqZNh7iEgCZB+sBO4a89GmH48XMHLYLcyIJPBkncGf6yzklpnym5VW5 tUbQsdQRI7q1M5NyNRT896hL3092TfbOc9zQGalW2YSZgdnvCnYrVX5MZkHHL/Qg64C1Cm oKj1XTPC8GxDKyhXux3FLWqYTjlZkfFKq1SM87/R6d8gt0s7N0n64+WF3h81oyneS6l68n WgVlkkQCMMYhLYykPm8/kwTuhxfbpM+EaHvExUGzbf4jKAqO2N0Vnf0FW5mUNjPOLEC2qF /c8L16DdBpp+uHpuAydyoNjsXFyF0bg2AbZ1RkTJaME3F16ok5JdEV6QA2gDIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773140090; a=rsa-sha256; cv=none; b=ceDlzYv1yz3iEeE9aQEQyhRbU4UBHixtHgWkeen4Crhlq7lGgrs8Xf8rO2UkJvyVfY6PY5 NU+C9ssBNKf28FFlbdqU//3W+946quWDlmMt+fZatRcY1+r2998AqoojDf0LUcoy3YdoXL YsrOxA6fbkNyhPnIsppYIoWo0sc8Ugsg1dqejlLM5ZmopLFaVI0atWiyAEykbIcGP/r3Xs KEfEsS+eNzotAnHWUm4VjmZSlRw+G51P3RG2+/0ppsFEkqWN5rstycmQ6gKiETTg1oIZZj WPGYlUNHfCmRg6PCSH0PUFuOsZ1JpbWpTKMrbvWo4kQvFlCFc9ZqTjl9qNRt1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773140090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gshTLW+yged2rCXsvOXPlReSsS4GBMH6XayFJSBgMJM=; b=FTTMnys+cFxnyBEzCe8EHXDT0xHWtsctyQjaUwuvzycqVeuj73K/2x01N0rCX1y8ya/7HH 8Z8D9Jd//BOfpC7YAzx2Ap6wqjsIZOACJdmZ4lgnAqLREGrQe7mUzMXvpZgn7ce/R+Sh0y 0TF8rWFvtPG+D2/YJ6RO7Nh5WorWBJzbA6dNbWuj7JqPBaDam+GfoDuKPFH4MDcxwnkTV9 ViHVAobn+OnGeQJ0S6ZwblbVp63pj6/oEgeGLBDV+ltwvNz9Mq5QWJGHIB2Mv5zUByuByk YVPlyXfg/UyrAYf+I9aaxBP1KkOLXIQju3dpY6QlnmNFDy+/0Cf+r1XyJvqm6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVW3t0HKvz17kF for ; Tue, 10 Mar 2026 10:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46543 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 10:54:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 0b27b79f357c - stable/15 - sound: Notify devd when no devices are connected List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0b27b79f357cd7bafbe7a400a09c0c66e3443b80 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 10:54:50 +0000 Message-Id: <69aff87a.46543.49fd93c1@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0b27b79f357cd7bafbe7a400a09c0c66e3443b80 commit 0b27b79f357cd7bafbe7a400a09c0c66e3443b80 Author: Christos Margiolis AuthorDate: 2026-03-03 11:32:38 +0000 Commit: Christos Margiolis CommitDate: 2026-03-10 10:54:42 +0000 sound: Notify devd when no devices are connected Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55531 (cherry picked from commit 428517a7712e44b58e0687fbee4037a8ebe5bf5a) --- sbin/devd/devd.conf.5 | 4 +++- sbin/devd/snd.conf | 10 ++++++++++ sys/dev/sound/pcm/sound.c | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5 index 8df3e910e076..67d73d4ebf49 100644 --- a/sbin/devd/devd.conf.5 +++ b/sbin/devd/devd.conf.5 @@ -38,7 +38,7 @@ .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS .\" SOFTWARE. .\" -.Dd July 9, 2025 +.Dd February 26, 2026 .Dt DEVD.CONF 5 .Os .Sh NAME @@ -666,6 +666,8 @@ variable. Connected output device specified in .Pa cdev variable. +.It Li SND Ta Li CONN Ta Li NODEV Ta +No connected devices. .El .Pp .\" diff --git a/sbin/devd/snd.conf b/sbin/devd/snd.conf index a45f427f6c79..5ca0be86e246 100644 --- a/sbin/devd/snd.conf +++ b/sbin/devd/snd.conf @@ -24,3 +24,13 @@ notify 0 { # See comment above. action "/usr/sbin/virtual_oss_cmd /dev/vdsp.ctl -P /dev/$cdev"; }; + +notify 0 { + match "system" "SND"; + match "subsystem" "CONN"; + match "type" "NODEV"; + + # No connected devices. Disable both recording and playback to avoid + # repeated virtual_oss error messages. + action "/usr/sbin/virtual_oss_cmd /dev/vdsp.ctl -f /dev/null"; +}; diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index abd92d93e02d..305d663cd6ad 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -483,6 +483,8 @@ pcm_unregister(device_t dev) snd_unit = pcm_best_unit(-1); if (snd_unit_auto == 0) snd_unit_auto = 1; + if (snd_unit < 0) + devctl_notify("SND", "CONN", "NODEV", NULL); } return (0); From nobody Tue Mar 10 10:54:51 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVW3v4Tzxz6VRY3 for ; Tue, 10 Mar 2026 10:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVW3v1P1Kz43KF for ; Tue, 10 Mar 2026 10:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773140091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DrOIOmefVV8U4AwIdhvsEO9NNRcNh24ndSSLZpB7uxw=; b=ZnQ/ztf/Q/2ckyg3DCcex38JCSZmJrFLG/cYhSNbmGQ3pMe1K8pUGvOcHAmprXmi+7mEsJ BFCVZ5kTYKs1KLtkrNM6EJ4zGUKv/zuMmjtC4pTNhSeA7505zOBs4QgUrBBzwhzQwX7GIn LnEjjwAAMuj1rxUtUNj5IYolLYRh+u6YBqQrl+h/raqIN1gwoVvo8bF2N1HTcBKlwlYb7u DRwPcyEAWwYQ9Ow0s43Fs9AWvwaAKAhc3t15ah2dhTHvuvwPM9vhd6JPBpKNObQNrGEJIb P1vdVdfR7YjIH3q2ui+Y22xFDvFYm4dg4y5FFebLh4a4GU7EcIP+CrQmM01QXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773140091; a=rsa-sha256; cv=none; b=P/Q5R7y4VkBajCvUlBKsz4sup2gvTKJvA1Hffdqn4N3ozMgEXvvl0PofwO4EiuEXxRUXv4 e4rn3WuL8m9LsWIS7XjSwaQVmS0brOJprrmss/+PNetU59+LeSTkGbH2w2i34EaJPSzvbS Px3qdP3Zblco5OyffDeGnAKUPdrwIFtcHYVcA6E6a3lJOdyRUh0PVIEAM4uOmqEsrPZidN EFna/ARsdS/BGIiiX+byH1SlGc/6bKJTgzvt/XKniJckXjTDZ5HXv5ANr9fgAu7Xzta4af xbaafNudpzeB3i6uf/NT7IsCFPQH4oZD1x2mph9JS8VeJ2iBkbOJjoyI/HyqAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773140091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DrOIOmefVV8U4AwIdhvsEO9NNRcNh24ndSSLZpB7uxw=; b=MYwvUmtdZStBzArx1Cx5ACmejuGNM2UShvdVrU1ZREEMTiywHWXuZWp18BpxdfDcBh5Kxh L7ZbFzRqBF/iK0jadochf5sTKurDiPigQG9gfbCBoqtyYWoKNfsKzFs7FEFRxX2L3YpPmg PiKOHSQ7rHUkN5rN3MYppjAx3AIpresuR4/F/ULuEMgRq2kc9ingHnIqr+sczAzd+qzBBG 0fJKzEZx6+PqFtfx75ljEsr2+hWH7/Zs2kSq0RVgyrJmr6EKw+CKNADpS/fC0C3WX6PLD1 S2Zpmm4ZSWDUAbMdKbMPM4G55siUWc5Oe+CHxu+xIDihPCTjRXQTlBKU5RWJJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVW3v0vjgz18F4 for ; Tue, 10 Mar 2026 10:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4744a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 10:54:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 10aa4c8ce852 - stable/15 - Revert "mixer(8): Implement hot-swapping" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 10aa4c8ce852cf77c7bedb8cb0df62eccb7b7a71 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 10:54:51 +0000 Message-Id: <69aff87b.4744a.368065b@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=10aa4c8ce852cf77c7bedb8cb0df62eccb7b7a71 commit 10aa4c8ce852cf77c7bedb8cb0df62eccb7b7a71 Author: Christos Margiolis AuthorDate: 2026-03-03 11:32:42 +0000 Commit: Christos Margiolis CommitDate: 2026-03-10 10:54:42 +0000 Revert "mixer(8): Implement hot-swapping" We now have devd rules in snd.conf that achieve this in a much cleaner way. This reverts commit 9aac27599acaffa21ff69c5be8a2d71d29cc3d6b. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55532 (cherry picked from commit d00b32c2d70ce79fddb94dd990d2b162c8fc3a85) --- usr.sbin/mixer/mixer.8 | 75 +++------------------------------------------- usr.sbin/mixer/mixer.c | 81 +++++--------------------------------------------- 2 files changed, 11 insertions(+), 145 deletions(-) diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8 index d7de675bceee..bdff0dbedc11 100644 --- a/usr.sbin/mixer/mixer.8 +++ b/usr.sbin/mixer/mixer.8 @@ -19,7 +19,7 @@ .\" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN .\" THE SOFTWARE. .\" -.Dd October 31, 2025 +.Dd February 26, 2026 .Dt MIXER 8 .Os .Sh NAME @@ -28,7 +28,7 @@ .Sh SYNOPSIS .Nm .Op Fl f Ar device -.Op Fl d Ar pcmX | X Op Fl V Ar voss_device:mode +.Op Fl d Ar pcmX | X .Op Fl os .Op Ar dev Ns Op Cm \&. Ns Ar control Ns Op Cm \&= Ns Ar value .Ar ... @@ -43,7 +43,7 @@ The utility is used to set and display soundcard mixer device controls. .Pp The options are as follows: -.Bl -tag -width "-V voss_device:mode" +.Bl -tag -width "-d pcmN | N" .It Fl a Print the values for all mixer devices available in the system .Pq see Sx FILES . @@ -54,30 +54,6 @@ where X is the device's unit number (e.g for pcm0, the unit number is 0). See .Sx EXAMPLES on how to list all available audio devices in the system. -.Pp -There is also the possibility of hot-swapping to the new default device if -.Xr virtual_oss 8 -exists in the system and is running, in which case the -.Fl V -option needs to be specified as well. -.Pp -Hot-swapping generally cannot happen with plain -.Xr sound 4 , -so the user has to restart the track in order to get sound coming out of the -new default device. -This is because applications usually open a device at the start of the track -and do not check for default device changes, in order to open the new device -mid-track. -.Xr virtual_oss 8 , -on the other hand, can do hot-swapping, because it creates a virtual device for -applications to open, and then does all the necessary routing and conversions -to the appropriate device(s). -.Pp -Note that hot-swapping will work only for applications that are using -.Xr virtual_oss 8 -devices, and not plain -.Xr sound 4 -ones. .It Fl f Ar device Open .Ar device @@ -90,33 +66,6 @@ Print mixer values in a format suitable for use inside scripts. The mixer's header (name, audio card name, ...) will not be printed. .It Fl s Print only the recording source(s) of the mixer device. -.It Fl V Ar voss_device:mode -Specify a -.Xr virtual_oss 8 -control device, as well as a mode (see below), in order to hot-swap devices. -This option is meant to only be used in combination with the -.Fl d -option. -.Pp -The available modes are as follows: -.Bl -column play -.It Sy Mode Ta Sy Action -.It all Ta Playback and recording -.It play Ta Playback -.It rec Ta Recording -.El -.Pp -The -.Pa mode -part is needed, so that -.Nm -will not accidentally hot-swap both the recording and playback device in -.Xr virtual_oss 8 , -if only one direction is to be hot-swapped. -.Pp -See -.Sx EXAMPLES -on how to use this option. .El .Pp The list of mixer devices that may be modified are: @@ -316,26 +265,10 @@ $ mixer -f /dev/mixer0 -o > info \&... $ mixer -f /dev/mixer0 `cat info` .Ed -.Pp -Suppose -.Xr virtual_oss 8 -is running with -.Pa /dev/vdsp.ctl -as its control device, and -.Pa pcm0 -as the playback device. -Change the default device to -.Pa pcm1 , -and hot-swap to it for both recording and playback in -.Xr virtual_oss 8 : -.Bd -literal -offset indent -$ mixer -d pcm1 -V /dev/vdsp.ctl:all -.Ed .Sh SEE ALSO .Xr mixer 3 , .Xr sound 4 , -.Xr sysctl 8 , -.Xr virtual_oss 8 +.Xr sysctl 8 .Sh HISTORY The .Nm diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c index 15e0eae69952..a0fc9705a301 100644 --- a/usr.sbin/mixer/mixer.c +++ b/usr.sbin/mixer/mixer.c @@ -20,9 +20,6 @@ * THE SOFTWARE. */ -#include -#include - #include #include #include @@ -43,7 +40,7 @@ static void printall(struct mixer *, int); static void printminfo(struct mixer *, int); static void printdev(struct mixer *, int); static void printrecsrc(struct mixer *, int); /* XXX: change name */ -static int set_dunit(struct mixer *, int, char *); +static int set_dunit(struct mixer *, int); /* Control handlers */ static int mod_volume(struct mix_dev *, void *); static int mod_mute(struct mix_dev *, void *); @@ -57,13 +54,13 @@ main(int argc, char *argv[]) { struct mixer *m; mix_ctl_t *cp; - char *name = NULL, buf[NAME_MAX], *vctl = NULL; + char *name = NULL, buf[NAME_MAX]; char *p, *q, *devstr, *ctlstr, *valstr = NULL; int dunit, i, n, pall = 1, shorthand; int aflag = 0, dflag = 0, oflag = 0, sflag = 0; int ch; - while ((ch = getopt(argc, argv, "ad:f:hosV:")) != -1) { + while ((ch = getopt(argc, argv, "ad:f:hos")) != -1) { switch (ch) { case 'a': aflag = 1; @@ -86,9 +83,6 @@ main(int argc, char *argv[]) case 's': sflag = 1; break; - case 'V': - vctl = optarg; - break; case 'h': /* FALLTHROUGH */ case '?': default: @@ -125,7 +119,7 @@ main(int argc, char *argv[]) initctls(m); if (dflag) { - if (set_dunit(m, dunit, vctl) < 0) + if (set_dunit(m, dunit) < 0) goto parse; else { /* @@ -217,8 +211,7 @@ next: static void __dead2 usage(void) { - fprintf(stderr, "usage: %1$s [-f device] [-d pcmN | N " - "[-V voss_device:mode]] [-os] [dev[.control[=value]]] ...\n" + fprintf(stderr, "usage: %1$s [-f device] [-d pcmN | N] [-os] [dev[.control[=value]]] ...\n" " %1$s [-os] -a\n" " %1$s -h\n", getprogname()); exit(1); @@ -331,32 +324,9 @@ printrecsrc(struct mixer *m, int oflag) } static int -set_dunit(struct mixer *m, int dunit, char *vctl) +set_dunit(struct mixer *m, int dunit) { - const char *opt; - char *dev, *mode; - char buf[32]; - size_t size; - int n, rc; - - /* - * Issue warning in case of hw.snd.basename_clone being unset. Omit the - * check and warning if the -V flag is used, since the user is most - * likely to be aware of this, and the warning might be confusing. - */ - if (vctl == NULL) { - size = sizeof(int); - if (sysctlbyname("hw.snd.basename_clone", &n, &size, - NULL, 0) < 0) { - warn("hw.snd.basename_clone failed"); - return (-1); - } - if (n == 0) { - warnx("warning: hw.snd.basename_clone not set. " - "/dev/dsp is managed externally and does not " - "change with the default unit change here."); - } - } + int n; if ((n = mixer_get_dunit()) < 0) { warn("cannot get default unit"); @@ -368,43 +338,6 @@ set_dunit(struct mixer *m, int dunit, char *vctl) } printf("default_unit: %d -> %d\n", n, dunit); - /* Hot-swap in case virtual_oss exists and is running. */ - if (vctl != NULL) { - dev = strsep(&vctl, ":"); - mode = vctl; - if (dev == NULL || mode == NULL) { - warnx("voss_device:mode tuple incomplete"); - return (-1); - } - if (strcmp(mode, "all") == 0) - opt = "-f"; - else if (strcmp(mode, "play") == 0) - opt = "-P"; - else if (strcmp(mode, "rec") == 0) - opt = "-R"; - else { - warnx("please use one of the following modes: " - "all, play, rec"); - return (-1); - } - snprintf(buf, sizeof(buf), "/dev/dsp%d", dunit); - switch (fork()) { - case -1: - warn("fork"); - break; - case 0: - rc = execl("/usr/sbin/virtual_oss_cmd", - "virtual_oss_cmd", dev, opt, buf, NULL); - if (rc < 0) - warn("virtual_oss_cmd"); - _exit(0); - default: - if (wait(NULL) < 0) - warn("wait"); - break; - } - } - return (0); } From nobody Tue Mar 10 11:43:31 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8369Shz6VWK6 for ; Tue, 10 Mar 2026 11:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8353X4z49Z1 for ; Tue, 10 Mar 2026 11:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A4Xq66L+WAXsArZq8KihwJJ00jwGwADhQoMBWu6VWAE=; b=JuRNwMPpIZqClj6qfjdV6RT5g9ksiO5YM4Yp60tw6bWj6Us7E1gYOfBr6zgzLWN/Phh4m/ l8gGD7MT9AL0BNFpch1w4wOP4aN2tc0esMuKGnJmvlByXOFXizL1l3ttmg4289XJAHclBd QRLKav6NWsrynSTNiG7wNv2wfyVahLIaZOthq+/iI9A04jLIqCnh0fyykLbUbWwe8wkeH6 RGADseVcvUVCsJeg5YW8aO1m2wLe3lI8N/Ps+VIzBw5XVXP8f9r/aJh1NxCdYVVwfbOEgq +ixQYe+SuIQrKf8BeV9BGX3UlFhh+3wuI16GwYpFdXI+3IW0k6GukdxmGpggKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143011; a=rsa-sha256; cv=none; b=kFnyb6vj7VDtomesol+B/thC93uYPXzy3JxSYe8+v5PuNoWQKLuWMFn7d/6Ji0K/ILPhJ5 4zCAfS8Sh23c+IooewIBKpS2tNnqKZMwRQO2yrfvHfleX9a8OeI9r9qeBEIAt8Hi9DjyZC +OBiOKrC7h8QbuCzweg8LMMkRf5dgiOY0g5hjkViqB7uxZhiDR+ufvNtfSxiz0u/LdgmQ8 0zrBVan8A7mBZw2mjflMWid6PX4HNKL4vrtwbZJt+VCrEjfMnwRdlpeVdgvnhDdaeEP2MA PqXRzPeRtmBz1O28DPDbYqchILlIZs9zlmdXO2c1v7lAXdJiAt2MLcpp0DeXAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A4Xq66L+WAXsArZq8KihwJJ00jwGwADhQoMBWu6VWAE=; b=aHzfNrya0CpMyKYcKH6V9AxD5/wwkRtwgkXh5HHyCrxKIm071h+mOm0RvZjRUhc7Ngdx2g WbP9d2DQAsiF5LxGS0oI21hPf+bQAR7y0pIF8wHewKMtLbyWd3p92BHhqtSthG7ofUD1Ax Us6+u4TntXhrsLf4isOB9l/pbYF7UlN4Pv1kDJJMlAgGNqqa8uejRbtpNnuNNv55JIXrUD GNSYSVKLGlRmKjinbSQ/8xkCMADQ74AzO3MBGAoNSFfNXIjbIMmP6HbEfNZUrwA1O73+ht 6N2CrPTo4z6ljD2Ovqpox6XWo3TsafU1UcfKS/Gf4Bx2joTeMR1C4/5zkoBbzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX832hypz19Sm for ; Tue, 10 Mar 2026 11:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c6f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ade737514f5a - stable/15 - amd64: align stack on 16 bytes when calling into a EFIRT method List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ade737514f5aa4e8af61e322c7d04d2a539692fa Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:31 +0000 Message-Id: <69b003e3.1c6f3.1c7e7768@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ade737514f5aa4e8af61e322c7d04d2a539692fa commit ade737514f5aa4e8af61e322c7d04d2a539692fa Author: Konstantin Belousov AuthorDate: 2026-03-05 08:37:23 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 amd64: align stack on 16 bytes when calling into a EFIRT method (cherry picked from commit 347cec10e25eacb2906a0a8105eff036850db766) --- sys/amd64/amd64/efirt_support.S | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/amd64/amd64/efirt_support.S b/sys/amd64/amd64/efirt_support.S index 98063ad561aa..54578f573750 100644 --- a/sys/amd64/amd64/efirt_support.S +++ b/sys/amd64/amd64/efirt_support.S @@ -58,6 +58,7 @@ ENTRY(efi_rt_arch_call) cmovbl %eax, %ecx shll $3, %ecx subq %rcx, %rsp + andq $~0xf, %rsp cmpl $0, %ebx jz 1f From nobody Tue Mar 10 11:43:32 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX846vYrz6VVs3 for ; Tue, 10 Mar 2026 11:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX843tpsz49QV for ; Tue, 10 Mar 2026 11:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bdGtNl/Lnvr5Rf6Yu8tez4Fbhh01de2RnDCkCtNDeYM=; b=q5oVl6Ds2pdxRdc1jEwkpXlTuh7L7FbW0ktwuGEqwyaRyrIb09wqmoF4AING0+Xlp37R2r NDGJsrI9On04DnqiaMhIEVABrOKbQVSZ+QF9c5K5ORFNM13f5XYLggAejZr3KX6N6sIq0i 2SkrgqygmDX7I6gg3kkIpcXBs9jUAGDg152m3h/tiVWzqaYm0sxGMsU2cHua5E3fI608mK yk9ktlUL7P4qnY+am3x6qMHN1T6PJrLx8KEX6al1Ab7uqAQLlzYpeziCfEqrk7r27wPkOg cYmNCxpb4unN3P9Fom70AzsdcChBP3qOe9ftFfiZY8tooJK1i0M1Gn8kiVT9EA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143012; a=rsa-sha256; cv=none; b=shcRXGwjnierGchd5phsPuVwMFcrC2sDETasLhZ1K0VRVCXZ+JEq8HXCnPUntizDA+drnf 7T1kbggZmS3V3Hnw2JwD9ZYM5Gga67idP+DNFN543vMUasjMTETcgL8No2Cw+CHW2r6H5O 0mE4VJ9eR5FhELHXkW1I03EWfMgBD2HTAqFhdNljZ9a+99LQFVjoPqGCaPo7Nn8KDgMuA3 b4/66qgpzCvl18LTpAbR5fU47B5YfZrR229p6rub7i0zTyKjn8ZKNb83lZwRHz5XWNlcKe 8u4hRaNrQNsUn/eu9acRHpBEiWpMl4nZ4whSx4185aTuMFwWjVF6fzLuwBgnOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bdGtNl/Lnvr5Rf6Yu8tez4Fbhh01de2RnDCkCtNDeYM=; b=RTtyrkX7cO27CgQS/CIt2w1CQj7vEurczpF4uRwTIX3aDQySo5V3ZWoJLrj81jZ0wyHQSn 337rtp/2YexGZT4DkdZViZXNwNPeDIQB/d7xKblZyPZrFgNcas136PYPCg1iHf3OLg0XiZ IoapS5q9SWuZnHAxu4Y72uZrLdZ+cdQ8Q44BsNzw8qGmcPd64c1X+4xEsHvMBtUk/kCIGM jXdMKhjdNgBa7MjOBeEjtwXbMVk+850Ffb7R9bOSS8NkDqiWPOvlrtPnoCxn9VikggG8eO nJ7/fNM0JlXDG3RvsDh5smVxpzD+tO75pSbeyIkx1W2d5nmGBELGLhIV3mv5Eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX843TWbz19Ky for ; Tue, 10 Mar 2026 11:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1be48 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ab2b871e82e1 - stable/15 - amd64: extract uprintf_signal printing into a helper List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ab2b871e82e1d0a6cf5d6faeb1800116237a5a67 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:32 +0000 Message-Id: <69b003e4.1be48.4406298e@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ab2b871e82e1d0a6cf5d6faeb1800116237a5a67 commit ab2b871e82e1d0a6cf5d6faeb1800116237a5a67 Author: Konstantin Belousov AuthorDate: 2026-02-18 19:04:39 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 amd64: extract uprintf_signal printing into a helper (cherry picked from commit 3e8a9995e9541a0bdd707f111e51ef46a544ee3e) --- sys/amd64/amd64/trap.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 84305ca918df..d07fbc223193 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -177,6 +177,30 @@ SYSCTL_INT(_machdep, OID_AUTO, nmi_flush_l1d_sw, CTLFLAG_RWTUN, &nmi_flush_l1d_sw, 0, "Flush L1 Data Cache on NMI exit, software bhyve L1TF mitigation assist"); +static void +trap_uprintf_signal(struct thread *td, struct trapframe *frame, register_t addr, + int signo, int ucode) +{ + struct proc *p; + + if (!uprintf_signal) + return; + p = td->td_proc; + uprintf("pid %d comm %s: signal %d err %#lx code %d type %d " + "addr %#lx rsp %#lx rip %#lx rax %#lx " + "<%02x %02x %02x %02x %02x %02x %02x %02x>\n", + p->p_pid, p->p_comm, signo, frame->tf_err, ucode, frame->tf_trapno, + addr, frame->tf_rsp, frame->tf_rip, frame->tf_rax, + fubyte((void *)(frame->tf_rip + 0)), + fubyte((void *)(frame->tf_rip + 1)), + fubyte((void *)(frame->tf_rip + 2)), + fubyte((void *)(frame->tf_rip + 3)), + fubyte((void *)(frame->tf_rip + 4)), + fubyte((void *)(frame->tf_rip + 5)), + fubyte((void *)(frame->tf_rip + 6)), + fubyte((void *)(frame->tf_rip + 7))); +} + /* * Table of handlers for various segment load faults. */ @@ -626,21 +650,7 @@ trap(struct trapframe *frame) ksi.ksi_code = ucode; ksi.ksi_trapno = type; ksi.ksi_addr = (void *)addr; - if (uprintf_signal) { - uprintf("pid %d comm %s: signal %d err %#lx code %d type %d " - "addr %#lx rsp %#lx rip %#lx rax %#lx " - "<%02x %02x %02x %02x %02x %02x %02x %02x>\n", - p->p_pid, p->p_comm, signo, frame->tf_err, ucode, type, - addr, frame->tf_rsp, frame->tf_rip, frame->tf_rax, - fubyte((void *)(frame->tf_rip + 0)), - fubyte((void *)(frame->tf_rip + 1)), - fubyte((void *)(frame->tf_rip + 2)), - fubyte((void *)(frame->tf_rip + 3)), - fubyte((void *)(frame->tf_rip + 4)), - fubyte((void *)(frame->tf_rip + 5)), - fubyte((void *)(frame->tf_rip + 6)), - fubyte((void *)(frame->tf_rip + 7))); - } + trap_uprintf_signal(td, frame, addr, signo, ucode); KASSERT((read_rflags() & PSL_I) != 0, ("interrupts disabled")); trapsignal(td, &ksi); From nobody Tue Mar 10 11:43:33 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX860R5sz6VWB9 for ; Tue, 10 Mar 2026 11:43:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX854m56z494M for ; Tue, 10 Mar 2026 11:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jV7mtXhBVCrIxYLv97rk2cYdALer5CjpXWh/iGbuqtY=; b=GvGNlwJcSf+HAzyEkhjxCL1sjxEgkpF+dkpIVyMDciUlqRy3kZLUeiDZVv9L6W7qM0fKwg HvqCJUeC2oA2XWVbU/rgxEoPckRzfIszx8ALNhbAXR0QJH4UW+Wx/N8w6oamWDuXA+haIO SCJ4AX4yt9udI0yHa9iXmGd6wwY72g1Li5ojgaTGHijsTAsao1yiau1WPiBKPkKxrFd9i/ F79rwh0ZQphvqfhSQChCYbz+s+8S6WoJotQG3ipUMhmgP8JsEVP+i+pUJIni1l2At/7y6t xgge9NmHHU4NDhcbNp0iBfRLJDXm6NTtnNry4E92sQHPtIBLkelfzByRYZBR2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143013; a=rsa-sha256; cv=none; b=HEP8vhvwmnhlmLizo9kbmNOIgjYO1ndB3dYhzKEMr3Re35nJpsV3nTdqPHcBEcrTeut7Xf Deag/vLtUwV7pTxdcxA1YpbmbosuvBmuoJKjOjDkufFuaBrO17BqooCcREfIrfenmHurth mSuiV5lgTjidFu3qa1CvYw/do50Y5ZScOPZuzCxfyndNqJtvqaaVLQwVDuUYKUMX71a2YS rn9VwuK+DIxSCFFvuIm9fbZ6/z9HHU7Kg2AGd4KF0qmjnn/kgRCy2/aJJvg5IkJptU16wE ofOP3j7508qonLQv+z7MGBmrdX21bqMlYfeBEbwe1wxKJqWzr+VY33WHu1PbQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jV7mtXhBVCrIxYLv97rk2cYdALer5CjpXWh/iGbuqtY=; b=C79xSnGEIKA+H1U/RKOOOhGwvTzsbeEdI+pNP1ly5exSSsnbgXFBlig2X3rQj/wO83hJNc VarFQjR78Ev8iTWXiOEUZ1KjQOg8NOLx8BMKAUfgW8Bm62EEgU+8lcKtc5P9bgH/Hc1GlH qH6qpa9nQqha5r1MH12LtTmFHWwiykdQBE4zx1nYBIOrZ60PKSkJgubUmofS/YqrWecEiK nH4w5Qp03BPt8k2hrQgXuTX8+UHVzywVlQNztHQ0cQPCcK+SxJRdK4R0VH+29qZlemBkoi EMhkadsDZ1IStB+UjZ9vfdWSXiE3K6W817EnvLUKiq8XUnpkqtsFrl210H5yGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX854Hb1z18sM for ; Tue, 10 Mar 2026 11:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1df33 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5061709d8f7c - stable/15 - amd64: print userspace fsbase and gsbase for uprintf_signal List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5061709d8f7c42a873e09721509d24aba1316fe2 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:33 +0000 Message-Id: <69b003e5.1df33.d00bdc5@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5061709d8f7c42a873e09721509d24aba1316fe2 commit 5061709d8f7c42a873e09721509d24aba1316fe2 Author: Konstantin Belousov AuthorDate: 2026-03-04 03:22:26 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 amd64: print userspace fsbase and gsbase for uprintf_signal (cherry picked from commit 272ea451199462dffd55dd580532eb28ddc92174) --- sys/amd64/amd64/trap.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index d07fbc223193..d173f57e2e4f 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -182,15 +182,32 @@ trap_uprintf_signal(struct thread *td, struct trapframe *frame, register_t addr, int signo, int ucode) { struct proc *p; + struct pcb *pcb; + register_t fsbase, gsbase, r; if (!uprintf_signal) return; p = td->td_proc; + pcb = td->td_pcb; + if ((cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) != 0) { + r = intr_disable(); + if ((pcb->pcb_flags & PCB_FULL_IRET) == 0) { + fsbase = rdfsbase(); + gsbase = rdmsr(MSR_KGSBASE); + } else { + fsbase = pcb->pcb_fsbase; + gsbase = pcb->pcb_gsbase; + } + intr_restore(r); + } else { + fsbase = pcb->pcb_fsbase; + gsbase = pcb->pcb_gsbase; + } uprintf("pid %d comm %s: signal %d err %#lx code %d type %d " - "addr %#lx rsp %#lx rip %#lx rax %#lx " + "addr %#lx rsp %#lx rip %#lx rax %#lx fsb %#lx gsb %#lx " "<%02x %02x %02x %02x %02x %02x %02x %02x>\n", p->p_pid, p->p_comm, signo, frame->tf_err, ucode, frame->tf_trapno, - addr, frame->tf_rsp, frame->tf_rip, frame->tf_rax, + addr, frame->tf_rsp, frame->tf_rip, frame->tf_rax, fsbase, gsbase, fubyte((void *)(frame->tf_rip + 0)), fubyte((void *)(frame->tf_rip + 1)), fubyte((void *)(frame->tf_rip + 2)), From nobody Tue Mar 10 11:43:34 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX870dY4z6VVs8 for ; Tue, 10 Mar 2026 11:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX866vkcz49fh for ; Tue, 10 Mar 2026 11:43:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qmd2iDgM2lRCvQwYOhZN4RJ4x+sdBYsE2mvSVfsBOb0=; b=SXvysv6hWjfCLcnI0+kFWzgcEzM1UvxiJOU3YiwV3WfXnzjRBck2zLM27f83pDTzPEUWsT bTLjmBzHt6sEFNJI/W6rt/rIJhX0IgPQDMiKLKVPzww51W5aULwdhdHxjSrkZNRBwK8pDr U0+SqbBJekeREz52ThR+5CAVkJnQrfA3ZSWY4PM+jH0p0Lk5QFX1ZG3ElysnNvMvkMcOXA e+aODlf0dZYHXQ6Gb5q1/LPCU7o1hZCO5Tiwa0M2yQ6n7lPdXqSVNPDLC3jzmd6XkNLfq/ 4l0IqWoZkEafVY0RVs0Cn1dQ4rb5cEXUrfzjaPY+MMPqoYaMICnaOJrpOactwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143015; a=rsa-sha256; cv=none; b=yxHZLqvGYEEbAb2J2wUqvinXXuLyK2vOw7jz9XDJbOd4vajY3+6VVNNqQJvjoEdt79u75Y 2Av41L6F76gXE6yryC4eAs362M2InCjhAjuWlY7yDCwNWToaIOfmzHK4YisSz8PGiLi6pN K9XUqriTJU3AR3AnVOqTDbdHBIDU3uXe6DmFwcbULTDmpghC2l4rjBsYh76V1tdbTWGwQU QFcjZ9PxwPUnFu5wCa4xNS6pQQoBe5AWAffP4posqlWfSYbyKQ1g6IPocVh/AGwsK2vyf9 8Y4vv8LgMR8RDna7Vm+wa0w97zFfxMFk/6dYErVnIvM2xCYXDb7ktkw2gtap6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qmd2iDgM2lRCvQwYOhZN4RJ4x+sdBYsE2mvSVfsBOb0=; b=FGO8rNo2iqU50WY3LTh37Hx9zCbDRbArIxRVTyy5xw7FFcuZGdO1erDGlq43eID+gHIy+i KIoMFC6urvHdTRIfismzrrnsDGD8HuubRuFOy0VVtHfpDWD3idzFk6E5pskDHPQLVfWVpE CSFvTdGEJXV1AaERK595L5l9f3bic7wLAoAKu0XZVRdE7JnQK0I2E8HaFht9OBFv1EVMZw M4Hh0sy8yq3cn6eGRjxZ/luRxrkHsbBEfblqkloHMwZ8jYM++6I1cS3RjnokMzofdekfms HGfe4PmGT6ZEowsRVz/cq+0K9sLt9fwxQ1RnkvSRR97YvxW80eEbfS2EkwCsIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8655kmz19H5 for ; Tue, 10 Mar 2026 11:43:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c272 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b0ca929c27ea - stable/15 - x86: change signatures of ipi_{bitmap,swi}_handler() to take pointer List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b0ca929c27ea012b648be9a5b6373f851e4ccf40 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:34 +0000 Message-Id: <69b003e6.1c272.209f7832@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b0ca929c27ea012b648be9a5b6373f851e4ccf40 commit b0ca929c27ea012b648be9a5b6373f851e4ccf40 Author: Konstantin Belousov AuthorDate: 2026-02-27 03:54:06 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 x86: change signatures of ipi_{bitmap,swi}_handler() to take pointer (cherry picked from commit fdc1f34506346fd26db8bfb80ba69d1af844c53a) --- sys/amd64/amd64/apic_vector.S | 2 ++ sys/i386/i386/apic_vector.S | 4 ++-- sys/i386/i386/mp_machdep.c | 14 ++++++++++++++ sys/x86/include/x86_smp.h | 4 ++-- sys/x86/x86/mp_x86.c | 10 +++++----- sys/x86/xen/xen_apic.c | 4 ++-- 6 files changed, 27 insertions(+), 11 deletions(-) diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S index e98bae9eb6c5..d3ff3c238b48 100644 --- a/sys/amd64/amd64/apic_vector.S +++ b/sys/amd64/amd64/apic_vector.S @@ -179,6 +179,7 @@ IDTVEC(spuriousint) INTR_HANDLER ipi_intr_bitmap_handler call as_lapic_eoi KMSAN_ENTER + movq %rsp,%rdi call ipi_bitmap_handler KMSAN_LEAVE jmp doreti @@ -209,6 +210,7 @@ IDTVEC(spuriousint) INTR_HANDLER ipi_swi call as_lapic_eoi KMSAN_ENTER + movq %rsp,%rdi call ipi_swi_handler KMSAN_LEAVE jmp doreti diff --git a/sys/i386/i386/apic_vector.S b/sys/i386/i386/apic_vector.S index 5d248409718d..0037f1c968fb 100644 --- a/sys/i386/i386/apic_vector.S +++ b/sys/i386/i386/apic_vector.S @@ -261,7 +261,7 @@ IDTVEC(ipi_intr_bitmap_handler) cld KENTER call as_lapic_eoi - movl $ipi_bitmap_handler, %eax + movl $ipi_bitmap_handler_i386, %eax call *%eax jmp doreti @@ -306,7 +306,7 @@ IDTVEC(ipi_swi) cld KENTER call as_lapic_eoi - movl $ipi_swi_handler, %eax + movl $ipi_swi_handler_i386, %eax call *%eax jmp doreti diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index 18ec0d83fad3..0913a0f70d14 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -736,3 +736,17 @@ invlcache_handler(void) wbinvd(); PCPU_SET(smp_tlb_done, generation); } + +void ipi_bitmap_handler_i386(struct trapframe frame); +void +ipi_bitmap_handler_i386(struct trapframe frame) +{ + ipi_bitmap_handler(&frame); +} + +void ipi_swi_handler_i386(struct trapframe frame); +void +ipi_swi_handler_i386(struct trapframe frame) +{ + ipi_swi_handler(&frame); +} diff --git a/sys/x86/include/x86_smp.h b/sys/x86/include/x86_smp.h index 5cecfab9d183..84601a379e19 100644 --- a/sys/x86/include/x86_smp.h +++ b/sys/x86/include/x86_smp.h @@ -96,10 +96,10 @@ void init_secondary_tail(void); void init_secondary(void); void ipi_startup(int apic_id, int vector); void ipi_all_but_self(u_int ipi); -void ipi_bitmap_handler(struct trapframe frame); +void ipi_bitmap_handler(struct trapframe *frame); void ipi_cpu(int cpu, u_int ipi); int ipi_nmi_handler(void); -void ipi_swi_handler(struct trapframe frame); +void ipi_swi_handler(struct trapframe *frame); void ipi_selected(cpuset_t cpus, u_int ipi); void ipi_self_from_nmi(u_int vector); void set_interrupt_apic_ids(void); diff --git a/sys/x86/x86/mp_x86.c b/sys/x86/x86/mp_x86.c index 8345117f5b6f..a04b4aaa704e 100644 --- a/sys/x86/x86/mp_x86.c +++ b/sys/x86/x86/mp_x86.c @@ -1328,14 +1328,14 @@ ipi_send_cpu(int cpu, u_int ipi) } void -ipi_bitmap_handler(struct trapframe frame) +ipi_bitmap_handler(struct trapframe *frame) { struct trapframe *oldframe; struct thread *td; int cpu = PCPU_GET(cpuid); u_int ipi_bitmap; - kasan_mark(&frame, sizeof(frame), sizeof(frame), 0); + kasan_mark(frame, sizeof(*frame), sizeof(*frame), 0); td = curthread; ipi_bitmap = atomic_readandclear_int(&cpuid_to_pcpu[cpu]-> @@ -1353,7 +1353,7 @@ ipi_bitmap_handler(struct trapframe frame) td->td_intr_nesting_level++; oldframe = td->td_intr_frame; - td->td_intr_frame = &frame; + td->td_intr_frame = frame; #if defined(STACK) || defined(DDB) if (ipi_bitmap & (1 << IPI_TRACE)) stack_capture_intr(); @@ -1707,10 +1707,10 @@ cpususpend_handler(void) * Handle an IPI_SWI by waking delayed SWI thread. */ void -ipi_swi_handler(struct trapframe frame) +ipi_swi_handler(struct trapframe *frame) { - intr_event_handle(clk_intr_event, &frame); + intr_event_handle(clk_intr_event, frame); } /* diff --git a/sys/x86/xen/xen_apic.c b/sys/x86/xen/xen_apic.c index 43a253cc2860..c8760545c8e9 100644 --- a/sys/x86/xen/xen_apic.c +++ b/sys/x86/xen/xen_apic.c @@ -217,7 +217,7 @@ static int xen_ipi_bitmap_handler(void *arg) { - ipi_bitmap_handler(*curthread->td_intr_frame); + ipi_bitmap_handler(curthread->td_intr_frame); return (FILTER_HANDLED); } @@ -296,7 +296,7 @@ static int xen_ipi_swi_handler(void *arg) { - ipi_swi_handler(*curthread->td_intr_frame); + ipi_swi_handler(curthread->td_intr_frame); return (FILTER_HANDLED); } From nobody Tue Mar 10 11:43:35 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX880lcPz6VWH0 for ; Tue, 10 Mar 2026 11:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX876TFpz49X4 for ; Tue, 10 Mar 2026 11:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oqWufFMpVBsB33fsbFrYQfWa/1wmDvgZ5qENSSVkfEQ=; b=oIlVn3v7G7G8liJdGxyv5Q77obPcF+4KBeW3lQVyFp6IsJuIDBDUd5t/nVingJ+FnGMfqw YyLvatCytroM0cSUOSX+u5Qj1+9BSeB4IaIbTJ4fcEFHxOXoOlkI1TEa2gBfKzDFQHy8v+ KWfRQVevvfqH8Wi9C4NwNCSnkFHebtzvw5heoF14dV4FPmE5T1/X9bVi+8Ik+610eSHszA K64YvnT36rdCgLIpwBbk8UPEgA1070pQkuD+F9EOZnUaeSaAXiqwzNrlMCEBtFYvk+xZr2 Xzd6W3lnGxMSZqf5GvEKt0Qzb+26v8/vgKKEWzbpkZNUKQnFZ3a68UVQW2vc2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143015; a=rsa-sha256; cv=none; b=OG8srDnDUJuddTn9gZmt1n4yrsUfLyAQifo4eEzvsuYYyBS3jOaQdLzirVk/0lWtBY8Km8 RQ+4n8YvRtm/8tC20A3mI8GSk/AvcAM/uErgSgXO10vdGOE3vKdatPV3dwiJdt/B6qlekE 4QOOe6ktw5TjULj8Hyra0V5ggdQ6DYmyK+Q15NGxenjpCVUKNZcmGenrrf4KW0yijrudGh lQ7tSq2QLXUVLZ+T7tls2KKSubMiFZ2qPI+7XGmlwHQ5Rk/36ebizHohnLusGHv0I8QB9x 1r7BExtSV4dIy6WLdVp1UcjQAO+45j5IpnyPRr5uTzAsazn8QSzGhBj69loREw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oqWufFMpVBsB33fsbFrYQfWa/1wmDvgZ5qENSSVkfEQ=; b=Se8KcXab6bOJfP6C18kGFiA/FSJbvMLoV10McbNdqeu4rAzLwlKnK/DS382rarpGbU2xNO frp+MXVLez6wDlA/X3lRI3EfjsyedYRd8vYQ7xI6/m3phj7breWcodkeJXafxBBjAZ8V8L YrIGjo53U7lCQtNSUeB9a2xBoVP3WlyWPEH4zoJ1fLCu38t92fp/WcawRZ0ZZJ7GgI4vbg zMPCxszcBslOlBFtLWOCK71AuwJ2xtlZr8zKGPhFrnJ5XKz/CQFCd29fKcnOyLzZCDj1PL aaX5ubBVPIWOUXevigZdnvU0iOWEcn5uEwgRUOmcYHaHzQObBB+bV7NrnkQu2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX875x77z18sN for ; Tue, 10 Mar 2026 11:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1be4c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0b0bbdac18d1 - stable/15 - zfs rename: properly cleanup on errors occuring before zfs_do_rename() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0b0bbdac18d153e365e20989e23636d51214f972 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:35 +0000 Message-Id: <69b003e7.1be4c.68b43bb6@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0b0bbdac18d153e365e20989e23636d51214f972 commit 0b0bbdac18d153e365e20989e23636d51214f972 Author: Konstantin Belousov AuthorDate: 2026-03-05 02:57:34 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 zfs rename: properly cleanup on errors occuring before zfs_do_rename() (cherry picked from commit ed87040311b88e2c95a791aa049f2c37c857f048) --- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index 42565b579de7..7ea6f119130b 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -5518,15 +5518,24 @@ zfs_freebsd_rename(struct vop_rename_args *ap) } #endif - if (error == 0) + if (error == 0) { error = zfs_do_rename(fdvp, &fvp, ap->a_fcnp, tdvp, &tvp, ap->a_tcnp, ap->a_fcnp->cn_cred); - - vrele(fdvp); - vrele(fvp); - vrele(tdvp); - if (tvp != NULL) - vrele(tvp); + vrele(fdvp); + vrele(fvp); + vrele(tdvp); + if (tvp != NULL) + vrele(tvp); + } else { + if (tdvp == tvp) + vrele(tdvp); + else + vput(tdvp); + if (tvp != NULL) + vput(tvp); + vrele(fdvp); + vrele(fvp); + } return (error); } From nobody Tue Mar 10 11:43:36 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX894rxwz6VWBB for ; Tue, 10 Mar 2026 11:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX890zmDz49R5 for ; Tue, 10 Mar 2026 11:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D7mGFUf+DGslPxgliQWaPZc6jSUozPaK7SjYjyXw62g=; b=ZZs3d0ZqIIu+mhapqwO5bQ/J1xJ60q55/9Y5OJ3KfwkSumw6dnHOZLTx9vQWo4TX0XkDDR ekdVuSJfr78yHNdiyO8ew9PO6zeixPMLsAc7IiWUmKcpHSA0zxKNrDISTm3kPdm3zdcKeV ZEg+Qf8KkWwXR10fQY6h19RGQ4/LvYu0hv8HQZv+tQfVDzjwthFiBBTfLS5Lmx4kYKShee U27gNT24upn0KLS9Vt44rlzwxvYFg1lmY9/8Hpis4+sBoeeSR1uak6cAlloNKakHe1JQ7K S4QA8j4VD+drZbm/I9wM4oNTtQrAJRjsBMK8A7/LNqwNUgPTFeBliRbGWplEvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143017; a=rsa-sha256; cv=none; b=DqzjUI1RwNCDfRfdpeHuo/oD6JB7RMMGQqFE6wxHfSDwekDEHfqQp5v//Ctuhn1mDlmyF6 Mhkp77PaXQHZzzIqWH+YXNH1pGbhoLhFJBful4ba+39S4NCe0zENuiKSjkvxvada92i9Oe DfzAnrAX8EP9y9AykNEIxTM+C8aLQdJRFNQP1xnLGZrWgcIJC/5x34NZ/wit5A2jVhgs+j RIHGFcJp+RhfI+1hzbGJYzxfcdctVyDXjYeM/7iNPBFEe0H8mEBhXot7IS8BQwGdRhZkuS /NrqeshIOdYsxKokJ6fm854l9PMRtfq1binjmf3qfLJgfOACP8PLDuqbGf8KJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D7mGFUf+DGslPxgliQWaPZc6jSUozPaK7SjYjyXw62g=; b=isF1FkNN2U2PyIScxZGv1ylgEJ8fpHE2scVvPcpRvIuI8nAVkW6I1p0iwq//1NC3hfobPt faGVz00VqafNIAl+VYUMJIJOSLDpUTqvbOh5BlKEsLYnsMSgJlLwEOBdkDDz1w5iKzO9gH 2IpEnckz80RuCha5kU7l/8Yd6K/kfjLIESGkI5Em9Inpv5PUMLO9A+8b3enMFpGozC814k wNoMt08AQ/Q0HWyuywxfSW9n11cLFSrGv77qOf5jrflFHEO7bNUyCCtlFAO/T8PgDBLs9m 1HsLoemnbCBZpYAILU1iyhv5feiy+JVarqd3XUWT/7wtNuJeaZuje8aTsf1dlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX886rdfz19L1 for ; Tue, 10 Mar 2026 11:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19cfa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 45401a4bdec4 - stable/15 - VOP_RENAME(9): add flags argument List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 45401a4bdec4a1c2d6bf7bc9deaaf858da7e41e4 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:36 +0000 Message-Id: <69b003e8.19cfa.68a865e7@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=45401a4bdec4a1c2d6bf7bc9deaaf858da7e41e4 commit 45401a4bdec4a1c2d6bf7bc9deaaf858da7e41e4 Author: Konstantin Belousov AuthorDate: 2026-02-26 18:22:48 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 VOP_RENAME(9): add flags argument (cherry picked from commit e486066cf48a89ba87fab6b3d2b56f271f50439b) --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 3 +++ sys/fs/fuse/fuse_vnops.c | 4 ++++ sys/fs/msdosfs/msdosfs_vnops.c | 5 +++++ sys/fs/nfsclient/nfs_clvnops.c | 6 ++++++ sys/fs/nfsserver/nfs_nfsdport.c | 2 +- sys/fs/nullfs/null_vnops.c | 3 ++- sys/fs/p9fs/p9fs_vnops.c | 5 +++++ sys/fs/smbfs/smbfs_vnops.c | 5 +++++ sys/fs/tmpfs/tmpfs_vnops.c | 5 +++++ sys/fs/unionfs/union_vnops.c | 7 ++++++- sys/kern/vfs_syscalls.c | 2 +- sys/kern/vnode_if.src | 1 + sys/ufs/ufs/ufs_vnops.c | 7 +++++++ 13 files changed, 51 insertions(+), 4 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index 7ea6f119130b..ed4aa19b96e5 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -5518,6 +5518,9 @@ zfs_freebsd_rename(struct vop_rename_args *ap) } #endif + if (error == 0 && ap->a_flags != 0) + error = EOPNOTSUPP; + if (error == 0) { error = zfs_do_rename(fdvp, &fvp, ap->a_fcnp, tdvp, &tvp, ap->a_tcnp, ap->a_fcnp->cn_cred); diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 9c0fa0a5b6f9..3bfc5396c365 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -2171,6 +2171,10 @@ fuse_vnop_rename(struct vop_rename_args *ap) err = EXTERROR(EXDEV, "Cross-device rename"); goto out; } + if (ap->a_flags != 0) { + err = EOPNOTSUPP; + goto out; + } cache_purge(fvp); /* diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 6dfac1b4ebd2..3e28a7ce9d05 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -970,6 +970,11 @@ msdosfs_rename(struct vop_rename_args *ap) goto abortit; } + if (ap->a_flags != 0) { + error = EOPNOTSUPP; + goto abortit; + } + /* * If source and dest are the same, do nothing. */ diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 0d54b869d74c..5eea16d0f129 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -2196,6 +2196,12 @@ nfs_rename(struct vop_rename_args *ap) error = EXDEV; goto out; } + + if (ap->a_flags != 0) { + error = EOPNOTSUPP; + goto out; + } + nmp = VFSTONFS(fvp->v_mount); if (fvp == tvp) { diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index 567de6422b7c..63f7b5ecf564 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -1715,7 +1715,7 @@ out: if (error == 0) { error = VOP_RENAME(fromndp->ni_dvp, fromndp->ni_vp, &fromndp->ni_cnd, tondp->ni_dvp, tondp->ni_vp, - &tondp->ni_cnd); + &tondp->ni_cnd, 0); lockmgr(&mp->mnt_renamelock, LK_RELEASE, 0); vfs_rel(mp); } else { diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index acbe4cb03f76..a3daa2d8dd54 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -737,7 +737,8 @@ null_rename(struct vop_rename_args *ap) ltvp = NULL; } - error = VOP_RENAME(lfdvp, lfvp, ap->a_fcnp, ltdvp, ltvp, ap->a_tcnp); + error = VOP_RENAME(lfdvp, lfvp, ap->a_fcnp, ltdvp, ltvp, ap->a_tcnp, + ap->a_flags); vrele(fdvp); vrele(fvp); vrele(tdvp); diff --git a/sys/fs/p9fs/p9fs_vnops.c b/sys/fs/p9fs/p9fs_vnops.c index acb73973d93b..ad1eb50276e3 100644 --- a/sys/fs/p9fs/p9fs_vnops.c +++ b/sys/fs/p9fs/p9fs_vnops.c @@ -2084,6 +2084,11 @@ p9fs_rename(struct vop_rename_args *ap) goto out; } + if (ap->a_flags != 0) { + error = EOPNOTSUPP; + goto out; + } + /* warning if you are renaming to the same name */ if (fvp == tvp) error = 0; diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c index 63b249c93771..690f30681332 100644 --- a/sys/fs/smbfs/smbfs_vnops.c +++ b/sys/fs/smbfs/smbfs_vnops.c @@ -577,6 +577,11 @@ smbfs_rename(struct vop_rename_args *ap) goto out; } + if (ap->a_flags != 0) { + error = EOPNOTSUPP; + goto out; + } + if (tvp && vrefcnt(tvp) > 1) { error = EBUSY; goto out; diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index e1bc0d156baa..5596f8794546 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -993,6 +993,11 @@ tmpfs_rename(struct vop_rename_args *v) goto out; } + if (v->a_flags != 0) { + error = EOPNOTSUPP; + goto out; + } + /* If source and target are the same file, there is nothing to do. */ if (fvp == tvp) { error = 0; diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 602d5fdfcb97..9dccecaef5f7 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -1413,6 +1413,11 @@ unionfs_rename(struct vop_rename_args *ap) goto unionfs_rename_abort; } + if (ap->a_flags != 0) { + error = EOPNOTSUPP; + goto unionfs_rename_abort; + } + /* Renaming a file to itself has no effect. */ if (fvp == tvp) goto unionfs_rename_abort; @@ -1581,7 +1586,7 @@ unionfs_rename(struct vop_rename_args *ap) if (rfvp == rtvp) goto unionfs_rename_abort; - error = VOP_RENAME(rfdvp, rfvp, fcnp, rtdvp, rtvp, tcnp); + error = VOP_RENAME(rfdvp, rfvp, fcnp, rtdvp, rtvp, tcnp, ap->a_flags); if (error == 0) { if (rtvp != NULLVP && rtvp->v_type == VDIR) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 5eaa9d0ef120..0af4e9d08253 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -3887,7 +3887,7 @@ again1: out: if (error == 0) { error = VOP_RENAME(fromnd.ni_dvp, fromnd.ni_vp, &fromnd.ni_cnd, - tond.ni_dvp, tond.ni_vp, &tond.ni_cnd); + tond.ni_dvp, tond.ni_vp, &tond.ni_cnd, 0); NDFREE_PNBUF(&fromnd); NDFREE_PNBUF(&tond); } else { diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src index 3faefb607f24..6b7448d9f1df 100644 --- a/sys/kern/vnode_if.src +++ b/sys/kern/vnode_if.src @@ -336,6 +336,7 @@ vop_rename { IN WILLRELE struct vnode *tdvp; IN WILLRELE struct vnode *tvp; IN struct componentname *tcnp; + IN u_int flags; }; diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 736c5a66267e..429e6b5c8dd7 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1255,6 +1255,7 @@ ufs_rename( struct vnode *a_tdvp; struct vnode *a_tvp; struct componentname *a_tcnp; + u_int a_flags; } */ *ap) { struct vnode *tvp = ap->a_tvp; @@ -1293,6 +1294,12 @@ ufs_rename( goto releout; } + if (ap->a_flags != 0) { + error = EOPNOTSUPP; + mp = NULL; + goto releout; + } + fdvp_s = fvp_s = tdvp_s = tvp_s = SEQC_MOD; relock: /* From nobody Tue Mar 10 11:43:39 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8C3Slgz6VWFJ for ; Tue, 10 Mar 2026 11:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8C1tsVz49PC for ; Tue, 10 Mar 2026 11:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5m/r8dUzVyYf8vR3sxVSHZEnXNFG0Z4HnQo/7fj27cc=; b=ik6fwUbV3mwVvYj+CQpLAlNv54kj1voO91Eq12xyHwnBscV3CmuZ/L+6f4hrwh5DwOjiiM 70Hl1kkuX4Gp705fiQZFzEEp8p84xK8AJT4NlMk4lizj84zyy1kWaT1wWU+QVtsQ4f/9JF QaJrecHZ5ZdTABcnNTSHrA8525Iv15YdkYrlpLN02BCiFN4BH/7wx1dbS5ufEK+07yeOmy GjoxwJKEWa+VVOhW4dkOSlHyIWW6mD0dIu+iHDFPm1NuWmV9XYcBg3TgJ4gDXEks4u4YXH F7iuA1FnPItHz+8Ase6i9PSsXBTr5f0NlV6uMwpRscsyH8/18Cp5lj0jKT5gqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143019; a=rsa-sha256; cv=none; b=Gy2GIwYDI/oJ8ALeb6LPQ2Iem7tgQwwSRvkn5a+4V1dpeFdmv3mkOFt7d6HdCNN7XP7on1 M0yhp7V2kgtsvRPgZ/ZK+NkOecSAf7wR+JzU5nNJGCqHaQd73ycjElp1YPl/B36xZcJhQm z15id2i3Z+sPPHUi0F31mlptiK8eypZ1Wkh2PzwXwQJbdt0KhCKh6QtZ6u+FQ0UUpKg5ZB 6RcIEKzPx1zFJaITpKXHos4v29k0WWeyRubOM+c2YaTu0JvLXYYgiVzFWr42yy94TbwkaC BfIrA14Ju6myPTcNp2dS1b6qalePZAyr5T4JndrAhxR5shp/hG2JFER6fb2KIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5m/r8dUzVyYf8vR3sxVSHZEnXNFG0Z4HnQo/7fj27cc=; b=utQwcXUVy2Sciag3EWyYoTHvaVRgF3bnH9t8Q0WXCer0kTbznlOAHUXh4VghINoBJkxWxM MDf7h5pl0f2xKJ053nPlNRNauVZesTp/tY21tb1m4JOs99G6Y9KMRoIGxodCYqI7FFJLLE n+W3WsGzV8e4PvXzEBFNBjN8VsndmkM+Fxj2udg6hchZKNaiD9hoGBRGHopWll9PxIKA3/ O1TVHLyDbz+uhMYnlD9U9gi5FesjiOA/oOQ4PgIdZS05rSWUyCQ+aV9wXdXEjJxCAaYb1Q J2L4p9a32QYMs63EpTRjnxqktR9hQjY0pY3zQm/wtzKLQc+y8ONu/bay9Qiy7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8C16TTz19Sp for ; Tue, 10 Mar 2026 11:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bebb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 522dbeb9f259 - stable/15 - sys: add renameat2(2) syscall List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 522dbeb9f259ab333927685fb7ecda41ffd96b77 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:39 +0000 Message-Id: <69b003eb.1bebb.51e4118c@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=522dbeb9f259ab333927685fb7ecda41ffd96b77 commit 522dbeb9f259ab333927685fb7ecda41ffd96b77 Author: Konstantin Belousov AuthorDate: 2026-02-26 18:33:33 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 sys: add renameat2(2) syscall (cherry picked from commit 28599a1e5f1b90676a818e0a4818cddd0839ad25) --- include/stdio.h | 1 + lib/libsys/Symbol.sys.map | 1 + sys/kern/syscalls.master | 10 +++++++++- sys/kern/vfs_syscalls.c | 10 ++++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/include/stdio.h b/include/stdio.h index 34e877b60c14..753c7f3df03f 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -398,6 +398,7 @@ int fdclose(FILE *, int *); char *fgetln(FILE *, size_t *); const char *fmtcheck(const char *, const char *) __format_arg(2); int fpurge(FILE *); +int renameat2(int, const char *, int, const char *, unsigned int); void setbuffer(FILE *, char *, int); int setlinebuf(FILE *); int vasprintf(char **, const char *, __va_list) diff --git a/lib/libsys/Symbol.sys.map b/lib/libsys/Symbol.sys.map index 46767f5b6a4d..7f5c252af91b 100644 --- a/lib/libsys/Symbol.sys.map +++ b/lib/libsys/Symbol.sys.map @@ -393,6 +393,7 @@ FBSD_1.8 { FBSD_1.9 { pdrfork; pdrfork_thread; + renameat2; }; FBSDprivate_1.0 { diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index d711f21bee4d..6856a0907d48 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -3413,5 +3413,13 @@ _Out_opt_ _Contains_long_ptr_ struct __siginfo *info ); } - +602 AUE_RENAMEAT STD|CAPENABLED { + int renameat2( + int oldfd, + _In_z_ const char *old, + int newfd, + _In_z_ const char *new, + int flags + ); + } ; vim: syntax=off diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 59bdedf184c6..fdd215f1c9f9 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -3739,6 +3739,14 @@ sys_renameat(struct thread *td, struct renameat_args *uap) UIO_USERSPACE, 0)); } +int +sys_renameat2(struct thread *td, struct renameat2_args *uap) +{ + + return (kern_renameat(td, uap->oldfd, uap->old, uap->newfd, uap->new, + UIO_USERSPACE, uap->flags)); +} + #ifdef MAC static int kern_renameat_mac(struct thread *td, int oldfd, const char *old, int newfd, @@ -3775,6 +3783,8 @@ kern_renameat(struct thread *td, int oldfd, const char *old, int newfd, int error; short irflag; + if (flags != 0) + return (EINVAL); again: tmp = mp = NULL; bwillwrite(); From nobody Tue Mar 10 11:43:38 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8B50bmz6VWMq for ; Tue, 10 Mar 2026 11:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8B2CTzz49XJ for ; Tue, 10 Mar 2026 11:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TIM224sA3TchGMr8pvslAMclzE5JtbZyTj3IHhdY8hk=; b=lsTMlgsEGjdEugSCgr8QvQUAOjJOZ8vHRXk6ISGwWnnlm4dICLpxiwpqI6pKDNrtHdblRg bc0/sDsXnl6rDQkirQKQTaVyy1KUVXJOYfMUVXogF2FTCQLd2AiAvNoGgcmfGi6otbvdln XbwSgR+MDCg4ivYnSIhNeJokZcvBb8XOW2G8du+pMaFkRT8VBJ+Rd1zhFkpAQzSL8FgC7Q 53tTK+v6NqPzPlPk45dYTmmBSoEWaf44v3yCXG2qXTao0pI/sGgDXONzn565GRDw60P8V7 Hk5IpI8OOf/tzFY2L/r1kLQWqiBCED2q//HFB2FywPGxt8+0sHR7lOHihdSe2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143018; a=rsa-sha256; cv=none; b=CwI8pR7PMKHCI0mwvu3wTzjpul+Ds1sgWEw/cuMSOZ/Wj7CkBQVR9CiX3KDA45H22WKVNC MlUJ2ZpDD6dDejdxzdOIZyhuzB5zVv9ujNH5crQiyuyYzdInVODwk3KNRje8P34tT4w/Wm nw0MirJ22fJduATmPpT/SzN95XEecBNxm8TDdCuZUl/j436KXU/zluu0hfg00jgMY99HDp r0k4oMCV8RiC5H07m4EkuOxuKxoCoYFxI2PSLJDySZBf/XG3fueilVLPI8L2snz5f0Fb1o 4Y65HufUelqNLsTvRq+M7s75+BEBOGiYleW3bkaHtEH9T40JuFDYcoZE+caIxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TIM224sA3TchGMr8pvslAMclzE5JtbZyTj3IHhdY8hk=; b=ZFagyJrtuHXuD4d5sSdrNTxrfGLBBfmZCNQuymAhzBLDY8cQtUsx5sdZic3kvvTRSp8R5j VI10/KIJH8Fif/W75yTfXsd8at0VGMhhNCuIsjE/SR0XcwoV3h57GVbWAzozijRItBpI6R E8n2zjAWQAyq3/Y1uF/iS3DYONo4OnTTW0cfigNDZPMT2EeyuX9jWZQS9wBkQkIagxkOtv 2zzK4w0+0l02WzwbDjGCjaYdjQNZJbYERMPJ86dg0FlHcR/VpA0WVUjaGhXaV56eSBLCFB 3OiIO5Z7j5nRl8MdondtRqyIYBEFObLijif9bRpvJZdlyfBU7iWpvxdeczL6Aw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8B0Z6Fz19Yn for ; Tue, 10 Mar 2026 11:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d188 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: bbdf04567777 - stable/15 - kern_renameat(9): add flags argument List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bbdf045677774b7307e0b93e126f0cfc769a7139 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:38 +0000 Message-Id: <69b003ea.1d188.677f7bdb@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bbdf045677774b7307e0b93e126f0cfc769a7139 commit bbdf045677774b7307e0b93e126f0cfc769a7139 Author: Konstantin Belousov AuthorDate: 2026-02-26 18:30:14 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 kern_renameat(9): add flags argument (cherry picked from commit 1f3020067ab3f3c5043d01ea1e3a3d2998a39d4a) --- sys/compat/linux/linux_file.c | 4 ++-- sys/kern/vfs_syscalls.c | 8 ++++---- sys/sys/syscallsubr.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index ca089585bb95..43ccac0308d3 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -811,7 +811,7 @@ linux_rename(struct thread *td, struct linux_rename_args *args) { return (kern_renameat(td, AT_FDCWD, args->from, AT_FDCWD, - args->to, UIO_USERSPACE)); + args->to, UIO_USERSPACE, 0)); } #endif @@ -858,7 +858,7 @@ linux_renameat2(struct thread *td, struct linux_renameat2_args *args) olddfd = (args->olddfd == LINUX_AT_FDCWD) ? AT_FDCWD : args->olddfd; newdfd = (args->newdfd == LINUX_AT_FDCWD) ? AT_FDCWD : args->newdfd; return (kern_renameat(td, olddfd, args->oldname, newdfd, - args->newname, UIO_USERSPACE)); + args->newname, UIO_USERSPACE, 0)); } #ifdef LINUX_LEGACY_SYSCALLS diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 0af4e9d08253..59bdedf184c6 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -3720,7 +3720,7 @@ sys_rename(struct thread *td, struct rename_args *uap) { return (kern_renameat(td, AT_FDCWD, uap->from, AT_FDCWD, - uap->to, UIO_USERSPACE)); + uap->to, UIO_USERSPACE, 0)); } #ifndef _SYS_SYSPROTO_H_ @@ -3736,7 +3736,7 @@ sys_renameat(struct thread *td, struct renameat_args *uap) { return (kern_renameat(td, uap->oldfd, uap->old, uap->newfd, uap->new, - UIO_USERSPACE)); + UIO_USERSPACE, 0)); } #ifdef MAC @@ -3766,7 +3766,7 @@ kern_renameat_mac(struct thread *td, int oldfd, const char *old, int newfd, int kern_renameat(struct thread *td, int oldfd, const char *old, int newfd, - const char *new, enum uio_seg pathseg) + const char *new, enum uio_seg pathseg, u_int flags) { struct mount *mp, *tmp; struct vnode *tvp, *fvp, *tdvp; @@ -3887,7 +3887,7 @@ again1: out: if (error == 0) { error = VOP_RENAME(fromnd.ni_dvp, fromnd.ni_vp, &fromnd.ni_cnd, - tond.ni_dvp, tond.ni_vp, &tond.ni_cnd, 0); + tond.ni_dvp, tond.ni_vp, &tond.ni_cnd, flags); NDFREE_PNBUF(&fromnd); NDFREE_PNBUF(&tond); } else { diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 908a3b89259b..1154e73a6fd3 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -305,7 +305,7 @@ int kern_readv(struct thread *td, int fd, struct uio *auio); int kern_recvit(struct thread *td, int s, struct msghdr *mp, enum uio_seg fromseg, struct mbuf **controlp); int kern_renameat(struct thread *td, int oldfd, const char *old, int newfd, - const char *new, enum uio_seg pathseg); + const char *new, enum uio_seg pathseg, u_int flags); int kern_frmdirat(struct thread *td, int dfd, const char *path, int fd, enum uio_seg pathseg, int flag); int kern_sched_getparam(struct thread *td, struct thread *targettd, From nobody Tue Mar 10 11:43:41 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8F4SN2z6VWMv for ; Tue, 10 Mar 2026 11:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8F2yh5z49Rd for ; Tue, 10 Mar 2026 11:43:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LiZqazwtjKJbu/Gs6vVxTzopWWs1Xoou4leDN908bqM=; b=bJCm7qvCCesF2ilJRFXrRFDtcLZyepbS/DGYuIMtDpNg8QceEauoMArOSnIpAjpuBNtrcb 1r7IdPjrr3aMaOkQNiJpfqNq3whW+5bVTKnjt+zsy5OQWWlXcQwR6OJhu48fyoUYmak1os 7mJRxlRNRyi2gJweZAj6nP3tXk+pC64AVH8c7+EqlvziI+fp81PV35r+bIBPsaWKmDRJQJ +3oVmVCADEtXuloPtCEuDt3efccRx+tB1CFyLmROhHq9zxNpp3nqIceoAUw5LdIXJLhhQg VAkQLIFO2gKkBEkip6pR6k2Ivz6HPPW86qfAxeA+pGDcrBKwG8s5Y00GVcJUJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143021; a=rsa-sha256; cv=none; b=FBgZr6F4HGPJb93/7e0LYZFNfWiG9hkpUBA6T2C8F7RR1Phfqv7VBmMMtxIuPHmZFG1tID j8qla6x7kGO/QlDFriG85vWql9KZMxdp4bRwDNQlLTo3ZsXvd0eNDOTKkoIHsbNIAGrM0c +nGT6jsjfxCiNo59BtKuAoU+Sp+rGDY3lU7DULNj+wSIFCR0jYmT9ETLs/5MvB3nHnBN8+ 33bYC2otqD39BNin25904LS/vLkDwfmagQlAp6icZxYslFSuyE51bCwV29XZZy2f1Vhy0Z RgVUuXDBfAaBhs2V5iuIHK9qLcJh5ieyiXYKX+BSi5VT4nEoeB7wtzA19z/h2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LiZqazwtjKJbu/Gs6vVxTzopWWs1Xoou4leDN908bqM=; b=ny/nYgbeD7OlvkrYjDMv/2KAASykP0F4Qjx7Zrwp7xJBW3BslIOrXsmxs5vTTRcHYoe6M2 sgQh7t7T6d+RMjLvD83VcWE38bF4XvA+yTfXjidv9WDg5dk4EOA/+xvz4T9fgBGIw95I4S u8RKMzB2eqU7ap6gOGe/n2kWdr/tMszuZ1vNzDVGWVyh7QgjMLDerilDmnFd5P0MDAWlHU bQBwc7pWu5k3INIOnGolYZY0yvO/RklPiN/CYYRRzAMRvcLMYJviRBYyaDtN385IW5fPaD 6l00XVHMCYYycK83NFnrBMgI8RTvXXlxIKhxYLzxBP4YHLr24rCbZZHiG4mJAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8F2YkLz19c6 for ; Tue, 10 Mar 2026 11:43:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1df82 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 72cf8b9e680b - stable/15 - zfs: implement AT_RENAME_NOREPLACE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 72cf8b9e680b65cd07e883a3a872d38825f267c5 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:41 +0000 Message-Id: <69b003ed.1df82.8f7e3a0@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=72cf8b9e680b65cd07e883a3a872d38825f267c5 commit 72cf8b9e680b65cd07e883a3a872d38825f267c5 Author: Konstantin Belousov AuthorDate: 2026-03-01 13:16:55 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 zfs: implement AT_RENAME_NOREPLACE (cherry picked from commit 7a1217ff3bbdd1ef40d1b94170c53611fadeb026) --- .../include/os/freebsd/zfs/sys/zfs_vnops_os.h | 4 ++-- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 25 +++++++++++++++------- sys/contrib/openzfs/module/zfs/zfs_replay.c | 2 +- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops_os.h b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops_os.h index e27c6527e2b6..17ba5255b7b2 100644 --- a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops_os.h +++ b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops_os.h @@ -42,8 +42,8 @@ extern int zfs_rmdir(znode_t *dzp, const char *name, znode_t *cwd, extern int zfs_setattr(znode_t *zp, vattr_t *vap, int flag, cred_t *cr, zidmap_t *mnt_ns); extern int zfs_rename(znode_t *sdzp, const char *snm, znode_t *tdzp, - const char *tnm, cred_t *cr, int flags, uint64_t rflags, vattr_t *wo_vap, - zidmap_t *mnt_ns); + const char *tnm, cred_t *cr, int flags, uint64_t rflags, u_int at_flags, + vattr_t *wo_vap, zidmap_t *mnt_ns); extern int zfs_symlink(znode_t *dzp, const char *name, vattr_t *vap, const char *link, znode_t **zpp, cred_t *cr, int flags, zidmap_t *mnt_ns); extern int zfs_link(znode_t *tdzp, znode_t *sp, diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index ed4aa19b96e5..1b3eeb4353fe 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -3247,7 +3247,7 @@ zfs_rename_check(znode_t *szp, znode_t *sdzp, znode_t *tdzp) static int zfs_do_rename_impl(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, vnode_t *tdvp, vnode_t **tvpp, struct componentname *tcnp, - cred_t *cr); + cred_t *cr, u_int at_flags); /* * Move an entry from the provided source directory to the target @@ -3258,6 +3258,7 @@ zfs_do_rename_impl(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, * tdvp - Target directory to contain the "new entry". * tcnp - New entry name. * cr - credentials of caller. + * at_flags - AT_RENAME_* * INOUT: svpp - Source file * tvpp - Target file, may point to NULL initially * @@ -3269,7 +3270,7 @@ zfs_do_rename_impl(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, static int zfs_do_rename(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, vnode_t *tdvp, vnode_t **tvpp, struct componentname *tcnp, - cred_t *cr) + cred_t *cr, u_int at_flags) { int error; @@ -3298,7 +3299,8 @@ zfs_do_rename(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, return (error); } - error = zfs_do_rename_impl(sdvp, svpp, scnp, tdvp, tvpp, tcnp, cr); + error = zfs_do_rename_impl(sdvp, svpp, scnp, tdvp, tvpp, tcnp, cr, + at_flags); VOP_UNLOCK(sdvp); VOP_UNLOCK(*svpp); out: @@ -3313,7 +3315,7 @@ out: static int zfs_do_rename_impl(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, vnode_t *tdvp, vnode_t **tvpp, struct componentname *tcnp, - cred_t *cr) + cred_t *cr, u_int at_flags) { dmu_tx_t *tx; zfsvfs_t *zfsvfs; @@ -3422,6 +3424,11 @@ zfs_do_rename_impl(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, * Does target exist? */ if (tzp) { + if ((at_flags & AT_RENAME_NOREPLACE) != 0) { + error = SET_ERROR(EEXIST); + goto out; + } + /* * Source and target must be the same type. */ @@ -3542,7 +3549,8 @@ out: int zfs_rename(znode_t *sdzp, const char *sname, znode_t *tdzp, const char *tname, - cred_t *cr, int flags, uint64_t rflags, vattr_t *wo_vap, zidmap_t *mnt_ns) + cred_t *cr, int flags, uint64_t rflags, u_int at_flags, vattr_t *wo_vap, + zidmap_t *mnt_ns) { struct componentname scn, tcn; vnode_t *sdvp, *tdvp; @@ -3574,7 +3582,8 @@ zfs_rename(znode_t *sdzp, const char *sname, znode_t *tdzp, const char *tname, goto fail; } - error = zfs_do_rename(sdvp, &svp, &scn, tdvp, &tvp, &tcn, cr); + error = zfs_do_rename(sdvp, &svp, &scn, tdvp, &tvp, &tcn, cr, + at_flags); fail: if (svp != NULL) vrele(svp); @@ -5518,12 +5527,12 @@ zfs_freebsd_rename(struct vop_rename_args *ap) } #endif - if (error == 0 && ap->a_flags != 0) + if (error == 0 && (ap->a_flags & ~(AT_RENAME_NOREPLACE)) != 0) error = EOPNOTSUPP; if (error == 0) { error = zfs_do_rename(fdvp, &fvp, ap->a_fcnp, tdvp, &tvp, - ap->a_tcnp, ap->a_fcnp->cn_cred); + ap->a_tcnp, ap->a_fcnp->cn_cred, ap->a_flags); vrele(fdvp); vrele(fvp); vrele(tdvp); diff --git a/sys/contrib/openzfs/module/zfs/zfs_replay.c b/sys/contrib/openzfs/module/zfs/zfs_replay.c index 78be046f2262..d8b7c4e8a83e 100644 --- a/sys/contrib/openzfs/module/zfs/zfs_replay.c +++ b/sys/contrib/openzfs/module/zfs/zfs_replay.c @@ -710,7 +710,7 @@ do_zfs_replay_rename(zfsvfs_t *zfsvfs, _lr_rename_t *lr, char *sname, wo_vap, zfs_init_idmap); #else error = zfs_rename(sdzp, sname, tdzp, tname, kcred, vflg, rflags, - wo_vap, NULL); + 0, wo_vap, NULL); #endif zrele(tdzp); From nobody Tue Mar 10 11:43:40 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8D5j1rz6VWFR for ; Tue, 10 Mar 2026 11:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8D2M9xz49RT for ; Tue, 10 Mar 2026 11:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EB3H1aLVIAsl6mgdYi8U1qWMhN7+x6R2k0FcA9ij6yA=; b=lTQzWz12JhxKW68gE+2AeJ3J6wrLoyrHVg80c/zFS8pE6de6uux1UqQpfHmaRJVkoAoyUU KGqaSPNuWvMFUY9hDaJXZutCDk9LvebKlaYKLF6qR81tOCfwdHm1lJ0VOJhqIqWvlg+zvl UIemc+Ds71Owa5nkk72D526wOXp16HK6QtZL6Q6vnK0oLDeYmIus0C4p2gzhZSpWEqhP8X EsSdkvC95XJARs1jzqYo8caC7/UVAq5fsmB/lOfjDdlBxvfH2VoImwJnoZolfFNG158Dlo rkYoKryBNJKrTV8BPkq2tsv+s6KMV+JT4j0E1HL+AHi0mB9EYzItY2sC+W3B9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143020; a=rsa-sha256; cv=none; b=PonnQT3Ox2ji4fNVTLm9L65LBFGJInh0wO8/zJANxE6QcneqgGwywCygyiAc1ktJrQaHAz R9nHI5UlXcyvCqO+k7kgDfA+HpM+LkVBJB2fNqr1bvHzAjK6fLDbUSSUQyb7pigDmN3miU DJDCKEk6J5mxtjpU5ydpsIXap69FYmUusWrZDZMaf2v34r7dwh5YIyD43EeLyGewGlHPyc UiJT+oZRdSmn6WFUm9GX0BCLOwBAYOgjUzlTiZniCoOFeS03buLVk3OAimIEV+i9xtm01k qyarH5ctvxfGJWUjUiSFgOP+L1cD8aRN8gn3lnCiPuXRDRgl7f6fWae0lYRVtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EB3H1aLVIAsl6mgdYi8U1qWMhN7+x6R2k0FcA9ij6yA=; b=aKyvyq4kqzFS0+JGvEjxuhN9MXaeg5gb5Qjjli8o+5VVKJGV4qmuHtEIoVjmW5THwRVN0i naNLvyv6sI/MMx8oc9bAFBYHwG9uji+UEMZ1maWyOIfw+ZG6/LwjlaZo/XmIoiFwvQ7Hqy mmRIZNKE7vhbFRZw3JAjO4VvghlP0GWFB1FyFVwRVb8BbriiQ9Csf98T77XpEXq92qQ1Ij eNpkeAWf4smZyQ2a9NEhMs+F4CA+PnSV6O5pSq0UigfiC8DqiSsBREqrcrPJ3hDQ0YuA76 NSOCjvPIDzcMdYiIfduAWVByu45JSA7Hh6+nUtfWpkGE+fzNfQ3IfpeJD+JzIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8D1ybGz19Yp for ; Tue, 10 Mar 2026 11:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d109 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 9c37c82f526c - stable/15 - renameat2(2): implement AT_RENAME_NOREPLACE flag List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9c37c82f526cc6f70e775e52f1e537d23202dd35 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:40 +0000 Message-Id: <69b003ec.1d109.3f2bbf2e@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9c37c82f526cc6f70e775e52f1e537d23202dd35 commit 9c37c82f526cc6f70e775e52f1e537d23202dd35 Author: Konstantin Belousov AuthorDate: 2026-02-26 18:57:24 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 renameat2(2): implement AT_RENAME_NOREPLACE flag (cherry picked from commit 7aaec5f3faecf98e377c97e24dddb9c65f4b2e75) --- sys/fs/msdosfs/msdosfs_vnops.c | 9 +++++++-- sys/fs/tmpfs/tmpfs_vnops.c | 9 +++++++-- sys/kern/vfs_syscalls.c | 24 ++++++++++++++++++++---- sys/sys/fcntl.h | 3 +++ sys/ufs/ufs/ufs_vnops.c | 7 ++++++- 5 files changed, 43 insertions(+), 9 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 3e28a7ce9d05..d626aed28076 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -49,12 +49,12 @@ * October 1992 */ -#include #include #include #include #include #include +#include #include #include #include @@ -970,7 +970,7 @@ msdosfs_rename(struct vop_rename_args *ap) goto abortit; } - if (ap->a_flags != 0) { + if ((ap->a_flags & ~(AT_RENAME_NOREPLACE)) != 0) { error = EOPNOTSUPP; goto abortit; } @@ -1041,6 +1041,11 @@ relock: vrele(tvp); tvp = NULL; } + if (error == 0 && tvp != NULL && + (ap->a_flags & AT_RENAME_NOREPLACE) != 0) { + error = EEXIST; + goto unlock; + } if (error == 0) { nip = NULL; error = deget(pmp, scn, blkoff, LK_EXCLUSIVE | LK_NOWAIT, diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index 5596f8794546..edd620cfdb5b 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -993,7 +993,7 @@ tmpfs_rename(struct vop_rename_args *v) goto out; } - if (v->a_flags != 0) { + if ((v->a_flags & ~(AT_RENAME_NOREPLACE)) != 0) { error = EOPNOTSUPP; goto out; } @@ -1018,9 +1018,14 @@ tmpfs_rename(struct vop_rename_args *v) "tmpfs_rename: fdvp not locked"); ASSERT_VOP_ELOCKED(tdvp, "tmpfs_rename: tdvp not locked"); - if (tvp != NULL) + if (tvp != NULL) { ASSERT_VOP_ELOCKED(tvp, "tmpfs_rename: tvp not locked"); + if ((v->a_flags & AT_RENAME_NOREPLACE) != 0) { + error = EEXIST; + goto out_locked; + } + } if (fvp == tvp) { error = 0; goto out_locked; diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index fdd215f1c9f9..92b43672bae0 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -3783,7 +3783,7 @@ kern_renameat(struct thread *td, int oldfd, const char *old, int newfd, int error; short irflag; - if (flags != 0) + if ((flags & ~(AT_RENAME_NOREPLACE)) != 0) return (EINVAL); again: tmp = mp = NULL; @@ -3820,6 +3820,19 @@ again: } tdvp = tond.ni_dvp; tvp = tond.ni_vp; + if (tvp != NULL && (flags & AT_RENAME_NOREPLACE) != 0) { + /* + * Often filesystems need to relock the vnodes in + * VOP_RENAME(), which opens a window for invalidation + * of this check. Then, not all filesystems might + * implement AT_RENAME_NOREPLACE. This leads to + * situation where sometimes EOPNOTSUPP might be + * returned from the VOP due to race, while most of + * the time this check works. + */ + error = EEXIST; + goto out; + } error = vn_start_write(fvp, &mp, V_NOWAIT); if (error != 0) { again1: @@ -3912,9 +3925,12 @@ out: vrele(fromnd.ni_dvp); vrele(fvp); } - lockmgr(&tmp->mnt_renamelock, LK_RELEASE, 0); - vfs_rel(tmp); - vn_finished_write(mp); + if (tmp != NULL) { + lockmgr(&tmp->mnt_renamelock, LK_RELEASE, 0); + vfs_rel(tmp); + } + if (mp != NULL) + vn_finished_write(mp); out1: if (error == ERESTART) return (0); diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h index 18d3928e91c7..8f2fc1e2debb 100644 --- a/sys/sys/fcntl.h +++ b/sys/sys/fcntl.h @@ -245,6 +245,9 @@ typedef __pid_t pid_t; #define AT_RESOLVE_BENEATH 0x2000 /* Do not allow name resolution to walk out of dirfd */ #define AT_EMPTY_PATH 0x4000 /* Operate on dirfd if path is empty */ + +#define AT_RENAME_NOREPLACE 0x0001 /* Fail rename if target exists */ +#define RENAME_NOREPLACE AT_RENAME_NOREPLACE #endif /* __BSD_VISIBLE */ /* diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 429e6b5c8dd7..4abbd4ee807f 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1294,7 +1294,7 @@ ufs_rename( goto releout; } - if (ap->a_flags != 0) { + if ((ap->a_flags & ~(AT_RENAME_NOREPLACE)) != 0) { error = EOPNOTSUPP; mp = NULL; goto releout; @@ -1394,6 +1394,11 @@ relock: } } + if (tvp != NULL && (ap->a_flags & AT_RENAME_NOREPLACE) != 0) { + error = EEXIST; + goto unlockout; + } + if (DOINGSUJ(fdvp) && (seqc_in_modify(fdvp_s) || !vn_seqc_consistent(fdvp, fdvp_s) || seqc_in_modify(fvp_s) || !vn_seqc_consistent(fvp, fvp_s) || From nobody Tue Mar 10 11:43:42 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8G5Z0Sz6VWBK for ; Tue, 10 Mar 2026 11:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8G45MJz49bL for ; Tue, 10 Mar 2026 11:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZfsH7hkJeO+kc9gSdNAhdXXe6DLwBjW/xlOR9ev9WjU=; b=IssJWhoKaBZNccAe92T8t1/nKi1LvjqElak//UkbVxShY1fKQwnwMKsbawFVmCvUdSdlNr qefa08Qi1PNpoNj/eo661KmLvlwhnNR5bkwlc/86VZLPV8OV1x9Y8W3yzBFReAVcYkQ11R +IRe4/Dn8tM4ouDLOsCX/cXdqxxEJ6q3o1c5F7zYjx48VngGGg6aTbhk95g+jyV5bzzIhX xmSAKN+08IJynAeiKU0sIWZCQmvzsR+lzU3f1+6wWoFBSfha52Pt0gwMyXTtxhsik/cbJN SrTPBR0WGHZOWHENdJTm7m3bUxJ5IK80ws+VaI6/8B4K4NOxp9cx95N491Nn+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143022; a=rsa-sha256; cv=none; b=pB2cZsPPCkky9N9BedHAryo/8wuC0X5+MZ+VNiC7kTHBaLky2Yi+p/W/uOTARrHjvwErYo ShIGUeDPP84jFYhUjT2PoR0w7VETbS6SFMezXKwnRzwVSQQUXeAEDq1uK/YBbp7ZjFQ+Rp tO+bt27u78uPBonilrj9TGGrYFOaQuXmKk6B+1uXjK1LGTZDqJQaBDNJUDvLYk56XFsNMg DJIuzmnRBJZHRzRp3b111qtCx9dkO6ioAdCA38JnJCZbWRHGjn5Jd5GXq5DqSJADwZ3hDr bPImUiWcY8aXSIsPyzO2d7r+/RZSNA0Oww2FP9tg0noNSptlRQ0hKD3aWhcflg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZfsH7hkJeO+kc9gSdNAhdXXe6DLwBjW/xlOR9ev9WjU=; b=wXCW3ICiOD+PW+hV1k3gxJKRjuNX8UrHsyNQyIqIz2Pma5/go3Qg5YxzWfR6aei/bYUKhQ Sh9zS0x7QktbgtQgiZ/NompbKVvizqVyvNPr5ftOjuIAZgo5D6uO/1kB1kE0UEfAEoKNo1 50tNBDxApzzmT65yIXUDRl5GB1C/TJXw13AObC+lEo4eiD6qSoQgHMrLm5+nshYa9YW/jk LMDsM7Qgg6NCFypcifpveFsyMCev5rVgTUGvOCUDTk1GWjTARvBinL5JtnjmSEILWvhfxU quPeC6SVl/hug3m/6Mj5ShFNZrZLUlplkTymlYZlR9qCKN9V27wEful25Bsjfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8G3bbQz18vD for ; Tue, 10 Mar 2026 11:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d523 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b2ae957e9c8f - stable/15 - linuxolator: translate LINUX_RENAME_NOREPLACE into our AT_RENAME_NOREPLACE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b2ae957e9c8fd6a67a37fe38efed2c034dbe81b0 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:42 +0000 Message-Id: <69b003ee.1d523.11768c3b@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b2ae957e9c8fd6a67a37fe38efed2c034dbe81b0 commit b2ae957e9c8fd6a67a37fe38efed2c034dbe81b0 Author: Konstantin Belousov AuthorDate: 2026-02-26 19:21:08 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:32 +0000 linuxolator: translate LINUX_RENAME_NOREPLACE into our AT_RENAME_NOREPLACE (cherry picked from commit 8feb8d221cfb842ee11d744d22571baec6c18cd8) --- sys/compat/linux/linux_file.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 43ccac0308d3..30e79a53ad2a 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -833,23 +833,34 @@ int linux_renameat2(struct thread *td, struct linux_renameat2_args *args) { int olddfd, newdfd; + u_int atflags; - if (args->flags != 0) { - if (args->flags & ~(LINUX_RENAME_EXCHANGE | - LINUX_RENAME_NOREPLACE | LINUX_RENAME_WHITEOUT)) - return (EINVAL); - if (args->flags & LINUX_RENAME_EXCHANGE && - args->flags & (LINUX_RENAME_NOREPLACE | - LINUX_RENAME_WHITEOUT)) + atflags = 0; + if ((args->flags & ~(LINUX_RENAME_EXCHANGE | + LINUX_RENAME_NOREPLACE | LINUX_RENAME_WHITEOUT)) != 0) + return (EINVAL); + if ((args->flags & LINUX_RENAME_EXCHANGE) != 0 && + (args->flags & (LINUX_RENAME_NOREPLACE | + LINUX_RENAME_WHITEOUT)) != 0) + return (EINVAL); + if ((args->flags & LINUX_RENAME_NOREPLACE) != 0) { + if ((args->flags & (LINUX_RENAME_EXCHANGE | + LINUX_RENAME_WHITEOUT)) != 0) return (EINVAL); -#if 0 + args->flags &= ~LINUX_RENAME_NOREPLACE; + atflags |= AT_RENAME_NOREPLACE; + } + + if (args->flags != 0) { /* * This spams the console on Ubuntu Focal. * - * What's needed here is a general mechanism to let users know - * about missing features without hogging the system. + * What's needed here is a general mechanism to let + * users know about missing features without hogging + * the system. */ - linux_msg(td, "renameat2 unsupported flags 0x%x", +#if 0 + linux_msg(td, "renameat2 unsupported flags %#x", args->flags); #endif return (EINVAL); @@ -858,7 +869,7 @@ linux_renameat2(struct thread *td, struct linux_renameat2_args *args) olddfd = (args->olddfd == LINUX_AT_FDCWD) ? AT_FDCWD : args->olddfd; newdfd = (args->newdfd == LINUX_AT_FDCWD) ? AT_FDCWD : args->newdfd; return (kern_renameat(td, olddfd, args->oldname, newdfd, - args->newname, UIO_USERSPACE, 0)); + args->newname, UIO_USERSPACE, atflags)); } #ifdef LINUX_LEGACY_SYSCALLS From nobody Tue Mar 10 11:43:43 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8J0KR3z6VWHD for ; Tue, 10 Mar 2026 11:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8H51smz49fS for ; Tue, 10 Mar 2026 11:43:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r155N0cqgjK6+gUgWAOfQ3rRcsQnlD7VoUa/kL793/o=; b=lJyw2SqokJImZCm1rfovEdAbF+Il+o43N86f2JgeDiyIX9efSx6OoBPCsUBB/Fmeev6pes LgXps5i79jXIzaP6Cylc/NliAyhxtgHYNCgWlYSj9dixOv+Z8KmeznUH37bcfP/mB9YJQI VuQ3lvQWkyKfBQICeYzdOnHHGoU6R0Z0hXuzYudvDM5du1Uqi+j3RLp+YYbj1TBwLOm2Ri t0nArR4bYeoZ0S9zdB+iHfe5AcKruUjbLu1jI4QZ0blHqlSCTzflif/cI0OnD0IhpoJKwT jleY6aW2FxxeBXeF0PNGO9k943RHWw8ow22mhl/ZCWdz2wFLPdSW0yQ4LVTU0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143023; a=rsa-sha256; cv=none; b=kVReZWDSaL8H0Cx+sLMDU103cwhORst2FkyOviiszCX1pZtmNgk8lZBVDv2QM3PAFxvckP MuZXnJ6M9zzUOaDCebBxqfHzsOB0bUtO38Da9gLmjR7fea8jl16s42Nid+THulwuQ0ggpK 6IfNETWAzFk4mzBqfAnOSwL2w6/kfUuV0xkkwFDV6rmv5PhS3JtpPRx0EvKOjG4n2hmhU/ xXWriRKApPdsNolbth1A7qmdHxpDrWz60ELAINTzPmhxtYCE0lP/Io//K5hFElyWPi7uCX nJK1S/UgIWiJ3B0ifXpQbLAjnuFvhugIjFw57NbLgKGpVxX4a0cmLY184e2GvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r155N0cqgjK6+gUgWAOfQ3rRcsQnlD7VoUa/kL793/o=; b=Rs5GPH801q8c1kopMET/NOvAzFy63T8vqd9Zb37e14UFPbMIDyG8NP2dHZTsrUrjF10Vzq DClJvgw9a2tNHru19vTm12S2YOhhQO4SSu6VSN2jEpomEwvzOdJUiUTbyJ1kUiNNcMgw0w Cut2n9a1D/Y89a746AMY7tRkszBT3RpJMtEMVsL8tIVYXuu3SP9/2wGwDidQegMYhDRpgE wwk4XAsKGXf2PxnB4/zYQY49xdV62sMcmCTmc9gTn1U8E8DiOYkKUcjz0JgzM64mZcZX/M M8wcm4AYgXh7K5s69fHqcPAQAR7fGX6kDVHazn2GIuTatmaMlux0FhkzOX8ExA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8H4RLmz18vF for ; Tue, 10 Mar 2026 11:43:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c6f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1bb58ba12b47 - stable/15 - libsys/rename.2: remove commented-out CAVEAT section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1bb58ba12b47ed58144784b3b68e41cced330642 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:43 +0000 Message-Id: <69b003ef.1c6f7.6a4de7b7@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1bb58ba12b47ed58144784b3b68e41cced330642 commit 1bb58ba12b47ed58144784b3b68e41cced330642 Author: Konstantin Belousov AuthorDate: 2026-02-27 00:03:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:32 +0000 libsys/rename.2: remove commented-out CAVEAT section (cherry picked from commit 5f911eaba017645487a1eaee3609b26a77f0f174) --- lib/libsys/rename.2 | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/lib/libsys/rename.2 b/lib/libsys/rename.2 index 4faba81ff509..1806321245ec 100644 --- a/lib/libsys/rename.2 +++ b/lib/libsys/rename.2 @@ -112,32 +112,6 @@ or .Fa tofd parameter, the current working directory is used in the determination of the file for the respective path parameter. -.\".Sh CAVEAT -.\"The system can deadlock if a loop in the file system graph is present. -.\"This loop takes the form of an entry in directory -.\".Pa a , -.\"say -.\".Pa a/foo , -.\"being a hard link to directory -.\".Pa b , -.\"and an entry in -.\"directory -.\".Pa b , -.\"say -.\".Pa b/bar , -.\"being a hard link -.\"to directory -.\".Pa a . -.\"When such a loop exists and two separate processes attempt to -.\"perform -.\".Ql rename a/foo b/bar -.\"and -.\".Ql rename b/bar a/foo , -.\"respectively, -.\"the system may deadlock attempting to lock -.\"both directories for modification. -.\"Hard links to directories should be -.\"replaced by symbolic links by the system administrator. .Sh RETURN VALUES .Rv -std rename .Sh ERRORS From nobody Tue Mar 10 11:43:44 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8K1YSdz6VWKX for ; Tue, 10 Mar 2026 11:43: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8J5pt0z49SB for ; Tue, 10 Mar 2026 11:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+qWjF/Bs93dyGHSYJXz3TQa0sShNKA4OOU7ahQ7YOq4=; b=EDad+ocO+7Cr+tzgmvpxYJHzXCdqrkRI922lADJ7uUnvaa+mIyvTC7nCwM4tWoZrQIBcEa pIetcQmGOzjvB9BIyHdylRS1c1Z4O1QKx2554Z2SLNP80nE+nShZ2L6yb+q2vtTV5VzBOw h/SimYkGuEiGpFf1R7bUiMBNetGa0irgeD39yCPcSzrlMeA7z0tQCNHjhXyJsBpq3lxYMe r8eTgR9xy8RvZQHGXtzGVZBHIbyzE9oN6QPGYf9ThEZudq4tWGjWEWGdto/Ar8L43TbFmL et3rSY/D36bd/e5eyuMZTNva6NcWYWG3Qr4YmnOn3iK+38NEoAjNKuklHlr0SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143024; a=rsa-sha256; cv=none; b=OPnP4l8O0xOpcnaBPlWZfKWg7HO8VkSCRtaD2BQagI8jevQ8F90QBTOyn4D7PXkXxobZdI LrVf//hcQlSX/PMUv4ZeHwEe1LWk5qC7YTvXgxuMu7RsIqn1ZUJmreHR6ZIRaSfpj0ZLtP K+nu5Nq68A9uzBE8b6DWtzdDGMgdW5+ySBW1vDUMBOiqKq7/eumTjyZDWzGpBtq+nox0Zn qK/ZmM7yHIcb9niW2E5m73+r/VrxqwN+c6tEmj9aOIGNKDqfKbRbTQEHVIti0+g7/z2iLG ZPtO4uxJ5ijtAudOeanUbfbSouGodtFccuMFl8BRx4PcOX0fJgRdz7uILVgpCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+qWjF/Bs93dyGHSYJXz3TQa0sShNKA4OOU7ahQ7YOq4=; b=n41OMbrCMT7z9092LbaQQ5OK4CUn8yrv7tOwwylGqCdgvjhlq6kUS7Ty+FvBEzUfUXbrI4 xxyzJT/8FYlj7KNDjIlhnLkwZlwwvnO3olsz0XKhJ81vWd/4ANkI3G3lSRk8QR6FWcJQrE 2cpf/mJ2LwKMFN6SBlhxgC5DPePMAlM5zJ8ApY+BLxfBMutCFimHPHlX/eQHaPKwnbuqhu /71t7VDL9aDKq+sUD4xDeT/vPCl9Kd2h1QHfLwb8siJuEOMC3WiTPaxXRSvQrWVlTH9UfP Ps4sp18b2P0pp2T24McvpW9Q5WAY4a5fD7yKBqcYtoSyIutYKPRVSSAdBqlAkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8J5N6Sz19c8 for ; Tue, 10 Mar 2026 11:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cf18 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3ccc39d38ed8 - stable/15 - renameat2(2): document List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3ccc39d38ed8c805383f261d67fe18a6b7eb29e6 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:44 +0000 Message-Id: <69b003f0.1cf18.3af4cd8d@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3ccc39d38ed8c805383f261d67fe18a6b7eb29e6 commit 3ccc39d38ed8c805383f261d67fe18a6b7eb29e6 Author: Konstantin Belousov AuthorDate: 2026-02-27 00:10:36 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:32 +0000 renameat2(2): document (cherry picked from commit 619e49b2ba58e1ffd2ab111fef6d1e87d77e7391) --- lib/libsys/Makefile.sys | 3 ++- lib/libsys/rename.2 | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index 4ad1ad4db7e9..fc948ae9c5c7 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -510,7 +510,8 @@ MLINKS+=readlink.2 readlinkat.2 MLINKS+=recv.2 recvfrom.2 \ recv.2 recvmmsg.2 \ recv.2 recvmsg.2 -MLINKS+=rename.2 renameat.2 +MLINKS+=rename.2 renameat.2 \ + rename.2 renameat2.2 MLINKS+=rtprio.2 rtprio_thread.2 MLINKS+=sched_get_priority_max.2 sched_get_priority_min.2 \ sched_get_priority_max.2 sched_rr_get_interval.2 diff --git a/lib/libsys/rename.2 b/lib/libsys/rename.2 index 1806321245ec..dbad50edb9a9 100644 --- a/lib/libsys/rename.2 +++ b/lib/libsys/rename.2 @@ -39,6 +39,16 @@ .Fn rename "const char *from" "const char *to" .Ft int .Fn renameat "int fromfd" "const char *from" "int tofd" "const char *to" +.In sys/fcntl.h +.In stdio.h +.Ft int +.Fo renameat2 +.Fa "int fromfd" +.Fa "const char *from" +.Fa "int tofd" +.Fa "const char *to" +.Fa "unsigned int flags" +.Fc .Sh DESCRIPTION The .Fn rename @@ -112,6 +122,28 @@ or .Fa tofd parameter, the current working directory is used in the determination of the file for the respective path parameter. +.Pp +The +.Fn renameat2 +system call takes an additional +.Fa flags +argument. +If +.Fa flags +is zero, the +.Fn renameat2 +call operates identically to +.Fn renameat . +Additionally, the following flags can be specified: +.Bl -tag -width AT_RENAME_NOREPLACE +.It Dv AT_RENAME_NOREPLACE +If the path specified by +.Fa tofd +and +.Fa to +exists, the request fails with the error +.Er EEXIST . +.El .Sh RETURN VALUES .Rv -std rename .Sh ERRORS @@ -298,6 +330,35 @@ file descriptor lacks the .Dv CAP_RENAMEAT_TARGET right. .El +.Pp +In addition to the errors returned by the +.Fn renameat +system call, the +.Fn renameat2 +system call may fail if: +.Bl -tag -width Er +.It Bq Er EEXIST +The +.Dv AT_RENAME_NOREPLACE +flag was provided, and a file exists at the path specified by +.Fa to . +.It Bq Er EOPNOTSUPP +One of the +.Fa flags +specified is not supported by the filesystem where the to-be +renamed file is located. +.El +.Sh CAVEATS +If the filesystem which owns the file to be renamed does not +implement the +.Dv AT_RENAME_NOREPLACE +flag, it is possible that due to race with target file creation, +the error returned by the +.Fn renameat2 +system call would be non-deterministically either +.Er EEXIST +or +.Er EOPNOTSUPP . .Sh SEE ALSO .Xr chflags 2 , .Xr open 2 , @@ -315,3 +376,7 @@ The .Fn renameat system call appeared in .Fx 8.0 . +The +.Fn renameat2 +system call appeared in +.Fx 16.0 . From nobody Tue Mar 10 11:43:45 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8L3qhtz6VW8W for ; Tue, 10 Mar 2026 11:43:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8K75hkz49rn for ; Tue, 10 Mar 2026 11:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n8Jb0Ppnab5VzWK8UR7PuY7Bm554rJlKLlQU2v701tA=; b=mT4oIQFI98gI1m2p3PJxj4LGPvYju4AAmdjRjBC5x3pk3FUkcRHn0GAIhPX+uL3IcGIgel G4ZLWwy79p1ApxU8Zx0h0FF7X5n1/umomAXaWb42E3/1IGOuiFiy+Rkyyce0+E4c0Axpc6 XEIY2r41/WJXTTDBm49PwUvQruEEa603F9pGvWF6+IGlrh5QBcKulynrFio/5vyLvvHog8 CvfDG8LNejY+olLV3E3R9yEBTNzVjJIhVWDB/AC00onfLLGNSRid5pj5VZ/k1KyXpbk94P fYl4RtAozIKQfub/6cdXSP4AtBKK0ant7Fa3k9F11HOBfGlp5tsXkEardwKVUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143026; a=rsa-sha256; cv=none; b=No1xPWOza5gbbvU8H0CTuZYDnWwtGxgxJh7DhlDr9uzBVulaV0e84e4XggPkUcIMBaXY6t my+uCKGFzNfhEJS21Ct2ovQpfkm7SqAx1Efd8Gcf7ZgJzANBB2iq81Co1WcjC8T2m90vAq 9AkABsWMl4JoYVPkBygVX2z16g8p5KFlBy/YfhdC40nR/AeNrwIs8c6b/dtDT/FBsiTOiQ z0pz1fthZ+/yQJ7otYEQnzjx6JcFMk4gFErTNqUU2vL//yGTf+ObTM4mimEO9GlJf8ewR1 YXSrIZzuF7/xf0N0RaUC4RYIgIBlt3NcRO3jEUnB1gORiJRzD3iiHmdcSs5DtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n8Jb0Ppnab5VzWK8UR7PuY7Bm554rJlKLlQU2v701tA=; b=KIvVK5KyDM/J8KUIHS59fqGAyCeDA+xf2KfqvDgPCvLau6XJvSRuaJe8WjbKRBSvKtlxgH +1NKKrQn8xQKLXp3vaGiJfsxXHj+r2N2OtCuBTkjjf5QjNcTCc2zUGG2s8F2lB6/KXxLaq CQkiXhboGU8SnkSHAuNMQDuyYzAvTR5CJVc/XanxR/0JEZ5HkNK2c7ByjedFijmLewSFmX MQgpy/flU4vc6f7w5OrXBKByk2yyHXKCt9FkjE8rQRiAFN4XLM84uwlWUBkl/ku9YEAtlO 8KItl3NEvHSdQCV334RIVILb34+QTgMdq4xkhdW8yRJvrHhHWg9Mqz0/vzGHYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8K6QrVz19c9 for ; Tue, 10 Mar 2026 11:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d7dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b5e307d41e2e - stable/15 - Regen List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b5e307d41e2e347989033aa6ed39feb91624987d Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:45 +0000 Message-Id: <69b003f1.1d7dc.4a1c29d8@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b5e307d41e2e347989033aa6ed39feb91624987d commit b5e307d41e2e347989033aa6ed39feb91624987d Author: Konstantin Belousov AuthorDate: 2026-02-26 18:47:52 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:32 +0000 Regen --- lib/libsys/_libsys.h | 2 ++ lib/libsys/syscalls.map | 2 ++ sys/compat/freebsd32/freebsd32_syscall.h | 3 +- sys/compat/freebsd32/freebsd32_syscalls.c | 1 + sys/compat/freebsd32/freebsd32_sysent.c | 1 + sys/compat/freebsd32/freebsd32_systrace_args.c | 38 ++++++++++++++++++++++++++ sys/kern/init_sysent.c | 1 + sys/kern/syscalls.c | 1 + sys/kern/systrace_args.c | 38 ++++++++++++++++++++++++++ sys/sys/syscall.h | 3 +- sys/sys/syscall.mk | 3 +- sys/sys/sysproto.h | 9 ++++++ 12 files changed, 99 insertions(+), 3 deletions(-) diff --git a/lib/libsys/_libsys.h b/lib/libsys/_libsys.h index 46a2687216b0..0c61bcd2dd23 100644 --- a/lib/libsys/_libsys.h +++ b/lib/libsys/_libsys.h @@ -472,6 +472,7 @@ typedef int (__sys_jail_attach_jd_t)(int); typedef int (__sys_jail_remove_jd_t)(int); typedef int (__sys_pdrfork_t)(int *, int, int); typedef int (__sys_pdwait_t)(int, int *, int, struct __wrusage *, struct __siginfo *); +typedef int (__sys_renameat2_t)(int, const char *, int, const char *, int); _Noreturn void __sys__exit(int rval); int __sys_fork(void); @@ -880,6 +881,7 @@ int __sys_jail_attach_jd(int fd); int __sys_jail_remove_jd(int fd); int __sys_pdrfork(int * fdp, int pdflags, int rfflags); int __sys_pdwait(int fd, int * status, int options, struct __wrusage * wrusage, struct __siginfo * info); +int __sys_renameat2(int oldfd, const char * old, int newfd, const char * new, int flags); __END_DECLS #endif /* __LIBSYS_H_ */ diff --git a/lib/libsys/syscalls.map b/lib/libsys/syscalls.map index 18d65b64ab8d..795844d6e748 100644 --- a/lib/libsys/syscalls.map +++ b/lib/libsys/syscalls.map @@ -821,4 +821,6 @@ FBSDprivate_1.0 { __sys_pdrfork; _pdwait; __sys_pdwait; + _renameat2; + __sys_renameat2; }; diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h index 67ff022922a8..9fed7ec58669 100644 --- a/sys/compat/freebsd32/freebsd32_syscall.h +++ b/sys/compat/freebsd32/freebsd32_syscall.h @@ -519,4 +519,5 @@ #define FREEBSD32_SYS_jail_remove_jd 598 #define FREEBSD32_SYS_pdrfork 600 #define FREEBSD32_SYS_freebsd32_pdwait 601 -#define FREEBSD32_SYS_MAXSYSCALL 602 +#define FREEBSD32_SYS_renameat2 602 +#define FREEBSD32_SYS_MAXSYSCALL 603 diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c index 54b826098a9d..d91d45130c89 100644 --- a/sys/compat/freebsd32/freebsd32_syscalls.c +++ b/sys/compat/freebsd32/freebsd32_syscalls.c @@ -607,4 +607,5 @@ const char *freebsd32_syscallnames[] = { "#599", /* 599 = kexec_load */ "pdrfork", /* 600 = pdrfork */ "freebsd32_pdwait", /* 601 = freebsd32_pdwait */ + "renameat2", /* 602 = renameat2 */ }; diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c index 1b0e5a4a5b86..ce2ce8a0eb4f 100644 --- a/sys/compat/freebsd32/freebsd32_sysent.c +++ b/sys/compat/freebsd32/freebsd32_sysent.c @@ -669,4 +669,5 @@ struct sysent freebsd32_sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 599 = kexec_load */ { .sy_narg = AS(pdrfork_args), .sy_call = (sy_call_t *)sys_pdrfork, .sy_auevent = AUE_PDRFORK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 600 = pdrfork */ { .sy_narg = AS(freebsd32_pdwait_args), .sy_call = (sy_call_t *)freebsd32_pdwait, .sy_auevent = AUE_PDWAIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 601 = freebsd32_pdwait */ + { .sy_narg = AS(renameat2_args), .sy_call = (sy_call_t *)sys_renameat2, .sy_auevent = AUE_RENAMEAT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 602 = renameat2 */ }; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 59a74d365e1c..e85cf4765c98 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -3447,6 +3447,17 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 5; break; } + /* renameat2 */ + case 602: { + struct renameat2_args *p = params; + iarg[a++] = p->oldfd; /* int */ + uarg[a++] = (intptr_t)p->old; /* const char * */ + iarg[a++] = p->newfd; /* int */ + uarg[a++] = (intptr_t)p->new; /* const char * */ + iarg[a++] = p->flags; /* int */ + *n_args = 5; + break; + } default: *n_args = 0; break; @@ -9314,6 +9325,28 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* renameat2 */ + case 602: + switch (ndx) { + case 0: + p = "int"; + break; + case 1: + p = "userland const char *"; + break; + case 2: + p = "int"; + break; + case 3: + p = "userland const char *"; + break; + case 4: + p = "int"; + break; + default: + break; + }; + break; default: break; }; @@ -11242,6 +11275,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* renameat2 */ + case 602: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index fcfee33c3fec..6345293dfb7f 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -668,4 +668,5 @@ struct sysent sysent[] = { { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 599 = kexec_load */ { .sy_narg = AS(pdrfork_args), .sy_call = (sy_call_t *)sys_pdrfork, .sy_auevent = AUE_PDRFORK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 600 = pdrfork */ { .sy_narg = AS(pdwait_args), .sy_call = (sy_call_t *)sys_pdwait, .sy_auevent = AUE_PDWAIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 601 = pdwait */ + { .sy_narg = AS(renameat2_args), .sy_call = (sy_call_t *)sys_renameat2, .sy_auevent = AUE_RENAMEAT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 602 = renameat2 */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 82adf3f79970..1594b03016da 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -607,4 +607,5 @@ const char *syscallnames[] = { "#599", /* 599 = kexec_load */ "pdrfork", /* 600 = pdrfork */ "pdwait", /* 601 = pdwait */ + "renameat2", /* 602 = renameat2 */ }; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 973c2ed8e97a..dc6f55de9fa4 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -3534,6 +3534,17 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 5; break; } + /* renameat2 */ + case 602: { + struct renameat2_args *p = params; + iarg[a++] = p->oldfd; /* int */ + uarg[a++] = (intptr_t)p->old; /* const char * */ + iarg[a++] = p->newfd; /* int */ + uarg[a++] = (intptr_t)p->new; /* const char * */ + iarg[a++] = p->flags; /* int */ + *n_args = 5; + break; + } default: *n_args = 0; break; @@ -9459,6 +9470,28 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; + /* renameat2 */ + case 602: + switch (ndx) { + case 0: + p = "int"; + break; + case 1: + p = "userland const char *"; + break; + case 2: + p = "int"; + break; + case 3: + p = "userland const char *"; + break; + case 4: + p = "int"; + break; + default: + break; + }; + break; default: break; }; @@ -11477,6 +11510,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; + /* renameat2 */ + case 602: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index a754c1b5b534..e1d3e7daa7d2 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -539,4 +539,5 @@ #define SYS_jail_remove_jd 598 #define SYS_pdrfork 600 #define SYS_pdwait 601 -#define SYS_MAXSYSCALL 602 +#define SYS_renameat2 602 +#define SYS_MAXSYSCALL 603 diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk index 71b59ec44fd8..8b0f61233cee 100644 --- a/sys/sys/syscall.mk +++ b/sys/sys/syscall.mk @@ -442,4 +442,5 @@ MIASM = \ jail_attach_jd.o \ jail_remove_jd.o \ pdrfork.o \ - pdwait.o + pdwait.o \ + renameat2.o diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index abd8145ff01a..b458b9426db7 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -1919,6 +1919,13 @@ struct pdwait_args { char wrusage_l_[PADL_(struct __wrusage *)]; struct __wrusage * wrusage; char wrusage_r_[PADR_(struct __wrusage *)]; char info_l_[PADL_(struct __siginfo *)]; struct __siginfo * info; char info_r_[PADR_(struct __siginfo *)]; }; +struct renameat2_args { + char oldfd_l_[PADL_(int)]; int oldfd; char oldfd_r_[PADR_(int)]; + char old_l_[PADL_(const char *)]; const char * old; char old_r_[PADR_(const char *)]; + char newfd_l_[PADL_(int)]; int newfd; char newfd_r_[PADR_(int)]; + char new_l_[PADL_(const char *)]; const char * new; char new_r_[PADR_(const char *)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; +}; int sys__exit(struct thread *, struct _exit_args *); int sys_fork(struct thread *, struct fork_args *); int sys_read(struct thread *, struct read_args *); @@ -2327,6 +2334,7 @@ int sys_jail_attach_jd(struct thread *, struct jail_attach_jd_args *); int sys_jail_remove_jd(struct thread *, struct jail_remove_jd_args *); int sys_pdrfork(struct thread *, struct pdrfork_args *); int sys_pdwait(struct thread *, struct pdwait_args *); +int sys_renameat2(struct thread *, struct renameat2_args *); #ifdef COMPAT_43 @@ -3327,6 +3335,7 @@ int freebsd14_setgroups(struct thread *, struct freebsd14_setgroups_args *); #define SYS_AUE_jail_remove_jd AUE_JAIL_REMOVE #define SYS_AUE_pdrfork AUE_PDRFORK #define SYS_AUE_pdwait AUE_PDWAIT +#define SYS_AUE_renameat2 AUE_RENAMEAT #undef PAD_ #undef PADL_ From nobody Tue Mar 10 14:59:27 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVcVD3Phvz6Vmtm for ; Tue, 10 Mar 2026 14:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVcVD13hdz3WV0 for ; Tue, 10 Mar 2026 14:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773154772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CkIcIkIjmZS721MdYi9HwQ4wE/ZPllLqWGPLpw8sxWk=; b=po8hrvwHz/D6g6W409cgPbwz6HFL5cI2+WfESR5X6Vf5uQQjjkvrXcOx6RUW1OmuEipHdt Toh4jo+yrtQcm5D43+t5bW1c3os7ll5G3Bp+AzmTDzhSFVEiPpEHgyc5rsy//Vq8afxc+I XDn443TzSaxi5+b4nRzrFjRyP3hoO7AFMNnz2gN2seFlUzhvlxPoiS4iHEUP5HNUDCLOhG KwAE4KOUFoLSXhAVzvjn2lKvCBLT7+9wKGiZaiD32N/QtnKxu5WIe3ycEEzDnEZjLwyqg+ oCZTDBphliekDKUl+cbKBuF7kv9+syxXxUSBep9qb6pynbUXVWCCmOiIVXJK9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773154772; a=rsa-sha256; cv=none; b=DpngYkTrsjnMHuJOfZA63FdBPbkYR8kAMIxiin2GhLW7DocTZvdWcabFdI0Cxo8ajXvrcu DoloK6KsJolcbJEgq+/yIFG/UpGThkUJrzttOHFptUihcKbb9wsF/7NBpLkJ/AC7zeITMF icwjBKNkcl9oWhqUjvUVxvPas80ErW0eDFE8hhUGgC/Li5mqP/QkNNeXwomM/AJSa1+HMr soSS9r/ueew3FojSSGZAyl/ycKtQ6cisAVeDM8nIprhRz+3ELJ/tyF45Z4WrtJeArOx60m Ak7/DhKoPqCp05lLNpYmdo02a5ULltAiK9fH/5aOHGqI4ir6WpIIhi8PfnAmQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773154772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CkIcIkIjmZS721MdYi9HwQ4wE/ZPllLqWGPLpw8sxWk=; b=cK05th2spRhji0PRmWlBMuvvBeZ3DWnGoDl9ejA0lqnH2SX/RAK6t/aKQaheTk6635dzy0 BMR723ZoJv6myAddI+3Bqe33G+P1XNv3pUPBY0rrUxFHAneHEBt3s3t3roFUKpGoFPzv30 FbwFRgpvQGcaPmArLO7LKG87Mj5y+HSvmYfvzWBiUObn7aQRWKGWQimYyKEb4+PksPCYiy 48GAVfcfq8bEvIDJP+JjLTvVIxzCgHI58qOyg0j+Pp0cefKPeUx8+gzUwRskI/F0oB6BCE ouBDoi29Z8VxV55/D1ea0NP6WXm+MPsM8J/zZhFlaXeSw2rEM5rP0bkmamh7DQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVcVD0N2Jz1x1 for ; Tue, 10 Mar 2026 14:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a2a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 14:59:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Nathaniel Braun From: Ed Maste Subject: git: 1fd1b699bda2 - stable/14 - vt: Fix handling of backtab List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1fd1b699bda2ec32be3e0c7afa894c615113afc2 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 14:59:27 +0000 Message-Id: <69b031cf.3a2a6.19a9fc4f@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1fd1b699bda2ec32be3e0c7afa894c615113afc2 commit 1fd1b699bda2ec32be3e0c7afa894c615113afc2 Author: Nathaniel Braun AuthorDate: 2026-01-17 17:14:42 +0000 Commit: Ed Maste CommitDate: 2026-03-09 13:25:55 +0000 vt: Fix handling of backtab PR: 292463 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/2002 (cherry picked from commit 5fec99caff3ac4f476bb88078ebf85fbecf6afb3) (cherry picked from commit 3ca02a70f7f94f7479ffcd3ed7ca6d83ec58af10) --- sys/dev/vt/vt_core.c | 6 ++++++ sys/teken/teken.c | 4 ++++ sys/teken/teken.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index 5cf45a7c61b2..9ca2a547b067 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -948,6 +948,9 @@ vt_processkey(keyboard_t *kbd, struct vt_device *vd, int c) VT_UNLOCK(vd); break; } + case BKEY | BTAB: /* Back tab (usually, shift+tab). */ + terminal_input_special(vw->vw_terminal, TKEY_BTAB); + break; case FKEY | F(1): case FKEY | F(2): case FKEY | F(3): case FKEY | F(4): case FKEY | F(5): case FKEY | F(6): case FKEY | F(7): case FKEY | F(8): case FKEY | F(9): @@ -1967,6 +1970,9 @@ vtterm_cngetc(struct terminal *tm) VTBUF_SLCK_DISABLE(&vw->vw_buf); } break; + case SPCLKEY | BTAB: /* Back tab (usually, shift+tab). */ + vw->vw_kbdsq = "\x1b[Z"; + break; /* XXX: KDB can handle history. */ case SPCLKEY | FKEY | F(50): /* Arrow up. */ vw->vw_kbdsq = "\x1b[A"; diff --git a/sys/teken/teken.c b/sys/teken/teken.c index b0161a2e3b20..a1522e00ecf7 100644 --- a/sys/teken/teken.c +++ b/sys/teken/teken.c @@ -703,6 +703,8 @@ static const char * const special_strings_cons25[] = { [TKEY_F7] = "\x1B[S", [TKEY_F8] = "\x1B[T", [TKEY_F9] = "\x1B[U", [TKEY_F10] = "\x1B[V", [TKEY_F11] = "\x1B[W", [TKEY_F12] = "\x1B[X", + + [TKEY_BTAB] = "\x1B[Z", }; static const char * const special_strings_ckeys[] = { @@ -726,6 +728,8 @@ static const char * const special_strings_normal[] = { [TKEY_F7] = "\x1B[18~", [TKEY_F8] = "\x1B[19~", [TKEY_F9] = "\x1B[20~", [TKEY_F10] = "\x1B[21~", [TKEY_F11] = "\x1B[23~", [TKEY_F12] = "\x1B[24~", + + [TKEY_BTAB] = "\x1B[Z", }; const char * diff --git a/sys/teken/teken.h b/sys/teken/teken.h index 38a85e80110e..c8c73db55f06 100644 --- a/sys/teken/teken.h +++ b/sys/teken/teken.h @@ -206,6 +206,8 @@ void teken_set_winsize_noreset(teken_t *, const teken_pos_t *); #define TKEY_F10 0x13 #define TKEY_F11 0x14 #define TKEY_F12 0x15 + +#define TKEY_BTAB 0x16 const char *teken_get_sequence(const teken_t *, unsigned int); /* Legacy features. */ From nobody Wed Mar 11 07:21:23 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fW2H72Wv3z6Vvqr for ; Wed, 11 Mar 2026 07: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fW2H71s25z3W5f for ; Wed, 11 Mar 2026 07:21:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773213683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eh/0YyDRrc2p+Cg/+YqBUxOlh6YHvz1RY9eEYlDpt5g=; b=TI21se5HqUuyHDlWssrYAluH9IUd5zF8pM12wTXPsdpQtfex9RTRauNC7hbxDDkNWBnacZ /GMjdng49Dv06R//8opK4vib/U/if+vl5ykcF3uZVyziDETybW+kXD9/6jZKWyKp7ch7fD Y+FTDl2okzs+md1S69uEY2DZ/HuOt8GpZunzEYlH2gyAoGH5rrOi2Q0M7B/dTTSVdm1+NM FoVNdOChifB4ApX5G5LqtqcUNnsgpLqtwIIRMViVAlRsEI0AGpNNXp/lPeiJVliDiL9Nho buF75tjoy7FjQ8DTrgyiC9KdVntcqQHoIaXy4ZpkMk8WfiuguV3AMYrrx6PkQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773213683; a=rsa-sha256; cv=none; b=LsorgvJcUgfgMjky1R1OhRHH6GPAWUWPfS+O7hFKKVUqS8WV82/0TtHpZAZ1K1AfcRbLOS BC/IMmOsYmjwqosvlZuh6/FdSnp0DPR9LzGpDZRB4Y3eTSDbmwUu5o56i2LY8QkivPsQFX fVojvbDw+RFVxwAZ9MkoQLRMK/2//GV5ggsbP4GOHbfh7ZYR1WWtQHS4Q89u9mYPd5NhG1 g47c0Z8t9M3W2gEQCnya/E3KhbzNqxb2/goTdwlJasIaNHgcm3qJSCaEV1qDyJq9iKzw+/ 6NAJZU5xYdd5ZaLcXTkC30BzdXFLZDX/AhCWKpDShRwUmwMcceLxZFMVQxK7hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773213683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eh/0YyDRrc2p+Cg/+YqBUxOlh6YHvz1RY9eEYlDpt5g=; b=sx6KzVNNlq2x+FA50dNnWqfmNOICwMvM98J+3K3ixpW6U94jPUn4Frg1AHeIlCkazoe8xM ymvwInvBiU//VdWXENvHoW9Ea98b44v/VTQNaiy9ZdJvSf6tFp1hrkZIBjb04ea4lO7LAH t8HBs1kOTGQt0tF0qI2o1L1XXmUyxgfrhwkTy+Dwa6PGb8fWd7yPw7U1sXLl8YKrq7tdSZ ShwiIknIGqYKwUsN6Emt70bnsZreD4UH7RzEcVSTbyLHJkTIcU6ZTbkLYi0OF24L9olOf7 B7j/76zMlD2Ef54X+TkBKUNE/V1/KqkDu3wr5/yAmHr2V/ME/vv/ySFeC2wWRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fW2H71SyyzpLL for ; Wed, 11 Mar 2026 07:21:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30e11 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 07:21:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 077da2a9e37c - stable/15 - me.4: MFC: link if_me kernel module to its manual page. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 077da2a9e37c7734e7c527c7d184b3ad8c61f31f Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 07:21:23 +0000 Message-Id: <69b117f3.30e11.159f6926@gitrepo.freebsd.org> The branch stable/15 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=077da2a9e37c7734e7c527c7d184b3ad8c61f31f commit 077da2a9e37c7734e7c527c7d184b3ad8c61f31f Author: Eugene Grosbein AuthorDate: 2026-03-04 07:29:26 +0000 Commit: Eugene Grosbein CommitDate: 2026-03-11 07:19:59 +0000 me.4: MFC: link if_me kernel module to its manual page. (cherry picked from commit 46ba263d6eeb1c6029841b4c42f54912ad61de5c) --- share/man/man4/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 2b3bf620fe48..47e624f9c014 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -758,6 +758,7 @@ MLINKS+=lge.4 if_lge.4 MLINKS+=lo.4 loop.4 MLINKS+=lp.4 plip.4 MLINKS+=malo.4 if_malo.4 +MLINKS+=me.4 if_me.4 MLINKS+=mem.4 kmem.4 MLINKS+=mfi.4 mfi_linux.4 \ mfi.4 mfip.4 From nobody Wed Mar 11 07:22:05 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fW2Hy1912z6Vvfl for ; Wed, 11 Mar 2026 07:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fW2Hy0F6Dz3WT8 for ; Wed, 11 Mar 2026 07:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773213726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gR6wWriBtiS1/oXLWqXdySeCxwnb27WaomdbN1Vcg+g=; b=cO0tKGhqkiWHeiFDtpJiIGR3OJYBVufRJZboFOImvcEDsItmCVdXbj/geD0klX0suZRTs3 9PvMIexXliAvaseZsQt/DQ26icEGJ7I6SL9924Hl115xoO/rV2P2MgVKGyeD4jlry371Tj YNgY4POmyLqpLVyu/kKFLVzZHuEM/96KXAsLEK3HIscBROI1Z1GlE7fnfytOsUtayzOq9U pD6Y7OkL3+4f2LH+Z6NfWVGczvD3GFWNFNhU8U9H1BpNCN/LrTW6yrcnhg/m9JfhfAOety 6lUP5SfB1k4ZFd6RX5wvkJn3w1mZrSNhzzRF/s59JMYrY7Rgv1IBjA6hE18SrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773213726; a=rsa-sha256; cv=none; b=wFC1gj2KxzQtdPIkvPbiZ4K1ykeg4c8osZfUDlkKSsohP4oy72LUWhQMf58Ta4AxJKQWIq b6Ny9eATDcT8gHrom4hLJNzXDOOvy6ErEgXBugbM74wKIKNfEbuE+RLlAFYRopNLDq+0Qr D+yoI8xto5JVtDNXlwWumdwxkUz5xaWxSNl2IF6+INfXiYvvl9UtJinN5dGrzD94bwcwFj rWw3+YJDBfjvidoXiEklPcpHy/VF/5r91CDD7qxvMWnwvzX0GHY4JozKOI8SKpXujSueeH aeaL4ZAfleocFfYp9hNkKgIX8GM2A7Xf3XaMf5GP0Jzzj929WB1LcIW85aPgHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773213726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gR6wWriBtiS1/oXLWqXdySeCxwnb27WaomdbN1Vcg+g=; b=iWWgxODURotLk0BU8+nOE0EUeyRkqrdswpr5vyXhxSXohWgYSaDEwLTAE5Ao8/fG96PQLq HdLkgYdgRo1WFpoZ8fY75tw13qUujGqY5YEwlumyXmDvEbXYlH6+irnFjV+k43bAtP1rAM N4x7iXokVSFutu3JyT3IXDx8Nof7B0OIRnOeFqhaX7dlLuX7V5pXvIFdBfqiBY7BUu4Nu/ yJwBmLI18d005X1xauijTSiHmKeTe5op18efWVfZvYMb4lqRPKDPfCftJQbSaHWunSIR4O y4MIryPk9y0wd66/y8jktczCflDs/S5Tlz3USFCtWWUJ1vr9u0YzLlQ5MdwA0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fW2Hx6rsKzpvt for ; Wed, 11 Mar 2026 07:22:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27df5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 07:22:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 51ffffe9be91 - stable/14 - me.4: MFC: link if_me kernel module to its manual page. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 51ffffe9be917a001dd61be91464aa4aad8f7d84 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 07:22:05 +0000 Message-Id: <69b1181d.27df5.6bbca99f@gitrepo.freebsd.org> The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=51ffffe9be917a001dd61be91464aa4aad8f7d84 commit 51ffffe9be917a001dd61be91464aa4aad8f7d84 Author: Eugene Grosbein AuthorDate: 2026-03-04 07:29:26 +0000 Commit: Eugene Grosbein CommitDate: 2026-03-11 07:21:45 +0000 me.4: MFC: link if_me kernel module to its manual page. (cherry picked from commit 46ba263d6eeb1c6029841b4c42f54912ad61de5c) --- share/man/man4/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 2db6e350a401..eba7fe341c8a 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -722,6 +722,7 @@ MLINKS+=lge.4 if_lge.4 MLINKS+=lo.4 loop.4 MLINKS+=lp.4 plip.4 MLINKS+=malo.4 if_malo.4 +MLINKS+=me.4 if_me.4 MLINKS+=mem.4 kmem.4 MLINKS+=mfi.4 mfi_linux.4 \ mfi.4 mfip.4 From nobody Wed Mar 11 07:23:39 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fW2Kl5VL2z6Vvfx for ; Wed, 11 Mar 2026 07:23: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fW2Kl50w6z3WkL for ; Wed, 11 Mar 2026 07:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773213819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EMtGR0uKLDdU+v4WEOUGWIvXBpVdbJXJ3T51EcpbXdA=; b=GIyRfL+UiDa2+rjVVfJoJEOG/NekWFfveGO8/potj9CAEj9gXX6c/ARLGRyWShDzdaeXAb jczGOeeKxmjlqbde0yt6BS+vm1m0QoPRcbNx2Y9FtxoyXDCpXXbPgonDhJxjmoRNXJ+47z CEOUxaXCfG91Sxt4TKx1Uo61oumU2ODuONPjnRmDoT1jp6X41t7cRDpCeiylVGXHziH6xq MlKY1l4FQW99a6VGaLbwdJlONgMa3IjTiYddq8dWWCTzLnpvC02h389QaVbN+/LHbrcdL0 gzKQpiOXqMMXkxkdbvW1s9lx/rpOuZnISYCpJledG8qem/iyunpkDz3M5E/hZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773213819; a=rsa-sha256; cv=none; b=lCJ+sbfcCNXsFgq44t2ZBQxGFL/ctAsMEmPnuYrcTugB4MKbOs8lb71ZLaEtH2Y8FzIuQA 5A6DL+XNNEC5fmMdOpzifCUGc97vog+3CDsdf9xmzp4zrrte4PgayiRJT+4D7m/bdHyrRw DQJ8jcPpnM6hwu0+TkXQQWrOGB52kyoncCmt6NEIBl1uA6EudBFCkZQntWMNVvsXFtvs8X zjVxdJt0AGEyApDEya+nBFFGyB2cw4n4zVD5NxYtvpHHiZrNwzj0AGtDilOxgEpt7GLTXd kikgpeUz4HDoyIOjSaxyjgDWAuJypwgpfDsqWm9da3gzPzLK2KtL2Uk4NL1ogA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773213819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EMtGR0uKLDdU+v4WEOUGWIvXBpVdbJXJ3T51EcpbXdA=; b=T2cTOrieVk2loUPxihz15tI2LIan/Xt4sug/9W9Q5UGhPa0pE2Qg2tTRP2uwJ3Tk/5Byph QBeV+YcxuRyVMZ1+uqL1ecRL580JwakLnW3n7Q69o5tPmF1FMxKQKsvcbxUDGiPUA2s6AW nYejacFbV7Mw/cqHEJaqs1zEtxAjhfeiB9Asts+TnLRm8xEIvjhEoqeN1987vyD8xyLjJG Prwiz4Sl2+roNcCXoKQE/nZuedbMOtdF9wlD+Zxsa2n/i6CkeJ6NojocmbRY20khppbSbC a7JdvXGVJjfNhDZpjk8FXT/I5E0TxG08mvBoUa6gzjQencsbZBBttEisQyEZrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fW2Kl4T7LzpLV for ; Wed, 11 Mar 2026 07:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 311ea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 07:23:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 242346cb89f8 - stable/13 - me.4: MFC: link if_me kernel module to its manual page. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 242346cb89f8d4ca97d933fc215bf2cf25f2ed0b Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 07:23:39 +0000 Message-Id: <69b1187b.311ea.7b49608@gitrepo.freebsd.org> The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=242346cb89f8d4ca97d933fc215bf2cf25f2ed0b commit 242346cb89f8d4ca97d933fc215bf2cf25f2ed0b Author: Eugene Grosbein AuthorDate: 2026-03-04 07:29:26 +0000 Commit: Eugene Grosbein CommitDate: 2026-03-11 07:23:00 +0000 me.4: MFC: link if_me kernel module to its manual page. (cherry picked from commit 46ba263d6eeb1c6029841b4c42f54912ad61de5c) --- share/man/man4/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 5ea51eb02eb0..55acde8c7f30 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -733,6 +733,7 @@ MLINKS+=lo.4 loop.4 MLINKS+=lp.4 plip.4 MLINKS+=malo.4 if_malo.4 MLINKS+=md.4 vn.4 +MLINKS+=me.4 if_me.4 MLINKS+=mem.4 kmem.4 MLINKS+=mfi.4 mfi_linux.4 \ mfi.4 mfip.4 From nobody Wed Mar 11 13:16:38 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWB926bvrz6V9GL for ; Wed, 11 Mar 2026 13:16: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWB925vXrz49ZF for ; Wed, 11 Mar 2026 13:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773234998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xb4AMyr5jp77TO4Rbjp+IoBJHfCYKvDQfGJVAe+HVlM=; b=o2WOBCkzxktnHFT20dOuSgXrggMEfTZqOCplKDPPnal2OlcnR/Y9s8YcLdcd5w8TsfxrV8 rdTVGSy1h2MW1lqMWQ+w4d1cnevgf4nUWz64j8TdahP2fhzBtFsJXoabmVNZL47JihRG9V K/csRyhrqqt/6Q7V0p3WfjOEPbSU9C8+odWbwWdneFeQQLFs1Ejx3Tv6pBWjbsqp2zZG/L MAwDNe85flb44kiR/QD8ej8HhhMyesLD7ZzxQFQHY1Ey5z+8Bb0pYyKPtxpBPsN62jT93e 1Yp8m8xKmRSFGKK2OHouX+xvv3oSon04RdKWAntMN6f53tlajB7bDg5uwF2rEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773234998; a=rsa-sha256; cv=none; b=oehuXn+16u5InzIYtEkwb71Xh03GF48SyHliCcZTd/XD/z3cD7M2oGixxBeAeOsxawO4F4 ZnG9ahhxUIFhvgOr/LeazOjErLHWFeWxf/Pw5uHIFQ3fczZLuCtllGgQEJUTrnremcYSPO Bl+76chnoY9CAsM2g98btJ+tUP3EKoNiJ6Yf7iGfeY8+XEODDEhwqYqz3y9J1IKiDHr3Bd 8lwoVqUSvSCfkgtFSfTuGIJEpZ5VQHiZ/sopU16yGomEYppGwkQm2nwWa/c+jNrGdrcjrh 01ydO1j8a9bXtwK6JLZKegJSa00t0IswWTOVSrXHKSsRix/gDYLnILO4O6kVlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773234998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xb4AMyr5jp77TO4Rbjp+IoBJHfCYKvDQfGJVAe+HVlM=; b=XFz3YpSlwfQPXMxtb4kd58idbABg2ZYmGt7hT0N9/mvAuRVVzapH6Qzdx6V4/rPWqNE0kk be2o8JYBZR+vIh2pKNG71+zauDTEJVEWZdNwrMeGcm/zWEErIffAwnaqOEvDseIqGlky+U 1p7nTU7IbhBZaymxpmOhdJO/MsQf/jIR2mxnG55KI0DzBcfgIHL55EHOkuhrOKchZd3clm NHdQai4TW3d/5YjsvZR6Bu/UDopgj9hFsekcUII7BZko5VXkDIjfZ7XZeaUFMmgSNkZBEA 3hX09U3nrZVPGk2tI3kjrErZE/HqYthHW+GFWXXsuHbPxyCZ8xA82Wv8gRyedw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWB925Mntz10Ph for ; Wed, 11 Mar 2026 13:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 275ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 13:16:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 3d394a1da079 - stable/15 - system(3): Unwrap execve() 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3d394a1da0798cbe8fa07bbc92dab14ad4c4fff1 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 13:16:38 +0000 Message-Id: <69b16b36.275ef.6ffc5448@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3d394a1da0798cbe8fa07bbc92dab14ad4c4fff1 commit 3d394a1da0798cbe8fa07bbc92dab14ad4c4fff1 Author: Dag-Erling Smørgrav AuthorDate: 2026-03-04 15:22:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-11 13:16:00 +0000 system(3): Unwrap execve() There is no need to call execl(), which will allocate an array and copy our arguments into it, when we can use a static array and call execve() directly. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55648 (cherry picked from commit 40e52e0edd038460a2a2aca017b3ac5a513fe37b) --- lib/libc/stdlib/system.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libc/stdlib/system.c b/lib/libc/stdlib/system.c index 94f7460c9b68..a2f472502bfd 100644 --- a/lib/libc/stdlib/system.c +++ b/lib/libc/stdlib/system.c @@ -60,6 +60,8 @@ __libc_system(const char *command) static struct sigaction ointact, oquitact; struct sigaction ign; sigset_t sigblock, osigblock; + char *argv[] = { "sh", "-c", __DECONST(char *, command), NULL }; + extern char **environ; int pstat = -1, serrno = 0; pid_t pid; @@ -101,7 +103,7 @@ __libc_system(const char *command) /* * Exec the command. */ - execl(_PATH_BSHELL, "sh", "-c", command, NULL); + _execve(_PATH_BSHELL, argv, environ); _exit(127); } else { /* parent */ /* From nobody Wed Mar 11 13:16:39 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWB940kMQz6V9K3 for ; Wed, 11 Mar 2026 13:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWB936gd7z48vQ for ; Wed, 11 Mar 2026 13:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773235000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kiM76rDd+YLgKTUk9AnnkRW8sWLmS62bkg5bERT+3kc=; b=yNWuF0ByPelx1OsENFmfmywtA0DcucdSeeJIam7Bfhqdu8CnA1bSbmkL0BQdSfJTFTpoqo GFldmw67qWEpjPx5fIPbLgkwDhbK42SVfw3ItFArsYz4PYS/oIxLYqvMA/+1XQnWZFZrbY ivpiIX58F7l0CGhZA7jz5eOG2aQ+mhkEMwZx3ww09Qol3tj786Z3q275eTPtAzveBHQ7vw LwSl9d4/tn3OH+T54LtGup5Av9Xh96noEgm4dwDiQ/4JH6eSZAhC4bp/1kcD+dM43+Rgrp krIL+isPvRULFNNMSrb+gxzE2QTjuBFEEYHFGICfOwzk5ndnQ5lLiA2Kd4JxpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773235000; a=rsa-sha256; cv=none; b=x+VR97BybKDuAOp8PgnalPXLulGAv7N8gueWz2hOkVY0nVf9gm3jdI1T1U2J4zkPiiRJFL cLb1TwbSNdF9Lx2msXBYJ4RTLiaQH5TeFj9L9CVwjQOLcBaQ5rt+3oDh0zGNAtg6rotkbg OIldn3eWaxVXCdI9qxAAfXHbYvD3ibkF+fDvlzvOCjV+thcM808iWfhf/xjB8PbwVcWQwn 57sMZv7Rv5GYbXUdtEJpY2/dvN6Dw9X+AWVSqePS4huE/FiBzJ6dgFPy55l1QU1utroEE5 3LNtniyZif2zebc38XqJ1FTWZ9PG9MdMIdm27ixW6SuoDrPk7HmwSUpnO9bGGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773235000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kiM76rDd+YLgKTUk9AnnkRW8sWLmS62bkg5bERT+3kc=; b=yJvRHrHaDBEl4kaapDAlfTxmYTr3u7LrWyEwqrBaGH6U1LkGnxGUsUxcBPT8tiYHW49ufY nd859wLN14fNvPgkglc81Tq8SC4+WHHVHuch9YnN6+TGGA2T0QWrCQpjjev1wVznQlJBxt B+fGjLmn014w7WvFKf2DHz7GdDYfyX5WVB59UTpPZ6UdX63aSnQti+5VUzjlGifX7ErNNo uy/0anxx6aMZIlQKSkOYu9/rXUQpcvFSYNJDV0wTZKv6eug5lz3zoC4BQSpJ5a3aFcwliy 3jdgU2HsusyH9VZ6jDhPl0Dz1R0RjAAj83jicKfa70TqP0AbjdXy2Z9igiRI6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWB936DVSz1161 for ; Wed, 11 Mar 2026 13:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25ac0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 13:16:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: c4c375354287 - stable/15 - system(3): Address test robustness issue 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c4c375354287d6eb9fa71ebb5d9fd6a765faf795 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 13:16:39 +0000 Message-Id: <69b16b37.25ac0.41aa2574@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c4c375354287d6eb9fa71ebb5d9fd6a765faf795 commit c4c375354287d6eb9fa71ebb5d9fd6a765faf795 Author: Dag-Erling Smørgrav AuthorDate: 2026-03-09 20:41:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-11 13:16:10 +0000 system(3): Address test robustness issue Don't assume that SIGINT and SIGQUIT are set to SIG_DFL at the start of the test. Instead, retrieve their current dispositions and verify that they are restored at the end of the test. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55709 (cherry picked from commit 48368f702423742b2a7dff7ad3191625e8bf26f0) system(3): Fix brain glitch in previous commit We were saving SIGINT twice instead of SIGINT and SIGQUIT. Also restore original order of operations (SIGINT then SIGQUIT), which matches the order in which they're discussed in the POSIX description of system(3). MFC after: 1 week Sponsored by: Klara, Inc. Fixes: 48368f702423 ("system(3): Address test robustness issue") (cherry picked from commit 863b5c137a98d29dc6964cba0e0c4fe2a8bebab8) --- lib/libc/tests/stdlib/system_test.c | 38 ++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/lib/libc/tests/stdlib/system_test.c b/lib/libc/tests/stdlib/system_test.c index b6a31583d52d..9e556f257791 100644 --- a/lib/libc/tests/stdlib/system_test.c +++ b/lib/libc/tests/stdlib/system_test.c @@ -92,6 +92,12 @@ system_thread(void *arg) return ((void *)(intptr_t)system(cmd)); } +static inline int +sigcmpset(const sigset_t *a, const sigset_t *b) +{ + return (memcmp(a, b, sizeof(sigset_t))); +} + ATF_TC(system_concurrent); ATF_TC_HEAD(system_concurrent, tc) { @@ -99,7 +105,8 @@ ATF_TC_HEAD(system_concurrent, tc) } ATF_TC_BODY(system_concurrent, tc) { -#define N 3 + enum { N = 3 }; + struct sigaction sigint, sigquit, sigact; sigset_t normset, sigset; pthread_t thr[N]; char fn[8]; @@ -119,8 +126,10 @@ ATF_TC_BODY(system_concurrent, tc) ATF_REQUIRE_EQ(0, symlink(fn, fn)); } - /* Get the current and expected signal mask */ - sigprocmask(0, NULL, &normset); + /* Save the current signal dispositions */ + ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigint)); + ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigquit)); + ATF_REQUIRE_EQ(0, sigprocmask(0, NULL, &normset)); /* Spawn threads which block on these files */ for (int i = 0; i < N; i++) { @@ -140,10 +149,12 @@ ATF_TC_BODY(system_concurrent, tc) /* Release the locks */ for (int i = 0; i < N; i++) { /* Check the signal dispositions */ - ATF_CHECK_EQ(SIG_IGN, signal(SIGINT, SIG_IGN)); - ATF_CHECK_EQ(SIG_IGN, signal(SIGQUIT, SIG_IGN)); + ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigact)); + ATF_CHECK_EQ(SIG_IGN, sigact.sa_handler); + ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigact)); + ATF_CHECK_EQ(SIG_IGN, sigact.sa_handler); #ifndef PROCMASK_IS_THREADMASK - sigprocmask(0, NULL, &sigset); + ATF_REQUIRE_EQ(0, sigprocmask(0, NULL, &sigset)); ATF_CHECK(sigismember(&sigset, SIGCHLD)); #endif @@ -156,11 +167,16 @@ ATF_TC_BODY(system_concurrent, tc) } /* Check the signal dispositions */ - ATF_CHECK_EQ(SIG_DFL, signal(SIGINT, SIG_DFL)); - ATF_CHECK_EQ(SIG_DFL, signal(SIGQUIT, SIG_DFL)); - sigprocmask(0, NULL, &sigset); - ATF_CHECK_EQ(0, memcmp(&sigset, &normset, sizeof(sigset_t))); -#undef N + ATF_REQUIRE_EQ(0, sigaction(SIGINT, NULL, &sigact)); + ATF_CHECK_EQ(sigint.sa_handler, sigact.sa_handler); + ATF_CHECK_EQ(sigint.sa_flags, sigact.sa_flags); + ATF_CHECK_EQ(0, sigcmpset(&sigint.sa_mask, &sigact.sa_mask)); + ATF_REQUIRE_EQ(0, sigaction(SIGQUIT, NULL, &sigact)); + ATF_CHECK_EQ(sigquit.sa_handler, sigact.sa_handler); + ATF_CHECK_EQ(sigquit.sa_flags, sigact.sa_flags); + ATF_CHECK_EQ(0, sigcmpset(&sigquit.sa_mask, &sigact.sa_mask)); + ATF_REQUIRE_EQ(0, sigprocmask(0, NULL, &sigset)); + ATF_CHECK_EQ(0, sigcmpset(&sigset, &normset)); } ATF_TP_ADD_TCS(tp) From nobody Wed Mar 11 14:01:30 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWC930pT9z6VD2k; Wed, 11 Mar 2026 14:01:43 +0000 (UTC) (envelope-from fuz@fuz.su) Received: from fuz.su (fuz.su [IPv6:2001:41d0:8:e508::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 RSA-PSS (2048 bits) client-digest SHA256) (Client CN "fuz.su", Issuer "fuz.su" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWC8z6GHhz4JJr; Wed, 11 Mar 2026 14:01:39 +0000 (UTC) (envelope-from fuz@fuz.su) Authentication-Results: mx1.freebsd.org; none Received: from fuz.su (localhost [127.0.0.1]) by fuz.su (8.18.1/8.18.1) with ESMTPS id 62BE1UbB025154 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 11 Mar 2026 15:01:30 +0100 (CET) (envelope-from fuz@fuz.su) Received: (from fuz@localhost) by fuz.su (8.18.1/8.18.1/Submit) id 62BE1U2Y025153; Wed, 11 Mar 2026 15:01:30 +0100 (CET) (envelope-from fuz) Date: Wed, 11 Mar 2026 15:01:30 +0100 From: Robert Clausecker To: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 3d394a1da079 - stable/15 - system(3): Unwrap execve() Message-ID: References: <69b16b36.275ef.6ffc5448@gitrepo.freebsd.org> 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-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <69b16b36.275ef.6ffc5448@gitrepo.freebsd.org> X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16276, ipnet:2001:41d0::/32, country:FR] X-Rspamd-Queue-Id: 4fWC8z6GHhz4JJr X-Spamd-Bar: ---- Hi des, Am Wed, Mar 11, 2026 at 01:16:38PM +0000 schrieb Dag-Erling Smørgrav: > The branch stable/15 has been updated by des: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3d394a1da0798cbe8fa07bbc92dab14ad4c4fff1 > > commit 3d394a1da0798cbe8fa07bbc92dab14ad4c4fff1 > Author: Dag-Erling Smørgrav > AuthorDate: 2026-03-04 15:22:42 +0000 > Commit: Dag-Erling Smørgrav > CommitDate: 2026-03-11 13:16:00 +0000 > > system(3): Unwrap execve() > > There is no need to call execl(), which will allocate an array and copy > our arguments into it, when we can use a static array and call execve() > directly. > > MFC after: 1 week > Sponsored by: Klara, Inc. > Reviewed by: kevans > Differential Revision: https://reviews.freebsd.org/D55648 > > (cherry picked from commit 40e52e0edd038460a2a2aca017b3ac5a513fe37b) > --- > lib/libc/stdlib/system.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/lib/libc/stdlib/system.c b/lib/libc/stdlib/system.c > index 94f7460c9b68..a2f472502bfd 100644 > --- a/lib/libc/stdlib/system.c > +++ b/lib/libc/stdlib/system.c > @@ -60,6 +60,8 @@ __libc_system(const char *command) > static struct sigaction ointact, oquitact; > struct sigaction ign; > sigset_t sigblock, osigblock; > + char *argv[] = { "sh", "-c", __DECONST(char *, command), NULL }; How about > + const char *argv[] = { "sh", "-c", command, NULL }; instead? > + extern char **environ; > int pstat = -1, serrno = 0; > pid_t pid; > > @@ -101,7 +103,7 @@ __libc_system(const char *command) > /* > * Exec the command. > */ > - execl(_PATH_BSHELL, "sh", "-c", command, NULL); > + _execve(_PATH_BSHELL, argv, environ); > _exit(127); > } else { /* parent */ > /* Yours, Robert Clausecker -- () ascii ribbon campaign - for an encoding-agnostic world /\ - against html email - against proprietary attachments From nobody Wed Mar 11 14:48:30 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWDC34Kplz6VHF5; Wed, 11 Mar 2026 14:48:31 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWDC33m57z3CjB; Wed, 11 Mar 2026 14:48:31 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773240511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aAFn8aXTdXcvOhU1p0k4ywXjxV6GsBMMW5ABvl0LU20=; b=TgfMyYiEUT1LJnGp23O83lBtuObPMcTtKwbULF/XSw6veY0Lfc/SMtR1qVIDtT78uhEfBr a1swqENBgZVDP8YnDIovpk8uG12VSfh3YvDlocuNPUo9B8YriMZgMQNs1hneybLpXZXZwc GtUJ9ympthumhsFmBip0ZuSeILW3b1wOYF9wbuvp0iam+/Mie+t4zUQW20aMUIUylOvvTq lv8WrvHmmVX4a0Dm1aNyOA9jFfjRNkn4g7Da4yjwX5ze8wRPiLy0SEulU3sdcJKz+Lv468 y7+FxsKea4yt2X91J95hd6rtSnROhPSaDE1RCZBaeqGNzKG2wfIXGvDZ2aA7kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773240511; a=rsa-sha256; cv=none; b=FqmkLm6WvY+XIsp4o1WttQ2cf6SKjyn++/TKY0cEbbPkEF4rzOFbWAPX2nZxqCTCjpwkLH wKvhOCFHY+u0YECkG4nXpFeKg7HbpEVWR0Ric+dEsdIbdPreGK+k7Yq/xt4ypF8T+Q108E I9zNiCwhvdwlMj6hwPr2eWoMDgBQuJuTqdpit/tOTtNcLFkchRJSjqN7xcGa96J3iPTk8Z FKn6PmgnaYrmDG5158ePHgFWghW41/a12ntTDqEfX85vhAJzlxfhbFd5KkJGlX++GwVuSP D9UU6r8r+7ghaMmE4msunKICxLSXN/p3twRGK3kufF/vp93R1tWfdzmkoXIVjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773240511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aAFn8aXTdXcvOhU1p0k4ywXjxV6GsBMMW5ABvl0LU20=; b=Wu5U3dik00OPr87x+818/AXdWIHrj77iQkpbZ56eVwMQLv9szWj5JIbWMD7X/NJgme/vXu fUjlQdnSvS1hvQWf03ydQdOdAZj0O5se/L8Xez3yP+kiNEyuVowmj3ib3AvJQBfZJMk/Lm Nci89RQkR4zdml3hVCS/LLwAOY/Lb+Nw5PBQml6tvSOyUt0AdkZsNDlkD0CSWGaLvzjVFj A33aR+oJNBiUcnT8/PHDuV8IfKcN3BKafjfGIAMSismdKZWCzJdyc1lct0RUCyj5jzj7BZ BkPbTF0RS+CB2bbztigLqvx5GXO/Od744gXCgDDZ+bz3bwHBGDQc2v1LnPtRzw== Received: from ltc.des.dev (2a01cb0585090500922e16fffef1acef.ipv6.abo.wanadoo.fr [IPv6:2a01:cb05:8509:500:922e:16ff:fef1:acef]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fWDC32HZXzjq2; Wed, 11 Mar 2026 14:48:31 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 3003448105; Wed, 11 Mar 2026 15:48:30 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Robert Clausecker Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 3d394a1da079 - stable/15 - system(3): Unwrap execve() In-Reply-To: (Robert Clausecker's message of "Wed, 11 Mar 2026 15:01:30 +0100") References: <69b16b36.275ef.6ffc5448@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Wed, 11 Mar 2026 15:48:30 +0100 Message-ID: <867bripgld.fsf@ltc.des.dev> 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: quoted-printable Robert Clausecker writes: > Dag-Erling Sm=C3=B8rgrav writes: > > + char *argv[] =3D { "sh", "-c", __DECONST(char *, command), NULL }; > > How about > > > + const char *argv[] =3D { "sh", "-c", command, NULL }; > > instead? That would not work. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Wed Mar 11 16:45:19 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWGnq59s4z6VQhC for ; Wed, 11 Mar 2026 16:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWGnq4blkz3VW2 for ; Wed, 11 Mar 2026 16:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773247519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y/0XPvcZaC/z5nvfOTk1tIEW7LwDQKm98a5h1G3v2vU=; b=q7mcdsht5g65tYXlMqbKEvdcIrJeAMj9FpAmqPI5VDqbQ8KSSvF+xXp3sd/wf1iaQ+xrV0 a3CsF5QuXiYcGiNIlknqGp+mT9PgHqUCCMsMw048oiL2BxCv0C9mdP/Rb21yZA2k1RCND4 3zPZBv6kYmwj2ioxK95qR0Vrwq95wdJ0WaMHnUYXXSTq4yXo8tSKbFuoPb0C5r65t4sPLZ atKOCuC3ommYHWeDI6nmmlmLiz4laBXYhjK66LLEsLCNDWk6P1v3LW7A0XCn6vwTmt8o6d Ckqw8G6t7bBw1u3sEsGCLpjv1D8T998BW7pHqL4cUdBIdU9/n3G7I5UruCwN4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773247519; a=rsa-sha256; cv=none; b=kTgcDmZQmD7wLZ2zcCmWQweH2ewxB4vo4Jgb0HPcGRUFI5BBXWHnvSmcm5ifChDp4Eymgx nNxtlzdDRsBp6+KaIF/oFxZ9oHxvZm+wEzz1bCDvC6exppoJhmy6/Q+fp0t4G2IBR46dU3 E8ErBdcqgroC/7RYtU1h9YbGvqBJsXAM+E2l1cfPoQnHaHHyOe/OuekEs4IZYscsF6VBYF w93KlGBbemm8j9vuYOunwa6R7hdreOFg/VCDzkKYvmhXi1LWGXxVGloGR6CdoTFaNJGit3 F24JCoWN90bIyVQWgvTPdyFRFWMamtb50BkfyIIFeT6ictbQVLvm3hAhaO2mYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773247519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y/0XPvcZaC/z5nvfOTk1tIEW7LwDQKm98a5h1G3v2vU=; b=bD6OCn0ZSmAxEN03F52zfFqKk3rA0ckh5hPeLqX0kriSyL1r6VN9VfbauGmP9b+wj2sp2h zZ9+MOfHs9nie9DTPtH/lOihtXWQ55iNvtp6QYzgpei1uW68WGbRz1Gsw9AhoVWqKzjjkP 7+QtUjwBpk5oA9PiQCDbms8A8sEJyvOse2Q7lnmhKdraueNoIRa+8H6DpWRHm5Aer1wkVB 6eoSXbRcF3EXsulWdTbt7gxfXnK3VUTQgbhdMRuF0vx3g6REo3ksVqb8/7AIdtWi8hWlhG IgMdMbPlCv9vRD5Fmt5yBeRJGVVxgrBbMnP9d6HOl23WVdocFoHBJDDKlwZwxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWGnq3s5dz16QL for ; Wed, 11 Mar 2026 16:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 440e6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 16:45:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: 56401a9c3459 - stable/15 - LinuxKPI: avoid -Werror=unused-value in sort() from BUILD_BUG_ON_ZERO() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 56401a9c3459f8f4151ac0da1f820863119c1749 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 16:45:19 +0000 Message-Id: <69b19c1f.440e6.2e993800@gitrepo.freebsd.org> The branch stable/15 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=56401a9c3459f8f4151ac0da1f820863119c1749 commit 56401a9c3459f8f4151ac0da1f820863119c1749 Author: Siva Mahadevan AuthorDate: 2026-03-03 19:09:35 +0000 Commit: Siva Mahadevan CommitDate: 2026-03-11 16:16:17 +0000 LinuxKPI: avoid -Werror=unused-value in sort() from BUILD_BUG_ON_ZERO() The BUILD_BUG_ON_ZERO() macro returns an (int)0 if it does not fail at build time. LinuxKPI sort() has it as a guard for an unsupported argument but ignores the return value. This leads to gcc complaining: /usr/src/sys/compat/linuxkpi/common/include/linux/build_bug.h:60:33: error: statement with no effect [-Werror=unused-value] 60 | #define BUILD_BUG_ON_ZERO(x) ((int)sizeof(struct { int:-((x) != 0); })) | ^ /usr/src/sys/compat/linuxkpi/common/include/linux/sort.h:37:9: note: in expansion of macro 'BUILD_BUG_ON_ZERO' 37 | BUILD_BUG_ON_ZERO(swap); \ | ^~~~~~~~~~~~~~~~~ /usr/src/sys/contrib/dev/rtw89/core.c:2575:9: note: in expansion of macro 'sort' 2575 | sort(drift, RTW89_BCN_TRACK_STAT_NR, sizeof(*drift), cmp_u16, NULL); Change to BUILD_BUG_ON() for the statement version. Reported by: CI Co-authored-by: bz Approved by: emaste (mentor) MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55634 (cherry picked from commit f26cb4757eb74ceace39144933ae198ebf1b4f28) --- sys/compat/linuxkpi/common/include/linux/sort.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/sort.h b/sys/compat/linuxkpi/common/include/linux/sort.h index e6196d1f41c7..361b37c587c8 100644 --- a/sys/compat/linuxkpi/common/include/linux/sort.h +++ b/sys/compat/linuxkpi/common/include/linux/sort.h @@ -34,7 +34,7 @@ #include #define sort(base, num, size, cmp, swap) do { \ - BUILD_BUG_ON_ZERO(swap); \ + BUILD_BUG_ON(swap); \ qsort(base, num, size, cmp); \ } while (0) From nobody Wed Mar 11 16:47:12 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWGr052Mlz6VQwq for ; Wed, 11 Mar 2026 16:47:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWGr04HjCz3W65 for ; Wed, 11 Mar 2026 16:47:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773247632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EWc4LIY5oJnAWlhWBfAS10kOD4AsEumUI61e79m96ak=; b=Pzb1aljT7LcOnVKKMNLIT44wzG5+NHN0maBlBkddkpYR4LqG1siU3A+Jnx4vPdX+jAMZTN mUd9A9FQka1tkHFe0s//zlgcnNfVAhQ2xlK5gk4gjlQKIt9hsoDVzBQZeDQtCl2fE4Stf/ i+eju8FCWBis3UusfWsUzx/fSnPO6bNlOZQzqLW9435LX/QpVqG1ai2VFetEO0P8FVl5jV rajDkM40Is6NIu0JRKOlBhoNGU3lslIvOZHHJ9bQab+vqZS6z7hPWC2cZW11q4egW+djeS IntlPRG41WQDW3b3RcSH9HS6zwiRdMSMX9+CVnFivslan8mCYcFoIcXAwKHvrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773247632; a=rsa-sha256; cv=none; b=NWcRTROHDtxN34lW//yN9sHvL2r1ZGnDCWN6bCimBprMvxE1Pgbbtmr2EcxExt6TdfcRLt AK9x5WXP+D7OIFXN/cy4y89TGcG5Z4YKUGxSaVIdB+YkbwLE8H/FAsP6XywzGRJH2d1BQt Dn3aVPuLVmGuIU4KHJ+/cajd2hzk4HXref67Px+8Y82B6mk0akGDU7UJMG/mTIqjPrx2a+ lJeRUcnjppLbbFinlMCTS0HXwDNryvmxtAGe/RQoOMTNg/NsPTrR9GjN0FQCrZiO8CU0ia ud5MBeg2HvZx8ZoqHUneZ41BpxdCiTutJgKK2A0QUjaHP+QjypPCOOPcH5ZRLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773247632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EWc4LIY5oJnAWlhWBfAS10kOD4AsEumUI61e79m96ak=; b=MhUGiTqRuKr6XFHR1QXhWVQjZ6QWTwZh3ZJkznwX8XJSostqyWIOmUzAehMtEEL667G9fn Bc2Gkq0xQ/b7lLPXhLdPxKQTgDrU54lDGMiiA72GXNopKYa8F1w+BVmgHL5smj147my3B8 jZ5HOw9BpJ+FfEX0Rol22mb0GlsigxVAf+Kq7LmnVowRueR8YII+zVM2ACqGWp47/Dm6FW WnId+m7/qK5mGs5RlGGGr9A2X11c4piiXQ1zMxatcw18IXaT+yeJS0l8HsB0Q/cc8WERCq GMdB2BPtLQ9Lvtj9PCY+wAqpHe5RP4jCcOcSmxCU3VQVjbwTepXRUCqZPy1PSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWGr03k2sz16XQ for ; Wed, 11 Mar 2026 16:47:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 435ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 16:47:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 945099520368 - stable/15 - share/dict/web2: Sort List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 945099520368481f1f5d6fd76028db7802a96d13 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 16:47:12 +0000 Message-Id: <69b19c90.435ed.b8ee527@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=945099520368481f1f5d6fd76028db7802a96d13 commit 945099520368481f1f5d6fd76028db7802a96d13 Author: Ed Maste AuthorDate: 2026-03-09 19:35:53 +0000 Commit: Ed Maste CommitDate: 2026-03-11 16:46:55 +0000 share/dict/web2: Sort PR: 293659 Fixes: e49b6ead4114 ("Add a number of five letter words to the dictionary") (cherry picked from commit 72f0bc868bf00586cba1e50057d8f1998b4abe80) --- share/dict/web2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/dict/web2 b/share/dict/web2 index bcb6b779d634..5e7369d565b6 100644 --- a/share/dict/web2 +++ b/share/dict/web2 @@ -31891,7 +31891,6 @@ caul cauld cauldrife cauldrifeness -caulk Caulerpa Caulerpaceae caulerpaceous @@ -31914,6 +31913,7 @@ cauline caulis Caulite caulivorous +caulk caulocarpic caulocarpous caulome @@ -78895,7 +78895,6 @@ Gonzalo goo goober good -gooey Goodenia Goodeniaceae goodeniaceous @@ -78926,6 +78925,7 @@ goodyish goodyism goodyness goodyship +gooey goof goofer goofily From nobody Wed Mar 11 16:53:41 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWGzT4QKXz6VRKL for ; Wed, 11 Mar 2026 16:53: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWGzT3mX7z3XC7 for ; Wed, 11 Mar 2026 16:53:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773248021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hqSRQfiad1sHFfh4694UJzforYMQ8+lHpYal8e42vzM=; b=ybp6u9Q9sn5Y5pNlqlrJ/zNX0ECpjxgimLh6B3KFgZtkGNV1E3F00lJSZ6ILOGuFpbx2ru zFQ1VwIJj222d9XuK/zjU/4dcHckB8JCS2dpoYoD5EDio84EtDme156S7yV1s9FYNBetUv ULRi5Ax2GF9hClu3RlhZw3jM6A3rfMivwu4f5NzdHnVUMgmwUxuRylNGw+iPf06r2sp8P6 xpRkTR2PHkEmd7jpjmTg+RTg55vntt37NVxNVvISdTwC7qKJlnFK2gAxxFgRzqUt06TXbG XOZoAIgYf5u6AVZNEWODwHVVgqTG4EAj2owD6awHRYSkPO87HNkyiIYlINIB/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773248021; a=rsa-sha256; cv=none; b=CIcVas4bGRig0XMzSmMcCzUeEJzGEKbr4MvvNLlBX4eRlsnxGQfR60/anQPNR2Gd6amlGO BtnAGAkTBmeekuI6a9E8jS9R4jUlytstgVYq7pwaec9Qv2bBRZCQxiQ7CbNPR+x91Ix8gs PCrhmiCAcHgNyJpgVJDuE7KRJRB4M2+CkSkraZELkQAY7AoWSzjxHpDvyrNwyHeB+GaeCu IahoujRZGBFdFai24myFwY8Bi/UajPKwOrKtDEkt5+t3fsumcTgHC35+omaVqVUr/5Lq5D v+xqZ2b99ILG7gl7ea/WkuYBjTAPT840Egu9I4wx60suKi5SNcmbTg2pTXnspg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773248021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hqSRQfiad1sHFfh4694UJzforYMQ8+lHpYal8e42vzM=; b=CKEeFXdFEkEuAuWhanH8S7HGlABEnAgaEui6wPTLnfiUzbMWFFe/VXJv3txkfjJruLNcGd YAyBKsV4gV2RPTj+PyyZ24dKUzJk+eiRgxsLhKEBLJUKGpGSbj6taz57gbi+wrkxOzZEQR REf2Jsz92Am6IGKlHsknm2zLvdVo7BZJAXdOtt4Rm7v6z29zxlUbQK6OzBAtAcmPIlo/Oo bQo76+w5ow0vE58vkp6wXkvbMRewdhhZhfjclTGw5zbdKGjpacdT+PsQDxbwhvQdDkPXrg tM+KE3pvWVZBnC+RoCj/rh65H/wgzbXGs4g17Slac8ggTVerf16fICMqzGYvcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWGzT2yNgz16NV for ; Wed, 11 Mar 2026 16:53:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 436d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 16:53:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 86417d5b061f - stable/15 - LinuxKPI: 802.11: lkpi_sta_auth_to_scan() fail graciously on lsta == NULL 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/15 X-Git-Reftype: branch X-Git-Commit: 86417d5b061f7d385a09ae557504e8ef306ecbf9 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 16:53:41 +0000 Message-Id: <69b19e15.436d7.3804426e@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=86417d5b061f7d385a09ae557504e8ef306ecbf9 commit 86417d5b061f7d385a09ae557504e8ef306ecbf9 Author: Bjoern A. Zeeb AuthorDate: 2026-03-08 12:48:51 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-11 16:53:24 +0000 LinuxKPI: 802.11: lkpi_sta_auth_to_scan() fail graciously on lsta == NULL Usually after a firmware crash, we see reports of crashes in lkpi_sta_auth_to_scan(). One of the last ones was in the PR mentioned below. These crashes are often attributed as the problem while the real problem happened before. At this point try avoid the NULL pointer and to fail graciously if lvif->iv_bss (lsta) is no longer set. This way users have a chance to possibly recover using netif restart wlan0 rather than dealing with a panic. See if this helps us to better track down the original problems rather than the follow-up crash. On a debug kernel the KASSERT should normally have caught that condition as well but we see panics on page faults were the log line was there but then the lsta->ni deref has happened, which is after the KASSERT. I have not checked if this is a reordering problem or if the people reporting had IEEE80211_DEBUG on but not INVARIANTS. Sponsored by: The FreeBSD Foundation PR: 286219 #c11 (cherry picked from commit 53c69fd933dc49f69d5603fb27ce51064ebe681e) --- sys/compat/linuxkpi/common/src/linux_80211.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 63f92b8afb2b..01347586ef63 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3215,16 +3215,28 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int wiphy_lock(hw->wiphy); LKPI_80211_LVIF_LOCK(lvif); -#ifdef LINUXKPI_DEBUG_80211 - /* XXX-BZ KASSERT later; state going down so no action. */ - if (lvif->lvif_bss == NULL) - ic_printf(vap->iv_ic, "%s:%d: lvif %p vap %p iv_bss %p lvif_bss %p " - "lvif_bss->ni %p synched %d\n", __func__, __LINE__, + /* + * XXX-BZ KASSERT later; state going down so no action in theory + * but try to avoid a NULL-pointer derref for now and gracefully + * fail for non-debug kernels. + */ + if (lvif->lvif_bss == NULL) { + ic_printf(vap->iv_ic, "%s:%d: ERROR: lvif %p vap %p iv_bss %p " + "lvif_bss %p lvif_bss->ni %p synched %d; " + "expect follow-up problems\n", __func__, __LINE__, lvif, vap, vap->iv_bss, lvif->lvif_bss, (lvif->lvif_bss != NULL) ? lvif->lvif_bss->ni : NULL, lvif->lvif_bss_synched); -#endif - + LKPI_80211_LVIF_UNLOCK(lvif); + /* + * This will likely lead to a firmware crash (if there + * was not one before already) and need a + * ieee80211_restart_hw() but still better than a panic + * for users as they can at least recover. + */ + error = ENOTRECOVERABLE; + goto out; + } lsta = lvif->lvif_bss; LKPI_80211_LVIF_UNLOCK(lvif); KASSERT(lsta != NULL && lsta->ni != NULL, ("%s: lsta %p ni %p " From nobody Wed Mar 11 16:53:42 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWGzV5PGsz6VRL9 for ; Wed, 11 Mar 2026 16:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWGzV4Sd7z3Wgx for ; Wed, 11 Mar 2026 16:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773248022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xo1f2ReEP7u6eUDgfcINmyT3lnYnFW4dme6XJu0huvo=; b=qp3wcp3YXF04PQgJAswxRFXe7D35nNRGsPhyYyIyoeQTp0aC5t6uuIU/9IqlId+h+IlmDZ uB/4xm6Qk2gYpf1R2vR/cbeBh1k2u0LluYUYTxK7NQairFqsloBSd2EkdhU1rdE61G6Ofg ag38q1jeMO/XMirFSQmASm8KvcwZJHIEVZdmMdLEu20oLvW+1/6RLw1rv7Gkd1f/w77xj3 9iE2Rs4R9Xt5W2RDAH2O+eZbbYGGK+V24vRMwuMGaLqnSpE0essVUcteZEc87XV0ggBgXV VZyzYeyxhkOTKW5QZAYsmIET4tncxxhf/OnimI9qpyr9kisGlPwW8BXdJUjnwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773248022; a=rsa-sha256; cv=none; b=rzR5es494Ry7OQ9OfJsK/EFsg4CBLQgHtRcUglyJ+8AZb9WBRIfKVTDF29gCHOR7X9sjIt j7x8LBQikoAYdjrhl3uykJuoqVEvnyWZ2VaQyV8BX7NNUcZuMJzlTXg+o2W2Pd6dKacCnI Whd3yvpJTc4WIrL4/GeQPZHo5q4g0KgZFmDvBMM6DUfRiwazeV83JRC7oeYtSGk6KKKfk6 5bUc3vNRP+iZrCrok/AlUCTxBjpp0NKSUck84SWkpMfSK5Kl4ku8mWSmk/gn6g7Kahy9Kp QAA2oh7xRoUO2/fbywXKOT6o8waytiC/SErgdY//4bg+0BXTlF9KcdGtPyL5fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773248022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xo1f2ReEP7u6eUDgfcINmyT3lnYnFW4dme6XJu0huvo=; b=bIO8q7a9Cm6coPiBxERG31ed43/WFl3xd7ETG4Gnju1ZXUobCaAhEDMg+QFr3j85WoOGwM xUzVfnH269CDqSsqrhpVLApOap/3sQMOdpDuT95TqISRlBcz4Q99wgnf8Bxx5tpRRh4po4 4o5aOrJvia2E1981p/QGMV35xaeDkZ2mKuwULj5+G+BfUaKRZNC8kE+oFHduTrnyMCxCZx rv/J81VXgc5Bqzs5MDJM1mCNEBwHc9cSoyKGR81/Mat6KMJiBkRYQVNbtrfT/JIUtfw3R2 ig3m5nxmbmug5ZNMAwUnajEoEmQ0k72kYyMiPL66XkVHmWPwqOEQ8yDLKwgpNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWGzV3qfxz16NW for ; Wed, 11 Mar 2026 16:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44acb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 16:53:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 68fcf0b94c51 - stable/15 - net80211: fix VHT160/80P80/80 chanwidth selection in the "40-" case List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 68fcf0b94c5167f89481052f358064c9b6732553 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 16:53:42 +0000 Message-Id: <69b19e16.44acb.13ff800e@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=68fcf0b94c5167f89481052f358064c9b6732553 commit 68fcf0b94c5167f89481052f358064c9b6732553 Author: Bjoern A. Zeeb AuthorDate: 2026-03-08 00:57:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-11 16:53:24 +0000 net80211: fix VHT160/80P80/80 chanwidth selection in the "40-" case Depending on the base channel ni_vht_chan2 - ni_vht_chan1 can be negative. Apply abs() as indicated in the comments right above | CCFS1 - CCFS0 | = 8 or > 16 in order to fix the channel width selection. Sponsored by: The FreeBSD Foundation PR: 293645 Fixes: 4bf049bfeefd9 Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D55717 (cherry picked from commit 6cfd2b93e68061c7831016b91c2e308d01658764) --- sys/net80211/ieee80211_ht.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index b3c9532764d9..508ddc7de920 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -2036,11 +2037,11 @@ do { \ } /* CCFS1 > 0 and | CCFS1 - CCFS0 | = 8 */ - if (ni->ni_vht_chan2 > 0 && (ni->ni_vht_chan2 - ni->ni_vht_chan1) == 8) + if (ni->ni_vht_chan2 > 0 && abs(ni->ni_vht_chan2 - ni->ni_vht_chan1) == 8) can_vht160 = can_vht80 = true; /* CCFS1 > 0 and | CCFS1 - CCFS0 | > 16 */ - if (ni->ni_vht_chan2 > 0 && (ni->ni_vht_chan2 - ni->ni_vht_chan1) > 16) + if (ni->ni_vht_chan2 > 0 && abs(ni->ni_vht_chan2 - ni->ni_vht_chan1) > 16) can_vht80p80 = can_vht80 = true; /* CFFS1 == 0 */ From nobody Wed Mar 11 16:53:43 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWGzW6x9qz6VRWs for ; Wed, 11 Mar 2026 16:53: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWGzW5N5tz3X4L for ; Wed, 11 Mar 2026 16:53:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773248023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Koy6hQNJcgGp5Fk4P3BnIR4uw/QfFc+1a7+58EsSaTc=; b=vo9ZxMwMPYczeG7XM9wnqByjvBJWRuYWjaYgT5b3XUpGnU4Qv+Knvxo7Bw5C1s+EGOVvnu OCVWURjp8QNCNB/LT+BjwIET1ocIjrhtQhI9sUkzxKoxep8xe7yxH+dPl8eJ9MHyWqcuSQ Uqd8XGHMlGRdqraebTm4ZVpKjtTb7IXtWP1iqccFXZkjodyzeoB8kVu40Bu65HPrpGzGJ4 a5/JcwSR8C3ddyVsMopQRqO1uDASjDxSLLXrmRKocd+XYDyAfQGYhgE93eaFwukcDzJDx/ M/HCQEAygXG3lTeTpfTSMAb0TReFsc9sUOCZk5Jr4yoI/bYIagP4whIYwdoWqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773248023; a=rsa-sha256; cv=none; b=ACGFyxoSenm3NKtMgdZRqepASWVUN+JxUZDXgssl7TpQfJeanwc/8g87YObLME0jcosnY/ U+1YsuyjoZzaey/IhUX9AgBytRrBRr6wE5ryUGQ3UJOZQBOIxBGfa6ssVbzqHnc2ZOghe6 ztwZaKeKbQY2ca1Tf3oeOJvC9PuXZ0dAVIYVF5ih37m8u4r9+tpUN6JkSEGtz60XYox24l /Yl+qu4VWPC4U40BUvkwfbZZiGy1k82w1yIbF0AnfQrW6UeNnBbSrRdJwmrG6RufYOCCg9 foLpf8pZsbItJUaMkQXIQL4QO3Qsa+xO0avhcLBr1sq2JwFFNEcaW6XetcAHwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773248023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Koy6hQNJcgGp5Fk4P3BnIR4uw/QfFc+1a7+58EsSaTc=; b=nvb5p2rQvFGUHmiyRsKNypwdoLPbYpBCIy7uXF28bI6PfGjyuPu07lFuxM2fzbSuLsx1El dvWXJZddkty7rVa5SibWyXGrAMs372tR7+xctnn/iAZjqlIJRSqZOYC8gfCKQDLFTXt/hV 1QJbQYRHAXgYqVSCDnresCFD0nP5iq2uEgiRJillE3m5XGlJ2+2qEONMr4PAeS/mMvXi7i BFg2/tcxIzD/iFGpOVS+h7H5Eaid99obZVYE8mi37wMjvHG3DjbsVhCh4iSkvamvaBSMPK I3qhPzzxEefXWsEFU7dgPZ/WgVK97P/fFbQhBMAd5bi0H22VEFhwW5s3Zo6YYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWGzW4dVYz16bf for ; Wed, 11 Mar 2026 16:53:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 456d1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 16:53:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 4c7dbe9f794f - stable/15 - usb: umass: add SCSIEJECT quirk and fix RTW8821CU_CD (USB mode 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4c7dbe9f794f601c8abf791078fbe57e0a8a63e5 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 16:53:43 +0000 Message-Id: <69b19e17.456d1.47de9198@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4c7dbe9f794f601c8abf791078fbe57e0a8a63e5 commit 4c7dbe9f794f601c8abf791078fbe57e0a8a63e5 Author: Bjoern A. Zeeb AuthorDate: 2026-01-26 13:19:37 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-11 16:53:25 +0000 usb: umass: add SCSIEJECT quirk and fix RTW8821CU_CD (USB mode switch) Several Realtek (and lots other) USB dongles present themselves as CDROM device first. Upon eject they do a mode switch and suddenly are a different kind of device (sometimes even with different IDs), e.g., a wireless dongle. In order to avoid the CDROM stage and rather than adding the quirk handling to more drivers, add support to umass and if enabled automatically eject the "CDROM" to make it the real device. Longer-term some other drivers could stop using their hand-rolled support for this. It is unclear as-to how much we need the list of (eject) quirks from u3g here, or if these are very specific to that kind of devices. Sponsored by: The FreeBSD Foundation Fixes: b3b6a959c85a, 9c0cce328363 Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54901 (cherry picked from commit b4daeded66b5e950ed8e618d66915b863c2414b1) --- sys/dev/usb/quirk/usb_quirk.c | 2 +- sys/dev/usb/storage/umass.c | 57 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 802ea2b2ae6a..69e16c91604f 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -532,7 +532,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { UQ_MSC_NO_INQUIRY, UQ_CFG_INDEX_0), USB_QUIRK(SMART2, G2MEMKEY, UQ_MSC_NO_INQUIRY), USB_QUIRK_REV(RALINK, RT_STOR, 0x0001, 0x0001, UQ_MSC_IGNORE), - USB_QUIRK(REALTEK, RTW8821CU_CD, UQ_MSC_IGNORE), + USB_QUIRK(REALTEK, RTW8821CU_CD, UQ_MSC_EJECT_SCSIEJECT), /* Non-standard USB MIDI devices */ USB_QUIRK(ROLAND, UM1, UQ_AU_VENDOR_CLASS), USB_QUIRK(ROLAND, SC8850, UQ_AU_VENDOR_CLASS), diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c index cacf4ddf8f16..0ee6ea992fa7 100644 --- a/sys/dev/usb/storage/umass.c +++ b/sys/dev/usb/storage/umass.c @@ -115,6 +115,7 @@ #include #include #include +#include #include #include @@ -124,6 +125,7 @@ #include "usbdevs.h" #include +#include #include #include @@ -705,6 +707,59 @@ static const uint8_t fake_inq_data[SHORT_INQUIRY_LENGTH] = { #define UFI_COMMAND_LENGTH 12 /* UFI commands are always 12 bytes */ #define ATAPI_COMMAND_LENGTH 12 /* ATAPI commands are always 12 bytes */ +static void +umass_autoinst_eject_quirks(void *arg __unused, struct usb_device *udev, + struct usb_attach_arg *uaa) +{ + struct usb_interface *iface; + struct usb_interface_descriptor *id; + + if (uaa->dev_state != UAA_DEV_READY) + return; + + iface = usbd_get_iface(udev, 0); + if (iface == NULL) + return; + + id = iface->idesc; + if (id == NULL || id->bInterfaceClass != UICLASS_MASS) + return; + + if (usb_test_quirk(uaa, UQ_MSC_EJECT_SCSIEJECT)) { + int error; + + error = usb_msc_eject(uaa->device, 0, MSC_EJECT_STOPUNIT); + if (error == 0) + uaa->dev_state = UAA_DEV_EJECTING; + else + printf("UMASS failed to eject by SCSI eject STOPUNIT " + "command based on quirk: %d\n", error); + } +} + +static eventhandler_tag umass_drv_evh_tag; + +static int +umass_driver_evh(struct module *mod, int what, void *arg) +{ + + switch (what) { + case MOD_LOAD: + umass_drv_evh_tag = EVENTHANDLER_REGISTER(usb_dev_configured, + umass_autoinst_eject_quirks, NULL, EVENTHANDLER_PRI_ANY); + break; + case MOD_UNLOAD: + if (umass_drv_evh_tag != NULL) + EVENTHANDLER_DEREGISTER(usb_dev_configured, + umass_drv_evh_tag); + break; + default: + return (EOPNOTSUPP); + } + + return (0); +} + static device_method_t umass_methods[] = { /* Device interface */ DEVMETHOD(device_probe, umass_probe), @@ -725,7 +780,7 @@ static const STRUCT_USB_HOST_ID __used umass_devs[] = { {USB_IFACE_CLASS(UICLASS_MASS),}, }; -DRIVER_MODULE(umass, uhub, umass_driver, NULL, NULL); +DRIVER_MODULE(umass, uhub, umass_driver, umass_driver_evh, NULL); MODULE_DEPEND(umass, usb, 1, 1, 1); MODULE_DEPEND(umass, cam, 1, 1, 1); MODULE_VERSION(umass, 1); From nobody Wed Mar 11 17:15:36 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWHSm22HNz6VSl6 for ; Wed, 11 Mar 2026 17:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWHSm1F7Fz3Zvr for ; Wed, 11 Mar 2026 17:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773249336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KGrKZbEUGz5u+CaELk8n6BRj0yltdkFEvhv/rvxk/bI=; b=QcF14jjV3xP2KsDKjNeHb6ZqdYYgbKDC0vBbQ6ZrmPVdJTfmKNeLvzw38mc9HxAwplxLIf pIEZ6er63dUU4uF8xYyoU7UYoWbYN99B+dns78Cad7l/Ul28ZJGqOL5RkjXBkBMID6Vb9v Ul4H6NlHQrUP3HtKAOqsgulsWYyR4cJ8MaUTP8Cht5fyKwVfVHTubuSTnbigDi9J57NvR8 49wFdNlJivI1BWNAOSBigExXlikB3DmHTc7Vdi+4zPoBUbhsqsirX3PQ3L5w0liXIsMs+x DGa7W6WuUTpHwUNogueE6kzUsQ63o2M88CM8NR/GJuIQbxJNbgVzC5hB+MBSOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773249336; a=rsa-sha256; cv=none; b=I+7OWBPGE7YZuthbThYNTHFhzRPkYIZVMjvBLUp8l0xRtmksrq4Fv5PbN8TB0Hm8E4xGpB G8ZxmhTc94iVBE78/6n346Iof/o8K5179YDIc/TeuV23TwzRHKFesi8uQFVTfec9xcJT/G uhTlPfW4EuHDj9H27SD2pjyvZfj41FE/++MoGu7v2BZLhAlnUuL/HNbp6DIplafB1sBIBQ jkP5JXNa6V2DQs2XX6bp9hT54zpeIIYb2Aw5VB5T0pNKovREiadyZgjgwUAzLonc8nhabL X1hExQws0lvzMY8YFU8tBLUJg8aK7G1+Q/8vWBK9B7bPky8gRUEPH8vMOlMy4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773249336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KGrKZbEUGz5u+CaELk8n6BRj0yltdkFEvhv/rvxk/bI=; b=EzqbXgOnSvTbXq1HxI/YIwmO3zSIq7JzaHXNwQ8hBliv/Q0botJy7Yf0b3U9mU4ifJW258 ytZ+pAhQ2hhFHc9Dxz7FfXHE9oPoewkggm7oNcZo58kCtqi8XyQCRbwrk5DfooGocZXu/I zS71F79VV0lzKQl+0ziYPtKel4g7foW6Lj55u1qWXz5nnWo/pRZsIEqY1+CtA1SGRmqna9 yd+UKzfS7iVgO/Zw4SxFrVsHhio3Gucz9tGMJoGRNxl5vCUgFp9WNUqcksgTypS9DDYs4+ GCZJu5CmuOm4dEBhWFPp2t5xzhdbCFGyqKVVSoWK62aqMWt37Y3PV0rNvJ1lDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWHSm0pyZz17JZ for ; Wed, 11 Mar 2026 17:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47872 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 17:15:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: b9c0e0c77036 - stable/14 - LinuxKPI: avoid -Werror=unused-value in sort() from BUILD_BUG_ON_ZERO() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b9c0e0c77036a83b2d1b6993224370b686446d6a Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 17:15:36 +0000 Message-Id: <69b1a338.47872.72a1d082@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=b9c0e0c77036a83b2d1b6993224370b686446d6a commit b9c0e0c77036a83b2d1b6993224370b686446d6a Author: Siva Mahadevan AuthorDate: 2026-03-03 19:09:35 +0000 Commit: Siva Mahadevan CommitDate: 2026-03-11 16:45:36 +0000 LinuxKPI: avoid -Werror=unused-value in sort() from BUILD_BUG_ON_ZERO() The BUILD_BUG_ON_ZERO() macro returns an (int)0 if it does not fail at build time. LinuxKPI sort() has it as a guard for an unsupported argument but ignores the return value. This leads to gcc complaining: /usr/src/sys/compat/linuxkpi/common/include/linux/build_bug.h:60:33: error: statement with no effect [-Werror=unused-value] 60 | #define BUILD_BUG_ON_ZERO(x) ((int)sizeof(struct { int:-((x) != 0); })) | ^ /usr/src/sys/compat/linuxkpi/common/include/linux/sort.h:37:9: note: in expansion of macro 'BUILD_BUG_ON_ZERO' 37 | BUILD_BUG_ON_ZERO(swap); \ | ^~~~~~~~~~~~~~~~~ /usr/src/sys/contrib/dev/rtw89/core.c:2575:9: note: in expansion of macro 'sort' 2575 | sort(drift, RTW89_BCN_TRACK_STAT_NR, sizeof(*drift), cmp_u16, NULL); Change to BUILD_BUG_ON() for the statement version. Reported by: CI Co-authored-by: bz Approved by: emaste (mentor) MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55634 (cherry picked from commit f26cb4757eb74ceace39144933ae198ebf1b4f28) --- sys/compat/linuxkpi/common/include/linux/sort.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/sort.h b/sys/compat/linuxkpi/common/include/linux/sort.h index e6196d1f41c7..361b37c587c8 100644 --- a/sys/compat/linuxkpi/common/include/linux/sort.h +++ b/sys/compat/linuxkpi/common/include/linux/sort.h @@ -34,7 +34,7 @@ #include #define sort(base, num, size, cmp, swap) do { \ - BUILD_BUG_ON_ZERO(swap); \ + BUILD_BUG_ON(swap); \ qsort(base, num, size, cmp); \ } while (0) From nobody Wed Mar 11 17:37:00 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWHxS4j0Cz6VV40 for ; Wed, 11 Mar 2026 17:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWHxS2PsPz3dmK for ; Wed, 11 Mar 2026 17:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773250620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QIKFgkDZWHebYQrPjljsgYVc9YvqLKvQeHUxUjnKdG0=; b=HAf5qNlxg6UjSEpDNB61BkTfBEwvBIdN3NzWiYL37AAZ9Aej3oWV8fVKtYGy84u2wWBVe2 UJMNTlMsf01AH2yPbtllot+k/EY+f5VTi9uOAYPj+BNSvNHB93Vy+iOsuLoJdKv48rmUgE MOZHS9A96gCl84sNe0Hc4GSkRtEW1XSTakHPvDndDKBB2tzY1r7rwUDi6VXBeDVkzq/9FI Y6RIuxADhm69LGo5K7eJs+z+YoaabsnM2BCempIVVhUacivlL5b6WrTP+zpGOgdwaD3438 8m33t+Vb2AjDKEVj37L8i+TweymqYy4tGA8Gy2AOPee2l6mnvsvSCWlBy32X4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773250620; a=rsa-sha256; cv=none; b=kBVMjEoHQrwzudpQN4J0SeJs13Kcv1ihj7EXUtok0GVhdQS2M3lal6YWat+pKc2HIY4dOf TmDvAqVAPPReDfk2morva3HMJsHHnRYYmQvBkK8mYWirDMNjNL/0xrX/ILvAtcn8In9t6H LrYuOZJqsXWoTFxV4gW0uX5JgpUUW0XlBVjxtuLM9tGaZuPzUz4CHheLxrHXy2ZKCtaCQq +4ejnTkgG+Qyz9ygXlftYByOYWXQ1vjFWvBqVSiNTSzlza24kMgovFWf7JQ2FQDVfYLKKQ OpRCyHUNDWs33Rk1xd3U4wDDRaAYraDNpudyJ3SI4EkMqjbu3gHobJhbQtybzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773250620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QIKFgkDZWHebYQrPjljsgYVc9YvqLKvQeHUxUjnKdG0=; b=UYzmpPnXE6jfZeyZKS0daMJ6ME8lIvtbHvzrpZA8XMc3Om1HSYvwEmR86qefk3w6qYagWu V3hqozCa8pRFikgiah3+5sl1DdvriSKYFt9JFCbHnF+z62UFADj84a42Tv/dTRjwQfBKbq mYHazJ9873Np9IQPUYGXeRzlElwYK858gKWal0j3HuOCQrzUuYmZ3mc2PKGtaEWt8SUNeP r0rgy5K+P8r8jRyI5ZlNHGGsFL+PWemio10G1YinHeNjz22Vb205QIggsIREiduP7mYZAf rk4mz38u5ZCW3PQJgP/Si2xfLDyIHHYV+3JkX+TBPWFhmKog+7lsY1NIeOnhDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWHxS1df7z16v1 for ; Wed, 11 Mar 2026 17:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 198bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 17:37:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jessica Clarke From: Cy Schubert Subject: git: b373cf4ff140 - stable/15 - krb5: Include on Linux so __GLIBC__ can be checked 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b373cf4ff1406dca10985362aff9d9f3a3fa351d Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 17:37:00 +0000 Message-Id: <69b1a83c.198bf.3dff65ff@gitrepo.freebsd.org> The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b373cf4ff1406dca10985362aff9d9f3a3fa351d commit b373cf4ff1406dca10985362aff9d9f3a3fa351d Author: Jessica Clarke AuthorDate: 2025-10-22 20:06:02 +0000 Commit: Cy Schubert CommitDate: 2026-03-11 17:36:36 +0000 krb5: Include on Linux so __GLIBC__ can be checked __GLIBC__ is not pre-defined by the toolchain, it comes from features.h, so we need to make sure that's included by this point. Fixes: 4dd2b869cd07 ("krb5: Fix -Wint-conversion when bootstrapping on GNU/Linux") (cherry picked from commit 34e7a57673c9730ee5d1f7ebb07e152567bd8e0b) --- krb5/include/autoconf.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/krb5/include/autoconf.h b/krb5/include/autoconf.h index f1cf42d8f90f..760aca79176b 100644 --- a/krb5/include/autoconf.h +++ b/krb5/include/autoconf.h @@ -691,6 +691,9 @@ #define STDC_HEADERS 1 /* Define to 1 if strerror_r returns char *. */ +#ifdef __linux__ +#include +#endif #ifdef __GLIBC__ /* Bootstrapping on GNU/Linux */ #define STRERROR_R_CHAR_P 1 From nobody Wed Mar 11 17:36:59 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWHxX2GFpz6VV8d for ; Wed, 11 Mar 2026 17:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWHxX1RgYz3dsb for ; Wed, 11 Mar 2026 17:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773250624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FtB6LUEOSP5eYU1954Sl8zYA9G4XnrWR/dSwXSWHS4w=; b=Q5q3YQtqHEZ4oMwwouzrUYPuGcrqRfPpOe/bGktFZJvtG9z9b3Vveg692nDT/gfCJkIKXx mZpcQvBcx9qxcqx2WtIXoVNpWv0029ivXZHIQlvbUstw1E4C6wzyPvFytdwLgfJU4F977j j8s6TWCAAZgcX384VqAtmp47nbKyvyaPkG0zedR4FnmtSJdYqIJI5rt3+Z2uW+vqXXCSlY cVT9oy7l+lVNzmgKAKxnaac0y5XDMY7a1lnc92glMfqgP+DjuoqC4CIqaR2p+mFSIzSreO 0rEaQbkB3o4QcN9+8rOS0fkIfRwJLvmhhE9tgqzdh4kA1t4U+BCoZevcmKxGIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773250624; a=rsa-sha256; cv=none; b=UmKR1cMN/IrugRpzRuxAm7XU+EFuK+1k7PHKkk8+yjs6n0s3WJHfvb29usiG4e7TWB485b 76QNsI/umbvUDZ6AkxjsAHPrC1Quo7fN4mgfd0y4EfMrhjgLQbAj8yS1IuJTShQw68air0 sAIlJwF28c1yVpskNDCvhDX6a329mkZAiFYoSzzhWr6CcHu23psIlRVHJkdjDjlGVGfASa gI/Ft1GIs+VeIqqKI9Ttmf6IHvkrVD/wWB2pEsEf+1Cif3EO+ilh/dM+MwzouiOqYbNwUg 95cRDGX1QJXKGfP6EJgZaGKvz3nFAR4/nwrGYY+qcYZXeiB0ISzkJHD6kQZzbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773250624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FtB6LUEOSP5eYU1954Sl8zYA9G4XnrWR/dSwXSWHS4w=; b=LEd4K1geF1+WtAAdkdG5m7tyw/p2pP5ULtj9UMPvzqvn7PQjEsNn9nMW0rohtBDnEhgC6+ d/CEwqHHy8n0lyd+TY0VG0/iiObstHus3kHFbdMju3T4GGOdEHYVpCF5rXoK1m3GJXLcZg r1L8MBAP9wzX+HCPvJiycesXN3edAvHtC4DTsGPWd6c9OPPLH9Rmr5YXCQTbB2n8yvky7v sZ4CQCqy0Ekt+PYrlzfY9JgBrbtcoSY9gZ8vbNKMTdItLNf5+yfahqkae0I+OBdYR9ml23 +OFIw/BkypiAZ2kRfRlRtMYRQEqyIA0ZygS4TOCSrbpemPeOE3y1RGYXngGQJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWHxX0pSXz17b2 for ; Wed, 11 Mar 2026 17:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 185f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 17:36:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jessica Clarke From: Cy Schubert Subject: git: fdddd0058e34 - stable/15 - krb5: Fix -Wint-conversion when bootstrapping on GNU/Linux 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: fdddd0058e3457e2cdce3e84f43e86bedaa66846 Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 17:36:59 +0000 Message-Id: <69b1a83b.185f3.2a2f72a5@gitrepo.freebsd.org> The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=fdddd0058e3457e2cdce3e84f43e86bedaa66846 commit fdddd0058e3457e2cdce3e84f43e86bedaa66846 Author: Jessica Clarke AuthorDate: 2025-10-22 19:50:50 +0000 Commit: Cy Schubert CommitDate: 2026-03-11 17:36:36 +0000 krb5: Fix -Wint-conversion when bootstrapping on GNU/Linux This shows up in GitHub Actions as a warning, and some compilers can default to it being an error. (cherry picked from commit 4dd2b869cd078ed6f40c42d1ef429222da16a58f) --- krb5/include/autoconf.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/krb5/include/autoconf.h b/krb5/include/autoconf.h index ed0bf8cacc14..f1cf42d8f90f 100644 --- a/krb5/include/autoconf.h +++ b/krb5/include/autoconf.h @@ -691,7 +691,12 @@ #define STDC_HEADERS 1 /* Define to 1 if strerror_r returns char *. */ +#ifdef __GLIBC__ +/* Bootstrapping on GNU/Linux */ +#define STRERROR_R_CHAR_P 1 +#else /* #undef STRERROR_R_CHAR_P */ +#endif /* Define if sys_errlist is defined in errno.h */ #define SYS_ERRLIST_DECLARED 1 From nobody Wed Mar 11 18:37:42 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWKHV4Pckz6VYnJ for ; Wed, 11 Mar 2026 18:37:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWKHV3d7Vz3lhq for ; Wed, 11 Mar 2026 18:37:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773254262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vcq4EFUV+53KYnyVp20I9HeY2XiXCKX3+AUNNIwjmQA=; b=DUoJ704H6Yo+UNL17T7rvNpIQgmch8Qdw+Ssp/TFFT8/mAoQTZsc8BK73lacCo9DaUv2Ow bYJYBTO5dGYvzlFuHYZ4J9JohYQKQXfAr1qJX5542C120pgypiUCzpNpDk8eXLJrvVbUEm XwMtkbN1tZitixpiJ7dI0qmB2aqgLz7KjgXaNs339JkoH5B/haJODfDDxbtkO98UW7ZM60 StDj5Jn8D9SWnBMlX9PfqM33P56smhJwHvOd4r5K7497NiiXEyzvUDZrh9IDlKw495Ek/M GuAh/QYU5pBUqItUGW/U0fsiZFF5wz60raSBubqyWb5vtAAMxJyqeGGjcc92LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773254262; a=rsa-sha256; cv=none; b=jbrtYJgNXjdo7Dw6E73r65jIKUkDjYSB+gM0jsITfz8x8o1qQfPYsLS88UvyPf/MNjcrFK q9D+Mv2/zRyOe0N2kiXYtqzVmBMC4ihunOc/8S3gcv24ED8Q1w9UDZcF9bMqP/tN4j51YU v8/Z7Be+Eoy9V9sOPqBAWyqqzTuwWrNfTH1HjzFgKrY2rp1V4iNtWajAIjqmddU/wuUgot f2a1yCsrYf9r1iLmczAF1HuAquww5dz1b8AvKJ6DTZob6gDkbepTe9bSi4s/fOTEca26YR CIJX/9VM5SZaPX6lPt54Legvsp9CjDtV0aic1dNp1eYn6TSMvtnkTuMQQQBZNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773254262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vcq4EFUV+53KYnyVp20I9HeY2XiXCKX3+AUNNIwjmQA=; b=N2dRb4luVpA17pKSUSc3NHccqmsigKfjnrHOsFhX/27aqTeqrGTWDDx6rphRdBtPpyilAS BFzUEyvYyQTM7mq6JhLPVi8UDyuOlG1W8JHsnd//Lz+Bh/vZtyExG44tFLeYh7ZBN5pwrf TPRmtFVFXOWeeb0qUZgpyZ2QRN5Z9f6G/2K65MFgQ6TAMkyif1lMkNcY9KqM09j6LLw2WU soqzzpVNFU/YYIqAqxIfVfy2lm/SfvRdqGl5YhoBTLM/pRImFEtNyXpe4NklCMzclx0p8n up6fYipdJX9iKk3X7lXIgC58mMKbFFV3NS1D1nf4Wa62SYlvYv9+GJnowqSPkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWKHV2wKsz18vF for ; Wed, 11 Mar 2026 18:37:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fd47 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 18:37:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kenneth D. Merry Subject: git: 7fe98ee4d49a - stable/15 - mt(1)/libmt: Add LTO-10 density codes and specs. 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: ken X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7fe98ee4d49ad4a7c5e994a999567aec4b34f84e Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 18:37:42 +0000 Message-Id: <69b1b676.1fd47.4271f18f@gitrepo.freebsd.org> The branch stable/15 has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=7fe98ee4d49ad4a7c5e994a999567aec4b34f84e commit 7fe98ee4d49ad4a7c5e994a999567aec4b34f84e Author: Kenneth D. Merry AuthorDate: 2026-03-02 19:13:47 +0000 Commit: Kenneth D. Merry CommitDate: 2026-03-11 18:33:17 +0000 mt(1)/libmt: Add LTO-10 density codes and specs. These were obtained from IBM specs and actual tapes/drives. Standard LTO-10 cartriges hold 30TB raw, 75TB with 2.5:1 compression. Premium LTO-10 cartridges hold 40TB raw, 100TB with 2.5:1 compression. LTO-10 tape drives are not backward compatible with previous generation LTO tapes. (This is a change from older generation drives.) Since the Premium tape is a new thing for LTO, we'll call this density code LTO-10P vs. the standard LTO-10. The barcode identifier for LTO-10 tapes is "LA"; the barcode identifier for LTO-10P tapes is "PA". LTO-10 cartridges contain 1035m of tape, while LTO-10 Premium cartridges contain 1337m of tape and have slightly higher density. (Obtained from MAM data on actual tape cartridges and the density report, obtained via 'mt getdensity'.) LTO-10 cartridges use a polyethylene naphthalate (PEN) film substrate. LTO-10 Premium cartridges use an Aramid (aromatic polyamide) substrate that is thinner and stronger, allowing a longer tape to fit in the same cartridge form factor. usr.bin/mt/mt.1: Add density codes and specs for LTO-10 and LTO-10P. lib/libmt/mtlib.c: Add density codes for LTO-10 and LTO-10P. Sponsored by: Spectra Logic (cherry picked from commit 930486f9be5c884d1d2f0aae9f81a3f5af1f2718) --- lib/libmt/mtlib.c | 2 ++ usr.bin/mt/mt.1 | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/libmt/mtlib.c b/lib/libmt/mtlib.c index 6175f6b8888a..4cbee073de56 100644 --- a/lib/libmt/mtlib.c +++ b/lib/libmt/mtlib.c @@ -647,6 +647,8 @@ static struct densities { { 0x5D, 19107, 485318, "LTO-M8" }, { 0x5E, 20669, 524993, "LTO-8" }, { 0x60, 23031, 584987, "LTO-9" }, + { 0x62, 21657, 550088, "LTO-10" }, + { 0x63, 22441, 570001, "LTO-10P" }, { 0x71, 11800, 299720, "3592A1 (encrypted)" }, { 0x72, 11800, 299720, "3592A2 (encrypted)" }, { 0x73, 13452, 341681, "3592A3 (encrypted)" }, diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1 index 4cafdf4437c7..361c9ae65bda 100644 --- a/usr.bin/mt/mt.1 +++ b/usr.bin/mt/mt.1 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 31, 2023 +.Dd March 2, 2026 .Dt MT 1 .Os .Sh NAME @@ -524,6 +524,8 @@ Value Width Tracks Density Code Type Reference Note 0x5D 12.7 (0.5) 5376 19,107 (485,318) C LTO-M8 14 0x5E 12.7 (0.5) 6656 20,669 (524,993) C LTO-8 0x60 12.7 (0.5) 8960 23,031 (584,987) C LTO-9 +0x62 12.7 (0.5)15104 21,657 (550,088) C LTO-10 15 +0x63 12.7 (0.5)15104 22,441 (570,001) C LTO-10P 15 0x71 12.7 (0.5) 512 11,800 (299,720) C 3592A1 (encrypted) 0x72 12.7 (0.5) 896 11,800 (299,720) C 3592A2 (encrypted) 0x73 12.7 (0.5) 1152 13,452 (341,681) C 3592A3 (encrypted) @@ -572,6 +574,11 @@ NOTES LTO-7 cartridge initialized with a higher density format by an LTO-8 drive. It cannot be read by an LTO-7 drive. Uncompressed capacity is 9TB, compared to 6TB for LTO-7 and 12TB for LTO-8. +15. LTO-10 Premium cartridges hold 40TB uncompressed vs. 30TB + uncompressed for standard LTO-10 cartridges due to slightly higher + density and stronger, thinner, longer tape. LTO-10 tape drives + are not backward compatible with previous generation LTO tape + cartridges. .Ed .Bd -literal -offset 2n NOTE ON QIC STREAMERS From nobody Wed Mar 11 18:38:00 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWKHr5VQGz6VYwF for ; Wed, 11 Mar 2026 18:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWKHr24Vqz3lq0 for ; Wed, 11 Mar 2026 18:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773254280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XDHh9nyUJtGdqbr4y0auPBM9tNZWrlGD3BEFI1msBec=; b=YOeW8dz6Vngjb9ofr1+56Pfj5pVBTLd0Wr/9ctxZEHPqhAwMxfgQAOc4e89z7IPcaZYBf/ QlkCfbu7qSrsuGGpCMCQ8jhDRR5w4dvcKvyPJE67IGo3lXYQbJhy33nreyFEBk4sJKUcai NKdhJdeCGkvMixcDLaCapH8G7OLtHqLOVDDNQTN8Zh5Xr3bX+r7Wz0+bt9qxb10+G090I9 d3+YnBWuLnIaGeW+cd2UN+/f2Gl/B0gMmAERDOTbwWqxI6rLGDrvErKwuIUaSUXGaSXBjV u88PzZMm6VwVwfnUU/O5OxjYOzHKA+KpuO0acpB7S8DGjqwrYym0KhuT88MjBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773254280; a=rsa-sha256; cv=none; b=v4mgE3hkcAyZ4PEIbnguMPxBK1zhvOvPjOLsxjZNQTMYXw1vTNsZiN4zPD2QPznqzp2s4U RRRT7nBe9FQEAe6B1lHbv7aopYBA+ZZZDmVRHglinJVuaOTg7iKd+0I44jo/DW19r3IYKS CQMZspePyRhPYK8gAFDFGuLZ3lNiNMa9tBIzaVznKFonRbzQe+AveNS+xrqt3q6OPeh7VN BgpKi1beQf5rmaExq2qCRXu1PqNnGnntkrKgB1sNaJJ1/1IEeeOOhwhHB8pZuWGxXQEQ0X 7guWEhD38Rz+1Z8+UBXbGOppZ9PyH1QwIYAB4HxUDswq3Q8lCEsob1a0OkFf9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773254280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XDHh9nyUJtGdqbr4y0auPBM9tNZWrlGD3BEFI1msBec=; b=fwH60aRKfIVaa8g07aKucYaBqaUnKTAPV3ZokjWuA/wNsjFGJFOrx8F4xJvw/4XNCYCADi gwrCF12WJ0i8+Vdh7gKecGbFlDOr8u2mAWXttxwsEpYlV6RrFwYK28k9mzxXZPE2xcWu3B P//RQXMORiFTCn06d399SI0Tl6aCu5mfEvB9Ei3OpLMV8A8DyKq5ICmlEXHVY/U/MZeTyG JWoLhOj6Gw3RVXcdzyTxQovgr14tY7dx1KCBhjenktjVmz9xKSfxIFrNqVGH1ZfqIj6nDk se5aQW+c5izEbQOs6kt74CKFqD6pzVj7Th0PQk9U4d10dAWx86oBukNv6a247A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWKHr1GJLz19Ml for ; Wed, 11 Mar 2026 18:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21355 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Mar 2026 18:38:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kenneth D. Merry Subject: git: 5f55c59cbab5 - stable/14 - mt(1)/libmt: Add LTO-10 density codes and specs. 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: ken X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5f55c59cbab5b06a2fcb272b345ce94c48c01c1c Auto-Submitted: auto-generated Date: Wed, 11 Mar 2026 18:38:00 +0000 Message-Id: <69b1b688.21355.77a2a155@gitrepo.freebsd.org> The branch stable/14 has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=5f55c59cbab5b06a2fcb272b345ce94c48c01c1c commit 5f55c59cbab5b06a2fcb272b345ce94c48c01c1c Author: Kenneth D. Merry AuthorDate: 2026-03-02 19:13:47 +0000 Commit: Kenneth D. Merry CommitDate: 2026-03-11 18:36:26 +0000 mt(1)/libmt: Add LTO-10 density codes and specs. These were obtained from IBM specs and actual tapes/drives. Standard LTO-10 cartriges hold 30TB raw, 75TB with 2.5:1 compression. Premium LTO-10 cartridges hold 40TB raw, 100TB with 2.5:1 compression. LTO-10 tape drives are not backward compatible with previous generation LTO tapes. (This is a change from older generation drives.) Since the Premium tape is a new thing for LTO, we'll call this density code LTO-10P vs. the standard LTO-10. The barcode identifier for LTO-10 tapes is "LA"; the barcode identifier for LTO-10P tapes is "PA". LTO-10 cartridges contain 1035m of tape, while LTO-10 Premium cartridges contain 1337m of tape and have slightly higher density. (Obtained from MAM data on actual tape cartridges and the density report, obtained via 'mt getdensity'.) LTO-10 cartridges use a polyethylene naphthalate (PEN) film substrate. LTO-10 Premium cartridges use an Aramid (aromatic polyamide) substrate that is thinner and stronger, allowing a longer tape to fit in the same cartridge form factor. usr.bin/mt/mt.1: Add density codes and specs for LTO-10 and LTO-10P. lib/libmt/mtlib.c: Add density codes for LTO-10 and LTO-10P. Sponsored by: Spectra Logic (cherry picked from commit 930486f9be5c884d1d2f0aae9f81a3f5af1f2718) --- lib/libmt/mtlib.c | 2 ++ usr.bin/mt/mt.1 | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/libmt/mtlib.c b/lib/libmt/mtlib.c index 43f9c95bb797..7c3cdfa072dd 100644 --- a/lib/libmt/mtlib.c +++ b/lib/libmt/mtlib.c @@ -648,6 +648,8 @@ static struct densities { { 0x5D, 19107, 485318, "LTO-M8" }, { 0x5E, 20669, 524993, "LTO-8" }, { 0x60, 23031, 584987, "LTO-9" }, + { 0x62, 21657, 550088, "LTO-10" }, + { 0x63, 22441, 570001, "LTO-10P" }, { 0x71, 11800, 299720, "3592A1 (encrypted)" }, { 0x72, 11800, 299720, "3592A2 (encrypted)" }, { 0x73, 13452, 341681, "3592A3 (encrypted)" }, diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1 index fe5506107c99..bb9e0fedf7b7 100644 --- a/usr.bin/mt/mt.1 +++ b/usr.bin/mt/mt.1 @@ -28,7 +28,7 @@ .\" .\" @(#)mt.1 8.1 (Berkeley) 6/6/93 .\" -.Dd October 31, 2023 +.Dd March 2, 2026 .Dt MT 1 .Os .Sh NAME @@ -526,6 +526,8 @@ Value Width Tracks Density Code Type Reference Note 0x5D 12.7 (0.5) 5376 19,107 (485,318) C LTO-M8 14 0x5E 12.7 (0.5) 6656 20,669 (524,993) C LTO-8 0x60 12.7 (0.5) 8960 23,031 (584,987) C LTO-9 +0x62 12.7 (0.5)15104 21,657 (550,088) C LTO-10 15 +0x63 12.7 (0.5)15104 22,441 (570,001) C LTO-10P 15 0x71 12.7 (0.5) 512 11,800 (299,720) C 3592A1 (encrypted) 0x72 12.7 (0.5) 896 11,800 (299,720) C 3592A2 (encrypted) 0x73 12.7 (0.5) 1152 13,452 (341,681) C 3592A3 (encrypted) @@ -574,6 +576,11 @@ NOTES LTO-7 cartridge initialized with a higher density format by an LTO-8 drive. It cannot be read by an LTO-7 drive. Uncompressed capacity is 9TB, compared to 6TB for LTO-7 and 12TB for LTO-8. +15. LTO-10 Premium cartridges hold 40TB uncompressed vs. 30TB + uncompressed for standard LTO-10 cartridges due to slightly higher + density and stronger, thinner, longer tape. LTO-10 tape drives + are not backward compatible with previous generation LTO tape + cartridges. .Ed .Bd -literal -offset 2n NOTE ON QIC STREAMERS From nobody Wed Mar 11 20:07:35 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWMHG2WK2z6Vfx6; Wed, 11 Mar 2026 20:07:38 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWMHG1zgdz3yf8; Wed, 11 Mar 2026 20:07:38 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773259658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XubDP68q1RbKPJY2/1rcS3spT3pxZ2vD4Qq3M1O62Eo=; b=i81m2dgGriJqKY62HWBmoVfGRApR1oq6/RuTrhb//Piwkfmg/PGxIhskJQTdHq3w14DW/C yiauwnFmVGlQ7FYR5uKGkjOiRrOV//ySwRkK9hGjWaEC345a2zJK8f8VIaFBbScDTJNV+z aCaWDc4IUX20hjZp8qQre17382a/fAygZwB4fq5tdc2UyqDUaxPT2ZDjXj9QrfiokjNlma Hg68y0ieu8wdTQ25WduTTVqeKkbOCuLA50te4xenB59dlvqyNn5DsLR0ZQxVhIaUxkMAqk Iu/b4/Vzt9U8MgaI2xWW0plPPsfBBrnHWJSA5F37dqXoQc3hgnnrNX4R2ndjzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773259658; a=rsa-sha256; cv=none; b=nbbGLuANojGf+y+usTPIYjljZFBqZbIwsbwlppP8fqAx1YzIYEzlTcRYkGkshofS0B5qjq QFCpvJQbr6v21HGP14wN18piXqXSe9lyF9w1lm++P++/3ZSYbW7HT6lXbpDzijTSRhABIh AtldG5SgHei41a5YIJCDEstnVyRaCwHEa5bKtjZtRHyBJgXmRaWrhJy+2uoLvVW/WipEZR XXzfmbgKrtZJNl9QyA+W2baTkCnbZCiGUxSDGcK6bRkQfGo1g6uIsxOxcbC1QT0PVHGFy3 KwuqsyAYOQ8kI65quk7XCwAsrCFfAD08C/J4Rs9P2y+pJmQckz738C64Ah5zkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773259658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XubDP68q1RbKPJY2/1rcS3spT3pxZ2vD4Qq3M1O62Eo=; b=QI9qDSCLjKuJRlbKbgajhoaZLuRb1h4v9dFHIcz+PbEDVbmIT9UHAoIfc3xJfupnXSSjAK IJzWU0chLNXMZAwaxYGMJDlswXqcC3LOI1wxN/z8TgfYxARlILHLuPiE2M4Oh0MOAVbHSw r4MIyazBjVy8s7GCLsIxtc10yFyrB3wVAIvSvHlzo1X+zftyiR23mbKUNvHoFfRqaoeZrx Lmlb/T+N3hTToJFTJvxgNwQuOczpcKYYT45IVCOeOT2DJmz12FhXw10E687q+CV6n3XqeU F6kKPp8X7gUm2YmBHjVtsX4BtAl+rHA2vExdC2oaulzfmvc4OLL8+NQi8tqt3g== Received: from ltc.des.dev (lfbn-nan-1-698-103.w86-236.abo.wanadoo.fr [86.236.35.103]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fWMHG0WwnzqPW; Wed, 11 Mar 2026 20:07:38 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 16DE84810C; Wed, 11 Mar 2026 21:07:36 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Bjoern A. Zeeb Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: a1fd73b3faed - stable/15 - brcm80211: add LinuxKPI files and module Makefiles In-Reply-To: <69a101b2.20f4a.3331ae88@gitrepo.freebsd.org> (Bjoern A. Zeeb's message of "Fri, 27 Feb 2026 02:30:10 +0000") References: <69a101b2.20f4a.3331ae88@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Wed, 11 Mar 2026 21:07:35 +0100 Message-ID: <86fr663zaw.fsf@ltc.des.dev> 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: quoted-printable Bjoern A. Zeeb writes: > The branch stable/15 has been updated by bz: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Da1fd73b3faed190457a072ad71= 27a1a860b3e925 > > commit a1fd73b3faed190457a072ad7127a1a860b3e925 > Author: Bjoern A. Zeeb > AuthorDate: 2026-02-10 21:33:09 +0000 > Commit: Bjoern A. Zeeb > CommitDate: 2026-02-26 23:07:18 +0000 > > brcm80211: add LinuxKPI files and module Makefiles >=20=20=20=20=20 > sys/compat/linuxkpi/common/include/linux/platform_data/brcmfmac.h > is based on > git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git > e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). >=20=20=20=20=20 > Currently only PCIe is made to compile. > It does load firmware (if needed, e.g., on arm64 with an alignment > issue fixed), and starts to come up. >=20=20=20=20=20 > To make it work there is a cfg80211 layer and netdevice integration > to do, so do not hold your breath just yet. >=20=20=20=20=20 > (cherry picked from commit 902136e0fe112383ec64d2ef43a446063b5e6417) > --- This broke the gcc build (I assume it's also broken in main, but that's currently hidden by another failure in usr.sbin/bhyve): x86_64-unknown-freebsd14.3-gcc14: error: unrecognized command-line option '= -ferror-limit=3D0' DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Wed Mar 11 23:56:43 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWSMn429qz6VDwx; Wed, 11 Mar 2026 23:56:53 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mx-01.divo.sbone.de (legacy1.sbone.de [80.151.10.34]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E7" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWSMn1Z0fz3Q1s; Wed, 11 Mar 2026 23:56:53 +0000 (UTC) (envelope-from bz@FreeBSD.org) Authentication-Results: mx1.freebsd.org; none Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id BEDCAA64805; Wed, 11 Mar 2026 23:56:25 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 6386E2D029E7; Wed, 11 Mar 2026 23:56:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id 9TvkFEDftOLM; Wed, 11 Mar 2026 23:56:44 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 130CB2D029D8; Wed, 11 Mar 2026 23:56:44 +0000 (UTC) Date: Wed, 11 Mar 2026 23:56:43 +0000 (UTC) From: "Bjoern A. Zeeb" To: =?UTF-8?Q?Dag-Erling_Sm=C3=B8rgrav?= cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: a1fd73b3faed - stable/15 - brcm80211: add LinuxKPI files and module Makefiles In-Reply-To: <86fr663zaw.fsf@ltc.des.dev> Message-ID: <75r13n85-o23n-6250-o939-qqq1898pqr59@SerrOFQ.bet> References: <69a101b2.20f4a.3331ae88@gitrepo.freebsd.org> <86fr663zaw.fsf@ltc.des.dev> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 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: multipart/mixed; boundary="0-1535374699-1773273404=:11296" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:3320, ipnet:80.144.0.0/13, country:DE] X-Rspamd-Queue-Id: 4fWSMn1Z0fz3Q1s X-Spamd-Bar: ---- This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --0-1535374699-1773273404=:11296 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Wed, 11 Mar 2026, Dag-Erling Smørgrav wrote: > Bjoern A. Zeeb writes: >> The branch stable/15 has been updated by bz: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=a1fd73b3faed190457a072ad7127a1a860b3e925 >> >> commit a1fd73b3faed190457a072ad7127a1a860b3e925 >> Author: Bjoern A. Zeeb >> AuthorDate: 2026-02-10 21:33:09 +0000 >> Commit: Bjoern A. Zeeb >> CommitDate: 2026-02-26 23:07:18 +0000 >> >> brcm80211: add LinuxKPI files and module Makefiles >> >> sys/compat/linuxkpi/common/include/linux/platform_data/brcmfmac.h >> is based on >> git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git >> e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). >> >> Currently only PCIe is made to compile. >> It does load firmware (if needed, e.g., on arm64 with an alignment >> issue fixed), and starts to come up. >> >> To make it work there is a cfg80211 layer and netdevice integration >> to do, so do not hold your breath just yet. >> >> (cherry picked from commit 902136e0fe112383ec64d2ef43a446063b5e6417) >> --- > > This broke the gcc build (I assume it's also broken in main, but that's > currently hidden by another failure in usr.sbin/bhyve): > > x86_64-unknown-freebsd14.3-gcc14: error: unrecognized command-line option '-ferror-limit=0' This is not even hooked up to the build; how can it break anything? -- Bjoern A. Zeeb r15:7 --0-1535374699-1773273404=:11296-- From nobody Thu Mar 12 01:38:53 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWVdT4dC1z6VMWl for ; Thu, 12 Mar 2026 01:38: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWVdT28WCz3Ytp for ; Thu, 12 Mar 2026 01:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773279533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0XA+/r427joDZ4n76cS239UQn8yhSoP9KEK0Kn6P5xs=; b=yk56C5xLuVbEJUUjPt8Li0IWxHvMbwiE0iXtqg40IqcIrMiYwUrRvxmLk35uR7EbbSsLsU 2jmaFmFxduu3Qbfy7XHsMJNJq7jdYZf82gYhPMgj0JkJ/jD3WEI5D6kFy552wiI5r+/kD0 RFqdiiBBCEJyFkCM1mQggaAKRjxYyQSKWSeghnMuxCp1VtwUrhpt613GFv4jppc1KCj2aH PcFAC3q2Dzd6wlw5xNRNL66KKnaMzoVWnS7nOraExTX9M/kvO7FMdN3RpznyZ7O6lBGH79 KlMKZGY5MBB1tBpXPZ7uI3t2YjbO2Q7sCDCOH9Adv9meONT2lYPY3DSHgsi+pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773279533; a=rsa-sha256; cv=none; b=q8mMMNDcSbilXVRh7aK/1C7PbPGQUANWs+e+avFkVFwy+HVvRJIgOSeRiLdgdmgEv7/eX9 HKjF8EejGujKC+3RWwwzlRYbqvKDBDiEigZK+kqW34gCl62QEM+aghCNaCpQ9JRGg89ehA 3OaX1hfdg7D2dDgqEUtxY0MGgCx5TfxjQe7DR6OXdctM72g39Yql+zkyh2A796KJd9kSai bNWHy5W5jybPZD62Nwf5gLURYrU/aI9j7yxXELyo92gsxgdpuX0f5tS0qGcTr+ixFsMzVo pNHNTGD+CiByca2hif20RpmiqTiUySXnG7Gbp5nrcIVQKiWjVmLsmzruIS7A/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773279533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0XA+/r427joDZ4n76cS239UQn8yhSoP9KEK0Kn6P5xs=; b=o+2QPBdPhrjfKgmRDitF0CZVqfHr6jSKA01cwICbWAx1xq3aAa2t4bDyARR4M0w3EidNmo HoqlOdzU5fi3fGFEX8m2+364fsBJomuRgnaLiuD7SJYvR+J48VD5Elw+VSGvIgQrgzeyNS 8xYWA5rs25WVwN4ZYl40u3R6U4bqWv1s67M6osZ+sVfOV3L3gSscbcjHtq2GI6afnDWGkB IUxqcM5vCf537H8MU5fqAEY82zX9QAe2VrJMLKruOutP2Rzzrlp3Ni89eOFpdtLco8etNf bSsGf4tDnceVzcj/qWJ5gXe9yf1ed8c8BHJ48ZaUNm2kqRIzCO0M4iU8xoUO2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWVdT1J77z7gh for ; Thu, 12 Mar 2026 01:38:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35f06 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 01:38:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 2a3d650552fc - stable/15 - packages: Don't create empty packages 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2a3d650552fc1a48c89e3d6d8e77f64ad53372ed Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 01:38:53 +0000 Message-Id: <69b2192d.35f06.575528de@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=2a3d650552fc1a48c89e3d6d8e77f64ad53372ed commit 2a3d650552fc1a48c89e3d6d8e77f64ad53372ed Author: Lexi Winter AuthorDate: 2026-02-21 20:19:42 +0000 Commit: Lexi Winter CommitDate: 2026-03-12 01:38:01 +0000 packages: Don't create empty packages If a package plist only contains directories, but no files, do not create the package. This fixes an issue where setting "package=foo" in mtree causes the "foo" package to always be created, even if nothing else installs in that package, because the mtree entry is always added to the plist. This most often happens: * With architecture-specific directories, because mtree can't install a directory conditionally based on architecture, and * With packages that are completely empty when a particular src.conf knob is disabled, because mtree will still create the directories. Although it's theoretically possible that we might want to create a package that only contains directories, there are no such packages today. MFC after: 2 weeks (stable/15 only) Reviewed by: manu, des Differential Revision: https://reviews.freebsd.org/D55412 Sponsored by: https://www.patreon.com/bsdivy (cherry picked from commit 7965c93e4d4103ba6ed7ac1e5f1599c93cbcdbf7) --- Makefile.inc1 | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 0af5c38f0489..30d37e6bd2f5 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2277,17 +2277,24 @@ create-world-packages-jobs: create-world-package-${pkgname} create-world-package-${pkgname}: .PHONY @sh ${SRCDIR}/release/packages/generate-ucl.sh -o ${pkgname} \ -s ${SRCDIR} -u ${WSTAGEDIR}/${pkgname}.ucl - @awk -F\" ' \ - /^name/ { printf("===> Creating %s-", $$2); next } \ - /^version/ { print $$2; next } \ - ' ${WSTAGEDIR}/${pkgname}.ucl - ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ - -o OSVERSION="${SRCRELDATE}" \ - create -f ${PKG_FORMAT} ${PKG_CLEVEL} -T${PKG_CTHREADS} \ - -M ${WSTAGEDIR}/${pkgname}.ucl \ - -p ${WSTAGEDIR}/${pkgname}.plist \ - -r ${WSTAGEDIR} \ - -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} + @if [ "$$(grep -vc '^@dir' ${WSTAGEDIR}/${pkgname}.plist)" -gt 0 ]; then \ + awk -F\" ' \ + /^name/ { printf("===> Creating %s-", $$2); next } \ + /^version/ { print $$2; next } \ + ' ${WSTAGEDIR}/${pkgname}.ucl && \ + ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ + -o OSVERSION="${SRCRELDATE}" \ + create -f ${PKG_FORMAT} ${PKG_CLEVEL} -T${PKG_CTHREADS} \ + -M ${WSTAGEDIR}/${pkgname}.ucl \ + -p ${WSTAGEDIR}/${pkgname}.plist \ + -r ${WSTAGEDIR} \ + -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR}; \ + else \ + awk -F\" ' \ + /^name/ { printf("===> Skipping %s-", $$2); next } \ + /^version/ { print $$2; next } \ + ' ${WSTAGEDIR}/${pkgname}.ucl; \ + fi .endfor create-sets-packages-jobs: .PHONY create-sets-packages From nobody Thu Mar 12 01:38:52 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWVdY5tfMz6VMmT for ; Thu, 12 Mar 2026 01:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWVdY3YMnz3ZB9 for ; Thu, 12 Mar 2026 01:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773279537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2uzEif/6mhM1Wzz8t4trXDUjymapqZMKBrX7HFnhS3g=; b=RIrd9mkb8mZrGaZTZHpf67W/QMSpLuZtD4XWuHtKuNVxboBKDc62TmAapuZYFoGWKQnCmx HFR6XpGTgiAfMGqDQ+NPNjy4HAKR1q/WS4hGFIXVQflZ3ZdObBsYIWtrHToZD7jqYeXcgb QesiU0Ip7Qabp8P84bADUF2GvoUEvjmsAWwhF3HrswDnb31m+Dz5p+QKWQhIYtjvus6dTh Upkxe/ldVU6erR/ilXPJyDi6dG27OeLaeess2ngsh9/+DfbPaqdaQ06iTi8tHmEwwWqzWR vTvLUWLctGD/m0gugt8LZ2jN6473MTdnPdEWS4DHNFYbwikxf1qN+uRgb770yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773279537; a=rsa-sha256; cv=none; b=cfHcIt49aHr1jlJ1rHt89vO6AKsErqW8EEojTcub8/J379wlspqT3EXc0TGWdJsrNtU7qb 0tnemAhzmX6oFPq7xJ5NT3FE7JwmfAnXI1Pyn+FfmQAijOmAsNJ7iIXaC0yuzqypLH2Qu8 H+i2egebRFT0+qe8TEOUEatJu2KamgD6Z19wuhs+PIVJjHpqaOwhA8emboZhxY7g7MqOEn zcNK/TIWAbCFKl+FTPM1H/HnJWYUJrQMatWa4MKiXGg9LKwR1/T3m/7xlz5BRCwZOsSmU5 LBxN3+94qbW280NP6aaTDfndf4wcNxetio6P1pD/j1SCCFt9oRG5c4r/nxL6Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773279537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2uzEif/6mhM1Wzz8t4trXDUjymapqZMKBrX7HFnhS3g=; b=v5xe762RfKO5o23jfvFVe+UazzzP6+ICvNmAPTPon8Z2wTnOIhsd507B0wMsILJE9ufYr3 7YLOvlOQ1Lt26Wj1z2J1FWhJBA2Hyv4UZdrrQGcpmH29qWOHwfPTV7PmCbAHwDBkiUndke ngqEtyrb/kydHCQhtYX+9ojpUUForpjoOL5bW5FeS2Hmnp5GuypeA0dD+T6RV8WWveHULU vpD3B1uXruMCWkVn6E/er3vMAs0QtcaPd/Iv8QGVwXj6dhrC0wKyZXGoTn9VGvmDA06VaV JnWROze2FWdnD+RJjz6qmR3PxnouLekgMNgDruH8o4pLKHVAnGrcYl4V3fPFxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWVdY25Sjz8Cn for ; Thu, 12 Mar 2026 01:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36094 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 01:38:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Warner Losh From: Lexi Winter Subject: git: 1346ffb457d5 - stable/15 - Makefile.inc1: Remove svn support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1346ffb457d512323940d3d9dd18776539bf0087 Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 01:38:52 +0000 Message-Id: <69b2192c.36094.4099b240@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=1346ffb457d512323940d3d9dd18776539bf0087 commit 1346ffb457d512323940d3d9dd18776539bf0087 Author: Warner Losh AuthorDate: 2025-10-05 14:25:06 +0000 Commit: Lexi Winter CommitDate: 2026-03-12 01:37:38 +0000 Makefile.inc1: Remove svn support We don't need this, and we don't use this. It's left over from the svn days. We stopped supporting svn as a project entirely when 12.x went EOL. And VCS_REVSION isn't in any current ucl file or anywhere else in the tree. Sponsored by: Netflix Reviewed by : kevans, brd Differential Revision: https://reviews.freebsd.org/D52912 (cherry picked from commit 28b858f5059c8b25fa08be494699997000fce58c) Makefile.inc1: Add back missing if The .if defined(_MKSHOWCONFIG) covered an unusually large area, so it should have not been removed in the last commit. I must have tested in the wrong tree before pushing... FixeS: 28b858f5059c Sponsored by: Netflix (cherry picked from commit 106951f09fe39dc693fd7130ab4bc751e1438631) --- Makefile.inc1 | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index e65021c356c5..0af5c38f0489 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -523,25 +523,6 @@ BUILDENV_SHELL?=/bin/sh .endif .if !defined(_MKSHOWCONFIG) -.if !defined(VCS_REVISION) || empty(VCS_REVISION) -.if !defined(SVNVERSION_CMD) || empty(SVNVERSION_CMD) -. for _D in ${PATH:S,:, ,g} -. if exists(${_D}/svnversion) -SVNVERSION_CMD?=${_D}/svnversion -. endif -. if exists(${_D}/svnliteversion) -SVNVERSION_CMD?=${_D}/svnliteversion -. endif -. endfor -.endif -.if defined(SVNVERSION_CMD) && !empty(SVNVERSION_CMD) -_VCS_REVISION?= $$(eval ${SVNVERSION_CMD} ${SRCDIR}) -. if !empty(_VCS_REVISION) -VCS_REVISION= $$(echo r${_VCS_REVISION}) -.export VCS_REVISION -. endif -.endif -.endif .if !defined(GIT_CMD) || empty(GIT_CMD) . for _P in /usr/bin /usr/local/bin @@ -603,6 +584,7 @@ EXTRA_REVISION= p${_BRANCH:C/.*-p([0-9]+$)/\1/} .if !defined(PKG_VERSION) PKG_VERSION:= ${_PKG_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} .endif + .endif # !defined(_MKSHOWCONFIG) PKG_NAME_PREFIX?= FreeBSD @@ -2299,9 +2281,6 @@ create-world-package-${pkgname}: .PHONY /^name/ { printf("===> Creating %s-", $$2); next } \ /^version/ { print $$2; next } \ ' ${WSTAGEDIR}/${pkgname}.ucl - @if [ "${pkgname}" == "runtime" ]; then \ - sed -i '' -e "s/%VCS_REVISION%/${VCS_REVISION}/" ${WSTAGEDIR}/${pkgname}.ucl ; \ - fi ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ -o OSVERSION="${SRCRELDATE}" \ create -f ${PKG_FORMAT} ${PKG_CLEVEL} -T${PKG_CTHREADS} \ From nobody Thu Mar 12 13:44:19 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWpkX0cQhz6VM6B for ; Thu, 12 Mar 2026 13:44:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWpkW6zhcz3lCt for ; Thu, 12 Mar 2026 13:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773323060; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PI4PB3H9mpI6K1Itg0PmFKq6autbkQRVJgKClbNjez8=; b=uY0nni4SRklZWJ19UYHCz4GLifNv/hDC0YS1c7P05qgwL6q77M1rT86NQMVY7vxVgrU3GU I0pc4iFQOkMERlandiRdmiNaW//+Qzo0BjXdyBCLDt1+WWBoPElQ3S6jn6VDdouz+x7mpn 1sGU+Xv7StSfFSauXVkhcNBAybGEaVb11nFEzJ37pjuxJJwGHA/6DueSVJ0LQ6Vjua3BWJ LEGPSpDAGwR5mIlN5Uk2ff2S9FD3qfruMfuBLsmFUyHz92hOEgZXdVzlAhnohpWY/BLyiK NHUQWjk2C4TkVJ9c1pYJyPN+PG5hPfZrBlaxdMzn2vXPomx9M2fBsweKD/K8WQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773323060; a=rsa-sha256; cv=none; b=jecQwHnRvSd3oEQPiDPyjJrBECPEgmd2R4XhOmB1+/oPHUijhKphajyEB+kQ5bKS80SRUo SFXW401gkexKGftJHKtmuOsLtZdAYECZOKWfjEVpa/QKF1+HvMmZe+CGRopOp0tAbKWZNX HqNXnhAb5444MkorhBm6Vlyxbg8YKne75H2kXW27THkfb5rRgWnSJzpj8YAji3Pkw2jcXD S+3csHHaRwVqlx+YGd9RPFMwse6QG96tRYna55HPjIQWp2MahC+ENPJSrWmfZ8mJS9jgve Nmg+4ypRvt0JFfYeX/kaqg3sygr2ojkA7nkYreHU0Gcfeq0+JGiXbbe1U56Zjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773323060; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PI4PB3H9mpI6K1Itg0PmFKq6autbkQRVJgKClbNjez8=; b=U6COkOT6GAfeaojkDgvPYksVlvSd0poHhToHSQelJIKgql3snVOxRaxEXO9qDx0S6ru5zE PfTeMTeR+btbpMxxCu0zkMPUVkui7laJE7YaGY0x3f5sI7ei3Y3oAHstDTlHjmNzgzZplZ jejjk1XAvU2x3/9Rr7cHC2eTOqGOegVEmDqeVLFMTraXJQXZD2GgGXrOBhEU+YDsrzKscf Y2sj8ZKRfDJaRqbJuhIqHZqsNsI2IyNs+pPZpAvi0Jw4TK8kz0aJfWFce06/Z3J5Ebv4Hy fJ/uZ4WWwnyO/ZtuMF7NoTDO8kiHYHC8TZDZOoTsW9zVldh0PTZNPhXVjxbtog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWpkW6WCbzndf for ; Thu, 12 Mar 2026 13:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3208e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 13:44:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: d74dfe03ba98 - stable/15 - camcontrol: Add SPDX-License-Identifier tag List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d74dfe03ba98d9cbb1607f94c3992b4355987fa0 Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 13:44:19 +0000 Message-Id: <69b2c333.3208e.9ce9f@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d74dfe03ba98d9cbb1607f94c3992b4355987fa0 commit d74dfe03ba98d9cbb1607f94c3992b4355987fa0 Author: Tuukka Pasanen AuthorDate: 2026-02-09 08:12:25 +0000 Commit: Ed Maste CommitDate: 2026-03-12 13:43:57 +0000 camcontrol: Add SPDX-License-Identifier tag Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55269 (cherry picked from commit 25ed5ee654a8cd7d9f694307c62bb84ff4d16866) --- sbin/camcontrol/camcontrol.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 1b27ad3723dd..7ad177c3e4b6 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1997-2007 Kenneth D. Merry * All rights reserved. * From nobody Thu Mar 12 13:44:18 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fWpkc3MG6z6VM5R for ; Thu, 12 Mar 2026 13:44: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fWpkc0mgKz3l38 for ; Thu, 12 Mar 2026 13:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773323064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fyZUV8MSaEUGxFgf9s6Xl7Vr+5DE2WUze3yfpdonJw4=; b=wpmQCakM8Ieok4XOqRtW8AqVGnUxuLNs8tYQ5OTlMqEes9SJjIg813lEWrDss2YuXTKHDL +JyyGVbkg8YQDOE583qSurOhyBylhe9nwXIoSWQR46ZepicISTBk2OkWcJtB/Jsd1c6H5h mQNq31a1aqL+NGH46VG19YwnU+pwIWi6Wkh7wRF2IobE8woYq1bjRsFcQOtgAyYSwpoe4E CyYMRSE5JvODwBmfYigR0yNL68YGsRAMUU/2rVVSUckr7Kem8WTH5g/IKNprCJPY5Wmfyt OCGjxU4yV6viPqXJawlj4US6GvjkRxiu4op41/bIRwcN+WR/k0rMpfymb0uiPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773323064; a=rsa-sha256; cv=none; b=sBTgX/v3hljZmW5J8gV9+qbvPusHImwwOSup0v+voa2vY1GCCwrf/RayztAjin6QwlxyCg oP/0hkewjXF8fAn7xdMd1hwJ/EfPJEpF4L4Xyyq8EXFXLr7tZtHutQ+OGxNPpKYhRRUDPQ fRr0ySQlhjAWtycWBxCi7xd7c4UZhqmmoCSyIA5LBYOLWKGE+ZvbGGYbLjnuoNw+tRRZG/ 7AC58myrFGh4GaOg6v+myKNlHmEGKQmNXxgxjJ42jI14/yr4rrPrvZfNQ1lkPNLKQiYRCl XhOH2saBU8C9i3CWxgq0djWfLr1X4RDo636JZBpv+87EwEh/SxOrPvdV2pr99Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773323064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fyZUV8MSaEUGxFgf9s6Xl7Vr+5DE2WUze3yfpdonJw4=; b=gY2hDnkQxX2+BnREUt1F6smYRhG2TTB1Da7K9lYvmwTVvRCdScUx6WnXn0lxaGLJvtPGKj NN6NVtyMn1BiIn2kitgQPzl6HMeJ+EHJ6U2gs052EAyWy7UrNZdzW44EWp2CR72nQHLrtV wOByOz/DSx+S7y3qLNjX3DF8gLmrzBLtwx6ky5ZHlsDbS5DWtFLLnPIimWGm/jGsdgIgwa eopG9YJ5rz+Z3S5v0kFnmuO4MUTUH2gmOX8rDnRcMKMfgm4q1OCLVu0KRRXg/2caj7V+q4 5S90z7GWtdqxdY8l2SfJKZNhmr/jQoAlZB/2PlPuLWmpJByIm+WOjD68xMGF9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fWpkc03sBzndg for ; Thu, 12 Mar 2026 13:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32df8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Mar 2026 13:44:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dmitry Lukhtionov From: Ed Maste Subject: git: b1d4b8379f92 - stable/15 - camcontrol: Print 'transport revision' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b1d4b8379f928259b50b3db13972a9a47a345892 Auto-Submitted: auto-generated Date: Thu, 12 Mar 2026 13:44:18 +0000 Message-Id: <69b2c332.32df8.203ea0c4@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b1d4b8379f928259b50b3db13972a9a47a345892 commit b1d4b8379f928259b50b3db13972a9a47a345892 Author: Dmitry Lukhtionov AuthorDate: 2026-02-23 14:42:59 +0000 Commit: Ed Maste CommitDate: 2026-03-12 13:43:38 +0000 camcontrol: Print 'transport revision' As described in Serial ATA Revision 3.5a Reviewed by: mav Pull Request: https://github.com/freebsd/freebsd-src/pull/2044 (cherry picked from commit f4f9054dc47b430872d38c7a75fea753c6fe796f) --- sbin/camcontrol/camcontrol.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 15a5d42a2ba5..1b27ad3723dd 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -1672,6 +1672,35 @@ atacapprint(struct ata_params *parm) } printf("\n"); + printf("transport revision "); + if (parm->transport_major == 0 || parm->transport_major == 0xffff) { + printf("Unknown"); + } else { + if (parm->transport_major & 0x0400) + printf("SATA Rev 3.5"); + else if (parm->transport_major & 0x0200) + printf("SATA Rev 3.4"); + else if (parm->transport_major & 0x0100) + printf("SATA Rev 3.3"); + else if (parm->transport_major & 0x0080) + printf("SATA Rev 3.2"); + else if (parm->transport_major & 0x0040) + printf("SATA Rev 3.1"); + else if (parm->transport_major & 0x0020) + printf("SATA Rev 3.0"); + else if (parm->transport_major & 0x0010) + printf("SATA Rev 2.6"); + else if (parm->transport_major & 0x0008) + printf("SATA Rev 2.5"); + else if (parm->transport_major & 0x0004) + printf("SATA II: Extensions"); + else if (parm->transport_major & 0x0002) + printf("SATA 1.0a"); + else if (parm->transport_major & 0x0001) + printf("ATA8-AST"); + } + printf("\n"); + if (parm->media_rotation_rate == 1) { printf("media RPM non-rotating\n"); } else if (parm->media_rotation_rate >= 0x0401 && From nobody Fri Mar 13 09:14:19 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXJhW6jvPz6VlyT for ; Fri, 13 Mar 2026 09:14: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXJhW43P5z42v7 for ; Fri, 13 Mar 2026 09:14:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773393259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zo0vajsmId85Mrux7jTYSe4CD/8+GSDiwNrNq7j8Gy4=; b=d2SpCyu7BJ5Miwf/whShQIn0kxPJeUHClC/JIJGpvYFkhhmYvdeb9wZhWe/GxqFyyCJ8Aa s0Yxvbj0kPfofjxSa3WXKG6h61bkF3BA3xf8VoRPzdfWBI43ivLYpen1gyL/fsMsoNUGf9 jFU7UhmHdGj7/sX0fjQwI1LqLKdCM5HZZAaE9M6kQqY4yPkXERZcbOLZEHqSglTZyBszBR HSR76RIeimTnNE6aMqabr2v28UkUwKo04z8chHGsbdJ/TqIEgsEhFY3PDWsj9Bl+PQjRDa /eMdkyLs9Zl2R4fG4IPjzpxXLjse6ETzaegaoD8OsXn0P3TFH67Q7ov3ZS//oA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773393259; a=rsa-sha256; cv=none; b=SQsrCnElsorJTCxZNFrbwRPotNlDm5JQEsKED/2Mf/QQyvOz/g01NIWhOWbVCw7kXZIE1C jqK2kc7yCEpAwMoY7zMtwujWBcyPPEfnLMrHsG8mNIaoBclvQ8u+SQDzzUtzRKeUqW4f/o LjLXOa3Dafs3ztKSlMlkjVXMcOrnqqkGz0xmTXuO8ltYYiU3IK/XcTxMVIcHFX0pvpTiQs VLipoAT/SoNj03fV+wKs+621Ir2UVXxeL2bY3HP/MX0otUef3vZvBM/a/GaSz/BJyGoiI3 E6zywSoeYaRF7AOBnF73uuwTGx0JbjSeYMUjV7A4La9YLEy3yZfoboS5AdOClw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773393259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zo0vajsmId85Mrux7jTYSe4CD/8+GSDiwNrNq7j8Gy4=; b=e72UWlExB7rJVzuOhgiahC4a/4ZXQQF9hF/fgTalm8ZH1db4bWPm1CSx56A+/Ld3DSbTJ5 lkJaHT1L8iXx9ry+HULTwWzuO9tIGuRbvvgbxjGhk8n39zG+8BeCJ9uHimiE744DlFTzUb SpMFhQMdmLX/qQzVWMajbQVHTXjk7cDwzfIfmLL8WIp/pDeaXJwKzHBZJt4OvVAbC35lRx 49khJ9Bm6+NZUGmUNXw93E9XBpZ1BcY3mceZMvesoOqGf9Bc3ISPynDexpyM3ob7RQAMiW A3TdZkZYVZX4CbcL0eM+Tkwi4roYxDz/oBwoWRXcBDaxGXqPjxsbxGRP6HHegg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXJhW3FRrz9jw for ; Fri, 13 Mar 2026 09:14:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e47a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 09:14:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Juhyung Park From: Brooks Davis Subject: git: 3abef030d31a - stable/15 - Set errno to ENOMEM on rallocx() OOM failures 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3abef030d31a9837ac7ba45bd8ee17340fabd120 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 09:14:19 +0000 Message-Id: <69b3d56b.3e47a.5e9a8fcf@gitrepo.freebsd.org> The branch stable/15 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=3abef030d31a9837ac7ba45bd8ee17340fabd120 commit 3abef030d31a9837ac7ba45bd8ee17340fabd120 Author: Juhyung Park AuthorDate: 2026-03-03 09:59:33 +0000 Commit: Brooks Davis CommitDate: 2026-03-13 09:13:08 +0000 Set errno to ENOMEM on rallocx() OOM failures realloc() and rallocx() shares path, and realloc() should set errno to ENOMEM upon OOM failures. PR: 291677 Obtained from: jemalloc (commit 38056fea64c34ca4fef0a16212776eaa4de80b78) Fixes: c43cad871720 ("jemalloc: Merge from jemalloc 5.3.0 vendor branch") MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/2059 (cherry picked from commit 5583b64f230fe0ea4e3d4bf4566205b521190fbb) --- contrib/jemalloc/src/jemalloc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/jemalloc/src/jemalloc.c b/contrib/jemalloc/src/jemalloc.c index e4b183d1a24d..352c18870e0b 100644 --- a/contrib/jemalloc/src/jemalloc.c +++ b/contrib/jemalloc/src/jemalloc.c @@ -3561,6 +3561,7 @@ do_rallocx(void *ptr, size_t size, int flags, bool is_realloc) { return p; label_oom: + set_errno(ENOMEM); if (config_xmalloc && unlikely(opt_xmalloc)) { malloc_write(": Error in rallocx(): out of memory\n"); abort(); From nobody Fri Mar 13 09:14:20 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXJhX5qQhz6VltY for ; Fri, 13 Mar 2026 09:14:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXJhX4qYgz42rg for ; Fri, 13 Mar 2026 09:14:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773393260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YuTBFQZshrXZwV9xx5nNVNJQf8WE7HSwOFcvGFowDo4=; b=vFkEZVOCafaAaDq/2f65L3PPgfRo2AOZSZjhNf3xi0ODtwvDKX7ptGMyTt3ay4hb9/BETU EDGX2kEH7YXYRGtAPMkyMmmfivKKS5UQgCb/CxQk+NLwcd7tRVxs/QNOVS1epPg7dDYxlN Qmaamep3QEXnzRZkZ2Re5mnGPfPnU3lHJVA6eMqE96K5kOj0efqKz8BRNerY2DLaSdewfv ODThRqlENI4IiGI1GBNVxKhtmMtbb39k8juhFGirmvhxhtuMveT6q8f8XebogRSKSqp0Ik uwq21MAsjIdvl5jcxCXxDF7bUe6P4sxVok8n2w80QI5FJpCH4bOMlortTUTVTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773393260; a=rsa-sha256; cv=none; b=KTSxk+nZgoRusD76UVwh82kI1YmbYd+QOs/x8i0H5dz25QaTUjpiZigyh6jj40EnqDL+T+ LK0DtQUlOQ4Nd0lZyVgBTl0r6v5CWK1mOz7rPvf7ZX+ZIXGlXLi+PBFy7HLPddZ5jNvAqN UvsmH3BpqfTIkaOS1C0AZxxfGuZEIcmINHBjdgFaSFiEQhrKus2BzgkDN4mQhFaoHXbHMy IDc1fHTtne5zWe8l2PzjWwcRWDkP6Ug2gvgCw1ytLrU8fnc84mQNRDGtwEOtyfsf4xtU4g cNdBek52aATx8/yRKZs9ciVPkNzUSzOr/sIlkTYgiTDoMCOSE9UV+kQsNi1t7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773393260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YuTBFQZshrXZwV9xx5nNVNJQf8WE7HSwOFcvGFowDo4=; b=AAEenDIO5DpaWz6FLG90xwHAe6qjQfzmCvOK8DY6cvRPzFcidX2BKH8/YCYeM+cYnGgg6I GISKuuzsX+E92VdkRfr3f6Arakb5svMSrH6Jq39WIY+xlU6CEck53G1+hc+TBMsyUMUdFi 1iVyGaPqF+058VVt6phzMO9shcFNeLmaUJbzWM8bkICCAr34w3W55VOr2HJNczncESlX+T //+c8aSdEJtPOJzNvtR92oOJ/j3sMaw5o5d3EIeBmGhPYPemR9VL3DZ4+oZJDIEQ0j337v 3EucqVGSJLU+iP+fu7bs94BkqIipKWb8fNTtZV4Goljtu+k23YgAQFWDMrnQRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXJhX44P3z9jy for ; Fri, 13 Mar 2026 09:14:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d5bd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 09:14:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Qi Wang From: Brooks Davis Subject: git: b4d8d9bde083 - stable/15 - rallocx path: only set errno on the realloc case. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b4d8d9bde083b466bc0728c6400cf5e6439f44e3 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 09:14:20 +0000 Message-Id: <69b3d56c.3d5bd.33fda24b@gitrepo.freebsd.org> The branch stable/15 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b4d8d9bde083b466bc0728c6400cf5e6439f44e3 commit b4d8d9bde083b466bc0728c6400cf5e6439f44e3 Author: Qi Wang AuthorDate: 2026-03-03 11:55:23 +0000 Commit: Brooks Davis CommitDate: 2026-03-13 09:13:16 +0000 rallocx path: only set errno on the realloc case. PR: 291677 Obtained from: jemalloc (commit 83b075789b4239035931c1ee212576d00153bbf0) Fixes: c43cad871720 ("jemalloc: Merge from jemalloc 5.3.0 vendor branch") MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/2059 (cherry picked from commit 2c5cd07828ad76c332e3bedc29fc641809e85396) --- contrib/jemalloc/src/jemalloc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/jemalloc/src/jemalloc.c b/contrib/jemalloc/src/jemalloc.c index 352c18870e0b..edf23b9801b4 100644 --- a/contrib/jemalloc/src/jemalloc.c +++ b/contrib/jemalloc/src/jemalloc.c @@ -3561,7 +3561,9 @@ do_rallocx(void *ptr, size_t size, int flags, bool is_realloc) { return p; label_oom: - set_errno(ENOMEM); + if (is_realloc) { + set_errno(ENOMEM); + } if (config_xmalloc && unlikely(opt_xmalloc)) { malloc_write(": Error in rallocx(): out of memory\n"); abort(); From nobody Fri Mar 13 11:49:30 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXN7b1FYQz6V01F for ; Fri, 13 Mar 2026 11:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXN7b0PlGz3Lxm for ; Fri, 13 Mar 2026 11:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773402571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mbs0a5nq1cw/NJ+vQInAyAfRZaCVK9JYgysT6t+x+Lk=; b=kcI4fGuqsEdpe7SGsyvKV/35xEC33QrbyLe6ZJoLEX/N0VsmVNzrnRktGCeFfA0HRFo7am 0/HibjXKF0wviQzmnsMU5ahoEdrMdZ99EijGsCqWSyd/HRatyW7j9vTKDCh1TVNwME08gD FomcGK5G8yALEt1rdCjEBQPOxw+NcIx6GSwiQc4i86kW+yCaLE7Q1MGYYyno1K8wCM6lHd tnLgIJrIuwFkcdsiLd31fVZlRFUSZJmvy625C1l2LpGaIb+gpOgDLBjk5COXlxQ2piucFO +PrGSePtXVw/ScYJL7mBKiEaS/zkemuRpI4O7j1H8wExVIb9MMTvPEQ1aQ219g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773402571; a=rsa-sha256; cv=none; b=qfcdUfcVmxVtJ2bOXPapz5ZAYpIil7QDvFcSMD7haLO486qVou0Ltz9GJcCNs+bPgd9Zn/ G64+p6Lr65g/CN0veSbZ3Bfq3RbmWJqBuNW/ZhTo00m75d7jkugE2m0ky2leCVdpQQKzvU wEnx7+nKJrFw1PaxGZ/EEm3bxcimIs6qNsSSat4nBRvEMlhBkFFK5CEas+0k4KZLmNQdn/ Laks/y9aRjLlODcP0IdT00tCFGLB1tSWYqFt5pIl4ys+Oq5+cPLpG0nKThurQYMOAhVe3+ 4GrDuEeKY3C9CvQzxMXCaQgzqHCXygSRdduX5+VKcw74HcIAazwsuQ+1BlSTXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773402571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mbs0a5nq1cw/NJ+vQInAyAfRZaCVK9JYgysT6t+x+Lk=; b=GXkl17YdAzVQVLZIvjvFD0QRFiqdQfLKc7Dyvg262NCRODHxHhFbnc6p4sADEVeDs306Di ekB41BQduF/dmDjOrFAyXZblm/bfm+upSG6x1GSv3b9CLLe4qBcRa+P+fvDE/kZDAWtd+g ZgXm5jiLk9qEgDFnOwoLCG5U38Sn3fn2jIPEmcxxjBHtaTXgRBMxZ87W7tfrH6fNqSapXG jYrK9uq8xkX0dHkamMOYunAbMSe/jO6sAra2ua7C6oUDcXIY9ZMEPoPEHgJxTt5Ex7Kl+i yGTlvhG2YF1+YTmoOnYI9Q/8k89blCZ7qJ7EvlFrelnz2aswomV/8BqU0ZUHQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXN7Z71YVzVX6 for ; Fri, 13 Mar 2026 11:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e560 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 11:49:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 63888350d583 - stable/15 - rc: virtual_oss: Silence potential hw.snd.default_unit error List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 63888350d583e370814abb5c078244cd8ddf8eeb Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 11:49:30 +0000 Message-Id: <69b3f9ca.1e560.52f56552@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=63888350d583e370814abb5c078244cd8ddf8eeb commit 63888350d583e370814abb5c078244cd8ddf8eeb Author: Christos Margiolis AuthorDate: 2026-03-06 12:27:03 +0000 Commit: Christos Margiolis CommitDate: 2026-03-13 11:49:23 +0000 rc: virtual_oss: Silence potential hw.snd.default_unit error PR: 293582 Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit e85f221def717660c9daf4c0616dfb9cdfb75827) --- libexec/rc/rc.d/virtual_oss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/virtual_oss b/libexec/rc/rc.d/virtual_oss index 42353a6c1520..d55b51463442 100644 --- a/libexec/rc/rc.d/virtual_oss +++ b/libexec/rc/rc.d/virtual_oss @@ -24,7 +24,7 @@ required_modules="cuse" configs= pidpath="/var/run/${name}" -default_unit=$(sysctl -n hw.snd.default_unit) +default_unit=$(sysctl -n hw.snd.default_unit 2> /dev/null) virtual_oss_default_args="\ -S \ -C 2 \ From nobody Sat Mar 14 09:30:29 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXx0j5Qf6z6VYVx for ; Sat, 14 Mar 2026 09:30:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXx0j3GQTz3mgG for ; Sat, 14 Mar 2026 09:30:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773480629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hITu+Uye22cJjVCfliO9FPWwkraM6t+rQcfWFmiyryk=; b=vsnwiMWEBiPpzJ5+QW7x1EXbja6lAgIo9M8m8E2e7zbPM9tknddQZo9gAm4y1FkUxXzWgI W8LZwhmDqgmQAticxXK9X2Y7h69gIkKJwVYHCWwD7PxyToQZy7YUHFjU6AXgHc/5T/QeHP MUAccBgHB+UZ8UAMziftFr2OAREzRoibB4Dms2djCtTYctdBaaC62ZK+KfJvuPz3CnNUci UUKkmeLXlHx9GQr+FpkUakrnHGT9PIe1AcZHBV30POeG3kPhD6sWIAw9F4OHsCm78aXCcf oXde1Dv7yUiPJJLNI0GMNpLMBgIGKXct0fx1NGVqKKMhRAuOMNX99YRApujxlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773480629; a=rsa-sha256; cv=none; b=RJ7dcSxJc0aVk/npK+WdW1Ym+mZ3GTYOQvaN2OtfHF1QeMNrd6wXb2DPFveXmUOAj7H9VT tc2qOvMBwJBQJun+A4/reiPlLNMtvaIMd40PMj5S1w8TIkdX0+wWk92zSU9iUm62Soypq/ IF7b+na0RVy0n4IjPKS+TzLCbgckdULLsyRyIE7Q98vf7YU4qoqJJ0KKIpNihDfvQAMlgw SN5kdE34+PME4TRknyt4/KbHe3xvyM0qI+tiPxphY6r1692xZJj5jDw6KbpqW8CXz1xHQc 62wmZLHO3wFWgmI16SXAJ9ys++luNKE8YNs2sioD/rrC0z8xNtF9e7n/OWzpiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773480629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hITu+Uye22cJjVCfliO9FPWwkraM6t+rQcfWFmiyryk=; b=jVbnux8f25FEGPmx29unVZAb9AfZH2uTCH8CN804NPxYktoapqHOVqrg4LnSlj+vOm/asv KfABjnZlm7j6A/aQS59mPI9WqJ4PAZZga6wqt+ROvVcUDqYldvsdmelNBQDRKC7Dwp39hl f7tBxQX0brgu6hDenH/BkFyB1SgN4WNq3uAkwS04wWZA717QqKIgF97U0kKh6AjhEh+uOZ cmoLWhDAgxBiCNxWAI6zmoZyosyvIHNohIgVS1eZjsJkj7+FJ88mvncDyl9QCuKueCyipu ugHQrLFEAIm+cHGCR0cS8bnLYjnd2ZyUSS2Ffg485+45IKVZGesptNvt/yAXuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXx0j2q8Jz1Bqr for ; Sat, 14 Mar 2026 09:30:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f7c8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 09:30:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Strahinja =?utf-8?Q?Stani=C5=A1?==?utf-8?Q?i=C4=87?= From: Robert Clausecker Subject: git: 0536513edabc - stable/15 - libc/riscv64: temporarily disable strnlen() implementation until a fix is developed 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: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0536513edabc9ce3447738e986b0c9fff3907e64 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 09:30:29 +0000 Message-Id: <69b52ab5.3f7c8.611f0eec@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=0536513edabc9ce3447738e986b0c9fff3907e64 commit 0536513edabc9ce3447738e986b0c9fff3907e64 Author: Strahinja StaniÅ¡ić AuthorDate: 2026-03-07 21:59:25 +0000 Commit: Robert Clausecker CommitDate: 2026-03-14 09:29:21 +0000 libc/riscv64: temporarily disable strnlen() implementation until a fix is developed strnlen() doesn't seem to cope well with a length argument such that string pointer plus length overflows past the end of the address space. Reviewed by: fuz MFC after: 1 week PR: 293353, 293296 Differential Revision: https://reviews.freebsd.org/D55714 (cherry picked from commit 2a4e3112c811b9892e14e15cfd23538e7e47329c) --- lib/libc/riscv/string/Makefile.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libc/riscv/string/Makefile.inc b/lib/libc/riscv/string/Makefile.inc index 6dae6b2cb62d..ce965833cb27 100644 --- a/lib/libc/riscv/string/Makefile.inc +++ b/lib/libc/riscv/string/Makefile.inc @@ -5,6 +5,5 @@ MDSRCS+= \ memcpy.S \ memset.S \ strlen.S \ - strnlen.S \ strchrnul.S \ strrchr.S From nobody Sat Mar 14 09:30:30 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fXx0k5nJJz6VYW3 for ; Sat, 14 Mar 2026 09:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXx0k47w9z3myf for ; Sat, 14 Mar 2026 09:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773480630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gz4Nh6R4ShxKGBQ5LYud8XId9f3RyI3MLSkEGMWXfTI=; b=H+sCW1XcJV1izlSEYFKRYm9YmS/sHjJWa/1AQ/xXvaP+LhP5qcYAuO2uTwLT44g1mo3g1m I0EzUwt45msiogL0M657pOwgI68POoWL8pHwcFfM6LmvhQRcd6hRR5wwZrLt23KflkR5Ob IM08gxGHnhPk9EtQoLgwFGIyIDMOYzewDAd6LSV+ygZJJn/xfawKbz3zPnGanNK71/tWi0 4ne1zUEGTTlrS0XVQ2vAuGjbVsfaCvjGj4dj1c56bZ+7H0AtIlWIzca3DMS+VOdDOwM/zo FYtvr1920T6d3r5bJus/mkDdb7o8UkN9PilCne6fEQaOZE5GyKVXrQCLFoBWUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773480630; a=rsa-sha256; cv=none; b=O0vSJcFl+EW+N5bayJReFwJEezXiZ9vJRK0hUqLrgPgn2qePfeQOxvDT9S9s5Se0dDcJrC Y0IyGCcbFn7OtE8N14z46I17Z4tRoJmHuID4EEmfjsTmZ1rSVdirKrsaIsl2AB2wEsjDPx gOElQ9Z/W6jL8/u02IuYliHVx5WqU+dDIdWuMS1Y2l6j87XqwqUcUipLmQvWUEg6/uhofa xjb219Q4eVndo9nKWmEb2anUu/kMjD62y3aoniTyv6CdnOhjAqbpqiMx9zVC6aOaGEaMMT vQlCuluFBYN7d23mb2a56eW0YUF/A9+xif/pl6/wEbLOtvU7DzyxvXGTy1b37A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773480630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gz4Nh6R4ShxKGBQ5LYud8XId9f3RyI3MLSkEGMWXfTI=; b=xQQJZZ+T2kpboeziC0L1YbOMINuTwISFFnTS6FLba4eXW9bvTzDYgGTCq0gZN9+oeZJBhp gic5HrRzVC2F9Qbedb/NLVlMG/ytL8G9fR3ZlkfCPL6wlwgOxt5uJaMwbTq4exL4h9rUjK 6xAo09Ts0Cnxl5NwMRDpkrAsKUgw05Jj8+tjDA4MiQZTBz/9xBHsM1k0iVN8xRzSqKydzO bCPgmOntbuHrAJSEN4YnU14dmXLsXQAFJrzkzw2mLN57AdrtBlBXWUswo7zTyJQmofgPv2 E0tvKy0ghxlUJUyFV0cfkiPkcAOM/pHdTDbJvxhO8WJvDhLEy06ArQhTLu1yIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXx0k3gYwz1Bqt for ; Sat, 14 Mar 2026 09:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18881 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 09:30:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 521519f72d59 - stable/15 - depend-cleanup.sh: rebuild strnlen.o on riscv64 if it came from strnlen.S 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: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 521519f72d599622a79ed79f93c4f4b208089174 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 09:30:30 +0000 Message-Id: <69b52ab6.18881.6772147c@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=521519f72d599622a79ed79f93c4f4b208089174 commit 521519f72d599622a79ed79f93c4f4b208089174 Author: Robert Clausecker AuthorDate: 2026-03-07 23:14:25 +0000 Commit: Robert Clausecker CommitDate: 2026-03-14 09:29:22 +0000 depend-cleanup.sh: rebuild strnlen.o on riscv64 if it came from strnlen.S We have to switch back to the previous rule once the temporary build fix has been replaced with a permanent fix. MFC after: 1 week See also: 2a4e3112c811b9892e14e15cfd23538e7e47329c PR: 293353, 293296 (cherry picked from commit b5514e1c6d9e7ec09b299a983d1ce32852e0d9dc) --- tools/build/depend-cleanup.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 8e4b552edb0c..c36046385fae 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -546,7 +546,7 @@ if [ ${MACHINE} = riscv ]; then clean_dep lib/libc memcpy c # 20251031 5a52f0704435 libc: scalar strnlen() in RISC-V assembly - clean_dep lib/libc strnlen c + #clean_dep lib/libc strnlen c # 20251031 08af0bbc9c7d libc: scalar strchrnul() in RISC-V assembly clean_dep lib/libc strchrnul c @@ -554,6 +554,9 @@ if [ ${MACHINE} = riscv ]; then # 20251031 b5dbf3de5611 libc/riscv64: implement bcopy() and bzero() through memcpy() and memset() clean_dep lib/libc bcopy c "libc.string.bcopy.c" clean_dep lib/libc bzero c "libc.string.bzero.c" + + # 20260307 2a4e3112c811 libc/riscv64: temporarily disable strnlen() implementation until a fix is developed + clean_dep lib/libc strnlen S fi if [ ${MACHINE_ARCH} = "aarch64" ]; then From nobody Sat Mar 14 12:03:05 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fY0Nv3lxVz6VmqQ for ; Sat, 14 Mar 2026 12:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fY0Nv1hvgz435W for ; Sat, 14 Mar 2026 12:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773489791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T2XaKbPYA0p/GzCWTED/cZRU29j4O1Ekr7sZuSALtOI=; b=JKoe8ft/fCGe3KHYi9n76mf+q6rxJAN6il+eMzFqv4eLcZF+pbwLk4ZKPEdeufwhNvuUhE wo/uBQNddIHaJ+fHq/6eiLUhjr9jQ1jFq+MVbndb3ukipwoplHYZ4obIPugJrGlGnOrFgk eJqHD32Xcfzwna542JrC9F7pjmg8Clu+yfwMOvxilucD1tqARh73QiuFmNll8v5nevaEN/ 0aIpr49zfz1uLbG5k0o19omKSQCegNQqdUkOp8v7/uI8U8Ta8QUzw114616KotXH7ybvSi eGYFITzJ0mWJNiEsCHv0ywpn2Y4dZEhT5rWb9OI66rqp1i7WeifJXXGz/5CICw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773489791; a=rsa-sha256; cv=none; b=eXB/6RLat2uzcDQZ7eqjRTrV5P6epr19jNN0vxTca6v936gIz2YVyNW/UEGeFbZgkru6IL 8lfFso55GPGUnod9mQtvexLntIY9j9XJp4eZTtwv04n0jGuyMXiE6nZvUaZSh6eU5wSe65 AZppKHzWOmPq/Ee+iwaaE5Wh6a/48DL9pAwqUm9zh/ZV1Q352SVkdFp1LZh99IuC14qCHp /3n2/V16rerEEaTrHWLZ6IAPX8WWh9lj6/KhFxcPSuaXHCBxynK87Ff8KwSwe3fnNoh8pT XEt7/Z6dQn7EjXOmp/JAXfUYi0q1vEMEFPoHZOhBMOvCVdZPMpT3Z3j/AD/MiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773489791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T2XaKbPYA0p/GzCWTED/cZRU29j4O1Ekr7sZuSALtOI=; b=EQXDwKdpqGuRgSrh70o3I7gxCbkESkiayyKgVGhMkLp2BYpo4hs6xT6f1GzkziGFwNZFD8 ggLaqP/okPWF2e9v/3JnGiO08vGuHh/O0GSqR+KJc9mBL5refFjpbPHHYCMIOz5dx/D+0k q+K8qNgN3cV5YMmf7fmnm1lQZsycMkoUaHpSR2nkhU3brL4miOg6b7yCdGfaBb/kDQ9ecb pjU8GknlQRXXvEZJ+DSLND7+ew9ft/2/VcRTEvyYINYB1oxSzANUPRm7fTWBNqIArVwh+Y pXim2jXekxQojOZaQxT/I9C1CTKemBIoDM05nrSs7OP0zgze0bu0C786vnzIGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fY0Nv0rztz1G0C for ; Sat, 14 Mar 2026 12:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31471 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 12:03:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 756689232e6a - stable/15 - sigreturn.2: refresh the man page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 756689232e6a9e227c26b56f91624d69a08fdcce Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 12:03:05 +0000 Message-Id: <69b54e79.31471.6b04b1d8@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=756689232e6a9e227c26b56f91624d69a08fdcce commit 756689232e6a9e227c26b56f91624d69a08fdcce Author: Konstantin Belousov AuthorDate: 2026-03-08 20:08:42 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-14 12:02:34 +0000 sigreturn.2: refresh the man page (cherry picked from commit 9da4a804f0916b24519b8baa7ed460a7ba23d8c8) --- lib/libsys/sigreturn.2 | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/lib/libsys/sigreturn.2 b/lib/libsys/sigreturn.2 index 4effeaa5abc7..0e7bca507fc7 100644 --- a/lib/libsys/sigreturn.2 +++ b/lib/libsys/sigreturn.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 6, 2013 +.Dd March 11, 2026 .Dt SIGRETURN 2 .Os .Sh NAME @@ -47,17 +47,25 @@ The thread's signal mask and stack status are restored from the context structure pointed to by .Fa scp . The system call does not return; -the users stack pointer, frame pointer, argument pointer, -and processor status longword are restored from the context. -Execution resumes at the specified pc. -This system call is used by the trampoline code and -.Xr longjmp 3 +the whole userspace context as specified by +.Fa scp , +including the userspace stack pointer, all general-purpose registers, +coprocessor state, process status register, and program counter +are restored from the context. +Execution resumes at the program counter from the specified context. +.Pp +This system call is used by the kernel-provided signal trampoline code, +located in the virtual DSO (VDSO) on some architectures or as raw code +in the shared page if VDSO is not provided, when returning from a signal to the previously executing program. .Sh RETURN VALUES If successful, the system call does not return. -Otherwise, a value of -1 is returned and +Otherwise, a value of -1 may be returned, with .Va errno -is set to indicate the error. +set to indicate the error. +Some conditions detected by hardware result in the delivery of +a synchronous trap signal to the thread, in addition to or instead of +setting the system call error code. .Sh ERRORS The .Fn sigreturn From nobody Sat Mar 14 14:03:46 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fY3430G0Rz6VwcD for ; Sat, 14 Mar 2026 14:03:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fY3426lz5z3JX4 for ; Sat, 14 Mar 2026 14:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773497026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KHWNqRgco4y/4NObMpLoc0yIkvGbq8cD3GoQPqLsUiE=; b=gFUrGFoHnW+3ChCjUI/FJ3z/CHnwx/c0eqv5YlP3LK8U7cNdTkWCeVV2m72FeiTISJW96X eep+2k+21bnfkwVc5niIGckv/K2skSOt7AIWufFu2VdH7kttzJI7Pr0A58DZQYUzGwcsLF v8kfPZSjpNTt4Mh5zgj2yFhbiQmo8w8LI4mWD/Pjs7Gtex/JKSBXxw+KcD3aVqpY2BvrsU 4XcirJ5pW7VtbJVG9XNTuAKHpNnPc3oTr2lnztvbhzYM3ulNGpNRjx0ggjRY9+I6AaPunq fMGH4ZxkL1+ZQpg1S/7/6UCTeOaBjQPmWQy2dPdHeLXcemw3kULk9NhVK7fzvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773497026; a=rsa-sha256; cv=none; b=XkAnIkfZDc2J2wJAPwdUOy2Q5JrTniKhIlouSHiKI6ZkXDO2AgLmxtSE9ocyphUAsnY/ys xXCfD8Gk5eMh1NylU1bqFqRZGFBIHddeEacq4vCb4pKe2PVYyZXq18Kt0V1wp+6J7qcPD2 jzU5nNJ0Vf+cn1k4qyrJ8PZUL7azj25kiU4LTLXlYKOz4ZUpAzIocuiBua8hEabtX1VeYD +VrBGsHGyIxgKmxUEA9h+EJl0jh0g82yX/GoUwGle1JObP11XPUJ5Q1sgAM8U7mILxqWT9 osQJXxZQdmuQroz6elr4wvvasJsUPEs+IEXUEhywncdnNpRqvxqJnYkd44MPKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773497026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KHWNqRgco4y/4NObMpLoc0yIkvGbq8cD3GoQPqLsUiE=; b=EpesfKtnneKZ6dGjcL/YoAqjHjylyCUk+XQihjYIhJoKsOjgNEMN+5Itze9MtAVEpNhYi7 qzFxeFfeKEsyn4RjywGHZ9vv2WeGDjwGOaAQLBjIxE8DpV1j+I1YmXqnjNPR6gqOj/gsMZ CavDsi7t+hjI5Hjh6qp5+gs8KBNQl7SpQs4c7OqfpXU9Cv2e1D7qtwQIDUZgqpO+tDb01k 2P6C0O991IAyphYHA5wUC3Wpf60URQKxhaec+RL69ytQO24TzSB3wlXwuowU6hCNUb50QR rHpikUUUTESflHC3TrolJp4v76fbEfSwiMcMyO8HMUGs8wZV589RKceHua2Zvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fY3426Lclz1Kxb for ; Sat, 14 Mar 2026 14:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3db11 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 14:03:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 9c49c393a81b - stable/15 - virtual_oss: Use virtual_oss_timestamp() to avoid duplication List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9c49c393a81bd47304ba76f26892faf4fc172d1c Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 14:03:46 +0000 Message-Id: <69b56ac2.3db11.7d95377c@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9c49c393a81bd47304ba76f26892faf4fc172d1c commit 9c49c393a81bd47304ba76f26892faf4fc172d1c Author: Christos Margiolis AuthorDate: 2026-03-07 23:46:28 +0000 Commit: Christos Margiolis CommitDate: 2026-03-14 14:03:30 +0000 virtual_oss: Use virtual_oss_timestamp() to avoid duplication Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit e75c8faf277dded0a80d469cb8182583716a2211) --- usr.sbin/virtual_oss/virtual_oss/virtual_oss.c | 29 ++++++++++++-------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c index fc7892df892c..18af38d8e7aa 100644 --- a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c +++ b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c @@ -39,6 +39,18 @@ #include "backend.h" #include "int.h" +uint64_t +virtual_oss_timestamp(void) +{ + struct timespec ts; + uint64_t nsec; + + clock_gettime(CLOCK_MONOTONIC, &ts); + + nsec = ts.tv_sec * 1000000000ULL + ts.tv_nsec; + return (nsec); +} + uint64_t virtual_oss_delay_ns(void) { @@ -54,31 +66,16 @@ virtual_oss_delay_ns(void) void virtual_oss_wait(void) { - struct timespec ts; uint64_t delay; uint64_t nsec; - clock_gettime(CLOCK_MONOTONIC, &ts); - - nsec = ts.tv_sec * 1000000000ULL + ts.tv_nsec; + nsec = virtual_oss_timestamp(); delay = virtual_oss_delay_ns(); usleep((delay - (nsec % delay)) / 1000); } -uint64_t -virtual_oss_timestamp(void) -{ - struct timespec ts; - uint64_t nsec; - - clock_gettime(CLOCK_MONOTONIC, &ts); - - nsec = ts.tv_sec * 1000000000ULL + ts.tv_nsec; - return (nsec); -} - static size_t vclient_read_linear(struct virtual_client *pvc, struct virtual_ring *pvr, int64_t *dst, size_t total) __requires_exclusive(atomic_mtx) From nobody Sat Mar 14 14:03:45 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fY3470rJYz6Vwt8 for ; Sat, 14 Mar 2026 14:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fY3466MSxz3JK8 for ; Sat, 14 Mar 2026 14:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773497030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mLIoHopMDUIyHbPBGPB/XkEt2s2zdKB1ZWyyY0lRIKU=; b=ODyoPkt1aLDGt9NWlkkRZGszXnuIFL5NmD566QC9xu2bVcOasK466QISjsto4+RSYimRjV dWMLvTA+7mpeB5mZgLDnuKLhMLWUxUYayAy3+eD65szlk80VWITGjhZ/Y/EkJyM++7vBM8 3vVePIZ4AILY8cF580Jy+6ns/Nqj+5r9i/G2SgkrXBKrTIZvbrylRL/A6SAvLtUd47wF58 1ODgSYgC7Q08wRH7YhMIXqvCQWWJjCeWKvSQi7riIQ9gSZybqiaZPkGrm/c6kOkWena58p qS/LPAkmM7ClaYeaQVwTJ0chEYojvibhwWWeYQpc0AeR4tTgRkrej+dnNvbuqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773497030; a=rsa-sha256; cv=none; b=YkFtWn52KH+I+WHNn0wJQZsIODCyyIWFTWBjcTaHV8NvTK4mVkBkFWCSJzKgwRym7OznKa XU0PlEf5tnXrTsMwY61DNFzeikjN4r+yHec/PMaF6kAdFS69iyG2xsaI9W7TlIkSUgkE0i qEYCz46WZqQCEvUIaeOhq1xP/GCVxPICjNU6tcllrppO3qo9AQlIjd35RdpVBaO/n6u09B qzcSc2kB8EMOqh5M8hmXYtyWkQnaeJlL/VBpq58f7aABKf7wX+SaXgmzmAPapKIQa5KgmR 6CnHs/Tws97kdNQ7Ac4dPHdTwF268KAV9npPKWkR0/+BtDN/UGjHSgTavP/PnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773497030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mLIoHopMDUIyHbPBGPB/XkEt2s2zdKB1ZWyyY0lRIKU=; b=ZUJ85m5bjZdk79ygP0Lrs9X5CuR77TKV6w+aqWfbIAaMOfj/gdLD/plJz9bEBMIrzUIn8e CL0p3V3NMZLoWEMnswufS5B35405ItiK4/BkMFQHfC5HlpM0Eq6VjbdD0KfZdLYNLcVOs2 QSXXcE/QFkby799RKfX7S03ExuWZoLOA6MkKfsC9lJiH2gNxjZ3ZnteuWgeu860pFu6fn/ gBlZAdP+bfSRuZWkUHHTGQSeTO0Pqps1SEDu52D4fk/2Zrs80Cxlsa4X2R2NtxFL1mW5Xx 4NXemeK2IsfA2WNwfCHMcOKnHJz99CqSzldajBByGjsgkjEdq0+pjRFfVrzBJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fY3465m0Gz1K2R for ; Sat, 14 Mar 2026 14:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d897 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 14:03:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: c4e303fbdca7 - stable/15 - virtual_oss: Use virtual_oss_delay_ns() to avoid duplication List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c4e303fbdca7cdf9a2a98e56fc906ec3f9d54337 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 14:03:45 +0000 Message-Id: <69b56ac1.3d897.59bd0142@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=c4e303fbdca7cdf9a2a98e56fc906ec3f9d54337 commit c4e303fbdca7cdf9a2a98e56fc906ec3f9d54337 Author: Christos Margiolis AuthorDate: 2026-03-07 23:46:25 +0000 Commit: Christos Margiolis CommitDate: 2026-03-14 14:03:30 +0000 virtual_oss: Use virtual_oss_delay_ns() to avoid duplication Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit 3a410851bf02c247e71bcd06fdeec2706c6b6070) --- usr.sbin/virtual_oss/virtual_oss/virtual_oss.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c index 891653494f06..fc7892df892c 100644 --- a/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c +++ b/usr.sbin/virtual_oss/virtual_oss/virtual_oss.c @@ -62,10 +62,7 @@ virtual_oss_wait(void) nsec = ts.tv_sec * 1000000000ULL + ts.tv_nsec; - /* TODO use virtual_oss_delay_ns() */ - delay = voss_dsp_samples; - delay *= 1000000000ULL; - delay /= voss_dsp_sample_rate; + delay = virtual_oss_delay_ns(); usleep((delay - (nsec % delay)) / 1000); }